From 88ceab8d948f3c67f22438c1cca2ffdfd21fbc2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bargull?= <andre.bargull@gmail.com>
Date: Thu, 29 Jan 2026 07:42:53 +0000
Subject: [PATCH 001/116] Bug 2010219 - Part 1: Move Intl.Segmenter
 initialisation to C++. r=dminor

Moves initialisation, `resolvedOptions`, and `segment` to C++.

Part 2 removes the self-hosted code.

Differential Revision: https://phabricator.services.mozilla.com/D279032
---
 js/src/builtin/intl/Segmenter.cpp | 272 +++++++++++++++++++++++-------
 js/src/builtin/intl/Segmenter.h   |  42 ++---
 js/src/builtin/intl/Segmenter.js  |   3 -
 js/src/vm/SelfHosting.cpp         |   1 -
 4 files changed, 233 insertions(+), 85 deletions(-)

diff --git a/js/src/builtin/intl/Segmenter.cpp b/js/src/builtin/intl/Segmenter.cpp
index 7c6e9f1a92734..4bc6158559509 100644
--- a/js/src/builtin/intl/Segmenter.cpp
+++ b/js/src/builtin/intl/Segmenter.cpp
@@ -17,7 +17,9 @@
 #include "builtin/Array.h"
 #include "builtin/intl/CommonFunctions.h"
 #include "builtin/intl/LocaleNegotiation.h"
+#include "builtin/intl/ParameterNegotiation.h"
 #include "builtin/intl/StringAsciiChars.h"
+#include "builtin/intl/UsingEnum.h"
 #include "gc/AllocKind.h"
 #include "gc/GCContext.h"
 #include "icu4x/GraphemeClusterSegmenter.hpp"
@@ -71,6 +73,10 @@ const JSClass& SegmenterObject::protoClass_ = PlainObject::class_;
 static bool segmenter_supportedLocalesOf(JSContext* cx, unsigned argc,
                                          Value* vp);
 
+static bool segmenter_segment(JSContext* cx, unsigned argc, Value* vp);
+
+static bool segmenter_resolvedOptions(JSContext* cx, unsigned argc, Value* vp);
+
 static bool segmenter_toSource(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
   args.rval().setString(cx->names().Segmenter);
@@ -83,9 +89,8 @@ static const JSFunctionSpec segmenter_static_methods[] = {
 };
 
 static const JSFunctionSpec segmenter_methods[] = {
-    JS_SELF_HOSTED_FN("resolvedOptions", "Intl_Segmenter_resolvedOptions", 0,
-                      0),
-    JS_SELF_HOSTED_FN("segment", "Intl_Segmenter_segment", 1, 0),
+    JS_FN("resolvedOptions", segmenter_resolvedOptions, 0, 0),
+    JS_FN("segment", segmenter_segment, 1, 0),
     JS_FN("toSource", segmenter_toSource, 0, 0),
     JS_FS_END,
 };
@@ -108,6 +113,24 @@ const ClassSpec SegmenterObject::classSpec_ = {
     ClassSpec::DontDefineConstructor,
 };
 
+static constexpr std::string_view GranularityToString(
+    SegmenterGranularity granularity) {
+#ifndef USING_ENUM
+  using enum SegmenterGranularity;
+#else
+  USING_ENUM(SegmenterGranularity, Grapheme, Word, Sentence);
+#endif
+  switch (granularity) {
+    case Grapheme:
+      return "grapheme";
+    case Word:
+      return "word";
+    case Sentence:
+      return "sentence";
+  }
+  MOZ_CRASH("invalid segmenter granularity");
+}
+
 /**
  * Intl.Segmenter ([ locales [ , options ]])
  */
@@ -132,16 +155,69 @@ static bool Segmenter(JSContext* cx, unsigned argc, Value* vp) {
     return false;
   }
 
-  HandleValue locales = args.get(0);
-  HandleValue options = args.get(1);
+  // Step 4. (Inlined ResolveOptions)
+
+  // ResolveOptions, step 1.
+  Rooted<LocalesList> requestedLocales(cx, cx);
+  if (!CanonicalizeLocaleList(cx, args.get(0), &requestedLocales)) {
+    return false;
+  }
 
-  // Steps 4-13.
-  if (!intl::InitializeObject(cx, segmenter, cx->names().InitializeSegmenter,
-                              locales, options)) {
+  Rooted<ArrayObject*> requestedLocalesArray(
+      cx, LocalesListToArray(cx, requestedLocales));
+  if (!requestedLocalesArray) {
     return false;
   }
+  segmenter->setRequestedLocales(requestedLocalesArray);
+
+  auto granularity = SegmenterGranularity::Grapheme;
+  if (args.hasDefined(1)) {
+    // ResolveOptions, steps 2-3.
+    Rooted<JSObject*> options(
+        cx, RequireObjectArg(cx, "options", "Intl.Segmenter", args[1]));
+    if (!options) {
+      return false;
+    }
+
+    // ResolveOptions, step 4.
+    LocaleMatcher matcher;
+    if (!GetLocaleMatcherOption(cx, options, &matcher)) {
+      return false;
+    }
+
+    // ResolveOptions, step 5.
+    //
+    // This implementation only supports the "lookup" locale matcher, therefore
+    // the "localeMatcher" option doesn't need to be stored.
+
+    // ResolveOptions, step 6.
+    //
+    // Intl.Segmenter doesn't support any Unicode extension keys.
+
+    // ResolveOptions, step 7. (Not applicable)
+
+    // ResolveOptions, step 8. (Performed in ResolveLocale)
+
+    // ResolveOptions, step 9. (Return)
+
+    // Step 5. (Not applicable when ResolveOptions is inlined.)
+
+    // Steps 6-7. (Performed in ResolveLocale)
+
+    // Step 8.
+    static constexpr auto granularities = MapOptions<GranularityToString>(
+        SegmenterGranularity::Grapheme, SegmenterGranularity::Word,
+        SegmenterGranularity::Sentence);
+    if (!GetStringOption(cx, options, cx->names().granularity, granularities,
+                         SegmenterGranularity::Grapheme, &granularity)) {
+      return false;
+    }
+  }
 
-  // Step 14.
+  // Step 9.
+  segmenter->setGranularity(granularity);
+
+  // Step 10.
   args.rval().setObject(*segmenter);
   return true;
 }
@@ -516,46 +592,36 @@ static typename Interface::Segmenter* CreateSegmenter(
   return result.ok;
 }
 
-static bool EnsureInternalsResolved(JSContext* cx,
-                                    Handle<SegmenterObject*> segmenter) {
-  if (segmenter->getLocale()) {
+/**
+ * Resolve the actual locale to finish initialization of the Segmenter.
+ */
+static bool ResolveLocale(JSContext* cx, Handle<SegmenterObject*> segmenter) {
+  // Return if the locale was already resolved.
+  if (segmenter->isLocaleResolved()) {
     return true;
   }
 
-  Rooted<JS::Value> value(cx);
+  Rooted<ArrayObject*> requestedLocales(
+      cx, &segmenter->getRequestedLocales()->as<ArrayObject>());
 
-  Rooted<JSObject*> internals(cx, intl::GetInternalsObject(cx, segmenter));
-  if (!internals) {
-    return false;
-  }
+  // %Intl.Segmenter%.[[RelevantExtensionKeys]] is « ».
+  mozilla::EnumSet<UnicodeExtensionKey> relevantExtensionKeys{};
 
-  if (!GetProperty(cx, internals, internals, cx->names().locale, &value)) {
-    return false;
-  }
-  Rooted<JSString*> locale(cx, value.toString());
-
-  if (!GetProperty(cx, internals, internals, cx->names().granularity, &value)) {
-    return false;
-  }
+  // Initialize locale options from constructor arguments.
+  Rooted<LocaleOptions> localeOptions(cx);
 
-  SegmenterGranularity granularity;
-  {
-    JSLinearString* linear = value.toString()->ensureLinear(cx);
-    if (!linear) {
-      return false;
-    }
+  // Use the default locale data.
+  auto localeData = LocaleData::Default;
 
-    if (StringEqualsLiteral(linear, "grapheme")) {
-      granularity = SegmenterGranularity::Grapheme;
-    } else if (StringEqualsLiteral(linear, "word")) {
-      granularity = SegmenterGranularity::Word;
-    } else {
-      MOZ_ASSERT(StringEqualsLiteral(linear, "sentence"));
-      granularity = SegmenterGranularity::Sentence;
-    }
+  // Resolve the actual locale.
+  Rooted<ResolvedLocale> resolved(cx);
+  if (!ResolveLocale(cx, AvailableLocaleKind::ListFormat, requestedLocales,
+                     localeOptions, relevantExtensionKeys, localeData,
+                     &resolved)) {
+    return false;
   }
 
-  switch (granularity) {
+  switch (segmenter->getGranularity()) {
     case SegmenterGranularity::Grapheme: {
       auto* seg = CreateSegmenter<GraphemeClusterSegmenter>();
       if (!seg) {
@@ -565,7 +631,7 @@ static bool EnsureInternalsResolved(JSContext* cx,
       break;
     }
     case SegmenterGranularity::Word: {
-      auto* seg = CreateSegmenter<WordSegmenter>(cx, locale);
+      auto* seg = CreateSegmenter<WordSegmenter>(cx, resolved.dataLocale());
       if (!seg) {
         return false;
       }
@@ -573,7 +639,7 @@ static bool EnsureInternalsResolved(JSContext* cx,
       break;
     }
     case SegmenterGranularity::Sentence: {
-      auto* seg = CreateSegmenter<SentenceSegmenter>(cx, locale);
+      auto* seg = CreateSegmenter<SentenceSegmenter>(cx, resolved.dataLocale());
       if (!seg) {
         return false;
       }
@@ -582,9 +648,10 @@ static bool EnsureInternalsResolved(JSContext* cx,
     }
   }
 
-  segmenter->setLocale(locale);
-  segmenter->setGranularity(granularity);
+  // Finish initialization by setting the actual locale.
+  segmenter->setLocale(resolved.dataLocale());
 
+  MOZ_ASSERT(segmenter->isLocaleResolved(), "locale successfully resolved");
   return true;
 }
 
@@ -824,6 +891,14 @@ static bool EnsureBreakIterator(JSContext* cx, Handle<T*> segments,
     segments->setIndex(0);
   }
 
+  // Ensure the locale is resolved.
+  if (!segments->getSegmenter()->isLocaleResolved()) {
+    Rooted<SegmenterObject*> segmenter(cx, segments->getSegmenter());
+    if (!ResolveLocale(cx, segmenter)) {
+      return false;
+    }
+  }
+
   // Ensure the string characters can be passed to ICU4X.
   if (!EnsureStringChars(cx, segments)) {
     return false;
@@ -925,28 +1000,21 @@ static ArrayObject* FindSegmentBoundaries(JSContext* cx, Handle<T*> segments,
   return CreateBoundaries(cx, boundaries, segments->getGranularity());
 }
 
-bool js::intl_CreateSegmentsObject(JSContext* cx, unsigned argc, Value* vp) {
-  CallArgs args = CallArgsFromVp(argc, vp);
-  MOZ_ASSERT(args.length() == 2);
-
-  Rooted<SegmenterObject*> segmenter(cx,
-                                     &args[0].toObject().as<SegmenterObject>());
-  Rooted<JSString*> string(cx, args[1].toString());
-
-  // Ensure the internal properties are resolved.
-  if (!EnsureInternalsResolved(cx, segmenter)) {
-    return false;
-  }
-
+/**
+ * Create a new Segments object.
+ */
+static SegmentsObject* CreateSegmentsObject(JSContext* cx,
+                                            Handle<SegmenterObject*> segmenter,
+                                            Handle<JSString*> string) {
   Rooted<JSObject*> proto(
       cx, GlobalObject::getOrCreateSegmentsPrototype(cx, cx->global()));
   if (!proto) {
-    return false;
+    return nullptr;
   }
 
   auto* segments = NewObjectWithGivenProto<SegmentsObject>(cx, proto);
   if (!segments) {
-    return false;
+    return nullptr;
   }
 
   segments->setSegmenter(segmenter);
@@ -954,8 +1022,7 @@ bool js::intl_CreateSegmentsObject(JSContext* cx, unsigned argc, Value* vp) {
   segments->setString(string);
   segments->setIndex(0);
 
-  args.rval().setObject(*segments);
-  return true;
+  return segments;
 }
 
 bool js::intl_CreateSegmentIterator(JSContext* cx, unsigned argc, Value* vp) {
@@ -1028,6 +1095,89 @@ bool js::intl_FindNextSegmentBoundaries(JSContext* cx, unsigned argc,
   return true;
 }
 
+static bool IsSegmenter(Handle<JS::Value> v) {
+  return v.isObject() && v.toObject().is<SegmenterObject>();
+}
+
+/**
+ * Intl.Segmenter.prototype.segment ( string )
+ */
+static bool segmenter_segment(JSContext* cx, const CallArgs& args) {
+  Rooted<SegmenterObject*> segmenter(
+      cx, &args.thisv().toObject().as<SegmenterObject>());
+
+  // Step 3.
+  Rooted<JSString*> string(cx, JS::ToString(cx, args.get(0)));
+  if (!string) {
+    return false;
+  }
+
+  // Step 4.
+  auto* result = CreateSegmentsObject(cx, segmenter, string);
+  if (!result) {
+    return false;
+  }
+  args.rval().setObject(*result);
+  return true;
+}
+
+/**
+ * Intl.Segmenter.prototype.segment ( string )
+ */
+static bool segmenter_segment(JSContext* cx, unsigned argc, Value* vp) {
+  // Steps 1-2.
+  CallArgs args = CallArgsFromVp(argc, vp);
+  return CallNonGenericMethod<IsSegmenter, segmenter_segment>(cx, args);
+}
+
+/**
+ * Intl.Segmenter.prototype.resolvedOptions ( )
+ */
+static bool segmenter_resolvedOptions(JSContext* cx, const CallArgs& args) {
+  Rooted<SegmenterObject*> segmenter(
+      cx, &args.thisv().toObject().as<SegmenterObject>());
+
+  if (!ResolveLocale(cx, segmenter)) {
+    return false;
+  }
+
+  // Step 3.
+  Rooted<IdValueVector> options(cx, cx);
+
+  // Step 4.
+  if (!options.emplaceBack(NameToId(cx->names().locale),
+                           StringValue(segmenter->getLocale()))) {
+    return false;
+  }
+
+  auto* granularity = NewStringCopy<CanGC>(
+      cx, GranularityToString(segmenter->getGranularity()));
+  if (!granularity) {
+    return false;
+  }
+  if (!options.emplaceBack(NameToId(cx->names().granularity),
+                           StringValue(granularity))) {
+    return false;
+  }
+
+  // Step 5.
+  auto* result = NewPlainObjectWithUniqueNames(cx, options);
+  if (!result) {
+    return false;
+  }
+  args.rval().setObject(*result);
+  return true;
+}
+
+/**
+ * Intl.Segmenter.prototype.resolvedOptions ( )
+ */
+static bool segmenter_resolvedOptions(JSContext* cx, unsigned argc, Value* vp) {
+  // Steps 1-2.
+  CallArgs args = CallArgsFromVp(argc, vp);
+  return CallNonGenericMethod<IsSegmenter, segmenter_resolvedOptions>(cx, args);
+}
+
 /**
  * Intl.Segmenter.supportedLocalesOf ( locales [ , options ] )
  */
diff --git a/js/src/builtin/intl/Segmenter.h b/js/src/builtin/intl/Segmenter.h
index 2b75b86488257..b7ff42d6e26de 100644
--- a/js/src/builtin/intl/Segmenter.h
+++ b/js/src/builtin/intl/Segmenter.h
@@ -14,6 +14,7 @@
 #include "js/Class.h"
 #include "js/Value.h"
 #include "vm/NativeObject.h"
+#include "vm/StringType.h"
 
 struct JS_PUBLIC_API JSContext;
 class JSString;
@@ -31,26 +32,35 @@ class SegmenterObject : public NativeObject {
   static const JSClass class_;
   static const JSClass& protoClass_;
 
-  static constexpr uint32_t INTERNALS_SLOT = 0;
-  static constexpr uint32_t LOCALE_SLOT = 1;
-  static constexpr uint32_t GRANULARITY_SLOT = 2;
-  static constexpr uint32_t SEGMENTER_SLOT = 3;
-  static constexpr uint32_t SLOT_COUNT = 4;
+  static constexpr uint32_t LOCALE_SLOT = 0;
+  static constexpr uint32_t GRANULARITY_SLOT = 1;
+  static constexpr uint32_t SEGMENTER_SLOT = 2;
+  static constexpr uint32_t SLOT_COUNT = 3;
 
-  static_assert(INTERNALS_SLOT == INTL_INTERNALS_OBJECT_SLOT,
-                "INTERNALS_SLOT must match self-hosting define for internals "
-                "object slot");
+  bool isLocaleResolved() const { return getFixedSlot(LOCALE_SLOT).isString(); }
 
-  JSString* getLocale() const {
+  JSObject* getRequestedLocales() const {
     const auto& slot = getFixedSlot(LOCALE_SLOT);
     if (slot.isUndefined()) {
       return nullptr;
     }
-    return slot.toString();
+    return &slot.toObject();
+  }
+
+  void setRequestedLocales(JSObject* requestedLocales) {
+    setFixedSlot(LOCALE_SLOT, JS::ObjectValue(*requestedLocales));
   }
 
-  void setLocale(JSString* locale) {
-    setFixedSlot(LOCALE_SLOT, StringValue(locale));
+  JSLinearString* getLocale() const {
+    const auto& slot = getFixedSlot(LOCALE_SLOT);
+    if (slot.isUndefined()) {
+      return nullptr;
+    }
+    return &slot.toString()->asLinear();
+  }
+
+  void setLocale(JSLinearString* locale) {
+    setFixedSlot(LOCALE_SLOT, JS::StringValue(locale));
   }
 
   SegmenterGranularity getGranularity() const {
@@ -346,14 +356,6 @@ class SegmentIteratorObject : public NativeObject {
   static void finalize(JS::GCContext* gcx, JSObject* obj);
 };
 
-/**
- * Create a new Segments object.
- *
- * Usage: segment = intl_CreateSegmentsObject(segmenter, string)
- */
-[[nodiscard]] extern bool intl_CreateSegmentsObject(JSContext* cx,
-                                                    unsigned argc, Value* vp);
-
 /**
  * Create a new Segment Iterator object.
  *
diff --git a/js/src/builtin/intl/Segmenter.js b/js/src/builtin/intl/Segmenter.js
index 2636a6a4e3948..226acb2cf0a19 100644
--- a/js/src/builtin/intl/Segmenter.js
+++ b/js/src/builtin/intl/Segmenter.js
@@ -161,9 +161,6 @@ function Intl_Segmenter_segment(value) {
     );
   }
 
-  // Ensure the Segmenter internals are resolved.
-  getSegmenterInternals(segmenter);
-
   // Step 3.
   var string = ToString(value);
 
diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp
index fb4210b7fc51f..349b7599a4bfc 100644
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -1862,7 +1862,6 @@ static const JSFunctionSpec intrinsic_functions[] = {
           CallNonGenericSelfhostedMethod<Is<SegmentsObject>>, 2, 0),
     JS_FN("intl_CompareStrings", intl_CompareStrings, 3, 0),
     JS_FN("intl_CreateSegmentIterator", intl_CreateSegmentIterator, 1, 0),
-    JS_FN("intl_CreateSegmentsObject", intl_CreateSegmentsObject, 2, 0),
     JS_FN("intl_DefaultTimeZone", intrinsic_DefaultTimeZone, 0, 0),
     JS_FN("intl_FindNextSegmentBoundaries", intl_FindNextSegmentBoundaries, 1,
           0),

From 3b41d03e4c21ac94504184bcb6c09609faf9577d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bargull?= <andre.bargull@gmail.com>
Date: Thu, 29 Jan 2026 07:42:53 +0000
Subject: [PATCH 002/116] Bug 2010219 - Part 2: Remove no longer used
 self-hosting code for Intl.Segmenter. r=dminor

Differential Revision: https://phabricator.services.mozilla.com/D279033
---
 js/src/builtin/intl/CommonFunctions.js |  14 +-
 js/src/builtin/intl/Segmenter.js       | 199 -------------------------
 js/src/jit/CacheIR.cpp                 |   1 -
 js/src/jit/InlinableNatives.cpp        |   4 -
 js/src/jit/InlinableNatives.h          |   1 -
 js/src/vm/SelfHosting.cpp              |   5 -
 6 files changed, 4 insertions(+), 220 deletions(-)

diff --git a/js/src/builtin/intl/CommonFunctions.js b/js/src/builtin/intl/CommonFunctions.js
index 9d3050cf0c4e9..ad57c643a2f22 100644
--- a/js/src/builtin/intl/CommonFunctions.js
+++ b/js/src/builtin/intl/CommonFunctions.js
@@ -262,8 +262,7 @@ function initializeIntlObject(obj, type, lazyData) {
       (type === "DateTimeFormat" && intl_GuardToDateTimeFormat(obj) !== null) ||
       (type === "DurationFormat" && intl_GuardToDurationFormat(obj) !== null) ||
       (type === "NumberFormat" && intl_GuardToNumberFormat(obj) !== null) ||
-      (type === "PluralRules" && intl_GuardToPluralRules(obj) !== null) ||
-      (type === "Segmenter" && intl_GuardToSegmenter(obj) !== null),
+      (type === "PluralRules" && intl_GuardToPluralRules(obj) !== null),
     "type must match the object's class"
   );
   assert(IsObject(lazyData), "non-object lazy data");
@@ -277,7 +276,6 @@ function initializeIntlObject(obj, type, lazyData) {
   // - DurationFormat
   // - NumberFormat
   // - PluralRules
-  // - Segmenter
   //
   // The .lazyData property stores information needed to compute -- without
   // observable side effects -- the actual internal Intl properties of
@@ -344,8 +342,7 @@ function getIntlObjectInternals(obj) {
       intl_GuardToDateTimeFormat(obj) !== null ||
       intl_GuardToDurationFormat(obj) !== null ||
       intl_GuardToNumberFormat(obj) !== null ||
-      intl_GuardToPluralRules(obj) !== null ||
-      intl_GuardToSegmenter(obj) !== null,
+      intl_GuardToPluralRules(obj) !== null,
     "getIntlObjectInternals called with non-Intl object"
   );
 
@@ -362,9 +359,7 @@ function getIntlObjectInternals(obj) {
       (internals.type === "NumberFormat" &&
         intl_GuardToNumberFormat(obj) !== null) ||
       (internals.type === "PluralRules" &&
-        intl_GuardToPluralRules(obj) !== null) ||
-      (internals.type === "Segmenter" &&
-        intl_GuardToSegmenter(obj) !== null),
+        intl_GuardToPluralRules(obj) !== null),
     "type must match the object's class"
   );
   assert(hasOwn("lazyData", internals), "missing lazyData");
@@ -399,8 +394,7 @@ function getInternals(obj) {
   } else if (type === "PluralRules") {
     internalProps = resolvePluralRulesInternals(internals.lazyData);
   } else {
-    assert(type === "Segmenter", "unexpected Intl type");
-    internalProps = resolveSegmenterInternals(internals.lazyData);
+    assert(false, "unexpected Intl constructor");
   }
   setInternalProperties(internals, internalProps);
   return internalProps;
diff --git a/js/src/builtin/intl/Segmenter.js b/js/src/builtin/intl/Segmenter.js
index 226acb2cf0a19..472b2f67356f5 100644
--- a/js/src/builtin/intl/Segmenter.js
+++ b/js/src/builtin/intl/Segmenter.js
@@ -2,205 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/**
- * Intl.Segmenter ( [ locales [ , options ] ] )
- *
- * Compute an internal properties object from |lazySegmenterData|.
- */
-function resolveSegmenterInternals(lazySegmenterData) {
-  assert(IsObject(lazySegmenterData), "lazy data not an object?");
-
-  var internalProps = std_Object_create(null);
-
-  // Compute effective locale.
-
-  // Steps 9-10.
-  var r = intl_ResolveLocale(
-    "Segmenter",
-    lazySegmenterData.requestedLocales,
-    lazySegmenterData.opt,
-  );
-
-  // Step 11.
-  internalProps.locale = r.locale;
-
-  // Step 13.
-  internalProps.granularity = lazySegmenterData.granularity;
-
-  // The caller is responsible for associating |internalProps| with the right
-  // object using |setInternalProperties|.
-  return internalProps;
-}
-
-/**
- * Returns an object containing the Segmenter internal properties of |obj|.
- */
-function getSegmenterInternals(obj) {
-  assert(IsObject(obj), "getSegmenterInternals called with non-object");
-  assert(
-    intl_GuardToSegmenter(obj) !== null,
-    "getSegmenterInternals called with non-Segmenter"
-  );
-
-  var internals = getIntlObjectInternals(obj);
-  assert(
-    internals.type === "Segmenter",
-    "bad type escaped getIntlObjectInternals"
-  );
-
-  // If internal properties have already been computed, use them.
-  var internalProps = maybeInternalProperties(internals);
-  if (internalProps) {
-    return internalProps;
-  }
-
-  // Otherwise it's time to fully create them.
-  internalProps = resolveSegmenterInternals(internals.lazyData);
-  setInternalProperties(internals, internalProps);
-  return internalProps;
-}
-
-/**
- * Intl.Segmenter ( [ locales [ , options ] ] )
- *
- * Initializes an object as a Segmenter.
- *
- * This method is complicated a moderate bit by its implementing initialization
- * as a *lazy* concept.  Everything that must happen now, does -- but we defer
- * all the work we can until the object is actually used as a Segmenter.
- * This later work occurs in |resolveSegmenterInternals|; steps not noted here
- * occur there.
- */
-function InitializeSegmenter(segmenter, locales, options) {
-  assert(IsObject(segmenter), "InitializeSegmenter called with non-object");
-  assert(
-    intl_GuardToSegmenter(segmenter) !== null,
-    "InitializeSegmenter called with non-Segmenter"
-  );
-
-  // Lazy Segmenter data has the following structure:
-  //
-  //   {
-  //     requestedLocales: List of locales,
-  //
-  //     opt: // opt object computed in InitializeSegmenter
-  //       {
-  //         localeMatcher: "lookup" / "best fit",
-  //       }
-  //
-  //     granularity: "grapheme" / "word" / "sentence",
-  //   }
-  //
-  // Note that lazy data is only installed as a final step of initialization,
-  // so every Segmenter lazy data object has *all* these properties, never a
-  // subset of them.
-  var lazySegmenterData = std_Object_create(null);
-
-  // Step 4.
-  var requestedLocales = CanonicalizeLocaleList(locales);
-  lazySegmenterData.requestedLocales = requestedLocales;
-
-  // Step 5.
-  if (options === undefined) {
-    options = std_Object_create(null);
-  } else if (!IsObject(options)) {
-    ThrowTypeError(
-      JSMSG_OBJECT_REQUIRED,
-      options === null ? "null" : typeof options
-    );
-  }
-
-  // Step 6.
-  var opt = NEW_RECORD();
-  lazySegmenterData.opt = opt;
-
-  // Steps 7-8.
-  var matcher = GetOption(
-    options,
-    "localeMatcher",
-    "string",
-    ["lookup", "best fit"],
-    "best fit"
-  );
-  opt.localeMatcher = matcher;
-
-  // Steps 12-13.
-  var granularity = GetOption(
-    options,
-    "granularity",
-    "string",
-    ["grapheme", "word", "sentence"],
-    "grapheme"
-  );
-  lazySegmenterData.granularity = granularity;
-
-  // We've done everything that must be done now: mark the lazy data as fully
-  // computed and install it.
-  initializeIntlObject(segmenter, "Segmenter", lazySegmenterData);
-}
-
-/**
- * Intl.Segmenter.prototype.segment ( string )
- *
- * Create a new Segments object.
- */
-function Intl_Segmenter_segment(value) {
-  // Step 1.
-  var segmenter = this;
-
-  // Step 2.
-  if (
-    !IsObject(segmenter) ||
-    (segmenter = intl_GuardToSegmenter(segmenter)) === null
-  ) {
-    return callFunction(
-      intl_CallSegmenterMethodIfWrapped,
-      this,
-      value,
-      "Intl_Segmenter_segment"
-    );
-  }
-
-  // Step 3.
-  var string = ToString(value);
-
-  // Step 4.
-  return intl_CreateSegmentsObject(segmenter, string);
-}
-
-/**
- * Intl.Segmenter.prototype.resolvedOptions ()
- *
- * Returns the resolved options for a Segmenter object.
- */
-function Intl_Segmenter_resolvedOptions() {
-  // Step 1.
-  var segmenter = this;
-
-  // Step 2.
-  if (
-    !IsObject(segmenter) ||
-    (segmenter = intl_GuardToSegmenter(segmenter)) === null
-  ) {
-    return callFunction(
-      intl_CallSegmenterMethodIfWrapped,
-      this,
-      "Intl_Segmenter_resolvedOptions"
-    );
-  }
-
-  var internals = getSegmenterInternals(segmenter);
-
-  // Steps 3-4.
-  var options = {
-    locale: internals.locale,
-    granularity: internals.granularity,
-  };
-
-  // Step 5.
-  return options;
-}
-
 /**
  * CreateSegmentDataObject ( segmenter, string, startIndex, endIndex )
  */
diff --git a/js/src/jit/CacheIR.cpp b/js/src/jit/CacheIR.cpp
index 12540d07672fb..24c7a361ca323 100644
--- a/js/src/jit/CacheIR.cpp
+++ b/js/src/jit/CacheIR.cpp
@@ -13185,7 +13185,6 @@ AttachDecision InlinableNativeIRGenerator::tryAttachStub() {
     case InlinableNative::IntlGuardToDurationFormat:
     case InlinableNative::IntlGuardToNumberFormat:
     case InlinableNative::IntlGuardToPluralRules:
-    case InlinableNative::IntlGuardToSegmenter:
     case InlinableNative::IntlGuardToSegments:
     case InlinableNative::IntlGuardToSegmentIterator:
       return tryAttachGuardToClass(native);
diff --git a/js/src/jit/InlinableNatives.cpp b/js/src/jit/InlinableNatives.cpp
index 483bf70259a6b..df8922bb85a3a 100644
--- a/js/src/jit/InlinableNatives.cpp
+++ b/js/src/jit/InlinableNatives.cpp
@@ -51,8 +51,6 @@ const JSClass* js::jit::InlinableNativeGuardToClass(InlinableNative native) {
       return &NumberFormatObject::class_;
     case InlinableNative::IntlGuardToPluralRules:
       return &PluralRulesObject::class_;
-    case InlinableNative::IntlGuardToSegmenter:
-      return &SegmenterObject::class_;
     case InlinableNative::IntlGuardToSegments:
       return &SegmentsObject::class_;
     case InlinableNative::IntlGuardToSegmentIterator:
@@ -62,7 +60,6 @@ const JSClass* js::jit::InlinableNativeGuardToClass(InlinableNative native) {
     case InlinableNative::IntlGuardToDateTimeFormat:
     case InlinableNative::IntlGuardToNumberFormat:
     case InlinableNative::IntlGuardToPluralRules:
-    case InlinableNative::IntlGuardToSegmenter:
     case InlinableNative::IntlGuardToSegments:
     case InlinableNative::IntlGuardToSegmentIterator:
       MOZ_CRASH("Intl API disabled");
@@ -172,7 +169,6 @@ bool js::jit::CanInlineNativeCrossRealm(InlinableNative native) {
     case InlinableNative::IntlGuardToDurationFormat:
     case InlinableNative::IntlGuardToNumberFormat:
     case InlinableNative::IntlGuardToPluralRules:
-    case InlinableNative::IntlGuardToSegmenter:
     case InlinableNative::IntlGuardToSegments:
     case InlinableNative::IntlGuardToSegmentIterator:
     case InlinableNative::IsRegExpObject:
diff --git a/js/src/jit/InlinableNatives.h b/js/src/jit/InlinableNatives.h
index ec1ea2ae45763..9087746c43006 100644
--- a/js/src/jit/InlinableNatives.h
+++ b/js/src/jit/InlinableNatives.h
@@ -100,7 +100,6 @@
   _(IntlGuardToDurationFormat)                     \
   _(IntlGuardToNumberFormat)                       \
   _(IntlGuardToPluralRules)                        \
-  _(IntlGuardToSegmenter)                          \
   _(IntlGuardToSegments)                           \
   _(IntlGuardToSegmentIterator)                    \
                                                    \
diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp
index 349b7599a4bfc..d3acf7ff43773 100644
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -1856,8 +1856,6 @@ static const JSFunctionSpec intrinsic_functions[] = {
           CallNonGenericSelfhostedMethod<Is<PluralRulesObject>>, 2, 0),
     JS_FN("intl_CallSegmentIteratorMethodIfWrapped",
           CallNonGenericSelfhostedMethod<Is<SegmentIteratorObject>>, 2, 0),
-    JS_FN("intl_CallSegmenterMethodIfWrapped",
-          CallNonGenericSelfhostedMethod<Is<SegmenterObject>>, 2, 0),
     JS_FN("intl_CallSegmentsMethodIfWrapped",
           CallNonGenericSelfhostedMethod<Is<SegmentsObject>>, 2, 0),
     JS_FN("intl_CompareStrings", intl_CompareStrings, 3, 0),
@@ -1889,9 +1887,6 @@ static const JSFunctionSpec intrinsic_functions[] = {
     JS_INLINABLE_FN("intl_GuardToSegmentIterator",
                     intrinsic_GuardToBuiltin<SegmentIteratorObject>, 1, 0,
                     IntlGuardToSegmentIterator),
-    JS_INLINABLE_FN("intl_GuardToSegmenter",
-                    intrinsic_GuardToBuiltin<SegmenterObject>, 1, 0,
-                    IntlGuardToSegmenter),
     JS_INLINABLE_FN("intl_GuardToSegments",
                     intrinsic_GuardToBuiltin<SegmentsObject>, 1, 0,
                     IntlGuardToSegments),

From 759d06c2bdf79a6893cf8193318a390391b20f50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bargull?= <andre.bargull@gmail.com>
Date: Thu, 29 Jan 2026 07:42:53 +0000
Subject: [PATCH 003/116] Bug 2010220 - Part 1: Move Intl.Collator to C++.
 r=spidermonkey-reviewers,dminor

Part 2 removes the self-hosted code.

Differential Revision: https://phabricator.services.mozilla.com/D279034
---
 js/src/builtin/intl/Collator.cpp | 660 +++++++++++++++++++++++++------
 js/src/builtin/intl/Collator.h   | 100 ++++-
 2 files changed, 624 insertions(+), 136 deletions(-)

diff --git a/js/src/builtin/intl/Collator.cpp b/js/src/builtin/intl/Collator.cpp
index bceff97853ff6..50fb32026fd6f 100644
--- a/js/src/builtin/intl/Collator.cpp
+++ b/js/src/builtin/intl/Collator.cpp
@@ -17,7 +17,9 @@
 #include "builtin/intl/FormatBuffer.h"
 #include "builtin/intl/LanguageTag.h"
 #include "builtin/intl/LocaleNegotiation.h"
+#include "builtin/intl/ParameterNegotiation.h"
 #include "builtin/intl/SharedIntlData.h"
+#include "builtin/intl/UsingEnum.h"
 #include "gc/GCContext.h"
 #include "js/PropertySpec.h"
 #include "js/StableStringChars.h"
@@ -36,9 +38,6 @@ using namespace js::intl;
 
 using JS::AutoStableStringChars;
 
-using js::intl::ReportInternalError;
-using js::intl::SharedIntlData;
-
 const JSClassOps CollatorObject::classOps_ = {
     nullptr,                   // addProperty
     nullptr,                   // delProperty
@@ -66,6 +65,10 @@ const JSClass& CollatorObject::protoClass_ = PlainObject::class_;
 static bool collator_supportedLocalesOf(JSContext* cx, unsigned argc,
                                         Value* vp);
 
+static bool collator_compare(JSContext* cx, unsigned argc, Value* vp);
+
+static bool collator_resolvedOptions(JSContext* cx, unsigned argc, Value* vp);
+
 static bool collator_toSource(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
   args.rval().setString(cx->names().Collator);
@@ -78,13 +81,13 @@ static const JSFunctionSpec collator_static_methods[] = {
 };
 
 static const JSFunctionSpec collator_methods[] = {
-    JS_SELF_HOSTED_FN("resolvedOptions", "Intl_Collator_resolvedOptions", 0, 0),
+    JS_FN("resolvedOptions", collator_resolvedOptions, 0, 0),
     JS_FN("toSource", collator_toSource, 0, 0),
     JS_FS_END,
 };
 
 static const JSPropertySpec collator_properties[] = {
-    JS_SELF_HOSTED_GET("compare", "$Intl_Collator_compare_get", 0),
+    JS_PSG("compare", collator_compare, 0),
     JS_STRING_SYM_PS(toStringTag, "Intl.Collator", JSPROP_READONLY),
     JS_PS_END,
 };
@@ -102,6 +105,173 @@ const ClassSpec CollatorObject::classSpec_ = {
     ClassSpec::DontDefineConstructor,
 };
 
+static constexpr std::string_view UsageToString(CollatorOptions::Usage usage) {
+#ifndef USING_ENUM
+  using enum CollatorOptions::Usage;
+#else
+  USING_ENUM(CollatorOptions::Usage, Sort, Search);
+#endif
+  switch (usage) {
+    case Sort:
+      return "sort";
+    case Search:
+      return "search";
+  }
+  MOZ_CRASH("invalid collator usage");
+}
+
+static constexpr std::string_view SensitivityToString(
+    CollatorOptions::Sensitivity sensitivity) {
+#ifndef USING_ENUM
+  using enum CollatorOptions::Sensitivity;
+#else
+  USING_ENUM(CollatorOptions::Sensitivity, Base, Accent, Case, Variant);
+#endif
+  switch (sensitivity) {
+    case Base:
+      return "base";
+    case Accent:
+      return "accent";
+    case Case:
+      return "case";
+    case Variant:
+      return "variant";
+  }
+  MOZ_CRASH("invalid collator sensitivity");
+}
+
+static constexpr std::string_view CaseFirstToString(
+    CollatorOptions::CaseFirst caseFirst) {
+#ifndef USING_ENUM
+  using enum CollatorOptions::CaseFirst;
+#else
+  USING_ENUM(CollatorOptions::CaseFirst, False, Lower, Upper);
+#endif
+  switch (caseFirst) {
+    case False:
+      return "false";
+    case Lower:
+      return "lower";
+    case Upper:
+      return "upper";
+  }
+  MOZ_CRASH("invalid collator case first");
+}
+
+/**
+ * 10.1.2 Intl.Collator([ locales [, options]])
+ *
+ * ES2017 Intl draft rev 94045d234762ad107a3d09bb6f7381a65f1a2f9b
+ */
+static bool InitializeCollator(JSContext* cx, Handle<CollatorObject*> collator,
+                               Handle<JS::Value> locales,
+                               Handle<JS::Value> optionsValue) {
+  // Steps 4-5.
+  Rooted<LocalesList> requestedLocales(cx, cx);
+  if (!CanonicalizeLocaleList(cx, locales, &requestedLocales)) {
+    return false;
+  }
+
+  Rooted<ArrayObject*> requestedLocalesArray(
+      cx, LocalesListToArray(cx, requestedLocales));
+  if (!requestedLocalesArray) {
+    return false;
+  }
+  collator->setRequestedLocales(requestedLocalesArray);
+
+  auto colOptions = cx->make_unique<CollatorOptions>();
+  if (!colOptions) {
+    return false;
+  }
+
+  if (!optionsValue.isUndefined()) {
+    // Step 6.
+    Rooted<JSObject*> options(cx, JS::ToObject(cx, optionsValue));
+    if (!options) {
+      return false;
+    }
+
+    // Steps 7-8.
+    static constexpr auto usages = MapOptions<UsageToString>(
+        CollatorOptions::Usage::Sort, CollatorOptions::Usage::Search);
+    if (!GetStringOption(cx, options, cx->names().usage, usages,
+                         CollatorOptions::Usage::Sort, &colOptions->usage)) {
+      return false;
+    }
+
+    // Step 9-10. (Performed in ResolveLocale)
+
+    // Step 11. (Inlined ResolveOptions)
+
+    // ResolveOptions, steps 1-3. (Already performed above)
+
+    // ResolveOptions, step 4.
+    LocaleMatcher matcher;
+    if (!GetLocaleMatcherOption(cx, options, &matcher)) {
+      return false;
+    }
+
+    // ResolveOptions, step 5.
+    //
+    // This implementation only supports the "lookup" locale matcher, therefore
+    // the "localeMatcher" option doesn't need to be stored.
+
+    // ResolveOptions, step 6.
+    Rooted<JSLinearString*> collation(cx);
+    if (!GetUnicodeExtensionOption(cx, options, UnicodeExtensionKey::Collation,
+                                   &collation)) {
+      return false;
+    }
+    if (collation) {
+      collator->setCollation(collation);
+    }
+
+    // ResolveOptions, step 6.
+    if (!GetBooleanOption(cx, options, cx->names().numeric,
+                          &colOptions->numeric)) {
+      return false;
+    }
+
+    // ResolveOptions, step 6.
+    static constexpr auto caseFirsts = MapOptions<CaseFirstToString>(
+        CollatorOptions::CaseFirst::Upper, CollatorOptions::CaseFirst::Lower,
+        CollatorOptions::CaseFirst::False);
+    if (!GetStringOption(cx, options, cx->names().caseFirst, caseFirsts,
+                         &colOptions->caseFirst)) {
+      return false;
+    }
+
+    // ResolveOptions, step 7. (Not applicable)
+
+    // ResolveOptions, step 8. (Performed in ResolveLocale)
+
+    // ResolveOptions, step 9. (Return)
+
+    // Steps 12-19 and 21. (Performed in ResolveLocale)
+
+    // Step 20.
+    static constexpr auto sensitivities =
+        MapOptions<SensitivityToString>(CollatorOptions::Sensitivity::Base,
+                                        CollatorOptions::Sensitivity::Accent,
+                                        CollatorOptions::Sensitivity::Case,
+                                        CollatorOptions::Sensitivity::Variant);
+    if (!GetStringOption(cx, options, cx->names().sensitivity, sensitivities,
+                         &colOptions->sensitivity)) {
+      return false;
+    }
+
+    // Step 22.
+    if (!GetBooleanOption(cx, options, cx->names().ignorePunctuation,
+                          &colOptions->ignorePunctuation)) {
+      return false;
+    }
+  }
+  collator->setOptions(colOptions.release());
+  AddCellMemory(collator, sizeof(CollatorOptions), js::MemoryUse::IntlOptions);
+
+  return true;
+}
+
 /**
  * 10.1.2 Intl.Collator([ locales [, options]])
  *
@@ -113,8 +283,8 @@ static bool Collator(JSContext* cx, unsigned argc, Value* vp) {
 
   // Step 1 (Handled by OrdinaryCreateFromConstructor fallback code).
 
-  // Steps 2-5 (Inlined 9.1.14, OrdinaryCreateFromConstructor).
-  RootedObject proto(cx);
+  // Steps 2-3 (Inlined 9.1.14, OrdinaryCreateFromConstructor).
+  Rooted<JSObject*> proto(cx);
   if (!GetPrototypeFromBuiltinConstructor(cx, args, JSProto_Collator, &proto)) {
     return false;
   }
@@ -125,15 +295,12 @@ static bool Collator(JSContext* cx, unsigned argc, Value* vp) {
     return false;
   }
 
-  HandleValue locales = args.get(0);
-  HandleValue options = args.get(1);
-
-  // Step 6.
-  if (!intl::InitializeObject(cx, collator, cx->names().InitializeCollator,
-                              locales, options)) {
+  // Steps 4-22.
+  if (!InitializeCollator(cx, collator, args.get(0), args.get(1))) {
     return false;
   }
 
+  // Step 23.
   args.rval().setObject(*collator);
   return true;
 }
@@ -146,11 +313,9 @@ CollatorObject* js::intl::CreateCollator(JSContext* cx, Handle<Value> locales,
     return nullptr;
   }
 
-  if (!InitializeObject(cx, collator, cx->names().InitializeCollator, locales,
-                        options)) {
+  if (!InitializeCollator(cx, collator, locales, options)) {
     return nullptr;
   }
-
   return collator;
 }
 
@@ -175,147 +340,238 @@ CollatorObject* js::intl::GetOrCreateCollator(JSContext* cx,
 }
 
 void js::CollatorObject::finalize(JS::GCContext* gcx, JSObject* obj) {
-  if (mozilla::intl::Collator* coll = obj->as<CollatorObject>().getCollator()) {
-    intl::RemoveICUCellMemory(gcx, obj, CollatorObject::EstimatedMemoryUse);
+  auto* collator = &obj->as<CollatorObject>();
+
+  if (auto* options = collator->getOptions()) {
+    gcx->delete_(obj, options, MemoryUse::IntlOptions);
+  }
+
+  if (auto* coll = collator->getCollator()) {
+    RemoveICUCellMemory(gcx, obj, CollatorObject::EstimatedMemoryUse);
     delete coll;
   }
 }
 
 /**
- * Returns a new mozilla::intl::Collator with the locale and collation options
- * of the given Collator.
+ * Resolve the actual locale to finish initialization of the Collator.
  */
-static mozilla::intl::Collator* NewIntlCollator(
-    JSContext* cx, Handle<CollatorObject*> collator) {
-  RootedValue value(cx);
-  RootedObject internals(cx, intl::GetInternalsObject(cx, collator));
-  if (!internals) {
-    return nullptr;
+static bool ResolveLocale(JSContext* cx, Handle<CollatorObject*> collator) {
+  // Return if the locale was already resolved.
+  if (collator->isLocaleResolved()) {
+    return true;
   }
+  auto* colOptions = collator->getOptions();
 
-  using mozilla::intl::Collator;
+  Rooted<ArrayObject*> requestedLocales(
+      cx, &collator->getRequestedLocales()->as<ArrayObject>());
 
-  Collator::Options options{};
+  // %Intl.Collator%.[[RelevantExtensionKeys]] is « "co", "kf", "kn" ».
+  mozilla::EnumSet<UnicodeExtensionKey> relevantExtensionKeys{
+      UnicodeExtensionKey::Collation,
+      UnicodeExtensionKey::CollationCaseFirst,
+      UnicodeExtensionKey::CollationNumeric,
+  };
 
-  if (!GetProperty(cx, internals, internals, cx->names().usage, &value)) {
-    return nullptr;
+  // Initialize locale options from constructor arguments.
+  Rooted<LocaleOptions> localeOptions(cx);
+  if (auto* co = collator->getCollation()) {
+    localeOptions.setUnicodeExtension(UnicodeExtensionKey::Collation, co);
   }
+  if (auto caseFirst = colOptions->caseFirst) {
+#ifndef USING_ENUM
+    using enum CollatorOptions::CaseFirst;
+#else
+    USING_ENUM(CollatorOptions::CaseFirst, False, Lower, Upper);
+#endif
 
-  enum class Usage { Search, Sort };
-
-  Usage usage;
-  {
-    JSLinearString* str = value.toString()->ensureLinear(cx);
-    if (!str) {
-      return nullptr;
-    }
-
-    if (StringEqualsLiteral(str, "search")) {
-      usage = Usage::Search;
-    } else {
-      MOZ_ASSERT(StringEqualsLiteral(str, "sort"));
-      usage = Usage::Sort;
+    JSLinearString* kf;
+    switch (*caseFirst) {
+      case Upper:
+        kf = cx->names().upper;
+        break;
+      case Lower:
+        kf = cx->names().lower;
+        break;
+      case False:
+        kf = cx->names().false_;
+        break;
     }
+    localeOptions.setUnicodeExtension(UnicodeExtensionKey::CollationCaseFirst,
+                                      kf);
+  }
+  if (auto numeric = colOptions->numeric) {
+    JSLinearString* kn = *numeric ? cx->names().true_ : cx->names().false_;
+    localeOptions.setUnicodeExtension(UnicodeExtensionKey::CollationNumeric,
+                                      kn);
   }
 
-  JS::RootedVector<intl::UnicodeExtensionKeyword> keywords(cx);
-
-  // ICU expects collation as Unicode locale extensions on locale.
-  if (usage == Usage::Search) {
-    if (!keywords.emplaceBack("co", cx->names().search)) {
-      return nullptr;
-    }
+  // Use the default locale data for "sort" usage.
+  // Use the collator search locale data for "search" usage.
+  LocaleData localeData;
+  if (colOptions->usage == CollatorOptions::Usage::Sort) {
+    localeData = LocaleData::Default;
+  } else {
+    localeData = LocaleData::CollatorSearch;
+  }
 
-    // Search collations can't select a different collation, so the collation
-    // property is guaranteed to be "default".
-#ifdef DEBUG
-    if (!GetProperty(cx, internals, internals, cx->names().collation, &value)) {
-      return nullptr;
-    }
+  // Resolve the actual locale.
+  Rooted<ResolvedLocale> resolved(cx);
+  if (!ResolveLocale(cx, AvailableLocaleKind::Collator, requestedLocales,
+                     localeOptions, relevantExtensionKeys, localeData,
+                     &resolved)) {
+    return false;
+  }
 
-    JSLinearString* collation = value.toString()->ensureLinear(cx);
-    if (!collation) {
-      return nullptr;
-    }
+  if (colOptions->sensitivity.isNothing()) {
+    // In theory the default sensitivity for the "search" collator is locale
+    // dependent; in reality the CLDR/ICU default strength is always tertiary.
+    // Therefore use "variant" as the default value for both collation modes.
+    colOptions->sensitivity =
+        mozilla::Some(CollatorOptions::Sensitivity::Variant);
+  }
 
-    MOZ_ASSERT(StringEqualsLiteral(collation, "default"));
-#endif
-  } else {
-    if (!GetProperty(cx, internals, internals, cx->names().collation, &value)) {
-      return nullptr;
+  if (colOptions->ignorePunctuation.isNothing()) {
+    // If |locale| is the default locale (e.g. da-DK), but only supported
+    // through a fallback (da), we need to get the actual data locale first.
+    Rooted<JSLinearString*> dataLocale(cx);
+    if (!BestAvailableLocale(cx, AvailableLocaleKind::Collator,
+                             resolved.dataLocale(), nullptr, &dataLocale)) {
+      return false;
     }
+    MOZ_ASSERT(dataLocale);
 
-    JSLinearString* collation = value.toString()->ensureLinear(cx);
-    if (!collation) {
-      return nullptr;
-    }
+    auto& sharedIntlData = cx->runtime()->sharedIntlData.ref();
 
-    // Set collation as a Unicode locale extension when it was specified.
-    if (!StringEqualsLiteral(collation, "default")) {
-      if (!keywords.emplaceBack("co", collation)) {
-        return nullptr;
-      }
+    bool ignorePunctuation;
+    if (!sharedIntlData.isIgnorePunctuation(cx, dataLocale,
+                                            &ignorePunctuation)) {
+      return false;
     }
+    colOptions->ignorePunctuation = mozilla::Some(ignorePunctuation);
   }
 
-  UniqueChars locale = intl::FormatLocale(cx, internals, keywords);
+  // Finish initialization by setting the actual locale and collation.
+  auto* locale = resolved.toLocale(cx);
   if (!locale) {
-    return nullptr;
+    return false;
   }
+  collator->setLocale(locale);
 
-  if (!GetProperty(cx, internals, internals, cx->names().sensitivity, &value)) {
-    return nullptr;
+  if (auto co = resolved.extension(UnicodeExtensionKey::Collation)) {
+    collator->setCollation(co);
+  } else {
+    collator->setCollation(cx->names().default_);
   }
 
-  {
-    JSLinearString* sensitivity = value.toString()->ensureLinear(cx);
-    if (!sensitivity) {
-      return nullptr;
-    }
-    if (StringEqualsLiteral(sensitivity, "base")) {
-      options.sensitivity = Collator::Sensitivity::Base;
-    } else if (StringEqualsLiteral(sensitivity, "accent")) {
-      options.sensitivity = Collator::Sensitivity::Accent;
-    } else if (StringEqualsLiteral(sensitivity, "case")) {
-      options.sensitivity = Collator::Sensitivity::Case;
-    } else {
-      MOZ_ASSERT(StringEqualsLiteral(sensitivity, "variant"));
-      options.sensitivity = Collator::Sensitivity::Variant;
-    }
-  }
+  auto kf = resolved.extension(UnicodeExtensionKey::CollationCaseFirst);
+  MOZ_ASSERT(kf, "resolved case first is non-null");
 
-  if (!GetProperty(cx, internals, internals, cx->names().ignorePunctuation,
-                   &value)) {
-    return nullptr;
+  if (StringEqualsLiteral(kf, "upper")) {
+    colOptions->caseFirst = mozilla::Some(CollatorOptions::CaseFirst::Upper);
+  } else if (StringEqualsLiteral(kf, "lower")) {
+    colOptions->caseFirst = mozilla::Some(CollatorOptions::CaseFirst::Lower);
+  } else {
+    MOZ_ASSERT(StringEqualsLiteral(kf, "false"));
+    colOptions->caseFirst = mozilla::Some(CollatorOptions::CaseFirst::False);
   }
-  options.ignorePunctuation = value.toBoolean();
 
-  if (!GetProperty(cx, internals, internals, cx->names().numeric, &value)) {
-    return nullptr;
-  }
-  if (!value.isUndefined()) {
-    options.numeric = value.toBoolean();
+  auto kn = resolved.extension(UnicodeExtensionKey::CollationNumeric);
+  MOZ_ASSERT(kn, "resolved numeric is non-null");
+
+  if (StringEqualsLiteral(kn, "true")) {
+    colOptions->numeric = mozilla::Some(true);
+  } else {
+    MOZ_ASSERT(StringEqualsLiteral(kn, "false"));
+    colOptions->numeric = mozilla::Some(false);
   }
 
-  if (!GetProperty(cx, internals, internals, cx->names().caseFirst, &value)) {
+  MOZ_ASSERT(collator->isLocaleResolved(), "locale successfully resolved");
+  return true;
+}
+
+static auto ToCollatorSensitivity(CollatorOptions::Sensitivity sensitivity) {
+#ifndef USING_ENUM
+  using enum mozilla::intl::Collator::Sensitivity;
+#else
+  USING_ENUM(mozilla::intl::Collator::Sensitivity, Base, Accent, Case, Variant);
+#endif
+  switch (sensitivity) {
+    case CollatorOptions::Sensitivity::Base:
+      return Base;
+    case CollatorOptions::Sensitivity::Accent:
+      return Accent;
+    case CollatorOptions::Sensitivity::Case:
+      return Case;
+    case CollatorOptions::Sensitivity::Variant:
+      return Variant;
+  }
+  MOZ_CRASH("invalid collator sensitivity");
+}
+
+static auto ToCollatorCaseFirst(CollatorOptions::CaseFirst caseFirst) {
+#ifndef USING_ENUM
+  using enum mozilla::intl::Collator::CaseFirst;
+#else
+  USING_ENUM(mozilla::intl::Collator::CaseFirst, False, Lower, Upper);
+#endif
+  switch (caseFirst) {
+    case CollatorOptions::CaseFirst::Upper:
+      return Upper;
+    case CollatorOptions::CaseFirst::Lower:
+      return Lower;
+    case CollatorOptions::CaseFirst::False:
+      return False;
+  }
+  MOZ_CRASH("invalid collator case first");
+}
+
+/**
+ * Returns a new mozilla::intl::Collator with the locale and collation options
+ * of the given Collator.
+ */
+static mozilla::intl::Collator* NewIntlCollator(
+    JSContext* cx, Handle<CollatorObject*> collator) {
+  if (!ResolveLocale(cx, collator)) {
     return nullptr;
   }
-  if (!value.isUndefined()) {
-    JSLinearString* caseFirst = value.toString()->ensureLinear(cx);
-    if (!caseFirst) {
+  auto colOptions = *collator->getOptions();
+
+  JS::RootedVector<UnicodeExtensionKeyword> keywords(cx);
+
+  // ICU expects collation as Unicode locale extensions on locale.
+  if (colOptions.usage == CollatorOptions::Usage::Search) {
+    if (!keywords.emplaceBack("co", cx->names().search)) {
       return nullptr;
     }
-    if (StringEqualsLiteral(caseFirst, "upper")) {
-      options.caseFirst = Collator::CaseFirst::Upper;
-    } else if (StringEqualsLiteral(caseFirst, "lower")) {
-      options.caseFirst = Collator::CaseFirst::Lower;
-    } else {
-      MOZ_ASSERT(StringEqualsLiteral(caseFirst, "false"));
-      options.caseFirst = Collator::CaseFirst::False;
+
+    // Search collations can't select a different collation, so the collation
+    // property is guaranteed to be "default".
+    MOZ_ASSERT(StringEqualsLiteral(collator->getCollation(), "default"));
+  } else {
+    auto* collation = collator->getCollation();
+
+    // Set collation as a Unicode locale extension when it was specified.
+    if (!StringEqualsLiteral(collation, "default")) {
+      if (!keywords.emplaceBack("co", collation)) {
+        return nullptr;
+      }
     }
   }
 
-  auto collResult = Collator::TryCreate(locale.get());
+  Rooted<JSLinearString*> localeStr(cx, collator->getLocale());
+  auto locale = FormatLocale(cx, localeStr, keywords);
+  if (!locale) {
+    return nullptr;
+  }
+
+  mozilla::intl::Collator::Options options = {
+      .sensitivity = ToCollatorSensitivity(*colOptions.sensitivity),
+      .caseFirst = ToCollatorCaseFirst(*colOptions.caseFirst),
+      .ignorePunctuation = *colOptions.ignorePunctuation,
+      .numeric = *colOptions.numeric,
+  };
+
+  auto collResult = mozilla::intl::Collator::TryCreate(locale.get());
   if (collResult.isErr()) {
     ReportInternalError(cx, collResult.unwrapErr());
     return nullptr;
@@ -327,31 +583,29 @@ static mozilla::intl::Collator* NewIntlCollator(
     ReportInternalError(cx, optResult.unwrapErr());
     return nullptr;
   }
-
   return coll.release();
 }
 
 static mozilla::intl::Collator* GetOrCreateCollator(
     JSContext* cx, Handle<CollatorObject*> collator) {
   // Obtain a cached mozilla::intl::Collator object.
-  mozilla::intl::Collator* coll = collator->getCollator();
-  if (coll) {
+  if (auto* coll = collator->getCollator()) {
     return coll;
   }
 
-  coll = NewIntlCollator(cx, collator);
+  auto* coll = NewIntlCollator(cx, collator);
   if (!coll) {
     return nullptr;
   }
   collator->setCollator(coll);
 
-  intl::AddICUCellMemory(collator, CollatorObject::EstimatedMemoryUse);
+  AddICUCellMemory(collator, CollatorObject::EstimatedMemoryUse);
   return coll;
 }
 
-static bool intl_CompareStrings(JSContext* cx, mozilla::intl::Collator* coll,
-                                JSString* str1, JSString* str2,
-                                MutableHandleValue result) {
+static bool CompareStrings(JSContext* cx, mozilla::intl::Collator* coll,
+                           JSString* str1, JSString* str2,
+                           MutableHandleValue result) {
   MOZ_ASSERT(str1);
   MOZ_ASSERT(str2);
 
@@ -395,7 +649,7 @@ bool js::intl_CompareStrings(JSContext* cx, unsigned argc, Value* vp) {
   // Use the UCollator to actually compare the strings.
   JSString* str1 = args[1].toString();
   JSString* str2 = args[2].toString();
-  return intl_CompareStrings(cx, coll, str1, str2, args.rval());
+  return CompareStrings(cx, coll, str1, str2, args.rval());
 }
 
 bool js::intl::CompareStrings(JSContext* cx, Handle<CollatorObject*> collator,
@@ -405,7 +659,7 @@ bool js::intl::CompareStrings(JSContext* cx, Handle<CollatorObject*> collator,
   if (!coll) {
     return false;
   }
-  return intl_CompareStrings(cx, coll, str1, str2, result);
+  return CompareStrings(cx, coll, str1, str2, result);
 }
 
 bool js::intl_isUpperCaseFirst(JSContext* cx, unsigned argc, Value* vp) {
@@ -450,6 +704,160 @@ bool js::intl_isIgnorePunctuation(JSContext* cx, unsigned argc, Value* vp) {
   return true;
 }
 
+static bool IsCollator(Handle<JS::Value> v) {
+  return v.isObject() && v.toObject().is<CollatorObject>();
+}
+
+static constexpr uint32_t CollatorCompareFunction_Collator = 0;
+
+/**
+ * Collator Compare Functions
+ */
+static bool CollatorCompareFunction(JSContext* cx, unsigned argc, Value* vp) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+
+  // Steps 1-2.
+  auto* compare = &args.callee().as<JSFunction>();
+  auto collValue = compare->getExtendedSlot(CollatorCompareFunction_Collator);
+  Rooted<CollatorObject*> collator(cx,
+                                   &collValue.toObject().as<CollatorObject>());
+
+  // Step 3.
+  Rooted<JSString*> x(cx, JS::ToString(cx, args.get(0)));
+  if (!x) {
+    return false;
+  }
+
+  // Step 4.
+  Rooted<JSString*> y(cx, JS::ToString(cx, args.get(1)));
+  if (!y) {
+    return false;
+  }
+
+  // Step 5.
+  return CompareStrings(cx, collator, x, y, args.rval());
+}
+
+/**
+ * get Intl.Collator.prototype.compare
+ */
+static bool collator_compare(JSContext* cx, const CallArgs& args) {
+  Rooted<CollatorObject*> collator(
+      cx, &args.thisv().toObject().as<CollatorObject>());
+
+  // Step 3.
+  auto* boundCompare = collator->getBoundCompare();
+  if (!boundCompare) {
+    Handle<PropertyName*> funName = cx->names().empty_;
+    auto* fn =
+        NewNativeFunction(cx, CollatorCompareFunction, 2, funName,
+                          gc::AllocKind::FUNCTION_EXTENDED, GenericObject);
+    if (!fn) {
+      return false;
+    }
+    fn->initExtendedSlot(CollatorCompareFunction_Collator,
+                         ObjectValue(*collator));
+
+    collator->setBoundCompare(fn);
+    boundCompare = fn;
+  }
+
+  // Step 4.
+  args.rval().setObject(*boundCompare);
+  return true;
+}
+
+/**
+ * get Intl.Collator.prototype.compare
+ */
+static bool collator_compare(JSContext* cx, unsigned argc, Value* vp) {
+  // Steps 1-2.
+  CallArgs args = CallArgsFromVp(argc, vp);
+  return CallNonGenericMethod<IsCollator, collator_compare>(cx, args);
+}
+
+/**
+ * Intl.Collator.prototype.resolvedOptions ( )
+ */
+static bool collator_resolvedOptions(JSContext* cx, const CallArgs& args) {
+  Rooted<CollatorObject*> collator(
+      cx, &args.thisv().toObject().as<CollatorObject>());
+
+  if (!ResolveLocale(cx, collator)) {
+    return false;
+  }
+  auto colOptions = *collator->getOptions();
+
+  // Step 3.
+  Rooted<IdValueVector> options(cx, cx);
+
+  // Step 4.
+  if (!options.emplaceBack(NameToId(cx->names().locale),
+                           StringValue(collator->getLocale()))) {
+    return false;
+  }
+
+  auto* usage = NewStringCopy<CanGC>(cx, UsageToString(colOptions.usage));
+  if (!usage) {
+    return false;
+  }
+  if (!options.emplaceBack(NameToId(cx->names().usage), StringValue(usage))) {
+    return false;
+  }
+
+  auto* sensitivity =
+      NewStringCopy<CanGC>(cx, SensitivityToString(*colOptions.sensitivity));
+  if (!sensitivity) {
+    return false;
+  }
+  if (!options.emplaceBack(NameToId(cx->names().sensitivity),
+                           StringValue(sensitivity))) {
+    return false;
+  }
+
+  if (!options.emplaceBack(NameToId(cx->names().ignorePunctuation),
+                           BooleanValue(*colOptions.ignorePunctuation))) {
+    return false;
+  }
+
+  if (!options.emplaceBack(NameToId(cx->names().collation),
+                           StringValue(collator->getCollation()))) {
+    return false;
+  }
+
+  if (!options.emplaceBack(NameToId(cx->names().numeric),
+                           BooleanValue(*colOptions.numeric))) {
+    return false;
+  }
+
+  auto* caseFirst =
+      NewStringCopy<CanGC>(cx, CaseFirstToString(*colOptions.caseFirst));
+  if (!caseFirst) {
+    return false;
+  }
+  if (!options.emplaceBack(NameToId(cx->names().caseFirst),
+                           StringValue(caseFirst))) {
+    return false;
+  }
+
+  // Step 5.
+  auto* result = NewPlainObjectWithUniqueNames(cx, options);
+  if (!result) {
+    return false;
+  }
+  args.rval().setObject(*result);
+  return true;
+}
+
+/**
+ * Intl.Collator.prototype.resolvedOptions ( )
+ */
+static bool collator_resolvedOptions(JSContext* cx, unsigned argc, Value* vp) {
+  // Steps 1-2.
+  CallArgs args = CallArgsFromVp(argc, vp);
+  return CallNonGenericMethod<IsCollator, collator_resolvedOptions>(cx, args);
+}
+
 /**
  * Intl.Collator.supportedLocalesOf ( locales [ , options ] )
  */
diff --git a/js/src/builtin/intl/Collator.h b/js/src/builtin/intl/Collator.h
index 146bf2fe74ea3..843dd69def79c 100644
--- a/js/src/builtin/intl/Collator.h
+++ b/js/src/builtin/intl/Collator.h
@@ -7,11 +7,15 @@
 #ifndef builtin_intl_Collator_h
 #define builtin_intl_Collator_h
 
+#include "mozilla/Maybe.h"
+
+#include <stddef.h>
 #include <stdint.h>
 
-#include "builtin/SelfHostingDefines.h"
 #include "js/Class.h"
+#include "js/Value.h"
 #include "vm/NativeObject.h"
+#include "vm/StringType.h"
 
 namespace mozilla::intl {
 class Collator;
@@ -19,24 +23,88 @@ class Collator;
 
 namespace js {
 
-/******************** Collator ********************/
+namespace intl {
+struct CollatorOptions {
+  enum class Usage : int8_t { Sort, Search };
+  Usage usage = Usage::Sort;
+
+  enum class Sensitivity : int8_t { Base, Accent, Case, Variant };
+  mozilla::Maybe<Sensitivity> sensitivity{};
+
+  mozilla::Maybe<bool> ignorePunctuation{};
+
+  mozilla::Maybe<bool> numeric{};
+
+  enum class CaseFirst : int8_t { Upper, Lower, False };
+  mozilla::Maybe<CaseFirst> caseFirst{};
+};
+}  // namespace intl
 
 class CollatorObject : public NativeObject {
  public:
   static const JSClass class_;
   static const JSClass& protoClass_;
 
-  static constexpr uint32_t INTERNALS_SLOT = 0;
-  static constexpr uint32_t INTL_COLLATOR_SLOT = 1;
-  static constexpr uint32_t SLOT_COUNT = 2;
-
-  static_assert(INTERNALS_SLOT == INTL_INTERNALS_OBJECT_SLOT,
-                "INTERNALS_SLOT must match self-hosting define for internals "
-                "object slot");
+  static constexpr uint32_t LOCALE_SLOT = 0;
+  static constexpr uint32_t COLLATION_SLOT = 1;
+  static constexpr uint32_t OPTIONS_SLOT = 2;
+  static constexpr uint32_t INTL_COLLATOR_SLOT = 3;
+  static constexpr uint32_t BOUND_COMPARE_SLOT = 4;
+  static constexpr uint32_t SLOT_COUNT = 5;
 
   // Estimated memory use for UCollator (see IcuMemoryUsage).
   static constexpr size_t EstimatedMemoryUse = 1128;
 
+  bool isLocaleResolved() const { return getFixedSlot(LOCALE_SLOT).isString(); }
+
+  JSObject* getRequestedLocales() const {
+    const auto& slot = getFixedSlot(LOCALE_SLOT);
+    if (slot.isUndefined()) {
+      return nullptr;
+    }
+    return &slot.toObject();
+  }
+
+  void setRequestedLocales(JSObject* requestedLocales) {
+    setFixedSlot(LOCALE_SLOT, JS::ObjectValue(*requestedLocales));
+  }
+
+  JSLinearString* getLocale() const {
+    const auto& slot = getFixedSlot(LOCALE_SLOT);
+    if (slot.isUndefined()) {
+      return nullptr;
+    }
+    return &slot.toString()->asLinear();
+  }
+
+  void setLocale(JSLinearString* locale) {
+    setFixedSlot(LOCALE_SLOT, JS::StringValue(locale));
+  }
+
+  JSLinearString* getCollation() const {
+    const auto& slot = getFixedSlot(COLLATION_SLOT);
+    if (slot.isUndefined()) {
+      return nullptr;
+    }
+    return &slot.toString()->asLinear();
+  }
+
+  void setCollation(JSLinearString* collation) {
+    setFixedSlot(COLLATION_SLOT, JS::StringValue(collation));
+  }
+
+  intl::CollatorOptions* getOptions() const {
+    const auto& slot = getFixedSlot(OPTIONS_SLOT);
+    if (slot.isUndefined()) {
+      return nullptr;
+    }
+    return static_cast<intl::CollatorOptions*>(slot.toPrivate());
+  }
+
+  void setOptions(intl::CollatorOptions* options) {
+    setFixedSlot(OPTIONS_SLOT, JS::PrivateValue(options));
+  }
+
   mozilla::intl::Collator* getCollator() const {
     const auto& slot = getFixedSlot(INTL_COLLATOR_SLOT);
     if (slot.isUndefined()) {
@@ -46,7 +114,19 @@ class CollatorObject : public NativeObject {
   }
 
   void setCollator(mozilla::intl::Collator* collator) {
-    setFixedSlot(INTL_COLLATOR_SLOT, PrivateValue(collator));
+    setFixedSlot(INTL_COLLATOR_SLOT, JS::PrivateValue(collator));
+  }
+
+  JSObject* getBoundCompare() const {
+    const auto& slot = getFixedSlot(BOUND_COMPARE_SLOT);
+    if (slot.isUndefined()) {
+      return nullptr;
+    }
+    return &slot.toObject();
+  }
+
+  void setBoundCompare(JSObject* boundCompare) {
+    setFixedSlot(BOUND_COMPARE_SLOT, JS::ObjectValue(*boundCompare));
   }
 
  private:

From c87a5afc1234bc8a51d5e1d474b5ce3be845a39d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bargull?= <andre.bargull@gmail.com>
Date: Thu, 29 Jan 2026 07:42:54 +0000
Subject: [PATCH 004/116] Bug 2010220 - Part 2: Remove no longer used
 self-hosting code for Intl.Collator. r=spidermonkey-reviewers,dminor

Differential Revision: https://phabricator.services.mozilla.com/D279035
---
 js/src/builtin/intl/Collator.cpp       |  92 +------
 js/src/builtin/intl/Collator.h         |  35 +--
 js/src/builtin/intl/Collator.js        | 353 -------------------------
 js/src/builtin/intl/CommonFunctions.js |  14 +-
 js/src/builtin/moz.build               |   1 -
 js/src/jit/CacheIR.cpp                 |   1 -
 js/src/jit/InlinableNatives.cpp        |   5 -
 js/src/jit/InlinableNatives.h          |   1 -
 js/src/vm/SelfHosting.cpp              |   9 -
 9 files changed, 20 insertions(+), 491 deletions(-)
 delete mode 100644 js/src/builtin/intl/Collator.js

diff --git a/js/src/builtin/intl/Collator.cpp b/js/src/builtin/intl/Collator.cpp
index 50fb32026fd6f..0fd1294a4e700 100644
--- a/js/src/builtin/intl/Collator.cpp
+++ b/js/src/builtin/intl/Collator.cpp
@@ -36,8 +36,6 @@
 using namespace js;
 using namespace js::intl;
 
-using JS::AutoStableStringChars;
-
 const JSClassOps CollatorObject::classOps_ = {
     nullptr,                   // addProperty
     nullptr,                   // delProperty
@@ -603,9 +601,9 @@ static mozilla::intl::Collator* GetOrCreateCollator(
   return coll;
 }
 
-static bool CompareStrings(JSContext* cx, mozilla::intl::Collator* coll,
-                           JSString* str1, JSString* str2,
-                           MutableHandleValue result) {
+bool js::intl::CompareStrings(JSContext* cx, Handle<CollatorObject*> collator,
+                              Handle<JSString*> str1, Handle<JSString*> str2,
+                              MutableHandle<Value> result) {
   MOZ_ASSERT(str1);
   MOZ_ASSERT(str2);
 
@@ -614,93 +612,25 @@ static bool CompareStrings(JSContext* cx, mozilla::intl::Collator* coll,
     return true;
   }
 
-  AutoStableStringChars stableChars1(cx);
-  if (!stableChars1.initTwoByte(cx, str1)) {
-    return false;
-  }
-
-  AutoStableStringChars stableChars2(cx);
-  if (!stableChars2.initTwoByte(cx, str2)) {
-    return false;
-  }
-
-  mozilla::Range<const char16_t> chars1 = stableChars1.twoByteRange();
-  mozilla::Range<const char16_t> chars2 = stableChars2.twoByteRange();
-
-  result.setInt32(coll->CompareStrings(chars1, chars2));
-  return true;
-}
-
-bool js::intl_CompareStrings(JSContext* cx, unsigned argc, Value* vp) {
-  CallArgs args = CallArgsFromVp(argc, vp);
-  MOZ_ASSERT(args.length() == 3);
-  MOZ_ASSERT(args[0].isObject());
-  MOZ_ASSERT(args[1].isString());
-  MOZ_ASSERT(args[2].isString());
-
-  Rooted<CollatorObject*> collator(cx,
-                                   &args[0].toObject().as<CollatorObject>());
-
-  mozilla::intl::Collator* coll = GetOrCreateCollator(cx, collator);
-  if (!coll) {
-    return false;
-  }
-
-  // Use the UCollator to actually compare the strings.
-  JSString* str1 = args[1].toString();
-  JSString* str2 = args[2].toString();
-  return CompareStrings(cx, coll, str1, str2, args.rval());
-}
-
-bool js::intl::CompareStrings(JSContext* cx, Handle<CollatorObject*> collator,
-                              Handle<JSString*> str1, Handle<JSString*> str2,
-                              MutableHandle<Value> result) {
-  mozilla::intl::Collator* coll = GetOrCreateCollator(cx, collator);
+  auto* coll = GetOrCreateCollator(cx, collator);
   if (!coll) {
     return false;
   }
-  return CompareStrings(cx, coll, str1, str2, result);
-}
-
-bool js::intl_isUpperCaseFirst(JSContext* cx, unsigned argc, Value* vp) {
-  CallArgs args = CallArgsFromVp(argc, vp);
-  MOZ_ASSERT(args.length() == 1);
-  MOZ_ASSERT(args[0].isString());
-
-  SharedIntlData& sharedIntlData = cx->runtime()->sharedIntlData.ref();
-
-  Rooted<JSLinearString*> locale(cx, args[0].toString()->ensureLinear(cx));
-  if (!locale) {
-    return false;
-  }
 
-  bool isUpperFirst;
-  if (!sharedIntlData.isUpperCaseFirst(cx, locale, &isUpperFirst)) {
+  JS::AutoStableStringChars stableChars1(cx);
+  if (!stableChars1.initTwoByte(cx, str1)) {
     return false;
   }
 
-  args.rval().setBoolean(isUpperFirst);
-  return true;
-}
-
-bool js::intl_isIgnorePunctuation(JSContext* cx, unsigned argc, Value* vp) {
-  CallArgs args = CallArgsFromVp(argc, vp);
-  MOZ_ASSERT(args.length() == 1);
-  MOZ_ASSERT(args[0].isString());
-
-  SharedIntlData& sharedIntlData = cx->runtime()->sharedIntlData.ref();
-
-  Rooted<JSLinearString*> locale(cx, args[0].toString()->ensureLinear(cx));
-  if (!locale) {
+  JS::AutoStableStringChars stableChars2(cx);
+  if (!stableChars2.initTwoByte(cx, str2)) {
     return false;
   }
 
-  bool isIgnorePunctuation;
-  if (!sharedIntlData.isIgnorePunctuation(cx, locale, &isIgnorePunctuation)) {
-    return false;
-  }
+  auto chars1 = stableChars1.twoByteRange();
+  auto chars2 = stableChars2.twoByteRange();
 
-  args.rval().setBoolean(isIgnorePunctuation);
+  result.setInt32(coll->CompareStrings(chars1, chars2));
   return true;
 }
 
diff --git a/js/src/builtin/intl/Collator.h b/js/src/builtin/intl/Collator.h
index 843dd69def79c..84fb256e1dde1 100644
--- a/js/src/builtin/intl/Collator.h
+++ b/js/src/builtin/intl/Collator.h
@@ -136,36 +136,6 @@ class CollatorObject : public NativeObject {
   static void finalize(JS::GCContext* gcx, JSObject* obj);
 };
 
-/**
- * Compares x and y (which must be String values), and returns a number less
- * than 0 if x < y, 0 if x = y, or a number greater than 0 if x > y according
- * to the sort order for the locale and collation options of the given
- * Collator.
- *
- * Spec: ECMAScript Internationalization API Specification, 10.3.2.
- *
- * Usage: result = intl_CompareStrings(collator, x, y)
- */
-[[nodiscard]] extern bool intl_CompareStrings(JSContext* cx, unsigned argc,
-                                              JS::Value* vp);
-
-/**
- * Returns true if the given locale sorts upper-case before lower-case
- * characters.
- *
- * Usage: result = intl_isUpperCaseFirst(locale)
- */
-[[nodiscard]] extern bool intl_isUpperCaseFirst(JSContext* cx, unsigned argc,
-                                                JS::Value* vp);
-
-/**
- * Returns true if the given locale ignores punctuation by default.
- *
- * Usage: result = intl_isIgnorePunctuation(locale)
- */
-[[nodiscard]] extern bool intl_isIgnorePunctuation(JSContext* cx, unsigned argc,
-                                                   JS::Value* vp);
-
 namespace intl {
 
 /**
@@ -183,6 +153,11 @@ namespace intl {
     JSContext* cx, JS::Handle<JS::Value> locales,
     JS::Handle<JS::Value> options);
 
+/**
+ * Compares x and y, and returns a number less than 0 if x < y, 0 if x = y, or a
+ * number greater than 0 if x > y according to the sort order for the locale and
+ * collation options of the given Collator.
+ */
 [[nodiscard]] extern bool CompareStrings(JSContext* cx,
                                          JS::Handle<CollatorObject*> collator,
                                          JS::Handle<JSString*> str1,
diff --git a/js/src/builtin/intl/Collator.js b/js/src/builtin/intl/Collator.js
deleted file mode 100644
index c4c4f3048de21..0000000000000
--- a/js/src/builtin/intl/Collator.js
+++ /dev/null
@@ -1,353 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* Portions Copyright Norbert Lindenberg 2011-2012. */
-
-/**
- * Compute an internal properties object from |lazyCollatorData|.
- */
-function resolveCollatorInternals(lazyCollatorData) {
-  assert(IsObject(lazyCollatorData), "lazy data not an object?");
-
-  var internalProps = std_Object_create(null);
-
-  // Step 5.
-  internalProps.usage = lazyCollatorData.usage;
-
-  // Compute effective locale.
-
-  // Steps 6-7 and 16-17.
-  var r = intl_ResolveLocale(
-    "Collator",
-    lazyCollatorData.requestedLocales,
-    lazyCollatorData.opt,
-    lazyCollatorData.usage === "search"
-  );
-
-  // Step 18.
-  internalProps.locale = r.locale;
-
-  // Step 19.
-  var collation = r.co;
-
-  // Step 20.
-  if (collation === null) {
-    collation = "default";
-  }
-
-  // Step 21.
-  internalProps.collation = collation;
-
-  // Step 22.
-  internalProps.numeric = r.kn === "true";
-
-  // Step 23.
-  internalProps.caseFirst = r.kf;
-
-  // Compute remaining collation options.
-  // Step 25.
-  var s = lazyCollatorData.rawSensitivity;
-  if (s === undefined) {
-    // In theory the default sensitivity for the "search" collator is
-    // locale dependent; in reality the CLDR/ICU default strength is
-    // always tertiary. Therefore use "variant" as the default value for
-    // both collation modes.
-    s = "variant";
-  }
-
-  // Step 26.
-  internalProps.sensitivity = s;
-
-  // Step 28.
-  var ignorePunctuation = lazyCollatorData.ignorePunctuation;
-  if (ignorePunctuation === undefined) {
-    var actualLocale = collatorActualLocale(r.dataLocale);
-    ignorePunctuation = intl_isIgnorePunctuation(actualLocale);
-  }
-  internalProps.ignorePunctuation = ignorePunctuation;
-
-  // The caller is responsible for associating |internalProps| with the right
-  // object using |setInternalProperties|.
-  return internalProps;
-}
-
-/**
- * Returns an object containing the Collator internal properties of |obj|.
- */
-function getCollatorInternals(obj) {
-  assert(IsObject(obj), "getCollatorInternals called with non-object");
-  assert(
-    intl_GuardToCollator(obj) !== null,
-    "getCollatorInternals called with non-Collator"
-  );
-
-  var internals = getIntlObjectInternals(obj);
-  assert(
-    internals.type === "Collator",
-    "bad type escaped getIntlObjectInternals"
-  );
-
-  // If internal properties have already been computed, use them.
-  var internalProps = maybeInternalProperties(internals);
-  if (internalProps) {
-    return internalProps;
-  }
-
-  // Otherwise it's time to fully create them.
-  internalProps = resolveCollatorInternals(internals.lazyData);
-  setInternalProperties(internals, internalProps);
-  return internalProps;
-}
-
-/**
- * Initializes an object as a Collator.
- *
- * This method is complicated a moderate bit by its implementing initialization
- * as a *lazy* concept.  Everything that must happen now, does -- but we defer
- * all the work we can until the object is actually used as a Collator.  This
- * later work occurs in |resolveCollatorInternals|; steps not noted here occur
- * there.
- *
- * Spec: ECMAScript Internationalization API Specification, 10.1.1.
- */
-function InitializeCollator(collator, locales, options) {
-  assert(IsObject(collator), "InitializeCollator called with non-object");
-  assert(
-    intl_GuardToCollator(collator) !== null,
-    "InitializeCollator called with non-Collator"
-  );
-
-  // Lazy Collator data has the following structure:
-  //
-  //   {
-  //     requestedLocales: List of locales,
-  //     usage: "sort" / "search",
-  //     opt: // opt object computed in InitializeCollator
-  //       {
-  //         localeMatcher: "lookup" / "best fit",
-  //         co: string matching a Unicode extension type / undefined
-  //         kn: true / false / undefined,
-  //         kf: "upper" / "lower" / "false" / undefined
-  //       }
-  //     rawSensitivity: "base" / "accent" / "case" / "variant" / undefined,
-  //     ignorePunctuation: true / false / undefined
-  //   }
-  //
-  // Note that lazy data is only installed as a final step of initialization,
-  // so every Collator lazy data object has *all* these properties, never a
-  // subset of them.
-  var lazyCollatorData = std_Object_create(null);
-
-  // Step 1.
-  var requestedLocales = CanonicalizeLocaleList(locales);
-  lazyCollatorData.requestedLocales = requestedLocales;
-
-  // Steps 2-3.
-  //
-  // If we ever need more speed here at startup, we should try to detect the
-  // case where |options === undefined| and then directly use the default
-  // value for each option.  For now, just keep it simple.
-  if (options === undefined) {
-    options = std_Object_create(null);
-  } else {
-    options = ToObject(options);
-  }
-
-  // Compute options that impact interpretation of locale.
-  // Step 4.
-  var u = GetOption(options, "usage", "string", ["sort", "search"], "sort");
-  lazyCollatorData.usage = u;
-
-  // Step 8.
-  var opt = NEW_RECORD();
-  lazyCollatorData.opt = opt;
-
-  // Steps 9-10.
-  var matcher = GetOption(
-    options,
-    "localeMatcher",
-    "string",
-    ["lookup", "best fit"],
-    "best fit"
-  );
-  opt.localeMatcher = matcher;
-
-  // https://github.com/tc39/ecma402/pull/459
-  var collation = GetOption(
-    options,
-    "collation",
-    "string",
-    undefined,
-    undefined
-  );
-  if (collation !== undefined) {
-    collation = intl_ValidateAndCanonicalizeUnicodeExtensionType(
-      collation,
-      "collation",
-      "co"
-    );
-  }
-  opt.co = collation;
-
-  // Steps 11-13.
-  var numericValue = GetOption(
-    options,
-    "numeric",
-    "boolean",
-    undefined,
-    undefined
-  );
-  if (numericValue !== undefined) {
-    numericValue = numericValue ? "true" : "false";
-  }
-  opt.kn = numericValue;
-
-  // Steps 14-15.
-  var caseFirstValue = GetOption(
-    options,
-    "caseFirst",
-    "string",
-    ["upper", "lower", "false"],
-    undefined
-  );
-  opt.kf = caseFirstValue;
-
-  // Compute remaining collation options.
-  // Step 24.
-  var s = GetOption(
-    options,
-    "sensitivity",
-    "string",
-    ["base", "accent", "case", "variant"],
-    undefined
-  );
-  lazyCollatorData.rawSensitivity = s;
-
-  // Step 27.
-  var ip = GetOption(options, "ignorePunctuation", "boolean", undefined, undefined);
-  lazyCollatorData.ignorePunctuation = ip;
-
-  // Step 29.
-  //
-  // We've done everything that must be done now: mark the lazy data as fully
-  // computed and install it.
-  initializeIntlObject(collator, "Collator", lazyCollatorData);
-}
-
-/**
- * Returns the actual locale used when a collator for |locale| is constructed.
- */
-function collatorActualLocale(locale) {
-  assert(typeof locale === "string", "locale should be string");
-
-  // If |locale| is the default locale (e.g. da-DK), but only supported
-  // through a fallback (da), we need to get the actual locale before we
-  // can call intl_isUpperCaseFirst. Also see intl_BestAvailableLocale.
-  return BestAvailableLocaleIgnoringDefault("Collator", locale);
-}
-
-/**
- * Create function to be cached and returned by Intl.Collator.prototype.compare.
- *
- * Spec: ECMAScript Internationalization API Specification, 10.3.3.1.
- */
-function createCollatorCompare(collator) {
-  // This function is not inlined in $Intl_Collator_compare_get to avoid
-  // creating a call-object on each call to $Intl_Collator_compare_get.
-  return function(x, y) {
-    // Step 1 (implicit).
-
-    // Step 2.
-    assert(IsObject(collator), "collatorCompareToBind called with non-object");
-    assert(
-      intl_GuardToCollator(collator) !== null,
-      "collatorCompareToBind called with non-Collator"
-    );
-
-    // Steps 3-6
-    var X = ToString(x);
-    var Y = ToString(y);
-
-    // Step 7.
-    return intl_CompareStrings(collator, X, Y);
-  };
-}
-
-/**
- * Returns a function bound to this Collator that compares x (converted to a
- * String value) and y (converted to a String value),
- * and returns a number less than 0 if x < y, 0 if x = y, or a number greater
- * than 0 if x > y according to the sort order for the locale and collation
- * options of this Collator object.
- *
- * Spec: ECMAScript Internationalization API Specification, 10.3.3.
- */
-// Uncloned functions with `$` prefix are allocated as extended function
-// to store the original name in `SetCanonicalName`.
-function $Intl_Collator_compare_get() {
-  // Step 1.
-  var collator = this;
-
-  // Steps 2-3.
-  if (
-    !IsObject(collator) ||
-    (collator = intl_GuardToCollator(collator)) === null
-  ) {
-    return callFunction(
-      intl_CallCollatorMethodIfWrapped,
-      this,
-      "$Intl_Collator_compare_get"
-    );
-  }
-
-  var internals = getCollatorInternals(collator);
-
-  // Step 4.
-  if (internals.boundCompare === undefined) {
-    // Steps 4.a-c.
-    internals.boundCompare = createCollatorCompare(collator);
-  }
-
-  // Step 5.
-  return internals.boundCompare;
-}
-SetCanonicalName($Intl_Collator_compare_get, "get compare");
-
-/**
- * Returns the resolved options for a Collator object.
- *
- * Spec: ECMAScript Internationalization API Specification, 10.3.4.
- */
-function Intl_Collator_resolvedOptions() {
-  // Step 1.
-  var collator = this;
-
-  // Steps 2-3.
-  if (
-    !IsObject(collator) ||
-    (collator = intl_GuardToCollator(collator)) === null
-  ) {
-    return callFunction(
-      intl_CallCollatorMethodIfWrapped,
-      this,
-      "Intl_Collator_resolvedOptions"
-    );
-  }
-
-  var internals = getCollatorInternals(collator);
-
-  // Steps 4-5.
-  var result = {
-    locale: internals.locale,
-    usage: internals.usage,
-    sensitivity: internals.sensitivity,
-    ignorePunctuation: internals.ignorePunctuation,
-    collation: internals.collation,
-    numeric: internals.numeric,
-    caseFirst: internals.caseFirst,
-  };
-
-  // Step 6.
-  return result;
-}
diff --git a/js/src/builtin/intl/CommonFunctions.js b/js/src/builtin/intl/CommonFunctions.js
index ad57c643a2f22..5c168be6a9a07 100644
--- a/js/src/builtin/intl/CommonFunctions.js
+++ b/js/src/builtin/intl/CommonFunctions.js
@@ -258,8 +258,7 @@ function intlFallbackSymbol() {
 function initializeIntlObject(obj, type, lazyData) {
   assert(IsObject(obj), "Non-object passed to initializeIntlObject");
   assert(
-    (type === "Collator" && intl_GuardToCollator(obj) !== null) ||
-      (type === "DateTimeFormat" && intl_GuardToDateTimeFormat(obj) !== null) ||
+    (type === "DateTimeFormat" && intl_GuardToDateTimeFormat(obj) !== null) ||
       (type === "DurationFormat" && intl_GuardToDurationFormat(obj) !== null) ||
       (type === "NumberFormat" && intl_GuardToNumberFormat(obj) !== null) ||
       (type === "PluralRules" && intl_GuardToPluralRules(obj) !== null),
@@ -271,7 +270,6 @@ function initializeIntlObject(obj, type, lazyData) {
   //
   // The .type property indicates the type of Intl object that |obj| is. It
   // must be one of:
-  // - Collator
   // - DateTimeFormat
   // - DurationFormat
   // - NumberFormat
@@ -338,8 +336,7 @@ function maybeInternalProperties(internals) {
 function getIntlObjectInternals(obj) {
   assert(IsObject(obj), "getIntlObjectInternals called with non-Object");
   assert(
-    intl_GuardToCollator(obj) !== null ||
-      intl_GuardToDateTimeFormat(obj) !== null ||
+    intl_GuardToDateTimeFormat(obj) !== null ||
       intl_GuardToDurationFormat(obj) !== null ||
       intl_GuardToNumberFormat(obj) !== null ||
       intl_GuardToPluralRules(obj) !== null,
@@ -351,8 +348,7 @@ function getIntlObjectInternals(obj) {
   assert(IsObject(internals), "internals not an object");
   assert(hasOwn("type", internals), "missing type");
   assert(
-    (internals.type === "Collator" && intl_GuardToCollator(obj) !== null) ||
-      (internals.type === "DateTimeFormat" &&
+    (internals.type === "DateTimeFormat" &&
         intl_GuardToDateTimeFormat(obj) !== null) ||
       (internals.type === "DurationFormat" &&
         intl_GuardToDurationFormat(obj) !== null) ||
@@ -383,9 +379,7 @@ function getInternals(obj) {
 
   // Otherwise it's time to fully create them.
   var type = internals.type;
-  if (type === "Collator") {
-    internalProps = resolveCollatorInternals(internals.lazyData);
-  } else if (type === "DateTimeFormat") {
+  if (type === "DateTimeFormat") {
     internalProps = resolveDateTimeFormatInternals(internals.lazyData);
   } else if (type === "DurationFormat") {
     internalProps = resolveDurationFormatInternals(internals.lazyData);
diff --git a/js/src/builtin/moz.build b/js/src/builtin/moz.build
index 125d8c81b0ef9..abde0f665c6e5 100644
--- a/js/src/builtin/moz.build
+++ b/js/src/builtin/moz.build
@@ -89,7 +89,6 @@ selfhosted_inputs = [
 ] + (
     [
         "intl/NumberingSystemsGenerated.h",
-        "intl/Collator.js",
         "intl/CommonFunctions.js",
         "intl/CurrencyDataGenerated.js",
         "intl/DateTimeFormat.js",
diff --git a/js/src/jit/CacheIR.cpp b/js/src/jit/CacheIR.cpp
index 24c7a361ca323..51e37bca65f9f 100644
--- a/js/src/jit/CacheIR.cpp
+++ b/js/src/jit/CacheIR.cpp
@@ -13180,7 +13180,6 @@ AttachDecision InlinableNativeIRGenerator::tryAttachStub() {
       return tryAttachFunctionBind();
 
     // Intl natives.
-    case InlinableNative::IntlGuardToCollator:
     case InlinableNative::IntlGuardToDateTimeFormat:
     case InlinableNative::IntlGuardToDurationFormat:
     case InlinableNative::IntlGuardToNumberFormat:
diff --git a/js/src/jit/InlinableNatives.cpp b/js/src/jit/InlinableNatives.cpp
index df8922bb85a3a..869f8fe12474e 100644
--- a/js/src/jit/InlinableNatives.cpp
+++ b/js/src/jit/InlinableNatives.cpp
@@ -7,7 +7,6 @@
 #include "jit/InlinableNatives.h"
 
 #ifdef JS_HAS_INTL_API
-#  include "builtin/intl/Collator.h"
 #  include "builtin/intl/DateTimeFormat.h"
 #  include "builtin/intl/DurationFormat.h"
 #  include "builtin/intl/NumberFormat.h"
@@ -41,8 +40,6 @@ const JSClass* js::jit::InlinableNativeGuardToClass(InlinableNative native) {
   switch (native) {
 #ifdef JS_HAS_INTL_API
     // Intl natives.
-    case InlinableNative::IntlGuardToCollator:
-      return &CollatorObject::class_;
     case InlinableNative::IntlGuardToDateTimeFormat:
       return &DateTimeFormatObject::class_;
     case InlinableNative::IntlGuardToDurationFormat:
@@ -56,7 +53,6 @@ const JSClass* js::jit::InlinableNativeGuardToClass(InlinableNative native) {
     case InlinableNative::IntlGuardToSegmentIterator:
       return &SegmentIteratorObject::class_;
 #else
-    case InlinableNative::IntlGuardToCollator:
     case InlinableNative::IntlGuardToDateTimeFormat:
     case InlinableNative::IntlGuardToNumberFormat:
     case InlinableNative::IntlGuardToPluralRules:
@@ -164,7 +160,6 @@ bool js::jit::CanInlineNativeCrossRealm(InlinableNative native) {
       // RNG state is per-realm.
       return false;
 
-    case InlinableNative::IntlGuardToCollator:
     case InlinableNative::IntlGuardToDateTimeFormat:
     case InlinableNative::IntlGuardToDurationFormat:
     case InlinableNative::IntlGuardToNumberFormat:
diff --git a/js/src/jit/InlinableNatives.h b/js/src/jit/InlinableNatives.h
index 9087746c43006..f42ccb7a61d58 100644
--- a/js/src/jit/InlinableNatives.h
+++ b/js/src/jit/InlinableNatives.h
@@ -95,7 +95,6 @@
                                                    \
   _(FunctionBind)                                  \
                                                    \
-  _(IntlGuardToCollator)                           \
   _(IntlGuardToDateTimeFormat)                     \
   _(IntlGuardToDurationFormat)                     \
   _(IntlGuardToNumberFormat)                       \
diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp
index d3acf7ff43773..d4a7d795503e3 100644
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -24,7 +24,6 @@
 #include "builtin/Array.h"
 #include "builtin/BigInt.h"
 #ifdef JS_HAS_INTL_API
-#  include "builtin/intl/Collator.h"
 #  include "builtin/intl/DateTimeFormat.h"
 #  include "builtin/intl/DurationFormat.h"
 #  include "builtin/intl/IntlObject.h"
@@ -1844,8 +1843,6 @@ static const JSFunctionSpec intrinsic_functions[] = {
 // Intrinsics and standard functions used by Intl API implementation.
 #ifdef JS_HAS_INTL_API
     JS_FN("intl_BestAvailableLocale", intl_BestAvailableLocale, 3, 0),
-    JS_FN("intl_CallCollatorMethodIfWrapped",
-          CallNonGenericSelfhostedMethod<Is<CollatorObject>>, 2, 0),
     JS_FN("intl_CallDateTimeFormatMethodIfWrapped",
           CallNonGenericSelfhostedMethod<Is<DateTimeFormatObject>>, 2, 0),
     JS_FN("intl_CallDurationFormatMethodIfWrapped",
@@ -1858,7 +1855,6 @@ static const JSFunctionSpec intrinsic_functions[] = {
           CallNonGenericSelfhostedMethod<Is<SegmentIteratorObject>>, 2, 0),
     JS_FN("intl_CallSegmentsMethodIfWrapped",
           CallNonGenericSelfhostedMethod<Is<SegmentsObject>>, 2, 0),
-    JS_FN("intl_CompareStrings", intl_CompareStrings, 3, 0),
     JS_FN("intl_CreateSegmentIterator", intl_CreateSegmentIterator, 1, 0),
     JS_FN("intl_DefaultTimeZone", intrinsic_DefaultTimeZone, 0, 0),
     JS_FN("intl_FindNextSegmentBoundaries", intl_FindNextSegmentBoundaries, 1,
@@ -1869,9 +1865,6 @@ static const JSFunctionSpec intrinsic_functions[] = {
     JS_FN("intl_FormatNumber", intl_FormatNumber, 3, 0),
     JS_FN("intl_FormatNumberRange", intl_FormatNumberRange, 4, 0),
     JS_FN("intl_GetPluralCategories", intl_GetPluralCategories, 1, 0),
-    JS_INLINABLE_FN("intl_GuardToCollator",
-                    intrinsic_GuardToBuiltin<CollatorObject>, 1, 0,
-                    IntlGuardToCollator),
     JS_INLINABLE_FN("intl_GuardToDateTimeFormat",
                     intrinsic_GuardToBuiltin<DateTimeFormatObject>, 1, 0,
                     IntlGuardToDateTimeFormat),
@@ -1908,8 +1901,6 @@ static const JSFunctionSpec intrinsic_functions[] = {
     JS_FN("intl_availableMeasurementUnits", intl_availableMeasurementUnits, 0,
           0),
 #  endif
-    JS_FN("intl_isIgnorePunctuation", intl_isIgnorePunctuation, 1, 0),
-    JS_FN("intl_isUpperCaseFirst", intl_isUpperCaseFirst, 1, 0),
     JS_FN("intl_resolveDateTimeFormatComponents",
           intl_resolveDateTimeFormatComponents, 3, 0),
 #endif  // JS_HAS_INTL_API

From eff29d99caecaebb575df6b153a3d9636bebf002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bargull?= <andre.bargull@gmail.com>
Date: Thu, 29 Jan 2026 07:42:54 +0000
Subject: [PATCH 005/116] Bug 2010221 - Part 1: Move Intl.DurationFormat
 initialisation to C++. r=spidermonkey-reviewers,mgaudet

Differential Revision: https://phabricator.services.mozilla.com/D279036
---
 js/src/builtin/intl/DurationFormat.cpp | 1302 +++++++++++++++---------
 js/src/builtin/intl/DurationFormat.h   |  106 +-
 2 files changed, 894 insertions(+), 514 deletions(-)

diff --git a/js/src/builtin/intl/DurationFormat.cpp b/js/src/builtin/intl/DurationFormat.cpp
index d8250c23d2017..0816e6ce446cf 100644
--- a/js/src/builtin/intl/DurationFormat.cpp
+++ b/js/src/builtin/intl/DurationFormat.cpp
@@ -12,10 +12,12 @@
 #include "mozilla/intl/DateTimeFormat.h"
 #include "mozilla/intl/ListFormat.h"
 #include "mozilla/intl/NumberFormat.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/Span.h"
 
 #include <array>
 #include <charconv>
+#include <utility>
 
 #include "jspubtd.h"
 #include "NamespaceImports.h"
@@ -26,6 +28,8 @@
 #include "builtin/intl/ListFormat.h"
 #include "builtin/intl/LocaleNegotiation.h"
 #include "builtin/intl/NumberFormat.h"
+#include "builtin/intl/ParameterNegotiation.h"
+#include "builtin/intl/UsingEnum.h"
 #include "builtin/temporal/Duration.h"
 #include "gc/AllocKind.h"
 #include "gc/GCContext.h"
@@ -47,12 +51,14 @@
 using namespace js;
 using namespace js::intl;
 
+using js::temporal::TemporalUnit;
+
 static constexpr auto durationUnits = std::array{
-    temporal::TemporalUnit::Year,        temporal::TemporalUnit::Month,
-    temporal::TemporalUnit::Week,        temporal::TemporalUnit::Day,
-    temporal::TemporalUnit::Hour,        temporal::TemporalUnit::Minute,
-    temporal::TemporalUnit::Second,      temporal::TemporalUnit::Millisecond,
-    temporal::TemporalUnit::Microsecond, temporal::TemporalUnit::Nanosecond,
+    TemporalUnit::Year,        TemporalUnit::Month,
+    TemporalUnit::Week,        TemporalUnit::Day,
+    TemporalUnit::Hour,        TemporalUnit::Minute,
+    TemporalUnit::Second,      TemporalUnit::Millisecond,
+    TemporalUnit::Microsecond, TemporalUnit::Nanosecond,
 };
 
 const JSClass DurationFormatObject::class_ = {
@@ -67,8 +73,13 @@ const JSClass DurationFormatObject::class_ = {
 const JSClass& DurationFormatObject::protoClass_ = PlainObject::class_;
 
 static bool durationFormat_format(JSContext* cx, unsigned argc, Value* vp);
+
 static bool durationFormat_formatToParts(JSContext* cx, unsigned argc,
                                          Value* vp);
+
+static bool durationFormat_resolvedOptions(JSContext* cx, unsigned argc,
+                                           Value* vp);
+
 static bool durationFormat_supportedLocalesOf(JSContext* cx, unsigned argc,
                                               Value* vp);
 
@@ -84,8 +95,7 @@ static const JSFunctionSpec durationFormat_static_methods[] = {
 };
 
 static const JSFunctionSpec durationFormat_methods[] = {
-    JS_SELF_HOSTED_FN("resolvedOptions", "Intl_DurationFormat_resolvedOptions",
-                      0, 0),
+    JS_FN("resolvedOptions", durationFormat_resolvedOptions, 0, 0),
     JS_FN("format", durationFormat_format, 1, 0),
     JS_FN("formatToParts", durationFormat_formatToParts, 1, 0),
     JS_FN("toSource", durationFormat_toSource, 0, 0),
@@ -143,6 +153,545 @@ void js::DurationFormatObject::finalize(JS::GCContext* gcx, JSObject* obj) {
   }
 }
 
+static constexpr std::string_view DisplayToString(DurationDisplay display) {
+#ifndef USING_ENUM
+  using enum DurationDisplay;
+#else
+  USING_ENUM(DurationDisplay, Auto, Always);
+#endif
+  switch (display) {
+    case Auto:
+      return "auto";
+    case Always:
+      return "always";
+  }
+  MOZ_CRASH("invalid duration format display");
+}
+
+static constexpr std::string_view DurationStyleToString(DurationStyle style) {
+#ifndef USING_ENUM
+  using enum DurationStyle;
+#else
+  USING_ENUM(DurationStyle, Long, Short, Narrow, Numeric, TwoDigit);
+#endif
+  switch (style) {
+    case Long:
+      return "long";
+    case Short:
+      return "short";
+    case Narrow:
+      return "narrow";
+    case Numeric:
+      return "numeric";
+    case TwoDigit:
+      return "2-digit";
+  }
+  MOZ_CRASH("invalid duration format style");
+}
+
+static constexpr std::string_view BaseStyleToString(DurationBaseStyle style) {
+#ifndef USING_ENUM
+  using enum DurationBaseStyle;
+#else
+  USING_ENUM(DurationBaseStyle, Long, Short, Narrow, Digital);
+#endif
+  switch (style) {
+    case Long:
+      return "long";
+    case Short:
+      return "short";
+    case Narrow:
+      return "narrow";
+    case Digital:
+      return "digital";
+  }
+  MOZ_CRASH("invalid duration format base style");
+}
+
+/**
+ * Return the singular name for |unit|.
+ */
+static std::string_view SingularUnitName(TemporalUnit unit) {
+  switch (unit) {
+    case TemporalUnit::Year:
+      return "year";
+    case TemporalUnit::Month:
+      return "month";
+    case TemporalUnit::Week:
+      return "week";
+    case TemporalUnit::Day:
+      return "day";
+    case TemporalUnit::Hour:
+      return "hour";
+    case TemporalUnit::Minute:
+      return "minute";
+    case TemporalUnit::Second:
+      return "second";
+    case TemporalUnit::Millisecond:
+      return "millisecond";
+    case TemporalUnit::Microsecond:
+      return "microsecond";
+    case TemporalUnit::Nanosecond:
+      return "nanosecond";
+    case TemporalUnit::Unset:
+    case TemporalUnit::Auto:
+      break;
+  }
+  MOZ_CRASH("invalid temporal unit");
+}
+
+/**
+ * Return the plural name for |unit|.
+ */
+static std::string_view PluralUnitName(TemporalUnit unit) {
+  switch (unit) {
+    case TemporalUnit::Year:
+      return "years";
+    case TemporalUnit::Month:
+      return "months";
+    case TemporalUnit::Week:
+      return "weeks";
+    case TemporalUnit::Day:
+      return "days";
+    case TemporalUnit::Hour:
+      return "hours";
+    case TemporalUnit::Minute:
+      return "minutes";
+    case TemporalUnit::Second:
+      return "seconds";
+    case TemporalUnit::Millisecond:
+      return "milliseconds";
+    case TemporalUnit::Microsecond:
+      return "microseconds";
+    case TemporalUnit::Nanosecond:
+      return "nanoseconds";
+    case TemporalUnit::Unset:
+    case TemporalUnit::Auto:
+      break;
+  }
+  MOZ_CRASH("invalid temporal unit");
+}
+
+/**
+ * Return the "style" property name for |unit|.
+ */
+static Handle<PropertyName*> DurationStyleName(TemporalUnit unit,
+                                               JSContext* cx) {
+  switch (unit) {
+    case TemporalUnit::Year:
+      return cx->names().years;
+    case TemporalUnit::Month:
+      return cx->names().months;
+    case TemporalUnit::Week:
+      return cx->names().weeks;
+    case TemporalUnit::Day:
+      return cx->names().days;
+    case TemporalUnit::Hour:
+      return cx->names().hours;
+    case TemporalUnit::Minute:
+      return cx->names().minutes;
+    case TemporalUnit::Second:
+      return cx->names().seconds;
+    case TemporalUnit::Millisecond:
+      return cx->names().milliseconds;
+    case TemporalUnit::Microsecond:
+      return cx->names().microseconds;
+    case TemporalUnit::Nanosecond:
+      return cx->names().nanoseconds;
+    case TemporalUnit::Unset:
+    case TemporalUnit::Auto:
+      break;
+  }
+  MOZ_CRASH("invalid temporal unit");
+}
+
+/**
+ * Return the "display" property name for |unit|.
+ */
+static Handle<PropertyName*> DurationDisplayName(TemporalUnit unit,
+                                                 JSContext* cx) {
+  switch (unit) {
+    case TemporalUnit::Year:
+      return cx->names().yearsDisplay;
+    case TemporalUnit::Month:
+      return cx->names().monthsDisplay;
+    case TemporalUnit::Week:
+      return cx->names().weeksDisplay;
+    case TemporalUnit::Day:
+      return cx->names().daysDisplay;
+    case TemporalUnit::Hour:
+      return cx->names().hoursDisplay;
+    case TemporalUnit::Minute:
+      return cx->names().minutesDisplay;
+    case TemporalUnit::Second:
+      return cx->names().secondsDisplay;
+    case TemporalUnit::Millisecond:
+      return cx->names().millisecondsDisplay;
+    case TemporalUnit::Microsecond:
+      return cx->names().microsecondsDisplay;
+    case TemporalUnit::Nanosecond:
+      return cx->names().nanosecondsDisplay;
+    case TemporalUnit::Unset:
+    case TemporalUnit::Auto:
+      break;
+  }
+  MOZ_CRASH("invalid temporal unit");
+}
+
+/**
+ * IsFractionalSecondUnitName ( unit )
+ */
+static inline bool IsFractionalSecondUnitName(TemporalUnit unit) {
+  return TemporalUnit::Millisecond <= unit && unit <= TemporalUnit::Nanosecond;
+}
+
+/**
+ * GetDurationUnitOptions ( unit, options, baseStyle, stylesList, digitalBase,
+ * prevStyle, twoDigitHours )
+ */
+static bool GetDurationUnitOptions(
+    JSContext* cx, TemporalUnit unit, Handle<JSObject*> options,
+    DurationBaseStyle baseStyle, DurationStyle digitalBase,
+    DurationStyle prevStyle,
+    std::pair<DurationStyle, DurationDisplay>* result) {
+  // Step 1.
+  mozilla::Maybe<DurationStyle> styleOption{};
+  switch (unit) {
+    case TemporalUnit::Year:
+    case TemporalUnit::Month:
+    case TemporalUnit::Week:
+    case TemporalUnit::Day: {
+      static constexpr auto styles = MapOptions<DurationStyleToString>(
+          DurationStyle::Long, DurationStyle::Short, DurationStyle::Narrow);
+      if (!GetStringOption(cx, options, DurationStyleName(unit, cx), styles,
+                           &styleOption)) {
+        return false;
+      }
+      break;
+    }
+
+    case TemporalUnit::Hour:
+    case TemporalUnit::Minute:
+    case TemporalUnit::Second: {
+      static constexpr auto styles = MapOptions<DurationStyleToString>(
+          DurationStyle::Long, DurationStyle::Short, DurationStyle::Narrow,
+          DurationStyle::Numeric, DurationStyle::TwoDigit);
+      if (!GetStringOption(cx, options, DurationStyleName(unit, cx), styles,
+                           &styleOption)) {
+        return false;
+      }
+      break;
+    }
+
+    case TemporalUnit::Millisecond:
+    case TemporalUnit::Microsecond:
+    case TemporalUnit::Nanosecond: {
+      static constexpr auto styles = MapOptions<DurationStyleToString>(
+          DurationStyle::Long, DurationStyle::Short, DurationStyle::Narrow,
+          DurationStyle::Numeric);
+      if (!GetStringOption(cx, options, DurationStyleName(unit, cx), styles,
+                           &styleOption)) {
+        return false;
+      }
+      break;
+    }
+
+    case TemporalUnit::Unset:
+    case TemporalUnit::Auto:
+      MOZ_CRASH("invalid temporal unit");
+  }
+
+  // Step 2.
+  auto displayDefault = DurationDisplay::Always;
+
+  // Step 3.
+  if (styleOption.isNothing()) {
+    // Step 3.a.
+    if (baseStyle == DurationBaseStyle::Digital) {
+      // Step 3.a.i.
+      styleOption = mozilla::Some(digitalBase);
+
+      // Step 3.a.ii.
+      if (!(TemporalUnit::Hour <= unit && unit <= TemporalUnit::Second)) {
+        displayDefault = DurationDisplay::Auto;
+      }
+    }
+
+    // Step 3.b. ("fractional" handled implicitly)
+    else if (prevStyle == DurationStyle::Numeric ||
+             prevStyle == DurationStyle::TwoDigit) {
+      // Step 3.b.i.
+      styleOption = mozilla::Some(DurationStyle::Numeric);
+
+      // Step 3.b.ii.
+      if (unit != TemporalUnit::Minute && unit != TemporalUnit::Second) {
+        displayDefault = DurationDisplay::Auto;
+      }
+    }
+
+    // Step 3.c.
+    else {
+      // Step 3.c.i.
+      styleOption = mozilla::Some(static_cast<DurationStyle>(baseStyle));
+
+      // Step 3.c.ii.
+      displayDefault = DurationDisplay::Auto;
+    }
+  }
+  auto style = *styleOption;
+
+  // Step 4.
+  bool isFractional =
+      style == DurationStyle::Numeric && IsFractionalSecondUnitName(unit);
+  if (isFractional) {
+    // Step 4.a. (Not applicable in our implementation)
+
+    // Step 4.b.
+    displayDefault = DurationDisplay::Auto;
+  }
+
+  // Steps 5-6.
+  static constexpr auto displays = MapOptions<DisplayToString>(
+      DurationDisplay::Auto, DurationDisplay::Always);
+
+  mozilla::Maybe<DurationDisplay> displayOption{};
+  if (!GetStringOption(cx, options, DurationDisplayName(unit, cx), displays,
+                       &displayOption)) {
+    return false;
+  }
+  auto display = displayOption.valueOr(displayDefault);
+
+  // Step 7. (Inlined ValidateDurationUnitStyle)
+
+  // ValidateDurationUnitStyle, step 1.
+  if (display == DurationDisplay::Always && isFractional) {
+    MOZ_ASSERT(styleOption.isSome() || displayOption.isSome(),
+               "no error is thrown when both 'style' and 'display' are absent");
+
+    JSErrNum errorNumber =
+        styleOption.isSome() && displayOption.isSome()
+            ? JSMSG_INTL_DURATION_INVALID_DISPLAY_OPTION
+        : displayOption.isSome()
+            ? JSMSG_INTL_DURATION_INVALID_DISPLAY_OPTION_DEFAULT_STYLE
+            : JSMSG_INTL_DURATION_INVALID_DISPLAY_OPTION_DEFAULT_DISPLAY;
+    JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, errorNumber,
+                              PluralUnitName(unit).data());
+    return false;
+  }
+
+  // ValidateDurationUnitStyle, steps 2-3.
+  if ((prevStyle == DurationStyle::Numeric ||
+       prevStyle == DurationStyle::TwoDigit) &&
+      !(style == DurationStyle::Numeric || style == DurationStyle::TwoDigit)) {
+    JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
+                              JSMSG_INTL_DURATION_INVALID_NON_NUMERIC_OPTION,
+                              PluralUnitName(unit).data(),
+                              DurationStyleToString(style).data());
+    return false;
+  }
+
+  // Step 8. (Our implementation doesn't use |twoDigitHours|.)
+
+  // Step 9.
+  if ((TemporalUnit::Minute == unit || unit == TemporalUnit::Second) &&
+      (prevStyle == DurationStyle::Numeric ||
+       prevStyle == DurationStyle::TwoDigit)) {
+    style = DurationStyle::TwoDigit;
+  }
+
+  // Step 10.
+  *result = {style, display};
+  return true;
+}
+
+/**
+ * Intl.DurationFormat ( [ locales [ , options ] ] )
+ */
+static bool InitializeDurationFormat(
+    JSContext* cx, Handle<DurationFormatObject*> durationFormat,
+    const CallArgs& args) {
+  // Step 3. (Inlined ResolveOptions)
+
+  // ResolveOptions, step 1.
+  Rooted<LocalesList> requestedLocales(cx, cx);
+  if (!CanonicalizeLocaleList(cx, args.get(0), &requestedLocales)) {
+    return false;
+  }
+
+  Rooted<ArrayObject*> requestedLocalesArray(
+      cx, LocalesListToArray(cx, requestedLocales));
+  if (!requestedLocalesArray) {
+    return false;
+  }
+  durationFormat->setRequestedLocales(requestedLocalesArray);
+
+  auto dfOptions = cx->make_unique<DurationFormatOptions>();
+  if (!dfOptions) {
+    return false;
+  }
+
+  if (args.hasDefined(1)) {
+    // ResolveOptions, steps 2-3.
+    Rooted<JSObject*> options(cx, JS::ToObject(cx, args[1]));
+    if (!options) {
+      return false;
+    }
+
+    // ResolveOptions, step 4.
+    LocaleMatcher matcher;
+    if (!GetLocaleMatcherOption(cx, options, &matcher)) {
+      return false;
+    }
+
+    // ResolveOptions, step 5.
+    //
+    // This implementation only supports the "lookup" locale matcher, therefore
+    // the "localeMatcher" option doesn't need to be stored.
+
+    // ResolveOptions, step 6.
+    Rooted<JSLinearString*> numberingSystem(cx);
+    if (!GetUnicodeExtensionOption(cx, options,
+                                   UnicodeExtensionKey::NumberingSystem,
+                                   &numberingSystem)) {
+      return false;
+    }
+    if (numberingSystem) {
+      durationFormat->setNumberingSystem(numberingSystem);
+    }
+
+    // ResolveOptions, step 7. (Not applicable)
+
+    // ResolveOptions, step 8. (Performed in ResolveLocale)
+
+    // ResolveOptions, step 9. (Return)
+
+    // Step 4. (Not applicable when ResolveOptions is inlined.)
+
+    // Steps 5-11. (Performed in ResolveLocale)
+
+    // Steps 12-13.
+    static constexpr auto styles = MapOptions<BaseStyleToString>(
+        DurationBaseStyle::Long, DurationBaseStyle::Short,
+        DurationBaseStyle::Narrow, DurationBaseStyle::Digital);
+    DurationBaseStyle style;
+    if (!GetStringOption(cx, options, cx->names().style, styles,
+                         DurationBaseStyle::Short, &style)) {
+      return false;
+    }
+    dfOptions->style = style;
+
+    // Step 14.
+    //
+    // This implementation doesn't support passing an empty string for
+    // |prevStyle|. Using one of the textual styles has the same effect, so we
+    // use "long" here.
+    constexpr auto emptyPrevStyle = DurationStyle::Long;
+
+    // Step 15. (Loop unrolled)
+    using DurationUnitOption = std::pair<DurationStyle, DurationDisplay>;
+
+    DurationUnitOption years;
+    if (!GetDurationUnitOptions(cx, TemporalUnit::Year, options, style,
+                                DurationStyle::Short, emptyPrevStyle, &years)) {
+      return false;
+    }
+    dfOptions->yearsStyle = years.first;
+    dfOptions->yearsDisplay = years.second;
+
+    DurationUnitOption months;
+    if (!GetDurationUnitOptions(cx, TemporalUnit::Month, options, style,
+                                DurationStyle::Short, emptyPrevStyle,
+                                &months)) {
+      return false;
+    }
+    dfOptions->monthsStyle = months.first;
+    dfOptions->monthsDisplay = months.second;
+
+    DurationUnitOption weeks;
+    if (!GetDurationUnitOptions(cx, TemporalUnit::Week, options, style,
+                                DurationStyle::Short, emptyPrevStyle, &weeks)) {
+      return false;
+    }
+    dfOptions->weeksStyle = weeks.first;
+    dfOptions->weeksDisplay = weeks.second;
+
+    DurationUnitOption days;
+    if (!GetDurationUnitOptions(cx, TemporalUnit::Day, options, style,
+                                DurationStyle::Short, emptyPrevStyle, &days)) {
+      return false;
+    }
+    dfOptions->daysStyle = days.first;
+    dfOptions->daysDisplay = days.second;
+
+    DurationUnitOption hours;
+    if (!GetDurationUnitOptions(cx, TemporalUnit::Hour, options, style,
+                                DurationStyle::Numeric, emptyPrevStyle,
+                                &hours)) {
+      return false;
+    }
+    dfOptions->hoursStyle = hours.first;
+    dfOptions->hoursDisplay = hours.second;
+
+    DurationUnitOption minutes;
+    if (!GetDurationUnitOptions(cx, TemporalUnit::Minute, options, style,
+                                DurationStyle::Numeric, hours.first,
+                                &minutes)) {
+      return false;
+    }
+    dfOptions->minutesStyle = minutes.first;
+    dfOptions->minutesDisplay = minutes.second;
+
+    DurationUnitOption seconds;
+    if (!GetDurationUnitOptions(cx, TemporalUnit::Second, options, style,
+                                DurationStyle::Numeric, minutes.first,
+                                &seconds)) {
+      return false;
+    }
+    dfOptions->secondsStyle = seconds.first;
+    dfOptions->secondsDisplay = seconds.second;
+
+    DurationUnitOption milliseconds;
+    if (!GetDurationUnitOptions(cx, TemporalUnit::Millisecond, options, style,
+                                DurationStyle::Numeric, seconds.first,
+                                &milliseconds)) {
+      return false;
+    }
+    dfOptions->millisecondsStyle = milliseconds.first;
+    dfOptions->millisecondsDisplay = milliseconds.second;
+
+    DurationUnitOption microseconds;
+    if (!GetDurationUnitOptions(cx, TemporalUnit::Microsecond, options, style,
+                                DurationStyle::Numeric, milliseconds.first,
+                                &microseconds)) {
+      return false;
+    }
+    dfOptions->microsecondsStyle = microseconds.first;
+    dfOptions->microsecondsDisplay = microseconds.second;
+
+    DurationUnitOption nanoseconds;
+    if (!GetDurationUnitOptions(cx, TemporalUnit::Nanosecond, options, style,
+                                DurationStyle::Numeric, microseconds.first,
+                                &nanoseconds)) {
+      return false;
+    }
+    dfOptions->nanosecondsStyle = nanoseconds.first;
+    dfOptions->nanosecondsDisplay = nanoseconds.second;
+
+    // Step 16.
+    mozilla::Maybe<int32_t> fractionalDigits{};
+    if (!GetNumberOption(cx, options, cx->names().fractionalDigits, 0, 9,
+                         &fractionalDigits)) {
+      return false;
+    }
+    dfOptions->fractionalDigits = fractionalDigits.valueOr(-1);
+  }
+  durationFormat->setOptions(dfOptions.release());
+  AddCellMemory(durationFormat, sizeof(DurationFormatOptions),
+                MemoryUse::IntlOptions);
+
+  return true;
+}
+
 /**
  * Intl.DurationFormat ( [ locales [ , options ] ] )
  */
@@ -155,7 +704,7 @@ static bool DurationFormat(JSContext* cx, unsigned argc, Value* vp) {
   }
 
   // Step 2 (Inlined 9.1.14, OrdinaryCreateFromConstructor).
-  RootedObject proto(cx);
+  Rooted<JSObject*> proto(cx);
   if (!GetPrototypeFromBuiltinConstructor(cx, args, JSProto_DurationFormat,
                                           &proto)) {
     return false;
@@ -167,51 +716,86 @@ static bool DurationFormat(JSContext* cx, unsigned argc, Value* vp) {
     return false;
   }
 
-  HandleValue locales = args.get(0);
-  HandleValue options = args.get(1);
-
-  // Steps 3-28.
-  if (!InitializeObject(cx, durationFormat,
-                        cx->names().InitializeDurationFormat, locales,
-                        options)) {
+  // Steps 3-16.
+  if (!InitializeDurationFormat(cx, durationFormat, args)) {
     return false;
   }
 
+  // Step 17.
   args.rval().setObject(*durationFormat);
   return true;
 }
 
 /**
- * Returns the time separator string for the given locale and numbering system.
+ * Resolve the actual locale to finish initialization of the DurationFormat.
  */
-static JSString* GetTimeSeparator(
-    JSContext* cx, Handle<DurationFormatObject*> durationFormat) {
-  if (auto* separator = durationFormat->getTimeSeparator()) {
-    return separator;
+static bool ResolveLocale(JSContext* cx,
+                          Handle<DurationFormatObject*> durationFormat) {
+  // Return if the locale was already resolved.
+  if (durationFormat->isLocaleResolved()) {
+    return true;
   }
 
-  Rooted<JSObject*> internals(cx, GetInternalsObject(cx, durationFormat));
-  if (!internals) {
-    return nullptr;
+  Rooted<ArrayObject*> requestedLocales(
+      cx, &durationFormat->getRequestedLocales()->as<ArrayObject>());
+
+  // %Intl.DurationFormat%.[[RelevantExtensionKeys]] is « "nu" ».
+  mozilla::EnumSet<UnicodeExtensionKey> relevantExtensionKeys{
+      UnicodeExtensionKey::NumberingSystem,
+  };
+
+  // Initialize locale options from constructor arguments.
+  Rooted<LocaleOptions> localeOptions(cx);
+  if (auto* nu = durationFormat->getNumberingSystem()) {
+    localeOptions.setUnicodeExtension(UnicodeExtensionKey::NumberingSystem, nu);
   }
 
-  Rooted<Value> value(cx);
+  // Use the default locale data.
+  auto localeData = LocaleData::Default;
 
-  if (!GetProperty(cx, internals, internals, cx->names().locale, &value)) {
-    return nullptr;
+  // Resolve the actual locale.
+  Rooted<ResolvedLocale> resolved(cx);
+  if (!ResolveLocale(cx, AvailableLocaleKind::DurationFormat, requestedLocales,
+                     localeOptions, relevantExtensionKeys, localeData,
+                     &resolved)) {
+    return false;
   }
 
-  UniqueChars locale = EncodeLocale(cx, value.toString());
+  // Finish initialization by setting the actual locale and numbering system.
+  auto* locale = resolved.toLocale(cx);
   if (!locale) {
+    return false;
+  }
+  durationFormat->setLocale(locale);
+
+  auto nu = resolved.extension(UnicodeExtensionKey::NumberingSystem);
+  MOZ_ASSERT(nu, "resolved numbering system is non-null");
+  durationFormat->setNumberingSystem(nu);
+
+  MOZ_ASSERT(durationFormat->isLocaleResolved(),
+             "locale successfully resolved");
+  return true;
+}
+
+/**
+ * Returns the time separator string for the given locale and numbering system.
+ */
+static JSString* GetTimeSeparator(
+    JSContext* cx, Handle<DurationFormatObject*> durationFormat) {
+  if (auto* separator = durationFormat->getTimeSeparator()) {
+    return separator;
+  }
+
+  if (!ResolveLocale(cx, durationFormat)) {
     return nullptr;
   }
 
-  if (!GetProperty(cx, internals, internals, cx->names().numberingSystem,
-                   &value)) {
+  auto locale = EncodeLocale(cx, durationFormat->getLocale());
+  if (!locale) {
     return nullptr;
   }
 
-  UniqueChars numberingSystem = EncodeAscii(cx, value.toString());
+  auto numberingSystem = EncodeAscii(cx, durationFormat->getNumberingSystem());
   if (!numberingSystem) {
     return nullptr;
   }
@@ -242,169 +826,76 @@ struct DurationValue {
       /* sign */ 1 +
       /* seconds part */ 16 +
       /* decimal dot */ 1 +
-      /* nanoseconds part */ 9;
-
-  // Next power of two after `MaximumDecimalStringLength`.
-  static constexpr size_t DecimalStringCapacity = 32;
-
-  double number = 0;
-  char decimal[DecimalStringCapacity] = {};
-
-  explicit DurationValue() = default;
-  explicit DurationValue(double number) : number(number) {}
-
-  bool isNegative() const {
-    return mozilla::IsNegative(number) || decimal[0] == '-';
-  }
-
-  auto abs() const {
-    // Return unchanged if not negative.
-    if (!isNegative()) {
-      return *this;
-    }
-
-    // Call |std::abs| for non-decimal values.
-    if (!isDecimal()) {
-      return DurationValue{std::abs(number)};
-    }
-
-    // Copy decimal strings without the leading '-' sign character.
-    auto result = DurationValue{};
-    std::copy(std::next(decimal), std::end(decimal), result.decimal);
-    return result;
-  }
-
-  // |number| is active by default unless |decimal| is used.
-  bool isDecimal() const { return decimal[0] != '\0'; }
-
-  // Return true if this value represents either +0 or -0.
-  bool isZero() const { return number == 0 && !isDecimal(); }
-
-  operator std::string_view() const {
-    MOZ_ASSERT(isDecimal());
-    return {decimal};
-  }
-};
-
-/**
- * Return the |unit| value from |duration|.
- */
-static auto ToDurationValue(const temporal::Duration& duration,
-                            temporal::TemporalUnit unit) {
-  using namespace temporal;
-
-  switch (unit) {
-    case TemporalUnit::Year:
-      return DurationValue{duration.years};
-    case TemporalUnit::Month:
-      return DurationValue{duration.months};
-    case TemporalUnit::Week:
-      return DurationValue{duration.weeks};
-    case TemporalUnit::Day:
-      return DurationValue{duration.days};
-    case TemporalUnit::Hour:
-      return DurationValue{duration.hours};
-    case TemporalUnit::Minute:
-      return DurationValue{duration.minutes};
-    case TemporalUnit::Second:
-      return DurationValue{duration.seconds};
-    case TemporalUnit::Millisecond:
-      return DurationValue{duration.milliseconds};
-    case TemporalUnit::Microsecond:
-      return DurationValue{duration.microseconds};
-    case TemporalUnit::Nanosecond:
-      return DurationValue{duration.nanoseconds};
-    case TemporalUnit::Unset:
-    case TemporalUnit::Auto:
-      break;
-  }
-  MOZ_CRASH("invalid temporal unit");
-}
-
-/**
- * Return the "display" property name for |unit|.
- */
-static PropertyName* DurationDisplayName(temporal::TemporalUnit unit,
-                                         JSContext* cx) {
-  using namespace temporal;
-
-  switch (unit) {
-    case TemporalUnit::Year:
-      return cx->names().yearsDisplay;
-    case TemporalUnit::Month:
-      return cx->names().monthsDisplay;
-    case TemporalUnit::Week:
-      return cx->names().weeksDisplay;
-    case TemporalUnit::Day:
-      return cx->names().daysDisplay;
-    case TemporalUnit::Hour:
-      return cx->names().hoursDisplay;
-    case TemporalUnit::Minute:
-      return cx->names().minutesDisplay;
-    case TemporalUnit::Second:
-      return cx->names().secondsDisplay;
-    case TemporalUnit::Millisecond:
-      return cx->names().millisecondsDisplay;
-    case TemporalUnit::Microsecond:
-      return cx->names().microsecondsDisplay;
-    case TemporalUnit::Nanosecond:
-      return cx->names().nanosecondsDisplay;
-    case TemporalUnit::Unset:
-    case TemporalUnit::Auto:
-      break;
+      /* nanoseconds part */ 9;
+
+  // Next power of two after `MaximumDecimalStringLength`.
+  static constexpr size_t DecimalStringCapacity = 32;
+
+  double number = 0;
+  char decimal[DecimalStringCapacity] = {};
+
+  explicit DurationValue() = default;
+  explicit DurationValue(double number) : number(number) {}
+
+  bool isNegative() const {
+    return mozilla::IsNegative(number) || decimal[0] == '-';
   }
-  MOZ_CRASH("invalid temporal unit");
-}
 
-/**
- * Convert |value|, which must be a string, to a |DurationDisplay|.
- */
-static bool ToDurationDisplay(JSContext* cx, const Value& value,
-                              DurationDisplay* result) {
-  MOZ_ASSERT(value.isString());
+  auto abs() const {
+    // Return unchanged if not negative.
+    if (!isNegative()) {
+      return *this;
+    }
 
-  auto* linear = value.toString()->ensureLinear(cx);
-  if (!linear) {
-    return false;
+    // Call |std::abs| for non-decimal values.
+    if (!isDecimal()) {
+      return DurationValue{std::abs(number)};
+    }
+
+    // Copy decimal strings without the leading '-' sign character.
+    auto result = DurationValue{};
+    std::copy(std::next(decimal), std::end(decimal), result.decimal);
+    return result;
   }
 
-  if (StringEqualsAscii(linear, "auto")) {
-    *result = DurationDisplay::Auto;
-  } else {
-    MOZ_ASSERT(StringEqualsAscii(linear, "always"));
-    *result = DurationDisplay::Always;
+  // |number| is active by default unless |decimal| is used.
+  bool isDecimal() const { return decimal[0] != '\0'; }
+
+  // Return true if this value represents either +0 or -0.
+  bool isZero() const { return number == 0 && !isDecimal(); }
+
+  operator std::string_view() const {
+    MOZ_ASSERT(isDecimal());
+    return {decimal};
   }
-  return true;
-}
+};
 
 /**
- * Return the "style" property name for |unit|.
+ * Return the |unit| value from |duration|.
  */
-static PropertyName* DurationStyleName(temporal::TemporalUnit unit,
-                                       JSContext* cx) {
-  using namespace temporal;
-
+static auto ToDurationValue(const temporal::Duration& duration,
+                            TemporalUnit unit) {
   switch (unit) {
     case TemporalUnit::Year:
-      return cx->names().yearsStyle;
+      return DurationValue{duration.years};
     case TemporalUnit::Month:
-      return cx->names().monthsStyle;
+      return DurationValue{duration.months};
     case TemporalUnit::Week:
-      return cx->names().weeksStyle;
+      return DurationValue{duration.weeks};
     case TemporalUnit::Day:
-      return cx->names().daysStyle;
+      return DurationValue{duration.days};
     case TemporalUnit::Hour:
-      return cx->names().hoursStyle;
+      return DurationValue{duration.hours};
     case TemporalUnit::Minute:
-      return cx->names().minutesStyle;
+      return DurationValue{duration.minutes};
     case TemporalUnit::Second:
-      return cx->names().secondsStyle;
+      return DurationValue{duration.seconds};
     case TemporalUnit::Millisecond:
-      return cx->names().millisecondsStyle;
+      return DurationValue{duration.milliseconds};
     case TemporalUnit::Microsecond:
-      return cx->names().microsecondsStyle;
+      return DurationValue{duration.microseconds};
     case TemporalUnit::Nanosecond:
-      return cx->names().nanosecondsStyle;
+      return DurationValue{duration.nanoseconds};
     case TemporalUnit::Unset:
     case TemporalUnit::Auto:
       break;
@@ -412,33 +903,6 @@ static PropertyName* DurationStyleName(temporal::TemporalUnit unit,
   MOZ_CRASH("invalid temporal unit");
 }
 
-/**
- * Convert |value|, which must be a string, to a |DurationStyle|.
- */
-static bool ToDurationStyle(JSContext* cx, const Value& value,
-                            DurationStyle* result) {
-  MOZ_ASSERT(value.isString());
-
-  auto* linear = value.toString()->ensureLinear(cx);
-  if (!linear) {
-    return false;
-  }
-
-  if (StringEqualsAscii(linear, "long")) {
-    *result = DurationStyle::Long;
-  } else if (StringEqualsAscii(linear, "short")) {
-    *result = DurationStyle::Short;
-  } else if (StringEqualsAscii(linear, "narrow")) {
-    *result = DurationStyle::Narrow;
-  } else if (StringEqualsAscii(linear, "numeric")) {
-    *result = DurationStyle::Numeric;
-  } else {
-    MOZ_ASSERT(StringEqualsAscii(linear, "2-digit"));
-    *result = DurationStyle::TwoDigit;
-  }
-  return true;
-}
-
 /**
  * Return the fractional digits setting from |durationFormat|.
  */
@@ -457,9 +921,7 @@ static std::pair<uint32_t, uint32_t> GetFractionalDigits(
 }
 
 static DurationUnitOptions GetUnitOptions(const DurationFormatOptions& options,
-                                          temporal::TemporalUnit unit) {
-  using namespace temporal;
-
+                                          TemporalUnit unit) {
   switch (unit) {
 #define GET_UNIT_OPTIONS(name) \
   DurationUnitOptions { options.name##Display, options.name##Style }
@@ -493,167 +955,27 @@ static DurationUnitOptions GetUnitOptions(const DurationFormatOptions& options,
   MOZ_CRASH("invalid duration unit");
 }
 
-static void SetUnitOptions(DurationFormatOptions& options,
-                           temporal::TemporalUnit unit,
-                           const DurationUnitOptions& unitOptions) {
-  using namespace temporal;
-
-  switch (unit) {
-#define SET_UNIT_OPTIONS(name)                    \
-  do {                                            \
-    options.name##Display = unitOptions.display_; \
-    options.name##Style = unitOptions.style_;     \
-  } while (0)
-
-    case TemporalUnit::Year:
-      SET_UNIT_OPTIONS(years);
-      return;
-    case TemporalUnit::Month:
-      SET_UNIT_OPTIONS(months);
-      return;
-    case TemporalUnit::Week:
-      SET_UNIT_OPTIONS(weeks);
-      return;
-    case TemporalUnit::Day:
-      SET_UNIT_OPTIONS(days);
-      return;
-    case TemporalUnit::Hour:
-      SET_UNIT_OPTIONS(hours);
-      return;
-    case TemporalUnit::Minute:
-      SET_UNIT_OPTIONS(minutes);
-      return;
-    case TemporalUnit::Second:
-      SET_UNIT_OPTIONS(seconds);
-      return;
-    case TemporalUnit::Millisecond:
-      SET_UNIT_OPTIONS(milliseconds);
-      return;
-    case TemporalUnit::Microsecond:
-      SET_UNIT_OPTIONS(microseconds);
-      return;
-    case TemporalUnit::Nanosecond:
-      SET_UNIT_OPTIONS(nanoseconds);
-      return;
-    case TemporalUnit::Unset:
-    case TemporalUnit::Auto:
-      break;
-
-#undef SET_UNIT_OPTIONS
-  }
-  MOZ_CRASH("invalid duration unit");
-}
-
-static DurationFormatOptions* NewDurationFormatOptions(
-    JSContext* cx, Handle<DurationFormatObject*> durationFormat) {
-  Rooted<JSObject*> internals(cx, GetInternalsObject(cx, durationFormat));
-  if (!internals) {
-    return nullptr;
-  }
-
-  auto options = cx->make_unique<DurationFormatOptions>();
-  if (!options) {
-    return nullptr;
-  }
-
-  Rooted<Value> value(cx);
-  for (temporal::TemporalUnit unit : durationUnits) {
-    DurationDisplay display;
-    if (!GetProperty(cx, internals, internals, DurationDisplayName(unit, cx),
-                     &value)) {
-      return nullptr;
-    }
-    if (!ToDurationDisplay(cx, value, &display)) {
-      return nullptr;
-    }
-
-    DurationStyle style;
-    if (!GetProperty(cx, internals, internals, DurationStyleName(unit, cx),
-                     &value)) {
-      return nullptr;
-    }
-    if (!ToDurationStyle(cx, value, &style)) {
-      return nullptr;
-    }
-
-    SetUnitOptions(*options, unit,
-                   DurationUnitOptions{static_cast<uint8_t>(display),
-                                       static_cast<uint8_t>(style)});
-  }
-
-  if (!GetProperty(cx, internals, internals, cx->names().fractionalDigits,
-                   &value)) {
-    return nullptr;
-  }
-  if (value.isUndefined()) {
-    options->fractionalDigits = -1;
-  } else {
-    options->fractionalDigits = value.toInt32();
-  }
-
-  return options.release();
-}
-
-static DurationFormatOptions* GetOrCreateDurationFormatOptions(
-    JSContext* cx, Handle<DurationFormatObject*> durationFormat) {
-  auto* options = durationFormat->getOptions();
-  if (options) {
-    return options;
-  }
-
-  options = NewDurationFormatOptions(cx, durationFormat);
-  if (!options) {
+/**
+ * Create a `mozilla::intl::NumberFormat` instance based on
+ * |durationFormat.locale| and |options|.
+ */
+static mozilla::intl::NumberFormat* NewDurationNumberFormat(
+    JSContext* cx, Handle<DurationFormatObject*> durationFormat,
+    const mozilla::intl::NumberFormatOptions& options) {
+  if (!ResolveLocale(cx, durationFormat)) {
     return nullptr;
   }
-  durationFormat->setOptions(options);
-
-  AddCellMemory(durationFormat, sizeof(DurationFormatOptions),
-                MemoryUse::IntlOptions);
-  return options;
-}
 
-/**
- * Return the locale for `mozilla::intl::NumberFormat` objects.
- */
-static UniqueChars NewDurationNumberFormatLocale(
-    JSContext* cx, Handle<DurationFormatObject*> durationFormat) {
   // ICU expects numberingSystem as a Unicode locale extensions on locale.
 
-  Rooted<JSObject*> internals(cx, GetInternalsObject(cx, durationFormat));
-  if (!internals) {
-    return nullptr;
-  }
+  Rooted<JSLinearString*> localeStr(cx, durationFormat->getLocale());
 
   JS::RootedVector<UnicodeExtensionKeyword> keywords(cx);
-
-  Rooted<Value> value(cx);
-  if (!GetProperty(cx, internals, internals, cx->names().numberingSystem,
-                   &value)) {
+  if (!keywords.emplaceBack("nu", durationFormat->getNumberingSystem())) {
     return nullptr;
   }
 
-  {
-    auto* numberingSystem = value.toString()->ensureLinear(cx);
-    if (!numberingSystem) {
-      return nullptr;
-    }
-
-    if (!keywords.emplaceBack("nu", numberingSystem)) {
-      return nullptr;
-    }
-  }
-
-  return FormatLocale(cx, internals, keywords);
-}
-
-/**
- * Create a `mozilla::intl::NumberFormat` instance based on |internals.locale|
- * and |options|.
- */
-static mozilla::intl::NumberFormat* NewDurationNumberFormat(
-    JSContext* cx, Handle<DurationFormatObject*> durationFormat,
-    const mozilla::intl::NumberFormatOptions& options) {
-  auto locale = NewDurationNumberFormatLocale(cx, durationFormat);
+  auto locale = FormatLocale(cx, localeStr, keywords);
   if (!locale) {
     return nullptr;
   }
@@ -669,43 +991,7 @@ static mozilla::intl::NumberFormat* NewDurationNumberFormat(
 /**
  * Return the singular name for |unit|.
  */
-static std::string_view UnitName(temporal::TemporalUnit unit) {
-  using namespace temporal;
-
-  switch (unit) {
-    case TemporalUnit::Year:
-      return "year";
-    case TemporalUnit::Month:
-      return "month";
-    case TemporalUnit::Week:
-      return "week";
-    case TemporalUnit::Day:
-      return "day";
-    case TemporalUnit::Hour:
-      return "hour";
-    case TemporalUnit::Minute:
-      return "minute";
-    case TemporalUnit::Second:
-      return "second";
-    case TemporalUnit::Millisecond:
-      return "millisecond";
-    case TemporalUnit::Microsecond:
-      return "microsecond";
-    case TemporalUnit::Nanosecond:
-      return "nanosecond";
-    case TemporalUnit::Unset:
-    case TemporalUnit::Auto:
-      break;
-  }
-  MOZ_CRASH("invalid temporal unit");
-}
-
-/**
- * Return the singular name for |unit|.
- */
-static auto PartUnitName(temporal::TemporalUnit unit) {
-  using namespace temporal;
-
+static auto PartUnitName(TemporalUnit unit) {
   switch (unit) {
     case TemporalUnit::Year:
       return &JSAtomState::year;
@@ -763,15 +1049,13 @@ static auto UnitDisplay(DurationStyle style) {
  * decimal string when the fractional part is non-zero.
  */
 static auto ComputeFractionalDigits(const temporal::Duration& duration,
-                                    temporal::TemporalUnit unit) {
-  using namespace temporal;
-
+                                    TemporalUnit unit) {
   MOZ_ASSERT(IsValidDuration(duration));
   MOZ_ASSERT(TemporalUnit::Second <= unit && unit <= TemporalUnit::Microsecond);
 
   // Directly return the duration amount when no sub-seconds are present, i.e.
   // the fractional part is zero.
-  TimeDuration timeDuration;
+  temporal::TimeDuration timeDuration;
   int32_t exponent;
   switch (unit) {
     case TemporalUnit::Second: {
@@ -779,7 +1063,7 @@ static auto ComputeFractionalDigits(const temporal::Duration& duration,
           duration.nanoseconds == 0) {
         return DurationValue{duration.seconds};
       }
-      timeDuration = TimeDurationFromComponents({
+      timeDuration = temporal::TimeDurationFromComponents({
           0,
           0,
           0,
@@ -799,7 +1083,7 @@ static auto ComputeFractionalDigits(const temporal::Duration& duration,
       if (duration.microseconds == 0 && duration.nanoseconds == 0) {
         return DurationValue{duration.milliseconds};
       }
-      timeDuration = TimeDurationFromComponents({
+      timeDuration = temporal::TimeDurationFromComponents({
           0,
           0,
           0,
@@ -819,7 +1103,7 @@ static auto ComputeFractionalDigits(const temporal::Duration& duration,
       if (duration.nanoseconds == 0) {
         return DurationValue{duration.microseconds};
       }
-      timeDuration = TimeDurationFromComponents({
+      timeDuration = temporal::TimeDurationFromComponents({
           0,
           0,
           0,
@@ -846,7 +1130,7 @@ static auto ComputeFractionalDigits(const temporal::Duration& duration,
   char* chars = result.decimal;
 
   // Leading '-' sign when the duration is negative.
-  if (timeDuration < TimeDuration{}) {
+  if (timeDuration < temporal::TimeDuration{}) {
     *chars++ = '-';
     timeDuration = timeDuration.abs();
   }
@@ -890,7 +1174,7 @@ static auto ComputeFractionalDigits(const temporal::Duration& duration,
  */
 static mozilla::intl::NumberFormat* NewNumericFormatter(
     JSContext* cx, Handle<DurationFormatObject*> durationFormat,
-    temporal::TemporalUnit unit) {
+    TemporalUnit unit) {
   // FormatNumericHours, step 1. (Not applicable in our implementation.)
   // FormatNumericMinutes, steps 1-2. (Not applicable in our implementation.)
   // FormatNumericSeconds, steps 1-2. (Not applicable in our implementation.)
@@ -901,7 +1185,7 @@ static mozilla::intl::NumberFormat* NewNumericFormatter(
   auto* dfOptions = durationFormat->getOptions();
   MOZ_ASSERT(dfOptions, "unexpected unresolved duration format options");
 
-  auto style = GetUnitOptions(*dfOptions, unit).style();
+  auto style = GetUnitOptions(*dfOptions, unit).style;
 
   // FormatNumericHours, step 3.
   // FormatNumericMinutes, step 4.
@@ -935,7 +1219,7 @@ static mozilla::intl::NumberFormat* NewNumericFormatter(
   options.mGrouping = mozilla::intl::NumberFormatOptions::Grouping::Never;
 
   // FormatNumericSeconds, steps 11-14.
-  if (unit == temporal::TemporalUnit::Second) {
+  if (unit == TemporalUnit::Second) {
     // FormatNumericSeconds, step 11.
     auto fractionalDigits = GetFractionalDigits(durationFormat);
 
@@ -955,7 +1239,7 @@ static mozilla::intl::NumberFormat* NewNumericFormatter(
 
 static mozilla::intl::NumberFormat* GetOrCreateNumericFormatter(
     JSContext* cx, Handle<DurationFormatObject*> durationFormat,
-    temporal::TemporalUnit unit) {
+    TemporalUnit unit) {
   // Obtain a cached mozilla::intl::NumberFormat object.
   auto* nf = durationFormat->getNumberFormat(unit);
   if (nf) {
@@ -976,9 +1260,7 @@ static mozilla::intl::NumberFormat* GetOrCreateNumericFormatter(
  * NextUnitFractional ( durationFormat, unit )
  */
 static bool NextUnitFractional(const DurationFormatObject* durationFormat,
-                               temporal::TemporalUnit unit) {
-  using namespace temporal;
-
+                               TemporalUnit unit) {
   // Steps 1-3.
   if (TemporalUnit::Second <= unit && unit <= TemporalUnit::Microsecond) {
     auto* options = durationFormat->getOptions();
@@ -988,7 +1270,7 @@ static bool NextUnitFractional(const DurationFormatObject* durationFormat,
 
     auto nextUnit =
         static_cast<TemporalUnit>(static_cast<TemporalUnitType>(unit) + 1);
-    auto nextStyle = GetUnitOptions(*options, nextUnit).style();
+    auto nextStyle = GetUnitOptions(*options, nextUnit).style;
     return nextStyle == DurationStyle::Numeric;
   }
 
@@ -1001,7 +1283,7 @@ static bool NextUnitFractional(const DurationFormatObject* durationFormat,
  */
 static mozilla::intl::NumberFormat* NewNumberFormat(
     JSContext* cx, Handle<DurationFormatObject*> durationFormat,
-    temporal::TemporalUnit unit, DurationStyle style) {
+    TemporalUnit unit, DurationStyle style) {
   // Step 4.h.i.
   mozilla::intl::NumberFormatOptions options{};
 
@@ -1017,7 +1299,8 @@ static mozilla::intl::NumberFormat* NewNumberFormat(
   }
 
   // Steps 4.h.iii.4-6.
-  options.mUnit = mozilla::Some(std::pair{UnitName(unit), UnitDisplay(style)});
+  options.mUnit =
+      mozilla::Some(std::pair{SingularUnitName(unit), UnitDisplay(style)});
 
   // Step 4.h.iii.7.
   return NewDurationNumberFormat(cx, durationFormat, options);
@@ -1025,14 +1308,13 @@ static mozilla::intl::NumberFormat* NewNumberFormat(
 
 static mozilla::intl::NumberFormat* GetOrCreateNumberFormat(
     JSContext* cx, Handle<DurationFormatObject*> durationFormat,
-    temporal::TemporalUnit unit, DurationStyle style) {
+    TemporalUnit unit, DurationStyle style) {
   // Obtain a cached mozilla::intl::NumberFormat object.
-  auto* nf = durationFormat->getNumberFormat(unit);
-  if (nf) {
+  if (auto* nf = durationFormat->getNumberFormat(unit)) {
     return nf;
   }
 
-  nf = NewNumberFormat(cx, durationFormat, unit, style);
+  auto* nf = NewNumberFormat(cx, durationFormat, unit, style);
   if (!nf) {
     return nullptr;
   }
@@ -1054,7 +1336,7 @@ static JSLinearString* FormatDurationValueToString(
 static ArrayObject* FormatDurationValueToParts(JSContext* cx,
                                                mozilla::intl::NumberFormat* nf,
                                                const DurationValue& value,
-                                               temporal::TemporalUnit unit) {
+                                               TemporalUnit unit) {
   if (value.isDecimal()) {
     return FormatNumberToParts(cx, nf, std::string_view{value},
                                PartUnitName(unit));
@@ -1063,8 +1345,8 @@ static ArrayObject* FormatDurationValueToParts(JSContext* cx,
 }
 
 static bool FormatDurationValue(JSContext* cx, mozilla::intl::NumberFormat* nf,
-                                temporal::TemporalUnit unit,
-                                const DurationValue& value, bool formatToParts,
+                                TemporalUnit unit, const DurationValue& value,
+                                bool formatToParts,
                                 MutableHandle<Value> result) {
   if (!formatToParts) {
     auto* str = FormatDurationValueToString(cx, nf, value);
@@ -1093,10 +1375,9 @@ static bool FormatDurationValue(JSContext* cx, mozilla::intl::NumberFormat* nf,
  */
 static bool FormatNumericHoursOrMinutesOrSeconds(
     JSContext* cx, Handle<DurationFormatObject*> durationFormat,
-    temporal::TemporalUnit unit, const DurationValue& value, bool formatToParts,
+    TemporalUnit unit, const DurationValue& value, bool formatToParts,
     MutableHandle<Value> result) {
-  MOZ_ASSERT(temporal::TemporalUnit::Hour <= unit &&
-             unit <= temporal::TemporalUnit::Second);
+  MOZ_ASSERT(TemporalUnit::Hour <= unit && unit <= TemporalUnit::Second);
 
   // FormatNumericHours, steps 1-10.
   // FormatNumericMinutes, steps 1-11.
@@ -1133,11 +1414,9 @@ static PlainObject* NewLiteralPart(JSContext* cx, JSString* value) {
 static bool FormatNumericUnits(JSContext* cx,
                                Handle<DurationFormatObject*> durationFormat,
                                const temporal::Duration& duration,
-                               temporal::TemporalUnit firstNumericUnit,
+                               TemporalUnit firstNumericUnit,
                                bool signDisplayed, bool formatToParts,
                                MutableHandle<Value> result) {
-  using namespace temporal;
-
   auto* options = durationFormat->getOptions();
   MOZ_ASSERT(options, "unexpected unresolved duration format options");
 
@@ -1158,21 +1437,19 @@ static bool FormatNumericUnits(JSContext* cx,
   auto hoursValue = DurationValue{duration.hours};
 
   // Step 4.
-  auto hoursDisplay = GetUnitOptions(*options, TemporalUnit::Hour).display();
+  auto hoursDisplay = GetUnitOptions(*options, TemporalUnit::Hour).display;
 
   // Step 5.
   auto minutesValue = DurationValue{duration.minutes};
 
   // Step 6.
-  auto minutesDisplay =
-      GetUnitOptions(*options, TemporalUnit::Minute).display();
+  auto minutesDisplay = GetUnitOptions(*options, TemporalUnit::Minute).display;
 
   // Step 7-8.
   auto secondsValue = ComputeFractionalDigits(duration, TemporalUnit::Second);
 
   // Step 9.
-  auto secondsDisplay =
-      GetUnitOptions(*options, TemporalUnit::Second).display();
+  auto secondsDisplay = GetUnitOptions(*options, TemporalUnit::Second).display;
 
   // Step 10.
   bool hoursFormatted = false;
@@ -1353,47 +1630,41 @@ static bool FormatNumericUnits(JSContext* cx,
   return true;
 }
 
+static auto ToListFormatStyle(DurationBaseStyle style) {
+#ifndef USING_ENUM
+  using enum mozilla::intl::ListFormat::Style;
+#else
+  USING_ENUM(mozilla::intl::ListFormat::Style, Long, Short, Narrow);
+#endif
+  switch (style) {
+    case DurationBaseStyle::Long:
+      return Long;
+    case DurationBaseStyle::Short:
+      return Short;
+    case DurationBaseStyle::Narrow:
+      return Narrow;
+    case DurationBaseStyle::Digital:
+      return Short;
+  }
+  MOZ_CRASH("invalid duration format base style");
+}
+
 static mozilla::intl::ListFormat* NewDurationListFormat(
     JSContext* cx, Handle<DurationFormatObject*> durationFormat) {
-  Rooted<JSObject*> internals(cx, GetInternalsObject(cx, durationFormat));
-  if (!internals) {
-    return nullptr;
-  }
-
-  Rooted<Value> value(cx);
-  if (!GetProperty(cx, internals, internals, cx->names().locale, &value)) {
+  if (!ResolveLocale(cx, durationFormat)) {
     return nullptr;
   }
+  auto dfOptions = *durationFormat->getOptions();
 
-  UniqueChars locale = EncodeLocale(cx, value.toString());
+  auto locale = EncodeLocale(cx, durationFormat->getLocale());
   if (!locale) {
     return nullptr;
   }
 
-  mozilla::intl::ListFormat::Options options;
-  options.mType = mozilla::intl::ListFormat::Type::Unit;
-
-  if (!GetProperty(cx, internals, internals, cx->names().style, &value)) {
-    return nullptr;
-  }
-  {
-    auto* linear = value.toString()->ensureLinear(cx);
-    if (!linear) {
-      return nullptr;
-    }
-
-    using ListFormatStyle = mozilla::intl::ListFormat::Style;
-    if (StringEqualsLiteral(linear, "long")) {
-      options.mStyle = ListFormatStyle::Long;
-    } else if (StringEqualsLiteral(linear, "short")) {
-      options.mStyle = ListFormatStyle::Short;
-    } else if (StringEqualsLiteral(linear, "narrow")) {
-      options.mStyle = ListFormatStyle::Narrow;
-    } else {
-      MOZ_ASSERT(StringEqualsLiteral(linear, "digital"));
-      options.mStyle = ListFormatStyle::Short;
-    }
-  }
+  mozilla::intl::ListFormat::Options options = {
+      .mType = mozilla::intl::ListFormat::Type::Unit,
+      .mStyle = ToListFormatStyle(dfOptions.style),
+  };
 
   auto result = mozilla::intl::ListFormat::TryCreate(
       mozilla::MakeStringSpan(locale.get()), options);
@@ -1407,12 +1678,11 @@ static mozilla::intl::ListFormat* NewDurationListFormat(
 static mozilla::intl::ListFormat* GetOrCreateListFormat(
     JSContext* cx, Handle<DurationFormatObject*> durationFormat) {
   // Obtain a cached mozilla::intl::ListFormat object.
-  auto* lf = durationFormat->getListFormat();
-  if (lf) {
+  if (auto* lf = durationFormat->getListFormat()) {
     return lf;
   }
 
-  lf = NewDurationListFormat(cx, durationFormat);
+  auto* lf = NewDurationListFormat(cx, durationFormat);
   if (!lf) {
     return nullptr;
   }
@@ -1623,9 +1893,7 @@ static bool PartitionDurationFormatPattern(
     JSContext* cx, Handle<DurationFormatObject*> durationFormat,
     Handle<Value> durationLike, bool formatToParts,
     MutableHandle<Value> result) {
-  using namespace temporal;
-
-  Duration duration;
+  temporal::Duration duration;
   if (!ToTemporalDuration(cx, durationLike, &duration)) {
     return false;
   }
@@ -1645,10 +1913,7 @@ static bool PartitionDurationFormatPattern(
   static_assert(durationUnits.size() == FormattedDurationValueVectorCapacity,
                 "inline stack capacity large enough for all duration units");
 
-  auto* options = GetOrCreateDurationFormatOptions(cx, durationFormat);
-  if (!options) {
-    return false;
-  }
+  auto options = *durationFormat->getOptions();
 
   Rooted<Value> formattedValue(cx);
 
@@ -1673,13 +1938,13 @@ static bool PartitionDurationFormatPattern(
     // Step 4.a. (Moved below)
 
     // Step 4.b.
-    auto unitOptions = GetUnitOptions(*options, unit);
+    auto unitOptions = GetUnitOptions(options, unit);
 
     // Step 4.c.
-    auto style = unitOptions.style();
+    auto style = unitOptions.style;
 
     // Step 4.d.
-    auto display = unitOptions.display();
+    auto display = unitOptions.display;
 
     // Steps 4.e-f. (Not applicable in our implementation.)
 
@@ -1756,7 +2021,7 @@ static bool PartitionDurationFormatPattern(
                          result);
 }
 
-static bool IsDurationFormat(HandleValue v) {
+static bool IsDurationFormat(Handle<JS::Value> v) {
   return v.isObject() && v.toObject().is<DurationFormatObject>();
 }
 
@@ -1800,6 +2065,93 @@ static bool durationFormat_formatToParts(JSContext* cx, unsigned argc,
       cx, args);
 }
 
+/**
+ * Intl.DurationFormat.prototype.resolvedOptions ( )
+ */
+static bool durationFormat_resolvedOptions(JSContext* cx,
+                                           const JS::CallArgs& args) {
+  Rooted<DurationFormatObject*> durationFormat(
+      cx, &args.thisv().toObject().as<DurationFormatObject>());
+
+  if (!ResolveLocale(cx, durationFormat)) {
+    return false;
+  }
+  auto dfOptions = *durationFormat->getOptions();
+
+  // Step 3.
+  Rooted<IdValueVector> options(cx, cx);
+
+  // Step 4.
+  if (!options.emplaceBack(NameToId(cx->names().locale),
+                           StringValue(durationFormat->getLocale()))) {
+    return false;
+  }
+
+  if (!options.emplaceBack(NameToId(cx->names().numberingSystem),
+                           StringValue(durationFormat->getNumberingSystem()))) {
+    return false;
+  }
+
+  auto* style = NewStringCopy<CanGC>(cx, BaseStyleToString(dfOptions.style));
+  if (!style) {
+    return false;
+  }
+  if (!options.emplaceBack(NameToId(cx->names().style), StringValue(style))) {
+    return false;
+  }
+
+  for (auto unit : durationUnits) {
+    auto unitOptions = GetUnitOptions(dfOptions, unit);
+
+    auto* style =
+        NewStringCopy<CanGC>(cx, DurationStyleToString(unitOptions.style));
+    if (!style) {
+      return false;
+    }
+    if (!options.emplaceBack(NameToId(DurationStyleName(unit, cx)),
+                             StringValue(style))) {
+      return false;
+    }
+
+    auto* display =
+        NewStringCopy<CanGC>(cx, DisplayToString(unitOptions.display));
+    if (!display) {
+      return false;
+    }
+    if (!options.emplaceBack(NameToId(DurationDisplayName(unit, cx)),
+                             StringValue(display))) {
+      return false;
+    }
+  }
+
+  if (dfOptions.fractionalDigits >= 0) {
+    MOZ_ASSERT(dfOptions.fractionalDigits <= 9);
+    if (!options.emplaceBack(NameToId(cx->names().fractionalDigits),
+                             Int32Value(dfOptions.fractionalDigits))) {
+      return false;
+    }
+  }
+
+  // Step 5.
+  auto* result = NewPlainObjectWithUniqueNames(cx, options);
+  if (!result) {
+    return false;
+  }
+  args.rval().setObject(*result);
+  return true;
+}
+
+/**
+ * Intl.DurationFormat.prototype.resolvedOptions ( )
+ */
+static bool durationFormat_resolvedOptions(JSContext* cx, unsigned argc,
+                                           Value* vp) {
+  // Steps 1-2.
+  CallArgs args = CallArgsFromVp(argc, vp);
+  return CallNonGenericMethod<IsDurationFormat, durationFormat_resolvedOptions>(
+      cx, args);
+}
+
 /**
  * Intl.DurationFormat.supportedLocalesOf ( locales [ , options ] )
  */
@@ -1828,9 +2180,7 @@ bool js::TemporalDurationToLocaleString(JSContext* cx,
     return false;
   }
 
-  if (!intl::InitializeObject(cx, durationFormat,
-                              cx->names().InitializeDurationFormat, args.get(0),
-                              args.get(1))) {
+  if (!InitializeDurationFormat(cx, durationFormat, args)) {
     return false;
   }
 
diff --git a/js/src/builtin/intl/DurationFormat.h b/js/src/builtin/intl/DurationFormat.h
index d287299302f96..fbe0ae54a77ce 100644
--- a/js/src/builtin/intl/DurationFormat.h
+++ b/js/src/builtin/intl/DurationFormat.h
@@ -9,10 +9,10 @@
 
 #include <stdint.h>
 
-#include "builtin/SelfHostingDefines.h"
 #include "builtin/temporal/TemporalUnit.h"
 #include "js/Class.h"
 #include "vm/NativeObject.h"
+#include "vm/StringType.h"
 
 namespace mozilla::intl {
 class ListFormat;
@@ -24,15 +24,13 @@ namespace js {
 namespace intl {
 enum class DurationDisplay : uint8_t { Auto, Always };
 enum class DurationStyle : uint8_t { Long, Short, Narrow, Numeric, TwoDigit };
+enum class DurationBaseStyle : uint8_t { Long, Short, Narrow, Digital };
 
 struct DurationFormatOptions {
-  // Packed representation to keep the unit options as small as possible.
-  //
-  // Use |uint8_t| instead of the actual enum type to avoid GCC warnings:
-  // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61414
-#define DECLARE_DURATION_UNIT(name)                \
-  /* DurationDisplay */ uint8_t name##Display : 1; \
-  /* DurationStyle */ uint8_t name##Style : 3;
+// Packed representation to keep the unit options as small as possible.
+#define DECLARE_DURATION_UNIT(name)                          \
+  DurationDisplay name##Display : 1 = DurationDisplay::Auto; \
+  DurationStyle name##Style : 3 = DurationStyle::Short;
 
   DECLARE_DURATION_UNIT(years);
   DECLARE_DURATION_UNIT(months);
@@ -47,17 +45,14 @@ struct DurationFormatOptions {
 
 #undef DECLARE_DURATION_UNIT
 
-  int8_t fractionalDigits;
+  DurationBaseStyle style = DurationBaseStyle::Short;
+  int8_t fractionalDigits = -1;
 };
 
 struct DurationUnitOptions {
   // Use the same bit-widths for fast extraction from DurationFormatOptions.
-  /* DurationDisplay */ uint8_t display_ : 1;
-  /* DurationStyle */ uint8_t style_ : 3;
-
-  auto display() const { return static_cast<DurationDisplay>(display_); }
-
-  auto style() const { return static_cast<DurationStyle>(style_); }
+  DurationDisplay display : 1;
+  DurationStyle style : 3;
 };
 
 }  // namespace intl
@@ -67,8 +62,8 @@ class DurationFormatObject : public NativeObject {
   static const JSClass class_;
   static const JSClass& protoClass_;
 
-  static constexpr uint32_t INTERNALS_SLOT = 0;
-  static constexpr uint32_t LIST_FORMAT_SLOT = 1;
+  static constexpr uint32_t LOCALE_SLOT = 0;
+  static constexpr uint32_t NUMBERING_SYSTEM = 1;
   static constexpr uint32_t NUMBER_FORMAT_YEARS_SLOT = 2;
   static constexpr uint32_t NUMBER_FORMAT_MONTHS_SLOT = 3;
   static constexpr uint32_t NUMBER_FORMAT_WEEKS_SLOT = 4;
@@ -79,13 +74,10 @@ class DurationFormatObject : public NativeObject {
   static constexpr uint32_t NUMBER_FORMAT_MILLISECONDS_SLOT = 9;
   static constexpr uint32_t NUMBER_FORMAT_MICROSECONDS_SLOT = 10;
   static constexpr uint32_t NUMBER_FORMAT_NANOSECONDS_SLOT = 11;
-  static constexpr uint32_t OPTIONS_SLOT = 12;
-  static constexpr uint32_t TIME_SEPARATOR_SLOT = 13;
-  static constexpr uint32_t SLOT_COUNT = 14;
-
-  static_assert(INTERNALS_SLOT == INTL_INTERNALS_OBJECT_SLOT,
-                "INTERNALS_SLOT must match self-hosting define for internals "
-                "object slot");
+  static constexpr uint32_t LIST_FORMAT_SLOT = 12;
+  static constexpr uint32_t OPTIONS_SLOT = 13;
+  static constexpr uint32_t TIME_SEPARATOR_SLOT = 14;
+  static constexpr uint32_t SLOT_COUNT = 15;
 
  private:
   static constexpr uint32_t numberFormatSlot(temporal::TemporalUnit unit) {
@@ -101,30 +93,42 @@ class DurationFormatObject : public NativeObject {
   }
 
  public:
-  mozilla::intl::NumberFormat* getNumberFormat(
-      temporal::TemporalUnit unit) const {
-    const auto& slot = getFixedSlot(numberFormatSlot(unit));
+  bool isLocaleResolved() const { return getFixedSlot(LOCALE_SLOT).isString(); }
+
+  JSObject* getRequestedLocales() const {
+    const auto& slot = getFixedSlot(LOCALE_SLOT);
     if (slot.isUndefined()) {
       return nullptr;
     }
-    return static_cast<mozilla::intl::NumberFormat*>(slot.toPrivate());
+    return &slot.toObject();
   }
 
-  void setNumberFormat(temporal::TemporalUnit unit,
-                       mozilla::intl::NumberFormat* numberFormat) {
-    setFixedSlot(numberFormatSlot(unit), PrivateValue(numberFormat));
+  void setRequestedLocales(JSObject* requestedLocales) {
+    setFixedSlot(LOCALE_SLOT, JS::ObjectValue(*requestedLocales));
   }
 
-  mozilla::intl::ListFormat* getListFormat() const {
-    const auto& slot = getFixedSlot(LIST_FORMAT_SLOT);
+  JSLinearString* getLocale() const {
+    const auto& slot = getFixedSlot(LOCALE_SLOT);
     if (slot.isUndefined()) {
       return nullptr;
     }
-    return static_cast<mozilla::intl::ListFormat*>(slot.toPrivate());
+    return &slot.toString()->asLinear();
   }
 
-  void setListFormat(mozilla::intl::ListFormat* listFormat) {
-    setFixedSlot(LIST_FORMAT_SLOT, PrivateValue(listFormat));
+  void setLocale(JSLinearString* locale) {
+    setFixedSlot(LOCALE_SLOT, JS::StringValue(locale));
+  }
+
+  JSLinearString* getNumberingSystem() const {
+    const auto& slot = getFixedSlot(NUMBERING_SYSTEM);
+    if (slot.isUndefined()) {
+      return nullptr;
+    }
+    return &slot.toString()->asLinear();
+  }
+
+  void setNumberingSystem(JSLinearString* numberingSystem) {
+    setFixedSlot(NUMBERING_SYSTEM, JS::StringValue(numberingSystem));
   }
 
   intl::DurationFormatOptions* getOptions() const {
@@ -136,7 +140,33 @@ class DurationFormatObject : public NativeObject {
   }
 
   void setOptions(intl::DurationFormatOptions* options) {
-    setFixedSlot(OPTIONS_SLOT, PrivateValue(options));
+    setFixedSlot(OPTIONS_SLOT, JS::PrivateValue(options));
+  }
+
+  mozilla::intl::NumberFormat* getNumberFormat(
+      temporal::TemporalUnit unit) const {
+    const auto& slot = getFixedSlot(numberFormatSlot(unit));
+    if (slot.isUndefined()) {
+      return nullptr;
+    }
+    return static_cast<mozilla::intl::NumberFormat*>(slot.toPrivate());
+  }
+
+  void setNumberFormat(temporal::TemporalUnit unit,
+                       mozilla::intl::NumberFormat* numberFormat) {
+    setFixedSlot(numberFormatSlot(unit), JS::PrivateValue(numberFormat));
+  }
+
+  mozilla::intl::ListFormat* getListFormat() const {
+    const auto& slot = getFixedSlot(LIST_FORMAT_SLOT);
+    if (slot.isUndefined()) {
+      return nullptr;
+    }
+    return static_cast<mozilla::intl::ListFormat*>(slot.toPrivate());
+  }
+
+  void setListFormat(mozilla::intl::ListFormat* listFormat) {
+    setFixedSlot(LIST_FORMAT_SLOT, JS::PrivateValue(listFormat));
   }
 
   JSString* getTimeSeparator() const {
@@ -148,7 +178,7 @@ class DurationFormatObject : public NativeObject {
   }
 
   void setTimeSeparator(JSString* timeSeparator) {
-    setFixedSlot(TIME_SEPARATOR_SLOT, StringValue(timeSeparator));
+    setFixedSlot(TIME_SEPARATOR_SLOT, JS::StringValue(timeSeparator));
   }
 
  private:

From 161968231671738aa1360c62d3d1dc43a13300d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bargull?= <andre.bargull@gmail.com>
Date: Thu, 29 Jan 2026 07:42:55 +0000
Subject: [PATCH 006/116] Bug 2010221 - Part 2: Remove no longer used
 self-hosting code for Intl.DurationFormat. r=spidermonkey-reviewers,mgaudet

Differential Revision: https://phabricator.services.mozilla.com/D279037
---
 js/src/builtin/intl/CommonFunctions.js |   7 -
 js/src/builtin/intl/DurationFormat.js  | 556 -------------------------
 js/src/builtin/moz.build               |   1 -
 js/src/jit/CacheIR.cpp                 |   1 -
 js/src/jit/InlinableNatives.cpp        |   4 -
 js/src/jit/InlinableNatives.h          |   1 -
 js/src/vm/SelfHosting.cpp              |   6 -
 7 files changed, 576 deletions(-)
 delete mode 100644 js/src/builtin/intl/DurationFormat.js

diff --git a/js/src/builtin/intl/CommonFunctions.js b/js/src/builtin/intl/CommonFunctions.js
index 5c168be6a9a07..874560a4efc8b 100644
--- a/js/src/builtin/intl/CommonFunctions.js
+++ b/js/src/builtin/intl/CommonFunctions.js
@@ -259,7 +259,6 @@ function initializeIntlObject(obj, type, lazyData) {
   assert(IsObject(obj), "Non-object passed to initializeIntlObject");
   assert(
     (type === "DateTimeFormat" && intl_GuardToDateTimeFormat(obj) !== null) ||
-      (type === "DurationFormat" && intl_GuardToDurationFormat(obj) !== null) ||
       (type === "NumberFormat" && intl_GuardToNumberFormat(obj) !== null) ||
       (type === "PluralRules" && intl_GuardToPluralRules(obj) !== null),
     "type must match the object's class"
@@ -271,7 +270,6 @@ function initializeIntlObject(obj, type, lazyData) {
   // The .type property indicates the type of Intl object that |obj| is. It
   // must be one of:
   // - DateTimeFormat
-  // - DurationFormat
   // - NumberFormat
   // - PluralRules
   //
@@ -337,7 +335,6 @@ function getIntlObjectInternals(obj) {
   assert(IsObject(obj), "getIntlObjectInternals called with non-Object");
   assert(
     intl_GuardToDateTimeFormat(obj) !== null ||
-      intl_GuardToDurationFormat(obj) !== null ||
       intl_GuardToNumberFormat(obj) !== null ||
       intl_GuardToPluralRules(obj) !== null,
     "getIntlObjectInternals called with non-Intl object"
@@ -350,8 +347,6 @@ function getIntlObjectInternals(obj) {
   assert(
     (internals.type === "DateTimeFormat" &&
         intl_GuardToDateTimeFormat(obj) !== null) ||
-      (internals.type === "DurationFormat" &&
-        intl_GuardToDurationFormat(obj) !== null) ||
       (internals.type === "NumberFormat" &&
         intl_GuardToNumberFormat(obj) !== null) ||
       (internals.type === "PluralRules" &&
@@ -381,8 +376,6 @@ function getInternals(obj) {
   var type = internals.type;
   if (type === "DateTimeFormat") {
     internalProps = resolveDateTimeFormatInternals(internals.lazyData);
-  } else if (type === "DurationFormat") {
-    internalProps = resolveDurationFormatInternals(internals.lazyData);
   } else if (type === "NumberFormat") {
     internalProps = resolveNumberFormatInternals(internals.lazyData);
   } else if (type === "PluralRules") {
diff --git a/js/src/builtin/intl/DurationFormat.js b/js/src/builtin/intl/DurationFormat.js
deleted file mode 100644
index 3e812b8ca452d..0000000000000
--- a/js/src/builtin/intl/DurationFormat.js
+++ /dev/null
@@ -1,556 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Intl.DurationFormat ( [ locales [ , options ] ] )
- *
- * Compute an internal properties object from |lazyDurationFormatData|.
- */
-function resolveDurationFormatInternals(lazyDurationFormatData) {
-  assert(IsObject(lazyDurationFormatData), "lazy data not an object?");
-
-  var internalProps = std_Object_create(null);
-
-  // Compute effective locale.
-
-  // Step 9.
-  var r = intl_ResolveLocale(
-    "DurationFormat",
-    lazyDurationFormatData.requestedLocales,
-    lazyDurationFormatData.opt,
-  );
-
-  // Steps 10-11.
-  internalProps.locale = r.locale;
-
-  // Steps 12-21. (Not applicable in our implementation.)
-
-  // Step 22.
-  internalProps.numberingSystem = r.nu;
-
-  // Step 24.
-  internalProps.style = lazyDurationFormatData.style;
-
-  // Step 26.
-  internalProps.yearsStyle = lazyDurationFormatData.yearsStyle;
-  internalProps.yearsDisplay = lazyDurationFormatData.yearsDisplay;
-
-  internalProps.weeksStyle = lazyDurationFormatData.weeksStyle;
-  internalProps.weeksDisplay = lazyDurationFormatData.weeksDisplay;
-
-  internalProps.monthsStyle = lazyDurationFormatData.monthsStyle;
-  internalProps.monthsDisplay = lazyDurationFormatData.monthsDisplay;
-
-  internalProps.daysStyle = lazyDurationFormatData.daysStyle;
-  internalProps.daysDisplay = lazyDurationFormatData.daysDisplay;
-
-  internalProps.hoursStyle = lazyDurationFormatData.hoursStyle;
-  internalProps.hoursDisplay = lazyDurationFormatData.hoursDisplay;
-
-  internalProps.minutesStyle = lazyDurationFormatData.minutesStyle;
-  internalProps.minutesDisplay = lazyDurationFormatData.minutesDisplay;
-
-  internalProps.secondsStyle = lazyDurationFormatData.secondsStyle;
-  internalProps.secondsDisplay = lazyDurationFormatData.secondsDisplay;
-
-  internalProps.millisecondsStyle = lazyDurationFormatData.millisecondsStyle;
-  internalProps.millisecondsDisplay =
-    lazyDurationFormatData.millisecondsDisplay;
-
-  internalProps.microsecondsStyle = lazyDurationFormatData.microsecondsStyle;
-  internalProps.microsecondsDisplay =
-    lazyDurationFormatData.microsecondsDisplay;
-
-  internalProps.nanosecondsStyle = lazyDurationFormatData.nanosecondsStyle;
-  internalProps.nanosecondsDisplay = lazyDurationFormatData.nanosecondsDisplay;
-
-  // Step 27.
-  internalProps.fractionalDigits = lazyDurationFormatData.fractionalDigits;
-
-  // The caller is responsible for associating |internalProps| with the right
-  // object using |setInternalProperties|.
-  return internalProps;
-}
-
-/**
- * Returns an object containing the DurationFormat internal properties of |obj|.
- */
-function getDurationFormatInternals(obj) {
-  assert(IsObject(obj), "getDurationFormatInternals called with non-object");
-  assert(
-    intl_GuardToDurationFormat(obj) !== null,
-    "getDurationFormatInternals called with non-DurationFormat"
-  );
-
-  var internals = getIntlObjectInternals(obj);
-  assert(
-    internals.type === "DurationFormat",
-    "bad type escaped getIntlObjectInternals"
-  );
-
-  // If internal properties have already been computed, use them.
-  var internalProps = maybeInternalProperties(internals);
-  if (internalProps) {
-    return internalProps;
-  }
-
-  // Otherwise it's time to fully create them.
-  internalProps = resolveDurationFormatInternals(internals.lazyData);
-  setInternalProperties(internals, internalProps);
-  return internalProps;
-}
-
-/**
- * Intl.DurationFormat ( [ locales [ , options ] ] )
- *
- * Initializes an object as a DurationFormat.
- *
- * This method is complicated a moderate bit by its implementing initialization
- * as a *lazy* concept.  Everything that must happen now, does -- but we defer
- * all the work we can until the object is actually used as a DurationFormat.
- * This later work occurs in |resolveDurationFormatInternals|; steps not noted
- * here occur there.
- */
-function InitializeDurationFormat(durationFormat, locales, options) {
-  assert(
-    IsObject(durationFormat),
-    "InitializeDurationFormat called with non-object"
-  );
-  assert(
-    intl_GuardToDurationFormat(durationFormat) !== null,
-    "InitializeDurationFormat called with non-DurationFormat"
-  );
-
-  // Lazy DurationFormat data has the following structure:
-  //
-  //   {
-  //     requestedLocales: List of locales,
-  //     style: "long" / "short" / "narrow" / "digital",
-  //
-  //     yearsStyle: "long" / "short" / "narrow",
-  //     yearsDisplay: "auto" / "always",
-  //
-  //     monthsStyle: "long" / "short" / "narrow",
-  //     monthsDisplay: "auto" / "always",
-  //
-  //     weeksStyle: "long" / "short" / "narrow",
-  //     weeksDisplay: "auto" / "always",
-  //
-  //     daysStyle: "long" / "short" / "narrow",
-  //     daysDisplay: "auto" / "always",
-  //
-  //     hoursStyle: "long" / "short" / "narrow" / "numeric" / "2-digit",
-  //     hoursDisplay: "auto" / "always",
-  //
-  //     minutesStyle: "long" / "short" / "narrow" / "numeric" / "2-digit",
-  //     minutesDisplay: "auto" / "always",
-  //
-  //     secondsStyle: "long" / "short" / "narrow" / "numeric" / "2-digit",
-  //     secondsDisplay: "auto" / "always",
-  //
-  //     millisecondsStyle: "long" / "short" / "narrow" / "numeric",
-  //     millisecondsDisplay: "auto" / "always",
-  //
-  //     microsecondsStyle: "long" / "short" / "narrow" / "numeric",
-  //     microsecondsDisplay: "auto" / "always",
-  //
-  //     nanosecondsStyle: "long" / "short" / "narrow" / "numeric",
-  //     nanosecondsDisplay: "auto" / "always",
-  //
-  //     fractionalDigits: integer ∈ [0, 9] / undefined,
-  //
-  //     opt: // opt object computed in InitializeDurationFormat
-  //       {
-  //         localeMatcher: "lookup" / "best fit",
-  //
-  //         nu: string matching a Unicode extension type, // optional
-  //       }
-  //   }
-  //
-  // Note that lazy data is only installed as a final step of initialization,
-  // so every DurationFormat lazy data object has *all* these properties,
-  // never a subset of them.
-  var lazyDurationFormatData = std_Object_create(null);
-
-  // Step 3.
-  var requestedLocales = CanonicalizeLocaleList(locales);
-  lazyDurationFormatData.requestedLocales = requestedLocales;
-
-  // Step 4.
-  if (options === undefined) {
-    options = std_Object_create(null);
-  } else if (!IsObject(options)) {
-    ThrowTypeError(
-      JSMSG_OBJECT_REQUIRED,
-      options === null ? "null" : typeof options
-    );
-  }
-
-  // Step 5.
-  var matcher = GetOption(
-    options,
-    "localeMatcher",
-    "string",
-    ["lookup", "best fit"],
-    "best fit"
-  );
-
-  // Step 6.
-  var numberingSystem = GetOption(
-    options,
-    "numberingSystem",
-    "string",
-    undefined,
-    undefined
-  );
-
-  // Step 7.
-  if (numberingSystem !== undefined) {
-    numberingSystem = intl_ValidateAndCanonicalizeUnicodeExtensionType(
-      numberingSystem,
-      "numberingSystem",
-      "nu"
-    );
-  }
-
-  // Step 8.
-  var opt = NEW_RECORD();
-  opt.localeMatcher = matcher;
-  opt.nu = numberingSystem;
-
-  lazyDurationFormatData.opt = opt;
-
-  // Compute formatting options.
-
-  // Steps 23-24.
-  var style = GetOption(
-    options,
-    "style",
-    "string",
-    ["long", "short", "narrow", "digital"],
-    "short"
-  );
-  lazyDurationFormatData.style = style;
-
-  // Step 25. (Not applicable in our implementation)
-
-  // Step 26, unit = "years".
-  var yearsOptions = GetDurationUnitOptions(
-    "years",
-    options,
-    style,
-    ["long", "short", "narrow"],
-    "short",
-    /* prevStyle= */ ""
-  );
-  lazyDurationFormatData.yearsStyle = yearsOptions.style;
-  lazyDurationFormatData.yearsDisplay = yearsOptions.display;
-
-  // Step 26, unit = "months".
-  var monthsOptions = GetDurationUnitOptions(
-    "months",
-    options,
-    style,
-    ["long", "short", "narrow"],
-    "short",
-    /* prevStyle= */ ""
-  );
-  lazyDurationFormatData.monthsStyle = monthsOptions.style;
-  lazyDurationFormatData.monthsDisplay = monthsOptions.display;
-
-  // Step 26, unit = "weeks".
-  var weeksOptions = GetDurationUnitOptions(
-    "weeks",
-    options,
-    style,
-    ["long", "short", "narrow"],
-    "short",
-    /* prevStyle= */ ""
-  );
-  lazyDurationFormatData.weeksStyle = weeksOptions.style;
-  lazyDurationFormatData.weeksDisplay = weeksOptions.display;
-
-  // Step 26, unit = "days".
-  var daysOptions = GetDurationUnitOptions(
-    "days",
-    options,
-    style,
-    ["long", "short", "narrow"],
-    "short",
-    /* prevStyle= */ ""
-  );
-  lazyDurationFormatData.daysStyle = daysOptions.style;
-  lazyDurationFormatData.daysDisplay = daysOptions.display;
-
-  // Step 26, unit = "hours".
-  var hoursOptions = GetDurationUnitOptions(
-    "hours",
-    options,
-    style,
-    ["long", "short", "narrow", "numeric", "2-digit"],
-    "numeric",
-    /* prevStyle= */ ""
-  );
-  lazyDurationFormatData.hoursStyle = hoursOptions.style;
-  lazyDurationFormatData.hoursDisplay = hoursOptions.display;
-
-  // Step 26, unit = "minutes".
-  var minutesOptions = GetDurationUnitOptions(
-    "minutes",
-    options,
-    style,
-    ["long", "short", "narrow", "numeric", "2-digit"],
-    "numeric",
-    hoursOptions.style
-  );
-  lazyDurationFormatData.minutesStyle = minutesOptions.style;
-  lazyDurationFormatData.minutesDisplay = minutesOptions.display;
-
-  // Step 26, unit = "seconds".
-  var secondsOptions = GetDurationUnitOptions(
-    "seconds",
-    options,
-    style,
-    ["long", "short", "narrow", "numeric", "2-digit"],
-    "numeric",
-    minutesOptions.style
-  );
-  lazyDurationFormatData.secondsStyle = secondsOptions.style;
-  lazyDurationFormatData.secondsDisplay = secondsOptions.display;
-
-  // Step 26, unit = "milliseconds".
-  var millisecondsOptions = GetDurationUnitOptions(
-    "milliseconds",
-    options,
-    style,
-    ["long", "short", "narrow", "numeric"],
-    "numeric",
-    secondsOptions.style
-  );
-  lazyDurationFormatData.millisecondsStyle = millisecondsOptions.style;
-  lazyDurationFormatData.millisecondsDisplay = millisecondsOptions.display;
-
-  // Step 26, unit = "microseconds".
-  var microsecondsOptions = GetDurationUnitOptions(
-    "microseconds",
-    options,
-    style,
-    ["long", "short", "narrow", "numeric"],
-    "numeric",
-    millisecondsOptions.style
-  );
-  lazyDurationFormatData.microsecondsStyle = microsecondsOptions.style;
-  lazyDurationFormatData.microsecondsDisplay = microsecondsOptions.display;
-
-  // Step 26, unit = "milliseconds".
-  var nanosecondsOptions = GetDurationUnitOptions(
-    "nanoseconds",
-    options,
-    style,
-    ["long", "short", "narrow", "numeric"],
-    "numeric",
-    microsecondsOptions.style
-  );
-  lazyDurationFormatData.nanosecondsStyle = nanosecondsOptions.style;
-  lazyDurationFormatData.nanosecondsDisplay = nanosecondsOptions.display;
-
-  // Step 27.
-  lazyDurationFormatData.fractionalDigits = GetNumberOption(
-    options,
-    "fractionalDigits",
-    0,
-    9,
-    undefined
-  );
-
-  // We've done everything that must be done now: mark the lazy data as fully
-  // computed and install it.
-  initializeIntlObject(
-    durationFormat,
-    "DurationFormat",
-    lazyDurationFormatData
-  );
-}
-
-/**
- * GetDurationUnitOptions ( unit, options, baseStyle, stylesList, digitalBase, prevStyle, twoDigitHours )
- */
-function GetDurationUnitOptions(
-  unit,
-  options,
-  baseStyle,
-  stylesList,
-  digitalBase,
-  prevStyle
-) {
-  assert(typeof unit === "string", "unit is a string");
-  assert(IsObject(options), "options is an object");
-  assert(typeof baseStyle === "string", "baseStyle is a string");
-  assert(IsArray(stylesList), "stylesList is an array");
-  assert(typeof digitalBase === "string", "digitalBase is a string");
-  assert(typeof prevStyle === "string", "prevStyle is a string");
-
-  // Step 1.
-  var styleOption = GetOption(options, unit, "string", stylesList, undefined);
-
-  var style = styleOption;
-
-  // Step 2.
-  var displayDefault = "always";
-
-  // Step 3.
-  if (style === undefined) {
-    // Steps 3.a-b.
-    if (baseStyle === "digital") {
-      // Step 3.a.i.
-      if (unit !== "hours" && unit !== "minutes" && unit !== "seconds") {
-        displayDefault = "auto";
-      }
-
-      // Step 3.a.ii.
-      style = digitalBase;
-    } else {
-      // Steps 3.b.i-ii. ("fractional" handled implicitly)
-      if (prevStyle === "numeric" || prevStyle === "2-digit") {
-        // Step 3.b.i.1.
-        if (unit !== "minutes" && unit !== "seconds") {
-          // Step 3.b.i.1.a.
-          displayDefault = "auto";
-        }
-
-        // Step 3.b.i.2.
-        style = "numeric";
-      } else {
-        // Step 3.b.ii.1.
-        displayDefault = "auto";
-
-        // Step 3.b.ii.2.
-        style = baseStyle;
-      }
-    }
-  }
-
-  // Step 4.
-  var isFractional =
-    style === "numeric" &&
-    (unit === "milliseconds" ||
-      unit === "microseconds" ||
-      unit === "nanoseconds");
-  if (isFractional) {
-    // Step 4.a.i. (Not applicable in our implementation)
-
-    // Step 4.a.ii.
-    displayDefault = "auto";
-  }
-
-  // Step 5.
-  var displayField = unit + "Display";
-
-  // Step 6.
-  var displayOption = GetOption(
-    options,
-    displayField,
-    "string",
-    ["auto", "always"],
-    undefined
-  );
-
-  var display = displayOption ?? displayDefault;
-
-  // Step 7.
-  if (display === "always" && isFractional) {
-    assert(
-      styleOption !== undefined || displayOption !== undefined,
-      "no error is thrown when both 'style' and 'display' are absent"
-    );
-
-    ThrowRangeError(
-      // eslint-disable-next-line no-nested-ternary
-      styleOption !== undefined && displayOption !== undefined
-        ? JSMSG_INTL_DURATION_INVALID_DISPLAY_OPTION
-        : displayOption !== undefined
-        ? JSMSG_INTL_DURATION_INVALID_DISPLAY_OPTION_DEFAULT_STYLE
-        : JSMSG_INTL_DURATION_INVALID_DISPLAY_OPTION_DEFAULT_DISPLAY,
-      unit
-    );
-  }
-
-  // Steps 8-9.
-  if (prevStyle === "numeric" || prevStyle === "2-digit") {
-    // Step 8.a. and 9.a.
-    if (style !== "numeric" && style !== "2-digit") {
-      ThrowRangeError(
-        JSMSG_INTL_DURATION_INVALID_NON_NUMERIC_OPTION,
-        unit,
-        `"${style}"`
-      );
-    }
-
-    // Step 9.b.
-    else if (unit === "minutes" || unit === "seconds") {
-      style = "2-digit";
-    }
-  }
-
-  // Step 10. (Our implementation doesn't use |twoDigitHours|.)
-
-  // Step 11.
-  return { style, display };
-}
-
-/**
- * Returns the resolved options for a DurationFormat object.
- */
-function Intl_DurationFormat_resolvedOptions() {
-  // Step 1.
-  var durationFormat = this;
-
-  // Step 2.
-  if (
-    !IsObject(durationFormat) ||
-    (durationFormat = intl_GuardToDurationFormat(durationFormat)) === null
-  ) {
-    return callFunction(
-      intl_CallDurationFormatMethodIfWrapped,
-      this,
-      "Intl_DurationFormat_resolvedOptions"
-    );
-  }
-
-  var internals = getDurationFormatInternals(durationFormat);
-
-  // Steps 3-4.
-  var result = {
-    locale: internals.locale,
-    numberingSystem: internals.numberingSystem,
-    style: internals.style,
-    years: internals.yearsStyle,
-    yearsDisplay: internals.yearsDisplay,
-    months: internals.monthsStyle,
-    monthsDisplay: internals.monthsDisplay,
-    weeks: internals.weeksStyle,
-    weeksDisplay: internals.weeksDisplay,
-    days: internals.daysStyle,
-    daysDisplay: internals.daysDisplay,
-    hours: internals.hoursStyle,
-    hoursDisplay: internals.hoursDisplay,
-    minutes: internals.minutesStyle,
-    minutesDisplay: internals.minutesDisplay,
-    seconds: internals.secondsStyle,
-    secondsDisplay: internals.secondsDisplay,
-    milliseconds: internals.millisecondsStyle,
-    millisecondsDisplay: internals.millisecondsDisplay,
-    microseconds: internals.microsecondsStyle,
-    microsecondsDisplay: internals.microsecondsDisplay,
-    nanoseconds: internals.nanosecondsStyle,
-    nanosecondsDisplay: internals.nanosecondsDisplay,
-  };
-
-  if (internals.fractionalDigits !== undefined) {
-    DefineDataProperty(result, "fractionalDigits", internals.fractionalDigits);
-  }
-
-  // Step 5.
-  return result;
-}
diff --git a/js/src/builtin/moz.build b/js/src/builtin/moz.build
index abde0f665c6e5..04d55984f44f5 100644
--- a/js/src/builtin/moz.build
+++ b/js/src/builtin/moz.build
@@ -92,7 +92,6 @@ selfhosted_inputs = [
         "intl/CommonFunctions.js",
         "intl/CurrencyDataGenerated.js",
         "intl/DateTimeFormat.js",
-        "intl/DurationFormat.js",
         "intl/NumberFormat.js",
         "intl/PluralRules.js",
         "intl/SanctionedSimpleUnitIdentifiersGenerated.js",
diff --git a/js/src/jit/CacheIR.cpp b/js/src/jit/CacheIR.cpp
index 51e37bca65f9f..cb63f93265e6c 100644
--- a/js/src/jit/CacheIR.cpp
+++ b/js/src/jit/CacheIR.cpp
@@ -13181,7 +13181,6 @@ AttachDecision InlinableNativeIRGenerator::tryAttachStub() {
 
     // Intl natives.
     case InlinableNative::IntlGuardToDateTimeFormat:
-    case InlinableNative::IntlGuardToDurationFormat:
     case InlinableNative::IntlGuardToNumberFormat:
     case InlinableNative::IntlGuardToPluralRules:
     case InlinableNative::IntlGuardToSegments:
diff --git a/js/src/jit/InlinableNatives.cpp b/js/src/jit/InlinableNatives.cpp
index 869f8fe12474e..ad723f3507ec4 100644
--- a/js/src/jit/InlinableNatives.cpp
+++ b/js/src/jit/InlinableNatives.cpp
@@ -8,7 +8,6 @@
 
 #ifdef JS_HAS_INTL_API
 #  include "builtin/intl/DateTimeFormat.h"
-#  include "builtin/intl/DurationFormat.h"
 #  include "builtin/intl/NumberFormat.h"
 #  include "builtin/intl/PluralRules.h"
 #  include "builtin/intl/Segmenter.h"
@@ -42,8 +41,6 @@ const JSClass* js::jit::InlinableNativeGuardToClass(InlinableNative native) {
     // Intl natives.
     case InlinableNative::IntlGuardToDateTimeFormat:
       return &DateTimeFormatObject::class_;
-    case InlinableNative::IntlGuardToDurationFormat:
-      return &DurationFormatObject::class_;
     case InlinableNative::IntlGuardToNumberFormat:
       return &NumberFormatObject::class_;
     case InlinableNative::IntlGuardToPluralRules:
@@ -161,7 +158,6 @@ bool js::jit::CanInlineNativeCrossRealm(InlinableNative native) {
       return false;
 
     case InlinableNative::IntlGuardToDateTimeFormat:
-    case InlinableNative::IntlGuardToDurationFormat:
     case InlinableNative::IntlGuardToNumberFormat:
     case InlinableNative::IntlGuardToPluralRules:
     case InlinableNative::IntlGuardToSegments:
diff --git a/js/src/jit/InlinableNatives.h b/js/src/jit/InlinableNatives.h
index f42ccb7a61d58..5f7d6145e755e 100644
--- a/js/src/jit/InlinableNatives.h
+++ b/js/src/jit/InlinableNatives.h
@@ -96,7 +96,6 @@
   _(FunctionBind)                                  \
                                                    \
   _(IntlGuardToDateTimeFormat)                     \
-  _(IntlGuardToDurationFormat)                     \
   _(IntlGuardToNumberFormat)                       \
   _(IntlGuardToPluralRules)                        \
   _(IntlGuardToSegments)                           \
diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp
index d4a7d795503e3..9359bcea8ef96 100644
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -25,7 +25,6 @@
 #include "builtin/BigInt.h"
 #ifdef JS_HAS_INTL_API
 #  include "builtin/intl/DateTimeFormat.h"
-#  include "builtin/intl/DurationFormat.h"
 #  include "builtin/intl/IntlObject.h"
 #  include "builtin/intl/Locale.h"
 #  include "builtin/intl/NumberFormat.h"
@@ -1845,8 +1844,6 @@ static const JSFunctionSpec intrinsic_functions[] = {
     JS_FN("intl_BestAvailableLocale", intl_BestAvailableLocale, 3, 0),
     JS_FN("intl_CallDateTimeFormatMethodIfWrapped",
           CallNonGenericSelfhostedMethod<Is<DateTimeFormatObject>>, 2, 0),
-    JS_FN("intl_CallDurationFormatMethodIfWrapped",
-          CallNonGenericSelfhostedMethod<Is<DurationFormatObject>>, 2, 0),
     JS_FN("intl_CallNumberFormatMethodIfWrapped",
           CallNonGenericSelfhostedMethod<Is<NumberFormatObject>>, 2, 0),
     JS_FN("intl_CallPluralRulesMethodIfWrapped",
@@ -1868,9 +1865,6 @@ static const JSFunctionSpec intrinsic_functions[] = {
     JS_INLINABLE_FN("intl_GuardToDateTimeFormat",
                     intrinsic_GuardToBuiltin<DateTimeFormatObject>, 1, 0,
                     IntlGuardToDateTimeFormat),
-    JS_INLINABLE_FN("intl_GuardToDurationFormat",
-                    intrinsic_GuardToBuiltin<DurationFormatObject>, 1, 0,
-                    IntlGuardToDurationFormat),
     JS_INLINABLE_FN("intl_GuardToNumberFormat",
                     intrinsic_GuardToBuiltin<NumberFormatObject>, 1, 0,
                     IntlGuardToNumberFormat),

From d920164e06e4276fefd73394d4adfafc30ea0de1 Mon Sep 17 00:00:00 2001
From: Updatebot <updatebot@mozilla.com>
Date: Thu, 29 Jan 2026 07:53:42 +0000
Subject: [PATCH 007/116] Bug 2012986 - Update PDF.js to
 550520193085788c1dbb1dac0d4565109fbbb49f r=pdfjs-reviewers,calixte

Differential Revision: https://phabricator.services.mozilla.com/D280736
---
 .../components/pdfjs/content/build/pdf.mjs    | 264 ++++++-
 .../pdfjs/content/build/pdf.scripting.mjs     |   4 +-
 .../pdfjs/content/build/pdf.worker.mjs        |  84 ++-
 .../pdfjs/content/web/viewer-geckoview.mjs    | 244 ++++---
 .../components/pdfjs/content/web/viewer.css   |  17 +-
 .../components/pdfjs/content/web/viewer.html  |  19 +-
 .../components/pdfjs/content/web/viewer.mjs   | 655 +++++++++---------
 toolkit/components/pdfjs/moz.yaml             |   4 +-
 .../en-US/toolkit/pdfviewer/viewer.ftl        |   1 +
 9 files changed, 793 insertions(+), 499 deletions(-)

diff --git a/toolkit/components/pdfjs/content/build/pdf.mjs b/toolkit/components/pdfjs/content/build/pdf.mjs
index 7185e46fed07d..6817711e299b1 100644
--- a/toolkit/components/pdfjs/content/build/pdf.mjs
+++ b/toolkit/components/pdfjs/content/build/pdf.mjs
@@ -21,8 +21,8 @@
  */
 
 /**
- * pdfjsVersion = 5.4.569
- * pdfjsBuild = 6a4a3b060
+ * pdfjsVersion = 5.4.590
+ * pdfjsBuild = 550520193
  */
 /******/ // The require scope
 /******/ var __webpack_require__ = {};
@@ -1848,6 +1848,115 @@ function makePathFromDrawOPS(data) {
   }
   return path;
 }
+class PagesMapper {
+  static #idToPageNumber = null;
+  static #pageNumberToId = null;
+  static #prevIdToPageNumber = null;
+  static #pagesNumber = 0;
+  static #listeners = [];
+  get pagesNumber() {
+    return PagesMapper.#pagesNumber;
+  }
+  set pagesNumber(n) {
+    if (PagesMapper.#pagesNumber === n) {
+      return;
+    }
+    PagesMapper.#pagesNumber = n;
+    if (n === 0) {
+      PagesMapper.#pageNumberToId = null;
+      PagesMapper.#idToPageNumber = null;
+    }
+  }
+  addListener(listener) {
+    PagesMapper.#listeners.push(listener);
+  }
+  removeListener(listener) {
+    const index = PagesMapper.#listeners.indexOf(listener);
+    if (index >= 0) {
+      PagesMapper.#listeners.splice(index, 1);
+    }
+  }
+  #updateListeners() {
+    for (const listener of PagesMapper.#listeners) {
+      listener();
+    }
+  }
+  #init(mustInit) {
+    if (PagesMapper.#pageNumberToId) {
+      return;
+    }
+    const n = PagesMapper.#pagesNumber;
+    const array = new Uint32Array(3 * n);
+    const pageNumberToId = PagesMapper.#pageNumberToId = array.subarray(0, n);
+    const idToPageNumber = PagesMapper.#idToPageNumber = array.subarray(n, 2 * n);
+    if (mustInit) {
+      for (let i = 0; i < n; i++) {
+        pageNumberToId[i] = idToPageNumber[i] = i + 1;
+      }
+    }
+    PagesMapper.#prevIdToPageNumber = array.subarray(2 * n);
+  }
+  movePages(selectedPages, pagesToMove, index) {
+    this.#init(true);
+    const pageNumberToId = PagesMapper.#pageNumberToId;
+    const idToPageNumber = PagesMapper.#idToPageNumber;
+    PagesMapper.#prevIdToPageNumber.set(idToPageNumber);
+    const movedCount = pagesToMove.length;
+    const mappedPagesToMove = new Uint32Array(movedCount);
+    let removedBeforeTarget = 0;
+    for (let i = 0; i < movedCount; i++) {
+      const pageIndex = pagesToMove[i] - 1;
+      mappedPagesToMove[i] = pageNumberToId[pageIndex];
+      if (pageIndex < index) {
+        removedBeforeTarget += 1;
+      }
+    }
+    const pagesNumber = PagesMapper.#pagesNumber;
+    let adjustedTarget = index - removedBeforeTarget;
+    const remainingLen = pagesNumber - movedCount;
+    adjustedTarget = MathClamp(adjustedTarget, 0, remainingLen);
+    for (let i = 0, r = 0; i < pagesNumber; i++) {
+      if (!selectedPages.has(i + 1)) {
+        pageNumberToId[r++] = pageNumberToId[i];
+      }
+    }
+    pageNumberToId.copyWithin(adjustedTarget + movedCount, adjustedTarget, remainingLen);
+    pageNumberToId.set(mappedPagesToMove, adjustedTarget);
+    let hasChanged = false;
+    for (let i = 0, ii = pagesNumber; i < ii; i++) {
+      const id = pageNumberToId[i];
+      hasChanged ||= id !== i + 1;
+      idToPageNumber[id - 1] = i + 1;
+    }
+    this.#updateListeners();
+    if (!hasChanged) {
+      this.pagesNumber = 0;
+    }
+  }
+  hasBeenAltered() {
+    return PagesMapper.#pageNumberToId !== null;
+  }
+  getPageMappingForSaving() {
+    return {
+      pageIndices: PagesMapper.#idToPageNumber ? PagesMapper.#idToPageNumber.map(x => x - 1) : null
+    };
+  }
+  getPrevPageNumber(pageNumber) {
+    return PagesMapper.#prevIdToPageNumber[PagesMapper.#pageNumberToId[pageNumber - 1] - 1];
+  }
+  getPageNumber(id) {
+    return PagesMapper.#idToPageNumber?.[id - 1] ?? id;
+  }
+  getPageId(pageNumber) {
+    return PagesMapper.#pageNumberToId?.[pageNumber - 1] ?? pageNumber;
+  }
+  static get instance() {
+    return shadow(this, "instance", new PagesMapper());
+  }
+  getMapping() {
+    return PagesMapper.#pageNumberToId.subarray(0, this.pagesNumber);
+  }
+}
 
 ;// ./src/display/editor/toolbar.js
 
@@ -2728,6 +2837,9 @@ class AnnotationEditorUIManager {
     eventBus._on("switchannotationeditorparams", evt => this.updateParams(evt.type, evt.value), {
       signal
     });
+    eventBus._on("pagesedited", this.onPagesEdited.bind(this), {
+      signal
+    });
     window.addEventListener("pointerdown", () => {
       this.#isPointerDown = true;
     }, {
@@ -2889,6 +3001,21 @@ class AnnotationEditorUIManager {
   removeComment(editor) {
     this.#commentManager?.removeComments([editor.uid]);
   }
+  deleteComment(editor, savedData) {
+    const undo = () => {
+      editor.comment = savedData;
+    };
+    const cmd = () => {
+      this._editorUndoBar?.show(undo, "comment");
+      this.toggleComment(null);
+      editor.comment = null;
+    };
+    this.addCommands({
+      cmd,
+      undo,
+      mustExec: true
+    });
+  }
   toggleComment(editor, isSelected, visibility = undefined) {
     this.#commentManager?.toggleCommentPopup(editor, isSelected, visibility);
   }
@@ -2951,6 +3078,24 @@ class AnnotationEditorUIManager {
         break;
     }
   }
+  onPagesEdited({
+    pagesMapper
+  }) {
+    for (const editor of this.#allEditors.values()) {
+      editor.updatePageIndex(pagesMapper.getPrevPageNumber(editor.pageIndex + 1) - 1);
+    }
+    const allLayers = this.#allLayers;
+    const newAllLayers = this.#allLayers = new Map();
+    for (const [pageIndex, layer] of allLayers) {
+      const prevPageIndex = pagesMapper.getPrevPageNumber(pageIndex + 1) - 1;
+      if (prevPageIndex === -1) {
+        layer.destroy();
+        continue;
+      }
+      newAllLayers.set(prevPageIndex, layer);
+      layer.updatePageIndex(prevPageIndex);
+    }
+  }
   onPageChanging({
     pageNumber
   }) {
@@ -4710,6 +4855,16 @@ class Comment {
     this.#date = new Date();
     this.#deleted = false;
   }
+  restoreData({
+    text,
+    richText,
+    date
+  }) {
+    this.#text = text;
+    this.#richText = richText;
+    this.#date = date;
+    this.#deleted = false;
+  }
   setInitialText(text, richText = null) {
     this.#initialText = text;
     this.data = text;
@@ -5013,6 +5168,9 @@ class AnnotationEditor {
     this.isAttachedToDOM = false;
     this.deleted = false;
   }
+  updatePageIndex(newPageIndex) {
+    this.pageIndex = newPageIndex;
+  }
   get editorType() {
     return Object.getPrototypeOf(this).constructor._type;
   }
@@ -5719,9 +5877,13 @@ class AnnotationEditor {
       opacity: this.opacity ?? 1
     };
   }
-  set comment(text) {
+  set comment(value) {
     this.#comment ||= new Comment(this);
-    this.#comment.data = text;
+    if (typeof value === "object" && value !== null) {
+      this.#comment.restoreData(value);
+    } else {
+      this.#comment.data = value;
+    }
     if (this.hasComment) {
       this.removeCommentButtonFromToolbar();
       this.addStandaloneCommentButton();
@@ -6766,6 +6928,10 @@ class AnnotationStorage {
     let hasBitmap = false;
     for (const [key, val] of this.#storage) {
       const serialized = val instanceof AnnotationEditor ? val.serialize(false, context) : val;
+      if (val.page) {
+        val.pageIndex = val.page._pageIndex;
+        delete val.page;
+      }
       if (serialized) {
         map.set(key, serialized);
         hash.update(`${key}:${JSON.stringify(serialized)}`);
@@ -13146,7 +13312,7 @@ function getDocument(src = {}) {
   }
   const docParams = {
     docId,
-    apiVersion: "5.4.569",
+    apiVersion: "5.4.590",
     data,
     password,
     disableAutoFetch,
@@ -13425,6 +13591,7 @@ class PDFDocumentProxy {
 }
 class PDFPageProxy {
   #pendingCleanup = false;
+  #pagesMapper = PagesMapper.instance;
   constructor(pageIndex, pageInfo, transport, pdfBug = false) {
     this._pageIndex = pageIndex;
     this._pageInfo = pageInfo;
@@ -13440,6 +13607,9 @@ class PDFPageProxy {
   get pageNumber() {
     return this._pageIndex + 1;
   }
+  set pageNumber(value) {
+    this._pageIndex = value - 1;
+  }
   get rotate() {
     return this._pageInfo.rotate;
   }
@@ -13626,6 +13796,7 @@ class PDFPageProxy {
   } = {}) {
     const TEXT_CONTENT_CHUNK_SIZE = 100;
     return this._transport.messageHandler.sendWithStream("GetTextContent", {
+      pageId: this.#pagesMapper.getPageId(this._pageIndex + 1) - 1,
       pageIndex: this._pageIndex,
       includeMarkedContent: includeMarkedContent === true,
       disableNormalization: disableNormalization === true
@@ -13748,6 +13919,7 @@ class PDFPageProxy {
       transfer
     } = annotationStorageSerializable;
     const readableStream = this._transport.messageHandler.sendWithStream("GetOperatorList", {
+      pageId: this.#pagesMapper.getPageId(this._pageIndex + 1) - 1,
       pageIndex: this._pageIndex,
       intent: renderingIntent,
       cacheKey,
@@ -14028,6 +14200,7 @@ class WorkerTransport {
   #pagePromises = new Map();
   #pageRefCache = new Map();
   #passwordCapability = null;
+  #pagesMapper = PagesMapper.instance;
   constructor(messageHandler, loadingTask, networkStream, params, factory, enableHWA) {
     this.messageHandler = messageHandler;
     this.loadingTask = loadingTask;
@@ -14051,6 +14224,24 @@ class WorkerTransport {
     this.downloadInfoCapability = Promise.withResolvers();
     this.enableHWA = enableHWA;
     this.setupMessageHandler();
+    this.#pagesMapper.addListener(this.#updateCaches.bind(this));
+  }
+  #updateCaches() {
+    const newPageCache = new Map();
+    const newPromiseCache = new Map();
+    for (let i = 0, ii = this.#pagesMapper.pagesNumber; i < ii; i++) {
+      const prevPageIndex = this.#pagesMapper.getPrevPageNumber(i + 1) - 1;
+      const page = this.#pageCache.get(prevPageIndex);
+      if (page) {
+        newPageCache.set(i, page);
+      }
+      const promise = this.#pagePromises.get(prevPageIndex);
+      if (promise) {
+        newPromiseCache.set(i, promise);
+      }
+    }
+    this.#pageCache = newPageCache;
+    this.#pagePromises = newPromiseCache;
   }
   #cacheSimpleMethod(name, data = null) {
     const cachedPromise = this.#methodPromises.get(name);
@@ -14244,6 +14435,7 @@ class WorkerTransport {
     messageHandler.on("GetDoc", ({
       pdfInfo
     }) => {
+      this.#pagesMapper.pagesNumber = pdfInfo.numPages;
       this._numPages = pdfInfo.numPages;
       this._htmlForXfa = pdfInfo.htmlForXfa;
       delete pdfInfo.htmlForXfa;
@@ -14407,22 +14599,23 @@ class WorkerTransport {
     });
   }
   getPage(pageNumber) {
-    if (!Number.isInteger(pageNumber) || pageNumber <= 0 || pageNumber > this._numPages) {
+    if (!Number.isInteger(pageNumber) || pageNumber <= 0 || pageNumber > this.#pagesMapper.pagesNumber) {
       return Promise.reject(new Error("Invalid page request."));
     }
-    const pageIndex = pageNumber - 1,
-      cachedPromise = this.#pagePromises.get(pageIndex);
+    const pageIndex = pageNumber - 1;
+    const newPageIndex = this.#pagesMapper.getPageId(pageNumber) - 1;
+    const cachedPromise = this.#pagePromises.get(pageIndex);
     if (cachedPromise) {
       return cachedPromise;
     }
     const promise = this.messageHandler.sendWithPromise("GetPage", {
-      pageIndex
+      pageIndex: newPageIndex
     }).then(pageInfo => {
       if (this.destroyed) {
         throw new Error("Transport destroyed");
       }
       if (pageInfo.refStr) {
-        this.#pageRefCache.set(pageInfo.refStr, pageNumber);
+        this.#pageRefCache.set(pageInfo.refStr, newPageIndex);
       }
       const page = new PDFPageProxy(pageIndex, pageInfo, this, this._params.pdfBug);
       this.#pageCache.set(pageIndex, page);
@@ -14431,18 +14624,19 @@ class WorkerTransport {
     this.#pagePromises.set(pageIndex, promise);
     return promise;
   }
-  getPageIndex(ref) {
+  async getPageIndex(ref) {
     if (!isRefProxy(ref)) {
-      return Promise.reject(new Error("Invalid pageIndex request."));
+      throw new Error("Invalid pageIndex request.");
     }
-    return this.messageHandler.sendWithPromise("GetPageIndex", {
+    const index = await this.messageHandler.sendWithPromise("GetPageIndex", {
       num: ref.num,
       gen: ref.gen
     });
+    return this.#pagesMapper.getPageNumber(index + 1) - 1;
   }
   getAnnotations(pageIndex, intent) {
     return this.messageHandler.sendWithPromise("GetAnnotations", {
-      pageIndex,
+      pageIndex: this.#pagesMapper.getPageId(pageIndex + 1) - 1,
       intent
     });
   }
@@ -14495,12 +14689,12 @@ class WorkerTransport {
   }
   getPageJSActions(pageIndex) {
     return this.messageHandler.sendWithPromise("GetPageJSActions", {
-      pageIndex
+      pageIndex: this.#pagesMapper.getPageId(pageIndex + 1) - 1
     });
   }
   getStructTree(pageIndex) {
     return this.messageHandler.sendWithPromise("GetStructTree", {
-      pageIndex
+      pageIndex: this.#pagesMapper.getPageId(pageIndex + 1) - 1
     });
   }
   getOutline() {
@@ -14555,32 +14749,33 @@ class WorkerTransport {
       return null;
     }
     const refStr = ref.gen === 0 ? `${ref.num}R` : `${ref.num}R${ref.gen}`;
-    return this.#pageRefCache.get(refStr) ?? null;
+    const pageIndex = this.#pageRefCache.get(refStr);
+    return pageIndex >= 0 ? this.#pagesMapper.getPageNumber(pageIndex + 1) : null;
   }
 }
 class RenderTask {
-  #internalRenderTask = null;
+  _internalRenderTask = null;
   onContinue = null;
   onError = null;
   constructor(internalRenderTask) {
-    this.#internalRenderTask = internalRenderTask;
+    this._internalRenderTask = internalRenderTask;
   }
   get promise() {
-    return this.#internalRenderTask.capability.promise;
+    return this._internalRenderTask.capability.promise;
   }
   cancel(extraDelay = 0) {
-    this.#internalRenderTask.cancel(null, extraDelay);
+    this._internalRenderTask.cancel(null, extraDelay);
   }
   get separateAnnots() {
     const {
       separateAnnots
-    } = this.#internalRenderTask.operatorList;
+    } = this._internalRenderTask.operatorList;
     if (!separateAnnots) {
       return false;
     }
     const {
       annotationCanvasMap
-    } = this.#internalRenderTask;
+    } = this._internalRenderTask;
     return separateAnnots.form || separateAnnots.canvas && annotationCanvasMap?.size > 0;
   }
 }
@@ -14737,8 +14932,8 @@ class InternalRenderTask {
     }
   }
 }
-const version = "5.4.569";
-const build = "6a4a3b060";
+const version = "5.4.590";
+const build = "550520193";
 
 ;// ./src/display/editor/color_picker.js
 
@@ -15325,7 +15520,7 @@ class AnnotationElement {
       this.annotationStorage.setValue(`${AnnotationEditorPrefix}${data.id}`, {
         id: data.id,
         annotationType: data.annotationType,
-        pageIndex: this.parent.page._pageIndex,
+        page: this.parent.page,
         popup,
         popupRef: data.popupRef,
         modificationDate: new Date()
@@ -24000,6 +24195,9 @@ class AnnotationEditorLayer {
     this._structTree = structTreeLayer;
     this.#uiManager.addLayer(this);
   }
+  updatePageIndex(newPageIndex) {
+    this.pageIndex = newPageIndex;
+  }
   get isEmpty() {
     return this.#editors.size === 0;
   }
@@ -24707,11 +24905,6 @@ class DrawLayer {
   #mapping = new Map();
   #toUpdate = new Map();
   static #id = 0;
-  constructor({
-    pageIndex
-  }) {
-    this.pageIndex = pageIndex;
-  }
   setParent(parent) {
     if (!this.#parent) {
       this.#parent = parent;
@@ -24773,7 +24966,7 @@ class DrawLayer {
     root.append(defs);
     const path = DrawLayer._svgFactory.createElement("path");
     defs.append(path);
-    const pathId = `path_p${this.pageIndex}_${id}`;
+    const pathId = `path_${id}`;
     path.setAttribute("id", pathId);
     path.setAttribute("vector-effect", "non-scaling-stroke");
     if (isPathUpdatable) {
@@ -24797,14 +24990,14 @@ class DrawLayer {
     root.append(defs);
     const path = DrawLayer._svgFactory.createElement("path");
     defs.append(path);
-    const pathId = `path_p${this.pageIndex}_${id}`;
+    const pathId = `path_${id}`;
     path.setAttribute("id", pathId);
     path.setAttribute("vector-effect", "non-scaling-stroke");
     let maskId;
     if (mustRemoveSelfIntersections) {
       const mask = DrawLayer._svgFactory.createElement("mask");
       defs.append(mask);
-      maskId = `mask_p${this.pageIndex}_${id}`;
+      maskId = `mask_${id}`;
       mask.setAttribute("id", maskId);
       mask.setAttribute("maskUnits", "objectBoundingBox");
       const rect = DrawLayer._svgFactory.createElement("rect");
@@ -24955,6 +25148,7 @@ globalThis.pdfjsLib = {
   normalizeUnicode: normalizeUnicode,
   OPS: OPS,
   OutputScale: OutputScale,
+  PagesMapper: PagesMapper,
   PasswordResponses: PasswordResponses,
   PDFDataRangeTransport: PDFDataRangeTransport,
   PDFDateString: PDFDateString,
@@ -24978,4 +25172,4 @@ globalThis.pdfjsLib = {
   XfaLayer: XfaLayer
 };
 
-export { AbortException, AnnotationEditorLayer, AnnotationEditorParamsType, AnnotationEditorType, AnnotationEditorUIManager, AnnotationLayer, AnnotationMode, AnnotationType, CSSConstants, ColorPicker, DOMSVGFactory, DrawLayer, util_FeatureTest as FeatureTest, GlobalWorkerOptions, util_ImageKind as ImageKind, InvalidPDFException, MathClamp, OPS, OutputScale, PDFDataRangeTransport, PDFDateString, PDFWorker, PasswordResponses, PermissionFlag, PixelsPerInch, RenderingCancelledException, ResponseException, SignatureExtractor, SupportedImageMimeTypes, TextLayer, TouchManager, Util, VerbosityLevel, XfaLayer, applyOpacity, build, createValidAbsoluteUrl, fetchData, findContrastColor, getDocument, getFilenameFromUrl, getPdfFilenameFromUrl, getRGB, getUuid, getXfaPageViewport, isDataScheme, isPdfFile, isValidExplicitDest, noContextMenu, normalizeUnicode, renderRichText, setLayerDimensions, shadow, stopEvent, updateUrlHash, version };
+export { AbortException, AnnotationEditorLayer, AnnotationEditorParamsType, AnnotationEditorType, AnnotationEditorUIManager, AnnotationLayer, AnnotationMode, AnnotationType, CSSConstants, ColorPicker, DOMSVGFactory, DrawLayer, util_FeatureTest as FeatureTest, GlobalWorkerOptions, util_ImageKind as ImageKind, InvalidPDFException, MathClamp, OPS, OutputScale, PDFDataRangeTransport, PDFDateString, PDFWorker, PagesMapper, PasswordResponses, PermissionFlag, PixelsPerInch, RenderingCancelledException, ResponseException, SignatureExtractor, SupportedImageMimeTypes, TextLayer, TouchManager, Util, VerbosityLevel, XfaLayer, applyOpacity, build, createValidAbsoluteUrl, fetchData, findContrastColor, getDocument, getFilenameFromUrl, getPdfFilenameFromUrl, getRGB, getUuid, getXfaPageViewport, isDataScheme, isPdfFile, isValidExplicitDest, noContextMenu, normalizeUnicode, renderRichText, setLayerDimensions, shadow, stopEvent, updateUrlHash, version };
diff --git a/toolkit/components/pdfjs/content/build/pdf.scripting.mjs b/toolkit/components/pdfjs/content/build/pdf.scripting.mjs
index cd1133946d4a4..f924044a64184 100644
--- a/toolkit/components/pdfjs/content/build/pdf.scripting.mjs
+++ b/toolkit/components/pdfjs/content/build/pdf.scripting.mjs
@@ -21,8 +21,8 @@
  */
 
 /**
- * pdfjsVersion = 5.4.569
- * pdfjsBuild = 6a4a3b060
+ * pdfjsVersion = 5.4.590
+ * pdfjsBuild = 550520193
  */
 
 ;// ./src/scripting_api/constants.js
diff --git a/toolkit/components/pdfjs/content/build/pdf.worker.mjs b/toolkit/components/pdfjs/content/build/pdf.worker.mjs
index 8e276cac6bdb9..e038fe0744a2d 100644
--- a/toolkit/components/pdfjs/content/build/pdf.worker.mjs
+++ b/toolkit/components/pdfjs/content/build/pdf.worker.mjs
@@ -21,8 +21,8 @@
  */
 
 /**
- * pdfjsVersion = 5.4.569
- * pdfjsBuild = 6a4a3b060
+ * pdfjsVersion = 5.4.590
+ * pdfjsBuild = 550520193
  */
 /******/ // The require scope
 /******/ var __webpack_require__ = {};
@@ -2882,6 +2882,7 @@ class Stream extends BaseStream {
     const pos = this.pos;
     const strEnd = this.end;
     if (!length) {
+      this.pos = strEnd;
       return bytes.subarray(pos, strEnd);
     }
     let end = pos + length;
@@ -8085,6 +8086,7 @@ const distDecode = new Int32Array([0x00001, 0x00002, 0x00003, 0x00004, 0x10005,
 const fixedLitCodeTab = [new Int32Array([0x70100, 0x80050, 0x80010, 0x80118, 0x70110, 0x80070, 0x80030, 0x900c0, 0x70108, 0x80060, 0x80020, 0x900a0, 0x80000, 0x80080, 0x80040, 0x900e0, 0x70104, 0x80058, 0x80018, 0x90090, 0x70114, 0x80078, 0x80038, 0x900d0, 0x7010c, 0x80068, 0x80028, 0x900b0, 0x80008, 0x80088, 0x80048, 0x900f0, 0x70102, 0x80054, 0x80014, 0x8011c, 0x70112, 0x80074, 0x80034, 0x900c8, 0x7010a, 0x80064, 0x80024, 0x900a8, 0x80004, 0x80084, 0x80044, 0x900e8, 0x70106, 0x8005c, 0x8001c, 0x90098, 0x70116, 0x8007c, 0x8003c, 0x900d8, 0x7010e, 0x8006c, 0x8002c, 0x900b8, 0x8000c, 0x8008c, 0x8004c, 0x900f8, 0x70101, 0x80052, 0x80012, 0x8011a, 0x70111, 0x80072, 0x80032, 0x900c4, 0x70109, 0x80062, 0x80022, 0x900a4, 0x80002, 0x80082, 0x80042, 0x900e4, 0x70105, 0x8005a, 0x8001a, 0x90094, 0x70115, 0x8007a, 0x8003a, 0x900d4, 0x7010d, 0x8006a, 0x8002a, 0x900b4, 0x8000a, 0x8008a, 0x8004a, 0x900f4, 0x70103, 0x80056, 0x80016, 0x8011e, 0x70113, 0x80076, 0x80036, 0x900cc, 0x7010b, 0x80066, 0x80026, 0x900ac, 0x80006, 0x80086, 0x80046, 0x900ec, 0x70107, 0x8005e, 0x8001e, 0x9009c, 0x70117, 0x8007e, 0x8003e, 0x900dc, 0x7010f, 0x8006e, 0x8002e, 0x900bc, 0x8000e, 0x8008e, 0x8004e, 0x900fc, 0x70100, 0x80051, 0x80011, 0x80119, 0x70110, 0x80071, 0x80031, 0x900c2, 0x70108, 0x80061, 0x80021, 0x900a2, 0x80001, 0x80081, 0x80041, 0x900e2, 0x70104, 0x80059, 0x80019, 0x90092, 0x70114, 0x80079, 0x80039, 0x900d2, 0x7010c, 0x80069, 0x80029, 0x900b2, 0x80009, 0x80089, 0x80049, 0x900f2, 0x70102, 0x80055, 0x80015, 0x8011d, 0x70112, 0x80075, 0x80035, 0x900ca, 0x7010a, 0x80065, 0x80025, 0x900aa, 0x80005, 0x80085, 0x80045, 0x900ea, 0x70106, 0x8005d, 0x8001d, 0x9009a, 0x70116, 0x8007d, 0x8003d, 0x900da, 0x7010e, 0x8006d, 0x8002d, 0x900ba, 0x8000d, 0x8008d, 0x8004d, 0x900fa, 0x70101, 0x80053, 0x80013, 0x8011b, 0x70111, 0x80073, 0x80033, 0x900c6, 0x70109, 0x80063, 0x80023, 0x900a6, 0x80003, 0x80083, 0x80043, 0x900e6, 0x70105, 0x8005b, 0x8001b, 0x90096, 0x70115, 0x8007b, 0x8003b, 0x900d6, 0x7010d, 0x8006b, 0x8002b, 0x900b6, 0x8000b, 0x8008b, 0x8004b, 0x900f6, 0x70103, 0x80057, 0x80017, 0x8011f, 0x70113, 0x80077, 0x80037, 0x900ce, 0x7010b, 0x80067, 0x80027, 0x900ae, 0x80007, 0x80087, 0x80047, 0x900ee, 0x70107, 0x8005f, 0x8001f, 0x9009e, 0x70117, 0x8007f, 0x8003f, 0x900de, 0x7010f, 0x8006f, 0x8002f, 0x900be, 0x8000f, 0x8008f, 0x8004f, 0x900fe, 0x70100, 0x80050, 0x80010, 0x80118, 0x70110, 0x80070, 0x80030, 0x900c1, 0x70108, 0x80060, 0x80020, 0x900a1, 0x80000, 0x80080, 0x80040, 0x900e1, 0x70104, 0x80058, 0x80018, 0x90091, 0x70114, 0x80078, 0x80038, 0x900d1, 0x7010c, 0x80068, 0x80028, 0x900b1, 0x80008, 0x80088, 0x80048, 0x900f1, 0x70102, 0x80054, 0x80014, 0x8011c, 0x70112, 0x80074, 0x80034, 0x900c9, 0x7010a, 0x80064, 0x80024, 0x900a9, 0x80004, 0x80084, 0x80044, 0x900e9, 0x70106, 0x8005c, 0x8001c, 0x90099, 0x70116, 0x8007c, 0x8003c, 0x900d9, 0x7010e, 0x8006c, 0x8002c, 0x900b9, 0x8000c, 0x8008c, 0x8004c, 0x900f9, 0x70101, 0x80052, 0x80012, 0x8011a, 0x70111, 0x80072, 0x80032, 0x900c5, 0x70109, 0x80062, 0x80022, 0x900a5, 0x80002, 0x80082, 0x80042, 0x900e5, 0x70105, 0x8005a, 0x8001a, 0x90095, 0x70115, 0x8007a, 0x8003a, 0x900d5, 0x7010d, 0x8006a, 0x8002a, 0x900b5, 0x8000a, 0x8008a, 0x8004a, 0x900f5, 0x70103, 0x80056, 0x80016, 0x8011e, 0x70113, 0x80076, 0x80036, 0x900cd, 0x7010b, 0x80066, 0x80026, 0x900ad, 0x80006, 0x80086, 0x80046, 0x900ed, 0x70107, 0x8005e, 0x8001e, 0x9009d, 0x70117, 0x8007e, 0x8003e, 0x900dd, 0x7010f, 0x8006e, 0x8002e, 0x900bd, 0x8000e, 0x8008e, 0x8004e, 0x900fd, 0x70100, 0x80051, 0x80011, 0x80119, 0x70110, 0x80071, 0x80031, 0x900c3, 0x70108, 0x80061, 0x80021, 0x900a3, 0x80001, 0x80081, 0x80041, 0x900e3, 0x70104, 0x80059, 0x80019, 0x90093, 0x70114, 0x80079, 0x80039, 0x900d3, 0x7010c, 0x80069, 0x80029, 0x900b3, 0x80009, 0x80089, 0x80049, 0x900f3, 0x70102, 0x80055, 0x80015, 0x8011d, 0x70112, 0x80075, 0x80035, 0x900cb, 0x7010a, 0x80065, 0x80025, 0x900ab, 0x80005, 0x80085, 0x80045, 0x900eb, 0x70106, 0x8005d, 0x8001d, 0x9009b, 0x70116, 0x8007d, 0x8003d, 0x900db, 0x7010e, 0x8006d, 0x8002d, 0x900bb, 0x8000d, 0x8008d, 0x8004d, 0x900fb, 0x70101, 0x80053, 0x80013, 0x8011b, 0x70111, 0x80073, 0x80033, 0x900c7, 0x70109, 0x80063, 0x80023, 0x900a7, 0x80003, 0x80083, 0x80043, 0x900e7, 0x70105, 0x8005b, 0x8001b, 0x90097, 0x70115, 0x8007b, 0x8003b, 0x900d7, 0x7010d, 0x8006b, 0x8002b, 0x900b7, 0x8000b, 0x8008b, 0x8004b, 0x900f7, 0x70103, 0x80057, 0x80017, 0x8011f, 0x70113, 0x80077, 0x80037, 0x900cf, 0x7010b, 0x80067, 0x80027, 0x900af, 0x80007, 0x80087, 0x80047, 0x900ef, 0x70107, 0x8005f, 0x8001f, 0x9009f, 0x70117, 0x8007f, 0x8003f, 0x900df, 0x7010f, 0x8006f, 0x8002f, 0x900bf, 0x8000f, 0x8008f, 0x8004f, 0x900ff]), 9];
 const fixedDistCodeTab = [new Int32Array([0x50000, 0x50010, 0x50008, 0x50018, 0x50004, 0x50014, 0x5000c, 0x5001c, 0x50002, 0x50012, 0x5000a, 0x5001a, 0x50006, 0x50016, 0x5000e, 0x00000, 0x50001, 0x50011, 0x50009, 0x50019, 0x50005, 0x50015, 0x5000d, 0x5001d, 0x50003, 0x50013, 0x5000b, 0x5001b, 0x50007, 0x50017, 0x5000f, 0x00000]), 5];
 class FlateStream extends DecodeStream {
+  #isAsync = true;
   constructor(str, maybeLength) {
     super(maybeLength);
     this.stream = str;
@@ -8118,7 +8120,7 @@ class FlateStream extends DecodeStream {
   }
   async asyncGetBytes() {
     this.stream.reset();
-    const bytes = this.stream.getBytes();
+    const bytes = this.stream.isAsync ? await this.stream.asyncGetBytes() : this.stream.getBytes();
     try {
       const {
         readable,
@@ -8144,13 +8146,14 @@ class FlateStream extends DecodeStream {
       }
       return data;
     } catch {
+      this.#isAsync = false;
       this.stream = new Stream(bytes, 2, bytes.length, this.stream.dict);
       this.reset();
       return null;
     }
   }
   get isAsync() {
-    return true;
+    return this.#isAsync;
   }
   getBits(bits) {
     const str = this.stream;
@@ -12409,6 +12412,12 @@ class CMapFactory {
     if (encoding instanceof Name) {
       return createBuiltInCMap(encoding.name, fetchBuiltInCMap);
     } else if (encoding instanceof BaseStream) {
+      if (encoding.isAsync) {
+        const bytes = await encoding.asyncGetBytes();
+        if (bytes) {
+          encoding = new Stream(bytes, 0, bytes.length, encoding.dict);
+        }
+      }
       const parsedCMap = await parseCMap(new CMap(), new Lexer(encoding), fetchBuiltInCMap, useCMap);
       if (parsedCMap.isIdentityCMap) {
         return createBuiltInCMap(parsedCMap.name, fetchBuiltInCMap);
@@ -33461,7 +33470,7 @@ class PartialEvaluator {
     }
     return null;
   }
-  getOperatorList({
+  async getOperatorList({
     stream,
     task,
     resources,
@@ -33470,6 +33479,12 @@ class PartialEvaluator {
     fallbackFontDict = null,
     prevRefs = null
   }) {
+    if (stream.isAsync) {
+      const bytes = await stream.asyncGetBytes();
+      if (bytes) {
+        stream = new Stream(bytes, 0, bytes.length, stream.dict);
+      }
+    }
     const objId = stream.dict?.objId;
     const seenRefs = new RefSet(prevRefs);
     if (objId) {
@@ -33975,7 +33990,7 @@ class PartialEvaluator {
       throw reason;
     });
   }
-  getTextContent({
+  async getTextContent({
     stream,
     task,
     resources,
@@ -33991,6 +34006,12 @@ class PartialEvaluator {
     prevRefs = null,
     intersector = null
   }) {
+    if (stream.isAsync) {
+      const bytes = await stream.asyncGetBytes();
+      if (bytes) {
+        stream = new Stream(bytes, 0, bytes.length, stream.dict);
+      }
+    }
     const objId = stream.dict?.objId;
     const seenRefs = new RefSet(prevRefs);
     if (objId) {
@@ -35515,8 +35536,16 @@ class PartialEvaluator {
       if (fontFile) {
         if (!(fontFile instanceof BaseStream)) {
           throw new FormatError("FontFile should be a stream");
-        } else if (fontFile.isEmpty) {
-          throw new FormatError("FontFile is empty");
+        } else {
+          if (fontFile.isAsync) {
+            const bytes = await fontFile.asyncGetBytes();
+            if (bytes) {
+              fontFile = new Stream(bytes, 0, bytes.length, fontFile.dict);
+            }
+          }
+          if (fontFile.isEmpty) {
+            throw new FormatError("FontFile is empty");
+          }
         }
       }
     } catch (ex) {
@@ -56606,9 +56635,29 @@ class Page {
   async getContentStream() {
     const content = await this.pdfManager.ensure(this, "content");
     if (content instanceof BaseStream && !content.isImageStream) {
+      if (content.isAsync) {
+        const bytes = await content.asyncGetBytes();
+        if (bytes) {
+          return new Stream(bytes, 0, bytes.length, content.dict);
+        }
+      }
       return content;
     }
     if (Array.isArray(content)) {
+      const promises = [];
+      for (let i = 0, ii = content.length; i < ii; i++) {
+        const item = content[i];
+        if (item instanceof BaseStream && item.isAsync) {
+          promises.push(item.asyncGetBytes().then(bytes => {
+            if (bytes) {
+              content[i] = new Stream(bytes, 0, bytes.length, item.dict);
+            }
+          }));
+        }
+      }
+      if (promises.length > 0) {
+        await Promise.all(promises);
+      }
       return new StreamsSequenceStream(content, this.#onSubStreamError.bind(this));
     }
     return new NullStream();
@@ -56720,6 +56769,8 @@ class Page {
     task,
     intent,
     cacheKey,
+    pageId = this.pageIndex,
+    pageIndex = this.pageIndex,
     annotationStorage = null,
     modifiedIds = null
   }) {
@@ -56772,7 +56823,7 @@ class Page {
       const opList = new OperatorList(intent, sink);
       handler.send("StartRenderPage", {
         transparency: partialEvaluator.hasBlendModes(resources, this.nonBlendModesSet),
-        pageIndex: this.pageIndex,
+        pageIndex,
         cacheKey
       });
       await partialEvaluator.getOperatorList({
@@ -60315,7 +60366,7 @@ class WorkerMessageHandler {
       docId,
       apiVersion
     } = docParams;
-    const workerVersion = "5.4.569";
+    const workerVersion = "5.4.590";
     if (apiVersion !== workerVersion) {
       throw new Error(`The API version "${apiVersion}" does not match ` + `the Worker version "${workerVersion}".`);
     }
@@ -60859,8 +60910,11 @@ class WorkerMessageHandler {
       });
     });
     handler.on("GetOperatorList", function (data, sink) {
-      const pageIndex = data.pageIndex;
-      pdfManager.getPage(pageIndex).then(function (page) {
+      const {
+        pageId,
+        pageIndex
+      } = data;
+      pdfManager.getPage(pageId).then(function (page) {
         const task = new WorkerTask(`GetOperatorList: page ${pageIndex}`);
         startWorkerTask(task);
         const start = verbosity >= VerbosityLevel.INFOS ? Date.now() : 0;
@@ -60871,7 +60925,8 @@ class WorkerMessageHandler {
           intent: data.intent,
           cacheKey: data.cacheKey,
           annotationStorage: data.annotationStorage,
-          modifiedIds: data.modifiedIds
+          modifiedIds: data.modifiedIds,
+          pageIndex
         }).then(function (operatorListInfo) {
           finishWorkerTask(task);
           if (start) {
@@ -60889,11 +60944,12 @@ class WorkerMessageHandler {
     });
     handler.on("GetTextContent", function (data, sink) {
       const {
+        pageId,
         pageIndex,
         includeMarkedContent,
         disableNormalization
       } = data;
-      pdfManager.getPage(pageIndex).then(function (page) {
+      pdfManager.getPage(pageId).then(function (page) {
         const task = new WorkerTask("GetTextContent: page " + pageIndex);
         startWorkerTask(task);
         const start = verbosity >= VerbosityLevel.INFOS ? Date.now() : 0;
diff --git a/toolkit/components/pdfjs/content/web/viewer-geckoview.mjs b/toolkit/components/pdfjs/content/web/viewer-geckoview.mjs
index 6384e5a90e46d..8e0003acb18d9 100644
--- a/toolkit/components/pdfjs/content/web/viewer-geckoview.mjs
+++ b/toolkit/components/pdfjs/content/web/viewer-geckoview.mjs
@@ -21,8 +21,8 @@
  */
 
 /**
- * pdfjsVersion = 5.4.569
- * pdfjsBuild = 6a4a3b060
+ * pdfjsVersion = 5.4.590
+ * pdfjsBuild = 550520193
  */
 /******/ // The require scope
 /******/ var __webpack_require__ = {};
@@ -85,6 +85,7 @@ const {
   normalizeUnicode,
   OPS,
   OutputScale,
+  PagesMapper,
   PasswordResponses,
   PDFDataRangeTransport,
   PDFDateString,
@@ -597,65 +598,6 @@ function toggleExpandedBtn(button, toggle, view = null) {
   view?.classList.toggle("hidden", !toggle);
 }
 const calcRound = Math.fround;
-class PagesMapper {
-  static #idToPageNumber = null;
-  static #pageNumberToId = null;
-  static #pagesNumber = 0;
-  get pagesNumber() {
-    return PagesMapper.#pagesNumber;
-  }
-  set pagesNumber(n) {
-    if (PagesMapper.#pagesNumber === n) {
-      return;
-    }
-    PagesMapper.#pagesNumber = n;
-    const pageNumberToId = PagesMapper.#pageNumberToId = new Uint32Array(2 * n);
-    const idToPageNumber = PagesMapper.#idToPageNumber = pageNumberToId.subarray(n);
-    for (let i = 0; i < n; i++) {
-      pageNumberToId[i] = idToPageNumber[i] = i + 1;
-    }
-  }
-  movePages(selectedPages, pagesToMove, index) {
-    const pageNumberToId = PagesMapper.#pageNumberToId;
-    const idToPageNumber = PagesMapper.#idToPageNumber;
-    const movedCount = pagesToMove.length;
-    const mappedPagesToMove = new Uint32Array(movedCount);
-    let removedBeforeTarget = 0;
-    for (let i = 0; i < movedCount; i++) {
-      const pageIndex = pagesToMove[i] - 1;
-      mappedPagesToMove[i] = pageNumberToId[pageIndex];
-      if (pageIndex < index) {
-        removedBeforeTarget += 1;
-      }
-    }
-    const pagesNumber = PagesMapper.#pagesNumber;
-    let adjustedTarget = index - removedBeforeTarget;
-    const remainingLen = pagesNumber - movedCount;
-    adjustedTarget = MathClamp(adjustedTarget, 0, remainingLen);
-    for (let i = 0, r = 0; i < pagesNumber; i++) {
-      if (!selectedPages.has(i + 1)) {
-        pageNumberToId[r++] = pageNumberToId[i];
-      }
-    }
-    pageNumberToId.copyWithin(adjustedTarget + movedCount, adjustedTarget, remainingLen);
-    pageNumberToId.set(mappedPagesToMove, adjustedTarget);
-    for (let i = 0, ii = pagesNumber; i < ii; i++) {
-      idToPageNumber[pageNumberToId[i] - 1] = i + 1;
-    }
-  }
-  getPageNumber(id) {
-    return PagesMapper.#idToPageNumber?.[id - 1] ?? id;
-  }
-  getPageId(pageNumber) {
-    return PagesMapper.#pageNumberToId?.[pageNumber - 1] ?? pageNumber;
-  }
-  static get instance() {
-    return shadow(this, "instance", new PagesMapper());
-  }
-  getMapping() {
-    return PagesMapper.#pageNumberToId.subarray(0, this.pagesNumber);
-  }
-}
 
 ;// ./web/app_options.js
 const OptionKind = {
@@ -3441,9 +3383,15 @@ class CommentPopup {
           }
         }
       });
-      this.#editor.comment = null;
-      this.#editor.focus();
+      const editor = this.#editor;
+      const savedData = editor.comment;
       this.destroy();
+      if (savedData?.text) {
+        editor._uiManager.deleteComment(editor, savedData);
+      } else {
+        editor.comment = null;
+      }
+      editor.focus();
     });
     del.addEventListener("contextmenu", noContextMenu);
     buttons.append(edit, del);
@@ -3655,6 +3603,7 @@ class EditorUndoBar {
     stamp: "pdfjs-editor-undo-bar-message-stamp",
     ink: "pdfjs-editor-undo-bar-message-ink",
     signature: "pdfjs-editor-undo-bar-message-signature",
+    comment: "pdfjs-editor-undo-bar-message-comment",
     _multiple: "pdfjs-editor-undo-bar-message-multiple"
   });
   constructor({
@@ -4150,7 +4099,6 @@ class PDFFindController {
   #state = null;
   #updateMatchesCountOnProgress = true;
   #visitedPagesCount = 0;
-  #pagesMapper = PagesMapper.instance;
   constructor({
     linkService,
     eventBus,
@@ -4407,12 +4355,11 @@ class PDFFindController {
     if (query.length === 0) {
       return;
     }
-    const pageId = this.getPageId(pageIndex);
-    const pageContent = this._pageContents[pageId];
+    const pageContent = this._pageContents[pageIndex];
     const matcherResult = this.match(query, pageContent, pageIndex);
     const matches = this._pageMatches[pageIndex] = [];
     const matchesLength = this._pageMatchesLength[pageIndex] = [];
-    const diffs = this._pageDiffs[pageId];
+    const diffs = this._pageDiffs[pageIndex];
     matcherResult?.forEach(({
       index,
       length
@@ -4441,7 +4388,7 @@ class PDFFindController {
     }
   }
   match(query, pageContent, pageIndex) {
-    const hasDiacritics = this._hasDiacritics[this.getPageId(pageIndex)];
+    const hasDiacritics = this._hasDiacritics[pageIndex];
     let isUnicode = false;
     if (typeof query === "string") {
       [isUnicode, query] = this.#convertToRegExpString(query, hasDiacritics);
@@ -4514,27 +4461,19 @@ class PDFFindController {
       });
     }
   }
-  getPageNumber(idx) {
-    return this.#pagesMapper.getPageNumber(idx + 1) - 1;
-  }
-  getPageId(pageNumber) {
-    return this.#pagesMapper.getPageId(pageNumber + 1) - 1;
-  }
   #updatePage(index) {
     if (this._scrollMatches && this._selected.pageIdx === index) {
       this._linkService.page = index + 1;
     }
     this._eventBus.dispatch("updatetextlayermatches", {
       source: this,
-      pageIndex: index,
-      pageId: this.getPageId(index)
+      pageIndex: index
     });
   }
   #updateAllPages() {
     this._eventBus.dispatch("updatetextlayermatches", {
       source: this,
-      pageIndex: -1,
-      pageId: -1
+      pageIndex: -1
     });
   }
   #nextMatch() {
@@ -4559,7 +4498,7 @@ class PDFFindController {
           continue;
         }
         this._pendingFindMatches.add(i);
-        this._extractTextPromises[this.getPageId(i)].then(() => {
+        this._extractTextPromises[i].then(() => {
           this._pendingFindMatches.delete(i);
           this.#calculateMatch(i);
         });
@@ -4649,12 +4588,23 @@ class PDFFindController {
       this.#updatePage(this._selected.pageIdx);
     }
   }
-  #onPagesEdited() {
+  #onPagesEdited({
+    pagesMapper
+  }) {
     if (this._extractTextPromises.length === 0) {
       return;
     }
     this.#onFindBarClose();
     this._dirtyMatch = true;
+    const prevTextPromises = this._extractTextPromises;
+    const extractTextPromises = this._extractTextPromises.length = [];
+    for (let i = 0, ii = pagesMapper.length; i < ii; i++) {
+      const prevPageIndex = pagesMapper.getPrevPageNumber(i + 1) - 1;
+      if (prevPageIndex === -1) {
+        continue;
+      }
+      extractTextPromises.push(prevTextPromises[prevPageIndex] || Promise.resolve());
+    }
   }
   #onFindBarClose(evt) {
     const pdfDocument = this._pdfDocument;
@@ -6609,18 +6559,13 @@ class BasePDFPageView {
 
 class DrawLayerBuilder {
   #drawLayer = null;
-  constructor(options) {
-    this.pageIndex = options.pageIndex;
-  }
   async render({
     intent = "display"
   }) {
     if (intent !== "display" || this.#drawLayer || this._cancelled) {
       return;
     }
-    this.#drawLayer = new DrawLayer({
-      pageIndex: this.pageIndex
-    });
+    this.#drawLayer = new DrawLayer();
   }
   cancel() {
     this._cancelled = true;
@@ -7319,7 +7264,7 @@ class TextHighlighter {
     if (!this.#eventAbortController) {
       this.#eventAbortController = new AbortController();
       this.eventBus._on("updatetextlayermatches", evt => {
-        if (evt.pageId === this.pageIdx || evt.pageId === -1) {
+        if (evt.pageIndex === this.pageIdx || evt.pageIndex === -1) {
           this._updateMatches();
         }
       }, {
@@ -7388,7 +7333,7 @@ class TextHighlighter {
       textContentItemsStr,
       textDivs
     } = this;
-    const isSelectedPage = findController.getPageNumber(pageIdx) === findController.selected.pageIdx;
+    const isSelectedPage = pageIdx === findController.selected.pageIdx;
     const selectedMatchIdx = findController.selected.matchIdx;
     const highlightAll = findController.state.highlightAll;
     let prevEnd = null;
@@ -7473,7 +7418,7 @@ class TextHighlighter {
         findController.scrollMatchIntoView({
           element: textDivs[begin.divIdx],
           selectedLeft,
-          pageIndex: findController.getPageNumber(pageIdx),
+          pageIndex: pageIdx,
           matchIndex: selectedMatchIdx
         });
       }
@@ -7508,9 +7453,8 @@ class TextHighlighter {
     if (!findController?.highlightMatches || reset) {
       return;
     }
-    const pageNumber = findController.getPageNumber(pageIdx);
-    const pageMatches = findController.pageMatches[pageNumber] || null;
-    const pageMatchesLength = findController.pageMatchesLength[pageNumber] || null;
+    const pageMatches = findController.pageMatches[pageIdx] || null;
+    const pageMatchesLength = findController.pageMatchesLength[pageIdx] || null;
     this.matches = this._convertMatches(pageMatches, pageMatchesLength);
     this._renderMatches(this.matches);
   }
@@ -7807,6 +7751,25 @@ class PDFPageView extends BasePDFPageView {
     }
     setLayerDimensions(div, viewport, true, false);
   }
+  updatePageNumber(newPageNumber) {
+    if (this.id === newPageNumber) {
+      return;
+    }
+    this.id = newPageNumber;
+    this.renderingId = `page${newPageNumber}`;
+    if (this.pdfPage) {
+      this.pdfPage.pageNumber = newPageNumber;
+    }
+    this.setPageLabel(this.pageLabel);
+    const {
+      div
+    } = this;
+    div.setAttribute("data-page-number", newPageNumber);
+    div.setAttribute("data-l10n-args", JSON.stringify({
+      page: newPageNumber
+    }));
+    this._textHighlighter.pageIdx = newPageNumber - 1;
+  }
   setPdfPage(pdfPage) {
     this.pdfPage = pdfPage;
     this.pdfPageRotate = pdfPage.rotate;
@@ -8381,9 +8344,7 @@ class PDFPageView extends BasePDFPageView {
       if (!annotationEditorUIManager) {
         return;
       }
-      this.drawLayer ||= new DrawLayerBuilder({
-        pageIndex: this.id
-      });
+      this.drawLayer ||= new DrawLayerBuilder();
       await this.#renderDrawLayer();
       this.drawLayer.setParent(canvasWrapper);
       if (this.annotationLayer || this.#annotationMode === AnnotationMode.DISABLE) {
@@ -8540,10 +8501,9 @@ class PDFViewer {
   #supportsPinchToZoom = true;
   #textLayerMode = TextLayerMode.ENABLE;
   #viewerAlert = null;
-  #originalPages = null;
   #pagesMapper = PagesMapper.instance;
   constructor(options) {
-    const viewerVersion = "5.4.569";
+    const viewerVersion = "5.4.590";
     if (version !== viewerVersion) {
       throw new Error(`The API version "${version}" does not match the Viewer version "${viewerVersion}".`);
     }
@@ -8906,6 +8866,7 @@ class PDFViewer {
       this.#annotationEditorUIManager = null;
       this.#annotationEditorMode = AnnotationEditorType.NONE;
       this.#printingAllowed = true;
+      this.#pagesMapper.pagesNumber = 0;
     }
     this.pdfDocument = pdfDocument;
     if (!pdfDocument) {
@@ -9114,36 +9075,43 @@ class PDFViewer {
       this._pagesCapability.reject(reason);
     });
   }
-  onBeforePagesEdited() {
-    this._currentPageId = this.#pagesMapper.getPageId(this._currentPageNumber);
+  async onBeforePagesEdited({
+    pagesMapper
+  }) {
+    await this._pagesCapability.promise;
+    this._currentPageId = pagesMapper.getPageId(this._currentPageNumber);
   }
   onPagesEdited({
-    index,
-    pagesToMove
+    pagesMapper
   }) {
-    const pagesMapper = this.#pagesMapper;
     this._currentPageNumber = pagesMapper.getPageNumber(this._currentPageId);
+    const prevPages = this._pages;
+    const newPages = this._pages = [];
+    for (let i = 0, ii = pagesMapper.pagesNumber; i < ii; i++) {
+      const prevPageNumber = pagesMapper.getPrevPageNumber(i + 1) - 1;
+      if (prevPageNumber === -1) {
+        continue;
+      }
+      const page = prevPages[prevPageNumber];
+      newPages[i] = page;
+      page.updatePageNumber(i + 1);
+    }
     const viewerElement = this._scrollMode === ScrollMode.PAGE ? null : this.viewer;
     if (viewerElement) {
-      const pages = this._pages;
-      let page = pages[pagesToMove[0] - 1].div;
-      if (index === 0) {
-        pages[0].div.before(page);
-      } else {
-        pages[index - 1].div.after(page);
-      }
-      for (let i = 1, ii = pagesToMove.length; i < ii; i++) {
-        const newPage = pages[pagesToMove[i] - 1].div;
-        page.after(newPage);
-        page = newPage;
+      viewerElement.replaceChildren();
+      const fragment = document.createDocumentFragment();
+      for (let i = 0, ii = pagesMapper.pagesNumber; i < ii; i++) {
+        const {
+          div
+        } = newPages[i];
+        div.setAttribute("data-page-number", i + 1);
+        fragment.append(div);
       }
+      viewerElement.append(fragment);
     }
-    this.#originalPages ||= this._pages;
-    const newPages = this._pages = [];
-    for (let i = 0, ii = pagesMapper.pagesNumber; i < ii; i++) {
-      const pageView = this.#originalPages[pagesMapper.getPageId(i + 1) - 1];
-      newPages.push(pageView);
-    }
+    setTimeout(() => {
+      this.forceRendering();
+    });
   }
   setPageLabels(labels) {
     if (!this.pdfDocument) {
@@ -9255,9 +9223,8 @@ class PDFViewer {
       div,
       id
     } = pageView;
-    const pageNumber = this.#pagesMapper.getPageNumber(id);
-    if (this._currentPageNumber !== pageNumber) {
-      this._setCurrentPageNumber(pageNumber);
+    if (this._currentPageNumber !== id) {
+      this._setCurrentPageNumber(id);
     }
     if (this._scrollMode === ScrollMode.PAGE) {
       this.#ensurePageViewVisible();
@@ -9567,18 +9534,18 @@ class PDFViewer {
     }
     this.renderingQueue.renderHighestPriority(visible);
     const isSimpleLayout = this._spreadMode === SpreadMode.NONE && (this._scrollMode === ScrollMode.PAGE || this._scrollMode === ScrollMode.VERTICAL);
-    const currentId = this.#pagesMapper.getPageId(this._currentPageNumber);
+    const currentPageNumber = this._currentPageNumber;
     let stillFullyVisible = false;
     for (const page of visiblePages) {
       if (page.percent < 100) {
         break;
       }
-      if (page.id === currentId && isSimpleLayout) {
+      if (page.id === currentPageNumber && isSimpleLayout) {
         stillFullyVisible = true;
         break;
       }
     }
-    this._setCurrentPageNumber(stillFullyVisible ? this._currentPageNumber : this.#pagesMapper.getPageNumber(visiblePages[0].id));
+    this._setCurrentPageNumber(stillFullyVisible ? this._currentPageNumber : visiblePages[0].id);
     this._updateLocation(visible.first);
     this.eventBus.dispatch("updateviewarea", {
       source: this,
@@ -10604,7 +10571,8 @@ const PDFViewerApplication = {
         pageColors,
         abortSignal,
         enableHWA,
-        enableSplitMerge: AppOptions.get("enableSplitMerge")
+        enableSplitMerge: AppOptions.get("enableSplitMerge"),
+        manageMenu: appConfig.viewsManager.manageMenu
       });
       renderingQueue.setThumbnailViewer(this.pdfThumbnailViewer);
     }
@@ -11532,6 +11500,7 @@ const PDFViewerApplication = {
     eventBus._on("setpreference", evt => preferences.set(evt.name, evt.value), opts);
     eventBus._on("pagesedited", this.onPagesEdited.bind(this), opts);
     eventBus._on("beforepagesedited", this.onBeforePagesEdited.bind(this), opts);
+    eventBus._on("savepageseditedpdf", this.onSavePagesEditedPDF.bind(this), opts);
   },
   bindWindowEvents() {
     if (this._windowAbortController) {
@@ -11666,6 +11635,29 @@ const PDFViewerApplication = {
   onPagesEdited(data) {
     this.pdfViewer.onPagesEdited(data);
   },
+  async onSavePagesEditedPDF({
+    data: {
+      includePages,
+      excludePages,
+      pageIndices
+    }
+  }) {
+    if (!this.pdfDocument) {
+      return;
+    }
+    const pageInfo = {
+      document: null,
+      includePages,
+      excludePages,
+      pageIndices
+    };
+    const modifiedPdfBytes = await this.pdfDocument.extractPages([pageInfo]);
+    if (!modifiedPdfBytes) {
+      console.error("Something wrong happened when saving the edited PDF.\nPlease file a bug.");
+      return;
+    }
+    this.downloadManager.download(modifiedPdfBytes, this._downloadUrl, this._docFilename);
+  },
   _accumulateTicks(ticks, prop) {
     if (this[prop] > 0 && ticks < 0 || this[prop] < 0 && ticks > 0) {
       this[prop] = 0;
diff --git a/toolkit/components/pdfjs/content/web/viewer.css b/toolkit/components/pdfjs/content/web/viewer.css
index 5c68d7cd5006a..d3bfd3b71e745 100644
--- a/toolkit/components/pdfjs/content/web/viewer.css
+++ b/toolkit/components/pdfjs/content/web/viewer.css
@@ -4554,6 +4554,16 @@
   }
 }
 
+button.hasPopupMenu{
+  &[aria-expanded="true"] + menu{
+    visibility:visible;
+  }
+
+  &[aria-expanded="false"] + menu{
+    visibility:hidden;
+  }
+}
+
 .popupMenu{
   --menuitem-checkmark-icon:url(images/checkmark.svg);
   --menu-mark-icon-size:0;
@@ -4614,6 +4624,7 @@
   top:1px;
   margin:0;
   padding:5px;
+  box-sizing:border-box;
 
   background:var(--menu-bg);
   background-blend-mode:var(--menu-background-blend-mode);
@@ -5202,6 +5213,7 @@
 
         #actionSelector{
           height:32px;
+          min-width:115px;
           width:auto;
           display:block;
 
@@ -5233,8 +5245,9 @@
             }
           }
 
-          > .contextMenu{
-            min-width:115px;
+          > .popupMenu{
+            width:auto;
+            z-index:1;
           }
         }
       }
diff --git a/toolkit/components/pdfjs/content/web/viewer.html b/toolkit/components/pdfjs/content/web/viewer.html
index 2a37b96a273af..d4272c7a4d753 100644
--- a/toolkit/components/pdfjs/content/web/viewer.html
+++ b/toolkit/components/pdfjs/content/web/viewer.html
@@ -68,7 +68,7 @@
                     <div id="viewsManagerTitle">
                       <div id="viewsManagerSelector">
                         <button
-                          class="toolbarButton viewsManagerButton"
+                          class="toolbarButton viewsManagerButton hasPopupMenu"
                           type="button"
                           id="viewsManagerSelectorButton"
                           tabindex="0"
@@ -79,7 +79,7 @@
                         >
                           <span data-l10n-id="pdfjs-views-manager-view-selector-button-label"></span>
                         </button>
-                        <menu id="viewsManagerSelectorOptions" role="listbox" class="popupMenu hidden withMark">
+                        <menu id="viewsManagerSelectorOptions" role="listbox" class="popupMenu withMark">
                           <li>
                             <button id="thumbnailsViewMenu" role="option" type="button" tabindex="-1">
                               <span data-l10n-id="pdfjs-views-manager-pages-option-label"></span>
@@ -125,7 +125,7 @@
                       </button>
                     </div>
                     <div id="viewsManagerStatus">
-                      <div id="viewsManagerStatusAction" class="hidden">
+                      <div id="viewsManagerStatusAction">
                         <span
                           id="viewsManagerStatusActionLabel"
                           class="viewsManagerStatusLabel"
@@ -134,32 +134,33 @@
                         <div id="actionSelector">
                           <button
                             id="viewsManagerStatusActionButton"
-                            class="viewsManagerButton"
+                            class="viewsManagerButton hasPopupMenu"
                             type="button"
                             tabindex="0"
                             aria-haspopup="menu"
                             aria-controls="viewsManagerStatusActionOptions"
+                            aria-expanded="false"
                           >
                             <span data-l10n-id="pdfjs-views-manager-pages-status-action-button-label"></span>
                           </button>
-                          <menu id="viewsManagerStatusActionOptions" class="popupMenu hidden">
+                          <menu id="viewsManagerStatusActionOptions" class="popupMenu">
                             <li>
-                              <button id="viewsManagerStatusActionCopy" class="noIcon" role="menuitem" type="button" tabindex="0">
+                              <button id="viewsManagerStatusActionCopy" class="noIcon" role="menuitem" type="button" tabindex="0" disabled>
                                 <span data-l10n-id="pdfjs-views-manager-pages-status-copy-button-label"></span>
                               </button>
                             </li>
                             <li>
-                              <button id="viewsManagerStatusActionCut" class="noIcon" role="menuitem" type="button" tabindex="0">
+                              <button id="viewsManagerStatusActionCut" class="noIcon" role="menuitem" type="button" tabindex="0" disabled>
                                 <span data-l10n-id="pdfjs-views-manager-pages-status-cut-button-label"></span>
                               </button>
                             </li>
                             <li>
-                              <button id="viewsManagerStatusActionDelete" class="noIcon" role="menuitem" type="button" tabindex="0">
+                              <button id="viewsManagerStatusActionDelete" class="noIcon" role="menuitem" type="button" tabindex="0" disabled>
                                 <span data-l10n-id="pdfjs-views-manager-pages-status-delete-button-label"></span>
                               </button>
                             </li>
                             <li>
-                              <button id="viewsManagerStatusActionSaveAs" class="noIcon" role="menuitem" type="button" tabindex="0">
+                              <button id="viewsManagerStatusActionSaveAs" class="noIcon" role="menuitem" type="button" tabindex="0" disabled>
                                 <span data-l10n-id="pdfjs-views-manager-pages-status-save-as-button-label"></span>
                               </button>
                             </li>
diff --git a/toolkit/components/pdfjs/content/web/viewer.mjs b/toolkit/components/pdfjs/content/web/viewer.mjs
index ed9432eea9d98..5ccf20ac637a7 100644
--- a/toolkit/components/pdfjs/content/web/viewer.mjs
+++ b/toolkit/components/pdfjs/content/web/viewer.mjs
@@ -21,8 +21,8 @@
  */
 
 /**
- * pdfjsVersion = 5.4.569
- * pdfjsBuild = 6a4a3b060
+ * pdfjsVersion = 5.4.590
+ * pdfjsBuild = 550520193
  */
 /******/ // The require scope
 /******/ var __webpack_require__ = {};
@@ -85,6 +85,7 @@ const {
   normalizeUnicode,
   OPS,
   OutputScale,
+  PagesMapper,
   PasswordResponses,
   PDFDataRangeTransport,
   PDFDateString,
@@ -597,65 +598,6 @@ function toggleExpandedBtn(button, toggle, view = null) {
   view?.classList.toggle("hidden", !toggle);
 }
 const calcRound = Math.fround;
-class PagesMapper {
-  static #idToPageNumber = null;
-  static #pageNumberToId = null;
-  static #pagesNumber = 0;
-  get pagesNumber() {
-    return PagesMapper.#pagesNumber;
-  }
-  set pagesNumber(n) {
-    if (PagesMapper.#pagesNumber === n) {
-      return;
-    }
-    PagesMapper.#pagesNumber = n;
-    const pageNumberToId = PagesMapper.#pageNumberToId = new Uint32Array(2 * n);
-    const idToPageNumber = PagesMapper.#idToPageNumber = pageNumberToId.subarray(n);
-    for (let i = 0; i < n; i++) {
-      pageNumberToId[i] = idToPageNumber[i] = i + 1;
-    }
-  }
-  movePages(selectedPages, pagesToMove, index) {
-    const pageNumberToId = PagesMapper.#pageNumberToId;
-    const idToPageNumber = PagesMapper.#idToPageNumber;
-    const movedCount = pagesToMove.length;
-    const mappedPagesToMove = new Uint32Array(movedCount);
-    let removedBeforeTarget = 0;
-    for (let i = 0; i < movedCount; i++) {
-      const pageIndex = pagesToMove[i] - 1;
-      mappedPagesToMove[i] = pageNumberToId[pageIndex];
-      if (pageIndex < index) {
-        removedBeforeTarget += 1;
-      }
-    }
-    const pagesNumber = PagesMapper.#pagesNumber;
-    let adjustedTarget = index - removedBeforeTarget;
-    const remainingLen = pagesNumber - movedCount;
-    adjustedTarget = MathClamp(adjustedTarget, 0, remainingLen);
-    for (let i = 0, r = 0; i < pagesNumber; i++) {
-      if (!selectedPages.has(i + 1)) {
-        pageNumberToId[r++] = pageNumberToId[i];
-      }
-    }
-    pageNumberToId.copyWithin(adjustedTarget + movedCount, adjustedTarget, remainingLen);
-    pageNumberToId.set(mappedPagesToMove, adjustedTarget);
-    for (let i = 0, ii = pagesNumber; i < ii; i++) {
-      idToPageNumber[pageNumberToId[i] - 1] = i + 1;
-    }
-  }
-  getPageNumber(id) {
-    return PagesMapper.#idToPageNumber?.[id - 1] ?? id;
-  }
-  getPageId(pageNumber) {
-    return PagesMapper.#pageNumberToId?.[pageNumber - 1] ?? pageNumber;
-  }
-  static get instance() {
-    return shadow(this, "instance", new PagesMapper());
-  }
-  getMapping() {
-    return PagesMapper.#pageNumberToId.subarray(0, this.pagesNumber);
-  }
-}
 
 ;// ./web/app_options.js
 const OptionKind = {
@@ -4298,9 +4240,15 @@ class CommentPopup {
           }
         }
       });
-      this.#editor.comment = null;
-      this.#editor.focus();
+      const editor = this.#editor;
+      const savedData = editor.comment;
       this.destroy();
+      if (savedData?.text) {
+        editor._uiManager.deleteComment(editor, savedData);
+      } else {
+        editor.comment = null;
+      }
+      editor.focus();
     });
     del.addEventListener("contextmenu", noContextMenu);
     buttons.append(edit, del);
@@ -4512,6 +4460,7 @@ class EditorUndoBar {
     stamp: "pdfjs-editor-undo-bar-message-stamp",
     ink: "pdfjs-editor-undo-bar-message-ink",
     signature: "pdfjs-editor-undo-bar-message-signature",
+    comment: "pdfjs-editor-undo-bar-message-comment",
     _multiple: "pdfjs-editor-undo-bar-message-multiple"
   });
   constructor({
@@ -5618,7 +5567,6 @@ class PDFFindController {
   #state = null;
   #updateMatchesCountOnProgress = true;
   #visitedPagesCount = 0;
-  #pagesMapper = PagesMapper.instance;
   constructor({
     linkService,
     eventBus,
@@ -5875,12 +5823,11 @@ class PDFFindController {
     if (query.length === 0) {
       return;
     }
-    const pageId = this.getPageId(pageIndex);
-    const pageContent = this._pageContents[pageId];
+    const pageContent = this._pageContents[pageIndex];
     const matcherResult = this.match(query, pageContent, pageIndex);
     const matches = this._pageMatches[pageIndex] = [];
     const matchesLength = this._pageMatchesLength[pageIndex] = [];
-    const diffs = this._pageDiffs[pageId];
+    const diffs = this._pageDiffs[pageIndex];
     matcherResult?.forEach(({
       index,
       length
@@ -5909,7 +5856,7 @@ class PDFFindController {
     }
   }
   match(query, pageContent, pageIndex) {
-    const hasDiacritics = this._hasDiacritics[this.getPageId(pageIndex)];
+    const hasDiacritics = this._hasDiacritics[pageIndex];
     let isUnicode = false;
     if (typeof query === "string") {
       [isUnicode, query] = this.#convertToRegExpString(query, hasDiacritics);
@@ -5982,27 +5929,19 @@ class PDFFindController {
       });
     }
   }
-  getPageNumber(idx) {
-    return this.#pagesMapper.getPageNumber(idx + 1) - 1;
-  }
-  getPageId(pageNumber) {
-    return this.#pagesMapper.getPageId(pageNumber + 1) - 1;
-  }
   #updatePage(index) {
     if (this._scrollMatches && this._selected.pageIdx === index) {
       this._linkService.page = index + 1;
     }
     this._eventBus.dispatch("updatetextlayermatches", {
       source: this,
-      pageIndex: index,
-      pageId: this.getPageId(index)
+      pageIndex: index
     });
   }
   #updateAllPages() {
     this._eventBus.dispatch("updatetextlayermatches", {
       source: this,
-      pageIndex: -1,
-      pageId: -1
+      pageIndex: -1
     });
   }
   #nextMatch() {
@@ -6027,7 +5966,7 @@ class PDFFindController {
           continue;
         }
         this._pendingFindMatches.add(i);
-        this._extractTextPromises[this.getPageId(i)].then(() => {
+        this._extractTextPromises[i].then(() => {
           this._pendingFindMatches.delete(i);
           this.#calculateMatch(i);
         });
@@ -6117,12 +6056,23 @@ class PDFFindController {
       this.#updatePage(this._selected.pageIdx);
     }
   }
-  #onPagesEdited() {
+  #onPagesEdited({
+    pagesMapper
+  }) {
     if (this._extractTextPromises.length === 0) {
       return;
     }
     this.#onFindBarClose();
     this._dirtyMatch = true;
+    const prevTextPromises = this._extractTextPromises;
+    const extractTextPromises = this._extractTextPromises.length = [];
+    for (let i = 0, ii = pagesMapper.length; i < ii; i++) {
+      const prevPageIndex = pagesMapper.getPrevPageNumber(i + 1) - 1;
+      if (prevPageIndex === -1) {
+        continue;
+      }
+      extractTextPromises.push(prevTextPromises[prevPageIndex] || Promise.resolve());
+    }
   }
   #onFindBarClose(evt) {
     const pdfDocument = this._pdfDocument;
@@ -8306,6 +8256,161 @@ class PdfTextExtractor {
   }
 }
 
+;// ./web/menu.js
+
+class Menu {
+  #triggeringButton;
+  #menu;
+  #menuItems;
+  #openMenuAC = null;
+  #menuAC = new AbortController();
+  #lastIndex = -1;
+  constructor(menuContainer, triggeringButton, menuItems) {
+    this.#menu = menuContainer;
+    this.#triggeringButton = triggeringButton;
+    if (Array.isArray(menuItems)) {
+      this.#menuItems = menuItems;
+    } else {
+      this.#menuItems = [];
+      for (const button of this.#menu.querySelectorAll("button")) {
+        this.#menuItems.push(button);
+      }
+    }
+    this.#setUpMenu();
+  }
+  #closeMenu() {
+    if (!this.#openMenuAC) {
+      return;
+    }
+    const menu = this.#menu;
+    this.#triggeringButton.ariaExpanded = "false";
+    this.#openMenuAC.abort();
+    this.#openMenuAC = null;
+    if (menu.contains(document.activeElement)) {
+      setTimeout(() => {
+        if (!menu.contains(document.activeElement)) {
+          this.#triggeringButton.focus();
+        }
+      }, 0);
+    }
+    this.#lastIndex = -1;
+  }
+  #setUpMenu() {
+    this.#triggeringButton.addEventListener("click", e => {
+      if (this.#openMenuAC) {
+        this.#closeMenu();
+        return;
+      }
+      const menu = this.#menu;
+      this.#triggeringButton.ariaExpanded = "true";
+      this.#openMenuAC = new AbortController();
+      const signal = AbortSignal.any([this.#menuAC.signal, this.#openMenuAC.signal]);
+      window.addEventListener("pointerdown", ({
+        target
+      }) => {
+        if (target !== this.#triggeringButton && !menu.contains(target)) {
+          this.#closeMenu();
+        }
+      }, {
+        signal
+      });
+      window.addEventListener("blur", this.#closeMenu.bind(this), {
+        signal
+      });
+    });
+    const {
+      signal
+    } = this.#menuAC;
+    this.#menu.addEventListener("keydown", e => {
+      switch (e.key) {
+        case "Escape":
+          this.#closeMenu();
+          stopEvent(e);
+          break;
+        case "ArrowDown":
+        case "Tab":
+          this.#goToNextItem(e.target, true);
+          stopEvent(e);
+          break;
+        case "ArrowUp":
+        case "ShiftTab":
+          this.#goToNextItem(e.target, false);
+          stopEvent(e);
+          break;
+        case "Home":
+          this.#menuItems.find(item => !item.disabled && !item.classList.contains("hidden")).focus();
+          stopEvent(e);
+          break;
+        case "End":
+          this.#menuItems.findLast(item => !item.disabled && !item.classList.contains("hidden")).focus();
+          stopEvent(e);
+          break;
+        default:
+          const char = e.key.toLocaleLowerCase();
+          this.#goToNextItem(e.target, true, item => item.textContent.trim().toLowerCase().startsWith(char));
+          stopEvent(e);
+          break;
+      }
+    }, {
+      signal,
+      capture: true
+    });
+    this.#menu.addEventListener("contextmenu", noContextMenu, {
+      signal
+    });
+    this.#menu.addEventListener("click", this.#closeMenu.bind(this), {
+      signal,
+      capture: true
+    });
+    this.#triggeringButton.addEventListener("keydown", e => {
+      switch (e.key) {
+        case " ":
+        case "Enter":
+        case "ArrowDown":
+        case "Home":
+          if (!this.#openMenuAC) {
+            this.#triggeringButton.click();
+          }
+          this.#menuItems.find(item => !item.disabled && !item.classList.contains("hidden")).focus();
+          stopEvent(e);
+          break;
+        case "ArrowUp":
+        case "End":
+          if (!this.#openMenuAC) {
+            this.#triggeringButton.click();
+          }
+          this.#menuItems.findLast(item => !item.disabled && !item.classList.contains("hidden")).focus();
+          stopEvent(e);
+          break;
+        case "Escape":
+          this.#closeMenu();
+          stopEvent(e);
+          break;
+      }
+    }, {
+      signal
+    });
+  }
+  #goToNextItem(element, forward, check = () => true) {
+    const index = this.#lastIndex === -1 ? this.#menuItems.indexOf(element) : this.#lastIndex;
+    const len = this.#menuItems.length;
+    const increment = forward ? 1 : len - 1;
+    for (let i = (index + increment) % len; i !== index; i = (i + increment) % len) {
+      const menuItem = this.#menuItems[i];
+      if (!menuItem.disabled && !menuItem.classList.contains("hidden") && check(menuItem)) {
+        menuItem.focus();
+        this.#lastIndex = i;
+        break;
+      }
+    }
+  }
+  destroy() {
+    this.#closeMenu();
+    this.#menuAC?.abort();
+    this.#menuAC = null;
+  }
+}
+
 ;// ./web/pdf_thumbnail_view.js
 
 
@@ -8348,7 +8453,7 @@ class PDFThumbnailView {
     enableSplitMerge = false
   }) {
     this.id = id;
-    this.renderingId = "thumbnail" + id;
+    this.renderingId = `thumbnail${id}`;
     this.pageLabel = null;
     this.pdfPage = null;
     this.rotation = 0;
@@ -8384,6 +8489,12 @@ class PDFThumbnailView {
     imageContainer.append(image);
     container.append(imageContainer);
   }
+  updateId(newId) {
+    this.id = newId;
+    this.renderingId = `thumbnail${newId}`;
+    this.div.setAttribute("page-number", newId);
+    this.setPageLabel(this.pageLabel);
+  }
   #updateDims() {
     const {
       width,
@@ -8622,6 +8733,7 @@ class PDFThumbnailView {
 
 
 
+
 const SCROLL_OPTIONS = {
   behavior: "instant",
   block: "nearest",
@@ -8650,7 +8762,7 @@ class PDFThumbnailViewer {
   #currentScrollBottom = 0;
   #currentScrollTop = 0;
   #pagesMapper = PagesMapper.instance;
-  #originalThumbnails = null;
+  #manageSaveAsButton = null;
   constructor({
     container,
     eventBus,
@@ -8661,7 +8773,8 @@ class PDFThumbnailViewer {
     pageColors,
     abortSignal,
     enableHWA,
-    enableSplitMerge
+    enableSplitMerge,
+    manageMenu
   }) {
     this.scrollableContainer = container.parentElement;
     this.container = container;
@@ -8673,6 +8786,26 @@ class PDFThumbnailViewer {
     this.pageColors = pageColors || null;
     this.enableHWA = enableHWA || false;
     this.#enableSplitMerge = enableSplitMerge || false;
+    if (this.#enableSplitMerge && manageMenu) {
+      const {
+        button,
+        menu,
+        copy,
+        cut,
+        delete: del,
+        saveAs
+      } = manageMenu;
+      this._manageMenu = new Menu(menu, button, [copy, cut, del, saveAs]);
+      this.#manageSaveAsButton = saveAs;
+      saveAs.addEventListener("click", () => {
+        this.eventBus.dispatch("savepageseditedpdf", {
+          source: this,
+          data: this.#pagesMapper.getPageMappingForSaving()
+        });
+      });
+    } else {
+      manageMenu.button.hidden = true;
+    }
     this.scroll = watchScroll(this.scrollableContainer, this.#scrollUpdated.bind(this), abortSignal);
     this.#resetView();
     this.#addEventListeners();
@@ -8870,6 +9003,25 @@ class PDFThumbnailViewer {
   static #getScaleFactor(image) {
     return PDFThumbnailViewer.#draggingScaleFactor ||= parseFloat(getComputedStyle(image).getPropertyValue("--thumbnail-dragging-scale"));
   }
+  #updateThumbnails() {
+    const pagesMapper = this.#pagesMapper;
+    this.container.replaceChildren();
+    const prevThumbnails = this._thumbnails;
+    const newThumbnails = this._thumbnails = [];
+    const fragment = document.createDocumentFragment();
+    for (let i = 0, ii = pagesMapper.pagesNumber; i < ii; i++) {
+      const prevPageIndex = pagesMapper.getPrevPageNumber(i + 1) - 1;
+      if (prevPageIndex === -1) {
+        continue;
+      }
+      const newThumbnail = prevThumbnails[prevPageIndex];
+      newThumbnails.push(newThumbnail);
+      newThumbnail.updateId(i + 1);
+      newThumbnail.checkbox.checked = false;
+      fragment.append(newThumbnail.div);
+    }
+    this.container.append(fragment);
+  }
   #onStartDragging(draggedThumbnail) {
     this.#currentScrollTop = this.scrollableContainer.scrollTop;
     this.#currentScrollBottom = this.#currentScrollTop + this.scrollableContainer.clientHeight;
@@ -8919,7 +9071,6 @@ class PDFThumbnailViewer {
     this.#dragMarker = null;
     this.#dragAC.abort();
     this.#dragAC = null;
-    this.#originalThumbnails ||= this._thumbnails;
     this.container.classList.remove("isDragging");
     for (const selected of this.#selectedPages) {
       const thumbnail = this._thumbnails[selected - 1];
@@ -8943,49 +9094,28 @@ class PDFThumbnailViewer {
     if (!isNaN(lastDraggedOverIndex) && isDropping && !(selectedPages.size === 1 && (selectedPages.has(lastDraggedOverIndex + 1) || selectedPages.has(lastDraggedOverIndex + 2)))) {
       const newIndex = lastDraggedOverIndex + 1;
       const pagesToMove = Array.from(selectedPages).sort((a, b) => a - b);
-      const movedCount = pagesToMove.length;
-      const thumbnails = this._thumbnails;
       const pagesMapper = this.#pagesMapper;
-      const N = thumbnails.length;
-      pagesMapper.pagesNumber = N;
       const currentPageId = pagesMapper.getPageId(this._currentPageNumber);
       const newCurrentPageId = pagesMapper.getPageId(isNaN(this.#pageNumberToRemove) ? pagesToMove[0] : this.#pageNumberToRemove);
-      let thumbnail = thumbnails[pagesToMove[0] - 1];
-      thumbnail.checkbox.checked = false;
-      if (newIndex === 0) {
-        thumbnails[0].div.before(thumbnail.div);
-      } else {
-        thumbnails[newIndex - 1].div.after(thumbnail.div);
-      }
-      for (let i = 1; i < movedCount; i++) {
-        const newThumbnail = thumbnails[pagesToMove[i] - 1];
-        newThumbnail.checkbox.checked = false;
-        thumbnail.div.after(newThumbnail.div);
-        thumbnail = newThumbnail;
-      }
       this.eventBus.dispatch("beforepagesedited", {
         source: this,
-        pagesMapper,
-        index: newIndex,
-        pagesToMove
+        pagesMapper
       });
       pagesMapper.movePages(selectedPages, pagesToMove, newIndex);
-      const newThumbnails = this._thumbnails = new Array(N);
-      const originalThumbnails = this.#originalThumbnails;
-      for (let i = 0; i < N; i++) {
-        const newThumbnail = newThumbnails[i] = originalThumbnails[pagesMapper.getPageId(i + 1) - 1];
-        newThumbnail.div.setAttribute("page-number", i + 1);
-      }
+      this.#updateThumbnails();
       this._currentPageNumber = pagesMapper.getPageNumber(currentPageId);
       this.#computeThumbnailsPosition();
       selectedPages.clear();
       this.#pageNumberToRemove = NaN;
-      this.eventBus.dispatch("pagesedited", {
-        source: this,
-        pagesMapper,
-        index: newIndex,
-        pagesToMove
-      });
+      const isIdentity = this.#manageSaveAsButton.disabled = !this.#pagesMapper.hasBeenAltered();
+      if (!isIdentity) {
+        this.eventBus.dispatch("pagesedited", {
+          source: this,
+          pagesMapper,
+          index: newIndex,
+          pagesToMove
+        });
+      }
       const newCurrentPageNumber = pagesMapper.getPageNumber(newCurrentPageId);
       setTimeout(() => {
         this.linkService.goToPage(newCurrentPageNumber);
@@ -9068,6 +9198,9 @@ class PDFThumbnailViewer {
         offsetWidth: w,
         offsetHeight: h
       } = div;
+      if (w === 0) {
+        return;
+      }
       bbox[i * 4] = x;
       bbox[i * 4 + 1] = y;
       bbox[i * 4 + 2] = w;
@@ -10031,18 +10164,13 @@ class BasePDFPageView {
 
 class DrawLayerBuilder {
   #drawLayer = null;
-  constructor(options) {
-    this.pageIndex = options.pageIndex;
-  }
   async render({
     intent = "display"
   }) {
     if (intent !== "display" || this.#drawLayer || this._cancelled) {
       return;
     }
-    this.#drawLayer = new DrawLayer({
-      pageIndex: this.pageIndex
-    });
+    this.#drawLayer = new DrawLayer();
   }
   cancel() {
     this._cancelled = true;
@@ -10741,7 +10869,7 @@ class TextHighlighter {
     if (!this.#eventAbortController) {
       this.#eventAbortController = new AbortController();
       this.eventBus._on("updatetextlayermatches", evt => {
-        if (evt.pageId === this.pageIdx || evt.pageId === -1) {
+        if (evt.pageIndex === this.pageIdx || evt.pageIndex === -1) {
           this._updateMatches();
         }
       }, {
@@ -10810,7 +10938,7 @@ class TextHighlighter {
       textContentItemsStr,
       textDivs
     } = this;
-    const isSelectedPage = findController.getPageNumber(pageIdx) === findController.selected.pageIdx;
+    const isSelectedPage = pageIdx === findController.selected.pageIdx;
     const selectedMatchIdx = findController.selected.matchIdx;
     const highlightAll = findController.state.highlightAll;
     let prevEnd = null;
@@ -10895,7 +11023,7 @@ class TextHighlighter {
         findController.scrollMatchIntoView({
           element: textDivs[begin.divIdx],
           selectedLeft,
-          pageIndex: findController.getPageNumber(pageIdx),
+          pageIndex: pageIdx,
           matchIndex: selectedMatchIdx
         });
       }
@@ -10930,9 +11058,8 @@ class TextHighlighter {
     if (!findController?.highlightMatches || reset) {
       return;
     }
-    const pageNumber = findController.getPageNumber(pageIdx);
-    const pageMatches = findController.pageMatches[pageNumber] || null;
-    const pageMatchesLength = findController.pageMatchesLength[pageNumber] || null;
+    const pageMatches = findController.pageMatches[pageIdx] || null;
+    const pageMatchesLength = findController.pageMatchesLength[pageIdx] || null;
     this.matches = this._convertMatches(pageMatches, pageMatchesLength);
     this._renderMatches(this.matches);
   }
@@ -11229,6 +11356,25 @@ class PDFPageView extends BasePDFPageView {
     }
     setLayerDimensions(div, viewport, true, false);
   }
+  updatePageNumber(newPageNumber) {
+    if (this.id === newPageNumber) {
+      return;
+    }
+    this.id = newPageNumber;
+    this.renderingId = `page${newPageNumber}`;
+    if (this.pdfPage) {
+      this.pdfPage.pageNumber = newPageNumber;
+    }
+    this.setPageLabel(this.pageLabel);
+    const {
+      div
+    } = this;
+    div.setAttribute("data-page-number", newPageNumber);
+    div.setAttribute("data-l10n-args", JSON.stringify({
+      page: newPageNumber
+    }));
+    this._textHighlighter.pageIdx = newPageNumber - 1;
+  }
   setPdfPage(pdfPage) {
     this.pdfPage = pdfPage;
     this.pdfPageRotate = pdfPage.rotate;
@@ -11803,9 +11949,7 @@ class PDFPageView extends BasePDFPageView {
       if (!annotationEditorUIManager) {
         return;
       }
-      this.drawLayer ||= new DrawLayerBuilder({
-        pageIndex: this.id
-      });
+      this.drawLayer ||= new DrawLayerBuilder();
       await this.#renderDrawLayer();
       this.drawLayer.setParent(canvasWrapper);
       if (this.annotationLayer || this.#annotationMode === AnnotationMode.DISABLE) {
@@ -11962,10 +12106,9 @@ class PDFViewer {
   #supportsPinchToZoom = true;
   #textLayerMode = TextLayerMode.ENABLE;
   #viewerAlert = null;
-  #originalPages = null;
   #pagesMapper = PagesMapper.instance;
   constructor(options) {
-    const viewerVersion = "5.4.569";
+    const viewerVersion = "5.4.590";
     if (version !== viewerVersion) {
       throw new Error(`The API version "${version}" does not match the Viewer version "${viewerVersion}".`);
     }
@@ -12328,6 +12471,7 @@ class PDFViewer {
       this.#annotationEditorUIManager = null;
       this.#annotationEditorMode = AnnotationEditorType.NONE;
       this.#printingAllowed = true;
+      this.#pagesMapper.pagesNumber = 0;
     }
     this.pdfDocument = pdfDocument;
     if (!pdfDocument) {
@@ -12536,36 +12680,43 @@ class PDFViewer {
       this._pagesCapability.reject(reason);
     });
   }
-  onBeforePagesEdited() {
-    this._currentPageId = this.#pagesMapper.getPageId(this._currentPageNumber);
+  async onBeforePagesEdited({
+    pagesMapper
+  }) {
+    await this._pagesCapability.promise;
+    this._currentPageId = pagesMapper.getPageId(this._currentPageNumber);
   }
   onPagesEdited({
-    index,
-    pagesToMove
+    pagesMapper
   }) {
-    const pagesMapper = this.#pagesMapper;
     this._currentPageNumber = pagesMapper.getPageNumber(this._currentPageId);
+    const prevPages = this._pages;
+    const newPages = this._pages = [];
+    for (let i = 0, ii = pagesMapper.pagesNumber; i < ii; i++) {
+      const prevPageNumber = pagesMapper.getPrevPageNumber(i + 1) - 1;
+      if (prevPageNumber === -1) {
+        continue;
+      }
+      const page = prevPages[prevPageNumber];
+      newPages[i] = page;
+      page.updatePageNumber(i + 1);
+    }
     const viewerElement = this._scrollMode === ScrollMode.PAGE ? null : this.viewer;
     if (viewerElement) {
-      const pages = this._pages;
-      let page = pages[pagesToMove[0] - 1].div;
-      if (index === 0) {
-        pages[0].div.before(page);
-      } else {
-        pages[index - 1].div.after(page);
-      }
-      for (let i = 1, ii = pagesToMove.length; i < ii; i++) {
-        const newPage = pages[pagesToMove[i] - 1].div;
-        page.after(newPage);
-        page = newPage;
+      viewerElement.replaceChildren();
+      const fragment = document.createDocumentFragment();
+      for (let i = 0, ii = pagesMapper.pagesNumber; i < ii; i++) {
+        const {
+          div
+        } = newPages[i];
+        div.setAttribute("data-page-number", i + 1);
+        fragment.append(div);
       }
+      viewerElement.append(fragment);
     }
-    this.#originalPages ||= this._pages;
-    const newPages = this._pages = [];
-    for (let i = 0, ii = pagesMapper.pagesNumber; i < ii; i++) {
-      const pageView = this.#originalPages[pagesMapper.getPageId(i + 1) - 1];
-      newPages.push(pageView);
-    }
+    setTimeout(() => {
+      this.forceRendering();
+    });
   }
   setPageLabels(labels) {
     if (!this.pdfDocument) {
@@ -12677,9 +12828,8 @@ class PDFViewer {
       div,
       id
     } = pageView;
-    const pageNumber = this.#pagesMapper.getPageNumber(id);
-    if (this._currentPageNumber !== pageNumber) {
-      this._setCurrentPageNumber(pageNumber);
+    if (this._currentPageNumber !== id) {
+      this._setCurrentPageNumber(id);
     }
     if (this._scrollMode === ScrollMode.PAGE) {
       this.#ensurePageViewVisible();
@@ -12989,18 +13139,18 @@ class PDFViewer {
     }
     this.renderingQueue.renderHighestPriority(visible);
     const isSimpleLayout = this._spreadMode === SpreadMode.NONE && (this._scrollMode === ScrollMode.PAGE || this._scrollMode === ScrollMode.VERTICAL);
-    const currentId = this.#pagesMapper.getPageId(this._currentPageNumber);
+    const currentPageNumber = this._currentPageNumber;
     let stillFullyVisible = false;
     for (const page of visiblePages) {
       if (page.percent < 100) {
         break;
       }
-      if (page.id === currentId && isSimpleLayout) {
+      if (page.id === currentPageNumber && isSimpleLayout) {
         stillFullyVisible = true;
         break;
       }
     }
-    this._setCurrentPageNumber(stillFullyVisible ? this._currentPageNumber : this.#pagesMapper.getPageNumber(visiblePages[0].id));
+    this._setCurrentPageNumber(stillFullyVisible ? this._currentPageNumber : visiblePages[0].id);
     this._updateLocation(visible.first);
     this.eventBus.dispatch("updateviewarea", {
       source: this,
@@ -15131,152 +15281,6 @@ class ViewHistory {
   }
 }
 
-;// ./web/menu.js
-
-class Menu {
-  #triggeringButton;
-  #menu;
-  #menuItems;
-  #openMenuAC = null;
-  #menuAC = new AbortController();
-  #lastIndex = -1;
-  constructor(menuContainer, triggeringButton, menuItems) {
-    this.#menu = menuContainer;
-    this.#triggeringButton = triggeringButton;
-    if (Array.isArray(menuItems)) {
-      this.#menuItems = menuItems;
-    } else {
-      this.#menuItems = [];
-      for (const button of this.#menu.querySelectorAll("button")) {
-        this.#menuItems.push(button);
-      }
-    }
-    this.#setUpMenu();
-  }
-  #closeMenu() {
-    if (!this.#openMenuAC) {
-      return;
-    }
-    const menu = this.#menu;
-    menu.classList.toggle("hidden", true);
-    this.#triggeringButton.ariaExpanded = "false";
-    this.#openMenuAC.abort();
-    this.#openMenuAC = null;
-    if (menu.contains(document.activeElement)) {
-      setTimeout(() => {
-        if (!menu.contains(document.activeElement)) {
-          this.#triggeringButton.focus();
-        }
-      }, 0);
-    }
-    this.#lastIndex = -1;
-  }
-  #setUpMenu() {
-    this.#triggeringButton.addEventListener("click", e => {
-      if (this.#openMenuAC) {
-        this.#closeMenu();
-        return;
-      }
-      const menu = this.#menu;
-      menu.classList.toggle("hidden", false);
-      this.#triggeringButton.ariaExpanded = "true";
-      this.#openMenuAC = new AbortController();
-      const signal = AbortSignal.any([this.#menuAC.signal, this.#openMenuAC.signal]);
-      window.addEventListener("pointerdown", ({
-        target
-      }) => {
-        if (target !== this.#triggeringButton && !menu.contains(target)) {
-          this.#closeMenu();
-        }
-      }, {
-        signal
-      });
-      window.addEventListener("blur", this.#closeMenu.bind(this), {
-        signal
-      });
-    });
-    const {
-      signal
-    } = this.#menuAC;
-    this.#menu.addEventListener("keydown", e => {
-      switch (e.key) {
-        case "Escape":
-          this.#closeMenu();
-          stopEvent(e);
-          break;
-        case "ArrowDown":
-        case "Tab":
-          this.#goToNextItem(e.target, true);
-          stopEvent(e);
-          break;
-        case "ArrowUp":
-        case "ShiftTab":
-          this.#goToNextItem(e.target, false);
-          stopEvent(e);
-          break;
-        case "Home":
-          this.#menuItems.find(item => !item.disabled && !item.classList.contains("hidden")).focus();
-          stopEvent(e);
-          break;
-        case "End":
-          this.#menuItems.findLast(item => !item.disabled && !item.classList.contains("hidden")).focus();
-          stopEvent(e);
-          break;
-      }
-    }, {
-      signal,
-      capture: true
-    });
-    this.#menu.addEventListener("contextmenu", noContextMenu, {
-      signal
-    });
-    this.#menu.addEventListener("click", this.#closeMenu.bind(this), {
-      signal,
-      capture: true
-    });
-    this.#triggeringButton.addEventListener("keydown", ev => {
-      if (!this.#openMenuAC) {
-        return;
-      }
-      switch (ev.key) {
-        case "ArrowDown":
-        case "Home":
-          this.#menuItems.find(item => !item.disabled && !item.classList.contains("hidden")).focus();
-          stopEvent(ev);
-          break;
-        case "ArrowUp":
-        case "End":
-          this.#menuItems.findLast(item => !item.disabled && !item.classList.contains("hidden")).focus();
-          stopEvent(ev);
-          break;
-        case "Escape":
-          this.#closeMenu();
-          stopEvent(ev);
-      }
-    }, {
-      signal
-    });
-  }
-  #goToNextItem(element, forward) {
-    const index = this.#lastIndex === -1 ? this.#menuItems.indexOf(element) : this.#lastIndex;
-    const len = this.#menuItems.length;
-    const increment = forward ? 1 : len - 1;
-    for (let i = (index + increment) % len; i !== index; i = (i + increment) % len) {
-      const menuItem = this.#menuItems[i];
-      if (!menuItem.disabled && !menuItem.classList.contains("hidden")) {
-        menuItem.focus();
-        this.#lastIndex = i;
-        break;
-      }
-    }
-  }
-  destroy() {
-    this.#closeMenu();
-    this.#menuAC?.abort();
-    this.#menuAC = null;
-  }
-}
-
 ;// ./web/views_manager.js
 
 
@@ -15922,7 +15926,8 @@ const PDFViewerApplication = {
         pageColors,
         abortSignal,
         enableHWA,
-        enableSplitMerge: AppOptions.get("enableSplitMerge")
+        enableSplitMerge: AppOptions.get("enableSplitMerge"),
+        manageMenu: appConfig.viewsManager.manageMenu
       });
       renderingQueue.setThumbnailViewer(this.pdfThumbnailViewer);
     }
@@ -16882,6 +16887,7 @@ const PDFViewerApplication = {
     eventBus._on("setpreference", evt => preferences.set(evt.name, evt.value), opts);
     eventBus._on("pagesedited", this.onPagesEdited.bind(this), opts);
     eventBus._on("beforepagesedited", this.onBeforePagesEdited.bind(this), opts);
+    eventBus._on("savepageseditedpdf", this.onSavePagesEditedPDF.bind(this), opts);
   },
   bindWindowEvents() {
     if (this._windowAbortController) {
@@ -17016,6 +17022,29 @@ const PDFViewerApplication = {
   onPagesEdited(data) {
     this.pdfViewer.onPagesEdited(data);
   },
+  async onSavePagesEditedPDF({
+    data: {
+      includePages,
+      excludePages,
+      pageIndices
+    }
+  }) {
+    if (!this.pdfDocument) {
+      return;
+    }
+    const pageInfo = {
+      document: null,
+      includePages,
+      excludePages,
+      pageIndices
+    };
+    const modifiedPdfBytes = await this.pdfDocument.extractPages([pageInfo]);
+    if (!modifiedPdfBytes) {
+      console.error("Something wrong happened when saving the edited PDF.\nPlease file a bug.");
+      return;
+    }
+    this.downloadManager.download(modifiedPdfBytes, this._downloadUrl, this._docFilename);
+  },
   _accumulateTicks(ticks, prop) {
     if (this[prop] > 0 && ticks < 0 || this[prop] < 0 && ticks > 0) {
       this[prop] = 0;
@@ -17668,7 +17697,15 @@ function getViewerConfiguration() {
       layersView: document.getElementById("layersView"),
       viewsManagerAddFileButton: document.getElementById("viewsManagerAddFileButton"),
       viewsManagerCurrentOutlineButton: document.getElementById("viewsManagerCurrentOutlineButton"),
-      viewsManagerHeaderLabel: document.getElementById("viewsManagerHeaderLabel")
+      viewsManagerHeaderLabel: document.getElementById("viewsManagerHeaderLabel"),
+      manageMenu: {
+        button: document.getElementById("viewsManagerStatusActionButton"),
+        menu: document.getElementById("viewsManagerStatusActionOptions"),
+        copy: document.getElementById("viewsManagerStatusActionCopy"),
+        cut: document.getElementById("viewsManagerStatusActionCut"),
+        delete: document.getElementById("viewsManagerStatusActionDelete"),
+        saveAs: document.getElementById("viewsManagerStatusActionSaveAs")
+      }
     },
     findBar: {
       bar: document.getElementById("findbar"),
diff --git a/toolkit/components/pdfjs/moz.yaml b/toolkit/components/pdfjs/moz.yaml
index 31e6cab3d30b7..c669a174a0106 100644
--- a/toolkit/components/pdfjs/moz.yaml
+++ b/toolkit/components/pdfjs/moz.yaml
@@ -20,8 +20,8 @@ origin:
 
   # Human-readable identifier for this version/release
   # Generally "version NNN", "tag SSS", "bookmark SSS"
-  release: 6a4a3b060dfe0bf9d48900ce2a43bb39fd186cf8 (2026-01-19T18:08:32Z).
-  revision: 6a4a3b060dfe0bf9d48900ce2a43bb39fd186cf8
+  release: 550520193085788c1dbb1dac0d4565109fbbb49f (2026-01-26T18:25:50Z).
+  revision: 550520193085788c1dbb1dac0d4565109fbbb49f
 
   # The package's license, where possible using the mnemonic from
   # https://spdx.org/licenses/
diff --git a/toolkit/locales/en-US/toolkit/pdfviewer/viewer.ftl b/toolkit/locales/en-US/toolkit/pdfviewer/viewer.ftl
index 3b3760605755d..9c6636de7829a 100644
--- a/toolkit/locales/en-US/toolkit/pdfviewer/viewer.ftl
+++ b/toolkit/locales/en-US/toolkit/pdfviewer/viewer.ftl
@@ -561,6 +561,7 @@ pdfjs-editor-undo-bar-message-freetext = Text removed
 pdfjs-editor-undo-bar-message-ink = Drawing removed
 pdfjs-editor-undo-bar-message-stamp = Image removed
 pdfjs-editor-undo-bar-message-signature = Signature removed
+pdfjs-editor-undo-bar-message-comment = Comment removed
 # Variables:
 #   $count (Number) - the number of removed annotations.
 pdfjs-editor-undo-bar-message-multiple =

From 3e399534e062e55dc92752a46aa63ebd2e62ddf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Wang?= <fwang@igalia.com>
Date: Thu, 29 Jan 2026 08:17:53 +0000
Subject: [PATCH 008/116] Bug 2013020 - Always run math-font-001.html with
 font-family: math enabled. r=emilio

This is necessary because it's only enabled in nightly for now.

Differential Revision: https://phabricator.services.mozilla.com/D280754
---
 .../mozilla/meta/mathml/fonts/math-font-001.html.ini           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testing/web-platform/mozilla/meta/mathml/fonts/math-font-001.html.ini b/testing/web-platform/mozilla/meta/mathml/fonts/math-font-001.html.ini
index 92d55e3a39daa..c8d9ec5e98f63 100644
--- a/testing/web-platform/mozilla/meta/mathml/fonts/math-font-001.html.ini
+++ b/testing/web-platform/mozilla/meta/mathml/fonts/math-font-001.html.ini
@@ -1,2 +1,3 @@
 [math-font-001.html]
-  prefs: [font.name-list.serif.x-math: Consolas\, Menlo\, Droid Sans Mono\, Liberation Mono\, monospace]
+  prefs: [mathml.font_family_math.enabled: true,
+          font.name-list.serif.x-math: Consolas\, Menlo\, Droid Sans Mono\, Liberation Mono\, monospace]

From ad5f6bf5cea671b1f78f43ba3c6085f58086d3d4 Mon Sep 17 00:00:00 2001
From: Bob Owen <bobowencode@gmail.com>
Date: Thu, 29 Jan 2026 09:00:40 +0000
Subject: [PATCH 009/116] Bug 2010286: Add sandbox rules for GetUserGeoID.
 r=handyman

Differential Revision: https://phabricator.services.mozilla.com/D279940
---
 .../sandbox/win/src/sandboxbroker/sandboxBroker.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp b/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
index f74e2869b451c..6f69ce6f66cf4 100644
--- a/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
+++ b/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
@@ -1321,6 +1321,19 @@ void SandboxBroker::SetSecurityLevelForContentProcess(int32_t aSandboxLevel,
       NS_ERROR("Failed to get user's SID.");
       LOG_E("Failed to get user's SID. %lx", ::GetLastError());
     }
+
+    // Required for GetUserGeoID, which is used to get timezone information.
+    bool geoRuleSet =
+        config->AllowRegistryRead(L"HKEY_CURRENT_USER") ==
+            sandbox::SBOX_ALL_OK &&
+        config->AllowRegistryRead(
+            L"HKEY_CURRENT_USER\\Control Panel\\International\\Geo") ==
+            sandbox::SBOX_ALL_OK;
+    if (!geoRuleSet) {
+      NS_ERROR("Failed to add rule for International Geo.");
+      LOG_E("Failed (ResultCode %d) to add rule for International Geo.",
+            result);
+    }
   }
 }
 

From 481a2f35a2c6e6c6ad854cd1217f297b393f0680 Mon Sep 17 00:00:00 2001
From: Bob Owen <bobowencode@gmail.com>
Date: Thu, 29 Jan 2026 09:10:41 +0000
Subject: [PATCH 010/116] Bug 1299611: Adjust LowLevelPolicy::Done byte
 accounting. r=handyman

Differential Revision: https://phabricator.services.mozilla.com/D279947
---
 ...st_accounting_in_LowLevelPolicy_Done.patch | 49 +++++++++++++++++++
 .../sandbox/win/src/policy_low_level.cc       | 17 +++++--
 2 files changed, 62 insertions(+), 4 deletions(-)
 create mode 100644 security/sandbox/chromium-shim/patches/53_adjust_accounting_in_LowLevelPolicy_Done.patch

diff --git a/security/sandbox/chromium-shim/patches/53_adjust_accounting_in_LowLevelPolicy_Done.patch b/security/sandbox/chromium-shim/patches/53_adjust_accounting_in_LowLevelPolicy_Done.patch
new file mode 100644
index 0000000000000..442ae73e5bf99
--- /dev/null
+++ b/security/sandbox/chromium-shim/patches/53_adjust_accounting_in_LowLevelPolicy_Done.patch
@@ -0,0 +1,49 @@
+Bug 1299611: Adjust LowLevelPolicy::Done byte accounting.
+
+diff --git a/sandbox/win/src/policy_low_level.cc b/sandbox/win/src/policy_low_level.cc
+index 0f47c96fbf01..111ab7a37ff1 100644
+--- a/sandbox/win/src/policy_low_level.cc
++++ b/sandbox/win/src/policy_low_level.cc
+@@ -89,6 +89,8 @@ bool LowLevelPolicy::Done() {
+       return false;
+     }
+     policy_store_->entry[static_cast<size_t>(service)] = current_buffer;
++    // Account for the opcode_count in PolicyBuffer.
++    avail_size -= sizeof PolicyBuffer::opcode_count;
+ 
+     RuleList::iterator rules_it = (*it).second.begin();
+     RuleList::iterator rules_it_end = (*it).second.end();
+@@ -103,12 +105,14 @@ bool LowLevelPolicy::Done() {
+       if (avail_size < opcodes_size) {
+         return false;
+       }
+-      size_t data_size = avail_size - opcodes_size;
++      avail_size -= opcodes_size;
++      size_t data_size = avail_size;
+       PolicyOpcode* opcodes_start = &current_buffer->opcodes[svc_opcode_count];
+       if (!rule->RebindCopy(opcodes_start, opcodes_size, buffer_end,
+                             &data_size)) {
+         return false;
+       }
++      DCHECK(avail_size >= data_size);
+       size_t used = avail_size - data_size;
+       buffer_end -= used;
+       avail_size -= used;
+@@ -116,9 +120,14 @@ bool LowLevelPolicy::Done() {
+     }
+ 
+     current_buffer->opcode_count = svc_opcode_count;
+-    size_t policy_buffers_occupied =
+-        (svc_opcode_count * sizeof(PolicyOpcode)) / sizeof(current_buffer[0]);
+-    current_buffer = &current_buffer[policy_buffers_occupied + 1];
++    size_t opcode_bytes_used = sizeof PolicyBuffer::opcode_count +
++                               (svc_opcode_count * sizeof(PolicyOpcode));
++    size_t policy_buffer_count =
++        (opcode_bytes_used + sizeof(PolicyBuffer) - 1) / sizeof(PolicyBuffer);
++    size_t byte_padding =
++        (policy_buffer_count * sizeof(PolicyBuffer)) - opcode_bytes_used;
++    avail_size -= byte_padding;
++    current_buffer += policy_buffer_count;
+   }
+ 
+   return true;
diff --git a/security/sandbox/chromium/sandbox/win/src/policy_low_level.cc b/security/sandbox/chromium/sandbox/win/src/policy_low_level.cc
index 0f47c96fbf01d..d68017565c29d 100644
--- a/security/sandbox/chromium/sandbox/win/src/policy_low_level.cc
+++ b/security/sandbox/chromium/sandbox/win/src/policy_low_level.cc
@@ -89,6 +89,8 @@ bool LowLevelPolicy::Done() {
       return false;
     }
     policy_store_->entry[static_cast<size_t>(service)] = current_buffer;
+    // Account for the opcode_count in PolicyBuffer.
+    avail_size -= sizeof PolicyBuffer::opcode_count;
 
     RuleList::iterator rules_it = (*it).second.begin();
     RuleList::iterator rules_it_end = (*it).second.end();
@@ -103,12 +105,14 @@ bool LowLevelPolicy::Done() {
       if (avail_size < opcodes_size) {
         return false;
       }
-      size_t data_size = avail_size - opcodes_size;
+      avail_size -= opcodes_size;
+      size_t data_size = avail_size;
       PolicyOpcode* opcodes_start = &current_buffer->opcodes[svc_opcode_count];
       if (!rule->RebindCopy(opcodes_start, opcodes_size, buffer_end,
                             &data_size)) {
         return false;
       }
+      DCHECK(avail_size >= data_size);
       size_t used = avail_size - data_size;
       buffer_end -= used;
       avail_size -= used;
@@ -116,9 +120,14 @@ bool LowLevelPolicy::Done() {
     }
 
     current_buffer->opcode_count = svc_opcode_count;
-    size_t policy_buffers_occupied =
-        (svc_opcode_count * sizeof(PolicyOpcode)) / sizeof(current_buffer[0]);
-    current_buffer = &current_buffer[policy_buffers_occupied + 1];
+    size_t opcode_bytes_used = sizeof PolicyBuffer::opcode_count +
+                               (svc_opcode_count * sizeof(PolicyOpcode));
+    size_t policy_buffer_count =
+        (opcode_bytes_used + sizeof(PolicyBuffer) - 1) / sizeof(PolicyBuffer);
+    size_t byte_padding =
+        (policy_buffer_count * sizeof(PolicyBuffer)) - opcode_bytes_used;
+    avail_size -= byte_padding;
+    current_buffer += policy_buffer_count;
   }
 
   return true;

From 7b9ec09080a4df1247cf455825d34dceffa2c9fc Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Thu, 29 Jan 2026 09:10:50 +0000
Subject: [PATCH 011/116] Bug 2013185. Normalize basic decoder gtests for avif.
 r=gfx-reviewers,nical

The IMAGE_GTEST_DECODER_BASE_F macro includes the 4 removed tests and 2 others that weren't being run.

Differential Revision: https://phabricator.services.mozilla.com/D280904
---
 image/test/gtest/TestDecoders.cpp | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/image/test/gtest/TestDecoders.cpp b/image/test/gtest/TestDecoders.cpp
index 4b1f6cf2b6ccd..da6ffa6dd7967 100644
--- a/image/test/gtest/TestDecoders.cpp
+++ b/image/test/gtest/TestDecoders.cpp
@@ -747,6 +747,7 @@ IMAGE_GTEST_DECODER_BASE_F(BMP)
 IMAGE_GTEST_DECODER_BASE_F(ICO)
 IMAGE_GTEST_DECODER_BASE_F(Icon)
 IMAGE_GTEST_DECODER_BASE_F(WebP)
+IMAGE_GTEST_DECODER_BASE_F(AVIF)
 #ifdef MOZ_JXL
 IMAGE_GTEST_DECODER_BASE_F(JXL)
 #endif
@@ -771,10 +772,6 @@ TEST_F(ImageDecoders, WebPTransparentNoAlphaHeaderSingleChunk) {
   CheckDecoderSingleChunk(TransparentNoAlphaHeaderWebPTestCase());
 }
 
-TEST_F(ImageDecoders, AVIFSingleChunk) {
-  CheckDecoderSingleChunk(GreenAVIFTestCase());
-}
-
 TEST_F(ImageDecoders, AVIFSingleChunkNonzeroReserved) {
   CheckDecoderSingleChunk(NonzeroReservedAVIFTestCase());
 }
@@ -926,22 +923,10 @@ TEST_F(ImageDecoders, AVIFStackCheck) {
   CheckDecoderSingleChunk(StackCheckAVIFTestCase(), /* aUseDecodePool */ true);
 }
 
-TEST_F(ImageDecoders, AVIFDelayedChunk) {
-  CheckDecoderDelayedChunk(GreenAVIFTestCase());
-}
-
-TEST_F(ImageDecoders, AVIFMultiChunk) {
-  CheckDecoderMultiChunk(GreenAVIFTestCase());
-}
-
 TEST_F(ImageDecoders, AVIFLargeMultiChunk) {
   CheckDecoderMultiChunk(LargeAVIFTestCase(), /* aChunkSize */ 64);
 }
 
-TEST_F(ImageDecoders, AVIFDownscaleDuringDecode) {
-  CheckDownscaleDuringDecode(DownscaledAVIFTestCase());
-}
-
 #ifdef MOZ_JXL
 TEST_F(ImageDecoders, JXLLargeMultiChunk) {
   CheckDecoderMultiChunk(LargeJXLTestCase(), /* aChunkSize */ 64);

From f82b6cac636345e7d143a5e5d897bc4d87d47e9d Mon Sep 17 00:00:00 2001
From: Nicolas Silva <nical@fastmail.com>
Date: Thu, 29 Jan 2026 09:18:17 +0000
Subject: [PATCH 012/116] Bug 2011700 - Fix missing clip prepare_quad_impl.
 r=gfx-reviewers,jnicol

The regressing patch had missed applying the surface's clipping rect in the case where the surface is in raster space.

Differential Revision: https://phabricator.services.mozilla.com/D280595
---
 gfx/wr/webrender/src/quad.rs             | 22 +++++++++-------------
 gfx/wr/wrench/reftests/clip/reftest.list |  2 +-
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/gfx/wr/webrender/src/quad.rs b/gfx/wr/webrender/src/quad.rs
index a571033e71ea5..190e58c1064cf 100644
--- a/gfx/wr/webrender/src/quad.rs
+++ b/gfx/wr/webrender/src/quad.rs
@@ -410,19 +410,15 @@ fn prepare_quad_impl(
     }
 
     let surface = &mut frame_state.surfaces[pic_context.surface_index.0];
-    let clipped_local_rect = clip_chain.pic_coverage_rect.intersection_unchecked(&surface.clipping_rect);
-
-    let mut clipped_raster_rect = clip_chain.pic_coverage_rect.cast_unit();
-    if surface.raster_spatial_node_index != surface.surface_spatial_node_index {
-        let pic_to_raster = SpaceMapper::new_with_target(
-            surface.raster_spatial_node_index,
-            surface.surface_spatial_node_index,
-            RasterRect::max_rect(),
-            ctx.spatial_tree,
-        );
+    let clipped_pic_rect = clip_chain.pic_coverage_rect.intersection_unchecked(&surface.clipping_rect);
 
-        clipped_raster_rect = pic_to_raster.map(&clipped_local_rect).unwrap();
-    }
+    let pic_to_raster = SpaceMapper::new_with_target(
+        surface.raster_spatial_node_index,
+        surface.surface_spatial_node_index,
+        RasterRect::max_rect(),
+        ctx.spatial_tree,
+    );
+    let Some(clipped_raster_rect) = pic_to_raster.map(&clipped_pic_rect) else { return; };
 
     // TODO: we are making the assumption that raster space and world space have the same
     // scale. I think that it is the case, but it's not super clean.
@@ -1494,7 +1490,7 @@ pub fn prepare_clip_task(
         QuadFlags::empty()
     };
 
-    
+
     rg_builder.push_sub_task(
         sub_tasks,
         SubTask::RectangleClip(RectangleClipSubTask {
diff --git a/gfx/wr/wrench/reftests/clip/reftest.list b/gfx/wr/wrench/reftests/clip/reftest.list
index 3410425635381..4dbcce97bccdd 100644
--- a/gfx/wr/wrench/reftests/clip/reftest.list
+++ b/gfx/wr/wrench/reftests/clip/reftest.list
@@ -1,7 +1,7 @@
 platform(linux,mac) == border-with-rounded-clip.yaml border-with-rounded-clip.png
 fuzzy-if(platform(swgl),1,4) == clip-mode.yaml clip-mode.png
 fuzzy-if(platform(swgl),1,80) == clip-ellipse.yaml clip-ellipse.png
-platform(linux,mac) == clip-45-degree-rotation.yaml clip-45-degree-rotation-ref.png
+fuzzy(1,1000) platform(linux,mac) == clip-45-degree-rotation.yaml clip-45-degree-rotation-ref.png
 == clip-3d-transform.yaml clip-3d-transform-ref.yaml
 fuzzy(1,4) == clip-corner-overlap.yaml clip-corner-overlap-ref.yaml
 == custom-clip-chain-node-ancestors.yaml custom-clip-chain-node-ancestors-ref.yaml

From cf9703fc231c4d35aca7b34020e4c24fa97a088d Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <krosylight@proton.me>
Date: Thu, 29 Jan 2026 09:46:56 +0000
Subject: [PATCH 013/116] Bug 2013142 - Enable SIMD for jxl-rs r=tnikkel

Differential Revision: https://phabricator.services.mozilla.com/D280858
---
 image/rust/jxl/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/image/rust/jxl/Cargo.toml b/image/rust/jxl/Cargo.toml
index 530ea70c5d492..9c6d082480717 100644
--- a/image/rust/jxl/Cargo.toml
+++ b/image/rust/jxl/Cargo.toml
@@ -10,5 +10,5 @@ edition = "2021"
 license = "MPL-2.0"
 
 [dependencies]
-jxl = "0.3"
+jxl = { version = "0.3", features = ["all-simd"] }
 log = "0.4"

From f902438c9034c77561d67be5d521ca338358b4f4 Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <krosylight@proton.me>
Date: Thu, 29 Jan 2026 09:46:56 +0000
Subject: [PATCH 014/116] Bug 2013145 - Remove unused C++ libjxl r=tnikkel

Differential Revision: https://phabricator.services.mozilla.com/D280865
---
 third_party/jpeg-xl/.bazelignore              |    1 -
 third_party/jpeg-xl/.clang-format             |    4 -
 third_party/jpeg-xl/.clang-tidy               |   87 -
 third_party/jpeg-xl/.pre-commit-config.yaml   |   30 -
 third_party/jpeg-xl/.readthedocs.yaml         |   24 -
 third_party/jpeg-xl/AUTHORS                   |  103 -
 third_party/jpeg-xl/BUILD.bazel               |   28 -
 third_party/jpeg-xl/BUILDING.md               |   85 -
 third_party/jpeg-xl/BUILDING_Haiku.md         |   20 -
 third_party/jpeg-xl/BUILDING_OSX.md           |   41 -
 third_party/jpeg-xl/CHANGELOG.md              |  403 --
 third_party/jpeg-xl/CMakeLists.txt            |  547 --
 third_party/jpeg-xl/CODE_OF_CONDUCT.md        |   93 -
 third_party/jpeg-xl/CONTRIBUTING.md           |  133 -
 third_party/jpeg-xl/CONTRIBUTORS              |   23 -
 third_party/jpeg-xl/LICENSE                   |   27 -
 third_party/jpeg-xl/MODULE.bazel              |   12 -
 third_party/jpeg-xl/MODULE.bazel.lock         |  132 -
 third_party/jpeg-xl/PATENTS                   |   22 -
 third_party/jpeg-xl/README.md                 |  141 -
 third_party/jpeg-xl/SECURITY.md               |   73 -
 third_party/jpeg-xl/WORKSPACE                 |   37 -
 third_party/jpeg-xl/bash_test.sh              |  312 -
 third_party/jpeg-xl/ci.sh                     | 1555 -----
 third_party/jpeg-xl/cmake/FindAtomics.cmake   |   53 -
 third_party/jpeg-xl/cmake/FindBrotli.cmake    |   75 -
 third_party/jpeg-xl/cmake/FindHWY.cmake       |   76 -
 third_party/jpeg-xl/cmake/FindLCMS2.cmake     |   59 -
 third_party/jpeg-xl/debian/changelog          |  125 -
 third_party/jpeg-xl/debian/compat             |    1 -
 third_party/jpeg-xl/debian/control            |   87 -
 third_party/jpeg-xl/debian/copyright          |  199 -
 third_party/jpeg-xl/debian/jxl.install        |    3 -
 third_party/jpeg-xl/debian/libjxl-dev.install |    3 -
 .../jpeg-xl/debian/libjxl-gdk-pixbuf.install  |    3 -
 .../jpeg-xl/debian/libjxl-gimp-plugin.install |    1 -
 third_party/jpeg-xl/debian/libjxl.install     |    1 -
 third_party/jpeg-xl/debian/rules              |   21 -
 third_party/jpeg-xl/debian/source/format      |    1 -
 third_party/jpeg-xl/deps.sh                   |   98 -
 third_party/jpeg-xl/examples/CMakeLists.txt   |   28 -
 .../jpeg-xl/examples/decode_exif_metadata.cc  |  174 -
 .../jpeg-xl/examples/decode_oneshot.cc        |  248 -
 .../jpeg-xl/examples/decode_progressive.cc    |  241 -
 .../jpeg-xl/examples/encode_oneshot.cc        |  284 -
 third_party/jpeg-xl/examples/examples.cmake   |   13 -
 third_party/jpeg-xl/flake.lock                |   61 -
 third_party/jpeg-xl/flake.nix                 |   38 -
 third_party/jpeg-xl/lib/BUILD                 |  314 -
 third_party/jpeg-xl/lib/CMakeLists.txt        |  193 -
 .../jpeg-xl/lib/extras/LICENSE.apngdis        |   27 -
 third_party/jpeg-xl/lib/extras/README.md      |    5 -
 third_party/jpeg-xl/lib/extras/alpha_blend.cc |   67 -
 third_party/jpeg-xl/lib/extras/alpha_blend.h  |   20 -
 third_party/jpeg-xl/lib/extras/codec.cc       |  111 -
 third_party/jpeg-xl/lib/extras/codec.h        |   54 -
 third_party/jpeg-xl/lib/extras/codec_test.cc  |  501 --
 third_party/jpeg-xl/lib/extras/common.cc      |   62 -
 third_party/jpeg-xl/lib/extras/common.h       |   26 -
 .../jpeg-xl/lib/extras/compressed_icc.cc      |   53 -
 .../jpeg-xl/lib/extras/compressed_icc_test.cc |   47 -
 third_party/jpeg-xl/lib/extras/dec/apng.cc    | 1293 ----
 third_party/jpeg-xl/lib/extras/dec/apng.h     |   34 -
 .../lib/extras/dec/color_description.cc       |  241 -
 .../lib/extras/dec/color_description.h        |   23 -
 .../lib/extras/dec/color_description_test.cc  |   37 -
 .../jpeg-xl/lib/extras/dec/color_hints.cc     |   79 -
 .../jpeg-xl/lib/extras/dec/color_hints.h      |   74 -
 third_party/jpeg-xl/lib/extras/dec/decode.cc  |  159 -
 third_party/jpeg-xl/lib/extras/dec/decode.h   |   57 -
 third_party/jpeg-xl/lib/extras/dec/exr.cc     |  233 -
 third_party/jpeg-xl/lib/extras/dec/exr.h      |   35 -
 third_party/jpeg-xl/lib/extras/dec/gif.cc     |  432 --
 third_party/jpeg-xl/lib/extras/dec/gif.h      |   35 -
 third_party/jpeg-xl/lib/extras/dec/jpegli.cc  |  286 -
 third_party/jpeg-xl/lib/extras/dec/jpegli.h   |   41 -
 third_party/jpeg-xl/lib/extras/dec/jpg.cc     |  353 -
 third_party/jpeg-xl/lib/extras/dec/jpg.h      |   45 -
 third_party/jpeg-xl/lib/extras/dec/jxl.cc     |  617 --
 third_party/jpeg-xl/lib/extras/dec/jxl.h      |   74 -
 third_party/jpeg-xl/lib/extras/dec/pgx.cc     |  207 -
 third_party/jpeg-xl/lib/extras/dec/pgx.h      |   34 -
 .../jpeg-xl/lib/extras/dec/pgx_test.cc        |   87 -
 third_party/jpeg-xl/lib/extras/dec/pnm.cc     |  571 --
 third_party/jpeg-xl/lib/extras/dec/pnm.h      |   64 -
 third_party/jpeg-xl/lib/extras/enc/apng.cc    |  510 --
 third_party/jpeg-xl/lib/extras/enc/apng.h     |   23 -
 third_party/jpeg-xl/lib/extras/enc/encode.cc  |  146 -
 third_party/jpeg-xl/lib/extras/enc/encode.h   |   90 -
 third_party/jpeg-xl/lib/extras/enc/exr.cc     |  208 -
 third_party/jpeg-xl/lib/extras/enc/exr.h      |   23 -
 third_party/jpeg-xl/lib/extras/enc/jpegli.cc  |  570 --
 third_party/jpeg-xl/lib/extras/enc/jpegli.h   |   53 -
 third_party/jpeg-xl/lib/extras/enc/jpg.cc     |  618 --
 third_party/jpeg-xl/lib/extras/enc/jpg.h      |   23 -
 third_party/jpeg-xl/lib/extras/enc/jxl.cc     |  387 --
 third_party/jpeg-xl/lib/extras/enc/jxl.h      |  102 -
 third_party/jpeg-xl/lib/extras/enc/npy.cc     |  326 -
 third_party/jpeg-xl/lib/extras/enc/npy.h      |   23 -
 third_party/jpeg-xl/lib/extras/enc/pgx.cc     |  124 -
 third_party/jpeg-xl/lib/extras/enc/pgx.h      |   24 -
 third_party/jpeg-xl/lib/extras/enc/pnm.cc     |  331 -
 third_party/jpeg-xl/lib/extras/enc/pnm.h      |   29 -
 third_party/jpeg-xl/lib/extras/exif.cc        |   55 -
 third_party/jpeg-xl/lib/extras/exif.h         |   20 -
 third_party/jpeg-xl/lib/extras/gain_map.cc    |  231 -
 .../jpeg-xl/lib/extras/gain_map_test.cc       |  173 -
 third_party/jpeg-xl/lib/extras/hlg.cc         |   57 -
 third_party/jpeg-xl/lib/extras/hlg.h          |   21 -
 third_party/jpeg-xl/lib/extras/jpegli_test.cc |  422 --
 third_party/jpeg-xl/lib/extras/metrics.cc     |  229 -
 third_party/jpeg-xl/lib/extras/metrics.h      |   28 -
 third_party/jpeg-xl/lib/extras/mmap.cc        |  149 -
 third_party/jpeg-xl/lib/extras/mmap.h         |   31 -
 third_party/jpeg-xl/lib/extras/packed_image.h |  308 -
 .../lib/extras/packed_image_convert.cc        |  359 --
 .../jpeg-xl/lib/extras/packed_image_convert.h |   40 -
 .../jpeg-xl/lib/extras/size_constraints.h     |   43 -
 third_party/jpeg-xl/lib/extras/time.cc        |   59 -
 third_party/jpeg-xl/lib/extras/time.h         |   19 -
 .../jpeg-xl/lib/extras/tone_mapping.cc        |  137 -
 third_party/jpeg-xl/lib/extras/tone_mapping.h |   30 -
 .../jpeg-xl/lib/extras/tone_mapping_gbench.cc |   61 -
 third_party/jpeg-xl/lib/gbench_main.cc        |    8 -
 third_party/jpeg-xl/lib/include/jxl/cms.h     |   24 -
 .../jpeg-xl/lib/include/jxl/cms_interface.h   |  255 -
 .../lib/include/jxl/codestream_header.h       |  433 --
 .../jpeg-xl/lib/include/jxl/color_encoding.h  |  161 -
 .../jpeg-xl/lib/include/jxl/compressed_icc.h  |   75 -
 third_party/jpeg-xl/lib/include/jxl/decode.h  | 1472 -----
 .../jpeg-xl/lib/include/jxl/decode_cxx.h      |   58 -
 third_party/jpeg-xl/lib/include/jxl/encode.h  | 1602 -----
 .../jpeg-xl/lib/include/jxl/encode_cxx.h      |   58 -
 .../jpeg-xl/lib/include/jxl/gain_map.h        |  129 -
 .../jpeg-xl/lib/include/jxl/memory_manager.h  |   73 -
 .../jpeg-xl/lib/include/jxl/parallel_runner.h |  164 -
 .../include/jxl/resizable_parallel_runner.h   |   77 -
 .../jxl/resizable_parallel_runner_cxx.h       |   65 -
 third_party/jpeg-xl/lib/include/jxl/stats.h   |  103 -
 .../lib/include/jxl/thread_parallel_runner.h  |   71 -
 .../include/jxl/thread_parallel_runner_cxx.h  |   66 -
 third_party/jpeg-xl/lib/include/jxl/types.h   |  154 -
 third_party/jpeg-xl/lib/jpegli.cmake          |  158 -
 third_party/jpeg-xl/lib/jpegli/README.md      |   52 -
 .../lib/jpegli/adaptive_quantization.cc       |  563 --
 .../lib/jpegli/adaptive_quantization.h        |   17 -
 third_party/jpeg-xl/lib/jpegli/bit_writer.cc  |   60 -
 third_party/jpeg-xl/lib/jpegli/bit_writer.h   |   98 -
 third_party/jpeg-xl/lib/jpegli/bitstream.cc   |  451 --
 third_party/jpeg-xl/lib/jpegli/bitstream.h    |   43 -
 .../jpeg-xl/lib/jpegli/color_quantize.cc      |  536 --
 .../jpeg-xl/lib/jpegli/color_quantize.h       |   27 -
 .../jpeg-xl/lib/jpegli/color_transform.cc     |  547 --
 .../jpeg-xl/lib/jpegli/color_transform.h      |   20 -
 third_party/jpeg-xl/lib/jpegli/common.cc      |   59 -
 third_party/jpeg-xl/lib/jpegli/common.h       |   43 -
 .../jpeg-xl/lib/jpegli/common_internal.h      |  166 -
 third_party/jpeg-xl/lib/jpegli/dct-inl.h      |  260 -
 third_party/jpeg-xl/lib/jpegli/decode.cc      | 1060 ---
 third_party/jpeg-xl/lib/jpegli/decode.h       |  107 -
 .../jpeg-xl/lib/jpegli/decode_api_test.cc     | 1340 ----
 .../jpeg-xl/lib/jpegli/decode_internal.h      |  156 -
 .../jpeg-xl/lib/jpegli/decode_marker.cc       |  585 --
 .../jpeg-xl/lib/jpegli/decode_marker.h        |   32 -
 third_party/jpeg-xl/lib/jpegli/decode_scan.cc |  567 --
 third_party/jpeg-xl/lib/jpegli/decode_scan.h  |   31 -
 .../jpeg-xl/lib/jpegli/destination_manager.cc |  148 -
 third_party/jpeg-xl/lib/jpegli/downsample.cc  |  357 --
 third_party/jpeg-xl/lib/jpegli/downsample.h   |   21 -
 third_party/jpeg-xl/lib/jpegli/encode.cc      | 1274 ----
 third_party/jpeg-xl/lib/jpegli/encode.h       |  159 -
 .../jpeg-xl/lib/jpegli/encode_api_test.cc     |  873 ---
 .../jpeg-xl/lib/jpegli/encode_finish.cc       |  232 -
 .../jpeg-xl/lib/jpegli/encode_finish.h        |   17 -
 .../jpeg-xl/lib/jpegli/encode_internal.h      |  141 -
 .../jpeg-xl/lib/jpegli/encode_streaming.cc    |  259 -
 .../jpeg-xl/lib/jpegli/encode_streaming.h     |   21 -
 .../jpeg-xl/lib/jpegli/entropy_coding-inl.h   |  213 -
 .../jpeg-xl/lib/jpegli/entropy_coding.cc      |  826 ---
 .../jpeg-xl/lib/jpegli/entropy_coding.h       |   28 -
 third_party/jpeg-xl/lib/jpegli/error.cc       |  102 -
 third_party/jpeg-xl/lib/jpegli/error.h        |   47 -
 .../jpeg-xl/lib/jpegli/error_handling_test.cc | 1284 ----
 third_party/jpeg-xl/lib/jpegli/fuzztest.h     |   22 -
 third_party/jpeg-xl/lib/jpegli/huffman.cc     |  323 -
 third_party/jpeg-xl/lib/jpegli/huffman.h      |   58 -
 third_party/jpeg-xl/lib/jpegli/idct.cc        |  703 --
 third_party/jpeg-xl/lib/jpegli/idct.h         |   18 -
 third_party/jpeg-xl/lib/jpegli/input.cc       |  414 --
 third_party/jpeg-xl/lib/jpegli/input.h        |   17 -
 .../lib/jpegli/input_suspension_test.cc       |  631 --
 .../jpeg-xl/lib/jpegli/jpeg.version.62        |   11 -
 third_party/jpeg-xl/lib/jpegli/jpeg.version.8 |    9 -
 .../jpeg-xl/lib/jpegli/libjpeg_test_util.cc   |  269 -
 .../jpeg-xl/lib/jpegli/libjpeg_test_util.h    |   37 -
 .../jpeg-xl/lib/jpegli/libjpeg_wrapper.cc     |  255 -
 .../jpeg-xl/lib/jpegli/memory_manager.cc      |  186 -
 .../jpeg-xl/lib/jpegli/memory_manager.h       |   46 -
 .../lib/jpegli/output_suspension_test.cc      |  231 -
 third_party/jpeg-xl/lib/jpegli/quant.cc       |  768 ---
 third_party/jpeg-xl/lib/jpegli/quant.h        |   26 -
 third_party/jpeg-xl/lib/jpegli/render.cc      |  761 ---
 third_party/jpeg-xl/lib/jpegli/render.h       |   24 -
 third_party/jpeg-xl/lib/jpegli/simd.cc        |   38 -
 third_party/jpeg-xl/lib/jpegli/simd.h         |   18 -
 .../jpeg-xl/lib/jpegli/source_manager.cc      |   91 -
 .../jpeg-xl/lib/jpegli/source_manager_test.cc |  151 -
 .../jpeg-xl/lib/jpegli/streaming_test.cc      |  245 -
 third_party/jpeg-xl/lib/jpegli/test_params.h  |  163 -
 .../jpeg-xl/lib/jpegli/test_utils-inl.h       |  432 --
 third_party/jpeg-xl/lib/jpegli/test_utils.cc  |  867 ---
 third_party/jpeg-xl/lib/jpegli/test_utils.h   |  123 -
 third_party/jpeg-xl/lib/jpegli/testing.h      |   37 -
 .../jpeg-xl/lib/jpegli/transcode_api_test.cc  |  141 -
 .../jpeg-xl/lib/jpegli/transpose-inl.h        |  111 -
 third_party/jpeg-xl/lib/jpegli/types.h        |   38 -
 third_party/jpeg-xl/lib/jpegli/upsample.cc    |  137 -
 third_party/jpeg-xl/lib/jpegli/upsample.h     |   26 -
 third_party/jpeg-xl/lib/jxl.cmake             |  283 -
 third_party/jpeg-xl/lib/jxl/ac_context.h      |  152 -
 third_party/jpeg-xl/lib/jxl/ac_strategy.cc    |  110 -
 third_party/jpeg-xl/lib/jxl/ac_strategy.h     |  275 -
 .../jpeg-xl/lib/jxl/ac_strategy_test.cc       |  271 -
 third_party/jpeg-xl/lib/jxl/alpha.cc          |  115 -
 third_party/jpeg-xl/lib/jxl/alpha.h           |   66 -
 third_party/jpeg-xl/lib/jxl/alpha_test.cc     |  127 -
 third_party/jpeg-xl/lib/jxl/ans_common.cc     |  160 -
 third_party/jpeg-xl/lib/jxl/ans_common.h      |  146 -
 .../jpeg-xl/lib/jxl/ans_common_test.cc        |   45 -
 third_party/jpeg-xl/lib/jxl/ans_params.h      |   36 -
 third_party/jpeg-xl/lib/jxl/ans_test.cc       |  301 -
 .../jpeg-xl/lib/jxl/base/arch_macros.h        |   33 -
 third_party/jpeg-xl/lib/jxl/base/bits.h       |  148 -
 third_party/jpeg-xl/lib/jxl/base/byte_order.h |  274 -
 .../jpeg-xl/lib/jxl/base/c_callback_support.h |   32 -
 third_party/jpeg-xl/lib/jxl/base/common.h     |  131 -
 .../jpeg-xl/lib/jxl/base/compiler_specific.h  |  220 -
 .../jpeg-xl/lib/jxl/base/data_parallel.h      |  145 -
 third_party/jpeg-xl/lib/jxl/base/exif.h       |   90 -
 .../jpeg-xl/lib/jxl/base/fast_math-inl.h      |  236 -
 third_party/jpeg-xl/lib/jxl/base/float.h      |  100 -
 third_party/jpeg-xl/lib/jxl/base/iaca.h       |   65 -
 .../jpeg-xl/lib/jxl/base/include_jpeglib.h    |   20 -
 third_party/jpeg-xl/lib/jxl/base/matrix_ops.h |   86 -
 third_party/jpeg-xl/lib/jxl/base/os_macros.h  |   50 -
 third_party/jpeg-xl/lib/jxl/base/override.h   |   31 -
 .../jpeg-xl/lib/jxl/base/printf_macros.h      |   34 -
 third_party/jpeg-xl/lib/jxl/base/random.h     |   99 -
 .../lib/jxl/base/rational_polynomial-inl.h    |  103 -
 third_party/jpeg-xl/lib/jxl/base/rect.h       |  186 -
 .../lib/jxl/base/sanitizer_definitions.h      |   44 -
 third_party/jpeg-xl/lib/jxl/base/sanitizers.h |  233 -
 .../jpeg-xl/lib/jxl/base/scope_guard.h        |   49 -
 third_party/jpeg-xl/lib/jxl/base/span.h       |   84 -
 third_party/jpeg-xl/lib/jxl/base/status.h     |  379 --
 .../jpeg-xl/lib/jxl/bit_reader_test.cc        |  276 -
 third_party/jpeg-xl/lib/jxl/bits_test.cc      |   92 -
 third_party/jpeg-xl/lib/jxl/blending.cc       |  192 -
 third_party/jpeg-xl/lib/jxl/blending.h        |   31 -
 third_party/jpeg-xl/lib/jxl/blending_test.cc  |   57 -
 .../jpeg-xl/lib/jxl/box_content_decoder.cc    |  106 -
 .../jpeg-xl/lib/jxl/box_content_decoder.h     |   46 -
 .../lib/jxl/butteraugli/butteraugli.cc        | 2195 -------
 .../jpeg-xl/lib/jxl/butteraugli/butteraugli.h |  225 -
 .../lib/jxl/butteraugli/butteraugli_test.cc   |  116 -
 .../jpeg-xl/lib/jxl/byte_order_test.cc        |   53 -
 .../jpeg-xl/lib/jxl/chroma_from_luma.cc       |   60 -
 .../jpeg-xl/lib/jxl/chroma_from_luma.h        |  142 -
 .../jpeg-xl/lib/jxl/cms/color_encoding_cms.h  |  642 --
 third_party/jpeg-xl/lib/jxl/cms/jxl_cms.cc    | 1368 ----
 .../jpeg-xl/lib/jxl/cms/jxl_cms_internal.h    | 1129 ----
 .../jpeg-xl/lib/jxl/cms/opsin_params.h        |  162 -
 .../jpeg-xl/lib/jxl/cms/tone_mapping-inl.h    |  191 -
 .../jpeg-xl/lib/jxl/cms/tone_mapping.h        |  180 -
 .../jpeg-xl/lib/jxl/cms/tone_mapping_test.cc  |  149 -
 .../lib/jxl/cms/transfer_functions-inl.h      |  322 -
 .../jpeg-xl/lib/jxl/cms/transfer_functions.h  |  131 -
 .../lib/jxl/cms/transfer_functions_test.cc    |   94 -
 third_party/jpeg-xl/lib/jxl/codec_in_out.h    |  125 -
 third_party/jpeg-xl/lib/jxl/coeff_order.cc    |  155 -
 third_party/jpeg-xl/lib/jxl/coeff_order.h     |   62 -
 third_party/jpeg-xl/lib/jxl/coeff_order_fwd.h |   47 -
 .../jpeg-xl/lib/jxl/coeff_order_test.cc       |  106 -
 .../lib/jxl/color_encoding_internal.cc        |  213 -
 .../jpeg-xl/lib/jxl/color_encoding_internal.h |  364 --
 .../lib/jxl/color_encoding_internal_test.cc   |  167 -
 .../jpeg-xl/lib/jxl/color_management_test.cc  |  469 --
 third_party/jpeg-xl/lib/jxl/common.h          |   70 -
 third_party/jpeg-xl/lib/jxl/compressed_dc.cc  |  311 -
 third_party/jpeg-xl/lib/jxl/compressed_dc.h   |   36 -
 third_party/jpeg-xl/lib/jxl/convolve-inl.h    |  303 -
 third_party/jpeg-xl/lib/jxl/convolve.h        |   90 -
 .../jpeg-xl/lib/jxl/convolve_separable5.cc    |  267 -
 third_party/jpeg-xl/lib/jxl/convolve_slow.cc  |  208 -
 .../jpeg-xl/lib/jxl/convolve_symmetric3.cc    |  202 -
 .../jpeg-xl/lib/jxl/convolve_symmetric5.cc    |  194 -
 third_party/jpeg-xl/lib/jxl/convolve_test.cc  |  292 -
 .../jpeg-xl/lib/jxl/data_parallel_test.cc     |  102 -
 third_party/jpeg-xl/lib/jxl/dct-inl.h         |  339 -
 third_party/jpeg-xl/lib/jxl/dct_block-inl.h   |  108 -
 third_party/jpeg-xl/lib/jxl/dct_for_test.h    |   98 -
 third_party/jpeg-xl/lib/jxl/dct_scales.cc     |   34 -
 third_party/jpeg-xl/lib/jxl/dct_scales.h      |  379 --
 third_party/jpeg-xl/lib/jxl/dct_test.cc       |  389 --
 third_party/jpeg-xl/lib/jxl/dct_util.h        |   95 -
 third_party/jpeg-xl/lib/jxl/dec_ans.cc        |  416 --
 third_party/jpeg-xl/lib/jxl/dec_ans.h         |  491 --
 third_party/jpeg-xl/lib/jxl/dec_bit_reader.h  |  333 -
 third_party/jpeg-xl/lib/jxl/dec_cache.cc      |  350 -
 third_party/jpeg-xl/lib/jxl/dec_cache.h       |  232 -
 .../jpeg-xl/lib/jxl/dec_context_map.cc        |   95 -
 third_party/jpeg-xl/lib/jxl/dec_context_map.h |   30 -
 .../jpeg-xl/lib/jxl/dec_external_image.cc     |  513 --
 .../jpeg-xl/lib/jxl/dec_external_image.h      |   65 -
 .../lib/jxl/dec_external_image_gbench.cc      |   74 -
 third_party/jpeg-xl/lib/jxl/dec_frame.cc      |  880 ---
 third_party/jpeg-xl/lib/jxl/dec_frame.h       |  342 -
 third_party/jpeg-xl/lib/jxl/dec_group.cc      |  829 ---
 third_party/jpeg-xl/lib/jxl/dec_group.h       |   47 -
 .../jpeg-xl/lib/jxl/dec_group_border.cc       |  191 -
 .../jpeg-xl/lib/jxl/dec_group_border.h        |   46 -
 third_party/jpeg-xl/lib/jxl/dec_huffman.cc    |  258 -
 third_party/jpeg-xl/lib/jxl/dec_huffman.h     |   32 -
 third_party/jpeg-xl/lib/jxl/dec_modular.cc    |  814 ---
 third_party/jpeg-xl/lib/jxl/dec_modular.h     |  154 -
 third_party/jpeg-xl/lib/jxl/dec_noise.cc      |  155 -
 third_party/jpeg-xl/lib/jxl/dec_noise.h       |   32 -
 .../jpeg-xl/lib/jxl/dec_patch_dictionary.cc   |  356 --
 .../jpeg-xl/lib/jxl/dec_patch_dictionary.h    |  168 -
 .../jpeg-xl/lib/jxl/dec_transforms-inl.h      |  821 ---
 .../lib/jxl/dec_transforms_testonly.cc        |   41 -
 .../jpeg-xl/lib/jxl/dec_transforms_testonly.h |   34 -
 third_party/jpeg-xl/lib/jxl/dec_xyb-inl.h     |  347 -
 third_party/jpeg-xl/lib/jxl/dec_xyb.cc        |  329 -
 third_party/jpeg-xl/lib/jxl/dec_xyb.h         |  100 -
 third_party/jpeg-xl/lib/jxl/decode.cc         | 2829 --------
 third_party/jpeg-xl/lib/jxl/decode_test.cc    | 5679 -----------------
 third_party/jpeg-xl/lib/jxl/decode_to_jpeg.cc |  184 -
 third_party/jpeg-xl/lib/jxl/decode_to_jpeg.h  |  220 -
 .../jpeg-xl/lib/jxl/enc_ac_strategy.cc        | 1183 ----
 third_party/jpeg-xl/lib/jxl/enc_ac_strategy.h |   91 -
 .../lib/jxl/enc_adaptive_quantization.cc      | 1297 ----
 .../lib/jxl/enc_adaptive_quantization.h       |   58 -
 third_party/jpeg-xl/lib/jxl/enc_ans.cc        | 1887 ------
 third_party/jpeg-xl/lib/jxl/enc_ans.h         |  145 -
 third_party/jpeg-xl/lib/jxl/enc_ans_params.h  |   92 -
 third_party/jpeg-xl/lib/jxl/enc_aux_out.cc    |  121 -
 third_party/jpeg-xl/lib/jxl/enc_aux_out.h     |  110 -
 third_party/jpeg-xl/lib/jxl/enc_bit_writer.cc |  204 -
 third_party/jpeg-xl/lib/jxl/enc_bit_writer.h  |  150 -
 .../lib/jxl/enc_butteraugli_comparator.cc     |  106 -
 .../lib/jxl/enc_butteraugli_comparator.h      |   47 -
 third_party/jpeg-xl/lib/jxl/enc_cache.cc      |  235 -
 third_party/jpeg-xl/lib/jxl/enc_cache.h       |   93 -
 .../jpeg-xl/lib/jxl/enc_chroma_from_luma.cc   |  410 --
 .../jpeg-xl/lib/jxl/enc_chroma_from_luma.h    |   72 -
 third_party/jpeg-xl/lib/jxl/enc_cluster.cc    |  358 --
 third_party/jpeg-xl/lib/jxl/enc_cluster.h     |   70 -
 .../jpeg-xl/lib/jxl/enc_coeff_order.cc        |  339 -
 third_party/jpeg-xl/lib/jxl/enc_coeff_order.h |   58 -
 third_party/jpeg-xl/lib/jxl/enc_comparator.cc |  138 -
 third_party/jpeg-xl/lib/jxl/enc_comparator.h  |   55 -
 .../jpeg-xl/lib/jxl/enc_context_map.cc        |  176 -
 third_party/jpeg-xl/lib/jxl/enc_context_map.h |   36 -
 .../jpeg-xl/lib/jxl/enc_debug_image.cc        |  126 -
 third_party/jpeg-xl/lib/jxl/enc_debug_image.h |   37 -
 .../jpeg-xl/lib/jxl/enc_detect_dots.cc        |  617 --
 third_party/jpeg-xl/lib/jxl/enc_detect_dots.h |   67 -
 .../jpeg-xl/lib/jxl/enc_dot_dictionary.cc     |   73 -
 .../jpeg-xl/lib/jxl/enc_dot_dictionary.h      |   30 -
 .../jpeg-xl/lib/jxl/enc_entropy_coder.cc      |  265 -
 .../jpeg-xl/lib/jxl/enc_entropy_coder.h       |   45 -
 .../jpeg-xl/lib/jxl/enc_external_image.cc     |  241 -
 .../jpeg-xl/lib/jxl/enc_external_image.h      |   64 -
 .../lib/jxl/enc_external_image_gbench.cc      |   59 -
 .../lib/jxl/enc_external_image_test.cc        |   82 -
 .../jpeg-xl/lib/jxl/enc_fast_lossless.cc      | 4339 -------------
 .../jpeg-xl/lib/jxl/enc_fast_lossless.h       |  117 -
 third_party/jpeg-xl/lib/jxl/enc_fields.cc     |  243 -
 third_party/jpeg-xl/lib/jxl/enc_fields.h      |   41 -
 third_party/jpeg-xl/lib/jxl/enc_frame.cc      | 2546 --------
 third_party/jpeg-xl/lib/jxl/enc_frame.h       |  111 -
 third_party/jpeg-xl/lib/jxl/enc_gaborish.cc   |   74 -
 third_party/jpeg-xl/lib/jxl/enc_gaborish.h    |   26 -
 .../jpeg-xl/lib/jxl/enc_gaborish_test.cc      |   91 -
 .../jpeg-xl/lib/jxl/enc_gamma_correct.h       |   35 -
 third_party/jpeg-xl/lib/jxl/enc_group.cc      |  561 --
 third_party/jpeg-xl/lib/jxl/enc_group.h       |   32 -
 third_party/jpeg-xl/lib/jxl/enc_heuristics.cc | 1214 ----
 third_party/jpeg-xl/lib/jxl/enc_heuristics.h  |   51 -
 third_party/jpeg-xl/lib/jxl/enc_huffman.cc    |  222 -
 third_party/jpeg-xl/lib/jxl/enc_huffman.h     |   26 -
 .../jpeg-xl/lib/jxl/enc_huffman_tree.cc       |  346 -
 .../jpeg-xl/lib/jxl/enc_huffman_tree.h        |   52 -
 third_party/jpeg-xl/lib/jxl/enc_icc_codec.cc  |  483 --
 third_party/jpeg-xl/lib/jxl/enc_icc_codec.h   |   30 -
 .../jpeg-xl/lib/jxl/enc_image_bundle.cc       |  160 -
 .../jpeg-xl/lib/jxl/enc_image_bundle.h        |   39 -
 third_party/jpeg-xl/lib/jxl/enc_linalg.cc     |   49 -
 third_party/jpeg-xl/lib/jxl/enc_linalg.h      |   24 -
 .../jpeg-xl/lib/jxl/enc_linalg_test.cc        |   98 -
 third_party/jpeg-xl/lib/jxl/enc_modular.cc    | 1796 ------
 third_party/jpeg-xl/lib/jxl/enc_modular.h     |  134 -
 third_party/jpeg-xl/lib/jxl/enc_noise.cc      |  371 --
 third_party/jpeg-xl/lib/jxl/enc_noise.h       |   35 -
 third_party/jpeg-xl/lib/jxl/enc_optimize.h    |  193 -
 .../jpeg-xl/lib/jxl/enc_optimize_test.cc      |   96 -
 third_party/jpeg-xl/lib/jxl/enc_params.h      |  208 -
 .../jpeg-xl/lib/jxl/enc_patch_dictionary.cc   |  870 ---
 .../jpeg-xl/lib/jxl/enc_patch_dictionary.h    |  111 -
 .../jpeg-xl/lib/jxl/enc_photon_noise.cc       |   95 -
 .../jpeg-xl/lib/jxl/enc_photon_noise.h        |   22 -
 .../jpeg-xl/lib/jxl/enc_photon_noise_test.cc  |   41 -
 .../jpeg-xl/lib/jxl/enc_progressive_split.cc  |   82 -
 .../jpeg-xl/lib/jxl/enc_progressive_split.h   |  125 -
 .../jpeg-xl/lib/jxl/enc_quant_weights.cc      |  224 -
 .../jpeg-xl/lib/jxl/enc_quant_weights.h       |   48 -
 third_party/jpeg-xl/lib/jxl/enc_splines.cc    |  101 -
 third_party/jpeg-xl/lib/jxl/enc_splines.h     |   30 -
 third_party/jpeg-xl/lib/jxl/enc_toc.cc        |   48 -
 third_party/jpeg-xl/lib/jxl/enc_toc.h         |   30 -
 .../jpeg-xl/lib/jxl/enc_transforms-inl.h      |  799 ---
 third_party/jpeg-xl/lib/jxl/enc_transforms.cc |   40 -
 third_party/jpeg-xl/lib/jxl/enc_transforms.h  |   33 -
 third_party/jpeg-xl/lib/jxl/enc_xyb.cc        |  408 --
 third_party/jpeg-xl/lib/jxl/enc_xyb.h         |   54 -
 third_party/jpeg-xl/lib/jxl/encode.cc         | 2785 --------
 third_party/jpeg-xl/lib/jxl/encode_internal.h |  688 --
 third_party/jpeg-xl/lib/jxl/encode_test.cc    | 2093 ------
 third_party/jpeg-xl/lib/jxl/entropy_coder.cc  |   66 -
 third_party/jpeg-xl/lib/jxl/entropy_coder.h   |   49 -
 .../jpeg-xl/lib/jxl/entropy_coder_test.cc     |   68 -
 third_party/jpeg-xl/lib/jxl/epf.cc            |  135 -
 third_party/jpeg-xl/lib/jxl/epf.h             |   32 -
 .../lib/jxl/fake_parallel_runner_testonly.h   |   79 -
 third_party/jpeg-xl/lib/jxl/fast_math_test.cc |  244 -
 third_party/jpeg-xl/lib/jxl/field_encodings.h |  134 -
 third_party/jpeg-xl/lib/jxl/fields.cc         |  651 --
 third_party/jpeg-xl/lib/jxl/fields.h          |  372 --
 third_party/jpeg-xl/lib/jxl/fields_test.cc    |  456 --
 .../jpeg-xl/lib/jxl/frame_dimensions.h        |  117 -
 third_party/jpeg-xl/lib/jxl/frame_header.cc   |  506 --
 third_party/jpeg-xl/lib/jxl/frame_header.h    |  508 --
 third_party/jpeg-xl/lib/jxl/fuzztest.h        |   22 -
 .../jpeg-xl/lib/jxl/gamma_correct_test.cc     |   37 -
 third_party/jpeg-xl/lib/jxl/gradient_test.cc  |  206 -
 third_party/jpeg-xl/lib/jxl/headers.cc        |  198 -
 third_party/jpeg-xl/lib/jxl/headers.h         |   97 -
 third_party/jpeg-xl/lib/jxl/huffman_table.cc  |  161 -
 third_party/jpeg-xl/lib/jxl/huffman_table.h   |   28 -
 third_party/jpeg-xl/lib/jxl/iaca_test.cc      |   21 -
 third_party/jpeg-xl/lib/jxl/icc_codec.cc      |  414 --
 third_party/jpeg-xl/lib/jxl/icc_codec.h       |   49 -
 .../jpeg-xl/lib/jxl/icc_codec_common.cc       |  176 -
 .../jpeg-xl/lib/jxl/icc_codec_common.h        |  105 -
 third_party/jpeg-xl/lib/jxl/icc_codec_test.cc |  216 -
 third_party/jpeg-xl/lib/jxl/image.cc          |  108 -
 third_party/jpeg-xl/lib/jxl/image.h           |  331 -
 third_party/jpeg-xl/lib/jxl/image_bundle.cc   |  133 -
 third_party/jpeg-xl/lib/jxl/image_bundle.h    |  265 -
 .../jpeg-xl/lib/jxl/image_bundle_test.cc      |   47 -
 third_party/jpeg-xl/lib/jxl/image_metadata.cc |  483 --
 third_party/jpeg-xl/lib/jxl/image_metadata.h  |  429 --
 third_party/jpeg-xl/lib/jxl/image_ops.cc      |   98 -
 third_party/jpeg-xl/lib/jxl/image_ops.h       |  309 -
 third_party/jpeg-xl/lib/jxl/image_ops_test.cc |  118 -
 .../jpeg-xl/lib/jxl/image_test_utils.h        |  262 -
 third_party/jpeg-xl/lib/jxl/inverse_mtf-inl.h |   90 -
 .../jpeg-xl/lib/jxl/jpeg/dec_jpeg_data.cc     |  144 -
 .../jpeg-xl/lib/jxl/jpeg/dec_jpeg_data.h      |   19 -
 .../lib/jxl/jpeg/dec_jpeg_data_writer.cc      | 1065 ----
 .../lib/jxl/jpeg/dec_jpeg_data_writer.h       |   31 -
 .../lib/jxl/jpeg/dec_jpeg_output_chunk.h      |   74 -
 .../jxl/jpeg/dec_jpeg_serialization_state.h   |  101 -
 .../jpeg-xl/lib/jxl/jpeg/enc_jpeg_data.cc     |  424 --
 .../jpeg-xl/lib/jxl/jpeg/enc_jpeg_data.h      |   46 -
 .../lib/jxl/jpeg/enc_jpeg_data_reader.cc      | 1051 ---
 .../lib/jxl/jpeg/enc_jpeg_data_reader.h       |   36 -
 .../lib/jxl/jpeg/enc_jpeg_huffman_decode.cc   |  103 -
 .../lib/jxl/jpeg/enc_jpeg_huffman_decode.h    |   49 -
 third_party/jpeg-xl/lib/jxl/jpeg/jpeg_data.cc |  483 --
 third_party/jpeg-xl/lib/jxl/jpeg/jpeg_data.h  |  219 -
 third_party/jpeg-xl/lib/jxl/jxl.syms          |    5 -
 third_party/jpeg-xl/lib/jxl/jxl.version       |   17 -
 third_party/jpeg-xl/lib/jxl/jxl_osx.syms      |    1 -
 third_party/jpeg-xl/lib/jxl/jxl_test.cc       | 1937 ------
 third_party/jpeg-xl/lib/jxl/lehmer_code.h     |  104 -
 .../jpeg-xl/lib/jxl/lehmer_code_test.cc       |   98 -
 third_party/jpeg-xl/lib/jxl/libjxl.pc.in      |   13 -
 third_party/jpeg-xl/lib/jxl/libjxl_cms.pc.in  |   13 -
 third_party/jpeg-xl/lib/jxl/loop_filter.cc    |  100 -
 third_party/jpeg-xl/lib/jxl/loop_filter.h     |   76 -
 third_party/jpeg-xl/lib/jxl/luminance.cc      |   26 -
 third_party/jpeg-xl/lib/jxl/luminance.h       |   22 -
 .../lib/jxl/memory_manager_internal.cc        |  157 -
 .../jpeg-xl/lib/jxl/memory_manager_internal.h |  193 -
 .../jxl/modular/encoding/context_predict.h    |  682 --
 .../lib/jxl/modular/encoding/dec_ma.cc        |  139 -
 .../jpeg-xl/lib/jxl/modular/encoding/dec_ma.h |   68 -
 .../jxl/modular/encoding/enc_debug_tree.cc    |  119 -
 .../lib/jxl/modular/encoding/enc_debug_tree.h |   19 -
 .../lib/jxl/modular/encoding/enc_encoding.cc  |  761 ---
 .../lib/jxl/modular/encoding/enc_encoding.h   |   49 -
 .../lib/jxl/modular/encoding/enc_ma.cc        | 1022 ---
 .../jpeg-xl/lib/jxl/modular/encoding/enc_ma.h |  160 -
 .../lib/jxl/modular/encoding/encoding.cc      |  702 --
 .../lib/jxl/modular/encoding/encoding.h       |  152 -
 .../lib/jxl/modular/encoding/ma_common.h      |   28 -
 .../jpeg-xl/lib/jxl/modular/modular_image.cc  |  105 -
 .../jpeg-xl/lib/jxl/modular/modular_image.h   |  136 -
 third_party/jpeg-xl/lib/jxl/modular/options.h |  123 -
 .../lib/jxl/modular/transform/enc_palette.cc  |  653 --
 .../lib/jxl/modular/transform/enc_palette.h   |   22 -
 .../lib/jxl/modular/transform/enc_rct.cc      |   75 -
 .../lib/jxl/modular/transform/enc_rct.h       |   17 -
 .../lib/jxl/modular/transform/enc_squeeze.cc  |  155 -
 .../lib/jxl/modular/transform/enc_squeeze.h   |   20 -
 .../jxl/modular/transform/enc_transform.cc    |   46 -
 .../lib/jxl/modular/transform/enc_transform.h |   22 -
 .../lib/jxl/modular/transform/palette.cc      |  189 -
 .../lib/jxl/modular/transform/palette.h       |  135 -
 .../jpeg-xl/lib/jxl/modular/transform/rct.cc  |  154 -
 .../jpeg-xl/lib/jxl/modular/transform/rct.h   |   19 -
 .../lib/jxl/modular/transform/squeeze.cc      |  496 --
 .../lib/jxl/modular/transform/squeeze.h       |   91 -
 .../lib/jxl/modular/transform/transform.cc    |  100 -
 .../lib/jxl/modular/transform/transform.h     |  154 -
 third_party/jpeg-xl/lib/jxl/modular_test.cc   |  564 --
 third_party/jpeg-xl/lib/jxl/noise.h           |   63 -
 .../jpeg-xl/lib/jxl/opsin_image_test.cc       |  141 -
 .../jpeg-xl/lib/jxl/opsin_inverse_test.cc     |   74 -
 third_party/jpeg-xl/lib/jxl/opsin_params.cc   |   44 -
 third_party/jpeg-xl/lib/jxl/opsin_params.h    |   26 -
 third_party/jpeg-xl/lib/jxl/pack_signed.h     |   34 -
 third_party/jpeg-xl/lib/jxl/padded_bytes.h    |  205 -
 .../jpeg-xl/lib/jxl/padded_bytes_test.cc      |   74 -
 third_party/jpeg-xl/lib/jxl/passes_state.cc   |   82 -
 third_party/jpeg-xl/lib/jxl/passes_state.h    |  106 -
 third_party/jpeg-xl/lib/jxl/passes_test.cc    |  411 --
 .../lib/jxl/patch_dictionary_internal.h       |   28 -
 .../jpeg-xl/lib/jxl/patch_dictionary_test.cc  |   64 -
 third_party/jpeg-xl/lib/jxl/preview_test.cc   |   70 -
 third_party/jpeg-xl/lib/jxl/quant_weights.cc  | 1263 ----
 third_party/jpeg-xl/lib/jxl/quant_weights.h   |  439 --
 .../jpeg-xl/lib/jxl/quant_weights_test.cc     |  268 -
 third_party/jpeg-xl/lib/jxl/quantizer-inl.h   |   74 -
 third_party/jpeg-xl/lib/jxl/quantizer.cc      |  157 -
 third_party/jpeg-xl/lib/jxl/quantizer.h       |  180 -
 third_party/jpeg-xl/lib/jxl/quantizer_test.cc |   99 -
 .../lib/jxl/rational_polynomial_test.cc       |  239 -
 .../low_memory_render_pipeline.cc             |  909 ---
 .../low_memory_render_pipeline.h              |  124 -
 .../jxl/render_pipeline/render_pipeline.cc    |  139 -
 .../lib/jxl/render_pipeline/render_pipeline.h |  157 -
 .../render_pipeline/render_pipeline_stage.h   |  177 -
 .../render_pipeline/render_pipeline_test.cc   |  600 --
 .../render_pipeline/simple_render_pipeline.cc |  291 -
 .../render_pipeline/simple_render_pipeline.h  |   48 -
 .../lib/jxl/render_pipeline/stage_blending.cc |  251 -
 .../lib/jxl/render_pipeline/stage_blending.h  |   25 -
 .../stage_chroma_upsampling.cc                |  129 -
 .../render_pipeline/stage_chroma_upsampling.h |   26 -
 .../lib/jxl/render_pipeline/stage_cms.cc      |  129 -
 .../lib/jxl/render_pipeline/stage_cms.h       |   21 -
 .../lib/jxl/render_pipeline/stage_epf.cc      |  529 --
 .../lib/jxl/render_pipeline/stage_epf.h       |   29 -
 .../jxl/render_pipeline/stage_from_linear.cc  |  199 -
 .../jxl/render_pipeline/stage_from_linear.h   |   20 -
 .../lib/jxl/render_pipeline/stage_gaborish.cc |  121 -
 .../lib/jxl/render_pipeline/stage_gaborish.h  |   24 -
 .../lib/jxl/render_pipeline/stage_noise.cc    |  321 -
 .../lib/jxl/render_pipeline/stage_noise.h     |   29 -
 .../lib/jxl/render_pipeline/stage_patches.cc  |   59 -
 .../lib/jxl/render_pipeline/stage_patches.h   |   25 -
 .../lib/jxl/render_pipeline/stage_splines.cc  |   70 -
 .../lib/jxl/render_pipeline/stage_splines.h   |   21 -
 .../lib/jxl/render_pipeline/stage_spot.cc     |   57 -
 .../lib/jxl/render_pipeline/stage_spot.h      |   22 -
 .../jxl/render_pipeline/stage_to_linear.cc    |  206 -
 .../lib/jxl/render_pipeline/stage_to_linear.h |   21 -
 .../jxl/render_pipeline/stage_tone_mapping.cc |  149 -
 .../jxl/render_pipeline/stage_tone_mapping.h  |   36 -
 .../jxl/render_pipeline/stage_upsampling.cc   |  195 -
 .../jxl/render_pipeline/stage_upsampling.h    |   26 -
 .../lib/jxl/render_pipeline/stage_write.cc    |  698 --
 .../lib/jxl/render_pipeline/stage_write.h     |   39 -
 .../lib/jxl/render_pipeline/stage_xyb.cc      |  182 -
 .../lib/jxl/render_pipeline/stage_xyb.h       |   26 -
 .../lib/jxl/render_pipeline/stage_ycbcr.cc    |   84 -
 .../lib/jxl/render_pipeline/stage_ycbcr.h     |   24 -
 .../test_render_pipeline_stages.h             |  101 -
 third_party/jpeg-xl/lib/jxl/roundtrip_test.cc | 1099 ----
 third_party/jpeg-xl/lib/jxl/simd_util-inl.h   |  349 -
 third_party/jpeg-xl/lib/jxl/simd_util.cc      |   42 -
 third_party/jpeg-xl/lib/jxl/simd_util.h       |   18 -
 third_party/jpeg-xl/lib/jxl/simd_util_test.cc |   84 -
 .../jpeg-xl/lib/jxl/speed_tier_test.cc        |  118 -
 third_party/jpeg-xl/lib/jxl/splines.cc        |  727 ---
 third_party/jpeg-xl/lib/jxl/splines.h         |  157 -
 third_party/jpeg-xl/lib/jxl/splines_gbench.cc |   78 -
 third_party/jpeg-xl/lib/jxl/splines_test.cc   |  369 --
 third_party/jpeg-xl/lib/jxl/test_image.cc     |  453 --
 third_party/jpeg-xl/lib/jxl/test_image.h      |   94 -
 .../jpeg-xl/lib/jxl/test_memory_manager.cc    |   24 -
 .../jpeg-xl/lib/jxl/test_memory_manager.h     |   19 -
 third_party/jpeg-xl/lib/jxl/test_utils.cc     |  922 ---
 third_party/jpeg-xl/lib/jxl/test_utils.h      |  243 -
 third_party/jpeg-xl/lib/jxl/testing.h         |   94 -
 third_party/jpeg-xl/lib/jxl/tf_gbench.cc      |  147 -
 third_party/jpeg-xl/lib/jxl/toc.cc            |  109 -
 third_party/jpeg-xl/lib/jxl/toc.h             |   56 -
 third_party/jpeg-xl/lib/jxl/toc_test.cc       |  112 -
 third_party/jpeg-xl/lib/jxl/transpose-inl.h   |  203 -
 third_party/jpeg-xl/lib/jxl/version.h.in      |   39 -
 .../jpeg-xl/lib/jxl/xorshift128plus-inl.h     |  103 -
 .../jpeg-xl/lib/jxl/xorshift128plus_test.cc   |  378 --
 third_party/jpeg-xl/lib/jxl_benchmark.cmake   |   44 -
 third_party/jpeg-xl/lib/jxl_cms.cmake         |   74 -
 third_party/jpeg-xl/lib/jxl_extras.cmake      |  169 -
 third_party/jpeg-xl/lib/jxl_lists.bzl         |  656 --
 third_party/jpeg-xl/lib/jxl_lists.cmake       |  645 --
 third_party/jpeg-xl/lib/jxl_tests.cmake       |   96 -
 third_party/jpeg-xl/lib/jxl_threads.cmake     |   96 -
 third_party/jpeg-xl/lib/jxl_vars.bzl          |   46 -
 third_party/jpeg-xl/lib/nothing.cc            |    7 -
 .../jpeg-xl/lib/threads/libjxl_threads.pc.in  |   13 -
 .../lib/threads/resizable_parallel_runner.cc  |  200 -
 .../lib/threads/thread_parallel_runner.cc     |  109 -
 .../thread_parallel_runner_internal.cc        |  180 -
 .../threads/thread_parallel_runner_internal.h |  166 -
 .../threads/thread_parallel_runner_test.cc    |  129 -
 third_party/jpeg-xl/plugins/CMakeLists.txt    |   21 -
 .../jpeg-xl/plugins/gdk-pixbuf/CMakeLists.txt |   83 -
 .../jpeg-xl/plugins/gdk-pixbuf/README.md      |   50 -
 .../plugins/gdk-pixbuf/jxl.thumbnailer        |    4 -
 .../plugins/gdk-pixbuf/loaders_test.cache     |   16 -
 .../plugins/gdk-pixbuf/pixbufloader-jxl.c     |  781 ---
 .../plugins/gdk-pixbuf/pixbufloader_test.cc   |   42 -
 .../jpeg-xl/plugins/gimp/CMakeLists.txt       |   28 -
 third_party/jpeg-xl/plugins/gimp/common.cc    |   24 -
 third_party/jpeg-xl/plugins/gimp/common.h     |   45 -
 .../jpeg-xl/plugins/gimp/file-jxl-load.cc     |  483 --
 .../jpeg-xl/plugins/gimp/file-jxl-load.h      |   17 -
 .../jpeg-xl/plugins/gimp/file-jxl-save.cc     |  893 ---
 .../jpeg-xl/plugins/gimp/file-jxl-save.h      |   18 -
 third_party/jpeg-xl/plugins/gimp/file-jxl.cc  |  157 -
 .../jpeg-xl/plugins/mime/CMakeLists.txt       |    6 -
 third_party/jpeg-xl/plugins/mime/README.md    |   37 -
 .../jpeg-xl/plugins/mime/image-jxl.xml        |   13 -
 .../jpeg-xl/third_party/CMakeLists.txt        |  175 -
 .../third_party/HEVCSoftware/README.md        |    2 -
 .../third_party/HEVCSoftware/cfg/LICENSE      |   31 -
 .../cfg/encoder_intra_main_scc_10.cfg         |  136 -
 third_party/jpeg-xl/third_party/dirent.cc     |  144 -
 third_party/jpeg-xl/third_party/dirent.h      |   49 -
 third_party/jpeg-xl/third_party/lcms2.cmake   |   77 -
 third_party/jpeg-xl/third_party/sjpeg.cmake   |   27 -
 third_party/jpeg-xl/third_party/skcms.cmake   |   26 -
 third_party/jpeg-xl/third_party/testing.cmake |   60 -
 659 files changed, 155587 deletions(-)
 delete mode 100644 third_party/jpeg-xl/.bazelignore
 delete mode 100644 third_party/jpeg-xl/.clang-format
 delete mode 100644 third_party/jpeg-xl/.clang-tidy
 delete mode 100644 third_party/jpeg-xl/.pre-commit-config.yaml
 delete mode 100644 third_party/jpeg-xl/.readthedocs.yaml
 delete mode 100644 third_party/jpeg-xl/AUTHORS
 delete mode 100644 third_party/jpeg-xl/BUILD.bazel
 delete mode 100644 third_party/jpeg-xl/BUILDING.md
 delete mode 100644 third_party/jpeg-xl/BUILDING_Haiku.md
 delete mode 100644 third_party/jpeg-xl/BUILDING_OSX.md
 delete mode 100644 third_party/jpeg-xl/CHANGELOG.md
 delete mode 100644 third_party/jpeg-xl/CMakeLists.txt
 delete mode 100644 third_party/jpeg-xl/CODE_OF_CONDUCT.md
 delete mode 100644 third_party/jpeg-xl/CONTRIBUTING.md
 delete mode 100644 third_party/jpeg-xl/CONTRIBUTORS
 delete mode 100644 third_party/jpeg-xl/LICENSE
 delete mode 100644 third_party/jpeg-xl/MODULE.bazel
 delete mode 100644 third_party/jpeg-xl/MODULE.bazel.lock
 delete mode 100644 third_party/jpeg-xl/PATENTS
 delete mode 100644 third_party/jpeg-xl/README.md
 delete mode 100644 third_party/jpeg-xl/SECURITY.md
 delete mode 100644 third_party/jpeg-xl/WORKSPACE
 delete mode 100755 third_party/jpeg-xl/bash_test.sh
 delete mode 100755 third_party/jpeg-xl/ci.sh
 delete mode 100644 third_party/jpeg-xl/cmake/FindAtomics.cmake
 delete mode 100644 third_party/jpeg-xl/cmake/FindBrotli.cmake
 delete mode 100644 third_party/jpeg-xl/cmake/FindHWY.cmake
 delete mode 100644 third_party/jpeg-xl/cmake/FindLCMS2.cmake
 delete mode 100644 third_party/jpeg-xl/debian/changelog
 delete mode 100644 third_party/jpeg-xl/debian/compat
 delete mode 100644 third_party/jpeg-xl/debian/control
 delete mode 100644 third_party/jpeg-xl/debian/copyright
 delete mode 100644 third_party/jpeg-xl/debian/jxl.install
 delete mode 100644 third_party/jpeg-xl/debian/libjxl-dev.install
 delete mode 100644 third_party/jpeg-xl/debian/libjxl-gdk-pixbuf.install
 delete mode 100644 third_party/jpeg-xl/debian/libjxl-gimp-plugin.install
 delete mode 100644 third_party/jpeg-xl/debian/libjxl.install
 delete mode 100755 third_party/jpeg-xl/debian/rules
 delete mode 100644 third_party/jpeg-xl/debian/source/format
 delete mode 100755 third_party/jpeg-xl/deps.sh
 delete mode 100644 third_party/jpeg-xl/examples/CMakeLists.txt
 delete mode 100644 third_party/jpeg-xl/examples/decode_exif_metadata.cc
 delete mode 100644 third_party/jpeg-xl/examples/decode_oneshot.cc
 delete mode 100644 third_party/jpeg-xl/examples/decode_progressive.cc
 delete mode 100644 third_party/jpeg-xl/examples/encode_oneshot.cc
 delete mode 100644 third_party/jpeg-xl/examples/examples.cmake
 delete mode 100644 third_party/jpeg-xl/flake.lock
 delete mode 100644 third_party/jpeg-xl/flake.nix
 delete mode 100644 third_party/jpeg-xl/lib/BUILD
 delete mode 100644 third_party/jpeg-xl/lib/CMakeLists.txt
 delete mode 100644 third_party/jpeg-xl/lib/extras/LICENSE.apngdis
 delete mode 100644 third_party/jpeg-xl/lib/extras/README.md
 delete mode 100644 third_party/jpeg-xl/lib/extras/alpha_blend.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/alpha_blend.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/codec.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/codec.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/codec_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/common.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/common.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/compressed_icc.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/compressed_icc_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/apng.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/apng.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/color_description.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/color_description.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/color_description_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/color_hints.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/color_hints.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/decode.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/decode.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/exr.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/exr.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/gif.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/gif.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/jpegli.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/jpegli.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/jpg.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/jpg.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/jxl.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/jxl.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/pgx.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/pgx.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/pgx_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/pnm.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/dec/pnm.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/enc/apng.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/enc/apng.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/enc/encode.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/enc/encode.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/enc/exr.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/enc/exr.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/enc/jpegli.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/enc/jpegli.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/enc/jpg.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/enc/jpg.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/enc/jxl.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/enc/jxl.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/enc/npy.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/enc/npy.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/enc/pgx.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/enc/pgx.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/enc/pnm.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/enc/pnm.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/exif.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/exif.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/gain_map.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/gain_map_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/hlg.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/hlg.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/jpegli_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/metrics.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/metrics.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/mmap.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/mmap.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/packed_image.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/packed_image_convert.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/packed_image_convert.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/size_constraints.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/time.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/time.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/tone_mapping.cc
 delete mode 100644 third_party/jpeg-xl/lib/extras/tone_mapping.h
 delete mode 100644 third_party/jpeg-xl/lib/extras/tone_mapping_gbench.cc
 delete mode 100644 third_party/jpeg-xl/lib/gbench_main.cc
 delete mode 100644 third_party/jpeg-xl/lib/include/jxl/cms.h
 delete mode 100644 third_party/jpeg-xl/lib/include/jxl/cms_interface.h
 delete mode 100644 third_party/jpeg-xl/lib/include/jxl/codestream_header.h
 delete mode 100644 third_party/jpeg-xl/lib/include/jxl/color_encoding.h
 delete mode 100644 third_party/jpeg-xl/lib/include/jxl/compressed_icc.h
 delete mode 100644 third_party/jpeg-xl/lib/include/jxl/decode.h
 delete mode 100644 third_party/jpeg-xl/lib/include/jxl/decode_cxx.h
 delete mode 100644 third_party/jpeg-xl/lib/include/jxl/encode.h
 delete mode 100644 third_party/jpeg-xl/lib/include/jxl/encode_cxx.h
 delete mode 100644 third_party/jpeg-xl/lib/include/jxl/gain_map.h
 delete mode 100644 third_party/jpeg-xl/lib/include/jxl/memory_manager.h
 delete mode 100644 third_party/jpeg-xl/lib/include/jxl/parallel_runner.h
 delete mode 100644 third_party/jpeg-xl/lib/include/jxl/resizable_parallel_runner.h
 delete mode 100644 third_party/jpeg-xl/lib/include/jxl/resizable_parallel_runner_cxx.h
 delete mode 100644 third_party/jpeg-xl/lib/include/jxl/stats.h
 delete mode 100644 third_party/jpeg-xl/lib/include/jxl/thread_parallel_runner.h
 delete mode 100644 third_party/jpeg-xl/lib/include/jxl/thread_parallel_runner_cxx.h
 delete mode 100644 third_party/jpeg-xl/lib/include/jxl/types.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli.cmake
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/README.md
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/adaptive_quantization.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/adaptive_quantization.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/bit_writer.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/bit_writer.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/bitstream.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/bitstream.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/color_quantize.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/color_quantize.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/color_transform.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/color_transform.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/common.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/common.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/common_internal.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/dct-inl.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/decode.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/decode.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/decode_api_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/decode_internal.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/decode_marker.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/decode_marker.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/decode_scan.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/decode_scan.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/destination_manager.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/downsample.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/downsample.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/encode.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/encode.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/encode_api_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/encode_finish.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/encode_finish.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/encode_internal.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/encode_streaming.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/encode_streaming.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/entropy_coding-inl.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/entropy_coding.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/entropy_coding.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/error.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/error.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/error_handling_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/fuzztest.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/huffman.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/huffman.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/idct.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/idct.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/input.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/input.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/input_suspension_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/jpeg.version.62
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/jpeg.version.8
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/libjpeg_test_util.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/libjpeg_test_util.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/libjpeg_wrapper.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/memory_manager.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/memory_manager.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/output_suspension_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/quant.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/quant.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/render.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/render.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/simd.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/simd.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/source_manager.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/source_manager_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/streaming_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/test_params.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/test_utils-inl.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/test_utils.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/test_utils.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/testing.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/transcode_api_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/transpose-inl.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/types.h
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/upsample.cc
 delete mode 100644 third_party/jpeg-xl/lib/jpegli/upsample.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl.cmake
 delete mode 100644 third_party/jpeg-xl/lib/jxl/ac_context.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/ac_strategy.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/ac_strategy.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/ac_strategy_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/alpha.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/alpha.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/alpha_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/ans_common.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/ans_common.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/ans_common_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/ans_params.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/ans_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/arch_macros.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/bits.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/byte_order.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/c_callback_support.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/common.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/compiler_specific.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/data_parallel.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/exif.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/fast_math-inl.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/float.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/iaca.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/include_jpeglib.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/matrix_ops.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/os_macros.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/override.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/printf_macros.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/random.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/rational_polynomial-inl.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/rect.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/sanitizer_definitions.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/sanitizers.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/scope_guard.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/span.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/base/status.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/bit_reader_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/bits_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/blending.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/blending.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/blending_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/box_content_decoder.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/box_content_decoder.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/butteraugli/butteraugli.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/butteraugli/butteraugli.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/butteraugli/butteraugli_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/byte_order_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/chroma_from_luma.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/chroma_from_luma.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/cms/color_encoding_cms.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/cms/jxl_cms.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/cms/jxl_cms_internal.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/cms/opsin_params.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/cms/tone_mapping-inl.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/cms/tone_mapping.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/cms/tone_mapping_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/cms/transfer_functions-inl.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/cms/transfer_functions.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/cms/transfer_functions_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/codec_in_out.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/coeff_order.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/coeff_order.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/coeff_order_fwd.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/coeff_order_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/color_encoding_internal.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/color_encoding_internal.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/color_encoding_internal_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/color_management_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/common.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/compressed_dc.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/compressed_dc.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/convolve-inl.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/convolve.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/convolve_separable5.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/convolve_slow.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/convolve_symmetric3.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/convolve_symmetric5.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/convolve_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/data_parallel_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dct-inl.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dct_block-inl.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dct_for_test.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dct_scales.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dct_scales.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dct_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dct_util.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_ans.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_ans.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_bit_reader.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_cache.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_cache.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_context_map.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_context_map.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_external_image.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_external_image.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_external_image_gbench.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_frame.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_frame.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_group.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_group.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_group_border.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_group_border.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_huffman.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_huffman.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_modular.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_modular.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_noise.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_noise.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_patch_dictionary.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_patch_dictionary.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_transforms-inl.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_transforms_testonly.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_transforms_testonly.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_xyb-inl.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_xyb.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/dec_xyb.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/decode.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/decode_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/decode_to_jpeg.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/decode_to_jpeg.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_ac_strategy.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_ac_strategy.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_adaptive_quantization.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_adaptive_quantization.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_ans.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_ans.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_ans_params.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_aux_out.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_aux_out.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_bit_writer.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_bit_writer.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_butteraugli_comparator.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_butteraugli_comparator.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_cache.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_cache.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_chroma_from_luma.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_chroma_from_luma.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_cluster.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_cluster.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_coeff_order.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_coeff_order.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_comparator.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_comparator.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_context_map.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_context_map.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_debug_image.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_debug_image.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_detect_dots.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_detect_dots.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_entropy_coder.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_entropy_coder.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_external_image.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_external_image.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_external_image_gbench.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_external_image_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_fast_lossless.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_fast_lossless.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_fields.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_fields.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_frame.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_frame.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_gaborish.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_gaborish.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_gaborish_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_gamma_correct.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_group.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_group.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_heuristics.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_heuristics.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_huffman.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_huffman.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_huffman_tree.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_huffman_tree.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_icc_codec.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_icc_codec.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_image_bundle.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_image_bundle.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_linalg.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_linalg.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_linalg_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_modular.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_modular.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_noise.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_noise.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_optimize.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_optimize_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_params.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_patch_dictionary.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_patch_dictionary.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_photon_noise.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_photon_noise.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_photon_noise_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_progressive_split.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_progressive_split.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_quant_weights.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_quant_weights.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_splines.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_splines.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_toc.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_toc.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_transforms-inl.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_transforms.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_transforms.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_xyb.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/enc_xyb.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/encode.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/encode_internal.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/encode_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/entropy_coder.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/entropy_coder.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/entropy_coder_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/epf.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/epf.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/fake_parallel_runner_testonly.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/fast_math_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/field_encodings.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/fields.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/fields.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/fields_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/frame_dimensions.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/frame_header.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/frame_header.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/fuzztest.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/gamma_correct_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/gradient_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/headers.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/headers.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/huffman_table.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/huffman_table.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/iaca_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/icc_codec.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/icc_codec.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/icc_codec_common.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/icc_codec_common.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/icc_codec_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/image.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/image.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/image_bundle.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/image_bundle.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/image_bundle_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/image_metadata.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/image_metadata.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/image_ops.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/image_ops.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/image_ops_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/image_test_utils.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/inverse_mtf-inl.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data_writer.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data_writer.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_output_chunk.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_serialization_state.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data_reader.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data_reader.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_huffman_decode.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_huffman_decode.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/jpeg/jpeg_data.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/jpeg/jpeg_data.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/jxl.syms
 delete mode 100644 third_party/jpeg-xl/lib/jxl/jxl.version
 delete mode 100644 third_party/jpeg-xl/lib/jxl/jxl_osx.syms
 delete mode 100644 third_party/jpeg-xl/lib/jxl/jxl_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/lehmer_code.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/lehmer_code_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/libjxl.pc.in
 delete mode 100644 third_party/jpeg-xl/lib/jxl/libjxl_cms.pc.in
 delete mode 100644 third_party/jpeg-xl/lib/jxl/loop_filter.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/loop_filter.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/luminance.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/luminance.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/memory_manager_internal.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/memory_manager_internal.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/encoding/context_predict.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/encoding/dec_ma.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/encoding/dec_ma.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/encoding/enc_debug_tree.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/encoding/enc_debug_tree.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/encoding/enc_encoding.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/encoding/enc_encoding.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/encoding/enc_ma.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/encoding/enc_ma.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/encoding/encoding.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/encoding/encoding.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/encoding/ma_common.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/modular_image.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/modular_image.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/options.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/transform/enc_palette.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/transform/enc_palette.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/transform/enc_rct.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/transform/enc_rct.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/transform/enc_squeeze.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/transform/enc_squeeze.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/transform/enc_transform.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/transform/enc_transform.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/transform/palette.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/transform/palette.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/transform/rct.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/transform/rct.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/transform/squeeze.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/transform/squeeze.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/transform/transform.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular/transform/transform.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/modular_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/noise.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/opsin_image_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/opsin_inverse_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/opsin_params.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/opsin_params.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/pack_signed.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/padded_bytes.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/padded_bytes_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/passes_state.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/passes_state.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/passes_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/patch_dictionary_internal.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/patch_dictionary_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/preview_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/quant_weights.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/quant_weights.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/quant_weights_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/quantizer-inl.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/quantizer.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/quantizer.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/quantizer_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/rational_polynomial_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/low_memory_render_pipeline.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/low_memory_render_pipeline.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/render_pipeline.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/render_pipeline.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/render_pipeline_stage.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/render_pipeline_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/simple_render_pipeline.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/simple_render_pipeline.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_blending.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_blending.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_chroma_upsampling.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_chroma_upsampling.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_cms.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_cms.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_epf.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_epf.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_from_linear.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_from_linear.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_gaborish.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_gaborish.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_noise.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_noise.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_patches.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_patches.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_splines.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_splines.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_spot.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_spot.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_to_linear.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_to_linear.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_tone_mapping.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_tone_mapping.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_upsampling.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_upsampling.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_write.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_write.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_xyb.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_xyb.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_ycbcr.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/stage_ycbcr.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/render_pipeline/test_render_pipeline_stages.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/roundtrip_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/simd_util-inl.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/simd_util.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/simd_util.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/simd_util_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/speed_tier_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/splines.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/splines.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/splines_gbench.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/splines_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/test_image.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/test_image.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/test_memory_manager.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/test_memory_manager.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/test_utils.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/test_utils.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/testing.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/tf_gbench.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/toc.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/toc.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/toc_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl/transpose-inl.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/version.h.in
 delete mode 100644 third_party/jpeg-xl/lib/jxl/xorshift128plus-inl.h
 delete mode 100644 third_party/jpeg-xl/lib/jxl/xorshift128plus_test.cc
 delete mode 100644 third_party/jpeg-xl/lib/jxl_benchmark.cmake
 delete mode 100644 third_party/jpeg-xl/lib/jxl_cms.cmake
 delete mode 100644 third_party/jpeg-xl/lib/jxl_extras.cmake
 delete mode 100644 third_party/jpeg-xl/lib/jxl_lists.bzl
 delete mode 100644 third_party/jpeg-xl/lib/jxl_lists.cmake
 delete mode 100644 third_party/jpeg-xl/lib/jxl_tests.cmake
 delete mode 100644 third_party/jpeg-xl/lib/jxl_threads.cmake
 delete mode 100644 third_party/jpeg-xl/lib/jxl_vars.bzl
 delete mode 100644 third_party/jpeg-xl/lib/nothing.cc
 delete mode 100644 third_party/jpeg-xl/lib/threads/libjxl_threads.pc.in
 delete mode 100644 third_party/jpeg-xl/lib/threads/resizable_parallel_runner.cc
 delete mode 100644 third_party/jpeg-xl/lib/threads/thread_parallel_runner.cc
 delete mode 100644 third_party/jpeg-xl/lib/threads/thread_parallel_runner_internal.cc
 delete mode 100644 third_party/jpeg-xl/lib/threads/thread_parallel_runner_internal.h
 delete mode 100644 third_party/jpeg-xl/lib/threads/thread_parallel_runner_test.cc
 delete mode 100644 third_party/jpeg-xl/plugins/CMakeLists.txt
 delete mode 100644 third_party/jpeg-xl/plugins/gdk-pixbuf/CMakeLists.txt
 delete mode 100644 third_party/jpeg-xl/plugins/gdk-pixbuf/README.md
 delete mode 100644 third_party/jpeg-xl/plugins/gdk-pixbuf/jxl.thumbnailer
 delete mode 100644 third_party/jpeg-xl/plugins/gdk-pixbuf/loaders_test.cache
 delete mode 100644 third_party/jpeg-xl/plugins/gdk-pixbuf/pixbufloader-jxl.c
 delete mode 100644 third_party/jpeg-xl/plugins/gdk-pixbuf/pixbufloader_test.cc
 delete mode 100644 third_party/jpeg-xl/plugins/gimp/CMakeLists.txt
 delete mode 100644 third_party/jpeg-xl/plugins/gimp/common.cc
 delete mode 100644 third_party/jpeg-xl/plugins/gimp/common.h
 delete mode 100644 third_party/jpeg-xl/plugins/gimp/file-jxl-load.cc
 delete mode 100644 third_party/jpeg-xl/plugins/gimp/file-jxl-load.h
 delete mode 100644 third_party/jpeg-xl/plugins/gimp/file-jxl-save.cc
 delete mode 100644 third_party/jpeg-xl/plugins/gimp/file-jxl-save.h
 delete mode 100644 third_party/jpeg-xl/plugins/gimp/file-jxl.cc
 delete mode 100644 third_party/jpeg-xl/plugins/mime/CMakeLists.txt
 delete mode 100644 third_party/jpeg-xl/plugins/mime/README.md
 delete mode 100644 third_party/jpeg-xl/plugins/mime/image-jxl.xml
 delete mode 100644 third_party/jpeg-xl/third_party/CMakeLists.txt
 delete mode 100644 third_party/jpeg-xl/third_party/HEVCSoftware/README.md
 delete mode 100644 third_party/jpeg-xl/third_party/HEVCSoftware/cfg/LICENSE
 delete mode 100644 third_party/jpeg-xl/third_party/HEVCSoftware/cfg/encoder_intra_main_scc_10.cfg
 delete mode 100644 third_party/jpeg-xl/third_party/dirent.cc
 delete mode 100644 third_party/jpeg-xl/third_party/dirent.h
 delete mode 100644 third_party/jpeg-xl/third_party/lcms2.cmake
 delete mode 100644 third_party/jpeg-xl/third_party/sjpeg.cmake
 delete mode 100644 third_party/jpeg-xl/third_party/skcms.cmake
 delete mode 100644 third_party/jpeg-xl/third_party/testing.cmake

diff --git a/third_party/jpeg-xl/.bazelignore b/third_party/jpeg-xl/.bazelignore
deleted file mode 100644
index 912eacc1b5274..0000000000000
--- a/third_party/jpeg-xl/.bazelignore
+++ /dev/null
@@ -1 +0,0 @@
-third_party
diff --git a/third_party/jpeg-xl/.clang-format b/third_party/jpeg-xl/.clang-format
deleted file mode 100644
index a61b61c569724..0000000000000
--- a/third_party/jpeg-xl/.clang-format
+++ /dev/null
@@ -1,4 +0,0 @@
-BasedOnStyle: Google
-IncludeCategories:
-  - Regex:           '^<hwy/'
-    Priority:        2
diff --git a/third_party/jpeg-xl/.clang-tidy b/third_party/jpeg-xl/.clang-tidy
deleted file mode 100644
index 11c6d2bcdd6e7..0000000000000
--- a/third_party/jpeg-xl/.clang-tidy
+++ /dev/null
@@ -1,87 +0,0 @@
-# Disabled checks:
-# - modernize-deprecated-headers: We don't use std:: versions of the standard
-#   types and functions like size_t or printf, so we should include <stdio.h>
-#   instead <cstdio>.
-# - modernize-return-braced-init-list: this often doesn't improve readability.
-# - modernize-use-auto: is too aggressive towards using auto.
-# - modernize-use-default-member-init: with a mix of constructors and default
-#   member initialization this can be confusing if enforced.
-# - modernize-use-trailing-return-type: does not improve readability when used
-#   systematically.
-# - modernize-use-using: typedefs are ok.
-#
-# - readability-else-after-return: It doesn't always improve readability.
-# - readability-static-accessed-through-instance
-#   It is often more useful and readable to access a constant of a passed
-#   variable (like d.N) instead of using the type of the variable that could be
-#   long and complex.
-# - readability-uppercase-literal-suffix: we write 1.0f, not 1.0F.
-
-Checks: >-
-  bugprone-*,
-  clang-*,
-  -clang-diagnostic-unused-command-line-argument,
-  google-*,
-  modernize-*,
-  performance-*,
-  readability-*,
-  -bugprone-branch-clone,
-  -bugprone-easily-swappable-parameters,
-  -bugprone-implicit-widening-of-multiplication-result,
-  -bugprone-infinite-loop,
-  -bugprone-narrowing-conversions,
-  -bugprone-unused-local-non-trivial-variable,
-  -modernize-avoid-c-arrays,
-  -modernize-concat-nested-namespaces,
-  -modernize-deprecated-headers,
-  -modernize-return-braced-init-list,
-  -modernize-type-traits,
-  -modernize-use-auto,
-  -modernize-use-default-member-init,
-  -modernize-use-nodiscard,
-  -modernize-use-trailing-return-type,
-  -modernize-use-using,
-  -performance-enum-size,
-  -readability-avoid-nested-conditional-operator,
-  -readability-else-after-return,
-  -readability-function-cognitive-complexity,
-  -readability-identifier-length,
-  -readability-magic-numbers,
-  -readability-redundant-access-specifiers,
-  -readability-simplify-boolean-expr,
-  -readability-static-accessed-through-instance,
-  -readability-suspicious-call-argument,
-  -readability-uppercase-literal-suffix,
-  -readability-use-anyofallof,
-
-
-WarningsAsErrors: >-
-  bugprone-argument-comment,
-  bugprone-macro-parentheses,
-  bugprone-suspicious-string-compare,
-  bugprone-use-after-move,
-  clang-*,
-  clang-analyzer-*,
-  -clang-diagnostic-unused-command-line-argument,
-  google-build-using-namespace,
-  google-explicit-constructor,
-  google-readability-braces-around-statements,
-  google-readability-namespace-comments,
-  modernize-use-override,
-  readability-inconsistent-declaration-parameter-name
-
-# We are only interested in the headers from this projects, excluding
-# third_party/ and build/.
-HeaderFilterRegex: '^.*/(lib|tools)/.*\.h$'
-
-CheckOptions:
-  - key:   readability-braces-around-statements.ShortStatementLines
-    value: '2'
-  - key:   google-readability-braces-around-statements.ShortStatementLines
-    value: '2'
-  - key:   readability-implicit-bool-conversion.AllowPointerConditions
-    value: '1'
-  - key:   readability-implicit-bool-conversion.AllowIntegerConditions
-    value: '1'
-  - key:   bugprone-signed-char-misuse.CharTypdefsToIgnore
-    value: 'int8_t'
diff --git a/third_party/jpeg-xl/.pre-commit-config.yaml b/third_party/jpeg-xl/.pre-commit-config.yaml
deleted file mode 100644
index 96b5d7fb5254c..0000000000000
--- a/third_party/jpeg-xl/.pre-commit-config.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-repos:
-- repo: https://github.com/gherynos/pre-commit-java
-  rev: v0.2.4
-  hooks:
-  - id: Checkstyle
-- repo: https://github.com/gitleaks/gitleaks
-  rev: v8.16.3
-  hooks:
-  - id: gitleaks
-- repo: https://github.com/jumanjihouse/pre-commit-hooks
-  rev: 3.0.0
-  hooks:
-  - id: shellcheck
-- repo: https://github.com/pocc/pre-commit-hooks
-  rev: v1.3.5
-  hooks:
-  - id: cpplint
-- repo: https://github.com/pre-commit/mirrors-eslint
-  rev: v8.38.0
-  hooks:
-  - id: eslint
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.4.0
-  hooks:
-  - id: end-of-file-fixer
-  - id: trailing-whitespace
-- repo: https://github.com/pylint-dev/pylint
-  rev: v2.17.2
-  hooks:
-  - id: pylint
diff --git a/third_party/jpeg-xl/.readthedocs.yaml b/third_party/jpeg-xl/.readthedocs.yaml
deleted file mode 100644
index ee25fed4816ff..0000000000000
--- a/third_party/jpeg-xl/.readthedocs.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# readthedocs.io configuration file. See:
-#   https://docs.readthedocs.io/en/stable/config-file/v2.html
-
-version: 2
-
-sphinx:
-   configuration: doc/sphinx/conf.py
-
-build:
-   os: ubuntu-22.04
-   tools:
-      python: "3"
-   apt_packages:
-      - doxygen
-      - graphviz
-
-python:
-   install:
-   - requirements: doc/sphinx/requirements.txt
diff --git a/third_party/jpeg-xl/AUTHORS b/third_party/jpeg-xl/AUTHORS
deleted file mode 100644
index afd884bc79df5..0000000000000
--- a/third_party/jpeg-xl/AUTHORS
+++ /dev/null
@@ -1,103 +0,0 @@
-# List of the project authors.
-# When contributing you can add your name to this list.
-# For a complete list of contributions made after the move
-# from gitlab to github, see
-# https://github.com/libjxl/libjxl/graphs/contributors.
-# See CONTRIBUTING.md for details.
-#
-#
-# Please keep each list sorted. If you wish to change your email address please
-# send a pull request.
-
-# Organizations:
-
-# - Cloudinary Ltd.:
-Jon Sneyers <jon@cloudinary.com>
-
-# - Google:
-Evgenii Kliuchnikov <eustas@google.com>
-Iulia Comșa <iuliacomsa@google.com>
-Jan Wassenberg <janwas@google.com>
-Jyrki Alakuijala <jyrki@google.com>
-Lode Vandevenne <lode@google.com>
-Luca Versari <veluca@google.com>
-Marcin Kowalczyk <qrczak@google.com>
-Martin Bruse <zond@google.com>
-Moritz Firsching <firsching@google.com>
-Sami Boukortt <sboukortt@google.com>
-Sebastian Gomez <sggonzalez@google.com>
-Thomas Fischbacher <tfish@google.com>
-Zoltan Szabadka <szabadka@google.com>
-
-# Individuals:
-a-shvedov
-Aditya Patadia <adityapatadia@users.noreply.github.com>
-Ahmad Amsyar Asyadiq Bin Syaiful Bahri <27284123+Ahmad-Amsyar@users.noreply.github.com>
-Alex Xu (Hello71) <alex_y_xu@yahoo.ca>
-Alexander Sago <cagelight@gmail.com>
-Alifian Caesar Khalid <alifiancaesar@gmail.com>
-Alistair Barrow
-Andrius Lukas Narbutas <andrius4669@gmail.com>
-Aous Naman <aous@unsw.edu.au>
-Artem Selishchev
-Aryan Pingle <realaryanpingle@gmail.com>
-Biswapriyo Nath <nathbappai@gmail.com>
-CanadianBaconBoi <beamconnor@gmail.com>
-Damiano Albani <damiano.albani@gmail.com>
-Damon Townsend
-Daniel Novomeský <dnovomesky@gmail.com>
-David Burnett <vargolsoft@gmail.com>
-dependabot[bot]
-Diego Pino <dpino@igalia.com>
-Dirk Lemstra <dirk@lemstra.org>
-Dmitry Baryshev <dima8w@gmail.com>
-Don Olmstead <don.j.olmstead@gmail.com>
-Dong Xu <xdong181@gmail.com>
-estrogently <41487185+estrogently@users.noreply.github.com>
-Even Rouault <even.rouault@spatialys.com>
-Fred Brennan <copypaste@kittens.ph>
-Gerhard Huber <support@pl32.com>
-gi-man
-Gilles Devillers (GilDev) <gildev@gmail.com>
-Heiko Becker <heirecka@exherbo.org>
-Ivan Kokorev
-Jim Robinson <jimbo2150@gmail.com>
-John Platts <john_platts@hotmail.com>
-Jonathan Brown (Jonnyawsom3) <jonathanbr30@gmail.com>
-Joshua Root <jmr@macports.org>
-Kai Hollberg <Schweinepriester@users.noreply.github.com>
-Kerry Su <me@sshockwave.net>
-Kleis Auke Wolthuizen <github@kleisauke.nl>
-L. E. Segovia
-ledoge
-Leo Izen <leo.izen@gmail.com>
-Lovell Fuller
-Maarten DB <anonymous.maarten@gmail.com>
-Marcin Konicki <ahwayakchih@gmail.com>
-Martin Strunz
-Mathieu Malaterre <mathieu.malaterre@gmail.com>
-Mikk Leini <mikk.leini@krakul.eu>
-Misaki Kasumi <misakikasumi@outlook.com>
-Moonchild Straver <moonchild@palemoon.org>
-Nicholas Hayes <0xC0000054@users.noreply.github.com>
-Nigel Tao <nigeltao@golang.org>
-oupson <oupson1er@gmail.com>
-Petr Diblík
-Pieter Wuille
-roland-rollo
-Samuel Leong <wvvwvvvvwvvw@gmail.com>
-Sandro <sandro.jaeckel@gmail.com>
-sandstrom
-Sergey Fedorov <vital.had@gmail.com>
-Stephan T. Lavavej <stl@nuwen.net>
-StepSecurity Bot <bot@stepsecurity.io>
-Sylvestre Ledru <sylvestre@debian.org>
-Thomas Bonfort <thomas.bonfort@airbus.com>
-Timo Rothenpieler <timo@rothenpieler.org>
-tmkk <tmkkmac@gmail.com>
-Vincent Torri <vincent.torri@gmail.com>
-Wonwoo Choi <chwo9843@gmail.com>
-xiota
-Yonatan Nebenzhal <yonatan.nebenzhl@gmail.com>
-Ziemowit Zabawa <ziemek.zabawa@outlook.com>
-源文雨 <41315874+fumiama@users.noreply.github.com>
diff --git a/third_party/jpeg-xl/BUILD.bazel b/third_party/jpeg-xl/BUILD.bazel
deleted file mode 100644
index 45c5261a2ea47..0000000000000
--- a/third_party/jpeg-xl/BUILD.bazel
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-package(default_visibility = ["//:__subpackages__"])
-
-filegroup(
-    name = "testdata",
-    srcs = glob([
-        "testdata/**/*.icc",
-        "testdata/**/*.pam",
-        "testdata/**/*.pfm",
-        "testdata/**/*.pgm",
-        "testdata/**/*.pnm",
-        "testdata/**/*.ppm",
-        "testdata/**/*.png",
-        "testdata/**/*.jpg",
-        "testdata/**/*.jxl",
-        "testdata/**/*.gif",
-        "testdata/**/*.y4m",
-        "testdata/**/*.jxl",
-        "testdata/**/*.png",
-        "testdata/**/*.jpg",
-        "testdata/position_encoding/*.txt",
-    ]),
-)
-
diff --git a/third_party/jpeg-xl/BUILDING.md b/third_party/jpeg-xl/BUILDING.md
deleted file mode 100644
index 7e9bc2aad3a40..0000000000000
--- a/third_party/jpeg-xl/BUILDING.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# Compilation
-
-For more details and other workflows see the "Advanced guide" below.
-
-## Checking out the code
-
-```bash
-git clone https://github.com/libjxl/libjxl.git --recursive --shallow-submodules
-```
-
-This repository uses git submodules to handle some third party dependencies
-under `third_party`, that's why it is important to pass `--recursive`. If you
-didn't check out with `--recursive`, or any submodule has changed, run:
-
-```bash
-git submodule update --init --recursive --depth 1 --recommend-shallow
-```
-
-The `--shallow-submodules` and `--depth 1 --recommend-shallow` options create
-shallow clones which only downloads the commits requested, and is all that is
-needed to build `libjxl`. Should full clones be necessary, you could always run:
-
-```bash
-git submodule foreach git fetch --unshallow
-git submodule update --init --recursive
-```
-
-which pulls the rest of the commits in the submodules.
-
-Important: If you downloaded a zip file or tarball from the web interface you
-won't get the needed submodules and the code will not compile. You can download
-these external dependencies from source running `./deps.sh`. The git workflow
-described above is recommended instead.
-
-## Installing dependencies
-
-Required dependencies for compiling the code, in a Debian/Ubuntu based
-distribution run:
-
-```bash
-sudo apt install cmake pkg-config libbrotli-dev
-```
-
-Optional dependencies for supporting other formats in the `cjxl`/`djxl` tools,
-in a Debian/Ubuntu based distribution run:
-
-```bash
-sudo apt install libgif-dev libjpeg-dev libopenexr-dev libpng-dev libwebp-dev
-```
-
-We recommend using a recent Clang compiler (version 7 or newer), for that
-install clang and set `CC` and `CXX` variables.
-
-```bash
-sudo apt install clang
-export CC=clang CXX=clang++
-```
-
-## Building
-
-```bash
-cd libjxl
-mkdir build
-cd build
-cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF ..
-cmake --build . -- -j$(nproc)
-```
-
-The encoder/decoder tools will be available in the `build/tools` directory.
-
-## <a name="installing"></a> Installing
-
-```bash
-sudo cmake --install .
-```
-
-
-## Building JPEG XL for developers
-
-For experienced developers, we provide build instructions for several other environments:
-
-*   [Building on Debian](doc/developing_in_debian.md)
-*   Building on Windows with [vcpkg](doc/developing_in_windows_vcpkg.md) (Visual Studio 2019)
-*   Building on Windows with [MSYS2](doc/developing_in_windows_msys.md)
-*   [Cross Compiling for Windows with Crossroad](doc/developing_with_crossroad.md)
diff --git a/third_party/jpeg-xl/BUILDING_Haiku.md b/third_party/jpeg-xl/BUILDING_Haiku.md
deleted file mode 100644
index 1ffca1453c77b..0000000000000
--- a/third_party/jpeg-xl/BUILDING_Haiku.md
+++ /dev/null
@@ -1,20 +0,0 @@
-## Disclaimer
-
-Haiku builds are not officially supported, i.e. the build might not work at all,
-some tests may fail and some sub-projects are excluded from build.
-
-This manual outlines Haiku-specific setup. For general building and testing
-instructions see "[BUILDING](BUILDING.md)" and
-"[Building and Testing changes](doc/building_and_testing.md)".
-
-## Dependencies
-
-```shell
-pkgman install llvm9_clang ninja cmake doxygen libjpeg_turbo_devel giflib_devel
-```
-
-## Building
-
-```shell
-TEST_STACK_LIMIT=none CMAKE_FLAGS="-I/boot/system/develop/tools/lib/gcc/x86_64-unknown-haiku/8.3.0/include/c++ -I/boot/system/develop/tools/lib/gcc/x86_64-unknown-haiku/8.3.0/include/c++/x86_64-unknown-haiku" CMAKE_SHARED_LINKER_FLAGS="-shared -Xlinker -soname=libjpegxl.so -lpthread" ./ci.sh opt
-```
diff --git a/third_party/jpeg-xl/BUILDING_OSX.md b/third_party/jpeg-xl/BUILDING_OSX.md
deleted file mode 100644
index b5f5e34db711e..0000000000000
--- a/third_party/jpeg-xl/BUILDING_OSX.md
+++ /dev/null
@@ -1,41 +0,0 @@
-## Disclaimer
-
-OSX builds have "best effort" support, i.e. build might not work at all, some
-tests may fail and some sub-projects are excluded from build.
-
-This manual outlines OSX specific setup. For general building and testing
-instructions see "[BUILDING](BUILDING.md)" and
-"[Building and Testing changes](doc/building_and_testing.md)".
-
-[Homebrew](https://brew.sh/) is a popular package manager. JPEG XL library and
-binaries could be installed using it:
-
-```bash
-brew install jpeg-xl
-```
-
-## Dependencies
-
-Make sure that `brew doctor` does not report serious problems and up-to-date
-version of XCode is installed.
-
-Installing (actually, building) `clang` might take a couple hours.
-
-```bash
-brew install llvm
-```
-
-```bash
-brew install coreutils cmake giflib jpeg-turbo libpng ninja zlib
-```
-
-Before building the project check that `which clang` is
-`/usr/local/opt/llvm/bin/clang`, not the one provided by XCode. If not, update
-`PATH` environment variable.
-
-Also, setting `CMAKE_PREFIX_PATH` might be necessary for correct include paths
-resolving, e.g.:
-
-```bash
-export CMAKE_PREFIX_PATH=`brew --prefix giflib`:`brew --prefix jpeg-turbo`:`brew --prefix libpng`:`brew --prefix zlib`
-```
\ No newline at end of file
diff --git a/third_party/jpeg-xl/CHANGELOG.md b/third_party/jpeg-xl/CHANGELOG.md
deleted file mode 100644
index 66bec271979d0..0000000000000
--- a/third_party/jpeg-xl/CHANGELOG.md
+++ /dev/null
@@ -1,403 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [0.11.1] - 2024-26-11
-
-### Fixed
-  - Huffman lookup table size fix (#3871 -
-    [CVE-2024-11403](https://www.cve.org/cverecord?id=CVE-2024-11403))
-  - Check height limit in modular trees. (#3943 -
-    [CVE-2024-11498](https://www.cve.org/cverecord?id=CVE-2024-11498))
-
-## [0.11.0] - 2024-09-13
-
-### Added
-  - Gain Map API (#3552 and #3628):  `JxlGainMapBundle` struct and API functions
-    to read and write gain map bundles`JxlGainMapWriteBundle` and
-    `JxlGainMapReadBundle` as well as handling compressed ICC profiles:
-    `JxlICCProfileEncode` and `JxlICCProfileDecode`.
-  - decoder API: added `JXL_DEC_BOX_COMPLETE` event to signal that the output
-    buffer for the current box has received all contents. Previously, this was
-    to be determined from the fact that the decoder had moved on either to
-    `JXL_DEC_SUCCESS` or to another subsequent `JXL_DEC_BOX`. This change is
-    made backward-compatible by the fact that the new event must be explicitly
-    subscribed to, and that `JXL_DEC_SUCCESS` / `JXL_DEC_BOX` still occur
-    afterwards and still imply that the previous box must be complete.
-
-### Changed / clarified
-  - avoiding abort in release build (#3631 and #3639)
-
-## [0.10.2] - 2024-03-08
-
-### Fixed
-  - bugs in (lossless) encoding (#3367, #3359 and #3386)
-  - re-enable installation of MIME file (#3375)
-  - bugs in streaming mode (#3379 and #3380)
-
-## [0.10.1] - 2024-02-28
-
-### Fixed
- - reduce allocations (#3336 and #3339),
-   fixing a significant speed regression present since 0.9.0
- - bug in streaming encoding (#3331)
-
-##  [0.10.0] - 2024-02-21
-
-### Added
- - decoder API: added `JxlDecoderGetBoxSizeContents` for getting the size of the
-   content of a box without the headers.
- - encoder API: implemented new api functions for streaming encoding.
-
-### Changed / clarified
- - decoder/encoder API: return failure when surface allocation fail
- - encoder API / cjxl: updated modular effort levels to faster settings; the
-   effort range is now 1-10, with 11 available in advanced mode.
-
-## [0.9.2] - 2024-02-07
-
-### Fixed
- - bugs in the gdk-pixbuf plugin
- - some build issues
-
-## [0.9.1] - 2024-01-08
-
-### Fixed
- - multiple build issues
-
-## [0.9.0] - 2023-12-22
-
-### Added
- - encoder API: add `JxlEncoderSetExtraChannelDistance` to adjust the quality
-   of extra channels (like alpha) separately.
- - encoder API: new api functions for streaming encoding:
-  - `JxlEncoderSetOutputProcessor`
-  - `JxlEncoderFlushInput`
-  - `JxlEncoderOutputProcessor` struct
-  - `JxlEncoderSetOutputCallback`
-  - `JxlChunkedFrameInputSource` struct
-  - `JxlEncoderAddChunkedFrame`
- - encoder API: new options for more fine-grained control over metadata
-   preservation when using `JxlEncoderAddJPEGFrame`:
-  - `JXL_ENC_FRAME_SETTING_JPEG_KEEP_EXIF`
-  - `JXL_ENC_FRAME_SETTING_JPEG_KEEP_XMP`
-  - `JXL_ENC_FRAME_SETTING_JPEG_KEEP_JUMBF`
- - encoder API: new function `JxlEncoderSetUpsamplingMode` to change the upsampling
-   method, e.g. to use nearest-neighbor upsampling for pixel art
- - decoder API: implemented `JxlDecoderSetOutputColorProfile` and
-   `JxlDecoderSetCms` to enable decoding to desired colorspace.
- - cjxl can now be used to explicitly add/update/strip Exif/XMP/JUMBF metadata using
-   the decoder-hints syntax, e.g. `cjxl input.ppm -x exif=input.exif output.jxl`
- - djxl can now be used to extract Exif/XMP/JUMBF metadata
- - encoder API: new function `JxlEncoderDistanceFromQuality` for convenience to
-   calculate a `distance` given a `quality`
-
-### Removed
- - API: the Butteraugli API (`jxl/butteraugli.h`) was removed.
- - encoder and decoder API: all deprecated functions were removed:
-   `JxlDecoderDefaultPixelFormat`, `JxlEncoderOptionsSetLossless`,
-   `JxlEncoderOptionsSetEffort`, `JxlEncoderOptionsSetDecodingSpeed`,
-   `JxlEncoderOptionsSetDistance`, `JxlEncoderOptionsCreate`, as well as
-   the deprecated enumerator values `JXL_DEC_EXTENSIONS`, `JXL_ENC_NOT_SUPPORTED`,
-   `JXL_TYPE_BOOLEAN`, `JXL_TYPE_UINT32`, and deprecated type `JxlEncoderOptions`.
- - decoder API: the signature of `JxlDecoderGetColorAsEncodedProfile`,
-   `JxlDecoderGetICCProfileSize`, and `JxlDecoderGetColorAsICCProfile`
-   changed: a deprecated unused argument was removed.
-
-### Changed / clarified
- - changed the name of the cjxl flag `photon_noise` to `photon_noise_iso`
- - fixed how large boxes are decoded (#2958)
- - fixed encoding files with unreadable patches (#3042, #3046)
-
-## [0.8.2] - 2023-06-14
-
-### Changed
- - Security: Fix an integer underflow bug in patch decoding (#2551- CVE-2023-35790).
-
-## [0.8.1] - 2023-02-03
-
-### Changed
- - Allow fast-lossless for 16-bit float input (#2093)
- - Fix bug in palette (#2120)
- - Security: Fix OOB read in exif.h (#2101 - [CVE-2023-0645](https://www.cve.org/cverecord?id=CVE-2023-0645))
-
-## [0.8.0] - 2023-01-18
-
-### Added
- - decoder API: new function `JxlDecoderSetImageBitDepth` to set the bit depth
-   of the output buffer.
- - decoder API proposal: add `JxlDecoderSetOutputColorProfile` and
-   `JxlDecoderSetCms` to enable decoding to desired colorspace; NB: not
-   implemented yet.
- - encoder API: new function `JxlEncoderSetFrameBitDepth` to set the bit depth
-   of the input buffer.
- - encoder API: add an effort 10 option for lossless compression; using this
-   setting requires calling `JxlEncoderAllowExpertOptions`.
- - encoder API: new `JXL_ENC_FRAME_SETTING_JPEG_COMPRESS_BOXES` enum value to
-   allow explicit control of metadata compression
-
-### Removed
- - common API: removed `JxlIntrinsicSizeHeader`
- - decoder API: removed deprecated `JXL_DEC_NEED_DC_OUT_BUFFER` and
-   `JXL_DEC_DC_IMAGE` events, `JxlDecoderDCOutBufferSize` and
-   `JxlDecoderSetDCOutBuffer` functions
-
-### Changed / clarified
- - encoder API: `JxlEncoderProcessOutput` requires at least 32 bytes of output
-   space to proceed and guarantees that at least one byte will be written
-
-## [0.7] - 2022-07-21
-
-### Added
- - Export version information in headers.
- - decoder API: Ability to decode the content of metadata boxes:
-   `JXL_DEC_BOX`, `JXL_DEC_BOX_NEED_MORE_OUTPUT`, `JxlDecoderSetBoxBuffer`,
-   `JxlDecoderGetBoxType`, `JxlDecoderGetBoxSizeRaw` and
-   `JxlDecoderSetDecompressBoxes`.
- - decoder API: ability to mark the input is finished: `JxlDecoderCloseInput`.
- - decoder API: ability to request updates on different progressive events using
-   `JxlDecoderSetProgressiveDetail`; currently supported events are
-   `kDC`, `kLastPasses` and `kPasses`.
- - decoder API: ability to specify desired intensity target using
-   `JxlDecoderSetDesiredIntensityTarget`
- - decoder API: new function `JxlDecoderSetCoalesced` to allow decoding
-   non-coalesced (unblended) frames, e.g. layers of a composite still image
-   or the cropped frames of a recompressed GIF/APNG.
- - decoder API: new function `JxlDecoderSetUnpremultiplyAlpha` to set
-   preference for getting an associated alpha channel with premultiplied or
-   unpremultiplied colors.
- - decoder API: field added to `JxlFrameHeader`: a `JxlLayerInfo` struct
-   that contains crop dimensions and offsets and blending information for
-   the non-coalesced case.
- - decoder API: new function `JxlDecoderGetExtraChannelBlendInfo` to get
-   the blending information for extra channels in the non-coalesced case.
- - decoder API: new function `JxlDecoderSetMultithreadedImageOutCallback`,
-   allowing output callbacks to receive more information about the number of
-   threads on which they are running.
- - decoder API: new function `JxlDecoderSkipCurrentFrame` to skip processing
-   the current frame after a progressive detail is reached.
- - decoder API: new function `JxlDecoderGetIntendedDownsamplingRatio` to get
-   the intended downsampling ratio of progressive steps, based on the
-   information in the frame header.
- - decoder API: new function `JxlDecoderSetRenderSpotcolors` to allow disabling
-   rendering of spot colors.
- - decoder/encoder API: add two fields to `JXLBasicInfo`: `intrinsic_xsize`
-   and `intrinsic_ysize` to signal the intrinsic size.
- - encoder API: ability to add metadata boxes, added new functions
-   `JxlEncoderAddBox`, `JxlEncoderUseBoxes`, `JxlEncoderCloseBoxes` and
-   `JxlEncoderCloseFrames`.
- - encoder API: added ability to set several encoder options / extra fields to
-   frames using `JxlEncoderSetFrameName`, `JxlEncoderFrameSettingsSetOption`,
-   `JxlEncoderFrameSettingsSetFloatOption`.
- - encoder API: added ability to check required codestream compatibility level
-   and force specified using `JxlEncoderGetRequiredCodestreamLevel` and
-   `JxlEncoderSetCodestreamLevel`.
- - encoder API: added ability to force emitting box-based container format
-   using `JxlEncoderUseContainer`.
- - encoder API: added ability to store JPEG metadata for lossless reconstruction
-   using `JxlEncoderStoreJPEGMetadata`
- - encoder API: new functions `JxlEncoderSetFrameHeader` and
-   `JxlEncoderSetExtraChannelBlendInfo` to set animation
-   and blending parameters of the frame, and `JxlEncoderInitFrameHeader` and
-   `JxlEncoderInitBlendInfo` to initialize the structs to set.
- - encoder API: ability to encode arbitrary extra channels:
-  `JxlEncoderInitExtraChannelInfo`, `JxlEncoderSetExtraChannelInfo`,
-  `JxlEncoderSetExtraChannelName` and `JxlEncoderSetExtraChannelBuffer`.
- - encoder API: ability to plug custom CMS implementation using
-   `JxlEncoderSetCms(JxlEncoder* enc, JxlCmsInterface cms)`
- - encoder API: added `JxlEncoderGetError` to retrieve last encoder error.
-
-### Changed
-- decoder API: using `JxlDecoderCloseInput` at the end of all input is required
-  when using JXL_DEC_BOX, and is now also encouraged in other cases, but not
-  required in those other cases for backwards compatibility.
-- encoder API: `JxlEncoderCloseInput` now closes both frames and boxes input.
-- CLI: `cjxl` and `djxl` have been reimplemented on the base of public decoder
-  and encoder API; dropped dependency on `gflags` for argument parsing.
-
-### Deprecated
-- decoder API: `JXL_DEC_EXTENSIONS` event: use `JXL_DEC_BASIC_INFO`
-- decoder / encoder API: pixel types `JXL_TYPE_BOOLEAN` and `JXL_TYPE_UINT32`:
-  consider using `JXL_TYPE_UINT8` and `JXL_TYPE_FLOAT` correspondingly.
-- decoder API: pixel format parameter for `JxlDecoderGetColorAsEncodedProfile`
-  and `JxlDecoderGetICCProfileSize`: pass `NULL`.
-- decoder API: `JxlDecoderDefaultPixelFormat`
-- encoder API: `JxlEncoderOptions`: use `JxlEncoderFrameSettings` instead.
-- encoder API: `JxlEncoderOptionsCreate`: use `JxlEncoderFrameSettingsCreate`
-  instead.
-- encoder API: `JxlEncoderOptionsSetDistance`: use `JxlEncoderSetFrameDistance`
-  instead.
-- encoder API: `JxlEncoderOptionsSetLossless`: use `JxlEncoderSetFrameLossless`
-  instead.
-- encoder API: `JxlEncoderOptionsSetEffort`: use
-  `JxlEncoderFrameSettingsSetOption(frame_settings, JXL_ENC_FRAME_SETTING_EFFORT, effort)`
-  instead.
-- encoder API: `JxlEncoderOptionsSetDecodingSpeed`: use
-  `JxlEncoderFrameSettingsSetOption(frame_settings, JXL_ENC_FRAME_SETTING_DECODING_SPEED, tier)`
-  instead.
-- encoder API: deprecated `JXL_ENC_NOT_SUPPORTED`, the encoder returns
-  `JXL_ENC_ERROR` instead and there is no need to handle
-  `JXL_ENC_NOT_SUPPORTED`.
-
-## [0.6.1] - 2021-10-29
-### Changed
- - Security: Fix OOB read in splines rendering (#735 -
-   [CVE-2021-22563](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-22563))
- - Security: Fix OOB copy (read/write) in out-of-order/multi-threaded decoding
-   (#708 - [CVE-2021-22564](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-22564))
- - Fix segfault in `djxl` tool with `--allow_partial_files` flag (#781).
- - Fix border in extra channels when using upsampling (#796)
-
-## [0.6] - 2021-10-04
-### Added
- - API: New functions to decode extra channels:
-   `JxlDecoderExtraChannelBufferSize` and `JxlDecoderSetExtraChannelBuffer`.
- - API: New function `JxlEncoderInitBasicInfo` to initialize `JxlBasicInfo`
-   (only needed when encoding). NOTE: it is now required to call this function
-   when using the encoder. Padding was added to the struct for forward
-   compatibility.
- - API: Support for encoding oriented images.
- - API: FLOAT16 support in the encoder API.
- - Rewrite of the GDK pixbuf loader plugin. Added proper color management and
-   animation support.
- - Rewrite of GIMP plugin. Added compression parameters dialog and switched to
-   using the public C API.
- - Debian packages for GDK pixbuf loader (`libjxl-gdk-pixbuf`) and GIMP
-   (`libjxl-gimp-plugin`) plugins.
- - `cjxl`/`djxl` support for `stdin` and `stdout`.
-
-### Changed
- - API: Renamed the field `alpha_associated` in `JxlExtraChannelInfo` to
-   `alpha_premultiplied`, to match the corresponding name in `JxlBasicInfo`.
- - Improved the 2x2 downscaling method in the encoder for the optional color
-   channel resampling for low bit rates.
- - Fixed: the combination of floating point original data, XYB color encoding,
-   and Modular mode was broken (in both encoder and decoder). It now works.
-   NOTE: this can cause the current encoder to write jxl bitstreams that do
-   not decode with the old decoder. In particular this will happen when using
-   cjxl with PFM, EXR, or floating point PSD input, and a combination of XYB
-   and modular mode is used (which caused an encoder error before), e.g.
-   using options like `-m -q 80` (lossy modular), `-d 4.5` or `--progressive_dc=1`
-   (modular DC frame), or default lossy encoding on an image where patches
-   end up being used. There is no problem when using cjxl with PNG, JPEG, GIF,
-   APNG, PPM, PGM, PGX, or integer (8-bit or 16-bit) PSD input.
- - `libjxl` static library now bundles skcms, fixing static linking in
-   downstream projects when skcms is used.
- - Spline rendering performance improvements.
- - Butteraugli changes for less visual masking.
-
-## [0.5] - 2021-08-02
-### Added
- - API: New function to decode the image using a callback outputting a part of a
-   row per call.
- - API: 16-bit float output support.
- - API: `JxlDecoderRewind` and `JxlDecoderSkipFrames` functions to skip more
-   efficiently to earlier animation frames.
- - API: `JxlDecoderSetPreferredColorProfile` function to choose color profile in
-   certain circumstances.
- - encoder: Adding `center_x` and `center_y` flags for more control of the tile
-   order.
- - New encoder speeds `lightning` (1) and `thunder` (2).
-
-### Changed
- - Re-licensed the project under a BSD 3-Clause license. See the
-   [LICENSE](LICENSE) and [PATENTS](PATENTS) files for details.
- - Full JPEG XL part 1 specification support: Implemented all the spec required
-   to decode files to pixels, including cases that are not used by the encoder
-   yet. Part 2 of the spec (container format) is final but not fully implemented
-   here.
- - Butteraugli metric improvements. Exact numbers are different from previous
-   versions.
- - Memory reductions during decoding.
- - Reduce the size of the jxl_dec library by removing dependencies.
- - A few encoding speedups.
- - Clarify the security policy.
- - Significant encoding improvements (~5 %) and less ringing.
- - Butteraugli metric to have some less masking.
- - `cjxl` flag `--speed` is deprecated and replaced by the `--effort` synonym.
-
-### Removed
-- API for returning a downsampled DC was deprecated
-  (`JxlDecoderDCOutBufferSize` and `JxlDecoderSetDCOutBuffer`) and will be
-  removed in the next release.
-
-## [0.3.7] - 2021-03-29
-### Changed
- - Fix a rounding issue in 8-bit decoding.
-
-## [0.3.6] - 2021-03-25
-### Changed
- - Fix a bug that could result in the generation of invalid codestreams as
-   well as failure to decode valid streams.
-
-## [0.3.5] - 2021-03-23
-### Added
- - New encode-time options for faster decoding at the cost of quality.
- - Man pages for cjxl and djxl.
-
-### Changed
- - Memory usage improvements.
- - Faster decoding to 8-bit output with the C API.
- - GIMP plugin: avoid the sRGB conversion dialog for sRGB images, do not show
-   a console window on Windows.
- - Various bug fixes.
-
-## [0.3.4] - 2021-03-16
-### Changed
- - Improved box parsing.
- - Improved metadata handling.
- - Performance and memory usage improvements.
-
-## [0.3.3] - 2021-03-05
-### Changed
- - Performance improvements for small images.
- - Add a (flag-protected) non-high-precision mode with better speed.
- - Significantly speed up the PQ EOTF.
- - Allow optional HDR tone mapping in djxl (--tone_map, --display_nits).
- - Change the behavior of djxl -j to make it consistent with cjxl (#153).
- - Improve image quality.
- - Improve EXIF handling.
-
-## [0.3.2] - 2021-02-12
-### Changed
- - Fix embedded ICC encoding regression
-   [#149](https://gitlab.com/wg1/jpeg-xl/-/issues/149).
-
-## [0.3.1] - 2021-02-10
-### Changed
- - New experimental Butteraugli API (`jxl/butteraugli.h`).
- - Encoder improvements to low quality settings.
- - Bug fixes, including fuzzer-found potential security bug fixes.
- - Fixed `-q 100` and `-d 0` not triggering lossless modes.
-
-## [0.3] - 2021-01-29
-### Changed
- - Minor change to the Decoder C API to accommodate future work for other ways
-   to provide input.
- - Future decoder C API changes will be backwards compatible.
- - Lots of bug fixes since the previous version.
-
-## [0.2] - 2020-12-24
-### Added
- - JPEG XL bitstream format is frozen. Files encoded with 0.2 will be supported
-   by future versions.
-
-### Changed
- - Files encoded with previous versions are not supported.
-
-## [0.1.1] - 2020-12-01
-
-## [0.1] - 2020-11-14
-### Added
- - Initial release of an encoder (`cjxl`) and decoder (`djxl`) that work
-   together as well as a benchmark tool for comparison with other codecs
-   (`benchmark_xl`).
- - Note: JPEG XL format is in the final stages of standardization, minor changes
-   to the codestream format are still possible but we are not expecting any
-   changes beyond what is required by bug fixing.
- - API: new decoder API in C, check the `examples/` directory for its example
-   usage. The C API is a work in progress and likely to change both in API and
-   ABI in future releases.
diff --git a/third_party/jpeg-xl/CMakeLists.txt b/third_party/jpeg-xl/CMakeLists.txt
deleted file mode 100644
index 2e5a1650e9242..0000000000000
--- a/third_party/jpeg-xl/CMakeLists.txt
+++ /dev/null
@@ -1,547 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# Ubuntu focal ships with cmake 3.16.
-cmake_minimum_required(VERSION 3.16...3.27)
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-project(LIBJXL LANGUAGES C CXX)
-
-# TODO(sboukortt): remove once oss-fuzz passes -DBUILD_SHARED_LIBS=OFF
-if(JPEGXL_ENABLE_FUZZERS)
-  message(STATUS "Fuzzer build detected, building static libs")
-  set(BUILD_SHARED_LIBS OFF)
-endif()
-
-message(STATUS "CMAKE_SYSTEM_PROCESSOR is ${CMAKE_SYSTEM_PROCESSOR}")
-include(CheckCXXCompilerFlag)
-check_cxx_compiler_flag("-fsanitize=fuzzer-no-link" CXX_FUZZERS_SUPPORTED)
-check_cxx_compiler_flag("-fmacro-prefix-map=OLD=NEW" CXX_MACRO_PREFIX_MAP)
-check_cxx_compiler_flag("-fno-rtti" CXX_NO_RTTI_SUPPORTED)
-
-# Add "DebugOpt" CMake build type. Unlike builtin DEBUG it is optimized.
-string(REGEX REPLACE "-DNDEBUG " "" CMAKE_CXX_FLAGS_DEBUGOPT "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DDEBUG" )
-string(REGEX REPLACE "-DNDEBUG " "" CMAKE_C_FLAGS_DEBUGOPT "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DDEBUG" )
-
-# Enabled PIE binaries by default if supported.
-include(CheckPIESupported OPTIONAL RESULT_VARIABLE CHECK_PIE_SUPPORTED)
-if(CHECK_PIE_SUPPORTED)
-  check_pie_supported(LANGUAGES CXX)
-  if(CMAKE_CXX_LINK_PIE_SUPPORTED)
-    set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
-  endif()
-endif()
-
-if(PROVISION_DEPENDENCIES)
-  # Run script to provision dependencies.
-  find_program (BASH_PROGRAM bash)
-  if(BASH_PROGRAM)
-    execute_process(
-      COMMAND ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/deps.sh
-      RESULT_VARIABLE PROVISION_DEPENDENCIES_RESULT)
-  endif()
-  if(NOT PROVISION_DEPENDENCIES_RESULT EQUAL "0")
-    message(FATAL_ERROR "${CMAKE_CURRENT_SOURCE_DIR}/deps.sh failed with ${PROVISION_DEPENDENCIES_RESULT}")
-  endif()
-endif()
-
-### Project build options:
-if(CXX_FUZZERS_SUPPORTED)
-  # Enabled by default except on arm64, Windows and Apple builds.
-  set(ENABLE_FUZZERS_DEFAULT true)
-endif()
-find_package(PkgConfig)
-if(NOT APPLE AND NOT WIN32 AND NOT HAIKU AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
-  pkg_check_modules(TCMallocMinimalVersionCheck QUIET IMPORTED_TARGET
-      libtcmalloc_minimal)
-  if(TCMallocMinimalVersionCheck_FOUND AND
-     NOT TCMallocMinimalVersionCheck_VERSION VERSION_EQUAL 2.8.0)
-    # Enabled by default except on Windows and Apple builds for
-    # tcmalloc != 2.8.0. tcmalloc 2.8.1 already has a fix for this issue.
-    set(ENABLE_TCMALLOC_DEFAULT true)
-  else()
-    message(STATUS
-        "tcmalloc version ${TCMallocMinimalVersionCheck_VERSION} -- "
-        "tcmalloc 2.8.0 disabled due to "
-        "https://github.com/gperftools/gperftools/issues/1204")
-  endif()
-endif()
-
-check_cxx_source_compiles(
-   "int main() {
-      #if !defined(HWY_DISABLED_TARGETS)
-      static_assert(false, \"HWY_DISABLED_TARGETS is not defined\");
-      #endif
-      return 0;
-    }"
-  JXL_HWY_DISABLED_TARGETS_FORCED
-)
-
-if((SANITIZER STREQUAL "msan") OR EMSCRIPTEN)
-  set(BUNDLE_LIBPNG_DEFAULT YES)
-else()
-  set(BUNDLE_LIBPNG_DEFAULT NO)
-endif()
-
-
-if(EXISTS "${PROJECT_SOURCE_DIR}/third_party/libjpeg-turbo/jconfig.h.in")
-  set(ENABLE_JPEGLI_DEFAULT YES)
-else()
-  set(ENABLE_JPEGLI_DEFAULT NO)
-  message(STATUS "libjpeg-turbo submodule is absent; not enabling jpegli")
-endif()
-
-include(TestBigEndian)
-test_big_endian(ARCH_IS_BIG_ENDIAN)
-if(ARCH_IS_BIG_ENDIAN)
-  set(ENABLE_SKCMS_DEFAULT NO)
-  message(STATUS "Big-endian architecture detected; defaulting to lcms2 instead of skcms")
-else()
-  set(ENABLE_SKCMS_DEFAULT YES)
-endif()
-
-# Standard cmake naming for building shared libraries.
-get_property(SHARED_LIBS_SUPPORTED GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS)
-option(BUILD_SHARED_LIBS "Build shared libraries instead of static ones" ${SHARED_LIBS_SUPPORTED})
-
-set(JPEGXL_ENABLE_FUZZERS ${ENABLE_FUZZERS_DEFAULT} CACHE BOOL
-    "Build JPEGXL fuzzer targets.")
-set(JPEGXL_ENABLE_DEVTOOLS false CACHE BOOL
-    "Build JPEGXL developer tools.")
-set(JPEGXL_ENABLE_TOOLS true CACHE BOOL
-    "Build JPEGXL user tools: cjxl and djxl.")
-set(JPEGXL_ENABLE_JPEGLI ${ENABLE_JPEGLI_DEFAULT} CACHE BOOL
-    "Build jpegli library.")
-set(JPEGXL_ENABLE_JPEGLI_LIBJPEG true CACHE BOOL
-    "Build libjpeg.so shared library based on jpegli.")
-set(JPEGXL_INSTALL_JPEGLI_LIBJPEG false CACHE BOOL
-    "Install jpegli version of libjpeg.so system-wide.")
-set(JPEGLI_LIBJPEG_LIBRARY_VERSION "62.3.0" CACHE STRING
-    "Library version of the libjpeg.so shared library that we build.")
-set(JPEGLI_LIBJPEG_LIBRARY_SOVERSION "62" CACHE STRING
-    "Library so-version of the libjpeg.so shared library that we build.")
-set(JPEGXL_ENABLE_DOXYGEN true CACHE BOOL
-    "Generate C API documentation using Doxygen.")
-set(JPEGXL_ENABLE_MANPAGES true CACHE BOOL
-    "Build and install man pages for the command-line tools.")
-set(JPEGXL_ENABLE_BENCHMARK true CACHE BOOL
-    "Build JPEGXL benchmark tools.")
-set(JPEGXL_ENABLE_EXAMPLES true CACHE BOOL
-    "Build JPEGXL library usage examples.")
-set(JPEGXL_BUNDLE_LIBPNG ${BUNDLE_LIBPNG_DEFAULT} CACHE BOOL
-    "Build libpng from source and link it statically.")
-set(JPEGXL_ENABLE_JNI true CACHE BOOL
-    "Build JPEGXL JNI Java wrapper, if Java dependencies are installed.")
-set(JPEGXL_ENABLE_SJPEG true CACHE BOOL
-    "Build JPEGXL with support for encoding with sjpeg.")
-set(JPEGXL_ENABLE_OPENEXR true CACHE BOOL
-    "Build JPEGXL with support for OpenEXR if available.")
-set(JPEGXL_ENABLE_SKCMS ${ENABLE_SKCMS_DEFAULT} CACHE BOOL
-    "Build with skcms instead of lcms2.")
-set(JPEGXL_ENABLE_VIEWERS false CACHE BOOL
-    "Build JPEGXL viewer tools for evaluation.")
-set(JPEGXL_ENABLE_TCMALLOC ${ENABLE_TCMALLOC_DEFAULT} CACHE BOOL
-    "Build JPEGXL using gperftools (tcmalloc) allocator.")
-set(JPEGXL_ENABLE_PLUGINS false CACHE BOOL
-    "Build third-party plugins to support JPEG XL in other applications.")
-set(JPEGXL_ENABLE_COVERAGE false CACHE BOOL
-    "Enable code coverage tracking for libjxl. This also enables debug and disables optimizations.")
-set(JPEGXL_ENABLE_SIZELESS_VECTORS false CACHE BOOL
-    "Builds in support for SVE/RVV vectorization")
-set(JPEGXL_ENABLE_TRANSCODE_JPEG true CACHE BOOL
-    "Builds in support for decoding transcoded JXL files back to JPEG,\
- disabling it makes the decoder reject JXL_DEC_JPEG_RECONSTRUCTION events,\
- (default enabled)")
-set(JPEGXL_ENABLE_BOXES true CACHE BOOL
-    "Builds in support for decoding boxes in JXL files,\
- disabling it makes the decoder reject JXL_DEC_BOX events,\
- (default enabled)")
-set(JPEGXL_STATIC false CACHE BOOL
-    "Build tools as static binaries.")
-set(JPEGXL_WARNINGS_AS_ERRORS false CACHE BOOL
-    "Treat warnings as errors during compilation.")
-set(JPEGXL_DEP_LICENSE_DIR "" CACHE STRING
-    "Directory where to search for system dependencies \"copyright\" files.")
-set(JPEGXL_FORCE_NEON false CACHE BOOL
-    "Set flags to enable NEON in arm if not enabled by your toolchain.")
-set(JPEGXL_TEST_TOOLS false CACHE BOOL
-    "Run scripts that test the encoding / decoding tools.")
-set(JPEGXL_ENABLE_AVX512 false CACHE BOOL
-    "Build with AVX512 support (faster on CPUs that support it, but larger binary size).")
-set(JPEGXL_ENABLE_AVX512_SPR false CACHE BOOL
-    "Build with AVX-512FP16 support (faster on CPUs that support it, but larger binary size).")
-set(JPEGXL_ENABLE_AVX512_ZEN4 false CACHE BOOL
-"Build with Zen4-optimized AVX512 support (faster on CPUs that support it, but larger binary size).")
-set(JPEGXL_ENABLE_WASM_THREADS true CACHE BOOL
-    "Builds WASM modules with threads support")
-
-# Force system dependencies.
-set(JPEGXL_FORCE_SYSTEM_BROTLI false CACHE BOOL
-    "Force using system installed brotli instead of third_party/brotli source.")
-set(JPEGXL_FORCE_SYSTEM_GTEST false CACHE BOOL
-    "Force using system installed googletest (gtest) instead of third_party/googletest source.")
-set(JPEGXL_FORCE_SYSTEM_LCMS2 false CACHE BOOL
-    "Force using system installed lcms2 instead of third_party/lcms source.")
-set(JPEGXL_FORCE_SYSTEM_HWY false CACHE BOOL
-    "Force using system installed highway (libhwy-dev) instead of third_party/highway source.")
-
-# Check minimum compiler versions. Older compilers are not supported and fail
-# with hard to understand errors.
-if (NOT CMAKE_C_COMPILER_ID STREQUAL CMAKE_CXX_COMPILER_ID)
-  message(FATAL_ERROR "Different C/C++ compilers set: "
-          "${CMAKE_C_COMPILER_ID} vs ${CMAKE_CXX_COMPILER_ID}")
-endif()
-
-message(STATUS
-    "Compiled IDs C:${CMAKE_C_COMPILER_ID}, C++:${CMAKE_CXX_COMPILER_ID}")
-
-set(JXL_HWY_INCLUDE_DIRS "$<BUILD_INTERFACE:$<TARGET_PROPERTY:$<IF:$<TARGET_EXISTS:hwy::hwy>,hwy::hwy,hwy>,INTERFACE_INCLUDE_DIRECTORIES>>")
-# Always disable SSSE3 since it is rare to have SSSE3 but not SSE4
-set(HWY_DISABLED_TARGETS "HWY_SSSE3")
-if (NOT JPEGXL_ENABLE_AVX512)
-  message(STATUS "Disabled AVX512 (set JPEGXL_ENABLE_AVX512 to enable it)")
-  set(HWY_DISABLED_TARGETS "${HWY_DISABLED_TARGETS}|HWY_AVX3")
-  add_definitions(-DFJXL_ENABLE_AVX512=0)
-endif()
-if (NOT JPEGXL_ENABLE_AVX512_SPR)
-  message(STATUS "Disabled AVX512_SPR (set JPEGXL_ENABLE_AVX512_SPR to enable it)")
-  set(HWY_DISABLED_TARGETS "${HWY_DISABLED_TARGETS}|HWY_AVX3_SPR")
-endif()
-if (NOT JPEGXL_ENABLE_AVX512_ZEN4)
-  message(STATUS "Disabled AVX512_ZEN4 (set JPEGXL_ENABLE_AVX512_ZEN4 to enable it)")
-  set(HWY_DISABLED_TARGETS "${HWY_DISABLED_TARGETS}|HWY_AVX3_ZEN4")
-endif()
-
-
-
-# CMAKE_EXPORT_COMPILE_COMMANDS is used to generate the compilation database
-# used by clang-tidy.
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
-if(JPEGXL_STATIC)
-  set(BUILD_SHARED_LIBS 0)
-
-  # https://learn.microsoft.com/en-us/cpp/build/reference/md-mt-ld-use-run-time-library?view=msvc-170
-  # https://cmake.org/cmake/help/latest/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html
-  set(CMAKE_MSVC_RUNTIME_LIBRARY "$<$<NOT:$<CONFIG:Debug>>:MultiThreaded>" CACHE STRING "")
-
-  # Clang developers say that in case to use "static" we have to build stdlib
-  # ourselves; for real use case we don't care about stdlib, as it is "granted",
-  # so just linking all other libraries is fine.
-  if (NOT MSVC)
-    string(APPEND CMAKE_EXE_LINKER_FLAGS " -static")
-  endif()
-  if ((NOT WIN32 AND NOT APPLE) OR CYGWIN OR MINGW)
-    set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
-    string(APPEND CMAKE_EXE_LINKER_FLAGS " -static-libgcc -static-libstdc++")
-  endif()
-endif()  # JPEGXL_STATIC
-
-# Threads
-set(THREADS_PREFER_PTHREAD_FLAG YES)
-find_package(Threads REQUIRED)
-
-# These settings are important to drive check_cxx_source_compiles
-# See CMP0067 (min cmake version is 3.10 anyway)
-
-if ("cxx_std_17" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
-  set(CMAKE_CXX_STANDARD 17)
-else()
-  if ("cxx_std_14" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
-    set(CMAKE_CXX_STANDARD 14)
-  else()
-    set(CMAKE_CXX_STANDARD 11)
-  endif()
-endif()
-set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_STANDARD_REQUIRED YES)
-
-# Atomics
-find_package(Atomics REQUIRED)
-
-if(JPEGXL_STATIC)
-  if (MINGW)
-    # In MINGW libstdc++ uses pthreads directly. When building statically a
-    # program (regardless of whether the source code uses pthread or not) the
-    # toolchain will add stdc++ and pthread to the linking step but stdc++ will
-    # be linked statically while pthread will be linked dynamically.
-    # To avoid this and have pthread statically linked with need to pass it in
-    # the command line with "-Wl,-Bstatic -lpthread -Wl,-Bdynamic" but the
-    # linker will discard it if not used by anything else up to that point in
-    # the linker command line. If the program or any dependency don't use
-    # pthread directly -lpthread is discarded and libstdc++ (added by the
-    # toolchain later) will then use the dynamic version. For this we also need
-    # to pass -lstdc++ explicitly before -lpthread. For pure C programs -lstdc++
-    # will be discarded anyway.
-    # This adds these flags as dependencies for *all* targets. Adding this to
-    # CMAKE_EXE_LINKER_FLAGS instead would cause them to be included before any
-    # object files and therefore discarded. This should be set in the
-    # INTERFACE_LINK_LIBRARIES of Threads::Threads but some third_part targets
-    # don't depend on it.
-    link_libraries(-Wl,-Bstatic -lstdc++ -lpthread -Wl,-Bdynamic)
-  elseif(CMAKE_USE_PTHREADS_INIT)
-    # "whole-archive" is not supported on OSX.
-    if (NOT APPLE)
-      # Set pthreads as a whole-archive, otherwise weak symbols in the static
-      # libraries will discard pthreads symbols leading to segmentation fault at
-      # runtime.
-      message(STATUS "Using -lpthread as --whole-archive")
-      set_target_properties(Threads::Threads PROPERTIES
-        INTERFACE_LINK_LIBRARIES
-            "-Wl,--whole-archive;-lpthread;-Wl,--no-whole-archive")
-    endif()
-  endif()
-endif()  # JPEGXL_STATIC
-
-if (EMSCRIPTEN AND JPEGXL_ENABLE_WASM_THREADS)
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
-endif()
-
-if (CXX_MACRO_PREFIX_MAP)
-  add_compile_options(-fmacro-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=.)
-endif()
-
-if (CXX_NO_RTTI_SUPPORTED)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
-endif()
-
-# Internal flags for coverage builds:
-set(JPEGXL_COVERAGE_FLAGS)
-set(JPEGXL_COVERAGE_LINK_FLAGS)
-
-if (MSVC)
-  # TODO(janwas): add flags
-  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-else ()
-  # Global compiler flags for all targets here and in subdirectories.
-  add_definitions(
-    # Avoid changing the binary based on the current time and date.
-    -D__DATE__="redacted"
-    -D__TIMESTAMP__="redacted"
-    -D__TIME__="redacted"
-  )
-
-  # TODO(eustas): JXL currently compiles, but does not pass tests...
-  if (NOT JXL_HWY_DISABLED_TARGETS_FORCED)
-    if (NOT JPEGXL_ENABLE_SIZELESS_VECTORS)
-      set(HWY_DISABLED_TARGETS "${HWY_DISABLED_TARGETS}|HWY_SVE|HWY_SVE2|HWY_SVE_256|HWY_SVE2_128|HWY_RVV")
-    endif()
-    add_compile_options($<$<NOT:$<COMPILE_LANGUAGE:RC>>:-DHWY_DISABLED_TARGETS=\(${HWY_DISABLED_TARGETS}\)>)
-  endif()
-
-  # Machine flags.
-  add_compile_options(-funwind-tables)
-  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    add_compile_options("SHELL:-Xclang -mrelax-all")
-  endif()
-  if (CXX_CONSTRUCTOR_ALIASES_SUPPORTED)
-    add_compile_options("SHELL:-Xclang -mconstructor-aliases")
-  endif()
-
-  if(WIN32)
-    # Not supported by clang-cl, but frame pointers are default on Windows
-  else()
-    add_compile_options(-fno-omit-frame-pointer)
-  endif()
-
-  # CPU flags - remove once we have NEON dynamic dispatch
-
-  # TODO(janwas): this also matches M1, but only ARMv7 is intended/needed.
-  if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
-    if(JPEGXL_FORCE_NEON)
-      # GCC requires these flags, otherwise __ARM_NEON is undefined.
-      add_compile_options(-mfpu=neon-vfpv4 -mfloat-abi=hard)
-    endif()
-  endif()
-
-  add_compile_options(
-    # Ignore this to allow redefining __DATE__ and others.
-    -Wno-builtin-macro-redefined
-
-    # Global warning settings.
-    -Wall
-  )
-
-  if (JPEGXL_WARNINGS_AS_ERRORS)
-    add_compile_options(-Werror)
-  endif ()
-
-  if(JPEGXL_ENABLE_COVERAGE)
-    set(JPEGXL_COVERAGE_FLAGS
-        -g -O0 -fprofile-arcs -ftest-coverage
-    )
-    set(JPEGXL_COVERAGE_LINK_FLAGS
-        --coverage
-    )
-  endif()  # JPEGXL_ENABLE_COVERAGE
-endif ()  # !MSVC
-
-include(GNUInstallDirs)
-
-# Separately build/configure testing frameworks and other third_party libraries
-# to allow disabling tests in those libraries.
-include(third_party/testing.cmake)
-add_subdirectory(third_party)
-# Copy the JXL license file to the output build directory.
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/LICENSE"
-               ${PROJECT_BINARY_DIR}/LICENSE.jpeg-xl COPYONLY)
-
-# Enable tests regardless of where they are defined.
-enable_testing()
-include(CTest)
-# Specify default location of `testdata`:
-if(NOT DEFINED JPEGXL_TEST_DATA_PATH)
-  set(JPEGXL_TEST_DATA_PATH "${PROJECT_SOURCE_DIR}/testdata")
-endif()
-
-# Libraries.
-add_subdirectory(lib)
-
-if(BUILD_TESTING)
-  # Script to run tests over the source code in bash.
-  find_program (BASH_PROGRAM bash)
-  if(BASH_PROGRAM)
-    add_test(
-      NAME bash_test
-      COMMAND ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/bash_test.sh)
-  endif()
-endif() # BUILD_TESTING
-
-# Documentation generated by Doxygen
-if(JPEGXL_ENABLE_DOXYGEN)
-  find_package(Doxygen)
-  if(DOXYGEN_FOUND)
-    set(DOXYGEN_GENERATE_HTML "YES")
-    set(DOXYGEN_GENERATE_XML "YES")
-    set(DOXYGEN_STRIP_FROM_PATH "${CMAKE_CURRENT_SOURCE_DIR}/lib/include")
-    if(JPEGXL_WARNINGS_AS_ERRORS)
-      set(DOXYGEN_WARN_AS_ERROR "YES")
-    endif()
-    set(DOXYGEN_QUIET "YES")
-    doxygen_add_docs(doc
-      "${CMAKE_CURRENT_SOURCE_DIR}/lib/include"
-      "${CMAKE_CURRENT_SOURCE_DIR}/doc/api.txt"
-      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-      COMMENT "Generating C API documentation")
-
-    # Add sphinx doc build step for readthedocs.io (requires doxygen too).
-    find_program(SPHINX_BUILD_PROGRAM sphinx-build)
-    if(SPHINX_BUILD_PROGRAM)
-      add_custom_command(
-        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/rtd/nonexistent"
-        COMMENT "Generating readthedocs.io output on ${CMAKE_CURRENT_BINARY_DIR}/rtd"
-        COMMAND ${SPHINX_BUILD_PROGRAM} -q -W -b html -j auto
-          ${CMAKE_SOURCE_DIR}/doc/sphinx
-          ${CMAKE_CURRENT_BINARY_DIR}/rtd
-        DEPENDS doc
-      )
-      # This command runs the documentation generation every time since the output
-      # target file doesn't exist.
-      add_custom_target(rtd-html
-        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/rtd/nonexistent
-      )
-    else() # SPHINX_BUILD_PROGRAM\
-      message(WARNING "sphinx-build not found, skipping rtd documentation")
-    endif() # SPHINX_BUILD_PROGRAM
-
-  else()
-    # Create a "doc" target for compatibility since "doc" is not otherwise added to
-    # the build when doxygen is not installed.
-    add_custom_target(doc false
-      COMMENT "Error: Can't generate doc since Doxygen not installed.")
-  endif() # DOXYGEN_FOUND
-endif() # JPEGXL_ENABLE_DOXYGEN
-
-if(JPEGXL_ENABLE_MANPAGES)
-  find_program(ASCIIDOC a2x)
-  if(ASCIIDOC)
-    file(STRINGS "${ASCIIDOC}" ASCIIDOC_SHEBANG LIMIT_COUNT 1)
-    if(ASCIIDOC_SHEBANG MATCHES "sh$" OR ASCIIDOC_SHEBANG MATCHES "libexec/bin/python$" OR MINGW)
-      set(ASCIIDOC_PY_FOUND ON)
-      # Run the program directly and set ASCIIDOC as empty.
-      set(ASCIIDOC_PY "${ASCIIDOC}")
-      set(ASCIIDOC "")
-    elseif(ASCIIDOC_SHEBANG MATCHES "python2")
-      find_package(Python2 COMPONENTS Interpreter)
-      set(ASCIIDOC_PY_FOUND "${Python2_Interpreter_FOUND}")
-      set(ASCIIDOC_PY Python2::Interpreter)
-    elseif(ASCIIDOC_SHEBANG MATCHES "python3")
-      find_package(Python3 COMPONENTS Interpreter)
-      set(ASCIIDOC_PY_FOUND "${Python3_Interpreter_FOUND}")
-      set(ASCIIDOC_PY Python3::Interpreter)
-    else()
-      find_package(Python COMPONENTS Interpreter QUIET)
-      if(NOT Python_Interpreter_FOUND)
-        find_program(ASCIIDOC_PY python)
-        if(ASCIIDOC_PY)
-          set(ASCIIDOC_PY_FOUND ON)
-        endif()
-      else()
-        set(ASCIIDOC_PY_FOUND "${Python_Interpreter_FOUND}")
-        set(ASCIIDOC_PY Python::Interpreter)
-      endif()
-    endif()
-
-    if (ASCIIDOC_PY_FOUND)
-      set(MANPAGE_FILES "")
-      set(MANPAGES "")
-      foreach(PAGE IN ITEMS cjxl djxl)
-        # Invoking the Python interpreter ourselves instead of running the a2x binary
-        # directly is necessary on MSYS2, otherwise it is run through cmd.exe which
-        # does not recognize it.
-        add_custom_command(
-          OUTPUT "${PAGE}.1"
-          COMMAND "${ASCIIDOC_PY}"
-          ARGS ${ASCIIDOC}
-            --format manpage --destination-dir="${CMAKE_CURRENT_BINARY_DIR}"
-            "${CMAKE_CURRENT_SOURCE_DIR}/doc/man/${PAGE}.txt"
-          MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/doc/man/${PAGE}.txt")
-        list(APPEND MANPAGE_FILES "${CMAKE_CURRENT_BINARY_DIR}/${PAGE}.1")
-        list(APPEND MANPAGES "${PAGE}.1")
-      endforeach()
-      add_custom_target(manpages ALL DEPENDS ${MANPAGES})
-      install(FILES ${MANPAGE_FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
-    endif()  # ASCIIDOC_PY_FOUND
-  else()
-    message(WARNING "asciidoc was not found, the man pages will not be installed.")
-  endif()  # ASCIIDOC
-endif()  # JPEGXL_ENABLE_MANPAGES
-
-# Example usage code.
-if (JPEGXL_ENABLE_EXAMPLES)
-  include(examples/examples.cmake)
-endif ()
-
-# Plugins for third-party software
-if (JPEGXL_ENABLE_PLUGINS)
-  add_subdirectory(plugins)
-endif ()
-
-# Binary tools
-add_subdirectory(tools)
-
-
-macro(list_test_targets out dir)
-  get_property(dir_targets DIRECTORY ${dir} PROPERTY BUILDSYSTEM_TARGETS)
-  foreach(target ${dir_targets})
-    if (target MATCHES ".*_test")
-      list(APPEND ${out} ${target})
-    endif()
-  endforeach()
-  get_property(subdirectories DIRECTORY ${dir} PROPERTY SUBDIRECTORIES)
-  foreach(subdir ${subdirectories})
-    list_test_targets(${out} ${subdir})
-  endforeach()
-endmacro()
-
-set(all_tests_list)
-list_test_targets(all_tests_list ${CMAKE_CURRENT_SOURCE_DIR})
-
-if(all_tests_list)
-  add_custom_target(all_tests)
-  add_dependencies(all_tests ${all_tests_list})
-endif()
diff --git a/third_party/jpeg-xl/CODE_OF_CONDUCT.md b/third_party/jpeg-xl/CODE_OF_CONDUCT.md
deleted file mode 100644
index b2d81a32142de..0000000000000
--- a/third_party/jpeg-xl/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,93 +0,0 @@
-# Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of
-experience, education, socio-economic status, nationality, personal appearance,
-race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-*   Using welcoming and inclusive language
-*   Being respectful of differing viewpoints and experiences
-*   Gracefully accepting constructive criticism
-*   Focusing on what is best for the community
-*   Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-*   The use of sexualized language or imagery and unwelcome sexual attention or
-    advances
-*   Trolling, insulting/derogatory comments, and personal or political attacks
-*   Public or private harassment
-*   Publishing others' private information, such as a physical or electronic
-    address, without explicit permission
-*   Other conduct which could reasonably be considered inappropriate in a
-    professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, or to ban temporarily or permanently any
-contributor for other behaviors that they deem inappropriate, threatening,
-offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-This Code of Conduct also applies outside the project spaces when the Project
-Steward has a reasonable belief that an individual's behavior may have a
-negative impact on the project or its community.
-
-## Conflict Resolution
-
-We do not believe that all conflict is bad; healthy debate and disagreement
-often yield positive results. However, it is never okay to be disrespectful or
-to engage in behavior that violates the project’s code of conduct.
-
-If you see someone violating the code of conduct, you are encouraged to address
-the behavior directly with those involved. Many issues can be resolved quickly
-and easily, and this gives people more control over the outcome of their
-dispute. If you are unable to resolve the matter for any reason, or if the
-behavior is threatening or harassing, report it. We are dedicated to providing
-an environment where participants feel welcome and safe.
-
-Reports should be directed to Jyrki Alakuijala <jyrki@google.com>, the
-Project Steward(s) for JPEG XL. It is the Project Steward’s duty to
-receive and address reported violations of the code of conduct. They will then
-work with a committee consisting of representatives from the Open Source
-Programs Office and the Google Open Source Strategy team. If for any reason you
-are uncomfortable reaching out to the Project Steward, please email
-opensource@google.com.
-
-We will investigate every complaint, but you may not receive a direct response.
-We will use our discretion in determining when and how to follow up on reported
-incidents, which may range from not taking action to permanent expulsion from
-the project and project-sponsored spaces. We will notify the accused of the
-report and provide them an opportunity to discuss it before any action is taken.
-The identity of the reporter will be omitted from the details of the report
-supplied to the accused. In potentially harmful situations, such as ongoing
-harassment or threats to anyone's safety, we may take action without notice.
-
-## Attribution
-
-This Code of Conduct is adapted from the Contributor Covenant, version 1.4,
-available at
-https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
diff --git a/third_party/jpeg-xl/CONTRIBUTING.md b/third_party/jpeg-xl/CONTRIBUTING.md
deleted file mode 100644
index 1a255ba40b33b..0000000000000
--- a/third_party/jpeg-xl/CONTRIBUTING.md
+++ /dev/null
@@ -1,133 +0,0 @@
-# Contributing to libjxl
-
-## Contributing with bug reports
-
-For security-related issues please see [SECURITY.md](SECURITY.md).
-
-We welcome suggestions, feature requests and bug reports. Before opening a new
-issue please take a look if there is already an existing one in the following
-link:
-
- *  https://github.com/libjxl/libjxl/issues
-
-## Contributing with patches and Pull Requests
-
-We'd love to accept your contributions to the JPEG XL Project. Please read
-through this section before sending a Pull Request.
-
-### Contributor License Agreements
-
-Our project is open source under the terms outlined in the [LICENSE](LICENSE)
-and [PATENTS](PATENTS) files. Before we can accept your contributions, even for
-small changes, there are just a few small guidelines you need to follow:
-
-Please fill out either the individual or corporate Contributor License Agreement
-(CLA) with Google. JPEG XL Project is an an effort by multiple individuals and
-companies, including the initial contributors Cloudinary and Google, but Google
-is the legal entity in charge of receiving these CLA and relicensing this
-software:
-
-  * If you are an individual writing original source code and you're sure you
-  own the intellectual property, then you'll need to sign an [individual
-  CLA](https://code.google.com/legal/individual-cla-v1.0.html).
-
-  * If you work for a company that wants to allow you to contribute your work,
-  then you'll need to sign a [corporate
-  CLA](https://code.google.com/legal/corporate-cla-v1.0.html).
-
-Follow either of the two links above to access the appropriate CLA and
-instructions for how to sign and return it. Once we receive it, we'll be able
-to accept your pull requests.
-
-***NOTE***: Only original source code from you and other people that have signed
-the CLA can be accepted into the main repository.
-
-### License
-
-Contributions are licensed under the project's [LICENSE](LICENSE). Each new
-file must include the following header when possible, with comment style adapted
-to the language as needed:
-
-```
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-```
-
-### Code Reviews
-
-All submissions, including submissions by project members, require review. We
-use GitHub pull requests for this purpose. Consult
-[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
-information on using pull requests.
-
-### Contribution philosophy
-
-  * Prefer small changes, even if they don't implement a complete feature. Small
-  changes are easier to review and can be submitted faster. Think about what's
-  the smallest unit you can send that makes sense to review and submit in
-  isolation. For example, new modules that are not yet used by the tools but
-  have their own unittests are ok. If you have unrelated changes that
-  you discovered while working on something else, please send them in a
-  different Pull Request. If your are refactoring code and changing
-  functionality try to send the refactor first without any change in
-  functionality. Reviewers may ask you to split a Pull Request and it is
-  easier to create a smaller change from the beginning.
-
-  * Describe your commits. Add a meaningful description to your commit message,
-  explain what you are changing if it is not trivially obvious, but more
-  importantly explain *why* you are making those changes. For example "Fix
-  build" is not a good commit message, describe what build and if it makes sense
-  why is this fixing it or why was it failing without this. It is very likely
-  that people far in the future without any context you have right now will be
-  looking at your commit trying to figure out why was the change introduced. If
-  related to an issue in this or another repository include a link to it.
-
-  * Code Style: We follow the [Google C++ Coding
-  Style](https://google.github.io/styleguide/cppguide.html). A
-  [clang-format](https://clang.llvm.org/docs/ClangFormat.html) configuration
-  file is available to automatically format your code, you can invoke it with
-  the `./ci.sh lint` helper tool.
-
-  * Testing: Test your change and explain in the commit message *how* your
-  commit was tested. For example adding unittests or in some cases just testing
-  with the existing ones is enough. In any case, mention what testing was
-  performed so reviewers can evaluate whether that's enough testing. In many
-  cases, testing that the Continuous Integration workflow passes is enough.
-
-  * Make one commit per Pull Request / review, unless there's a good reason not
-  to. If you have multiple changes send multiple Pull Requests and each one can
-  have its own review.
-
-  * When addressing comments from reviewers prefer to squash or fixup your
-  edits and force-push your commit. When merging changes into the repository we
-  don't want to include the history of code review back and forth changes or
-  typos. Reviewers can click on the "force-pushed" automatic comment on a Pull
-  Request to see the changes between versions. We use "Rebase and merge" policy
-  to keep a linear git history which is easier to reason about.
-
-  * Your change must pass the build and test workflows. There's a `ci.sh` script
-  to help building and testing these configurations. See [building and
-  testing](doc/building_and_testing.md) for more details.
-
-### Contributing checklist.
-
-  * Sign the CLA (only needed once per user, see above).
-
-  * AUTHORS: You can add your name to the [AUTHORS](AUTHORS) file.
-
-  * Style guide. Check `./ci.sh lint`.
-
-  * Meaningful commit description: What and *why*, links to issues, testing
-  procedure.
-
-  * Squashed multiple edits into a single commit.
-
-  * Upload your changes to your fork and [create a Pull
-  Request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request).
-
-# Community Guidelines
-
-This project follows [Google's Open Source Community
-Guidelines](https://opensource.google.com/conduct/).
diff --git a/third_party/jpeg-xl/CONTRIBUTORS b/third_party/jpeg-xl/CONTRIBUTORS
deleted file mode 100644
index 848096f9219b7..0000000000000
--- a/third_party/jpeg-xl/CONTRIBUTORS
+++ /dev/null
@@ -1,23 +0,0 @@
-# This files lists individuals who made significant contributions to the JPEG XL
-# code base, such as design, adding features, performing experiments, ...
-# Small changes such as a small bugfix or fixing spelling errors are not
-# included. If you'd like to be included in this file thanks to a significant
-# contribution, feel free to send a pull request changing this file.
-Alex Deymo
-Alexander Rhatushnyak
-Evgenii Kliuchnikov
-Iulia-Maria Comșa
-Jan Wassenberg
-Jon Sneyers
-Jyrki Alakuijala
-Krzysztof Potempa
-Lode Vandevenne
-Luca Versari
-Martin Bruse
-Moritz Firsching
-Renata Khasanova
-Robert Obryk
-Sami Boukortt
-Sebastian Gomez-Gonzalez
-Thomas Fischbacher
-Zoltan Szabadka
diff --git a/third_party/jpeg-xl/LICENSE b/third_party/jpeg-xl/LICENSE
deleted file mode 100644
index c66034b105f23..0000000000000
--- a/third_party/jpeg-xl/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) the JPEG XL Project Authors.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/third_party/jpeg-xl/MODULE.bazel b/third_party/jpeg-xl/MODULE.bazel
deleted file mode 100644
index cc2397538dfbf..0000000000000
--- a/third_party/jpeg-xl/MODULE.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-bazel_dep(name = "bazel_skylib", version = "1.7.1")
-bazel_dep(name = "giflib", version = "5.2.1")
-bazel_dep(name = "googletest", version = "1.14.0")
-bazel_dep(name = "libjpeg_turbo", version = "2.1.91")
-bazel_dep(name = "libpng", version = "1.6.40")
-bazel_dep(name = "libwebp", version = "1.3.2")
-bazel_dep(name = "openexr", version = "3.2.1")
diff --git a/third_party/jpeg-xl/MODULE.bazel.lock b/third_party/jpeg-xl/MODULE.bazel.lock
deleted file mode 100644
index 7ea00d853cbed..0000000000000
--- a/third_party/jpeg-xl/MODULE.bazel.lock
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "lockFileVersion": 11,
-  "registryFileHashes": {
-    "https://bcr.bazel.build/bazel_registry.json": "8a28e4aff06ee60aed2a8c281907fb8bcbf3b753c91fb5a5c57da3215d5b3497",
-    "https://bcr.bazel.build/modules/abseil-cpp/20210324.2/MODULE.bazel": "7cd0312e064fde87c8d1cd79ba06c876bd23630c83466e9500321be55c96ace2",
-    "https://bcr.bazel.build/modules/abseil-cpp/20211102.0/MODULE.bazel": "70390338f7a5106231d20620712f7cccb659cd0e9d073d1991c038eb9fc57589",
-    "https://bcr.bazel.build/modules/abseil-cpp/20230125.1/MODULE.bazel": "89047429cb0207707b2dface14ba7f8df85273d484c2572755be4bab7ce9c3a0",
-    "https://bcr.bazel.build/modules/abseil-cpp/20230125.1/source.json": "06cc0842d241da0c5edc755edb3c7d0d008d304330e57ecf2d6449fb0b633a82",
-    "https://bcr.bazel.build/modules/apple_support/1.5.0/MODULE.bazel": "50341a62efbc483e8a2a6aec30994a58749bd7b885e18dd96aa8c33031e558ef",
-    "https://bcr.bazel.build/modules/apple_support/1.5.0/source.json": "eb98a7627c0bc486b57f598ad8da50f6625d974c8f723e9ea71bd39f709c9862",
-    "https://bcr.bazel.build/modules/bazel_features/1.11.0/MODULE.bazel": "f9382337dd5a474c3b7d334c2f83e50b6eaedc284253334cf823044a26de03e8",
-    "https://bcr.bazel.build/modules/bazel_features/1.11.0/source.json": "c9320aa53cd1c441d24bd6b716da087ad7e4ff0d9742a9884587596edfe53015",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.0.3/MODULE.bazel": "bcb0fd896384802d1ad283b4e4eb4d718eebd8cb820b0a2c3a347fb971afd9d8",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.2.1/MODULE.bazel": "f35baf9da0efe45fa3da1696ae906eea3d615ad41e2e3def4aeb4e8bc0ef9a7a",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.3.0/MODULE.bazel": "20228b92868bf5cfc41bda7afc8a8ba2a543201851de39d990ec957b513579c5",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.4.1/MODULE.bazel": "a0dcb779424be33100dcae821e9e27e4f2901d9dfd5333efe5ac6a8d7ab75e1d",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.4.2/MODULE.bazel": "3bd40978e7a1fac911d5989e6b09d8f64921865a45822d8b09e815eaa726a651",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.5.0/MODULE.bazel": "32880f5e2945ce6a03d1fbd588e9198c0a959bb42297b2cfaf1685b7bc32e138",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.6.1/MODULE.bazel": "8fdee2dbaace6c252131c00e1de4b165dc65af02ea278476187765e1a617b917",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.7.1/MODULE.bazel": "3120d80c5861aa616222ec015332e5f8d3171e062e3e804a2a0253e1be26e59b",
-    "https://bcr.bazel.build/modules/bazel_skylib/1.7.1/source.json": "f121b43eeefc7c29efbd51b83d08631e2347297c95aac9764a701f2a6a2bb953",
-    "https://bcr.bazel.build/modules/buildozer/7.1.2/MODULE.bazel": "2e8dd40ede9c454042645fd8d8d0cd1527966aa5c919de86661e62953cd73d84",
-    "https://bcr.bazel.build/modules/buildozer/7.1.2/source.json": "c9028a501d2db85793a6996205c8de120944f50a0d570438fcae0457a5f9d1f8",
-    "https://bcr.bazel.build/modules/giflib/5.2.1/MODULE.bazel": "810dbc4275425c89ffe648dd78c537fe2eb1d2a9704d10e950b295263af03366",
-    "https://bcr.bazel.build/modules/giflib/5.2.1/source.json": "94215af981976c329eaec0083727b155ea89607e61debea50ed508e7963ef9a6",
-    "https://bcr.bazel.build/modules/googletest/1.11.0/MODULE.bazel": "3a83f095183f66345ca86aa13c58b59f9f94a2f81999c093d4eeaa2d262d12f4",
-    "https://bcr.bazel.build/modules/googletest/1.14.0/MODULE.bazel": "cfbcbf3e6eac06ef9d85900f64424708cc08687d1b527f0ef65aa7517af8118f",
-    "https://bcr.bazel.build/modules/googletest/1.14.0/source.json": "2478949479000fdd7de9a3d0107ba2c85bb5f961c3ecb1aa448f52549ce310b5",
-    "https://bcr.bazel.build/modules/imath/3.1.9/MODULE.bazel": "26fe47ee8137a4c605667fb0d26a5c12b8fb2e758824a376789b287b2f9d424d",
-    "https://bcr.bazel.build/modules/imath/3.1.9/source.json": "22b7d9e617d4d26626f5ac8fba3cd2bd7a87f7501c99fa847f8d9e2980416e8f",
-    "https://bcr.bazel.build/modules/libdeflate/1.19/MODULE.bazel": "b7396a2edfd5ce6669509fbdd10db5e8731d60954063699c546c3126c8156824",
-    "https://bcr.bazel.build/modules/libdeflate/1.19/source.json": "d4604a526efba9b5347309de49673bbe152da465f7c80c7f7ffe6800d8b504d1",
-    "https://bcr.bazel.build/modules/libjpeg_turbo/2.1.91/MODULE.bazel": "bcc23b7c4866af2d7777ee49db435603ca1e35b90ea0689f8051900fa8c73c6b",
-    "https://bcr.bazel.build/modules/libjpeg_turbo/2.1.91/source.json": "42ea85708058e2408f229075e1cbeaad13fa2719918ff9c505be5e22b57ef17b",
-    "https://bcr.bazel.build/modules/libpng/1.6.40/MODULE.bazel": "cc1952a9b5efd4df3dfdb9f9ba2b1c8d88b4fd9b0e474185cb81d90a31c7c453",
-    "https://bcr.bazel.build/modules/libpng/1.6.40/source.json": "2fe294bf161c2d3f1e04e7cecb6eb2e6c0c198698b23cabc1c4e6ff77d82a86a",
-    "https://bcr.bazel.build/modules/libwebp/1.3.2/MODULE.bazel": "c60edf34a913daebac9bd2cbe17b84048e4a7a5d3571f70be93c1b1227a69659",
-    "https://bcr.bazel.build/modules/libwebp/1.3.2/source.json": "e7b8d3047ad9758fda22fcf46bd8b57414b0eb5e7903f4ce888683d778633cf7",
-    "https://bcr.bazel.build/modules/openexr/3.2.1/MODULE.bazel": "5665fa95490825760943601d618e2d70eb45378ea3f2961c5ec18f23ae8a2106",
-    "https://bcr.bazel.build/modules/openexr/3.2.1/source.json": "afc17dda6614ff723cc1def634fa4f33534d3d29514b089fa4aa5eb47ba1c65b",
-    "https://bcr.bazel.build/modules/platforms/0.0.4/MODULE.bazel": "9b328e31ee156f53f3c416a64f8491f7eb731742655a47c9eec4703a71644aee",
-    "https://bcr.bazel.build/modules/platforms/0.0.5/MODULE.bazel": "5733b54ea419d5eaf7997054bb55f6a1d0b5ff8aedf0176fef9eea44f3acda37",
-    "https://bcr.bazel.build/modules/platforms/0.0.6/MODULE.bazel": "ad6eeef431dc52aefd2d77ed20a4b353f8ebf0f4ecdd26a807d2da5aa8cd0615",
-    "https://bcr.bazel.build/modules/platforms/0.0.7/MODULE.bazel": "72fd4a0ede9ee5c021f6a8dd92b503e089f46c227ba2813ff183b71616034814",
-    "https://bcr.bazel.build/modules/platforms/0.0.8/MODULE.bazel": "9f142c03e348f6d263719f5074b21ef3adf0b139ee4c5133e2aa35664da9eb2d",
-    "https://bcr.bazel.build/modules/platforms/0.0.9/MODULE.bazel": "4a87a60c927b56ddd67db50c89acaa62f4ce2a1d2149ccb63ffd871d5ce29ebc",
-    "https://bcr.bazel.build/modules/platforms/0.0.9/source.json": "cd74d854bf16a9e002fb2ca7b1a421f4403cda29f824a765acd3a8c56f8d43e6",
-    "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel": "a5a29bb89544f9b97edce05642fac225a808b5b7be74038ea3640fae2f8e66a7",
-    "https://bcr.bazel.build/modules/protobuf/21.7/source.json": "bbe500720421e582ff2d18b0802464205138c06056f443184de39fbb8187b09b",
-    "https://bcr.bazel.build/modules/protobuf/3.19.0/MODULE.bazel": "6b5fbb433f760a99a22b18b6850ed5784ef0e9928a72668b66e4d7ccd47db9b0",
-    "https://bcr.bazel.build/modules/protobuf/3.19.6/MODULE.bazel": "9233edc5e1f2ee276a60de3eaa47ac4132302ef9643238f23128fea53ea12858",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.1/MODULE.bazel": "cb2aa0747f84c6c3a78dad4e2049c154f08ab9d166b1273835a8174940365647",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.2/MODULE.bazel": "6915987c90970493ab97393024c156ea8fb9f3bea953b2f3ec05c34f19b5695c",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.6/MODULE.bazel": "abf360251023dfe3efcef65ab9d56beefa8394d4176dd29529750e1c57eaa33f",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.8/MODULE.bazel": "964c85c82cfeb6f3855e6a07054fdb159aced38e99a5eecf7bce9d53990afa3e",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.9/MODULE.bazel": "836e76439f354b89afe6a911a7adf59a6b2518fafb174483ad78a2a2fde7b1c5",
-    "https://bcr.bazel.build/modules/rules_cc/0.0.9/source.json": "1f1ba6fea244b616de4a554a0f4983c91a9301640c8fe0dd1d410254115c8430",
-    "https://bcr.bazel.build/modules/rules_java/4.0.0/MODULE.bazel": "5a78a7ae82cd1a33cef56dc578c7d2a46ed0dca12643ee45edbb8417899e6f74",
-    "https://bcr.bazel.build/modules/rules_java/7.6.1/MODULE.bazel": "2f14b7e8a1aa2f67ae92bc69d1ec0fa8d9f827c4e17ff5e5f02e91caa3b2d0fe",
-    "https://bcr.bazel.build/modules/rules_java/7.6.1/source.json": "8f3f3076554e1558e8e468b2232991c510ecbcbed9e6f8c06ac31c93bcf38362",
-    "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel": "a56b85e418c83eb1839819f0b515c431010160383306d13ec21959ac412d2fe7",
-    "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/source.json": "a075731e1b46bc8425098512d038d416e966ab19684a10a34f4741295642fc35",
-    "https://bcr.bazel.build/modules/rules_license/0.0.3/MODULE.bazel": "627e9ab0247f7d1e05736b59dbb1b6871373de5ad31c3011880b4133cafd4bd0",
-    "https://bcr.bazel.build/modules/rules_license/0.0.7/MODULE.bazel": "088fbeb0b6a419005b89cf93fe62d9517c0a2b8bb56af3244af65ecfe37e7d5d",
-    "https://bcr.bazel.build/modules/rules_license/0.0.7/source.json": "355cc5737a0f294e560d52b1b7a6492d4fff2caf0bef1a315df5a298fca2d34a",
-    "https://bcr.bazel.build/modules/rules_pkg/0.7.0/MODULE.bazel": "df99f03fc7934a4737122518bb87e667e62d780b610910f0447665a7e2be62dc",
-    "https://bcr.bazel.build/modules/rules_pkg/0.7.0/source.json": "c2557066e0c0342223ba592510ad3d812d4963b9024831f7f66fd0584dd8c66c",
-    "https://bcr.bazel.build/modules/rules_proto/4.0.0/MODULE.bazel": "a7a7b6ce9bee418c1a760b3d84f83a299ad6952f9903c67f19e4edd964894e06",
-    "https://bcr.bazel.build/modules/rules_proto/5.3.0-21.7/MODULE.bazel": "e8dff86b0971688790ae75528fe1813f71809b5afd57facb44dad9e8eca631b7",
-    "https://bcr.bazel.build/modules/rules_proto/5.3.0-21.7/source.json": "d57902c052424dfda0e71646cb12668d39c4620ee0544294d9d941e7d12bc3a9",
-    "https://bcr.bazel.build/modules/rules_python/0.10.2/MODULE.bazel": "cc82bc96f2997baa545ab3ce73f196d040ffb8756fd2d66125a530031cd90e5f",
-    "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel": "26114f0c0b5e93018c0c066d6673f1a2c3737c7e90af95eff30cfee38d0bbac7",
-    "https://bcr.bazel.build/modules/rules_python/0.22.1/source.json": "57226905e783bae7c37c2dd662be078728e48fa28ee4324a7eabcafb5a43d014",
-    "https://bcr.bazel.build/modules/rules_python/0.4.0/MODULE.bazel": "9208ee05fd48bf09ac60ed269791cf17fb343db56c8226a720fbb1cdf467166c",
-    "https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8",
-    "https://bcr.bazel.build/modules/stardoc/0.5.1/source.json": "a96f95e02123320aa015b956f29c00cb818fa891ef823d55148e1a362caacf29",
-    "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/MODULE.bazel": "7298990c00040a0e2f121f6c32544bab27d4452f80d9ce51349b1a28f3005c43",
-    "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/source.json": "f1ef7d3f9e0e26d4b23d1c39b5f5de71f584dd7d1b4ef83d9bbba6ec7a6a6459",
-    "https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0",
-    "https://bcr.bazel.build/modules/zlib/1.2.12/MODULE.bazel": "3b1a8834ada2a883674be8cbd36ede1b6ec481477ada359cd2d3ddc562340b27",
-    "https://bcr.bazel.build/modules/zlib/1.3/MODULE.bazel": "6a9c02f19a24dcedb05572b2381446e27c272cd383aed11d41d99da9e3167a72",
-    "https://bcr.bazel.build/modules/zlib/1.3/source.json": "b6b43d0737af846022636e6e255fd4a96fee0d34f08f3830e6e0bac51465c37c"
-  },
-  "selectedYankedVersions": {},
-  "moduleExtensions": {
-    "@@apple_support~//crosstool:setup.bzl%apple_cc_configure_extension": {
-      "general": {
-        "bzlTransitiveDigest": "PjIds3feoYE8SGbbIq2SFTZy3zmxeO2tQevJZNDo7iY=",
-        "usagesDigest": "aLmqbvowmHkkBPve05yyDNGN7oh7QE9kBADr3QIZTZs=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "local_config_apple_cc": {
-            "bzlFile": "@@apple_support~//crosstool:setup.bzl",
-            "ruleClassName": "_apple_cc_autoconf",
-            "attributes": {}
-          },
-          "local_config_apple_cc_toolchains": {
-            "bzlFile": "@@apple_support~//crosstool:setup.bzl",
-            "ruleClassName": "_apple_cc_autoconf_toolchains",
-            "attributes": {}
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "apple_support~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "@@platforms//host:extension.bzl%host_platform": {
-      "general": {
-        "bzlTransitiveDigest": "xelQcPZH8+tmuOHVjL9vDxMnnQNMlwj0SlvgoqBkm4U=",
-        "usagesDigest": "meSzxn3DUCcYEhq4HQwExWkWtU4EjriRBQLsZN+Q0SU=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "host_platform": {
-            "bzlFile": "@@platforms//host:extension.bzl",
-            "ruleClassName": "host_platform_repo",
-            "attributes": {}
-          }
-        },
-        "recordedRepoMappingEntries": []
-      }
-    }
-  }
-}
diff --git a/third_party/jpeg-xl/PATENTS b/third_party/jpeg-xl/PATENTS
deleted file mode 100644
index c95b8f4105f21..0000000000000
--- a/third_party/jpeg-xl/PATENTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the JPEG XL project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of JPEG XL, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of JPEG XL.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of JPEG XL or any code incorporated within this
-implementation of JPEG XL constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of JPEG XL
-shall terminate as of the date such litigation is filed.
diff --git a/third_party/jpeg-xl/README.md b/third_party/jpeg-xl/README.md
deleted file mode 100644
index 877eabac8f94d..0000000000000
--- a/third_party/jpeg-xl/README.md
+++ /dev/null
@@ -1,141 +0,0 @@
-# JPEG XL reference implementation
-
-[![Build/Test](https://github.com/libjxl/libjxl/actions/workflows/build_test.yml/badge.svg)](
-https://github.com/libjxl/libjxl/actions/workflows/build_test.yml)
-[![Build/Test Cross](https://github.com/libjxl/libjxl/actions/workflows/build_test_cross.yml/badge.svg)](
-https://github.com/libjxl/libjxl/actions/workflows/build_test_cross.yml)
-[![Conformance](https://github.com/libjxl/libjxl/actions/workflows/conformance.yml/badge.svg)](
-https://github.com/libjxl/libjxl/actions/workflows/conformance.yml)
-[![CIFuzz](https://github.com/libjxl/libjxl/actions/workflows/fuzz.yml/badge.svg)](
-https://github.com/libjxl/libjxl/actions/workflows/fuzz.yml)
-[![Releases](https://github.com/libjxl/libjxl/actions/workflows/release.yaml/badge.svg)](
-https://github.com/libjxl/libjxl/actions/workflows/release.yaml)
-[![Doc](https://readthedocs.org/projects/libjxl/badge/?version=latest)](
-https://libjxl.readthedocs.io/en/latest/?badge=latest)
-[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/7845/badge)](
-https://www.bestpractices.dev/projects/7845)
-[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/libjxl/libjxl/badge)](
-https://securityscorecards.dev/viewer/?uri=github.com/libjxl/libjxl)
-[![codecov](https://codecov.io/gh/libjxl/libjxl/branch/main/graph/badge.svg)](
-https://codecov.io/gh/libjxl/libjxl)
-
-<img src="doc/jxl.svg" width="100" align="right" alt="JXL logo">
-
-This repository contains a reference implementation of JPEG XL (encoder and
-decoder), called `libjxl`. This software library is
-[used by many applications that support JPEG XL](doc/software_support.md).
-
-JPEG XL was standardized in 2022 as [ISO/IEC 18181](https://jpeg.org/jpegxl/workplan.html).
-The [core codestream](doc/format_overview.md#codestream-features) is specified in 18181-1,
-the [file format](doc/format_overview.md#file-format-features) in 18181-2.
-[Decoder conformance](https://github.com/libjxl/conformance) is defined in 18181-3,
-and 18181-4 is the [reference software](https://github.com/libjxl/libjxl).
-
-The library API, command line options, and tools in this repository are subject
-to change, however files encoded with `cjxl` conform to the JPEG XL specification
-and can be decoded with current and future `djxl` decoders or the `libjxl` decoding library.
-
-## Installation
-
-In most Linux distributions, installing `libjxl` is just a matter of using the package management system.
-For example in Debian-based distributions: `apt install libjxl-tools` will install `cjxl` and `djxl`
-and other tools like `benchmark_xl` are available in the package `libjxl-devtools`.
-On MacOS, you can use [Homebrew](https://brew.sh/): `brew install jpeg-xl`.
-
-[![libjxl packaging status](https://repology.org/badge/vertical-allrepos/libjxl.svg?exclude_unsupported=1&columns=3&exclude_sources=modules,site&header=libjxl%20packaging%20status)](https://repology.org/project/libjxl/versions)
-
-From the [releases page](https://github.com/libjxl/libjxl/releases/) the following can be downloaded:
- - Windows binaries 
- - Debian and Ubuntu .deb packages 
-
-Of course you can also [build libjxl from sources](BUILDING.md).
-
-
-## Usage
-
-To encode a source image to JPEG XL with default settings:
-
-```bash
-cjxl input.png output.jxl
-```
-
-The desired visual fidelity can be selected using the `--distance` parameter
-(in units of just-noticeable difference, where 0 is lossless and the most useful lossy range is 0.5 .. 3.0),
-or using `--quality` (on a scale from 0 to 100, roughly matching libjpeg).
-The [encode effort](doc/encode_effort.md) can be selected using the `--effort` parameter.
-
-For more settings run `cjxl --help` or for a full list of options
-run `cjxl -v -v --help`.
-
-To decode a JPEG XL file run:
-
-```bash
-djxl input.jxl output.png
-```
-
-When possible, `cjxl`/`djxl` are able to read/write the following image formats:
-OpenEXR (`.exr`), GIF (`.gif`), JPEG (`.jpg`/`.jpeg`), NetPBM (`.pam`/`.pgm`/`.ppm`),
-Portable FloatMap (`.pfm`), PGX Test Format (`.pgx`), Portable Network Graphics (`.png`),
-Animated PNG (`.png`/`.apng`), and JPEG XL itself (`.jxl`).
-
-Specifically for JPEG files, the default `cjxl` behavior is to apply lossless
-recompression and the default `djxl` behavior is to reconstruct the original
-JPEG file (when the extension of the output file is `.jpg`).
-
-### Benchmarking
-
-For speed benchmarks on single images in single or multi-threaded decoding
-`djxl` can print decoding speed information. See `djxl --help` for details
-on the decoding options and note that the output image is optional for
-benchmarking purposes.
-
-For more comprehensive benchmarking options, see the
-[benchmarking guide](doc/benchmarking.md).
-
-### Library API
-
-Besides the `libjxl` library [API documentation](https://libjxl.readthedocs.io/en/latest/),
-there are [example applications](examples/) and [plugins](plugins/) that can be used as a reference or
-starting point for developers who wish to integrate `libjxl` in their project.
-
-
-## License
-
-This software is available under a 3-clause BSD license which can be found in
-the [LICENSE](LICENSE) file, with an "Additional IP Rights Grant" as outlined in
-the [PATENTS](PATENTS) file.
-
-Please note that the PATENTS file only mentions Google since Google is the legal
-entity receiving the Contributor License Agreements (CLA) from all contributors
-to the JPEG XL Project, including the initial main contributors to the JPEG XL
-format: Cloudinary and Google.
-
-## Additional documentation
-
-### Codec description
-
-*   [JPEG XL Format Overview](doc/format_overview.md)
-*   [Introductory paper](https://www.spiedigitallibrary.org/proceedings/Download?fullDOI=10.1117%2F12.2529237) (open-access)
-*   [XL Overview](doc/xl_overview.md) - a brief introduction to the source code modules
-*   [JPEG XL white paper](https://ds.jpeg.org/whitepapers/jpeg-xl-whitepaper.pdf)
-*   [JPEG XL official website](https://jpeg.org/jpegxl)
-*   [JPEG XL community website](https://jpegxl.info)
-
-### Development process
-
-*   [More information on testing/build options](doc/building_and_testing.md)
-*   [Git guide for JPEG XL](doc/developing_in_github.md) - for developers
-*   [Fuzzing](doc/fuzzing.md) - for developers
-*   [Building Web Assembly artifacts](doc/building_wasm.md)
-*   [Test coverage on Codecov.io](https://app.codecov.io/gh/libjxl/libjxl) - for
-    developers
-*   [libjxl documentation on readthedocs.io](https://libjxl.readthedocs.io/)
-*   The development of jpegli, the improved JPEG encoder and decoder, will continue at https://github.com/google/jpegli
-
-### Contact
-
-If you encounter a bug or other issue with the software, please open an Issue here.
-
-There is a [subreddit about JPEG XL](https://www.reddit.com/r/jpegxl/), and
-informal chatting with developers and early adopters of `libjxl` can be done on the
-[JPEG XL Discord server](https://discord.gg/DqkQgDRTFu).
diff --git a/third_party/jpeg-xl/SECURITY.md b/third_party/jpeg-xl/SECURITY.md
deleted file mode 100644
index d03012a63ad94..0000000000000
--- a/third_party/jpeg-xl/SECURITY.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# Security and Vulnerability Policy for libjxl
-
-## TL;DR:
-
-CPE prefix: `cpe:2.3:a:libjxl_project:libjxl`
-
-To report a security issue, please email libjxl-security@google.com.
-
-Include in your email a description of the issue, the steps you took to create
-the issue, affected versions, and if known, mitigations for the issue. Our
-vulnerability management team will acknowledge receiving your email within 3
-working days.
-
-This project follows a 90 day disclosure timeline.
-
-For all other bugs, where there are no security implications about disclosing
-the unpatched bug, open a [new issue](https://github.com/libjxl/libjxl/issues)
-checking first for existing similar issues. If in doubt about the security
-impact of a bug you discovered, email first.
-
-## Policy overview
-
-libjxl's Security Policy is based on the [Google Open Source program
-guidelines](https://github.com/google/oss-vulnerability-guide) for coordinated
-vulnerability disclosure.
-
-Early versions of `libjxl` had a different security policy that didn't provide
-security and vulnerability disclosure support. Versions up to and including
-0.3.7 are not covered and won't receive any security advisory.
-
-Only released versions, starting from version 0.5, are covered by this policy.
-Development branches, arbitrary commits from `main` branch or even releases with
-backported features externally patched on top are not covered. Only those
-versions with a release tag in `libjxl`'s repository are covered, starting from
-version 0.5.
-
-## What's a "Security bug"
-
-A security bug is a bug that can potentially be exploited to let an attacker
-gain unauthorized access or privileges such as disclosing information or
-arbitrary code execution. Not all fuzzer-found bugs and not all assert()
-failures are considered security bugs in libjxl. For a detailed explanation and
-examples see our [Security Vulnerabilities Playbook](doc/vuln_playbook.md).
-
-## What to expect
-
-To report a security issue, please email libjxl-security@google.com with all the
-details about the bug you encountered.
-
- * Include a description of the issue, steps to reproduce, etc. Compiler
-   versions, flags, exact version used and even CPU are often relevant given our
-   usage of SIMD and run-time dispatch of SIMD instructions.
-
- * A member of our security team will reply to you within 3 business days. Note
-   that business days are different in different countries.
-
- * We will evaluate the issue and we may require more input from your side to
-   reproduce it.
-
- * If the issue fits in the description of a security bug, we will issue a
-   CVE, publish a fix and make a new minor or patch release with it. There is
-   a maximum of 90 day disclosure timeline, we ask you to not publish the
-   details before the 90 day deadline or the release date (whichever comes
-   first).
-
- * In the case that we publish a CVE we will credit the external researcher who
-   reported the issue. When reporting security issues please let us know if you
-   need to include specific information while doing so, like for example a
-   company affiliation.
-
-Our security team follows the [Security Vulnerabilities
-Playbook](doc/vuln_playbook.md). For more details about the process and policies
-please take a look at it.
diff --git a/third_party/jpeg-xl/WORKSPACE b/third_party/jpeg-xl/WORKSPACE
deleted file mode 100644
index d8cd9a7495762..0000000000000
--- a/third_party/jpeg-xl/WORKSPACE
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-workspace(name = "libjxl")
-
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository", "new_git_repository")
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-local_repository(
-    name = "highway",
-    path = "third_party/highway",
-)
-
-local_repository(
-    name = "brotli",
-    path = "third_party/brotli",
-)
-
-new_local_repository(
-    name = "skcms",
-    build_file_content = """
-cc_library(
-    name = "skcms",
-    srcs = [
-        "skcms.cc",
-        "src/skcms_internals.h",
-        "src/skcms_Transform.h",
-        "src/Transform_inl.h",
-    ],
-    hdrs = ["skcms.h"],
-    visibility = ["//visibility:public"],
-)
-    """,
-    path = "third_party/skcms",
-)
diff --git a/third_party/jpeg-xl/bash_test.sh b/third_party/jpeg-xl/bash_test.sh
deleted file mode 100755
index 9472c85970bf6..0000000000000
--- a/third_party/jpeg-xl/bash_test.sh
+++ /dev/null
@@ -1,312 +0,0 @@
-#!/bin/bash
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# Tests implemented in bash. These typically will run checks about the source
-# code rather than the compiled one.
-
-SELF=$(realpath "$0")
-MYDIR=$(dirname "${SELF}")
-
-set -u
-
-test_includes() {
-  local ret=0
-  local f
-  for f in $(git ls-files | grep -E '(\.cc|\.cpp|\.h)$'); do
-    if [ ! -e "$f" ]; then
-      continue
-    fi
-    # Check that the full paths to the public headers are not used, since users
-    # of the library will include the library as: #include "jxl/foobar.h".
-    if grep -i -H -n -E '#include\s*[<"]lib/include/jxl' "$f" >&2; then
-      echo "Don't add \"include/\" to the include path of public headers." >&2
-      ret=1
-    fi
-
-    if [[ "${f#third_party/}" == "$f" ]]; then
-      # $f is not in third_party/
-
-      # Check that local files don't use the full path to third_party/
-      # directory since the installed versions will not have that path.
-      # Add an exception for third_party/dirent.h.
-      if grep -v -F 'third_party/dirent.h' "$f" | \
-          grep -i -H -n -E '#include\s*[<"]third_party/' >&2 &&
-          [[ $ret -eq 0 ]]; then
-        cat >&2 <<EOF
-$f: Don't add third_party/ to the include path of third_party projects. This \
-makes it harder to use installed system libraries instead of the third_party/ \
-ones.
-EOF
-        ret=1
-      fi
-    fi
-
-  done
-  return ${ret}
-}
-
-test_include_collision() {
-  local ret=0
-  local f
-  for f in $(git ls-files | grep -E '^lib/include/'); do
-    if [ ! -e "$f" ]; then
-      continue
-    fi
-    local base=${f#lib/include/}
-    if [[ -e "lib/${base}" ]]; then
-      echo "$f: Name collision, both $f and lib/${base} exist." >&2
-      ret=1
-    fi
-  done
-  return ${ret}
-}
-
-test_copyright() {
-  local ret=0
-  local f
-  for f in $(
-      git ls-files | grep -E \
-      '(Dockerfile.*|\.c|\.cc|\.cpp|\.gni|\.h|\.java|\.sh|\.m|\.py|\.ui|\.yml)$'); do
-    if [ ! -e "$f" ]; then
-      continue
-    fi
-    if [[ "${f#third_party/}" == "$f" ]]; then
-      # $f is not in third_party/
-      if ! head -n 10 "$f" |
-          grep -F 'Copyright (c) the JPEG XL Project Authors.' >/dev/null ; then
-        echo "$f: Missing Copyright blob near the top of the file." >&2
-        ret=1
-      fi
-      if ! head -n 10 "$f" |
-          grep -F 'Use of this source code is governed by a BSD-style' \
-            >/dev/null ; then
-        echo "$f: Missing License blob near the top of the file." >&2
-        ret=1
-      fi
-    fi
-  done
-  return ${ret}
-}
-
-# Check that we don't use "%zu" or "%zd" in format string for size_t.
-test_printf_size_t() {
-  local ret=0
-  if grep -n -E '%[0-9]*z[udx]' \
-      $(git ls-files | grep -E '(\.c|\.cc|\.cpp|\.h)$'); then
-    echo "Don't use '%zu' or '%zd' in a format string, instead use " \
-      "'%\" PRIuS \"' or '%\" PRIdS \"'." >&2
-    ret=1
-  fi
-
-  if grep -n -E '[^_]gtest\.h' \
-      $(git ls-files | grep -E '(\.c|\.cc|\.cpp|\.h)$' | grep -v -F /testing.h); then
-    echo "Don't include gtest directly, instead include 'testing.h'. " >&2
-    ret=1
-  fi
-
-  local f
-  for f in $(git ls-files | grep -E "\.cc$" | xargs grep 'PRI[udx]S' |
-      cut -f 1 -d : | uniq); do
-    if [ ! -e "$f" ]; then
-      continue
-    fi
-    if ! grep -F printf_macros.h "$f" >/dev/null; then
-      echo "$f: Add lib/jxl/base/printf_macros.h for PRI.S, or use other " \
-        "types for code outside lib/jxl library." >&2
-      ret=1
-    fi
-  done
-
-  for f in $(git ls-files | grep -E "\.h$" | grep -v -E '(printf_macros\.h|testing\.h)' |
-      xargs grep -n 'PRI[udx]S'); do
-    # Having PRIuS / PRIdS in a header file means that printf_macros.h may
-    # be included before a system header, in particular before gtest headers.
-    # those may re-define PRIuS unconditionally causing a compile error.
-    echo "$f: Don't use PRI.S in header files. Sorry."
-    ret=1
-  done
-
-  return ${ret}
-}
-
-# Check that "dec_" code doesn't depend on "enc_" headers.
-test_dec_enc_deps() {
-  local ret=0
-  local f
-  for f in $(git ls-files | grep -E '/dec_'); do
-    if [ ! -e "$f" ]; then
-      continue
-    fi
-    if [[ "${f#third_party/}" == "$f" ]]; then
-      # $f is not in third_party/
-      if grep -n -H -E "#include.*/enc_" "$f" >&2; then
-        echo "$f: Don't include \"enc_*\" files from \"dec_*\" files." >&2
-        ret=1
-      fi
-    fi
-  done
-  return ${ret}
-}
-
-# Check for git merge conflict markers.
-test_merge_conflict() {
-  local ret=0
-  TEXT_FILES='(\.cc|\.cpp|\.h|\.sh|\.m|\.py|\.md|\.txt|\.cmake)$'
-  for f in $(git ls-files | grep -E "${TEXT_FILES}"); do
-    if [ ! -e "$f" ]; then
-      continue
-    fi
-    if grep -E '^<<<<<<< ' "$f"; then
-      echo "$f: Found git merge conflict marker. Please resolve." >&2
-      ret=1
-    fi
-  done
-  return ${ret}
-}
-
-# Check that the library and the package have the same version. This prevents
-# accidentally having them out of sync.
-get_version() {
-  local varname=$1
-  local line=$(grep -F "set(${varname} " lib/CMakeLists.txt | head -n 1)
-  [[ -n "${line}" ]]
-  line="${line#set(${varname} }"
-  line="${line%)}"
-  echo "${line}"
-}
-
-test_version() {
-  local major=$(get_version JPEGXL_MAJOR_VERSION)
-  local minor=$(get_version JPEGXL_MINOR_VERSION)
-  local patch=$(get_version JPEGXL_PATCH_VERSION)
-  # Check that the version is not empty
-  if [[ -z "${major}${minor}${patch}" ]]; then
-    echo "Couldn't parse version from CMakeLists.txt" >&2
-    return 1
-  fi
-  local pkg_version=$(head -n 1 debian/changelog)
-  # Get only the part between the first "jpeg-xl (" and the following ")".
-  pkg_version="${pkg_version#jpeg-xl (}"
-  pkg_version="${pkg_version%%)*}"
-  if [[ -z "${pkg_version}" ]]; then
-    echo "Couldn't parse version from debian package" >&2
-    return 1
-  fi
-
-  local lib_version="${major}.${minor}.${patch}"
-  lib_version="${lib_version%.0}"
-  if [[ "${pkg_version}" != "${lib_version}"* ]]; then
-    echo "Debian package version (${pkg_version}) doesn't match library" \
-      "version (${lib_version})." >&2
-    return 1
-  fi
-  return 0
-}
-
-# Check that the SHA versions in deps.sh matches the git submodules.
-test_deps_version() {
-  while IFS= read -r line; do
-    if [[ "${line:0:10}" != "[submodule" ]]; then
-      continue
-    fi
-    line="${line#[submodule \"}"
-    line="${line%\"]}"
-    local varname=$(tr '[:lower:]' '[:upper:]' <<< "${line}")
-    varname="${varname/\//_}"
-    if ! grep -F "${varname}=" deps.sh >/dev/null; then
-      # Ignoring submodule not in deps.sh
-      continue
-    fi
-    local deps_sha=$(grep -F "${varname}=" deps.sh | cut -f 2 -d '"')
-    [[ -n "${deps_sha}" ]]
-    local git_sha=$(git ls-tree -r HEAD "${line}" | cut -f 1 | cut -f 3 -d ' ')
-    if [[ "${deps_sha}" != "${git_sha}" ]]; then
-      cat >&2 <<EOF
-deps.sh: SHA for project ${line} is at ${deps_sha} but the git submodule is at
-${git_sha}. Please update deps.sh
-
-If you did not intend to change the submodule's SHA value, it is possible that
-you accidentally included this change in your commit after a rebase or checkout
-without running "git submodule --init". To revert the submodule change run from
-the top checkout directory:
-
-  git -C ${line} checkout ${deps_sha}
-  git commit --amend ${line}
-
-EOF
-      return 1
-    fi
-  done < .gitmodules
-}
-
-# Make sure that all the Fields objects are fuzzed directly.
-test_fuzz_fields() {
-  local ret=0
-  # List all the classes of the form "ClassName : public Fields".
-  # This doesn't catch class names that are too long to fit.
-  local field_classes=$( git ls-files |
-    grep -E '\.(cc|h)' | grep -v 'test\.cc$' |
-    xargs grep -h -o -E '\b[^ ]+ : public Fields' | cut -f 1 -d ' ')
-  local classname
-  for classname in ${field_classes}; do
-    if [ ! -e "$classname" ]; then
-      continue
-    fi
-    if ! grep -E "\\b${classname}\\b" tools/fields_fuzzer.cc >/dev/null; then
-      cat >&2 <<EOF
-tools/fields_fuzzer.cc: Class ${classname} not found in the fields_fuzzer.
-EOF
-      ret=1
-    fi
-  done
-  return $ret
-}
-
-# Test that we don't use %n in C++ code to avoid using it in printf and scanf.
-# This test is not very precise but in cases where "module n" is needed we would
-# normally have "% n" instead of "%n". Using %n is not allowed in Android 10+.
-test_percent_n() {
-  local ret=0
-  local f
-  for f in $(git ls-files | grep -E '(\.cc|\.cpp|\.h)$'); do
-    if [ ! -e "$f" ]; then
-      continue
-    fi
-    if grep -i -H -n -E '%h*n' "$f" >&2; then
-      echo "Don't use \"%n\"." >&2
-      ret=1
-    fi
-  done
-  return ${ret}
-}
-
-main() {
-  local ret=0
-  cd "${MYDIR}"
-
-  if ! git rev-parse >/dev/null 2>/dev/null; then
-    echo "Not a git checkout, skipping bash_test"
-    return 0
-  fi
-
-  IFS=$'\n'
-  for f in $(declare -F); do
-    local test_name=$(echo "$f" | cut -f 3 -d ' ')
-    # Runs all the local bash functions that start with "test_".
-    if [[ "${test_name}" == test_* ]]; then
-      echo "Test ${test_name}: Start"
-      if ${test_name}; then
-        echo "Test ${test_name}: PASS"
-      else
-        echo "Test ${test_name}: FAIL"
-        ret=1
-      fi
-    fi
-  done
-  return ${ret}
-}
-
-main "$@"
diff --git a/third_party/jpeg-xl/ci.sh b/third_party/jpeg-xl/ci.sh
deleted file mode 100755
index a2ad829cb7371..0000000000000
--- a/third_party/jpeg-xl/ci.sh
+++ /dev/null
@@ -1,1555 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# Continuous integration helper module. This module is meant to be called from
-# workflows during the continuous integration build, as well as from the
-# command line for developers.
-
-set -eu
-
-OS=`uname -s`
-
-SELF=$(realpath "$0")
-MYDIR=$(dirname "${SELF}")
-
-### Environment parameters:
-TEST_STACK_LIMIT="${TEST_STACK_LIMIT:-256}"
-BENCHMARK_NUM_THREADS="${BENCHMARK_NUM_THREADS:-0}"
-BUILD_CONFIG=${BUILD_CONFIG:-}
-CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-RelWithDebInfo}
-CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH:-}
-CMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER:-}
-CMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER:-}
-CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM:-}
-SKIP_BUILD="${SKIP_BUILD:-0}"
-SKIP_TEST="${SKIP_TEST:-0}"
-FASTER_MSAN_BUILD="${FASTER_MSAN_BUILD:-0}"
-TARGETS="${TARGETS:-all doc}"
-TEST_SELECTOR="${TEST_SELECTOR:-}"
-BUILD_TARGET="${BUILD_TARGET:-}"
-ENABLE_WASM_SIMD="${ENABLE_WASM_SIMD:-0}"
-if [[ -n "${BUILD_TARGET}" ]]; then
-  BUILD_DIR="${BUILD_DIR:-${MYDIR}/build-${BUILD_TARGET%%-*}}"
-else
-  BUILD_DIR="${BUILD_DIR:-${MYDIR}/build}"
-fi
-# Whether we should post a message in the MR when the build fails.
-POST_MESSAGE_ON_ERROR="${POST_MESSAGE_ON_ERROR:-1}"
-# By default, do a lightweight debian HWY package build.
-HWY_PKG_OPTIONS="${HWY_PKG_OPTIONS:---set-envvar=HWY_EXTRA_CONFIG=-DBUILD_TESTING=OFF -DHWY_ENABLE_EXAMPLES=OFF -DHWY_ENABLE_CONTRIB=OFF}"
-
-# Set default compilers to clang if not already set
-export CC=${CC:-clang}
-export CXX=${CXX:-clang++}
-
-# Time limit for the "fuzz" command in seconds (0 means no limit).
-FUZZER_MAX_TIME="${FUZZER_MAX_TIME:-0}"
-
-SANITIZER="none"
-
-
-if [[ "${BUILD_TARGET%%-*}" == "x86_64" ||
-    "${BUILD_TARGET%%-*}" == "i686" ]]; then
-  # Default to building all targets, even if compiler baseline is SSE4
-  HWY_BASELINE_TARGETS=${HWY_BASELINE_TARGETS:-HWY_EMU128}
-else
-  HWY_BASELINE_TARGETS=${HWY_BASELINE_TARGETS:-}
-fi
-
-# Convenience flag to pass both CMAKE_C_FLAGS and CMAKE_CXX_FLAGS
-CMAKE_FLAGS=${CMAKE_FLAGS:-}
-CMAKE_C_FLAGS="${CMAKE_C_FLAGS:-} ${CMAKE_FLAGS}"
-CMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS:-} ${CMAKE_FLAGS}"
-
-CMAKE_CROSSCOMPILING_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR:-}
-CMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS:-}
-CMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH:-}
-CMAKE_MODULE_LINKER_FLAGS=${CMAKE_MODULE_LINKER_FLAGS:-}
-CMAKE_SHARED_LINKER_FLAGS=${CMAKE_SHARED_LINKER_FLAGS:-}
-CMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE:-}
-
-if [[ "${ENABLE_WASM_SIMD}" -ne "0" ]]; then
-  CMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -msimd128"
-  CMAKE_C_FLAGS="${CMAKE_C_FLAGS} -msimd128"
-  CMAKE_EXE_LINKER_FLAGS="${CMAKE_EXE_LINKER_FLAGS} -msimd128"
-fi
-
-if [[ "${ENABLE_WASM_SIMD}" -eq "2" ]]; then
-  CMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -DHWY_WANT_WASM2"
-  CMAKE_C_FLAGS="${CMAKE_C_FLAGS} -DHWY_WANT_WASM2"
-fi
-
-if [[ -z "${BUILD_CONFIG}" ]]; then
-  TOOLS_DIR="${BUILD_DIR}/tools"
-else
-  TOOLS_DIR="${BUILD_DIR}/tools/${BUILD_CONFIG}"
-fi
-
-if [[ ! -z "${HWY_BASELINE_TARGETS}" ]]; then
-  CMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -DHWY_BASELINE_TARGETS=${HWY_BASELINE_TARGETS}"
-fi
-
-# Version inferred from the CI variables.
-CI_COMMIT_SHA=${GITHUB_SHA:-}
-JPEGXL_VERSION=${JPEGXL_VERSION:-}
-
-# Benchmark parameters
-STORE_IMAGES=${STORE_IMAGES:-1}
-BENCHMARK_CORPORA="${MYDIR}/third_party/corpora"
-
-# Local flags passed to sanitizers.
-UBSAN_FLAGS=(
-  -fsanitize=alignment
-  -fsanitize=bool
-  -fsanitize=bounds
-  -fsanitize=builtin
-  -fsanitize=enum
-  -fsanitize=float-cast-overflow
-  -fsanitize=float-divide-by-zero
-  -fsanitize=integer-divide-by-zero
-  -fsanitize=null
-  -fsanitize=object-size
-  -fsanitize=pointer-overflow
-  -fsanitize=return
-  -fsanitize=returns-nonnull-attribute
-  -fsanitize=shift-base
-  -fsanitize=shift-exponent
-  -fsanitize=unreachable
-  -fsanitize=vla-bound
-
-  -fno-sanitize-recover=undefined
-  # Brunsli uses unaligned accesses to uint32_t, so alignment is just a warning.
-  -fsanitize-recover=alignment
-)
-# -fsanitize=function doesn't work on aarch64 and arm.
-if [[ "${BUILD_TARGET%%-*}" != "aarch64" &&
-    "${BUILD_TARGET%%-*}" != "arm" ]]; then
-  UBSAN_FLAGS+=(
-    -fsanitize=function
-  )
-fi
-if [[ "${BUILD_TARGET%%-*}" != "arm" ]]; then
-  UBSAN_FLAGS+=(
-    -fsanitize=signed-integer-overflow
-  )
-fi
-
-CLANG_TIDY_BIN_CANDIDATES=(
-  clang-tidy
-  clang-tidy-6.0
-  clang-tidy-7
-  clang-tidy-8
-  clang-tidy-9
-  clang-tidy-10
-  clang-tidy-11
-  clang-tidy-12
-  clang-tidy-13
-  clang-tidy-14
-  clang-tidy-15
-  clang-tidy-16
-  clang-tidy-17
-  clang-tidy-18
-)
-
-CLANG_TIDY_BIN=${CLANG_TIDY_BIN:-$(which ${CLANG_TIDY_BIN_CANDIDATES[@]} 2>/dev/null | tail -n 1)}
-# Default to "cat" if "colordiff" is not installed or if stdout is not a tty.
-if [[ -t 1 ]]; then
-  COLORDIFF_BIN=$(which colordiff cat 2>/dev/null | head -n 1)
-else
-  COLORDIFF_BIN="cat"
-fi
-FIND_BIN=$(which gfind find 2>/dev/null | head -n 1)
-# "false" will disable wine64 when not installed. This won't allow
-# cross-compiling.
-WINE_BIN=$(which wine64 false 2>/dev/null | head -n 1)
-
-CLANG_VERSION="${CLANG_VERSION:-}"
-# Detect the clang version suffix and store it in CLANG_VERSION. For example,
-# "6.0" for clang 6 or "7" for clang 7.
-detect_clang_version() {
-  if [[ -n "${CLANG_VERSION}" ]]; then
-    return 0
-  fi
-  local clang_version=$("${CC:-clang}" --version | head -n1)
-  clang_version=${clang_version#"Debian "}
-  clang_version=${clang_version#"Ubuntu "}
-  local llvm_tag
-  case "${clang_version}" in
-    "clang version 6."*)
-      CLANG_VERSION="6.0"
-      ;;
-    "clang version "*)
-      # Any other clang version uses just the major version number.
-      local suffix="${clang_version#clang version }"
-      CLANG_VERSION="${suffix%%.*}"
-      ;;
-    "emcc"*)
-      # We can't use asan or msan in the emcc case.
-      ;;
-    *)
-      echo "Unknown clang version: ${clang_version}" >&2
-      return 1
-  esac
-}
-
-# Temporary files cleanup hooks.
-CLEANUP_FILES=()
-cleanup() {
-  if [[ ${#CLEANUP_FILES[@]} -ne 0 ]]; then
-    rm -fr "${CLEANUP_FILES[@]}"
-  fi
-}
-
-# Executed on exit.
-on_exit() {
-  local retcode="$1"
-  # Always cleanup the CLEANUP_FILES.
-  cleanup
-}
-
-trap 'retcode=$?; { set +x; } 2>/dev/null; on_exit ${retcode}' INT TERM EXIT
-
-
-# These variables are populated when calling merge_request_commits().
-
-# The current hash at the top of the current branch or merge request branch (if
-# running from a merge request pipeline).
-MR_HEAD_SHA=""
-# The common ancestor between the current commit and the tracked branch, such
-# as main. This includes a list
-MR_ANCESTOR_SHA=""
-
-# Populate MR_HEAD_SHA and MR_ANCESTOR_SHA.
-merge_request_commits() {
-  { set +x; } 2>/dev/null
-  # GITHUB_SHA is the current reference being build in GitHub Actions.
-  if [[ -n "${GITHUB_SHA:-}" ]]; then
-    # GitHub normally does a checkout of a merge commit on a shallow repository
-    # by default. We want to get a bit more of the history to be able to diff
-    # changes on the Pull Request if needed. This fetches 10 more commits which
-    # should be enough given that PR normally should have 1 commit.
-    git -C "${MYDIR}" fetch -q origin "${GITHUB_SHA}" --depth 10
-    if [ "${GITHUB_EVENT_NAME}" = "pull_request" ]; then
-      MR_HEAD_SHA="$(git rev-parse "FETCH_HEAD^2" 2>/dev/null ||
-                   echo "${GITHUB_SHA}")"
-    else
-      MR_HEAD_SHA="${GITHUB_SHA}"
-    fi
-  else
-    MR_HEAD_SHA=$(git -C "${MYDIR}" rev-parse -q "HEAD")
-  fi
-
-  if [[ -n "${GITHUB_BASE_REF:-}" ]]; then
-    # Pull request workflow in GitHub Actions. GitHub checkout action uses
-    # "origin" as the remote for the git checkout.
-    git -C "${MYDIR}" fetch -q origin "${GITHUB_BASE_REF}"
-    MR_ANCESTOR_SHA=$(git -C "${MYDIR}" rev-parse -q FETCH_HEAD)
-  else
-    # We are in a local branch, not a pull request workflow.
-    MR_ANCESTOR_SHA=$(git -C "${MYDIR}" rev-parse -q HEAD@{upstream} || true)
-  fi
-
-  if [[ -z "${MR_ANCESTOR_SHA}" ]]; then
-    echo "Warning, not tracking any branch, using the last commit in HEAD.">&2
-    # This prints the return value with just HEAD.
-    MR_ANCESTOR_SHA=$(git -C "${MYDIR}" rev-parse -q "${MR_HEAD_SHA}^")
-  else
-    # GitHub runs the pipeline on a merge commit, no need to look for the common
-    # ancestor in that case.
-    if [[ -z "${GITHUB_BASE_REF:-}" ]]; then
-      MR_ANCESTOR_SHA=$(git -C "${MYDIR}" merge-base \
-        "${MR_ANCESTOR_SHA}" "${MR_HEAD_SHA}")
-    fi
-  fi
-  set -x
-}
-
-
-# Set up and export the environment variables needed by the child processes.
-export_env() {
-  if [[ "${BUILD_TARGET}" == *mingw32 ]]; then
-    # Wine needs to know the paths to the mingw dlls. These should be
-    # separated by ';'.
-    WINEPATH=$("${CC:-clang}" -print-search-dirs --target="${BUILD_TARGET}" \
-      | grep -F 'libraries: =' | cut -f 2- -d '=' | tr ':' ';')
-    # We also need our own libraries in the wine path.
-    local real_build_dir=$(realpath "${BUILD_DIR}")
-    # Some library .dll dependencies are installed in /bin:
-    export WINEPATH="${WINEPATH};${real_build_dir};${real_build_dir}/third_party/brotli;/usr/${BUILD_TARGET}/bin"
-
-    local prefix="${BUILD_DIR}/wineprefix"
-    mkdir -p "${prefix}"
-    export WINEPREFIX=$(realpath "${prefix}")
-  fi
-  # Sanitizers need these variables to print and properly format the stack
-  # traces:
-  LLVM_SYMBOLIZER=$("${CC:-clang}" -print-prog-name=llvm-symbolizer || true)
-  if [[ -n "${LLVM_SYMBOLIZER}" ]]; then
-    export ASAN_SYMBOLIZER_PATH="${LLVM_SYMBOLIZER}"
-    export MSAN_SYMBOLIZER_PATH="${LLVM_SYMBOLIZER}"
-    export UBSAN_SYMBOLIZER_PATH="${LLVM_SYMBOLIZER}"
-  fi
-}
-
-cmake_configure() {
-  export_env
-
-  if [[ "${STACK_SIZE:-0}" == 1 ]]; then
-    # Dump the stack size of each function in the .stack_sizes section for
-    # analysis.
-    CMAKE_C_FLAGS+=" -fstack-size-section"
-    CMAKE_CXX_FLAGS+=" -fstack-size-section"
-  fi
-
-  local args=(
-    -B"${BUILD_DIR}" -H"${MYDIR}"
-    -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
-    -G Ninja
-    -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS}"
-    -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS}"
-    -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_EXE_LINKER_FLAGS}"
-    -DCMAKE_MODULE_LINKER_FLAGS="${CMAKE_MODULE_LINKER_FLAGS}"
-    -DCMAKE_SHARED_LINKER_FLAGS="${CMAKE_SHARED_LINKER_FLAGS}"
-    -DJPEGXL_VERSION="${JPEGXL_VERSION}"
-    -DSANITIZER="${SANITIZER}"
-    # These are not enabled by default in cmake.
-    -DJPEGXL_ENABLE_VIEWERS=ON
-    -DJPEGXL_ENABLE_PLUGINS=ON
-    -DJPEGXL_ENABLE_DEVTOOLS=ON
-    # We always use libfuzzer in the ci.sh wrapper.
-    -DJPEGXL_FUZZER_LINK_FLAGS="-fsanitize=fuzzer"
-  )
-  if [[ "${BUILD_TARGET}" != *mingw32 ]]; then
-    args+=(
-      -DJPEGXL_WARNINGS_AS_ERRORS=ON
-    )
-  fi
-  if [[ -n "${BUILD_TARGET}" ]]; then
-    local system_name="Linux"
-    if [[ "${BUILD_TARGET}" == *mingw32 ]]; then
-      # When cross-compiling with mingw the target must be set to Windows and
-      # run programs with wine.
-      system_name="Windows"
-      args+=(
-        -DCMAKE_CROSSCOMPILING_EMULATOR="${WINE_BIN}"
-        # Normally CMake automatically defines MINGW=1 when building with the
-        # mingw compiler (x86_64-w64-mingw32-gcc) but we are normally compiling
-        # with clang.
-        -DMINGW=1
-      )
-    fi
-    # EMSCRIPTEN toolchain sets the right values itself
-    if [[ "${BUILD_TARGET}" != wasm* ]]; then
-      # If set, BUILD_TARGET must be the target triplet such as
-      # x86_64-unknown-linux-gnu.
-      args+=(
-        -DCMAKE_C_COMPILER_TARGET="${BUILD_TARGET}"
-        -DCMAKE_CXX_COMPILER_TARGET="${BUILD_TARGET}"
-        # Only the first element of the target triplet.
-        -DCMAKE_SYSTEM_PROCESSOR="${BUILD_TARGET%%-*}"
-        -DCMAKE_SYSTEM_NAME="${system_name}"
-        -DCMAKE_TOOLCHAIN_FILE="${CMAKE_TOOLCHAIN_FILE}"
-      )
-    else
-      args+=(
-        # sjpeg confuses WASM SIMD with SSE.
-        -DSJPEG_ENABLE_SIMD=OFF
-        # Building shared libs is not very useful for WASM.
-        -DBUILD_SHARED_LIBS=OFF
-      )
-    fi
-    args+=(
-      # These are needed to make googletest work when cross-compiling.
-      -DCMAKE_CROSSCOMPILING=1
-      -DHAVE_STD_REGEX=0
-      -DHAVE_POSIX_REGEX=0
-      -DHAVE_GNU_POSIX_REGEX=0
-      -DHAVE_STEADY_CLOCK=0
-      -DHAVE_THREAD_SAFETY_ATTRIBUTES=0
-    )
-    if [[ -z "${CMAKE_FIND_ROOT_PATH}" ]]; then
-      # find_package() will look in this prefix for libraries.
-      CMAKE_FIND_ROOT_PATH="/usr/${BUILD_TARGET}"
-    fi
-    if [[ -z "${CMAKE_PREFIX_PATH}" ]]; then
-      CMAKE_PREFIX_PATH="/usr/${BUILD_TARGET}"
-    fi
-    # Use pkg-config for the target. If there's no pkg-config available for the
-    # target we can set the PKG_CONFIG_PATH to the appropriate path in most
-    # linux distributions.
-    local pkg_config=$(which "${BUILD_TARGET}-pkg-config" || true)
-    if [[ -z "${pkg_config}" ]]; then
-      pkg_config=$(which pkg-config)
-      export PKG_CONFIG_LIBDIR="/usr/${BUILD_TARGET}/lib/pkgconfig"
-    fi
-    if [[ -n "${pkg_config}" ]]; then
-      args+=(-DPKG_CONFIG_EXECUTABLE="${pkg_config}")
-    fi
-  fi
-  if [[ -n "${CMAKE_CROSSCOMPILING_EMULATOR}" ]]; then
-    args+=(
-      -DCMAKE_CROSSCOMPILING_EMULATOR="${CMAKE_CROSSCOMPILING_EMULATOR}"
-    )
-  fi
-  if [[ -n "${CMAKE_FIND_ROOT_PATH}" ]]; then
-    args+=(
-      -DCMAKE_FIND_ROOT_PATH="${CMAKE_FIND_ROOT_PATH}"
-    )
-  fi
-  if [[ -n "${CMAKE_PREFIX_PATH}" ]]; then
-    args+=(
-      -DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}"
-    )
-  fi
-  if [[ -n "${CMAKE_C_COMPILER_LAUNCHER}" ]]; then
-    args+=(
-      -DCMAKE_C_COMPILER_LAUNCHER="${CMAKE_C_COMPILER_LAUNCHER}"
-    )
-  fi
-  if [[ -n "${CMAKE_CXX_COMPILER_LAUNCHER}" ]]; then
-    args+=(
-      -DCMAKE_CXX_COMPILER_LAUNCHER="${CMAKE_CXX_COMPILER_LAUNCHER}"
-    )
-  fi
-  if [[ -n "${CMAKE_MAKE_PROGRAM}" ]]; then
-    args+=(
-      -DCMAKE_MAKE_PROGRAM="${CMAKE_MAKE_PROGRAM}"
-    )
-  fi
-  if [[ "${BUILD_TARGET}" == wasm* ]]; then
-    emcmake cmake "${args[@]}" "$@"
-  else
-    cmake "${args[@]}" "$@"
-  fi
-}
-
-cmake_build_and_test() {
-  if [[ "${SKIP_BUILD}" -eq "1" ]]; then
-      return 0
-  fi
-  # gtest_discover_tests() runs the test binaries to discover the list of tests
-  # at build time, which fails under qemu.
-  ASAN_OPTIONS=detect_leaks=0 cmake --build "${BUILD_DIR}" -- $TARGETS
-  # Pack test binaries if requested.
-  if [[ "${PACK_TEST:-}" == "1" ]]; then
-    (cd "${BUILD_DIR}"
-     ${FIND_BIN} -name '*.cmake' -a '!' -path '*CMakeFiles*'
-     # gtest / gtest_main shared libs
-     ${FIND_BIN} lib/ -name 'libg*.so*'
-     ${FIND_BIN} -type d -name tests -a '!' -path '*CMakeFiles*'
-    ) | tar -C "${BUILD_DIR}" -cf "${BUILD_DIR}/tests.tar.xz" -T - \
-      --use-compress-program="xz --threads=$(nproc --all || echo 1) -6"
-    du -h "${BUILD_DIR}/tests.tar.xz"
-    # Pack coverage data if also available.
-    touch "${BUILD_DIR}/gcno.sentinel"
-    (cd "${BUILD_DIR}"; echo gcno.sentinel; ${FIND_BIN} -name '*gcno') | \
-      tar -C "${BUILD_DIR}" -cvf "${BUILD_DIR}/gcno.tar.xz" -T - \
-        --use-compress-program="xz --threads=$(nproc --all || echo 1) -6"
-  fi
-
-  if [[ "${SKIP_TEST}" -ne "1" ]]; then
-    (cd "${BUILD_DIR}"
-     export UBSAN_OPTIONS=print_stacktrace=1
-     [[ "${TEST_STACK_LIMIT}" == "none" ]] || ulimit -s "${TEST_STACK_LIMIT}"
-     ctest -j $(nproc --all || echo 1) ${TEST_SELECTOR} --output-on-failure)
-  fi
-}
-
-# Configure the build to strip unused functions. This considerably reduces the
-# output size, specially for tests which only use a small part of the whole
-# library.
-strip_dead_code() {
-  # Emscripten does tree shaking without any extra flags.
-  if [[ "${BUILD_TARGET}" == wasm* ]]; then
-    return 0
-  fi
-  # -ffunction-sections, -fdata-sections and -Wl,--gc-sections effectively
-  # discard all unreachable code, reducing the code size. For this to work, we
-  # need to also pass --no-export-dynamic to prevent it from exporting all the
-  # internal symbols (like functions) making them all reachable and thus not a
-  # candidate for removal.
-  CMAKE_CXX_FLAGS+=" -ffunction-sections -fdata-sections"
-  CMAKE_C_FLAGS+=" -ffunction-sections -fdata-sections"
-  if [[ "${OS}" == "Darwin" ]]; then
-    CMAKE_EXE_LINKER_FLAGS+=" -dead_strip"
-    CMAKE_SHARED_LINKER_FLAGS+=" -dead_strip"
-  else
-    CMAKE_EXE_LINKER_FLAGS+=" -Wl,--gc-sections -Wl,--no-export-dynamic"
-    CMAKE_SHARED_LINKER_FLAGS+=" -Wl,--gc-sections -Wl,--no-export-dynamic"
-  fi
-}
-
-### Externally visible commands
-
-cmd_debug() {
-  CMAKE_BUILD_TYPE="DebugOpt"
-  cmake_configure "$@"
-  cmake_build_and_test
-}
-
-cmd_release() {
-  CMAKE_BUILD_TYPE="Release"
-  strip_dead_code
-  cmake_configure "$@"
-  cmake_build_and_test
-}
-
-cmd_opt() {
-  CMAKE_BUILD_TYPE="RelWithDebInfo"
-  CMAKE_CXX_FLAGS+=" -DJXL_IS_DEBUG_BUILD"
-  cmake_configure "$@"
-  cmake_build_and_test
-}
-
-cmd_coverage() {
-  # -O0 prohibits stack space reuse -> causes stack-overflow on dozens of tests.
-  TEST_STACK_LIMIT="none"
-
-  cmd_release -DJPEGXL_ENABLE_COVERAGE=ON "$@"
-
-  if [[ "${SKIP_TEST}" -ne "1" ]]; then
-    # If we didn't run the test we also don't print a coverage report.
-    cmd_coverage_report
-  fi
-}
-
-cmd_coverage_report() {
-  LLVM_COV=$("${CC:-clang}" -print-prog-name=llvm-cov)
-  local real_build_dir=$(realpath "${BUILD_DIR}")
-  local gcovr_args=(
-    -r "${real_build_dir}"
-    --gcov-executable "${LLVM_COV} gcov"
-    # Only print coverage information for the libjxl directories. The rest
-    # is not part of the code under test.
-    --filter '.*jxl/.*'
-    --exclude '.*_gbench.cc'
-    --exclude '.*_test.cc'
-    --exclude '.*_testonly..*'
-    --exclude '.*_debug.*'
-    --exclude '.*test_utils..*'
-    --object-directory "${real_build_dir}"
-  )
-
-  (
-   cd "${real_build_dir}"
-    gcovr "${gcovr_args[@]}" --html --html-details \
-      --output="${real_build_dir}/coverage.html"
-    gcovr "${gcovr_args[@]}" --print-summary |
-      tee "${real_build_dir}/coverage.txt"
-    gcovr "${gcovr_args[@]}" --xml --output="${real_build_dir}/coverage.xml"
-  )
-}
-
-cmd_test() {
-  export_env
-  # Unpack tests if needed.
-  if [[ -e "${BUILD_DIR}/tests.tar.xz" && ! -d "${BUILD_DIR}/tests" ]]; then
-    tar -C "${BUILD_DIR}" -Jxvf "${BUILD_DIR}/tests.tar.xz"
-  fi
-  if [[ -e "${BUILD_DIR}/gcno.tar.xz" && ! -d "${BUILD_DIR}/gcno.sentinel" ]]; then
-    tar -C "${BUILD_DIR}" -Jxvf "${BUILD_DIR}/gcno.tar.xz"
-  fi
-  (cd "${BUILD_DIR}"
-   export UBSAN_OPTIONS=print_stacktrace=1
-   [[ "${TEST_STACK_LIMIT}" == "none" ]] || ulimit -s "${TEST_STACK_LIMIT}"
-   ctest -j $(nproc --all || echo 1) ${TEST_SELECTOR} --output-on-failure "$@")
-}
-
-cmd_gbench() {
-  export_env
-  (cd "${BUILD_DIR}"
-   export UBSAN_OPTIONS=print_stacktrace=1
-   lib/jxl_gbench \
-     --benchmark_counters_tabular=true \
-     --benchmark_out_format=json \
-     --benchmark_out=gbench.json "$@"
-  )
-}
-
-cmd_asanfuzz() {
-  CMAKE_CXX_FLAGS+=" -fsanitize=fuzzer-no-link -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION=1"
-  CMAKE_C_FLAGS+=" -fsanitize=fuzzer-no-link -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION=1"
-  cmd_asan -DJPEGXL_ENABLE_FUZZERS=ON "$@"
-}
-
-cmd_msanfuzz() {
-  # Install msan if needed before changing the flags.
-  detect_clang_version
-  local msan_prefix="${HOME}/.msan/${CLANG_VERSION}"
-  # TODO(eustas): why libc++abi.a is bad?
-  if [[ ! -d "${msan_prefix}" || -e "${msan_prefix}/lib/libc++abi.a" ]]; then
-    # Install msan libraries for this version if needed or if an older version
-    # with libc++abi was installed.
-    cmd_msan_install
-  fi
-
-  CMAKE_CXX_FLAGS+=" -fsanitize=fuzzer-no-link -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION=1"
-  CMAKE_C_FLAGS+=" -fsanitize=fuzzer-no-link -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION=1"
-  cmd_msan -DJPEGXL_ENABLE_FUZZERS=ON "$@"
-}
-
-cmd_asan() {
-  SANITIZER="asan"
-  CMAKE_C_FLAGS+=" -g -DADDRESS_SANITIZER \
-    -fsanitize=address ${UBSAN_FLAGS[@]}"
-  CMAKE_CXX_FLAGS+=" -g -DADDRESS_SANITIZER \
-    -fsanitize=address ${UBSAN_FLAGS[@]}"
-  strip_dead_code
-  cmake_configure "$@" -DJPEGXL_ENABLE_TCMALLOC=OFF
-  cmake_build_and_test
-}
-
-cmd_tsan() {
-  SANITIZER="tsan"
-  local tsan_args=(
-    -g
-    -DTHREAD_SANITIZER
-    -fsanitize=thread
-  )
-  CMAKE_C_FLAGS+=" ${tsan_args[@]}"
-  CMAKE_CXX_FLAGS+=" ${tsan_args[@]}"
-
-  cmake_configure "$@" -DJPEGXL_ENABLE_TCMALLOC=OFF
-  cmake_build_and_test
-}
-
-cmd_msan() {
-  SANITIZER="msan"
-  detect_clang_version
-  local msan_prefix="${HOME}/.msan/${CLANG_VERSION}"
-  if [[ ! -d "${msan_prefix}" || -e "${msan_prefix}/lib/libc++abi.a" ]]; then
-    # Install msan libraries for this version if needed or if an older version
-    # with libc++abi was installed.
-    cmd_msan_install
-  fi
-
-  local msan_c_flags=(
-    -fsanitize=memory
-    -fno-omit-frame-pointer
-
-    -g
-    -DMEMORY_SANITIZER
-
-    # Force gtest to not use the cxxbai.
-    -DGTEST_HAS_CXXABI_H_=0
-  )
-  if [[ "${FASTER_MSAN_BUILD}" -ne "1" ]]; then
-    msan_c_flags=(
-      "${msan_c_flags[@]}"
-      -fsanitize-memory-track-origins
-    )
-  fi
-
-  local msan_cxx_flags=(
-    "${msan_c_flags[@]}"
-
-    # Some C++ sources don't use the std at all, so the -stdlib=libc++ is unused
-    # in those cases. Ignore the warning.
-    -Wno-unused-command-line-argument
-    -stdlib=libc++
-
-    # We include the libc++ from the msan directory instead, so we don't want
-    # the std includes.
-    -nostdinc++
-    -cxx-isystem"${msan_prefix}/include/c++/v1"
-  )
-
-  local msan_linker_flags=(
-    -L"${msan_prefix}"/lib
-    -Wl,-rpath -Wl,"${msan_prefix}"/lib/
-  )
-
-  CMAKE_C_FLAGS+=" ${msan_c_flags[@]}"
-  CMAKE_CXX_FLAGS+=" ${msan_cxx_flags[@]}"
-  CMAKE_EXE_LINKER_FLAGS+=" ${msan_linker_flags[@]}"
-  CMAKE_MODULE_LINKER_FLAGS+=" ${msan_linker_flags[@]}"
-  CMAKE_SHARED_LINKER_FLAGS+=" ${msan_linker_flags[@]}"
-  strip_dead_code
-
-  # MSAN share of stack size is non-negligible.
-  TEST_STACK_LIMIT="none"
-
-  # TODO(eustas): investigate why fuzzers do not link when MSAN libc++ is used
-  cmake_configure "$@" \
-    -DCMAKE_CROSSCOMPILING=1 -DRUN_HAVE_STD_REGEX=0 -DRUN_HAVE_POSIX_REGEX=0 \
-    -DJPEGXL_ENABLE_TCMALLOC=OFF -DJPEGXL_WARNINGS_AS_ERRORS=OFF \
-    -DCMAKE_REQUIRED_LINK_OPTIONS="${msan_linker_flags[@]}" \
-    -DJPEGXL_ENABLE_FUZZERS=OFF
-  cmake_build_and_test
-}
-
-# Install libc++ libraries compiled with msan in the msan_prefix for the current
-# compiler version.
-cmd_msan_install() {
-  local tmpdir=$(mktemp -d)
-  CLEANUP_FILES+=("${tmpdir}")
-  local msan_root="${HOME}/.msan"
-  mkdir -p "${msan_root}"
-  # Detect the llvm to install:
-  export CC="${CC:-clang}"
-  export CXX="${CXX:-clang++}"
-  detect_clang_version
-  # Allow overriding the LLVM checkout.
-  local llvm_root="${LLVM_ROOT:-}"
-  if [ -z "${llvm_root}" ]; then
-    declare -A llvm_tag_by_version=(
-      ["6.0"]="6.0.1"
-      ["7"]="7.1.0"
-      ["8"]="8.0.1"
-      ["9"]="9.0.2"
-      ["10"]="10.0.1"
-      ["11"]="11.1.0"
-      ["12"]="12.0.1"
-      ["13"]="13.0.1"
-      ["14"]="14.0.6"
-      ["15"]="15.0.7"
-      ["16"]="16.0.6"
-      ["17"]="17.0.6"
-      ["18"]="18.1.6"
-    ) 
-    local llvm_tag="${CLANG_VERSION}.0.0"
-    if [[ -n "${llvm_tag_by_version["${CLANG_VERSION}"]}" ]]; then
-      llvm_tag=${llvm_tag_by_version["${CLANG_VERSION}"]}
-    fi
-    llvm_tag="llvmorg-${llvm_tag}"
-    local llvm_targz="${msan_root}/${llvm_tag}.tar.gz"
-    if [ ! -f "${llvm_targz}" ]; then
-      curl -L --show-error -o "${llvm_targz}" \
-        "https://github.com/llvm/llvm-project/archive/${llvm_tag}.tar.gz"
-    fi
-    tar -C "${tmpdir}" -zxf "${llvm_targz}"
-    llvm_root="${tmpdir}/llvm-project-${llvm_tag}"
-  fi
-
-  local msan_prefix="${msan_root}/${CLANG_VERSION}"
-  rm -rf "${msan_prefix}"
-
-  local TARGET_OPTS=""
-  if [[ -n "${BUILD_TARGET}" ]]; then
-    TARGET_OPTS=" \
-      -DCMAKE_C_COMPILER_TARGET=\"${BUILD_TARGET}\" \
-      -DCMAKE_CXX_COMPILER_TARGET=\"${BUILD_TARGET}\" \
-      -DCMAKE_SYSTEM_PROCESSOR=\"${BUILD_TARGET%%-*}\" \
-    "
-  fi
-
-  local build_dir="${tmpdir}/build-llvm"
-  mkdir -p "${build_dir}"
-  cd ${llvm_root}
-  cmake -B"${build_dir}" \
-    -G Ninja \
-    -S runtimes \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DLLVM_USE_SANITIZER=Memory \
-    -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind;compiler-rt" \
-    -DLIBCXXABI_ENABLE_SHARED=ON \
-    -DLIBCXXABI_ENABLE_STATIC=OFF \
-    -DLIBCXX_ENABLE_SHARED=ON \
-    -DLIBCXX_ENABLE_STATIC=OFF \
-    -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS}" \
-    -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS}" \
-    -DCMAKE_EXE_LINKER_FLAGS="${CMAKE_EXE_LINKER_FLAGS}" \
-    -DCMAKE_SHARED_LINKER_FLAGS="${CMAKE_SHARED_LINKER_FLAGS}" \
-    -DCMAKE_INSTALL_PREFIX="${msan_prefix}" \
-    -DLLVM_PATH="${llvm_root}/llvm" \
-    -DLLVM_CONFIG_PATH="$(which llvm-config-${CLANG_VERSION} llvm-config | head -n1)" \
-     ${TARGET_OPTS}
-  cmake --build "${build_dir}"
-  ninja -C "${build_dir}" install
-}
-
-# Internal build step shared between all cmd_ossfuzz_* commands.
-_cmd_ossfuzz() {
-  local sanitizer="$1"
-  shift
-  mkdir -p "${BUILD_DIR}"
-  local real_build_dir=$(realpath "${BUILD_DIR}")
-
-  # oss-fuzz defines three directories:
-  # * /work, with the working directory to do re-builds
-  # * /src, with the source code to build
-  # * /out, with the output directory where to copy over the built files.
-  # We use $BUILD_DIR as the /work and the script directory as the /src. The
-  # /out directory is ignored as developers are used to look for the fuzzers in
-  # $BUILD_DIR/tools/ directly.
-
-  if [[ "${sanitizer}" = "memory" && ! -d "${BUILD_DIR}/msan" ]]; then
-    sudo docker run --rm -i \
-      --user $(id -u):$(id -g) \
-      -v "${real_build_dir}":/work \
-      gcr.io/oss-fuzz-base/msan-libs-builder \
-      bash -c "cp -r /msan /work"
-  fi
-
-  # Args passed to ninja. These will be evaluated as a string separated by
-  # spaces.
-  local jpegxl_extra_args="$@"
-
-  sudo docker run --rm -i \
-    -e JPEGXL_UID=$(id -u) \
-    -e JPEGXL_GID=$(id -g) \
-    -e FUZZING_ENGINE="${FUZZING_ENGINE:-libfuzzer}" \
-    -e SANITIZER="${sanitizer}" \
-    -e ARCHITECTURE=x86_64 \
-    -e FUZZING_LANGUAGE=c++ \
-    -e MSAN_LIBS_PATH="/work/msan" \
-    -e JPEGXL_EXTRA_ARGS="${jpegxl_extra_args}" \
-    -v "${MYDIR}":/src/libjxl \
-    -v "${MYDIR}/tools/scripts/ossfuzz-build.sh":/src/build.sh \
-    -v "${real_build_dir}":/work \
-    gcr.io/oss-fuzz/libjxl
-}
-
-cmd_ossfuzz_asan() {
-  _cmd_ossfuzz address "$@"
-}
-cmd_ossfuzz_msan() {
-  _cmd_ossfuzz memory "$@"
-}
-cmd_ossfuzz_ubsan() {
-  _cmd_ossfuzz undefined "$@"
-}
-
-cmd_ossfuzz_ninja() {
-  [[ -e "${BUILD_DIR}/build.ninja" ]]
-  local real_build_dir=$(realpath "${BUILD_DIR}")
-
-  if [[ -e "${BUILD_DIR}/msan" ]]; then
-    echo "ossfuzz_ninja doesn't work with msan builds. Use ossfuzz_msan." >&2
-    exit 1
-  fi
-
-  sudo docker run --rm -i \
-    --user $(id -u):$(id -g) \
-    -v "${MYDIR}":/src/libjxl \
-    -v "${real_build_dir}":/work \
-    gcr.io/oss-fuzz/libjxl \
-    ninja -C /work "$@"
-}
-
-cmd_fast_benchmark() {
-  local small_corpus_tar="${BENCHMARK_CORPORA}/jyrki-full.tar"
-  local small_corpus_url="https://storage.googleapis.com/artifacts.jpegxl.appspot.com/corpora/jyrki-full.tar"
-  mkdir -p "${BENCHMARK_CORPORA}"
-  if [ -f "${small_corpus_tar}" ]; then
-    curl --show-error -o "${small_corpus_tar}" -z "${small_corpus_tar}" "${small_corpus_url}"
-  else
-    curl --show-error -o "${small_corpus_tar}" "${small_corpus_url}"
-  fi
-
-  local tmpdir=$(mktemp -d)
-  CLEANUP_FILES+=("${tmpdir}")
-  tar -xf "${small_corpus_tar}" -C "${tmpdir}"
-
-  run_benchmark "${tmpdir}" 1048576
-}
-
-cmd_benchmark() {
-  local nikon_corpus_tar="${BENCHMARK_CORPORA}/nikon-subset.tar"
-  mkdir -p "${BENCHMARK_CORPORA}"
-  curl --show-error -o "${nikon_corpus_tar}" -z "${nikon_corpus_tar}" \
-    "https://storage.googleapis.com/artifacts.jpegxl.appspot.com/corpora/nikon-subset.tar"
-
-  local tmpdir=$(mktemp -d)
-  CLEANUP_FILES+=("${tmpdir}")
-  tar -xvf "${nikon_corpus_tar}" -C "${tmpdir}"
-
-  local sem_id="jpegxl_benchmark-$$"
-  local nprocs=$(nproc --all || echo 1)
-  images=()
-  local filename
-  while IFS= read -r filename; do
-    # This removes the './'
-    filename="${filename:2}"
-    local mode
-    if [[ "${filename:0:4}" == "srgb" ]]; then
-      mode="RGB_D65_SRG_Rel_SRG"
-    elif [[ "${filename:0:5}" == "adobe" ]]; then
-      mode="RGB_D65_Ado_Rel_Ado"
-    else
-      echo "Unknown image colorspace: ${filename}" >&2
-      exit 1
-    fi
-    png_filename="${filename%.ppm}.png"
-    png_filename=$(echo "${png_filename}" | tr '/' '_')
-    sem --bg --id "${sem_id}" -j"${nprocs}" -- \
-      "${TOOLS_DIR}/decode_and_encode" \
-        "${tmpdir}/${filename}" "${mode}" "${tmpdir}/${png_filename}"
-    images+=( "${png_filename}" )
-  done < <(cd "${tmpdir}"; ${FIND_BIN} . -name '*.ppm' -type f)
-  sem --id "${sem_id}" --wait
-
-  # We need about 10 GiB per thread on these images.
-  run_benchmark "${tmpdir}" 10485760
-}
-
-get_mem_available() {
-  if [[ "${OS}" == "Darwin" ]]; then
-    echo $(vm_stat | grep -F 'Pages free:' | awk '{print $3 * 4}')
-  elif [[ "${OS}" == MINGW* ]]; then
-    echo $(vmstat | tail -n 1 | awk '{print $4 * 4}')
-  else
-    echo $(grep -F MemAvailable: /proc/meminfo | awk '{print $2}')
-  fi
-}
-
-run_benchmark() {
-  local src_img_dir="$1"
-  local mem_per_thread="${2:-10485760}"
-
-  local output_dir="${BUILD_DIR}/benchmark_results"
-  mkdir -p "${output_dir}"
-
-  if [[ "${OS}" == MINGW* ]]; then
-    src_img_dir=`cygpath -w "${src_img_dir}"`
-  fi
-
-  local num_threads=1
-  if [[ ${BENCHMARK_NUM_THREADS} -gt 0 ]]; then
-    num_threads=${BENCHMARK_NUM_THREADS}
-  else
-    # The memory available at the beginning of the benchmark run in kB. The number
-    # of threads depends on the available memory, and the passed memory per
-    # thread. We also add a 2 GiB of constant memory.
-    local mem_available="$(get_mem_available)"
-    # Check that we actually have a MemAvailable value.
-    [[ -n "${mem_available}" ]]
-    num_threads=$(( (${mem_available} - 1048576) / ${mem_per_thread} ))
-    if [[ ${num_threads} -le 0 ]]; then
-      num_threads=1
-    fi
-  fi
-
-  local benchmark_args=(
-    --input "${src_img_dir}/*.png"
-    --codec=jpeg:yuv420:q85,webp:q80,jxl:d1:6,jxl:d1:6:downsampling=8,jxl:d5:6,jxl:d5:6:downsampling=8,jxl:m:d0:2,jxl:m:d0:3,jxl:m:d2:2
-    --output_dir "${output_dir}"
-    --show_progress
-    --num_threads="${num_threads}"
-    --decode_reps=11
-    --encode_reps=11
-  )
-  if [[ "${STORE_IMAGES}" == "1" ]]; then
-    benchmark_args+=(--save_decompressed --save_compressed)
-  fi
-  (
-    [[ "${TEST_STACK_LIMIT}" == "none" ]] || ulimit -s "${TEST_STACK_LIMIT}"
-    "${TOOLS_DIR}/benchmark_xl" "${benchmark_args[@]}" | \
-       tee "${output_dir}/results.txt"
-
-    # Check error code for benchmark_xl command. This will exit if not.
-    return ${PIPESTATUS[0]}
-  )
-}
-
-# Helper function to wait for the CPU temperature to cool down on ARM.
-wait_for_temp() {
-  { set +x; } 2>/dev/null
-  local temp_limit=${1:-38000}
-  if [[ -z "${THERMAL_FILE:-}" ]]; then
-    echo "Must define the THERMAL_FILE with the thermal_zoneX/temp file" \
-      "to read the temperature from. This is normally set in the runner." >&2
-    exit 1
-  fi
-  local org_temp=$(cat "${THERMAL_FILE}")
-  if [[ "${org_temp}" -ge "${temp_limit}" ]]; then
-    echo -n "Waiting for temp to get down from ${org_temp}... "
-  fi
-  local temp="${org_temp}"
-  local secs=0
-  while [[ "${temp}" -ge "${temp_limit}" ]]; do
-    sleep 1
-    temp=$(cat "${THERMAL_FILE}")
-    echo -n "${temp} "
-    secs=$((secs + 1))
-    if [[ ${secs} -ge 5 ]]; then
-      break
-    fi
-  done
-  if [[ "${org_temp}" -ge "${temp_limit}" ]]; then
-    echo "Done, temp=${temp}"
-  fi
-  set -x
-}
-
-# Helper function to set the cpuset restriction of the current process.
-cmd_cpuset() {
-  [[ "${SKIP_CPUSET:-}" != "1" ]] || return 0
-  local newset="$1"
-  local mycpuset=$(cat /proc/self/cpuset)
-  mycpuset="/dev/cpuset${mycpuset}"
-  # Check that the directory exists:
-  [[ -d "${mycpuset}" ]]
-  if [[ -e "${mycpuset}/cpuset.cpus" ]]; then
-    echo "${newset}" >"${mycpuset}/cpuset.cpus"
-  else
-    echo "${newset}" >"${mycpuset}/cpus"
-  fi
-}
-
-# Return the encoding/decoding speed from the Stats output.
-_speed_from_output() {
-  local speed="$1"
-  local unit="${2:-MP/s}"
-  if [[ "${speed}" == *"${unit}"* ]]; then
-    speed="${speed%% ${unit}*}"
-    speed="${speed##* }"
-    echo "${speed}"
-  fi
-}
-
-
-# Run benchmarks on ARM for the big and little CPUs.
-cmd_arm_benchmark() {
-  # Flags used for cjxl encoder with .png inputs
-  local jxl_png_benchmarks=(
-    # Lossy options:
-    "--epf=0 --distance=1.0 --speed=cheetah"
-    "--epf=2 --distance=1.0 --speed=cheetah"
-    "--epf=0 --distance=8.0 --speed=cheetah"
-    "--epf=1 --distance=8.0 --speed=cheetah"
-    "--epf=2 --distance=8.0 --speed=cheetah"
-    "--epf=3 --distance=8.0 --speed=cheetah"
-    "--modular -Q 90"
-    "--modular -Q 50"
-    # Lossless options:
-    "--modular"
-    "--modular -E 0 -I 0"
-    "--modular -P 5"
-    "--modular --responsive=1"
-    # Near-lossless options:
-    "--epf=0 --distance=0.3 --speed=fast"
-    "--modular -Q 97"
-  )
-
-  # Flags used for cjxl encoder with .jpg inputs. These should do lossless
-  # JPEG recompression (of pixels or full jpeg).
-  local jxl_jpeg_benchmarks=(
-    "--num_reps=3"
-  )
-
-  local images=(
-    "testdata/jxl/flower/flower.png"
-  )
-
-  local jpg_images=(
-    "testdata/jxl/flower/flower.png.im_q85_420.jpg"
-  )
-
-  if [[ "${SKIP_CPUSET:-}" == "1" ]]; then
-    # Use a single cpu config in this case.
-    local cpu_confs=("?")
-  else
-    # Otherwise the CPU config comes from the environment:
-    local cpu_confs=(
-      "${RUNNER_CPU_LITTLE}"
-      "${RUNNER_CPU_BIG}"
-      # The CPU description is something like 3-7, so these configurations only
-      # take the first CPU of the group.
-      "${RUNNER_CPU_LITTLE%%-*}"
-      "${RUNNER_CPU_BIG%%-*}"
-    )
-    # Check that RUNNER_CPU_ALL is defined. In the SKIP_CPUSET=1 case this will
-    # be ignored but still evaluated when calling cmd_cpuset.
-    [[ -n "${RUNNER_CPU_ALL}" ]]
-  fi
-
-  local jpg_dirname="third_party/corpora/jpeg"
-  mkdir -p "${jpg_dirname}"
-  local jpg_qualities=( 50 80 95 )
-  for src_img in "${images[@]}"; do
-    for q in "${jpg_qualities[@]}"; do
-      local jpeg_name="${jpg_dirname}/"$(basename "${src_img}" .png)"-q${q}.jpg"
-      convert -sampling-factor 1x1 -quality "${q}" \
-        "${src_img}" "${jpeg_name}"
-      jpg_images+=("${jpeg_name}")
-    done
-  done
-
-  local output_dir="${BUILD_DIR}/benchmark_results"
-  mkdir -p "${output_dir}"
-  local runs_file="${output_dir}/runs.txt"
-
-  if [[ ! -e "${runs_file}" ]]; then
-    echo -e "binary\tflags\tsrc_img\tsrc size\tsrc pixels\tcpuset\tenc size (B)\tenc speed (MP/s)\tdec speed (MP/s)\tJPG dec speed (MP/s)\tJPG dec speed (MB/s)" |
-      tee -a "${runs_file}"
-  fi
-
-  mkdir -p "${BUILD_DIR}/arm_benchmark"
-  local flags
-  local src_img
-  for src_img in "${jpg_images[@]}" "${images[@]}"; do
-    local src_img_hash=$(sha1sum "${src_img}" | cut -f 1 -d ' ')
-    local enc_binaries=("${TOOLS_DIR}/cjxl")
-    local src_ext="${src_img##*.}"
-    for enc_binary in "${enc_binaries[@]}"; do
-      local enc_binary_base=$(basename "${enc_binary}")
-
-      # Select the list of flags to use for the current encoder/image pair.
-      local img_benchmarks
-      if [[ "${src_ext}" == "jpg" ]]; then
-        img_benchmarks=("${jxl_jpeg_benchmarks[@]}")
-      else
-        img_benchmarks=("${jxl_png_benchmarks[@]}")
-      fi
-
-      for flags in "${img_benchmarks[@]}"; do
-        # Encoding step.
-        local enc_file_hash="${enc_binary_base} || $flags || ${src_img} || ${src_img_hash}"
-        enc_file_hash=$(echo "${enc_file_hash}" | sha1sum | cut -f 1 -d ' ')
-        local enc_file="${BUILD_DIR}/arm_benchmark/${enc_file_hash}.jxl"
-
-        for cpu_conf in "${cpu_confs[@]}"; do
-          cmd_cpuset "${cpu_conf}"
-          # nproc returns the number of active CPUs, which is given by the cpuset
-          # mask.
-          local num_threads="$(nproc)"
-
-          echo "Encoding with: ${enc_binary_base} img=${src_img} cpus=${cpu_conf} enc_flags=${flags}"
-          local enc_output
-          if [[ "${flags}" == *"modular"* ]]; then
-            # We don't benchmark encoding speed in this case.
-            if [[ ! -f "${enc_file}" ]]; then
-              cmd_cpuset "${RUNNER_CPU_ALL:-}"
-              "${enc_binary}" ${flags} "${src_img}" "${enc_file}.tmp"
-              mv "${enc_file}.tmp" "${enc_file}"
-              cmd_cpuset "${cpu_conf}"
-            fi
-            enc_output=" ?? MP/s"
-          else
-            wait_for_temp
-            enc_output=$("${enc_binary}" ${flags} "${src_img}" "${enc_file}.tmp" \
-              2>&1 | tee /dev/stderr | grep -F "MP/s [")
-            mv "${enc_file}.tmp" "${enc_file}"
-          fi
-          local enc_speed=$(_speed_from_output "${enc_output}")
-          local enc_size=$(stat -c "%s" "${enc_file}")
-
-          echo "Decoding with: img=${src_img} cpus=${cpu_conf} enc_flags=${flags}"
-
-          local dec_output
-          wait_for_temp
-          dec_output=$("${TOOLS_DIR}/djxl" "${enc_file}" \
-            --num_reps=5 --num_threads="${num_threads}" 2>&1 | tee /dev/stderr |
-            grep -E "M[BP]/s \[")
-          local img_size=$(echo "${dec_output}" | cut -f 1 -d ',')
-          local img_size_x=$(echo "${img_size}" | cut -f 1 -d ' ')
-          local img_size_y=$(echo "${img_size}" | cut -f 3 -d ' ')
-          local img_size_px=$(( ${img_size_x} * ${img_size_y} ))
-          local dec_speed=$(_speed_from_output "${dec_output}")
-
-          # For JPEG lossless recompression modes (where the original is a JPEG)
-          # decode to JPG as well.
-          local jpeg_dec_mps_speed=""
-          local jpeg_dec_mbs_speed=""
-          if [[ "${src_ext}" == "jpg" ]]; then
-            wait_for_temp
-            local dec_file="${BUILD_DIR}/arm_benchmark/${enc_file_hash}.jpg"
-            dec_output=$("${TOOLS_DIR}/djxl" "${enc_file}" \
-              "${dec_file}" --num_reps=5 --num_threads="${num_threads}" 2>&1 | \
-                tee /dev/stderr | grep -E "M[BP]/s \[")
-            local jpeg_dec_mps_speed=$(_speed_from_output "${dec_output}")
-            local jpeg_dec_mbs_speed=$(_speed_from_output "${dec_output}" MB/s)
-            if ! cmp --quiet "${src_img}" "${dec_file}"; then
-              # Add a start at the end to signal that the files are different.
-              jpeg_dec_mbs_speed+="*"
-            fi
-          fi
-
-          # Record entry in a tab-separated file.
-          local src_img_base=$(basename "${src_img}")
-          echo -e "${enc_binary_base}\t${flags}\t${src_img_base}\t${img_size}\t${img_size_px}\t${cpu_conf}\t${enc_size}\t${enc_speed}\t${dec_speed}\t${jpeg_dec_mps_speed}\t${jpeg_dec_mbs_speed}" |
-            tee -a "${runs_file}"
-        done
-      done
-    done
-  done
-  cmd_cpuset "${RUNNER_CPU_ALL:-}"
-  cat "${runs_file}"
-
-}
-
-# Generate a corpus and run the fuzzer on that corpus.
-cmd_fuzz() {
-  local corpus_dir=$(realpath "${BUILD_DIR}/fuzzer_corpus")
-  local fuzzer_crash_dir=$(realpath "${BUILD_DIR}/fuzzer_crash")
-  mkdir -p "${corpus_dir}" "${fuzzer_crash_dir}"
-  # Generate step.
-  "${TOOLS_DIR}/fuzzer_corpus" "${corpus_dir}"
-  # Run step:
-  local nprocs=$(nproc --all || echo 1)
-  (
-   cd "${TOOLS_DIR}"
-   djxl_fuzzer "${fuzzer_crash_dir}" "${corpus_dir}" \
-     -max_total_time="${FUZZER_MAX_TIME}" -jobs=${nprocs} \
-     -artifact_prefix="${fuzzer_crash_dir}/"
-  )
-}
-
-# Runs the linters (clang-format, build_cleaner, buildirier) on the pending CLs.
-cmd_lint() {
-  merge_request_commits
-  { set +x; } 2>/dev/null
-  local versions=(${1:-16 15 14 13 12 11 10 9 8 7 6.0})
-  local clang_format_bins=("${versions[@]/#/clang-format-}" clang-format)
-  local tmpdir=$(mktemp -d)
-  CLEANUP_FILES+=("${tmpdir}")
-
-  local ret=0
-  local build_patch="${tmpdir}/build_cleaner.patch"
-  if ! "${MYDIR}/tools/scripts/build_cleaner.py" >"${build_patch}"; then
-    ret=1
-    echo "build_cleaner.py findings:" >&2
-    "${COLORDIFF_BIN}" <"${build_patch}"
-    echo "Run \`tools/scripts/build_cleaner.py --update\` to apply them" >&2
-  fi
-
-  # It is ok, if buildifier is not installed.
-  if which buildifier >/dev/null; then
-    local buildifier_patch="${tmpdir}/buildifier.patch"
-    local bazel_files=`git -C "${MYDIR}" ls-files | grep -E "/BUILD$|WORKSPACE|.bzl$"`
-    set -x
-    buildifier -d ${bazel_files} >"${buildifier_patch}"|| true
-    { set +x; } 2>/dev/null
-    if [ -s "${buildifier_patch}" ]; then
-      ret=1
-      echo 'buildifier have found some problems in Bazel build files:' >&2
-      "${COLORDIFF_BIN}" <"${buildifier_patch}"
-      echo 'To fix them run (from the base directory):' >&2
-      echo '  buildifier `git ls-files | grep -E "/BUILD$|WORKSPACE|.bzl$"`' >&2
-    fi
-  fi
-
-  # It is ok, if spell-checker is not installed.
-  if which typos >/dev/null; then
-    local src_ext="bazel|bzl|c|cc|cmake|gni|h|html|in|java|js|m|md|nix|py|rst|sh|ts|txt|yaml|yml"
-    local sources=`git -C "${MYDIR}" ls-files | grep -E "\.(${src_ext})$"`
-    typos -c "${MYDIR}/tools/scripts/typos.toml" ${sources}
-  else
-    echo "Consider installing https://github.com/crate-ci/typos for spell-checking"
-  fi
-
-  local installed=()
-  local clang_patch
-  local clang_format
-  for clang_format in "${clang_format_bins[@]}"; do
-    if ! which "${clang_format}" >/dev/null; then
-      continue
-    fi
-    installed+=("${clang_format}")
-    local tmppatch="${tmpdir}/${clang_format}.patch"
-    # We include in this linter all the changes including the uncommitted changes
-    # to avoid printing changes already applied.
-    set -x
-    # Ignoring the error that git-clang-format outputs.
-    git -C "${MYDIR}" "${clang_format}" --binary "${clang_format}" \
-      --style=file --diff "${MR_ANCESTOR_SHA}" -- >"${tmppatch}" || true
-    { set +x; } 2>/dev/null
-    if grep -E '^--- ' "${tmppatch}" | grep -v 'a/third_party' >/dev/null; then
-      if [[ -n "${LINT_OUTPUT:-}" ]]; then
-        cp "${tmppatch}" "${LINT_OUTPUT}"
-      fi
-      clang_patch="${tmppatch}"
-    else
-      echo "clang-format check OK" >&2
-      return ${ret}
-    fi
-  done
-
-  if [[ ${#installed[@]} -eq 0 ]]; then
-    echo "You must install clang-format for \"git clang-format\"" >&2
-    exit 1
-  fi
-
-  # clang-format is installed but found problems.
-  echo "clang-format findings:" >&2
-  "${COLORDIFF_BIN}" < "${clang_patch}"
-
-  echo "clang-format found issues in your patches from ${MR_ANCESTOR_SHA}" \
-    "to the current patch. Run \`./ci.sh lint | patch -p1\` from the base" \
-    "directory to apply them." >&2
-  exit 1
-}
-
-# Runs clang-tidy on the pending CLs. If the "all" argument is passed it runs
-# clang-tidy over all the source files instead.
-cmd_tidy() {
-  local what="${1:-}"
-
-  if [[ -z "${CLANG_TIDY_BIN}" ]]; then
-    echo "ERROR: You must install clang-tidy-7 or newer to use ci.sh tidy" >&2
-    exit 1
-  fi
-
-  local git_args=()
-  if [[ "${what}" == "all" ]]; then
-    git_args=(ls-files)
-    shift
-  else
-    merge_request_commits
-    git_args=(
-        diff-tree --no-commit-id --name-only -r "${MR_ANCESTOR_SHA}"
-        "${MR_HEAD_SHA}"
-    )
-  fi
-
-  # Clang-tidy needs the compilation database generated by cmake.
-  if [[ ! -e "${BUILD_DIR}/compile_commands.json" ]]; then
-    # Generate the build options in debug mode, since we need the debug asserts
-    # enabled for the clang-tidy analyzer to use them.
-    CMAKE_BUILD_TYPE="Debug"
-    cmake_configure
-    # Build the autogen targets to generate the .h files from the .ui files.
-    local autogen_targets=(
-        $(ninja -C "${BUILD_DIR}" -t targets | grep -F _autogen: |
-          cut -f 1 -d :)
-    )
-    if [[ ${#autogen_targets[@]} != 0 ]]; then
-      ninja -C "${BUILD_DIR}" "${autogen_targets[@]}"
-    fi
-  fi
-
-  cd "${MYDIR}"
-  local nprocs=$(nproc --all || echo 1)
-  local ret=0
-  if ! parallel -j"${nprocs}" --keep-order -- \
-      "${CLANG_TIDY_BIN}" -p "${BUILD_DIR}" -format-style=file -quiet "$@" {} \
-      < <(git "${git_args[@]}" | grep -E '(\.cc|\.cpp)$') \
-      >"${BUILD_DIR}/clang-tidy.txt"; then
-    ret=1
-  fi
-  { set +x; } 2>/dev/null
-  echo "Findings statistics:" >&2
-  grep -E ' \[[A-Za-z\.,\-]+\]' -o "${BUILD_DIR}/clang-tidy.txt" | sort \
-    | uniq -c >&2
-
-  if [[ $ret -ne 0 ]]; then
-    cat >&2 <<EOF
-Errors found, see ${BUILD_DIR}/clang-tidy.txt for details.
-To automatically fix them, run:
-
-  SKIP_TEST=1 ./ci.sh debug
-  ${CLANG_TIDY_BIN} -p ${BUILD_DIR} -fix -format-style=file -quiet $@ \$(git ${git_args[@]} | grep -E '(\.cc|\.cpp)\$')
-EOF
-  fi
-
-  return ${ret}
-}
-
-# Print stats about all the packages built in ${BUILD_DIR}/debs/.
-cmd_debian_stats() {
-  { set +x; } 2>/dev/null
-  local debsdir="${BUILD_DIR}/debs"
-  local f
-  while IFS='' read -r -d '' f; do
-    echo "====================================================================="
-    echo "Package $f:"
-    dpkg --info $f
-    dpkg --contents $f
-  done < <(find "${BUILD_DIR}/debs" -maxdepth 1 -mindepth 1 -type f \
-           -name '*.deb' -print0)
-}
-
-build_debian_pkg() {
-  local srcdir="$1"
-  local srcpkg="$2"
-  local options="${3:-}"
-
-  local debsdir="${BUILD_DIR}/debs"
-  local builddir="${debsdir}/${srcpkg}"
-
-  # debuild doesn't have an easy way to build out of tree, so we make a copy
-  # of with all symlinks on the first level.
-  mkdir -p "${builddir}"
-  for f in $(find "${srcdir}" -mindepth 1 -maxdepth 1 -printf '%P\n'); do
-    if [[ ! -L "${builddir}/$f" ]]; then
-      rm -f "${builddir}/$f"
-      ln -s "${srcdir}/$f" "${builddir}/$f"
-    fi
-  done
-  (
-    cd "${builddir}"
-    debuild "${options}" -b -uc -us
-  )
-}
-
-cmd_debian_build() {
-  local srcpkg="${1:-}"
-
-  case "${srcpkg}" in
-    jpeg-xl)
-      build_debian_pkg "${MYDIR}" "jpeg-xl"
-      ;;
-    highway)
-      build_debian_pkg "${MYDIR}/third_party/highway" "highway" "${HWY_PKG_OPTIONS}"
-      ;;
-    *)
-      echo "ERROR: Must pass a valid source package name to build." >&2
-      ;;
-  esac
-}
-
-get_version() {
-  local varname=$1
-  local line=$(grep -F "set(${varname} " lib/CMakeLists.txt | head -n 1)
-  [[ -n "${line}" ]]
-  line="${line#set(${varname} }"
-  line="${line%)}"
-  echo "${line}"
-}
-
-cmd_bump_version() {
-  local newver="${1:-}"
-
-  if ! which dch >/dev/null; then
-    echo "Missing dch\nTo install it run:\n  sudo apt install devscripts"
-    exit 1
-  fi
-
-  if [[ -z "${newver}" ]]; then
-    local major=$(get_version JPEGXL_MAJOR_VERSION)
-    local minor=$(get_version JPEGXL_MINOR_VERSION)
-    local patch=0
-    minor=$(( ${minor}  + 1))
-  else
-    local major="${newver%%.*}"
-    newver="${newver#*.}"
-    local minor="${newver%%.*}"
-    newver="${newver#${minor}}"
-    local patch="${newver#.}"
-    if [[ -z "${patch}" ]]; then
-      patch=0
-    fi
-  fi
-
-  newver="${major}.${minor}.${patch}"
-
-  echo "Bumping version to ${newver} (${major}.${minor}.${patch})"
-  sed -E \
-    -e "s/(set\\(JPEGXL_MAJOR_VERSION) [0-9]+\\)/\\1 ${major})/" \
-    -e "s/(set\\(JPEGXL_MINOR_VERSION) [0-9]+\\)/\\1 ${minor})/" \
-    -e "s/(set\\(JPEGXL_PATCH_VERSION) [0-9]+\\)/\\1 ${patch})/" \
-    -i lib/CMakeLists.txt
-  sed -E \
-    -e "s/(LIBJXL_VERSION: )\"[0-9.]+\"/\\1\"${major}.${minor}.${patch}\"/" \
-    -e "s/(LIBJXL_ABI_VERSION: )\"[0-9.]+\"/\\1\"${major}.${minor}\"/" \
-    -i .github/workflows/conformance.yml
-
-  # Update lib.gni
-  tools/scripts/build_cleaner.py --update
-
-  # Mark the previous version as "unstable".
-  DEBCHANGE_RELEASE_HEURISTIC=log dch -M --distribution unstable --release ''
-  DEBCHANGE_RELEASE_HEURISTIC=log dch -M \
-    --newversion "${newver}" \
-    "Bump JPEG XL version to ${newver}."
-}
-
-# Check that the AUTHORS file contains the email of the committer.
-cmd_authors() {
-  merge_request_commits
-  local emails
-  local names
-  readarray -t emails < <(git log --format='%ae' "${MR_ANCESTOR_SHA}..${MR_HEAD_SHA}")
-  readarray -t names < <(git log --format='%an' "${MR_ANCESTOR_SHA}..${MR_HEAD_SHA}")
-  for i in "${!names[@]}"; do
-    echo "Checking name '${names[$i]}' with email '${emails[$i]}' ..."
-    "${MYDIR}"/tools/scripts/check_author.py "${emails[$i]}" "${names[$i]}"
-  done
-}
-
-main() {
-  local cmd="${1:-}"
-  if [[ -z "${cmd}" ]]; then
-    cat >&2 <<EOF
-Use: $0 CMD
-
-Where cmd is one of:
- opt       Build and test a Release with symbols build.
- debug     Build and test a Debug build (NDEBUG is not defined).
- release   Build and test a striped Release binary without debug information.
- asan      Build and test an ASan (AddressSanitizer) build.
- msan      Build and test an MSan (MemorySanitizer) build. Needs to have msan
-           c++ libs installed with msan_install first.
- tsan      Build and test a TSan (ThreadSanitizer) build.
- asanfuzz  Build and test an ASan (AddressSanitizer) build for fuzzing.
- msanfuzz  Build and test an MSan (MemorySanitizer) build for fuzzing.
- test      Run the tests build by opt, debug, release, asan or msan. Useful when
-           building with SKIP_TEST=1.
- gbench    Run the Google benchmark tests.
- fuzz      Generate the fuzzer corpus and run the fuzzer on it. Useful after
-           building with asan or msan.
- benchmark Run the benchmark over the default corpus.
- fast_benchmark Run the benchmark over the small corpus.
-
- coverage  Build and run tests with coverage support. Runs coverage_report as
-           well.
- coverage_report Generate HTML, XML and text coverage report after a coverage
-           run.
-
- lint      Run the linter checks on the current commit or merge request.
- tidy      Run clang-tidy on the current commit or merge request.
- authors   Check that the last commit's author is listed in the AUTHORS file.
-
- msan_install Install the libc++ libraries required to build in msan mode. This
-              needs to be done once.
-
- debian_build <srcpkg> Build the given source package.
- debian_stats  Print stats about the built packages.
-
-oss-fuzz commands:
- ossfuzz_asan   Build the local source inside oss-fuzz docker with asan.
- ossfuzz_msan   Build the local source inside oss-fuzz docker with msan.
- ossfuzz_ubsan  Build the local source inside oss-fuzz docker with ubsan.
- ossfuzz_ninja  Run ninja on the BUILD_DIR inside the oss-fuzz docker. Extra
-                parameters are passed to ninja, for example "djxl_fuzzer" will
-                only build that ninja target. Use for faster build iteration
-                after one of the ossfuzz_*san commands.
-
-You can pass some optional environment variables as well:
- - BUILD_DIR: The output build directory (by default "$$repo/build")
- - BUILD_TARGET: The target triplet used when cross-compiling.
- - CMAKE_FLAGS: Convenience flag to pass both CMAKE_C_FLAGS and CMAKE_CXX_FLAGS.
- - CMAKE_PREFIX_PATH: Installation prefixes to be searched by the find_package.
- - ENABLE_WASM_SIMD=1: enable experimental SIMD in WASM build (only).
- - FUZZER_MAX_TIME: "fuzz" command fuzzer running timeout in seconds.
- - LINT_OUTPUT: Path to the output patch from the "lint" command.
- - SKIP_CPUSET=1: Skip modifying the cpuset in the arm_benchmark.
- - SKIP_BUILD=1: Skip the build stage, cmake configure only.
- - SKIP_TEST=1: Skip the test stage.
- - STORE_IMAGES=0: Makes the benchmark discard the computed images.
- - TEST_STACK_LIMIT: Stack size limit (ulimit -s) during tests, in KiB.
- - TEST_SELECTOR: pass additional arguments to ctest, e.g. "-R .Resample.".
- - STACK_SIZE=1: Generate binaries with the .stack_sizes sections.
-
-These optional environment variables are forwarded to the cmake call as
-parameters:
- - CMAKE_BUILD_TYPE
- - CMAKE_C_FLAGS
- - CMAKE_CXX_FLAGS
- - CMAKE_C_COMPILER_LAUNCHER
- - CMAKE_CXX_COMPILER_LAUNCHER
- - CMAKE_CROSSCOMPILING_EMULATOR
- - CMAKE_FIND_ROOT_PATH
- - CMAKE_EXE_LINKER_FLAGS
- - CMAKE_MAKE_PROGRAM
- - CMAKE_MODULE_LINKER_FLAGS
- - CMAKE_SHARED_LINKER_FLAGS
- - CMAKE_TOOLCHAIN_FILE
-
-Example:
-  BUILD_DIR=/tmp/build $0 opt
-EOF
-    exit 1
-  fi
-
-  cmd="cmd_${cmd}"
-  shift
-  set -x
-  "${cmd}" "$@"
-}
-
-main "$@"
diff --git a/third_party/jpeg-xl/cmake/FindAtomics.cmake b/third_party/jpeg-xl/cmake/FindAtomics.cmake
deleted file mode 100644
index 9a6cdc39ec38d..0000000000000
--- a/third_party/jpeg-xl/cmake/FindAtomics.cmake
+++ /dev/null
@@ -1,53 +0,0 @@
-# Original issue:
-# * https://gitlab.kitware.com/cmake/cmake/-/issues/23021#note_1098733
-#
-# For reference:
-# * https://gcc.gnu.org/wiki/Atomic/GCCMM
-#
-# riscv64 specific:
-# * https://lists.debian.org/debian-riscv/2022/01/msg00009.html
-#
-# ATOMICS_FOUND        - system has c++ atomics
-# ATOMICS_LIBRARIES    - libraries needed to use c++ atomics
-
-include(CheckCXXSourceCompiles)
-
-# RISC-V only has 32-bit and 64-bit atomic instructions. GCC is supposed
-# to convert smaller atomics to those larger ones via masking and
-# shifting like LLVM, but it’s a known bug that it does not. This means
-# anything that wants to use atomics on 1-byte or 2-byte types needs
-# -latomic, but not 4-byte or 8-byte (though it does no harm).
-set(atomic_code
-    "
-     #include <atomic>
-     #include <cstdint>
-     std::atomic<uint8_t> n8 (0); // riscv64
-     std::atomic<uint64_t> n64 (0); // armel, mipsel, powerpc
-     int main() {
-       ++n8;
-       ++n64;
-       return 0;
-     }")
-
-check_cxx_source_compiles("${atomic_code}" ATOMICS_LOCK_FREE_INSTRUCTIONS)
-
-if(ATOMICS_LOCK_FREE_INSTRUCTIONS)
-  set(ATOMICS_FOUND TRUE)
-  set(ATOMICS_LIBRARIES)
-else()
-  set(CMAKE_REQUIRED_LIBRARIES "-latomic")
-  check_cxx_source_compiles("${atomic_code}" ATOMICS_IN_LIBRARY)
-  set(CMAKE_REQUIRED_LIBRARIES)
-  if(ATOMICS_IN_LIBRARY)
-    set(ATOMICS_LIBRARY atomic)
-    include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(Atomics DEFAULT_MSG ATOMICS_LIBRARY)
-    set(ATOMICS_LIBRARIES ${ATOMICS_LIBRARY})
-    unset(ATOMICS_LIBRARY)
-  else()
-    if(Atomics_FIND_REQUIRED)
-      message(FATAL_ERROR "Neither lock free instructions nor -latomic found.")
-    endif()
-  endif()
-endif()
-unset(atomic_code)
diff --git a/third_party/jpeg-xl/cmake/FindBrotli.cmake b/third_party/jpeg-xl/cmake/FindBrotli.cmake
deleted file mode 100644
index 9fb78e47d8964..0000000000000
--- a/third_party/jpeg-xl/cmake/FindBrotli.cmake
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-set(brlibs brotlicommon brotlienc brotlidec)
-
-find_package(PkgConfig QUIET)
-if (PkgConfig_FOUND)
-  foreach(brlib IN ITEMS ${brlibs})
-    string(TOUPPER "${brlib}" BRPREFIX)
-    pkg_check_modules("PC_${BRPREFIX}" lib${brlib})
-  endforeach()
-endif()
-
-find_path(BROTLI_INCLUDE_DIR
-  NAMES brotli/decode.h
-  HINTS ${PC_BROTLICOMMON_INCLUDEDIR} ${PC_BROTLICOMMON_INCLUDE_DIRS}
-)
-
-foreach(brlib IN ITEMS ${brlibs})
-  string(TOUPPER "${brlib}" BRPREFIX)
-  find_library(${BRPREFIX}_LIBRARY
-    NAMES ${${BRPREFIX}_NAMES} ${brlib}
-    HINTS ${PC_${BRPREFIX}_LIBDIR} ${PC_${BRPREFIX}_LIBRARY_DIRS}
-  )
-
-  if (${BRPREFIX}_LIBRARY AND NOT TARGET ${brlib})
-    if(CMAKE_VERSION VERSION_LESS "3.13.5")
-    add_library(${brlib} INTERFACE IMPORTED GLOBAL)
-      set_property(TARGET ${brlib} PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${BROTLI_INCLUDE_DIR})
-      target_link_libraries(${brlib} INTERFACE ${${BRPREFIX}_LIBRARY})
-      set_property(TARGET ${brlib} PROPERTY INTERFACE_COMPILE_OPTIONS ${PC_${BRPREFIX}_CFLAGS_OTHER})
-    else()
-    add_library(${brlib} INTERFACE IMPORTED GLOBAL)
-      target_include_directories(${brlib}
-        INTERFACE ${BROTLI_INCLUDE_DIR})
-      target_link_libraries(${brlib}
-        INTERFACE ${${BRPREFIX}_LIBRARY})
-      target_link_options(${brlib}
-        INTERFACE ${PC_${BRPREFIX}_LDFLAGS_OTHER})
-      target_compile_options(${brlib}
-        INTERFACE ${PC_${BRPREFIX}_CFLAGS_OTHER})
-    endif()
-  endif()
-endforeach()
-
-if (BROTLICOMMON_FOUND AND BROTLIENC_FOUND AND BROTLIDEC_FOUND)
-  set(Brotli_FOUND ON)
-else ()
-  set(Brotli_FOUND OFF)
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Brotli
-  FOUND_VAR Brotli_FOUND
-  REQUIRED_VARS
-    BROTLI_INCLUDE_DIR
-    BROTLICOMMON_LIBRARY
-    BROTLIENC_LIBRARY
-    BROTLIDEC_LIBRARY
-  VERSION_VAR Brotli_VERSION
-)
-
-mark_as_advanced(
-  BROTLI_INCLUDE_DIR
-  BROTLICOMMON_LIBRARY
-  BROTLIENC_LIBRARY
-  BROTLIDEC_LIBRARY
-)
-
-if (Brotli_FOUND)
-  set(Brotli_LIBRARIES ${BROTLICOMMON_LIBRARY} ${BROTLIENC_LIBRARY} ${BROTLIDEC_LIBRARY})
-  set(Brotli_INCLUDE_DIRS ${BROTLI_INCLUDE_DIR})
-endif()
diff --git a/third_party/jpeg-xl/cmake/FindHWY.cmake b/third_party/jpeg-xl/cmake/FindHWY.cmake
deleted file mode 100644
index eab306a8b7826..0000000000000
--- a/third_party/jpeg-xl/cmake/FindHWY.cmake
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-find_package(PkgConfig QUIET)
-if (PkgConfig_FOUND)
-  pkg_check_modules(PC_HWY QUIET libhwy)
-  set(HWY_VERSION ${PC_HWY_VERSION})
-endif ()
-
-find_path(HWY_INCLUDE_DIR
-  NAMES hwy/base.h hwy/highway.h
-  HINTS ${PC_HWY_INCLUDEDIR} ${PC_HWY_INCLUDE_DIRS}
-)
-
-find_library(HWY_LIBRARY
-  NAMES ${HWY_NAMES} hwy
-  HINTS ${PC_HWY_LIBDIR} ${PC_HWY_LIBRARY_DIRS}
-)
-
-# If version not found using pkg-config, try extracting it from header files
-if (HWY_INCLUDE_DIR AND NOT HWY_VERSION)
-  set(HWY_VERSION "")
-  set(HWY_POSSIBLE_HEADERS "${HWY_INCLUDE_DIR}/hwy/base.h" "${HWY_INCLUDE_DIR}/hwy/highway.h")
-  foreach(HWY_HEADER_FILE IN LISTS HWY_POSSIBLE_HEADERS)
-    if (EXISTS "${HWY_HEADER_FILE}")
-      file(READ  "${HWY_HEADER_FILE}" HWY_VERSION_CONTENT)
-
-      string(REGEX MATCH "#define HWY_MAJOR +([0-9]+)" _sink "${HWY_VERSION_CONTENT}")
-      set(HWY_VERSION_MAJOR "${CMAKE_MATCH_1}")
-
-      string(REGEX MATCH "#define +HWY_MINOR +([0-9]+)" _sink "${HWY_VERSION_CONTENT}")
-      set(HWY_VERSION_MINOR "${CMAKE_MATCH_1}")
-
-      string(REGEX MATCH "#define +HWY_PATCH +([0-9]+)" _sink "${HWY_VERSION_CONTENT}")
-      set(HWY_VERSION_PATCH "${CMAKE_MATCH_1}")
-      if (NOT HWY_VERSION_MAJOR STREQUAL "" AND NOT HWY_VERSION_MINOR STREQUAL "" AND NOT HWY_VERSION_PATCH STREQUAL "")
-        set(HWY_VERSION "${HWY_VERSION_MAJOR}.${HWY_VERSION_MINOR}.${HWY_VERSION_PATCH}")
-        break()
-      endif()
-    endif ()
-  endforeach ()
-  if (NOT HWY_VERSION)
-    message(WARNING "Highway version not found.")
-  endif()
-endif ()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(HWY
-  FOUND_VAR HWY_FOUND
-  REQUIRED_VARS HWY_LIBRARY HWY_INCLUDE_DIR
-  VERSION_VAR HWY_VERSION
-)
-
-if (HWY_LIBRARY AND NOT TARGET hwy)
-  add_library(hwy INTERFACE IMPORTED GLOBAL)
-
-  if(CMAKE_VERSION VERSION_LESS "3.13.5")
-    set_property(TARGET hwy PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${HWY_INCLUDE_DIR})
-    target_link_libraries(hwy INTERFACE ${HWY_LIBRARY})
-    set_property(TARGET hwy PROPERTY INTERFACE_COMPILE_OPTIONS ${PC_HWY_CFLAGS_OTHER})
-  else()
-    target_include_directories(hwy INTERFACE ${HWY_INCLUDE_DIR})
-    target_link_libraries(hwy INTERFACE ${HWY_LIBRARY})
-    target_link_options(hwy INTERFACE ${PC_HWY_LDFLAGS_OTHER})
-    target_compile_options(hwy INTERFACE ${PC_HWY_CFLAGS_OTHER})
-  endif()
-endif()
-
-mark_as_advanced(HWY_INCLUDE_DIR HWY_LIBRARY)
-
-if (HWY_FOUND)
-    set(HWY_LIBRARIES ${HWY_LIBRARY})
-    set(HWY_INCLUDE_DIRS ${HWY_INCLUDE_DIR})
-endif ()
diff --git a/third_party/jpeg-xl/cmake/FindLCMS2.cmake b/third_party/jpeg-xl/cmake/FindLCMS2.cmake
deleted file mode 100644
index 0a7b54eb963cb..0000000000000
--- a/third_party/jpeg-xl/cmake/FindLCMS2.cmake
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-find_package(PkgConfig QUIET)
-if (PkgConfig_FOUND)
-  pkg_check_modules(PC_LCMS2 QUIET libLCMS2)
-  set(LCMS2_VERSION ${PC_LCMS2_VERSION})
-endif ()
-
-find_path(LCMS2_INCLUDE_DIR
-  NAMES lcms2.h
-  HINTS ${PC_LCMS2_INCLUDEDIR} ${PC_LCMS2_INCLUDE_DIRS}
-)
-
-find_library(LCMS2_LIBRARY
-  NAMES ${LCMS2_NAMES} lcms2 liblcms2 lcms-2 liblcms-2
-  HINTS ${PC_LCMS2_LIBDIR} ${PC_LCMS2_LIBRARY_DIRS}
-)
-
-if (LCMS2_INCLUDE_DIR AND NOT LCMS_VERSION)
-    file(READ ${LCMS2_INCLUDE_DIR}/lcms2.h LCMS2_VERSION_CONTENT)
-    string(REGEX MATCH "#define[ \t]+LCMS_VERSION[ \t]+([0-9]+)[ \t]*\n" LCMS2_VERSION_MATCH ${LCMS2_VERSION_CONTENT})
-    if (LCMS2_VERSION_MATCH)
-        string(SUBSTRING ${CMAKE_MATCH_1} 0 1 LCMS2_VERSION_MAJOR)
-        string(SUBSTRING ${CMAKE_MATCH_1} 1 2 LCMS2_VERSION_MINOR)
-        set(LCMS2_VERSION "${LCMS2_VERSION_MAJOR}.${LCMS2_VERSION_MINOR}")
-    endif ()
-endif ()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LCMS2
-  FOUND_VAR LCMS2_FOUND
-  REQUIRED_VARS LCMS2_LIBRARY LCMS2_INCLUDE_DIR
-  VERSION_VAR LCMS2_VERSION
-)
-
-if (LCMS2_LIBRARY AND NOT TARGET lcms2)
-  add_library(lcms2 INTERFACE IMPORTED GLOBAL)
-
-  if(CMAKE_VERSION VERSION_LESS "3.13.5")
-    set_property(TARGET lcms2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${LCMS2_INCLUDE_DIR})
-    target_link_libraries(lcms2 INTERFACE ${LCMS2_LIBRARY})
-    set_property(TARGET lcms2 PROPERTY INTERFACE_COMPILE_OPTIONS ${PC_LCMS2_CFLAGS_OTHER})
-  else()
-    target_include_directories(lcms2 INTERFACE ${LCMS2_INCLUDE_DIR})
-    target_link_libraries(lcms2 INTERFACE ${LCMS2_LIBRARY})
-    target_link_options(lcms2 INTERFACE ${PC_LCMS2_LDFLAGS_OTHER})
-    target_compile_options(lcms2 INTERFACE ${PC_LCMS2_CFLAGS_OTHER})
-  endif()
-endif()
-
-mark_as_advanced(LCMS2_INCLUDE_DIR LCMS2_LIBRARY)
-
-if (LCMS2_FOUND)
-    set(LCMS2_LIBRARIES ${LCMS2_LIBRARY})
-    set(LCMS2_INCLUDE_DIRS ${LCMS2_INCLUDE_DIR})
-endif ()
diff --git a/third_party/jpeg-xl/debian/changelog b/third_party/jpeg-xl/debian/changelog
deleted file mode 100644
index 503d8f216575f..0000000000000
--- a/third_party/jpeg-xl/debian/changelog
+++ /dev/null
@@ -1,125 +0,0 @@
-jpeg-xl (0.11.1) UNRELEASED; urgency=medium
-
-  * Bump JPEG XL version to 0.11.1.
-
- -- JPEG XL Maintainers <jpegxl@google.com>  Tue, 26 Nov 2024 12:09:23 +0100
-
-jpeg-xl (0.11.0) unstable; urgency=medium
-
-  * Bump JPEG XL version to 0.11.0.
-
- -- JPEG XL Maintainers <jpegxl@google.com>  Tue, 06 Aug 2024 14:35:34 +0200
-
-jpeg-xl (0.10.2) unstable; urgency=medium
-
-  * Bump JPEG XL version to 0.10.2.
-
- -- JPEG XL Maintainers <jpegxl@google.com>  Thu, 07 Mar 2024 13:50:05 +0100
-
-jpeg-xl (0.10.1) unstable; urgency=medium
-
-  * Bump JPEG XL version to 0.10.1.
-
- -- JPEG XL Maintainers <jpegxl@google.com>  Wed, 28 Feb 2024 12:52:20 +0100
-
-jpeg-xl (0.10.0) unstable; urgency=medium
-
-  * Bump JPEG XL version to 0.10.0.
-
- -- JPEG XL Maintainers <jpegxl@google.com>  Wed, 21 Feb 2024 08:37:00 +0100
-
-jpeg-xl (0.9.0) unstable; urgency=medium
-
-  * Bump JPEG XL version to 0.9.0.
-
- -- JPEG XL Maintainers <jpegxl@google.com>  Tue, 21 Nov 2023 10:32:59 +0100
-
-jpeg-xl (0.8) unstable; urgency=medium
-
-  * Bump JPEG XL version to 0.8.
-
- -- JPEG XL Maintainers <jpegxl@google.com>  Wed, 11 Jan 2023 16:12:34 +0000
-
-jpeg-xl (0.7) unstable; urgency=medium
-
-  * Bump JPEG XL version to 0.7.
-
- -- JPEG XL Maintainers <jpegxl@google.com>  Mon, 08 Aug 2022 14:43:58 +0000
-
-jpeg-xl (0.6) unstable; urgency=medium
-
-  * Bump JPEG XL version to 0.6.
-
- -- JPEG XL Maintainers <jpegxl@google.com>  Fri, 10 Sep 2021 16:08:17 +0200
-
-jpeg-xl (0.5.0) unstable; urgency=medium
-
-  * Bump JPEG XL version to 0.5.0.
-
- -- JPEG XL Maintainers <jpegxl@google.com>  Thu, 12 Aug 2021 23:49:40 +0200
-
-jpeg-xl (0.3.7) UNRELEASED; urgency=medium
-
-  * Bump JPEG XL version to 0.3.7.
-
- -- Sami Boukortt <sboukortt@google.com>  Mon, 29 Mar 2021 12:14:20 +0200
-
-jpeg-xl (0.3.6) UNRELEASED; urgency=medium
-
-  * Bump JPEG XL version to 0.3.6.
-
- -- Sami Boukortt <sboukortt@google.com>  Thu, 25 Mar 2021 17:40:58 +0100
-
-jpeg-xl (0.3.5) UNRELEASED; urgency=medium
-
-  * Bump JPEG XL version to 0.3.5.
-
- -- Sami Boukortt <sboukortt@google.com>  Tue, 23 Mar 2021 15:20:44 +0100
-
-jpeg-xl (0.3.4) UNRELEASED; urgency=medium
-
-  * Bump JPEG XL version to 0.3.4.
-
- -- Sami Boukortt <sboukortt@google.com>  Tue, 16 Mar 2021 12:13:59 +0100
-
-jpeg-xl (0.3.3) UNRELEASED; urgency=medium
-
-  * Bump JPEG XL version to 0.3.3.
-
- -- Sami Boukortt <sboukortt@google.com>  Fri, 5 Mar 2021 19:15:26 +0100
-
-jpeg-xl (0.3.2) UNRELEASED; urgency=medium
-
-  * Bump JPEG XL version to 0.3.2.
-
- -- Alex Deymo <deymo@google.com>  Fri, 12 Feb 2021 21:00:12 +0100
-
-jpeg-xl (0.3.1) UNRELEASED; urgency=medium
-
-  * Bump JPEG XL version to 0.3.1.
-
- -- Alex Deymo <deymo@google.com>  Tue, 09 Feb 2021 09:48:43 +0100
-
-jpeg-xl (0.3) UNRELEASED; urgency=medium
-
-  * Bump JPEG XL version to 0.3.
-
- -- Alex Deymo <deymo@google.com>  Wed, 27 Jan 2021 22:36:32 +0100
-
-jpeg-xl (0.2) UNRELEASED; urgency=medium
-
-  * Bump JPEG XL version to 0.2.
-
- -- Alex Deymo <deymo@google.com>  Wed, 23 Nov 2020 20:42:10 +0100
-
-jpeg-xl (0.1) UNRELEASED; urgency=medium
-
-  * JPEG XL format release candidate.
-
- -- Alex Deymo <deymo@google.com>  Fri, 13 Nov 2020 17:42:24 +0100
-
-jpeg-xl (0.0.2-1) UNRELEASED; urgency=medium
-
-  * Initial debian package.
-
- -- Alex Deymo <deymo@google.com>  Tue, 27 Oct 2020 15:27:59 +0100
diff --git a/third_party/jpeg-xl/debian/compat b/third_party/jpeg-xl/debian/compat
deleted file mode 100644
index f599e28b8ab0d..0000000000000
--- a/third_party/jpeg-xl/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/third_party/jpeg-xl/debian/control b/third_party/jpeg-xl/debian/control
deleted file mode 100644
index e0169a3488474..0000000000000
--- a/third_party/jpeg-xl/debian/control
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: jpeg-xl
-Maintainer: JPEG XL Maintainers <jpegxl@google.com>
-Section: misc
-Priority: optional
-Standards-Version: 3.9.8
-Build-Depends:
- asciidoc,
- cmake,
- debhelper (>= 9),
- libbrotli-dev,
- libgdk-pixbuf-2.0-dev | libgdk-pixbuf2.0-dev,
- libgif-dev,
- libgimp2.0-dev,
- libgoogle-perftools-dev,
- libgtest-dev,
- libhwy-dev (>= 1.0.0),
- libjpeg-dev,
- libopenexr-dev,
- libpng-dev,
- libwebp-dev,
- pkg-config,
- xdg-utils,
- xmlto,
-Homepage: https://github.com/libjxl/libjxl
-Rules-Requires-Root: no
-
-Package: jxl
-Architecture: any
-Section: utils
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: JPEG XL Image Coding System - "JXL" (command line utility)
- The JPEG XL Image Coding System (ISO/IEC 18181) is a lossy and
- lossless image compression format. It has a rich feature set and is
- particularly optimized for responsive web environments, so that
- content renders well on a wide range of devices. Moreover, it includes
- several features that help transition from the legacy JPEG format.
- .
- This package installs the command line utilities.
-
-Package: libjxl-dev
-Architecture: any
-Section: libdevel
-Depends: libjxl (= ${binary:Version}), ${misc:Depends}
- libhwy-dev,
-Description: JPEG XL Image Coding System - "JXL" (development files)
- The JPEG XL Image Coding System (ISO/IEC 18181) is a lossy and
- lossless image compression format. It has a rich feature set and is
- particularly optimized for responsive web environments, so that
- content renders well on a wide range of devices. Moreover, it includes
- several features that help transition from the legacy JPEG format.
- .
- This package installs development files.
-
-Package: libjxl
-Architecture: any
-Multi-Arch: same
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Description: JPEG XL Image Coding System - "JXL" (shared libraries)
- The JPEG XL Image Coding System (ISO/IEC 18181) is a lossy and
- lossless image compression format. It has a rich feature set and is
- particularly optimized for responsive web environments, so that
- content renders well on a wide range of devices. Moreover, it includes
- several features that help transition from the legacy JPEG format.
- .
- This package installs shared libraries.
-
-Package: libjxl-gdk-pixbuf
-Architecture: any
-Multi-Arch: same
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Description: JPEG XL Plugin for gdk-pixbuf
- This package installs the required files for reading JPEG XL files in
- GTK applications.
-
-Package: libjxl-gimp-plugin
-Architecture: any
-Multi-Arch: same
-Section: graphics
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Enhances: gimp
-Description: JPEG XL Import and Export Plugin for GIMP
- This is a plugin for GIMP version 2.10.x to import and export JPEG XL images.
diff --git a/third_party/jpeg-xl/debian/copyright b/third_party/jpeg-xl/debian/copyright
deleted file mode 100644
index 7786a8775b058..0000000000000
--- a/third_party/jpeg-xl/debian/copyright
+++ /dev/null
@@ -1,199 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: jpeg-xl
-
-Files: *
-Copyright: 2020 the JPEG XL Project
-License: BSD-3-clause
-
-Files: third_party/libjpeg-turbo/*
-Copyright (C)2009-2023 D. R. Commander. All Rights Reserved.
-Copyright (C)2015 Viktor Szathmáry. All Rights Reserved.
-License: BSD-3-clause
-
-Files: third_party/sjpeg/*
-Copyright: 2017 Google, Inc
-License: Apache-2.0
-
-Files: third_party/skcms/*
-Copyright: 2018 Google Inc.
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
- * Neither the name of Google Inc. nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Files: testdata/external/pngsuite/*
-Copyright: Willem van Schaik, 1996, 2011
-License: PngSuite License
- See http://www.schaik.com/pngsuite/ for details.
- .
- Permission to use, copy, modify and distribute these images for any
- purpose and without fee is hereby granted.
-
-Files: testdata/external/raw.pixls/*
-Copyright: their respective owners listed in https://raw.pixls.us/
-License: CC0-1.0
-
-Files: testdata/external/wesaturate/*
-Copyright: their respective owners listed in https://www.wesaturate.com/
-License: CC0-1.0
-
-Files: testdata/external/wide-gamut-tests/
-Copyright: github.com/codelogic/wide-gamut-tests authors.
-License: Apache-2.0
-
-License: Apache-2.0
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- .
-      http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- .
- On Debian systems, the complete text of the Apache License, Version 2
- can be found in "/usr/share/common-licenses/Apache-2.0".
-
-License: CC0
- Creative Commons Zero v1.0 Universal
- .
- CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
- SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN ATTORNEY-CLIENT
- RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS"
- BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE OF THIS
- DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS
- LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE
- INFORMATION OR WORKS PROVIDED HEREUNDER.
- .
- Statement of Purpose
- .
- The laws of most jurisdictions throughout the world automatically confer
- exclusive Copyright and Related Rights (defined below) upon the creator and
- subsequent owner(s) (each and all, an "owner") of an original work of
- authorship and/or a database (each, a "Work").
- .
- Certain owners wish to permanently relinquish those rights to a Work for the
- purpose of contributing to a commons of creative, cultural and scientific
- works ("Commons") that the public can reliably and without fear of later
- claims of infringement build upon, modify, incorporate in other works, reuse
- and redistribute as freely as possible in any form whatsoever and for any
- purposes, including without limitation commercial purposes. These owners may
- contribute to the Commons to promote the ideal of a free culture and the
- further production of creative, cultural and scientific works, or to gain
- reputation or greater distribution for their Work in part through the use
- and efforts of others.
- .
- For these and/or other purposes and motivations, and without any expectation
- of additional consideration or compensation, the person associating CC0 with
- a Work (the "Affirmer"), to the extent that he or she is an owner of
- Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to
- the Work and publicly distribute the Work under its terms, with knowledge of
- his or her Copyright and Related Rights in the Work and the meaning and
- intended legal effect of CC0 on those rights.
- .
- 1. Copyright and Related Rights. A Work made available under CC0 may be
- protected by copyright and related or neighboring rights ("Copyright and
- Related Rights"). Copyright and Related Rights include, but are not limited
- to, the following:
-   i. the right to reproduce, adapt, distribute, perform, display,
- communicate, and translate a Work;
-   ii. moral rights retained by the original author(s) and/or performer(s);
-   iii. publicity and privacy rights pertaining to a person's image or
- likeness depicted in a Work;
-   iv. rights protecting against unfair competition in regards to a Work,
- subject to the limitations in paragraph 4(a), below;
-   v. rights protecting the extraction, dissemination, use and reuse of data
- in a Work;
-   vi. database rights (such as those arising under Directive 96/9/EC of the
- European Parliament and of the Council of 11 March 1996 on the legal
- protection of databases, and under any national implementation thereof,
- including any amended or successor version of such directive); and
-   vii. other similar, equivalent or corresponding rights throughout the
- world based on applicable law or treaty, and any national implementations
- thereof.
- .
- 2. Waiver. To the greatest extent permitted by, but not in contravention of,
- applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
- unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
- and Related Rights and associated claims and causes of action, whether now
- known or unknown (including existing as well as future claims and causes of
- action), in the Work (i) in all territories worldwide, (ii) for the maximum
- duration provided by applicable law or treaty (including future time
- extensions), (iii) in any current or future medium and for any number of
- copies, and (iv) for any purpose whatsoever, including without limitation
- commercial, advertising or promotional purposes (the "Waiver"). Affirmer
- makes the Waiver for the benefit of each member of the public at large and
- to the detriment of Affirmer's heirs and successors, fully intending that
- such Waiver shall not be subject to revocation, rescission, cancellation,
- termination, or any other legal or equitable action to disrupt the quiet
- enjoyment of the Work by the public as contemplated by Affirmer's express
- Statement of Purpose.
- .
- 3. Public License Fallback. Should any part of the Waiver for any reason be
- judged legally invalid or ineffective under applicable law, then the Waiver
- shall be preserved to the maximum extent permitted taking into account
- Affirmer's express Statement of Purpose. In addition, to the extent the
- Waiver is so judged Affirmer hereby grants to each affected person a
- royalty-free, non transferable, non sublicensable, non exclusive,
- irrevocable and unconditional license to exercise Affirmer's Copyright and
- Related Rights in the Work (i) in all territories worldwide, (ii) for the
- maximum duration provided by applicable law or treaty (including future time
- extensions), (iii) in any current or future medium and for any number of
- copies, and (iv) for any purpose whatsoever, including without limitation
- commercial, advertising or promotional purposes (the "License"). The License
- shall be deemed effective as of the date CC0 was applied by Affirmer to the
- Work. Should any part of the License for any reason be judged legally
- invalid or ineffective under applicable law, such partial invalidity or
- ineffectiveness shall not invalidate the remainder of the License, and in
- such case Affirmer hereby affirms that he or she will not (i) exercise any
- of his or her remaining Copyright and Related Rights in the Work or (ii)
- assert any associated claims and causes of action with respect to the Work,
- in either case contrary to Affirmer's express Statement of Purpose.
- .
- 4. Limitations and Disclaimers.
-   a. No trademark or patent rights held by Affirmer are waived, abandoned,
- surrendered, licensed or otherwise affected by this document.
-   b. Affirmer offers the Work as-is and makes no representations or
- warranties of any kind concerning the Work, express, implied, statutory or
- otherwise, including without limitation warranties of title,
- merchantability, fitness for a particular purpose, non infringement, or the
- absence of latent or other defects, accuracy, or the present or absence of
- errors, whether or not discoverable, all to the greatest extent permissible
- under applicable law.
-   c. Affirmer disclaims responsibility for clearing rights of other persons
- that may apply to the Work or any use thereof, including without limitation
- any person's Copyright and Related Rights in the Work. Further, Affirmer
- disclaims responsibility for obtaining any necessary consents, permissions
- or other rights required for any use of the Work.
-   d. Affirmer understands and acknowledges that Creative Commons is not a
- party to this document and has no duty or obligation with respect to this
- CC0 or use of the Work.
- .
- For more information, please see:
- http://creativecommons.org/publicdomain/zero/1.0/>
-
diff --git a/third_party/jpeg-xl/debian/jxl.install b/third_party/jpeg-xl/debian/jxl.install
deleted file mode 100644
index c3bae3ed10b98..0000000000000
--- a/third_party/jpeg-xl/debian/jxl.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/*
-usr/share/man/man1/cjxl.1
-usr/share/man/man1/djxl.1
diff --git a/third_party/jpeg-xl/debian/libjxl-dev.install b/third_party/jpeg-xl/debian/libjxl-dev.install
deleted file mode 100644
index ebe4ac4ae577c..0000000000000
--- a/third_party/jpeg-xl/debian/libjxl-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/jxl/*.h
-usr/lib/*/*.so
-usr/lib/*/pkgconfig/*.pc
diff --git a/third_party/jpeg-xl/debian/libjxl-gdk-pixbuf.install b/third_party/jpeg-xl/debian/libjxl-gdk-pixbuf.install
deleted file mode 100644
index 12d2ab250f97b..0000000000000
--- a/third_party/jpeg-xl/debian/libjxl-gdk-pixbuf.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/gdk-pixbuf-*/*/loaders/*
-usr/share/mime/packages/image-jxl.xml
-usr/share/thumbnailers/jxl.thumbnailer
diff --git a/third_party/jpeg-xl/debian/libjxl-gimp-plugin.install b/third_party/jpeg-xl/debian/libjxl-gimp-plugin.install
deleted file mode 100644
index 353431dba3607..0000000000000
--- a/third_party/jpeg-xl/debian/libjxl-gimp-plugin.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/gimp
diff --git a/third_party/jpeg-xl/debian/libjxl.install b/third_party/jpeg-xl/debian/libjxl.install
deleted file mode 100644
index cd157a7a5cbf7..0000000000000
--- a/third_party/jpeg-xl/debian/libjxl.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libjxl*.so.*
diff --git a/third_party/jpeg-xl/debian/rules b/third_party/jpeg-xl/debian/rules
deleted file mode 100755
index 6259dbfc61e5c..0000000000000
--- a/third_party/jpeg-xl/debian/rules
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/dpkg/pkg-info.mk
-
-%:
-	dh $@ --buildsystem=cmake
-
-override_dh_auto_configure:
-	# TODO(deymo): Remove the DCMAKE_BUILD_TYPE once builds without NDEBUG
-	# are as useful as Release builds.
-        # TODO(szabadka) Re-enable jpegli after tests are fixed on Ubuntu 20.04,
-        # and debian:buster
-	dh_auto_configure -- \
-	  -DJPEGXL_VERSION=$(DEB_VERSION) \
-	  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-	  -DJPEGXL_FORCE_SYSTEM_GTEST=ON \
-	  -DJPEGXL_FORCE_SYSTEM_BROTLI=ON \
-	  -DJPEGXL_FORCE_SYSTEM_HWY=ON \
-	  -DJPEGXL_ENABLE_JPEGLI=OFF \
-	  -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF \
-	  -DJPEGXL_ENABLE_PLUGINS=ON
diff --git a/third_party/jpeg-xl/debian/source/format b/third_party/jpeg-xl/debian/source/format
deleted file mode 100644
index 163aaf8d82b6c..0000000000000
--- a/third_party/jpeg-xl/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/third_party/jpeg-xl/deps.sh b/third_party/jpeg-xl/deps.sh
deleted file mode 100755
index 069c721de1500..0000000000000
--- a/third_party/jpeg-xl/deps.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# This file downloads the dependencies needed to build JPEG XL into third_party.
-# These dependencies are normally pulled by git.
-
-set -eu
-
-SELF=$(realpath "$0")
-MYDIR=$(dirname "${SELF}")
-
-# Git revisions we use for the given submodules. Update these whenever you
-# update a git submodule.
-TESTDATA="873045a9c42ed60721756e26e2a6b32e17415205"
-THIRD_PARTY_BROTLI="36533a866ed1ca4b75cf049f4521e4ec5fe24727"
-THIRD_PARTY_GOOGLETEST="58d77fa8070e8cec2dc1ed015d66b454c8d78850"
-THIRD_PARTY_HIGHWAY="457c891775a7397bdb0376bb1031e6e027af1c48"
-THIRD_PARTY_SKCMS="42030a771244ba67f86b1c1c76a6493f873c5f91"
-THIRD_PARTY_SJPEG="e5ab13008bb214deb66d5f3e17ca2f8dbff150bf"
-THIRD_PARTY_ZLIB="51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf" # v1.3.1
-THIRD_PARTY_LIBPNG="f135775ad4e5d4408d2e12ffcc71bb36e6b48551" # v1.6.40
-THIRD_PARTY_LIBJPEG_TURBO="8ecba3647edb6dd940463fedf38ca33a8e2a73d1" # 2.1.5.1
-
-# Download the target revision from GitHub.
-download_github() {
-  local path="$1"
-  local project="$2"
-
-  local varname=`echo "$path" | tr '[:lower:]' '[:upper:]'`
-  varname="${varname//[\/-]/_}"
-  local sha
-  eval "sha=\${${varname}}"
-
-  local down_dir="${MYDIR}/downloads"
-  local local_fn="${down_dir}/${sha}.tar.gz"
-  if [[ -e "${local_fn}" && -d "${MYDIR}/${path}" ]]; then
-    echo "${path} already up to date." >&2
-    return 0
-  fi
-
-  local url
-  local strip_components=0
-  if [[ "${project:0:4}" == "http" ]]; then
-    # "project" is a googlesource.com base url.
-    url="${project}${sha}.tar.gz"
-  else
-    # GitHub files have a top-level directory
-    strip_components=1
-    url="https://github.com/${project}/tarball/${sha}"
-  fi
-
-  echo "Downloading ${path} version ${sha}..." >&2
-  mkdir -p "${down_dir}"
-  curl -L --show-error -o "${local_fn}.tmp" "${url}"
-  mkdir -p "${MYDIR}/${path}"
-  tar -zxf "${local_fn}.tmp" -C "${MYDIR}/${path}" \
-    --strip-components="${strip_components}"
-  mv "${local_fn}.tmp" "${local_fn}"
-}
-
-is_git_repository() {
-    local dir="$1"
-    local toplevel=$(git rev-parse --show-toplevel)
-
-    [[ "${dir}" == "${toplevel}" ]]
-}
-
-
-main() {
-  if is_git_repository "${MYDIR}"; then
-    cat >&2 <<EOF
-Current directory is a git repository, downloading dependencies via git:
-
-  git submodule update --init --recursive
-
-EOF
-    git -C "${MYDIR}" submodule update --init --recursive --depth 1 --recommend-shallow
-    return 0
-  fi
-
-  # Sources downloaded from a tarball.
-  download_github testdata libjxl/testdata
-  download_github third_party/brotli google/brotli
-  download_github third_party/googletest google/googletest
-  download_github third_party/highway google/highway
-  download_github third_party/sjpeg webmproject/sjpeg
-  download_github third_party/skcms \
-    "https://skia.googlesource.com/skcms/+archive/"
-  download_github third_party/zlib madler/zlib
-  download_github third_party/libpng glennrp/libpng
-  download_github third_party/libjpeg-turbo libjpeg-turbo/libjpeg-turbo
-  echo "Done."
-}
-
-main "$@"
diff --git a/third_party/jpeg-xl/examples/CMakeLists.txt b/third_party/jpeg-xl/examples/CMakeLists.txt
deleted file mode 100644
index 6b2b99c12459b..0000000000000
--- a/third_party/jpeg-xl/examples/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# Example project using libjxl.
-
-cmake_minimum_required(VERSION 3.10)
-
-project(SAMPLE_LIBJXL LANGUAGES C CXX)
-
-# Use pkg-config to find libjxl.
-find_package(PkgConfig)
-pkg_check_modules(Jxl REQUIRED IMPORTED_TARGET libjxl libjxl_cms libjxl_threads)
-
-# Build the example encoder/decoder binaries using the default shared libraries
-# installed.
-add_executable(decode_exif_metadata decode_exif_metadata.cc)
-target_link_libraries(decode_exif_metadata PkgConfig::Jxl)
-
-add_executable(decode_oneshot decode_oneshot.cc)
-target_link_libraries(decode_oneshot PkgConfig::Jxl)
-
-add_executable(decode_progressive decode_progressive.cc)
-target_link_libraries(decode_progressive PkgConfig::Jxl)
-
-add_executable(encode_oneshot encode_oneshot.cc)
-target_link_libraries(encode_oneshot PkgConfig::Jxl)
diff --git a/third_party/jpeg-xl/examples/decode_exif_metadata.cc b/third_party/jpeg-xl/examples/decode_exif_metadata.cc
deleted file mode 100644
index c1609edde326a..0000000000000
--- a/third_party/jpeg-xl/examples/decode_exif_metadata.cc
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This C++ example decodes a JPEG XL image in one shot (all input bytes
-// available at once). The example outputs the pixels and color information to a
-// floating point image and an ICC profile on disk.
-
-#include <jxl/decode.h>
-#include <jxl/decode_cxx.h>
-#include <limits.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <vector>
-
-bool DecodeJpegXlExif(const uint8_t* jxl, size_t size,
-                      std::vector<uint8_t>* exif) {
-  auto dec = JxlDecoderMake(nullptr);
-
-  // We're only interested in the Exif boxes in this example, so don't
-  // subscribe to events related to pixel data.
-  if (JXL_DEC_SUCCESS != JxlDecoderSubscribeEvents(
-                             dec.get(), JXL_DEC_BOX | JXL_DEC_BOX_COMPLETE)) {
-    fprintf(stderr, "JxlDecoderSubscribeEvents failed\n");
-    return false;
-  }
-  bool support_decompression = true;
-  if (JXL_DEC_SUCCESS != JxlDecoderSetDecompressBoxes(dec.get(), JXL_TRUE)) {
-    fprintf(stderr,
-            "NOTE: decompressing brob boxes not supported with the currently "
-            "used jxl library.\n");
-    support_decompression = false;
-  }
-
-  JxlDecoderSetInput(dec.get(), jxl, size);
-  JxlDecoderCloseInput(dec.get());
-
-  const constexpr size_t kChunkSize = 65536;
-  size_t output_pos = 0;
-
-  for (;;) {
-    JxlDecoderStatus status = JxlDecoderProcessInput(dec.get());
-    if (status == JXL_DEC_ERROR) {
-      fprintf(stderr, "Decoder error\n");
-      return false;
-    } else if (status == JXL_DEC_NEED_MORE_INPUT) {
-      fprintf(stderr, "Error, already provided all input\n");
-      return false;
-    } else if (status == JXL_DEC_BOX) {
-      if (!exif->empty()) {
-        size_t remaining = JxlDecoderReleaseBoxBuffer(dec.get());
-        exif->resize(exif->size() - remaining);
-        // No need to wait for JXL_DEC_SUCCESS or decode other boxes.
-        return true;
-      }
-      JxlBoxType type;
-      status = JxlDecoderGetBoxType(dec.get(), type,
-                                    TO_JXL_BOOL(support_decompression));
-      if (JXL_DEC_SUCCESS != status) {
-        fprintf(stderr, "Error, failed to get box type\n");
-        return false;
-      }
-      if (!memcmp(type, "Exif", 4)) {
-        exif->resize(kChunkSize);
-        JxlDecoderSetBoxBuffer(dec.get(), exif->data(), exif->size());
-      }
-    } else if (status == JXL_DEC_BOX_NEED_MORE_OUTPUT) {
-      size_t remaining = JxlDecoderReleaseBoxBuffer(dec.get());
-      output_pos += kChunkSize - remaining;
-      exif->resize(exif->size() + kChunkSize);
-      JxlDecoderSetBoxBuffer(dec.get(), exif->data() + output_pos,
-                             exif->size() - output_pos);
-    } else if (status == JXL_DEC_BOX_COMPLETE) {
-      if (!exif->empty()) {
-        size_t remaining = JxlDecoderReleaseBoxBuffer(dec.get());
-        exif->resize(exif->size() - remaining);
-        return true;
-      }
-      return true;
-    } else {
-      fprintf(stderr, "Unknown decoder status\n");
-      return false;
-    }
-  }
-}
-
-bool LoadFile(const char* filename, std::vector<uint8_t>* out) {
-  FILE* file = fopen(filename, "rb");
-  if (!file) {
-    return false;
-  }
-
-  if (fseek(file, 0, SEEK_END) != 0) {
-    fclose(file);
-    return false;
-  }
-
-  long size = ftell(file);  // NOLINT
-  // Avoid invalid file or directory.
-  if (size >= LONG_MAX || size < 0) {
-    fclose(file);
-    return false;
-  }
-
-  if (fseek(file, 0, SEEK_SET) != 0) {
-    fclose(file);
-    return false;
-  }
-
-  out->resize(size);
-  size_t readsize = fread(out->data(), 1, size, file);
-  if (fclose(file) != 0) {
-    return false;
-  }
-
-  return readsize == static_cast<size_t>(size);
-}
-
-bool WriteFile(const char* filename, const uint8_t* data, size_t size) {
-  FILE* file = fopen(filename, "wb");
-  if (!file) {
-    fprintf(stderr, "Could not open %s for writing", filename);
-    return false;
-  }
-  fwrite(data, 1, size, file);
-  if (fclose(file) != 0) {
-    return false;
-  }
-  return true;
-}
-
-int main(int argc, char* argv[]) {
-  if (argc != 3) {
-    fprintf(stderr,
-            "Usage: %s <jxl> <exif>\n"
-            "Where:\n"
-            "  jxl = input JPEG XL image filename\n"
-            "  exif = output exif filename\n"
-            "Output files will be overwritten.\n",
-            argv[0]);
-    return 1;
-  }
-
-  const char* jxl_filename = argv[1];
-  const char* exif_filename = argv[2];
-
-  std::vector<uint8_t> jxl;
-  if (!LoadFile(jxl_filename, &jxl)) {
-    fprintf(stderr, "couldn't load %s\n", jxl_filename);
-    return 1;
-  }
-
-  std::vector<uint8_t> exif;
-  if (!DecodeJpegXlExif(jxl.data(), jxl.size(), &exif)) {
-    fprintf(stderr, "Error while decoding the jxl file\n");
-    return 1;
-  }
-  if (exif.empty()) {
-    printf("No exif data present in this image\n");
-  } else {
-    // TODO(lode): the exif box data contains the 4-byte TIFF header at the
-    // beginning, check whether this is desired to be part of the output, or
-    // should be removed.
-    if (!WriteFile(exif_filename, exif.data(), exif.size())) {
-      fprintf(stderr, "Error while writing the exif file\n");
-      return 1;
-    }
-    printf("Successfully wrote %s\n", exif_filename);
-  }
-  return 0;
-}
diff --git a/third_party/jpeg-xl/examples/decode_oneshot.cc b/third_party/jpeg-xl/examples/decode_oneshot.cc
deleted file mode 100644
index b7e17c21a497a..0000000000000
--- a/third_party/jpeg-xl/examples/decode_oneshot.cc
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This C++ example decodes a JPEG XL image in one shot (all input bytes
-// available at once). The example outputs the pixels and color information to a
-// floating point image and an ICC profile on disk.
-
-#include <jxl/codestream_header.h>
-#include <jxl/decode.h>
-#include <jxl/decode_cxx.h>
-#include <jxl/resizable_parallel_runner.h>
-#include <jxl/resizable_parallel_runner_cxx.h>
-#include <jxl/types.h>
-#include <limits.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <vector>
-
-/** Decodes JPEG XL image to floating point pixels and ICC Profile. Pixel are
- * stored as floating point, as interleaved RGBA (4 floating point values per
- * pixel), line per line from top to bottom.  Pixel values have nominal range
- * 0..1 but may go beyond this range for HDR or wide gamut. The ICC profile
- * describes the color format of the pixel data.
- */
-bool DecodeJpegXlOneShot(const uint8_t* jxl, size_t size,
-                         std::vector<float>* pixels, size_t* xsize,
-                         size_t* ysize, std::vector<uint8_t>* icc_profile) {
-  // Multi-threaded parallel runner.
-  auto runner = JxlResizableParallelRunnerMake(nullptr);
-
-  auto dec = JxlDecoderMake(nullptr);
-  if (JXL_DEC_SUCCESS !=
-      JxlDecoderSubscribeEvents(dec.get(), JXL_DEC_BASIC_INFO |
-                                               JXL_DEC_COLOR_ENCODING |
-                                               JXL_DEC_FULL_IMAGE)) {
-    fprintf(stderr, "JxlDecoderSubscribeEvents failed\n");
-    return false;
-  }
-
-  if (JXL_DEC_SUCCESS != JxlDecoderSetParallelRunner(dec.get(),
-                                                     JxlResizableParallelRunner,
-                                                     runner.get())) {
-    fprintf(stderr, "JxlDecoderSetParallelRunner failed\n");
-    return false;
-  }
-
-  JxlBasicInfo info;
-  JxlPixelFormat format = {4, JXL_TYPE_FLOAT, JXL_NATIVE_ENDIAN, 0};
-
-  JxlDecoderSetInput(dec.get(), jxl, size);
-  JxlDecoderCloseInput(dec.get());
-
-  for (;;) {
-    JxlDecoderStatus status = JxlDecoderProcessInput(dec.get());
-
-    if (status == JXL_DEC_ERROR) {
-      fprintf(stderr, "Decoder error\n");
-      return false;
-    } else if (status == JXL_DEC_NEED_MORE_INPUT) {
-      fprintf(stderr, "Error, already provided all input\n");
-      return false;
-    } else if (status == JXL_DEC_BASIC_INFO) {
-      if (JXL_DEC_SUCCESS != JxlDecoderGetBasicInfo(dec.get(), &info)) {
-        fprintf(stderr, "JxlDecoderGetBasicInfo failed\n");
-        return false;
-      }
-      *xsize = info.xsize;
-      *ysize = info.ysize;
-      JxlResizableParallelRunnerSetThreads(
-          runner.get(),
-          JxlResizableParallelRunnerSuggestThreads(info.xsize, info.ysize));
-    } else if (status == JXL_DEC_COLOR_ENCODING) {
-      // Get the ICC color profile of the pixel data
-      size_t icc_size;
-      if (JXL_DEC_SUCCESS !=
-          JxlDecoderGetICCProfileSize(dec.get(), JXL_COLOR_PROFILE_TARGET_DATA,
-                                      &icc_size)) {
-        fprintf(stderr, "JxlDecoderGetICCProfileSize failed\n");
-        return false;
-      }
-      icc_profile->resize(icc_size);
-      if (JXL_DEC_SUCCESS != JxlDecoderGetColorAsICCProfile(
-                                 dec.get(), JXL_COLOR_PROFILE_TARGET_DATA,
-                                 icc_profile->data(), icc_profile->size())) {
-        fprintf(stderr, "JxlDecoderGetColorAsICCProfile failed\n");
-        return false;
-      }
-    } else if (status == JXL_DEC_NEED_IMAGE_OUT_BUFFER) {
-      size_t buffer_size;
-      if (JXL_DEC_SUCCESS !=
-          JxlDecoderImageOutBufferSize(dec.get(), &format, &buffer_size)) {
-        fprintf(stderr, "JxlDecoderImageOutBufferSize failed\n");
-        return false;
-      }
-      if (buffer_size != *xsize * *ysize * 16) {
-        fprintf(stderr, "Invalid out buffer size %d %d\n",
-                static_cast<int>(buffer_size),
-                static_cast<int>(*xsize * *ysize * 16));
-        return false;
-      }
-      pixels->resize(*xsize * *ysize * 4);
-      void* pixels_buffer = static_cast<void*>(pixels->data());
-      size_t pixels_buffer_size = pixels->size() * sizeof(float);
-      if (JXL_DEC_SUCCESS != JxlDecoderSetImageOutBuffer(dec.get(), &format,
-                                                         pixels_buffer,
-                                                         pixels_buffer_size)) {
-        fprintf(stderr, "JxlDecoderSetImageOutBuffer failed\n");
-        return false;
-      }
-    } else if (status == JXL_DEC_FULL_IMAGE) {
-      // Nothing to do. Do not yet return. If the image is an animation, more
-      // full frames may be decoded. This example only keeps the last one.
-    } else if (status == JXL_DEC_SUCCESS) {
-      // All decoding successfully finished.
-      // It's not required to call JxlDecoderReleaseInput(dec.get()) here since
-      // the decoder will be destroyed.
-      return true;
-    } else {
-      fprintf(stderr, "Unknown decoder status\n");
-      return false;
-    }
-  }
-}
-
-/** Writes to .pfm file (Portable FloatMap). Gimp, tev viewer and ImageMagick
- * support viewing this format.
- * The input pixels are given as 32-bit floating point with 4-channel RGBA.
- * The alpha channel will not be written since .pfm does not support it.
- */
-bool WritePFM(const char* filename, const float* pixels, size_t xsize,
-              size_t ysize) {
-  FILE* file = fopen(filename, "wb");
-  if (!file) {
-    fprintf(stderr, "Could not open %s for writing", filename);
-    return false;
-  }
-  uint32_t endian_test = 1;
-  uint8_t little_endian[4];
-  memcpy(little_endian, &endian_test, 4);
-
-  fprintf(file, "PF\n%d %d\n%s\n", static_cast<int>(xsize),
-          static_cast<int>(ysize), little_endian[0] ? "-1.0" : "1.0");
-  for (int y = ysize - 1; y >= 0; y--) {
-    for (size_t x = 0; x < xsize; x++) {
-      for (size_t c = 0; c < 3; c++) {
-        const float* f = &pixels[(y * xsize + x) * 4 + c];
-        fwrite(f, 4, 1, file);
-      }
-    }
-  }
-  if (fclose(file) != 0) {
-    return false;
-  }
-  return true;
-}
-
-bool LoadFile(const char* filename, std::vector<uint8_t>* out) {
-  FILE* file = fopen(filename, "rb");
-  if (!file) {
-    return false;
-  }
-
-  if (fseek(file, 0, SEEK_END) != 0) {
-    fclose(file);
-    return false;
-  }
-
-  long size = ftell(file);  // NOLINT
-  // Avoid invalid file or directory.
-  if (size >= LONG_MAX || size < 0) {
-    fclose(file);
-    return false;
-  }
-
-  if (fseek(file, 0, SEEK_SET) != 0) {
-    fclose(file);
-    return false;
-  }
-
-  out->resize(size);
-  size_t readsize = fread(out->data(), 1, size, file);
-  if (fclose(file) != 0) {
-    return false;
-  }
-
-  return readsize == static_cast<size_t>(size);
-}
-
-bool WriteFile(const char* filename, const uint8_t* data, size_t size) {
-  FILE* file = fopen(filename, "wb");
-  if (!file) {
-    fprintf(stderr, "Could not open %s for writing", filename);
-    return false;
-  }
-  fwrite(data, 1, size, file);
-  if (fclose(file) != 0) {
-    return false;
-  }
-  return true;
-}
-
-int main(int argc, char* argv[]) {
-  if (argc != 4) {
-    fprintf(stderr,
-            "Usage: %s <jxl> <pfm> <icc>\n"
-            "Where:\n"
-            "  jxl = input JPEG XL image filename\n"
-            "  pfm = output Portable FloatMap image filename\n"
-            "  icc = output ICC color profile filename\n"
-            "Output files will be overwritten.\n",
-            argv[0]);
-    return 1;
-  }
-
-  const char* jxl_filename = argv[1];
-  const char* pfm_filename = argv[2];
-  const char* icc_filename = argv[3];
-
-  std::vector<uint8_t> jxl;
-  if (!LoadFile(jxl_filename, &jxl)) {
-    fprintf(stderr, "couldn't load %s\n", jxl_filename);
-    return 1;
-  }
-
-  std::vector<float> pixels;
-  std::vector<uint8_t> icc_profile;
-  size_t xsize = 0;
-  size_t ysize = 0;
-  if (!DecodeJpegXlOneShot(jxl.data(), jxl.size(), &pixels, &xsize, &ysize,
-                           &icc_profile)) {
-    fprintf(stderr, "Error while decoding the jxl file\n");
-    return 1;
-  }
-  if (!WritePFM(pfm_filename, pixels.data(), xsize, ysize)) {
-    fprintf(stderr, "Error while writing the PFM image file\n");
-    return 1;
-  }
-  if (!WriteFile(icc_filename, icc_profile.data(), icc_profile.size())) {
-    fprintf(stderr, "Error while writing the ICC profile file\n");
-    return 1;
-  }
-  printf("Successfully wrote %s and %s\n", pfm_filename, icc_filename);
-  return 0;
-}
diff --git a/third_party/jpeg-xl/examples/decode_progressive.cc b/third_party/jpeg-xl/examples/decode_progressive.cc
deleted file mode 100644
index 7a3a9aa33b702..0000000000000
--- a/third_party/jpeg-xl/examples/decode_progressive.cc
+++ /dev/null
@@ -1,241 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This C++ example decodes a JPEG XL image progressively (input bytes are
-// passed in chunks). The example outputs the intermediate steps to PAM files.
-
-#ifndef __STDC_FORMAT_MACROS
-#define __STDC_FORMAT_MACROS
-#endif
-
-#include <jxl/decode.h>
-#include <jxl/decode_cxx.h>
-#include <jxl/resizable_parallel_runner.h>
-#include <jxl/resizable_parallel_runner_cxx.h>
-#include <limits.h>
-
-#include <cinttypes>  // PRIu64
-#include <cstdint>
-#include <cstdio>
-#include <cstring>
-#include <vector>
-
-bool WritePAM(const char* filename, const uint8_t* buffer, size_t w, size_t h) {
-  FILE* fp = fopen(filename, "wb");
-  if (!fp) {
-    fprintf(stderr, "Could not open %s for writing", filename);
-    return false;
-  }
-  fprintf(fp,
-          "P7\nWIDTH %d\nHEIGHT %d\nDEPTH 4\nMAXVAL 255\nTUPLTYPE "
-          "RGB_ALPHA\nENDHDR\n",
-          static_cast<int>(w), static_cast<int>(h));
-  size_t num_bytes = w * h * 4;
-  if (fwrite(buffer, 1, num_bytes, fp) != num_bytes) {
-    fclose(fp);
-    return false;
-  };
-  if (fclose(fp) != 0) {
-    return false;
-  }
-  return true;
-}
-
-/** Decodes JPEG XL image to 8-bit integer RGBA pixels and an ICC Profile, in a
- * progressive way, saving the intermediate steps.
- */
-bool DecodeJpegXlProgressive(const uint8_t* jxl, size_t size,
-                             const char* filename, size_t chunksize) {
-  std::vector<uint8_t> pixels;
-  std::vector<uint8_t> icc_profile;
-  size_t xsize = 0;
-  size_t ysize = 0;
-
-  // Multi-threaded parallel runner.
-  auto runner = JxlResizableParallelRunnerMake(nullptr);
-
-  auto dec = JxlDecoderMake(nullptr);
-  if (JXL_DEC_SUCCESS !=
-      JxlDecoderSubscribeEvents(dec.get(), JXL_DEC_BASIC_INFO |
-                                               JXL_DEC_COLOR_ENCODING |
-                                               JXL_DEC_FULL_IMAGE)) {
-    fprintf(stderr, "JxlDecoderSubscribeEvents failed\n");
-    return false;
-  }
-
-  if (JXL_DEC_SUCCESS != JxlDecoderSetParallelRunner(dec.get(),
-                                                     JxlResizableParallelRunner,
-                                                     runner.get())) {
-    fprintf(stderr, "JxlDecoderSetParallelRunner failed\n");
-    return false;
-  }
-
-  JxlBasicInfo info;
-  JxlPixelFormat format = {4, JXL_TYPE_UINT8, JXL_NATIVE_ENDIAN, 0};
-
-  size_t seen = 0;
-  JxlDecoderSetInput(dec.get(), jxl, chunksize);
-  size_t remaining = chunksize;
-
-  for (;;) {
-    JxlDecoderStatus status = JxlDecoderProcessInput(dec.get());
-
-    if (status == JXL_DEC_ERROR) {
-      fprintf(stderr, "Decoder error\n");
-      return false;
-    } else if (status == JXL_DEC_NEED_MORE_INPUT || status == JXL_DEC_SUCCESS ||
-               status == JXL_DEC_FULL_IMAGE) {
-      seen += remaining - JxlDecoderReleaseInput(dec.get());
-      printf("Flushing after %" PRIu64 " bytes\n", static_cast<uint64_t>(seen));
-      if (status == JXL_DEC_NEED_MORE_INPUT &&
-          JXL_DEC_SUCCESS != JxlDecoderFlushImage(dec.get())) {
-        printf("flush error (no preview yet)\n");
-      } else {
-        char fname[1024];
-        if (snprintf(fname, 1024, "%s-%" PRIu64 ".pam", filename,
-                     static_cast<uint64_t>(seen)) >= 1024) {
-          fprintf(stderr, "Filename too long\n");
-          return false;
-        };
-        if (!WritePAM(fname, pixels.data(), xsize, ysize)) {
-          fprintf(stderr, "Error writing progressive output\n");
-        }
-      }
-      remaining = size - seen;
-      if (remaining > chunksize) remaining = chunksize;
-      if (remaining == 0) {
-        if (status == JXL_DEC_NEED_MORE_INPUT) {
-          fprintf(stderr, "Error, already provided all input\n");
-          return false;
-        } else {
-          return true;
-        }
-      }
-      JxlDecoderSetInput(dec.get(), jxl + seen, remaining);
-    } else if (status == JXL_DEC_BASIC_INFO) {
-      if (JXL_DEC_SUCCESS != JxlDecoderGetBasicInfo(dec.get(), &info)) {
-        fprintf(stderr, "JxlDecoderGetBasicInfo failed\n");
-        return false;
-      }
-      xsize = info.xsize;
-      ysize = info.ysize;
-      JxlResizableParallelRunnerSetThreads(
-          runner.get(),
-          JxlResizableParallelRunnerSuggestThreads(info.xsize, info.ysize));
-    } else if (status == JXL_DEC_COLOR_ENCODING) {
-      // Get the ICC color profile of the pixel data
-      size_t icc_size;
-      if (JXL_DEC_SUCCESS !=
-          JxlDecoderGetICCProfileSize(
-              dec.get(), JXL_COLOR_PROFILE_TARGET_ORIGINAL, &icc_size)) {
-        fprintf(stderr, "JxlDecoderGetICCProfileSize failed\n");
-        return false;
-      }
-      icc_profile.resize(icc_size);
-      if (JXL_DEC_SUCCESS != JxlDecoderGetColorAsICCProfile(
-                                 dec.get(), JXL_COLOR_PROFILE_TARGET_ORIGINAL,
-                                 icc_profile.data(), icc_profile.size())) {
-        fprintf(stderr, "JxlDecoderGetColorAsICCProfile failed\n");
-        return false;
-      }
-    } else if (status == JXL_DEC_NEED_IMAGE_OUT_BUFFER) {
-      size_t buffer_size;
-      if (JXL_DEC_SUCCESS !=
-          JxlDecoderImageOutBufferSize(dec.get(), &format, &buffer_size)) {
-        fprintf(stderr, "JxlDecoderImageOutBufferSize failed\n");
-        return false;
-      }
-      if (buffer_size != xsize * ysize * 4) {
-        fprintf(stderr, "Invalid out buffer size %" PRIu64 " != %" PRIu64 "\n",
-                static_cast<uint64_t>(buffer_size),
-                static_cast<uint64_t>(xsize * ysize * 4));
-        return false;
-      }
-      pixels.resize(xsize * ysize * 4);
-      if (JXL_DEC_SUCCESS != JxlDecoderSetImageOutBuffer(dec.get(), &format,
-                                                         pixels.data(),
-                                                         pixels.size())) {
-        fprintf(stderr, "JxlDecoderSetImageOutBuffer failed\n");
-        return false;
-      }
-    } else {
-      fprintf(stderr, "Unknown decoder status\n");
-      return false;
-    }
-  }
-}
-
-bool LoadFile(const char* filename, std::vector<uint8_t>* out) {
-  FILE* file = fopen(filename, "rb");
-  if (!file) {
-    return false;
-  }
-
-  if (fseek(file, 0, SEEK_END) != 0) {
-    fclose(file);
-    return false;
-  }
-
-  long size = ftell(file);  // NOLINT
-  // Avoid invalid file or directory.
-  if (size >= LONG_MAX || size < 0) {
-    fclose(file);
-    return false;
-  }
-
-  if (fseek(file, 0, SEEK_SET) != 0) {
-    fclose(file);
-    return false;
-  }
-
-  out->resize(size);
-  size_t readsize = fread(out->data(), 1, size, file);
-  if (fclose(file) != 0) {
-    return false;
-  }
-
-  return readsize == static_cast<size_t>(size);
-}
-
-int main(int argc, char* argv[]) {
-  if (argc < 3) {
-    fprintf(
-        stderr,
-        "Usage: %s <jxl> <basename> [chunksize]\n"
-        "Where:\n"
-        "  jxl = input JPEG XL image filename\n"
-        "  basename = prefix of output filenames\n"
-        "  chunksize = loads chunksize bytes at a time and writes\n"
-        "              intermediate results to basename-[bytes loaded].pam\n"
-        "Output files will be overwritten.\n",
-        argv[0]);
-    return 1;
-  }
-
-  const char* jxl_filename = argv[1];
-  const char* png_filename = argv[2];
-
-  std::vector<uint8_t> jxl;
-  if (!LoadFile(jxl_filename, &jxl)) {
-    fprintf(stderr, "couldn't load %s\n", jxl_filename);
-    return 1;
-  }
-  size_t chunksize = jxl.size();
-  if (argc > 3) {
-    long cs = atol(argv[3]);  // NOLINT
-    if (cs < 100) {
-      fprintf(stderr, "Chunk size is too low, try at least 100 bytes\n");
-      return 1;
-    }
-    chunksize = cs;
-  }
-
-  if (!DecodeJpegXlProgressive(jxl.data(), jxl.size(), png_filename,
-                               chunksize)) {
-    fprintf(stderr, "Error while decoding the jxl file\n");
-    return 1;
-  }
-  return 0;
-}
diff --git a/third_party/jpeg-xl/examples/encode_oneshot.cc b/third_party/jpeg-xl/examples/encode_oneshot.cc
deleted file mode 100644
index 6c45a70411e63..0000000000000
--- a/third_party/jpeg-xl/examples/encode_oneshot.cc
+++ /dev/null
@@ -1,284 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This example encodes a file containing a floating point image to another
-// file containing JPEG XL image with a single frame.
-
-#include <jxl/codestream_header.h>
-#include <jxl/color_encoding.h>
-#include <jxl/encode.h>
-#include <jxl/encode_cxx.h>
-#include <jxl/thread_parallel_runner.h>
-#include <jxl/thread_parallel_runner_cxx.h>
-#include <jxl/types.h>
-#include <limits.h>
-#include <string.h>
-
-#include <cstdint>
-#include <cstdio>
-#include <sstream>
-#include <string>
-#include <vector>
-
-/**
- * Reads from .pfm file (Portable FloatMap)
- *
- * @param filename name of the file to read
- * @param pixels vector to fill with loaded pixels as 32-bit floating point with
- * 3-channel RGB
- * @param xsize set to width of loaded image
- * @param ysize set to height of loaded image
- */
-bool ReadPFM(const char* filename, std::vector<float>* pixels, uint32_t* xsize,
-             uint32_t* ysize) {
-  FILE* file = fopen(filename, "rb");
-  if (!file) {
-    fprintf(stderr, "Could not open %s for reading.\n", filename);
-    return false;
-  }
-  uint32_t endian_test = 1;
-  uint8_t little_endian_check[4];
-  memcpy(little_endian_check, &endian_test, 4);
-  bool little_endian = (little_endian_check[0] == 1);
-
-  if (fseek(file, 0, SEEK_END) != 0) {
-    fclose(file);
-    return false;
-  }
-
-  long size = ftell(file);  // NOLINT
-  // Avoid invalid file or directory.
-  if (size >= LONG_MAX || size < 0) {
-    fclose(file);
-    return false;
-  }
-
-  if (fseek(file, 0, SEEK_SET) != 0) {
-    fclose(file);
-    return false;
-  }
-
-  std::vector<char> data;
-  data.resize(size);
-
-  size_t readsize = fread(data.data(), 1, size, file);
-  if (static_cast<long>(readsize) != size) {  // NOLINT
-    fclose(file);
-    return false;
-  }
-  if (fclose(file) != 0) {
-    return false;
-  }
-
-  std::stringstream datastream;
-  std::string datastream_content(data.data(), data.size());
-  datastream.str(datastream_content);
-
-  std::string pf_token;
-  getline(datastream, pf_token, '\n');
-  if (pf_token != "PF") {
-    fprintf(stderr,
-            "%s doesn't seem to be a 3 channel Portable FloatMap file (missing "
-            "'PF\\n' "
-            "bytes).\n",
-            filename);
-    return false;
-  }
-
-  std::string xsize_token;
-  getline(datastream, xsize_token, ' ');
-  *xsize = std::stoi(xsize_token);
-
-  std::string ysize_token;
-  getline(datastream, ysize_token, '\n');
-  *ysize = std::stoi(ysize_token);
-
-  std::string endianness_token;
-  getline(datastream, endianness_token, '\n');
-  bool input_little_endian;
-  if (endianness_token == "1.0") {
-    input_little_endian = false;
-  } else if (endianness_token == "-1.0") {
-    input_little_endian = true;
-  } else {
-    fprintf(stderr,
-            "%s doesn't seem to be a Portable FloatMap file (endianness token "
-            "isn't '1.0' or '-1.0').\n",
-            filename);
-    return false;
-  }
-
-  size_t offset = pf_token.size() + 1 + xsize_token.size() + 1 +
-                  ysize_token.size() + 1 + endianness_token.size() + 1;
-
-  if (data.size() != *ysize * *xsize * 3 * 4 + offset) {
-    fprintf(stderr,
-            "%s doesn't seem to be a Portable FloatMap file (pixel data bytes "
-            "are %d, but expected %d * %d * 3 * 4 + %d (%d).\n",
-            filename, static_cast<int>(data.size()), static_cast<int>(*ysize),
-            static_cast<int>(*xsize), static_cast<int>(offset),
-            static_cast<int>(*ysize * *xsize * 3 * 4 + offset));
-    return false;
-  }
-
-  if (little_endian != input_little_endian) {
-    fprintf(stderr,
-            "%s has a different endianness than we do, conversion is not "
-            "supported.\n",
-            filename);
-    return false;
-  }
-
-  pixels->resize(*ysize * *xsize * 3);
-
-  for (int y = *ysize - 1; y >= 0; y--) {
-    for (int x = 0; x < static_cast<int>(*xsize); x++) {
-      for (int c = 0; c < 3; c++) {
-        memcpy(pixels->data() + (y * *xsize + x) * 3 + c, data.data() + offset,
-               sizeof(float));
-        offset += sizeof(float);
-      }
-    }
-  }
-
-  return true;
-}
-
-/**
- * Compresses the provided pixels.
- *
- * @param pixels input pixels
- * @param xsize width of the input image
- * @param ysize height of the input image
- * @param compressed will be populated with the compressed bytes
- */
-bool EncodeJxlOneshot(const std::vector<float>& pixels, const uint32_t xsize,
-                      const uint32_t ysize, std::vector<uint8_t>* compressed) {
-  auto enc = JxlEncoderMake(/*memory_manager=*/nullptr);
-  auto runner = JxlThreadParallelRunnerMake(
-      /*memory_manager=*/nullptr,
-      JxlThreadParallelRunnerDefaultNumWorkerThreads());
-  if (JXL_ENC_SUCCESS != JxlEncoderSetParallelRunner(enc.get(),
-                                                     JxlThreadParallelRunner,
-                                                     runner.get())) {
-    fprintf(stderr, "JxlEncoderSetParallelRunner failed\n");
-    return false;
-  }
-
-  JxlPixelFormat pixel_format = {3, JXL_TYPE_FLOAT, JXL_NATIVE_ENDIAN, 0};
-
-  JxlBasicInfo basic_info;
-  JxlEncoderInitBasicInfo(&basic_info);
-  basic_info.xsize = xsize;
-  basic_info.ysize = ysize;
-  basic_info.bits_per_sample = 32;
-  basic_info.exponent_bits_per_sample = 8;
-  basic_info.uses_original_profile = JXL_FALSE;
-  if (JXL_ENC_SUCCESS != JxlEncoderSetBasicInfo(enc.get(), &basic_info)) {
-    fprintf(stderr, "JxlEncoderSetBasicInfo failed\n");
-    return false;
-  }
-
-  JxlColorEncoding color_encoding = {};
-  JXL_BOOL is_gray = TO_JXL_BOOL(pixel_format.num_channels < 3);
-  JxlColorEncodingSetToSRGB(&color_encoding, is_gray);
-  if (JXL_ENC_SUCCESS !=
-      JxlEncoderSetColorEncoding(enc.get(), &color_encoding)) {
-    fprintf(stderr, "JxlEncoderSetColorEncoding failed\n");
-    return false;
-  }
-
-  JxlEncoderFrameSettings* frame_settings =
-      JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-
-  if (JXL_ENC_SUCCESS !=
-      JxlEncoderAddImageFrame(frame_settings, &pixel_format,
-                              static_cast<const void*>(pixels.data()),
-                              sizeof(float) * pixels.size())) {
-    fprintf(stderr, "JxlEncoderAddImageFrame failed\n");
-    return false;
-  }
-  JxlEncoderCloseInput(enc.get());
-
-  compressed->resize(64);
-  uint8_t* next_out = compressed->data();
-  size_t avail_out = compressed->size() - (next_out - compressed->data());
-  JxlEncoderStatus process_result = JXL_ENC_NEED_MORE_OUTPUT;
-  while (process_result == JXL_ENC_NEED_MORE_OUTPUT) {
-    process_result = JxlEncoderProcessOutput(enc.get(), &next_out, &avail_out);
-    if (process_result == JXL_ENC_NEED_MORE_OUTPUT) {
-      size_t offset = next_out - compressed->data();
-      compressed->resize(compressed->size() * 2);
-      next_out = compressed->data() + offset;
-      avail_out = compressed->size() - offset;
-    }
-  }
-  compressed->resize(next_out - compressed->data());
-  if (JXL_ENC_SUCCESS != process_result) {
-    fprintf(stderr, "JxlEncoderProcessOutput failed\n");
-    return false;
-  }
-
-  return true;
-}
-
-/**
- * Writes bytes to file.
- */
-bool WriteFile(const std::vector<uint8_t>& bytes, const char* filename) {
-  FILE* file = fopen(filename, "wb");
-  if (!file) {
-    fprintf(stderr, "Could not open %s for writing\n", filename);
-    return false;
-  }
-  if (fwrite(bytes.data(), sizeof(uint8_t), bytes.size(), file) !=
-      bytes.size()) {
-    fprintf(stderr, "Could not write bytes to %s\n", filename);
-    fclose(file);
-    return false;
-  }
-  if (fclose(file) != 0) {
-    fprintf(stderr, "Could not close %s\n", filename);
-    return false;
-  }
-  return true;
-}
-
-int main(int argc, char* argv[]) {
-  if (argc != 3) {
-    fprintf(stderr,
-            "Usage: %s <pfm> <jxl>\n"
-            "Where:\n"
-            "  pfm = input Portable FloatMap image filename\n"
-            "  jxl = output JPEG XL image filename\n"
-            "Output files will be overwritten.\n",
-            argv[0]);
-    return 1;
-  }
-
-  const char* pfm_filename = argv[1];
-  const char* jxl_filename = argv[2];
-
-  std::vector<float> pixels;
-  uint32_t xsize;
-  uint32_t ysize;
-  if (!ReadPFM(pfm_filename, &pixels, &xsize, &ysize)) {
-    fprintf(stderr, "Couldn't load %s\n", pfm_filename);
-    return 2;
-  }
-
-  std::vector<uint8_t> compressed;
-  if (!EncodeJxlOneshot(pixels, xsize, ysize, &compressed)) {
-    fprintf(stderr, "Couldn't encode jxl\n");
-    return 3;
-  }
-
-  if (!WriteFile(compressed, jxl_filename)) {
-    fprintf(stderr, "Couldn't write jxl file\n");
-    return 4;
-  }
-
-  return 0;
-}
diff --git a/third_party/jpeg-xl/examples/examples.cmake b/third_party/jpeg-xl/examples/examples.cmake
deleted file mode 100644
index b13731ca3c1eb..0000000000000
--- a/third_party/jpeg-xl/examples/examples.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-add_executable(decode_exif_metadata ${CMAKE_CURRENT_LIST_DIR}/decode_exif_metadata.cc)
-target_link_libraries(decode_exif_metadata jxl_dec jxl_threads)
-add_executable(decode_oneshot ${CMAKE_CURRENT_LIST_DIR}/decode_oneshot.cc)
-target_link_libraries(decode_oneshot jxl_dec jxl_threads)
-add_executable(decode_progressive ${CMAKE_CURRENT_LIST_DIR}/decode_progressive.cc)
-target_link_libraries(decode_progressive jxl_dec jxl_threads)
-add_executable(encode_oneshot ${CMAKE_CURRENT_LIST_DIR}/encode_oneshot.cc)
-target_link_libraries(encode_oneshot jxl jxl_threads)
diff --git a/third_party/jpeg-xl/flake.lock b/third_party/jpeg-xl/flake.lock
deleted file mode 100644
index 3bfd004b14863..0000000000000
--- a/third_party/jpeg-xl/flake.lock
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1702312524,
-        "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a9bf124c46ef298113270b1f84a164865987a91c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/third_party/jpeg-xl/flake.nix b/third_party/jpeg-xl/flake.nix
deleted file mode 100644
index 64a36311ab13b..0000000000000
--- a/third_party/jpeg-xl/flake.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
-  };
-  outputs = { self, nixpkgs, flake-utils }:
-    flake-utils.lib.eachDefaultSystem
-      (system:
-        let
-          pkgs = import nixpkgs {
-            inherit system;
-          };
-        in
-        with pkgs;
-        {
-          devShells.default = mkShell {
-            buildInputs = [
-              clang
-              cmake
-              pkg-config
-              gtest
-              doxygen
-              graphviz
-              python3
-              libclang.python
-              libpng
-              giflib
-              lcms2
-              brotli
-            ];
-            shellHook = ''
-              export CC=clang
-              export CXX=clang++
-            '';
-          };
-        }
-      );
-}
diff --git a/third_party/jpeg-xl/lib/BUILD b/third_party/jpeg-xl/lib/BUILD
deleted file mode 100644
index 3d48919f7775e..0000000000000
--- a/third_party/jpeg-xl/lib/BUILD
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
-load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
-
-# Load sources/headers/tests lists.
-load(
-    "jxl_lists.bzl",
-    "libjxl_base_sources",
-    "libjxl_cms_sources",
-    "libjxl_codec_apng_sources",
-    "libjxl_codec_exr_sources",
-    "libjxl_codec_gif_sources",
-    "libjxl_codec_jpegli_sources",
-    "libjxl_codec_jpg_sources",
-    "libjxl_codec_jxl_sources",
-    "libjxl_codec_npy_sources",
-    "libjxl_codec_pgx_sources",
-    "libjxl_codec_pnm_sources",
-    "libjxl_dec_box_sources",
-    "libjxl_dec_jpeg_sources",
-    "libjxl_dec_sources",
-    "libjxl_enc_sources",
-    "libjxl_extras_for_tools_sources",
-    "libjxl_extras_sources",
-    # "libjxl_gbench_sources",
-    # "libjxl_jpegli_lib_version",
-    "libjxl_jpegli_libjpeg_helper_files",
-    "libjxl_jpegli_sources",
-    "libjxl_jpegli_testlib_files",
-    "libjxl_jpegli_tests",
-    "libjxl_major_version",
-    "libjxl_minor_version",
-    "libjxl_patch_version",
-    "libjxl_public_headers",
-    "libjxl_testlib_files",
-    "libjxl_tests",
-    "libjxl_threads_public_headers",
-    "libjxl_threads_sources",
-)
-load(
-    "jxl_vars.bzl",
-    "libjxl_deps_brotli",
-    "libjxl_deps_exr",
-    "libjxl_deps_gif",
-    "libjxl_deps_gtest",
-    "libjxl_deps_hwy",
-    "libjxl_deps_hwy_nanobenchmark",
-    "libjxl_deps_hwy_test_util",
-    "libjxl_deps_jpeg",
-    "libjxl_deps_png",
-    "libjxl_deps_runfiles",
-    "libjxl_deps_skcms",
-    # "libjxl_deps_testdata",
-    # "libjxl_deps_webp",
-    "libjxl_root_package",
-    "libjxl_test_shards",
-    "libjxl_test_timeouts",
-)
-
-DEFAULT_VISIBILITY = ["//:__subpackages__"]
-
-DEFAULT_COMPATIBILITY = []
-
-INCLUDES_DIR = "include"
-
-package(
-    default_visibility = DEFAULT_VISIBILITY,
-)
-
-licenses(["notice"])
-
-exports_files(["LICENSE"])
-
-EXPORT_TEMPLATE = """
-#ifndef @_EXPORT_H
-#define @_EXPORT_H
-
-#define @_EXPORT
-#define @_NO_EXPORT
-
-#ifndef @_DEPRECATED
-#  define @_DEPRECATED __attribute__ ((__deprecated__))
-#endif
-
-#endif
-"""
-
-JXL_EXPORT_H = INCLUDES_DIR + "/jxl/jxl_export.h"
-
-genrule(
-    name = "create_jxl_export",
-    outs = [JXL_EXPORT_H],
-    cmd = "echo '" + EXPORT_TEMPLATE.replace("@", "JXL") + "' > $@",
-    compatible_with = DEFAULT_COMPATIBILITY,
-)
-
-JXL_CMS_EXPORT_H = INCLUDES_DIR + "/jxl/jxl_cms_export.h"
-
-genrule(
-    name = "create_jxl_cms_export",
-    outs = [JXL_CMS_EXPORT_H],
-    cmd = "echo '" + EXPORT_TEMPLATE.replace("@", "JXL_CMS") + "' > $@",
-    compatible_with = DEFAULT_COMPATIBILITY,
-)
-
-JXL_THREADS_EXPORT_H = INCLUDES_DIR + "/jxl/jxl_threads_export.h"
-
-genrule(
-    name = "create_jxl_threads_export",
-    outs = [JXL_THREADS_EXPORT_H],
-    cmd = "echo '" + EXPORT_TEMPLATE.replace("@", "JXL_THREADS") + "' > $@",
-    compatible_with = DEFAULT_COMPATIBILITY,
-)
-
-JXL_VERSION_H = INCLUDES_DIR + "/jxl/version.h"
-
-expand_template(
-    name = "expand_jxl_version",
-    out = JXL_VERSION_H,
-    compatible_with = DEFAULT_COMPATIBILITY,
-    substitutions = {
-        "@JPEGXL_MAJOR_VERSION@": str(libjxl_major_version),
-        "@JPEGXL_MINOR_VERSION@": str(libjxl_minor_version),
-        "@JPEGXL_PATCH_VERSION@": str(libjxl_patch_version),
-    },
-    template = "jxl/version.h.in",
-)
-
-cc_library(
-    name = "jxl_version",
-    hdrs = [JXL_VERSION_H],
-    compatible_with = DEFAULT_COMPATIBILITY,
-    strip_include_prefix = INCLUDES_DIR,
-)
-
-JPEGLI_JCONFIG_H = INCLUDES_DIR + "/jpegli/jconfig.h"
-
-JPEGLI_JMORECFG_H = INCLUDES_DIR + "/jpegli/jmorecfg.h"
-
-JPEGLI_JPEGLIB_H = INCLUDES_DIR + "/jpegli/jpeglib.h"
-
-copy_file(
-    name = "expand_jconfig",
-    src = "@libjpeg_turbo//:jconfig.h",
-    out = JPEGLI_JCONFIG_H,
-    compatible_with = DEFAULT_COMPATIBILITY,
-)
-
-copy_file(
-    name = "copy_jmorecfg",
-    src = "@libjpeg_turbo//:jmorecfg.h",
-    out = JPEGLI_JMORECFG_H,
-    compatible_with = DEFAULT_COMPATIBILITY,
-)
-
-copy_file(
-    name = "copy_jpeglib",
-    src = "@libjpeg_turbo//:jpeglib.h",
-    out = JPEGLI_JPEGLIB_H,
-    compatible_with = DEFAULT_COMPATIBILITY,
-)
-
-cc_library(
-    name = "includes",
-    hdrs = libjxl_public_headers + [
-        JXL_EXPORT_H,
-        JXL_CMS_EXPORT_H,
-    ],
-    compatible_with = DEFAULT_COMPATIBILITY,
-    strip_include_prefix = INCLUDES_DIR,
-    deps = [":jxl_version"],
-)
-
-cc_library(
-    name = "libjpeg_includes",
-    hdrs = [
-        JPEGLI_JCONFIG_H,
-        JPEGLI_JMORECFG_H,
-        JPEGLI_JPEGLIB_H,
-    ],
-    compatible_with = DEFAULT_COMPATIBILITY,
-    strip_include_prefix = INCLUDES_DIR + "/jpegli",
-)
-
-cc_library(
-    name = "base",
-    srcs = [path for path in libjxl_base_sources if path.endswith(".cc")],
-    hdrs = [path for path in libjxl_base_sources if path.endswith(".h")],
-    compatible_with = DEFAULT_COMPATIBILITY,
-    deps = [
-        ":includes",
-    ] + libjxl_deps_hwy,
-)
-
-cc_library(
-    name = "jpegxl",
-    srcs = libjxl_dec_sources + libjxl_dec_box_sources + libjxl_dec_jpeg_sources + libjxl_enc_sources + libjxl_cms_sources,
-    compatible_with = DEFAULT_COMPATIBILITY,
-    defines = [
-        "JPEGXL_ENABLE_SKCMS=1",
-    ],
-    deps = [
-        ":base",
-        ":includes",
-    ] + libjxl_deps_brotli + libjxl_deps_hwy + libjxl_deps_skcms,
-)
-
-cc_library(
-    name = "jpegxl_private",
-    hdrs = [
-        path
-        for path in libjxl_dec_sources + libjxl_dec_box_sources + libjxl_dec_jpeg_sources + libjxl_enc_sources + libjxl_cms_sources
-        if path.endswith(".h") and not path.endswith("-inl.h")
-    ],
-    compatible_with = DEFAULT_COMPATIBILITY,
-    deps = [":jpegxl"],
-)
-
-cc_library(
-    name = "jpegxl_threads",
-    srcs = libjxl_threads_sources,
-    hdrs = libjxl_threads_public_headers + [JXL_THREADS_EXPORT_H],
-    compatible_with = DEFAULT_COMPATIBILITY,
-    strip_include_prefix = INCLUDES_DIR,
-    deps = [
-        ":base",
-        ":includes",
-    ],
-)
-
-CODEC_FILES = libjxl_codec_apng_sources + libjxl_codec_exr_sources + libjxl_codec_gif_sources + libjxl_codec_jpegli_sources + libjxl_codec_jpg_sources + libjxl_codec_jxl_sources + libjxl_codec_npy_sources + libjxl_codec_pgx_sources + libjxl_codec_pnm_sources
-
-CODEC_SRCS = [path for path in CODEC_FILES if path.endswith(".cc")]
-
-CODEC_HDRS = [path for path in CODEC_FILES if path.endswith(".h")]
-
-cc_library(
-    name = "jpegli",
-    srcs = libjxl_jpegli_sources,
-    hdrs = [
-        "jpegli/common_internal.h",  # TODO(eustas): should not be here
-    ],
-    compatible_with = DEFAULT_COMPATIBILITY,
-    deps = [
-        ":jpegxl_private",
-        ":libjpeg_includes",
-    ] + libjxl_deps_hwy,
-)
-
-# TODO(eustas): build codecs separately?
-cc_library(
-    name = "jpegxl_extras",
-    srcs = libjxl_extras_sources + libjxl_extras_for_tools_sources + CODEC_SRCS,
-    hdrs = CODEC_HDRS,
-    compatible_with = DEFAULT_COMPATIBILITY,
-    defines = [
-        "JPEGXL_ENABLE_APNG=1",
-        "JPEGXL_ENABLE_EXR=1",
-        "JPEGXL_ENABLE_GIF=1",
-        "JPEGXL_ENABLE_JPEG=1",
-        "JPEGXL_ENABLE_JPEGLI=1",
-    ],
-    deps = [
-        ":jpegli",
-        ":jpegxl_private",
-        ":jpegxl_threads",
-        ":jxl_version",
-    ] + libjxl_deps_exr + libjxl_deps_gif + libjxl_deps_jpeg + libjxl_deps_png,
-)
-
-TESTLIB_FILES = libjxl_testlib_files + libjxl_jpegli_testlib_files + libjxl_jpegli_libjpeg_helper_files
-
-cc_library(
-    name = "test_utils",
-    testonly = 1,
-    srcs = [path for path in TESTLIB_FILES if not path.endswith(".h")],
-    hdrs = [path for path in TESTLIB_FILES if path.endswith(".h")],
-    compatible_with = DEFAULT_COMPATIBILITY,
-    defines = [
-        'JPEGXL_ROOT_PACKAGE=\'"' + libjxl_root_package + '"\'',
-    ],
-    deps = [
-        ":jpegli",
-        ":jpegxl_extras",
-        ":jpegxl_private",
-    ] + libjxl_deps_runfiles,
-)
-
-TESTS = [path.partition(".")[0] for path in libjxl_tests + libjxl_jpegli_tests]
-
-[
-    cc_test(
-        name = test,
-        timeout = libjxl_test_timeouts.get(test, "moderate"),
-        srcs = [
-            test + ".cc",
-            "jpegli/testing.h",
-            "jxl/testing.h",
-        ],
-        data = ["//:testdata"],
-        shard_count = libjxl_test_shards.get(test, 1),
-        deps = [
-            ":jpegxl_extras",
-            ":jpegxl_private",
-            ":jpegxl_threads",
-            ":test_utils",
-        ] + libjxl_deps_gtest + libjxl_deps_hwy_test_util + libjxl_deps_hwy_nanobenchmark,
-    )
-    for test in TESTS
-]
diff --git a/third_party/jpeg-xl/lib/CMakeLists.txt b/third_party/jpeg-xl/lib/CMakeLists.txt
deleted file mode 100644
index 8973ea6ece922..0000000000000
--- a/third_party/jpeg-xl/lib/CMakeLists.txt
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-set(JPEGXL_MAJOR_VERSION 0)
-set(JPEGXL_MINOR_VERSION 11)
-set(JPEGXL_PATCH_VERSION 1)
-set(JPEGXL_LIBRARY_VERSION
-    "${JPEGXL_MAJOR_VERSION}.${JPEGXL_MINOR_VERSION}.${JPEGXL_PATCH_VERSION}")
-
-# This is the library API/ABI compatibility version. Changing this value makes
-# the shared library incompatible with previous version. A program linked
-# against this shared library SOVERSION will not run with an older SOVERSION.
-# It is important to update this value when making incompatible API/ABI changes
-# so that programs that depend on libjxl can update their dependencies. Semantic
-# versioning allows 0.y.z to have incompatible changes in minor versions.
-set(JPEGXL_SO_MINOR_VERSION 11)
-if (JPEGXL_MAJOR_VERSION EQUAL 0)
-  set(JPEGXL_LIBRARY_SOVERSION
-      "${JPEGXL_MAJOR_VERSION}.${JPEGXL_SO_MINOR_VERSION}")
-else()
-  set(JPEGXL_LIBRARY_SOVERSION "${JPEGXL_MAJOR_VERSION}")
-endif()
-
-
-# List of warning and feature flags for our library and tests.
-if (MSVC)
-  set(JPEGXL_INTERNAL_FLAGS
-    # TODO(janwas): add flags
-  )
-else ()
-  set(JPEGXL_INTERNAL_FLAGS
-    # F_FLAGS
-    -fmerge-all-constants
-    -fno-builtin-fwrite
-    -fno-builtin-fread
-
-    # WARN_FLAGS
-    -Wall
-    -Wextra
-    -Wc++11-compat
-    -Warray-bounds
-    -Wformat-security
-    -Wimplicit-fallthrough
-    -Wno-register  # Needed by public headers in lcms
-    -Wno-unused-function
-    -Wno-unused-parameter
-    -Wnon-virtual-dtor
-    -Woverloaded-virtual
-    -Wvla
-  )
-
-  # Warning flags supported by clang.
-  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    list(APPEND JPEGXL_INTERNAL_FLAGS
-      -Wdeprecated-increment-bool
-      # TODO(deymo): Add -Wextra-semi once we update third_party/highway.
-      # -Wextra-semi
-      -Wfloat-overflow-conversion
-      -Wfloat-zero-conversion
-      -Wfor-loop-analysis
-      -Wgnu-redeclared-enum
-      -Winfinite-recursion
-      -Wliteral-conversion
-      -Wno-c++98-compat
-      -Wno-unused-command-line-argument
-      -Wprivate-header
-      -Wself-assign
-      -Wstring-conversion
-      -Wtautological-overlap-compare
-      -Wthread-safety-analysis
-      -Wundefined-func-template
-      -Wunreachable-code
-      -Wunused-comparison
-    )
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.0)
-      list(APPEND HWY_FLAGS -Wc++2a-extensions)
-    endif()
-  endif()  # Clang
-
-  if (WIN32)
-    list(APPEND JPEGXL_INTERNAL_FLAGS
-      -Wno-cast-align
-      -Wno-double-promotion
-      -Wno-float-equal
-      -Wno-format-nonliteral
-      -Wno-shadow
-      -Wno-sign-conversion
-      -Wno-zero-as-null-pointer-constant
-    )
-
-    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-      list(APPEND JPEGXL_INTERNAL_FLAGS
-        -Wno-used-but-marked-unused
-        -Wno-unused-template
-        -Wno-unused-member-function
-        -Wno-shadow-field-in-constructor
-        -Wno-language-extension-token
-        -Wno-global-constructors
-        -Wno-c++98-compat-pedantic
-      )
-    endif()  # Clang
-  else()  # WIN32
-    list(APPEND JPEGXL_INTERNAL_FLAGS
-      -fsized-deallocation
-      -fno-exceptions
-
-      # Language flags
-      -fmath-errno
-    )
-
-    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-      list(APPEND JPEGXL_INTERNAL_FLAGS
-        -fnew-alignment=8
-        -fno-cxx-exceptions
-        -fno-slp-vectorize
-        -fno-vectorize
-
-        -disable-free
-        -disable-llvm-verifier
-      )
-    endif()  # Clang
-  endif()  # WIN32
-endif()  #!MSVC
-
-if (JPEGXL_ENABLE_SKCMS)
-  list(APPEND JPEGXL_INTERNAL_FLAGS -DJPEGXL_ENABLE_SKCMS=1)
-endif ()
-
-# strips the -internal suffix from all the elements in LIST
-function(strip_internal OUTPUT_VAR LIB_LIST)
-  foreach(lib IN LISTS ${LIB_LIST})
-    string(REGEX REPLACE "-internal$" "" lib "${lib}")
-    list(APPEND out_list "${lib}")
-  endforeach()
-  set(${OUTPUT_VAR} ${out_list} PARENT_SCOPE)
-endfunction()
-
-# set variables for jxl_cms.cmake and jxl.cmake
-if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
-    set(PKGCONFIG_TARGET_INCLUDES "${CMAKE_INSTALL_INCLUDEDIR}")
-else()
-    set(PKGCONFIG_TARGET_INCLUDES "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
-endif()
-if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
-    set(PKGCONFIG_TARGET_LIBS "${CMAKE_INSTALL_LIBDIR}")
-else()
-    set(PKGCONFIG_TARGET_LIBS "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
-endif()
-
-include(CheckCXXSymbolExists)
-set(PKGCONFIG_CXX_LIB "")
-check_cxx_symbol_exists(__GLIBCXX__ iostream LIBSTDCXX)
-check_cxx_symbol_exists(_LIBCPP_VERSION iostream LIBCXX)
-if(LIBSTDCXX)
-  set(PKGCONFIG_CXX_LIB "-lstdc++")
-elseif(LIBCXX)
-  set(PKGCONFIG_CXX_LIB "-lc++")
-endif()
-
-# The jxl_cms library definition.
-include(jxl_cms.cmake)
-# The jxl library definition.
-include(jxl.cmake)
-
-# Other libraries outside the core jxl library.
-if(JPEGXL_ENABLE_TOOLS OR BUILD_TESTING)
-  include(jxl_extras.cmake)
-endif()
-include(jxl_threads.cmake)
-if (JPEGXL_ENABLE_JPEGLI)
-  include(jpegli.cmake)
-endif()
-
-# For simplicity all the library headers, both source and generated ones, are
-# gathered in the binary folder. There is no distinction on which libraries use
-# which header since it is expected that all developer libraries are available
-# together at build time.
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/jxl
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-
-if(BUILD_TESTING)
-  include(GoogleTest)
-endif()
-
-# Tests for the jxl library.
-include(jxl_tests.cmake)
-
-if(BUILD_TESTING)
-  # Google benchmark for the jxl library
-  include(jxl_benchmark.cmake)
-endif()
diff --git a/third_party/jpeg-xl/lib/extras/LICENSE.apngdis b/third_party/jpeg-xl/lib/extras/LICENSE.apngdis
deleted file mode 100644
index eb0ba7c07b180..0000000000000
--- a/third_party/jpeg-xl/lib/extras/LICENSE.apngdis
+++ /dev/null
@@ -1,27 +0,0 @@
-APNG Disassembler 2.8
-
-Deconstructs APNG files into individual frames.
-
-http://apngdis.sourceforge.net
-
-Copyright (c) 2010-2015 Max Stepin
-maxst at users.sourceforge.net
-
-zlib license
-------------
-
-This software is provided 'as-is', without any express or implied
-warranty.  In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
diff --git a/third_party/jpeg-xl/lib/extras/README.md b/third_party/jpeg-xl/lib/extras/README.md
deleted file mode 100644
index 06a9b5ea0782b..0000000000000
--- a/third_party/jpeg-xl/lib/extras/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## JPEG XL "extras"
-
-The files in this directory do not form part of the library or codec and are
-only used by tests or specific internal tools that have access to the internals
-of the library.
diff --git a/third_party/jpeg-xl/lib/extras/alpha_blend.cc b/third_party/jpeg-xl/lib/extras/alpha_blend.cc
deleted file mode 100644
index 8e34d56cecbb9..0000000000000
--- a/third_party/jpeg-xl/lib/extras/alpha_blend.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/alpha_blend.h"
-
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-namespace extras {
-
-namespace {
-
-Status AlphaBlend(PackedFrame* frame, const float background[3]) {
-  if (!frame) return true;
-  const PackedImage& im = frame->color;
-  JxlPixelFormat format = im.format;
-  if (format.num_channels != 2 && format.num_channels != 4) {
-    return true;
-  }
-  --format.num_channels;
-  JXL_ASSIGN_OR_RETURN(PackedImage blended,
-                       PackedImage::Create(im.xsize, im.ysize, format));
-  // TODO(szabadka) SIMDify this and make it work for float16.
-  for (size_t y = 0; y < im.ysize; ++y) {
-    for (size_t x = 0; x < im.xsize; ++x) {
-      if (format.num_channels == 2) {
-        float g = im.GetPixelValue(y, x, 0);
-        float a = im.GetPixelValue(y, x, 1);
-        float out = g * a + background[0] * (1 - a);
-        blended.SetPixelValue(y, x, 0, out);
-      } else {
-        float r = im.GetPixelValue(y, x, 0);
-        float g = im.GetPixelValue(y, x, 1);
-        float b = im.GetPixelValue(y, x, 2);
-        float a = im.GetPixelValue(y, x, 3);
-        float out_r = r * a + background[0] * (1 - a);
-        float out_g = g * a + background[1] * (1 - a);
-        float out_b = b * a + background[2] * (1 - a);
-        blended.SetPixelValue(y, x, 0, out_r);
-        blended.SetPixelValue(y, x, 1, out_g);
-        blended.SetPixelValue(y, x, 2, out_b);
-      }
-    }
-  }
-  frame->color = blended.Copy();
-  return true;
-}
-
-}  // namespace
-
-Status AlphaBlend(PackedPixelFile* ppf, const float background[3]) {
-  if (!ppf || ppf->info.alpha_bits == 0) {
-    return true;
-  }
-  ppf->info.alpha_bits = 0;
-  JXL_RETURN_IF_ERROR(AlphaBlend(ppf->preview_frame.get(), background));
-  for (auto& frame : ppf->frames) {
-    JXL_RETURN_IF_ERROR(AlphaBlend(&frame, background));
-  }
-  return true;
-}
-
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/alpha_blend.h b/third_party/jpeg-xl/lib/extras/alpha_blend.h
deleted file mode 100644
index b388a5e22aa48..0000000000000
--- a/third_party/jpeg-xl/lib/extras/alpha_blend.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_ALPHA_BLEND_H_
-#define LIB_EXTRAS_ALPHA_BLEND_H_
-
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-namespace extras {
-
-Status AlphaBlend(PackedPixelFile* ppf, const float background[3]);
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_ALPHA_BLEND_H_
diff --git a/third_party/jpeg-xl/lib/extras/codec.cc b/third_party/jpeg-xl/lib/extras/codec.cc
deleted file mode 100644
index ba4bcfebbc475..0000000000000
--- a/third_party/jpeg-xl/lib/extras/codec.cc
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/codec.h"
-
-#include <jxl/decode.h>
-#include <jxl/types.h>
-
-#include "lib/extras/dec/decode.h"
-#include "lib/extras/enc/apng.h"
-#include "lib/extras/enc/exr.h"
-#include "lib/extras/enc/jpg.h"
-#include "lib/extras/enc/pgx.h"
-#include "lib/extras/enc/pnm.h"
-#include "lib/extras/packed_image.h"
-#include "lib/extras/packed_image_convert.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-namespace {
-
-// Any valid encoding is larger (ensures codecs can read the first few bytes)
-constexpr size_t kMinBytes = 9;
-
-}  // namespace
-
-Status SetFromBytes(const Span<const uint8_t> bytes,
-                    const extras::ColorHints& color_hints, CodecInOut* io,
-                    ThreadPool* pool, const SizeConstraints* constraints,
-                    extras::Codec* orig_codec) {
-  if (bytes.size() < kMinBytes) return JXL_FAILURE("Too few bytes");
-
-  extras::PackedPixelFile ppf;
-  if (extras::DecodeBytes(bytes, color_hints, &ppf, constraints, orig_codec)) {
-    return ConvertPackedPixelFileToCodecInOut(ppf, pool, io);
-  }
-  return JXL_FAILURE("Codecs failed to decode");
-}
-
-Status Encode(const extras::PackedPixelFile& ppf, const extras::Codec codec,
-              std::vector<uint8_t>* bytes, ThreadPool* pool) {
-  bytes->clear();
-  std::unique_ptr<extras::Encoder> encoder;
-  switch (codec) {
-    case extras::Codec::kPNG:
-      encoder = extras::GetAPNGEncoder();
-      if (encoder) {
-        break;
-      } else {
-        return JXL_FAILURE("JPEG XL was built without (A)PNG support");
-      }
-    case extras::Codec::kJPG:
-      encoder = extras::GetJPEGEncoder();
-      if (encoder) {
-        break;
-      } else {
-        return JXL_FAILURE("JPEG XL was built without JPEG support");
-      }
-    case extras::Codec::kPNM:
-      if (ppf.info.alpha_bits > 0) {
-        encoder = extras::GetPAMEncoder();
-      } else if (ppf.info.num_color_channels == 1) {
-        encoder = extras::GetPGMEncoder();
-      } else if (ppf.info.bits_per_sample <= 16) {
-        encoder = extras::GetPPMEncoder();
-      } else {
-        encoder = extras::GetPFMEncoder();
-      }
-      break;
-    case extras::Codec::kPGX:
-      encoder = extras::GetPGXEncoder();
-      break;
-    case extras::Codec::kGIF:
-      return JXL_FAILURE("Encoding to GIF is not implemented");
-    case extras::Codec::kEXR:
-      encoder = extras::GetEXREncoder();
-      if (encoder) {
-        break;
-      } else {
-        return JXL_FAILURE("JPEG XL was built without OpenEXR support");
-      }
-    case extras::Codec::kJXL:
-      // TODO(user): implement
-      return JXL_FAILURE("Codec::kJXL is not supported yet");
-
-    case extras::Codec::kUnknown:
-      return JXL_FAILURE("Cannot encode using Codec::kUnknown");
-  }
-
-  if (!encoder) {
-    return JXL_FAILURE("Invalid codec.");
-  }
-  extras::EncodedImage encoded_image;
-  JXL_RETURN_IF_ERROR(encoder->Encode(ppf, &encoded_image, pool));
-  JXL_ENSURE(encoded_image.bitstreams.size() == 1);
-  *bytes = encoded_image.bitstreams[0];
-
-  return true;
-}
-
-Status Encode(const extras::PackedPixelFile& ppf, const std::string& pathname,
-              std::vector<uint8_t>* bytes, ThreadPool* pool) {
-  std::string extension;
-  const extras::Codec codec =
-      extras::CodecFromPath(pathname, nullptr, &extension);
-  return Encode(ppf, codec, bytes, pool);
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/codec.h b/third_party/jpeg-xl/lib/extras/codec.h
deleted file mode 100644
index 9fd61503cb458..0000000000000
--- a/third_party/jpeg-xl/lib/extras/codec.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_CODEC_H_
-#define LIB_EXTRAS_CODEC_H_
-
-// Facade for image encoders/decoders (PNG, PNM, ...).
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include <string>
-
-#include "lib/extras/dec/color_hints.h"
-#include "lib/extras/dec/decode.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/codec_in_out.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/field_encodings.h"  // MakeBit
-
-namespace jxl {
-
-struct SizeConstraints;
-
-// Decodes "bytes" and sets io->metadata.m.
-// color_space_hint may specify the color space, otherwise, defaults to sRGB.
-Status SetFromBytes(Span<const uint8_t> bytes,
-                    const extras::ColorHints& color_hints, CodecInOut* io,
-                    ThreadPool* pool = nullptr,
-                    const SizeConstraints* constraints = nullptr,
-                    extras::Codec* orig_codec = nullptr);
-// Helper function to use no color_space_hint.
-JXL_INLINE Status SetFromBytes(const Span<const uint8_t> bytes, CodecInOut* io,
-                               ThreadPool* pool = nullptr,
-                               const SizeConstraints* constraints = nullptr,
-                               extras::Codec* orig_codec = nullptr) {
-  return SetFromBytes(bytes, extras::ColorHints(), io, pool, constraints,
-                      orig_codec);
-}
-
-Status Encode(const extras::PackedPixelFile& ppf, extras::Codec codec,
-              std::vector<uint8_t>* bytes, ThreadPool* pool);
-
-Status Encode(const extras::PackedPixelFile& ppf, const std::string& pathname,
-              std::vector<uint8_t>* bytes, ThreadPool* pool = nullptr);
-
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_CODEC_H_
diff --git a/third_party/jpeg-xl/lib/extras/codec_test.cc b/third_party/jpeg-xl/lib/extras/codec_test.cc
deleted file mode 100644
index 6cbed220975ef..0000000000000
--- a/third_party/jpeg-xl/lib/extras/codec_test.cc
+++ /dev/null
@@ -1,501 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/codestream_header.h>
-#include <jxl/color_encoding.h>
-#include <jxl/encode.h>
-#include <jxl/types.h>
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <memory>
-#include <sstream>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "lib/extras/common.h"
-#include "lib/extras/dec/color_hints.h"
-#include "lib/extras/dec/decode.h"
-#include "lib/extras/enc/encode.h"
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/random.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-
-using ::jxl::test::ThreadPoolForTests;
-
-namespace extras {
-
-Status PnmParseSigned(Bytes str, double* v);
-Status PnmParseUnsigned(Bytes str, size_t* v);
-
-namespace {
-
-Span<const uint8_t> MakeSpan(const char* str) {
-  return Bytes(reinterpret_cast<const uint8_t*>(str), strlen(str));
-}
-
-std::string ExtensionFromCodec(Codec codec, const bool is_gray,
-                               const bool has_alpha,
-                               const size_t bits_per_sample) {
-  switch (codec) {
-    case Codec::kJPG:
-      return ".jpg";
-    case Codec::kPGX:
-      return ".pgx";
-    case Codec::kPNG:
-      return ".png";
-    case Codec::kPNM:
-      if (bits_per_sample == 32) return ".pfm";
-      if (has_alpha) return ".pam";
-      return is_gray ? ".pgm" : ".ppm";
-    case Codec::kEXR:
-      return ".exr";
-    default:
-      return std::string();
-  }
-}
-
-void VerifySameImage(const PackedImage& im0, size_t bits_per_sample0,
-                     const PackedImage& im1, size_t bits_per_sample1,
-                     bool lossless = true) {
-  ASSERT_EQ(im0.xsize, im1.xsize);
-  ASSERT_EQ(im0.ysize, im1.ysize);
-  ASSERT_EQ(im0.format.num_channels, im1.format.num_channels);
-  auto get_factor = [](JxlPixelFormat f, size_t bits) -> double {
-    return 1.0 / ((1u << std::min(test::GetPrecision(f.data_type), bits)) - 1);
-  };
-  double factor0 = get_factor(im0.format, bits_per_sample0);
-  double factor1 = get_factor(im1.format, bits_per_sample1);
-  const auto* pixels0 = static_cast<const uint8_t*>(im0.pixels());
-  const auto* pixels1 = static_cast<const uint8_t*>(im1.pixels());
-  auto rgba0 =
-      test::ConvertToRGBA32(pixels0, im0.xsize, im0.ysize, im0.format, factor0);
-  auto rgba1 =
-      test::ConvertToRGBA32(pixels1, im1.xsize, im1.ysize, im1.format, factor1);
-  double tolerance =
-      lossless ? 0.5 * std::min(factor0, factor1) : 3.0f / 255.0f;
-  if (bits_per_sample0 == 32 || bits_per_sample1 == 32) {
-    tolerance = 0.5 * std::max(factor0, factor1);
-  }
-  for (size_t y = 0; y < im0.ysize; ++y) {
-    for (size_t x = 0; x < im0.xsize; ++x) {
-      for (size_t c = 0; c < im0.format.num_channels; ++c) {
-        size_t ix = (y * im0.xsize + x) * 4 + c;
-        double val0 = rgba0[ix];
-        double val1 = rgba1[ix];
-        ASSERT_NEAR(val1, val0, tolerance)
-            << "y = " << y << " x = " << x << " c = " << c;
-      }
-    }
-  }
-}
-
-JxlColorEncoding CreateTestColorEncoding(bool is_gray) {
-  JxlColorEncoding c;
-  c.color_space = is_gray ? JXL_COLOR_SPACE_GRAY : JXL_COLOR_SPACE_RGB;
-  c.white_point = JXL_WHITE_POINT_D65;
-  c.primaries = JXL_PRIMARIES_P3;
-  c.rendering_intent = JXL_RENDERING_INTENT_RELATIVE;
-  c.transfer_function = JXL_TRANSFER_FUNCTION_LINEAR;
-  // Roundtrip through internal color encoding to fill in primaries and white
-  // point CIE xy coordinates.
-  ColorEncoding c_internal;
-  EXPECT_TRUE(c_internal.FromExternal(c));
-  c = c_internal.ToExternal();
-  return c;
-}
-
-std::vector<uint8_t> GenerateICC(JxlColorEncoding color_encoding) {
-  ColorEncoding c;
-  EXPECT_TRUE(c.FromExternal(color_encoding));
-  EXPECT_TRUE(!c.ICC().empty());
-  return c.ICC();
-}
-
-void StoreRandomValue(uint8_t* out, Rng* rng, JxlPixelFormat format,
-                      size_t bits_per_sample) {
-  uint64_t max_val = (1ull << bits_per_sample) - 1;
-  if (format.data_type == JXL_TYPE_UINT8) {
-    *out = rng->UniformU(0, max_val);
-  } else if (format.data_type == JXL_TYPE_UINT16) {
-    uint32_t val = rng->UniformU(0, max_val);
-    if (format.endianness == JXL_BIG_ENDIAN) {
-      StoreBE16(val, out);
-    } else {
-      StoreLE16(val, out);
-    }
-  } else {
-    ASSERT_EQ(format.data_type, JXL_TYPE_FLOAT);
-    float val = rng->UniformF(0.0, 1.0);
-    uint32_t uval;
-    memcpy(&uval, &val, 4);
-    if (format.endianness == JXL_BIG_ENDIAN) {
-      StoreBE32(uval, out);
-    } else {
-      StoreLE32(uval, out);
-    }
-  }
-}
-
-void FillPackedImage(size_t bits_per_sample, PackedImage* image) {
-  JxlPixelFormat format = image->format;
-  size_t bytes_per_channel = PackedImage::BitsPerChannel(format.data_type) / 8;
-  uint8_t* out = static_cast<uint8_t*>(image->pixels());
-  size_t stride = image->xsize * format.num_channels * bytes_per_channel;
-  ASSERT_EQ(image->pixels_size, image->ysize * stride);
-  Rng rng(129);
-  for (size_t y = 0; y < image->ysize; ++y) {
-    for (size_t x = 0; x < image->xsize; ++x) {
-      for (size_t c = 0; c < format.num_channels; ++c) {
-        StoreRandomValue(out, &rng, format, bits_per_sample);
-        out += bytes_per_channel;
-      }
-    }
-  }
-}
-
-struct TestImageParams {
-  Codec codec;
-  size_t xsize;
-  size_t ysize;
-  size_t bits_per_sample;
-  bool is_gray;
-  bool add_alpha;
-  bool big_endian;
-  bool add_extra_channels;
-
-  bool ShouldTestRoundtrip() const {
-    if (codec == Codec::kPNG) {
-      return bits_per_sample <= 16;
-    } else if (codec == Codec::kPNM) {
-      // TODO(szabadka) Make PNM encoder endianness-aware.
-      return ((bits_per_sample <= 16 && big_endian) ||
-              (bits_per_sample == 32 && !add_alpha && !big_endian));
-    } else if (codec == Codec::kPGX) {
-      return ((bits_per_sample == 8 || bits_per_sample == 16) && is_gray &&
-              !add_alpha);
-    } else if (codec == Codec::kEXR) {
-#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) || \
-    defined(THREAD_SANITIZER)
-      // OpenEXR 2.3 has a memory leak in IlmThread_2_3::ThreadPool
-      return false;
-#else
-      return bits_per_sample == 32 && !is_gray;
-#endif
-    } else if (codec == Codec::kJPG) {
-      return bits_per_sample == 8 && !add_alpha;
-    } else {
-      return false;
-    }
-  }
-
-  JxlPixelFormat PixelFormat() const {
-    JxlPixelFormat format;
-    format.num_channels = (is_gray ? 1 : 3) + (add_alpha ? 1 : 0);
-    format.data_type = (bits_per_sample == 32 ? JXL_TYPE_FLOAT
-                        : bits_per_sample > 8 ? JXL_TYPE_UINT16
-                                              : JXL_TYPE_UINT8);
-    format.endianness = big_endian ? JXL_BIG_ENDIAN : JXL_LITTLE_ENDIAN;
-    format.align = 0;
-    return format;
-  }
-
-  std::string DebugString() const {
-    std::ostringstream os;
-    os << "bps:" << bits_per_sample << " gr:" << is_gray << " al:" << add_alpha
-       << " be: " << big_endian << " ec: " << add_extra_channels;
-    return os.str();
-  }
-};
-
-void CreateTestImage(const TestImageParams& params, PackedPixelFile* ppf) {
-  ppf->info.xsize = params.xsize;
-  ppf->info.ysize = params.ysize;
-  ppf->info.bits_per_sample = params.bits_per_sample;
-  ppf->info.exponent_bits_per_sample = params.bits_per_sample == 32 ? 8 : 0;
-  ppf->info.num_color_channels = params.is_gray ? 1 : 3;
-  ppf->info.alpha_bits = params.add_alpha ? params.bits_per_sample : 0;
-  ppf->info.alpha_premultiplied = TO_JXL_BOOL(params.codec == Codec::kEXR);
-
-  JxlColorEncoding color_encoding = CreateTestColorEncoding(params.is_gray);
-  ppf->icc = GenerateICC(color_encoding);
-  ppf->color_encoding = color_encoding;
-
-  JXL_TEST_ASSIGN_OR_DIE(
-      PackedFrame frame,
-      PackedFrame::Create(params.xsize, params.ysize, params.PixelFormat()));
-  FillPackedImage(params.bits_per_sample, &frame.color);
-  if (params.add_extra_channels) {
-    for (size_t i = 0; i < 7; ++i) {
-      JxlPixelFormat ec_format = params.PixelFormat();
-      ec_format.num_channels = 1;
-      JXL_TEST_ASSIGN_OR_DIE(
-          PackedImage ec,
-          PackedImage::Create(params.xsize, params.ysize, ec_format));
-      FillPackedImage(params.bits_per_sample, &ec);
-      frame.extra_channels.emplace_back(std::move(ec));
-      PackedExtraChannel pec;
-      pec.ec_info.bits_per_sample = params.bits_per_sample;
-      pec.ec_info.type = static_cast<JxlExtraChannelType>(i);
-      ppf->extra_channels_info.emplace_back(std::move(pec));
-    }
-  }
-  ppf->frames.emplace_back(std::move(frame));
-}
-
-// Ensures reading a newly written file leads to the same image pixels.
-void TestRoundTrip(const TestImageParams& params, ThreadPool* pool) {
-  if (!params.ShouldTestRoundtrip()) return;
-
-  std::string extension = ExtensionFromCodec(
-      params.codec, params.is_gray, params.add_alpha, params.bits_per_sample);
-  printf("Codec %s %s\n", extension.c_str(), params.DebugString().c_str());
-
-  PackedPixelFile ppf_in;
-  CreateTestImage(params, &ppf_in);
-
-  EncodedImage encoded;
-  auto encoder = Encoder::FromExtension(extension);
-  if (!encoder) {
-    fprintf(stderr, "Skipping test because of missing codec support.\n");
-    return;
-  }
-  ASSERT_TRUE(encoder->Encode(ppf_in, &encoded, pool));
-  ASSERT_EQ(encoded.bitstreams.size(), 1);
-
-  PackedPixelFile ppf_out;
-  ColorHints color_hints;
-  if (params.codec == Codec::kPNM || params.codec == Codec::kPGX) {
-    color_hints.Add("color_space",
-                    params.is_gray ? "Gra_D65_Rel_SRG" : "RGB_D65_SRG_Rel_SRG");
-  }
-  ASSERT_TRUE(DecodeBytes(Bytes(encoded.bitstreams[0]), color_hints, &ppf_out));
-  if (params.codec == Codec::kPNG && ppf_out.icc.empty()) {
-    // Decoding a PNG may drop the ICC profile if there's a valid cICP chunk.
-    // Rendering intent is not preserved in this case.
-    EXPECT_EQ(ppf_in.color_encoding.color_space,
-              ppf_out.color_encoding.color_space);
-    EXPECT_EQ(ppf_in.color_encoding.white_point,
-              ppf_out.color_encoding.white_point);
-    if (ppf_in.color_encoding.color_space != JXL_COLOR_SPACE_GRAY) {
-      EXPECT_EQ(ppf_in.color_encoding.primaries,
-                ppf_out.color_encoding.primaries);
-    }
-    EXPECT_EQ(ppf_in.color_encoding.transfer_function,
-              ppf_out.color_encoding.transfer_function);
-    EXPECT_EQ(ppf_out.color_encoding.rendering_intent,
-              JXL_RENDERING_INTENT_RELATIVE);
-  } else if (params.codec != Codec::kPNM && params.codec != Codec::kPGX &&
-             params.codec != Codec::kEXR) {
-    EXPECT_EQ(ppf_in.icc, ppf_out.icc);
-  }
-
-  ASSERT_EQ(ppf_out.frames.size(), 1);
-  const auto& frame_in = ppf_in.frames[0];
-  const auto& frame_out = ppf_out.frames[0];
-  VerifySameImage(frame_in.color, ppf_in.info.bits_per_sample, frame_out.color,
-                  ppf_out.info.bits_per_sample,
-                  /*lossless=*/params.codec != Codec::kJPG);
-  ASSERT_EQ(frame_in.extra_channels.size(), frame_out.extra_channels.size());
-  ASSERT_EQ(ppf_out.extra_channels_info.size(),
-            frame_out.extra_channels.size());
-  for (size_t i = 0; i < frame_in.extra_channels.size(); ++i) {
-    VerifySameImage(frame_in.extra_channels[i], ppf_in.info.bits_per_sample,
-                    frame_out.extra_channels[i], ppf_out.info.bits_per_sample,
-                    /*lossless=*/true);
-    EXPECT_EQ(ppf_out.extra_channels_info[i].ec_info.type,
-              ppf_in.extra_channels_info[i].ec_info.type);
-  }
-}
-
-TEST(CodecTest, TestRoundTrip) {
-  ThreadPoolForTests pool(12);
-
-  TestImageParams params;
-  params.xsize = 7;
-  params.ysize = 4;
-
-  for (Codec codec :
-       {Codec::kPNG, Codec::kPNM, Codec::kPGX, Codec::kEXR, Codec::kJPG}) {
-    for (int bits_per_sample : {4, 8, 10, 12, 16, 32}) {
-      for (bool is_gray : {false, true}) {
-        for (bool add_alpha : {false, true}) {
-          for (bool big_endian : {false, true}) {
-            params.codec = codec;
-            params.bits_per_sample = static_cast<size_t>(bits_per_sample);
-            params.is_gray = is_gray;
-            params.add_alpha = add_alpha;
-            params.big_endian = big_endian;
-            params.add_extra_channels = false;
-            TestRoundTrip(params, pool.get());
-            if (codec == Codec::kPNM && add_alpha) {
-              params.add_extra_channels = true;
-              TestRoundTrip(params, pool.get());
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-TEST(CodecTest, LosslessPNMRoundtrip) {
-  ThreadPoolForTests pool(12);
-
-  static const char* kChannels[] = {"", "g", "ga", "rgb", "rgba"};
-  static const char* kExtension[] = {"", ".pgm", ".pam", ".ppm", ".pam"};
-  for (size_t bit_depth = 1; bit_depth <= 16; ++bit_depth) {
-    for (size_t channels = 1; channels <= 4; ++channels) {
-      if (bit_depth == 1 && (channels == 2 || channels == 4)) continue;
-      std::string extension(kExtension[channels]);
-      std::string filename = "jxl/flower/flower_small." +
-                             std::string(kChannels[channels]) + ".depth" +
-                             std::to_string(bit_depth) + extension;
-      const std::vector<uint8_t> orig = jxl::test::ReadTestData(filename);
-
-      PackedPixelFile ppf;
-      ColorHints color_hints;
-      color_hints.Add("color_space",
-                      channels < 3 ? "Gra_D65_Rel_SRG" : "RGB_D65_SRG_Rel_SRG");
-      ASSERT_TRUE(
-          DecodeBytes(Bytes(orig.data(), orig.size()), color_hints, &ppf));
-
-      EncodedImage encoded;
-      auto encoder = Encoder::FromExtension(extension);
-      ASSERT_TRUE(encoder.get());
-      ASSERT_TRUE(encoder->Encode(ppf, &encoded, pool.get()));
-      ASSERT_EQ(encoded.bitstreams.size(), 1);
-      ASSERT_EQ(orig.size(), encoded.bitstreams[0].size());
-      EXPECT_EQ(0,
-                memcmp(orig.data(), encoded.bitstreams[0].data(), orig.size()));
-    }
-  }
-}
-
-TEST(CodecTest, TestPNM) {
-  size_t u = 77777;  // Initialized to wrong value.
-  double d = 77.77;
-// Failing to parse invalid strings results in a crash if `JXL_CRASH_ON_ERROR`
-// is defined and hence the tests fail. Therefore we only run these tests if
-// `JXL_CRASH_ON_ERROR` is not defined.
-#if (!JXL_CRASH_ON_ERROR)
-  ASSERT_FALSE(PnmParseUnsigned(MakeSpan(""), &u));
-  ASSERT_FALSE(PnmParseUnsigned(MakeSpan("+"), &u));
-  ASSERT_FALSE(PnmParseUnsigned(MakeSpan("-"), &u));
-  ASSERT_FALSE(PnmParseUnsigned(MakeSpan("A"), &u));
-
-  ASSERT_FALSE(PnmParseSigned(MakeSpan(""), &d));
-  ASSERT_FALSE(PnmParseSigned(MakeSpan("+"), &d));
-  ASSERT_FALSE(PnmParseSigned(MakeSpan("-"), &d));
-  ASSERT_FALSE(PnmParseSigned(MakeSpan("A"), &d));
-#endif
-  ASSERT_TRUE(PnmParseUnsigned(MakeSpan("1"), &u));
-  ASSERT_TRUE(u == 1);
-
-  ASSERT_TRUE(PnmParseUnsigned(MakeSpan("32"), &u));
-  ASSERT_TRUE(u == 32);
-
-  ASSERT_TRUE(PnmParseSigned(MakeSpan("1"), &d));
-  ASSERT_TRUE(d == 1.0);
-  ASSERT_TRUE(PnmParseSigned(MakeSpan("+2"), &d));
-  ASSERT_TRUE(d == 2.0);
-  ASSERT_TRUE(PnmParseSigned(MakeSpan("-3"), &d));
-  ASSERT_TRUE(std::abs(d - -3.0) < 1E-15);
-  ASSERT_TRUE(PnmParseSigned(MakeSpan("3.141592"), &d));
-  ASSERT_TRUE(std::abs(d - 3.141592) < 1E-15);
-  ASSERT_TRUE(PnmParseSigned(MakeSpan("-3.141592"), &d));
-  ASSERT_TRUE(std::abs(d - -3.141592) < 1E-15);
-}
-
-TEST(CodecTest, FormatNegotiation) {
-  const std::vector<JxlPixelFormat> accepted_formats = {
-      {/*num_channels=*/4,
-       /*data_type=*/JXL_TYPE_UINT16,
-       /*endianness=*/JXL_NATIVE_ENDIAN,
-       /*align=*/0},
-      {/*num_channels=*/3,
-       /*data_type=*/JXL_TYPE_UINT8,
-       /*endianness=*/JXL_NATIVE_ENDIAN,
-       /*align=*/0},
-      {/*num_channels=*/3,
-       /*data_type=*/JXL_TYPE_UINT16,
-       /*endianness=*/JXL_NATIVE_ENDIAN,
-       /*align=*/0},
-      {/*num_channels=*/1,
-       /*data_type=*/JXL_TYPE_UINT8,
-       /*endianness=*/JXL_NATIVE_ENDIAN,
-       /*align=*/0},
-  };
-
-  JxlBasicInfo info;
-  JxlEncoderInitBasicInfo(&info);
-  info.bits_per_sample = 12;
-  info.num_color_channels = 2;
-
-  JxlPixelFormat format;
-  EXPECT_FALSE(SelectFormat(accepted_formats, info, &format));
-
-  info.num_color_channels = 3;
-  ASSERT_TRUE(SelectFormat(accepted_formats, info, &format));
-  EXPECT_EQ(format.num_channels, info.num_color_channels);
-  // 16 is the smallest accepted format that can accommodate the 12-bit data.
-  EXPECT_EQ(format.data_type, JXL_TYPE_UINT16);
-}
-
-TEST(CodecTest, EncodeToPNG) {
-  ThreadPool* const pool = nullptr;
-
-  std::unique_ptr<Encoder> png_encoder = Encoder::FromExtension(".png");
-  if (!png_encoder) {
-    fprintf(stderr, "Skipping test because of missing codec support.\n");
-    return;
-  }
-
-  const std::vector<uint8_t> original_png = jxl::test::ReadTestData(
-      "external/wesaturate/500px/tmshre_riaphotographs_srgb8.png");
-  PackedPixelFile ppf;
-  ASSERT_TRUE(extras::DecodeBytes(Bytes(original_png), ColorHints(), &ppf));
-
-  const JxlPixelFormat& format = ppf.frames.front().color.format;
-  const auto& format_matcher = [&format](const JxlPixelFormat& candidate) {
-    return (candidate.num_channels == format.num_channels) &&
-           (candidate.data_type == format.data_type) &&
-           (candidate.endianness == format.endianness);
-  };
-  const auto formats = png_encoder->AcceptedFormats();
-  ASSERT_TRUE(std::any_of(formats.begin(), formats.end(), format_matcher));
-  EncodedImage encoded_png;
-  ASSERT_TRUE(png_encoder->Encode(ppf, &encoded_png, pool));
-  EXPECT_TRUE(encoded_png.icc.empty());
-  ASSERT_EQ(encoded_png.bitstreams.size(), 1);
-
-  PackedPixelFile decoded_ppf;
-  ASSERT_TRUE(extras::DecodeBytes(Bytes(encoded_png.bitstreams.front()),
-                                  ColorHints(), &decoded_ppf));
-
-  ASSERT_EQ(decoded_ppf.info.bits_per_sample, ppf.info.bits_per_sample);
-  ASSERT_EQ(decoded_ppf.frames.size(), 1);
-  VerifySameImage(ppf.frames[0].color, ppf.info.bits_per_sample,
-                  decoded_ppf.frames[0].color,
-                  decoded_ppf.info.bits_per_sample);
-}
-
-}  // namespace
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/common.cc b/third_party/jpeg-xl/lib/extras/common.cc
deleted file mode 100644
index 56abd13ea6699..0000000000000
--- a/third_party/jpeg-xl/lib/extras/common.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/common.h"
-
-#include <jxl/codestream_header.h>
-#include <jxl/types.h>
-
-#include <cstddef>
-#include <vector>
-
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-namespace extras {
-
-Status SelectFormat(const std::vector<JxlPixelFormat>& accepted_formats,
-                    const JxlBasicInfo& basic_info, JxlPixelFormat* format) {
-  const size_t original_bit_depth = basic_info.bits_per_sample;
-  size_t current_bit_depth = 0;
-  size_t num_alpha_channels = (basic_info.alpha_bits != 0 ? 1 : 0);
-  size_t num_channels = basic_info.num_color_channels + num_alpha_channels;
-  for (;;) {
-    for (const JxlPixelFormat& candidate : accepted_formats) {
-      if (candidate.num_channels != num_channels) continue;
-      JXL_RETURN_IF_ERROR(PackedImage::ValidateDataType(candidate.data_type));
-      const size_t candidate_bit_depth =
-          PackedImage::BitsPerChannel(candidate.data_type);
-      if (
-          // Candidate bit depth is less than what we have and still enough
-          (original_bit_depth <= candidate_bit_depth &&
-           candidate_bit_depth < current_bit_depth) ||
-          // Or larger than the too-small bit depth we currently have
-          (current_bit_depth < candidate_bit_depth &&
-           current_bit_depth < original_bit_depth)) {
-        *format = candidate;
-        current_bit_depth = candidate_bit_depth;
-      }
-    }
-    if (current_bit_depth == 0) {
-      if (num_channels > basic_info.num_color_channels) {
-        // Try dropping the alpha channel.
-        --num_channels;
-        continue;
-      }
-      return JXL_FAILURE("no appropriate format found");
-    }
-    break;
-  }
-  if (current_bit_depth < original_bit_depth) {
-    JXL_WARNING("encoding %" PRIuS "-bit original to %" PRIuS " bits",
-                original_bit_depth, current_bit_depth);
-  }
-  return true;
-}
-
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/common.h b/third_party/jpeg-xl/lib/extras/common.h
deleted file mode 100644
index 88ed581af3dc1..0000000000000
--- a/third_party/jpeg-xl/lib/extras/common.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_COMMON_H_
-#define LIB_EXTRAS_COMMON_H_
-
-#include <jxl/codestream_header.h>
-#include <jxl/types.h>
-
-#include <vector>
-
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-namespace extras {
-
-// TODO(sboukortt): consider exposing this as part of the C API.
-Status SelectFormat(const std::vector<JxlPixelFormat>& accepted_formats,
-                    const JxlBasicInfo& basic_info, JxlPixelFormat* format);
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_COMMON_H_
diff --git a/third_party/jpeg-xl/lib/extras/compressed_icc.cc b/third_party/jpeg-xl/lib/extras/compressed_icc.cc
deleted file mode 100644
index 52d433d4f9d30..0000000000000
--- a/third_party/jpeg-xl/lib/extras/compressed_icc.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/compressed_icc.h>
-
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_icc_codec.h"
-#include "lib/jxl/icc_codec.h"
-
-JXL_BOOL JxlICCProfileEncode(const JxlMemoryManager* memory_manager,
-                             const uint8_t* icc, size_t icc_size,
-                             uint8_t** compressed_icc,
-                             size_t* compressed_icc_size) {
-  JxlMemoryManager local_memory_manager;
-  if (!jxl::MemoryManagerInit(&local_memory_manager, memory_manager)) {
-    return JXL_FALSE;
-  }
-  jxl::BitWriter writer(&local_memory_manager);
-  JXL_RETURN_IF_ERROR(jxl::WriteICC(jxl::Span<const uint8_t>(icc, icc_size),
-                                    &writer, jxl::LayerType::Header, nullptr));
-  writer.ZeroPadToByte();
-  jxl::Bytes bytes = writer.GetSpan();
-  *compressed_icc_size = bytes.size();
-  *compressed_icc = static_cast<uint8_t*>(
-      jxl::MemoryManagerAlloc(&local_memory_manager, *compressed_icc_size));
-  memcpy(*compressed_icc, bytes.data(), bytes.size());
-  return JXL_TRUE;
-}
-
-JXL_BOOL JxlICCProfileDecode(const JxlMemoryManager* memory_manager,
-                             const uint8_t* compressed_icc,
-                             size_t compressed_icc_size, uint8_t** icc,
-                             size_t* icc_size) {
-  JxlMemoryManager local_memory_manager;
-  if (!jxl::MemoryManagerInit(&local_memory_manager, memory_manager)) {
-    return JXL_FALSE;
-  }
-  jxl::ICCReader icc_reader(&local_memory_manager);
-  jxl::PaddedBytes decompressed(&local_memory_manager);
-  jxl::BitReader bit_reader(
-      jxl::Span<const uint8_t>(compressed_icc, compressed_icc_size));
-  JXL_RETURN_IF_ERROR(icc_reader.Init(&bit_reader));
-  JXL_RETURN_IF_ERROR(icc_reader.Process(&bit_reader, &decompressed));
-  JXL_RETURN_IF_ERROR(bit_reader.Close());
-  *icc_size = decompressed.size();
-  *icc = static_cast<uint8_t*>(
-      jxl::MemoryManagerAlloc(&local_memory_manager, *icc_size));
-  memcpy(*icc, decompressed.data(), *icc_size);
-  return JXL_TRUE;
-}
diff --git a/third_party/jpeg-xl/lib/extras/compressed_icc_test.cc b/third_party/jpeg-xl/lib/extras/compressed_icc_test.cc
deleted file mode 100644
index 2aa994d6e69e8..0000000000000
--- a/third_party/jpeg-xl/lib/extras/compressed_icc_test.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "jxl/compressed_icc.h"
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-TEST(CompressedIccTest, Roundtrip) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  uint8_t* compressed_icc;
-  size_t compressed_icc_size;
-  const IccBytes icc = jxl::test::GetIccTestProfile();
-  ASSERT_TRUE(JxlICCProfileEncode(memory_manager, icc.data(), icc.size(),
-                                  &compressed_icc, &compressed_icc_size));
-
-  EXPECT_LT(compressed_icc_size, icc.size());
-
-  uint8_t* decompressed_icc;
-  size_t decompressed_icc_size;
-  ASSERT_TRUE(JxlICCProfileDecode(memory_manager, compressed_icc,
-                                  compressed_icc_size, &decompressed_icc,
-                                  &decompressed_icc_size));
-
-  ASSERT_EQ(decompressed_icc_size, icc.size());
-
-  EXPECT_EQ(0, memcmp(decompressed_icc, icc.data(), decompressed_icc_size));
-
-  memory_manager->free(memory_manager->opaque, compressed_icc);
-  memory_manager->free(memory_manager->opaque, decompressed_icc);
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/dec/apng.cc b/third_party/jpeg-xl/lib/extras/dec/apng.cc
deleted file mode 100644
index 24b4795d03dc6..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/apng.cc
+++ /dev/null
@@ -1,1293 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/dec/apng.h"
-
-// Parts of this code are taken from apngdis, which has the following license:
-/* APNG Disassembler 2.8
- *
- * Deconstructs APNG files into individual frames.
- *
- * http://apngdis.sourceforge.net
- *
- * Copyright (c) 2010-2015 Max Stepin
- * maxst at users.sourceforge.net
- *
- * zlib license
- * ------------
- *
- * This software is provided 'as-is', without any express or implied
- * warranty.  In no event will the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- *
- */
-
-#include <jxl/codestream_header.h>
-#include <jxl/encode.h>
-
-#include <array>
-#include <atomic>
-#include <cstdint>
-#include <cstring>
-#include <limits>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "lib/extras/packed_image.h"
-#include "lib/extras/size_constraints.h"
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/sanitizers.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#if JPEGXL_ENABLE_APNG
-#include "png.h" /* original (unpatched) libpng is ok */
-#endif
-
-namespace jxl {
-namespace extras {
-
-#if !JPEGXL_ENABLE_APNG
-
-bool CanDecodeAPNG() { return false; }
-Status DecodeImageAPNG(const Span<const uint8_t> bytes,
-                       const ColorHints& color_hints, PackedPixelFile* ppf,
-                       const SizeConstraints* constraints) {
-  return false;
-}
-
-#else  // JPEGXL_ENABLE_APNG
-
-namespace {
-
-constexpr std::array<uint8_t, 8> kPngSignature = {137,  'P',  'N', 'G',
-                                                  '\r', '\n', 26,  '\n'};
-
-// Returns floating-point value from the PNG encoding (times 10^5).
-double F64FromU32(const uint32_t x) { return static_cast<int32_t>(x) * 1E-5; }
-
-/** Extract information from 'sRGB' chunk. */
-Status DecodeSrgbChunk(const Bytes payload, JxlColorEncoding* color_encoding) {
-  if (payload.size() != 1) return JXL_FAILURE("Wrong sRGB size");
-  uint8_t ri = payload[0];
-  // (PNG uses the same values as ICC.)
-  if (ri >= 4) return JXL_FAILURE("Invalid Rendering Intent");
-  color_encoding->white_point = JXL_WHITE_POINT_D65;
-  color_encoding->primaries = JXL_PRIMARIES_SRGB;
-  color_encoding->transfer_function = JXL_TRANSFER_FUNCTION_SRGB;
-  color_encoding->rendering_intent = static_cast<JxlRenderingIntent>(ri);
-  return true;
-}
-
-/**
- * Extract information from 'cICP' chunk.
- *
- * If the cICP profile is not fully supported, return `false` and leave
- * `color_encoding` unmodified.
- */
-Status DecodeCicpChunk(const Bytes payload, JxlColorEncoding* color_encoding) {
-  if (payload.size() != 4) return JXL_FAILURE("Wrong cICP size");
-  JxlColorEncoding color_enc = *color_encoding;
-
-  // From https://www.itu.int/rec/T-REC-H.273-202107-I/en
-  if (payload[0] == 1) {
-    // IEC 61966-2-1 sRGB
-    color_enc.primaries = JXL_PRIMARIES_SRGB;
-    color_enc.white_point = JXL_WHITE_POINT_D65;
-  } else if (payload[0] == 4) {
-    // Rec. ITU-R BT.470-6 System M
-    color_enc.primaries = JXL_PRIMARIES_CUSTOM;
-    color_enc.primaries_red_xy[0] = 0.67;
-    color_enc.primaries_red_xy[1] = 0.33;
-    color_enc.primaries_green_xy[0] = 0.21;
-    color_enc.primaries_green_xy[1] = 0.71;
-    color_enc.primaries_blue_xy[0] = 0.14;
-    color_enc.primaries_blue_xy[1] = 0.08;
-    color_enc.white_point = JXL_WHITE_POINT_CUSTOM;
-    color_enc.white_point_xy[0] = 0.310;
-    color_enc.white_point_xy[1] = 0.316;
-  } else if (payload[0] == 5) {
-    // Rec. ITU-R BT.1700-0 625 PAL and 625 SECAM
-    color_enc.primaries = JXL_PRIMARIES_CUSTOM;
-    color_enc.primaries_red_xy[0] = 0.64;
-    color_enc.primaries_red_xy[1] = 0.33;
-    color_enc.primaries_green_xy[0] = 0.29;
-    color_enc.primaries_green_xy[1] = 0.60;
-    color_enc.primaries_blue_xy[0] = 0.15;
-    color_enc.primaries_blue_xy[1] = 0.06;
-    color_enc.white_point = JXL_WHITE_POINT_D65;
-  } else if (payload[0] == 6 || payload[0] == 7) {
-    // SMPTE ST 170 (2004) / SMPTE ST 240 (1999)
-    color_enc.primaries = JXL_PRIMARIES_CUSTOM;
-    color_enc.primaries_red_xy[0] = 0.630;
-    color_enc.primaries_red_xy[1] = 0.340;
-    color_enc.primaries_green_xy[0] = 0.310;
-    color_enc.primaries_green_xy[1] = 0.595;
-    color_enc.primaries_blue_xy[0] = 0.155;
-    color_enc.primaries_blue_xy[1] = 0.070;
-    color_enc.white_point = JXL_WHITE_POINT_D65;
-  } else if (payload[0] == 8) {
-    // Generic film (colour filters using Illuminant C)
-    color_enc.primaries = JXL_PRIMARIES_CUSTOM;
-    color_enc.primaries_red_xy[0] = 0.681;
-    color_enc.primaries_red_xy[1] = 0.319;
-    color_enc.primaries_green_xy[0] = 0.243;
-    color_enc.primaries_green_xy[1] = 0.692;
-    color_enc.primaries_blue_xy[0] = 0.145;
-    color_enc.primaries_blue_xy[1] = 0.049;
-    color_enc.white_point = JXL_WHITE_POINT_CUSTOM;
-    color_enc.white_point_xy[0] = 0.310;
-    color_enc.white_point_xy[1] = 0.316;
-  } else if (payload[0] == 9) {
-    // Rec. ITU-R BT.2100-2
-    color_enc.primaries = JXL_PRIMARIES_2100;
-    color_enc.white_point = JXL_WHITE_POINT_D65;
-  } else if (payload[0] == 10) {
-    // CIE 1931 XYZ
-    color_enc.primaries = JXL_PRIMARIES_CUSTOM;
-    color_enc.primaries_red_xy[0] = 1;
-    color_enc.primaries_red_xy[1] = 0;
-    color_enc.primaries_green_xy[0] = 0;
-    color_enc.primaries_green_xy[1] = 1;
-    color_enc.primaries_blue_xy[0] = 0;
-    color_enc.primaries_blue_xy[1] = 0;
-    color_enc.white_point = JXL_WHITE_POINT_E;
-  } else if (payload[0] == 11) {
-    // SMPTE RP 431-2 (2011)
-    color_enc.primaries = JXL_PRIMARIES_P3;
-    color_enc.white_point = JXL_WHITE_POINT_DCI;
-  } else if (payload[0] == 12) {
-    // SMPTE EG 432-1 (2010)
-    color_enc.primaries = JXL_PRIMARIES_P3;
-    color_enc.white_point = JXL_WHITE_POINT_D65;
-  } else if (payload[0] == 22) {
-    color_enc.primaries = JXL_PRIMARIES_CUSTOM;
-    color_enc.primaries_red_xy[0] = 0.630;
-    color_enc.primaries_red_xy[1] = 0.340;
-    color_enc.primaries_green_xy[0] = 0.295;
-    color_enc.primaries_green_xy[1] = 0.605;
-    color_enc.primaries_blue_xy[0] = 0.155;
-    color_enc.primaries_blue_xy[1] = 0.077;
-    color_enc.white_point = JXL_WHITE_POINT_D65;
-  } else {
-    JXL_WARNING("Unsupported primaries specified in cICP chunk: %d",
-                static_cast<int>(payload[0]));
-    return false;
-  }
-
-  if (payload[1] == 1 || payload[1] == 6 || payload[1] == 14 ||
-      payload[1] == 15) {
-    // Rec. ITU-R BT.709-6
-    color_enc.transfer_function = JXL_TRANSFER_FUNCTION_709;
-  } else if (payload[1] == 4) {
-    // Rec. ITU-R BT.1700-0 625 PAL and 625 SECAM
-    color_enc.transfer_function = JXL_TRANSFER_FUNCTION_GAMMA;
-    color_enc.gamma = 1 / 2.2;
-  } else if (payload[1] == 5) {
-    // Rec. ITU-R BT.470-6 System B, G
-    color_enc.transfer_function = JXL_TRANSFER_FUNCTION_GAMMA;
-    color_enc.gamma = 1 / 2.8;
-  } else if (payload[1] == 8 || payload[1] == 13 || payload[1] == 16 ||
-             payload[1] == 17 || payload[1] == 18) {
-    // These codes all match the corresponding JXL enum values
-    color_enc.transfer_function = static_cast<JxlTransferFunction>(payload[1]);
-  } else {
-    JXL_WARNING("Unsupported transfer function specified in cICP chunk: %d",
-                static_cast<int>(payload[1]));
-    return false;
-  }
-
-  if (payload[2] != 0) {
-    JXL_WARNING("Unsupported color space specified in cICP chunk: %d",
-                static_cast<int>(payload[2]));
-    return false;
-  }
-  if (payload[3] != 1) {
-    JXL_WARNING("Unsupported full-range flag specified in cICP chunk: %d",
-                static_cast<int>(payload[3]));
-    return false;
-  }
-  // cICP has no rendering intent, so use the default
-  color_enc.rendering_intent = JXL_RENDERING_INTENT_RELATIVE;
-  *color_encoding = color_enc;
-  return true;
-}
-
-/** Extract information from 'gAMA' chunk. */
-Status DecodeGamaChunk(Bytes payload, JxlColorEncoding* color_encoding) {
-  if (payload.size() != 4) return JXL_FAILURE("Wrong gAMA size");
-  color_encoding->transfer_function = JXL_TRANSFER_FUNCTION_GAMMA;
-  color_encoding->gamma = F64FromU32(LoadBE32(payload.data()));
-  return true;
-}
-
-/** Extract information from 'cHTM' chunk. */
-Status DecodeChrmChunk(Bytes payload, JxlColorEncoding* color_encoding) {
-  if (payload.size() != 32) return JXL_FAILURE("Wrong cHRM size");
-  const uint8_t* data = payload.data();
-  color_encoding->white_point = JXL_WHITE_POINT_CUSTOM;
-  color_encoding->white_point_xy[0] = F64FromU32(LoadBE32(data + 0));
-  color_encoding->white_point_xy[1] = F64FromU32(LoadBE32(data + 4));
-
-  color_encoding->primaries = JXL_PRIMARIES_CUSTOM;
-  color_encoding->primaries_red_xy[0] = F64FromU32(LoadBE32(data + 8));
-  color_encoding->primaries_red_xy[1] = F64FromU32(LoadBE32(data + 12));
-  color_encoding->primaries_green_xy[0] = F64FromU32(LoadBE32(data + 16));
-  color_encoding->primaries_green_xy[1] = F64FromU32(LoadBE32(data + 20));
-  color_encoding->primaries_blue_xy[0] = F64FromU32(LoadBE32(data + 24));
-  color_encoding->primaries_blue_xy[1] = F64FromU32(LoadBE32(data + 28));
-  return true;
-}
-
-/** Extracts information from 'cLLi' chunk. */
-Status DecodeClliChunk(Bytes payload, float* max_content_light_level) {
-  if (payload.size() != 8) return JXL_FAILURE("Wrong cLLi size");
-  const uint8_t* data = payload.data();
-  const uint32_t maxcll_png =
-      Clamp1(png_get_uint_32(data), uint32_t{0}, uint32_t{10000 * 10000});
-  // Ignore MaxFALL value.
-  *max_content_light_level = static_cast<float>(maxcll_png) / 10000.f;
-  return true;
-}
-
-/** Returns false if invalid. */
-JXL_INLINE Status DecodeHexNibble(const char c, uint32_t* JXL_RESTRICT nibble) {
-  if ('a' <= c && c <= 'f') {
-    *nibble = 10 + c - 'a';
-  } else if ('0' <= c && c <= '9') {
-    *nibble = c - '0';
-  } else {
-    *nibble = 0;
-    return JXL_FAILURE("Invalid metadata nibble");
-  }
-  JXL_ENSURE(*nibble < 16);
-  return true;
-}
-
-/** Returns false if invalid. */
-JXL_INLINE Status DecodeDecimal(const char** pos, const char* end,
-                                uint32_t* JXL_RESTRICT value) {
-  size_t len = 0;
-  *value = 0;
-  while (*pos < end) {
-    char next = **pos;
-    if (next >= '0' && next <= '9') {
-      *value = (*value * 10) + static_cast<uint32_t>(next - '0');
-      len++;
-      if (len > 8) {
-        break;
-      }
-    } else {
-      // Do not consume terminator (non-decimal digit).
-      break;
-    }
-    (*pos)++;
-  }
-  if (len == 0 || len > 8) {
-    return JXL_FAILURE("Failed to parse decimal");
-  }
-  return true;
-}
-
-/**
- * Parses a PNG text chunk with key of the form "Raw profile type ####", with
- * #### a type.
- *
- * Returns whether it could successfully parse the content.
- * We trust key and encoded are null-terminated because they come from
- * libpng.
- */
-Status MaybeDecodeBase16(const char* key, const char* encoded,
-                         std::string* type, std::vector<uint8_t>* bytes) {
-  const char* encoded_end = encoded + strlen(encoded);
-
-  const char* kKey = "Raw profile type ";
-  if (strncmp(key, kKey, strlen(kKey)) != 0) return false;
-  *type = key + strlen(kKey);
-  const size_t kMaxTypeLen = 20;
-  if (type->length() > kMaxTypeLen) return false;  // Type too long
-
-  // Header: freeform string and number of bytes
-  // Expected format is:
-  // \n
-  // profile name/description\n
-  //       40\n               (the number of bytes after hex-decoding)
-  // 01234566789abcdef....\n  (72 bytes per line max).
-  // 012345667\n              (last line)
-  const char* pos = encoded;
-
-  if (*(pos++) != '\n') return false;
-  while (pos < encoded_end && *pos != '\n') {
-    pos++;
-  }
-  if (pos == encoded_end) return false;
-  // We parsed so far a \n, some number of non \n characters and are now
-  // pointing at a \n.
-  if (*(pos++) != '\n') return false;
-  // Skip leading spaces
-  while (pos < encoded_end && *pos == ' ') {
-    pos++;
-  }
-  uint32_t bytes_to_decode = 0;
-  JXL_RETURN_IF_ERROR(DecodeDecimal(&pos, encoded_end, &bytes_to_decode));
-
-  // We need 2*bytes for the hex values plus 1 byte every 36 values,
-  // plus terminal \n for length.
-  size_t tail = static_cast<size_t>(encoded_end - pos);
-  bool ok = ((tail / 2) >= bytes_to_decode);
-  if (ok) tail -= 2 * static_cast<size_t>(bytes_to_decode);
-  ok = ok && (tail == 1 + DivCeil(bytes_to_decode, 36));
-  if (!ok) {
-    return JXL_FAILURE("Not enough bytes to parse %d bytes in hex",
-                       bytes_to_decode);
-  }
-  JXL_ENSURE(bytes->empty());
-  bytes->reserve(bytes_to_decode);
-
-  // Encoding: base16 with newline after 72 chars.
-  // pos points to the \n before the first line of hex values.
-  for (size_t i = 0; i < bytes_to_decode; ++i) {
-    if (i % 36 == 0) {
-      if (pos + 1 >= encoded_end) return false;  // Truncated base16 1
-      if (*pos != '\n') return false;            // Expected newline
-      ++pos;
-    }
-
-    if (pos + 2 >= encoded_end) return false;  // Truncated base16 2;
-    uint32_t nibble0;
-    uint32_t nibble1;
-    JXL_RETURN_IF_ERROR(DecodeHexNibble(pos[0], &nibble0));
-    JXL_RETURN_IF_ERROR(DecodeHexNibble(pos[1], &nibble1));
-    bytes->push_back(static_cast<uint8_t>((nibble0 << 4) + nibble1));
-    pos += 2;
-  }
-  if (pos + 1 != encoded_end) return false;  // Too many encoded bytes
-  if (pos[0] != '\n') return false;          // Incorrect metadata terminator
-  return true;
-}
-
-/** Retrieves XMP and EXIF/IPTC from itext and text. */
-Status DecodeBlob(const png_text_struct& info, PackedMetadata* metadata) {
-  // We trust these are properly null-terminated by libpng.
-  const char* key = info.key;
-  const char* value = info.text;
-  if (strstr(key, "XML:com.adobe.xmp")) {
-    metadata->xmp.resize(strlen(value));  // safe, see above
-    memcpy(metadata->xmp.data(), value, metadata->xmp.size());
-  }
-
-  std::string type;
-  std::vector<uint8_t> bytes;
-
-  // Handle text chunks annotated with key "Raw profile type ####", with
-  // #### a type, which may contain metadata.
-  const char* kKey = "Raw profile type ";
-  if (strncmp(key, kKey, strlen(kKey)) != 0) return false;
-
-  if (!MaybeDecodeBase16(key, value, &type, &bytes)) {
-    JXL_WARNING("Couldn't parse 'Raw format type' text chunk");
-    return false;
-  }
-  if (type == "exif") {
-    // Remove prefix if present.
-    constexpr std::array<uint8_t, 6> kExifPrefix = {'E', 'x', 'i', 'f', 0, 0};
-    if (bytes.size() >= kExifPrefix.size() &&
-        memcmp(bytes.data(), kExifPrefix.data(), kExifPrefix.size()) == 0) {
-      bytes.erase(bytes.begin(), bytes.begin() + kExifPrefix.size());
-    }
-    if (!metadata->exif.empty()) {
-      JXL_DEBUG_V(2,
-                  "overwriting EXIF (%" PRIuS " bytes) with base16 (%" PRIuS
-                  " bytes)",
-                  metadata->exif.size(), bytes.size());
-    }
-    metadata->exif = std::move(bytes);
-  } else if (type == "iptc") {
-    // TODO(jon): Deal with IPTC in some way
-  } else if (type == "8bim") {
-    // TODO(jon): Deal with 8bim in some way
-  } else if (type == "xmp") {
-    if (!metadata->xmp.empty()) {
-      JXL_DEBUG_V(2,
-                  "overwriting XMP (%" PRIuS " bytes) with base16 (%" PRIuS
-                  " bytes)",
-                  metadata->xmp.size(), bytes.size());
-    }
-    metadata->xmp = std::move(bytes);
-  } else {
-    JXL_DEBUG_V(
-        2, "Unknown type in 'Raw format type' text chunk: %s: %" PRIuS " bytes",
-        type.c_str(), bytes.size());
-  }
-  return true;
-}
-
-constexpr bool isAbc(char c) {
-  return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z');
-}
-
-/** Wrap 4-char tag name into ID. */
-constexpr uint32_t MakeTag(uint8_t a, uint8_t b, uint8_t c, uint8_t d) {
-  return a | (b << 8) | (c << 16) | (d << 24);
-}
-
-/** Reusable image data container. */
-struct Pixels {
-  // Use array instead of vector to avoid memory initialization.
-  std::unique_ptr<uint8_t[]> pixels;
-  size_t pixels_size = 0;
-  std::vector<uint8_t*> rows;
-  std::atomic<bool> has_error{false};
-
-  Status Resize(size_t row_bytes, size_t num_rows) {
-    size_t new_size = row_bytes * num_rows;  // it is assumed size is sane
-    if (new_size > pixels_size) {
-      pixels.reset(new uint8_t[new_size]);
-      if (!pixels) {
-        // TODO(szabadka): use specialized OOM error code
-        return JXL_FAILURE("Failed to allocate memory for image buffer");
-      }
-      pixels_size = new_size;
-    }
-    rows.resize(num_rows);
-    for (size_t y = 0; y < num_rows; y++) {
-      rows[y] = pixels.get() + y * row_bytes;
-    }
-    return true;
-  }
-};
-
-/**
- * Helper that chunks in-memory input.
- */
-struct Reader {
-  explicit Reader(Span<const uint8_t> data) : data_(data) {}
-
-  const Span<const uint8_t> data_;
-  size_t offset_ = 0;
-
-  Bytes Peek(size_t len) const {
-    size_t cap = data_.size() - offset_;
-    size_t to_copy = std::min(cap, len);
-    return {data_.data() + offset_, to_copy};
-  }
-
-  Bytes Read(size_t len) {
-    Bytes result = Peek(len);
-    offset_ += result.size();
-    return result;
-  }
-
-  /* Returns empty Span on error. */
-  Bytes ReadChunk() {
-    Bytes len = Peek(4);
-    if (len.size() != 4) {
-      return Bytes();
-    }
-    const auto size = png_get_uint_32(len.data());
-    // NB: specification allows 2^31 - 1
-    constexpr size_t kMaxPNGChunkSize = 1u << 30;  // 1 GB
-    // Check first, to avoid overflow.
-    if (size > kMaxPNGChunkSize) {
-      JXL_WARNING("APNG chunk size is too big");
-      return Bytes();
-    }
-    size_t full_size = size + 12;  // size does not include itself, tag and CRC.
-    Bytes result = Read(full_size);
-    return (result.size() == full_size) ? result : Bytes();
-  }
-
-  bool Eof() const { return offset_ == data_.size(); }
-};
-
-void ProgressiveRead_OnInfo(png_structp png_ptr, png_infop info_ptr) {
-  png_set_expand(png_ptr);
-  png_set_palette_to_rgb(png_ptr);
-  png_set_tRNS_to_alpha(png_ptr);
-  (void)png_set_interlace_handling(png_ptr);
-  png_read_update_info(png_ptr, info_ptr);
-}
-
-void ProgressiveRead_OnRow(png_structp png_ptr, png_bytep new_row,
-                           png_uint_32 row_num, int pass) {
-  Pixels* frame = reinterpret_cast<Pixels*>(png_get_progressive_ptr(png_ptr));
-  if (!frame) {
-    JXL_DEBUG_ABORT("Internal logic error");
-    return;
-  }
-  if (row_num >= frame->rows.size()) {
-    frame->has_error = true;
-    return;
-  }
-  png_progressive_combine_row(png_ptr, frame->rows[row_num], new_row);
-}
-
-// Holds intermediate state during parsing APNG file.
-struct Context {
-  ~Context() {
-    // Make sure png memory is released in any case.
-    ResetPngDecoder();
-  }
-
-  bool CreatePngDecoder() {
-    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr,
-                                     nullptr);
-    info_ptr = png_create_info_struct(png_ptr);
-    return (png_ptr != nullptr && info_ptr != nullptr);
-  }
-
-  /**
-   * Initialize PNG decoder.
-   *
-   * TODO(eustas): add details
-   */
-  bool InitPngDecoder(const std::vector<Bytes>& chunksInfo,
-                      const RectT<uint64_t>& viewport) {
-    ResetPngDecoder();
-
-    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr,
-                                     nullptr);
-    info_ptr = png_create_info_struct(png_ptr);
-    if (png_ptr == nullptr || info_ptr == nullptr) {
-      return false;
-    }
-
-    if (setjmp(png_jmpbuf(png_ptr))) {
-      return false;
-    }
-
-    /* hIST chunk tail is not processed properly; skip this chunk completely;
-       see https://github.com/glennrp/libpng/pull/413 */
-    constexpr std::array<uint8_t, 5> kIgnoredChunks = {'h', 'I', 'S', 'T', 0};
-    png_set_keep_unknown_chunks(png_ptr, 1, kIgnoredChunks.data(),
-                                static_cast<int>(kIgnoredChunks.size() / 5));
-
-    png_set_crc_action(png_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE);
-    png_set_progressive_read_fn(png_ptr, static_cast<void*>(&frameRaw),
-                                ProgressiveRead_OnInfo, ProgressiveRead_OnRow,
-                                nullptr);
-
-    png_process_data(png_ptr, info_ptr,
-                     const_cast<uint8_t*>(kPngSignature.data()),
-                     kPngSignature.size());
-
-    // Patch dimensions.
-    png_save_uint_32(ihdr.data() + 8, static_cast<uint32_t>(viewport.xsize()));
-    png_save_uint_32(ihdr.data() + 12, static_cast<uint32_t>(viewport.ysize()));
-    png_process_data(png_ptr, info_ptr, ihdr.data(), ihdr.size());
-
-    for (const auto& chunk : chunksInfo) {
-      png_process_data(png_ptr, info_ptr, const_cast<uint8_t*>(chunk.data()),
-                       chunk.size());
-    }
-
-    return true;
-  }
-
-  /**
-   * Pass chunk to PNG decoder.
-   */
-  bool FeedChunks(const Bytes& chunk1, const Bytes& chunk2 = Bytes()) {
-    // TODO(eustas): turn to DCHECK
-    if (!png_ptr || !info_ptr) return false;
-
-    if (setjmp(png_jmpbuf(png_ptr))) {
-      return false;
-    }
-
-    for (const auto& chunk : {chunk1, chunk2}) {
-      if (!chunk.empty()) {
-        png_process_data(png_ptr, info_ptr, const_cast<uint8_t*>(chunk.data()),
-                         chunk.size());
-      }
-    }
-    return true;
-  }
-
-  bool FinalizeStream(PackedMetadata* metadata) {
-    // TODO(eustas): turn to DCHECK
-    if (!png_ptr || !info_ptr) return false;
-
-    if (setjmp(png_jmpbuf(png_ptr))) {
-      return false;
-    }
-
-    const std::array<uint8_t, 12> kFooter = {0,  0,  0,   0,  73, 69,
-                                             78, 68, 174, 66, 96, 130};
-    png_process_data(png_ptr, info_ptr, const_cast<uint8_t*>(kFooter.data()),
-                     kFooter.size());
-    // before destroying: check if we encountered any metadata chunks
-    png_textp text_ptr = nullptr;
-    int num_text = 0;
-    if (png_get_text(png_ptr, info_ptr, &text_ptr, &num_text) != 0) {
-      msan::UnpoisonMemory(text_ptr, sizeof(png_text_struct) * num_text);
-      for (int i = 0; i < num_text; i++) {
-        Status result = DecodeBlob(text_ptr[i], metadata);
-        // Ignore unknown / malformed blob.
-        (void)result;
-      }
-    }
-
-    return true;
-  }
-
-  void ResetPngDecoder() {
-    png_destroy_read_struct(&png_ptr, &info_ptr, nullptr);
-    // Just in case. Not all versions on libpng wipe-out the pointers.
-    png_ptr = nullptr;
-    info_ptr = nullptr;
-  }
-
-  std::array<uint8_t, 25> ihdr;  // (modified) copy of file IHDR chunk
-  png_structp png_ptr = nullptr;
-  png_infop info_ptr = nullptr;
-  Pixels frameRaw = {};
-};
-
-enum class DisposeOp : uint8_t { NONE = 0, BACKGROUND = 1, PREVIOUS = 2 };
-
-constexpr uint8_t kLastDisposeOp = static_cast<uint32_t>(DisposeOp::PREVIOUS);
-
-enum class BlendOp : uint8_t { SOURCE = 0, OVER = 1 };
-
-constexpr uint8_t kLastBlendOp = static_cast<uint32_t>(BlendOp::OVER);
-
-// fcTL
-struct FrameControl {
-  uint32_t delay_num;
-  uint32_t delay_den;
-  RectT<uint64_t> viewport;
-  DisposeOp dispose_op;
-  BlendOp blend_op;
-};
-
-struct Frame {
-  PackedImage pixels;
-  FrameControl metadata;
-};
-
-bool ValidateViewport(const RectT<uint64_t>& r) {
-  constexpr uint32_t kMaxPngDim = 1000000UL;
-  return (r.xsize() <= kMaxPngDim) && (r.ysize() <= kMaxPngDim);
-}
-
-/**
- * Setup #channels, bpp, colorspace, etc. from PNG values.
- */
-void SetColorData(PackedPixelFile* ppf, uint8_t color_type, uint8_t bit_depth,
-                  png_color_8p sig_bits, uint32_t has_transparency) {
-  bool palette_used = ((color_type & 1) != 0);
-  bool color_used = ((color_type & 2) != 0);
-  bool alpha_channel_used = ((color_type & 4) != 0);
-  if (palette_used) {
-    if (!color_used || alpha_channel_used) {
-      JXL_DEBUG_V(2, "Unexpected PNG color type");
-    }
-  }
-
-  ppf->info.bits_per_sample = bit_depth;
-
-  if (palette_used) {
-    // palette will actually be 8-bit regardless of the index bitdepth
-    ppf->info.bits_per_sample = 8;
-  }
-  if (color_used) {
-    ppf->info.num_color_channels = 3;
-    ppf->color_encoding.color_space = JXL_COLOR_SPACE_RGB;
-    if (sig_bits) {
-      if (sig_bits->red == sig_bits->green &&
-          sig_bits->green == sig_bits->blue) {
-        ppf->info.bits_per_sample = sig_bits->red;
-      } else {
-        int maxbps =
-            std::max(sig_bits->red, std::max(sig_bits->green, sig_bits->blue));
-        JXL_DEBUG_V(2,
-                    "sBIT chunk: bit depths for R, G, and B are not the same "
-                    "(%i %i %i), while in JPEG XL they have to be the same. "
-                    "Setting RGB bit depth to %i.",
-                    sig_bits->red, sig_bits->green, sig_bits->blue, maxbps);
-        ppf->info.bits_per_sample = maxbps;
-      }
-    }
-  } else {
-    ppf->info.num_color_channels = 1;
-    ppf->color_encoding.color_space = JXL_COLOR_SPACE_GRAY;
-    if (sig_bits) ppf->info.bits_per_sample = sig_bits->gray;
-  }
-  if (alpha_channel_used || has_transparency) {
-    ppf->info.alpha_bits = ppf->info.bits_per_sample;
-    if (sig_bits && sig_bits->alpha != ppf->info.bits_per_sample) {
-      JXL_DEBUG_V(2,
-                  "sBIT chunk: bit depths for RGBA are inconsistent "
-                  "(%i %i %i %i). Setting A bitdepth to %i.",
-                  sig_bits->red, sig_bits->green, sig_bits->blue,
-                  sig_bits->alpha, ppf->info.bits_per_sample);
-    }
-  } else {
-    ppf->info.alpha_bits = 0;
-  }
-  ppf->color_encoding.color_space = (ppf->info.num_color_channels == 1)
-                                        ? JXL_COLOR_SPACE_GRAY
-                                        : JXL_COLOR_SPACE_RGB;
-}
-
-// Color profile chunks: cICP has the highest priority, followed by
-// iCCP and sRGB (which shouldn't co-exist, but if they do, we use
-// iCCP), followed finally by gAMA and cHRM.
-enum class ColorInfoType {
-  NONE = 0,
-  GAMA_OR_CHRM = 1,
-  ICCP_OR_SRGB = 2,
-  CICP = 3
-};
-
-}  // namespace
-
-bool CanDecodeAPNG() { return true; }
-
-/**
- * Parse and decode PNG file.
- *
- * Useful PNG chunks:
- *   acTL : animation control (#frames, loop count)
- *   fcTL : frame control (seq#, viewport, delay, disposal blending)
- *   bKGD : preferable background
- *   IDAT : "default image"
- *          if single fcTL goes before IDAT, then it is also first frame
- *   fdAT : seq# + IDAT-like content
- *   PLTE : palette
- *   cICP : coding-independent code points for video signal type identification
- *   iCCP : embedded ICC profile
- *   sRGB : standard RGB colour space
- *   eXIf : exchangeable image file profile
- *   gAMA : image gamma
- *   cHRM : primary chromaticities and white point
- *   tRNS : transparency
- *
- * PNG chunk ordering:
- *  - IHDR first
- *  - IEND last
- *  - acTL, cHRM, cICP, gAMA, iCCP, sRGB, bKGD, eXIf, PLTE before IDAT
- *  - fdAT after IDAT
- *
- * More rules:
- *  - iCCP and sRGB are exclusive
- *  - fcTL and fdAT seq# must be in order fro 0, with no gaps or duplicates
- *  - fcTL before corresponding IDAT / fdAT
- */
-Status DecodeImageAPNG(const Span<const uint8_t> bytes,
-                       const ColorHints& color_hints, PackedPixelFile* ppf,
-                       const SizeConstraints* constraints) {
-  // Initialize output (default settings in case e.g. only gAMA is given).
-  ppf->frames.clear();
-  ppf->info.exponent_bits_per_sample = 0;
-  ppf->info.alpha_exponent_bits = 0;
-  ppf->info.orientation = JXL_ORIENT_IDENTITY;
-  ppf->color_encoding.color_space = JXL_COLOR_SPACE_RGB;
-  ppf->color_encoding.white_point = JXL_WHITE_POINT_D65;
-  ppf->color_encoding.primaries = JXL_PRIMARIES_SRGB;
-  ppf->color_encoding.transfer_function = JXL_TRANSFER_FUNCTION_SRGB;
-  ppf->color_encoding.rendering_intent = JXL_RENDERING_INTENT_RELATIVE;
-
-  Reader input(bytes);
-
-  // Check signature.
-  Bytes sig = input.Read(kPngSignature.size());
-  if (sig.size() != 8 ||
-      memcmp(sig.data(), kPngSignature.data(), kPngSignature.size()) != 0) {
-    return false;  // Return silently if it is not a PNG
-  }
-
-  // Check IHDR chunk.
-  Context ctx;
-  Bytes ihdr = input.ReadChunk();
-  if (ihdr.size() != ctx.ihdr.size()) {
-    return JXL_FAILURE("Unexpected first chunk payload size");
-  }
-  memcpy(ctx.ihdr.data(), ihdr.data(), ihdr.size());
-  uint32_t id = LoadLE32(ihdr.data() + 4);
-  if (id != MakeTag('I', 'H', 'D', 'R')) {
-    return JXL_FAILURE("First chunk is not IHDR");
-  }
-  const RectT<uint64_t> image_rect(0, 0, png_get_uint_32(ihdr.data() + 8),
-                                   png_get_uint_32(ihdr.data() + 12));
-  if (!ValidateViewport(image_rect)) {
-    return JXL_FAILURE("PNG image dimensions are too large");
-  }
-
-  // Chunks we supply to PNG decoder for every animation frame.
-  std::vector<Bytes> passthrough_chunks;
-  if (!ctx.InitPngDecoder(passthrough_chunks, image_rect)) {
-    return JXL_FAILURE("Failed to initialize PNG decoder");
-  }
-
-  // Marker that this PNG is animated.
-  bool seen_actl = false;
-  // First IDAT is a very important milestone; at this moment we freeze
-  // gathered metadata.
-  bool seen_idat = false;
-  // fCTL can occur multiple times, but only once before IDAT.
-  bool seen_fctl = false;
-  // Logical EOF.
-  bool seen_iend = false;
-
-  ColorInfoType color_info_type = ColorInfoType::NONE;
-
-  // Flag that we processed some IDAT / fDAT after image / frame start.
-  bool seen_pixel_data = false;
-
-  uint32_t num_channels;
-  JxlPixelFormat format = {};
-  size_t bytes_per_pixel = 0;
-  std::vector<Frame> frames;
-  FrameControl current_frame = {/*delay_num=*/1, /*delay_den=*/10, image_rect,
-                                DisposeOp::NONE, BlendOp::SOURCE};
-
-  // Copies frame pixels / metadata from temporary storage.
-  // TODO(eustas): avoid copying.
-  const auto finalize_frame = [&]() -> Status {
-    if (!seen_pixel_data) {
-      return JXL_FAILURE("Frame / image without fdAT / IDAT chunks");
-    }
-    if (!ctx.FinalizeStream(&ppf->metadata)) {
-      return JXL_FAILURE("Failed to finalize PNG substream");
-    }
-    if (ctx.frameRaw.has_error) {
-      return JXL_FAILURE("Internal error");
-    }
-    // Allocates the frame buffer.
-    const RectT<uint64_t>& vp = current_frame.viewport;
-    size_t xsize = static_cast<size_t>(vp.xsize());
-    size_t ysize = static_cast<size_t>(vp.ysize());
-    JXL_ASSIGN_OR_RETURN(PackedImage image,
-                         PackedImage::Create(xsize, ysize, format));
-    for (size_t y = 0; y < ysize; ++y) {
-      // TODO(eustas): ensure multiplication is safe
-      memcpy(static_cast<uint8_t*>(image.pixels()) + image.stride * y,
-             ctx.frameRaw.rows[y], bytes_per_pixel * xsize);
-    }
-    frames.push_back(Frame{std::move(image), current_frame});
-    seen_pixel_data = false;
-    return true;
-  };
-
-  while (!input.Eof()) {
-    if (seen_iend) {
-      return JXL_FAILURE("Exuberant input after IEND chunk");
-    }
-    Bytes chunk = input.ReadChunk();
-    if (chunk.empty()) {
-      return JXL_FAILURE("Malformed chunk");
-    }
-    Bytes type(chunk.data() + 4, 4);
-    id = LoadLE32(type.data());
-    // Cut 'size' and 'type' at front and 'CRC' at the end.
-    Bytes payload(chunk.data() + 8, chunk.size() - 12);
-
-    if (!isAbc(type[0]) || !isAbc(type[1]) || !isAbc(type[2]) ||
-        !isAbc(type[3])) {
-      return JXL_FAILURE("Exotic PNG chunk");
-    }
-
-    switch (id) {
-      case MakeTag('a', 'c', 'T', 'L'):
-        if (seen_idat) {
-          JXL_DEBUG_V(2, "aCTL after IDAT ignored");
-          continue;
-        }
-        if (seen_actl) {
-          JXL_DEBUG_V(2, "Duplicate aCTL chunk ignored");
-          continue;
-        }
-        seen_actl = true;
-        ppf->info.have_animation = JXL_TRUE;
-        // TODO(eustas): decode from chunk?
-        ppf->info.animation.tps_numerator = 1000;
-        ppf->info.animation.tps_denominator = 1;
-        continue;
-
-      case MakeTag('I', 'E', 'N', 'D'):
-        seen_iend = true;
-        JXL_RETURN_IF_ERROR(finalize_frame());
-        continue;
-
-      case MakeTag('f', 'c', 'T', 'L'): {
-        if (payload.size() != 26) {
-          return JXL_FAILURE("Unexpected fcTL payload size: %u",
-                             static_cast<uint32_t>(payload.size()));
-        }
-        if (seen_fctl && !seen_idat) {
-          return JXL_FAILURE("More than one fcTL before IDAT");
-        }
-        if (seen_idat && !seen_actl) {
-          return JXL_FAILURE("fcTL after IDAT, but without acTL");
-        }
-        seen_fctl = true;
-
-        // TODO(eustas): check order?
-        // sequence_number = png_get_uint_32(payload.data());
-        RectT<uint64_t> raw_viewport(png_get_uint_32(payload.data() + 12),
-                                     png_get_uint_32(payload.data() + 16),
-                                     png_get_uint_32(payload.data() + 4),
-                                     png_get_uint_32(payload.data() + 8));
-        uint8_t dispose_op = payload[24];
-        if (dispose_op > kLastDisposeOp) {
-          return JXL_FAILURE("Invalid DisposeOp");
-        }
-        uint8_t blend_op = payload[25];
-        if (blend_op > kLastBlendOp) {
-          return JXL_FAILURE("Invalid BlendOp");
-        }
-        FrameControl next_frame = {
-            /*delay_num=*/png_get_uint_16(payload.data() + 20),
-            /*delay_den=*/png_get_uint_16(payload.data() + 22), raw_viewport,
-            static_cast<DisposeOp>(dispose_op), static_cast<BlendOp>(blend_op)};
-
-        if (!raw_viewport.Intersection(image_rect).IsSame(raw_viewport)) {
-          // Cropping happened.
-          return JXL_FAILURE("PNG frame is outside of image rect");
-        }
-
-        if (!seen_idat) {
-          // "Default" image is the first animation frame. Its viewport must
-          // cover the whole image area.
-          if (!raw_viewport.IsSame(image_rect)) {
-            return JXL_FAILURE(
-                "If the first animation frame is default image, its viewport "
-                "must cover full image");
-          }
-        } else {
-          JXL_RETURN_IF_ERROR(finalize_frame());
-          if (!ctx.InitPngDecoder(passthrough_chunks, next_frame.viewport)) {
-            return JXL_FAILURE("Failed to initialize PNG decoder");
-          }
-        }
-        current_frame = next_frame;
-        continue;
-      }
-
-      case MakeTag('I', 'D', 'A', 'T'): {
-        if (!frames.empty()) {
-          return JXL_FAILURE("IDAT after default image is over");
-        }
-        if (!seen_idat) {
-          // First IDAT means that all metadata is ready.
-          seen_idat = true;
-          JXL_ENSURE(image_rect.xsize() ==
-                     png_get_image_width(ctx.png_ptr, ctx.info_ptr));
-          JXL_ENSURE(image_rect.ysize() ==
-                     png_get_image_height(ctx.png_ptr, ctx.info_ptr));
-          JXL_RETURN_IF_ERROR(VerifyDimensions(constraints, image_rect.xsize(),
-                                               image_rect.ysize()));
-          ppf->info.xsize = image_rect.xsize();
-          ppf->info.ysize = image_rect.ysize();
-
-          png_color_8p sig_bits = nullptr;
-          // Error is OK -> sig_bits remains nullptr.
-          png_get_sBIT(ctx.png_ptr, ctx.info_ptr, &sig_bits);
-          SetColorData(ppf, png_get_color_type(ctx.png_ptr, ctx.info_ptr),
-                       png_get_bit_depth(ctx.png_ptr, ctx.info_ptr), sig_bits,
-                       png_get_valid(ctx.png_ptr, ctx.info_ptr, PNG_INFO_tRNS));
-          num_channels =
-              ppf->info.num_color_channels + (ppf->info.alpha_bits ? 1 : 0);
-          format = {
-              /*num_channels=*/num_channels,
-              /*data_type=*/ppf->info.bits_per_sample > 8 ? JXL_TYPE_UINT16
-                                                          : JXL_TYPE_UINT8,
-              /*endianness=*/JXL_BIG_ENDIAN,
-              /*align=*/0,
-          };
-          bytes_per_pixel =
-              num_channels * (format.data_type == JXL_TYPE_UINT16 ? 2 : 1);
-          // TODO(eustas): ensure multiplication is safe
-          uint64_t row_bytes =
-              static_cast<uint64_t>(image_rect.xsize()) * bytes_per_pixel;
-          uint64_t max_rows = std::numeric_limits<size_t>::max() / row_bytes;
-          if (image_rect.ysize() > max_rows) {
-            return JXL_FAILURE("Image too big.");
-          }
-          // TODO(eustas): drop frameRaw
-          JXL_RETURN_IF_ERROR(
-              ctx.frameRaw.Resize(row_bytes, image_rect.ysize()));
-        }
-
-        if (!ctx.FeedChunks(chunk)) {
-          return JXL_FAILURE("Decoding IDAT failed");
-        }
-        seen_pixel_data = true;
-        continue;
-      }
-
-      case MakeTag('f', 'd', 'A', 'T'): {
-        if (!seen_idat) {
-          return JXL_FAILURE("fdAT chunk before IDAT");
-        }
-        if (!seen_actl) {
-          return JXL_FAILURE("fdAT chunk before acTL");
-        }
-        /* The 'fdAT' chunk has... the same structure as an 'IDAT' chunk,
-         * except preceded by a sequence number. */
-        if (payload.size() < 4) {
-          return JXL_FAILURE("Corrupted fdAT chunk");
-        }
-        // Turn 'fdAT' to 'IDAT' by cutting sequence number and replacing tag.
-        std::array<uint8_t, 8> preamble;
-        png_save_uint_32(preamble.data(), payload.size() - 4);
-        memcpy(preamble.data() + 4, "IDAT", 4);
-        // Cut-off 'size', 'type' and 'sequence_number'
-        Bytes chunk_tail(chunk.data() + 12, chunk.size() - 12);
-        if (!ctx.FeedChunks(Bytes(preamble), chunk_tail)) {
-          return JXL_FAILURE("Decoding fdAT failed");
-        }
-        seen_pixel_data = true;
-        continue;
-      }
-
-      case MakeTag('c', 'I', 'C', 'P'):
-        if (color_info_type == ColorInfoType::CICP) {
-          JXL_DEBUG_V(2, "Excessive colorspace definition; cICP chunk ignored");
-          continue;
-        }
-        JXL_RETURN_IF_ERROR(DecodeCicpChunk(payload, &ppf->color_encoding));
-        ppf->icc.clear();
-        ppf->primary_color_representation =
-            PackedPixelFile::kColorEncodingIsPrimary;
-        color_info_type = ColorInfoType::CICP;
-        continue;
-
-      case MakeTag('i', 'C', 'C', 'P'): {
-        if (color_info_type == ColorInfoType::ICCP_OR_SRGB) {
-          return JXL_FAILURE("Repeated iCCP / sRGB chunk");
-        }
-        if (color_info_type > ColorInfoType::ICCP_OR_SRGB) {
-          JXL_DEBUG_V(2, "Excessive colorspace definition; iCCP chunk ignored");
-          continue;
-        }
-        // Let PNG decoder deal with chunk processing.
-        if (!ctx.FeedChunks(chunk)) {
-          return JXL_FAILURE("Corrupt iCCP chunk");
-        }
-
-        // TODO(jon): catch special case of PQ and synthesize color encoding
-        // in that case
-        int compression_type = 0;
-        png_bytep profile = nullptr;
-        png_charp name = nullptr;
-        png_uint_32 profile_len = 0;
-        png_uint_32 ok =
-            png_get_iCCP(ctx.png_ptr, ctx.info_ptr, &name, &compression_type,
-                         &profile, &profile_len);
-        if (!ok || !profile_len) {
-          return JXL_FAILURE("Malformed / incomplete iCCP chunk");
-        }
-        ppf->icc.assign(profile, profile + profile_len);
-        ppf->primary_color_representation = PackedPixelFile::kIccIsPrimary;
-        color_info_type = ColorInfoType::ICCP_OR_SRGB;
-        continue;
-      }
-
-      case MakeTag('s', 'R', 'G', 'B'):
-        if (color_info_type == ColorInfoType::ICCP_OR_SRGB) {
-          return JXL_FAILURE("Repeated iCCP / sRGB chunk");
-        }
-        if (color_info_type > ColorInfoType::ICCP_OR_SRGB) {
-          JXL_DEBUG_V(2, "Excessive colorspace definition; sRGB chunk ignored");
-          continue;
-        }
-        JXL_RETURN_IF_ERROR(DecodeSrgbChunk(payload, &ppf->color_encoding));
-        color_info_type = ColorInfoType::ICCP_OR_SRGB;
-        continue;
-
-      case MakeTag('g', 'A', 'M', 'A'):
-        if (color_info_type >= ColorInfoType::GAMA_OR_CHRM) {
-          JXL_DEBUG_V(2, "Excessive colorspace definition; gAMA chunk ignored");
-          continue;
-        }
-        JXL_RETURN_IF_ERROR(DecodeGamaChunk(payload, &ppf->color_encoding));
-        color_info_type = ColorInfoType::GAMA_OR_CHRM;
-        continue;
-
-      case MakeTag('c', 'H', 'R', 'M'):
-        if (color_info_type >= ColorInfoType::GAMA_OR_CHRM) {
-          JXL_DEBUG_V(2, "Excessive colorspace definition; cHRM chunk ignored");
-          continue;
-        }
-        JXL_RETURN_IF_ERROR(DecodeChrmChunk(payload, &ppf->color_encoding));
-        color_info_type = ColorInfoType::GAMA_OR_CHRM;
-        continue;
-
-      case MakeTag('c', 'L', 'L', 'i'):
-        JXL_RETURN_IF_ERROR(
-            DecodeClliChunk(payload, &ppf->info.intensity_target));
-        continue;
-
-      case MakeTag('e', 'X', 'I', 'f'):
-        // TODO(eustas): next eXIF chunk overwrites current; is it ok?
-        ppf->metadata.exif.resize(payload.size());
-        memcpy(ppf->metadata.exif.data(), payload.data(), payload.size());
-        continue;
-
-      default:
-        // We don't know what is that, just pass through.
-        if (!ctx.FeedChunks(chunk)) {
-          return JXL_FAILURE("PNG decoder failed to process chunk");
-        }
-        // If it happens before IDAT, we consider it metadata and pass to all
-        // sub-decoders.
-        if (!seen_idat) {
-          passthrough_chunks.push_back(chunk);
-        }
-        continue;
-    }
-  }
-
-  bool color_is_already_set = (color_info_type != ColorInfoType::NONE);
-  bool is_gray = (ppf->info.num_color_channels == 1);
-  JXL_RETURN_IF_ERROR(
-      ApplyColorHints(color_hints, color_is_already_set, is_gray, ppf));
-
-  if (ppf->color_encoding.transfer_function != JXL_TRANSFER_FUNCTION_PQ) {
-    // Reset intensity target, in case we set it from cLLi but TF is not PQ.
-    ppf->info.intensity_target = 0.f;
-  }
-
-  bool has_nontrivial_background = false;
-  bool previous_frame_should_be_cleared = false;
-  for (size_t i = 0; i < frames.size(); i++) {
-    Frame& frame = frames[i];
-    const FrameControl& fc = frame.metadata;
-    const RectT<uint64_t> vp = fc.viewport;
-    const auto& pixels = frame.pixels;
-    size_t xsize = pixels.xsize;
-    size_t ysize = pixels.ysize;
-    JXL_ENSURE(xsize == vp.xsize());
-    JXL_ENSURE(ysize == vp.ysize());
-
-    // Before encountering a DISPOSE_OP_NONE frame, the canvas is filled with
-    // 0, so DISPOSE_OP_BACKGROUND and DISPOSE_OP_PREVIOUS are equivalent.
-    if (fc.dispose_op == DisposeOp::NONE) {
-      has_nontrivial_background = true;
-    }
-    bool should_blend = fc.blend_op == BlendOp::OVER;
-    bool use_for_next_frame =
-        has_nontrivial_background && fc.dispose_op != DisposeOp::PREVIOUS;
-    size_t x0 = vp.x0();
-    size_t y0 = vp.y0();
-    if (previous_frame_should_be_cleared) {
-      const auto& pvp = frames[i - 1].metadata.viewport;
-      size_t px0 = pvp.x0();
-      size_t py0 = pvp.y0();
-      size_t pxs = pvp.xsize();
-      size_t pys = pvp.ysize();
-      if (px0 >= x0 && py0 >= y0 && px0 + pxs <= x0 + xsize &&
-          py0 + pys <= y0 + ysize && fc.blend_op == BlendOp::SOURCE &&
-          use_for_next_frame) {
-        // If the previous frame is entirely contained in the current frame
-        // and we are using BLEND_OP_SOURCE, nothing special needs to be done.
-        ppf->frames.emplace_back(std::move(frame.pixels));
-      } else if (px0 == x0 && py0 == y0 && px0 + pxs == x0 + xsize &&
-                 py0 + pys == y0 + ysize && use_for_next_frame) {
-        // If the new frame has the same size as the old one, but we are
-        // blending, we can instead just not blend.
-        should_blend = false;
-        ppf->frames.emplace_back(std::move(frame.pixels));
-      } else if (px0 <= x0 && py0 <= y0 && px0 + pxs >= x0 + xsize &&
-                 py0 + pys >= y0 + ysize && use_for_next_frame) {
-        // If the new frame is contained within the old frame, we can pad the
-        // new frame with zeros and not blend.
-        JXL_ASSIGN_OR_RETURN(PackedImage new_data,
-                             PackedImage::Create(pxs, pys, pixels.format));
-        memset(new_data.pixels(), 0, new_data.pixels_size);
-        for (size_t y = 0; y < ysize; y++) {
-          JXL_RETURN_IF_ERROR(
-              PackedImage::ValidateDataType(new_data.format.data_type));
-          size_t bytes_per_pixel =
-              PackedImage::BitsPerChannel(new_data.format.data_type) *
-              new_data.format.num_channels / 8;
-          memcpy(
-              static_cast<uint8_t*>(new_data.pixels()) +
-                  new_data.stride * (y + y0 - py0) +
-                  bytes_per_pixel * (x0 - px0),
-              static_cast<const uint8_t*>(pixels.pixels()) + pixels.stride * y,
-              xsize * bytes_per_pixel);
-        }
-
-        x0 = px0;
-        y0 = py0;
-        xsize = pxs;
-        ysize = pys;
-        should_blend = false;
-        ppf->frames.emplace_back(std::move(new_data));
-      } else {
-        // If all else fails, insert a placeholder blank frame with kReplace.
-        JXL_ASSIGN_OR_RETURN(PackedImage blank,
-                             PackedImage::Create(pxs, pys, pixels.format));
-        memset(blank.pixels(), 0, blank.pixels_size);
-        ppf->frames.emplace_back(std::move(blank));
-        auto& pframe = ppf->frames.back();
-        pframe.frame_info.layer_info.crop_x0 = px0;
-        pframe.frame_info.layer_info.crop_y0 = py0;
-        pframe.frame_info.layer_info.xsize = pxs;
-        pframe.frame_info.layer_info.ysize = pys;
-        pframe.frame_info.duration = 0;
-        bool is_full_size = px0 == 0 && py0 == 0 && pxs == ppf->info.xsize &&
-                            pys == ppf->info.ysize;
-        pframe.frame_info.layer_info.have_crop = is_full_size ? 0 : 1;
-        pframe.frame_info.layer_info.blend_info.blendmode = JXL_BLEND_REPLACE;
-        pframe.frame_info.layer_info.blend_info.source = 1;
-        pframe.frame_info.layer_info.save_as_reference = 1;
-        ppf->frames.emplace_back(std::move(frame.pixels));
-      }
-    } else {
-      ppf->frames.emplace_back(std::move(frame.pixels));
-    }
-
-    auto& pframe = ppf->frames.back();
-    pframe.frame_info.layer_info.crop_x0 = x0;
-    pframe.frame_info.layer_info.crop_y0 = y0;
-    pframe.frame_info.layer_info.xsize = xsize;
-    pframe.frame_info.layer_info.ysize = ysize;
-    pframe.frame_info.duration =
-        fc.delay_num * 1000 / (fc.delay_den ? fc.delay_den : 100);
-    pframe.frame_info.layer_info.blend_info.blendmode =
-        should_blend ? JXL_BLEND_BLEND : JXL_BLEND_REPLACE;
-    bool is_full_size = x0 == 0 && y0 == 0 && xsize == ppf->info.xsize &&
-                        ysize == ppf->info.ysize;
-    pframe.frame_info.layer_info.have_crop = is_full_size ? 0 : 1;
-    pframe.frame_info.layer_info.blend_info.source = 1;
-    pframe.frame_info.layer_info.blend_info.alpha = 0;
-    pframe.frame_info.layer_info.save_as_reference = use_for_next_frame ? 1 : 0;
-
-    previous_frame_should_be_cleared =
-        has_nontrivial_background && (fc.dispose_op == DisposeOp::BACKGROUND);
-  }
-
-  if (ppf->frames.empty()) return JXL_FAILURE("No frames decoded");
-  ppf->frames.back().frame_info.is_last = JXL_TRUE;
-
-  return true;
-}
-
-#endif  // JPEGXL_ENABLE_APNG
-
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/dec/apng.h b/third_party/jpeg-xl/lib/extras/dec/apng.h
deleted file mode 100644
index 7ebc2ee7c8ae1..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/apng.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_DEC_APNG_H_
-#define LIB_EXTRAS_DEC_APNG_H_
-
-// Decodes APNG images in memory.
-
-#include <cstdint>
-
-#include "lib/extras/dec/color_hints.h"
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-struct SizeConstraints;
-
-namespace extras {
-
-bool CanDecodeAPNG();
-
-// Decodes `bytes` into `ppf`.
-Status DecodeImageAPNG(Span<const uint8_t> bytes, const ColorHints& color_hints,
-                       PackedPixelFile* ppf,
-                       const SizeConstraints* constraints = nullptr);
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_DEC_APNG_H_
diff --git a/third_party/jpeg-xl/lib/extras/dec/color_description.cc b/third_party/jpeg-xl/lib/extras/dec/color_description.cc
deleted file mode 100644
index dd84455c41095..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/color_description.cc
+++ /dev/null
@@ -1,241 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/dec/color_description.h"
-
-#include <errno.h>
-
-#include <cmath>
-
-#include "lib/jxl/base/common.h"
-
-namespace jxl {
-
-namespace {
-
-template <typename T>
-struct EnumName {
-  const char* name;
-  T value;
-};
-
-constexpr auto kJxlColorSpaceNames =
-    to_array<EnumName<JxlColorSpace>>({{"RGB", JXL_COLOR_SPACE_RGB},
-                                       {"Gra", JXL_COLOR_SPACE_GRAY},
-                                       {"XYB", JXL_COLOR_SPACE_XYB},
-                                       {"CS?", JXL_COLOR_SPACE_UNKNOWN}});
-
-constexpr auto kJxlWhitePointNames =
-    to_array<EnumName<JxlWhitePoint>>({{"D65", JXL_WHITE_POINT_D65},
-                                       {"Cst", JXL_WHITE_POINT_CUSTOM},
-                                       {"EER", JXL_WHITE_POINT_E},
-                                       {"DCI", JXL_WHITE_POINT_DCI}});
-
-constexpr auto kJxlPrimariesNames =
-    to_array<EnumName<JxlPrimaries>>({{"SRG", JXL_PRIMARIES_SRGB},
-                                      {"Cst", JXL_PRIMARIES_CUSTOM},
-                                      {"202", JXL_PRIMARIES_2100},
-                                      {"DCI", JXL_PRIMARIES_P3}});
-
-constexpr auto kJxlRenderingIntentNames =
-    to_array<EnumName<JxlRenderingIntent>>(
-        {{"Per", JXL_RENDERING_INTENT_PERCEPTUAL},
-         {"Rel", JXL_RENDERING_INTENT_RELATIVE},
-         {"Sat", JXL_RENDERING_INTENT_SATURATION},
-         {"Abs", JXL_RENDERING_INTENT_ABSOLUTE}});
-
-constexpr auto kJxlTransferFunctionNames =
-    to_array<EnumName<JxlTransferFunction>>(
-        {{"709", JXL_TRANSFER_FUNCTION_709},
-         {"TF?", JXL_TRANSFER_FUNCTION_UNKNOWN},
-         {"Lin", JXL_TRANSFER_FUNCTION_LINEAR},
-         {"SRG", JXL_TRANSFER_FUNCTION_SRGB},
-         {"PeQ", JXL_TRANSFER_FUNCTION_PQ},
-         {"DCI", JXL_TRANSFER_FUNCTION_DCI},
-         {"HLG", JXL_TRANSFER_FUNCTION_HLG},
-         {"", JXL_TRANSFER_FUNCTION_GAMMA}});
-
-template <typename T, size_t N>
-Status ParseEnum(const std::string& token,
-                 const std::array<EnumName<T>, N>& enum_values, T* value) {
-  for (size_t i = 0; i < enum_values.size(); i++) {
-    if (enum_values[i].name == token) {
-      *value = enum_values[i].value;
-      return true;
-    }
-  }
-  return false;
-}
-
-class Tokenizer {
- public:
-  Tokenizer(const std::string* input, char separator)
-      : input_(input), separator_(separator) {}
-
-  Status Next(std::string* next) {
-    const size_t end = input_->find(separator_, start_);
-    if (end == std::string::npos) {
-      *next = input_->substr(start_);  // rest of string
-    } else {
-      *next = input_->substr(start_, end - start_);
-    }
-    if (next->empty()) return JXL_FAILURE("Missing token");
-    start_ = end + 1;
-    return true;
-  }
-
- private:
-  const std::string* const input_;  // not owned
-  const char separator_;
-  size_t start_ = 0;  // of next token
-};
-
-Status ParseDouble(const std::string& num, double* d) {
-  char* end;
-  errno = 0;
-  *d = strtod(num.c_str(), &end);
-  if (*d == 0.0 && end == num.c_str()) {
-    return JXL_FAILURE("Invalid double: %s", num.c_str());
-  }
-  if (std::isnan(*d)) {
-    return JXL_FAILURE("Invalid double: %s", num.c_str());
-  }
-  if (errno == ERANGE) {
-    return JXL_FAILURE("Double out of range: %s", num.c_str());
-  }
-  return true;
-}
-
-Status ParseDouble(Tokenizer* tokenizer, double* d) {
-  std::string num;
-  JXL_RETURN_IF_ERROR(tokenizer->Next(&num));
-  return ParseDouble(num, d);
-}
-
-Status ParseColorSpace(Tokenizer* tokenizer, JxlColorEncoding* c) {
-  std::string str;
-  JXL_RETURN_IF_ERROR(tokenizer->Next(&str));
-  JxlColorSpace cs;
-  if (ParseEnum(str, kJxlColorSpaceNames, &cs)) {
-    c->color_space = cs;
-    return true;
-  }
-
-  return JXL_FAILURE("Unknown ColorSpace %s", str.c_str());
-}
-
-Status ParseWhitePoint(Tokenizer* tokenizer, JxlColorEncoding* c) {
-  if (c->color_space == JXL_COLOR_SPACE_XYB) {
-    // Implicit white point.
-    c->white_point = JXL_WHITE_POINT_D65;
-    return true;
-  }
-
-  std::string str;
-  JXL_RETURN_IF_ERROR(tokenizer->Next(&str));
-  if (ParseEnum(str, kJxlWhitePointNames, &c->white_point)) return true;
-
-  Tokenizer xy_tokenizer(&str, ';');
-  c->white_point = JXL_WHITE_POINT_CUSTOM;
-  JXL_RETURN_IF_ERROR(ParseDouble(&xy_tokenizer, c->white_point_xy + 0));
-  JXL_RETURN_IF_ERROR(ParseDouble(&xy_tokenizer, c->white_point_xy + 1));
-  return true;
-}
-
-Status ParsePrimaries(Tokenizer* tokenizer, JxlColorEncoding* c) {
-  if (c->color_space == JXL_COLOR_SPACE_GRAY ||
-      c->color_space == JXL_COLOR_SPACE_XYB) {
-    // No primaries case.
-    return true;
-  }
-
-  std::string str;
-  JXL_RETURN_IF_ERROR(tokenizer->Next(&str));
-  if (ParseEnum(str, kJxlPrimariesNames, &c->primaries)) return true;
-
-  Tokenizer xy_tokenizer(&str, ';');
-  JXL_RETURN_IF_ERROR(ParseDouble(&xy_tokenizer, c->primaries_red_xy + 0));
-  JXL_RETURN_IF_ERROR(ParseDouble(&xy_tokenizer, c->primaries_red_xy + 1));
-  JXL_RETURN_IF_ERROR(ParseDouble(&xy_tokenizer, c->primaries_green_xy + 0));
-  JXL_RETURN_IF_ERROR(ParseDouble(&xy_tokenizer, c->primaries_green_xy + 1));
-  JXL_RETURN_IF_ERROR(ParseDouble(&xy_tokenizer, c->primaries_blue_xy + 0));
-  JXL_RETURN_IF_ERROR(ParseDouble(&xy_tokenizer, c->primaries_blue_xy + 1));
-  c->primaries = JXL_PRIMARIES_CUSTOM;
-
-  return true;
-}
-
-Status ParseRenderingIntent(Tokenizer* tokenizer, JxlColorEncoding* c) {
-  std::string str;
-  JXL_RETURN_IF_ERROR(tokenizer->Next(&str));
-  if (ParseEnum(str, kJxlRenderingIntentNames, &c->rendering_intent))
-    return true;
-
-  return JXL_FAILURE("Invalid RenderingIntent %s\n", str.c_str());
-}
-
-Status ParseTransferFunction(Tokenizer* tokenizer, JxlColorEncoding* c) {
-  if (c->color_space == JXL_COLOR_SPACE_XYB) {
-    // Implicit TF.
-    c->transfer_function = JXL_TRANSFER_FUNCTION_GAMMA;
-    c->gamma = 1 / 3.;
-    return true;
-  }
-
-  std::string str;
-  JXL_RETURN_IF_ERROR(tokenizer->Next(&str));
-  if (ParseEnum(str, kJxlTransferFunctionNames, &c->transfer_function)) {
-    return true;
-  }
-
-  if (str[0] == 'g') {
-    JXL_RETURN_IF_ERROR(ParseDouble(str.substr(1), &c->gamma));
-    c->transfer_function = JXL_TRANSFER_FUNCTION_GAMMA;
-    return true;
-  }
-
-  return JXL_FAILURE("Invalid gamma %s", str.c_str());
-}
-
-}  // namespace
-
-Status ParseDescription(const std::string& description, JxlColorEncoding* c) {
-  *c = {};
-  if (description == "sRGB") {
-    c->color_space = JXL_COLOR_SPACE_RGB;
-    c->white_point = JXL_WHITE_POINT_D65;
-    c->primaries = JXL_PRIMARIES_SRGB;
-    c->transfer_function = JXL_TRANSFER_FUNCTION_SRGB;
-    c->rendering_intent = JXL_RENDERING_INTENT_PERCEPTUAL;
-  } else if (description == "DisplayP3") {
-    c->color_space = JXL_COLOR_SPACE_RGB;
-    c->white_point = JXL_WHITE_POINT_D65;
-    c->primaries = JXL_PRIMARIES_P3;
-    c->transfer_function = JXL_TRANSFER_FUNCTION_SRGB;
-    c->rendering_intent = JXL_RENDERING_INTENT_PERCEPTUAL;
-  } else if (description == "Rec2100PQ") {
-    c->color_space = JXL_COLOR_SPACE_RGB;
-    c->white_point = JXL_WHITE_POINT_D65;
-    c->primaries = JXL_PRIMARIES_2100;
-    c->transfer_function = JXL_TRANSFER_FUNCTION_PQ;
-    c->rendering_intent = JXL_RENDERING_INTENT_RELATIVE;
-  } else if (description == "Rec2100HLG") {
-    c->color_space = JXL_COLOR_SPACE_RGB;
-    c->white_point = JXL_WHITE_POINT_D65;
-    c->primaries = JXL_PRIMARIES_2100;
-    c->transfer_function = JXL_TRANSFER_FUNCTION_HLG;
-    c->rendering_intent = JXL_RENDERING_INTENT_RELATIVE;
-  } else {
-    Tokenizer tokenizer(&description, '_');
-    JXL_RETURN_IF_ERROR(ParseColorSpace(&tokenizer, c));
-    JXL_RETURN_IF_ERROR(ParseWhitePoint(&tokenizer, c));
-    JXL_RETURN_IF_ERROR(ParsePrimaries(&tokenizer, c));
-    JXL_RETURN_IF_ERROR(ParseRenderingIntent(&tokenizer, c));
-    JXL_RETURN_IF_ERROR(ParseTransferFunction(&tokenizer, c));
-  }
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/dec/color_description.h b/third_party/jpeg-xl/lib/extras/dec/color_description.h
deleted file mode 100644
index 23680ff7c6a24..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/color_description.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_COLOR_DESCRIPTION_H_
-#define LIB_EXTRAS_COLOR_DESCRIPTION_H_
-
-#include <jxl/color_encoding.h>
-
-#include <string>
-
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-// Parse the color description into a JxlColorEncoding "RGB_D65_SRG_Rel_Lin".
-Status ParseDescription(const std::string& description,
-                        JxlColorEncoding* JXL_RESTRICT c);
-
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_COLOR_DESCRIPTION_H_
diff --git a/third_party/jpeg-xl/lib/extras/dec/color_description_test.cc b/third_party/jpeg-xl/lib/extras/dec/color_description_test.cc
deleted file mode 100644
index e6e34f0edf061..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/color_description_test.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/dec/color_description.h"
-
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-
-// Verify ParseDescription(Description) yields the same ColorEncoding
-TEST(ColorDescriptionTest, RoundTripAll) {
-  for (const auto& cdesc : test::AllEncodings()) {
-    const ColorEncoding c_original = test::ColorEncodingFromDescriptor(cdesc);
-    const std::string description = Description(c_original);
-    printf("%s\n", description.c_str());
-
-    JxlColorEncoding c_external = {};
-    EXPECT_TRUE(ParseDescription(description, &c_external));
-    ColorEncoding c_internal;
-    EXPECT_TRUE(c_internal.FromExternal(c_external));
-    EXPECT_TRUE(c_original.SameColorEncoding(c_internal))
-        << "Where c_original=" << c_original
-        << " and c_internal=" << c_internal;
-  }
-}
-
-TEST(ColorDescriptionTest, NanGamma) {
-  const std::string description = "Gra_2_Per_gnan";
-  JxlColorEncoding c;
-  EXPECT_FALSE(ParseDescription(description, &c));
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/dec/color_hints.cc b/third_party/jpeg-xl/lib/extras/dec/color_hints.cc
deleted file mode 100644
index b1edd9f6eabf4..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/color_hints.cc
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/dec/color_hints.h"
-
-#include <jxl/encode.h>
-
-#include <vector>
-
-#include "lib/extras/dec/color_description.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-namespace extras {
-
-Status ApplyColorHints(const ColorHints& color_hints,
-                       const bool color_already_set, const bool is_gray,
-                       PackedPixelFile* ppf) {
-  bool got_color_space = color_already_set;
-
-  JXL_RETURN_IF_ERROR(color_hints.Foreach(
-      [color_already_set, is_gray, ppf, &got_color_space](
-          const std::string& key, const std::string& value) -> Status {
-        if (color_already_set && (key == "color_space" || key == "icc")) {
-          JXL_WARNING("Decoder ignoring %s hint", key.c_str());
-          return true;
-        }
-        if (key == "color_space") {
-          JxlColorEncoding c_original_external;
-          if (!ParseDescription(value, &c_original_external)) {
-            return JXL_FAILURE("Failed to apply color_space");
-          }
-          ppf->color_encoding = c_original_external;
-
-          if (is_gray !=
-              (ppf->color_encoding.color_space == JXL_COLOR_SPACE_GRAY)) {
-            return JXL_FAILURE("mismatch between file and color_space hint");
-          }
-
-          got_color_space = true;
-        } else if (key == "icc") {
-          const uint8_t* data = reinterpret_cast<const uint8_t*>(value.data());
-          std::vector<uint8_t> icc(data, data + value.size());
-          ppf->icc = std::move(icc);
-          ppf->primary_color_representation = PackedPixelFile::kIccIsPrimary;
-          got_color_space = true;
-        } else if (key == "exif") {
-          const uint8_t* data = reinterpret_cast<const uint8_t*>(value.data());
-          std::vector<uint8_t> blob(data, data + value.size());
-          ppf->metadata.exif = std::move(blob);
-        } else if (key == "xmp") {
-          const uint8_t* data = reinterpret_cast<const uint8_t*>(value.data());
-          std::vector<uint8_t> blob(data, data + value.size());
-          ppf->metadata.xmp = std::move(blob);
-        } else if (key == "jumbf") {
-          const uint8_t* data = reinterpret_cast<const uint8_t*>(value.data());
-          std::vector<uint8_t> blob(data, data + value.size());
-          ppf->metadata.jumbf = std::move(blob);
-        } else {
-          JXL_WARNING("Ignoring %s hint", key.c_str());
-        }
-        return true;
-      }));
-
-  if (!got_color_space) {
-    ppf->color_encoding.color_space =
-        is_gray ? JXL_COLOR_SPACE_GRAY : JXL_COLOR_SPACE_RGB;
-    ppf->color_encoding.white_point = JXL_WHITE_POINT_D65;
-    ppf->color_encoding.primaries = JXL_PRIMARIES_SRGB;
-    ppf->color_encoding.transfer_function = JXL_TRANSFER_FUNCTION_SRGB;
-  }
-
-  return true;
-}
-
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/dec/color_hints.h b/third_party/jpeg-xl/lib/extras/dec/color_hints.h
deleted file mode 100644
index 036f203e261b4..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/color_hints.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_COLOR_HINTS_H_
-#define LIB_EXTRAS_COLOR_HINTS_H_
-
-// Not all the formats implemented in the extras lib support bundling color
-// information into the file, and those that support it may not have it.
-// To allow attaching color information to those file formats the caller can
-// define these color hints.
-// Besides color space information, 'ColorHints' may also include other
-// additional information such as Exif, XMP and JUMBF metadata.
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include <string>
-#include <vector>
-
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-namespace extras {
-
-class ColorHints {
- public:
-  // key=color_space, value=Description(c/pp): specify the ColorEncoding of
-  //   the pixels for decoding. Otherwise, if the codec did not obtain an ICC
-  //   profile from the image, assume sRGB.
-  //
-  // Strings are taken from the command line, so avoid spaces for convenience.
-  void Add(const std::string& key, const std::string& value) {
-    kv_.emplace_back(key, value);
-  }
-
-  // Calls `func(key, value)` for each key/value in the order they were added,
-  // returning false immediately if `func` returns false.
-  template <class Func>
-  Status Foreach(const Func& func) const {
-    for (const KeyValue& kv : kv_) {
-      Status ok = func(kv.key, kv.value);
-      if (!ok) {
-        return JXL_FAILURE("ColorHints::Foreach returned false");
-      }
-    }
-    return true;
-  }
-
- private:
-  // Splitting into key/value avoids parsing in each codec.
-  struct KeyValue {
-    KeyValue(std::string key, std::string value)
-        : key(std::move(key)), value(std::move(value)) {}
-
-    std::string key;
-    std::string value;
-  };
-
-  std::vector<KeyValue> kv_;
-};
-
-// Apply the color hints to the decoded image in PackedPixelFile if any.
-// color_already_set tells whether the color encoding was already set, in which
-// case the hints are ignored if any hint is passed.
-Status ApplyColorHints(const ColorHints& color_hints, bool color_already_set,
-                       bool is_gray, PackedPixelFile* ppf);
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_COLOR_HINTS_H_
diff --git a/third_party/jpeg-xl/lib/extras/dec/decode.cc b/third_party/jpeg-xl/lib/extras/dec/decode.cc
deleted file mode 100644
index 2581d53f633c0..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/decode.cc
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/dec/decode.h"
-
-#include <locale>
-
-#include "lib/extras/dec/apng.h"
-#include "lib/extras/dec/exr.h"
-#include "lib/extras/dec/gif.h"
-#include "lib/extras/dec/jpg.h"
-#include "lib/extras/dec/jxl.h"
-#include "lib/extras/dec/pgx.h"
-#include "lib/extras/dec/pnm.h"
-
-namespace jxl {
-namespace extras {
-namespace {
-
-// Any valid encoding is larger (ensures codecs can read the first few bytes)
-constexpr size_t kMinBytes = 9;
-
-std::string GetExtension(const std::string& path) {
-  // Pattern: "name.png"
-  size_t pos = path.find_last_of('.');
-  if (pos != std::string::npos) {
-    return path.substr(pos);
-  }
-
-  // Extension not found
-  return "";
-}
-
-}  // namespace
-
-Codec CodecFromPath(const std::string& path,
-                    size_t* JXL_RESTRICT bits_per_sample,
-                    std::string* extension) {
-  std::string ext = GetExtension(path);
-  if (extension) {
-    if (extension->empty()) {
-      *extension = ext;
-    } else {
-      ext = *extension;
-    }
-  }
-  std::transform(ext.begin(), ext.end(), ext.begin(), [](char c) {
-    return std::tolower(c, std::locale::classic());
-  });
-  if (ext == ".png") return Codec::kPNG;
-
-  if (ext == ".jpg") return Codec::kJPG;
-  if (ext == ".jpeg") return Codec::kJPG;
-
-  if (ext == ".pgx") return Codec::kPGX;
-
-  if (ext == ".pam") return Codec::kPNM;
-  if (ext == ".pnm") return Codec::kPNM;
-  if (ext == ".pgm") return Codec::kPNM;
-  if (ext == ".ppm") return Codec::kPNM;
-  if (ext == ".pfm") {
-    if (bits_per_sample != nullptr) *bits_per_sample = 32;
-    return Codec::kPNM;
-  }
-
-  if (ext == ".gif") return Codec::kGIF;
-
-  if (ext == ".exr") return Codec::kEXR;
-
-  return Codec::kUnknown;
-}
-
-bool CanDecode(Codec codec) {
-  switch (codec) {
-    case Codec::kEXR:
-      return CanDecodeEXR();
-    case Codec::kGIF:
-      return CanDecodeGIF();
-    case Codec::kJPG:
-      return CanDecodeJPG();
-    case Codec::kPNG:
-      return CanDecodeAPNG();
-    case Codec::kPNM:
-    case Codec::kPGX:
-    case Codec::kJXL:
-      return true;
-    default:
-      return false;
-  }
-}
-
-std::string ListOfDecodeCodecs() {
-  std::string list_of_codecs("JXL, PPM, PNM, PFM, PAM, PGX");
-  if (CanDecode(Codec::kPNG)) list_of_codecs.append(", PNG, APNG");
-  if (CanDecode(Codec::kGIF)) list_of_codecs.append(", GIF");
-  if (CanDecode(Codec::kJPG)) list_of_codecs.append(", JPEG");
-  if (CanDecode(Codec::kEXR)) list_of_codecs.append(", EXR");
-  return list_of_codecs;
-}
-
-Status DecodeBytes(const Span<const uint8_t> bytes,
-                   const ColorHints& color_hints, extras::PackedPixelFile* ppf,
-                   const SizeConstraints* constraints, Codec* orig_codec) {
-  if (bytes.size() < kMinBytes) return JXL_FAILURE("Too few bytes");
-
-  *ppf = extras::PackedPixelFile();
-
-  // Default values when not set by decoders.
-  ppf->info.uses_original_profile = JXL_TRUE;
-  ppf->info.orientation = JXL_ORIENT_IDENTITY;
-
-  const auto choose_codec = [&]() -> Codec {
-    if (DecodeImageAPNG(bytes, color_hints, ppf, constraints)) {
-      return Codec::kPNG;
-    }
-    if (DecodeImagePGX(bytes, color_hints, ppf, constraints)) {
-      return Codec::kPGX;
-    }
-    if (DecodeImagePNM(bytes, color_hints, ppf, constraints)) {
-      return Codec::kPNM;
-    }
-    JXLDecompressParams dparams = {};
-    for (const uint32_t num_channels : {1, 2, 3, 4}) {
-      dparams.accepted_formats.push_back(
-          {num_channels, JXL_TYPE_FLOAT, JXL_LITTLE_ENDIAN, /*align=*/0});
-    }
-    dparams.output_bitdepth.type = JXL_BIT_DEPTH_FROM_CODESTREAM;
-    size_t decoded_bytes;
-    if (DecodeImageJXL(bytes.data(), bytes.size(), dparams, &decoded_bytes,
-                       ppf) &&
-        ApplyColorHints(color_hints, true, ppf->info.num_color_channels == 1,
-                        ppf)) {
-      return Codec::kJXL;
-    }
-    if (DecodeImageGIF(bytes, color_hints, ppf, constraints)) {
-      return Codec::kGIF;
-    }
-    if (DecodeImageJPG(bytes, color_hints, ppf, constraints)) {
-      return Codec::kJPG;
-    }
-    if (DecodeImageEXR(bytes, color_hints, ppf, constraints)) {
-      return Codec::kEXR;
-    }
-    return Codec::kUnknown;
-  };
-
-  Codec codec = choose_codec();
-  if (codec == Codec::kUnknown) {
-    return JXL_FAILURE("Codecs failed to decode");
-  }
-  if (orig_codec) *orig_codec = codec;
-
-  return true;
-}
-
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/dec/decode.h b/third_party/jpeg-xl/lib/extras/dec/decode.h
deleted file mode 100644
index bbffc7e0f0a33..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/decode.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_DEC_DECODE_H_
-#define LIB_EXTRAS_DEC_DECODE_H_
-
-// Facade for image decoders (PNG, PNM, ...).
-
-#include <cstddef>
-#include <cstdint>
-#include <string>
-
-#include "lib/extras/dec/color_hints.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-struct SizeConstraints;
-
-namespace extras {
-
-// Codecs supported by DecodeBytes.
-enum class Codec : uint32_t {
-  kUnknown,  // for CodecFromPath
-  kPNG,
-  kPNM,
-  kPGX,
-  kJPG,
-  kGIF,
-  kEXR,
-  kJXL
-};
-
-bool CanDecode(Codec codec);
-
-std::string ListOfDecodeCodecs();
-
-// If and only if extension is ".pfm", *bits_per_sample is updated to 32 so
-// that Encode() would encode to PFM instead of PPM.
-Codec CodecFromPath(const std::string& path,
-                    size_t* JXL_RESTRICT bits_per_sample = nullptr,
-                    std::string* extension = nullptr);
-
-// Decodes "bytes" info *ppf.
-// color_space_hint may specify the color space, otherwise, defaults to sRGB.
-Status DecodeBytes(Span<const uint8_t> bytes, const ColorHints& color_hints,
-                   extras::PackedPixelFile* ppf,
-                   const SizeConstraints* constraints = nullptr,
-                   Codec* orig_codec = nullptr);
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_DEC_DECODE_H_
diff --git a/third_party/jpeg-xl/lib/extras/dec/exr.cc b/third_party/jpeg-xl/lib/extras/dec/exr.cc
deleted file mode 100644
index 59edd63eb863f..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/exr.cc
+++ /dev/null
@@ -1,233 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/dec/exr.h"
-
-#include <cstdint>
-
-#include "lib/extras/dec/color_hints.h"
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-
-#if !JPEGXL_ENABLE_EXR
-
-namespace jxl {
-namespace extras {
-bool CanDecodeEXR() { return false; }
-
-Status DecodeImageEXR(Span<const uint8_t> bytes, const ColorHints& color_hints,
-                      PackedPixelFile* ppf,
-                      const SizeConstraints* constraints) {
-  (void)bytes;
-  (void)color_hints;
-  (void)ppf;
-  (void)constraints;
-  return JXL_FAILURE("EXR is not supported");
-}
-}  // namespace extras
-}  // namespace jxl
-
-#else  // JPEGXL_ENABLE_EXR
-
-#include <ImfChromaticitiesAttribute.h>
-#include <ImfIO.h>
-#include <ImfRgbaFile.h>
-#include <ImfStandardAttributes.h>
-
-#include <vector>
-
-#ifdef __EXCEPTIONS
-#include <stdexcept>
-#define JXL_EXR_THROW_LENGTH_ERROR() throw std::length_error("");
-#else  // __EXCEPTIONS
-#define JXL_EXR_THROW_LENGTH_ERROR() JXL_CRASH()
-#endif  // __EXCEPTIONS
-
-namespace jxl {
-namespace extras {
-
-namespace {
-
-namespace OpenEXR = OPENEXR_IMF_NAMESPACE;
-
-// OpenEXR::Int64 is deprecated in favor of using uint64_t directly, but using
-// uint64_t as recommended causes build failures with previous OpenEXR versions
-// on macOS, where the definition for OpenEXR::Int64 was actually not equivalent
-// to uint64_t. This alternative should work in all cases.
-using ExrInt64 = decltype(std::declval<OpenEXR::IStream>().tellg());
-
-constexpr int kExrBitsPerSample = 16;
-constexpr int kExrAlphaBits = 16;
-
-class InMemoryIStream : public OpenEXR::IStream {
- public:
-  // The data pointed to by `bytes` must outlive the InMemoryIStream.
-  explicit InMemoryIStream(const Span<const uint8_t> bytes)
-      : IStream(/*fileName=*/""), bytes_(bytes) {}
-
-  bool isMemoryMapped() const override { return true; }
-  char* readMemoryMapped(const int n) override {
-    if (pos_ + n < pos_ || pos_ + n > bytes_.size()) {
-      JXL_EXR_THROW_LENGTH_ERROR();
-    }
-    char* const result =
-        const_cast<char*>(reinterpret_cast<const char*>(bytes_.data() + pos_));
-    pos_ += n;
-    return result;
-  }
-  bool read(char c[], const int n) override {
-    std::copy_n(readMemoryMapped(n), n, c);
-    return pos_ < bytes_.size();
-  }
-
-  ExrInt64 tellg() override { return pos_; }
-  void seekg(const ExrInt64 pos) override {
-    if (pos >= bytes_.size()) {
-      JXL_EXR_THROW_LENGTH_ERROR();
-    }
-    pos_ = pos;
-  }
-
- private:
-  const Span<const uint8_t> bytes_;
-  size_t pos_ = 0;
-};
-
-}  // namespace
-
-bool CanDecodeEXR() { return true; }
-
-Status DecodeImageEXR(Span<const uint8_t> bytes, const ColorHints& color_hints,
-                      PackedPixelFile* ppf,
-                      const SizeConstraints* constraints) {
-  InMemoryIStream is(bytes);
-
-#ifdef __EXCEPTIONS
-  std::unique_ptr<OpenEXR::RgbaInputFile> input_ptr;
-  try {
-    input_ptr = jxl::make_unique<OpenEXR::RgbaInputFile>(is);
-  } catch (...) {
-    // silently return false if it is not an EXR file
-    return false;
-  }
-  OpenEXR::RgbaInputFile& input = *input_ptr;
-#else
-  OpenEXR::RgbaInputFile input(is);
-#endif
-
-  if ((input.channels() & OpenEXR::RgbaChannels::WRITE_RGB) !=
-      OpenEXR::RgbaChannels::WRITE_RGB) {
-    return JXL_FAILURE("only RGB OpenEXR files are supported");
-  }
-  const bool has_alpha = (input.channels() & OpenEXR::RgbaChannels::WRITE_A) ==
-                         OpenEXR::RgbaChannels::WRITE_A;
-
-  const float intensity_target = OpenEXR::hasWhiteLuminance(input.header())
-                                     ? OpenEXR::whiteLuminance(input.header())
-                                     : 0;
-
-  auto image_size = input.displayWindow().size();
-  // Size is computed as max - min, but both bounds are inclusive.
-  ++image_size.x;
-  ++image_size.y;
-
-  ppf->info.xsize = image_size.x;
-  ppf->info.ysize = image_size.y;
-  ppf->info.num_color_channels = 3;
-
-  const JxlDataType data_type =
-      kExrBitsPerSample == 16 ? JXL_TYPE_FLOAT16 : JXL_TYPE_FLOAT;
-  const JxlPixelFormat format{
-      /*num_channels=*/3u + (has_alpha ? 1u : 0u),
-      /*data_type=*/data_type,
-      /*endianness=*/JXL_NATIVE_ENDIAN,
-      /*align=*/0,
-  };
-  ppf->frames.clear();
-  // Allocates the frame buffer.
-  {
-    JXL_ASSIGN_OR_RETURN(
-        PackedFrame frame,
-        PackedFrame::Create(image_size.x, image_size.y, format));
-    ppf->frames.emplace_back(std::move(frame));
-  }
-  const auto& frame = ppf->frames.back();
-
-  const int row_size = input.dataWindow().size().x + 1;
-  // Number of rows to read at a time.
-  // https://www.openexr.com/documentation/ReadingAndWritingImageFiles.pdf
-  // recommends reading the whole file at once.
-  const int y_chunk_size = input.displayWindow().size().y + 1;
-  std::vector<OpenEXR::Rgba> input_rows(row_size * y_chunk_size);
-  for (int start_y =
-           std::max(input.dataWindow().min.y, input.displayWindow().min.y);
-       start_y <=
-       std::min(input.dataWindow().max.y, input.displayWindow().max.y);
-       start_y += y_chunk_size) {
-    // Inclusive.
-    const int end_y = std::min(
-        start_y + y_chunk_size - 1,
-        std::min(input.dataWindow().max.y, input.displayWindow().max.y));
-    input.setFrameBuffer(
-        input_rows.data() - input.dataWindow().min.x - start_y * row_size,
-        /*xStride=*/1, /*yStride=*/row_size);
-    input.readPixels(start_y, end_y);
-    for (int exr_y = start_y; exr_y <= end_y; ++exr_y) {
-      const int image_y = exr_y - input.displayWindow().min.y;
-      const OpenEXR::Rgba* const JXL_RESTRICT input_row =
-          &input_rows[(exr_y - start_y) * row_size];
-      uint8_t* row = static_cast<uint8_t*>(frame.color.pixels()) +
-                     frame.color.stride * image_y;
-      const uint32_t pixel_size =
-          (3 + (has_alpha ? 1 : 0)) * kExrBitsPerSample / 8;
-      for (int exr_x =
-               std::max(input.dataWindow().min.x, input.displayWindow().min.x);
-           exr_x <=
-           std::min(input.dataWindow().max.x, input.displayWindow().max.x);
-           ++exr_x) {
-        const int image_x = exr_x - input.displayWindow().min.x;
-        // TODO(eustas): UB: OpenEXR::Rgba is not TriviallyCopyable
-        memcpy(row + image_x * pixel_size,
-               input_row + (exr_x - input.dataWindow().min.x), pixel_size);
-      }
-    }
-  }
-
-  ppf->color_encoding.transfer_function = JXL_TRANSFER_FUNCTION_LINEAR;
-  ppf->color_encoding.color_space = JXL_COLOR_SPACE_RGB;
-  ppf->color_encoding.primaries = JXL_PRIMARIES_SRGB;
-  ppf->color_encoding.white_point = JXL_WHITE_POINT_D65;
-  if (OpenEXR::hasChromaticities(input.header())) {
-    ppf->color_encoding.primaries = JXL_PRIMARIES_CUSTOM;
-    ppf->color_encoding.white_point = JXL_WHITE_POINT_CUSTOM;
-    const auto& chromaticities = OpenEXR::chromaticities(input.header());
-    ppf->color_encoding.primaries_red_xy[0] = chromaticities.red.x;
-    ppf->color_encoding.primaries_red_xy[1] = chromaticities.red.y;
-    ppf->color_encoding.primaries_green_xy[0] = chromaticities.green.x;
-    ppf->color_encoding.primaries_green_xy[1] = chromaticities.green.y;
-    ppf->color_encoding.primaries_blue_xy[0] = chromaticities.blue.x;
-    ppf->color_encoding.primaries_blue_xy[1] = chromaticities.blue.y;
-    ppf->color_encoding.white_point_xy[0] = chromaticities.white.x;
-    ppf->color_encoding.white_point_xy[1] = chromaticities.white.y;
-  }
-
-  // EXR uses binary16 or binary32 floating point format.
-  ppf->info.bits_per_sample = kExrBitsPerSample;
-  ppf->info.exponent_bits_per_sample = kExrBitsPerSample == 16 ? 5 : 8;
-  if (has_alpha) {
-    ppf->info.alpha_bits = kExrAlphaBits;
-    ppf->info.alpha_exponent_bits = ppf->info.exponent_bits_per_sample;
-    ppf->info.alpha_premultiplied = JXL_TRUE;
-  }
-  ppf->info.intensity_target = intensity_target;
-  return true;
-}
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // JPEGXL_ENABLE_EXR
diff --git a/third_party/jpeg-xl/lib/extras/dec/exr.h b/third_party/jpeg-xl/lib/extras/dec/exr.h
deleted file mode 100644
index 65078d030ff97..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/exr.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_DEC_EXR_H_
-#define LIB_EXTRAS_DEC_EXR_H_
-
-// Decodes OpenEXR images in memory.
-
-#include <cstdint>
-
-#include "lib/extras/dec/color_hints.h"
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-struct SizeConstraints;
-
-namespace extras {
-
-bool CanDecodeEXR();
-
-// Decodes `bytes` into `ppf`. color_hints are ignored.
-Status DecodeImageEXR(Span<const uint8_t> bytes, const ColorHints& color_hints,
-                      PackedPixelFile* ppf,
-                      const SizeConstraints* constraints = nullptr);
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_DEC_EXR_H_
diff --git a/third_party/jpeg-xl/lib/extras/dec/gif.cc b/third_party/jpeg-xl/lib/extras/dec/gif.cc
deleted file mode 100644
index a87beb901acf7..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/gif.cc
+++ /dev/null
@@ -1,432 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/dec/gif.h"
-
-#include "lib/jxl/base/status.h"
-
-#if JPEGXL_ENABLE_GIF
-#include <gif_lib.h>
-#endif
-#include <jxl/codestream_header.h>
-
-#include <cstring>
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "lib/extras/size_constraints.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/sanitizers.h"
-
-namespace jxl {
-namespace extras {
-
-#if JPEGXL_ENABLE_GIF
-namespace {
-
-struct ReadState {
-  Span<const uint8_t> bytes;
-};
-
-struct DGifCloser {
-  void operator()(GifFileType* const ptr) const { DGifCloseFile(ptr, nullptr); }
-};
-using GifUniquePtr = std::unique_ptr<GifFileType, DGifCloser>;
-
-struct PackedRgba {
-  uint8_t r, g, b, a;
-};
-
-struct PackedRgb {
-  uint8_t r, g, b;
-};
-
-Status ensure_have_alpha(PackedFrame* frame) {
-  if (!frame->extra_channels.empty()) return true;
-  const JxlPixelFormat alpha_format{
-      /*num_channels=*/1u,
-      /*data_type=*/JXL_TYPE_UINT8,
-      /*endianness=*/JXL_NATIVE_ENDIAN,
-      /*align=*/0,
-  };
-  JXL_ASSIGN_OR_RETURN(PackedImage image,
-                       PackedImage::Create(frame->color.xsize,
-                                           frame->color.ysize, alpha_format));
-  frame->extra_channels.emplace_back(std::move(image));
-  // We need to set opaque-by-default.
-  std::fill_n(static_cast<uint8_t*>(frame->extra_channels[0].pixels()),
-              frame->color.xsize * frame->color.ysize, 255u);
-  return true;
-}
-}  // namespace
-#endif
-
-bool CanDecodeGIF() {
-#if JPEGXL_ENABLE_GIF
-  return true;
-#else
-  return false;
-#endif
-}
-
-Status DecodeImageGIF(Span<const uint8_t> bytes, const ColorHints& color_hints,
-                      PackedPixelFile* ppf,
-                      const SizeConstraints* constraints) {
-#if JPEGXL_ENABLE_GIF
-  int error = GIF_OK;
-  ReadState state = {bytes};
-  const auto ReadFromSpan = [](GifFileType* const gif, GifByteType* const bytes,
-                               int n) {
-    ReadState* const state = reinterpret_cast<ReadState*>(gif->UserData);
-    // giflib API requires the input size `n` to be signed int.
-    if (static_cast<size_t>(n) > state->bytes.size()) {
-      n = state->bytes.size();
-    }
-    memcpy(bytes, state->bytes.data(), n);
-    if (!state->bytes.remove_prefix(n)) return 0;
-    return n;
-  };
-  GifUniquePtr gif(DGifOpen(&state, ReadFromSpan, &error));
-  if (gif == nullptr) {
-    if (error == D_GIF_ERR_NOT_GIF_FILE) {
-      // Not an error.
-      return false;
-    } else {
-      return JXL_FAILURE("Failed to read GIF: %s", GifErrorString(error));
-    }
-  }
-  error = DGifSlurp(gif.get());
-  if (error != GIF_OK) {
-    return JXL_FAILURE("Failed to read GIF: %s", GifErrorString(gif->Error));
-  }
-
-  msan::UnpoisonMemory(gif.get(), sizeof(*gif));
-  if (gif->SColorMap) {
-    msan::UnpoisonMemory(gif->SColorMap, sizeof(*gif->SColorMap));
-    msan::UnpoisonMemory(
-        gif->SColorMap->Colors,
-        sizeof(*gif->SColorMap->Colors) * gif->SColorMap->ColorCount);
-  }
-  msan::UnpoisonMemory(gif->SavedImages,
-                       sizeof(*gif->SavedImages) * gif->ImageCount);
-
-  JXL_RETURN_IF_ERROR(
-      VerifyDimensions<uint32_t>(constraints, gif->SWidth, gif->SHeight));
-  uint64_t total_pixel_count =
-      static_cast<uint64_t>(gif->SWidth) * gif->SHeight;
-  for (int i = 0; i < gif->ImageCount; ++i) {
-    const SavedImage& image = gif->SavedImages[i];
-    uint32_t w = image.ImageDesc.Width;
-    uint32_t h = image.ImageDesc.Height;
-    JXL_RETURN_IF_ERROR(VerifyDimensions<uint32_t>(constraints, w, h));
-    uint64_t pixel_count = static_cast<uint64_t>(w) * h;
-    if (total_pixel_count + pixel_count < total_pixel_count) {
-      return JXL_FAILURE("Image too big");
-    }
-    total_pixel_count += pixel_count;
-    if (constraints && (total_pixel_count > constraints->dec_max_pixels)) {
-      return JXL_FAILURE("Image too big");
-    }
-  }
-
-  if (!gif->SColorMap) {
-    for (int i = 0; i < gif->ImageCount; ++i) {
-      if (!gif->SavedImages[i].ImageDesc.ColorMap) {
-        return JXL_FAILURE("Missing GIF color map");
-      }
-    }
-  }
-
-  if (gif->ImageCount > 1) {
-    ppf->info.have_animation = JXL_TRUE;
-    // Delays in GIF are specified in censiseconds.
-    ppf->info.animation.tps_numerator = 100;
-    ppf->info.animation.tps_denominator = 1;
-  }
-
-  ppf->frames.clear();
-  ppf->frames.reserve(gif->ImageCount);
-
-  ppf->info.xsize = gif->SWidth;
-  ppf->info.ysize = gif->SHeight;
-  ppf->info.bits_per_sample = 8;
-  ppf->info.exponent_bits_per_sample = 0;
-  // alpha_bits is later set to 8 if we find a frame with transparent pixels.
-  ppf->info.alpha_bits = 0;
-  ppf->info.alpha_exponent_bits = 0;
-  JXL_RETURN_IF_ERROR(ApplyColorHints(color_hints, /*color_already_set=*/false,
-                                      /*is_gray=*/false, ppf));
-
-  ppf->info.num_color_channels = 3;
-
-  // Pixel format for the 'canvas' onto which we paint
-  // the (potentially individually cropped) GIF frames
-  // of an animation.
-  const JxlPixelFormat canvas_format{
-      /*num_channels=*/4u,
-      /*data_type=*/JXL_TYPE_UINT8,
-      /*endianness=*/JXL_NATIVE_ENDIAN,
-      /*align=*/0,
-  };
-
-  // Pixel format for the JXL PackedFrame that goes into the
-  // PackedPixelFile. Here, we use 3 color channels, and provide
-  // the alpha channel as an extra_channel wherever it is used.
-  const JxlPixelFormat packed_frame_format{
-      /*num_channels=*/3u,
-      /*data_type=*/JXL_TYPE_UINT8,
-      /*endianness=*/JXL_NATIVE_ENDIAN,
-      /*align=*/0,
-  };
-
-  GifColorType background_color;
-  if (gif->SColorMap == nullptr ||
-      gif->SBackGroundColor >= gif->SColorMap->ColorCount) {
-    background_color = {0, 0, 0};
-  } else {
-    background_color = gif->SColorMap->Colors[gif->SBackGroundColor];
-  }
-  const PackedRgba background_rgba{background_color.Red, background_color.Green,
-                                   background_color.Blue, 0};
-  JXL_ASSIGN_OR_RETURN(
-      PackedFrame canvas,
-      PackedFrame::Create(gif->SWidth, gif->SHeight, canvas_format));
-  std::fill_n(static_cast<PackedRgba*>(canvas.color.pixels()),
-              canvas.color.xsize * canvas.color.ysize, background_rgba);
-  Rect canvas_rect{0, 0, canvas.color.xsize, canvas.color.ysize};
-
-  Rect previous_rect_if_restore_to_background;
-
-  bool replace = true;
-  bool last_base_was_none = true;
-  for (int i = 0; i < gif->ImageCount; ++i) {
-    const SavedImage& image = gif->SavedImages[i];
-    msan::UnpoisonMemory(image.RasterBits, sizeof(*image.RasterBits) *
-                                               image.ImageDesc.Width *
-                                               image.ImageDesc.Height);
-    const Rect image_rect(image.ImageDesc.Left, image.ImageDesc.Top,
-                          image.ImageDesc.Width, image.ImageDesc.Height);
-
-    Rect total_rect;
-    if (previous_rect_if_restore_to_background.xsize() != 0 ||
-        previous_rect_if_restore_to_background.ysize() != 0) {
-      const size_t xbegin = std::min(
-          image_rect.x0(), previous_rect_if_restore_to_background.x0());
-      const size_t ybegin = std::min(
-          image_rect.y0(), previous_rect_if_restore_to_background.y0());
-      const size_t xend =
-          std::max(image_rect.x0() + image_rect.xsize(),
-                   previous_rect_if_restore_to_background.x0() +
-                       previous_rect_if_restore_to_background.xsize());
-      const size_t yend =
-          std::max(image_rect.y0() + image_rect.ysize(),
-                   previous_rect_if_restore_to_background.y0() +
-                       previous_rect_if_restore_to_background.ysize());
-      total_rect = Rect(xbegin, ybegin, xend - xbegin, yend - ybegin);
-      previous_rect_if_restore_to_background = Rect();
-      replace = true;
-    } else {
-      total_rect = image_rect;
-      replace = false;
-    }
-    if (!image_rect.IsInside(canvas_rect)) {
-      return JXL_FAILURE("GIF frame extends outside of the canvas");
-    }
-
-    // Allocates the frame buffer.
-    {
-      JXL_ASSIGN_OR_RETURN(
-          PackedFrame frame,
-          PackedFrame::Create(total_rect.xsize(), total_rect.ysize(),
-                              packed_frame_format));
-      ppf->frames.emplace_back(std::move(frame));
-    }
-
-    PackedFrame* frame = &ppf->frames.back();
-
-    // We cannot tell right from the start whether there will be a
-    // need for an alpha channel. This is discovered only as soon as
-    // we see a transparent pixel. We hence initialize alpha lazily.
-    auto set_pixel_alpha = [&frame](size_t x, size_t y, uint8_t a) -> Status {
-      // If we do not have an alpha-channel and a==255 (fully opaque),
-      // we can skip setting this pixel-value and rely on
-      // "no alpha channel = no transparency".
-      if (a == 255 && !frame->extra_channels.empty()) return true;
-      JXL_RETURN_IF_ERROR(ensure_have_alpha(frame));
-      static_cast<uint8_t*>(
-          frame->extra_channels[0].pixels())[y * frame->color.xsize + x] = a;
-      return true;
-    };
-
-    const ColorMapObject* const color_map =
-        image.ImageDesc.ColorMap ? image.ImageDesc.ColorMap : gif->SColorMap;
-    JXL_ENSURE(color_map);
-    msan::UnpoisonMemory(color_map, sizeof(*color_map));
-    msan::UnpoisonMemory(color_map->Colors,
-                         sizeof(*color_map->Colors) * color_map->ColorCount);
-    GraphicsControlBlock gcb;
-    DGifSavedExtensionToGCB(gif.get(), i, &gcb);
-    msan::UnpoisonMemory(&gcb, sizeof(gcb));
-    bool is_full_size = total_rect.x0() == 0 && total_rect.y0() == 0 &&
-                        total_rect.xsize() == canvas.color.xsize &&
-                        total_rect.ysize() == canvas.color.ysize;
-    if (ppf->info.have_animation) {
-      frame->frame_info.duration = gcb.DelayTime;
-      frame->frame_info.layer_info.have_crop = static_cast<int>(!is_full_size);
-      frame->frame_info.layer_info.crop_x0 = total_rect.x0();
-      frame->frame_info.layer_info.crop_y0 = total_rect.y0();
-      frame->frame_info.layer_info.xsize = frame->color.xsize;
-      frame->frame_info.layer_info.ysize = frame->color.ysize;
-      if (last_base_was_none) {
-        replace = true;
-      }
-      frame->frame_info.layer_info.blend_info.blendmode =
-          replace ? JXL_BLEND_REPLACE : JXL_BLEND_BLEND;
-      // We always only reference at most the last frame
-      frame->frame_info.layer_info.blend_info.source =
-          last_base_was_none ? 0u : 1u;
-      frame->frame_info.layer_info.blend_info.clamp = 1;
-      frame->frame_info.layer_info.blend_info.alpha = 0;
-      // TODO(veluca): this could in principle be implemented.
-      if (last_base_was_none &&
-          (total_rect.x0() != 0 || total_rect.y0() != 0 ||
-           total_rect.xsize() != canvas.color.xsize ||
-           total_rect.ysize() != canvas.color.ysize || !replace)) {
-        return JXL_FAILURE(
-            "GIF with dispose-to-0 is not supported for non-full or "
-            "blended frames");
-      }
-      switch (gcb.DisposalMode) {
-        case DISPOSE_DO_NOT:
-        case DISPOSE_BACKGROUND:
-          frame->frame_info.layer_info.save_as_reference = 1u;
-          last_base_was_none = false;
-          break;
-        case DISPOSE_PREVIOUS:
-          frame->frame_info.layer_info.save_as_reference = 0u;
-          break;
-        default:
-          frame->frame_info.layer_info.save_as_reference = 0u;
-          last_base_was_none = true;
-      }
-    }
-
-    // Update the canvas by creating a copy first.
-    JXL_ASSIGN_OR_RETURN(
-        PackedImage new_canvas_image,
-        PackedImage::Create(canvas.color.xsize, canvas.color.ysize,
-                            canvas.color.format));
-    memcpy(new_canvas_image.pixels(), canvas.color.pixels(),
-           new_canvas_image.pixels_size);
-    for (size_t y = 0, byte_index = 0; y < image_rect.ysize(); ++y) {
-      // Assumes format.align == 0. row points to the beginning of the y row in
-      // the image_rect.
-      PackedRgba* row = static_cast<PackedRgba*>(new_canvas_image.pixels()) +
-                        (y + image_rect.y0()) * new_canvas_image.xsize +
-                        image_rect.x0();
-      for (size_t x = 0; x < image_rect.xsize(); ++x, ++byte_index) {
-        const GifByteType byte = image.RasterBits[byte_index];
-        if (byte >= color_map->ColorCount) {
-          return JXL_FAILURE("GIF color is out of bounds");
-        }
-
-        if (byte == gcb.TransparentColor) continue;
-        GifColorType color = color_map->Colors[byte];
-        row[x].r = color.Red;
-        row[x].g = color.Green;
-        row[x].b = color.Blue;
-        row[x].a = 255;
-      }
-    }
-    const PackedImage& sub_frame_image = frame->color;
-    if (replace) {
-      // Copy from the new canvas image to the subframe
-      for (size_t y = 0; y < total_rect.ysize(); ++y) {
-        const PackedRgba* row_in =
-            static_cast<const PackedRgba*>(new_canvas_image.pixels()) +
-            (y + total_rect.y0()) * new_canvas_image.xsize + total_rect.x0();
-        PackedRgb* row_out = static_cast<PackedRgb*>(sub_frame_image.pixels()) +
-                             y * sub_frame_image.xsize;
-        for (size_t x = 0; x < sub_frame_image.xsize; ++x) {
-          row_out[x].r = row_in[x].r;
-          row_out[x].g = row_in[x].g;
-          row_out[x].b = row_in[x].b;
-          JXL_RETURN_IF_ERROR(set_pixel_alpha(x, y, row_in[x].a));
-        }
-      }
-    } else {
-      for (size_t y = 0, byte_index = 0; y < image_rect.ysize(); ++y) {
-        // Assumes format.align == 0
-        PackedRgb* row = static_cast<PackedRgb*>(sub_frame_image.pixels()) +
-                         y * sub_frame_image.xsize;
-        for (size_t x = 0; x < image_rect.xsize(); ++x, ++byte_index) {
-          const GifByteType byte = image.RasterBits[byte_index];
-          if (byte > color_map->ColorCount) {
-            return JXL_FAILURE("GIF color is out of bounds");
-          }
-          if (byte == gcb.TransparentColor) {
-            row[x].r = 0;
-            row[x].g = 0;
-            row[x].b = 0;
-            JXL_RETURN_IF_ERROR(set_pixel_alpha(x, y, 0));
-            continue;
-          }
-          GifColorType color = color_map->Colors[byte];
-          row[x].r = color.Red;
-          row[x].g = color.Green;
-          row[x].b = color.Blue;
-          JXL_RETURN_IF_ERROR(set_pixel_alpha(x, y, 255));
-        }
-      }
-    }
-
-    if (!frame->extra_channels.empty()) {
-      ppf->info.alpha_bits = 8;
-    }
-
-    switch (gcb.DisposalMode) {
-      case DISPOSE_DO_NOT:
-        canvas.color = std::move(new_canvas_image);
-        break;
-
-      case DISPOSE_BACKGROUND:
-        std::fill_n(static_cast<PackedRgba*>(canvas.color.pixels()),
-                    canvas.color.xsize * canvas.color.ysize, background_rgba);
-        previous_rect_if_restore_to_background = image_rect;
-        break;
-
-      case DISPOSE_PREVIOUS:
-        break;
-
-      case DISPOSAL_UNSPECIFIED:
-      default:
-        std::fill_n(static_cast<PackedRgba*>(canvas.color.pixels()),
-                    canvas.color.xsize * canvas.color.ysize, background_rgba);
-    }
-  }
-  // Finally, if any frame has an alpha-channel, every frame will need
-  // to have an alpha-channel.
-  bool seen_alpha = false;
-  for (const PackedFrame& frame : ppf->frames) {
-    if (!frame.extra_channels.empty()) {
-      seen_alpha = true;
-      break;
-    }
-  }
-  if (seen_alpha) {
-    for (PackedFrame& frame : ppf->frames) {
-      JXL_RETURN_IF_ERROR(ensure_have_alpha(&frame));
-    }
-  }
-  return true;
-#else
-  return false;
-#endif
-}
-
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/dec/gif.h b/third_party/jpeg-xl/lib/extras/dec/gif.h
deleted file mode 100644
index 4d5be8664e720..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/gif.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_DEC_GIF_H_
-#define LIB_EXTRAS_DEC_GIF_H_
-
-// Decodes GIF images in memory.
-
-#include <stdint.h>
-
-#include "lib/extras/dec/color_hints.h"
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-struct SizeConstraints;
-
-namespace extras {
-
-bool CanDecodeGIF();
-
-// Decodes `bytes` into `ppf`. color_hints are ignored.
-Status DecodeImageGIF(Span<const uint8_t> bytes, const ColorHints& color_hints,
-                      PackedPixelFile* ppf,
-                      const SizeConstraints* constraints = nullptr);
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_DEC_GIF_H_
diff --git a/third_party/jpeg-xl/lib/extras/dec/jpegli.cc b/third_party/jpeg-xl/lib/extras/dec/jpegli.cc
deleted file mode 100644
index c307105139173..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/jpegli.cc
+++ /dev/null
@@ -1,286 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/dec/jpegli.h"
-
-#include <setjmp.h>
-
-#include <algorithm>
-#include <cstdint>
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "lib/jpegli/decode.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/sanitizers.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-namespace extras {
-
-namespace {
-
-constexpr unsigned char kExifSignature[6] = {0x45, 0x78, 0x69,
-                                             0x66, 0x00, 0x00};
-constexpr int kExifMarker = JPEG_APP0 + 1;
-constexpr int kICCMarker = JPEG_APP0 + 2;
-
-inline bool IsJPG(const std::vector<uint8_t>& bytes) {
-  if (bytes.size() < 2) return false;
-  if (bytes[0] != 0xFF || bytes[1] != 0xD8) return false;
-  return true;
-}
-
-bool MarkerIsExif(const jpeg_saved_marker_ptr marker) {
-  return marker->marker == kExifMarker &&
-         marker->data_length >= sizeof kExifSignature + 2 &&
-         std::equal(std::begin(kExifSignature), std::end(kExifSignature),
-                    marker->data);
-}
-
-Status ReadICCProfile(jpeg_decompress_struct* const cinfo,
-                      std::vector<uint8_t>* const icc) {
-  uint8_t* icc_data_ptr;
-  unsigned int icc_data_len;
-  if (jpegli_read_icc_profile(cinfo, &icc_data_ptr, &icc_data_len)) {
-    icc->assign(icc_data_ptr, icc_data_ptr + icc_data_len);
-    free(icc_data_ptr);
-    return true;
-  }
-  return false;
-}
-
-void ReadExif(jpeg_decompress_struct* const cinfo,
-              std::vector<uint8_t>* const exif) {
-  constexpr size_t kExifSignatureSize = sizeof kExifSignature;
-  for (jpeg_saved_marker_ptr marker = cinfo->marker_list; marker != nullptr;
-       marker = marker->next) {
-    // marker is initialized by libjpeg, which we are not instrumenting with
-    // msan.
-    msan::UnpoisonMemory(marker, sizeof(*marker));
-    msan::UnpoisonMemory(marker->data, marker->data_length);
-    if (!MarkerIsExif(marker)) continue;
-    size_t marker_length = marker->data_length - kExifSignatureSize;
-    exif->resize(marker_length);
-    std::copy_n(marker->data + kExifSignatureSize, marker_length, exif->data());
-    return;
-  }
-}
-
-JpegliDataType ConvertDataType(JxlDataType type) {
-  switch (type) {
-    case JXL_TYPE_UINT8:
-      return JPEGLI_TYPE_UINT8;
-    case JXL_TYPE_UINT16:
-      return JPEGLI_TYPE_UINT16;
-    case JXL_TYPE_FLOAT:
-      return JPEGLI_TYPE_FLOAT;
-    default:
-      return JPEGLI_TYPE_UINT8;
-  }
-}
-
-JpegliEndianness ConvertEndianness(JxlEndianness type) {
-  switch (type) {
-    case JXL_NATIVE_ENDIAN:
-      return JPEGLI_NATIVE_ENDIAN;
-    case JXL_BIG_ENDIAN:
-      return JPEGLI_BIG_ENDIAN;
-    case JXL_LITTLE_ENDIAN:
-      return JPEGLI_LITTLE_ENDIAN;
-    default:
-      return JPEGLI_NATIVE_ENDIAN;
-  }
-}
-
-JxlColorSpace ConvertColorSpace(J_COLOR_SPACE colorspace) {
-  switch (colorspace) {
-    case JCS_GRAYSCALE:
-      return JXL_COLOR_SPACE_GRAY;
-    case JCS_RGB:
-      return JXL_COLOR_SPACE_RGB;
-    default:
-      return JXL_COLOR_SPACE_UNKNOWN;
-  }
-}
-
-void MyErrorExit(j_common_ptr cinfo) {
-  jmp_buf* env = static_cast<jmp_buf*>(cinfo->client_data);
-  (*cinfo->err->output_message)(cinfo);
-  jpegli_destroy_decompress(reinterpret_cast<j_decompress_ptr>(cinfo));
-  longjmp(*env, 1);
-}
-
-void MyOutputMessage(j_common_ptr cinfo) {
-  if (JXL_IS_DEBUG_BUILD) {
-    char buf[JMSG_LENGTH_MAX + 1];
-    (*cinfo->err->format_message)(cinfo, buf);
-    buf[JMSG_LENGTH_MAX] = 0;
-    JXL_WARNING("%s", buf);
-  }
-}
-
-Status UnmapColors(uint8_t* row, size_t xsize, int components,
-                   JSAMPARRAY colormap, size_t num_colors) {
-  JXL_ENSURE(colormap != nullptr);
-  std::vector<uint8_t> tmp(xsize * components);
-  for (size_t x = 0; x < xsize; ++x) {
-    JXL_ENSURE(row[x] < num_colors);
-    for (int c = 0; c < components; ++c) {
-      tmp[x * components + c] = colormap[c][row[x]];
-    }
-  }
-  memcpy(row, tmp.data(), tmp.size());
-  return true;
-}
-
-}  // namespace
-
-Status DecodeJpeg(const std::vector<uint8_t>& compressed,
-                  const JpegDecompressParams& dparams, ThreadPool* pool,
-                  PackedPixelFile* ppf) {
-  // Don't do anything for non-JPEG files (no need to report an error)
-  if (!IsJPG(compressed)) return false;
-
-  // TODO(veluca): use JPEGData also for pixels?
-
-  // We need to declare all the non-trivial destructor local variables before
-  // the call to setjmp().
-  std::unique_ptr<JSAMPLE[]> row;
-
-  jpeg_decompress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    // Setup error handling in jpeg library so we can deal with broken jpegs in
-    // the fuzzer.
-    jpeg_error_mgr jerr;
-    jmp_buf env;
-    cinfo.err = jpegli_std_error(&jerr);
-    jerr.error_exit = &MyErrorExit;
-    jerr.output_message = &MyOutputMessage;
-    if (setjmp(env)) {
-      return false;
-    }
-    cinfo.client_data = static_cast<void*>(&env);
-
-    jpegli_create_decompress(&cinfo);
-    jpegli_mem_src(&cinfo,
-                   reinterpret_cast<const unsigned char*>(compressed.data()),
-                   compressed.size());
-    jpegli_save_markers(&cinfo, kICCMarker, 0xFFFF);
-    jpegli_save_markers(&cinfo, kExifMarker, 0xFFFF);
-    const auto failure = [&cinfo](const char* str) -> Status {
-      jpegli_abort_decompress(&cinfo);
-      jpegli_destroy_decompress(&cinfo);
-      return JXL_FAILURE("%s", str);
-    };
-    jpegli_read_header(&cinfo, TRUE);
-    // Might cause CPU-zip bomb.
-    if (cinfo.arith_code) {
-      return failure("arithmetic code JPEGs are not supported");
-    }
-    int nbcomp = cinfo.num_components;
-    if (nbcomp != 1 && nbcomp != 3) {
-      std::string msg =
-          "unsupported number of components in JPEG: " + std::to_string(nbcomp);
-      return failure(msg.c_str());
-    }
-    if (dparams.force_rgb) {
-      cinfo.out_color_space = JCS_RGB;
-    } else if (dparams.force_grayscale) {
-      cinfo.out_color_space = JCS_GRAYSCALE;
-    }
-    if (ReadICCProfile(&cinfo, &ppf->icc)) {
-      ppf->primary_color_representation = PackedPixelFile::kIccIsPrimary;
-    } else {
-      ppf->primary_color_representation =
-          PackedPixelFile::kColorEncodingIsPrimary;
-      ppf->icc.clear();
-      // Default to SRGB
-      ppf->color_encoding.color_space =
-          ConvertColorSpace(cinfo.out_color_space);
-      ppf->color_encoding.white_point = JXL_WHITE_POINT_D65;
-      ppf->color_encoding.primaries = JXL_PRIMARIES_SRGB;
-      ppf->color_encoding.transfer_function = JXL_TRANSFER_FUNCTION_SRGB;
-      ppf->color_encoding.rendering_intent = JXL_RENDERING_INTENT_PERCEPTUAL;
-    }
-    ReadExif(&cinfo, &ppf->metadata.exif);
-
-    ppf->info.xsize = cinfo.image_width;
-    ppf->info.ysize = cinfo.image_height;
-    if (dparams.output_data_type == JXL_TYPE_UINT8) {
-      ppf->info.bits_per_sample = 8;
-      ppf->info.exponent_bits_per_sample = 0;
-    } else if (dparams.output_data_type == JXL_TYPE_UINT16) {
-      ppf->info.bits_per_sample = 16;
-      ppf->info.exponent_bits_per_sample = 0;
-    } else if (dparams.output_data_type == JXL_TYPE_FLOAT) {
-      ppf->info.bits_per_sample = 32;
-      ppf->info.exponent_bits_per_sample = 8;
-    } else {
-      return failure("unsupported data type");
-    }
-    ppf->info.uses_original_profile = JXL_TRUE;
-
-    // No alpha in JPG
-    ppf->info.alpha_bits = 0;
-    ppf->info.alpha_exponent_bits = 0;
-    ppf->info.orientation = JXL_ORIENT_IDENTITY;
-
-    jpegli_set_output_format(&cinfo, ConvertDataType(dparams.output_data_type),
-                             ConvertEndianness(dparams.output_endianness));
-
-    if (dparams.num_colors > 0) {
-      cinfo.quantize_colors = TRUE;
-      cinfo.desired_number_of_colors = dparams.num_colors;
-      cinfo.two_pass_quantize = static_cast<boolean>(dparams.two_pass_quant);
-      cinfo.dither_mode = static_cast<J_DITHER_MODE>(dparams.dither_mode);
-    }
-
-    jpegli_start_decompress(&cinfo);
-
-    ppf->info.num_color_channels = cinfo.out_color_components;
-    const JxlPixelFormat format{
-        /*num_channels=*/static_cast<uint32_t>(cinfo.out_color_components),
-        dparams.output_data_type,
-        dparams.output_endianness,
-        /*align=*/0,
-    };
-    ppf->frames.clear();
-    // Allocates the frame buffer.
-    {
-      JXL_ASSIGN_OR_RETURN(
-          PackedFrame frame,
-          PackedFrame::Create(cinfo.image_width, cinfo.image_height, format));
-      ppf->frames.emplace_back(std::move(frame));
-    }
-    const auto& frame = ppf->frames.back();
-    JXL_ENSURE(sizeof(JSAMPLE) * cinfo.out_color_components *
-                   cinfo.image_width <=
-               frame.color.stride);
-    if (dparams.num_colors > 0) JXL_ENSURE(cinfo.colormap != nullptr);
-
-    for (size_t y = 0; y < cinfo.image_height; ++y) {
-      JSAMPROW rows[] = {reinterpret_cast<JSAMPLE*>(
-          static_cast<uint8_t*>(frame.color.pixels()) +
-          frame.color.stride * y)};
-      jpegli_read_scanlines(&cinfo, rows, 1);
-      if (dparams.num_colors > 0) {
-        JXL_RETURN_IF_ERROR(
-            UnmapColors(rows[0], cinfo.output_width, cinfo.out_color_components,
-                        cinfo.colormap, cinfo.actual_number_of_colors));
-      }
-    }
-
-    jpegli_finish_decompress(&cinfo);
-    return true;
-  };
-  bool success = try_catch_block();
-  jpegli_destroy_decompress(&cinfo);
-  return success;
-}
-
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/dec/jpegli.h b/third_party/jpeg-xl/lib/extras/dec/jpegli.h
deleted file mode 100644
index 574df54c8e453..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/jpegli.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_DEC_JPEGLI_H_
-#define LIB_EXTRAS_DEC_JPEGLI_H_
-
-// Decodes JPG pixels and metadata in memory using the libjpegli library.
-
-#include <jxl/types.h>
-#include <stdint.h>
-
-#include <vector>
-
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-namespace extras {
-
-struct JpegDecompressParams {
-  JxlDataType output_data_type = JXL_TYPE_UINT8;
-  JxlEndianness output_endianness = JXL_NATIVE_ENDIAN;
-  bool force_rgb = false;
-  bool force_grayscale = false;
-  int num_colors = 0;
-  bool two_pass_quant = true;
-  // 0 = none, 1 = ordered, 2 = Floyd-Steinberg
-  int dither_mode = 2;
-};
-
-Status DecodeJpeg(const std::vector<uint8_t>& compressed,
-                  const JpegDecompressParams& dparams, ThreadPool* pool,
-                  PackedPixelFile* ppf);
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_DEC_JPEGLI_H_
diff --git a/third_party/jpeg-xl/lib/extras/dec/jpg.cc b/third_party/jpeg-xl/lib/extras/dec/jpg.cc
deleted file mode 100644
index 35f7b51e0c68a..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/jpg.cc
+++ /dev/null
@@ -1,353 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/dec/jpg.h"
-
-#if JPEGXL_ENABLE_JPEG
-#include "lib/jxl/base/include_jpeglib.h"  // NOLINT
-#endif
-
-#include <algorithm>
-#include <cstdint>
-#include <numeric>
-#include <utility>
-#include <vector>
-
-#include "lib/extras/size_constraints.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/sanitizers.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-namespace extras {
-
-#if JPEGXL_ENABLE_JPEG
-namespace {
-
-constexpr unsigned char kICCSignature[12] = {
-    0x49, 0x43, 0x43, 0x5F, 0x50, 0x52, 0x4F, 0x46, 0x49, 0x4C, 0x45, 0x00};
-constexpr int kICCMarker = JPEG_APP0 + 2;
-
-constexpr unsigned char kExifSignature[6] = {0x45, 0x78, 0x69,
-                                             0x66, 0x00, 0x00};
-constexpr int kExifMarker = JPEG_APP0 + 1;
-
-inline bool IsJPG(const Span<const uint8_t> bytes) {
-  if (bytes.size() < 2) return false;
-  if (bytes[0] != 0xFF || bytes[1] != 0xD8) return false;
-  return true;
-}
-
-bool MarkerIsICC(const jpeg_saved_marker_ptr marker) {
-  return marker->marker == kICCMarker &&
-         marker->data_length >= sizeof kICCSignature + 2 &&
-         std::equal(std::begin(kICCSignature), std::end(kICCSignature),
-                    marker->data);
-}
-bool MarkerIsExif(const jpeg_saved_marker_ptr marker) {
-  return marker->marker == kExifMarker &&
-         marker->data_length >= sizeof kExifSignature + 2 &&
-         std::equal(std::begin(kExifSignature), std::end(kExifSignature),
-                    marker->data);
-}
-
-Status ReadICCProfile(jpeg_decompress_struct* const cinfo,
-                      std::vector<uint8_t>* const icc) {
-  constexpr size_t kICCSignatureSize = sizeof kICCSignature;
-  // ICC signature + uint8_t index + uint8_t max_index.
-  constexpr size_t kICCHeadSize = kICCSignatureSize + 2;
-  // Markers are 1-indexed, and we keep them that way in this vector to get a
-  // convenient 0 at the front for when we compute the offsets later.
-  std::vector<size_t> marker_lengths;
-  int num_markers = 0;
-  int seen_markers_count = 0;
-  bool has_num_markers = false;
-  for (jpeg_saved_marker_ptr marker = cinfo->marker_list; marker != nullptr;
-       marker = marker->next) {
-    // marker is initialized by libjpeg, which we are not instrumenting with
-    // msan.
-    msan::UnpoisonMemory(marker, sizeof(*marker));
-    msan::UnpoisonMemory(marker->data, marker->data_length);
-    if (!MarkerIsICC(marker)) continue;
-
-    const int current_marker = marker->data[kICCSignatureSize];
-    if (current_marker == 0) {
-      return JXL_FAILURE("inconsistent JPEG ICC marker numbering");
-    }
-    const int current_num_markers = marker->data[kICCSignatureSize + 1];
-    if (current_marker > current_num_markers) {
-      return JXL_FAILURE("inconsistent JPEG ICC marker numbering");
-    }
-    if (has_num_markers) {
-      if (current_num_markers != num_markers) {
-        return JXL_FAILURE("inconsistent numbers of JPEG ICC markers");
-      }
-    } else {
-      num_markers = current_num_markers;
-      has_num_markers = true;
-      marker_lengths.resize(num_markers + 1);
-    }
-
-    size_t marker_length = marker->data_length - kICCHeadSize;
-
-    if (marker_length == 0) {
-      // NB: if we allow empty chunks, then the next check is incorrect.
-      return JXL_FAILURE("Empty ICC chunk");
-    }
-
-    if (marker_lengths[current_marker] != 0) {
-      return JXL_FAILURE("duplicate JPEG ICC marker number");
-    }
-    marker_lengths[current_marker] = marker_length;
-    seen_markers_count++;
-  }
-
-  if (marker_lengths.empty()) {
-    // Not an error.
-    return false;
-  }
-
-  if (seen_markers_count != num_markers) {
-    JXL_ENSURE(has_num_markers);
-    return JXL_FAILURE("Incomplete set of ICC chunks");
-  }
-
-  std::vector<size_t> offsets = std::move(marker_lengths);
-  std::partial_sum(offsets.begin(), offsets.end(), offsets.begin());
-  icc->resize(offsets.back());
-
-  for (jpeg_saved_marker_ptr marker = cinfo->marker_list; marker != nullptr;
-       marker = marker->next) {
-    if (!MarkerIsICC(marker)) continue;
-    const uint8_t* first = marker->data + kICCHeadSize;
-    uint8_t current_marker = marker->data[kICCSignatureSize];
-    size_t offset = offsets[current_marker - 1];
-    size_t marker_length = offsets[current_marker] - offset;
-    std::copy_n(first, marker_length, icc->data() + offset);
-  }
-
-  return true;
-}
-
-void ReadExif(jpeg_decompress_struct* const cinfo,
-              std::vector<uint8_t>* const exif) {
-  constexpr size_t kExifSignatureSize = sizeof kExifSignature;
-  for (jpeg_saved_marker_ptr marker = cinfo->marker_list; marker != nullptr;
-       marker = marker->next) {
-    // marker is initialized by libjpeg, which we are not instrumenting with
-    // msan.
-    msan::UnpoisonMemory(marker, sizeof(*marker));
-    msan::UnpoisonMemory(marker->data, marker->data_length);
-    if (!MarkerIsExif(marker)) continue;
-    size_t marker_length = marker->data_length - kExifSignatureSize;
-    exif->resize(marker_length);
-    std::copy_n(marker->data + kExifSignatureSize, marker_length, exif->data());
-    return;
-  }
-}
-
-void MyErrorExit(j_common_ptr cinfo) {
-  jmp_buf* env = static_cast<jmp_buf*>(cinfo->client_data);
-  (*cinfo->err->output_message)(cinfo);
-  jpeg_destroy_decompress(reinterpret_cast<j_decompress_ptr>(cinfo));
-  longjmp(*env, 1);
-}
-
-void MyOutputMessage(j_common_ptr cinfo) {
-  if (JXL_IS_DEBUG_BUILD) {
-    char buf[JMSG_LENGTH_MAX + 1];
-    (*cinfo->err->format_message)(cinfo, buf);
-    buf[JMSG_LENGTH_MAX] = 0;
-    JXL_WARNING("%s", buf);
-  }
-}
-
-Status UnmapColors(uint8_t* row, size_t xsize, int components,
-                   JSAMPARRAY colormap, size_t num_colors) {
-  JXL_ENSURE(colormap != nullptr);
-  std::vector<uint8_t> tmp(xsize * components);
-  for (size_t x = 0; x < xsize; ++x) {
-    JXL_ENSURE(row[x] < num_colors);
-    for (int c = 0; c < components; ++c) {
-      tmp[x * components + c] = colormap[c][row[x]];
-    }
-  }
-  memcpy(row, tmp.data(), tmp.size());
-  return true;
-}
-
-}  // namespace
-#endif
-
-bool CanDecodeJPG() {
-#if JPEGXL_ENABLE_JPEG
-  return true;
-#else
-  return false;
-#endif
-}
-
-Status DecodeImageJPG(const Span<const uint8_t> bytes,
-                      const ColorHints& color_hints, PackedPixelFile* ppf,
-                      const SizeConstraints* constraints,
-                      const JPGDecompressParams* dparams) {
-#if JPEGXL_ENABLE_JPEG
-  // Don't do anything for non-JPEG files (no need to report an error)
-  if (!IsJPG(bytes)) return false;
-
-  // TODO(veluca): use JPEGData also for pixels?
-
-  // We need to declare all the non-trivial destructor local variables before
-  // the call to setjmp().
-  std::unique_ptr<JSAMPLE[]> row;
-
-  const auto try_catch_block = [&]() -> bool {
-    jpeg_decompress_struct cinfo = {};
-    // Setup error handling in jpeg library so we can deal with broken jpegs in
-    // the fuzzer.
-    jpeg_error_mgr jerr;
-    jmp_buf env;
-    cinfo.err = jpeg_std_error(&jerr);
-    jerr.error_exit = &MyErrorExit;
-    jerr.output_message = &MyOutputMessage;
-    if (setjmp(env)) {
-      return false;
-    }
-    cinfo.client_data = static_cast<void*>(&env);
-
-    jpeg_create_decompress(&cinfo);
-    jpeg_mem_src(&cinfo, reinterpret_cast<const unsigned char*>(bytes.data()),
-                 bytes.size());
-    jpeg_save_markers(&cinfo, kICCMarker, 0xFFFF);
-    jpeg_save_markers(&cinfo, kExifMarker, 0xFFFF);
-    const auto failure = [&cinfo](const char* str) -> Status {
-      jpeg_abort_decompress(&cinfo);
-      jpeg_destroy_decompress(&cinfo);
-      return JXL_FAILURE("%s", str);
-    };
-    int read_header_result = jpeg_read_header(&cinfo, TRUE);
-    // TODO(eustas): what about JPEG_HEADER_TABLES_ONLY?
-    if (read_header_result == JPEG_SUSPENDED) {
-      return failure("truncated JPEG input");
-    }
-    if (!VerifyDimensions(constraints, cinfo.image_width, cinfo.image_height)) {
-      return failure("image too big");
-    }
-    // Might cause CPU-zip bomb.
-    if (cinfo.arith_code) {
-      return failure("arithmetic code JPEGs are not supported");
-    }
-    int nbcomp = cinfo.num_components;
-    if (nbcomp != 1 && nbcomp != 3) {
-      return failure("unsupported number of components in JPEG");
-    }
-    if (ReadICCProfile(&cinfo, &ppf->icc)) {
-      ppf->primary_color_representation = PackedPixelFile::kIccIsPrimary;
-    } else {
-      ppf->primary_color_representation =
-          PackedPixelFile::kColorEncodingIsPrimary;
-      ppf->icc.clear();
-      // Default to SRGB
-      // Actually, (cinfo.output_components == nbcomp) will be checked after
-      // `jpeg_start_decompress`.
-      ppf->color_encoding.color_space =
-          (nbcomp == 1) ? JXL_COLOR_SPACE_GRAY : JXL_COLOR_SPACE_RGB;
-      ppf->color_encoding.white_point = JXL_WHITE_POINT_D65;
-      ppf->color_encoding.primaries = JXL_PRIMARIES_SRGB;
-      ppf->color_encoding.transfer_function = JXL_TRANSFER_FUNCTION_SRGB;
-      ppf->color_encoding.rendering_intent = JXL_RENDERING_INTENT_PERCEPTUAL;
-    }
-    ReadExif(&cinfo, &ppf->metadata.exif);
-    if (!ApplyColorHints(color_hints, /*color_already_set=*/true,
-                         /*is_gray=*/false, ppf)) {
-      return failure("ApplyColorHints failed");
-    }
-
-    ppf->info.xsize = cinfo.image_width;
-    ppf->info.ysize = cinfo.image_height;
-    // Original data is uint, so exponent_bits_per_sample = 0.
-    ppf->info.bits_per_sample = BITS_IN_JSAMPLE;
-    static_assert(BITS_IN_JSAMPLE == 8 || BITS_IN_JSAMPLE == 16);
-    ppf->info.exponent_bits_per_sample = 0;
-    ppf->info.uses_original_profile = JXL_TRUE;
-
-    // No alpha in JPG
-    ppf->info.alpha_bits = 0;
-    ppf->info.alpha_exponent_bits = 0;
-
-    ppf->info.num_color_channels = nbcomp;
-    ppf->info.orientation = JXL_ORIENT_IDENTITY;
-
-    if (dparams && dparams->num_colors > 0) {
-      cinfo.quantize_colors = TRUE;
-      cinfo.desired_number_of_colors = dparams->num_colors;
-      cinfo.two_pass_quantize = static_cast<boolean>(dparams->two_pass_quant);
-      cinfo.dither_mode = static_cast<J_DITHER_MODE>(dparams->dither_mode);
-    }
-
-    jpeg_start_decompress(&cinfo);
-    JXL_ENSURE(cinfo.out_color_components == nbcomp);
-    JxlDataType data_type =
-        ppf->info.bits_per_sample <= 8 ? JXL_TYPE_UINT8 : JXL_TYPE_UINT16;
-
-    const JxlPixelFormat format{
-        /*num_channels=*/static_cast<uint32_t>(nbcomp),
-        data_type,
-        /*endianness=*/JXL_NATIVE_ENDIAN,
-        /*align=*/0,
-    };
-    ppf->frames.clear();
-    // Allocates the frame buffer.
-    {
-      JXL_ASSIGN_OR_RETURN(
-          PackedFrame frame,
-          PackedFrame::Create(cinfo.image_width, cinfo.image_height, format));
-      ppf->frames.emplace_back(std::move(frame));
-    }
-    const auto& frame = ppf->frames.back();
-    JXL_ENSURE(sizeof(JSAMPLE) * cinfo.out_color_components *
-                   cinfo.image_width <=
-               frame.color.stride);
-
-    if (cinfo.quantize_colors) {
-      JSAMPLE** colormap = cinfo.colormap;
-      jxl::msan::UnpoisonMemory(reinterpret_cast<void*>(colormap),
-                                cinfo.out_color_components * sizeof(JSAMPLE*));
-      for (int c = 0; c < cinfo.out_color_components; ++c) {
-        jxl::msan::UnpoisonMemory(
-            reinterpret_cast<void*>(colormap[c]),
-            cinfo.actual_number_of_colors * sizeof(JSAMPLE));
-      }
-    }
-    if (dparams && dparams->num_colors > 0) {
-      JXL_ENSURE(cinfo.colormap != nullptr);
-    }
-    for (size_t y = 0; y < cinfo.image_height; ++y) {
-      JSAMPROW rows[] = {reinterpret_cast<JSAMPLE*>(
-          static_cast<uint8_t*>(frame.color.pixels()) +
-          frame.color.stride * y)};
-      jpeg_read_scanlines(&cinfo, rows, 1);
-      msan::UnpoisonMemory(rows[0], sizeof(JSAMPLE) * cinfo.output_components *
-                                        cinfo.image_width);
-      if (dparams && dparams->num_colors > 0) {
-        JXL_RETURN_IF_ERROR(
-            UnmapColors(rows[0], cinfo.output_width, cinfo.out_color_components,
-                        cinfo.colormap, cinfo.actual_number_of_colors));
-      }
-    }
-
-    jpeg_finish_decompress(&cinfo);
-    jpeg_destroy_decompress(&cinfo);
-    return true;
-  };
-
-  return try_catch_block();
-#else
-  return false;
-#endif
-}
-
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/dec/jpg.h b/third_party/jpeg-xl/lib/extras/dec/jpg.h
deleted file mode 100644
index 6e7b2f786b054..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/jpg.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_DEC_JPG_H_
-#define LIB_EXTRAS_DEC_JPG_H_
-
-// Decodes JPG pixels and metadata in memory.
-
-#include <stdint.h>
-
-#include "lib/extras/codec.h"
-#include "lib/extras/dec/color_hints.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-struct SizeConstraints;
-
-namespace extras {
-
-bool CanDecodeJPG();
-
-struct JPGDecompressParams {
-  int num_colors = 0;
-  bool two_pass_quant = false;
-  // 0 = none, 1 = ordered, 2 = Floyd-Steinberg
-  int dither_mode = 0;
-};
-
-// Decodes `bytes` into `ppf`. color_hints are ignored.
-// `elapsed_deinterleave`, if non-null, will be set to the time (in seconds)
-// that it took to deinterleave the raw JSAMPLEs to planar floats.
-Status DecodeImageJPG(Span<const uint8_t> bytes, const ColorHints& color_hints,
-                      PackedPixelFile* ppf,
-                      const SizeConstraints* constraints = nullptr,
-                      const JPGDecompressParams* dparams = nullptr);
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_DEC_JPG_H_
diff --git a/third_party/jpeg-xl/lib/extras/dec/jxl.cc b/third_party/jpeg-xl/lib/extras/dec/jxl.cc
deleted file mode 100644
index 83170b2b9fcec..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/jxl.cc
+++ /dev/null
@@ -1,617 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/dec/jxl.h"
-
-#include <jxl/cms.h>
-#include <jxl/codestream_header.h>
-#include <jxl/decode.h>
-#include <jxl/decode_cxx.h>
-#include <jxl/types.h>
-
-#include <cinttypes>  // PRIu32
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#include <limits>
-#include <vector>
-
-#include "lib/extras/common.h"
-#include "lib/extras/dec/color_description.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/exif.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-namespace extras {
-namespace {
-
-#define QUIT(M)               \
-  fprintf(stderr, "%s\n", M); \
-  return false;
-
-struct BoxProcessor {
-  explicit BoxProcessor(JxlDecoder* dec) : dec_(dec) { Reset(); }
-
-  bool InitializeOutput(std::vector<uint8_t>* out) {
-    if (out == nullptr) {
-      fprintf(stderr, "internal: out == nullptr\n");
-      return false;
-    }
-    box_data_ = out;
-    return AddMoreOutput();
-  }
-
-  bool AddMoreOutput() {
-    if (box_data_ == nullptr) {
-      fprintf(stderr, "internal: box_data_ == nullptr\n");
-      return false;
-    }
-    Flush();
-    static const size_t kBoxOutputChunkSize = 1 << 16;
-    box_data_->resize(box_data_->size() + kBoxOutputChunkSize);
-    next_out_ = box_data_->data() + total_size_;
-    avail_out_ = box_data_->size() - total_size_;
-    if (JXL_DEC_SUCCESS !=
-        JxlDecoderSetBoxBuffer(dec_, next_out_, avail_out_)) {
-      fprintf(stderr, "JxlDecoderSetBoxBuffer failed\n");
-      return false;
-    }
-    return true;
-  }
-
-  void FinalizeOutput() {
-    if (box_data_ == nullptr) return;
-    Flush();
-    box_data_->resize(total_size_);
-    Reset();
-  }
-
- private:
-  JxlDecoder* dec_;
-  std::vector<uint8_t>* box_data_;
-  uint8_t* next_out_;
-  size_t avail_out_;
-  size_t total_size_;
-
-  void Reset() {
-    box_data_ = nullptr;
-    next_out_ = nullptr;
-    avail_out_ = 0;
-    total_size_ = 0;
-  }
-  void Flush() {
-    if (box_data_ == nullptr) return;
-    size_t remaining = JxlDecoderReleaseBoxBuffer(dec_);
-    size_t bytes_written = avail_out_ - remaining;
-    next_out_ += bytes_written;
-    avail_out_ -= bytes_written;
-    total_size_ += bytes_written;
-  }
-};
-
-void SetBitDepthFromDataType(JxlDataType data_type, uint32_t* bits_per_sample,
-                             uint32_t* exponent_bits_per_sample) {
-  switch (data_type) {
-    case JXL_TYPE_UINT8:
-      *bits_per_sample = 8;
-      *exponent_bits_per_sample = 0;
-      break;
-    case JXL_TYPE_UINT16:
-      *bits_per_sample = 16;
-      *exponent_bits_per_sample = 0;
-      break;
-    case JXL_TYPE_FLOAT16:
-      *bits_per_sample = 16;
-      *exponent_bits_per_sample = 5;
-      break;
-    case JXL_TYPE_FLOAT:
-      *bits_per_sample = 32;
-      *exponent_bits_per_sample = 8;
-      break;
-  }
-}
-
-template <typename T>
-void UpdateBitDepth(JxlBitDepth bit_depth, JxlDataType data_type, T* info) {
-  if (bit_depth.type == JXL_BIT_DEPTH_FROM_PIXEL_FORMAT) {
-    SetBitDepthFromDataType(data_type, &info->bits_per_sample,
-                            &info->exponent_bits_per_sample);
-  } else if (bit_depth.type == JXL_BIT_DEPTH_CUSTOM) {
-    info->bits_per_sample = bit_depth.bits_per_sample;
-    info->exponent_bits_per_sample = bit_depth.exponent_bits_per_sample;
-  }
-}
-
-}  // namespace
-
-bool DecodeImageJXL(const uint8_t* bytes, size_t bytes_size,
-                    const JXLDecompressParams& dparams, size_t* decoded_bytes,
-                    PackedPixelFile* ppf, std::vector<uint8_t>* jpeg_bytes) {
-  JxlSignature sig = JxlSignatureCheck(bytes, bytes_size);
-  // silently return false if this is not a JXL file
-  if (sig == JXL_SIG_INVALID) return false;
-
-  auto decoder = JxlDecoderMake(dparams.memory_manager);
-  JxlDecoder* dec = decoder.get();
-  ppf->frames.clear();
-
-  if (dparams.runner_opaque != nullptr &&
-      JXL_DEC_SUCCESS != JxlDecoderSetParallelRunner(dec, dparams.runner,
-                                                     dparams.runner_opaque)) {
-    fprintf(stderr, "JxlEncoderSetParallelRunner failed\n");
-    return false;
-  }
-
-  JxlPixelFormat format = {};  // Initialize to calm down clang-tidy.
-  std::vector<JxlPixelFormat> accepted_formats = dparams.accepted_formats;
-
-  JxlColorEncoding color_encoding;
-  size_t num_color_channels = 0;
-  if (!dparams.color_space.empty()) {
-    if (!jxl::ParseDescription(dparams.color_space, &color_encoding)) {
-      fprintf(stderr, "Failed to parse color space %s.\n",
-              dparams.color_space.c_str());
-      return false;
-    }
-    num_color_channels =
-        color_encoding.color_space == JXL_COLOR_SPACE_GRAY ? 1 : 3;
-  }
-
-  bool can_reconstruct_jpeg = false;
-  std::vector<uint8_t> jpeg_data_chunk;
-  if (jpeg_bytes != nullptr) {
-    // This bound is very likely to be enough to hold the entire
-    // reconstructed JPEG, to avoid having to do expensive retries.
-    jpeg_data_chunk.resize(bytes_size * 3 / 2 + 1024);
-    jpeg_bytes->resize(0);
-  }
-
-  int events = (JXL_DEC_BASIC_INFO | JXL_DEC_FULL_IMAGE);
-
-  bool max_passes_defined =
-      (dparams.max_passes < std::numeric_limits<uint32_t>::max());
-  if (max_passes_defined || dparams.max_downsampling > 1) {
-    events |= JXL_DEC_FRAME_PROGRESSION;
-    if (max_passes_defined) {
-      JxlDecoderSetProgressiveDetail(dec, JxlProgressiveDetail::kPasses);
-    } else {
-      JxlDecoderSetProgressiveDetail(dec, JxlProgressiveDetail::kLastPasses);
-    }
-  }
-  if (jpeg_bytes != nullptr) {
-    events |= JXL_DEC_JPEG_RECONSTRUCTION;
-  } else {
-    events |= (JXL_DEC_COLOR_ENCODING | JXL_DEC_FRAME | JXL_DEC_PREVIEW_IMAGE |
-               JXL_DEC_BOX);
-    if (accepted_formats.empty()) {
-      // decoding just the metadata, not the pixel data
-      events ^= (JXL_DEC_FULL_IMAGE | JXL_DEC_PREVIEW_IMAGE);
-    }
-  }
-  if (JXL_DEC_SUCCESS != JxlDecoderSubscribeEvents(dec, events)) {
-    fprintf(stderr, "JxlDecoderSubscribeEvents failed\n");
-    return false;
-  }
-  if (jpeg_bytes == nullptr) {
-    if (JXL_DEC_SUCCESS != JxlDecoderSetRenderSpotcolors(
-                               dec, TO_JXL_BOOL(dparams.render_spotcolors))) {
-      fprintf(stderr, "JxlDecoderSetRenderSpotColors failed\n");
-      return false;
-    }
-    if (JXL_DEC_SUCCESS != JxlDecoderSetKeepOrientation(
-                               dec, TO_JXL_BOOL(dparams.keep_orientation))) {
-      fprintf(stderr, "JxlDecoderSetKeepOrientation failed\n");
-      return false;
-    }
-    if (JXL_DEC_SUCCESS != JxlDecoderSetUnpremultiplyAlpha(
-                               dec, TO_JXL_BOOL(dparams.unpremultiply_alpha))) {
-      fprintf(stderr, "JxlDecoderSetUnpremultiplyAlpha failed\n");
-      return false;
-    }
-    if (dparams.display_nits > 0 &&
-        JXL_DEC_SUCCESS !=
-            JxlDecoderSetDesiredIntensityTarget(dec, dparams.display_nits)) {
-      fprintf(stderr, "Decoder failed to set desired intensity target\n");
-      return false;
-    }
-    if (JXL_DEC_SUCCESS != JxlDecoderSetDecompressBoxes(dec, JXL_TRUE)) {
-      fprintf(stderr, "JxlDecoderSetDecompressBoxes failed\n");
-      return false;
-    }
-  }
-  if (JXL_DEC_SUCCESS != JxlDecoderSetInput(dec, bytes, bytes_size)) {
-    fprintf(stderr, "Decoder failed to set input\n");
-    return false;
-  }
-  uint32_t progression_index = 0;
-  bool codestream_done = jpeg_bytes == nullptr && accepted_formats.empty();
-  BoxProcessor boxes(dec);
-  for (;;) {
-    JxlDecoderStatus status = JxlDecoderProcessInput(dec);
-    if (status == JXL_DEC_ERROR) {
-      fprintf(stderr, "Failed to decode image\n");
-      return false;
-    } else if (status == JXL_DEC_NEED_MORE_INPUT) {
-      if (codestream_done) {
-        break;
-      }
-      if (dparams.allow_partial_input) {
-        if (JXL_DEC_SUCCESS != JxlDecoderFlushImage(dec)) {
-          fprintf(stderr,
-                  "Input file is truncated and there is no preview "
-                  "available yet.\n");
-          return false;
-        }
-        break;
-      }
-      size_t released_size = JxlDecoderReleaseInput(dec);
-      fprintf(stderr,
-              "Input file is truncated (total bytes: %" PRIuS
-              ", processed bytes: %" PRIuS
-              ") and --allow_partial_files is not present.\n",
-              bytes_size, bytes_size - released_size);
-      return false;
-    } else if (status == JXL_DEC_BOX) {
-      boxes.FinalizeOutput();
-      JxlBoxType box_type;
-      if (JXL_DEC_SUCCESS != JxlDecoderGetBoxType(dec, box_type, JXL_TRUE)) {
-        fprintf(stderr, "JxlDecoderGetBoxType failed\n");
-        return false;
-      }
-      std::vector<uint8_t>* box_data = nullptr;
-      if (memcmp(box_type, "Exif", 4) == 0) {
-        box_data = &ppf->metadata.exif;
-      } else if (memcmp(box_type, "iptc", 4) == 0) {
-        box_data = &ppf->metadata.iptc;
-      } else if (memcmp(box_type, "jumb", 4) == 0) {
-        box_data = &ppf->metadata.jumbf;
-      } else if (memcmp(box_type, "jhgm", 4) == 0) {
-        box_data = &ppf->metadata.jhgm;
-      } else if (memcmp(box_type, "xml ", 4) == 0) {
-        box_data = &ppf->metadata.xmp;
-      }
-      if (box_data) {
-        if (!boxes.InitializeOutput(box_data)) {
-          return false;
-        }
-      }
-    } else if (status == JXL_DEC_BOX_NEED_MORE_OUTPUT) {
-      if (!boxes.AddMoreOutput()) {
-        return false;
-      }
-    } else if (status == JXL_DEC_JPEG_RECONSTRUCTION) {
-      can_reconstruct_jpeg = true;
-      // Decoding to JPEG.
-      if (JXL_DEC_SUCCESS != JxlDecoderSetJPEGBuffer(dec,
-                                                     jpeg_data_chunk.data(),
-                                                     jpeg_data_chunk.size())) {
-        fprintf(stderr, "Decoder failed to set JPEG Buffer\n");
-        return false;
-      }
-    } else if (status == JXL_DEC_JPEG_NEED_MORE_OUTPUT) {
-      if (jpeg_bytes == nullptr) {
-        fprintf(stderr, "internal: jpeg_bytes == nullptr\n");
-        return false;
-      }
-      // Decoded a chunk to JPEG.
-      size_t used_jpeg_output =
-          jpeg_data_chunk.size() - JxlDecoderReleaseJPEGBuffer(dec);
-      jpeg_bytes->insert(jpeg_bytes->end(), jpeg_data_chunk.data(),
-                         jpeg_data_chunk.data() + used_jpeg_output);
-      if (used_jpeg_output == 0) {
-        // Chunk is too small.
-        jpeg_data_chunk.resize(jpeg_data_chunk.size() * 2);
-      }
-      if (JXL_DEC_SUCCESS != JxlDecoderSetJPEGBuffer(dec,
-                                                     jpeg_data_chunk.data(),
-                                                     jpeg_data_chunk.size())) {
-        fprintf(stderr, "Decoder failed to set JPEG Buffer\n");
-        return false;
-      }
-    } else if (status == JXL_DEC_BASIC_INFO) {
-      if (JXL_DEC_SUCCESS != JxlDecoderGetBasicInfo(dec, &ppf->info)) {
-        fprintf(stderr, "JxlDecoderGetBasicInfo failed\n");
-        return false;
-      }
-      if (accepted_formats.empty()) continue;
-      if (num_color_channels != 0) {
-        // Mark the change in number of color channels due to the requested
-        // color space.
-        ppf->info.num_color_channels = num_color_channels;
-      }
-      if (dparams.output_bitdepth.type == JXL_BIT_DEPTH_CUSTOM) {
-        // Select format based on custom bits per sample.
-        ppf->info.bits_per_sample = dparams.output_bitdepth.bits_per_sample;
-      }
-      // Select format according to accepted formats.
-      if (!jxl::extras::SelectFormat(accepted_formats, ppf->info, &format)) {
-        fprintf(stderr, "SelectFormat failed\n");
-        return false;
-      }
-      bool have_alpha = (format.num_channels == 2 || format.num_channels == 4);
-      if (!have_alpha) {
-        // Mark in the basic info that alpha channel was dropped.
-        ppf->info.alpha_bits = 0;
-      } else {
-        if (dparams.unpremultiply_alpha) {
-          // Mark in the basic info that alpha was unpremultiplied.
-          ppf->info.alpha_premultiplied = JXL_FALSE;
-        }
-      }
-      bool alpha_found = false;
-      for (uint32_t i = 0; i < ppf->info.num_extra_channels; ++i) {
-        JxlExtraChannelInfo eci;
-        if (JXL_DEC_SUCCESS != JxlDecoderGetExtraChannelInfo(dec, i, &eci)) {
-          fprintf(stderr, "JxlDecoderGetExtraChannelInfo failed\n");
-          return false;
-        }
-        if (eci.type == JXL_CHANNEL_ALPHA && have_alpha && !alpha_found) {
-          // Skip the first alpha channels because it is already present in the
-          // interleaved image.
-          alpha_found = true;
-          continue;
-        }
-        std::string name(eci.name_length + 1, 0);
-        if (JXL_DEC_SUCCESS !=
-            JxlDecoderGetExtraChannelName(
-                dec, i, const_cast<char*>(name.data()), name.size())) {
-          fprintf(stderr, "JxlDecoderGetExtraChannelName failed\n");
-          return false;
-        }
-        name.resize(eci.name_length);
-        ppf->extra_channels_info.push_back({eci, i, name});
-      }
-    } else if (status == JXL_DEC_COLOR_ENCODING) {
-      if (!dparams.color_space.empty()) {
-        if (ppf->info.uses_original_profile) {
-          fprintf(stderr,
-                  "Warning: --color_space ignored because the image is "
-                  "not XYB encoded.\n");
-        } else {
-          JxlDecoderSetCms(dec, *JxlGetDefaultCms());
-          if (JXL_DEC_SUCCESS !=
-              JxlDecoderSetPreferredColorProfile(dec, &color_encoding)) {
-            fprintf(stderr, "Failed to set color space.\n");
-            return false;
-          }
-        }
-      }
-      size_t icc_size = 0;
-      JxlColorProfileTarget target = JXL_COLOR_PROFILE_TARGET_DATA;
-      if (JXL_DEC_SUCCESS !=
-          JxlDecoderGetICCProfileSize(dec, target, &icc_size)) {
-        fprintf(stderr, "JxlDecoderGetICCProfileSize failed\n");
-      }
-      if (icc_size != 0) {
-        ppf->icc.resize(icc_size);
-        if (JXL_DEC_SUCCESS != JxlDecoderGetColorAsICCProfile(
-                                   dec, target, ppf->icc.data(), icc_size)) {
-          fprintf(stderr, "JxlDecoderGetColorAsICCProfile failed\n");
-          return false;
-        }
-      }
-      if (JXL_DEC_SUCCESS != JxlDecoderGetColorAsEncodedProfile(
-                                 dec, target, &ppf->color_encoding)) {
-        ppf->color_encoding.color_space = JXL_COLOR_SPACE_UNKNOWN;
-      }
-      ppf->primary_color_representation =
-          PackedPixelFile::kColorEncodingIsPrimary;
-      icc_size = 0;
-      target = JXL_COLOR_PROFILE_TARGET_ORIGINAL;
-      if (JXL_DEC_SUCCESS !=
-          JxlDecoderGetICCProfileSize(dec, target, &icc_size)) {
-        fprintf(stderr, "JxlDecoderGetICCProfileSize failed\n");
-      }
-      if (icc_size != 0) {
-        ppf->orig_icc.resize(icc_size);
-        if (JXL_DEC_SUCCESS !=
-            JxlDecoderGetColorAsICCProfile(dec, target, ppf->orig_icc.data(),
-                                           icc_size)) {
-          fprintf(stderr, "JxlDecoderGetColorAsICCProfile failed\n");
-          return false;
-        }
-        ppf->primary_color_representation = PackedPixelFile::kIccIsPrimary;
-      }
-    } else if (status == JXL_DEC_FRAME) {
-      auto frame_or = jxl::extras::PackedFrame::Create(ppf->info.xsize,
-                                                       ppf->info.ysize, format);
-      JXL_ASSIGN_OR_QUIT(jxl::extras::PackedFrame frame,
-                         jxl::extras::PackedFrame::Create(
-                             ppf->info.xsize, ppf->info.ysize, format),
-                         "Failed to create image frame.");
-      if (JXL_DEC_SUCCESS != JxlDecoderGetFrameHeader(dec, &frame.frame_info)) {
-        fprintf(stderr, "JxlDecoderGetFrameHeader failed\n");
-        return false;
-      }
-      frame.name.resize(frame.frame_info.name_length + 1, 0);
-      if (JXL_DEC_SUCCESS !=
-          JxlDecoderGetFrameName(dec, const_cast<char*>(frame.name.data()),
-                                 frame.name.size())) {
-        fprintf(stderr, "JxlDecoderGetFrameName failed\n");
-        return false;
-      }
-      frame.name.resize(frame.frame_info.name_length);
-      ppf->frames.emplace_back(std::move(frame));
-      progression_index = 0;
-    } else if (status == JXL_DEC_FRAME_PROGRESSION) {
-      size_t downsampling = JxlDecoderGetIntendedDownsamplingRatio(dec);
-      if ((max_passes_defined && progression_index >= dparams.max_passes) ||
-          (!max_passes_defined && downsampling <= dparams.max_downsampling)) {
-        if (JXL_DEC_SUCCESS != JxlDecoderFlushImage(dec)) {
-          fprintf(stderr, "JxlDecoderFlushImage failed\n");
-          return false;
-        }
-        if (ppf->frames.back().frame_info.is_last) {
-          break;
-        }
-        if (JXL_DEC_SUCCESS != JxlDecoderSkipCurrentFrame(dec)) {
-          fprintf(stderr, "JxlDecoderSkipCurrentFrame failed\n");
-          return false;
-        }
-      }
-      ++progression_index;
-    } else if (status == JXL_DEC_NEED_PREVIEW_OUT_BUFFER) {
-      size_t buffer_size;
-      if (JXL_DEC_SUCCESS !=
-          JxlDecoderPreviewOutBufferSize(dec, &format, &buffer_size)) {
-        fprintf(stderr, "JxlDecoderPreviewOutBufferSize failed\n");
-        return false;
-      }
-      JXL_ASSIGN_OR_QUIT(
-          jxl::extras::PackedImage preview_image,
-          jxl::extras::PackedImage::Create(ppf->info.preview.xsize,
-                                           ppf->info.preview.ysize, format),
-          "Failed to create preview image.");
-      ppf->preview_frame =
-          jxl::make_unique<jxl::extras::PackedFrame>(std::move(preview_image));
-      if (buffer_size != ppf->preview_frame->color.pixels_size) {
-        fprintf(stderr, "Invalid out buffer size %" PRIuS " %" PRIuS "\n",
-                buffer_size, ppf->preview_frame->color.pixels_size);
-        return false;
-      }
-      if (JXL_DEC_SUCCESS !=
-          JxlDecoderSetPreviewOutBuffer(
-              dec, &format, ppf->preview_frame->color.pixels(), buffer_size)) {
-        fprintf(stderr, "JxlDecoderSetPreviewOutBuffer failed\n");
-        return false;
-      }
-    } else if (status == JXL_DEC_NEED_IMAGE_OUT_BUFFER) {
-      if (jpeg_bytes != nullptr) {
-        break;
-      }
-      size_t buffer_size;
-      if (JXL_DEC_SUCCESS !=
-          JxlDecoderImageOutBufferSize(dec, &format, &buffer_size)) {
-        fprintf(stderr, "JxlDecoderImageOutBufferSize failed\n");
-        return false;
-      }
-      jxl::extras::PackedFrame& frame = ppf->frames.back();
-      if (buffer_size != frame.color.pixels_size) {
-        fprintf(stderr, "Invalid out buffer size %" PRIuS " %" PRIuS "\n",
-                buffer_size, frame.color.pixels_size);
-        return false;
-      }
-
-      if (dparams.use_image_callback) {
-        auto callback = [](void* opaque, size_t x, size_t y, size_t num_pixels,
-                           const void* pixels) {
-          auto* ppf = reinterpret_cast<jxl::extras::PackedPixelFile*>(opaque);
-          jxl::extras::PackedImage& color = ppf->frames.back().color;
-          uint8_t* pixels_buffer = reinterpret_cast<uint8_t*>(color.pixels());
-          size_t sample_size = color.pixel_stride();
-          memcpy(pixels_buffer + (color.stride * y + sample_size * x), pixels,
-                 num_pixels * sample_size);
-        };
-        if (JXL_DEC_SUCCESS !=
-            JxlDecoderSetImageOutCallback(dec, &format, callback, ppf)) {
-          fprintf(stderr, "JxlDecoderSetImageOutCallback failed\n");
-          return false;
-        }
-      } else {
-        if (JXL_DEC_SUCCESS != JxlDecoderSetImageOutBuffer(dec, &format,
-                                                           frame.color.pixels(),
-                                                           buffer_size)) {
-          fprintf(stderr, "JxlDecoderSetImageOutBuffer failed\n");
-          return false;
-        }
-      }
-      if (JXL_DEC_SUCCESS !=
-          JxlDecoderSetImageOutBitDepth(dec, &dparams.output_bitdepth)) {
-        fprintf(stderr, "JxlDecoderSetImageOutBitDepth failed\n");
-        return false;
-      }
-      UpdateBitDepth(dparams.output_bitdepth, format.data_type, &ppf->info);
-      bool have_alpha = (format.num_channels == 2 || format.num_channels == 4);
-      if (have_alpha) {
-        // Interleaved alpha channels has the same bit depth as color channels.
-        ppf->info.alpha_bits = ppf->info.bits_per_sample;
-        ppf->info.alpha_exponent_bits = ppf->info.exponent_bits_per_sample;
-      }
-      JxlPixelFormat ec_format = format;
-      ec_format.num_channels = 1;
-      for (auto& eci : ppf->extra_channels_info) {
-        JXL_ASSIGN_OR_QUIT(jxl::extras::PackedImage image,
-                           jxl::extras::PackedImage::Create(
-                               ppf->info.xsize, ppf->info.ysize, ec_format),
-                           "Failed to create extra channel image.");
-        frame.extra_channels.emplace_back(std::move(image));
-        auto& ec = frame.extra_channels.back();
-        size_t buffer_size;
-        if (JXL_DEC_SUCCESS != JxlDecoderExtraChannelBufferSize(
-                                   dec, &ec_format, &buffer_size, eci.index)) {
-          fprintf(stderr, "JxlDecoderExtraChannelBufferSize failed\n");
-          return false;
-        }
-        if (buffer_size != ec.pixels_size) {
-          fprintf(stderr,
-                  "Invalid extra channel buffer size"
-                  " %" PRIuS " %" PRIuS "\n",
-                  buffer_size, ec.pixels_size);
-          return false;
-        }
-        if (JXL_DEC_SUCCESS !=
-            JxlDecoderSetExtraChannelBuffer(dec, &ec_format, ec.pixels(),
-                                            buffer_size, eci.index)) {
-          fprintf(stderr, "JxlDecoderSetExtraChannelBuffer failed\n");
-          return false;
-        }
-        UpdateBitDepth(dparams.output_bitdepth, ec_format.data_type,
-                       &eci.ec_info);
-      }
-    } else if (status == JXL_DEC_SUCCESS) {
-      // Decoding finished successfully.
-      break;
-    } else if (status == JXL_DEC_PREVIEW_IMAGE) {
-      // Nothing to do.
-    } else if (status == JXL_DEC_FULL_IMAGE) {
-      if (jpeg_bytes != nullptr || ppf->frames.back().frame_info.is_last) {
-        codestream_done = true;
-      }
-    } else {
-      fprintf(stderr, "Error: unexpected status: %d\n",
-              static_cast<int>(status));
-      return false;
-    }
-  }
-  boxes.FinalizeOutput();
-  if (!ppf->metadata.exif.empty()) {
-    // Verify that Exif box has a valid TIFF header at the specified offset.
-    // Discard bytes preceding the header.
-    if (ppf->metadata.exif.size() >= 4) {
-      uint32_t offset = LoadBE32(ppf->metadata.exif.data());
-      if (offset <= ppf->metadata.exif.size() - 8) {
-        std::vector<uint8_t> exif(ppf->metadata.exif.begin() + 4 + offset,
-                                  ppf->metadata.exif.end());
-        bool bigendian;
-        if (IsExif(exif, &bigendian)) {
-          ppf->metadata.exif = std::move(exif);
-        } else {
-          fprintf(stderr, "Warning: invalid TIFF header in Exif\n");
-        }
-      } else {
-        fprintf(stderr, "Warning: invalid Exif offset: %" PRIu32 "\n", offset);
-      }
-    } else {
-      fprintf(stderr, "Warning: invalid Exif length: %" PRIuS "\n",
-              ppf->metadata.exif.size());
-    }
-  }
-  if (jpeg_bytes != nullptr) {
-    if (!can_reconstruct_jpeg) return false;
-    size_t used_jpeg_output =
-        jpeg_data_chunk.size() - JxlDecoderReleaseJPEGBuffer(dec);
-    jpeg_bytes->insert(jpeg_bytes->end(), jpeg_data_chunk.data(),
-                       jpeg_data_chunk.data() + used_jpeg_output);
-  }
-  if (decoded_bytes) {
-    *decoded_bytes = bytes_size - JxlDecoderReleaseInput(dec);
-  }
-  return true;
-}
-
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/dec/jxl.h b/third_party/jpeg-xl/lib/extras/dec/jxl.h
deleted file mode 100644
index 7c80280c033ad..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/jxl.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_DEC_JXL_H_
-#define LIB_EXTRAS_DEC_JXL_H_
-
-// Decodes JPEG XL images in memory.
-
-#include <jxl/memory_manager.h>
-#include <jxl/parallel_runner.h>
-#include <jxl/types.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <limits>
-#include <string>
-#include <vector>
-
-#include "lib/extras/packed_image.h"
-
-namespace jxl {
-namespace extras {
-
-struct JXLDecompressParams {
-  // If empty, little endian float formats will be accepted.
-  std::vector<JxlPixelFormat> accepted_formats;
-
-  // Requested output color space description.
-  std::string color_space;
-  // If set, performs tone mapping to this intensity target luminance.
-  float display_nits = 0.0;
-  // Whether spot colors are rendered on the image.
-  bool render_spotcolors = true;
-  // Whether to keep or undo the orientation given in the header.
-  bool keep_orientation = false;
-
-  // If runner_opaque is set, the decoder uses this parallel runner.
-  JxlParallelRunner runner;
-  void* runner_opaque = nullptr;
-
-  // If memory_manager is set, decoder uses it.
-  JxlMemoryManager* memory_manager = nullptr;
-
-  // Whether truncated input should be treated as an error.
-  bool allow_partial_input = false;
-
-  // How many passes to decode at most. By default, decode everything.
-  uint32_t max_passes = std::numeric_limits<uint32_t>::max();
-
-  // Alternatively, one can specify the maximum tolerable downscaling factor
-  // with respect to the full size of the image. By default, nothing less than
-  // the full size is requested.
-  size_t max_downsampling = 1;
-
-  // Whether to use the image callback or the image buffer to get the output.
-  bool use_image_callback = true;
-  // Whether to unpremultiply colors for associated alpha channels.
-  bool unpremultiply_alpha = false;
-
-  // Controls the effective bit depth of the output pixels.
-  JxlBitDepth output_bitdepth = {JXL_BIT_DEPTH_FROM_PIXEL_FORMAT, 0, 0};
-};
-
-bool DecodeImageJXL(const uint8_t* bytes, size_t bytes_size,
-                    const JXLDecompressParams& dparams, size_t* decoded_bytes,
-                    PackedPixelFile* ppf,
-                    std::vector<uint8_t>* jpeg_bytes = nullptr);
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_DEC_JXL_H_
diff --git a/third_party/jpeg-xl/lib/extras/dec/pgx.cc b/third_party/jpeg-xl/lib/extras/dec/pgx.cc
deleted file mode 100644
index 4499069d7708b..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/pgx.cc
+++ /dev/null
@@ -1,207 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/dec/pgx.h"
-
-#include <string.h>
-
-#include "lib/extras/size_constraints.h"
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/base/compiler_specific.h"
-
-namespace jxl {
-namespace extras {
-namespace {
-
-struct HeaderPGX {
-  // NOTE: PGX is always grayscale
-  size_t xsize;
-  size_t ysize;
-  size_t bits_per_sample;
-  bool big_endian;
-  bool is_signed;
-};
-
-class Parser {
- public:
-  explicit Parser(const Span<const uint8_t> bytes)
-      : pos_(bytes.data()), end_(pos_ + bytes.size()) {}
-
-  // Sets "pos" to the first non-header byte/pixel on success.
-  Status ParseHeader(HeaderPGX* header, const uint8_t** pos) {
-    // codec.cc ensures we have at least two bytes => no range check here.
-    if (pos_[0] != 'P' || pos_[1] != 'G') return false;
-    pos_ += 2;
-    return ParseHeaderPGX(header, pos);
-  }
-
-  // Exposed for testing
-  Status ParseUnsigned(size_t* number) {
-    if (pos_ == end_) return JXL_FAILURE("PGX: reached end before number");
-    if (!IsDigit(*pos_)) return JXL_FAILURE("PGX: expected unsigned number");
-
-    *number = 0;
-    while (pos_ < end_ && *pos_ >= '0' && *pos_ <= '9') {
-      *number *= 10;
-      *number += *pos_ - '0';
-      ++pos_;
-    }
-
-    return true;
-  }
-
- private:
-  static bool IsDigit(const uint8_t c) { return '0' <= c && c <= '9'; }
-  static bool IsLineBreak(const uint8_t c) { return c == '\r' || c == '\n'; }
-  static bool IsWhitespace(const uint8_t c) {
-    return IsLineBreak(c) || c == '\t' || c == ' ';
-  }
-
-  Status SkipSpace() {
-    if (pos_ == end_) return JXL_FAILURE("PGX: reached end before space");
-    const uint8_t c = *pos_;
-    if (c != ' ') return JXL_FAILURE("PGX: expected space");
-    ++pos_;
-    return true;
-  }
-
-  Status SkipLineBreak() {
-    if (pos_ == end_) return JXL_FAILURE("PGX: reached end before line break");
-    // Line break can be either "\n" (0a) or "\r\n" (0d 0a).
-    if (*pos_ == '\n') {
-      pos_++;
-      return true;
-    } else if (*pos_ == '\r' && pos_ + 1 != end_ && *(pos_ + 1) == '\n') {
-      pos_ += 2;
-      return true;
-    }
-    return JXL_FAILURE("PGX: expected line break");
-  }
-
-  Status SkipSingleWhitespace() {
-    if (pos_ == end_) return JXL_FAILURE("PGX: reached end before whitespace");
-    if (!IsWhitespace(*pos_)) return JXL_FAILURE("PGX: expected whitespace");
-    ++pos_;
-    return true;
-  }
-
-  Status ParseHeaderPGX(HeaderPGX* header, const uint8_t** pos) {
-    JXL_RETURN_IF_ERROR(SkipSpace());
-    if (pos_ + 2 > end_) return JXL_FAILURE("PGX: header too small");
-    if (*pos_ == 'M' && *(pos_ + 1) == 'L') {
-      header->big_endian = true;
-    } else if (*pos_ == 'L' && *(pos_ + 1) == 'M') {
-      header->big_endian = false;
-    } else {
-      return JXL_FAILURE("PGX: invalid endianness");
-    }
-    pos_ += 2;
-    JXL_RETURN_IF_ERROR(SkipSpace());
-    if (pos_ == end_) return JXL_FAILURE("PGX: header too small");
-    if (*pos_ == '+') {
-      header->is_signed = false;
-    } else if (*pos_ == '-') {
-      header->is_signed = true;
-    } else {
-      return JXL_FAILURE("PGX: invalid signedness");
-    }
-    pos_++;
-    // Skip optional space
-    if (pos_ < end_ && *pos_ == ' ') pos_++;
-    JXL_RETURN_IF_ERROR(ParseUnsigned(&header->bits_per_sample));
-    JXL_RETURN_IF_ERROR(SkipSingleWhitespace());
-    JXL_RETURN_IF_ERROR(ParseUnsigned(&header->xsize));
-    JXL_RETURN_IF_ERROR(SkipSingleWhitespace());
-    JXL_RETURN_IF_ERROR(ParseUnsigned(&header->ysize));
-    // 0xa, or 0xd 0xa.
-    JXL_RETURN_IF_ERROR(SkipLineBreak());
-
-    // TODO(jon): could do up to 24-bit by converting the values to
-    // JXL_TYPE_FLOAT.
-    if (header->bits_per_sample > 16) {
-      return JXL_FAILURE("PGX: >16 bits not yet supported");
-    }
-    // TODO(lode): support signed integers. This may require changing the way
-    // external_image works.
-    if (header->is_signed) {
-      return JXL_FAILURE("PGX: signed not yet supported");
-    }
-
-    size_t numpixels = header->xsize * header->ysize;
-    size_t bytes_per_pixel = header->bits_per_sample <= 8 ? 1 : 2;
-    if (pos_ + numpixels * bytes_per_pixel > end_) {
-      return JXL_FAILURE("PGX: data too small");
-    }
-
-    *pos = pos_;
-    return true;
-  }
-
-  const uint8_t* pos_;
-  const uint8_t* const end_;
-};
-
-}  // namespace
-
-Status DecodeImagePGX(const Span<const uint8_t> bytes,
-                      const ColorHints& color_hints, PackedPixelFile* ppf,
-                      const SizeConstraints* constraints) {
-  Parser parser(bytes);
-  HeaderPGX header = {};
-  const uint8_t* pos = nullptr;
-  if (!parser.ParseHeader(&header, &pos)) return false;
-  JXL_RETURN_IF_ERROR(
-      VerifyDimensions(constraints, header.xsize, header.ysize));
-  if (header.bits_per_sample == 0 || header.bits_per_sample > 32) {
-    return JXL_FAILURE("PGX: bits_per_sample invalid");
-  }
-
-  JXL_RETURN_IF_ERROR(ApplyColorHints(color_hints, /*color_already_set=*/false,
-                                      /*is_gray=*/true, ppf));
-  ppf->info.xsize = header.xsize;
-  ppf->info.ysize = header.ysize;
-  // Original data is uint, so exponent_bits_per_sample = 0.
-  ppf->info.bits_per_sample = header.bits_per_sample;
-  ppf->info.exponent_bits_per_sample = 0;
-  ppf->info.uses_original_profile = JXL_TRUE;
-
-  // No alpha in PGX
-  ppf->info.alpha_bits = 0;
-  ppf->info.alpha_exponent_bits = 0;
-  ppf->info.num_color_channels = 1;  // Always grayscale
-  ppf->info.orientation = JXL_ORIENT_IDENTITY;
-
-  JxlDataType data_type;
-  if (header.bits_per_sample > 8) {
-    data_type = JXL_TYPE_UINT16;
-  } else {
-    data_type = JXL_TYPE_UINT8;
-  }
-
-  const JxlPixelFormat format{
-      /*num_channels=*/1,
-      /*data_type=*/data_type,
-      /*endianness=*/header.big_endian ? JXL_BIG_ENDIAN : JXL_LITTLE_ENDIAN,
-      /*align=*/0,
-  };
-  ppf->frames.clear();
-  // Allocates the frame buffer.
-  {
-    JXL_ASSIGN_OR_RETURN(
-        PackedFrame frame,
-        PackedFrame::Create(header.xsize, header.ysize, format));
-    ppf->frames.emplace_back(std::move(frame));
-  }
-  const auto& frame = ppf->frames.back();
-  size_t pgx_remaining_size = bytes.data() + bytes.size() - pos;
-  if (pgx_remaining_size < frame.color.pixels_size) {
-    return JXL_FAILURE("PGX file too small");
-  }
-  memcpy(frame.color.pixels(), pos, frame.color.pixels_size);
-  return true;
-}
-
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/dec/pgx.h b/third_party/jpeg-xl/lib/extras/dec/pgx.h
deleted file mode 100644
index ce852e6965537..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/pgx.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_DEC_PGX_H_
-#define LIB_EXTRAS_DEC_PGX_H_
-
-// Decodes PGX pixels in memory.
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "lib/extras/dec/color_hints.h"
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-struct SizeConstraints;
-
-namespace extras {
-
-// Decodes `bytes` into `ppf`.
-Status DecodeImagePGX(Span<const uint8_t> bytes, const ColorHints& color_hints,
-                      PackedPixelFile* ppf,
-                      const SizeConstraints* constraints = nullptr);
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_DEC_PGX_H_
diff --git a/third_party/jpeg-xl/lib/extras/dec/pgx_test.cc b/third_party/jpeg-xl/lib/extras/dec/pgx_test.cc
deleted file mode 100644
index 9370e5d5ae2bf..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/pgx_test.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/dec/pgx.h"
-
-#include <cstdint>
-#include <cstring>
-#include <string>
-
-#include "lib/extras/packed_image.h"
-#include "lib/extras/packed_image_convert.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace extras {
-namespace {
-
-Span<const uint8_t> MakeSpan(const char* str) {
-  return Bytes(reinterpret_cast<const uint8_t*>(str), strlen(str));
-}
-
-TEST(CodecPGXTest, Test8bits) {
-  std::string pgx = "PG ML + 8 2 3\npixels";
-
-  PackedPixelFile ppf;
-  ThreadPool* pool = nullptr;
-
-  EXPECT_TRUE(DecodeImagePGX(MakeSpan(pgx.c_str()), ColorHints(), &ppf));
-  CodecInOut io{jxl::test::MemoryManager()};
-  EXPECT_TRUE(ConvertPackedPixelFileToCodecInOut(ppf, pool, &io));
-
-  ScaleImage(255.f, io.Main().color());
-
-  EXPECT_FALSE(io.metadata.m.bit_depth.floating_point_sample);
-  EXPECT_EQ(8u, io.metadata.m.bit_depth.bits_per_sample);
-  EXPECT_TRUE(io.metadata.m.color_encoding.IsGray());
-  EXPECT_EQ(2u, io.xsize());
-  EXPECT_EQ(3u, io.ysize());
-
-  float eps = 1e-5;
-  EXPECT_NEAR('p', io.Main().color()->Plane(0).Row(0)[0], eps);
-  EXPECT_NEAR('i', io.Main().color()->Plane(0).Row(0)[1], eps);
-  EXPECT_NEAR('x', io.Main().color()->Plane(0).Row(1)[0], eps);
-  EXPECT_NEAR('e', io.Main().color()->Plane(0).Row(1)[1], eps);
-  EXPECT_NEAR('l', io.Main().color()->Plane(0).Row(2)[0], eps);
-  EXPECT_NEAR('s', io.Main().color()->Plane(0).Row(2)[1], eps);
-}
-
-TEST(CodecPGXTest, Test16bits) {
-  std::string pgx = "PG ML + 16 2 3\np_i_x_e_l_s_";
-
-  PackedPixelFile ppf;
-  ThreadPool* pool = nullptr;
-
-  EXPECT_TRUE(DecodeImagePGX(MakeSpan(pgx.c_str()), ColorHints(), &ppf));
-  CodecInOut io{jxl::test::MemoryManager()};
-  EXPECT_TRUE(ConvertPackedPixelFileToCodecInOut(ppf, pool, &io));
-
-  ScaleImage(255.f, io.Main().color());
-
-  EXPECT_FALSE(io.metadata.m.bit_depth.floating_point_sample);
-  EXPECT_EQ(16u, io.metadata.m.bit_depth.bits_per_sample);
-  EXPECT_TRUE(io.metadata.m.color_encoding.IsGray());
-  EXPECT_EQ(2u, io.xsize());
-  EXPECT_EQ(3u, io.ysize());
-
-  // Comparing ~16-bit numbers in floats, only ~7 bits left.
-  float eps = 1e-3;
-  const auto& plane = io.Main().color()->Plane(0);
-  EXPECT_NEAR(256.0f * 'p' + '_', plane.Row(0)[0] * 257, eps);
-  EXPECT_NEAR(256.0f * 'i' + '_', plane.Row(0)[1] * 257, eps);
-  EXPECT_NEAR(256.0f * 'x' + '_', plane.Row(1)[0] * 257, eps);
-  EXPECT_NEAR(256.0f * 'e' + '_', plane.Row(1)[1] * 257, eps);
-  EXPECT_NEAR(256.0f * 'l' + '_', plane.Row(2)[0] * 257, eps);
-  EXPECT_NEAR(256.0f * 's' + '_', plane.Row(2)[1] * 257, eps);
-}
-
-}  // namespace
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/dec/pnm.cc b/third_party/jpeg-xl/lib/extras/dec/pnm.cc
deleted file mode 100644
index 587cd189a9d04..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/pnm.cc
+++ /dev/null
@@ -1,571 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/dec/pnm.h"
-
-#include <jxl/encode.h>
-
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
-
-#include "lib/extras/size_constraints.h"
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/base/c_callback_support.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-namespace extras {
-namespace {
-
-class Parser {
- public:
-  explicit Parser(const Span<const uint8_t> bytes)
-      : pos_(bytes.data()), end_(pos_ + bytes.size()) {}
-
-  // Sets "pos" to the first non-header byte/pixel on success.
-  Status ParseHeader(HeaderPNM* header, const uint8_t** pos) {
-    // codec.cc ensures we have at least two bytes => no range check here.
-    if (pos_[0] != 'P') return false;
-    const uint8_t type = pos_[1];
-    pos_ += 2;
-
-    switch (type) {
-      case '4':
-        return JXL_FAILURE("pbm not supported");
-
-      case '5':
-        header->is_gray = true;
-        return ParseHeaderPNM(header, pos);
-
-      case '6':
-        header->is_gray = false;
-        return ParseHeaderPNM(header, pos);
-
-      case '7':
-        return ParseHeaderPAM(header, pos);
-
-      case 'F':
-        header->is_gray = false;
-        return ParseHeaderPFM(header, pos);
-
-      case 'f':
-        header->is_gray = true;
-        return ParseHeaderPFM(header, pos);
-
-      default:
-        return false;
-    }
-  }
-
-  // Exposed for testing
-  Status ParseUnsigned(size_t* number) {
-    if (pos_ == end_) return JXL_FAILURE("PNM: reached end before number");
-    if (!IsDigit(*pos_)) return JXL_FAILURE("PNM: expected unsigned number");
-
-    *number = 0;
-    while (pos_ < end_ && *pos_ >= '0' && *pos_ <= '9') {
-      *number *= 10;
-      *number += *pos_ - '0';
-      ++pos_;
-    }
-
-    return true;
-  }
-
-  Status ParseSigned(double* number) {
-    if (pos_ == end_) return JXL_FAILURE("PNM: reached end before signed");
-
-    if (*pos_ != '-' && *pos_ != '+' && !IsDigit(*pos_)) {
-      return JXL_FAILURE("PNM: expected signed number");
-    }
-
-    // Skip sign
-    const bool is_neg = *pos_ == '-';
-    if (is_neg || *pos_ == '+') {
-      ++pos_;
-      if (pos_ == end_) return JXL_FAILURE("PNM: reached end before digits");
-    }
-
-    // Leading digits
-    *number = 0.0;
-    while (pos_ < end_ && *pos_ >= '0' && *pos_ <= '9') {
-      *number *= 10;
-      *number += *pos_ - '0';
-      ++pos_;
-    }
-
-    // Decimal places?
-    if (pos_ < end_ && *pos_ == '.') {
-      ++pos_;
-      double place = 0.1;
-      while (pos_ < end_ && *pos_ >= '0' && *pos_ <= '9') {
-        *number += (*pos_ - '0') * place;
-        place *= 0.1;
-        ++pos_;
-      }
-    }
-
-    if (is_neg) *number = -*number;
-    return true;
-  }
-
- private:
-  static bool IsDigit(const uint8_t c) { return '0' <= c && c <= '9'; }
-  static bool IsLineBreak(const uint8_t c) { return c == '\r' || c == '\n'; }
-  static bool IsWhitespace(const uint8_t c) {
-    return IsLineBreak(c) || c == '\t' || c == ' ';
-  }
-
-  Status SkipBlank() {
-    if (pos_ == end_) return JXL_FAILURE("PNM: reached end before blank");
-    const uint8_t c = *pos_;
-    if (c != ' ' && c != '\n') return JXL_FAILURE("PNM: expected blank");
-    ++pos_;
-    return true;
-  }
-
-  Status SkipSingleWhitespace() {
-    if (pos_ == end_) return JXL_FAILURE("PNM: reached end before whitespace");
-    if (!IsWhitespace(*pos_)) return JXL_FAILURE("PNM: expected whitespace");
-    ++pos_;
-    return true;
-  }
-
-  Status SkipWhitespace() {
-    if (pos_ == end_) return JXL_FAILURE("PNM: reached end before whitespace");
-    if (!IsWhitespace(*pos_) && *pos_ != '#') {
-      return JXL_FAILURE("PNM: expected whitespace/comment");
-    }
-
-    while (pos_ < end_ && IsWhitespace(*pos_)) {
-      ++pos_;
-    }
-
-    // Comment(s)
-    while (pos_ != end_ && *pos_ == '#') {
-      while (pos_ != end_ && !IsLineBreak(*pos_)) {
-        ++pos_;
-      }
-      // Newline(s)
-      while (pos_ != end_ && IsLineBreak(*pos_)) pos_++;
-    }
-
-    while (pos_ < end_ && IsWhitespace(*pos_)) {
-      ++pos_;
-    }
-    return true;
-  }
-
-  Status MatchString(const char* keyword, bool skipws = true) {
-    const uint8_t* ppos = pos_;
-    const uint8_t* kw = reinterpret_cast<const uint8_t*>(keyword);
-    while (*kw) {
-      if (ppos >= end_) return JXL_FAILURE("PAM: unexpected end of input");
-      if (*kw != *ppos) return false;
-      ppos++;
-      kw++;
-    }
-    pos_ = ppos;
-    if (skipws) {
-      JXL_RETURN_IF_ERROR(SkipWhitespace());
-    } else {
-      JXL_RETURN_IF_ERROR(SkipSingleWhitespace());
-    }
-    return true;
-  }
-
-  Status ParseHeaderPAM(HeaderPNM* header, const uint8_t** pos) {
-    size_t depth = 3;
-    size_t max_val = 255;
-    JXL_RETURN_IF_ERROR(SkipWhitespace());
-    while (!MatchString("ENDHDR", /*skipws=*/false)) {
-      if (MatchString("WIDTH")) {
-        JXL_RETURN_IF_ERROR(ParseUnsigned(&header->xsize));
-        JXL_RETURN_IF_ERROR(SkipWhitespace());
-      } else if (MatchString("HEIGHT")) {
-        JXL_RETURN_IF_ERROR(ParseUnsigned(&header->ysize));
-        JXL_RETURN_IF_ERROR(SkipWhitespace());
-      } else if (MatchString("DEPTH")) {
-        JXL_RETURN_IF_ERROR(ParseUnsigned(&depth));
-        JXL_RETURN_IF_ERROR(SkipWhitespace());
-      } else if (MatchString("MAXVAL")) {
-        JXL_RETURN_IF_ERROR(ParseUnsigned(&max_val));
-        JXL_RETURN_IF_ERROR(SkipWhitespace());
-      } else if (MatchString("TUPLTYPE")) {
-        if (MatchString("RGB_ALPHA")) {
-          header->has_alpha = true;
-        } else if (MatchString("RGB")) {
-        } else if (MatchString("GRAYSCALE_ALPHA")) {
-          header->has_alpha = true;
-          header->is_gray = true;
-        } else if (MatchString("GRAYSCALE")) {
-          header->is_gray = true;
-        } else if (MatchString("BLACKANDWHITE_ALPHA")) {
-          header->has_alpha = true;
-          header->is_gray = true;
-          max_val = 1;
-        } else if (MatchString("BLACKANDWHITE")) {
-          header->is_gray = true;
-          max_val = 1;
-        } else if (MatchString("Alpha")) {
-          header->ec_types.push_back(JXL_CHANNEL_ALPHA);
-        } else if (MatchString("Depth")) {
-          header->ec_types.push_back(JXL_CHANNEL_DEPTH);
-        } else if (MatchString("SpotColor")) {
-          header->ec_types.push_back(JXL_CHANNEL_SPOT_COLOR);
-        } else if (MatchString("SelectionMask")) {
-          header->ec_types.push_back(JXL_CHANNEL_SELECTION_MASK);
-        } else if (MatchString("Black")) {
-          header->ec_types.push_back(JXL_CHANNEL_BLACK);
-        } else if (MatchString("CFA")) {
-          header->ec_types.push_back(JXL_CHANNEL_CFA);
-        } else if (MatchString("Thermal")) {
-          header->ec_types.push_back(JXL_CHANNEL_THERMAL);
-        } else if (MatchString("Unknown")) {
-          header->ec_types.push_back(JXL_CHANNEL_UNKNOWN);
-        } else if (MatchString("Optional")) {
-          header->ec_types.push_back(JXL_CHANNEL_OPTIONAL);
-        } else {
-          return JXL_FAILURE("PAM: unknown TUPLTYPE");
-        }
-      } else {
-        constexpr size_t kMaxHeaderLength = 20;
-        char unknown_header[kMaxHeaderLength + 1];
-        size_t len = std::min<size_t>(kMaxHeaderLength, end_ - pos_);
-        strncpy(unknown_header, reinterpret_cast<const char*>(pos_), len);
-        unknown_header[len] = 0;
-        return JXL_FAILURE("PAM: unknown header keyword: %s", unknown_header);
-      }
-    }
-    size_t num_channels = header->is_gray ? 1 : 3;
-    if (header->has_alpha) num_channels++;
-    if (num_channels + header->ec_types.size() != depth) {
-      return JXL_FAILURE("PAM: bad DEPTH");
-    }
-    if (max_val == 0 || max_val >= 65536) {
-      return JXL_FAILURE("PAM: bad MAXVAL");
-    }
-    // e.g. When `max_val` is 1 , we want 1 bit:
-    header->bits_per_sample = FloorLog2Nonzero(max_val) + 1;
-    if ((1u << header->bits_per_sample) - 1 != max_val)
-      return JXL_FAILURE("PNM: unsupported MaxVal (expected 2^n - 1)");
-    // PAM does not pack bits as in PBM.
-
-    header->floating_point = false;
-    header->big_endian = true;
-    *pos = pos_;
-    return true;
-  }
-
-  Status ParseHeaderPNM(HeaderPNM* header, const uint8_t** pos) {
-    JXL_RETURN_IF_ERROR(SkipWhitespace());
-    JXL_RETURN_IF_ERROR(ParseUnsigned(&header->xsize));
-
-    JXL_RETURN_IF_ERROR(SkipWhitespace());
-    JXL_RETURN_IF_ERROR(ParseUnsigned(&header->ysize));
-
-    JXL_RETURN_IF_ERROR(SkipWhitespace());
-    size_t max_val;
-    JXL_RETURN_IF_ERROR(ParseUnsigned(&max_val));
-    if (max_val == 0 || max_val >= 65536) {
-      return JXL_FAILURE("PNM: bad MaxVal");
-    }
-    header->bits_per_sample = FloorLog2Nonzero(max_val) + 1;
-    if ((1u << header->bits_per_sample) - 1 != max_val)
-      return JXL_FAILURE("PNM: unsupported MaxVal (expected 2^n - 1)");
-    header->floating_point = false;
-    header->big_endian = true;
-
-    JXL_RETURN_IF_ERROR(SkipSingleWhitespace());
-
-    *pos = pos_;
-    return true;
-  }
-
-  Status ParseHeaderPFM(HeaderPNM* header, const uint8_t** pos) {
-    JXL_RETURN_IF_ERROR(SkipSingleWhitespace());
-    JXL_RETURN_IF_ERROR(ParseUnsigned(&header->xsize));
-
-    JXL_RETURN_IF_ERROR(SkipBlank());
-    JXL_RETURN_IF_ERROR(ParseUnsigned(&header->ysize));
-
-    JXL_RETURN_IF_ERROR(SkipSingleWhitespace());
-    // The scale has no meaning as multiplier, only its sign is used to
-    // indicate endianness. All software expects nominal range 0..1.
-    double scale;
-    JXL_RETURN_IF_ERROR(ParseSigned(&scale));
-    if (scale == 0.0) {
-      return JXL_FAILURE("PFM: bad scale factor value.");
-    } else if (std::abs(scale) != 1.0) {
-      JXL_WARNING("PFM: Discarding non-unit scale factor");
-    }
-    header->big_endian = scale > 0.0;
-    header->bits_per_sample = 32;
-    header->floating_point = true;
-
-    JXL_RETURN_IF_ERROR(SkipSingleWhitespace());
-
-    *pos = pos_;
-    return true;
-  }
-
-  const uint8_t* pos_;
-  const uint8_t* const end_;
-};
-
-}  // namespace
-
-struct PNMChunkedInputFrame {
-  JxlChunkedFrameInputSource operator()() {
-    return JxlChunkedFrameInputSource{
-        this,
-        METHOD_TO_C_CALLBACK(
-            &PNMChunkedInputFrame::GetColorChannelsPixelFormat),
-        METHOD_TO_C_CALLBACK(&PNMChunkedInputFrame::GetColorChannelDataAt),
-        METHOD_TO_C_CALLBACK(&PNMChunkedInputFrame::GetExtraChannelPixelFormat),
-        METHOD_TO_C_CALLBACK(&PNMChunkedInputFrame::GetExtraChannelDataAt),
-        METHOD_TO_C_CALLBACK(&PNMChunkedInputFrame::ReleaseCurrentData)};
-  }
-
-  void /* NOLINT */ GetColorChannelsPixelFormat(JxlPixelFormat* pixel_format) {
-    *pixel_format = format;
-  }
-
-  const void* GetColorChannelDataAt(size_t xpos, size_t ypos, size_t xsize,
-                                    size_t ysize, size_t* row_offset) {
-    const size_t bytes_per_channel =
-        DivCeil(dec->header_.bits_per_sample, jxl::kBitsPerByte);
-    const size_t num_channels = dec->header_.is_gray ? 1 : 3;
-    const size_t bytes_per_pixel = num_channels * bytes_per_channel;
-    *row_offset = dec->header_.xsize * bytes_per_pixel;
-    const size_t offset = ypos * *row_offset + xpos * bytes_per_pixel;
-    return dec->pnm_.data() + offset + dec->data_start_;
-  }
-
-  void GetExtraChannelPixelFormat(size_t ec_index,
-                                  JxlPixelFormat* pixel_format) {
-    (void)this;
-    *pixel_format = {};
-    JXL_DEBUG_ABORT("Not implemented");
-  }
-
-  const void* GetExtraChannelDataAt(size_t ec_index, size_t xpos, size_t ypos,
-                                    size_t xsize, size_t ysize,
-                                    size_t* row_offset) {
-    (void)this;
-    *row_offset = 0;
-    JXL_DEBUG_ABORT("Not implemented");
-    return nullptr;
-  }
-
-  void ReleaseCurrentData(const void* buffer) {}
-
-  JxlPixelFormat format;
-  const ChunkedPNMDecoder* dec;
-};
-
-StatusOr<ChunkedPNMDecoder> ChunkedPNMDecoder::Init(const char* path) {
-  ChunkedPNMDecoder dec;
-  JXL_ASSIGN_OR_RETURN(dec.pnm_, MemoryMappedFile::Init(path));
-  size_t size = dec.pnm_.size();
-  if (size < 2) return JXL_FAILURE("Invalid ppm");
-  size_t hdr_buf = std::min<size_t>(size, 10 * 1024);
-  Span<const uint8_t> span(dec.pnm_.data(), hdr_buf);
-  Parser parser(span);
-  HeaderPNM& header = dec.header_;
-  const uint8_t* pos = nullptr;
-  if (!parser.ParseHeader(&header, &pos)) {
-    return StatusCode::kGenericError;
-  }
-  dec.data_start_ = pos - span.data();
-
-  if (header.bits_per_sample == 0 || header.bits_per_sample > 16) {
-    return JXL_FAILURE("Invalid bits_per_sample");
-  }
-  if (header.has_alpha || !header.ec_types.empty() || header.floating_point) {
-    return JXL_FAILURE("Only PGM and PPM inputs are supported");
-  }
-
-  const size_t bytes_per_channel =
-      DivCeil(dec.header_.bits_per_sample, jxl::kBitsPerByte);
-  const size_t num_channels = dec.header_.is_gray ? 1 : 3;
-  const size_t bytes_per_pixel = num_channels * bytes_per_channel;
-  size_t row_size = dec.header_.xsize * bytes_per_pixel;
-  if (size < header.ysize * row_size + dec.data_start_) {
-    return JXL_FAILURE("PNM file too small");
-  }
-  return dec;
-}
-
-jxl::Status ChunkedPNMDecoder::InitializePPF(const ColorHints& color_hints,
-                                             PackedPixelFile* ppf) {
-  // PPM specifies that in the raster, the sample values are "nonlinear"
-  // (BP.709, with gamma number of 2.2). Deviate from the specification and
-  // assume `sRGB` in our implementation.
-  JXL_RETURN_IF_ERROR(ApplyColorHints(color_hints, /*color_already_set=*/false,
-                                      header_.is_gray, ppf));
-
-  ppf->info.xsize = header_.xsize;
-  ppf->info.ysize = header_.ysize;
-  ppf->info.bits_per_sample = header_.bits_per_sample;
-  ppf->info.exponent_bits_per_sample = 0;
-  ppf->info.orientation = JXL_ORIENT_IDENTITY;
-  ppf->info.alpha_bits = 0;
-  ppf->info.alpha_exponent_bits = 0;
-  ppf->info.num_color_channels = (header_.is_gray ? 1 : 3);
-  ppf->info.num_extra_channels = 0;
-
-  const JxlDataType data_type =
-      header_.bits_per_sample > 8 ? JXL_TYPE_UINT16 : JXL_TYPE_UINT8;
-  const JxlPixelFormat format{
-      /*num_channels=*/ppf->info.num_color_channels,
-      /*data_type=*/data_type,
-      /*endianness=*/header_.big_endian ? JXL_BIG_ENDIAN : JXL_LITTLE_ENDIAN,
-      /*align=*/0,
-  };
-
-  PNMChunkedInputFrame frame;
-  frame.format = format;
-  frame.dec = this;
-  ppf->chunked_frames.emplace_back(header_.xsize, header_.ysize, frame);
-  return true;
-}
-
-Status DecodeImagePNM(const Span<const uint8_t> bytes,
-                      const ColorHints& color_hints, PackedPixelFile* ppf,
-                      const SizeConstraints* constraints) {
-  Parser parser(bytes);
-  HeaderPNM header = {};
-  const uint8_t* pos = nullptr;
-  if (!parser.ParseHeader(&header, &pos)) return false;
-  JXL_RETURN_IF_ERROR(
-      VerifyDimensions(constraints, header.xsize, header.ysize));
-
-  if (header.bits_per_sample == 0 || header.bits_per_sample > 32) {
-    return JXL_FAILURE("PNM: bits_per_sample invalid");
-  }
-
-  // PPM specifies that in the raster, the sample values are "nonlinear"
-  // (BP.709, with gamma number of 2.2). Deviate from the specification and
-  // assume `sRGB` in our implementation.
-  JXL_RETURN_IF_ERROR(ApplyColorHints(color_hints, /*color_already_set=*/false,
-                                      header.is_gray, ppf));
-
-  ppf->info.xsize = header.xsize;
-  ppf->info.ysize = header.ysize;
-  if (header.floating_point) {
-    ppf->info.bits_per_sample = 32;
-    ppf->info.exponent_bits_per_sample = 8;
-  } else {
-    ppf->info.bits_per_sample = header.bits_per_sample;
-    ppf->info.exponent_bits_per_sample = 0;
-  }
-
-  ppf->info.orientation = JXL_ORIENT_IDENTITY;
-
-  // No alpha in PNM and PFM
-  ppf->info.alpha_bits = (header.has_alpha ? ppf->info.bits_per_sample : 0);
-  ppf->info.alpha_exponent_bits = 0;
-  ppf->info.num_color_channels = (header.is_gray ? 1 : 3);
-  uint32_t num_alpha_channels = (header.has_alpha ? 1 : 0);
-  uint32_t num_interleaved_channels =
-      ppf->info.num_color_channels + num_alpha_channels;
-  ppf->info.num_extra_channels = num_alpha_channels + header.ec_types.size();
-
-  for (auto type : header.ec_types) {
-    PackedExtraChannel pec = {};
-    pec.ec_info.bits_per_sample = ppf->info.bits_per_sample;
-    pec.ec_info.type = type;
-    ppf->extra_channels_info.emplace_back(std::move(pec));
-  }
-
-  JxlDataType data_type;
-  if (header.floating_point) {
-    // There's no float16 pnm version.
-    data_type = JXL_TYPE_FLOAT;
-  } else {
-    if (header.bits_per_sample > 8) {
-      data_type = JXL_TYPE_UINT16;
-    } else {
-      data_type = JXL_TYPE_UINT8;
-    }
-  }
-
-  const JxlPixelFormat format{
-      /*num_channels=*/num_interleaved_channels,
-      /*data_type=*/data_type,
-      /*endianness=*/header.big_endian ? JXL_BIG_ENDIAN : JXL_LITTLE_ENDIAN,
-      /*align=*/0,
-  };
-  const JxlPixelFormat ec_format{1, format.data_type, format.endianness, 0};
-  ppf->frames.clear();
-  {
-    JXL_ASSIGN_OR_RETURN(
-        PackedFrame frame,
-        PackedFrame::Create(header.xsize, header.ysize, format));
-    ppf->frames.emplace_back(std::move(frame));
-  }
-  auto* frame = &ppf->frames.back();
-  for (size_t i = 0; i < header.ec_types.size(); ++i) {
-    JXL_ASSIGN_OR_RETURN(
-        PackedImage ec,
-        PackedImage::Create(header.xsize, header.ysize, ec_format));
-    frame->extra_channels.emplace_back(std::move(ec));
-  }
-  size_t pnm_remaining_size = bytes.data() + bytes.size() - pos;
-  if (pnm_remaining_size < frame->color.pixels_size) {
-    return JXL_FAILURE("PNM file too small");
-  }
-
-  uint8_t* out = reinterpret_cast<uint8_t*>(frame->color.pixels());
-  std::vector<uint8_t*> ec_out(header.ec_types.size());
-  for (size_t i = 0; i < ec_out.size(); ++i) {
-    ec_out[i] = reinterpret_cast<uint8_t*>(frame->extra_channels[i].pixels());
-  }
-  if (ec_out.empty()) {
-    const bool flipped_y = header.bits_per_sample == 32;  // PFMs are flipped
-    for (size_t y = 0; y < header.ysize; ++y) {
-      size_t y_in = flipped_y ? header.ysize - 1 - y : y;
-      const uint8_t* row_in = &pos[y_in * frame->color.stride];
-      uint8_t* row_out = &out[y * frame->color.stride];
-      memcpy(row_out, row_in, frame->color.stride);
-    }
-  } else {
-    JXL_RETURN_IF_ERROR(PackedImage::ValidateDataType(data_type));
-    size_t pwidth = PackedImage::BitsPerChannel(data_type) / 8;
-    for (size_t y = 0; y < header.ysize; ++y) {
-      for (size_t x = 0; x < header.xsize; ++x) {
-        memcpy(out, pos, frame->color.pixel_stride());
-        out += frame->color.pixel_stride();
-        pos += frame->color.pixel_stride();
-        for (auto& p : ec_out) {
-          memcpy(p, pos, pwidth);
-          pos += pwidth;
-          p += pwidth;
-        }
-      }
-    }
-  }
-  if (ppf->info.exponent_bits_per_sample == 0) {
-    ppf->input_bitdepth.type = JXL_BIT_DEPTH_FROM_CODESTREAM;
-  }
-  return true;
-}
-
-// Exposed for testing.
-Status PnmParseSigned(Bytes str, double* v) {
-  return Parser(str).ParseSigned(v);
-}
-
-Status PnmParseUnsigned(Bytes str, size_t* v) {
-  return Parser(str).ParseUnsigned(v);
-}
-
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/dec/pnm.h b/third_party/jpeg-xl/lib/extras/dec/pnm.h
deleted file mode 100644
index a6ad14fdc8f6b..0000000000000
--- a/third_party/jpeg-xl/lib/extras/dec/pnm.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_DEC_PNM_H_
-#define LIB_EXTRAS_DEC_PNM_H_
-
-// Decodes PBM/PGM/PPM/PFM pixels in memory.
-
-#include <stddef.h>
-#include <stdint.h>
-
-// TODO(janwas): workaround for incorrect Win64 codegen (cause unknown)
-#include <hwy/highway.h>
-
-#include "lib/extras/dec/color_hints.h"
-#include "lib/extras/mmap.h"
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-struct SizeConstraints;
-
-namespace extras {
-
-// Decodes `bytes` into `ppf`. color_hints may specify "color_space", which
-// defaults to sRGB.
-Status DecodeImagePNM(Span<const uint8_t> bytes, const ColorHints& color_hints,
-                      PackedPixelFile* ppf,
-                      const SizeConstraints* constraints = nullptr);
-
-struct HeaderPNM {
-  size_t xsize;
-  size_t ysize;
-  bool is_gray;    // PGM
-  bool has_alpha;  // PAM
-  size_t bits_per_sample;
-  bool floating_point;
-  bool big_endian;
-  std::vector<JxlExtraChannelType> ec_types;  // PAM
-};
-
-class ChunkedPNMDecoder {
- public:
-  static StatusOr<ChunkedPNMDecoder> Init(const char* file_path);
-  // Initializes `ppf` with a pointer to this `ChunkedPNMDecoder`.
-  jxl::Status InitializePPF(const ColorHints& color_hints,
-                            PackedPixelFile* ppf);
-
- private:
-  HeaderPNM header_ = {};
-  size_t data_start_ = 0;
-  MemoryMappedFile pnm_;
-
-  friend struct PNMChunkedInputFrame;
-};
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_DEC_PNM_H_
diff --git a/third_party/jpeg-xl/lib/extras/enc/apng.cc b/third_party/jpeg-xl/lib/extras/enc/apng.cc
deleted file mode 100644
index 4d3ce8c17ab5c..0000000000000
--- a/third_party/jpeg-xl/lib/extras/enc/apng.cc
+++ /dev/null
@@ -1,510 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/enc/apng.h"
-
-// Parts of this code are taken from apngdis, which has the following license:
-/* APNG Disassembler 2.8
- *
- * Deconstructs APNG files into individual frames.
- *
- * http://apngdis.sourceforge.net
- *
- * Copyright (c) 2010-2015 Max Stepin
- * maxst at users.sourceforge.net
- *
- * zlib license
- * ------------
- *
- * This software is provided 'as-is', without any express or implied
- * warranty.  In no event will the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- *    claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- *
- */
-
-#include <cstring>
-#include <string>
-#include <vector>
-
-#include "lib/extras/exif.h"
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/printf_macros.h"
-#if JPEGXL_ENABLE_APNG
-#include "png.h" /* original (unpatched) libpng is ok */
-#endif
-
-namespace jxl {
-namespace extras {
-
-#if JPEGXL_ENABLE_APNG
-namespace {
-
-constexpr unsigned char kExifSignature[6] = {0x45, 0x78, 0x69,
-                                             0x66, 0x00, 0x00};
-
-class APNGEncoder : public Encoder {
- public:
-  std::vector<JxlPixelFormat> AcceptedFormats() const override {
-    std::vector<JxlPixelFormat> formats;
-    for (const uint32_t num_channels : {1, 2, 3, 4}) {
-      for (const JxlDataType data_type :
-           {JXL_TYPE_UINT8, JXL_TYPE_UINT16, JXL_TYPE_FLOAT}) {
-        for (JxlEndianness endianness : {JXL_BIG_ENDIAN, JXL_LITTLE_ENDIAN}) {
-          formats.push_back(
-              JxlPixelFormat{num_channels, data_type, endianness, /*align=*/0});
-        }
-      }
-    }
-    return formats;
-  }
-  Status Encode(const PackedPixelFile& ppf, EncodedImage* encoded_image,
-                ThreadPool* pool) const override {
-    // Encode main image frames
-    JXL_RETURN_IF_ERROR(VerifyBasicInfo(ppf.info));
-    encoded_image->icc.clear();
-    encoded_image->bitstreams.resize(1);
-    JXL_RETURN_IF_ERROR(EncodePackedPixelFileToAPNG(
-        ppf, pool, &encoded_image->bitstreams.front()));
-
-    // Encode extra channels
-    for (size_t i = 0; i < ppf.extra_channels_info.size(); ++i) {
-      encoded_image->extra_channel_bitstreams.emplace_back();
-      auto& ec_bitstreams = encoded_image->extra_channel_bitstreams.back();
-      ec_bitstreams.emplace_back();
-      JXL_RETURN_IF_ERROR(EncodePackedPixelFileToAPNG(
-          ppf, pool, &ec_bitstreams.back(), true, i));
-    }
-    return true;
-  }
-
- private:
-  Status EncodePackedPixelFileToAPNG(const PackedPixelFile& ppf,
-                                     ThreadPool* pool,
-                                     std::vector<uint8_t>* bytes,
-                                     bool encode_extra_channels = false,
-                                     size_t extra_channel_index = 0) const;
-};
-
-void PngWrite(png_structp png_ptr, png_bytep data, png_size_t length) {
-  std::vector<uint8_t>* bytes =
-      static_cast<std::vector<uint8_t>*>(png_get_io_ptr(png_ptr));
-  bytes->insert(bytes->end(), data, data + length);
-}
-
-// Stores XMP and EXIF/IPTC into key/value strings for PNG
-class BlobsWriterPNG {
- public:
-  static Status Encode(const PackedMetadata& blobs,
-                       std::vector<std::string>* strings) {
-    if (!blobs.exif.empty()) {
-      // PNG viewers typically ignore Exif orientation but not all of them do
-      // (and e.g. cjxl doesn't), so we overwrite the Exif orientation to the
-      // identity to avoid repeated orientation.
-      std::vector<uint8_t> exif = blobs.exif;
-      ResetExifOrientation(exif);
-      // By convention, the data is prefixed with "Exif\0\0" when stored in
-      // the legacy (and non-standard) "Raw profile type exif" text chunk
-      // currently used here.
-      // TODO(user): Store Exif data in an eXIf chunk instead, which always
-      //             begins with the TIFF header.
-      if (exif.size() >= sizeof kExifSignature &&
-          memcmp(exif.data(), kExifSignature, sizeof kExifSignature) != 0) {
-        exif.insert(exif.begin(), kExifSignature,
-                    kExifSignature + sizeof kExifSignature);
-      }
-      JXL_RETURN_IF_ERROR(EncodeBase16("exif", exif, strings));
-    }
-    if (!blobs.iptc.empty()) {
-      JXL_RETURN_IF_ERROR(EncodeBase16("iptc", blobs.iptc, strings));
-    }
-    if (!blobs.xmp.empty()) {
-      // TODO(user): Store XMP data in an "XML:com.adobe.xmp" text chunk
-      //             instead.
-      JXL_RETURN_IF_ERROR(EncodeBase16("xmp", blobs.xmp, strings));
-    }
-    return true;
-  }
-
- private:
-  // TODO(eustas): use array
-  static JXL_INLINE char EncodeNibble(const uint8_t nibble) {
-    if (nibble < 16) {
-      return (nibble < 10) ? '0' + nibble : 'a' + nibble - 10;
-    } else {
-      JXL_DEBUG_ABORT("Internal logic error");
-      return 0;
-    }
-  }
-
-  static Status EncodeBase16(const std::string& type,
-                             const std::vector<uint8_t>& bytes,
-                             std::vector<std::string>* strings) {
-    // Encoding: base16 with newline after 72 chars.
-    const size_t base16_size =
-        2 * bytes.size() + DivCeil(bytes.size(), static_cast<size_t>(36)) + 1;
-    std::string base16;
-    base16.reserve(base16_size);
-    for (size_t i = 0; i < bytes.size(); ++i) {
-      if (i % 36 == 0) base16.push_back('\n');
-      base16.push_back(EncodeNibble(bytes[i] >> 4));
-      base16.push_back(EncodeNibble(bytes[i] & 0x0F));
-    }
-    base16.push_back('\n');
-    JXL_ENSURE(base16.length() == base16_size);
-
-    char key[30];
-    snprintf(key, sizeof(key), "Raw profile type %s", type.c_str());
-
-    char header[30];
-    snprintf(header, sizeof(header), "\n%s\n%8" PRIuS, type.c_str(),
-             bytes.size());
-
-    strings->emplace_back(key);
-    strings->push_back(std::string(header) + base16);
-    return true;
-  }
-};
-
-void MaybeAddCICP(const JxlColorEncoding& c_enc, png_structp png_ptr,
-                  png_infop info_ptr) {
-  png_byte cicp_data[4] = {};
-  png_unknown_chunk cicp_chunk;
-  if (c_enc.color_space != JXL_COLOR_SPACE_RGB) {
-    return;
-  }
-  if (c_enc.primaries == JXL_PRIMARIES_P3) {
-    if (c_enc.white_point == JXL_WHITE_POINT_D65) {
-      cicp_data[0] = 12;
-    } else if (c_enc.white_point == JXL_WHITE_POINT_DCI) {
-      cicp_data[0] = 11;
-    } else {
-      return;
-    }
-  } else if (c_enc.primaries != JXL_PRIMARIES_CUSTOM &&
-             c_enc.white_point == JXL_WHITE_POINT_D65) {
-    cicp_data[0] = static_cast<png_byte>(c_enc.primaries);
-  } else {
-    return;
-  }
-  if (c_enc.transfer_function == JXL_TRANSFER_FUNCTION_UNKNOWN ||
-      c_enc.transfer_function == JXL_TRANSFER_FUNCTION_GAMMA) {
-    return;
-  }
-  cicp_data[1] = static_cast<png_byte>(c_enc.transfer_function);
-  cicp_data[2] = 0;
-  cicp_data[3] = 1;
-  cicp_chunk.data = cicp_data;
-  cicp_chunk.size = sizeof(cicp_data);
-  cicp_chunk.location = PNG_HAVE_IHDR;
-  memcpy(cicp_chunk.name, "cICP", 5);
-  png_set_keep_unknown_chunks(png_ptr, PNG_HANDLE_CHUNK_ALWAYS,
-                              reinterpret_cast<const png_byte*>("cICP"), 1);
-  png_set_unknown_chunks(png_ptr, info_ptr, &cicp_chunk, 1);
-}
-
-bool MaybeAddSRGB(const JxlColorEncoding& c_enc, png_structp png_ptr,
-                  png_infop info_ptr) {
-  if (c_enc.transfer_function == JXL_TRANSFER_FUNCTION_SRGB &&
-      (c_enc.color_space == JXL_COLOR_SPACE_GRAY ||
-       (c_enc.color_space == JXL_COLOR_SPACE_RGB &&
-        c_enc.primaries == JXL_PRIMARIES_SRGB &&
-        c_enc.white_point == JXL_WHITE_POINT_D65))) {
-    png_set_sRGB(png_ptr, info_ptr, c_enc.rendering_intent);
-    png_set_cHRM_fixed(png_ptr, info_ptr, 31270, 32900, 64000, 33000, 30000,
-                       60000, 15000, 6000);
-    png_set_gAMA_fixed(png_ptr, info_ptr, 45455);
-    return true;
-  }
-  return false;
-}
-
-void MaybeAddCHRM(const JxlColorEncoding& c_enc, png_structp png_ptr,
-                  png_infop info_ptr) {
-  if (c_enc.color_space != JXL_COLOR_SPACE_RGB) return;
-  if (c_enc.primaries == 0) return;
-  png_set_cHRM(png_ptr, info_ptr, c_enc.white_point_xy[0],
-               c_enc.white_point_xy[1], c_enc.primaries_red_xy[0],
-               c_enc.primaries_red_xy[1], c_enc.primaries_green_xy[0],
-               c_enc.primaries_green_xy[1], c_enc.primaries_blue_xy[0],
-               c_enc.primaries_blue_xy[1]);
-}
-
-void MaybeAddGAMA(const JxlColorEncoding& c_enc, png_structp png_ptr,
-                  png_infop info_ptr) {
-  switch (c_enc.transfer_function) {
-    case JXL_TRANSFER_FUNCTION_LINEAR:
-      png_set_gAMA_fixed(png_ptr, info_ptr, PNG_FP_1);
-      break;
-    case JXL_TRANSFER_FUNCTION_SRGB:
-      png_set_gAMA_fixed(png_ptr, info_ptr, 45455);
-      break;
-    case JXL_TRANSFER_FUNCTION_GAMMA:
-      png_set_gAMA(png_ptr, info_ptr, c_enc.gamma);
-      break;
-
-    default:;
-      // No gAMA chunk.
-  }
-}
-
-void MaybeAddCLLi(const JxlColorEncoding& c_enc, const float intensity_target,
-                  png_structp png_ptr, png_infop info_ptr) {
-  if (c_enc.transfer_function != JXL_TRANSFER_FUNCTION_PQ) return;
-  if (intensity_target == 10'000) return;
-
-  const uint32_t max_content_light_level =
-      static_cast<uint32_t>(10'000.f * Clamp1(intensity_target, 0.f, 10'000.f));
-  png_byte chunk_data[8] = {};
-  png_save_uint_32(chunk_data, max_content_light_level);
-  // Leave MaxFALL set to 0.
-  png_unknown_chunk chunk;
-  memcpy(chunk.name, "cLLi", 5);
-  chunk.data = chunk_data;
-  chunk.size = sizeof chunk_data;
-  chunk.location = PNG_HAVE_IHDR;
-  png_set_keep_unknown_chunks(png_ptr, PNG_HANDLE_CHUNK_ALWAYS,
-                              reinterpret_cast<const png_byte*>("cLLi"), 1);
-  png_set_unknown_chunks(png_ptr, info_ptr, &chunk, 1);
-}
-
-Status APNGEncoder::EncodePackedPixelFileToAPNG(
-    const PackedPixelFile& ppf, ThreadPool* pool, std::vector<uint8_t>* bytes,
-    bool encode_extra_channels, size_t extra_channel_index) const {
-  JxlExtraChannelInfo ec_info{};
-  if (encode_extra_channels) {
-    if (ppf.extra_channels_info.size() <= extra_channel_index) {
-      return JXL_FAILURE("Invalid index for extra channel");
-    }
-    ec_info = ppf.extra_channels_info[extra_channel_index].ec_info;
-  }
-
-  bool has_alpha = !encode_extra_channels && (ppf.info.alpha_bits != 0);
-  bool is_gray = encode_extra_channels || (ppf.info.num_color_channels == 1);
-  size_t color_channels =
-      encode_extra_channels ? 1 : ppf.info.num_color_channels;
-  size_t num_channels = color_channels + (has_alpha ? 1 : 0);
-
-  if (!ppf.info.have_animation && ppf.frames.size() != 1) {
-    return JXL_FAILURE("Invalid number of frames");
-  }
-
-  size_t count = 0;
-  size_t anim_chunks = 0;
-
-  for (const auto& frame : ppf.frames) {
-    const PackedImage& color = encode_extra_channels
-                                   ? frame.extra_channels[extra_channel_index]
-                                   : frame.color;
-
-    size_t xsize = color.xsize;
-    size_t ysize = color.ysize;
-    size_t num_samples = num_channels * xsize * ysize;
-
-    uint32_t bits_per_sample = encode_extra_channels ? ec_info.bits_per_sample
-                                                     : ppf.info.bits_per_sample;
-    if (!encode_extra_channels) {
-      JXL_RETURN_IF_ERROR(VerifyPackedImage(color, ppf.info));
-    } else {
-      JXL_RETURN_IF_ERROR(VerifyFormat(color.format));
-      JXL_RETURN_IF_ERROR(VerifyBitDepth(color.format.data_type,
-                                         bits_per_sample,
-                                         ec_info.exponent_bits_per_sample));
-    }
-    const JxlPixelFormat format = color.format;
-    const uint8_t* in = reinterpret_cast<const uint8_t*>(color.pixels());
-    JXL_RETURN_IF_ERROR(PackedImage::ValidateDataType(format.data_type));
-    size_t data_bits_per_sample = PackedImage::BitsPerChannel(format.data_type);
-    size_t bytes_per_sample = data_bits_per_sample / 8;
-    size_t out_bytes_per_sample = bytes_per_sample > 1 ? 2 : 1;
-    size_t out_stride = xsize * num_channels * out_bytes_per_sample;
-    size_t out_size = ysize * out_stride;
-    std::vector<uint8_t> out(out_size);
-
-    if (format.data_type == JXL_TYPE_UINT8) {
-      if (bits_per_sample < 8) {
-        float mul = 255.0 / ((1u << bits_per_sample) - 1);
-        for (size_t i = 0; i < num_samples; ++i) {
-          out[i] = static_cast<uint8_t>(std::lroundf(in[i] * mul));
-        }
-      } else {
-        memcpy(out.data(), in, out_size);
-      }
-    } else if (format.data_type == JXL_TYPE_UINT16) {
-      if (bits_per_sample < 16 || format.endianness != JXL_BIG_ENDIAN) {
-        float mul = 65535.0 / ((1u << bits_per_sample) - 1);
-        const uint8_t* p_in = in;
-        uint8_t* p_out = out.data();
-        for (size_t i = 0; i < num_samples; ++i, p_in += 2, p_out += 2) {
-          uint32_t val = (format.endianness == JXL_BIG_ENDIAN ? LoadBE16(p_in)
-                                                              : LoadLE16(p_in));
-          StoreBE16(static_cast<uint32_t>(std::lroundf(val * mul)), p_out);
-        }
-      } else {
-        memcpy(out.data(), in, out_size);
-      }
-    } else if (format.data_type == JXL_TYPE_FLOAT) {
-      constexpr float kMul = 65535.0;
-      const uint8_t* p_in = in;
-      uint8_t* p_out = out.data();
-      for (size_t i = 0; i < num_samples;
-           ++i, p_in += sizeof(float), p_out += 2) {
-        float val =
-            Clamp1(format.endianness == JXL_BIG_ENDIAN ? LoadBEFloat(p_in)
-                   : format.endianness == JXL_LITTLE_ENDIAN
-                       ? LoadLEFloat(p_in)
-                       : *reinterpret_cast<const float*>(p_in),
-                   0.f, 1.f);
-        StoreBE16(static_cast<uint32_t>(std::lroundf(val * kMul)), p_out);
-      }
-    }
-    png_structp png_ptr;
-    png_infop info_ptr;
-
-    png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr,
-                                      nullptr);
-
-    if (!png_ptr) return JXL_FAILURE("Could not init png encoder");
-
-    info_ptr = png_create_info_struct(png_ptr);
-    if (!info_ptr) return JXL_FAILURE("Could not init png info struct");
-    png_set_compression_level(png_ptr, 1);
-
-    png_set_write_fn(png_ptr, bytes, PngWrite, nullptr);
-    png_set_flush(png_ptr, 0);
-
-    int width = xsize;
-    int height = ysize;
-
-    png_byte color_type = (is_gray ? PNG_COLOR_TYPE_GRAY : PNG_COLOR_TYPE_RGB);
-    if (has_alpha) color_type |= PNG_COLOR_MASK_ALPHA;
-    png_byte bit_depth = out_bytes_per_sample * 8;
-
-    png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, color_type,
-                 PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,
-                 PNG_FILTER_TYPE_BASE);
-    if (count == 0 && !encode_extra_channels) {
-      if (!MaybeAddSRGB(ppf.color_encoding, png_ptr, info_ptr)) {
-        if (ppf.primary_color_representation !=
-            PackedPixelFile::kIccIsPrimary) {
-          MaybeAddCICP(ppf.color_encoding, png_ptr, info_ptr);
-        }
-        if (!ppf.icc.empty()) {
-          png_set_benign_errors(png_ptr, 1);
-          png_set_iCCP(png_ptr, info_ptr, "1", 0, ppf.icc.data(),
-                       ppf.icc.size());
-        }
-        MaybeAddCHRM(ppf.color_encoding, png_ptr, info_ptr);
-        MaybeAddGAMA(ppf.color_encoding, png_ptr, info_ptr);
-      }
-      MaybeAddCLLi(ppf.color_encoding, ppf.info.intensity_target, png_ptr,
-                   info_ptr);
-
-      std::vector<std::string> textstrings;
-      JXL_RETURN_IF_ERROR(BlobsWriterPNG::Encode(ppf.metadata, &textstrings));
-      for (size_t kk = 0; kk + 1 < textstrings.size(); kk += 2) {
-        png_text text;
-        text.key = const_cast<png_charp>(textstrings[kk].c_str());
-        text.text = const_cast<png_charp>(textstrings[kk + 1].c_str());
-        text.compression = PNG_TEXT_COMPRESSION_zTXt;
-        png_set_text(png_ptr, info_ptr, &text, 1);
-      }
-
-      png_write_info(png_ptr, info_ptr);
-    } else {
-      // fake writing a header, otherwise libpng gets confused
-      size_t pos = bytes->size();
-      png_write_info(png_ptr, info_ptr);
-      bytes->resize(pos);
-    }
-
-    if (ppf.info.have_animation) {
-      if (count == 0) {
-        png_byte adata[8];
-        png_save_uint_32(adata, ppf.frames.size());
-        png_save_uint_32(adata + 4, ppf.info.animation.num_loops);
-        png_byte actl[5] = "acTL";
-        png_write_chunk(png_ptr, actl, adata, 8);
-      }
-      png_byte fdata[26];
-      // TODO(jon): also make this work for the non-coalesced case
-      png_save_uint_32(fdata, anim_chunks++);
-      png_save_uint_32(fdata + 4, width);
-      png_save_uint_32(fdata + 8, height);
-      png_save_uint_32(fdata + 12, 0);
-      png_save_uint_32(fdata + 16, 0);
-      png_save_uint_16(fdata + 20, frame.frame_info.duration *
-                                       ppf.info.animation.tps_denominator);
-      png_save_uint_16(fdata + 22, ppf.info.animation.tps_numerator);
-      fdata[24] = 1;
-      fdata[25] = 0;
-      png_byte fctl[5] = "fcTL";
-      png_write_chunk(png_ptr, fctl, fdata, 26);
-    }
-
-    std::vector<uint8_t*> rows(height);
-    for (int y = 0; y < height; ++y) {
-      rows[y] = out.data() + y * out_stride;
-    }
-
-    png_write_flush(png_ptr);
-    const size_t pos = bytes->size();
-    png_write_image(png_ptr, rows.data());
-    png_write_flush(png_ptr);
-    if (count > 0) {
-      std::vector<uint8_t> fdata(4);
-      png_save_uint_32(fdata.data(), anim_chunks++);
-      size_t p = pos;
-      while (p + 8 < bytes->size()) {
-        size_t len = png_get_uint_32(bytes->data() + p);
-        JXL_ENSURE(bytes->operator[](p + 4) == 'I');
-        JXL_ENSURE(bytes->operator[](p + 5) == 'D');
-        JXL_ENSURE(bytes->operator[](p + 6) == 'A');
-        JXL_ENSURE(bytes->operator[](p + 7) == 'T');
-        fdata.insert(fdata.end(), bytes->data() + p + 8,
-                     bytes->data() + p + 8 + len);
-        p += len + 12;
-      }
-      bytes->resize(pos);
-
-      png_byte fdat[5] = "fdAT";
-      png_write_chunk(png_ptr, fdat, fdata.data(), fdata.size());
-    }
-
-    count++;
-    if (count == ppf.frames.size() || !ppf.info.have_animation) {
-      png_write_end(png_ptr, nullptr);
-    }
-
-    png_destroy_write_struct(&png_ptr, &info_ptr);
-  }
-
-  return true;
-}
-
-}  // namespace
-#endif
-
-std::unique_ptr<Encoder> GetAPNGEncoder() {
-#if JPEGXL_ENABLE_APNG
-  return jxl::make_unique<APNGEncoder>();
-#else
-  return nullptr;
-#endif
-}
-
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/enc/apng.h b/third_party/jpeg-xl/lib/extras/enc/apng.h
deleted file mode 100644
index 2a2139c8fac18..0000000000000
--- a/third_party/jpeg-xl/lib/extras/enc/apng.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_ENC_APNG_H_
-#define LIB_EXTRAS_ENC_APNG_H_
-
-// Encodes APNG images in memory.
-
-#include <memory>
-
-#include "lib/extras/enc/encode.h"
-
-namespace jxl {
-namespace extras {
-
-std::unique_ptr<Encoder> GetAPNGEncoder();
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_ENC_APNG_H_
diff --git a/third_party/jpeg-xl/lib/extras/enc/encode.cc b/third_party/jpeg-xl/lib/extras/enc/encode.cc
deleted file mode 100644
index 71be78e36cc22..0000000000000
--- a/third_party/jpeg-xl/lib/extras/enc/encode.cc
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/enc/encode.h"
-
-#include <locale>
-
-#include "lib/extras/enc/apng.h"
-#include "lib/extras/enc/exr.h"
-#include "lib/extras/enc/jpg.h"
-#include "lib/extras/enc/npy.h"
-#include "lib/extras/enc/pgx.h"
-#include "lib/extras/enc/pnm.h"
-
-namespace jxl {
-namespace extras {
-
-Status Encoder::VerifyBasicInfo(const JxlBasicInfo& info) {
-  if (info.xsize == 0 || info.ysize == 0) {
-    return JXL_FAILURE("Empty image");
-  }
-  if (info.num_color_channels != 1 && info.num_color_channels != 3) {
-    return JXL_FAILURE("Invalid number of color channels");
-  }
-  if (info.alpha_bits > 0 && info.alpha_bits != info.bits_per_sample) {
-    return JXL_FAILURE("Alpha bit depth does not match image bit depth");
-  }
-  if (info.orientation != JXL_ORIENT_IDENTITY) {
-    return JXL_FAILURE("Orientation must be identity");
-  }
-  return true;
-}
-
-Status Encoder::VerifyFormat(const JxlPixelFormat& format) const {
-  for (auto f : AcceptedFormats()) {
-    if (f.num_channels != format.num_channels) continue;
-    if (f.data_type != format.data_type) continue;
-    if (f.data_type == JXL_TYPE_UINT8 || f.endianness == format.endianness) {
-      return true;
-    }
-  }
-  return JXL_FAILURE("Format is not in the list of accepted formats.");
-}
-
-Status Encoder::VerifyBitDepth(JxlDataType data_type, uint32_t bits_per_sample,
-                               uint32_t exponent_bits) {
-  if ((data_type == JXL_TYPE_UINT8 &&
-       (bits_per_sample == 0 || bits_per_sample > 8 || exponent_bits != 0)) ||
-      (data_type == JXL_TYPE_UINT16 &&
-       (bits_per_sample <= 8 || bits_per_sample > 16 || exponent_bits != 0)) ||
-      (data_type == JXL_TYPE_FLOAT16 &&
-       (bits_per_sample > 16 || exponent_bits > 5))) {
-    return JXL_FAILURE(
-        "Incompatible data_type %d and bit depth %u with exponent bits %u",
-        static_cast<int>(data_type), bits_per_sample, exponent_bits);
-  }
-  return true;
-}
-
-Status Encoder::VerifyImageSize(const PackedImage& image,
-                                const JxlBasicInfo& info) {
-  if (image.pixels() == nullptr) {
-    return JXL_FAILURE("Invalid image.");
-  }
-  if (image.stride != image.xsize * image.pixel_stride()) {
-    return JXL_FAILURE("Invalid image stride.");
-  }
-  if (image.pixels_size != image.ysize * image.stride) {
-    return JXL_FAILURE("Invalid image size.");
-  }
-  size_t info_num_channels =
-      (info.num_color_channels + (info.alpha_bits > 0 ? 1 : 0));
-  if (image.xsize != info.xsize || image.ysize != info.ysize ||
-      image.format.num_channels != info_num_channels) {
-    return JXL_FAILURE("Frame size does not match image size");
-  }
-  return true;
-}
-
-Status Encoder::VerifyPackedImage(const PackedImage& image,
-                                  const JxlBasicInfo& info) const {
-  JXL_RETURN_IF_ERROR(VerifyImageSize(image, info));
-  JXL_RETURN_IF_ERROR(VerifyFormat(image.format));
-  JXL_RETURN_IF_ERROR(VerifyBitDepth(image.format.data_type,
-                                     info.bits_per_sample,
-                                     info.exponent_bits_per_sample));
-  return true;
-}
-
-template <int metadata>
-class MetadataEncoder : public Encoder {
- public:
-  std::vector<JxlPixelFormat> AcceptedFormats() const override {
-    std::vector<JxlPixelFormat> formats;
-    // empty, i.e. no need for actual pixel data
-    return formats;
-  }
-
-  Status Encode(const PackedPixelFile& ppf, EncodedImage* encoded,
-                ThreadPool* pool) const override {
-    JXL_RETURN_IF_ERROR(VerifyBasicInfo(ppf.info));
-    encoded->icc.clear();
-    encoded->bitstreams.resize(1);
-    if (metadata == 0) encoded->bitstreams.front() = ppf.metadata.exif;
-    if (metadata == 1) encoded->bitstreams.front() = ppf.metadata.xmp;
-    if (metadata == 2) encoded->bitstreams.front() = ppf.metadata.jumbf;
-    return true;
-  }
-};
-
-std::unique_ptr<Encoder> Encoder::FromExtension(std::string extension) {
-  std::transform(
-      extension.begin(), extension.end(), extension.begin(),
-      [](char c) { return std::tolower(c, std::locale::classic()); });
-  if (extension == ".png" || extension == ".apng") return GetAPNGEncoder();
-  if (extension == ".jpg") return GetJPEGEncoder();
-  if (extension == ".jpeg") return GetJPEGEncoder();
-  if (extension == ".npy") return GetNumPyEncoder();
-  if (extension == ".pgx") return GetPGXEncoder();
-  if (extension == ".pam") return GetPAMEncoder();
-  if (extension == ".pgm") return GetPGMEncoder();
-  if (extension == ".ppm") return GetPPMEncoder();
-  if (extension == ".pnm") return GetPNMEncoder();
-  if (extension == ".pfm") return GetPFMEncoder();
-  if (extension == ".exr") return GetEXREncoder();
-  if (extension == ".exif") return jxl::make_unique<MetadataEncoder<0>>();
-  if (extension == ".xmp") return jxl::make_unique<MetadataEncoder<1>>();
-  if (extension == ".xml") return jxl::make_unique<MetadataEncoder<1>>();
-  if (extension == ".jumbf") return jxl::make_unique<MetadataEncoder<2>>();
-  if (extension == ".jumb") return jxl::make_unique<MetadataEncoder<2>>();
-
-  return nullptr;
-}
-
-std::string ListOfEncodeCodecs() {
-  std::string list_of_codecs("PPM, PNM, PFM, PAM, PGX");
-  if (GetAPNGEncoder()) list_of_codecs.append(", PNG, APNG");
-  if (GetJPEGEncoder()) list_of_codecs.append(", JPEG");
-  if (GetEXREncoder()) list_of_codecs.append(", EXR");
-  return list_of_codecs;
-}
-
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/enc/encode.h b/third_party/jpeg-xl/lib/extras/enc/encode.h
deleted file mode 100644
index a71f3b220fc7b..0000000000000
--- a/third_party/jpeg-xl/lib/extras/enc/encode.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_ENC_ENCODE_H_
-#define LIB_EXTRAS_ENC_ENCODE_H_
-
-// Facade for image encoders.
-
-#include <jxl/codestream_header.h>
-#include <jxl/types.h>
-
-#include <cstdint>
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-namespace extras {
-
-struct EncodedImage {
-  // One (if the format supports animations or the image has only one frame) or
-  // more 1quential bitstreams.
-  std::vector<std::vector<uint8_t>> bitstreams;
-
-  // For each extra channel one or more sequential bitstreams.
-  std::vector<std::vector<std::vector<uint8_t>>> extra_channel_bitstreams;
-
-  std::vector<uint8_t> preview_bitstream;
-
-  // If the format does not support embedding color profiles into the bitstreams
-  // above, it will be present here, to be written as a separate file. If it
-  // does support them, this field will be empty.
-  std::vector<uint8_t> icc;
-
-  // Additional output for conformance testing, only filled in by NumPyEncoder.
-  std::vector<uint8_t> metadata;
-};
-
-class Encoder {
- public:
-  static std::unique_ptr<Encoder> FromExtension(std::string extension);
-
-  virtual ~Encoder() = default;
-
-  // Set of pixel formats that this encoder takes as input.
-  // If empty, the 'encoder' does not need any pixels (it's metadata-only).
-  virtual std::vector<JxlPixelFormat> AcceptedFormats() const = 0;
-
-  // Any existing data in encoded_image is discarded.
-  virtual Status Encode(const PackedPixelFile& ppf, EncodedImage* encoded_image,
-                        ThreadPool* pool) const = 0;
-
-  void SetOption(std::string name, std::string value) {
-    options_[std::move(name)] = std::move(value);
-  }
-
-  static Status VerifyBasicInfo(const JxlBasicInfo& info);
-  static Status VerifyImageSize(const PackedImage& image,
-                                const JxlBasicInfo& info);
-  static Status VerifyBitDepth(JxlDataType data_type, uint32_t bits_per_sample,
-                               uint32_t exponent_bits);
-
- protected:
-  const std::unordered_map<std::string, std::string>& options() const {
-    return options_;
-  }
-
-  Status VerifyFormat(const JxlPixelFormat& format) const;
-
-  Status VerifyPackedImage(const PackedImage& image,
-                           const JxlBasicInfo& info) const;
-
- private:
-  std::unordered_map<std::string, std::string> options_;
-};
-
-std::string ListOfEncodeCodecs();
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_ENC_ENCODE_H_
diff --git a/third_party/jpeg-xl/lib/extras/enc/exr.cc b/third_party/jpeg-xl/lib/extras/enc/exr.cc
deleted file mode 100644
index 5a4f7d768c3d9..0000000000000
--- a/third_party/jpeg-xl/lib/extras/enc/exr.cc
+++ /dev/null
@@ -1,208 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/enc/exr.h"
-
-#if JPEGXL_ENABLE_EXR
-#include <ImfChromaticitiesAttribute.h>
-#include <ImfIO.h>
-#include <ImfRgbaFile.h>
-#include <ImfStandardAttributes.h>
-#endif
-#include <jxl/codestream_header.h>
-
-#include <vector>
-
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/byte_order.h"
-
-namespace jxl {
-namespace extras {
-
-#if JPEGXL_ENABLE_EXR
-namespace {
-
-namespace OpenEXR = OPENEXR_IMF_NAMESPACE;
-namespace Imath = IMATH_NAMESPACE;
-
-// OpenEXR::Int64 is deprecated in favor of using uint64_t directly, but using
-// uint64_t as recommended causes build failures with previous OpenEXR versions
-// on macOS, where the definition for OpenEXR::Int64 was actually not equivalent
-// to uint64_t. This alternative should work in all cases.
-using ExrInt64 = decltype(std::declval<OpenEXR::IStream>().tellg());
-
-class InMemoryOStream : public OpenEXR::OStream {
- public:
-  // `bytes` must outlive the InMemoryOStream.
-  explicit InMemoryOStream(std::vector<uint8_t>* const bytes)
-      : OStream(/*fileName=*/""), bytes_(*bytes) {}
-
-  void write(const char c[], const int n) override {
-    if (bytes_.size() < pos_ + n) {
-      bytes_.resize(pos_ + n);
-    }
-    std::copy_n(c, n, bytes_.begin() + pos_);
-    pos_ += n;
-  }
-
-  ExrInt64 tellp() override { return pos_; }
-  void seekp(const ExrInt64 pos) override {
-    if (bytes_.size() + 1 < pos) {
-      bytes_.resize(pos - 1);
-    }
-    pos_ = pos;
-  }
-
- private:
-  std::vector<uint8_t>& bytes_;
-  size_t pos_ = 0;
-};
-
-// Loads a Big-Endian float
-float LoadBEFloat(const uint8_t* p) {
-  uint32_t u = LoadBE32(p);
-  float result;
-  memcpy(&result, &u, 4);
-  return result;
-}
-
-// Loads a Little-Endian float
-float LoadLEFloat(const uint8_t* p) {
-  uint32_t u = LoadLE32(p);
-  float result;
-  memcpy(&result, &u, 4);
-  return result;
-}
-
-Status EncodeImageEXR(const PackedImage& image, const JxlBasicInfo& info,
-                      const JxlColorEncoding& c_enc, ThreadPool* pool,
-                      std::vector<uint8_t>* bytes) {
-  OpenEXR::setGlobalThreadCount(0);
-
-  const size_t xsize = info.xsize;
-  const size_t ysize = info.ysize;
-  const bool has_alpha = info.alpha_bits > 0;
-  const bool alpha_is_premultiplied = FROM_JXL_BOOL(info.alpha_premultiplied);
-
-  if (info.num_color_channels != 3 ||
-      c_enc.color_space != JXL_COLOR_SPACE_RGB ||
-      c_enc.transfer_function != JXL_TRANSFER_FUNCTION_LINEAR) {
-    return JXL_FAILURE("Unsupported color encoding for OpenEXR output.");
-  }
-
-  const size_t num_channels = 3 + (has_alpha ? 1 : 0);
-  const JxlPixelFormat format = image.format;
-
-  if (format.data_type != JXL_TYPE_FLOAT) {
-    return JXL_FAILURE("Unsupported pixel format for OpenEXR output");
-  }
-
-  const uint8_t* in = reinterpret_cast<const uint8_t*>(image.pixels());
-  size_t in_stride = num_channels * 4 * xsize;
-
-  OpenEXR::Header header(xsize, ysize);
-  OpenEXR::Chromaticities chromaticities;
-  chromaticities.red =
-      Imath::V2f(c_enc.primaries_red_xy[0], c_enc.primaries_red_xy[1]);
-  chromaticities.green =
-      Imath::V2f(c_enc.primaries_green_xy[0], c_enc.primaries_green_xy[1]);
-  chromaticities.blue =
-      Imath::V2f(c_enc.primaries_blue_xy[0], c_enc.primaries_blue_xy[1]);
-  chromaticities.white =
-      Imath::V2f(c_enc.white_point_xy[0], c_enc.white_point_xy[1]);
-  OpenEXR::addChromaticities(header, chromaticities);
-  OpenEXR::addWhiteLuminance(header, info.intensity_target);
-
-  auto loadFloat =
-      format.endianness == JXL_BIG_ENDIAN ? LoadBEFloat : LoadLEFloat;
-  auto loadAlpha =
-      has_alpha ? loadFloat : [](const uint8_t* p) -> float { return 1.0f; };
-
-  // Ensure that the destructor of RgbaOutputFile has run before we look at the
-  // size of `bytes`.
-  {
-    InMemoryOStream os(bytes);
-    OpenEXR::RgbaOutputFile output(
-        os, header, has_alpha ? OpenEXR::WRITE_RGBA : OpenEXR::WRITE_RGB);
-    // How many rows to write at once. Again, the OpenEXR documentation
-    // recommends writing the whole image in one call.
-    const int y_chunk_size = ysize;
-    std::vector<OpenEXR::Rgba> output_rows(xsize * y_chunk_size);
-
-    for (size_t start_y = 0; start_y < ysize; start_y += y_chunk_size) {
-      // Inclusive.
-      const size_t end_y = std::min(start_y + y_chunk_size - 1, ysize - 1);
-      output.setFrameBuffer(output_rows.data() - start_y * xsize,
-                            /*xStride=*/1, /*yStride=*/xsize);
-      for (size_t y = start_y; y <= end_y; ++y) {
-        const uint8_t* in_row = &in[(y - start_y) * in_stride];
-        OpenEXR::Rgba* const JXL_RESTRICT row_data =
-            &output_rows[(y - start_y) * xsize];
-        for (size_t x = 0; x < xsize; ++x) {
-          const uint8_t* in_pixel = &in_row[4 * num_channels * x];
-          float r = loadFloat(&in_pixel[0]);
-          float g = loadFloat(&in_pixel[4]);
-          float b = loadFloat(&in_pixel[8]);
-          const float alpha = loadAlpha(&in_pixel[12]);
-          if (!alpha_is_premultiplied) {
-            r *= alpha;
-            g *= alpha;
-            b *= alpha;
-          }
-          row_data[x] = OpenEXR::Rgba(r, g, b, alpha);
-        }
-      }
-      output.writePixels(/*numScanLines=*/end_y - start_y + 1);
-    }
-  }
-
-  return true;
-}
-
-class EXREncoder : public Encoder {
-  std::vector<JxlPixelFormat> AcceptedFormats() const override {
-    std::vector<JxlPixelFormat> formats;
-    for (const uint32_t num_channels : {1, 2, 3, 4}) {
-      for (const JxlDataType data_type : {JXL_TYPE_FLOAT}) {
-        for (JxlEndianness endianness : {JXL_BIG_ENDIAN, JXL_LITTLE_ENDIAN}) {
-          formats.push_back(JxlPixelFormat{/*num_channels=*/num_channels,
-                                           /*data_type=*/data_type,
-                                           /*endianness=*/endianness,
-                                           /*align=*/0});
-        }
-      }
-    }
-    return formats;
-  }
-  Status Encode(const PackedPixelFile& ppf, EncodedImage* encoded_image,
-                ThreadPool* pool) const override {
-    JXL_RETURN_IF_ERROR(VerifyBasicInfo(ppf.info));
-    encoded_image->icc.clear();
-    encoded_image->bitstreams.clear();
-    encoded_image->bitstreams.reserve(ppf.frames.size());
-    for (const auto& frame : ppf.frames) {
-      JXL_RETURN_IF_ERROR(VerifyPackedImage(frame.color, ppf.info));
-      encoded_image->bitstreams.emplace_back();
-      JXL_RETURN_IF_ERROR(EncodeImageEXR(frame.color, ppf.info,
-                                         ppf.color_encoding, pool,
-                                         &encoded_image->bitstreams.back()));
-    }
-    return true;
-  }
-};
-
-}  // namespace
-#endif
-
-std::unique_ptr<Encoder> GetEXREncoder() {
-#if JPEGXL_ENABLE_EXR
-  return jxl::make_unique<EXREncoder>();
-#else
-  return nullptr;
-#endif
-}
-
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/enc/exr.h b/third_party/jpeg-xl/lib/extras/enc/exr.h
deleted file mode 100644
index 1baaa0272f5eb..0000000000000
--- a/third_party/jpeg-xl/lib/extras/enc/exr.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_ENC_EXR_H_
-#define LIB_EXTRAS_ENC_EXR_H_
-
-// Encodes OpenEXR images in memory.
-
-#include <memory>
-
-#include "lib/extras/enc/encode.h"
-
-namespace jxl {
-namespace extras {
-
-std::unique_ptr<Encoder> GetEXREncoder();
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_ENC_EXR_H_
diff --git a/third_party/jpeg-xl/lib/extras/enc/jpegli.cc b/third_party/jpeg-xl/lib/extras/enc/jpegli.cc
deleted file mode 100644
index 52de317399a6e..0000000000000
--- a/third_party/jpeg-xl/lib/extras/enc/jpegli.cc
+++ /dev/null
@@ -1,570 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/enc/jpegli.h"
-
-#include <jxl/cms.h>
-#include <jxl/codestream_header.h>
-#include <jxl/types.h>
-#include <setjmp.h>
-
-#include <algorithm>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
-#include <hwy/aligned_allocator.h>
-#include <limits>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "lib/extras/enc/encode.h"
-#include "lib/extras/packed_image.h"
-#include "lib/jpegli/common.h"
-#include "lib/jpegli/encode.h"
-#include "lib/jpegli/types.h"
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/enc_xyb.h"
-#include "lib/jxl/simd_util.h"
-
-namespace jxl {
-namespace extras {
-
-namespace {
-
-void MyErrorExit(j_common_ptr cinfo) {
-  jmp_buf* env = static_cast<jmp_buf*>(cinfo->client_data);
-  (*cinfo->err->output_message)(cinfo);
-  jpegli_destroy_compress(reinterpret_cast<j_compress_ptr>(cinfo));
-  longjmp(*env, 1);
-}
-
-Status VerifyInput(const PackedPixelFile& ppf) {
-  const JxlBasicInfo& info = ppf.info;
-  JXL_RETURN_IF_ERROR(Encoder::VerifyBasicInfo(info));
-  if (ppf.frames.size() != 1) {
-    return JXL_FAILURE("JPEG input must have exactly one frame.");
-  }
-  if (info.num_color_channels != 1 && info.num_color_channels != 3) {
-    return JXL_FAILURE("Invalid number of color channels %d",
-                       info.num_color_channels);
-  }
-  const PackedImage& image = ppf.frames[0].color;
-  JXL_RETURN_IF_ERROR(Encoder::VerifyImageSize(image, info));
-  if (image.format.data_type == JXL_TYPE_FLOAT16) {
-    return JXL_FAILURE("FLOAT16 input is not supported.");
-  }
-  JXL_RETURN_IF_ERROR(Encoder::VerifyBitDepth(image.format.data_type,
-                                              info.bits_per_sample,
-                                              info.exponent_bits_per_sample));
-  if ((image.format.data_type == JXL_TYPE_UINT8 && info.bits_per_sample != 8) ||
-      (image.format.data_type == JXL_TYPE_UINT16 &&
-       info.bits_per_sample != 16)) {
-    return JXL_FAILURE("Only full bit depth unsigned types are supported.");
-  }
-  return true;
-}
-
-Status GetColorEncoding(const PackedPixelFile& ppf,
-                        ColorEncoding* color_encoding) {
-  if (ppf.primary_color_representation == PackedPixelFile::kIccIsPrimary) {
-    IccBytes icc = ppf.icc;
-    JXL_RETURN_IF_ERROR(
-        color_encoding->SetICC(std::move(icc), JxlGetDefaultCms()));
-  } else {
-    JXL_RETURN_IF_ERROR(color_encoding->FromExternal(ppf.color_encoding));
-  }
-  if (color_encoding->ICC().empty()) {
-    return JXL_FAILURE("Invalid color encoding.");
-  }
-  return true;
-}
-
-bool HasICCProfile(const std::vector<uint8_t>& app_data) {
-  size_t pos = 0;
-  while (pos < app_data.size()) {
-    if (pos + 16 > app_data.size()) return false;
-    uint8_t marker = app_data[pos + 1];
-    size_t marker_len = (app_data[pos + 2] << 8) + app_data[pos + 3] + 2;
-    if (marker == 0xe2 && memcmp(&app_data[pos + 4], "ICC_PROFILE", 12) == 0) {
-      return true;
-    }
-    pos += marker_len;
-  }
-  return false;
-}
-
-Status WriteAppData(j_compress_ptr cinfo,
-                    const std::vector<uint8_t>& app_data) {
-  size_t pos = 0;
-  while (pos < app_data.size()) {
-    if (pos + 4 > app_data.size()) {
-      return JXL_FAILURE("Incomplete APP header.");
-    }
-    uint8_t marker = app_data[pos + 1];
-    size_t marker_len = (app_data[pos + 2] << 8) + app_data[pos + 3] + 2;
-    if (app_data[pos] != 0xff || marker < 0xe0 || marker > 0xef) {
-      return JXL_FAILURE("Invalid APP marker %02x %02x", app_data[pos], marker);
-    }
-    if (marker_len <= 4) {
-      return JXL_FAILURE("Invalid APP marker length.");
-    }
-    if (pos + marker_len > app_data.size()) {
-      return JXL_FAILURE("Incomplete APP data");
-    }
-    jpegli_write_marker(cinfo, marker, &app_data[pos + 4], marker_len - 4);
-    pos += marker_len;
-  }
-  return true;
-}
-
-constexpr int kICCMarker = 0xe2;
-constexpr unsigned char kICCSignature[12] = {
-    0x49, 0x43, 0x43, 0x5F, 0x50, 0x52, 0x4F, 0x46, 0x49, 0x4C, 0x45, 0x00};
-constexpr uint8_t kUnknownTf = 2;
-constexpr unsigned char kCICPTagSignature[4] = {0x63, 0x69, 0x63, 0x70};
-constexpr size_t kCICPTagSize = 12;
-
-bool FindCICPTag(const uint8_t* icc_data, size_t len, bool is_first_chunk,
-                 size_t* cicp_offset, size_t* cicp_length, uint8_t* cicp_tag,
-                 size_t* cicp_pos) {
-  if (is_first_chunk) {
-    // Look up the offset of the CICP tag from the first chunk of ICC data.
-    if (len < 132) {
-      return false;
-    }
-    uint32_t tag_count = LoadBE32(&icc_data[128]);
-    if (len < 132 + 12 * tag_count) {
-      return false;
-    }
-    for (uint32_t i = 0; i < tag_count; ++i) {
-      if (memcmp(&icc_data[132 + 12 * i], kCICPTagSignature, 4) == 0) {
-        *cicp_offset = LoadBE32(&icc_data[136 + 12 * i]);
-        *cicp_length = LoadBE32(&icc_data[140 + 12 * i]);
-      }
-    }
-    if (*cicp_length < kCICPTagSize) {
-      return false;
-    }
-  }
-  if (*cicp_offset < len) {
-    size_t n_bytes = std::min(len - *cicp_offset, kCICPTagSize - *cicp_pos);
-    memcpy(&cicp_tag[*cicp_pos], &icc_data[*cicp_offset], n_bytes);
-    *cicp_pos += n_bytes;
-    *cicp_offset = 0;
-  } else {
-    *cicp_offset -= len;
-  }
-  return true;
-}
-
-uint8_t LookupCICPTransferFunctionFromAppData(const uint8_t* app_data,
-                                              size_t len) {
-  size_t last_index = 0;
-  size_t cicp_offset = 0;
-  size_t cicp_length = 0;
-  uint8_t cicp_tag[kCICPTagSize] = {};
-  size_t cicp_pos = 0;
-  size_t pos = 0;
-  while (pos < len) {
-    const uint8_t* marker = &app_data[pos];
-    if (pos + 4 > len) {
-      return kUnknownTf;
-    }
-    size_t marker_size = (marker[2] << 8) + marker[3] + 2;
-    if (pos + marker_size > len) {
-      return kUnknownTf;
-    }
-    if (marker_size < 18 || marker[0] != 0xff || marker[1] != kICCMarker ||
-        memcmp(&marker[4], kICCSignature, 12) != 0) {
-      pos += marker_size;
-      continue;
-    }
-    uint8_t index = marker[16];
-    uint8_t total = marker[17];
-    const uint8_t* payload = marker + 18;
-    const size_t payload_size = marker_size - 18;
-    if (index != last_index + 1 || index > total) {
-      return kUnknownTf;
-    }
-    if (!FindCICPTag(payload, payload_size, last_index == 0, &cicp_offset,
-                     &cicp_length, &cicp_tag[0], &cicp_pos)) {
-      return kUnknownTf;
-    }
-    if (cicp_pos == kCICPTagSize) {
-      break;
-    }
-    ++last_index;
-  }
-  if (cicp_pos >= kCICPTagSize && memcmp(cicp_tag, kCICPTagSignature, 4) == 0) {
-    return cicp_tag[9];
-  }
-  return kUnknownTf;
-}
-
-uint8_t LookupCICPTransferFunctionFromICCProfile(const uint8_t* icc_data,
-                                                 size_t len) {
-  size_t cicp_offset = 0;
-  size_t cicp_length = 0;
-  uint8_t cicp_tag[kCICPTagSize] = {};
-  size_t cicp_pos = 0;
-  if (!FindCICPTag(icc_data, len, true, &cicp_offset, &cicp_length,
-                   &cicp_tag[0], &cicp_pos)) {
-    return kUnknownTf;
-  }
-  if (cicp_pos >= kCICPTagSize && memcmp(cicp_tag, kCICPTagSignature, 4) == 0) {
-    return cicp_tag[9];
-  }
-  return kUnknownTf;
-}
-
-JpegliDataType ConvertDataType(JxlDataType type) {
-  switch (type) {
-    case JXL_TYPE_UINT8:
-      return JPEGLI_TYPE_UINT8;
-    case JXL_TYPE_UINT16:
-      return JPEGLI_TYPE_UINT16;
-    case JXL_TYPE_FLOAT:
-      return JPEGLI_TYPE_FLOAT;
-    default:
-      return JPEGLI_TYPE_UINT8;
-  }
-}
-
-JpegliEndianness ConvertEndianness(JxlEndianness endianness) {
-  switch (endianness) {
-    case JXL_NATIVE_ENDIAN:
-      return JPEGLI_NATIVE_ENDIAN;
-    case JXL_LITTLE_ENDIAN:
-      return JPEGLI_LITTLE_ENDIAN;
-    case JXL_BIG_ENDIAN:
-      return JPEGLI_BIG_ENDIAN;
-    default:
-      return JPEGLI_NATIVE_ENDIAN;
-  }
-}
-
-void ToFloatRow(const uint8_t* row_in, JxlPixelFormat format, size_t xsize,
-                size_t c_out, float* row_out) {
-  bool is_little_endian =
-      (format.endianness == JXL_LITTLE_ENDIAN ||
-       (format.endianness == JXL_NATIVE_ENDIAN && IsLittleEndian()));
-  static constexpr double kMul8 = 1.0 / 255.0;
-  static constexpr double kMul16 = 1.0 / 65535.0;
-  const size_t c_in = format.num_channels;
-  if (format.data_type == JXL_TYPE_UINT8) {
-    for (size_t x = 0; x < xsize; ++x) {
-      for (size_t c = 0; c < c_out; ++c) {
-        const size_t ix = c_in * x + c;
-        row_out[c_out * x + c] = row_in[ix] * kMul8;
-      }
-    }
-  } else if (format.data_type == JXL_TYPE_UINT16 && is_little_endian) {
-    for (size_t x = 0; x < xsize; ++x) {
-      for (size_t c = 0; c < c_out; ++c) {
-        const size_t ix = c_in * x + c;
-        row_out[c_out * x + c] = LoadLE16(&row_in[2 * ix]) * kMul16;
-      }
-    }
-  } else if (format.data_type == JXL_TYPE_UINT16 && !is_little_endian) {
-    for (size_t x = 0; x < xsize; ++x) {
-      for (size_t c = 0; c < c_out; ++c) {
-        const size_t ix = c_in * x + c;
-        row_out[c_out * x + c] = LoadBE16(&row_in[2 * ix]) * kMul16;
-      }
-    }
-  } else if (format.data_type == JXL_TYPE_FLOAT && is_little_endian) {
-    for (size_t x = 0; x < xsize; ++x) {
-      for (size_t c = 0; c < c_out; ++c) {
-        const size_t ix = c_in * x + c;
-        row_out[c_out * x + c] = LoadLEFloat(&row_in[4 * ix]);
-      }
-    }
-  } else if (format.data_type == JXL_TYPE_FLOAT && !is_little_endian) {
-    for (size_t x = 0; x < xsize; ++x) {
-      for (size_t c = 0; c < c_out; ++c) {
-        const size_t ix = c_in * x + c;
-        row_out[c_out * x + c] = LoadBEFloat(&row_in[4 * ix]);
-      }
-    }
-  }
-}
-
-Status EncodeJpegToTargetSize(const PackedPixelFile& ppf,
-                              const JpegSettings& jpeg_settings,
-                              size_t target_size, ThreadPool* pool,
-                              std::vector<uint8_t>* output) {
-  output->clear();
-  size_t best_error = std::numeric_limits<size_t>::max();
-  float distance0 = -1.0f;
-  float distance1 = -1.0f;
-  float distance = 1.0f;
-  for (int step = 0; step < 15; ++step) {
-    JpegSettings settings = jpeg_settings;
-    settings.libjpeg_quality = 0;
-    settings.distance = distance;
-    settings.target_size = 0;
-    std::vector<uint8_t> compressed;
-    JXL_RETURN_IF_ERROR(EncodeJpeg(ppf, settings, pool, &compressed));
-    size_t size = compressed.size();
-    // prefer being under the target size to being over it
-    size_t error = size < target_size
-                       ? target_size - size
-                       : static_cast<size_t>(1.2f * (size - target_size));
-    if (error < best_error) {
-      best_error = error;
-      std::swap(*output, compressed);
-    }
-    float rel_error = size * 1.0f / target_size;
-    if (std::abs(rel_error - 1.0f) < 0.002f) {
-      break;
-    }
-    if (size < target_size) {
-      distance1 = distance;
-    } else {
-      distance0 = distance;
-    }
-    if (distance1 == -1) {
-      distance *= std::pow(rel_error, 1.5) * 1.05;
-    } else if (distance0 == -1) {
-      distance *= std::pow(rel_error, 1.5) * 0.95;
-    } else {
-      distance = 0.5 * (distance0 + distance1);
-    }
-  }
-  return true;
-}
-
-}  // namespace
-
-Status EncodeJpeg(const PackedPixelFile& ppf, const JpegSettings& jpeg_settings,
-                  ThreadPool* pool, std::vector<uint8_t>* compressed) {
-  if (jpeg_settings.libjpeg_quality > 0) {
-    auto encoder = Encoder::FromExtension(".jpg");
-    encoder->SetOption("q", std::to_string(jpeg_settings.libjpeg_quality));
-    if (!jpeg_settings.libjpeg_chroma_subsampling.empty()) {
-      encoder->SetOption("chroma_subsampling",
-                         jpeg_settings.libjpeg_chroma_subsampling);
-    }
-    EncodedImage encoded;
-    JXL_RETURN_IF_ERROR(encoder->Encode(ppf, &encoded, pool));
-    size_t target_size = encoded.bitstreams[0].size();
-    return EncodeJpegToTargetSize(ppf, jpeg_settings, target_size, pool,
-                                  compressed);
-  }
-  if (jpeg_settings.target_size > 0) {
-    return EncodeJpegToTargetSize(ppf, jpeg_settings, jpeg_settings.target_size,
-                                  pool, compressed);
-  }
-  JXL_RETURN_IF_ERROR(VerifyInput(ppf));
-
-  ColorEncoding color_encoding;
-  JXL_RETURN_IF_ERROR(GetColorEncoding(ppf, &color_encoding));
-
-  ColorSpaceTransform c_transform(*JxlGetDefaultCms());
-  ColorEncoding xyb_encoding;
-  if (jpeg_settings.xyb) {
-    if (HasICCProfile(jpeg_settings.app_data)) {
-      return JXL_FAILURE("APP data ICC profile is not supported in XYB mode.");
-    }
-    const ColorEncoding& c_desired = ColorEncoding::LinearSRGB(false);
-    JXL_RETURN_IF_ERROR(
-        c_transform.Init(color_encoding, c_desired, 255.0f, ppf.info.xsize, 1));
-    xyb_encoding.SetColorSpace(jxl::ColorSpace::kXYB);
-    xyb_encoding.SetRenderingIntent(jxl::RenderingIntent::kPerceptual);
-    JXL_RETURN_IF_ERROR(xyb_encoding.CreateICC());
-  }
-  const ColorEncoding& output_encoding =
-      jpeg_settings.xyb ? xyb_encoding : color_encoding;
-
-  // We need to declare all the non-trivial destructor local variables
-  // before the call to setjmp().
-  std::vector<uint8_t> pixels;
-  unsigned char* output_buffer = nullptr;
-  unsigned long output_size = 0;  // NOLINT
-  std::vector<uint8_t> row_bytes;
-  const size_t max_vector_size = MaxVectorSize();
-  size_t rowlen = RoundUpTo(ppf.info.xsize, max_vector_size);
-  hwy::AlignedFreeUniquePtr<float[]> xyb_tmp =
-      hwy::AllocateAligned<float>(6 * rowlen);
-  hwy::AlignedFreeUniquePtr<float[]> premul_absorb =
-      hwy::AllocateAligned<float>(max_vector_size * 12);
-  ComputePremulAbsorb(255.0f, premul_absorb.get());
-
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    jpeg_error_mgr jerr;
-    jmp_buf env;
-    cinfo.err = jpegli_std_error(&jerr);
-    jerr.error_exit = &MyErrorExit;
-    if (setjmp(env)) {
-      return false;
-    }
-    cinfo.client_data = static_cast<void*>(&env);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &output_buffer, &output_size);
-    const JxlBasicInfo& info = ppf.info;
-    cinfo.image_width = info.xsize;
-    cinfo.image_height = info.ysize;
-    cinfo.input_components = info.num_color_channels;
-    cinfo.in_color_space =
-        cinfo.input_components == 1 ? JCS_GRAYSCALE : JCS_RGB;
-    if (jpeg_settings.xyb) {
-      jpegli_set_xyb_mode(&cinfo);
-      cinfo.input_components = 3;
-      cinfo.in_color_space = JCS_RGB;
-    } else if (jpeg_settings.use_std_quant_tables) {
-      jpegli_use_standard_quant_tables(&cinfo);
-    }
-    uint8_t cicp_tf = kUnknownTf;
-    if (!jpeg_settings.app_data.empty()) {
-      cicp_tf = LookupCICPTransferFunctionFromAppData(
-          jpeg_settings.app_data.data(), jpeg_settings.app_data.size());
-    } else if (!output_encoding.IsSRGB()) {
-      cicp_tf = LookupCICPTransferFunctionFromICCProfile(
-          output_encoding.ICC().data(), output_encoding.ICC().size());
-    }
-    jpegli_set_cicp_transfer_function(&cinfo, cicp_tf);
-    jpegli_set_defaults(&cinfo);
-    if (!jpeg_settings.chroma_subsampling.empty()) {
-      if (jpeg_settings.chroma_subsampling == "444") {
-        cinfo.comp_info[0].h_samp_factor = 1;
-        cinfo.comp_info[0].v_samp_factor = 1;
-      } else if (jpeg_settings.chroma_subsampling == "440") {
-        cinfo.comp_info[0].h_samp_factor = 1;
-        cinfo.comp_info[0].v_samp_factor = 2;
-      } else if (jpeg_settings.chroma_subsampling == "422") {
-        cinfo.comp_info[0].h_samp_factor = 2;
-        cinfo.comp_info[0].v_samp_factor = 1;
-      } else if (jpeg_settings.chroma_subsampling == "420") {
-        cinfo.comp_info[0].h_samp_factor = 2;
-        cinfo.comp_info[0].v_samp_factor = 2;
-      } else {
-        return false;
-      }
-      for (int i = 1; i < cinfo.num_components; ++i) {
-        cinfo.comp_info[i].h_samp_factor = 1;
-        cinfo.comp_info[i].v_samp_factor = 1;
-      }
-    } else if (!jpeg_settings.xyb) {
-      // Default is no chroma subsampling.
-      cinfo.comp_info[0].h_samp_factor = 1;
-      cinfo.comp_info[0].v_samp_factor = 1;
-    }
-    jpegli_enable_adaptive_quantization(
-        &cinfo, TO_JXL_BOOL(jpeg_settings.use_adaptive_quantization));
-    if (jpeg_settings.psnr_target > 0.0) {
-      jpegli_set_psnr(&cinfo, jpeg_settings.psnr_target,
-                      jpeg_settings.search_tolerance,
-                      jpeg_settings.min_distance, jpeg_settings.max_distance);
-    } else if (jpeg_settings.quality > 0.0) {
-      float distance = jpegli_quality_to_distance(jpeg_settings.quality);
-      jpegli_set_distance(&cinfo, distance, TRUE);
-    } else {
-      jpegli_set_distance(&cinfo, jpeg_settings.distance, TRUE);
-    }
-    jpegli_set_progressive_level(&cinfo, jpeg_settings.progressive_level);
-    cinfo.optimize_coding = TO_JXL_BOOL(jpeg_settings.optimize_coding);
-    if (!jpeg_settings.app_data.empty()) {
-      // Make sure jpegli_start_compress() does not write any APP markers.
-      cinfo.write_JFIF_header = JXL_FALSE;
-      cinfo.write_Adobe_marker = JXL_FALSE;
-    }
-    const PackedImage& image = ppf.frames[0].color;
-    if (jpeg_settings.xyb) {
-      jpegli_set_input_format(&cinfo, JPEGLI_TYPE_FLOAT, JPEGLI_NATIVE_ENDIAN);
-    } else {
-      jpegli_set_input_format(&cinfo, ConvertDataType(image.format.data_type),
-                              ConvertEndianness(image.format.endianness));
-    }
-    jpegli_start_compress(&cinfo, TRUE);
-    if (!jpeg_settings.app_data.empty()) {
-      JXL_RETURN_IF_ERROR(WriteAppData(&cinfo, jpeg_settings.app_data));
-    }
-    if ((jpeg_settings.app_data.empty() && !output_encoding.IsSRGB()) ||
-        jpeg_settings.xyb) {
-      jpegli_write_icc_profile(&cinfo, output_encoding.ICC().data(),
-                               output_encoding.ICC().size());
-    }
-    const uint8_t* pixels = reinterpret_cast<const uint8_t*>(image.pixels());
-    if (jpeg_settings.xyb) {
-      float* src_buf = c_transform.BufSrc(0);
-      float* dst_buf = c_transform.BufDst(0);
-      for (size_t y = 0; y < image.ysize; ++y) {
-        // convert to float
-        ToFloatRow(&pixels[y * image.stride], image.format, image.xsize,
-                   info.num_color_channels, src_buf);
-        // convert to linear srgb
-        if (!c_transform.Run(0, src_buf, dst_buf, image.xsize)) {
-          return false;
-        }
-        // deinterleave channels
-        float* row0 = &xyb_tmp[0];
-        float* row1 = &xyb_tmp[rowlen];
-        float* row2 = &xyb_tmp[2 * rowlen];
-        for (size_t x = 0; x < image.xsize; ++x) {
-          row0[x] = dst_buf[3 * x + 0];
-          row1[x] = dst_buf[3 * x + 1];
-          row2[x] = dst_buf[3 * x + 2];
-        }
-        // convert to xyb
-        LinearRGBRowToXYB(row0, row1, row2, premul_absorb.get(), image.xsize);
-        // scale xyb
-        ScaleXYBRow(row0, row1, row2, image.xsize);
-        // interleave channels
-        float* row_out = &xyb_tmp[3 * rowlen];
-        for (size_t x = 0; x < image.xsize; ++x) {
-          row_out[3 * x + 0] = row0[x];
-          row_out[3 * x + 1] = row1[x];
-          row_out[3 * x + 2] = row2[x];
-        }
-        // feed to jpegli as native endian floats
-        JSAMPROW row[] = {reinterpret_cast<uint8_t*>(row_out)};
-        jpegli_write_scanlines(&cinfo, row, 1);
-      }
-    } else {
-      row_bytes.resize(image.stride);
-      if (cinfo.num_components == static_cast<int>(image.format.num_channels)) {
-        for (size_t y = 0; y < info.ysize; ++y) {
-          memcpy(row_bytes.data(), pixels + y * image.stride, image.stride);
-          JSAMPROW row[] = {row_bytes.data()};
-          jpegli_write_scanlines(&cinfo, row, 1);
-        }
-      } else {
-        for (size_t y = 0; y < info.ysize; ++y) {
-          JXL_RETURN_IF_ERROR(
-              PackedImage::ValidateDataType(image.format.data_type));
-          int bytes_per_channel =
-              PackedImage::BitsPerChannel(image.format.data_type) / 8;
-          int bytes_per_pixel = cinfo.num_components * bytes_per_channel;
-          for (size_t x = 0; x < info.xsize; ++x) {
-            memcpy(&row_bytes[x * bytes_per_pixel],
-                   &pixels[y * image.stride + x * image.pixel_stride()],
-                   bytes_per_pixel);
-          }
-          JSAMPROW row[] = {row_bytes.data()};
-          jpegli_write_scanlines(&cinfo, row, 1);
-        }
-      }
-    }
-    jpegli_finish_compress(&cinfo);
-    compressed->resize(output_size);
-    std::copy_n(output_buffer, output_size, compressed->data());
-    return true;
-  };
-  bool success = try_catch_block();
-  jpegli_destroy_compress(&cinfo);
-  if (output_buffer) free(output_buffer);
-  return success;
-}
-
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/enc/jpegli.h b/third_party/jpeg-xl/lib/extras/enc/jpegli.h
deleted file mode 100644
index 9538b2e3fc92e..0000000000000
--- a/third_party/jpeg-xl/lib/extras/enc/jpegli.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_ENC_JPEGLI_H_
-#define LIB_EXTRAS_ENC_JPEGLI_H_
-
-// Encodes JPG pixels and metadata in memory using the libjpegli library.
-
-#include <stdint.h>
-
-#include <string>
-#include <vector>
-
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-namespace extras {
-
-struct JpegSettings {
-  bool xyb = false;
-  size_t target_size = 0;
-  float quality = 0.0f;
-  float distance = 1.f;
-  bool use_adaptive_quantization = true;
-  bool use_std_quant_tables = false;
-  int progressive_level = 2;
-  bool optimize_coding = true;
-  std::string chroma_subsampling;
-  int libjpeg_quality = 0;
-  std::string libjpeg_chroma_subsampling;
-  // Parameters for selecting distance based on PSNR target.
-  float psnr_target = 0.0f;
-  float search_tolerance = 0.01;
-  float min_distance = 0.1f;
-  float max_distance = 25.0f;
-  // If not empty, must contain concatenated APP marker segments. In this case,
-  // these and only these APP marker segments will be written to the JPEG
-  // output. In xyb mode app_data must not contain an ICC profile, in this
-  // case an additional APP2 ICC profile for the XYB colorspace will be emitted.
-  std::vector<uint8_t> app_data;
-};
-
-Status EncodeJpeg(const PackedPixelFile& ppf, const JpegSettings& jpeg_settings,
-                  ThreadPool* pool, std::vector<uint8_t>* compressed);
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_ENC_JPEGLI_H_
diff --git a/third_party/jpeg-xl/lib/extras/enc/jpg.cc b/third_party/jpeg-xl/lib/extras/enc/jpg.cc
deleted file mode 100644
index a9209ffce0eec..0000000000000
--- a/third_party/jpeg-xl/lib/extras/enc/jpg.cc
+++ /dev/null
@@ -1,618 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/enc/jpg.h"
-
-#if JPEGXL_ENABLE_JPEG
-#include "lib/jxl/base/include_jpeglib.h"  // NOLINT
-#endif
-
-#include <algorithm>
-#include <array>
-#include <cmath>
-#include <cstdint>
-#include <fstream>
-#include <memory>
-#include <sstream>
-#include <utility>
-#include <vector>
-
-#include "lib/extras/exif.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/sanitizers.h"
-#include "lib/jxl/base/status.h"
-#if JPEGXL_ENABLE_SJPEG
-#include "sjpeg.h"
-#include "sjpegi.h"
-#endif
-
-namespace jxl {
-namespace extras {
-
-#if JPEGXL_ENABLE_JPEG
-namespace {
-
-constexpr unsigned char kICCSignature[12] = {
-    0x49, 0x43, 0x43, 0x5F, 0x50, 0x52, 0x4F, 0x46, 0x49, 0x4C, 0x45, 0x00};
-constexpr int kICCMarker = JPEG_APP0 + 2;
-constexpr size_t kMaxBytesInMarker = 65533;
-
-constexpr unsigned char kExifSignature[6] = {0x45, 0x78, 0x69,
-                                             0x66, 0x00, 0x00};
-constexpr int kExifMarker = JPEG_APP0 + 1;
-
-enum class JpegEncoder {
-  kLibJpeg,
-  kSJpeg,
-};
-
-// Popular jpeg scan scripts
-// The fields of the individual scans are:
-// comps_in_scan, component_index[], Ss, Se, Ah, Al
-constexpr auto kScanScript1 = to_array<jpeg_scan_info>({
-    {1, {0}, 0, 0, 0, 0},   //
-    {1, {1}, 0, 0, 0, 0},   //
-    {1, {2}, 0, 0, 0, 0},   //
-    {1, {0}, 1, 8, 0, 0},   //
-    {1, {0}, 9, 63, 0, 0},  //
-    {1, {1}, 1, 63, 0, 0},  //
-    {1, {2}, 1, 63, 0, 0}   //
-});
-constexpr size_t kNumScans1 = kScanScript1.size();
-
-constexpr auto kScanScript2 = to_array<jpeg_scan_info>({
-    {1, {0}, 0, 0, 0, 0},   //
-    {1, {1}, 0, 0, 0, 0},   //
-    {1, {2}, 0, 0, 0, 0},   //
-    {1, {0}, 1, 2, 0, 1},   //
-    {1, {0}, 3, 63, 0, 1},  //
-    {1, {0}, 1, 63, 1, 0},  //
-    {1, {1}, 1, 63, 0, 0},  //
-    {1, {2}, 1, 63, 0, 0}   //
-});
-constexpr size_t kNumScans2 = kScanScript2.size();
-
-constexpr auto kScanScript3 = to_array<jpeg_scan_info>({
-    {1, {0}, 0, 0, 0, 0},   //
-    {1, {1}, 0, 0, 0, 0},   //
-    {1, {2}, 0, 0, 0, 0},   //
-    {1, {0}, 1, 63, 0, 2},  //
-    {1, {0}, 1, 63, 2, 1},  //
-    {1, {0}, 1, 63, 1, 0},  //
-    {1, {1}, 1, 63, 0, 0},  //
-    {1, {2}, 1, 63, 0, 0}   //
-});
-constexpr size_t kNumScans3 = kScanScript3.size();
-
-constexpr auto kScanScript4 = to_array<jpeg_scan_info>({
-    {3, {0, 1, 2}, 0, 0, 0, 1},  //
-    {1, {0}, 1, 5, 0, 2},        //
-    {1, {2}, 1, 63, 0, 1},       //
-    {1, {1}, 1, 63, 0, 1},       //
-    {1, {0}, 6, 63, 0, 2},       //
-    {1, {0}, 1, 63, 2, 1},       //
-    {3, {0, 1, 2}, 0, 0, 1, 0},  //
-    {1, {2}, 1, 63, 1, 0},       //
-    {1, {1}, 1, 63, 1, 0},       //
-    {1, {0}, 1, 63, 1, 0}        //
-});
-constexpr size_t kNumScans4 = kScanScript4.size();
-
-constexpr auto kScanScript5 = to_array<jpeg_scan_info>({
-    {3, {0, 1, 2}, 0, 0, 0, 1},  //
-    {1, {0}, 1, 5, 0, 2},        //
-    {1, {1}, 1, 5, 0, 2},        //
-    {1, {2}, 1, 5, 0, 2},        //
-    {1, {1}, 6, 63, 0, 2},       //
-    {1, {2}, 6, 63, 0, 2},       //
-    {1, {0}, 6, 63, 0, 2},       //
-    {1, {0}, 1, 63, 2, 1},       //
-    {1, {1}, 1, 63, 2, 1},       //
-    {1, {2}, 1, 63, 2, 1},       //
-    {3, {0, 1, 2}, 0, 0, 1, 0},  //
-    {1, {0}, 1, 63, 1, 0},       //
-    {1, {1}, 1, 63, 1, 0},       //
-    {1, {2}, 1, 63, 1, 0}        //
-});
-constexpr size_t kNumScans5 = kScanScript5.size();
-
-// default progressive mode of jpegli
-constexpr auto kScanScript6 = to_array<jpeg_scan_info>({
-    {3, {0, 1, 2}, 0, 0, 0, 0},  //
-    {1, {0}, 1, 2, 0, 0},        //
-    {1, {1}, 1, 2, 0, 0},        //
-    {1, {2}, 1, 2, 0, 0},        //
-    {1, {0}, 3, 63, 0, 2},       //
-    {1, {1}, 3, 63, 0, 2},       //
-    {1, {2}, 3, 63, 0, 2},       //
-    {1, {0}, 3, 63, 2, 1},       //
-    {1, {1}, 3, 63, 2, 1},       //
-    {1, {2}, 3, 63, 2, 1},       //
-    {1, {0}, 3, 63, 1, 0},       //
-    {1, {1}, 3, 63, 1, 0},       //
-    {1, {2}, 3, 63, 1, 0},       //
-});
-constexpr size_t kNumScans6 = kScanScript6.size();
-
-// Adapt RGB scan info to grayscale jpegs.
-void FilterScanComponents(const jpeg_compress_struct* cinfo,
-                          jpeg_scan_info* si) {
-  const int all_comps_in_scan = si->comps_in_scan;
-  si->comps_in_scan = 0;
-  for (int j = 0; j < all_comps_in_scan; ++j) {
-    const int component = si->component_index[j];
-    if (component < cinfo->input_components) {
-      si->component_index[si->comps_in_scan++] = component;
-    }
-  }
-}
-
-Status SetJpegProgression(int progressive_id,
-                          std::vector<jpeg_scan_info>* scan_infos,
-                          jpeg_compress_struct* cinfo) {
-  if (progressive_id < 0) {
-    return true;
-  }
-  if (progressive_id == 0) {
-    jpeg_simple_progression(cinfo);
-    return true;
-  }
-  const jpeg_scan_info* kScanScripts[] = {
-      kScanScript1.data(), kScanScript2.data(), kScanScript3.data(),
-      kScanScript4.data(), kScanScript5.data(), kScanScript6.data()};
-  constexpr auto kNumScans = to_array<size_t>(
-      {kNumScans1, kNumScans2, kNumScans3, kNumScans4, kNumScans5, kNumScans6});
-  if (progressive_id > static_cast<int>(kNumScans.size())) {
-    return JXL_FAILURE("Unknown jpeg scan script id %d", progressive_id);
-  }
-  const jpeg_scan_info* scan_script = kScanScripts[progressive_id - 1];
-  const size_t num_scans = kNumScans[progressive_id - 1];
-  // filter scan script for number of components
-  for (size_t i = 0; i < num_scans; ++i) {
-    jpeg_scan_info scan_info = scan_script[i];
-    FilterScanComponents(cinfo, &scan_info);
-    if (scan_info.comps_in_scan > 0) {
-      scan_infos->emplace_back(scan_info);
-    }
-  }
-  cinfo->scan_info = scan_infos->data();
-  cinfo->num_scans = scan_infos->size();
-  return true;
-}
-
-void WriteICCProfile(jpeg_compress_struct* const cinfo,
-                     const std::vector<uint8_t>& icc) {
-  constexpr size_t kMaxIccBytesInMarker =
-      kMaxBytesInMarker - sizeof kICCSignature - 2;
-  const int num_markers =
-      static_cast<int>(DivCeil(icc.size(), kMaxIccBytesInMarker));
-  size_t begin = 0;
-  for (int current_marker = 0; current_marker < num_markers; ++current_marker) {
-    const size_t length = std::min(kMaxIccBytesInMarker, icc.size() - begin);
-    jpeg_write_m_header(
-        cinfo, kICCMarker,
-        static_cast<unsigned int>(length + sizeof kICCSignature + 2));
-    for (const unsigned char c : kICCSignature) {
-      jpeg_write_m_byte(cinfo, c);
-    }
-    jpeg_write_m_byte(cinfo, current_marker + 1);
-    jpeg_write_m_byte(cinfo, num_markers);
-    for (size_t i = 0; i < length; ++i) {
-      jpeg_write_m_byte(cinfo, icc[begin]);
-      ++begin;
-    }
-  }
-}
-void WriteExif(jpeg_compress_struct* const cinfo,
-               const std::vector<uint8_t>& exif) {
-  jpeg_write_m_header(
-      cinfo, kExifMarker,
-      static_cast<unsigned int>(exif.size() + sizeof kExifSignature));
-  for (const unsigned char c : kExifSignature) {
-    jpeg_write_m_byte(cinfo, c);
-  }
-  for (uint8_t c : exif) {
-    jpeg_write_m_byte(cinfo, c);
-  }
-}
-
-Status SetChromaSubsampling(const std::string& subsampling,
-                            jpeg_compress_struct* const cinfo) {
-  const std::pair<const char*,
-                  std::pair<std::array<uint8_t, 3>, std::array<uint8_t, 3>>>
-      options[] = {{"444", {{{1, 1, 1}}, {{1, 1, 1}}}},
-                   {"420", {{{2, 1, 1}}, {{2, 1, 1}}}},
-                   {"422", {{{2, 1, 1}}, {{1, 1, 1}}}},
-                   {"440", {{{1, 1, 1}}, {{2, 1, 1}}}}};
-  for (const auto& option : options) {
-    if (subsampling == option.first) {
-      for (size_t i = 0; i < 3; i++) {
-        cinfo->comp_info[i].h_samp_factor = option.second.first[i];
-        cinfo->comp_info[i].v_samp_factor = option.second.second[i];
-      }
-      return true;
-    }
-  }
-  return false;
-}
-
-struct JpegParams {
-  // Common between sjpeg and libjpeg
-  int quality = 100;
-  std::string chroma_subsampling = "444";
-  // Libjpeg parameters
-  int progressive_id = -1;
-  bool optimize_coding = true;
-  bool is_xyb = false;
-  // Sjpeg parameters
-  int libjpeg_quality = 0;
-  std::string libjpeg_chroma_subsampling = "444";
-  float psnr_target = 0;
-  std::string custom_base_quant_fn;
-  float search_q_start = 65.0f;
-  float search_q_min = 1.0f;
-  float search_q_max = 100.0f;
-  int search_max_iters = 20;
-  float search_tolerance = 0.1f;
-  float search_q_precision = 0.01f;
-  float search_first_iter_slope = 3.0f;
-  bool enable_adaptive_quant = true;
-};
-
-Status EncodeWithLibJpeg(const PackedImage& image, const JxlBasicInfo& info,
-                         const std::vector<uint8_t>& icc,
-                         std::vector<uint8_t> exif, const JpegParams& params,
-                         std::vector<uint8_t>* bytes) {
-  if (BITS_IN_JSAMPLE != 8 || sizeof(JSAMPLE) != 1) {
-    return JXL_FAILURE("Only 8 bit JSAMPLE is supported.");
-  }
-  jpeg_compress_struct cinfo = {};
-  jpeg_error_mgr jerr;
-  cinfo.err = jpeg_std_error(&jerr);
-  jpeg_create_compress(&cinfo);
-  unsigned char* buffer = nullptr;
-#ifdef LIBJPEG_TURBO_VERSION
-  unsigned long size = 0;  // NOLINT
-#else
-  size_t size = 0;  // NOLINT
-#endif
-  jpeg_mem_dest(&cinfo, &buffer, &size);
-  cinfo.image_width = image.xsize;
-  cinfo.image_height = image.ysize;
-  cinfo.input_components = info.num_color_channels;
-  cinfo.in_color_space = info.num_color_channels == 1 ? JCS_GRAYSCALE : JCS_RGB;
-  jpeg_set_defaults(&cinfo);
-  cinfo.optimize_coding = static_cast<boolean>(params.optimize_coding);
-  if (cinfo.input_components == 3) {
-    JXL_RETURN_IF_ERROR(
-        SetChromaSubsampling(params.chroma_subsampling, &cinfo));
-  }
-  if (params.is_xyb) {
-    // Tell libjpeg not to convert XYB data to YCbCr.
-    jpeg_set_colorspace(&cinfo, JCS_RGB);
-  }
-  jpeg_set_quality(&cinfo, params.quality, TRUE);
-  std::vector<jpeg_scan_info> scan_infos;
-  JXL_RETURN_IF_ERROR(
-      SetJpegProgression(params.progressive_id, &scan_infos, &cinfo));
-  jpeg_start_compress(&cinfo, TRUE);
-  if (!icc.empty()) {
-    WriteICCProfile(&cinfo, icc);
-  }
-  if (!exif.empty()) {
-    ResetExifOrientation(exif);
-    WriteExif(&cinfo, exif);
-  }
-  if (cinfo.input_components > 3 || cinfo.input_components < 0)
-    return JXL_FAILURE("invalid numbers of components");
-
-  std::vector<uint8_t> row_bytes(image.stride);
-  const uint8_t* pixels = reinterpret_cast<const uint8_t*>(image.pixels());
-  if (cinfo.num_components == static_cast<int>(image.format.num_channels) &&
-      image.format.data_type == JXL_TYPE_UINT8) {
-    for (size_t y = 0; y < info.ysize; ++y) {
-      memcpy(row_bytes.data(), pixels + y * image.stride, image.stride);
-      JSAMPROW row[] = {row_bytes.data()};
-      jpeg_write_scanlines(&cinfo, row, 1);
-    }
-  } else if (image.format.data_type == JXL_TYPE_UINT8) {
-    for (size_t y = 0; y < info.ysize; ++y) {
-      const uint8_t* image_row = pixels + y * image.stride;
-      for (size_t x = 0; x < info.xsize; ++x) {
-        const uint8_t* image_pixel = image_row + x * image.pixel_stride();
-        memcpy(&row_bytes[x * cinfo.num_components], image_pixel,
-               cinfo.num_components);
-      }
-      JSAMPROW row[] = {row_bytes.data()};
-      jpeg_write_scanlines(&cinfo, row, 1);
-    }
-  } else {
-    for (size_t y = 0; y < info.ysize; ++y) {
-      const uint8_t* image_row = pixels + y * image.stride;
-      for (size_t x = 0; x < info.xsize; ++x) {
-        const uint8_t* image_pixel = image_row + x * image.pixel_stride();
-        for (int c = 0; c < cinfo.num_components; ++c) {
-          uint32_t val16 = (image_pixel[2 * c] << 8) + image_pixel[2 * c + 1];
-          row_bytes[x * cinfo.num_components + c] = (val16 + 128) / 257;
-        }
-      }
-      JSAMPROW row[] = {row_bytes.data()};
-      jpeg_write_scanlines(&cinfo, row, 1);
-    }
-  }
-  jpeg_finish_compress(&cinfo);
-  jpeg_destroy_compress(&cinfo);
-  bytes->resize(size);
-  // Compressed image data is initialized by libjpeg, which we are not
-  // instrumenting with msan.
-  msan::UnpoisonMemory(buffer, size);
-  std::copy_n(buffer, size, bytes->data());
-  std::free(buffer);
-  return true;
-}
-
-#if JPEGXL_ENABLE_SJPEG
-struct MySearchHook : public sjpeg::SearchHook {
-  uint8_t base_tables[2][64];
-  float q_start;
-  float q_precision;
-  float first_iter_slope;
-  void ReadBaseTables(const std::string& fn) {
-    const uint8_t kJPEGAnnexKMatrices[2][64] = {
-        {16, 11, 10, 16, 24,  40,  51,  61,  12, 12, 14, 19, 26,  58,  60,  55,
-         14, 13, 16, 24, 40,  57,  69,  56,  14, 17, 22, 29, 51,  87,  80,  62,
-         18, 22, 37, 56, 68,  109, 103, 77,  24, 35, 55, 64, 81,  104, 113, 92,
-         49, 64, 78, 87, 103, 121, 120, 101, 72, 92, 95, 98, 112, 100, 103, 99},
-        {17, 18, 24, 47, 99, 99, 99, 99, 18, 21, 26, 66, 99, 99, 99, 99,
-         24, 26, 56, 99, 99, 99, 99, 99, 47, 66, 99, 99, 99, 99, 99, 99,
-         99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
-         99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99}};
-    memcpy(base_tables[0], kJPEGAnnexKMatrices[0], sizeof(base_tables[0]));
-    memcpy(base_tables[1], kJPEGAnnexKMatrices[1], sizeof(base_tables[1]));
-    if (!fn.empty()) {
-      std::ifstream f(fn);
-      std::string line;
-      int idx = 0;
-      while (idx < 128 && std::getline(f, line)) {
-        if (line.empty() || line[0] == '#') continue;
-        std::istringstream line_stream(line);
-        std::string token;
-        while (idx < 128 && std::getline(line_stream, token, ',')) {
-          uint8_t val = std::stoi(token);
-          base_tables[idx / 64][idx % 64] = val;
-          idx++;
-        }
-      }
-    }
-  }
-  bool Setup(const sjpeg::EncoderParam& param) override {
-    sjpeg::SearchHook::Setup(param);
-    q = q_start;
-    return true;
-  }
-  void NextMatrix(int idx, uint8_t dst[64]) override {
-    float factor = (q <= 0)       ? 5000.0f
-                   : (q < 50.0f)  ? 5000.0f / q
-                   : (q < 100.0f) ? 2 * (100.0f - q)
-                                  : 0.0f;
-    sjpeg::SetQuantMatrix(base_tables[idx], factor, dst);
-  }
-  bool Update(float result) override {
-    value = result;
-    if (std::fabs(value - target) < tolerance * target) {
-      return true;
-    }
-    if (value > target) {
-      qmax = q;
-    } else {
-      qmin = q;
-    }
-    if (qmin == qmax) {
-      return true;
-    }
-    const float last_q = q;
-    if (pass == 0) {
-      q += first_iter_slope *
-           (for_size ? 0.1 * std::log(target / value) : (target - value));
-      q = std::max(qmin, std::min(qmax, q));
-    } else {
-      q = (qmin + qmax) / 2.;
-    }
-    return (pass > 0 && std::fabs(q - last_q) < q_precision);
-  }
-  ~MySearchHook() override = default;
-};
-#endif
-
-Status EncodeWithSJpeg(const PackedImage& image, const JxlBasicInfo& info,
-                       const std::vector<uint8_t>& icc,
-                       std::vector<uint8_t> exif, const JpegParams& params,
-                       std::vector<uint8_t>* bytes) {
-#if !JPEGXL_ENABLE_SJPEG
-  return JXL_FAILURE("JPEG XL was built without sjpeg support");
-#else
-  if (image.format.data_type != JXL_TYPE_UINT8) {
-    return JXL_FAILURE("Unsupported pixel data type");
-  }
-  if (info.alpha_bits > 0) {
-    return JXL_FAILURE("alpha is not supported");
-  }
-  sjpeg::EncoderParam param(params.quality);
-  if (!icc.empty()) {
-    param.iccp.assign(icc.begin(), icc.end());
-  }
-  if (!exif.empty()) {
-    ResetExifOrientation(exif);
-    param.exif.assign(exif.begin(), exif.end());
-  }
-  if (params.chroma_subsampling == "444") {
-    param.yuv_mode = SJPEG_YUV_444;
-  } else if (params.chroma_subsampling == "420") {
-    param.yuv_mode = SJPEG_YUV_420;
-  } else if (params.chroma_subsampling == "420sharp") {
-    param.yuv_mode = SJPEG_YUV_SHARP;
-  } else {
-    return JXL_FAILURE("sjpeg does not support this chroma subsampling mode");
-  }
-  param.adaptive_quantization = params.enable_adaptive_quant;
-  std::unique_ptr<MySearchHook> hook;
-  if (params.libjpeg_quality > 0) {
-    JpegParams libjpeg_params;
-    libjpeg_params.quality = params.libjpeg_quality;
-    libjpeg_params.chroma_subsampling = params.libjpeg_chroma_subsampling;
-    std::vector<uint8_t> libjpeg_bytes;
-    JXL_RETURN_IF_ERROR(EncodeWithLibJpeg(image, info, icc, exif,
-                                          libjpeg_params, &libjpeg_bytes));
-    param.target_mode = sjpeg::EncoderParam::TARGET_SIZE;
-    param.target_value = libjpeg_bytes.size();
-  }
-  if (params.psnr_target > 0) {
-    param.target_mode = sjpeg::EncoderParam::TARGET_PSNR;
-    param.target_value = params.psnr_target;
-  }
-  if (param.target_mode != sjpeg::EncoderParam::TARGET_NONE) {
-    param.passes = params.search_max_iters;
-    param.tolerance = params.search_tolerance;
-    param.qmin = params.search_q_min;
-    param.qmax = params.search_q_max;
-    hook = jxl::make_unique<MySearchHook>();
-    hook->ReadBaseTables(params.custom_base_quant_fn);
-    hook->q_start = params.search_q_start;
-    hook->q_precision = params.search_q_precision;
-    hook->first_iter_slope = params.search_first_iter_slope;
-    param.search_hook = hook.get();
-  }
-  size_t stride = info.xsize * 3;
-  const uint8_t* pixels = reinterpret_cast<const uint8_t*>(image.pixels());
-  std::string output;
-  JXL_RETURN_IF_ERROR(
-      sjpeg::Encode(pixels, image.xsize, image.ysize, stride, param, &output));
-  bytes->assign(
-      reinterpret_cast<const uint8_t*>(output.data()),
-      reinterpret_cast<const uint8_t*>(output.data() + output.size()));
-  return true;
-#endif
-}
-
-Status EncodeImageJPG(const PackedImage& image, const JxlBasicInfo& info,
-                      const std::vector<uint8_t>& icc,
-                      std::vector<uint8_t> exif, JpegEncoder encoder,
-                      const JpegParams& params, ThreadPool* pool,
-                      std::vector<uint8_t>* bytes) {
-  if (params.quality > 100) {
-    return JXL_FAILURE("please specify a 0-100 JPEG quality");
-  }
-
-  switch (encoder) {
-    case JpegEncoder::kLibJpeg:
-      JXL_RETURN_IF_ERROR(
-          EncodeWithLibJpeg(image, info, icc, std::move(exif), params, bytes));
-      break;
-    case JpegEncoder::kSJpeg:
-      JXL_RETURN_IF_ERROR(
-          EncodeWithSJpeg(image, info, icc, std::move(exif), params, bytes));
-      break;
-    default:
-      return JXL_FAILURE("tried to use an unknown JPEG encoder");
-  }
-
-  return true;
-}
-
-class JPEGEncoder : public Encoder {
-  std::vector<JxlPixelFormat> AcceptedFormats() const override {
-    std::vector<JxlPixelFormat> formats;
-    for (const uint32_t num_channels : {1, 2, 3, 4}) {
-      for (JxlEndianness endianness : {JXL_BIG_ENDIAN, JXL_LITTLE_ENDIAN}) {
-        formats.push_back(JxlPixelFormat{/*num_channels=*/num_channels,
-                                         /*data_type=*/JXL_TYPE_UINT8,
-                                         /*endianness=*/endianness,
-                                         /*align=*/0});
-      }
-      formats.push_back(JxlPixelFormat{/*num_channels=*/num_channels,
-                                       /*data_type=*/JXL_TYPE_UINT16,
-                                       /*endianness=*/JXL_BIG_ENDIAN,
-                                       /*align=*/0});
-    }
-    return formats;
-  }
-  Status Encode(const PackedPixelFile& ppf, EncodedImage* encoded_image,
-                ThreadPool* pool) const override {
-    JXL_RETURN_IF_ERROR(VerifyBasicInfo(ppf.info));
-    JpegEncoder jpeg_encoder = JpegEncoder::kLibJpeg;
-    JpegParams params;
-    for (const auto& it : options()) {
-      if (it.first == "q") {
-        std::istringstream is(it.second);
-        JXL_RETURN_IF_ERROR(static_cast<bool>(is >> params.quality));
-      } else if (it.first == "libjpeg_quality") {
-        std::istringstream is(it.second);
-        JXL_RETURN_IF_ERROR(static_cast<bool>(is >> params.libjpeg_quality));
-      } else if (it.first == "chroma_subsampling") {
-        params.chroma_subsampling = it.second;
-      } else if (it.first == "libjpeg_chroma_subsampling") {
-        params.libjpeg_chroma_subsampling = it.second;
-      } else if (it.first == "jpeg_encoder") {
-        if (it.second == "libjpeg") {
-          jpeg_encoder = JpegEncoder::kLibJpeg;
-        } else if (it.second == "sjpeg") {
-          jpeg_encoder = JpegEncoder::kSJpeg;
-        } else {
-          return JXL_FAILURE("unknown jpeg encoder \"%s\"", it.second.c_str());
-        }
-      } else if (it.first == "progressive") {
-        std::istringstream is(it.second);
-        JXL_RETURN_IF_ERROR(static_cast<bool>(is >> params.progressive_id));
-      } else if (it.first == "optimize" && it.second == "OFF") {
-        params.optimize_coding = false;
-      } else if (it.first == "adaptive_q" && it.second == "OFF") {
-        params.enable_adaptive_quant = false;
-      } else if (it.first == "psnr") {
-        params.psnr_target = std::stof(it.second);
-      } else if (it.first == "base_quant_fn") {
-        params.custom_base_quant_fn = it.second;
-      } else if (it.first == "search_q_start") {
-        params.search_q_start = std::stof(it.second);
-      } else if (it.first == "search_q_min") {
-        params.search_q_min = std::stof(it.second);
-      } else if (it.first == "search_q_max") {
-        params.search_q_max = std::stof(it.second);
-      } else if (it.first == "search_max_iters") {
-        params.search_max_iters = std::stoi(it.second);
-      } else if (it.first == "search_tolerance") {
-        params.search_tolerance = std::stof(it.second);
-      } else if (it.first == "search_q_precision") {
-        params.search_q_precision = std::stof(it.second);
-      } else if (it.first == "search_first_iter_slope") {
-        params.search_first_iter_slope = std::stof(it.second);
-      }
-    }
-    params.is_xyb = (ppf.color_encoding.color_space == JXL_COLOR_SPACE_XYB);
-    encoded_image->bitstreams.clear();
-    encoded_image->bitstreams.reserve(ppf.frames.size());
-    for (const auto& frame : ppf.frames) {
-      JXL_RETURN_IF_ERROR(VerifyPackedImage(frame.color, ppf.info));
-      encoded_image->bitstreams.emplace_back();
-      JXL_RETURN_IF_ERROR(EncodeImageJPG(
-          frame.color, ppf.info, ppf.icc, ppf.metadata.exif, jpeg_encoder,
-          params, pool, &encoded_image->bitstreams.back()));
-    }
-    return true;
-  }
-};
-
-}  // namespace
-#endif
-
-std::unique_ptr<Encoder> GetJPEGEncoder() {
-#if JPEGXL_ENABLE_JPEG
-  return jxl::make_unique<JPEGEncoder>();
-#else
-  return nullptr;
-#endif
-}
-
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/enc/jpg.h b/third_party/jpeg-xl/lib/extras/enc/jpg.h
deleted file mode 100644
index 20b37cd168446..0000000000000
--- a/third_party/jpeg-xl/lib/extras/enc/jpg.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_ENC_JPG_H_
-#define LIB_EXTRAS_ENC_JPG_H_
-
-// Encodes JPG pixels and metadata in memory.
-
-#include <memory>
-
-#include "lib/extras/enc/encode.h"
-
-namespace jxl {
-namespace extras {
-
-std::unique_ptr<Encoder> GetJPEGEncoder();
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_ENC_JPG_H_
diff --git a/third_party/jpeg-xl/lib/extras/enc/jxl.cc b/third_party/jpeg-xl/lib/extras/enc/jxl.cc
deleted file mode 100644
index 15f62673161da..0000000000000
--- a/third_party/jpeg-xl/lib/extras/enc/jxl.cc
+++ /dev/null
@@ -1,387 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/enc/jxl.h"
-
-#include <jxl/codestream_header.h>
-#include <jxl/encode.h>
-#include <jxl/encode_cxx.h>
-#include <jxl/types.h>
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#include <vector>
-
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/exif.h"
-
-namespace jxl {
-namespace extras {
-
-JxlEncoderStatus SetOption(const JXLOption& opt,
-                           JxlEncoderFrameSettings* settings) {
-  return opt.is_float
-             ? JxlEncoderFrameSettingsSetFloatOption(settings, opt.id, opt.fval)
-             : JxlEncoderFrameSettingsSetOption(settings, opt.id, opt.ival);
-}
-
-bool SetFrameOptions(const std::vector<JXLOption>& options, size_t frame_index,
-                     size_t* option_idx, JxlEncoderFrameSettings* settings) {
-  while (*option_idx < options.size()) {
-    const auto& opt = options[*option_idx];
-    if (opt.frame_index > frame_index) {
-      break;
-    }
-    if (JXL_ENC_SUCCESS != SetOption(opt, settings)) {
-      fprintf(stderr, "Setting option id %d failed.\n", opt.id);
-      return false;
-    }
-    (*option_idx)++;
-  }
-  return true;
-}
-
-bool SetupFrame(JxlEncoder* enc, JxlEncoderFrameSettings* settings,
-                const JxlFrameHeader& frame_header,
-                const JXLCompressParams& params, const PackedPixelFile& ppf,
-                size_t frame_index, size_t num_alpha_channels,
-                size_t num_interleaved_alpha, size_t& option_idx) {
-  if (JXL_ENC_SUCCESS != JxlEncoderSetFrameHeader(settings, &frame_header)) {
-    fprintf(stderr, "JxlEncoderSetFrameHeader() failed.\n");
-    return false;
-  }
-  if (!SetFrameOptions(params.options, frame_index, &option_idx, settings)) {
-    return false;
-  }
-  if (num_alpha_channels > 0) {
-    JxlExtraChannelInfo extra_channel_info;
-    JxlEncoderInitExtraChannelInfo(JXL_CHANNEL_ALPHA, &extra_channel_info);
-    extra_channel_info.bits_per_sample = ppf.info.alpha_bits;
-    extra_channel_info.exponent_bits_per_sample = ppf.info.alpha_exponent_bits;
-    if (params.premultiply != -1) {
-      if (params.premultiply != 0 && params.premultiply != 1) {
-        fprintf(stderr, "premultiply must be one of: -1, 0, 1.\n");
-        return false;
-      }
-      extra_channel_info.alpha_premultiplied = params.premultiply;
-    }
-    if (JXL_ENC_SUCCESS !=
-        JxlEncoderSetExtraChannelInfo(enc, 0, &extra_channel_info)) {
-      fprintf(stderr, "JxlEncoderSetExtraChannelInfo() failed.\n");
-      return false;
-    }
-    // We take the extra channel blend info frame_info, but don't do
-    // clamping.
-    JxlBlendInfo extra_channel_blend_info = frame_header.layer_info.blend_info;
-    extra_channel_blend_info.clamp = JXL_FALSE;
-    JxlEncoderSetExtraChannelBlendInfo(settings, 0, &extra_channel_blend_info);
-  }
-  // Add extra channel info for the rest of the extra channels.
-  for (size_t i = 0; i < ppf.info.num_extra_channels; ++i) {
-    if (i < ppf.extra_channels_info.size()) {
-      const auto& ec_info = ppf.extra_channels_info[i].ec_info;
-      if (JXL_ENC_SUCCESS != JxlEncoderSetExtraChannelInfo(
-                                 enc, num_interleaved_alpha + i, &ec_info)) {
-        fprintf(stderr, "JxlEncoderSetExtraChannelInfo() failed.\n");
-        return false;
-      }
-    }
-  }
-  return true;
-}
-
-bool ReadCompressedOutput(JxlEncoder* enc, std::vector<uint8_t>* compressed) {
-  compressed->clear();
-  compressed->resize(4096);
-  uint8_t* next_out = compressed->data();
-  size_t avail_out = compressed->size() - (next_out - compressed->data());
-  JxlEncoderStatus result = JXL_ENC_NEED_MORE_OUTPUT;
-  while (result == JXL_ENC_NEED_MORE_OUTPUT) {
-    result = JxlEncoderProcessOutput(enc, &next_out, &avail_out);
-    if (result == JXL_ENC_NEED_MORE_OUTPUT) {
-      size_t offset = next_out - compressed->data();
-      compressed->resize(compressed->size() * 2);
-      next_out = compressed->data() + offset;
-      avail_out = compressed->size() - offset;
-    }
-  }
-  compressed->resize(next_out - compressed->data());
-  if (result != JXL_ENC_SUCCESS) {
-    fprintf(stderr, "JxlEncoderProcessOutput failed.\n");
-    return false;
-  }
-  return true;
-}
-
-bool EncodeImageJXL(const JXLCompressParams& params, const PackedPixelFile& ppf,
-                    const std::vector<uint8_t>* jpeg_bytes,
-                    std::vector<uint8_t>* compressed) {
-  auto encoder = JxlEncoderMake(params.memory_manager);
-  JxlEncoder* enc = encoder.get();
-
-  if (params.allow_expert_options) {
-    JxlEncoderAllowExpertOptions(enc);
-  }
-
-  if (params.runner_opaque != nullptr &&
-      JXL_ENC_SUCCESS != JxlEncoderSetParallelRunner(enc, params.runner,
-                                                     params.runner_opaque)) {
-    fprintf(stderr, "JxlEncoderSetParallelRunner failed\n");
-    return false;
-  }
-
-  if (params.HasOutputProcessor() &&
-      JXL_ENC_SUCCESS !=
-          JxlEncoderSetOutputProcessor(enc, params.output_processor)) {
-    fprintf(stderr, "JxlEncoderSetOutputProcessorfailed\n");
-    return false;
-  }
-
-  auto* settings = JxlEncoderFrameSettingsCreate(enc, nullptr);
-  size_t option_idx = 0;
-  if (!SetFrameOptions(params.options, 0, &option_idx, settings)) {
-    return false;
-  }
-  if (JXL_ENC_SUCCESS !=
-      JxlEncoderSetFrameDistance(settings, params.distance)) {
-    fprintf(stderr, "Setting frame distance failed.\n");
-    return false;
-  }
-  if (params.debug_image) {
-    JxlEncoderSetDebugImageCallback(settings, params.debug_image,
-                                    params.debug_image_opaque);
-  }
-  if (params.stats) {
-    JxlEncoderCollectStats(settings, params.stats);
-  }
-
-  bool has_jpeg_bytes = (jpeg_bytes != nullptr);
-  bool use_boxes = !ppf.metadata.exif.empty() || !ppf.metadata.xmp.empty() ||
-                   !ppf.metadata.jhgm.empty() || !ppf.metadata.jumbf.empty() ||
-                   !ppf.metadata.iptc.empty();
-  bool use_container = params.use_container || use_boxes ||
-                       (has_jpeg_bytes && params.jpeg_store_metadata);
-
-  if (JXL_ENC_SUCCESS !=
-      JxlEncoderUseContainer(enc, static_cast<int>(use_container))) {
-    fprintf(stderr, "JxlEncoderUseContainer failed.\n");
-    return false;
-  }
-
-  if (has_jpeg_bytes) {
-    if (params.jpeg_store_metadata &&
-        JXL_ENC_SUCCESS != JxlEncoderStoreJPEGMetadata(enc, JXL_TRUE)) {
-      fprintf(stderr, "Storing JPEG metadata failed.\n");
-      return false;
-    }
-    if (params.jpeg_store_metadata && params.jpeg_strip_exif) {
-      fprintf(stderr,
-              "Cannot store metadata and strip exif at the same time.\n");
-      return false;
-    }
-    if (params.jpeg_store_metadata && params.jpeg_strip_xmp) {
-      fprintf(stderr,
-              "Cannot store metadata and strip xmp at the same time.\n");
-      return false;
-    }
-    if (!params.jpeg_store_metadata && params.jpeg_strip_exif) {
-      JxlEncoderFrameSettingsSetOption(settings,
-                                       JXL_ENC_FRAME_SETTING_JPEG_KEEP_EXIF, 0);
-    }
-    if (!params.jpeg_store_metadata && params.jpeg_strip_xmp) {
-      JxlEncoderFrameSettingsSetOption(settings,
-                                       JXL_ENC_FRAME_SETTING_JPEG_KEEP_XMP, 0);
-    }
-    if (params.jpeg_strip_jumbf) {
-      JxlEncoderFrameSettingsSetOption(
-          settings, JXL_ENC_FRAME_SETTING_JPEG_KEEP_JUMBF, 0);
-    }
-    if (JXL_ENC_SUCCESS != JxlEncoderAddJPEGFrame(settings, jpeg_bytes->data(),
-                                                  jpeg_bytes->size())) {
-      JxlEncoderError error = JxlEncoderGetError(enc);
-      if (error == JXL_ENC_ERR_BAD_INPUT) {
-        fprintf(stderr,
-                "Error while decoding the JPEG image. It may be corrupt (e.g. "
-                "truncated) or of an unsupported type (e.g. CMYK).\n");
-      } else if (error == JXL_ENC_ERR_JBRD) {
-        fprintf(stderr,
-                "JPEG bitstream reconstruction data could not be created. "
-                "Possibly there is too much tail data.\n"
-                "Try using --allow_jpeg_reconstruction 0, to losslessly "
-                "recompress the JPEG image data without bitstream "
-                "reconstruction data.\n");
-      } else {
-        fprintf(stderr, "JxlEncoderAddJPEGFrame() failed.\n");
-      }
-      return false;
-    }
-  } else {
-    size_t num_alpha_channels = 0;  // Adjusted below.
-    JxlBasicInfo basic_info = ppf.info;
-    basic_info.xsize *= params.already_downsampled;
-    basic_info.ysize *= params.already_downsampled;
-    if (basic_info.alpha_bits > 0) num_alpha_channels = 1;
-    if (params.intensity_target > 0) {
-      basic_info.intensity_target = params.intensity_target;
-    }
-    basic_info.num_extra_channels =
-        std::max<uint32_t>(num_alpha_channels, ppf.info.num_extra_channels);
-    basic_info.num_color_channels = ppf.info.num_color_channels;
-    const bool lossless = (params.distance == 0);
-    auto non_perceptual_option = std::find_if(
-        params.options.begin(), params.options.end(), [](JXLOption option) {
-          return option.id ==
-                 JXL_ENC_FRAME_SETTING_DISABLE_PERCEPTUAL_HEURISTICS;
-        });
-    const bool non_perceptual = non_perceptual_option != params.options.end() &&
-                                non_perceptual_option->ival == 1;
-    basic_info.uses_original_profile = TO_JXL_BOOL(lossless || non_perceptual);
-    if (params.override_bitdepth != 0) {
-      basic_info.bits_per_sample = params.override_bitdepth;
-      basic_info.exponent_bits_per_sample =
-          params.override_bitdepth == 32 ? 8 : 0;
-    }
-    if (JXL_ENC_SUCCESS !=
-        JxlEncoderSetCodestreamLevel(enc, params.codestream_level)) {
-      fprintf(stderr, "Setting --codestream_level failed.\n");
-      return false;
-    }
-    if (JXL_ENC_SUCCESS != JxlEncoderSetBasicInfo(enc, &basic_info)) {
-      fprintf(stderr, "JxlEncoderSetBasicInfo() failed.\n");
-      return false;
-    }
-    if (JXL_ENC_SUCCESS !=
-        JxlEncoderSetUpsamplingMode(enc, params.already_downsampled,
-                                    params.upsampling_mode)) {
-      fprintf(stderr, "JxlEncoderSetUpsamplingMode() failed.\n");
-      return false;
-    }
-    if (JXL_ENC_SUCCESS !=
-        JxlEncoderSetFrameBitDepth(settings, &ppf.input_bitdepth)) {
-      fprintf(stderr, "JxlEncoderSetFrameBitDepth() failed.\n");
-      return false;
-    }
-    if (num_alpha_channels != 0 &&
-        JXL_ENC_SUCCESS != JxlEncoderSetExtraChannelDistance(
-                               settings, 0, params.alpha_distance)) {
-      fprintf(stderr, "Setting alpha distance failed.\n");
-      return false;
-    }
-    if (lossless &&
-        JXL_ENC_SUCCESS != JxlEncoderSetFrameLossless(settings, JXL_TRUE)) {
-      fprintf(stderr, "JxlEncoderSetFrameLossless() failed.\n");
-      return false;
-    }
-    if (ppf.primary_color_representation == PackedPixelFile::kIccIsPrimary) {
-      if (JXL_ENC_SUCCESS !=
-          JxlEncoderSetICCProfile(enc, ppf.icc.data(), ppf.icc.size())) {
-        fprintf(stderr, "JxlEncoderSetICCProfile() failed.\n");
-        return false;
-      }
-    } else {
-      if (JXL_ENC_SUCCESS !=
-          JxlEncoderSetColorEncoding(enc, &ppf.color_encoding)) {
-        fprintf(stderr, "JxlEncoderSetColorEncoding() failed.\n");
-        return false;
-      }
-    }
-
-    if (use_boxes) {
-      if (JXL_ENC_SUCCESS != JxlEncoderUseBoxes(enc)) {
-        fprintf(stderr, "JxlEncoderUseBoxes() failed.\n");
-        return false;
-      }
-      // Prepend 4 zero bytes to exif for tiff header offset
-      std::vector<uint8_t> exif_with_offset;
-      bool bigendian;
-      if (IsExif(ppf.metadata.exif, &bigendian)) {
-        exif_with_offset.resize(ppf.metadata.exif.size() + 4);
-        memcpy(exif_with_offset.data() + 4, ppf.metadata.exif.data(),
-               ppf.metadata.exif.size());
-      }
-      const struct BoxInfo {
-        const char* type;
-        const std::vector<uint8_t>& bytes;
-      } boxes[] = {
-          {"Exif", exif_with_offset},   {"xml ", ppf.metadata.xmp},
-          {"jumb", ppf.metadata.jumbf}, {"xml ", ppf.metadata.iptc},
-          {"jhgm", ppf.metadata.jhgm},
-      };
-      for (auto box : boxes) {
-        if (!box.bytes.empty()) {
-          if (JXL_ENC_SUCCESS !=
-              JxlEncoderAddBox(enc, box.type, box.bytes.data(),
-                               box.bytes.size(),
-                               TO_JXL_BOOL(params.compress_boxes))) {
-            fprintf(stderr, "JxlEncoderAddBox() failed (%s).\n", box.type);
-            return false;
-          }
-        }
-      }
-      JxlEncoderCloseBoxes(enc);
-    }
-
-    for (size_t num_frame = 0; num_frame < ppf.frames.size(); ++num_frame) {
-      const jxl::extras::PackedFrame& pframe = ppf.frames[num_frame];
-      const jxl::extras::PackedImage& pimage = pframe.color;
-      JxlPixelFormat ppixelformat = pimage.format;
-      size_t num_interleaved_alpha =
-          (ppixelformat.num_channels - ppf.info.num_color_channels);
-      if (!SetupFrame(enc, settings, pframe.frame_info, params, ppf, num_frame,
-                      num_alpha_channels, num_interleaved_alpha, option_idx)) {
-        return false;
-      }
-      if (JXL_ENC_SUCCESS != JxlEncoderAddImageFrame(settings, &ppixelformat,
-                                                     pimage.pixels(),
-                                                     pimage.pixels_size)) {
-        fprintf(stderr, "JxlEncoderAddImageFrame() failed.\n");
-        return false;
-      }
-      // Only set extra channel buffer if it is provided non-interleaved.
-      for (size_t i = 0; i < pframe.extra_channels.size(); ++i) {
-        if (JXL_ENC_SUCCESS !=
-            JxlEncoderSetExtraChannelBuffer(settings, &ppixelformat,
-                                            pframe.extra_channels[i].pixels(),
-                                            pframe.extra_channels[i].stride *
-                                                pframe.extra_channels[i].ysize,
-                                            num_interleaved_alpha + i)) {
-          fprintf(stderr, "JxlEncoderSetExtraChannelBuffer() failed.\n");
-          return false;
-        }
-      }
-    }
-    for (size_t fi = 0; fi < ppf.chunked_frames.size(); ++fi) {
-      ChunkedPackedFrame& chunked_frame = ppf.chunked_frames[fi];
-      size_t num_interleaved_alpha =
-          (chunked_frame.format.num_channels - ppf.info.num_color_channels);
-      if (!SetupFrame(enc, settings, chunked_frame.frame_info, params, ppf, fi,
-                      num_alpha_channels, num_interleaved_alpha, option_idx)) {
-        return false;
-      }
-      const bool last_frame = fi + 1 == ppf.chunked_frames.size();
-      if (JXL_ENC_SUCCESS !=
-          JxlEncoderAddChunkedFrame(settings, TO_JXL_BOOL(last_frame),
-                                    chunked_frame.GetInputSource())) {
-        fprintf(stderr, "JxlEncoderAddChunkedFrame() failed.\n");
-        return false;
-      }
-    }
-  }
-  JxlEncoderCloseInput(enc);
-  if (params.HasOutputProcessor()) {
-    if (JXL_ENC_SUCCESS != JxlEncoderFlushInput(enc)) {
-      fprintf(stderr, "JxlEncoderAddChunkedFrame() failed.\n");
-      return false;
-    }
-  } else if (!ReadCompressedOutput(enc, compressed)) {
-    return false;
-  }
-  return true;
-}
-
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/enc/jxl.h b/third_party/jpeg-xl/lib/extras/enc/jxl.h
deleted file mode 100644
index a6573eb129ffa..0000000000000
--- a/third_party/jpeg-xl/lib/extras/enc/jxl.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_ENC_JXL_H_
-#define LIB_EXTRAS_ENC_JXL_H_
-
-#include <jxl/encode.h>
-#include <jxl/memory_manager.h>
-#include <jxl/parallel_runner.h>
-#include <jxl/thread_parallel_runner.h>
-#include <jxl/types.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#include "lib/extras/packed_image.h"
-
-namespace jxl {
-namespace extras {
-
-struct JXLOption {
-  JXLOption(JxlEncoderFrameSettingId id, int64_t val, size_t frame_index)
-      : id(id), is_float(false), ival(val), frame_index(frame_index) {}
-  JXLOption(JxlEncoderFrameSettingId id, float val, size_t frame_index)
-      : id(id), is_float(true), fval(val), frame_index(frame_index) {}
-
-  JxlEncoderFrameSettingId id;
-  bool is_float;
-  union {
-    int64_t ival;
-    float fval;
-  };
-  size_t frame_index;
-};
-
-struct JXLCompressParams {
-  std::vector<JXLOption> options;
-
-  // Target butteraugli distance, 0.0 means lossless.
-  float distance = 1.0f;
-  float alpha_distance = 0.0f;
-
-  // If set to true, forces container mode.
-  bool use_container = false;
-
-  // Whether to enable/disable byte-exact jpeg reconstruction for jpeg inputs.
-  bool jpeg_store_metadata = true;
-  bool jpeg_strip_exif = false;
-  bool jpeg_strip_xmp = false;
-  bool jpeg_strip_jumbf = false;
-
-  // Whether to create brob boxes.
-  bool compress_boxes = true;
-
-  // Upper bound on the intensity level present in the image in nits (zero means
-  // that the library chooses a default).
-  float intensity_target = 0;
-  int already_downsampled = 1;
-  int upsampling_mode = -1;
-
-  // Overrides for bitdepth, codestream level and alpha premultiply.
-  size_t override_bitdepth = 0;
-  int32_t codestream_level = -1;
-  int32_t premultiply = -1;
-
-  // If runner_opaque is set, the encoder uses this parallel runner.
-  JxlParallelRunner runner = JxlThreadParallelRunner;
-  void* runner_opaque = nullptr;
-
-  // If memory_manager is set, encoder uses it.
-  JxlMemoryManager* memory_manager = nullptr;
-
-  JxlEncoderOutputProcessor output_processor = {};
-  JxlDebugImageCallback debug_image = nullptr;
-  void* debug_image_opaque = nullptr;
-  JxlEncoderStats* stats = nullptr;
-  bool allow_expert_options = false;
-
-  void AddOption(JxlEncoderFrameSettingId id, int64_t val) {
-    options.emplace_back(id, val, 0);
-  }
-  void AddFloatOption(JxlEncoderFrameSettingId id, float val) {
-    options.emplace_back(id, val, 0);
-  }
-  bool HasOutputProcessor() const {
-    return (output_processor.get_buffer != nullptr &&
-            output_processor.release_buffer != nullptr &&
-            output_processor.set_finalized_position != nullptr);
-  }
-};
-
-bool EncodeImageJXL(const JXLCompressParams& params, const PackedPixelFile& ppf,
-                    const std::vector<uint8_t>* jpeg_bytes,
-                    std::vector<uint8_t>* compressed);
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_ENC_JXL_H_
diff --git a/third_party/jpeg-xl/lib/extras/enc/npy.cc b/third_party/jpeg-xl/lib/extras/enc/npy.cc
deleted file mode 100644
index 38777a3535412..0000000000000
--- a/third_party/jpeg-xl/lib/extras/enc/npy.cc
+++ /dev/null
@@ -1,326 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/enc/npy.h"
-
-#include <jxl/types.h>
-
-#include <memory>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/common.h"
-
-namespace jxl {
-namespace extras {
-namespace {
-
-// JSON value writing
-
-class JSONField {
- public:
-  virtual ~JSONField() = default;
-  virtual void Write(std::ostream& o, uint32_t indent) const = 0;
-
- protected:
-  JSONField() = default;
-};
-
-class JSONValue : public JSONField {
- public:
-  template <typename T>
-  explicit JSONValue(const T& value) : value_(std::to_string(value)) {}
-
-  explicit JSONValue(const std::string& value) : value_("\"" + value + "\"") {}
-
-  explicit JSONValue(bool value) : value_(value ? "true" : "false") {}
-
-  void Write(std::ostream& o, uint32_t indent) const override { o << value_; }
-
- private:
-  std::string value_;
-};
-
-class JSONDict : public JSONField {
- public:
-  JSONDict() = default;
-
-  template <typename T>
-  T* AddEmpty(const std::string& key) {
-    static_assert(std::is_convertible<T*, JSONField*>::value,
-                  "T must be a JSONField");
-    T* ret = new T();
-    JSONField* field = static_cast<JSONField*>(ret);
-    auto handle = std::unique_ptr<JSONField>(field);
-    values_.emplace_back(key, std::move(handle));
-    return ret;
-  }
-
-  template <typename T>
-  void Add(const std::string& key, const T& value) {
-    JSONField* field = static_cast<JSONField*>(new JSONValue(value));
-    auto handle = std::unique_ptr<JSONField>(field);
-    values_.emplace_back(key, std::move(handle));
-  }
-
-  void Write(std::ostream& o, uint32_t indent) const override {
-    std::string indent_str(indent, ' ');
-    o << "{";
-    bool is_first = true;
-    for (const auto& key_value : values_) {
-      if (!is_first) {
-        o << ",";
-      }
-      is_first = false;
-      o << "\n" << indent_str << "  \"" << key_value.first << "\": ";
-      key_value.second->Write(o, indent + 2);
-    }
-    if (!values_.empty()) {
-      o << "\n" << indent_str;
-    }
-    o << "}";
-  }
-
- private:
-  // Dictionary with order.
-  std::vector<std::pair<std::string, std::unique_ptr<JSONField>>> values_;
-};
-
-class JSONArray : public JSONField {
- public:
-  JSONArray() = default;
-
-  template <typename T>
-  T* AddEmpty() {
-    static_assert(std::is_convertible<T*, JSONField*>::value,
-                  "T must be a JSONField");
-    T* ret = new T();
-    values_.emplace_back(ret);
-    return ret;
-  }
-
-  template <typename T>
-  void Add(const T& value) {
-    values_.emplace_back(new JSONValue(value));
-  }
-
-  void Write(std::ostream& o, uint32_t indent) const override {
-    std::string indent_str(indent, ' ');
-    o << "[";
-    bool is_first = true;
-    for (const auto& value : values_) {
-      if (!is_first) {
-        o << ",";
-      }
-      is_first = false;
-      o << "\n" << indent_str << "  ";
-      value->Write(o, indent + 2);
-    }
-    if (!values_.empty()) {
-      o << "\n" << indent_str;
-    }
-    o << "]";
-  }
-
- private:
-  std::vector<std::unique_ptr<JSONField>> values_;
-};
-
-void GenerateMetadata(const PackedPixelFile& ppf, std::vector<uint8_t>* out) {
-  JSONDict meta;
-  // Same order as in 18181-3 CD.
-
-  // Frames.
-  auto* meta_frames = meta.AddEmpty<JSONArray>("frames");
-  for (size_t i = 0; i < ppf.frames.size(); i++) {
-    auto* frame_i = meta_frames->AddEmpty<JSONDict>();
-    if (ppf.info.have_animation) {
-      frame_i->Add("duration",
-                   JSONValue(ppf.frames[i].frame_info.duration * 1.0f *
-                             ppf.info.animation.tps_denominator /
-                             ppf.info.animation.tps_numerator));
-    }
-
-    frame_i->Add("name", JSONValue(ppf.frames[i].name));
-
-    if (ppf.info.animation.have_timecodes) {
-      frame_i->Add("timecode", JSONValue(ppf.frames[i].frame_info.timecode));
-    }
-  }
-
-#define METADATA(FIELD) meta.Add(#FIELD, ppf.info.FIELD)
-
-  METADATA(intensity_target);
-  METADATA(min_nits);
-  METADATA(relative_to_max_display);
-  METADATA(linear_below);
-
-  if (ppf.info.have_preview) {
-    meta.AddEmpty<JSONDict>("preview");
-    // TODO(veluca): can we have duration/name/timecode here?
-  }
-
-  {
-    auto* ectype = meta.AddEmpty<JSONArray>("extra_channel_type");
-    auto* bps = meta.AddEmpty<JSONArray>("bits_per_sample");
-    auto* ebps = meta.AddEmpty<JSONArray>("exp_bits_per_sample");
-    bps->Add(ppf.info.bits_per_sample);
-    ebps->Add(ppf.info.exponent_bits_per_sample);
-    for (const auto& eci : ppf.extra_channels_info) {
-      switch (eci.ec_info.type) {
-        case JXL_CHANNEL_ALPHA: {
-          ectype->Add(std::string("Alpha"));
-          break;
-        }
-        case JXL_CHANNEL_DEPTH: {
-          ectype->Add(std::string("Depth"));
-          break;
-        }
-        case JXL_CHANNEL_SPOT_COLOR: {
-          ectype->Add(std::string("SpotColor"));
-          break;
-        }
-        case JXL_CHANNEL_SELECTION_MASK: {
-          ectype->Add(std::string("SelectionMask"));
-          break;
-        }
-        case JXL_CHANNEL_BLACK: {
-          ectype->Add(std::string("Black"));
-          break;
-        }
-        case JXL_CHANNEL_CFA: {
-          ectype->Add(std::string("CFA"));
-          break;
-        }
-        case JXL_CHANNEL_THERMAL: {
-          ectype->Add(std::string("Thermal"));
-          break;
-        }
-        default: {
-          ectype->Add(std::string("UNKNOWN"));
-          break;
-        }
-      }
-      bps->Add(eci.ec_info.bits_per_sample);
-      ebps->Add(eci.ec_info.exponent_bits_per_sample);
-    }
-  }
-
-  std::ostringstream os;
-  meta.Write(os, 0);
-  out->resize(os.str().size());
-  memcpy(out->data(), os.str().data(), os.str().size());
-}
-
-void Append(std::vector<uint8_t>* out, const void* data, size_t size) {
-  size_t pos = out->size();
-  out->resize(pos + size);
-  memcpy(out->data() + pos, data, size);
-}
-
-void WriteNPYHeader(size_t xsize, size_t ysize, uint32_t num_channels,
-                    size_t num_frames, std::vector<uint8_t>* out) {
-  const uint8_t header[] = "\x93NUMPY\x01\x00";
-  Append(out, header, 8);
-  std::stringstream ss;
-  ss << "{'descr': '<f4', 'fortran_order': False, 'shape': (" << num_frames
-     << ", " << ysize << ", " << xsize << ", " << num_channels << "), }\n";
-  // 16-bit little endian header length.
-  uint8_t header_len[2] = {static_cast<uint8_t>(ss.str().size() % 256),
-                           static_cast<uint8_t>(ss.str().size() / 256)};
-  Append(out, header_len, 2);
-  Append(out, ss.str().data(), ss.str().size());
-}
-
-bool WriteFrameToNPYArray(size_t xsize, size_t ysize, const PackedFrame& frame,
-                          std::vector<uint8_t>* out) {
-  const auto& color = frame.color;
-  if (color.xsize != xsize || color.ysize != ysize) {
-    return false;
-  }
-  for (const auto& ec : frame.extra_channels) {
-    if (ec.xsize != xsize || ec.ysize != ysize) {
-      return false;
-    }
-  }
-  // interleave the samples from color and extra channels
-  for (size_t y = 0; y < ysize; ++y) {
-    for (size_t x = 0; x < xsize; ++x) {
-      {
-        size_t sample_size = color.pixel_stride();
-        size_t offset = y * color.stride + x * sample_size;
-        uint8_t* pixels = reinterpret_cast<uint8_t*>(color.pixels());
-        JXL_ENSURE(offset + sample_size <= color.pixels_size);
-        Append(out, pixels + offset, sample_size);
-      }
-      for (const auto& ec : frame.extra_channels) {
-        size_t sample_size = ec.pixel_stride();
-        size_t offset = y * ec.stride + x * sample_size;
-        uint8_t* pixels = reinterpret_cast<uint8_t*>(ec.pixels());
-        JXL_ENSURE(offset + sample_size <= ec.pixels_size);
-        Append(out, pixels + offset, sample_size);
-      }
-    }
-  }
-  return true;
-}
-
-// Writes a PackedPixelFile as a numpy 4D ndarray in binary format.
-bool WriteNPYArray(const PackedPixelFile& ppf, std::vector<uint8_t>* out) {
-  size_t xsize = ppf.info.xsize;
-  size_t ysize = ppf.info.ysize;
-  WriteNPYHeader(xsize, ysize,
-                 ppf.info.num_color_channels + ppf.extra_channels_info.size(),
-                 ppf.frames.size(), out);
-  for (const auto& frame : ppf.frames) {
-    if (!WriteFrameToNPYArray(xsize, ysize, frame, out)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-class NumPyEncoder : public Encoder {
- public:
-  Status Encode(const PackedPixelFile& ppf, EncodedImage* encoded_image,
-                ThreadPool* pool) const override {
-    JXL_RETURN_IF_ERROR(VerifyBasicInfo(ppf.info));
-    GenerateMetadata(ppf, &encoded_image->metadata);
-    encoded_image->bitstreams.emplace_back();
-    if (!WriteNPYArray(ppf, &encoded_image->bitstreams.back())) {
-      return false;
-    }
-    if (ppf.preview_frame) {
-      size_t xsize = ppf.info.preview.xsize;
-      size_t ysize = ppf.info.preview.ysize;
-      WriteNPYHeader(xsize, ysize, ppf.info.num_color_channels, 1,
-                     &encoded_image->preview_bitstream);
-      if (!WriteFrameToNPYArray(xsize, ysize, *ppf.preview_frame,
-                                &encoded_image->preview_bitstream)) {
-        return false;
-      }
-    }
-    return true;
-  }
-  std::vector<JxlPixelFormat> AcceptedFormats() const override {
-    std::vector<JxlPixelFormat> formats;
-    for (const uint32_t num_channels : {1, 3}) {
-      formats.push_back(JxlPixelFormat{num_channels, JXL_TYPE_FLOAT,
-                                       JXL_LITTLE_ENDIAN, /*align=*/0});
-    }
-    return formats;
-  }
-};
-
-}  // namespace
-
-std::unique_ptr<Encoder> GetNumPyEncoder() {
-  return jxl::make_unique<NumPyEncoder>();
-}
-
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/enc/npy.h b/third_party/jpeg-xl/lib/extras/enc/npy.h
deleted file mode 100644
index 3ee6208ec290c..0000000000000
--- a/third_party/jpeg-xl/lib/extras/enc/npy.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_ENC_NPY_H_
-#define LIB_EXTRAS_ENC_NPY_H_
-
-// Encodes pixels to numpy array, used for conformance testing.
-
-#include <memory>
-
-#include "lib/extras/enc/encode.h"
-
-namespace jxl {
-namespace extras {
-
-std::unique_ptr<Encoder> GetNumPyEncoder();
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_ENC_NPY_H_
diff --git a/third_party/jpeg-xl/lib/extras/enc/pgx.cc b/third_party/jpeg-xl/lib/extras/enc/pgx.cc
deleted file mode 100644
index fb47b3e1a97d5..0000000000000
--- a/third_party/jpeg-xl/lib/extras/enc/pgx.cc
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/enc/pgx.h"
-
-#include <jxl/codestream_header.h>
-
-#include <cstring>
-
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/byte_order.h"
-
-namespace jxl {
-namespace extras {
-namespace {
-
-constexpr size_t kMaxHeaderSize = 200;
-
-Status EncodeHeader(const JxlBasicInfo& info, char* header,
-                    int* chars_written) {
-  if (info.alpha_bits > 0) {
-    return JXL_FAILURE("PGX: can't store alpha");
-  }
-  if (info.num_color_channels != 1) {
-    return JXL_FAILURE("PGX: must be grayscale");
-  }
-  // TODO(lode): verify other bit depths: for other bit depths such as 1 or 4
-  // bits, have a test case to verify it works correctly. For bits > 16, we may
-  // need to change the way external_image works.
-  if (info.bits_per_sample != 8 && info.bits_per_sample != 16) {
-    return JXL_FAILURE("PGX: bits other than 8 or 16 not yet supported");
-  }
-
-  // Use ML (Big Endian), LM may not be well supported by all decoders.
-  *chars_written = snprintf(header, kMaxHeaderSize, "PG ML + %u %u %u\n",
-                            info.bits_per_sample, info.xsize, info.ysize);
-  JXL_RETURN_IF_ERROR(static_cast<unsigned int>(*chars_written) <
-                      kMaxHeaderSize);
-  return true;
-}
-
-Status EncodeImagePGX(const PackedFrame& frame, const JxlBasicInfo& info,
-                      std::vector<uint8_t>* bytes) {
-  char header[kMaxHeaderSize];
-  int header_size = 0;
-  JXL_RETURN_IF_ERROR(EncodeHeader(info, header, &header_size));
-
-  const PackedImage& color = frame.color;
-  const JxlPixelFormat format = color.format;
-  const uint8_t* in = reinterpret_cast<const uint8_t*>(color.pixels());
-  JXL_RETURN_IF_ERROR(PackedImage::ValidateDataType(format.data_type));
-  size_t data_bits_per_sample = PackedImage::BitsPerChannel(format.data_type);
-  size_t bytes_per_sample = data_bits_per_sample / kBitsPerByte;
-  size_t num_samples = info.xsize * info.ysize;
-
-  if (info.bits_per_sample != data_bits_per_sample) {
-    return JXL_FAILURE("Bit depth does not match pixel data type");
-  }
-
-  std::vector<uint8_t> pixels(num_samples * bytes_per_sample);
-
-  if (format.data_type == JXL_TYPE_UINT8) {
-    memcpy(pixels.data(), in, num_samples * bytes_per_sample);
-  } else if (format.data_type == JXL_TYPE_UINT16) {
-    if (format.endianness != JXL_BIG_ENDIAN) {
-      const uint8_t* p_in = in;
-      uint8_t* p_out = pixels.data();
-      for (size_t i = 0; i < num_samples; ++i, p_in += 2, p_out += 2) {
-        StoreBE16(LoadLE16(p_in), p_out);
-      }
-    } else {
-      memcpy(pixels.data(), in, num_samples * bytes_per_sample);
-    }
-  } else {
-    return JXL_FAILURE("Unsupported pixel data type");
-  }
-
-  bytes->resize(static_cast<size_t>(header_size) + pixels.size());
-  memcpy(bytes->data(), header, static_cast<size_t>(header_size));
-  memcpy(bytes->data() + header_size, pixels.data(), pixels.size());
-
-  return true;
-}
-
-class PGXEncoder : public Encoder {
- public:
-  std::vector<JxlPixelFormat> AcceptedFormats() const override {
-    std::vector<JxlPixelFormat> formats;
-    for (const JxlDataType data_type : {JXL_TYPE_UINT8, JXL_TYPE_UINT16}) {
-      for (JxlEndianness endianness : {JXL_BIG_ENDIAN, JXL_LITTLE_ENDIAN}) {
-        formats.push_back(JxlPixelFormat{/*num_channels=*/1,
-                                         /*data_type=*/data_type,
-                                         /*endianness=*/endianness,
-                                         /*align=*/0});
-      }
-    }
-    return formats;
-  }
-  Status Encode(const PackedPixelFile& ppf, EncodedImage* encoded_image,
-                ThreadPool* pool) const override {
-    JXL_RETURN_IF_ERROR(VerifyBasicInfo(ppf.info));
-    encoded_image->icc.assign(ppf.icc.begin(), ppf.icc.end());
-    encoded_image->bitstreams.clear();
-    encoded_image->bitstreams.reserve(ppf.frames.size());
-    for (const auto& frame : ppf.frames) {
-      JXL_RETURN_IF_ERROR(VerifyPackedImage(frame.color, ppf.info));
-      encoded_image->bitstreams.emplace_back();
-      JXL_RETURN_IF_ERROR(
-          EncodeImagePGX(frame, ppf.info, &encoded_image->bitstreams.back()));
-    }
-    return true;
-  }
-};
-
-}  // namespace
-
-std::unique_ptr<Encoder> GetPGXEncoder() {
-  return jxl::make_unique<PGXEncoder>();
-}
-
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/enc/pgx.h b/third_party/jpeg-xl/lib/extras/enc/pgx.h
deleted file mode 100644
index f24e391b0917a..0000000000000
--- a/third_party/jpeg-xl/lib/extras/enc/pgx.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_ENC_PGX_H_
-#define LIB_EXTRAS_ENC_PGX_H_
-
-// Encodes PGX pixels in memory.
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "lib/extras/enc/encode.h"
-
-namespace jxl {
-namespace extras {
-
-std::unique_ptr<Encoder> GetPGXEncoder();
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_ENC_PGX_H_
diff --git a/third_party/jpeg-xl/lib/extras/enc/pnm.cc b/third_party/jpeg-xl/lib/extras/enc/pnm.cc
deleted file mode 100644
index c4aa8d12eb4d6..0000000000000
--- a/third_party/jpeg-xl/lib/extras/enc/pnm.cc
+++ /dev/null
@@ -1,331 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/enc/pnm.h"
-
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-namespace extras {
-namespace {
-
-constexpr size_t kMaxHeaderSize = 2000;
-
-class BasePNMEncoder : public Encoder {
- public:
-  Status Encode(const PackedPixelFile& ppf, EncodedImage* encoded_image,
-                ThreadPool* pool) const override {
-    JXL_RETURN_IF_ERROR(VerifyBasicInfo(ppf.info));
-    if (!ppf.metadata.exif.empty() || !ppf.metadata.iptc.empty() ||
-        !ppf.metadata.jumbf.empty() || !ppf.metadata.xmp.empty()) {
-      JXL_WARNING("PNM encoder ignoring metadata - use a different codec");
-    }
-    encoded_image->icc = ppf.icc;
-    encoded_image->bitstreams.clear();
-    encoded_image->bitstreams.reserve(ppf.frames.size());
-    for (const auto& frame : ppf.frames) {
-      JXL_RETURN_IF_ERROR(VerifyPackedImage(frame.color, ppf.info));
-      encoded_image->bitstreams.emplace_back();
-      JXL_RETURN_IF_ERROR(
-          EncodeFrame(ppf, frame, &encoded_image->bitstreams.back()));
-    }
-    for (size_t i = 0; i < ppf.extra_channels_info.size(); ++i) {
-      const auto& ec_info = ppf.extra_channels_info[i].ec_info;
-      encoded_image->extra_channel_bitstreams.emplace_back();
-      auto& ec_bitstreams = encoded_image->extra_channel_bitstreams.back();
-      for (const auto& frame : ppf.frames) {
-        ec_bitstreams.emplace_back();
-        JXL_RETURN_IF_ERROR(EncodeExtraChannel(frame.extra_channels[i],
-                                               ec_info.bits_per_sample,
-                                               &ec_bitstreams.back()));
-      }
-    }
-    return true;
-  }
-
- protected:
-  virtual Status EncodeFrame(const PackedPixelFile& ppf,
-                             const PackedFrame& frame,
-                             std::vector<uint8_t>* bytes) const = 0;
-  virtual Status EncodeExtraChannel(const PackedImage& image,
-                                    size_t bits_per_sample,
-                                    std::vector<uint8_t>* bytes) const = 0;
-};
-
-class PNMEncoder : public BasePNMEncoder {
- public:
-  static const std::vector<JxlPixelFormat> kAcceptedFormats;
-
-  std::vector<JxlPixelFormat> AcceptedFormats() const override {
-    return kAcceptedFormats;
-  }
-
-  Status EncodeFrame(const PackedPixelFile& ppf, const PackedFrame& frame,
-                     std::vector<uint8_t>* bytes) const override {
-    return EncodeImage(frame.color, ppf.info.bits_per_sample, bytes);
-  }
-  Status EncodeExtraChannel(const PackedImage& image, size_t bits_per_sample,
-                            std::vector<uint8_t>* bytes) const override {
-    return EncodeImage(image, bits_per_sample, bytes);
-  }
-
- private:
-  static Status EncodeImage(const PackedImage& image, size_t bits_per_sample,
-                            std::vector<uint8_t>* bytes) {
-    uint32_t maxval = (1u << bits_per_sample) - 1;
-    char type = image.format.num_channels == 1 ? '5' : '6';
-    char header[kMaxHeaderSize];
-    size_t header_size =
-        snprintf(header, kMaxHeaderSize, "P%c\n%" PRIuS " %" PRIuS "\n%u\n",
-                 type, image.xsize, image.ysize, maxval);
-    JXL_RETURN_IF_ERROR(header_size < kMaxHeaderSize);
-    bytes->resize(header_size + image.pixels_size);
-    memcpy(bytes->data(), header, header_size);
-    memcpy(bytes->data() + header_size,
-           reinterpret_cast<uint8_t*>(image.pixels()), image.pixels_size);
-    return true;
-  }
-};
-
-class PGMEncoder : public PNMEncoder {
- public:
-  static const std::vector<JxlPixelFormat> kAcceptedFormats;
-
-  std::vector<JxlPixelFormat> AcceptedFormats() const override {
-    return kAcceptedFormats;
-  }
-};
-
-const std::vector<JxlPixelFormat> PGMEncoder::kAcceptedFormats = {
-    JxlPixelFormat{1, JXL_TYPE_UINT8, JXL_BIG_ENDIAN, 0},
-    JxlPixelFormat{1, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0}};
-
-class PPMEncoder : public PNMEncoder {
- public:
-  static const std::vector<JxlPixelFormat> kAcceptedFormats;
-
-  std::vector<JxlPixelFormat> AcceptedFormats() const override {
-    return kAcceptedFormats;
-  }
-};
-
-const std::vector<JxlPixelFormat> PPMEncoder::kAcceptedFormats = {
-    JxlPixelFormat{3, JXL_TYPE_UINT8, JXL_BIG_ENDIAN, 0},
-    JxlPixelFormat{3, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0}};
-
-const std::vector<JxlPixelFormat> PNMEncoder::kAcceptedFormats = [] {
-  std::vector<JxlPixelFormat> combined = PPMEncoder::kAcceptedFormats;
-  combined.insert(combined.end(), PGMEncoder::kAcceptedFormats.begin(),
-                  PGMEncoder::kAcceptedFormats.end());
-  return combined;
-}();
-
-class PFMEncoder : public BasePNMEncoder {
- public:
-  std::vector<JxlPixelFormat> AcceptedFormats() const override {
-    std::vector<JxlPixelFormat> formats;
-    for (const uint32_t num_channels : {1, 3}) {
-      for (JxlEndianness endianness : {JXL_BIG_ENDIAN, JXL_LITTLE_ENDIAN}) {
-        formats.push_back(JxlPixelFormat{/*num_channels=*/num_channels,
-                                         /*data_type=*/JXL_TYPE_FLOAT,
-                                         /*endianness=*/endianness,
-                                         /*align=*/0});
-      }
-    }
-    return formats;
-  }
-  Status EncodeFrame(const PackedPixelFile& ppf, const PackedFrame& frame,
-                     std::vector<uint8_t>* bytes) const override {
-    return EncodeImage(frame.color, bytes);
-  }
-  Status EncodeExtraChannel(const PackedImage& image, size_t bits_per_sample,
-                            std::vector<uint8_t>* bytes) const override {
-    return EncodeImage(image, bytes);
-  }
-
- private:
-  static Status EncodeImage(const PackedImage& image,
-                            std::vector<uint8_t>* bytes) {
-    char type = image.format.num_channels == 1 ? 'f' : 'F';
-    double scale = image.format.endianness == JXL_LITTLE_ENDIAN ? -1.0 : 1.0;
-    char header[kMaxHeaderSize];
-    size_t header_size =
-        snprintf(header, kMaxHeaderSize, "P%c\n%" PRIuS " %" PRIuS "\n%.1f\n",
-                 type, image.xsize, image.ysize, scale);
-    JXL_RETURN_IF_ERROR(header_size < kMaxHeaderSize);
-    bytes->resize(header_size + image.pixels_size);
-    memcpy(bytes->data(), header, header_size);
-    const uint8_t* in = reinterpret_cast<const uint8_t*>(image.pixels());
-    uint8_t* out = bytes->data() + header_size;
-    for (size_t y = 0; y < image.ysize; ++y) {
-      size_t y_out = image.ysize - 1 - y;
-      const uint8_t* row_in = &in[y * image.stride];
-      uint8_t* row_out = &out[y_out * image.stride];
-      memcpy(row_out, row_in, image.stride);
-    }
-    return true;
-  }
-};
-
-class PAMEncoder : public BasePNMEncoder {
- public:
-  std::vector<JxlPixelFormat> AcceptedFormats() const override {
-    std::vector<JxlPixelFormat> formats;
-    for (const uint32_t num_channels : {1, 2, 3, 4}) {
-      for (const JxlDataType data_type : {JXL_TYPE_UINT8, JXL_TYPE_UINT16}) {
-        formats.push_back(JxlPixelFormat{/*num_channels=*/num_channels,
-                                         /*data_type=*/data_type,
-                                         /*endianness=*/JXL_BIG_ENDIAN,
-                                         /*align=*/0});
-      }
-    }
-    return formats;
-  }
-  Status EncodeFrame(const PackedPixelFile& ppf, const PackedFrame& frame,
-                     std::vector<uint8_t>* bytes) const override {
-    const PackedImage& color = frame.color;
-    const auto& ec_info = ppf.extra_channels_info;
-    JXL_RETURN_IF_ERROR(frame.extra_channels.size() == ec_info.size());
-    for (const auto& ec : frame.extra_channels) {
-      if (ec.xsize != color.xsize || ec.ysize != color.ysize) {
-        return JXL_FAILURE("Extra channel and color size mismatch.");
-      }
-      if (ec.format.data_type != color.format.data_type ||
-          ec.format.endianness != color.format.endianness) {
-        return JXL_FAILURE("Extra channel and color format mismatch.");
-      }
-    }
-    if (ppf.info.alpha_bits &&
-        (ppf.info.bits_per_sample != ppf.info.alpha_bits)) {
-      return JXL_FAILURE("Alpha bit depth does not match image bit depth");
-    }
-    for (const auto& it : ec_info) {
-      if (it.ec_info.bits_per_sample != ppf.info.bits_per_sample) {
-        return JXL_FAILURE(
-            "Extra channel bit depth does not match image bit depth");
-      }
-    }
-    const char* kColorTypes[4] = {"GRAYSCALE", "GRAYSCALE_ALPHA", "RGB",
-                                  "RGB_ALPHA"};
-    uint32_t maxval = (1u << ppf.info.bits_per_sample) - 1;
-    uint32_t depth = color.format.num_channels + ec_info.size();
-    char header[kMaxHeaderSize];
-    size_t pos = 0;
-    pos += snprintf(header + pos, kMaxHeaderSize - pos,
-                    "P7\nWIDTH %" PRIuS "\nHEIGHT %" PRIuS
-                    "\nDEPTH %u\n"
-                    "MAXVAL %u\nTUPLTYPE %s\n",
-                    color.xsize, color.ysize, depth, maxval,
-                    kColorTypes[color.format.num_channels - 1]);
-    JXL_RETURN_IF_ERROR(pos < kMaxHeaderSize);
-    for (const auto& info : ec_info) {
-      pos += snprintf(header + pos, kMaxHeaderSize - pos, "TUPLTYPE %s\n",
-                      ExtraChannelTypeName(info.ec_info.type).c_str());
-      JXL_RETURN_IF_ERROR(pos < kMaxHeaderSize);
-    }
-    pos += snprintf(header + pos, kMaxHeaderSize - pos, "ENDHDR\n");
-    JXL_RETURN_IF_ERROR(pos < kMaxHeaderSize);
-    size_t total_size = color.pixels_size;
-    for (const auto& ec : frame.extra_channels) {
-      total_size += ec.pixels_size;
-    }
-    bytes->resize(pos + total_size);
-    memcpy(bytes->data(), header, pos);
-    // If we have no extra channels, just copy color pixel data over.
-    if (frame.extra_channels.empty()) {
-      memcpy(bytes->data() + pos, reinterpret_cast<uint8_t*>(color.pixels()),
-             color.pixels_size);
-      return true;
-    }
-    // Interleave color and extra channels.
-    const uint8_t* in = reinterpret_cast<const uint8_t*>(color.pixels());
-    std::vector<const uint8_t*> ec_in(frame.extra_channels.size());
-    for (size_t i = 0; i < frame.extra_channels.size(); ++i) {
-      ec_in[i] =
-          reinterpret_cast<const uint8_t*>(frame.extra_channels[i].pixels());
-    }
-    uint8_t* out = bytes->data() + pos;
-    JXL_RETURN_IF_ERROR(PackedImage::ValidateDataType(color.format.data_type));
-    size_t pwidth = PackedImage::BitsPerChannel(color.format.data_type) / 8;
-    for (size_t y = 0; y < color.ysize; ++y) {
-      for (size_t x = 0; x < color.xsize; ++x) {
-        memcpy(out, in, color.pixel_stride());
-        out += color.pixel_stride();
-        in += color.pixel_stride();
-        for (auto& p : ec_in) {
-          memcpy(out, p, pwidth);
-          out += pwidth;
-          p += pwidth;
-        }
-      }
-    }
-    return true;
-  }
-  Status EncodeExtraChannel(const PackedImage& image, size_t bits_per_sample,
-                            std::vector<uint8_t>* bytes) const override {
-    return true;
-  }
-
- private:
-  static std::string ExtraChannelTypeName(JxlExtraChannelType type) {
-    switch (type) {
-      case JXL_CHANNEL_ALPHA:
-        return std::string("Alpha");
-      case JXL_CHANNEL_DEPTH:
-        return std::string("Depth");
-      case JXL_CHANNEL_SPOT_COLOR:
-        return std::string("SpotColor");
-      case JXL_CHANNEL_SELECTION_MASK:
-        return std::string("SelectionMask");
-      case JXL_CHANNEL_BLACK:
-        return std::string("Black");
-      case JXL_CHANNEL_CFA:
-        return std::string("CFA");
-      case JXL_CHANNEL_THERMAL:
-        return std::string("Thermal");
-      case JXL_CHANNEL_UNKNOWN:
-        return std::string("Unknown");
-      case JXL_CHANNEL_OPTIONAL:
-        return std::string("Optional");
-      default:
-        return std::string("UNKNOWN");
-    }
-  }
-};
-
-}  // namespace
-
-std::unique_ptr<Encoder> GetPPMEncoder() {
-  return jxl::make_unique<PPMEncoder>();
-}
-
-std::unique_ptr<Encoder> GetPNMEncoder() {
-  return jxl::make_unique<PNMEncoder>();
-}
-
-std::unique_ptr<Encoder> GetPFMEncoder() {
-  return jxl::make_unique<PFMEncoder>();
-}
-
-std::unique_ptr<Encoder> GetPGMEncoder() {
-  return jxl::make_unique<PGMEncoder>();
-}
-
-std::unique_ptr<Encoder> GetPAMEncoder() {
-  return jxl::make_unique<PAMEncoder>();
-}
-
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/enc/pnm.h b/third_party/jpeg-xl/lib/extras/enc/pnm.h
deleted file mode 100644
index 1e0020cdbd884..0000000000000
--- a/third_party/jpeg-xl/lib/extras/enc/pnm.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_ENC_PNM_H_
-#define LIB_EXTRAS_ENC_PNM_H_
-
-// Encodes/decodes PBM/PGM/PPM/PFM pixels in memory.
-
-// TODO(janwas): workaround for incorrect Win64 codegen (cause unknown)
-#include <hwy/highway.h>
-#include <memory>
-
-#include "lib/extras/enc/encode.h"
-
-namespace jxl {
-namespace extras {
-
-std::unique_ptr<Encoder> GetPAMEncoder();
-std::unique_ptr<Encoder> GetPGMEncoder();
-std::unique_ptr<Encoder> GetPNMEncoder();
-std::unique_ptr<Encoder> GetPPMEncoder();
-std::unique_ptr<Encoder> GetPFMEncoder();
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_ENC_PNM_H_
diff --git a/third_party/jpeg-xl/lib/extras/exif.cc b/third_party/jpeg-xl/lib/extras/exif.cc
deleted file mode 100644
index aea632732b8d9..0000000000000
--- a/third_party/jpeg-xl/lib/extras/exif.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/exif.h"
-
-#include "lib/jxl/base/byte_order.h"
-
-namespace jxl {
-
-constexpr uint16_t kExifOrientationTag = 274;
-
-void ResetExifOrientation(std::vector<uint8_t>& exif) {
-  if (exif.size() < 12) return;  // not enough bytes for a valid exif blob
-  bool bigendian;
-  uint8_t* t = exif.data();
-  if (LoadLE32(t) == 0x2A004D4D) {
-    bigendian = true;
-  } else if (LoadLE32(t) == 0x002A4949) {
-    bigendian = false;
-  } else {
-    return;  // not a valid tiff header
-  }
-  t += 4;
-  uint64_t offset = (bigendian ? LoadBE32(t) : LoadLE32(t));
-  if (exif.size() < 12 + offset + 2 || offset < 8) return;
-  t += offset - 4;
-  uint16_t nb_tags = (bigendian ? LoadBE16(t) : LoadLE16(t));
-  t += 2;
-  while (nb_tags > 0) {
-    if (t + 12 >= exif.data() + exif.size()) return;
-    uint16_t tag = (bigendian ? LoadBE16(t) : LoadLE16(t));
-    t += 2;
-    if (tag == kExifOrientationTag) {
-      uint16_t type = (bigendian ? LoadBE16(t) : LoadLE16(t));
-      t += 2;
-      uint32_t count = (bigendian ? LoadBE32(t) : LoadLE32(t));
-      t += 4;
-      if (type == 3 && count == 1) {
-        if (bigendian) {
-          StoreBE16(1, t);
-        } else {
-          StoreLE16(1, t);
-        }
-      }
-      return;
-    } else {
-      t += 10;
-      nb_tags--;
-    }
-  }
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/exif.h b/third_party/jpeg-xl/lib/extras/exif.h
deleted file mode 100644
index f22b2ccef54f8..0000000000000
--- a/third_party/jpeg-xl/lib/extras/exif.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_EXIF_H_
-#define LIB_EXTRAS_EXIF_H_
-
-#include <stdint.h>
-
-#include <vector>
-
-namespace jxl {
-
-// Sets the Exif orientation to the identity, to avoid repeated orientation
-void ResetExifOrientation(std::vector<uint8_t>& exif);
-
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_EXIF_H_
diff --git a/third_party/jpeg-xl/lib/extras/gain_map.cc b/third_party/jpeg-xl/lib/extras/gain_map.cc
deleted file mode 100644
index 8cce67161bb84..0000000000000
--- a/third_party/jpeg-xl/lib/extras/gain_map.cc
+++ /dev/null
@@ -1,231 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/gain_map.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
-
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/memory_manager_internal.h"
-
-namespace {
-
-template <size_t N>
-class FixedSizeMemoryManager {
- public:
-  FixedSizeMemoryManager() = default;
-
-  JxlMemoryManager* memory_manager() { return &manager_; }
-
- private:
-  static void* FixedSizeMemoryManagerAlloc(void* opaque, size_t capacity) {
-    auto manager = static_cast<FixedSizeMemoryManager<N>*>(opaque);
-    if (capacity > N + jxl::memory_manager_internal::kAlias) {
-      return nullptr;
-    }
-    return manager->memory_;
-  }
-  static void FixedSizeMemoryManagerFree(void* opaque, void* pointer) {}
-
-  uint8_t memory_[N + jxl::memory_manager_internal::kAlias];
-  JxlMemoryManager manager_ = {
-      /*opaque=*/this,
-      /*alloc=*/&FixedSizeMemoryManagerAlloc,
-      /*free=*/&FixedSizeMemoryManagerFree,
-  };
-};
-
-}  // namespace
-
-JXL_BOOL JxlGainMapGetBundleSize(const JxlGainMapBundle* map_bundle,
-                                 size_t* bundle_size) {
-  if (map_bundle == nullptr) return JXL_FALSE;
-
-  jxl::ColorEncoding internal_color_encoding;
-  size_t color_encoding_size = 0;
-  size_t extension_bits = 0;
-  if (map_bundle->has_color_encoding) {
-    JXL_RETURN_IF_ERROR(
-        internal_color_encoding.FromExternal(map_bundle->color_encoding));
-    if (!jxl::Bundle::CanEncode(internal_color_encoding, &extension_bits,
-                                &color_encoding_size)) {
-      return JXL_FALSE;
-    }
-  }
-
-  *bundle_size =
-      1 +                                     // size of jhgm_version
-      2 +                                     // size_of gain_map_metadata_size
-      map_bundle->gain_map_metadata_size +    // size of gain_map_metadata
-      1 +                                     // size of color_encoding_size
-      jxl::DivCeil(color_encoding_size, 8) +  // size of the color_encoding
-      4 +                                     // size of compressed_icc_size
-      map_bundle->alt_icc_size +              // size of compressed_icc
-      map_bundle->gain_map_size;              // size of gain map
-  return JXL_TRUE;
-}
-
-JXL_BOOL JxlGainMapWriteBundle(const JxlGainMapBundle* map_bundle,
-                               uint8_t* output_buffer,
-                               size_t output_buffer_size,
-                               size_t* bytes_written) {
-  if (map_bundle == nullptr) return JXL_FALSE;
-
-  uint8_t jhgm_version = map_bundle->jhgm_version;
-
-  FixedSizeMemoryManager<sizeof(jxl::ColorEncoding)> memory_manager;
-  jxl::ColorEncoding internal_color_encoding;
-  jxl::BitWriter color_encoding_writer(memory_manager.memory_manager());
-  if (map_bundle->has_color_encoding) {
-    JXL_RETURN_IF_ERROR(
-        internal_color_encoding.FromExternal(map_bundle->color_encoding));
-    if (!jxl::Bundle::Write(internal_color_encoding, &color_encoding_writer,
-                            jxl::LayerType::Header, nullptr)) {
-      return JXL_FALSE;
-    }
-  }
-
-  color_encoding_writer.ZeroPadToByte();
-
-  uint64_t cursor = 0;
-  uint64_t next_cursor = 0;
-
-#define SAFE_CURSOR_UPDATE(n)                    \
-  do {                                           \
-    cursor = next_cursor;                        \
-    if (!jxl::SafeAdd(cursor, n, next_cursor) || \
-        next_cursor > output_buffer_size) {      \
-      return JXL_FALSE;                          \
-    }                                            \
-  } while (false)
-
-  SAFE_CURSOR_UPDATE(1);
-  memcpy(output_buffer + cursor, &jhgm_version, 1);
-
-  SAFE_CURSOR_UPDATE(2);
-  StoreBE16(map_bundle->gain_map_metadata_size, output_buffer + cursor);
-
-  SAFE_CURSOR_UPDATE(map_bundle->gain_map_metadata_size);
-  memcpy(output_buffer + cursor, map_bundle->gain_map_metadata,
-         map_bundle->gain_map_metadata_size);
-
-  jxl::Bytes bytes = color_encoding_writer.GetSpan();
-  uint8_t color_enc_size = static_cast<uint8_t>(bytes.size());
-  if (color_enc_size != bytes.size()) return JXL_FALSE;
-  SAFE_CURSOR_UPDATE(1);
-  memcpy(output_buffer + cursor, &color_enc_size, 1);
-
-  SAFE_CURSOR_UPDATE(color_enc_size);
-  memcpy(output_buffer + cursor, bytes.data(), color_enc_size);
-
-  SAFE_CURSOR_UPDATE(4);
-  StoreBE32(map_bundle->alt_icc_size, output_buffer + cursor);
-
-  SAFE_CURSOR_UPDATE(map_bundle->alt_icc_size);
-  memcpy(output_buffer + cursor, map_bundle->alt_icc, map_bundle->alt_icc_size);
-
-  SAFE_CURSOR_UPDATE(map_bundle->gain_map_size);
-  memcpy(output_buffer + cursor, map_bundle->gain_map,
-         map_bundle->gain_map_size);
-
-#undef SAFE_CURSOR_UPDATE
-
-  cursor = next_cursor;
-
-  if (bytes_written != nullptr)
-    *bytes_written = cursor;  // Ensure size_t compatibility
-  return cursor == output_buffer_size ? JXL_TRUE : JXL_FALSE;
-}
-
-JXL_BOOL JxlGainMapReadBundle(JxlGainMapBundle* map_bundle,
-                              const uint8_t* input_buffer,
-                              const size_t input_buffer_size,
-                              size_t* bytes_read) {
-  if (map_bundle == nullptr || input_buffer == nullptr ||
-      input_buffer_size == 0) {
-    return JXL_FALSE;
-  }
-
-  uint64_t cursor = 0;
-  uint64_t next_cursor = 0;
-
-#define SAFE_CURSOR_UPDATE(n)                    \
-  do {                                           \
-    cursor = next_cursor;                        \
-    if (!jxl::SafeAdd(cursor, n, next_cursor) || \
-        next_cursor > input_buffer_size) {       \
-      return JXL_FALSE;                          \
-    }                                            \
-  } while (false)
-
-  // Read the version byte
-  SAFE_CURSOR_UPDATE(1);
-  map_bundle->jhgm_version = input_buffer[cursor];
-
-  // Read gain_map_metadata_size
-  SAFE_CURSOR_UPDATE(2);
-  uint16_t gain_map_metadata_size = LoadBE16(input_buffer + cursor);
-
-  SAFE_CURSOR_UPDATE(gain_map_metadata_size);
-  map_bundle->gain_map_metadata_size = gain_map_metadata_size;
-  map_bundle->gain_map_metadata = input_buffer + cursor;
-
-  // Read compressed_color_encoding_size
-  SAFE_CURSOR_UPDATE(1);
-  uint8_t compressed_color_encoding_size;
-  memcpy(&compressed_color_encoding_size, input_buffer + cursor, 1);
-
-  map_bundle->has_color_encoding = (compressed_color_encoding_size > 0);
-  if (map_bundle->has_color_encoding) {
-    SAFE_CURSOR_UPDATE(compressed_color_encoding_size);
-    // Decode color encoding
-    jxl::Span<const uint8_t> color_encoding_span(
-        input_buffer + cursor, compressed_color_encoding_size);
-    jxl::BitReader color_encoding_reader(color_encoding_span);
-    jxl::ColorEncoding internal_color_encoding;
-    if (!jxl::Bundle::Read(&color_encoding_reader, &internal_color_encoding)) {
-      return JXL_FALSE;
-    }
-    JXL_RETURN_IF_ERROR(color_encoding_reader.Close());
-    map_bundle->color_encoding = internal_color_encoding.ToExternal();
-  }
-
-  // Read compressed_icc_size
-  SAFE_CURSOR_UPDATE(4);
-  uint32_t compressed_icc_size = LoadBE32(input_buffer + cursor);
-
-  SAFE_CURSOR_UPDATE(compressed_icc_size);
-  map_bundle->alt_icc_size = compressed_icc_size;
-  map_bundle->alt_icc = input_buffer + cursor;
-
-  // Calculate remaining bytes for gain map
-  cursor = next_cursor;
-  // This calculation is guaranteed not to underflow because `cursor` is always
-  // updated to a position within or at the end of `input_buffer` (not beyond).
-  // Thus, subtracting `cursor` from `input_buffer_size` (the total size of the
-  // buffer) will always result in a non-negative integer representing the
-  // remaining buffer size.
-  map_bundle->gain_map_size = input_buffer_size - cursor;
-  SAFE_CURSOR_UPDATE(map_bundle->gain_map_size);
-  map_bundle->gain_map = input_buffer + cursor;
-
-#undef SAFE_CURSOR_UPDATE
-
-  cursor = next_cursor;
-
-  if (bytes_read != nullptr) {
-    *bytes_read = cursor;
-  }
-  return JXL_TRUE;
-}
diff --git a/third_party/jpeg-xl/lib/extras/gain_map_test.cc b/third_party/jpeg-xl/lib/extras/gain_map_test.cc
deleted file mode 100644
index 7b4864974c07a..0000000000000
--- a/third_party/jpeg-xl/lib/extras/gain_map_test.cc
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "jxl/gain_map.h"
-
-#include <jxl/color_encoding.h>
-#include <jxl/encode.h>
-#include <jxl/types.h>
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <string>
-#include <vector>
-
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace {
-
-std::vector<uint8_t> GoldenTestGainMap(bool has_icc, bool has_color_encoding) {
-  // Define the parts of the gain map
-  uint8_t jhgm_version = 0x00;
-  std::vector<uint8_t> gain_map_metadata_size = {0x00, 0x58};  // 88 in decimal
-  // TODO(firsching): Replace with more realistic data
-  std::string first_placeholder =
-      "placeholder gain map metadata, fill with actual example after (ISO "
-      "21496-1) is finalized";
-
-  uint8_t color_encoding_size = has_color_encoding ? 3 : 0;
-  std::vector<uint8_t> color_encoding = {0x50, 0xb4, 0x00};
-
-  std::vector<uint8_t> icc_size = {0x00, 0x00, 0x00, 0x00};
-  if (has_icc) {
-    icc_size = {0x00, 0x00, 0x00, 0x88};  // 136 in decimal
-  }
-  std::vector<uint8_t> icc_data = jxl::test::GetCompressedIccTestProfile();
-  std::string second_placeholder =
-      "placeholder for an actual naked JPEG XL codestream";
-
-  // Assemble the gain map
-  std::vector<uint8_t> gain_map;
-  gain_map.push_back(jhgm_version);
-  gain_map.insert(gain_map.end(), gain_map_metadata_size.begin(),
-                  gain_map_metadata_size.end());
-  gain_map.insert(gain_map.end(), first_placeholder.begin(),
-                  first_placeholder.end());
-  gain_map.push_back(color_encoding_size);
-  if (has_color_encoding) {
-    gain_map.insert(gain_map.end(), color_encoding.begin(),
-                    color_encoding.end());
-  }
-  gain_map.insert(gain_map.end(), icc_size.begin(), icc_size.end());
-  if (has_icc) {
-    gain_map.insert(gain_map.end(), icc_data.begin(), icc_data.end());
-  }
-  gain_map.insert(gain_map.end(), second_placeholder.begin(),
-                  second_placeholder.end());
-
-  return gain_map;
-}
-
-}  // namespace
-
-namespace jxl {
-namespace {
-
-struct GainMapTestParams {
-  bool has_color_encoding;
-  std::vector<uint8_t> icc_data;
-};
-
-class GainMapTest : public ::testing::TestWithParam<GainMapTestParams> {};
-
-TEST_P(GainMapTest, GainMapRoundtrip) {
-  size_t bundle_size;
-  const GainMapTestParams& params = GetParam();
-  std::vector<uint8_t> golden_gain_map =
-      GoldenTestGainMap(!params.icc_data.empty(), params.has_color_encoding);
-
-  JxlGainMapBundle orig_bundle;
-  // Initialize the bundle with some test data
-  orig_bundle.jhgm_version = 0;
-  const char* metadata_str =
-      "placeholder gain map metadata, fill with actual example after (ISO "
-      "21496-1) is finalized";
-  std::vector<uint8_t> gain_map_metadata(metadata_str,
-                                         metadata_str + strlen(metadata_str));
-  orig_bundle.gain_map_metadata_size = gain_map_metadata.size();
-  orig_bundle.gain_map_metadata = gain_map_metadata.data();
-
-  // Use the ICC profile from the parameter
-  orig_bundle.has_color_encoding = TO_JXL_BOOL(params.has_color_encoding);
-  if (orig_bundle.has_color_encoding) {
-    JxlColorEncoding color_encoding = {};
-    JxlColorEncodingSetToLinearSRGB(&color_encoding, /*is_gray=*/JXL_FALSE);
-    orig_bundle.color_encoding = color_encoding;
-  }
-
-  std::vector<uint8_t> alt_icc(params.icc_data.begin(), params.icc_data.end());
-  orig_bundle.alt_icc = alt_icc.data();
-  orig_bundle.alt_icc_size = alt_icc.size();
-
-  const char* gain_map_str =
-      "placeholder for an actual naked JPEG XL codestream";
-  std::vector<uint8_t> gain_map(gain_map_str,
-                                gain_map_str + strlen(gain_map_str));
-  orig_bundle.gain_map_size = gain_map.size();
-  orig_bundle.gain_map = gain_map.data();
-
-  ASSERT_TRUE(JxlGainMapGetBundleSize(&orig_bundle, &bundle_size));
-  EXPECT_EQ(bundle_size, golden_gain_map.size());
-
-  std::vector<uint8_t> buffer(bundle_size);
-  size_t bytes_written;
-  ASSERT_TRUE(JxlGainMapWriteBundle(&orig_bundle, buffer.data(), buffer.size(),
-                                    &bytes_written));
-  EXPECT_EQ(bytes_written, bundle_size);
-  EXPECT_EQ(buffer[0], orig_bundle.jhgm_version);
-  EXPECT_EQ(buffer.size(), golden_gain_map.size());
-  EXPECT_TRUE(
-      std::equal(buffer.begin(), buffer.end(), golden_gain_map.begin()));
-
-  JxlGainMapBundle output_bundle;
-  size_t bytes_read;
-  ASSERT_TRUE(JxlGainMapReadBundle(&output_bundle, buffer.data(), buffer.size(),
-                                   &bytes_read));
-
-  EXPECT_EQ(output_bundle.gain_map_size, orig_bundle.gain_map_size);
-  EXPECT_EQ(output_bundle.gain_map_metadata_size,
-            orig_bundle.gain_map_metadata_size);
-  EXPECT_EQ(output_bundle.alt_icc_size, orig_bundle.alt_icc_size);
-  EXPECT_EQ(output_bundle.has_color_encoding, params.has_color_encoding);
-  EXPECT_EQ(output_bundle.jhgm_version, orig_bundle.jhgm_version);
-  std::vector<uint8_t> output_gain_map_metadata(
-      output_bundle.gain_map_metadata,
-      output_bundle.gain_map_metadata + output_bundle.gain_map_metadata_size);
-  std::vector<uint8_t> output_alt_icc(
-      output_bundle.alt_icc,
-      output_bundle.alt_icc + output_bundle.alt_icc_size);
-  std::vector<uint8_t> output_gain_map(
-      output_bundle.gain_map,
-      output_bundle.gain_map + output_bundle.gain_map_size);
-  EXPECT_TRUE(std::equal(output_gain_map_metadata.begin(),
-                         output_gain_map_metadata.end(),
-                         gain_map_metadata.begin()));
-  EXPECT_TRUE(std::equal(output_alt_icc.begin(), output_alt_icc.end(),
-                         alt_icc.begin()));
-  EXPECT_TRUE(std::equal(output_gain_map.begin(), output_gain_map.end(),
-                         gain_map.begin()));
-}
-
-JXL_GTEST_INSTANTIATE_TEST_SUITE_P(
-    GainMapTestCases, GainMapTest,
-    ::testing::Values(
-        GainMapTestParams{true, std::vector<uint8_t>()},
-        GainMapTestParams{true, test::GetCompressedIccTestProfile()},
-        GainMapTestParams{false, test::GetCompressedIccTestProfile()},
-        GainMapTestParams{false, std::vector<uint8_t>()}),
-    [](const testing::TestParamInfo<GainMapTest::ParamType>& info) {
-      std::string name =
-          "HasColorEncoding" + std::to_string(info.param.has_color_encoding);
-
-      name += "ICCSize" + std::to_string(info.param.icc_data.size());
-
-      return name;
-    });
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/hlg.cc b/third_party/jpeg-xl/lib/extras/hlg.cc
deleted file mode 100644
index d92272052b969..0000000000000
--- a/third_party/jpeg-xl/lib/extras/hlg.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/hlg.h"
-
-#include <jxl/cms.h>
-
-#include <cmath>
-
-namespace jxl {
-
-float GetHlgGamma(const float peak_luminance, const float surround_luminance) {
-  return 1.2f * std::pow(1.111f, std::log2(peak_luminance / 1000.f)) *
-         std::pow(0.98f, std::log2(surround_luminance / 5.f));
-}
-
-Status HlgOOTF(ImageBundle* ib, const float gamma, ThreadPool* pool) {
-  ColorEncoding linear_rec2020;
-  linear_rec2020.SetColorSpace(ColorSpace::kRGB);
-  JXL_RETURN_IF_ERROR(linear_rec2020.SetPrimariesType(Primaries::k2100));
-  JXL_RETURN_IF_ERROR(linear_rec2020.SetWhitePointType(WhitePoint::kD65));
-  linear_rec2020.Tf().SetTransferFunction(TransferFunction::kLinear);
-  JXL_RETURN_IF_ERROR(linear_rec2020.CreateICC());
-  JXL_RETURN_IF_ERROR(
-      ib->TransformTo(linear_rec2020, *JxlGetDefaultCms(), pool));
-
-  const auto process_row = [&](const int y, const int thread) -> Status {
-    float* const JXL_RESTRICT rows[3] = {ib->color()->PlaneRow(0, y),
-                                         ib->color()->PlaneRow(1, y),
-                                         ib->color()->PlaneRow(2, y)};
-    for (size_t x = 0; x < ib->xsize(); ++x) {
-      float& red = rows[0][x];
-      float& green = rows[1][x];
-      float& blue = rows[2][x];
-      const float luminance = 0.2627f * red + 0.6780f * green + 0.0593f * blue;
-      const float ratio = std::pow(luminance, gamma - 1);
-      if (std::isfinite(ratio)) {
-        red *= ratio;
-        green *= ratio;
-        blue *= ratio;
-      }
-    }
-    return true;
-  };
-
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, ib->ysize(), ThreadPool::NoInit,
-                                process_row, "HlgOOTF"));
-  return true;
-}
-
-Status HlgInverseOOTF(ImageBundle* ib, const float gamma, ThreadPool* pool) {
-  return HlgOOTF(ib, 1.f / gamma, pool);
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/hlg.h b/third_party/jpeg-xl/lib/extras/hlg.h
deleted file mode 100644
index 4cfec444f4c50..0000000000000
--- a/third_party/jpeg-xl/lib/extras/hlg.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_HLG_H_
-#define LIB_EXTRAS_HLG_H_
-
-#include "lib/jxl/image_bundle.h"
-
-namespace jxl {
-
-float GetHlgGamma(float peak_luminance, float surround_luminance = 5.f);
-
-Status HlgOOTF(ImageBundle* ib, float gamma, ThreadPool* pool = nullptr);
-
-Status HlgInverseOOTF(ImageBundle* ib, float gamma, ThreadPool* pool = nullptr);
-
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_HLG_H_
diff --git a/third_party/jpeg-xl/lib/extras/jpegli_test.cc b/third_party/jpeg-xl/lib/extras/jpegli_test.cc
deleted file mode 100644
index d22afd0e851d3..0000000000000
--- a/third_party/jpeg-xl/lib/extras/jpegli_test.cc
+++ /dev/null
@@ -1,422 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#if JPEGXL_ENABLE_JPEGLI
-
-#include "lib/extras/dec/jpegli.h"
-
-#include <jxl/color_encoding.h>
-#include <jxl/types.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#include <cstring>
-#include <memory>
-#include <ostream>
-#include <sstream>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "lib/extras/dec/color_hints.h"
-#include "lib/extras/dec/decode.h"
-#include "lib/extras/dec/jpg.h"
-#include "lib/extras/enc/encode.h"
-#include "lib/extras/enc/jpegli.h"
-#include "lib/extras/enc/jpg.h"
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/test_image.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace extras {
-namespace {
-
-using ::jxl::test::Butteraugli3Norm;
-using ::jxl::test::ButteraugliDistance;
-using ::jxl::test::TestImage;
-
-Status ReadTestImage(const std::string& pathname, PackedPixelFile* ppf) {
-  const std::vector<uint8_t> encoded = jxl::test::ReadTestData(pathname);
-  ColorHints color_hints;
-  if (pathname.find(".ppm") != std::string::npos) {
-    color_hints.Add("color_space", "RGB_D65_SRG_Rel_SRG");
-  } else if (pathname.find(".pgm") != std::string::npos) {
-    color_hints.Add("color_space", "Gra_D65_Rel_SRG");
-  }
-  return DecodeBytes(Bytes(encoded), color_hints, ppf);
-}
-
-std::vector<uint8_t> GetAppData(const std::vector<uint8_t>& compressed) {
-  std::vector<uint8_t> result;
-  size_t pos = 2;  // After SOI
-  while (pos + 4 < compressed.size()) {
-    if (compressed[pos] != 0xff || compressed[pos + 1] < 0xe0 ||
-        compressed[pos + 1] > 0xf0) {
-      break;
-    }
-    size_t len = (compressed[pos + 2] << 8) + compressed[pos + 3] + 2;
-    if (pos + len > compressed.size()) {
-      break;
-    }
-    result.insert(result.end(), &compressed[pos], &compressed[pos] + len);
-    pos += len;
-  }
-  return result;
-}
-
-Status DecodeWithLibjpeg(const std::vector<uint8_t>& compressed,
-                         PackedPixelFile* ppf,
-                         const JPGDecompressParams* dparams = nullptr) {
-  return DecodeImageJPG(Bytes(compressed), ColorHints(), ppf,
-                        /*constraints=*/nullptr, dparams);
-}
-
-Status EncodeWithLibjpeg(const PackedPixelFile& ppf, int quality,
-                         std::vector<uint8_t>* compressed) {
-  std::unique_ptr<Encoder> encoder = GetJPEGEncoder();
-  encoder->SetOption("q", std::to_string(quality));
-  EncodedImage encoded;
-  JXL_RETURN_IF_ERROR(encoder->Encode(ppf, &encoded, nullptr));
-  JXL_RETURN_IF_ERROR(!encoded.bitstreams.empty());
-  *compressed = std::move(encoded.bitstreams[0]);
-  return true;
-}
-
-std::string Description(const JxlColorEncoding& color_encoding) {
-  ColorEncoding c_enc;
-  EXPECT_TRUE(c_enc.FromExternal(color_encoding));
-  return Description(c_enc);
-}
-
-float BitsPerPixel(const PackedPixelFile& ppf,
-                   const std::vector<uint8_t>& compressed) {
-  const size_t num_pixels = ppf.info.xsize * ppf.info.ysize;
-  return compressed.size() * 8.0 / num_pixels;
-}
-
-TEST(JpegliTest, JpegliSRGBDecodeTest) {
-  TEST_LIBJPEG_SUPPORT();
-  std::string testimage = "jxl/flower/flower_small.rgb.depth8.ppm";
-  PackedPixelFile ppf0;
-  ASSERT_TRUE(ReadTestImage(testimage, &ppf0));
-  EXPECT_EQ("RGB_D65_SRG_Rel_SRG", Description(ppf0.color_encoding));
-  EXPECT_EQ(8, ppf0.info.bits_per_sample);
-
-  std::vector<uint8_t> compressed;
-  ASSERT_TRUE(EncodeWithLibjpeg(ppf0, 90, &compressed));
-
-  PackedPixelFile ppf1;
-  ASSERT_TRUE(DecodeWithLibjpeg(compressed, &ppf1));
-  PackedPixelFile ppf2;
-  JpegDecompressParams dparams;
-  ASSERT_TRUE(DecodeJpeg(compressed, dparams, nullptr, &ppf2));
-  EXPECT_LT(ButteraugliDistance(ppf0, ppf2), ButteraugliDistance(ppf0, ppf1));
-}
-
-TEST(JpegliTest, JpegliGrayscaleDecodeTest) {
-  TEST_LIBJPEG_SUPPORT();
-  std::string testimage = "jxl/flower/flower_small.g.depth8.pgm";
-  PackedPixelFile ppf0;
-  ASSERT_TRUE(ReadTestImage(testimage, &ppf0));
-  EXPECT_EQ("Gra_D65_Rel_SRG", Description(ppf0.color_encoding));
-  EXPECT_EQ(8, ppf0.info.bits_per_sample);
-
-  std::vector<uint8_t> compressed;
-  ASSERT_TRUE(EncodeWithLibjpeg(ppf0, 90, &compressed));
-
-  PackedPixelFile ppf1;
-  ASSERT_TRUE(DecodeWithLibjpeg(compressed, &ppf1));
-  PackedPixelFile ppf2;
-  JpegDecompressParams dparams;
-  ASSERT_TRUE(DecodeJpeg(compressed, dparams, nullptr, &ppf2));
-  EXPECT_LT(ButteraugliDistance(ppf0, ppf2), ButteraugliDistance(ppf0, ppf1));
-}
-
-TEST(JpegliTest, JpegliXYBEncodeTest) {
-  TEST_LIBJPEG_SUPPORT();
-  std::string testimage = "jxl/flower/flower_small.rgb.depth8.ppm";
-  PackedPixelFile ppf_in;
-  ASSERT_TRUE(ReadTestImage(testimage, &ppf_in));
-  EXPECT_EQ("RGB_D65_SRG_Rel_SRG", Description(ppf_in.color_encoding));
-  EXPECT_EQ(8, ppf_in.info.bits_per_sample);
-
-  std::vector<uint8_t> compressed;
-  JpegSettings settings;
-  settings.xyb = true;
-  ASSERT_TRUE(EncodeJpeg(ppf_in, settings, nullptr, &compressed));
-
-  PackedPixelFile ppf_out;
-  ASSERT_TRUE(DecodeWithLibjpeg(compressed, &ppf_out));
-  EXPECT_SLIGHTLY_BELOW(BitsPerPixel(ppf_in, compressed), 1.45f);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(ppf_in, ppf_out), 1.32f);
-}
-
-TEST(JpegliTest, JpegliDecodeTestLargeSmoothArea) {
-  TEST_LIBJPEG_SUPPORT();
-  TestImage t;
-  const size_t xsize = 2070;
-  const size_t ysize = 1063;
-  ASSERT_TRUE(t.SetDimensions(xsize, ysize));
-  ASSERT_TRUE(t.SetChannels(3));
-  t.SetAllBitDepths(8).SetEndianness(JXL_NATIVE_ENDIAN);
-  JXL_TEST_ASSIGN_OR_DIE(TestImage::Frame frame, t.AddFrame());
-  frame.RandomFill();
-  // Create a large smooth area in the top half of the image. This is to test
-  // that the bias statistics calculation can handle many blocks with all-zero
-  // AC coefficients.
-  for (size_t y = 0; y < ysize / 2; ++y) {
-    for (size_t x = 0; x < xsize; ++x) {
-      for (size_t c = 0; c < 3; ++c) {
-        ASSERT_TRUE(frame.SetValue(y, x, c, 0.5f));
-      }
-    }
-  }
-  const PackedPixelFile& ppf0 = t.ppf();
-
-  std::vector<uint8_t> compressed;
-  ASSERT_TRUE(EncodeWithLibjpeg(ppf0, 90, &compressed));
-
-  PackedPixelFile ppf1;
-  JpegDecompressParams dparams;
-  ASSERT_TRUE(DecodeJpeg(compressed, dparams, nullptr, &ppf1));
-  EXPECT_LT(ButteraugliDistance(ppf0, ppf1), 3.0f);
-}
-
-TEST(JpegliTest, JpegliYUVEncodeTest) {
-  TEST_LIBJPEG_SUPPORT();
-  std::string testimage = "jxl/flower/flower_small.rgb.depth8.ppm";
-  PackedPixelFile ppf_in;
-  ASSERT_TRUE(ReadTestImage(testimage, &ppf_in));
-  EXPECT_EQ("RGB_D65_SRG_Rel_SRG", Description(ppf_in.color_encoding));
-  EXPECT_EQ(8, ppf_in.info.bits_per_sample);
-
-  std::vector<uint8_t> compressed;
-  JpegSettings settings;
-  settings.xyb = false;
-  ASSERT_TRUE(EncodeJpeg(ppf_in, settings, nullptr, &compressed));
-
-  PackedPixelFile ppf_out;
-  ASSERT_TRUE(DecodeWithLibjpeg(compressed, &ppf_out));
-  EXPECT_SLIGHTLY_BELOW(BitsPerPixel(ppf_in, compressed), 1.7f);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(ppf_in, ppf_out), 1.32f);
-}
-
-TEST(JpegliTest, JpegliYUVChromaSubsamplingEncodeTest) {
-  TEST_LIBJPEG_SUPPORT();
-  std::string testimage = "jxl/flower/flower_small.rgb.depth8.ppm";
-  PackedPixelFile ppf_in;
-  ASSERT_TRUE(ReadTestImage(testimage, &ppf_in));
-  EXPECT_EQ("RGB_D65_SRG_Rel_SRG", Description(ppf_in.color_encoding));
-  EXPECT_EQ(8, ppf_in.info.bits_per_sample);
-
-  std::vector<uint8_t> compressed;
-  JpegSettings settings;
-  for (const char* sampling : {"440", "422", "420"}) {
-    settings.xyb = false;
-    settings.chroma_subsampling = std::string(sampling);
-    ASSERT_TRUE(EncodeJpeg(ppf_in, settings, nullptr, &compressed));
-
-    PackedPixelFile ppf_out;
-    ASSERT_TRUE(DecodeWithLibjpeg(compressed, &ppf_out));
-    EXPECT_LE(BitsPerPixel(ppf_in, compressed), 1.55f);
-    EXPECT_LE(ButteraugliDistance(ppf_in, ppf_out), 1.82f);
-  }
-}
-
-TEST(JpegliTest, JpegliYUVEncodeTestNoAq) {
-  TEST_LIBJPEG_SUPPORT();
-  std::string testimage = "jxl/flower/flower_small.rgb.depth8.ppm";
-  PackedPixelFile ppf_in;
-  ASSERT_TRUE(ReadTestImage(testimage, &ppf_in));
-  EXPECT_EQ("RGB_D65_SRG_Rel_SRG", Description(ppf_in.color_encoding));
-  EXPECT_EQ(8, ppf_in.info.bits_per_sample);
-
-  std::vector<uint8_t> compressed;
-  JpegSettings settings;
-  settings.xyb = false;
-  settings.use_adaptive_quantization = false;
-  ASSERT_TRUE(EncodeJpeg(ppf_in, settings, nullptr, &compressed));
-
-  PackedPixelFile ppf_out;
-  ASSERT_TRUE(DecodeWithLibjpeg(compressed, &ppf_out));
-  EXPECT_SLIGHTLY_BELOW(BitsPerPixel(ppf_in, compressed), 1.85f);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(ppf_in, ppf_out), 1.25f);
-}
-
-TEST(JpegliTest, JpegliHDRRoundtripTest) {
-  std::string testimage = "jxl/hdr_room.png";
-  PackedPixelFile ppf_in;
-  ASSERT_TRUE(ReadTestImage(testimage, &ppf_in));
-  EXPECT_EQ("Rec2100HLG", Description(ppf_in.color_encoding));
-  EXPECT_EQ(16, ppf_in.info.bits_per_sample);
-
-  std::vector<uint8_t> compressed;
-  JpegSettings settings;
-  settings.xyb = false;
-  ASSERT_TRUE(EncodeJpeg(ppf_in, settings, nullptr, &compressed));
-
-  PackedPixelFile ppf_out;
-  JpegDecompressParams dparams;
-  dparams.output_data_type = JXL_TYPE_UINT16;
-  ASSERT_TRUE(DecodeJpeg(compressed, dparams, nullptr, &ppf_out));
-  EXPECT_SLIGHTLY_BELOW(BitsPerPixel(ppf_in, compressed), 2.95f);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(ppf_in, ppf_out), 1.05f);
-}
-
-TEST(JpegliTest, JpegliSetAppData) {
-  std::string testimage = "jxl/flower/flower_small.rgb.depth8.ppm";
-  PackedPixelFile ppf_in;
-  ASSERT_TRUE(ReadTestImage(testimage, &ppf_in));
-  EXPECT_EQ("RGB_D65_SRG_Rel_SRG", Description(ppf_in.color_encoding));
-  EXPECT_EQ(8, ppf_in.info.bits_per_sample);
-
-  std::vector<uint8_t> compressed;
-  JpegSettings settings;
-  settings.app_data = {0xff, 0xe3, 0, 4, 0, 1};
-  EXPECT_TRUE(EncodeJpeg(ppf_in, settings, nullptr, &compressed));
-  EXPECT_EQ(settings.app_data, GetAppData(compressed));
-
-  settings.app_data = {0xff, 0xe3, 0, 6, 0, 1, 2, 3, 0xff, 0xef, 0, 4, 0, 1};
-  EXPECT_TRUE(EncodeJpeg(ppf_in, settings, nullptr, &compressed));
-  EXPECT_EQ(settings.app_data, GetAppData(compressed));
-
-  settings.xyb = true;
-  EXPECT_TRUE(EncodeJpeg(ppf_in, settings, nullptr, &compressed));
-  EXPECT_EQ(0, memcmp(settings.app_data.data(), GetAppData(compressed).data(),
-                      settings.app_data.size()));
-
-  settings.xyb = false;
-  settings.app_data = {0};
-  EXPECT_FALSE(EncodeJpeg(ppf_in, settings, nullptr, &compressed));
-
-  settings.app_data = {0xff, 0xe0};
-  EXPECT_FALSE(EncodeJpeg(ppf_in, settings, nullptr, &compressed));
-
-  settings.app_data = {0xff, 0xe0, 0, 2};
-  EXPECT_FALSE(EncodeJpeg(ppf_in, settings, nullptr, &compressed));
-
-  settings.app_data = {0xff, 0xeb, 0, 4, 0};
-  EXPECT_FALSE(EncodeJpeg(ppf_in, settings, nullptr, &compressed));
-
-  settings.app_data = {0xff, 0xeb, 0, 4, 0, 1, 2, 3};
-  EXPECT_FALSE(EncodeJpeg(ppf_in, settings, nullptr, &compressed));
-
-  settings.app_data = {0xff, 0xab, 0, 4, 0, 1};
-  EXPECT_FALSE(EncodeJpeg(ppf_in, settings, nullptr, &compressed));
-
-  settings.xyb = false;
-  settings.app_data = {
-      0xff, 0xeb, 0,    4,    0,    1,                       //
-      0xff, 0xe2, 0,    20,   0x49, 0x43, 0x43, 0x5F, 0x50,  //
-      0x52, 0x4F, 0x46, 0x49, 0x4C, 0x45, 0x00, 0,    1,     //
-      0,    0,    0,    0,                                   //
-  };
-  EXPECT_TRUE(EncodeJpeg(ppf_in, settings, nullptr, &compressed));
-  EXPECT_EQ(settings.app_data, GetAppData(compressed));
-
-  settings.xyb = true;
-  EXPECT_FALSE(EncodeJpeg(ppf_in, settings, nullptr, &compressed));
-}
-
-struct TestConfig {
-  int num_colors;
-  int passes;
-  int dither;
-};
-
-class JpegliColorQuantTestParam : public ::testing::TestWithParam<TestConfig> {
-};
-
-TEST_P(JpegliColorQuantTestParam, JpegliColorQuantizeTest) {
-  TEST_LIBJPEG_SUPPORT();
-  TestConfig config = GetParam();
-  std::string testimage = "jxl/flower/flower_small.rgb.depth8.ppm";
-  PackedPixelFile ppf0;
-  ASSERT_TRUE(ReadTestImage(testimage, &ppf0));
-  EXPECT_EQ("RGB_D65_SRG_Rel_SRG", Description(ppf0.color_encoding));
-  EXPECT_EQ(8, ppf0.info.bits_per_sample);
-
-  std::vector<uint8_t> compressed;
-  ASSERT_TRUE(EncodeWithLibjpeg(ppf0, 90, &compressed));
-
-  PackedPixelFile ppf1;
-  JPGDecompressParams dparams1;
-  dparams1.two_pass_quant = (config.passes == 2);
-  dparams1.num_colors = config.num_colors;
-  dparams1.dither_mode = config.dither;
-  ASSERT_TRUE(DecodeWithLibjpeg(compressed, &ppf1, &dparams1));
-
-  PackedPixelFile ppf2;
-  JpegDecompressParams dparams2;
-  dparams2.two_pass_quant = (config.passes == 2);
-  dparams2.num_colors = config.num_colors;
-  dparams2.dither_mode = config.dither;
-  ASSERT_TRUE(DecodeJpeg(compressed, dparams2, nullptr, &ppf2));
-
-  double dist1 = Butteraugli3Norm(ppf0, ppf1);
-  double dist2 = Butteraugli3Norm(ppf0, ppf2);
-  printf("distance: %f  vs %f\n", dist2, dist1);
-  if (config.passes == 1) {
-    if (config.num_colors == 16 && config.dither == 2) {
-      // TODO(szabadka) Fix this case.
-      EXPECT_LT(dist2, dist1 * 1.5);
-    } else {
-      EXPECT_LT(dist2, dist1 * 1.05);
-    }
-  } else if (config.num_colors > 64) {
-    // TODO(szabadka) Fix 2pass quantization for <= 64 colors.
-    EXPECT_LT(dist2, dist1 * 1.1);
-  } else if (config.num_colors > 32) {
-    EXPECT_LT(dist2, dist1 * 1.2);
-  } else {
-    EXPECT_LT(dist2, dist1 * 1.7);
-  }
-}
-
-std::vector<TestConfig> GenerateTests() {
-  std::vector<TestConfig> all_tests;
-  for (int num_colors = 8; num_colors <= 256; num_colors *= 2) {
-    for (int passes = 1; passes <= 2; ++passes) {
-      for (int dither = 0; dither < 3; dither += passes) {
-        TestConfig config;
-        config.num_colors = num_colors;
-        config.passes = passes;
-        config.dither = dither;
-        all_tests.push_back(config);
-      }
-    }
-  }
-  return all_tests;
-}
-
-std::ostream& operator<<(std::ostream& os, const TestConfig& c) {
-  static constexpr const char* kDitherModeStr[] = {"No", "Ordered", "FS"};
-  os << c.passes << "pass";
-  os << c.num_colors << "colors";
-  os << kDitherModeStr[c.dither] << "dither";
-  return os;
-}
-
-std::string TestDescription(const testing::TestParamInfo<TestConfig>& info) {
-  std::stringstream name;
-  name << info.param;
-  return name.str();
-}
-
-JXL_GTEST_INSTANTIATE_TEST_SUITE_P(JpegliColorQuantTest,
-                                   JpegliColorQuantTestParam,
-                                   testing::ValuesIn(GenerateTests()),
-                                   TestDescription);
-
-}  // namespace
-}  // namespace extras
-}  // namespace jxl
-#endif  // JPEGXL_ENABLE_JPEGLI
diff --git a/third_party/jpeg-xl/lib/extras/metrics.cc b/third_party/jpeg-xl/lib/extras/metrics.cc
deleted file mode 100644
index 55c1130944480..0000000000000
--- a/third_party/jpeg-xl/lib/extras/metrics.cc
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/metrics.h"
-
-#include <math.h>
-#include <stdlib.h>
-
-#include <atomic>
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/extras/metrics.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/color_encoding_internal.h"
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::GetLane;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::Rebind;
-
-double ComputeDistanceP(const ImageF& distmap, const ButteraugliParams& params,
-                        double p) {
-  const double onePerPixels = 1.0 / (distmap.ysize() * distmap.xsize());
-  if (std::abs(p - 3.0) < 1E-6) {
-    double sum1[3] = {0.0};
-
-// Prefer double if possible, but otherwise use float rather than scalar.
-#if HWY_CAP_FLOAT64
-    using T = double;
-    const Rebind<float, HWY_FULL(double)> df;
-#else
-    using T = float;
-#endif
-    const HWY_FULL(T) d;
-    constexpr size_t N = MaxLanes(d);
-    // Manually aligned storage to avoid asan crash on clang-7 due to
-    // unaligned spill.
-    HWY_ALIGN T sum_totals0[N] = {0};
-    HWY_ALIGN T sum_totals1[N] = {0};
-    HWY_ALIGN T sum_totals2[N] = {0};
-
-    for (size_t y = 0; y < distmap.ysize(); ++y) {
-      const float* JXL_RESTRICT row = distmap.ConstRow(y);
-
-      auto sums0 = Zero(d);
-      auto sums1 = Zero(d);
-      auto sums2 = Zero(d);
-
-      size_t x = 0;
-      for (; x + Lanes(d) <= distmap.xsize(); x += Lanes(d)) {
-#if HWY_CAP_FLOAT64
-        const auto d1 = PromoteTo(d, Load(df, row + x));
-#else
-        const auto d1 = Load(d, row + x);
-#endif
-        const auto d2 = Mul(d1, Mul(d1, d1));
-        sums0 = Add(sums0, d2);
-        const auto d3 = Mul(d2, d2);
-        sums1 = Add(sums1, d3);
-        const auto d4 = Mul(d3, d3);
-        sums2 = Add(sums2, d4);
-      }
-
-      Store(Add(sums0, Load(d, sum_totals0)), d, sum_totals0);
-      Store(Add(sums1, Load(d, sum_totals1)), d, sum_totals1);
-      Store(Add(sums2, Load(d, sum_totals2)), d, sum_totals2);
-
-      for (; x < distmap.xsize(); ++x) {
-        const double d1 = row[x];
-        double d2 = d1 * d1 * d1;
-        sum1[0] += d2;
-        d2 *= d2;
-        sum1[1] += d2;
-        d2 *= d2;
-        sum1[2] += d2;
-      }
-    }
-    double v = 0;
-    v += pow(
-        onePerPixels * (sum1[0] + GetLane(SumOfLanes(d, Load(d, sum_totals0)))),
-        1.0 / (p * 1.0));
-    v += pow(
-        onePerPixels * (sum1[1] + GetLane(SumOfLanes(d, Load(d, sum_totals1)))),
-        1.0 / (p * 2.0));
-    v += pow(
-        onePerPixels * (sum1[2] + GetLane(SumOfLanes(d, Load(d, sum_totals2)))),
-        1.0 / (p * 4.0));
-    v /= 3.0;
-    return v;
-  } else {
-    static std::atomic<int> once{0};
-    if (once.fetch_add(1, std::memory_order_relaxed) == 0) {
-      JXL_WARNING("WARNING: using slow ComputeDistanceP");
-    }
-    double sum1[3] = {0.0};
-    for (size_t y = 0; y < distmap.ysize(); ++y) {
-      const float* JXL_RESTRICT row = distmap.ConstRow(y);
-      for (size_t x = 0; x < distmap.xsize(); ++x) {
-        double d2 = std::pow(row[x], p);
-        sum1[0] += d2;
-        d2 *= d2;
-        sum1[1] += d2;
-        d2 *= d2;
-        sum1[2] += d2;
-      }
-    }
-    double v = 0;
-    for (int i = 0; i < 3; ++i) {
-      v += pow(onePerPixels * (sum1[i]), 1.0 / (p * (1 << i)));
-    }
-    v /= 3.0;
-    return v;
-  }
-}
-
-void ComputeSumOfSquares(const ImageBundle& ib1, const ImageBundle& ib2,
-                         const JxlCmsInterface& cms, double sum_of_squares[3]) {
-  sum_of_squares[0] = sum_of_squares[1] = sum_of_squares[2] =
-      std::numeric_limits<double>::max();
-  // Convert to sRGB - closer to perception than linear.
-  const Image3F* srgb1 = &ib1.color();
-  Image3F copy1;
-  if (!ib1.IsSRGB()) {
-    if (!ib1.CopyTo(Rect(ib1), ColorEncoding::SRGB(ib1.IsGray()), cms, &copy1))
-      return;
-    srgb1 = &copy1;
-  }
-  const Image3F* srgb2 = &ib2.color();
-  Image3F copy2;
-  if (!ib2.IsSRGB()) {
-    if (!ib2.CopyTo(Rect(ib2), ColorEncoding::SRGB(ib2.IsGray()), cms, &copy2))
-      return;
-    srgb2 = &copy2;
-  }
-
-  if (!SameSize(*srgb1, *srgb2)) return;
-
-  sum_of_squares[0] = sum_of_squares[1] = sum_of_squares[2] = 0.0;
-
-  // TODO(veluca): SIMD.
-  float yuvmatrix[3][3] = {{0.299, 0.587, 0.114},
-                           {-0.14713, -0.28886, 0.436},
-                           {0.615, -0.51499, -0.10001}};
-  for (size_t y = 0; y < srgb1->ysize(); ++y) {
-    const float* JXL_RESTRICT row1[3];
-    const float* JXL_RESTRICT row2[3];
-    for (size_t j = 0; j < 3; j++) {
-      row1[j] = srgb1->ConstPlaneRow(j, y);
-      row2[j] = srgb2->ConstPlaneRow(j, y);
-    }
-    for (size_t x = 0; x < srgb1->xsize(); ++x) {
-      float cdiff[3] = {};
-      // YUV conversion is linear, so we can run it on the difference.
-      for (size_t j = 0; j < 3; j++) {
-        cdiff[j] = row1[j][x] - row2[j][x];
-      }
-      float yuvdiff[3] = {};
-      for (size_t j = 0; j < 3; j++) {
-        for (size_t k = 0; k < 3; k++) {
-          yuvdiff[j] += yuvmatrix[j][k] * cdiff[k];
-        }
-      }
-      for (size_t j = 0; j < 3; j++) {
-        sum_of_squares[j] += yuvdiff[j] * yuvdiff[j];
-      }
-    }
-  }
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-HWY_EXPORT(ComputeDistanceP);
-double ComputeDistanceP(const ImageF& distmap, const ButteraugliParams& params,
-                        double p) {
-  return HWY_DYNAMIC_DISPATCH(ComputeDistanceP)(distmap, params, p);
-}
-
-HWY_EXPORT(ComputeSumOfSquares);
-
-double ComputeDistance2(const ImageBundle& ib1, const ImageBundle& ib2,
-                        const JxlCmsInterface& cms) {
-  double sum_of_squares[3] = {};
-  HWY_DYNAMIC_DISPATCH(ComputeSumOfSquares)(ib1, ib2, cms, sum_of_squares);
-  // Weighted PSNR as in JPEG-XL: chroma counts 1/8.
-  const float weights[3] = {6.0f / 8, 1.0f / 8, 1.0f / 8};
-  // Avoid squaring the weight - 1/64 is too extreme.
-  double norm = 0;
-  for (size_t i = 0; i < 3; i++) {
-    norm += std::sqrt(sum_of_squares[i]) * weights[i];
-  }
-  // This function returns distance *squared*.
-  return norm * norm;
-}
-
-double ComputePSNR(const ImageBundle& ib1, const ImageBundle& ib2,
-                   const JxlCmsInterface& cms) {
-  if (!SameSize(ib1, ib2)) return 0.0;
-  double sum_of_squares[3] = {};
-  HWY_DYNAMIC_DISPATCH(ComputeSumOfSquares)(ib1, ib2, cms, sum_of_squares);
-  constexpr double kChannelWeights[3] = {6.0 / 8, 1.0 / 8, 1.0 / 8};
-  double avg_psnr = 0;
-  const size_t input_pixels = ib1.xsize() * ib1.ysize();
-  for (int i = 0; i < 3; ++i) {
-    const double rmse = std::sqrt(sum_of_squares[i] / input_pixels);
-    const double psnr =
-        sum_of_squares[i] == 0 ? 99.99 : (20 * std::log10(1 / rmse));
-    avg_psnr += kChannelWeights[i] * psnr;
-  }
-  return avg_psnr;
-}
-
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/extras/metrics.h b/third_party/jpeg-xl/lib/extras/metrics.h
deleted file mode 100644
index 87a69a99cea51..0000000000000
--- a/third_party/jpeg-xl/lib/extras/metrics.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_METRICS_H_
-#define LIB_EXTRAS_METRICS_H_
-
-#include <stdint.h>
-
-#include "lib/jxl/butteraugli/butteraugli.h"
-#include "lib/jxl/image_bundle.h"
-
-namespace jxl {
-
-// Computes p-norm given the butteraugli distmap.
-double ComputeDistanceP(const ImageF& distmap, const ButteraugliParams& params,
-                        double p);
-
-double ComputeDistance2(const ImageBundle& ib1, const ImageBundle& ib2,
-                        const JxlCmsInterface& cms);
-
-double ComputePSNR(const ImageBundle& ib1, const ImageBundle& ib2,
-                   const JxlCmsInterface& cms);
-
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_METRICS_H_
diff --git a/third_party/jpeg-xl/lib/extras/mmap.cc b/third_party/jpeg-xl/lib/extras/mmap.cc
deleted file mode 100644
index 9f5bba97edae5..0000000000000
--- a/third_party/jpeg-xl/lib/extras/mmap.cc
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "mmap.h"
-
-#include <cstdint>
-#include <memory>
-
-#include "lib/jxl/base/common.h"
-
-#if defined(__unix__) || defined(__unix) || \
-    defined(__APPLE__) && defined(__MACH__)
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <unistd.h>
-
-namespace jxl {
-
-struct MemoryMappedFileImpl {
-  static StatusOr<std::unique_ptr<MemoryMappedFileImpl>> Init(
-      const char* path) {
-    auto f = make_unique<MemoryMappedFileImpl>();
-    f->fd = open(path, O_RDONLY);
-    if (f->fd == -1) {
-      return JXL_FAILURE("Cannot open file %s", path);
-    }
-    f->mmap_len = lseek(f->fd, 0, SEEK_END);
-    lseek(f->fd, 0, SEEK_SET);
-
-    f->ptr = mmap(nullptr, f->mmap_len, PROT_READ, MAP_SHARED, f->fd, 0);
-    if (f->ptr == MAP_FAILED) {
-      return JXL_FAILURE("mmap failure");
-    }
-    return f;
-  }
-
-  const uint8_t* data() const { return reinterpret_cast<const uint8_t*>(ptr); }
-  size_t size() const { return mmap_len; }
-
-  ~MemoryMappedFileImpl() {
-    if (fd != -1) {
-      close(fd);
-    }
-    if (ptr != nullptr) {
-      munmap(ptr, mmap_len);
-    }
-  }
-
-  int fd = -1;
-  size_t mmap_len = 0;
-  void* ptr = nullptr;
-};
-
-}  // namespace jxl
-
-#elif defined(_WIN32)
-#include <string.h>
-#include <windows.h>
-
-namespace {
-
-struct HandleDeleter {
-  void operator()(const HANDLE handle) const {
-    if (handle != INVALID_HANDLE_VALUE) {
-      CloseHandle(handle);
-    }
-  }
-};
-using HandleUniquePtr =
-    std::unique_ptr<std::remove_pointer<HANDLE>::type, HandleDeleter>;
-
-}  // namespace
-
-namespace jxl {
-
-struct MemoryMappedFileImpl {
-  static StatusOr<std::unique_ptr<MemoryMappedFileImpl>> Init(
-      const char* path) {
-    auto f = make_unique<MemoryMappedFileImpl>();
-    std::wstring stemp = std::wstring(path, path + strlen(path));
-    f->handle.reset(CreateFileW(stemp.c_str(), GENERIC_READ, FILE_SHARE_READ,
-                                nullptr, OPEN_EXISTING,
-                                FILE_FLAG_SEQUENTIAL_SCAN, nullptr));
-    if (f->handle.get() == INVALID_HANDLE_VALUE) {
-      return JXL_FAILURE("Cannot open file %s", path);
-    }
-    if (!GetFileSizeEx(f->handle.get(), &f->fsize)) {
-      return JXL_FAILURE("Cannot get file size (%s)", path);
-    }
-    f->handle_mapping.reset(CreateFileMappingW(f->handle.get(), nullptr,
-                                               PAGE_READONLY, 0, 0, nullptr));
-    if (f->handle_mapping == nullptr) {
-      return JXL_FAILURE("Cannot create memory mapping (%s)", path);
-    }
-    f->ptr = MapViewOfFile(f->handle_mapping.get(), FILE_MAP_READ, 0, 0, 0);
-    return f;
-  }
-
-  ~MemoryMappedFileImpl() { UnmapViewOfFile(ptr); }
-
-  const uint8_t* data() const { return reinterpret_cast<const uint8_t*>(ptr); }
-  size_t size() const { return fsize.QuadPart; }
-
-  HandleUniquePtr handle;
-  HandleUniquePtr handle_mapping;
-  LARGE_INTEGER fsize;
-  void* ptr = nullptr;
-};
-
-}  // namespace jxl
-
-#else
-
-namespace jxl {
-
-struct MemoryMappedFileImpl {
-  static StatusOr<std::unique_ptr<MemoryMappedFileImpl>> Init(
-      const char* path) {
-    return JXL_FAILURE("Memory mapping not supported on this system");
-  }
-
-  const uint8_t* data() const { return nullptr; }
-  size_t size() const { return 0; }
-};
-
-}  // namespace jxl
-
-#endif
-
-namespace jxl {
-
-StatusOr<MemoryMappedFile> MemoryMappedFile::Init(const char* path) {
-  JXL_ASSIGN_OR_RETURN(auto mmf, MemoryMappedFileImpl::Init(path));
-  MemoryMappedFile ret;
-  ret.impl_ = std::move(mmf);
-  return ret;
-}
-
-MemoryMappedFile::MemoryMappedFile() = default;
-MemoryMappedFile::~MemoryMappedFile() = default;
-MemoryMappedFile::MemoryMappedFile(MemoryMappedFile&&) noexcept = default;
-MemoryMappedFile& MemoryMappedFile::operator=(MemoryMappedFile&&) noexcept =
-    default;
-
-const uint8_t* MemoryMappedFile::data() const { return impl_->data(); }
-size_t MemoryMappedFile::size() const { return impl_->size(); }
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/mmap.h b/third_party/jpeg-xl/lib/extras/mmap.h
deleted file mode 100644
index 60cc215993eea..0000000000000
--- a/third_party/jpeg-xl/lib/extras/mmap.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_MMAP_H_
-#define LIB_EXTRAS_MMAP_H_
-
-#include <memory>
-
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-struct MemoryMappedFileImpl;
-
-class MemoryMappedFile {
- public:
-  static StatusOr<MemoryMappedFile> Init(const char* path);
-  const uint8_t* data() const;
-  size_t size() const;
-  MemoryMappedFile();                                        // NOLINT
-  ~MemoryMappedFile();                                       // NOLINT
-  MemoryMappedFile(MemoryMappedFile&&) noexcept;             // NOLINT
-  MemoryMappedFile& operator=(MemoryMappedFile&&) noexcept;  // NOLINT
-
- private:
-  std::unique_ptr<MemoryMappedFileImpl> impl_;
-};
-}  // namespace jxl
-
-#endif
diff --git a/third_party/jpeg-xl/lib/extras/packed_image.h b/third_party/jpeg-xl/lib/extras/packed_image.h
deleted file mode 100644
index 8a88af618811a..0000000000000
--- a/third_party/jpeg-xl/lib/extras/packed_image.h
+++ /dev/null
@@ -1,308 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_PACKED_IMAGE_H_
-#define LIB_EXTRAS_PACKED_IMAGE_H_
-
-// Helper class for storing external (int or float, interleaved) images. This is
-// the common format used by other libraries and in the libjxl API.
-
-#include <jxl/codestream_header.h>
-#include <jxl/encode.h>
-#include <jxl/types.h>
-
-#include <algorithm>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
-#include <functional>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-namespace extras {
-
-// Class representing an interleaved image with a bunch of channels.
-class PackedImage {
- public:
-  static StatusOr<PackedImage> Create(size_t xsize, size_t ysize,
-                                      const JxlPixelFormat& format) {
-    PackedImage image(xsize, ysize, format, CalcStride(format, xsize));
-    if (!image.pixels()) {
-      // TODO(szabadka): use specialized OOM error code
-      return JXL_FAILURE("Failed to allocate memory for image");
-    }
-    return image;
-  }
-
-  PackedImage Copy() const {
-    PackedImage copy(xsize, ysize, format, CalcStride(format, xsize));
-    memcpy(reinterpret_cast<uint8_t*>(copy.pixels()),
-           reinterpret_cast<const uint8_t*>(pixels()), pixels_size);
-    return copy;
-  }
-
-  // The interleaved pixels as defined in the storage format.
-  void* pixels() const { return pixels_.get(); }
-
-  uint8_t* pixels(size_t y, size_t x, size_t c) const {
-    return (reinterpret_cast<uint8_t*>(pixels_.get()) + y * stride +
-            x * pixel_stride_ + c * bytes_per_channel_);
-  }
-
-  const uint8_t* const_pixels(size_t y, size_t x, size_t c) const {
-    return (reinterpret_cast<const uint8_t*>(pixels_.get()) + y * stride +
-            x * pixel_stride_ + c * bytes_per_channel_);
-  }
-
-  // The image size in pixels.
-  size_t xsize;
-  size_t ysize;
-
-  // The number of bytes per row.
-  size_t stride;
-
-  // Pixel storage format and buffer size of the pixels_ pointer.
-  JxlPixelFormat format;
-  size_t pixels_size;
-
-  size_t pixel_stride() const { return pixel_stride_; }
-
-  static Status ValidateDataType(JxlDataType data_type) {
-    if ((data_type != JXL_TYPE_UINT8) && (data_type != JXL_TYPE_UINT16) &&
-        (data_type != JXL_TYPE_FLOAT) && (data_type != JXL_TYPE_FLOAT16)) {
-      return JXL_FAILURE("Unhandled data type: %d",
-                         static_cast<int>(data_type));
-    }
-    return true;
-  }
-
-  static size_t BitsPerChannel(JxlDataType data_type) {
-    switch (data_type) {
-      case JXL_TYPE_UINT8:
-        return 8;
-      case JXL_TYPE_UINT16:
-        return 16;
-      case JXL_TYPE_FLOAT:
-        return 32;
-      case JXL_TYPE_FLOAT16:
-        return 16;
-      default:
-        JXL_DEBUG_ABORT("Unreachable");
-        return 0;
-    }
-  }
-
-  float GetPixelValue(size_t y, size_t x, size_t c) const {
-    const uint8_t* data = const_pixels(y, x, c);
-    switch (format.data_type) {
-      case JXL_TYPE_UINT8:
-        return data[0] * (1.0f / 255);
-      case JXL_TYPE_UINT16: {
-        uint16_t val;
-        memcpy(&val, data, 2);
-        return (swap_endianness_ ? JXL_BSWAP16(val) : val) * (1.0f / 65535);
-      }
-      case JXL_TYPE_FLOAT: {
-        float val;
-        memcpy(&val, data, 4);
-        return swap_endianness_ ? BSwapFloat(val) : val;
-      }
-      default:
-        JXL_DEBUG_ABORT("Unreachable");
-        return 0.0f;
-    }
-  }
-
-  void SetPixelValue(size_t y, size_t x, size_t c, float val) const {
-    uint8_t* data = pixels(y, x, c);
-    switch (format.data_type) {
-      case JXL_TYPE_UINT8:
-        data[0] = Clamp1(std::round(val * 255), 0.0f, 255.0f);
-        break;
-      case JXL_TYPE_UINT16: {
-        uint16_t val16 = Clamp1(std::round(val * 65535), 0.0f, 65535.0f);
-        if (swap_endianness_) {
-          val16 = JXL_BSWAP16(val16);
-        }
-        memcpy(data, &val16, 2);
-        break;
-      }
-      case JXL_TYPE_FLOAT: {
-        if (swap_endianness_) {
-          val = BSwapFloat(val);
-        }
-        memcpy(data, &val, 4);
-        break;
-      }
-      default:
-        JXL_DEBUG_ABORT("Unreachable");
-    }
-  }
-
- private:
-  PackedImage(size_t xsize, size_t ysize, const JxlPixelFormat& format,
-              size_t stride)
-      : xsize(xsize),
-        ysize(ysize),
-        stride(stride),
-        format(format),
-        pixels_size(ysize * stride),
-        pixels_(malloc(std::max<size_t>(1, pixels_size)), free) {
-    bytes_per_channel_ = BitsPerChannel(format.data_type) / jxl::kBitsPerByte;
-    pixel_stride_ = format.num_channels * bytes_per_channel_;
-    swap_endianness_ = SwapEndianness(format.endianness);
-  }
-
-  static size_t CalcStride(const JxlPixelFormat& format, size_t xsize) {
-    size_t stride = xsize * (BitsPerChannel(format.data_type) *
-                             format.num_channels / jxl::kBitsPerByte);
-    if (format.align > 1) {
-      stride = jxl::DivCeil(stride, format.align) * format.align;
-    }
-    return stride;
-  }
-
-  size_t bytes_per_channel_;
-  size_t pixel_stride_;
-  bool swap_endianness_;
-  std::unique_ptr<void, decltype(free)*> pixels_;
-};
-
-// Helper class representing a frame, as seen from the API. Animations will have
-// multiple frames, but a single frame can have a color/grayscale channel and
-// multiple extra channels. The order of the extra channels should be the same
-// as all other frames in the same image.
-class PackedFrame {
- public:
-  explicit PackedFrame(PackedImage&& image) : color(std::move(image)) {}
-
-  static StatusOr<PackedFrame> Create(size_t xsize, size_t ysize,
-                                      const JxlPixelFormat& format) {
-    JXL_ASSIGN_OR_RETURN(PackedImage image,
-                         PackedImage::Create(xsize, ysize, format));
-    PackedFrame frame(std::move(image));
-    return frame;
-  }
-
-  StatusOr<PackedFrame> Copy() const {
-    JXL_ASSIGN_OR_RETURN(
-        PackedFrame copy,
-        PackedFrame::Create(color.xsize, color.ysize, color.format));
-    copy.frame_info = frame_info;
-    copy.name = name;
-    copy.color = color.Copy();
-    for (const auto& ec : extra_channels) {
-      copy.extra_channels.emplace_back(ec.Copy());
-    }
-    return copy;
-  }
-
-  // The Frame metadata.
-  JxlFrameHeader frame_info = {};
-  std::string name;
-
-  // The pixel data for the color (or grayscale) channels.
-  PackedImage color;
-  // Extra channel image data.
-  std::vector<PackedImage> extra_channels;
-};
-
-class ChunkedPackedFrame {
- public:
-  ChunkedPackedFrame(
-      size_t xsize, size_t ysize,
-      std::function<JxlChunkedFrameInputSource()> get_input_source)
-      : xsize(xsize),
-        ysize(ysize),
-        get_input_source_(std::move(get_input_source)) {
-    const auto input_source = get_input_source_();
-    input_source.get_color_channels_pixel_format(input_source.opaque, &format);
-  }
-
-  JxlChunkedFrameInputSource GetInputSource() { return get_input_source_(); }
-
-  // The Frame metadata.
-  JxlFrameHeader frame_info = {};
-  std::string name;
-
-  size_t xsize;
-  size_t ysize;
-  JxlPixelFormat format;
-
- private:
-  std::function<JxlChunkedFrameInputSource()> get_input_source_;
-};
-
-// Optional metadata associated with a file
-class PackedMetadata {
- public:
-  std::vector<uint8_t> exif;
-  std::vector<uint8_t> iptc;
-  std::vector<uint8_t> jhgm;
-  std::vector<uint8_t> jumbf;
-  std::vector<uint8_t> xmp;
-};
-
-// The extra channel metadata information.
-struct PackedExtraChannel {
-  JxlExtraChannelInfo ec_info;
-  size_t index;
-  std::string name;
-};
-
-// Helper class representing a JXL image file as decoded to pixels from the API.
-class PackedPixelFile {
- public:
-  JxlBasicInfo info = {};
-
-  std::vector<PackedExtraChannel> extra_channels_info;
-
-  // Color information of the decoded pixels.
-  // `primary_color_representation` indicates whether `color_encoding` or `icc`
-  // is the “authoritative” encoding of the colorspace, as opposed to a fallback
-  // encoding. For example, if `color_encoding` is the primary one, as would
-  // occur when decoding a jxl file with such a representation, then `enc/jxl`
-  // will use it and ignore the ICC profile, whereas `enc/png` will include the
-  // ICC profile for compatibility.
-  // If `icc` is the primary representation, `enc/jxl` will preserve it when
-  // compressing losslessly, but *may* encode it as a color_encoding when
-  // compressing lossily.
-  enum {
-    kColorEncodingIsPrimary,
-    kIccIsPrimary
-  } primary_color_representation = kColorEncodingIsPrimary;
-  JxlColorEncoding color_encoding = {};
-  std::vector<uint8_t> icc;
-  // The icc profile of the original image.
-  std::vector<uint8_t> orig_icc;
-
-  JxlBitDepth input_bitdepth = {JXL_BIT_DEPTH_FROM_PIXEL_FORMAT, 0, 0};
-
-  std::unique_ptr<PackedFrame> preview_frame;
-  std::vector<PackedFrame> frames;
-  mutable std::vector<ChunkedPackedFrame> chunked_frames;
-
-  PackedMetadata metadata;
-  PackedPixelFile() { JxlEncoderInitBasicInfo(&info); };
-
-  size_t num_frames() const {
-    return chunked_frames.empty() ? frames.size() : chunked_frames.size();
-  }
-  size_t xsize() const { return info.xsize; }
-  size_t ysize() const { return info.ysize; }
-};
-
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_PACKED_IMAGE_H_
diff --git a/third_party/jpeg-xl/lib/extras/packed_image_convert.cc b/third_party/jpeg-xl/lib/extras/packed_image_convert.cc
deleted file mode 100644
index 7bdb3cdf64a3d..0000000000000
--- a/third_party/jpeg-xl/lib/extras/packed_image_convert.cc
+++ /dev/null
@@ -1,359 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/packed_image_convert.h"
-
-#include <jxl/cms.h>
-#include <jxl/color_encoding.h>
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-
-#include <cstdint>
-#include <cstdio>
-
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/dec_external_image.h"
-#include "lib/jxl/enc_external_image.h"
-#include "lib/jxl/enc_image_bundle.h"
-#include "lib/jxl/luminance.h"
-
-namespace jxl {
-namespace extras {
-
-Status ConvertPackedFrameToImageBundle(const JxlBasicInfo& info,
-                                       const JxlBitDepth& input_bitdepth,
-                                       const PackedFrame& frame,
-                                       const CodecInOut& io, ThreadPool* pool,
-                                       ImageBundle* bundle) {
-  JxlMemoryManager* memory_manager = io.memory_manager;
-  JXL_ENSURE(frame.color.pixels() != nullptr);
-  size_t frame_bits_per_sample;
-  if (input_bitdepth.type == JXL_BIT_DEPTH_FROM_PIXEL_FORMAT) {
-    JXL_RETURN_IF_ERROR(
-        PackedImage::ValidateDataType(frame.color.format.data_type));
-    frame_bits_per_sample =
-        PackedImage::BitsPerChannel(frame.color.format.data_type);
-  } else {
-    frame_bits_per_sample = info.bits_per_sample;
-  }
-  JXL_ENSURE(frame_bits_per_sample != 0);
-  // It is ok for the frame.color.format.num_channels to not match the
-  // number of channels on the image.
-  JXL_ENSURE(1 <= frame.color.format.num_channels &&
-             frame.color.format.num_channels <= 4);
-
-  const Span<const uint8_t> span(
-      static_cast<const uint8_t*>(frame.color.pixels()),
-      frame.color.pixels_size);
-  JXL_ENSURE(Rect(frame.frame_info.layer_info.crop_x0,
-                  frame.frame_info.layer_info.crop_y0,
-                  frame.frame_info.layer_info.xsize,
-                  frame.frame_info.layer_info.ysize)
-                 .IsInside(Rect(0, 0, info.xsize, info.ysize)));
-  if (info.have_animation) {
-    bundle->duration = frame.frame_info.duration;
-    bundle->blend = frame.frame_info.layer_info.blend_info.blendmode > 0;
-    bundle->use_for_next_frame =
-        frame.frame_info.layer_info.save_as_reference > 0;
-    bundle->origin.x0 = frame.frame_info.layer_info.crop_x0;
-    bundle->origin.y0 = frame.frame_info.layer_info.crop_y0;
-  }
-  bundle->name = frame.name;  // frame.frame_info.name_length is ignored here.
-  JXL_ENSURE(io.metadata.m.color_encoding.IsGray() ==
-             (frame.color.format.num_channels <= 2));
-
-  JXL_RETURN_IF_ERROR(ConvertFromExternal(
-      span, frame.color.xsize, frame.color.ysize, io.metadata.m.color_encoding,
-      frame_bits_per_sample, frame.color.format, pool, bundle));
-
-  bundle->extra_channels().resize(io.metadata.m.extra_channel_info.size());
-  for (size_t i = 0; i < frame.extra_channels.size(); i++) {
-    const auto& ppf_ec = frame.extra_channels[i];
-    JXL_ASSIGN_OR_RETURN(
-        bundle->extra_channels()[i],
-        ImageF::Create(memory_manager, ppf_ec.xsize, ppf_ec.ysize));
-    JXL_RETURN_IF_ERROR(BufferToImageF(
-        ppf_ec.format, ppf_ec.xsize, ppf_ec.ysize, ppf_ec.pixels(),
-        ppf_ec.pixels_size, pool, &bundle->extra_channels()[i]));
-  }
-  return true;
-}
-
-Status ConvertPackedPixelFileToCodecInOut(const PackedPixelFile& ppf,
-                                          ThreadPool* pool, CodecInOut* io) {
-  JxlMemoryManager* memory_manager = io->memory_manager;
-  const bool has_alpha = ppf.info.alpha_bits != 0;
-  JXL_ENSURE(!ppf.frames.empty());
-  if (has_alpha) {
-    JXL_ENSURE(ppf.info.alpha_bits == ppf.info.bits_per_sample);
-    JXL_ENSURE(ppf.info.alpha_exponent_bits ==
-               ppf.info.exponent_bits_per_sample);
-  }
-
-  const bool is_gray = (ppf.info.num_color_channels == 1);
-  JXL_ENSURE(ppf.info.num_color_channels == 1 ||
-             ppf.info.num_color_channels == 3);
-
-  // Convert the image metadata
-  JXL_RETURN_IF_ERROR(io->SetSize(ppf.info.xsize, ppf.info.ysize));
-  io->metadata.m.bit_depth.bits_per_sample = ppf.info.bits_per_sample;
-  io->metadata.m.bit_depth.exponent_bits_per_sample =
-      ppf.info.exponent_bits_per_sample;
-  io->metadata.m.bit_depth.floating_point_sample =
-      ppf.info.exponent_bits_per_sample != 0;
-  io->metadata.m.modular_16_bit_buffer_sufficient =
-      ppf.info.exponent_bits_per_sample == 0 && ppf.info.bits_per_sample <= 12;
-
-  io->metadata.m.SetAlphaBits(ppf.info.alpha_bits,
-                              FROM_JXL_BOOL(ppf.info.alpha_premultiplied));
-  ExtraChannelInfo* alpha = io->metadata.m.Find(ExtraChannel::kAlpha);
-  if (alpha) alpha->bit_depth = io->metadata.m.bit_depth;
-
-  io->metadata.m.xyb_encoded = !FROM_JXL_BOOL(ppf.info.uses_original_profile);
-  JXL_ENSURE(ppf.info.orientation > 0 && ppf.info.orientation <= 8);
-  io->metadata.m.orientation = ppf.info.orientation;
-
-  // Convert animation metadata
-  JXL_ENSURE(ppf.frames.size() == 1 || ppf.info.have_animation);
-  io->metadata.m.have_animation = FROM_JXL_BOOL(ppf.info.have_animation);
-  io->metadata.m.animation.tps_numerator = ppf.info.animation.tps_numerator;
-  io->metadata.m.animation.tps_denominator = ppf.info.animation.tps_denominator;
-  io->metadata.m.animation.num_loops = ppf.info.animation.num_loops;
-
-  // Convert the color encoding.
-  if (ppf.primary_color_representation == PackedPixelFile::kIccIsPrimary) {
-    IccBytes icc = ppf.icc;
-    if (!io->metadata.m.color_encoding.SetICC(std::move(icc),
-                                              JxlGetDefaultCms())) {
-      fprintf(stderr, "Warning: error setting ICC profile, assuming SRGB\n");
-      io->metadata.m.color_encoding = ColorEncoding::SRGB(is_gray);
-    } else {
-      if (io->metadata.m.color_encoding.IsCMYK()) {
-        // We expect gray or tri-color.
-        return JXL_FAILURE("Embedded ICC is CMYK");
-      }
-      if (io->metadata.m.color_encoding.IsGray() != is_gray) {
-        // E.g. JPG image has 3 channels, but gray ICC.
-        return JXL_FAILURE("Embedded ICC does not match image color type");
-      }
-    }
-  } else {
-    JXL_RETURN_IF_ERROR(
-        io->metadata.m.color_encoding.FromExternal(ppf.color_encoding));
-    if (io->metadata.m.color_encoding.ICC().empty()) {
-      return JXL_FAILURE("Failed to serialize ICC");
-    }
-  }
-
-  // Convert the extra blobs
-  io->blobs.exif = ppf.metadata.exif;
-  io->blobs.iptc = ppf.metadata.iptc;
-  io->blobs.jhgm = ppf.metadata.jhgm;
-  io->blobs.jumbf = ppf.metadata.jumbf;
-  io->blobs.xmp = ppf.metadata.xmp;
-
-  // Append all other extra channels.
-  for (const auto& info : ppf.extra_channels_info) {
-    ExtraChannelInfo out;
-    out.type = static_cast<jxl::ExtraChannel>(info.ec_info.type);
-    out.bit_depth.bits_per_sample = info.ec_info.bits_per_sample;
-    out.bit_depth.exponent_bits_per_sample =
-        info.ec_info.exponent_bits_per_sample;
-    out.bit_depth.floating_point_sample =
-        info.ec_info.exponent_bits_per_sample != 0;
-    out.dim_shift = info.ec_info.dim_shift;
-    out.name = info.name;
-    out.alpha_associated = (info.ec_info.alpha_premultiplied != 0);
-    out.spot_color[0] = info.ec_info.spot_color[0];
-    out.spot_color[1] = info.ec_info.spot_color[1];
-    out.spot_color[2] = info.ec_info.spot_color[2];
-    out.spot_color[3] = info.ec_info.spot_color[3];
-    io->metadata.m.extra_channel_info.push_back(std::move(out));
-  }
-
-  // Convert the preview
-  if (ppf.preview_frame) {
-    size_t preview_xsize = ppf.preview_frame->color.xsize;
-    size_t preview_ysize = ppf.preview_frame->color.ysize;
-    io->metadata.m.have_preview = true;
-    JXL_RETURN_IF_ERROR(
-        io->metadata.m.preview_size.Set(preview_xsize, preview_ysize));
-    JXL_RETURN_IF_ERROR(ConvertPackedFrameToImageBundle(
-        ppf.info, ppf.input_bitdepth, *ppf.preview_frame, *io, pool,
-        &io->preview_frame));
-  }
-
-  // Convert the pixels
-  io->frames.clear();
-  for (const auto& frame : ppf.frames) {
-    ImageBundle bundle(memory_manager, &io->metadata.m);
-    JXL_RETURN_IF_ERROR(ConvertPackedFrameToImageBundle(
-        ppf.info, ppf.input_bitdepth, frame, *io, pool, &bundle));
-    io->frames.push_back(std::move(bundle));
-  }
-
-  if (ppf.info.exponent_bits_per_sample == 0) {
-    // uint case.
-    io->metadata.m.bit_depth.bits_per_sample = io->Main().DetectRealBitdepth();
-  }
-  if (ppf.info.intensity_target != 0) {
-    io->metadata.m.SetIntensityTarget(ppf.info.intensity_target);
-  } else {
-    SetIntensityTarget(&io->metadata.m);
-  }
-  JXL_RETURN_IF_ERROR(io->CheckMetadata());
-  return true;
-}
-
-StatusOr<PackedPixelFile> ConvertImage3FToPackedPixelFile(
-    const Image3F& image, const ColorEncoding& c_enc, JxlPixelFormat format,
-    ThreadPool* pool) {
-  PackedPixelFile ppf{};
-  ppf.info.xsize = image.xsize();
-  ppf.info.ysize = image.ysize();
-  ppf.info.num_color_channels = 3;
-  JXL_RETURN_IF_ERROR(PackedImage::ValidateDataType(format.data_type));
-  ppf.info.bits_per_sample = PackedImage::BitsPerChannel(format.data_type);
-  ppf.info.exponent_bits_per_sample = format.data_type == JXL_TYPE_FLOAT ? 8
-                                      : format.data_type == JXL_TYPE_FLOAT16
-                                          ? 5
-                                          : 0;
-  ppf.color_encoding = c_enc.ToExternal();
-  ppf.frames.clear();
-  JXL_ASSIGN_OR_RETURN(
-      PackedFrame frame,
-      PackedFrame::Create(image.xsize(), image.ysize(), format));
-  const ImageF* channels[3];
-  for (int c = 0; c < 3; ++c) {
-    channels[c] = &image.Plane(c);
-  }
-  bool float_samples = ppf.info.exponent_bits_per_sample > 0;
-  JXL_RETURN_IF_ERROR(ConvertChannelsToExternal(
-      channels, 3, ppf.info.bits_per_sample, float_samples, format.endianness,
-      frame.color.stride, pool, frame.color.pixels(0, 0, 0),
-      frame.color.pixels_size, PixelCallback(), Orientation::kIdentity));
-  ppf.frames.emplace_back(std::move(frame));
-  return ppf;
-}
-
-// Allows converting from internal CodecInOut to external PackedPixelFile
-Status ConvertCodecInOutToPackedPixelFile(const CodecInOut& io,
-                                          const JxlPixelFormat& pixel_format,
-                                          const ColorEncoding& c_desired,
-                                          ThreadPool* pool,
-                                          PackedPixelFile* ppf) {
-  JxlMemoryManager* memory_manager = io.memory_manager;
-  const bool has_alpha = io.metadata.m.HasAlpha();
-  JXL_ENSURE(!io.frames.empty());
-
-  if (has_alpha) {
-    JXL_ENSURE(io.metadata.m.GetAlphaBits() ==
-               io.metadata.m.bit_depth.bits_per_sample);
-    const auto* alpha_channel = io.metadata.m.Find(ExtraChannel::kAlpha);
-    JXL_ENSURE(alpha_channel->bit_depth.exponent_bits_per_sample ==
-               io.metadata.m.bit_depth.exponent_bits_per_sample);
-    ppf->info.alpha_bits = alpha_channel->bit_depth.bits_per_sample;
-    ppf->info.alpha_exponent_bits =
-        alpha_channel->bit_depth.exponent_bits_per_sample;
-    ppf->info.alpha_premultiplied =
-        TO_JXL_BOOL(alpha_channel->alpha_associated);
-  }
-
-  // Convert the image metadata
-  ppf->info.xsize = io.metadata.size.xsize();
-  ppf->info.ysize = io.metadata.size.ysize();
-  ppf->info.num_color_channels = io.metadata.m.color_encoding.Channels();
-  ppf->info.bits_per_sample = io.metadata.m.bit_depth.bits_per_sample;
-  ppf->info.exponent_bits_per_sample =
-      io.metadata.m.bit_depth.exponent_bits_per_sample;
-
-  ppf->info.intensity_target = io.metadata.m.tone_mapping.intensity_target;
-  ppf->info.linear_below = io.metadata.m.tone_mapping.linear_below;
-  ppf->info.min_nits = io.metadata.m.tone_mapping.min_nits;
-  ppf->info.relative_to_max_display =
-      TO_JXL_BOOL(io.metadata.m.tone_mapping.relative_to_max_display);
-
-  ppf->info.uses_original_profile = TO_JXL_BOOL(!io.metadata.m.xyb_encoded);
-  JXL_ENSURE(0 < io.metadata.m.orientation && io.metadata.m.orientation <= 8);
-  ppf->info.orientation =
-      static_cast<JxlOrientation>(io.metadata.m.orientation);
-  ppf->info.num_color_channels = io.metadata.m.color_encoding.Channels();
-
-  // Convert animation metadata
-  JXL_ENSURE(io.frames.size() == 1 || io.metadata.m.have_animation);
-  ppf->info.have_animation = TO_JXL_BOOL(io.metadata.m.have_animation);
-  ppf->info.animation.tps_numerator = io.metadata.m.animation.tps_numerator;
-  ppf->info.animation.tps_denominator = io.metadata.m.animation.tps_denominator;
-  ppf->info.animation.num_loops = io.metadata.m.animation.num_loops;
-
-  // Convert the color encoding
-  ppf->icc.assign(c_desired.ICC().begin(), c_desired.ICC().end());
-  ppf->primary_color_representation =
-      c_desired.WantICC() ? PackedPixelFile::kIccIsPrimary
-                          : PackedPixelFile::kColorEncodingIsPrimary;
-  ppf->color_encoding = c_desired.ToExternal();
-
-  // Convert the extra blobs
-  ppf->metadata.exif = io.blobs.exif;
-  ppf->metadata.iptc = io.blobs.iptc;
-  ppf->metadata.jhgm = io.blobs.jhgm;
-  ppf->metadata.jumbf = io.blobs.jumbf;
-  ppf->metadata.xmp = io.blobs.xmp;
-  const bool float_out = pixel_format.data_type == JXL_TYPE_FLOAT ||
-                         pixel_format.data_type == JXL_TYPE_FLOAT16;
-  // Convert the pixels
-  ppf->frames.clear();
-  for (const auto& frame : io.frames) {
-    JXL_ENSURE(frame.metadata()->bit_depth.bits_per_sample != 0);
-    // It is ok for the frame.color().kNumPlanes to not match the
-    // number of channels on the image.
-    const uint32_t alpha_channels = has_alpha ? 1 : 0;
-    const uint32_t num_channels =
-        frame.metadata()->color_encoding.Channels() + alpha_channels;
-    JxlPixelFormat format{/*num_channels=*/num_channels,
-                          /*data_type=*/pixel_format.data_type,
-                          /*endianness=*/pixel_format.endianness,
-                          /*align=*/pixel_format.align};
-
-    JXL_ASSIGN_OR_RETURN(PackedFrame packed_frame,
-                         PackedFrame::Create(frame.oriented_xsize(),
-                                             frame.oriented_ysize(), format));
-    JXL_RETURN_IF_ERROR(PackedImage::ValidateDataType(pixel_format.data_type));
-    const size_t bits_per_sample =
-        float_out ? packed_frame.color.BitsPerChannel(pixel_format.data_type)
-                  : ppf->info.bits_per_sample;
-    packed_frame.name = frame.name;
-    packed_frame.frame_info.name_length = frame.name.size();
-    // Color transform
-    JXL_ASSIGN_OR_RETURN(ImageBundle ib, frame.Copy());
-    const ImageBundle* to_color_transform = &ib;
-    ImageMetadata metadata = io.metadata.m;
-    ImageBundle store(memory_manager, &metadata);
-    const ImageBundle* transformed;
-    // TODO(firsching): handle the transform here.
-    JXL_RETURN_IF_ERROR(TransformIfNeeded(*to_color_transform, c_desired,
-                                          *JxlGetDefaultCms(), pool, &store,
-                                          &transformed));
-
-    JXL_RETURN_IF_ERROR(ConvertToExternal(
-        *transformed, bits_per_sample, float_out, format.num_channels,
-        format.endianness,
-        /* stride_out=*/packed_frame.color.stride, pool,
-        packed_frame.color.pixels(), packed_frame.color.pixels_size,
-        /*out_callback=*/{}, frame.metadata()->GetOrientation()));
-
-    // TODO(firsching): Convert the extra channels, beside one potential alpha
-    // channel. FIXME!
-    JXL_ENSURE(frame.extra_channels().size() <= (has_alpha ? 1 : 0));
-    ppf->frames.push_back(std::move(packed_frame));
-  }
-
-  return true;
-}
-}  // namespace extras
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/packed_image_convert.h b/third_party/jpeg-xl/lib/extras/packed_image_convert.h
deleted file mode 100644
index 20ed330b84719..0000000000000
--- a/third_party/jpeg-xl/lib/extras/packed_image_convert.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_PACKED_IMAGE_CONVERT_H_
-#define LIB_EXTRAS_PACKED_IMAGE_CONVERT_H_
-
-// Helper functions to convert from the external image types to the internal
-// CodecInOut to help transitioning to the external types.
-
-#include <jxl/types.h>
-
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/codec_in_out.h"
-
-namespace jxl {
-namespace extras {
-
-// Converts an external PackedPixelFile to the internal CodecInOut for use with
-// internal functions directly.
-Status ConvertPackedPixelFileToCodecInOut(const PackedPixelFile& ppf,
-                                          ThreadPool* pool, CodecInOut* io);
-
-// Converts an internal CodecInOut for use with internal function to an external
-// PackedPixelFile.
-Status ConvertCodecInOutToPackedPixelFile(const CodecInOut& io,
-                                          const JxlPixelFormat& pixel_format,
-                                          const ColorEncoding& c_desired,
-                                          ThreadPool* pool,
-                                          PackedPixelFile* ppf);
-
-StatusOr<PackedPixelFile> ConvertImage3FToPackedPixelFile(
-    const Image3F& image, const ColorEncoding& c_enc, JxlPixelFormat format,
-    ThreadPool* pool);
-}  // namespace extras
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_PACKED_IMAGE_CONVERT_H_
diff --git a/third_party/jpeg-xl/lib/extras/size_constraints.h b/third_party/jpeg-xl/lib/extras/size_constraints.h
deleted file mode 100644
index cf06f8cb22814..0000000000000
--- a/third_party/jpeg-xl/lib/extras/size_constraints.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_SIZE_CONSTRAINTS_H_
-#define LIB_JXL_SIZE_CONSTRAINTS_H_
-
-#include <cstdint>
-#include <type_traits>
-
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-struct SizeConstraints {
-  // Upper limit on pixel dimensions/area, enforced by VerifyDimensions
-  // (called from decoders). Fuzzers set smaller values to limit memory use.
-  uint32_t dec_max_xsize = 0xFFFFFFFFu;
-  uint32_t dec_max_ysize = 0xFFFFFFFFu;
-  uint64_t dec_max_pixels = 0xFFFFFFFFu;  // Might be up to ~0ull
-};
-
-template <typename T,
-          class = typename std::enable_if<std::is_unsigned<T>::value>::type>
-Status VerifyDimensions(const SizeConstraints* constraints, T xs, T ys) {
-  if (!constraints) return true;
-
-  if (xs == 0 || ys == 0) return JXL_FAILURE("Empty image.");
-  if (xs > constraints->dec_max_xsize) return JXL_FAILURE("Image too wide.");
-  if (ys > constraints->dec_max_ysize) return JXL_FAILURE("Image too tall.");
-
-  const uint64_t num_pixels = static_cast<uint64_t>(xs) * ys;
-  if (num_pixels > constraints->dec_max_pixels) {
-    return JXL_FAILURE("Image too big.");
-  }
-
-  return true;
-}
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_SIZE_CONSTRAINTS_H_
diff --git a/third_party/jpeg-xl/lib/extras/time.cc b/third_party/jpeg-xl/lib/extras/time.cc
deleted file mode 100644
index 344994f78da7a..0000000000000
--- a/third_party/jpeg-xl/lib/extras/time.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/time.h"
-
-#include <stdint.h>
-#include <stdlib.h>
-
-#include <ctime>
-
-#include "lib/jxl/base/os_macros.h"  // for JXL_OS_*
-
-#if JXL_OS_WIN
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif  // NOMINMAX
-#include <windows.h>
-#endif  // JXL_OS_WIN
-
-#if JXL_OS_MAC
-#include <mach/mach.h>
-#include <mach/mach_time.h>
-#endif  // JXL_OS_MAC
-
-#if JXL_OS_HAIKU
-#include <OS.h>
-#endif  // JXL_OS_HAIKU
-
-namespace jxl {
-
-double Now() {
-#if JXL_OS_WIN
-  LARGE_INTEGER counter;
-  (void)QueryPerformanceCounter(&counter);
-  LARGE_INTEGER freq;
-  (void)QueryPerformanceFrequency(&freq);
-  return double(counter.QuadPart) / freq.QuadPart;
-#elif JXL_OS_MAC
-  const auto t = mach_absolute_time();
-  // On OSX/iOS platform the elapsed time is cpu time unit
-  // We have to query the time base information to convert it back
-  // See https://developer.apple.com/library/mac/qa/qa1398/_index.html
-  static mach_timebase_info_data_t timebase;
-  if (timebase.denom == 0) {
-    (void)mach_timebase_info(&timebase);
-  }
-  return double(t) * timebase.numer / timebase.denom * 1E-9;  // notypo
-#elif JXL_OS_HAIKU
-  return double(system_time_nsecs()) * 1E-9;
-#else
-  timespec t;
-  clock_gettime(CLOCK_MONOTONIC, &t);
-  return t.tv_sec + t.tv_nsec * 1E-9;
-#endif
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/extras/time.h b/third_party/jpeg-xl/lib/extras/time.h
deleted file mode 100644
index c71414b877b84..0000000000000
--- a/third_party/jpeg-xl/lib/extras/time.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_TIME_H_
-#define LIB_EXTRAS_TIME_H_
-
-// OS-specific function for timing.
-
-namespace jxl {
-
-// Returns current time [seconds] from a monotonic clock with unspecified
-// starting point - only suitable for computing elapsed time.
-double Now();
-
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_TIME_H_
diff --git a/third_party/jpeg-xl/lib/extras/tone_mapping.cc b/third_party/jpeg-xl/lib/extras/tone_mapping.cc
deleted file mode 100644
index 9a700c48a32f0..0000000000000
--- a/third_party/jpeg-xl/lib/extras/tone_mapping.cc
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/tone_mapping.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/extras/tone_mapping.cc"
-#include <jxl/cms.h>
-
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/cms/tone_mapping-inl.h"
-#include "lib/jxl/image_bundle.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-static constexpr Vector3 rec2020_luminances{0.2627f, 0.6780f, 0.0593f};
-
-Status ToneMapFrame(const std::pair<float, float> display_nits,
-                    ImageBundle* const ib, ThreadPool* const pool) {
-  // Perform tone mapping as described in Report ITU-R BT.2390-8, section 5.4
-  // (pp. 23-25).
-  // https://www.itu.int/pub/R-REP-BT.2390-8-2020
-
-  HWY_FULL(float) df;
-  using V = decltype(Zero(df));
-
-  ColorEncoding linear_rec2020;
-  linear_rec2020.SetColorSpace(ColorSpace::kRGB);
-  JXL_RETURN_IF_ERROR(linear_rec2020.SetPrimariesType(Primaries::k2100));
-  JXL_RETURN_IF_ERROR(linear_rec2020.SetWhitePointType(WhitePoint::kD65));
-  linear_rec2020.Tf().SetTransferFunction(TransferFunction::kLinear);
-  JXL_RETURN_IF_ERROR(linear_rec2020.CreateICC());
-  JXL_RETURN_IF_ERROR(
-      ib->TransformTo(linear_rec2020, *JxlGetDefaultCms(), pool));
-
-  Rec2408ToneMapper<decltype(df)> tone_mapper(
-      {ib->metadata()->tone_mapping.min_nits,
-       ib->metadata()->IntensityTarget()},
-      display_nits, rec2020_luminances);
-
-  const auto process_row = [&](const uint32_t y,
-                               size_t /* thread */) -> Status {
-    float* const JXL_RESTRICT row_r = ib->color()->PlaneRow(0, y);
-    float* const JXL_RESTRICT row_g = ib->color()->PlaneRow(1, y);
-    float* const JXL_RESTRICT row_b = ib->color()->PlaneRow(2, y);
-    for (size_t x = 0; x < ib->xsize(); x += Lanes(df)) {
-      V red = Load(df, row_r + x);
-      V green = Load(df, row_g + x);
-      V blue = Load(df, row_b + x);
-      tone_mapper.ToneMap(&red, &green, &blue);
-      Store(red, df, row_r + x);
-      Store(green, df, row_g + x);
-      Store(blue, df, row_b + x);
-    }
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, ib->ysize(), ThreadPool::NoInit,
-                                process_row, "ToneMap"));
-  return true;
-}
-
-Status GamutMapFrame(ImageBundle* const ib, float preserve_saturation,
-                     ThreadPool* const pool) {
-  HWY_FULL(float) df;
-  using V = decltype(Zero(df));
-
-  ColorEncoding linear_rec2020;
-  linear_rec2020.SetColorSpace(ColorSpace::kRGB);
-  JXL_RETURN_IF_ERROR(linear_rec2020.SetPrimariesType(Primaries::k2100));
-  JXL_RETURN_IF_ERROR(linear_rec2020.SetWhitePointType(WhitePoint::kD65));
-  linear_rec2020.Tf().SetTransferFunction(TransferFunction::kLinear);
-  JXL_RETURN_IF_ERROR(linear_rec2020.CreateICC());
-  JXL_RETURN_IF_ERROR(
-      ib->TransformTo(linear_rec2020, *JxlGetDefaultCms(), pool));
-
-  const auto process_row = [&](const uint32_t y, size_t /* thread*/) -> Status {
-    float* const JXL_RESTRICT row_r = ib->color()->PlaneRow(0, y);
-    float* const JXL_RESTRICT row_g = ib->color()->PlaneRow(1, y);
-    float* const JXL_RESTRICT row_b = ib->color()->PlaneRow(2, y);
-    for (size_t x = 0; x < ib->xsize(); x += Lanes(df)) {
-      V red = Load(df, row_r + x);
-      V green = Load(df, row_g + x);
-      V blue = Load(df, row_b + x);
-      GamutMap(&red, &green, &blue, rec2020_luminances, preserve_saturation);
-      Store(red, df, row_r + x);
-      Store(green, df, row_g + x);
-      Store(blue, df, row_b + x);
-    }
-    return true;
-  };
-
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, ib->ysize(), ThreadPool::NoInit,
-                                process_row, "GamutMap"));
-
-  return true;
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-namespace {
-HWY_EXPORT(ToneMapFrame);
-HWY_EXPORT(GamutMapFrame);
-}  // namespace
-
-Status ToneMapTo(const std::pair<float, float> display_nits,
-                 CodecInOut* const io, ThreadPool* const pool) {
-  const auto tone_map_frame = HWY_DYNAMIC_DISPATCH(ToneMapFrame);
-  for (ImageBundle& ib : io->frames) {
-    JXL_RETURN_IF_ERROR(tone_map_frame(display_nits, &ib, pool));
-  }
-  io->metadata.m.SetIntensityTarget(display_nits.second);
-  return true;
-}
-
-Status GamutMap(CodecInOut* const io, float preserve_saturation,
-                ThreadPool* const pool) {
-  const auto gamut_map_frame = HWY_DYNAMIC_DISPATCH(GamutMapFrame);
-  for (ImageBundle& ib : io->frames) {
-    JXL_RETURN_IF_ERROR(gamut_map_frame(&ib, preserve_saturation, pool));
-  }
-  return true;
-}
-
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/extras/tone_mapping.h b/third_party/jpeg-xl/lib/extras/tone_mapping.h
deleted file mode 100644
index 1f474101eb443..0000000000000
--- a/third_party/jpeg-xl/lib/extras/tone_mapping.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_EXTRAS_TONE_MAPPING_H_
-#define LIB_EXTRAS_TONE_MAPPING_H_
-
-#include "lib/jxl/codec_in_out.h"
-
-namespace jxl {
-
-// Important: after calling this, the result will contain many out-of-gamut
-// colors. It is very strongly recommended to call GamutMap afterwards to
-// rectify this.
-Status ToneMapTo(std::pair<float, float> display_nits, CodecInOut* io,
-                 ThreadPool* pool = nullptr);
-
-// `preserve_saturation` indicates to what extent to favor saturation over
-// luminance when mapping out-of-gamut colors to Rec. 2020. 0 preserves
-// luminance at the complete expense of saturation, while 1 gives the most
-// saturated color with the same hue that Rec. 2020 can represent even if it
-// means lowering the luminance. Values in between correspond to linear mixtures
-// of those two extremes.
-Status GamutMap(CodecInOut* io, float preserve_saturation,
-                ThreadPool* pool = nullptr);
-
-}  // namespace jxl
-
-#endif  // LIB_EXTRAS_TONE_MAPPING_H_
diff --git a/third_party/jpeg-xl/lib/extras/tone_mapping_gbench.cc b/third_party/jpeg-xl/lib/extras/tone_mapping_gbench.cc
deleted file mode 100644
index 30b4e6e7e0930..0000000000000
--- a/third_party/jpeg-xl/lib/extras/tone_mapping_gbench.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/memory_manager.h>
-
-#include "benchmark/benchmark.h"
-#include "lib/extras/tone_mapping.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/image.h"
-#include "tools/no_memory_manager.h"
-
-namespace jxl {
-
-#define QUIT(M)           \
-  state.SkipWithError(M); \
-  return;
-
-#define BM_CHECK(C) \
-  if (!(C)) {       \
-    QUIT(#C)        \
-  }
-
-static void BM_ToneMapping(benchmark::State& state) {
-  JxlMemoryManager* memory_manager = jpegxl::tools::NoMemoryManager();
-  JXL_ASSIGN_OR_QUIT(Image3F color, Image3F::Create(memory_manager, 2268, 1512),
-                     "Failed to allocate color plane");
-  FillImage(0.5f, &color);
-
-  // Use linear Rec. 2020 so that `ToneMapTo` doesn't have to convert to it and
-  // we mainly measure the tone mapping itself.
-  ColorEncoding linear_rec2020;
-  linear_rec2020.SetColorSpace(ColorSpace::kRGB);
-  BM_CHECK(linear_rec2020.SetPrimariesType(Primaries::k2100));
-  BM_CHECK(linear_rec2020.SetWhitePointType(WhitePoint::kD65));
-  linear_rec2020.Tf().SetTransferFunction(TransferFunction::kLinear);
-  BM_CHECK(linear_rec2020.CreateICC());
-
-  for (auto _ : state) {
-    (void)_;
-    state.PauseTiming();
-    CodecInOut tone_mapping_input{memory_manager};
-    JXL_ASSIGN_OR_QUIT(
-        Image3F color2,
-        Image3F::Create(memory_manager, color.xsize(), color.ysize()),
-        "Failed to allocate color plane");
-    BM_CHECK(CopyImageTo(color, &color2));
-    BM_CHECK(
-        tone_mapping_input.SetFromImage(std::move(color2), linear_rec2020));
-    tone_mapping_input.metadata.m.SetIntensityTarget(255);
-    state.ResumeTiming();
-
-    BM_CHECK(ToneMapTo({0.1, 100}, &tone_mapping_input));
-  }
-
-  state.SetItemsProcessed(state.iterations() * color.xsize() * color.ysize());
-}
-BENCHMARK(BM_ToneMapping);
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/gbench_main.cc b/third_party/jpeg-xl/lib/gbench_main.cc
deleted file mode 100644
index 1cc17720177d8..0000000000000
--- a/third_party/jpeg-xl/lib/gbench_main.cc
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "benchmark/benchmark.h"
-
-BENCHMARK_MAIN();
diff --git a/third_party/jpeg-xl/lib/include/jxl/cms.h b/third_party/jpeg-xl/lib/include/jxl/cms.h
deleted file mode 100644
index 6616a2681c58f..0000000000000
--- a/third_party/jpeg-xl/lib/include/jxl/cms.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef JXL_CMS_H_
-#define JXL_CMS_H_
-
-// ICC profiles and color space conversions.
-
-#include <jxl/cms_interface.h>
-#include <jxl/jxl_cms_export.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-JXL_CMS_EXPORT const JxlCmsInterface* JxlGetDefaultCms();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // JXL_CMS_H_
diff --git a/third_party/jpeg-xl/lib/include/jxl/cms_interface.h b/third_party/jpeg-xl/lib/include/jxl/cms_interface.h
deleted file mode 100644
index 137fb42d8ca9e..0000000000000
--- a/third_party/jpeg-xl/lib/include/jxl/cms_interface.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/* Copyright (c) the JPEG XL Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
- */
-
-/** @addtogroup libjxl_color
- * @{
- * @file cms_interface.h
- * @brief Interface to allow the injection of different color management systems
- * (CMSes, also called color management modules, or CMMs) in JPEG XL.
- *
- * A CMS is needed by the JPEG XL encoder and decoder to perform colorspace
- * conversions. This defines an interface that can be implemented for different
- * CMSes and then passed to the library.
- */
-
-#ifndef JXL_CMS_INTERFACE_H_
-#define JXL_CMS_INTERFACE_H_
-
-#include <jxl/color_encoding.h>
-#include <jxl/types.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Parses an ICC profile and populates @p c and @p cmyk with the data.
- *
- * @param user_data @ref JxlCmsInterface::set_fields_data passed as-is.
- * @param icc_data the ICC data to parse.
- * @param icc_size how many bytes of icc_data are valid.
- * @param c a @ref JxlColorEncoding to populate if applicable.
- * @param cmyk a boolean to set to whether the colorspace is a CMYK colorspace.
- * @return Whether the relevant fields in @p c were successfully populated.
- */
-typedef JXL_BOOL (*jpegxl_cms_set_fields_from_icc_func)(void* user_data,
-                                                        const uint8_t* icc_data,
-                                                        size_t icc_size,
-                                                        JxlColorEncoding* c,
-                                                        JXL_BOOL* cmyk);
-
-/** Represents an input or output colorspace to a color transform, as a
- * serialized ICC profile. */
-typedef struct {
-  /** The serialized ICC profile. This is guaranteed to be present and valid. */
-  struct {
-    const uint8_t* data;
-    size_t size;
-  } icc;
-
-  /** Structured representation of the colorspace, if applicable. If all fields
-   * are different from their "unknown" value, then this is equivalent to the
-   * ICC representation of the colorspace. If some are "unknown", those that are
-   * not are still valid and can still be used on their own if they are useful.
-   */
-  JxlColorEncoding color_encoding;
-
-  /** Number of components per pixel. This can be deduced from the other
-   * representations of the colorspace but is provided for convenience and
-   * validation. */
-  size_t num_channels;
-} JxlColorProfile;
-
-/** Allocates and returns the data needed for @p num_threads parallel transforms
- * from the @p input colorspace to @p output, with up to @p pixels_per_thread
- * pixels to transform per call to @ref JxlCmsInterface::run. @p init_data comes
- * directly from the @ref JxlCmsInterface instance. Since @c run only receives
- * the data returned by @c init, a reference to @p init_data should be kept
- * there if access to it is desired in @c run. Likewise for @ref
- * JxlCmsInterface::destroy.
- *
- * The ICC data in @p input and @p output is guaranteed to outlive the @c init /
- * @c run / @c destroy cycle.
- *
- * @param init_data @ref JxlCmsInterface::init_data passed as-is.
- * @param num_threads the maximum number of threads from which
- *        @ref JxlCmsInterface::run will be called.
- * @param pixels_per_thread the maximum number of pixels that each call to
- *        @ref JxlCmsInterface::run will have to transform.
- * @param input_profile the input colorspace for the transform.
- * @param output_profile the colorspace to which @ref JxlCmsInterface::run
- * should convert the input data.
- * @param intensity_target for colorspaces where luminance is relative
- *        (essentially: not PQ), indicates the luminance at which (1, 1, 1) will
- *        be displayed. This is useful for conversions between PQ and a relative
- *        luminance colorspace, in either direction: @p intensity_target cd/m²
- *        in PQ should map to and from (1, 1, 1) in the relative one.\n
- *        It is also used for conversions to and from HLG, as it is
- *        scene-referred while other colorspaces are assumed to be
- *        display-referred. That is, conversions from HLG should apply the OOTF
- *        for a peak display luminance of @p intensity_target, and conversions
- *        to HLG should undo it. The OOTF is a gamma function applied to the
- *        luminance channel (https://www.itu.int/rec/R-REC-BT.2100-2-201807-I
- *        page 7), with the gamma value computed as
- *        <tt>1.2 * 1.111^log2(intensity_target / 1000)</tt> (footnote 2 page 8
- *        of the same document).
- * @return The data needed for the transform, or @c NULL in case of failure.
- *         This will be passed to the other functions as @c user_data.
- */
-typedef void* (*jpegxl_cms_init_func)(void* init_data, size_t num_threads,
-                                      size_t pixels_per_thread,
-                                      const JxlColorProfile* input_profile,
-                                      const JxlColorProfile* output_profile,
-                                      float intensity_target);
-
-/** Returns a buffer that can be used by callers of the interface to store the
- * input of the conversion or read its result, if they pass it as the input or
- * output of the @c run function.
- * @param user_data the data returned by @c init.
- * @param thread the index of the thread for which to return a buffer.
- * @return A buffer that can be used by the caller for passing to @c run.
- */
-typedef float* (*jpegxl_cms_get_buffer_func)(void* user_data, size_t thread);
-
-/** Executes one transform and returns true on success or false on error. It
- * must be possible to call this from different threads with different values
- * for @p thread, all between 0 (inclusive) and the value of @p num_threads
- * passed to @c init (exclusive). It is allowed to implement this by locking
- * such that the transforms are essentially performed sequentially, if such a
- * performance profile is acceptable. @p user_data is the data returned by
- * @c init.
- * The buffers each contain @p num_pixels × @c num_channels interleaved floating
- * point (0..1) samples where @c num_channels is the number of color channels of
- * their respective color profiles. It is guaranteed that the only case in which
- * they might overlap is if the output has fewer channels than the input, in
- * which case the pointers may be identical.
- * For CMYK data, 0 represents the maximum amount of ink while 1 represents no
- * ink.
- * @param user_data the data returned by @c init.
- * @param thread the index of the thread from which the function is being
- *        called.
- * @param input_buffer the buffer containing the pixel data to be transformed.
- * @param output_buffer the buffer receiving the transformed pixel data.
- * @param num_pixels the number of pixels to transform from @p input to
- * @p output.
- * @return ::JXL_TRUE on success, ::JXL_FALSE on failure.
- */
-typedef JXL_BOOL (*jpegxl_cms_run_func)(void* user_data, size_t thread,
-                                        const float* input_buffer,
-                                        float* output_buffer,
-                                        size_t num_pixels);
-
-/** Performs the necessary clean-up and frees the memory allocated for user
- * data.
- */
-typedef void (*jpegxl_cms_destroy_func)(void*);
-
-/**
- * Interface for performing colorspace transforms. The @c init function can be
- * called several times to instantiate several transforms, including before
- * other transforms have been destroyed.
- *
- * The call sequence for a given colorspace transform could look like the
- * following:
- * @dot
- * digraph calls {
- *   newrank = true
- *   node [shape = box, fontname = monospace]
- *   init [label = "user_data <- init(\l\
- *     init_data = data,\l\
- *     num_threads = 3,\l\
- *     pixels_per_thread = 20,\l\
- *     input = (sRGB, 3 channels),\l\
- *     output = (Display-P3, 3 channels),\l\
- *     intensity_target = 255\l\
- *   )\l"]
- *   subgraph cluster_0 {
- *   color = lightgrey
- *   label = "thread 1"
- *   labeljust = "c"
- *   run_1_1 [label = "run(\l\
- *     user_data,\l\
- *     thread = 1,\l\
- *     input = in[0],\l\
- *     output = out[0],\l\
- *     num_pixels = 20\l\
- *   )\l"]
- *   run_1_2 [label = "run(\l\
- *     user_data,\l\
- *     thread = 1,\l\
- *     input = in[3],\l\
- *     output = out[3],\l\
- *     num_pixels = 20\l\
- *   )\l"]
- *   }
- *   subgraph cluster_1 {
- *   color = lightgrey
- *   label = "thread 2"
- *   labeljust = "l"
- *   run_2_1 [label = "run(\l\
- *     user_data,\l\
- *     thread = 2,\l\
- *     input = in[1],\l\
- *     output = out[1],\l\
- *     num_pixels = 20\l\
- *   )\l"]
- *   run_2_2 [label = "run(\l\
- *     user_data,\l\
- *     thread = 2,\l\
- *     input = in[4],\l\
- *     output = out[4],\l\
- *     num_pixels = 13\l\
- *   )\l"]
- *   }
- *   subgraph cluster_3 {
- *   color = lightgrey
- *   label = "thread 3"
- *   labeljust = "c"
- *   run_3_1 [label = "run(\l\
- *     user_data,\l\
- *     thread = 3,\l\
- *     input = in[2],\l\
- *     output = out[2],\l\
- *     num_pixels = 20\l\
- *   )\l"]
- *   }
- *   init -> {run_1_1; run_2_1; run_3_1; rank = same}
- *   run_1_1 -> run_1_2
- *   run_2_1 -> run_2_2
- *   {run_1_2; run_2_2, run_3_1} -> "destroy(user_data)"
- * }
- * @enddot
- */
-typedef struct {
-  /** CMS-specific data that will be passed to @ref set_fields_from_icc. */
-  void* set_fields_data;
-  /** Populates a @ref JxlColorEncoding from an ICC profile. */
-  jpegxl_cms_set_fields_from_icc_func set_fields_from_icc;
-
-  /** CMS-specific data that will be passed to @ref init. */
-  void* init_data;
-  /** Prepares a colorspace transform as described in the documentation of @ref
-   * jpegxl_cms_init_func. */
-  jpegxl_cms_init_func init;
-  /** Returns a buffer that can be used as input to @c run. */
-  jpegxl_cms_get_buffer_func get_src_buf;
-  /** Returns a buffer that can be used as output from @c run. */
-  jpegxl_cms_get_buffer_func get_dst_buf;
-  /** Executes the transform on a batch of pixels, per @ref jpegxl_cms_run_func.
-   */
-  jpegxl_cms_run_func run;
-  /** Cleans up the transform. */
-  jpegxl_cms_destroy_func destroy;
-} JxlCmsInterface;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* JXL_CMS_INTERFACE_H_ */
-
-/** @} */
diff --git a/third_party/jpeg-xl/lib/include/jxl/codestream_header.h b/third_party/jpeg-xl/lib/include/jxl/codestream_header.h
deleted file mode 100644
index 513c92f1dda2d..0000000000000
--- a/third_party/jpeg-xl/lib/include/jxl/codestream_header.h
+++ /dev/null
@@ -1,433 +0,0 @@
-/* Copyright (c) the JPEG XL Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
- */
-
-/** @addtogroup libjxl_metadata
- * @{
- * @file codestream_header.h
- * @brief Definitions of structs and enums for the metadata from the JPEG XL
- * codestream headers (signature, metadata, preview dimensions, ...), excluding
- * color encoding which is in color_encoding.h.
- */
-
-#ifndef JXL_CODESTREAM_HEADER_H_
-#define JXL_CODESTREAM_HEADER_H_
-
-#include <jxl/types.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Image orientation metadata.
- * Values 1..8 match the EXIF definitions.
- * The name indicates the operation to perform to transform from the encoded
- * image to the display image.
- */
-typedef enum {
-  JXL_ORIENT_IDENTITY = 1,
-  JXL_ORIENT_FLIP_HORIZONTAL = 2,
-  JXL_ORIENT_ROTATE_180 = 3,
-  JXL_ORIENT_FLIP_VERTICAL = 4,
-  JXL_ORIENT_TRANSPOSE = 5,
-  JXL_ORIENT_ROTATE_90_CW = 6,
-  JXL_ORIENT_ANTI_TRANSPOSE = 7,
-  JXL_ORIENT_ROTATE_90_CCW = 8,
-} JxlOrientation;
-
-/** Given type of an extra channel.
- */
-typedef enum {
-  JXL_CHANNEL_ALPHA,
-  JXL_CHANNEL_DEPTH,
-  JXL_CHANNEL_SPOT_COLOR,
-  JXL_CHANNEL_SELECTION_MASK,
-  JXL_CHANNEL_BLACK,
-  JXL_CHANNEL_CFA,
-  JXL_CHANNEL_THERMAL,
-  JXL_CHANNEL_RESERVED0,
-  JXL_CHANNEL_RESERVED1,
-  JXL_CHANNEL_RESERVED2,
-  JXL_CHANNEL_RESERVED3,
-  JXL_CHANNEL_RESERVED4,
-  JXL_CHANNEL_RESERVED5,
-  JXL_CHANNEL_RESERVED6,
-  JXL_CHANNEL_RESERVED7,
-  JXL_CHANNEL_UNKNOWN,
-  JXL_CHANNEL_OPTIONAL
-} JxlExtraChannelType;
-
-/** The codestream preview header */
-typedef struct {
-  /** Preview width in pixels */
-  uint32_t xsize;
-
-  /** Preview height in pixels */
-  uint32_t ysize;
-} JxlPreviewHeader;
-
-/** The codestream animation header, optionally present in the beginning of
- * the codestream, and if it is it applies to all animation frames, unlike @ref
- * JxlFrameHeader which applies to an individual frame.
- */
-typedef struct {
-  /** Numerator of ticks per second of a single animation frame time unit */
-  uint32_t tps_numerator;
-
-  /** Denominator of ticks per second of a single animation frame time unit */
-  uint32_t tps_denominator;
-
-  /** Amount of animation loops, or 0 to repeat infinitely */
-  uint32_t num_loops;
-
-  /** Whether animation time codes are present at animation frames in the
-   * codestream */
-  JXL_BOOL have_timecodes;
-} JxlAnimationHeader;
-
-/** Basic image information. This information is available from the file
- * signature and first part of the codestream header.
- */
-typedef struct {
-  /* TODO(lode): need additional fields for (transcoded) JPEG? For reusable
-   * fields orientation must be read from Exif APP1. For has_icc_profile: must
-   * look up where ICC profile is guaranteed to be in a JPEG file to be able to
-   * indicate this. */
-
-  /* TODO(lode): make struct packed, and/or make this opaque struct with getter
-   * functions (still separate struct from opaque decoder) */
-
-  /** Whether the codestream is embedded in the container format. If true,
-   * metadata information and extensions may be available in addition to the
-   * codestream.
-   */
-  JXL_BOOL have_container;
-
-  /** Width of the image in pixels, before applying orientation.
-   */
-  uint32_t xsize;
-
-  /** Height of the image in pixels, before applying orientation.
-   */
-  uint32_t ysize;
-
-  /** Original image color channel bit depth.
-   */
-  uint32_t bits_per_sample;
-
-  /** Original image color channel floating point exponent bits, or 0 if they
-   * are unsigned integer. For example, if the original data is half-precision
-   * (binary16) floating point, bits_per_sample is 16 and
-   * exponent_bits_per_sample is 5, and so on for other floating point
-   * precisions.
-   */
-  uint32_t exponent_bits_per_sample;
-
-  /** Upper bound on the intensity level present in the image in nits. For
-   * unsigned integer pixel encodings, this is the brightness of the largest
-   * representable value. The image does not necessarily contain a pixel
-   * actually this bright. An encoder is allowed to set 255 for SDR images
-   * without computing a histogram.
-   * Leaving this set to its default of 0 lets libjxl choose a sensible default
-   * value based on the color encoding.
-   */
-  float intensity_target;
-
-  /** Lower bound on the intensity level present in the image. This may be
-   * loose, i.e. lower than the actual darkest pixel. When tone mapping, a
-   * decoder will map [min_nits, intensity_target] to the display range.
-   */
-  float min_nits;
-
-  /** See the description of @see linear_below.
-   */
-  JXL_BOOL relative_to_max_display;
-
-  /** The tone mapping will leave unchanged (linear mapping) any pixels whose
-   * brightness is strictly below this. The interpretation depends on
-   * relative_to_max_display. If true, this is a ratio [0, 1] of the maximum
-   * display brightness [nits], otherwise an absolute brightness [nits].
-   */
-  float linear_below;
-
-  /** Whether the data in the codestream is encoded in the original color
-   * profile that is attached to the codestream metadata header, or is
-   * encoded in an internally supported absolute color space (which the decoder
-   * can always convert to linear or non-linear sRGB or to XYB). If the original
-   * profile is used, the decoder outputs pixel data in the color space matching
-   * that profile, but doesn't convert it to any other color space. If the
-   * original profile is not used, the decoder only outputs the data as sRGB
-   * (linear if outputting to floating point, nonlinear with standard sRGB
-   * transfer function if outputting to unsigned integers) but will not convert
-   * it to to the original color profile. The decoder also does not convert to
-   * the target display color profile. To convert the pixel data produced by
-   * the decoder to the original color profile, one of the JxlDecoderGetColor*
-   * functions needs to be called with
-   * ::JXL_COLOR_PROFILE_TARGET_DATA to get the color profile of the decoder
-   * output, and then an external CMS can be used for conversion. Note that for
-   * lossy compression, this should be set to false for most use cases, and if
-   * needed, the image should be converted to the original color profile after
-   * decoding, as described above.
-   */
-  JXL_BOOL uses_original_profile;
-
-  /** Indicates a preview image exists near the beginning of the codestream.
-   * The preview itself or its dimensions are not included in the basic info.
-   */
-  JXL_BOOL have_preview;
-
-  /** Indicates animation frames exist in the codestream. The animation
-   * information is not included in the basic info.
-   */
-  JXL_BOOL have_animation;
-
-  /** Image orientation, value 1-8 matching the values used by JEITA CP-3451C
-   * (Exif version 2.3).
-   */
-  JxlOrientation orientation;
-
-  /** Number of color channels encoded in the image, this is either 1 for
-   * grayscale data, or 3 for colored data. This count does not include
-   * the alpha channel or other extra channels. To check presence of an alpha
-   * channel, such as in the case of RGBA color, check alpha_bits != 0.
-   * If and only if this is 1, the @ref JxlColorSpace in the @ref
-   * JxlColorEncoding is
-   * ::JXL_COLOR_SPACE_GRAY.
-   */
-  uint32_t num_color_channels;
-
-  /** Number of additional image channels. This includes the main alpha channel,
-   * but can also include additional channels such as depth, additional alpha
-   * channels, spot colors, and so on. Information about the extra channels
-   * can be queried with @ref JxlDecoderGetExtraChannelInfo. The main alpha
-   * channel, if it exists, also has its information available in the
-   * alpha_bits, alpha_exponent_bits and alpha_premultiplied fields in this @ref
-   * JxlBasicInfo.
-   */
-  uint32_t num_extra_channels;
-
-  /** Bit depth of the encoded alpha channel, or 0 if there is no alpha channel.
-   * If present, matches the alpha_bits value of the JxlExtraChannelInfo
-   * associated with this alpha channel.
-   */
-  uint32_t alpha_bits;
-
-  /** Alpha channel floating point exponent bits, or 0 if they are unsigned. If
-   * present, matches the alpha_bits value of the JxlExtraChannelInfo associated
-   * with this alpha channel. integer.
-   */
-  uint32_t alpha_exponent_bits;
-
-  /** Whether the alpha channel is premultiplied. Only used if there is a main
-   * alpha channel. Matches the alpha_premultiplied value of the
-   * JxlExtraChannelInfo associated with this alpha channel.
-   */
-  JXL_BOOL alpha_premultiplied;
-
-  /** Dimensions of encoded preview image, only used if have_preview is
-   * JXL_TRUE.
-   */
-  JxlPreviewHeader preview;
-
-  /** Animation header with global animation properties for all frames, only
-   * used if have_animation is JXL_TRUE.
-   */
-  JxlAnimationHeader animation;
-
-  /** Intrinsic width of the image.
-   * The intrinsic size can be different from the actual size in pixels
-   * (as given by xsize and ysize) and it denotes the recommended dimensions
-   * for displaying the image, i.e. applications are advised to resample the
-   * decoded image to the intrinsic dimensions.
-   */
-  uint32_t intrinsic_xsize;
-
-  /** Intrinsic height of the image.
-   * The intrinsic size can be different from the actual size in pixels
-   * (as given by xsize and ysize) and it denotes the recommended dimensions
-   * for displaying the image, i.e. applications are advised to resample the
-   * decoded image to the intrinsic dimensions.
-   */
-  uint32_t intrinsic_ysize;
-
-  /** Padding for forwards-compatibility, in case more fields are exposed
-   * in a future version of the library.
-   */
-  uint8_t padding[100];
-} JxlBasicInfo;
-
-/** Information for a single extra channel.
- */
-typedef struct {
-  /** Given type of an extra channel.
-   */
-  JxlExtraChannelType type;
-
-  /** Total bits per sample for this channel.
-   */
-  uint32_t bits_per_sample;
-
-  /** Floating point exponent bits per channel, or 0 if they are unsigned
-   * integer.
-   */
-  uint32_t exponent_bits_per_sample;
-
-  /** The exponent the channel is downsampled by on each axis.
-   * TODO(lode): expand this comment to match the JPEG XL specification,
-   * specify how to upscale, how to round the size computation, and to which
-   * extra channels this field applies.
-   */
-  uint32_t dim_shift;
-
-  /** Length of the extra channel name in bytes, or 0 if no name.
-   * Excludes null termination character.
-   */
-  uint32_t name_length;
-
-  /** Whether alpha channel uses premultiplied alpha. Only applicable if
-   * type is JXL_CHANNEL_ALPHA.
-   */
-  JXL_BOOL alpha_premultiplied;
-
-  /** Spot color of the current spot channel in linear RGBA. Only applicable if
-   * type is JXL_CHANNEL_SPOT_COLOR.
-   */
-  float spot_color[4];
-
-  /** Only applicable if type is JXL_CHANNEL_CFA.
-   * TODO(lode): add comment about the meaning of this field.
-   */
-  uint32_t cfa_channel;
-} JxlExtraChannelInfo;
-
-/* TODO(lode): add API to get the codestream header extensions. */
-/** Extensions in the codestream header. */
-typedef struct {
-  /** Extension bits. */
-  uint64_t extensions;
-} JxlHeaderExtensions;
-
-/** Frame blend modes.
- * When decoding, if coalescing is enabled (default), this can be ignored.
- */
-typedef enum {
-  JXL_BLEND_REPLACE = 0,
-  JXL_BLEND_ADD = 1,
-  JXL_BLEND_BLEND = 2,
-  JXL_BLEND_MULADD = 3,
-  JXL_BLEND_MUL = 4,
-} JxlBlendMode;
-
-/** The information about blending the color channels or a single extra channel.
- * When decoding, if coalescing is enabled (default), this can be ignored and
- * the blend mode is considered to be JXL_BLEND_REPLACE.
- * When encoding, these settings apply to the pixel data given to the encoder.
- */
-typedef struct {
-  /** Blend mode.
-   */
-  JxlBlendMode blendmode;
-  /** Reference frame ID to use as the 'bottom' layer (0-3).
-   */
-  uint32_t source;
-  /** Which extra channel to use as the 'alpha' channel for blend modes
-   * JXL_BLEND_BLEND and JXL_BLEND_MULADD.
-   */
-  uint32_t alpha;
-  /** Clamp values to [0,1] for the purpose of blending.
-   */
-  JXL_BOOL clamp;
-} JxlBlendInfo;
-
-/** The information about layers.
- * When decoding, if coalescing is enabled (default), this can be ignored.
- * When encoding, these settings apply to the pixel data given to the encoder,
- * the encoder could choose an internal representation that differs.
- */
-typedef struct {
-  /** Whether cropping is applied for this frame. When decoding, if false,
-   * crop_x0 and crop_y0 are set to zero, and xsize and ysize to the main
-   * image dimensions. When encoding and this is false, those fields are
-   * ignored. When decoding, if coalescing is enabled (default), this is always
-   * false, regardless of the internal encoding in the JPEG XL codestream.
-   */
-  JXL_BOOL have_crop;
-
-  /** Horizontal offset of the frame (can be negative).
-   */
-  int32_t crop_x0;
-
-  /** Vertical offset of the frame (can be negative).
-   */
-  int32_t crop_y0;
-
-  /** Width of the frame (number of columns).
-   */
-  uint32_t xsize;
-
-  /** Height of the frame (number of rows).
-   */
-  uint32_t ysize;
-
-  /** The blending info for the color channels. Blending info for extra channels
-   * has to be retrieved separately using JxlDecoderGetExtraChannelBlendInfo.
-   */
-  JxlBlendInfo blend_info;
-
-  /** After blending, save the frame as reference frame with this ID (0-3).
-   * Special case: if the frame duration is nonzero, ID 0 means "will not be
-   * referenced in the future". This value is not used for the last frame.
-   * When encoding, ID 3 is reserved to frames that are generated internally by
-   * the encoder, and should not be used by applications.
-   */
-  uint32_t save_as_reference;
-} JxlLayerInfo;
-
-/** The header of one displayed frame or non-coalesced layer. */
-typedef struct {
-  /** How long to wait after rendering in ticks. The duration in seconds of a
-   * tick is given by tps_numerator and tps_denominator in @ref
-   * JxlAnimationHeader.
-   */
-  uint32_t duration;
-
-  /** SMPTE timecode of the current frame in form 0xHHMMSSFF, or 0. The bits are
-   * interpreted from most-significant to least-significant as hour, minute,
-   * second, and frame. If timecode is nonzero, it is strictly larger than that
-   * of a previous frame with nonzero duration. These values are only available
-   * if have_timecodes in @ref JxlAnimationHeader is ::JXL_TRUE.
-   * This value is only used if have_timecodes in @ref JxlAnimationHeader is
-   * ::JXL_TRUE.
-   */
-  uint32_t timecode;
-
-  /** Length of the frame name in bytes, or 0 if no name.
-   * Excludes null termination character. This value is set by the decoder.
-   * For the encoder, this value is ignored and @ref JxlEncoderSetFrameName is
-   * used instead to set the name and the length.
-   */
-  uint32_t name_length;
-
-  /** Indicates this is the last animation frame. This value is set by the
-   * decoder to indicate no further frames follow. For the encoder, it is not
-   * required to set this value and it is ignored, @ref JxlEncoderCloseFrames is
-   * used to indicate the last frame to the encoder instead.
-   */
-  JXL_BOOL is_last;
-
-  /** Information about the layer in case of no coalescing.
-   */
-  JxlLayerInfo layer_info;
-} JxlFrameHeader;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* JXL_CODESTREAM_HEADER_H_ */
-
-/** @}*/
diff --git a/third_party/jpeg-xl/lib/include/jxl/color_encoding.h b/third_party/jpeg-xl/lib/include/jxl/color_encoding.h
deleted file mode 100644
index 14dcdeb0a2123..0000000000000
--- a/third_party/jpeg-xl/lib/include/jxl/color_encoding.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/* Copyright (c) the JPEG XL Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
- */
-
-/** @addtogroup libjxl_color
- * @{
- * @file color_encoding.h
- * @brief Color Encoding definitions used by JPEG XL.
- * All CIE units are for the standard 1931 2 degree observer.
- */
-
-#ifndef JXL_COLOR_ENCODING_H_
-#define JXL_COLOR_ENCODING_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Color space of the image data. */
-typedef enum {
-  /** Tristimulus RGB */
-  JXL_COLOR_SPACE_RGB,
-  /** Luminance based, the primaries in @ref JxlColorEncoding must be ignored.
-   * This value implies that num_color_channels in @ref JxlBasicInfo is 1, any
-   * other value implies num_color_channels is 3. */
-  JXL_COLOR_SPACE_GRAY,
-  /** XYB (opsin) color space */
-  JXL_COLOR_SPACE_XYB,
-  /** None of the other table entries describe the color space appropriately */
-  JXL_COLOR_SPACE_UNKNOWN,
-} JxlColorSpace;
-
-/** Built-in white points for color encoding. When decoding, the numerical xy
- * white point value can be read from the @ref JxlColorEncoding white_point
- * field regardless of the enum value. When encoding, enum values except
- * ::JXL_WHITE_POINT_CUSTOM override the numerical fields. Some enum values
- * match a subset of CICP (Rec. ITU-T H.273 | ISO/IEC 23091-2:2019(E)), however
- * the white point and RGB primaries are separate enums here.
- */
-typedef enum {
-  /** CIE Standard Illuminant D65: 0.3127, 0.3290 */
-  JXL_WHITE_POINT_D65 = 1,
-  /** White point must be read from the @ref JxlColorEncoding white_point field,
-   * or as ICC profile. This enum value is not an exact match of the
-   * corresponding CICP value. */
-  JXL_WHITE_POINT_CUSTOM = 2,
-  /** CIE Standard Illuminant E (equal-energy): 1/3, 1/3 */
-  JXL_WHITE_POINT_E = 10,
-  /** DCI-P3 from SMPTE RP 431-2: 0.314, 0.351 */
-  JXL_WHITE_POINT_DCI = 11,
-} JxlWhitePoint;
-
-/** Built-in primaries for color encoding. When decoding, the primaries can be
- * read from the @ref JxlColorEncoding primaries_red_xy, primaries_green_xy and
- * primaries_blue_xy fields regardless of the enum value. When encoding, the
- * enum values except ::JXL_PRIMARIES_CUSTOM override the numerical fields.
- * Some enum values match a subset of CICP (Rec. ITU-T H.273 | ISO/IEC
- * 23091-2:2019(E)), however the white point and RGB primaries are separate
- * enums here.
- */
-typedef enum {
-  /** The CIE xy values of the red, green and blue primaries are: 0.639998686,
-     0.330010138; 0.300003784, 0.600003357; 0.150002046, 0.059997204 */
-  JXL_PRIMARIES_SRGB = 1,
-  /** Primaries must be read from the @ref JxlColorEncoding primaries_red_xy,
-   * primaries_green_xy and primaries_blue_xy fields, or as ICC profile. This
-   * enum value is not an exact match of the corresponding CICP value. */
-  JXL_PRIMARIES_CUSTOM = 2,
-  /** As specified in Rec. ITU-R BT.2100-1 */
-  JXL_PRIMARIES_2100 = 9,
-  /** As specified in SMPTE RP 431-2 */
-  JXL_PRIMARIES_P3 = 11,
-} JxlPrimaries;
-
-/** Built-in transfer functions for color encoding. Enum values match a subset
- * of CICP (Rec. ITU-T H.273 | ISO/IEC 23091-2:2019(E)) unless specified
- * otherwise. */
-typedef enum {
-  /** As specified in ITU-R BT.709-6 */
-  JXL_TRANSFER_FUNCTION_709 = 1,
-  /** None of the other table entries describe the transfer function. */
-  JXL_TRANSFER_FUNCTION_UNKNOWN = 2,
-  /** The gamma exponent is 1 */
-  JXL_TRANSFER_FUNCTION_LINEAR = 8,
-  /** As specified in IEC 61966-2-1 sRGB */
-  JXL_TRANSFER_FUNCTION_SRGB = 13,
-  /** As specified in SMPTE ST 2084 */
-  JXL_TRANSFER_FUNCTION_PQ = 16,
-  /** As specified in SMPTE ST 428-1 */
-  JXL_TRANSFER_FUNCTION_DCI = 17,
-  /** As specified in Rec. ITU-R BT.2100-1 (HLG) */
-  JXL_TRANSFER_FUNCTION_HLG = 18,
-  /** Transfer function follows power law given by the gamma value in @ref
-     JxlColorEncoding. Not a CICP value. */
-  JXL_TRANSFER_FUNCTION_GAMMA = 65535,
-} JxlTransferFunction;
-
-/** Rendering intent for color encoding, as specified in ISO 15076-1:2010 */
-typedef enum {
-  /** vendor-specific */
-  JXL_RENDERING_INTENT_PERCEPTUAL = 0,
-  /** media-relative */
-  JXL_RENDERING_INTENT_RELATIVE,
-  /** vendor-specific */
-  JXL_RENDERING_INTENT_SATURATION,
-  /** ICC-absolute */
-  JXL_RENDERING_INTENT_ABSOLUTE,
-} JxlRenderingIntent;
-
-/** Color encoding of the image as structured information.
- */
-typedef struct {
-  /** Color space of the image data.
-   */
-  JxlColorSpace color_space;
-
-  /** Built-in white point. If this value is ::JXL_WHITE_POINT_CUSTOM, must
-   * use the numerical white point values from white_point_xy.
-   */
-  JxlWhitePoint white_point;
-
-  /** Numerical whitepoint values in CIE xy space. */
-  double white_point_xy[2];
-
-  /** Built-in RGB primaries. If this value is ::JXL_PRIMARIES_CUSTOM, must
-   * use the numerical primaries values below. This field and the custom values
-   * below are unused and must be ignored if the color space is
-   * ::JXL_COLOR_SPACE_GRAY or ::JXL_COLOR_SPACE_XYB.
-   */
-  JxlPrimaries primaries;
-
-  /** Numerical red primary values in CIE xy space. */
-  double primaries_red_xy[2];
-
-  /** Numerical green primary values in CIE xy space. */
-  double primaries_green_xy[2];
-
-  /** Numerical blue primary values in CIE xy space. */
-  double primaries_blue_xy[2];
-
-  /** Transfer function if have_gamma is 0 */
-  JxlTransferFunction transfer_function;
-
-  /** Gamma value used when transfer_function is @ref
-   * JXL_TRANSFER_FUNCTION_GAMMA
-   */
-  double gamma;
-
-  /** Rendering intent defined for the color profile. */
-  JxlRenderingIntent rendering_intent;
-} JxlColorEncoding;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* JXL_COLOR_ENCODING_H_ */
-
-/** @}*/
diff --git a/third_party/jpeg-xl/lib/include/jxl/compressed_icc.h b/third_party/jpeg-xl/lib/include/jxl/compressed_icc.h
deleted file mode 100644
index 10232794b69d3..0000000000000
--- a/third_party/jpeg-xl/lib/include/jxl/compressed_icc.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright (c) the JPEG XL Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
- */
-
-/** @addtogroup libjxl_metadata
- * @{
- * @file compressed_icc.h
- * @brief Utility functions to compress and decompress ICC streams.
- */
-
-#ifndef JXL_COMPRESSED_ICC_H_
-#define JXL_COMPRESSED_ICC_H_
-
-#include <jxl/jxl_export.h>
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Allocates a buffer using the memory manager, fills it with a compressed
- * representation of an ICC profile, returns the result through @c output_buffer
- * and indicates its size through @c output_size.
- *
- * The result must be freed using the memory manager once it is not of any more
- * use.
- *
- * @param[in] memory_manager Pointer to a JxlMemoryManager.
- * @param[in] icc Pointer to a buffer containing the uncompressed ICC profile.
- * @param[in] icc_size Size of the buffer containing the ICC profile.
- * @param[out] compressed_icc Will be set to a pointer to the buffer containing
- * the result.
- * @param[out] compressed_icc_size Will be set to the size of the buffer
- * containing the result.
- * @return Whether compressing the profile was successful.
- */
-JXL_EXPORT JXL_BOOL JxlICCProfileEncode(const JxlMemoryManager* memory_manager,
-                                        const uint8_t* icc, size_t icc_size,
-                                        uint8_t** compressed_icc,
-                                        size_t* compressed_icc_size);
-
-/**
- * Allocates a buffer using the memory manager, fills it with the decompressed
- * version of the ICC profile in @c compressed_icc, returns the result through
- * @c output_buffer and indicates its size through @c output_size.
- *
- * The result must be freed using the memory manager once it is not of any more
- * use.
- *
- * @param[in] memory_manager Pointer to a JxlMemoryManager.
- * @param[in] compressed_icc Pointer to a buffer containing the compressed ICC
- * profile.
- * @param[in] compressed_icc_size Size of the buffer containing the compressed
- * ICC profile.
- * @param[out] icc Will be set to a pointer to the buffer containing the result.
- * @param[out] icc_size Will be set to the size of the buffer containing the
- * result.
- * @return Whether decompressing the profile was successful.
- */
-JXL_EXPORT JXL_BOOL JxlICCProfileDecode(const JxlMemoryManager* memory_manager,
-                                        const uint8_t* compressed_icc,
-                                        size_t compressed_icc_size,
-                                        uint8_t** icc, size_t* icc_size);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* JXL_COMPRESSED_ICC_H_ */
-
-/** @} */
diff --git a/third_party/jpeg-xl/lib/include/jxl/decode.h b/third_party/jpeg-xl/lib/include/jxl/decode.h
deleted file mode 100644
index 69c00243d6633..0000000000000
--- a/third_party/jpeg-xl/lib/include/jxl/decode.h
+++ /dev/null
@@ -1,1472 +0,0 @@
-/* Copyright (c) the JPEG XL Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
- */
-
-/** @addtogroup libjxl_decoder
- * @{
- * @file decode.h
- * @brief Decoding API for JPEG XL.
- */
-
-#ifndef JXL_DECODE_H_
-#define JXL_DECODE_H_
-
-#include <jxl/cms_interface.h>
-#include <jxl/codestream_header.h>
-#include <jxl/color_encoding.h>
-#include <jxl/jxl_export.h>
-#include <jxl/memory_manager.h>
-#include <jxl/parallel_runner.h>
-#include <jxl/types.h>
-#include <jxl/version.h>  // TODO(eustas): remove before v1.0
-#include <stddef.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Decoder library version.
- *
- * @return the decoder library version as an integer:
- * MAJOR_VERSION * 1000000 + MINOR_VERSION * 1000 + PATCH_VERSION. For example,
- * version 1.2.3 would return 1002003.
- */
-JXL_EXPORT uint32_t JxlDecoderVersion(void);
-
-/** The result of @ref JxlSignatureCheck.
- */
-typedef enum {
-  /** Not enough bytes were passed to determine if a valid signature was found.
-   */
-  JXL_SIG_NOT_ENOUGH_BYTES = 0,
-
-  /** No valid JPEG XL header was found. */
-  JXL_SIG_INVALID = 1,
-
-  /** A valid JPEG XL codestream signature was found, that is a JPEG XL image
-   * without container.
-   */
-  JXL_SIG_CODESTREAM = 2,
-
-  /** A valid container signature was found, that is a JPEG XL image embedded
-   * in a box format container.
-   */
-  JXL_SIG_CONTAINER = 3,
-} JxlSignature;
-
-/**
- * JPEG XL signature identification.
- *
- * Checks if the passed buffer contains a valid JPEG XL signature. The passed @p
- * buf of size
- * @p size doesn't need to be a full image, only the beginning of the file.
- *
- * @return a flag indicating if a JPEG XL signature was found and what type.
- *  - ::JXL_SIG_NOT_ENOUGH_BYTES if not enough bytes were passed to
- *    determine if a valid signature is there.
- *  - ::JXL_SIG_INVALID if no valid signature found for JPEG XL decoding.
- *  - ::JXL_SIG_CODESTREAM if a valid JPEG XL codestream signature was
- *    found.
- *  - ::JXL_SIG_CONTAINER if a valid JPEG XL container signature was found.
- */
-JXL_EXPORT JxlSignature JxlSignatureCheck(const uint8_t* buf, size_t len);
-
-/**
- * Opaque structure that holds the JPEG XL decoder.
- *
- * Allocated and initialized with @ref JxlDecoderCreate().
- * Cleaned up and deallocated with @ref JxlDecoderDestroy().
- */
-typedef struct JxlDecoderStruct JxlDecoder;
-
-/**
- * Creates an instance of @ref JxlDecoder and initializes it.
- *
- * @p memory_manager will be used for all the library dynamic allocations made
- * from this instance. The parameter may be NULL, in which case the default
- * allocator will be used. See jxl/memory_manager.h for details.
- *
- * @param memory_manager custom allocator function. It may be NULL. The memory
- *        manager will be copied internally.
- * @return @c NULL if the instance can not be allocated or initialized
- * @return pointer to initialized @ref JxlDecoder otherwise
- */
-JXL_EXPORT JxlDecoder* JxlDecoderCreate(const JxlMemoryManager* memory_manager);
-
-/**
- * Re-initializes a @ref JxlDecoder instance, so it can be re-used for decoding
- * another image. All state and settings are reset as if the object was
- * newly created with @ref JxlDecoderCreate, but the memory manager is kept.
- *
- * @param dec instance to be re-initialized.
- */
-JXL_EXPORT void JxlDecoderReset(JxlDecoder* dec);
-
-/**
- * Deinitializes and frees @ref JxlDecoder instance.
- *
- * @param dec instance to be cleaned up and deallocated.
- */
-JXL_EXPORT void JxlDecoderDestroy(JxlDecoder* dec);
-
-/**
- * Return value for @ref JxlDecoderProcessInput.
- * The values from ::JXL_DEC_BASIC_INFO onwards are optional informative
- * events that can be subscribed to, they are never returned if they
- * have not been registered with @ref JxlDecoderSubscribeEvents.
- */
-typedef enum {
-  /** Function call finished successfully, or decoding is finished and there is
-   * nothing more to be done.
-   *
-   * Note that @ref JxlDecoderProcessInput will return ::JXL_DEC_SUCCESS if
-   * all events that were registered with @ref JxlDecoderSubscribeEvents were
-   * processed, even before the end of the JPEG XL codestream.
-   *
-   * In this case, the return value @ref JxlDecoderReleaseInput will be the same
-   * as it was at the last signaled event. E.g. if ::JXL_DEC_FULL_IMAGE was
-   * subscribed to, then all bytes from the end of the JPEG XL codestream
-   * (including possible boxes needed for jpeg reconstruction) will be returned
-   * as unprocessed.
-   */
-  JXL_DEC_SUCCESS = 0,
-
-  /** An error occurred, for example invalid input file or out of memory.
-   * TODO(lode): add function to get error information from decoder.
-   */
-  JXL_DEC_ERROR = 1,
-
-  /** The decoder needs more input bytes to continue. Before the next @ref
-   * JxlDecoderProcessInput call, more input data must be set, by calling @ref
-   * JxlDecoderReleaseInput (if input was set previously) and then calling @ref
-   * JxlDecoderSetInput. @ref JxlDecoderReleaseInput returns how many bytes
-   * are not yet processed, before a next call to @ref JxlDecoderProcessInput
-   * all unprocessed bytes must be provided again (the address need not match,
-   * but the contents must), and more bytes must be concatenated after the
-   * unprocessed bytes.
-   * In most cases, @ref JxlDecoderReleaseInput will return no unprocessed bytes
-   * at this event, the only exceptions are if the previously set input ended
-   * within (a) the raw codestream signature, (b) the signature box, (c) a box
-   * header, or (d) the first 4 bytes of a `brob`, `ftyp`, or `jxlp` box. In any
-   * of these cases the number of unprocessed bytes is less than 20.
-   */
-  JXL_DEC_NEED_MORE_INPUT = 2,
-
-  /** The decoder is able to decode a preview image and requests setting a
-   * preview output buffer using @ref JxlDecoderSetPreviewOutBuffer. This occurs
-   * if ::JXL_DEC_PREVIEW_IMAGE is requested and it is possible to decode a
-   * preview image from the codestream and the preview out buffer was not yet
-   * set. There is maximum one preview image in a codestream.
-   * In this case, @ref JxlDecoderReleaseInput will return all bytes from the
-   * end of the frame header (including ToC) of the preview frame as
-   * unprocessed.
-   */
-  JXL_DEC_NEED_PREVIEW_OUT_BUFFER = 3,
-
-  /** The decoder requests an output buffer to store the full resolution image,
-   * which can be set with @ref JxlDecoderSetImageOutBuffer or with @ref
-   * JxlDecoderSetImageOutCallback. This event re-occurs for new frames if
-   * there are multiple animation frames and requires setting an output again.
-   * In this case, @ref JxlDecoderReleaseInput will return all bytes from the
-   * end of the frame header (including ToC) as unprocessed.
-   */
-  JXL_DEC_NEED_IMAGE_OUT_BUFFER = 5,
-
-  /** The JPEG reconstruction buffer is too small for reconstructed JPEG
-   * codestream to fit. @ref JxlDecoderSetJPEGBuffer must be called again to
-   * make room for remaining bytes. This event may occur multiple times
-   * after ::JXL_DEC_JPEG_RECONSTRUCTION.
-   */
-  JXL_DEC_JPEG_NEED_MORE_OUTPUT = 6,
-
-  /** The box contents output buffer is too small. @ref JxlDecoderSetBoxBuffer
-   * must be called again to make room for remaining bytes. This event may occur
-   * multiple times after ::JXL_DEC_BOX.
-   */
-  JXL_DEC_BOX_NEED_MORE_OUTPUT = 7,
-
-  /** Informative event by @ref JxlDecoderProcessInput
-   * "JxlDecoderProcessInput": Basic information such as image dimensions and
-   * extra channels. This event occurs max once per image.
-   * In this case, @ref JxlDecoderReleaseInput will return all bytes from the
-   * end of the basic info as unprocessed (including the last byte of basic info
-   * if it did not end on a byte boundary).
-   */
-  JXL_DEC_BASIC_INFO = 0x40,
-
-  /** Informative event by @ref JxlDecoderProcessInput
-   * "JxlDecoderProcessInput": Color encoding or ICC profile from the
-   * codestream header. This event occurs max once per image and always later
-   * than ::JXL_DEC_BASIC_INFO and earlier than any pixel data.
-   * In this case, @ref JxlDecoderReleaseInput will return all bytes from the
-   * end of the image header (which is the start of the first frame) as
-   * unprocessed.
-   */
-  JXL_DEC_COLOR_ENCODING = 0x100,
-
-  /** Informative event by @ref JxlDecoderProcessInput
-   * "JxlDecoderProcessInput": Preview image, a small frame, decoded. This
-   * event can only happen if the image has a preview frame encoded. This event
-   * occurs max once for the codestream and always later than @ref
-   * JXL_DEC_COLOR_ENCODING and before ::JXL_DEC_FRAME.
-   * In this case, @ref JxlDecoderReleaseInput will return all bytes from the
-   * end of the preview frame as unprocessed.
-   */
-  JXL_DEC_PREVIEW_IMAGE = 0x200,
-
-  /** Informative event by @ref JxlDecoderProcessInput
-   * "JxlDecoderProcessInput": Beginning of a frame. @ref
-   * JxlDecoderGetFrameHeader can be used at this point. A note on frames:
-   * a JPEG XL image can have internal frames that are not intended to be
-   * displayed (e.g. used for compositing a final frame), but this only returns
-   * displayed frames, unless @ref JxlDecoderSetCoalescing was set to @ref
-   * JXL_FALSE "JXL_FALSE": in that case, the individual layers are returned,
-   * without blending. Note that even when coalescing is disabled, only frames
-   * of type kRegularFrame are returned; frames of type kReferenceOnly
-   * and kLfFrame are always for internal purposes only and cannot be accessed.
-   * A displayed frame either has an animation duration or is the only or last
-   * frame in the image. This event occurs max once per displayed frame, always
-   * later than ::JXL_DEC_COLOR_ENCODING, and always earlier than any pixel
-   * data. While JPEG XL supports encoding a single frame as the composition of
-   * multiple internal sub-frames also called frames, this event is not
-   * indicated for the internal frames. In this case, @ref
-   * JxlDecoderReleaseInput will return all bytes from the end of the frame
-   * header (including ToC) as unprocessed.
-   */
-  JXL_DEC_FRAME = 0x400,
-
-  /** Informative event by @ref JxlDecoderProcessInput
-   * "JxlDecoderProcessInput": full frame (or layer, in case coalescing is
-   * disabled) is decoded. @ref JxlDecoderSetImageOutBuffer must be used after
-   * getting the basic image information to be able to get the image pixels, if
-   * not this return status only indicates we're past this point in the
-   * codestream. This event occurs max once per frame.
-   * In this case, @ref JxlDecoderReleaseInput will return all bytes from the
-   * end of the frame (or if ::JXL_DEC_JPEG_RECONSTRUCTION is subscribed to,
-   * from the end of the last box that is needed for jpeg reconstruction) as
-   * unprocessed.
-   */
-  JXL_DEC_FULL_IMAGE = 0x1000,
-
-  /** Informative event by @ref JxlDecoderProcessInput
-   * "JxlDecoderProcessInput": JPEG reconstruction data decoded. @ref
-   * JxlDecoderSetJPEGBuffer may be used to set a JPEG reconstruction buffer
-   * after getting the JPEG reconstruction data. If a JPEG reconstruction buffer
-   * is set a byte stream identical to the JPEG codestream used to encode the
-   * image will be written to the JPEG reconstruction buffer instead of pixels
-   * to the image out buffer. This event occurs max once per image and always
-   * before ::JXL_DEC_FULL_IMAGE.
-   * In this case, @ref JxlDecoderReleaseInput will return all bytes from the
-   * end of the `jbrd` box as unprocessed.
-   */
-  JXL_DEC_JPEG_RECONSTRUCTION = 0x2000,
-
-  /** Informative event by @ref JxlDecoderProcessInput
-   * "JxlDecoderProcessInput": The header of a box of the container format
-   * (BMFF) is decoded. The following API functions related to boxes can be used
-   * after this event:
-   *  - @ref JxlDecoderSetBoxBuffer and @ref JxlDecoderReleaseBoxBuffer
-   *    "JxlDecoderReleaseBoxBuffer": set and release a buffer to get the box
-   *    data.
-   *  - @ref JxlDecoderGetBoxType get the 4-character box typename.
-   *  - @ref JxlDecoderGetBoxSizeRaw get the size of the box as it appears in
-   *    the container file, not decompressed.
-   *  - @ref JxlDecoderSetDecompressBoxes to configure whether to get the box
-   *    data decompressed, or possibly compressed.
-   *
-   * Boxes can be compressed. This is so when their box type is
-   * "brob". In that case, they have an underlying decompressed box
-   * type and decompressed data. @ref JxlDecoderSetDecompressBoxes allows
-   * configuring which data to get. Decompressing requires
-   * Brotli. @ref JxlDecoderGetBoxType has a flag to get the compressed box
-   * type, which can be "brob", or the decompressed box type. If a box
-   * is not compressed (its compressed type is not "brob"), then
-   * the output decompressed box type and data is independent of what
-   * setting is configured.
-   *
-   * The buffer set with @ref JxlDecoderSetBoxBuffer must be set again for each
-   * next box to be obtained, or can be left unset to skip outputting this box.
-   * The output buffer contains the full box data when the
-   * ::JXL_DEC_BOX_COMPLETE (if subscribed to) or subsequent ::JXL_DEC_SUCCESS
-   * or ::JXL_DEC_BOX event occurs. ::JXL_DEC_BOX occurs for all boxes,
-   * including non-metadata boxes such as the signature box or codestream boxes.
-   * To check whether the box is a metadata type for respectively EXIF, XMP or
-   * JUMBF, use @ref JxlDecoderGetBoxType and check for types "Exif", "xml " and
-   * "jumb" respectively.
-   *
-   * In this case, @ref JxlDecoderReleaseInput will return all bytes from the
-   * start of the box header as unprocessed.
-   */
-  JXL_DEC_BOX = 0x4000,
-
-  /** Informative event by @ref JxlDecoderProcessInput
-   * "JxlDecoderProcessInput": a progressive step in decoding the frame is
-   * reached. When calling @ref JxlDecoderFlushImage at this point, the flushed
-   * image will correspond exactly to this point in decoding, and not yet
-   * contain partial results (such as partially more fine detail) of a next
-   * step. By default, this event will trigger maximum once per frame, when a
-   * 8x8th resolution (DC) image is ready (the image data is still returned at
-   * full resolution, giving upscaled DC). Use @ref
-   * JxlDecoderSetProgressiveDetail to configure more fine-grainedness. The
-   * event is not guaranteed to trigger, not all images have progressive steps
-   * or DC encoded.
-   * In this case, @ref JxlDecoderReleaseInput will return all bytes from the
-   * end of the section that was needed to produce this progressive event as
-   * unprocessed.
-   */
-  JXL_DEC_FRAME_PROGRESSION = 0x8000,
-
-  /** The box being decoded is now complete. This is only emitted if a buffer
-   * was set for the box.
-   */
-  JXL_DEC_BOX_COMPLETE = 0x10000,
-} JxlDecoderStatus;
-
-/** Types of progressive detail.
- * Setting a progressive detail with value N implies all progressive details
- * with smaller or equal value. Currently only the following level of
- * progressive detail is implemented:
- *  - @ref kDC (which implies kFrames)
- *  - @ref kLastPasses (which implies @ref kDC and @ref kFrames)
- *  - @ref kPasses (which implies @ref kLastPasses, kDC and @ref kFrames)
- */
-typedef enum {
-  /**
-   * after completed kRegularFrames
-   */
-  kFrames = 0,
-  /**
-   * after completed DC (1:8)
-   */
-  kDC = 1,
-  /**
-   * after completed AC passes that are the last pass for their resolution
-   * target.
-   */
-  kLastPasses = 2,
-  /**
-   * after completed AC passes that are not the last pass for their resolution
-   * target.
-   */
-  kPasses = 3,
-  /**
-   * during DC frame when lower resolution are completed (1:32, 1:16)
-   */
-  kDCProgressive = 4,
-  /**
-   * after completed groups
-   */
-  kDCGroups = 5,
-  /**
-   * after completed groups
-   */
-  kGroups = 6,
-} JxlProgressiveDetail;
-
-/** Rewinds decoder to the beginning. The same input must be given again from
- * the beginning of the file and the decoder will emit events from the beginning
- * again. When rewinding (as opposed to @ref JxlDecoderReset), the decoder can
- * keep state about the image, which it can use to skip to a requested frame
- * more efficiently with @ref JxlDecoderSkipFrames. Settings such as parallel
- * runner or subscribed events are kept. After rewind, @ref
- * JxlDecoderSubscribeEvents can be used again, and it is feasible to leave out
- * events that were already handled before, such as ::JXL_DEC_BASIC_INFO
- * and ::JXL_DEC_COLOR_ENCODING, since they will provide the same information
- * as before.
- * The difference to @ref JxlDecoderReset is that some state is kept, namely
- * settings set by a call to
- *  - @ref JxlDecoderSetCoalescing,
- *  - @ref JxlDecoderSetDesiredIntensityTarget,
- *  - @ref JxlDecoderSetDecompressBoxes,
- *  - @ref JxlDecoderSetKeepOrientation,
- *  - @ref JxlDecoderSetUnpremultiplyAlpha,
- *  - @ref JxlDecoderSetParallelRunner,
- *  - @ref JxlDecoderSetRenderSpotcolors, and
- *  - @ref JxlDecoderSubscribeEvents.
- *
- * @param dec decoder object
- */
-JXL_EXPORT void JxlDecoderRewind(JxlDecoder* dec);
-
-/** Makes the decoder skip the next `amount` frames. It still needs to process
- * the input, but will not output the frame events. It can be more efficient
- * when skipping frames, and even more so when using this after @ref
- * JxlDecoderRewind. If the decoder is already processing a frame (could
- * have emitted ::JXL_DEC_FRAME but not yet ::JXL_DEC_FULL_IMAGE), it
- * starts skipping from the next frame. If the amount is larger than the amount
- * of frames remaining in the image, all remaining frames are skipped. Calling
- * this function multiple times adds the amount to skip to the already existing
- * amount.
- *
- * A frame here is defined as a frame that without skipping emits events such
- * as ::JXL_DEC_FRAME and ::JXL_DEC_FULL_IMAGE, frames that are internal
- * to the file format but are not rendered as part of an animation, or are not
- * the final still frame of a still image, are not counted.
- *
- * @param dec decoder object
- * @param amount the amount of frames to skip
- */
-JXL_EXPORT void JxlDecoderSkipFrames(JxlDecoder* dec, size_t amount);
-
-/**
- * Skips processing the current frame. Can be called after frame processing
- * already started, signaled by a ::JXL_DEC_NEED_IMAGE_OUT_BUFFER event,
- * but before the corresponding ::JXL_DEC_FULL_IMAGE event. The next signaled
- * event will be another ::JXL_DEC_FRAME, or ::JXL_DEC_SUCCESS if there
- * are no more frames. If pixel data is required from the already processed part
- * of the frame, @ref JxlDecoderFlushImage must be called before this.
- *
- * @param dec decoder object
- * @return ::JXL_DEC_SUCCESS if there is a frame to skip, and @ref
- *     JXL_DEC_ERROR if the function was not called during frame processing.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderSkipCurrentFrame(JxlDecoder* dec);
-
-/**
- * Set the parallel runner for multithreading. May only be set before starting
- * decoding.
- *
- * @param dec decoder object
- * @param parallel_runner function pointer to runner for multithreading. It may
- *     be NULL to use the default, single-threaded, runner. A multithreaded
- *     runner should be set to reach fast performance.
- * @param parallel_runner_opaque opaque pointer for parallel_runner.
- * @return ::JXL_DEC_SUCCESS if the runner was set, ::JXL_DEC_ERROR
- *     otherwise (the previous runner remains set).
- */
-JXL_EXPORT JxlDecoderStatus
-JxlDecoderSetParallelRunner(JxlDecoder* dec, JxlParallelRunner parallel_runner,
-                            void* parallel_runner_opaque);
-
-/**
- * Returns a hint indicating how many more bytes the decoder is expected to
- * need to make @ref JxlDecoderGetBasicInfo available after the next @ref
- * JxlDecoderProcessInput call. This is a suggested large enough value for
- * the amount of bytes to provide in the next @ref JxlDecoderSetInput call, but
- * it is not guaranteed to be an upper bound nor a lower bound. This number does
- * not include bytes that have already been released from the input. Can be used
- * before the first @ref JxlDecoderProcessInput call, and is correct the first
- * time in most cases. If not, @ref JxlDecoderSizeHintBasicInfo can be called
- * again to get an updated hint.
- *
- * @param dec decoder object
- * @return the size hint in bytes if the basic info is not yet fully decoded.
- * @return 0 when the basic info is already available.
- */
-JXL_EXPORT size_t JxlDecoderSizeHintBasicInfo(const JxlDecoder* dec);
-
-/** Select for which informative events, i.e. ::JXL_DEC_BASIC_INFO, etc., the
- * decoder should return with a status. It is not required to subscribe to any
- * events, data can still be requested from the decoder as soon as it available.
- * By default, the decoder is subscribed to no events (events_wanted == 0), and
- * the decoder will then only return when it cannot continue because it needs
- * more input data or more output buffer. This function may only be be called
- * before using @ref JxlDecoderProcessInput.
- *
- * @param dec decoder object
- * @param events_wanted bitfield of desired events.
- * @return ::JXL_DEC_SUCCESS if no error, ::JXL_DEC_ERROR otherwise.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderSubscribeEvents(JxlDecoder* dec,
-                                                      int events_wanted);
-
-/** Enables or disables preserving of as-in-bitstream pixeldata
- * orientation. Some images are encoded with an Orientation tag
- * indicating that the decoder must perform a rotation and/or
- * mirroring to the encoded image data.
- *
- *  - If skip_reorientation is ::JXL_FALSE (the default): the decoder
- *    will apply the transformation from the orientation setting, hence
- *    rendering the image according to its specified intent. When
- *    producing a @ref JxlBasicInfo, the decoder will always set the
- *    orientation field to JXL_ORIENT_IDENTITY (matching the returned
- *    pixel data) and also align xsize and ysize so that they correspond
- *    to the width and the height of the returned pixel data.
- *  - If skip_reorientation is ::JXL_TRUE "JXL_TRUE": the decoder will skip
- *    applying the transformation from the orientation setting, returning
- *    the image in the as-in-bitstream pixeldata orientation.
- *    This may be faster to decode since the decoder doesn't have to apply the
- *    transformation, but can cause wrong display of the image if the
- *    orientation tag is not correctly taken into account by the user.
- *
- * By default, this option is disabled, and the returned pixel data is
- * re-oriented according to the image's Orientation setting.
- *
- * This function must be called at the beginning, before decoding is performed.
- *
- * @see JxlBasicInfo for the orientation field, and @ref JxlOrientation for the
- * possible values.
- *
- * @param dec decoder object
- * @param skip_reorientation JXL_TRUE to enable, JXL_FALSE to disable.
- * @return ::JXL_DEC_SUCCESS if no error, ::JXL_DEC_ERROR otherwise.
- */
-JXL_EXPORT JxlDecoderStatus
-JxlDecoderSetKeepOrientation(JxlDecoder* dec, JXL_BOOL skip_reorientation);
-
-/**
- * Enables or disables preserving of associated alpha channels. If
- * unpremul_alpha is set to ::JXL_FALSE then for associated alpha channel,
- * the pixel data is returned with premultiplied colors. If it is set to @ref
- * JXL_TRUE, The colors will be unpremultiplied based on the alpha channel. This
- * function has no effect if the image does not have an associated alpha
- * channel.
- *
- * By default, this option is disabled, and the returned pixel data "as is".
- *
- * This function must be called at the beginning, before decoding is performed.
- *
- * @param dec decoder object
- * @param unpremul_alpha JXL_TRUE to enable, JXL_FALSE to disable.
- * @return ::JXL_DEC_SUCCESS if no error, ::JXL_DEC_ERROR otherwise.
- */
-JXL_EXPORT JxlDecoderStatus
-JxlDecoderSetUnpremultiplyAlpha(JxlDecoder* dec, JXL_BOOL unpremul_alpha);
-
-/** Enables or disables rendering spot colors. By default, spot colors
- * are rendered, which is OK for viewing the decoded image. If render_spotcolors
- * is ::JXL_FALSE, then spot colors are not rendered, and have to be
- * retrieved separately using @ref JxlDecoderSetExtraChannelBuffer. This is
- * useful for e.g. printing applications.
- *
- * @param dec decoder object
- * @param render_spotcolors JXL_TRUE to enable (default), JXL_FALSE to disable.
- * @return ::JXL_DEC_SUCCESS if no error, ::JXL_DEC_ERROR otherwise.
- */
-JXL_EXPORT JxlDecoderStatus
-JxlDecoderSetRenderSpotcolors(JxlDecoder* dec, JXL_BOOL render_spotcolors);
-
-/** Enables or disables coalescing of zero-duration frames. By default, frames
- * are returned with coalescing enabled, i.e. all frames have the image
- * dimensions, and are blended if needed. When coalescing is disabled, frames
- * can have arbitrary dimensions, a non-zero crop offset, and blending is not
- * performed. For display, coalescing is recommended. For loading a multi-layer
- * still image as separate layers (as opposed to the merged image), coalescing
- * has to be disabled.
- *
- * @param dec decoder object
- * @param coalescing JXL_TRUE to enable coalescing (default), JXL_FALSE to
- *     disable it.
- * @return ::JXL_DEC_SUCCESS if no error, ::JXL_DEC_ERROR otherwise.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderSetCoalescing(JxlDecoder* dec,
-                                                    JXL_BOOL coalescing);
-
-/**
- * Decodes JPEG XL file using the available bytes. Requires input has been
- * set with @ref JxlDecoderSetInput. After @ref JxlDecoderProcessInput, input
- * can optionally be released with @ref JxlDecoderReleaseInput and then set
- * again to next bytes in the stream. @ref JxlDecoderReleaseInput returns how
- * many bytes are not yet processed, before a next call to @ref
- * JxlDecoderProcessInput all unprocessed bytes must be provided again (the
- * address need not match, but the contents must), and more bytes may be
- * concatenated after the unprocessed bytes.
- *
- * The returned status indicates whether the decoder needs more input bytes, or
- * more output buffer for a certain type of output data. No matter what the
- * returned status is (other than ::JXL_DEC_ERROR), new information, such
- * as @ref JxlDecoderGetBasicInfo, may have become available after this call.
- * When the return value is not ::JXL_DEC_ERROR or ::JXL_DEC_SUCCESS, the
- * decoding requires more @ref JxlDecoderProcessInput calls to continue.
- *
- * @param dec decoder object
- * @return ::JXL_DEC_SUCCESS when decoding finished and all events handled.
- *     If you still have more unprocessed input data anyway, then you can still
- *     continue by using @ref JxlDecoderSetInput and calling @ref
- *     JxlDecoderProcessInput again, similar to handling @ref
- *     JXL_DEC_NEED_MORE_INPUT. ::JXL_DEC_SUCCESS can occur instead of @ref
- *     JXL_DEC_NEED_MORE_INPUT when, for example, the input data ended right at
- *     the boundary of a box of the container format, all essential codestream
- *     boxes were already decoded, but extra metadata boxes are still present in
- *     the next data. @ref JxlDecoderProcessInput cannot return success if all
- *     codestream boxes have not been seen yet.
- * @return ::JXL_DEC_ERROR when decoding failed, e.g. invalid codestream.
- *     TODO(lode): document the input data mechanism
- * @return ::JXL_DEC_NEED_MORE_INPUT when more input data is necessary.
- * @return ::JXL_DEC_BASIC_INFO when basic info such as image dimensions is
- *     available and this informative event is subscribed to.
- * @return ::JXL_DEC_COLOR_ENCODING when color profile information is
- *     available and this informative event is subscribed to.
- * @return ::JXL_DEC_PREVIEW_IMAGE when preview pixel information is
- *     available and output in the preview buffer.
- * @return ::JXL_DEC_FULL_IMAGE when all pixel information at highest detail
- *     is available and has been output in the pixel buffer.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderProcessInput(JxlDecoder* dec);
-
-/**
- * Sets input data for @ref JxlDecoderProcessInput. The data is owned by the
- * caller and may be used by the decoder until @ref JxlDecoderReleaseInput is
- * called or the decoder is destroyed or reset so must be kept alive until then.
- * Cannot be called if @ref JxlDecoderSetInput was already called and @ref
- * JxlDecoderReleaseInput was not yet called, and cannot be called after @ref
- * JxlDecoderCloseInput indicating the end of input was called.
- *
- * @param dec decoder object
- * @param data pointer to next bytes to read from
- * @param size amount of bytes available starting from data
- * @return ::JXL_DEC_ERROR if input was already set without releasing or @ref
- *     JxlDecoderCloseInput was already called, ::JXL_DEC_SUCCESS otherwise.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderSetInput(JxlDecoder* dec,
-                                               const uint8_t* data,
-                                               size_t size);
-
-/**
- * Releases input which was provided with @ref JxlDecoderSetInput. Between @ref
- * JxlDecoderProcessInput and @ref JxlDecoderReleaseInput, the user may not
- * alter the data in the buffer. Calling @ref JxlDecoderReleaseInput is required
- * whenever any input is already set and new input needs to be added with @ref
- * JxlDecoderSetInput, but is not required before @ref JxlDecoderDestroy or @ref
- * JxlDecoderReset. Calling @ref JxlDecoderReleaseInput when no input is set is
- * not an error and returns `0`.
- *
- * @param dec decoder object
- * @return The amount of bytes the decoder has not yet processed that are still
- *     remaining in the data set by @ref JxlDecoderSetInput, or `0` if no input
- * is set or @ref JxlDecoderReleaseInput was already called. For a next call to
- * @ref JxlDecoderProcessInput, the buffer must start with these unprocessed
- * bytes. From this value it is possible to infer the position of certain JPEG
- * XL codestream elements (e.g. end of headers, frame start/end). See the
- * documentation of individual values of @ref JxlDecoderStatus for more
- * information.
- */
-JXL_EXPORT size_t JxlDecoderReleaseInput(JxlDecoder* dec);
-
-/**
- * Marks the input as finished, indicates that no more @ref JxlDecoderSetInput
- * will be called. This function allows the decoder to determine correctly if it
- * should return success, need more input or error in certain cases. For
- * backwards compatibility with a previous version of the API, using this
- * function is optional when not using the ::JXL_DEC_BOX event (the decoder
- * is able to determine the end of the image frames without marking the end),
- * but using this function is required when using ::JXL_DEC_BOX for getting
- * metadata box contents. This function does not replace @ref
- * JxlDecoderReleaseInput, that function should still be called if its return
- * value is needed.
- *
- * @ref JxlDecoderCloseInput should be called as soon as all known input bytes
- * are set (e.g. at the beginning when not streaming but setting all input
- * at once), before the final @ref JxlDecoderProcessInput calls.
- *
- * @param dec decoder object
- */
-JXL_EXPORT void JxlDecoderCloseInput(JxlDecoder* dec);
-
-/**
- * Outputs the basic image information, such as image dimensions, bit depth and
- * all other JxlBasicInfo fields, if available.
- *
- * @param dec decoder object
- * @param info struct to copy the information into, or NULL to only check
- *     whether the information is available through the return value.
- * @return ::JXL_DEC_SUCCESS if the value is available, @ref
- *     JXL_DEC_NEED_MORE_INPUT if not yet available, ::JXL_DEC_ERROR
- *     in case of other error conditions.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderGetBasicInfo(const JxlDecoder* dec,
-                                                   JxlBasicInfo* info);
-
-/**
- * Outputs information for extra channel at the given index. The index must be
- * smaller than num_extra_channels in the associated @ref JxlBasicInfo.
- *
- * @param dec decoder object
- * @param index index of the extra channel to query.
- * @param info struct to copy the information into, or NULL to only check
- *     whether the information is available through the return value.
- * @return ::JXL_DEC_SUCCESS if the value is available, @ref
- *     JXL_DEC_NEED_MORE_INPUT if not yet available, ::JXL_DEC_ERROR
- *     in case of other error conditions.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderGetExtraChannelInfo(
-    const JxlDecoder* dec, size_t index, JxlExtraChannelInfo* info);
-
-/**
- * Outputs name for extra channel at the given index in UTF-8. The index must be
- * smaller than `num_extra_channels` in the associated @ref JxlBasicInfo. The
- * buffer for name must have at least `name_length + 1` bytes allocated, gotten
- * from the associated @ref JxlExtraChannelInfo.
- *
- * @param dec decoder object
- * @param index index of the extra channel to query.
- * @param name buffer to copy the name into
- * @param size size of the name buffer in bytes
- * @return ::JXL_DEC_SUCCESS if the value is available, @ref
- *     JXL_DEC_NEED_MORE_INPUT if not yet available, ::JXL_DEC_ERROR
- *     in case of other error conditions.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderGetExtraChannelName(const JxlDecoder* dec,
-                                                          size_t index,
-                                                          char* name,
-                                                          size_t size);
-
-/** Defines which color profile to get: the profile from the codestream
- * metadata header, which represents the color profile of the original image,
- * or the color profile from the pixel data produced by the decoder. Both are
- * the same if the JxlBasicInfo has uses_original_profile set.
- */
-typedef enum {
-  /** Get the color profile of the original image from the metadata.
-   */
-  JXL_COLOR_PROFILE_TARGET_ORIGINAL = 0,
-
-  /** Get the color profile of the pixel data the decoder outputs. */
-  JXL_COLOR_PROFILE_TARGET_DATA = 1,
-} JxlColorProfileTarget;
-
-/**
- * Outputs the color profile as JPEG XL encoded structured data, if available.
- * This is an alternative to an ICC Profile, which can represent a more limited
- * amount of color spaces, but represents them exactly through enum values.
- *
- * It is often possible to use @ref JxlDecoderGetColorAsICCProfile as an
- * alternative anyway. The following scenarios are possible:
- *  - The JPEG XL image has an attached ICC Profile, in that case, the encoded
- *    structured data is not available and this function will return an error
- *    status. @ref JxlDecoderGetColorAsICCProfile should be called instead.
- *  - The JPEG XL image has an encoded structured color profile, and it
- *    represents an RGB or grayscale color space. This function will return it.
- *    You can still use @ref JxlDecoderGetColorAsICCProfile as well as an
- *    alternative if desired, though depending on which RGB color space is
- *    represented, the ICC profile may be a close approximation. It is also not
- *    always feasible to deduce from an ICC profile which named color space it
- *    exactly represents, if any, as it can represent any arbitrary space.
- *    HDR color spaces such as those using PQ and HLG are also potentially
- *    problematic, in that: while ICC profiles can encode a transfer function
- *    that happens to approximate those of PQ and HLG (HLG for only one given
- *    system gamma at a time, and necessitating a 3D LUT if gamma is to be
- *    different from `1`), they cannot (before ICCv4.4) semantically signal that
- *    this is the color space that they represent. Therefore, they will
- *    typically not actually be interpreted as representing an HDR color space.
- *    This is especially detrimental to PQ which will then be interpreted as if
- *    the maximum signal value represented SDR white instead of 10000 cd/m^2,
- *    meaning that the image will be displayed two orders of magnitude (5-7 EV)
- *    too dim.
- *  - The JPEG XL image has an encoded structured color profile, and it
- *    indicates an unknown or xyb color space. In that case, @ref
- *    JxlDecoderGetColorAsICCProfile is not available.
- *
- * When rendering an image on a system where ICC-based color management is used,
- * @ref JxlDecoderGetColorAsICCProfile should generally be used first as it will
- * return a ready-to-use profile (with the aforementioned caveat about HDR).
- * When knowledge about the nominal color space is desired if available, @ref
- * JxlDecoderGetColorAsEncodedProfile should be used first.
- *
- * @param dec decoder object
- * @param target whether to get the original color profile from the metadata
- *     or the color profile of the decoded pixels.
- * @param color_encoding struct to copy the information into, or NULL to only
- *     check whether the information is available through the return value.
- * @return ::JXL_DEC_SUCCESS if the data is available and returned, @ref
- *     JXL_DEC_NEED_MORE_INPUT if not yet available, ::JXL_DEC_ERROR in
- *     case the encoded structured color profile does not exist in the
- *     codestream.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderGetColorAsEncodedProfile(
-    const JxlDecoder* dec, JxlColorProfileTarget target,
-    JxlColorEncoding* color_encoding);
-
-/**
- * Outputs the size in bytes of the ICC profile returned by @ref
- * JxlDecoderGetColorAsICCProfile, if available, or indicates there is none
- * available. In most cases, the image will have an ICC profile available, but
- * if it does not, @ref JxlDecoderGetColorAsEncodedProfile must be used instead.
- *
- * @see JxlDecoderGetColorAsEncodedProfile for more information. The ICC
- * profile is either the exact ICC profile attached to the codestream metadata,
- * or a close approximation generated from JPEG XL encoded structured data,
- * depending of what is encoded in the codestream.
- *
- * @param dec decoder object
- * @param target whether to get the original color profile from the metadata
- *     or the color profile of the decoded pixels.
- * @param size variable to output the size into, or NULL to only check the
- *     return status.
- * @return ::JXL_DEC_SUCCESS if the ICC profile is available, @ref
- *     JXL_DEC_NEED_MORE_INPUT if the decoder has not yet received enough
- *     input data to determine whether an ICC profile is available or what its
- *     size is, ::JXL_DEC_ERROR in case the ICC profile is not available and
- *     cannot be generated.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderGetICCProfileSize(
-    const JxlDecoder* dec, JxlColorProfileTarget target, size_t* size);
-
-/**
- * Outputs ICC profile if available. The profile is only available if @ref
- * JxlDecoderGetICCProfileSize returns success. The output buffer must have
- * at least as many bytes as given by @ref JxlDecoderGetICCProfileSize.
- *
- * @param dec decoder object
- * @param target whether to get the original color profile from the metadata
- *     or the color profile of the decoded pixels.
- * @param icc_profile buffer to copy the ICC profile into
- * @param size size of the icc_profile buffer in bytes
- * @return ::JXL_DEC_SUCCESS if the profile was successfully returned,
- *     ::JXL_DEC_NEED_MORE_INPUT if not yet available, @ref
- *     JXL_DEC_ERROR if the profile doesn't exist or the output size is not
- *     large enough.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderGetColorAsICCProfile(
-    const JxlDecoder* dec, JxlColorProfileTarget target, uint8_t* icc_profile,
-    size_t size);
-
-/** Sets the desired output color profile of the decoded image by calling
- * @ref JxlDecoderSetOutputColorProfile, passing on @c color_encoding and
- * setting @c icc_data to NULL. See @ref JxlDecoderSetOutputColorProfile for
- * details.
- *
- * @param dec decoder object
- * @param color_encoding the default color encoding to set
- * @return ::JXL_DEC_SUCCESS if the preference was set successfully, @ref
- *     JXL_DEC_ERROR otherwise.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderSetPreferredColorProfile(
-    JxlDecoder* dec, const JxlColorEncoding* color_encoding);
-
-/** Requests that the decoder perform tone mapping to the peak display luminance
- * passed as @c desired_intensity_target, if appropriate.
- * @note This is provided for convenience and the exact tone mapping that is
- * performed is not meant to be considered authoritative in any way. It may
- * change from version to version.
- * @param dec decoder object
- * @param desired_intensity_target the intended target peak luminance
- * @return ::JXL_DEC_SUCCESS if the preference was set successfully, @ref
- * JXL_DEC_ERROR otherwise.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderSetDesiredIntensityTarget(
-    JxlDecoder* dec, float desired_intensity_target);
-
-/**
- * Sets the desired output color profile of the decoded image either from a
- * color encoding or an ICC profile. Valid calls of this function have either @c
- * color_encoding or @c icc_data set to NULL and @c icc_size must be `0` if and
- * only if @c icc_data is NULL.
- *
- * Depending on whether a color management system (CMS) has been set the
- * behavior is as follows:
- *
- * If a color management system (CMS) has been set with @ref JxlDecoderSetCms,
- * and the CMS supports output to the desired color encoding or ICC profile,
- * then it will provide the output in that color encoding or ICC profile. If the
- * desired color encoding or the ICC is not supported, then an error will be
- * returned.
- *
- * If no CMS has been set with @ref JxlDecoderSetCms, there are two cases:
- *
- * (1) Calling this function with a color encoding will convert XYB images to
- * the desired color encoding. In this case, if the requested color encoding has
- * a narrower gamut, or the white points differ, then the resulting image can
- * have significant color distortion. Non-XYB images will not be converted to
- * the desired color space.
- *
- * (2) Calling this function with an ICC profile will result in an error.
- *
- * If called with an ICC profile (after a call to @ref JxlDecoderSetCms), the
- * ICC profile has to be a valid RGB or grayscale color profile.
- *
- * Can only be set after the ::JXL_DEC_COLOR_ENCODING event occurred and
- * before any other event occurred, and should be used before getting
- * ::JXL_COLOR_PROFILE_TARGET_DATA.
- *
- * This function must not be called before @ref JxlDecoderSetCms.
- *
- * @param dec decoder object
- * @param color_encoding the output color encoding
- * @param icc_data bytes of the icc profile
- * @param icc_size size of the icc profile in bytes
- * @return ::JXL_DEC_SUCCESS if the color profile was set successfully, @ref
- *     JXL_DEC_ERROR otherwise.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderSetOutputColorProfile(
-    JxlDecoder* dec, const JxlColorEncoding* color_encoding,
-    const uint8_t* icc_data, size_t icc_size);
-
-/**
- * Sets the color management system (CMS) that will be used for color
- * conversion (if applicable) during decoding. May only be set before starting
- * decoding and must not be called after @ref JxlDecoderSetOutputColorProfile.
- *
- * See @ref JxlDecoderSetOutputColorProfile for how color conversions are done
- * depending on whether or not a CMS has been set with @ref JxlDecoderSetCms.
- *
- * @param dec decoder object.
- * @param cms structure representing a CMS implementation. See @ref
- * JxlCmsInterface for more details.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderSetCms(JxlDecoder* dec,
-                                             JxlCmsInterface cms);
-// TODO(firsching): add a function JxlDecoderSetDefaultCms() for setting a
-// default in case libjxl is build with a CMS.
-
-/**
- * Returns the minimum size in bytes of the preview image output pixel buffer
- * for the given format. This is the buffer for @ref
- * JxlDecoderSetPreviewOutBuffer. Requires the preview header information is
- * available in the decoder.
- *
- * @param dec decoder object
- * @param format format of pixels
- * @param size output value, buffer size in bytes
- * @return ::JXL_DEC_SUCCESS on success, ::JXL_DEC_ERROR on error, such as
- *     information not available yet.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderPreviewOutBufferSize(
-    const JxlDecoder* dec, const JxlPixelFormat* format, size_t* size);
-
-/**
- * Sets the buffer to write the low-resolution preview image
- * to. The size of the buffer must be at least as large as given by @ref
- * JxlDecoderPreviewOutBufferSize. The buffer follows the format described
- * by @ref JxlPixelFormat. The preview image dimensions are given by the
- * @ref JxlPreviewHeader. The buffer is owned by the caller.
- *
- * @param dec decoder object
- * @param format format of pixels. Object owned by user and its contents are
- *     copied internally.
- * @param buffer buffer type to output the pixel data to
- * @param size size of buffer in bytes
- * @return ::JXL_DEC_SUCCESS on success, ::JXL_DEC_ERROR on error, such as
- *     size too small.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderSetPreviewOutBuffer(
-    JxlDecoder* dec, const JxlPixelFormat* format, void* buffer, size_t size);
-
-/**
- * Outputs the information from the frame, such as duration when have_animation.
- * This function can be called when ::JXL_DEC_FRAME occurred for the current
- * frame, even when have_animation in the JxlBasicInfo is JXL_FALSE.
- *
- * @param dec decoder object
- * @param header struct to copy the information into, or NULL to only check
- *     whether the information is available through the return value.
- * @return ::JXL_DEC_SUCCESS if the value is available, @ref
- *     JXL_DEC_NEED_MORE_INPUT if not yet available, ::JXL_DEC_ERROR in
- *     case of other error conditions.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderGetFrameHeader(const JxlDecoder* dec,
-                                                     JxlFrameHeader* header);
-
-/**
- * Outputs name for the current frame. The buffer for name must have at least
- * `name_length + 1` bytes allocated, gotten from the associated JxlFrameHeader.
- *
- * @param dec decoder object
- * @param name buffer to copy the name into
- * @param size size of the name buffer in bytes, including zero termination
- *    character, so this must be at least @ref JxlFrameHeader.name_length + 1.
- * @return ::JXL_DEC_SUCCESS if the value is available, @ref
- *     JXL_DEC_NEED_MORE_INPUT if not yet available, ::JXL_DEC_ERROR in
- *     case of other error conditions.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderGetFrameName(const JxlDecoder* dec,
-                                                   char* name, size_t size);
-
-/**
- * Outputs the blend information for the current frame for a specific extra
- * channel. This function can be called once the ::JXL_DEC_FRAME event occurred
- * for the current frame, even if the `have_animation` field in the @ref
- * JxlBasicInfo is @ref JXL_FALSE. This information is only useful if coalescing
- * is disabled; otherwise the decoder will have performed blending already.
- *
- * @param dec decoder object
- * @param index the index of the extra channel
- * @param blend_info struct to copy the information into
- * @return ::JXL_DEC_SUCCESS on success, ::JXL_DEC_ERROR on error
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderGetExtraChannelBlendInfo(
-    const JxlDecoder* dec, size_t index, JxlBlendInfo* blend_info);
-
-/**
- * Returns the minimum size in bytes of the image output pixel buffer for the
- * given format. This is the buffer for @ref JxlDecoderSetImageOutBuffer.
- * Requires that the basic image information is available in the decoder in the
- * case of coalescing enabled (default). In case coalescing is disabled, this
- * can only be called after the ::JXL_DEC_FRAME event occurs. In that case,
- * it will return the size required to store the possibly cropped frame (which
- * can be larger or smaller than the image dimensions).
- *
- * @param dec decoder object
- * @param format format of the pixels.
- * @param size output value, buffer size in bytes
- * @return ::JXL_DEC_SUCCESS on success, ::JXL_DEC_ERROR on error, such as
- *     information not available yet.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderImageOutBufferSize(
-    const JxlDecoder* dec, const JxlPixelFormat* format, size_t* size);
-
-/**
- * Sets the buffer to write the full resolution image to. This can be set when
- * the ::JXL_DEC_FRAME event occurs, must be set when the @ref
- * JXL_DEC_NEED_IMAGE_OUT_BUFFER event occurs, and applies only for the
- * current frame. The size of the buffer must be at least as large as given
- * by @ref JxlDecoderImageOutBufferSize. The buffer follows the format described
- * by @ref JxlPixelFormat. The buffer is owned by the caller.
- *
- * @param dec decoder object
- * @param format format of the pixels. Object owned by user and its contents
- *     are copied internally.
- * @param buffer buffer type to output the pixel data to
- * @param size size of buffer in bytes
- * @return ::JXL_DEC_SUCCESS on success, ::JXL_DEC_ERROR on error, such as
- *     size too small.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderSetImageOutBuffer(
-    JxlDecoder* dec, const JxlPixelFormat* format, void* buffer, size_t size);
-
-/**
- * Function type for @ref JxlDecoderSetImageOutCallback.
- *
- * The callback may be called simultaneously by different threads when using a
- * threaded parallel runner, on different pixels.
- *
- * @param opaque optional user data, as given to @ref
- *     JxlDecoderSetImageOutCallback.
- * @param x horizontal position of leftmost pixel of the pixel data.
- * @param y vertical position of the pixel data.
- * @param num_pixels amount of pixels included in the pixel data, horizontally.
- *     This is not the same as xsize of the full image, it may be smaller.
- * @param pixels pixel data as a horizontal stripe, in the format passed to @ref
- *     JxlDecoderSetImageOutCallback. The memory is not owned by the user, and
- *     is only valid during the time the callback is running.
- */
-typedef void (*JxlImageOutCallback)(void* opaque, size_t x, size_t y,
-                                    size_t num_pixels, const void* pixels);
-
-/**
- * Initialization callback for @ref JxlDecoderSetMultithreadedImageOutCallback.
- *
- * @param init_opaque optional user data, as given to @ref
- *     JxlDecoderSetMultithreadedImageOutCallback.
- * @param num_threads maximum number of threads that will call the @c run
- *     callback concurrently.
- * @param num_pixels_per_thread maximum number of pixels that will be passed in
- *     one call to @c run.
- * @return a pointer to data that will be passed to the @c run callback, or
- *     @c NULL if initialization failed.
- */
-typedef void* (*JxlImageOutInitCallback)(void* init_opaque, size_t num_threads,
-                                         size_t num_pixels_per_thread);
-
-/**
- * Worker callback for @ref JxlDecoderSetMultithreadedImageOutCallback.
- *
- * @param run_opaque user data returned by the @c init callback.
- * @param thread_id number in `[0, num_threads)` identifying the thread of the
- *     current invocation of the callback.
- * @param x horizontal position of the first (leftmost) pixel of the pixel data.
- * @param y vertical position of the pixel data.
- * @param num_pixels number of pixels in the pixel data. May be less than the
- *     full @c xsize of the image, and will be at most equal to the @c
- *     num_pixels_per_thread that was passed to @c init.
- * @param pixels pixel data as a horizontal stripe, in the format passed to @ref
- *     JxlDecoderSetMultithreadedImageOutCallback. The data pointed to
- *     remains owned by the caller and is only guaranteed to outlive the current
- *     callback invocation.
- */
-typedef void (*JxlImageOutRunCallback)(void* run_opaque, size_t thread_id,
-                                       size_t x, size_t y, size_t num_pixels,
-                                       const void* pixels);
-
-/**
- * Destruction callback for @ref JxlDecoderSetMultithreadedImageOutCallback,
- * called after all invocations of the @c run callback to perform any
- * appropriate clean-up of the @c run_opaque data returned by @c init.
- *
- * @param run_opaque user data returned by the @c init callback.
- */
-typedef void (*JxlImageOutDestroyCallback)(void* run_opaque);
-
-/**
- * Sets pixel output callback. This is an alternative to @ref
- * JxlDecoderSetImageOutBuffer. This can be set when the ::JXL_DEC_FRAME
- * event occurs, must be set when the ::JXL_DEC_NEED_IMAGE_OUT_BUFFER event
- * occurs, and applies only for the current frame. Only one of @ref
- * JxlDecoderSetImageOutBuffer or @ref JxlDecoderSetImageOutCallback may be used
- * for the same frame, not both at the same time.
- *
- * The callback will be called multiple times, to receive the image
- * data in small chunks. The callback receives a horizontal stripe of pixel
- * data, `1` pixel high, xsize pixels wide, called a scanline. The xsize here is
- * not the same as the full image width, the scanline may be a partial section,
- * and xsize may differ between calls. The user can then process and/or copy the
- * partial scanline to an image buffer. The callback may be called
- * simultaneously by different threads when using a threaded parallel runner, on
- * different pixels.
- *
- * If @ref JxlDecoderFlushImage is not used, then each pixel will be visited
- * exactly once by the different callback calls, during processing with one or
- * more @ref JxlDecoderProcessInput calls. These pixels are decoded to full
- * detail, they are not part of a lower resolution or lower quality progressive
- * pass, but the final pass.
- *
- * If @ref JxlDecoderFlushImage is used, then in addition each pixel will be
- * visited zero or one times during the blocking @ref JxlDecoderFlushImage call.
- * Pixels visited as a result of @ref JxlDecoderFlushImage may represent a lower
- * resolution or lower quality intermediate progressive pass of the image. Any
- * visited pixel will be of a quality at least as good or better than previous
- * visits of this pixel. A pixel may be visited zero times if it cannot be
- * decoded yet or if it was already decoded to full precision (this behavior is
- * not guaranteed).
- *
- * @param dec decoder object
- * @param format format of the pixels. Object owned by user; its contents are
- *     copied internally.
- * @param callback the callback function receiving partial scanlines of pixel
- *     data.
- * @param opaque optional user data, which will be passed on to the callback,
- *     may be NULL.
- * @return ::JXL_DEC_SUCCESS on success, ::JXL_DEC_ERROR on error, such
- *     as @ref JxlDecoderSetImageOutBuffer already set.
- */
-JXL_EXPORT JxlDecoderStatus
-JxlDecoderSetImageOutCallback(JxlDecoder* dec, const JxlPixelFormat* format,
-                              JxlImageOutCallback callback, void* opaque);
-
-/** Similar to @ref JxlDecoderSetImageOutCallback except that the callback is
- * allowed an initialization phase during which it is informed of how many
- * threads will call it concurrently, and those calls are further informed of
- * which thread they are occurring in.
- *
- * @param dec decoder object
- * @param format format of the pixels. Object owned by user; its contents are
- *     copied internally.
- * @param init_callback initialization callback.
- * @param run_callback the callback function receiving partial scanlines of
- *     pixel data.
- * @param destroy_callback clean-up callback invoked after all calls to @c
- *     run_callback. May be NULL if no clean-up is necessary.
- * @param init_opaque optional user data passed to @c init_callback, may be NULL
- *     (unlike the return value from @c init_callback which may only be NULL if
- *     initialization failed).
- * @return ::JXL_DEC_SUCCESS on success, ::JXL_DEC_ERROR on error, such
- *     as @ref JxlDecoderSetImageOutBuffer having already been called.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderSetMultithreadedImageOutCallback(
-    JxlDecoder* dec, const JxlPixelFormat* format,
-    JxlImageOutInitCallback init_callback, JxlImageOutRunCallback run_callback,
-    JxlImageOutDestroyCallback destroy_callback, void* init_opaque);
-
-/**
- * Returns the minimum size in bytes of an extra channel pixel buffer for the
- * given format. This is the buffer for @ref JxlDecoderSetExtraChannelBuffer.
- * Requires the basic image information is available in the decoder.
- *
- * @param dec decoder object
- * @param format format of the pixels. The num_channels value is ignored and is
- *     always treated to be `1`.
- * @param size output value, buffer size in bytes
- * @param index which extra channel to get, matching the index used in @ref
- *     JxlDecoderGetExtraChannelInfo. Must be smaller than num_extra_channels in
- *     the associated @ref JxlBasicInfo.
- * @return ::JXL_DEC_SUCCESS on success, ::JXL_DEC_ERROR on error, such as
- *     information not available yet or invalid index.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderExtraChannelBufferSize(
-    const JxlDecoder* dec, const JxlPixelFormat* format, size_t* size,
-    uint32_t index);
-
-/**
- * Sets the buffer to write an extra channel to. This can be set when
- * the ::JXL_DEC_FRAME or ::JXL_DEC_NEED_IMAGE_OUT_BUFFER event occurs,
- * and applies only for the current frame. The size of the buffer must be at
- * least as large as given by @ref JxlDecoderExtraChannelBufferSize. The buffer
- * follows the format described by @ref JxlPixelFormat, but where num_channels
- * is `1`. The buffer is owned by the caller. The amount of extra channels is
- * given by the num_extra_channels field in the associated @ref JxlBasicInfo,
- * and the information of individual extra channels can be queried with @ref
- * JxlDecoderGetExtraChannelInfo. To get multiple extra channels, this function
- * must be called multiple times, once for each wanted index. Not all images
- * have extra channels. The alpha channel is an extra channel and can be gotten
- * as part of the color channels when using an RGBA pixel buffer with @ref
- * JxlDecoderSetImageOutBuffer, but additionally also can be gotten
- * separately as extra channel. The color channels themselves cannot be gotten
- * this way.
- *
- *
- * @param dec decoder object
- * @param format format of the pixels. Object owned by user and its contents
- *     are copied internally. The num_channels value is ignored and is always
- *     treated to be `1`.
- * @param buffer buffer type to output the pixel data to
- * @param size size of buffer in bytes
- * @param index which extra channel to get, matching the index used in @ref
- *     JxlDecoderGetExtraChannelInfo. Must be smaller than num_extra_channels in
- *     the associated @ref JxlBasicInfo.
- * @return ::JXL_DEC_SUCCESS on success, ::JXL_DEC_ERROR on error, such as
- *     size too small or invalid index.
- */
-JXL_EXPORT JxlDecoderStatus
-JxlDecoderSetExtraChannelBuffer(JxlDecoder* dec, const JxlPixelFormat* format,
-                                void* buffer, size_t size, uint32_t index);
-
-/**
- * Sets output buffer for reconstructed JPEG codestream.
- *
- * The data is owned by the caller and may be used by the decoder until @ref
- * JxlDecoderReleaseJPEGBuffer is called or the decoder is destroyed or
- * reset so must be kept alive until then.
- *
- * If a JPEG buffer was set before and released with @ref
- * JxlDecoderReleaseJPEGBuffer, bytes that the decoder has already output
- * should not be included, only the remaining bytes output must be set.
- *
- * @param dec decoder object
- * @param data pointer to next bytes to write to
- * @param size amount of bytes available starting from data
- * @return ::JXL_DEC_ERROR if output buffer was already set and @ref
- *     JxlDecoderReleaseJPEGBuffer was not called on it, ::JXL_DEC_SUCCESS
- *     otherwise
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderSetJPEGBuffer(JxlDecoder* dec,
-                                                    uint8_t* data, size_t size);
-
-/**
- * Releases buffer which was provided with @ref JxlDecoderSetJPEGBuffer.
- *
- * Calling @ref JxlDecoderReleaseJPEGBuffer is required whenever
- * a buffer is already set and a new buffer needs to be added with @ref
- * JxlDecoderSetJPEGBuffer, but is not required before @ref
- * JxlDecoderDestroy or @ref JxlDecoderReset.
- *
- * Calling @ref JxlDecoderReleaseJPEGBuffer when no buffer is set is
- * not an error and returns `0`.
- *
- * @param dec decoder object
- * @return the amount of bytes the decoder has not yet written to of the data
- *     set by @ref JxlDecoderSetJPEGBuffer, or `0` if no buffer is set or @ref
- *     JxlDecoderReleaseJPEGBuffer was already called.
- */
-JXL_EXPORT size_t JxlDecoderReleaseJPEGBuffer(JxlDecoder* dec);
-
-/**
- * Sets output buffer for box output codestream.
- *
- * The data is owned by the caller and may be used by the decoder until @ref
- * JxlDecoderReleaseBoxBuffer is called or the decoder is destroyed or
- * reset so must be kept alive until then.
- *
- * If for the current box a box buffer was set before and released with @ref
- * JxlDecoderReleaseBoxBuffer, bytes that the decoder has already output
- * should not be included, only the remaining bytes output must be set.
- *
- * The @ref JxlDecoderReleaseBoxBuffer must be used at the next ::JXL_DEC_BOX
- * event or final ::JXL_DEC_SUCCESS event to compute the size of the output
- * box bytes.
- *
- * @param dec decoder object
- * @param data pointer to next bytes to write to
- * @param size amount of bytes available starting from data
- * @return ::JXL_DEC_ERROR if output buffer was already set and @ref
- *     JxlDecoderReleaseBoxBuffer was not called on it, ::JXL_DEC_SUCCESS
- *     otherwise
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderSetBoxBuffer(JxlDecoder* dec,
-                                                   uint8_t* data, size_t size);
-
-/**
- * Releases buffer which was provided with @ref JxlDecoderSetBoxBuffer.
- *
- * Calling @ref JxlDecoderReleaseBoxBuffer is required whenever
- * a buffer is already set and a new buffer needs to be added with @ref
- * JxlDecoderSetBoxBuffer, but is not required before @ref
- * JxlDecoderDestroy or @ref JxlDecoderReset.
- *
- * Calling @ref JxlDecoderReleaseBoxBuffer when no buffer is set is
- * not an error and returns `0`.
- *
- * @param dec decoder object
- * @return the amount of bytes the decoder has not yet written to of the data
- *     set by @ref JxlDecoderSetBoxBuffer, or `0` if no buffer is set or @ref
- *     JxlDecoderReleaseBoxBuffer was already called.
- */
-JXL_EXPORT size_t JxlDecoderReleaseBoxBuffer(JxlDecoder* dec);
-
-/**
- * Configures whether to get boxes in raw mode or in decompressed mode. In raw
- * mode, boxes are output as their bytes appear in the container file, which may
- * be decompressed, or compressed if their type is "brob". In decompressed mode,
- * "brob" boxes are decompressed with Brotli before outputting them. The size of
- * the decompressed stream is not known before the decompression has already
- * finished.
- *
- * The default mode is raw. This setting can only be changed before decoding, or
- * directly after a ::JXL_DEC_BOX event, and is remembered until the decoder
- * is reset or destroyed.
- *
- * Enabling decompressed mode requires Brotli support from the library.
- *
- * @param dec decoder object
- * @param decompress ::JXL_TRUE to transparently decompress, ::JXL_FALSE
- * to get boxes in raw mode.
- * @return ::JXL_DEC_ERROR if decompressed mode is set and Brotli is not
- *     available, ::JXL_DEC_SUCCESS otherwise.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderSetDecompressBoxes(JxlDecoder* dec,
-                                                         JXL_BOOL decompress);
-
-/**
- * Outputs the type of the current box, after a ::JXL_DEC_BOX event occurred,
- * as `4` characters without null termination character. In case of a compressed
- * "brob" box, this will return "brob" if the decompressed argument is
- * JXL_FALSE, or the underlying box type if the decompressed argument is
- * JXL_TRUE.
- *
- * The following box types are currently described in ISO/IEC 18181-2:
- *  - "Exif": a box with EXIF metadata.  Starts with a 4-byte tiff header offset
- *    (big-endian uint32) that indicates the start of the actual EXIF data
- *    (which starts with a tiff header). Usually the offset will be zero and the
- *    EXIF data starts immediately after the offset field. The Exif orientation
- *    should be ignored by applications; the JPEG XL codestream orientation
- *    takes precedence and libjxl will by default apply the correct orientation
- *    automatically (see @ref JxlDecoderSetKeepOrientation).
- *  - "xml ": a box with XML data, in particular XMP metadata.
- *  - "jumb": a JUMBF superbox (JPEG Universal Metadata Box Format, ISO/IEC
- *    19566-5).
- *  - "JXL ": mandatory signature box, must come first, `12` bytes long
- * including the box header
- *  - "ftyp": a second mandatory signature box, must come second, `20` bytes
- * long including the box header
- *  - "jxll": a JXL level box. This indicates if the codestream is level `5` or
- *    level `10` compatible. If not present, it is level `5`. Level `10` allows
- * more features such as very high image resolution and bit-depths above `16`
- * bits per channel. Added automatically by the encoder when
- *    @ref JxlEncoderSetCodestreamLevel is used
- *  - "jxlc": a box with the image codestream, in case the codestream is not
- *    split across multiple boxes. The codestream contains the JPEG XL image
- *    itself, including the basic info such as image dimensions, ICC color
- *    profile, and all the pixel data of all the image frames.
- *  - "jxlp": a codestream box in case it is split across multiple boxes.
- *    The contents are the same as in case of a jxlc box, when concatenated.
- *  - "brob": a Brotli-compressed box, which otherwise represents an existing
- *    type of box such as Exif or "xml ". When @ref JxlDecoderSetDecompressBoxes
- *    is set to JXL_TRUE, these boxes will be transparently decompressed by the
- *    decoder.
- *  - "jxli": frame index box, can list the keyframes in case of a JPEG XL
- *    animation allowing the decoder to jump to individual frames more
- *    efficiently.
- *  - "jbrd": JPEG reconstruction box, contains the information required to
- *    byte-for-byte losslessly reconstruct a JPEG-1 image. The JPEG DCT
- *    coefficients (pixel content) themselves as well as the ICC profile are
- *    encoded in the JXL codestream (jxlc or jxlp) itself. EXIF, XMP and JUMBF
- *    metadata is encoded in the corresponding boxes. The jbrd box itself
- *    contains information such as the remaining app markers of the JPEG-1 file
- *    and everything else required to fit the information together into the
- *    exact original JPEG file.
- *
- * Other application-specific boxes can exist. Their typename should not begin
- * with "jxl" or "JXL" or conflict with other existing typenames.
- *
- * The signature, jxl* and jbrd boxes are processed by the decoder and would
- * typically be ignored by applications. The typical way to use this function is
- * to check if an encountered box contains metadata that the application is
- * interested in (e.g. EXIF or XMP metadata), in order to conditionally set a
- * box buffer.
- *
- * @param dec decoder object
- * @param type buffer to copy the type into
- * @param decompressed which box type to get: JXL_FALSE to get the raw box type,
- *     which can be "brob", JXL_TRUE, get the underlying box type.
- * @return ::JXL_DEC_SUCCESS if the value is available, ::JXL_DEC_ERROR if
- *     not, for example the JPEG XL file does not use the container format.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderGetBoxType(JxlDecoder* dec,
-                                                 JxlBoxType type,
-                                                 JXL_BOOL decompressed);
-
-/**
- * Returns the size of a box as it appears in the container file, after the @ref
- * JXL_DEC_BOX event. This includes all the box headers.
- *
- * @param dec decoder object
- * @param size raw size of the box in bytes
- * @return ::JXL_DEC_ERROR if no box size is available, ::JXL_DEC_SUCCESS
- *     otherwise.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderGetBoxSizeRaw(const JxlDecoder* dec,
-                                                    uint64_t* size);
-
-/**
- * Returns the size of the contents of a box, after the @ref
- * JXL_DEC_BOX event. This does not include any of the headers of the box. For
- * compressed "brob" boxes, this is the size of the compressed content. Even
- * when @ref JxlDecoderSetDecompressBoxes is enabled, the return value of
- * function does not change, and the decompressed size is not known before it
- * has already been decompressed and output.
- *
- * @param dec decoder object
- * @param size size of the payload of the box in bytes
- * @return @ref JXL_DEC_ERROR if no box size is available, @ref JXL_DEC_SUCCESS
- *     otherwise.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderGetBoxSizeContents(const JxlDecoder* dec,
-                                                         uint64_t* size);
-
-/**
- * Configures at which progressive steps in frame decoding these @ref
- * JXL_DEC_FRAME_PROGRESSION event occurs. The default value for the level
- * of detail if this function is never called is `kDC`.
- *
- * @param dec decoder object
- * @param detail at which level of detail to trigger @ref
- *     JXL_DEC_FRAME_PROGRESSION
- * @return ::JXL_DEC_SUCCESS on success, ::JXL_DEC_ERROR on error, such as
- *     an invalid value for the progressive detail.
- */
-JXL_EXPORT JxlDecoderStatus
-JxlDecoderSetProgressiveDetail(JxlDecoder* dec, JxlProgressiveDetail detail);
-
-/**
- * Returns the intended downsampling ratio for the progressive frame produced
- * by @ref JxlDecoderFlushImage after the latest ::JXL_DEC_FRAME_PROGRESSION
- * event.
- *
- * @param dec decoder object
- * @return The intended downsampling ratio, can be `1`, `2`, `4` or `8`.
- */
-JXL_EXPORT size_t JxlDecoderGetIntendedDownsamplingRatio(JxlDecoder* dec);
-
-/**
- * Outputs progressive step towards the decoded image so far when only partial
- * input was received. If the flush was successful, the buffer set with @ref
- * JxlDecoderSetImageOutBuffer will contain partial image data.
- *
- * Can be called when @ref JxlDecoderProcessInput returns @ref
- * JXL_DEC_NEED_MORE_INPUT, after the ::JXL_DEC_FRAME event already occurred
- * and before the ::JXL_DEC_FULL_IMAGE event occurred for a frame.
- *
- * @param dec decoder object
- * @return ::JXL_DEC_SUCCESS if image data was flushed to the output buffer,
- *     or ::JXL_DEC_ERROR when no flush was done, e.g. if not enough image
- *     data was available yet even for flush, or no output buffer was set yet.
- *     This error is not fatal, it only indicates no flushed image is available
- *     right now. Regular decoding can still be performed.
- */
-JXL_EXPORT JxlDecoderStatus JxlDecoderFlushImage(JxlDecoder* dec);
-
-/**
- * Sets the bit depth of the output buffer or callback.
- *
- * Can be called after @ref JxlDecoderSetImageOutBuffer or @ref
- * JxlDecoderSetImageOutCallback. For float pixel data types, only the default
- * ::JXL_BIT_DEPTH_FROM_PIXEL_FORMAT setting is supported.
- *
- * @param dec decoder object
- * @param bit_depth the bit depth setting of the pixel output
- * @return ::JXL_DEC_SUCCESS on success, ::JXL_DEC_ERROR on error, such as
- *     incompatible custom bit depth and pixel data type.
- */
-JXL_EXPORT JxlDecoderStatus
-JxlDecoderSetImageOutBitDepth(JxlDecoder* dec, const JxlBitDepth* bit_depth);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* JXL_DECODE_H_ */
-
-/** @}*/
diff --git a/third_party/jpeg-xl/lib/include/jxl/decode_cxx.h b/third_party/jpeg-xl/lib/include/jxl/decode_cxx.h
deleted file mode 100644
index 6089538dbe76c..0000000000000
--- a/third_party/jpeg-xl/lib/include/jxl/decode_cxx.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/// @addtogroup libjxl_cpp
-/// @{
-///
-/// @file decode_cxx.h
-/// @brief C++ header-only helper for @ref decode.h.
-///
-/// There's no binary library associated with the header since this is a header
-/// only library.
-
-#ifndef JXL_DECODE_CXX_H_
-#define JXL_DECODE_CXX_H_
-
-#include <jxl/decode.h>
-#include <jxl/memory_manager.h>
-
-#include <memory>
-
-#ifndef __cplusplus
-#error "This a C++ only header. Use jxl/decode.h from C sources."
-#endif
-
-/// Struct to call JxlDecoderDestroy from the JxlDecoderPtr unique_ptr.
-struct JxlDecoderDestroyStruct {
-  /// Calls @ref JxlDecoderDestroy() on the passed decoder.
-  void operator()(JxlDecoder* decoder) { JxlDecoderDestroy(decoder); }
-};
-
-/// std::unique_ptr<> type that calls JxlDecoderDestroy() when releasing the
-/// decoder.
-///
-/// Use this helper type from C++ sources to ensure the decoder is destroyed and
-/// their internal resources released.
-typedef std::unique_ptr<JxlDecoder, JxlDecoderDestroyStruct> JxlDecoderPtr;
-
-/// Creates an instance of JxlDecoder into a JxlDecoderPtr and initializes it.
-///
-/// This function returns a unique_ptr that will call JxlDecoderDestroy() when
-/// releasing the pointer. See @ref JxlDecoderCreate for details on the
-/// instance creation.
-///
-/// @param memory_manager custom allocator function. It may be NULL. The memory
-///        manager will be copied internally.
-/// @return a @c NULL JxlDecoderPtr if the instance can not be allocated or
-///         initialized
-/// @return initialized JxlDecoderPtr instance otherwise.
-static inline JxlDecoderPtr JxlDecoderMake(
-    const JxlMemoryManager* memory_manager) {
-  return JxlDecoderPtr(JxlDecoderCreate(memory_manager));
-}
-
-#endif  // JXL_DECODE_CXX_H_
-
-/// @}
diff --git a/third_party/jpeg-xl/lib/include/jxl/encode.h b/third_party/jpeg-xl/lib/include/jxl/encode.h
deleted file mode 100644
index 633a98e41754e..0000000000000
--- a/third_party/jpeg-xl/lib/include/jxl/encode.h
+++ /dev/null
@@ -1,1602 +0,0 @@
-/* Copyright (c) the JPEG XL Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
- */
-
-/** @addtogroup libjxl_encoder
- * @{
- * @file encode.h
- * @brief Encoding API for JPEG XL.
- */
-
-#ifndef JXL_ENCODE_H_
-#define JXL_ENCODE_H_
-
-#include <jxl/cms_interface.h>
-#include <jxl/codestream_header.h>
-#include <jxl/color_encoding.h>
-#include <jxl/jxl_export.h>
-#include <jxl/memory_manager.h>
-#include <jxl/parallel_runner.h>
-#include <jxl/stats.h>
-#include <jxl/types.h>
-#include <jxl/version.h>  // TODO(eustas): remove before v1.0
-#include <stddef.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Encoder library version.
- *
- * @return the encoder library version as an integer:
- * MAJOR_VERSION * 1000000 + MINOR_VERSION * 1000 + PATCH_VERSION. For example,
- * version 1.2.3 would return 1002003.
- */
-JXL_EXPORT uint32_t JxlEncoderVersion(void);
-
-/**
- * Opaque structure that holds the JPEG XL encoder.
- *
- * Allocated and initialized with @ref JxlEncoderCreate().
- * Cleaned up and deallocated with @ref JxlEncoderDestroy().
- */
-typedef struct JxlEncoderStruct JxlEncoder;
-
-/**
- * Settings and metadata for a single image frame. This includes encoder options
- * for a frame such as compression quality and speed.
- *
- * Allocated and initialized with @ref JxlEncoderFrameSettingsCreate().
- * Cleaned up and deallocated when the encoder is destroyed with
- * @ref JxlEncoderDestroy().
- */
-typedef struct JxlEncoderFrameSettingsStruct JxlEncoderFrameSettings;
-
-/**
- * Return value for multiple encoder functions.
- */
-typedef enum {
-  /** Function call finished successfully, or encoding is finished and there is
-   * nothing more to be done.
-   */
-  JXL_ENC_SUCCESS = 0,
-
-  /** An error occurred, for example out of memory.
-   */
-  JXL_ENC_ERROR = 1,
-
-  /** The encoder needs more output buffer to continue encoding.
-   */
-  JXL_ENC_NEED_MORE_OUTPUT = 2,
-
-} JxlEncoderStatus;
-
-/**
- * Error conditions:
- * API usage errors have the 0x80 bit set to 1
- * Other errors have the 0x80 bit set to 0
- */
-typedef enum {
-  /** No error
-   */
-  JXL_ENC_ERR_OK = 0,
-
-  /** Generic encoder error due to unspecified cause
-   */
-  JXL_ENC_ERR_GENERIC = 1,
-
-  /** Out of memory
-   *  TODO(jon): actually catch this and return this error
-   */
-  JXL_ENC_ERR_OOM = 2,
-
-  /** JPEG bitstream reconstruction data could not be
-   *  represented (e.g. too much tail data)
-   */
-  JXL_ENC_ERR_JBRD = 3,
-
-  /** Input is invalid (e.g. corrupt JPEG file or ICC profile)
-   */
-  JXL_ENC_ERR_BAD_INPUT = 4,
-
-  /** The encoder doesn't (yet) support this. Either no version of libjxl
-   * supports this, and the API is used incorrectly, or the libjxl version
-   * should have been checked before trying to do this.
-   */
-  JXL_ENC_ERR_NOT_SUPPORTED = 0x80,
-
-  /** The encoder API is used in an incorrect way.
-   *  In this case, a debug build of libjxl should output a specific error
-   * message. (if not, please open an issue about it)
-   */
-  JXL_ENC_ERR_API_USAGE = 0x81,
-
-} JxlEncoderError;
-
-/**
- * Id of encoder options for a frame. This includes options such as setting
- * encoding effort/speed or overriding the use of certain coding tools, for this
- * frame. This does not include non-frame related encoder options such as for
- * boxes.
- */
-typedef enum {
-  /** Sets encoder effort/speed level without affecting decoding speed. Valid
-   * values are, from faster to slower speed: 1:lightning 2:thunder 3:falcon
-   * 4:cheetah 5:hare 6:wombat 7:squirrel 8:kitten 9:tortoise 10:glacier.
-   * Default: squirrel (7).
-   */
-  JXL_ENC_FRAME_SETTING_EFFORT = 0,
-
-  /** Sets the decoding speed tier for the provided options. Minimum is 0
-   * (slowest to decode, best quality/density), and maximum is 4 (fastest to
-   * decode, at the cost of some quality/density). Default is 0.
-   */
-  JXL_ENC_FRAME_SETTING_DECODING_SPEED = 1,
-
-  /** Sets resampling option. If enabled, the image is downsampled before
-   * compression, and upsampled to original size in the decoder. Integer option,
-   * use -1 for the default behavior (resampling only applied for low quality),
-   * 1 for no downsampling (1x1), 2 for 2x2 downsampling, 4 for 4x4
-   * downsampling, 8 for 8x8 downsampling.
-   */
-  JXL_ENC_FRAME_SETTING_RESAMPLING = 2,
-
-  /** Similar to ::JXL_ENC_FRAME_SETTING_RESAMPLING, but for extra channels.
-   * Integer option, use -1 for the default behavior (depends on encoder
-   * implementation), 1 for no downsampling (1x1), 2 for 2x2 downsampling, 4 for
-   * 4x4 downsampling, 8 for 8x8 downsampling.
-   */
-  JXL_ENC_FRAME_SETTING_EXTRA_CHANNEL_RESAMPLING = 3,
-
-  /** Indicates the frame added with @ref JxlEncoderAddImageFrame is already
-   * downsampled by the downsampling factor set with @ref
-   * JXL_ENC_FRAME_SETTING_RESAMPLING. The input frame must then be given in the
-   * downsampled resolution, not the full image resolution. The downsampled
-   * resolution is given by ceil(xsize / resampling), ceil(ysize / resampling)
-   * with xsize and ysize the dimensions given in the basic info, and resampling
-   * the factor set with ::JXL_ENC_FRAME_SETTING_RESAMPLING.
-   * Use 0 to disable, 1 to enable. Default value is 0.
-   */
-  JXL_ENC_FRAME_SETTING_ALREADY_DOWNSAMPLED = 4,
-
-  /** Adds noise to the image emulating photographic film noise, the higher the
-   * given number, the grainier the image will be. As an example, a value of 100
-   * gives low noise whereas a value of 3200 gives a lot of noise. The default
-   * value is 0.
-   */
-  JXL_ENC_FRAME_SETTING_PHOTON_NOISE = 5,
-
-  /** Enables adaptive noise generation. This setting is not recommended for
-   * use, please use ::JXL_ENC_FRAME_SETTING_PHOTON_NOISE instead. Use -1 for
-   * the default (encoder chooses), 0 to disable, 1 to enable.
-   */
-  JXL_ENC_FRAME_SETTING_NOISE = 6,
-
-  /** Enables or disables dots generation. Use -1 for the default (encoder
-   * chooses), 0 to disable, 1 to enable.
-   */
-  JXL_ENC_FRAME_SETTING_DOTS = 7,
-
-  /** Enables or disables patches generation. Use -1 for the default (encoder
-   * chooses), 0 to disable, 1 to enable.
-   */
-  JXL_ENC_FRAME_SETTING_PATCHES = 8,
-
-  /** Edge preserving filter level, -1 to 3. Use -1 for the default (encoder
-   * chooses), 0 to 3 to set a strength.
-   */
-  JXL_ENC_FRAME_SETTING_EPF = 9,
-
-  /** Enables or disables the gaborish filter. Use -1 for the default (encoder
-   * chooses), 0 to disable, 1 to enable.
-   */
-  JXL_ENC_FRAME_SETTING_GABORISH = 10,
-
-  /** Enables modular encoding. Use -1 for default (encoder
-   * chooses), 0 to enforce VarDCT mode (e.g. for photographic images), 1 to
-   * enforce modular mode (e.g. for lossless images).
-   */
-  JXL_ENC_FRAME_SETTING_MODULAR = 11,
-
-  /** Enables or disables preserving color of invisible pixels. Use -1 for the
-   * default (1 if lossless, 0 if lossy), 0 to disable, 1 to enable.
-   */
-  JXL_ENC_FRAME_SETTING_KEEP_INVISIBLE = 12,
-
-  /** Determines the order in which 256x256 regions are stored in the codestream
-   * for progressive rendering. Use -1 for the encoder
-   * default, 0 for scanline order, 1 for center-first order.
-   */
-  JXL_ENC_FRAME_SETTING_GROUP_ORDER = 13,
-
-  /** Determines the horizontal position of center for the center-first group
-   * order. Use -1 to automatically use the middle of the image, 0..xsize to
-   * specifically set it.
-   */
-  JXL_ENC_FRAME_SETTING_GROUP_ORDER_CENTER_X = 14,
-
-  /** Determines the center for the center-first group order. Use -1 to
-   * automatically use the middle of the image, 0..ysize to specifically set it.
-   */
-  JXL_ENC_FRAME_SETTING_GROUP_ORDER_CENTER_Y = 15,
-
-  /** Enables or disables progressive encoding for modular mode. Use -1 for the
-   * encoder default, 0 to disable, 1 to enable.
-   */
-  JXL_ENC_FRAME_SETTING_RESPONSIVE = 16,
-
-  /** Set the progressive mode for the AC coefficients of VarDCT, using spectral
-   * progression from the DCT coefficients. Use -1 for the encoder default, 0 to
-   * disable, 1 to enable.
-   */
-  JXL_ENC_FRAME_SETTING_PROGRESSIVE_AC = 17,
-
-  /** Set the progressive mode for the AC coefficients of VarDCT, using
-   * quantization of the least significant bits. Use -1 for the encoder default,
-   * 0 to disable, 1 to enable.
-   */
-  JXL_ENC_FRAME_SETTING_QPROGRESSIVE_AC = 18,
-
-  /** Set the progressive mode using lower-resolution DC images for VarDCT. Use
-   * -1 for the encoder default, 0 to disable, 1 to have an extra 64x64 lower
-   * resolution pass, 2 to have a 512x512 and 64x64 lower resolution pass.
-   */
-  JXL_ENC_FRAME_SETTING_PROGRESSIVE_DC = 19,
-
-  /** Use Global channel palette if the amount of colors is smaller than this
-   * percentage of range. Use 0-100 to set an explicit percentage, -1 to use the
-   * encoder default. Used for modular encoding.
-   */
-  JXL_ENC_FRAME_SETTING_CHANNEL_COLORS_GLOBAL_PERCENT = 20,
-
-  /** Use Local (per-group) channel palette if the amount of colors is smaller
-   * than this percentage of range. Use 0-100 to set an explicit percentage, -1
-   * to use the encoder default. Used for modular encoding.
-   */
-  JXL_ENC_FRAME_SETTING_CHANNEL_COLORS_GROUP_PERCENT = 21,
-
-  /** Use color palette if amount of colors is smaller than or equal to this
-   * amount, or -1 to use the encoder default. Used for modular encoding.
-   */
-  JXL_ENC_FRAME_SETTING_PALETTE_COLORS = 22,
-
-  /** Enables or disables delta palette. Use -1 for the default (encoder
-   * chooses), 0 to disable, 1 to enable. Used in modular mode.
-   */
-  JXL_ENC_FRAME_SETTING_LOSSY_PALETTE = 23,
-
-  /** Color transform for internal encoding: -1 = default, 0=XYB, 1=none (RGB),
-   * 2=YCbCr. The XYB setting performs the forward XYB transform. None and
-   * YCbCr both perform no transform, but YCbCr is used to indicate that the
-   * encoded data losslessly represents YCbCr values.
-   */
-  JXL_ENC_FRAME_SETTING_COLOR_TRANSFORM = 24,
-
-  /** Reversible color transform for modular encoding: -1=default, 0-41=RCT
-   * index, e.g. index 0 = none, index 6 = YCoCg.
-   * If this option is set to a non-default value, the RCT will be globally
-   * applied to the whole frame.
-   * The default behavior is to try several RCTs locally per modular group,
-   * depending on the speed and distance setting.
-   */
-  JXL_ENC_FRAME_SETTING_MODULAR_COLOR_SPACE = 25,
-
-  /** Group size for modular encoding: -1=default, 0=128, 1=256, 2=512, 3=1024.
-   */
-  JXL_ENC_FRAME_SETTING_MODULAR_GROUP_SIZE = 26,
-
-  /** Predictor for modular encoding. -1 = default, 0=zero, 1=left, 2=top,
-   * 3=avg0, 4=select, 5=gradient, 6=weighted, 7=topright, 8=topleft,
-   * 9=leftleft, 10=avg1, 11=avg2, 12=avg3, 13=toptop predictive average 14=mix
-   * 5 and 6, 15=mix everything.
-   */
-  JXL_ENC_FRAME_SETTING_MODULAR_PREDICTOR = 27,
-
-  /** Fraction of pixels used to learn MA trees as a percentage. -1 = default,
-   * 0 = no MA and fast decode, 50 = default value, 100 = all, values above
-   * 100 are also permitted. Higher values use more encoder memory.
-   */
-  JXL_ENC_FRAME_SETTING_MODULAR_MA_TREE_LEARNING_PERCENT = 28,
-
-  /** Number of extra (previous-channel) MA tree properties to use. -1 =
-   * default, 0-11 = valid values. Recommended values are in the range 0 to 3,
-   * or 0 to amount of channels minus 1 (including all extra channels, and
-   * excluding color channels when using VarDCT mode). Higher value gives slower
-   * encoding and slower decoding.
-   */
-  JXL_ENC_FRAME_SETTING_MODULAR_NB_PREV_CHANNELS = 29,
-
-  /** Enable or disable CFL (chroma-from-luma) for lossless JPEG recompression.
-   * -1 = default, 0 = disable CFL, 1 = enable CFL.
-   */
-  JXL_ENC_FRAME_SETTING_JPEG_RECON_CFL = 30,
-
-  /** Prepare the frame for indexing in the frame index box.
-   * 0 = ignore this frame (same as not setting a value),
-   * 1 = index this frame within the Frame Index Box.
-   * If any frames are indexed, the first frame needs to
-   * be indexed, too. If the first frame is not indexed, and
-   * a later frame is attempted to be indexed, ::JXL_ENC_ERROR will occur.
-   * If non-keyframes, i.e., frames with cropping, blending or patches are
-   * attempted to be indexed, ::JXL_ENC_ERROR will occur.
-   */
-  JXL_ENC_FRAME_INDEX_BOX = 31,
-
-  /** Sets brotli encode effort for use in JPEG recompression and
-   * compressed metadata boxes (brob). Can be -1 (default) or 0 (fastest) to 11
-   * (slowest). Default is based on the general encode effort in case of JPEG
-   * recompression, and 4 for brob boxes.
-   */
-  JXL_ENC_FRAME_SETTING_BROTLI_EFFORT = 32,
-
-  /** Enables or disables brotli compression of metadata boxes derived from
-   * a JPEG frame when using @ref JxlEncoderAddJPEGFrame. This has no effect on
-   * boxes added using @ref JxlEncoderAddBox. -1 = default, 0 = disable
-   * compression, 1 = enable compression.
-   */
-  JXL_ENC_FRAME_SETTING_JPEG_COMPRESS_BOXES = 33,
-
-  /** Control what kind of buffering is used, when using chunked image frames.
-   * -1 = default (let the encoder decide)
-   * 0 = buffers everything, basically the same as non-streamed code path
-   (mainly for testing)
-   * 1 = buffers everything for images that are smaller than 2048 x 2048, and
-   *     uses streaming input and output for larger images
-   * 2 = uses streaming input and output for all images that are larger than
-   *     one group, i.e. 256 x 256 pixels by default
-   * 3 = currently same as 2
-   *
-   * When using streaming input and output the encoder minimizes memory usage at
-   * the cost of compression density. Also note that images produced with
-   * streaming mode might not be progressively decodeable.
-   */
-  JXL_ENC_FRAME_SETTING_BUFFERING = 34,
-
-  /** Keep or discard Exif metadata boxes derived from a JPEG frame when using
-   * @ref JxlEncoderAddJPEGFrame. This has no effect on boxes added using
-   * @ref JxlEncoderAddBox. When @ref JxlEncoderStoreJPEGMetadata is set to 1,
-   * this option cannot be set to 0. Even when Exif metadata is discarded, the
-   * orientation will still be applied. 0 = discard Exif metadata, 1 = keep Exif
-   * metadata (default).
-   */
-  JXL_ENC_FRAME_SETTING_JPEG_KEEP_EXIF = 35,
-
-  /** Keep or discard XMP metadata boxes derived from a JPEG frame when using
-   * @ref JxlEncoderAddJPEGFrame. This has no effect on boxes added using
-   * @ref JxlEncoderAddBox. When @ref JxlEncoderStoreJPEGMetadata is set to 1,
-   * this option cannot be set to 0. 0 = discard XMP metadata, 1 = keep XMP
-   * metadata (default).
-   */
-  JXL_ENC_FRAME_SETTING_JPEG_KEEP_XMP = 36,
-
-  /** Keep or discard JUMBF metadata boxes derived from a JPEG frame when using
-   * @ref JxlEncoderAddJPEGFrame. This has no effect on boxes added using
-   * @ref JxlEncoderAddBox. 0 = discard JUMBF metadata, 1 = keep JUMBF metadata
-   * (default).
-   */
-  JXL_ENC_FRAME_SETTING_JPEG_KEEP_JUMBF = 37,
-
-  /** If this mode is disabled, the encoder will not make any image quality
-   * decisions that are computed based on the full image, but stored only once
-   * (e.g. the X quant multiplier in the frame header). Used mainly for testing
-   * equivalence of streaming and non-streaming code.
-   * 0 = disabled, 1 = enabled (default)
-   */
-  JXL_ENC_FRAME_SETTING_USE_FULL_IMAGE_HEURISTICS = 38,
-
-  /** Disable perceptual optimizations. 0 = optimizations enabled (default), 1 =
-   * optimizations disabled.
-   */
-  JXL_ENC_FRAME_SETTING_DISABLE_PERCEPTUAL_HEURISTICS = 39,
-
-  /** Enum value not to be used as an option. This value is added to force the
-   * C compiler to have the enum to take a known size.
-   */
-  JXL_ENC_FRAME_SETTING_FILL_ENUM = 65535,
-
-} JxlEncoderFrameSettingId;
-
-/**
- * Creates an instance of @ref JxlEncoder and initializes it.
- *
- * @p memory_manager will be used for all the library dynamic allocations made
- * from this instance. The parameter may be NULL, in which case the default
- * allocator will be used. See jpegxl/memory_manager.h for details.
- *
- * @param memory_manager custom allocator function. It may be NULL. The memory
- *        manager will be copied internally.
- * @return @c NULL if the instance can not be allocated or initialized
- * @return pointer to initialized @ref JxlEncoder otherwise
- */
-JXL_EXPORT JxlEncoder* JxlEncoderCreate(const JxlMemoryManager* memory_manager);
-
-/**
- * Re-initializes a @ref JxlEncoder instance, so it can be re-used for encoding
- * another image. All state and settings are reset as if the object was
- * newly created with @ref JxlEncoderCreate, but the memory manager is kept.
- *
- * @param enc instance to be re-initialized.
- */
-JXL_EXPORT void JxlEncoderReset(JxlEncoder* enc);
-
-/**
- * Deinitializes and frees a @ref JxlEncoder instance.
- *
- * @param enc instance to be cleaned up and deallocated.
- */
-JXL_EXPORT void JxlEncoderDestroy(JxlEncoder* enc);
-
-/**
- * Sets the color management system (CMS) that will be used for color conversion
- * (if applicable) during encoding. May only be set before starting encoding. If
- * left unset, the default CMS implementation will be used.
- *
- * @param enc encoder object.
- * @param cms structure representing a CMS implementation. See @ref
- * JxlCmsInterface for more details.
- */
-JXL_EXPORT void JxlEncoderSetCms(JxlEncoder* enc, JxlCmsInterface cms);
-
-/**
- * Set the parallel runner for multithreading. May only be set before starting
- * encoding.
- *
- * @param enc encoder object.
- * @param parallel_runner function pointer to runner for multithreading. It may
- *        be NULL to use the default, single-threaded, runner. A multithreaded
- *        runner should be set to reach fast performance.
- * @param parallel_runner_opaque opaque pointer for parallel_runner.
- * @return ::JXL_ENC_SUCCESS if the runner was set, ::JXL_ENC_ERROR
- * otherwise (the previous runner remains set).
- */
-JXL_EXPORT JxlEncoderStatus
-JxlEncoderSetParallelRunner(JxlEncoder* enc, JxlParallelRunner parallel_runner,
-                            void* parallel_runner_opaque);
-
-/**
- * Get the (last) error code in case ::JXL_ENC_ERROR was returned.
- *
- * @param enc encoder object.
- * @return the @ref JxlEncoderError that caused the (last) ::JXL_ENC_ERROR to
- * be returned.
- */
-JXL_EXPORT JxlEncoderError JxlEncoderGetError(JxlEncoder* enc);
-
-/**
- * Encodes a JPEG XL file using the available bytes. @p *avail_out indicates how
- * many output bytes are available, and @p *next_out points to the input bytes.
- * *avail_out will be decremented by the amount of bytes that have been
- * processed by the encoder and *next_out will be incremented by the same
- * amount, so *next_out will now point at the amount of *avail_out unprocessed
- * bytes.
- *
- * The returned status indicates whether the encoder needs more output bytes.
- * When the return value is not ::JXL_ENC_ERROR or ::JXL_ENC_SUCCESS, the
- * encoding requires more @ref JxlEncoderProcessOutput calls to continue.
- *
- * The caller must guarantee that *avail_out >= 32 when calling
- * @ref JxlEncoderProcessOutput; otherwise, ::JXL_ENC_NEED_MORE_OUTPUT will
- * be returned. It is guaranteed that, if *avail_out >= 32, at least one byte of
- * output will be written.
- *
- * This encodes the frames and/or boxes added so far. If the last frame or last
- * box has been added, @ref JxlEncoderCloseInput, @ref JxlEncoderCloseFrames
- * and/or @ref JxlEncoderCloseBoxes must be called before the next
- * @ref JxlEncoderProcessOutput call, or the codestream won't be encoded
- * correctly.
- *
- * @param enc encoder object.
- * @param next_out pointer to next bytes to write to.
- * @param avail_out amount of bytes available starting from *next_out.
- * @return ::JXL_ENC_SUCCESS when encoding finished and all events handled.
- * @return ::JXL_ENC_ERROR when encoding failed, e.g. invalid input.
- * @return ::JXL_ENC_NEED_MORE_OUTPUT more output buffer is necessary.
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderProcessOutput(JxlEncoder* enc,
-                                                    uint8_t** next_out,
-                                                    size_t* avail_out);
-
-/**
- * Sets the frame information for this frame to the encoder. This includes
- * animation information such as frame duration to store in the frame header.
- * The frame header fields represent the frame as passed to the encoder, but not
- * necessarily the exact values as they will be encoded file format: the encoder
- * could change crop and blending options of a frame for more efficient encoding
- * or introduce additional internal frames. Animation duration and time code
- * information is not altered since those are immutable metadata of the frame.
- *
- * It is not required to use this function, however if have_animation is set
- * to true in the basic info, then this function should be used to set the
- * time duration of this individual frame. By default individual frames have a
- * time duration of 0, making them form a composite still. See @ref
- * JxlFrameHeader for more information.
- *
- * This information is stored in the @ref JxlEncoderFrameSettings and so is used
- * for any frame encoded with these @ref JxlEncoderFrameSettings. It is ok to
- * change between @ref JxlEncoderAddImageFrame calls, each added image frame
- * will have the frame header that was set in the options at the time of calling
- * @ref JxlEncoderAddImageFrame.
- *
- * The is_last and name_length fields of the @ref JxlFrameHeader are ignored,
- * use
- * @ref JxlEncoderCloseFrames to indicate last frame, and @ref
- * JxlEncoderSetFrameName to indicate the name and its length instead.
- * Calling this function will clear any name that was previously set with @ref
- * JxlEncoderSetFrameName.
- *
- * @param frame_settings set of options and metadata for this frame. Also
- * includes reference to the encoder object.
- * @param frame_header frame header data to set. Object owned by the caller and
- * does not need to be kept in memory, its information is copied internally.
- * @return ::JXL_ENC_SUCCESS on success, ::JXL_ENC_ERROR on error
- */
-JXL_EXPORT JxlEncoderStatus
-JxlEncoderSetFrameHeader(JxlEncoderFrameSettings* frame_settings,
-                         const JxlFrameHeader* frame_header);
-
-/**
- * Sets blend info of an extra channel. The blend info of extra channels is set
- * separately from that of the color channels, the color channels are set with
- * @ref JxlEncoderSetFrameHeader.
- *
- * @param frame_settings set of options and metadata for this frame. Also
- * includes reference to the encoder object.
- * @param index index of the extra channel to use.
- * @param blend_info blend info to set for the extra channel
- * @return ::JXL_ENC_SUCCESS on success, ::JXL_ENC_ERROR on error
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderSetExtraChannelBlendInfo(
-    JxlEncoderFrameSettings* frame_settings, size_t index,
-    const JxlBlendInfo* blend_info);
-
-/**
- * Sets the name of the animation frame. This function is optional, frames are
- * not required to have a name. This setting is a part of the frame header, and
- * the same principles as for @ref JxlEncoderSetFrameHeader apply. The
- * name_length field of @ref JxlFrameHeader is ignored by the encoder, this
- * function determines the name length instead as the length in bytes of the C
- * string.
- *
- * The maximum possible name length is 1071 bytes (excluding terminating null
- * character).
- *
- * Calling @ref JxlEncoderSetFrameHeader clears any name that was
- * previously set.
- *
- * @param frame_settings set of options and metadata for this frame. Also
- * includes reference to the encoder object.
- * @param frame_name name of the next frame to be encoded, as a UTF-8 encoded C
- * string (zero terminated). Owned by the caller, and copied internally.
- * @return ::JXL_ENC_SUCCESS on success, ::JXL_ENC_ERROR on error
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderSetFrameName(
-    JxlEncoderFrameSettings* frame_settings, const char* frame_name);
-
-/**
- * Sets the bit depth of the input buffer.
- *
- * For float pixel formats, only the default @ref
- JXL_BIT_DEPTH_FROM_PIXEL_FORMAT
- * setting is allowed, while for unsigned pixel formats,
- * ::JXL_BIT_DEPTH_FROM_CODESTREAM setting is also allowed. See the comment
- on
- * @ref JxlEncoderAddImageFrame for the effects of the bit depth setting.
-
- * @param frame_settings set of options and metadata for this frame. Also
- * includes reference to the encoder object.
- * @param bit_depth the bit depth setting of the pixel input
- * @return ::JXL_ENC_SUCCESS on success, ::JXL_ENC_ERROR on error
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderSetFrameBitDepth(
-    JxlEncoderFrameSettings* frame_settings, const JxlBitDepth* bit_depth);
-
-/**
- * Sets the buffer to read JPEG encoded bytes from for the next frame to encode.
- *
- * If @ref JxlEncoderSetBasicInfo has not yet been called, calling
- * @ref JxlEncoderAddJPEGFrame will implicitly call it with the parameters of
- * the added JPEG frame.
- *
- * If @ref JxlEncoderSetColorEncoding or @ref JxlEncoderSetICCProfile has not
- * yet been called, calling @ref JxlEncoderAddJPEGFrame will implicitly call it
- * with the parameters of the added JPEG frame.
- *
- * If the encoder is set to store JPEG reconstruction metadata using @ref
- * JxlEncoderStoreJPEGMetadata and a single JPEG frame is added, it will be
- * possible to losslessly reconstruct the JPEG codestream.
- *
- * If this is the last frame, @ref JxlEncoderCloseInput or @ref
- * JxlEncoderCloseFrames must be called before the next
- * @ref JxlEncoderProcessOutput call.
- *
- * Note, this can only be used to add JPEG frames for lossless compression. To
- * encode with lossy compression, the JPEG must be decoded manually and a pixel
- * buffer added using JxlEncoderAddImageFrame.
- *
- * @param frame_settings set of options and metadata for this frame. Also
- * includes reference to the encoder object.
- * @param buffer bytes to read JPEG from. Owned by the caller and its contents
- * are copied internally.
- * @param size size of buffer in bytes.
- * @return ::JXL_ENC_SUCCESS on success, ::JXL_ENC_ERROR on error
- */
-JXL_EXPORT JxlEncoderStatus
-JxlEncoderAddJPEGFrame(const JxlEncoderFrameSettings* frame_settings,
-                       const uint8_t* buffer, size_t size);
-
-/**
- * Sets the buffer to read pixels from for the next image to encode. Must call
- * @ref JxlEncoderSetBasicInfo before @ref JxlEncoderAddImageFrame.
- *
- * Currently only some data types for pixel formats are supported:
- * - ::JXL_TYPE_UINT8, with range 0..255
- * - ::JXL_TYPE_UINT16, with range 0..65535
- * - ::JXL_TYPE_FLOAT16, with nominal range 0..1
- * - ::JXL_TYPE_FLOAT, with nominal range 0..1
- *
- * Note: the sample data type in pixel_format is allowed to be different from
- * what is described in the @ref JxlBasicInfo. The type in pixel_format,
- * together with an optional @ref JxlBitDepth parameter set by @ref
- * JxlEncoderSetFrameBitDepth describes the format of the uncompressed pixel
- * buffer. The bits_per_sample and exponent_bits_per_sample in the @ref
- * JxlBasicInfo describes what will actually be encoded in the JPEG XL
- * codestream. For example, to encode a 12-bit image, you would set
- * bits_per_sample to 12, while the input frame buffer can be in the following
- * formats:
- *  - if pixel format is in ::JXL_TYPE_UINT16 with default bit depth setting
- *    (i.e. ::JXL_BIT_DEPTH_FROM_PIXEL_FORMAT), input sample values are
- * rescaled to 16-bit, i.e. multiplied by 65535/4095;
- *  - if pixel format is in ::JXL_TYPE_UINT16 with @ref
- * JXL_BIT_DEPTH_FROM_CODESTREAM bit depth setting, input sample values are
- * provided unscaled;
- *  - if pixel format is in ::JXL_TYPE_FLOAT, input sample values are
- * rescaled to 0..1, i.e.  multiplied by 1.f/4095.f. While it is allowed, it is
- * obviously not recommended to use a pixel_format with lower precision than
- * what is specified in the @ref JxlBasicInfo.
- *
- * We support interleaved channels as described by the @ref JxlPixelFormat
- * "JxlPixelFormat":
- * - single-channel data, e.g. grayscale
- * - single-channel + alpha
- * - trichromatic, e.g. RGB
- * - trichromatic + alpha
- *
- * Extra channels not handled here need to be set by @ref
- * JxlEncoderSetExtraChannelBuffer.
- * If the image has alpha, and alpha is not passed here, it will implicitly be
- * set to all-opaque (an alpha value of 1.0 everywhere).
- *
- * The pixels are assumed to be encoded in the original profile that is set with
- * @ref JxlEncoderSetColorEncoding or @ref JxlEncoderSetICCProfile. If none of
- * these functions were used, the pixels are assumed to be nonlinear sRGB for
- * integer data types (::JXL_TYPE_UINT8, ::JXL_TYPE_UINT16), and linear
- * sRGB for floating point data types (::JXL_TYPE_FLOAT16, @ref
- * JXL_TYPE_FLOAT).
- *
- * Sample values in floating-point pixel formats are allowed to be outside the
- * nominal range, e.g. to represent out-of-sRGB-gamut colors in the
- * uses_original_profile=false case. They are however not allowed to be NaN or
- * +-infinity.
- *
- * If this is the last frame, @ref JxlEncoderCloseInput or @ref
- * JxlEncoderCloseFrames must be called before the next
- * @ref JxlEncoderProcessOutput call.
- *
- * @param frame_settings set of options and metadata for this frame. Also
- * includes reference to the encoder object.
- * @param pixel_format format for pixels. Object owned by the caller and its
- * contents are copied internally.
- * @param buffer buffer type to input the pixel data from. Owned by the caller
- * and its contents are copied internally.
- * @param size size of buffer in bytes. This size should match what is implied
- * by the frame dimensions and the pixel format.
- * @return ::JXL_ENC_SUCCESS on success, ::JXL_ENC_ERROR on error
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderAddImageFrame(
-    const JxlEncoderFrameSettings* frame_settings,
-    const JxlPixelFormat* pixel_format, const void* buffer, size_t size);
-
-/**
- * The @ref JxlEncoderOutputProcessor structure provides an interface for the
- * encoder's output processing. Users of the library, who want to do streaming
- * encoding, should implement the required callbacks for buffering, writing,
- * seeking (if supported), and setting a finalized position during the encoding
- * process.
- *
- * At a high level, the processor can be in one of two states:
- * - With an active buffer: This indicates that a buffer has been acquired using
- *   `get_buffer` and encoded data can be written to it.
- * - Without an active buffer: In this state, no data can be written. A new
- * buffer must be acquired after releasing any previously active buffer.
- *
- * The library will not acquire more than one buffer at a given time.
- *
- * The state of the processor includes `position` and `finalized position`,
- * which have the following meaning.
- *
- * - position: Represents the current position, in bytes, within the output
- * stream where the encoded data will be written next. This position moves
- * forward with each `release_buffer` call as data is written, and can also be
- * adjusted through the optional seek callback, if provided. At this position
- * the next write will occur.
- *
- * - finalized position:  A position in the output stream that ensures all bytes
- * before this point are finalized and won't be changed by later writes.
- *
- * All fields but `seek` are required, `seek` is optional and can be NULL.
- */
-struct JxlEncoderOutputProcessor {
-  /**
-   * Required.
-   * An opaque pointer that the client can use to store custom data.
-   * This data will be passed to the associated callback functions.
-   */
-  void* opaque;
-
-  /**
-   * Required.
-   * Acquires a buffer at the current position into which the library will write
-   * the output data.
-   *
-   * If the `size` argument points to 0 and the returned value is NULL, this
-   * will be interpreted as asking the output writing to stop. In such a case,
-   * the library will return an error. The client is expected to set the size of
-   * the returned buffer based on the suggested `size` when this function is
-   * called.
-   *
-   * @param opaque user supplied parameters to the callback
-   * @param size points to a suggested buffer size when called; must be set to
-   * the size of the returned buffer once the function returns.
-   * @return a pointer to the acquired buffer or NULL to indicate a stop
-   * condition.
-   */
-  void* (*get_buffer)(void* opaque, size_t* size);
-
-  /**
-   * Required.
-   * Notifies the user of library that the current buffer's data has been
-   * written and can be released. This function should advance the current
-   * position of the buffer by `written_bytes` number of bytes.
-   *
-   * @param opaque user supplied parameters to the callback
-   * @param written_bytes the number of bytes written to the buffer.
-   */
-  void (*release_buffer)(void* opaque, size_t written_bytes);
-
-  /**
-   * Optional, can be NULL
-   * Seeks to a specific position in the output. This function is optional and
-   * can be set to NULL if the output doesn't support seeking. Can only be done
-   * when there is no buffer. Cannot be used to seek before the finalized
-   * position.
-   *
-   * @param opaque user supplied parameters to the callback
-   * @param position the position to seek to, in bytes.
-   */
-  void (*seek)(void* opaque, uint64_t position);
-
-  /**
-   * Required.
-   * Sets a finalized position on the output data, at a specific position.
-   * Seeking will never request a position before the finalized position.
-   *
-   * Will only be called if there is no active buffer.
-   *
-   * @param opaque user supplied parameters to the callback
-   * @param finalized_position the position, in bytes, where the finalized
-   * position should be set.
-   */
-  void (*set_finalized_position)(void* opaque, uint64_t finalized_position);
-};
-
-/**
- * Sets the output processor for the encoder. This processor determines how the
- * encoder will handle buffering, writing, seeking (if supported), and
- * setting a finalized position during the encoding process.
- *
- * This should not be used when using @ref JxlEncoderProcessOutput.
- *
- * @param enc encoder object.
- * @param output_processor the struct containing the callbacks for managing
- * output.
- * @return ::JXL_ENC_SUCCESS on success, ::JXL_ENC_ERROR on error.
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderSetOutputProcessor(
-    JxlEncoder* enc, struct JxlEncoderOutputProcessor output_processor);
-
-/**
- * Flushes any buffered input in the encoder, ensuring that all available input
- * data has been processed and written to the output.
- *
- * This function can only be used after @ref JxlEncoderSetOutputProcessor.
- * Before making the last call to @ref JxlEncoderFlushInput, users should call
- * @ref JxlEncoderCloseInput to signal the end of input data.
- *
- * This should not be used when using @ref JxlEncoderProcessOutput.
- *
- * @param enc encoder object.
- * @return ::JXL_ENC_SUCCESS on success, ::JXL_ENC_ERROR on error.
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderFlushInput(JxlEncoder* enc);
-
-/**
- * This struct provides callback functions to pass pixel data in a streaming
- * manner instead of requiring the entire frame data in memory at once.
- */
-struct JxlChunkedFrameInputSource {
-  /**
-   * A pointer to any user-defined data or state. This can be used to pass
-   * information to the callback functions.
-   */
-  void* opaque;
-
-  /**
-   * Get the pixel format that color channel data will be provided in.
-   * When called, `pixel_format` points to a suggested pixel format; if
-   * color channel data can be given in this pixel format, processing might
-   * be more efficient.
-   *
-   * This function will be called exactly once, before any call to
-   * get_color_channel_at.
-   *
-   * @param opaque user supplied parameters to the callback
-   * @param pixel_format format for pixels
-   */
-  void (*get_color_channels_pixel_format)(void* opaque,
-                                          JxlPixelFormat* pixel_format);
-
-  /**
-   * Callback to retrieve a rectangle of color channel data at a specific
-   * location. It is guaranteed that xpos and ypos are multiples of 8. xsize,
-   * ysize will be multiples of 8, unless the resulting rectangle would be out
-   * of image bounds. Moreover, xsize and ysize will be at most 2048. The
-   * returned data will be assumed to be in the format returned by the
-   * (preceding) call to get_color_channels_pixel_format, except the `align`
-   * parameter of the pixel format will be ignored. Instead, the `i`-th row will
-   * be assumed to start at position `return_value + i * *row_offset`, with the
-   * value of `*row_offset` decided by the callee.
-   *
-   * Note that multiple calls to `get_color_channel_data_at` may happen before a
-   * call to `release_buffer`.
-   *
-   * @param opaque user supplied parameters to the callback
-   * @param xpos horizontal position for the data.
-   * @param ypos vertical position for the data.
-   * @param xsize horizontal size of the requested rectangle of data.
-   * @param ysize vertical size of the requested rectangle of data.
-   * @param row_offset pointer to a the byte offset between consecutive rows of
-   * the retrieved pixel data.
-   * @return pointer to the retrieved pixel data.
-   */
-  const void* (*get_color_channel_data_at)(void* opaque, size_t xpos,
-                                           size_t ypos, size_t xsize,
-                                           size_t ysize, size_t* row_offset);
-
-  /**
-   * Get the pixel format that extra channel data will be provided in.
-   * When called, `pixel_format` points to a suggested pixel format; if
-   * extra channel data can be given in this pixel format, processing might
-   * be more efficient.
-   *
-   * This function will be called exactly once per index, before any call to
-   * get_extra_channel_data_at with that given index.
-   *
-   * @param opaque user supplied parameters to the callback
-   * @param ec_index zero-indexed index of the extra channel
-   * @param pixel_format format for extra channel data
-   */
-  void (*get_extra_channel_pixel_format)(void* opaque, size_t ec_index,
-                                         JxlPixelFormat* pixel_format);
-
-  /**
-   * Callback to retrieve a rectangle of extra channel `ec_index` data at a
-   * specific location. It is guaranteed that xpos and ypos are multiples of
-   * 8. xsize, ysize will be multiples of 8, unless the resulting rectangle
-   * would be out of image bounds. Moreover, xsize and ysize will be at most
-   * 2048. The returned data will be assumed to be in the format returned by the
-   * (preceding) call to get_extra_channels_pixel_format_at with the
-   * corresponding extra channel index `ec_index`, except the `align` parameter
-   * of the pixel format will be ignored. Instead, the `i`-th row will be
-   * assumed to start at position `return_value + i * *row_offset`, with the
-   * value of `*row_offset` decided by the callee.
-   *
-   * Note that multiple calls to `get_extra_channel_data_at` may happen before a
-   * call to `release_buffer`.
-   *
-   * @param opaque user supplied parameters to the callback
-   * @param xpos horizontal position for the data.
-   * @param ypos vertical position for the data.
-   * @param xsize horizontal size of the requested rectangle of data.
-   * @param ysize vertical size of the requested rectangle of data.
-   * @param row_offset pointer to a the byte offset between consecutive rows of
-   * the retrieved pixel data.
-   * @return pointer to the retrieved pixel data.
-   */
-  const void* (*get_extra_channel_data_at)(void* opaque, size_t ec_index,
-                                           size_t xpos, size_t ypos,
-                                           size_t xsize, size_t ysize,
-                                           size_t* row_offset);
-
-  /**
-   * Releases the buffer `buf` (obtained through a call to
-   * `get_color_channel_data_at` or `get_extra_channel_data_at`). This function
-   * will be called exactly once per call to `get_color_channel_data_at` or
-   * `get_extra_channel_data_at`.
-   *
-   * @param opaque user supplied parameters to the callback
-   * @param buf pointer returned by `get_color_channel_data_at` or
-   * `get_extra_channel_data_at`
-   */
-  void (*release_buffer)(void* opaque, const void* buf);
-};
-
-/**
- * @brief Adds a frame to the encoder using a chunked input source.
- *
- * This function gives a way to encode a frame by providing pixel data in a
- * chunked or streaming manner, which can be especially useful when dealing with
- * large images that may not fit entirely in memory or when trying to optimize
- * memory usage. The input data is provided through callbacks defined in the
- * @ref JxlChunkedFrameInputSource struct. Once the frame data has been
- * completely retrieved, this function will flush the input and close it if it
- * is the last frame.
- *
- * @param frame_settings set of options and metadata for this frame. Also
- * includes reference to the encoder object.
- * @param is_last_frame indicates if this is the last frame.
- * @param chunked_frame_input struct providing callback methods for retrieving
- * pixel data in chunks.
- *
- * @return Returns a status indicating the success or failure of adding the
- * frame.
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderAddChunkedFrame(
-    const JxlEncoderFrameSettings* frame_settings, JXL_BOOL is_last_frame,
-    struct JxlChunkedFrameInputSource chunked_frame_input);
-
-/**
- * Sets the buffer to read pixels from for an extra channel at a given index.
- * The index must be smaller than the num_extra_channels in the associated
- * @ref JxlBasicInfo. Must call @ref JxlEncoderSetExtraChannelInfo before @ref
- * JxlEncoderSetExtraChannelBuffer.
- *
- * TODO(firsching): mention what data types in pixel formats are supported.
- *
- * It is required to call this function for every extra channel, except for the
- * alpha channel if that was already set through @ref JxlEncoderAddImageFrame.
- *
- * @param frame_settings set of options and metadata for this frame. Also
- * includes reference to the encoder object.
- * @param pixel_format format for pixels. Object owned by the caller and its
- * contents are copied internally. The num_channels value is ignored, since the
- * number of channels for an extra channel is always assumed to be one.
- * @param buffer buffer type to input the pixel data from. Owned by the caller
- * and its contents are copied internally.
- * @param size size of buffer in bytes. This size should match what is implied
- * by the frame dimensions and the pixel format.
- * @param index index of the extra channel to use.
- * @return ::JXL_ENC_SUCCESS on success, ::JXL_ENC_ERROR on error
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderSetExtraChannelBuffer(
-    const JxlEncoderFrameSettings* frame_settings,
-    const JxlPixelFormat* pixel_format, const void* buffer, size_t size,
-    uint32_t index);
-
-/** Adds a metadata box to the file format. @ref JxlEncoderProcessOutput must be
- * used to effectively write the box to the output. @ref JxlEncoderUseBoxes must
- * be enabled before using this function.
- *
- * Boxes allow inserting application-specific data and metadata (Exif, XML/XMP,
- * JUMBF and user defined boxes).
- *
- * The box format follows ISO BMFF and shares features and box types with other
- * image and video formats, including the Exif, XML and JUMBF boxes. The box
- * format for JPEG XL is specified in ISO/IEC 18181-2.
- *
- * Boxes in general don't contain other boxes inside, except a JUMBF superbox.
- * Boxes follow each other sequentially and are byte-aligned. If the container
- * format is used, the JXL stream consists of concatenated boxes.
- * It is also possible to use a direct codestream without boxes, but in that
- * case metadata cannot be added.
- *
- * Each box generally has the following byte structure in the file:
- * - 4 bytes: box size including box header (Big endian. If set to 0, an
- *   8-byte 64-bit size follows instead).
- * - 4 bytes: type, e.g. "JXL " for the signature box, "jxlc" for a codestream
- *   box.
- * - N bytes: box contents.
- *
- * Only the box contents are provided to the contents argument of this function,
- * the encoder encodes the size header itself. Most boxes are written
- * automatically by the encoder as needed ("JXL ", "ftyp", "jxll", "jxlc",
- * "jxlp", "jxli", "jbrd"), and this function only needs to be called to add
- * optional metadata when encoding from pixels (using @ref
- * JxlEncoderAddImageFrame). When recompressing JPEG files (using @ref
- * JxlEncoderAddJPEGFrame), if the input JPEG contains EXIF, XMP or JUMBF
- * metadata, the corresponding boxes are already added automatically.
- *
- * Box types are given by 4 characters. The following boxes can be added with
- * this function:
- * - "Exif": a box with EXIF metadata, can be added by libjxl users, or is
- *   automatically added when needed for JPEG reconstruction. The contents of
- *   this box must be prepended by a 4-byte tiff header offset, which may
- *   be 4 zero bytes in case the tiff header follows immediately.
- *   The EXIF metadata must be in sync with what is encoded in the JPEG XL
- *   codestream, specifically the image orientation. While this is not
- *   recommended in practice, in case of conflicting metadata, the JPEG XL
- *   codestream takes precedence.
- * - "xml ": a box with XML data, in particular XMP metadata, can be added by
- *   libjxl users, or is automatically added when needed for JPEG reconstruction
- * - "jumb": a JUMBF superbox, which can contain boxes with different types of
- *   metadata inside. This box type can be added by the encoder transparently,
- *   and other libraries to create and handle JUMBF content exist.
- * - Application-specific boxes. Their typename should not begin with "jxl" or
- *   "JXL" or conflict with other existing typenames, and they should be
- *   registered with MP4RA (mp4ra.org).
- *
- * These boxes can be stored uncompressed or Brotli-compressed (using a "brob"
- * box), depending on the compress_box parameter.
- *
- * @param enc encoder object.
- * @param type the box type, e.g. "Exif" for EXIF metadata, "xml " for XMP or
- * IPTC metadata, "jumb" for JUMBF metadata.
- * @param contents the full contents of the box, for example EXIF
- * data. ISO BMFF box header must not be included, only the contents. Owned by
- * the caller and its contents are copied internally.
- * @param size size of the box contents.
- * @param compress_box Whether to compress this box as a "brob" box. Requires
- * Brotli support.
- * @return ::JXL_ENC_SUCCESS on success, ::JXL_ENC_ERROR on error, such as
- * when using this function without @ref JxlEncoderUseContainer, or adding a box
- * type that would result in an invalid file format.
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderAddBox(JxlEncoder* enc,
-                                             const JxlBoxType type,
-                                             const uint8_t* contents,
-                                             size_t size,
-                                             JXL_BOOL compress_box);
-
-/**
- * Indicates the intention to add metadata boxes. This allows @ref
- * JxlEncoderAddBox to be used. When using this function, then it is required
- * to use @ref JxlEncoderCloseBoxes at the end.
- *
- * By default the encoder assumes no metadata boxes will be added.
- *
- * This setting can only be set at the beginning, before encoding starts.
- *
- * @param enc encoder object.
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderUseBoxes(JxlEncoder* enc);
-
-/**
- * Declares that no further boxes will be added with @ref JxlEncoderAddBox.
- * This function must be called after the last box is added so the encoder knows
- * the stream will be finished. It is not necessary to use this function if
- * @ref JxlEncoderUseBoxes is not used. Further frames may still be added.
- *
- * Must be called between @ref JxlEncoderAddBox of the last box
- * and the next call to @ref JxlEncoderProcessOutput, or @ref
- * JxlEncoderProcessOutput won't output the last box correctly.
- *
- * NOTE: if you don't need to close frames and boxes at separate times, you can
- * use @ref JxlEncoderCloseInput instead to close both at once.
- *
- * @param enc encoder object.
- */
-JXL_EXPORT void JxlEncoderCloseBoxes(JxlEncoder* enc);
-
-/**
- * Declares that no frames will be added and @ref JxlEncoderAddImageFrame and
- * @ref JxlEncoderAddJPEGFrame won't be called anymore. Further metadata boxes
- * may still be added. This function or @ref JxlEncoderCloseInput must be called
- * after adding the last frame and the next call to
- * @ref JxlEncoderProcessOutput, or the frame won't be properly marked as last.
- *
- * NOTE: if you don't need to close frames and boxes at separate times, you can
- * use @ref JxlEncoderCloseInput instead to close both at once.
- *
- * @param enc encoder object.
- */
-JXL_EXPORT void JxlEncoderCloseFrames(JxlEncoder* enc);
-
-/**
- * Closes any input to the encoder, equivalent to calling @ref
- * JxlEncoderCloseFrames as well as calling @ref JxlEncoderCloseBoxes if needed.
- * No further input of any kind may be given to the encoder, but further @ref
- * JxlEncoderProcessOutput calls should be done to create the final output.
- *
- * The requirements of both @ref JxlEncoderCloseFrames and @ref
- * JxlEncoderCloseBoxes apply to this function. Either this function or the
- * other two must be called after the final frame and/or box, and the next
- * @ref JxlEncoderProcessOutput call, or the codestream won't be encoded
- * correctly.
- *
- * @param enc encoder object.
- */
-JXL_EXPORT void JxlEncoderCloseInput(JxlEncoder* enc);
-
-/**
- * Sets the original color encoding of the image encoded by this encoder. This
- * is an alternative to @ref JxlEncoderSetICCProfile and only one of these two
- * must be used. This one sets the color encoding as a @ref JxlColorEncoding,
- * while the other sets it as ICC binary data. Must be called after @ref
- * JxlEncoderSetBasicInfo.
- *
- * @param enc encoder object.
- * @param color color encoding. Object owned by the caller and its contents are
- * copied internally.
- * @return ::JXL_ENC_SUCCESS if the operation was successful, @ref
- * JXL_ENC_ERROR otherwise
- */
-JXL_EXPORT JxlEncoderStatus
-JxlEncoderSetColorEncoding(JxlEncoder* enc, const JxlColorEncoding* color);
-
-/**
- * Sets the original color encoding of the image encoded by this encoder as an
- * ICC color profile. This is an alternative to @ref JxlEncoderSetColorEncoding
- * and only one of these two must be used. This one sets the color encoding as
- * ICC binary data, while the other defines it as a @ref JxlColorEncoding. Must
- * be called after @ref JxlEncoderSetBasicInfo.
- *
- * @param enc encoder object.
- * @param icc_profile bytes of the original ICC profile
- * @param size size of the icc_profile buffer in bytes
- * @return ::JXL_ENC_SUCCESS if the operation was successful, @ref
- * JXL_ENC_ERROR otherwise
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderSetICCProfile(JxlEncoder* enc,
-                                                    const uint8_t* icc_profile,
-                                                    size_t size);
-
-/**
- * Initializes a @ref JxlBasicInfo struct to default values.
- * For forwards-compatibility, this function has to be called before values
- * are assigned to the struct fields.
- * The default values correspond to an 8-bit RGB image, no alpha or any
- * other extra channels.
- *
- * @param info global image metadata. Object owned by the caller.
- */
-JXL_EXPORT void JxlEncoderInitBasicInfo(JxlBasicInfo* info);
-
-/**
- * Initializes a @ref JxlFrameHeader struct to default values.
- * For forwards-compatibility, this function has to be called before values
- * are assigned to the struct fields.
- * The default values correspond to a frame with no animation duration and the
- * 'replace' blend mode. After using this function, For animation duration must
- * be set, for composite still blend settings must be set.
- *
- * @param frame_header frame metadata. Object owned by the caller.
- */
-JXL_EXPORT void JxlEncoderInitFrameHeader(JxlFrameHeader* frame_header);
-
-/**
- * Initializes a @ref JxlBlendInfo struct to default values.
- * For forwards-compatibility, this function has to be called before values
- * are assigned to the struct fields.
- *
- * @param blend_info blending info. Object owned by the caller.
- */
-JXL_EXPORT void JxlEncoderInitBlendInfo(JxlBlendInfo* blend_info);
-
-/**
- * Sets the global metadata of the image encoded by this encoder.
- *
- * If the @ref JxlBasicInfo contains information of extra channels beyond an
- * alpha channel, then @ref JxlEncoderSetExtraChannelInfo must be called between
- * @ref JxlEncoderSetBasicInfo and @ref JxlEncoderAddImageFrame. In order to
- * indicate extra channels, the value of `info.num_extra_channels` should be set
- * to the number of extra channels, also counting the alpha channel if present.
- *
- * @param enc encoder object.
- * @param info global image metadata. Object owned by the caller and its
- * contents are copied internally.
- * @return ::JXL_ENC_SUCCESS if the operation was successful,
- * ::JXL_ENC_ERROR otherwise
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderSetBasicInfo(JxlEncoder* enc,
-                                                   const JxlBasicInfo* info);
-
-/**
- * Sets the upsampling method the decoder will use in case there are frames
- * with ::JXL_ENC_FRAME_SETTING_RESAMPLING set. This is useful in combination
- * with the ::JXL_ENC_FRAME_SETTING_ALREADY_DOWNSAMPLED option, to control
- * the type of upsampling that will be used.
- *
- * @param enc encoder object.
- * @param factor upsampling factor to configure (1, 2, 4 or 8; for 1 this
- * function has no effect at all)
- * @param mode upsampling mode to use for this upsampling:
- * -1: default (good for photographic images, no signaling overhead)
- * 0: nearest neighbor (good for pixel art)
- * 1: 'pixel dots' (same as NN for 2x, diamond-shaped 'pixel dots' for 4x/8x)
- * @return ::JXL_ENC_SUCCESS if the operation was successful,
- * ::JXL_ENC_ERROR otherwise
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderSetUpsamplingMode(JxlEncoder* enc,
-                                                        int64_t factor,
-                                                        int64_t mode);
-
-/**
- * Initializes a @ref JxlExtraChannelInfo struct to default values.
- * For forwards-compatibility, this function has to be called before values
- * are assigned to the struct fields.
- * The default values correspond to an 8-bit channel of the provided type.
- *
- * @param type type of the extra channel.
- * @param info global extra channel metadata. Object owned by the caller and its
- * contents are copied internally.
- */
-JXL_EXPORT void JxlEncoderInitExtraChannelInfo(JxlExtraChannelType type,
-                                               JxlExtraChannelInfo* info);
-
-/**
- * Sets information for the extra channel at the given index. The index
- * must be smaller than num_extra_channels in the associated @ref JxlBasicInfo.
- *
- * @param enc encoder object
- * @param index index of the extra channel to set.
- * @param info global extra channel metadata. Object owned by the caller and its
- * contents are copied internally.
- * @return ::JXL_ENC_SUCCESS on success, ::JXL_ENC_ERROR on error
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderSetExtraChannelInfo(
-    JxlEncoder* enc, size_t index, const JxlExtraChannelInfo* info);
-
-/**
- * Sets the name for the extra channel at the given index in UTF-8. The index
- * must be smaller than the num_extra_channels in the associated @ref
- * JxlBasicInfo.
- *
- * TODO(lode): remove size parameter for consistency with
- * @ref JxlEncoderSetFrameName
- *
- * @param enc encoder object
- * @param index index of the extra channel to set.
- * @param name buffer with the name of the extra channel.
- * @param size size of the name buffer in bytes, not counting the terminating
- * character.
- * @return JXL_ENC_SUCCESS on success, JXL_ENC_ERROR on error
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderSetExtraChannelName(JxlEncoder* enc,
-                                                          size_t index,
-                                                          const char* name,
-                                                          size_t size);
-
-/**
- * Sets a frame-specific option of integer type to the encoder options.
- * The @ref JxlEncoderFrameSettingId argument determines which option is set.
- *
- * @param frame_settings set of options and metadata for this frame. Also
- * includes reference to the encoder object.
- * @param option ID of the option to set.
- * @param value Integer value to set for this option.
- * @return ::JXL_ENC_SUCCESS if the operation was successful, @ref
- * JXL_ENC_ERROR in case of an error, such as invalid or unknown option id, or
- * invalid integer value for the given option. If an error is returned, the
- * state of the
- * @ref JxlEncoderFrameSettings object is still valid and is the same as before
- * this function was called.
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderFrameSettingsSetOption(
-    JxlEncoderFrameSettings* frame_settings, JxlEncoderFrameSettingId option,
-    int64_t value);
-
-/**
- * Sets a frame-specific option of float type to the encoder options.
- * The @ref JxlEncoderFrameSettingId argument determines which option is set.
- *
- * @param frame_settings set of options and metadata for this frame. Also
- * includes reference to the encoder object.
- * @param option ID of the option to set.
- * @param value Float value to set for this option.
- * @return ::JXL_ENC_SUCCESS if the operation was successful, @ref
- * JXL_ENC_ERROR in case of an error, such as invalid or unknown option id, or
- * invalid integer value for the given option. If an error is returned, the
- * state of the
- * @ref JxlEncoderFrameSettings object is still valid and is the same as before
- * this function was called.
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderFrameSettingsSetFloatOption(
-    JxlEncoderFrameSettings* frame_settings, JxlEncoderFrameSettingId option,
-    float value);
-
-/** Forces the encoder to use the box-based container format (BMFF) even
- * when not necessary.
- *
- * When using @ref JxlEncoderUseBoxes, @ref JxlEncoderStoreJPEGMetadata or @ref
- * JxlEncoderSetCodestreamLevel with level 10, the encoder will automatically
- * also use the container format, it is not necessary to use
- * @ref JxlEncoderUseContainer for those use cases.
- *
- * By default this setting is disabled.
- *
- * This setting can only be set at the beginning, before encoding starts.
- *
- * @param enc encoder object.
- * @param use_container true if the encoder should always output the JPEG XL
- * container format, false to only output it when necessary.
- * @return JXL_ENC_SUCCESS if the operation was successful, JXL_ENC_ERROR
- * otherwise.
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderUseContainer(JxlEncoder* enc,
-                                                   JXL_BOOL use_container);
-
-/**
- * Configure the encoder to store JPEG reconstruction metadata in the JPEG XL
- * container.
- *
- * If this is set to true and a single JPEG frame is added, it will be
- * possible to losslessly reconstruct the JPEG codestream.
- *
- * This setting can only be set at the beginning, before encoding starts.
- *
- * @param enc encoder object.
- * @param store_jpeg_metadata true if the encoder should store JPEG metadata.
- * @return ::JXL_ENC_SUCCESS if the operation was successful, @ref
- * JXL_ENC_ERROR otherwise.
- */
-JXL_EXPORT JxlEncoderStatus
-JxlEncoderStoreJPEGMetadata(JxlEncoder* enc, JXL_BOOL store_jpeg_metadata);
-
-/** Sets the feature level of the JPEG XL codestream. Valid values are 5 and
- * 10, or -1 (to choose automatically). Using the minimum required level, or
- * level 5 in most cases, is recommended for compatibility with all decoders.
- *
- * Level 5: for end-user image delivery, this level is the most widely
- * supported level by image decoders and the recommended level to use unless a
- * level 10 feature is absolutely necessary. Supports a maximum resolution
- * 268435456 pixels total with a maximum width or height of 262144 pixels,
- * maximum 16-bit color channel depth, maximum 120 frames per second for
- * animation, maximum ICC color profile size of 4 MiB, it allows all color
- * models and extra channel types except CMYK and the JXL_CHANNEL_BLACK
- * extra channel, and a maximum of 4 extra channels in addition to the 3 color
- * channels. It also sets boundaries to certain internally used coding tools.
- *
- * Level 10: this level removes or increases the bounds of most of the level
- * 5 limitations, allows CMYK color and up to 32 bits per color channel, but
- * may be less widely supported.
- *
- * The default value is -1. This means the encoder will automatically choose
- * between level 5 and level 10 based on what information is inside the @ref
- * JxlBasicInfo structure. Do note that some level 10 features, particularly
- * those used by animated JPEG XL codestreams, might require level 10, even
- * though the @ref JxlBasicInfo only suggests level 5. In this case, the level
- * must be explicitly set to 10, otherwise the encoder will return an error.
- * The encoder will restrict internal encoding choices to those compatible with
- * the level setting.
- *
- * This setting can only be set at the beginning, before encoding starts.
- *
- * @param enc encoder object.
- * @param level the level value to set, must be -1, 5, or 10.
- * @return ::JXL_ENC_SUCCESS if the operation was successful, @ref
- * JXL_ENC_ERROR otherwise.
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderSetCodestreamLevel(JxlEncoder* enc,
-                                                         int level);
-
-/** Returns the codestream level required to support the currently configured
- * settings and basic info. This function can only be used at the beginning,
- * before encoding starts, but after setting basic info.
- *
- * This does not support per-frame settings, only global configuration, such as
- * the image dimensions, that are known at the time of writing the header of
- * the JPEG XL file.
- *
- * If this returns 5, nothing needs to be done and the codestream can be
- * compatible with any decoder. If this returns 10, @ref
- * JxlEncoderSetCodestreamLevel has to be used to set the codestream level to
- * 10, or the encoder can be configured differently to allow using the more
- * compatible level 5.
- *
- * @param enc encoder object.
- * @return -1 if no level can support the configuration (e.g. image dimensions
- * larger than even level 10 supports), 5 if level 5 is supported, 10 if setting
- * the codestream level to 10 is required.
- *
- */
-JXL_EXPORT int JxlEncoderGetRequiredCodestreamLevel(const JxlEncoder* enc);
-
-/**
- * Enables lossless encoding.
- *
- * This is not an option like the others on itself, but rather while enabled it
- * overrides a set of existing options (such as distance, modular mode and
- * color transform) that enables bit-for-bit lossless encoding.
- *
- * When disabled, those options are not overridden, but since those options
- * could still have been manually set to a combination that operates losslessly,
- * using this function with lossless set to ::JXL_FALSE does not
- * guarantee lossy encoding, though the default set of options is lossy.
- *
- * @param frame_settings set of options and metadata for this frame. Also
- * includes reference to the encoder object.
- * @param lossless whether to override options for lossless mode
- * @return ::JXL_ENC_SUCCESS if the operation was successful, @ref
- * JXL_ENC_ERROR otherwise.
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderSetFrameLossless(
-    JxlEncoderFrameSettings* frame_settings, JXL_BOOL lossless);
-
-/**
- * Sets the distance level for lossy compression: target max butteraugli
- * distance, lower = higher quality. Range: 0 .. 25.
- * 0.0 = mathematically lossless (however, use @ref JxlEncoderSetFrameLossless
- * instead to use true lossless, as setting distance to 0 alone is not the only
- * requirement). 1.0 = visually lossless. Recommended range: 0.5 .. 3.0. Default
- * value: 1.0.
- *
- * @param frame_settings set of options and metadata for this frame. Also
- * includes reference to the encoder object.
- * @param distance the distance value to set.
- * @return ::JXL_ENC_SUCCESS if the operation was successful, @ref
- * JXL_ENC_ERROR otherwise.
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderSetFrameDistance(
-    JxlEncoderFrameSettings* frame_settings, float distance);
-
-/**
- * Sets the distance level for lossy compression of extra channels.
- * The distance is as in @ref JxlEncoderSetFrameDistance (lower = higher
- * quality). If not set, or if set to the special value -1, the distance that
- * was set with
- * @ref JxlEncoderSetFrameDistance will be used.
- *
- * @param frame_settings set of options and metadata for this frame. Also
- * includes reference to the encoder object.
- * @param index index of the extra channel to set a distance value for.
- * @param distance the distance value to set.
- * @return ::JXL_ENC_SUCCESS if the operation was successful, @ref
- * JXL_ENC_ERROR otherwise.
- */
-JXL_EXPORT JxlEncoderStatus JxlEncoderSetExtraChannelDistance(
-    JxlEncoderFrameSettings* frame_settings, size_t index, float distance);
-
-/**
- * Maps JPEG-style quality factor to distance.
- *
- * This function takes in input a JPEG-style quality factor `quality` and
- * produces as output a `distance` value suitable to be used with @ref
- * JxlEncoderSetFrameDistance and @ref JxlEncoderSetExtraChannelDistance.
- *
- * The `distance` value influences the level of compression, with lower values
- * indicating higher quality:
- * - 0.0 implies lossless compression (however, note that calling @ref
- * JxlEncoderSetFrameLossless is required).
- * - 1.0 represents a visually lossy compression, which is also the default
- * setting.
- *
- * The `quality` parameter, ranging up to 100, is inversely related to
- * 'distance':
- * - A `quality` of 100.0 maps to a `distance` of 0.0 (lossless).
- * - A `quality` of 90.0 corresponds to a `distance` of 1.0.
- *
- * Recommended Range:
- * - `distance`: 0.5 to 3.0.
- * - corresponding `quality`: approximately 96 to 68.
- *
- * Allowed Range:
- * - `distance`: 0.0 to 25.0.
- * - corresponding `quality`: 100.0 to 0.0.
- *
- * Note: the `quality` parameter has no consistent psychovisual meaning
- * across different codecs and libraries. Using the mapping defined by @ref
- * JxlEncoderDistanceFromQuality will result in a visual quality roughly
- * equivalent to what would be obtained with `libjpeg-turbo` with the same
- * `quality` parameter, but that is by no means guaranteed; do not assume that
- * the same quality value will result in similar file sizes and image quality
- * across different codecs.
- */
-JXL_EXPORT float JxlEncoderDistanceFromQuality(float quality);
-
-/**
- * Create a new set of encoder options, with all values initially copied from
- * the @p source options, or set to default if @p source is NULL.
- *
- * The returned pointer is an opaque struct tied to the encoder and it will be
- * deallocated by the encoder when @ref JxlEncoderDestroy() is called. For
- * functions taking both a @ref JxlEncoder and a @ref JxlEncoderFrameSettings,
- * only @ref JxlEncoderFrameSettings created with this function for the same
- * encoder instance can be used.
- *
- * @param enc encoder object.
- * @param source source options to copy initial values from, or NULL to get
- * defaults initialized to defaults.
- * @return the opaque struct pointer identifying a new set of encoder options.
- */
-JXL_EXPORT JxlEncoderFrameSettings* JxlEncoderFrameSettingsCreate(
-    JxlEncoder* enc, const JxlEncoderFrameSettings* source);
-
-/**
- * Sets a color encoding to be sRGB.
- *
- * @param color_encoding color encoding instance.
- * @param is_gray whether the color encoding should be gray scale or color.
- */
-JXL_EXPORT void JxlColorEncodingSetToSRGB(JxlColorEncoding* color_encoding,
-                                          JXL_BOOL is_gray);
-
-/**
- * Sets a color encoding to be linear sRGB.
- *
- * @param color_encoding color encoding instance.
- * @param is_gray whether the color encoding should be gray scale or color.
- */
-JXL_EXPORT void JxlColorEncodingSetToLinearSRGB(
-    JxlColorEncoding* color_encoding, JXL_BOOL is_gray);
-
-/**
- * Enables usage of expert options.
- *
- * At the moment, the only expert option is setting an effort value of 11,
- * which gives the best compression for pixel-lossless modes but is very slow.
- *
- * @param enc encoder object.
- */
-JXL_EXPORT void JxlEncoderAllowExpertOptions(JxlEncoder* enc);
-
-/**
- * Function type for @ref JxlEncoderSetDebugImageCallback.
- *
- * The callback may be called simultaneously by different threads when using a
- * threaded parallel runner, on different debug images.
- *
- * @param opaque optional user data, as given to @ref
- *   JxlEncoderSetDebugImageCallback.
- * @param label label of debug image, can be used in filenames
- * @param xsize width of debug image
- * @param ysize height of debug image
- * @param color color encoding of debug image
- * @param pixels pixel data of debug image as big-endian 16-bit unsigned
- *   samples. The memory is not owned by the user, and is only valid during the
- *   time the callback is running.
- */
-typedef void (*JxlDebugImageCallback)(void* opaque, const char* label,
-                                      size_t xsize, size_t ysize,
-                                      const JxlColorEncoding* color,
-                                      const uint16_t* pixels);
-
-/**
- * Sets the given debug image callback that will be used by the encoder to
- * output various debug images during encoding.
- *
- * This only has any effect if the encoder was compiled with the appropriate
- * debug build flags.
- *
- * @param frame_settings set of options and metadata for this frame. Also
- * includes reference to the encoder object.
- * @param callback used to return the debug image
- * @param opaque user supplied parameter to the image callback
- */
-JXL_EXPORT void JxlEncoderSetDebugImageCallback(
-    JxlEncoderFrameSettings* frame_settings, JxlDebugImageCallback callback,
-    void* opaque);
-
-/**
- * Sets the given stats object for gathering various statistics during encoding.
- *
- * This only has any effect if the encoder was compiled with the appropriate
- * debug build flags.
- *
- * @param frame_settings set of options and metadata for this frame. Also
- * includes reference to the encoder object.
- * @param stats object that can be used to query the gathered stats (created
- *   by @ref JxlEncoderStatsCreate)
- */
-JXL_EXPORT void JxlEncoderCollectStats(JxlEncoderFrameSettings* frame_settings,
-                                       JxlEncoderStats* stats);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* JXL_ENCODE_H_ */
-
-/** @}*/
diff --git a/third_party/jpeg-xl/lib/include/jxl/encode_cxx.h b/third_party/jpeg-xl/lib/include/jxl/encode_cxx.h
deleted file mode 100644
index 8e552357ac1c5..0000000000000
--- a/third_party/jpeg-xl/lib/include/jxl/encode_cxx.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/// @addtogroup libjxl_cpp
-///@{
-///
-/// @file encode_cxx.h
-/// @brief C++ header-only helper for @ref encode.h.
-///
-/// There's no binary library associated with the header since this is a header
-/// only library.
-
-#ifndef JXL_ENCODE_CXX_H_
-#define JXL_ENCODE_CXX_H_
-
-#include <jxl/encode.h>
-#include <jxl/memory_manager.h>
-
-#include <memory>
-
-#ifndef __cplusplus
-#error "This a C++ only header. Use jxl/encode.h from C sources."
-#endif
-
-/// Struct to call JxlEncoderDestroy from the JxlEncoderPtr unique_ptr.
-struct JxlEncoderDestroyStruct {
-  /// Calls @ref JxlEncoderDestroy() on the passed encoder.
-  void operator()(JxlEncoder* encoder) { JxlEncoderDestroy(encoder); }
-};
-
-/// std::unique_ptr<> type that calls JxlEncoderDestroy() when releasing the
-/// encoder.
-///
-/// Use this helper type from C++ sources to ensure the encoder is destroyed and
-/// their internal resources released.
-typedef std::unique_ptr<JxlEncoder, JxlEncoderDestroyStruct> JxlEncoderPtr;
-
-/// Creates an instance of JxlEncoder into a JxlEncoderPtr and initializes it.
-///
-/// This function returns a unique_ptr that will call JxlEncoderDestroy() when
-/// releasing the pointer. See @ref JxlEncoderCreate for details on the
-/// instance creation.
-///
-/// @param memory_manager custom allocator function. It may be NULL. The memory
-///        manager will be copied internally.
-/// @return a @c NULL JxlEncoderPtr if the instance can not be allocated or
-///         initialized
-/// @return initialized JxlEncoderPtr instance otherwise.
-static inline JxlEncoderPtr JxlEncoderMake(
-    const JxlMemoryManager* memory_manager) {
-  return JxlEncoderPtr(JxlEncoderCreate(memory_manager));
-}
-
-#endif  // JXL_ENCODE_CXX_H_
-
-/// @}
diff --git a/third_party/jpeg-xl/lib/include/jxl/gain_map.h b/third_party/jpeg-xl/lib/include/jxl/gain_map.h
deleted file mode 100644
index e1b314b56cbd9..0000000000000
--- a/third_party/jpeg-xl/lib/include/jxl/gain_map.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Copyright (c) the JPEG XL Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
- */
-
-/** @addtogroup libjxl_metadata
- * @{
- * @file gain_map.h
- * @brief Utility functions to manipulate jhgm (gain map) boxes.
- */
-
-#ifndef JXL_GAIN_MAP_H_
-#define JXL_GAIN_MAP_H_
-
-#include <jxl/color_encoding.h>
-#include <jxl/jxl_export.h>
-#include <jxl/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Gain map bundle
- *
- * This structure is used to serialize gain map data to and from an input
- * buffer. It holds pointers to sections within the buffer, and different parts
- * of the gain map data such as metadata, ICC profile data, and the gain map
- * itself.
- *
- * The pointers in this structure do not take ownership of the memory they point
- * to. Instead, they reference specific locations within the provided buffer. It
- * is the caller's responsibility to ensure that the buffer remains valid and is
- * not deallocated as long as these pointers are in use. The structure should be
- * considered as providing a view into the buffer, not as an owner of the data.
- */
-typedef struct {
-  /** Version number of the gain map bundle. */
-  uint8_t jhgm_version;
-  /** Size of the gain map metadata in bytes. */
-  uint16_t gain_map_metadata_size;
-  /** Pointer to the gain map metadata, which is a binary
-   * blob following ISO 21496-1. This pointer references data within the input
-   * buffer. */
-  const uint8_t* gain_map_metadata;
-  /** Indicates whether a color encoding is present. */
-  JXL_BOOL has_color_encoding;
-  /** If has_color_encoding is true, this field contains the
-   *        uncompressed color encoding data. */
-  JxlColorEncoding color_encoding;
-  /** Size of the alternative ICC profile in bytes (compressed
-   * size). */
-  uint32_t alt_icc_size;
-  /** Pointer to the compressed ICC profile. This pointer references
-   * data within the input buffer. */
-  const uint8_t* alt_icc;
-  /** Size of the gain map in bytes. */
-  uint32_t gain_map_size;
-  /** Pointer to the gain map data, which is a JPEG XL naked
-   * codestream. This pointer references data within the input buffer.*/
-  const uint8_t* gain_map;
-} JxlGainMapBundle;
-
-/**
- * Calculates the total size required to serialize the gain map bundle into a
- * binary buffer. This function accounts for all the necessary space to
- * serialize fields such as gain map metadata, color encoding, compressed ICC
- * profile data, and the gain map itself.
- *
- * @param[in] map_bundle Pointer to the JxlGainMapBundle containing all
- * necessary data to compute the size.
- * @param[out] bundle_size The size in bytes required to serialize the bundle.
- * @return Whether setting the size was successful.
- */
-JXL_EXPORT JXL_BOOL JxlGainMapGetBundleSize(const JxlGainMapBundle* map_bundle,
-                                            size_t* bundle_size);
-
-/**
- * Serializes the gain map bundle into a preallocated buffer. The function
- * ensures that all parts of the bundle such as metadata, color encoding,
- * compressed ICC profile, and the gain map are correctly encoded into the
- * buffer. First call `JxlGainMapGetBundleSize` to get the size needed for
- * the buffer.
- *
- * @param[in] map_bundle Pointer to the `JxlGainMapBundle` to serialize.
- * @param[out] output_buffer Pointer to the buffer where the serialized data
- * will be written.
- * @param[in] output_buffer_size The size of the output buffer in bytes. Must be
- * large enough to hold the entire serialized data.
- * @param[out] bytes_written The number of bytes written to the output buffer.
- * @return Whether writing the bundle was successful.
- */
-JXL_EXPORT JXL_BOOL JxlGainMapWriteBundle(const JxlGainMapBundle* map_bundle,
-                                          uint8_t* output_buffer,
-                                          size_t output_buffer_size,
-                                          size_t* bytes_written);
-
-/**
- * Deserializes a gain map bundle from a provided buffer and populates a
- * `JxlGainMapBundle` structure with the data extracted. This function assumes
- * the buffer contains a valid serialized gain map bundle. After successful
- * execution, the `JxlGainMapBundle` structure will reference three different
- * sections within the buffer:
- *  - gain_map_metadata
- *  - alt_icc
- *  - gain_map
- * These sections will be accompanied by their respective sizes. Users must
- * ensure that the buffer remains valid as long as these pointers are in use.
- * @param[in,out] map_bundle Pointer to a preallocated `JxlGainMapBundle` where
- * the deserialized data will be stored.
- * @param[in] input_buffer Pointer to the buffer containing the serialized gain
- * map bundle data.
- * @param[in] input_buffer_size The size of the input buffer in bytes.
- * @param[out] bytes_read The number of bytes read from the input buffer.
- * @return Whether reading the bundle was successful.
- */
-JXL_EXPORT JXL_BOOL JxlGainMapReadBundle(JxlGainMapBundle* map_bundle,
-                                         const uint8_t* input_buffer,
-                                         size_t input_buffer_size,
-                                         size_t* bytes_read);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* JXL_GAIN_MAP_H_ */
-
-/** @} */
diff --git a/third_party/jpeg-xl/lib/include/jxl/memory_manager.h b/third_party/jpeg-xl/lib/include/jxl/memory_manager.h
deleted file mode 100644
index 05b4abe90b520..0000000000000
--- a/third_party/jpeg-xl/lib/include/jxl/memory_manager.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright (c) the JPEG XL Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
- */
-
-/** @addtogroup libjxl_common
- * @{
- * @file memory_manager.h
- * @brief Abstraction functions used by JPEG XL to allocate memory.
- */
-
-#ifndef JXL_MEMORY_MANAGER_H_
-#define JXL_MEMORY_MANAGER_H_
-
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Allocating function for a memory region of a given size.
- *
- * Allocates a contiguous memory region of size @p size bytes. The returned
- * memory may not be aligned to a specific size or initialized at all.
- *
- * @param opaque custom memory manager handle provided by the caller.
- * @param size in bytes of the requested memory region.
- * @return @c NULL if the memory can not be allocated,
- * @return pointer to the memory otherwise.
- */
-typedef void* (*jpegxl_alloc_func)(void* opaque, size_t size);
-
-/**
- * Deallocating function pointer type.
- *
- * This function @b MUST do nothing if @p address is @c NULL.
- *
- * @param opaque custom memory manager handle provided by the caller.
- * @param address memory region pointer returned by ::jpegxl_alloc_func, or @c
- * NULL.
- */
-typedef void (*jpegxl_free_func)(void* opaque, void* address);
-
-/**
- * Memory Manager struct.
- * These functions, when provided by the caller, will be used to handle memory
- * allocations.
- */
-typedef struct JxlMemoryManagerStruct {
-  /** The opaque pointer that will be passed as the first parameter to all the
-   * functions in this struct. */
-  void* opaque;
-
-  /** Memory allocation function. This can be NULL if and only if also the
-   * free() member in this class is NULL. All dynamic memory will be allocated
-   * and freed with these functions if they are not NULL, otherwise with the
-   * standard malloc/free. */
-  jpegxl_alloc_func alloc;
-  /** Free function matching the alloc() member. */
-  jpegxl_free_func free;
-
-  /* TODO(deymo): Add cache-aligned alloc/free functions here. */
-} JxlMemoryManager;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* JXL_MEMORY_MANAGER_H_ */
-
-/** @}*/
diff --git a/third_party/jpeg-xl/lib/include/jxl/parallel_runner.h b/third_party/jpeg-xl/lib/include/jxl/parallel_runner.h
deleted file mode 100644
index 742f9598e90a5..0000000000000
--- a/third_party/jpeg-xl/lib/include/jxl/parallel_runner.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/* Copyright (c) the JPEG XL Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
- */
-
-/** @addtogroup libjxl_threads
- *  @{
- */
-/**
- * @file parallel_runner.h
- */
-
-/** API for running data operations in parallel in a multi-threaded environment.
- * This module allows the JPEG XL caller to define their own way of creating and
- * assigning threads.
- *
- * The JxlParallelRunner function type defines a parallel data processing
- * runner that may be implemented by the caller to allow the library to process
- * in multiple threads. The multi-threaded processing in this library only
- * requires to run the same function over each number of a range, possibly
- * running each call in a different thread. The JPEG XL caller is responsible
- * for implementing this logic using the thread APIs available in their system.
- * For convenience, a C++ implementation based on std::thread is provided in
- * jpegxl/parallel_runner_thread.h (part of the jpegxl_threads library).
- *
- * Thread pools usually store small numbers of heterogeneous tasks in a queue.
- * When tasks are identical or differ only by an integer input parameter, it is
- * much faster to store just one function of an integer parameter and call it
- * for each value. Conventional vector-of-tasks can be run in parallel using a
- * lambda function adapter that simply calls task_funcs[task].
- *
- * If no multi-threading is desired, a @c NULL value of JxlParallelRunner
- * will use an internal implementation without multi-threading.
- */
-
-#ifndef JXL_PARALLEL_RUNNER_H_
-#define JXL_PARALLEL_RUNNER_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Return code used in the JxlParallel* functions as return value. A value
- * of ::JXL_PARALLEL_RET_SUCCESS means success and any other value means error.
- * The special value ::JXL_PARALLEL_RET_RUNNER_ERROR can be used by the runner
- * to indicate any other error.
- */
-typedef int JxlParallelRetCode;
-
-/**
- * Code returned by the @ref JxlParallelRunInit function to indicate success.
- */
-#define JXL_PARALLEL_RET_SUCCESS (0)
-
-/**
- * Code returned by the @ref JxlParallelRunInit function to indicate a general
- * error.
- */
-#define JXL_PARALLEL_RET_RUNNER_ERROR (-1)
-
-/**
- * Parallel run initialization callback. See @ref JxlParallelRunner for details.
- *
- * This function MUST be called by the JxlParallelRunner only once, on the
- * same thread that called @ref JxlParallelRunner, before any parallel
- * execution. The purpose of this call is to provide the maximum number of
- * threads that the
- * @ref JxlParallelRunner will use, which can be used by JPEG XL to allocate
- * per-thread storage if needed.
- *
- * @param jpegxl_opaque the @p jpegxl_opaque handle provided to
- * @ref JxlParallelRunner() must be passed here.
- * @param num_threads the maximum number of threads. This value must be
- * positive.
- * @return 0 if the initialization process was successful.
- * @return an error code if there was an error, which should be returned by
- * @ref JxlParallelRunner().
- */
-typedef JxlParallelRetCode (*JxlParallelRunInit)(void* jpegxl_opaque,
-                                                 size_t num_threads);
-
-/**
- * Parallel run data processing callback. See @ref JxlParallelRunner for
- * details.
- *
- * This function MUST be called once for every number in the range [start_range,
- * end_range) (including start_range but not including end_range) passing this
- * number as the @p value. Calls for different value may be executed from
- * different threads in parallel.
- *
- * @param jpegxl_opaque the @p jpegxl_opaque handle provided to
- * @ref JxlParallelRunner() must be passed here.
- * @param value the number in the range [start_range, end_range) of the call.
- * @param thread_id the thread number where this function is being called from.
- * This must be lower than the @p num_threads value passed to
- * @ref JxlParallelRunInit.
- */
-typedef void (*JxlParallelRunFunction)(void* jpegxl_opaque, uint32_t value,
-                                       size_t thread_id);
-
-/**
- * JxlParallelRunner function type. A parallel runner implementation can be
- * provided by a JPEG XL caller to allow running computations in multiple
- * threads. This function must call the initialization function @p init in the
- * same thread that called it and then call the passed @p func once for every
- * number in the range [start_range, end_range) (including start_range but not
- * including end_range) possibly from different multiple threads in parallel.
- *
- * The @ref JxlParallelRunner function does not need to be re-entrant. This
- * means that the same @ref JxlParallelRunner function with the same
- * runner_opaque provided parameter will not be called from the library from
- * either @p init or
- * @p func in the same decoder or encoder instance. However, a single decoding
- * or encoding instance may call the provided @ref JxlParallelRunner multiple
- * times for different parts of the decoding or encoding process.
- *
- * @return 0 if the @p init call succeeded (returned 0) and no other error
- * occurred in the runner code.
- * @return JXL_PARALLEL_RET_RUNNER_ERROR if an error occurred in the runner
- * code, for example, setting up the threads.
- * @return the return value of @p init() if non-zero.
- */
-typedef JxlParallelRetCode (*JxlParallelRunner)(
-    void* runner_opaque, void* jpegxl_opaque, JxlParallelRunInit init,
-    JxlParallelRunFunction func, uint32_t start_range, uint32_t end_range);
-
-/* The following is an example of a @ref JxlParallelRunner that doesn't use any
- * multi-threading. Note that this implementation doesn't store any state
- * between multiple calls of the ExampleSequentialRunner function, so the
- * runner_opaque value is not used.
-
-  JxlParallelRetCode ExampleSequentialRunner(void* runner_opaque,
-                                                void* jpegxl_opaque,
-                                                JxlParallelRunInit init,
-                                                JxlParallelRunFunction func,
-                                                uint32_t start_range,
-                                                uint32_t end_range) {
-    // We only use one thread (the currently running thread).
-    JxlParallelRetCode init_ret = (*init)(jpegxl_opaque, 1);
-    if (init_ret != 0) return init_ret;
-
-    // In case of other initialization error (for example when initializing the
-    // threads) one can return JXL_PARALLEL_RET_RUNNER_ERROR.
-
-    for (uint32_t i = start_range; i < end_range; i++) {
-      // Every call is in the thread number 0. These don't need to be in any
-      // order.
-      (*func)(jpegxl_opaque, i, 0);
-    }
-    return JXL_PARALLEL_RET_SUCCESS;
-  }
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* JXL_PARALLEL_RUNNER_H_ */
-
-/** @}*/
diff --git a/third_party/jpeg-xl/lib/include/jxl/resizable_parallel_runner.h b/third_party/jpeg-xl/lib/include/jxl/resizable_parallel_runner.h
deleted file mode 100644
index b0bf68091ea21..0000000000000
--- a/third_party/jpeg-xl/lib/include/jxl/resizable_parallel_runner.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright (c) the JPEG XL Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
- */
-
-/** @addtogroup libjxl_threads
- * @{
- * @file resizable_parallel_runner.h
- * @brief implementation using std::thread of a resizeable ::JxlParallelRunner.
- */
-
-/** Implementation of JxlParallelRunner than can be used to enable
- * multithreading when using the JPEG XL library. This uses std::thread
- * internally and related synchronization functions. The number of threads
- * created can be changed after creation of the thread pool; the threads
- * (including the main thread) are re-used for every
- * ResizableParallelRunner::Runner call. Only one concurrent
- * @ref JxlResizableParallelRunner call per instance is allowed at a time.
- *
- * This is a scalable, lower-overhead thread pool runner, especially suitable
- * for data-parallel computations in the fork-join model, where clients need to
- * know when all tasks have completed.
- *
- * Compared to the implementation in @ref thread_parallel_runner.h, this
- * implementation is tuned for execution on lower-powered systems, including
- * for example ARM CPUs with big.LITTLE computation models.
- */
-
-#ifndef JXL_RESIZABLE_PARALLEL_RUNNER_H_
-#define JXL_RESIZABLE_PARALLEL_RUNNER_H_
-
-#include <jxl/jxl_threads_export.h>
-#include <jxl/memory_manager.h>
-#include <jxl/parallel_runner.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Parallel runner internally using std::thread. Use as @ref JxlParallelRunner.
- */
-JXL_THREADS_EXPORT JxlParallelRetCode JxlResizableParallelRunner(
-    void* runner_opaque, void* jpegxl_opaque, JxlParallelRunInit init,
-    JxlParallelRunFunction func, uint32_t start_range, uint32_t end_range);
-
-/** Creates the runner for @ref JxlResizableParallelRunner. Use as the opaque
- * runner. The runner will execute tasks on the calling thread until
- * @ref JxlResizableParallelRunnerSetThreads is called.
- */
-JXL_THREADS_EXPORT void* JxlResizableParallelRunnerCreate(
-    const JxlMemoryManager* memory_manager);
-
-/** Changes the number of threads for @ref JxlResizableParallelRunner.
- */
-JXL_THREADS_EXPORT void JxlResizableParallelRunnerSetThreads(
-    void* runner_opaque, size_t num_threads);
-
-/** Suggests a number of threads to use for an image of given size.
- */
-JXL_THREADS_EXPORT uint32_t
-JxlResizableParallelRunnerSuggestThreads(uint64_t xsize, uint64_t ysize);
-
-/** Destroys the runner created by @ref JxlResizableParallelRunnerCreate.
- */
-JXL_THREADS_EXPORT void JxlResizableParallelRunnerDestroy(void* runner_opaque);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* JXL_RESIZABLE_PARALLEL_RUNNER_H_ */
-
-/** @}*/
diff --git a/third_party/jpeg-xl/lib/include/jxl/resizable_parallel_runner_cxx.h b/third_party/jpeg-xl/lib/include/jxl/resizable_parallel_runner_cxx.h
deleted file mode 100644
index 344c96cc9ebf9..0000000000000
--- a/third_party/jpeg-xl/lib/include/jxl/resizable_parallel_runner_cxx.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/// @addtogroup libjxl_cpp
-/// @{
-///
-/// @file resizable_parallel_runner_cxx.h
-/// @ingroup libjxl_threads
-/// @brief C++ header-only helper for @ref resizable_parallel_runner.h.
-///
-/// There's no binary library associated with the header since this is a header
-/// only library.
-
-#ifndef JXL_RESIZABLE_PARALLEL_RUNNER_CXX_H_
-#define JXL_RESIZABLE_PARALLEL_RUNNER_CXX_H_
-
-#include <jxl/memory_manager.h>
-#include <jxl/resizable_parallel_runner.h>
-
-#include <memory>
-
-#ifndef __cplusplus
-#error \
-    "This a C++ only header. Use jxl/jxl_resizable_parallel_runner.h from C" \
-    "sources."
-#endif
-
-/// Struct to call JxlResizableParallelRunnerDestroy from the
-/// JxlResizableParallelRunnerPtr unique_ptr.
-struct JxlResizableParallelRunnerDestroyStruct {
-  /// Calls @ref JxlResizableParallelRunnerDestroy() on the passed runner.
-  void operator()(void* runner) { JxlResizableParallelRunnerDestroy(runner); }
-};
-
-/// std::unique_ptr<> type that calls JxlResizableParallelRunnerDestroy() when
-/// releasing the runner.
-///
-/// Use this helper type from C++ sources to ensure the runner is destroyed and
-/// their internal resources released.
-typedef std::unique_ptr<void, JxlResizableParallelRunnerDestroyStruct>
-    JxlResizableParallelRunnerPtr;
-
-/// Creates an instance of JxlResizableParallelRunner into a
-/// JxlResizableParallelRunnerPtr and initializes it.
-///
-/// This function returns a unique_ptr that will call
-/// JxlResizableParallelRunnerDestroy() when releasing the pointer. See @ref
-/// JxlResizableParallelRunnerCreate for details on the instance creation.
-///
-/// @param memory_manager custom allocator function. It may be NULL. The memory
-///        manager will be copied internally.
-/// @return a @c NULL JxlResizableParallelRunnerPtr if the instance can not be
-/// allocated or initialized
-/// @return initialized JxlResizableParallelRunnerPtr instance otherwise.
-static inline JxlResizableParallelRunnerPtr JxlResizableParallelRunnerMake(
-    const JxlMemoryManager* memory_manager) {
-  return JxlResizableParallelRunnerPtr(
-      JxlResizableParallelRunnerCreate(memory_manager));
-}
-
-#endif  // JXL_RESIZABLE_PARALLEL_RUNNER_CXX_H_
-
-/// @}
diff --git a/third_party/jpeg-xl/lib/include/jxl/stats.h b/third_party/jpeg-xl/lib/include/jxl/stats.h
deleted file mode 100644
index 35930b4da1547..0000000000000
--- a/third_party/jpeg-xl/lib/include/jxl/stats.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Copyright (c) the JPEG XL Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
- */
-
-/** @addtogroup libjxl_encoder
- * @{
- * @file stats.h
- * @brief API to collect various statistics from JXL encoder.
- */
-
-#ifndef JXL_STATS_H_
-#define JXL_STATS_H_
-
-#include <jxl/jxl_export.h>
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Opaque structure that holds the encoder statistics.
- *
- * Allocated and initialized with @ref JxlEncoderStatsCreate().
- * Cleaned up and deallocated with @ref JxlEncoderStatsDestroy().
- */
-typedef struct JxlEncoderStatsStruct JxlEncoderStats;
-
-/**
- * Creates an instance of JxlEncoderStats and initializes it.
- *
- * @return pointer to initialized @ref JxlEncoderStats instance
- */
-JXL_EXPORT JxlEncoderStats* JxlEncoderStatsCreate(void);
-
-/**
- * Deinitializes and frees JxlEncoderStats instance.
- *
- * @param stats instance to be cleaned up and deallocated. No-op if stats is
- * null pointer.
- */
-JXL_EXPORT void JxlEncoderStatsDestroy(JxlEncoderStats* stats);
-
-/** Data type for querying @ref JxlEncoderStats object
- */
-typedef enum {
-  JXL_ENC_STAT_HEADER_BITS,
-  JXL_ENC_STAT_TOC_BITS,
-  JXL_ENC_STAT_DICTIONARY_BITS,
-  JXL_ENC_STAT_SPLINES_BITS,
-  JXL_ENC_STAT_NOISE_BITS,
-  JXL_ENC_STAT_QUANT_BITS,
-  JXL_ENC_STAT_MODULAR_TREE_BITS,
-  JXL_ENC_STAT_MODULAR_GLOBAL_BITS,
-  JXL_ENC_STAT_DC_BITS,
-  JXL_ENC_STAT_MODULAR_DC_GROUP_BITS,
-  JXL_ENC_STAT_CONTROL_FIELDS_BITS,
-  JXL_ENC_STAT_COEF_ORDER_BITS,
-  JXL_ENC_STAT_AC_HISTOGRAM_BITS,
-  JXL_ENC_STAT_AC_BITS,
-  JXL_ENC_STAT_MODULAR_AC_GROUP_BITS,
-  JXL_ENC_STAT_NUM_SMALL_BLOCKS,
-  JXL_ENC_STAT_NUM_DCT4X8_BLOCKS,
-  JXL_ENC_STAT_NUM_AFV_BLOCKS,
-  JXL_ENC_STAT_NUM_DCT8_BLOCKS,
-  JXL_ENC_STAT_NUM_DCT8X32_BLOCKS,
-  JXL_ENC_STAT_NUM_DCT16_BLOCKS,
-  JXL_ENC_STAT_NUM_DCT16X32_BLOCKS,
-  JXL_ENC_STAT_NUM_DCT32_BLOCKS,
-  JXL_ENC_STAT_NUM_DCT32X64_BLOCKS,
-  JXL_ENC_STAT_NUM_DCT64_BLOCKS,
-  JXL_ENC_STAT_NUM_BUTTERAUGLI_ITERS,
-  JXL_ENC_NUM_STATS,
-} JxlEncoderStatsKey;
-
-/** Returns the value of the statistics corresponding the given key.
- *
- * @param stats object that was passed to the encoder with a
- *   @ref JxlEncoderCollectStats function
- * @param key the particular statistics to query
- *
- * @return the value of the statistics
- */
-JXL_EXPORT size_t JxlEncoderStatsGet(const JxlEncoderStats* stats,
-                                     JxlEncoderStatsKey key);
-
-/** Updates the values of the given stats object with that of an other.
- *
- * @param stats object whose values will be updated (usually added together)
- * @param other stats object whose values will be merged with stats
- */
-JXL_EXPORT void JxlEncoderStatsMerge(JxlEncoderStats* stats,
-                                     const JxlEncoderStats* other);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* JXL_STATS_H_ */
-
-/** @}*/
diff --git a/third_party/jpeg-xl/lib/include/jxl/thread_parallel_runner.h b/third_party/jpeg-xl/lib/include/jxl/thread_parallel_runner.h
deleted file mode 100644
index fbfe9e20749aa..0000000000000
--- a/third_party/jpeg-xl/lib/include/jxl/thread_parallel_runner.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright (c) the JPEG XL Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
- */
-
-/** @addtogroup libjxl_threads
- * @{
- * @file thread_parallel_runner.h
- * @brief implementation using std::thread of a ::JxlParallelRunner.
- */
-
-/** Implementation of JxlParallelRunner than can be used to enable
- * multithreading when using the JPEG XL library. This uses std::thread
- * internally and related synchronization functions. The number of threads
- * created is fixed at construction time and the threads are re-used for every
- * ThreadParallelRunner::Runner call. Only one concurrent
- * JxlThreadParallelRunner call per instance is allowed at a time.
- *
- * This is a scalable, lower-overhead thread pool runner, especially suitable
- * for data-parallel computations in the fork-join model, where clients need to
- * know when all tasks have completed.
- *
- * This thread pool can efficiently load-balance millions of tasks using an
- * atomic counter, thus avoiding per-task virtual or system calls. With 48
- * hyperthreads and 1M tasks that add to an atomic counter, overall runtime is
- * 10-20x higher when using std::async, and ~200x for a queue-based thread
- */
-
-#ifndef JXL_THREAD_PARALLEL_RUNNER_H_
-#define JXL_THREAD_PARALLEL_RUNNER_H_
-
-#include <jxl/jxl_threads_export.h>
-#include <jxl/memory_manager.h>
-#include <jxl/parallel_runner.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Parallel runner internally using std::thread. Use as @ref JxlParallelRunner.
- */
-JXL_THREADS_EXPORT JxlParallelRetCode JxlThreadParallelRunner(
-    void* runner_opaque, void* jpegxl_opaque, JxlParallelRunInit init,
-    JxlParallelRunFunction func, uint32_t start_range, uint32_t end_range);
-
-/** Creates the runner for @ref JxlThreadParallelRunner. Use as the opaque
- * runner.
- */
-JXL_THREADS_EXPORT void* JxlThreadParallelRunnerCreate(
-    const JxlMemoryManager* memory_manager, size_t num_worker_threads);
-
-/** Destroys the runner created by @ref JxlThreadParallelRunnerCreate.
- */
-JXL_THREADS_EXPORT void JxlThreadParallelRunnerDestroy(void* runner_opaque);
-
-/** Returns a default num_worker_threads value for
- * @ref JxlThreadParallelRunnerCreate.
- */
-JXL_THREADS_EXPORT size_t JxlThreadParallelRunnerDefaultNumWorkerThreads(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* JXL_THREAD_PARALLEL_RUNNER_H_ */
-
-/** @}*/
diff --git a/third_party/jpeg-xl/lib/include/jxl/thread_parallel_runner_cxx.h b/third_party/jpeg-xl/lib/include/jxl/thread_parallel_runner_cxx.h
deleted file mode 100644
index 7f35ca00e2898..0000000000000
--- a/third_party/jpeg-xl/lib/include/jxl/thread_parallel_runner_cxx.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/// @addtogroup libjxl_cpp
-/// @{
-///
-/// @file thread_parallel_runner_cxx.h
-/// @brief C++ header-only helper for @ref thread_parallel_runner.h.
-///
-/// There's no binary library associated with the header since this is a header
-/// only library.
-
-#ifndef JXL_THREAD_PARALLEL_RUNNER_CXX_H_
-#define JXL_THREAD_PARALLEL_RUNNER_CXX_H_
-
-#include <jxl/memory_manager.h>
-#include <jxl/thread_parallel_runner.h>
-
-#include <cstddef>
-#include <memory>
-
-#ifndef __cplusplus
-#error \
-    "This a C++ only header. Use jxl/jxl_thread_parallel_runner.h from C" \
-    "sources."
-#endif
-
-/// Struct to call JxlThreadParallelRunnerDestroy from the
-/// JxlThreadParallelRunnerPtr unique_ptr.
-struct JxlThreadParallelRunnerDestroyStruct {
-  /// Calls @ref JxlThreadParallelRunnerDestroy() on the passed runner.
-  void operator()(void* runner) { JxlThreadParallelRunnerDestroy(runner); }
-};
-
-/// std::unique_ptr<> type that calls JxlThreadParallelRunnerDestroy() when
-/// releasing the runner.
-///
-/// Use this helper type from C++ sources to ensure the runner is destroyed and
-/// their internal resources released.
-typedef std::unique_ptr<void, JxlThreadParallelRunnerDestroyStruct>
-    JxlThreadParallelRunnerPtr;
-
-/// Creates an instance of JxlThreadParallelRunner into a
-/// JxlThreadParallelRunnerPtr and initializes it.
-///
-/// This function returns a unique_ptr that will call
-/// JxlThreadParallelRunnerDestroy() when releasing the pointer. See @ref
-/// JxlThreadParallelRunnerCreate for details on the instance creation.
-///
-/// @param memory_manager custom allocator function. It may be NULL. The memory
-///        manager will be copied internally.
-/// @param num_worker_threads the number of worker threads to create.
-/// @return a @c NULL JxlThreadParallelRunnerPtr if the instance can not be
-/// allocated or initialized
-/// @return initialized JxlThreadParallelRunnerPtr instance otherwise.
-static inline JxlThreadParallelRunnerPtr JxlThreadParallelRunnerMake(
-    const JxlMemoryManager* memory_manager, size_t num_worker_threads) {
-  return JxlThreadParallelRunnerPtr(
-      JxlThreadParallelRunnerCreate(memory_manager, num_worker_threads));
-}
-
-#endif  // JXL_THREAD_PARALLEL_RUNNER_CXX_H_
-
-/// @}
diff --git a/third_party/jpeg-xl/lib/include/jxl/types.h b/third_party/jpeg-xl/lib/include/jxl/types.h
deleted file mode 100644
index 1844375f68dac..0000000000000
--- a/third_party/jpeg-xl/lib/include/jxl/types.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/* Copyright (c) the JPEG XL Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
- */
-
-/** @addtogroup libjxl_common
- * @{
- * @file types.h
- * @brief Data types for the JPEG XL API, for both encoding and decoding.
- */
-
-#ifndef JXL_TYPES_H_
-#define JXL_TYPES_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * A portable @c bool replacement.
- *
- * ::JXL_BOOL is a "documentation" type: actually it is @c int, but in API it
- * denotes a type, whose only values are ::JXL_TRUE and ::JXL_FALSE.
- */
-#define JXL_BOOL int
-/** Portable @c true replacement. */
-#define JXL_TRUE 1
-/** Portable @c false replacement. */
-#define JXL_FALSE 0
-/** Converts of bool-like value to either ::JXL_TRUE or ::JXL_FALSE. */
-#define TO_JXL_BOOL(C) (!!(C) ? JXL_TRUE : JXL_FALSE)
-/** Converts JXL_BOOL to C++ bool. */
-#define FROM_JXL_BOOL(C) (static_cast<bool>(C))
-
-/** Data type for the sample values per channel per pixel.
- */
-typedef enum {
-  /** Use 32-bit single-precision floating point values, with range 0.0-1.0
-   * (within gamut, may go outside this range for wide color gamut). Floating
-   * point output, either ::JXL_TYPE_FLOAT or ::JXL_TYPE_FLOAT16, is recommended
-   * for HDR and wide gamut images when color profile conversion is required. */
-  JXL_TYPE_FLOAT = 0,
-
-  /** Use type uint8_t. May clip wide color gamut data.
-   */
-  JXL_TYPE_UINT8 = 2,
-
-  /** Use type uint16_t. May clip wide color gamut data.
-   */
-  JXL_TYPE_UINT16 = 3,
-
-  /** Use 16-bit IEEE 754 half-precision floating point values */
-  JXL_TYPE_FLOAT16 = 5,
-} JxlDataType;
-
-/** Ordering of multi-byte data.
- */
-typedef enum {
-  /** Use the endianness of the system, either little endian or big endian,
-   * without forcing either specific endianness. Do not use if pixel data
-   * should be exported to a well defined format.
-   */
-  JXL_NATIVE_ENDIAN = 0,
-  /** Force little endian */
-  JXL_LITTLE_ENDIAN = 1,
-  /** Force big endian */
-  JXL_BIG_ENDIAN = 2,
-} JxlEndianness;
-
-/** Data type for the sample values per channel per pixel for the output buffer
- * for pixels. This is not necessarily the same as the data type encoded in the
- * codestream. The channels are interleaved per pixel. The pixels are
- * organized row by row, left to right, top to bottom.
- * TODO(lode): support different channel orders if needed (RGB, BGR, ...)
- */
-typedef struct {
-  /** Amount of channels available in a pixel buffer.
-   * 1: single-channel data, e.g. grayscale or a single extra channel
-   * 2: single-channel + alpha
-   * 3: trichromatic, e.g. RGB
-   * 4: trichromatic + alpha
-   * TODO(lode): this needs finetuning. It is not yet defined how the user
-   * chooses output color space. CMYK+alpha needs 5 channels.
-   */
-  uint32_t num_channels;
-
-  /** Data type of each channel.
-   */
-  JxlDataType data_type;
-
-  /** Whether multi-byte data types are represented in big endian or little
-   * endian format. This applies to ::JXL_TYPE_UINT16 and ::JXL_TYPE_FLOAT.
-   */
-  JxlEndianness endianness;
-
-  /** Align scanlines to a multiple of align bytes, or 0 to require no
-   * alignment at all (which has the same effect as value 1)
-   */
-  size_t align;
-} JxlPixelFormat;
-
-/** Settings for the interpretation of UINT input and output buffers.
- *  (buffers using a FLOAT data type are not affected by this)
- */
-typedef enum {
-  /** This is the default setting, where the encoder expects the input pixels
-   * to use the full range of the pixel format data type (e.g. for UINT16, the
-   * input range is 0 .. 65535 and the value 65535 is mapped to 1.0 when
-   * converting to float), and the decoder uses the full range to output
-   * pixels. If the bit depth in the basic info is different from this, the
-   * encoder expects the values to be rescaled accordingly (e.g. multiplied by
-   * 65535/4095 for a 12-bit image using UINT16 input data type). */
-  JXL_BIT_DEPTH_FROM_PIXEL_FORMAT = 0,
-
-  /** If this setting is selected, the encoder expects the input pixels to be
-   * in the range defined by the bits_per_sample value of the basic info (e.g.
-   * for 12-bit images using UINT16 input data types, the allowed range is
-   * 0 .. 4095 and the value 4095 is mapped to 1.0 when converting to float),
-   * and the decoder outputs pixels in this range. */
-  JXL_BIT_DEPTH_FROM_CODESTREAM = 1,
-
-  /** This setting can only be used in the decoder to select a custom range for
-   * pixel output */
-  JXL_BIT_DEPTH_CUSTOM = 2,
-} JxlBitDepthType;
-
-/** Data type for describing the interpretation of the input and output buffers
- * in terms of the range of allowed input and output pixel values. */
-typedef struct {
-  /** Bit depth setting, see comment on @ref JxlBitDepthType */
-  JxlBitDepthType type;
-
-  /** Custom bits per sample */
-  uint32_t bits_per_sample;
-
-  /** Custom exponent bits per sample */
-  uint32_t exponent_bits_per_sample;
-} JxlBitDepth;
-
-/** Data type holding the 4-character type name of an ISOBMFF box.
- */
-typedef char JxlBoxType[4];
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* JXL_TYPES_H_ */
-
-/** @}*/
diff --git a/third_party/jpeg-xl/lib/jpegli.cmake b/third_party/jpeg-xl/lib/jpegli.cmake
deleted file mode 100644
index a471c8b2abd8c..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli.cmake
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include(jxl_lists.cmake)
-
-set(JPEGLI_INTERNAL_LIBS
-  hwy
-  Threads::Threads
-  ${ATOMICS_LIBRARIES}
-)
-
-# JPEGLIB setup
-set(BITS_IN_JSAMPLE 8)
-set(MEM_SRCDST_SUPPORTED 1)
-
-if(JPEGLI_LIBJPEG_LIBRARY_SOVERSION STREQUAL "62")
-  set(JPEG_LIB_VERSION 62)
-elseif(JPEGLI_LIBJPEG_LIBRARY_SOVERSION STREQUAL "7")
-  set(JPEG_LIB_VERSION 70)
-elseif(JPEGLI_LIBJPEG_LIBRARY_SOVERSION STREQUAL "8")
-  set(JPEG_LIB_VERSION 80)
-endif()
-
-configure_file(
-  ../third_party/libjpeg-turbo/jconfig.h.in include/jpegli/jconfig.h)
-configure_file(
-  ../third_party/libjpeg-turbo/jpeglib.h include/jpegli/jpeglib.h COPYONLY)
-configure_file(
-  ../third_party/libjpeg-turbo/jmorecfg.h include/jpegli/jmorecfg.h COPYONLY)
-
-add_library(jpegli-static STATIC EXCLUDE_FROM_ALL "${JPEGXL_INTERNAL_JPEGLI_SOURCES}")
-target_compile_options(jpegli-static PRIVATE "${JPEGXL_INTERNAL_FLAGS}")
-target_compile_options(jpegli-static PUBLIC ${JPEGXL_COVERAGE_FLAGS})
-set_property(TARGET jpegli-static PROPERTY POSITION_INDEPENDENT_CODE ON)
-target_include_directories(jpegli-static PRIVATE
-  "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>"
-  "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
-  "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
-  "${JXL_HWY_INCLUDE_DIRS}"
-)
-target_include_directories(jpegli-static PUBLIC
-  "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include/jpegli>"
-)
-target_link_libraries(jpegli-static PUBLIC ${JPEGLI_INTERNAL_LIBS})
-
-#
-# Tests for jpegli-static
-#
-
-find_package(JPEG)
-if(JPEG_FOUND AND BUILD_TESTING)
-# TODO(eustas): merge into jxl_tests.cmake?
-
-add_library(jpegli_libjpeg_util-obj OBJECT
-  ${JPEGXL_INTERNAL_JPEGLI_LIBJPEG_HELPER_FILES}
-)
-target_include_directories(jpegli_libjpeg_util-obj PRIVATE
-  "${PROJECT_SOURCE_DIR}"
-  "${JPEG_INCLUDE_DIRS}"
-)
-target_compile_options(jpegli_libjpeg_util-obj PRIVATE
-  "${JPEGXL_INTERNAL_FLAGS}" "${JPEGXL_COVERAGE_FLAGS}")
-
-# Individual test binaries:
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests)
-foreach (TESTFILE IN LISTS JPEGXL_INTERNAL_JPEGLI_TESTS)
-  # The TESTNAME is the name without the extension or directory.
-  get_filename_component(TESTNAME ${TESTFILE} NAME_WE)
-  add_executable(${TESTNAME} ${TESTFILE}
-    $<TARGET_OBJECTS:jpegli_libjpeg_util-obj>
-    ${JPEGXL_INTERNAL_JPEGLI_TESTLIB_FILES}
-  )
-  target_compile_options(${TESTNAME} PRIVATE
-    ${JPEGXL_INTERNAL_FLAGS}
-    # Add coverage flags to the test binary so code in the private headers of
-    # the library is also instrumented when running tests that execute it.
-    ${JPEGXL_COVERAGE_FLAGS}
-  )
-  target_compile_definitions(${TESTNAME} PRIVATE
-    -DTEST_DATA_PATH="${JPEGXL_TEST_DATA_PATH}")
-  target_include_directories(${TESTNAME} PRIVATE
-    "${PROJECT_SOURCE_DIR}"
-    "${CMAKE_CURRENT_SOURCE_DIR}/include"
-    "${CMAKE_CURRENT_BINARY_DIR}/include"
-  )
-  target_link_libraries(${TESTNAME}
-    hwy
-    jpegli-static
-    GTest::GTest
-    GTest::Main
-    ${JPEG_LIBRARIES}
-  )
-  set_target_properties(${TESTNAME} PROPERTIES LINK_FLAGS "${JPEGXL_COVERAGE_LINK_FLAGS}")
-  # Output test targets in the test directory.
-  set_target_properties(${TESTNAME} PROPERTIES PREFIX "tests/")
-  if (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set_target_properties(${TESTNAME} PROPERTIES COMPILE_FLAGS "-Wno-error")
-  endif ()
-  # 240 seconds because some build types (e.g. coverage) can be quite slow.
-  gtest_discover_tests(${TESTNAME} DISCOVERY_TIMEOUT 240)
-endforeach ()
-endif()
-
-#
-# Build libjpeg.so that links to libjpeg-static
-#
-
-if (JPEGXL_ENABLE_JPEGLI_LIBJPEG AND NOT APPLE AND NOT WIN32 AND NOT EMSCRIPTEN)
-add_library(jpegli-libjpeg-obj OBJECT "${JPEGXL_INTERNAL_JPEGLI_WRAPPER_SOURCES}")
-target_compile_options(jpegli-libjpeg-obj PRIVATE ${JPEGXL_INTERNAL_FLAGS})
-target_compile_options(jpegli-libjpeg-obj PUBLIC ${JPEGXL_COVERAGE_FLAGS})
-set_property(TARGET jpegli-libjpeg-obj PROPERTY POSITION_INDEPENDENT_CODE ON)
-target_include_directories(jpegli-libjpeg-obj PRIVATE
-  "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>"
-  "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include/jpegli>"
-)
-target_compile_definitions(jpegli-libjpeg-obj PUBLIC
-  ${JPEGLI_LIBJPEG_OBJ_COMPILE_DEFINITIONS}
-)
-set(JPEGLI_LIBJPEG_INTERNAL_OBJECTS $<TARGET_OBJECTS:jpegli-libjpeg-obj>)
-
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/jpegli)
-add_library(jpeg SHARED ${JPEGLI_LIBJPEG_INTERNAL_OBJECTS})
-target_link_libraries(jpeg PUBLIC ${JPEGXL_COVERAGE_FLAGS})
-target_link_libraries(jpeg PRIVATE jpegli-static)
-set_target_properties(jpeg PROPERTIES
-  VERSION ${JPEGLI_LIBJPEG_LIBRARY_VERSION}
-  SOVERSION ${JPEGLI_LIBJPEG_LIBRARY_SOVERSION}
-  LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/jpegli"
-  RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/jpegli")
-
-# Add a jpeg.version file as a version script to tag symbols with the
-# appropriate version number.
-set_target_properties(jpeg PROPERTIES
-  LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/jpegli/jpeg.version.${JPEGLI_LIBJPEG_LIBRARY_SOVERSION})
-set_property(TARGET jpeg APPEND_STRING PROPERTY
-  LINK_FLAGS " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/jpegli/jpeg.version.${JPEGLI_LIBJPEG_LIBRARY_SOVERSION}")
-
-if (JPEGXL_INSTALL_JPEGLI_LIBJPEG)
-  install(TARGETS jpeg
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-  install(
-    DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/include/jpegli/"
-    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-endif()
-
-# This hides the default visibility symbols from static libraries bundled into
-# the shared library. In particular this prevents exposing symbols from hwy
-# in the shared library.
-if(LINKER_SUPPORT_EXCLUDE_LIBS)
-  set_property(TARGET jpeg APPEND_STRING PROPERTY
-    LINK_FLAGS " ${LINKER_EXCLUDE_LIBS_FLAG}")
-endif()
-endif()
diff --git a/third_party/jpeg-xl/lib/jpegli/README.md b/third_party/jpeg-xl/lib/jpegli/README.md
deleted file mode 100644
index 7241d1eaabfd9..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-:warning: **Important Update:** Development continues at https://github.com/google/jpegli
-
-
-# Improved JPEG encoder and decoder implementation
-
-This subdirectory contains a JPEG encoder and decoder implementation that is
-API and ABI compatible with libjpeg62.
-
-## Building
-
-When building the parent libjxl project, two binaries, `tools/cjpegli` and
-`tools/djpegli` will be built, as well as a
-`lib/jpegli/libjpeg.so.62.3.0` shared library that can be used as a drop-in
-replacement for the system library with the same name.
-
-## Encoder improvements
-
-Improvements and new features used by the encoder include:
-
-* Support for 16-bit unsigned and 32-bit floating point input buffers.
-
-* Color space conversions, chroma subsampling and DCT are all done in floating
-  point precision, the conversion to integers happens first when producing
-  the final quantized DCT coefficients.
-
-* The desired quality can be indicated by a distance parameter that is
-  analogous to the distance parameter of JPEG XL. The quantization tables
-  are chosen based on the distance and the chroma subsampling mode, with
-  different positions in the quantization matrix scaling differently, and the
-  red and blue chrominance channels have separate quantization tables.
-
-* Adaptive dead-zone quantization. On noisy parts of the image, quantization
-  thresholds for zero coefficients are higher than on smoother parts of the
-  image.
-
-* Support for more efficient compression of JPEGs with an ICC profile
-  representing the XYB colorspace. These JPEGs will not be converted to the
-  YCbCr colorspace, but specialized quantization tables will be chosen for
-  the original X, Y, B channels.
-
-## Decoder improvements
-
-* Support for 16-bit unsigned and 32-bit floating point output buffers.
-
-* Non-zero DCT coefficients are dequantized to the expectation value of their
-  respective quantization intervals assuming a Laplacian distribution of the
-  original unquantized DCT coefficients.
-
-* After dequantization, inverse DCT, chroma upsampling and color space
-  conversions are all done in floating point precision, the conversion to
-  integer samples happens only in the final output phase (unless output to
-  floating point was requested).
diff --git a/third_party/jpeg-xl/lib/jpegli/adaptive_quantization.cc b/third_party/jpeg-xl/lib/jpegli/adaptive_quantization.cc
deleted file mode 100644
index 11367ee66083f..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/adaptive_quantization.cc
+++ /dev/null
@@ -1,563 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/adaptive_quantization.h"
-
-#include <jxl/types.h>
-#include <stddef.h>
-#include <stdlib.h>
-
-#include <algorithm>
-#include <cmath>
-#include <limits>
-#include <string>
-#include <vector>
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jpegli/adaptive_quantization.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jpegli/encode_internal.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-HWY_BEFORE_NAMESPACE();
-namespace jpegli {
-namespace HWY_NAMESPACE {
-namespace {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::AbsDiff;
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::And;
-using hwy::HWY_NAMESPACE::Div;
-using hwy::HWY_NAMESPACE::Floor;
-using hwy::HWY_NAMESPACE::GetLane;
-using hwy::HWY_NAMESPACE::Max;
-using hwy::HWY_NAMESPACE::Min;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::MulAdd;
-using hwy::HWY_NAMESPACE::NegMulAdd;
-using hwy::HWY_NAMESPACE::Rebind;
-using hwy::HWY_NAMESPACE::ShiftLeft;
-using hwy::HWY_NAMESPACE::ShiftRight;
-using hwy::HWY_NAMESPACE::Sqrt;
-using hwy::HWY_NAMESPACE::Sub;
-using hwy::HWY_NAMESPACE::ZeroIfNegative;
-
-constexpr float kInputScaling = 1.0f / 255.0f;
-
-// Primary template: default to actual division.
-template <typename T, class V>
-struct FastDivision {
-  HWY_INLINE V operator()(const V n, const V d) const { return n / d; }
-};
-// Partial specialization for float vectors.
-template <class V>
-struct FastDivision<float, V> {
-  // One Newton-Raphson iteration.
-  static HWY_INLINE V ReciprocalNR(const V x) {
-    const auto rcp = ApproximateReciprocal(x);
-    const auto sum = Add(rcp, rcp);
-    const auto x_rcp = Mul(x, rcp);
-    return NegMulAdd(x_rcp, rcp, sum);
-  }
-
-  V operator()(const V n, const V d) const {
-#if JXL_TRUE  // Faster on SKX
-    return Div(n, d);
-#else
-    return n * ReciprocalNR(d);
-#endif
-  }
-};
-
-// Approximates smooth functions via rational polynomials (i.e. dividing two
-// polynomials). Evaluates polynomials via Horner's scheme, which is faster than
-// Clenshaw recurrence for Chebyshev polynomials. LoadDup128 allows us to
-// specify constants (replicated 4x) independently of the lane count.
-template <size_t NP, size_t NQ, class D, class V, typename T>
-HWY_INLINE HWY_MAYBE_UNUSED V EvalRationalPolynomial(const D d, const V x,
-                                                     const T (&p)[NP],
-                                                     const T (&q)[NQ]) {
-  constexpr size_t kDegP = NP / 4 - 1;
-  constexpr size_t kDegQ = NQ / 4 - 1;
-  auto yp = LoadDup128(d, &p[kDegP * 4]);
-  auto yq = LoadDup128(d, &q[kDegQ * 4]);
-  // We use pointer arithmetic to refer to &p[(kDegP - n) * 4] to avoid a
-  // compiler warning that the index is out of bounds since we are already
-  // checking that it is not out of bounds with (kDegP >= n) and the access
-  // will be optimized away. Similarly with q and kDegQ.
-  HWY_FENCE;
-  if (kDegP >= 1) yp = MulAdd(yp, x, LoadDup128(d, p + ((kDegP - 1) * 4)));
-  if (kDegQ >= 1) yq = MulAdd(yq, x, LoadDup128(d, q + ((kDegQ - 1) * 4)));
-  HWY_FENCE;
-  if (kDegP >= 2) yp = MulAdd(yp, x, LoadDup128(d, p + ((kDegP - 2) * 4)));
-  if (kDegQ >= 2) yq = MulAdd(yq, x, LoadDup128(d, q + ((kDegQ - 2) * 4)));
-  HWY_FENCE;
-  if (kDegP >= 3) yp = MulAdd(yp, x, LoadDup128(d, p + ((kDegP - 3) * 4)));
-  if (kDegQ >= 3) yq = MulAdd(yq, x, LoadDup128(d, q + ((kDegQ - 3) * 4)));
-  HWY_FENCE;
-  if (kDegP >= 4) yp = MulAdd(yp, x, LoadDup128(d, p + ((kDegP - 4) * 4)));
-  if (kDegQ >= 4) yq = MulAdd(yq, x, LoadDup128(d, q + ((kDegQ - 4) * 4)));
-  HWY_FENCE;
-  if (kDegP >= 5) yp = MulAdd(yp, x, LoadDup128(d, p + ((kDegP - 5) * 4)));
-  if (kDegQ >= 5) yq = MulAdd(yq, x, LoadDup128(d, q + ((kDegQ - 5) * 4)));
-  HWY_FENCE;
-  if (kDegP >= 6) yp = MulAdd(yp, x, LoadDup128(d, p + ((kDegP - 6) * 4)));
-  if (kDegQ >= 6) yq = MulAdd(yq, x, LoadDup128(d, q + ((kDegQ - 6) * 4)));
-  HWY_FENCE;
-  if (kDegP >= 7) yp = MulAdd(yp, x, LoadDup128(d, p + ((kDegP - 7) * 4)));
-  if (kDegQ >= 7) yq = MulAdd(yq, x, LoadDup128(d, q + ((kDegQ - 7) * 4)));
-
-  return FastDivision<T, V>()(yp, yq);
-}
-
-// Computes base-2 logarithm like std::log2. Undefined if negative / NaN.
-// L1 error ~3.9E-6
-template <class DF, class V>
-V FastLog2f(const DF df, V x) {
-  // 2,2 rational polynomial approximation of std::log1p(x) / std::log(2).
-  HWY_ALIGN const float p[4 * (2 + 1)] = {HWY_REP4(-1.8503833400518310E-06f),
-                                          HWY_REP4(1.4287160470083755E+00f),
-                                          HWY_REP4(7.4245873327820566E-01f)};
-  HWY_ALIGN const float q[4 * (2 + 1)] = {HWY_REP4(9.9032814277590719E-01f),
-                                          HWY_REP4(1.0096718572241148E+00f),
-                                          HWY_REP4(1.7409343003366853E-01f)};
-
-  const Rebind<int32_t, DF> di;
-  const auto x_bits = BitCast(di, x);
-
-  // Range reduction to [-1/3, 1/3] - 3 integer, 2 float ops
-  const auto exp_bits = Sub(x_bits, Set(di, 0x3f2aaaab));  // = 2/3
-  // Shifted exponent = log2; also used to clear mantissa.
-  const auto exp_shifted = ShiftRight<23>(exp_bits);
-  const auto mantissa = BitCast(df, Sub(x_bits, ShiftLeft<23>(exp_shifted)));
-  const auto exp_val = ConvertTo(df, exp_shifted);
-  return Add(EvalRationalPolynomial(df, Sub(mantissa, Set(df, 1.0f)), p, q),
-             exp_val);
-}
-
-// max relative error ~3e-7
-template <class DF, class V>
-V FastPow2f(const DF df, V x) {
-  const Rebind<int32_t, DF> di;
-  auto floorx = Floor(x);
-  auto exp =
-      BitCast(df, ShiftLeft<23>(Add(ConvertTo(di, floorx), Set(di, 127))));
-  auto frac = Sub(x, floorx);
-  auto num = Add(frac, Set(df, 1.01749063e+01));
-  num = MulAdd(num, frac, Set(df, 4.88687798e+01));
-  num = MulAdd(num, frac, Set(df, 9.85506591e+01));
-  num = Mul(num, exp);
-  auto den = MulAdd(frac, Set(df, 2.10242958e-01), Set(df, -2.22328856e-02));
-  den = MulAdd(den, frac, Set(df, -1.94414990e+01));
-  den = MulAdd(den, frac, Set(df, 9.85506633e+01));
-  return Div(num, den);
-}
-
-inline float FastPow2f(float f) {
-  HWY_CAPPED(float, 1) D;
-  return GetLane(FastPow2f(D, Set(D, f)));
-}
-
-// The following functions modulate an exponent (out_val) and return the updated
-// value. Their descriptor is limited to 8 lanes for 8x8 blocks.
-
-template <class D, class V>
-V ComputeMask(const D d, const V out_val) {
-  const auto kBase = Set(d, -0.74174993f);
-  const auto kMul4 = Set(d, 3.2353257320940401f);
-  const auto kMul2 = Set(d, 12.906028311180409f);
-  const auto kOffset2 = Set(d, 305.04035728311436f);
-  const auto kMul3 = Set(d, 5.0220313103171232f);
-  const auto kOffset3 = Set(d, 2.1925739705298404f);
-  const auto kOffset4 = Mul(Set(d, 0.25f), kOffset3);
-  const auto kMul0 = Set(d, 0.74760422233706747f);
-  const auto k1 = Set(d, 1.0f);
-
-  // Avoid division by zero.
-  const auto v1 = Max(Mul(out_val, kMul0), Set(d, 1e-3f));
-  const auto v2 = Div(k1, Add(v1, kOffset2));
-  const auto v3 = Div(k1, MulAdd(v1, v1, kOffset3));
-  const auto v4 = Div(k1, MulAdd(v1, v1, kOffset4));
-  // TODO(jyrki):
-  // A log or two here could make sense. In butteraugli we have effectively
-  // log(log(x + C)) for this kind of use, as a single log is used in
-  // saturating visual masking and here the modulation values are exponential,
-  // another log would counter that.
-  return Add(kBase, MulAdd(kMul4, v4, MulAdd(kMul2, v2, Mul(kMul3, v3))));
-}
-
-// mul and mul2 represent a scaling difference between jxl and butteraugli.
-const float kSGmul = 226.0480446705883f;
-const float kSGmul2 = 1.0f / 73.377132366608819f;
-const float kLog2 = 0.693147181f;
-// Includes correction factor for std::log -> log2.
-const float kSGRetMul = kSGmul2 * 18.6580932135f * kLog2;
-const float kSGVOffset = 7.14672470003f;
-
-template <bool invert, typename D, typename V>
-V RatioOfDerivativesOfCubicRootToSimpleGamma(const D d, V v) {
-  // The opsin space in jxl is the cubic root of photons, i.e., v * v * v
-  // is related to the number of photons.
-  //
-  // SimpleGamma(v * v * v) is the psychovisual space in butteraugli.
-  // This ratio allows quantization to move from jxl's opsin space to
-  // butteraugli's log-gamma space.
-  static const float kEpsilon = 1e-2;
-  static const float kNumOffset = kEpsilon / kInputScaling / kInputScaling;
-  static const float kNumMul = kSGRetMul * 3 * kSGmul;
-  static const float kVOffset = (kSGVOffset * kLog2 + kEpsilon) / kInputScaling;
-  static const float kDenMul = kLog2 * kSGmul * kInputScaling * kInputScaling;
-
-  v = ZeroIfNegative(v);
-  const auto num_mul = Set(d, kNumMul);
-  const auto num_offset = Set(d, kNumOffset);
-  const auto den_offset = Set(d, kVOffset);
-  const auto den_mul = Set(d, kDenMul);
-
-  const auto v2 = Mul(v, v);
-
-  const auto num = MulAdd(num_mul, v2, num_offset);
-  const auto den = MulAdd(Mul(den_mul, v), v2, den_offset);
-  return invert ? Div(num, den) : Div(den, num);
-}
-
-template <bool invert = false>
-float RatioOfDerivativesOfCubicRootToSimpleGamma(float v) {
-  using DScalar = HWY_CAPPED(float, 1);
-  auto vscalar = Load(DScalar(), &v);
-  return GetLane(
-      RatioOfDerivativesOfCubicRootToSimpleGamma<invert>(DScalar(), vscalar));
-}
-
-// TODO(veluca): this function computes an approximation of the derivative of
-// SimpleGamma with (f(x+eps)-f(x))/eps. Consider two-sided approximation or
-// exact derivatives. For reference, SimpleGamma was:
-/*
-template <typename D, typename V>
-V SimpleGamma(const D d, V v) {
-  // A simple HDR compatible gamma function.
-  const auto mul = Set(d, kSGmul);
-  const auto kRetMul = Set(d, kSGRetMul);
-  const auto kRetAdd = Set(d, kSGmul2 * -20.2789020414f);
-  const auto kVOffset = Set(d, kSGVOffset);
-
-  v *= mul;
-
-  // This should happen rarely, but may lead to a NaN, which is rather
-  // undesirable. Since negative photons don't exist we solve the NaNs by
-  // clamping here.
-  // TODO(veluca): with FastLog2f, this no longer leads to NaNs.
-  v = ZeroIfNegative(v);
-  return kRetMul * FastLog2f(d, v + kVOffset) + kRetAdd;
-}
-*/
-
-template <class D, class V>
-V GammaModulation(const D d, const size_t x, const size_t y,
-                  const RowBuffer<float>& input, const V out_val) {
-  static const float kBias = 0.16f / kInputScaling;
-  static const float kScale = kInputScaling / 64.0f;
-  auto overall_ratio = Zero(d);
-  const auto bias = Set(d, kBias);
-  const auto scale = Set(d, kScale);
-  const float* const JXL_RESTRICT block_start = input.Row(y) + x;
-  for (size_t dy = 0; dy < 8; ++dy) {
-    const float* const JXL_RESTRICT row_in = block_start + dy * input.stride();
-    for (size_t dx = 0; dx < 8; dx += Lanes(d)) {
-      const auto iny = Add(Load(d, row_in + dx), bias);
-      const auto ratio_g =
-          RatioOfDerivativesOfCubicRootToSimpleGamma</*invert=*/true>(d, iny);
-      overall_ratio = Add(overall_ratio, ratio_g);
-    }
-  }
-  overall_ratio = Mul(SumOfLanes(d, overall_ratio), scale);
-  // ideally -1.0, but likely optimal correction adds some entropy, so slightly
-  // less than that.
-  // ln(2) constant folded in because we want std::log but have FastLog2f.
-  const auto kGamma = Set(d, -0.15526878023684174f * 0.693147180559945f);
-  return MulAdd(kGamma, FastLog2f(d, overall_ratio), out_val);
-}
-
-// Change precision in 8x8 blocks that have high frequency content.
-template <class D, class V>
-V HfModulation(const D d, const size_t x, const size_t y,
-               const RowBuffer<float>& input, const V out_val) {
-  // Zero out the invalid differences for the rightmost value per row.
-  const Rebind<uint32_t, D> du;
-  HWY_ALIGN constexpr uint32_t kMaskRight[8] = {~0u, ~0u, ~0u, ~0u,
-                                                ~0u, ~0u, ~0u, 0};
-
-  auto sum = Zero(d);  // sum of absolute differences with right and below
-  static const float kSumCoeff = -2.0052193233688884f * kInputScaling / 112.0;
-  auto sumcoeff = Set(d, kSumCoeff);
-
-  const float* const JXL_RESTRICT block_start = input.Row(y) + x;
-  for (size_t dy = 0; dy < 8; ++dy) {
-    const float* JXL_RESTRICT row_in = block_start + dy * input.stride();
-    const float* JXL_RESTRICT row_in_next =
-        dy == 7 ? row_in : row_in + input.stride();
-
-    for (size_t dx = 0; dx < 8; dx += Lanes(d)) {
-      const auto p = Load(d, row_in + dx);
-      const auto pr = LoadU(d, row_in + dx + 1);
-      const auto mask = BitCast(d, Load(du, kMaskRight + dx));
-      sum = Add(sum, And(mask, AbsDiff(p, pr)));
-      const auto pd = Load(d, row_in_next + dx);
-      sum = Add(sum, AbsDiff(p, pd));
-    }
-  }
-
-  sum = SumOfLanes(d, sum);
-  return MulAdd(sum, sumcoeff, out_val);
-}
-
-void PerBlockModulations(const float y_quant_01, const RowBuffer<float>& input,
-                         const size_t yb0, const size_t yblen,
-                         RowBuffer<float>* aq_map) {
-  static const float kAcQuant = 0.841f;
-  float base_level = 0.48f * kAcQuant;
-  float kDampenRampStart = 9.0f;
-  float kDampenRampEnd = 65.0f;
-  float dampen = 1.0f;
-  if (y_quant_01 >= kDampenRampStart) {
-    dampen = 1.0f - ((y_quant_01 - kDampenRampStart) /
-                     (kDampenRampEnd - kDampenRampStart));
-    if (dampen < 0) {
-      dampen = 0;
-    }
-  }
-  const float mul = kAcQuant * dampen;
-  const float add = (1.0f - dampen) * base_level;
-  for (size_t iy = 0; iy < yblen; iy++) {
-    const size_t yb = yb0 + iy;
-    const size_t y = yb * 8;
-    float* const JXL_RESTRICT row_out = aq_map->Row(yb);
-    const HWY_CAPPED(float, 8) df;
-    for (size_t ix = 0; ix < aq_map->xsize(); ix++) {
-      size_t x = ix * 8;
-      auto out_val = Set(df, row_out[ix]);
-      out_val = ComputeMask(df, out_val);
-      out_val = HfModulation(df, x, y, input, out_val);
-      out_val = GammaModulation(df, x, y, input, out_val);
-      // We want multiplicative quantization field, so everything
-      // until this point has been modulating the exponent.
-      row_out[ix] = FastPow2f(GetLane(out_val) * 1.442695041f) * mul + add;
-    }
-  }
-}
-
-template <typename D, typename V>
-V MaskingSqrt(const D d, V v) {
-  static const float kLogOffset = 28;
-  static const float kMul = 211.50759899638012f;
-  const auto mul_v = Set(d, kMul * 1e8);
-  const auto offset_v = Set(d, kLogOffset);
-  return Mul(Set(d, 0.25f), Sqrt(MulAdd(v, Sqrt(mul_v), offset_v)));
-}
-
-template <typename V>
-void Sort4(V& min0, V& min1, V& min2, V& min3) {
-  const auto tmp0 = Min(min0, min1);
-  const auto tmp1 = Max(min0, min1);
-  const auto tmp2 = Min(min2, min3);
-  const auto tmp3 = Max(min2, min3);
-  const auto tmp4 = Max(tmp0, tmp2);
-  const auto tmp5 = Min(tmp1, tmp3);
-  min0 = Min(tmp0, tmp2);
-  min1 = Min(tmp4, tmp5);
-  min2 = Max(tmp4, tmp5);
-  min3 = Max(tmp1, tmp3);
-}
-
-template <typename V>
-void UpdateMin4(const V v, V& min0, V& min1, V& min2, V& min3) {
-  const auto tmp0 = Max(min0, v);
-  const auto tmp1 = Max(min1, tmp0);
-  const auto tmp2 = Max(min2, tmp1);
-  min0 = Min(min0, v);
-  min1 = Min(min1, tmp0);
-  min2 = Min(min2, tmp1);
-  min3 = Min(min3, tmp2);
-}
-
-// Computes a linear combination of the 4 lowest values of the 3x3 neighborhood
-// of each pixel. Output is downsampled 2x.
-void FuzzyErosion(const RowBuffer<float>& pre_erosion, const size_t yb0,
-                  const size_t yblen, RowBuffer<float>* tmp,
-                  RowBuffer<float>* aq_map) {
-  int xsize_blocks = aq_map->xsize();
-  int xsize = pre_erosion.xsize();
-  HWY_FULL(float) d;
-  const auto mul0 = Set(d, 0.125f);
-  const auto mul1 = Set(d, 0.075f);
-  const auto mul2 = Set(d, 0.06f);
-  const auto mul3 = Set(d, 0.05f);
-  for (size_t iy = 0; iy < 2 * yblen; ++iy) {
-    size_t y = 2 * yb0 + iy;
-    const float* JXL_RESTRICT rowt = pre_erosion.Row(y - 1);
-    const float* JXL_RESTRICT rowm = pre_erosion.Row(y);
-    const float* JXL_RESTRICT rowb = pre_erosion.Row(y + 1);
-    float* row_out = tmp->Row(y);
-    for (int x = 0; x < xsize; x += Lanes(d)) {
-      int xm1 = x - 1;
-      int xp1 = x + 1;
-      auto min0 = LoadU(d, rowm + x);
-      auto min1 = LoadU(d, rowm + xm1);
-      auto min2 = LoadU(d, rowm + xp1);
-      auto min3 = LoadU(d, rowt + xm1);
-      Sort4(min0, min1, min2, min3);
-      UpdateMin4(LoadU(d, rowt + x), min0, min1, min2, min3);
-      UpdateMin4(LoadU(d, rowt + xp1), min0, min1, min2, min3);
-      UpdateMin4(LoadU(d, rowb + xm1), min0, min1, min2, min3);
-      UpdateMin4(LoadU(d, rowb + x), min0, min1, min2, min3);
-      UpdateMin4(LoadU(d, rowb + xp1), min0, min1, min2, min3);
-      const auto v = Add(Add(Mul(mul0, min0), Mul(mul1, min1)),
-                         Add(Mul(mul2, min2), Mul(mul3, min3)));
-      Store(v, d, row_out + x);
-    }
-    if (iy % 2 == 1) {
-      const float* JXL_RESTRICT row_out0 = tmp->Row(y - 1);
-      float* JXL_RESTRICT aq_out = aq_map->Row(yb0 + iy / 2);
-      for (int bx = 0, x = 0; bx < xsize_blocks; ++bx, x += 2) {
-        aq_out[bx] =
-            (row_out[x] + row_out[x + 1] + row_out0[x] + row_out0[x + 1]);
-      }
-    }
-  }
-}
-
-void ComputePreErosion(const RowBuffer<float>& input, const size_t xsize,
-                       const size_t y0, const size_t ylen, int border,
-                       float* diff_buffer, RowBuffer<float>* pre_erosion) {
-  const size_t xsize_out = xsize / 4;
-  const size_t y0_out = y0 / 4;
-
-  // The XYB gamma is 3.0 to be able to decode faster with two muls.
-  // Butteraugli's gamma is matching the gamma of human eye, around 2.6.
-  // We approximate the gamma difference by adding one cubic root into
-  // the adaptive quantization. This gives us a total gamma of 2.6666
-  // for quantization uses.
-  static const float match_gamma_offset = 0.019 / kInputScaling;
-
-  const HWY_CAPPED(float, 8) df;
-
-  static const float limit = 0.2f;
-  // Computes image (padded to multiple of 8x8) of local pixel differences.
-  // Subsample both directions by 4.
-  for (size_t iy = 0; iy < ylen; ++iy) {
-    size_t y = y0 + iy;
-    const float* row_in = input.Row(y);
-    const float* row_in1 = input.Row(y + 1);
-    const float* row_in2 = input.Row(y - 1);
-    float* JXL_RESTRICT row_out = diff_buffer;
-    const auto match_gamma_offset_v = Set(df, match_gamma_offset);
-    const auto quarter = Set(df, 0.25f);
-    for (size_t x = 0; x < xsize; x += Lanes(df)) {
-      const auto in = LoadU(df, row_in + x);
-      const auto in_r = LoadU(df, row_in + x + 1);
-      const auto in_l = LoadU(df, row_in + x - 1);
-      const auto in_t = LoadU(df, row_in2 + x);
-      const auto in_b = LoadU(df, row_in1 + x);
-      const auto base = Mul(quarter, Add(Add(in_r, in_l), Add(in_t, in_b)));
-      const auto gammacv =
-          RatioOfDerivativesOfCubicRootToSimpleGamma</*invert=*/false>(
-              df, Add(in, match_gamma_offset_v));
-      auto diff = Mul(gammacv, Sub(in, base));
-      diff = Mul(diff, diff);
-      diff = Min(diff, Set(df, limit));
-      diff = MaskingSqrt(df, diff);
-      if ((iy & 3) != 0) {
-        diff = Add(diff, LoadU(df, row_out + x));
-      }
-      StoreU(diff, df, row_out + x);
-    }
-    if (iy % 4 == 3) {
-      size_t y_out = y0_out + iy / 4;
-      float* row_d_out = pre_erosion->Row(y_out);
-      for (size_t x = 0; x < xsize_out; x++) {
-        row_d_out[x] = (row_out[x * 4] + row_out[x * 4 + 1] +
-                        row_out[x * 4 + 2] + row_out[x * 4 + 3]) *
-                       0.25f;
-      }
-      pre_erosion->PadRow(y_out, xsize_out, border);
-    }
-  }
-}
-
-}  // namespace
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jpegli
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jpegli {
-HWY_EXPORT(ComputePreErosion);
-HWY_EXPORT(FuzzyErosion);
-HWY_EXPORT(PerBlockModulations);
-
-namespace {
-
-constexpr int kPreErosionBorder = 1;
-
-}  // namespace
-
-void ComputeAdaptiveQuantField(j_compress_ptr cinfo) {
-  jpeg_comp_master* m = cinfo->master;
-  if (!m->use_adaptive_quantization) {
-    return;
-  }
-  int y_channel = cinfo->jpeg_color_space == JCS_RGB ? 1 : 0;
-  jpeg_component_info* y_comp = &cinfo->comp_info[y_channel];
-  int y_quant_01 = cinfo->quant_tbl_ptrs[y_comp->quant_tbl_no]->quantval[1];
-  if (m->next_iMCU_row == 0) {
-    m->input_buffer[y_channel].CopyRow(-1, 0, 1);
-  }
-  if (m->next_iMCU_row + 1 == cinfo->total_iMCU_rows) {
-    size_t last_row = m->ysize_blocks * DCTSIZE - 1;
-    m->input_buffer[y_channel].CopyRow(last_row + 1, last_row, 1);
-  }
-  const RowBuffer<float>& input = m->input_buffer[y_channel];
-  const size_t xsize_blocks = y_comp->width_in_blocks;
-  const size_t xsize = xsize_blocks * DCTSIZE;
-  const size_t yb0 = m->next_iMCU_row * cinfo->max_v_samp_factor;
-  const size_t yblen = cinfo->max_v_samp_factor;
-  size_t y0 = yb0 * DCTSIZE;
-  size_t ylen = cinfo->max_v_samp_factor * DCTSIZE;
-  if (y0 == 0) {
-    ylen += 4;
-  } else {
-    y0 += 4;
-  }
-  if (m->next_iMCU_row + 1 == cinfo->total_iMCU_rows) {
-    ylen -= 4;
-  }
-  HWY_DYNAMIC_DISPATCH(ComputePreErosion)
-  (input, xsize, y0, ylen, kPreErosionBorder, m->diff_buffer, &m->pre_erosion);
-  if (y0 == 0) {
-    m->pre_erosion.CopyRow(-1, 0, kPreErosionBorder);
-  }
-  if (m->next_iMCU_row + 1 == cinfo->total_iMCU_rows) {
-    size_t last_row = m->ysize_blocks * 2 - 1;
-    m->pre_erosion.CopyRow(last_row + 1, last_row, kPreErosionBorder);
-  }
-  HWY_DYNAMIC_DISPATCH(FuzzyErosion)
-  (m->pre_erosion, yb0, yblen, &m->fuzzy_erosion_tmp, &m->quant_field);
-  HWY_DYNAMIC_DISPATCH(PerBlockModulations)
-  (y_quant_01, input, yb0, yblen, &m->quant_field);
-  for (int y = 0; y < cinfo->max_v_samp_factor; ++y) {
-    float* row = m->quant_field.Row(yb0 + y);
-    for (size_t x = 0; x < xsize_blocks; ++x) {
-      row[x] = std::max(0.0f, (0.6f / row[x]) - 1.0f);
-    }
-  }
-}
-
-}  // namespace jpegli
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jpegli/adaptive_quantization.h b/third_party/jpeg-xl/lib/jpegli/adaptive_quantization.h
deleted file mode 100644
index d8537e85df2a0..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/adaptive_quantization.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_ADAPTIVE_QUANTIZATION_H_
-#define LIB_JPEGLI_ADAPTIVE_QUANTIZATION_H_
-
-#include "lib/jpegli/common.h"
-
-namespace jpegli {
-
-void ComputeAdaptiveQuantField(j_compress_ptr cinfo);
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_ADAPTIVE_QUANTIZATION_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/bit_writer.cc b/third_party/jpeg-xl/lib/jpegli/bit_writer.cc
deleted file mode 100644
index 9788f35b8d405..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/bit_writer.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/bit_writer.h"
-
-#include "lib/jpegli/encode_internal.h"
-
-namespace jpegli {
-
-void JpegBitWriterInit(j_compress_ptr cinfo) {
-  jpeg_comp_master* m = cinfo->master;
-  JpegBitWriter* bw = &m->bw;
-  size_t buffer_size = m->blocks_per_iMCU_row * (DCTSIZE2 * 16 + 8) + (1 << 16);
-  bw->cinfo = cinfo;
-  bw->data = Allocate<uint8_t>(cinfo, buffer_size, JPOOL_IMAGE);
-  bw->len = buffer_size;
-  bw->pos = 0;
-  bw->output_pos = 0;
-  bw->put_buffer = 0;
-  bw->free_bits = 64;
-  bw->healthy = true;
-}
-
-bool EmptyBitWriterBuffer(JpegBitWriter* bw) {
-  while (bw->output_pos < bw->pos) {
-    j_compress_ptr cinfo = bw->cinfo;
-    if (cinfo->dest->free_in_buffer == 0 &&
-        !(*cinfo->dest->empty_output_buffer)(cinfo)) {
-      return false;
-    }
-    size_t buflen = bw->pos - bw->output_pos;
-    size_t copylen = std::min<size_t>(cinfo->dest->free_in_buffer, buflen);
-    memcpy(cinfo->dest->next_output_byte, bw->data + bw->output_pos, copylen);
-    bw->output_pos += copylen;
-    cinfo->dest->free_in_buffer -= copylen;
-    cinfo->dest->next_output_byte += copylen;
-  }
-  bw->output_pos = bw->pos = 0;
-  return true;
-}
-
-void JumpToByteBoundary(JpegBitWriter* bw) {
-  size_t n_bits = bw->free_bits & 7u;
-  if (n_bits > 0) {
-    WriteBits(bw, n_bits, (1u << n_bits) - 1);
-  }
-  bw->put_buffer <<= bw->free_bits;
-  while (bw->free_bits <= 56) {
-    int c = (bw->put_buffer >> 56) & 0xFF;
-    EmitByte(bw, c);
-    bw->put_buffer <<= 8;
-    bw->free_bits += 8;
-  }
-  bw->put_buffer = 0;
-  bw->free_bits = 64;
-}
-
-}  // namespace jpegli
diff --git a/third_party/jpeg-xl/lib/jpegli/bit_writer.h b/third_party/jpeg-xl/lib/jpegli/bit_writer.h
deleted file mode 100644
index 3adf1eaca1f24..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/bit_writer.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_BIT_WRITER_H_
-#define LIB_JPEGLI_BIT_WRITER_H_
-
-#include <stdint.h>
-#include <string.h>
-
-#include "lib/jpegli/common.h"
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/compiler_specific.h"
-
-namespace jpegli {
-
-// Handles the packing of bits into output bytes.
-struct JpegBitWriter {
-  j_compress_ptr cinfo;
-  uint8_t* data;
-  size_t len;
-  size_t pos;
-  size_t output_pos;
-  uint64_t put_buffer;
-  int free_bits;
-  bool healthy;
-};
-
-void JpegBitWriterInit(j_compress_ptr cinfo);
-
-bool EmptyBitWriterBuffer(JpegBitWriter* bw);
-
-void JumpToByteBoundary(JpegBitWriter* bw);
-
-// Returns non-zero if and only if x has a zero byte, i.e. one of
-// x & 0xff, x & 0xff00, ..., x & 0xff00000000000000 is zero.
-static JXL_INLINE uint64_t HasZeroByte(uint64_t x) {
-  return (x - 0x0101010101010101ULL) & ~x & 0x8080808080808080ULL;
-}
-
-/**
- * Writes the given byte to the output, writes an extra zero if byte is 0xFF.
- *
- * This method is "careless" - caller must make sure that there is enough
- * space in the output buffer. Emits up to 2 bytes to buffer.
- */
-static JXL_INLINE void EmitByte(JpegBitWriter* bw, int byte) {
-  bw->data[bw->pos++] = byte;
-  if (byte == 0xFF) bw->data[bw->pos++] = 0;
-}
-
-static JXL_INLINE void DischargeBitBuffer(JpegBitWriter* bw) {
-  // At this point we are ready to emit the bytes of put_buffer to the output.
-  // The JPEG format requires that after every 0xff byte in the entropy
-  // coded section, there is a zero byte, therefore we first check if any of
-  // the bytes of put_buffer is 0xFF.
-  if (HasZeroByte(~bw->put_buffer)) {
-    // We have a 0xFF byte somewhere, examine each byte and append a zero
-    // byte if necessary.
-    EmitByte(bw, (bw->put_buffer >> 56) & 0xFF);
-    EmitByte(bw, (bw->put_buffer >> 48) & 0xFF);
-    EmitByte(bw, (bw->put_buffer >> 40) & 0xFF);
-    EmitByte(bw, (bw->put_buffer >> 32) & 0xFF);
-    EmitByte(bw, (bw->put_buffer >> 24) & 0xFF);
-    EmitByte(bw, (bw->put_buffer >> 16) & 0xFF);
-    EmitByte(bw, (bw->put_buffer >> 8) & 0xFF);
-    EmitByte(bw, (bw->put_buffer >> 0) & 0xFF);
-  } else {
-    // We don't have any 0xFF bytes, output all 8 bytes without checking.
-    StoreBE64(bw->put_buffer, bw->data + bw->pos);
-    bw->pos += 8;
-  }
-}
-
-static JXL_INLINE void WriteBits(JpegBitWriter* bw, int nbits, uint64_t bits) {
-  // This is an optimization; if everything goes well,
-  // then |nbits| is positive; if non-existing Huffman symbol is going to be
-  // encoded, its length should be zero; later encoder could check the
-  // "health" of JpegBitWriter.
-  if (nbits == 0) {
-    bw->healthy = false;
-    return;
-  }
-  bw->free_bits -= nbits;
-  if (bw->free_bits < 0) {
-    bw->put_buffer <<= (bw->free_bits + nbits);
-    bw->put_buffer |= (bits >> -bw->free_bits);
-    DischargeBitBuffer(bw);
-    bw->free_bits += 64;
-    bw->put_buffer = nbits;
-  }
-  bw->put_buffer <<= nbits;
-  bw->put_buffer |= bits;
-}
-
-}  // namespace jpegli
-#endif  // LIB_JPEGLI_BIT_WRITER_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/bitstream.cc b/third_party/jpeg-xl/lib/jpegli/bitstream.cc
deleted file mode 100644
index 4dbeb738bba2d..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/bitstream.cc
+++ /dev/null
@@ -1,451 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/bitstream.h"
-
-#include <cmath>
-
-#include "lib/jpegli/bit_writer.h"
-#include "lib/jpegli/error.h"
-#include "lib/jpegli/memory_manager.h"
-
-namespace jpegli {
-
-void WriteOutput(j_compress_ptr cinfo, const uint8_t* buf, size_t bufsize) {
-  size_t pos = 0;
-  while (pos < bufsize) {
-    if (cinfo->dest->free_in_buffer == 0 &&
-        !(*cinfo->dest->empty_output_buffer)(cinfo)) {
-      JPEGLI_ERROR("Destination suspension is not supported in markers.");
-    }
-    size_t len = std::min<size_t>(cinfo->dest->free_in_buffer, bufsize - pos);
-    memcpy(cinfo->dest->next_output_byte, buf + pos, len);
-    pos += len;
-    cinfo->dest->free_in_buffer -= len;
-    cinfo->dest->next_output_byte += len;
-  }
-}
-
-void WriteOutput(j_compress_ptr cinfo, const std::vector<uint8_t>& bytes) {
-  WriteOutput(cinfo, bytes.data(), bytes.size());
-}
-
-void WriteOutput(j_compress_ptr cinfo, std::initializer_list<uint8_t> bytes) {
-  WriteOutput(cinfo, bytes.begin(), bytes.size());
-}
-
-void EncodeAPP0(j_compress_ptr cinfo) {
-  WriteOutput(cinfo,
-              {0xff, 0xe0, 0, 16, 'J', 'F', 'I', 'F', '\0',
-               cinfo->JFIF_major_version, cinfo->JFIF_minor_version,
-               cinfo->density_unit, static_cast<uint8_t>(cinfo->X_density >> 8),
-               static_cast<uint8_t>(cinfo->X_density & 0xff),
-               static_cast<uint8_t>(cinfo->Y_density >> 8),
-               static_cast<uint8_t>(cinfo->Y_density & 0xff), 0, 0});
-}
-
-void EncodeAPP14(j_compress_ptr cinfo) {
-  uint8_t color_transform = cinfo->jpeg_color_space == JCS_YCbCr  ? 1
-                            : cinfo->jpeg_color_space == JCS_YCCK ? 2
-                                                                  : 0;
-  WriteOutput(cinfo, {0xff, 0xee, 0, 14, 'A', 'd', 'o', 'b', 'e', 0, 100, 0, 0,
-                      0, 0, color_transform});
-}
-
-void WriteFileHeader(j_compress_ptr cinfo) {
-  WriteOutput(cinfo, {0xFF, 0xD8});  // SOI
-  if (cinfo->write_JFIF_header) {
-    EncodeAPP0(cinfo);
-  }
-  if (cinfo->write_Adobe_marker) {
-    EncodeAPP14(cinfo);
-  }
-}
-
-bool EncodeDQT(j_compress_ptr cinfo, bool write_all_tables) {
-  uint8_t data[4 + NUM_QUANT_TBLS * (1 + 2 * DCTSIZE2)];  // 520 bytes
-  size_t pos = 0;
-  data[pos++] = 0xFF;
-  data[pos++] = 0xDB;
-  pos += 2;  // Length will be filled in later.
-
-  int send_table[NUM_QUANT_TBLS] = {};
-  if (write_all_tables) {
-    for (int i = 0; i < NUM_QUANT_TBLS; ++i) {
-      if (cinfo->quant_tbl_ptrs[i]) send_table[i] = 1;
-    }
-  } else {
-    for (int c = 0; c < cinfo->num_components; ++c) {
-      send_table[cinfo->comp_info[c].quant_tbl_no] = 1;
-    }
-  }
-
-  bool is_baseline = true;
-  for (int i = 0; i < NUM_QUANT_TBLS; ++i) {
-    if (!send_table[i]) continue;
-    JQUANT_TBL* quant_table = cinfo->quant_tbl_ptrs[i];
-    if (quant_table == nullptr) {
-      JPEGLI_ERROR("Missing quant table %d", i);
-    }
-    int precision = 0;
-    for (UINT16 q : quant_table->quantval) {
-      if (q > 255) {
-        precision = 1;
-        is_baseline = false;
-      }
-    }
-    if (quant_table->sent_table) {
-      continue;
-    }
-    data[pos++] = (precision << 4) + i;
-    for (size_t j = 0; j < DCTSIZE2; ++j) {
-      int val_idx = kJPEGNaturalOrder[j];
-      int val = quant_table->quantval[val_idx];
-      if (val == 0) {
-        JPEGLI_ERROR("Invalid quantval 0.");
-      }
-      if (precision) {
-        data[pos++] = val >> 8;
-      }
-      data[pos++] = val & 0xFFu;
-    }
-    quant_table->sent_table = TRUE;
-  }
-  if (pos > 4) {
-    data[2] = (pos - 2) >> 8u;
-    data[3] = (pos - 2) & 0xFFu;
-    WriteOutput(cinfo, data, pos);
-  }
-  return is_baseline;
-}
-
-void EncodeSOF(j_compress_ptr cinfo, bool is_baseline) {
-  if (cinfo->data_precision != kJpegPrecision) {
-    JPEGLI_ERROR("Unsupported data precision %d", cinfo->data_precision);
-  }
-  const uint8_t marker = cinfo->progressive_mode ? 0xc2
-                         : is_baseline           ? 0xc0
-                                                 : 0xc1;
-  const size_t n_comps = cinfo->num_components;
-  const size_t marker_len = 8 + 3 * n_comps;
-  std::vector<uint8_t> data(marker_len + 2);
-  size_t pos = 0;
-  data[pos++] = 0xFF;
-  data[pos++] = marker;
-  data[pos++] = marker_len >> 8u;
-  data[pos++] = marker_len & 0xFFu;
-  data[pos++] = kJpegPrecision;
-  data[pos++] = cinfo->image_height >> 8u;
-  data[pos++] = cinfo->image_height & 0xFFu;
-  data[pos++] = cinfo->image_width >> 8u;
-  data[pos++] = cinfo->image_width & 0xFFu;
-  data[pos++] = n_comps;
-  for (size_t i = 0; i < n_comps; ++i) {
-    jpeg_component_info* comp = &cinfo->comp_info[i];
-    data[pos++] = comp->component_id;
-    data[pos++] = ((comp->h_samp_factor << 4u) | (comp->v_samp_factor));
-    const uint32_t quant_idx = comp->quant_tbl_no;
-    if (cinfo->quant_tbl_ptrs[quant_idx] == nullptr) {
-      JPEGLI_ERROR("Invalid component quant table index %u.", quant_idx);
-    }
-    data[pos++] = quant_idx;
-  }
-  WriteOutput(cinfo, data);
-}
-
-void WriteFrameHeader(j_compress_ptr cinfo) {
-  jpeg_comp_master* m = cinfo->master;
-  bool is_baseline = EncodeDQT(cinfo, /*write_all_tables=*/false);
-  if (cinfo->progressive_mode || cinfo->arith_code ||
-      cinfo->data_precision != 8) {
-    is_baseline = false;
-  }
-  for (size_t i = 0; i < m->num_huffman_tables; ++i) {
-    int slot_id = m->slot_id_map[i];
-    if (slot_id > 0x11 || (slot_id > 0x01 && slot_id < 0x10)) {
-      is_baseline = false;
-    }
-  }
-  EncodeSOF(cinfo, is_baseline);
-}
-
-void EncodeDRI(j_compress_ptr cinfo) {
-  WriteOutput(cinfo, {0xFF, 0xDD, 0, 4,
-                      static_cast<uint8_t>(cinfo->restart_interval >> 8),
-                      static_cast<uint8_t>(cinfo->restart_interval & 0xFF)});
-}
-
-void EncodeDHT(j_compress_ptr cinfo, size_t offset, size_t num) {
-  jpeg_comp_master* m = cinfo->master;
-  size_t marker_len = 2;
-  for (size_t i = 0; i < num; ++i) {
-    const JHUFF_TBL& table = m->huffman_tables[offset + i];
-    if (table.sent_table) continue;
-    marker_len += kJpegHuffmanMaxBitLength + 1;
-    for (size_t j = 0; j <= kJpegHuffmanMaxBitLength; ++j) {
-      marker_len += table.bits[j];
-    }
-  }
-  std::vector<uint8_t> data(marker_len + 2);
-  size_t pos = 0;
-  data[pos++] = 0xFF;
-  data[pos++] = 0xC4;
-  data[pos++] = marker_len >> 8u;
-  data[pos++] = marker_len & 0xFFu;
-  for (size_t i = 0; i < num; ++i) {
-    const JHUFF_TBL& table = m->huffman_tables[offset + i];
-    if (table.sent_table) continue;
-    size_t total_count = 0;
-    for (size_t i = 0; i <= kJpegHuffmanMaxBitLength; ++i) {
-      total_count += table.bits[i];
-    }
-    data[pos++] = m->slot_id_map[offset + i];
-    for (size_t i = 1; i <= kJpegHuffmanMaxBitLength; ++i) {
-      data[pos++] = table.bits[i];
-    }
-    for (size_t i = 0; i < total_count; ++i) {
-      data[pos++] = table.huffval[i];
-    }
-  }
-  if (marker_len > 2) {
-    WriteOutput(cinfo, data);
-  }
-}
-
-void EncodeSOS(j_compress_ptr cinfo, int scan_index) {
-  jpeg_comp_master* m = cinfo->master;
-  const jpeg_scan_info* scan_info = &cinfo->scan_info[scan_index];
-  const size_t marker_len = 6 + 2 * scan_info->comps_in_scan;
-  std::vector<uint8_t> data(marker_len + 2);
-  size_t pos = 0;
-  data[pos++] = 0xFF;
-  data[pos++] = 0xDA;
-  data[pos++] = marker_len >> 8u;
-  data[pos++] = marker_len & 0xFFu;
-  data[pos++] = scan_info->comps_in_scan;
-  for (int i = 0; i < scan_info->comps_in_scan; ++i) {
-    int comp_idx = scan_info->component_index[i];
-    data[pos++] = cinfo->comp_info[comp_idx].component_id;
-    int dc_slot_id = m->slot_id_map[m->context_map[comp_idx]];
-    int ac_context = m->ac_ctx_offset[scan_index] + i;
-    int ac_slot_id = m->slot_id_map[m->context_map[ac_context]];
-    data[pos++] = (dc_slot_id << 4u) + (ac_slot_id - 16);
-  }
-  data[pos++] = scan_info->Ss;
-  data[pos++] = scan_info->Se;
-  data[pos++] = ((scan_info->Ah << 4u) | (scan_info->Al));
-  WriteOutput(cinfo, data);
-}
-
-void WriteScanHeader(j_compress_ptr cinfo, int scan_index) {
-  jpeg_comp_master* m = cinfo->master;
-  const jpeg_scan_info* scan_info = &cinfo->scan_info[scan_index];
-  cinfo->restart_interval = m->scan_token_info[scan_index].restart_interval;
-  if (cinfo->restart_interval != m->last_restart_interval) {
-    EncodeDRI(cinfo);
-    m->last_restart_interval = cinfo->restart_interval;
-  }
-  size_t num_dht = 0;
-  if (scan_index == 0) {
-    // For the first scan we emit all DC and at most 4 AC Huffman codes.
-    for (size_t i = 0, num_ac = 0; i < m->num_huffman_tables; ++i) {
-      if (m->slot_id_map[i] >= 16 && num_ac++ >= 4) break;
-      ++num_dht;
-    }
-  } else if (scan_info->Ss > 0) {
-    // For multi-scan sequential and progressive DC scans we have already
-    // emitted all Huffman codes that we need before the first scan. For
-    // progressive AC scans we only need at most one new Huffman code.
-    if (m->context_map[m->ac_ctx_offset[scan_index]] == m->next_dht_index) {
-      num_dht = 1;
-    }
-  }
-  if (num_dht > 0) {
-    EncodeDHT(cinfo, m->next_dht_index, num_dht);
-    m->next_dht_index += num_dht;
-  }
-  EncodeSOS(cinfo, scan_index);
-}
-
-void WriteBlock(const int32_t* JXL_RESTRICT symbols,
-                const int32_t* JXL_RESTRICT extra_bits, const int num_nonzeros,
-                const bool emit_eob,
-                const HuffmanCodeTable* JXL_RESTRICT dc_code,
-                const HuffmanCodeTable* JXL_RESTRICT ac_code,
-                JpegBitWriter* JXL_RESTRICT bw) {
-  int symbol = symbols[0];
-  WriteBits(bw, dc_code->depth[symbol], dc_code->code[symbol] | extra_bits[0]);
-  for (int i = 1; i < num_nonzeros; ++i) {
-    symbol = symbols[i];
-    if (symbol > 255) {
-      WriteBits(bw, ac_code->depth[0xf0], ac_code->code[0xf0]);
-      symbol -= 256;
-      if (symbol > 255) {
-        WriteBits(bw, ac_code->depth[0xf0], ac_code->code[0xf0]);
-        symbol -= 256;
-        if (symbol > 255) {
-          WriteBits(bw, ac_code->depth[0xf0], ac_code->code[0xf0]);
-          symbol -= 256;
-        }
-      }
-    }
-    WriteBits(bw, ac_code->depth[symbol],
-              ac_code->code[symbol] | extra_bits[i]);
-  }
-  if (emit_eob) {
-    WriteBits(bw, ac_code->depth[0], ac_code->code[0]);
-  }
-}
-
-namespace {
-
-JXL_INLINE void EmitMarker(JpegBitWriter* bw, int marker) {
-  bw->data[bw->pos++] = 0xFF;
-  bw->data[bw->pos++] = marker;
-}
-
-void WriteTokens(j_compress_ptr cinfo, int scan_index, JpegBitWriter* bw) {
-  jpeg_comp_master* m = cinfo->master;
-  HuffmanCodeTable* coding_tables = &m->coding_tables[0];
-  int next_restart_marker = 0;
-  const ScanTokenInfo& sti = m->scan_token_info[scan_index];
-  size_t num_token_arrays = m->cur_token_array + 1;
-  size_t total_tokens = 0;
-  size_t restart_idx = 0;
-  size_t next_restart = sti.restarts[restart_idx];
-  uint8_t* context_map = m->context_map;
-  for (size_t i = 0; i < num_token_arrays; ++i) {
-    Token* tokens = m->token_arrays[i].tokens;
-    size_t num_tokens = m->token_arrays[i].num_tokens;
-    if (sti.token_offset < total_tokens + num_tokens &&
-        total_tokens < sti.token_offset + sti.num_tokens) {
-      size_t start_ix =
-          total_tokens < sti.token_offset ? sti.token_offset - total_tokens : 0;
-      size_t end_ix = std::min(sti.token_offset + sti.num_tokens - total_tokens,
-                               num_tokens);
-      size_t cycle_len = bw->len / 8;
-      size_t next_cycle = cycle_len;
-      for (size_t i = start_ix; i < end_ix; ++i) {
-        if (total_tokens + i == next_restart) {
-          JumpToByteBoundary(bw);
-          EmitMarker(bw, 0xD0 + next_restart_marker);
-          next_restart_marker += 1;
-          next_restart_marker &= 0x7;
-          next_restart = sti.restarts[++restart_idx];
-        }
-        Token t = tokens[i];
-        const HuffmanCodeTable* code = &coding_tables[context_map[t.context]];
-        WriteBits(bw, code->depth[t.symbol], code->code[t.symbol] | t.bits);
-        if (--next_cycle == 0) {
-          if (!EmptyBitWriterBuffer(bw)) {
-            JPEGLI_ERROR(
-                "Output suspension is not supported in "
-                "finish_compress");
-          }
-          next_cycle = cycle_len;
-        }
-      }
-    }
-    total_tokens += num_tokens;
-  }
-}
-
-void WriteACRefinementTokens(j_compress_ptr cinfo, int scan_index,
-                             JpegBitWriter* bw) {
-  jpeg_comp_master* m = cinfo->master;
-  const ScanTokenInfo& sti = m->scan_token_info[scan_index];
-  const uint8_t context = m->ac_ctx_offset[scan_index];
-  const HuffmanCodeTable* code = &m->coding_tables[m->context_map[context]];
-  size_t cycle_len = bw->len / 64;
-  size_t next_cycle = cycle_len;
-  size_t refbit_idx = 0;
-  size_t eobrun_idx = 0;
-  size_t restart_idx = 0;
-  size_t next_restart = sti.restarts[restart_idx];
-  int next_restart_marker = 0;
-  for (size_t i = 0; i < sti.num_tokens; ++i) {
-    if (i == next_restart) {
-      JumpToByteBoundary(bw);
-      EmitMarker(bw, 0xD0 + next_restart_marker);
-      next_restart_marker += 1;
-      next_restart_marker &= 0x7;
-      next_restart = sti.restarts[++restart_idx];
-    }
-    RefToken t = sti.tokens[i];
-    int symbol = t.symbol & 253;
-    uint16_t bits = 0;
-    if ((symbol & 1) == 0) {
-      int r = symbol >> 4;
-      if (r > 0 && r < 15) {
-        bits = sti.eobruns[eobrun_idx++];
-      }
-    } else {
-      bits = (t.symbol >> 1) & 1;
-    }
-    WriteBits(bw, code->depth[symbol], code->code[symbol] | bits);
-    for (int j = 0; j < t.refbits; ++j) {
-      WriteBits(bw, 1, sti.refbits[refbit_idx++]);
-    }
-    if (--next_cycle == 0) {
-      if (!EmptyBitWriterBuffer(bw)) {
-        JPEGLI_ERROR("Output suspension is not supported in finish_compress");
-      }
-      next_cycle = cycle_len;
-    }
-  }
-}
-
-void WriteDCRefinementBits(j_compress_ptr cinfo, int scan_index,
-                           JpegBitWriter* bw) {
-  jpeg_comp_master* m = cinfo->master;
-  const ScanTokenInfo& sti = m->scan_token_info[scan_index];
-  size_t restart_idx = 0;
-  size_t next_restart = sti.restarts[restart_idx];
-  int next_restart_marker = 0;
-  size_t cycle_len = bw->len * 4;
-  size_t next_cycle = cycle_len;
-  size_t refbit_idx = 0;
-  for (size_t i = 0; i < sti.num_tokens; ++i) {
-    if (i == next_restart) {
-      JumpToByteBoundary(bw);
-      EmitMarker(bw, 0xD0 + next_restart_marker);
-      next_restart_marker += 1;
-      next_restart_marker &= 0x7;
-      next_restart = sti.restarts[++restart_idx];
-    }
-    WriteBits(bw, 1, sti.refbits[refbit_idx++]);
-    if (--next_cycle == 0) {
-      if (!EmptyBitWriterBuffer(bw)) {
-        JPEGLI_ERROR(
-            "Output suspension is not supported in "
-            "finish_compress");
-      }
-      next_cycle = cycle_len;
-    }
-  }
-}
-
-}  // namespace
-
-void WriteScanData(j_compress_ptr cinfo, int scan_index) {
-  const jpeg_scan_info* scan_info = &cinfo->scan_info[scan_index];
-  JpegBitWriter* bw = &cinfo->master->bw;
-  if (scan_info->Ah == 0) {
-    WriteTokens(cinfo, scan_index, bw);
-  } else if (scan_info->Ss > 0) {
-    WriteACRefinementTokens(cinfo, scan_index, bw);
-  } else {
-    WriteDCRefinementBits(cinfo, scan_index, bw);
-  }
-  if (!bw->healthy) {
-    JPEGLI_ERROR("Unknown Huffman coded symbol found in scan %d", scan_index);
-  }
-  JumpToByteBoundary(bw);
-  if (!EmptyBitWriterBuffer(bw)) {
-    JPEGLI_ERROR("Output suspension is not supported in finish_compress");
-  }
-}
-
-}  // namespace jpegli
diff --git a/third_party/jpeg-xl/lib/jpegli/bitstream.h b/third_party/jpeg-xl/lib/jpegli/bitstream.h
deleted file mode 100644
index bed441aefe438..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/bitstream.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_BITSTREAM_H_
-#define LIB_JPEGLI_BITSTREAM_H_
-
-#include <initializer_list>
-#include <vector>
-
-#include "lib/jpegli/encode_internal.h"
-
-namespace jpegli {
-
-void WriteOutput(j_compress_ptr cinfo, const uint8_t* buf, size_t bufsize);
-void WriteOutput(j_compress_ptr cinfo, const std::vector<uint8_t>& bytes);
-void WriteOutput(j_compress_ptr cinfo, std::initializer_list<uint8_t> bytes);
-
-void EncodeAPP0(j_compress_ptr cinfo);
-void EncodeAPP14(j_compress_ptr cinfo);
-void WriteFileHeader(j_compress_ptr cinfo);
-
-// Returns true of only baseline 8-bit tables are used.
-bool EncodeDQT(j_compress_ptr cinfo, bool write_all_tables);
-void EncodeSOF(j_compress_ptr cinfo, bool is_baseline);
-void WriteFrameHeader(j_compress_ptr cinfo);
-
-void EncodeDRI(j_compress_ptr cinfo);
-void EncodeDHT(j_compress_ptr cinfo, size_t offset, size_t num);
-void EncodeSOS(j_compress_ptr cinfo, int scan_index);
-void WriteScanHeader(j_compress_ptr cinfo, int scan_index);
-
-void WriteBlock(const int32_t* JXL_RESTRICT symbols,
-                const int32_t* JXL_RESTRICT extra_bits, int num_nonzeros,
-                bool emit_eob, const HuffmanCodeTable* JXL_RESTRICT dc_code,
-                const HuffmanCodeTable* JXL_RESTRICT ac_code,
-                JpegBitWriter* JXL_RESTRICT bw);
-void WriteScanData(j_compress_ptr cinfo, int scan_index);
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_BITSTREAM_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/color_quantize.cc b/third_party/jpeg-xl/lib/jpegli/color_quantize.cc
deleted file mode 100644
index d5b0097f3d066..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/color_quantize.cc
+++ /dev/null
@@ -1,536 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/color_quantize.h"
-
-#include <cmath>
-#include <limits>
-#include <unordered_map>
-
-#include "lib/jpegli/decode_internal.h"
-#include "lib/jpegli/error.h"
-
-namespace jpegli {
-
-namespace {
-
-constexpr int kNumColorCellBits[kMaxComponents] = {3, 4, 3, 3};
-constexpr int kCompW[kMaxComponents] = {2, 3, 1, 1};
-
-int Pow(int a, int b) {
-  int r = 1;
-  for (int i = 0; i < b; ++i) {
-    r *= a;
-  }
-  return r;
-}
-
-int ComponentOrder(j_decompress_ptr cinfo, int i) {
-  if (cinfo->out_color_components == 3) {
-    return i < 2 ? 1 - i : i;
-  }
-  return i;
-}
-
-int GetColorComponent(int i, int N) {
-  return (i * 255 + (N - 1) / 2) / (N - 1);
-}
-
-}  // namespace
-
-void ChooseColorMap1Pass(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  int components = cinfo->out_color_components;
-  int desired = std::min(cinfo->desired_number_of_colors, 256);
-  int num = 1;
-  while (Pow(num + 1, components) <= desired) {
-    ++num;
-  }
-  if (num == 1) {
-    JPEGLI_ERROR("Too few colors (%d) in requested colormap", desired);
-  }
-  int actual = Pow(num, components);
-  for (int i = 0; i < components; ++i) {
-    m->num_colors_[i] = num;
-  }
-  while (actual < desired) {
-    int total = actual;
-    for (int i = 0; i < components; ++i) {
-      int c = ComponentOrder(cinfo, i);
-      int new_total = (actual / m->num_colors_[c]) * (m->num_colors_[c] + 1);
-      if (new_total <= desired) {
-        ++m->num_colors_[c];
-        actual = new_total;
-      }
-    }
-    if (actual == total) {
-      break;
-    }
-  }
-  cinfo->actual_number_of_colors = actual;
-  cinfo->colormap = (*cinfo->mem->alloc_sarray)(
-      reinterpret_cast<j_common_ptr>(cinfo), JPOOL_IMAGE, actual, components);
-  int next_color[kMaxComponents] = {0};
-  for (int i = 0; i < actual; ++i) {
-    for (int c = 0; c < components; ++c) {
-      cinfo->colormap[c][i] =
-          GetColorComponent(next_color[c], m->num_colors_[c]);
-    }
-    int c = components - 1;
-    while (c > 0 && next_color[c] + 1 == m->num_colors_[c]) {
-      next_color[c--] = 0;
-    }
-    ++next_color[c];
-  }
-  if (!m->colormap_lut_) {
-    m->colormap_lut_ = Allocate<uint8_t>(cinfo, components * 256, JPOOL_IMAGE);
-  }
-  int stride = actual;
-  for (int c = 0; c < components; ++c) {
-    int N = m->num_colors_[c];
-    stride /= N;
-    for (int i = 0; i < 256; ++i) {
-      int index = ((2 * i - 1) * (N - 1) + 254) / 510;
-      m->colormap_lut_[c * 256 + i] = index * stride;
-    }
-  }
-}
-
-namespace {
-
-// 2^13 priority levels for the PQ seems to be a good compromise between
-// accuracy, running time and stack space usage.
-const int kMaxPriority = 1 << 13;
-const int kMaxLevel = 3;
-
-// This function is used in the multi-resolution grid to be able to compute
-// the keys for the different resolutions by just shifting the first key.
-inline int InterlaceBitsRGB(uint8_t r, uint8_t g, uint8_t b) {
-  int z = 0;
-  for (int i = 0; i < 7; ++i) {
-    z += (r >> 5) & 4;
-    z += (g >> 6) & 2;
-    z += (b >> 7);
-    z <<= 3;
-    r <<= 1;
-    g <<= 1;
-    b <<= 1;
-  }
-  z += (r >> 5) & 4;
-  z += (g >> 6) & 2;
-  z += (b >> 7);
-  return z;
-}
-
-// This function will compute the actual priorities of the colors based on
-// the current distance from the palette, the population count and the signals
-// from the multi-resolution grid.
-inline int Priority(int d, int n, const int* density, const int* radius) {
-  int p = d * n;
-  for (int level = 0; level < kMaxLevel; ++level) {
-    if (d > radius[level]) {
-      p += density[level] * (d - radius[level]);
-    }
-  }
-  return std::min(kMaxPriority - 1, p >> 4);
-}
-
-inline int ColorIntQuadDistanceRGB(uint8_t r1, uint8_t g1, uint8_t b1,
-                                   uint8_t r2, uint8_t g2, uint8_t b2) {
-  // weights for the intensity calculation
-  static constexpr int ired = 2;
-  static constexpr int igreen = 5;
-  static constexpr int iblue = 1;
-  // normalization factor for the intensity calculation (2^ishift)
-  static constexpr int ishift = 3;
-  const int rd = r1 - r2;
-  const int gd = g1 - g2;
-  const int bd = b1 - b2;
-  const int id = ired * rd + igreen * gd + iblue * bd;
-  return rd * rd + gd * gd + bd * bd + ((id * id) >> (2 * ishift));
-}
-
-inline int ScaleQuadDistanceRGB(int d) {
-  return static_cast<int>(std::lround(sqrt(d * 0.25)));
-}
-
-// The function updates the minimal distances, the clustering and the
-// quantization error after the insertion of the new color into the palette.
-void AddToRGBPalette(const uint8_t* red, const uint8_t* green,
-                     const uint8_t* blue,
-                     const int* count,  // histogram of colors
-                     const int index,   // index of color to be added
-                     const int k,       // size of current palette
-                     const int n,       // number of colors
-                     int* dist,         // array of distances from palette
-                     int* cluster,      // mapping of color indices to palette
-                     int* center,       // the inverse mapping
-                     int64_t* error) {  // measure of the quantization error
-  center[k] = index;
-  cluster[index] = k;
-  *error -=
-      static_cast<int64_t>(dist[index]) * static_cast<int64_t>(count[index]);
-  dist[index] = 0;
-  for (int j = 0; j < n; ++j) {
-    if (dist[j] > 0) {
-      const int d = ColorIntQuadDistanceRGB(
-          red[index], green[index], blue[index], red[j], green[j], blue[j]);
-      if (d < dist[j]) {
-        *error += static_cast<int64_t>((d - dist[j])) *
-                  static_cast<int64_t>(count[j]);
-        dist[j] = d;
-        cluster[j] = k;
-      }
-    }
-  }
-}
-
-struct RGBPixelHasher {
-  // A quick but good-enough hash to get 24 bits of RGB into the lower 12 bits.
-  size_t operator()(uint32_t a) const { return (a ^ (a >> 12)) * 0x9e3779b9; }
-};
-
-struct WangHasher {
-  // Thomas Wang's Hash.  Nearly perfect and still quite fast.  Above (for
-  // pixels) we use a simpler hash because the number of hash calls is
-  // proportional to the number of pixels and that hash dominates; we want the
-  // cost to be minimal and we start with a large table.  We can use a better
-  // hash for the histogram since the number of hash calls is proportional to
-  // the number of unique colors in the image, which is hopefully much smaller.
-  // Note that the difference is slight; e.g. replacing RGBPixelHasher with
-  // WangHasher only slows things down by 5% on an Opteron.
-  size_t operator()(uint32_t a) const {
-    a = (a ^ 61) ^ (a >> 16);
-    a = a + (a << 3);
-    a = a ^ (a >> 4);
-    a = a * 0x27d4eb2d;
-    a = a ^ (a >> 15);
-    return a;
-  }
-};
-
-// Build an index of all the different colors in the input
-// image. To do this we map the 24 bit RGB representation of the colors
-// to a unique integer index assigned to the different colors in order of
-// appearance in the image.  Return the number of unique colors found.
-// The colors are pre-quantized to 3 * 6 bits precision.
-int BuildRGBColorIndex(const uint8_t* const image, int const num_pixels,
-                       int* const count, uint8_t* const red,
-                       uint8_t* const green, uint8_t* const blue) {
-  // Impossible because rgb are in the low 24 bits, and the upper 8 bits is 0.
-  const uint32_t impossible_pixel_value = 0x10000000;
-  std::unordered_map<uint32_t, int, RGBPixelHasher> index_map(1 << 12);
-  std::unordered_map<uint32_t, int, RGBPixelHasher>::iterator index_map_lookup;
-  const uint8_t* imagep = &image[0];
-  uint32_t prev_pixel = impossible_pixel_value;
-  int index = 0;
-  int n = 0;
-  for (int i = 0; i < num_pixels; ++i) {
-    uint8_t r = ((*imagep++) & 0xfc) + 2;
-    uint8_t g = ((*imagep++) & 0xfc) + 2;
-    uint8_t b = ((*imagep++) & 0xfc) + 2;
-    uint32_t pixel = (b << 16) | (g << 8) | r;
-    if (pixel != prev_pixel) {
-      prev_pixel = pixel;
-      index_map_lookup = index_map.find(pixel);
-      if (index_map_lookup != index_map.end()) {
-        index = index_map_lookup->second;
-      } else {
-        index_map[pixel] = index = n++;
-        red[index] = r;
-        green[index] = g;
-        blue[index] = b;
-      }
-    }
-    ++count[index];
-  }
-  return n;
-}
-
-}  // namespace
-
-void ChooseColorMap2Pass(j_decompress_ptr cinfo) {
-  if (cinfo->out_color_space != JCS_RGB) {
-    JPEGLI_ERROR("Two-pass quantizer must use RGB output color space.");
-  }
-  jpeg_decomp_master* m = cinfo->master;
-  const size_t num_pixels = cinfo->output_width * cinfo->output_height;
-  const int max_color_count = std::max<size_t>(num_pixels, 1u << 18);
-  const int max_palette_size = cinfo->desired_number_of_colors;
-  std::unique_ptr<uint8_t[]> red(new uint8_t[max_color_count]);
-  std::unique_ptr<uint8_t[]> green(new uint8_t[max_color_count]);
-  std::unique_ptr<uint8_t[]> blue(new uint8_t[max_color_count]);
-  std::vector<int> count(max_color_count, 0);
-  // number of colors
-  int n = BuildRGBColorIndex(m->pixels_, num_pixels, count.data(), &red[0],
-                             &green[0], &blue[0]);
-
-  std::vector<int> dist(n, std::numeric_limits<int>::max());
-  std::vector<int> cluster(n);
-  std::vector<bool> in_palette(n, false);
-  int center[256];
-  int k = 0;  // palette size
-  const int count_threshold = (num_pixels * 4) / max_palette_size;
-  static constexpr int kAveragePixelErrorThreshold = 1;
-  const int64_t error_threshold = num_pixels * kAveragePixelErrorThreshold;
-  int64_t error = 0;  // quantization error
-
-  int max_count = 0;
-  int winner = 0;
-  for (int i = 0; i < n; ++i) {
-    if (count[i] > max_count) {
-      max_count = count[i];
-      winner = i;
-    }
-    if (!in_palette[i] && count[i] > count_threshold) {
-      AddToRGBPalette(&red[0], &green[0], &blue[0], count.data(), i, k++, n,
-                      dist.data(), cluster.data(), &center[0], &error);
-      in_palette[i] = true;
-    }
-  }
-  if (k == 0) {
-    AddToRGBPalette(&red[0], &green[0], &blue[0], count.data(), winner, k++, n,
-                    dist.data(), cluster.data(), &center[0], &error);
-    in_palette[winner] = true;
-  }
-
-  // Calculation of the multi-resolution density grid.
-  std::vector<int> density(n * kMaxLevel);
-  std::vector<int> radius(n * kMaxLevel);
-  std::unordered_map<uint32_t, int, WangHasher> histogram[kMaxLevel];
-  for (int level = 0; level < kMaxLevel; ++level) {
-    // This value is never used because key = InterlaceBitsRGB(...) >> 6
-  }
-
-  for (int i = 0; i < n; ++i) {
-    if (!in_palette[i]) {
-      const int key = InterlaceBitsRGB(red[i], green[i], blue[i]) >> 6;
-      for (int level = 0; level < kMaxLevel; ++level) {
-        histogram[level][key >> (3 * level)] += count[i];
-      }
-    }
-  }
-  for (int i = 0; i < n; ++i) {
-    if (!in_palette[i]) {
-      for (int level = 0; level < kMaxLevel; ++level) {
-        const int mask = (4 << level) - 1;
-        const int rd = std::max(red[i] & mask, mask - (red[i] & mask));
-        const int gd = std::max(green[i] & mask, mask - (green[i] & mask));
-        const int bd = std::max(blue[i] & mask, mask - (blue[i] & mask));
-        radius[i * kMaxLevel + level] =
-            ScaleQuadDistanceRGB(ColorIntQuadDistanceRGB(0, 0, 0, rd, gd, bd));
-      }
-      const int key = InterlaceBitsRGB(red[i], green[i], blue[i]) >> 6;
-      if (kMaxLevel > 0) {
-        density[i * kMaxLevel] = histogram[0][key] - count[i];
-      }
-      for (int level = 1; level < kMaxLevel; ++level) {
-        density[i * kMaxLevel + level] =
-            (histogram[level][key >> (3 * level)] -
-             histogram[level - 1][key >> (3 * level - 3)]);
-      }
-    }
-  }
-
-  // Calculate the initial error now that the palette has been initialized.
-  error = 0;
-  for (int i = 0; i < n; ++i) {
-    error += static_cast<int64_t>(dist[i]) * static_cast<int64_t>(count[i]);
-  }
-
-  std::unique_ptr<std::vector<int>[]> bucket_array(
-      new std::vector<int>[kMaxPriority]);
-  int top_priority = -1;
-  for (int i = 0; i < n; ++i) {
-    if (!in_palette[i]) {
-      int priority = Priority(ScaleQuadDistanceRGB(dist[i]), count[i],
-                              &density[i * kMaxLevel], &radius[i * kMaxLevel]);
-      bucket_array[priority].push_back(i);
-      top_priority = std::max(priority, top_priority);
-    }
-  }
-  double error_accum = 0;
-  while (top_priority >= 0 && k < max_palette_size) {
-    if (error < error_threshold) {
-      error_accum += std::min(error_threshold, error_threshold - error);
-      if (error_accum >= 10 * error_threshold) {
-        break;
-      }
-    }
-    int i = bucket_array[top_priority].back();
-    int priority = Priority(ScaleQuadDistanceRGB(dist[i]), count[i],
-                            &density[i * kMaxLevel], &radius[i * kMaxLevel]);
-    if (priority < top_priority) {
-      bucket_array[priority].push_back(i);
-    } else {
-      AddToRGBPalette(&red[0], &green[0], &blue[0], count.data(), i, k++, n,
-                      dist.data(), cluster.data(), &center[0], &error);
-    }
-    bucket_array[top_priority].pop_back();
-    while (top_priority >= 0 && bucket_array[top_priority].empty()) {
-      --top_priority;
-    }
-  }
-
-  cinfo->actual_number_of_colors = k;
-  cinfo->colormap = (*cinfo->mem->alloc_sarray)(
-      reinterpret_cast<j_common_ptr>(cinfo), JPOOL_IMAGE, k, 3);
-  for (int i = 0; i < k; ++i) {
-    int index = center[i];
-    cinfo->colormap[0][i] = red[index];
-    cinfo->colormap[1][i] = green[index];
-    cinfo->colormap[2][i] = blue[index];
-  }
-}
-
-namespace {
-
-void FindCandidatesForCell(j_decompress_ptr cinfo, int ncomp, const int cell[],
-                           std::vector<uint8_t>* candidates) {
-  int cell_min[kMaxComponents];
-  int cell_max[kMaxComponents];
-  int cell_center[kMaxComponents];
-  for (int c = 0; c < ncomp; ++c) {
-    cell_min[c] = cell[c] << (8 - kNumColorCellBits[c]);
-    cell_max[c] = cell_min[c] + (1 << (8 - kNumColorCellBits[c])) - 1;
-    cell_center[c] = (cell_min[c] + cell_max[c]) >> 1;
-  }
-  int min_maxdist = std::numeric_limits<int>::max();
-  int mindist[256];
-  for (int i = 0; i < cinfo->actual_number_of_colors; ++i) {
-    int dmin = 0;
-    int dmax = 0;
-    for (int c = 0; c < ncomp; ++c) {
-      int palette_c = cinfo->colormap[c][i];
-      int dminc = 0;
-      int dmaxc;
-      if (palette_c < cell_min[c]) {
-        dminc = cell_min[c] - palette_c;
-        dmaxc = cell_max[c] - palette_c;
-      } else if (palette_c > cell_max[c]) {
-        dminc = palette_c - cell_max[c];
-        dmaxc = palette_c - cell_min[c];
-      } else if (palette_c > cell_center[c]) {
-        dmaxc = palette_c - cell_min[c];
-      } else {
-        dmaxc = cell_max[c] - palette_c;
-      }
-      dminc *= kCompW[c];
-      dmaxc *= kCompW[c];
-      dmin += dminc * dminc;
-      dmax += dmaxc * dmaxc;
-    }
-    mindist[i] = dmin;
-    min_maxdist = std::min(dmax, min_maxdist);
-  }
-  for (int i = 0; i < cinfo->actual_number_of_colors; ++i) {
-    if (mindist[i] < min_maxdist) {
-      candidates->push_back(i);
-    }
-  }
-}
-
-}  // namespace
-
-void CreateInverseColorMap(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  int ncomp = cinfo->out_color_components;
-  JPEGLI_CHECK(ncomp > 0);
-  JPEGLI_CHECK(ncomp <= kMaxComponents);
-  int num_cells = 1;
-  for (int c = 0; c < ncomp; ++c) {
-    num_cells *= (1 << kNumColorCellBits[c]);
-  }
-  m->candidate_lists_.resize(num_cells);
-
-  int next_cell[kMaxComponents] = {0};
-  for (int i = 0; i < num_cells; ++i) {
-    m->candidate_lists_[i].clear();
-    FindCandidatesForCell(cinfo, ncomp, next_cell, &m->candidate_lists_[i]);
-    int c = ncomp - 1;
-    while (c > 0 && next_cell[c] + 1 == (1 << kNumColorCellBits[c])) {
-      next_cell[c--] = 0;
-    }
-    ++next_cell[c];
-  }
-  m->regenerate_inverse_colormap_ = false;
-}
-
-int LookupColorIndex(j_decompress_ptr cinfo, const JSAMPLE* pixel) {
-  jpeg_decomp_master* m = cinfo->master;
-  int num_channels = cinfo->out_color_components;
-  int index = 0;
-  if (m->quant_mode_ == 1) {
-    for (int c = 0; c < num_channels; ++c) {
-      index += m->colormap_lut_[c * 256 + pixel[c]];
-    }
-  } else {
-    size_t cell_idx = 0;
-    size_t stride = 1;
-    for (int c = num_channels - 1; c >= 0; --c) {
-      cell_idx += (pixel[c] >> (8 - kNumColorCellBits[c])) * stride;
-      stride <<= kNumColorCellBits[c];
-    }
-    JPEGLI_CHECK(cell_idx < m->candidate_lists_.size());
-    int mindist = std::numeric_limits<int>::max();
-    const auto& candidates = m->candidate_lists_[cell_idx];
-    for (uint8_t i : candidates) {
-      int dist = 0;
-      for (int c = 0; c < num_channels; ++c) {
-        int d = (cinfo->colormap[c][i] - pixel[c]) * kCompW[c];
-        dist += d * d;
-      }
-      if (dist < mindist) {
-        mindist = dist;
-        index = i;
-      }
-    }
-  }
-  JPEGLI_CHECK(index < cinfo->actual_number_of_colors);
-  return index;
-}
-
-void CreateOrderedDitherTables(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  static constexpr size_t kDitherSize = 4;
-  static constexpr size_t kDitherMask = kDitherSize - 1;
-  static constexpr float kBaseDitherMatrix[] = {
-      0,  8,  2,  10,  //
-      12, 4,  14, 6,   //
-      3,  11, 1,  9,   //
-      15, 7,  13, 5,   //
-  };
-  m->dither_size_ = kDitherSize;
-  m->dither_mask_ = kDitherMask;
-  size_t ncells = m->dither_size_ * m->dither_size_;
-  for (int c = 0; c < cinfo->out_color_components; ++c) {
-    float spread = 1.0f / (m->num_colors_[c] - 1);
-    float mul = spread / ncells;
-    float offset = 0.5f * spread;
-    if (m->dither_[c] == nullptr) {
-      m->dither_[c] = Allocate<float>(cinfo, ncells, JPOOL_IMAGE_ALIGNED);
-    }
-    for (size_t idx = 0; idx < ncells; ++idx) {
-      m->dither_[c][idx] = kBaseDitherMatrix[idx] * mul - offset;
-    }
-  }
-}
-
-void InitFSDitherState(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  for (int c = 0; c < cinfo->out_color_components; ++c) {
-    if (m->error_row_[c] == nullptr) {
-      m->error_row_[c] =
-          Allocate<float>(cinfo, cinfo->output_width, JPOOL_IMAGE_ALIGNED);
-      m->error_row_[c + kMaxComponents] =
-          Allocate<float>(cinfo, cinfo->output_width, JPOOL_IMAGE_ALIGNED);
-    }
-    memset(m->error_row_[c], 0.0, cinfo->output_width * sizeof(float));
-    memset(m->error_row_[c + kMaxComponents], 0.0,
-           cinfo->output_width * sizeof(float));
-  }
-}
-
-}  // namespace jpegli
diff --git a/third_party/jpeg-xl/lib/jpegli/color_quantize.h b/third_party/jpeg-xl/lib/jpegli/color_quantize.h
deleted file mode 100644
index 92b922f7564cf..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/color_quantize.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_COLOR_QUANTIZE_H_
-#define LIB_JPEGLI_COLOR_QUANTIZE_H_
-
-#include "lib/jpegli/common.h"
-
-namespace jpegli {
-
-void ChooseColorMap1Pass(j_decompress_ptr cinfo);
-
-void ChooseColorMap2Pass(j_decompress_ptr cinfo);
-
-void CreateInverseColorMap(j_decompress_ptr cinfo);
-
-void CreateOrderedDitherTables(j_decompress_ptr cinfo);
-
-void InitFSDitherState(j_decompress_ptr cinfo);
-
-int LookupColorIndex(j_decompress_ptr cinfo, const JSAMPLE* pixel);
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_COLOR_QUANTIZE_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/color_transform.cc b/third_party/jpeg-xl/lib/jpegli/color_transform.cc
deleted file mode 100644
index ec906bedce414..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/color_transform.cc
+++ /dev/null
@@ -1,547 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/color_transform.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jpegli/color_transform.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jpegli/decode_internal.h"
-#include "lib/jpegli/encode_internal.h"
-#include "lib/jpegli/error.h"
-#include "lib/jxl/base/compiler_specific.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jpegli {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::Div;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::MulAdd;
-using hwy::HWY_NAMESPACE::Sub;
-
-template <int kRed, int kGreen, int kBlue, int kAlpha>
-void YCbCrToExtRGB(float* row[kMaxComponents], size_t xsize) {
-  const HWY_CAPPED(float, 8) df;
-  const float* row_y = row[0];
-  const float* row_cb = row[1];
-  const float* row_cr = row[2];
-  float* row_r = row[kRed];
-  float* row_g = row[kGreen];
-  float* row_b = row[kBlue];
-  float* row_a = row[kAlpha];
-
-  // Full-range BT.601 as defined by JFIF Clause 7:
-  // https://www.itu.int/rec/T-REC-T.871-201105-I/en
-  const auto crcr = Set(df, 1.402f);
-  const auto cgcb = Set(df, -0.114f * 1.772f / 0.587f);
-  const auto cgcr = Set(df, -0.299f * 1.402f / 0.587f);
-  const auto cbcb = Set(df, 1.772f);
-  const auto alpha_opaque = Set(df, 127.0f / 255.0f);
-
-  for (size_t x = 0; x < xsize; x += Lanes(df)) {
-    const auto y_vec = Load(df, row_y + x);
-    const auto cb_vec = Load(df, row_cb + x);
-    const auto cr_vec = Load(df, row_cr + x);
-    const auto r_vec = MulAdd(crcr, cr_vec, y_vec);
-    const auto g_vec = MulAdd(cgcr, cr_vec, MulAdd(cgcb, cb_vec, y_vec));
-    const auto b_vec = MulAdd(cbcb, cb_vec, y_vec);
-    Store(r_vec, df, row_r + x);
-    Store(g_vec, df, row_g + x);
-    Store(b_vec, df, row_b + x);
-    if (kAlpha >= 0) {
-      Store(alpha_opaque, df, row_a + x);
-    }
-  }
-}
-
-void YCbCrToRGB(float* row[kMaxComponents], size_t xsize) {
-  YCbCrToExtRGB<0, 1, 2, -1>(row, xsize);
-}
-
-void YCbCrToBGR(float* row[kMaxComponents], size_t xsize) {
-  YCbCrToExtRGB<2, 1, 0, -1>(row, xsize);
-}
-
-void YCbCrToRGBA(float* row[kMaxComponents], size_t xsize) {
-  YCbCrToExtRGB<0, 1, 2, 3>(row, xsize);
-}
-
-void YCbCrToBGRA(float* row[kMaxComponents], size_t xsize) {
-  YCbCrToExtRGB<2, 1, 0, 3>(row, xsize);
-}
-
-void YCbCrToARGB(float* row[kMaxComponents], size_t xsize) {
-  YCbCrToExtRGB<1, 2, 3, 0>(row, xsize);
-}
-
-void YCbCrToABGR(float* row[kMaxComponents], size_t xsize) {
-  YCbCrToExtRGB<3, 2, 1, 0>(row, xsize);
-}
-
-void YCCKToCMYK(float* row[kMaxComponents], size_t xsize) {
-  const HWY_CAPPED(float, 8) df;
-  float* JXL_RESTRICT row0 = row[0];
-  float* JXL_RESTRICT row1 = row[1];
-  float* JXL_RESTRICT row2 = row[2];
-  YCbCrToRGB(row, xsize);
-  const auto offset = Set(df, -1.0f / 255.0f);
-  for (size_t x = 0; x < xsize; x += Lanes(df)) {
-    Store(Sub(offset, Load(df, row0 + x)), df, row0 + x);
-    Store(Sub(offset, Load(df, row1 + x)), df, row1 + x);
-    Store(Sub(offset, Load(df, row2 + x)), df, row2 + x);
-  }
-}
-
-template <int kRed, int kGreen, int kBlue>
-void ExtRGBToYCbCr(float* row[kMaxComponents], size_t xsize) {
-  const HWY_CAPPED(float, 8) df;
-  const float* row_r = row[kRed];
-  const float* row_g = row[kGreen];
-  const float* row_b = row[kBlue];
-  float* row_y = row[0];
-  float* row_cb = row[1];
-  float* row_cr = row[2];
-  // Full-range BT.601 as defined by JFIF Clause 7:
-  // https://www.itu.int/rec/T-REC-T.871-201105-I/en
-  const auto c128 = Set(df, 128.0f);
-  const auto kR = Set(df, 0.299f);  // NTSC luma
-  const auto kG = Set(df, 0.587f);
-  const auto kB = Set(df, 0.114f);
-  const auto kAmpR = Set(df, 0.701f);
-  const auto kAmpB = Set(df, 0.886f);
-  const auto kDiffR = Add(kAmpR, kR);
-  const auto kDiffB = Add(kAmpB, kB);
-  const auto kNormR = Div(Set(df, 1.0f), (Add(kAmpR, Add(kG, kB))));
-  const auto kNormB = Div(Set(df, 1.0f), (Add(kR, Add(kG, kAmpB))));
-
-  for (size_t x = 0; x < xsize; x += Lanes(df)) {
-    const auto r = Load(df, row_r + x);
-    const auto g = Load(df, row_g + x);
-    const auto b = Load(df, row_b + x);
-    const auto r_base = Mul(r, kR);
-    const auto r_diff = Mul(r, kDiffR);
-    const auto g_base = Mul(g, kG);
-    const auto b_base = Mul(b, kB);
-    const auto b_diff = Mul(b, kDiffB);
-    const auto y_base = Add(r_base, Add(g_base, b_base));
-    const auto cb_vec = MulAdd(Sub(b_diff, y_base), kNormB, c128);
-    const auto cr_vec = MulAdd(Sub(r_diff, y_base), kNormR, c128);
-    Store(y_base, df, row_y + x);
-    Store(cb_vec, df, row_cb + x);
-    Store(cr_vec, df, row_cr + x);
-  }
-}
-
-void RGBToYCbCr(float* row[kMaxComponents], size_t xsize) {
-  ExtRGBToYCbCr<0, 1, 2>(row, xsize);
-}
-
-void BGRToYCbCr(float* row[kMaxComponents], size_t xsize) {
-  ExtRGBToYCbCr<2, 1, 0>(row, xsize);
-}
-
-void ARGBToYCbCr(float* row[kMaxComponents], size_t xsize) {
-  ExtRGBToYCbCr<1, 2, 3>(row, xsize);
-}
-
-void ABGRToYCbCr(float* row[kMaxComponents], size_t xsize) {
-  ExtRGBToYCbCr<3, 2, 1>(row, xsize);
-}
-
-void CMYKToYCCK(float* row[kMaxComponents], size_t xsize) {
-  const HWY_CAPPED(float, 8) df;
-  float* JXL_RESTRICT row0 = row[0];
-  float* JXL_RESTRICT row1 = row[1];
-  float* JXL_RESTRICT row2 = row[2];
-  const auto unity = Set(df, 255.0f);
-  for (size_t x = 0; x < xsize; x += Lanes(df)) {
-    Store(Sub(unity, Load(df, row0 + x)), df, row0 + x);
-    Store(Sub(unity, Load(df, row1 + x)), df, row1 + x);
-    Store(Sub(unity, Load(df, row2 + x)), df, row2 + x);
-  }
-  RGBToYCbCr(row, xsize);
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jpegli
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jpegli {
-
-HWY_EXPORT(CMYKToYCCK);
-HWY_EXPORT(YCCKToCMYK);
-HWY_EXPORT(YCbCrToRGB);
-HWY_EXPORT(YCbCrToBGR);
-HWY_EXPORT(YCbCrToRGBA);
-HWY_EXPORT(YCbCrToBGRA);
-HWY_EXPORT(YCbCrToARGB);
-HWY_EXPORT(YCbCrToABGR);
-HWY_EXPORT(RGBToYCbCr);
-HWY_EXPORT(BGRToYCbCr);
-HWY_EXPORT(ARGBToYCbCr);
-HWY_EXPORT(ABGRToYCbCr);
-
-bool CheckColorSpaceComponents(int num_components, J_COLOR_SPACE colorspace) {
-  switch (colorspace) {
-    case JCS_GRAYSCALE:
-      return num_components == 1;
-    case JCS_RGB:
-    case JCS_YCbCr:
-#ifdef JCS_EXTENSIONS
-    case JCS_EXT_RGB:
-    case JCS_EXT_BGR:
-#endif
-      return num_components == 3;
-    case JCS_CMYK:
-    case JCS_YCCK:
-#ifdef JCS_EXTENSIONS
-    case JCS_EXT_RGBX:
-    case JCS_EXT_BGRX:
-    case JCS_EXT_XBGR:
-    case JCS_EXT_XRGB:
-#endif
-#ifdef JCS_ALPHA_EXTENSIONS
-    case JCS_EXT_RGBA:
-    case JCS_EXT_BGRA:
-    case JCS_EXT_ABGR:
-    case JCS_EXT_ARGB:
-#endif
-      return num_components == 4;
-    default:
-      // Unrecognized colorspaces can have any number of channels, since no
-      // color transform will be performed on them.
-      return true;
-  }
-}
-
-void NullTransform(float* row[kMaxComponents], size_t len) {}
-
-void FillAlpha(float* row, size_t len) {
-  static const float kAlpha = 127.0f / 255.0f;
-  for (size_t i = 0; i < len; ++i) {
-    row[i] = kAlpha;
-  }
-}
-
-// Works for BGR as well.
-void GrayscaleToRGB(float* row[kMaxComponents], size_t len) {
-  memcpy(row[1], row[0], len * sizeof(row[1][0]));
-  memcpy(row[2], row[0], len * sizeof(row[2][0]));
-}
-
-// Works for BGRA as well.
-void GrayscaleToRGBA(float* row[kMaxComponents], size_t len) {
-  memcpy(row[1], row[0], len * sizeof(row[1][0]));
-  memcpy(row[2], row[0], len * sizeof(row[2][0]));
-  FillAlpha(row[3], len);
-}
-
-// Works for ABGR as well.
-void GrayscaleToARGB(float* row[kMaxComponents], size_t len) {
-  memcpy(row[1], row[0], len * sizeof(row[1][0]));
-  memcpy(row[2], row[0], len * sizeof(row[2][0]));
-  memcpy(row[3], row[0], len * sizeof(row[1][0]));
-  FillAlpha(row[0], len);
-}
-
-void GrayscaleToYCbCr(float* row[kMaxComponents], size_t len) {
-  memset(row[1], 0, len * sizeof(row[1][0]));
-  memset(row[2], 0, len * sizeof(row[2][0]));
-}
-
-void RGBToBGR(float* row[kMaxComponents], size_t len) {
-  for (size_t i = 0; i < len; ++i) {
-    std::swap(row[0][i], row[2][i]);
-  }
-}
-
-void RGBToRGBA(float* row[kMaxComponents], size_t len) {
-  FillAlpha(row[3], len);
-}
-
-void RGBToBGRA(float* row[kMaxComponents], size_t len) {
-  static const float kAlpha = 127.0f / 255.0f;
-  for (size_t i = 0; i < len; ++i) {
-    std::swap(row[0][i], row[2][i]);
-    row[3][i] = kAlpha;
-  }
-}
-
-void RGBToARGB(float* row[kMaxComponents], size_t len) {
-  memcpy(row[3], row[2], len * sizeof(row[1][0]));
-  memcpy(row[2], row[1], len * sizeof(row[2][0]));
-  memcpy(row[1], row[0], len * sizeof(row[1][0]));
-  FillAlpha(row[0], len);
-}
-
-void RGBToABGR(float* row[kMaxComponents], size_t len) {
-  static const float kAlpha = 127.0f / 255.0f;
-  for (size_t i = 0; i < len; ++i) {
-    std::swap(row[1][i], row[2][i]);
-    row[3][i] = row[0][i];
-    row[0][i] = kAlpha;
-  }
-}
-
-void ChooseColorTransform(j_compress_ptr cinfo) {
-  jpeg_comp_master* m = cinfo->master;
-  if (!CheckColorSpaceComponents(cinfo->input_components,
-                                 cinfo->in_color_space)) {
-    JPEGLI_ERROR("Invalid number of input components %d for colorspace %d",
-                 cinfo->input_components, cinfo->in_color_space);
-  }
-  if (!CheckColorSpaceComponents(cinfo->num_components,
-                                 cinfo->jpeg_color_space)) {
-    JPEGLI_ERROR("Invalid number of components %d for colorspace %d",
-                 cinfo->num_components, cinfo->jpeg_color_space);
-  }
-  if (cinfo->jpeg_color_space == cinfo->in_color_space) {
-    if (cinfo->num_components != cinfo->input_components) {
-      JPEGLI_ERROR("Input/output components mismatch:  %d vs %d",
-                   cinfo->input_components, cinfo->num_components);
-    }
-    // No color transform requested.
-    m->color_transform = NullTransform;
-    return;
-  }
-
-  if (cinfo->in_color_space == JCS_RGB && m->xyb_mode) {
-    JPEGLI_ERROR("Color transform on XYB colorspace is not supported.");
-  }
-
-  m->color_transform = nullptr;
-  if (cinfo->jpeg_color_space == JCS_GRAYSCALE) {
-    if (cinfo->in_color_space == JCS_RGB) {
-      m->color_transform = HWY_DYNAMIC_DISPATCH(RGBToYCbCr);
-    } else if (cinfo->in_color_space == JCS_YCbCr ||
-               cinfo->in_color_space == JCS_YCCK) {
-      // Since the first luminance channel is the grayscale version of the
-      // image, nothing to do here
-      m->color_transform = NullTransform;
-    }
-  } else if (cinfo->jpeg_color_space == JCS_RGB) {
-    if (cinfo->in_color_space == JCS_GRAYSCALE) {
-      m->color_transform = GrayscaleToRGB;
-    }
-  } else if (cinfo->jpeg_color_space == JCS_YCbCr) {
-    if (cinfo->in_color_space == JCS_RGB) {
-      m->color_transform = HWY_DYNAMIC_DISPATCH(RGBToYCbCr);
-    } else if (cinfo->in_color_space == JCS_GRAYSCALE) {
-      m->color_transform = GrayscaleToYCbCr;
-    }
-  } else if (cinfo->jpeg_color_space == JCS_YCCK) {
-    if (cinfo->in_color_space == JCS_CMYK) {
-      m->color_transform = HWY_DYNAMIC_DISPATCH(CMYKToYCCK);
-    }
-  }
-
-  if (cinfo->jpeg_color_space == JCS_GRAYSCALE ||
-      cinfo->jpeg_color_space == JCS_YCbCr) {
-    switch (cinfo->in_color_space) {
-#ifdef JCS_EXTENSIONS
-      case JCS_EXT_RGB:
-      case JCS_EXT_RGBX:
-        m->color_transform = HWY_DYNAMIC_DISPATCH(RGBToYCbCr);
-        break;
-      case JCS_EXT_BGR:
-      case JCS_EXT_BGRX:
-        m->color_transform = HWY_DYNAMIC_DISPATCH(BGRToYCbCr);
-        break;
-      case JCS_EXT_XRGB:
-        m->color_transform = HWY_DYNAMIC_DISPATCH(ARGBToYCbCr);
-        break;
-      case JCS_EXT_XBGR:
-        m->color_transform = HWY_DYNAMIC_DISPATCH(ABGRToYCbCr);
-        break;
-#endif
-#ifdef JCS_ALPHA_EXTENSIONS
-      case JCS_EXT_RGBA:
-        m->color_transform = HWY_DYNAMIC_DISPATCH(RGBToYCbCr);
-        break;
-      case JCS_EXT_BGRA:
-        m->color_transform = HWY_DYNAMIC_DISPATCH(BGRToYCbCr);
-        break;
-      case JCS_EXT_ARGB:
-        m->color_transform = HWY_DYNAMIC_DISPATCH(ARGBToYCbCr);
-        break;
-      case JCS_EXT_ABGR:
-        m->color_transform = HWY_DYNAMIC_DISPATCH(ABGRToYCbCr);
-        break;
-#endif
-      default:;  // Nothing to do.
-    }
-  }
-
-  if (m->color_transform == nullptr) {
-    // TODO(szabadka) Support more color transforms.
-    JPEGLI_ERROR("Unsupported color transform %d -> %d", cinfo->in_color_space,
-                 cinfo->jpeg_color_space);
-  }
-}
-
-void ChooseColorTransform(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  if (!CheckColorSpaceComponents(cinfo->out_color_components,
-                                 cinfo->out_color_space)) {
-    JPEGLI_ERROR("Invalid number of output components %d for colorspace %d",
-                 cinfo->out_color_components, cinfo->out_color_space);
-  }
-  if (!CheckColorSpaceComponents(cinfo->num_components,
-                                 cinfo->jpeg_color_space)) {
-    JPEGLI_ERROR("Invalid number of components %d for colorspace %d",
-                 cinfo->num_components, cinfo->jpeg_color_space);
-  }
-  if (cinfo->jpeg_color_space == cinfo->out_color_space) {
-    if (cinfo->num_components != cinfo->out_color_components) {
-      JPEGLI_ERROR("Input/output components mismatch:  %d vs %d",
-                   cinfo->num_components, cinfo->out_color_components);
-    }
-    // No color transform requested.
-    m->color_transform = NullTransform;
-    return;
-  }
-
-  m->color_transform = nullptr;
-  if (cinfo->jpeg_color_space == JCS_GRAYSCALE) {
-    switch (cinfo->out_color_space) {
-      case JCS_RGB:
-        m->color_transform = GrayscaleToRGB;
-        break;
-#ifdef JCS_EXTENSIONS
-      case JCS_EXT_RGB:
-      case JCS_EXT_BGR:
-        m->color_transform = GrayscaleToRGB;
-        break;
-      case JCS_EXT_RGBX:
-      case JCS_EXT_BGRX:
-        m->color_transform = GrayscaleToRGBA;
-        break;
-      case JCS_EXT_XRGB:
-      case JCS_EXT_XBGR:
-        m->color_transform = GrayscaleToARGB;
-        break;
-#endif
-#ifdef JCS_ALPHA_EXTENSIONS
-      case JCS_EXT_RGBA:
-      case JCS_EXT_BGRA:
-        m->color_transform = GrayscaleToRGBA;
-        break;
-      case JCS_EXT_ARGB:
-      case JCS_EXT_ABGR:
-        m->color_transform = GrayscaleToARGB;
-        break;
-#endif
-      default:
-        m->color_transform = nullptr;
-    }
-  } else if (cinfo->jpeg_color_space == JCS_RGB) {
-    switch (cinfo->out_color_space) {
-      case JCS_GRAYSCALE:
-        m->color_transform = HWY_DYNAMIC_DISPATCH(RGBToYCbCr);
-        break;
-#ifdef JCS_EXTENSIONS
-      case JCS_EXT_RGB:
-        m->color_transform = NullTransform;
-        break;
-      case JCS_EXT_BGR:
-        m->color_transform = RGBToBGR;
-        break;
-      case JCS_EXT_RGBX:
-        m->color_transform = RGBToRGBA;
-        break;
-      case JCS_EXT_BGRX:
-        m->color_transform = RGBToBGRA;
-        break;
-      case JCS_EXT_XRGB:
-        m->color_transform = RGBToARGB;
-        break;
-      case JCS_EXT_XBGR:
-        m->color_transform = RGBToABGR;
-        break;
-#endif
-#ifdef JCS_ALPHA_EXTENSIONS
-      case JCS_EXT_RGBA:
-        m->color_transform = RGBToRGBA;
-        break;
-      case JCS_EXT_BGRA:
-        m->color_transform = RGBToBGRA;
-        break;
-      case JCS_EXT_ARGB:
-        m->color_transform = RGBToARGB;
-        break;
-      case JCS_EXT_ABGR:
-        m->color_transform = RGBToABGR;
-        break;
-#endif
-      default:
-        m->color_transform = nullptr;
-    }
-  } else if (cinfo->jpeg_color_space == JCS_YCbCr) {
-    switch (cinfo->out_color_space) {
-      case JCS_GRAYSCALE:
-        m->color_transform = NullTransform;
-        break;
-      case JCS_RGB:
-        m->color_transform = HWY_DYNAMIC_DISPATCH(YCbCrToRGB);
-        break;
-#ifdef JCS_EXTENSIONS
-      case JCS_EXT_RGB:
-        m->color_transform = HWY_DYNAMIC_DISPATCH(YCbCrToRGB);
-        break;
-      case JCS_EXT_BGR:
-        m->color_transform = HWY_DYNAMIC_DISPATCH(YCbCrToBGR);
-        break;
-      case JCS_EXT_RGBX:
-        m->color_transform = HWY_DYNAMIC_DISPATCH(YCbCrToRGBA);
-        break;
-      case JCS_EXT_BGRX:
-        m->color_transform = HWY_DYNAMIC_DISPATCH(YCbCrToBGRA);
-        break;
-      case JCS_EXT_XRGB:
-        m->color_transform = HWY_DYNAMIC_DISPATCH(YCbCrToARGB);
-        break;
-      case JCS_EXT_XBGR:
-        m->color_transform = HWY_DYNAMIC_DISPATCH(YCbCrToABGR);
-        break;
-#endif
-#ifdef JCS_ALPHA_EXTENSIONS
-      case JCS_EXT_RGBA:
-        m->color_transform = HWY_DYNAMIC_DISPATCH(YCbCrToRGBA);
-        break;
-      case JCS_EXT_BGRA:
-        m->color_transform = HWY_DYNAMIC_DISPATCH(YCbCrToBGRA);
-        break;
-      case JCS_EXT_ARGB:
-        m->color_transform = HWY_DYNAMIC_DISPATCH(YCbCrToARGB);
-        break;
-      case JCS_EXT_ABGR:
-        m->color_transform = HWY_DYNAMIC_DISPATCH(YCbCrToABGR);
-        break;
-#endif
-      default:
-        m->color_transform = nullptr;
-    }
-  } else if (cinfo->jpeg_color_space == JCS_YCCK) {
-    if (cinfo->out_color_space == JCS_CMYK) {
-      m->color_transform = HWY_DYNAMIC_DISPATCH(YCCKToCMYK);
-    }
-  }
-
-  if (m->color_transform == nullptr) {
-    // TODO(szabadka) Support more color transforms.
-    JPEGLI_ERROR("Unsupported color transform %d -> %d",
-                 cinfo->jpeg_color_space, cinfo->out_color_space);
-  }
-}
-
-}  // namespace jpegli
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jpegli/color_transform.h b/third_party/jpeg-xl/lib/jpegli/color_transform.h
deleted file mode 100644
index 8d58f8849a4e9..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/color_transform.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_COLOR_TRANSFORM_H_
-#define LIB_JPEGLI_COLOR_TRANSFORM_H_
-
-#include "lib/jpegli/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-
-namespace jpegli {
-
-void ChooseColorTransform(j_compress_ptr cinfo);
-
-void ChooseColorTransform(j_decompress_ptr cinfo);
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_COLOR_TRANSFORM_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/common.cc b/third_party/jpeg-xl/lib/jpegli/common.cc
deleted file mode 100644
index 5f34372f3e534..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/common.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/common.h"
-
-#include "lib/jpegli/decode_internal.h"
-#include "lib/jpegli/encode_internal.h"
-#include "lib/jpegli/memory_manager.h"
-
-void jpegli_abort(j_common_ptr cinfo) {
-  if (cinfo->mem == nullptr) return;
-  for (int pool_id = 0; pool_id < JPOOL_NUMPOOLS; ++pool_id) {
-    if (pool_id == JPOOL_PERMANENT) continue;
-    (*cinfo->mem->free_pool)(cinfo, pool_id);
-  }
-  if (cinfo->is_decompressor) {
-    cinfo->global_state = jpegli::kDecStart;
-  } else {
-    cinfo->global_state = jpegli::kEncStart;
-  }
-}
-
-void jpegli_destroy(j_common_ptr cinfo) {
-  if (cinfo->mem == nullptr) return;
-  (*cinfo->mem->self_destruct)(cinfo);
-  if (cinfo->is_decompressor) {
-    cinfo->global_state = jpegli::kDecNull;
-    delete reinterpret_cast<j_decompress_ptr>(cinfo)->master;
-  } else {
-    cinfo->global_state = jpegli::kEncNull;
-  }
-}
-
-JQUANT_TBL* jpegli_alloc_quant_table(j_common_ptr cinfo) {
-  JQUANT_TBL* table = jpegli::Allocate<JQUANT_TBL>(cinfo, 1);
-  table->sent_table = FALSE;
-  return table;
-}
-
-JHUFF_TBL* jpegli_alloc_huff_table(j_common_ptr cinfo) {
-  JHUFF_TBL* table = jpegli::Allocate<JHUFF_TBL>(cinfo, 1);
-  table->sent_table = FALSE;
-  return table;
-}
-
-int jpegli_bytes_per_sample(JpegliDataType data_type) {
-  switch (data_type) {
-    case JPEGLI_TYPE_UINT8:
-      return 1;
-    case JPEGLI_TYPE_UINT16:
-      return 2;
-    case JPEGLI_TYPE_FLOAT:
-      return 4;
-    default:
-      return 0;
-  }
-}
diff --git a/third_party/jpeg-xl/lib/jpegli/common.h b/third_party/jpeg-xl/lib/jpegli/common.h
deleted file mode 100644
index 731a2e9d3f361..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/common.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-//
-// This file contains the C API of the common encoder/decoder part of libjpegli
-// library, which is based on the C API of libjpeg, with the function names
-// changed from jpeg_* to jpegli_*, while compressor and decompressor object
-// definitions are included directly from jpeglib.h
-//
-// Applications can use the libjpegli library in one of the following ways:
-//
-//  (1) Include jpegli/encode.h and/or jpegli/decode.h, update the function
-//      names of the API and link against libjpegli.
-//
-//  (2) Leave the application code unchanged, but replace the libjpeg.so library
-//      with the one built by this project that is API- and ABI-compatible with
-//      libjpeg-turbo's version of libjpeg.so.
-
-#ifndef LIB_JPEGLI_COMMON_H_
-#define LIB_JPEGLI_COMMON_H_
-
-#include "lib/jxl/base/include_jpeglib.h"  // NOLINT
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct jpeg_error_mgr* jpegli_std_error(struct jpeg_error_mgr* err);
-
-void jpegli_abort(j_common_ptr cinfo);
-
-void jpegli_destroy(j_common_ptr cinfo);
-
-JQUANT_TBL* jpegli_alloc_quant_table(j_common_ptr cinfo);
-
-JHUFF_TBL* jpegli_alloc_huff_table(j_common_ptr cinfo);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif  // LIB_JPEGLI_COMMON_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/common_internal.h b/third_party/jpeg-xl/lib/jpegli/common_internal.h
deleted file mode 100644
index bd0a86d3b0864..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/common_internal.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_COMMON_INTERNAL_H_
-#define LIB_JPEGLI_COMMON_INTERNAL_H_
-
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-
-// Suppress any -Wdeprecated-declarations warning that might be emitted by
-// GCC or Clang by std::stable_sort in C++17 or later mode
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#elif defined(__GNUC__)
-#pragma GCC push_options
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
-#include <algorithm>
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#pragma GCC pop_options
-#endif
-
-#include <hwy/aligned_allocator.h>
-
-#include "lib/jpegli/memory_manager.h"
-#include "lib/jpegli/simd.h"
-#include "lib/jxl/base/compiler_specific.h"  // for ssize_t
-
-namespace jpegli {
-
-enum State {
-  kDecNull,
-  kDecStart,
-  kDecInHeader,
-  kDecHeaderDone,
-  kDecProcessMarkers,
-  kDecProcessScan,
-  kEncNull,
-  kEncStart,
-  kEncHeader,
-  kEncReadImage,
-  kEncWriteCoeffs,
-};
-
-template <typename T1, typename T2>
-constexpr inline T1 DivCeil(T1 a, T2 b) {
-  return (a + b - 1) / b;
-}
-
-template <typename T1, typename T2>
-constexpr inline T1 RoundUpTo(T1 a, T2 b) {
-  return DivCeil(a, b) * b;
-}
-
-constexpr size_t kDCTBlockSize = 64;
-// This is set to the same value as MAX_COMPS_IN_SCAN, because that is the
-// maximum number of channels the libjpeg-turbo decoder can decode.
-constexpr int kMaxComponents = 4;
-constexpr int kMaxQuantTables = 4;
-constexpr int kJpegPrecision = 8;
-constexpr int kMaxHuffmanTables = 4;
-constexpr size_t kJpegHuffmanMaxBitLength = 16;
-constexpr int kJpegHuffmanAlphabetSize = 256;
-constexpr int kJpegDCAlphabetSize = 12;
-constexpr int kMaxDHTMarkers = 512;
-constexpr int kMaxDimPixels = 65535;
-constexpr uint8_t kApp1 = 0xE1;
-constexpr uint8_t kApp2 = 0xE2;
-const uint8_t kIccProfileTag[12] = "ICC_PROFILE";
-const uint8_t kExifTag[6] = "Exif\0";
-const uint8_t kXMPTag[29] = "http://ns.adobe.com/xap/1.0/";
-
-/* clang-format off */
-constexpr uint32_t kJPEGNaturalOrder[80] = {
-  0,   1,  8, 16,  9,  2,  3, 10,
-  17, 24, 32, 25, 18, 11,  4,  5,
-  12, 19, 26, 33, 40, 48, 41, 34,
-  27, 20, 13,  6,  7, 14, 21, 28,
-  35, 42, 49, 56, 57, 50, 43, 36,
-  29, 22, 15, 23, 30, 37, 44, 51,
-  58, 59, 52, 45, 38, 31, 39, 46,
-  53, 60, 61, 54, 47, 55, 62, 63,
-  // extra entries for safety in decoder
-  63, 63, 63, 63, 63, 63, 63, 63,
-  63, 63, 63, 63, 63, 63, 63, 63
-};
-
-constexpr uint32_t kJPEGZigZagOrder[64] = {
-  0,   1,  5,  6, 14, 15, 27, 28,
-  2,   4,  7, 13, 16, 26, 29, 42,
-  3,   8, 12, 17, 25, 30, 41, 43,
-  9,  11, 18, 24, 31, 40, 44, 53,
-  10, 19, 23, 32, 39, 45, 52, 54,
-  20, 22, 33, 38, 46, 51, 55, 60,
-  21, 34, 37, 47, 50, 56, 59, 61,
-  35, 36, 48, 49, 57, 58, 62, 63
-};
-/* clang-format on */
-
-template <typename T>
-class RowBuffer {
- public:
-  template <typename CInfoType>
-  void Allocate(CInfoType cinfo, size_t num_rows, size_t rowsize) {
-    static_assert(sizeof(T) == 4);
-    size_t vec_size = std::max(VectorSize(), sizeof(T));
-    size_t alignment = std::max<size_t>(HWY_ALIGNMENT, vec_size);
-    size_t min_memstride = alignment + rowsize * sizeof(T) + vec_size;
-    size_t memstride = RoundUpTo(min_memstride, alignment);
-    xsize_ = rowsize;
-    ysize_ = num_rows;
-    stride_ = memstride / sizeof(T);
-    offset_ = alignment / sizeof(T);
-    data_ = ::jpegli::Allocate<T>(cinfo, ysize_ * stride_, JPOOL_IMAGE_ALIGNED);
-  }
-
-  T* Row(ssize_t y) const {
-    return &data_[((ysize_ + y) % ysize_) * stride_ + offset_];
-  }
-
-  size_t xsize() const { return xsize_; };
-  size_t ysize() const { return ysize_; };
-  size_t stride() const { return stride_; }
-
-  void PadRow(size_t y, size_t from, int border) {
-    float* row = Row(y);
-    for (int offset = -border; offset < 0; ++offset) {
-      row[offset] = row[0];
-    }
-    float last_val = row[from - 1];
-    for (size_t x = from; x < xsize_ + border; ++x) {
-      row[x] = last_val;
-    }
-  }
-
-  void CopyRow(ssize_t dst_row, ssize_t src_row, int border) {
-    memcpy(Row(dst_row) - border, Row(src_row) - border,
-           (xsize_ + 2 * border) * sizeof(T));
-  }
-
-  void FillRow(ssize_t y, T val, size_t len) {
-    T* row = Row(y);
-    for (size_t x = 0; x < len; ++x) {
-      row[x] = val;
-    }
-  }
-
- private:
-  size_t xsize_;
-  size_t ysize_;
-  size_t stride_;
-  size_t offset_;
-  T* data_;
-};
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_COMMON_INTERNAL_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/dct-inl.h b/third_party/jpeg-xl/lib/jpegli/dct-inl.h
deleted file mode 100644
index fb54a152d59c3..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/dct-inl.h
+++ /dev/null
@@ -1,260 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#if defined(LIB_JPEGLI_DCT_INL_H_) == defined(HWY_TARGET_TOGGLE)
-#ifdef LIB_JPEGLI_DCT_INL_H_
-#undef LIB_JPEGLI_DCT_INL_H_
-#else
-#define LIB_JPEGLI_DCT_INL_H_
-#endif
-
-#include "lib/jpegli/transpose-inl.h"
-#include "lib/jxl/base/compiler_specific.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jpegli {
-namespace HWY_NAMESPACE {
-namespace {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Abs;
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::DemoteTo;
-using hwy::HWY_NAMESPACE::Ge;
-using hwy::HWY_NAMESPACE::IfThenElseZero;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::MulAdd;
-using hwy::HWY_NAMESPACE::Rebind;
-using hwy::HWY_NAMESPACE::Round;
-using hwy::HWY_NAMESPACE::Sub;
-using hwy::HWY_NAMESPACE::Vec;
-
-using D = HWY_FULL(float);
-using DI = HWY_FULL(int32_t);
-
-template <size_t N>
-void AddReverse(const float* JXL_RESTRICT a_in1,
-                const float* JXL_RESTRICT a_in2, float* JXL_RESTRICT a_out) {
-  HWY_CAPPED(float, 8) d8;
-  for (size_t i = 0; i < N; i++) {
-    auto in1 = Load(d8, a_in1 + i * 8);
-    auto in2 = Load(d8, a_in2 + (N - i - 1) * 8);
-    Store(Add(in1, in2), d8, a_out + i * 8);
-  }
-}
-
-template <size_t N>
-void SubReverse(const float* JXL_RESTRICT a_in1,
-                const float* JXL_RESTRICT a_in2, float* JXL_RESTRICT a_out) {
-  HWY_CAPPED(float, 8) d8;
-  for (size_t i = 0; i < N; i++) {
-    auto in1 = Load(d8, a_in1 + i * 8);
-    auto in2 = Load(d8, a_in2 + (N - i - 1) * 8);
-    Store(Sub(in1, in2), d8, a_out + i * 8);
-  }
-}
-
-template <size_t N>
-void B(float* JXL_RESTRICT coeff) {
-  HWY_CAPPED(float, 8) d8;
-  constexpr float kSqrt2 = 1.41421356237f;
-  auto sqrt2 = Set(d8, kSqrt2);
-  auto in1 = Load(d8, coeff);
-  auto in2 = Load(d8, coeff + 8);
-  Store(MulAdd(in1, sqrt2, in2), d8, coeff);
-  for (size_t i = 1; i + 1 < N; i++) {
-    auto in1 = Load(d8, coeff + i * 8);
-    auto in2 = Load(d8, coeff + (i + 1) * 8);
-    Store(Add(in1, in2), d8, coeff + i * 8);
-  }
-}
-
-// Ideally optimized away by compiler (except the multiply).
-template <size_t N>
-void InverseEvenOdd(const float* JXL_RESTRICT a_in, float* JXL_RESTRICT a_out) {
-  HWY_CAPPED(float, 8) d8;
-  for (size_t i = 0; i < N / 2; i++) {
-    auto in1 = Load(d8, a_in + i * 8);
-    Store(in1, d8, a_out + 2 * i * 8);
-  }
-  for (size_t i = N / 2; i < N; i++) {
-    auto in1 = Load(d8, a_in + i * 8);
-    Store(in1, d8, a_out + (2 * (i - N / 2) + 1) * 8);
-  }
-}
-
-// Constants for DCT implementation. Generated by the following snippet:
-// for i in range(N // 2):
-//    print(1.0 / (2 * math.cos((i + 0.5) * math.pi / N)), end=", ")
-template <size_t N>
-struct WcMultipliers;
-
-template <>
-struct WcMultipliers<4> {
-  static constexpr float kMultipliers[] = {
-      0.541196100146197,
-      1.3065629648763764,
-  };
-};
-
-template <>
-struct WcMultipliers<8> {
-  static constexpr float kMultipliers[] = {
-      0.5097955791041592,
-      0.6013448869350453,
-      0.8999762231364156,
-      2.5629154477415055,
-  };
-};
-
-#if JXL_CXX_LANG < JXL_CXX_17
-constexpr float WcMultipliers<4>::kMultipliers[];
-constexpr float WcMultipliers<8>::kMultipliers[];
-#endif
-
-// Invoked on full vector.
-template <size_t N>
-void Multiply(float* JXL_RESTRICT coeff) {
-  HWY_CAPPED(float, 8) d8;
-  for (size_t i = 0; i < N / 2; i++) {
-    auto in1 = Load(d8, coeff + (N / 2 + i) * 8);
-    auto mul = Set(d8, WcMultipliers<N>::kMultipliers[i]);
-    Store(Mul(in1, mul), d8, coeff + (N / 2 + i) * 8);
-  }
-}
-
-void LoadFromBlock(const float* JXL_RESTRICT pixels, size_t pixels_stride,
-                   size_t off, float* JXL_RESTRICT coeff) {
-  HWY_CAPPED(float, 8) d8;
-  for (size_t i = 0; i < 8; i++) {
-    Store(LoadU(d8, pixels + i * pixels_stride + off), d8, coeff + i * 8);
-  }
-}
-
-void StoreToBlockAndScale(const float* JXL_RESTRICT coeff, float* output,
-                          size_t off) {
-  HWY_CAPPED(float, 8) d8;
-  auto mul = Set(d8, 1.0f / 8);
-  for (size_t i = 0; i < 8; i++) {
-    StoreU(Mul(mul, Load(d8, coeff + i * 8)), d8, output + i * 8 + off);
-  }
-}
-
-template <size_t N>
-struct DCT1DImpl;
-
-template <>
-struct DCT1DImpl<1> {
-  JXL_INLINE void operator()(float* JXL_RESTRICT mem) {}
-};
-
-template <>
-struct DCT1DImpl<2> {
-  JXL_INLINE void operator()(float* JXL_RESTRICT mem) {
-    HWY_CAPPED(float, 8) d8;
-    auto in1 = Load(d8, mem);
-    auto in2 = Load(d8, mem + 8);
-    Store(Add(in1, in2), d8, mem);
-    Store(Sub(in1, in2), d8, mem + 8);
-  }
-};
-
-template <size_t N>
-struct DCT1DImpl {
-  void operator()(float* JXL_RESTRICT mem) {
-    HWY_ALIGN float tmp[N * 8];
-    AddReverse<N / 2>(mem, mem + N * 4, tmp);
-    DCT1DImpl<N / 2>()(tmp);
-    SubReverse<N / 2>(mem, mem + N * 4, tmp + N * 4);
-    Multiply<N>(tmp);
-    DCT1DImpl<N / 2>()(tmp + N * 4);
-    B<N / 2>(tmp + N * 4);
-    InverseEvenOdd<N>(tmp, mem);
-  }
-};
-
-void DCT1D(const float* JXL_RESTRICT pixels, size_t pixels_stride,
-           float* JXL_RESTRICT output) {
-  HWY_CAPPED(float, 8) d8;
-  HWY_ALIGN float tmp[64];
-  for (size_t i = 0; i < 8; i += Lanes(d8)) {
-    // TODO(veluca): consider removing the temporary memory here (as is done in
-    // IDCT), if it turns out that some compilers don't optimize away the loads
-    // and this is performance-critical.
-    LoadFromBlock(pixels, pixels_stride, i, tmp);
-    DCT1DImpl<8>()(tmp);
-    StoreToBlockAndScale(tmp, output, i);
-  }
-}
-
-JXL_INLINE JXL_MAYBE_UNUSED void TransformFromPixels(
-    const float* JXL_RESTRICT pixels, size_t pixels_stride,
-    float* JXL_RESTRICT coefficients, float* JXL_RESTRICT scratch_space) {
-  DCT1D(pixels, pixels_stride, scratch_space);
-  Transpose8x8Block(scratch_space, coefficients);
-  DCT1D(coefficients, 8, scratch_space);
-  Transpose8x8Block(scratch_space, coefficients);
-}
-
-JXL_INLINE JXL_MAYBE_UNUSED void StoreQuantizedValue(const Vec<DI>& ival,
-                                                     int16_t* out) {
-  Rebind<int16_t, DI> di16;
-  Store(DemoteTo(di16, ival), di16, out);
-}
-
-JXL_INLINE JXL_MAYBE_UNUSED void StoreQuantizedValue(const Vec<DI>& ival,
-                                                     int32_t* out) {
-  DI di;
-  Store(ival, di, out);
-}
-
-template <typename T>
-void QuantizeBlock(const float* dct, const float* qmc, float aq_strength,
-                   const float* zero_bias_offset, const float* zero_bias_mul,
-                   T* block) {
-  D d;
-  DI di;
-  const auto aq_mul = Set(d, aq_strength);
-  for (size_t k = 0; k < DCTSIZE2; k += Lanes(d)) {
-    const auto val = Load(d, dct + k);
-    const auto q = Load(d, qmc + k);
-    const auto qval = Mul(val, q);
-    const auto zb_offset = Load(d, zero_bias_offset + k);
-    const auto zb_mul = Load(d, zero_bias_mul + k);
-    const auto threshold = Add(zb_offset, Mul(zb_mul, aq_mul));
-    const auto nzero_mask = Ge(Abs(qval), threshold);
-    const auto ival = ConvertTo(di, IfThenElseZero(nzero_mask, Round(qval)));
-    StoreQuantizedValue(ival, block + k);
-  }
-}
-
-template <typename T>
-void ComputeCoefficientBlock(const float* JXL_RESTRICT pixels, size_t stride,
-                             const float* JXL_RESTRICT qmc,
-                             int16_t last_dc_coeff, float aq_strength,
-                             const float* zero_bias_offset,
-                             const float* zero_bias_mul,
-                             float* JXL_RESTRICT tmp, T* block) {
-  float* JXL_RESTRICT dct = tmp;
-  float* JXL_RESTRICT scratch_space = tmp + DCTSIZE2;
-  TransformFromPixels(pixels, stride, dct, scratch_space);
-  QuantizeBlock(dct, qmc, aq_strength, zero_bias_offset, zero_bias_mul, block);
-  // Center DC values around zero.
-  static constexpr float kDCBias = 128.0f;
-  const float dc = (dct[0] - kDCBias) * qmc[0];
-  float dc_threshold = zero_bias_offset[0] + aq_strength * zero_bias_mul[0];
-  if (std::abs(dc - last_dc_coeff) < dc_threshold) {
-    block[0] = last_dc_coeff;
-  } else {
-    block[0] = std::round(dc);
-  }
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace
-}  // namespace HWY_NAMESPACE
-}  // namespace jpegli
-HWY_AFTER_NAMESPACE();
-#endif  // LIB_JPEGLI_DCT_INL_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/decode.cc b/third_party/jpeg-xl/lib/jpegli/decode.cc
deleted file mode 100644
index 832f0df87681b..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/decode.cc
+++ /dev/null
@@ -1,1060 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/decode.h"
-
-#include <string.h>
-
-#include <vector>
-
-#include "lib/jpegli/color_quantize.h"
-#include "lib/jpegli/decode_internal.h"
-#include "lib/jpegli/decode_marker.h"
-#include "lib/jpegli/decode_scan.h"
-#include "lib/jpegli/error.h"
-#include "lib/jpegli/memory_manager.h"
-#include "lib/jpegli/render.h"
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/status.h"
-
-namespace jpegli {
-
-void InitializeImage(j_decompress_ptr cinfo) {
-  cinfo->restart_interval = 0;
-  cinfo->saw_JFIF_marker = FALSE;
-  cinfo->JFIF_major_version = 1;
-  cinfo->JFIF_minor_version = 1;
-  cinfo->density_unit = 0;
-  cinfo->X_density = 1;
-  cinfo->Y_density = 1;
-  cinfo->saw_Adobe_marker = FALSE;
-  cinfo->Adobe_transform = 0;
-  cinfo->CCIR601_sampling = FALSE;  // not used
-  cinfo->marker_list = nullptr;
-  cinfo->comp_info = nullptr;
-  cinfo->input_scan_number = 0;
-  cinfo->input_iMCU_row = 0;
-  cinfo->output_scan_number = 0;
-  cinfo->output_iMCU_row = 0;
-  cinfo->output_scanline = 0;
-  cinfo->unread_marker = 0;
-  cinfo->coef_bits = nullptr;
-  // We set all these to zero since we don't yet support arithmetic coding.
-  memset(cinfo->arith_dc_L, 0, sizeof(cinfo->arith_dc_L));
-  memset(cinfo->arith_dc_U, 0, sizeof(cinfo->arith_dc_U));
-  memset(cinfo->arith_ac_K, 0, sizeof(cinfo->arith_ac_K));
-  // Initialize the private fields.
-  jpeg_decomp_master* m = cinfo->master;
-  m->input_buffer_.clear();
-  m->input_buffer_pos_ = 0;
-  m->codestream_bits_ahead_ = 0;
-  m->is_multiscan_ = false;
-  m->found_soi_ = false;
-  m->found_dri_ = false;
-  m->found_sof_ = false;
-  m->found_sos_ = false;
-  m->found_eoi_ = false;
-  m->icc_index_ = 0;
-  m->icc_total_ = 0;
-  m->icc_profile_.clear();
-  memset(m->dc_huff_lut_, 0, sizeof(m->dc_huff_lut_));
-  memset(m->ac_huff_lut_, 0, sizeof(m->ac_huff_lut_));
-  // Initialize the values to an invalid symbol so that we can recognize it
-  // when reading the bit stream using a Huffman code with space > 0.
-  for (size_t i = 0; i < kAllHuffLutSize; ++i) {
-    m->dc_huff_lut_[i].bits = 0;
-    m->dc_huff_lut_[i].value = 0xffff;
-    m->ac_huff_lut_[i].bits = 0;
-    m->ac_huff_lut_[i].value = 0xffff;
-  }
-  m->colormap_lut_ = nullptr;
-  m->pixels_ = nullptr;
-  m->scanlines_ = nullptr;
-  m->regenerate_inverse_colormap_ = true;
-  for (int i = 0; i < kMaxComponents; ++i) {
-    m->dither_[i] = nullptr;
-    m->error_row_[i] = nullptr;
-  }
-  m->output_passes_done_ = 0;
-  m->xoffset_ = 0;
-  m->dequant_ = nullptr;
-}
-
-void InitializeDecompressParams(j_decompress_ptr cinfo) {
-  cinfo->jpeg_color_space = JCS_UNKNOWN;
-  cinfo->out_color_space = JCS_UNKNOWN;
-  cinfo->scale_num = 1;
-  cinfo->scale_denom = 1;
-  cinfo->output_gamma = 0.0f;
-  cinfo->buffered_image = FALSE;
-  cinfo->raw_data_out = FALSE;
-  cinfo->dct_method = JDCT_DEFAULT;
-  cinfo->do_fancy_upsampling = TRUE;
-  cinfo->do_block_smoothing = TRUE;
-  cinfo->quantize_colors = FALSE;
-  cinfo->dither_mode = JDITHER_FS;
-  cinfo->two_pass_quantize = TRUE;
-  cinfo->desired_number_of_colors = 256;
-  cinfo->enable_1pass_quant = FALSE;
-  cinfo->enable_external_quant = FALSE;
-  cinfo->enable_2pass_quant = FALSE;
-  cinfo->actual_number_of_colors = 0;
-  cinfo->colormap = nullptr;
-}
-
-void InitProgressMonitor(j_decompress_ptr cinfo, bool coef_only) {
-  if (!cinfo->progress) return;
-  jpeg_decomp_master* m = cinfo->master;
-  int nc = cinfo->num_components;
-  int estimated_num_scans =
-      cinfo->progressive_mode ? 2 + 3 * nc : (m->is_multiscan_ ? nc : 1);
-  cinfo->progress->pass_limit = cinfo->total_iMCU_rows * estimated_num_scans;
-  cinfo->progress->pass_counter = 0;
-  if (coef_only) {
-    cinfo->progress->total_passes = 1;
-  } else {
-    int input_passes = !cinfo->buffered_image && m->is_multiscan_ ? 1 : 0;
-    bool two_pass_quant = FROM_JXL_BOOL(cinfo->quantize_colors) &&
-                          (cinfo->colormap != nullptr) &&
-                          FROM_JXL_BOOL(cinfo->two_pass_quantize) &&
-                          FROM_JXL_BOOL(cinfo->enable_2pass_quant);
-    cinfo->progress->total_passes = input_passes + (two_pass_quant ? 2 : 1);
-  }
-  cinfo->progress->completed_passes = 0;
-}
-
-void InitProgressMonitorForOutput(j_decompress_ptr cinfo) {
-  if (!cinfo->progress) return;
-  jpeg_decomp_master* m = cinfo->master;
-  int passes_per_output = cinfo->enable_2pass_quant ? 2 : 1;
-  int output_passes_left = cinfo->buffered_image && !m->found_eoi_ ? 2 : 1;
-  cinfo->progress->total_passes =
-      m->output_passes_done_ + passes_per_output * output_passes_left;
-  cinfo->progress->completed_passes = m->output_passes_done_;
-}
-
-void ProgressMonitorInputPass(j_decompress_ptr cinfo) {
-  if (!cinfo->progress) return;
-  cinfo->progress->pass_counter =
-      ((cinfo->input_scan_number - 1) * cinfo->total_iMCU_rows +
-       cinfo->input_iMCU_row);
-  if (cinfo->progress->pass_counter > cinfo->progress->pass_limit) {
-    cinfo->progress->pass_limit =
-        cinfo->input_scan_number * cinfo->total_iMCU_rows;
-  }
-  (*cinfo->progress->progress_monitor)(reinterpret_cast<j_common_ptr>(cinfo));
-}
-
-void ProgressMonitorOutputPass(j_decompress_ptr cinfo) {
-  if (!cinfo->progress) return;
-  jpeg_decomp_master* m = cinfo->master;
-  int input_passes = !cinfo->buffered_image && m->is_multiscan_ ? 1 : 0;
-  cinfo->progress->pass_counter = cinfo->output_scanline;
-  cinfo->progress->pass_limit = cinfo->output_height;
-  cinfo->progress->completed_passes = input_passes + m->output_passes_done_;
-  (*cinfo->progress->progress_monitor)(reinterpret_cast<j_common_ptr>(cinfo));
-}
-
-void BuildHuffmanLookupTable(j_decompress_ptr cinfo, JHUFF_TBL* table,
-                             HuffmanTableEntry* huff_lut) {
-  uint32_t counts[kJpegHuffmanMaxBitLength + 1] = {};
-  counts[0] = 0;
-  int total_count = 0;
-  int space = 1 << kJpegHuffmanMaxBitLength;
-  int max_depth = 1;
-  for (size_t i = 1; i <= kJpegHuffmanMaxBitLength; ++i) {
-    int count = table->bits[i];
-    if (count != 0) {
-      max_depth = i;
-    }
-    counts[i] = count;
-    total_count += count;
-    space -= count * (1 << (kJpegHuffmanMaxBitLength - i));
-  }
-  uint32_t values[kJpegHuffmanAlphabetSize + 1] = {};
-  uint8_t values_seen[256] = {0};
-  for (int i = 0; i < total_count; ++i) {
-    int value = table->huffval[i];
-    if (values_seen[value]) {
-      JPEGLI_ERROR("Duplicate Huffman code value %d", value);
-    }
-    values_seen[value] = 1;
-    values[i] = value;
-  }
-  // Add an invalid symbol that will have the all 1 code.
-  ++counts[max_depth];
-  values[total_count] = kJpegHuffmanAlphabetSize;
-  space -= (1 << (kJpegHuffmanMaxBitLength - max_depth));
-  if (space < 0) {
-    JPEGLI_ERROR("Invalid Huffman code lengths.");
-  } else if (space > 0 && huff_lut[0].value != 0xffff) {
-    // Re-initialize the values to an invalid symbol so that we can recognize
-    // it when reading the bit stream using a Huffman code with space > 0.
-    for (int i = 0; i < kJpegHuffmanLutSize; ++i) {
-      huff_lut[i].bits = 0;
-      huff_lut[i].value = 0xffff;
-    }
-  }
-  BuildJpegHuffmanTable(&counts[0], &values[0], huff_lut);
-}
-
-void PrepareForScan(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  for (int i = 0; i < cinfo->comps_in_scan; ++i) {
-    int comp_idx = cinfo->cur_comp_info[i]->component_index;
-    int* prev_coef_bits = cinfo->coef_bits[comp_idx + cinfo->num_components];
-    for (int k = std::min(cinfo->Ss, 1); k <= std::max(cinfo->Se, 9); k++) {
-      prev_coef_bits[k] =
-          (cinfo->input_scan_number > 0) ? cinfo->coef_bits[comp_idx][k] : 0;
-    }
-    for (int k = cinfo->Ss; k <= cinfo->Se; ++k) {
-      cinfo->coef_bits[comp_idx][k] = cinfo->Al;
-    }
-  }
-  AddStandardHuffmanTables(reinterpret_cast<j_common_ptr>(cinfo),
-                           /*is_dc=*/false);
-  AddStandardHuffmanTables(reinterpret_cast<j_common_ptr>(cinfo),
-                           /*is_dc=*/true);
-  // Check that all the Huffman tables needed for this scan are defined and
-  // build derived lookup tables.
-  for (int i = 0; i < cinfo->comps_in_scan; ++i) {
-    if (cinfo->Ss == 0) {
-      int dc_tbl_idx = cinfo->cur_comp_info[i]->dc_tbl_no;
-      JHUFF_TBL* table = cinfo->dc_huff_tbl_ptrs[dc_tbl_idx];
-      HuffmanTableEntry* huff_lut =
-          &m->dc_huff_lut_[dc_tbl_idx * kJpegHuffmanLutSize];
-      if (!table) {
-        JPEGLI_ERROR("DC Huffman table %d not found", dc_tbl_idx);
-      }
-      BuildHuffmanLookupTable(cinfo, table, huff_lut);
-    }
-    if (cinfo->Se > 0) {
-      int ac_tbl_idx = cinfo->cur_comp_info[i]->ac_tbl_no;
-      JHUFF_TBL* table = cinfo->ac_huff_tbl_ptrs[ac_tbl_idx];
-      HuffmanTableEntry* huff_lut =
-          &m->ac_huff_lut_[ac_tbl_idx * kJpegHuffmanLutSize];
-      if (!table) {
-        JPEGLI_ERROR("AC Huffman table %d not found", ac_tbl_idx);
-      }
-      BuildHuffmanLookupTable(cinfo, table, huff_lut);
-    }
-  }
-  // Copy quantization tables into comp_info.
-  for (int i = 0; i < cinfo->comps_in_scan; ++i) {
-    jpeg_component_info* comp = cinfo->cur_comp_info[i];
-    int quant_tbl_idx = comp->quant_tbl_no;
-    JQUANT_TBL* quant_table = cinfo->quant_tbl_ptrs[quant_tbl_idx];
-    if (!quant_table) {
-      JPEGLI_ERROR("Quantization table with index %d not found", quant_tbl_idx);
-    }
-    if (comp->quant_table == nullptr) {
-      comp->quant_table = Allocate<JQUANT_TBL>(cinfo, 1, JPOOL_IMAGE);
-      memcpy(comp->quant_table, quant_table, sizeof(JQUANT_TBL));
-    }
-  }
-  if (cinfo->comps_in_scan == 1) {
-    const auto& comp = *cinfo->cur_comp_info[0];
-    cinfo->MCUs_per_row = DivCeil(cinfo->image_width * comp.h_samp_factor,
-                                  cinfo->max_h_samp_factor * DCTSIZE);
-    cinfo->MCU_rows_in_scan = DivCeil(cinfo->image_height * comp.v_samp_factor,
-                                      cinfo->max_v_samp_factor * DCTSIZE);
-    m->mcu_rows_per_iMCU_row_ = cinfo->cur_comp_info[0]->v_samp_factor;
-  } else {
-    cinfo->MCU_rows_in_scan = cinfo->total_iMCU_rows;
-    cinfo->MCUs_per_row = m->iMCU_cols_;
-    m->mcu_rows_per_iMCU_row_ = 1;
-    size_t mcu_size = 0;
-    for (int i = 0; i < cinfo->comps_in_scan; ++i) {
-      jpeg_component_info* comp = cinfo->cur_comp_info[i];
-      mcu_size += comp->h_samp_factor * comp->v_samp_factor;
-    }
-    if (mcu_size > D_MAX_BLOCKS_IN_MCU) {
-      JPEGLI_ERROR("MCU size too big");
-    }
-  }
-  memset(m->last_dc_coeff_, 0, sizeof(m->last_dc_coeff_));
-  m->restarts_to_go_ = cinfo->restart_interval;
-  m->next_restart_marker_ = 0;
-  m->eobrun_ = -1;
-  m->scan_mcu_row_ = 0;
-  m->scan_mcu_col_ = 0;
-  m->codestream_bits_ahead_ = 0;
-  ++cinfo->input_scan_number;
-  cinfo->input_iMCU_row = 0;
-  PrepareForiMCURow(cinfo);
-  cinfo->global_state = kDecProcessScan;
-}
-
-int ConsumeInput(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  if (cinfo->global_state == kDecProcessScan && m->streaming_mode_ &&
-      cinfo->input_iMCU_row > cinfo->output_iMCU_row) {
-    // Prevent input from getting ahead of output in streaming mode.
-    return JPEG_SUSPENDED;
-  }
-  jpeg_source_mgr* src = cinfo->src;
-  int status;
-  for (;;) {
-    const uint8_t* data;
-    size_t len;
-    if (m->input_buffer_.empty()) {
-      data = cinfo->src->next_input_byte;
-      len = cinfo->src->bytes_in_buffer;
-    } else {
-      data = &m->input_buffer_[m->input_buffer_pos_];
-      len = m->input_buffer_.size() - m->input_buffer_pos_;
-    }
-    size_t pos = 0;
-    if (cinfo->global_state == kDecProcessScan) {
-      status = ProcessScan(cinfo, data, len, &pos, &m->codestream_bits_ahead_);
-    } else {
-      status = ProcessMarkers(cinfo, data, len, &pos);
-    }
-    if (m->input_buffer_.empty()) {
-      cinfo->src->next_input_byte += pos;
-      cinfo->src->bytes_in_buffer -= pos;
-    } else {
-      m->input_buffer_pos_ += pos;
-      size_t bytes_left = m->input_buffer_.size() - m->input_buffer_pos_;
-      if (bytes_left <= src->bytes_in_buffer) {
-        src->next_input_byte += (src->bytes_in_buffer - bytes_left);
-        src->bytes_in_buffer = bytes_left;
-        m->input_buffer_.clear();
-        m->input_buffer_pos_ = 0;
-      }
-    }
-    if (status == kHandleRestart) {
-      JXL_DASSERT(m->input_buffer_.size() <=
-                  m->input_buffer_pos_ + src->bytes_in_buffer);
-      m->input_buffer_.clear();
-      m->input_buffer_pos_ = 0;
-      if (cinfo->unread_marker == 0xd0 + m->next_restart_marker_) {
-        cinfo->unread_marker = 0;
-      } else {
-        if (!(*cinfo->src->resync_to_restart)(cinfo, m->next_restart_marker_)) {
-          return JPEG_SUSPENDED;
-        }
-      }
-      m->next_restart_marker_ += 1;
-      m->next_restart_marker_ &= 0x7;
-      m->restarts_to_go_ = cinfo->restart_interval;
-      if (cinfo->unread_marker != 0) {
-        JPEGLI_WARN("Failed to resync to next restart marker, skipping scan.");
-        return JPEG_SCAN_COMPLETED;
-      }
-      continue;
-    }
-    if (status == kHandleMarkerProcessor) {
-      JXL_DASSERT(m->input_buffer_.size() <=
-                  m->input_buffer_pos_ + src->bytes_in_buffer);
-      m->input_buffer_.clear();
-      m->input_buffer_pos_ = 0;
-      if (!(*GetMarkerProcessor(cinfo))(cinfo)) {
-        return JPEG_SUSPENDED;
-      }
-      cinfo->unread_marker = 0;
-      continue;
-    }
-    if (status != kNeedMoreInput) {
-      break;
-    }
-    if (m->input_buffer_.empty()) {
-      JXL_DASSERT(m->input_buffer_pos_ == 0);
-      m->input_buffer_.assign(src->next_input_byte,
-                              src->next_input_byte + src->bytes_in_buffer);
-    }
-    if (!(*cinfo->src->fill_input_buffer)(cinfo)) {
-      m->input_buffer_.clear();
-      m->input_buffer_pos_ = 0;
-      return JPEG_SUSPENDED;
-    }
-    if (src->bytes_in_buffer == 0) {
-      JPEGLI_ERROR("Empty input.");
-    }
-    m->input_buffer_.insert(m->input_buffer_.end(), src->next_input_byte,
-                            src->next_input_byte + src->bytes_in_buffer);
-  }
-  if (status == JPEG_SCAN_COMPLETED) {
-    cinfo->global_state = kDecProcessMarkers;
-  } else if (status == JPEG_REACHED_SOS) {
-    if (cinfo->global_state == kDecInHeader) {
-      cinfo->global_state = kDecHeaderDone;
-    } else {
-      PrepareForScan(cinfo);
-    }
-  }
-  return status;
-}
-
-bool IsInputReady(j_decompress_ptr cinfo) {
-  if (cinfo->master->found_eoi_) {
-    return true;
-  }
-  if (cinfo->input_scan_number > cinfo->output_scan_number) {
-    return true;
-  }
-  if (cinfo->input_scan_number < cinfo->output_scan_number) {
-    return false;
-  }
-  if (cinfo->input_iMCU_row == cinfo->total_iMCU_rows) {
-    return true;
-  }
-  return cinfo->input_iMCU_row >
-         cinfo->output_iMCU_row + (cinfo->master->streaming_mode_ ? 0 : 2);
-}
-
-bool ReadOutputPass(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  if (!m->pixels_) {
-    size_t stride = cinfo->out_color_components * cinfo->output_width;
-    size_t num_samples = cinfo->output_height * stride;
-    m->pixels_ = Allocate<uint8_t>(cinfo, num_samples, JPOOL_IMAGE);
-    m->scanlines_ =
-        Allocate<JSAMPROW>(cinfo, cinfo->output_height, JPOOL_IMAGE);
-    for (size_t i = 0; i < cinfo->output_height; ++i) {
-      m->scanlines_[i] = &m->pixels_[i * stride];
-    }
-  }
-  size_t num_output_rows = 0;
-  while (num_output_rows < cinfo->output_height) {
-    if (IsInputReady(cinfo)) {
-      ProgressMonitorOutputPass(cinfo);
-      ProcessOutput(cinfo, &num_output_rows, m->scanlines_,
-                    cinfo->output_height);
-    } else if (ConsumeInput(cinfo) == JPEG_SUSPENDED) {
-      return false;
-    }
-  }
-  cinfo->output_scanline = 0;
-  cinfo->output_iMCU_row = 0;
-  return true;
-}
-
-boolean PrepareQuantizedOutput(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  if (cinfo->raw_data_out) {
-    JPEGLI_ERROR("Color quantization is not supported in raw data mode.");
-  }
-  if (m->output_data_type_ != JPEGLI_TYPE_UINT8) {
-    JPEGLI_ERROR("Color quantization must use 8-bit mode.");
-  }
-  if (cinfo->colormap) {
-    m->quant_mode_ = 3;
-  } else if (cinfo->two_pass_quantize && cinfo->enable_2pass_quant) {
-    m->quant_mode_ = 2;
-  } else if (cinfo->enable_1pass_quant) {
-    m->quant_mode_ = 1;
-  } else {
-    JPEGLI_ERROR("Invalid quantization mode change");
-  }
-  if (m->quant_mode_ > 1 && cinfo->dither_mode == JDITHER_ORDERED) {
-    cinfo->dither_mode = JDITHER_FS;
-  }
-  if (m->quant_mode_ == 1) {
-    ChooseColorMap1Pass(cinfo);
-  } else if (m->quant_mode_ == 2) {
-    m->quant_pass_ = 0;
-    if (!ReadOutputPass(cinfo)) {
-      return FALSE;
-    }
-    ChooseColorMap2Pass(cinfo);
-  }
-  if (m->quant_mode_ == 2 ||
-      (m->quant_mode_ == 3 && m->regenerate_inverse_colormap_)) {
-    CreateInverseColorMap(cinfo);
-  }
-  if (cinfo->dither_mode == JDITHER_ORDERED) {
-    CreateOrderedDitherTables(cinfo);
-  } else if (cinfo->dither_mode == JDITHER_FS) {
-    InitFSDitherState(cinfo);
-  }
-  m->quant_pass_ = 1;
-  return TRUE;
-}
-
-void AllocateCoefficientBuffer(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  j_common_ptr comptr = reinterpret_cast<j_common_ptr>(cinfo);
-  jvirt_barray_ptr* coef_arrays = jpegli::Allocate<jvirt_barray_ptr>(
-      cinfo, cinfo->num_components, JPOOL_IMAGE);
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    jpeg_component_info* comp = &cinfo->comp_info[c];
-    size_t height_in_blocks =
-        m->streaming_mode_ ? comp->v_samp_factor : comp->height_in_blocks;
-    coef_arrays[c] = (*cinfo->mem->request_virt_barray)(
-        comptr, JPOOL_IMAGE, TRUE, comp->width_in_blocks, height_in_blocks,
-        comp->v_samp_factor);
-  }
-  cinfo->master->coef_arrays = coef_arrays;
-  (*cinfo->mem->realize_virt_arrays)(comptr);
-}
-
-void AllocateOutputBuffers(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  size_t iMCU_width = cinfo->max_h_samp_factor * m->min_scaled_dct_size;
-  size_t output_stride = m->iMCU_cols_ * iMCU_width;
-  m->need_context_rows_ = false;
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    if (cinfo->do_fancy_upsampling && m->v_factor[c] == 2) {
-      m->need_context_rows_ = true;
-    }
-  }
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    const auto& comp = cinfo->comp_info[c];
-    size_t cheight = comp.v_samp_factor * m->scaled_dct_size[c];
-    int downsampled_width = output_stride / m->h_factor[c];
-    m->raw_height_[c] = comp.height_in_blocks * m->scaled_dct_size[c];
-    if (m->need_context_rows_) {
-      cheight *= 3;
-    }
-    m->raw_output_[c].Allocate(cinfo, cheight, downsampled_width);
-  }
-  int num_all_components =
-      std::max(cinfo->out_color_components, cinfo->num_components);
-  for (int c = 0; c < num_all_components; ++c) {
-    m->render_output_[c].Allocate(cinfo, cinfo->max_v_samp_factor,
-                                  output_stride);
-  }
-  m->idct_scratch_ = Allocate<float>(cinfo, 5 * DCTSIZE2, JPOOL_IMAGE_ALIGNED);
-  // Padding for horizontal chroma upsampling.
-  constexpr size_t kPaddingLeft = 64;
-  constexpr size_t kPaddingRight = 64;
-  m->upsample_scratch_ = Allocate<float>(
-      cinfo, output_stride + kPaddingLeft + kPaddingRight, JPOOL_IMAGE_ALIGNED);
-  size_t bytes_per_sample = jpegli_bytes_per_sample(m->output_data_type_);
-  size_t bytes_per_pixel = cinfo->out_color_components * bytes_per_sample;
-  size_t scratch_stride = RoundUpTo(output_stride, HWY_ALIGNMENT);
-  m->output_scratch_ = Allocate<uint8_t>(
-      cinfo, bytes_per_pixel * scratch_stride, JPOOL_IMAGE_ALIGNED);
-  m->smoothing_scratch_ =
-      Allocate<int16_t>(cinfo, DCTSIZE2, JPOOL_IMAGE_ALIGNED);
-  size_t coeffs_per_block = cinfo->num_components * DCTSIZE2;
-  m->nonzeros_ = Allocate<int>(cinfo, coeffs_per_block, JPOOL_IMAGE_ALIGNED);
-  m->sumabs_ = Allocate<int>(cinfo, coeffs_per_block, JPOOL_IMAGE_ALIGNED);
-  m->biases_ = Allocate<float>(cinfo, coeffs_per_block, JPOOL_IMAGE_ALIGNED);
-  m->dequant_ = Allocate<float>(cinfo, coeffs_per_block, JPOOL_IMAGE_ALIGNED);
-  memset(m->dequant_, 0, coeffs_per_block * sizeof(float));
-}
-
-}  // namespace jpegli
-
-void jpegli_CreateDecompress(j_decompress_ptr cinfo, int version,
-                             size_t structsize) {
-  cinfo->mem = nullptr;
-  if (structsize != sizeof(*cinfo)) {
-    JPEGLI_ERROR("jpeg_decompress_struct has wrong size.");
-  }
-  jpegli::InitMemoryManager(reinterpret_cast<j_common_ptr>(cinfo));
-  cinfo->is_decompressor = TRUE;
-  cinfo->progress = nullptr;
-  cinfo->src = nullptr;
-  for (auto& quant_tbl_ptr : cinfo->quant_tbl_ptrs) {
-    quant_tbl_ptr = nullptr;
-  }
-  for (int i = 0; i < NUM_HUFF_TBLS; i++) {
-    cinfo->dc_huff_tbl_ptrs[i] = nullptr;
-    cinfo->ac_huff_tbl_ptrs[i] = nullptr;
-  }
-  cinfo->global_state = jpegli::kDecStart;
-  cinfo->sample_range_limit = nullptr;  // not used
-  cinfo->rec_outbuf_height = 1;         // output works with any buffer height
-  cinfo->master = new jpeg_decomp_master;
-  jpeg_decomp_master* m = cinfo->master;
-  for (auto& app_marker_parser : m->app_marker_parsers) {
-    app_marker_parser = nullptr;
-  }
-  m->com_marker_parser = nullptr;
-  memset(m->markers_to_save_, 0, sizeof(m->markers_to_save_));
-  jpegli::InitializeDecompressParams(cinfo);
-  jpegli::InitializeImage(cinfo);
-}
-
-void jpegli_destroy_decompress(j_decompress_ptr cinfo) {
-  jpegli_destroy(reinterpret_cast<j_common_ptr>(cinfo));
-}
-
-void jpegli_abort_decompress(j_decompress_ptr cinfo) {
-  jpegli_abort(reinterpret_cast<j_common_ptr>(cinfo));
-}
-
-void jpegli_save_markers(j_decompress_ptr cinfo, int marker_code,
-                         unsigned int length_limit) {
-  // TODO(szabadka) Limit our memory usage by taking into account length_limit.
-  jpeg_decomp_master* m = cinfo->master;
-  if (marker_code < 0xe0) {
-    JPEGLI_ERROR("jpegli_save_markers: invalid marker code %d", marker_code);
-  }
-  m->markers_to_save_[marker_code - 0xe0] = 1;
-}
-
-void jpegli_set_marker_processor(j_decompress_ptr cinfo, int marker_code,
-                                 jpeg_marker_parser_method routine) {
-  jpeg_decomp_master* m = cinfo->master;
-  if (marker_code == 0xfe) {
-    m->com_marker_parser = routine;
-  } else if (marker_code >= 0xe0 && marker_code <= 0xef) {
-    m->app_marker_parsers[marker_code - 0xe0] = routine;
-  } else {
-    JPEGLI_ERROR("jpegli_set_marker_processor: invalid marker code %d",
-                 marker_code);
-  }
-}
-
-int jpegli_consume_input(j_decompress_ptr cinfo) {
-  if (cinfo->global_state == jpegli::kDecStart) {
-    (*cinfo->err->reset_error_mgr)(reinterpret_cast<j_common_ptr>(cinfo));
-    (*cinfo->src->init_source)(cinfo);
-    jpegli::InitializeDecompressParams(cinfo);
-    jpegli::InitializeImage(cinfo);
-    cinfo->global_state = jpegli::kDecInHeader;
-  }
-  if (cinfo->global_state == jpegli::kDecHeaderDone) {
-    return JPEG_REACHED_SOS;
-  }
-  if (cinfo->master->found_eoi_) {
-    return JPEG_REACHED_EOI;
-  }
-  if (cinfo->global_state == jpegli::kDecInHeader ||
-      cinfo->global_state == jpegli::kDecProcessMarkers ||
-      cinfo->global_state == jpegli::kDecProcessScan) {
-    return jpegli::ConsumeInput(cinfo);
-  }
-  JPEGLI_ERROR("Unexpected state %d", cinfo->global_state);
-  return JPEG_REACHED_EOI;  // return value does not matter
-}
-
-int jpegli_read_header(j_decompress_ptr cinfo, boolean require_image) {
-  if (cinfo->global_state != jpegli::kDecStart &&
-      cinfo->global_state != jpegli::kDecInHeader) {
-    JPEGLI_ERROR("jpegli_read_header: unexpected state %d",
-                 cinfo->global_state);
-  }
-  if (cinfo->src == nullptr) {
-    JPEGLI_ERROR("Missing source.");
-  }
-  for (;;) {
-    int retcode = jpegli_consume_input(cinfo);
-    if (retcode == JPEG_SUSPENDED) {
-      return retcode;
-    } else if (retcode == JPEG_REACHED_SOS) {
-      break;
-    } else if (retcode == JPEG_REACHED_EOI) {
-      if (require_image) {
-        JPEGLI_ERROR("jpegli_read_header: unexpected EOI marker.");
-      }
-      jpegli_abort_decompress(cinfo);
-      return JPEG_HEADER_TABLES_ONLY;
-    }
-  };
-  return JPEG_HEADER_OK;
-}
-
-boolean jpegli_read_icc_profile(j_decompress_ptr cinfo, JOCTET** icc_data_ptr,
-                                unsigned int* icc_data_len) {
-  if (cinfo->global_state == jpegli::kDecStart ||
-      cinfo->global_state == jpegli::kDecInHeader) {
-    JPEGLI_ERROR("jpegli_read_icc_profile: unexpected state %d",
-                 cinfo->global_state);
-  }
-  if (icc_data_ptr == nullptr || icc_data_len == nullptr) {
-    JPEGLI_ERROR("jpegli_read_icc_profile: invalid output buffer");
-  }
-  jpeg_decomp_master* m = cinfo->master;
-  if (m->icc_profile_.empty()) {
-    *icc_data_ptr = nullptr;
-    *icc_data_len = 0;
-    return FALSE;
-  }
-  *icc_data_len = m->icc_profile_.size();
-  *icc_data_ptr = static_cast<JOCTET*>(malloc(*icc_data_len));
-  if (*icc_data_ptr == nullptr) {
-    JPEGLI_ERROR("jpegli_read_icc_profile: Out of memory");
-  }
-  memcpy(*icc_data_ptr, m->icc_profile_.data(), *icc_data_len);
-  return TRUE;
-}
-
-void jpegli_core_output_dimensions(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  if (!m->found_sof_) {
-    JPEGLI_ERROR("No SOF marker found.");
-  }
-  if (cinfo->raw_data_out) {
-    if (cinfo->scale_num != 1 || cinfo->scale_denom != 1) {
-      JPEGLI_ERROR("Output scaling is not supported in raw output mode");
-    }
-  }
-  if (cinfo->scale_num != 1 || cinfo->scale_denom != 1) {
-    int dctsize = 16;
-    while (cinfo->scale_num * DCTSIZE <= cinfo->scale_denom * (dctsize - 1)) {
-      --dctsize;
-    }
-    m->min_scaled_dct_size = dctsize;
-    cinfo->output_width =
-        jpegli::DivCeil(cinfo->image_width * dctsize, DCTSIZE);
-    cinfo->output_height =
-        jpegli::DivCeil(cinfo->image_height * dctsize, DCTSIZE);
-    for (int c = 0; c < cinfo->num_components; ++c) {
-      m->scaled_dct_size[c] = m->min_scaled_dct_size;
-    }
-  } else {
-    cinfo->output_width = cinfo->image_width;
-    cinfo->output_height = cinfo->image_height;
-    m->min_scaled_dct_size = DCTSIZE;
-    for (int c = 0; c < cinfo->num_components; ++c) {
-      m->scaled_dct_size[c] = DCTSIZE;
-    }
-  }
-}
-
-void jpegli_calc_output_dimensions(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  jpegli_core_output_dimensions(cinfo);
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    jpeg_component_info* comp = &cinfo->comp_info[c];
-    m->h_factor[c] = cinfo->max_h_samp_factor / comp->h_samp_factor;
-    m->v_factor[c] = cinfo->max_v_samp_factor / comp->v_samp_factor;
-  }
-  if (cinfo->scale_num != 1 || cinfo->scale_denom != 1) {
-    for (int c = 0; c < cinfo->num_components; ++c) {
-      // Prefer IDCT scaling over 2x upsampling.
-      while (m->scaled_dct_size[c] < DCTSIZE && (m->v_factor[c] % 2) == 0 &&
-             (m->h_factor[c] % 2) == 0) {
-        m->scaled_dct_size[c] *= 2;
-        m->v_factor[c] /= 2;
-        m->h_factor[c] /= 2;
-      }
-    }
-  }
-  switch (cinfo->out_color_space) {
-    case JCS_GRAYSCALE:
-      cinfo->out_color_components = 1;
-      break;
-    case JCS_RGB:
-    case JCS_YCbCr:
-#ifdef JCS_EXTENSIONS
-    case JCS_EXT_RGB:
-    case JCS_EXT_BGR:
-#endif
-      cinfo->out_color_components = 3;
-      break;
-    case JCS_CMYK:
-    case JCS_YCCK:
-#ifdef JCS_EXTENSIONS
-    case JCS_EXT_RGBX:
-    case JCS_EXT_BGRX:
-    case JCS_EXT_XBGR:
-    case JCS_EXT_XRGB:
-#endif
-#ifdef JCS_ALPHA_EXTENSIONS
-    case JCS_EXT_RGBA:
-    case JCS_EXT_BGRA:
-    case JCS_EXT_ABGR:
-    case JCS_EXT_ARGB:
-#endif
-      cinfo->out_color_components = 4;
-      break;
-    default:
-      cinfo->out_color_components = cinfo->num_components;
-  }
-  cinfo->output_components =
-      cinfo->quantize_colors ? 1 : cinfo->out_color_components;
-  cinfo->rec_outbuf_height = 1;
-}
-
-boolean jpegli_has_multiple_scans(j_decompress_ptr cinfo) {
-  if (cinfo->global_state != jpegli::kDecHeaderDone &&
-      cinfo->global_state != jpegli::kDecProcessScan &&
-      cinfo->global_state != jpegli::kDecProcessMarkers) {
-    JPEGLI_ERROR("jpegli_has_multiple_scans: unexpected state %d",
-                 cinfo->global_state);
-  }
-  return TO_JXL_BOOL(cinfo->master->is_multiscan_);
-}
-
-boolean jpegli_input_complete(j_decompress_ptr cinfo) {
-  return TO_JXL_BOOL(cinfo->master->found_eoi_);
-}
-
-boolean jpegli_start_decompress(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  if (cinfo->global_state == jpegli::kDecHeaderDone) {
-    m->streaming_mode_ = !m->is_multiscan_ &&
-                         !FROM_JXL_BOOL(cinfo->buffered_image) &&
-                         (!FROM_JXL_BOOL(cinfo->quantize_colors) ||
-                          !FROM_JXL_BOOL(cinfo->two_pass_quantize));
-    jpegli::AllocateCoefficientBuffer(cinfo);
-    jpegli_calc_output_dimensions(cinfo);
-    jpegli::PrepareForScan(cinfo);
-    if (cinfo->quantize_colors) {
-      if (cinfo->colormap != nullptr) {
-        cinfo->enable_external_quant = TRUE;
-      } else if (cinfo->two_pass_quantize &&
-                 cinfo->out_color_space == JCS_RGB) {
-        cinfo->enable_2pass_quant = TRUE;
-      } else {
-        cinfo->enable_1pass_quant = TRUE;
-      }
-    }
-    jpegli::InitProgressMonitor(cinfo, /*coef_only=*/false);
-    jpegli::AllocateOutputBuffers(cinfo);
-    if (cinfo->buffered_image == TRUE) {
-      cinfo->output_scan_number = 0;
-      return TRUE;
-    }
-  } else if (!m->is_multiscan_) {
-    JPEGLI_ERROR("jpegli_start_decompress: unexpected state %d",
-                 cinfo->global_state);
-  }
-  if (m->is_multiscan_) {
-    if (cinfo->global_state != jpegli::kDecProcessScan &&
-        cinfo->global_state != jpegli::kDecProcessMarkers) {
-      JPEGLI_ERROR("jpegli_start_decompress: unexpected state %d",
-                   cinfo->global_state);
-    }
-    while (!m->found_eoi_) {
-      jpegli::ProgressMonitorInputPass(cinfo);
-      if (jpegli::ConsumeInput(cinfo) == JPEG_SUSPENDED) {
-        return FALSE;
-      }
-    }
-  }
-  cinfo->output_scan_number = cinfo->input_scan_number;
-  jpegli::PrepareForOutput(cinfo);
-  if (cinfo->quantize_colors) {
-    return jpegli::PrepareQuantizedOutput(cinfo);
-  } else {
-    return TRUE;
-  }
-}
-
-boolean jpegli_start_output(j_decompress_ptr cinfo, int scan_number) {
-  jpeg_decomp_master* m = cinfo->master;
-  if (!cinfo->buffered_image) {
-    JPEGLI_ERROR("jpegli_start_output: buffered image mode was not set");
-  }
-  if (cinfo->global_state != jpegli::kDecProcessScan &&
-      cinfo->global_state != jpegli::kDecProcessMarkers) {
-    JPEGLI_ERROR("jpegli_start_output: unexpected state %d",
-                 cinfo->global_state);
-  }
-  cinfo->output_scan_number = std::max(1, scan_number);
-  if (m->found_eoi_) {
-    cinfo->output_scan_number =
-        std::min(cinfo->output_scan_number, cinfo->input_scan_number);
-  }
-  jpegli::InitProgressMonitorForOutput(cinfo);
-  jpegli::PrepareForOutput(cinfo);
-  if (cinfo->quantize_colors) {
-    return jpegli::PrepareQuantizedOutput(cinfo);
-  } else {
-    return TRUE;
-  }
-}
-
-boolean jpegli_finish_output(j_decompress_ptr cinfo) {
-  if (!cinfo->buffered_image) {
-    JPEGLI_ERROR("jpegli_finish_output: buffered image mode was not set");
-  }
-  if (cinfo->global_state != jpegli::kDecProcessScan &&
-      cinfo->global_state != jpegli::kDecProcessMarkers) {
-    JPEGLI_ERROR("jpegli_finish_output: unexpected state %d",
-                 cinfo->global_state);
-  }
-  // Advance input to the start of the next scan, or to the end of input.
-  while (cinfo->input_scan_number <= cinfo->output_scan_number &&
-         !cinfo->master->found_eoi_) {
-    if (jpegli::ConsumeInput(cinfo) == JPEG_SUSPENDED) {
-      return FALSE;
-    }
-  }
-  return TRUE;
-}
-
-JDIMENSION jpegli_read_scanlines(j_decompress_ptr cinfo, JSAMPARRAY scanlines,
-                                 JDIMENSION max_lines) {
-  jpeg_decomp_master* m = cinfo->master;
-  if (cinfo->global_state != jpegli::kDecProcessScan &&
-      cinfo->global_state != jpegli::kDecProcessMarkers) {
-    JPEGLI_ERROR("jpegli_read_scanlines: unexpected state %d",
-                 cinfo->global_state);
-  }
-  if (cinfo->buffered_image) {
-    if (cinfo->output_scan_number == 0) {
-      JPEGLI_ERROR(
-          "jpegli_read_scanlines: "
-          "jpegli_start_output() was not called");
-    }
-  } else if (m->is_multiscan_ && !m->found_eoi_) {
-    JPEGLI_ERROR(
-        "jpegli_read_scanlines: "
-        "jpegli_start_decompress() did not finish");
-  }
-  if (cinfo->output_scanline + max_lines > cinfo->output_height) {
-    max_lines = cinfo->output_height - cinfo->output_scanline;
-  }
-  jpegli::ProgressMonitorOutputPass(cinfo);
-  size_t num_output_rows = 0;
-  while (num_output_rows < max_lines) {
-    if (jpegli::IsInputReady(cinfo)) {
-      jpegli::ProcessOutput(cinfo, &num_output_rows, scanlines, max_lines);
-    } else if (jpegli::ConsumeInput(cinfo) == JPEG_SUSPENDED) {
-      break;
-    }
-  }
-  return num_output_rows;
-}
-
-JDIMENSION jpegli_skip_scanlines(j_decompress_ptr cinfo, JDIMENSION num_lines) {
-  // TODO(szabadka) Skip the IDCT for skipped over blocks.
-  return jpegli_read_scanlines(cinfo, nullptr, num_lines);
-}
-
-void jpegli_crop_scanline(j_decompress_ptr cinfo, JDIMENSION* xoffset,
-                          JDIMENSION* width) {
-  jpeg_decomp_master* m = cinfo->master;
-  if ((cinfo->global_state != jpegli::kDecProcessScan &&
-       cinfo->global_state != jpegli::kDecProcessMarkers) ||
-      cinfo->output_scanline != 0) {
-    JPEGLI_ERROR("jpegli_crop_decompress: unexpected state %d",
-                 cinfo->global_state);
-  }
-  if (cinfo->raw_data_out) {
-    JPEGLI_ERROR("Output cropping is not supported in raw data mode");
-  }
-  if (xoffset == nullptr || width == nullptr || *width == 0 ||
-      *xoffset + *width > cinfo->output_width) {
-    JPEGLI_ERROR("jpegli_crop_scanline: Invalid arguments");
-  }
-  // TODO(szabadka) Skip the IDCT for skipped over blocks.
-  size_t xend = *xoffset + *width;
-  size_t iMCU_width = m->min_scaled_dct_size * cinfo->max_h_samp_factor;
-  *xoffset = (*xoffset / iMCU_width) * iMCU_width;
-  *width = xend - *xoffset;
-  cinfo->master->xoffset_ = *xoffset;
-  cinfo->output_width = *width;
-}
-
-JDIMENSION jpegli_read_raw_data(j_decompress_ptr cinfo, JSAMPIMAGE data,
-                                JDIMENSION max_lines) {
-  if ((cinfo->global_state != jpegli::kDecProcessScan &&
-       cinfo->global_state != jpegli::kDecProcessMarkers) ||
-      !cinfo->raw_data_out) {
-    JPEGLI_ERROR("jpegli_read_raw_data: unexpected state %d",
-                 cinfo->global_state);
-  }
-  size_t iMCU_height = cinfo->max_v_samp_factor * DCTSIZE;
-  if (max_lines < iMCU_height) {
-    JPEGLI_ERROR("jpegli_read_raw_data: output buffer too small");
-  }
-  jpegli::ProgressMonitorOutputPass(cinfo);
-  while (!jpegli::IsInputReady(cinfo)) {
-    if (jpegli::ConsumeInput(cinfo) == JPEG_SUSPENDED) {
-      return 0;
-    }
-  }
-  if (cinfo->output_iMCU_row < cinfo->total_iMCU_rows) {
-    jpegli::ProcessRawOutput(cinfo, data);
-    return iMCU_height;
-  }
-  return 0;
-}
-
-jvirt_barray_ptr* jpegli_read_coefficients(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  m->streaming_mode_ = false;
-  if (!cinfo->buffered_image && cinfo->global_state == jpegli::kDecHeaderDone) {
-    jpegli::AllocateCoefficientBuffer(cinfo);
-    jpegli_calc_output_dimensions(cinfo);
-    jpegli::InitProgressMonitor(cinfo, /*coef_only=*/true);
-    jpegli::PrepareForScan(cinfo);
-  }
-  if (cinfo->global_state != jpegli::kDecProcessScan &&
-      cinfo->global_state != jpegli::kDecProcessMarkers) {
-    JPEGLI_ERROR("jpegli_read_coefficients: unexpected state %d",
-                 cinfo->global_state);
-  }
-  if (!cinfo->buffered_image) {
-    while (!m->found_eoi_) {
-      jpegli::ProgressMonitorInputPass(cinfo);
-      if (jpegli::ConsumeInput(cinfo) == JPEG_SUSPENDED) {
-        return nullptr;
-      }
-    }
-    cinfo->output_scanline = cinfo->output_height;
-  }
-  return m->coef_arrays;
-}
-
-boolean jpegli_finish_decompress(j_decompress_ptr cinfo) {
-  if (cinfo->global_state != jpegli::kDecProcessScan &&
-      cinfo->global_state != jpegli::kDecProcessMarkers) {
-    JPEGLI_ERROR("jpegli_finish_decompress: unexpected state %d",
-                 cinfo->global_state);
-  }
-  if (!cinfo->buffered_image && cinfo->output_scanline < cinfo->output_height) {
-    JPEGLI_ERROR("Incomplete output");
-  }
-  while (!cinfo->master->found_eoi_) {
-    if (jpegli::ConsumeInput(cinfo) == JPEG_SUSPENDED) {
-      return FALSE;
-    }
-  }
-  (*cinfo->src->term_source)(cinfo);
-  jpegli_abort_decompress(cinfo);
-  return TRUE;
-}
-
-boolean jpegli_resync_to_restart(j_decompress_ptr cinfo, int desired) {
-  JPEGLI_WARN("Invalid restart marker found: 0x%02x vs 0x%02x.",
-              cinfo->unread_marker, 0xd0 + desired);
-  // This is a trivial implementation, we just let the decoder skip the entire
-  // scan and attempt to render the partial input.
-  return TRUE;
-}
-
-void jpegli_new_colormap(j_decompress_ptr cinfo) {
-  if (cinfo->global_state != jpegli::kDecProcessScan &&
-      cinfo->global_state != jpegli::kDecProcessMarkers) {
-    JPEGLI_ERROR("jpegli_new_colormap: unexpected state %d",
-                 cinfo->global_state);
-  }
-  if (!cinfo->buffered_image) {
-    JPEGLI_ERROR("jpegli_new_colormap: not in  buffered image mode");
-  }
-  if (!cinfo->enable_external_quant) {
-    JPEGLI_ERROR("external colormap quantizer was not enabled");
-  }
-  if (!cinfo->quantize_colors || cinfo->colormap == nullptr) {
-    JPEGLI_ERROR("jpegli_new_colormap: not in external colormap mode");
-  }
-  cinfo->master->regenerate_inverse_colormap_ = true;
-}
-
-void jpegli_set_output_format(j_decompress_ptr cinfo, JpegliDataType data_type,
-                              JpegliEndianness endianness) {
-  switch (data_type) {
-    case JPEGLI_TYPE_UINT8:
-    case JPEGLI_TYPE_UINT16:
-    case JPEGLI_TYPE_FLOAT:
-      cinfo->master->output_data_type_ = data_type;
-      break;
-    default:
-      JPEGLI_ERROR("Unsupported data type %d", data_type);
-  }
-  switch (endianness) {
-    case JPEGLI_NATIVE_ENDIAN:
-      cinfo->master->swap_endianness_ = false;
-      break;
-    case JPEGLI_LITTLE_ENDIAN:
-      cinfo->master->swap_endianness_ = !IsLittleEndian();
-      break;
-    case JPEGLI_BIG_ENDIAN:
-      cinfo->master->swap_endianness_ = IsLittleEndian();
-      break;
-    default:
-      JPEGLI_ERROR("Unsupported endianness %d", endianness);
-  }
-}
diff --git a/third_party/jpeg-xl/lib/jpegli/decode.h b/third_party/jpeg-xl/lib/jpegli/decode.h
deleted file mode 100644
index 78c39b409cd16..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/decode.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-//
-// This file contains the C API of the decoder part of the libjpegli library,
-// which is based on the C API of libjpeg, with the function names changed from
-// jpeg_* to jpegli_*, while decompressor object definitions are included
-// directly from jpeglib.h
-//
-// Applications can use the libjpegli library in one of the following ways:
-//
-//  (1) Include jpegli/encode.h and/or jpegli/decode.h, update the function
-//      names of the API and link against libjpegli.
-//
-//  (2) Leave the application code unchanged, but replace the libjpeg.so library
-//      with the one built by this project that is API- and ABI-compatible with
-//      libjpeg-turbo's version of libjpeg.so.
-
-#ifndef LIB_JPEGLI_DECODE_H_
-#define LIB_JPEGLI_DECODE_H_
-
-#include "lib/jpegli/common.h"
-#include "lib/jpegli/types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define jpegli_create_decompress(cinfo)              \
-  jpegli_CreateDecompress((cinfo), JPEG_LIB_VERSION, \
-                          (size_t)sizeof(struct jpeg_decompress_struct))
-
-void jpegli_CreateDecompress(j_decompress_ptr cinfo, int version,
-                             size_t structsize);
-
-void jpegli_stdio_src(j_decompress_ptr cinfo, FILE *infile);
-
-void jpegli_mem_src(j_decompress_ptr cinfo, const unsigned char *inbuffer,
-                    unsigned long insize /* NOLINT */);
-
-int jpegli_read_header(j_decompress_ptr cinfo, boolean require_image);
-
-boolean jpegli_start_decompress(j_decompress_ptr cinfo);
-
-JDIMENSION jpegli_read_scanlines(j_decompress_ptr cinfo, JSAMPARRAY scanlines,
-                                 JDIMENSION max_lines);
-
-JDIMENSION jpegli_skip_scanlines(j_decompress_ptr cinfo, JDIMENSION num_lines);
-
-void jpegli_crop_scanline(j_decompress_ptr cinfo, JDIMENSION *xoffset,
-                          JDIMENSION *width);
-
-boolean jpegli_finish_decompress(j_decompress_ptr cinfo);
-
-JDIMENSION jpegli_read_raw_data(j_decompress_ptr cinfo, JSAMPIMAGE data,
-                                JDIMENSION max_lines);
-
-jvirt_barray_ptr *jpegli_read_coefficients(j_decompress_ptr cinfo);
-
-boolean jpegli_has_multiple_scans(j_decompress_ptr cinfo);
-
-boolean jpegli_start_output(j_decompress_ptr cinfo, int scan_number);
-
-boolean jpegli_finish_output(j_decompress_ptr cinfo);
-
-boolean jpegli_input_complete(j_decompress_ptr cinfo);
-
-int jpegli_consume_input(j_decompress_ptr cinfo);
-
-#if JPEG_LIB_VERSION >= 80
-void jpegli_core_output_dimensions(j_decompress_ptr cinfo);
-#endif
-void jpegli_calc_output_dimensions(j_decompress_ptr cinfo);
-
-void jpegli_save_markers(j_decompress_ptr cinfo, int marker_code,
-                         unsigned int length_limit);
-
-void jpegli_set_marker_processor(j_decompress_ptr cinfo, int marker_code,
-                                 jpeg_marker_parser_method routine);
-
-boolean jpegli_resync_to_restart(j_decompress_ptr cinfo, int desired);
-
-boolean jpegli_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr,
-                                unsigned int *icc_data_len);
-
-void jpegli_abort_decompress(j_decompress_ptr cinfo);
-
-void jpegli_destroy_decompress(j_decompress_ptr cinfo);
-
-void jpegli_new_colormap(j_decompress_ptr cinfo);
-
-//
-// New API functions that are not available in libjpeg
-//
-// NOTE: This part of the API is still experimental and will probably change in
-// the future.
-//
-
-void jpegli_set_output_format(j_decompress_ptr cinfo, JpegliDataType data_type,
-                              JpegliEndianness endianness);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif  // LIB_JPEGLI_DECODE_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/decode_api_test.cc b/third_party/jpeg-xl/lib/jpegli/decode_api_test.cc
deleted file mode 100644
index b7ce6bb4d7340..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/decode_api_test.cc
+++ /dev/null
@@ -1,1340 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/types.h>
-
-#include <algorithm>
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <ostream>
-#include <sstream>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "lib/jpegli/decode.h"
-#include "lib/jpegli/encode.h"
-#include "lib/jpegli/libjpeg_test_util.h"
-#include "lib/jpegli/test_params.h"
-#include "lib/jpegli/test_utils.h"
-#include "lib/jpegli/testing.h"
-#include "lib/jpegli/types.h"
-#include "lib/jxl/base/status.h"
-
-namespace jpegli {
-namespace {
-
-constexpr uint8_t kFakeEoiMarker[2] = {0xff, 0xd9};
-constexpr size_t kNumSourceBuffers = 4;
-
-// Custom source manager that refills the input buffer in chunks, simulating
-// a file reader with a fixed buffer size.
-class SourceManager {
- public:
-  SourceManager(const uint8_t* data, size_t len, size_t max_chunk_size)
-      : data_(data), len_(len), max_chunk_size_(max_chunk_size) {
-    pub_.skip_input_data = skip_input_data;
-    pub_.resync_to_restart = jpegli_resync_to_restart;
-    pub_.term_source = term_source;
-    pub_.init_source = init_source;
-    pub_.fill_input_buffer = fill_input_buffer;
-    if (max_chunk_size_ == 0) max_chunk_size_ = len;
-    buffers_.resize(kNumSourceBuffers, std::vector<uint8_t>(max_chunk_size_));
-    Reset();
-  }
-
-  void Reset() {
-    pub_.next_input_byte = nullptr;
-    pub_.bytes_in_buffer = 0;
-    pos_ = 0;
-    chunk_idx_ = 0;
-  }
-
-  ~SourceManager() {
-    EXPECT_EQ(0, pub_.bytes_in_buffer);
-    EXPECT_EQ(len_, pos_);
-  }
-
- private:
-  jpeg_source_mgr pub_;
-  const uint8_t* data_;
-  size_t len_;
-  size_t chunk_idx_;
-  size_t pos_;
-  size_t max_chunk_size_;
-  std::vector<std::vector<uint8_t>> buffers_;
-
-  static void init_source(j_decompress_ptr cinfo) {}
-
-  static boolean fill_input_buffer(j_decompress_ptr cinfo) {
-    auto* src = reinterpret_cast<SourceManager*>(cinfo->src);
-    if (src->pos_ < src->len_) {
-      size_t chunk_size = std::min(src->len_ - src->pos_, src->max_chunk_size_);
-      size_t next_idx = ++src->chunk_idx_ % kNumSourceBuffers;
-      uint8_t* next_buffer = src->buffers_[next_idx].data();
-      memcpy(next_buffer, src->data_ + src->pos_, chunk_size);
-      src->pub_.next_input_byte = next_buffer;
-      src->pub_.bytes_in_buffer = chunk_size;
-    } else {
-      src->pub_.next_input_byte = kFakeEoiMarker;
-      src->pub_.bytes_in_buffer = 2;
-      src->len_ += 2;
-    }
-    src->pos_ += src->pub_.bytes_in_buffer;
-    return TRUE;
-  }
-
-  static void skip_input_data(j_decompress_ptr cinfo,
-                              long num_bytes /* NOLINT */) {
-    auto* src = reinterpret_cast<SourceManager*>(cinfo->src);
-    if (num_bytes <= 0) {
-      return;
-    }
-    if (src->pub_.bytes_in_buffer >= static_cast<size_t>(num_bytes)) {
-      src->pub_.bytes_in_buffer -= num_bytes;
-      src->pub_.next_input_byte += num_bytes;
-    } else {
-      src->pos_ += num_bytes - src->pub_.bytes_in_buffer;
-      src->pub_.bytes_in_buffer = 0;
-    }
-  }
-
-  static void term_source(j_decompress_ptr cinfo) {}
-};
-
-uint8_t markers_seen[kMarkerSequenceLen];
-size_t num_markers_seen = 0;
-
-uint8_t get_next_byte(j_decompress_ptr cinfo) {
-  if (cinfo->src->bytes_in_buffer == 0) {
-    (*cinfo->src->fill_input_buffer)(cinfo);
-  }
-  cinfo->src->bytes_in_buffer--;
-  return *cinfo->src->next_input_byte++;
-}
-
-boolean test_marker_processor(j_decompress_ptr cinfo) {
-  markers_seen[num_markers_seen] = cinfo->unread_marker;
-  size_t marker_len = (get_next_byte(cinfo) << 8) + get_next_byte(cinfo);
-  EXPECT_EQ(2 + ((num_markers_seen + 2) % sizeof(kMarkerData)), marker_len);
-  if (marker_len > 2) {
-    (*cinfo->src->skip_input_data)(cinfo, marker_len - 2);
-  }
-  ++num_markers_seen;
-  return TRUE;
-}
-
-void ReadOutputImage(const DecompressParams& dparams, j_decompress_ptr cinfo,
-                     TestImage* output) {
-  JDIMENSION xoffset = 0;
-  JDIMENSION yoffset = 0;
-  JDIMENSION xsize_cropped = cinfo->output_width;
-  JDIMENSION ysize_cropped = cinfo->output_height;
-  if (dparams.crop_output) {
-    xoffset = xsize_cropped = cinfo->output_width / 3;
-    yoffset = ysize_cropped = cinfo->output_height / 3;
-    jpegli_crop_scanline(cinfo, &xoffset, &xsize_cropped);
-  }
-  output->ysize = ysize_cropped;
-  output->xsize = cinfo->output_width;
-  output->components = cinfo->out_color_components;
-  output->data_type = dparams.data_type;
-  output->endianness = dparams.endianness;
-  size_t bytes_per_sample = jpegli_bytes_per_sample(dparams.data_type);
-  if (cinfo->raw_data_out) {
-    output->color_space = cinfo->jpeg_color_space;
-    for (int c = 0; c < cinfo->num_components; ++c) {
-      size_t xsize = cinfo->comp_info[c].width_in_blocks * DCTSIZE;
-      size_t ysize = cinfo->comp_info[c].height_in_blocks * DCTSIZE;
-      std::vector<uint8_t> plane(ysize * xsize * bytes_per_sample);
-      output->raw_data.emplace_back(std::move(plane));
-    }
-  } else {
-    output->color_space = cinfo->out_color_space;
-    output->AllocatePixels();
-  }
-  size_t total_output_lines = 0;
-  while (cinfo->output_scanline < cinfo->output_height) {
-    size_t max_lines;
-    size_t num_output_lines;
-    if (cinfo->raw_data_out) {
-      size_t iMCU_height = cinfo->max_v_samp_factor * DCTSIZE;
-      EXPECT_EQ(cinfo->output_scanline, cinfo->output_iMCU_row * iMCU_height);
-      max_lines = iMCU_height;
-      std::vector<std::vector<JSAMPROW>> rowdata(cinfo->num_components);
-      std::vector<JSAMPARRAY> data(cinfo->num_components);
-      for (int c = 0; c < cinfo->num_components; ++c) {
-        size_t xsize = cinfo->comp_info[c].width_in_blocks * DCTSIZE;
-        size_t ysize = cinfo->comp_info[c].height_in_blocks * DCTSIZE;
-        size_t num_lines = cinfo->comp_info[c].v_samp_factor * DCTSIZE;
-        rowdata[c].resize(num_lines);
-        size_t y0 = cinfo->output_iMCU_row * num_lines;
-        for (size_t i = 0; i < num_lines; ++i) {
-          rowdata[c][i] =
-              y0 + i < ysize ? &output->raw_data[c][(y0 + i) * xsize] : nullptr;
-        }
-        data[c] = rowdata[c].data();
-      }
-      num_output_lines = jpegli_read_raw_data(cinfo, data.data(), max_lines);
-    } else {
-      size_t max_output_lines = dparams.max_output_lines;
-      if (max_output_lines == 0) max_output_lines = cinfo->output_height;
-      if (cinfo->output_scanline < yoffset) {
-        max_lines = yoffset - cinfo->output_scanline;
-        num_output_lines = jpegli_skip_scanlines(cinfo, max_lines);
-      } else if (cinfo->output_scanline >= yoffset + ysize_cropped) {
-        max_lines = cinfo->output_height - cinfo->output_scanline;
-        num_output_lines = jpegli_skip_scanlines(cinfo, max_lines);
-      } else {
-        size_t lines_left = yoffset + ysize_cropped - cinfo->output_scanline;
-        max_lines = std::min<size_t>(max_output_lines, lines_left);
-        size_t stride = cinfo->output_width * cinfo->out_color_components *
-                        bytes_per_sample;
-        std::vector<JSAMPROW> scanlines(max_lines);
-        for (size_t i = 0; i < max_lines; ++i) {
-          size_t yidx = cinfo->output_scanline - yoffset + i;
-          scanlines[i] = &output->pixels[yidx * stride];
-        }
-        num_output_lines =
-            jpegli_read_scanlines(cinfo, scanlines.data(), max_lines);
-        if (cinfo->quantize_colors) {
-          for (size_t i = 0; i < num_output_lines; ++i) {
-            UnmapColors(scanlines[i], cinfo->output_width,
-                        cinfo->out_color_components, cinfo->colormap,
-                        cinfo->actual_number_of_colors);
-          }
-        }
-      }
-    }
-    total_output_lines += num_output_lines;
-    EXPECT_EQ(total_output_lines, cinfo->output_scanline);
-    EXPECT_EQ(num_output_lines, max_lines);
-  }
-  EXPECT_EQ(cinfo->total_iMCU_rows,
-            DivCeil(cinfo->image_height, cinfo->max_v_samp_factor * DCTSIZE));
-}
-
-struct TestConfig {
-  std::string fn;
-  std::string fn_desc;
-  TestImage input;
-  CompressParams jparams;
-  DecompressParams dparams;
-  bool compare_to_orig = false;
-  float max_tolerance_factor = 1.01f;
-  float max_rms_dist = 1.0f;
-  float max_diff = 35.0f;
-};
-
-jxl::StatusOr<std::vector<uint8_t>> GetTestJpegData(TestConfig& config) {
-  std::vector<uint8_t> compressed;
-  if (!config.fn.empty()) {
-    JXL_ASSIGN_OR_RETURN(compressed, ReadTestData(config.fn));
-  } else {
-    GeneratePixels(&config.input);
-    JXL_RETURN_IF_ERROR(
-        EncodeWithJpegli(config.input, config.jparams, &compressed));
-  }
-  if (config.dparams.size_factor < 1.0f) {
-    compressed.resize(compressed.size() * config.dparams.size_factor);
-  }
-  return compressed;
-}
-
-void TestAPINonBuffered(const CompressParams& jparams,
-                        const DecompressParams& dparams,
-                        const TestImage& expected_output,
-                        j_decompress_ptr cinfo, TestImage* output) {
-  if (jparams.add_marker) {
-    jpegli_save_markers(cinfo, kSpecialMarker0, 0xffff);
-    jpegli_save_markers(cinfo, kSpecialMarker1, 0xffff);
-    num_markers_seen = 0;
-    jpegli_set_marker_processor(cinfo, 0xe6, test_marker_processor);
-    jpegli_set_marker_processor(cinfo, 0xe7, test_marker_processor);
-    jpegli_set_marker_processor(cinfo, 0xe8, test_marker_processor);
-  }
-  if (!jparams.icc.empty()) {
-    jpegli_save_markers(cinfo, JPEG_APP0 + 2, 0xffff);
-  }
-  jpegli_read_header(cinfo, /*require_image=*/TRUE);
-  if (jparams.add_marker) {
-    EXPECT_EQ(num_markers_seen, kMarkerSequenceLen);
-    EXPECT_EQ(0, memcmp(markers_seen, kMarkerSequence, num_markers_seen));
-  }
-  if (!jparams.icc.empty()) {
-    uint8_t* icc_data = nullptr;
-    unsigned int icc_len;
-    ASSERT_TRUE(jpegli_read_icc_profile(cinfo, &icc_data, &icc_len));
-    ASSERT_TRUE(icc_data);
-    EXPECT_EQ(0, memcmp(jparams.icc.data(), icc_data, icc_len));
-    free(icc_data);
-  }
-  // Check that jpegli_calc_output_dimensions can be called multiple times
-  // even with different parameters.
-  if (!cinfo->raw_data_out) {
-    cinfo->scale_num = 1;
-    cinfo->scale_denom = 2;
-  }
-  jpegli_calc_output_dimensions(cinfo);
-  SetDecompressParams(dparams, cinfo);
-  jpegli_set_output_format(cinfo, dparams.data_type, dparams.endianness);
-  VerifyHeader(jparams, cinfo);
-  jpegli_calc_output_dimensions(cinfo);
-  EXPECT_LE(expected_output.xsize, cinfo->output_width);
-  if (!dparams.crop_output) {
-    EXPECT_EQ(expected_output.xsize, cinfo->output_width);
-  }
-  if (dparams.output_mode == COEFFICIENTS) {
-    jvirt_barray_ptr* coef_arrays = jpegli_read_coefficients(cinfo);
-    ASSERT_TRUE(coef_arrays != nullptr);
-    CopyCoefficients(cinfo, coef_arrays, output);
-  } else {
-    jpegli_start_decompress(cinfo);
-    VerifyScanHeader(jparams, cinfo);
-    ReadOutputImage(dparams, cinfo, output);
-  }
-  jpegli_finish_decompress(cinfo);
-}
-
-void TestAPIBuffered(const CompressParams& jparams,
-                     const DecompressParams& dparams, j_decompress_ptr cinfo,
-                     std::vector<TestImage>* output_progression) {
-  EXPECT_EQ(JPEG_REACHED_SOS,
-            jpegli_read_header(cinfo, /*require_image=*/TRUE));
-  cinfo->buffered_image = TRUE;
-  SetDecompressParams(dparams, cinfo);
-  jpegli_set_output_format(cinfo, dparams.data_type, dparams.endianness);
-  VerifyHeader(jparams, cinfo);
-  bool has_multiple_scans = FROM_JXL_BOOL(jpegli_has_multiple_scans(cinfo));
-  EXPECT_TRUE(jpegli_start_decompress(cinfo));
-  // start decompress should not read the whole input in buffered image mode
-  EXPECT_FALSE(jpegli_input_complete(cinfo));
-  EXPECT_EQ(0, cinfo->output_scan_number);
-  int sos_marker_cnt = 1;  // read_header reads the first SOS marker
-  while (!jpegli_input_complete(cinfo)) {
-    EXPECT_EQ(cinfo->input_scan_number, sos_marker_cnt);
-    if (dparams.skip_scans && (cinfo->input_scan_number % 2) != 1) {
-      int result = JPEG_SUSPENDED;
-      while (result != JPEG_REACHED_SOS && result != JPEG_REACHED_EOI) {
-        result = jpegli_consume_input(cinfo);
-      }
-      if (result == JPEG_REACHED_SOS) ++sos_marker_cnt;
-      continue;
-    }
-    SetScanDecompressParams(dparams, cinfo, cinfo->input_scan_number);
-    EXPECT_TRUE(jpegli_start_output(cinfo, cinfo->input_scan_number));
-    // start output sets output_scan_number, but does not change
-    // input_scan_number
-    EXPECT_EQ(cinfo->output_scan_number, cinfo->input_scan_number);
-    EXPECT_EQ(cinfo->input_scan_number, sos_marker_cnt);
-    VerifyScanHeader(jparams, cinfo);
-    TestImage output;
-    ReadOutputImage(dparams, cinfo, &output);
-    output_progression->emplace_back(std::move(output));
-    // read scanlines/read raw data does not change input/output scan number
-    EXPECT_EQ(cinfo->input_scan_number, sos_marker_cnt);
-    EXPECT_EQ(cinfo->output_scan_number, cinfo->input_scan_number);
-    EXPECT_TRUE(jpegli_finish_output(cinfo));
-    ++sos_marker_cnt;  // finish output reads the next SOS marker or EOI
-    if (dparams.output_mode == COEFFICIENTS) {
-      jvirt_barray_ptr* coef_arrays = jpegli_read_coefficients(cinfo);
-      ASSERT_TRUE(coef_arrays != nullptr);
-      CopyCoefficients(cinfo, coef_arrays, &output_progression->back());
-    }
-  }
-  jpegli_finish_decompress(cinfo);
-  if (dparams.size_factor == 1.0f) {
-    EXPECT_EQ(has_multiple_scans, cinfo->input_scan_number > 1);
-  }
-}
-
-TEST(DecodeAPITest, ReuseCinfo) {
-  TestImage input;
-  TestImage output;
-  TestImage expected;
-  std::vector<TestImage> output_progression;
-  std::vector<TestImage> expected_output_progression;
-  CompressParams jparams;
-  DecompressParams dparams;
-  std::vector<uint8_t> compressed;
-  jpeg_decompress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_decompress(&cinfo);
-    input.xsize = 129;
-    input.ysize = 73;
-    GeneratePixels(&input);
-    for (int h_samp : {2, 1}) {
-      for (int v_samp : {2, 1}) {
-        for (int progr : {0, 2}) {
-          jparams.h_sampling = {h_samp, 1, 1};
-          jparams.v_sampling = {v_samp, 1, 1};
-          jparams.progressive_mode = progr;
-          printf(
-              "Generating input with %dx%d chroma subsampling "
-              "progressive level %d\n",
-              h_samp, v_samp, progr);
-          JPEGLI_TEST_ENSURE_TRUE(
-              EncodeWithJpegli(input, jparams, &compressed));
-          for (JpegIOMode output_mode : {PIXELS, RAW_DATA, COEFFICIENTS}) {
-            for (bool crop : {true, false}) {
-              if (crop && output_mode != PIXELS) continue;
-              for (int scale_num : {1, 2, 3, 4, 7, 8, 13, 16}) {
-                if (scale_num != 8 && output_mode != PIXELS) continue;
-                int scale_denom = 8;
-                while (scale_num % 2 == 0 && scale_denom % 2 == 0) {
-                  scale_num /= 2;
-                  scale_denom /= 2;
-                }
-                printf("Decoding with output mode %d output scaling %d/%d %s\n",
-                       output_mode, scale_num, scale_denom,
-                       crop ? "with cropped output" : "");
-                dparams.output_mode = output_mode;
-                dparams.scale_num = scale_num;
-                dparams.scale_denom = scale_denom;
-                expected.Clear();
-                DecodeWithLibjpeg(jparams, dparams, compressed, &expected);
-                output.Clear();
-                cinfo.buffered_image = JXL_FALSE;
-                cinfo.raw_data_out = JXL_FALSE;
-                cinfo.scale_num = cinfo.scale_denom = 1;
-                SourceManager src(compressed.data(), compressed.size(),
-                                  1u << 12);
-                cinfo.src = reinterpret_cast<jpeg_source_mgr*>(&src);
-                jpegli_read_header(&cinfo, /*require_image=*/TRUE);
-                jpegli_abort_decompress(&cinfo);
-                src.Reset();
-                TestAPINonBuffered(jparams, dparams, expected, &cinfo, &output);
-                float max_rms = output_mode == COEFFICIENTS ? 0.0f : 1.0f;
-                if (scale_num == 1 && scale_denom == 8 && h_samp != v_samp) {
-                  max_rms = 5.0f;  // libjpeg does not do fancy upsampling
-                }
-                VerifyOutputImage(expected, output, max_rms);
-                printf("Decoding in buffered image mode\n");
-                expected_output_progression.clear();
-                DecodeAllScansWithLibjpeg(jparams, dparams, compressed,
-                                          &expected_output_progression);
-                output_progression.clear();
-                src.Reset();
-                TestAPIBuffered(jparams, dparams, &cinfo, &output_progression);
-                JPEGLI_TEST_ENSURE_TRUE(output_progression.size() ==
-                                        expected_output_progression.size());
-                for (size_t i = 0; i < output_progression.size(); ++i) {
-                  const TestImage& output = output_progression[i];
-                  const TestImage& expected = expected_output_progression[i];
-                  VerifyOutputImage(expected, output, max_rms);
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    return true;
-  };
-  ASSERT_TRUE(try_catch_block());
-  jpegli_destroy_decompress(&cinfo);
-}
-
-std::vector<TestConfig> GenerateBasicConfigs() {
-  std::vector<TestConfig> all_configs;
-  for (int samp : {1, 2}) {
-    for (int progr : {0, 2}) {
-      TestConfig config;
-      config.input.xsize = 257 + samp * 37;
-      config.input.ysize = 265 + (progr / 2) * 17;
-      config.jparams.h_sampling = {samp, 1, 1};
-      config.jparams.v_sampling = {samp, 1, 1};
-      config.jparams.progressive_mode = progr;
-      GeneratePixels(&config.input);
-      all_configs.push_back(config);
-    }
-  }
-  return all_configs;
-}
-
-TEST(DecodeAPITest, ReuseCinfoSameMemSource) {
-  std::vector<TestConfig> all_configs = GenerateBasicConfigs();
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  {
-    jpeg_compress_struct cinfo;
-    const auto try_catch_block = [&]() -> bool {
-      ERROR_HANDLER_SETUP(jpegli);
-      jpegli_create_compress(&cinfo);
-      jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-      for (const TestConfig& config : all_configs) {
-        EncodeWithJpegli(config.input, config.jparams, &cinfo);
-      }
-      return true;
-    };
-    EXPECT_TRUE(try_catch_block());
-    jpegli_destroy_compress(&cinfo);
-  }
-  std::vector<TestImage> all_outputs(all_configs.size());
-  {
-    jpeg_decompress_struct cinfo;
-    const auto try_catch_block = [&]() -> bool {
-      ERROR_HANDLER_SETUP(jpegli);
-      jpegli_create_decompress(&cinfo);
-      jpegli_mem_src(&cinfo, buffer, buffer_size);
-      for (size_t i = 0; i < all_configs.size(); ++i) {
-        TestAPINonBuffered(all_configs[i].jparams, DecompressParams(),
-                           all_configs[i].input, &cinfo, &all_outputs[i]);
-      }
-      return true;
-    };
-    EXPECT_TRUE(try_catch_block());
-    jpegli_destroy_decompress(&cinfo);
-  }
-  for (size_t i = 0; i < all_configs.size(); ++i) {
-    VerifyOutputImage(all_configs[i].input, all_outputs[i], 2.35f);
-  }
-  if (buffer) free(buffer);
-}
-
-TEST(DecodeAPITest, ReuseCinfoSameStdSource) {
-  std::vector<TestConfig> all_configs = GenerateBasicConfigs();
-  FILE* tmpf = tmpfile();
-  ASSERT_TRUE(tmpf);
-  {
-    jpeg_compress_struct cinfo;
-    const auto try_catch_block = [&]() -> bool {
-      ERROR_HANDLER_SETUP(jpegli);
-      jpegli_create_compress(&cinfo);
-      jpegli_stdio_dest(&cinfo, tmpf);
-      for (const TestConfig& config : all_configs) {
-        EncodeWithJpegli(config.input, config.jparams, &cinfo);
-      }
-      return true;
-    };
-    EXPECT_TRUE(try_catch_block());
-    jpegli_destroy_compress(&cinfo);
-  }
-  fseek(tmpf, 0, SEEK_SET);
-  std::vector<TestImage> all_outputs(all_configs.size());
-  {
-    jpeg_decompress_struct cinfo;
-    const auto try_catch_block = [&]() -> bool {
-      ERROR_HANDLER_SETUP(jpegli);
-      jpegli_create_decompress(&cinfo);
-      jpegli_stdio_src(&cinfo, tmpf);
-      for (size_t i = 0; i < all_configs.size(); ++i) {
-        TestAPINonBuffered(all_configs[i].jparams, DecompressParams(),
-                           all_configs[i].input, &cinfo, &all_outputs[i]);
-      }
-      return true;
-    };
-    EXPECT_TRUE(try_catch_block());
-    jpegli_destroy_decompress(&cinfo);
-  }
-  for (size_t i = 0; i < all_configs.size(); ++i) {
-    VerifyOutputImage(all_configs[i].input, all_outputs[i], 2.35f);
-  }
-  fclose(tmpf);
-}
-
-TEST(DecodeAPITest, AbbreviatedStreams) {
-  uint8_t* table_stream = nullptr;
-  unsigned long table_stream_size = 0;  // NOLINT
-  uint8_t* data_stream = nullptr;
-  unsigned long data_stream_size = 0;  // NOLINT
-  {
-    jpeg_compress_struct cinfo;
-    const auto try_catch_block = [&]() -> bool {
-      ERROR_HANDLER_SETUP(jpegli);
-      jpegli_create_compress(&cinfo);
-      jpegli_mem_dest(&cinfo, &table_stream, &table_stream_size);
-      cinfo.input_components = 3;
-      cinfo.in_color_space = JCS_RGB;
-      jpegli_set_defaults(&cinfo);
-      jpegli_write_tables(&cinfo);
-      jpegli_mem_dest(&cinfo, &data_stream, &data_stream_size);
-      cinfo.image_width = 1;
-      cinfo.image_height = 1;
-      cinfo.optimize_coding = FALSE;
-      jpegli_set_progressive_level(&cinfo, 0);
-      jpegli_start_compress(&cinfo, FALSE);
-      JSAMPLE image[3] = {0};
-      JSAMPROW row[] = {image};
-      jpegli_write_scanlines(&cinfo, row, 1);
-      jpegli_finish_compress(&cinfo);
-      return true;
-    };
-    EXPECT_TRUE(try_catch_block());
-    EXPECT_LT(data_stream_size, 50);
-    jpegli_destroy_compress(&cinfo);
-  }
-  {
-    jpeg_decompress_struct cinfo = {};
-    const auto try_catch_block = [&]() -> bool {
-      ERROR_HANDLER_SETUP(jpegli);
-      jpegli_create_decompress(&cinfo);
-      jpegli_mem_src(&cinfo, table_stream, table_stream_size);
-      jpegli_read_header(&cinfo, FALSE);
-      jpegli_mem_src(&cinfo, data_stream, data_stream_size);
-      jpegli_read_header(&cinfo, TRUE);
-      EXPECT_EQ(1, cinfo.image_width);
-      EXPECT_EQ(1, cinfo.image_height);
-      EXPECT_EQ(3, cinfo.num_components);
-      jpegli_start_decompress(&cinfo);
-      JSAMPLE image[3] = {0};
-      JSAMPROW row[] = {image};
-      jpegli_read_scanlines(&cinfo, row, 1);
-      EXPECT_EQ(0, image[0]);
-      EXPECT_EQ(0, image[1]);
-      EXPECT_EQ(0, image[2]);
-      jpegli_finish_decompress(&cinfo);
-      return true;
-    };
-    EXPECT_TRUE(try_catch_block());
-    jpegli_destroy_decompress(&cinfo);
-  }
-  if (table_stream) free(table_stream);
-  if (data_stream) free(data_stream);
-}
-
-class DecodeAPITestParam : public ::testing::TestWithParam<TestConfig> {};
-
-TEST_P(DecodeAPITestParam, TestAPI) {
-  TestConfig config = GetParam();
-  const DecompressParams& dparams = config.dparams;
-  if (dparams.skip_scans) return;
-  JXL_ASSIGN_OR_QUIT(std::vector<uint8_t> compressed, GetTestJpegData(config),
-                     "Failed to create test data");
-  SourceManager src(compressed.data(), compressed.size(), dparams.chunk_size);
-
-  TestImage output1;
-  DecodeWithLibjpeg(config.jparams, dparams, compressed, &output1);
-
-  TestImage output0;
-  jpeg_decompress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_decompress(&cinfo);
-    cinfo.src = reinterpret_cast<jpeg_source_mgr*>(&src);
-    TestAPINonBuffered(config.jparams, dparams, output1, &cinfo, &output0);
-    return true;
-  };
-  ASSERT_TRUE(try_catch_block());
-  jpegli_destroy_decompress(&cinfo);
-
-  if (config.compare_to_orig) {
-    double rms0 = DistanceRms(config.input, output0);
-    double rms1 = DistanceRms(config.input, output1);
-    printf("rms: %f  vs  %f\n", rms0, rms1);
-    EXPECT_LE(rms0, rms1 * config.max_tolerance_factor);
-  } else {
-    VerifyOutputImage(output0, output1, config.max_rms_dist, config.max_diff);
-  }
-}
-
-class DecodeAPITestParamBuffered : public ::testing::TestWithParam<TestConfig> {
-};
-
-TEST_P(DecodeAPITestParamBuffered, TestAPI) {
-  TestConfig config = GetParam();
-  const DecompressParams& dparams = config.dparams;
-  JXL_ASSIGN_OR_QUIT(std::vector<uint8_t> compressed, GetTestJpegData(config),
-                     "Failed to create test data.");
-  SourceManager src(compressed.data(), compressed.size(), dparams.chunk_size);
-
-  std::vector<TestImage> output_progression1;
-  DecodeAllScansWithLibjpeg(config.jparams, dparams, compressed,
-                            &output_progression1);
-
-  std::vector<TestImage> output_progression0;
-  jpeg_decompress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_decompress(&cinfo);
-    cinfo.src = reinterpret_cast<jpeg_source_mgr*>(&src);
-    TestAPIBuffered(config.jparams, dparams, &cinfo, &output_progression0);
-    return true;
-  };
-  ASSERT_TRUE(try_catch_block());
-  jpegli_destroy_decompress(&cinfo);
-
-  ASSERT_EQ(output_progression0.size(), output_progression1.size());
-  for (size_t i = 0; i < output_progression0.size(); ++i) {
-    const TestImage& output = output_progression0[i];
-    const TestImage& expected = output_progression1[i];
-    if (config.compare_to_orig) {
-      double rms0 = DistanceRms(config.input, output);
-      double rms1 = DistanceRms(config.input, expected);
-      printf("rms: %f  vs  %f\n", rms0, rms1);
-      EXPECT_LE(rms0, rms1 * config.max_tolerance_factor);
-    } else {
-      VerifyOutputImage(expected, output, config.max_rms_dist, config.max_diff);
-    }
-  }
-}
-
-std::vector<TestConfig> GenerateTests(bool buffered) {
-  std::vector<TestConfig> all_tests;
-  {
-    std::vector<std::pair<std::string, std::string>> testfiles({
-        {"jxl/flower/flower.png.im_q85_420_progr.jpg", "Q85YUV420PROGR"},
-        {"jxl/flower/flower.png.im_q85_420_R13B.jpg", "Q85YUV420R13B"},
-        {"jxl/flower/flower.png.im_q85_444.jpg", "Q85YUV444"},
-    });
-    for (size_t i = 0; i < (buffered ? 1u : testfiles.size()); ++i) {
-      TestConfig config;
-      config.fn = testfiles[i].first;
-      config.fn_desc = testfiles[i].second;
-      for (size_t chunk_size : {0, 1, 64, 65536}) {
-        config.dparams.chunk_size = chunk_size;
-        for (size_t max_output_lines : {0, 1, 8, 16}) {
-          config.dparams.max_output_lines = max_output_lines;
-          config.dparams.output_mode = PIXELS;
-          all_tests.push_back(config);
-        }
-        {
-          config.dparams.max_output_lines = 16;
-          config.dparams.output_mode = RAW_DATA;
-          all_tests.push_back(config);
-        }
-      }
-    }
-  }
-
-  {
-    std::vector<std::pair<std::string, std::string>> testfiles({
-        {"jxl/flower/flower_small.q85_444_non_interleaved.jpg",
-         "Q85YUV444NonInterleaved"},
-        {"jxl/flower/flower_small.q85_420_non_interleaved.jpg",
-         "Q85YUV420NonInterleaved"},
-        {"jxl/flower/flower_small.q85_444_partially_interleaved.jpg",
-         "Q85YUV444PartiallyInterleaved"},
-        {"jxl/flower/flower_small.q85_420_partially_interleaved.jpg",
-         "Q85YUV420PartiallyInterleaved"},
-        {"jxl/flower/flower.png.im_q85_422.jpg", "Q85YUV422"},
-        {"jxl/flower/flower.png.im_q85_440.jpg", "Q85YUV440"},
-        {"jxl/flower/flower.png.im_q85_444_1x2.jpg", "Q85YUV444_1x2"},
-        {"jxl/flower/flower.png.im_q85_asymmetric.jpg", "Q85Asymmetric"},
-        {"jxl/flower/flower.png.im_q85_gray.jpg", "Q85Gray"},
-        {"jxl/flower/flower.png.im_q85_luma_subsample.jpg", "Q85LumaSubsample"},
-        {"jxl/flower/flower.png.im_q85_rgb.jpg", "Q85RGB"},
-        {"jxl/flower/flower.png.im_q85_rgb_subsample_blue.jpg",
-         "Q85RGBSubsampleBlue"},
-        {"jxl/flower/flower_small.cmyk.jpg", "CMYK"},
-    });
-    for (size_t i = 0; i < (buffered ? 4u : testfiles.size()); ++i) {
-      for (JpegIOMode output_mode : {PIXELS, RAW_DATA}) {
-        TestConfig config;
-        config.fn = testfiles[i].first;
-        config.fn_desc = testfiles[i].second;
-        config.dparams.output_mode = output_mode;
-        all_tests.push_back(config);
-      }
-    }
-  }
-
-  // Tests for common chroma subsampling and output modes.
-  for (JpegIOMode output_mode : {PIXELS, RAW_DATA, COEFFICIENTS}) {
-    for (int h_samp : {1, 2}) {
-      for (int v_samp : {1, 2}) {
-        for (bool fancy : {true, false}) {
-          if (!fancy && (output_mode != PIXELS || h_samp * v_samp == 1)) {
-            continue;
-          }
-          TestConfig config;
-          config.dparams.output_mode = output_mode;
-          config.dparams.do_fancy_upsampling = fancy;
-          config.jparams.progressive_mode = 2;
-          config.jparams.h_sampling = {h_samp, 1, 1};
-          config.jparams.v_sampling = {v_samp, 1, 1};
-          if (output_mode == COEFFICIENTS) {
-            config.max_rms_dist = 0.0f;
-          }
-          all_tests.push_back(config);
-        }
-      }
-    }
-  }
-
-  // Tests for partial input.
-  for (float size_factor : {0.1f, 0.33f, 0.5f, 0.75f}) {
-    for (int progr : {0, 1, 3}) {
-      for (int samp : {1, 2}) {
-        for (bool skip_scans : {false, true}) {
-          if (skip_scans && (progr != 1 || size_factor < 0.5f)) continue;
-          for (JpegIOMode output_mode : {PIXELS, RAW_DATA}) {
-            TestConfig config;
-            config.input.xsize = 517;
-            config.input.ysize = 523;
-            config.jparams.h_sampling = {samp, 1, 1};
-            config.jparams.v_sampling = {samp, 1, 1};
-            config.jparams.progressive_mode = progr;
-            config.dparams.size_factor = size_factor;
-            config.dparams.output_mode = output_mode;
-            config.dparams.skip_scans = skip_scans;
-            // The last partially available block can behave differently.
-            // TODO(szabadka) Figure out if we can make the behaviour more
-            // similar.
-            config.max_rms_dist = samp == 1 ? 1.75f : 3.0f;
-            config.max_diff = 255.0f;
-            all_tests.push_back(config);
-          }
-        }
-      }
-    }
-  }
-
-  // Tests for block smoothing.
-  for (float size_factor : {0.1f, 0.33f, 0.5f, 0.75f, 1.0f}) {
-    for (int samp : {1, 2}) {
-      for (bool skip_scans : {false, true}) {
-        if (skip_scans && size_factor < 0.3f) continue;
-        TestConfig config;
-        config.input.xsize = 517;
-        config.input.ysize = 523;
-        config.jparams.h_sampling = {samp, 1, 1};
-        config.jparams.v_sampling = {samp, 1, 1};
-        config.jparams.progressive_mode = 2;
-        config.dparams.size_factor = size_factor;
-        config.dparams.do_block_smoothing = true;
-        config.dparams.skip_scans = skip_scans;
-        // libjpeg does smoothing for incomplete scans differently at
-        // the border between current and previous scans.
-        config.max_rms_dist = 8.0f;
-        config.max_diff = 255.0f;
-        all_tests.push_back(config);
-      }
-    }
-  }
-
-  // Test for switching output color quantization modes between scans.
-  if (buffered) {
-    TestConfig config;
-    config.jparams.progressive_mode = 2;
-    config.dparams.quantize_colors = true;
-    config.dparams.scan_params = {
-        {3, JDITHER_NONE, CQUANT_1PASS},  {4, JDITHER_ORDERED, CQUANT_1PASS},
-        {5, JDITHER_FS, CQUANT_1PASS},    {6, JDITHER_NONE, CQUANT_EXTERNAL},
-        {8, JDITHER_NONE, CQUANT_REUSE},  {9, JDITHER_NONE, CQUANT_EXTERNAL},
-        {10, JDITHER_NONE, CQUANT_2PASS}, {11, JDITHER_NONE, CQUANT_REUSE},
-        {12, JDITHER_NONE, CQUANT_2PASS}, {13, JDITHER_FS, CQUANT_2PASS},
-    };
-    config.compare_to_orig = true;
-    config.max_tolerance_factor = 1.04f;
-    all_tests.push_back(config);
-  }
-
-  if (buffered) {
-    return all_tests;
-  }
-
-  // Tests for output color quantization.
-  for (int num_colors : {8, 64, 256}) {
-    for (ColorQuantMode mode : {CQUANT_1PASS, CQUANT_EXTERNAL, CQUANT_2PASS}) {
-      if (mode == CQUANT_EXTERNAL && num_colors != 256) continue;
-      for (J_DITHER_MODE dither : {JDITHER_NONE, JDITHER_ORDERED, JDITHER_FS}) {
-        if (mode == CQUANT_EXTERNAL && dither != JDITHER_NONE) continue;
-        if (mode != CQUANT_1PASS && dither == JDITHER_ORDERED) continue;
-        for (bool crop : {false, true}) {
-          for (bool scale : {false, true}) {
-            for (bool samp : {false, true}) {
-              if ((num_colors != 256) && (crop || scale || samp)) {
-                continue;
-              }
-              if (mode == CQUANT_2PASS && crop) continue;
-              TestConfig config;
-              config.input.xsize = 1024;
-              config.input.ysize = 768;
-              config.dparams.quantize_colors = true;
-              config.dparams.desired_number_of_colors = num_colors;
-              config.dparams.scan_params = {{kLastScan, dither, mode}};
-              config.dparams.crop_output = crop;
-              if (scale) {
-                config.dparams.scale_num = 7;
-                config.dparams.scale_denom = 8;
-              }
-              if (samp) {
-                config.jparams.h_sampling = {2, 1, 1};
-                config.jparams.v_sampling = {2, 1, 1};
-              }
-              if (!scale && !crop) {
-                config.compare_to_orig = true;
-                if (dither != JDITHER_NONE) {
-                  config.max_tolerance_factor = 1.05f;
-                }
-                if (mode == CQUANT_2PASS &&
-                    (num_colors == 8 || dither == JDITHER_FS)) {
-                  // TODO(szabadka) Lower this bound.
-                  config.max_tolerance_factor = 1.5f;
-                }
-              } else {
-                // We only test for buffer overflows, etc.
-                config.max_rms_dist = 100.0f;
-                config.max_diff = 255.0f;
-              }
-              all_tests.push_back(config);
-            }
-          }
-        }
-      }
-    }
-  }
-
-  // Tests for output formats.
-  for (JpegliDataType type :
-       {JPEGLI_TYPE_UINT8, JPEGLI_TYPE_UINT16, JPEGLI_TYPE_FLOAT}) {
-    for (JpegliEndianness endianness :
-         {JPEGLI_NATIVE_ENDIAN, JPEGLI_LITTLE_ENDIAN, JPEGLI_BIG_ENDIAN}) {
-      if (type == JPEGLI_TYPE_UINT8 && endianness != JPEGLI_NATIVE_ENDIAN) {
-        continue;
-      }
-      for (int channels = 1; channels <= 4; ++channels) {
-        TestConfig config;
-        config.dparams.data_type = type;
-        config.dparams.endianness = endianness;
-        config.input.color_space = JCS_UNKNOWN;
-        config.input.components = channels;
-        config.dparams.set_out_color_space = true;
-        config.dparams.out_color_space = JCS_UNKNOWN;
-        all_tests.push_back(config);
-      }
-    }
-  }
-  // Test for output cropping.
-  {
-    TestConfig config;
-    config.dparams.crop_output = true;
-    all_tests.push_back(config);
-  }
-  // Tests for color transforms.
-  for (J_COLOR_SPACE out_color_space :
-       {JCS_RGB, JCS_GRAYSCALE, JCS_EXT_RGB, JCS_EXT_BGR, JCS_EXT_RGBA,
-        JCS_EXT_BGRA, JCS_EXT_ARGB, JCS_EXT_ABGR}) {
-    TestConfig config;
-    config.input.xsize = config.input.ysize = 256;
-    config.input.color_space = JCS_GRAYSCALE;
-    config.dparams.set_out_color_space = true;
-    config.dparams.out_color_space = out_color_space;
-    all_tests.push_back(config);
-  }
-  for (J_COLOR_SPACE jpeg_color_space : {JCS_RGB, JCS_YCbCr}) {
-    for (J_COLOR_SPACE out_color_space :
-         {JCS_RGB, JCS_YCbCr, JCS_GRAYSCALE, JCS_EXT_RGB, JCS_EXT_BGR,
-          JCS_EXT_RGBA, JCS_EXT_BGRA, JCS_EXT_ARGB, JCS_EXT_ABGR}) {
-      if (jpeg_color_space == JCS_RGB && out_color_space == JCS_YCbCr) continue;
-      TestConfig config;
-      config.input.xsize = config.input.ysize = 256;
-      config.jparams.set_jpeg_colorspace = true;
-      config.jparams.jpeg_color_space = jpeg_color_space;
-      config.dparams.set_out_color_space = true;
-      config.dparams.out_color_space = out_color_space;
-      all_tests.push_back(config);
-    }
-  }
-  for (J_COLOR_SPACE jpeg_color_space : {JCS_CMYK, JCS_YCCK}) {
-    for (J_COLOR_SPACE out_color_space : {JCS_CMYK, JCS_YCCK}) {
-      if (jpeg_color_space == JCS_CMYK && out_color_space == JCS_YCCK) continue;
-      TestConfig config;
-      config.input.xsize = config.input.ysize = 256;
-      config.input.color_space = JCS_CMYK;
-      config.jparams.set_jpeg_colorspace = true;
-      config.jparams.jpeg_color_space = jpeg_color_space;
-      config.dparams.set_out_color_space = true;
-      config.dparams.out_color_space = out_color_space;
-      all_tests.push_back(config);
-    }
-  }
-  // Tests for progressive levels.
-  for (int p = 0; p < 3 + NumTestScanScripts(); ++p) {
-    TestConfig config;
-    config.jparams.progressive_mode = p;
-    all_tests.push_back(config);
-  }
-  // Tests for RST markers.
-  for (size_t r : {1, 17, 1024}) {
-    for (size_t chunk_size : {1, 65536}) {
-      for (int progr : {0, 2}) {
-        TestConfig config;
-        config.dparams.chunk_size = chunk_size;
-        config.jparams.progressive_mode = progr;
-        config.jparams.restart_interval = r;
-        all_tests.push_back(config);
-      }
-    }
-  }
-  for (size_t rr : {1, 3, 8, 100}) {
-    TestConfig config;
-    config.jparams.restart_in_rows = rr;
-    all_tests.push_back(config);
-  }
-  // Tests for custom quantization tables.
-  for (int type : {0, 1, 10, 100, 10000}) {
-    for (int scale : {1, 50, 100, 200, 500}) {
-      for (bool add_raw : {false, true}) {
-        for (bool baseline : {true, false}) {
-          if (!baseline && (add_raw || type * scale < 25500)) continue;
-          TestConfig config;
-          config.input.xsize = 64;
-          config.input.ysize = 64;
-          CustomQuantTable table;
-          table.table_type = type;
-          table.scale_factor = scale;
-          table.force_baseline = baseline;
-          table.add_raw = add_raw;
-          table.Generate();
-          config.jparams.quant_tables.push_back(table);
-          config.jparams.quant_indexes = {0, 0, 0};
-          config.compare_to_orig = true;
-          config.max_tolerance_factor = 1.02;
-          all_tests.push_back(config);
-        }
-      }
-    }
-  }
-  for (int qidx = 0; qidx < 8; ++qidx) {
-    if (qidx == 3) continue;
-    TestConfig config;
-    config.input.xsize = 256;
-    config.input.ysize = 256;
-    config.jparams.quant_indexes = {(qidx >> 2) & 1, (qidx >> 1) & 1,
-                                    (qidx >> 0) & 1};
-    all_tests.push_back(config);
-  }
-  for (int qidx = 0; qidx < 8; ++qidx) {
-    for (int slot_idx = 0; slot_idx < 2; ++slot_idx) {
-      if (qidx == 0 && slot_idx == 0) continue;
-      TestConfig config;
-      config.input.xsize = 256;
-      config.input.ysize = 256;
-      config.jparams.quant_indexes = {(qidx >> 2) & 1, (qidx >> 1) & 1,
-                                      (qidx >> 0) & 1};
-      CustomQuantTable table;
-      table.slot_idx = slot_idx;
-      table.Generate();
-      config.jparams.quant_tables.push_back(table);
-      all_tests.push_back(config);
-    }
-  }
-  for (int qidx = 0; qidx < 8; ++qidx) {
-    for (bool xyb : {false, true}) {
-      TestConfig config;
-      config.input.xsize = 256;
-      config.input.ysize = 256;
-      config.jparams.xyb_mode = xyb;
-      config.jparams.quant_indexes = {(qidx >> 2) & 1, (qidx >> 1) & 1,
-                                      (qidx >> 0) & 1};
-      {
-        CustomQuantTable table;
-        table.slot_idx = 0;
-        table.Generate();
-        config.jparams.quant_tables.push_back(table);
-      }
-      {
-        CustomQuantTable table;
-        table.slot_idx = 1;
-        table.table_type = 20;
-        table.Generate();
-        config.jparams.quant_tables.push_back(table);
-      }
-      config.compare_to_orig = true;
-      all_tests.push_back(config);
-    }
-  }
-  for (bool xyb : {false, true}) {
-    TestConfig config;
-    config.input.xsize = 256;
-    config.input.ysize = 256;
-    config.jparams.xyb_mode = xyb;
-    config.jparams.quant_indexes = {0, 1, 2};
-    {
-      CustomQuantTable table;
-      table.slot_idx = 0;
-      table.Generate();
-      config.jparams.quant_tables.push_back(table);
-    }
-    {
-      CustomQuantTable table;
-      table.slot_idx = 1;
-      table.table_type = 20;
-      table.Generate();
-      config.jparams.quant_tables.push_back(table);
-    }
-    {
-      CustomQuantTable table;
-      table.slot_idx = 2;
-      table.table_type = 30;
-      table.Generate();
-      config.jparams.quant_tables.push_back(table);
-    }
-    config.compare_to_orig = true;
-    all_tests.push_back(config);
-  }
-  // Tests for fixed (and custom) prefix codes.
-  for (J_COLOR_SPACE jpeg_color_space : {JCS_RGB, JCS_YCbCr}) {
-    for (bool flat_dc_luma : {false, true}) {
-      TestConfig config;
-      config.jparams.set_jpeg_colorspace = true;
-      config.jparams.jpeg_color_space = jpeg_color_space;
-      config.jparams.progressive_mode = 0;
-      config.jparams.optimize_coding = 0;
-      config.jparams.use_flat_dc_luma_code = flat_dc_luma;
-      all_tests.push_back(config);
-    }
-  }
-  for (J_COLOR_SPACE jpeg_color_space : {JCS_CMYK, JCS_YCCK}) {
-    for (bool flat_dc_luma : {false, true}) {
-      TestConfig config;
-      config.input.color_space = JCS_CMYK;
-      config.jparams.set_jpeg_colorspace = true;
-      config.jparams.jpeg_color_space = jpeg_color_space;
-      config.jparams.progressive_mode = 0;
-      config.jparams.optimize_coding = 0;
-      config.jparams.use_flat_dc_luma_code = flat_dc_luma;
-      all_tests.push_back(config);
-    }
-  }
-  // Test for jpeg without DHT marker.
-  {
-    TestConfig config;
-    config.jparams.progressive_mode = 0;
-    config.jparams.optimize_coding = 0;
-    config.jparams.omit_standard_tables = true;
-    all_tests.push_back(config);
-  }
-  // Test for custom component ids.
-  {
-    TestConfig config;
-    config.input.xsize = config.input.ysize = 128;
-    config.jparams.comp_ids = {7, 17, 177};
-    all_tests.push_back(config);
-  }
-  // Tests for JFIF/Adobe markers.
-  for (int override_JFIF : {-1, 0, 1}) {
-    for (int override_Adobe : {-1, 0, 1}) {
-      if (override_JFIF == -1 && override_Adobe == -1) continue;
-      TestConfig config;
-      config.input.xsize = config.input.ysize = 128;
-      config.jparams.override_JFIF = override_JFIF;
-      config.jparams.override_Adobe = override_Adobe;
-      all_tests.push_back(config);
-    }
-  }
-  // Tests for small images.
-  for (int xsize : {1, 7, 8, 9, 15, 16, 17}) {
-    for (int ysize : {1, 7, 8, 9, 15, 16, 17}) {
-      TestConfig config;
-      config.input.xsize = xsize;
-      config.input.ysize = ysize;
-      config.jparams.h_sampling = {1, 1, 1};
-      config.jparams.v_sampling = {1, 1, 1};
-      all_tests.push_back(config);
-    }
-  }
-  // Tests for custom marker processor.
-  for (size_t chunk_size : {0, 1, 64, 65536}) {
-    TestConfig config;
-    config.input.xsize = config.input.ysize = 256;
-    config.dparams.chunk_size = chunk_size;
-    config.jparams.add_marker = true;
-    all_tests.push_back(config);
-  }
-  // Tests for icc profile decoding.
-  for (size_t icc_size : {728, 70000, 1000000}) {
-    TestConfig config;
-    config.input.xsize = config.input.ysize = 256;
-    config.jparams.icc.resize(icc_size);
-    for (size_t i = 0; i < icc_size; ++i) {
-      config.jparams.icc[i] = (i * 17) & 0xff;
-    }
-    all_tests.push_back(config);
-  }
-  // Tests for unusual sampling factors.
-  for (int h0_samp : {1, 2, 3, 4}) {
-    for (int v0_samp : {1, 2, 3, 4}) {
-      for (int dxb = 0; dxb < h0_samp; ++dxb) {
-        for (int dyb = 0; dyb < v0_samp; ++dyb) {
-          for (int dx = 0; dx < 2; ++dx) {
-            for (int dy = 0; dy < 2; ++dy) {
-              TestConfig config;
-              config.input.xsize = 128 + dyb * 8 + dy;
-              config.input.ysize = 256 + dxb * 8 + dx;
-              config.jparams.progressive_mode = 2;
-              config.jparams.h_sampling = {h0_samp, 1, 1};
-              config.jparams.v_sampling = {v0_samp, 1, 1};
-              config.compare_to_orig = true;
-              all_tests.push_back(config);
-            }
-          }
-        }
-      }
-    }
-  }
-  for (int h0_samp : {1, 2, 4}) {
-    for (int v0_samp : {1, 2, 4}) {
-      for (int h2_samp : {1, 2, 4}) {
-        for (int v2_samp : {1, 2, 4}) {
-          TestConfig config;
-          config.input.xsize = 137;
-          config.input.ysize = 75;
-          config.jparams.progressive_mode = 2;
-          config.jparams.h_sampling = {h0_samp, 1, h2_samp};
-          config.jparams.v_sampling = {v0_samp, 1, v2_samp};
-          config.compare_to_orig = true;
-          all_tests.push_back(config);
-        }
-      }
-    }
-  }
-  {
-    TestConfig config;
-    config.input.xsize = 137;
-    config.input.ysize = 80;
-    config.jparams.progressive_mode = 0;
-    config.jparams.h_sampling = {1, 1, 1};
-    config.jparams.v_sampling = {4, 2, 1};
-    config.compare_to_orig = true;
-    all_tests.push_back(config);
-  }
-  for (int h0_samp : {1, 3}) {
-    for (int v0_samp : {1, 3}) {
-      for (int h2_samp : {1, 3}) {
-        for (int v2_samp : {1, 3}) {
-          TestConfig config;
-          config.input.xsize = 205;
-          config.input.ysize = 99;
-          config.jparams.progressive_mode = 2;
-          config.jparams.h_sampling = {h0_samp, 1, h2_samp};
-          config.jparams.v_sampling = {v0_samp, 1, v2_samp};
-          all_tests.push_back(config);
-        }
-      }
-    }
-  }
-  // Tests for output scaling.
-  for (int scale_num = 1; scale_num <= 16; ++scale_num) {
-    if (scale_num == 8) continue;
-    for (bool crop : {false, true}) {
-      for (int samp : {1, 2}) {
-        for (int progr : {0, 2}) {
-          TestConfig config;
-          config.jparams.h_sampling = {samp, 1, 1};
-          config.jparams.v_sampling = {samp, 1, 1};
-          config.jparams.progressive_mode = progr;
-          config.dparams.scale_num = scale_num;
-          config.dparams.scale_denom = 8;
-          config.dparams.crop_output = crop;
-          all_tests.push_back(config);
-        }
-      }
-    }
-  }
-  return all_tests;
-}
-
-std::string QuantMode(ColorQuantMode mode) {
-  switch (mode) {
-    case CQUANT_1PASS:
-      return "1pass";
-    case CQUANT_EXTERNAL:
-      return "External";
-    case CQUANT_2PASS:
-      return "2pass";
-    case CQUANT_REUSE:
-      return "Reuse";
-  }
-  return "";
-}
-
-std::string DitherMode(J_DITHER_MODE mode) {
-  switch (mode) {
-    case JDITHER_NONE:
-      return "No";
-    case JDITHER_ORDERED:
-      return "Ordered";
-    case JDITHER_FS:
-      return "FS";
-  }
-  return "";
-}
-
-std::ostream& operator<<(std::ostream& os, const DecompressParams& dparams) {
-  if (dparams.chunk_size == 0) {
-    os << "CompleteInput";
-  } else {
-    os << "InputChunks" << dparams.chunk_size;
-  }
-  if (dparams.size_factor < 1.0f) {
-    os << "Partial" << static_cast<int>(dparams.size_factor * 100) << "p";
-  }
-  if (dparams.max_output_lines == 0) {
-    os << "CompleteOutput";
-  } else {
-    os << "OutputLines" << dparams.max_output_lines;
-  }
-  if (dparams.output_mode == RAW_DATA) {
-    os << "RawDataOut";
-  } else if (dparams.output_mode == COEFFICIENTS) {
-    os << "CoeffsOut";
-  }
-  os << IOMethodName(dparams.data_type, dparams.endianness);
-  if (dparams.set_out_color_space) {
-    os << "OutColor"
-       << ColorSpaceName(static_cast<J_COLOR_SPACE>(dparams.out_color_space));
-  }
-  if (dparams.crop_output) {
-    os << "Crop";
-  }
-  if (dparams.do_block_smoothing) {
-    os << "BlockSmoothing";
-  }
-  if (!dparams.do_fancy_upsampling) {
-    os << "NoFancyUpsampling";
-  }
-  if (dparams.scale_num != 1 || dparams.scale_denom != 1) {
-    os << "Scale" << dparams.scale_num << "_" << dparams.scale_denom;
-  }
-  if (dparams.quantize_colors) {
-    os << "Quant" << dparams.desired_number_of_colors << "colors";
-    for (size_t i = 0; i < dparams.scan_params.size(); ++i) {
-      if (i > 0) os << "_";
-      const auto& sparam = dparams.scan_params[i];
-      os << QuantMode(sparam.color_quant_mode);
-      os << DitherMode(static_cast<J_DITHER_MODE>(sparam.dither_mode))
-         << "Dither";
-    }
-  }
-  if (dparams.skip_scans) {
-    os << "SkipScans";
-  }
-  return os;
-}
-
-std::ostream& operator<<(std::ostream& os, const TestConfig& c) {
-  if (!c.fn.empty()) {
-    os << c.fn_desc;
-  } else {
-    os << c.input;
-  }
-  os << c.jparams;
-  os << c.dparams;
-  return os;
-}
-
-std::string TestDescription(const testing::TestParamInfo<TestConfig>& info) {
-  std::stringstream name;
-  name << info.param;
-  return name.str();
-}
-
-JPEGLI_INSTANTIATE_TEST_SUITE_P(DecodeAPITest, DecodeAPITestParam,
-                                testing::ValuesIn(GenerateTests(false)),
-                                TestDescription);
-
-JPEGLI_INSTANTIATE_TEST_SUITE_P(DecodeAPITestBuffered,
-                                DecodeAPITestParamBuffered,
-                                testing::ValuesIn(GenerateTests(true)),
-                                TestDescription);
-
-}  // namespace
-}  // namespace jpegli
diff --git a/third_party/jpeg-xl/lib/jpegli/decode_internal.h b/third_party/jpeg-xl/lib/jpegli/decode_internal.h
deleted file mode 100644
index c36f6774b9ca6..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/decode_internal.h
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_DECODE_INTERNAL_H_
-#define LIB_JPEGLI_DECODE_INTERNAL_H_
-
-#include <sys/types.h>
-
-#include <cstdint>
-#include <vector>
-
-#include "lib/jpegli/common.h"
-#include "lib/jpegli/common_internal.h"
-#include "lib/jpegli/huffman.h"
-#include "lib/jpegli/types.h"
-
-namespace jpegli {
-
-static constexpr int kNeedMoreInput = 100;
-static constexpr int kHandleRestart = 101;
-static constexpr int kHandleMarkerProcessor = 102;
-static constexpr int kProcessNextMarker = 103;
-static constexpr size_t kAllHuffLutSize = NUM_HUFF_TBLS * kJpegHuffmanLutSize;
-
-typedef int16_t coeff_t;
-
-// State of the decoder that has to be saved before decoding one MCU in case
-// we run out of the bitstream.
-struct MCUCodingState {
-  coeff_t last_dc_coeff[kMaxComponents];
-  int eobrun;
-  coeff_t coeffs[D_MAX_BLOCKS_IN_MCU * DCTSIZE2];
-};
-
-}  // namespace jpegli
-
-// Use this forward-declared libjpeg struct to hold all our private variables.
-// TODO(szabadka) Remove variables that have a corresponding version in cinfo.
-struct jpeg_decomp_master {
-  //
-  // Input handling state.
-  //
-  std::vector<uint8_t> input_buffer_;
-  size_t input_buffer_pos_;
-  // Number of bits after codestream_pos_ that were already processed.
-  size_t codestream_bits_ahead_;
-
-  // Coefficient buffers
-  jvirt_barray_ptr* coef_arrays;
-  JBLOCKARRAY coeff_rows[jpegli::kMaxComponents];
-
-  bool streaming_mode_;
-
-  //
-  // Marker data processing state.
-  //
-  bool found_soi_;
-  bool found_dri_;
-  bool found_sof_;
-  bool found_sos_;
-  bool found_eoi_;
-
-  // Whether this jpeg has multiple scans (progressive or non-interleaved
-  // sequential).
-  bool is_multiscan_;
-
-  size_t icc_index_;
-  size_t icc_total_;
-  std::vector<uint8_t> icc_profile_;
-  jpegli::HuffmanTableEntry dc_huff_lut_[jpegli::kAllHuffLutSize];
-  jpegli::HuffmanTableEntry ac_huff_lut_[jpegli::kAllHuffLutSize];
-  uint8_t markers_to_save_[32];
-  jpeg_marker_parser_method app_marker_parsers[16];
-  jpeg_marker_parser_method com_marker_parser;
-
-  // Fields defined by SOF marker.
-  size_t iMCU_cols_;
-  int h_factor[jpegli::kMaxComponents];
-  int v_factor[jpegli::kMaxComponents];
-
-  // Initialized at start of frame.
-  uint16_t scan_progression_[jpegli::kMaxComponents][DCTSIZE2];
-
-  //
-  // Per scan state.
-  //
-  size_t scan_mcu_row_;
-  size_t scan_mcu_col_;
-  size_t mcu_rows_per_iMCU_row_;
-  jpegli::coeff_t last_dc_coeff_[jpegli::kMaxComponents];
-  int eobrun_;
-  int restarts_to_go_;
-  int next_restart_marker_;
-
-  jpegli::MCUCodingState mcu_;
-
-  //
-  // Rendering state.
-  //
-  int output_passes_done_;
-  JpegliDataType output_data_type_ = JPEGLI_TYPE_UINT8;
-  size_t xoffset_;
-  bool swap_endianness_ = false;
-  bool need_context_rows_;
-  bool regenerate_inverse_colormap_;
-  bool apply_smoothing;
-
-  int min_scaled_dct_size;
-  int scaled_dct_size[jpegli::kMaxComponents];
-
-  size_t raw_height_[jpegli::kMaxComponents];
-  jpegli::RowBuffer<float> raw_output_[jpegli::kMaxComponents];
-  jpegli::RowBuffer<float> render_output_[jpegli::kMaxComponents];
-
-  void (*inverse_transform[jpegli::kMaxComponents])(
-      const int16_t* JXL_RESTRICT qblock, const float* JXL_RESTRICT dequant,
-      const float* JXL_RESTRICT biases, float* JXL_RESTRICT scratch_space,
-      float* JXL_RESTRICT output, size_t output_stride, size_t dctsize);
-
-  void (*color_transform)(float* row[jpegli::kMaxComponents], size_t len);
-
-  float* idct_scratch_;
-  float* upsample_scratch_;
-  uint8_t* output_scratch_;
-  int16_t* smoothing_scratch_;
-  float* dequant_;
-  // 1 = 1pass, 2 = 2pass, 3 = external
-  int quant_mode_;
-  int quant_pass_;
-  int num_colors_[jpegli::kMaxComponents];
-  uint8_t* colormap_lut_;
-  uint8_t* pixels_;
-  JSAMPARRAY scanlines_;
-  std::vector<std::vector<uint8_t>> candidate_lists_;
-  float* dither_[jpegli::kMaxComponents];
-  float* error_row_[2 * jpegli::kMaxComponents];
-  size_t dither_size_;
-  size_t dither_mask_;
-
-  // Per channel and per frequency statistics about the number of nonzeros and
-  // the sum of coefficient absolute values, used in dequantization bias
-  // computation.
-  int* nonzeros_;
-  int* sumabs_;
-  size_t num_processed_blocks_[jpegli::kMaxComponents];
-  float* biases_;
-#define SAVED_COEFS 10
-  // This holds the coef_bits of the scan before the current scan,
-  // i.e. the bottom half when rendering incomplete scans.
-  int (*coef_bits_latch)[SAVED_COEFS];
-  int (*prev_coef_bits_latch)[SAVED_COEFS];
-};
-
-#endif  // LIB_JPEGLI_DECODE_INTERNAL_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/decode_marker.cc b/third_party/jpeg-xl/lib/jpegli/decode_marker.cc
deleted file mode 100644
index 2621ed08670cc..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/decode_marker.cc
+++ /dev/null
@@ -1,585 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/decode_marker.h"
-
-#include <jxl/types.h>
-#include <string.h>
-
-#include "lib/jpegli/common.h"
-#include "lib/jpegli/decode_internal.h"
-#include "lib/jpegli/error.h"
-#include "lib/jpegli/huffman.h"
-#include "lib/jpegli/memory_manager.h"
-#include "lib/jxl/base/printf_macros.h"
-
-namespace jpegli {
-namespace {
-
-constexpr int kMaxDimPixels = 65535;
-constexpr uint8_t kIccProfileTag[12] = "ICC_PROFILE";
-
-// Macros for commonly used error conditions.
-
-#define JPEG_VERIFY_LEN(n)                               \
-  if (pos + (n) > len) {                                 \
-    JPEGLI_ERROR("Unexpected end of marker: pos=%" PRIuS \
-                 " need=%d len=%" PRIuS,                 \
-                 pos, static_cast<int>(n), len);         \
-  }
-
-#define JPEG_VERIFY_INPUT(var, low, high)                        \
-  if ((var) < (low) || (var) > (high)) {                         \
-    JPEGLI_ERROR("Invalid " #var ": %d", static_cast<int>(var)); \
-  }
-
-#define JPEG_VERIFY_MARKER_END()                                              \
-  if (pos != len) {                                                           \
-    JPEGLI_ERROR("Invalid marker length: declared=%" PRIuS " actual=%" PRIuS, \
-                 len, pos);                                                   \
-  }
-
-inline int ReadUint8(const uint8_t* data, size_t* pos) {
-  return data[(*pos)++];
-}
-
-inline int ReadUint16(const uint8_t* data, size_t* pos) {
-  int v = (data[*pos] << 8) + data[*pos + 1];
-  *pos += 2;
-  return v;
-}
-
-void ProcessSOF(j_decompress_ptr cinfo, const uint8_t* data, size_t len) {
-  jpeg_decomp_master* m = cinfo->master;
-  if (!m->found_soi_) {
-    JPEGLI_ERROR("Unexpected SOF marker.");
-  }
-  if (m->found_sof_) {
-    JPEGLI_ERROR("Duplicate SOF marker.");
-  }
-  m->found_sof_ = true;
-  cinfo->progressive_mode = TO_JXL_BOOL(cinfo->unread_marker == 0xc2);
-  cinfo->arith_code = 0;
-  size_t pos = 2;
-  JPEG_VERIFY_LEN(6);
-  cinfo->data_precision = ReadUint8(data, &pos);
-  cinfo->image_height = ReadUint16(data, &pos);
-  cinfo->image_width = ReadUint16(data, &pos);
-  cinfo->num_components = ReadUint8(data, &pos);
-  JPEG_VERIFY_INPUT(cinfo->data_precision, kJpegPrecision, kJpegPrecision);
-  JPEG_VERIFY_INPUT(cinfo->image_height, 1, kMaxDimPixels);
-  JPEG_VERIFY_INPUT(cinfo->image_width, 1, kMaxDimPixels);
-  JPEG_VERIFY_INPUT(cinfo->num_components, 1, kMaxComponents);
-  JPEG_VERIFY_LEN(3 * cinfo->num_components);
-  cinfo->comp_info = jpegli::Allocate<jpeg_component_info>(
-      cinfo, cinfo->num_components, JPOOL_IMAGE);
-
-  // Read sampling factors and quant table index for each component.
-  uint8_t ids_seen[256] = {0};
-  cinfo->max_h_samp_factor = 1;
-  cinfo->max_v_samp_factor = 1;
-  for (int i = 0; i < cinfo->num_components; ++i) {
-    jpeg_component_info* comp = &cinfo->comp_info[i];
-    comp->component_index = i;
-    const int id = ReadUint8(data, &pos);
-    if (ids_seen[id]) {  // (cf. section B.2.2, syntax of Ci)
-      JPEGLI_ERROR("Duplicate ID %d in SOF.", id);
-    }
-    ids_seen[id] = 1;
-    comp->component_id = id;
-    int factor = ReadUint8(data, &pos);
-    int h_samp_factor = factor >> 4;
-    int v_samp_factor = factor & 0xf;
-    JPEG_VERIFY_INPUT(h_samp_factor, 1, MAX_SAMP_FACTOR);
-    JPEG_VERIFY_INPUT(v_samp_factor, 1, MAX_SAMP_FACTOR);
-    comp->h_samp_factor = h_samp_factor;
-    comp->v_samp_factor = v_samp_factor;
-    cinfo->max_h_samp_factor =
-        std::max(cinfo->max_h_samp_factor, h_samp_factor);
-    cinfo->max_v_samp_factor =
-        std::max(cinfo->max_v_samp_factor, v_samp_factor);
-    int quant_tbl_idx = ReadUint8(data, &pos);
-    JPEG_VERIFY_INPUT(quant_tbl_idx, 0, NUM_QUANT_TBLS - 1);
-    comp->quant_tbl_no = quant_tbl_idx;
-    comp->quant_table = nullptr;  // will be allocated after SOS marker
-  }
-  JPEG_VERIFY_MARKER_END();
-
-  // Set the input colorspace based on the markers we have seen and set
-  // default output colorspace.
-  if (cinfo->num_components == 1) {
-    cinfo->jpeg_color_space = JCS_GRAYSCALE;
-    cinfo->out_color_space = JCS_GRAYSCALE;
-  } else if (cinfo->num_components == 3) {
-    if (cinfo->saw_JFIF_marker) {
-      cinfo->jpeg_color_space = JCS_YCbCr;
-    } else if (cinfo->saw_Adobe_marker) {
-      cinfo->jpeg_color_space =
-          cinfo->Adobe_transform == 0 ? JCS_RGB : JCS_YCbCr;
-    } else {
-      cinfo->jpeg_color_space = JCS_YCbCr;
-      if (cinfo->comp_info[0].component_id == 'R' &&  //
-          cinfo->comp_info[1].component_id == 'G' &&  //
-          cinfo->comp_info[2].component_id == 'B') {
-        cinfo->jpeg_color_space = JCS_RGB;
-      }
-    }
-    cinfo->out_color_space = JCS_RGB;
-  } else if (cinfo->num_components == 4) {
-    if (cinfo->saw_Adobe_marker) {
-      cinfo->jpeg_color_space =
-          cinfo->Adobe_transform == 0 ? JCS_CMYK : JCS_YCCK;
-    } else {
-      cinfo->jpeg_color_space = JCS_CMYK;
-    }
-    cinfo->out_color_space = JCS_CMYK;
-  }
-
-  // We have checked above that none of the sampling factors are 0, so the max
-  // sampling factors can not be 0.
-  cinfo->total_iMCU_rows =
-      DivCeil(cinfo->image_height, cinfo->max_v_samp_factor * DCTSIZE);
-  m->iMCU_cols_ =
-      DivCeil(cinfo->image_width, cinfo->max_h_samp_factor * DCTSIZE);
-  // Compute the block dimensions for each component.
-  for (int i = 0; i < cinfo->num_components; ++i) {
-    jpeg_component_info* comp = &cinfo->comp_info[i];
-    if (cinfo->max_h_samp_factor % comp->h_samp_factor != 0 ||
-        cinfo->max_v_samp_factor % comp->v_samp_factor != 0) {
-      JPEGLI_ERROR("Non-integral subsampling ratios.");
-    }
-    m->h_factor[i] = cinfo->max_h_samp_factor / comp->h_samp_factor;
-    m->v_factor[i] = cinfo->max_v_samp_factor / comp->v_samp_factor;
-    comp->downsampled_width = DivCeil(cinfo->image_width, m->h_factor[i]);
-    comp->downsampled_height = DivCeil(cinfo->image_height, m->v_factor[i]);
-    comp->width_in_blocks = DivCeil(comp->downsampled_width, DCTSIZE);
-    comp->height_in_blocks = DivCeil(comp->downsampled_height, DCTSIZE);
-  }
-  memset(m->scan_progression_, 0, sizeof(m->scan_progression_));
-}
-
-void ProcessSOS(j_decompress_ptr cinfo, const uint8_t* data, size_t len) {
-  jpeg_decomp_master* m = cinfo->master;
-  if (!m->found_sof_) {
-    JPEGLI_ERROR("Unexpected SOS marker.");
-  }
-  m->found_sos_ = true;
-  size_t pos = 2;
-  JPEG_VERIFY_LEN(1);
-  cinfo->comps_in_scan = ReadUint8(data, &pos);
-  JPEG_VERIFY_INPUT(cinfo->comps_in_scan, 1, cinfo->num_components);
-  JPEG_VERIFY_INPUT(cinfo->comps_in_scan, 1, MAX_COMPS_IN_SCAN);
-
-  JPEG_VERIFY_LEN(2 * cinfo->comps_in_scan);
-  bool is_interleaved = (cinfo->comps_in_scan > 1);
-  uint8_t ids_seen[256] = {0};
-  cinfo->blocks_in_MCU = 0;
-  for (int i = 0; i < cinfo->comps_in_scan; ++i) {
-    int id = ReadUint8(data, &pos);
-    if (ids_seen[id]) {  // (cf. section B.2.3, regarding CSj)
-      JPEGLI_ERROR("Duplicate ID %d in SOS.", id);
-    }
-    ids_seen[id] = 1;
-    jpeg_component_info* comp = nullptr;
-    for (int j = 0; j < cinfo->num_components; ++j) {
-      if (cinfo->comp_info[j].component_id == id) {
-        comp = &cinfo->comp_info[j];
-        cinfo->cur_comp_info[i] = comp;
-      }
-    }
-    if (!comp) {
-      JPEGLI_ERROR("SOS marker: Could not find component with id %d", id);
-    }
-    int c = ReadUint8(data, &pos);
-    comp->dc_tbl_no = c >> 4;
-    comp->ac_tbl_no = c & 0xf;
-    JPEG_VERIFY_INPUT(comp->dc_tbl_no, 0, 3);
-    JPEG_VERIFY_INPUT(comp->ac_tbl_no, 0, 3);
-    comp->MCU_width = is_interleaved ? comp->h_samp_factor : 1;
-    comp->MCU_height = is_interleaved ? comp->v_samp_factor : 1;
-    comp->MCU_blocks = comp->MCU_width * comp->MCU_height;
-    if (cinfo->blocks_in_MCU + comp->MCU_blocks > D_MAX_BLOCKS_IN_MCU) {
-      JPEGLI_ERROR("Too many blocks in MCU.");
-    }
-    for (int j = 0; j < comp->MCU_blocks; ++j) {
-      cinfo->MCU_membership[cinfo->blocks_in_MCU++] = i;
-    }
-  }
-  JPEG_VERIFY_LEN(3);
-  cinfo->Ss = ReadUint8(data, &pos);
-  cinfo->Se = ReadUint8(data, &pos);
-  JPEG_VERIFY_INPUT(cinfo->Ss, 0, 63);
-  JPEG_VERIFY_INPUT(cinfo->Se, cinfo->Ss, 63);
-  int c = ReadUint8(data, &pos);
-  cinfo->Ah = c >> 4;
-  cinfo->Al = c & 0xf;
-  JPEG_VERIFY_MARKER_END();
-
-  if (cinfo->input_scan_number == 0) {
-    m->is_multiscan_ = (cinfo->comps_in_scan < cinfo->num_components ||
-                        FROM_JXL_BOOL(cinfo->progressive_mode));
-  }
-  if (cinfo->Ah != 0 && cinfo->Al != cinfo->Ah - 1) {
-    // section G.1.1.1.2 : Successive approximation control only improves
-    // by one bit at a time.
-    JPEGLI_ERROR("Invalid progressive parameters: Al=%d Ah=%d", cinfo->Al,
-                 cinfo->Ah);
-  }
-  if (!cinfo->progressive_mode) {
-    cinfo->Ss = 0;
-    cinfo->Se = 63;
-    cinfo->Ah = 0;
-    cinfo->Al = 0;
-  }
-  const uint16_t scan_bitmask =
-      cinfo->Ah == 0 ? (0xffff << cinfo->Al) : (1u << cinfo->Al);
-  const uint16_t refinement_bitmask = (1 << cinfo->Al) - 1;
-  if (!cinfo->coef_bits) {
-    cinfo->coef_bits =
-        Allocate<int[DCTSIZE2]>(cinfo, cinfo->num_components * 2, JPOOL_IMAGE);
-    m->coef_bits_latch =
-        Allocate<int[SAVED_COEFS]>(cinfo, cinfo->num_components, JPOOL_IMAGE);
-    m->prev_coef_bits_latch =
-        Allocate<int[SAVED_COEFS]>(cinfo, cinfo->num_components, JPOOL_IMAGE);
-
-    for (int c = 0; c < cinfo->num_components; ++c) {
-      for (int i = 0; i < DCTSIZE2; ++i) {
-        cinfo->coef_bits[c][i] = -1;
-        if (i < SAVED_COEFS) {
-          m->coef_bits_latch[c][i] = -1;
-        }
-      }
-    }
-  }
-
-  for (int i = 0; i < cinfo->comps_in_scan; ++i) {
-    int comp_idx = cinfo->cur_comp_info[i]->component_index;
-    for (int k = cinfo->Ss; k <= cinfo->Se; ++k) {
-      if (m->scan_progression_[comp_idx][k] & scan_bitmask) {
-        JPEGLI_ERROR(
-            "Overlapping scans: component=%d k=%d prev_mask: %u cur_mask %u",
-            comp_idx, k, m->scan_progression_[i][k], scan_bitmask);
-      }
-      if (m->scan_progression_[comp_idx][k] & refinement_bitmask) {
-        JPEGLI_ERROR(
-            "Invalid scan order, a more refined scan was already done: "
-            "component=%d k=%d prev_mask=%u cur_mask=%u",
-            comp_idx, k, m->scan_progression_[i][k], scan_bitmask);
-      }
-      m->scan_progression_[comp_idx][k] |= scan_bitmask;
-    }
-  }
-  if (cinfo->Al > 10) {
-    JPEGLI_ERROR("Scan parameter Al=%d is not supported.", cinfo->Al);
-  }
-}
-
-// Reads the Define Huffman Table (DHT) marker segment and builds the Huffman
-// decoding table in either dc_huff_lut_ or ac_huff_lut_, depending on the type
-// and solt_id of Huffman code being read.
-void ProcessDHT(j_decompress_ptr cinfo, const uint8_t* data, size_t len) {
-  size_t pos = 2;
-  if (pos == len) {
-    JPEGLI_ERROR("DHT marker: no Huffman table found");
-  }
-  while (pos < len) {
-    JPEG_VERIFY_LEN(1 + kJpegHuffmanMaxBitLength);
-    // The index of the Huffman code in the current set of Huffman codes. For AC
-    // component Huffman codes, 0x10 is added to the index.
-    int slot_id = ReadUint8(data, &pos);
-    int huffman_index = slot_id;
-    bool is_ac_table = ((slot_id & 0x10) != 0);
-    JHUFF_TBL** table;
-    if (is_ac_table) {
-      huffman_index -= 0x10;
-      JPEG_VERIFY_INPUT(huffman_index, 0, NUM_HUFF_TBLS - 1);
-      table = &cinfo->ac_huff_tbl_ptrs[huffman_index];
-    } else {
-      JPEG_VERIFY_INPUT(huffman_index, 0, NUM_HUFF_TBLS - 1);
-      table = &cinfo->dc_huff_tbl_ptrs[huffman_index];
-    }
-    if (*table == nullptr) {
-      *table = jpegli_alloc_huff_table(reinterpret_cast<j_common_ptr>(cinfo));
-    }
-    int total_count = 0;
-    for (size_t i = 1; i <= kJpegHuffmanMaxBitLength; ++i) {
-      int count = ReadUint8(data, &pos);
-      (*table)->bits[i] = count;
-      total_count += count;
-    }
-    if (is_ac_table) {
-      JPEG_VERIFY_INPUT(total_count, 0, kJpegHuffmanAlphabetSize);
-    } else {
-      // Allow symbols up to 15 here, we check later whether any invalid symbols
-      // are actually decoded.
-      // TODO(szabadka) Make sure decoder works (does not crash) with up to
-      // 15-nbits DC symbols and then increase kJpegDCAlphabetSize.
-      JPEG_VERIFY_INPUT(total_count, 0, 16);
-    }
-    JPEG_VERIFY_LEN(total_count);
-    for (int i = 0; i < total_count; ++i) {
-      int value = ReadUint8(data, &pos);
-      if (!is_ac_table) {
-        JPEG_VERIFY_INPUT(value, 0, 15);
-      }
-      (*table)->huffval[i] = value;
-    }
-    for (int i = total_count; i < kJpegHuffmanAlphabetSize; ++i) {
-      (*table)->huffval[i] = 0;
-    }
-  }
-  JPEG_VERIFY_MARKER_END();
-}
-
-void ProcessDQT(j_decompress_ptr cinfo, const uint8_t* data, size_t len) {
-  jpeg_decomp_master* m = cinfo->master;
-  if (m->found_sos_) {
-    JPEGLI_ERROR("Updating quant tables between scans is not supported.");
-  }
-  size_t pos = 2;
-  if (pos == len) {
-    JPEGLI_ERROR("DQT marker: no quantization table found");
-  }
-  while (pos < len) {
-    JPEG_VERIFY_LEN(1);
-    int quant_table_index = ReadUint8(data, &pos);
-    int precision = quant_table_index >> 4;
-    JPEG_VERIFY_INPUT(precision, 0, 1);
-    quant_table_index &= 0xf;
-    JPEG_VERIFY_INPUT(quant_table_index, 0, NUM_QUANT_TBLS - 1);
-    JPEG_VERIFY_LEN((precision + 1) * DCTSIZE2);
-
-    if (cinfo->quant_tbl_ptrs[quant_table_index] == nullptr) {
-      cinfo->quant_tbl_ptrs[quant_table_index] =
-          jpegli_alloc_quant_table(reinterpret_cast<j_common_ptr>(cinfo));
-    }
-    JQUANT_TBL* quant_table = cinfo->quant_tbl_ptrs[quant_table_index];
-
-    for (size_t i = 0; i < DCTSIZE2; ++i) {
-      int quant_val =
-          precision ? ReadUint16(data, &pos) : ReadUint8(data, &pos);
-      JPEG_VERIFY_INPUT(quant_val, 1, 65535);
-      quant_table->quantval[kJPEGNaturalOrder[i]] = quant_val;
-    }
-  }
-  JPEG_VERIFY_MARKER_END();
-}
-
-void ProcessDNL(j_decompress_ptr cinfo, const uint8_t* data, size_t len) {
-  // Ignore marker.
-}
-
-void ProcessDRI(j_decompress_ptr cinfo, const uint8_t* data, size_t len) {
-  jpeg_decomp_master* m = cinfo->master;
-  if (m->found_dri_) {
-    JPEGLI_ERROR("Duplicate DRI marker.");
-  }
-  m->found_dri_ = true;
-  size_t pos = 2;
-  JPEG_VERIFY_LEN(2);
-  cinfo->restart_interval = ReadUint16(data, &pos);
-  JPEG_VERIFY_MARKER_END();
-}
-
-void ProcessAPP(j_decompress_ptr cinfo, const uint8_t* data, size_t len) {
-  jpeg_decomp_master* m = cinfo->master;
-  const uint8_t marker = cinfo->unread_marker;
-  const uint8_t* payload = data + 2;
-  size_t payload_size = len - 2;
-  if (marker == 0xE0) {
-    if (payload_size >= 14 && memcmp(payload, "JFIF", 4) == 0) {
-      cinfo->saw_JFIF_marker = TRUE;
-      cinfo->JFIF_major_version = payload[5];
-      cinfo->JFIF_minor_version = payload[6];
-      cinfo->density_unit = payload[7];
-      cinfo->X_density = (payload[8] << 8) + payload[9];
-      cinfo->Y_density = (payload[10] << 8) + payload[11];
-    }
-  } else if (marker == 0xEE) {
-    if (payload_size >= 12 && memcmp(payload, "Adobe", 5) == 0) {
-      cinfo->saw_Adobe_marker = TRUE;
-      cinfo->Adobe_transform = payload[11];
-    }
-  } else if (marker == 0xE2) {
-    if (payload_size >= sizeof(kIccProfileTag) &&
-        memcmp(payload, kIccProfileTag, sizeof(kIccProfileTag)) == 0) {
-      payload += sizeof(kIccProfileTag);
-      payload_size -= sizeof(kIccProfileTag);
-      if (payload_size < 2) {
-        JPEGLI_ERROR("ICC chunk is too small.");
-      }
-      uint8_t index = payload[0];
-      uint8_t total = payload[1];
-      ++m->icc_index_;
-      if (m->icc_index_ != index) {
-        JPEGLI_ERROR("Invalid ICC chunk order.");
-      }
-      if (total == 0) {
-        JPEGLI_ERROR("Invalid ICC chunk total.");
-      }
-      if (m->icc_total_ == 0) {
-        m->icc_total_ = total;
-      } else if (m->icc_total_ != total) {
-        JPEGLI_ERROR("Invalid ICC chunk total.");
-      }
-      if (m->icc_index_ > m->icc_total_) {
-        JPEGLI_ERROR("Invalid ICC chunk index.");
-      }
-      m->icc_profile_.insert(m->icc_profile_.end(), payload + 2,
-                             payload + payload_size);
-    }
-  }
-}
-
-void ProcessCOM(j_decompress_ptr cinfo, const uint8_t* data, size_t len) {
-  // Ignore marker.
-}
-
-void ProcessSOI(j_decompress_ptr cinfo, const uint8_t* data, size_t len) {
-  jpeg_decomp_master* m = cinfo->master;
-  if (m->found_soi_) {
-    JPEGLI_ERROR("Duplicate SOI marker");
-  }
-  m->found_soi_ = true;
-}
-
-void ProcessEOI(j_decompress_ptr cinfo, const uint8_t* data, size_t len) {
-  cinfo->master->found_eoi_ = true;
-}
-
-void SaveMarker(j_decompress_ptr cinfo, const uint8_t* data, size_t len) {
-  const uint8_t marker = cinfo->unread_marker;
-  const uint8_t* payload = data + 2;
-  size_t payload_size = len - 2;
-
-  // Insert new saved marker to the head of the list.
-  jpeg_saved_marker_ptr next = cinfo->marker_list;
-  cinfo->marker_list =
-      jpegli::Allocate<jpeg_marker_struct>(cinfo, 1, JPOOL_IMAGE);
-  cinfo->marker_list->next = next;
-  cinfo->marker_list->marker = marker;
-  cinfo->marker_list->original_length = payload_size;
-  cinfo->marker_list->data_length = payload_size;
-  cinfo->marker_list->data =
-      jpegli::Allocate<uint8_t>(cinfo, payload_size, JPOOL_IMAGE);
-  memcpy(cinfo->marker_list->data, payload, payload_size);
-}
-
-uint8_t ProcessNextMarker(j_decompress_ptr cinfo, const uint8_t* const data,
-                          const size_t len, size_t* pos) {
-  jpeg_decomp_master* m = cinfo->master;
-  size_t num_skipped = 0;
-  uint8_t marker = cinfo->unread_marker;
-  if (marker == 0) {
-    // kIsValidMarker[i] == 1 means (0xc0 + i) is a valid marker.
-    static const uint8_t kIsValidMarker[] = {
-        1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
-    };
-    // Skip bytes between markers.
-    while (*pos + 1 < len && (data[*pos] != 0xff || data[*pos + 1] < 0xc0 ||
-                              !kIsValidMarker[data[*pos + 1] - 0xc0])) {
-      ++(*pos);
-      ++num_skipped;
-    }
-    if (*pos + 2 > len) {
-      return kNeedMoreInput;
-    }
-    marker = data[*pos + 1];
-    if (num_skipped > 0) {
-      if (m->found_soi_) {
-        JPEGLI_WARN("Skipped %d bytes before marker 0x%02x",
-                    static_cast<int>(num_skipped), marker);
-      } else {
-        JPEGLI_ERROR("Did not find SOI marker.");
-      }
-    }
-    *pos += 2;
-    cinfo->unread_marker = marker;
-  }
-  if (!m->found_soi_ && marker != 0xd8) {
-    JPEGLI_ERROR("Did not find SOI marker.");
-  }
-  if (GetMarkerProcessor(cinfo)) {
-    return kHandleMarkerProcessor;
-  }
-  const uint8_t* marker_data = &data[*pos];
-  size_t marker_len = 0;
-  if (marker != 0xd8 && marker != 0xd9) {
-    if (*pos + 2 > len) {
-      return kNeedMoreInput;
-    }
-    marker_len += (data[*pos] << 8) + data[*pos + 1];
-    if (marker_len < 2) {
-      JPEGLI_ERROR("Invalid marker length");
-    }
-    if (*pos + marker_len > len) {
-      // TODO(szabadka) Limit our memory usage by using the skip_input_data
-      // source manager callback on APP markers that are not saved.
-      return kNeedMoreInput;
-    }
-    if (marker >= 0xe0 && m->markers_to_save_[marker - 0xe0]) {
-      SaveMarker(cinfo, marker_data, marker_len);
-    }
-  }
-  if (marker == 0xc0 || marker == 0xc1 || marker == 0xc2) {
-    ProcessSOF(cinfo, marker_data, marker_len);
-  } else if (marker == 0xc4) {
-    ProcessDHT(cinfo, marker_data, marker_len);
-  } else if (marker == 0xda) {
-    ProcessSOS(cinfo, marker_data, marker_len);
-  } else if (marker == 0xdb) {
-    ProcessDQT(cinfo, marker_data, marker_len);
-  } else if (marker == 0xdc) {
-    ProcessDNL(cinfo, marker_data, marker_len);
-  } else if (marker == 0xdd) {
-    ProcessDRI(cinfo, marker_data, marker_len);
-  } else if (marker >= 0xe0 && marker <= 0xef) {
-    ProcessAPP(cinfo, marker_data, marker_len);
-  } else if (marker == 0xfe) {
-    ProcessCOM(cinfo, marker_data, marker_len);
-  } else if (marker == 0xd8) {
-    ProcessSOI(cinfo, marker_data, marker_len);
-  } else if (marker == 0xd9) {
-    ProcessEOI(cinfo, marker_data, marker_len);
-  } else {
-    JPEGLI_ERROR("Unexpected marker 0x%x", marker);
-  }
-  *pos += marker_len;
-  cinfo->unread_marker = 0;
-  if (marker == 0xda) {
-    return JPEG_REACHED_SOS;
-  } else if (marker == 0xd9) {
-    return JPEG_REACHED_EOI;
-  }
-  return kProcessNextMarker;
-}
-
-}  // namespace
-
-jpeg_marker_parser_method GetMarkerProcessor(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  uint8_t marker = cinfo->unread_marker;
-  jpeg_marker_parser_method callback = nullptr;
-  if (marker >= 0xe0 && marker <= 0xef) {
-    callback = m->app_marker_parsers[marker - 0xe0];
-  } else if (marker == 0xfe) {
-    callback = m->com_marker_parser;
-  }
-  return callback;
-}
-
-int ProcessMarkers(j_decompress_ptr cinfo, const uint8_t* const data,
-                   const size_t len, size_t* pos) {
-  for (;;) {
-    int status = ProcessNextMarker(cinfo, data, len, pos);
-    if (status != kProcessNextMarker) {
-      return status;
-    }
-  }
-}
-
-}  // namespace jpegli
diff --git a/third_party/jpeg-xl/lib/jpegli/decode_marker.h b/third_party/jpeg-xl/lib/jpegli/decode_marker.h
deleted file mode 100644
index f3d47f6ad27bc..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/decode_marker.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_DECODE_MARKER_H_
-#define LIB_JPEGLI_DECODE_MARKER_H_
-
-#include <stdint.h>
-
-#include "lib/jpegli/common.h"
-
-namespace jpegli {
-
-// Reads the available input in the source manager's input buffer until either
-// the end of the next SOS marker or the end of the input.
-// The corresponding fields of cinfo are updated with the processed input data.
-// Upon return, the input buffer will be at the start or at the end of a marker
-// data segment (inter-marker data is allowed).
-// Return value is one of:
-//   * JPEG_SUSPENDED, if the current input buffer ends before the next SOS or
-//       EOI marker. Input buffer refill is handled by the caller;
-//   * JPEG_REACHED_SOS, if the next SOS marker is found;
-//   * JPEG_REACHED_EOR, if the end of the input is found.
-int ProcessMarkers(j_decompress_ptr cinfo, const uint8_t* data, size_t len,
-                   size_t* pos);
-
-jpeg_marker_parser_method GetMarkerProcessor(j_decompress_ptr cinfo);
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_DECODE_MARKER_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/decode_scan.cc b/third_party/jpeg-xl/lib/jpegli/decode_scan.cc
deleted file mode 100644
index 6c4e5ac5f77e5..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/decode_scan.cc
+++ /dev/null
@@ -1,567 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/decode_scan.h"
-
-#include <string.h>
-
-#include <hwy/base.h>  // HWY_ALIGN_MAX
-
-#include "lib/jpegli/decode_internal.h"
-#include "lib/jpegli/error.h"
-#include "lib/jxl/base/status.h"
-
-namespace jpegli {
-namespace {
-
-// Max 14 block per MCU (when 1 channel is subsampled)
-// Max 64 nonzero coefficients per block
-// Max 16 symbol bits plus 11 extra bits per nonzero symbol
-// Max 2 bytes per 8 bits (worst case is all bytes are escaped 0xff)
-constexpr int kMaxMCUByteSize = 6048;
-
-// Helper structure to read bits from the entropy coded data segment.
-struct BitReaderState {
-  BitReaderState(const uint8_t* data, const size_t len, size_t pos)
-      : data_(data), len_(len), start_pos_(pos) {
-    Reset(pos);
-  }
-
-  void Reset(size_t pos) {
-    pos_ = pos;
-    val_ = 0;
-    bits_left_ = 0;
-    next_marker_pos_ = len_;
-    FillBitWindow();
-  }
-
-  // Returns the next byte and skips the 0xff/0x00 escape sequences.
-  uint8_t GetNextByte() {
-    if (pos_ >= next_marker_pos_) {
-      ++pos_;
-      return 0;
-    }
-    uint8_t c = data_[pos_++];
-    if (c == 0xff) {
-      uint8_t escape = pos_ < len_ ? data_[pos_] : 0;
-      if (escape == 0) {
-        ++pos_;
-      } else {
-        // 0xff was followed by a non-zero byte, which means that we found the
-        // start of the next marker segment.
-        next_marker_pos_ = pos_ - 1;
-      }
-    }
-    return c;
-  }
-
-  void FillBitWindow() {
-    if (bits_left_ <= 16) {
-      while (bits_left_ <= 56) {
-        val_ <<= 8;
-        val_ |= static_cast<uint64_t>(GetNextByte());
-        bits_left_ += 8;
-      }
-    }
-  }
-
-  int ReadBits(int nbits) {
-    FillBitWindow();
-    uint64_t val = (val_ >> (bits_left_ - nbits)) & ((1ULL << nbits) - 1);
-    bits_left_ -= nbits;
-    return val;
-  }
-
-  // Sets *pos to the next stream position, and *bit_pos to the bit position
-  // within the next byte where parsing should continue.
-  // Returns false if the stream ended too early.
-  bool FinishStream(size_t* pos, size_t* bit_pos) {
-    *bit_pos = (8 - (bits_left_ & 7)) & 7;
-    // Give back some bytes that we did not use.
-    int unused_bytes_left = DivCeil(bits_left_, 8);
-    while (unused_bytes_left-- > 0) {
-      --pos_;
-      // If we give back a 0 byte, we need to check if it was a 0xff/0x00 escape
-      // sequence, and if yes, we need to give back one more byte.
-      if (((pos_ == len_ && pos_ == next_marker_pos_) ||
-           (pos_ > 0 && pos_ < next_marker_pos_ && data_[pos_] == 0)) &&
-          (data_[pos_ - 1] == 0xff)) {
-        --pos_;
-      }
-    }
-    if (pos_ >= next_marker_pos_) {
-      *pos = next_marker_pos_;
-      if (pos_ > next_marker_pos_ || *bit_pos > 0) {
-        // Data ran out before the scan was complete.
-        return false;
-      }
-    }
-    *pos = pos_;
-    return true;
-  }
-
-  const uint8_t* data_;
-  const size_t len_;
-  size_t pos_;
-  uint64_t val_;
-  int bits_left_;
-  size_t next_marker_pos_;
-  size_t start_pos_;
-};
-
-// Returns the next Huffman-coded symbol.
-int ReadSymbol(const HuffmanTableEntry* table, BitReaderState* br) {
-  int nbits;
-  br->FillBitWindow();
-  int val = (br->val_ >> (br->bits_left_ - 8)) & 0xff;
-  table += val;
-  nbits = table->bits - 8;
-  if (nbits > 0) {
-    br->bits_left_ -= 8;
-    table += table->value;
-    val = (br->val_ >> (br->bits_left_ - nbits)) & ((1 << nbits) - 1);
-    table += val;
-  }
-  br->bits_left_ -= table->bits;
-  return table->value;
-}
-
-/**
- * Returns the DC diff or AC value for extra bits value x and prefix code s.
- *
- * CCITT Rec. T.81 (1992 E)
- * Table F.1 – Difference magnitude categories for DC coding
- *  SSSS | DIFF values
- * ------+--------------------------
- *     0 | 0
- *     1 | –1, 1
- *     2 | –3, –2, 2, 3
- *     3 | –7..–4, 4..7
- * ......|..........................
- *    11 | –2047..–1024, 1024..2047
- *
- * CCITT Rec. T.81 (1992 E)
- * Table F.2 – Categories assigned to coefficient values
- * [ Same as Table F.1, but does not include SSSS equal to 0 and 11]
- *
- *
- * CCITT Rec. T.81 (1992 E)
- * F.1.2.1.1 Structure of DC code table
- * For each category,... additional bits... appended... to uniquely identify
- * which difference... occurred... When DIFF is positive... SSSS... bits of DIFF
- * are appended. When DIFF is negative... SSSS... bits of (DIFF – 1) are
- * appended... Most significant bit... is 0 for negative differences and 1 for
- * positive differences.
- *
- * In other words the upper half of extra bits range represents DIFF as is.
- * The lower half represents the negative DIFFs with an offset.
- */
-int HuffExtend(int x, int s) {
-  JXL_DASSERT(s > 0);
-  int half = 1 << (s - 1);
-  if (x >= half) {
-    JXL_DASSERT(x < (1 << s));
-    return x;
-  } else {
-    return x - (1 << s) + 1;
-  }
-}
-
-// Decodes one 8x8 block of DCT coefficients from the bit stream.
-bool DecodeDCTBlock(const HuffmanTableEntry* dc_huff,
-                    const HuffmanTableEntry* ac_huff, int Ss, int Se, int Al,
-                    int* eobrun, BitReaderState* br, coeff_t* last_dc_coeff,
-                    coeff_t* coeffs) {
-  // Nowadays multiplication is even faster than variable shift.
-  int Am = 1 << Al;
-  bool eobrun_allowed = Ss > 0;
-  if (Ss == 0) {
-    int s = ReadSymbol(dc_huff, br);
-    if (s >= kJpegDCAlphabetSize) {
-      return false;
-    }
-    int diff = 0;
-    if (s > 0) {
-      int bits = br->ReadBits(s);
-      diff = HuffExtend(bits, s);
-    }
-    int coeff = diff + *last_dc_coeff;
-    const int dc_coeff = coeff * Am;
-    coeffs[0] = dc_coeff;
-    // TODO(eustas): is there a more elegant / explicit way to check this?
-    if (dc_coeff != coeffs[0]) {
-      return false;
-    }
-    *last_dc_coeff = coeff;
-    ++Ss;
-  }
-  if (Ss > Se) {
-    return true;
-  }
-  if (*eobrun > 0) {
-    --(*eobrun);
-    return true;
-  }
-  for (int k = Ss; k <= Se; k++) {
-    int sr = ReadSymbol(ac_huff, br);
-    if (sr >= kJpegHuffmanAlphabetSize) {
-      return false;
-    }
-    int r = sr >> 4;
-    int s = sr & 15;
-    if (s > 0) {
-      k += r;
-      if (k > Se) {
-        return false;
-      }
-      if (s + Al >= kJpegDCAlphabetSize) {
-        return false;
-      }
-      int bits = br->ReadBits(s);
-      int coeff = HuffExtend(bits, s);
-      coeffs[kJPEGNaturalOrder[k]] = coeff * Am;
-    } else if (r == 15) {
-      k += 15;
-    } else {
-      *eobrun = 1 << r;
-      if (r > 0) {
-        if (!eobrun_allowed) {
-          return false;
-        }
-        *eobrun += br->ReadBits(r);
-      }
-      break;
-    }
-  }
-  --(*eobrun);
-  return true;
-}
-
-bool RefineDCTBlock(const HuffmanTableEntry* ac_huff, int Ss, int Se, int Al,
-                    int* eobrun, BitReaderState* br, coeff_t* coeffs) {
-  // Nowadays multiplication is even faster than variable shift.
-  int Am = 1 << Al;
-  bool eobrun_allowed = Ss > 0;
-  if (Ss == 0) {
-    int s = br->ReadBits(1);
-    coeff_t dc_coeff = coeffs[0];
-    dc_coeff |= s * Am;
-    coeffs[0] = dc_coeff;
-    ++Ss;
-  }
-  if (Ss > Se) {
-    return true;
-  }
-  int p1 = Am;
-  int m1 = -Am;
-  int k = Ss;
-  int r;
-  int s;
-  bool in_zero_run = false;
-  if (*eobrun <= 0) {
-    for (; k <= Se; k++) {
-      s = ReadSymbol(ac_huff, br);
-      if (s >= kJpegHuffmanAlphabetSize) {
-        return false;
-      }
-      r = s >> 4;
-      s &= 15;
-      if (s) {
-        if (s != 1) {
-          return false;
-        }
-        s = br->ReadBits(1) ? p1 : m1;
-        in_zero_run = false;
-      } else {
-        if (r != 15) {
-          *eobrun = 1 << r;
-          if (r > 0) {
-            if (!eobrun_allowed) {
-              return false;
-            }
-            *eobrun += br->ReadBits(r);
-          }
-          break;
-        }
-        in_zero_run = true;
-      }
-      do {
-        coeff_t thiscoef = coeffs[kJPEGNaturalOrder[k]];
-        if (thiscoef != 0) {
-          if (br->ReadBits(1)) {
-            if ((thiscoef & p1) == 0) {
-              if (thiscoef >= 0) {
-                thiscoef += p1;
-              } else {
-                thiscoef += m1;
-              }
-            }
-          }
-          coeffs[kJPEGNaturalOrder[k]] = thiscoef;
-        } else {
-          if (--r < 0) {
-            break;
-          }
-        }
-        k++;
-      } while (k <= Se);
-      if (s) {
-        if (k > Se) {
-          return false;
-        }
-        coeffs[kJPEGNaturalOrder[k]] = s;
-      }
-    }
-  }
-  if (in_zero_run) {
-    return false;
-  }
-  if (*eobrun > 0) {
-    for (; k <= Se; k++) {
-      coeff_t thiscoef = coeffs[kJPEGNaturalOrder[k]];
-      if (thiscoef != 0) {
-        if (br->ReadBits(1)) {
-          if ((thiscoef & p1) == 0) {
-            if (thiscoef >= 0) {
-              thiscoef += p1;
-            } else {
-              thiscoef += m1;
-            }
-          }
-        }
-        coeffs[kJPEGNaturalOrder[k]] = thiscoef;
-      }
-    }
-  }
-  --(*eobrun);
-  return true;
-}
-
-void SaveMCUCodingState(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  memcpy(m->mcu_.last_dc_coeff, m->last_dc_coeff_, sizeof(m->last_dc_coeff_));
-  m->mcu_.eobrun = m->eobrun_;
-  size_t offset = 0;
-  for (int i = 0; i < cinfo->comps_in_scan; ++i) {
-    const jpeg_component_info* comp = cinfo->cur_comp_info[i];
-    int c = comp->component_index;
-    size_t block_x = m->scan_mcu_col_ * comp->MCU_width;
-    for (int iy = 0; iy < comp->MCU_height; ++iy) {
-      size_t block_y = m->scan_mcu_row_ * comp->MCU_height + iy;
-      size_t biy = block_y % comp->v_samp_factor;
-      if (block_y >= comp->height_in_blocks) {
-        continue;
-      }
-      size_t nblocks =
-          std::min<size_t>(comp->MCU_width, comp->width_in_blocks - block_x);
-      size_t ncoeffs = nblocks * DCTSIZE2;
-      coeff_t* coeffs = &m->coeff_rows[c][biy][block_x][0];
-      memcpy(&m->mcu_.coeffs[offset], coeffs, ncoeffs * sizeof(coeffs[0]));
-      offset += ncoeffs;
-    }
-  }
-}
-
-void RestoreMCUCodingState(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  memcpy(m->last_dc_coeff_, m->mcu_.last_dc_coeff, sizeof(m->last_dc_coeff_));
-  m->eobrun_ = m->mcu_.eobrun;
-  size_t offset = 0;
-  for (int i = 0; i < cinfo->comps_in_scan; ++i) {
-    const jpeg_component_info* comp = cinfo->cur_comp_info[i];
-    int c = comp->component_index;
-    size_t block_x = m->scan_mcu_col_ * comp->MCU_width;
-    for (int iy = 0; iy < comp->MCU_height; ++iy) {
-      size_t block_y = m->scan_mcu_row_ * comp->MCU_height + iy;
-      size_t biy = block_y % comp->v_samp_factor;
-      if (block_y >= comp->height_in_blocks) {
-        continue;
-      }
-      size_t nblocks =
-          std::min<size_t>(comp->MCU_width, comp->width_in_blocks - block_x);
-      size_t ncoeffs = nblocks * DCTSIZE2;
-      coeff_t* coeffs = &m->coeff_rows[c][biy][block_x][0];
-      memcpy(coeffs, &m->mcu_.coeffs[offset], ncoeffs * sizeof(coeffs[0]));
-      offset += ncoeffs;
-    }
-  }
-}
-
-bool FinishScan(j_decompress_ptr cinfo, const uint8_t* data, const size_t len,
-                size_t* pos, size_t* bit_pos) {
-  jpeg_decomp_master* m = cinfo->master;
-  if (m->eobrun_ > 0) {
-    JPEGLI_ERROR("End-of-block run too long.");
-  }
-  m->eobrun_ = -1;
-  memset(m->last_dc_coeff_, 0, sizeof(m->last_dc_coeff_));
-  if (*bit_pos == 0) {
-    return true;
-  }
-  if (data[*pos] == 0xff) {
-    // After last br.FinishStream we checked that there is at least 2 bytes
-    // in the buffer.
-    JXL_DASSERT(*pos + 1 < len);
-    // br.FinishStream would have detected an early marker.
-    JXL_DASSERT(data[*pos + 1] == 0);
-    *pos += 2;
-  } else {
-    *pos += 1;
-  }
-  *bit_pos = 0;
-  return true;
-}
-
-}  // namespace
-
-void PrepareForiMCURow(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  for (int i = 0; i < cinfo->comps_in_scan; ++i) {
-    const jpeg_component_info* comp = cinfo->cur_comp_info[i];
-    int c = comp->component_index;
-    int by0 = cinfo->input_iMCU_row * comp->v_samp_factor;
-    int block_rows_left = comp->height_in_blocks - by0;
-    int max_block_rows = std::min(comp->v_samp_factor, block_rows_left);
-    int offset = m->streaming_mode_ ? 0 : by0;
-    m->coeff_rows[c] = (*cinfo->mem->access_virt_barray)(
-        reinterpret_cast<j_common_ptr>(cinfo), m->coef_arrays[c], offset,
-        max_block_rows, TRUE);
-  }
-}
-
-int ProcessScan(j_decompress_ptr cinfo, const uint8_t* const data,
-                const size_t len, size_t* pos, size_t* bit_pos) {
-  if (len == 0) {
-    return kNeedMoreInput;
-  }
-  jpeg_decomp_master* m = cinfo->master;
-  for (;;) {
-    // Handle the restart intervals.
-    if (cinfo->restart_interval > 0 && m->restarts_to_go_ == 0) {
-      if (!FinishScan(cinfo, data, len, pos, bit_pos)) {
-        return kNeedMoreInput;
-      }
-      // Go to the next marker, warn if we had to skip any data.
-      size_t num_skipped = 0;
-      while (*pos + 1 < len && (data[*pos] != 0xff || data[*pos + 1] == 0 ||
-                                data[*pos + 1] == 0xff)) {
-        ++(*pos);
-        ++num_skipped;
-      }
-      if (num_skipped > 0) {
-        JPEGLI_WARN("Skipped %d bytes before restart marker",
-                    static_cast<int>(num_skipped));
-      }
-      if (*pos + 2 > len) {
-        return kNeedMoreInput;
-      }
-      cinfo->unread_marker = data[*pos + 1];
-      *pos += 2;
-      return kHandleRestart;
-    }
-
-    size_t start_pos = *pos;
-    BitReaderState br(data, len, start_pos);
-    if (*bit_pos > 0) {
-      br.ReadBits(*bit_pos);
-    }
-    if (start_pos + kMaxMCUByteSize > len) {
-      SaveMCUCodingState(cinfo);
-    }
-
-    // Decode one MCU.
-    HWY_ALIGN_MAX static coeff_t sink_block[DCTSIZE2] = {0};
-    bool scan_ok = true;
-    for (int i = 0; i < cinfo->comps_in_scan; ++i) {
-      const jpeg_component_info* comp = cinfo->cur_comp_info[i];
-      int c = comp->component_index;
-      const HuffmanTableEntry* dc_lut =
-          &m->dc_huff_lut_[comp->dc_tbl_no * kJpegHuffmanLutSize];
-      const HuffmanTableEntry* ac_lut =
-          &m->ac_huff_lut_[comp->ac_tbl_no * kJpegHuffmanLutSize];
-      for (int iy = 0; iy < comp->MCU_height; ++iy) {
-        size_t block_y = m->scan_mcu_row_ * comp->MCU_height + iy;
-        int biy = block_y % comp->v_samp_factor;
-        for (int ix = 0; ix < comp->MCU_width; ++ix) {
-          size_t block_x = m->scan_mcu_col_ * comp->MCU_width + ix;
-          coeff_t* coeffs;
-          if (block_x >= comp->width_in_blocks ||
-              block_y >= comp->height_in_blocks) {
-            // Note that it is OK that sink_block is uninitialized because
-            // it will never be used in any branches, even in the RefineDCTBlock
-            // case, because only DC scans can be interleaved and we don't use
-            // the zero-ness of the DC coeff in the DC refinement code-path.
-            coeffs = sink_block;
-          } else {
-            coeffs = &m->coeff_rows[c][biy][block_x][0];
-          }
-          if (cinfo->Ah == 0) {
-            if (!DecodeDCTBlock(dc_lut, ac_lut, cinfo->Ss, cinfo->Se, cinfo->Al,
-                                &m->eobrun_, &br,
-                                &m->last_dc_coeff_[comp->component_index],
-                                coeffs)) {
-              scan_ok = false;
-            }
-          } else {
-            if (!RefineDCTBlock(ac_lut, cinfo->Ss, cinfo->Se, cinfo->Al,
-                                &m->eobrun_, &br, coeffs)) {
-              scan_ok = false;
-            }
-          }
-        }
-      }
-    }
-    size_t new_pos;
-    size_t new_bit_pos;
-    bool stream_ok = br.FinishStream(&new_pos, &new_bit_pos);
-    if (new_pos + 2 > len) {
-      // If reading stopped within the last two bytes, we have to request more
-      // input even if FinishStream() returned true, since the Huffman code
-      // reader could have peaked ahead some bits past the current input chunk
-      // and thus the last prefix code length could have been wrong. We can do
-      // this because a valid JPEG bit stream has two extra bytes at the end.
-      RestoreMCUCodingState(cinfo);
-      return kNeedMoreInput;
-    }
-    *pos = new_pos;
-    *bit_pos = new_bit_pos;
-    if (!stream_ok) {
-      // We hit a marker during parsing.
-      JXL_DASSERT(data[*pos] == 0xff);
-      JXL_DASSERT(data[*pos + 1] != 0);
-      RestoreMCUCodingState(cinfo);
-      JPEGLI_WARN("Incomplete scan detected.");
-      return JPEG_SCAN_COMPLETED;
-    }
-    if (!scan_ok) {
-      JPEGLI_ERROR("Failed to decode DCT block");
-    }
-    if (m->restarts_to_go_ > 0) {
-      --m->restarts_to_go_;
-    }
-    ++m->scan_mcu_col_;
-    if (m->scan_mcu_col_ == cinfo->MCUs_per_row) {
-      ++m->scan_mcu_row_;
-      m->scan_mcu_col_ = 0;
-      if (m->scan_mcu_row_ == cinfo->MCU_rows_in_scan) {
-        if (!FinishScan(cinfo, data, len, pos, bit_pos)) {
-          return kNeedMoreInput;
-        }
-        break;
-      } else if ((m->scan_mcu_row_ % m->mcu_rows_per_iMCU_row_) == 0) {
-        // Current iMCU row is done.
-        break;
-      }
-    }
-  }
-  ++cinfo->input_iMCU_row;
-  if (cinfo->input_iMCU_row < cinfo->total_iMCU_rows) {
-    PrepareForiMCURow(cinfo);
-    return JPEG_ROW_COMPLETED;
-  }
-  return JPEG_SCAN_COMPLETED;
-}
-
-}  // namespace jpegli
diff --git a/third_party/jpeg-xl/lib/jpegli/decode_scan.h b/third_party/jpeg-xl/lib/jpegli/decode_scan.h
deleted file mode 100644
index dd1bfcd110283..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/decode_scan.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_DECODE_SCAN_H_
-#define LIB_JPEGLI_DECODE_SCAN_H_
-
-#include <stdint.h>
-
-#include "lib/jpegli/common.h"
-
-namespace jpegli {
-
-// Reads the available input in the source manager's input buffer until the end
-// of the next iMCU row.
-// The corresponding fields of cinfo are updated with the processed input data.
-// Upon return, the input buffer will be at the start of an MCU, or at the end
-// of the scan.
-// Return value is one of:
-//   * JPEG_SUSPENDED, if the input buffer ends before the end of an iMCU row;
-//   * JPEG_ROW_COMPLETED, if the next iMCU row (but not the scan) is reached;
-//   * JPEG_SCAN_COMPLETED, if the end of the scan is reached.
-int ProcessScan(j_decompress_ptr cinfo, const uint8_t* data, size_t len,
-                size_t* pos, size_t* bit_pos);
-
-void PrepareForiMCURow(j_decompress_ptr cinfo);
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_DECODE_SCAN_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/destination_manager.cc b/third_party/jpeg-xl/lib/jpegli/destination_manager.cc
deleted file mode 100644
index 05d35797b87cb..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/destination_manager.cc
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <string.h>
-
-#include "lib/jpegli/encode.h"
-#include "lib/jpegli/error.h"
-#include "lib/jpegli/memory_manager.h"
-
-namespace jpegli {
-
-constexpr size_t kDestBufferSize = 64 << 10;
-
-struct StdioDestinationManager {
-  jpeg_destination_mgr pub;
-  FILE* f;
-  uint8_t* buffer;
-
-  static void init_destination(j_compress_ptr cinfo) {
-    auto* dest = reinterpret_cast<StdioDestinationManager*>(cinfo->dest);
-    dest->pub.next_output_byte = dest->buffer;
-    dest->pub.free_in_buffer = kDestBufferSize;
-  }
-
-  static boolean empty_output_buffer(j_compress_ptr cinfo) {
-    auto* dest = reinterpret_cast<StdioDestinationManager*>(cinfo->dest);
-    if (fwrite(dest->buffer, 1, kDestBufferSize, dest->f) != kDestBufferSize) {
-      JPEGLI_ERROR("Failed to write to output stream.");
-    }
-    dest->pub.next_output_byte = dest->buffer;
-    dest->pub.free_in_buffer = kDestBufferSize;
-    return TRUE;
-  }
-
-  static void term_destination(j_compress_ptr cinfo) {
-    auto* dest = reinterpret_cast<StdioDestinationManager*>(cinfo->dest);
-    size_t bytes_left = kDestBufferSize - dest->pub.free_in_buffer;
-    if (bytes_left &&
-        fwrite(dest->buffer, 1, bytes_left, dest->f) != bytes_left) {
-      JPEGLI_ERROR("Failed to write to output stream.");
-    }
-    fflush(dest->f);
-    if (ferror(dest->f)) {
-      JPEGLI_ERROR("Failed to write to output stream.");
-    }
-  }
-};
-
-struct MemoryDestinationManager {
-  jpeg_destination_mgr pub;
-  // Output buffer supplied by the application
-  uint8_t** output;
-  unsigned long* output_size;  // NOLINT
-  // Output buffer allocated by us.
-  uint8_t* temp_buffer;
-  // Current output buffer (either application supplied or allocated by us).
-  uint8_t* current_buffer;
-  size_t buffer_size;
-
-  static void init_destination(j_compress_ptr cinfo) {}
-
-  static boolean empty_output_buffer(j_compress_ptr cinfo) {
-    auto* dest = reinterpret_cast<MemoryDestinationManager*>(cinfo->dest);
-    uint8_t* next_buffer =
-        reinterpret_cast<uint8_t*>(malloc(dest->buffer_size * 2));
-    memcpy(next_buffer, dest->current_buffer, dest->buffer_size);
-    if (dest->temp_buffer != nullptr) {
-      free(dest->temp_buffer);
-    }
-    dest->temp_buffer = next_buffer;
-    dest->current_buffer = next_buffer;
-    *dest->output = next_buffer;
-    *dest->output_size = dest->buffer_size;
-    dest->pub.next_output_byte = next_buffer + dest->buffer_size;
-    dest->pub.free_in_buffer = dest->buffer_size;
-    dest->buffer_size *= 2;
-    return TRUE;
-  }
-
-  static void term_destination(j_compress_ptr cinfo) {
-    auto* dest = reinterpret_cast<MemoryDestinationManager*>(cinfo->dest);
-    *dest->output_size = dest->buffer_size - dest->pub.free_in_buffer;
-  }
-};
-
-}  // namespace jpegli
-
-void jpegli_stdio_dest(j_compress_ptr cinfo, FILE* outfile) {
-  if (outfile == nullptr) {
-    JPEGLI_ERROR("jpegli_stdio_dest: Invalid destination.");
-  }
-  if (cinfo->dest && cinfo->dest->init_destination !=
-                         jpegli::StdioDestinationManager::init_destination) {
-    JPEGLI_ERROR("jpegli_stdio_dest: a different dest manager was already set");
-  }
-  if (!cinfo->dest) {
-    cinfo->dest = reinterpret_cast<jpeg_destination_mgr*>(
-        jpegli::Allocate<jpegli::StdioDestinationManager>(cinfo, 1));
-  }
-  auto* dest = reinterpret_cast<jpegli::StdioDestinationManager*>(cinfo->dest);
-  dest->f = outfile;
-  dest->buffer = jpegli::Allocate<uint8_t>(cinfo, jpegli::kDestBufferSize);
-  dest->pub.next_output_byte = dest->buffer;
-  dest->pub.free_in_buffer = jpegli::kDestBufferSize;
-  dest->pub.init_destination =
-      jpegli::StdioDestinationManager::init_destination;
-  dest->pub.empty_output_buffer =
-      jpegli::StdioDestinationManager::empty_output_buffer;
-  dest->pub.term_destination =
-      jpegli::StdioDestinationManager::term_destination;
-}
-
-void jpegli_mem_dest(j_compress_ptr cinfo, unsigned char** outbuffer,
-                     unsigned long* outsize /* NOLINT */) {
-  if (outbuffer == nullptr || outsize == nullptr) {
-    JPEGLI_ERROR("jpegli_mem_dest: Invalid destination.");
-  }
-  if (cinfo->dest && cinfo->dest->init_destination !=
-                         jpegli::MemoryDestinationManager::init_destination) {
-    JPEGLI_ERROR("jpegli_mem_dest: a different dest manager was already set");
-  }
-  if (!cinfo->dest) {
-    auto* dest = jpegli::Allocate<jpegli::MemoryDestinationManager>(cinfo, 1);
-    dest->temp_buffer = nullptr;
-    cinfo->dest = reinterpret_cast<jpeg_destination_mgr*>(dest);
-  }
-  auto* dest = reinterpret_cast<jpegli::MemoryDestinationManager*>(cinfo->dest);
-  dest->pub.init_destination =
-      jpegli::MemoryDestinationManager::init_destination;
-  dest->pub.empty_output_buffer =
-      jpegli::MemoryDestinationManager::empty_output_buffer;
-  dest->pub.term_destination =
-      jpegli::MemoryDestinationManager::term_destination;
-  dest->output = outbuffer;
-  dest->output_size = outsize;
-  if (*outbuffer == nullptr || *outsize == 0) {
-    dest->temp_buffer =
-        reinterpret_cast<uint8_t*>(malloc(jpegli::kDestBufferSize));
-    *outbuffer = dest->temp_buffer;
-    *outsize = jpegli::kDestBufferSize;
-  }
-  dest->current_buffer = *outbuffer;
-  dest->buffer_size = *outsize;
-  dest->pub.next_output_byte = dest->current_buffer;
-  dest->pub.free_in_buffer = dest->buffer_size;
-}
diff --git a/third_party/jpeg-xl/lib/jpegli/downsample.cc b/third_party/jpeg-xl/lib/jpegli/downsample.cc
deleted file mode 100644
index 1e5bb1563b190..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/downsample.cc
+++ /dev/null
@@ -1,357 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/downsample.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jpegli/downsample.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jpegli/encode_internal.h"
-#include "lib/jpegli/error.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jpegli {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::Vec;
-
-using D = HWY_CAPPED(float, 8);
-constexpr D d;
-
-void DownsampleRow2x1(const float* row_in, size_t len, float* row_out) {
-  const size_t N = Lanes(d);
-  const size_t len_out = len / 2;
-  const auto mul = Set(d, 0.5f);
-  Vec<D> v0, v1;  // NOLINT
-  for (size_t x = 0; x < len_out; x += N) {
-    LoadInterleaved2(d, row_in + 2 * x, v0, v1);
-    Store(Mul(mul, Add(v0, v1)), d, row_out + x);
-  }
-}
-
-void DownsampleRow3x1(const float* row_in, size_t len, float* row_out) {
-  const size_t N = Lanes(d);
-  const size_t len_out = len / 3;
-  const auto mul = Set(d, 1.0f / 3);
-  Vec<D> v0, v1, v2;  // NOLINT
-  for (size_t x = 0; x < len_out; x += N) {
-    LoadInterleaved3(d, row_in + 3 * x, v0, v1, v2);
-    Store(Mul(mul, Add(Add(v0, v1), v2)), d, row_out + x);
-  }
-}
-
-void DownsampleRow4x1(const float* row_in, size_t len, float* row_out) {
-  const size_t N = Lanes(d);
-  const size_t len_out = len / 4;
-  const auto mul = Set(d, 0.25f);
-  Vec<D> v0, v1, v2, v3;  // NOLINT
-  for (size_t x = 0; x < len_out; x += N) {
-    LoadInterleaved4(d, row_in + 4 * x, v0, v1, v2, v3);
-    Store(Mul(mul, Add(Add(v0, v1), Add(v2, v3))), d, row_out + x);
-  }
-}
-
-void Downsample2x1(float* rows_in[MAX_SAMP_FACTOR], size_t len,
-                   float* row_out) {
-  DownsampleRow2x1(rows_in[0], len, row_out);
-}
-
-void Downsample3x1(float* rows_in[MAX_SAMP_FACTOR], size_t len,
-                   float* row_out) {
-  DownsampleRow3x1(rows_in[0], len, row_out);
-}
-
-void Downsample4x1(float* rows_in[MAX_SAMP_FACTOR], size_t len,
-                   float* row_out) {
-  DownsampleRow4x1(rows_in[0], len, row_out);
-}
-
-void Downsample1x2(float* rows_in[MAX_SAMP_FACTOR], size_t len,
-                   float* row_out) {
-  const size_t N = Lanes(d);
-  const auto mul = Set(d, 0.5f);
-  float* row0 = rows_in[0];
-  float* row1 = rows_in[1];
-  for (size_t x = 0; x < len; x += N) {
-    Store(Mul(mul, Add(Load(d, row0 + x), Load(d, row1 + x))), d, row_out + x);
-  }
-}
-
-void Downsample2x2(float* rows_in[MAX_SAMP_FACTOR], size_t len,
-                   float* row_out) {
-  const size_t N = Lanes(d);
-  const size_t len_out = len / 2;
-  const auto mul = Set(d, 0.25f);
-  float* row0 = rows_in[0];
-  float* row1 = rows_in[1];
-  Vec<D> v0, v1, v2, v3;  // NOLINT
-  for (size_t x = 0; x < len_out; x += N) {
-    LoadInterleaved2(d, row0 + 2 * x, v0, v1);
-    LoadInterleaved2(d, row1 + 2 * x, v2, v3);
-    Store(Mul(mul, Add(Add(v0, v1), Add(v2, v3))), d, row_out + x);
-  }
-}
-
-void Downsample3x2(float* rows_in[MAX_SAMP_FACTOR], size_t len,
-                   float* row_out) {
-  DownsampleRow3x1(rows_in[0], len, rows_in[0]);
-  DownsampleRow3x1(rows_in[1], len, rows_in[1]);
-  Downsample1x2(rows_in, len / 3, row_out);
-}
-
-void Downsample4x2(float* rows_in[MAX_SAMP_FACTOR], size_t len,
-                   float* row_out) {
-  DownsampleRow4x1(rows_in[0], len, rows_in[0]);
-  DownsampleRow4x1(rows_in[1], len, rows_in[1]);
-  Downsample1x2(rows_in, len / 4, row_out);
-}
-
-void Downsample1x3(float* rows_in[MAX_SAMP_FACTOR], size_t len,
-                   float* row_out) {
-  const size_t N = Lanes(d);
-  const auto mul = Set(d, 1.0f / 3);
-  float* row0 = rows_in[0];
-  float* row1 = rows_in[1];
-  float* row2 = rows_in[2];
-  for (size_t x = 0; x < len; x += N) {
-    const auto in0 = Load(d, row0 + x);
-    const auto in1 = Load(d, row1 + x);
-    const auto in2 = Load(d, row2 + x);
-    Store(Mul(mul, Add(Add(in0, in1), in2)), d, row_out + x);
-  }
-}
-
-void Downsample2x3(float* rows_in[MAX_SAMP_FACTOR], size_t len,
-                   float* row_out) {
-  DownsampleRow2x1(rows_in[0], len, rows_in[0]);
-  DownsampleRow2x1(rows_in[1], len, rows_in[1]);
-  DownsampleRow2x1(rows_in[2], len, rows_in[2]);
-  Downsample1x3(rows_in, len / 2, row_out);
-}
-
-void Downsample3x3(float* rows_in[MAX_SAMP_FACTOR], size_t len,
-                   float* row_out) {
-  DownsampleRow3x1(rows_in[0], len, rows_in[0]);
-  DownsampleRow3x1(rows_in[1], len, rows_in[1]);
-  DownsampleRow3x1(rows_in[2], len, rows_in[2]);
-  Downsample1x3(rows_in, len / 3, row_out);
-}
-
-void Downsample4x3(float* rows_in[MAX_SAMP_FACTOR], size_t len,
-                   float* row_out) {
-  DownsampleRow4x1(rows_in[0], len, rows_in[0]);
-  DownsampleRow4x1(rows_in[1], len, rows_in[1]);
-  DownsampleRow4x1(rows_in[2], len, rows_in[2]);
-  Downsample1x3(rows_in, len / 4, row_out);
-}
-
-void Downsample1x4(float* rows_in[MAX_SAMP_FACTOR], size_t len,
-                   float* row_out) {
-  const size_t N = Lanes(d);
-  const auto mul = Set(d, 0.25f);
-  float* row0 = rows_in[0];
-  float* row1 = rows_in[1];
-  float* row2 = rows_in[2];
-  float* row3 = rows_in[3];
-  for (size_t x = 0; x < len; x += N) {
-    const auto in0 = Load(d, row0 + x);
-    const auto in1 = Load(d, row1 + x);
-    const auto in2 = Load(d, row2 + x);
-    const auto in3 = Load(d, row3 + x);
-    Store(Mul(mul, Add(Add(in0, in1), Add(in2, in3))), d, row_out + x);
-  }
-}
-
-void Downsample2x4(float* rows_in[MAX_SAMP_FACTOR], size_t len,
-                   float* row_out) {
-  DownsampleRow2x1(rows_in[0], len, rows_in[0]);
-  DownsampleRow2x1(rows_in[1], len, rows_in[1]);
-  DownsampleRow2x1(rows_in[2], len, rows_in[2]);
-  DownsampleRow2x1(rows_in[3], len, rows_in[3]);
-  Downsample1x4(rows_in, len / 2, row_out);
-}
-
-void Downsample3x4(float* rows_in[MAX_SAMP_FACTOR], size_t len,
-                   float* row_out) {
-  DownsampleRow3x1(rows_in[0], len, rows_in[0]);
-  DownsampleRow3x1(rows_in[1], len, rows_in[1]);
-  DownsampleRow3x1(rows_in[2], len, rows_in[2]);
-  DownsampleRow3x1(rows_in[3], len, rows_in[3]);
-  Downsample1x4(rows_in, len / 3, row_out);
-}
-
-void Downsample4x4(float* rows_in[MAX_SAMP_FACTOR], size_t len,
-                   float* row_out) {
-  DownsampleRow4x1(rows_in[0], len, rows_in[0]);
-  DownsampleRow4x1(rows_in[1], len, rows_in[1]);
-  DownsampleRow4x1(rows_in[2], len, rows_in[2]);
-  DownsampleRow4x1(rows_in[3], len, rows_in[3]);
-  Downsample1x4(rows_in, len / 4, row_out);
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jpegli
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jpegli {
-
-HWY_EXPORT(Downsample1x2);
-HWY_EXPORT(Downsample1x3);
-HWY_EXPORT(Downsample1x4);
-HWY_EXPORT(Downsample2x1);
-HWY_EXPORT(Downsample2x2);
-HWY_EXPORT(Downsample2x3);
-HWY_EXPORT(Downsample2x4);
-HWY_EXPORT(Downsample3x1);
-HWY_EXPORT(Downsample3x2);
-HWY_EXPORT(Downsample3x3);
-HWY_EXPORT(Downsample3x4);
-HWY_EXPORT(Downsample4x1);
-HWY_EXPORT(Downsample4x2);
-HWY_EXPORT(Downsample4x3);
-HWY_EXPORT(Downsample4x4);
-
-void NullDownsample(float* rows_in[MAX_SAMP_FACTOR], size_t len,
-                    float* row_out) {}
-
-void ChooseDownsampleMethods(j_compress_ptr cinfo) {
-  jpeg_comp_master* m = cinfo->master;
-  for (int c = 0; c < cinfo->num_components; c++) {
-    m->downsample_method[c] = nullptr;
-    jpeg_component_info* comp = &cinfo->comp_info[c];
-    const int h_factor = cinfo->max_h_samp_factor / comp->h_samp_factor;
-    const int v_factor = cinfo->max_v_samp_factor / comp->v_samp_factor;
-    if (v_factor == 1) {
-      if (h_factor == 1) {
-        m->downsample_method[c] = NullDownsample;
-      } else if (h_factor == 2) {
-        m->downsample_method[c] = HWY_DYNAMIC_DISPATCH(Downsample2x1);
-      } else if (h_factor == 3) {
-        m->downsample_method[c] = HWY_DYNAMIC_DISPATCH(Downsample3x1);
-      } else if (h_factor == 4) {
-        m->downsample_method[c] = HWY_DYNAMIC_DISPATCH(Downsample4x1);
-      }
-    } else if (v_factor == 2) {
-      if (h_factor == 1) {
-        m->downsample_method[c] = HWY_DYNAMIC_DISPATCH(Downsample1x2);
-      } else if (h_factor == 2) {
-        m->downsample_method[c] = HWY_DYNAMIC_DISPATCH(Downsample2x2);
-      } else if (h_factor == 3) {
-        m->downsample_method[c] = HWY_DYNAMIC_DISPATCH(Downsample3x2);
-      } else if (h_factor == 4) {
-        m->downsample_method[c] = HWY_DYNAMIC_DISPATCH(Downsample4x2);
-      }
-    } else if (v_factor == 3) {
-      if (h_factor == 1) {
-        m->downsample_method[c] = HWY_DYNAMIC_DISPATCH(Downsample1x2);
-      } else if (h_factor == 2) {
-        m->downsample_method[c] = HWY_DYNAMIC_DISPATCH(Downsample2x2);
-      } else if (h_factor == 3) {
-        m->downsample_method[c] = HWY_DYNAMIC_DISPATCH(Downsample3x2);
-      } else if (h_factor == 4) {
-        m->downsample_method[c] = HWY_DYNAMIC_DISPATCH(Downsample4x2);
-      }
-    } else if (v_factor == 4) {
-      if (h_factor == 1) {
-        m->downsample_method[c] = HWY_DYNAMIC_DISPATCH(Downsample1x4);
-      } else if (h_factor == 2) {
-        m->downsample_method[c] = HWY_DYNAMIC_DISPATCH(Downsample2x4);
-      } else if (h_factor == 3) {
-        m->downsample_method[c] = HWY_DYNAMIC_DISPATCH(Downsample3x4);
-      } else if (h_factor == 4) {
-        m->downsample_method[c] = HWY_DYNAMIC_DISPATCH(Downsample4x4);
-      }
-    }
-    if (m->downsample_method[c] == nullptr) {
-      JPEGLI_ERROR("Unsupported downsampling ratio %dx%d", h_factor, v_factor);
-    }
-  }
-}
-
-void DownsampleInputBuffer(j_compress_ptr cinfo) {
-  if (cinfo->max_h_samp_factor == 1 && cinfo->max_v_samp_factor == 1) {
-    return;
-  }
-  jpeg_comp_master* m = cinfo->master;
-  const size_t iMCU_height = DCTSIZE * cinfo->max_v_samp_factor;
-  const size_t y0 = m->next_iMCU_row * iMCU_height;
-  const size_t y1 = y0 + iMCU_height;
-  const size_t xsize_padded = m->xsize_blocks * DCTSIZE;
-  for (int c = 0; c < cinfo->num_components; c++) {
-    jpeg_component_info* comp = &cinfo->comp_info[c];
-    const int h_factor = cinfo->max_h_samp_factor / comp->h_samp_factor;
-    const int v_factor = cinfo->max_v_samp_factor / comp->v_samp_factor;
-    if (h_factor == 1 && v_factor == 1) {
-      continue;
-    }
-    auto& input = *m->smooth_input[c];
-    auto& output = *m->raw_data[c];
-    const size_t y_out0 = y0 / v_factor;
-    float* rows_in[MAX_SAMP_FACTOR];
-    for (size_t y_in = y0, y_out = y_out0; y_in < y1;
-         y_in += v_factor, ++y_out) {
-      for (int iy = 0; iy < v_factor; ++iy) {
-        rows_in[iy] = input.Row(y_in + iy);
-      }
-      float* row_out = output.Row(y_out);
-      (*m->downsample_method[c])(rows_in, xsize_padded, row_out);
-    }
-  }
-}
-
-void ApplyInputSmoothing(j_compress_ptr cinfo) {
-  if (!cinfo->smoothing_factor) {
-    return;
-  }
-  jpeg_comp_master* m = cinfo->master;
-  const float kW1 = cinfo->smoothing_factor / 1024.0;
-  const float kW0 = 1.0f - 8.0f * kW1;
-  const size_t iMCU_height = DCTSIZE * cinfo->max_v_samp_factor;
-  const ssize_t y0 = m->next_iMCU_row * iMCU_height;
-  const ssize_t y1 = y0 + iMCU_height;
-  const ssize_t xsize_padded = m->xsize_blocks * DCTSIZE;
-  for (int c = 0; c < cinfo->num_components; c++) {
-    auto& input = m->input_buffer[c];
-    auto& output = *m->smooth_input[c];
-    if (m->next_iMCU_row == 0) {
-      input.CopyRow(-1, 0, 1);
-    }
-    if (m->next_iMCU_row + 1 == cinfo->total_iMCU_rows) {
-      size_t last_row = m->ysize_blocks * DCTSIZE - 1;
-      input.CopyRow(last_row + 1, last_row, 1);
-    }
-    // TODO(szabadka) SIMDify this.
-    for (ssize_t y = y0; y < y1; ++y) {
-      const float* row_t = input.Row(y - 1);
-      const float* row_m = input.Row(y);
-      const float* row_b = input.Row(y + 1);
-      float* row_out = output.Row(y);
-      for (ssize_t x = 0; x < xsize_padded; ++x) {
-        float val_tl = row_t[x - 1];
-        float val_tm = row_t[x];
-        float val_tr = row_t[x + 1];
-        float val_ml = row_m[x - 1];
-        float val_mm = row_m[x];
-        float val_mr = row_m[x + 1];
-        float val_bl = row_b[x - 1];
-        float val_bm = row_b[x];
-        float val_br = row_b[x + 1];
-        float val1 = (val_tl + val_tm + val_tr + val_ml + val_mr + val_bl +
-                      val_bm + val_br);
-        row_out[x] = val_mm * kW0 + val1 * kW1;
-      }
-    }
-  }
-}
-
-}  // namespace jpegli
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jpegli/downsample.h b/third_party/jpeg-xl/lib/jpegli/downsample.h
deleted file mode 100644
index 3ccf069e4e50c..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/downsample.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_DOWNSAMPLE_H_
-#define LIB_JPEGLI_DOWNSAMPLE_H_
-
-#include "lib/jpegli/common.h"
-
-namespace jpegli {
-
-void ChooseDownsampleMethods(j_compress_ptr cinfo);
-
-void DownsampleInputBuffer(j_compress_ptr cinfo);
-
-void ApplyInputSmoothing(j_compress_ptr cinfo);
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_DOWNSAMPLE_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/encode.cc b/third_party/jpeg-xl/lib/jpegli/encode.cc
deleted file mode 100644
index 410eeed8083ec..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/encode.cc
+++ /dev/null
@@ -1,1274 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/encode.h"
-
-#include <jxl/types.h>
-
-#include <cmath>
-#include <initializer_list>
-#include <vector>
-
-#include "lib/jpegli/adaptive_quantization.h"
-#include "lib/jpegli/bit_writer.h"
-#include "lib/jpegli/bitstream.h"
-#include "lib/jpegli/color_transform.h"
-#include "lib/jpegli/downsample.h"
-#include "lib/jpegli/encode_finish.h"
-#include "lib/jpegli/encode_internal.h"
-#include "lib/jpegli/encode_streaming.h"
-#include "lib/jpegli/entropy_coding.h"
-#include "lib/jpegli/error.h"
-#include "lib/jpegli/huffman.h"
-#include "lib/jpegli/input.h"
-#include "lib/jpegli/memory_manager.h"
-#include "lib/jpegli/quant.h"
-
-namespace jpegli {
-
-constexpr size_t kMaxBytesInMarker = 65533;
-
-void CheckState(j_compress_ptr cinfo, int state) {
-  if (cinfo->global_state != state) {
-    JPEGLI_ERROR("Unexpected global state %d [expected %d]",
-                 cinfo->global_state, state);
-  }
-}
-
-void CheckState(j_compress_ptr cinfo, int state1, int state2) {
-  if (cinfo->global_state != state1 && cinfo->global_state != state2) {
-    JPEGLI_ERROR("Unexpected global state %d [expected %d or %d]",
-                 cinfo->global_state, state1, state2);
-  }
-}
-
-//
-// Parameter setup
-//
-
-// Initialize cinfo fields that are not dependent on input image. This is shared
-// between jpegli_CreateCompress() and jpegli_set_defaults()
-void InitializeCompressParams(j_compress_ptr cinfo) {
-  cinfo->data_precision = 8;
-  cinfo->num_scans = 0;
-  cinfo->scan_info = nullptr;
-  cinfo->raw_data_in = FALSE;
-  cinfo->arith_code = FALSE;
-  cinfo->optimize_coding = FALSE;
-  cinfo->CCIR601_sampling = FALSE;
-  cinfo->smoothing_factor = 0;
-  cinfo->dct_method = JDCT_FLOAT;
-  cinfo->restart_interval = 0;
-  cinfo->restart_in_rows = 0;
-  cinfo->write_JFIF_header = FALSE;
-  cinfo->JFIF_major_version = 1;
-  cinfo->JFIF_minor_version = 1;
-  cinfo->density_unit = 0;
-  cinfo->X_density = 1;
-  cinfo->Y_density = 1;
-#if JPEG_LIB_VERSION >= 70
-  cinfo->scale_num = 1;
-  cinfo->scale_denom = 1;
-  cinfo->do_fancy_downsampling = FALSE;
-  cinfo->min_DCT_h_scaled_size = DCTSIZE;
-  cinfo->min_DCT_v_scaled_size = DCTSIZE;
-#endif
-  cinfo->master->psnr_target = 0.0f;
-  cinfo->master->psnr_tolerance = 0.01f;
-  cinfo->master->min_distance = 0.1f;
-  cinfo->master->max_distance = 25.0f;
-}
-
-float LinearQualityToDistance(int scale_factor) {
-  scale_factor = std::min(5000, std::max(0, scale_factor));
-  int quality =
-      scale_factor < 100 ? 100 - scale_factor / 2 : 5000 / scale_factor;
-  return jpegli_quality_to_distance(quality);
-}
-
-template <typename T>
-void SetSentTableFlag(T** table_ptrs, size_t num, boolean val) {
-  for (size_t i = 0; i < num; ++i) {
-    if (table_ptrs[i]) table_ptrs[i]->sent_table = val;
-  }
-}
-
-//
-// Compressor initialization
-//
-
-struct ProgressiveScan {
-  int Ss, Se, Ah, Al;
-  bool interleaved;
-};
-
-void SetDefaultScanScript(j_compress_ptr cinfo) {
-  int level = cinfo->master->progressive_level;
-  std::vector<ProgressiveScan> progressive_mode;
-  bool interleave_dc =
-      (cinfo->max_h_samp_factor == 1 && cinfo->max_v_samp_factor == 1);
-  if (level == 0) {
-    progressive_mode.push_back({0, 63, 0, 0, true});
-  } else if (level == 1) {
-    progressive_mode.push_back({0, 0, 0, 0, interleave_dc});
-    progressive_mode.push_back({1, 63, 0, 1, false});
-    progressive_mode.push_back({1, 63, 1, 0, false});
-  } else {
-    progressive_mode.push_back({0, 0, 0, 0, interleave_dc});
-    progressive_mode.push_back({1, 2, 0, 0, false});
-    progressive_mode.push_back({3, 63, 0, 2, false});
-    progressive_mode.push_back({3, 63, 2, 1, false});
-    progressive_mode.push_back({3, 63, 1, 0, false});
-  }
-
-  cinfo->script_space_size = 0;
-  for (const auto& scan : progressive_mode) {
-    int comps = scan.interleaved ? MAX_COMPS_IN_SCAN : 1;
-    cinfo->script_space_size += DivCeil(cinfo->num_components, comps);
-  }
-  cinfo->script_space =
-      Allocate<jpeg_scan_info>(cinfo, cinfo->script_space_size);
-
-  jpeg_scan_info* next_scan = cinfo->script_space;
-  for (const auto& scan : progressive_mode) {
-    int comps = scan.interleaved ? MAX_COMPS_IN_SCAN : 1;
-    for (int c = 0; c < cinfo->num_components; c += comps) {
-      next_scan->Ss = scan.Ss;
-      next_scan->Se = scan.Se;
-      next_scan->Ah = scan.Ah;
-      next_scan->Al = scan.Al;
-      next_scan->comps_in_scan = std::min(comps, cinfo->num_components - c);
-      for (int j = 0; j < next_scan->comps_in_scan; ++j) {
-        next_scan->component_index[j] = c + j;
-      }
-      ++next_scan;
-    }
-  }
-  JPEGLI_CHECK(next_scan - cinfo->script_space == cinfo->script_space_size);
-  cinfo->scan_info = cinfo->script_space;
-  cinfo->num_scans = cinfo->script_space_size;
-}
-
-void ValidateScanScript(j_compress_ptr cinfo) {
-  // Mask of coefficient bits defined by the scan script, for each component
-  // and coefficient index.
-  uint16_t comp_mask[kMaxComponents][DCTSIZE2] = {};
-  static constexpr int kMaxRefinementBit = 10;
-
-  for (int i = 0; i < cinfo->num_scans; ++i) {
-    const jpeg_scan_info& si = cinfo->scan_info[i];
-    if (si.comps_in_scan < 1 || si.comps_in_scan > MAX_COMPS_IN_SCAN) {
-      JPEGLI_ERROR("Invalid number of components in scan %d", si.comps_in_scan);
-    }
-    int last_ci = -1;
-    for (int j = 0; j < si.comps_in_scan; ++j) {
-      int ci = si.component_index[j];
-      if (ci < 0 || ci >= cinfo->num_components) {
-        JPEGLI_ERROR("Invalid component index %d in scan", ci);
-      } else if (ci == last_ci) {
-        JPEGLI_ERROR("Duplicate component index %d in scan", ci);
-      } else if (ci < last_ci) {
-        JPEGLI_ERROR("Out of order component index %d in scan", ci);
-      }
-      last_ci = ci;
-    }
-    if (si.Ss < 0 || si.Se < si.Ss || si.Se >= DCTSIZE2) {
-      JPEGLI_ERROR("Invalid spectral range %d .. %d in scan", si.Ss, si.Se);
-    }
-    if (si.Ah < 0 || si.Al < 0 || si.Al > kMaxRefinementBit) {
-      JPEGLI_ERROR("Invalid refinement bits %d/%d", si.Ah, si.Al);
-    }
-    if (!cinfo->progressive_mode) {
-      if (si.Ss != 0 || si.Se != DCTSIZE2 - 1 || si.Ah != 0 || si.Al != 0) {
-        JPEGLI_ERROR("Invalid scan for sequential mode");
-      }
-    } else {
-      if (si.Ss == 0 && si.Se != 0) {
-        JPEGLI_ERROR("DC and AC together in progressive scan");
-      }
-    }
-    if (si.Ss != 0 && si.comps_in_scan != 1) {
-      JPEGLI_ERROR("Interleaved AC only scan.");
-    }
-    for (int j = 0; j < si.comps_in_scan; ++j) {
-      int ci = si.component_index[j];
-      if (si.Ss != 0 && comp_mask[ci][0] == 0) {
-        JPEGLI_ERROR("AC before DC in component %d of scan", ci);
-      }
-      for (int k = si.Ss; k <= si.Se; ++k) {
-        if (comp_mask[ci][k] == 0) {
-          if (si.Ah != 0) {
-            JPEGLI_ERROR("Invalid first scan refinement bit");
-          }
-          comp_mask[ci][k] = ((0xffff << si.Al) & 0xffff);
-        } else {
-          if (comp_mask[ci][k] != ((0xffff << si.Ah) & 0xffff) ||
-              si.Al != si.Ah - 1) {
-            JPEGLI_ERROR("Invalid refinement bit progression.");
-          }
-          comp_mask[ci][k] |= 1 << si.Al;
-        }
-      }
-    }
-    if (si.comps_in_scan > 1) {
-      size_t mcu_size = 0;
-      for (int j = 0; j < si.comps_in_scan; ++j) {
-        int ci = si.component_index[j];
-        jpeg_component_info* comp = &cinfo->comp_info[ci];
-        mcu_size += comp->h_samp_factor * comp->v_samp_factor;
-      }
-      if (mcu_size > C_MAX_BLOCKS_IN_MCU) {
-        JPEGLI_ERROR("MCU size too big");
-      }
-    }
-  }
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    for (int k = 0; k < DCTSIZE2; ++k) {
-      if (comp_mask[c][k] != 0xffff) {
-        JPEGLI_ERROR("Incomplete scan of component %d and frequency %d", c, k);
-      }
-    }
-  }
-}
-
-void ProcessCompressionParams(j_compress_ptr cinfo) {
-  if (cinfo->dest == nullptr) {
-    JPEGLI_ERROR("Missing destination.");
-  }
-  if (cinfo->image_width < 1 || cinfo->image_height < 1 ||
-      cinfo->input_components < 1) {
-    JPEGLI_ERROR("Empty input image.");
-  }
-  if (cinfo->image_width > static_cast<int>(JPEG_MAX_DIMENSION) ||
-      cinfo->image_height > static_cast<int>(JPEG_MAX_DIMENSION) ||
-      cinfo->input_components > static_cast<int>(kMaxComponents)) {
-    JPEGLI_ERROR("Input image too big.");
-  }
-  if (cinfo->num_components < 1 ||
-      cinfo->num_components > static_cast<int>(kMaxComponents)) {
-    JPEGLI_ERROR("Invalid number of components.");
-  }
-  if (cinfo->data_precision != kJpegPrecision) {
-    JPEGLI_ERROR("Invalid data precision");
-  }
-  if (cinfo->arith_code) {
-    JPEGLI_ERROR("Arithmetic coding is not implemented.");
-  }
-  if (cinfo->CCIR601_sampling) {
-    JPEGLI_ERROR("CCIR601 sampling is not implemented.");
-  }
-  if (cinfo->restart_interval > 65535u) {
-    JPEGLI_ERROR("Restart interval too big");
-  }
-  if (cinfo->smoothing_factor < 0 || cinfo->smoothing_factor > 100) {
-    JPEGLI_ERROR("Invalid smoothing factor %d", cinfo->smoothing_factor);
-  }
-  jpeg_comp_master* m = cinfo->master;
-  cinfo->max_h_samp_factor = cinfo->max_v_samp_factor = 1;
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    jpeg_component_info* comp = &cinfo->comp_info[c];
-    if (comp->component_index != c) {
-      JPEGLI_ERROR("Invalid component index");
-    }
-    for (int j = 0; j < c; ++j) {
-      if (cinfo->comp_info[j].component_id == comp->component_id) {
-        JPEGLI_ERROR("Duplicate component id %d", comp->component_id);
-      }
-    }
-    if (comp->h_samp_factor <= 0 || comp->v_samp_factor <= 0 ||
-        comp->h_samp_factor > MAX_SAMP_FACTOR ||
-        comp->v_samp_factor > MAX_SAMP_FACTOR) {
-      JPEGLI_ERROR("Invalid sampling factor %d x %d", comp->h_samp_factor,
-                   comp->v_samp_factor);
-    }
-    if (cinfo->num_components == 1) {
-      // Force samp factors to 1x1 for single-component images.
-      comp->h_samp_factor = comp->v_samp_factor = 1;
-    }
-    cinfo->max_h_samp_factor =
-        std::max(comp->h_samp_factor, cinfo->max_h_samp_factor);
-    cinfo->max_v_samp_factor =
-        std::max(comp->v_samp_factor, cinfo->max_v_samp_factor);
-  }
-  size_t iMCU_width = DCTSIZE * cinfo->max_h_samp_factor;
-  size_t iMCU_height = DCTSIZE * cinfo->max_v_samp_factor;
-  size_t total_iMCU_cols = DivCeil(cinfo->image_width, iMCU_width);
-  cinfo->total_iMCU_rows = DivCeil(cinfo->image_height, iMCU_height);
-  m->xsize_blocks = total_iMCU_cols * cinfo->max_h_samp_factor;
-  m->ysize_blocks = cinfo->total_iMCU_rows * cinfo->max_v_samp_factor;
-
-  size_t blocks_per_iMCU = 0;
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    jpeg_component_info* comp = &cinfo->comp_info[c];
-    if (cinfo->max_h_samp_factor % comp->h_samp_factor != 0 ||
-        cinfo->max_v_samp_factor % comp->v_samp_factor != 0) {
-      JPEGLI_ERROR("Non-integral sampling ratios are not supported.");
-    }
-    m->h_factor[c] = cinfo->max_h_samp_factor / comp->h_samp_factor;
-    m->v_factor[c] = cinfo->max_v_samp_factor / comp->v_samp_factor;
-    comp->downsampled_width = DivCeil(cinfo->image_width, m->h_factor[c]);
-    comp->downsampled_height = DivCeil(cinfo->image_height, m->v_factor[c]);
-    comp->width_in_blocks = DivCeil(comp->downsampled_width, DCTSIZE);
-    comp->height_in_blocks = DivCeil(comp->downsampled_height, DCTSIZE);
-    blocks_per_iMCU += comp->h_samp_factor * comp->v_samp_factor;
-  }
-  m->blocks_per_iMCU_row = total_iMCU_cols * blocks_per_iMCU;
-  // Disable adaptive quantization for subsampled luma channel.
-  int y_channel = cinfo->jpeg_color_space == JCS_RGB ? 1 : 0;
-  jpeg_component_info* y_comp = &cinfo->comp_info[y_channel];
-  if (y_comp->h_samp_factor != cinfo->max_h_samp_factor ||
-      y_comp->v_samp_factor != cinfo->max_v_samp_factor) {
-    m->use_adaptive_quantization = false;
-  }
-  if (cinfo->scan_info == nullptr) {
-    SetDefaultScanScript(cinfo);
-  }
-  cinfo->progressive_mode = TO_JXL_BOOL(cinfo->scan_info->Ss != 0 ||
-                                        cinfo->scan_info->Se != DCTSIZE2 - 1);
-  ValidateScanScript(cinfo);
-  m->scan_token_info =
-      Allocate<ScanTokenInfo>(cinfo, cinfo->num_scans, JPOOL_IMAGE);
-  memset(m->scan_token_info, 0, cinfo->num_scans * sizeof(ScanTokenInfo));
-  m->ac_ctx_offset = Allocate<uint8_t>(cinfo, cinfo->num_scans, JPOOL_IMAGE);
-  size_t num_ac_contexts = 0;
-  for (int i = 0; i < cinfo->num_scans; ++i) {
-    const jpeg_scan_info* scan_info = &cinfo->scan_info[i];
-    m->ac_ctx_offset[i] = 4 + num_ac_contexts;
-    if (scan_info->Se > 0) {
-      num_ac_contexts += scan_info->comps_in_scan;
-    }
-    if (num_ac_contexts > 252) {
-      JPEGLI_ERROR("Too many AC scans in image");
-    }
-    ScanTokenInfo* sti = &m->scan_token_info[i];
-    if (scan_info->comps_in_scan == 1) {
-      int comp_idx = scan_info->component_index[0];
-      jpeg_component_info* comp = &cinfo->comp_info[comp_idx];
-      sti->MCUs_per_row = comp->width_in_blocks;
-      sti->MCU_rows_in_scan = comp->height_in_blocks;
-      sti->blocks_in_MCU = 1;
-    } else {
-      sti->MCUs_per_row =
-          DivCeil(cinfo->image_width, DCTSIZE * cinfo->max_h_samp_factor);
-      sti->MCU_rows_in_scan =
-          DivCeil(cinfo->image_height, DCTSIZE * cinfo->max_v_samp_factor);
-      sti->blocks_in_MCU = 0;
-      for (int j = 0; j < scan_info->comps_in_scan; ++j) {
-        int comp_idx = scan_info->component_index[j];
-        jpeg_component_info* comp = &cinfo->comp_info[comp_idx];
-        sti->blocks_in_MCU += comp->h_samp_factor * comp->v_samp_factor;
-      }
-    }
-    size_t num_MCUs = sti->MCU_rows_in_scan * sti->MCUs_per_row;
-    sti->num_blocks = num_MCUs * sti->blocks_in_MCU;
-    if (cinfo->restart_in_rows <= 0) {
-      sti->restart_interval = cinfo->restart_interval;
-    } else {
-      sti->restart_interval =
-          std::min<size_t>(sti->MCUs_per_row * cinfo->restart_in_rows, 65535u);
-    }
-    sti->num_restarts = sti->restart_interval > 0
-                            ? DivCeil(num_MCUs, sti->restart_interval)
-                            : 1;
-    sti->restarts = Allocate<size_t>(cinfo, sti->num_restarts, JPOOL_IMAGE);
-  }
-  m->num_contexts = 4 + num_ac_contexts;
-}
-
-bool IsStreamingSupported(j_compress_ptr cinfo) {
-  if (cinfo->global_state == kEncWriteCoeffs) {
-    return false;
-  }
-  // TODO(szabadka) Remove this restriction.
-  if (cinfo->restart_interval > 0 || cinfo->restart_in_rows > 0) {
-    return false;
-  }
-  if (cinfo->num_scans > 1) {
-    return false;
-  }
-  if (cinfo->master->psnr_target > 0) {
-    return false;
-  }
-  return true;
-}
-
-void AllocateBuffers(j_compress_ptr cinfo) {
-  jpeg_comp_master* m = cinfo->master;
-  memset(m->last_dc_coeff, 0, sizeof(m->last_dc_coeff));
-  if (!IsStreamingSupported(cinfo) || cinfo->optimize_coding) {
-    int ysize_blocks = DivCeil(cinfo->image_height, DCTSIZE);
-    int num_arrays = cinfo->num_scans * ysize_blocks;
-    m->token_arrays = Allocate<TokenArray>(cinfo, num_arrays, JPOOL_IMAGE);
-    m->cur_token_array = 0;
-    memset(m->token_arrays, 0, num_arrays * sizeof(TokenArray));
-    m->num_tokens = 0;
-    m->total_num_tokens = 0;
-  }
-  if (cinfo->global_state == kEncWriteCoeffs) {
-    return;
-  }
-  size_t iMCU_width = DCTSIZE * cinfo->max_h_samp_factor;
-  size_t iMCU_height = DCTSIZE * cinfo->max_v_samp_factor;
-  size_t total_iMCU_cols = DivCeil(cinfo->image_width, iMCU_width);
-  size_t xsize_full = total_iMCU_cols * iMCU_width;
-  size_t ysize_full = 3 * iMCU_height;
-  if (!cinfo->raw_data_in) {
-    int num_all_components =
-        std::max(cinfo->input_components, cinfo->num_components);
-    for (int c = 0; c < num_all_components; ++c) {
-      m->input_buffer[c].Allocate(cinfo, ysize_full, xsize_full);
-    }
-  }
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    jpeg_component_info* comp = &cinfo->comp_info[c];
-    size_t xsize = total_iMCU_cols * comp->h_samp_factor * DCTSIZE;
-    size_t ysize = 3 * comp->v_samp_factor * DCTSIZE;
-    if (cinfo->raw_data_in) {
-      m->input_buffer[c].Allocate(cinfo, ysize, xsize);
-    }
-    m->smooth_input[c] = &m->input_buffer[c];
-    if (!cinfo->raw_data_in && cinfo->smoothing_factor) {
-      m->smooth_input[c] = Allocate<RowBuffer<float>>(cinfo, 1, JPOOL_IMAGE);
-      m->smooth_input[c]->Allocate(cinfo, ysize_full, xsize_full);
-    }
-    m->raw_data[c] = m->smooth_input[c];
-    if (!cinfo->raw_data_in && (m->h_factor[c] > 1 || m->v_factor[c] > 1)) {
-      m->raw_data[c] = Allocate<RowBuffer<float>>(cinfo, 1, JPOOL_IMAGE);
-      m->raw_data[c]->Allocate(cinfo, ysize, xsize);
-    }
-    m->quant_mul[c] = Allocate<float>(cinfo, DCTSIZE2, JPOOL_IMAGE_ALIGNED);
-  }
-  m->dct_buffer = Allocate<float>(cinfo, 2 * DCTSIZE2, JPOOL_IMAGE_ALIGNED);
-  m->block_tmp = Allocate<int32_t>(cinfo, DCTSIZE2 * 4, JPOOL_IMAGE_ALIGNED);
-  if (!IsStreamingSupported(cinfo)) {
-    m->coeff_buffers =
-        Allocate<jvirt_barray_ptr>(cinfo, cinfo->num_components, JPOOL_IMAGE);
-    for (int c = 0; c < cinfo->num_components; ++c) {
-      jpeg_component_info* comp = &cinfo->comp_info[c];
-      const size_t xsize_blocks = comp->width_in_blocks;
-      const size_t ysize_blocks = comp->height_in_blocks;
-      m->coeff_buffers[c] = (*cinfo->mem->request_virt_barray)(
-          reinterpret_cast<j_common_ptr>(cinfo), JPOOL_IMAGE,
-          /*pre_zero=*/FALSE, xsize_blocks, ysize_blocks, comp->v_samp_factor);
-    }
-  }
-  if (m->use_adaptive_quantization) {
-    int y_channel = cinfo->jpeg_color_space == JCS_RGB ? 1 : 0;
-    jpeg_component_info* y_comp = &cinfo->comp_info[y_channel];
-    const size_t xsize_blocks = y_comp->width_in_blocks;
-    const size_t vecsize = VectorSize();
-    const size_t xsize_padded = DivCeil(2 * xsize_blocks, vecsize) * vecsize;
-    m->diff_buffer =
-        Allocate<float>(cinfo, xsize_blocks * DCTSIZE + 8, JPOOL_IMAGE_ALIGNED);
-    m->fuzzy_erosion_tmp.Allocate(cinfo, 2, xsize_padded);
-    m->pre_erosion.Allocate(cinfo, 6 * cinfo->max_v_samp_factor, xsize_padded);
-    size_t qf_height = cinfo->max_v_samp_factor;
-    if (m->psnr_target > 0) {
-      qf_height *= cinfo->total_iMCU_rows;
-    }
-    m->quant_field.Allocate(cinfo, qf_height, xsize_blocks);
-  } else {
-    m->quant_field.Allocate(cinfo, 1, m->xsize_blocks);
-    m->quant_field.FillRow(0, 0, m->xsize_blocks);
-  }
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    m->zero_bias_offset[c] =
-        Allocate<float>(cinfo, DCTSIZE2, JPOOL_IMAGE_ALIGNED);
-    m->zero_bias_mul[c] = Allocate<float>(cinfo, DCTSIZE2, JPOOL_IMAGE_ALIGNED);
-    memset(m->zero_bias_mul[c], 0, DCTSIZE2 * sizeof(float));
-    memset(m->zero_bias_offset[c], 0, DCTSIZE2 * sizeof(float));
-  }
-}
-
-void InitProgressMonitor(j_compress_ptr cinfo) {
-  if (cinfo->progress == nullptr) {
-    return;
-  }
-  if (IsStreamingSupported(cinfo)) {
-    // We have only one input pass.
-    cinfo->progress->total_passes = 1;
-  } else {
-    // We have one input pass, a histogram pass for each scan, and an encode
-    // pass for each scan.
-    cinfo->progress->total_passes = 1 + 2 * cinfo->num_scans;
-  }
-}
-
-// Common setup code between streaming and transcoding code paths. Called in
-// both jpegli_start_compress() and jpegli_write_coefficients().
-void InitCompress(j_compress_ptr cinfo, boolean write_all_tables) {
-  jpeg_comp_master* m = cinfo->master;
-  (*cinfo->err->reset_error_mgr)(reinterpret_cast<j_common_ptr>(cinfo));
-  ProcessCompressionParams(cinfo);
-  InitProgressMonitor(cinfo);
-  AllocateBuffers(cinfo);
-  if (cinfo->global_state != kEncWriteCoeffs) {
-    ChooseInputMethod(cinfo);
-    if (!cinfo->raw_data_in) {
-      ChooseColorTransform(cinfo);
-      ChooseDownsampleMethods(cinfo);
-    }
-    QuantPass pass = m->psnr_target > 0 ? QuantPass::SEARCH_FIRST_PASS
-                                        : QuantPass::NO_SEARCH;
-    InitQuantizer(cinfo, pass);
-  }
-  if (write_all_tables) {
-    jpegli_suppress_tables(cinfo, FALSE);
-  }
-  if (!cinfo->optimize_coding && !cinfo->progressive_mode) {
-    CopyHuffmanTables(cinfo);
-    InitEntropyCoder(cinfo);
-  }
-  (*cinfo->dest->init_destination)(cinfo);
-  WriteFileHeader(cinfo);
-  JpegBitWriterInit(cinfo);
-  m->next_iMCU_row = 0;
-  m->last_restart_interval = 0;
-  m->next_dht_index = 0;
-}
-
-//
-// Input streaming
-//
-
-void ProgressMonitorInputPass(j_compress_ptr cinfo) {
-  if (cinfo->progress == nullptr) {
-    return;
-  }
-  cinfo->progress->completed_passes = 0;
-  cinfo->progress->pass_counter = cinfo->next_scanline;
-  cinfo->progress->pass_limit = cinfo->image_height;
-  (*cinfo->progress->progress_monitor)(reinterpret_cast<j_common_ptr>(cinfo));
-}
-
-void ReadInputRow(j_compress_ptr cinfo, const uint8_t* scanline,
-                  float* row[kMaxComponents]) {
-  jpeg_comp_master* m = cinfo->master;
-  int num_all_components =
-      std::max(cinfo->input_components, cinfo->num_components);
-  for (int c = 0; c < num_all_components; ++c) {
-    row[c] = m->input_buffer[c].Row(m->next_input_row);
-  }
-  ++m->next_input_row;
-  if (scanline == nullptr) {
-    for (int c = 0; c < cinfo->input_components; ++c) {
-      memset(row[c], 0, cinfo->image_width * sizeof(row[c][0]));
-    }
-    return;
-  }
-  (*m->input_method)(scanline, cinfo->image_width, row);
-}
-
-void PadInputBuffer(j_compress_ptr cinfo, float* row[kMaxComponents]) {
-  jpeg_comp_master* m = cinfo->master;
-  const size_t len0 = cinfo->image_width;
-  const size_t len1 = m->xsize_blocks * DCTSIZE;
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    // Pad row to a multiple of the iMCU width, plus create a border of 1
-    // repeated pixel for adaptive quant field calculation.
-    float last_val = row[c][len0 - 1];
-    for (size_t x = len0; x <= len1; ++x) {
-      row[c][x] = last_val;
-    }
-    row[c][-1] = row[c][0];
-  }
-  if (m->next_input_row == cinfo->image_height) {
-    size_t num_rows = m->ysize_blocks * DCTSIZE - cinfo->image_height;
-    for (size_t i = 0; i < num_rows; ++i) {
-      for (int c = 0; c < cinfo->num_components; ++c) {
-        float* dest = m->input_buffer[c].Row(m->next_input_row) - 1;
-        memcpy(dest, row[c] - 1, (len1 + 2) * sizeof(dest[0]));
-      }
-      ++m->next_input_row;
-    }
-  }
-}
-
-void ProcessiMCURow(j_compress_ptr cinfo) {
-  JPEGLI_CHECK(cinfo->master->next_iMCU_row < cinfo->total_iMCU_rows);
-  if (!cinfo->raw_data_in) {
-    ApplyInputSmoothing(cinfo);
-    DownsampleInputBuffer(cinfo);
-  }
-  ComputeAdaptiveQuantField(cinfo);
-  if (IsStreamingSupported(cinfo)) {
-    if (cinfo->optimize_coding) {
-      ComputeTokensForiMCURow(cinfo);
-    } else {
-      WriteiMCURow(cinfo);
-    }
-  } else {
-    ComputeCoefficientsForiMCURow(cinfo);
-  }
-  ++cinfo->master->next_iMCU_row;
-}
-
-void ProcessiMCURows(j_compress_ptr cinfo) {
-  jpeg_comp_master* m = cinfo->master;
-  size_t iMCU_height = DCTSIZE * cinfo->max_v_samp_factor;
-  // To have context rows both above and below the current iMCU row, we delay
-  // processing the first iMCU row and process two iMCU rows after we receive
-  // the last input row.
-  if (m->next_input_row % iMCU_height == 0 && m->next_input_row > iMCU_height) {
-    ProcessiMCURow(cinfo);
-  }
-  if (m->next_input_row >= cinfo->image_height) {
-    ProcessiMCURow(cinfo);
-  }
-}
-
-//
-// Non-streaming part
-//
-
-void ZigZagShuffleBlocks(j_compress_ptr cinfo) {
-  JCOEF tmp[DCTSIZE2];
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    jpeg_component_info* comp = &cinfo->comp_info[c];
-    for (JDIMENSION by = 0; by < comp->height_in_blocks; ++by) {
-      JBLOCKARRAY blocks = GetBlockRow(cinfo, c, by);
-      for (JDIMENSION bx = 0; bx < comp->width_in_blocks; ++bx) {
-        JCOEF* block = &blocks[0][bx][0];
-        for (int k = 0; k < DCTSIZE2; ++k) {
-          tmp[k] = block[kJPEGNaturalOrder[k]];
-        }
-        memcpy(block, tmp, sizeof(tmp));
-      }
-    }
-  }
-}
-
-}  // namespace jpegli
-
-//
-// Parameter setup
-//
-
-void jpegli_CreateCompress(j_compress_ptr cinfo, int version,
-                           size_t structsize) {
-  cinfo->mem = nullptr;
-  if (structsize != sizeof(*cinfo)) {
-    JPEGLI_ERROR("jpegli_compress_struct has wrong size.");
-  }
-  jpegli::InitMemoryManager(reinterpret_cast<j_common_ptr>(cinfo));
-  cinfo->progress = nullptr;
-  cinfo->is_decompressor = FALSE;
-  cinfo->global_state = jpegli::kEncStart;
-  cinfo->dest = nullptr;
-  cinfo->image_width = 0;
-  cinfo->image_height = 0;
-  cinfo->input_components = 0;
-  cinfo->in_color_space = JCS_UNKNOWN;
-  cinfo->input_gamma = 1.0f;
-  cinfo->num_components = 0;
-  cinfo->jpeg_color_space = JCS_UNKNOWN;
-  cinfo->comp_info = nullptr;
-  for (auto& quant_tbl_ptr : cinfo->quant_tbl_ptrs) {
-    quant_tbl_ptr = nullptr;
-  }
-  for (int i = 0; i < NUM_HUFF_TBLS; ++i) {
-    cinfo->dc_huff_tbl_ptrs[i] = nullptr;
-    cinfo->ac_huff_tbl_ptrs[i] = nullptr;
-  }
-  memset(cinfo->arith_dc_L, 0, sizeof(cinfo->arith_dc_L));
-  memset(cinfo->arith_dc_U, 0, sizeof(cinfo->arith_dc_U));
-  memset(cinfo->arith_ac_K, 0, sizeof(cinfo->arith_ac_K));
-  cinfo->write_Adobe_marker = FALSE;
-  cinfo->master = jpegli::Allocate<jpeg_comp_master>(cinfo, 1);
-  jpegli::InitializeCompressParams(cinfo);
-  cinfo->master->force_baseline = true;
-  cinfo->master->xyb_mode = false;
-  cinfo->master->cicp_transfer_function = 2;  // unknown transfer function code
-  cinfo->master->use_std_tables = false;
-  cinfo->master->use_adaptive_quantization = true;
-  cinfo->master->progressive_level = jpegli::kDefaultProgressiveLevel;
-  cinfo->master->data_type = JPEGLI_TYPE_UINT8;
-  cinfo->master->endianness = JPEGLI_NATIVE_ENDIAN;
-  cinfo->master->coeff_buffers = nullptr;
-}
-
-void jpegli_set_xyb_mode(j_compress_ptr cinfo) {
-  CheckState(cinfo, jpegli::kEncStart);
-  cinfo->master->xyb_mode = true;
-}
-
-void jpegli_set_cicp_transfer_function(j_compress_ptr cinfo, int code) {
-  CheckState(cinfo, jpegli::kEncStart);
-  cinfo->master->cicp_transfer_function = code;
-}
-
-void jpegli_set_defaults(j_compress_ptr cinfo) {
-  CheckState(cinfo, jpegli::kEncStart);
-  jpegli::InitializeCompressParams(cinfo);
-  jpegli_default_colorspace(cinfo);
-  jpegli_set_quality(cinfo, 90, TRUE);
-  jpegli_set_progressive_level(cinfo, jpegli::kDefaultProgressiveLevel);
-  jpegli::AddStandardHuffmanTables(reinterpret_cast<j_common_ptr>(cinfo),
-                                   /*is_dc=*/false);
-  jpegli::AddStandardHuffmanTables(reinterpret_cast<j_common_ptr>(cinfo),
-                                   /*is_dc=*/true);
-}
-
-void jpegli_default_colorspace(j_compress_ptr cinfo) {
-  CheckState(cinfo, jpegli::kEncStart);
-  if (cinfo->in_color_space == JCS_RGB && cinfo->master->xyb_mode) {
-    jpegli_set_colorspace(cinfo, JCS_RGB);
-    return;
-  }
-  switch (cinfo->in_color_space) {
-    case JCS_GRAYSCALE:
-      jpegli_set_colorspace(cinfo, JCS_GRAYSCALE);
-      break;
-    case JCS_RGB:
-#ifdef JCS_EXTENSIONS
-    case JCS_EXT_RGB:
-    case JCS_EXT_BGR:
-    case JCS_EXT_RGBX:
-    case JCS_EXT_BGRX:
-    case JCS_EXT_XRGB:
-    case JCS_EXT_XBGR:
-#endif
-#if JCS_ALPHA_EXTENSIONS
-    case JCS_EXT_RGBA:
-    case JCS_EXT_BGRA:
-    case JCS_EXT_ARGB:
-    case JCS_EXT_ABGR:
-#endif
-      jpegli_set_colorspace(cinfo, JCS_YCbCr);
-      break;
-    case JCS_YCbCr:
-      jpegli_set_colorspace(cinfo, JCS_YCbCr);
-      break;
-    case JCS_CMYK:
-      jpegli_set_colorspace(cinfo, JCS_CMYK);
-      break;
-    case JCS_YCCK:
-      jpegli_set_colorspace(cinfo, JCS_YCCK);
-      break;
-    case JCS_UNKNOWN:
-      jpegli_set_colorspace(cinfo, JCS_UNKNOWN);
-      break;
-    default:
-      JPEGLI_ERROR("Unsupported input colorspace %d", cinfo->in_color_space);
-  }
-}
-
-void jpegli_set_colorspace(j_compress_ptr cinfo, J_COLOR_SPACE colorspace) {
-  CheckState(cinfo, jpegli::kEncStart);
-  cinfo->jpeg_color_space = colorspace;
-  switch (colorspace) {
-    case JCS_GRAYSCALE:
-      cinfo->num_components = 1;
-      break;
-    case JCS_RGB:
-    case JCS_YCbCr:
-      cinfo->num_components = 3;
-      break;
-    case JCS_CMYK:
-    case JCS_YCCK:
-      cinfo->num_components = 4;
-      break;
-    case JCS_UNKNOWN:
-      cinfo->num_components =
-          std::min<int>(jpegli::kMaxComponents, cinfo->input_components);
-      break;
-    default:
-      JPEGLI_ERROR("Unsupported jpeg colorspace %d", colorspace);
-  }
-  // Adobe marker is only needed to distinguish CMYK and YCCK JPEGs.
-  cinfo->write_Adobe_marker = TO_JXL_BOOL(cinfo->jpeg_color_space == JCS_YCCK);
-  if (cinfo->comp_info == nullptr) {
-    cinfo->comp_info =
-        jpegli::Allocate<jpeg_component_info>(cinfo, MAX_COMPONENTS);
-  }
-  memset(cinfo->comp_info, 0,
-         jpegli::kMaxComponents * sizeof(jpeg_component_info));
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    jpeg_component_info* comp = &cinfo->comp_info[c];
-    comp->component_index = c;
-    comp->component_id = c + 1;
-    comp->h_samp_factor = 1;
-    comp->v_samp_factor = 1;
-    comp->quant_tbl_no = 0;
-    comp->dc_tbl_no = 0;
-    comp->ac_tbl_no = 0;
-  }
-  if (colorspace == JCS_RGB) {
-    cinfo->comp_info[0].component_id = 'R';
-    cinfo->comp_info[1].component_id = 'G';
-    cinfo->comp_info[2].component_id = 'B';
-    if (cinfo->master->xyb_mode) {
-      // Subsample blue channel.
-      cinfo->comp_info[0].h_samp_factor = cinfo->comp_info[0].v_samp_factor = 2;
-      cinfo->comp_info[1].h_samp_factor = cinfo->comp_info[1].v_samp_factor = 2;
-      cinfo->comp_info[2].h_samp_factor = cinfo->comp_info[2].v_samp_factor = 1;
-      // Use separate quantization tables for each component
-      cinfo->comp_info[1].quant_tbl_no = 1;
-      cinfo->comp_info[2].quant_tbl_no = 2;
-    }
-  } else if (colorspace == JCS_CMYK) {
-    cinfo->comp_info[0].component_id = 'C';
-    cinfo->comp_info[1].component_id = 'M';
-    cinfo->comp_info[2].component_id = 'Y';
-    cinfo->comp_info[3].component_id = 'K';
-  } else if (colorspace == JCS_YCbCr || colorspace == JCS_YCCK) {
-    // Use separate quantization and Huffman tables for luma and chroma
-    cinfo->comp_info[1].quant_tbl_no = 1;
-    cinfo->comp_info[2].quant_tbl_no = 1;
-    cinfo->comp_info[1].dc_tbl_no = cinfo->comp_info[1].ac_tbl_no = 1;
-    cinfo->comp_info[2].dc_tbl_no = cinfo->comp_info[2].ac_tbl_no = 1;
-    // Use chroma subsampling by default
-    cinfo->comp_info[0].h_samp_factor = cinfo->comp_info[0].v_samp_factor = 2;
-    if (colorspace == JCS_YCCK) {
-      cinfo->comp_info[3].h_samp_factor = cinfo->comp_info[3].v_samp_factor = 2;
-    }
-  }
-}
-
-void jpegli_set_distance(j_compress_ptr cinfo, float distance,
-                         boolean force_baseline) {
-  CheckState(cinfo, jpegli::kEncStart);
-  cinfo->master->force_baseline = FROM_JXL_BOOL(force_baseline);
-  float distances[NUM_QUANT_TBLS] = {distance, distance, distance};
-  jpegli::SetQuantMatrices(cinfo, distances, /*add_two_chroma_tables=*/true);
-}
-
-float jpegli_quality_to_distance(int quality) {
-  return (quality >= 100  ? 0.01f
-          : quality >= 30 ? 0.1f + (100 - quality) * 0.09f
-                          : 53.0f / 3000.0f * quality * quality -
-                                23.0f / 20.0f * quality + 25.0f);
-}
-
-void jpegli_set_psnr(j_compress_ptr cinfo, float psnr, float tolerance,
-                     float min_distance, float max_distance) {
-  CheckState(cinfo, jpegli::kEncStart);
-  cinfo->master->psnr_target = psnr;
-  cinfo->master->psnr_tolerance = tolerance;
-  cinfo->master->min_distance = min_distance;
-  cinfo->master->max_distance = max_distance;
-}
-
-void jpegli_set_quality(j_compress_ptr cinfo, int quality,
-                        boolean force_baseline) {
-  CheckState(cinfo, jpegli::kEncStart);
-  cinfo->master->force_baseline = FROM_JXL_BOOL(force_baseline);
-  float distance = jpegli_quality_to_distance(quality);
-  float distances[NUM_QUANT_TBLS] = {distance, distance, distance};
-  jpegli::SetQuantMatrices(cinfo, distances, /*add_two_chroma_tables=*/false);
-}
-
-void jpegli_set_linear_quality(j_compress_ptr cinfo, int scale_factor,
-                               boolean force_baseline) {
-  CheckState(cinfo, jpegli::kEncStart);
-  cinfo->master->force_baseline = FROM_JXL_BOOL(force_baseline);
-  float distance = jpegli::LinearQualityToDistance(scale_factor);
-  float distances[NUM_QUANT_TBLS] = {distance, distance, distance};
-  jpegli::SetQuantMatrices(cinfo, distances, /*add_two_chroma_tables=*/false);
-}
-
-#if JPEG_LIB_VERSION >= 70
-void jpegli_default_qtables(j_compress_ptr cinfo, boolean force_baseline) {
-  CheckState(cinfo, jpegli::kEncStart);
-  cinfo->master->force_baseline = force_baseline;
-  float distances[NUM_QUANT_TBLS];
-  for (int i = 0; i < NUM_QUANT_TBLS; ++i) {
-    distances[i] = jpegli::LinearQualityToDistance(cinfo->q_scale_factor[i]);
-  }
-  jpegli::SetQuantMatrices(cinfo, distances, /*add_two_chroma_tables=*/false);
-}
-#endif
-
-int jpegli_quality_scaling(int quality) {
-  quality = std::min(100, std::max(1, quality));
-  return quality < 50 ? 5000 / quality : 200 - 2 * quality;
-}
-
-void jpegli_use_standard_quant_tables(j_compress_ptr cinfo) {
-  CheckState(cinfo, jpegli::kEncStart);
-  cinfo->master->use_std_tables = true;
-}
-
-void jpegli_add_quant_table(j_compress_ptr cinfo, int which_tbl,
-                            const unsigned int* basic_table, int scale_factor,
-                            boolean force_baseline) {
-  CheckState(cinfo, jpegli::kEncStart);
-  if (which_tbl < 0 || which_tbl > NUM_QUANT_TBLS) {
-    JPEGLI_ERROR("Invalid quant table index %d", which_tbl);
-  }
-  if (cinfo->quant_tbl_ptrs[which_tbl] == nullptr) {
-    cinfo->quant_tbl_ptrs[which_tbl] =
-        jpegli_alloc_quant_table(reinterpret_cast<j_common_ptr>(cinfo));
-  }
-  int max_qval = force_baseline ? 255 : 32767U;
-  JQUANT_TBL* quant_table = cinfo->quant_tbl_ptrs[which_tbl];
-  for (int k = 0; k < DCTSIZE2; ++k) {
-    int qval = (basic_table[k] * scale_factor + 50) / 100;
-    qval = std::max(1, std::min(qval, max_qval));
-    quant_table->quantval[k] = qval;
-  }
-  quant_table->sent_table = FALSE;
-}
-
-void jpegli_enable_adaptive_quantization(j_compress_ptr cinfo, boolean value) {
-  CheckState(cinfo, jpegli::kEncStart);
-  cinfo->master->use_adaptive_quantization = FROM_JXL_BOOL(value);
-}
-
-void jpegli_simple_progression(j_compress_ptr cinfo) {
-  CheckState(cinfo, jpegli::kEncStart);
-  jpegli_set_progressive_level(cinfo, 2);
-}
-
-void jpegli_set_progressive_level(j_compress_ptr cinfo, int level) {
-  CheckState(cinfo, jpegli::kEncStart);
-  if (level < 0) {
-    JPEGLI_ERROR("Invalid progressive level %d", level);
-  }
-  cinfo->master->progressive_level = level;
-}
-
-void jpegli_set_input_format(j_compress_ptr cinfo, JpegliDataType data_type,
-                             JpegliEndianness endianness) {
-  CheckState(cinfo, jpegli::kEncStart);
-  switch (data_type) {
-    case JPEGLI_TYPE_UINT8:
-    case JPEGLI_TYPE_UINT16:
-    case JPEGLI_TYPE_FLOAT:
-      cinfo->master->data_type = data_type;
-      break;
-    default:
-      JPEGLI_ERROR("Unsupported data type %d", data_type);
-  }
-  switch (endianness) {
-    case JPEGLI_NATIVE_ENDIAN:
-    case JPEGLI_LITTLE_ENDIAN:
-    case JPEGLI_BIG_ENDIAN:
-      cinfo->master->endianness = endianness;
-      break;
-    default:
-      JPEGLI_ERROR("Unsupported endianness %d", endianness);
-  }
-}
-
-#if JPEG_LIB_VERSION >= 70
-void jpegli_calc_jpeg_dimensions(j_compress_ptr cinfo) {
-  // Since input scaling is not supported, we just copy the image dimensions.
-  cinfo->jpeg_width = cinfo->image_width;
-  cinfo->jpeg_height = cinfo->image_height;
-}
-#endif
-
-void jpegli_copy_critical_parameters(j_decompress_ptr srcinfo,
-                                     j_compress_ptr dstinfo) {
-  CheckState(dstinfo, jpegli::kEncStart);
-  // Image parameters.
-  dstinfo->image_width = srcinfo->image_width;
-  dstinfo->image_height = srcinfo->image_height;
-  dstinfo->input_components = srcinfo->num_components;
-  dstinfo->in_color_space = srcinfo->jpeg_color_space;
-  dstinfo->input_gamma = srcinfo->output_gamma;
-  // Compression parameters.
-  jpegli_set_defaults(dstinfo);
-  jpegli_set_colorspace(dstinfo, srcinfo->jpeg_color_space);
-  if (dstinfo->num_components != srcinfo->num_components) {
-    const auto& cinfo = dstinfo;
-    JPEGLI_ERROR("Mismatch between src colorspace and components");
-  }
-  dstinfo->data_precision = srcinfo->data_precision;
-  dstinfo->CCIR601_sampling = srcinfo->CCIR601_sampling;
-  dstinfo->JFIF_major_version = srcinfo->JFIF_major_version;
-  dstinfo->JFIF_minor_version = srcinfo->JFIF_minor_version;
-  dstinfo->density_unit = srcinfo->density_unit;
-  dstinfo->X_density = srcinfo->X_density;
-  dstinfo->Y_density = srcinfo->Y_density;
-  for (int c = 0; c < dstinfo->num_components; ++c) {
-    jpeg_component_info* srccomp = &srcinfo->comp_info[c];
-    jpeg_component_info* dstcomp = &dstinfo->comp_info[c];
-    dstcomp->component_id = srccomp->component_id;
-    dstcomp->h_samp_factor = srccomp->h_samp_factor;
-    dstcomp->v_samp_factor = srccomp->v_samp_factor;
-    dstcomp->quant_tbl_no = srccomp->quant_tbl_no;
-  }
-  for (int i = 0; i < NUM_QUANT_TBLS; ++i) {
-    if (!srcinfo->quant_tbl_ptrs[i]) continue;
-    if (dstinfo->quant_tbl_ptrs[i] == nullptr) {
-      dstinfo->quant_tbl_ptrs[i] = jpegli::Allocate<JQUANT_TBL>(dstinfo, 1);
-    }
-    memcpy(dstinfo->quant_tbl_ptrs[i], srcinfo->quant_tbl_ptrs[i],
-           sizeof(JQUANT_TBL));
-    dstinfo->quant_tbl_ptrs[i]->sent_table = FALSE;
-  }
-}
-
-void jpegli_suppress_tables(j_compress_ptr cinfo, boolean suppress) {
-  jpegli::SetSentTableFlag(cinfo->quant_tbl_ptrs, NUM_QUANT_TBLS, suppress);
-  jpegli::SetSentTableFlag(cinfo->dc_huff_tbl_ptrs, NUM_HUFF_TBLS, suppress);
-  jpegli::SetSentTableFlag(cinfo->ac_huff_tbl_ptrs, NUM_HUFF_TBLS, suppress);
-}
-
-//
-// Compressor initialization
-//
-
-void jpegli_start_compress(j_compress_ptr cinfo, boolean write_all_tables) {
-  CheckState(cinfo, jpegli::kEncStart);
-  cinfo->global_state = jpegli::kEncHeader;
-  jpegli::InitCompress(cinfo, write_all_tables);
-  cinfo->next_scanline = 0;
-  cinfo->master->next_input_row = 0;
-}
-
-void jpegli_write_coefficients(j_compress_ptr cinfo,
-                               jvirt_barray_ptr* coef_arrays) {
-  CheckState(cinfo, jpegli::kEncStart);
-  cinfo->global_state = jpegli::kEncWriteCoeffs;
-  jpegli::InitCompress(cinfo, /*write_all_tables=*/TRUE);
-  cinfo->master->coeff_buffers = coef_arrays;
-  cinfo->next_scanline = cinfo->image_height;
-  cinfo->master->next_input_row = cinfo->image_height;
-}
-
-void jpegli_write_tables(j_compress_ptr cinfo) {
-  CheckState(cinfo, jpegli::kEncStart);
-  if (cinfo->dest == nullptr) {
-    JPEGLI_ERROR("Missing destination.");
-  }
-  jpeg_comp_master* m = cinfo->master;
-  (*cinfo->err->reset_error_mgr)(reinterpret_cast<j_common_ptr>(cinfo));
-  (*cinfo->dest->init_destination)(cinfo);
-  jpegli::WriteOutput(cinfo, {0xFF, 0xD8});  // SOI
-  jpegli::EncodeDQT(cinfo, /*write_all_tables=*/true);
-  jpegli::CopyHuffmanTables(cinfo);
-  jpegli::EncodeDHT(cinfo, 0, m->num_huffman_tables);
-  jpegli::WriteOutput(cinfo, {0xFF, 0xD9});  // EOI
-  (*cinfo->dest->term_destination)(cinfo);
-  jpegli_suppress_tables(cinfo, TRUE);
-}
-
-//
-// Marker writing
-//
-
-void jpegli_write_m_header(j_compress_ptr cinfo, int marker,
-                           unsigned int datalen) {
-  CheckState(cinfo, jpegli::kEncHeader, jpegli::kEncWriteCoeffs);
-  if (datalen > jpegli::kMaxBytesInMarker) {
-    JPEGLI_ERROR("Invalid marker length %u", datalen);
-  }
-  if (marker != 0xfe && (marker < 0xe0 || marker > 0xef)) {
-    JPEGLI_ERROR(
-        "jpegli_write_m_header: Only APP and COM markers are supported.");
-  }
-  std::vector<uint8_t> marker_data(4 + datalen);
-  marker_data[0] = 0xff;
-  marker_data[1] = marker;
-  marker_data[2] = (datalen + 2) >> 8;
-  marker_data[3] = (datalen + 2) & 0xff;
-  jpegli::WriteOutput(cinfo, marker_data.data(), 4);
-}
-
-void jpegli_write_m_byte(j_compress_ptr cinfo, int val) {
-  uint8_t data = val;
-  jpegli::WriteOutput(cinfo, &data, 1);
-}
-
-void jpegli_write_marker(j_compress_ptr cinfo, int marker,
-                         const JOCTET* dataptr, unsigned int datalen) {
-  jpegli_write_m_header(cinfo, marker, datalen);
-  jpegli::WriteOutput(cinfo, dataptr, datalen);
-}
-
-void jpegli_write_icc_profile(j_compress_ptr cinfo, const JOCTET* icc_data_ptr,
-                              unsigned int icc_data_len) {
-  constexpr size_t kMaxIccBytesInMarker =
-      jpegli::kMaxBytesInMarker - sizeof jpegli::kICCSignature - 2;
-  const int num_markers =
-      static_cast<int>(jpegli::DivCeil(icc_data_len, kMaxIccBytesInMarker));
-  size_t begin = 0;
-  for (int current_marker = 0; current_marker < num_markers; ++current_marker) {
-    const size_t length = std::min(kMaxIccBytesInMarker, icc_data_len - begin);
-    jpegli_write_m_header(
-        cinfo, jpegli::kICCMarker,
-        static_cast<unsigned int>(length + sizeof jpegli::kICCSignature + 2));
-    for (const unsigned char c : jpegli::kICCSignature) {
-      jpegli_write_m_byte(cinfo, c);
-    }
-    jpegli_write_m_byte(cinfo, current_marker + 1);
-    jpegli_write_m_byte(cinfo, num_markers);
-    for (size_t i = 0; i < length; ++i) {
-      jpegli_write_m_byte(cinfo, icc_data_ptr[begin]);
-      ++begin;
-    }
-  }
-}
-
-//
-// Input streaming
-//
-
-JDIMENSION jpegli_write_scanlines(j_compress_ptr cinfo, JSAMPARRAY scanlines,
-                                  JDIMENSION num_lines) {
-  CheckState(cinfo, jpegli::kEncHeader, jpegli::kEncReadImage);
-  if (cinfo->raw_data_in) {
-    JPEGLI_ERROR("jpegli_write_raw_data() must be called for raw data mode.");
-  }
-  jpegli::ProgressMonitorInputPass(cinfo);
-  if (cinfo->global_state == jpegli::kEncHeader &&
-      jpegli::IsStreamingSupported(cinfo) && !cinfo->optimize_coding) {
-    jpegli::WriteFrameHeader(cinfo);
-    jpegli::WriteScanHeader(cinfo, 0);
-  }
-  cinfo->global_state = jpegli::kEncReadImage;
-  jpeg_comp_master* m = cinfo->master;
-  if (num_lines + cinfo->next_scanline > cinfo->image_height) {
-    num_lines = cinfo->image_height - cinfo->next_scanline;
-  }
-  JDIMENSION prev_scanline = cinfo->next_scanline;
-  size_t input_lag = (std::min<size_t>(cinfo->image_height, m->next_input_row) -
-                      cinfo->next_scanline);
-  if (input_lag > num_lines) {
-    JPEGLI_ERROR("Need at least %u lines to continue", input_lag);
-  }
-  if (input_lag > 0) {
-    if (!jpegli::EmptyBitWriterBuffer(&m->bw)) {
-      return 0;
-    }
-    cinfo->next_scanline += input_lag;
-  }
-  float* rows[jpegli::kMaxComponents];
-  for (size_t i = input_lag; i < num_lines; ++i) {
-    jpegli::ReadInputRow(cinfo, scanlines[i], rows);
-    (*m->color_transform)(rows, cinfo->image_width);
-    jpegli::PadInputBuffer(cinfo, rows);
-    jpegli::ProcessiMCURows(cinfo);
-    if (!jpegli::EmptyBitWriterBuffer(&m->bw)) {
-      break;
-    }
-    ++cinfo->next_scanline;
-  }
-  return cinfo->next_scanline - prev_scanline;
-}
-
-JDIMENSION jpegli_write_raw_data(j_compress_ptr cinfo, JSAMPIMAGE data,
-                                 JDIMENSION num_lines) {
-  CheckState(cinfo, jpegli::kEncHeader, jpegli::kEncReadImage);
-  if (!cinfo->raw_data_in) {
-    JPEGLI_ERROR("jpegli_write_raw_data(): raw data mode was not set");
-  }
-  jpegli::ProgressMonitorInputPass(cinfo);
-  if (cinfo->global_state == jpegli::kEncHeader &&
-      jpegli::IsStreamingSupported(cinfo) && !cinfo->optimize_coding) {
-    jpegli::WriteFrameHeader(cinfo);
-    jpegli::WriteScanHeader(cinfo, 0);
-  }
-  cinfo->global_state = jpegli::kEncReadImage;
-  jpeg_comp_master* m = cinfo->master;
-  if (cinfo->next_scanline >= cinfo->image_height) {
-    return 0;
-  }
-  size_t iMCU_height = DCTSIZE * cinfo->max_v_samp_factor;
-  if (num_lines < iMCU_height) {
-    JPEGLI_ERROR("Missing input lines, minimum is %u", iMCU_height);
-  }
-  if (cinfo->next_scanline < m->next_input_row) {
-    JPEGLI_CHECK(m->next_input_row - cinfo->next_scanline == iMCU_height);
-    if (!jpegli::EmptyBitWriterBuffer(&m->bw)) {
-      return 0;
-    }
-    cinfo->next_scanline = m->next_input_row;
-    return iMCU_height;
-  }
-  size_t iMCU_y = m->next_input_row / iMCU_height;
-  float* rows[jpegli::kMaxComponents];
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    JSAMPARRAY plane = data[c];
-    jpeg_component_info* comp = &cinfo->comp_info[c];
-    size_t xsize = comp->width_in_blocks * DCTSIZE;
-    size_t ysize = comp->v_samp_factor * DCTSIZE;
-    size_t y0 = iMCU_y * ysize;
-    auto& buffer = m->input_buffer[c];
-    for (size_t i = 0; i < ysize; ++i) {
-      rows[0] = buffer.Row(y0 + i);
-      if (plane[i] == nullptr) {
-        memset(rows[0], 0, xsize * sizeof(rows[0][0]));
-      } else {
-        (*m->input_method)(plane[i], xsize, rows);
-      }
-      // We need a border of 1 repeated pixel for adaptive quant field.
-      buffer.PadRow(y0 + i, xsize, /*border=*/1);
-    }
-  }
-  m->next_input_row += iMCU_height;
-  jpegli::ProcessiMCURows(cinfo);
-  if (!jpegli::EmptyBitWriterBuffer(&m->bw)) {
-    return 0;
-  }
-  cinfo->next_scanline += iMCU_height;
-  return iMCU_height;
-}
-
-//
-// Non-streaming part
-//
-
-void jpegli_finish_compress(j_compress_ptr cinfo) {
-  CheckState(cinfo, jpegli::kEncReadImage, jpegli::kEncWriteCoeffs);
-  jpeg_comp_master* m = cinfo->master;
-  if (cinfo->next_scanline < cinfo->image_height) {
-    JPEGLI_ERROR("Incomplete image, expected %d rows, got %d",
-                 cinfo->image_height, cinfo->next_scanline);
-  }
-
-  if (cinfo->global_state == jpegli::kEncWriteCoeffs) {
-    // Zig-zag shuffle all the blocks. For non-transcoding case it was already
-    // done in EncodeiMCURow().
-    jpegli::ZigZagShuffleBlocks(cinfo);
-  }
-
-  if (m->psnr_target > 0) {
-    jpegli::QuantizetoPSNR(cinfo);
-  }
-
-  const bool tokens_done = jpegli::IsStreamingSupported(cinfo);
-  const bool bitstream_done =
-      tokens_done && !FROM_JXL_BOOL(cinfo->optimize_coding);
-
-  if (!tokens_done) {
-    jpegli::TokenizeJpeg(cinfo);
-  }
-
-  if (cinfo->optimize_coding || cinfo->progressive_mode) {
-    jpegli::OptimizeHuffmanCodes(cinfo);
-    jpegli::InitEntropyCoder(cinfo);
-  }
-
-  if (!bitstream_done) {
-    jpegli::WriteFrameHeader(cinfo);
-    for (int i = 0; i < cinfo->num_scans; ++i) {
-      jpegli::WriteScanHeader(cinfo, i);
-      jpegli::WriteScanData(cinfo, i);
-    }
-  } else {
-    JumpToByteBoundary(&m->bw);
-    if (!EmptyBitWriterBuffer(&m->bw)) {
-      JPEGLI_ERROR("Output suspension is not supported in finish_compress");
-    }
-  }
-
-  jpegli::WriteOutput(cinfo, {0xFF, 0xD9});  // EOI
-  (*cinfo->dest->term_destination)(cinfo);
-
-  // Release memory and reset global state.
-  jpegli_abort_compress(cinfo);
-}
-
-void jpegli_abort_compress(j_compress_ptr cinfo) {
-  jpegli_abort(reinterpret_cast<j_common_ptr>(cinfo));
-}
-
-void jpegli_destroy_compress(j_compress_ptr cinfo) {
-  jpegli_destroy(reinterpret_cast<j_common_ptr>(cinfo));
-}
diff --git a/third_party/jpeg-xl/lib/jpegli/encode.h b/third_party/jpeg-xl/lib/jpegli/encode.h
deleted file mode 100644
index 54ff9d1f9eec6..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/encode.h
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-//
-// This file contains the C API of the encoder part of the libjpegli library,
-// which is based on the C API of libjpeg, with the function names changed from
-// jpeg_* to jpegli_*, while compressor object definitions are included directly
-// from jpeglib.h
-//
-// Applications can use the libjpegli library in one of the following ways:
-//
-//  (1) Include jpegli/encode.h and/or jpegli/decode.h, update the function
-//      names of the API and link against libjpegli.
-//
-//  (2) Leave the application code unchanged, but replace the libjpeg.so library
-//      with the one built by this project that is API- and ABI-compatible with
-//      libjpeg-turbo's version of libjpeg.so.
-
-#ifndef LIB_JPEGLI_ENCODE_H_
-#define LIB_JPEGLI_ENCODE_H_
-
-#include "lib/jpegli/common.h"
-#include "lib/jpegli/types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define jpegli_create_compress(cinfo)              \
-  jpegli_CreateCompress((cinfo), JPEG_LIB_VERSION, \
-                        (size_t)sizeof(struct jpeg_compress_struct))
-void jpegli_CreateCompress(j_compress_ptr cinfo, int version,
-                           size_t structsize);
-
-void jpegli_stdio_dest(j_compress_ptr cinfo, FILE* outfile);
-
-void jpegli_mem_dest(j_compress_ptr cinfo, unsigned char** outbuffer,
-                     unsigned long* outsize /* NOLINT */);
-
-void jpegli_set_defaults(j_compress_ptr cinfo);
-
-void jpegli_default_colorspace(j_compress_ptr cinfo);
-
-void jpegli_set_colorspace(j_compress_ptr cinfo, J_COLOR_SPACE colorspace);
-
-void jpegli_set_quality(j_compress_ptr cinfo, int quality,
-                        boolean force_baseline);
-
-void jpegli_set_linear_quality(j_compress_ptr cinfo, int scale_factor,
-                               boolean force_baseline);
-
-#if JPEG_LIB_VERSION >= 70
-void jpegli_default_qtables(j_compress_ptr cinfo, boolean force_baseline);
-#endif
-
-int jpegli_quality_scaling(int quality);
-
-void jpegli_add_quant_table(j_compress_ptr cinfo, int which_tbl,
-                            const unsigned int* basic_table, int scale_factor,
-                            boolean force_baseline);
-
-void jpegli_simple_progression(j_compress_ptr cinfo);
-
-void jpegli_suppress_tables(j_compress_ptr cinfo, boolean suppress);
-
-#if JPEG_LIB_VERSION >= 70
-void jpegli_calc_jpeg_dimensions(j_compress_ptr cinfo);
-#endif
-
-void jpegli_copy_critical_parameters(j_decompress_ptr srcinfo,
-                                     j_compress_ptr dstinfo);
-
-void jpegli_write_m_header(j_compress_ptr cinfo, int marker,
-                           unsigned int datalen);
-
-void jpegli_write_m_byte(j_compress_ptr cinfo, int val);
-
-void jpegli_write_marker(j_compress_ptr cinfo, int marker,
-                         const JOCTET* dataptr, unsigned int datalen);
-
-void jpegli_write_icc_profile(j_compress_ptr cinfo, const JOCTET* icc_data_ptr,
-                              unsigned int icc_data_len);
-
-void jpegli_start_compress(j_compress_ptr cinfo, boolean write_all_tables);
-
-void jpegli_write_tables(j_compress_ptr cinfo);
-
-JDIMENSION jpegli_write_scanlines(j_compress_ptr cinfo, JSAMPARRAY scanlines,
-                                  JDIMENSION num_lines);
-
-JDIMENSION jpegli_write_raw_data(j_compress_ptr cinfo, JSAMPIMAGE data,
-                                 JDIMENSION num_lines);
-
-void jpegli_write_coefficients(j_compress_ptr cinfo,
-                               jvirt_barray_ptr* coef_arrays);
-
-void jpegli_finish_compress(j_compress_ptr cinfo);
-
-void jpegli_abort_compress(j_compress_ptr cinfo);
-
-void jpegli_destroy_compress(j_compress_ptr cinfo);
-
-//
-// New API functions that are not available in libjpeg
-//
-// NOTE: This part of the API is still experimental and will probably change in
-// the future.
-//
-
-// Sets the butteraugli target distance for the compressor. This may override
-// the default quantization table indexes based on jpeg colorspace, therefore
-// it must be called after jpegli_set_defaults() or after the last
-// jpegli_set_colorspace() or jpegli_default_colorspace() calls.
-void jpegli_set_distance(j_compress_ptr cinfo, float distance,
-                         boolean force_baseline);
-
-// Returns the butteraugli target distance for the given quality parameter.
-float jpegli_quality_to_distance(int quality);
-
-// Enables distance parameter search to meet the given psnr target.
-void jpegli_set_psnr(j_compress_ptr cinfo, float psnr, float tolerance,
-                     float min_distance, float max_distance);
-
-// Changes the default behaviour of the encoder in the selection of quantization
-// matrices and chroma subsampling. Must be called before jpegli_set_defaults()
-// because some default setting depend on the XYB mode.
-void jpegli_set_xyb_mode(j_compress_ptr cinfo);
-
-// Signals to the encoder that the pixel data that will be provided later
-// through jpegli_write_scanlines() has this transfer function. This must be
-// called before jpegli_set_defaults() because it changes the default
-// quantization tables.
-void jpegli_set_cicp_transfer_function(j_compress_ptr cinfo, int code);
-
-void jpegli_set_input_format(j_compress_ptr cinfo, JpegliDataType data_type,
-                             JpegliEndianness endianness);
-
-// Sets whether or not the encoder uses adaptive quantization for creating more
-// zero coefficients based on the local properties of the image.
-// Enabled by default.
-void jpegli_enable_adaptive_quantization(j_compress_ptr cinfo, boolean value);
-
-// Sets the default progression parameters, where level 0 is sequential, and
-// greater level value means more progression steps. Default is 2.
-void jpegli_set_progressive_level(j_compress_ptr cinfo, int level);
-
-// If this function is called before starting compression, the quality and
-// linear quality parameters will be used to scale the standard quantization
-// tables from Annex K of the JPEG standard. By default jpegli uses a different
-// set of quantization tables and used different scaling parameters for DC and
-// AC coefficients. Must be called before jpegli_set_defaults().
-void jpegli_use_standard_quant_tables(j_compress_ptr cinfo);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif  // LIB_JPEGLI_ENCODE_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/encode_api_test.cc b/third_party/jpeg-xl/lib/jpegli/encode_api_test.cc
deleted file mode 100644
index c8a8e21f677aa..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/encode_api_test.cc
+++ /dev/null
@@ -1,873 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <ostream>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include "lib/jpegli/encode.h"
-#include "lib/jpegli/libjpeg_test_util.h"
-#include "lib/jpegli/test_params.h"
-#include "lib/jpegli/test_utils.h"
-#include "lib/jpegli/testing.h"
-#include "lib/jpegli/types.h"
-
-namespace jpegli {
-namespace {
-
-struct TestConfig {
-  TestImage input;
-  CompressParams jparams;
-  JpegIOMode input_mode = PIXELS;
-  double max_bpp;
-  double max_dist;
-};
-
-class EncodeAPITestParam : public ::testing::TestWithParam<TestConfig> {};
-
-void GenerateInput(JpegIOMode input_mode, const CompressParams& jparams,
-                   TestImage* input) {
-  GeneratePixels(input);
-  if (input_mode == RAW_DATA) {
-    GenerateRawData(jparams, input);
-  } else if (input_mode == COEFFICIENTS) {
-    GenerateCoeffs(jparams, input);
-  }
-}
-
-TEST_P(EncodeAPITestParam, TestAPI) {
-  TestConfig config = GetParam();
-  GenerateInput(config.input_mode, config.jparams, &config.input);
-  std::vector<uint8_t> compressed;
-  ASSERT_TRUE(EncodeWithJpegli(config.input, config.jparams, &compressed));
-  if (config.jparams.icc.empty()) {
-    double bpp =
-        compressed.size() * 8.0 / (config.input.xsize * config.input.ysize);
-    printf("bpp: %f\n", bpp);
-    EXPECT_LT(bpp, config.max_bpp);
-  }
-  DecompressParams dparams;
-  dparams.output_mode =
-      config.input_mode == COEFFICIENTS ? COEFFICIENTS : PIXELS;
-  if (config.jparams.set_jpeg_colorspace &&
-      config.jparams.jpeg_color_space == JCS_GRAYSCALE) {
-    ConvertToGrayscale(&config.input);
-  } else {
-    dparams.set_out_color_space = true;
-    dparams.out_color_space = config.input.color_space;
-  }
-  TestImage output;
-  DecodeWithLibjpeg(config.jparams, dparams, compressed, &output);
-  VerifyOutputImage(config.input, output, config.max_dist);
-}
-
-TEST(EncodeAPITest, ReuseCinfoSameImageTwice) {
-  TestImage input;
-  input.xsize = 129;
-  input.ysize = 73;
-  CompressParams jparams;
-  GenerateInput(PIXELS, jparams, &input);
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  std::vector<uint8_t> compressed0;
-  std::vector<uint8_t> compressed1;
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    EncodeWithJpegli(input, jparams, &cinfo);
-    compressed0.assign(buffer, buffer + buffer_size);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    EncodeWithJpegli(input, jparams, &cinfo);
-    compressed1.assign(buffer, buffer + buffer_size);
-    return true;
-  };
-  EXPECT_TRUE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-  ASSERT_EQ(compressed0.size(), compressed1.size());
-  EXPECT_EQ(0,
-            memcmp(compressed0.data(), compressed1.data(), compressed0.size()));
-}
-
-std::vector<TestConfig> GenerateBasicConfigs() {
-  std::vector<TestConfig> all_configs;
-  for (int samp : {1, 2}) {
-    for (int progr : {0, 2}) {
-      for (int optimize : {0, 1}) {
-        if (progr && optimize) continue;
-        TestConfig config;
-        config.input.xsize = 257 + samp * 37;
-        config.input.ysize = 265 + optimize * 17;
-        config.jparams.h_sampling = {samp, 1, 1};
-        config.jparams.v_sampling = {samp, 1, 1};
-        config.jparams.progressive_mode = progr;
-        config.jparams.optimize_coding = optimize;
-        config.max_dist = 2.4f;
-        GeneratePixels(&config.input);
-        all_configs.push_back(config);
-      }
-    }
-  }
-  return all_configs;
-}
-
-TEST(EncodeAPITest, ReuseCinfoSameMemOutput) {
-  std::vector<TestConfig> all_configs = GenerateBasicConfigs();
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  {
-    jpeg_compress_struct cinfo;
-    const auto try_catch_block = [&]() -> bool {
-      ERROR_HANDLER_SETUP(jpegli);
-      jpegli_create_compress(&cinfo);
-      jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-      for (const TestConfig& config : all_configs) {
-        EncodeWithJpegli(config.input, config.jparams, &cinfo);
-      }
-      return true;
-    };
-    EXPECT_TRUE(try_catch_block());
-    jpegli_destroy_compress(&cinfo);
-  }
-  size_t pos = 0;
-  for (auto& config : all_configs) {
-    TestImage output;
-    pos += DecodeWithLibjpeg(config.jparams, DecompressParams(), nullptr, 0,
-                             buffer + pos, buffer_size - pos, &output);
-    VerifyOutputImage(config.input, output, config.max_dist);
-  }
-  if (buffer) free(buffer);
-}
-
-TEST(EncodeAPITest, ReuseCinfoSameStdOutput) {
-  std::vector<TestConfig> all_configs = GenerateBasicConfigs();
-  FILE* tmpf = tmpfile();
-  ASSERT_TRUE(tmpf);
-  {
-    jpeg_compress_struct cinfo;
-    const auto try_catch_block = [&]() -> bool {
-      ERROR_HANDLER_SETUP(jpegli);
-      jpegli_create_compress(&cinfo);
-      jpegli_stdio_dest(&cinfo, tmpf);
-      for (const TestConfig& config : all_configs) {
-        EncodeWithJpegli(config.input, config.jparams, &cinfo);
-      }
-      return true;
-    };
-    EXPECT_TRUE(try_catch_block());
-    jpegli_destroy_compress(&cinfo);
-  }
-  size_t total_size = ftell(tmpf);
-  fseek(tmpf, 0, SEEK_SET);
-  std::vector<uint8_t> compressed(total_size);
-  ASSERT_TRUE(total_size == fread(compressed.data(), 1, total_size, tmpf));
-  fclose(tmpf);
-  size_t pos = 0;
-  for (auto& config : all_configs) {
-    TestImage output;
-    pos +=
-        DecodeWithLibjpeg(config.jparams, DecompressParams(), nullptr, 0,
-                          &compressed[pos], compressed.size() - pos, &output);
-    VerifyOutputImage(config.input, output, config.max_dist);
-  }
-}
-
-TEST(EncodeAPITest, ReuseCinfoChangeParams) {
-  TestImage input;
-  TestImage output;
-  CompressParams jparams;
-  DecompressParams dparams;
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  std::vector<uint8_t> compressed;
-  jpeg_compress_struct cinfo;
-  const auto max_rms = [](int q, int hs, int vs) {
-    if (hs == 1 && vs == 1) return q == 90 ? 2.2 : 0.6;
-    if (hs == 2 && vs == 2) return q == 90 ? 2.8 : 1.2;
-    return q == 90 ? 2.4 : 1.0;
-  };
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    input.xsize = 129;
-    input.ysize = 73;
-    dparams.set_out_color_space = true;
-    for (JpegIOMode input_mode : {PIXELS, RAW_DATA, PIXELS, COEFFICIENTS}) {
-      for (int h_samp : {2, 1}) {
-        for (int v_samp : {2, 1}) {
-          for (int progr : {0, 2}) {
-            for (int quality : {90, 100}) {
-              input.Clear();
-              input.color_space =
-                  (input_mode == RAW_DATA ? JCS_YCbCr : JCS_RGB);
-              jparams.quality = quality;
-              jparams.h_sampling = {h_samp, 1, 1};
-              jparams.v_sampling = {v_samp, 1, 1};
-              jparams.progressive_mode = progr;
-              printf(
-                  "Generating input with quality %d chroma subsampling %dx%d "
-                  "input mode %d progressive_mode %d\n",
-                  quality, h_samp, v_samp, input_mode, progr);
-              GenerateInput(input_mode, jparams, &input);
-              jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-              if (input_mode != COEFFICIENTS) {
-                cinfo.image_width = input.xsize;
-                cinfo.image_height = input.ysize;
-                cinfo.input_components = input.components;
-                jpegli_set_defaults(&cinfo);
-                jpegli_start_compress(&cinfo, TRUE);
-                jpegli_abort_compress(&cinfo);
-                jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-              }
-              EncodeWithJpegli(input, jparams, &cinfo);
-              compressed.resize(buffer_size);
-              std::copy_n(buffer, buffer_size, compressed.data());
-              dparams.output_mode =
-                  input_mode == COEFFICIENTS ? COEFFICIENTS : PIXELS;
-              dparams.out_color_space = input.color_space;
-              output.Clear();
-              DecodeWithLibjpeg(jparams, dparams, compressed, &output);
-              VerifyOutputImage(input, output,
-                                max_rms(quality, h_samp, v_samp));
-            }
-          }
-        }
-      }
-    }
-    return true;
-  };
-  EXPECT_TRUE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncodeAPITest, AbbreviatedStreams) {
-  uint8_t* table_stream = nullptr;
-  unsigned long table_stream_size = 0;  // NOLINT
-  uint8_t* data_stream = nullptr;
-  unsigned long data_stream_size = 0;  // NOLINT
-  {
-    jpeg_compress_struct cinfo;
-    const auto try_catch_block = [&]() -> bool {
-      ERROR_HANDLER_SETUP(jpegli);
-      jpegli_create_compress(&cinfo);
-      jpegli_mem_dest(&cinfo, &table_stream, &table_stream_size);
-      cinfo.input_components = 3;
-      cinfo.in_color_space = JCS_RGB;
-      jpegli_set_defaults(&cinfo);
-      jpegli_write_tables(&cinfo);
-      jpegli_mem_dest(&cinfo, &data_stream, &data_stream_size);
-      cinfo.image_width = 1;
-      cinfo.image_height = 1;
-      cinfo.optimize_coding = FALSE;
-      jpegli_set_progressive_level(&cinfo, 0);
-      jpegli_start_compress(&cinfo, FALSE);
-      JSAMPLE image[3] = {0};
-      JSAMPROW row[] = {image};
-      jpegli_write_scanlines(&cinfo, row, 1);
-      jpegli_finish_compress(&cinfo);
-      return true;
-    };
-    EXPECT_TRUE(try_catch_block());
-    EXPECT_LT(data_stream_size, 50);
-    jpegli_destroy_compress(&cinfo);
-  }
-  TestImage output;
-  DecodeWithLibjpeg(CompressParams(), DecompressParams(), table_stream,
-                    table_stream_size, data_stream, data_stream_size, &output);
-  EXPECT_EQ(1, output.xsize);
-  EXPECT_EQ(1, output.ysize);
-  EXPECT_EQ(3, output.components);
-  EXPECT_EQ(0, output.pixels[0]);
-  EXPECT_EQ(0, output.pixels[1]);
-  EXPECT_EQ(0, output.pixels[2]);
-  if (table_stream) free(table_stream);
-  if (data_stream) free(data_stream);
-}
-
-void CopyQuantTables(j_compress_ptr cinfo, uint16_t* quant_tables) {
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    int quant_idx = cinfo->comp_info[c].quant_tbl_no;
-    JQUANT_TBL* quant_table = cinfo->quant_tbl_ptrs[quant_idx];
-    for (int k = 0; k < DCTSIZE2; ++k) {
-      quant_tables[c * DCTSIZE2 + k] = quant_table->quantval[k];
-    }
-  }
-}
-
-TEST(EncodeAPITest, QualitySettings) {
-  // Test that jpegli_set_quality, jpegli_set_linear_quality and
-  // jpegli_quality_scaling are consistent with each other.
-  uint16_t quant_tables0[3 * DCTSIZE2];
-  uint16_t quant_tables1[3 * DCTSIZE2];
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    cinfo.input_components = 3;
-    cinfo.in_color_space = JCS_RGB;
-    jpegli_set_defaults(&cinfo);
-    for (boolean baseline : {FALSE, TRUE}) {
-      for (int q = 1; q <= 100; ++q) {
-        jpegli_set_quality(&cinfo, q, baseline);
-        CopyQuantTables(&cinfo, quant_tables0);
-        jpegli_set_linear_quality(&cinfo, jpegli_quality_scaling(q), baseline);
-        CopyQuantTables(&cinfo, quant_tables1);
-        EXPECT_EQ(0,
-                  memcmp(quant_tables0, quant_tables1, sizeof(quant_tables0)));
-#if JPEG_LIB_VERSION >= 70
-        for (int i = 0; i < NUM_QUANT_TBLS; ++i) {
-          cinfo.q_scale_factor[i] = jpegli_quality_scaling(q);
-        }
-        jpegli_default_qtables(&cinfo, baseline);
-        CopyQuantTables(&cinfo, quant_tables1);
-        EXPECT_EQ(0,
-                  memcmp(quant_tables0, quant_tables1, sizeof(quant_tables0)));
-#endif
-      }
-    }
-    return true;
-  };
-  EXPECT_TRUE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  // Test jpegli_quality_scaling for some specific values .
-  EXPECT_EQ(5000, jpegli_quality_scaling(-1));
-  EXPECT_EQ(5000, jpegli_quality_scaling(0));
-  EXPECT_EQ(5000, jpegli_quality_scaling(1));
-  EXPECT_EQ(100, jpegli_quality_scaling(50));
-  EXPECT_EQ(50, jpegli_quality_scaling(75));
-  EXPECT_EQ(20, jpegli_quality_scaling(90));
-  EXPECT_EQ(0, jpegli_quality_scaling(100));
-  EXPECT_EQ(0, jpegli_quality_scaling(101));
-}
-
-std::vector<TestConfig> GenerateTests() {
-  std::vector<TestConfig> all_tests;
-  for (int h_samp : {1, 2}) {
-    for (int v_samp : {1, 2}) {
-      for (int progr : {0, 2}) {
-        for (int optimize : {0, 1}) {
-          if (progr && optimize) continue;
-          TestConfig config;
-          config.jparams.h_sampling = {h_samp, 1, 1};
-          config.jparams.v_sampling = {v_samp, 1, 1};
-          config.jparams.progressive_mode = progr;
-          if (!progr) {
-            config.jparams.optimize_coding = optimize;
-          }
-          const float kMaxBpp[4] = {1.55, 1.4, 1.4, 1.32};
-          const float kMaxDist[4] = {1.95, 2.2, 2.2, 2.0};
-          const int idx = v_samp * 2 + h_samp - 3;
-          config.max_bpp =
-              kMaxBpp[idx] * (optimize ? 0.97 : 1.0) * (progr ? 0.97 : 1.0);
-          config.max_dist = kMaxDist[idx];
-          all_tests.push_back(config);
-        }
-      }
-    }
-  }
-  {
-    TestConfig config;
-    config.jparams.quality = 100;
-    config.jparams.h_sampling = {1, 1, 1};
-    config.jparams.v_sampling = {1, 1, 1};
-    config.max_bpp = 6.6;
-    config.max_dist = 0.6;
-    all_tests.push_back(config);
-  }
-  {
-    TestConfig config;
-    config.jparams.quality = 80;
-    config.max_bpp = 1.05;
-    config.max_dist = 2.7;
-    all_tests.push_back(config);
-  }
-  for (int samp : {1, 2}) {
-    for (int progr : {0, 2}) {
-      for (int optimize : {0, 1}) {
-        if (progr && optimize) continue;
-        TestConfig config;
-        config.input.xsize = 257;
-        config.input.ysize = 265;
-        config.jparams.h_sampling = {samp, 1, 1};
-        config.jparams.v_sampling = {samp, 1, 1};
-        config.jparams.progressive_mode = progr;
-        if (!progr) {
-          config.jparams.optimize_coding = optimize;
-        }
-        config.jparams.use_adaptive_quantization = false;
-        config.max_bpp = 2.05f;
-        config.max_dist = 2.3f;
-        all_tests.push_back(config);
-      }
-    }
-  }
-  for (int h0_samp : {1, 2, 4}) {
-    for (int v0_samp : {1, 2, 4}) {
-      for (int h2_samp : {1, 2, 4}) {
-        for (int v2_samp : {1, 2, 4}) {
-          TestConfig config;
-          config.input.xsize = 137;
-          config.input.ysize = 75;
-          config.jparams.progressive_mode = 2;
-          config.jparams.h_sampling = {h0_samp, 1, h2_samp};
-          config.jparams.v_sampling = {v0_samp, 1, v2_samp};
-          config.max_bpp = 2.5;
-          config.max_dist = 12.0;
-          all_tests.push_back(config);
-        }
-      }
-    }
-  }
-  for (int h0_samp : {1, 3}) {
-    for (int v0_samp : {1, 3}) {
-      for (int h2_samp : {1, 3}) {
-        for (int v2_samp : {1, 3}) {
-          TestConfig config;
-          config.input.xsize = 205;
-          config.input.ysize = 99;
-          config.jparams.progressive_mode = 2;
-          config.jparams.h_sampling = {h0_samp, 1, h2_samp};
-          config.jparams.v_sampling = {v0_samp, 1, v2_samp};
-          config.max_bpp = 2.5;
-          config.max_dist = 10.0;
-          all_tests.push_back(config);
-        }
-      }
-    }
-  }
-  for (int h0_samp : {1, 2, 3, 4}) {
-    for (int v0_samp : {1, 2, 3, 4}) {
-      TestConfig config;
-      config.input.xsize = 217;
-      config.input.ysize = 129;
-      config.jparams.progressive_mode = 2;
-      config.jparams.h_sampling = {h0_samp, 1, 1};
-      config.jparams.v_sampling = {v0_samp, 1, 1};
-      config.max_bpp = 2.0;
-      config.max_dist = 5.5;
-      all_tests.push_back(config);
-    }
-  }
-  for (int p = 0; p < 3 + NumTestScanScripts(); ++p) {
-    for (int samp : {1, 2}) {
-      for (int quality : {100, 90, 1}) {
-        for (int r : {0, 1024, 1}) {
-          for (int optimize : {0, 1}) {
-            bool progressive = p == 1 || p == 2 || p > 4;
-            if (progressive && !optimize) continue;
-            TestConfig config;
-            config.input.xsize = 273;
-            config.input.ysize = 265;
-            config.jparams.progressive_mode = p;
-            if (!progressive) {
-              config.jparams.optimize_coding = optimize;
-            }
-            config.jparams.h_sampling = {samp, 1, 1};
-            config.jparams.v_sampling = {samp, 1, 1};
-            config.jparams.quality = quality;
-            config.jparams.restart_interval = r;
-            config.max_bpp = quality == 100 ? 8.0 : 1.9;
-            if (r == 1) {
-              config.max_bpp += 10.0;
-            }
-            config.max_dist = quality == 1 ? 20.0 : 2.1;
-            all_tests.push_back(config);
-          }
-        }
-      }
-    }
-  }
-  {
-    TestConfig config;
-    config.jparams.simple_progression = true;
-    config.max_bpp = 1.48;
-    config.max_dist = 2.0;
-    all_tests.push_back(config);
-  }
-  {
-    TestConfig config;
-    config.input_mode = COEFFICIENTS;
-    config.jparams.h_sampling = {2, 1, 1};
-    config.jparams.v_sampling = {2, 1, 1};
-    config.jparams.progressive_mode = 0;
-    config.jparams.optimize_coding = 0;
-    config.max_bpp = 16;
-    config.max_dist = 0.0;
-    all_tests.push_back(config);
-  }
-  {
-    TestConfig config;
-    config.jparams.xyb_mode = true;
-    config.jparams.progressive_mode = 2;
-    config.max_bpp = 1.5;
-    config.max_dist = 3.5;
-    all_tests.push_back(config);
-  }
-  {
-    TestConfig config;
-    config.jparams.libjpeg_mode = true;
-    config.max_bpp = 2.1;
-    config.max_dist = 1.7;
-    config.jparams.h_sampling = {1, 1, 1};
-    config.jparams.v_sampling = {1, 1, 1};
-    all_tests.push_back(config);
-  }
-
-  for (J_COLOR_SPACE in_color_space :
-       {JCS_RGB, JCS_YCbCr, JCS_GRAYSCALE, JCS_EXT_RGB, JCS_EXT_BGR,
-        JCS_EXT_RGBA, JCS_EXT_BGRA, JCS_EXT_ARGB, JCS_EXT_ABGR}) {
-    for (J_COLOR_SPACE jpeg_color_space : {JCS_RGB, JCS_YCbCr, JCS_GRAYSCALE}) {
-      if (jpeg_color_space == JCS_RGB && in_color_space >= JCS_YCbCr) continue;
-      TestConfig config;
-      config.input.xsize = config.input.ysize = 256;
-      config.input.color_space = in_color_space;
-      config.jparams.set_jpeg_colorspace = true;
-      config.jparams.jpeg_color_space = jpeg_color_space;
-      config.jparams.h_sampling = {1, 1, 1};
-      config.jparams.v_sampling = {1, 1, 1};
-      config.max_bpp = jpeg_color_space == JCS_RGB ? 4.5 : 1.85;
-      config.max_dist = jpeg_color_space == JCS_RGB ? 1.4 : 2.05;
-      all_tests.push_back(config);
-    }
-  }
-  for (J_COLOR_SPACE in_color_space : {JCS_CMYK, JCS_YCCK}) {
-    for (J_COLOR_SPACE jpeg_color_space : {JCS_CMYK, JCS_YCCK}) {
-      if (jpeg_color_space == JCS_CMYK && in_color_space == JCS_YCCK) continue;
-      TestConfig config;
-      config.input.xsize = config.input.ysize = 256;
-      config.input.color_space = in_color_space;
-      if (in_color_space != jpeg_color_space) {
-        config.jparams.set_jpeg_colorspace = true;
-        config.jparams.jpeg_color_space = jpeg_color_space;
-      }
-      config.jparams.h_sampling = {1, 1, 1, 1};
-      config.jparams.v_sampling = {1, 1, 1, 1};
-      config.max_bpp = jpeg_color_space == JCS_CMYK ? 4.0 : 3.6;
-      config.max_dist = jpeg_color_space == JCS_CMYK ? 1.2 : 1.5;
-      all_tests.push_back(config);
-    }
-  }
-  {
-    TestConfig config;
-    config.input.color_space = JCS_YCbCr;
-    config.max_bpp = 1.6;
-    config.max_dist = 1.35;
-    config.jparams.h_sampling = {1, 1, 1};
-    config.jparams.v_sampling = {1, 1, 1};
-    all_tests.push_back(config);
-  }
-  for (bool xyb : {false, true}) {
-    TestConfig config;
-    config.input.color_space = JCS_GRAYSCALE;
-    config.jparams.xyb_mode = xyb;
-    config.max_bpp = 1.35;
-    config.max_dist = 1.4;
-    all_tests.push_back(config);
-  }
-  for (int channels = 1; channels <= 4; ++channels) {
-    TestConfig config;
-    config.input.color_space = JCS_UNKNOWN;
-    config.input.components = channels;
-    config.max_bpp = 1.35 * channels;
-    config.max_dist = 1.4;
-    all_tests.push_back(config);
-  }
-  for (size_t r : {1, 3, 17, 1024}) {
-    for (int progr : {0, 2}) {
-      TestConfig config;
-      config.jparams.restart_interval = r;
-      config.jparams.progressive_mode = progr;
-      config.max_bpp = 1.58 + 5.5 / r;
-      config.max_dist = 2.2;
-      all_tests.push_back(config);
-    }
-  }
-  for (size_t rr : {1, 3, 8, 100}) {
-    TestConfig config;
-    config.jparams.restart_in_rows = rr;
-    config.max_bpp = 1.6;
-    config.max_dist = 2.2;
-    all_tests.push_back(config);
-  }
-  for (int type : {0, 1, 10, 100, 10000}) {
-    for (int scale : {1, 50, 100, 200, 500}) {
-      for (bool add_raw : {false, true}) {
-        for (bool baseline : {true, false}) {
-          if (!baseline && (add_raw || type * scale < 25500)) continue;
-          TestConfig config;
-          config.input.xsize = 64;
-          config.input.ysize = 64;
-          CustomQuantTable table;
-          table.table_type = type;
-          table.scale_factor = scale;
-          table.force_baseline = baseline;
-          table.add_raw = add_raw;
-          table.Generate();
-          config.jparams.optimize_coding = 1;
-          config.jparams.h_sampling = {1, 1, 1};
-          config.jparams.v_sampling = {1, 1, 1};
-          config.jparams.quant_tables.push_back(table);
-          config.jparams.quant_indexes = {0, 0, 0};
-          float q = (type == 0 ? 16 : type) * scale * 0.01f;
-          if (baseline && !add_raw) q = std::max(1.0f, std::min(255.0f, q));
-          config.max_bpp = 1.5f + 25.0f / q;
-          config.max_dist = 0.6f + 0.25f * q;
-          all_tests.push_back(config);
-        }
-      }
-    }
-  }
-  for (int qidx = 0; qidx < 8; ++qidx) {
-    if (qidx == 3) continue;
-    TestConfig config;
-    config.input.xsize = 256;
-    config.input.ysize = 256;
-    config.jparams.quant_indexes = {(qidx >> 2) & 1, (qidx >> 1) & 1,
-                                    (qidx >> 0) & 1};
-    config.jparams.h_sampling = {1, 1, 1};
-    config.jparams.v_sampling = {1, 1, 1};
-    config.max_bpp = 2.25;
-    config.max_dist = 2.8;
-    all_tests.push_back(config);
-  }
-  for (int qidx = 0; qidx < 8; ++qidx) {
-    for (int slot_idx = 0; slot_idx < 2; ++slot_idx) {
-      if (qidx == 0 && slot_idx == 0) continue;
-      TestConfig config;
-      config.input.xsize = 256;
-      config.input.ysize = 256;
-      config.jparams.quant_indexes = {(qidx >> 2) & 1, (qidx >> 1) & 1,
-                                      (qidx >> 0) & 1};
-      config.jparams.h_sampling = {1, 1, 1};
-      config.jparams.v_sampling = {1, 1, 1};
-      CustomQuantTable table;
-      table.slot_idx = slot_idx;
-      table.Generate();
-      config.jparams.quant_tables.push_back(table);
-      config.max_bpp = 2.3;
-      config.max_dist = 2.9;
-      all_tests.push_back(config);
-    }
-  }
-  for (int qidx = 0; qidx < 8; ++qidx) {
-    for (bool xyb : {false, true}) {
-      TestConfig config;
-      config.input.xsize = 256;
-      config.input.ysize = 256;
-      config.jparams.xyb_mode = xyb;
-      config.jparams.quant_indexes = {(qidx >> 2) & 1, (qidx >> 1) & 1,
-                                      (qidx >> 0) & 1};
-      if (!xyb) {
-        config.jparams.h_sampling = {1, 1, 1};
-        config.jparams.v_sampling = {1, 1, 1};
-      }
-      {
-        CustomQuantTable table;
-        table.slot_idx = 0;
-        table.Generate();
-        config.jparams.quant_tables.push_back(table);
-      }
-      {
-        CustomQuantTable table;
-        table.slot_idx = 1;
-        table.table_type = 20;
-        table.Generate();
-        config.jparams.quant_tables.push_back(table);
-      }
-      config.max_bpp = 2.0;
-      config.max_dist = 3.85;
-      all_tests.push_back(config);
-    }
-  }
-  for (bool xyb : {false, true}) {
-    TestConfig config;
-    config.input.xsize = 256;
-    config.input.ysize = 256;
-    config.jparams.xyb_mode = xyb;
-    config.jparams.quant_indexes = {0, 1, 2};
-    if (!xyb) {
-      config.jparams.h_sampling = {1, 1, 1};
-      config.jparams.v_sampling = {1, 1, 1};
-    }
-    {
-      CustomQuantTable table;
-      table.slot_idx = 0;
-      table.Generate();
-      config.jparams.quant_tables.push_back(table);
-    }
-    {
-      CustomQuantTable table;
-      table.slot_idx = 1;
-      table.table_type = 20;
-      table.Generate();
-      config.jparams.quant_tables.push_back(table);
-    }
-    {
-      CustomQuantTable table;
-      table.slot_idx = 2;
-      table.table_type = 30;
-      table.Generate();
-      config.jparams.quant_tables.push_back(table);
-    }
-    config.max_bpp = 1.5;
-    config.max_dist = 3.75;
-    all_tests.push_back(config);
-  }
-  {
-    TestConfig config;
-    config.jparams.comp_ids = {7, 17, 177};
-    config.input.xsize = config.input.ysize = 128;
-    config.max_bpp = 2.25;
-    config.max_dist = 2.4;
-    all_tests.push_back(config);
-  }
-  for (int override_JFIF : {-1, 0, 1}) {
-    for (int override_Adobe : {-1, 0, 1}) {
-      if (override_JFIF == -1 && override_Adobe == -1) continue;
-      TestConfig config;
-      config.input.xsize = config.input.ysize = 128;
-      config.jparams.override_JFIF = override_JFIF;
-      config.jparams.override_Adobe = override_Adobe;
-      config.max_bpp = 2.25;
-      config.max_dist = 2.4;
-      all_tests.push_back(config);
-    }
-  }
-  {
-    TestConfig config;
-    config.input.xsize = config.input.ysize = 256;
-    config.max_bpp = 1.85;
-    config.max_dist = 2.05;
-    config.jparams.add_marker = true;
-    all_tests.push_back(config);
-  }
-  for (size_t icc_size : {728, 70000, 1000000}) {
-    TestConfig config;
-    config.input.xsize = config.input.ysize = 256;
-    config.max_dist = 2.05;
-    config.jparams.icc.resize(icc_size);
-    for (size_t i = 0; i < icc_size; ++i) {
-      config.jparams.icc[i] = (i * 17) & 0xff;
-    }
-    all_tests.push_back(config);
-  }
-  for (JpegIOMode input_mode : {PIXELS, RAW_DATA, COEFFICIENTS}) {
-    TestConfig config;
-    config.input.xsize = config.input.ysize = 256;
-    config.input_mode = input_mode;
-    if (input_mode == RAW_DATA) {
-      config.input.color_space = JCS_YCbCr;
-    }
-    config.jparams.progressive_mode = 0;
-    config.jparams.optimize_coding = 0;
-    config.jparams.h_sampling = {1, 1, 1};
-    config.jparams.v_sampling = {1, 1, 1};
-    config.max_bpp = 1.85;
-    config.max_dist = 2.05;
-    if (input_mode == COEFFICIENTS) {
-      config.max_bpp = 3.5;
-      config.max_dist = 0.0;
-    }
-    all_tests.push_back(config);
-    config.jparams.use_flat_dc_luma_code = true;
-    all_tests.push_back(config);
-  }
-  for (int xsize : {640, 641, 648, 649}) {
-    for (int ysize : {640, 641, 648, 649}) {
-      for (int h_sampling : {1, 2}) {
-        for (int v_sampling : {1, 2}) {
-          if (h_sampling == 1 && v_sampling == 1) continue;
-          for (int progr : {0, 2}) {
-            TestConfig config;
-            config.input.xsize = xsize;
-            config.input.ysize = ysize;
-            config.input.color_space = JCS_YCbCr;
-            config.jparams.h_sampling = {h_sampling, 1, 1};
-            config.jparams.v_sampling = {v_sampling, 1, 1};
-            config.jparams.progressive_mode = progr;
-            config.input_mode = RAW_DATA;
-            config.max_bpp = 1.75;
-            config.max_dist = 2.0;
-            all_tests.push_back(config);
-            config.input_mode = COEFFICIENTS;
-            if (xsize & 1) {
-              config.jparams.add_marker = true;
-            }
-            config.max_bpp = 24.0;
-            all_tests.push_back(config);
-          }
-        }
-      }
-    }
-  }
-  for (JpegliDataType data_type : {JPEGLI_TYPE_UINT16, JPEGLI_TYPE_FLOAT}) {
-    for (JpegliEndianness endianness :
-         {JPEGLI_LITTLE_ENDIAN, JPEGLI_BIG_ENDIAN, JPEGLI_NATIVE_ENDIAN}) {
-      J_COLOR_SPACE colorspace[4] = {JCS_GRAYSCALE, JCS_UNKNOWN, JCS_RGB,
-                                     JCS_CMYK};
-      float max_bpp[4] = {1.32, 2.7, 1.6, 4.0};
-      for (int channels = 1; channels <= 4; ++channels) {
-        TestConfig config;
-        config.input.data_type = data_type;
-        config.input.endianness = endianness;
-        config.input.components = channels;
-        config.input.color_space = colorspace[channels - 1];
-        config.max_bpp = max_bpp[channels - 1];
-        config.max_dist = 2.2;
-        all_tests.push_back(config);
-      }
-    }
-  }
-  for (int smoothing : {1, 5, 50, 100}) {
-    for (int h_sampling : {1, 2}) {
-      for (int v_sampling : {1, 2}) {
-        TestConfig config;
-        config.input.xsize = 257;
-        config.input.ysize = 265;
-        config.jparams.smoothing_factor = smoothing;
-        config.jparams.h_sampling = {h_sampling, 1, 1};
-        config.jparams.v_sampling = {v_sampling, 1, 1};
-        config.max_bpp = 1.85;
-        config.max_dist = 3.05f;
-        all_tests.push_back(config);
-      }
-    }
-  }
-  return all_tests;
-};
-
-std::ostream& operator<<(std::ostream& os, const TestConfig& c) {
-  os << c.input;
-  os << c.jparams;
-  if (c.input_mode == RAW_DATA) {
-    os << "RawDataIn";
-  } else if (c.input_mode == COEFFICIENTS) {
-    os << "WriteCoeffs";
-  }
-  return os;
-}
-
-std::string TestDescription(
-    const testing::TestParamInfo<EncodeAPITestParam::ParamType>& info) {
-  std::stringstream name;
-  name << info.param;
-  return name.str();
-}
-
-JPEGLI_INSTANTIATE_TEST_SUITE_P(EncodeAPITest, EncodeAPITestParam,
-                                testing::ValuesIn(GenerateTests()),
-                                TestDescription);
-}  // namespace
-}  // namespace jpegli
diff --git a/third_party/jpeg-xl/lib/jpegli/encode_finish.cc b/third_party/jpeg-xl/lib/jpegli/encode_finish.cc
deleted file mode 100644
index 8cc3b8d27503b..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/encode_finish.cc
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/encode_finish.h"
-
-#include <cmath>
-#include <limits>
-
-#include "lib/jpegli/error.h"
-#include "lib/jpegli/memory_manager.h"
-#include "lib/jpegli/quant.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jpegli/encode_finish.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jpegli/dct-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jpegli {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::GetLane;
-
-using D = HWY_FULL(float);
-using DI = HWY_FULL(int32_t);
-using DI16 = Rebind<int16_t, HWY_FULL(int32_t)>;
-
-void ReQuantizeBlock(int16_t* block, const float* qmc, float aq_strength,
-                     const float* zero_bias_offset,
-                     const float* zero_bias_mul) {
-  D d;
-  DI di;
-  DI16 di16;
-  const auto aq_mul = Set(d, aq_strength);
-  for (size_t k = 0; k < DCTSIZE2; k += Lanes(d)) {
-    const auto in = Load(di16, block + k);
-    const auto val = ConvertTo(d, PromoteTo(di, in));
-    const auto q = Load(d, qmc + k);
-    const auto qval = Mul(val, q);
-    const auto zb_offset = Load(d, zero_bias_offset + k);
-    const auto zb_mul = Load(d, zero_bias_mul + k);
-    const auto threshold = Add(zb_offset, Mul(zb_mul, aq_mul));
-    const auto nzero_mask = Ge(Abs(qval), threshold);
-    const auto iqval = IfThenElseZero(nzero_mask, Round(qval));
-    Store(DemoteTo(di16, ConvertTo(di, iqval)), di16, block + k);
-  }
-}
-
-float BlockError(const int16_t* block, const float* qmc, const float* iqmc,
-                 const float aq_strength, const float* zero_bias_offset,
-                 const float* zero_bias_mul) {
-  D d;
-  DI di;
-  DI16 di16;
-  auto err = Zero(d);
-  const auto scale = Set(d, 1.0 / 16);
-  const auto aq_mul = Set(d, aq_strength);
-  for (size_t k = 0; k < DCTSIZE2; k += Lanes(d)) {
-    const auto in = Load(di16, block + k);
-    const auto val = ConvertTo(d, PromoteTo(di, in));
-    const auto q = Load(d, qmc + k);
-    const auto qval = Mul(val, q);
-    const auto zb_offset = Load(d, zero_bias_offset + k);
-    const auto zb_mul = Load(d, zero_bias_mul + k);
-    const auto threshold = Add(zb_offset, Mul(zb_mul, aq_mul));
-    const auto nzero_mask = Ge(Abs(qval), threshold);
-    const auto iqval = IfThenElseZero(nzero_mask, Round(qval));
-    const auto invq = Load(d, iqmc + k);
-    const auto rval = Mul(iqval, invq);
-    const auto diff = Mul(Sub(val, rval), scale);
-    err = Add(err, Mul(diff, diff));
-  }
-  return GetLane(SumOfLanes(d, err));
-}
-
-void ComputeInverseWeights(const float* qmc, float* iqmc) {
-  for (int k = 0; k < 64; ++k) {
-    iqmc[k] = 1.0f / qmc[k];
-  }
-}
-
-float ComputePSNR(j_compress_ptr cinfo, int sampling) {
-  jpeg_comp_master* m = cinfo->master;
-  InitQuantizer(cinfo, QuantPass::SEARCH_SECOND_PASS);
-  double error = 0.0;
-  size_t num = 0;
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    jpeg_component_info* comp = &cinfo->comp_info[c];
-    const float* qmc = m->quant_mul[c];
-    const int h_factor = m->h_factor[c];
-    const int v_factor = m->v_factor[c];
-    const float* zero_bias_offset = m->zero_bias_offset[c];
-    const float* zero_bias_mul = m->zero_bias_mul[c];
-    HWY_ALIGN float iqmc[64];
-    ComputeInverseWeights(qmc, iqmc);
-    for (JDIMENSION by = 0; by < comp->height_in_blocks; by += sampling) {
-      JBLOCKARRAY blocks = GetBlockRow(cinfo, c, by);
-      const float* qf = m->quant_field.Row(by * v_factor);
-      for (JDIMENSION bx = 0; bx < comp->width_in_blocks; bx += sampling) {
-        error += BlockError(&blocks[0][bx][0], qmc, iqmc, qf[bx * h_factor],
-                            zero_bias_offset, zero_bias_mul);
-        num += DCTSIZE2;
-      }
-    }
-  }
-  return 4.3429448f * log(num / (error / 255. / 255.));
-}
-
-void ReQuantizeCoeffs(j_compress_ptr cinfo) {
-  jpeg_comp_master* m = cinfo->master;
-  InitQuantizer(cinfo, QuantPass::SEARCH_SECOND_PASS);
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    jpeg_component_info* comp = &cinfo->comp_info[c];
-    const float* qmc = m->quant_mul[c];
-    const int h_factor = m->h_factor[c];
-    const int v_factor = m->v_factor[c];
-    const float* zero_bias_offset = m->zero_bias_offset[c];
-    const float* zero_bias_mul = m->zero_bias_mul[c];
-    for (JDIMENSION by = 0; by < comp->height_in_blocks; ++by) {
-      JBLOCKARRAY block = GetBlockRow(cinfo, c, by);
-      const float* qf = m->quant_field.Row(by * v_factor);
-      for (JDIMENSION bx = 0; bx < comp->width_in_blocks; ++bx) {
-        ReQuantizeBlock(&block[0][bx][0], qmc, qf[bx * h_factor],
-                        zero_bias_offset, zero_bias_mul);
-      }
-    }
-  }
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jpegli
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jpegli {
-namespace {
-HWY_EXPORT(ComputePSNR);
-HWY_EXPORT(ReQuantizeCoeffs);
-
-void ReQuantizeCoeffs(j_compress_ptr cinfo) {
-  HWY_DYNAMIC_DISPATCH(ReQuantizeCoeffs)(cinfo);
-}
-
-float ComputePSNR(j_compress_ptr cinfo, int sampling) {
-  return HWY_DYNAMIC_DISPATCH(ComputePSNR)(cinfo, sampling);
-}
-
-void UpdateDistance(j_compress_ptr cinfo, float distance) {
-  float distances[NUM_QUANT_TBLS] = {distance, distance, distance};
-  SetQuantMatrices(cinfo, distances, /*add_two_chroma_tables=*/true);
-}
-
-float Clamp(float val, float minval, float maxval) {
-  return std::max(minval, std::min(maxval, val));
-}
-
-#define PSNR_SEARCH_DBG 0
-
-float FindDistanceForPSNR(j_compress_ptr cinfo) {
-  constexpr int kMaxIters = 20;
-  const float psnr_target = cinfo->master->psnr_target;
-  const float tolerance = cinfo->master->psnr_tolerance;
-  const float min_dist = cinfo->master->min_distance;
-  const float max_dist = cinfo->master->max_distance;
-  float d = Clamp(1.0f, min_dist, max_dist);
-  for (int sampling : {4, 1}) {
-    float best_diff = std::numeric_limits<float>::max();
-    float best_distance = 0.0f;
-    float best_psnr = 0.0;
-    float dmin = min_dist;
-    float dmax = max_dist;
-    bool found_lower_bound = false;
-    bool found_upper_bound = false;
-    for (int i = 0; i < kMaxIters; ++i) {
-      UpdateDistance(cinfo, d);
-      float psnr = ComputePSNR(cinfo, sampling);
-      if (psnr > psnr_target) {
-        dmin = d;
-        found_lower_bound = true;
-      } else {
-        dmax = d;
-        found_upper_bound = true;
-      }
-#if (PSNR_SEARCH_DBG > 1)
-      printf("sampling %d iter %2d d %7.4f psnr %.2f", sampling, i, d, psnr);
-      if (found_upper_bound && found_lower_bound) {
-        printf("    d-interval: [ %7.4f .. %7.4f ]", dmin, dmax);
-      }
-      printf("\n");
-#endif
-      float diff = std::abs(psnr - psnr_target);
-      if (diff < best_diff) {
-        best_diff = diff;
-        best_distance = d;
-        best_psnr = psnr;
-      }
-      if (diff < tolerance * psnr_target || dmin == dmax) {
-        break;
-      }
-      if (!found_lower_bound || !found_upper_bound) {
-        d *= std::exp(0.15f * (psnr - psnr_target));
-      } else {
-        d = 0.5f * (dmin + dmax);
-      }
-      d = Clamp(d, min_dist, max_dist);
-    }
-    d = best_distance;
-    if (sampling == 1 && PSNR_SEARCH_DBG) {
-      printf("Final PSNR %.2f at distance %.4f\n", best_psnr, d);
-    } else {
-      (void)best_psnr;
-    }
-  }
-  return d;
-}
-
-}  // namespace
-
-void QuantizetoPSNR(j_compress_ptr cinfo) {
-  float distance = FindDistanceForPSNR(cinfo);
-  UpdateDistance(cinfo, distance);
-  ReQuantizeCoeffs(cinfo);
-}
-
-}  // namespace jpegli
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jpegli/encode_finish.h b/third_party/jpeg-xl/lib/jpegli/encode_finish.h
deleted file mode 100644
index f6862decb9243..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/encode_finish.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_ENCODE_FINISH_H_
-#define LIB_JPEGLI_ENCODE_FINISH_H_
-
-#include "lib/jpegli/encode_internal.h"
-
-namespace jpegli {
-
-void QuantizetoPSNR(j_compress_ptr cinfo);
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_ENCODE_FINISH_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/encode_internal.h b/third_party/jpeg-xl/lib/jpegli/encode_internal.h
deleted file mode 100644
index 4dbef97538660..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/encode_internal.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_ENCODE_INTERNAL_H_
-#define LIB_JPEGLI_ENCODE_INTERNAL_H_
-
-#include <stdint.h>
-
-#include "lib/jpegli/bit_writer.h"
-#include "lib/jpegli/common.h"
-#include "lib/jpegli/common_internal.h"
-#include "lib/jpegli/encode.h"
-
-namespace jpegli {
-
-constexpr unsigned char kICCSignature[12] = {
-    0x49, 0x43, 0x43, 0x5F, 0x50, 0x52, 0x4F, 0x46, 0x49, 0x4C, 0x45, 0x00};
-constexpr int kICCMarker = JPEG_APP0 + 2;
-
-constexpr int kDefaultProgressiveLevel = 0;
-
-typedef int16_t coeff_t;
-
-struct HuffmanCodeTable {
-  int depth[256];
-  int code[256];
-};
-
-struct Token {
-  uint8_t context;
-  uint8_t symbol;
-  uint16_t bits;
-  Token(int c, int s, int b) : context(c), symbol(s), bits(b) {}
-};
-
-struct TokenArray {
-  Token* tokens;
-  size_t num_tokens;
-};
-
-struct RefToken {
-  uint8_t symbol;
-  uint8_t refbits;
-};
-
-struct ScanTokenInfo {
-  RefToken* tokens;
-  size_t num_tokens;
-  uint8_t* refbits;
-  uint16_t* eobruns;
-  size_t* restarts;
-  size_t num_restarts;
-  size_t num_nonzeros;
-  size_t num_future_nonzeros;
-  size_t token_offset;
-  size_t restart_interval;
-  size_t MCUs_per_row;
-  size_t MCU_rows_in_scan;
-  size_t blocks_in_MCU;
-  size_t num_blocks;
-};
-
-}  // namespace jpegli
-
-struct jpeg_comp_master {
-  jpegli::RowBuffer<float> input_buffer[jpegli::kMaxComponents];
-  jpegli::RowBuffer<float>* smooth_input[jpegli::kMaxComponents];
-  jpegli::RowBuffer<float>* raw_data[jpegli::kMaxComponents];
-  bool force_baseline;
-  bool xyb_mode;
-  uint8_t cicp_transfer_function;
-  bool use_std_tables;
-  bool use_adaptive_quantization;
-  int progressive_level;
-  size_t xsize_blocks;
-  size_t ysize_blocks;
-  size_t blocks_per_iMCU_row;
-  jpegli::ScanTokenInfo* scan_token_info;
-  JpegliDataType data_type;
-  JpegliEndianness endianness;
-  void (*input_method)(const uint8_t* row_in, size_t len,
-                       float* row_out[jpegli::kMaxComponents]);
-  void (*color_transform)(float* row[jpegli::kMaxComponents], size_t len);
-  void (*downsample_method[jpegli::kMaxComponents])(
-      float* rows_in[MAX_SAMP_FACTOR], size_t len, float* row_out);
-  float* quant_mul[jpegli::kMaxComponents];
-  float* zero_bias_offset[jpegli::kMaxComponents];
-  float* zero_bias_mul[jpegli::kMaxComponents];
-  int h_factor[jpegli::kMaxComponents];
-  int v_factor[jpegli::kMaxComponents];
-  // Array of Huffman tables that will be encoded in one or more DHT segments.
-  // In progressive mode we compute all Huffman tables that will be used in any
-  // of the scans, thus we can have more than 4 tables here.
-  JHUFF_TBL* huffman_tables;
-  size_t num_huffman_tables;
-  // Array of num_huffman_tables slot ids, where the ith element is the slot id
-  // of the ith Huffman table, as it appears in the DHT segment. The range of
-  // the slot ids is 0..3 for DC and 16..19 for AC Huffman codes.
-  uint8_t* slot_id_map;
-  // Maps context ids to an index in the huffman_tables array. Each component in
-  // each scan has a DC and AC context id, which are defined as follows:
-  //   - DC context id is the component index (relative to cinfo->comp_info) of
-  //     the scan component
-  //   - AC context ids start at 4 and are increased for each component of each
-  //     scan that have AC components (i.e. Se > 0)
-  uint8_t* context_map;
-  size_t num_contexts;
-  // Array of cinfo->num_scans context ids, where the ith element is the context
-  // id of the first AC component of the ith scan.
-  uint8_t* ac_ctx_offset;
-  // Array of num_huffman tables derived coding tables.
-  jpegli::HuffmanCodeTable* coding_tables;
-  float* diff_buffer;
-  jpegli::RowBuffer<float> fuzzy_erosion_tmp;
-  jpegli::RowBuffer<float> pre_erosion;
-  jpegli::RowBuffer<float> quant_field;
-  jvirt_barray_ptr* coeff_buffers;
-  size_t next_input_row;
-  size_t next_iMCU_row;
-  size_t next_dht_index;
-  size_t last_restart_interval;
-  JCOEF last_dc_coeff[MAX_COMPS_IN_SCAN];
-  jpegli::JpegBitWriter bw;
-  float* dct_buffer;
-  int32_t* block_tmp;
-  jpegli::TokenArray* token_arrays;
-  size_t cur_token_array;
-  jpegli::Token* next_token;
-  size_t num_tokens;
-  size_t total_num_tokens;
-  jpegli::RefToken* next_refinement_token;
-  uint8_t* next_refinement_bit;
-  float psnr_target;
-  float psnr_tolerance;
-  float min_distance;
-  float max_distance;
-};
-
-#endif  // LIB_JPEGLI_ENCODE_INTERNAL_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/encode_streaming.cc b/third_party/jpeg-xl/lib/jpegli/encode_streaming.cc
deleted file mode 100644
index ff43864a47bae..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/encode_streaming.cc
+++ /dev/null
@@ -1,259 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/encode_streaming.h"
-
-#include <cmath>
-
-#include "lib/jpegli/bit_writer.h"
-#include "lib/jpegli/bitstream.h"
-#include "lib/jpegli/entropy_coding.h"
-#include "lib/jpegli/error.h"
-#include "lib/jpegli/memory_manager.h"
-#include "lib/jxl/base/bits.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jpegli/encode_streaming.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jpegli/dct-inl.h"
-#include "lib/jpegli/entropy_coding-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jpegli {
-namespace HWY_NAMESPACE {
-
-static const int kStreamingModeCoefficients = 0;
-static const int kStreamingModeTokens = 1;
-static const int kStreamingModeBits = 2;
-
-namespace {
-void ZigZagShuffle(int32_t* JXL_RESTRICT block) {
-  // TODO(szabadka) SIMDify this.
-  int32_t tmp[DCTSIZE2];
-  tmp[0] = block[0];
-  tmp[1] = block[1];
-  tmp[2] = block[8];
-  tmp[3] = block[16];
-  tmp[4] = block[9];
-  tmp[5] = block[2];
-  tmp[6] = block[3];
-  tmp[7] = block[10];
-  tmp[8] = block[17];
-  tmp[9] = block[24];
-  tmp[10] = block[32];
-  tmp[11] = block[25];
-  tmp[12] = block[18];
-  tmp[13] = block[11];
-  tmp[14] = block[4];
-  tmp[15] = block[5];
-  tmp[16] = block[12];
-  tmp[17] = block[19];
-  tmp[18] = block[26];
-  tmp[19] = block[33];
-  tmp[20] = block[40];
-  tmp[21] = block[48];
-  tmp[22] = block[41];
-  tmp[23] = block[34];
-  tmp[24] = block[27];
-  tmp[25] = block[20];
-  tmp[26] = block[13];
-  tmp[27] = block[6];
-  tmp[28] = block[7];
-  tmp[29] = block[14];
-  tmp[30] = block[21];
-  tmp[31] = block[28];
-  tmp[32] = block[35];
-  tmp[33] = block[42];
-  tmp[34] = block[49];
-  tmp[35] = block[56];
-  tmp[36] = block[57];
-  tmp[37] = block[50];
-  tmp[38] = block[43];
-  tmp[39] = block[36];
-  tmp[40] = block[29];
-  tmp[41] = block[22];
-  tmp[42] = block[15];
-  tmp[43] = block[23];
-  tmp[44] = block[30];
-  tmp[45] = block[37];
-  tmp[46] = block[44];
-  tmp[47] = block[51];
-  tmp[48] = block[58];
-  tmp[49] = block[59];
-  tmp[50] = block[52];
-  tmp[51] = block[45];
-  tmp[52] = block[38];
-  tmp[53] = block[31];
-  tmp[54] = block[39];
-  tmp[55] = block[46];
-  tmp[56] = block[53];
-  tmp[57] = block[60];
-  tmp[58] = block[61];
-  tmp[59] = block[54];
-  tmp[60] = block[47];
-  tmp[61] = block[55];
-  tmp[62] = block[62];
-  tmp[63] = block[63];
-  memcpy(block, tmp, DCTSIZE2 * sizeof(tmp[0]));
-}
-}  // namespace
-
-template <int kMode>
-void ProcessiMCURow(j_compress_ptr cinfo) {
-  jpeg_comp_master* m = cinfo->master;
-  JpegBitWriter* bw = &m->bw;
-  int xsize_mcus = DivCeil(cinfo->image_width, 8 * cinfo->max_h_samp_factor);
-  int ysize_mcus = DivCeil(cinfo->image_height, 8 * cinfo->max_v_samp_factor);
-  int mcu_y = m->next_iMCU_row;
-  int32_t* block = m->block_tmp;
-  int32_t* symbols = m->block_tmp + DCTSIZE2;
-  int32_t* nonzero_idx = m->block_tmp + 3 * DCTSIZE2;
-  coeff_t* JXL_RESTRICT last_dc_coeff = m->last_dc_coeff;
-  bool adaptive_quant = m->use_adaptive_quantization && m->psnr_target == 0;
-  JBLOCKARRAY blocks[kMaxComponents];
-  if (kMode == kStreamingModeCoefficients) {
-    for (int c = 0; c < cinfo->num_components; ++c) {
-      jpeg_component_info* comp = &cinfo->comp_info[c];
-      int by0 = mcu_y * comp->v_samp_factor;
-      int block_rows_left = comp->height_in_blocks - by0;
-      int max_block_rows = std::min(comp->v_samp_factor, block_rows_left);
-      blocks[c] = (*cinfo->mem->access_virt_barray)(
-          reinterpret_cast<j_common_ptr>(cinfo), m->coeff_buffers[c], by0,
-          max_block_rows, true);
-    }
-  }
-  if (kMode == kStreamingModeTokens) {
-    TokenArray* ta = &m->token_arrays[m->cur_token_array];
-    int max_tokens_per_mcu_row = MaxNumTokensPerMCURow(cinfo);
-    if (ta->num_tokens + max_tokens_per_mcu_row > m->num_tokens) {
-      if (ta->tokens) {
-        m->total_num_tokens += ta->num_tokens;
-        ++m->cur_token_array;
-        ta = &m->token_arrays[m->cur_token_array];
-      }
-      m->num_tokens =
-          EstimateNumTokens(cinfo, mcu_y, ysize_mcus, m->total_num_tokens,
-                            max_tokens_per_mcu_row);
-      ta->tokens = Allocate<Token>(cinfo, m->num_tokens, JPOOL_IMAGE);
-      m->next_token = ta->tokens;
-    }
-  }
-  const float* imcu_start[kMaxComponents];
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    jpeg_component_info* comp = &cinfo->comp_info[c];
-    imcu_start[c] = m->raw_data[c]->Row(mcu_y * comp->v_samp_factor * DCTSIZE);
-  }
-  const float* qf = nullptr;
-  if (adaptive_quant) {
-    qf = m->quant_field.Row(0);
-  }
-  HuffmanCodeTable* dc_code = nullptr;
-  HuffmanCodeTable* ac_code = nullptr;
-  const size_t qf_stride = m->quant_field.stride();
-  for (int mcu_x = 0; mcu_x < xsize_mcus; ++mcu_x) {
-    for (int c = 0; c < cinfo->num_components; ++c) {
-      jpeg_component_info* comp = &cinfo->comp_info[c];
-      if (kMode == kStreamingModeBits) {
-        dc_code = &m->coding_tables[m->context_map[c]];
-        ac_code = &m->coding_tables[m->context_map[c + 4]];
-      }
-      float* JXL_RESTRICT qmc = m->quant_mul[c];
-      const size_t stride = m->raw_data[c]->stride();
-      const int h_factor = m->h_factor[c];
-      const float* zero_bias_offset = m->zero_bias_offset[c];
-      const float* zero_bias_mul = m->zero_bias_mul[c];
-      float aq_strength = 0.0f;
-      for (int iy = 0; iy < comp->v_samp_factor; ++iy) {
-        for (int ix = 0; ix < comp->h_samp_factor; ++ix) {
-          size_t by = mcu_y * comp->v_samp_factor + iy;
-          size_t bx = mcu_x * comp->h_samp_factor + ix;
-          if (bx >= comp->width_in_blocks || by >= comp->height_in_blocks) {
-            if (kMode == kStreamingModeTokens) {
-              *m->next_token++ = Token(c, 0, 0);
-              *m->next_token++ = Token(c + 4, 0, 0);
-            } else if (kMode == kStreamingModeBits) {
-              WriteBits(bw, dc_code->depth[0], dc_code->code[0]);
-              WriteBits(bw, ac_code->depth[0], ac_code->code[0]);
-            }
-            continue;
-          }
-          if (adaptive_quant) {
-            aq_strength = qf[iy * qf_stride + bx * h_factor];
-          }
-          const float* pixels = imcu_start[c] + (iy * stride + bx) * DCTSIZE;
-          ComputeCoefficientBlock(pixels, stride, qmc, last_dc_coeff[c],
-                                  aq_strength, zero_bias_offset, zero_bias_mul,
-                                  m->dct_buffer, block);
-          if (kMode == kStreamingModeCoefficients) {
-            JCOEF* cblock = &blocks[c][iy][bx][0];
-            for (int k = 0; k < DCTSIZE2; ++k) {
-              cblock[k] = block[kJPEGNaturalOrder[k]];
-            }
-          }
-          block[0] -= last_dc_coeff[c];
-          last_dc_coeff[c] += block[0];
-          if (kMode == kStreamingModeTokens) {
-            ComputeTokensForBlock<int32_t, false>(block, 0, c, c + 4,
-                                                  &m->next_token);
-          } else if (kMode == kStreamingModeBits) {
-            ZigZagShuffle(block);
-            const int num_nonzeros = CompactBlock(block, nonzero_idx);
-            const bool emit_eob = nonzero_idx[num_nonzeros - 1] < 1008;
-            ComputeSymbols(num_nonzeros, nonzero_idx, block, symbols);
-            WriteBlock(symbols, block, num_nonzeros, emit_eob, dc_code, ac_code,
-                       bw);
-          }
-        }
-      }
-    }
-  }
-  if (kMode == kStreamingModeTokens) {
-    TokenArray* ta = &m->token_arrays[m->cur_token_array];
-    ta->num_tokens = m->next_token - ta->tokens;
-    ScanTokenInfo* sti = &m->scan_token_info[0];
-    sti->num_tokens = m->total_num_tokens + ta->num_tokens;
-    sti->restarts[0] = sti->num_tokens;
-  }
-}
-
-void ComputeCoefficientsForiMCURow(j_compress_ptr cinfo) {
-  ProcessiMCURow<kStreamingModeCoefficients>(cinfo);
-}
-
-void ComputeTokensForiMCURow(j_compress_ptr cinfo) {
-  ProcessiMCURow<kStreamingModeTokens>(cinfo);
-}
-
-void WriteiMCURow(j_compress_ptr cinfo) {
-  ProcessiMCURow<kStreamingModeBits>(cinfo);
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jpegli
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jpegli {
-HWY_EXPORT(ComputeCoefficientsForiMCURow);
-HWY_EXPORT(ComputeTokensForiMCURow);
-HWY_EXPORT(WriteiMCURow);
-
-void ComputeCoefficientsForiMCURow(j_compress_ptr cinfo) {
-  HWY_DYNAMIC_DISPATCH(ComputeCoefficientsForiMCURow)(cinfo);
-}
-
-void ComputeTokensForiMCURow(j_compress_ptr cinfo) {
-  HWY_DYNAMIC_DISPATCH(ComputeTokensForiMCURow)(cinfo);
-}
-
-void WriteiMCURow(j_compress_ptr cinfo) {
-  HWY_DYNAMIC_DISPATCH(WriteiMCURow)(cinfo);
-}
-
-}  // namespace jpegli
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jpegli/encode_streaming.h b/third_party/jpeg-xl/lib/jpegli/encode_streaming.h
deleted file mode 100644
index 69acff4eaf2f2..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/encode_streaming.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_ENCODE_STREAMING_H_
-#define LIB_JPEGLI_ENCODE_STREAMING_H_
-
-#include "lib/jpegli/encode_internal.h"
-
-namespace jpegli {
-
-void ComputeCoefficientsForiMCURow(j_compress_ptr cinfo);
-
-void ComputeTokensForiMCURow(j_compress_ptr cinfo);
-
-void WriteiMCURow(j_compress_ptr cinfo);
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_ENCODE_STREAMING_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/entropy_coding-inl.h b/third_party/jpeg-xl/lib/jpegli/entropy_coding-inl.h
deleted file mode 100644
index bfb436d7954da..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/entropy_coding-inl.h
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#if defined(LIB_JPEGLI_ENTROPY_CODING_INL_H_) == defined(HWY_TARGET_TOGGLE)
-#ifdef LIB_JPEGLI_ENTROPY_CODING_INL_H_
-#undef LIB_JPEGLI_ENTROPY_CODING_INL_H_
-#else
-#define LIB_JPEGLI_ENTROPY_CODING_INL_H_
-#endif
-
-#include "lib/jxl/base/compiler_specific.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jpegli {
-namespace HWY_NAMESPACE {
-namespace {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Abs;
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::And;
-using hwy::HWY_NAMESPACE::AndNot;
-using hwy::HWY_NAMESPACE::Compress;
-using hwy::HWY_NAMESPACE::CountTrue;
-using hwy::HWY_NAMESPACE::Eq;
-using hwy::HWY_NAMESPACE::GetLane;
-using hwy::HWY_NAMESPACE::MaskFromVec;
-using hwy::HWY_NAMESPACE::Max;
-using hwy::HWY_NAMESPACE::Not;
-using hwy::HWY_NAMESPACE::Or;
-using hwy::HWY_NAMESPACE::ShiftRight;
-using hwy::HWY_NAMESPACE::Shl;
-using hwy::HWY_NAMESPACE::Sub;
-
-using DI = HWY_FULL(int32_t);
-constexpr DI di;
-
-template <typename DI, class V>
-JXL_INLINE V NumBits(DI di, const V x) {
-  // TODO(szabadka) Add faster implementations for some specific architectures.
-  const auto b1 = And(x, Set(di, 1));
-  const auto b2 = And(x, Set(di, 2));
-  const auto b3 = Sub((And(x, Set(di, 4))), Set(di, 1));
-  const auto b4 = Sub((And(x, Set(di, 8))), Set(di, 4));
-  const auto b5 = Sub((And(x, Set(di, 16))), Set(di, 11));
-  const auto b6 = Sub((And(x, Set(di, 32))), Set(di, 26));
-  const auto b7 = Sub((And(x, Set(di, 64))), Set(di, 57));
-  const auto b8 = Sub((And(x, Set(di, 128))), Set(di, 120));
-  const auto b9 = Sub((And(x, Set(di, 256))), Set(di, 247));
-  const auto b10 = Sub((And(x, Set(di, 512))), Set(di, 502));
-  const auto b11 = Sub((And(x, Set(di, 1024))), Set(di, 1013));
-  const auto b12 = Sub((And(x, Set(di, 2048))), Set(di, 2036));
-  return Max(Max(Max(Max(b1, b2), Max(b3, b4)), Max(Max(b5, b6), Max(b7, b8))),
-             Max(Max(b9, b10), Max(b11, b12)));
-}
-
-// Coefficient indexes pre-multiplied by 16 for the symbol calculation.
-HWY_ALIGN constexpr int32_t kIndexes[64] = {
-    0,   16,  32,  48,  64,  80,  96,  112, 128, 144, 160, 176,  192,
-    208, 224, 240, 256, 272, 288, 304, 320, 336, 352, 368, 384,  400,
-    416, 432, 448, 464, 480, 496, 512, 528, 544, 560, 576, 592,  608,
-    624, 640, 656, 672, 688, 704, 720, 736, 752, 768, 784, 800,  816,
-    832, 848, 864, 880, 896, 912, 928, 944, 960, 976, 992, 1008,
-};
-
-JXL_INLINE int CompactBlock(int32_t* JXL_RESTRICT block,
-                            int32_t* JXL_RESTRICT nonzero_idx) {
-  const auto zero = Zero(di);
-  HWY_ALIGN constexpr int32_t dc_mask_lanes[HWY_LANES(DI)] = {-1};
-  const auto dc_mask = MaskFromVec(Load(di, dc_mask_lanes));
-  int num_nonzeros = 0;
-  int k = 0;
-  {
-    const auto coef = Load(di, block);
-    const auto idx = Load(di, kIndexes);
-    const auto nonzero_mask = Or(dc_mask, Not(Eq(coef, zero)));
-    const auto nzero_coef = Compress(coef, nonzero_mask);
-    const auto nzero_idx = Compress(idx, nonzero_mask);
-    StoreU(nzero_coef, di, &block[num_nonzeros]);
-    StoreU(nzero_idx, di, &nonzero_idx[num_nonzeros]);
-    num_nonzeros += CountTrue(di, nonzero_mask);
-    k += Lanes(di);
-  }
-  for (; k < DCTSIZE2; k += Lanes(di)) {
-    const auto coef = Load(di, &block[k]);
-    const auto idx = Load(di, &kIndexes[k]);
-    const auto nonzero_mask = Not(Eq(coef, zero));
-    const auto nzero_coef = Compress(coef, nonzero_mask);
-    const auto nzero_idx = Compress(idx, nonzero_mask);
-    StoreU(nzero_coef, di, &block[num_nonzeros]);
-    StoreU(nzero_idx, di, &nonzero_idx[num_nonzeros]);
-    num_nonzeros += CountTrue(di, nonzero_mask);
-  }
-  return num_nonzeros;
-}
-
-JXL_INLINE void ComputeSymbols(const int num_nonzeros,
-                               int32_t* JXL_RESTRICT nonzero_idx,
-                               int32_t* JXL_RESTRICT block,
-                               int32_t* JXL_RESTRICT symbols) {
-  nonzero_idx[-1] = -16;
-  const auto one = Set(di, 1);
-  const auto offset = Set(di, 16);
-  for (int i = 0; i < num_nonzeros; i += Lanes(di)) {
-    const auto idx = Load(di, &nonzero_idx[i]);
-    const auto prev_idx = LoadU(di, &nonzero_idx[i - 1]);
-    const auto coeff = Load(di, &block[i]);
-    const auto nbits = NumBits(di, Abs(coeff));
-    const auto mask = ShiftRight<8 * sizeof(int32_t) - 1>(coeff);
-    const auto bits = And(Add(coeff, mask), Sub(Shl(one, nbits), one));
-    const auto symbol = Sub(Add(nbits, idx), Add(prev_idx, offset));
-    Store(symbol, di, symbols + i);
-    Store(bits, di, block + i);
-  }
-}
-
-template <typename T>
-int NumNonZero8x8ExceptDC(const T* block) {
-  const HWY_CAPPED(T, 8) di;
-
-  const auto zero = Zero(di);
-  // Add FFFF for every zero coefficient, negate to get #zeros.
-  auto neg_sum_zero = zero;
-  {
-    // First row has DC, so mask
-    const size_t y = 0;
-    HWY_ALIGN const T dc_mask_lanes[8] = {-1};
-
-    for (size_t x = 0; x < 8; x += Lanes(di)) {
-      const auto dc_mask = Load(di, dc_mask_lanes + x);
-
-      // DC counts as zero so we don't include it in nzeros.
-      const auto coef = AndNot(dc_mask, Load(di, &block[y * 8 + x]));
-
-      neg_sum_zero = Add(neg_sum_zero, VecFromMask(di, Eq(coef, zero)));
-    }
-  }
-  // Remaining rows: no mask
-  for (size_t y = 1; y < 8; y++) {
-    for (size_t x = 0; x < 8; x += Lanes(di)) {
-      const auto coef = Load(di, &block[y * 8 + x]);
-      neg_sum_zero = Add(neg_sum_zero, VecFromMask(di, Eq(coef, zero)));
-    }
-  }
-
-  // We want 64 - sum_zero, add because neg_sum_zero is already negated.
-  return kDCTBlockSize + GetLane(SumOfLanes(di, neg_sum_zero));
-}
-
-template <typename T, bool zig_zag_order>
-void ComputeTokensForBlock(const T* block, int last_dc, int dc_ctx, int ac_ctx,
-                           Token** tokens_ptr) {
-  Token* next_token = *tokens_ptr;
-  coeff_t temp2;
-  coeff_t temp;
-  temp = block[0] - last_dc;
-  if (temp == 0) {
-    *next_token++ = Token(dc_ctx, 0, 0);
-  } else {
-    temp2 = temp;
-    if (temp < 0) {
-      temp = -temp;
-      temp2--;
-    }
-    int dc_nbits = jxl::FloorLog2Nonzero<uint32_t>(temp) + 1;
-    int dc_mask = (1 << dc_nbits) - 1;
-    *next_token++ = Token(dc_ctx, dc_nbits, temp2 & dc_mask);
-  }
-  int num_nonzeros = NumNonZero8x8ExceptDC(block);
-  for (int k = 1; k < 64; ++k) {
-    if (num_nonzeros == 0) {
-      *next_token++ = Token(ac_ctx, 0, 0);
-      break;
-    }
-    int r = 0;
-    if (zig_zag_order) {
-      while ((temp = block[k]) == 0) {
-        r++;
-        k++;
-      }
-    } else {
-      while ((temp = block[kJPEGNaturalOrder[k]]) == 0) {
-        r++;
-        k++;
-      }
-    }
-    --num_nonzeros;
-    if (temp < 0) {
-      temp = -temp;
-      temp2 = ~temp;
-    } else {
-      temp2 = temp;
-    }
-    while (r > 15) {
-      *next_token++ = Token(ac_ctx, 0xf0, 0);
-      r -= 16;
-    }
-    int ac_nbits = jxl::FloorLog2Nonzero<uint32_t>(temp) + 1;
-    int ac_mask = (1 << ac_nbits) - 1;
-    int symbol = (r << 4u) + ac_nbits;
-    *next_token++ = Token(ac_ctx, symbol, temp2 & ac_mask);
-  }
-  *tokens_ptr = next_token;
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace
-}  // namespace HWY_NAMESPACE
-}  // namespace jpegli
-HWY_AFTER_NAMESPACE();
-#endif  // LIB_JPEGLI_ENTROPY_CODING_INL_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/entropy_coding.cc b/third_party/jpeg-xl/lib/jpegli/entropy_coding.cc
deleted file mode 100644
index d7d928099b1c2..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/entropy_coding.cc
+++ /dev/null
@@ -1,826 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/entropy_coding.h"
-
-#include <vector>
-
-#include "lib/jpegli/encode_internal.h"
-#include "lib/jpegli/error.h"
-#include "lib/jpegli/huffman.h"
-#include "lib/jxl/base/bits.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jpegli/entropy_coding.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jpegli/entropy_coding-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jpegli {
-namespace HWY_NAMESPACE {
-
-void ComputeTokensSequential(const coeff_t* block, int last_dc, int dc_ctx,
-                             int ac_ctx, Token** tokens_ptr) {
-  ComputeTokensForBlock<coeff_t, true>(block, last_dc, dc_ctx, ac_ctx,
-                                       tokens_ptr);
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jpegli
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jpegli {
-
-size_t MaxNumTokensPerMCURow(j_compress_ptr cinfo) {
-  int MCUs_per_row = DivCeil(cinfo->image_width, 8 * cinfo->max_h_samp_factor);
-  size_t blocks_per_mcu = 0;
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    jpeg_component_info* comp = &cinfo->comp_info[c];
-    blocks_per_mcu += comp->h_samp_factor * comp->v_samp_factor;
-  }
-  return kDCTBlockSize * blocks_per_mcu * MCUs_per_row;
-}
-
-size_t EstimateNumTokens(j_compress_ptr cinfo, size_t mcu_y, size_t ysize_mcus,
-                         size_t num_tokens, size_t max_per_row) {
-  size_t estimate;
-  if (mcu_y == 0) {
-    estimate = 16 * max_per_row;
-  } else {
-    estimate = (4 * ysize_mcus * num_tokens) / (3 * mcu_y);
-  }
-  size_t mcus_left = ysize_mcus - mcu_y;
-  return std::min(mcus_left * max_per_row,
-                  std::max(max_per_row, estimate - num_tokens));
-}
-
-namespace {
-HWY_EXPORT(ComputeTokensSequential);
-
-void TokenizeProgressiveDC(const coeff_t* coeffs, int context, int Al,
-                           coeff_t* last_dc_coeff, Token** next_token) {
-  coeff_t temp2;
-  coeff_t temp;
-  temp2 = coeffs[0] >> Al;
-  temp = temp2 - *last_dc_coeff;
-  *last_dc_coeff = temp2;
-  temp2 = temp;
-  if (temp < 0) {
-    temp = -temp;
-    temp2--;
-  }
-  int nbits = (temp == 0) ? 0 : (jxl::FloorLog2Nonzero<uint32_t>(temp) + 1);
-  int bits = temp2 & ((1 << nbits) - 1);
-  *(*next_token)++ = Token(context, nbits, bits);
-}
-
-void TokenizeACProgressiveScan(j_compress_ptr cinfo, int scan_index,
-                               int context, ScanTokenInfo* sti) {
-  jpeg_comp_master* m = cinfo->master;
-  const jpeg_scan_info* scan_info = &cinfo->scan_info[scan_index];
-  const int comp_idx = scan_info->component_index[0];
-  const jpeg_component_info* comp = &cinfo->comp_info[comp_idx];
-  const int Al = scan_info->Al;
-  const int Ss = scan_info->Ss;
-  const int Se = scan_info->Se;
-  const size_t restart_interval = sti->restart_interval;
-  int restarts_to_go = restart_interval;
-  size_t num_blocks = comp->height_in_blocks * comp->width_in_blocks;
-  size_t num_restarts =
-      restart_interval > 0 ? DivCeil(num_blocks, restart_interval) : 1;
-  size_t restart_idx = 0;
-  int eob_run = 0;
-  TokenArray* ta = &m->token_arrays[m->cur_token_array];
-  sti->token_offset = m->total_num_tokens + ta->num_tokens;
-  sti->restarts = Allocate<size_t>(cinfo, num_restarts, JPOOL_IMAGE);
-  const auto emit_eob_run = [&]() {
-    int nbits = jxl::FloorLog2Nonzero<uint32_t>(eob_run);
-    int symbol = nbits << 4u;
-    *m->next_token++ = Token(context, symbol, eob_run & ((1 << nbits) - 1));
-    eob_run = 0;
-  };
-  for (JDIMENSION by = 0; by < comp->height_in_blocks; ++by) {
-    JBLOCKARRAY blocks = (*cinfo->mem->access_virt_barray)(
-        reinterpret_cast<j_common_ptr>(cinfo), m->coeff_buffers[comp_idx], by,
-        1, FALSE);
-    // Each coefficient can appear in at most one token, but we have to reserve
-    // one extra EOBrun token that was rolled over from the previous block-row
-    // and has to be flushed at the end.
-    int max_tokens_per_row = 1 + comp->width_in_blocks * (Se - Ss + 1);
-    if (ta->num_tokens + max_tokens_per_row > m->num_tokens) {
-      if (ta->tokens) {
-        m->total_num_tokens += ta->num_tokens;
-        ++m->cur_token_array;
-        ta = &m->token_arrays[m->cur_token_array];
-      }
-      m->num_tokens =
-          EstimateNumTokens(cinfo, by, comp->height_in_blocks,
-                            m->total_num_tokens, max_tokens_per_row);
-      ta->tokens = Allocate<Token>(cinfo, m->num_tokens, JPOOL_IMAGE);
-      m->next_token = ta->tokens;
-    }
-    for (JDIMENSION bx = 0; bx < comp->width_in_blocks; ++bx) {
-      if (restart_interval > 0 && restarts_to_go == 0) {
-        if (eob_run > 0) emit_eob_run();
-        ta->num_tokens = m->next_token - ta->tokens;
-        sti->restarts[restart_idx++] = m->total_num_tokens + ta->num_tokens;
-        restarts_to_go = restart_interval;
-      }
-      const coeff_t* block = &blocks[0][bx][0];
-      coeff_t temp2;
-      coeff_t temp;
-      int r = 0;
-      int num_nzeros = 0;
-      int num_future_nzeros = 0;
-      for (int k = Ss; k <= Se; ++k) {
-        temp = block[k];
-        if (temp == 0) {
-          r++;
-          continue;
-        }
-        if (temp < 0) {
-          temp = -temp;
-          temp >>= Al;
-          temp2 = ~temp;
-        } else {
-          temp >>= Al;
-          temp2 = temp;
-        }
-        if (temp == 0) {
-          r++;
-          num_future_nzeros++;
-          continue;
-        }
-        if (eob_run > 0) emit_eob_run();
-        while (r > 15) {
-          *m->next_token++ = Token(context, 0xf0, 0);
-          r -= 16;
-        }
-        int nbits = jxl::FloorLog2Nonzero<uint32_t>(temp) + 1;
-        int symbol = (r << 4u) + nbits;
-        *m->next_token++ = Token(context, symbol, temp2 & ((1 << nbits) - 1));
-        ++num_nzeros;
-        r = 0;
-      }
-      if (r > 0) {
-        ++eob_run;
-        if (eob_run == 0x7FFF) emit_eob_run();
-      }
-      sti->num_nonzeros += num_nzeros;
-      sti->num_future_nonzeros += num_future_nzeros;
-      --restarts_to_go;
-    }
-    ta->num_tokens = m->next_token - ta->tokens;
-  }
-  if (eob_run > 0) {
-    emit_eob_run();
-    ++ta->num_tokens;
-  }
-  sti->num_tokens = m->total_num_tokens + ta->num_tokens - sti->token_offset;
-  sti->restarts[restart_idx++] = m->total_num_tokens + ta->num_tokens;
-}
-
-void TokenizeACRefinementScan(j_compress_ptr cinfo, int scan_index,
-                              ScanTokenInfo* sti) {
-  jpeg_comp_master* m = cinfo->master;
-  const jpeg_scan_info* scan_info = &cinfo->scan_info[scan_index];
-  const int comp_idx = scan_info->component_index[0];
-  const jpeg_component_info* comp = &cinfo->comp_info[comp_idx];
-  const int Al = scan_info->Al;
-  const int Ss = scan_info->Ss;
-  const int Se = scan_info->Se;
-  const size_t restart_interval = sti->restart_interval;
-  int restarts_to_go = restart_interval;
-  RefToken token;
-  int eob_run = 0;
-  int eob_refbits = 0;
-  size_t num_blocks = comp->height_in_blocks * comp->width_in_blocks;
-  size_t num_restarts =
-      restart_interval > 0 ? DivCeil(num_blocks, restart_interval) : 1;
-  sti->tokens = m->next_refinement_token;
-  sti->refbits = m->next_refinement_bit;
-  sti->eobruns = Allocate<uint16_t>(cinfo, num_blocks / 2, JPOOL_IMAGE);
-  sti->restarts = Allocate<size_t>(cinfo, num_restarts, JPOOL_IMAGE);
-  RefToken* next_token = sti->tokens;
-  RefToken* next_eob_token = next_token;
-  uint8_t* next_ref_bit = sti->refbits;
-  uint16_t* next_eobrun = sti->eobruns;
-  size_t restart_idx = 0;
-  for (JDIMENSION by = 0; by < comp->height_in_blocks; ++by) {
-    JBLOCKARRAY blocks = (*cinfo->mem->access_virt_barray)(
-        reinterpret_cast<j_common_ptr>(cinfo), m->coeff_buffers[comp_idx], by,
-        1, FALSE);
-    for (JDIMENSION bx = 0; bx < comp->width_in_blocks; ++bx) {
-      if (restart_interval > 0 && restarts_to_go == 0) {
-        sti->restarts[restart_idx++] = next_token - sti->tokens;
-        restarts_to_go = restart_interval;
-        next_eob_token = next_token;
-        eob_run = eob_refbits = 0;
-      }
-      const coeff_t* block = &blocks[0][bx][0];
-      int num_eob_refinement_bits = 0;
-      int num_refinement_bits = 0;
-      int num_nzeros = 0;
-      int r = 0;
-      for (int k = Ss; k <= Se; ++k) {
-        int absval = block[k];
-        if (absval == 0) {
-          r++;
-          continue;
-        }
-        const int mask = absval >> (8 * sizeof(int) - 1);
-        absval += mask;
-        absval ^= mask;
-        absval >>= Al;
-        if (absval == 0) {
-          r++;
-          continue;
-        }
-        while (r > 15) {
-          token.symbol = 0xf0;
-          token.refbits = num_refinement_bits;
-          *next_token++ = token;
-          r -= 16;
-          num_eob_refinement_bits += num_refinement_bits;
-          num_refinement_bits = 0;
-        }
-        if (absval > 1) {
-          *next_ref_bit++ = absval & 1u;
-          ++num_refinement_bits;
-          continue;
-        }
-        int symbol = (r << 4u) + 1 + ((mask + 1) << 1);
-        token.symbol = symbol;
-        token.refbits = num_refinement_bits;
-        *next_token++ = token;
-        ++num_nzeros;
-        num_refinement_bits = 0;
-        num_eob_refinement_bits = 0;
-        r = 0;
-        next_eob_token = next_token;
-        eob_run = eob_refbits = 0;
-      }
-      if (r > 0 || num_eob_refinement_bits + num_refinement_bits > 0) {
-        ++eob_run;
-        eob_refbits += num_eob_refinement_bits + num_refinement_bits;
-        if (eob_refbits > 255) {
-          ++next_eob_token;
-          eob_refbits = num_eob_refinement_bits + num_refinement_bits;
-          eob_run = 1;
-        }
-        next_token = next_eob_token;
-        next_token->refbits = eob_refbits;
-        if (eob_run == 1) {
-          next_token->symbol = 0;
-        } else if (eob_run == 2) {
-          next_token->symbol = 16;
-          *next_eobrun++ = 0;
-        } else if ((eob_run & (eob_run - 1)) == 0) {
-          next_token->symbol += 16;
-          next_eobrun[-1] = 0;
-        } else {
-          ++next_eobrun[-1];
-        }
-        ++next_token;
-        if (eob_run == 0x7fff) {
-          next_eob_token = next_token;
-          eob_run = eob_refbits = 0;
-        }
-      }
-      sti->num_nonzeros += num_nzeros;
-      --restarts_to_go;
-    }
-  }
-  sti->num_tokens = next_token - sti->tokens;
-  sti->restarts[restart_idx++] = sti->num_tokens;
-  m->next_refinement_token = next_token;
-  m->next_refinement_bit = next_ref_bit;
-}
-
-void TokenizeScan(j_compress_ptr cinfo, size_t scan_index, int ac_ctx_offset,
-                  ScanTokenInfo* sti) {
-  const jpeg_scan_info* scan_info = &cinfo->scan_info[scan_index];
-  if (scan_info->Ss > 0) {
-    if (scan_info->Ah == 0) {
-      TokenizeACProgressiveScan(cinfo, scan_index, ac_ctx_offset, sti);
-    } else {
-      TokenizeACRefinementScan(cinfo, scan_index, sti);
-    }
-    return;
-  }
-
-  jpeg_comp_master* m = cinfo->master;
-  size_t restart_interval = sti->restart_interval;
-  int restarts_to_go = restart_interval;
-  coeff_t last_dc_coeff[MAX_COMPS_IN_SCAN] = {0};
-
-  // "Non-interleaved" means color data comes in separate scans, in other words
-  // each scan can contain only one color component.
-  const bool is_interleaved = (scan_info->comps_in_scan > 1);
-  const bool is_progressive = FROM_JXL_BOOL(cinfo->progressive_mode);
-  const int Ah = scan_info->Ah;
-  const int Al = scan_info->Al;
-  HWY_ALIGN constexpr coeff_t kSinkBlock[DCTSIZE2] = {0};
-
-  size_t restart_idx = 0;
-  TokenArray* ta = &m->token_arrays[m->cur_token_array];
-  sti->token_offset = Ah > 0 ? 0 : m->total_num_tokens + ta->num_tokens;
-
-  if (Ah > 0) {
-    sti->refbits = Allocate<uint8_t>(cinfo, sti->num_blocks, JPOOL_IMAGE);
-  } else if (cinfo->progressive_mode) {
-    if (ta->num_tokens + sti->num_blocks > m->num_tokens) {
-      if (ta->tokens) {
-        m->total_num_tokens += ta->num_tokens;
-        ++m->cur_token_array;
-        ta = &m->token_arrays[m->cur_token_array];
-      }
-      m->num_tokens = sti->num_blocks;
-      ta->tokens = Allocate<Token>(cinfo, m->num_tokens, JPOOL_IMAGE);
-      m->next_token = ta->tokens;
-    }
-  }
-
-  JBLOCKARRAY blocks[MAX_COMPS_IN_SCAN];
-  size_t block_idx = 0;
-  for (size_t mcu_y = 0; mcu_y < sti->MCU_rows_in_scan; ++mcu_y) {
-    for (int i = 0; i < scan_info->comps_in_scan; ++i) {
-      int comp_idx = scan_info->component_index[i];
-      jpeg_component_info* comp = &cinfo->comp_info[comp_idx];
-      int n_blocks_y = is_interleaved ? comp->v_samp_factor : 1;
-      int by0 = mcu_y * n_blocks_y;
-      int block_rows_left = comp->height_in_blocks - by0;
-      int max_block_rows = std::min(n_blocks_y, block_rows_left);
-      blocks[i] = (*cinfo->mem->access_virt_barray)(
-          reinterpret_cast<j_common_ptr>(cinfo), m->coeff_buffers[comp_idx],
-          by0, max_block_rows, FALSE);
-    }
-    if (!cinfo->progressive_mode) {
-      int max_tokens_per_mcu_row = MaxNumTokensPerMCURow(cinfo);
-      if (ta->num_tokens + max_tokens_per_mcu_row > m->num_tokens) {
-        if (ta->tokens) {
-          m->total_num_tokens += ta->num_tokens;
-          ++m->cur_token_array;
-          ta = &m->token_arrays[m->cur_token_array];
-        }
-        m->num_tokens =
-            EstimateNumTokens(cinfo, mcu_y, sti->MCU_rows_in_scan,
-                              m->total_num_tokens, max_tokens_per_mcu_row);
-        ta->tokens = Allocate<Token>(cinfo, m->num_tokens, JPOOL_IMAGE);
-        m->next_token = ta->tokens;
-      }
-    }
-    for (size_t mcu_x = 0; mcu_x < sti->MCUs_per_row; ++mcu_x) {
-      // Possibly emit a restart marker.
-      if (restart_interval > 0 && restarts_to_go == 0) {
-        restarts_to_go = restart_interval;
-        memset(last_dc_coeff, 0, sizeof(last_dc_coeff));
-        ta->num_tokens = m->next_token - ta->tokens;
-        sti->restarts[restart_idx++] =
-            Ah > 0 ? block_idx : m->total_num_tokens + ta->num_tokens;
-      }
-      // Encode one MCU
-      for (int i = 0; i < scan_info->comps_in_scan; ++i) {
-        int comp_idx = scan_info->component_index[i];
-        jpeg_component_info* comp = &cinfo->comp_info[comp_idx];
-        int n_blocks_y = is_interleaved ? comp->v_samp_factor : 1;
-        int n_blocks_x = is_interleaved ? comp->h_samp_factor : 1;
-        for (int iy = 0; iy < n_blocks_y; ++iy) {
-          for (int ix = 0; ix < n_blocks_x; ++ix) {
-            size_t block_y = mcu_y * n_blocks_y + iy;
-            size_t block_x = mcu_x * n_blocks_x + ix;
-            const coeff_t* block;
-            if (block_x >= comp->width_in_blocks ||
-                block_y >= comp->height_in_blocks) {
-              block = kSinkBlock;
-            } else {
-              block = &blocks[i][iy][block_x][0];
-            }
-            if (!is_progressive) {
-              HWY_DYNAMIC_DISPATCH(ComputeTokensSequential)
-              (block, last_dc_coeff[i], comp_idx, ac_ctx_offset + i,
-               &m->next_token);
-              last_dc_coeff[i] = block[0];
-            } else {
-              if (Ah == 0) {
-                TokenizeProgressiveDC(block, comp_idx, Al, last_dc_coeff + i,
-                                      &m->next_token);
-              } else {
-                sti->refbits[block_idx] = (block[0] >> Al) & 1;
-              }
-            }
-            ++block_idx;
-          }
-        }
-      }
-      --restarts_to_go;
-    }
-    ta->num_tokens = m->next_token - ta->tokens;
-  }
-  JXL_DASSERT(block_idx == sti->num_blocks);
-  sti->num_tokens =
-      Ah > 0 ? sti->num_blocks
-             : m->total_num_tokens + ta->num_tokens - sti->token_offset;
-  sti->restarts[restart_idx++] =
-      Ah > 0 ? sti->num_blocks : m->total_num_tokens + ta->num_tokens;
-  if (Ah == 0 && cinfo->progressive_mode) {
-    JXL_DASSERT(sti->num_blocks == sti->num_tokens);
-  }
-}
-
-}  // namespace
-
-void TokenizeJpeg(j_compress_ptr cinfo) {
-  jpeg_comp_master* m = cinfo->master;
-  std::vector<int> processed(cinfo->num_scans);
-  size_t max_refinement_tokens = 0;
-  size_t num_refinement_bits = 0;
-  int num_refinement_scans[kMaxComponents][DCTSIZE2] = {};
-  int max_num_refinement_scans = 0;
-  for (int i = 0; i < cinfo->num_scans; ++i) {
-    const jpeg_scan_info* si = &cinfo->scan_info[i];
-    ScanTokenInfo* sti = &m->scan_token_info[i];
-    if (si->Ss > 0 && si->Ah == 0 && si->Al > 0) {
-      int offset = m->ac_ctx_offset[i];
-      int comp_idx = si->component_index[0];
-      TokenizeScan(cinfo, i, offset, sti);
-      processed[i] = 1;
-      max_refinement_tokens += sti->num_future_nonzeros;
-      for (int k = si->Ss; k <= si->Se; ++k) {
-        num_refinement_scans[comp_idx][k] = si->Al;
-      }
-      max_num_refinement_scans = std::max(max_num_refinement_scans, si->Al);
-      num_refinement_bits += sti->num_nonzeros;
-    }
-    if (si->Ss > 0 && si->Ah > 0) {
-      int comp_idx = si->component_index[0];
-      const jpeg_component_info* comp = &cinfo->comp_info[comp_idx];
-      size_t num_blocks = comp->width_in_blocks * comp->height_in_blocks;
-      max_refinement_tokens += (1 + (si->Se - si->Ss) / 16) * num_blocks;
-    }
-  }
-  if (max_refinement_tokens > 0) {
-    m->next_refinement_token =
-        Allocate<RefToken>(cinfo, max_refinement_tokens, JPOOL_IMAGE);
-  }
-  for (int j = 0; j < max_num_refinement_scans; ++j) {
-    uint8_t* refinement_bits =
-        Allocate<uint8_t>(cinfo, num_refinement_bits, JPOOL_IMAGE);
-    m->next_refinement_bit = refinement_bits;
-    size_t new_refinement_bits = 0;
-    for (int i = 0; i < cinfo->num_scans; ++i) {
-      const jpeg_scan_info* si = &cinfo->scan_info[i];
-      int comp_idx = si->component_index[0];
-      ScanTokenInfo* sti = &m->scan_token_info[i];
-      if (si->Ss > 0 && si->Ah > 0 &&
-          si->Ah == num_refinement_scans[comp_idx][si->Ss] - j) {
-        int offset = m->ac_ctx_offset[i];
-        TokenizeScan(cinfo, i, offset, sti);
-        processed[i] = 1;
-        new_refinement_bits += sti->num_nonzeros;
-      }
-    }
-    JXL_DASSERT(m->next_refinement_bit <=
-                refinement_bits + num_refinement_bits);
-    num_refinement_bits += new_refinement_bits;
-  }
-  for (int i = 0; i < cinfo->num_scans; ++i) {
-    if (processed[i]) {
-      continue;
-    }
-    int offset = m->ac_ctx_offset[i];
-    TokenizeScan(cinfo, i, offset, &m->scan_token_info[i]);
-    processed[i] = 1;
-  }
-}
-
-namespace {
-
-struct Histogram {
-  int count[kJpegHuffmanAlphabetSize];
-  Histogram() { memset(count, 0, sizeof(count)); }
-};
-
-void BuildHistograms(j_compress_ptr cinfo, Histogram* histograms) {
-  jpeg_comp_master* m = cinfo->master;
-  size_t num_token_arrays = m->cur_token_array + 1;
-  for (size_t i = 0; i < num_token_arrays; ++i) {
-    Token* tokens = m->token_arrays[i].tokens;
-    size_t num_tokens = m->token_arrays[i].num_tokens;
-    for (size_t j = 0; j < num_tokens; ++j) {
-      Token t = tokens[j];
-      ++histograms[t.context].count[t.symbol];
-    }
-  }
-  for (int i = 0; i < cinfo->num_scans; ++i) {
-    const jpeg_scan_info& si = cinfo->scan_info[i];
-    const ScanTokenInfo& sti = m->scan_token_info[i];
-    if (si.Ss > 0 && si.Ah > 0) {
-      int context = m->ac_ctx_offset[i];
-      int* ac_histo = &histograms[context].count[0];
-      for (size_t j = 0; j < sti.num_tokens; ++j) {
-        ++ac_histo[sti.tokens[j].symbol & 253];
-      }
-    }
-  }
-}
-
-struct JpegClusteredHistograms {
-  std::vector<Histogram> histograms;
-  std::vector<uint32_t> histogram_indexes;
-  std::vector<uint32_t> slot_ids;
-};
-
-float HistogramCost(const Histogram& histo) {
-  std::vector<uint32_t> counts(kJpegHuffmanAlphabetSize + 1);
-  std::vector<uint8_t> depths(kJpegHuffmanAlphabetSize + 1);
-  for (size_t i = 0; i < kJpegHuffmanAlphabetSize; ++i) {
-    counts[i] = histo.count[i];
-  }
-  counts[kJpegHuffmanAlphabetSize] = 1;
-  CreateHuffmanTree(counts.data(), counts.size(), kJpegHuffmanMaxBitLength,
-                    depths.data());
-  size_t header_bits = (1 + kJpegHuffmanMaxBitLength) * 8;
-  size_t data_bits = 0;
-  for (size_t i = 0; i < kJpegHuffmanAlphabetSize; ++i) {
-    if (depths[i] > 0) {
-      header_bits += 8;
-      data_bits += counts[i] * depths[i];
-    }
-  }
-  return header_bits + data_bits;
-}
-
-void AddHistograms(const Histogram& a, const Histogram& b, Histogram* c) {
-  for (size_t i = 0; i < kJpegHuffmanAlphabetSize; ++i) {
-    c->count[i] = a.count[i] + b.count[i];
-  }
-}
-
-bool IsEmptyHistogram(const Histogram& histo) {
-  for (int count : histo.count) {
-    if (count) return false;
-  }
-  return true;
-}
-
-void ClusterJpegHistograms(j_compress_ptr cinfo, const Histogram* histograms,
-                           size_t num, JpegClusteredHistograms* clusters) {
-  clusters->histogram_indexes.resize(num);
-  std::vector<uint32_t> slot_histograms;
-  std::vector<float> slot_costs;
-  for (size_t i = 0; i < num; ++i) {
-    const Histogram& cur = histograms[i];
-    if (IsEmptyHistogram(cur)) {
-      continue;
-    }
-    float best_cost = HistogramCost(cur);
-    size_t best_slot = slot_histograms.size();
-    for (size_t j = 0; j < slot_histograms.size(); ++j) {
-      size_t prev_idx = slot_histograms[j];
-      const Histogram& prev = clusters->histograms[prev_idx];
-      Histogram combined;
-      AddHistograms(prev, cur, &combined);
-      float combined_cost = HistogramCost(combined);
-      float cost = combined_cost - slot_costs[j];
-      if (cost < best_cost) {
-        best_cost = cost;
-        best_slot = j;
-      }
-    }
-    if (best_slot == slot_histograms.size()) {
-      // Create new histogram.
-      size_t histogram_index = clusters->histograms.size();
-      clusters->histograms.push_back(cur);
-      clusters->histogram_indexes[i] = histogram_index;
-      if (best_slot < 4) {
-        // We have a free slot, so we put the new histogram there.
-        slot_histograms.push_back(histogram_index);
-        slot_costs.push_back(best_cost);
-      } else {
-        // TODO(szabadka) Find the best histogram to replce.
-        best_slot = (clusters->slot_ids.back() + 1) % 4;
-      }
-      slot_histograms[best_slot] = histogram_index;
-      slot_costs[best_slot] = best_cost;
-      clusters->slot_ids.push_back(best_slot);
-    } else {
-      // Merge this histogram with a previous one.
-      size_t histogram_index = slot_histograms[best_slot];
-      const Histogram& prev = clusters->histograms[histogram_index];
-      AddHistograms(prev, cur, &clusters->histograms[histogram_index]);
-      clusters->histogram_indexes[i] = histogram_index;
-      JPEGLI_CHECK(clusters->slot_ids[histogram_index] == best_slot);
-      slot_costs[best_slot] += best_cost;
-    }
-  }
-}
-
-void CopyHuffmanTable(j_compress_ptr cinfo, int index, bool is_dc,
-                      int* inv_slot_map, uint8_t* slot_id_map,
-                      JHUFF_TBL* huffman_tables, size_t* num_huffman_tables) {
-  const char* type = is_dc ? "DC" : "AC";
-  if (index < 0 || index >= NUM_HUFF_TBLS) {
-    JPEGLI_ERROR("Invalid %s Huffman table index %d", type, index);
-  }
-  // Check if we have already copied this Huffman table.
-  int slot_idx = index + (is_dc ? 0 : NUM_HUFF_TBLS);
-  if (inv_slot_map[slot_idx] != -1) {
-    return;
-  }
-  inv_slot_map[slot_idx] = *num_huffman_tables;
-  // Look up and validate Huffman table.
-  JHUFF_TBL* table =
-      is_dc ? cinfo->dc_huff_tbl_ptrs[index] : cinfo->ac_huff_tbl_ptrs[index];
-  if (table == nullptr) {
-    JPEGLI_ERROR("Missing %s Huffman table %d", type, index);
-  }
-  ValidateHuffmanTable(reinterpret_cast<j_common_ptr>(cinfo), table, is_dc);
-  // Copy Huffman table to the end of the list and save slot id.
-  slot_id_map[*num_huffman_tables] = index + (is_dc ? 0 : 0x10);
-  memcpy(&huffman_tables[*num_huffman_tables], table, sizeof(JHUFF_TBL));
-  ++(*num_huffman_tables);
-}
-
-void BuildJpegHuffmanTable(const Histogram& histo, JHUFF_TBL* table) {
-  std::vector<uint32_t> counts(kJpegHuffmanAlphabetSize + 1);
-  std::vector<uint8_t> depths(kJpegHuffmanAlphabetSize + 1);
-  for (size_t j = 0; j < kJpegHuffmanAlphabetSize; ++j) {
-    counts[j] = histo.count[j];
-  }
-  counts[kJpegHuffmanAlphabetSize] = 1;
-  CreateHuffmanTree(counts.data(), counts.size(), kJpegHuffmanMaxBitLength,
-                    depths.data());
-  memset(table, 0, sizeof(JHUFF_TBL));
-  for (size_t i = 0; i < kJpegHuffmanAlphabetSize; ++i) {
-    if (depths[i] > 0) {
-      ++table->bits[depths[i]];
-    }
-  }
-  int offset[kJpegHuffmanMaxBitLength + 1] = {0};
-  for (size_t i = 1; i <= kJpegHuffmanMaxBitLength; ++i) {
-    offset[i] = offset[i - 1] + table->bits[i - 1];
-  }
-  for (size_t i = 0; i < kJpegHuffmanAlphabetSize; ++i) {
-    if (depths[i] > 0) {
-      table->huffval[offset[depths[i]]++] = i;
-    }
-  }
-}
-
-}  // namespace
-
-void CopyHuffmanTables(j_compress_ptr cinfo) {
-  jpeg_comp_master* m = cinfo->master;
-  size_t max_huff_tables = 2 * cinfo->num_components;
-  // Copy Huffman tables and save slot ids.
-  m->huffman_tables = Allocate<JHUFF_TBL>(cinfo, max_huff_tables, JPOOL_IMAGE);
-  m->slot_id_map = Allocate<uint8_t>(cinfo, max_huff_tables, JPOOL_IMAGE);
-  m->num_huffman_tables = 0;
-  int inv_slot_map[8] = {-1, -1, -1, -1, -1, -1, -1, -1};
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    jpeg_component_info* comp = &cinfo->comp_info[c];
-    CopyHuffmanTable(cinfo, comp->dc_tbl_no, /*is_dc=*/true, &inv_slot_map[0],
-                     m->slot_id_map, m->huffman_tables, &m->num_huffman_tables);
-    CopyHuffmanTable(cinfo, comp->ac_tbl_no, /*is_dc=*/false, &inv_slot_map[0],
-                     m->slot_id_map, m->huffman_tables, &m->num_huffman_tables);
-  }
-  // Compute context map.
-  m->context_map = Allocate<uint8_t>(cinfo, 8, JPOOL_IMAGE);
-  memset(m->context_map, 0, 8);
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    m->context_map[c] = inv_slot_map[cinfo->comp_info[c].dc_tbl_no];
-  }
-  int ac_ctx = 4;
-  for (int i = 0; i < cinfo->num_scans; ++i) {
-    const jpeg_scan_info* si = &cinfo->scan_info[i];
-    if (si->Se > 0) {
-      for (int j = 0; j < si->comps_in_scan; ++j) {
-        int c = si->component_index[j];
-        jpeg_component_info* comp = &cinfo->comp_info[c];
-        m->context_map[ac_ctx++] = inv_slot_map[comp->ac_tbl_no + 4];
-      }
-    }
-  }
-}
-
-void OptimizeHuffmanCodes(j_compress_ptr cinfo) {
-  jpeg_comp_master* m = cinfo->master;
-  // Build DC and AC histograms.
-  std::vector<Histogram> histograms(m->num_contexts);
-  BuildHistograms(cinfo, histograms.data());
-
-  // Cluster DC histograms.
-  JpegClusteredHistograms dc_clusters;
-  ClusterJpegHistograms(cinfo, histograms.data(), cinfo->num_components,
-                        &dc_clusters);
-
-  // Cluster AC histograms.
-  JpegClusteredHistograms ac_clusters;
-  ClusterJpegHistograms(cinfo, histograms.data() + 4, m->num_contexts - 4,
-                        &ac_clusters);
-
-  // Create Huffman tables and slot ids clusters.
-  size_t num_dc_huff = dc_clusters.histograms.size();
-  m->num_huffman_tables = num_dc_huff + ac_clusters.histograms.size();
-  m->huffman_tables =
-      Allocate<JHUFF_TBL>(cinfo, m->num_huffman_tables, JPOOL_IMAGE);
-  m->slot_id_map = Allocate<uint8_t>(cinfo, m->num_huffman_tables, JPOOL_IMAGE);
-  for (size_t i = 0; i < m->num_huffman_tables; ++i) {
-    JHUFF_TBL huff_table = {};
-    if (i < dc_clusters.histograms.size()) {
-      m->slot_id_map[i] = i;
-      BuildJpegHuffmanTable(dc_clusters.histograms[i], &huff_table);
-    } else {
-      m->slot_id_map[i] = 16 + ac_clusters.slot_ids[i - num_dc_huff];
-      BuildJpegHuffmanTable(ac_clusters.histograms[i - num_dc_huff],
-                            &huff_table);
-    }
-    memcpy(&m->huffman_tables[i], &huff_table, sizeof(huff_table));
-  }
-
-  // Create context map from clustered histogram indexes.
-  m->context_map = Allocate<uint8_t>(cinfo, m->num_contexts, JPOOL_IMAGE);
-  memset(m->context_map, 0, m->num_contexts);
-  for (size_t i = 0; i < m->num_contexts; ++i) {
-    if (i < static_cast<size_t>(cinfo->num_components)) {
-      m->context_map[i] = dc_clusters.histogram_indexes[i];
-    } else if (i >= 4) {
-      m->context_map[i] = num_dc_huff + ac_clusters.histogram_indexes[i - 4];
-    }
-  }
-}
-
-namespace {
-
-constexpr uint8_t kNumExtraBits[256] = {
-    0,  1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,  //
-    1,  1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,  //
-    2,  1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,  //
-    3,  1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,  //
-    4,  1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,  //
-    5,  1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,  //
-    6,  1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,  //
-    7,  1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,  //
-    8,  1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,  //
-    9,  1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,  //
-    10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,  //
-    11, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,  //
-    12, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,  //
-    13, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,  //
-    14, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,  //
-    0,  1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,  //
-};
-
-void BuildHuffmanCodeTable(const JHUFF_TBL& table, HuffmanCodeTable* code) {
-  int huff_code[kJpegHuffmanAlphabetSize];
-  // +1 for a sentinel element.
-  uint32_t huff_size[kJpegHuffmanAlphabetSize + 1];
-  int p = 0;
-  for (size_t l = 1; l <= kJpegHuffmanMaxBitLength; ++l) {
-    int i = table.bits[l];
-    while (i--) huff_size[p++] = l;
-  }
-
-  // Reuse sentinel element.
-  int last_p = p;
-  huff_size[last_p] = 0;
-
-  int next_code = 0;
-  uint32_t si = huff_size[0];
-  p = 0;
-  while (huff_size[p]) {
-    while ((huff_size[p]) == si) {
-      huff_code[p++] = next_code;
-      next_code++;
-    }
-    next_code <<= 1;
-    si++;
-  }
-  for (p = 0; p < last_p; p++) {
-    int i = table.huffval[p];
-    int nbits = kNumExtraBits[i];
-    code->depth[i] = huff_size[p] + nbits;
-    code->code[i] = huff_code[p] << nbits;
-  }
-}
-
-}  // namespace
-
-void InitEntropyCoder(j_compress_ptr cinfo) {
-  jpeg_comp_master* m = cinfo->master;
-  m->coding_tables =
-      Allocate<HuffmanCodeTable>(cinfo, m->num_huffman_tables, JPOOL_IMAGE);
-  for (size_t i = 0; i < m->num_huffman_tables; ++i) {
-    BuildHuffmanCodeTable(m->huffman_tables[i], &m->coding_tables[i]);
-  }
-}
-
-}  // namespace jpegli
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jpegli/entropy_coding.h b/third_party/jpeg-xl/lib/jpegli/entropy_coding.h
deleted file mode 100644
index a552219ec388e..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/entropy_coding.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_ENTROPY_CODING_H_
-#define LIB_JPEGLI_ENTROPY_CODING_H_
-
-#include "lib/jpegli/common.h"
-
-namespace jpegli {
-
-size_t MaxNumTokensPerMCURow(j_compress_ptr cinfo);
-
-size_t EstimateNumTokens(j_compress_ptr cinfo, size_t mcu_y, size_t ysize_mcus,
-                         size_t num_tokens, size_t max_per_row);
-
-void TokenizeJpeg(j_compress_ptr cinfo);
-
-void CopyHuffmanTables(j_compress_ptr cinfo);
-
-void OptimizeHuffmanCodes(j_compress_ptr cinfo);
-
-void InitEntropyCoder(j_compress_ptr cinfo);
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_ENTROPY_CODING_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/error.cc b/third_party/jpeg-xl/lib/jpegli/error.cc
deleted file mode 100644
index b3ccab0452e74..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/error.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/error.h"
-
-#include <setjmp.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <string>
-
-#include "lib/jpegli/common.h"
-
-namespace jpegli {
-
-const char* const kErrorMessageTable[] = {
-    "Message codes are not supported, error message is in msg_parm.s string",
-};
-
-bool FormatString(char* buffer, const char* format, ...) {
-  va_list args;
-  va_start(args, format);
-  vsnprintf(buffer, JMSG_STR_PARM_MAX, format, args);  // notypo
-  va_end(args);
-  return false;
-}
-
-void ExitWithAbort(j_common_ptr cinfo) {
-  (*cinfo->err->output_message)(cinfo);
-  jpegli_destroy(cinfo);
-  exit(EXIT_FAILURE);
-}
-
-void EmitMessage(j_common_ptr cinfo, int msg_level) {
-  if (msg_level < 0) {
-    if (cinfo->err->num_warnings <= 5 || cinfo->err->trace_level >= 3) {
-      (*cinfo->err->output_message)(cinfo);
-    }
-    ++cinfo->err->num_warnings;
-  } else if (cinfo->err->trace_level >= msg_level) {
-    (*cinfo->err->output_message)(cinfo);
-  }
-}
-
-void OutputMessage(j_common_ptr cinfo) {
-  char buffer[JMSG_LENGTH_MAX];
-  (*cinfo->err->format_message)(cinfo, buffer);
-  fprintf(stderr, "%s\n", buffer);
-}
-
-void FormatMessage(j_common_ptr cinfo, char* buffer) {
-  jpeg_error_mgr* err = cinfo->err;
-  int code = err->msg_code;
-  if (code == 0) {
-    memcpy(buffer, cinfo->err->msg_parm.s, JMSG_STR_PARM_MAX);
-  } else if (err->addon_message_table != nullptr &&
-             code >= err->first_addon_message &&
-             code <= err->last_addon_message) {
-    std::string msg(err->addon_message_table[code - err->first_addon_message]);
-    if (msg.find("%s") != std::string::npos) {
-      snprintf(buffer, JMSG_LENGTH_MAX, msg.data(), err->msg_parm.s);
-    } else {
-      snprintf(buffer, JMSG_LENGTH_MAX, msg.data(), err->msg_parm.i[0],
-               err->msg_parm.i[1], err->msg_parm.i[2], err->msg_parm.i[3],
-               err->msg_parm.i[4], err->msg_parm.i[5], err->msg_parm.i[6],
-               err->msg_parm.i[7]);
-    }
-  } else {
-    snprintf(buffer, JMSG_LENGTH_MAX, "%s", kErrorMessageTable[0]);
-  }
-}
-
-void ResetErrorManager(j_common_ptr cinfo) {
-  memset(cinfo->err->msg_parm.s, 0, JMSG_STR_PARM_MAX);
-  cinfo->err->msg_code = 0;
-  cinfo->err->num_warnings = 0;
-}
-
-}  // namespace jpegli
-
-struct jpeg_error_mgr* jpegli_std_error(struct jpeg_error_mgr* err) {
-  err->error_exit = jpegli::ExitWithAbort;
-  err->emit_message = jpegli::EmitMessage;
-  err->output_message = jpegli::OutputMessage;
-  err->format_message = jpegli::FormatMessage;
-  err->reset_error_mgr = jpegli::ResetErrorManager;
-  memset(err->msg_parm.s, 0, JMSG_STR_PARM_MAX);
-  err->trace_level = 0;
-  err->num_warnings = 0;
-  // We don't support message codes and message table, but we define one here
-  // in case the application has a custom format_message and tries to access
-  // these fields there.
-  err->msg_code = 0;
-  err->jpeg_message_table = jpegli::kErrorMessageTable;
-  err->last_jpeg_message = 0;
-  err->addon_message_table = nullptr;
-  err->first_addon_message = 0;
-  err->last_addon_message = 0;
-  return err;
-}
diff --git a/third_party/jpeg-xl/lib/jpegli/error.h b/third_party/jpeg-xl/lib/jpegli/error.h
deleted file mode 100644
index fb5dc411a8b6d..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/error.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_ERROR_H_
-#define LIB_JPEGLI_ERROR_H_
-
-#include <stdarg.h>
-#include <stdint.h>
-
-#include "lib/jpegli/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-
-namespace jpegli {
-
-bool FormatString(char* buffer, const char* format, ...);
-
-}  // namespace jpegli
-
-// `error_exit` should be no-return; but let's add some guarantees on our side.
-#define JPEGLI_ERROR(format, ...)                                            \
-  jpegli::FormatString(cinfo->err->msg_parm.s, ("%s:%d: " format), __FILE__, \
-                       __LINE__, ##__VA_ARGS__),                             \
-      (*cinfo->err->error_exit)(reinterpret_cast<j_common_ptr>(cinfo)),      \
-      JXL_CRASH()
-
-#define JPEGLI_WARN(format, ...)                                             \
-  jpegli::FormatString(cinfo->err->msg_parm.s, ("%s:%d: " format), __FILE__, \
-                       __LINE__, ##__VA_ARGS__),                             \
-      (*cinfo->err->emit_message)(reinterpret_cast<j_common_ptr>(cinfo), -1)
-
-#define JPEGLI_TRACE(level, format, ...)                                     \
-  if (cinfo->err->trace_level >= (level))                                    \
-  jpegli::FormatString(cinfo->err->msg_parm.s, ("%s:%d: " format), __FILE__, \
-                       __LINE__, ##__VA_ARGS__),                             \
-      (*cinfo->err->emit_message)(reinterpret_cast<j_common_ptr>(cinfo),     \
-                                  (level))
-
-#define JPEGLI_CHECK(condition)                     \
-  do {                                              \
-    if (!(condition)) {                             \
-      JPEGLI_ERROR("JPEGLI_CHECK: %s", #condition); \
-    }                                               \
-  } while (0)
-
-#endif  // LIB_JPEGLI_ERROR_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/error_handling_test.cc b/third_party/jpeg-xl/lib/jpegli/error_handling_test.cc
deleted file mode 100644
index da85dbcb0b3db..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/error_handling_test.cc
+++ /dev/null
@@ -1,1284 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
-#include <vector>
-
-#include "lib/jpegli/common.h"
-#include "lib/jpegli/decode.h"
-#include "lib/jpegli/encode.h"
-#include "lib/jpegli/libjpeg_test_util.h"
-#include "lib/jpegli/test_params.h"
-#include "lib/jpegli/test_utils.h"
-#include "lib/jpegli/testing.h"
-
-namespace jpegli {
-namespace {
-
-TEST(EncoderErrorHandlingTest, MinimalSuccess) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  {
-    jpeg_compress_struct cinfo;
-    const auto try_catch_block = [&]() -> bool {
-      ERROR_HANDLER_SETUP(jpegli);
-      jpegli_create_compress(&cinfo);
-      jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-      cinfo.image_width = 1;
-      cinfo.image_height = 1;
-      cinfo.input_components = 1;
-      jpegli_set_defaults(&cinfo);
-      jpegli_start_compress(&cinfo, TRUE);
-      JSAMPLE image[1] = {0};
-      JSAMPROW row[] = {image};
-      jpegli_write_scanlines(&cinfo, row, 1);
-      jpegli_finish_compress(&cinfo);
-      return true;
-    };
-    EXPECT_TRUE(try_catch_block());
-    jpegli_destroy_compress(&cinfo);
-  }
-  TestImage output;
-  DecodeWithLibjpeg(CompressParams(), DecompressParams(), nullptr, 0, buffer,
-                    buffer_size, &output);
-  EXPECT_EQ(1, output.xsize);
-  EXPECT_EQ(1, output.ysize);
-  EXPECT_EQ(1, output.components);
-  EXPECT_EQ(0, output.pixels[0]);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, NoDestination) {
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-}
-
-TEST(EncoderErrorHandlingTest, NoImageDimensions) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, ImageTooBig) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 100000;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, NoInputComponents) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    jpegli_set_defaults(&cinfo);
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, TooManyInputComponents) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1000;
-    jpegli_set_defaults(&cinfo);
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, NoSetDefaults) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    jpegli_start_compress(&cinfo, TRUE);
-    JSAMPLE image[1] = {0};
-    JSAMPROW row[] = {image};
-    jpegli_write_scanlines(&cinfo, row, 1);
-    jpegli_finish_compress(&cinfo);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, NoStartCompress) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    JSAMPLE image[1] = {0};
-    JSAMPROW row[] = {image};
-    jpegli_write_scanlines(&cinfo, row, 1);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, NoWriteScanlines) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    jpegli_start_compress(&cinfo, TRUE);
-    jpegli_finish_compress(&cinfo);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, NoWriteAllScanlines) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 2;
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    jpegli_start_compress(&cinfo, TRUE);
-    JSAMPLE image[1] = {0};
-    JSAMPROW row[] = {image};
-    jpegli_write_scanlines(&cinfo, row, 1);
-    jpegli_finish_compress(&cinfo);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, InvalidQuantValue) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    cinfo.quant_tbl_ptrs[0] =
-        jpegli_alloc_quant_table(reinterpret_cast<j_common_ptr>(&cinfo));
-    for (UINT16& q : cinfo.quant_tbl_ptrs[0]->quantval) {
-      q = 0;
-    }
-    jpegli_start_compress(&cinfo, TRUE);
-    JSAMPLE image[1] = {0};
-    JSAMPROW row[] = {image};
-    jpegli_write_scanlines(&cinfo, row, 1);
-    jpegli_finish_compress(&cinfo);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, InvalidQuantTableIndex) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    cinfo.comp_info[0].quant_tbl_no = 3;
-    jpegli_start_compress(&cinfo, TRUE);
-    JSAMPLE image[1] = {0};
-    JSAMPROW row[] = {image};
-    jpegli_write_scanlines(&cinfo, row, 1);
-    jpegli_finish_compress(&cinfo);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, NumberOfComponentsMismatch1) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    cinfo.num_components = 100;
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, NumberOfComponentsMismatch2) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    cinfo.num_components = 2;
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, NumberOfComponentsMismatch3) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    cinfo.num_components = 2;
-    cinfo.comp_info[1].h_samp_factor = cinfo.comp_info[1].v_samp_factor = 1;
-    jpegli_start_compress(&cinfo, TRUE);
-    JSAMPLE image[1] = {0};
-    JSAMPROW row[] = {image};
-    jpegli_write_scanlines(&cinfo, row, 1);
-    jpegli_finish_compress(&cinfo);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, NumberOfComponentsMismatch4) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    cinfo.in_color_space = JCS_RGB;
-    jpegli_set_defaults(&cinfo);
-    jpegli_start_compress(&cinfo, TRUE);
-    JSAMPLE image[1] = {0};
-    JSAMPROW row[] = {image};
-    jpegli_write_scanlines(&cinfo, row, 1);
-    jpegli_finish_compress(&cinfo);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, NumberOfComponentsMismatch5) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 3;
-    cinfo.in_color_space = JCS_GRAYSCALE;
-    jpegli_set_defaults(&cinfo);
-    jpegli_start_compress(&cinfo, TRUE);
-    JSAMPLE image[3] = {0};
-    JSAMPROW row[] = {image};
-    jpegli_write_scanlines(&cinfo, row, 1);
-    jpegli_finish_compress(&cinfo);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, NumberOfComponentsMismatch6) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 3;
-    cinfo.in_color_space = JCS_RGB;
-    jpegli_set_defaults(&cinfo);
-    cinfo.num_components = 2;
-    jpegli_start_compress(&cinfo, TRUE);
-    JSAMPLE image[3] = {0};
-    JSAMPROW row[] = {image};
-    jpegli_write_scanlines(&cinfo, row, 1);
-    jpegli_finish_compress(&cinfo);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, InvalidColorTransform) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 3;
-    cinfo.in_color_space = JCS_YCbCr;
-    jpegli_set_defaults(&cinfo);
-    cinfo.jpeg_color_space = JCS_RGB;
-    jpegli_start_compress(&cinfo, TRUE);
-    JSAMPLE image[3] = {0};
-    JSAMPROW row[] = {image};
-    jpegli_write_scanlines(&cinfo, row, 1);
-    jpegli_finish_compress(&cinfo);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, DuplicateComponentIds) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 3;
-    jpegli_set_defaults(&cinfo);
-    cinfo.comp_info[0].component_id = 0;
-    cinfo.comp_info[1].component_id = 0;
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, InvalidComponentIndex) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 3;
-    jpegli_set_defaults(&cinfo);
-    cinfo.comp_info[0].component_index = 17;
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, ArithmeticCoding) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 3;
-    jpegli_set_defaults(&cinfo);
-    cinfo.arith_code = TRUE;
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, CCIR601Sampling) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 3;
-    jpegli_set_defaults(&cinfo);
-    cinfo.CCIR601_sampling = TRUE;
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, InvalidScanScript1) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    static constexpr jpeg_scan_info kScript[] = {{1, {0}, 0, 63, 0, 0}};  //
-    cinfo.scan_info = kScript;
-    cinfo.num_scans = 0;
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, InvalidScanScript2) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    static constexpr jpeg_scan_info kScript[] = {{2, {0, 1}, 0, 63, 0, 0}};  //
-    cinfo.scan_info = kScript;
-    cinfo.num_scans = ARRAY_SIZE(kScript);
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, InvalidScanScript3) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    static constexpr jpeg_scan_info kScript[] = {{5, {0}, 0, 63, 0, 0}};  //
-    cinfo.scan_info = kScript;
-    cinfo.num_scans = ARRAY_SIZE(kScript);
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, InvalidScanScript4) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 2;
-    jpegli_set_defaults(&cinfo);
-    static constexpr jpeg_scan_info kScript[] = {{2, {0, 0}, 0, 63, 0, 0}};  //
-    cinfo.scan_info = kScript;
-    cinfo.num_scans = ARRAY_SIZE(kScript);
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, InvalidScanScript5) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 2;
-    jpegli_set_defaults(&cinfo);
-    static constexpr jpeg_scan_info kScript[] = {{2, {1, 0}, 0, 63, 0, 0}};  //
-    cinfo.scan_info = kScript;
-    cinfo.num_scans = ARRAY_SIZE(kScript);
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, InvalidScanScript6) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    static constexpr jpeg_scan_info kScript[] = {{1, {0}, 0, 64, 0, 0}};  //
-    cinfo.scan_info = kScript;
-    cinfo.num_scans = ARRAY_SIZE(kScript);
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, InvalidScanScript7) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    static constexpr jpeg_scan_info kScript[] = {{1, {0}, 2, 1, 0, 0}};  //
-    cinfo.scan_info = kScript;
-    cinfo.num_scans = ARRAY_SIZE(kScript);
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, InvalidScanScript8) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 2;
-    jpegli_set_defaults(&cinfo);
-    static constexpr jpeg_scan_info kScript[] = {
-        {1, {0}, 0, 63, 0, 0}, {1, {1}, 0, 0, 0, 0}, {1, {1}, 1, 63, 0, 0}  //
-    };
-    cinfo.scan_info = kScript;
-    cinfo.num_scans = ARRAY_SIZE(kScript);
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, InvalidScanScript9) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    static constexpr jpeg_scan_info kScript[] = {
-        {1, {0}, 0, 1, 0, 0}, {1, {0}, 2, 63, 0, 0},  //
-    };
-    cinfo.scan_info = kScript;
-    cinfo.num_scans = ARRAY_SIZE(kScript);
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, InvalidScanScript10) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 2;
-    jpegli_set_defaults(&cinfo);
-    static constexpr jpeg_scan_info kScript[] = {
-        {2, {0, 1}, 0, 0, 0, 0}, {2, {0, 1}, 1, 63, 0, 0}  //
-    };
-    cinfo.scan_info = kScript;
-    cinfo.num_scans = ARRAY_SIZE(kScript);
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, InvalidScanScript11) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    static constexpr jpeg_scan_info kScript[] = {
-        {1, {0}, 1, 63, 0, 0}, {1, {0}, 0, 0, 0, 0}  //
-    };
-    cinfo.scan_info = kScript;
-    cinfo.num_scans = ARRAY_SIZE(kScript);
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, InvalidScanScript12) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    static constexpr jpeg_scan_info kScript[] = {
-        {1, {0}, 0, 0, 10, 1}, {1, {0}, 0, 0, 1, 0}, {1, {0}, 1, 63, 0, 0}  //
-    };
-    cinfo.scan_info = kScript;
-    cinfo.num_scans = ARRAY_SIZE(kScript);
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, InvalidScanScript13) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    static constexpr jpeg_scan_info kScript[] = {
-        {1, {0}, 0, 0, 0, 2},
-        {1, {0}, 0, 0, 1, 0},
-        {1, {0}, 0, 0, 2, 1},  //
-        {1, {0}, 1, 63, 0, 0}  //
-    };
-    cinfo.scan_info = kScript;
-    cinfo.num_scans = ARRAY_SIZE(kScript);
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, MCUSizeTooBig) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 3;
-    jpegli_set_defaults(&cinfo);
-    jpegli_set_progressive_level(&cinfo, 0);
-    cinfo.comp_info[0].h_samp_factor = 3;
-    cinfo.comp_info[0].v_samp_factor = 3;
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, RestartIntervalTooBig) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 1;
-    jpegli_set_defaults(&cinfo);
-    cinfo.restart_interval = 1000000;
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, SamplingFactorTooBig) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 3;
-    jpegli_set_defaults(&cinfo);
-    cinfo.comp_info[0].h_samp_factor = 5;
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-TEST(EncoderErrorHandlingTest, NonIntegralSamplingRatio) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    cinfo.image_width = 1;
-    cinfo.image_height = 1;
-    cinfo.input_components = 3;
-    jpegli_set_defaults(&cinfo);
-    cinfo.comp_info[0].h_samp_factor = 3;
-    cinfo.comp_info[1].h_samp_factor = 2;
-    jpegli_start_compress(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  if (buffer) free(buffer);
-}
-
-constexpr const char* kAddOnTable[] = {"First message",
-                                       "Second message with int param %d",
-                                       "Third message with string param %s"};
-
-TEST(EncoderErrorHandlingTest, AddOnTableNoParam) {
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    cinfo.err->addon_message_table = kAddOnTable;
-    cinfo.err->first_addon_message = 10000;
-    cinfo.err->last_addon_message = 10002;
-    cinfo.err->msg_code = 10000;
-    (*cinfo.err->error_exit)(reinterpret_cast<j_common_ptr>(&cinfo));
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-}
-
-TEST(EncoderErrorHandlingTest, AddOnTableIntParam) {
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    cinfo.err->addon_message_table = kAddOnTable;
-    cinfo.err->first_addon_message = 10000;
-    cinfo.err->last_addon_message = 10002;
-    cinfo.err->msg_code = 10001;
-    cinfo.err->msg_parm.i[0] = 17;
-    (*cinfo.err->error_exit)(reinterpret_cast<j_common_ptr>(&cinfo));
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-}
-
-TEST(EncoderErrorHandlingTest, AddOnTableNoStringParam) {
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    cinfo.err->addon_message_table = kAddOnTable;
-    cinfo.err->first_addon_message = 10000;
-    cinfo.err->last_addon_message = 10002;
-    cinfo.err->msg_code = 10002;
-    memcpy(cinfo.err->msg_parm.s, "MESSAGE PARAM", 14);
-    (*cinfo.err->error_exit)(reinterpret_cast<j_common_ptr>(&cinfo));
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-}
-
-const uint8_t kCompressed0[] = {
-    // SOI
-    0xff, 0xd8,  //
-    // SOF
-    0xff, 0xc0, 0x00, 0x0b, 0x08, 0x00, 0x01, 0x00, 0x01, 0x01,  //
-    0x01, 0x11, 0x00,                                            //
-    // DQT
-    0xff, 0xdb, 0x00, 0x43, 0x00, 0x03, 0x02, 0x02, 0x03, 0x02,  //
-    0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x03, 0x03, 0x04, 0x05,  //
-    0x08, 0x05, 0x05, 0x04, 0x04, 0x05, 0x0a, 0x07, 0x07, 0x06,  //
-    0x08, 0x0c, 0x0a, 0x0c, 0x0c, 0x0b, 0x0a, 0x0b, 0x0b, 0x0d,  //
-    0x0e, 0x12, 0x10, 0x0d, 0x0e, 0x11, 0x0e, 0x0b, 0x0b, 0x10,  //
-    0x16, 0x10, 0x11, 0x13, 0x14, 0x15, 0x15, 0x15, 0x0c, 0x0f,  //
-    0x17, 0x18, 0x16, 0x14, 0x18, 0x12, 0x14, 0x15, 0x14,        //
-    // DHT
-    0xff, 0xc4, 0x00, 0xd2, 0x00, 0x00, 0x01, 0x05, 0x01, 0x01,  //
-    0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  //
-    0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,  //
-    0x09, 0x0a, 0x0b, 0x10, 0x00, 0x02, 0x01, 0x03, 0x03, 0x02,  //
-    0x04, 0x03, 0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7d,  //
-    0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 0x21, 0x31,  //
-    0x41, 0x06, 0x13, 0x51, 0x61, 0x07, 0x22, 0x71, 0x14, 0x32,  //
-    0x81, 0x91, 0xa1, 0x08, 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52,  //
-    0xd1, 0xf0, 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,  //
-    0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a,  //
-    0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x43, 0x44, 0x45,  //
-    0x46, 0x47, 0x48, 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57,  //
-    0x58, 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,  //
-    0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x83,  //
-    0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94,  //
-    0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,  //
-    0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,  //
-    0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,  //
-    0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8,  //
-    0xd9, 0xda, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8,  //
-    0xe9, 0xea, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,  //
-    0xf9, 0xfa,                                                  //
-    // SOS
-    0xff, 0xda, 0x00, 0x08, 0x01, 0x01, 0x00, 0x00, 0x3f, 0x00,  //
-    // entropy coded data
-    0xfc, 0xaa, 0xaf,  //
-    // EOI
-    0xff, 0xd9,  //
-};
-const size_t kLen0 = sizeof(kCompressed0);
-
-const size_t kSOFOffset = 2;
-const size_t kDQTOffset = 15;
-const size_t kDHTOffset = 84;
-const size_t kSOSOffset = 296;
-
-TEST(DecoderErrorHandlingTest, MinimalSuccess) {
-  ASSERT_TRUE(kCompressed0[kDQTOffset] == 0xff);
-  ASSERT_TRUE(kCompressed0[kSOFOffset] == 0xff);
-  ASSERT_TRUE(kCompressed0[kDHTOffset] == 0xff);
-  ASSERT_TRUE(kCompressed0[kSOSOffset] == 0xff);
-  jpeg_decompress_struct cinfo = {};
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_decompress(&cinfo);
-    jpegli_mem_src(&cinfo, kCompressed0, kLen0);
-    jpegli_read_header(&cinfo, TRUE);
-    EXPECT_EQ(1, cinfo.image_width);
-    EXPECT_EQ(1, cinfo.image_height);
-    jpegli_start_decompress(&cinfo);
-    JSAMPLE image[1];
-    JSAMPROW row[] = {image};
-    jpegli_read_scanlines(&cinfo, row, 1);
-    EXPECT_EQ(0, image[0]);
-    jpegli_finish_decompress(&cinfo);
-    return true;
-  };
-  EXPECT_TRUE(try_catch_block());
-  jpegli_destroy_decompress(&cinfo);
-}
-
-TEST(DecoderErrorHandlingTest, NoSource) {
-  jpeg_decompress_struct cinfo = {};
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_decompress(&cinfo);
-    jpegli_read_header(&cinfo, TRUE);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_decompress(&cinfo);
-}
-
-TEST(DecoderErrorHandlingTest, NoReadHeader) {
-  jpeg_decompress_struct cinfo = {};
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_decompress(&cinfo);
-    jpegli_mem_src(&cinfo, kCompressed0, kLen0);
-    jpegli_start_decompress(&cinfo);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_decompress(&cinfo);
-}
-
-TEST(DecoderErrorHandlingTest, NoStartDecompress) {
-  jpeg_decompress_struct cinfo = {};
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_decompress(&cinfo);
-    jpegli_mem_src(&cinfo, kCompressed0, kLen0);
-    jpegli_read_header(&cinfo, TRUE);
-    EXPECT_EQ(1, cinfo.image_width);
-    EXPECT_EQ(1, cinfo.image_height);
-    JSAMPLE image[1];
-    JSAMPROW row[] = {image};
-    jpegli_read_scanlines(&cinfo, row, 1);
-    EXPECT_EQ(0, image[0]);
-    jpegli_finish_decompress(&cinfo);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_decompress(&cinfo);
-}
-
-TEST(DecoderErrorHandlingTest, NoReadScanlines) {
-  jpeg_decompress_struct cinfo = {};
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_decompress(&cinfo);
-    jpegli_mem_src(&cinfo, kCompressed0, kLen0);
-    jpegli_read_header(&cinfo, TRUE);
-    EXPECT_EQ(1, cinfo.image_width);
-    EXPECT_EQ(1, cinfo.image_height);
-    jpegli_start_decompress(&cinfo);
-    jpegli_finish_decompress(&cinfo);
-    return true;
-  };
-  EXPECT_FALSE(try_catch_block());
-  jpegli_destroy_decompress(&cinfo);
-}
-
-const size_t kMaxImageWidth = 0xffff;
-JSAMPLE kOutputBuffer[MAX_COMPONENTS * kMaxImageWidth];
-
-bool ParseCompressed(const std::vector<uint8_t>& compressed) {
-  jpeg_decompress_struct cinfo = {};
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_decompress(&cinfo);
-    jpegli_mem_src(&cinfo, compressed.data(), compressed.size());
-    jpegli_read_header(&cinfo, TRUE);
-    jpegli_start_decompress(&cinfo);
-    for (JDIMENSION i = 0; i < cinfo.output_height; ++i) {
-      JSAMPROW row[] = {kOutputBuffer};
-      jpegli_read_scanlines(&cinfo, row, 1);
-    }
-    jpegli_finish_decompress(&cinfo);
-    return true;
-  };
-  bool retval = try_catch_block();
-  jpegli_destroy_decompress(&cinfo);
-  return retval;
-}
-
-TEST(DecoderErrorHandlingTest, NoSOI) {
-  for (int pos : {0, 1}) {
-    std::vector<uint8_t> compressed(kCompressed0, kCompressed0 + kLen0);
-    compressed[pos] = 0;
-    EXPECT_FALSE(ParseCompressed(compressed));
-  }
-}
-
-TEST(DecoderErrorHandlingTest, InvalidDQT) {
-  // Bad marker length
-  for (int diff : {-2, -1, 1, 2}) {
-    std::vector<uint8_t> compressed(kCompressed0, kCompressed0 + kLen0);
-    compressed[kDQTOffset + 3] += diff;
-    EXPECT_FALSE(ParseCompressed(compressed));
-  }
-  // invalid table index / precision
-  for (int val : {0x20, 0x05}) {
-    std::vector<uint8_t> compressed(kCompressed0, kCompressed0 + kLen0);
-    compressed[kDQTOffset + 4] = val;
-    EXPECT_FALSE(ParseCompressed(compressed));
-  }
-  // zero quant value
-  for (int k : {0, 1, 17, 63}) {
-    std::vector<uint8_t> compressed(kCompressed0, kCompressed0 + kLen0);
-    compressed[kDQTOffset + 5 + k] = 0;
-    EXPECT_FALSE(ParseCompressed(compressed));
-  }
-}
-
-TEST(DecoderErrorHandlingTest, InvalidSOF) {
-  // Bad marker length
-  for (int diff : {-2, -1, 1, 2}) {
-    std::vector<uint8_t> compressed(kCompressed0, kCompressed0 + kLen0);
-    compressed[kSOFOffset + 3] += diff;
-    EXPECT_FALSE(ParseCompressed(compressed));
-  }
-  // zero width, height or num_components
-  for (int pos : {6, 8, 9}) {
-    std::vector<uint8_t> compressed(kCompressed0, kCompressed0 + kLen0);
-    compressed[kSOFOffset + pos] = 0;
-    EXPECT_FALSE(ParseCompressed(compressed));
-  }
-  // invalid data precision
-  for (int val : {0, 1, 127}) {
-    std::vector<uint8_t> compressed(kCompressed0, kCompressed0 + kLen0);
-    compressed[kSOFOffset + 4] = val;
-    EXPECT_FALSE(ParseCompressed(compressed));
-  }
-  // too many num_components
-  for (int val : {5, 255}) {
-    std::vector<uint8_t> compressed(kCompressed0, kCompressed0 + kLen0);
-    compressed[kSOFOffset + 9] = val;
-    EXPECT_FALSE(ParseCompressed(compressed));
-  }
-  // invalid sampling factors
-  for (int val : {0x00, 0x01, 0x10, 0x15, 0x51}) {
-    std::vector<uint8_t> compressed(kCompressed0, kCompressed0 + kLen0);
-    compressed[kSOFOffset + 11] = val;
-    EXPECT_FALSE(ParseCompressed(compressed));
-  }
-  // invalid quant table index
-  for (int val : {5, 17}) {
-    std::vector<uint8_t> compressed(kCompressed0, kCompressed0 + kLen0);
-    compressed[kSOFOffset + 12] = val;
-    EXPECT_FALSE(ParseCompressed(compressed));
-  }
-}
-
-TEST(DecoderErrorHandlingTest, InvalidDHT) {
-  // Bad marker length
-  for (int diff : {-2, -1, 1, 2}) {
-    std::vector<uint8_t> compressed(kCompressed0, kCompressed0 + kLen0);
-    compressed[kDHTOffset + 3] += diff;
-    EXPECT_FALSE(ParseCompressed(compressed));
-  }
-  {
-    std::vector<uint8_t> compressed(kCompressed0, kCompressed0 + kLen0);
-    compressed[kDHTOffset + 2] += 17;
-    EXPECT_FALSE(ParseCompressed(compressed));
-  }
-  // invalid table slot_id
-  for (int val : {0x05, 0x15, 0x20}) {
-    std::vector<uint8_t> compressed(kCompressed0, kCompressed0 + kLen0);
-    compressed[kDHTOffset + 4] = val;
-    EXPECT_FALSE(ParseCompressed(compressed));
-  }
-}
-
-TEST(DecoderErrorHandlingTest, InvalidSOS) {
-  // Invalid comps_in_scan
-  for (int val : {2, 5, 17}) {
-    std::vector<uint8_t> compressed(kCompressed0, kCompressed0 + kLen0);
-    compressed[kSOSOffset + 4] = val;
-    EXPECT_FALSE(ParseCompressed(compressed));
-  }
-  // invalid Huffman table indexes
-  for (int val : {0x05, 0x50, 0x15, 0x51}) {
-    std::vector<uint8_t> compressed(kCompressed0, kCompressed0 + kLen0);
-    compressed[kSOSOffset + 6] = val;
-    EXPECT_FALSE(ParseCompressed(compressed));
-  }
-  // invalid Ss/Se
-  for (int pos : {7, 8}) {
-    std::vector<uint8_t> compressed(kCompressed0, kCompressed0 + kLen0);
-    compressed[kSOSOffset + pos] = 64;
-    EXPECT_FALSE(ParseCompressed(compressed));
-  }
-}
-
-TEST(DecoderErrorHandlingTest, MutateSingleBytes) {
-  for (size_t pos = 0; pos < kLen0; ++pos) {
-    std::vector<uint8_t> compressed(kCompressed0, kCompressed0 + kLen0);
-    for (int val : {0x00, 0x0f, 0xf0, 0xff}) {
-      compressed[pos] = val;
-      ParseCompressed(compressed);
-    }
-  }
-}
-
-}  // namespace
-}  // namespace jpegli
diff --git a/third_party/jpeg-xl/lib/jpegli/fuzztest.h b/third_party/jpeg-xl/lib/jpegli/fuzztest.h
deleted file mode 100644
index d5cde97713e67..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/fuzztest.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_FUZZTEST_H_
-#define LIB_JPEGLI_FUZZTEST_H_
-
-#include "lib/jxl/base/compiler_specific.h"
-
-#if !defined(FUZZ_TEST)
-struct FuzzTestSink {
-  template <typename F>
-  FuzzTestSink WithSeeds(F /*f*/) {
-    return *this;
-  }
-};
-#define FUZZ_TEST(A, B) \
-  const JXL_MAYBE_UNUSED FuzzTestSink unused##A##B = FuzzTestSink()
-#endif
-
-#endif  // LIB_JPEGLI_FUZZTEST_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/huffman.cc b/third_party/jpeg-xl/lib/jpegli/huffman.cc
deleted file mode 100644
index 6b068ab64f6ad..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/huffman.cc
+++ /dev/null
@@ -1,323 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/huffman.h"
-
-#include <limits>
-#include <vector>
-
-#include "lib/jpegli/common.h"
-#include "lib/jpegli/error.h"
-#include "lib/jxl/base/status.h"
-
-namespace jpegli {
-
-// Returns the table width of the next 2nd level table, count is the histogram
-// of bit lengths for the remaining symbols, len is the code length of the next
-// processed symbol.
-static inline int NextTableBitSize(const int* count, int len) {
-  int left = 1 << (len - kJpegHuffmanRootTableBits);
-  while (len < static_cast<int>(kJpegHuffmanMaxBitLength)) {
-    left -= count[len];
-    if (left <= 0) break;
-    ++len;
-    left <<= 1;
-  }
-  return len - kJpegHuffmanRootTableBits;
-}
-
-void BuildJpegHuffmanTable(const uint32_t* count, const uint32_t* symbols,
-                           HuffmanTableEntry* lut) {
-  HuffmanTableEntry code;    // current table entry
-  HuffmanTableEntry* table;  // next available space in table
-  int len;                   // current code length
-  int idx;                   // symbol index
-  int key;                   // prefix code
-  int reps;                  // number of replicate key values in current table
-  int low;                   // low bits for current root entry
-  int table_bits;            // key length of current table
-  int table_size;            // size of current table
-
-  // Make a local copy of the input bit length histogram.
-  int tmp_count[kJpegHuffmanMaxBitLength + 1] = {0};
-  int total_count = 0;
-  for (len = 1; len <= static_cast<int>(kJpegHuffmanMaxBitLength); ++len) {
-    tmp_count[len] = count[len];
-    total_count += tmp_count[len];
-  }
-
-  table = lut;
-  table_bits = kJpegHuffmanRootTableBits;
-  table_size = 1 << table_bits;
-
-  // Special case code with only one value.
-  if (total_count == 1) {
-    code.bits = 0;
-    code.value = symbols[0];
-    for (key = 0; key < table_size; ++key) {
-      table[key] = code;
-    }
-    return;
-  }
-
-  // Fill in root table.
-  key = 0;
-  idx = 0;
-  for (len = 1; len <= kJpegHuffmanRootTableBits; ++len) {
-    for (; tmp_count[len] > 0; --tmp_count[len]) {
-      code.bits = len;
-      code.value = symbols[idx++];
-      reps = 1 << (kJpegHuffmanRootTableBits - len);
-      while (reps--) {
-        table[key++] = code;
-      }
-    }
-  }
-
-  // Fill in 2nd level tables and add pointers to root table.
-  table += table_size;
-  table_size = 0;
-  low = 0;
-  for (len = kJpegHuffmanRootTableBits + 1;
-       len <= static_cast<int>(kJpegHuffmanMaxBitLength); ++len) {
-    for (; tmp_count[len] > 0; --tmp_count[len]) {
-      // Start a new sub-table if the previous one is full.
-      if (low >= table_size) {
-        table += table_size;
-        table_bits = NextTableBitSize(tmp_count, len);
-        table_size = 1 << table_bits;
-        low = 0;
-        lut[key].bits = table_bits + kJpegHuffmanRootTableBits;
-        lut[key].value = (table - lut) - key;
-        ++key;
-      }
-      code.bits = len - kJpegHuffmanRootTableBits;
-      code.value = symbols[idx++];
-      reps = 1 << (table_bits - code.bits);
-      while (reps--) {
-        table[low++] = code;
-      }
-    }
-  }
-}
-
-// A node of a Huffman tree.
-struct HuffmanTree {
-  HuffmanTree(uint32_t count, int16_t left, int16_t right)
-      : total_count(count), index_left(left), index_right_or_value(right) {}
-  uint32_t total_count;
-  int16_t index_left;
-  int16_t index_right_or_value;
-};
-
-void SetDepth(const HuffmanTree& p, HuffmanTree* pool, uint8_t* depth,
-              uint8_t level) {
-  if (p.index_left >= 0) {
-    ++level;
-    SetDepth(pool[p.index_left], pool, depth, level);
-    SetDepth(pool[p.index_right_or_value], pool, depth, level);
-  } else {
-    depth[p.index_right_or_value] = level;
-  }
-}
-
-// Sort the root nodes, least popular first.
-static JXL_INLINE bool Compare(const HuffmanTree& v0, const HuffmanTree& v1) {
-  return v0.total_count < v1.total_count;
-}
-
-// This function will create a Huffman tree.
-//
-// The catch here is that the tree cannot be arbitrarily deep.
-// Brotli specifies a maximum depth of 15 bits for "code trees"
-// and 7 bits for "code length code trees."
-//
-// count_limit is the value that is to be faked as the minimum value
-// and this minimum value is raised until the tree matches the
-// maximum length requirement.
-//
-// This algorithm is not of excellent performance for very long data blocks,
-// especially when population counts are longer than 2**tree_limit, but
-// we are not planning to use this with extremely long blocks.
-//
-// See http://en.wikipedia.org/wiki/Huffman_coding
-void CreateHuffmanTree(const uint32_t* data, const size_t length,
-                       const int tree_limit, uint8_t* depth) {
-  // For block sizes below 64 kB, we never need to do a second iteration
-  // of this loop. Probably all of our block sizes will be smaller than
-  // that, so this loop is mostly of academic interest. If we actually
-  // would need this, we would be better off with the Katajainen algorithm.
-  for (uint32_t count_limit = 1;; count_limit *= 2) {
-    std::vector<HuffmanTree> tree;
-    tree.reserve(2 * length + 1);
-
-    for (size_t i = length; i != 0;) {
-      --i;
-      if (data[i]) {
-        const uint32_t count = std::max(data[i], count_limit - 1);
-        tree.emplace_back(count, -1, static_cast<int16_t>(i));
-      }
-    }
-
-    const size_t n = tree.size();
-    if (n == 1) {
-      // Fake value; will be fixed on upper level.
-      depth[tree[0].index_right_or_value] = 1;
-      break;
-    }
-
-    std::stable_sort(tree.begin(), tree.end(), Compare);
-
-    // The nodes are:
-    // [0, n): the sorted leaf nodes that we start with.
-    // [n]: we add a sentinel here.
-    // [n + 1, 2n): new parent nodes are added here, starting from
-    //              (n+1). These are naturally in ascending order.
-    // [2n]: we add a sentinel at the end as well.
-    // There will be (2n+1) elements at the end.
-    const HuffmanTree sentinel(std::numeric_limits<uint32_t>::max(), -1, -1);
-    tree.push_back(sentinel);
-    tree.push_back(sentinel);
-
-    size_t i = 0;      // Points to the next leaf node.
-    size_t j = n + 1;  // Points to the next non-leaf node.
-    for (size_t k = n - 1; k != 0; --k) {
-      size_t left;
-      size_t right;
-      if (tree[i].total_count <= tree[j].total_count) {
-        left = i;
-        ++i;
-      } else {
-        left = j;
-        ++j;
-      }
-      if (tree[i].total_count <= tree[j].total_count) {
-        right = i;
-        ++i;
-      } else {
-        right = j;
-        ++j;
-      }
-
-      // The sentinel node becomes the parent node.
-      size_t j_end = tree.size() - 1;
-      tree[j_end].total_count =
-          tree[left].total_count + tree[right].total_count;
-      tree[j_end].index_left = static_cast<int16_t>(left);
-      tree[j_end].index_right_or_value = static_cast<int16_t>(right);
-
-      // Add back the last sentinel node.
-      tree.push_back(sentinel);
-    }
-    JXL_DASSERT(tree.size() == 2 * n + 1);
-    SetDepth(tree[2 * n - 1], tree.data(), depth, 0);
-
-    // We need to pack the Huffman tree in tree_limit bits.
-    // If this was not successful, add fake entities to the lowest values
-    // and retry.
-    if (*std::max_element(&depth[0], &depth[length]) <= tree_limit) {
-      break;
-    }
-  }
-}
-
-void ValidateHuffmanTable(j_common_ptr cinfo, const JHUFF_TBL* table,
-                          bool is_dc) {
-  size_t total_symbols = 0;
-  size_t total_p = 0;
-  size_t max_depth = 0;
-  for (size_t d = 1; d <= kJpegHuffmanMaxBitLength; ++d) {
-    uint8_t count = table->bits[d];
-    if (count) {
-      total_symbols += count;
-      total_p += (1u << (kJpegHuffmanMaxBitLength - d)) * count;
-      max_depth = d;
-    }
-  }
-  total_p += 1u << (kJpegHuffmanMaxBitLength - max_depth);  // sentinel symbol
-  if (total_symbols == 0) {
-    JPEGLI_ERROR("Empty Huffman table");
-  }
-  if (total_symbols > kJpegHuffmanAlphabetSize) {
-    JPEGLI_ERROR("Too many symbols in Huffman table");
-  }
-  if (total_p != (1u << kJpegHuffmanMaxBitLength)) {
-    JPEGLI_ERROR("Invalid bit length distribution");
-  }
-  uint8_t symbol_seen[kJpegHuffmanAlphabetSize] = {};
-  for (size_t i = 0; i < total_symbols; ++i) {
-    uint8_t symbol = table->huffval[i];
-    if (symbol_seen[symbol]) {
-      JPEGLI_ERROR("Duplicate symbol %d in Huffman table", symbol);
-    }
-    symbol_seen[symbol] = 1;
-  }
-}
-
-void AddStandardHuffmanTables(j_common_ptr cinfo, bool is_dc) {
-  // Huffman tables from the JPEG standard.
-  static constexpr JHUFF_TBL kStandardDCTables[2] = {
-      // DC luma
-      {{0, 0, 1, 5, 1, 1, 1, 1, 1, 1},
-       {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11},
-       FALSE},
-      // DC chroma
-      {{0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1},
-       {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11},
-       FALSE}};
-  static constexpr JHUFF_TBL kStandardACTables[2] = {
-      // AC luma
-      {{0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 125},
-       {0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 0x21, 0x31, 0x41, 0x06,
-        0x13, 0x51, 0x61, 0x07, 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
-        0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, 0x24, 0x33, 0x62, 0x72,
-        0x82, 0x09, 0x0a, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
-        0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x43, 0x44, 0x45,
-        0x46, 0x47, 0x48, 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
-        0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x73, 0x74, 0x75,
-        0x76, 0x77, 0x78, 0x79, 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
-        0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3,
-        0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
-        0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9,
-        0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
-        0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xf1, 0xf2, 0xf3, 0xf4,
-        0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa},
-       FALSE},
-      // AC chroma
-      {{0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 119},
-       {0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, 0x31, 0x06, 0x12, 0x41,
-        0x51, 0x07, 0x61, 0x71, 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
-        0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, 0x15, 0x62, 0x72, 0xd1,
-        0x0a, 0x16, 0x24, 0x34, 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
-        0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x43, 0x44,
-        0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
-        0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x73, 0x74,
-        0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-        0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a,
-        0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
-        0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
-        0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
-        0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xf2, 0xf3, 0xf4,
-        0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa},
-       FALSE}};
-  const JHUFF_TBL* std_tables = is_dc ? kStandardDCTables : kStandardACTables;
-  JHUFF_TBL** tables;
-  if (cinfo->is_decompressor) {
-    j_decompress_ptr cinfo_d = reinterpret_cast<j_decompress_ptr>(cinfo);
-    tables = is_dc ? cinfo_d->dc_huff_tbl_ptrs : cinfo_d->ac_huff_tbl_ptrs;
-  } else {
-    j_compress_ptr cinfo_c = reinterpret_cast<j_compress_ptr>(cinfo);
-    tables = is_dc ? cinfo_c->dc_huff_tbl_ptrs : cinfo_c->ac_huff_tbl_ptrs;
-  }
-  for (int i = 0; i < 2; ++i) {
-    if (tables[i] == nullptr) {
-      tables[i] = jpegli_alloc_huff_table(cinfo);
-      memcpy(tables[i], &std_tables[i], sizeof(JHUFF_TBL));
-      ValidateHuffmanTable(cinfo, tables[i], is_dc);
-    }
-  }
-}
-
-}  // namespace jpegli
diff --git a/third_party/jpeg-xl/lib/jpegli/huffman.h b/third_party/jpeg-xl/lib/jpegli/huffman.h
deleted file mode 100644
index 99549668cffe7..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/huffman.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_HUFFMAN_H_
-#define LIB_JPEGLI_HUFFMAN_H_
-
-#include <stdint.h>
-#include <stdlib.h>
-
-#include "lib/jpegli/common_internal.h"
-
-namespace jpegli {
-
-constexpr int kJpegHuffmanRootTableBits = 8;
-// Maximum huffman lookup table size.
-// Requirements: alphabet of 257 symbols (256 + 1 special symbol for the all 1s
-// code) and max bit length 16, the root table has 8 bits.
-// zlib/examples/enough.c works with an assumption that Huffman code is
-// "complete". Input JPEGs might have this assumption broken, hence the
-// following sum is used as estimate:
-//  + number of 1-st level cells
-//  + number of symbols
-//  + asymptotic amount of repeated 2nd level cells
-// The third number is 1 + 3 + ... + 255 i.e. it is assumed that sub-table of
-// each "size" might be almost completely be filled with repetitions.
-// Total sum is slightly less than 1024,...
-constexpr int kJpegHuffmanLutSize = 1024;
-
-struct HuffmanTableEntry {
-  uint8_t bits;    // number of bits used for this symbol
-  uint16_t value;  // symbol value or table offset
-};
-
-void BuildJpegHuffmanTable(const uint32_t* count, const uint32_t* symbols,
-                           HuffmanTableEntry* lut);
-
-// This function will create a Huffman tree.
-//
-// The (data,length) contains the population counts.
-// The tree_limit is the maximum bit depth of the Huffman codes.
-//
-// The depth contains the tree, i.e., how many bits are used for
-// the symbol.
-//
-// See http://en.wikipedia.org/wiki/Huffman_coding
-void CreateHuffmanTree(const uint32_t* data, size_t length, int tree_limit,
-                       uint8_t* depth);
-
-void ValidateHuffmanTable(j_common_ptr cinfo, const JHUFF_TBL* table,
-                          bool is_dc);
-
-void AddStandardHuffmanTables(j_common_ptr cinfo, bool is_dc);
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_HUFFMAN_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/idct.cc b/third_party/jpeg-xl/lib/jpegli/idct.cc
deleted file mode 100644
index 665a00d826de0..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/idct.cc
+++ /dev/null
@@ -1,703 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/idct.h"
-
-#include <cmath>
-
-#include "lib/jpegli/decode_internal.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jpegli/idct.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jpegli/transpose-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jpegli {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Abs;
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::Gt;
-using hwy::HWY_NAMESPACE::IfThenElseZero;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::MulAdd;
-using hwy::HWY_NAMESPACE::NegMulAdd;
-using hwy::HWY_NAMESPACE::Rebind;
-using hwy::HWY_NAMESPACE::Sub;
-using hwy::HWY_NAMESPACE::Vec;
-using hwy::HWY_NAMESPACE::Xor;
-
-using D = HWY_FULL(float);
-using DI = HWY_FULL(int32_t);
-constexpr D d;
-constexpr DI di;
-
-using D8 = HWY_CAPPED(float, 8);
-constexpr D8 d8;
-
-void DequantBlock(const int16_t* JXL_RESTRICT qblock,
-                  const float* JXL_RESTRICT dequant,
-                  const float* JXL_RESTRICT biases, float* JXL_RESTRICT block) {
-  for (size_t k = 0; k < 64; k += Lanes(d)) {
-    const auto mul = Load(d, dequant + k);
-    const auto bias = Load(d, biases + k);
-    const Rebind<int16_t, DI> di16;
-    const Vec<DI> quant_i = PromoteTo(di, Load(di16, qblock + k));
-    const Rebind<float, DI> df;
-    const auto quant = ConvertTo(df, quant_i);
-    const auto abs_quant = Abs(quant);
-    const auto not_0 = Gt(abs_quant, Zero(df));
-    const auto sign_quant = Xor(quant, abs_quant);
-    const auto biased_quant = Sub(quant, Xor(bias, sign_quant));
-    const auto dequant = IfThenElseZero(not_0, Mul(biased_quant, mul));
-    Store(dequant, d, block + k);
-  }
-}
-
-template <size_t N>
-void ForwardEvenOdd(const float* JXL_RESTRICT a_in, size_t a_in_stride,
-                    float* JXL_RESTRICT a_out) {
-  for (size_t i = 0; i < N / 2; i++) {
-    auto in1 = LoadU(d8, a_in + 2 * i * a_in_stride);
-    Store(in1, d8, a_out + i * 8);
-  }
-  for (size_t i = N / 2; i < N; i++) {
-    auto in1 = LoadU(d8, a_in + (2 * (i - N / 2) + 1) * a_in_stride);
-    Store(in1, d8, a_out + i * 8);
-  }
-}
-
-template <size_t N>
-void BTranspose(float* JXL_RESTRICT coeff) {
-  for (size_t i = N - 1; i > 0; i--) {
-    auto in1 = Load(d8, coeff + i * 8);
-    auto in2 = Load(d8, coeff + (i - 1) * 8);
-    Store(Add(in1, in2), d8, coeff + i * 8);
-  }
-  constexpr float kSqrt2 = 1.41421356237f;
-  auto sqrt2 = Set(d8, kSqrt2);
-  auto in1 = Load(d8, coeff);
-  Store(Mul(in1, sqrt2), d8, coeff);
-}
-
-// Constants for DCT implementation. Generated by the following snippet:
-// for i in range(N // 2):
-//    print(1.0 / (2 * math.cos((i + 0.5) * math.pi / N)), end=", ")
-template <size_t N>
-struct WcMultipliers;
-
-template <>
-struct WcMultipliers<4> {
-  static constexpr float kMultipliers[] = {
-      0.541196100146197,
-      1.3065629648763764,
-  };
-};
-
-template <>
-struct WcMultipliers<8> {
-  static constexpr float kMultipliers[] = {
-      0.5097955791041592,
-      0.6013448869350453,
-      0.8999762231364156,
-      2.5629154477415055,
-  };
-};
-
-#if JXL_CXX_LANG < JXL_CXX_17
-constexpr float WcMultipliers<4>::kMultipliers[];
-constexpr float WcMultipliers<8>::kMultipliers[];
-#endif
-
-template <size_t N>
-void MultiplyAndAdd(const float* JXL_RESTRICT coeff, float* JXL_RESTRICT out,
-                    size_t out_stride) {
-  for (size_t i = 0; i < N / 2; i++) {
-    auto mul = Set(d8, WcMultipliers<N>::kMultipliers[i]);
-    auto in1 = Load(d8, coeff + i * 8);
-    auto in2 = Load(d8, coeff + (N / 2 + i) * 8);
-    auto out1 = MulAdd(mul, in2, in1);
-    auto out2 = NegMulAdd(mul, in2, in1);
-    StoreU(out1, d8, out + i * out_stride);
-    StoreU(out2, d8, out + (N - i - 1) * out_stride);
-  }
-}
-
-template <size_t N>
-struct IDCT1DImpl;
-
-template <>
-struct IDCT1DImpl<1> {
-  JXL_INLINE void operator()(const float* from, size_t from_stride, float* to,
-                             size_t to_stride) {
-    StoreU(LoadU(d8, from), d8, to);
-  }
-};
-
-template <>
-struct IDCT1DImpl<2> {
-  JXL_INLINE void operator()(const float* from, size_t from_stride, float* to,
-                             size_t to_stride) {
-    JXL_DASSERT(from_stride >= 8);
-    JXL_DASSERT(to_stride >= 8);
-    auto in1 = LoadU(d8, from);
-    auto in2 = LoadU(d8, from + from_stride);
-    StoreU(Add(in1, in2), d8, to);
-    StoreU(Sub(in1, in2), d8, to + to_stride);
-  }
-};
-
-template <size_t N>
-struct IDCT1DImpl {
-  void operator()(const float* from, size_t from_stride, float* to,
-                  size_t to_stride) {
-    JXL_DASSERT(from_stride >= 8);
-    JXL_DASSERT(to_stride >= 8);
-    HWY_ALIGN float tmp[64];
-    ForwardEvenOdd<N>(from, from_stride, tmp);
-    IDCT1DImpl<N / 2>()(tmp, 8, tmp, 8);
-    BTranspose<N / 2>(tmp + N * 4);
-    IDCT1DImpl<N / 2>()(tmp + N * 4, 8, tmp + N * 4, 8);
-    MultiplyAndAdd<N>(tmp, to, to_stride);
-  }
-};
-
-template <size_t N>
-void IDCT1D(float* JXL_RESTRICT from, float* JXL_RESTRICT output,
-            size_t output_stride) {
-  for (size_t i = 0; i < 8; i += Lanes(d8)) {
-    IDCT1DImpl<N>()(from + i, 8, output + i, output_stride);
-  }
-}
-
-void ComputeScaledIDCT(float* JXL_RESTRICT block0, float* JXL_RESTRICT block1,
-                       float* JXL_RESTRICT output, size_t output_stride) {
-  Transpose8x8Block(block0, block1);
-  IDCT1D<8>(block1, block0, 8);
-  Transpose8x8Block(block0, block1);
-  IDCT1D<8>(block1, output, output_stride);
-}
-
-void InverseTransformBlock8x8(const int16_t* JXL_RESTRICT qblock,
-                              const float* JXL_RESTRICT dequant,
-                              const float* JXL_RESTRICT biases,
-                              float* JXL_RESTRICT scratch_space,
-                              float* JXL_RESTRICT output, size_t output_stride,
-                              size_t dctsize) {
-  float* JXL_RESTRICT block0 = scratch_space;
-  float* JXL_RESTRICT block1 = scratch_space + DCTSIZE2;
-  DequantBlock(qblock, dequant, biases, block0);
-  ComputeScaledIDCT(block0, block1, output, output_stride);
-}
-
-// Computes the N-point IDCT of in[], and stores the result in out[]. The in[]
-// array is at most 8 values long, values in[8:N-1] are assumed to be 0.
-void Compute1dIDCT(const float* in, float* out, size_t N) {
-  switch (N) {
-    case 3: {
-      static constexpr float kC3[3] = {
-          1.414213562373,
-          1.224744871392,
-          0.707106781187,
-      };
-      float even0 = in[0] + kC3[2] * in[2];
-      float even1 = in[0] - kC3[0] * in[2];
-      float odd0 = kC3[1] * in[1];
-      out[0] = even0 + odd0;
-      out[2] = even0 - odd0;
-      out[1] = even1;
-      break;
-    }
-    case 5: {
-      static constexpr float kC5[5] = {
-          1.414213562373, 1.344997023928, 1.144122805635,
-          0.831253875555, 0.437016024449,
-      };
-      float even0 = in[0] + kC5[2] * in[2] + kC5[4] * in[4];
-      float even1 = in[0] - kC5[4] * in[2] - kC5[2] * in[4];
-      float even2 = in[0] - kC5[0] * in[2] + kC5[0] * in[4];
-      float odd0 = kC5[1] * in[1] + kC5[3] * in[3];
-      float odd1 = kC5[3] * in[1] - kC5[1] * in[3];
-      out[0] = even0 + odd0;
-      out[4] = even0 - odd0;
-      out[1] = even1 + odd1;
-      out[3] = even1 - odd1;
-      out[2] = even2;
-      break;
-    }
-    case 6: {
-      static constexpr float kC6[6] = {
-          1.414213562373, 1.366025403784, 1.224744871392,
-          1.000000000000, 0.707106781187, 0.366025403784,
-      };
-      float even0 = in[0] + kC6[2] * in[2] + kC6[4] * in[4];
-      float even1 = in[0] - kC6[0] * in[4];
-      float even2 = in[0] - kC6[2] * in[2] + kC6[4] * in[4];
-      float odd0 = kC6[1] * in[1] + kC6[3] * in[3] + kC6[5] * in[5];
-      float odd1 = kC6[3] * in[1] - kC6[3] * in[3] - kC6[3] * in[5];
-      float odd2 = kC6[5] * in[1] - kC6[3] * in[3] + kC6[1] * in[5];
-      out[0] = even0 + odd0;
-      out[5] = even0 - odd0;
-      out[1] = even1 + odd1;
-      out[4] = even1 - odd1;
-      out[2] = even2 + odd2;
-      out[3] = even2 - odd2;
-      break;
-    }
-    case 7: {
-      static constexpr float kC7[7] = {
-          1.414213562373, 1.378756275744, 1.274162392264, 1.105676685997,
-          0.881747733790, 0.613604268353, 0.314692122713,
-      };
-      float even0 = in[0] + kC7[2] * in[2] + kC7[4] * in[4] + kC7[6] * in[6];
-      float even1 = in[0] + kC7[6] * in[2] - kC7[2] * in[4] - kC7[4] * in[6];
-      float even2 = in[0] - kC7[4] * in[2] - kC7[6] * in[4] + kC7[2] * in[6];
-      float even3 = in[0] - kC7[0] * in[2] + kC7[0] * in[4] - kC7[0] * in[6];
-      float odd0 = kC7[1] * in[1] + kC7[3] * in[3] + kC7[5] * in[5];
-      float odd1 = kC7[3] * in[1] - kC7[5] * in[3] - kC7[1] * in[5];
-      float odd2 = kC7[5] * in[1] - kC7[1] * in[3] + kC7[3] * in[5];
-      out[0] = even0 + odd0;
-      out[6] = even0 - odd0;
-      out[1] = even1 + odd1;
-      out[5] = even1 - odd1;
-      out[2] = even2 + odd2;
-      out[4] = even2 - odd2;
-      out[3] = even3;
-      break;
-    }
-    case 9: {
-      static constexpr float kC9[9] = {
-          1.414213562373, 1.392728480640, 1.328926048777,
-          1.224744871392, 1.083350440839, 0.909038955344,
-          0.707106781187, 0.483689525296, 0.245575607938,
-      };
-      float even0 = in[0] + kC9[2] * in[2] + kC9[4] * in[4] + kC9[6] * in[6];
-      float even1 = in[0] + kC9[6] * in[2] - kC9[6] * in[4] - kC9[0] * in[6];
-      float even2 = in[0] - kC9[8] * in[2] - kC9[2] * in[4] + kC9[6] * in[6];
-      float even3 = in[0] - kC9[4] * in[2] + kC9[8] * in[4] + kC9[6] * in[6];
-      float even4 = in[0] - kC9[0] * in[2] + kC9[0] * in[4] - kC9[0] * in[6];
-      float odd0 =
-          kC9[1] * in[1] + kC9[3] * in[3] + kC9[5] * in[5] + kC9[7] * in[7];
-      float odd1 = kC9[3] * in[1] - kC9[3] * in[5] - kC9[3] * in[7];
-      float odd2 =
-          kC9[5] * in[1] - kC9[3] * in[3] - kC9[7] * in[5] + kC9[1] * in[7];
-      float odd3 =
-          kC9[7] * in[1] - kC9[3] * in[3] + kC9[1] * in[5] - kC9[5] * in[7];
-      out[0] = even0 + odd0;
-      out[8] = even0 - odd0;
-      out[1] = even1 + odd1;
-      out[7] = even1 - odd1;
-      out[2] = even2 + odd2;
-      out[6] = even2 - odd2;
-      out[3] = even3 + odd3;
-      out[5] = even3 - odd3;
-      out[4] = even4;
-      break;
-    }
-    case 10: {
-      static constexpr float kC10[10] = {
-          1.414213562373, 1.396802246667, 1.344997023928, 1.260073510670,
-          1.144122805635, 1.000000000000, 0.831253875555, 0.642039521920,
-          0.437016024449, 0.221231742082,
-      };
-      float even0 = in[0] + kC10[2] * in[2] + kC10[4] * in[4] + kC10[6] * in[6];
-      float even1 = in[0] + kC10[6] * in[2] - kC10[8] * in[4] - kC10[2] * in[6];
-      float even2 = in[0] - kC10[0] * in[4];
-      float even3 = in[0] - kC10[6] * in[2] - kC10[8] * in[4] + kC10[2] * in[6];
-      float even4 = in[0] - kC10[2] * in[2] + kC10[4] * in[4] - kC10[6] * in[6];
-      float odd0 =
-          kC10[1] * in[1] + kC10[3] * in[3] + kC10[5] * in[5] + kC10[7] * in[7];
-      float odd1 =
-          kC10[3] * in[1] + kC10[9] * in[3] - kC10[5] * in[5] - kC10[1] * in[7];
-      float odd2 =
-          kC10[5] * in[1] - kC10[5] * in[3] - kC10[5] * in[5] + kC10[5] * in[7];
-      float odd3 =
-          kC10[7] * in[1] - kC10[1] * in[3] + kC10[5] * in[5] + kC10[9] * in[7];
-      float odd4 =
-          kC10[9] * in[1] - kC10[7] * in[3] + kC10[5] * in[5] - kC10[3] * in[7];
-      out[0] = even0 + odd0;
-      out[9] = even0 - odd0;
-      out[1] = even1 + odd1;
-      out[8] = even1 - odd1;
-      out[2] = even2 + odd2;
-      out[7] = even2 - odd2;
-      out[3] = even3 + odd3;
-      out[6] = even3 - odd3;
-      out[4] = even4 + odd4;
-      out[5] = even4 - odd4;
-      break;
-    }
-    case 11: {
-      static constexpr float kC11[11] = {
-          1.414213562373, 1.399818907436, 1.356927976287, 1.286413904599,
-          1.189712155524, 1.068791297809, 0.926112931411, 0.764581576418,
-          0.587485545401, 0.398430002847, 0.201263574413,
-      };
-      float even0 = in[0] + kC11[2] * in[2] + kC11[4] * in[4] + kC11[6] * in[6];
-      float even1 =
-          in[0] + kC11[6] * in[2] - kC11[10] * in[4] - kC11[4] * in[6];
-      float even2 =
-          in[0] + kC11[10] * in[2] - kC11[2] * in[4] - kC11[8] * in[6];
-      float even3 = in[0] - kC11[8] * in[2] - kC11[6] * in[4] + kC11[2] * in[6];
-      float even4 =
-          in[0] - kC11[4] * in[2] + kC11[8] * in[4] + kC11[10] * in[6];
-      float even5 = in[0] - kC11[0] * in[2] + kC11[0] * in[4] - kC11[0] * in[6];
-      float odd0 =
-          kC11[1] * in[1] + kC11[3] * in[3] + kC11[5] * in[5] + kC11[7] * in[7];
-      float odd1 =
-          kC11[3] * in[1] + kC11[9] * in[3] - kC11[7] * in[5] - kC11[1] * in[7];
-      float odd2 =
-          kC11[5] * in[1] - kC11[7] * in[3] - kC11[3] * in[5] + kC11[9] * in[7];
-      float odd3 =
-          kC11[7] * in[1] - kC11[1] * in[3] + kC11[9] * in[5] + kC11[5] * in[7];
-      float odd4 =
-          kC11[9] * in[1] - kC11[5] * in[3] + kC11[1] * in[5] - kC11[3] * in[7];
-      out[0] = even0 + odd0;
-      out[10] = even0 - odd0;
-      out[1] = even1 + odd1;
-      out[9] = even1 - odd1;
-      out[2] = even2 + odd2;
-      out[8] = even2 - odd2;
-      out[3] = even3 + odd3;
-      out[7] = even3 - odd3;
-      out[4] = even4 + odd4;
-      out[6] = even4 - odd4;
-      out[5] = even5;
-      break;
-    }
-    case 12: {
-      static constexpr float kC12[12] = {
-          1.414213562373, 1.402114769300, 1.366025403784, 1.306562964876,
-          1.224744871392, 1.121971053594, 1.000000000000, 0.860918669154,
-          0.707106781187, 0.541196100146, 0.366025403784, 0.184591911283,
-      };
-      float even0 = in[0] + kC12[2] * in[2] + kC12[4] * in[4] + kC12[6] * in[6];
-      float even1 = in[0] + kC12[6] * in[2] - kC12[6] * in[6];
-      float even2 =
-          in[0] + kC12[10] * in[2] - kC12[4] * in[4] - kC12[6] * in[6];
-      float even3 =
-          in[0] - kC12[10] * in[2] - kC12[4] * in[4] + kC12[6] * in[6];
-      float even4 = in[0] - kC12[6] * in[2] + kC12[6] * in[6];
-      float even5 = in[0] - kC12[2] * in[2] + kC12[4] * in[4] - kC12[6] * in[6];
-      float odd0 =
-          kC12[1] * in[1] + kC12[3] * in[3] + kC12[5] * in[5] + kC12[7] * in[7];
-      float odd1 =
-          kC12[3] * in[1] + kC12[9] * in[3] - kC12[9] * in[5] - kC12[3] * in[7];
-      float odd2 = kC12[5] * in[1] - kC12[9] * in[3] - kC12[1] * in[5] -
-                   kC12[11] * in[7];
-      float odd3 = kC12[7] * in[1] - kC12[3] * in[3] - kC12[11] * in[5] +
-                   kC12[1] * in[7];
-      float odd4 =
-          kC12[9] * in[1] - kC12[3] * in[3] + kC12[3] * in[5] - kC12[9] * in[7];
-      float odd5 = kC12[11] * in[1] - kC12[9] * in[3] + kC12[7] * in[5] -
-                   kC12[5] * in[7];
-      out[0] = even0 + odd0;
-      out[11] = even0 - odd0;
-      out[1] = even1 + odd1;
-      out[10] = even1 - odd1;
-      out[2] = even2 + odd2;
-      out[9] = even2 - odd2;
-      out[3] = even3 + odd3;
-      out[8] = even3 - odd3;
-      out[4] = even4 + odd4;
-      out[7] = even4 - odd4;
-      out[5] = even5 + odd5;
-      out[6] = even5 - odd5;
-      break;
-    }
-    case 13: {
-      static constexpr float kC13[13] = {
-          1.414213562373, 1.403902353238, 1.373119086479, 1.322312651445,
-          1.252223920364, 1.163874944761, 1.058554051646, 0.937797056801,
-          0.803364869133, 0.657217812653, 0.501487040539, 0.338443458124,
-          0.170464607981,
-      };
-      float even0 = in[0] + kC13[2] * in[2] + kC13[4] * in[4] + kC13[6] * in[6];
-      float even1 =
-          in[0] + kC13[6] * in[2] + kC13[12] * in[4] - kC13[8] * in[6];
-      float even2 =
-          in[0] + kC13[10] * in[2] - kC13[6] * in[4] - kC13[4] * in[6];
-      float even3 =
-          in[0] - kC13[12] * in[2] - kC13[2] * in[4] + kC13[10] * in[6];
-      float even4 =
-          in[0] - kC13[8] * in[2] - kC13[10] * in[4] + kC13[2] * in[6];
-      float even5 =
-          in[0] - kC13[4] * in[2] + kC13[8] * in[4] - kC13[12] * in[6];
-      float even6 = in[0] - kC13[0] * in[2] + kC13[0] * in[4] - kC13[0] * in[6];
-      float odd0 =
-          kC13[1] * in[1] + kC13[3] * in[3] + kC13[5] * in[5] + kC13[7] * in[7];
-      float odd1 = kC13[3] * in[1] + kC13[9] * in[3] - kC13[11] * in[5] -
-                   kC13[5] * in[7];
-      float odd2 = kC13[5] * in[1] - kC13[11] * in[3] - kC13[1] * in[5] -
-                   kC13[9] * in[7];
-      float odd3 =
-          kC13[7] * in[1] - kC13[5] * in[3] - kC13[9] * in[5] + kC13[3] * in[7];
-      float odd4 = kC13[9] * in[1] - kC13[1] * in[3] + kC13[7] * in[5] +
-                   kC13[11] * in[7];
-      float odd5 = kC13[11] * in[1] - kC13[7] * in[3] + kC13[3] * in[5] -
-                   kC13[1] * in[7];
-      out[0] = even0 + odd0;
-      out[12] = even0 - odd0;
-      out[1] = even1 + odd1;
-      out[11] = even1 - odd1;
-      out[2] = even2 + odd2;
-      out[10] = even2 - odd2;
-      out[3] = even3 + odd3;
-      out[9] = even3 - odd3;
-      out[4] = even4 + odd4;
-      out[8] = even4 - odd4;
-      out[5] = even5 + odd5;
-      out[7] = even5 - odd5;
-      out[6] = even6;
-      break;
-    }
-    case 14: {
-      static constexpr float kC14[14] = {
-          1.414213562373, 1.405321284327, 1.378756275744, 1.334852607020,
-          1.274162392264, 1.197448846138, 1.105676685997, 1.000000000000,
-          0.881747733790, 0.752406978226, 0.613604268353, 0.467085128785,
-          0.314692122713, 0.158341680609,
-      };
-      float even0 = in[0] + kC14[2] * in[2] + kC14[4] * in[4] + kC14[6] * in[6];
-      float even1 =
-          in[0] + kC14[6] * in[2] + kC14[12] * in[4] - kC14[10] * in[6];
-      float even2 =
-          in[0] + kC14[10] * in[2] - kC14[8] * in[4] - kC14[2] * in[6];
-      float even3 = in[0] - kC14[0] * in[4];
-      float even4 =
-          in[0] - kC14[10] * in[2] - kC14[8] * in[4] + kC14[2] * in[6];
-      float even5 =
-          in[0] - kC14[6] * in[2] + kC14[12] * in[4] + kC14[10] * in[6];
-      float even6 = in[0] - kC14[2] * in[2] + kC14[4] * in[4] - kC14[6] * in[6];
-      float odd0 =
-          kC14[1] * in[1] + kC14[3] * in[3] + kC14[5] * in[5] + kC14[7] * in[7];
-      float odd1 = kC14[3] * in[1] + kC14[9] * in[3] - kC14[13] * in[5] -
-                   kC14[7] * in[7];
-      float odd2 = kC14[5] * in[1] - kC14[13] * in[3] - kC14[3] * in[5] -
-                   kC14[7] * in[7];
-      float odd3 =
-          kC14[7] * in[1] - kC14[7] * in[3] - kC14[7] * in[5] + kC14[7] * in[7];
-      float odd4 = kC14[9] * in[1] - kC14[1] * in[3] + kC14[11] * in[5] +
-                   kC14[7] * in[7];
-      float odd5 = kC14[11] * in[1] - kC14[5] * in[3] + kC14[1] * in[5] -
-                   kC14[7] * in[7];
-      float odd6 = kC14[13] * in[1] - kC14[11] * in[3] + kC14[9] * in[5] -
-                   kC14[7] * in[7];
-      out[0] = even0 + odd0;
-      out[13] = even0 - odd0;
-      out[1] = even1 + odd1;
-      out[12] = even1 - odd1;
-      out[2] = even2 + odd2;
-      out[11] = even2 - odd2;
-      out[3] = even3 + odd3;
-      out[10] = even3 - odd3;
-      out[4] = even4 + odd4;
-      out[9] = even4 - odd4;
-      out[5] = even5 + odd5;
-      out[8] = even5 - odd5;
-      out[6] = even6 + odd6;
-      out[7] = even6 - odd6;
-      break;
-    }
-    case 15: {
-      static constexpr float kC15[15] = {
-          1.414213562373, 1.406466352507, 1.383309602960, 1.344997023928,
-          1.291948376043, 1.224744871392, 1.144122805635, 1.050965490998,
-          0.946293578512, 0.831253875555, 0.707106781187, 0.575212476952,
-          0.437016024449, 0.294031532930, 0.147825570407,
-      };
-      float even0 = in[0] + kC15[2] * in[2] + kC15[4] * in[4] + kC15[6] * in[6];
-      float even1 =
-          in[0] + kC15[6] * in[2] + kC15[12] * in[4] - kC15[12] * in[6];
-      float even2 =
-          in[0] + kC15[10] * in[2] - kC15[10] * in[4] - kC15[0] * in[6];
-      float even3 =
-          in[0] + kC15[14] * in[2] - kC15[2] * in[4] - kC15[12] * in[6];
-      float even4 =
-          in[0] - kC15[12] * in[2] - kC15[6] * in[4] + kC15[6] * in[6];
-      float even5 =
-          in[0] - kC15[8] * in[2] - kC15[14] * in[4] + kC15[6] * in[6];
-      float even6 =
-          in[0] - kC15[4] * in[2] + kC15[8] * in[4] - kC15[12] * in[6];
-      float even7 = in[0] - kC15[0] * in[2] + kC15[0] * in[4] - kC15[0] * in[6];
-      float odd0 =
-          kC15[1] * in[1] + kC15[3] * in[3] + kC15[5] * in[5] + kC15[7] * in[7];
-      float odd1 = kC15[3] * in[1] + kC15[9] * in[3] - kC15[9] * in[7];
-      float odd2 = kC15[5] * in[1] - kC15[5] * in[5] - kC15[5] * in[7];
-      float odd3 = kC15[7] * in[1] - kC15[9] * in[3] - kC15[5] * in[5] +
-                   kC15[11] * in[7];
-      float odd4 = kC15[9] * in[1] - kC15[3] * in[3] + kC15[3] * in[7];
-      float odd5 = kC15[11] * in[1] - kC15[3] * in[3] + kC15[5] * in[5] -
-                   kC15[13] * in[7];
-      float odd6 = kC15[13] * in[1] - kC15[9] * in[3] + kC15[5] * in[5] -
-                   kC15[1] * in[7];
-      out[0] = even0 + odd0;
-      out[14] = even0 - odd0;
-      out[1] = even1 + odd1;
-      out[13] = even1 - odd1;
-      out[2] = even2 + odd2;
-      out[12] = even2 - odd2;
-      out[3] = even3 + odd3;
-      out[11] = even3 - odd3;
-      out[4] = even4 + odd4;
-      out[10] = even4 - odd4;
-      out[5] = even5 + odd5;
-      out[9] = even5 - odd5;
-      out[6] = even6 + odd6;
-      out[8] = even6 - odd6;
-      out[7] = even7;
-      break;
-    }
-    case 16: {
-      static constexpr float kC16[16] = {
-          1.414213562373, 1.407403737526, 1.387039845322, 1.353318001174,
-          1.306562964876, 1.247225012987, 1.175875602419, 1.093201867002,
-          1.000000000000, 0.897167586343, 0.785694958387, 0.666655658478,
-          0.541196100146, 0.410524527522, 0.275899379283, 0.138617169199,
-      };
-      float even0 = in[0] + kC16[2] * in[2] + kC16[4] * in[4] + kC16[6] * in[6];
-      float even1 =
-          in[0] + kC16[6] * in[2] + kC16[12] * in[4] - kC16[14] * in[6];
-      float even2 =
-          in[0] + kC16[10] * in[2] - kC16[12] * in[4] - kC16[2] * in[6];
-      float even3 =
-          in[0] + kC16[14] * in[2] - kC16[4] * in[4] - kC16[10] * in[6];
-      float even4 =
-          in[0] - kC16[14] * in[2] - kC16[4] * in[4] + kC16[10] * in[6];
-      float even5 =
-          in[0] - kC16[10] * in[2] - kC16[12] * in[4] + kC16[2] * in[6];
-      float even6 =
-          in[0] - kC16[6] * in[2] + kC16[12] * in[4] + kC16[14] * in[6];
-      float even7 = in[0] - kC16[2] * in[2] + kC16[4] * in[4] - kC16[6] * in[6];
-      float odd0 = (kC16[1] * in[1] + kC16[3] * in[3] + kC16[5] * in[5] +
-                    kC16[7] * in[7]);
-      float odd1 = (kC16[3] * in[1] + kC16[9] * in[3] + kC16[15] * in[5] -
-                    kC16[11] * in[7]);
-      float odd2 = (kC16[5] * in[1] + kC16[15] * in[3] - kC16[7] * in[5] -
-                    kC16[3] * in[7]);
-      float odd3 = (kC16[7] * in[1] - kC16[11] * in[3] - kC16[3] * in[5] +
-                    kC16[15] * in[7]);
-      float odd4 = (kC16[9] * in[1] - kC16[5] * in[3] - kC16[13] * in[5] +
-                    kC16[1] * in[7]);
-      float odd5 = (kC16[11] * in[1] - kC16[1] * in[3] + kC16[9] * in[5] +
-                    kC16[13] * in[7]);
-      float odd6 = (kC16[13] * in[1] - kC16[7] * in[3] + kC16[1] * in[5] -
-                    kC16[5] * in[7]);
-      float odd7 = (kC16[15] * in[1] - kC16[13] * in[3] + kC16[11] * in[5] -
-                    kC16[9] * in[7]);
-      out[0] = even0 + odd0;
-      out[15] = even0 - odd0;
-      out[1] = even1 + odd1;
-      out[14] = even1 - odd1;
-      out[2] = even2 + odd2;
-      out[13] = even2 - odd2;
-      out[3] = even3 + odd3;
-      out[12] = even3 - odd3;
-      out[4] = even4 + odd4;
-      out[11] = even4 - odd4;
-      out[5] = even5 + odd5;
-      out[10] = even5 - odd5;
-      out[6] = even6 + odd6;
-      out[9] = even6 - odd6;
-      out[7] = even7 + odd7;
-      out[8] = even7 - odd7;
-      break;
-    }
-    default:
-      JXL_DEBUG_ABORT("Unreachable");
-      break;
-  }
-}
-
-void InverseTransformBlockGeneric(const int16_t* JXL_RESTRICT qblock,
-                                  const float* JXL_RESTRICT dequant,
-                                  const float* JXL_RESTRICT biases,
-                                  float* JXL_RESTRICT scratch_space,
-                                  float* JXL_RESTRICT output,
-                                  size_t output_stride, size_t dctsize) {
-  float* JXL_RESTRICT block0 = scratch_space;
-  float* JXL_RESTRICT block1 = scratch_space + DCTSIZE2;
-  DequantBlock(qblock, dequant, biases, block0);
-  if (dctsize == 1) {
-    *output = *block0;
-  } else if (dctsize == 2 || dctsize == 4) {
-    float* JXL_RESTRICT block2 = scratch_space + 2 * DCTSIZE2;
-    ComputeScaledIDCT(block0, block1, block2, 8);
-    if (dctsize == 4) {
-      for (size_t iy = 0; iy < 4; ++iy) {
-        for (size_t ix = 0; ix < 4; ++ix) {
-          float* block = &block2[16 * iy + 2 * ix];
-          output[iy * output_stride + ix] =
-              0.25f * (block[0] + block[1] + block[8] + block[9]);
-        }
-      }
-    } else {
-      for (size_t iy = 0; iy < 2; ++iy) {
-        for (size_t ix = 0; ix < 2; ++ix) {
-          float* block = &block2[32 * iy + 4 * ix];
-          output[iy * output_stride + ix] =
-              0.0625f *
-              (block[0] + block[1] + block[2] + block[3] + block[8] + block[9] +
-               block[10] + block[11] + block[16] + block[17] + block[18] +
-               block[19] + block[24] + block[25] + block[26] + block[27]);
-        }
-      }
-    }
-  } else {
-    float dctin[DCTSIZE];
-    float dctout[DCTSIZE * 2];
-    size_t insize = std::min<size_t>(dctsize, DCTSIZE);
-    for (size_t ix = 0; ix < insize; ++ix) {
-      for (size_t iy = 0; iy < insize; ++iy) {
-        dctin[iy] = block0[iy * DCTSIZE + ix];
-      }
-      Compute1dIDCT(dctin, dctout, dctsize);
-      for (size_t iy = 0; iy < dctsize; ++iy) {
-        block1[iy * dctsize + ix] = dctout[iy];
-      }
-    }
-    for (size_t iy = 0; iy < dctsize; ++iy) {
-      Compute1dIDCT(block1 + iy * dctsize, output + iy * output_stride,
-                    dctsize);
-    }
-  }
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jpegli
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jpegli {
-
-HWY_EXPORT(InverseTransformBlock8x8);
-HWY_EXPORT(InverseTransformBlockGeneric);
-
-jxl::Status ChooseInverseTransform(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    int dct_size = m->scaled_dct_size[c];
-    if (dct_size < 1 || dct_size > 16) {
-      return JXL_FAILURE("Compute1dIDCT does not support N=%d", dct_size);
-    }
-    if (dct_size == DCTSIZE) {
-      m->inverse_transform[c] = HWY_DYNAMIC_DISPATCH(InverseTransformBlock8x8);
-    } else {
-      m->inverse_transform[c] =
-          HWY_DYNAMIC_DISPATCH(InverseTransformBlockGeneric);
-    }
-  }
-  return true;
-}
-
-}  // namespace jpegli
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jpegli/idct.h b/third_party/jpeg-xl/lib/jpegli/idct.h
deleted file mode 100644
index 746b1562c1524..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/idct.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_IDCT_H_
-#define LIB_JPEGLI_IDCT_H_
-
-#include "lib/jpegli/common.h"
-#include "lib/jxl/base/status.h"
-
-namespace jpegli {
-
-jxl::Status ChooseInverseTransform(j_decompress_ptr cinfo);
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_IDCT_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/input.cc b/third_party/jpeg-xl/lib/jpegli/input.cc
deleted file mode 100644
index 16299477f7b32..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/input.cc
+++ /dev/null
@@ -1,414 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/input.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jpegli/input.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jpegli/encode_internal.h"
-#include "lib/jpegli/error.h"
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/compiler_specific.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jpegli {
-namespace HWY_NAMESPACE {
-
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::Rebind;
-using hwy::HWY_NAMESPACE::Vec;
-
-using D = HWY_FULL(float);
-using DU = HWY_FULL(uint32_t);
-using DU8 = Rebind<uint8_t, D>;
-using DU16 = Rebind<uint16_t, D>;
-
-constexpr D d;
-constexpr DU du;
-constexpr DU8 du8;
-constexpr DU16 du16;
-
-static constexpr double kMul16 = 1.0 / 257.0;
-static constexpr double kMulFloat = 255.0;
-
-template <size_t C>
-void ReadUint8Row(const uint8_t* row_in, size_t x0, size_t len,
-                  float* row_out[kMaxComponents]) {
-  for (size_t x = x0; x < len; ++x) {
-    for (size_t c = 0; c < C; ++c) {
-      row_out[c][x] = row_in[C * x + c];
-    }
-  }
-}
-
-template <size_t C, bool swap_endianness = false>
-void ReadUint16Row(const uint8_t* row_in, size_t x0, size_t len,
-                   float* row_out[kMaxComponents]) {
-  const uint16_t* row16 = reinterpret_cast<const uint16_t*>(row_in);
-  for (size_t x = x0; x < len; ++x) {
-    for (size_t c = 0; c < C; ++c) {
-      uint16_t val = row16[C * x + c];
-      if (swap_endianness) val = JXL_BSWAP16(val);
-      row_out[c][x] = val * kMul16;
-    }
-  }
-}
-
-template <size_t C, bool swap_endianness = false>
-void ReadFloatRow(const uint8_t* row_in, size_t x0, size_t len,
-                  float* row_out[kMaxComponents]) {
-  const float* rowf = reinterpret_cast<const float*>(row_in);
-  for (size_t x = x0; x < len; ++x) {
-    for (size_t c = 0; c < C; ++c) {
-      float val = rowf[C * x + c];
-      if (swap_endianness) val = BSwapFloat(val);
-      row_out[c][x] = val * kMulFloat;
-    }
-  }
-}
-
-void ReadUint8RowSingle(const uint8_t* row_in, size_t len,
-                        float* row_out[kMaxComponents]) {
-  const size_t N = Lanes(d);
-  const size_t simd_len = len & (~(N - 1));
-  float* JXL_RESTRICT const row0 = row_out[0];
-  for (size_t x = 0; x < simd_len; x += N) {
-    Store(ConvertTo(d, PromoteTo(du, LoadU(du8, row_in + x))), d, row0 + x);
-  }
-  ReadUint8Row<1>(row_in, simd_len, len, row_out);
-}
-
-void ReadUint8RowInterleaved2(const uint8_t* row_in, size_t len,
-                              float* row_out[kMaxComponents]) {
-  const size_t N = Lanes(d);
-  const size_t simd_len = len & (~(N - 1));
-  float* JXL_RESTRICT const row0 = row_out[0];
-  float* JXL_RESTRICT const row1 = row_out[1];
-  Vec<DU8> out0, out1;  // NOLINT
-  for (size_t x = 0; x < simd_len; x += N) {
-    LoadInterleaved2(du8, row_in + 2 * x, out0, out1);
-    Store(ConvertTo(d, PromoteTo(du, out0)), d, row0 + x);
-    Store(ConvertTo(d, PromoteTo(du, out1)), d, row1 + x);
-  }
-  ReadUint8Row<2>(row_in, simd_len, len, row_out);
-}
-
-void ReadUint8RowInterleaved3(const uint8_t* row_in, size_t len,
-                              float* row_out[kMaxComponents]) {
-  const size_t N = Lanes(d);
-  const size_t simd_len = len & (~(N - 1));
-  float* JXL_RESTRICT const row0 = row_out[0];
-  float* JXL_RESTRICT const row1 = row_out[1];
-  float* JXL_RESTRICT const row2 = row_out[2];
-  Vec<DU8> out0, out1, out2;  // NOLINT
-  for (size_t x = 0; x < simd_len; x += N) {
-    LoadInterleaved3(du8, row_in + 3 * x, out0, out1, out2);
-    Store(ConvertTo(d, PromoteTo(du, out0)), d, row0 + x);
-    Store(ConvertTo(d, PromoteTo(du, out1)), d, row1 + x);
-    Store(ConvertTo(d, PromoteTo(du, out2)), d, row2 + x);
-  }
-  ReadUint8Row<3>(row_in, simd_len, len, row_out);
-}
-
-void ReadUint8RowInterleaved4(const uint8_t* row_in, size_t len,
-                              float* row_out[kMaxComponents]) {
-  const size_t N = Lanes(d);
-  const size_t simd_len = len & (~(N - 1));
-  float* JXL_RESTRICT const row0 = row_out[0];
-  float* JXL_RESTRICT const row1 = row_out[1];
-  float* JXL_RESTRICT const row2 = row_out[2];
-  float* JXL_RESTRICT const row3 = row_out[3];
-  Vec<DU8> out0, out1, out2, out3;  // NOLINT
-  for (size_t x = 0; x < simd_len; x += N) {
-    LoadInterleaved4(du8, row_in + 4 * x, out0, out1, out2, out3);
-    Store(ConvertTo(d, PromoteTo(du, out0)), d, row0 + x);
-    Store(ConvertTo(d, PromoteTo(du, out1)), d, row1 + x);
-    Store(ConvertTo(d, PromoteTo(du, out2)), d, row2 + x);
-    Store(ConvertTo(d, PromoteTo(du, out3)), d, row3 + x);
-  }
-  ReadUint8Row<4>(row_in, simd_len, len, row_out);
-}
-
-void ReadUint16RowSingle(const uint8_t* row_in, size_t len,
-                         float* row_out[kMaxComponents]) {
-  const size_t N = Lanes(d);
-  const size_t simd_len = len & (~(N - 1));
-  const auto mul = Set(d, kMul16);
-  const uint16_t* JXL_RESTRICT const row =
-      reinterpret_cast<const uint16_t*>(row_in);
-  float* JXL_RESTRICT const row0 = row_out[0];
-  for (size_t x = 0; x < simd_len; x += N) {
-    Store(Mul(mul, ConvertTo(d, PromoteTo(du, LoadU(du16, row + x)))), d,
-          row0 + x);
-  }
-  ReadUint16Row<1>(row_in, simd_len, len, row_out);
-}
-
-void ReadUint16RowInterleaved2(const uint8_t* row_in, size_t len,
-                               float* row_out[kMaxComponents]) {
-  const size_t N = Lanes(d);
-  const size_t simd_len = len & (~(N - 1));
-  const auto mul = Set(d, kMul16);
-  const uint16_t* JXL_RESTRICT const row =
-      reinterpret_cast<const uint16_t*>(row_in);
-  float* JXL_RESTRICT const row0 = row_out[0];
-  float* JXL_RESTRICT const row1 = row_out[1];
-  Vec<DU16> out0, out1;  // NOLINT
-  for (size_t x = 0; x < simd_len; x += N) {
-    LoadInterleaved2(du16, row + 2 * x, out0, out1);
-    Store(Mul(mul, ConvertTo(d, PromoteTo(du, out0))), d, row0 + x);
-    Store(Mul(mul, ConvertTo(d, PromoteTo(du, out1))), d, row1 + x);
-  }
-  ReadUint16Row<2>(row_in, simd_len, len, row_out);
-}
-
-void ReadUint16RowInterleaved3(const uint8_t* row_in, size_t len,
-                               float* row_out[kMaxComponents]) {
-  const size_t N = Lanes(d);
-  const size_t simd_len = len & (~(N - 1));
-  const auto mul = Set(d, kMul16);
-  const uint16_t* JXL_RESTRICT const row =
-      reinterpret_cast<const uint16_t*>(row_in);
-  float* JXL_RESTRICT const row0 = row_out[0];
-  float* JXL_RESTRICT const row1 = row_out[1];
-  float* JXL_RESTRICT const row2 = row_out[2];
-  Vec<DU16> out0, out1, out2;  // NOLINT
-  for (size_t x = 0; x < simd_len; x += N) {
-    LoadInterleaved3(du16, row + 3 * x, out0, out1, out2);
-    Store(Mul(mul, ConvertTo(d, PromoteTo(du, out0))), d, row0 + x);
-    Store(Mul(mul, ConvertTo(d, PromoteTo(du, out1))), d, row1 + x);
-    Store(Mul(mul, ConvertTo(d, PromoteTo(du, out2))), d, row2 + x);
-  }
-  ReadUint16Row<3>(row_in, simd_len, len, row_out);
-}
-
-void ReadUint16RowInterleaved4(const uint8_t* row_in, size_t len,
-                               float* row_out[kMaxComponents]) {
-  const size_t N = Lanes(d);
-  const size_t simd_len = len & (~(N - 1));
-  const auto mul = Set(d, kMul16);
-  const uint16_t* JXL_RESTRICT const row =
-      reinterpret_cast<const uint16_t*>(row_in);
-  float* JXL_RESTRICT const row0 = row_out[0];
-  float* JXL_RESTRICT const row1 = row_out[1];
-  float* JXL_RESTRICT const row2 = row_out[2];
-  float* JXL_RESTRICT const row3 = row_out[3];
-  Vec<DU16> out0, out1, out2, out3;  // NOLINT
-  for (size_t x = 0; x < simd_len; x += N) {
-    LoadInterleaved4(du16, row + 4 * x, out0, out1, out2, out3);
-    Store(Mul(mul, ConvertTo(d, PromoteTo(du, out0))), d, row0 + x);
-    Store(Mul(mul, ConvertTo(d, PromoteTo(du, out1))), d, row1 + x);
-    Store(Mul(mul, ConvertTo(d, PromoteTo(du, out2))), d, row2 + x);
-    Store(Mul(mul, ConvertTo(d, PromoteTo(du, out3))), d, row3 + x);
-  }
-  ReadUint16Row<4>(row_in, simd_len, len, row_out);
-}
-
-void ReadUint16RowSingleSwap(const uint8_t* row_in, size_t len,
-                             float* row_out[kMaxComponents]) {
-  ReadUint16Row<1, true>(row_in, 0, len, row_out);
-}
-
-void ReadUint16RowInterleaved2Swap(const uint8_t* row_in, size_t len,
-                                   float* row_out[kMaxComponents]) {
-  ReadUint16Row<2, true>(row_in, 0, len, row_out);
-}
-
-void ReadUint16RowInterleaved3Swap(const uint8_t* row_in, size_t len,
-                                   float* row_out[kMaxComponents]) {
-  ReadUint16Row<3, true>(row_in, 0, len, row_out);
-}
-
-void ReadUint16RowInterleaved4Swap(const uint8_t* row_in, size_t len,
-                                   float* row_out[kMaxComponents]) {
-  ReadUint16Row<4, true>(row_in, 0, len, row_out);
-}
-
-void ReadFloatRowSingle(const uint8_t* row_in, size_t len,
-                        float* row_out[kMaxComponents]) {
-  const size_t N = Lanes(d);
-  const size_t simd_len = len & (~(N - 1));
-  const auto mul = Set(d, kMulFloat);
-  const float* JXL_RESTRICT const row = reinterpret_cast<const float*>(row_in);
-  float* JXL_RESTRICT const row0 = row_out[0];
-  for (size_t x = 0; x < simd_len; x += N) {
-    Store(Mul(mul, LoadU(d, row + x)), d, row0 + x);
-  }
-  ReadFloatRow<1>(row_in, simd_len, len, row_out);
-}
-
-void ReadFloatRowInterleaved2(const uint8_t* row_in, size_t len,
-                              float* row_out[kMaxComponents]) {
-  const size_t N = Lanes(d);
-  const size_t simd_len = len & (~(N - 1));
-  const auto mul = Set(d, kMulFloat);
-  const float* JXL_RESTRICT const row = reinterpret_cast<const float*>(row_in);
-  float* JXL_RESTRICT const row0 = row_out[0];
-  float* JXL_RESTRICT const row1 = row_out[1];
-  Vec<D> out0, out1;  // NOLINT
-  for (size_t x = 0; x < simd_len; x += N) {
-    LoadInterleaved2(d, row + 2 * x, out0, out1);
-    Store(Mul(mul, out0), d, row0 + x);
-    Store(Mul(mul, out1), d, row1 + x);
-  }
-  ReadFloatRow<2>(row_in, simd_len, len, row_out);
-}
-
-void ReadFloatRowInterleaved3(const uint8_t* row_in, size_t len,
-                              float* row_out[kMaxComponents]) {
-  const size_t N = Lanes(d);
-  const size_t simd_len = len & (~(N - 1));
-  const auto mul = Set(d, kMulFloat);
-  const float* JXL_RESTRICT const row = reinterpret_cast<const float*>(row_in);
-  float* JXL_RESTRICT const row0 = row_out[0];
-  float* JXL_RESTRICT const row1 = row_out[1];
-  float* JXL_RESTRICT const row2 = row_out[2];
-  Vec<D> out0, out1, out2;  // NOLINT
-  for (size_t x = 0; x < simd_len; x += N) {
-    LoadInterleaved3(d, row + 3 * x, out0, out1, out2);
-    Store(Mul(mul, out0), d, row0 + x);
-    Store(Mul(mul, out1), d, row1 + x);
-    Store(Mul(mul, out2), d, row2 + x);
-  }
-  ReadFloatRow<3>(row_in, simd_len, len, row_out);
-}
-
-void ReadFloatRowInterleaved4(const uint8_t* row_in, size_t len,
-                              float* row_out[kMaxComponents]) {
-  const size_t N = Lanes(d);
-  const size_t simd_len = len & (~(N - 1));
-  const auto mul = Set(d, kMulFloat);
-  const float* JXL_RESTRICT const row = reinterpret_cast<const float*>(row_in);
-  float* JXL_RESTRICT const row0 = row_out[0];
-  float* JXL_RESTRICT const row1 = row_out[1];
-  float* JXL_RESTRICT const row2 = row_out[2];
-  float* JXL_RESTRICT const row3 = row_out[3];
-  Vec<D> out0, out1, out2, out3;  // NOLINT
-  for (size_t x = 0; x < simd_len; x += N) {
-    LoadInterleaved4(d, row + 4 * x, out0, out1, out2, out3);
-    Store(Mul(mul, out0), d, row0 + x);
-    Store(Mul(mul, out1), d, row1 + x);
-    Store(Mul(mul, out2), d, row2 + x);
-    Store(Mul(mul, out3), d, row3 + x);
-  }
-  ReadFloatRow<4>(row_in, simd_len, len, row_out);
-}
-
-void ReadFloatRowSingleSwap(const uint8_t* row_in, size_t len,
-                            float* row_out[kMaxComponents]) {
-  ReadFloatRow<1, true>(row_in, 0, len, row_out);
-}
-
-void ReadFloatRowInterleaved2Swap(const uint8_t* row_in, size_t len,
-                                  float* row_out[kMaxComponents]) {
-  ReadFloatRow<2, true>(row_in, 0, len, row_out);
-}
-
-void ReadFloatRowInterleaved3Swap(const uint8_t* row_in, size_t len,
-                                  float* row_out[kMaxComponents]) {
-  ReadFloatRow<3, true>(row_in, 0, len, row_out);
-}
-
-void ReadFloatRowInterleaved4Swap(const uint8_t* row_in, size_t len,
-                                  float* row_out[kMaxComponents]) {
-  ReadFloatRow<4, true>(row_in, 0, len, row_out);
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jpegli
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jpegli {
-
-HWY_EXPORT(ReadUint8RowSingle);
-HWY_EXPORT(ReadUint8RowInterleaved2);
-HWY_EXPORT(ReadUint8RowInterleaved3);
-HWY_EXPORT(ReadUint8RowInterleaved4);
-HWY_EXPORT(ReadUint16RowSingle);
-HWY_EXPORT(ReadUint16RowInterleaved2);
-HWY_EXPORT(ReadUint16RowInterleaved3);
-HWY_EXPORT(ReadUint16RowInterleaved4);
-HWY_EXPORT(ReadUint16RowSingleSwap);
-HWY_EXPORT(ReadUint16RowInterleaved2Swap);
-HWY_EXPORT(ReadUint16RowInterleaved3Swap);
-HWY_EXPORT(ReadUint16RowInterleaved4Swap);
-HWY_EXPORT(ReadFloatRowSingle);
-HWY_EXPORT(ReadFloatRowInterleaved2);
-HWY_EXPORT(ReadFloatRowInterleaved3);
-HWY_EXPORT(ReadFloatRowInterleaved4);
-HWY_EXPORT(ReadFloatRowSingleSwap);
-HWY_EXPORT(ReadFloatRowInterleaved2Swap);
-HWY_EXPORT(ReadFloatRowInterleaved3Swap);
-HWY_EXPORT(ReadFloatRowInterleaved4Swap);
-
-void ChooseInputMethod(j_compress_ptr cinfo) {
-  jpeg_comp_master* m = cinfo->master;
-  bool swap_endianness =
-      (m->endianness == JPEGLI_LITTLE_ENDIAN && !IsLittleEndian()) ||
-      (m->endianness == JPEGLI_BIG_ENDIAN && IsLittleEndian());
-  m->input_method = nullptr;
-  if (m->data_type == JPEGLI_TYPE_UINT8) {
-    if (cinfo->raw_data_in || cinfo->input_components == 1) {
-      m->input_method = HWY_DYNAMIC_DISPATCH(ReadUint8RowSingle);
-    } else if (cinfo->input_components == 2) {
-      m->input_method = HWY_DYNAMIC_DISPATCH(ReadUint8RowInterleaved2);
-    } else if (cinfo->input_components == 3) {
-      m->input_method = HWY_DYNAMIC_DISPATCH(ReadUint8RowInterleaved3);
-    } else if (cinfo->input_components == 4) {
-      m->input_method = HWY_DYNAMIC_DISPATCH(ReadUint8RowInterleaved4);
-    }
-  } else if (m->data_type == JPEGLI_TYPE_UINT16 && !swap_endianness) {
-    if (cinfo->raw_data_in || cinfo->input_components == 1) {
-      m->input_method = HWY_DYNAMIC_DISPATCH(ReadUint16RowSingle);
-    } else if (cinfo->input_components == 2) {
-      m->input_method = HWY_DYNAMIC_DISPATCH(ReadUint16RowInterleaved2);
-    } else if (cinfo->input_components == 3) {
-      m->input_method = HWY_DYNAMIC_DISPATCH(ReadUint16RowInterleaved3);
-    } else if (cinfo->input_components == 4) {
-      m->input_method = HWY_DYNAMIC_DISPATCH(ReadUint16RowInterleaved4);
-    }
-  } else if (m->data_type == JPEGLI_TYPE_UINT16 && swap_endianness) {
-    if (cinfo->raw_data_in || cinfo->input_components == 1) {
-      m->input_method = HWY_DYNAMIC_DISPATCH(ReadUint16RowSingleSwap);
-    } else if (cinfo->input_components == 2) {
-      m->input_method = HWY_DYNAMIC_DISPATCH(ReadUint16RowInterleaved2Swap);
-    } else if (cinfo->input_components == 3) {
-      m->input_method = HWY_DYNAMIC_DISPATCH(ReadUint16RowInterleaved3Swap);
-    } else if (cinfo->input_components == 4) {
-      m->input_method = HWY_DYNAMIC_DISPATCH(ReadUint16RowInterleaved4Swap);
-    }
-  } else if (m->data_type == JPEGLI_TYPE_FLOAT && !swap_endianness) {
-    if (cinfo->raw_data_in || cinfo->input_components == 1) {
-      m->input_method = HWY_DYNAMIC_DISPATCH(ReadFloatRowSingle);
-    } else if (cinfo->input_components == 2) {
-      m->input_method = HWY_DYNAMIC_DISPATCH(ReadFloatRowInterleaved2);
-    } else if (cinfo->input_components == 3) {
-      m->input_method = HWY_DYNAMIC_DISPATCH(ReadFloatRowInterleaved3);
-    } else if (cinfo->input_components == 4) {
-      m->input_method = HWY_DYNAMIC_DISPATCH(ReadFloatRowInterleaved4);
-    }
-  } else if (m->data_type == JPEGLI_TYPE_FLOAT && swap_endianness) {
-    if (cinfo->raw_data_in || cinfo->input_components == 1) {
-      m->input_method = HWY_DYNAMIC_DISPATCH(ReadFloatRowSingleSwap);
-    } else if (cinfo->input_components == 2) {
-      m->input_method = HWY_DYNAMIC_DISPATCH(ReadFloatRowInterleaved2Swap);
-    } else if (cinfo->input_components == 3) {
-      m->input_method = HWY_DYNAMIC_DISPATCH(ReadFloatRowInterleaved3Swap);
-    } else if (cinfo->input_components == 4) {
-      m->input_method = HWY_DYNAMIC_DISPATCH(ReadFloatRowInterleaved4Swap);
-    }
-  }
-  if (m->input_method == nullptr) {
-    JPEGLI_ERROR("Could not find input method.");
-  }
-}
-
-}  // namespace jpegli
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jpegli/input.h b/third_party/jpeg-xl/lib/jpegli/input.h
deleted file mode 100644
index f54d0bee438d8..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/input.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_INPUT_H_
-#define LIB_JPEGLI_INPUT_H_
-
-#include "lib/jpegli/common.h"
-
-namespace jpegli {
-
-void ChooseInputMethod(j_compress_ptr cinfo);
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_INPUT_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/input_suspension_test.cc b/third_party/jpeg-xl/lib/jpegli/input_suspension_test.cc
deleted file mode 100644
index 6fa1416213ce6..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/input_suspension_test.cc
+++ /dev/null
@@ -1,631 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/types.h>
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <ostream>
-#include <sstream>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "lib/jpegli/decode.h"
-#include "lib/jpegli/libjpeg_test_util.h"
-#include "lib/jpegli/test_params.h"
-#include "lib/jpegli/test_utils.h"
-#include "lib/jpegli/testing.h"
-#include "lib/jxl/base/status.h"
-
-namespace jpegli {
-namespace {
-
-constexpr uint8_t kFakeEoiMarker[2] = {0xff, 0xd9};
-
-struct SourceManager {
-  SourceManager(const uint8_t* data, size_t len, size_t max_chunk_size,
-                bool is_partial_file)
-      : data_(data),
-        len_(len),
-        pos_(0),
-        max_chunk_size_(max_chunk_size),
-        is_partial_file_(is_partial_file) {
-    pub_.init_source = init_source;
-    pub_.fill_input_buffer = fill_input_buffer;
-    pub_.next_input_byte = nullptr;
-    pub_.bytes_in_buffer = 0;
-    pub_.skip_input_data = skip_input_data;
-    pub_.resync_to_restart = jpegli_resync_to_restart;
-    pub_.term_source = term_source;
-    if (max_chunk_size_ == 0) max_chunk_size_ = len;
-  }
-
-  ~SourceManager() {
-    EXPECT_EQ(0, pub_.bytes_in_buffer);
-    if (!is_partial_file_) {
-      EXPECT_EQ(len_, pos_);
-    }
-  }
-
-  bool LoadNextChunk() {
-    if (pos_ >= len_ && !is_partial_file_) {
-      return false;
-    }
-    if (pub_.bytes_in_buffer > 0) {
-      EXPECT_LE(pub_.bytes_in_buffer, buffer_.size());
-      memmove(buffer_.data(), pub_.next_input_byte, pub_.bytes_in_buffer);
-    }
-    size_t chunk_size =
-        pos_ < len_ ? std::min(len_ - pos_, max_chunk_size_) : 2;
-    buffer_.resize(pub_.bytes_in_buffer + chunk_size);
-    memcpy(&buffer_[pub_.bytes_in_buffer],
-           pos_ < len_ ? data_ + pos_ : kFakeEoiMarker, chunk_size);
-    pub_.next_input_byte = buffer_.data();
-    pub_.bytes_in_buffer += chunk_size;
-    pos_ += chunk_size;
-    return true;
-  }
-
- private:
-  jpeg_source_mgr pub_;
-  std::vector<uint8_t> buffer_;
-  const uint8_t* data_;
-  size_t len_;
-  size_t pos_;
-  size_t max_chunk_size_;
-  bool is_partial_file_;
-
-  static void init_source(j_decompress_ptr cinfo) {
-    auto* src = reinterpret_cast<SourceManager*>(cinfo->src);
-    src->pub_.next_input_byte = nullptr;
-    src->pub_.bytes_in_buffer = 0;
-  }
-
-  static boolean fill_input_buffer(j_decompress_ptr cinfo) { return FALSE; }
-
-  static void skip_input_data(j_decompress_ptr cinfo,
-                              long num_bytes /* NOLINT*/) {
-    auto* src = reinterpret_cast<SourceManager*>(cinfo->src);
-    if (num_bytes <= 0) {
-      return;
-    }
-    if (src->pub_.bytes_in_buffer >= static_cast<size_t>(num_bytes)) {
-      src->pub_.bytes_in_buffer -= num_bytes;
-      src->pub_.next_input_byte += num_bytes;
-    } else {
-      src->pos_ += num_bytes - src->pub_.bytes_in_buffer;
-      src->pub_.bytes_in_buffer = 0;
-    }
-  }
-
-  static void term_source(j_decompress_ptr cinfo) {}
-};
-
-uint8_t markers_seen[kMarkerSequenceLen];
-size_t num_markers_seen = 0;
-
-uint8_t get_next_byte(j_decompress_ptr cinfo) {
-  cinfo->src->bytes_in_buffer--;
-  return *cinfo->src->next_input_byte++;
-}
-
-boolean test_marker_processor(j_decompress_ptr cinfo) {
-  markers_seen[num_markers_seen] = cinfo->unread_marker;
-  if (cinfo->src->bytes_in_buffer < 2) {
-    return FALSE;
-  }
-  size_t marker_len = (get_next_byte(cinfo) << 8) + get_next_byte(cinfo);
-  EXPECT_EQ(2 + ((num_markers_seen + 2) % sizeof(kMarkerData)), marker_len);
-  if (marker_len > 2) {
-    (*cinfo->src->skip_input_data)(cinfo, marker_len - 2);
-  }
-  ++num_markers_seen;
-  return TRUE;
-}
-
-jxl::Status ReadOutputImage(const DecompressParams& dparams,
-                            j_decompress_ptr cinfo, SourceManager* src,
-                            TestImage* output) {
-  output->ysize = cinfo->output_height;
-  output->xsize = cinfo->output_width;
-  output->components = cinfo->num_components;
-  if (cinfo->raw_data_out) {
-    output->color_space = cinfo->jpeg_color_space;
-    for (int c = 0; c < cinfo->num_components; ++c) {
-      size_t xsize = cinfo->comp_info[c].width_in_blocks * DCTSIZE;
-      size_t ysize = cinfo->comp_info[c].height_in_blocks * DCTSIZE;
-      std::vector<uint8_t> plane(ysize * xsize);
-      output->raw_data.emplace_back(std::move(plane));
-    }
-  } else {
-    output->color_space = cinfo->out_color_space;
-    output->AllocatePixels();
-  }
-  size_t total_output_lines = 0;
-  while (cinfo->output_scanline < cinfo->output_height) {
-    size_t max_lines;
-    size_t num_output_lines;
-    if (cinfo->raw_data_out) {
-      size_t iMCU_height = cinfo->max_v_samp_factor * DCTSIZE;
-      EXPECT_EQ(cinfo->output_scanline, cinfo->output_iMCU_row * iMCU_height);
-      max_lines = iMCU_height;
-      std::vector<std::vector<JSAMPROW>> rowdata(cinfo->num_components);
-      std::vector<JSAMPARRAY> data(cinfo->num_components);
-      for (int c = 0; c < cinfo->num_components; ++c) {
-        size_t xsize = cinfo->comp_info[c].width_in_blocks * DCTSIZE;
-        size_t ysize = cinfo->comp_info[c].height_in_blocks * DCTSIZE;
-        size_t num_lines = cinfo->comp_info[c].v_samp_factor * DCTSIZE;
-        rowdata[c].resize(num_lines);
-        size_t y0 = cinfo->output_iMCU_row * num_lines;
-        for (size_t i = 0; i < num_lines; ++i) {
-          rowdata[c][i] =
-              y0 + i < ysize ? &output->raw_data[c][(y0 + i) * xsize] : nullptr;
-        }
-        data[c] = rowdata[c].data();
-      }
-      while ((num_output_lines =
-                  jpegli_read_raw_data(cinfo, data.data(), max_lines)) == 0) {
-        JXL_ENSURE(src && src->LoadNextChunk());
-      }
-    } else {
-      size_t max_output_lines = dparams.max_output_lines;
-      if (max_output_lines == 0) max_output_lines = cinfo->output_height;
-      size_t lines_left = cinfo->output_height - cinfo->output_scanline;
-      max_lines = std::min<size_t>(max_output_lines, lines_left);
-      size_t stride = cinfo->output_width * cinfo->num_components;
-      std::vector<JSAMPROW> scanlines(max_lines);
-      for (size_t i = 0; i < max_lines; ++i) {
-        size_t yidx = cinfo->output_scanline + i;
-        scanlines[i] = &output->pixels[yidx * stride];
-      }
-      while ((num_output_lines = jpegli_read_scanlines(cinfo, scanlines.data(),
-                                                       max_lines)) == 0) {
-        JXL_ENSURE(src && src->LoadNextChunk());
-      }
-    }
-    total_output_lines += num_output_lines;
-    EXPECT_EQ(total_output_lines, cinfo->output_scanline);
-    if (num_output_lines < max_lines) {
-      JXL_ENSURE(src && src->LoadNextChunk());
-    }
-  }
-  return true;
-}
-
-struct TestConfig {
-  std::string fn;
-  std::string fn_desc;
-  TestImage input;
-  CompressParams jparams;
-  DecompressParams dparams;
-  float max_rms_dist = 1.0f;
-};
-
-jxl::StatusOr<std::vector<uint8_t>> GetTestJpegData(TestConfig& config) {
-  std::vector<uint8_t> compressed;
-  if (!config.fn.empty()) {
-    JXL_ASSIGN_OR_RETURN(compressed, ReadTestData(config.fn));
-  } else {
-    GeneratePixels(&config.input);
-    JXL_RETURN_IF_ERROR(
-        EncodeWithJpegli(config.input, config.jparams, &compressed));
-  }
-  return compressed;
-}
-
-bool IsSequential(const TestConfig& config) {
-  if (!config.fn.empty()) {
-    return config.fn_desc.find("PROGR") == std::string::npos;
-  }
-  return config.jparams.progressive_mode <= 0;
-}
-
-class InputSuspensionTestParam : public ::testing::TestWithParam<TestConfig> {};
-
-TEST_P(InputSuspensionTestParam, InputOutputLockStepNonBuffered) {
-  TestConfig config = GetParam();
-  const DecompressParams& dparams = config.dparams;
-  JXL_ASSIGN_OR_QUIT(std::vector<uint8_t> compressed, GetTestJpegData(config),
-                     "Failed to create test data.");
-  bool is_partial = config.dparams.size_factor < 1.0f;
-  if (is_partial) {
-    compressed.resize(compressed.size() * config.dparams.size_factor);
-  }
-  SourceManager src(compressed.data(), compressed.size(), dparams.chunk_size,
-                    is_partial);
-  TestImage output0;
-  jpeg_decompress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_decompress(&cinfo);
-    cinfo.src = reinterpret_cast<jpeg_source_mgr*>(&src);
-
-    if (config.jparams.add_marker) {
-      jpegli_save_markers(&cinfo, kSpecialMarker0, 0xffff);
-      jpegli_save_markers(&cinfo, kSpecialMarker1, 0xffff);
-      num_markers_seen = 0;
-      jpegli_set_marker_processor(&cinfo, 0xe6, test_marker_processor);
-      jpegli_set_marker_processor(&cinfo, 0xe7, test_marker_processor);
-      jpegli_set_marker_processor(&cinfo, 0xe8, test_marker_processor);
-    }
-    while (jpegli_read_header(&cinfo, TRUE) == JPEG_SUSPENDED) {
-      JPEGLI_TEST_ENSURE_TRUE(src.LoadNextChunk());
-    }
-    SetDecompressParams(dparams, &cinfo);
-    jpegli_set_output_format(&cinfo, dparams.data_type, dparams.endianness);
-    if (config.jparams.add_marker) {
-      EXPECT_EQ(num_markers_seen, kMarkerSequenceLen);
-      EXPECT_EQ(0, memcmp(markers_seen, kMarkerSequence, num_markers_seen));
-    }
-    VerifyHeader(config.jparams, &cinfo);
-    cinfo.raw_data_out = TO_JXL_BOOL(dparams.output_mode == RAW_DATA);
-
-    if (dparams.output_mode == COEFFICIENTS) {
-      jvirt_barray_ptr* coef_arrays;
-      while ((coef_arrays = jpegli_read_coefficients(&cinfo)) == nullptr) {
-        JPEGLI_TEST_ENSURE_TRUE(src.LoadNextChunk());
-      }
-      CopyCoefficients(&cinfo, coef_arrays, &output0);
-    } else {
-      while (!jpegli_start_decompress(&cinfo)) {
-        JPEGLI_TEST_ENSURE_TRUE(src.LoadNextChunk());
-      }
-      JPEGLI_TEST_ENSURE_TRUE(ReadOutputImage(dparams, &cinfo, &src, &output0));
-    }
-
-    while (!jpegli_finish_decompress(&cinfo)) {
-      JPEGLI_TEST_ENSURE_TRUE(src.LoadNextChunk());
-    }
-    return true;
-  };
-  ASSERT_TRUE(try_catch_block());
-  jpegli_destroy_decompress(&cinfo);
-
-  TestImage output1;
-  DecodeWithLibjpeg(config.jparams, dparams, compressed, &output1);
-  VerifyOutputImage(output1, output0, config.max_rms_dist);
-}
-
-TEST_P(InputSuspensionTestParam, InputOutputLockStepBuffered) {
-  TestConfig config = GetParam();
-  if (config.jparams.add_marker) return;
-  const DecompressParams& dparams = config.dparams;
-  JXL_ASSIGN_OR_QUIT(std::vector<uint8_t> compressed, GetTestJpegData(config),
-                     "Failed to create test data.");
-  bool is_partial = config.dparams.size_factor < 1.0f;
-  if (is_partial) {
-    compressed.resize(compressed.size() * config.dparams.size_factor);
-  }
-  SourceManager src(compressed.data(), compressed.size(), dparams.chunk_size,
-                    is_partial);
-  std::vector<TestImage> output_progression0;
-  jpeg_decompress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_decompress(&cinfo);
-
-    cinfo.src = reinterpret_cast<jpeg_source_mgr*>(&src);
-
-    while (jpegli_read_header(&cinfo, TRUE) == JPEG_SUSPENDED) {
-      JPEGLI_TEST_ENSURE_TRUE(src.LoadNextChunk());
-    }
-    SetDecompressParams(dparams, &cinfo);
-    jpegli_set_output_format(&cinfo, dparams.data_type, dparams.endianness);
-
-    cinfo.buffered_image = TRUE;
-    cinfo.raw_data_out = TO_JXL_BOOL(dparams.output_mode == RAW_DATA);
-
-    EXPECT_TRUE(jpegli_start_decompress(&cinfo));
-    EXPECT_FALSE(jpegli_input_complete(&cinfo));
-    EXPECT_EQ(0, cinfo.output_scan_number);
-
-    int sos_marker_cnt = 1;  // read_header reads the first SOS marker
-    while (!jpegli_input_complete(&cinfo)) {
-      EXPECT_EQ(cinfo.input_scan_number, sos_marker_cnt);
-      EXPECT_TRUE(jpegli_start_output(&cinfo, cinfo.input_scan_number));
-      // start output sets output_scan_number, but does not change
-      // input_scan_number
-      EXPECT_EQ(cinfo.output_scan_number, cinfo.input_scan_number);
-      EXPECT_EQ(cinfo.input_scan_number, sos_marker_cnt);
-      TestImage output;
-      JPEGLI_TEST_ENSURE_TRUE(ReadOutputImage(dparams, &cinfo, &src, &output));
-      output_progression0.emplace_back(std::move(output));
-      // read scanlines/read raw data does not change input/output scan number
-      EXPECT_EQ(cinfo.input_scan_number, sos_marker_cnt);
-      EXPECT_EQ(cinfo.output_scan_number, cinfo.input_scan_number);
-      while (!jpegli_finish_output(&cinfo)) {
-        JPEGLI_TEST_ENSURE_TRUE(src.LoadNextChunk());
-      }
-      ++sos_marker_cnt;  // finish output reads the next SOS marker or EOI
-      if (dparams.output_mode == COEFFICIENTS) {
-        jvirt_barray_ptr* coef_arrays = jpegli_read_coefficients(&cinfo);
-        JPEGLI_TEST_ENSURE_TRUE(coef_arrays != nullptr);
-        CopyCoefficients(&cinfo, coef_arrays, &output_progression0.back());
-      }
-    }
-
-    EXPECT_TRUE(jpegli_finish_decompress(&cinfo));
-    return true;
-  };
-  ASSERT_TRUE(try_catch_block());
-  jpegli_destroy_decompress(&cinfo);
-
-  std::vector<TestImage> output_progression1;
-  DecodeAllScansWithLibjpeg(config.jparams, dparams, compressed,
-                            &output_progression1);
-  ASSERT_EQ(output_progression0.size(), output_progression1.size());
-  for (size_t i = 0; i < output_progression0.size(); ++i) {
-    const TestImage& output = output_progression0[i];
-    const TestImage& expected = output_progression1[i];
-    VerifyOutputImage(expected, output, config.max_rms_dist);
-  }
-}
-
-TEST_P(InputSuspensionTestParam, PreConsumeInputBuffered) {
-  TestConfig config = GetParam();
-  if (config.jparams.add_marker) return;
-  const DecompressParams& dparams = config.dparams;
-  JXL_ASSIGN_OR_QUIT(std::vector<uint8_t> compressed, GetTestJpegData(config),
-                     "Failed to create test data.");
-  bool is_partial = config.dparams.size_factor < 1.0f;
-  if (is_partial) {
-    compressed.resize(compressed.size() * config.dparams.size_factor);
-  }
-  std::vector<TestImage> output_progression1;
-  DecodeAllScansWithLibjpeg(config.jparams, dparams, compressed,
-                            &output_progression1);
-  SourceManager src(compressed.data(), compressed.size(), dparams.chunk_size,
-                    is_partial);
-  TestImage output0;
-  jpeg_decompress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_decompress(&cinfo);
-    cinfo.src = reinterpret_cast<jpeg_source_mgr*>(&src);
-
-    int status;
-    while ((status = jpegli_consume_input(&cinfo)) != JPEG_REACHED_SOS) {
-      if (status == JPEG_SUSPENDED) {
-        JPEGLI_TEST_ENSURE_TRUE(src.LoadNextChunk());
-      }
-    }
-    EXPECT_EQ(JPEG_REACHED_SOS, jpegli_consume_input(&cinfo));
-    cinfo.buffered_image = TRUE;
-    cinfo.raw_data_out = TO_JXL_BOOL(dparams.output_mode == RAW_DATA);
-    cinfo.do_block_smoothing = TO_JXL_BOOL(dparams.do_block_smoothing);
-
-    EXPECT_TRUE(jpegli_start_decompress(&cinfo));
-    EXPECT_FALSE(jpegli_input_complete(&cinfo));
-    EXPECT_EQ(1, cinfo.input_scan_number);
-    EXPECT_EQ(0, cinfo.output_scan_number);
-
-    while ((status = jpegli_consume_input(&cinfo)) != JPEG_REACHED_EOI) {
-      if (status == JPEG_SUSPENDED) {
-        JPEGLI_TEST_ENSURE_TRUE(src.LoadNextChunk());
-      }
-    }
-
-    EXPECT_TRUE(jpegli_input_complete(&cinfo));
-    EXPECT_EQ(output_progression1.size(), cinfo.input_scan_number);
-    EXPECT_EQ(0, cinfo.output_scan_number);
-
-    EXPECT_TRUE(jpegli_start_output(&cinfo, cinfo.input_scan_number));
-    EXPECT_EQ(output_progression1.size(), cinfo.input_scan_number);
-    EXPECT_EQ(cinfo.output_scan_number, cinfo.input_scan_number);
-
-    JPEGLI_TEST_ENSURE_TRUE(
-        ReadOutputImage(dparams, &cinfo, nullptr, &output0));
-    EXPECT_EQ(output_progression1.size(), cinfo.input_scan_number);
-    EXPECT_EQ(cinfo.output_scan_number, cinfo.input_scan_number);
-
-    EXPECT_TRUE(jpegli_finish_output(&cinfo));
-    if (dparams.output_mode == COEFFICIENTS) {
-      jvirt_barray_ptr* coef_arrays = jpegli_read_coefficients(&cinfo);
-      JPEGLI_TEST_ENSURE_TRUE(coef_arrays != nullptr);
-      CopyCoefficients(&cinfo, coef_arrays, &output0);
-    }
-    EXPECT_TRUE(jpegli_finish_decompress(&cinfo));
-    return true;
-  };
-  ASSERT_TRUE(try_catch_block());
-  jpegli_destroy_decompress(&cinfo);
-
-  VerifyOutputImage(output_progression1.back(), output0, config.max_rms_dist);
-}
-
-TEST_P(InputSuspensionTestParam, PreConsumeInputNonBuffered) {
-  TestConfig config = GetParam();
-  if (config.jparams.add_marker || IsSequential(config)) return;
-  const DecompressParams& dparams = config.dparams;
-  JXL_ASSIGN_OR_QUIT(std::vector<uint8_t> compressed, GetTestJpegData(config),
-                     "Failed to create test data.");
-  bool is_partial = config.dparams.size_factor < 1.0f;
-  if (is_partial) {
-    compressed.resize(compressed.size() * config.dparams.size_factor);
-  }
-  SourceManager src(compressed.data(), compressed.size(), dparams.chunk_size,
-                    is_partial);
-  TestImage output0;
-  jpeg_decompress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_decompress(&cinfo);
-    cinfo.src = reinterpret_cast<jpeg_source_mgr*>(&src);
-
-    int status;
-    while ((status = jpegli_consume_input(&cinfo)) != JPEG_REACHED_SOS) {
-      if (status == JPEG_SUSPENDED) {
-        JPEGLI_TEST_ENSURE_TRUE(src.LoadNextChunk());
-      }
-    }
-    EXPECT_EQ(JPEG_REACHED_SOS, jpegli_consume_input(&cinfo));
-    cinfo.raw_data_out = TO_JXL_BOOL(dparams.output_mode == RAW_DATA);
-    cinfo.do_block_smoothing = TO_JXL_BOOL(dparams.do_block_smoothing);
-
-    if (dparams.output_mode == COEFFICIENTS) {
-      jpegli_read_coefficients(&cinfo);
-    } else {
-      while (!jpegli_start_decompress(&cinfo)) {
-        JPEGLI_TEST_ENSURE_TRUE(src.LoadNextChunk());
-      }
-    }
-
-    while ((status = jpegli_consume_input(&cinfo)) != JPEG_REACHED_EOI) {
-      if (status == JPEG_SUSPENDED) {
-        JPEGLI_TEST_ENSURE_TRUE(src.LoadNextChunk());
-      }
-    }
-
-    if (dparams.output_mode == COEFFICIENTS) {
-      jvirt_barray_ptr* coef_arrays = jpegli_read_coefficients(&cinfo);
-      JPEGLI_TEST_ENSURE_TRUE(coef_arrays != nullptr);
-      CopyCoefficients(&cinfo, coef_arrays, &output0);
-    } else {
-      JPEGLI_TEST_ENSURE_TRUE(
-          ReadOutputImage(dparams, &cinfo, nullptr, &output0));
-    }
-
-    EXPECT_TRUE(jpegli_finish_decompress(&cinfo));
-    return true;
-  };
-  ASSERT_TRUE(try_catch_block());
-  jpegli_destroy_decompress(&cinfo);
-
-  TestImage output1;
-  DecodeWithLibjpeg(config.jparams, dparams, compressed, &output1);
-  VerifyOutputImage(output1, output0, config.max_rms_dist);
-}
-
-std::vector<TestConfig> GenerateTests() {
-  std::vector<TestConfig> all_tests;
-  std::vector<std::pair<std::string, std::string>> testfiles({
-      {"jxl/flower/flower.png.im_q85_444.jpg", "Q85YUV444"},
-      {"jxl/flower/flower.png.im_q85_420_R13B.jpg", "Q85YUV420R13B"},
-      {"jxl/flower/flower.png.im_q85_420_progr.jpg", "Q85YUV420PROGR"},
-  });
-  for (const auto& it : testfiles) {
-    for (size_t chunk_size : {1, 64, 65536}) {
-      for (size_t max_output_lines : {0, 1, 8, 16}) {
-        TestConfig config;
-        config.fn = it.first;
-        config.fn_desc = it.second;
-        config.dparams.chunk_size = chunk_size;
-        config.dparams.max_output_lines = max_output_lines;
-        all_tests.push_back(config);
-        if (max_output_lines == 16) {
-          config.dparams.output_mode = RAW_DATA;
-          all_tests.push_back(config);
-          config.dparams.output_mode = COEFFICIENTS;
-          all_tests.push_back(config);
-        }
-      }
-    }
-  }
-  for (size_t r : {1, 17, 1024}) {
-    for (size_t chunk_size : {1, 65536}) {
-      TestConfig config;
-      config.dparams.chunk_size = chunk_size;
-      config.jparams.progressive_mode = 2;
-      config.jparams.restart_interval = r;
-      all_tests.push_back(config);
-    }
-  }
-  for (size_t chunk_size : {1, 4, 1024}) {
-    TestConfig config;
-    config.input.xsize = 256;
-    config.input.ysize = 256;
-    config.dparams.chunk_size = chunk_size;
-    config.jparams.add_marker = true;
-    all_tests.push_back(config);
-  }
-  // Tests for partial input.
-  for (float size_factor : {0.1f, 0.33f, 0.5f, 0.75f}) {
-    for (int progr : {0, 1, 3}) {
-      for (int samp : {1, 2}) {
-        for (JpegIOMode output_mode : {PIXELS, RAW_DATA}) {
-          TestConfig config;
-          config.input.xsize = 517;
-          config.input.ysize = 523;
-          config.jparams.h_sampling = {samp, 1, 1};
-          config.jparams.v_sampling = {samp, 1, 1};
-          config.jparams.progressive_mode = progr;
-          config.dparams.size_factor = size_factor;
-          config.dparams.output_mode = output_mode;
-          // The last partially available block can behave differently.
-          // TODO(szabadka) Figure out if we can make the behaviour more
-          // similar.
-          config.max_rms_dist = samp == 1 ? 1.75f : 3.0f;
-          all_tests.push_back(config);
-        }
-      }
-    }
-  }
-  // Tests for block smoothing.
-  for (float size_factor : {0.1f, 0.33f, 0.5f, 0.75f, 1.0f}) {
-    for (int samp : {1, 2}) {
-      TestConfig config;
-      config.input.xsize = 517;
-      config.input.ysize = 523;
-      config.jparams.h_sampling = {samp, 1, 1};
-      config.jparams.v_sampling = {samp, 1, 1};
-      config.jparams.progressive_mode = 2;
-      config.dparams.size_factor = size_factor;
-      config.dparams.do_block_smoothing = true;
-      // libjpeg does smoothing for incomplete scans differently at
-      // the border between current and previous scans.
-      config.max_rms_dist = 8.0f;
-      all_tests.push_back(config);
-    }
-  }
-  return all_tests;
-}
-
-std::ostream& operator<<(std::ostream& os, const TestConfig& c) {
-  if (!c.fn.empty()) {
-    os << c.fn_desc;
-  } else {
-    os << c.input;
-  }
-  os << c.jparams;
-  if (c.dparams.chunk_size == 0) {
-    os << "CompleteInput";
-  } else {
-    os << "InputChunks" << c.dparams.chunk_size;
-  }
-  if (c.dparams.size_factor < 1.0f) {
-    os << "Partial" << static_cast<int>(c.dparams.size_factor * 100) << "p";
-  }
-  if (c.dparams.max_output_lines == 0) {
-    os << "CompleteOutput";
-  } else {
-    os << "OutputLines" << c.dparams.max_output_lines;
-  }
-  if (c.dparams.output_mode == RAW_DATA) {
-    os << "RawDataOut";
-  } else if (c.dparams.output_mode == COEFFICIENTS) {
-    os << "CoeffsOut";
-  }
-  if (c.dparams.do_block_smoothing) {
-    os << "BlockSmoothing";
-  }
-  return os;
-}
-
-std::string TestDescription(
-    const testing::TestParamInfo<InputSuspensionTestParam::ParamType>& info) {
-  std::stringstream name;
-  name << info.param;
-  return name.str();
-}
-
-JPEGLI_INSTANTIATE_TEST_SUITE_P(InputSuspensionTest, InputSuspensionTestParam,
-                                testing::ValuesIn(GenerateTests()),
-                                TestDescription);
-
-}  // namespace
-}  // namespace jpegli
diff --git a/third_party/jpeg-xl/lib/jpegli/jpeg.version.62 b/third_party/jpeg-xl/lib/jpegli/jpeg.version.62
deleted file mode 100644
index 3a8d1f5ec5f00..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/jpeg.version.62
+++ /dev/null
@@ -1,11 +0,0 @@
-LIBJPEG_6.2 {
-  global:
-    jpeg*;
-};
-
-LIBJPEGTURBO_6.2 {
-  global:
-    jpeg_mem_src*;
-    jpeg_mem_dest*;
-    tj*;
-};
\ No newline at end of file
diff --git a/third_party/jpeg-xl/lib/jpegli/jpeg.version.8 b/third_party/jpeg-xl/lib/jpegli/jpeg.version.8
deleted file mode 100644
index aa891f85716e5..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/jpeg.version.8
+++ /dev/null
@@ -1,9 +0,0 @@
-LIBJPEG_8.0 {
-  global:
-    jpeg*;
-};
-
-LIBJPEGTURBO_8.0 {
-  global:
-    tj*;
-};
diff --git a/third_party/jpeg-xl/lib/jpegli/libjpeg_test_util.cc b/third_party/jpeg-xl/lib/jpegli/libjpeg_test_util.cc
deleted file mode 100644
index 76746a8fddb34..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/libjpeg_test_util.cc
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/libjpeg_test_util.h"
-
-#include <cstdlib>
-#include <cstring>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/include_jpeglib.h"  // NOLINT
-#include "lib/jxl/base/sanitizers.h"
-
-namespace jpegli {
-
-namespace {
-
-void Check(bool ok) {
-  if (!ok) {
-    JXL_CRASH();
-  }
-}
-
-#define JPEG_API_FN(name) jpeg_##name
-#include "lib/jpegli/test_utils-inl.h"
-#undef JPEG_API_FN
-
-void ReadOutputPass(j_decompress_ptr cinfo, const DecompressParams& dparams,
-                    TestImage* output) {
-  JDIMENSION xoffset = 0;
-  JDIMENSION yoffset = 0;
-  JDIMENSION xsize_cropped = cinfo->output_width;
-  JDIMENSION ysize_cropped = cinfo->output_height;
-  if (dparams.crop_output) {
-    xoffset = xsize_cropped = cinfo->output_width / 3;
-    yoffset = ysize_cropped = cinfo->output_height / 3;
-    jpeg_crop_scanline(cinfo, &xoffset, &xsize_cropped);
-    Check(xsize_cropped == cinfo->output_width);
-  }
-  output->xsize = xsize_cropped;
-  output->ysize = ysize_cropped;
-  output->components = cinfo->out_color_components;
-  if (cinfo->quantize_colors) {
-    JSAMPLE** colormap = cinfo->colormap;
-    jxl::msan::UnpoisonMemory(reinterpret_cast<void*>(colormap),
-                              cinfo->out_color_components * sizeof(JSAMPLE*));
-    for (int c = 0; c < cinfo->out_color_components; ++c) {
-      jxl::msan::UnpoisonMemory(
-          reinterpret_cast<void*>(colormap[c]),
-          cinfo->actual_number_of_colors * sizeof(JSAMPLE));
-    }
-  }
-  if (!cinfo->raw_data_out) {
-    size_t stride = output->xsize * output->components;
-    output->pixels.resize(output->ysize * stride);
-    output->color_space = cinfo->out_color_space;
-    if (yoffset > 0) {
-      jpeg_skip_scanlines(cinfo, yoffset);
-    }
-    for (size_t y = 0; y < output->ysize; ++y) {
-      JSAMPROW rows[] = {
-          reinterpret_cast<JSAMPLE*>(&output->pixels[y * stride])};
-      Check(1 == jpeg_read_scanlines(cinfo, rows, 1));
-      jxl::msan::UnpoisonMemory(
-          rows[0], sizeof(JSAMPLE) * cinfo->output_components * output->xsize);
-      if (cinfo->quantize_colors) {
-        UnmapColors(rows[0], cinfo->output_width, cinfo->out_color_components,
-                    cinfo->colormap, cinfo->actual_number_of_colors);
-      }
-    }
-    if (cinfo->output_scanline < cinfo->output_height) {
-      jpeg_skip_scanlines(cinfo, cinfo->output_height - cinfo->output_scanline);
-    }
-  } else {
-    output->color_space = cinfo->jpeg_color_space;
-    for (int c = 0; c < cinfo->num_components; ++c) {
-      size_t xsize = cinfo->comp_info[c].width_in_blocks * DCTSIZE;
-      size_t ysize = cinfo->comp_info[c].height_in_blocks * DCTSIZE;
-      std::vector<uint8_t> plane(ysize * xsize);
-      output->raw_data.emplace_back(std::move(plane));
-    }
-    while (cinfo->output_scanline < cinfo->output_height) {
-      size_t iMCU_height = cinfo->max_v_samp_factor * DCTSIZE;
-      Check(cinfo->output_scanline == cinfo->output_iMCU_row * iMCU_height);
-      std::vector<std::vector<JSAMPROW>> rowdata(cinfo->num_components);
-      std::vector<JSAMPARRAY> data(cinfo->num_components);
-      for (int c = 0; c < cinfo->num_components; ++c) {
-        size_t xsize = cinfo->comp_info[c].width_in_blocks * DCTSIZE;
-        size_t ysize = cinfo->comp_info[c].height_in_blocks * DCTSIZE;
-        size_t num_lines = cinfo->comp_info[c].v_samp_factor * DCTSIZE;
-        rowdata[c].resize(num_lines);
-        size_t y0 = cinfo->output_iMCU_row * num_lines;
-        for (size_t i = 0; i < num_lines; ++i) {
-          rowdata[c][i] =
-              y0 + i < ysize ? &output->raw_data[c][(y0 + i) * xsize] : nullptr;
-        }
-        data[c] = rowdata[c].data();
-      }
-      Check(iMCU_height == jpeg_read_raw_data(cinfo, data.data(), iMCU_height));
-    }
-  }
-  Check(cinfo->total_iMCU_rows ==
-        DivCeil(cinfo->image_height, cinfo->max_v_samp_factor * DCTSIZE));
-}
-
-void DecodeWithLibjpeg(const CompressParams& jparams,
-                       const DecompressParams& dparams, j_decompress_ptr cinfo,
-                       TestImage* output) {
-  if (jparams.add_marker) {
-    jpeg_save_markers(cinfo, kSpecialMarker0, 0xffff);
-    jpeg_save_markers(cinfo, kSpecialMarker1, 0xffff);
-  }
-  if (!jparams.icc.empty()) {
-    jpeg_save_markers(cinfo, JPEG_APP0 + 2, 0xffff);
-  }
-  Check(JPEG_REACHED_SOS == jpeg_read_header(cinfo, /*require_image=*/TRUE));
-  if (!jparams.icc.empty()) {
-    uint8_t* icc_data = nullptr;
-    unsigned int icc_len = 0;  // "unpoison" via initialization
-    Check(jpeg_read_icc_profile(cinfo, &icc_data, &icc_len));
-    Check(icc_data);
-    jxl::msan::UnpoisonMemory(icc_data, icc_len);
-    Check(0 == memcmp(jparams.icc.data(), icc_data, icc_len));
-    free(icc_data);
-  }
-  SetDecompressParams(dparams, cinfo);
-  VerifyHeader(jparams, cinfo);
-  if (dparams.output_mode == COEFFICIENTS) {
-    jvirt_barray_ptr* coef_arrays = jpeg_read_coefficients(cinfo);
-    Check(coef_arrays != nullptr);
-    jxl::msan::UnpoisonMemory(coef_arrays,
-                              cinfo->num_components * sizeof(jvirt_barray_ptr));
-    CopyCoefficients(cinfo, coef_arrays, output);
-  } else {
-    Check(jpeg_start_decompress(cinfo));
-    VerifyScanHeader(jparams, cinfo);
-    ReadOutputPass(cinfo, dparams, output);
-  }
-  Check(jpeg_finish_decompress(cinfo));
-}
-
-}  // namespace
-
-// Verifies that an image encoded with libjpegli can be decoded with libjpeg,
-// and checks that the jpeg coding metadata matches jparams.
-void DecodeAllScansWithLibjpeg(const CompressParams& jparams,
-                               const DecompressParams& dparams,
-                               const std::vector<uint8_t>& compressed,
-                               std::vector<TestImage>* output_progression) {
-  jpeg_decompress_struct cinfo = {};
-  const auto try_catch_block = [&]() {
-    jpeg_error_mgr jerr;
-    jmp_buf env;
-    cinfo.err = jpeg_std_error(&jerr);
-    if (setjmp(env)) {
-      return false;
-    }
-    cinfo.client_data = reinterpret_cast<void*>(&env);
-    cinfo.err->error_exit = [](j_common_ptr cinfo) {
-      (*cinfo->err->output_message)(cinfo);
-      jmp_buf* env = reinterpret_cast<jmp_buf*>(cinfo->client_data);
-      jpeg_destroy(cinfo);
-      longjmp(*env, 1);
-    };
-    jpeg_create_decompress(&cinfo);
-    jpeg_mem_src(&cinfo, compressed.data(), compressed.size());
-    if (jparams.add_marker) {
-      jpeg_save_markers(&cinfo, kSpecialMarker0, 0xffff);
-      jpeg_save_markers(&cinfo, kSpecialMarker1, 0xffff);
-    }
-    Check(JPEG_REACHED_SOS == jpeg_read_header(&cinfo, /*require_image=*/TRUE));
-    cinfo.buffered_image = TRUE;
-    SetDecompressParams(dparams, &cinfo);
-    VerifyHeader(jparams, &cinfo);
-    Check(jpeg_start_decompress(&cinfo));
-    // start decompress should not read the whole input in buffered image mode
-    Check(!jpeg_input_complete(&cinfo));
-    Check(cinfo.output_scan_number == 0);
-    int sos_marker_cnt = 1;  // read header reads the first SOS marker
-    while (!jpeg_input_complete(&cinfo)) {
-      Check(cinfo.input_scan_number == sos_marker_cnt);
-      if (dparams.skip_scans && (cinfo.input_scan_number % 2) != 1) {
-        int result = JPEG_SUSPENDED;
-        while (result != JPEG_REACHED_SOS && result != JPEG_REACHED_EOI) {
-          result = jpeg_consume_input(&cinfo);
-        }
-        if (result == JPEG_REACHED_SOS) ++sos_marker_cnt;
-        continue;
-      }
-      SetScanDecompressParams(dparams, &cinfo, cinfo.input_scan_number);
-      Check(jpeg_start_output(&cinfo, cinfo.input_scan_number));
-      // start output sets output_scan_number, but does not change
-      // input_scan_number
-      Check(cinfo.output_scan_number == cinfo.input_scan_number);
-      Check(cinfo.input_scan_number == sos_marker_cnt);
-      VerifyScanHeader(jparams, &cinfo);
-      TestImage output;
-      ReadOutputPass(&cinfo, dparams, &output);
-      output_progression->emplace_back(std::move(output));
-      // read scanlines/read raw data does not change input/output scan number
-      if (!cinfo.progressive_mode) {
-        Check(cinfo.input_scan_number == sos_marker_cnt);
-        Check(cinfo.output_scan_number == cinfo.input_scan_number);
-      }
-      Check(jpeg_finish_output(&cinfo));
-      ++sos_marker_cnt;  // finish output reads the next SOS marker or EOI
-      if (dparams.output_mode == COEFFICIENTS) {
-        jvirt_barray_ptr* coef_arrays = jpeg_read_coefficients(&cinfo);
-        Check(coef_arrays != nullptr);
-        jxl::msan::UnpoisonMemory(
-            coef_arrays, cinfo.num_components * sizeof(jvirt_barray_ptr));
-        CopyCoefficients(&cinfo, coef_arrays, &output_progression->back());
-      }
-    }
-    Check(jpeg_finish_decompress(&cinfo));
-    return true;
-  };
-  Check(try_catch_block());
-  jpeg_destroy_decompress(&cinfo);
-}
-
-// Returns the number of bytes read from compressed.
-size_t DecodeWithLibjpeg(const CompressParams& jparams,
-                         const DecompressParams& dparams,
-                         const uint8_t* table_stream, size_t table_stream_size,
-                         const uint8_t* compressed, size_t len,
-                         TestImage* output) {
-  jpeg_decompress_struct cinfo = {};
-  size_t bytes_read;
-  const auto try_catch_block = [&]() {
-    jpeg_error_mgr jerr;
-    jmp_buf env;
-    cinfo.err = jpeg_std_error(&jerr);
-    if (setjmp(env)) {
-      return false;
-    }
-    cinfo.client_data = reinterpret_cast<void*>(&env);
-    cinfo.err->error_exit = [](j_common_ptr cinfo) {
-      (*cinfo->err->output_message)(cinfo);
-      jmp_buf* env = reinterpret_cast<jmp_buf*>(cinfo->client_data);
-      jpeg_destroy(cinfo);
-      longjmp(*env, 1);
-    };
-    jpeg_create_decompress(&cinfo);
-    if (table_stream != nullptr) {
-      jpeg_mem_src(&cinfo, table_stream, table_stream_size);
-      jpeg_read_header(&cinfo, FALSE);
-    }
-    jpeg_mem_src(&cinfo, compressed, len);
-    DecodeWithLibjpeg(jparams, dparams, &cinfo, output);
-    jxl::msan::UnpoisonMemory(cinfo.src, sizeof(jpeg_source_mgr));
-    bytes_read = len - cinfo.src->bytes_in_buffer;
-    return true;
-  };
-  Check(try_catch_block());
-  jpeg_destroy_decompress(&cinfo);
-  return bytes_read;
-}
-
-void DecodeWithLibjpeg(const CompressParams& jparams,
-                       const DecompressParams& dparams,
-                       const std::vector<uint8_t>& compressed,
-                       TestImage* output) {
-  DecodeWithLibjpeg(jparams, dparams, nullptr, 0, compressed.data(),
-                    compressed.size(), output);
-}
-
-}  // namespace jpegli
diff --git a/third_party/jpeg-xl/lib/jpegli/libjpeg_test_util.h b/third_party/jpeg-xl/lib/jpegli/libjpeg_test_util.h
deleted file mode 100644
index 18cc1e57b54a1..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/libjpeg_test_util.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_LIBJPEG_TEST_UTIL_H_
-#define LIB_JPEGLI_LIBJPEG_TEST_UTIL_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include <vector>
-
-#include "lib/jpegli/test_params.h"
-
-namespace jpegli {
-
-// Verifies that an image encoded with libjpegli can be decoded with libjpeg,
-// and checks that the jpeg coding metadata matches jparams.
-void DecodeAllScansWithLibjpeg(const CompressParams& jparams,
-                               const DecompressParams& dparams,
-                               const std::vector<uint8_t>& compressed,
-                               std::vector<TestImage>* output_progression);
-// Returns the number of bytes read from compressed.
-size_t DecodeWithLibjpeg(const CompressParams& jparams,
-                         const DecompressParams& dparams,
-                         const uint8_t* table_stream, size_t table_stream_size,
-                         const uint8_t* compressed, size_t len,
-                         TestImage* output);
-void DecodeWithLibjpeg(const CompressParams& jparams,
-                       const DecompressParams& dparams,
-                       const std::vector<uint8_t>& compressed,
-                       TestImage* output);
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_LIBJPEG_TEST_UTIL_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/libjpeg_wrapper.cc b/third_party/jpeg-xl/lib/jpegli/libjpeg_wrapper.cc
deleted file mode 100644
index a2b333afef2c7..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/libjpeg_wrapper.cc
+++ /dev/null
@@ -1,255 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-//
-// This file contains wrapper-functions that are used to build the libjpeg.so
-// shared library that is API- and ABI-compatible with libjpeg-turbo's version
-// of libjpeg.so.
-
-#include "lib/jpegli/common.h"
-#include "lib/jpegli/decode.h"
-#include "lib/jpegli/encode.h"
-#include "lib/jpegli/error.h"
-
-struct jpeg_error_mgr *jpeg_std_error(struct jpeg_error_mgr *err) {
-  return jpegli_std_error(err);
-}
-
-void jpeg_abort(j_common_ptr cinfo) { jpegli_abort(cinfo); }
-
-void jpeg_destroy(j_common_ptr cinfo) { jpegli_destroy(cinfo); }
-
-JQUANT_TBL *jpeg_alloc_quant_table(j_common_ptr cinfo) {
-  return jpegli_alloc_quant_table(cinfo);
-}
-
-JHUFF_TBL *jpeg_alloc_huff_table(j_common_ptr cinfo) {
-  return jpegli_alloc_huff_table(cinfo);
-}
-
-void jpeg_CreateDecompress(j_decompress_ptr cinfo, int version,
-                           size_t structsize) {
-  jpegli_CreateDecompress(cinfo, version, structsize);
-}
-
-void jpeg_stdio_src(j_decompress_ptr cinfo, FILE *infile) {
-  jpegli_stdio_src(cinfo, infile);
-}
-
-void jpeg_mem_src(j_decompress_ptr cinfo, const unsigned char *inbuffer,
-                  unsigned long insize /* NOLINT */) {
-  jpegli_mem_src(cinfo, inbuffer, insize);
-}
-
-int jpeg_read_header(j_decompress_ptr cinfo, boolean require_image) {
-  return jpegli_read_header(cinfo, require_image);
-}
-
-boolean jpeg_start_decompress(j_decompress_ptr cinfo) {
-  return jpegli_start_decompress(cinfo);
-}
-
-JDIMENSION jpeg_read_scanlines(j_decompress_ptr cinfo, JSAMPARRAY scanlines,
-                               JDIMENSION max_lines) {
-  return jpegli_read_scanlines(cinfo, scanlines, max_lines);
-}
-
-JDIMENSION jpeg_skip_scanlines(j_decompress_ptr cinfo, JDIMENSION num_lines) {
-  return jpegli_skip_scanlines(cinfo, num_lines);
-}
-
-void jpeg_crop_scanline(j_decompress_ptr cinfo, JDIMENSION *xoffset,
-                        JDIMENSION *width) {
-  jpegli_crop_scanline(cinfo, xoffset, width);
-}
-
-boolean jpeg_finish_decompress(j_decompress_ptr cinfo) {
-  return jpegli_finish_decompress(cinfo);
-}
-
-JDIMENSION jpeg_read_raw_data(j_decompress_ptr cinfo, JSAMPIMAGE data,
-                              JDIMENSION max_lines) {
-  return jpegli_read_raw_data(cinfo, data, max_lines);
-}
-
-jvirt_barray_ptr *jpeg_read_coefficients(j_decompress_ptr cinfo) {
-  return jpegli_read_coefficients(cinfo);
-}
-
-boolean jpeg_has_multiple_scans(j_decompress_ptr cinfo) {
-  return jpegli_has_multiple_scans(cinfo);
-}
-
-boolean jpeg_start_output(j_decompress_ptr cinfo, int scan_number) {
-  return jpegli_start_output(cinfo, scan_number);
-}
-
-boolean jpeg_finish_output(j_decompress_ptr cinfo) {
-  return jpegli_finish_output(cinfo);
-}
-
-boolean jpeg_input_complete(j_decompress_ptr cinfo) {
-  return jpegli_input_complete(cinfo);
-}
-
-int jpeg_consume_input(j_decompress_ptr cinfo) {
-  return jpegli_consume_input(cinfo);
-}
-
-#if JPEG_LIB_VERSION >= 80
-void jpeg_core_output_dimensions(j_decompress_ptr cinfo) {
-  jpegli_core_output_dimensions(cinfo);
-}
-#endif
-void jpeg_calc_output_dimensions(j_decompress_ptr cinfo) {
-  jpegli_calc_output_dimensions(cinfo);
-}
-
-void jpeg_save_markers(j_decompress_ptr cinfo, int marker_code,
-                       unsigned int length_limit) {
-  jpegli_save_markers(cinfo, marker_code, length_limit);
-}
-
-void jpeg_set_marker_processor(j_decompress_ptr cinfo, int marker_code,
-                               jpeg_marker_parser_method routine) {
-  jpegli_set_marker_processor(cinfo, marker_code, routine);
-}
-
-boolean jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr,
-                              unsigned int *icc_data_len) {
-  return jpegli_read_icc_profile(cinfo, icc_data_ptr, icc_data_len);
-}
-
-void jpeg_abort_decompress(j_decompress_ptr cinfo) {
-  jpegli_abort_decompress(cinfo);
-}
-
-void jpeg_destroy_decompress(j_decompress_ptr cinfo) {
-  jpegli_destroy_decompress(cinfo);
-}
-
-void jpeg_CreateCompress(j_compress_ptr cinfo, int version, size_t structsize) {
-  jpegli_CreateCompress(cinfo, version, structsize);
-}
-
-void jpeg_stdio_dest(j_compress_ptr cinfo, FILE *outfile) {
-  jpegli_stdio_dest(cinfo, outfile);
-}
-
-void jpeg_mem_dest(j_compress_ptr cinfo, unsigned char **outbuffer,
-                   unsigned long *outsize /* NOLINT */) {
-  jpegli_mem_dest(cinfo, outbuffer, outsize);
-}
-
-void jpeg_set_defaults(j_compress_ptr cinfo) { jpegli_set_defaults(cinfo); }
-
-void jpeg_default_colorspace(j_compress_ptr cinfo) {
-  jpegli_default_colorspace(cinfo);
-}
-
-void jpeg_set_colorspace(j_compress_ptr cinfo, J_COLOR_SPACE colorspace) {
-  jpegli_set_colorspace(cinfo, colorspace);
-}
-
-void jpeg_set_quality(j_compress_ptr cinfo, int quality,
-                      boolean force_baseline) {
-  jpegli_set_quality(cinfo, quality, force_baseline);
-}
-
-void jpeg_set_linear_quality(j_compress_ptr cinfo, int scale_factor,
-                             boolean force_baseline) {
-  jpegli_set_linear_quality(cinfo, scale_factor, force_baseline);
-}
-
-#if JPEG_LIB_VERSION >= 70
-void jpeg_default_qtables(j_compress_ptr cinfo, boolean force_baseline) {
-  jpegli_default_qtables(cinfo, force_baseline);
-}
-#endif
-
-int jpeg_quality_scaling(int quality) {
-  return jpegli_quality_scaling(quality);
-}
-
-void jpeg_add_quant_table(j_compress_ptr cinfo, int which_tbl,
-                          const unsigned int *basic_table, int scale_factor,
-                          boolean force_baseline) {
-  jpegli_add_quant_table(cinfo, which_tbl, basic_table, scale_factor,
-                         force_baseline);
-}
-
-void jpeg_simple_progression(j_compress_ptr cinfo) {
-  jpegli_simple_progression(cinfo);
-}
-
-void jpeg_suppress_tables(j_compress_ptr cinfo, boolean suppress) {
-  jpegli_suppress_tables(cinfo, suppress);
-}
-
-#if JPEG_LIB_VERSION >= 70
-void jpeg_calc_jpeg_dimensions(j_compress_ptr cinfo) {
-  jpegli_calc_jpeg_dimensions(cinfo);
-}
-#endif
-
-void jpeg_copy_critical_parameters(j_decompress_ptr srcinfo,
-                                   j_compress_ptr dstinfo) {
-  jpegli_copy_critical_parameters(srcinfo, dstinfo);
-}
-
-void jpeg_write_m_header(j_compress_ptr cinfo, int marker,
-                         unsigned int datalen) {
-  jpegli_write_m_header(cinfo, marker, datalen);
-}
-
-void jpeg_write_m_byte(j_compress_ptr cinfo, int val) {
-  jpegli_write_m_byte(cinfo, val);
-}
-
-void jpeg_write_marker(j_compress_ptr cinfo, int marker, const JOCTET *dataptr,
-                       unsigned int datalen) {
-  jpegli_write_marker(cinfo, marker, dataptr, datalen);
-}
-
-void jpeg_write_icc_profile(j_compress_ptr cinfo, const JOCTET *icc_data_ptr,
-                            unsigned int icc_data_len) {
-  jpegli_write_icc_profile(cinfo, icc_data_ptr, icc_data_len);
-}
-
-void jpeg_start_compress(j_compress_ptr cinfo, boolean write_all_tables) {
-  jpegli_start_compress(cinfo, write_all_tables);
-}
-
-void jpeg_write_tables(j_compress_ptr cinfo) { jpegli_write_tables(cinfo); }
-
-JDIMENSION jpeg_write_scanlines(j_compress_ptr cinfo, JSAMPARRAY scanlines,
-                                JDIMENSION num_lines) {
-  return jpegli_write_scanlines(cinfo, scanlines, num_lines);
-}
-
-JDIMENSION jpeg_write_raw_data(j_compress_ptr cinfo, JSAMPIMAGE data,
-                               JDIMENSION num_lines) {
-  return jpegli_write_raw_data(cinfo, data, num_lines);
-}
-
-void jpeg_write_coefficients(j_compress_ptr cinfo,
-                             jvirt_barray_ptr *coef_arrays) {
-  jpegli_write_coefficients(cinfo, coef_arrays);
-}
-
-void jpeg_finish_compress(j_compress_ptr cinfo) {
-  jpegli_finish_compress(cinfo);
-}
-
-void jpeg_abort_compress(j_compress_ptr cinfo) { jpegli_abort_compress(cinfo); }
-
-void jpeg_destroy_compress(j_compress_ptr cinfo) {
-  jpegli_destroy_compress(cinfo);
-}
-
-boolean jpeg_resync_to_restart(j_decompress_ptr cinfo, int desired) {
-  return jpegli_resync_to_restart(cinfo, desired);
-}
-
-void jpeg_new_colormap(j_decompress_ptr cinfo) { jpegli_new_colormap(cinfo); }
diff --git a/third_party/jpeg-xl/lib/jpegli/memory_manager.cc b/third_party/jpeg-xl/lib/jpegli/memory_manager.cc
deleted file mode 100644
index 3a8f230e63800..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/memory_manager.cc
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/memory_manager.h"
-
-#include <string.h>
-
-#include <hwy/aligned_allocator.h>
-#include <vector>
-
-#include "lib/jpegli/common_internal.h"
-#include "lib/jpegli/error.h"
-
-struct jvirt_sarray_control {
-  JSAMPARRAY full_buffer;
-  size_t numrows;
-  JDIMENSION maxaccess;
-};
-
-struct jvirt_barray_control {
-  JBLOCKARRAY full_buffer;
-  size_t numrows;
-  JDIMENSION maxaccess;
-};
-
-namespace jpegli {
-
-namespace {
-
-struct MemoryManager {
-  struct jpeg_memory_mgr pub;
-  std::vector<void*> owned_ptrs[2 * JPOOL_NUMPOOLS];
-  uint64_t pool_memory_usage[2 * JPOOL_NUMPOOLS];
-  uint64_t total_memory_usage;
-  uint64_t peak_memory_usage;
-};
-
-void* Alloc(j_common_ptr cinfo, int pool_id, size_t sizeofobject) {
-  MemoryManager* mem = reinterpret_cast<MemoryManager*>(cinfo->mem);
-  if (pool_id < 0 || pool_id >= 2 * JPOOL_NUMPOOLS) {
-    JPEGLI_ERROR("Invalid pool id %d", pool_id);
-  }
-  if (mem->pub.max_memory_to_use > 0 &&
-      mem->total_memory_usage + static_cast<uint64_t>(sizeofobject) >
-          static_cast<uint64_t>(mem->pub.max_memory_to_use)) {
-    JPEGLI_ERROR("Total memory usage exceeding %ld",
-                 mem->pub.max_memory_to_use);
-  }
-  void* p;
-  if (pool_id < JPOOL_NUMPOOLS) {
-    p = malloc(sizeofobject);
-  } else {
-    p = hwy::AllocateAlignedBytes(sizeofobject, nullptr, nullptr);
-  }
-  if (p == nullptr) {
-    JPEGLI_ERROR("Out of memory");
-  }
-  mem->owned_ptrs[pool_id].push_back(p);
-  mem->pool_memory_usage[pool_id] += sizeofobject;
-  mem->total_memory_usage += sizeofobject;
-  mem->peak_memory_usage =
-      std::max(mem->peak_memory_usage, mem->total_memory_usage);
-  return p;
-}
-
-constexpr size_t gcd(size_t a, size_t b) { return b == 0 ? a : gcd(b, a % b); }
-constexpr size_t lcm(size_t a, size_t b) { return (a * b) / gcd(a, b); }
-
-template <typename T>
-T** Alloc2dArray(j_common_ptr cinfo, int pool_id, JDIMENSION samplesperrow,
-                 JDIMENSION numrows) {
-  T** array = Allocate<T*>(cinfo, numrows, pool_id);
-  // Always use aligned allocator for large 2d arrays.
-  if (pool_id < JPOOL_NUMPOOLS) {
-    pool_id += JPOOL_NUMPOOLS;
-  }
-  size_t alignment = lcm(sizeof(T), HWY_ALIGNMENT);
-  size_t memstride = RoundUpTo(samplesperrow * sizeof(T), alignment);
-  size_t stride = memstride / sizeof(T);
-  T* buffer = Allocate<T>(cinfo, numrows * stride, pool_id);
-  for (size_t i = 0; i < numrows; ++i) {
-    array[i] = &buffer[i * stride];
-  }
-  return array;
-}
-
-template <typename Control, typename T>
-Control* RequestVirtualArray(j_common_ptr cinfo, int pool_id, boolean pre_zero,
-                             JDIMENSION samplesperrow, JDIMENSION numrows,
-                             JDIMENSION maxaccess) {
-  if (pool_id != JPOOL_IMAGE) {
-    JPEGLI_ERROR("Only image lifetime virtual arrays are supported.");
-  }
-  Control* p = Allocate<Control>(cinfo, 1, pool_id);
-  p->full_buffer = Alloc2dArray<T>(cinfo, pool_id, samplesperrow, numrows);
-  p->numrows = numrows;
-  p->maxaccess = maxaccess;
-  if (pre_zero) {
-    for (size_t i = 0; i < numrows; ++i) {
-      memset(p->full_buffer[i], 0, samplesperrow * sizeof(T));
-    }
-  }
-  return p;
-}
-
-void RealizeVirtualArrays(j_common_ptr cinfo) {
-  // Nothing to do, the full arrays were realized at request time already.
-}
-
-template <typename Control, typename T>
-T** AccessVirtualArray(j_common_ptr cinfo, Control* ptr, JDIMENSION start_row,
-                       JDIMENSION num_rows, boolean writable) {
-  if (num_rows > ptr->maxaccess) {
-    JPEGLI_ERROR("Invalid virtual array access, num rows %u vs max rows %u",
-                 num_rows, ptr->maxaccess);
-  }
-  if (start_row + num_rows > ptr->numrows) {
-    JPEGLI_ERROR("Invalid virtual array access, %u vs %u total rows",
-                 start_row + num_rows, ptr->numrows);
-  }
-  if (ptr->full_buffer == nullptr) {
-    JPEGLI_ERROR("Invalid virtual array access, array not realized.");
-  }
-  return ptr->full_buffer + start_row;
-}
-
-void ClearPool(j_common_ptr cinfo, int pool_id) {
-  MemoryManager* mem = reinterpret_cast<MemoryManager*>(cinfo->mem);
-  mem->owned_ptrs[pool_id].clear();
-  mem->total_memory_usage -= mem->pool_memory_usage[pool_id];
-  mem->pool_memory_usage[pool_id] = 0;
-}
-
-void FreePool(j_common_ptr cinfo, int pool_id) {
-  MemoryManager* mem = reinterpret_cast<MemoryManager*>(cinfo->mem);
-  if (pool_id < 0 || pool_id >= JPOOL_NUMPOOLS) {
-    JPEGLI_ERROR("Invalid pool id %d", pool_id);
-  }
-  for (void* ptr : mem->owned_ptrs[pool_id]) {
-    free(ptr);
-  }
-  ClearPool(cinfo, pool_id);
-  for (void* ptr : mem->owned_ptrs[JPOOL_NUMPOOLS + pool_id]) {
-    hwy::FreeAlignedBytes(ptr, nullptr, nullptr);
-  }
-  ClearPool(cinfo, JPOOL_NUMPOOLS + pool_id);
-}
-
-void SelfDestruct(j_common_ptr cinfo) {
-  MemoryManager* mem = reinterpret_cast<MemoryManager*>(cinfo->mem);
-  for (int pool_id = 0; pool_id < JPOOL_NUMPOOLS; ++pool_id) {
-    FreePool(cinfo, pool_id);
-  }
-  delete mem;
-  cinfo->mem = nullptr;
-}
-
-}  // namespace
-
-void InitMemoryManager(j_common_ptr cinfo) {
-  MemoryManager* mem = new MemoryManager;
-  mem->pub.alloc_small = jpegli::Alloc;
-  mem->pub.alloc_large = jpegli::Alloc;
-  mem->pub.alloc_sarray = jpegli::Alloc2dArray<JSAMPLE>;
-  mem->pub.alloc_barray = jpegli::Alloc2dArray<JBLOCK>;
-  mem->pub.request_virt_sarray =
-      jpegli::RequestVirtualArray<jvirt_sarray_control, JSAMPLE>;
-  mem->pub.request_virt_barray =
-      jpegli::RequestVirtualArray<jvirt_barray_control, JBLOCK>;
-  mem->pub.realize_virt_arrays = jpegli::RealizeVirtualArrays;
-  mem->pub.access_virt_sarray =
-      jpegli::AccessVirtualArray<jvirt_sarray_control, JSAMPLE>;
-  mem->pub.access_virt_barray =
-      jpegli::AccessVirtualArray<jvirt_barray_control, JBLOCK>;
-  mem->pub.free_pool = jpegli::FreePool;
-  mem->pub.self_destruct = jpegli::SelfDestruct;
-  mem->pub.max_memory_to_use = 0;
-  mem->total_memory_usage = 0;
-  mem->peak_memory_usage = 0;
-  memset(mem->pool_memory_usage, 0, sizeof(mem->pool_memory_usage));
-  cinfo->mem = reinterpret_cast<struct jpeg_memory_mgr*>(mem);
-}
-
-}  // namespace jpegli
diff --git a/third_party/jpeg-xl/lib/jpegli/memory_manager.h b/third_party/jpeg-xl/lib/jpegli/memory_manager.h
deleted file mode 100644
index c650caad49ed8..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/memory_manager.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_MEMORY_MANAGER_H_
-#define LIB_JPEGLI_MEMORY_MANAGER_H_
-
-#include <stdlib.h>
-
-#include "lib/jpegli/common.h"
-
-#define JPOOL_PERMANENT_ALIGNED (JPOOL_NUMPOOLS + JPOOL_PERMANENT)
-#define JPOOL_IMAGE_ALIGNED (JPOOL_NUMPOOLS + JPOOL_IMAGE)
-
-namespace jpegli {
-
-void InitMemoryManager(j_common_ptr cinfo);
-
-template <typename T>
-T* Allocate(j_common_ptr cinfo, size_t len, int pool_id = JPOOL_PERMANENT) {
-  const size_t size = len * sizeof(T);  // NOLINT
-  void* p = (*cinfo->mem->alloc_small)(cinfo, pool_id, size);
-  return reinterpret_cast<T*>(p);
-}
-
-template <typename T>
-T* Allocate(j_decompress_ptr cinfo, size_t len, int pool_id = JPOOL_PERMANENT) {
-  return Allocate<T>(reinterpret_cast<j_common_ptr>(cinfo), len, pool_id);
-}
-
-template <typename T>
-T* Allocate(j_compress_ptr cinfo, size_t len, int pool_id = JPOOL_PERMANENT) {
-  return Allocate<T>(reinterpret_cast<j_common_ptr>(cinfo), len, pool_id);
-}
-
-template <typename T>
-JBLOCKARRAY GetBlockRow(T cinfo, int c, JDIMENSION by) {
-  return (*cinfo->mem->access_virt_barray)(
-      reinterpret_cast<j_common_ptr>(cinfo), cinfo->master->coeff_buffers[c],
-      by, 1, true);
-}
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_MEMORY_MANAGER_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/output_suspension_test.cc b/third_party/jpeg-xl/lib/jpegli/output_suspension_test.cc
deleted file mode 100644
index 44d63fdcbb4d0..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/output_suspension_test.cc
+++ /dev/null
@@ -1,231 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <ostream>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include "lib/jpegli/encode.h"
-#include "lib/jpegli/libjpeg_test_util.h"
-#include "lib/jpegli/test_params.h"
-#include "lib/jpegli/test_utils.h"
-#include "lib/jpegli/testing.h"
-
-namespace jpegli {
-namespace {
-
-constexpr size_t kInitialBufferSize = 1024;
-constexpr size_t kFinalBufferSize = 18;
-
-struct DestinationManager {
-  jpeg_destination_mgr pub;
-  std::vector<uint8_t> buffer;
-
-  DestinationManager() {
-    pub.init_destination = init_destination;
-    pub.empty_output_buffer = empty_output_buffer;
-    pub.term_destination = term_destination;
-  }
-
-  void Rewind() {
-    pub.next_output_byte = buffer.data();
-    pub.free_in_buffer = buffer.size();
-  }
-
-  void EmptyTo(std::vector<uint8_t>* output, size_t new_size = 0) {
-    output->insert(output->end(), buffer.data(), pub.next_output_byte);
-    if (new_size > 0) {
-      buffer.resize(new_size);
-    }
-    Rewind();
-  }
-
-  static void init_destination(j_compress_ptr cinfo) {
-    auto* us = reinterpret_cast<DestinationManager*>(cinfo->dest);
-    us->buffer.resize(kInitialBufferSize);
-    us->Rewind();
-  }
-
-  static boolean empty_output_buffer(j_compress_ptr cinfo) { return FALSE; }
-
-  static void term_destination(j_compress_ptr cinfo) {}
-};
-
-struct TestConfig {
-  TestImage input;
-  CompressParams jparams;
-  size_t buffer_size;
-  size_t lines_batch_size;
-};
-
-class OutputSuspensionTestParam : public ::testing::TestWithParam<TestConfig> {
-};
-
-TEST_P(OutputSuspensionTestParam, PixelData) {
-  jpeg_compress_struct cinfo = {};
-  TestConfig config = GetParam();
-  TestImage& input = config.input;
-  GeneratePixels(&input);
-  DestinationManager dest;
-  std::vector<uint8_t> compressed;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    cinfo.dest = reinterpret_cast<jpeg_destination_mgr*>(&dest);
-
-    cinfo.image_width = input.xsize;
-    cinfo.image_height = input.ysize;
-    cinfo.input_components = input.components;
-    cinfo.in_color_space = JCS_RGB;
-    jpegli_set_defaults(&cinfo);
-    cinfo.comp_info[0].v_samp_factor = config.jparams.v_sampling[0];
-    jpegli_set_progressive_level(&cinfo, 0);
-    cinfo.optimize_coding = FALSE;
-    jpegli_start_compress(&cinfo, TRUE);
-
-    size_t stride = cinfo.image_width * cinfo.input_components;
-    std::vector<uint8_t> row_bytes(config.lines_batch_size * stride);
-    while (cinfo.next_scanline < cinfo.image_height) {
-      size_t lines_left = cinfo.image_height - cinfo.next_scanline;
-      size_t num_lines = std::min(config.lines_batch_size, lines_left);
-      memcpy(row_bytes.data(), &input.pixels[cinfo.next_scanline * stride],
-             num_lines * stride);
-      std::vector<JSAMPROW> rows(num_lines);
-      for (size_t i = 0; i < num_lines; ++i) {
-        rows[i] = &row_bytes[i * stride];
-      }
-      size_t lines_done = 0;
-      while (lines_done < num_lines) {
-        lines_done += jpegli_write_scanlines(&cinfo, &rows[lines_done],
-                                             num_lines - lines_done);
-        if (lines_done < num_lines) {
-          dest.EmptyTo(&compressed, config.buffer_size);
-        }
-      }
-    }
-    dest.EmptyTo(&compressed, kFinalBufferSize);
-    jpegli_finish_compress(&cinfo);
-    dest.EmptyTo(&compressed);
-    return true;
-  };
-  ASSERT_TRUE(try_catch_block());
-  jpegli_destroy_compress(&cinfo);
-  TestImage output;
-  DecodeWithLibjpeg(CompressParams(), DecompressParams(), compressed, &output);
-  VerifyOutputImage(input, output, 2.5);
-}
-
-TEST_P(OutputSuspensionTestParam, RawData) {
-  jpeg_compress_struct cinfo = {};
-  TestConfig config = GetParam();
-  if (config.lines_batch_size != 1) return;
-  TestImage& input = config.input;
-  input.color_space = JCS_YCbCr;
-  GeneratePixels(&input);
-  GenerateRawData(config.jparams, &input);
-  DestinationManager dest;
-  std::vector<uint8_t> compressed;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    cinfo.dest = reinterpret_cast<jpeg_destination_mgr*>(&dest);
-    cinfo.image_width = input.xsize;
-    cinfo.image_height = input.ysize;
-    cinfo.input_components = input.components;
-    cinfo.in_color_space = JCS_YCbCr;
-    jpegli_set_defaults(&cinfo);
-    cinfo.comp_info[0].h_samp_factor = config.jparams.h_sampling[0];
-    cinfo.comp_info[0].v_samp_factor = config.jparams.v_sampling[0];
-    jpegli_set_progressive_level(&cinfo, 0);
-    cinfo.optimize_coding = FALSE;
-    cinfo.raw_data_in = TRUE;
-    jpegli_start_compress(&cinfo, TRUE);
-
-    std::vector<std::vector<uint8_t>> raw_data = input.raw_data;
-    size_t max_lines = config.jparams.max_v_sample() * DCTSIZE;
-    std::vector<std::vector<JSAMPROW>> rowdata(cinfo.num_components);
-    std::vector<JSAMPARRAY> data(cinfo.num_components);
-    for (int c = 0; c < cinfo.num_components; ++c) {
-      rowdata[c].resize(config.jparams.v_samp(c) * DCTSIZE);
-      data[c] = rowdata[c].data();
-    }
-    while (cinfo.next_scanline < cinfo.image_height) {
-      for (int c = 0; c < cinfo.num_components; ++c) {
-        size_t cwidth = cinfo.comp_info[c].width_in_blocks * DCTSIZE;
-        size_t cheight = cinfo.comp_info[c].height_in_blocks * DCTSIZE;
-        size_t num_lines = config.jparams.v_samp(c) * DCTSIZE;
-        size_t y0 = (cinfo.next_scanline / max_lines) * num_lines;
-        for (size_t i = 0; i < num_lines; ++i) {
-          rowdata[c][i] =
-              (y0 + i < cheight ? &raw_data[c][(y0 + i) * cwidth] : nullptr);
-        }
-      }
-      while (jpegli_write_raw_data(&cinfo, data.data(), max_lines) == 0) {
-        dest.EmptyTo(&compressed, config.buffer_size);
-      }
-    }
-    dest.EmptyTo(&compressed, kFinalBufferSize);
-    jpegli_finish_compress(&cinfo);
-    dest.EmptyTo(&compressed);
-    return true;
-  };
-  try_catch_block();
-  jpegli_destroy_compress(&cinfo);
-  DecompressParams dparams;
-  dparams.output_mode = RAW_DATA;
-  TestImage output;
-  DecodeWithLibjpeg(CompressParams(), dparams, compressed, &output);
-  VerifyOutputImage(input, output, 3.5);
-}
-
-std::vector<TestConfig> GenerateTests() {
-  std::vector<TestConfig> all_tests;
-  const size_t xsize0 = 1920;
-  const size_t ysize0 = 1080;
-  for (int dysize : {0, 1, 8, 9}) {
-    for (int v_sampling : {1, 2}) {
-      for (int nlines : {1, 8, 117}) {
-        for (int bufsize : {1, 16, 16 << 10}) {
-          TestConfig config;
-          config.lines_batch_size = nlines;
-          config.buffer_size = bufsize;
-          config.input.xsize = xsize0;
-          config.input.ysize = ysize0 + dysize;
-          config.jparams.h_sampling = {1, 1, 1};
-          config.jparams.v_sampling = {v_sampling, 1, 1};
-          all_tests.push_back(config);
-        }
-      }
-    }
-  }
-  return all_tests;
-}
-
-std::ostream& operator<<(std::ostream& os, const TestConfig& c) {
-  os << c.input;
-  os << c.jparams;
-  os << "Lines" << c.lines_batch_size;
-  os << "BufSize" << c.buffer_size;
-  return os;
-}
-
-std::string TestDescription(
-    const testing::TestParamInfo<OutputSuspensionTestParam::ParamType>& info) {
-  std::stringstream name;
-  name << info.param;
-  return name.str();
-}
-
-JPEGLI_INSTANTIATE_TEST_SUITE_P(OutputSuspensionTest, OutputSuspensionTestParam,
-                                testing::ValuesIn(GenerateTests()),
-                                TestDescription);
-
-}  // namespace
-}  // namespace jpegli
diff --git a/third_party/jpeg-xl/lib/jpegli/quant.cc b/third_party/jpeg-xl/lib/jpegli/quant.cc
deleted file mode 100644
index 14db6701b2e64..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/quant.cc
+++ /dev/null
@@ -1,768 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/quant.h"
-
-#include <algorithm>
-#include <cmath>
-#include <vector>
-
-#include "lib/jpegli/adaptive_quantization.h"
-#include "lib/jpegli/common.h"
-#include "lib/jpegli/encode_internal.h"
-#include "lib/jpegli/error.h"
-#include "lib/jpegli/memory_manager.h"
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/status.h"
-
-namespace jpegli {
-
-namespace {
-
-// Global scale is chosen in a way that butteraugli 3-norm matches libjpeg
-// with the same quality setting. Fitted for quality 90 on jyrki31 corpus.
-constexpr float kGlobalScaleXYB = 1.43951668f;
-constexpr float kGlobalScaleYCbCr = 1.73966010f;
-
-constexpr float kBaseQuantMatrixXYB[] = {
-    // c = 0
-    7.5629935265f,
-    19.8247814178f,
-    22.5724945068f,
-    20.6706695557f,
-    22.6864585876f,
-    23.5696277618f,
-    25.8129081726f,
-    36.3307571411f,
-    19.8247814178f,
-    21.5503177643f,
-    19.9372234344f,
-    20.5424213409f,
-    21.8645496368f,
-    23.9041385651f,
-    28.2844066620f,
-    32.6609764099f,
-    22.5724945068f,
-    19.9372234344f,
-    21.9017257690f,
-    19.1223449707f,
-    21.7515811920f,
-    24.6724700928f,
-    25.4249649048f,
-    32.6653823853f,
-    20.6706695557f,
-    20.5424213409f,
-    19.1223449707f,
-    20.1610221863f,
-    25.3719692230f,
-    25.9668903351f,
-    30.9804954529f,
-    31.3406009674f,
-    22.6864585876f,
-    21.8645496368f,
-    21.7515811920f,
-    25.3719692230f,
-    26.2431850433f,
-    40.5992202759f,
-    43.2624626160f,
-    63.3010940552f,
-    23.5696277618f,
-    23.9041385651f,
-    24.6724700928f,
-    25.9668903351f,
-    40.5992202759f,
-    48.3026771545f,
-    34.0964355469f,
-    61.9852142334f,
-    25.8129081726f,
-    28.2844066620f,
-    25.4249649048f,
-    30.9804954529f,
-    43.2624626160f,
-    34.0964355469f,
-    34.4937438965f,
-    66.9702758789f,
-    36.3307571411f,
-    32.6609764099f,
-    32.6653823853f,
-    31.3406009674f,
-    63.3010940552f,
-    61.9852142334f,
-    66.9702758789f,
-    39.9652709961f,
-    // c = 1
-    1.6262000799f,
-    3.2199242115f,
-    3.4903779030f,
-    3.9148359299f,
-    4.8337211609f,
-    4.9108843803f,
-    5.3137121201f,
-    6.1676793098f,
-    3.2199242115f,
-    3.4547898769f,
-    3.6036829948f,
-    4.2652835846f,
-    4.8368387222f,
-    4.8226222992f,
-    5.6120514870f,
-    6.3431472778f,
-    3.4903779030f,
-    3.6036829948f,
-    3.9044559002f,
-    4.3374395370f,
-    4.8435096741f,
-    5.4057979584f,
-    5.6066360474f,
-    6.1075134277f,
-    3.9148359299f,
-    4.2652835846f,
-    4.3374395370f,
-    4.6064834595f,
-    5.1751475334f,
-    5.4013924599f,
-    6.0399808884f,
-    6.7825231552f,
-    4.8337211609f,
-    4.8368387222f,
-    4.8435096741f,
-    5.1751475334f,
-    5.3748049736f,
-    6.1410837173f,
-    7.6529307365f,
-    7.5235214233f,
-    4.9108843803f,
-    4.8226222992f,
-    5.4057979584f,
-    5.4013924599f,
-    6.1410837173f,
-    6.3431472778f,
-    7.1083049774f,
-    7.6008300781f,
-    5.3137121201f,
-    5.6120514870f,
-    5.6066360474f,
-    6.0399808884f,
-    7.6529307365f,
-    7.1083049774f,
-    7.0943155289f,
-    7.0478363037f,
-    6.1676793098f,
-    6.3431472778f,
-    6.1075134277f,
-    6.7825231552f,
-    7.5235214233f,
-    7.6008300781f,
-    7.0478363037f,
-    6.9186143875f,
-    // c = 2
-    3.3038473129f,
-    10.0689258575f,
-    12.2785224915f,
-    14.6041173935f,
-    16.2107315063f,
-    19.2314529419f,
-    28.0129547119f,
-    55.6682891846f,
-    10.0689258575f,
-    11.4085016251f,
-    11.3871345520f,
-    15.4934167862f,
-    16.5364933014f,
-    14.9153423309f,
-    26.3748722076f,
-    40.8614425659f,
-    12.2785224915f,
-    11.3871345520f,
-    17.0886878967f,
-    13.9500350952f,
-    16.0003223419f,
-    28.5660629272f,
-    26.2124195099f,
-    30.1260128021f,
-    14.6041173935f,
-    15.4934167862f,
-    13.9500350952f,
-    21.1235027313f,
-    26.1579780579f,
-    25.5579223633f,
-    40.6859359741f,
-    33.8056335449f,
-    16.2107315063f,
-    16.5364933014f,
-    16.0003223419f,
-    26.1579780579f,
-    26.8042831421f,
-    26.1587715149f,
-    35.7343978882f,
-    43.6857032776f,
-    19.2314529419f,
-    14.9153423309f,
-    28.5660629272f,
-    25.5579223633f,
-    26.1587715149f,
-    34.5418128967f,
-    41.3197937012f,
-    48.7867660522f,
-    28.0129547119f,
-    26.3748722076f,
-    26.2124195099f,
-    40.6859359741f,
-    35.7343978882f,
-    41.3197937012f,
-    47.6329460144f,
-    55.3498458862f,
-    55.6682891846f,
-    40.8614425659f,
-    30.1260128021f,
-    33.8056335449f,
-    43.6857032776f,
-    48.7867660522f,
-    55.3498458862f,
-    63.6065597534f,
-};
-
-const float kBaseQuantMatrixYCbCr[] = {
-    // c = 0
-    1.2397409345866273f,  //
-    1.7227115097630963f,  //
-    2.9212167156636855f,  //
-    2.812737435286529f,   //
-    3.339819711906184f,   //
-    3.463603762596166f,   //
-    3.840915217993518f,   //
-    3.86956f,             //
-    1.7227115097630963f,  //
-    2.0928894413636874f,  //
-    2.8456760904429297f,  //
-    2.704506820909662f,   //
-    3.4407673520905337f,  //
-    3.166232352090534f,   //
-    4.025208741558432f,   //
-    4.035324490952577f,   //
-    2.9212167156636855f,  //
-    2.8456760904429297f,  //
-    2.9587403520905338f,  //
-    3.3862948970669273f,  //
-    3.619523781336757f,   //
-    3.9046279999999998f,  //
-    3.757835838431854f,   //
-    4.237447515714274f,   //
-    2.812737435286529f,   //
-    2.704506820909662f,   //
-    3.3862948970669273f,  //
-    3.380058821812233f,   //
-    4.1679867415584315f,  //
-    4.805510627261856f,   //
-    4.784259f,            //
-    4.605934f,            //
-    3.339819711906184f,   //
-    3.4407673520905337f,  //
-    3.619523781336757f,   //
-    4.1679867415584315f,  //
-    4.579851258441568f,   //
-    4.923237f,            //
-    5.574107f,            //
-    5.48533336146308f,    //
-    3.463603762596166f,   //
-    3.166232352090534f,   //
-    3.9046279999999998f,  //
-    4.805510627261856f,   //
-    4.923237f,            //
-    5.43936f,             //
-    5.093895741558431f,   //
-    6.0872254423617225f,  //
-    3.840915217993518f,   //
-    4.025208741558432f,   //
-    3.757835838431854f,   //
-    4.784259f,            //
-    5.574107f,            //
-    5.093895741558431f,   //
-    5.438461f,            //
-    5.4037359493250845f,  //
-    3.86956f,             //
-    4.035324490952577f,   //
-    4.237447515714274f,   //
-    4.605934f,            //
-    5.48533336146308f,    //
-    6.0872254423617225f,  //
-    5.4037359493250845f,  //
-    4.37787101190424f,
-    // c = 1
-    2.8236197786377537f,  //
-    6.495639358561486f,   //
-    9.310489207538302f,   //
-    10.64747864717083f,   //
-    11.07419143098738f,   //
-    17.146390223910462f,  //
-    18.463982229408998f,  //
-    29.087001644203088f,  //
-    6.495639358561486f,   //
-    8.890103846667353f,   //
-    8.976895794294748f,   //
-    13.666270550318826f,  //
-    16.547071905624193f,  //
-    16.63871382827686f,   //
-    26.778396930893695f,  //
-    21.33034294694781f,   //
-    9.310489207538302f,   //
-    8.976895794294748f,   //
-    11.08737706005991f,   //
-    18.20548239870446f,   //
-    19.752481654011646f,  //
-    23.985660533114896f,  //
-    102.6457378402362f,   //
-    24.450989f,           //
-    10.64747864717083f,   //
-    13.666270550318826f,  //
-    18.20548239870446f,   //
-    18.628012327860365f,  //
-    16.042509519487183f,  //
-    25.04918273242625f,   //
-    25.017140189353015f,  //
-    35.79788782635831f,   //
-    11.07419143098738f,   //
-    16.547071905624193f,  //
-    19.752481654011646f,  //
-    16.042509519487183f,  //
-    19.373482748612577f,  //
-    14.677529999999999f,  //
-    19.94695960400931f,   //
-    51.094112f,           //
-    17.146390223910462f,  //
-    16.63871382827686f,   //
-    23.985660533114896f,  //
-    25.04918273242625f,   //
-    14.677529999999999f,  //
-    31.320412426835304f,  //
-    46.357234000000005f,  //
-    67.48111451705412f,   //
-    18.463982229408998f,  //
-    26.778396930893695f,  //
-    102.6457378402362f,   //
-    25.017140189353015f,  //
-    19.94695960400931f,   //
-    46.357234000000005f,  //
-    61.315764694388044f,  //
-    88.34665293823721f,   //
-    29.087001644203088f,  //
-    21.33034294694781f,   //
-    24.450989f,           //
-    35.79788782635831f,   //
-    51.094112f,           //
-    67.48111451705412f,   //
-    88.34665293823721f,   //
-    112.16099098350989f,
-    // c = 2
-    2.9217254961255255f,  //
-    4.497681013199305f,   //
-    7.356344520940414f,   //
-    6.583891506504051f,   //
-    8.535608740100237f,   //
-    8.799434353234647f,   //
-    9.188341534163023f,   //
-    9.482700481227672f,   //
-    4.497681013199305f,   //
-    6.309548851989123f,   //
-    7.024608962670982f,   //
-    7.156445324163424f,   //
-    8.049059218663244f,   //
-    7.0124290657218555f,  //
-    6.711923184393611f,   //
-    8.380307846134853f,   //
-    7.356344520940414f,   //
-    7.024608962670982f,   //
-    6.892101177327445f,   //
-    6.882819916277163f,   //
-    8.782226090078568f,   //
-    6.8774750000000004f,  //
-    7.8858175969577955f,  //
-    8.67909f,             //
-    6.583891506504051f,   //
-    7.156445324163424f,   //
-    6.882819916277163f,   //
-    7.003072944847055f,   //
-    7.7223464701024875f,  //
-    7.955425720217421f,   //
-    7.4734110000000005f,  //
-    8.362933242943903f,   //
-    8.535608740100237f,   //
-    8.049059218663244f,   //
-    8.782226090078568f,   //
-    7.7223464701024875f,  //
-    6.778005927001542f,   //
-    9.484922741558432f,   //
-    9.043702663686046f,   //
-    8.053178199770173f,   //
-    8.799434353234647f,   //
-    7.0124290657218555f,  //
-    6.8774750000000004f,  //
-    7.955425720217421f,   //
-    9.484922741558432f,   //
-    8.607606527385098f,   //
-    9.922697394370815f,   //
-    64.25135180237939f,   //
-    9.188341534163023f,   //
-    6.711923184393611f,   //
-    7.8858175969577955f,  //
-    7.4734110000000005f,  //
-    9.043702663686046f,   //
-    9.922697394370815f,   //
-    63.184936549738225f,  //
-    83.35294340273799f,   //
-    9.482700481227672f,   //
-    8.380307846134853f,   //
-    8.67909f,             //
-    8.362933242943903f,   //
-    8.053178199770173f,   //
-    64.25135180237939f,   //
-    83.35294340273799f,   //
-    114.89202448569779f,  //
-};
-
-const float k420GlobalScale = 1.22;
-const float k420Rescale[64] = {
-    0.4093, 0.3209, 0.3477, 0.3333, 0.3144, 0.2823, 0.3214, 0.3354,  //
-    0.3209, 0.3111, 0.3489, 0.2801, 0.3059, 0.3119, 0.4135, 0.3445,  //
-    0.3477, 0.3489, 0.3586, 0.3257, 0.2727, 0.3754, 0.3369, 0.3484,  //
-    0.3333, 0.2801, 0.3257, 0.3020, 0.3515, 0.3410, 0.3971, 0.3839,  //
-    0.3144, 0.3059, 0.2727, 0.3515, 0.3105, 0.3397, 0.2716, 0.3836,  //
-    0.2823, 0.3119, 0.3754, 0.3410, 0.3397, 0.3212, 0.3203, 0.0726,  //
-    0.3214, 0.4135, 0.3369, 0.3971, 0.2716, 0.3203, 0.0798, 0.0553,  //
-    0.3354, 0.3445, 0.3484, 0.3839, 0.3836, 0.0726, 0.0553, 0.3368,  //
-};
-
-const float kBaseQuantMatrixStd[] = {
-    // c = 0
-    16.0f, 11.0f, 10.0f, 16.0f, 24.0f, 40.0f, 51.0f, 61.0f,      //
-    12.0f, 12.0f, 14.0f, 19.0f, 26.0f, 58.0f, 60.0f, 55.0f,      //
-    14.0f, 13.0f, 16.0f, 24.0f, 40.0f, 57.0f, 69.0f, 56.0f,      //
-    14.0f, 17.0f, 22.0f, 29.0f, 51.0f, 87.0f, 80.0f, 62.0f,      //
-    18.0f, 22.0f, 37.0f, 56.0f, 68.0f, 109.0f, 103.0f, 77.0f,    //
-    24.0f, 35.0f, 55.0f, 64.0f, 81.0f, 104.0f, 113.0f, 92.0f,    //
-    49.0f, 64.0f, 78.0f, 87.0f, 103.0f, 121.0f, 120.0f, 101.0f,  //
-    72.0f, 92.0f, 95.0f, 98.0f, 112.0f, 100.0f, 103.0f, 99.0f,   //
-    // c = 1
-    17.0f, 18.0f, 24.0f, 47.0f, 99.0f, 99.0f, 99.0f, 99.0f,  //
-    18.0f, 21.0f, 26.0f, 66.0f, 99.0f, 99.0f, 99.0f, 99.0f,  //
-    24.0f, 26.0f, 56.0f, 99.0f, 99.0f, 99.0f, 99.0f, 99.0f,  //
-    47.0f, 66.0f, 99.0f, 99.0f, 99.0f, 99.0f, 99.0f, 99.0f,  //
-    99.0f, 99.0f, 99.0f, 99.0f, 99.0f, 99.0f, 99.0f, 99.0f,  //
-    99.0f, 99.0f, 99.0f, 99.0f, 99.0f, 99.0f, 99.0f, 99.0f,  //
-    99.0f, 99.0f, 99.0f, 99.0f, 99.0f, 99.0f, 99.0f, 99.0f,  //
-    99.0f, 99.0f, 99.0f, 99.0f, 99.0f, 99.0f, 99.0f, 99.0f,  //
-};
-
-const float kZeroBiasMulYCbCrLQ[] = {
-    // c = 0
-    0.0000f, 0.0568f, 0.3880f, 0.6190f, 0.6190f, 0.4490f, 0.4490f, 0.6187f,  //
-    0.0568f, 0.5829f, 0.6189f, 0.6190f, 0.6190f, 0.7190f, 0.6190f, 0.6189f,  //
-    0.3880f, 0.6189f, 0.6190f, 0.6190f, 0.6190f, 0.6190f, 0.6187f, 0.6100f,  //
-    0.6190f, 0.6190f, 0.6190f, 0.6190f, 0.5890f, 0.3839f, 0.7160f, 0.6190f,  //
-    0.6190f, 0.6190f, 0.6190f, 0.5890f, 0.6190f, 0.3880f, 0.5860f, 0.4790f,  //
-    0.4490f, 0.7190f, 0.6190f, 0.3839f, 0.3880f, 0.6190f, 0.6190f, 0.6190f,  //
-    0.4490f, 0.6190f, 0.6187f, 0.7160f, 0.5860f, 0.6190f, 0.6204f, 0.6190f,  //
-    0.6187f, 0.6189f, 0.6100f, 0.6190f, 0.4790f, 0.6190f, 0.6190f, 0.3480f,  //
-    // c = 1
-    0.0000f, 1.1640f, 0.9373f, 1.1319f, 0.8016f, 0.9136f, 1.1530f, 0.9430f,  //
-    1.1640f, 0.9188f, 0.9160f, 1.1980f, 1.1830f, 0.9758f, 0.9430f, 0.9430f,  //
-    0.9373f, 0.9160f, 0.8430f, 1.1720f, 0.7083f, 0.9430f, 0.9430f, 0.9430f,  //
-    1.1319f, 1.1980f, 1.1720f, 1.1490f, 0.8547f, 0.9430f, 0.9430f, 0.9430f,  //
-    0.8016f, 1.1830f, 0.7083f, 0.8547f, 0.9430f, 0.9430f, 0.9430f, 0.9430f,  //
-    0.9136f, 0.9758f, 0.9430f, 0.9430f, 0.9430f, 0.9430f, 0.9430f, 0.9430f,  //
-    1.1530f, 0.9430f, 0.9430f, 0.9430f, 0.9430f, 0.9430f, 0.9430f, 0.9480f,  //
-    0.9430f, 0.9430f, 0.9430f, 0.9430f, 0.9430f, 0.9430f, 0.9480f, 0.9430f,  //
-    // c = 2
-    0.0000f, 1.3190f, 0.4308f, 0.4460f, 0.0661f, 0.0660f, 0.2660f, 0.2960f,  //
-    1.3190f, 0.3280f, 0.3093f, 0.0750f, 0.0505f, 0.1594f, 0.3060f, 0.2113f,  //
-    0.4308f, 0.3093f, 0.3060f, 0.1182f, 0.0500f, 0.3060f, 0.3915f, 0.2426f,  //
-    0.4460f, 0.0750f, 0.1182f, 0.0512f, 0.0500f, 0.2130f, 0.3930f, 0.1590f,  //
-    0.0661f, 0.0505f, 0.0500f, 0.0500f, 0.3055f, 0.3360f, 0.5148f, 0.5403f,  //
-    0.0660f, 0.1594f, 0.3060f, 0.2130f, 0.3360f, 0.5060f, 0.5874f, 0.3060f,  //
-    0.2660f, 0.3060f, 0.3915f, 0.3930f, 0.5148f, 0.5874f, 0.3060f, 0.3060f,  //
-    0.2960f, 0.2113f, 0.2426f, 0.1590f, 0.5403f, 0.3060f, 0.3060f, 0.3060f,  //
-};
-
-const float kZeroBiasMulYCbCrHQ[] = {
-    // c = 0
-    0.0000f, 0.0044f, 0.2521f, 0.6547f, 0.8161f, 0.6130f, 0.8841f, 0.8155f,  //
-    0.0044f, 0.6831f, 0.6553f, 0.6295f, 0.7848f, 0.7843f, 0.8474f, 0.7836f,  //
-    0.2521f, 0.6553f, 0.7834f, 0.7829f, 0.8161f, 0.8072f, 0.7743f, 0.9242f,  //
-    0.6547f, 0.6295f, 0.7829f, 0.8654f, 0.7829f, 0.6986f, 0.7818f, 0.7726f,  //
-    0.8161f, 0.7848f, 0.8161f, 0.7829f, 0.7471f, 0.7827f, 0.7843f, 0.7653f,  //
-    0.6130f, 0.7843f, 0.8072f, 0.6986f, 0.7827f, 0.7848f, 0.9508f, 0.7653f,  //
-    0.8841f, 0.8474f, 0.7743f, 0.7818f, 0.7843f, 0.9508f, 0.7839f, 0.8437f,  //
-    0.8155f, 0.7836f, 0.9242f, 0.7726f, 0.7653f, 0.7653f, 0.8437f, 0.7819f,  //
-    // c = 1
-    0.0000f, 1.0816f, 1.0556f, 1.2876f, 1.1554f, 1.1567f, 1.8851f, 0.5488f,  //
-    1.0816f, 1.1537f, 1.1850f, 1.0712f, 1.1671f, 2.0719f, 1.0544f, 1.4764f,  //
-    1.0556f, 1.1850f, 1.2870f, 1.1981f, 1.8181f, 1.2618f, 1.0564f, 1.1191f,  //
-    1.2876f, 1.0712f, 1.1981f, 1.4753f, 2.0609f, 1.0564f, 1.2645f, 1.0564f,  //
-    1.1554f, 1.1671f, 1.8181f, 2.0609f, 0.7324f, 1.1163f, 0.8464f, 1.0564f,  //
-    1.1567f, 2.0719f, 1.2618f, 1.0564f, 1.1163f, 1.0040f, 1.0564f, 1.0564f,  //
-    1.8851f, 1.0544f, 1.0564f, 1.2645f, 0.8464f, 1.0564f, 1.0564f, 1.0564f,  //
-    0.5488f, 1.4764f, 1.1191f, 1.0564f, 1.0564f, 1.0564f, 1.0564f, 1.0564f,  //
-    // c = 2
-    0.0000f, 0.5392f, 0.6659f, 0.8968f, 0.6829f, 0.6328f, 0.5802f, 0.4836f,  //
-    0.5392f, 0.6746f, 0.6760f, 0.6102f, 0.6015f, 0.6958f, 0.7327f, 0.4897f,  //
-    0.6659f, 0.6760f, 0.6957f, 0.6543f, 0.4396f, 0.6330f, 0.7081f, 0.2583f,  //
-    0.8968f, 0.6102f, 0.6543f, 0.5913f, 0.6457f, 0.5828f, 0.5139f, 0.3565f,  //
-    0.6829f, 0.6015f, 0.4396f, 0.6457f, 0.5633f, 0.4263f, 0.6371f, 0.5949f,  //
-    0.6328f, 0.6958f, 0.6330f, 0.5828f, 0.4263f, 0.2847f, 0.2909f, 0.6629f,  //
-    0.5802f, 0.7327f, 0.7081f, 0.5139f, 0.6371f, 0.2909f, 0.6644f, 0.6644f,  //
-    0.4836f, 0.4897f, 0.2583f, 0.3565f, 0.5949f, 0.6629f, 0.6644f, 0.6644f,  //
-};
-
-const float kZeroBiasOffsetYCbCrDC[] = {0.0f, 0.0f, 0.0f};
-
-const float kZeroBiasOffsetYCbCrAC[] = {
-    0.59082f,
-    0.58146f,
-    0.57988f,
-};
-
-constexpr uint8_t kTransferFunctionPQ = 16;
-constexpr uint8_t kTransferFunctionHLG = 18;
-
-float DistanceToLinearQuality(float distance) {
-  if (distance <= 0.1f) {
-    return 1.0f;
-  } else if (distance <= 4.6f) {
-    return (200.0f / 9.0f) * (distance - 0.1f);
-  } else if (distance <= 6.4f) {
-    return 5000.0f / (100.0f - (distance - 0.1f) / 0.09f);
-  } else if (distance < 25.0f) {
-    return 530000.0f /
-           (3450.0f -
-            300.0f * std::sqrt((848.0f * distance - 5330.0f) / 120.0f));
-  } else {
-    return 5000.0f;
-  }
-}
-
-constexpr float kExponent[DCTSIZE2] = {
-    1.00f, 0.51f, 0.67f, 0.74f, 1.00f, 1.00f, 1.00f, 1.00f,  //
-    0.51f, 0.66f, 0.69f, 0.87f, 1.00f, 1.00f, 1.00f, 1.00f,  //
-    0.67f, 0.69f, 0.84f, 0.83f, 0.96f, 1.00f, 1.00f, 1.00f,  //
-    0.74f, 0.87f, 0.83f, 1.00f, 1.00f, 0.91f, 0.91f, 1.00f,  //
-    1.00f, 1.00f, 0.96f, 1.00f, 1.00f, 1.00f, 1.00f, 1.00f,  //
-    1.00f, 1.00f, 1.00f, 0.91f, 1.00f, 1.00f, 1.00f, 1.00f,  //
-    1.00f, 1.00f, 1.00f, 0.91f, 1.00f, 1.00f, 1.00f, 1.00f,  //
-    1.00f, 1.00f, 1.00f, 1.00f, 1.00f, 1.00f, 1.00f, 1.00f,  //
-};
-constexpr float kDist0 = 1.5f;  // distance where non-linearity kicks in.
-
-float DistanceToScale(float distance, int k) {
-  if (distance < kDist0) {
-    return distance;
-  }
-  const float exp = kExponent[k];
-  const float mul = std::pow(kDist0, 1.0 - exp);
-  return std::max<float>(0.5f * distance, mul * std::pow(distance, exp));
-}
-
-float ScaleToDistance(float scale, int k) {
-  if (scale < kDist0) {
-    return scale;
-  }
-  const float exp = 1.0 / kExponent[k];
-  const float mul = std::pow(kDist0, 1.0 - exp);
-  return std::min<float>(2.0f * scale, mul * std::pow(scale, exp));
-}
-
-float QuantValsToDistance(j_compress_ptr cinfo) {
-  jpeg_comp_master* m = cinfo->master;
-  float global_scale = kGlobalScaleYCbCr;
-  if (m->cicp_transfer_function == kTransferFunctionPQ) {
-    global_scale *= .4f;
-  } else if (m->cicp_transfer_function == kTransferFunctionHLG) {
-    global_scale *= .5f;
-  }
-  int quant_max = m->force_baseline ? 255 : 32767U;
-  static const float kDistMax = 10000.0f;
-  float dist_min = 0.0f;
-  float dist_max = kDistMax;
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    int quant_idx = cinfo->comp_info[c].quant_tbl_no;
-    uint16_t* quantval = cinfo->quant_tbl_ptrs[quant_idx]->quantval;
-    const float* base_qm = &kBaseQuantMatrixYCbCr[quant_idx * DCTSIZE2];
-    for (int k = 0; k < DCTSIZE2; ++k) {
-      float dmin = 0.0;
-      float dmax = kDistMax;
-      float invq = 1.0f / base_qm[k] / global_scale;
-      int qval = quantval[k];
-      if (qval > 1) {
-        float scale_min = (qval - 0.5f) * invq;
-        dmin = ScaleToDistance(scale_min, k);
-      }
-      if (qval < quant_max) {
-        float scale_max = (qval + 0.5f) * invq;
-        dmax = ScaleToDistance(scale_max, k);
-      }
-      if (dmin <= dist_max) {
-        dist_min = std::max(dmin, dist_min);
-      }
-      if (dmax >= dist_min) {
-        dist_max = std::min(dist_max, dmax);
-      }
-    }
-  }
-  float distance;
-  if (dist_min == 0) {
-    distance = dist_max;
-  } else if (dist_max == kDistMax) {
-    distance = dist_min;
-  } else {
-    distance = 0.5f * (dist_min + dist_max);
-  }
-  return distance;
-}
-
-bool IsYUV420(j_compress_ptr cinfo) {
-  return (cinfo->jpeg_color_space == JCS_YCbCr &&
-          cinfo->comp_info[0].h_samp_factor == 2 &&
-          cinfo->comp_info[0].v_samp_factor == 2 &&
-          cinfo->comp_info[1].h_samp_factor == 1 &&
-          cinfo->comp_info[1].v_samp_factor == 1 &&
-          cinfo->comp_info[2].h_samp_factor == 1 &&
-          cinfo->comp_info[2].v_samp_factor == 1);
-}
-
-}  // namespace
-
-void SetQuantMatrices(j_compress_ptr cinfo, float distances[NUM_QUANT_TBLS],
-                      bool add_two_chroma_tables) {
-  jpeg_comp_master* m = cinfo->master;
-  const bool xyb = m->xyb_mode && cinfo->jpeg_color_space == JCS_RGB;
-  const bool is_yuv420 = IsYUV420(cinfo);
-
-  float global_scale;
-  bool non_linear_scaling = true;
-  const float* base_quant_matrix[NUM_QUANT_TBLS];
-  int num_base_tables;
-
-  if (xyb) {
-    global_scale = kGlobalScaleXYB;
-    num_base_tables = 3;
-    base_quant_matrix[0] = kBaseQuantMatrixXYB;
-    base_quant_matrix[1] = kBaseQuantMatrixXYB + DCTSIZE2;
-    base_quant_matrix[2] = kBaseQuantMatrixXYB + 2 * DCTSIZE2;
-  } else if (cinfo->jpeg_color_space == JCS_YCbCr && !m->use_std_tables) {
-    global_scale = kGlobalScaleYCbCr;
-    if (m->cicp_transfer_function == kTransferFunctionPQ) {
-      global_scale *= .4f;
-    } else if (m->cicp_transfer_function == kTransferFunctionHLG) {
-      global_scale *= .5f;
-    }
-    if (is_yuv420) {
-      global_scale *= k420GlobalScale;
-    }
-    if (add_two_chroma_tables) {
-      cinfo->comp_info[2].quant_tbl_no = 2;
-      num_base_tables = 3;
-      base_quant_matrix[0] = kBaseQuantMatrixYCbCr;
-      base_quant_matrix[1] = kBaseQuantMatrixYCbCr + DCTSIZE2;
-      base_quant_matrix[2] = kBaseQuantMatrixYCbCr + 2 * DCTSIZE2;
-    } else {
-      num_base_tables = 2;
-      base_quant_matrix[0] = kBaseQuantMatrixYCbCr;
-      // Use the Cr table for both Cb and Cr.
-      base_quant_matrix[1] = kBaseQuantMatrixYCbCr + 2 * DCTSIZE2;
-    }
-  } else {
-    global_scale = 0.01f;
-    non_linear_scaling = false;
-    num_base_tables = 2;
-    base_quant_matrix[0] = kBaseQuantMatrixStd;
-    base_quant_matrix[1] = kBaseQuantMatrixStd + DCTSIZE2;
-  }
-
-  int quant_max = m->force_baseline ? 255 : 32767U;
-  for (int quant_idx = 0; quant_idx < num_base_tables; ++quant_idx) {
-    const float* base_qm = base_quant_matrix[quant_idx];
-    JQUANT_TBL** qtable = &cinfo->quant_tbl_ptrs[quant_idx];
-    if (*qtable == nullptr) {
-      *qtable = jpegli_alloc_quant_table(reinterpret_cast<j_common_ptr>(cinfo));
-    }
-    for (int k = 0; k < DCTSIZE2; ++k) {
-      float scale = global_scale;
-      if (non_linear_scaling) {
-        scale *= DistanceToScale(distances[quant_idx], k);
-        if (is_yuv420 && quant_idx > 0) {
-          scale *= k420Rescale[k];
-        }
-      } else {
-        scale *= DistanceToLinearQuality(distances[quant_idx]);
-      }
-      int qval = std::round(scale * base_qm[k]);
-      (*qtable)->quantval[k] = std::max(1, std::min(qval, quant_max));
-    }
-    (*qtable)->sent_table = FALSE;
-  }
-}
-
-void InitQuantizer(j_compress_ptr cinfo, QuantPass pass) {
-  jpeg_comp_master* m = cinfo->master;
-  // Compute quantization multupliers from the quant table values.
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    int quant_idx = cinfo->comp_info[c].quant_tbl_no;
-    JQUANT_TBL* quant_table = cinfo->quant_tbl_ptrs[quant_idx];
-    if (!quant_table) {
-      JPEGLI_ERROR("Missing quantization table %d for component %d", quant_idx,
-                   c);
-    }
-    for (size_t k = 0; k < DCTSIZE2; k++) {
-      int val = quant_table->quantval[k];
-      if (val == 0) {
-        JPEGLI_ERROR("Invalid quantval 0.");
-      }
-      switch (pass) {
-        case QuantPass::NO_SEARCH:
-          m->quant_mul[c][k] = 8.0f / val;
-          break;
-        case QuantPass::SEARCH_FIRST_PASS:
-          m->quant_mul[c][k] = 128.0f;
-          break;
-        case QuantPass::SEARCH_SECOND_PASS:
-          m->quant_mul[c][kJPEGZigZagOrder[k]] = 1.0f / (16 * val);
-          break;
-      }
-    }
-  }
-  if (m->use_adaptive_quantization) {
-    for (int c = 0; c < cinfo->num_components; ++c) {
-      for (int k = 0; k < DCTSIZE2; ++k) {
-        m->zero_bias_mul[c][k] = k == 0 ? 0.0f : 0.5f;
-        m->zero_bias_offset[c][k] = k == 0 ? 0.0f : 0.5f;
-      }
-    }
-    if (cinfo->jpeg_color_space == JCS_YCbCr) {
-      float distance = QuantValsToDistance(cinfo);
-      static const float kDistHQ = 1.0f;
-      static const float kDistLQ = 3.0f;
-      float mix0 = (distance - kDistHQ) / (kDistLQ - kDistHQ);
-      mix0 = std::max(0.0f, std::min(1.0f, mix0));
-      float mix1 = 1.0f - mix0;
-      for (int c = 0; c < cinfo->num_components; ++c) {
-        for (int k = 0; k < DCTSIZE2; ++k) {
-          float mul0 = kZeroBiasMulYCbCrLQ[c * DCTSIZE2 + k];
-          float mul1 = kZeroBiasMulYCbCrHQ[c * DCTSIZE2 + k];
-          m->zero_bias_mul[c][k] = mix0 * mul0 + mix1 * mul1;
-          m->zero_bias_offset[c][k] =
-              k == 0 ? kZeroBiasOffsetYCbCrDC[c] : kZeroBiasOffsetYCbCrAC[c];
-        }
-      }
-    }
-  } else if (cinfo->jpeg_color_space == JCS_YCbCr) {
-    for (int c = 0; c < cinfo->num_components; ++c) {
-      for (int k = 0; k < DCTSIZE2; ++k) {
-        m->zero_bias_offset[c][k] =
-            k == 0 ? kZeroBiasOffsetYCbCrDC[c] : kZeroBiasOffsetYCbCrAC[c];
-      }
-    }
-  }
-}
-
-}  // namespace jpegli
diff --git a/third_party/jpeg-xl/lib/jpegli/quant.h b/third_party/jpeg-xl/lib/jpegli/quant.h
deleted file mode 100644
index cb37757ae204b..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/quant.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_QUANT_H_
-#define LIB_JPEGLI_QUANT_H_
-
-#include "lib/jpegli/common.h"
-
-namespace jpegli {
-
-void SetQuantMatrices(j_compress_ptr cinfo, float distances[NUM_QUANT_TBLS],
-                      bool add_two_chroma_tables);
-
-enum QuantPass {
-  NO_SEARCH,
-  SEARCH_FIRST_PASS,
-  SEARCH_SECOND_PASS,
-};
-
-void InitQuantizer(j_compress_ptr cinfo, QuantPass pass);
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_QUANT_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/render.cc b/third_party/jpeg-xl/lib/jpegli/render.cc
deleted file mode 100644
index 1510401fa70e6..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/render.cc
+++ /dev/null
@@ -1,761 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/render.h"
-
-#include <array>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <vector>
-
-#include "lib/jpegli/color_quantize.h"
-#include "lib/jpegli/color_transform.h"
-#include "lib/jpegli/decode_internal.h"
-#include "lib/jpegli/error.h"
-#include "lib/jpegli/idct.h"
-#include "lib/jpegli/upsample.h"
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/compiler_specific.h"
-
-#ifdef MEMORY_SANITIZER
-#define JXL_MEMORY_SANITIZER 1
-#elif defined(__has_feature)
-#if __has_feature(memory_sanitizer)
-#define JXL_MEMORY_SANITIZER 1
-#else
-#define JXL_MEMORY_SANITIZER 0
-#endif
-#else
-#define JXL_MEMORY_SANITIZER 0
-#endif
-
-#if JXL_MEMORY_SANITIZER
-#include "sanitizer/msan_interface.h"
-#endif
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jpegli/render.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-HWY_BEFORE_NAMESPACE();
-namespace jpegli {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Abs;
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::Clamp;
-using hwy::HWY_NAMESPACE::Gt;
-using hwy::HWY_NAMESPACE::IfThenElseZero;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::NearestInt;
-using hwy::HWY_NAMESPACE::Or;
-using hwy::HWY_NAMESPACE::Rebind;
-using hwy::HWY_NAMESPACE::ShiftLeftSame;
-using hwy::HWY_NAMESPACE::ShiftRightSame;
-using hwy::HWY_NAMESPACE::Vec;
-using D = HWY_FULL(float);
-using DI = HWY_FULL(int32_t);
-constexpr D d;
-constexpr DI di;
-
-void GatherBlockStats(const int16_t* JXL_RESTRICT coeffs,
-                      const size_t coeffs_size, int32_t* JXL_RESTRICT nonzeros,
-                      int32_t* JXL_RESTRICT sumabs) {
-  for (size_t i = 0; i < coeffs_size; i += Lanes(d)) {
-    size_t k = i % DCTSIZE2;
-    const Rebind<int16_t, DI> di16;
-    const Vec<DI> coeff = PromoteTo(di, Load(di16, coeffs + i));
-    const auto abs_coeff = Abs(coeff);
-    const auto not_0 = Gt(abs_coeff, Zero(di));
-    const auto nzero = IfThenElseZero(not_0, Set(di, 1));
-    Store(Add(nzero, Load(di, nonzeros + k)), di, nonzeros + k);
-    Store(Add(abs_coeff, Load(di, sumabs + k)), di, sumabs + k);
-  }
-}
-
-void DecenterRow(float* row, size_t xsize) {
-  const HWY_CAPPED(float, 8) df;
-  const auto c128 = Set(df, 128.0f / 255);
-  for (size_t x = 0; x < xsize; x += Lanes(df)) {
-    Store(Add(Load(df, row + x), c128), df, row + x);
-  }
-}
-
-void DitherRow(j_decompress_ptr cinfo, float* row, int c, size_t y,
-               size_t xsize) {
-  jpeg_decomp_master* m = cinfo->master;
-  if (!m->dither_[c]) return;
-  const float* dither_row =
-      &m->dither_[c][(y & m->dither_mask_) * m->dither_size_];
-  for (size_t x = 0; x < xsize; ++x) {
-    row[x] += dither_row[x & m->dither_mask_];
-  }
-}
-
-template <typename T>
-void StoreUnsignedRow(float* JXL_RESTRICT input[], size_t x0, size_t len,
-                      size_t num_channels, float multiplier, T* output) {
-  const HWY_CAPPED(float, 8) d;
-  auto zero = Zero(d);
-  auto mul = Set(d, multiplier);
-  const Rebind<T, decltype(d)> du;
-#if JXL_MEMORY_SANITIZER
-  const size_t padding = hwy::RoundUpTo(len, Lanes(d)) - len;
-  for (size_t c = 0; c < num_channels; ++c) {
-    __msan_unpoison(input[c] + x0 + len, sizeof(input[c][0]) * padding);
-  }
-#endif
-  if (num_channels == 1) {
-    for (size_t i = 0; i < len; i += Lanes(d)) {
-      auto v0 = Clamp(zero, Mul(LoadU(d, &input[0][x0 + i]), mul), mul);
-      StoreU(DemoteTo(du, NearestInt(v0)), du, &output[i]);
-    }
-  } else if (num_channels == 2) {
-    for (size_t i = 0; i < len; i += Lanes(d)) {
-      auto v0 = Clamp(zero, Mul(LoadU(d, &input[0][x0 + i]), mul), mul);
-      auto v1 = Clamp(zero, Mul(LoadU(d, &input[1][x0 + i]), mul), mul);
-      StoreInterleaved2(DemoteTo(du, NearestInt(v0)),
-                        DemoteTo(du, NearestInt(v1)), du, &output[2 * i]);
-    }
-  } else if (num_channels == 3) {
-    for (size_t i = 0; i < len; i += Lanes(d)) {
-      auto v0 = Clamp(zero, Mul(LoadU(d, &input[0][x0 + i]), mul), mul);
-      auto v1 = Clamp(zero, Mul(LoadU(d, &input[1][x0 + i]), mul), mul);
-      auto v2 = Clamp(zero, Mul(LoadU(d, &input[2][x0 + i]), mul), mul);
-      StoreInterleaved3(DemoteTo(du, NearestInt(v0)),
-                        DemoteTo(du, NearestInt(v1)),
-                        DemoteTo(du, NearestInt(v2)), du, &output[3 * i]);
-    }
-  } else if (num_channels == 4) {
-    for (size_t i = 0; i < len; i += Lanes(d)) {
-      auto v0 = Clamp(zero, Mul(LoadU(d, &input[0][x0 + i]), mul), mul);
-      auto v1 = Clamp(zero, Mul(LoadU(d, &input[1][x0 + i]), mul), mul);
-      auto v2 = Clamp(zero, Mul(LoadU(d, &input[2][x0 + i]), mul), mul);
-      auto v3 = Clamp(zero, Mul(LoadU(d, &input[3][x0 + i]), mul), mul);
-      StoreInterleaved4(DemoteTo(du, NearestInt(v0)),
-                        DemoteTo(du, NearestInt(v1)),
-                        DemoteTo(du, NearestInt(v2)),
-                        DemoteTo(du, NearestInt(v3)), du, &output[4 * i]);
-    }
-  }
-#if JXL_MEMORY_SANITIZER
-  __msan_poison(output + num_channels * len,
-                sizeof(output[0]) * num_channels * padding);
-#endif
-}
-
-void StoreFloatRow(float* JXL_RESTRICT input[3], size_t x0, size_t len,
-                   size_t num_channels, float* output) {
-  const HWY_CAPPED(float, 8) d;
-  if (num_channels == 1) {
-    memcpy(output, input[0] + x0, len * sizeof(output[0]));
-  } else if (num_channels == 2) {
-    for (size_t i = 0; i < len; i += Lanes(d)) {
-      StoreInterleaved2(LoadU(d, &input[0][x0 + i]),
-                        LoadU(d, &input[1][x0 + i]), d, &output[2 * i]);
-    }
-  } else if (num_channels == 3) {
-    for (size_t i = 0; i < len; i += Lanes(d)) {
-      StoreInterleaved3(LoadU(d, &input[0][x0 + i]),
-                        LoadU(d, &input[1][x0 + i]),
-                        LoadU(d, &input[2][x0 + i]), d, &output[3 * i]);
-    }
-  } else if (num_channels == 4) {
-    for (size_t i = 0; i < len; i += Lanes(d)) {
-      StoreInterleaved4(LoadU(d, &input[0][x0 + i]),
-                        LoadU(d, &input[1][x0 + i]),
-                        LoadU(d, &input[2][x0 + i]),
-                        LoadU(d, &input[3][x0 + i]), d, &output[4 * i]);
-    }
-  }
-}
-
-static constexpr float kFSWeightMR = 7.0f / 16.0f;
-static constexpr float kFSWeightBL = 3.0f / 16.0f;
-static constexpr float kFSWeightBM = 5.0f / 16.0f;
-static constexpr float kFSWeightBR = 1.0f / 16.0f;
-
-float LimitError(float error) {
-  float abserror = std::abs(error);
-  if (abserror > 48.0f) {
-    abserror = 32.0f;
-  } else if (abserror > 16.0f) {
-    abserror = 0.5f * abserror + 8.0f;
-  }
-  return error > 0.0f ? abserror : -abserror;
-}
-
-void WriteToOutput(j_decompress_ptr cinfo, float* JXL_RESTRICT rows[],
-                   size_t xoffset, size_t len, size_t num_channels,
-                   uint8_t* JXL_RESTRICT output) {
-  jpeg_decomp_master* m = cinfo->master;
-  uint8_t* JXL_RESTRICT scratch_space = m->output_scratch_;
-  if (cinfo->quantize_colors && m->quant_pass_ == 1) {
-    float* error_row[kMaxComponents];
-    float* next_error_row[kMaxComponents];
-    J_DITHER_MODE dither_mode = cinfo->dither_mode;
-    if (dither_mode == JDITHER_ORDERED) {
-      for (size_t c = 0; c < num_channels; ++c) {
-        DitherRow(cinfo, &rows[c][xoffset], c, cinfo->output_scanline,
-                  cinfo->output_width);
-      }
-    } else if (dither_mode == JDITHER_FS) {
-      for (size_t c = 0; c < num_channels; ++c) {
-        if (cinfo->output_scanline % 2 == 0) {
-          error_row[c] = m->error_row_[c];
-          next_error_row[c] = m->error_row_[c + kMaxComponents];
-        } else {
-          error_row[c] = m->error_row_[c + kMaxComponents];
-          next_error_row[c] = m->error_row_[c];
-        }
-        memset(next_error_row[c], 0.0, cinfo->output_width * sizeof(float));
-      }
-    }
-    const float mul = 255.0f;
-    if (dither_mode != JDITHER_FS) {
-      StoreUnsignedRow(rows, xoffset, len, num_channels, mul, scratch_space);
-    }
-    for (size_t i = 0; i < len; ++i) {
-      uint8_t* pixel = &scratch_space[num_channels * i];
-      if (dither_mode == JDITHER_FS) {
-        for (size_t c = 0; c < num_channels; ++c) {
-          float val = rows[c][i] * mul + LimitError(error_row[c][i]);
-          pixel[c] = std::round(std::min(255.0f, std::max(0.0f, val)));
-        }
-      }
-      int index = LookupColorIndex(cinfo, pixel);
-      output[i] = index;
-      if (dither_mode == JDITHER_FS) {
-        size_t prev_i = i > 0 ? i - 1 : 0;
-        size_t next_i = i + 1 < len ? i + 1 : len - 1;
-        for (size_t c = 0; c < num_channels; ++c) {
-          float error = pixel[c] - cinfo->colormap[c][index];
-          error_row[c][next_i] += kFSWeightMR * error;
-          next_error_row[c][prev_i] += kFSWeightBL * error;
-          next_error_row[c][i] += kFSWeightBM * error;
-          next_error_row[c][next_i] += kFSWeightBR * error;
-        }
-      }
-    }
-  } else if (m->output_data_type_ == JPEGLI_TYPE_UINT8) {
-    const float mul = 255.0;
-    StoreUnsignedRow(rows, xoffset, len, num_channels, mul, scratch_space);
-    memcpy(output, scratch_space, len * num_channels);
-  } else if (m->output_data_type_ == JPEGLI_TYPE_UINT16) {
-    const float mul = 65535.0;
-    uint16_t* tmp = reinterpret_cast<uint16_t*>(scratch_space);
-    StoreUnsignedRow(rows, xoffset, len, num_channels, mul, tmp);
-    if (m->swap_endianness_) {
-      const HWY_CAPPED(uint16_t, 8) du;
-      size_t output_len = len * num_channels;
-      for (size_t j = 0; j < output_len; j += Lanes(du)) {
-        auto v = LoadU(du, tmp + j);
-        auto vswap = Or(ShiftRightSame(v, 8), ShiftLeftSame(v, 8));
-        StoreU(vswap, du, tmp + j);
-      }
-    }
-    memcpy(output, tmp, len * num_channels * 2);
-  } else if (m->output_data_type_ == JPEGLI_TYPE_FLOAT) {
-    float* tmp = reinterpret_cast<float*>(scratch_space);
-    StoreFloatRow(rows, xoffset, len, num_channels, tmp);
-    if (m->swap_endianness_) {
-      size_t output_len = len * num_channels;
-      for (size_t j = 0; j < output_len; ++j) {
-        tmp[j] = BSwapFloat(tmp[j]);
-      }
-    }
-    memcpy(output, tmp, len * num_channels * 4);
-  }
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jpegli
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-
-namespace jpegli {
-
-HWY_EXPORT(GatherBlockStats);
-HWY_EXPORT(WriteToOutput);
-HWY_EXPORT(DecenterRow);
-
-void GatherBlockStats(const int16_t* JXL_RESTRICT coeffs,
-                      const size_t coeffs_size, int32_t* JXL_RESTRICT nonzeros,
-                      int32_t* JXL_RESTRICT sumabs) {
-  HWY_DYNAMIC_DISPATCH(GatherBlockStats)(coeffs, coeffs_size, nonzeros, sumabs);
-}
-
-void WriteToOutput(j_decompress_ptr cinfo, float* JXL_RESTRICT rows[],
-                   size_t xoffset, size_t len, size_t num_channels,
-                   uint8_t* JXL_RESTRICT output) {
-  HWY_DYNAMIC_DISPATCH(WriteToOutput)
-  (cinfo, rows, xoffset, len, num_channels, output);
-}
-
-void DecenterRow(float* row, size_t xsize) {
-  HWY_DYNAMIC_DISPATCH(DecenterRow)(row, xsize);
-}
-
-bool ShouldApplyDequantBiases(j_decompress_ptr cinfo, int ci) {
-  const auto& compinfo = cinfo->comp_info[ci];
-  return (compinfo.h_samp_factor == cinfo->max_h_samp_factor &&
-          compinfo.v_samp_factor == cinfo->max_v_samp_factor);
-}
-
-// See the following article for the details:
-// J. R. Price and M. Rabbani, "Dequantization bias for JPEG decompression"
-// Proceedings International Conference on Information Technology: Coding and
-// Computing (Cat. No.PR00540), 2000, pp. 30-35, doi: 10.1109/ITCC.2000.844179.
-void ComputeOptimalLaplacianBiases(const int num_blocks, const int* nonzeros,
-                                   const int* sumabs, float* biases) {
-  for (size_t k = 1; k < DCTSIZE2; ++k) {
-    if (nonzeros[k] == 0) {
-      biases[k] = 0.5f;
-      continue;
-    }
-    // Notation adapted from the article
-    float N = num_blocks;
-    float N1 = nonzeros[k];
-    float N0 = num_blocks - N1;
-    float S = sumabs[k];
-    // Compute gamma from N0, N1, N, S (eq. 11), with A and B being just
-    // temporary grouping of terms.
-    float A = 4.0 * S + 2.0 * N;
-    float B = 4.0 * S - 2.0 * N1;
-    float gamma = (-1.0 * N0 + std::sqrt(N0 * N0 * 1.0 + A * B)) / A;
-    float gamma2 = gamma * gamma;
-    // The bias is computed from gamma with (eq. 5), where the quantization
-    // multiplier Q can be factored out and thus the bias can be applied
-    // directly on the quantized coefficient.
-    biases[k] =
-        0.5 * (((1.0 + gamma2) / (1.0 - gamma2)) + 1.0 / std::log(gamma));
-  }
-}
-
-constexpr std::array<int, SAVED_COEFS> Q_POS = {0, 1, 8,  16, 9,
-                                                2, 3, 10, 17, 24};
-
-bool is_nonzero_quantizers(const JQUANT_TBL* qtable) {
-  return std::all_of(Q_POS.begin(), Q_POS.end(),
-                     [&](int pos) { return qtable->quantval[pos] != 0; });
-}
-
-// Determine whether smoothing should be applied during decompression
-bool do_smoothing(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  bool smoothing_useful = false;
-
-  if (!cinfo->progressive_mode || cinfo->coef_bits == nullptr) {
-    return false;
-  }
-  auto* coef_bits_latch = m->coef_bits_latch;
-  auto* prev_coef_bits_latch = m->prev_coef_bits_latch;
-
-  for (int ci = 0; ci < cinfo->num_components; ci++) {
-    jpeg_component_info* compptr = &cinfo->comp_info[ci];
-    JQUANT_TBL* qtable = compptr->quant_table;
-    int* coef_bits = cinfo->coef_bits[ci];
-    int* prev_coef_bits = cinfo->coef_bits[ci + cinfo->num_components];
-
-    // Return early if conditions for smoothing are not met
-    if (qtable == nullptr || !is_nonzero_quantizers(qtable) ||
-        coef_bits[0] < 0) {
-      return false;
-    }
-
-    coef_bits_latch[ci][0] = coef_bits[0];
-
-    for (int coefi = 1; coefi < SAVED_COEFS; coefi++) {
-      prev_coef_bits_latch[ci][coefi] =
-          cinfo->input_scan_number > 1 ? prev_coef_bits[coefi] : -1;
-      if (coef_bits[coefi] != 0) {
-        smoothing_useful = true;
-      }
-      coef_bits_latch[ci][coefi] = coef_bits[coefi];
-    }
-  }
-
-  return smoothing_useful;
-}
-
-void PredictSmooth(j_decompress_ptr cinfo, JBLOCKARRAY blocks, int component,
-                   size_t bx, int iy) {
-  const size_t imcu_row = cinfo->output_iMCU_row;
-  int16_t* scratch = cinfo->master->smoothing_scratch_;
-  std::vector<int> Q_VAL(SAVED_COEFS);
-  int* coef_bits;
-
-  std::array<std::array<int, 5>, 5> dc_values;
-  auto& compinfo = cinfo->comp_info[component];
-  const size_t by0 = imcu_row * compinfo.v_samp_factor;
-  const size_t by = by0 + iy;
-
-  int prev_iy = by > 0 ? iy - 1 : 0;
-  int prev_prev_iy = by > 1 ? iy - 2 : prev_iy;
-  int next_iy = by + 1 < compinfo.height_in_blocks ? iy + 1 : iy;
-  int next_next_iy = by + 2 < compinfo.height_in_blocks ? iy + 2 : next_iy;
-
-  const int16_t* cur_row = blocks[iy][bx];
-  const int16_t* prev_row = blocks[prev_iy][bx];
-  const int16_t* prev_prev_row = blocks[prev_prev_iy][bx];
-  const int16_t* next_row = blocks[next_iy][bx];
-  const int16_t* next_next_row = blocks[next_next_iy][bx];
-
-  int prev_block_ind = bx ? -DCTSIZE2 : 0;
-  int prev_prev_block_ind = bx > 1 ? -2 * DCTSIZE2 : prev_block_ind;
-  int next_block_ind = bx + 1 < compinfo.width_in_blocks ? DCTSIZE2 : 0;
-  int next_next_block_ind =
-      bx + 2 < compinfo.width_in_blocks ? DCTSIZE2 * 2 : next_block_ind;
-
-  std::array<const int16_t*, 5> row_ptrs = {prev_prev_row, prev_row, cur_row,
-                                            next_row, next_next_row};
-  std::array<int, 5> block_inds = {prev_prev_block_ind, prev_block_ind, 0,
-                                   next_block_ind, next_next_block_ind};
-
-  memcpy(scratch, cur_row, DCTSIZE2 * sizeof(cur_row[0]));
-
-  for (int r = 0; r < 5; ++r) {
-    for (int c = 0; c < 5; ++c) {
-      dc_values[r][c] = row_ptrs[r][block_inds[c]];
-    }
-  }
-  // Get the correct coef_bits: In case of an incomplete scan, we use the
-  // prev coefficients.
-  if (cinfo->output_iMCU_row + 1 > cinfo->input_iMCU_row) {
-    coef_bits = cinfo->master->prev_coef_bits_latch[component];
-  } else {
-    coef_bits = cinfo->master->coef_bits_latch[component];
-  }
-
-  bool change_dc = true;
-  for (int i = 1; i < SAVED_COEFS; i++) {
-    if (coef_bits[i] != -1) {
-      change_dc = false;
-      break;
-    }
-  }
-
-  JQUANT_TBL* quanttbl = cinfo->quant_tbl_ptrs[compinfo.quant_tbl_no];
-  for (size_t i = 0; i < 6; ++i) {
-    Q_VAL[i] = quanttbl->quantval[Q_POS[i]];
-  }
-  if (change_dc) {
-    for (size_t i = 6; i < SAVED_COEFS; ++i) {
-      Q_VAL[i] = quanttbl->quantval[Q_POS[i]];
-    }
-  }
-  auto calculate_dct_value = [&](int coef_index) {
-    int64_t num = 0;
-    int pred;
-    int Al;
-    // we use the symmetry of the smoothing matrices by transposing the 5x5 dc
-    // matrix in that case.
-    bool swap_indices = coef_index == 2 || coef_index == 5 || coef_index == 8 ||
-                        coef_index == 9;
-    auto dc = [&](int i, int j) {
-      return swap_indices ? dc_values[j][i] : dc_values[i][j];
-    };
-    JPEGLI_CHECK(coef_index >= 0 && coef_index < 10);
-    Al = coef_bits[coef_index];
-    switch (coef_index) {
-      case 0:
-        // set the DC
-        num = (-2 * dc(0, 0) - 6 * dc(0, 1) - 8 * dc(0, 2) - 6 * dc(0, 3) -
-               2 * dc(0, 4) - 6 * dc(1, 0) + 6 * dc(1, 1) + 42 * dc(1, 2) +
-               6 * dc(1, 3) - 6 * dc(1, 4) - 8 * dc(2, 0) + 42 * dc(2, 1) +
-               152 * dc(2, 2) + 42 * dc(2, 3) - 8 * dc(2, 4) - 6 * dc(3, 0) +
-               6 * dc(3, 1) + 42 * dc(3, 2) + 6 * dc(3, 3) - 6 * dc(3, 4) -
-               2 * dc(4, 0) - 6 * dc(4, 1) - 8 * dc(4, 2) - 6 * dc(4, 3) -
-               2 * dc(4, 4));
-        // special case: for the DC the dequantization is different
-        Al = 0;
-        break;
-      case 1:
-      case 2:
-        // set Q01 or Q10
-        num = (change_dc ? (-dc(0, 0) - dc(0, 1) + dc(0, 3) + dc(0, 4) -
-                            3 * dc(1, 0) + 13 * dc(1, 1) - 13 * dc(1, 3) +
-                            3 * dc(1, 4) - 3 * dc(2, 0) + 38 * dc(2, 1) -
-                            38 * dc(2, 3) + 3 * dc(2, 4) - 3 * dc(3, 0) +
-                            13 * dc(3, 1) - 13 * dc(3, 3) + 3 * dc(3, 4) -
-                            dc(4, 0) - dc(4, 1) + dc(4, 3) + dc(4, 4))
-                         : (-7 * dc(2, 0) + 50 * dc(2, 1) - 50 * dc(2, 3) +
-                            7 * dc(2, 4)));
-        break;
-      case 3:
-      case 5:
-        // set Q02 or Q20
-        num = (change_dc
-                   ? dc(0, 2) + 2 * dc(1, 1) + 7 * dc(1, 2) + 2 * dc(1, 3) -
-                         5 * dc(2, 1) - 14 * dc(2, 2) - 5 * dc(2, 3) +
-                         2 * dc(3, 1) + 7 * dc(3, 2) + 2 * dc(3, 3) + dc(4, 2)
-                   : (-dc(0, 2) + 13 * dc(1, 2) - 24 * dc(2, 2) +
-                      13 * dc(3, 2) - dc(4, 2)));
-        break;
-      case 4:
-        // set Q11
-        num =
-            (change_dc ? -dc(0, 0) + dc(0, 4) + 9 * dc(1, 1) - 9 * dc(1, 3) -
-                             9 * dc(3, 1) + 9 * dc(3, 3) + dc(4, 0) - dc(4, 4)
-                       : (dc(1, 4) + dc(3, 0) - 10 * dc(3, 1) + 10 * dc(3, 3) -
-                          dc(0, 1) - dc(3, 4) + dc(4, 1) - dc(4, 3) + dc(0, 3) -
-                          dc(1, 0) + 10 * dc(1, 1) - 10 * dc(1, 3)));
-        break;
-      case 6:
-      case 9:
-        // set Q03 or Q30
-        num = (dc(1, 1) - dc(1, 3) + 2 * dc(2, 1) - 2 * dc(2, 3) + dc(3, 1) -
-               dc(3, 3));
-        break;
-      case 7:
-      case 8:
-      default:
-        // set Q12 and Q21
-        num = (dc(1, 1) - 3 * dc(1, 2) + dc(1, 3) - dc(3, 1) + 3 * dc(3, 2) -
-               dc(3, 3));
-        break;
-    }
-    num = Q_VAL[0] * num;
-    if (num >= 0) {
-      pred = ((Q_VAL[coef_index] << 7) + num) / (Q_VAL[coef_index] << 8);
-      if (Al > 0 && pred >= (1 << Al)) pred = (1 << Al) - 1;
-    } else {
-      pred = ((Q_VAL[coef_index] << 7) - num) / (Q_VAL[coef_index] << 8);
-      if (Al > 0 && pred >= (1 << Al)) pred = (1 << Al) - 1;
-      pred = -pred;
-    }
-    return static_cast<int16_t>(pred);
-  };
-
-  int loop_end = change_dc ? SAVED_COEFS : 6;
-  for (int i = 1; i < loop_end; ++i) {
-    if (coef_bits[i] != 0 && scratch[Q_POS[i]] == 0) {
-      scratch[Q_POS[i]] = calculate_dct_value(i);
-    }
-  }
-  if (change_dc) {
-    scratch[0] = calculate_dct_value(0);
-  }
-}
-
-void PrepareForOutput(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  bool smoothing = do_smoothing(cinfo);
-  m->apply_smoothing = smoothing && FROM_JXL_BOOL(cinfo->do_block_smoothing);
-  size_t coeffs_per_block = cinfo->num_components * DCTSIZE2;
-  memset(m->nonzeros_, 0, coeffs_per_block * sizeof(m->nonzeros_[0]));
-  memset(m->sumabs_, 0, coeffs_per_block * sizeof(m->sumabs_[0]));
-  memset(m->num_processed_blocks_, 0, sizeof(m->num_processed_blocks_));
-  memset(m->biases_, 0, coeffs_per_block * sizeof(m->biases_[0]));
-  cinfo->output_iMCU_row = 0;
-  cinfo->output_scanline = 0;
-  const float kDequantScale = 1.0f / (8 * 255);
-  for (int c = 0; c < cinfo->num_components; c++) {
-    const auto& comp = cinfo->comp_info[c];
-    JQUANT_TBL* table = comp.quant_table;
-    if (table == nullptr) continue;
-    for (size_t k = 0; k < DCTSIZE2; ++k) {
-      m->dequant_[c * DCTSIZE2 + k] = table->quantval[k] * kDequantScale;
-    }
-  }
-  JPEGLI_CHECK(ChooseInverseTransform(cinfo));
-  ChooseColorTransform(cinfo);
-}
-
-void DecodeCurrentiMCURow(j_decompress_ptr cinfo) {
-  jpeg_decomp_master* m = cinfo->master;
-  const size_t imcu_row = cinfo->output_iMCU_row;
-  JBLOCKARRAY blocks[kMaxComponents];
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    const jpeg_component_info* comp = &cinfo->comp_info[c];
-    int by0 = imcu_row * comp->v_samp_factor;
-    int block_rows_left = comp->height_in_blocks - by0;
-    int max_block_rows = std::min(comp->v_samp_factor, block_rows_left);
-    int offset = m->streaming_mode_ ? 0 : by0;
-    blocks[c] = (*cinfo->mem->access_virt_barray)(
-        reinterpret_cast<j_common_ptr>(cinfo), m->coef_arrays[c], offset,
-        max_block_rows, FALSE);
-  }
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    size_t k0 = c * DCTSIZE2;
-    auto& compinfo = cinfo->comp_info[c];
-    size_t block_row = imcu_row * compinfo.v_samp_factor;
-    if (ShouldApplyDequantBiases(cinfo, c)) {
-      // Update statistics for this iMCU row.
-      for (int iy = 0; iy < compinfo.v_samp_factor; ++iy) {
-        size_t by = block_row + iy;
-        if (by >= compinfo.height_in_blocks) {
-          continue;
-        }
-        int16_t* JXL_RESTRICT coeffs = &blocks[c][iy][0][0];
-        size_t num = compinfo.width_in_blocks * DCTSIZE2;
-        GatherBlockStats(coeffs, num, &m->nonzeros_[k0], &m->sumabs_[k0]);
-        m->num_processed_blocks_[c] += compinfo.width_in_blocks;
-      }
-      if (imcu_row % 4 == 3) {
-        // Re-compute optimal biases every few iMCU-rows.
-        ComputeOptimalLaplacianBiases(m->num_processed_blocks_[c],
-                                      &m->nonzeros_[k0], &m->sumabs_[k0],
-                                      &m->biases_[k0]);
-      }
-    }
-    RowBuffer<float>* raw_out = &m->raw_output_[c];
-    for (int iy = 0; iy < compinfo.v_samp_factor; ++iy) {
-      size_t by = block_row + iy;
-      if (by >= compinfo.height_in_blocks) {
-        continue;
-      }
-      size_t dctsize = m->scaled_dct_size[c];
-      int16_t* JXL_RESTRICT row_in = &blocks[c][iy][0][0];
-      float* JXL_RESTRICT row_out = raw_out->Row(by * dctsize);
-      for (size_t bx = 0; bx < compinfo.width_in_blocks; ++bx) {
-        if (m->apply_smoothing) {
-          PredictSmooth(cinfo, blocks[c], c, bx, iy);
-          (*m->inverse_transform[c])(m->smoothing_scratch_, &m->dequant_[k0],
-                                     &m->biases_[k0], m->idct_scratch_,
-                                     &row_out[bx * dctsize], raw_out->stride(),
-                                     dctsize);
-        } else {
-          (*m->inverse_transform[c])(&row_in[bx * DCTSIZE2], &m->dequant_[k0],
-                                     &m->biases_[k0], m->idct_scratch_,
-                                     &row_out[bx * dctsize], raw_out->stride(),
-                                     dctsize);
-        }
-      }
-      if (m->streaming_mode_) {
-        memset(row_in, 0, compinfo.width_in_blocks * sizeof(JBLOCK));
-      }
-    }
-  }
-}
-
-void ProcessRawOutput(j_decompress_ptr cinfo, JSAMPIMAGE data) {
-  jpegli::DecodeCurrentiMCURow(cinfo);
-  jpeg_decomp_master* m = cinfo->master;
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    const auto& compinfo = cinfo->comp_info[c];
-    size_t comp_width = compinfo.width_in_blocks * DCTSIZE;
-    size_t comp_height = compinfo.height_in_blocks * DCTSIZE;
-    size_t comp_nrows = compinfo.v_samp_factor * DCTSIZE;
-    size_t y0 = cinfo->output_iMCU_row * compinfo.v_samp_factor * DCTSIZE;
-    size_t y1 = std::min(y0 + comp_nrows, comp_height);
-    for (size_t y = y0; y < y1; ++y) {
-      float* rows[1] = {m->raw_output_[c].Row(y)};
-      uint8_t* output = data[c][y - y0];
-      DecenterRow(rows[0], comp_width);
-      WriteToOutput(cinfo, rows, 0, comp_width, 1, output);
-    }
-  }
-  ++cinfo->output_iMCU_row;
-  cinfo->output_scanline += cinfo->max_v_samp_factor * DCTSIZE;
-  if (cinfo->output_scanline >= cinfo->output_height) {
-    ++m->output_passes_done_;
-  }
-}
-
-void ProcessOutput(j_decompress_ptr cinfo, size_t* num_output_rows,
-                   JSAMPARRAY scanlines, size_t max_output_rows) {
-  jpeg_decomp_master* m = cinfo->master;
-  const int vfactor = cinfo->max_v_samp_factor;
-  const int hfactor = cinfo->max_h_samp_factor;
-  const size_t context = m->need_context_rows_ ? 1 : 0;
-  const size_t imcu_row = cinfo->output_iMCU_row;
-  const size_t imcu_height = vfactor * m->min_scaled_dct_size;
-  const size_t imcu_width = hfactor * m->min_scaled_dct_size;
-  const size_t output_width = m->iMCU_cols_ * imcu_width;
-  if (imcu_row == cinfo->total_iMCU_rows ||
-      (imcu_row > context &&
-       cinfo->output_scanline < (imcu_row - context) * imcu_height)) {
-    // We are ready to output some scanlines.
-    size_t ybegin = cinfo->output_scanline;
-    size_t yend = (imcu_row == cinfo->total_iMCU_rows
-                       ? cinfo->output_height
-                       : (imcu_row - context) * imcu_height);
-    yend = std::min<size_t>(yend, ybegin + max_output_rows - *num_output_rows);
-    size_t yb = (ybegin / vfactor) * vfactor;
-    size_t ye = DivCeil(yend, vfactor) * vfactor;
-    for (size_t y = yb; y < ye; y += vfactor) {
-      for (int c = 0; c < cinfo->num_components; ++c) {
-        RowBuffer<float>* raw_out = &m->raw_output_[c];
-        RowBuffer<float>* render_out = &m->render_output_[c];
-        int line_groups = vfactor / m->v_factor[c];
-        int downsampled_width = output_width / m->h_factor[c];
-        size_t yc = y / m->v_factor[c];
-        for (int dy = 0; dy < line_groups; ++dy) {
-          size_t ymid = yc + dy;
-          const float* JXL_RESTRICT row_mid = raw_out->Row(ymid);
-          if (cinfo->do_fancy_upsampling && m->v_factor[c] == 2) {
-            const float* JXL_RESTRICT row_top =
-                ymid == 0 ? row_mid : raw_out->Row(ymid - 1);
-            const float* JXL_RESTRICT row_bot = ymid + 1 == m->raw_height_[c]
-                                                    ? row_mid
-                                                    : raw_out->Row(ymid + 1);
-            Upsample2Vertical(row_top, row_mid, row_bot,
-                              render_out->Row(2 * dy),
-                              render_out->Row(2 * dy + 1), downsampled_width);
-          } else {
-            for (int yix = 0; yix < m->v_factor[c]; ++yix) {
-              memcpy(render_out->Row(m->v_factor[c] * dy + yix), row_mid,
-                     downsampled_width * sizeof(float));
-            }
-          }
-          if (m->h_factor[c] > 1) {
-            for (int yix = 0; yix < m->v_factor[c]; ++yix) {
-              int row_ix = m->v_factor[c] * dy + yix;
-              float* JXL_RESTRICT row = render_out->Row(row_ix);
-              float* JXL_RESTRICT tmp = m->upsample_scratch_;
-              if (cinfo->do_fancy_upsampling && m->h_factor[c] == 2) {
-                Upsample2Horizontal(row, tmp, output_width);
-              } else {
-                // TODO(szabadka) SIMDify this.
-                for (size_t x = 0; x < output_width; ++x) {
-                  tmp[x] = row[x / m->h_factor[c]];
-                }
-                memcpy(row, tmp, output_width * sizeof(tmp[0]));
-              }
-            }
-          }
-        }
-      }
-      for (int yix = 0; yix < vfactor; ++yix) {
-        if (y + yix < ybegin || y + yix >= yend) continue;
-        float* rows[kMaxComponents];
-        int num_all_components =
-            std::max(cinfo->out_color_components, cinfo->num_components);
-        for (int c = 0; c < num_all_components; ++c) {
-          rows[c] = m->render_output_[c].Row(yix);
-        }
-        (*m->color_transform)(rows, output_width);
-        for (int c = 0; c < cinfo->out_color_components; ++c) {
-          // Undo the centering of the sample values around zero.
-          DecenterRow(rows[c], output_width);
-        }
-        if (scanlines) {
-          uint8_t* output = scanlines[*num_output_rows];
-          WriteToOutput(cinfo, rows, m->xoffset_, cinfo->output_width,
-                        cinfo->out_color_components, output);
-        }
-        JPEGLI_CHECK(cinfo->output_scanline == y + yix);
-        ++cinfo->output_scanline;
-        ++(*num_output_rows);
-        if (cinfo->output_scanline == cinfo->output_height) {
-          ++m->output_passes_done_;
-        }
-      }
-    }
-  } else {
-    DecodeCurrentiMCURow(cinfo);
-    ++cinfo->output_iMCU_row;
-  }
-}
-
-}  // namespace jpegli
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jpegli/render.h b/third_party/jpeg-xl/lib/jpegli/render.h
deleted file mode 100644
index ad69335d70bb3..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/render.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_RENDER_H_
-#define LIB_JPEGLI_RENDER_H_
-
-#include <stdint.h>
-
-#include "lib/jpegli/common.h"
-
-namespace jpegli {
-
-void PrepareForOutput(j_decompress_ptr cinfo);
-
-void ProcessOutput(j_decompress_ptr cinfo, size_t* num_output_rows,
-                   JSAMPARRAY scanlines, size_t max_output_rows);
-
-void ProcessRawOutput(j_decompress_ptr cinfo, JSAMPIMAGE data);
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_RENDER_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/simd.cc b/third_party/jpeg-xl/lib/jpegli/simd.cc
deleted file mode 100644
index 5e849393426ac..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/simd.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/simd.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jpegli/simd.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-HWY_BEFORE_NAMESPACE();
-namespace jpegli {
-namespace HWY_NAMESPACE {
-
-size_t GetVectorSize() { return HWY_LANES(uint8_t); }
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jpegli
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jpegli {
-namespace {
-
-HWY_EXPORT(GetVectorSize);  // Local function.
-
-}  // namespace
-
-size_t VectorSize() {
-  static size_t bytes = HWY_DYNAMIC_DISPATCH(GetVectorSize)();
-  return bytes;
-}
-
-}  // namespace jpegli
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jpegli/simd.h b/third_party/jpeg-xl/lib/jpegli/simd.h
deleted file mode 100644
index aec772e2d4a47..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/simd.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_SIMD_H_
-#define LIB_JPEGLI_SIMD_H_
-
-#include <stddef.h>
-
-namespace jpegli {
-
-// Returns SIMD vector size in bytes.
-size_t VectorSize();
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_SIMD_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/source_manager.cc b/third_party/jpeg-xl/lib/jpegli/source_manager.cc
deleted file mode 100644
index e0f0b4c275a12..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/source_manager.cc
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/decode.h"
-#include "lib/jpegli/error.h"
-#include "lib/jpegli/memory_manager.h"
-
-namespace jpegli {
-
-void init_mem_source(j_decompress_ptr cinfo) {}
-void init_stdio_source(j_decompress_ptr cinfo) {}
-
-void skip_input_data(j_decompress_ptr cinfo, long num_bytes /* NOLINT */) {
-  if (num_bytes <= 0) return;
-  while (num_bytes >
-         static_cast<long>(cinfo->src->bytes_in_buffer)) {  // NOLINT
-    num_bytes -= cinfo->src->bytes_in_buffer;
-    (*cinfo->src->fill_input_buffer)(cinfo);
-  }
-  cinfo->src->next_input_byte += num_bytes;
-  cinfo->src->bytes_in_buffer -= num_bytes;
-}
-
-void term_source(j_decompress_ptr cinfo) {}
-
-boolean EmitFakeEoiMarker(j_decompress_ptr cinfo) {
-  static constexpr uint8_t kFakeEoiMarker[2] = {0xff, 0xd9};
-  cinfo->src->next_input_byte = kFakeEoiMarker;
-  cinfo->src->bytes_in_buffer = 2;
-  return TRUE;
-}
-
-constexpr size_t kStdioBufferSize = 64 << 10;
-
-struct StdioSourceManager {
-  jpeg_source_mgr pub;
-  FILE* f;
-  uint8_t* buffer;
-
-  static boolean fill_input_buffer(j_decompress_ptr cinfo) {
-    auto* src = reinterpret_cast<StdioSourceManager*>(cinfo->src);
-    size_t num_bytes_read = fread(src->buffer, 1, kStdioBufferSize, src->f);
-    if (num_bytes_read == 0) {
-      return EmitFakeEoiMarker(cinfo);
-    }
-    src->pub.next_input_byte = src->buffer;
-    src->pub.bytes_in_buffer = num_bytes_read;
-    return TRUE;
-  }
-};
-
-}  // namespace jpegli
-
-void jpegli_mem_src(j_decompress_ptr cinfo, const unsigned char* inbuffer,
-                    unsigned long insize /* NOLINT */) {
-  if (cinfo->src && cinfo->src->init_source != jpegli::init_mem_source) {
-    JPEGLI_ERROR("jpegli_mem_src: a different source manager was already set");
-  }
-  if (!cinfo->src) {
-    cinfo->src = jpegli::Allocate<jpeg_source_mgr>(cinfo, 1);
-  }
-  cinfo->src->next_input_byte = inbuffer;
-  cinfo->src->bytes_in_buffer = insize;
-  cinfo->src->init_source = jpegli::init_mem_source;
-  cinfo->src->fill_input_buffer = jpegli::EmitFakeEoiMarker;
-  cinfo->src->skip_input_data = jpegli::skip_input_data;
-  cinfo->src->resync_to_restart = jpegli_resync_to_restart;
-  cinfo->src->term_source = jpegli::term_source;
-}
-
-void jpegli_stdio_src(j_decompress_ptr cinfo, FILE* infile) {
-  if (cinfo->src && cinfo->src->init_source != jpegli::init_stdio_source) {
-    JPEGLI_ERROR("jpeg_stdio_src: a different source manager was already set");
-  }
-  if (!cinfo->src) {
-    cinfo->src = reinterpret_cast<jpeg_source_mgr*>(
-        jpegli::Allocate<jpegli::StdioSourceManager>(cinfo, 1));
-  }
-  auto* src = reinterpret_cast<jpegli::StdioSourceManager*>(cinfo->src);
-  src->f = infile;
-  src->buffer = jpegli::Allocate<uint8_t>(cinfo, jpegli::kStdioBufferSize);
-  src->pub.next_input_byte = src->buffer;
-  src->pub.bytes_in_buffer = 0;
-  src->pub.init_source = jpegli::init_stdio_source;
-  src->pub.fill_input_buffer = jpegli::StdioSourceManager::fill_input_buffer;
-  src->pub.skip_input_data = jpegli::skip_input_data;
-  src->pub.resync_to_restart = jpegli_resync_to_restart;
-  src->pub.term_source = jpegli::term_source;
-}
diff --git a/third_party/jpeg-xl/lib/jpegli/source_manager_test.cc b/third_party/jpeg-xl/lib/jpegli/source_manager_test.cc
deleted file mode 100644
index b70b43d8dbef3..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/source_manager_test.cc
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#include <ostream>
-#include <sstream>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "lib/jpegli/decode.h"
-#include "lib/jpegli/libjpeg_test_util.h"
-#include "lib/jpegli/test_params.h"
-#include "lib/jpegli/test_utils.h"
-#include "lib/jpegli/testing.h"
-#include "lib/jxl/base/status.h"
-
-namespace jpegli {
-namespace {
-
-void ReadOutputImage(j_decompress_ptr cinfo, TestImage* output) {
-  jpegli_read_header(cinfo, /*require_image=*/TRUE);
-  jpegli_start_decompress(cinfo);
-  output->ysize = cinfo->output_height;
-  output->xsize = cinfo->output_width;
-  output->components = cinfo->num_components;
-  output->AllocatePixels();
-  size_t stride = cinfo->output_width * cinfo->num_components;
-  while (cinfo->output_scanline < cinfo->output_height) {
-    JSAMPROW scanline = &output->pixels[cinfo->output_scanline * stride];
-    jpegli_read_scanlines(cinfo, &scanline, 1);
-  }
-  jpegli_finish_decompress(cinfo);
-}
-
-struct TestConfig {
-  std::string fn;
-  std::string fn_desc;
-  DecompressParams dparams;
-};
-
-class SourceManagerTestParam : public ::testing::TestWithParam<TestConfig> {};
-
-namespace {
-FILE* MemOpen(const std::vector<uint8_t>& data) {
-  FILE* src = tmpfile();
-  if (!src) return nullptr;
-  fwrite(data.data(), 1, data.size(), src);
-  fseek(src, 0, SEEK_SET);
-  return src;
-}
-}  // namespace
-
-TEST_P(SourceManagerTestParam, TestStdioSourceManager) {
-  TestConfig config = GetParam();
-  JXL_ASSIGN_OR_QUIT(std::vector<uint8_t> compressed, ReadTestData(config.fn),
-                     "Failed to read test data.");
-  if (config.dparams.size_factor < 1.0) {
-    compressed.resize(compressed.size() * config.dparams.size_factor);
-  }
-  FILE* src = MemOpen(compressed);
-  ASSERT_TRUE(src);
-  TestImage output0;
-  jpeg_decompress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_decompress(&cinfo);
-    jpegli_stdio_src(&cinfo, src);
-    ReadOutputImage(&cinfo, &output0);
-    return true;
-  };
-  bool ok = try_catch_block();
-  fclose(src);
-  ASSERT_TRUE(ok);
-  jpegli_destroy_decompress(&cinfo);
-
-  TestImage output1;
-  DecodeWithLibjpeg(CompressParams(), DecompressParams(), compressed, &output1);
-  VerifyOutputImage(output1, output0, 1.0f);
-}
-
-TEST_P(SourceManagerTestParam, TestMemSourceManager) {
-  TestConfig config = GetParam();
-  JXL_ASSIGN_OR_QUIT(std::vector<uint8_t> compressed, ReadTestData(config.fn),
-                     "Failed to read test data.");
-  if (config.dparams.size_factor < 1.0f) {
-    compressed.resize(compressed.size() * config.dparams.size_factor);
-  }
-  TestImage output0;
-  jpeg_decompress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_decompress(&cinfo);
-    jpegli_mem_src(&cinfo, compressed.data(), compressed.size());
-    ReadOutputImage(&cinfo, &output0);
-    return true;
-  };
-  ASSERT_TRUE(try_catch_block());
-  jpegli_destroy_decompress(&cinfo);
-
-  TestImage output1;
-  DecodeWithLibjpeg(CompressParams(), DecompressParams(), compressed, &output1);
-  VerifyOutputImage(output1, output0, 1.0f);
-}
-
-std::vector<TestConfig> GenerateTests() {
-  std::vector<TestConfig> all_tests;
-  {
-    std::vector<std::pair<std::string, std::string>> testfiles({
-        {"jxl/flower/flower.png.im_q85_444.jpg", "Q85YUV444"},
-        {"jxl/flower/flower.png.im_q85_420.jpg", "Q85YUV420"},
-        {"jxl/flower/flower.png.im_q85_420_R13B.jpg", "Q85YUV420R13B"},
-    });
-    for (const auto& it : testfiles) {
-      for (float size_factor : {0.1f, 0.33f, 0.5f, 0.75f}) {
-        TestConfig config;
-        config.fn = it.first;
-        config.fn_desc = it.second;
-        config.dparams.size_factor = size_factor;
-        all_tests.push_back(config);
-      }
-    }
-    return all_tests;
-  }
-}
-
-std::ostream& operator<<(std::ostream& os, const TestConfig& c) {
-  os << c.fn_desc;
-  if (c.dparams.size_factor < 1.0f) {
-    os << "Partial" << static_cast<int>(c.dparams.size_factor * 100) << "p";
-  }
-  return os;
-}
-
-std::string TestDescription(
-    const testing::TestParamInfo<SourceManagerTestParam::ParamType>& info) {
-  std::stringstream name;
-  name << info.param;
-  return name.str();
-}
-
-JPEGLI_INSTANTIATE_TEST_SUITE_P(SourceManagerTest, SourceManagerTestParam,
-                                testing::ValuesIn(GenerateTests()),
-                                TestDescription);
-
-}  // namespace
-}  // namespace jpegli
diff --git a/third_party/jpeg-xl/lib/jpegli/streaming_test.cc b/third_party/jpeg-xl/lib/jpegli/streaming_test.cc
deleted file mode 100644
index ae85fd2451a18..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/streaming_test.cc
+++ /dev/null
@@ -1,245 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <ostream>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include "lib/jpegli/decode.h"
-#include "lib/jpegli/encode.h"
-#include "lib/jpegli/test_params.h"
-#include "lib/jpegli/test_utils.h"
-#include "lib/jpegli/testing.h"
-
-namespace jpegli {
-namespace {
-
-// A simple suspending source manager with an input buffer.
-struct SourceManager {
-  jpeg_source_mgr pub;
-  std::vector<uint8_t> buffer;
-
-  SourceManager() {
-    pub.next_input_byte = nullptr;
-    pub.bytes_in_buffer = 0;
-    pub.init_source = init_source;
-    pub.fill_input_buffer = fill_input_buffer;
-    pub.skip_input_data = skip_input_data;
-    pub.resync_to_restart = jpegli_resync_to_restart;
-    pub.term_source = term_source;
-  }
-
-  static void init_source(j_decompress_ptr cinfo) {}
-  static boolean fill_input_buffer(j_decompress_ptr cinfo) { return FALSE; }
-  static void skip_input_data(j_decompress_ptr cinfo,
-                              long num_bytes /* NOLINT */) {}
-  static void term_source(j_decompress_ptr cinfo) {}
-};
-
-// A destination manager that empties its output buffer into a SourceManager's
-// input buffer. The buffer size is kept short because empty_output_buffer() is
-// called only when the output buffer is full, and we want to update the decoder
-// input frequently to demonstrate that streaming works.
-constexpr size_t kOutputBufferSize = 1024;
-struct DestinationManager {
-  jpeg_destination_mgr pub;
-  std::vector<uint8_t> buffer;
-  SourceManager* dest;
-
-  explicit DestinationManager(SourceManager* src)
-      : buffer(kOutputBufferSize), dest(src) {
-    pub.next_output_byte = buffer.data();
-    pub.free_in_buffer = buffer.size();
-    pub.init_destination = init_destination;
-    pub.empty_output_buffer = empty_output_buffer;
-    pub.term_destination = term_destination;
-  }
-
-  static void init_destination(j_compress_ptr cinfo) {}
-
-  static boolean empty_output_buffer(j_compress_ptr cinfo) {
-    auto* us = reinterpret_cast<DestinationManager*>(cinfo->dest);
-    jpeg_destination_mgr* src = &us->pub;
-    jpeg_source_mgr* dst = &us->dest->pub;
-    std::vector<uint8_t>& src_buf = us->buffer;
-    std::vector<uint8_t>& dst_buf = us->dest->buffer;
-    if (dst->bytes_in_buffer > 0 && dst->bytes_in_buffer < dst_buf.size()) {
-      memmove(dst_buf.data(), dst->next_input_byte, dst->bytes_in_buffer);
-    }
-    size_t src_len = src_buf.size() - src->free_in_buffer;
-    dst_buf.resize(dst->bytes_in_buffer + src_len);
-    memcpy(&dst_buf[dst->bytes_in_buffer], src_buf.data(), src_len);
-    dst->next_input_byte = dst_buf.data();
-    dst->bytes_in_buffer = dst_buf.size();
-    src->next_output_byte = src_buf.data();
-    src->free_in_buffer = src_buf.size();
-    return TRUE;
-  }
-
-  static void term_destination(j_compress_ptr cinfo) {
-    empty_output_buffer(cinfo);
-  }
-};
-
-struct TestConfig {
-  TestImage input;
-  CompressParams jparams;
-};
-
-class StreamingTestParam : public ::testing::TestWithParam<TestConfig> {};
-
-TEST_P(StreamingTestParam, TestStreaming) {
-  jpeg_decompress_struct dinfo = {};
-  jpeg_compress_struct cinfo = {};
-  SourceManager src;
-  TestConfig config = GetParam();
-  TestImage& input = config.input;
-  TestImage output;
-  GeneratePixels(&input);
-  const auto try_catch_block = [&]() {
-    ERROR_HANDLER_SETUP(jpegli);
-    dinfo.err = cinfo.err;
-    dinfo.client_data = cinfo.client_data;
-    // Create a pair of compressor and decompressor objects, where the
-    // compressor's output is connected to the decompressor's input.
-    jpegli_create_decompress(&dinfo);
-    jpegli_create_compress(&cinfo);
-    dinfo.src = reinterpret_cast<jpeg_source_mgr*>(&src);
-    DestinationManager dest(&src);
-    cinfo.dest = reinterpret_cast<jpeg_destination_mgr*>(&dest);
-
-    cinfo.image_width = input.xsize;
-    cinfo.image_height = input.ysize;
-    cinfo.input_components = input.components;
-    cinfo.in_color_space = static_cast<J_COLOR_SPACE>(input.color_space);
-    jpegli_set_defaults(&cinfo);
-    cinfo.comp_info[0].v_samp_factor = config.jparams.v_sampling[0];
-    jpegli_set_progressive_level(&cinfo, 0);
-    cinfo.optimize_coding = FALSE;
-    jpegli_start_compress(&cinfo, TRUE);
-
-    size_t stride = cinfo.image_width * cinfo.input_components;
-    size_t iMCU_height = 8 * cinfo.max_v_samp_factor;
-    std::vector<uint8_t> row_bytes(iMCU_height * stride);
-    size_t y_in = 0;
-    size_t y_out = 0;
-    while (y_in < cinfo.image_height) {
-      // Feed one iMCU row at a time to the compressor.
-      size_t lines_in = std::min(iMCU_height, cinfo.image_height - y_in);
-      memcpy(row_bytes.data(), &input.pixels[y_in * stride], lines_in * stride);
-      std::vector<JSAMPROW> rows_in(lines_in);
-      for (size_t i = 0; i < lines_in; ++i) {
-        rows_in[i] = &row_bytes[i * stride];
-      }
-      EXPECT_EQ(lines_in,
-                jpegli_write_scanlines(&cinfo, rows_in.data(), lines_in));
-      y_in += lines_in;
-      if (y_in == cinfo.image_height) {
-        jpegli_finish_compress(&cinfo);
-      }
-
-      // Atfer the first iMCU row, we don't yet expect any output because the
-      // compressor delays processing to have context rows after the iMCU row.
-      if (y_in < std::min<size_t>(2 * iMCU_height, cinfo.image_height)) {
-        continue;
-      }
-
-      // After two iMCU rows, the compressor has started emitting compressed
-      // data. We check here that at least the scan header was output, because
-      // we expect that the compressor's output buffer was filled at least once
-      // while emitting the first compressed iMCU row.
-      if (y_in == std::min<size_t>(2 * iMCU_height, cinfo.image_height)) {
-        EXPECT_EQ(JPEG_REACHED_SOS,
-                  jpegli_read_header(&dinfo, /*require_image=*/TRUE));
-        output.xsize = dinfo.image_width;
-        output.ysize = dinfo.image_height;
-        output.components = dinfo.num_components;
-        EXPECT_EQ(output.xsize, input.xsize);
-        EXPECT_EQ(output.ysize, input.ysize);
-        EXPECT_EQ(output.components, input.components);
-        EXPECT_TRUE(jpegli_start_decompress(&dinfo));
-        output.pixels.resize(output.ysize * stride);
-        if (y_in < cinfo.image_height) {
-          continue;
-        }
-      }
-
-      // After six iMCU rows, the compressor has emitted five iMCU rows of
-      // compressed data, of which we expect four full iMCU row of compressed
-      // data to be in the decoder's input buffer, but since the decoder also
-      // needs context rows for upsampling and smoothing, we don't expect any
-      // output to be ready yet.
-      if (y_in < 7 * iMCU_height && y_in < cinfo.image_height) {
-        continue;
-      }
-
-      // After five iMCU rows, we expect the decoder to have rendered the output
-      // with four iMCU rows of delay.
-      // TODO(szabadka) Reduce the processing delay in the decoder if possible.
-      size_t lines_out =
-          (y_in == cinfo.image_height ? cinfo.image_height - y_out
-                                      : iMCU_height);
-      std::vector<JSAMPROW> rows_out(lines_out);
-      for (size_t i = 0; i < lines_out; ++i) {
-        rows_out[i] =
-            reinterpret_cast<JSAMPLE*>(&output.pixels[(y_out + i) * stride]);
-      }
-      EXPECT_EQ(lines_out,
-                jpegli_read_scanlines(&dinfo, rows_out.data(), lines_out));
-      VerifyOutputImage(input, output, y_out, lines_out, 3.8f);
-      y_out += lines_out;
-
-      if (y_out == cinfo.image_height) {
-        EXPECT_TRUE(jpegli_finish_decompress(&dinfo));
-      }
-    }
-    return true;
-  };
-  EXPECT_TRUE(try_catch_block());
-  jpegli_destroy_decompress(&dinfo);
-  jpegli_destroy_compress(&cinfo);
-}
-
-std::vector<TestConfig> GenerateTests() {
-  std::vector<TestConfig> all_tests;
-  const size_t xsize0 = 1920;
-  const size_t ysize0 = 1080;
-  for (int dysize : {0, 1, 8, 9}) {
-    for (int v_sampling : {1, 2}) {
-      TestConfig config;
-      config.input.xsize = xsize0;
-      config.input.ysize = ysize0 + dysize;
-      config.jparams.h_sampling = {1, 1, 1};
-      config.jparams.v_sampling = {v_sampling, 1, 1};
-      all_tests.push_back(config);
-    }
-  }
-  return all_tests;
-}
-
-std::ostream& operator<<(std::ostream& os, const TestConfig& c) {
-  os << c.input;
-  os << c.jparams;
-  return os;
-}
-
-std::string TestDescription(
-    const testing::TestParamInfo<StreamingTestParam::ParamType>& info) {
-  std::stringstream name;
-  name << info.param;
-  return name.str();
-}
-
-JPEGLI_INSTANTIATE_TEST_SUITE_P(StreamingTest, StreamingTestParam,
-                                testing::ValuesIn(GenerateTests()),
-                                TestDescription);
-
-}  // namespace
-}  // namespace jpegli
diff --git a/third_party/jpeg-xl/lib/jpegli/test_params.h b/third_party/jpeg-xl/lib/jpegli/test_params.h
deleted file mode 100644
index 6ab9fa573ae60..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/test_params.h
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_TEST_PARAMS_H_
-#define LIB_JPEGLI_TEST_PARAMS_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include <algorithm>
-#include <vector>
-
-#include "lib/jpegli/types.h"
-
-namespace jpegli {
-
-// We define this here as well to make sure that the *_api_test.cc tests only
-// use the public API and therefore we don't include any *_internal.h headers.
-template <typename T1, typename T2>
-constexpr inline T1 DivCeil(T1 a, T2 b) {
-  return (a + b - 1) / b;
-}
-
-#define ARRAY_SIZE(X) (sizeof(X) / sizeof((X)[0]))
-
-static constexpr int kLastScan = 0xffff;
-
-static uint32_t kTestColorMap[] = {
-    0x000000, 0xff0000, 0x00ff00, 0x0000ff, 0xffff00, 0x00ffff,
-    0xff00ff, 0xffffff, 0x6251fc, 0x45d9c7, 0xa7f059, 0xd9a945,
-    0xfa4e44, 0xceaffc, 0xbad7db, 0xc1f0b1, 0xdbca9a, 0xfacac5,
-    0xf201ff, 0x0063db, 0x00f01c, 0xdbb204, 0xf12f0c, 0x7ba1dc};
-static constexpr int kTestColorMapNumColors = ARRAY_SIZE(kTestColorMap);
-
-static constexpr int kSpecialMarker0 = 0xe5;
-static constexpr int kSpecialMarker1 = 0xe9;
-static constexpr uint8_t kMarkerData[] = {0, 1, 255, 0, 17};
-static constexpr uint8_t kMarkerSequence[] = {0xe6, 0xe8, 0xe7,
-                                              0xe6, 0xe7, 0xe8};
-static constexpr size_t kMarkerSequenceLen = ARRAY_SIZE(kMarkerSequence);
-
-enum JpegIOMode {
-  PIXELS,
-  RAW_DATA,
-  COEFFICIENTS,
-};
-
-struct CustomQuantTable {
-  int slot_idx = 0;
-  uint16_t table_type = 0;
-  int scale_factor = 100;
-  bool add_raw = false;
-  bool force_baseline = true;
-  std::vector<unsigned int> basic_table;
-  std::vector<unsigned int> quantval;
-  void Generate();
-};
-
-struct TestImage {
-  size_t xsize = 2268;
-  size_t ysize = 1512;
-  int color_space = 2;  // JCS_RGB
-  size_t components = 3;
-  JpegliDataType data_type = JPEGLI_TYPE_UINT8;
-  JpegliEndianness endianness = JPEGLI_NATIVE_ENDIAN;
-  std::vector<uint8_t> pixels;
-  std::vector<std::vector<uint8_t>> raw_data;
-  std::vector<std::vector<int16_t>> coeffs;
-  void AllocatePixels() {
-    pixels.resize(ysize * xsize * components *
-                  jpegli_bytes_per_sample(data_type));
-  }
-  void Clear() {
-    pixels.clear();
-    raw_data.clear();
-    coeffs.clear();
-  }
-};
-
-struct CompressParams {
-  int quality = 90;
-  bool set_jpeg_colorspace = false;
-  int jpeg_color_space = 0;  // JCS_UNKNOWN
-  std::vector<int> quant_indexes;
-  std::vector<CustomQuantTable> quant_tables;
-  std::vector<int> h_sampling;
-  std::vector<int> v_sampling;
-  std::vector<int> comp_ids;
-  int override_JFIF = -1;
-  int override_Adobe = -1;
-  bool add_marker = false;
-  bool simple_progression = false;
-  // -1 is library default
-  // 0, 1, 2 is set through jpegli_set_progressive_level()
-  // 2 + N is kScriptN
-  int progressive_mode = -1;
-  unsigned int restart_interval = 0;
-  int restart_in_rows = 0;
-  int smoothing_factor = 0;
-  int optimize_coding = -1;
-  bool use_flat_dc_luma_code = false;
-  bool omit_standard_tables = false;
-  bool xyb_mode = false;
-  bool libjpeg_mode = false;
-  bool use_adaptive_quantization = true;
-  std::vector<uint8_t> icc;
-
-  int h_samp(int c) const { return h_sampling.empty() ? 1 : h_sampling[c]; }
-  int v_samp(int c) const { return v_sampling.empty() ? 1 : v_sampling[c]; }
-  int max_h_sample() const {
-    auto it = std::max_element(h_sampling.begin(), h_sampling.end());
-    return it == h_sampling.end() ? 1 : *it;
-  }
-  int max_v_sample() const {
-    auto it = std::max_element(v_sampling.begin(), v_sampling.end());
-    return it == v_sampling.end() ? 1 : *it;
-  }
-  int comp_width(const TestImage& input, int c) const {
-    return DivCeil(input.xsize * h_samp(c), max_h_sample() * 8) * 8;
-  }
-  int comp_height(const TestImage& input, int c) const {
-    return DivCeil(input.ysize * v_samp(c), max_v_sample() * 8) * 8;
-  }
-};
-
-enum ColorQuantMode {
-  CQUANT_1PASS,
-  CQUANT_2PASS,
-  CQUANT_EXTERNAL,
-  CQUANT_REUSE,
-};
-
-struct ScanDecompressParams {
-  int max_scan_number;
-  int dither_mode;
-  ColorQuantMode color_quant_mode;
-};
-
-struct DecompressParams {
-  float size_factor = 1.0f;
-  size_t chunk_size = 65536;
-  size_t max_output_lines = 16;
-  JpegIOMode output_mode = PIXELS;
-  JpegliDataType data_type = JPEGLI_TYPE_UINT8;
-  JpegliEndianness endianness = JPEGLI_NATIVE_ENDIAN;
-  bool set_out_color_space = false;
-  int out_color_space = 0;  // JCS_UNKNOWN
-  bool crop_output = false;
-  bool do_block_smoothing = false;
-  bool do_fancy_upsampling = true;
-  bool skip_scans = false;
-  int scale_num = 1;
-  int scale_denom = 1;
-  bool quantize_colors = false;
-  int desired_number_of_colors = 256;
-  std::vector<ScanDecompressParams> scan_params;
-};
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_TEST_PARAMS_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/test_utils-inl.h b/third_party/jpeg-xl/lib/jpegli/test_utils-inl.h
deleted file mode 100644
index da1a924e21f85..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/test_utils-inl.h
+++ /dev/null
@@ -1,432 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This template file is included in both the libjpeg_test_util.cc and the
-// test_utils.cc files with different JPEG_API_FN macros and possibly different
-// include paths for the jpeg headers.
-
-// Sequential non-interleaved.
-constexpr jpeg_scan_info kScript1[] = {
-    {1, {0}, 0, 63, 0, 0},
-    {1, {1}, 0, 63, 0, 0},
-    {1, {2}, 0, 63, 0, 0},
-};
-// Sequential partially interleaved, chroma first.
-constexpr jpeg_scan_info kScript2[] = {
-    {2, {1, 2}, 0, 63, 0, 0},
-    {1, {0}, 0, 63, 0, 0},
-};
-
-// Rest of the scan scripts are progressive.
-
-constexpr jpeg_scan_info kScript3[] = {
-    // Interleaved full DC.
-    {3, {0, 1, 2}, 0, 0, 0, 0},
-    // Full AC scans.
-    {1, {0}, 1, 63, 0, 0},
-    {1, {1}, 1, 63, 0, 0},
-    {1, {2}, 1, 63, 0, 0},
-};
-constexpr jpeg_scan_info kScript4[] = {
-    // Non-interleaved full DC.
-    {1, {0}, 0, 0, 0, 0},
-    {1, {1}, 0, 0, 0, 0},
-    {1, {2}, 0, 0, 0, 0},
-    // Full AC scans.
-    {1, {0}, 1, 63, 0, 0},
-    {1, {1}, 1, 63, 0, 0},
-    {1, {2}, 1, 63, 0, 0},
-};
-constexpr jpeg_scan_info kScript5[] = {
-    // Partially interleaved full DC, chroma first.
-    {2, {1, 2}, 0, 0, 0, 0},
-    {1, {0}, 0, 0, 0, 0},
-    // AC shifted by 1 bit.
-    {1, {0}, 1, 63, 0, 1},
-    {1, {1}, 1, 63, 0, 1},
-    {1, {2}, 1, 63, 0, 1},
-    // AC refinement scan.
-    {1, {0}, 1, 63, 1, 0},
-    {1, {1}, 1, 63, 1, 0},
-    {1, {2}, 1, 63, 1, 0},
-};
-constexpr jpeg_scan_info kScript6[] = {
-    // Interleaved DC shifted by 2 bits.
-    {3, {0, 1, 2}, 0, 0, 0, 2},
-    // Interleaved DC refinement scans.
-    {3, {0, 1, 2}, 0, 0, 2, 1},
-    {3, {0, 1, 2}, 0, 0, 1, 0},
-    // Full AC scans.
-    {1, {0}, 1, 63, 0, 0},
-    {1, {1}, 1, 63, 0, 0},
-    {1, {2}, 1, 63, 0, 0},
-};
-
-constexpr jpeg_scan_info kScript7[] = {
-    // Non-interleaved DC shifted by 2 bits.
-    {1, {0}, 0, 0, 0, 2},
-    {1, {1}, 0, 0, 0, 2},
-    {1, {2}, 0, 0, 0, 2},
-    // Non-interleaved DC first refinement scans.
-    {1, {0}, 0, 0, 2, 1},
-    {1, {1}, 0, 0, 2, 1},
-    {1, {2}, 0, 0, 2, 1},
-    // Non-interleaved DC second refinement scans.
-    {1, {0}, 0, 0, 1, 0},
-    {1, {1}, 0, 0, 1, 0},
-    {1, {2}, 0, 0, 1, 0},
-    // Full AC scans.
-    {1, {0}, 1, 63, 0, 0},
-    {1, {1}, 1, 63, 0, 0},
-    {1, {2}, 1, 63, 0, 0},
-};
-
-constexpr jpeg_scan_info kScript8[] = {
-    // Partially interleaved DC shifted by 2 bits, chroma first
-    {2, {1, 2}, 0, 0, 0, 2},
-    {1, {0}, 0, 0, 0, 2},
-    // Partially interleaved DC first refinement scans.
-    {2, {0, 2}, 0, 0, 2, 1},
-    {1, {1}, 0, 0, 2, 1},
-    // Partially interleaved DC first refinement scans, chroma first.
-    {2, {1, 2}, 0, 0, 1, 0},
-    {1, {0}, 0, 0, 1, 0},
-    // Full AC scans.
-    {1, {0}, 1, 63, 0, 0},
-    {1, {1}, 1, 63, 0, 0},
-    {1, {2}, 1, 63, 0, 0},
-};
-
-constexpr jpeg_scan_info kScript9[] = {
-    // Interleaved full DC.
-    {3, {0, 1, 2}, 0, 0, 0, 0},
-    // AC scans for component 0
-    // shifted by 1 bit, two spectral ranges
-    {1, {0}, 1, 6, 0, 1},
-    {1, {0}, 7, 63, 0, 1},
-    // refinement scan, full
-    {1, {0}, 1, 63, 1, 0},
-    // AC scans for component 1
-    // shifted by 1 bit, full
-    {1, {1}, 1, 63, 0, 1},
-    // refinement scan, two spectral ranges
-    {1, {1}, 1, 6, 1, 0},
-    {1, {1}, 7, 63, 1, 0},
-    // AC scans for component 2
-    // shifted by 1 bit, two spectral ranges
-    {1, {2}, 1, 6, 0, 1},
-    {1, {2}, 7, 63, 0, 1},
-    // refinement scan, two spectral ranges (but different from above)
-    {1, {2}, 1, 16, 1, 0},
-    {1, {2}, 17, 63, 1, 0},
-};
-
-constexpr jpeg_scan_info kScript10[] = {
-    // Interleaved full DC.
-    {3, {0, 1, 2}, 0, 0, 0, 0},
-    // AC scans for spectral range 1..16
-    // shifted by 1
-    {1, {0}, 1, 16, 0, 1},
-    {1, {1}, 1, 16, 0, 1},
-    {1, {2}, 1, 16, 0, 1},
-    // refinement scans, two sub-ranges
-    {1, {0}, 1, 8, 1, 0},
-    {1, {0}, 9, 16, 1, 0},
-    {1, {1}, 1, 8, 1, 0},
-    {1, {1}, 9, 16, 1, 0},
-    {1, {2}, 1, 8, 1, 0},
-    {1, {2}, 9, 16, 1, 0},
-    // AC scans for spectral range 17..63
-    {1, {0}, 17, 63, 0, 1},
-    {1, {1}, 17, 63, 0, 1},
-    {1, {2}, 17, 63, 0, 1},
-    // refinement scans, two sub-ranges
-    {1, {0}, 17, 28, 1, 0},
-    {1, {0}, 29, 63, 1, 0},
-    {1, {1}, 17, 28, 1, 0},
-    {1, {1}, 29, 63, 1, 0},
-    {1, {2}, 17, 28, 1, 0},
-    {1, {2}, 29, 63, 1, 0},
-};
-
-struct ScanScript {
-  int num_scans;
-  const jpeg_scan_info* scans;
-};
-
-constexpr ScanScript kTestScript[] = {
-    {ARRAY_SIZE(kScript1), kScript1}, {ARRAY_SIZE(kScript2), kScript2},
-    {ARRAY_SIZE(kScript3), kScript3}, {ARRAY_SIZE(kScript4), kScript4},
-    {ARRAY_SIZE(kScript5), kScript5}, {ARRAY_SIZE(kScript6), kScript6},
-    {ARRAY_SIZE(kScript7), kScript7}, {ARRAY_SIZE(kScript8), kScript8},
-    {ARRAY_SIZE(kScript9), kScript9}, {ARRAY_SIZE(kScript10), kScript10},
-};
-constexpr int kNumTestScripts = ARRAY_SIZE(kTestScript);
-
-void SetScanDecompressParams(const DecompressParams& dparams,
-                             j_decompress_ptr cinfo, int scan_number) {
-  const ScanDecompressParams* sparams = nullptr;
-  for (const auto& sp : dparams.scan_params) {
-    if (scan_number <= sp.max_scan_number) {
-      sparams = &sp;
-      break;
-    }
-  }
-  if (sparams == nullptr) {
-    return;
-  }
-  if (dparams.quantize_colors) {
-    cinfo->dither_mode = static_cast<J_DITHER_MODE>(sparams->dither_mode);
-    if (sparams->color_quant_mode == CQUANT_1PASS) {
-      cinfo->two_pass_quantize = FALSE;
-      cinfo->colormap = nullptr;
-    } else if (sparams->color_quant_mode == CQUANT_2PASS) {
-      Check(cinfo->out_color_space == JCS_RGB);
-      cinfo->two_pass_quantize = TRUE;
-      cinfo->colormap = nullptr;
-    } else if (sparams->color_quant_mode == CQUANT_EXTERNAL) {
-      Check(cinfo->out_color_space == JCS_RGB);
-      cinfo->two_pass_quantize = FALSE;
-      bool have_colormap = cinfo->colormap != nullptr;
-      cinfo->actual_number_of_colors = kTestColorMapNumColors;
-      cinfo->colormap = (*cinfo->mem->alloc_sarray)(
-          reinterpret_cast<j_common_ptr>(cinfo), JPOOL_IMAGE,
-          cinfo->actual_number_of_colors, 3);
-      jxl::msan::UnpoisonMemory(reinterpret_cast<void*>(cinfo->colormap),
-                                3 * sizeof(JSAMPLE*));
-      for (int i = 0; i < kTestColorMapNumColors; ++i) {
-        cinfo->colormap[0][i] = (kTestColorMap[i] >> 16) & 0xff;
-        cinfo->colormap[1][i] = (kTestColorMap[i] >> 8) & 0xff;
-        cinfo->colormap[2][i] = (kTestColorMap[i] >> 0) & 0xff;
-      }
-      if (have_colormap) {
-        JPEG_API_FN(new_colormap)(cinfo);
-      }
-    } else if (sparams->color_quant_mode == CQUANT_REUSE) {
-      Check(cinfo->out_color_space == JCS_RGB);
-      Check(cinfo->colormap);
-    }
-  }
-}
-
-void SetDecompressParams(const DecompressParams& dparams,
-                         j_decompress_ptr cinfo) {
-  cinfo->do_block_smoothing = dparams.do_block_smoothing ? 1 : 0;
-  cinfo->do_fancy_upsampling = dparams.do_fancy_upsampling ? 1 : 0;
-  if (dparams.output_mode == RAW_DATA) {
-    cinfo->raw_data_out = TRUE;
-  }
-  if (dparams.set_out_color_space) {
-    cinfo->out_color_space =
-        static_cast<J_COLOR_SPACE>(dparams.out_color_space);
-    if (dparams.out_color_space == JCS_UNKNOWN) {
-      cinfo->jpeg_color_space = JCS_UNKNOWN;
-    }
-  }
-  cinfo->scale_num = dparams.scale_num;
-  cinfo->scale_denom = dparams.scale_denom;
-  cinfo->quantize_colors = dparams.quantize_colors ? 1 : 0;
-  cinfo->desired_number_of_colors = dparams.desired_number_of_colors;
-  if (!dparams.scan_params.empty()) {
-    if (cinfo->buffered_image) {
-      for (const auto& sparams : dparams.scan_params) {
-        if (sparams.color_quant_mode == CQUANT_1PASS) {
-          cinfo->enable_1pass_quant = TRUE;
-        } else if (sparams.color_quant_mode == CQUANT_2PASS) {
-          cinfo->enable_2pass_quant = TRUE;
-        } else if (sparams.color_quant_mode == CQUANT_EXTERNAL) {
-          cinfo->enable_external_quant = TRUE;
-        }
-      }
-      SetScanDecompressParams(dparams, cinfo, 1);
-    } else {
-      SetScanDecompressParams(dparams, cinfo, kLastScan);
-    }
-  }
-}
-
-void CheckMarkerPresent(j_decompress_ptr cinfo, uint8_t marker_type) {
-  bool marker_found = false;
-  for (jpeg_saved_marker_ptr marker = cinfo->marker_list; marker != nullptr;
-       marker = marker->next) {
-    jxl::msan::UnpoisonMemory(marker, sizeof(*marker));
-    jxl::msan::UnpoisonMemory(marker->data, marker->data_length);
-    if (marker->marker == marker_type &&
-        marker->data_length == sizeof(kMarkerData) &&
-        memcmp(marker->data, kMarkerData, sizeof(kMarkerData)) == 0) {
-      marker_found = true;
-    }
-  }
-  Check(marker_found);
-}
-
-void VerifyHeader(const CompressParams& jparams, j_decompress_ptr cinfo) {
-  if (jparams.set_jpeg_colorspace) {
-    Check(cinfo->jpeg_color_space == jparams.jpeg_color_space);
-  }
-  if (jparams.override_JFIF >= 0) {
-    Check(cinfo->saw_JFIF_marker == jparams.override_JFIF);
-  }
-  if (jparams.override_Adobe >= 0) {
-    Check(cinfo->saw_Adobe_marker == jparams.override_Adobe);
-  }
-  if (jparams.add_marker) {
-    CheckMarkerPresent(cinfo, kSpecialMarker0);
-    CheckMarkerPresent(cinfo, kSpecialMarker1);
-  }
-  jxl::msan::UnpoisonMemory(
-      cinfo->comp_info, cinfo->num_components * sizeof(cinfo->comp_info[0]));
-  int max_h_samp_factor = 1;
-  int max_v_samp_factor = 1;
-  for (int i = 0; i < cinfo->num_components; ++i) {
-    jpeg_component_info* comp = &cinfo->comp_info[i];
-    if (!jparams.comp_ids.empty()) {
-      Check(comp->component_id == jparams.comp_ids[i]);
-    }
-    if (!jparams.h_sampling.empty()) {
-      Check(comp->h_samp_factor == jparams.h_sampling[i]);
-    }
-    if (!jparams.v_sampling.empty()) {
-      Check(comp->v_samp_factor == jparams.v_sampling[i]);
-    }
-    if (!jparams.quant_indexes.empty()) {
-      Check(comp->quant_tbl_no == jparams.quant_indexes[i]);
-    }
-    max_h_samp_factor = std::max(max_h_samp_factor, comp->h_samp_factor);
-    max_v_samp_factor = std::max(max_v_samp_factor, comp->v_samp_factor);
-  }
-  Check(max_h_samp_factor == cinfo->max_h_samp_factor);
-  Check(max_v_samp_factor == cinfo->max_v_samp_factor);
-  int referenced_tables[NUM_QUANT_TBLS] = {};
-  for (int i = 0; i < cinfo->num_components; ++i) {
-    jpeg_component_info* comp = &cinfo->comp_info[i];
-    Check(comp->width_in_blocks ==
-          DivCeil(cinfo->image_width * comp->h_samp_factor,
-                  max_h_samp_factor * DCTSIZE));
-    Check(comp->height_in_blocks ==
-          DivCeil(cinfo->image_height * comp->v_samp_factor,
-                  max_v_samp_factor * DCTSIZE));
-    referenced_tables[comp->quant_tbl_no] = 1;
-  }
-  for (const auto& table : jparams.quant_tables) {
-    JQUANT_TBL* quant_table = cinfo->quant_tbl_ptrs[table.slot_idx];
-    if (!referenced_tables[table.slot_idx]) {
-      Check(quant_table == nullptr);
-      continue;
-    }
-    Check(quant_table != nullptr);
-    jxl::msan::UnpoisonMemory(quant_table, sizeof(*quant_table));
-    for (int k = 0; k < DCTSIZE2; ++k) {
-      Check(quant_table->quantval[k] == table.quantval[k]);
-    }
-  }
-}
-
-void VerifyScanHeader(const CompressParams& jparams, j_decompress_ptr cinfo) {
-  Check(cinfo->input_scan_number > 0);
-  if (cinfo->progressive_mode) {
-    Check(cinfo->Ss != 0 || cinfo->Se != 63);
-  } else {
-    Check(cinfo->Ss == 0 && cinfo->Se == 63);
-  }
-  if (jparams.progressive_mode > 2) {
-    Check(jparams.progressive_mode < 3 + kNumTestScripts);
-    const ScanScript& script = kTestScript[jparams.progressive_mode - 3];
-    Check(cinfo->input_scan_number <= script.num_scans);
-    const jpeg_scan_info& scan = script.scans[cinfo->input_scan_number - 1];
-    Check(cinfo->comps_in_scan == scan.comps_in_scan);
-    for (int i = 0; i < cinfo->comps_in_scan; ++i) {
-      Check(cinfo->cur_comp_info[i]->component_index ==
-            scan.component_index[i]);
-    }
-    Check(cinfo->Ss == scan.Ss);
-    Check(cinfo->Se == scan.Se);
-    Check(cinfo->Ah == scan.Ah);
-    Check(cinfo->Al == scan.Al);
-  }
-  if (jparams.restart_interval > 0) {
-    Check(cinfo->restart_interval == jparams.restart_interval);
-  } else if (jparams.restart_in_rows > 0) {
-    Check(cinfo->restart_interval ==
-          jparams.restart_in_rows * cinfo->MCUs_per_row);
-  }
-  if (jparams.progressive_mode == 0 && jparams.optimize_coding == 0) {
-    if (cinfo->jpeg_color_space == JCS_RGB) {
-      Check(cinfo->comp_info[0].dc_tbl_no == 0);
-      Check(cinfo->comp_info[1].dc_tbl_no == 0);
-      Check(cinfo->comp_info[2].dc_tbl_no == 0);
-      Check(cinfo->comp_info[0].ac_tbl_no == 0);
-      Check(cinfo->comp_info[1].ac_tbl_no == 0);
-      Check(cinfo->comp_info[2].ac_tbl_no == 0);
-    } else if (cinfo->jpeg_color_space == JCS_YCbCr) {
-      Check(cinfo->comp_info[0].dc_tbl_no == 0);
-      Check(cinfo->comp_info[1].dc_tbl_no == 1);
-      Check(cinfo->comp_info[2].dc_tbl_no == 1);
-      Check(cinfo->comp_info[0].ac_tbl_no == 0);
-      Check(cinfo->comp_info[1].ac_tbl_no == 1);
-      Check(cinfo->comp_info[2].ac_tbl_no == 1);
-    } else if (cinfo->jpeg_color_space == JCS_CMYK) {
-      Check(cinfo->comp_info[0].dc_tbl_no == 0);
-      Check(cinfo->comp_info[1].dc_tbl_no == 0);
-      Check(cinfo->comp_info[2].dc_tbl_no == 0);
-      Check(cinfo->comp_info[3].dc_tbl_no == 0);
-      Check(cinfo->comp_info[0].ac_tbl_no == 0);
-      Check(cinfo->comp_info[1].ac_tbl_no == 0);
-      Check(cinfo->comp_info[2].ac_tbl_no == 0);
-      Check(cinfo->comp_info[3].ac_tbl_no == 0);
-    } else if (cinfo->jpeg_color_space == JCS_YCCK) {
-      Check(cinfo->comp_info[0].dc_tbl_no == 0);
-      Check(cinfo->comp_info[1].dc_tbl_no == 1);
-      Check(cinfo->comp_info[2].dc_tbl_no == 1);
-      Check(cinfo->comp_info[3].dc_tbl_no == 0);
-      Check(cinfo->comp_info[0].ac_tbl_no == 0);
-      Check(cinfo->comp_info[1].ac_tbl_no == 1);
-      Check(cinfo->comp_info[2].ac_tbl_no == 1);
-      Check(cinfo->comp_info[3].ac_tbl_no == 0);
-    }
-    if (jparams.use_flat_dc_luma_code) {
-      JHUFF_TBL* tbl = cinfo->dc_huff_tbl_ptrs[0];
-      jxl::msan::UnpoisonMemory(tbl, sizeof(*tbl));
-      for (int i = 0; i < 15; ++i) {
-        Check(tbl->huffval[i] == i);
-      }
-    }
-  }
-}
-
-void UnmapColors(uint8_t* row, size_t xsize, int components,
-                 JSAMPARRAY colormap, size_t num_colors) {
-  Check(colormap != nullptr);
-  std::vector<uint8_t> tmp(xsize * components);
-  for (size_t x = 0; x < xsize; ++x) {
-    Check(row[x] < num_colors);
-    for (int c = 0; c < components; ++c) {
-      tmp[x * components + c] = colormap[c][row[x]];
-    }
-  }
-  memcpy(row, tmp.data(), tmp.size());
-}
-
-void CopyCoefficients(j_decompress_ptr cinfo, jvirt_barray_ptr* coef_arrays,
-                      TestImage* output) {
-  output->xsize = cinfo->image_width;
-  output->ysize = cinfo->image_height;
-  output->components = cinfo->num_components;
-  output->color_space = cinfo->out_color_space;
-  j_common_ptr comptr = reinterpret_cast<j_common_ptr>(cinfo);
-  for (int c = 0; c < cinfo->num_components; ++c) {
-    jpeg_component_info* comp = &cinfo->comp_info[c];
-    std::vector<JCOEF> coeffs(comp->width_in_blocks * comp->height_in_blocks *
-                              DCTSIZE2);
-    for (size_t by = 0; by < comp->height_in_blocks; ++by) {
-      JBLOCKARRAY blocks = (*cinfo->mem->access_virt_barray)(
-          comptr, coef_arrays[c], by, 1, TRUE);
-      size_t stride = comp->width_in_blocks * sizeof(JBLOCK);
-      size_t offset = by * comp->width_in_blocks * DCTSIZE2;
-      memcpy(&coeffs[offset], blocks[0], stride);
-    }
-    output->coeffs.emplace_back(std::move(coeffs));
-  }
-}
diff --git a/third_party/jpeg-xl/lib/jpegli/test_utils.cc b/third_party/jpeg-xl/lib/jpegli/test_utils.cc
deleted file mode 100644
index 2b903fa0c022f..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/test_utils.cc
+++ /dev/null
@@ -1,867 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/test_utils.h"
-
-#include <cmath>
-#include <cstdint>
-#include <cstring>
-#include <fstream>
-#include <sstream>
-
-#include "lib/jpegli/decode.h"
-#include "lib/jpegli/encode.h"
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/sanitizers.h"
-#include "lib/jxl/base/status.h"
-
-#if !defined(TEST_DATA_PATH)
-#include "tools/cpp/runfiles/runfiles.h"
-#endif
-
-namespace jpegli {
-
-namespace {
-void Check(bool ok) {
-  if (!ok) {
-    JXL_CRASH();
-  }
-}
-#define QUIT(M) Check(false);
-}  // namespace
-
-#define JPEG_API_FN(name) jpegli_##name
-#include "lib/jpegli/test_utils-inl.h"
-#undef JPEG_API_FN
-
-#if defined(TEST_DATA_PATH)
-std::string GetTestDataPath(const std::string& filename) {
-  return std::string(TEST_DATA_PATH "/") + filename;
-}
-#else
-using ::bazel::tools::cpp::runfiles::Runfiles;
-const std::unique_ptr<Runfiles> kRunfiles(Runfiles::Create(""));
-std::string GetTestDataPath(const std::string& filename) {
-  std::string root(JPEGXL_ROOT_PACKAGE "/testdata/");
-  return kRunfiles->Rlocation(root + filename);
-}
-#endif
-
-jxl::StatusOr<std::vector<uint8_t>> ReadTestData(const std::string& filename) {
-  std::vector<uint8_t> data;
-  std::string full_path = GetTestDataPath(filename);
-  fprintf(stderr, "ReadTestData %s\n", full_path.c_str());
-  std::ifstream file(full_path, std::ios::binary);
-  std::vector<char> str((std::istreambuf_iterator<char>(file)),
-                        std::istreambuf_iterator<char>());
-  JXL_ENSURE(file.good());
-  const uint8_t* raw = reinterpret_cast<const uint8_t*>(str.data());
-  data = std::vector<uint8_t>(raw, raw + str.size());
-  printf("Test data %s is %d bytes long.\n", filename.c_str(),
-         static_cast<int>(data.size()));
-  return data;
-}
-
-void CustomQuantTable::Generate() {
-  basic_table.resize(DCTSIZE2);
-  quantval.resize(DCTSIZE2);
-  switch (table_type) {
-    case 0: {
-      for (int k = 0; k < DCTSIZE2; ++k) {
-        basic_table[k] = k + 1;
-      }
-      break;
-    }
-    default:
-      for (int k = 0; k < DCTSIZE2; ++k) {
-        basic_table[k] = table_type;
-      }
-  }
-  for (int k = 0; k < DCTSIZE2; ++k) {
-    quantval[k] = (basic_table[k] * scale_factor + 50U) / 100U;
-    quantval[k] = std::max(quantval[k], 1U);
-    quantval[k] = std::min(quantval[k], 65535U);
-    if (!add_raw) {
-      quantval[k] = std::min(quantval[k], force_baseline ? 255U : 32767U);
-    }
-  }
-}
-
-bool PNMParser::ParseHeader(const uint8_t** pos, size_t* xsize, size_t* ysize,
-                            size_t* num_channels, size_t* bitdepth) {
-  if (pos_[0] != 'P' || (pos_[1] != '5' && pos_[1] != '6')) {
-    fprintf(stderr, "Invalid PNM header.");
-    return false;
-  }
-  *num_channels = (pos_[1] == '5' ? 1 : 3);
-  pos_ += 2;
-
-  size_t maxval;
-  if (!SkipWhitespace() || !ParseUnsigned(xsize) || !SkipWhitespace() ||
-      !ParseUnsigned(ysize) || !SkipWhitespace() || !ParseUnsigned(&maxval) ||
-      !SkipWhitespace()) {
-    return false;
-  }
-  if (maxval == 0 || maxval >= 65536) {
-    fprintf(stderr, "Invalid maxval value.\n");
-    return false;
-  }
-  bool found_bitdepth = false;
-  for (int bits = 1; bits <= 16; ++bits) {
-    if (maxval == (1u << bits) - 1) {
-      *bitdepth = bits;
-      found_bitdepth = true;
-      break;
-    }
-  }
-  if (!found_bitdepth) {
-    fprintf(stderr, "Invalid maxval value.\n");
-    return false;
-  }
-
-  *pos = pos_;
-  return true;
-}
-
-bool PNMParser::ParseUnsigned(size_t* number) {
-  if (pos_ == end_ || *pos_ < '0' || *pos_ > '9') {
-    fprintf(stderr, "Expected unsigned number.\n");
-    return false;
-  }
-  *number = 0;
-  while (pos_ < end_ && *pos_ >= '0' && *pos_ <= '9') {
-    *number *= 10;
-    *number += *pos_ - '0';
-    ++pos_;
-  }
-
-  return true;
-}
-
-bool PNMParser::SkipWhitespace() {
-  if (pos_ == end_ || !IsWhitespace(*pos_)) {
-    fprintf(stderr, "Expected whitespace.\n");
-    return false;
-  }
-  while (pos_ < end_ && IsWhitespace(*pos_)) {
-    ++pos_;
-  }
-  return true;
-}
-
-bool ReadPNM(const std::vector<uint8_t>& data, size_t* xsize, size_t* ysize,
-             size_t* num_channels, size_t* bitdepth,
-             std::vector<uint8_t>* pixels) {
-  if (data.size() < 2) {
-    fprintf(stderr, "PNM file too small.\n");
-    return false;
-  }
-  PNMParser parser(data.data(), data.size());
-  const uint8_t* pos = nullptr;
-  if (!parser.ParseHeader(&pos, xsize, ysize, num_channels, bitdepth)) {
-    return false;
-  }
-  pixels->resize(data.data() + data.size() - pos);
-  memcpy(pixels->data(), pos, pixels->size());
-  return true;
-}
-
-std::string ColorSpaceName(J_COLOR_SPACE colorspace) {
-  switch (colorspace) {
-    case JCS_UNKNOWN:
-      return "UNKNOWN";
-    case JCS_GRAYSCALE:
-      return "GRAYSCALE";
-    case JCS_RGB:
-      return "RGB";
-    case JCS_YCbCr:
-      return "YCbCr";
-    case JCS_CMYK:
-      return "CMYK";
-    case JCS_YCCK:
-      return "YCCK";
-    case JCS_EXT_RGB:
-      return "EXT_RGB";
-    case JCS_EXT_BGR:
-      return "EXT_BGR";
-    case JCS_EXT_RGBA:
-      return "EXT_RGBA";
-    case JCS_EXT_BGRA:
-      return "EXT_BGRA";
-    case JCS_EXT_ARGB:
-      return "EXT_ARGB";
-    case JCS_EXT_ABGR:
-      return "EXT_ABGR";
-    default:
-      return "";
-  }
-}
-
-std::string IOMethodName(JpegliDataType data_type,
-                         JpegliEndianness endianness) {
-  std::string retval;
-  if (data_type == JPEGLI_TYPE_UINT8) {
-    return "";
-  } else if (data_type == JPEGLI_TYPE_UINT16) {
-    retval = "UINT16";
-  } else if (data_type == JPEGLI_TYPE_FLOAT) {
-    retval = "FLOAT";
-  }
-  if (endianness == JPEGLI_LITTLE_ENDIAN) {
-    retval += "LE";
-  } else if (endianness == JPEGLI_BIG_ENDIAN) {
-    retval += "BE";
-  }
-  return retval;
-}
-
-std::string SamplingId(const CompressParams& jparams) {
-  std::stringstream os;
-  Check(jparams.h_sampling.size() == jparams.v_sampling.size());
-  if (!jparams.h_sampling.empty()) {
-    size_t len = jparams.h_sampling.size();
-    while (len > 1 && jparams.h_sampling[len - 1] == 1 &&
-           jparams.v_sampling[len - 1] == 1) {
-      --len;
-    }
-    os << "SAMP";
-    for (size_t i = 0; i < len; ++i) {
-      if (i > 0) os << "_";
-      os << jparams.h_sampling[i] << "x" << jparams.v_sampling[i];
-    }
-  }
-  return os.str();
-}
-
-std::ostream& operator<<(std::ostream& os, const TestImage& input) {
-  os << input.xsize << "x" << input.ysize;
-  os << IOMethodName(input.data_type, input.endianness);
-  if (input.color_space != JCS_RGB) {
-    os << "InputColor"
-       << ColorSpaceName(static_cast<J_COLOR_SPACE>(input.color_space));
-  }
-  if (input.color_space == JCS_UNKNOWN) {
-    os << input.components;
-  }
-  return os;
-}
-
-std::ostream& operator<<(std::ostream& os, const CompressParams& jparams) {
-  os << "Q" << jparams.quality;
-  os << SamplingId(jparams);
-  if (jparams.set_jpeg_colorspace) {
-    os << "JpegColor"
-       << ColorSpaceName(static_cast<J_COLOR_SPACE>(jparams.jpeg_color_space));
-  }
-  if (!jparams.comp_ids.empty()) {
-    os << "CID";
-    for (int cid : jparams.comp_ids) {
-      os << cid;
-    }
-  }
-  if (!jparams.quant_indexes.empty()) {
-    os << "QIDX";
-    for (int qi : jparams.quant_indexes) {
-      os << qi;
-    }
-    for (const auto& table : jparams.quant_tables) {
-      os << "TABLE" << table.slot_idx << "T" << table.table_type << "F"
-         << table.scale_factor
-         << (table.add_raw          ? "R"
-             : table.force_baseline ? "B"
-                                    : "");
-    }
-  }
-  if (jparams.progressive_mode >= 0) {
-    os << "P" << jparams.progressive_mode;
-  } else if (jparams.simple_progression) {
-    os << "Psimple";
-  }
-  if (jparams.optimize_coding == 1) {
-    os << "OptimizedCode";
-  } else if (jparams.optimize_coding == 0) {
-    os << "FixedCode";
-    if (jparams.use_flat_dc_luma_code) {
-      os << "FlatDCLuma";
-    } else if (jparams.omit_standard_tables) {
-      os << "OmitDHT";
-    }
-  }
-  if (!jparams.use_adaptive_quantization) {
-    os << "NoAQ";
-  }
-  if (jparams.restart_interval > 0) {
-    os << "R" << jparams.restart_interval;
-  }
-  if (jparams.restart_in_rows > 0) {
-    os << "RR" << jparams.restart_in_rows;
-  }
-  if (jparams.xyb_mode) {
-    os << "XYB";
-  } else if (jparams.libjpeg_mode) {
-    os << "Libjpeg";
-  }
-  if (jparams.override_JFIF >= 0) {
-    os << (jparams.override_JFIF ? "AddJFIF" : "NoJFIF");
-  }
-  if (jparams.override_Adobe >= 0) {
-    os << (jparams.override_Adobe ? "AddAdobe" : "NoAdobe");
-  }
-  if (jparams.add_marker) {
-    os << "AddMarker";
-  }
-  if (!jparams.icc.empty()) {
-    os << "ICCSize" << jparams.icc.size();
-  }
-  if (jparams.smoothing_factor != 0) {
-    os << "SF" << jparams.smoothing_factor;
-  }
-  return os;
-}
-
-jxl::Status SetNumChannels(J_COLOR_SPACE colorspace, size_t* channels) {
-  if (colorspace == JCS_GRAYSCALE) {
-    *channels = 1;
-  } else if (colorspace == JCS_RGB || colorspace == JCS_YCbCr ||
-             colorspace == JCS_EXT_RGB || colorspace == JCS_EXT_BGR) {
-    *channels = 3;
-  } else if (colorspace == JCS_CMYK || colorspace == JCS_YCCK ||
-             colorspace == JCS_EXT_RGBA || colorspace == JCS_EXT_BGRA ||
-             colorspace == JCS_EXT_ARGB || colorspace == JCS_EXT_ABGR) {
-    *channels = 4;
-  } else if (colorspace == JCS_UNKNOWN) {
-    JXL_ENSURE(*channels <= 4);
-  } else {
-    return JXL_FAILURE("Unsupported colorspace: %d",
-                       static_cast<int>(colorspace));
-  }
-  return true;
-}
-
-void RGBToYCbCr(float r, float g, float b, float* y, float* cb, float* cr) {
-  *y = 0.299f * r + 0.587f * g + 0.114f * b;
-  *cb = -0.168736f * r - 0.331264f * g + 0.5f * b + 0.5f;
-  *cr = 0.5f * r - 0.418688f * g - 0.081312f * b + 0.5f;
-}
-
-void ConvertPixel(const uint8_t* input_rgb, uint8_t* out,
-                  J_COLOR_SPACE colorspace, size_t num_channels,
-                  JpegliDataType data_type = JPEGLI_TYPE_UINT8,
-                  JXL_BOOL swap_endianness = JPEGLI_NATIVE_ENDIAN) {
-  const float kMul = 255.0f;
-  float r = input_rgb[0] / kMul;
-  float g = input_rgb[1] / kMul;
-  float b = input_rgb[2] / kMul;
-  uint8_t out8[MAX_COMPONENTS];
-  if (colorspace == JCS_GRAYSCALE) {
-    const float Y = 0.299f * r + 0.587f * g + 0.114f * b;
-    out8[0] = static_cast<uint8_t>(std::round(Y * kMul));
-  } else if (colorspace == JCS_RGB || colorspace == JCS_EXT_RGB ||
-             colorspace == JCS_EXT_RGBA) {
-    out8[0] = input_rgb[0];
-    out8[1] = input_rgb[1];
-    out8[2] = input_rgb[2];
-    if (colorspace == JCS_EXT_RGBA) out8[3] = 255;
-  } else if (colorspace == JCS_EXT_BGR || colorspace == JCS_EXT_BGRA) {
-    out8[2] = input_rgb[0];
-    out8[1] = input_rgb[1];
-    out8[0] = input_rgb[2];
-    if (colorspace == JCS_EXT_BGRA) out8[3] = 255;
-  } else if (colorspace == JCS_EXT_ABGR) {
-    out8[0] = 255;
-    out8[3] = input_rgb[0];
-    out8[2] = input_rgb[1];
-    out8[1] = input_rgb[2];
-  } else if (colorspace == JCS_EXT_ARGB) {
-    out8[0] = 255;
-    out8[1] = input_rgb[0];
-    out8[2] = input_rgb[1];
-    out8[3] = input_rgb[2];
-  } else if (colorspace == JCS_UNKNOWN) {
-    for (size_t c = 0; c < num_channels; ++c) {
-      out8[c] = input_rgb[std::min<size_t>(2, c)];
-    }
-  } else if (colorspace == JCS_YCbCr) {
-    float Y;
-    float Cb;
-    float Cr;
-    RGBToYCbCr(r, g, b, &Y, &Cb, &Cr);
-    out8[0] = static_cast<uint8_t>(std::round(Y * kMul));
-    out8[1] = static_cast<uint8_t>(std::round(Cb * kMul));
-    out8[2] = static_cast<uint8_t>(std::round(Cr * kMul));
-  } else if (colorspace == JCS_CMYK || colorspace == JCS_YCCK) {
-    float K = 1.0f - std::max(r, std::max(g, b));
-    float scaleK = 1.0f / (1.0f - K);
-    r *= scaleK;
-    g *= scaleK;
-    b *= scaleK;
-    if (colorspace == JCS_CMYK) {
-      out8[0] = static_cast<uint8_t>(std::round((1.0f - r) * kMul));
-      out8[1] = static_cast<uint8_t>(std::round((1.0f - g) * kMul));
-      out8[2] = static_cast<uint8_t>(std::round((1.0f - b) * kMul));
-    } else if (colorspace == JCS_YCCK) {
-      float Y;
-      float Cb;
-      float Cr;
-      RGBToYCbCr(r, g, b, &Y, &Cb, &Cr);
-      out8[0] = static_cast<uint8_t>(std::round(Y * kMul));
-      out8[1] = static_cast<uint8_t>(std::round(Cb * kMul));
-      out8[2] = static_cast<uint8_t>(std::round(Cr * kMul));
-    }
-    out8[3] = static_cast<uint8_t>(std::round(K * kMul));
-  } else {
-    Check(false);
-  }
-  if (data_type == JPEGLI_TYPE_UINT8) {
-    memcpy(out, out8, num_channels);
-  } else if (data_type == JPEGLI_TYPE_UINT16) {
-    for (size_t c = 0; c < num_channels; ++c) {
-      uint16_t val = (out8[c] << 8) + out8[c];
-      val |= 0x40;  // Make little-endian and big-endian asymmetric
-      if (swap_endianness) {
-        val = JXL_BSWAP16(val);
-      }
-      memcpy(&out[sizeof(val) * c], &val, sizeof(val));
-    }
-  } else if (data_type == JPEGLI_TYPE_FLOAT) {
-    for (size_t c = 0; c < num_channels; ++c) {
-      float val = out8[c] / 255.0f;
-      if (swap_endianness) {
-        val = BSwapFloat(val);
-      }
-      memcpy(&out[sizeof(val) * c], &val, sizeof(val));
-    }
-  }
-}
-
-void ConvertToGrayscale(TestImage* img) {
-  if (img->color_space == JCS_GRAYSCALE) return;
-  Check(img->data_type == JPEGLI_TYPE_UINT8);
-  bool rgb_pre_alpha =
-      img->color_space == JCS_EXT_ARGB || img->color_space == JCS_EXT_ABGR;
-  bool rgb_post_alpha =
-      img->color_space == JCS_EXT_RGBA || img->color_space == JCS_EXT_BGRA;
-  bool rgb_alpha = rgb_pre_alpha || rgb_post_alpha;
-  bool is_rgb = img->color_space == JCS_RGB ||
-                img->color_space == JCS_EXT_RGB ||
-                img->color_space == JCS_EXT_BGR || rgb_alpha;
-  bool switch_br = img->color_space == JCS_EXT_BGR ||
-                   img->color_space == JCS_EXT_ABGR ||
-                   img->color_space == JCS_EXT_BGRA;
-  size_t stride = rgb_alpha ? 4 : 3;
-  size_t offset = rgb_pre_alpha ? 1 : 0;
-  for (size_t i = offset; i < img->pixels.size(); i += stride) {
-    if (is_rgb) {
-      if (switch_br) std::swap(img->pixels[i], img->pixels[i + 2]);
-      ConvertPixel(&img->pixels[i], &img->pixels[i / stride], JCS_GRAYSCALE, 1);
-    } else if (img->color_space == JCS_YCbCr) {
-      img->pixels[i / 3] = img->pixels[i];
-    }
-  }
-  img->pixels.resize(img->pixels.size() / 3);
-  img->color_space = JCS_GRAYSCALE;
-  img->components = 1;
-}
-
-void GeneratePixels(TestImage* img) {
-  JXL_ASSIGN_OR_QUIT(std::vector<uint8_t> imgdata,
-                     ReadTestData("jxl/flower/flower.pnm"),
-                     "Failed to read test data");
-  size_t xsize;
-  size_t ysize;
-  size_t channels;
-  size_t bitdepth;
-  std::vector<uint8_t> pixels;
-  Check(ReadPNM(imgdata, &xsize, &ysize, &channels, &bitdepth, &pixels));
-  if (img->xsize == 0) img->xsize = xsize;
-  if (img->ysize == 0) img->ysize = ysize;
-  Check(img->xsize <= xsize);
-  Check(img->ysize <= ysize);
-  Check(3 == channels);
-  Check(8 == bitdepth);
-  size_t in_bytes_per_pixel = channels;
-  size_t in_stride = xsize * in_bytes_per_pixel;
-  size_t x0 = (xsize - img->xsize) / 2;
-  size_t y0 = (ysize - img->ysize) / 2;
-  Check(SetNumChannels(static_cast<J_COLOR_SPACE>(img->color_space),
-                       &img->components));
-  size_t out_bytes_per_pixel =
-      jpegli_bytes_per_sample(img->data_type) * img->components;
-  size_t out_stride = img->xsize * out_bytes_per_pixel;
-  bool swap_endianness =
-      (img->endianness == JPEGLI_LITTLE_ENDIAN && !IsLittleEndian()) ||
-      (img->endianness == JPEGLI_BIG_ENDIAN && IsLittleEndian());
-  img->pixels.resize(img->ysize * out_stride);
-  for (size_t iy = 0; iy < img->ysize; ++iy) {
-    size_t y = y0 + iy;
-    for (size_t ix = 0; ix < img->xsize; ++ix) {
-      size_t x = x0 + ix;
-      size_t idx_in = y * in_stride + x * in_bytes_per_pixel;
-      size_t idx_out = iy * out_stride + ix * out_bytes_per_pixel;
-      ConvertPixel(&pixels[idx_in], &img->pixels[idx_out],
-                   static_cast<J_COLOR_SPACE>(img->color_space),
-                   img->components, img->data_type,
-                   TO_JXL_BOOL(swap_endianness));
-    }
-  }
-}
-
-void GenerateRawData(const CompressParams& jparams, TestImage* img) {
-  for (size_t c = 0; c < img->components; ++c) {
-    size_t xsize = jparams.comp_width(*img, c);
-    size_t ysize = jparams.comp_height(*img, c);
-    size_t factor_y = jparams.max_v_sample() / jparams.v_samp(c);
-    size_t factor_x = jparams.max_h_sample() / jparams.h_samp(c);
-    size_t factor = factor_x * factor_y;
-    std::vector<uint8_t> plane(ysize * xsize);
-    size_t bytes_per_pixel = img->components;
-    for (size_t y = 0; y < ysize; ++y) {
-      for (size_t x = 0; x < xsize; ++x) {
-        int result = 0;
-        for (size_t iy = 0; iy < factor_y; ++iy) {
-          size_t yy = std::min(y * factor_y + iy, img->ysize - 1);
-          for (size_t ix = 0; ix < factor_x; ++ix) {
-            size_t xx = std::min(x * factor_x + ix, img->xsize - 1);
-            size_t pixel_ix = (yy * img->xsize + xx) * bytes_per_pixel + c;
-            result += img->pixels[pixel_ix];
-          }
-        }
-        result = static_cast<uint8_t>((result + factor / 2) / factor);
-        plane[y * xsize + x] = result;
-      }
-    }
-    img->raw_data.emplace_back(std::move(plane));
-  }
-}
-
-void GenerateCoeffs(const CompressParams& jparams, TestImage* img) {
-  for (size_t c = 0; c < img->components; ++c) {
-    int xsize_blocks = jparams.comp_width(*img, c) / DCTSIZE;
-    int ysize_blocks = jparams.comp_height(*img, c) / DCTSIZE;
-    std::vector<JCOEF> plane(ysize_blocks * xsize_blocks * DCTSIZE2);
-    for (int by = 0; by < ysize_blocks; ++by) {
-      for (int bx = 0; bx < xsize_blocks; ++bx) {
-        JCOEF* block = &plane[(by * xsize_blocks + bx) * DCTSIZE2];
-        for (int k = 0; k < DCTSIZE2; ++k) {
-          block[k] = (bx - by) / (k + 1);
-        }
-      }
-    }
-    img->coeffs.emplace_back(std::move(plane));
-  }
-}
-
-void EncodeWithJpegli(const TestImage& input, const CompressParams& jparams,
-                      j_compress_ptr cinfo) {
-  cinfo->image_width = input.xsize;
-  cinfo->image_height = input.ysize;
-  cinfo->input_components = input.components;
-  if (jparams.xyb_mode) {
-    jpegli_set_xyb_mode(cinfo);
-  }
-  if (jparams.libjpeg_mode) {
-    jpegli_enable_adaptive_quantization(cinfo, FALSE);
-    jpegli_use_standard_quant_tables(cinfo);
-    jpegli_set_progressive_level(cinfo, 0);
-  }
-  jpegli_set_defaults(cinfo);
-  cinfo->in_color_space = static_cast<J_COLOR_SPACE>(input.color_space);
-  jpegli_default_colorspace(cinfo);
-  if (jparams.override_JFIF >= 0) {
-    cinfo->write_JFIF_header = jparams.override_JFIF;
-  }
-  if (jparams.override_Adobe >= 0) {
-    cinfo->write_Adobe_marker = jparams.override_Adobe;
-  }
-  if (jparams.set_jpeg_colorspace) {
-    jpegli_set_colorspace(cinfo,
-                          static_cast<J_COLOR_SPACE>(jparams.jpeg_color_space));
-  }
-  if (!jparams.comp_ids.empty()) {
-    for (int c = 0; c < cinfo->num_components; ++c) {
-      cinfo->comp_info[c].component_id = jparams.comp_ids[c];
-    }
-  }
-  if (!jparams.h_sampling.empty()) {
-    for (int c = 0; c < cinfo->num_components; ++c) {
-      cinfo->comp_info[c].h_samp_factor = jparams.h_sampling[c];
-      cinfo->comp_info[c].v_samp_factor = jparams.v_sampling[c];
-    }
-  }
-  jpegli_set_quality(cinfo, jparams.quality, TRUE);
-  if (!jparams.quant_indexes.empty()) {
-    for (int c = 0; c < cinfo->num_components; ++c) {
-      cinfo->comp_info[c].quant_tbl_no = jparams.quant_indexes[c];
-    }
-    for (const auto& table : jparams.quant_tables) {
-      if (table.add_raw) {
-        cinfo->quant_tbl_ptrs[table.slot_idx] =
-            jpegli_alloc_quant_table(reinterpret_cast<j_common_ptr>(cinfo));
-        for (int k = 0; k < DCTSIZE2; ++k) {
-          cinfo->quant_tbl_ptrs[table.slot_idx]->quantval[k] =
-              table.quantval[k];
-        }
-        cinfo->quant_tbl_ptrs[table.slot_idx]->sent_table = FALSE;
-      } else {
-        jpegli_add_quant_table(cinfo, table.slot_idx, table.basic_table.data(),
-                               table.scale_factor,
-                               TO_JXL_BOOL(table.force_baseline));
-      }
-    }
-  }
-  if (jparams.simple_progression) {
-    jpegli_simple_progression(cinfo);
-    Check(jparams.progressive_mode == -1);
-  }
-  if (jparams.progressive_mode > 2) {
-    const ScanScript& script = kTestScript[jparams.progressive_mode - 3];
-    cinfo->scan_info = script.scans;
-    cinfo->num_scans = script.num_scans;
-  } else if (jparams.progressive_mode >= 0) {
-    jpegli_set_progressive_level(cinfo, jparams.progressive_mode);
-  }
-  jpegli_set_input_format(cinfo, input.data_type, input.endianness);
-  jpegli_enable_adaptive_quantization(
-      cinfo, TO_JXL_BOOL(jparams.use_adaptive_quantization));
-  cinfo->restart_interval = jparams.restart_interval;
-  cinfo->restart_in_rows = jparams.restart_in_rows;
-  cinfo->smoothing_factor = jparams.smoothing_factor;
-  if (jparams.optimize_coding == 1) {
-    cinfo->optimize_coding = TRUE;
-  } else if (jparams.optimize_coding == 0) {
-    cinfo->optimize_coding = FALSE;
-  }
-  cinfo->raw_data_in = TO_JXL_BOOL(!input.raw_data.empty());
-  if (jparams.optimize_coding == 0 && jparams.use_flat_dc_luma_code) {
-    JHUFF_TBL* tbl = cinfo->dc_huff_tbl_ptrs[0];
-    memset(tbl, 0, sizeof(*tbl));
-    tbl->bits[4] = 15;
-    for (int i = 0; i < 15; ++i) tbl->huffval[i] = i;
-  }
-  if (input.coeffs.empty()) {
-    bool write_all_tables = TRUE;
-    if (jparams.optimize_coding == 0 && !jparams.use_flat_dc_luma_code &&
-        jparams.omit_standard_tables) {
-      write_all_tables = FALSE;
-      cinfo->dc_huff_tbl_ptrs[0]->sent_table = TRUE;
-      cinfo->dc_huff_tbl_ptrs[1]->sent_table = TRUE;
-      cinfo->ac_huff_tbl_ptrs[0]->sent_table = TRUE;
-      cinfo->ac_huff_tbl_ptrs[1]->sent_table = TRUE;
-    }
-    jpegli_start_compress(cinfo, TO_JXL_BOOL(write_all_tables));
-    if (jparams.add_marker) {
-      jpegli_write_marker(cinfo, kSpecialMarker0, kMarkerData,
-                          sizeof(kMarkerData));
-      jpegli_write_m_header(cinfo, kSpecialMarker1, sizeof(kMarkerData));
-      for (uint8_t c : kMarkerData) {
-        jpegli_write_m_byte(cinfo, c);
-      }
-      for (size_t i = 0; i < kMarkerSequenceLen; ++i) {
-        jpegli_write_marker(cinfo, kMarkerSequence[i], kMarkerData,
-                            ((i + 2) % sizeof(kMarkerData)));
-      }
-    }
-    if (!jparams.icc.empty()) {
-      jpegli_write_icc_profile(cinfo, jparams.icc.data(), jparams.icc.size());
-    }
-  }
-  if (cinfo->raw_data_in) {
-    // Need to copy because jpeg API requires non-const pointers.
-    std::vector<std::vector<uint8_t>> raw_data = input.raw_data;
-    size_t max_lines = jparams.max_v_sample() * DCTSIZE;
-    std::vector<std::vector<JSAMPROW>> rowdata(cinfo->num_components);
-    std::vector<JSAMPARRAY> data(cinfo->num_components);
-    for (int c = 0; c < cinfo->num_components; ++c) {
-      rowdata[c].resize(jparams.v_samp(c) * DCTSIZE);
-      data[c] = rowdata[c].data();
-    }
-    while (cinfo->next_scanline < cinfo->image_height) {
-      for (int c = 0; c < cinfo->num_components; ++c) {
-        size_t cwidth = cinfo->comp_info[c].width_in_blocks * DCTSIZE;
-        size_t cheight = cinfo->comp_info[c].height_in_blocks * DCTSIZE;
-        size_t num_lines = jparams.v_samp(c) * DCTSIZE;
-        size_t y0 = (cinfo->next_scanline / max_lines) * num_lines;
-        for (size_t i = 0; i < num_lines; ++i) {
-          rowdata[c][i] =
-              (y0 + i < cheight ? &raw_data[c][(y0 + i) * cwidth] : nullptr);
-        }
-      }
-      size_t num_lines = jpegli_write_raw_data(cinfo, data.data(), max_lines);
-      Check(num_lines == max_lines);
-    }
-  } else if (!input.coeffs.empty()) {
-    j_common_ptr comptr = reinterpret_cast<j_common_ptr>(cinfo);
-    jvirt_barray_ptr* coef_arrays = reinterpret_cast<jvirt_barray_ptr*>((
-        *cinfo->mem->alloc_small)(
-        comptr, JPOOL_IMAGE, cinfo->num_components * sizeof(jvirt_barray_ptr)));
-    for (int c = 0; c < cinfo->num_components; ++c) {
-      size_t xsize_blocks = jparams.comp_width(input, c) / DCTSIZE;
-      size_t ysize_blocks = jparams.comp_height(input, c) / DCTSIZE;
-      coef_arrays[c] = (*cinfo->mem->request_virt_barray)(
-          comptr, JPOOL_IMAGE, FALSE, xsize_blocks, ysize_blocks,
-          cinfo->comp_info[c].v_samp_factor);
-    }
-    jpegli_write_coefficients(cinfo, coef_arrays);
-    if (jparams.add_marker) {
-      jpegli_write_marker(cinfo, kSpecialMarker0, kMarkerData,
-                          sizeof(kMarkerData));
-      jpegli_write_m_header(cinfo, kSpecialMarker1, sizeof(kMarkerData));
-      for (uint8_t c : kMarkerData) {
-        jpegli_write_m_byte(cinfo, c);
-      }
-    }
-    for (int c = 0; c < cinfo->num_components; ++c) {
-      jpeg_component_info* comp = &cinfo->comp_info[c];
-      for (size_t by = 0; by < comp->height_in_blocks; ++by) {
-        JBLOCKARRAY blocks = (*cinfo->mem->access_virt_barray)(
-            comptr, coef_arrays[c], by, 1, TRUE);
-        size_t stride = comp->width_in_blocks * sizeof(JBLOCK);
-        size_t offset = by * comp->width_in_blocks * DCTSIZE2;
-        memcpy(blocks[0], &input.coeffs[c][offset], stride);
-      }
-    }
-  } else {
-    size_t stride = cinfo->image_width * cinfo->input_components *
-                    jpegli_bytes_per_sample(input.data_type);
-    std::vector<uint8_t> row_bytes(stride);
-    for (size_t y = 0; y < cinfo->image_height; ++y) {
-      memcpy(row_bytes.data(), &input.pixels[y * stride], stride);
-      JSAMPROW row[] = {row_bytes.data()};
-      jpegli_write_scanlines(cinfo, row, 1);
-    }
-  }
-  jpegli_finish_compress(cinfo);
-}
-
-bool EncodeWithJpegli(const TestImage& input, const CompressParams& jparams,
-                      std::vector<uint8_t>* compressed) {
-  uint8_t* buffer = nullptr;
-  unsigned long buffer_size = 0;  // NOLINT
-  jpeg_compress_struct cinfo;
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &buffer, &buffer_size);
-    EncodeWithJpegli(input, jparams, &cinfo);
-    return true;
-  };
-  bool success = try_catch_block();
-  jpegli_destroy_compress(&cinfo);
-  if (success) {
-    compressed->resize(buffer_size);
-    std::copy_n(buffer, buffer_size, compressed->data());
-  }
-  if (buffer) std::free(buffer);
-  return success;
-}
-
-int NumTestScanScripts() { return kNumTestScripts; }
-
-void DumpImage(const TestImage& image, const std::string& fn) {
-  Check(image.components == 1 || image.components == 3);
-  size_t bytes_per_sample = jpegli_bytes_per_sample(image.data_type);
-  uint32_t maxval = (1u << (8 * bytes_per_sample)) - 1;
-  char type = image.components == 1 ? '5' : '6';
-  std::ofstream out(fn.c_str(), std::ofstream::binary);
-  out << "P" << type << "\n"
-      << image.xsize << " " << image.ysize << "\n"
-      << maxval << "\n";
-  out.write(reinterpret_cast<const char*>(image.pixels.data()),
-            image.pixels.size());
-  out.close();
-}
-
-double DistanceRms(const TestImage& input, const TestImage& output,
-                   size_t start_line, size_t num_lines, double* max_diff) {
-  size_t stride = input.xsize * input.components;
-  size_t start_offset = start_line * stride;
-  auto get_sample = [&](const TestImage& im, const std::vector<uint8_t>& data,
-                        size_t idx) -> double {
-    size_t bytes_per_sample = jpegli_bytes_per_sample(im.data_type);
-    bool is_little_endian =
-        (im.endianness == JPEGLI_LITTLE_ENDIAN ||
-         (im.endianness == JPEGLI_NATIVE_ENDIAN && IsLittleEndian()));
-    size_t offset = start_offset + idx * bytes_per_sample;
-    Check(offset < data.size());
-    const uint8_t* p = &data[offset];
-    if (im.data_type == JPEGLI_TYPE_UINT8) {
-      static const double mul8 = 1.0 / 255.0;
-      return p[0] * mul8;
-    } else if (im.data_type == JPEGLI_TYPE_UINT16) {
-      static const double mul16 = 1.0 / 65535.0;
-      return (is_little_endian ? LoadLE16(p) : LoadBE16(p)) * mul16;
-    } else if (im.data_type == JPEGLI_TYPE_FLOAT) {
-      return (is_little_endian ? LoadLEFloat(p) : LoadBEFloat(p));
-    }
-    return 0.0;
-  };
-  double diff2 = 0.0;
-  size_t num_samples = 0;
-  if (max_diff) *max_diff = 0.0;
-  if (!input.pixels.empty() && !output.pixels.empty()) {
-    num_samples = num_lines * stride;
-    for (size_t i = 0; i < num_samples; ++i) {
-      double sample_orig = get_sample(input, input.pixels, i);
-      double sample_output = get_sample(output, output.pixels, i);
-      double diff = sample_orig - sample_output;
-      if (max_diff) *max_diff = std::max(*max_diff, 255.0 * std::abs(diff));
-      diff2 += diff * diff;
-    }
-  } else {
-    Check(!input.raw_data.empty());
-    Check(!output.raw_data.empty());
-    for (size_t c = 0; c < input.raw_data.size(); ++c) {
-      Check(c < output.raw_data.size());
-      num_samples += input.raw_data[c].size();
-      for (size_t i = 0; i < input.raw_data[c].size(); ++i) {
-        double sample_orig = get_sample(input, input.raw_data[c], i);
-        double sample_output = get_sample(output, output.raw_data[c], i);
-        double diff = sample_orig - sample_output;
-        if (max_diff) *max_diff = std::max(*max_diff, 255.0 * std::abs(diff));
-        diff2 += diff * diff;
-      }
-    }
-  }
-  return std::sqrt(diff2 / num_samples) * 255.0;
-}
-
-double DistanceRms(const TestImage& input, const TestImage& output,
-                   double* max_diff) {
-  return DistanceRms(input, output, 0, output.ysize, max_diff);
-}
-
-void VerifyOutputImage(const TestImage& input, const TestImage& output,
-                       size_t start_line, size_t num_lines, double max_rms,
-                       double max_diff) {
-  double max_d;
-  double rms = DistanceRms(input, output, start_line, num_lines, &max_d);
-  printf("rms: %f, max_rms: %f, max_d: %f,  max_diff: %f\n", rms, max_rms,
-         max_d, max_diff);
-  Check(rms <= max_rms);
-  Check(max_d <= max_diff);
-}
-
-void VerifyOutputImage(const TestImage& input, const TestImage& output,
-                       double max_rms, double max_diff) {
-  Check(output.xsize == input.xsize);
-  Check(output.ysize == input.ysize);
-  Check(output.components == input.components);
-  Check(output.color_space == input.color_space);
-  if (!input.coeffs.empty()) {
-    Check(input.coeffs.size() == input.components);
-    Check(output.coeffs.size() == input.components);
-    for (size_t c = 0; c < input.components; ++c) {
-      Check(output.coeffs[c].size() == input.coeffs[c].size());
-      Check(0 == memcmp(input.coeffs[c].data(), output.coeffs[c].data(),
-                        input.coeffs[c].size()));
-    }
-  } else {
-    VerifyOutputImage(input, output, 0, output.ysize, max_rms, max_diff);
-  }
-}
-
-}  // namespace jpegli
diff --git a/third_party/jpeg-xl/lib/jpegli/test_utils.h b/third_party/jpeg-xl/lib/jpegli/test_utils.h
deleted file mode 100644
index 0ebd7ffbc8224..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/test_utils.h
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_TEST_UTILS_H_
-#define LIB_JPEGLI_TEST_UTILS_H_
-
-#include <cstddef>
-#include <cstdint>
-#include <string>
-#include <vector>
-
-#include "lib/jpegli/test_params.h"
-#include "lib/jpegli/types.h"
-#include "lib/jxl/base/include_jpeglib.h"  // NOLINT
-#include "lib/jxl/base/status.h"
-
-namespace jpegli {
-
-#define ERROR_HANDLER_SETUP(flavor)                                \
-  jpeg_error_mgr jerr;                                             \
-  jmp_buf env;                                                     \
-  cinfo.err = flavor##_std_error(&jerr);                           \
-  if (setjmp(env)) {                                               \
-    return false;                                                  \
-  }                                                                \
-  cinfo.client_data = reinterpret_cast<void*>(&env);               \
-  cinfo.err->error_exit = [](j_common_ptr cinfo) {                 \
-    (*cinfo->err->output_message)(cinfo);                          \
-    jmp_buf* env = reinterpret_cast<jmp_buf*>(cinfo->client_data); \
-    flavor##_destroy(cinfo);                                       \
-    longjmp(*env, 1);                                              \
-  };
-
-std::string IOMethodName(JpegliDataType data_type, JpegliEndianness endianness);
-
-std::string ColorSpaceName(J_COLOR_SPACE colorspace);
-
-std::ostream& operator<<(std::ostream& os, const TestImage& input);
-
-std::ostream& operator<<(std::ostream& os, const CompressParams& jparams);
-
-int NumTestScanScripts();
-
-void VerifyHeader(const CompressParams& jparams, j_decompress_ptr cinfo);
-void VerifyScanHeader(const CompressParams& jparams, j_decompress_ptr cinfo);
-
-void SetDecompressParams(const DecompressParams& dparams,
-                         j_decompress_ptr cinfo);
-
-void SetScanDecompressParams(const DecompressParams& dparams,
-                             j_decompress_ptr cinfo, int scan_number);
-
-void CopyCoefficients(j_decompress_ptr cinfo, jvirt_barray_ptr* coef_arrays,
-                      TestImage* output);
-
-void UnmapColors(uint8_t* row, size_t xsize, int components,
-                 JSAMPARRAY colormap, size_t num_colors);
-
-std::string GetTestDataPath(const std::string& filename);
-jxl::StatusOr<std::vector<uint8_t>> ReadTestData(const std::string& filename);
-
-class PNMParser {
- public:
-  explicit PNMParser(const uint8_t* data, const size_t len)
-      : pos_(data), end_(data + len) {}
-
-  // Sets "pos" to the first non-header byte/pixel on success.
-  bool ParseHeader(const uint8_t** pos, size_t* xsize, size_t* ysize,
-                   size_t* num_channels, size_t* bitdepth);
-
- private:
-  static bool IsLineBreak(const uint8_t c) { return c == '\r' || c == '\n'; }
-  static bool IsWhitespace(const uint8_t c) {
-    return IsLineBreak(c) || c == '\t' || c == ' ';
-  }
-
-  bool ParseUnsigned(size_t* number);
-
-  bool SkipWhitespace();
-
-  const uint8_t* pos_;
-  const uint8_t* const end_;
-};
-
-bool ReadPNM(const std::vector<uint8_t>& data, size_t* xsize, size_t* ysize,
-             size_t* num_channels, size_t* bitdepth,
-             std::vector<uint8_t>* pixels);
-
-jxl::Status SetNumChannels(J_COLOR_SPACE colorspace, size_t* channels);
-
-void ConvertToGrayscale(TestImage* img);
-
-void GeneratePixels(TestImage* img);
-
-void GenerateRawData(const CompressParams& jparams, TestImage* img);
-
-void GenerateCoeffs(const CompressParams& jparams, TestImage* img);
-
-void EncodeWithJpegli(const TestImage& input, const CompressParams& jparams,
-                      j_compress_ptr cinfo);
-
-bool EncodeWithJpegli(const TestImage& input, const CompressParams& jparams,
-                      std::vector<uint8_t>* compressed);
-
-double DistanceRms(const TestImage& input, const TestImage& output,
-                   size_t start_line, size_t num_lines,
-                   double* max_diff = nullptr);
-
-double DistanceRms(const TestImage& input, const TestImage& output,
-                   double* max_diff = nullptr);
-
-void VerifyOutputImage(const TestImage& input, const TestImage& output,
-                       size_t start_line, size_t num_lines, double max_rms,
-                       double max_diff = 255.0);
-
-void VerifyOutputImage(const TestImage& input, const TestImage& output,
-                       double max_rms, double max_diff = 255.0);
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_TEST_UTILS_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/testing.h b/third_party/jpeg-xl/lib/jpegli/testing.h
deleted file mode 100644
index 58df563f06644..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/testing.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_TESTING_H_
-#define LIB_JPEGLI_TESTING_H_
-
-// GTest specific macros / wrappers.
-
-#include "gtest/gtest.h"
-
-// googletest before 1.10 didn't define INSTANTIATE_TEST_SUITE_P() but instead
-// used INSTANTIATE_TEST_CASE_P which is now deprecated.
-#ifdef INSTANTIATE_TEST_SUITE_P
-#define JPEGLI_INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_SUITE_P
-#else
-#define JPEGLI_INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-#endif
-
-// Replacement for ASSERT_TRUE inside try-catch blocks.
-#define JPEGLI_TEST_ENSURE_TRUE(C) \
-  if (!(C)) return false;
-
-#define QUIT(M) FAIL() << M
-
-// Ensures that we don't make our test bounds too lax, effectively disabling the
-// tests.
-#define EXPECT_SLIGHTLY_BELOW(A, E)       \
-  {                                       \
-    double _actual = (A);                 \
-    double _expected = (E);               \
-    EXPECT_LE(_actual, _expected);        \
-    EXPECT_GE(_actual, 0.75 * _expected); \
-  }
-
-#endif  // LIB_JPEGLI_TESTING_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/transcode_api_test.cc b/third_party/jpeg-xl/lib/jpegli/transcode_api_test.cc
deleted file mode 100644
index 42d7e4f7fe324..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/transcode_api_test.cc
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
-#include <ostream>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include "lib/jpegli/decode.h"
-#include "lib/jpegli/encode.h"
-#include "lib/jpegli/libjpeg_test_util.h"
-#include "lib/jpegli/test_params.h"
-#include "lib/jpegli/test_utils.h"
-#include "lib/jpegli/testing.h"
-
-namespace jpegli {
-namespace {
-
-void TranscodeWithJpegli(const std::vector<uint8_t>& jpeg_input,
-                         const CompressParams& jparams,
-                         std::vector<uint8_t>* jpeg_output) {
-  jpeg_decompress_struct dinfo = {};
-  jpeg_compress_struct cinfo = {};
-  uint8_t* transcoded_data = nullptr;
-  unsigned long transcoded_size;  // NOLINT
-  const auto try_catch_block = [&]() -> bool {
-    ERROR_HANDLER_SETUP(jpegli);
-    dinfo.err = cinfo.err;
-    dinfo.client_data = cinfo.client_data;
-    jpegli_create_decompress(&dinfo);
-    jpegli_mem_src(&dinfo, jpeg_input.data(), jpeg_input.size());
-    EXPECT_EQ(JPEG_REACHED_SOS,
-              jpegli_read_header(&dinfo, /*require_image=*/TRUE));
-    jvirt_barray_ptr* coef_arrays = jpegli_read_coefficients(&dinfo);
-    JPEGLI_TEST_ENSURE_TRUE(coef_arrays != nullptr);
-    jpegli_create_compress(&cinfo);
-    jpegli_mem_dest(&cinfo, &transcoded_data, &transcoded_size);
-    jpegli_copy_critical_parameters(&dinfo, &cinfo);
-    jpegli_set_progressive_level(&cinfo, jparams.progressive_mode);
-    cinfo.optimize_coding = jparams.optimize_coding;
-    jpegli_write_coefficients(&cinfo, coef_arrays);
-    jpegli_finish_compress(&cinfo);
-    jpegli_finish_decompress(&dinfo);
-    return true;
-  };
-  ASSERT_TRUE(try_catch_block());
-  jpegli_destroy_decompress(&dinfo);
-  jpegli_destroy_compress(&cinfo);
-  if (transcoded_data) {
-    jpeg_output->assign(transcoded_data, transcoded_data + transcoded_size);
-    free(transcoded_data);
-  }
-}
-
-struct TestConfig {
-  TestImage input;
-  CompressParams jparams;
-};
-
-class TranscodeAPITestParam : public ::testing::TestWithParam<TestConfig> {};
-
-TEST_P(TranscodeAPITestParam, TestAPI) {
-  TestConfig config = GetParam();
-  CompressParams& jparams = config.jparams;
-  GeneratePixels(&config.input);
-
-  // Start with sequential non-optimized jpeg.
-  jparams.progressive_mode = 0;
-  jparams.optimize_coding = 0;
-  std::vector<uint8_t> compressed;
-  ASSERT_TRUE(EncodeWithJpegli(config.input, jparams, &compressed));
-  TestImage output0;
-  DecodeWithLibjpeg(jparams, DecompressParams(), compressed, &output0);
-
-  // Transcode first to a sequential optimized jpeg, and then further to
-  // a progressive jpeg.
-  for (int progr : {0, 2}) {
-    std::vector<uint8_t> transcoded;
-    jparams.progressive_mode = progr;
-    jparams.optimize_coding = 1;
-    TranscodeWithJpegli(compressed, jparams, &transcoded);
-
-    // We expect a size reduction of at least 2%.
-    EXPECT_LT(transcoded.size(), compressed.size() * 0.98f);
-
-    // Verify that transcoding is lossless.
-    TestImage output1;
-    DecodeWithLibjpeg(jparams, DecompressParams(), transcoded, &output1);
-    ASSERT_EQ(output0.pixels.size(), output1.pixels.size());
-    EXPECT_EQ(0, memcmp(output0.pixels.data(), output1.pixels.data(),
-                        output0.pixels.size()));
-    compressed = transcoded;
-  }
-}
-
-std::vector<TestConfig> GenerateTests() {
-  std::vector<TestConfig> all_tests;
-  const size_t xsize0 = 1024;
-  const size_t ysize0 = 768;
-  for (int dxsize : {0, 1, 8, 9}) {
-    for (int dysize : {0, 1, 8, 9}) {
-      for (int h_sampling : {1, 2}) {
-        for (int v_sampling : {1, 2}) {
-          TestConfig config;
-          config.input.xsize = xsize0 + dxsize;
-          config.input.ysize = ysize0 + dysize;
-          config.jparams.h_sampling = {h_sampling, 1, 1};
-          config.jparams.v_sampling = {v_sampling, 1, 1};
-          all_tests.push_back(config);
-        }
-      }
-    }
-  }
-  return all_tests;
-}
-
-std::ostream& operator<<(std::ostream& os, const TestConfig& c) {
-  os << c.input;
-  os << c.jparams;
-  return os;
-}
-
-std::string TestDescription(
-    const testing::TestParamInfo<TranscodeAPITestParam::ParamType>& info) {
-  std::stringstream name;
-  name << info.param;
-  return name.str();
-}
-
-JPEGLI_INSTANTIATE_TEST_SUITE_P(TranscodeAPITest, TranscodeAPITestParam,
-                                testing::ValuesIn(GenerateTests()),
-                                TestDescription);
-
-}  // namespace
-}  // namespace jpegli
diff --git a/third_party/jpeg-xl/lib/jpegli/transpose-inl.h b/third_party/jpeg-xl/lib/jpegli/transpose-inl.h
deleted file mode 100644
index cdc289f96c4c8..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/transpose-inl.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#if defined(LIB_JPEGLI_TRANSPOSE_INL_H_) == defined(HWY_TARGET_TOGGLE)
-#ifdef LIB_JPEGLI_TRANSPOSE_INL_H_
-#undef LIB_JPEGLI_TRANSPOSE_INL_H_
-#else
-#define LIB_JPEGLI_TRANSPOSE_INL_H_
-#endif
-
-#include "lib/jxl/base/compiler_specific.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jpegli {
-namespace HWY_NAMESPACE {
-namespace {
-
-#if HWY_CAP_GE256
-JXL_INLINE void Transpose8x8Block(const float* JXL_RESTRICT from,
-                                  float* JXL_RESTRICT to) {
-  const HWY_CAPPED(float, 8) d;
-  auto i0 = Load(d, from);
-  auto i1 = Load(d, from + 1 * 8);
-  auto i2 = Load(d, from + 2 * 8);
-  auto i3 = Load(d, from + 3 * 8);
-  auto i4 = Load(d, from + 4 * 8);
-  auto i5 = Load(d, from + 5 * 8);
-  auto i6 = Load(d, from + 6 * 8);
-  auto i7 = Load(d, from + 7 * 8);
-
-  const auto q0 = InterleaveLower(d, i0, i2);
-  const auto q1 = InterleaveLower(d, i1, i3);
-  const auto q2 = InterleaveUpper(d, i0, i2);
-  const auto q3 = InterleaveUpper(d, i1, i3);
-  const auto q4 = InterleaveLower(d, i4, i6);
-  const auto q5 = InterleaveLower(d, i5, i7);
-  const auto q6 = InterleaveUpper(d, i4, i6);
-  const auto q7 = InterleaveUpper(d, i5, i7);
-
-  const auto r0 = InterleaveLower(d, q0, q1);
-  const auto r1 = InterleaveUpper(d, q0, q1);
-  const auto r2 = InterleaveLower(d, q2, q3);
-  const auto r3 = InterleaveUpper(d, q2, q3);
-  const auto r4 = InterleaveLower(d, q4, q5);
-  const auto r5 = InterleaveUpper(d, q4, q5);
-  const auto r6 = InterleaveLower(d, q6, q7);
-  const auto r7 = InterleaveUpper(d, q6, q7);
-
-  i0 = ConcatLowerLower(d, r4, r0);
-  i1 = ConcatLowerLower(d, r5, r1);
-  i2 = ConcatLowerLower(d, r6, r2);
-  i3 = ConcatLowerLower(d, r7, r3);
-  i4 = ConcatUpperUpper(d, r4, r0);
-  i5 = ConcatUpperUpper(d, r5, r1);
-  i6 = ConcatUpperUpper(d, r6, r2);
-  i7 = ConcatUpperUpper(d, r7, r3);
-
-  Store(i0, d, to);
-  Store(i1, d, to + 1 * 8);
-  Store(i2, d, to + 2 * 8);
-  Store(i3, d, to + 3 * 8);
-  Store(i4, d, to + 4 * 8);
-  Store(i5, d, to + 5 * 8);
-  Store(i6, d, to + 6 * 8);
-  Store(i7, d, to + 7 * 8);
-}
-#elif HWY_TARGET != HWY_SCALAR
-JXL_INLINE void Transpose8x8Block(const float* JXL_RESTRICT from,
-                                  float* JXL_RESTRICT to) {
-  const HWY_CAPPED(float, 4) d;
-  for (size_t n = 0; n < 8; n += 4) {
-    for (size_t m = 0; m < 8; m += 4) {
-      auto p0 = Load(d, from + n * 8 + m);
-      auto p1 = Load(d, from + (n + 1) * 8 + m);
-      auto p2 = Load(d, from + (n + 2) * 8 + m);
-      auto p3 = Load(d, from + (n + 3) * 8 + m);
-      const auto q0 = InterleaveLower(d, p0, p2);
-      const auto q1 = InterleaveLower(d, p1, p3);
-      const auto q2 = InterleaveUpper(d, p0, p2);
-      const auto q3 = InterleaveUpper(d, p1, p3);
-
-      const auto r0 = InterleaveLower(d, q0, q1);
-      const auto r1 = InterleaveUpper(d, q0, q1);
-      const auto r2 = InterleaveLower(d, q2, q3);
-      const auto r3 = InterleaveUpper(d, q2, q3);
-      Store(r0, d, to + m * 8 + n);
-      Store(r1, d, to + (1 + m) * 8 + n);
-      Store(r2, d, to + (2 + m) * 8 + n);
-      Store(r3, d, to + (3 + m) * 8 + n);
-    }
-  }
-}
-#else
-static JXL_INLINE void Transpose8x8Block(const float* JXL_RESTRICT from,
-                                         float* JXL_RESTRICT to) {
-  for (size_t n = 0; n < 8; ++n) {
-    for (size_t m = 0; m < 8; ++m) {
-      to[8 * n + m] = from[8 * m + n];
-    }
-  }
-}
-#endif
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace
-}  // namespace HWY_NAMESPACE
-}  // namespace jpegli
-HWY_AFTER_NAMESPACE();
-#endif  // LIB_JPEGLI_TRANSPOSE_INL_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/types.h b/third_party/jpeg-xl/lib/jpegli/types.h
deleted file mode 100644
index c0c0450c1865d..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/types.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_TYPES_H_
-#define LIB_JPEGLI_TYPES_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//
-// New API structs and functions that are not available in libjpeg
-//
-// NOTE: This part of the API is still experimental and will probably change in
-// the future.
-//
-
-typedef enum {
-  JPEGLI_TYPE_FLOAT = 0,
-  JPEGLI_TYPE_UINT8 = 2,
-  JPEGLI_TYPE_UINT16 = 3,
-} JpegliDataType;
-
-typedef enum {
-  JPEGLI_NATIVE_ENDIAN = 0,
-  JPEGLI_LITTLE_ENDIAN = 1,
-  JPEGLI_BIG_ENDIAN = 2,
-} JpegliEndianness;
-
-int jpegli_bytes_per_sample(JpegliDataType data_type);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#endif  // LIB_JPEGLI_TYPES_H_
diff --git a/third_party/jpeg-xl/lib/jpegli/upsample.cc b/third_party/jpeg-xl/lib/jpegli/upsample.cc
deleted file mode 100644
index 7dae841b8a359..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/upsample.cc
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jpegli/upsample.h"
-
-#include <string.h>
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jpegli/upsample.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-HWY_BEFORE_NAMESPACE();
-namespace jpegli {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::MulAdd;
-using hwy::HWY_NAMESPACE::Vec;
-
-#if HWY_CAP_GE512
-using hwy::HWY_NAMESPACE::Half;
-using hwy::HWY_NAMESPACE::Vec;
-template <size_t i, class DF, class V>
-HWY_INLINE Vec<Half<Half<DF>>> Quarter(const DF df, V v) {
-  using HF = Half<DF>;
-  using HHF = Half<HF>;
-  auto half = i >= 2 ? UpperHalf(HF(), v) : LowerHalf(HF(), v);
-  return i & 1 ? UpperHalf(HHF(), half) : LowerHalf(HHF(), half);
-}
-
-template <class DF, class V>
-HWY_INLINE Vec<DF> Concat4(const DF df, V v0, V v1, V v2, V v3) {
-  using HF = Half<DF>;
-  return Combine(DF(), Combine(HF(), v3, v2), Combine(HF(), v1, v0));
-}
-
-#endif
-
-// Stores v0[0], v1[0], v0[1], v1[1], ... to mem, in this order. Mem must be
-// aligned.
-template <class DF, class V, typename T>
-void StoreInterleaved(const DF df, V v0, V v1, T* mem) {
-  static_assert(sizeof(T) == 4, "only use StoreInterleaved for 4-byte types");
-#if HWY_TARGET == HWY_SCALAR
-  Store(v0, df, mem);
-  Store(v1, df, mem + 1);
-#elif !HWY_CAP_GE256
-  Store(InterleaveLower(df, v0, v1), df, mem);
-  Store(InterleaveUpper(df, v0, v1), df, mem + Lanes(df));
-#else
-  if (!HWY_CAP_GE512 || Lanes(df) == 8) {
-    auto t0 = InterleaveLower(df, v0, v1);
-    auto t1 = InterleaveUpper(df, v0, v1);
-    Store(ConcatLowerLower(df, t1, t0), df, mem);
-    Store(ConcatUpperUpper(df, t1, t0), df, mem + Lanes(df));
-  } else {
-#if HWY_CAP_GE512
-    auto t0 = InterleaveLower(df, v0, v1);
-    auto t1 = InterleaveUpper(df, v0, v1);
-    Store(Concat4(df, Quarter<0>(df, t0), Quarter<0>(df, t1),
-                  Quarter<1>(df, t0), Quarter<1>(df, t1)),
-          df, mem);
-    Store(Concat4(df, Quarter<2>(df, t0), Quarter<2>(df, t1),
-                  Quarter<3>(df, t0), Quarter<3>(df, t1)),
-          df, mem + Lanes(df));
-#endif
-  }
-#endif
-}
-
-void Upsample2Horizontal(float* JXL_RESTRICT row,
-                         float* JXL_RESTRICT scratch_space, size_t len_out) {
-  HWY_FULL(float) df;
-  auto threefour = Set(df, 0.75f);
-  auto onefour = Set(df, 0.25f);
-  const size_t len_in = (len_out + 1) >> 1;
-  memcpy(scratch_space, row, len_in * sizeof(row[0]));
-  scratch_space[-1] = scratch_space[0];
-  scratch_space[len_in] = scratch_space[len_in - 1];
-  for (size_t x = 0; x < len_in; x += Lanes(df)) {
-    auto current = Mul(Load(df, scratch_space + x), threefour);
-    auto prev = LoadU(df, scratch_space + x - 1);
-    auto next = LoadU(df, scratch_space + x + 1);
-    auto left = MulAdd(onefour, prev, current);
-    auto right = MulAdd(onefour, next, current);
-    StoreInterleaved(df, left, right, row + x * 2);
-  }
-}
-
-void Upsample2Vertical(const float* JXL_RESTRICT row_top,
-                       const float* JXL_RESTRICT row_mid,
-                       const float* JXL_RESTRICT row_bot,
-                       float* JXL_RESTRICT row_out0,
-                       float* JXL_RESTRICT row_out1, size_t len) {
-  HWY_FULL(float) df;
-  auto threefour = Set(df, 0.75f);
-  auto onefour = Set(df, 0.25f);
-  for (size_t x = 0; x < len; x += Lanes(df)) {
-    auto it = Load(df, row_top + x);
-    auto im = Load(df, row_mid + x);
-    auto ib = Load(df, row_bot + x);
-    auto im_scaled = Mul(im, threefour);
-    Store(MulAdd(it, onefour, im_scaled), df, row_out0 + x);
-    Store(MulAdd(ib, onefour, im_scaled), df, row_out1 + x);
-  }
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jpegli
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jpegli {
-
-HWY_EXPORT(Upsample2Horizontal);
-HWY_EXPORT(Upsample2Vertical);
-
-void Upsample2Horizontal(float* JXL_RESTRICT row,
-                         float* JXL_RESTRICT scratch_space, size_t len_out) {
-  HWY_DYNAMIC_DISPATCH(Upsample2Horizontal)(row, scratch_space, len_out);
-}
-
-void Upsample2Vertical(const float* JXL_RESTRICT row_top,
-                       const float* JXL_RESTRICT row_mid,
-                       const float* JXL_RESTRICT row_bot,
-                       float* JXL_RESTRICT row_out0,
-                       float* JXL_RESTRICT row_out1, size_t len) {
-  HWY_DYNAMIC_DISPATCH(Upsample2Vertical)
-  (row_top, row_mid, row_bot, row_out0, row_out1, len);
-}
-}  // namespace jpegli
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jpegli/upsample.h b/third_party/jpeg-xl/lib/jpegli/upsample.h
deleted file mode 100644
index 1a057208dcc25..0000000000000
--- a/third_party/jpeg-xl/lib/jpegli/upsample.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JPEGLI_UPSAMPLE_H_
-#define LIB_JPEGLI_UPSAMPLE_H_
-
-#include <stddef.h>
-
-#include "lib/jxl/base/compiler_specific.h"
-
-namespace jpegli {
-
-void Upsample2Horizontal(float* JXL_RESTRICT row,
-                         float* JXL_RESTRICT scratch_space, size_t len_out);
-
-void Upsample2Vertical(const float* JXL_RESTRICT row_top,
-                       const float* JXL_RESTRICT row_mid,
-                       const float* JXL_RESTRICT row_bot,
-                       float* JXL_RESTRICT row_out0,
-                       float* JXL_RESTRICT row_out1, size_t len);
-
-}  // namespace jpegli
-
-#endif  // LIB_JPEGLI_UPSAMPLE_H_
diff --git a/third_party/jpeg-xl/lib/jxl.cmake b/third_party/jpeg-xl/lib/jxl.cmake
deleted file mode 100644
index 59b2cca4265ab..0000000000000
--- a/third_party/jpeg-xl/lib/jxl.cmake
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include(jxl_lists.cmake)
-
-if (JPEGXL_ENABLE_TOOLS OR JPEGXL_ENABLE_DEVTOOLS OR JPEGXL_ENABLE_BOXES)
-list(APPEND JPEGXL_INTERNAL_DEC_SOURCES ${JPEGXL_INTERNAL_DEC_BOX_SOURCES})
-endif()
-
-if (JPEGXL_ENABLE_TRANSCODE_JPEG OR JPEGXL_ENABLE_TOOLS OR JPEGXL_ENABLE_DEVTOOLS)
-list(APPEND JPEGXL_INTERNAL_DEC_SOURCES ${JPEGXL_INTERNAL_DEC_JPEG_SOURCES})
-endif()
-
-set(FJXL_COMPILE_FLAGS "-O3")
-
-set_source_files_properties(jxl/enc_fast_lossless.cc PROPERTIES COMPILE_FLAGS "${FJXL_COMPILE_FLAGS}")
-
-set(JPEGXL_DEC_INTERNAL_LIBS
-  hwy
-  Threads::Threads
-  ${ATOMICS_LIBRARIES}
-)
-
-if (JPEGXL_ENABLE_TRANSCODE_JPEG OR JPEGXL_ENABLE_BOXES)
-list(APPEND JPEGXL_DEC_INTERNAL_LIBS brotlidec brotlicommon)
-endif()
-
-set(JPEGXL_INTERNAL_LIBS
-  ${JPEGXL_DEC_INTERNAL_LIBS}
-  brotlienc
-)
-
-if (JPEGXL_ENABLE_TRANSCODE_JPEG)
-  list(APPEND JPEGXL_INTERNAL_FLAGS -DJPEGXL_ENABLE_TRANSCODE_JPEG=1)
-else()
-  list(APPEND JPEGXL_INTERNAL_FLAGS -DJPEGXL_ENABLE_TRANSCODE_JPEG=0)
-endif ()
-
-if (JPEGXL_ENABLE_BOXES)
-  list(APPEND JPEGXL_INTERNAL_FLAGS -DJPEGXL_ENABLE_BOXES=1)
-else()
-  list(APPEND JPEGXL_INTERNAL_FLAGS -DJPEGXL_ENABLE_BOXES=0)
-endif ()
-
-set(OBJ_COMPILE_DEFINITIONS
-  # Used to determine if we are building the library when defined or just
-  # including the library when not defined. This is public so libjxl shared
-  # library gets this define too.
-  JXL_INTERNAL_LIBRARY_BUILD
-)
-
-# Generate version.h
-configure_file("jxl/version.h.in" "include/jxl/version.h")
-
-list(APPEND JPEGXL_INTERNAL_PUBLIC_HEADERS
-  ${CMAKE_CURRENT_BINARY_DIR}/include/jxl/version.h)
-
-# Headers for exporting/importing public headers
-include(GenerateExportHeader)
-
-# CMake does not allow generate_export_header for INTERFACE library, so we
-# add this stub library just for file generation.
-add_library(jxl_export OBJECT ${JPEGXL_INTERNAL_PUBLIC_HEADERS} nothing.cc)
-set_target_properties(jxl_export PROPERTIES
-  CXX_VISIBILITY_PRESET hidden
-  VISIBILITY_INLINES_HIDDEN 1
-  DEFINE_SYMBOL JXL_INTERNAL_LIBRARY_BUILD
-  LINKER_LANGUAGE CXX
-)
-generate_export_header(jxl_export
-  BASE_NAME JXL
-  EXPORT_FILE_NAME include/jxl/jxl_export.h)
-# Place all public headers in a single directory.
-foreach(path ${JPEGXL_INTERNAL_PUBLIC_HEADERS})
-  configure_file(
-    ${path}
-    ${path}
-    COPYONLY
-  )
-endforeach()
-
-add_library(jxl_base INTERFACE)
-target_include_directories(jxl_base SYSTEM BEFORE INTERFACE
-  "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
-)
-target_include_directories(jxl_base BEFORE INTERFACE
-  ${PROJECT_SOURCE_DIR}
-  ${JXL_HWY_INCLUDE_DIRS}
-)
-
-# On android, link with log to use android-related log functions.
-if(CMAKE_SYSTEM_NAME STREQUAL "Android")
-  find_library(log-lib log)
-  if(log-lib)
-    target_link_libraries(jxl_base INTERFACE ${log-lib})
-    target_compile_definitions(jxl_base INTERFACE USE_ANDROID_LOGGER)
-  endif()
-endif()
-
-add_dependencies(jxl_base jxl_export)
-
-# Decoder-only object library
-add_library(jxl_dec-obj OBJECT ${JPEGXL_INTERNAL_DEC_SOURCES})
-target_compile_options(jxl_dec-obj PRIVATE ${JPEGXL_INTERNAL_FLAGS})
-target_compile_options(jxl_dec-obj PUBLIC ${JPEGXL_COVERAGE_FLAGS})
-set_property(TARGET jxl_dec-obj PROPERTY POSITION_INDEPENDENT_CODE ON)
-target_include_directories(jxl_dec-obj BEFORE PUBLIC
-  "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>"
-  "${JXL_HWY_INCLUDE_DIRS}"
-  "$<BUILD_INTERFACE:$<TARGET_PROPERTY:brotlicommon,INTERFACE_INCLUDE_DIRECTORIES>>"
-)
-target_compile_definitions(jxl_dec-obj PUBLIC
-  ${OBJ_COMPILE_DEFINITIONS}
-)
-target_link_libraries(jxl_dec-obj PUBLIC jxl_base)
-
-# Object library. This is used to hold the set of objects and properties.
-add_library(jxl_enc-obj OBJECT ${JPEGXL_INTERNAL_ENC_SOURCES})
-target_compile_options(jxl_enc-obj PRIVATE ${JPEGXL_INTERNAL_FLAGS})
-target_compile_options(jxl_enc-obj PUBLIC ${JPEGXL_COVERAGE_FLAGS})
-set_property(TARGET jxl_enc-obj PROPERTY POSITION_INDEPENDENT_CODE ON)
-target_include_directories(jxl_enc-obj BEFORE PUBLIC
-  ${PROJECT_SOURCE_DIR}
-  ${JXL_HWY_INCLUDE_DIRS}
-  $<TARGET_PROPERTY:brotlicommon,INTERFACE_INCLUDE_DIRECTORIES>
-)
-target_compile_definitions(jxl_enc-obj PUBLIC
-  ${OBJ_COMPILE_DEFINITIONS}
-)
-target_link_libraries(jxl_enc-obj PUBLIC jxl_base)
-
-set_target_properties(jxl_dec-obj PROPERTIES
-  CXX_VISIBILITY_PRESET hidden
-  VISIBILITY_INLINES_HIDDEN 1
-  DEFINE_SYMBOL JXL_INTERNAL_LIBRARY_BUILD
-)
-
-set_target_properties(jxl_enc-obj PROPERTIES
-  CXX_VISIBILITY_PRESET hidden
-  VISIBILITY_INLINES_HIDDEN 1
-  DEFINE_SYMBOL JXL_INTERNAL_LIBRARY_BUILD
-)
-
-# Private static library. This exposes all the internal functions and is used
-# for tests.
-add_library(jxl_dec-internal STATIC
-  $<TARGET_OBJECTS:jxl_dec-obj>
-  ${JXL_CMS_OBJECTS}
-)
-target_link_libraries(jxl_dec-internal PUBLIC
-  ${JPEGXL_COVERAGE_FLAGS}
-  ${JPEGXL_DEC_INTERNAL_LIBS}
-  jxl_base
-)
-
-# The list of objects in the static and shared libraries.
-set(JPEGXL_INTERNAL_OBJECTS
-  $<TARGET_OBJECTS:jxl_enc-obj>
-  $<TARGET_OBJECTS:jxl_dec-obj>
-)
-
-# Private static library. This exposes all the internal functions and is used
-# for tests.
-# TODO(lode): once the source files are correctly split so that it is possible
-# to do, remove $<TARGET_OBJECTS:jxl_dec-obj> here and depend on jxl_dec-internal
-add_library(jxl-internal STATIC
-  ${JPEGXL_INTERNAL_OBJECTS}
-)
-target_link_libraries(jxl-internal PUBLIC
-  ${JPEGXL_COVERAGE_FLAGS}
-  ${JPEGXL_INTERNAL_LIBS}
-  jxl_cms
-  jxl_base
-)
-target_include_directories(jxl-internal BEFORE PUBLIC
-  "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>")
-
-target_compile_definitions(jxl-internal INTERFACE -DJXL_STATIC_DEFINE)
-target_compile_definitions(jxl_dec-internal INTERFACE -DJXL_STATIC_DEFINE)
-target_compile_definitions(jxl-internal INTERFACE -DJXL_STATIC_DEFINE)
-target_compile_definitions(jxl_dec-internal INTERFACE -DJXL_STATIC_DEFINE)
-
-# TODO(deymo): Move TCMalloc linkage to the tools/ directory since the library
-# shouldn't do any allocs anyway.
-if(JPEGXL_ENABLE_TCMALLOC)
-  pkg_check_modules(TCMallocMinimal REQUIRED IMPORTED_TARGET
-      libtcmalloc_minimal)
-  # tcmalloc 2.8 has concurrency issues that makes it sometimes return nullptr
-  # for large allocs. See https://github.com/gperftools/gperftools/issues/1204
-  # for details.
-  if(TCMallocMinimal_VERSION VERSION_EQUAL 2.8)
-    message(FATAL_ERROR
-        "tcmalloc version 2.8 has a concurrency bug. You have installed "
-        "version ${TCMallocMinimal_VERSION}, please either downgrade tcmalloc "
-        "to version 2.7, upgrade to 2.8.1 or newer or pass "
-        "-DJPEGXL_ENABLE_TCMALLOC=OFF to jpeg-xl cmake line. See the following "
-        "bug for details:\n"
-        "   https://github.com/gperftools/gperftools/issues/1204\n")
-  endif()
-  target_link_libraries(jxl-internal PUBLIC PkgConfig::TCMallocMinimal)
-endif()  # JPEGXL_ENABLE_TCMALLOC
-
-# Public library.
-add_library(jxl ${JPEGXL_INTERNAL_OBJECTS})
-strip_internal(JPEGXL_INTERNAL_SHARED_LIBS JPEGXL_INTERNAL_LIBS)
-target_link_libraries(jxl PUBLIC ${JPEGXL_COVERAGE_FLAGS} jxl_base)
-target_link_libraries(jxl PUBLIC jxl_cms)
-target_link_libraries(jxl PRIVATE ${JPEGXL_INTERNAL_SHARED_LIBS})
-set_target_properties(jxl PROPERTIES
-  VERSION ${JPEGXL_LIBRARY_VERSION}
-  SOVERSION ${JPEGXL_LIBRARY_SOVERSION})
-
-# Public decoder library.
-add_library(jxl_dec $<TARGET_OBJECTS:jxl_dec-obj>)
-strip_internal(JPEGXL_DEC_INTERNAL_SHARED_LIBS JPEGXL_DEC_INTERNAL_LIBS)
-target_link_libraries(jxl_dec PUBLIC ${JPEGXL_COVERAGE_FLAGS} jxl_base)
-target_link_libraries(jxl_dec PRIVATE ${JPEGXL_DEC_INTERNAL_SHARED_LIBS})
-set_target_properties(jxl_dec PROPERTIES
-  VERSION ${JPEGXL_LIBRARY_VERSION}
-  SOVERSION ${JPEGXL_LIBRARY_SOVERSION})
-
-# Check whether the linker support excluding libs
-set(LINKER_EXCLUDE_LIBS_FLAG "-Wl,--exclude-libs=ALL")
-include(CheckCSourceCompiles)
-list(APPEND CMAKE_EXE_LINKER_FLAGS ${LINKER_EXCLUDE_LIBS_FLAG})
-check_c_source_compiles("int main(){return 0;}" LINKER_SUPPORT_EXCLUDE_LIBS)
-list(REMOVE_ITEM CMAKE_EXE_LINKER_FLAGS ${LINKER_EXCLUDE_LIBS_FLAG})
-
-if(NOT BUILD_SHARED_LIBS)
-  target_compile_definitions(jxl PUBLIC -DJXL_STATIC_DEFINE)
-  target_compile_definitions(jxl_dec PUBLIC -DJXL_STATIC_DEFINE)
-endif()
-
-# Add a jxl.version file as a version script to tag symbols with the
-# appropriate version number. This script is also used to limit what's exposed
-# in the shared library from the static dependencies bundled here.
-foreach(target IN ITEMS jxl jxl_dec)
-  set_target_properties(${target} PROPERTIES
-      LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/jxl/jxl.version)
-  if(APPLE)
-  set_property(TARGET ${target} APPEND_STRING PROPERTY
-      LINK_FLAGS "-Wl,-exported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/jxl/jxl_osx.syms")
-  elseif(WIN32)
-    # Nothing needed here, we use __declspec(dllexport) (jxl_export.h)
-  else()
-  set_property(TARGET ${target} APPEND_STRING PROPERTY
-      LINK_FLAGS " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/jxl/jxl.version")
-  endif()  # APPLE
-  # This hides the default visibility symbols from static libraries bundled into
-  # the shared library. In particular this prevents exposing symbols from hwy
-  # and skcms in the shared library.
-  if(LINKER_SUPPORT_EXCLUDE_LIBS)
-    set_property(TARGET ${target} APPEND_STRING PROPERTY
-        LINK_FLAGS " ${LINKER_EXCLUDE_LIBS_FLAG}")
-  endif()
-endforeach()
-
-# Only install libjxl public library. The libjxl_dec is not installed since it
-# contains symbols also in libjxl which would conflict if programs try to use
-# both.
-install(TARGETS jxl
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-# Add a pkg-config file for libjxl.
-set(JPEGXL_LIBRARY_REQUIRES
-    "libhwy libbrotlienc libbrotlidec libjxl_cms")
-
-if (BUILD_SHARED_LIBS)
-  set(JPEGXL_REQUIRES_TYPE "Requires.private")
-  set(JPEGXL_PRIVATE_LIBS "-lm ${PKGCONFIG_CXX_LIB}")
-else()
-  set(JPEGXL_REQUIRES_TYPE "Requires")
-  set(JPEGXL_PUBLIC_LIBS "-lm ${PKGCONFIG_CXX_LIB}")
-endif()
-
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/jxl/libjxl.pc.in"
-               "libjxl.pc" @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libjxl.pc"
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
diff --git a/third_party/jpeg-xl/lib/jxl/ac_context.h b/third_party/jpeg-xl/lib/jxl/ac_context.h
deleted file mode 100644
index 6529a9bb88bcb..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/ac_context.h
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_AC_CONTEXT_H_
-#define LIB_JXL_AC_CONTEXT_H_
-
-#include <algorithm>
-#include <vector>
-
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/coeff_order_fwd.h"
-
-namespace jxl {
-
-// Block context used for scanning order, number of non-zeros, AC coefficients.
-// Equal to the channel.
-constexpr uint32_t kDCTOrderContextStart = 0;
-
-// The number of predicted nonzeros goes from 0 to 1008. We use
-// ceil(log2(predicted+1)) as a context for the number of nonzeros, so from 0 to
-// 10, inclusive.
-constexpr uint32_t kNonZeroBuckets = 37;
-
-static const uint16_t kCoeffFreqContext[64] = {
-    0xBAD, 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14,
-    15,    15, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
-    23,    23, 23, 23, 24, 24, 24, 24, 25, 25, 25, 25, 26, 26, 26, 26,
-    27,    27, 27, 27, 28, 28, 28, 28, 29, 29, 29, 29, 30, 30, 30, 30,
-};
-
-static const uint16_t kCoeffNumNonzeroContext[64] = {
-    0xBAD, 0,   31,  62,  62,  93,  93,  93,  93,  123, 123, 123, 123,
-    152,   152, 152, 152, 152, 152, 152, 152, 180, 180, 180, 180, 180,
-    180,   180, 180, 180, 180, 180, 180, 206, 206, 206, 206, 206, 206,
-    206,   206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206,
-    206,   206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206,
-};
-
-// Supremum of ZeroDensityContext(x, y) + 1, when x + y < 64.
-constexpr int kZeroDensityContextCount = 458;
-// Supremum of ZeroDensityContext(x, y) + 1.
-constexpr int kZeroDensityContextLimit = 474;
-
-/* This function is used for entropy-sources pre-clustering.
- *
- * Ideally, each combination of |nonzeros_left| and |k| should go to its own
- * bucket; but it implies (64 * 63 / 2) == 2016 buckets. If there is other
- * dimension (e.g. block context), then number of primary clusters becomes too
- * big.
- *
- * To solve this problem, |nonzeros_left| and |k| values are clustered. It is
- * known that their sum is at most 64, consequently, the total number buckets
- * is at most A(64) * B(64).
- */
-// TODO(user): investigate, why disabling pre-clustering makes entropy code
-// less dense. Perhaps we would need to add HQ clustering algorithm that would
-// be able to squeeze better by spending more CPU cycles.
-static JXL_INLINE size_t ZeroDensityContext(size_t nonzeros_left, size_t k,
-                                            size_t covered_blocks,
-                                            size_t log2_covered_blocks,
-                                            size_t prev) {
-  JXL_DASSERT((static_cast<size_t>(1) << log2_covered_blocks) ==
-              covered_blocks);
-  nonzeros_left = (nonzeros_left + covered_blocks - 1) >> log2_covered_blocks;
-  k >>= log2_covered_blocks;
-  JXL_DASSERT(k > 0);
-  JXL_DASSERT(k < 64);
-  JXL_DASSERT(nonzeros_left > 0);
-  // Asserting nonzeros_left + k < 65 here causes crashes in debug mode with
-  // invalid input, since the (hot) decoding loop does not check this condition.
-  // As no out-of-bound memory reads are issued even if that condition is
-  // broken, we check this simpler condition which holds anyway. The decoder
-  // will still mark a file in which that condition happens as not valid at the
-  // end of the decoding loop, as `nzeros` will not be `0`.
-  JXL_DASSERT(nonzeros_left < 64);
-  return (kCoeffNumNonzeroContext[nonzeros_left] + kCoeffFreqContext[k]) * 2 +
-         prev;
-}
-
-struct BlockCtxMap {
-  std::vector<int> dc_thresholds[3];
-  std::vector<uint32_t> qf_thresholds;
-  std::vector<uint8_t> ctx_map;
-  size_t num_ctxs, num_dc_ctxs;
-
-  static constexpr uint8_t kDefaultCtxMap[] = {
-      // Default ctx map clusters all the large transforms together.
-      0, 1, 2, 2, 3,  3,  4,  5,  6,  6,  6,  6,  6,   //
-      7, 8, 9, 9, 10, 11, 12, 13, 14, 14, 14, 14, 14,  //
-      7, 8, 9, 9, 10, 11, 12, 13, 14, 14, 14, 14, 14,  //
-  };
-  static_assert(3 * kNumOrders ==
-                    sizeof(kDefaultCtxMap) / sizeof *kDefaultCtxMap,
-                "Update default context map");
-
-  size_t Context(int dc_idx, uint32_t qf, size_t ord, size_t c) const {
-    size_t qf_idx = 0;
-    for (uint32_t t : qf_thresholds) {
-      if (qf > t) qf_idx++;
-    }
-    size_t idx = c < 2 ? c ^ 1 : 2;
-    idx = idx * kNumOrders + ord;
-    idx = idx * (qf_thresholds.size() + 1) + qf_idx;
-    idx = idx * num_dc_ctxs + dc_idx;
-    return ctx_map[idx];
-  }
-  // Non-zero context is based on number of non-zeros and block context.
-  // For better clustering, contexts with same number of non-zeros are grouped.
-  constexpr uint32_t ZeroDensityContextsOffset(uint32_t block_ctx) const {
-    return static_cast<uint32_t>(num_ctxs * kNonZeroBuckets +
-                                 kZeroDensityContextCount * block_ctx);
-  }
-
-  // Context map for AC coefficients consists of 2 blocks:
-  //  |num_ctxs x                : context for number of non-zeros in the block
-  //   kNonZeroBuckets|            computed from block context and predicted
-  //                               value (based top and left values)
-  //  |num_ctxs x                : context for AC coefficient symbols,
-  //   kZeroDensityContextCount|   computed from block context,
-  //                               number of non-zeros left and
-  //                               index in scan order
-  constexpr uint32_t NumACContexts() const {
-    return static_cast<uint32_t>(num_ctxs *
-                                 (kNonZeroBuckets + kZeroDensityContextCount));
-  }
-
-  // Non-zero context is based on number of non-zeros and block context.
-  // For better clustering, contexts with same number of non-zeros are grouped.
-  inline uint32_t NonZeroContext(uint32_t non_zeros, uint32_t block_ctx) const {
-    uint32_t ctx;
-    if (non_zeros >= 64) non_zeros = 64;
-    if (non_zeros < 8) {
-      ctx = non_zeros;
-    } else {
-      ctx = 4 + non_zeros / 2;
-    }
-    return static_cast<uint32_t>(ctx * num_ctxs + block_ctx);
-  }
-
-  BlockCtxMap() {
-    ctx_map.assign(std::begin(kDefaultCtxMap), std::end(kDefaultCtxMap));
-    num_ctxs = *std::max_element(ctx_map.begin(), ctx_map.end()) + 1;
-    num_dc_ctxs = 1;
-  }
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_AC_CONTEXT_H_
diff --git a/third_party/jpeg-xl/lib/jxl/ac_strategy.cc b/third_party/jpeg-xl/lib/jxl/ac_strategy.cc
deleted file mode 100644
index 69e8ae6f470c1..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/ac_strategy.cc
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/ac_strategy.h"
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <cstring>
-#include <utility>
-
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/base/compiler_specific.h"
-
-namespace jxl {
-
-// Tries to generalize zig-zag order to non-square blocks. Surprisingly, in
-// square block frequency along the (i + j == const) diagonals is roughly the
-// same. For historical reasons, consecutive diagonals are traversed
-// in alternating directions - so called "zig-zag" (or "snake") order.
-template <bool is_lut>
-static void CoeffOrderAndLut(AcStrategy acs, coeff_order_t* out) {
-  size_t cx = acs.covered_blocks_x();
-  size_t cy = acs.covered_blocks_y();
-  CoefficientLayout(&cy, &cx);
-
-  // CoefficientLayout ensures cx >= cy.
-  // We compute the zigzag order for a cx x cx block, then discard all the
-  // lines that are not multiple of the ratio between cx and cy.
-  size_t xs = cx / cy;
-  size_t xsm = xs - 1;
-  size_t xss = CeilLog2Nonzero(xs);
-  // First half of the block
-  size_t cur = cx * cy;
-  for (size_t i = 0; i < cx * kBlockDim; i++) {
-    for (size_t j = 0; j <= i; j++) {
-      size_t x = j;
-      size_t y = i - j;
-      if (i % 2) std::swap(x, y);
-      if ((y & xsm) != 0) continue;
-      y >>= xss;
-      size_t val = 0;
-      if (x < cx && y < cy) {
-        val = y * cx + x;
-      } else {
-        val = cur++;
-      }
-      if (is_lut) {
-        out[y * cx * kBlockDim + x] = val;
-      } else {
-        out[val] = y * cx * kBlockDim + x;
-      }
-    }
-  }
-  // Second half
-  for (size_t ip = cx * kBlockDim - 1; ip > 0; ip--) {
-    size_t i = ip - 1;
-    for (size_t j = 0; j <= i; j++) {
-      size_t x = cx * kBlockDim - 1 - (i - j);
-      size_t y = cx * kBlockDim - 1 - j;
-      if (i % 2) std::swap(x, y);
-      if ((y & xsm) != 0) continue;
-      y >>= xss;
-      size_t val = cur++;
-      if (is_lut) {
-        out[y * cx * kBlockDim + x] = val;
-      } else {
-        out[val] = y * cx * kBlockDim + x;
-      }
-    }
-  }
-}
-
-void AcStrategy::ComputeNaturalCoeffOrder(coeff_order_t* order) const {
-  CoeffOrderAndLut</*is_lut=*/false>(*this, order);
-}
-void AcStrategy::ComputeNaturalCoeffOrderLut(coeff_order_t* lut) const {
-  CoeffOrderAndLut</*is_lut=*/true>(*this, lut);
-}
-
-#if JXL_CXX_LANG < JXL_CXX_17
-constexpr size_t AcStrategy::kMaxCoeffBlocks;
-constexpr size_t AcStrategy::kMaxBlockDim;
-constexpr size_t AcStrategy::kMaxCoeffArea;
-#endif
-
-StatusOr<AcStrategyImage> AcStrategyImage::Create(
-    JxlMemoryManager* memory_manager, size_t xsize, size_t ysize) {
-  AcStrategyImage img;
-  JXL_ASSIGN_OR_RETURN(img.layers_,
-                       ImageB::Create(memory_manager, xsize, ysize));
-  img.row_ = img.layers_.Row(0);
-  img.stride_ = img.layers_.PixelsPerRow();
-  return img;
-}
-
-size_t AcStrategyImage::CountBlocks(AcStrategyType type) const {
-  size_t ret = 0;
-  for (size_t y = 0; y < layers_.ysize(); y++) {
-    const uint8_t* JXL_RESTRICT row = layers_.ConstRow(y);
-    for (size_t x = 0; x < layers_.xsize(); x++) {
-      if (row[x] == ((static_cast<uint8_t>(type) << 1) | 1)) ret++;
-    }
-  }
-  return ret;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/ac_strategy.h b/third_party/jpeg-xl/lib/jxl/ac_strategy.h
deleted file mode 100644
index 8c3191c791a90..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/ac_strategy.h
+++ /dev/null
@@ -1,275 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_AC_STRATEGY_H_
-#define LIB_JXL_AC_STRATEGY_H_
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <hwy/base.h>  // kMaxVectorSize
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/coeff_order_fwd.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_ops.h"
-
-// Defines the different kinds of transforms, and heuristics to choose between
-// them.
-// `AcStrategy` represents what transform should be used, and which sub-block of
-// that transform we are currently in. Note that DCT4x4 is applied on all four
-// 4x4 sub-blocks of an 8x8 block.
-// `AcStrategyImage` defines which strategy should be used for each 8x8 block
-// of the image. The highest 4 bits represent the strategy to be used, the
-// lowest 4 represent the index of the block inside that strategy.
-
-namespace jxl {
-
-// Raw strategy types.
-enum class AcStrategyType : uint32_t {
-  // Regular block size DCT
-  DCT = 0,
-  // Encode pixels without transforming
-  IDENTITY = 1,
-  // Use 2-by-2 DCT
-  DCT2X2 = 2,
-  // Use 4-by-4 DCT
-  DCT4X4 = 3,
-  // Use 16-by-16 DCT
-  DCT16X16 = 4,
-  // Use 32-by-32 DCT
-  DCT32X32 = 5,
-  // Use 16-by-8 DCT
-  DCT16X8 = 6,
-  // Use 8-by-16 DCT
-  DCT8X16 = 7,
-  // Use 32-by-8 DCT
-  DCT32X8 = 8,
-  // Use 8-by-32 DCT
-  DCT8X32 = 9,
-  // Use 32-by-16 DCT
-  DCT32X16 = 10,
-  // Use 16-by-32 DCT
-  DCT16X32 = 11,
-  // 4x8 and 8x4 DCT
-  DCT4X8 = 12,
-  DCT8X4 = 13,
-  // Corner-DCT.
-  AFV0 = 14,
-  AFV1 = 15,
-  AFV2 = 16,
-  AFV3 = 17,
-  // Larger DCTs
-  DCT64X64 = 18,
-  DCT64X32 = 19,
-  DCT32X64 = 20,
-  // No transforms smaller than 64x64 are allowed below.
-  DCT128X128 = 21,
-  DCT128X64 = 22,
-  DCT64X128 = 23,
-  DCT256X256 = 24,
-  DCT256X128 = 25,
-  DCT128X256 = 26
-};
-
-class AcStrategy {
- public:
-  // Extremal values for the number of blocks/coefficients of a single strategy.
-  static constexpr size_t kMaxCoeffBlocks = 32;
-  static constexpr size_t kMaxBlockDim = kBlockDim * kMaxCoeffBlocks;
-  // Maximum number of coefficients in a block. Guaranteed to be a multiple of
-  // the vector size.
-  static constexpr size_t kMaxCoeffArea = kMaxBlockDim * kMaxBlockDim;
-  static_assert((kMaxCoeffArea * sizeof(float)) % hwy::kMaxVectorSize == 0,
-                "Coefficient area is not a multiple of vector size");
-
-  static constexpr uint8_t kNumValidStrategies =
-      static_cast<uint8_t>(AcStrategyType::DCT128X256) + 1;
-
-  static constexpr uint32_t TypeBit(const AcStrategyType type) {
-    return 1u << static_cast<uint32_t>(type);
-  }
-
-  // Returns true if this block is the first 8x8 block (i.e. top-left) of a
-  // possibly multi-block strategy.
-  JXL_INLINE bool IsFirstBlock() const { return is_first_; }
-
-  JXL_INLINE bool IsMultiblock() const {
-    constexpr uint32_t bits =
-        TypeBit(AcStrategyType::DCT16X16) | TypeBit(AcStrategyType::DCT32X32) |
-        TypeBit(AcStrategyType::DCT16X8) | TypeBit(AcStrategyType::DCT8X16) |
-        TypeBit(AcStrategyType::DCT32X8) | TypeBit(AcStrategyType::DCT8X32) |
-        TypeBit(AcStrategyType::DCT16X32) | TypeBit(AcStrategyType::DCT32X16) |
-        TypeBit(AcStrategyType::DCT32X64) | TypeBit(AcStrategyType::DCT64X32) |
-        TypeBit(AcStrategyType::DCT64X64) | TypeBit(AcStrategyType::DCT64X128) |
-        TypeBit(AcStrategyType::DCT128X64) |
-        TypeBit(AcStrategyType::DCT128X128) |
-        TypeBit(AcStrategyType::DCT128X256) |
-        TypeBit(AcStrategyType::DCT256X128) |
-        TypeBit(AcStrategyType::DCT256X256);
-    return ((1u << static_cast<uint32_t>(Strategy())) & bits) != 0;
-  }
-
-  // Returns the raw strategy value. Should only be used for tokenization.
-  JXL_INLINE uint8_t RawStrategy() const {
-    return static_cast<uint8_t>(strategy_);
-  }
-
-  JXL_INLINE AcStrategyType Strategy() const { return strategy_; }
-
-  // Inverse check
-  static JXL_INLINE constexpr bool IsRawStrategyValid(int raw_strategy) {
-    return raw_strategy < kNumValidStrategies && raw_strategy >= 0;
-  }
-  static JXL_INLINE AcStrategy FromRawStrategy(uint8_t raw_strategy) {
-    return FromRawStrategy(static_cast<AcStrategyType>(raw_strategy));
-  }
-  static JXL_INLINE AcStrategy FromRawStrategy(AcStrategyType raw_strategy) {
-    JXL_DASSERT(IsRawStrategyValid(static_cast<uint32_t>(raw_strategy)));
-    return AcStrategy(raw_strategy, /*is_first=*/true);
-  }
-
-  // "Natural order" means the order of increasing of "anisotropic" frequency of
-  // continuous version of DCT basis.
-  // Round-trip, for any given strategy s:
-  //  X = NaturalCoeffOrder(s)[NaturalCoeffOrderLutN(s)[X]]
-  //  X = NaturalCoeffOrderLut(s)[NaturalCoeffOrderN(s)[X]]
-  void ComputeNaturalCoeffOrder(coeff_order_t* order) const;
-  void ComputeNaturalCoeffOrderLut(coeff_order_t* lut) const;
-
-  // Number of 8x8 blocks that this strategy will cover. 0 for non-top-left
-  // blocks inside a multi-block transform.
-  JXL_INLINE size_t covered_blocks_x() const {
-    static constexpr uint8_t kLut[] = {1, 1, 1, 1,  2, 4,  1,  2,  1,
-                                       4, 2, 4, 1,  1, 1,  1,  1,  1,
-                                       8, 4, 8, 16, 8, 16, 32, 16, 32};
-    static_assert(sizeof(kLut) / sizeof(*kLut) == kNumValidStrategies,
-                  "Update LUT");
-    return kLut[static_cast<size_t>(strategy_)];
-  }
-
-  JXL_INLINE size_t covered_blocks_y() const {
-    static constexpr uint8_t kLut[] = {1, 1, 1, 1,  2,  4, 2,  1,  4,
-                                       1, 4, 2, 1,  1,  1, 1,  1,  1,
-                                       8, 8, 4, 16, 16, 8, 32, 32, 16};
-    static_assert(sizeof(kLut) / sizeof(*kLut) == kNumValidStrategies,
-                  "Update LUT");
-    return kLut[static_cast<size_t>(strategy_)];
-  }
-
-  JXL_INLINE size_t log2_covered_blocks() const {
-    static constexpr uint8_t kLut[] = {0, 0, 0, 0, 2, 4, 1,  1, 2,
-                                       2, 3, 3, 0, 0, 0, 0,  0, 0,
-                                       6, 5, 5, 8, 7, 7, 10, 9, 9};
-    static_assert(sizeof(kLut) / sizeof(*kLut) == kNumValidStrategies,
-                  "Update LUT");
-    return kLut[static_cast<size_t>(strategy_)];
-  }
-
- private:
-  friend class AcStrategyRow;
-  JXL_INLINE AcStrategy(AcStrategyType strategy, bool is_first)
-      : strategy_(strategy), is_first_(is_first) {
-    JXL_DASSERT(IsMultiblock() || is_first == true);
-  }
-
-  AcStrategyType strategy_;
-  bool is_first_;
-};
-
-// Class to use a certain row of the AC strategy.
-class AcStrategyRow {
- public:
-  explicit AcStrategyRow(const uint8_t* row) : row_(row) {}
-  AcStrategy operator[](size_t x) const {
-    AcStrategyType strategy = static_cast<AcStrategyType>(row_[x] >> 1);
-    bool is_first = static_cast<bool>(row_[x] & 1);
-    return AcStrategy(strategy, is_first);
-  }
-
- private:
-  const uint8_t* JXL_RESTRICT row_;
-};
-
-class AcStrategyImage {
- public:
-  AcStrategyImage() = default;
-  static StatusOr<AcStrategyImage> Create(JxlMemoryManager* memory_manager,
-                                          size_t xsize, size_t ysize);
-
-  AcStrategyImage(AcStrategyImage&&) = default;
-  AcStrategyImage& operator=(AcStrategyImage&&) = default;
-
-  void FillDCT8(const Rect& rect) {
-    FillPlane<uint8_t>((static_cast<uint8_t>(AcStrategyType::DCT) << 1) | 1,
-                       &layers_, rect);
-  }
-  void FillDCT8() { FillDCT8(Rect(layers_)); }
-
-  void FillInvalid() { FillImage(INVALID, &layers_); }
-
-  Status Set(size_t x, size_t y, AcStrategyType type) {
-#if (JXL_IS_DEBUG_BUILD)
-    AcStrategy acs = AcStrategy::FromRawStrategy(type);
-    JXL_DASSERT(y + acs.covered_blocks_y() <= layers_.ysize());
-    JXL_DASSERT(x + acs.covered_blocks_x() <= layers_.xsize());
-#endif
-    JXL_RETURN_IF_ERROR(SetNoBoundsCheck(x, y, type, /*check=*/false));
-    return true;
-  }
-
-  Status SetNoBoundsCheck(size_t x, size_t y, AcStrategyType type,
-                          bool check = true) {
-    AcStrategy acs = AcStrategy::FromRawStrategy(type);
-    for (size_t iy = 0; iy < acs.covered_blocks_y(); iy++) {
-      for (size_t ix = 0; ix < acs.covered_blocks_x(); ix++) {
-        size_t pos = (y + iy) * stride_ + x + ix;
-        if (check && row_[pos] != INVALID) {
-          return JXL_FAILURE("Invalid AC strategy: block overlap");
-        }
-        row_[pos] =
-            (static_cast<uint8_t>(type) << 1) | ((iy | ix) == 0 ? 1 : 0);
-      }
-    }
-    return true;
-  }
-
-  bool IsValid(size_t x, size_t y) { return row_[y * stride_ + x] != INVALID; }
-
-  AcStrategyRow ConstRow(size_t y, size_t x_prefix = 0) const {
-    return AcStrategyRow(layers_.ConstRow(y) + x_prefix);
-  }
-
-  AcStrategyRow ConstRow(const Rect& rect, size_t y) const {
-    return ConstRow(rect.y0() + y, rect.x0());
-  }
-
-  size_t PixelsPerRow() const { return layers_.PixelsPerRow(); }
-
-  size_t xsize() const { return layers_.xsize(); }
-  size_t ysize() const { return layers_.ysize(); }
-
-  // Count the number of blocks of a given type.
-  size_t CountBlocks(AcStrategyType type) const;
-
-  JxlMemoryManager* memory_manager() const { return layers_.memory_manager(); }
-
- private:
-  ImageB layers_;
-  uint8_t* JXL_RESTRICT row_;
-  size_t stride_;
-
-  // A value that does not represent a valid combined AC strategy
-  // value. Used as a sentinel.
-  static constexpr uint8_t INVALID = 0xFF;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_AC_STRATEGY_H_
diff --git a/third_party/jpeg-xl/lib/jxl/ac_strategy_test.cc b/third_party/jpeg-xl/lib/jxl/ac_strategy_test.cc
deleted file mode 100644
index e6405fc86b25a..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/ac_strategy_test.cc
+++ /dev/null
@@ -1,271 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/ac_strategy.h"
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <cstring>
-#include <hwy/base.h>  // HWY_ALIGN_MAX
-#include <hwy/tests/hwy_gtest.h>
-
-#include "lib/jxl/base/random.h"
-#include "lib/jxl/coeff_order_fwd.h"
-#include "lib/jxl/dec_transforms_testonly.h"
-#include "lib/jxl/enc_transforms.h"
-#include "lib/jxl/memory_manager_internal.h"
-#include "lib/jxl/simd_util.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-// Test that DCT -> IDCT is a noop.
-class AcStrategyRoundtrip : public ::hwy::TestWithParamTargetAndT<int> {
- protected:
-  void Run() {
-    JxlMemoryManager* memory_manager = test::MemoryManager();
-    const AcStrategyType type = static_cast<AcStrategyType>(GetParam());
-    const AcStrategy acs = AcStrategy::FromRawStrategy(type);
-    const size_t dct_scratch_size =
-        3 * (MaxVectorSize() / sizeof(float)) * AcStrategy::kMaxBlockDim;
-
-    size_t mem_bytes =
-        (4 * AcStrategy::kMaxCoeffArea + dct_scratch_size) * sizeof(float);
-    JXL_TEST_ASSIGN_OR_DIE(AlignedMemory mem,
-                           AlignedMemory::Create(memory_manager, mem_bytes));
-    float* coeffs = mem.address<float>();
-    float* idct = coeffs + AcStrategy::kMaxCoeffArea;
-    float* input = idct + AcStrategy::kMaxCoeffArea;
-    float* scratch_space = input + AcStrategy::kMaxCoeffArea;
-
-    Rng rng(static_cast<uint64_t>(type) * 65537 + 13);
-
-    for (size_t j = 0; j < 64; j++) {
-      size_t i = (acs.log2_covered_blocks()
-                      ? rng.UniformU(0, 64u << acs.log2_covered_blocks())
-                      : j);
-      std::fill_n(input, AcStrategy::kMaxCoeffArea, 0);
-      input[i] = 0.2f;
-      TransformFromPixels(type, input, acs.covered_blocks_x() * 8, coeffs,
-                          scratch_space);
-      ASSERT_NEAR(coeffs[0], 0.2 / (64 << acs.log2_covered_blocks()), 1e-6)
-          << " i = " << i;
-      TransformToPixels(type, coeffs, idct, acs.covered_blocks_x() * 8,
-                        scratch_space);
-      for (size_t j = 0; j < 64u << acs.log2_covered_blocks(); j++) {
-        ASSERT_NEAR(idct[j], j == i ? 0.2f : 0, 2e-6)
-            << "j = " << j << " i = " << i << " acs " << static_cast<int>(type);
-      }
-    }
-    // Test DC.
-    std::fill_n(idct, AcStrategy::kMaxCoeffArea, 0);
-    for (size_t y = 0; y < acs.covered_blocks_y(); y++) {
-      for (size_t x = 0; x < acs.covered_blocks_x(); x++) {
-        float* dc = idct + AcStrategy::kMaxCoeffArea;
-        std::fill_n(dc, AcStrategy::kMaxCoeffArea, 0);
-        dc[y * acs.covered_blocks_x() * 8 + x] = 0.2;
-        LowestFrequenciesFromDC(type, dc, acs.covered_blocks_x() * 8, coeffs,
-                                scratch_space);
-        DCFromLowestFrequencies(type, coeffs, idct, acs.covered_blocks_x() * 8);
-        std::fill_n(dc, AcStrategy::kMaxCoeffArea, 0);
-        dc[y * acs.covered_blocks_x() * 8 + x] = 0.2;
-        for (size_t j = 0; j < 64u << acs.log2_covered_blocks(); j++) {
-          ASSERT_NEAR(idct[j], dc[j], 1e-6)
-              << "j = " << j << " x = " << x << " y = " << y << " acs "
-              << static_cast<int>(type);
-        }
-      }
-    }
-  }
-};
-
-HWY_TARGET_INSTANTIATE_TEST_SUITE_P_T(
-    AcStrategyRoundtrip,
-    ::testing::Range(0, static_cast<int>(AcStrategy::kNumValidStrategies)));
-
-TEST_P(AcStrategyRoundtrip, Test) { Run(); }
-
-// Test that DC(2x2) -> DCT coefficients -> IDCT -> downsampled IDCT is a noop.
-class AcStrategyRoundtripDownsample
-    : public ::hwy::TestWithParamTargetAndT<int> {
- protected:
-  void Run() {
-    JxlMemoryManager* memory_manager = test::MemoryManager();
-    const AcStrategyType type = static_cast<AcStrategyType>(GetParam());
-    const AcStrategy acs = AcStrategy::FromRawStrategy(type);
-    const size_t dct_scratch_size =
-        3 * (MaxVectorSize() / sizeof(float)) * AcStrategy::kMaxBlockDim;
-
-    size_t mem_bytes =
-        (4 * AcStrategy::kMaxCoeffArea + dct_scratch_size) * sizeof(float);
-    JXL_TEST_ASSIGN_OR_DIE(AlignedMemory mem,
-                           AlignedMemory::Create(memory_manager, mem_bytes));
-    float* coeffs = mem.address<float>();
-    float* idct = coeffs + AcStrategy::kMaxCoeffArea;
-    float* dc = idct + AcStrategy::kMaxCoeffArea;
-    float* scratch_space = dc + AcStrategy::kMaxCoeffArea;
-
-    std::fill_n(coeffs, AcStrategy::kMaxCoeffArea, 0.0f);
-    Rng rng(static_cast<uint64_t>(type) * 65537 + 13);
-
-    for (size_t y = 0; y < acs.covered_blocks_y(); y++) {
-      for (size_t x = 0; x < acs.covered_blocks_x(); x++) {
-        if (x > 4 || y > 4) {
-          if (rng.Bernoulli(0.9f)) continue;
-        }
-        std::fill_n(dc, AcStrategy::kMaxCoeffArea, 0);
-        dc[y * acs.covered_blocks_x() * 8 + x] = 0.2f;
-        LowestFrequenciesFromDC(type, dc, acs.covered_blocks_x() * 8, coeffs,
-                                scratch_space);
-        TransformToPixels(type, coeffs, idct, acs.covered_blocks_x() * 8,
-                          scratch_space);
-        std::fill_n(coeffs, AcStrategy::kMaxCoeffArea, 0.0f);
-        std::fill_n(dc, AcStrategy::kMaxCoeffArea, 0);
-        dc[y * acs.covered_blocks_x() * 8 + x] = 0.2f;
-        // Downsample
-        for (size_t dy = 0; dy < acs.covered_blocks_y(); dy++) {
-          for (size_t dx = 0; dx < acs.covered_blocks_x(); dx++) {
-            float sum = 0;
-            for (size_t iy = 0; iy < 8; iy++) {
-              for (size_t ix = 0; ix < 8; ix++) {
-                sum += idct[(dy * 8 + iy) * 8 * acs.covered_blocks_x() +
-                            dx * 8 + ix];
-              }
-            }
-            sum /= 64.0f;
-            ASSERT_NEAR(sum, dc[dy * 8 * acs.covered_blocks_x() + dx], 1e-6)
-                << "acs " << static_cast<int>(type);
-          }
-        }
-      }
-    }
-  }
-};
-
-HWY_TARGET_INSTANTIATE_TEST_SUITE_P_T(
-    AcStrategyRoundtripDownsample,
-    ::testing::Range(0, static_cast<int>(AcStrategy::kNumValidStrategies)));
-
-TEST_P(AcStrategyRoundtripDownsample, Test) { Run(); }
-
-// Test that IDCT(block with zeros in the non-topleft corner) -> downsampled
-// IDCT is the same as IDCT -> DC(2x2) of the same block.
-class AcStrategyDownsample : public ::hwy::TestWithParamTargetAndT<int> {
- protected:
-  void Run() {
-    JxlMemoryManager* memory_manager = test::MemoryManager();
-    const AcStrategyType type = static_cast<AcStrategyType>(GetParam());
-    const AcStrategy acs = AcStrategy::FromRawStrategy(type);
-    const size_t dct_scratch_size =
-        3 * (MaxVectorSize() / sizeof(float)) * AcStrategy::kMaxBlockDim;
-    size_t cx = acs.covered_blocks_y();
-    size_t cy = acs.covered_blocks_x();
-    CoefficientLayout(&cy, &cx);
-
-    size_t mem_bytes =
-        (4 * AcStrategy::kMaxCoeffArea + dct_scratch_size) * sizeof(float);
-    JXL_TEST_ASSIGN_OR_DIE(AlignedMemory mem,
-                           AlignedMemory::Create(memory_manager, mem_bytes));
-    float* idct = mem.address<float>();
-    float* idct_acs_downsampled = idct + AcStrategy::kMaxCoeffArea;
-    float* coeffs = idct + AcStrategy::kMaxCoeffArea;
-    float* scratch_space = coeffs + AcStrategy::kMaxCoeffArea;
-
-    Rng rng(static_cast<uint64_t>(type) * 65537 + 13);
-
-    for (size_t y = 0; y < cy; y++) {
-      for (size_t x = 0; x < cx; x++) {
-        if (x > 4 || y > 4) {
-          if (rng.Bernoulli(0.9f)) continue;
-        }
-        float* coeffs = idct + AcStrategy::kMaxCoeffArea;
-        std::fill_n(coeffs, AcStrategy::kMaxCoeffArea, 0);
-        coeffs[y * cx * 8 + x] = 0.2f;
-        TransformToPixels(type, coeffs, idct, acs.covered_blocks_x() * 8,
-                          scratch_space);
-        std::fill_n(coeffs, AcStrategy::kMaxCoeffArea, 0);
-        coeffs[y * cx * 8 + x] = 0.2f;
-        DCFromLowestFrequencies(type, coeffs, idct_acs_downsampled,
-                                acs.covered_blocks_x() * 8);
-        // Downsample
-        for (size_t dy = 0; dy < acs.covered_blocks_y(); dy++) {
-          for (size_t dx = 0; dx < acs.covered_blocks_x(); dx++) {
-            float sum = 0;
-            for (size_t iy = 0; iy < 8; iy++) {
-              for (size_t ix = 0; ix < 8; ix++) {
-                sum += idct[(dy * 8 + iy) * 8 * acs.covered_blocks_x() +
-                            dx * 8 + ix];
-              }
-            }
-            sum /= 64;
-            ASSERT_NEAR(
-                sum, idct_acs_downsampled[dy * 8 * acs.covered_blocks_x() + dx],
-                1e-6)
-                << " acs " << static_cast<int>(type);
-          }
-        }
-      }
-    }
-  }
-};
-
-HWY_TARGET_INSTANTIATE_TEST_SUITE_P_T(
-    AcStrategyDownsample,
-    ::testing::Range(0, static_cast<int>(AcStrategy::kNumValidStrategies)));
-
-TEST_P(AcStrategyDownsample, Test) { Run(); }
-
-class AcStrategyTargetTest : public ::hwy::TestWithParamTarget {};
-HWY_TARGET_INSTANTIATE_TEST_SUITE_P(AcStrategyTargetTest);
-
-TEST_P(AcStrategyTargetTest, RoundtripAFVDCT) {
-  HWY_ALIGN_MAX float idct[16];
-  for (size_t i = 0; i < 16; i++) {
-    HWY_ALIGN_MAX float pixels[16] = {};
-    pixels[i] = 1;
-    HWY_ALIGN_MAX float coeffs[16] = {};
-
-    AFVDCT4x4(pixels, coeffs);
-    AFVIDCT4x4(coeffs, idct);
-    for (size_t j = 0; j < 16; j++) {
-      EXPECT_NEAR(idct[j], pixels[j], 1e-6);
-    }
-  }
-}
-
-TEST_P(AcStrategyTargetTest, BenchmarkAFV) {
-  JxlMemoryManager* memory_manager = test::MemoryManager();
-  const AcStrategyType type = AcStrategyType::AFV0;
-  HWY_ALIGN_MAX float pixels[64] = {1};
-  HWY_ALIGN_MAX float coeffs[64] = {};
-  const size_t dct_scratch_size =
-      3 * (MaxVectorSize() / sizeof(float)) * AcStrategy::kMaxBlockDim;
-  size_t mem_bytes = (64 + dct_scratch_size) * sizeof(float);
-  JXL_TEST_ASSIGN_OR_DIE(AlignedMemory mem,
-                         AlignedMemory::Create(memory_manager, mem_bytes));
-  float* scratch_space = mem.address<float>();
-  for (size_t i = 0; i < 1 << 14; i++) {
-    TransformToPixels(type, coeffs, pixels, 8, scratch_space);
-    TransformFromPixels(type, pixels, 8, coeffs, scratch_space);
-  }
-  EXPECT_NEAR(pixels[0], 0.0, 1E-6);
-}
-
-TEST_P(AcStrategyTargetTest, BenchmarkAFVDCT) {
-  HWY_ALIGN_MAX float pixels[64] = {1};
-  HWY_ALIGN_MAX float coeffs[64] = {};
-  for (size_t i = 0; i < 1 << 14; i++) {
-    AFVDCT4x4(pixels, coeffs);
-    AFVIDCT4x4(coeffs, pixels);
-  }
-  EXPECT_NEAR(pixels[0], 1.0, 1E-6);
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/alpha.cc b/third_party/jpeg-xl/lib/jxl/alpha.cc
deleted file mode 100644
index 48d7e7ee921f9..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/alpha.cc
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/alpha.h"
-
-#include <string.h>
-
-#include <algorithm>
-
-namespace jxl {
-
-static float Clamp(float x) { return std::max(std::min(1.0f, x), 0.0f); }
-
-void PerformAlphaBlending(const AlphaBlendingInputLayer& bg,
-                          const AlphaBlendingInputLayer& fg,
-                          const AlphaBlendingOutput& out, size_t num_pixels,
-                          bool alpha_is_premultiplied, bool clamp) {
-  if (alpha_is_premultiplied) {
-    for (size_t x = 0; x < num_pixels; ++x) {
-      float fga = clamp ? Clamp(fg.a[x]) : fg.a[x];
-      out.r[x] = (fg.r[x] + bg.r[x] * (1.f - fga));
-      out.g[x] = (fg.g[x] + bg.g[x] * (1.f - fga));
-      out.b[x] = (fg.b[x] + bg.b[x] * (1.f - fga));
-      out.a[x] = (1.f - (1.f - fga) * (1.f - bg.a[x]));
-    }
-  } else {
-    for (size_t x = 0; x < num_pixels; ++x) {
-      float fga = clamp ? Clamp(fg.a[x]) : fg.a[x];
-      const float new_a = 1.f - (1.f - fga) * (1.f - bg.a[x]);
-      const float rnew_a = (new_a > 0 ? 1.f / new_a : 0.f);
-      out.r[x] = (fg.r[x] * fga + bg.r[x] * bg.a[x] * (1.f - fga)) * rnew_a;
-      out.g[x] = (fg.g[x] * fga + bg.g[x] * bg.a[x] * (1.f - fga)) * rnew_a;
-      out.b[x] = (fg.b[x] * fga + bg.b[x] * bg.a[x] * (1.f - fga)) * rnew_a;
-      out.a[x] = new_a;
-    }
-  }
-}
-void PerformAlphaBlending(const float* bg, const float* bga, const float* fg,
-                          const float* fga, float* out, size_t num_pixels,
-                          bool alpha_is_premultiplied, bool clamp) {
-  if (bg == bga && fg == fga) {
-    for (size_t x = 0; x < num_pixels; ++x) {
-      float fa = clamp ? fga[x] : Clamp(fga[x]);
-      out[x] = (1.f - (1.f - fa) * (1.f - bga[x]));
-    }
-  } else {
-    if (alpha_is_premultiplied) {
-      for (size_t x = 0; x < num_pixels; ++x) {
-        float fa = clamp ? fga[x] : Clamp(fga[x]);
-        out[x] = (fg[x] + bg[x] * (1.f - fa));
-      }
-    } else {
-      for (size_t x = 0; x < num_pixels; ++x) {
-        float fa = clamp ? fga[x] : Clamp(fga[x]);
-        const float new_a = 1.f - (1.f - fa) * (1.f - bga[x]);
-        const float rnew_a = (new_a > 0 ? 1.f / new_a : 0.f);
-        out[x] = (fg[x] * fa + bg[x] * bga[x] * (1.f - fa)) * rnew_a;
-      }
-    }
-  }
-}
-
-void PerformAlphaWeightedAdd(const float* bg, const float* fg, const float* fga,
-                             float* out, size_t num_pixels, bool clamp) {
-  if (fg == fga) {
-    memcpy(out, bg, num_pixels * sizeof(*out));
-  } else if (clamp) {
-    for (size_t x = 0; x < num_pixels; ++x) {
-      out[x] = bg[x] + fg[x] * Clamp(fga[x]);
-    }
-  } else {
-    for (size_t x = 0; x < num_pixels; ++x) {
-      out[x] = bg[x] + fg[x] * fga[x];
-    }
-  }
-}
-
-void PerformMulBlending(const float* bg, const float* fg, float* out,
-                        size_t num_pixels, bool clamp) {
-  if (clamp) {
-    for (size_t x = 0; x < num_pixels; ++x) {
-      out[x] = bg[x] * Clamp(fg[x]);
-    }
-  } else {
-    for (size_t x = 0; x < num_pixels; ++x) {
-      out[x] = bg[x] * fg[x];
-    }
-  }
-}
-
-void PremultiplyAlpha(float* JXL_RESTRICT r, float* JXL_RESTRICT g,
-                      float* JXL_RESTRICT b, const float* JXL_RESTRICT a,
-                      size_t num_pixels) {
-  for (size_t x = 0; x < num_pixels; ++x) {
-    const float multiplier = std::max(kSmallAlpha, a[x]);
-    r[x] *= multiplier;
-    g[x] *= multiplier;
-    b[x] *= multiplier;
-  }
-}
-
-void UnpremultiplyAlpha(float* JXL_RESTRICT r, float* JXL_RESTRICT g,
-                        float* JXL_RESTRICT b, const float* JXL_RESTRICT a,
-                        size_t num_pixels) {
-  for (size_t x = 0; x < num_pixels; ++x) {
-    const float multiplier = 1.f / std::max(kSmallAlpha, a[x]);
-    r[x] *= multiplier;
-    g[x] *= multiplier;
-    b[x] *= multiplier;
-  }
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/alpha.h b/third_party/jpeg-xl/lib/jxl/alpha.h
deleted file mode 100644
index efb76c800f862..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/alpha.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ALPHA_H_
-#define LIB_JXL_ALPHA_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include <limits>
-
-#include "lib/jxl/base/compiler_specific.h"
-
-namespace jxl {
-
-// A very small value to avoid divisions by zero when converting to
-// unpremultiplied alpha. Page 21 of the technical introduction to OpenEXR
-// (https://www.openexr.com/documentation/TechnicalIntroduction.pdf) recommends
-// "a power of two" that is "less than half of the smallest positive 16-bit
-// floating-point value". That smallest value happens to be the denormal number
-// 2^-24, so 2^-26 should be a good choice.
-static constexpr float kSmallAlpha = 1.f / (1u << 26u);
-
-struct AlphaBlendingInputLayer {
-  const float* r;
-  const float* g;
-  const float* b;
-  const float* a;
-};
-
-struct AlphaBlendingOutput {
-  float* r;
-  float* g;
-  float* b;
-  float* a;
-};
-
-// Note: The pointers in `out` are allowed to alias those in `bg` or `fg`.
-// No pointer shall be null.
-void PerformAlphaBlending(const AlphaBlendingInputLayer& bg,
-                          const AlphaBlendingInputLayer& fg,
-                          const AlphaBlendingOutput& out, size_t num_pixels,
-                          bool alpha_is_premultiplied, bool clamp);
-// Single plane alpha blending
-void PerformAlphaBlending(const float* bg, const float* bga, const float* fg,
-                          const float* fga, float* out, size_t num_pixels,
-                          bool alpha_is_premultiplied, bool clamp);
-
-void PerformAlphaWeightedAdd(const float* bg, const float* fg, const float* fga,
-                             float* out, size_t num_pixels, bool clamp);
-
-void PerformMulBlending(const float* bg, const float* fg, float* out,
-                        size_t num_pixels, bool clamp);
-
-void PremultiplyAlpha(float* JXL_RESTRICT r, float* JXL_RESTRICT g,
-                      float* JXL_RESTRICT b, const float* JXL_RESTRICT a,
-                      size_t num_pixels);
-void UnpremultiplyAlpha(float* JXL_RESTRICT r, float* JXL_RESTRICT g,
-                        float* JXL_RESTRICT b, const float* JXL_RESTRICT a,
-                        size_t num_pixels);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ALPHA_H_
diff --git a/third_party/jpeg-xl/lib/jxl/alpha_test.cc b/third_party/jpeg-xl/lib/jxl/alpha_test.cc
deleted file mode 100644
index 6e26e77be6a7c..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/alpha_test.cc
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/alpha.h"
-
-#include <array>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-AlphaBlendingInputLayer makeAbil(const Color& rgb, const float& a) {
-  const float* data = rgb.data();
-  return {data, data + 1, data + 2, &a};
-}
-
-AlphaBlendingOutput makeAbo(Color& rgb, float& a) {
-  float* data = rgb.data();
-  return {data, data + 1, data + 2, &a};
-}
-
-TEST(AlphaTest, BlendingWithNonPremultiplied) {
-  const Color bg_rgb{100, 110, 120};
-  const float bg_a = 180.f / 255;
-  const Color fg_rgb{25, 21, 23};
-  const float fg_a = 15420.f / 65535;
-  const float fg_a2 = 2.0f;
-  Color out_rgb;
-  float out_a;
-  PerformAlphaBlending(
-      /*bg=*/makeAbil(bg_rgb, bg_a),
-      /*fg=*/makeAbil(fg_rgb, fg_a),
-      /*out=*/makeAbo(out_rgb, out_a), 1,
-      /*alpha_is_premultiplied=*/false, /*clamp=*/false);
-  EXPECT_ARRAY_NEAR(out_rgb, (Color{77.2f, 83.0f, 90.6f}), 0.05f);
-  EXPECT_NEAR(out_a, 3174.f / 4095, 1e-5);
-  PerformAlphaBlending(
-      /*bg=*/makeAbil(bg_rgb, bg_a),
-      /*fg=*/makeAbil(fg_rgb, fg_a2),
-      /*out=*/makeAbo(out_rgb, out_a), 1,
-      /*alpha_is_premultiplied=*/false, /*clamp=*/true);
-  EXPECT_ARRAY_NEAR(out_rgb, fg_rgb, 0.05f);
-  EXPECT_NEAR(out_a, 1.0f, 1e-5);
-}
-
-TEST(AlphaTest, BlendingWithPremultiplied) {
-  const Color bg_rgb{100, 110, 120};
-  const float bg_a = 180.f / 255;
-  const Color fg_rgb{25, 21, 23};
-  const float fg_a = 15420.f / 65535;
-  const float fg_a2 = 2.0f;
-  Color out_rgb;
-  float out_a;
-  PerformAlphaBlending(
-      /*bg=*/makeAbil(bg_rgb, bg_a),
-      /*fg=*/makeAbil(fg_rgb, fg_a),
-      /*out=*/makeAbo(out_rgb, out_a), 1,
-      /*alpha_is_premultiplied=*/true, /*clamp=*/false);
-  EXPECT_ARRAY_NEAR(out_rgb, (Color{101.5f, 105.1f, 114.8f}), 0.05f);
-  EXPECT_NEAR(out_a, 3174.f / 4095, 1e-5);
-  PerformAlphaBlending(
-      /*bg=*/makeAbil(bg_rgb, bg_a),
-      /*fg=*/makeAbil(fg_rgb, fg_a2),
-      /*out=*/makeAbo(out_rgb, out_a), 1,
-      /*alpha_is_premultiplied=*/true, /*clamp=*/true);
-  EXPECT_ARRAY_NEAR(out_rgb, fg_rgb, 0.05f);
-  EXPECT_NEAR(out_a, 1.0f, 1e-5);
-}
-
-TEST(AlphaTest, Mul) {
-  const float bg = 100;
-  const float fg = 25;
-  float out;
-  PerformMulBlending(&bg, &fg, &out, 1, /*clamp=*/false);
-  EXPECT_NEAR(out, fg * bg, .05f);
-  PerformMulBlending(&bg, &fg, &out, 1, /*clamp=*/true);
-  EXPECT_NEAR(out, bg, .05f);
-}
-
-TEST(AlphaTest, PremultiplyAndUnpremultiply) {
-  using F4 = std::array<float, 4>;
-  const F4 alpha{0.f, 63.f / 255, 127.f / 255, 1.f};
-  F4 r{120, 130, 140, 150};
-  F4 g{124, 134, 144, 154};
-  F4 b{127, 137, 147, 157};
-
-  PremultiplyAlpha(r.data(), g.data(), b.data(), alpha.data(), alpha.size());
-  EXPECT_ARRAY_NEAR(r, (F4{0.0f, 130 * 63.f / 255, 140 * 127.f / 255, 150}),
-                    1e-5f);
-  EXPECT_ARRAY_NEAR(g, (F4{0.0f, 134 * 63.f / 255, 144 * 127.f / 255, 154}),
-                    1e-5f);
-  EXPECT_ARRAY_NEAR(b, (F4{0.0f, 137 * 63.f / 255, 147 * 127.f / 255, 157}),
-                    1e-5f);
-
-  UnpremultiplyAlpha(r.data(), g.data(), b.data(), alpha.data(), alpha.size());
-  EXPECT_ARRAY_NEAR(r, (F4{120, 130, 140, 150}), 1e-4f);
-  EXPECT_ARRAY_NEAR(g, (F4{124, 134, 144, 154}), 1e-4f);
-  EXPECT_ARRAY_NEAR(b, (F4{127, 137, 147, 157}), 1e-4f);
-}
-
-TEST(AlphaTest, UnpremultiplyAndPremultiply) {
-  using F4 = std::array<float, 4>;
-  const F4 alpha{0.f, 63.f / 255, 127.f / 255, 1.f};
-  F4 r{50, 60, 70, 80};
-  F4 g{54, 64, 74, 84};
-  F4 b{57, 67, 77, 87};
-
-  UnpremultiplyAlpha(r.data(), g.data(), b.data(), alpha.data(), alpha.size());
-  EXPECT_ARRAY_NEAR(
-      r, (F4{50.0f * (1 << 26), 60 * 255.f / 63, 70 * 255.f / 127, 80}), 1e-4f);
-  EXPECT_ARRAY_NEAR(
-      g, (F4{54.0f * (1 << 26), 64 * 255.f / 63, 74 * 255.f / 127, 84}), 1e-4f);
-  EXPECT_ARRAY_NEAR(
-      b, (F4{57.0f * (1 << 26), 67 * 255.f / 63, 77 * 255.f / 127, 87}), 1e-4f);
-
-  PremultiplyAlpha(r.data(), g.data(), b.data(), alpha.data(), alpha.size());
-  EXPECT_ARRAY_NEAR(r, (F4{50, 60, 70, 80}), 1e-4);
-  EXPECT_ARRAY_NEAR(g, (F4{54, 64, 74, 84}), 1e-4);
-  EXPECT_ARRAY_NEAR(b, (F4{57, 67, 77, 87}), 1e-4);
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/ans_common.cc b/third_party/jpeg-xl/lib/jxl/ans_common.cc
deleted file mode 100644
index 306ecb7276782..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/ans_common.cc
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/ans_common.h"
-
-#include <cstddef>
-#include <cstdint>
-#include <numeric>
-#include <vector>
-
-#include "lib/jxl/ans_params.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-std::vector<int32_t> CreateFlatHistogram(int length, int total_count) {
-  JXL_DASSERT(length > 0);
-  JXL_DASSERT(length <= total_count);
-  const int count = total_count / length;
-  std::vector<int32_t> result(length, count);
-  const int rem_counts = total_count % length;
-  for (int i = 0; i < rem_counts; ++i) {
-    ++result[i];
-  }
-  return result;
-}
-
-// First, all trailing non-occurring symbols are removed from the distribution;
-// if this leaves the distribution empty, a placeholder symbol with max weight
-// is  added. This ensures that the resulting distribution sums to total table
-// size. Then, `entry_size` is chosen to be the largest power of two so that
-// `table_size` = ANS_TAB_SIZE/`entry_size` is at least as big as the
-// distribution size.
-// Note that each entry will only ever contain two different symbols, and
-// consecutive ranges of offsets, which allows us to use a compact
-// representation.
-// Each entry is initialized with only the (symbol=i, offset) pairs; then
-// positions for which the entry overflows (i.e. distribution[i] > entry_size)
-// or is not full are computed, and put into a stack in increasing order.
-// Missing symbols in the distribution are padded with 0 (because `table_size`
-// >= number of symbols). The `cutoff` value for each entry is initialized to
-// the number of occupied slots in that entry (i.e. `distributions[i]`). While
-// the overflowing-symbol stack is not empty (which implies that the
-// underflowing-symbol stack also is not), the top overfull and underfull
-// positions are popped from the stack; the empty slots in the underfull entry
-// are then filled with as many slots as needed from the overfull entry; such
-// slots are placed after the slots in the overfull entry, and `offsets[1]` is
-// computed accordingly. The formerly underfull entry is thus now neither
-// underfull nor overfull, and represents exactly two symbols. The overfull
-// entry might be either overfull or underfull, and is pushed into the
-// corresponding stack.
-Status InitAliasTable(std::vector<int32_t> distribution, uint32_t log_range,
-                      size_t log_alpha_size,
-                      AliasTable::Entry* JXL_RESTRICT a) {
-  const uint32_t range = 1 << log_range;
-  const size_t table_size = 1 << log_alpha_size;
-  JXL_ENSURE(table_size <= range);
-  while (!distribution.empty() && distribution.back() == 0) {
-    distribution.pop_back();
-  }
-  // Ensure that a valid table is always returned, even for an empty
-  // alphabet. Otherwise, a specially-crafted stream might crash the
-  // decoder.
-  if (distribution.empty()) {
-    distribution.emplace_back(range);
-  }
-  JXL_ENSURE(distribution.size() <= table_size);
-  const uint32_t entry_size = range >> log_alpha_size;  // this is exact
-  int single_symbol = -1;
-  int sum = 0;
-  // Special case for single-symbol distributions, that ensures that the state
-  // does not change when decoding from such a distribution. Note that, since we
-  // hardcode offset0 == 0, it is not straightforward (if at all possible) to
-  // fix the general case to produce this result.
-  for (size_t sym = 0; sym < distribution.size(); sym++) {
-    int32_t v = distribution[sym];
-    sum += v;
-    if (v == ANS_TAB_SIZE) {
-      JXL_ENSURE(single_symbol == -1);
-      single_symbol = sym;
-    }
-  }
-  JXL_ENSURE(static_cast<uint32_t>(sum) == range);
-  if (single_symbol != -1) {
-    uint8_t sym = single_symbol;
-    JXL_ENSURE(single_symbol == sym);
-    for (size_t i = 0; i < table_size; i++) {
-      a[i].right_value = sym;
-      a[i].cutoff = 0;
-      a[i].offsets1 = entry_size * i;
-      a[i].freq0 = 0;
-      a[i].freq1_xor_freq0 = ANS_TAB_SIZE;
-    }
-    return true;
-  }
-
-  std::vector<uint32_t> underfull_posn;
-  std::vector<uint32_t> overfull_posn;
-  std::vector<uint32_t> cutoffs(1 << log_alpha_size);
-  // Initialize entries.
-  for (size_t i = 0; i < distribution.size(); i++) {
-    cutoffs[i] = distribution[i];
-    if (cutoffs[i] > entry_size) {
-      overfull_posn.push_back(i);
-    } else if (cutoffs[i] < entry_size) {
-      underfull_posn.push_back(i);
-    }
-  }
-  for (uint32_t i = distribution.size(); i < table_size; i++) {
-    cutoffs[i] = 0;
-    underfull_posn.push_back(i);
-  }
-  // Reassign overflow/underflow values.
-  while (!overfull_posn.empty()) {
-    uint32_t overfull_i = overfull_posn.back();
-    overfull_posn.pop_back();
-    JXL_ENSURE(!underfull_posn.empty());
-    uint32_t underfull_i = underfull_posn.back();
-    underfull_posn.pop_back();
-    uint32_t underfull_by = entry_size - cutoffs[underfull_i];
-    cutoffs[overfull_i] -= underfull_by;
-    // overfull positions have their original symbols
-    a[underfull_i].right_value = overfull_i;
-    a[underfull_i].offsets1 = cutoffs[overfull_i];
-    // Slots in the right part of entry underfull_i were taken from the end
-    // of the symbols in entry overfull_i.
-    if (cutoffs[overfull_i] < entry_size) {
-      underfull_posn.push_back(overfull_i);
-    } else if (cutoffs[overfull_i] > entry_size) {
-      overfull_posn.push_back(overfull_i);
-    }
-  }
-  for (uint32_t i = 0; i < table_size; i++) {
-    // cutoffs[i] is properly initialized but the clang-analyzer doesn't infer
-    // it since it is partially initialized across two for-loops.
-    // NOLINTNEXTLINE(clang-analyzer-core.UndefinedBinaryOperatorResult)
-    if (cutoffs[i] == entry_size) {
-      a[i].right_value = i;
-      a[i].offsets1 = 0;
-      a[i].cutoff = 0;
-    } else {
-      // Note that, if cutoff is not equal to entry_size,
-      // a[i].offsets1 was initialized with (overfull cutoff) -
-      // (entry_size - a[i].cutoff). Thus, subtracting
-      // a[i].cutoff cannot make it negative.
-      a[i].offsets1 -= cutoffs[i];
-      a[i].cutoff = cutoffs[i];
-    }
-    const size_t freq0 = i < distribution.size() ? distribution[i] : 0;
-    const size_t i1 = a[i].right_value;
-    const size_t freq1 = i1 < distribution.size() ? distribution[i1] : 0;
-    a[i].freq0 = static_cast<uint16_t>(freq0);
-    a[i].freq1_xor_freq0 = static_cast<uint16_t>(freq1 ^ freq0);
-  }
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/ans_common.h b/third_party/jpeg-xl/lib/jxl/ans_common.h
deleted file mode 100644
index 20897028f026a..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/ans_common.h
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ANS_COMMON_H_
-#define LIB_JXL_ANS_COMMON_H_
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <hwy/base.h>
-#include <hwy/cache_control.h>  // Prefetch
-#include <vector>
-
-#include "lib/jxl/ans_params.h"
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-// Returns the precision (number of bits) that should be used to store
-// a histogram count such that Log2Floor(count) == logcount.
-static JXL_MAYBE_UNUSED JXL_INLINE uint32_t
-GetPopulationCountPrecision(uint32_t logcount, uint32_t shift) {
-  int32_t r = std::min<int>(
-      logcount, static_cast<int>(shift) -
-                    static_cast<int>((ANS_LOG_TAB_SIZE - logcount) >> 1));
-  if (r < 0) return 0;
-  return r;
-}
-
-// Returns a histogram where the counts are positive, differ by at most 1,
-// and add up to total_count. The bigger counts (if any) are at the beginning
-// of the histogram.
-std::vector<int32_t> CreateFlatHistogram(int length, int total_count);
-
-// An alias table implements a mapping from the [0, ANS_TAB_SIZE) range into
-// the [0, ANS_MAX_ALPHABET_SIZE) range, satisfying the following conditions:
-// - each symbol occurs as many times as specified by any valid distribution
-//   of frequencies of the symbols. A valid distribution here is an array of
-//   ANS_MAX_ALPHABET_SIZE that contains numbers in the range [0, ANS_TAB_SIZE],
-//   and whose sum is ANS_TAB_SIZE.
-// - lookups can be done in constant time, and also return how many smaller
-//   input values map into the same symbol, according to some well-defined order
-//   of input values.
-// - the space used by the alias table is given by a small constant times the
-//   index of the largest symbol with nonzero probability in the distribution.
-// Each of the entries in the table covers a range of `entry_size` values in the
-// [0, ANS_TAB_SIZE) range; consecutive entries represent consecutive
-// sub-ranges. In the range covered by entry `i`, the first `cutoff` values map
-// to symbol `i`, while the others map to symbol `right_value`.
-//
-// TODO(veluca): consider making the order used for computing offsets easier to
-// define - it is currently defined by the algorithm to compute the alias table.
-// Beware of breaking the implicit assumption that symbols that come after the
-// cutoff value should have an offset at least as big as the cutoff.
-
-struct AliasTable {
-  struct Symbol {
-    size_t value;
-    size_t offset;
-    size_t freq;
-  };
-
-// Working set size matters here (~64 tables x 256 entries).
-// offsets0 is always zero (beginning of [0] side among the same symbol).
-// offsets1 is an offset of (pos >= cutoff) side decremented by cutoff.
-#pragma pack(push, 1)
-  struct Entry {
-    uint8_t cutoff;       // < kEntrySizeMinus1 when used by ANS.
-    uint8_t right_value;  // < alphabet size.
-    uint16_t freq0;
-
-    // Only used if `greater` (see Lookup)
-    uint16_t offsets1;         // <= ANS_TAB_SIZE
-    uint16_t freq1_xor_freq0;  // for branchless ternary in Lookup
-  };
-#pragma pack(pop)
-
-  // Dividing `value` by `entry_size` determines `i`, the entry which is
-  // responsible for the input. If the remainder is below `cutoff`, then the
-  // mapped symbol is `i`; since `offsets[0]` stores the number of occurrences
-  // of `i` "before" the start of this entry, the offset of the input will be
-  // `offsets[0] + remainder`. If the remainder is above cutoff, the mapped
-  // symbol is `right_value`; since `offsets[1]` stores the number of
-  // occurrences of `right_value` "before" this entry, minus the `cutoff` value,
-  // the input offset is then `remainder + offsets[1]`.
-  static JXL_INLINE Symbol Lookup(const Entry* JXL_RESTRICT table, size_t value,
-                                  size_t log_entry_size,
-                                  size_t entry_size_minus_1) {
-    const size_t i = value >> log_entry_size;
-    const size_t pos = value & entry_size_minus_1;
-
-#if JXL_BYTE_ORDER_LITTLE
-    uint64_t entry;
-    memcpy(&entry, &table[i].cutoff, sizeof(entry));
-    const size_t cutoff = entry & 0xFF;              // = MOVZX
-    const size_t right_value = (entry >> 8) & 0xFF;  // = MOVZX
-    const size_t freq0 = (entry >> 16) & 0xFFFF;
-#else
-    // Generates multiple loads with complex addressing.
-    const size_t cutoff = table[i].cutoff;
-    const size_t right_value = table[i].right_value;
-    const size_t freq0 = table[i].freq0;
-#endif
-
-    const bool greater = pos >= cutoff;
-
-#if JXL_BYTE_ORDER_LITTLE
-    const uint64_t conditional = greater ? entry : 0;  // = CMOV
-    const size_t offsets1_or_0 = (conditional >> 32) & 0xFFFF;
-    const size_t freq1_xor_freq0_or_0 = conditional >> 48;
-#else
-    const size_t offsets1_or_0 = greater ? table[i].offsets1 : 0;
-    const size_t freq1_xor_freq0_or_0 = greater ? table[i].freq1_xor_freq0 : 0;
-#endif
-
-    // WARNING: moving this code may interfere with CMOV heuristics.
-    Symbol s;
-    s.value = greater ? right_value : i;
-    s.offset = offsets1_or_0 + pos;
-    s.freq = freq0 ^ freq1_xor_freq0_or_0;  // = greater ? freq1 : freq0
-    // XOR avoids implementation-defined conversion from unsigned to signed.
-    // Alternatives considered: BEXTR is 2 cycles on HSW, SET+shift causes
-    // spills, simple ternary has a long dependency chain.
-
-    return s;
-  }
-
-  static HWY_INLINE void Prefetch(const Entry* JXL_RESTRICT table, size_t value,
-                                  size_t log_entry_size) {
-    const size_t i = value >> log_entry_size;
-    hwy::Prefetch(table + i);
-  }
-};
-
-// Computes an alias table for a given distribution.
-Status InitAliasTable(std::vector<int32_t> distribution, uint32_t log_range,
-                      size_t log_alpha_size, AliasTable::Entry* JXL_RESTRICT a);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ANS_COMMON_H_
diff --git a/third_party/jpeg-xl/lib/jxl/ans_common_test.cc b/third_party/jpeg-xl/lib/jxl/ans_common_test.cc
deleted file mode 100644
index b97f5186f9fae..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/ans_common_test.cc
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/ans_common.h"
-
-#include <vector>
-
-#include "lib/jxl/ans_params.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-void VerifyAliasDistribution(const std::vector<int>& distribution,
-                             uint32_t log_range) {
-  constexpr size_t log_alpha_size = 8;
-  AliasTable::Entry table[1 << log_alpha_size];
-  ASSERT_TRUE(InitAliasTable(distribution, log_range, log_alpha_size, table));
-  uint32_t range = 1 << log_range;
-  std::vector<std::vector<uint32_t>> offsets(distribution.size());
-  for (uint32_t i = 0; i < range; i++) {
-    AliasTable::Symbol s = AliasTable::Lookup(
-        table, i, ANS_LOG_TAB_SIZE - 8, (1 << (ANS_LOG_TAB_SIZE - 8)) - 1);
-    offsets[s.value].push_back(s.offset);
-  }
-  for (uint32_t i = 0; i < distribution.size(); i++) {
-    ASSERT_EQ(static_cast<size_t>(distribution[i]), offsets[i].size());
-    std::sort(offsets[i].begin(), offsets[i].end());
-    for (uint32_t j = 0; j < offsets[i].size(); j++) {
-      ASSERT_EQ(offsets[i][j], j);
-    }
-  }
-}
-
-TEST(ANSCommonTest, AliasDistributionSmoke) {
-  VerifyAliasDistribution({ANS_TAB_SIZE / 2, ANS_TAB_SIZE / 2},
-                          ANS_LOG_TAB_SIZE);
-  VerifyAliasDistribution({ANS_TAB_SIZE}, ANS_LOG_TAB_SIZE);
-  VerifyAliasDistribution({0, 0, 0, ANS_TAB_SIZE, 0}, ANS_LOG_TAB_SIZE);
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/ans_params.h b/third_party/jpeg-xl/lib/jxl/ans_params.h
deleted file mode 100644
index 4bbc284c0bf49..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/ans_params.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ANS_PARAMS_H_
-#define LIB_JXL_ANS_PARAMS_H_
-
-// Common parameters that are needed for both the ANS entropy encoding and
-// decoding methods.
-
-#include <stdint.h>
-#include <stdlib.h>
-
-namespace jxl {
-
-// TODO(veluca): decide if 12 is the best constant here (valid range is up to
-// 16). This requires recomputing the Huffman tables in {enc,dec}_ans.cc
-// 14 gives a 0.2% improvement at d1 and makes d8 slightly worse. This is
-// likely not worth the increase in encoder complexity.
-#define ANS_LOG_TAB_SIZE 12u
-#define ANS_TAB_SIZE (1 << ANS_LOG_TAB_SIZE)
-#define ANS_TAB_MASK (ANS_TAB_SIZE - 1)
-
-// Largest possible symbol to be encoded by either ANS or prefix coding.
-#define PREFIX_MAX_ALPHABET_SIZE 4096
-#define ANS_MAX_ALPHABET_SIZE 256
-
-// Max number of bits for prefix coding.
-#define PREFIX_MAX_BITS 15
-
-#define ANS_SIGNATURE 0x13  // Initial state, used as CRC.
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ANS_PARAMS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/ans_test.cc b/third_party/jpeg-xl/lib/jxl/ans_test.cc
deleted file mode 100644
index 8bed98895f4c1..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/ans_test.cc
+++ /dev/null
@@ -1,301 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/ans_params.h"
-#include "lib/jxl/base/random.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_ans.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/enc_ans.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-void RoundtripTestcase(int n_histograms, int alphabet_size,
-                       const std::vector<Token>& input_values) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  constexpr uint16_t kMagic1 = 0x9e33;
-  constexpr uint16_t kMagic2 = 0x8b04;
-
-  BitWriter writer{memory_manager};
-  // Space for magic bytes.
-  ASSERT_TRUE(writer.WithMaxBits(16, LayerType::Header, nullptr, [&] {
-    writer.Write(16, kMagic1);
-    return true;
-  }));
-
-  std::vector<uint8_t> context_map;
-  EntropyEncodingData codes;
-  std::vector<std::vector<Token>> input_values_vec;
-  input_values_vec.push_back(input_values);
-
-  JXL_TEST_ASSIGN_OR_DIE(
-      size_t cost,
-      BuildAndEncodeHistograms(memory_manager, HistogramParams(), n_histograms,
-                               input_values_vec, &codes, &context_map, &writer,
-                               LayerType::Header, nullptr));
-  (void)cost;
-  ASSERT_TRUE(WriteTokens(input_values_vec[0], codes, context_map, 0, &writer,
-                          LayerType::Header, nullptr));
-
-  // Magic bytes + padding
-  ASSERT_TRUE(writer.WithMaxBits(24, LayerType::Header, nullptr, [&] {
-    writer.Write(16, kMagic2);
-    writer.ZeroPadToByte();
-    return true;
-  }));
-
-  // We do not truncate the output. Reading past the end reads out zeroes
-  // anyway.
-  BitReader br(writer.GetSpan());
-
-  ASSERT_EQ(br.ReadBits(16), kMagic1);
-
-  std::vector<uint8_t> dec_context_map;
-  ANSCode decoded_codes;
-  ASSERT_TRUE(DecodeHistograms(memory_manager, &br, n_histograms,
-                               &decoded_codes, &dec_context_map));
-  ASSERT_EQ(dec_context_map, context_map);
-  JXL_TEST_ASSIGN_OR_DIE(ANSSymbolReader reader,
-                         ANSSymbolReader::Create(&decoded_codes, &br));
-
-  for (const Token& symbol : input_values) {
-    uint32_t read_symbol =
-        reader.ReadHybridUint(symbol.context, &br, dec_context_map);
-    ASSERT_EQ(read_symbol, symbol.value);
-  }
-  ASSERT_TRUE(reader.CheckANSFinalState());
-
-  ASSERT_EQ(br.ReadBits(16), kMagic2);
-  EXPECT_TRUE(br.Close());
-}
-
-TEST(ANSTest, EmptyRoundtrip) {
-  RoundtripTestcase(2, ANS_MAX_ALPHABET_SIZE, std::vector<Token>());
-}
-
-TEST(ANSTest, SingleSymbolRoundtrip) {
-  for (uint32_t i = 0; i < ANS_MAX_ALPHABET_SIZE; i++) {
-    RoundtripTestcase(2, ANS_MAX_ALPHABET_SIZE, {{0, i}});
-  }
-  for (uint32_t i = 0; i < ANS_MAX_ALPHABET_SIZE; i++) {
-    RoundtripTestcase(2, ANS_MAX_ALPHABET_SIZE,
-                      std::vector<Token>(1024, {0, i}));
-  }
-}
-
-#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) || \
-    defined(THREAD_SANITIZER)
-constexpr size_t kReps = 3;
-#else
-constexpr size_t kReps = 10;
-#endif
-
-void RoundtripRandomStream(int alphabet_size, size_t reps = kReps,
-                           size_t num = 1 << 18) {
-  constexpr int kNumHistograms = 3;
-  Rng rng(0);
-  for (size_t i = 0; i < reps; i++) {
-    std::vector<Token> symbols;
-    for (size_t j = 0; j < num; j++) {
-      int context = rng.UniformI(0, kNumHistograms);
-      int value = rng.UniformU(0, alphabet_size);
-      symbols.emplace_back(context, value);
-    }
-    RoundtripTestcase(kNumHistograms, alphabet_size, symbols);
-  }
-}
-
-void RoundtripRandomUnbalancedStream(int alphabet_size) {
-  constexpr int kNumHistograms = 3;
-  constexpr int kPrecision = 1 << 10;
-  Rng rng(0);
-  for (size_t i = 0; i < kReps; i++) {
-    std::vector<int> distributions[kNumHistograms] = {};
-    for (auto& distr : distributions) {
-      distr.resize(kPrecision);
-      int symbol = 0;
-      int remaining = 1;
-      for (int k = 0; k < kPrecision; k++) {
-        if (remaining == 0) {
-          if (symbol < alphabet_size - 1) symbol++;
-          // There is no meaning behind this distribution: it's anything that
-          // will create a nonuniform distribution and won't have too few
-          // symbols usually. Also we want different distributions we get to be
-          // sufficiently dissimilar.
-          remaining = rng.UniformU(0, kPrecision - k + 1);
-        }
-        distr[k] = symbol;
-        remaining--;
-      }
-    }
-    std::vector<Token> symbols;
-    for (int j = 0; j < 1 << 18; j++) {
-      int context = rng.UniformI(0, kNumHistograms);
-      int value = rng.UniformU(0, kPrecision);
-      symbols.emplace_back(context, value);
-    }
-    RoundtripTestcase(kNumHistograms + 1, alphabet_size, symbols);
-  }
-}
-
-TEST(ANSTest, RandomStreamRoundtrip3Small) { RoundtripRandomStream(3, 1, 16); }
-
-TEST(ANSTest, RandomStreamRoundtrip3) { RoundtripRandomStream(3); }
-
-TEST(ANSTest, RandomStreamRoundtripBig) {
-  RoundtripRandomStream(ANS_MAX_ALPHABET_SIZE);
-}
-
-TEST(ANSTest, RandomUnbalancedStreamRoundtrip3) {
-  RoundtripRandomUnbalancedStream(3);
-}
-
-TEST(ANSTest, RandomUnbalancedStreamRoundtripBig) {
-  RoundtripRandomUnbalancedStream(ANS_MAX_ALPHABET_SIZE);
-}
-
-TEST(ANSTest, UintConfigRoundtrip) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  for (size_t log_alpha_size = 5; log_alpha_size <= 8; log_alpha_size++) {
-    std::vector<HybridUintConfig> uint_config;
-    std::vector<HybridUintConfig> uint_config_dec;
-    for (size_t i = 0; i < log_alpha_size; i++) {
-      for (size_t j = 0; j <= i; j++) {
-        for (size_t k = 0; k <= i - j; k++) {
-          uint_config.emplace_back(i, j, k);
-        }
-      }
-    }
-    uint_config.emplace_back(log_alpha_size, 0, 0);
-    uint_config_dec.resize(uint_config.size());
-    BitWriter writer{memory_manager};
-    ASSERT_TRUE(writer.WithMaxBits(
-        10 * uint_config.size(), LayerType::Header, nullptr, [&] {
-          EncodeUintConfigs(uint_config, &writer, log_alpha_size);
-          return true;
-        }));
-    writer.ZeroPadToByte();
-    BitReader br(writer.GetSpan());
-    EXPECT_TRUE(DecodeUintConfigs(log_alpha_size, &uint_config_dec, &br));
-    EXPECT_TRUE(br.Close());
-    for (size_t i = 0; i < uint_config.size(); i++) {
-      EXPECT_EQ(uint_config[i].split_token, uint_config_dec[i].split_token);
-      EXPECT_EQ(uint_config[i].msb_in_token, uint_config_dec[i].msb_in_token);
-      EXPECT_EQ(uint_config[i].lsb_in_token, uint_config_dec[i].lsb_in_token);
-    }
-  }
-}
-
-void TestCheckpointing(bool ans, bool lz77) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  std::vector<std::vector<Token>> input_values(1);
-  for (size_t i = 0; i < 1024; i++) {
-    input_values[0].emplace_back(0, i % 4);
-  }
-  // up to lz77 window size.
-  for (size_t i = 0; i < (1 << 20) - 1022; i++) {
-    input_values[0].emplace_back(0, (i % 5) + 4);
-  }
-  // Ensure that when the window wraps around, new values are different.
-  input_values[0].emplace_back(0, 0);
-  for (size_t i = 0; i < 1024; i++) {
-    input_values[0].emplace_back(0, i % 4);
-  }
-
-  std::vector<uint8_t> context_map;
-  EntropyEncodingData codes;
-  HistogramParams params;
-  params.lz77_method = lz77 ? HistogramParams::LZ77Method::kLZ77
-                            : HistogramParams::LZ77Method::kNone;
-  params.force_huffman = !ans;
-
-  BitWriter writer{memory_manager};
-  {
-    auto input_values_copy = input_values;
-    JXL_TEST_ASSIGN_OR_DIE(
-        size_t cost, BuildAndEncodeHistograms(
-                         memory_manager, params, 1, input_values_copy, &codes,
-                         &context_map, &writer, LayerType::Header, nullptr));
-    (void)cost;
-    ASSERT_TRUE(WriteTokens(input_values_copy[0], codes, context_map, 0,
-                            &writer, LayerType::Header, nullptr));
-    writer.ZeroPadToByte();
-  }
-
-  // We do not truncate the output. Reading past the end reads out zeroes
-  // anyway.
-  BitReader br(writer.GetSpan());
-  Status status = true;
-  {
-    BitReaderScopedCloser bc(br, status);
-
-    std::vector<uint8_t> dec_context_map;
-    ANSCode decoded_codes;
-    ASSERT_TRUE(DecodeHistograms(memory_manager, &br, 1, &decoded_codes,
-                                 &dec_context_map));
-    ASSERT_EQ(dec_context_map, context_map);
-    JXL_TEST_ASSIGN_OR_DIE(ANSSymbolReader reader,
-                           ANSSymbolReader::Create(&decoded_codes, &br));
-
-    ANSSymbolReader::Checkpoint checkpoint;
-    size_t br_pos = 0;
-    constexpr size_t kInterval = ANSSymbolReader::kMaxCheckpointInterval - 2;
-    for (size_t i = 0; i < input_values[0].size(); i++) {
-      if (i % kInterval == 0 && i > 0) {
-        reader.Restore(checkpoint);
-        ASSERT_TRUE(br.Close());
-        br = BitReader(writer.GetSpan());
-        br.SkipBits(br_pos);
-        for (size_t j = i - kInterval; j < i; j++) {
-          Token symbol = input_values[0][j];
-          uint32_t read_symbol =
-              reader.ReadHybridUint(symbol.context, &br, dec_context_map);
-          ASSERT_EQ(read_symbol, symbol.value) << "j = " << j;
-        }
-      }
-      if (i % kInterval == 0) {
-        reader.Save(&checkpoint);
-        br_pos = br.TotalBitsConsumed();
-      }
-      Token symbol = input_values[0][i];
-      uint32_t read_symbol =
-          reader.ReadHybridUint(symbol.context, &br, dec_context_map);
-      ASSERT_EQ(read_symbol, symbol.value) << "i = " << i;
-    }
-    ASSERT_TRUE(reader.CheckANSFinalState());
-  }
-  EXPECT_TRUE(status);
-}
-
-TEST(ANSTest, TestCheckpointingANS) {
-  TestCheckpointing(/*ans=*/true, /*lz77=*/false);
-}
-
-TEST(ANSTest, TestCheckpointingPrefix) {
-  TestCheckpointing(/*ans=*/false, /*lz77=*/false);
-}
-
-TEST(ANSTest, TestCheckpointingANSLZ77) {
-  TestCheckpointing(/*ans=*/true, /*lz77=*/true);
-}
-
-TEST(ANSTest, TestCheckpointingPrefixLZ77) {
-  TestCheckpointing(/*ans=*/false, /*lz77=*/true);
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/base/arch_macros.h b/third_party/jpeg-xl/lib/jxl/base/arch_macros.h
deleted file mode 100644
index a98301915e5b8..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/arch_macros.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_ARCH_MACROS_H_
-#define LIB_JXL_BASE_ARCH_MACROS_H_
-
-// Defines the JXL_ARCH_* macros.
-
-namespace jxl {
-
-#if defined(__x86_64__) || defined(_M_X64)
-#define JXL_ARCH_X64 1
-#else
-#define JXL_ARCH_X64 0
-#endif
-
-#if defined(__powerpc64__) || defined(_M_PPC)
-#define JXL_ARCH_PPC 1
-#else
-#define JXL_ARCH_PPC 0
-#endif
-
-#if defined(__aarch64__) || defined(__arm__)
-#define JXL_ARCH_ARM 1
-#else
-#define JXL_ARCH_ARM 0
-#endif
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_BASE_ARCH_MACROS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/base/bits.h b/third_party/jpeg-xl/lib/jxl/base/bits.h
deleted file mode 100644
index a79fdc2c99144..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/bits.h
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_BITS_H_
-#define LIB_JXL_BASE_BITS_H_
-
-// Specialized instructions for processing register-sized bit arrays.
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-
-#if JXL_COMPILER_MSVC
-#include <intrin.h>
-#endif
-
-#include <stddef.h>
-#include <stdint.h>
-
-namespace jxl {
-
-// Empty struct used as a size tag type.
-template <size_t N>
-struct SizeTag {};
-
-template <typename T>
-constexpr bool IsSigned() {
-  // TODO(eustas): remove dupes
-  return static_cast<T>(0) > static_cast<T>(-1);
-}
-
-// Undefined results for x == 0.
-static JXL_INLINE JXL_MAYBE_UNUSED size_t
-Num0BitsAboveMS1Bit_Nonzero(SizeTag<4> /* tag */, const uint32_t x) {
-  JXL_DASSERT(x != 0);
-#if JXL_COMPILER_MSVC
-  unsigned long index;
-  _BitScanReverse(&index, x);
-  return 31 - index;
-#else
-  return static_cast<size_t>(__builtin_clz(x));
-#endif
-}
-static JXL_INLINE JXL_MAYBE_UNUSED size_t
-Num0BitsAboveMS1Bit_Nonzero(SizeTag<8> /* tag */, const uint64_t x) {
-  JXL_DASSERT(x != 0);
-#if JXL_COMPILER_MSVC
-#if JXL_ARCH_X64
-  unsigned long index;
-  _BitScanReverse64(&index, x);
-  return 63 - index;
-#else   // JXL_ARCH_X64
-  // _BitScanReverse64 not available
-  uint32_t msb = static_cast<uint32_t>(x >> 32u);
-  unsigned long index;
-  if (msb == 0) {
-    uint32_t lsb = static_cast<uint32_t>(x & 0xFFFFFFFF);
-    _BitScanReverse(&index, lsb);
-    return 63 - index;
-  } else {
-    _BitScanReverse(&index, msb);
-    return 31 - index;
-  }
-#endif  // JXL_ARCH_X64
-#else
-  return static_cast<size_t>(__builtin_clzll(x));
-#endif
-}
-template <typename T>
-static JXL_INLINE JXL_MAYBE_UNUSED size_t
-Num0BitsAboveMS1Bit_Nonzero(const T x) {
-  static_assert(!IsSigned<T>(), "Num0BitsAboveMS1Bit_Nonzero: use unsigned");
-  return Num0BitsAboveMS1Bit_Nonzero(SizeTag<sizeof(T)>(), x);
-}
-
-// Undefined results for x == 0.
-static JXL_INLINE JXL_MAYBE_UNUSED size_t
-Num0BitsBelowLS1Bit_Nonzero(SizeTag<4> /* tag */, const uint32_t x) {
-  JXL_DASSERT(x != 0);
-#if JXL_COMPILER_MSVC
-  unsigned long index;
-  _BitScanForward(&index, x);
-  return index;
-#else
-  return static_cast<size_t>(__builtin_ctz(x));
-#endif
-}
-static JXL_INLINE JXL_MAYBE_UNUSED size_t
-Num0BitsBelowLS1Bit_Nonzero(SizeTag<8> /* tag */, const uint64_t x) {
-  JXL_DASSERT(x != 0);
-#if JXL_COMPILER_MSVC
-#if JXL_ARCH_X64
-  unsigned long index;
-  _BitScanForward64(&index, x);
-  return index;
-#else   // JXL_ARCH_64
-  // _BitScanForward64 not available
-  uint32_t lsb = static_cast<uint32_t>(x & 0xFFFFFFFF);
-  unsigned long index;
-  if (lsb == 0) {
-    uint32_t msb = static_cast<uint32_t>(x >> 32u);
-    _BitScanForward(&index, msb);
-    return 32 + index;
-  } else {
-    _BitScanForward(&index, lsb);
-    return index;
-  }
-#endif  // JXL_ARCH_X64
-#else
-  return static_cast<size_t>(__builtin_ctzll(x));
-#endif
-}
-template <typename T>
-static JXL_INLINE JXL_MAYBE_UNUSED size_t Num0BitsBelowLS1Bit_Nonzero(T x) {
-  static_assert(!IsSigned<T>(), "Num0BitsBelowLS1Bit_Nonzero: use unsigned");
-  return Num0BitsBelowLS1Bit_Nonzero(SizeTag<sizeof(T)>(), x);
-}
-
-// Returns bit width for x == 0.
-template <typename T>
-static JXL_INLINE JXL_MAYBE_UNUSED size_t Num0BitsAboveMS1Bit(const T x) {
-  return (x == 0) ? sizeof(T) * 8 : Num0BitsAboveMS1Bit_Nonzero(x);
-}
-
-// Returns bit width for x == 0.
-template <typename T>
-static JXL_INLINE JXL_MAYBE_UNUSED size_t Num0BitsBelowLS1Bit(const T x) {
-  return (x == 0) ? sizeof(T) * 8 : Num0BitsBelowLS1Bit_Nonzero(x);
-}
-
-// Returns base-2 logarithm, rounded down.
-template <typename T>
-static JXL_INLINE JXL_MAYBE_UNUSED size_t FloorLog2Nonzero(const T x) {
-  return (sizeof(T) * 8 - 1) ^ Num0BitsAboveMS1Bit_Nonzero(x);
-}
-
-// Returns base-2 logarithm, rounded up.
-template <typename T>
-static JXL_INLINE JXL_MAYBE_UNUSED size_t CeilLog2Nonzero(const T x) {
-  const size_t floor_log2 = FloorLog2Nonzero(x);
-  if ((x & (x - 1)) == 0) return floor_log2;  // power of two
-  return floor_log2 + 1;
-}
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_BASE_BITS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/base/byte_order.h b/third_party/jpeg-xl/lib/jxl/base/byte_order.h
deleted file mode 100644
index cf8d7db082ca2..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/byte_order.h
+++ /dev/null
@@ -1,274 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_BYTE_ORDER_H_
-#define LIB_JXL_BASE_BYTE_ORDER_H_
-
-#include <jxl/types.h>
-#include <stdint.h>
-#include <string.h>  // memcpy
-
-#include "lib/jxl/base/compiler_specific.h"
-
-#if JXL_COMPILER_MSVC
-#include <intrin.h>  // _byteswap_*
-#endif
-
-#if (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
-#define JXL_BYTE_ORDER_LITTLE 1
-#else
-// This means that we don't know that the byte order is little endian, in
-// this case we use endian-neutral code that works for both little- and
-// big-endian.
-#define JXL_BYTE_ORDER_LITTLE 0
-#endif
-
-// Returns whether the system is little-endian (least-significant byte first).
-#if JXL_BYTE_ORDER_LITTLE
-static constexpr bool IsLittleEndian() { return true; }
-#else
-static inline bool IsLittleEndian() {
-  const uint32_t multibyte = 1;
-  uint8_t byte;
-  memcpy(&byte, &multibyte, 1);
-  return byte == 1;
-}
-#endif
-
-static inline bool SwapEndianness(JxlEndianness endianness) {
-  return ((endianness == JXL_BIG_ENDIAN && IsLittleEndian()) ||
-          (endianness == JXL_LITTLE_ENDIAN && !IsLittleEndian()));
-}
-
-#if JXL_COMPILER_MSVC
-#define JXL_BSWAP16(x) _byteswap_ushort(x)
-#define JXL_BSWAP32(x) _byteswap_ulong(x)
-#define JXL_BSWAP64(x) _byteswap_uint64(x)
-#else
-#define JXL_BSWAP16(x) __builtin_bswap16(x)
-#define JXL_BSWAP32(x) __builtin_bswap32(x)
-#define JXL_BSWAP64(x) __builtin_bswap64(x)
-#endif
-
-static JXL_INLINE uint32_t LoadBE16(const uint8_t* p) {
-  const uint32_t byte1 = p[0];
-  const uint32_t byte0 = p[1];
-  return (byte1 << 8) | byte0;
-}
-
-static JXL_INLINE uint32_t LoadLE16(const uint8_t* p) {
-  const uint32_t byte0 = p[0];
-  const uint32_t byte1 = p[1];
-  return (byte1 << 8) | byte0;
-}
-
-static JXL_INLINE uint32_t LoadBE32(const uint8_t* p) {
-#if JXL_BYTE_ORDER_LITTLE
-  uint32_t big;
-  memcpy(&big, p, 4);
-  return JXL_BSWAP32(big);
-#else
-  // Byte-order-independent - can't assume this machine is big endian.
-  const uint32_t byte3 = p[0];
-  const uint32_t byte2 = p[1];
-  const uint32_t byte1 = p[2];
-  const uint32_t byte0 = p[3];
-  return (byte3 << 24) | (byte2 << 16) | (byte1 << 8) | byte0;
-#endif
-}
-
-static JXL_INLINE uint64_t LoadBE64(const uint8_t* p) {
-#if JXL_BYTE_ORDER_LITTLE
-  uint64_t big;
-  memcpy(&big, p, 8);
-  return JXL_BSWAP64(big);
-#else
-  // Byte-order-independent - can't assume this machine is big endian.
-  const uint64_t byte7 = p[0];
-  const uint64_t byte6 = p[1];
-  const uint64_t byte5 = p[2];
-  const uint64_t byte4 = p[3];
-  const uint64_t byte3 = p[4];
-  const uint64_t byte2 = p[5];
-  const uint64_t byte1 = p[6];
-  const uint64_t byte0 = p[7];
-  return (byte7 << 56ull) | (byte6 << 48ull) | (byte5 << 40ull) |
-         (byte4 << 32ull) | (byte3 << 24ull) | (byte2 << 16ull) |
-         (byte1 << 8ull) | byte0;
-#endif
-}
-
-static JXL_INLINE uint32_t LoadLE32(const uint8_t* p) {
-#if JXL_BYTE_ORDER_LITTLE
-  uint32_t little;
-  memcpy(&little, p, 4);
-  return little;
-#else
-  // Byte-order-independent - can't assume this machine is big endian.
-  const uint32_t byte0 = p[0];
-  const uint32_t byte1 = p[1];
-  const uint32_t byte2 = p[2];
-  const uint32_t byte3 = p[3];
-  return (byte3 << 24) | (byte2 << 16) | (byte1 << 8) | byte0;
-#endif
-}
-
-static JXL_INLINE uint64_t LoadLE64(const uint8_t* p) {
-#if JXL_BYTE_ORDER_LITTLE
-  uint64_t little;
-  memcpy(&little, p, 8);
-  return little;
-#else
-  // Byte-order-independent - can't assume this machine is big endian.
-  const uint64_t byte0 = p[0];
-  const uint64_t byte1 = p[1];
-  const uint64_t byte2 = p[2];
-  const uint64_t byte3 = p[3];
-  const uint64_t byte4 = p[4];
-  const uint64_t byte5 = p[5];
-  const uint64_t byte6 = p[6];
-  const uint64_t byte7 = p[7];
-  return (byte7 << 56) | (byte6 << 48) | (byte5 << 40) | (byte4 << 32) |
-         (byte3 << 24) | (byte2 << 16) | (byte1 << 8) | byte0;
-#endif
-}
-
-// Loads a Big-Endian float
-static JXL_INLINE float LoadBEFloat(const uint8_t* p) {
-  uint32_t u = LoadBE32(p);
-  float result;
-  memcpy(&result, &u, 4);
-  return result;
-}
-
-// Loads a Little-Endian float
-static JXL_INLINE float LoadLEFloat(const uint8_t* p) {
-  uint32_t u = LoadLE32(p);
-  float result;
-  memcpy(&result, &u, 4);
-  return result;
-}
-
-static JXL_INLINE void StoreBE16(const uint32_t native, uint8_t* p) {
-  p[0] = (native >> 8) & 0xFF;
-  p[1] = native & 0xFF;
-}
-
-static JXL_INLINE void StoreLE16(const uint32_t native, uint8_t* p) {
-  p[1] = (native >> 8) & 0xFF;
-  p[0] = native & 0xFF;
-}
-
-static JXL_INLINE void StoreBE32(const uint32_t native, uint8_t* p) {
-#if JXL_BYTE_ORDER_LITTLE
-  const uint32_t big = JXL_BSWAP32(native);
-  memcpy(p, &big, 4);
-#else
-  // Byte-order-independent - can't assume this machine is big endian.
-  p[0] = native >> 24;
-  p[1] = (native >> 16) & 0xFF;
-  p[2] = (native >> 8) & 0xFF;
-  p[3] = native & 0xFF;
-#endif
-}
-
-static JXL_INLINE void StoreBE64(const uint64_t native, uint8_t* p) {
-#if JXL_BYTE_ORDER_LITTLE
-  const uint64_t big = JXL_BSWAP64(native);
-  memcpy(p, &big, 8);
-#else
-  // Byte-order-independent - can't assume this machine is big endian.
-  p[0] = native >> 56ull;
-  p[1] = (native >> 48ull) & 0xFF;
-  p[2] = (native >> 40ull) & 0xFF;
-  p[3] = (native >> 32ull) & 0xFF;
-  p[4] = (native >> 24ull) & 0xFF;
-  p[5] = (native >> 16ull) & 0xFF;
-  p[6] = (native >> 8ull) & 0xFF;
-  p[7] = native & 0xFF;
-#endif
-}
-
-static JXL_INLINE void StoreLE32(const uint32_t native, uint8_t* p) {
-#if JXL_BYTE_ORDER_LITTLE
-  const uint32_t little = native;
-  memcpy(p, &little, 4);
-#else
-  // Byte-order-independent - can't assume this machine is big endian.
-  p[3] = native >> 24;
-  p[2] = (native >> 16) & 0xFF;
-  p[1] = (native >> 8) & 0xFF;
-  p[0] = native & 0xFF;
-#endif
-}
-
-static JXL_INLINE void StoreLE64(const uint64_t native, uint8_t* p) {
-#if JXL_BYTE_ORDER_LITTLE
-  const uint64_t little = native;
-  memcpy(p, &little, 8);
-#else
-  // Byte-order-independent - can't assume this machine is big endian.
-  p[7] = native >> 56;
-  p[6] = (native >> 48) & 0xFF;
-  p[5] = (native >> 40) & 0xFF;
-  p[4] = (native >> 32) & 0xFF;
-  p[3] = (native >> 24) & 0xFF;
-  p[2] = (native >> 16) & 0xFF;
-  p[1] = (native >> 8) & 0xFF;
-  p[0] = native & 0xFF;
-#endif
-}
-
-static JXL_INLINE float BSwapFloat(float x) {
-  uint32_t u;
-  memcpy(&u, &x, 4);
-  uint32_t uswap = JXL_BSWAP32(u);
-  float xswap;
-  memcpy(&xswap, &uswap, 4);
-  return xswap;
-}
-
-// Big/Little Endian order.
-struct OrderBE {};
-struct OrderLE {};
-
-// Wrappers for calling from generic code.
-static JXL_INLINE void Store16(OrderBE /*tag*/, const uint32_t native,
-                               uint8_t* p) {
-  StoreBE16(native, p);
-}
-
-static JXL_INLINE void Store16(OrderLE /*tag*/, const uint32_t native,
-                               uint8_t* p) {
-  StoreLE16(native, p);
-}
-
-static JXL_INLINE void Store32(OrderBE /*tag*/, const uint32_t native,
-                               uint8_t* p) {
-  StoreBE32(native, p);
-}
-
-static JXL_INLINE void Store32(OrderLE /*tag*/, const uint32_t native,
-                               uint8_t* p) {
-  StoreLE32(native, p);
-}
-
-static JXL_INLINE uint32_t Load16(OrderBE /*tag*/, const uint8_t* p) {
-  return LoadBE16(p);
-}
-
-static JXL_INLINE uint32_t Load16(OrderLE /*tag*/, const uint8_t* p) {
-  return LoadLE16(p);
-}
-
-static JXL_INLINE uint32_t Load32(OrderBE /*tag*/, const uint8_t* p) {
-  return LoadBE32(p);
-}
-
-static JXL_INLINE uint32_t Load32(OrderLE /*tag*/, const uint8_t* p) {
-  return LoadLE32(p);
-}
-
-#endif  // LIB_JXL_BASE_BYTE_ORDER_H_
diff --git a/third_party/jpeg-xl/lib/jxl/base/c_callback_support.h b/third_party/jpeg-xl/lib/jxl/base/c_callback_support.h
deleted file mode 100644
index aee0ce5346592..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/c_callback_support.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_C_CALLBACK_SUPPORT_H_
-#define LIB_JXL_BASE_C_CALLBACK_SUPPORT_H_
-
-#include <utility>
-
-namespace jxl {
-namespace detail {
-
-template <typename T>
-struct MethodToCCallbackHelper {};
-
-template <typename T, typename R, typename... Args>
-struct MethodToCCallbackHelper<R (T::*)(Args...)> {
-  template <R (T::*method)(Args...)>
-  static R Call(void *opaque, Args... args) {
-    return (reinterpret_cast<T *>(opaque)->*method)(
-        std::forward<Args>(args)...);
-  }
-};
-
-}  // namespace detail
-}  // namespace jxl
-
-#define METHOD_TO_C_CALLBACK(method) \
-  ::jxl::detail::MethodToCCallbackHelper<decltype(method)>::Call<method>
-
-#endif  // LIB_JXL_BASE_C_CALLBACK_SUPPORT_H_
diff --git a/third_party/jpeg-xl/lib/jxl/base/common.h b/third_party/jpeg-xl/lib/jxl/base/common.h
deleted file mode 100644
index 0893ef26b5a5a..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/common.h
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_COMMON_H_
-#define LIB_JXL_BASE_COMMON_H_
-
-// Shared constants and helper functions.
-
-#include <array>
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#include <memory>
-#include <string>
-#include <type_traits>
-
-#include "lib/jxl/base/compiler_specific.h"
-
-namespace jxl {
-// Some enums and typedefs used by more than one header file.
-
-constexpr size_t kBitsPerByte = 8;  // more clear than CHAR_BIT
-
-constexpr inline size_t RoundUpBitsToByteMultiple(size_t bits) {
-  return (bits + 7) & ~static_cast<size_t>(7);
-}
-
-constexpr inline size_t RoundUpToBlockDim(size_t dim) {
-  return (dim + 7) & ~static_cast<size_t>(7);
-}
-
-static inline bool JXL_MAYBE_UNUSED SafeAdd(const uint64_t a, const uint64_t b,
-                                            uint64_t& sum) {
-  sum = a + b;
-  return sum >= a;  // no need to check b - either sum >= both or < both.
-}
-
-template <typename T1, typename T2>
-constexpr inline T1 DivCeil(T1 a, T2 b) {
-  return (a + b - 1) / b;
-}
-
-// Works for any `align`; if a power of two, compiler emits ADD+AND.
-constexpr inline size_t RoundUpTo(size_t what, size_t align) {
-  return DivCeil(what, align) * align;
-}
-
-constexpr double kPi = 3.14159265358979323846264338327950288;
-
-// Reasonable default for sRGB, matches common monitors. We map white to this
-// many nits (cd/m^2) by default. Butteraugli was tuned for 250 nits, which is
-// very close.
-// NB: This constant is not very "base", but it is shared between modules.
-static constexpr float kDefaultIntensityTarget = 255;
-
-template <typename T>
-constexpr T Pi(T multiplier) {
-  return static_cast<T>(multiplier * kPi);
-}
-
-// Prior to C++14 (i.e. C++11): provide our own make_unique
-#if __cplusplus < 201402L
-template <typename T, typename... Args>
-std::unique_ptr<T> make_unique(Args&&... args) {
-  return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
-}
-#else
-using std::make_unique;
-#endif
-
-typedef std::array<float, 3> Color;
-
-// Backported std::experimental::to_array
-
-template <typename T>
-using remove_cv_t = typename std::remove_cv<T>::type;
-
-template <size_t... I>
-struct index_sequence {};
-
-template <size_t N, size_t... I>
-struct make_index_sequence : make_index_sequence<N - 1, N - 1, I...> {};
-
-template <size_t... I>
-struct make_index_sequence<0, I...> : index_sequence<I...> {};
-
-namespace detail {
-
-template <typename T, size_t N, size_t... I>
-constexpr auto to_array(T (&&arr)[N], index_sequence<I...> _)
-    -> std::array<remove_cv_t<T>, N> {
-  return {{std::move(arr[I])...}};
-}
-
-}  // namespace detail
-
-template <typename T, size_t N>
-constexpr auto to_array(T (&&arr)[N]) -> std::array<remove_cv_t<T>, N> {
-  return detail::to_array(std::move(arr), make_index_sequence<N>());
-}
-
-template <typename T>
-JXL_INLINE T Clamp1(T val, T low, T hi) {
-  return val < low ? low : val > hi ? hi : val;
-}
-
-// conversion from integer to string.
-template <typename T>
-std::string ToString(T n) {
-  char data[32] = {};
-  if (std::is_floating_point<T>::value) {
-    // float
-    snprintf(data, sizeof(data), "%g", static_cast<double>(n));
-  } else if (std::is_unsigned<T>::value) {
-    // unsigned
-    snprintf(data, sizeof(data), "%llu", static_cast<unsigned long long>(n));
-  } else {
-    // signed
-    snprintf(data, sizeof(data), "%lld", static_cast<long long>(n));
-  }
-  return data;
-}
-
-#define JXL_JOIN(x, y) JXL_DO_JOIN(x, y)
-#define JXL_DO_JOIN(x, y) x##y
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_BASE_COMMON_H_
diff --git a/third_party/jpeg-xl/lib/jxl/base/compiler_specific.h b/third_party/jpeg-xl/lib/jxl/base/compiler_specific.h
deleted file mode 100644
index cb1a8a038641f..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/compiler_specific.h
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_COMPILER_SPECIFIC_H_
-#define LIB_JXL_BASE_COMPILER_SPECIFIC_H_
-
-// Macros for compiler version + nonstandard keywords, e.g. __builtin_expect.
-
-#include <sys/types.h>
-
-#include "lib/jxl/base/sanitizer_definitions.h"
-
-#if JXL_ADDRESS_SANITIZER || JXL_MEMORY_SANITIZER || JXL_THREAD_SANITIZER
-#include "sanitizer/common_interface_defs.h"  // __sanitizer_print_stack_trace
-#endif                                        // defined(*_SANITIZER)
-
-// #if is shorter and safer than #ifdef. *_VERSION are zero if not detected,
-// otherwise 100 * major + minor version. Note that other packages check for
-// #ifdef COMPILER_MSVC, so we cannot use that same name.
-
-#ifdef _MSC_VER
-#define JXL_COMPILER_MSVC _MSC_VER
-#else
-#define JXL_COMPILER_MSVC 0
-#endif
-
-#ifdef __GNUC__
-#define JXL_COMPILER_GCC (__GNUC__ * 100 + __GNUC_MINOR__)
-#else
-#define JXL_COMPILER_GCC 0
-#endif
-
-#ifdef __clang__
-#define JXL_COMPILER_CLANG (__clang_major__ * 100 + __clang_minor__)
-// Clang pretends to be GCC for compatibility.
-#undef JXL_COMPILER_GCC
-#define JXL_COMPILER_GCC 0
-#else
-#define JXL_COMPILER_CLANG 0
-#endif
-
-#if JXL_COMPILER_MSVC
-#define JXL_RESTRICT __restrict
-#elif JXL_COMPILER_GCC || JXL_COMPILER_CLANG
-#define JXL_RESTRICT __restrict__
-#else
-#define JXL_RESTRICT
-#endif
-
-#if JXL_COMPILER_MSVC
-#define JXL_INLINE __forceinline
-#define JXL_NOINLINE __declspec(noinline)
-#else
-#define JXL_INLINE inline __attribute__((always_inline))
-#define JXL_NOINLINE __attribute__((noinline))
-#endif
-
-#if JXL_COMPILER_MSVC
-#define JXL_NORETURN __declspec(noreturn)
-#elif JXL_COMPILER_GCC || JXL_COMPILER_CLANG
-#define JXL_NORETURN __attribute__((noreturn))
-#else
-#define JXL_NORETURN
-#endif
-
-#if JXL_COMPILER_MSVC
-#define JXL_MAYBE_UNUSED
-#else
-// Encountered "attribute list cannot appear here" when using the C++17
-// [[maybe_unused]], so only use the old style attribute for now.
-#define JXL_MAYBE_UNUSED __attribute__((unused))
-#endif
-
-// MSAN execution won't hurt if some code it not inlined, but this can greatly
-// improve compilation time. Unfortunately this macro can not be used just
-// everywhere - inside header files it leads to "multiple definition" error;
-// though it would be better not to have JXL_INLINE in header overall.
-#if JXL_MEMORY_SANITIZER || JXL_ADDRESS_SANITIZER || JXL_THREAD_SANITIZER
-#define JXL_MAYBE_INLINE JXL_MAYBE_UNUSED
-#else
-#define JXL_MAYBE_INLINE JXL_INLINE
-#endif
-
-#if JXL_COMPILER_MSVC
-// Unsupported, __assume is not the same.
-#define JXL_LIKELY(expr) expr
-#define JXL_UNLIKELY(expr) expr
-#else
-#define JXL_LIKELY(expr) __builtin_expect(!!(expr), 1)
-#define JXL_UNLIKELY(expr) __builtin_expect(!!(expr), 0)
-#endif
-
-#if JXL_COMPILER_MSVC
-#include <stdint.h>
-using ssize_t = intptr_t;
-#endif
-
-// Returns a void* pointer which the compiler then assumes is N-byte aligned.
-// Example: float* JXL_RESTRICT aligned = (float*)JXL_ASSUME_ALIGNED(in, 32);
-//
-// The assignment semantics are required by GCC/Clang. ICC provides an in-place
-// __assume_aligned, whereas MSVC's __assume appears unsuitable.
-#if JXL_COMPILER_CLANG
-// Early versions of Clang did not support __builtin_assume_aligned.
-#define JXL_HAS_ASSUME_ALIGNED __has_builtin(__builtin_assume_aligned)
-#elif JXL_COMPILER_GCC
-#define JXL_HAS_ASSUME_ALIGNED 1
-#else
-#define JXL_HAS_ASSUME_ALIGNED 0
-#endif
-
-#if JXL_HAS_ASSUME_ALIGNED
-#define JXL_ASSUME_ALIGNED(ptr, align) __builtin_assume_aligned((ptr), (align))
-#else
-#define JXL_ASSUME_ALIGNED(ptr, align) (ptr) /* not supported */
-#endif
-
-#ifdef __has_attribute
-#define JXL_HAVE_ATTRIBUTE(x) __has_attribute(x)
-#else
-#define JXL_HAVE_ATTRIBUTE(x) 0
-#endif
-
-// Raises warnings if the function return value is unused. Should appear as the
-// first part of a function definition/declaration.
-#if JXL_HAVE_ATTRIBUTE(nodiscard)
-#define JXL_MUST_USE_RESULT [[nodiscard]]
-#elif JXL_COMPILER_CLANG && JXL_HAVE_ATTRIBUTE(warn_unused_result)
-#define JXL_MUST_USE_RESULT __attribute__((warn_unused_result))
-#else
-#define JXL_MUST_USE_RESULT
-#endif
-
-// Disable certain -fsanitize flags for functions that are expected to include
-// things like unsigned integer overflow. For example use in the function
-// declaration JXL_NO_SANITIZE("unsigned-integer-overflow") to silence unsigned
-// integer overflow ubsan messages.
-#if JXL_COMPILER_CLANG && JXL_HAVE_ATTRIBUTE(no_sanitize)
-#define JXL_NO_SANITIZE(X) __attribute__((no_sanitize(X)))
-#else
-#define JXL_NO_SANITIZE(X)
-#endif
-
-#if JXL_HAVE_ATTRIBUTE(__format__)
-#define JXL_FORMAT(idx_fmt, idx_arg) \
-  __attribute__((__format__(__printf__, idx_fmt, idx_arg)))
-#else
-#define JXL_FORMAT(idx_fmt, idx_arg)
-#endif
-
-// C++ standard.
-#if defined(_MSC_VER) && !defined(__clang__) && defined(_MSVC_LANG) && \
-    _MSVC_LANG > __cplusplus
-#define JXL_CXX_LANG _MSVC_LANG
-#else
-#define JXL_CXX_LANG __cplusplus
-#endif
-
-// Known / distinguished C++ standards.
-#define JXL_CXX_17 201703
-
-// In most cases we consider build as "debug". Use `NDEBUG` for release build.
-#if defined(JXL_IS_DEBUG_BUILD)
-#undef JXL_IS_DEBUG_BUILD
-#define JXL_IS_DEBUG_BUILD 1
-#elif defined(NDEBUG)
-#define JXL_IS_DEBUG_BUILD 0
-#else
-#define JXL_IS_DEBUG_BUILD 1
-#endif
-
-#if defined(JXL_CRASH_ON_ERROR)
-#undef JXL_CRASH_ON_ERROR
-#define JXL_CRASH_ON_ERROR 1
-#else
-#define JXL_CRASH_ON_ERROR 0
-#endif
-
-#if JXL_CRASH_ON_ERROR && !JXL_IS_DEBUG_BUILD
-#error "JXL_CRASH_ON_ERROR requires JXL_IS_DEBUG_BUILD"
-#endif
-
-// Pass -DJXL_DEBUG_ON_ALL_ERROR at compile time to print debug messages on
-// all error (fatal and non-fatal) status.
-#if defined(JXL_DEBUG_ON_ALL_ERROR)
-#undef JXL_DEBUG_ON_ALL_ERROR
-#define JXL_DEBUG_ON_ALL_ERROR 1
-#else
-#define JXL_DEBUG_ON_ALL_ERROR 0
-#endif
-
-#if JXL_DEBUG_ON_ALL_ERROR && !JXL_IS_DEBUG_BUILD
-#error "JXL_DEBUG_ON_ALL_ERROR requires JXL_IS_DEBUG_BUILD"
-#endif
-
-// Pass -DJXL_DEBUG_ON_ABORT={0} to disable the debug messages on
-// (debug) JXL_ENSURE and JXL_DASSERT.
-#if !defined(JXL_DEBUG_ON_ABORT)
-#define JXL_DEBUG_ON_ABORT JXL_IS_DEBUG_BUILD
-#endif  // JXL_DEBUG_ON_ABORT
-
-#if JXL_DEBUG_ON_ABORT && !JXL_IS_DEBUG_BUILD
-#error "JXL_DEBUG_ON_ABORT requires JXL_IS_DEBUG_BUILD"
-#endif
-
-#if JXL_ADDRESS_SANITIZER || JXL_MEMORY_SANITIZER || JXL_THREAD_SANITIZER
-#define JXL_PRINT_STACK_TRACE() __sanitizer_print_stack_trace();
-#else
-#define JXL_PRINT_STACK_TRACE()
-#endif
-
-#if JXL_COMPILER_MSVC
-#define JXL_CRASH() __debugbreak(), (void)abort()
-#else
-#define JXL_CRASH() (void)__builtin_trap()
-#endif
-
-#endif  // LIB_JXL_BASE_COMPILER_SPECIFIC_H_
diff --git a/third_party/jpeg-xl/lib/jxl/base/data_parallel.h b/third_party/jpeg-xl/lib/jxl/base/data_parallel.h
deleted file mode 100644
index e39f46c75b929..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/data_parallel.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_DATA_PARALLEL_H_
-#define LIB_JXL_BASE_DATA_PARALLEL_H_
-
-// Portable, low-overhead C++11 ThreadPool alternative to OpenMP for
-// data-parallel computations.
-
-#include <jxl/parallel_runner.h>
-
-#include <atomic>
-#include <cstddef>
-#include <cstdint>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#if JXL_COMPILER_MSVC
-// suppress warnings about the const & applied to function types
-#pragma warning(disable : 4180)
-#endif
-
-namespace jxl {
-
-class ThreadPool {
- public:
-  ThreadPool(JxlParallelRunner runner, void* runner_opaque)
-      : runner_(runner),
-        runner_opaque_(runner ? runner_opaque : static_cast<void*>(this)) {}
-
-  ThreadPool(const ThreadPool&) = delete;
-  ThreadPool& operator&(const ThreadPool&) = delete;
-
-  JxlParallelRunner runner() const { return runner_; }
-  void* runner_opaque() const { return runner_opaque_; }
-
-  // Runs init_func(num_threads) followed by data_func(task, thread) on worker
-  // thread(s) for every task in [begin, end). init_func() must return a Status
-  // indicating whether the initialization succeeded.
-  // "thread" is an integer smaller than num_threads.
-  // Not thread-safe - no two calls to Run may overlap.
-  // Subsequent calls will reuse the same threads.
-  //
-  // Precondition: begin <= end.
-  template <class InitFunc, class DataFunc>
-  Status Run(uint32_t begin, uint32_t end, const InitFunc& init_func,
-             const DataFunc& data_func, const char* caller) {
-    JXL_ENSURE(begin <= end);
-    if (begin == end) return true;
-    RunCallState<InitFunc, DataFunc> call_state(init_func, data_func);
-    // The runner_ uses the C convention and returns 0 in case of error, so we
-    // convert it to a Status.
-    if (!runner_) {
-      void* jpegxl_opaque = static_cast<void*>(&call_state);
-      if (call_state.CallInitFunc(jpegxl_opaque, 1) !=
-          JXL_PARALLEL_RET_SUCCESS) {
-        return JXL_FAILURE("Failed to initialize thread");
-      }
-      for (uint32_t i = begin; i < end; i++) {
-        call_state.CallDataFunc(jpegxl_opaque, i, 0);
-      }
-      if (call_state.HasError()) {
-        return JXL_FAILURE("[%s] failed", caller);
-      }
-      return true;
-    }
-    JxlParallelRetCode ret = (*runner_)(
-        runner_opaque_, static_cast<void*>(&call_state),
-        &call_state.CallInitFunc, &call_state.CallDataFunc, begin, end);
-
-    if (ret != JXL_PARALLEL_RET_SUCCESS || call_state.HasError()) {
-      return JXL_FAILURE("[%s] failed", caller);
-    }
-    return true;
-  }
-
-  // Use this as init_func when no initialization is needed.
-  static Status NoInit(size_t num_threads) { return true; }
-
- private:
-  // class holding the state of a Run() call to pass to the runner_ as an
-  // opaque_jpegxl pointer.
-  template <class InitFunc, class DataFunc>
-  class RunCallState final {
-   public:
-    RunCallState(const InitFunc& init_func, const DataFunc& data_func)
-        : init_func_(init_func), data_func_(data_func) {}
-
-    // JxlParallelRunInit interface.
-    static int CallInitFunc(void* jpegxl_opaque, size_t num_threads) {
-      auto* self =
-          static_cast<RunCallState<InitFunc, DataFunc>*>(jpegxl_opaque);
-      // Returns -1 when the internal init function returns false Status to
-      // indicate an error.
-      if (!self->init_func_(num_threads)) {
-        self->has_error_ = true;
-        return JXL_PARALLEL_RET_RUNNER_ERROR;
-      }
-      return JXL_PARALLEL_RET_SUCCESS;
-    }
-
-    // JxlParallelRunFunction interface.
-    static void CallDataFunc(void* jpegxl_opaque, uint32_t value,
-                             size_t thread_id) {
-      auto* self =
-          static_cast<RunCallState<InitFunc, DataFunc>*>(jpegxl_opaque);
-      if (self->has_error_) return;
-      if (!self->data_func_(value, thread_id)) {
-        self->has_error_ = true;
-      }
-    }
-
-    bool HasError() const { return has_error_; }
-
-   private:
-    const InitFunc& init_func_;
-    const DataFunc& data_func_;
-    std::atomic<bool> has_error_{false};
-  };
-
-  // The caller supplied runner function and its opaque void*.
-  const JxlParallelRunner runner_;
-  void* const runner_opaque_;
-};
-
-template <class InitFunc, class DataFunc>
-Status RunOnPool(ThreadPool* pool, const uint32_t begin, const uint32_t end,
-                 const InitFunc& init_func, const DataFunc& data_func,
-                 const char* caller) {
-  if (pool == nullptr) {
-    ThreadPool default_pool(nullptr, nullptr);
-    return default_pool.Run(begin, end, init_func, data_func, caller);
-  } else {
-    return pool->Run(begin, end, init_func, data_func, caller);
-  }
-}
-
-}  // namespace jxl
-#if JXL_COMPILER_MSVC
-#pragma warning(default : 4180)
-#endif
-
-#endif  // LIB_JXL_BASE_DATA_PARALLEL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/base/exif.h b/third_party/jpeg-xl/lib/jxl/base/exif.h
deleted file mode 100644
index acaa1a1ce4361..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/exif.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_EXIF_H_
-#define LIB_JXL_BASE_EXIF_H_
-
-// Basic parsing of Exif (just enough for the render-impacting things
-// like orientation)
-
-#include <jxl/codestream_header.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/compiler_specific.h"
-
-namespace jxl {
-
-constexpr uint16_t kExifOrientationTag = 274;
-
-// Checks if a blob looks like Exif, and if so, sets bigendian
-// according to the tiff endianness
-JXL_INLINE bool IsExif(const std::vector<uint8_t>& exif, bool* bigendian) {
-  if (exif.size() < 12) return false;  // not enough bytes for a valid exif blob
-  const uint8_t* t = exif.data();
-  if (LoadLE32(t) == 0x2A004D4D) {
-    *bigendian = true;
-    return true;
-  } else if (LoadLE32(t) == 0x002A4949) {
-    *bigendian = false;
-    return true;
-  }
-  return false;  // not a valid tiff header
-}
-
-// Finds the position of an Exif tag, or 0 if it is not found
-JXL_INLINE size_t FindExifTagPosition(const std::vector<uint8_t>& exif,
-                                      uint16_t tagname) {
-  bool bigendian;
-  if (!IsExif(exif, &bigendian)) return 0;
-  const uint8_t* t = exif.data() + 4;
-  uint64_t offset = (bigendian ? LoadBE32(t) : LoadLE32(t));
-  if (exif.size() < 12 + offset + 2 || offset < 8) return 0;
-  t += offset - 4;
-  if (offset + 2 >= exif.size()) return 0;
-  uint16_t nb_tags = (bigendian ? LoadBE16(t) : LoadLE16(t));
-  t += 2;
-  while (nb_tags > 0) {
-    if (t + 12 >= exif.data() + exif.size()) return 0;
-    uint16_t tag = (bigendian ? LoadBE16(t) : LoadLE16(t));
-    t += 2;
-    if (tag == tagname) return static_cast<size_t>(t - exif.data());
-    t += 10;
-    nb_tags--;
-  }
-  return 0;
-}
-
-// TODO(jon): tag 1 can be used to represent Adobe RGB 1998 if it has value
-// "R03"
-// TODO(jon): set intrinsic dimensions according to
-// https://discourse.wicg.io/t/proposal-exif-image-resolution-auto-and-from-image/4326/24
-// Parses the Exif data just enough to extract any render-impacting info.
-// If the Exif data is invalid or could not be parsed, then it is treated
-// as a no-op.
-JXL_INLINE void InterpretExif(const std::vector<uint8_t>& exif,
-                              JxlOrientation* orientation) {
-  bool bigendian;
-  if (!IsExif(exif, &bigendian)) return;
-  size_t o_pos = FindExifTagPosition(exif, kExifOrientationTag);
-  if (o_pos) {
-    const uint8_t* t = exif.data() + o_pos;
-    uint16_t type = (bigendian ? LoadBE16(t) : LoadLE16(t));
-    t += 2;
-    uint32_t count = (bigendian ? LoadBE32(t) : LoadLE32(t));
-    t += 4;
-    uint16_t value = (bigendian ? LoadBE16(t) : LoadLE16(t));
-    if (type == 3 && count == 1 && value >= 1 && value <= 8) {
-      *orientation = static_cast<JxlOrientation>(value);
-    }
-  }
-}
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_BASE_EXIF_H_
diff --git a/third_party/jpeg-xl/lib/jxl/base/fast_math-inl.h b/third_party/jpeg-xl/lib/jxl/base/fast_math-inl.h
deleted file mode 100644
index fa749cc25703d..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/fast_math-inl.h
+++ /dev/null
@@ -1,236 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Fast SIMD math ops (log2, encoder only, cos, erf for splines)
-
-#if defined(LIB_JXL_BASE_FAST_MATH_INL_H_) == defined(HWY_TARGET_TOGGLE)
-#ifdef LIB_JXL_BASE_FAST_MATH_INL_H_
-#undef LIB_JXL_BASE_FAST_MATH_INL_H_
-#else
-#define LIB_JXL_BASE_FAST_MATH_INL_H_
-#endif
-
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/rational_polynomial-inl.h"
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Abs;
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::Eq;
-using hwy::HWY_NAMESPACE::Floor;
-using hwy::HWY_NAMESPACE::Ge;
-using hwy::HWY_NAMESPACE::GetLane;
-using hwy::HWY_NAMESPACE::IfThenElse;
-using hwy::HWY_NAMESPACE::IfThenZeroElse;
-using hwy::HWY_NAMESPACE::Le;
-using hwy::HWY_NAMESPACE::Min;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::MulAdd;
-using hwy::HWY_NAMESPACE::NegMulAdd;
-using hwy::HWY_NAMESPACE::Rebind;
-using hwy::HWY_NAMESPACE::ShiftLeft;
-using hwy::HWY_NAMESPACE::ShiftRight;
-using hwy::HWY_NAMESPACE::Sub;
-using hwy::HWY_NAMESPACE::Xor;
-
-// Computes base-2 logarithm like std::log2. Undefined if negative / NaN.
-// L1 error ~3.9E-6
-template <class DF, class V>
-V FastLog2f(const DF df, V x) {
-  // 2,2 rational polynomial approximation of std::log1p(x) / std::log(2).
-  HWY_ALIGN const float p[4 * (2 + 1)] = {HWY_REP4(-1.8503833400518310E-06f),
-                                          HWY_REP4(1.4287160470083755E+00f),
-                                          HWY_REP4(7.4245873327820566E-01f)};
-  HWY_ALIGN const float q[4 * (2 + 1)] = {HWY_REP4(9.9032814277590719E-01f),
-                                          HWY_REP4(1.0096718572241148E+00f),
-                                          HWY_REP4(1.7409343003366853E-01f)};
-
-  const Rebind<int32_t, DF> di;
-  const auto x_bits = BitCast(di, x);
-
-  // Range reduction to [-1/3, 1/3] - 3 integer, 2 float ops
-  const auto exp_bits = Sub(x_bits, Set(di, 0x3f2aaaab));  // = 2/3
-  // Shifted exponent = log2; also used to clear mantissa.
-  const auto exp_shifted = ShiftRight<23>(exp_bits);
-  const auto mantissa = BitCast(df, Sub(x_bits, ShiftLeft<23>(exp_shifted)));
-  const auto exp_val = ConvertTo(df, exp_shifted);
-  return Add(EvalRationalPolynomial(df, Sub(mantissa, Set(df, 1.0f)), p, q),
-             exp_val);
-}
-
-// max relative error ~3e-7
-template <class DF, class V>
-V FastPow2f(const DF df, V x) {
-  const Rebind<int32_t, DF> di;
-  auto floorx = Floor(x);
-  auto exp =
-      BitCast(df, ShiftLeft<23>(Add(ConvertTo(di, floorx), Set(di, 127))));
-  auto frac = Sub(x, floorx);
-  auto num = Add(frac, Set(df, 1.01749063e+01));
-  num = MulAdd(num, frac, Set(df, 4.88687798e+01));
-  num = MulAdd(num, frac, Set(df, 9.85506591e+01));
-  num = Mul(num, exp);
-  auto den = MulAdd(frac, Set(df, 2.10242958e-01), Set(df, -2.22328856e-02));
-  den = MulAdd(den, frac, Set(df, -1.94414990e+01));
-  den = MulAdd(den, frac, Set(df, 9.85506633e+01));
-  return Div(num, den);
-}
-
-// max relative error ~3e-5
-template <class DF, class V>
-V FastPowf(const DF df, V base, V exponent) {
-  return FastPow2f(df, Mul(FastLog2f(df, base), exponent));
-}
-
-// Computes cosine like std::cos.
-// L1 error 7e-5.
-template <class DF, class V>
-V FastCosf(const DF df, V x) {
-  // Step 1: range reduction to [0, 2pi)
-  const auto pi2 = Set(df, kPi * 2.0f);
-  const auto pi2_inv = Set(df, 0.5f / kPi);
-  const auto npi2 = Mul(Floor(Mul(x, pi2_inv)), pi2);
-  const auto xmodpi2 = Sub(x, npi2);
-  // Step 2: range reduction to [0, pi]
-  const auto x_pi = Min(xmodpi2, Sub(pi2, xmodpi2));
-  // Step 3: range reduction to [0, pi/2]
-  const auto above_pihalf = Ge(x_pi, Set(df, kPi / 2.0f));
-  const auto x_pihalf = IfThenElse(above_pihalf, Sub(Set(df, kPi), x_pi), x_pi);
-  // Step 4: Taylor-like approximation, scaled by 2**0.75 to make angle
-  // duplication steps faster, on x/4.
-  const auto xs = Mul(x_pihalf, Set(df, 0.25f));
-  const auto x2 = Mul(xs, xs);
-  const auto x4 = Mul(x2, x2);
-  const auto cosx_prescaling =
-      MulAdd(x4, Set(df, 0.06960438),
-             MulAdd(x2, Set(df, -0.84087373), Set(df, 1.68179268)));
-  // Step 5: angle duplication.
-  const auto cosx_scale1 =
-      MulAdd(cosx_prescaling, cosx_prescaling, Set(df, -1.414213562));
-  const auto cosx_scale2 = MulAdd(cosx_scale1, cosx_scale1, Set(df, -1));
-  // Step 6: change sign if needed.
-  const Rebind<uint32_t, DF> du;
-  auto signbit = ShiftLeft<31>(BitCast(du, VecFromMask(df, above_pihalf)));
-  return BitCast(df, Xor(signbit, BitCast(du, cosx_scale2)));
-}
-
-// Computes the error function like std::erf.
-// L1 error 7e-4.
-template <class DF, class V>
-V FastErff(const DF df, V x) {
-  // Formula from
-  // https://en.wikipedia.org/wiki/Error_function#Numerical_approximations
-  // but constants have been recomputed.
-  const auto xle0 = Le(x, Zero(df));
-  const auto absx = Abs(x);
-  // Compute 1 - 1 / ((((x * a + b) * x + c) * x + d) * x + 1)**4
-  const auto denom1 =
-      MulAdd(absx, Set(df, 7.77394369e-02), Set(df, 2.05260015e-04));
-  const auto denom2 = MulAdd(denom1, absx, Set(df, 2.32120216e-01));
-  const auto denom3 = MulAdd(denom2, absx, Set(df, 2.77820801e-01));
-  const auto denom4 = MulAdd(denom3, absx, Set(df, 1.0f));
-  const auto denom5 = Mul(denom4, denom4);
-  const auto inv_denom5 = Div(Set(df, 1.0f), denom5);
-  const auto result = NegMulAdd(inv_denom5, inv_denom5, Set(df, 1.0f));
-  // Change sign if needed.
-  const Rebind<uint32_t, DF> du;
-  auto signbit = ShiftLeft<31>(BitCast(du, VecFromMask(df, xle0)));
-  return BitCast(df, Xor(signbit, BitCast(du, result)));
-}
-
-inline float FastLog2f(float f) {
-  HWY_CAPPED(float, 1) D;
-  return GetLane(FastLog2f(D, Set(D, f)));
-}
-
-inline float FastPow2f(float f) {
-  HWY_CAPPED(float, 1) D;
-  return GetLane(FastPow2f(D, Set(D, f)));
-}
-
-inline float FastPowf(float b, float e) {
-  HWY_CAPPED(float, 1) D;
-  return GetLane(FastPowf(D, Set(D, b), Set(D, e)));
-}
-
-inline float FastCosf(float f) {
-  HWY_CAPPED(float, 1) D;
-  return GetLane(FastCosf(D, Set(D, f)));
-}
-
-inline float FastErff(float f) {
-  HWY_CAPPED(float, 1) D;
-  return GetLane(FastErff(D, Set(D, f)));
-}
-
-// Returns cbrt(x) + add with 6 ulp max error.
-// Modified from vectormath_exp.h, Apache 2 license.
-// https://www.agner.org/optimize/vectorclass.zip
-template <class V>
-V CubeRootAndAdd(const V x, const V add) {
-  const HWY_FULL(float) df;
-  const HWY_FULL(int32_t) di;
-
-  const auto kExpBias = Set(di, 0x54800000);  // cast(1.) + cast(1.) / 3
-  const auto kExpMul = Set(di, 0x002AAAAA);   // shifted 1/3
-  const auto k1_3 = Set(df, 1.0f / 3);
-  const auto k4_3 = Set(df, 4.0f / 3);
-
-  const auto xa = x;  // assume inputs never negative
-  const auto xa_3 = Mul(k1_3, xa);
-
-  // Multiply exponent by -1/3
-  const auto m1 = BitCast(di, xa);
-  // Special case for 0. 0 is represented with an exponent of 0, so the
-  // "kExpBias - 1/3 * exp" below gives the wrong result. The IfThenZeroElse()
-  // sets those values as 0, which prevents having NaNs in the computations
-  // below.
-  // TODO(eustas): use fused op
-  const auto m2 = IfThenZeroElse(
-      Eq(m1, Zero(di)), Sub(kExpBias, Mul((ShiftRight<23>(m1)), kExpMul)));
-  auto r = BitCast(df, m2);
-
-  // Newton-Raphson iterations
-  for (int i = 0; i < 3; i++) {
-    const auto r2 = Mul(r, r);
-    r = NegMulAdd(xa_3, Mul(r2, r2), Mul(k4_3, r));
-  }
-  // Final iteration
-  auto r2 = Mul(r, r);
-  r = MulAdd(k1_3, NegMulAdd(xa, Mul(r2, r2), r), r);
-  r2 = Mul(r, r);
-  r = MulAdd(r2, x, add);
-
-  return r;
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#endif  // LIB_JXL_BASE_FAST_MATH_INL_H_
-
-#if HWY_ONCE
-#ifndef LIB_JXL_BASE_FAST_MATH_ONCE
-#define LIB_JXL_BASE_FAST_MATH_ONCE
-
-namespace jxl {
-inline float FastLog2f(float f) { return HWY_STATIC_DISPATCH(FastLog2f)(f); }
-inline float FastPow2f(float f) { return HWY_STATIC_DISPATCH(FastPow2f)(f); }
-inline float FastPowf(float b, float e) {
-  return HWY_STATIC_DISPATCH(FastPowf)(b, e);
-}
-inline float FastCosf(float f) { return HWY_STATIC_DISPATCH(FastCosf)(f); }
-inline float FastErff(float f) { return HWY_STATIC_DISPATCH(FastErff)(f); }
-}  // namespace jxl
-
-#endif  // LIB_JXL_BASE_FAST_MATH_ONCE
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/base/float.h b/third_party/jpeg-xl/lib/jxl/base/float.h
deleted file mode 100644
index 50af582b6f54a..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/float.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_FLOAT_H_
-#define LIB_JXL_BASE_FLOAT_H_
-
-#include <jxl/types.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-namespace detail {
-// Based on highway scalar implementation, for testing
-static JXL_INLINE float LoadFloat16(uint16_t bits16) {
-  const uint32_t sign = bits16 >> 15;
-  const uint32_t biased_exp = (bits16 >> 10) & 0x1F;
-  const uint32_t mantissa = bits16 & 0x3FF;
-
-  // Subnormal or zero
-  if (biased_exp == 0) {
-    const float subnormal =
-        (1.0f / 16384) * (static_cast<float>(mantissa) * (1.0f / 1024));
-    return sign ? -subnormal : subnormal;
-  }
-
-  // Normalized: convert the representation directly (faster than ldexp/tables).
-  const uint32_t biased_exp32 = biased_exp + (127 - 15);
-  const uint32_t mantissa32 = mantissa << (23 - 10);
-  const uint32_t bits32 = (sign << 31) | (biased_exp32 << 23) | mantissa32;
-
-  float result;
-  memcpy(&result, &bits32, 4);
-  return result;
-}
-}  // namespace detail
-
-template <typename SaveFloatAtFn>
-static Status JXL_INLINE LoadFloatRow(const uint8_t* src, size_t count,
-                                      size_t stride, JxlDataType type,
-                                      bool little_endian, float scale,
-                                      SaveFloatAtFn callback) {
-  switch (type) {
-    case JXL_TYPE_FLOAT:
-      if (little_endian) {
-        for (size_t i = 0; i < count; ++i) {
-          callback(i, LoadLEFloat(src + stride * i));
-        }
-      } else {
-        for (size_t i = 0; i < count; ++i) {
-          callback(i, LoadBEFloat(src + stride * i));
-        }
-      }
-      return true;
-
-    case JXL_TYPE_UINT8:
-      for (size_t i = 0; i < count; ++i) {
-        callback(i, src[stride * i] * scale);
-      }
-      return true;
-
-    case JXL_TYPE_UINT16:
-      if (little_endian) {
-        for (size_t i = 0; i < count; ++i) {
-          callback(i, LoadLE16(src + stride * i) * scale);
-        }
-      } else {
-        for (size_t i = 0; i < count; ++i) {
-          callback(i, LoadBE16(src + stride * i) * scale);
-        }
-      }
-      return true;
-
-    case JXL_TYPE_FLOAT16:
-      if (little_endian) {
-        for (size_t i = 0; i < count; ++i) {
-          callback(i, detail::LoadFloat16(LoadLE16(src + stride * i)));
-        }
-      } else {
-        for (size_t i = 0; i < count; ++i) {
-          callback(i, detail::LoadFloat16(LoadBE16(src + stride * i)));
-        }
-      }
-      return true;
-
-    default:
-      return JXL_FAILURE("Unsupported sample format");
-  }
-}
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_BASE_FLOAT_H_
diff --git a/third_party/jpeg-xl/lib/jxl/base/iaca.h b/third_party/jpeg-xl/lib/jxl/base/iaca.h
deleted file mode 100644
index e5732dae5c81c..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/iaca.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_IACA_H_
-#define LIB_JXL_BASE_IACA_H_
-
-#include "lib/jxl/base/compiler_specific.h"
-
-// IACA (Intel's Code Analyzer) analyzes instruction latencies, but only for
-// code between special markers. These functions embed such markers in an
-// executable, but only for reading via IACA - they deliberately trigger a
-// crash if executed to ensure they are removed in normal builds.
-
-#ifndef JXL_IACA_ENABLED
-#define JXL_IACA_ENABLED 0
-#endif
-
-namespace jxl {
-
-// Call before the region of interest.
-static JXL_INLINE void BeginIACA() {
-#if JXL_IACA_ENABLED && (JXL_COMPILER_GCC || JXL_COMPILER_CLANG)
-  asm volatile(
-      // UD2 "instruction" raises an invalid opcode exception.
-      ".byte 0x0F, 0x0B\n\t"
-      // Magic sequence recognized by IACA (MOV + addr32 fs:NOP). This actually
-      // clobbers EBX, but we don't care because the code won't be run, and we
-      // want IACA to observe the same code the compiler would have generated
-      // without this marker.
-      "movl $111, %%ebx\n\t"
-      ".byte 0x64, 0x67, 0x90\n\t"
-      :
-      :
-      // (Allegedly) clobbering memory may prevent reordering.
-      : "memory");
-#endif
-}
-
-// Call after the region of interest.
-static JXL_INLINE void EndIACA() {
-#if JXL_IACA_ENABLED && (JXL_COMPILER_GCC || JXL_COMPILER_CLANG)
-  asm volatile(
-      // See above.
-      "movl $222, %%ebx\n\t"
-      ".byte 0x64, 0x67, 0x90\n\t"
-      // UD2
-      ".byte 0x0F, 0x0B\n\t"
-      :
-      :
-      // (Allegedly) clobbering memory may prevent reordering.
-      : "memory");
-#endif
-}
-
-// Add to a scope to mark a region.
-struct ScopeIACA {
-  JXL_INLINE ScopeIACA() { BeginIACA(); }
-  JXL_INLINE ~ScopeIACA() { EndIACA(); }
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_BASE_IACA_H_
diff --git a/third_party/jpeg-xl/lib/jxl/base/include_jpeglib.h b/third_party/jpeg-xl/lib/jxl/base/include_jpeglib.h
deleted file mode 100644
index f72d13d04bad0..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/include_jpeglib.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_INCLUDE_JPEGLIB_H_
-#define LIB_JXL_BASE_INCLUDE_JPEGLIB_H_
-
-// Using this header ensures that includes go in the right order,
-// not alphabetically sorted.
-
-// NOLINTBEGIN
-/* clang-format off */
-#include <stdio.h>  // IWYU pragma: keep
-#include <jpeglib.h>  // IWYU pragma: keep
-#include <setjmp.h>  // IWYU pragma: keep
-/* clang-format on */
-// NOLINTEND
-
-#endif  // LIB_JXL_BASE_INCLUDE_JPEGLIB_H_
diff --git a/third_party/jpeg-xl/lib/jxl/base/matrix_ops.h b/third_party/jpeg-xl/lib/jxl/base/matrix_ops.h
deleted file mode 100644
index e1f8753932581..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/matrix_ops.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_MATRIX_OPS_H_
-#define LIB_JXL_BASE_MATRIX_OPS_H_
-
-// 3x3 matrix operations.
-
-#include <array>
-#include <cmath>  // abs
-#include <cstddef>
-
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-typedef std::array<float, 3> Vector3;
-typedef std::array<double, 3> Vector3d;
-typedef std::array<Vector3, 3> Matrix3x3;
-typedef std::array<Vector3d, 3> Matrix3x3d;
-
-// Computes C = A * B, where A, B, C are 3x3 matrices.
-template <typename Matrix>
-void Mul3x3Matrix(const Matrix& a, const Matrix& b, Matrix& c) {
-  for (size_t x = 0; x < 3; x++) {
-    alignas(16) Vector3d temp{b[0][x], b[1][x], b[2][x]};  // transpose
-    for (size_t y = 0; y < 3; y++) {
-      c[y][x] = a[y][0] * temp[0] + a[y][1] * temp[1] + a[y][2] * temp[2];
-    }
-  }
-}
-
-// Computes C = A * B, where A is 3x3 matrix and B is vector.
-template <typename Matrix, typename Vector>
-void Mul3x3Vector(const Matrix& a, const Vector& b, Vector& c) {
-  for (size_t y = 0; y < 3; y++) {
-    double e = 0;
-    for (size_t x = 0; x < 3; x++) {
-      e += a[y][x] * b[x];
-    }
-    c[y] = e;
-  }
-}
-
-// Inverts a 3x3 matrix in place.
-template <typename Matrix>
-Status Inv3x3Matrix(Matrix& matrix) {
-  // Intermediate computation is done in double precision.
-  Matrix3x3d temp;
-  temp[0][0] = static_cast<double>(matrix[1][1]) * matrix[2][2] -
-               static_cast<double>(matrix[1][2]) * matrix[2][1];
-  temp[0][1] = static_cast<double>(matrix[0][2]) * matrix[2][1] -
-               static_cast<double>(matrix[0][1]) * matrix[2][2];
-  temp[0][2] = static_cast<double>(matrix[0][1]) * matrix[1][2] -
-               static_cast<double>(matrix[0][2]) * matrix[1][1];
-  temp[1][0] = static_cast<double>(matrix[1][2]) * matrix[2][0] -
-               static_cast<double>(matrix[1][0]) * matrix[2][2];
-  temp[1][1] = static_cast<double>(matrix[0][0]) * matrix[2][2] -
-               static_cast<double>(matrix[0][2]) * matrix[2][0];
-  temp[1][2] = static_cast<double>(matrix[0][2]) * matrix[1][0] -
-               static_cast<double>(matrix[0][0]) * matrix[1][2];
-  temp[2][0] = static_cast<double>(matrix[1][0]) * matrix[2][1] -
-               static_cast<double>(matrix[1][1]) * matrix[2][0];
-  temp[2][1] = static_cast<double>(matrix[0][1]) * matrix[2][0] -
-               static_cast<double>(matrix[0][0]) * matrix[2][1];
-  temp[2][2] = static_cast<double>(matrix[0][0]) * matrix[1][1] -
-               static_cast<double>(matrix[0][1]) * matrix[1][0];
-  double det = matrix[0][0] * temp[0][0] + matrix[0][1] * temp[1][0] +
-               matrix[0][2] * temp[2][0];
-  if (std::abs(det) < 1e-10) {
-    return JXL_FAILURE("Matrix determinant is too close to 0");
-  }
-  double idet = 1.0 / det;
-  for (size_t j = 0; j < 3; j++) {
-    for (size_t i = 0; i < 3; i++) {
-      matrix[j][i] = temp[j][i] * idet;
-    }
-  }
-  return true;
-}
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_BASE_MATRIX_OPS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/base/os_macros.h b/third_party/jpeg-xl/lib/jxl/base/os_macros.h
deleted file mode 100644
index 84d0b82bf5c14..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/os_macros.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_OS_MACROS_H_
-#define LIB_JXL_BASE_OS_MACROS_H_
-
-// Defines the JXL_OS_* macros.
-
-#if defined(_WIN32) || defined(_WIN64)
-#define JXL_OS_WIN 1
-#else
-#define JXL_OS_WIN 0
-#endif
-
-#ifdef __linux__
-#define JXL_OS_LINUX 1
-#else
-#define JXL_OS_LINUX 0
-#endif
-
-#ifdef __APPLE__
-#define JXL_OS_MAC 1
-#else
-#define JXL_OS_MAC 0
-#endif
-
-#define JXL_OS_IOS 0
-#ifdef __APPLE__
-#include <TargetConditionals.h>
-#if TARGET_OS_IPHONE
-#undef JXL_OS_IOS
-#define JXL_OS_IOS 1
-#endif
-#endif
-
-#ifdef __FreeBSD__
-#define JXL_OS_FREEBSD 1
-#else
-#define JXL_OS_FREEBSD 0
-#endif
-
-#ifdef __HAIKU__
-#define JXL_OS_HAIKU 1
-#else
-#define JXL_OS_HAIKU 0
-#endif
-
-#endif  // LIB_JXL_BASE_OS_MACROS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/base/override.h b/third_party/jpeg-xl/lib/jxl/base/override.h
deleted file mode 100644
index da070e6e62430..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/override.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_OVERRIDE_H_
-#define LIB_JXL_BASE_OVERRIDE_H_
-
-#include <cstdint>
-
-// 'Trool' for command line arguments: force enable/disable, or use default.
-
-namespace jxl {
-
-// No effect if kDefault, otherwise forces a feature (typically a FrameHeader
-// flag) on or off.
-enum class Override : int8_t { kOn = 1, kOff = 0, kDefault = -1 };
-
-static inline Override OverrideFromBool(bool flag) {
-  return flag ? Override::kOn : Override::kOff;
-}
-
-static inline bool ApplyOverride(Override o, bool default_condition) {
-  if (o == Override::kOn) return true;
-  if (o == Override::kOff) return false;
-  return default_condition;
-}
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_BASE_OVERRIDE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/base/printf_macros.h b/third_party/jpeg-xl/lib/jxl/base/printf_macros.h
deleted file mode 100644
index 3215052afdec4..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/printf_macros.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_PRINTF_MACROS_H_
-#define LIB_JXL_BASE_PRINTF_MACROS_H_
-
-// Format string macros. These should be included after any other system
-// library since those may unconditionally define these, depending on the
-// platform.
-
-// PRIuS and PRIdS macros to print size_t and ssize_t respectively.
-#if !defined(PRIdS)
-#if defined(_WIN64)
-#define PRIdS "lld"
-#elif defined(_WIN32)
-#define PRIdS "d"
-#else
-#define PRIdS "zd"
-#endif
-#endif  // PRIdS
-
-#if !defined(PRIuS)
-#if defined(_WIN64)
-#define PRIuS "llu"
-#elif defined(_WIN32)
-#define PRIuS "u"
-#else
-#define PRIuS "zu"
-#endif
-#endif  // PRIuS
-
-#endif  // LIB_JXL_BASE_PRINTF_MACROS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/base/random.h b/third_party/jpeg-xl/lib/jxl/base/random.h
deleted file mode 100644
index 6922e282e83bc..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/random.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_RANDOM_
-#define LIB_JXL_BASE_RANDOM_
-
-// Random number generator + distributions.
-// We don't use <random> because the implementation (and thus results) differs
-// between libstdc++ and libc++.
-
-#include <stdint.h>
-#include <string.h>
-
-#include <algorithm>
-#include <cmath>
-
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-struct Rng {
-  explicit Rng(uint64_t seed)
-      : s{static_cast<uint64_t>(0x94D049BB133111EBull),
-          static_cast<uint64_t>(0xBF58476D1CE4E5B9ull) + seed} {}
-
-  // Xorshift128+ adapted from xorshift128+-inl.h
-  uint64_t operator()() {
-    uint64_t s1 = s[0];
-    const uint64_t s0 = s[1];
-    const uint64_t bits = s1 + s0;  // b, c
-    s[0] = s0;
-    s1 ^= s1 << 23;
-    s1 ^= s0 ^ (s1 >> 18) ^ (s0 >> 5);
-    s[1] = s1;
-    return bits;
-  }
-
-  // Uniformly distributed int64_t in [begin, end), under the assumption that
-  // `end-begin` is significantly smaller than 1<<64, otherwise there is some
-  // bias.
-  int64_t UniformI(int64_t begin, int64_t end) {
-    JXL_DASSERT(end > begin);
-    return static_cast<int64_t>((*this)() %
-                                static_cast<uint64_t>(end - begin)) +
-           begin;
-  }
-
-  // Same as UniformI, but for uint64_t.
-  uint64_t UniformU(uint64_t begin, uint64_t end) {
-    JXL_DASSERT(end > begin);
-    return (*this)() % (end - begin) + begin;
-  }
-
-  // Uniformly distributed float in [begin, end) range. Note: only 23 bits of
-  // randomness.
-  float UniformF(float begin, float end) {
-    float f;
-    // Bits of a random [1, 2) float.
-    uint32_t u = ((*this)() >> (64 - 23)) | 0x3F800000;
-    static_assert(sizeof(f) == sizeof(u),
-                  "Float and U32 must have the same size");
-    memcpy(&f, &u, sizeof(f));
-    // Note: (end-begin) * f + (2*begin-end) may fail to return a number >=
-    // begin.
-    return (end - begin) * (f - 1.0f) + begin;
-  }
-
-  // Bernoulli trial
-  bool Bernoulli(float p) { return UniformF(0, 1) < p; }
-
-  // State for geometric distributions.
-  // The stored value is inv_log_1mp
-  using GeometricDistribution = float;
-  static GeometricDistribution MakeGeometric(float p) {
-    return 1.0 / std::log(1 - p);
-  }
-
-  uint32_t Geometric(const GeometricDistribution& dist) {
-    float f = UniformF(0, 1);
-    float inv_log_1mp = dist;
-    float log = std::log(1 - f) * inv_log_1mp;
-    return static_cast<uint32_t>(log);
-  }
-
-  template <typename T>
-  void Shuffle(T* t, size_t n) {
-    for (size_t i = 0; i + 1 < n; i++) {
-      size_t a = UniformU(i, n);
-      std::swap(t[a], t[i]);
-    }
-  }
-
- private:
-  uint64_t s[2];
-};
-
-}  // namespace jxl
-#endif  // LIB_JXL_BASE_RANDOM_
diff --git a/third_party/jpeg-xl/lib/jxl/base/rational_polynomial-inl.h b/third_party/jpeg-xl/lib/jxl/base/rational_polynomial-inl.h
deleted file mode 100644
index 7a89c0bac1e38..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/rational_polynomial-inl.h
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Fast SIMD evaluation of rational polynomials for approximating functions.
-
-#if defined(LIB_JXL_BASE_RATIONAL_POLYNOMIAL_INL_H_) == \
-    defined(HWY_TARGET_TOGGLE)
-#ifdef LIB_JXL_BASE_RATIONAL_POLYNOMIAL_INL_H_
-#undef LIB_JXL_BASE_RATIONAL_POLYNOMIAL_INL_H_
-#else
-#define LIB_JXL_BASE_RATIONAL_POLYNOMIAL_INL_H_
-#endif
-
-#include <jxl/types.h>
-#include <stddef.h>
-
-#include <hwy/highway.h>
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-namespace {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Div;
-using hwy::HWY_NAMESPACE::MulAdd;
-
-// Primary template: default to actual division.
-template <typename T, class V>
-struct FastDivision {
-  HWY_INLINE V operator()(const V n, const V d) const { return n / d; }
-};
-// Partial specialization for float vectors.
-template <class V>
-struct FastDivision<float, V> {
-  // One Newton-Raphson iteration.
-  static HWY_INLINE V ReciprocalNR(const V x) {
-    const auto rcp = ApproximateReciprocal(x);
-    const auto sum = Add(rcp, rcp);
-    const auto x_rcp = Mul(x, rcp);
-    return NegMulAdd(x_rcp, rcp, sum);
-  }
-
-  V operator()(const V n, const V d) const {
-#if JXL_TRUE  // Faster on SKX
-    return Div(n, d);
-#else
-    return n * ReciprocalNR(d);
-#endif
-  }
-};
-
-// Approximates smooth functions via rational polynomials (i.e. dividing two
-// polynomials). Evaluates polynomials via Horner's scheme, which is faster than
-// Clenshaw recurrence for Chebyshev polynomials. LoadDup128 allows us to
-// specify constants (replicated 4x) independently of the lane count.
-template <size_t NP, size_t NQ, class D, class V, typename T>
-HWY_INLINE HWY_MAYBE_UNUSED V EvalRationalPolynomial(const D d, const V x,
-                                                     const T (&p)[NP],
-                                                     const T (&q)[NQ]) {
-  constexpr size_t kDegP = NP / 4 - 1;
-  constexpr size_t kDegQ = NQ / 4 - 1;
-  auto yp = LoadDup128(d, &p[kDegP * 4]);
-  auto yq = LoadDup128(d, &q[kDegQ * 4]);
-  // We use pointer arithmetic to refer to &p[(kDegP - n) * 4] to avoid a
-  // compiler warning that the index is out of bounds since we are already
-  // checking that it is not out of bounds with (kDegP >= n) and the access
-  // will be optimized away. Similarly with q and kDegQ.
-  HWY_FENCE;
-  if (kDegP >= 1) yp = MulAdd(yp, x, LoadDup128(d, p + ((kDegP - 1) * 4)));
-  if (kDegQ >= 1) yq = MulAdd(yq, x, LoadDup128(d, q + ((kDegQ - 1) * 4)));
-  HWY_FENCE;
-  if (kDegP >= 2) yp = MulAdd(yp, x, LoadDup128(d, p + ((kDegP - 2) * 4)));
-  if (kDegQ >= 2) yq = MulAdd(yq, x, LoadDup128(d, q + ((kDegQ - 2) * 4)));
-  HWY_FENCE;
-  if (kDegP >= 3) yp = MulAdd(yp, x, LoadDup128(d, p + ((kDegP - 3) * 4)));
-  if (kDegQ >= 3) yq = MulAdd(yq, x, LoadDup128(d, q + ((kDegQ - 3) * 4)));
-  HWY_FENCE;
-  if (kDegP >= 4) yp = MulAdd(yp, x, LoadDup128(d, p + ((kDegP - 4) * 4)));
-  if (kDegQ >= 4) yq = MulAdd(yq, x, LoadDup128(d, q + ((kDegQ - 4) * 4)));
-  HWY_FENCE;
-  if (kDegP >= 5) yp = MulAdd(yp, x, LoadDup128(d, p + ((kDegP - 5) * 4)));
-  if (kDegQ >= 5) yq = MulAdd(yq, x, LoadDup128(d, q + ((kDegQ - 5) * 4)));
-  HWY_FENCE;
-  if (kDegP >= 6) yp = MulAdd(yp, x, LoadDup128(d, p + ((kDegP - 6) * 4)));
-  if (kDegQ >= 6) yq = MulAdd(yq, x, LoadDup128(d, q + ((kDegQ - 6) * 4)));
-  HWY_FENCE;
-  if (kDegP >= 7) yp = MulAdd(yp, x, LoadDup128(d, p + ((kDegP - 7) * 4)));
-  if (kDegQ >= 7) yq = MulAdd(yq, x, LoadDup128(d, q + ((kDegQ - 7) * 4)));
-
-  static_assert(kDegP < 8, "Polynomial degree is too high");
-  static_assert(kDegQ < 8, "Polynomial degree is too high");
-
-  return FastDivision<T, V>()(yp, yq);
-}
-
-}  // namespace
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-#endif  // LIB_JXL_BASE_RATIONAL_POLYNOMIAL_INL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/base/rect.h b/third_party/jpeg-xl/lib/jxl/base/rect.h
deleted file mode 100644
index 31fe12dfb9529..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/rect.h
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_RECT_H_
-#define LIB_JXL_BASE_RECT_H_
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <sstream>
-#include <string>
-#include <utility>  // std::move
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-// Rectangular region in image(s). Factoring this out of Image instead of
-// shifting the pointer by x0/y0 allows this to apply to multiple images with
-// different resolutions (e.g. color transform and quantization field).
-// Can compare using SameSize(rect1, rect2).
-template <typename T>
-class RectT {
- public:
-  // Most windows are xsize_max * ysize_max, except those on the borders where
-  // begin + size_max > end.
-  constexpr RectT(T xbegin, T ybegin, size_t xsize_max, size_t ysize_max,
-                  T xend, T yend)
-      : x0_(xbegin),
-        y0_(ybegin),
-        xsize_(ClampedSize(xbegin, xsize_max, xend)),
-        ysize_(ClampedSize(ybegin, ysize_max, yend)) {}
-
-  // Construct with origin and known size (typically from another Rect).
-  constexpr RectT(T xbegin, T ybegin, size_t xsize, size_t ysize)
-      : x0_(xbegin), y0_(ybegin), xsize_(xsize), ysize_(ysize) {}
-
-  // Construct a rect that covers a whole image/plane/ImageBundle etc.
-  template <typename ImageT>
-  explicit RectT(const ImageT& image)
-      : RectT(0, 0, image.xsize(), image.ysize()) {}
-
-  RectT() : RectT(0, 0, 0, 0) {}
-
-  RectT(const RectT&) = default;
-  RectT& operator=(const RectT&) = default;
-
-  // Construct a subrect that resides in an image/plane/ImageBundle etc.
-  template <typename ImageT>
-  RectT Crop(const ImageT& image) const {
-    return Intersection(RectT(image));
-  }
-
-  // Construct a subrect that resides in the [0, ysize) x [0, xsize) region of
-  // the current rect.
-  RectT Crop(size_t area_xsize, size_t area_ysize) const {
-    return Intersection(RectT(0, 0, area_xsize, area_ysize));
-  }
-
-  JXL_MUST_USE_RESULT RectT Intersection(const RectT& other) const {
-    return RectT(std::max(x0_, other.x0_), std::max(y0_, other.y0_), xsize_,
-                 ysize_, std::min(x1(), other.x1()),
-                 std::min(y1(), other.y1()));
-  }
-
-  JXL_MUST_USE_RESULT RectT Translate(int64_t x_offset,
-                                      int64_t y_offset) const {
-    return RectT(x0_ + x_offset, y0_ + y_offset, xsize_, ysize_);
-  }
-
-  template <template <class> class P, typename V>
-  V* Row(P<V>* image, size_t y) const {
-    JXL_DASSERT(y + y0_ >= 0);
-    return image->Row(y + y0_) + x0_;
-  }
-
-  template <template <class> class P, typename V>
-  const V* Row(const P<V>* image, size_t y) const {
-    JXL_DASSERT(y + y0_ >= 0);
-    return image->Row(y + y0_) + x0_;
-  }
-
-  template <template <class> class MP, typename V>
-  V* PlaneRow(MP<V>* image, const size_t c, size_t y) const {
-    JXL_DASSERT(y + y0_ >= 0);
-    return image->PlaneRow(c, y + y0_) + x0_;
-  }
-
-  template <template <class> class P, typename V>
-  const V* ConstRow(const P<V>& image, size_t y) const {
-    JXL_DASSERT(y + y0_ >= 0);
-    return image.ConstRow(y + y0_) + x0_;
-  }
-
-  template <template <class> class MP, typename V>
-  const V* ConstPlaneRow(const MP<V>& image, size_t c, size_t y) const {
-    JXL_DASSERT(y + y0_ >= 0);
-    return image.ConstPlaneRow(c, y + y0_) + x0_;
-  }
-
-  bool IsInside(const RectT& other) const {
-    return x0_ >= other.x0() && x1() <= other.x1() && y0_ >= other.y0() &&
-           y1() <= other.y1();
-  }
-
-  bool IsSame(const RectT& other) const {
-    return x0_ == other.x0_ && xsize_ == other.xsize_ && y0_ == other.y0_ &&
-           ysize_ <= other.ysize_;
-  }
-
-  // Returns true if this Rect fully resides in the given image. ImageT could be
-  // Plane<T> or Image3<T>; however if ImageT is Rect, results are nonsensical.
-  template <class ImageT>
-  bool IsInside(const ImageT& image) const {
-    return IsInside(RectT(image));
-  }
-
-  T x0() const { return x0_; }
-  T y0() const { return y0_; }
-  size_t xsize() const { return xsize_; }
-  size_t ysize() const { return ysize_; }
-  T x1() const { return x0_ + xsize_; }
-  T y1() const { return y0_ + ysize_; }
-
-  RectT<T> ShiftLeft(size_t shiftx, size_t shifty) const {
-    return RectT<T>(x0_ * (1 << shiftx), y0_ * (1 << shifty), xsize_ << shiftx,
-                    ysize_ << shifty);
-  }
-  RectT<T> ShiftLeft(size_t shift) const { return ShiftLeft(shift, shift); }
-
-  // Requires x0(), y0() to be multiples of 1<<shiftx, 1<<shifty.
-  StatusOr<RectT<T>> CeilShiftRight(std::pair<size_t, size_t> shift) const {
-    size_t shiftx = shift.first;
-    size_t shifty = shift.second;
-    JXL_ENSURE((x0_ % (1 << shiftx) == 0) && (y0_ % (1 << shifty) == 0));
-    return RectT<T>(x0_ / (1 << shiftx), y0_ / (1 << shifty),
-                    DivCeil(xsize_, T{1} << shiftx),
-                    DivCeil(ysize_, T{1} << shifty));
-  }
-
-  RectT<T> Extend(T border, RectT<T> parent) const {
-    T new_x0 = x0() > parent.x0() + border ? x0() - border : parent.x0();
-    T new_y0 = y0() > parent.y0() + border ? y0() - border : parent.y0();
-    T new_x1 = x1() + border > parent.x1() ? parent.x1() : x1() + border;
-    T new_y1 = y1() + border > parent.y1() ? parent.y1() : y1() + border;
-    return RectT<T>(new_x0, new_y0, new_x1 - new_x0, new_y1 - new_y0);
-  }
-
-  template <typename U>
-  RectT<U> As() const {
-    return RectT<U>(static_cast<U>(x0_), static_cast<U>(y0_),
-                    static_cast<U>(xsize_), static_cast<U>(ysize_));
-  }
-
- private:
-  // Returns size_max, or whatever is left in [begin, end).
-  static constexpr size_t ClampedSize(T begin, size_t size_max, T end) {
-    return (static_cast<T>(begin + size_max) <= end)
-               ? size_max
-               : (end > begin ? end - begin : 0);
-  }
-
-  T x0_;
-  T y0_;
-
-  size_t xsize_;
-  size_t ysize_;
-};
-
-template <typename T>
-std::string Description(RectT<T> r) {
-  std::ostringstream os;
-  os << "[" << r.x0() << ".." << r.x1() << ")x"
-     << "[" << r.y0() << ".." << r.y1() << ")";
-  return os.str();
-}
-
-using Rect = RectT<size_t>;
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_BASE_RECT_H_
diff --git a/third_party/jpeg-xl/lib/jxl/base/sanitizer_definitions.h b/third_party/jpeg-xl/lib/jxl/base/sanitizer_definitions.h
deleted file mode 100644
index 315f3bd0035f9..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/sanitizer_definitions.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_SANITIZER_DEFINITIONS_H_
-#define LIB_JXL_BASE_SANITIZER_DEFINITIONS_H_
-
-#ifdef MEMORY_SANITIZER
-#define JXL_MEMORY_SANITIZER 1
-#elif defined(__has_feature)
-#if __has_feature(memory_sanitizer)
-#define JXL_MEMORY_SANITIZER 1
-#else
-#define JXL_MEMORY_SANITIZER 0
-#endif
-#else
-#define JXL_MEMORY_SANITIZER 0
-#endif
-
-#ifdef ADDRESS_SANITIZER
-#define JXL_ADDRESS_SANITIZER 1
-#elif defined(__has_feature)
-#if __has_feature(address_sanitizer)
-#define JXL_ADDRESS_SANITIZER 1
-#else
-#define JXL_ADDRESS_SANITIZER 0
-#endif
-#else
-#define JXL_ADDRESS_SANITIZER 0
-#endif
-
-#ifdef THREAD_SANITIZER
-#define JXL_THREAD_SANITIZER 1
-#elif defined(__has_feature)
-#if __has_feature(thread_sanitizer)
-#define JXL_THREAD_SANITIZER 1
-#else
-#define JXL_THREAD_SANITIZER 0
-#endif
-#else
-#define JXL_THREAD_SANITIZER 0
-#endif
-#endif  // LIB_JXL_BASE_SANITIZER_DEFINITIONS_H
diff --git a/third_party/jpeg-xl/lib/jxl/base/sanitizers.h b/third_party/jpeg-xl/lib/jxl/base/sanitizers.h
deleted file mode 100644
index 57dc3c13a53d3..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/sanitizers.h
+++ /dev/null
@@ -1,233 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_SANITIZERS_H_
-#define LIB_JXL_SANITIZERS_H_
-
-#include <cstddef>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/sanitizer_definitions.h"
-
-#if JXL_MEMORY_SANITIZER
-#include <algorithm>
-#include <cinttypes>  // PRId64
-#include <cstdio>
-#include <string>
-#include <vector>
-
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "sanitizer/msan_interface.h"
-#endif
-
-namespace jxl {
-namespace msan {
-
-#if JXL_MEMORY_SANITIZER
-
-// Chosen so that kSanitizerSentinel is four copies of kSanitizerSentinelByte.
-constexpr uint8_t kSanitizerSentinelByte = 0x48;
-constexpr float kSanitizerSentinel = 205089.125f;
-
-static JXL_INLINE JXL_MAYBE_UNUSED void PoisonMemory(const volatile void* m,
-                                                     size_t size) {
-  __msan_poison(m, size);
-}
-
-static JXL_INLINE JXL_MAYBE_UNUSED void UnpoisonMemory(const volatile void* m,
-                                                       size_t size) {
-  __msan_unpoison(m, size);
-}
-
-static JXL_INLINE JXL_MAYBE_UNUSED void MemoryIsInitialized(
-    const volatile void* m, size_t size) {
-  __msan_check_mem_is_initialized(m, size);
-}
-
-// Mark all the bytes of an image (including padding) as poisoned bytes.
-template <typename Pixels>
-static JXL_INLINE JXL_MAYBE_UNUSED void PoisonImage(const Pixels& im) {
-  PoisonMemory(im.bytes(), im.bytes_per_row() * im.ysize());
-}
-
-namespace {
-
-// Print the uninitialized regions of an image.
-template <typename Pixels>
-static JXL_INLINE JXL_MAYBE_UNUSED void PrintImageUninitialized(
-    const Pixels& im) {
-  fprintf(stderr,
-          "Uninitialized regions for image of size %" PRIu64 "x%" PRIu64 ":\n",
-          static_cast<uint64_t>(im.xsize()), static_cast<uint64_t>(im.ysize()));
-
-  // A segment of uninitialized pixels in a row, in the format [first, second).
-  typedef std::pair<size_t, size_t> PixelSegment;
-
-  // Helper class to merge and print a list of rows of PixelSegment that may be
-  // the same over big ranges of rows. This compacts the output to ranges of
-  // rows like "[y0, y1): [x0, x1) [x2, x3)".
-  class RowsMerger {
-   public:
-    // Add a new row the list of rows. If the row is the same as the previous
-    // one it will be merged showing a range of rows [y0, y1), but if the new
-    // row is different the current range of rows (if any) will be printed and a
-    // new one will be started.
-    void AddRow(size_t y, std::vector<PixelSegment>&& new_row) {
-      if (start_y_ != -1 && new_row != segments_) {
-        PrintRow(y);
-      }
-      if (new_row.empty()) {
-        // Skip ranges with no uninitialized pixels.
-        start_y_ = -1;
-        segments_.clear();
-        return;
-      }
-      if (start_y_ == -1) {
-        start_y_ = y;
-        segments_ = std::move(new_row);
-      }
-    }
-
-    // Print the contents of the range of rows [start_y_, end_y) if any.
-    void PrintRow(size_t end_y) {
-      if (start_y_ == -1) return;
-      if (segments_.empty()) {
-        start_y_ = -1;
-        return;
-      }
-      if (end_y - start_y_ > 1) {
-        fprintf(stderr, " y=[%" PRId64 ", %" PRIu64 "):",
-                static_cast<int64_t>(start_y_), static_cast<uint64_t>(end_y));
-      } else {
-        fprintf(stderr, " y=[%" PRId64 "]:", static_cast<int64_t>(start_y_));
-      }
-      for (const auto& seg : segments_) {
-        if (seg.first + 1 == seg.second) {
-          fprintf(stderr, " [%" PRId64 "]", static_cast<int64_t>(seg.first));
-        } else {
-          fprintf(stderr, " [%" PRId64 ", %" PRIu64 ")",
-                  static_cast<int64_t>(seg.first),
-                  static_cast<uint64_t>(seg.second));
-        }
-      }
-      fprintf(stderr, "\n");
-      start_y_ = -1;
-    }
-
-   private:
-    std::vector<PixelSegment> segments_;
-    // Row number of the first row in the range of rows that have |segments| as
-    // the undefined segments.
-    ssize_t start_y_ = -1;
-  } rows_merger;
-
-  class SegmentsMerger {
-   public:
-    void AddValue(size_t x) {
-      if (row.empty() || row.back().second != x) {
-        row.emplace_back(x, x + 1);
-      } else {
-        row.back().second = x + 1;
-      }
-    }
-
-    std::vector<PixelSegment> row;
-  };
-
-  for (size_t y = 0; y < im.ysize(); y++) {
-    auto* row = im.Row(y);
-    SegmentsMerger seg_merger;
-    size_t x = 0;
-    while (x < im.xsize()) {
-      intptr_t ret =
-          __msan_test_shadow(row + x, (im.xsize() - x) * sizeof(row[0]));
-      if (ret < 0) break;
-      size_t next_x = x + ret / sizeof(row[0]);
-      seg_merger.AddValue(next_x);
-      x = next_x + 1;
-    }
-    rows_merger.AddRow(y, std::move(seg_merger.row));
-  }
-  rows_merger.PrintRow(im.ysize());
-}
-
-// Check that all the pixels in the provided rect of the image are initialized
-// (not poisoned). If any of the values is poisoned it will abort.
-template <typename Pixels>
-static JXL_INLINE JXL_MAYBE_UNUSED void CheckImageInitialized(
-    const Pixels& im, const Rect& r, size_t c, const char* message) {
-  JXL_DASSERT(r.x0() <= im.xsize());
-  JXL_DASSERT(r.x0() + r.xsize() <= im.xsize());
-  JXL_DASSERT(r.y0() <= im.ysize());
-  JXL_DASSERT(r.y0() + r.ysize() <= im.ysize());
-  for (size_t y = r.y0(); y < r.y0() + r.ysize(); y++) {
-    const auto* row = im.Row(y);
-    intptr_t ret = __msan_test_shadow(row + r.x0(), sizeof(*row) * r.xsize());
-    if (ret != -1) {
-      JXL_DEBUG(
-          1,
-          "Checking an image of %" PRIu64 " x %" PRIu64 ", rect x0=%" PRIu64
-          ", y0=%" PRIu64
-          ", "
-          "xsize=%" PRIu64 ", ysize=%" PRIu64,
-          static_cast<uint64_t>(im.xsize()), static_cast<uint64_t>(im.ysize()),
-          static_cast<uint64_t>(r.x0()), static_cast<uint64_t>(r.y0()),
-          static_cast<uint64_t>(r.xsize()), static_cast<uint64_t>(r.ysize()));
-      size_t x = ret / sizeof(*row);
-      JXL_DEBUG(1,
-                "CheckImageInitialized failed at x=%" PRIu64 ", y=%" PRIu64
-                ", c=%" PRIu64 ": %s",
-                static_cast<uint64_t>(r.x0() + x), static_cast<uint64_t>(y),
-                static_cast<uint64_t>(c), message ? message : "");
-      PrintImageUninitialized(im);
-    }
-    // This will report an error if memory is not initialized.
-    __msan_check_mem_is_initialized(row + r.x0(), sizeof(*row) * r.xsize());
-  }
-}
-
-template <typename Image>
-static JXL_INLINE JXL_MAYBE_UNUSED void CheckImageInitialized(
-    const Image& im, const Rect& r, const char* message) {
-  for (size_t c = 0; c < 3; c++) {
-    std::string str_message(message);
-    str_message += " c=" + std::to_string(c);
-    CheckImageInitialized(im.Plane(c), r, c, str_message.c_str());
-  }
-}
-
-}  // namespace
-
-#define JXL_CHECK_IMAGE_INITIALIZED(im, r) \
-  ::jxl::msan::CheckImageInitialized(im, r, "im=" #im ", r=" #r);
-
-#define JXL_CHECK_PLANE_INITIALIZED(im, r, c) \
-  ::jxl::msan::CheckImageInitialized(im, r, c, "im=" #im ", r=" #r ", c=" #c);
-
-#else  // JXL_MEMORY_SANITIZER
-
-// In non-msan mode these functions don't use volatile since it is not needed
-// for the empty functions.
-
-static JXL_INLINE JXL_MAYBE_UNUSED void PoisonMemory(const void* m,
-                                                     size_t size) {}
-static JXL_INLINE JXL_MAYBE_UNUSED void UnpoisonMemory(const void* m,
-                                                       size_t size) {}
-static JXL_INLINE JXL_MAYBE_UNUSED void MemoryIsInitialized(const void* m,
-                                                            size_t size) {}
-
-template <typename Pixels>
-static JXL_INLINE JXL_MAYBE_UNUSED void PoisonImage(const Pixels& im) {}
-
-#define JXL_CHECK_IMAGE_INITIALIZED(im, r)
-#define JXL_CHECK_PLANE_INITIALIZED(im, r, c)
-
-#endif
-
-}  // namespace msan
-}  // namespace jxl
-
-#endif  // LIB_JXL_SANITIZERS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/base/scope_guard.h b/third_party/jpeg-xl/lib/jxl/base/scope_guard.h
deleted file mode 100644
index 418ce2172321c..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/scope_guard.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_SCOPE_GUARD_H_
-#define LIB_JXL_BASE_SCOPE_GUARD_H_
-
-#include <utility>
-
-namespace jxl {
-
-template <typename Callback>
-class ScopeGuard {
- public:
-  // Discourage unnecessary moves / copies.
-  ScopeGuard(const ScopeGuard &) = delete;
-  ScopeGuard &operator=(const ScopeGuard &) = delete;
-  ScopeGuard &operator=(ScopeGuard &&) = delete;
-
-  // Pre-C++17 does not guarantee RVO -> require move constructor.
-  ScopeGuard(ScopeGuard &&other) noexcept
-      : callback_(std::move(other.callback_)) {
-    other.armed_ = false;
-  }
-
-  template <typename CallbackParam>
-  ScopeGuard(CallbackParam &&callback, bool armed)
-      : callback_(std::forward<CallbackParam>(callback)), armed_(armed) {}
-
-  ~ScopeGuard() {
-    if (armed_) callback_();
-  }
-
-  void Disarm() { armed_ = false; }
-
- private:
-  Callback callback_;
-  bool armed_;
-};
-
-template <typename Callback>
-ScopeGuard<Callback> MakeScopeGuard(Callback &&callback) {
-  return ScopeGuard<Callback>{std::forward<Callback>(callback), true};
-}
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_BASE_SCOPE_GUARD_H_
diff --git a/third_party/jpeg-xl/lib/jxl/base/span.h b/third_party/jpeg-xl/lib/jxl/base/span.h
deleted file mode 100644
index 6c0edfca89977..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/span.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_SPAN_H_
-#define LIB_JXL_BASE_SPAN_H_
-
-// Span (array view) is a non-owning container that provides cheap "cut"
-// operations and could be used as "ArrayLike" data source for PaddedBytes.
-
-#include <cstddef>
-#include <cstdint>
-#include <type_traits>
-#include <vector>
-
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-template <typename T>
-class Span {
- public:
-  constexpr Span() noexcept : Span(nullptr, 0) {}
-
-  constexpr Span(T* array, size_t length) noexcept
-      : ptr_(array), len_(length) {}
-
-  template <size_t N>
-  explicit constexpr Span(T (&a)[N]) noexcept : Span(a, N) {}
-
-  template <typename U>
-  constexpr Span(U* array, size_t length) noexcept
-      : ptr_(reinterpret_cast<T*>(array)), len_(length) {
-    static_assert(sizeof(U) == sizeof(T), "Incompatible type of source.");
-  }
-
-  template <typename ArrayLike>
-  explicit constexpr Span(const ArrayLike& other) noexcept
-      : Span(reinterpret_cast<T*>(other.data()), other.size()) {
-    static_assert(sizeof(*other.data()) == sizeof(T),
-                  "Incompatible type of source.");
-  }
-
-  using NCT = typename std::remove_const<T>::type;
-
-  constexpr T* data() const noexcept { return ptr_; }
-
-  constexpr size_t size() const noexcept { return len_; }
-
-  constexpr bool empty() const noexcept { return len_ == 0; }
-
-  constexpr T* begin() const noexcept { return data(); }
-
-  constexpr T* end() const noexcept { return data() + size(); }
-
-  constexpr T& operator[](size_t i) const noexcept {
-    // MSVC 2015 accepts this as constexpr, but not ptr_[i]
-    return *(data() + i);
-  }
-
-  Status remove_prefix(size_t n) noexcept {
-    JXL_ENSURE(size() >= n);
-    ptr_ += n;
-    len_ -= n;
-    return true;
-  }
-
-  void AppendTo(std::vector<NCT>& dst) const {
-    dst.insert(dst.end(), begin(), end());
-  }
-
-  std::vector<NCT> Copy() const { return std::vector<NCT>(begin(), end()); }
-
- private:
-  T* ptr_;
-  size_t len_;
-};
-
-typedef Span<const uint8_t> Bytes;
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_BASE_SPAN_H_
diff --git a/third_party/jpeg-xl/lib/jxl/base/status.h b/third_party/jpeg-xl/lib/jxl/base/status.h
deleted file mode 100644
index 6578abdcf82b7..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/base/status.h
+++ /dev/null
@@ -1,379 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_STATUS_H_
-#define LIB_JXL_BASE_STATUS_H_
-
-// Error handling: Status return type + helper macros.
-
-#include <cstdarg>
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-#include <type_traits>
-#include <utility>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-
-namespace jxl {
-
-// The Verbose level for the library
-#ifndef JXL_DEBUG_V_LEVEL
-#define JXL_DEBUG_V_LEVEL 0
-#endif  // JXL_DEBUG_V_LEVEL
-
-#ifdef USE_ANDROID_LOGGER
-#include <android/log.h>
-#define LIBJXL_ANDROID_LOG_TAG ("libjxl")
-inline void android_vprintf(const char* format, va_list args) {
-  char* message = nullptr;
-  int res = vasprintf(&message, format, args);
-  if (res != -1) {
-    __android_log_write(ANDROID_LOG_DEBUG, LIBJXL_ANDROID_LOG_TAG, message);
-    free(message);
-  }
-}
-#endif
-
-// Print a debug message on standard error or android logs. You should use the
-// JXL_DEBUG macro instead of calling Debug directly. This function returns
-// false, so it can be used as a return value in JXL_FAILURE.
-JXL_FORMAT(1, 2)
-inline JXL_NOINLINE bool Debug(const char* format, ...) {
-  va_list args;
-  va_start(args, format);
-#ifdef USE_ANDROID_LOGGER
-  android_vprintf(format, args);
-#else
-  vfprintf(stderr, format, args);
-#endif
-  va_end(args);
-  return false;
-}
-
-// Print a debug message on standard error if "enabled" is true. "enabled" is
-// normally a macro that evaluates to 0 or 1 at compile time, so the Debug
-// function is never called and optimized out in release builds. Note that the
-// arguments are compiled but not evaluated when enabled is false. The format
-// string must be a explicit string in the call, for example:
-//   JXL_DEBUG(JXL_DEBUG_MYMODULE, "my module message: %d", some_var);
-// Add a header at the top of your module's .cc or .h file (depending on whether
-// you have JXL_DEBUG calls from the .h as well) like this:
-//   #ifndef JXL_DEBUG_MYMODULE
-//   #define JXL_DEBUG_MYMODULE 0
-//   #endif JXL_DEBUG_MYMODULE
-#define JXL_DEBUG_TMP(format, ...) \
-  ::jxl::Debug(("%s:%d: " format "\n"), __FILE__, __LINE__, ##__VA_ARGS__)
-
-#define JXL_DEBUG(enabled, format, ...)     \
-  do {                                      \
-    if (enabled) {                          \
-      JXL_DEBUG_TMP(format, ##__VA_ARGS__); \
-    }                                       \
-  } while (0)
-
-// JXL_DEBUG version that prints the debug message if the global verbose level
-// defined at compile time by JXL_DEBUG_V_LEVEL is greater or equal than the
-// passed level.
-#if JXL_DEBUG_V_LEVEL > 0
-#define JXL_DEBUG_V(level, format, ...) \
-  JXL_DEBUG(level <= JXL_DEBUG_V_LEVEL, format, ##__VA_ARGS__)
-#else
-#define JXL_DEBUG_V(level, format, ...)
-#endif
-
-#define JXL_WARNING(format, ...) \
-  JXL_DEBUG(JXL_IS_DEBUG_BUILD, format, ##__VA_ARGS__)
-
-#if JXL_IS_DEBUG_BUILD
-// Exits the program after printing a stack trace when possible.
-JXL_NORETURN inline JXL_NOINLINE bool Abort() {
-  JXL_PRINT_STACK_TRACE();
-  JXL_CRASH();
-}
-#endif
-
-#if JXL_IS_DEBUG_BUILD
-#define JXL_DEBUG_ABORT(format, ...)                                   \
-  do {                                                                 \
-    if (JXL_DEBUG_ON_ABORT) {                                          \
-      ::jxl::Debug(("%s:%d: JXL_DEBUG_ABORT: " format "\n"), __FILE__, \
-                   __LINE__, ##__VA_ARGS__);                           \
-    }                                                                  \
-    ::jxl::Abort();                                                    \
-  } while (0);
-#else
-#define JXL_DEBUG_ABORT(format, ...)
-#endif
-
-// Use this for code paths that are unreachable unless the code would change
-// to make it reachable, in which case it will print a warning and abort in
-// debug builds. In release builds no code is produced for this, so only use
-// this if this path is really unreachable.
-#if JXL_IS_DEBUG_BUILD
-#define JXL_UNREACHABLE(format, ...)                                          \
-  (::jxl::Debug(("%s:%d: JXL_UNREACHABLE: " format "\n"), __FILE__, __LINE__, \
-                ##__VA_ARGS__),                                               \
-   ::jxl::Abort(), JXL_FAILURE(format, ##__VA_ARGS__))
-#else  // JXL_IS_DEBUG_BUILD
-#define JXL_UNREACHABLE(format, ...) \
-  JXL_FAILURE("internal: " format, ##__VA_ARGS__)
-#endif
-
-// Only runs in debug builds (builds where NDEBUG is not
-// defined). This is useful for slower asserts that we want to run more rarely
-// than usual. These will run on asan, msan and other debug builds, but not in
-// opt or release.
-#if JXL_IS_DEBUG_BUILD
-#define JXL_DASSERT(condition)                                      \
-  do {                                                              \
-    if (!(condition)) {                                             \
-      JXL_DEBUG(JXL_DEBUG_ON_ABORT, "JXL_DASSERT: %s", #condition); \
-      ::jxl::Abort();                                               \
-    }                                                               \
-  } while (0)
-#else
-#define JXL_DASSERT(condition)
-#endif
-
-// A jxl::Status value from a StatusCode or Status which prints a debug message
-// when enabled.
-#define JXL_STATUS(status, format, ...)                                        \
-  ::jxl::StatusMessage(::jxl::Status(status), "%s:%d: " format "\n", __FILE__, \
-                       __LINE__, ##__VA_ARGS__)
-
-// Notify of an error but discard the resulting Status value. This is only
-// useful for debug builds or when building with JXL_CRASH_ON_ERROR.
-#define JXL_NOTIFY_ERROR(format, ...)                                      \
-  (void)JXL_STATUS(::jxl::StatusCode::kGenericError, "JXL_ERROR: " format, \
-                   ##__VA_ARGS__)
-
-// An error Status with a message. The JXL_STATUS() macro will return a Status
-// object with a kGenericError code, but the comma operator helps with
-// clang-tidy inference and potentially with optimizations.
-#define JXL_FAILURE(format, ...)                                              \
-  ((void)JXL_STATUS(::jxl::StatusCode::kGenericError, "JXL_FAILURE: " format, \
-                    ##__VA_ARGS__),                                           \
-   ::jxl::Status(::jxl::StatusCode::kGenericError))
-
-// Always evaluates the status exactly once, so can be used for non-debug calls.
-// Returns from the current context if the passed Status expression is an error
-// (fatal or non-fatal). The return value is the passed Status.
-#define JXL_RETURN_IF_ERROR(status)                                       \
-  do {                                                                    \
-    ::jxl::Status jxl_return_if_error_status = (status);                  \
-    if (!jxl_return_if_error_status) {                                    \
-      (void)::jxl::StatusMessage(                                         \
-          jxl_return_if_error_status,                                     \
-          "%s:%d: JXL_RETURN_IF_ERROR code=%d: %s\n", __FILE__, __LINE__, \
-          static_cast<int>(jxl_return_if_error_status.code()), #status);  \
-      return jxl_return_if_error_status;                                  \
-    }                                                                     \
-  } while (0)
-
-// As above, but without calling StatusMessage. Intended for bundles (see
-// fields.h), which have numerous call sites (-> relevant for code size) and do
-// not want to generate excessive messages when decoding partial headers.
-#define JXL_QUIET_RETURN_IF_ERROR(status)                \
-  do {                                                   \
-    ::jxl::Status jxl_return_if_error_status = (status); \
-    if (!jxl_return_if_error_status) {                   \
-      return jxl_return_if_error_status;                 \
-    }                                                    \
-  } while (0)
-
-#if JXL_IS_DEBUG_BUILD
-// Debug: fatal check.
-#define JXL_ENSURE(condition)                     \
-  do {                                            \
-    if (!(condition)) {                           \
-      ::jxl::Debug("JXL_ENSURE: %s", #condition); \
-      ::jxl::Abort();                             \
-    }                                             \
-  } while (0)
-#else
-// Release: non-fatal check of condition. If false, just return an error.
-#define JXL_ENSURE(condition)                           \
-  do {                                                  \
-    if (!(condition)) {                                 \
-      return JXL_FAILURE("JXL_ENSURE: %s", #condition); \
-    }                                                   \
-  } while (0)
-#endif
-
-enum class StatusCode : int32_t {
-  // Non-fatal errors (negative values).
-  kNotEnoughBytes = -1,
-
-  // The only non-error status code.
-  kOk = 0,
-
-  // Fatal-errors (positive values)
-  kGenericError = 1,
-};
-
-// Drop-in replacement for bool that raises compiler warnings if not used
-// after being returned from a function. Example:
-// Status LoadFile(...) { return true; } is more compact than
-// bool JXL_MUST_USE_RESULT LoadFile(...) { return true; }
-// In case of error, the status can carry an extra error code in its value which
-// is split between fatal and non-fatal error codes.
-class JXL_MUST_USE_RESULT Status {
- public:
-  // We want implicit constructor from bool to allow returning "true" or "false"
-  // on a function when using Status. "true" means kOk while "false" means a
-  // generic fatal error.
-  // NOLINTNEXTLINE(google-explicit-constructor)
-  constexpr Status(bool ok)
-      : code_(ok ? StatusCode::kOk : StatusCode::kGenericError) {}
-
-  // NOLINTNEXTLINE(google-explicit-constructor)
-  constexpr Status(StatusCode code) : code_(code) {}
-
-  // We also want implicit cast to bool to check for return values of functions.
-  // NOLINTNEXTLINE(google-explicit-constructor)
-  constexpr operator bool() const { return code_ == StatusCode::kOk; }
-
-  constexpr StatusCode code() const { return code_; }
-
-  // Returns whether the status code is a fatal error.
-  constexpr bool IsFatalError() const {
-    return static_cast<int32_t>(code_) > 0;
-  }
-
- private:
-  StatusCode code_;
-};
-
-static constexpr Status OkStatus() { return Status(StatusCode::kOk); }
-
-// Helper function to create a Status and print the debug message or abort when
-// needed.
-inline JXL_FORMAT(2, 3) Status
-    StatusMessage(const Status status, const char* format, ...) {
-  // This block will be optimized out when JXL_IS_DEBUG_BUILD is disabled.
-  if ((JXL_IS_DEBUG_BUILD && status.IsFatalError()) ||
-      (JXL_DEBUG_ON_ALL_ERROR && !status)) {
-    va_list args;
-    va_start(args, format);
-#ifdef USE_ANDROID_LOGGER
-    android_vprintf(format, args);
-#else
-    vfprintf(stderr, format, args);
-#endif
-    va_end(args);
-  }
-#if JXL_CRASH_ON_ERROR
-  // JXL_CRASH_ON_ERROR means to Abort() only on non-fatal errors.
-  if (status.IsFatalError()) {
-    ::jxl::Abort();
-  }
-#endif  // JXL_CRASH_ON_ERROR
-  return status;
-}
-
-template <typename T>
-class JXL_MUST_USE_RESULT StatusOr {
-  static_assert(!std::is_convertible<StatusCode, T>::value &&
-                    !std::is_convertible<T, StatusCode>::value,
-                "You cannot make a StatusOr with a type convertible from or to "
-                "StatusCode");
-  static_assert(std::is_move_constructible<T>::value &&
-                    std::is_move_assignable<T>::value,
-                "T must be move constructible and move assignable");
-
- public:
-  // NOLINTNEXTLINE(google-explicit-constructor)
-  StatusOr(StatusCode code) : code_(code) {
-    JXL_DASSERT(code_ != StatusCode::kOk);
-  }
-
-  // NOLINTNEXTLINE(google-explicit-constructor)
-  StatusOr(Status status) : StatusOr(status.code()) {}
-
-  // NOLINTNEXTLINE(google-explicit-constructor)
-  StatusOr(T&& value) : code_(StatusCode::kOk) {
-    new (&storage_.data_) T(std::move(value));
-  }
-
-  StatusOr(StatusOr&& other) noexcept {
-    if (other.ok()) {
-      new (&storage_.data_) T(std::move(other.storage_.data_));
-    }
-    code_ = other.code_;
-  }
-
-  StatusOr& operator=(StatusOr&& other) noexcept {
-    if (this == &other) return *this;
-    if (ok() && other.ok()) {
-      storage_.data_ = std::move(other.storage_.data_);
-    } else if (other.ok()) {
-      new (&storage_.data_) T(std::move(other.storage_.data_));
-    } else if (ok()) {
-      storage_.data_.~T();
-    }
-    code_ = other.code_;
-    return *this;
-  }
-
-  StatusOr(const StatusOr&) = delete;
-  StatusOr operator=(const StatusOr&) = delete;
-
-  bool ok() const { return code_ == StatusCode::kOk; }
-  Status status() const { return code_; }
-
-  // Only call this if you are absolutely sure that `ok()` is true.
-  // Never call this manually: rely on JXL_ASSIGN_OR.
-  T value_() && {
-    JXL_DASSERT(ok());
-    return std::move(storage_.data_);
-  }
-
-  ~StatusOr() {
-    if (code_ == StatusCode::kOk) {
-      storage_.data_.~T();
-    }
-  }
-
- private:
-  union Storage {
-    char placeholder_;
-    T data_;
-    Storage() {}
-    ~Storage() {}
-  } storage_;
-
-  StatusCode code_;
-};
-
-#define JXL_ASSIGN_OR_RETURN(lhs, statusor) \
-  PRIVATE_JXL_ASSIGN_OR_RETURN_IMPL(        \
-      JXL_JOIN(assign_or_return_temporary_variable, __LINE__), lhs, statusor)
-
-// NOLINTBEGIN(bugprone-macro-parentheses)
-#define PRIVATE_JXL_ASSIGN_OR_RETURN_IMPL(name, lhs, statusor) \
-  auto name = statusor;                                        \
-  JXL_RETURN_IF_ERROR(name.status());                          \
-  lhs = std::move(name).value_();
-// NOLINTEND(bugprone-macro-parentheses)
-
-#define JXL_ASSIGN_OR_QUIT(lhs, statusor, message)                     \
-  PRIVATE_JXL_ASSIGN_OR_QUIT_IMPL(                                     \
-      JXL_JOIN(assign_or_temporary_variable, __LINE__), lhs, statusor, \
-      message)
-
-// NOLINTBEGIN(bugprone-macro-parentheses)
-#define PRIVATE_JXL_ASSIGN_OR_QUIT_IMPL(name, lhs, statusor, message) \
-  auto name = statusor;                                               \
-  if (!name.ok()) {                                                   \
-    QUIT(message);                                                    \
-  }                                                                   \
-  lhs = std::move(name).value_();
-// NOLINTEND(bugprone-macro-parentheses)
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_BASE_STATUS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/bit_reader_test.cc b/third_party/jpeg-xl/lib/jxl/bit_reader_test.cc
deleted file mode 100644
index 67cd3f8a4b8af..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/bit_reader_test.cc
+++ /dev/null
@@ -1,276 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/random.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-TEST(BitReaderTest, ExtendsWithZeroes) {
-  for (size_t size = 4; size < 32; ++size) {
-    std::vector<uint8_t> data(size, 0xff);
-
-    for (size_t n_bytes = 0; n_bytes < size; n_bytes++) {
-      BitReader br(Bytes(data.data(), n_bytes));
-      // Read all the bits
-      for (size_t i = 0; i < n_bytes * kBitsPerByte; i++) {
-        ASSERT_EQ(br.ReadBits(1), 1u) << "n_bytes=" << n_bytes << " i=" << i;
-      }
-
-      // PEEK more than the declared size - all will be zero. Cannot consume.
-      for (size_t i = 0; i < BitReader::kMaxBitsPerCall; i++) {
-        ASSERT_EQ(br.PeekBits(i), 0u)
-            << "size=" << size << "n_bytes=" << n_bytes << " i=" << i;
-      }
-
-      EXPECT_TRUE(br.Close());
-    }
-  }
-}
-
-struct Symbol {
-  uint32_t num_bits;
-  uint32_t value;
-};
-
-// Reading from output gives the same values.
-TEST(BitReaderTest, TestRoundTrip) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  test::ThreadPoolForTests pool(8);
-  const auto do_test = [&memory_manager](const uint32_t task,
-                                         size_t /* thread */) -> Status {
-    constexpr size_t kMaxBits = 8000;
-    BitWriter writer{memory_manager};
-    std::vector<Symbol> symbols;
-    symbols.reserve(1000);
-    JXL_RETURN_IF_ERROR(
-        writer.WithMaxBits(kMaxBits, LayerType::Header, nullptr, [&] {
-          Rng rng(55537 + 129 * task);
-
-          for (;;) {
-            const uint32_t num_bits = rng.UniformU(1, 33);
-            if (writer.BitsWritten() + num_bits > kMaxBits) break;
-            const uint32_t value = rng.UniformU(0, 1ULL << num_bits);
-            symbols.push_back({num_bits, value});
-            writer.Write(num_bits, value);
-          }
-
-          writer.ZeroPadToByte();
-          return true;
-        }));
-    BitReader reader(writer.GetSpan());
-    for (const Symbol& s : symbols) {
-      EXPECT_EQ(s.value, reader.ReadBits(s.num_bits));
-    }
-    JXL_RETURN_IF_ERROR(reader.Close());
-    return true;
-  };
-  EXPECT_TRUE(RunOnPool(pool.get(), 0, 1000, ThreadPool::NoInit, do_test,
-                        "TestTBitReaderRoundTrip"));
-}
-
-// SkipBits is the same as reading that many bits.
-TEST(BitReaderTest, TestSkip) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  test::ThreadPoolForTests pool(8);
-  const auto do_test = [&memory_manager](const uint32_t task,
-                                         size_t /* thread */) -> Status {
-    constexpr size_t kSize = 100;
-
-    for (size_t skip = 0; skip < 128; ++skip) {
-      BitWriter writer{memory_manager};
-      AuxOut aux_out;
-      JXL_RETURN_IF_ERROR(writer.WithMaxBits(
-          kSize * kBitsPerByte, LayerType::Header, &aux_out, [&] {
-            // Start with "task" 1-bits.
-            for (size_t i = 0; i < task; ++i) {
-              writer.Write(1, 1);
-            }
-
-            // Write 0-bits that we will skip over
-            for (size_t i = 0; i < skip; ++i) {
-              writer.Write(1, 0);
-            }
-
-            // Write terminator bits '101'
-            writer.Write(3, 5);
-            EXPECT_EQ(task + skip + 3, writer.BitsWritten());
-            writer.ZeroPadToByte();
-            return true;
-          }));
-      EXPECT_LT(aux_out.layer(LayerType::Header).total_bits, kSize * 8);
-
-      Bytes bytes = writer.GetSpan();
-      BitReader reader1(bytes);
-      BitReader reader2(bytes);
-      // Verify initial 1-bits
-      for (size_t i = 0; i < task; ++i) {
-        EXPECT_EQ(1u, reader1.ReadBits(1));
-        EXPECT_EQ(1u, reader2.ReadBits(1));
-      }
-
-      // SkipBits or manually read "skip" bits
-      reader1.SkipBits(skip);
-      for (size_t i = 0; i < skip; ++i) {
-        EXPECT_EQ(0u, reader2.ReadBits(1)) << " skip=" << skip << " i=" << i;
-      }
-      EXPECT_EQ(reader1.TotalBitsConsumed(), reader2.TotalBitsConsumed());
-
-      // Ensure both readers see the terminator bits.
-      EXPECT_EQ(5u, reader1.ReadBits(3));
-      EXPECT_EQ(5u, reader2.ReadBits(3));
-
-      JXL_RETURN_IF_ERROR(reader1.Close());
-      JXL_RETURN_IF_ERROR(reader2.Close());
-    }
-    return true;
-  };
-  EXPECT_TRUE(
-      RunOnPool(pool.get(), 0, 96, ThreadPool::NoInit, do_test, "TestSkip"));
-}
-
-// Verifies byte order and different groupings of bits.
-TEST(BitReaderTest, TestOrder) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  constexpr size_t kMaxBits = 16;
-
-  // u(1) - bits written into LSBs of first byte
-  {
-    BitWriter writer{memory_manager};
-    ASSERT_TRUE(writer.WithMaxBits(kMaxBits, LayerType::Header, nullptr, [&] {
-      for (size_t i = 0; i < 5; ++i) {
-        writer.Write(1, 1);
-      }
-      for (size_t i = 0; i < 5; ++i) {
-        writer.Write(1, 0);
-      }
-      for (size_t i = 0; i < 6; ++i) {
-        writer.Write(1, 1);
-      }
-
-      writer.ZeroPadToByte();
-      return true;
-    }));
-    BitReader reader(writer.GetSpan());
-    EXPECT_EQ(0x1Fu, reader.ReadFixedBits<8>());
-    EXPECT_EQ(0xFCu, reader.ReadFixedBits<8>());
-    EXPECT_TRUE(reader.Close());
-  }
-
-  // u(8) - get bytes in the same order
-  {
-    BitWriter writer{memory_manager};
-    ASSERT_TRUE(writer.WithMaxBits(kMaxBits, LayerType::Header, nullptr, [&] {
-      writer.Write(8, 0xF8);
-      writer.Write(8, 0x3F);
-
-      writer.ZeroPadToByte();
-      return true;
-    }));
-    BitReader reader(writer.GetSpan());
-    EXPECT_EQ(0xF8u, reader.ReadFixedBits<8>());
-    EXPECT_EQ(0x3Fu, reader.ReadFixedBits<8>());
-    EXPECT_TRUE(reader.Close());
-  }
-
-  // u(16) - little-endian bytes
-  {
-    BitWriter writer{memory_manager};
-    ASSERT_TRUE(writer.WithMaxBits(kMaxBits, LayerType::Header, nullptr, [&] {
-      writer.Write(16, 0xF83F);
-
-      writer.ZeroPadToByte();
-      return true;
-    }));
-    BitReader reader(writer.GetSpan());
-    EXPECT_EQ(0x3Fu, reader.ReadFixedBits<8>());
-    EXPECT_EQ(0xF8u, reader.ReadFixedBits<8>());
-    EXPECT_TRUE(reader.Close());
-  }
-
-  // Non-byte-aligned, mixed sizes
-  {
-    BitWriter writer{memory_manager};
-    ASSERT_TRUE(writer.WithMaxBits(kMaxBits, LayerType::Header, nullptr, [&] {
-      writer.Write(1, 1);
-      writer.Write(3, 6);
-      writer.Write(8, 0xDB);
-      writer.Write(4, 8);
-
-      writer.ZeroPadToByte();
-      return true;
-    }));
-    BitReader reader(writer.GetSpan());
-    EXPECT_EQ(0xBDu, reader.ReadFixedBits<8>());
-    EXPECT_EQ(0x8Du, reader.ReadFixedBits<8>());
-    EXPECT_TRUE(reader.Close());
-  }
-}
-
-TEST(BitReaderTest, TotalCountersTest) {
-  uint8_t buf[8] = {1, 2, 3, 4};
-  BitReader reader(Bytes(buf, sizeof(buf)));
-
-  EXPECT_EQ(sizeof(buf), reader.TotalBytes());
-  EXPECT_EQ(0u, reader.TotalBitsConsumed());
-  reader.ReadFixedBits<1>();
-  EXPECT_EQ(1u, reader.TotalBitsConsumed());
-
-  reader.ReadFixedBits<10>();
-  EXPECT_EQ(11u, reader.TotalBitsConsumed());
-
-  reader.ReadFixedBits<4>();
-  EXPECT_EQ(15u, reader.TotalBitsConsumed());
-
-  reader.ReadFixedBits<1>();
-  EXPECT_EQ(16u, reader.TotalBitsConsumed());
-
-  reader.ReadFixedBits<16>();
-  EXPECT_EQ(32u, reader.TotalBitsConsumed());
-
-  EXPECT_TRUE(reader.Close());
-}
-
-TEST(BitReaderTest, MoveTest) {
-  uint8_t buf[8] = {1, 2, 3, 4};
-  BitReader reader2;
-  {
-    BitReader reader1(Bytes(buf, sizeof(buf)));
-
-    EXPECT_EQ(0u, reader1.TotalBitsConsumed());
-    reader1.ReadFixedBits<16>();
-    EXPECT_EQ(16u, reader1.TotalBitsConsumed());
-
-    reader2 = std::move(reader1);
-    // From this point reader1 is invalid, but can continue to access reader2
-    // and we don't need to call Close() on reader1.
-  }
-
-  EXPECT_EQ(16u, reader2.TotalBitsConsumed());
-  EXPECT_EQ(3U, reader2.ReadFixedBits<8>());
-  EXPECT_EQ(24u, reader2.TotalBitsConsumed());
-
-  EXPECT_TRUE(reader2.Close());
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/bits_test.cc b/third_party/jpeg-xl/lib/jxl/bits_test.cc
deleted file mode 100644
index 8340db5a389f8..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/bits_test.cc
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/base/bits.h"
-
-#include <cstddef>
-#include <cstdint>
-
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-TEST(BitsTest, TestNumZeroBits) {
-  // Zero input is well-defined.
-  EXPECT_EQ(32u, Num0BitsAboveMS1Bit(0u));
-  EXPECT_EQ(64u, Num0BitsAboveMS1Bit(0ull));
-  EXPECT_EQ(32u, Num0BitsBelowLS1Bit(0u));
-  EXPECT_EQ(64u, Num0BitsBelowLS1Bit(0ull));
-
-  EXPECT_EQ(31u, Num0BitsAboveMS1Bit(1u));
-  EXPECT_EQ(30u, Num0BitsAboveMS1Bit(2u));
-  EXPECT_EQ(63u, Num0BitsAboveMS1Bit(1ull));
-  EXPECT_EQ(62u, Num0BitsAboveMS1Bit(2ull));
-
-  EXPECT_EQ(0u, Num0BitsBelowLS1Bit(1u));
-  EXPECT_EQ(0u, Num0BitsBelowLS1Bit(1ull));
-  EXPECT_EQ(1u, Num0BitsBelowLS1Bit(2u));
-  EXPECT_EQ(1u, Num0BitsBelowLS1Bit(2ull));
-
-  EXPECT_EQ(0u, Num0BitsAboveMS1Bit(0x80000000u));
-  EXPECT_EQ(0u, Num0BitsAboveMS1Bit(0x8000000000000000ull));
-  EXPECT_EQ(31u, Num0BitsBelowLS1Bit(0x80000000u));
-  EXPECT_EQ(63u, Num0BitsBelowLS1Bit(0x8000000000000000ull));
-}
-
-TEST(BitsTest, TestFloorLog2) {
-  // for input = [1, 7]
-  const size_t expected[7] = {0, 1, 1, 2, 2, 2, 2};
-  for (uint32_t i = 1; i <= 7; ++i) {
-    EXPECT_EQ(expected[i - 1], FloorLog2Nonzero(i)) << " " << i;
-    EXPECT_EQ(expected[i - 1], FloorLog2Nonzero(static_cast<uint64_t>(i)))
-        << " " << i;
-  }
-
-  EXPECT_EQ(11u, FloorLog2Nonzero(0x00000fffu));  // 4095
-  EXPECT_EQ(12u, FloorLog2Nonzero(0x00001000u));  // 4096
-  EXPECT_EQ(12u, FloorLog2Nonzero(0x00001001u));  // 4097
-
-  EXPECT_EQ(31u, FloorLog2Nonzero(0x80000000u));
-  EXPECT_EQ(31u, FloorLog2Nonzero(0x80000001u));
-  EXPECT_EQ(31u, FloorLog2Nonzero(0xFFFFFFFFu));
-
-  EXPECT_EQ(31u, FloorLog2Nonzero(0x80000000ull));
-  EXPECT_EQ(31u, FloorLog2Nonzero(0x80000001ull));
-  EXPECT_EQ(31u, FloorLog2Nonzero(0xFFFFFFFFull));
-
-  EXPECT_EQ(63u, FloorLog2Nonzero(0x8000000000000000ull));
-  EXPECT_EQ(63u, FloorLog2Nonzero(0x8000000000000001ull));
-  EXPECT_EQ(63u, FloorLog2Nonzero(0xFFFFFFFFFFFFFFFFull));
-}
-
-TEST(BitsTest, TestCeilLog2) {
-  // for input = [1, 7]
-  const size_t expected[7] = {0, 1, 2, 2, 3, 3, 3};
-  for (uint32_t i = 1; i <= 7; ++i) {
-    EXPECT_EQ(expected[i - 1], CeilLog2Nonzero(i)) << " " << i;
-    EXPECT_EQ(expected[i - 1], CeilLog2Nonzero(static_cast<uint64_t>(i)))
-        << " " << i;
-  }
-
-  EXPECT_EQ(12u, CeilLog2Nonzero(0x00000fffu));  // 4095
-  EXPECT_EQ(12u, CeilLog2Nonzero(0x00001000u));  // 4096
-  EXPECT_EQ(13u, CeilLog2Nonzero(0x00001001u));  // 4097
-
-  EXPECT_EQ(31u, CeilLog2Nonzero(0x80000000u));
-  EXPECT_EQ(32u, CeilLog2Nonzero(0x80000001u));
-  EXPECT_EQ(32u, CeilLog2Nonzero(0xFFFFFFFFu));
-
-  EXPECT_EQ(31u, CeilLog2Nonzero(0x80000000ull));
-  EXPECT_EQ(32u, CeilLog2Nonzero(0x80000001ull));
-  EXPECT_EQ(32u, CeilLog2Nonzero(0xFFFFFFFFull));
-
-  EXPECT_EQ(63u, CeilLog2Nonzero(0x8000000000000000ull));
-  EXPECT_EQ(64u, CeilLog2Nonzero(0x8000000000000001ull));
-  EXPECT_EQ(64u, CeilLog2Nonzero(0xFFFFFFFFFFFFFFFFull));
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/blending.cc b/third_party/jpeg-xl/lib/jxl/blending.cc
deleted file mode 100644
index 5947a00a80614..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/blending.cc
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/blending.h"
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstring>
-#include <vector>
-
-#include "lib/jxl/alpha.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_patch_dictionary.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_metadata.h"
-
-namespace jxl {
-
-bool NeedsBlending(const FrameHeader& frame_header) {
-  if (!(frame_header.frame_type == FrameType::kRegularFrame ||
-        frame_header.frame_type == FrameType::kSkipProgressive)) {
-    return false;
-  }
-  const auto& info = frame_header.blending_info;
-  bool replace_all = (info.mode == BlendMode::kReplace);
-  for (const auto& ec_i : frame_header.extra_channel_blending_info) {
-    if (ec_i.mode != BlendMode::kReplace) {
-      replace_all = false;
-    }
-  }
-  // Replace the full frame: nothing to do.
-  if (!frame_header.custom_size_or_origin && replace_all) {
-    return false;
-  }
-  return true;
-}
-
-Status PerformBlending(
-    JxlMemoryManager* memory_manager, const float* const* bg,
-    const float* const* fg, float* const* out, size_t x0, size_t xsize,
-    const PatchBlending& color_blending, const PatchBlending* ec_blending,
-    const std::vector<ExtraChannelInfo>& extra_channel_info) {
-  bool has_alpha = false;
-  size_t num_ec = extra_channel_info.size();
-  for (size_t i = 0; i < num_ec; i++) {
-    if (extra_channel_info[i].type == jxl::ExtraChannel::kAlpha) {
-      has_alpha = true;
-      break;
-    }
-  }
-  JXL_ASSIGN_OR_RETURN(ImageF tmp,
-                       ImageF::Create(memory_manager, xsize, 3 + num_ec));
-  // Blend extra channels first so that we use the pre-blending alpha.
-  for (size_t i = 0; i < num_ec; i++) {
-    switch (ec_blending[i].mode) {
-      case PatchBlendMode::kAdd:
-        for (size_t x = 0; x < xsize; x++) {
-          tmp.Row(3 + i)[x] = bg[3 + i][x + x0] + fg[3 + i][x + x0];
-        }
-        continue;
-
-      case PatchBlendMode::kBlendAbove: {
-        size_t alpha = ec_blending[i].alpha_channel;
-        bool is_premultiplied = extra_channel_info[alpha].alpha_associated;
-        PerformAlphaBlending(bg[3 + i] + x0, bg[3 + alpha] + x0, fg[3 + i] + x0,
-                             fg[3 + alpha] + x0, tmp.Row(3 + i), xsize,
-                             is_premultiplied, ec_blending[i].clamp);
-        continue;
-      }
-
-      case PatchBlendMode::kBlendBelow: {
-        size_t alpha = ec_blending[i].alpha_channel;
-        bool is_premultiplied = extra_channel_info[alpha].alpha_associated;
-        PerformAlphaBlending(fg[3 + i] + x0, fg[3 + alpha] + x0, bg[3 + i] + x0,
-                             bg[3 + alpha] + x0, tmp.Row(3 + i), xsize,
-                             is_premultiplied, ec_blending[i].clamp);
-        continue;
-      }
-
-      case PatchBlendMode::kAlphaWeightedAddAbove: {
-        size_t alpha = ec_blending[i].alpha_channel;
-        PerformAlphaWeightedAdd(bg[3 + i] + x0, fg[3 + i] + x0,
-                                fg[3 + alpha] + x0, tmp.Row(3 + i), xsize,
-                                ec_blending[i].clamp);
-        continue;
-      }
-
-      case PatchBlendMode::kAlphaWeightedAddBelow: {
-        size_t alpha = ec_blending[i].alpha_channel;
-        PerformAlphaWeightedAdd(fg[3 + i] + x0, bg[3 + i] + x0,
-                                bg[3 + alpha] + x0, tmp.Row(3 + i), xsize,
-                                ec_blending[i].clamp);
-        continue;
-      }
-
-      case PatchBlendMode::kMul:
-        PerformMulBlending(bg[3 + i] + x0, fg[3 + i] + x0, tmp.Row(3 + i),
-                           xsize, ec_blending[i].clamp);
-        continue;
-
-      case PatchBlendMode::kReplace:
-        if (xsize) memcpy(tmp.Row(3 + i), fg[3 + i] + x0, xsize * sizeof(**fg));
-        continue;
-
-      case PatchBlendMode::kNone:
-        if (xsize) memcpy(tmp.Row(3 + i), bg[3 + i] + x0, xsize * sizeof(**fg));
-        continue;
-    }
-  }
-  size_t alpha = color_blending.alpha_channel;
-
-  const auto add = [&]() {
-    for (int p = 0; p < 3; p++) {
-      float* out = tmp.Row(p);
-      for (size_t x = 0; x < xsize; x++) {
-        out[x] = bg[p][x + x0] + fg[p][x + x0];
-      }
-    }
-  };
-
-  const auto blend_weighted = [&](const float* const* bottom,
-                                  const float* const* top) {
-    bool is_premultiplied = extra_channel_info[alpha].alpha_associated;
-    PerformAlphaBlending(
-        {bottom[0] + x0, bottom[1] + x0, bottom[2] + x0,
-         bottom[3 + alpha] + x0},
-        {top[0] + x0, top[1] + x0, top[2] + x0, top[3 + alpha] + x0},
-        {tmp.Row(0), tmp.Row(1), tmp.Row(2), tmp.Row(3 + alpha)}, xsize,
-        is_premultiplied, color_blending.clamp);
-  };
-
-  const auto add_weighted = [&](const float* const* bottom,
-                                const float* const* top) {
-    for (size_t c = 0; c < 3; c++) {
-      PerformAlphaWeightedAdd(bottom[c] + x0, top[c] + x0, top[3 + alpha] + x0,
-                              tmp.Row(c), xsize, color_blending.clamp);
-    }
-  };
-
-  const auto copy = [&](const float* const* src) {
-    for (size_t p = 0; p < 3; p++) {
-      memcpy(tmp.Row(p), src[p] + x0, xsize * sizeof(**src));
-    }
-  };
-
-  switch (color_blending.mode) {
-    case PatchBlendMode::kAdd:
-      add();
-      break;
-
-    case PatchBlendMode::kAlphaWeightedAddAbove:
-      has_alpha ? add_weighted(bg, fg) : add();
-      break;
-
-    case PatchBlendMode::kAlphaWeightedAddBelow:
-      has_alpha ? add_weighted(fg, bg) : add();
-      break;
-
-    case PatchBlendMode::kBlendAbove:
-      has_alpha ? blend_weighted(bg, fg) : copy(fg);
-      break;
-
-    case PatchBlendMode::kBlendBelow:
-      has_alpha ? blend_weighted(fg, bg) : copy(fg);
-      break;
-
-    case PatchBlendMode::kMul:
-      for (int p = 0; p < 3; p++) {
-        PerformMulBlending(bg[p] + x0, fg[p] + x0, tmp.Row(p), xsize,
-                           color_blending.clamp);
-      }
-      break;
-
-    case PatchBlendMode::kReplace:
-      copy(fg);
-      break;
-
-    case PatchBlendMode::kNone:
-      copy(bg);
-  }
-
-  for (size_t i = 0; i < 3 + num_ec; i++) {
-    if (xsize != 0) memcpy(out[i] + x0, tmp.Row(i), xsize * sizeof(**out));
-  }
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/blending.h b/third_party/jpeg-xl/lib/jxl/blending.h
deleted file mode 100644
index f7933bee2ddad..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/blending.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BLENDING_H_
-#define LIB_JXL_BLENDING_H_
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <vector>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_patch_dictionary.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/image_metadata.h"
-
-namespace jxl {
-
-bool NeedsBlending(const FrameHeader& frame_header);
-
-Status PerformBlending(JxlMemoryManager* memory_manager, const float* const* bg,
-                       const float* const* fg, float* const* out, size_t x0,
-                       size_t xsize, const PatchBlending& color_blending,
-                       const PatchBlending* ec_blending,
-                       const std::vector<ExtraChannelInfo>& extra_channel_info);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_BLENDING_H_
diff --git a/third_party/jpeg-xl/lib/jxl/blending_test.cc b/third_party/jpeg-xl/lib/jxl/blending_test.cc
deleted file mode 100644
index 7182616e2cf53..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/blending_test.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/types.h>
-
-#include <cstdint>
-#include <sstream>
-#include <utility>
-#include <vector>
-
-#include "lib/extras/dec/decode.h"
-#include "lib/extras/dec/jxl.h"
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-TEST(BlendingTest, Crops) {
-  const std::vector<uint8_t> compressed =
-      jxl::test::ReadTestData("jxl/blending/cropped_traffic_light.jxl");
-  extras::JXLDecompressParams dparams;
-  dparams.accepted_formats = {{3, JXL_TYPE_UINT8, JXL_LITTLE_ENDIAN, 0}};
-  extras::PackedPixelFile decoded;
-  ASSERT_TRUE(DecodeImageJXL(compressed.data(), compressed.size(), dparams,
-                             /*decoded_bytes=*/nullptr, &decoded));
-  ASSERT_EQ(decoded.frames.size(), 4);
-
-  int i = 0;
-  for (auto&& decoded_frame : decoded.frames) {
-    std::ostringstream filename;
-    filename << "jxl/blending/cropped_traffic_light_frame-" << i << ".png";
-    const std::vector<uint8_t> compressed_frame =
-        jxl::test::ReadTestData(filename.str());
-    extras::PackedPixelFile decoded_frame_ppf;
-    decoded_frame_ppf.info = decoded.info;
-    decoded_frame_ppf.primary_color_representation =
-        decoded.primary_color_representation;
-    decoded_frame_ppf.color_encoding = decoded.color_encoding;
-    decoded_frame_ppf.icc = decoded.icc;
-    decoded_frame_ppf.extra_channels_info = decoded.extra_channels_info;
-    decoded_frame_ppf.frames.emplace_back(std::move(decoded_frame));
-    extras::PackedPixelFile expected_frame_ppf;
-    ASSERT_TRUE(extras::DecodeBytes(Bytes(compressed_frame),
-                                    extras::ColorHints(), &expected_frame_ppf));
-    EXPECT_EQ(0.0f,
-              test::ComputeDistance2(decoded_frame_ppf, expected_frame_ppf));
-    ++i;
-  }
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/box_content_decoder.cc b/third_party/jpeg-xl/lib/jxl/box_content_decoder.cc
deleted file mode 100644
index 079298254fc3a..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/box_content_decoder.cc
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/box_content_decoder.h"
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-
-#include "lib/jxl/base/sanitizers.h"
-
-namespace jxl {
-
-JxlBoxContentDecoder::JxlBoxContentDecoder() = default;
-
-JxlBoxContentDecoder::~JxlBoxContentDecoder() {
-  if (brotli_dec) {
-    BrotliDecoderDestroyInstance(brotli_dec);
-  }
-}
-
-void JxlBoxContentDecoder::StartBox(bool brob_decode, bool box_until_eof,
-                                    size_t contents_size) {
-  if (brotli_dec) {
-    BrotliDecoderDestroyInstance(brotli_dec);
-    brotli_dec = nullptr;
-  }
-  header_done_ = false;
-  brob_decode_ = brob_decode;
-  box_until_eof_ = box_until_eof;
-  remaining_ = box_until_eof ? 0 : contents_size;
-  pos_ = 0;
-}
-
-JxlDecoderStatus JxlBoxContentDecoder::Process(const uint8_t* next_in,
-                                               size_t avail_in, size_t box_pos,
-                                               uint8_t** next_out,
-                                               size_t* avail_out) {
-  next_in += pos_ - box_pos;
-  avail_in -= pos_ - box_pos;
-
-  if (brob_decode_) {
-    if (!header_done_) {
-      if (avail_in < 4) return JXL_DEC_NEED_MORE_INPUT;
-      if (!box_until_eof_) {
-        if (remaining_ < 4) return JXL_DEC_ERROR;
-        remaining_ -= 4;
-      }
-      next_in += 4;
-      avail_in -= 4;
-      pos_ += 4;
-      header_done_ = true;
-    }
-
-    if (!brotli_dec) {
-      brotli_dec = BrotliDecoderCreateInstance(nullptr, nullptr, nullptr);
-    }
-
-    const uint8_t* next_in_before = next_in;
-    uint8_t* next_out_before = *next_out;
-    msan::MemoryIsInitialized(next_in, avail_in);
-    BrotliDecoderResult res = BrotliDecoderDecompressStream(
-        brotli_dec, &avail_in, &next_in, avail_out, next_out, nullptr);
-    size_t consumed = next_in - next_in_before;
-    size_t produced = *next_out - next_out_before;
-    if (res == BROTLI_DECODER_RESULT_ERROR) {
-      return JXL_DEC_ERROR;
-    }
-    msan::UnpoisonMemory(next_out_before, produced);
-    pos_ += consumed;
-    if (!box_until_eof_) remaining_ -= consumed;
-    if (res == BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT) {
-      return JXL_DEC_NEED_MORE_INPUT;
-    }
-    if (res == BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT) {
-      return JXL_DEC_BOX_NEED_MORE_OUTPUT;
-    }
-    if (res == BROTLI_DECODER_RESULT_SUCCESS) {
-      return JXL_DEC_BOX_COMPLETE;
-    }
-    // unknown Brotli result
-    return JXL_DEC_ERROR;
-  } else {
-    // remaining box bytes as seen from dec->file_pos
-    size_t can_read = avail_in;
-    if (!box_until_eof_) can_read = std::min<size_t>(can_read, remaining_);
-    size_t to_write = std::min<size_t>(can_read, *avail_out);
-    memcpy(*next_out, next_in, to_write);
-
-    *next_out += to_write;
-    *avail_out -= to_write;
-    if (!box_until_eof_) remaining_ -= to_write;
-    pos_ += to_write;
-
-    if (to_write < can_read) return JXL_DEC_BOX_NEED_MORE_OUTPUT;
-
-    if (!box_until_eof_ && remaining_ > 0) return JXL_DEC_NEED_MORE_INPUT;
-
-    return JXL_DEC_BOX_COMPLETE;
-  }
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/box_content_decoder.h b/third_party/jpeg-xl/lib/jxl/box_content_decoder.h
deleted file mode 100644
index 17db7faa3b6f8..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/box_content_decoder.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BOX_CONTENT_DECODER_H_
-#define LIB_JXL_BOX_CONTENT_DECODER_H_
-
-#include <brotli/decode.h>
-#include <jxl/decode.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-namespace jxl {
-
-/** Outputs the contents of a box in a streaming fashion, either directly, or
- * optionally decoding with Brotli, in case of a brob box. The input must be
- * the contents of a box, excluding the box header.
- */
-class JxlBoxContentDecoder {
- public:
-  JxlBoxContentDecoder();
-  ~JxlBoxContentDecoder();
-
-  void StartBox(bool brob_decode, bool box_until_eof, size_t contents_size);
-
-  // Outputs decoded bytes from the box, decoding with brotli if needed.
-  // box_pos is the position in the box content which next_in points to.
-  // Returns success, whether more input or output bytes are needed, or error.
-  JxlDecoderStatus Process(const uint8_t* next_in, size_t avail_in,
-                           size_t box_pos, uint8_t** next_out,
-                           size_t* avail_out);
-
- private:
-  BrotliDecoderState* brotli_dec;
-
-  bool header_done_;
-  bool brob_decode_;
-  bool box_until_eof_;
-  size_t remaining_;
-  size_t pos_;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_BOX_CONTENT_DECODER_H_
diff --git a/third_party/jpeg-xl/lib/jxl/butteraugli/butteraugli.cc b/third_party/jpeg-xl/lib/jxl/butteraugli/butteraugli.cc
deleted file mode 100644
index 83d1fd2678588..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/butteraugli/butteraugli.cc
+++ /dev/null
@@ -1,2195 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-//
-// Author: Jyrki Alakuijala (jyrki.alakuijala@gmail.com)
-//
-// The physical architecture of butteraugli is based on the following naming
-// convention:
-//   * Opsin - dynamics of the photosensitive chemicals in the retina
-//             with their immediate electrical processing
-//   * Xyb - hybrid opponent/trichromatic color space
-//     x is roughly red-subtract-green.
-//     y is yellow.
-//     b is blue.
-//     Xyb values are computed from Opsin mixing, not directly from rgb.
-//   * Mask - for visual masking
-//   * Hf - color modeling for spatially high-frequency features
-//   * Lf - color modeling for spatially low-frequency features
-//   * Diffmap - to cluster and build an image of error between the images
-//   * Blur - to hold the smoothing code
-
-#include "lib/jxl/butteraugli/butteraugli.h"
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <cmath>
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <memory>
-#include <vector>
-
-#include "lib/jxl/image.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/butteraugli/butteraugli.cc"
-#include <hwy/foreach_target.h>
-
-#include "lib/jxl/base/fast_math-inl.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/convolve.h"
-#include "lib/jxl/image_ops.h"
-
-#if BUTTERAUGLI_ENABLE_CHECKS
-#include "lib/jxl/base/printf_macros.h"
-#endif
-
-#ifndef JXL_BUTTERAUGLI_ONCE
-#define JXL_BUTTERAUGLI_ONCE
-
-namespace jxl {
-
-static const double wMfMalta = 37.0819870399;
-static const double norm1Mf = 130262059.556;
-static const double wMfMaltaX = 8246.75321353;
-static const double norm1MfX = 1009002.70582;
-static const double wHfMalta = 18.7237414387;
-static const double norm1Hf = 4498534.45232;
-static const double wHfMaltaX = 6923.99476109;
-static const double norm1HfX = 8051.15833247;
-static const double wUhfMalta = 1.10039032555;
-static const double norm1Uhf = 71.7800275169;
-static const double wUhfMaltaX = 173.5;
-static const double norm1UhfX = 5.0;
-static const double wmul[9] = {
-    400.0,         1.50815703118,  0,
-    2150.0,        10.6195433239,  16.2176043152,
-    29.2353797994, 0.844626970982, 0.703646627719,
-};
-
-std::vector<float> ComputeKernel(float sigma) {
-  const float m = 2.25;  // Accuracy increases when m is increased.
-  const double scaler = -1.0 / (2.0 * sigma * sigma);
-  const int diff = std::max<int>(1, m * std::fabs(sigma));
-  std::vector<float> kernel(2 * diff + 1);
-  for (int i = -diff; i <= diff; ++i) {
-    kernel[i + diff] = std::exp(scaler * i * i);
-  }
-  return kernel;
-}
-
-void ConvolveBorderColumn(const ImageF& in, const std::vector<float>& kernel,
-                          const size_t x, float* BUTTERAUGLI_RESTRICT row_out) {
-  const size_t offset = kernel.size() / 2;
-  int minx = x < offset ? 0 : x - offset;
-  int maxx = std::min<int>(in.xsize() - 1, x + offset);
-  float weight = 0.0f;
-  for (int j = minx; j <= maxx; ++j) {
-    weight += kernel[j - x + offset];
-  }
-  float scale = 1.0f / weight;
-  for (size_t y = 0; y < in.ysize(); ++y) {
-    const float* BUTTERAUGLI_RESTRICT row_in = in.Row(y);
-    float sum = 0.0f;
-    for (int j = minx; j <= maxx; ++j) {
-      sum += row_in[j] * kernel[j - x + offset];
-    }
-    row_out[y] = sum * scale;
-  }
-}
-
-// Computes a horizontal convolution and transposes the result.
-Status ConvolutionWithTranspose(const ImageF& in,
-                                const std::vector<float>& kernel,
-                                ImageF* BUTTERAUGLI_RESTRICT out) {
-  JXL_ENSURE(out->xsize() == in.ysize());
-  JXL_ENSURE(out->ysize() == in.xsize());
-  const size_t len = kernel.size();
-  const size_t offset = len / 2;
-  float weight_no_border = 0.0f;
-  for (size_t j = 0; j < len; ++j) {
-    weight_no_border += kernel[j];
-  }
-  const float scale_no_border = 1.0f / weight_no_border;
-  const size_t border1 = std::min(in.xsize(), offset);
-  const size_t border2 = in.xsize() > offset ? in.xsize() - offset : 0;
-  std::vector<float> scaled_kernel(len / 2 + 1);
-  for (size_t i = 0; i <= len / 2; ++i) {
-    scaled_kernel[i] = kernel[i] * scale_no_border;
-  }
-
-  // middle
-  switch (len) {
-    case 7: {
-      const float sk0 = scaled_kernel[0];
-      const float sk1 = scaled_kernel[1];
-      const float sk2 = scaled_kernel[2];
-      const float sk3 = scaled_kernel[3];
-      for (size_t y = 0; y < in.ysize(); ++y) {
-        const float* BUTTERAUGLI_RESTRICT row_in = in.Row(y) + border1 - offset;
-        for (size_t x = border1; x < border2; ++x, ++row_in) {
-          const float sum0 = (row_in[0] + row_in[6]) * sk0;
-          const float sum1 = (row_in[1] + row_in[5]) * sk1;
-          const float sum2 = (row_in[2] + row_in[4]) * sk2;
-          const float sum = (row_in[3]) * sk3 + sum0 + sum1 + sum2;
-          float* BUTTERAUGLI_RESTRICT row_out = out->Row(x);
-          row_out[y] = sum;
-        }
-      }
-    } break;
-    case 13: {
-      for (size_t y = 0; y < in.ysize(); ++y) {
-        const float* BUTTERAUGLI_RESTRICT row_in = in.Row(y) + border1 - offset;
-        for (size_t x = border1; x < border2; ++x, ++row_in) {
-          float sum0 = (row_in[0] + row_in[12]) * scaled_kernel[0];
-          float sum1 = (row_in[1] + row_in[11]) * scaled_kernel[1];
-          float sum2 = (row_in[2] + row_in[10]) * scaled_kernel[2];
-          float sum3 = (row_in[3] + row_in[9]) * scaled_kernel[3];
-          sum0 += (row_in[4] + row_in[8]) * scaled_kernel[4];
-          sum1 += (row_in[5] + row_in[7]) * scaled_kernel[5];
-          const float sum = (row_in[6]) * scaled_kernel[6];
-          float* BUTTERAUGLI_RESTRICT row_out = out->Row(x);
-          row_out[y] = sum + sum0 + sum1 + sum2 + sum3;
-        }
-      }
-      break;
-    }
-    case 15: {
-      for (size_t y = 0; y < in.ysize(); ++y) {
-        const float* BUTTERAUGLI_RESTRICT row_in = in.Row(y) + border1 - offset;
-        for (size_t x = border1; x < border2; ++x, ++row_in) {
-          float sum0 = (row_in[0] + row_in[14]) * scaled_kernel[0];
-          float sum1 = (row_in[1] + row_in[13]) * scaled_kernel[1];
-          float sum2 = (row_in[2] + row_in[12]) * scaled_kernel[2];
-          float sum3 = (row_in[3] + row_in[11]) * scaled_kernel[3];
-          sum0 += (row_in[4] + row_in[10]) * scaled_kernel[4];
-          sum1 += (row_in[5] + row_in[9]) * scaled_kernel[5];
-          sum2 += (row_in[6] + row_in[8]) * scaled_kernel[6];
-          const float sum = (row_in[7]) * scaled_kernel[7];
-          float* BUTTERAUGLI_RESTRICT row_out = out->Row(x);
-          row_out[y] = sum + sum0 + sum1 + sum2 + sum3;
-        }
-      }
-      break;
-    }
-    case 33: {
-      for (size_t y = 0; y < in.ysize(); ++y) {
-        const float* BUTTERAUGLI_RESTRICT row_in = in.Row(y) + border1 - offset;
-        for (size_t x = border1; x < border2; ++x, ++row_in) {
-          float sum0 = (row_in[0] + row_in[32]) * scaled_kernel[0];
-          float sum1 = (row_in[1] + row_in[31]) * scaled_kernel[1];
-          float sum2 = (row_in[2] + row_in[30]) * scaled_kernel[2];
-          float sum3 = (row_in[3] + row_in[29]) * scaled_kernel[3];
-          sum0 += (row_in[4] + row_in[28]) * scaled_kernel[4];
-          sum1 += (row_in[5] + row_in[27]) * scaled_kernel[5];
-          sum2 += (row_in[6] + row_in[26]) * scaled_kernel[6];
-          sum3 += (row_in[7] + row_in[25]) * scaled_kernel[7];
-          sum0 += (row_in[8] + row_in[24]) * scaled_kernel[8];
-          sum1 += (row_in[9] + row_in[23]) * scaled_kernel[9];
-          sum2 += (row_in[10] + row_in[22]) * scaled_kernel[10];
-          sum3 += (row_in[11] + row_in[21]) * scaled_kernel[11];
-          sum0 += (row_in[12] + row_in[20]) * scaled_kernel[12];
-          sum1 += (row_in[13] + row_in[19]) * scaled_kernel[13];
-          sum2 += (row_in[14] + row_in[18]) * scaled_kernel[14];
-          sum3 += (row_in[15] + row_in[17]) * scaled_kernel[15];
-          const float sum = (row_in[16]) * scaled_kernel[16];
-          float* BUTTERAUGLI_RESTRICT row_out = out->Row(x);
-          row_out[y] = sum + sum0 + sum1 + sum2 + sum3;
-        }
-      }
-      break;
-    }
-    default:
-      return JXL_UNREACHABLE("kernel size %d not implemented",
-                             static_cast<int>(len));
-  }
-  // left border
-  for (size_t x = 0; x < border1; ++x) {
-    ConvolveBorderColumn(in, kernel, x, out->Row(x));
-  }
-
-  // right border
-  for (size_t x = border2; x < in.xsize(); ++x) {
-    ConvolveBorderColumn(in, kernel, x, out->Row(x));
-  }
-  return true;
-}
-
-// A blur somewhat similar to a 2D Gaussian blur.
-// See: https://en.wikipedia.org/wiki/Gaussian_blur
-//
-// This is a bottleneck because the sigma can be quite large (>7). We can use
-// gauss_blur.cc (runtime independent of sigma, closer to a 4*sigma truncated
-// Gaussian and our 2.25 in ComputeKernel), but its boundary conditions are
-// zero-valued. This leads to noticeable differences at the edges of diffmaps.
-// We retain a special case for 5x5 kernels (even faster than gauss_blur),
-// optionally use gauss_blur followed by fixup of the borders for large images,
-// or fall back to the previous truncated FIR followed by a transpose.
-Status Blur(const ImageF& in, float sigma, const ButteraugliParams& params,
-            BlurTemp* temp, ImageF* out) {
-  std::vector<float> kernel = ComputeKernel(sigma);
-  // Separable5 does an in-place convolution, so this fast path is not safe if
-  // in aliases out.
-  if (kernel.size() == 5 && &in != out) {
-    float sum_weights = 0.0f;
-    for (const float w : kernel) {
-      sum_weights += w;
-    }
-    const float scale = 1.0f / sum_weights;
-    const float w0 = kernel[2] * scale;
-    const float w1 = kernel[1] * scale;
-    const float w2 = kernel[0] * scale;
-    const WeightsSeparable5 weights = {
-        {HWY_REP4(w0), HWY_REP4(w1), HWY_REP4(w2)},
-        {HWY_REP4(w0), HWY_REP4(w1), HWY_REP4(w2)},
-    };
-    JXL_RETURN_IF_ERROR(
-        Separable5(in, Rect(in), weights, /*pool=*/nullptr, out));
-    return true;
-  }
-
-  ImageF* temp_t;
-  JXL_RETURN_IF_ERROR(temp->GetTransposed(in, &temp_t));
-  JXL_RETURN_IF_ERROR(ConvolutionWithTranspose(in, kernel, temp_t));
-  JXL_RETURN_IF_ERROR(ConvolutionWithTranspose(*temp_t, kernel, out));
-  return true;
-}
-
-// Allows PaddedMaltaUnit to call either function via overloading.
-struct MaltaTagLF {};
-struct MaltaTag {};
-
-}  // namespace jxl
-
-#endif  // JXL_BUTTERAUGLI_ONCE
-
-#include <hwy/highway.h>
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Abs;
-using hwy::HWY_NAMESPACE::Div;
-using hwy::HWY_NAMESPACE::Gt;
-using hwy::HWY_NAMESPACE::IfThenElse;
-using hwy::HWY_NAMESPACE::IfThenElseZero;
-using hwy::HWY_NAMESPACE::Lt;
-using hwy::HWY_NAMESPACE::Max;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::MulAdd;
-using hwy::HWY_NAMESPACE::MulSub;
-using hwy::HWY_NAMESPACE::Neg;
-using hwy::HWY_NAMESPACE::Sub;
-using hwy::HWY_NAMESPACE::Vec;
-using hwy::HWY_NAMESPACE::ZeroIfNegative;
-
-template <class D, class V>
-HWY_INLINE V MaximumClamp(D d, V v, double kMaxVal) {
-  static const double kMul = 0.724216145665;
-  const V mul = Set(d, kMul);
-  const V maxval = Set(d, kMaxVal);
-  // If greater than maxval or less than -maxval, replace with if_*.
-  const V if_pos = MulAdd(Sub(v, maxval), mul, maxval);
-  const V if_neg = MulSub(Add(v, maxval), mul, maxval);
-  const V pos_or_v = IfThenElse(Ge(v, maxval), if_pos, v);
-  return IfThenElse(Lt(v, Neg(maxval)), if_neg, pos_or_v);
-}
-
-// Make area around zero less important (remove it).
-template <class D, class V>
-HWY_INLINE V RemoveRangeAroundZero(const D d, const double kw, const V x) {
-  const auto w = Set(d, kw);
-  return IfThenElse(Gt(x, w), Sub(x, w),
-                    IfThenElseZero(Lt(x, Neg(w)), Add(x, w)));
-}
-
-// Make area around zero more important (2x it until the limit).
-template <class D, class V>
-HWY_INLINE V AmplifyRangeAroundZero(const D d, const double kw, const V x) {
-  const auto w = Set(d, kw);
-  return IfThenElse(Gt(x, w), Add(x, w),
-                    IfThenElse(Lt(x, Neg(w)), Sub(x, w), Add(x, x)));
-}
-
-// XybLowFreqToVals converts from low-frequency XYB space to the 'vals' space.
-// Vals space can be converted to L2-norm space (Euclidean and normalized)
-// through visual masking.
-template <class D, class V>
-HWY_INLINE void XybLowFreqToVals(const D d, const V& x, const V& y,
-                                 const V& b_arg, V* HWY_RESTRICT valx,
-                                 V* HWY_RESTRICT valy, V* HWY_RESTRICT valb) {
-  static const double xmul_scalar = 33.832837186260;
-  static const double ymul_scalar = 14.458268100570;
-  static const double bmul_scalar = 49.87984651440;
-  static const double y_to_b_mul_scalar = -0.362267051518;
-  const V xmul = Set(d, xmul_scalar);
-  const V ymul = Set(d, ymul_scalar);
-  const V bmul = Set(d, bmul_scalar);
-  const V y_to_b_mul = Set(d, y_to_b_mul_scalar);
-  const V b = MulAdd(y_to_b_mul, y, b_arg);
-  *valb = Mul(b, bmul);
-  *valx = Mul(x, xmul);
-  *valy = Mul(y, ymul);
-}
-
-void XybLowFreqToVals(Image3F* xyb_lf) {
-  // Modify range around zero code only concerns the high frequency
-  // planes and only the X and Y channels.
-  // Convert low freq xyb to vals space so that we can do a simple squared sum
-  // diff on the low frequencies later.
-  const HWY_FULL(float) d;
-  for (size_t y = 0; y < xyb_lf->ysize(); ++y) {
-    float* BUTTERAUGLI_RESTRICT row_x = xyb_lf->PlaneRow(0, y);
-    float* BUTTERAUGLI_RESTRICT row_y = xyb_lf->PlaneRow(1, y);
-    float* BUTTERAUGLI_RESTRICT row_b = xyb_lf->PlaneRow(2, y);
-    for (size_t x = 0; x < xyb_lf->xsize(); x += Lanes(d)) {
-      auto valx = Undefined(d);
-      auto valy = Undefined(d);
-      auto valb = Undefined(d);
-      XybLowFreqToVals(d, Load(d, row_x + x), Load(d, row_y + x),
-                       Load(d, row_b + x), &valx, &valy, &valb);
-      Store(valx, d, row_x + x);
-      Store(valy, d, row_y + x);
-      Store(valb, d, row_b + x);
-    }
-  }
-}
-
-Status SuppressXByY(const ImageF& in_y, ImageF* HWY_RESTRICT inout_x) {
-  JXL_ENSURE(SameSize(*inout_x, in_y));
-  const size_t xsize = in_y.xsize();
-  const size_t ysize = in_y.ysize();
-  const HWY_FULL(float) d;
-  static const double suppress = 46.0;
-  static const double s = 0.653020556257;
-  const auto sv = Set(d, s);
-  const auto one_minus_s = Set(d, 1.0 - s);
-  const auto ywv = Set(d, suppress);
-
-  for (size_t y = 0; y < ysize; ++y) {
-    const float* HWY_RESTRICT row_y = in_y.ConstRow(y);
-    float* HWY_RESTRICT row_x = inout_x->Row(y);
-    for (size_t x = 0; x < xsize; x += Lanes(d)) {
-      const auto vx = Load(d, row_x + x);
-      const auto vy = Load(d, row_y + x);
-      const auto scaler =
-          MulAdd(Div(ywv, MulAdd(vy, vy, ywv)), one_minus_s, sv);
-      Store(Mul(scaler, vx), d, row_x + x);
-    }
-  }
-  return true;
-}
-
-void Subtract(const ImageF& a, const ImageF& b, ImageF* c) {
-  const HWY_FULL(float) d;
-  for (size_t y = 0; y < a.ysize(); ++y) {
-    const float* row_a = a.ConstRow(y);
-    const float* row_b = b.ConstRow(y);
-    float* row_c = c->Row(y);
-    for (size_t x = 0; x < a.xsize(); x += Lanes(d)) {
-      Store(Sub(Load(d, row_a + x), Load(d, row_b + x)), d, row_c + x);
-    }
-  }
-}
-
-Status SeparateLFAndMF(const ButteraugliParams& params, const Image3F& xyb,
-                       Image3F* lf, Image3F* mf, BlurTemp* blur_temp) {
-  static const double kSigmaLf = 7.15593339443;
-  for (int i = 0; i < 3; ++i) {
-    // Extract lf ...
-    JXL_RETURN_IF_ERROR(
-        Blur(xyb.Plane(i), kSigmaLf, params, blur_temp, &lf->Plane(i)));
-    // ... and keep everything else in mf.
-    Subtract(xyb.Plane(i), lf->Plane(i), &mf->Plane(i));
-  }
-  XybLowFreqToVals(lf);
-  return true;
-}
-
-Status SeparateMFAndHF(const ButteraugliParams& params, Image3F* mf, ImageF* hf,
-                       BlurTemp* blur_temp) {
-  const HWY_FULL(float) d;
-  static const double kSigmaHf = 3.22489901262;
-  const size_t xsize = mf->xsize();
-  const size_t ysize = mf->ysize();
-  JxlMemoryManager* memory_manager = mf[0].memory_manager();
-  JXL_ASSIGN_OR_RETURN(hf[0], ImageF::Create(memory_manager, xsize, ysize));
-  JXL_ASSIGN_OR_RETURN(hf[1], ImageF::Create(memory_manager, xsize, ysize));
-  for (int i = 0; i < 3; ++i) {
-    if (i == 2) {
-      JXL_RETURN_IF_ERROR(
-          Blur(mf->Plane(i), kSigmaHf, params, blur_temp, &mf->Plane(i)));
-      break;
-    }
-    for (size_t y = 0; y < ysize; ++y) {
-      float* BUTTERAUGLI_RESTRICT row_mf = mf->PlaneRow(i, y);
-      float* BUTTERAUGLI_RESTRICT row_hf = hf[i].Row(y);
-      for (size_t x = 0; x < xsize; x += Lanes(d)) {
-        Store(Load(d, row_mf + x), d, row_hf + x);
-      }
-    }
-    JXL_RETURN_IF_ERROR(
-        Blur(mf->Plane(i), kSigmaHf, params, blur_temp, &mf->Plane(i)));
-    static const double kRemoveMfRange = 0.29;
-    static const double kAddMfRange = 0.1;
-    if (i == 0) {
-      for (size_t y = 0; y < ysize; ++y) {
-        float* BUTTERAUGLI_RESTRICT row_mf = mf->PlaneRow(0, y);
-        float* BUTTERAUGLI_RESTRICT row_hf = hf[0].Row(y);
-        for (size_t x = 0; x < xsize; x += Lanes(d)) {
-          auto mf = Load(d, row_mf + x);
-          auto hf = Sub(Load(d, row_hf + x), mf);
-          mf = RemoveRangeAroundZero(d, kRemoveMfRange, mf);
-          Store(mf, d, row_mf + x);
-          Store(hf, d, row_hf + x);
-        }
-      }
-    } else {
-      for (size_t y = 0; y < ysize; ++y) {
-        float* BUTTERAUGLI_RESTRICT row_mf = mf->PlaneRow(1, y);
-        float* BUTTERAUGLI_RESTRICT row_hf = hf[1].Row(y);
-        for (size_t x = 0; x < xsize; x += Lanes(d)) {
-          auto mf = Load(d, row_mf + x);
-          auto hf = Sub(Load(d, row_hf + x), mf);
-
-          mf = AmplifyRangeAroundZero(d, kAddMfRange, mf);
-          Store(mf, d, row_mf + x);
-          Store(hf, d, row_hf + x);
-        }
-      }
-    }
-  }
-  // Suppress red-green by intensity change in the high freq channels.
-  JXL_RETURN_IF_ERROR(SuppressXByY(hf[1], &hf[0]));
-  return true;
-}
-
-Status SeparateHFAndUHF(const ButteraugliParams& params, ImageF* hf,
-                        ImageF* uhf, BlurTemp* blur_temp) {
-  const HWY_FULL(float) d;
-  const size_t xsize = hf[0].xsize();
-  const size_t ysize = hf[0].ysize();
-  JxlMemoryManager* memory_manager = hf[0].memory_manager();
-  static const double kSigmaUhf = 1.56416327805;
-  JXL_ASSIGN_OR_RETURN(uhf[0], ImageF::Create(memory_manager, xsize, ysize));
-  JXL_ASSIGN_OR_RETURN(uhf[1], ImageF::Create(memory_manager, xsize, ysize));
-  for (int i = 0; i < 2; ++i) {
-    // Divide hf into hf and uhf.
-    for (size_t y = 0; y < ysize; ++y) {
-      float* BUTTERAUGLI_RESTRICT row_uhf = uhf[i].Row(y);
-      float* BUTTERAUGLI_RESTRICT row_hf = hf[i].Row(y);
-      for (size_t x = 0; x < xsize; ++x) {
-        row_uhf[x] = row_hf[x];
-      }
-    }
-    JXL_RETURN_IF_ERROR(Blur(hf[i], kSigmaUhf, params, blur_temp, &hf[i]));
-    static const double kRemoveHfRange = 1.5;
-    static const double kAddHfRange = 0.132;
-    static const double kRemoveUhfRange = 0.04;
-    static const double kMaxclampHf = 28.4691806922;
-    static const double kMaxclampUhf = 5.19175294647;
-    static double kMulYHf = 2.155;
-    static double kMulYUhf = 2.69313763794;
-    if (i == 0) {
-      for (size_t y = 0; y < ysize; ++y) {
-        float* BUTTERAUGLI_RESTRICT row_uhf = uhf[0].Row(y);
-        float* BUTTERAUGLI_RESTRICT row_hf = hf[0].Row(y);
-        for (size_t x = 0; x < xsize; x += Lanes(d)) {
-          auto hf = Load(d, row_hf + x);
-          auto uhf = Sub(Load(d, row_uhf + x), hf);
-          hf = RemoveRangeAroundZero(d, kRemoveHfRange, hf);
-          uhf = RemoveRangeAroundZero(d, kRemoveUhfRange, uhf);
-          Store(hf, d, row_hf + x);
-          Store(uhf, d, row_uhf + x);
-        }
-      }
-    } else {
-      for (size_t y = 0; y < ysize; ++y) {
-        float* BUTTERAUGLI_RESTRICT row_uhf = uhf[1].Row(y);
-        float* BUTTERAUGLI_RESTRICT row_hf = hf[1].Row(y);
-        for (size_t x = 0; x < xsize; x += Lanes(d)) {
-          auto hf = Load(d, row_hf + x);
-          hf = MaximumClamp(d, hf, kMaxclampHf);
-
-          auto uhf = Sub(Load(d, row_uhf + x), hf);
-          uhf = MaximumClamp(d, uhf, kMaxclampUhf);
-          uhf = Mul(uhf, Set(d, kMulYUhf));
-          Store(uhf, d, row_uhf + x);
-
-          hf = Mul(hf, Set(d, kMulYHf));
-          hf = AmplifyRangeAroundZero(d, kAddHfRange, hf);
-          Store(hf, d, row_hf + x);
-        }
-      }
-    }
-  }
-  return true;
-}
-
-void DeallocateHFAndUHF(ImageF* hf, ImageF* uhf) {
-  for (int i = 0; i < 2; ++i) {
-    hf[i] = ImageF();
-    uhf[i] = ImageF();
-  }
-}
-
-Status SeparateFrequencies(size_t xsize, size_t ysize,
-                           const ButteraugliParams& params, BlurTemp* blur_temp,
-                           const Image3F& xyb, PsychoImage& ps) {
-  JxlMemoryManager* memory_manager = xyb.memory_manager();
-  JXL_ASSIGN_OR_RETURN(
-      ps.lf, Image3F::Create(memory_manager, xyb.xsize(), xyb.ysize()));
-  JXL_ASSIGN_OR_RETURN(
-      ps.mf, Image3F::Create(memory_manager, xyb.xsize(), xyb.ysize()));
-  JXL_RETURN_IF_ERROR(SeparateLFAndMF(params, xyb, &ps.lf, &ps.mf, blur_temp));
-  JXL_RETURN_IF_ERROR(SeparateMFAndHF(params, &ps.mf, &ps.hf[0], blur_temp));
-  JXL_RETURN_IF_ERROR(
-      SeparateHFAndUHF(params, &ps.hf[0], &ps.uhf[0], blur_temp));
-  return true;
-}
-
-namespace {
-template <typename V>
-BUTTERAUGLI_INLINE V Sum(V a, V b, V c, V d) {
-  return Add(Add(a, b), Add(c, d));
-}
-template <typename V>
-BUTTERAUGLI_INLINE V Sum(V a, V b, V c, V d, V e) {
-  return Sum(a, b, c, Add(d, e));
-}
-template <typename V>
-BUTTERAUGLI_INLINE V Sum(V a, V b, V c, V d, V e, V f, V g) {
-  return Sum(a, b, c, Sum(d, e, f, g));
-}
-template <typename V>
-BUTTERAUGLI_INLINE V Sum(V a, V b, V c, V d, V e, V f, V g, V h, V i) {
-  return Add(Add(Sum(a, b, c, d), Sum(e, f, g, h)), i);
-}
-}  // namespace
-
-template <class D>
-Vec<D> MaltaUnit(MaltaTagLF /*tag*/, const D df,
-                 const float* BUTTERAUGLI_RESTRICT d, const intptr_t xs) {
-  const intptr_t xs3 = 3 * xs;
-
-  const auto center = LoadU(df, d);
-
-  // x grows, y constant
-  const auto sum_yconst = Sum(LoadU(df, d - 4), LoadU(df, d - 2), center,
-                              LoadU(df, d + 2), LoadU(df, d + 4));
-  // Will return this, sum of all line kernels
-  auto retval = Mul(sum_yconst, sum_yconst);
-  {
-    // y grows, x constant
-    auto sum = Sum(LoadU(df, d - xs3 - xs), LoadU(df, d - xs - xs), center,
-                   LoadU(df, d + xs + xs), LoadU(df, d + xs3 + xs));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    // both grow
-    auto sum = Sum(LoadU(df, d - xs3 - 3), LoadU(df, d - xs - xs - 2), center,
-                   LoadU(df, d + xs + xs + 2), LoadU(df, d + xs3 + 3));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    // y grows, x shrinks
-    auto sum = Sum(LoadU(df, d - xs3 + 3), LoadU(df, d - xs - xs + 2), center,
-                   LoadU(df, d + xs + xs - 2), LoadU(df, d + xs3 - 3));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    // y grows -4 to 4, x shrinks 1 -> -1
-    auto sum =
-        Sum(LoadU(df, d - xs3 - xs + 1), LoadU(df, d - xs - xs + 1), center,
-            LoadU(df, d + xs + xs - 1), LoadU(df, d + xs3 + xs - 1));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    //  y grows -4 to 4, x grows -1 -> 1
-    auto sum =
-        Sum(LoadU(df, d - xs3 - xs - 1), LoadU(df, d - xs - xs - 1), center,
-            LoadU(df, d + xs + xs + 1), LoadU(df, d + xs3 + xs + 1));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    // x grows -4 to 4, y grows -1 to 1
-    auto sum = Sum(LoadU(df, d - 4 - xs), LoadU(df, d - 2 - xs), center,
-                   LoadU(df, d + 2 + xs), LoadU(df, d + 4 + xs));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    // x grows -4 to 4, y shrinks 1 to -1
-    auto sum = Sum(LoadU(df, d - 4 + xs), LoadU(df, d - 2 + xs), center,
-                   LoadU(df, d + 2 - xs), LoadU(df, d + 4 - xs));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    /* 0_________
-       1__*______
-       2___*_____
-       3_________
-       4____0____
-       5_________
-       6_____*___
-       7______*__
-       8_________ */
-    auto sum = Sum(LoadU(df, d - xs3 - 2), LoadU(df, d - xs - xs - 1), center,
-                   LoadU(df, d + xs + xs + 1), LoadU(df, d + xs3 + 2));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    /* 0_________
-       1______*__
-       2_____*___
-       3_________
-       4____0____
-       5_________
-       6___*_____
-       7__*______
-       8_________ */
-    auto sum = Sum(LoadU(df, d - xs3 + 2), LoadU(df, d - xs - xs + 1), center,
-                   LoadU(df, d + xs + xs - 1), LoadU(df, d + xs3 - 2));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    /* 0_________
-       1_________
-       2_*_______
-       3__*______
-       4____0____
-       5______*__
-       6_______*_
-       7_________
-       8_________ */
-    auto sum = Sum(LoadU(df, d - xs - xs - 3), LoadU(df, d - xs - 2), center,
-                   LoadU(df, d + xs + 2), LoadU(df, d + xs + xs + 3));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    /* 0_________
-       1_________
-       2_______*_
-       3______*__
-       4____0____
-       5__*______
-       6_*_______
-       7_________
-       8_________ */
-    auto sum = Sum(LoadU(df, d - xs - xs + 3), LoadU(df, d - xs + 2), center,
-                   LoadU(df, d + xs - 2), LoadU(df, d + xs + xs - 3));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    /* 0_________
-       1_________
-       2________*
-       3______*__
-       4____0____
-       5__*______
-       6*________
-       7_________
-       8_________ */
-
-    auto sum = Sum(LoadU(df, d + xs + xs - 4), LoadU(df, d + xs - 2), center,
-                   LoadU(df, d - xs + 2), LoadU(df, d - xs - xs + 4));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    /* 0_________
-       1_________
-       2*________
-       3__*______
-       4____0____
-       5______*__
-       6________*
-       7_________
-       8_________ */
-    auto sum = Sum(LoadU(df, d - xs - xs - 4), LoadU(df, d - xs - 2), center,
-                   LoadU(df, d + xs + 2), LoadU(df, d + xs + xs + 4));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    /* 0__*______
-       1_________
-       2___*_____
-       3_________
-       4____0____
-       5_________
-       6_____*___
-       7_________
-       8______*__ */
-    auto sum =
-        Sum(LoadU(df, d - xs3 - xs - 2), LoadU(df, d - xs - xs - 1), center,
-            LoadU(df, d + xs + xs + 1), LoadU(df, d + xs3 + xs + 2));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    /* 0______*__
-       1_________
-       2_____*___
-       3_________
-       4____0____
-       5_________
-       6___*_____
-       7_________
-       8__*______ */
-    auto sum =
-        Sum(LoadU(df, d - xs3 - xs + 2), LoadU(df, d - xs - xs + 1), center,
-            LoadU(df, d + xs + xs - 1), LoadU(df, d + xs3 + xs - 2));
-    retval = MulAdd(sum, sum, retval);
-  }
-  return retval;
-}
-
-template <class D>
-Vec<D> MaltaUnit(MaltaTag /*tag*/, const D df,
-                 const float* BUTTERAUGLI_RESTRICT d, const intptr_t xs) {
-  const intptr_t xs3 = 3 * xs;
-
-  const auto center = LoadU(df, d);
-
-  // x grows, y constant
-  const auto sum_yconst =
-      Sum(LoadU(df, d - 4), LoadU(df, d - 3), LoadU(df, d - 2),
-          LoadU(df, d - 1), center, LoadU(df, d + 1), LoadU(df, d + 2),
-          LoadU(df, d + 3), LoadU(df, d + 4));
-  // Will return this, sum of all line kernels
-  auto retval = Mul(sum_yconst, sum_yconst);
-
-  {
-    // y grows, x constant
-    auto sum = Sum(LoadU(df, d - xs3 - xs), LoadU(df, d - xs3),
-                   LoadU(df, d - xs - xs), LoadU(df, d - xs), center,
-                   LoadU(df, d + xs), LoadU(df, d + xs + xs),
-                   LoadU(df, d + xs3), LoadU(df, d + xs3 + xs));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    // both grow
-    auto sum = Sum(LoadU(df, d - xs3 - 3), LoadU(df, d - xs - xs - 2),
-                   LoadU(df, d - xs - 1), center, LoadU(df, d + xs + 1),
-                   LoadU(df, d + xs + xs + 2), LoadU(df, d + xs3 + 3));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    // y grows, x shrinks
-    auto sum = Sum(LoadU(df, d - xs3 + 3), LoadU(df, d - xs - xs + 2),
-                   LoadU(df, d - xs + 1), center, LoadU(df, d + xs - 1),
-                   LoadU(df, d + xs + xs - 2), LoadU(df, d + xs3 - 3));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    // y grows -4 to 4, x shrinks 1 -> -1
-    auto sum = Sum(LoadU(df, d - xs3 - xs + 1), LoadU(df, d - xs3 + 1),
-                   LoadU(df, d - xs - xs + 1), LoadU(df, d - xs), center,
-                   LoadU(df, d + xs), LoadU(df, d + xs + xs - 1),
-                   LoadU(df, d + xs3 - 1), LoadU(df, d + xs3 + xs - 1));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    //  y grows -4 to 4, x grows -1 -> 1
-    auto sum = Sum(LoadU(df, d - xs3 - xs - 1), LoadU(df, d - xs3 - 1),
-                   LoadU(df, d - xs - xs - 1), LoadU(df, d - xs), center,
-                   LoadU(df, d + xs), LoadU(df, d + xs + xs + 1),
-                   LoadU(df, d + xs3 + 1), LoadU(df, d + xs3 + xs + 1));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    // x grows -4 to 4, y grows -1 to 1
-    auto sum =
-        Sum(LoadU(df, d - 4 - xs), LoadU(df, d - 3 - xs), LoadU(df, d - 2 - xs),
-            LoadU(df, d - 1), center, LoadU(df, d + 1), LoadU(df, d + 2 + xs),
-            LoadU(df, d + 3 + xs), LoadU(df, d + 4 + xs));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    // x grows -4 to 4, y shrinks 1 to -1
-    auto sum =
-        Sum(LoadU(df, d - 4 + xs), LoadU(df, d - 3 + xs), LoadU(df, d - 2 + xs),
-            LoadU(df, d - 1), center, LoadU(df, d + 1), LoadU(df, d + 2 - xs),
-            LoadU(df, d + 3 - xs), LoadU(df, d + 4 - xs));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    /* 0_________
-       1__*______
-       2___*_____
-       3___*_____
-       4____0____
-       5_____*___
-       6_____*___
-       7______*__
-       8_________ */
-    auto sum = Sum(LoadU(df, d - xs3 - 2), LoadU(df, d - xs - xs - 1),
-                   LoadU(df, d - xs - 1), center, LoadU(df, d + xs + 1),
-                   LoadU(df, d + xs + xs + 1), LoadU(df, d + xs3 + 2));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    /* 0_________
-       1______*__
-       2_____*___
-       3_____*___
-       4____0____
-       5___*_____
-       6___*_____
-       7__*______
-       8_________ */
-    auto sum = Sum(LoadU(df, d - xs3 + 2), LoadU(df, d - xs - xs + 1),
-                   LoadU(df, d - xs + 1), center, LoadU(df, d + xs - 1),
-                   LoadU(df, d + xs + xs - 1), LoadU(df, d + xs3 - 2));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    /* 0_________
-       1_________
-       2_*_______
-       3__**_____
-       4____0____
-       5_____**__
-       6_______*_
-       7_________
-       8_________ */
-    auto sum = Sum(LoadU(df, d - xs - xs - 3), LoadU(df, d - xs - 2),
-                   LoadU(df, d - xs - 1), center, LoadU(df, d + xs + 1),
-                   LoadU(df, d + xs + 2), LoadU(df, d + xs + xs + 3));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    /* 0_________
-       1_________
-       2_______*_
-       3_____**__
-       4____0____
-       5__**_____
-       6_*_______
-       7_________
-       8_________ */
-    auto sum = Sum(LoadU(df, d - xs - xs + 3), LoadU(df, d - xs + 2),
-                   LoadU(df, d - xs + 1), center, LoadU(df, d + xs - 1),
-                   LoadU(df, d + xs - 2), LoadU(df, d + xs + xs - 3));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    /* 0_________
-       1_________
-       2_________
-       3______***
-       4___*0*___
-       5***______
-       6_________
-       7_________
-       8_________ */
-
-    auto sum =
-        Sum(LoadU(df, d + xs - 4), LoadU(df, d + xs - 3), LoadU(df, d + xs - 2),
-            LoadU(df, d - 1), center, LoadU(df, d + 1), LoadU(df, d - xs + 2),
-            LoadU(df, d - xs + 3), LoadU(df, d - xs + 4));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    /* 0_________
-       1_________
-       2_________
-       3***______
-       4___*0*___
-       5______***
-       6_________
-       7_________
-       8_________ */
-    auto sum =
-        Sum(LoadU(df, d - xs - 4), LoadU(df, d - xs - 3), LoadU(df, d - xs - 2),
-            LoadU(df, d - 1), center, LoadU(df, d + 1), LoadU(df, d + xs + 2),
-            LoadU(df, d + xs + 3), LoadU(df, d + xs + 4));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    /* 0___*_____
-       1___*_____
-       2___*_____
-       3____*____
-       4____0____
-       5____*____
-       6_____*___
-       7_____*___
-       8_____*___ */
-    auto sum = Sum(LoadU(df, d - xs3 - xs - 1), LoadU(df, d - xs3 - 1),
-                   LoadU(df, d - xs - xs - 1), LoadU(df, d - xs), center,
-                   LoadU(df, d + xs), LoadU(df, d + xs + xs + 1),
-                   LoadU(df, d + xs3 + 1), LoadU(df, d + xs3 + xs + 1));
-    retval = MulAdd(sum, sum, retval);
-  }
-  {
-    /* 0_____*___
-       1_____*___
-       2____ *___
-       3____*____
-       4____0____
-       5____*____
-       6___*_____
-       7___*_____
-       8___*_____ */
-    auto sum = Sum(LoadU(df, d - xs3 - xs + 1), LoadU(df, d - xs3 + 1),
-                   LoadU(df, d - xs - xs + 1), LoadU(df, d - xs), center,
-                   LoadU(df, d + xs), LoadU(df, d + xs + xs - 1),
-                   LoadU(df, d + xs3 - 1), LoadU(df, d + xs3 + xs - 1));
-    retval = MulAdd(sum, sum, retval);
-  }
-  return retval;
-}
-
-// Returns MaltaUnit. Avoids bounds-checks when x0 and y0 are known
-// to be far enough from the image borders. "diffs" is a packed image.
-template <class Tag>
-static BUTTERAUGLI_INLINE float PaddedMaltaUnit(const ImageF& diffs,
-                                                const size_t x0,
-                                                const size_t y0) {
-  const float* BUTTERAUGLI_RESTRICT d = diffs.ConstRow(y0) + x0;
-  const HWY_CAPPED(float, 1) df;
-  if ((x0 >= 4 && y0 >= 4 && x0 < (diffs.xsize() - 4) &&
-       y0 < (diffs.ysize() - 4))) {
-    return GetLane(MaltaUnit(Tag(), df, d, diffs.PixelsPerRow()));
-  }
-
-  float borderimage[12 * 9];  // round up to 4
-  for (int dy = 0; dy < 9; ++dy) {
-    int y = y0 + dy - 4;
-    if (y < 0 || static_cast<size_t>(y) >= diffs.ysize()) {
-      for (int dx = 0; dx < 12; ++dx) {
-        borderimage[dy * 12 + dx] = 0.0f;
-      }
-      continue;
-    }
-
-    const float* row_diffs = diffs.ConstRow(y);
-    for (int dx = 0; dx < 9; ++dx) {
-      int x = x0 + dx - 4;
-      if (x < 0 || static_cast<size_t>(x) >= diffs.xsize()) {
-        borderimage[dy * 12 + dx] = 0.0f;
-      } else {
-        borderimage[dy * 12 + dx] = row_diffs[x];
-      }
-    }
-    std::fill(borderimage + dy * 12 + 9, borderimage + dy * 12 + 12, 0.0f);
-  }
-  return GetLane(MaltaUnit(Tag(), df, &borderimage[4 * 12 + 4], 12));
-}
-
-template <class Tag>
-static Status MaltaDiffMapT(const Tag tag, const ImageF& lum0,
-                            const ImageF& lum1, const double w_0gt1,
-                            const double w_0lt1, const double norm1,
-                            const double len, const double mulli,
-                            ImageF* HWY_RESTRICT diffs,
-                            ImageF* HWY_RESTRICT block_diff_ac) {
-  JXL_ENSURE(SameSize(lum0, lum1) && SameSize(lum0, *diffs));
-  const size_t xsize_ = lum0.xsize();
-  const size_t ysize_ = lum0.ysize();
-
-  const float kWeight0 = 0.5;
-  const float kWeight1 = 0.33;
-
-  const double w_pre0gt1 = mulli * std::sqrt(kWeight0 * w_0gt1) / (len * 2 + 1);
-  const double w_pre0lt1 = mulli * std::sqrt(kWeight1 * w_0lt1) / (len * 2 + 1);
-  const float norm2_0gt1 = w_pre0gt1 * norm1;
-  const float norm2_0lt1 = w_pre0lt1 * norm1;
-
-  for (size_t y = 0; y < ysize_; ++y) {
-    const float* HWY_RESTRICT row0 = lum0.ConstRow(y);
-    const float* HWY_RESTRICT row1 = lum1.ConstRow(y);
-    float* HWY_RESTRICT row_diffs = diffs->Row(y);
-    for (size_t x = 0; x < xsize_; ++x) {
-      const float absval = 0.5f * (std::abs(row0[x]) + std::abs(row1[x]));
-      const float diff = row0[x] - row1[x];
-      const float scaler = norm2_0gt1 / (static_cast<float>(norm1) + absval);
-
-      // Primary symmetric quadratic objective.
-      row_diffs[x] = scaler * diff;
-
-      const float scaler2 = norm2_0lt1 / (static_cast<float>(norm1) + absval);
-      const double fabs0 = std::fabs(row0[x]);
-
-      // Secondary half-open quadratic objectives.
-      const double too_small = 0.55 * fabs0;
-      const double too_big = 1.05 * fabs0;
-
-      if (row0[x] < 0) {
-        if (row1[x] > -too_small) {
-          double impact = scaler2 * (row1[x] + too_small);
-          row_diffs[x] -= impact;
-        } else if (row1[x] < -too_big) {
-          double impact = scaler2 * (-row1[x] - too_big);
-          row_diffs[x] += impact;
-        }
-      } else {
-        if (row1[x] < too_small) {
-          double impact = scaler2 * (too_small - row1[x]);
-          row_diffs[x] += impact;
-        } else if (row1[x] > too_big) {
-          double impact = scaler2 * (row1[x] - too_big);
-          row_diffs[x] -= impact;
-        }
-      }
-    }
-  }
-
-  size_t y0 = 0;
-  // Top
-  for (; y0 < 4; ++y0) {
-    float* BUTTERAUGLI_RESTRICT row_diff = block_diff_ac->Row(y0);
-    for (size_t x0 = 0; x0 < xsize_; ++x0) {
-      row_diff[x0] += PaddedMaltaUnit<Tag>(*diffs, x0, y0);
-    }
-  }
-
-  const HWY_FULL(float) df;
-  const size_t aligned_x = std::max(static_cast<size_t>(4), Lanes(df));
-  const intptr_t stride = diffs->PixelsPerRow();
-
-  // Middle
-  for (; y0 < ysize_ - 4; ++y0) {
-    const float* BUTTERAUGLI_RESTRICT row_in = diffs->ConstRow(y0);
-    float* BUTTERAUGLI_RESTRICT row_diff = block_diff_ac->Row(y0);
-    size_t x0 = 0;
-    for (; x0 < aligned_x; ++x0) {
-      row_diff[x0] += PaddedMaltaUnit<Tag>(*diffs, x0, y0);
-    }
-    for (; x0 + Lanes(df) + 4 <= xsize_; x0 += Lanes(df)) {
-      auto diff = Load(df, row_diff + x0);
-      diff = Add(diff, MaltaUnit(Tag(), df, row_in + x0, stride));
-      Store(diff, df, row_diff + x0);
-    }
-
-    for (; x0 < xsize_; ++x0) {
-      row_diff[x0] += PaddedMaltaUnit<Tag>(*diffs, x0, y0);
-    }
-  }
-
-  // Bottom
-  for (; y0 < ysize_; ++y0) {
-    float* BUTTERAUGLI_RESTRICT row_diff = block_diff_ac->Row(y0);
-    for (size_t x0 = 0; x0 < xsize_; ++x0) {
-      row_diff[x0] += PaddedMaltaUnit<Tag>(*diffs, x0, y0);
-    }
-  }
-  return true;
-}
-
-// Need non-template wrapper functions for HWY_EXPORT.
-Status MaltaDiffMap(const ImageF& lum0, const ImageF& lum1, const double w_0gt1,
-                    const double w_0lt1, const double norm1,
-                    ImageF* HWY_RESTRICT diffs,
-                    ImageF* HWY_RESTRICT block_diff_ac) {
-  const double len = 3.75;
-  static const double mulli = 0.39905817637;
-  JXL_RETURN_IF_ERROR(MaltaDiffMapT(MaltaTag(), lum0, lum1, w_0gt1, w_0lt1,
-                                    norm1, len, mulli, diffs, block_diff_ac));
-  return true;
-}
-
-Status MaltaDiffMapLF(const ImageF& lum0, const ImageF& lum1,
-                      const double w_0gt1, const double w_0lt1,
-                      const double norm1, ImageF* HWY_RESTRICT diffs,
-                      ImageF* HWY_RESTRICT block_diff_ac) {
-  const double len = 3.75;
-  static const double mulli = 0.611612573796;
-  JXL_RETURN_IF_ERROR(MaltaDiffMapT(MaltaTagLF(), lum0, lum1, w_0gt1, w_0lt1,
-                                    norm1, len, mulli, diffs, block_diff_ac));
-  return true;
-}
-
-void CombineChannelsForMasking(const ImageF* hf, const ImageF* uhf,
-                               ImageF* out) {
-  // Only X and Y components are involved in masking. B's influence
-  // is considered less important in the high frequency area, and we
-  // don't model masking from lower frequency signals.
-  static const float muls[3] = {
-      2.5f,
-      0.4f,
-      0.4f,
-  };
-  // Silly and unoptimized approach here. TODO(jyrki): rework this.
-  for (size_t y = 0; y < hf[0].ysize(); ++y) {
-    const float* BUTTERAUGLI_RESTRICT row_y_hf = hf[1].Row(y);
-    const float* BUTTERAUGLI_RESTRICT row_y_uhf = uhf[1].Row(y);
-    const float* BUTTERAUGLI_RESTRICT row_x_hf = hf[0].Row(y);
-    const float* BUTTERAUGLI_RESTRICT row_x_uhf = uhf[0].Row(y);
-    float* BUTTERAUGLI_RESTRICT row = out->Row(y);
-    for (size_t x = 0; x < hf[0].xsize(); ++x) {
-      float xdiff = (row_x_uhf[x] + row_x_hf[x]) * muls[0];
-      float ydiff = row_y_uhf[x] * muls[1] + row_y_hf[x] * muls[2];
-      row[x] = xdiff * xdiff + ydiff * ydiff;
-      row[x] = std::sqrt(row[x]);
-    }
-  }
-}
-
-void DiffPrecompute(const ImageF& xyb, float mul, float bias_arg, ImageF* out) {
-  const size_t xsize = xyb.xsize();
-  const size_t ysize = xyb.ysize();
-  const float bias = mul * bias_arg;
-  const float sqrt_bias = std::sqrt(bias);
-  for (size_t y = 0; y < ysize; ++y) {
-    const float* BUTTERAUGLI_RESTRICT row_in = xyb.Row(y);
-    float* BUTTERAUGLI_RESTRICT row_out = out->Row(y);
-    for (size_t x = 0; x < xsize; ++x) {
-      // kBias makes sqrt behave more linearly.
-      row_out[x] = std::sqrt(mul * std::abs(row_in[x]) + bias) - sqrt_bias;
-    }
-  }
-}
-
-// std::log(80.0) / std::log(255.0);
-constexpr float kIntensityTargetNormalizationHack = 0.79079917404f;
-static const float kInternalGoodQualityThreshold =
-    17.83f * kIntensityTargetNormalizationHack;
-static const float kGlobalScale = 1.0 / kInternalGoodQualityThreshold;
-
-void StoreMin3(const float v, float& min0, float& min1, float& min2) {
-  if (v < min2) {
-    if (v < min0) {
-      min2 = min1;
-      min1 = min0;
-      min0 = v;
-    } else if (v < min1) {
-      min2 = min1;
-      min1 = v;
-    } else {
-      min2 = v;
-    }
-  }
-}
-
-// Look for smooth areas near the area of degradation.
-// If the areas area generally smooth, don't do masking.
-void FuzzyErosion(const ImageF& from, ImageF* to) {
-  const size_t xsize = from.xsize();
-  const size_t ysize = from.ysize();
-  static const int kStep = 3;
-  for (size_t y = 0; y < ysize; ++y) {
-    for (size_t x = 0; x < xsize; ++x) {
-      float min0 = from.Row(y)[x];
-      float min1 = 2 * min0;
-      float min2 = min1;
-      if (x >= kStep) {
-        float v = from.Row(y)[x - kStep];
-        StoreMin3(v, min0, min1, min2);
-        if (y >= kStep) {
-          float v = from.Row(y - kStep)[x - kStep];
-          StoreMin3(v, min0, min1, min2);
-        }
-        if (y < ysize - kStep) {
-          float v = from.Row(y + kStep)[x - kStep];
-          StoreMin3(v, min0, min1, min2);
-        }
-      }
-      if (x < xsize - kStep) {
-        float v = from.Row(y)[x + kStep];
-        StoreMin3(v, min0, min1, min2);
-        if (y >= kStep) {
-          float v = from.Row(y - kStep)[x + kStep];
-          StoreMin3(v, min0, min1, min2);
-        }
-        if (y < ysize - kStep) {
-          float v = from.Row(y + kStep)[x + kStep];
-          StoreMin3(v, min0, min1, min2);
-        }
-      }
-      if (y >= kStep) {
-        float v = from.Row(y - kStep)[x];
-        StoreMin3(v, min0, min1, min2);
-      }
-      if (y < ysize - kStep) {
-        float v = from.Row(y + kStep)[x];
-        StoreMin3(v, min0, min1, min2);
-      }
-      to->Row(y)[x] = (0.45f * min0 + 0.3f * min1 + 0.25f * min2);
-    }
-  }
-}
-
-// Compute values of local frequency and dc masking based on the activity
-// in the two images. img_diff_ac may be null.
-Status Mask(const ImageF& mask0, const ImageF& mask1,
-            const ButteraugliParams& params, BlurTemp* blur_temp,
-            ImageF* BUTTERAUGLI_RESTRICT mask,
-            ImageF* BUTTERAUGLI_RESTRICT diff_ac) {
-  const size_t xsize = mask0.xsize();
-  const size_t ysize = mask0.ysize();
-  JxlMemoryManager* memory_manager = mask0.memory_manager();
-  JXL_ASSIGN_OR_RETURN(*mask, ImageF::Create(memory_manager, xsize, ysize));
-  static const float kMul = 6.19424080439;
-  static const float kBias = 12.61050594197;
-  static const float kRadius = 2.7;
-  JXL_ASSIGN_OR_RETURN(ImageF diff0,
-                       ImageF::Create(memory_manager, xsize, ysize));
-  JXL_ASSIGN_OR_RETURN(ImageF diff1,
-                       ImageF::Create(memory_manager, xsize, ysize));
-  JXL_ASSIGN_OR_RETURN(ImageF blurred0,
-                       ImageF::Create(memory_manager, xsize, ysize));
-  JXL_ASSIGN_OR_RETURN(ImageF blurred1,
-                       ImageF::Create(memory_manager, xsize, ysize));
-  DiffPrecompute(mask0, kMul, kBias, &diff0);
-  DiffPrecompute(mask1, kMul, kBias, &diff1);
-  JXL_RETURN_IF_ERROR(Blur(diff0, kRadius, params, blur_temp, &blurred0));
-  FuzzyErosion(blurred0, &diff0);
-  JXL_RETURN_IF_ERROR(Blur(diff1, kRadius, params, blur_temp, &blurred1));
-  for (size_t y = 0; y < ysize; ++y) {
-    for (size_t x = 0; x < xsize; ++x) {
-      mask->Row(y)[x] = diff0.Row(y)[x];
-      if (diff_ac != nullptr) {
-        static const float kMaskToErrorMul = 10.0;
-        float diff = blurred0.Row(y)[x] - blurred1.Row(y)[x];
-        diff_ac->Row(y)[x] += kMaskToErrorMul * diff * diff;
-      }
-    }
-  }
-  return true;
-}
-
-// `diff_ac` may be null.
-Status MaskPsychoImage(const PsychoImage& pi0, const PsychoImage& pi1,
-                       const size_t xsize, const size_t ysize,
-                       const ButteraugliParams& params, BlurTemp* blur_temp,
-                       ImageF* BUTTERAUGLI_RESTRICT mask,
-                       ImageF* BUTTERAUGLI_RESTRICT diff_ac) {
-  JxlMemoryManager* memory_manager = pi0.hf[0].memory_manager();
-  JXL_ASSIGN_OR_RETURN(ImageF mask0,
-                       ImageF::Create(memory_manager, xsize, ysize));
-  JXL_ASSIGN_OR_RETURN(ImageF mask1,
-                       ImageF::Create(memory_manager, xsize, ysize));
-  CombineChannelsForMasking(&pi0.hf[0], &pi0.uhf[0], &mask0);
-  CombineChannelsForMasking(&pi1.hf[0], &pi1.uhf[0], &mask1);
-  JXL_RETURN_IF_ERROR(Mask(mask0, mask1, params, blur_temp, mask, diff_ac));
-  return true;
-}
-
-double MaskY(double delta) {
-  static const double offset = 0.829591754942;
-  static const double scaler = 0.451936922203;
-  static const double mul = 2.5485944793;
-  const double c = mul / ((scaler * delta) + offset);
-  const double retval = kGlobalScale * (1.0 + c);
-  return retval * retval;
-}
-
-double MaskDcY(double delta) {
-  static const double offset = 0.20025578522;
-  static const double scaler = 3.87449418804;
-  static const double mul = 0.505054525019;
-  const double c = mul / ((scaler * delta) + offset);
-  const double retval = kGlobalScale * (1.0 + c);
-  return retval * retval;
-}
-
-inline float MaskColor(const float color[3], const float mask) {
-  return color[0] * mask + color[1] * mask + color[2] * mask;
-}
-
-// Diffmap := sqrt of sum{diff images by multiplied by X and Y/B masks}
-Status CombineChannelsToDiffmap(const ImageF& mask,
-                                const Image3F& block_diff_dc,
-                                const Image3F& block_diff_ac, float xmul,
-                                ImageF* result) {
-  JXL_ENSURE(SameSize(mask, *result));
-  size_t xsize = mask.xsize();
-  size_t ysize = mask.ysize();
-  for (size_t y = 0; y < ysize; ++y) {
-    float* BUTTERAUGLI_RESTRICT row_out = result->Row(y);
-    for (size_t x = 0; x < xsize; ++x) {
-      float val = mask.Row(y)[x];
-      float maskval = MaskY(val);
-      float dc_maskval = MaskDcY(val);
-      float diff_dc[3];
-      float diff_ac[3];
-      for (int i = 0; i < 3; ++i) {
-        diff_dc[i] = block_diff_dc.PlaneRow(i, y)[x];
-        diff_ac[i] = block_diff_ac.PlaneRow(i, y)[x];
-      }
-      diff_ac[0] *= xmul;
-      diff_dc[0] *= xmul;
-      row_out[x] = std::sqrt(MaskColor(diff_dc, dc_maskval) +
-                             MaskColor(diff_ac, maskval));
-    }
-  }
-  return true;
-}
-
-// Adds weighted L2 difference between i0 and i1 to diffmap.
-static void L2Diff(const ImageF& i0, const ImageF& i1, const float w,
-                   ImageF* BUTTERAUGLI_RESTRICT diffmap) {
-  if (w == 0) return;
-
-  const HWY_FULL(float) d;
-  const auto weight = Set(d, w);
-
-  for (size_t y = 0; y < i0.ysize(); ++y) {
-    const float* BUTTERAUGLI_RESTRICT row0 = i0.ConstRow(y);
-    const float* BUTTERAUGLI_RESTRICT row1 = i1.ConstRow(y);
-    float* BUTTERAUGLI_RESTRICT row_diff = diffmap->Row(y);
-
-    for (size_t x = 0; x < i0.xsize(); x += Lanes(d)) {
-      const auto diff = Sub(Load(d, row0 + x), Load(d, row1 + x));
-      const auto diff2 = Mul(diff, diff);
-      const auto prev = Load(d, row_diff + x);
-      Store(MulAdd(diff2, weight, prev), d, row_diff + x);
-    }
-  }
-}
-
-// Initializes diffmap to the weighted L2 difference between i0 and i1.
-static void SetL2Diff(const ImageF& i0, const ImageF& i1, const float w,
-                      ImageF* BUTTERAUGLI_RESTRICT diffmap) {
-  if (w == 0) return;
-
-  const HWY_FULL(float) d;
-  const auto weight = Set(d, w);
-
-  for (size_t y = 0; y < i0.ysize(); ++y) {
-    const float* BUTTERAUGLI_RESTRICT row0 = i0.ConstRow(y);
-    const float* BUTTERAUGLI_RESTRICT row1 = i1.ConstRow(y);
-    float* BUTTERAUGLI_RESTRICT row_diff = diffmap->Row(y);
-
-    for (size_t x = 0; x < i0.xsize(); x += Lanes(d)) {
-      const auto diff = Sub(Load(d, row0 + x), Load(d, row1 + x));
-      const auto diff2 = Mul(diff, diff);
-      Store(Mul(diff2, weight), d, row_diff + x);
-    }
-  }
-}
-
-// i0 is the original image.
-// i1 is the deformed copy.
-static void L2DiffAsymmetric(const ImageF& i0, const ImageF& i1, float w_0gt1,
-                             float w_0lt1,
-                             ImageF* BUTTERAUGLI_RESTRICT diffmap) {
-  if (w_0gt1 == 0 && w_0lt1 == 0) {
-    return;
-  }
-
-  const HWY_FULL(float) d;
-  const auto vw_0gt1 = Set(d, w_0gt1 * 0.8);
-  const auto vw_0lt1 = Set(d, w_0lt1 * 0.8);
-
-  for (size_t y = 0; y < i0.ysize(); ++y) {
-    const float* BUTTERAUGLI_RESTRICT row0 = i0.Row(y);
-    const float* BUTTERAUGLI_RESTRICT row1 = i1.Row(y);
-    float* BUTTERAUGLI_RESTRICT row_diff = diffmap->Row(y);
-
-    for (size_t x = 0; x < i0.xsize(); x += Lanes(d)) {
-      const auto val0 = Load(d, row0 + x);
-      const auto val1 = Load(d, row1 + x);
-
-      // Primary symmetric quadratic objective.
-      const auto diff = Sub(val0, val1);
-      auto total = MulAdd(Mul(diff, diff), vw_0gt1, Load(d, row_diff + x));
-
-      // Secondary half-open quadratic objectives.
-      const auto fabs0 = Abs(val0);
-      const auto too_small = Mul(Set(d, 0.4), fabs0);
-      const auto too_big = fabs0;
-
-      const auto if_neg = IfThenElse(
-          Gt(val1, Neg(too_small)), Add(val1, too_small),
-          IfThenElseZero(Lt(val1, Neg(too_big)), Sub(Neg(val1), too_big)));
-      const auto if_pos =
-          IfThenElse(Lt(val1, too_small), Sub(too_small, val1),
-                     IfThenElseZero(Gt(val1, too_big), Sub(val1, too_big)));
-      const auto v = IfThenElse(Lt(val0, Zero(d)), if_neg, if_pos);
-      total = MulAdd(vw_0lt1, Mul(v, v), total);
-      Store(total, d, row_diff + x);
-    }
-  }
-}
-
-// A simple HDR compatible gamma function.
-template <class DF, class V>
-V Gamma(const DF df, V v) {
-  // ln(2) constant folded in because we want std::log but have FastLog2f.
-  const auto kRetMul = Set(df, 19.245013259874995f * 0.693147180559945f);
-  const auto kRetAdd = Set(df, -23.16046239805755);
-  // This should happen rarely, but may lead to a NaN in log, which is
-  // undesirable. Since negative photons don't exist we solve the NaNs by
-  // clamping here.
-  v = ZeroIfNegative(v);
-
-  const auto biased = Add(v, Set(df, 9.9710635769299145));
-  const auto log = FastLog2f(df, biased);
-  // We could fold this into a custom Log2 polynomial, but there would be
-  // relatively little gain.
-  return MulAdd(kRetMul, log, kRetAdd);
-}
-
-template <bool Clamp, class DF, class V>
-BUTTERAUGLI_INLINE void OpsinAbsorbance(const DF df, const V& in0, const V& in1,
-                                        const V& in2, V* JXL_RESTRICT out0,
-                                        V* JXL_RESTRICT out1,
-                                        V* JXL_RESTRICT out2) {
-  // https://en.wikipedia.org/wiki/Photopsin absorbance modeling.
-  static const double mixi0 = 0.29956550340058319;
-  static const double mixi1 = 0.63373087833825936;
-  static const double mixi2 = 0.077705617820981968;
-  static const double mixi3 = 1.7557483643287353;
-  static const double mixi4 = 0.22158691104574774;
-  static const double mixi5 = 0.69391388044116142;
-  static const double mixi6 = 0.0987313588422;
-  static const double mixi7 = 1.7557483643287353;
-  static const double mixi8 = 0.02;
-  static const double mixi9 = 0.02;
-  static const double mixi10 = 0.20480129041026129;
-  static const double mixi11 = 12.226454707163354;
-
-  const V mix0 = Set(df, mixi0);
-  const V mix1 = Set(df, mixi1);
-  const V mix2 = Set(df, mixi2);
-  const V mix3 = Set(df, mixi3);
-  const V mix4 = Set(df, mixi4);
-  const V mix5 = Set(df, mixi5);
-  const V mix6 = Set(df, mixi6);
-  const V mix7 = Set(df, mixi7);
-  const V mix8 = Set(df, mixi8);
-  const V mix9 = Set(df, mixi9);
-  const V mix10 = Set(df, mixi10);
-  const V mix11 = Set(df, mixi11);
-
-  *out0 = MulAdd(mix0, in0, MulAdd(mix1, in1, MulAdd(mix2, in2, mix3)));
-  *out1 = MulAdd(mix4, in0, MulAdd(mix5, in1, MulAdd(mix6, in2, mix7)));
-  *out2 = MulAdd(mix8, in0, MulAdd(mix9, in1, MulAdd(mix10, in2, mix11)));
-
-  if (Clamp) {
-    *out0 = Max(*out0, mix3);
-    *out1 = Max(*out1, mix7);
-    *out2 = Max(*out2, mix11);
-  }
-}
-
-// `blurred` is a temporary image used inside this function and not returned.
-Status OpsinDynamicsImage(const Image3F& rgb, const ButteraugliParams& params,
-                          Image3F* blurred, BlurTemp* blur_temp, Image3F* xyb) {
-  JXL_ENSURE(blurred != nullptr);
-  const double kSigma = 1.2;
-  JXL_RETURN_IF_ERROR(
-      Blur(rgb.Plane(0), kSigma, params, blur_temp, &blurred->Plane(0)));
-  JXL_RETURN_IF_ERROR(
-      Blur(rgb.Plane(1), kSigma, params, blur_temp, &blurred->Plane(1)));
-  JXL_RETURN_IF_ERROR(
-      Blur(rgb.Plane(2), kSigma, params, blur_temp, &blurred->Plane(2)));
-  const HWY_FULL(float) df;
-  const auto intensity_target_multiplier = Set(df, params.intensity_target);
-  for (size_t y = 0; y < rgb.ysize(); ++y) {
-    const float* row_r = rgb.ConstPlaneRow(0, y);
-    const float* row_g = rgb.ConstPlaneRow(1, y);
-    const float* row_b = rgb.ConstPlaneRow(2, y);
-    const float* row_blurred_r = blurred->ConstPlaneRow(0, y);
-    const float* row_blurred_g = blurred->ConstPlaneRow(1, y);
-    const float* row_blurred_b = blurred->ConstPlaneRow(2, y);
-    float* row_out_x = xyb->PlaneRow(0, y);
-    float* row_out_y = xyb->PlaneRow(1, y);
-    float* row_out_b = xyb->PlaneRow(2, y);
-    const auto min = Set(df, 1e-4f);
-    for (size_t x = 0; x < rgb.xsize(); x += Lanes(df)) {
-      auto sensitivity0 = Undefined(df);
-      auto sensitivity1 = Undefined(df);
-      auto sensitivity2 = Undefined(df);
-      {
-        // Calculate sensitivity based on the smoothed image gamma derivative.
-        auto pre_mixed0 = Undefined(df);
-        auto pre_mixed1 = Undefined(df);
-        auto pre_mixed2 = Undefined(df);
-        OpsinAbsorbance<true>(
-            df, Mul(Load(df, row_blurred_r + x), intensity_target_multiplier),
-            Mul(Load(df, row_blurred_g + x), intensity_target_multiplier),
-            Mul(Load(df, row_blurred_b + x), intensity_target_multiplier),
-            &pre_mixed0, &pre_mixed1, &pre_mixed2);
-        pre_mixed0 = Max(pre_mixed0, min);
-        pre_mixed1 = Max(pre_mixed1, min);
-        pre_mixed2 = Max(pre_mixed2, min);
-        sensitivity0 = Div(Gamma(df, pre_mixed0), pre_mixed0);
-        sensitivity1 = Div(Gamma(df, pre_mixed1), pre_mixed1);
-        sensitivity2 = Div(Gamma(df, pre_mixed2), pre_mixed2);
-        sensitivity0 = Max(sensitivity0, min);
-        sensitivity1 = Max(sensitivity1, min);
-        sensitivity2 = Max(sensitivity2, min);
-      }
-      auto cur_mixed0 = Undefined(df);
-      auto cur_mixed1 = Undefined(df);
-      auto cur_mixed2 = Undefined(df);
-      OpsinAbsorbance<false>(
-          df, Mul(Load(df, row_r + x), intensity_target_multiplier),
-          Mul(Load(df, row_g + x), intensity_target_multiplier),
-          Mul(Load(df, row_b + x), intensity_target_multiplier), &cur_mixed0,
-          &cur_mixed1, &cur_mixed2);
-      cur_mixed0 = Mul(cur_mixed0, sensitivity0);
-      cur_mixed1 = Mul(cur_mixed1, sensitivity1);
-      cur_mixed2 = Mul(cur_mixed2, sensitivity2);
-      // This is a kludge. The negative values should be zeroed away before
-      // blurring. Ideally there would be no negative values in the first place.
-      const auto min01 = Set(df, 1.7557483643287353f);
-      const auto min2 = Set(df, 12.226454707163354f);
-      cur_mixed0 = Max(cur_mixed0, min01);
-      cur_mixed1 = Max(cur_mixed1, min01);
-      cur_mixed2 = Max(cur_mixed2, min2);
-
-      Store(Sub(cur_mixed0, cur_mixed1), df, row_out_x + x);
-      Store(Add(cur_mixed0, cur_mixed1), df, row_out_y + x);
-      Store(cur_mixed2, df, row_out_b + x);
-    }
-  }
-  return true;
-}
-
-Status ButteraugliDiffmapInPlace(Image3F& image0, Image3F& image1,
-                                 const ButteraugliParams& params,
-                                 ImageF& diffmap) {
-  // image0 and image1 are in linear sRGB color space
-  const size_t xsize = image0.xsize();
-  const size_t ysize = image0.ysize();
-  JxlMemoryManager* memory_manager = image0.memory_manager();
-  BlurTemp blur_temp;
-  {
-    // Convert image0 and image1 to XYB in-place
-    JXL_ASSIGN_OR_RETURN(Image3F temp,
-                         Image3F::Create(memory_manager, xsize, ysize));
-    JXL_RETURN_IF_ERROR(
-        OpsinDynamicsImage(image0, params, &temp, &blur_temp, &image0));
-    JXL_RETURN_IF_ERROR(
-        OpsinDynamicsImage(image1, params, &temp, &blur_temp, &image1));
-  }
-  // image0 and image1 are in XYB color space
-  JXL_ASSIGN_OR_RETURN(ImageF block_diff_dc,
-                       ImageF::Create(memory_manager, xsize, ysize));
-  ZeroFillImage(&block_diff_dc);
-  {
-    // separate out LF components from image0 and image1 and compute the dc
-    // diff image from them
-    JXL_ASSIGN_OR_RETURN(Image3F lf0,
-                         Image3F::Create(memory_manager, xsize, ysize));
-    JXL_ASSIGN_OR_RETURN(Image3F lf1,
-                         Image3F::Create(memory_manager, xsize, ysize));
-    JXL_RETURN_IF_ERROR(
-        SeparateLFAndMF(params, image0, &lf0, &image0, &blur_temp));
-    JXL_RETURN_IF_ERROR(
-        SeparateLFAndMF(params, image1, &lf1, &image1, &blur_temp));
-    for (size_t c = 0; c < 3; ++c) {
-      L2Diff(lf0.Plane(c), lf1.Plane(c), wmul[6 + c], &block_diff_dc);
-    }
-  }
-  // image0 and image1 are MF residuals (before blurring) in XYB color space
-  ImageF hf0[2];
-  ImageF hf1[2];
-  JXL_RETURN_IF_ERROR(SeparateMFAndHF(params, &image0, &hf0[0], &blur_temp));
-  JXL_RETURN_IF_ERROR(SeparateMFAndHF(params, &image1, &hf1[0], &blur_temp));
-  // image0 and image1 are MF-images in XYB color space
-
-  JXL_ASSIGN_OR_RETURN(ImageF block_diff_ac,
-                       ImageF::Create(memory_manager, xsize, ysize));
-  ZeroFillImage(&block_diff_ac);
-  // start accumulating ac diff image from MF images
-  {
-    JXL_ASSIGN_OR_RETURN(ImageF diffs,
-                         ImageF::Create(memory_manager, xsize, ysize));
-    JXL_RETURN_IF_ERROR(MaltaDiffMapLF(image0.Plane(1), image1.Plane(1),
-                                       wMfMalta, wMfMalta, norm1Mf, &diffs,
-                                       &block_diff_ac));
-    JXL_RETURN_IF_ERROR(MaltaDiffMapLF(image0.Plane(0), image1.Plane(0),
-                                       wMfMaltaX, wMfMaltaX, norm1MfX, &diffs,
-                                       &block_diff_ac));
-  }
-  for (size_t c = 0; c < 3; ++c) {
-    L2Diff(image0.Plane(c), image1.Plane(c), wmul[3 + c], &block_diff_ac);
-  }
-  // we will not need the MF-images and more, so we deallocate them to reduce
-  // peak memory usage
-  image0 = Image3F();
-  image1 = Image3F();
-
-  ImageF uhf0[2];
-  ImageF uhf1[2];
-  JXL_RETURN_IF_ERROR(SeparateHFAndUHF(params, &hf0[0], &uhf0[0], &blur_temp));
-  JXL_RETURN_IF_ERROR(SeparateHFAndUHF(params, &hf1[0], &uhf1[0], &blur_temp));
-
-  // continue accumulating ac diff image from HF and UHF images
-  const float hf_asymmetry = params.hf_asymmetry;
-  {
-    JXL_ASSIGN_OR_RETURN(ImageF diffs,
-                         ImageF::Create(memory_manager, xsize, ysize));
-    JXL_RETURN_IF_ERROR(MaltaDiffMap(uhf0[1], uhf1[1], wUhfMalta * hf_asymmetry,
-                                     wUhfMalta / hf_asymmetry, norm1Uhf, &diffs,
-                                     &block_diff_ac));
-    JXL_RETURN_IF_ERROR(MaltaDiffMap(
-        uhf0[0], uhf1[0], wUhfMaltaX * hf_asymmetry, wUhfMaltaX / hf_asymmetry,
-        norm1UhfX, &diffs, &block_diff_ac));
-    JXL_RETURN_IF_ERROR(MaltaDiffMapLF(
-        hf0[1], hf1[1], wHfMalta * std::sqrt(hf_asymmetry),
-        wHfMalta / std::sqrt(hf_asymmetry), norm1Hf, &diffs, &block_diff_ac));
-    JXL_RETURN_IF_ERROR(MaltaDiffMapLF(
-        hf0[0], hf1[0], wHfMaltaX * std::sqrt(hf_asymmetry),
-        wHfMaltaX / std::sqrt(hf_asymmetry), norm1HfX, &diffs, &block_diff_ac));
-  }
-  for (size_t c = 0; c < 2; ++c) {
-    L2DiffAsymmetric(hf0[c], hf1[c], wmul[c] * hf_asymmetry,
-                     wmul[c] / hf_asymmetry, &block_diff_ac);
-  }
-
-  // compute mask image from HF and UHF X and Y images
-  JXL_ASSIGN_OR_RETURN(ImageF mask,
-                       ImageF::Create(memory_manager, xsize, ysize));
-  {
-    JXL_ASSIGN_OR_RETURN(ImageF mask0,
-                         ImageF::Create(memory_manager, xsize, ysize));
-    JXL_ASSIGN_OR_RETURN(ImageF mask1,
-                         ImageF::Create(memory_manager, xsize, ysize));
-    CombineChannelsForMasking(&hf0[0], &uhf0[0], &mask0);
-    CombineChannelsForMasking(&hf1[0], &uhf1[0], &mask1);
-    DeallocateHFAndUHF(&hf1[0], &uhf1[0]);
-    DeallocateHFAndUHF(&hf0[0], &uhf0[0]);
-    JXL_RETURN_IF_ERROR(
-        Mask(mask0, mask1, params, &blur_temp, &mask, &block_diff_ac));
-  }
-
-  // compute final diffmap from mask image and ac and dc diff images
-  JXL_ASSIGN_OR_RETURN(diffmap, ImageF::Create(memory_manager, xsize, ysize));
-  for (size_t y = 0; y < ysize; ++y) {
-    const float* row_dc = block_diff_dc.Row(y);
-    const float* row_ac = block_diff_ac.Row(y);
-    float* row_out = diffmap.Row(y);
-    for (size_t x = 0; x < xsize; ++x) {
-      const float val = mask.Row(y)[x];
-      row_out[x] = sqrt(row_dc[x] * MaskDcY(val) + row_ac[x] * MaskY(val));
-    }
-  }
-  return true;
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(SeparateFrequencies);       // Local function.
-HWY_EXPORT(MaskPsychoImage);           // Local function.
-HWY_EXPORT(L2DiffAsymmetric);          // Local function.
-HWY_EXPORT(L2Diff);                    // Local function.
-HWY_EXPORT(SetL2Diff);                 // Local function.
-HWY_EXPORT(CombineChannelsToDiffmap);  // Local function.
-HWY_EXPORT(MaltaDiffMap);              // Local function.
-HWY_EXPORT(MaltaDiffMapLF);            // Local function.
-HWY_EXPORT(OpsinDynamicsImage);        // Local function.
-HWY_EXPORT(ButteraugliDiffmapInPlace);  // Local function.
-
-#if BUTTERAUGLI_ENABLE_CHECKS
-
-static inline bool IsNan(const float x) {
-  uint32_t bits;
-  memcpy(&bits, &x, sizeof(bits));
-  const uint32_t bitmask_exp = 0x7F800000;
-  return (bits & bitmask_exp) == bitmask_exp && (bits & 0x7FFFFF);
-}
-
-static inline bool IsNan(const double x) {
-  uint64_t bits;
-  memcpy(&bits, &x, sizeof(bits));
-  return (0x7ff0000000000001ULL <= bits && bits <= 0x7fffffffffffffffULL) ||
-         (0xfff0000000000001ULL <= bits && bits <= 0xffffffffffffffffULL);
-}
-
-static inline void CheckImage(const ImageF& image, const char* name) {
-  for (size_t y = 0; y < image.ysize(); ++y) {
-    const float* BUTTERAUGLI_RESTRICT row = image.Row(y);
-    for (size_t x = 0; x < image.xsize(); ++x) {
-      if (IsNan(row[x])) {
-        printf("NAN: Image %s @ %" PRIuS ",%" PRIuS " (of %" PRIuS ",%" PRIuS
-               ")\n",
-               name, x, y, image.xsize(), image.ysize());
-        exit(1);
-      }
-    }
-  }
-}
-
-#define CHECK_NAN(x, str)                \
-  do {                                   \
-    if (IsNan(x)) {                      \
-      printf("%d: %s\n", __LINE__, str); \
-      abort();                           \
-    }                                    \
-  } while (0)
-
-#define CHECK_IMAGE(image, name) CheckImage(image, name)
-
-#else  // BUTTERAUGLI_ENABLE_CHECKS
-
-#define CHECK_NAN(x, str)
-#define CHECK_IMAGE(image, name)
-
-#endif  // BUTTERAUGLI_ENABLE_CHECKS
-
-// Calculate a 2x2 subsampled image for purposes of recursive butteraugli at
-// multiresolution.
-static StatusOr<Image3F> SubSample2x(const Image3F& in) {
-  size_t xs = (in.xsize() + 1) / 2;
-  size_t ys = (in.ysize() + 1) / 2;
-  JxlMemoryManager* memory_manager = in.memory_manager();
-  JXL_ASSIGN_OR_RETURN(Image3F retval, Image3F::Create(memory_manager, xs, ys));
-  for (size_t c = 0; c < 3; ++c) {
-    for (size_t y = 0; y < ys; ++y) {
-      for (size_t x = 0; x < xs; ++x) {
-        retval.PlaneRow(c, y)[x] = 0;
-      }
-    }
-  }
-  for (size_t c = 0; c < 3; ++c) {
-    for (size_t y = 0; y < in.ysize(); ++y) {
-      for (size_t x = 0; x < in.xsize(); ++x) {
-        retval.PlaneRow(c, y / 2)[x / 2] += 0.25f * in.PlaneRow(c, y)[x];
-      }
-    }
-    if ((in.xsize() & 1) != 0) {
-      for (size_t y = 0; y < retval.ysize(); ++y) {
-        size_t last_column = retval.xsize() - 1;
-        retval.PlaneRow(c, y)[last_column] *= 2.0f;
-      }
-    }
-    if ((in.ysize() & 1) != 0) {
-      for (size_t x = 0; x < retval.xsize(); ++x) {
-        size_t last_row = retval.ysize() - 1;
-        retval.PlaneRow(c, last_row)[x] *= 2.0f;
-      }
-    }
-  }
-  return retval;
-}
-
-// Supersample src by 2x and add it to dest.
-static void AddSupersampled2x(const ImageF& src, float w, ImageF& dest) {
-  for (size_t y = 0; y < dest.ysize(); ++y) {
-    for (size_t x = 0; x < dest.xsize(); ++x) {
-      // There will be less errors from the more averaged images.
-      // We take it into account to some extent using a scaler.
-      static const double kHeuristicMixingValue = 0.3;
-      dest.Row(y)[x] *= 1.0 - kHeuristicMixingValue * w;
-      dest.Row(y)[x] += w * src.Row(y / 2)[x / 2];
-    }
-  }
-}
-
-Image3F* ButteraugliComparator::Temp() const {
-  bool was_in_use = temp_in_use_.test_and_set(std::memory_order_acq_rel);
-  if (was_in_use) return nullptr;
-  return &temp_;
-}
-
-void ButteraugliComparator::ReleaseTemp() const { temp_in_use_.clear(); }
-
-ButteraugliComparator::ButteraugliComparator(size_t xsize, size_t ysize,
-                                             const ButteraugliParams& params)
-    : xsize_(xsize), ysize_(ysize), params_(params) {}
-
-StatusOr<std::unique_ptr<ButteraugliComparator>> ButteraugliComparator::Make(
-    const Image3F& rgb0, const ButteraugliParams& params) {
-  size_t xsize = rgb0.xsize();
-  size_t ysize = rgb0.ysize();
-  JxlMemoryManager* memory_manager = rgb0.memory_manager();
-  std::unique_ptr<ButteraugliComparator> result =
-      std::unique_ptr<ButteraugliComparator>(
-          new ButteraugliComparator(xsize, ysize, params));
-  JXL_ASSIGN_OR_RETURN(result->temp_,
-                       Image3F::Create(memory_manager, xsize, ysize));
-
-  if (xsize < 8 || ysize < 8) {
-    return result;
-  }
-
-  JXL_ASSIGN_OR_RETURN(Image3F xyb0,
-                       Image3F::Create(memory_manager, xsize, ysize));
-  JXL_RETURN_IF_ERROR(HWY_DYNAMIC_DISPATCH(OpsinDynamicsImage)(
-      rgb0, params, result->Temp(), &result->blur_temp_, &xyb0));
-  result->ReleaseTemp();
-  JXL_RETURN_IF_ERROR(HWY_DYNAMIC_DISPATCH(SeparateFrequencies)(
-      xsize, ysize, params, &result->blur_temp_, xyb0, result->pi0_));
-
-  // Awful recursive construction of samples of different resolution.
-  // This is an after-thought and possibly somewhat parallel in
-  // functionality with the PsychoImage multi-resolution approach.
-  JXL_ASSIGN_OR_RETURN(Image3F subsampledRgb0, SubSample2x(rgb0));
-  JXL_ASSIGN_OR_RETURN(result->sub_,
-                       ButteraugliComparator::Make(subsampledRgb0, params));
-  return result;
-}
-
-Status ButteraugliComparator::Mask(ImageF* BUTTERAUGLI_RESTRICT mask) const {
-  return HWY_DYNAMIC_DISPATCH(MaskPsychoImage)(
-      pi0_, pi0_, xsize_, ysize_, params_, &blur_temp_, mask, nullptr);
-}
-
-Status ButteraugliComparator::Diffmap(const Image3F& rgb1,
-                                      ImageF& result) const {
-  JxlMemoryManager* memory_manager = rgb1.memory_manager();
-  if (xsize_ < 8 || ysize_ < 8) {
-    ZeroFillImage(&result);
-    return true;
-  }
-  JXL_ASSIGN_OR_RETURN(Image3F xyb1,
-                       Image3F::Create(memory_manager, xsize_, ysize_));
-  JXL_RETURN_IF_ERROR(HWY_DYNAMIC_DISPATCH(OpsinDynamicsImage)(
-      rgb1, params_, Temp(), &blur_temp_, &xyb1));
-  ReleaseTemp();
-  JXL_RETURN_IF_ERROR(DiffmapOpsinDynamicsImage(xyb1, result));
-  if (sub_) {
-    if (sub_->xsize_ < 8 || sub_->ysize_ < 8) {
-      return true;
-    }
-    JXL_ASSIGN_OR_RETURN(
-        Image3F sub_xyb,
-        Image3F::Create(memory_manager, sub_->xsize_, sub_->ysize_));
-    JXL_ASSIGN_OR_RETURN(Image3F subsampledRgb1, SubSample2x(rgb1));
-    JXL_RETURN_IF_ERROR(HWY_DYNAMIC_DISPATCH(OpsinDynamicsImage)(
-        subsampledRgb1, params_, sub_->Temp(), &sub_->blur_temp_, &sub_xyb));
-    sub_->ReleaseTemp();
-    ImageF subresult;
-    JXL_RETURN_IF_ERROR(sub_->DiffmapOpsinDynamicsImage(sub_xyb, subresult));
-    AddSupersampled2x(subresult, 0.5, result);
-  }
-  return true;
-}
-
-Status ButteraugliComparator::DiffmapOpsinDynamicsImage(const Image3F& xyb1,
-                                                        ImageF& result) const {
-  JxlMemoryManager* memory_manager = xyb1.memory_manager();
-  if (xsize_ < 8 || ysize_ < 8) {
-    ZeroFillImage(&result);
-    return true;
-  }
-  PsychoImage pi1;
-  JXL_RETURN_IF_ERROR(HWY_DYNAMIC_DISPATCH(SeparateFrequencies)(
-      xsize_, ysize_, params_, &blur_temp_, xyb1, pi1));
-  JXL_ASSIGN_OR_RETURN(result, ImageF::Create(memory_manager, xsize_, ysize_));
-  return DiffmapPsychoImage(pi1, result);
-}
-
-namespace {
-
-Status MaltaDiffMap(const ImageF& lum0, const ImageF& lum1, const double w_0gt1,
-                    const double w_0lt1, const double norm1,
-                    ImageF* HWY_RESTRICT diffs,
-                    Image3F* HWY_RESTRICT block_diff_ac, size_t c) {
-  return HWY_DYNAMIC_DISPATCH(MaltaDiffMap)(lum0, lum1, w_0gt1, w_0lt1, norm1,
-                                            diffs, &block_diff_ac->Plane(c));
-}
-
-Status MaltaDiffMapLF(const ImageF& lum0, const ImageF& lum1,
-                      const double w_0gt1, const double w_0lt1,
-                      const double norm1, ImageF* HWY_RESTRICT diffs,
-                      Image3F* HWY_RESTRICT block_diff_ac, size_t c) {
-  return HWY_DYNAMIC_DISPATCH(MaltaDiffMapLF)(lum0, lum1, w_0gt1, w_0lt1, norm1,
-                                              diffs, &block_diff_ac->Plane(c));
-}
-
-}  // namespace
-
-Status ButteraugliComparator::DiffmapPsychoImage(const PsychoImage& pi1,
-                                                 ImageF& diffmap) const {
-  JxlMemoryManager* memory_manager = diffmap.memory_manager();
-  if (xsize_ < 8 || ysize_ < 8) {
-    ZeroFillImage(&diffmap);
-    return true;
-  }
-
-  const float hf_asymmetry_ = params_.hf_asymmetry;
-  const float xmul_ = params_.xmul;
-
-  JXL_ASSIGN_OR_RETURN(ImageF diffs,
-                       ImageF::Create(memory_manager, xsize_, ysize_));
-  JXL_ASSIGN_OR_RETURN(Image3F block_diff_ac,
-                       Image3F::Create(memory_manager, xsize_, ysize_));
-  ZeroFillImage(&block_diff_ac);
-  JXL_RETURN_IF_ERROR(MaltaDiffMap(
-      pi0_.uhf[1], pi1.uhf[1], wUhfMalta * hf_asymmetry_,
-      wUhfMalta / hf_asymmetry_, norm1Uhf, &diffs, &block_diff_ac, 1));
-  JXL_RETURN_IF_ERROR(MaltaDiffMap(
-      pi0_.uhf[0], pi1.uhf[0], wUhfMaltaX * hf_asymmetry_,
-      wUhfMaltaX / hf_asymmetry_, norm1UhfX, &diffs, &block_diff_ac, 0));
-  JXL_RETURN_IF_ERROR(MaltaDiffMapLF(
-      pi0_.hf[1], pi1.hf[1], wHfMalta * std::sqrt(hf_asymmetry_),
-      wHfMalta / std::sqrt(hf_asymmetry_), norm1Hf, &diffs, &block_diff_ac, 1));
-  JXL_RETURN_IF_ERROR(MaltaDiffMapLF(pi0_.hf[0], pi1.hf[0],
-                                     wHfMaltaX * std::sqrt(hf_asymmetry_),
-                                     wHfMaltaX / std::sqrt(hf_asymmetry_),
-                                     norm1HfX, &diffs, &block_diff_ac, 0));
-  JXL_RETURN_IF_ERROR(MaltaDiffMapLF(pi0_.mf.Plane(1), pi1.mf.Plane(1),
-                                     wMfMalta, wMfMalta, norm1Mf, &diffs,
-                                     &block_diff_ac, 1));
-  JXL_RETURN_IF_ERROR(MaltaDiffMapLF(pi0_.mf.Plane(0), pi1.mf.Plane(0),
-                                     wMfMaltaX, wMfMaltaX, norm1MfX, &diffs,
-                                     &block_diff_ac, 0));
-
-  JXL_ASSIGN_OR_RETURN(Image3F block_diff_dc,
-                       Image3F::Create(memory_manager, xsize_, ysize_));
-  for (size_t c = 0; c < 3; ++c) {
-    if (c < 2) {  // No blue channel error accumulated at HF.
-      HWY_DYNAMIC_DISPATCH(L2DiffAsymmetric)
-      (pi0_.hf[c], pi1.hf[c], wmul[c] * hf_asymmetry_, wmul[c] / hf_asymmetry_,
-       &block_diff_ac.Plane(c));
-    }
-    HWY_DYNAMIC_DISPATCH(L2Diff)
-    (pi0_.mf.Plane(c), pi1.mf.Plane(c), wmul[3 + c], &block_diff_ac.Plane(c));
-    HWY_DYNAMIC_DISPATCH(SetL2Diff)
-    (pi0_.lf.Plane(c), pi1.lf.Plane(c), wmul[6 + c], &block_diff_dc.Plane(c));
-  }
-
-  ImageF mask;
-  JXL_RETURN_IF_ERROR(HWY_DYNAMIC_DISPATCH(MaskPsychoImage)(
-      pi0_, pi1, xsize_, ysize_, params_, &blur_temp_, &mask,
-      &block_diff_ac.Plane(1)));
-
-  JXL_RETURN_IF_ERROR(HWY_DYNAMIC_DISPATCH(CombineChannelsToDiffmap)(
-      mask, block_diff_dc, block_diff_ac, xmul_, &diffmap));
-  return true;
-}
-
-double ButteraugliScoreFromDiffmap(const ImageF& diffmap,
-                                   const ButteraugliParams* params) {
-  float retval = 0.0f;
-  for (size_t y = 0; y < diffmap.ysize(); ++y) {
-    const float* BUTTERAUGLI_RESTRICT row = diffmap.ConstRow(y);
-    for (size_t x = 0; x < diffmap.xsize(); ++x) {
-      retval = std::max(retval, row[x]);
-    }
-  }
-  return retval;
-}
-
-Status ButteraugliDiffmap(const Image3F& rgb0, const Image3F& rgb1,
-                          double hf_asymmetry, double xmul, ImageF& diffmap) {
-  ButteraugliParams params;
-  params.hf_asymmetry = hf_asymmetry;
-  params.xmul = xmul;
-  return ButteraugliDiffmap(rgb0, rgb1, params, diffmap);
-}
-
-template <size_t kMax>
-bool ButteraugliDiffmapSmall(const Image3F& rgb0, const Image3F& rgb1,
-                             const ButteraugliParams& params, ImageF& diffmap) {
-  const size_t xsize = rgb0.xsize();
-  const size_t ysize = rgb0.ysize();
-  JxlMemoryManager* memory_manager = rgb0.memory_manager();
-  // Butteraugli values for small (where xsize or ysize is smaller
-  // than 8 pixels) images are non-sensical, but most likely it is
-  // less disruptive to try to compute something than just give up.
-  // Temporarily extend the borders of the image to fit 8 x 8 size.
-  size_t xborder = xsize < kMax ? (kMax - xsize) / 2 : 0;
-  size_t yborder = ysize < kMax ? (kMax - ysize) / 2 : 0;
-  size_t xscaled = std::max<size_t>(kMax, xsize);
-  size_t yscaled = std::max<size_t>(kMax, ysize);
-  JXL_ASSIGN_OR_RETURN(Image3F scaled0,
-                       Image3F::Create(memory_manager, xscaled, yscaled));
-  JXL_ASSIGN_OR_RETURN(Image3F scaled1,
-                       Image3F::Create(memory_manager, xscaled, yscaled));
-  for (int i = 0; i < 3; ++i) {
-    for (size_t y = 0; y < yscaled; ++y) {
-      for (size_t x = 0; x < xscaled; ++x) {
-        size_t x2 = std::min<size_t>(xsize - 1, x > xborder ? x - xborder : 0);
-        size_t y2 = std::min<size_t>(ysize - 1, y > yborder ? y - yborder : 0);
-        scaled0.PlaneRow(i, y)[x] = rgb0.PlaneRow(i, y2)[x2];
-        scaled1.PlaneRow(i, y)[x] = rgb1.PlaneRow(i, y2)[x2];
-      }
-    }
-  }
-  ImageF diffmap_scaled;
-  const bool ok = ButteraugliDiffmap(scaled0, scaled1, params, diffmap_scaled);
-  JXL_ASSIGN_OR_RETURN(diffmap, ImageF::Create(memory_manager, xsize, ysize));
-  for (size_t y = 0; y < ysize; ++y) {
-    for (size_t x = 0; x < xsize; ++x) {
-      diffmap.Row(y)[x] = diffmap_scaled.Row(y + yborder)[x + xborder];
-    }
-  }
-  return ok;
-}
-
-Status ButteraugliDiffmap(const Image3F& rgb0, const Image3F& rgb1,
-                          const ButteraugliParams& params, ImageF& diffmap) {
-  const size_t xsize = rgb0.xsize();
-  const size_t ysize = rgb0.ysize();
-  if (xsize < 1 || ysize < 1) {
-    return JXL_FAILURE("Zero-sized image");
-  }
-  if (!SameSize(rgb0, rgb1)) {
-    return JXL_FAILURE("Size mismatch");
-  }
-  static const int kMax = 8;
-  if (xsize < kMax || ysize < kMax) {
-    return ButteraugliDiffmapSmall<kMax>(rgb0, rgb1, params, diffmap);
-  }
-  JXL_ASSIGN_OR_RETURN(std::unique_ptr<ButteraugliComparator> butteraugli,
-                       ButteraugliComparator::Make(rgb0, params));
-  JXL_RETURN_IF_ERROR(butteraugli->Diffmap(rgb1, diffmap));
-  return true;
-}
-
-bool ButteraugliInterface(const Image3F& rgb0, const Image3F& rgb1,
-                          float hf_asymmetry, float xmul, ImageF& diffmap,
-                          double& diffvalue) {
-  ButteraugliParams params;
-  params.hf_asymmetry = hf_asymmetry;
-  params.xmul = xmul;
-  return ButteraugliInterface(rgb0, rgb1, params, diffmap, diffvalue);
-}
-
-bool ButteraugliInterface(const Image3F& rgb0, const Image3F& rgb1,
-                          const ButteraugliParams& params, ImageF& diffmap,
-                          double& diffvalue) {
-  if (!ButteraugliDiffmap(rgb0, rgb1, params, diffmap)) {
-    return false;
-  }
-  diffvalue = ButteraugliScoreFromDiffmap(diffmap, &params);
-  return true;
-}
-
-Status ButteraugliInterfaceInPlace(Image3F&& rgb0, Image3F&& rgb1,
-                                   const ButteraugliParams& params,
-                                   ImageF& diffmap, double& diffvalue) {
-  const size_t xsize = rgb0.xsize();
-  const size_t ysize = rgb0.ysize();
-  if (xsize < 1 || ysize < 1) {
-    return JXL_FAILURE("Zero-sized image");
-  }
-  if (!SameSize(rgb0, rgb1)) {
-    return JXL_FAILURE("Size mismatch");
-  }
-  static const int kMax = 8;
-  if (xsize < kMax || ysize < kMax) {
-    bool ok = ButteraugliDiffmapSmall<kMax>(rgb0, rgb1, params, diffmap);
-    diffvalue = ButteraugliScoreFromDiffmap(diffmap, &params);
-    return ok;
-  }
-  ImageF subdiffmap;
-  if (xsize >= 15 && ysize >= 15) {
-    JXL_ASSIGN_OR_RETURN(Image3F rgb0_sub, SubSample2x(rgb0));
-    JXL_ASSIGN_OR_RETURN(Image3F rgb1_sub, SubSample2x(rgb1));
-    JXL_RETURN_IF_ERROR(HWY_DYNAMIC_DISPATCH(ButteraugliDiffmapInPlace)(
-        rgb0_sub, rgb1_sub, params, subdiffmap));
-  }
-  JXL_RETURN_IF_ERROR(HWY_DYNAMIC_DISPATCH(ButteraugliDiffmapInPlace)(
-      rgb0, rgb1, params, diffmap));
-  if (xsize >= 15 && ysize >= 15) {
-    AddSupersampled2x(subdiffmap, 0.5, diffmap);
-  }
-  diffvalue = ButteraugliScoreFromDiffmap(diffmap, &params);
-  return true;
-}
-
-double ButteraugliFuzzyClass(double score) {
-  static const double fuzzy_width_up = 4.8;
-  static const double fuzzy_width_down = 4.8;
-  static const double m0 = 2.0;
-  static const double scaler = 0.7777;
-  double val;
-  if (score < 1.0) {
-    // val in [scaler .. 2.0]
-    val = m0 / (1.0 + exp((score - 1.0) * fuzzy_width_down));
-    val -= 1.0;           // from [1 .. 2] to [0 .. 1]
-    val *= 2.0 - scaler;  // from [0 .. 1] to [0 .. 2.0 - scaler]
-    val += scaler;        // from [0 .. 2.0 - scaler] to [scaler .. 2.0]
-  } else {
-    // val in [0 .. scaler]
-    val = m0 / (1.0 + exp((score - 1.0) * fuzzy_width_up));
-    val *= scaler;
-  }
-  return val;
-}
-
-// #define PRINT_OUT_NORMALIZATION
-
-double ButteraugliFuzzyInverse(double seek) {
-  double pos = 0;
-  // NOLINTNEXTLINE(clang-analyzer-security.FloatLoopCounter)
-  for (double range = 1.0; range >= 1e-10; range *= 0.5) {
-    double cur = ButteraugliFuzzyClass(pos);
-    if (cur < seek) {
-      pos -= range;
-    } else {
-      pos += range;
-    }
-  }
-#ifdef PRINT_OUT_NORMALIZATION
-  if (seek == 1.0) {
-    fprintf(stderr, "Fuzzy inverse %g\n", pos);
-  }
-#endif
-  return pos;
-}
-
-#ifdef PRINT_OUT_NORMALIZATION
-static double print_out_normalization = ButteraugliFuzzyInverse(1.0);
-#endif
-
-namespace {
-
-void ScoreToRgb(double score, double good_threshold, double bad_threshold,
-                float rgb[3]) {
-  double heatmap[12][3] = {
-      {0, 0, 0},       {0, 0, 1},
-      {0, 1, 1},       {0, 1, 0},  // Good level
-      {1, 1, 0},       {1, 0, 0},  // Bad level
-      {1, 0, 1},       {0.5, 0.5, 1.0},
-      {1.0, 0.5, 0.5},  // Pastel colors for the very bad quality range.
-      {1.0, 1.0, 0.5}, {1, 1, 1},
-      {1, 1, 1},  // Last color repeated to have a solid range of white.
-  };
-  if (score < good_threshold) {
-    score = (score / good_threshold) * 0.3;
-  } else if (score < bad_threshold) {
-    score = 0.3 +
-            (score - good_threshold) / (bad_threshold - good_threshold) * 0.15;
-  } else {
-    score = 0.45 + (score - bad_threshold) / (bad_threshold * 12) * 0.5;
-  }
-  static const int kTableSize = sizeof(heatmap) / sizeof(heatmap[0]);
-  score = std::min<double>(std::max<double>(score * (kTableSize - 1), 0.0),
-                           kTableSize - 2);
-  int ix = static_cast<int>(score);
-  ix = std::min(std::max(0, ix), kTableSize - 2);  // Handle NaN
-  double mix = score - ix;
-  for (int i = 0; i < 3; ++i) {
-    double v = mix * heatmap[ix + 1][i] + (1 - mix) * heatmap[ix][i];
-    rgb[i] = pow(v, 0.5);
-  }
-}
-
-}  // namespace
-
-StatusOr<Image3F> CreateHeatMapImage(const ImageF& distmap,
-                                     double good_threshold,
-                                     double bad_threshold) {
-  JxlMemoryManager* memory_manager = distmap.memory_manager();
-  JXL_ASSIGN_OR_RETURN(
-      Image3F heatmap,
-      Image3F::Create(memory_manager, distmap.xsize(), distmap.ysize()));
-  for (size_t y = 0; y < distmap.ysize(); ++y) {
-    const float* BUTTERAUGLI_RESTRICT row_distmap = distmap.ConstRow(y);
-    float* BUTTERAUGLI_RESTRICT row_h0 = heatmap.PlaneRow(0, y);
-    float* BUTTERAUGLI_RESTRICT row_h1 = heatmap.PlaneRow(1, y);
-    float* BUTTERAUGLI_RESTRICT row_h2 = heatmap.PlaneRow(2, y);
-    for (size_t x = 0; x < distmap.xsize(); ++x) {
-      const float d = row_distmap[x];
-      float rgb[3];
-      ScoreToRgb(d, good_threshold, bad_threshold, rgb);
-      row_h0[x] = rgb[0];
-      row_h1[x] = rgb[1];
-      row_h2[x] = rgb[2];
-    }
-  }
-  return heatmap;
-}
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/butteraugli/butteraugli.h b/third_party/jpeg-xl/lib/jxl/butteraugli/butteraugli.h
deleted file mode 100644
index 823b3ba1acd94..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/butteraugli/butteraugli.h
+++ /dev/null
@@ -1,225 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-//
-// Author: Jyrki Alakuijala (jyrki.alakuijala@gmail.com)
-
-#ifndef LIB_JXL_BUTTERAUGLI_BUTTERAUGLI_H_
-#define LIB_JXL_BUTTERAUGLI_BUTTERAUGLI_H_
-
-#include <jxl/memory_manager.h>
-
-#include <atomic>
-#include <cstddef>
-#include <cstdlib>
-#include <cstring>
-#include <memory>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/image.h"
-
-#if !defined(BUTTERAUGLI_ENABLE_CHECKS)
-#define BUTTERAUGLI_ENABLE_CHECKS 0
-#endif
-
-#define BUTTERAUGLI_RESTRICT JXL_RESTRICT
-
-// This is the main interface to butteraugli image similarity
-// analysis function.
-
-namespace jxl {
-
-struct ButteraugliParams {
-  // Multiplier for penalizing new HF artifacts more than blurring away
-  // features. 1.0=neutral.
-  float hf_asymmetry = 1.0f;
-
-  // Multiplier for the psychovisual difference in the X channel.
-  float xmul = 1.0f;
-
-  // Number of nits that correspond to 1.0f input values.
-  float intensity_target = 80.0f;
-};
-
-// ButteraugliInterface defines the public interface for butteraugli.
-//
-// It calculates the difference between rgb0 and rgb1.
-//
-// rgb0 and rgb1 contain the images. rgb0[c][px] and rgb1[c][px] contains
-// the red image for c == 0, green for c == 1, blue for c == 2. Location index
-// px is calculated as y * xsize + x.
-//
-// Value of pixels of images rgb0 and rgb1 need to be represented as raw
-// intensity. Most image formats store gamma corrected intensity in pixel
-// values. This gamma correction has to be removed, by applying the following
-// function to values in the 0-1 range:
-// butteraugli_val = pow(input_val, gamma);
-// A typical value of gamma is 2.2. It is usually stored in the image header.
-// Take care not to confuse that value with its inverse. The gamma value should
-// be always greater than one.
-// Butteraugli does not work as intended if the caller does not perform
-// gamma correction.
-//
-// hf_asymmetry is a multiplier for penalizing new HF artifacts more than
-// blurring away features (1.0 -> neutral).
-//
-// diffmap will contain an image of the size xsize * ysize, containing
-// localized differences for values px (indexed with the px the same as rgb0
-// and rgb1). diffvalue will give a global score of similarity.
-//
-// A diffvalue smaller than kButteraugliGood indicates that images can be
-// observed as the same image.
-// diffvalue larger than kButteraugliBad indicates that a difference between
-// the images can be observed.
-// A diffvalue between kButteraugliGood and kButteraugliBad indicates that
-// a subtle difference can be observed between the images.
-//
-// Returns true on success.
-bool ButteraugliInterface(const Image3F &rgb0, const Image3F &rgb1,
-                          const ButteraugliParams &params, ImageF &diffmap,
-                          double &diffvalue);
-
-// Deprecated (calls the previous function)
-bool ButteraugliInterface(const Image3F &rgb0, const Image3F &rgb1,
-                          float hf_asymmetry, float xmul, ImageF &diffmap,
-                          double &diffvalue);
-
-// Same as ButteraugliInterface, but reuses rgb0 and rgb1 for other purposes
-// inside the function after they are not needed any more, and it ignores
-// params.xmul.
-Status ButteraugliInterfaceInPlace(Image3F &&rgb0, Image3F &&rgb1,
-                                   const ButteraugliParams &params,
-                                   ImageF &diffmap, double &diffvalue);
-
-// Converts the butteraugli score into fuzzy class values that are continuous
-// at the class boundary. The class boundary location is based on human
-// raters, but the slope is arbitrary. Particularly, it does not reflect
-// the expectation value of probabilities of the human raters. It is just
-// expected that a smoother class boundary will allow for higher-level
-// optimization algorithms to work faster.
-//
-// Returns 2.0 for a perfect match, and 1.0 for 'ok', 0.0 for bad. Because the
-// scoring is fuzzy, a butteraugli score of 0.96 would return a class of
-// around 1.9.
-double ButteraugliFuzzyClass(double score);
-
-// Input values should be in range 0 (bad) to 2 (good). Use
-// kButteraugliNormalization as normalization.
-double ButteraugliFuzzyInverse(double seek);
-
-// Implementation details, don't use anything below or your code will
-// break in the future.
-
-#ifdef _MSC_VER
-#define BUTTERAUGLI_INLINE __forceinline
-#else
-#define BUTTERAUGLI_INLINE inline
-#endif
-
-#ifdef __clang__
-// Early versions of Clang did not support __builtin_assume_aligned.
-#define BUTTERAUGLI_HAS_ASSUME_ALIGNED __has_builtin(__builtin_assume_aligned)
-#elif defined(__GNUC__)
-#define BUTTERAUGLI_HAS_ASSUME_ALIGNED 1
-#else
-#define BUTTERAUGLI_HAS_ASSUME_ALIGNED 0
-#endif
-
-// Returns a void* pointer which the compiler then assumes is N-byte aligned.
-// Example: float* JXL_RESTRICT aligned = (float*)JXL_ASSUME_ALIGNED(in, 32);
-//
-// The assignment semantics are required by GCC/Clang. ICC provides an in-place
-// __assume_aligned, whereas MSVC's __assume appears unsuitable.
-#if BUTTERAUGLI_HAS_ASSUME_ALIGNED
-#define BUTTERAUGLI_ASSUME_ALIGNED(ptr, align) \
-  __builtin_assume_aligned((ptr), (align))
-#else
-#define BUTTERAUGLI_ASSUME_ALIGNED(ptr, align) (ptr)
-#endif  // BUTTERAUGLI_HAS_ASSUME_ALIGNED
-
-struct PsychoImage {
-  ImageF uhf[2];  // XY
-  ImageF hf[2];   // XY
-  Image3F mf;     // XYB
-  Image3F lf;     // XYB
-};
-
-// Blur needs a transposed image.
-// Hold it here and only allocate on demand to reduce memory usage.
-struct BlurTemp {
-  Status GetTransposed(const ImageF &in, ImageF **out) {
-    JxlMemoryManager *memory_manager = in.memory_manager();
-    if (transposed_temp.xsize() == 0) {
-      JXL_ASSIGN_OR_RETURN(
-          transposed_temp,
-          ImageF::Create(memory_manager, in.ysize(), in.xsize()));
-    }
-    *out = &transposed_temp;
-    return true;
-  }
-
-  ImageF transposed_temp;
-};
-
-class ButteraugliComparator {
- public:
-  // Butteraugli is calibrated at xmul = 1.0. We add a multiplier here so that
-  // we can test the hypothesis that a higher weighing of the X channel would
-  // improve results at higher Butteraugli values.
-  virtual ~ButteraugliComparator() = default;
-
-  static StatusOr<std::unique_ptr<ButteraugliComparator>> Make(
-      const Image3F &rgb0, const ButteraugliParams &params);
-
-  // Computes the butteraugli map between the original image given in the
-  // constructor and the distorted image give here.
-  Status Diffmap(const Image3F &rgb1, ImageF &result) const;
-
-  // Same as above, but OpsinDynamicsImage() was already applied.
-  Status DiffmapOpsinDynamicsImage(const Image3F &xyb1, ImageF &result) const;
-
-  // Same as above, but the frequency decomposition was already applied.
-  Status DiffmapPsychoImage(const PsychoImage &pi1, ImageF &diffmap) const;
-
-  Status Mask(ImageF *BUTTERAUGLI_RESTRICT mask) const;
-
- private:
-  ButteraugliComparator(size_t xsize, size_t ysize,
-                        const ButteraugliParams &params);
-  Image3F *Temp() const;
-  void ReleaseTemp() const;
-
-  const size_t xsize_;
-  const size_t ysize_;
-  ButteraugliParams params_;
-  PsychoImage pi0_;
-
-  // Shared temporary image storage to reduce the number of allocations;
-  // obtained via Temp(), must call ReleaseTemp when no longer needed.
-  mutable Image3F temp_;
-  mutable std::atomic_flag temp_in_use_ = ATOMIC_FLAG_INIT;
-
-  mutable BlurTemp blur_temp_;
-  std::unique_ptr<ButteraugliComparator> sub_;
-};
-
-// Deprecated.
-Status ButteraugliDiffmap(const Image3F &rgb0, const Image3F &rgb1,
-                          double hf_asymmetry, double xmul, ImageF &diffmap);
-
-Status ButteraugliDiffmap(const Image3F &rgb0, const Image3F &rgb1,
-                          const ButteraugliParams &params, ImageF &diffmap);
-
-double ButteraugliScoreFromDiffmap(const ImageF &diffmap,
-                                   const ButteraugliParams *params = nullptr);
-
-// Generate rgb-representation of the distance between two images.
-StatusOr<Image3F> CreateHeatMapImage(const ImageF &distmap,
-                                     double good_threshold,
-                                     double bad_threshold);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_BUTTERAUGLI_BUTTERAUGLI_H_
diff --git a/third_party/jpeg-xl/lib/jxl/butteraugli/butteraugli_test.cc b/third_party/jpeg-xl/lib/jxl/butteraugli/butteraugli_test.cc
deleted file mode 100644
index 2681fe4a28bc6..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/butteraugli/butteraugli_test.cc
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/butteraugli/butteraugli.h"
-
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <utility>
-
-#include "lib/extras/metrics.h"
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/random.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_external_image.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/test_image.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-using ::jxl::extras::PackedImage;
-using ::jxl::extras::PackedPixelFile;
-using ::jxl::test::GetColorImage;
-using ::jxl::test::TestImage;
-
-Image3F SinglePixelImage(float red, float green, float blue) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  JXL_TEST_ASSIGN_OR_DIE(Image3F img, Image3F::Create(memory_manager, 1, 1));
-  img.PlaneRow(0, 0)[0] = red;
-  img.PlaneRow(1, 0)[0] = green;
-  img.PlaneRow(2, 0)[0] = blue;
-  return img;
-}
-
-void AddUniformNoise(Image3F* img, float d, uint64_t seed) {
-  Rng generator(seed);
-  for (size_t y = 0; y < img->ysize(); ++y) {
-    for (int c = 0; c < 3; ++c) {
-      for (size_t x = 0; x < img->xsize(); ++x) {
-        img->PlaneRow(c, y)[x] += generator.UniformF(-d, d);
-      }
-    }
-  }
-}
-
-void AddEdge(Image3F* img, float d, size_t x0, size_t y0) {
-  const size_t h = std::min<size_t>(img->ysize() - y0, 100);
-  const size_t w = std::min<size_t>(img->xsize() - x0, 5);
-  for (size_t dy = 0; dy < h; ++dy) {
-    for (size_t dx = 0; dx < w; ++dx) {
-      img->PlaneRow(1, y0 + dy)[x0 + dx] += d;
-    }
-  }
-}
-
-TEST(ButteraugliInPlaceTest, SinglePixel) {
-  Image3F rgb0 = SinglePixelImage(0.5f, 0.5f, 0.5f);
-  Image3F rgb1 = SinglePixelImage(0.5f, 0.49f, 0.5f);
-  ButteraugliParams butteraugli_params;
-  ImageF diffmap;
-  double diffval;
-  EXPECT_TRUE(
-      ButteraugliInterface(rgb0, rgb1, butteraugli_params, diffmap, diffval));
-  EXPECT_NEAR(diffval, 2.5, 0.5);
-  ImageF diffmap2;
-  double diffval2;
-  EXPECT_TRUE(ButteraugliInterfaceInPlace(std::move(rgb0), std::move(rgb1),
-                                          butteraugli_params, diffmap2,
-                                          diffval2));
-  EXPECT_NEAR(diffval, diffval2, 1e-10);
-}
-
-TEST(ButteraugliInPlaceTest, LargeImage) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const size_t xsize = 1024;
-  const size_t ysize = 1024;
-  TestImage img;
-  ASSERT_TRUE(img.SetDimensions(xsize, ysize));
-  JXL_TEST_ASSIGN_OR_DIE(auto frame, img.AddFrame());
-  frame.RandomFill(777);
-  JXL_TEST_ASSIGN_OR_DIE(Image3F rgb0, GetColorImage(img.ppf()));
-  JXL_TEST_ASSIGN_OR_DIE(Image3F rgb1,
-                         Image3F::Create(memory_manager, xsize, ysize));
-  ASSERT_TRUE(CopyImageTo(rgb0, &rgb1));
-  AddUniformNoise(&rgb1, 0.02f, 7777);
-  AddEdge(&rgb1, 0.1f, xsize / 2, xsize / 2);
-  ButteraugliParams butteraugli_params;
-  ImageF diffmap;
-  double diffval;
-  EXPECT_TRUE(
-      ButteraugliInterface(rgb0, rgb1, butteraugli_params, diffmap, diffval));
-  double distp = ComputeDistanceP(diffmap, butteraugli_params, 3.0);
-  EXPECT_NEAR(diffval, 4.0, 0.5);
-  EXPECT_NEAR(distp, 1.5, 0.5);
-  ImageF diffmap2;
-  double diffval2;
-  EXPECT_TRUE(ButteraugliInterfaceInPlace(std::move(rgb0), std::move(rgb1),
-                                          butteraugli_params, diffmap2,
-                                          diffval2));
-  double distp2 = ComputeDistanceP(diffmap2, butteraugli_params, 3.0);
-  EXPECT_NEAR(diffval, diffval2, 5e-7);
-  EXPECT_NEAR(distp, distp2, 1e-7);
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/byte_order_test.cc b/third_party/jpeg-xl/lib/jxl/byte_order_test.cc
deleted file mode 100644
index 17d7ef6643112..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/byte_order_test.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/base/byte_order.h"
-
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-TEST(ByteOrderTest, TestRoundTripBE16) {
-  const uint32_t in = 0x1234;
-  uint8_t buf[2];
-  StoreBE16(in, buf);
-  EXPECT_EQ(in, LoadBE16(buf));
-  EXPECT_NE(in, LoadLE16(buf));
-}
-
-TEST(ByteOrderTest, TestRoundTripLE16) {
-  const uint32_t in = 0x1234;
-  uint8_t buf[2];
-  StoreLE16(in, buf);
-  EXPECT_EQ(in, LoadLE16(buf));
-  EXPECT_NE(in, LoadBE16(buf));
-}
-
-TEST(ByteOrderTest, TestRoundTripBE32) {
-  const uint32_t in = 0xFEDCBA98u;
-  uint8_t buf[4];
-  StoreBE32(in, buf);
-  EXPECT_EQ(in, LoadBE32(buf));
-  EXPECT_NE(in, LoadLE32(buf));
-}
-
-TEST(ByteOrderTest, TestRoundTripLE32) {
-  const uint32_t in = 0xFEDCBA98u;
-  uint8_t buf[4];
-  StoreLE32(in, buf);
-  EXPECT_EQ(in, LoadLE32(buf));
-  EXPECT_NE(in, LoadBE32(buf));
-}
-
-TEST(ByteOrderTest, TestRoundTripLE64) {
-  const uint64_t in = 0xFEDCBA9876543210ull;
-  uint8_t buf[8];
-  StoreLE64(in, buf);
-  EXPECT_EQ(in, LoadLE64(buf));
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/chroma_from_luma.cc b/third_party/jpeg-xl/lib/jxl/chroma_from_luma.cc
deleted file mode 100644
index 2a44e77781529..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/chroma_from_luma.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/chroma_from_luma.h"
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdlib>  // abs
-#include <limits>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/image_ops.h"
-
-namespace jxl {
-
-Status ColorCorrelation::DecodeDC(BitReader* br) {
-  if (br->ReadFixedBits<1>() == 1) {
-    // All default.
-    return true;
-  }
-  SetColorFactor(U32Coder::Read(kColorFactorDist, br));
-  JXL_RETURN_IF_ERROR(F16Coder::Read(br, &base_correlation_x_));
-  if (std::abs(base_correlation_x_) > 4.0f) {
-    return JXL_FAILURE("Base X correlation is out of range");
-  }
-  JXL_RETURN_IF_ERROR(F16Coder::Read(br, &base_correlation_b_));
-  if (std::abs(base_correlation_b_) > 4.0f) {
-    return JXL_FAILURE("Base B correlation is out of range");
-  }
-  ytox_dc_ = static_cast<int>(br->ReadFixedBits<kBitsPerByte>()) +
-             std::numeric_limits<int8_t>::min();
-  ytob_dc_ = static_cast<int>(br->ReadFixedBits<kBitsPerByte>()) +
-             std::numeric_limits<int8_t>::min();
-  RecomputeDCFactors();
-  return true;
-}
-
-StatusOr<ColorCorrelationMap> ColorCorrelationMap::Create(
-    JxlMemoryManager* memory_manager, size_t xsize, size_t ysize, bool XYB) {
-  ColorCorrelationMap result;
-  size_t xblocks = DivCeil(xsize, kColorTileDim);
-  size_t yblocks = DivCeil(ysize, kColorTileDim);
-  JXL_ASSIGN_OR_RETURN(result.ytox_map,
-                       ImageSB::Create(memory_manager, xblocks, yblocks));
-  JXL_ASSIGN_OR_RETURN(result.ytob_map,
-                       ImageSB::Create(memory_manager, xblocks, yblocks));
-  ZeroFillImage(&result.ytox_map);
-  ZeroFillImage(&result.ytob_map);
-  if (!XYB) {
-    result.base_.base_correlation_b_ = 0;
-  }
-  result.base_.RecomputeDCFactors();
-  return result;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/chroma_from_luma.h b/third_party/jpeg-xl/lib/jxl/chroma_from_luma.h
deleted file mode 100644
index b23c82cc4d0ef..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/chroma_from_luma.h
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_CHROMA_FROM_LUMA_H_
-#define LIB_JXL_CHROMA_FROM_LUMA_H_
-
-// Chroma-from-luma, computed using heuristics to determine the best linear
-// model for the X and B channels from the Y channel.
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/cms/opsin_params.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/field_encodings.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/image.h"
-
-namespace jxl {
-
-// Tile is the rectangular grid of blocks that share color correlation
-// parameters ("factor_x/b" such that residual_b = blue - Y * factor_b).
-static constexpr size_t kColorTileDim = 64;
-
-static_assert(kColorTileDim % kBlockDim == 0,
-              "Color tile dim should be divisible by block dim");
-static constexpr size_t kColorTileDimInBlocks = kColorTileDim / kBlockDim;
-
-static_assert(kGroupDimInBlocks % kColorTileDimInBlocks == 0,
-              "Group dim should be divisible by color tile dim");
-
-static constexpr uint8_t kDefaultColorFactor = 84;
-
-// JPEG DCT coefficients are at most 1024. CfL constants are at most 127, and
-// the ratio of two entries in a JPEG quantization table is at most 255. Thus,
-// since the CfL denominator is 84, this leaves 12 bits of mantissa to be used.
-// For extra caution, we use 11.
-static constexpr uint8_t kCFLFixedPointPrecision = 11;
-
-static constexpr U32Enc kColorFactorDist(Val(kDefaultColorFactor), Val(256),
-                                         BitsOffset(8, 2), BitsOffset(16, 258));
-
-struct ColorCorrelation {
-  float YtoXRatio(int32_t x_factor) const {
-    return base_correlation_x_ + x_factor * color_scale_;
-  }
-
-  float YtoBRatio(int32_t b_factor) const {
-    return base_correlation_b_ + b_factor * color_scale_;
-  }
-
-  Status DecodeDC(BitReader* br);
-
-  // We consider a CfL map to be JPEG-reconstruction-compatible if base
-  // correlation is 0, no DC correlation is used, and we use the default color
-  // factor.
-  bool IsJPEGCompatible() const {
-    return base_correlation_x_ == 0 && base_correlation_b_ == 0 &&
-           ytob_dc_ == 0 && ytox_dc_ == 0 &&
-           color_factor_ == kDefaultColorFactor;
-  }
-
-  static int32_t RatioJPEG(int32_t factor) {
-    return factor * (1 << kCFLFixedPointPrecision) / kDefaultColorFactor;
-  }
-
-  void SetColorFactor(uint32_t factor) {
-    color_factor_ = factor;
-    color_scale_ = 1.0f / color_factor_;
-    RecomputeDCFactors();
-  }
-
-  void SetYToBDC(int32_t ytob_dc) {
-    ytob_dc_ = ytob_dc;
-    RecomputeDCFactors();
-  }
-  void SetYToXDC(int32_t ytox_dc) {
-    ytox_dc_ = ytox_dc;
-    RecomputeDCFactors();
-  }
-
-  int32_t GetYToXDC() const { return ytox_dc_; }
-  int32_t GetYToBDC() const { return ytob_dc_; }
-  float GetColorFactor() const { return color_factor_; }
-  float GetBaseCorrelationX() const { return base_correlation_x_; }
-  float GetBaseCorrelationB() const { return base_correlation_b_; }
-
-  const float* DCFactors() const { return dc_factors_; }
-
-  void RecomputeDCFactors() {
-    dc_factors_[0] = YtoXRatio(ytox_dc_);
-    dc_factors_[2] = YtoBRatio(ytob_dc_);
-  }
-
- private:
-  friend struct ColorCorrelationMap;
-  float dc_factors_[4] = {};
-  // range of factor: -1.51 to +1.52
-  uint32_t color_factor_ = kDefaultColorFactor;
-  float color_scale_ = 1.0f / color_factor_;
-  float base_correlation_x_ = 0.0f;
-  float base_correlation_b_ = jxl::cms::kYToBRatio;
-  int32_t ytox_dc_ = 0;
-  int32_t ytob_dc_ = 0;
-};
-
-struct ColorCorrelationMap {
-  ColorCorrelationMap() = default;
-
-  // Copy disallowed.
-  ColorCorrelationMap(const ColorCorrelationMap&) = delete;
-  ColorCorrelationMap& operator=(const ColorCorrelationMap&) = delete;
-
-  // Move default.
-  ColorCorrelationMap(ColorCorrelationMap&&) = default;
-  ColorCorrelationMap& operator=(ColorCorrelationMap&&) = default;
-
-  // xsize/ysize are in pixels
-  // set XYB=false to do something close to no-op cmap (needed for now since
-  // cmap is mandatory)
-  static StatusOr<ColorCorrelationMap> Create(JxlMemoryManager* memory_manager,
-                                              size_t xsize, size_t ysize,
-                                              bool XYB = true);
-
-  const ColorCorrelation& base() const { return base_; }
-  Status DecodeDC(BitReader* br) { return base_.DecodeDC(br); }
-
-  ImageSB ytox_map;
-  ImageSB ytob_map;
-
- private:
-  ColorCorrelation base_;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_CHROMA_FROM_LUMA_H_
diff --git a/third_party/jpeg-xl/lib/jxl/cms/color_encoding_cms.h b/third_party/jpeg-xl/lib/jxl/cms/color_encoding_cms.h
deleted file mode 100644
index 28a74d7d76567..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/cms/color_encoding_cms.h
+++ /dev/null
@@ -1,642 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_CMS_COLOR_ENCODING_CMS_H_
-#define LIB_JXL_CMS_COLOR_ENCODING_CMS_H_
-
-#include <jxl/cms_interface.h>
-#include <jxl/color_encoding.h>
-#include <jxl/types.h>
-
-#include <cmath>
-#include <cstdint>
-#include <cstring>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-namespace cms {
-
-using IccBytes = std::vector<uint8_t>;
-
-// Returns whether the two inputs are approximately equal.
-static inline bool ApproxEq(const double a, const double b,
-                            double max_l1 = 1E-3) {
-  // Threshold should be sufficient for ICC's 15-bit fixed-point numbers.
-  // We have seen differences of 7.1E-5 with lcms2 and 1E-3 with skcms.
-  return std::abs(a - b) <= max_l1;
-}
-
-// (All CIE units are for the standard 1931 2 degree observer)
-
-// Color space the color pixel data is encoded in. The color pixel data is
-// 3-channel in all cases except in case of kGray, where it uses only 1 channel.
-// This also determines the amount of channels used in modular encoding.
-enum class ColorSpace : uint32_t {
-  // Trichromatic color data. This also includes CMYK if a kBlack
-  // ExtraChannelInfo is present. This implies, if there is an ICC profile, that
-  // the ICC profile uses a 3-channel color space if no kBlack extra channel is
-  // present, or uses color space 'CMYK' if a kBlack extra channel is present.
-  kRGB,
-  // Single-channel data. This implies, if there is an ICC profile, that the ICC
-  // profile also represents single-channel data and has the appropriate color
-  // space ('GRAY').
-  kGray,
-  // Like kRGB, but implies fixed values for primaries etc.
-  kXYB,
-  // For non-RGB/gray data, e.g. from non-electro-optical sensors. Otherwise
-  // the same conditions as kRGB apply.
-  kUnknown
-  // NB: don't forget to update EnumBits!
-};
-
-// Values from CICP ColourPrimaries.
-enum class WhitePoint : uint32_t {
-  kD65 = 1,     // sRGB/BT.709/Display P3/BT.2020
-  kCustom = 2,  // Actual values encoded in separate fields
-  kE = 10,      // XYZ
-  kDCI = 11,    // DCI-P3
-  // NB: don't forget to update EnumBits!
-};
-
-// Values from CICP ColourPrimaries
-enum class Primaries : uint32_t {
-  kSRGB = 1,    // Same as BT.709
-  kCustom = 2,  // Actual values encoded in separate fields
-  k2100 = 9,    // Same as BT.2020
-  kP3 = 11,
-  // NB: don't forget to update EnumBits!
-};
-
-// Values from CICP TransferCharacteristics
-enum class TransferFunction : uint32_t {
-  k709 = 1,
-  kUnknown = 2,
-  kLinear = 8,
-  kSRGB = 13,
-  kPQ = 16,   // from BT.2100
-  kDCI = 17,  // from SMPTE RP 431-2 reference projector
-  kHLG = 18,  // from BT.2100
-  // NB: don't forget to update EnumBits!
-};
-
-enum class RenderingIntent : uint32_t {
-  // Values match ICC sRGB encodings.
-  kPerceptual = 0,  // good for photos, requires a profile with LUT.
-  kRelative,        // good for logos.
-  kSaturation,      // perhaps useful for CG with fully saturated colors.
-  kAbsolute,        // leaves white point unchanged; good for proofing.
-  // NB: don't forget to update EnumBits!
-};
-
-// Chromaticity (Y is omitted because it is 1 for white points and implicit for
-// primaries)
-struct CIExy {
-  CIExy() = default;
-  CIExy(double x, double y) : x(x), y(y) {}
-  double x = 0.0;
-  double y = 0.0;
-};
-
-struct PrimariesCIExy {
-  CIExy r;
-  CIExy g;
-  CIExy b;
-};
-
-// Serializable form of CIExy.
-struct Customxy {
-  static constexpr uint32_t kMul = 1000000;
-  static constexpr double kRoughLimit = 4.0;
-  static constexpr int32_t kMin = -0x200000;
-  static constexpr int32_t kMax = 0x1FFFFF;
-
-  int32_t x = 0;
-  int32_t y = 0;
-
-  CIExy GetValue() const {
-    CIExy xy;
-    xy.x = x * (1.0 / kMul);
-    xy.y = y * (1.0 / kMul);
-    return xy;
-  }
-
-  Status SetValue(const CIExy& xy) {
-    bool ok = (std::abs(xy.x) < kRoughLimit) && (std::abs(xy.y) < kRoughLimit);
-    if (!ok) return JXL_FAILURE("X or Y is out of bounds");
-    x = static_cast<int32_t>(roundf(xy.x * kMul));
-    if (x < kMin || x > kMax) return JXL_FAILURE("X is out of bounds");
-    y = static_cast<int32_t>(roundf(xy.y * kMul));
-    if (y < kMin || y > kMax) return JXL_FAILURE("Y is out of bounds");
-    return true;
-  }
-
-  bool IsSame(const Customxy& other) const {
-    return (x == other.x) && (y == other.y);
-  }
-};
-
-static inline Status WhitePointFromExternal(const JxlWhitePoint external,
-                                            WhitePoint* out) {
-  switch (external) {
-    case JXL_WHITE_POINT_D65:
-      *out = WhitePoint::kD65;
-      return true;
-    case JXL_WHITE_POINT_CUSTOM:
-      *out = WhitePoint::kCustom;
-      return true;
-    case JXL_WHITE_POINT_E:
-      *out = WhitePoint::kE;
-      return true;
-    case JXL_WHITE_POINT_DCI:
-      *out = WhitePoint::kDCI;
-      return true;
-  }
-  return JXL_FAILURE("Invalid WhitePoint enum value %d",
-                     static_cast<int>(external));
-}
-
-static inline Status PrimariesFromExternal(const JxlPrimaries external,
-                                           Primaries* out) {
-  switch (external) {
-    case JXL_PRIMARIES_SRGB:
-      *out = Primaries::kSRGB;
-      return true;
-    case JXL_PRIMARIES_CUSTOM:
-      *out = Primaries::kCustom;
-      return true;
-    case JXL_PRIMARIES_2100:
-      *out = Primaries::k2100;
-      return true;
-    case JXL_PRIMARIES_P3:
-      *out = Primaries::kP3;
-      return true;
-  }
-  return JXL_FAILURE("Invalid Primaries enum value");
-}
-
-static inline Status RenderingIntentFromExternal(
-    const JxlRenderingIntent external, RenderingIntent* out) {
-  switch (external) {
-    case JXL_RENDERING_INTENT_PERCEPTUAL:
-      *out = RenderingIntent::kPerceptual;
-      return true;
-    case JXL_RENDERING_INTENT_RELATIVE:
-      *out = RenderingIntent::kRelative;
-      return true;
-    case JXL_RENDERING_INTENT_SATURATION:
-      *out = RenderingIntent::kSaturation;
-      return true;
-    case JXL_RENDERING_INTENT_ABSOLUTE:
-      *out = RenderingIntent::kAbsolute;
-      return true;
-  }
-  return JXL_FAILURE("Invalid RenderingIntent enum value");
-}
-
-struct CustomTransferFunction {
-  // Highest reasonable value for the gamma of a transfer curve.
-  static constexpr uint32_t kMaxGamma = 8192;
-  static constexpr uint32_t kGammaMul = 10000000;
-
-  bool have_gamma = false;
-
-  // OETF exponent to go from linear to gamma-compressed.
-  uint32_t gamma = 0;  // Only used if have_gamma_.
-
-  // Can be kUnknown.
-  TransferFunction transfer_function =
-      TransferFunction::kSRGB;  // Only used if !have_gamma_.
-
-  TransferFunction GetTransferFunction() const {
-    JXL_DASSERT(!have_gamma);
-    return have_gamma ? TransferFunction::kUnknown : transfer_function;
-  }
-  void SetTransferFunction(const TransferFunction tf) {
-    have_gamma = false;
-    transfer_function = tf;
-  }
-
-  bool IsUnknown() const {
-    return !have_gamma && (transfer_function == TransferFunction::kUnknown);
-  }
-  bool IsSRGB() const {
-    return !have_gamma && (transfer_function == TransferFunction::kSRGB);
-  }
-  bool IsLinear() const {
-    return !have_gamma && (transfer_function == TransferFunction::kLinear);
-  }
-  bool IsPQ() const {
-    return !have_gamma && (transfer_function == TransferFunction::kPQ);
-  }
-  bool IsHLG() const {
-    return !have_gamma && (transfer_function == TransferFunction::kHLG);
-  }
-  bool Is709() const {
-    return !have_gamma && (transfer_function == TransferFunction::k709);
-  }
-  bool IsDCI() const {
-    return !have_gamma && (transfer_function == TransferFunction::kDCI);
-  }
-
-  double GetGamma() const {
-    JXL_DASSERT(have_gamma);
-    if (!have_gamma) return 0.0;
-    return gamma * (1.0 / kGammaMul);  // (0, 1)
-  }
-  Status SetGamma(double new_gamma) {
-    if (new_gamma < (1.0 / kMaxGamma) || new_gamma > 1.0) {
-      return JXL_FAILURE("Invalid gamma %f", new_gamma);
-    }
-
-    have_gamma = false;
-    if (ApproxEq(new_gamma, 1.0)) {
-      transfer_function = TransferFunction::kLinear;
-      return true;
-    }
-    if (ApproxEq(new_gamma, 1.0 / 2.6)) {
-      transfer_function = TransferFunction::kDCI;
-      return true;
-    }
-    // Don't translate 0.45.. to kSRGB nor k709 - that might change pixel
-    // values because those curves also have a linear part.
-
-    have_gamma = true;
-    gamma = roundf(new_gamma * kGammaMul);
-    transfer_function = TransferFunction::kUnknown;
-    return true;
-  }
-
-  bool IsSame(const CustomTransferFunction& other) const {
-    if (have_gamma != other.have_gamma) {
-      return false;
-    }
-    if (have_gamma) {
-      if (gamma != other.gamma) {
-        return false;
-      }
-    } else {
-      if (transfer_function != other.transfer_function) {
-        return false;
-      }
-    }
-    return true;
-  }
-};
-
-static inline Status ConvertExternalToInternalTransferFunction(
-    const JxlTransferFunction external, TransferFunction* internal) {
-  switch (external) {
-    case JXL_TRANSFER_FUNCTION_709:
-      *internal = TransferFunction::k709;
-      return true;
-    case JXL_TRANSFER_FUNCTION_UNKNOWN:
-      *internal = TransferFunction::kUnknown;
-      return true;
-    case JXL_TRANSFER_FUNCTION_LINEAR:
-      *internal = TransferFunction::kLinear;
-      return true;
-    case JXL_TRANSFER_FUNCTION_SRGB:
-      *internal = TransferFunction::kSRGB;
-      return true;
-    case JXL_TRANSFER_FUNCTION_PQ:
-      *internal = TransferFunction::kPQ;
-      return true;
-    case JXL_TRANSFER_FUNCTION_DCI:
-      *internal = TransferFunction::kDCI;
-      return true;
-    case JXL_TRANSFER_FUNCTION_HLG:
-      *internal = TransferFunction::kHLG;
-      return true;
-    case JXL_TRANSFER_FUNCTION_GAMMA:
-      return JXL_FAILURE("Gamma should be handled separately");
-  }
-  return JXL_FAILURE("Invalid TransferFunction enum value");
-}
-
-// Compact encoding of data required to interpret and translate pixels to a
-// known color space. Stored in Metadata. Thread-compatible.
-struct ColorEncoding {
-  // Only valid if HaveFields()
-  WhitePoint white_point = WhitePoint::kD65;
-  Primaries primaries = Primaries::kSRGB;  // Only valid if HasPrimaries()
-  RenderingIntent rendering_intent = RenderingIntent::kRelative;
-
-  // When false, fields such as white_point and tf are invalid and must not be
-  // used. This occurs after setting a raw bytes-only ICC profile, only the
-  // ICC bytes may be used. The color_space_ field is still valid.
-  bool have_fields = true;
-
-  IccBytes icc;  // Valid ICC profile
-
-  ColorSpace color_space = ColorSpace::kRGB;  // Can be kUnknown
-  bool cmyk = false;
-
-  // "late sync" fields
-  CustomTransferFunction tf;
-  Customxy white;  // Only used if white_point == kCustom
-  Customxy red;    // Only used if primaries == kCustom
-  Customxy green;  // Only used if primaries == kCustom
-  Customxy blue;   // Only used if primaries == kCustom
-
-  // Returns false if the field is invalid and unusable.
-  bool HasPrimaries() const {
-    return (color_space != ColorSpace::kGray) &&
-           (color_space != ColorSpace::kXYB);
-  }
-
-  size_t Channels() const { return (color_space == ColorSpace::kGray) ? 1 : 3; }
-
-  Status GetPrimaries(PrimariesCIExy& xy) const {
-    JXL_ENSURE(have_fields);
-    JXL_ENSURE(HasPrimaries());
-    xy = {};
-    switch (primaries) {
-      case Primaries::kCustom:
-        xy.r = red.GetValue();
-        xy.g = green.GetValue();
-        xy.b = blue.GetValue();
-        break;
-
-      case Primaries::kSRGB:
-        xy.r.x = 0.639998686;
-        xy.r.y = 0.330010138;
-        xy.g.x = 0.300003784;
-        xy.g.y = 0.600003357;
-        xy.b.x = 0.150002046;
-        xy.b.y = 0.059997204;
-        break;
-
-      case Primaries::k2100:
-        xy.r.x = 0.708;
-        xy.r.y = 0.292;
-        xy.g.x = 0.170;
-        xy.g.y = 0.797;
-        xy.b.x = 0.131;
-        xy.b.y = 0.046;
-        break;
-
-      case Primaries::kP3:
-        xy.r.x = 0.680;
-        xy.r.y = 0.320;
-        xy.g.x = 0.265;
-        xy.g.y = 0.690;
-        xy.b.x = 0.150;
-        xy.b.y = 0.060;
-        break;
-
-      default:
-        JXL_DEBUG_ABORT("internal: unexpected Primaries: %d",
-                        static_cast<int>(primaries));
-    }
-    return true;
-  }
-
-  Status SetPrimaries(const PrimariesCIExy& xy) {
-    JXL_ENSURE(have_fields);
-    JXL_ENSURE(HasPrimaries());
-    if (xy.r.x == 0.0 || xy.r.y == 0.0 || xy.g.x == 0.0 || xy.g.y == 0.0 ||
-        xy.b.x == 0.0 || xy.b.y == 0.0) {
-      return JXL_FAILURE("Invalid primaries %f %f %f %f %f %f", xy.r.x, xy.r.y,
-                         xy.g.x, xy.g.y, xy.b.x, xy.b.y);
-    }
-
-    if (ApproxEq(xy.r.x, 0.64) && ApproxEq(xy.r.y, 0.33) &&
-        ApproxEq(xy.g.x, 0.30) && ApproxEq(xy.g.y, 0.60) &&
-        ApproxEq(xy.b.x, 0.15) && ApproxEq(xy.b.y, 0.06)) {
-      primaries = Primaries::kSRGB;
-      return true;
-    }
-
-    if (ApproxEq(xy.r.x, 0.708) && ApproxEq(xy.r.y, 0.292) &&
-        ApproxEq(xy.g.x, 0.170) && ApproxEq(xy.g.y, 0.797) &&
-        ApproxEq(xy.b.x, 0.131) && ApproxEq(xy.b.y, 0.046)) {
-      primaries = Primaries::k2100;
-      return true;
-    }
-    if (ApproxEq(xy.r.x, 0.680) && ApproxEq(xy.r.y, 0.320) &&
-        ApproxEq(xy.g.x, 0.265) && ApproxEq(xy.g.y, 0.690) &&
-        ApproxEq(xy.b.x, 0.150) && ApproxEq(xy.b.y, 0.060)) {
-      primaries = Primaries::kP3;
-      return true;
-    }
-
-    primaries = Primaries::kCustom;
-    JXL_RETURN_IF_ERROR(red.SetValue(xy.r));
-    JXL_RETURN_IF_ERROR(green.SetValue(xy.g));
-    JXL_RETURN_IF_ERROR(blue.SetValue(xy.b));
-    return true;
-  }
-
-  CIExy GetWhitePoint() const {
-    CIExy xy{};
-    JXL_DASSERT(have_fields);
-    if (!have_fields) return xy;
-    switch (white_point) {
-      case WhitePoint::kCustom:
-        xy = white.GetValue();
-        break;
-
-      case WhitePoint::kD65:
-        xy.x = 0.3127;
-        xy.y = 0.3290;
-        break;
-
-      case WhitePoint::kDCI:
-        // From https://ieeexplore.ieee.org/document/7290729 C.2 page 11
-        xy.x = 0.314;
-        xy.y = 0.351;
-        break;
-
-      case WhitePoint::kE:
-        xy.x = xy.y = 1.0 / 3;
-        break;
-
-      default:
-        JXL_DEBUG_ABORT("internal: unexpected WhitePoint: %d",
-                        static_cast<int>(white_point));
-    }
-    return xy;
-  }
-
-  Status SetWhitePoint(const CIExy& xy) {
-    JXL_ENSURE(have_fields);
-    if (xy.x == 0.0 || xy.y == 0.0) {
-      return JXL_FAILURE("Invalid white point %f %f", xy.x, xy.y);
-    }
-    if (ApproxEq(xy.x, 0.3127) && ApproxEq(xy.y, 0.3290)) {
-      white_point = WhitePoint::kD65;
-      return true;
-    }
-    if (ApproxEq(xy.x, 1.0 / 3) && ApproxEq(xy.y, 1.0 / 3)) {
-      white_point = WhitePoint::kE;
-      return true;
-    }
-    if (ApproxEq(xy.x, 0.314) && ApproxEq(xy.y, 0.351)) {
-      white_point = WhitePoint::kDCI;
-      return true;
-    }
-    white_point = WhitePoint::kCustom;
-    return white.SetValue(xy);
-  }
-
-  // Checks if the color spaces (including white point / primaries) are the
-  // same, but ignores the transfer function, rendering intent and ICC bytes.
-  bool SameColorSpace(const ColorEncoding& other) const {
-    if (color_space != other.color_space) return false;
-
-    if (white_point != other.white_point) return false;
-    if (white_point == WhitePoint::kCustom) {
-      if (!white.IsSame(other.white)) {
-        return false;
-      }
-    }
-
-    if (HasPrimaries() != other.HasPrimaries()) return false;
-    if (HasPrimaries()) {
-      if (primaries != other.primaries) return false;
-      if (primaries == Primaries::kCustom) {
-        if (!red.IsSame(other.red)) return false;
-        if (!green.IsSame(other.green)) return false;
-        if (!blue.IsSame(other.blue)) return false;
-      }
-    }
-    return true;
-  }
-
-  // Checks if the color space and transfer function are the same, ignoring
-  // rendering intent and ICC bytes
-  bool SameColorEncoding(const ColorEncoding& other) const {
-    return SameColorSpace(other) && tf.IsSame(other.tf);
-  }
-
-  // Returns true if all fields have been initialized (possibly to kUnknown).
-  // Returns false if the ICC profile is invalid or decoding it fails.
-  Status SetFieldsFromICC(IccBytes&& new_icc, const JxlCmsInterface& cms) {
-    // In case parsing fails, mark the ColorEncoding as invalid.
-    JXL_ENSURE(!new_icc.empty());
-    color_space = ColorSpace::kUnknown;
-    tf.transfer_function = TransferFunction::kUnknown;
-    icc.clear();
-
-    JxlColorEncoding external;
-    JXL_BOOL new_cmyk;
-    JXL_RETURN_IF_ERROR(cms.set_fields_from_icc(cms.set_fields_data,
-                                                new_icc.data(), new_icc.size(),
-                                                &external, &new_cmyk));
-    cmyk = static_cast<bool>(new_cmyk);
-    JXL_RETURN_IF_ERROR(FromExternal(external));
-    icc = std::move(new_icc);
-    return true;
-  }
-
-  JxlColorEncoding ToExternal() const {
-    JxlColorEncoding external = {};
-    auto set_error = [&]() {
-      external.color_space = JXL_COLOR_SPACE_UNKNOWN;
-      external.primaries = JXL_PRIMARIES_CUSTOM;
-      external.rendering_intent = JXL_RENDERING_INTENT_PERCEPTUAL;  //?
-      external.transfer_function = JXL_TRANSFER_FUNCTION_UNKNOWN;
-      external.white_point = JXL_WHITE_POINT_CUSTOM;
-    };
-    if (!have_fields) {
-      set_error();
-      return external;
-    }
-    external.color_space = static_cast<JxlColorSpace>(color_space);
-
-    external.white_point = static_cast<JxlWhitePoint>(white_point);
-
-    CIExy wp = GetWhitePoint();
-    external.white_point_xy[0] = wp.x;
-    external.white_point_xy[1] = wp.y;
-
-    if (external.color_space == JXL_COLOR_SPACE_RGB ||
-        external.color_space == JXL_COLOR_SPACE_UNKNOWN) {
-      external.primaries = static_cast<JxlPrimaries>(primaries);
-      PrimariesCIExy p;
-      if (!GetPrimaries(p)) {
-        set_error();
-        return external;
-      }
-      external.primaries_red_xy[0] = p.r.x;
-      external.primaries_red_xy[1] = p.r.y;
-      external.primaries_green_xy[0] = p.g.x;
-      external.primaries_green_xy[1] = p.g.y;
-      external.primaries_blue_xy[0] = p.b.x;
-      external.primaries_blue_xy[1] = p.b.y;
-    }
-
-    if (tf.have_gamma) {
-      external.transfer_function = JXL_TRANSFER_FUNCTION_GAMMA;
-      external.gamma = tf.GetGamma();
-    } else {
-      external.transfer_function =
-          static_cast<JxlTransferFunction>(tf.GetTransferFunction());
-      external.gamma = 0;
-    }
-
-    external.rendering_intent =
-        static_cast<JxlRenderingIntent>(rendering_intent);
-    return external;
-  }
-
-  // NB: does not create ICC.
-  Status FromExternal(const JxlColorEncoding& external) {
-    // TODO(eustas): update non-serializable on call-site
-    color_space = static_cast<ColorSpace>(external.color_space);
-
-    JXL_RETURN_IF_ERROR(
-        WhitePointFromExternal(external.white_point, &white_point));
-    if (external.white_point == JXL_WHITE_POINT_CUSTOM) {
-      CIExy wp;
-      wp.x = external.white_point_xy[0];
-      wp.y = external.white_point_xy[1];
-      JXL_RETURN_IF_ERROR(SetWhitePoint(wp));
-    }
-
-    if (external.color_space == JXL_COLOR_SPACE_RGB ||
-        external.color_space == JXL_COLOR_SPACE_UNKNOWN) {
-      JXL_RETURN_IF_ERROR(
-          PrimariesFromExternal(external.primaries, &primaries));
-      if (external.primaries == JXL_PRIMARIES_CUSTOM) {
-        PrimariesCIExy primaries;
-        primaries.r.x = external.primaries_red_xy[0];
-        primaries.r.y = external.primaries_red_xy[1];
-        primaries.g.x = external.primaries_green_xy[0];
-        primaries.g.y = external.primaries_green_xy[1];
-        primaries.b.x = external.primaries_blue_xy[0];
-        primaries.b.y = external.primaries_blue_xy[1];
-        JXL_RETURN_IF_ERROR(SetPrimaries(primaries));
-      }
-    }
-    CustomTransferFunction tf;
-    if (external.transfer_function == JXL_TRANSFER_FUNCTION_GAMMA) {
-      JXL_RETURN_IF_ERROR(tf.SetGamma(external.gamma));
-    } else {
-      TransferFunction tf_enum;
-      // JXL_TRANSFER_FUNCTION_GAMMA is not handled by this function since
-      // there's no internal enum value for it.
-      JXL_RETURN_IF_ERROR(ConvertExternalToInternalTransferFunction(
-          external.transfer_function, &tf_enum));
-      tf.SetTransferFunction(tf_enum);
-    }
-    this->tf = tf;
-
-    JXL_RETURN_IF_ERROR(RenderingIntentFromExternal(external.rendering_intent,
-                                                    &rendering_intent));
-
-    icc.clear();
-
-    return true;
-  }
-};
-
-}  // namespace cms
-}  // namespace jxl
-
-#endif  // LIB_JXL_CMS_COLOR_ENCODING_CMS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/cms/jxl_cms.cc b/third_party/jpeg-xl/lib/jxl/cms/jxl_cms.cc
deleted file mode 100644
index 319557b27ebd7..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/cms/jxl_cms.cc
+++ /dev/null
@@ -1,1368 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/cms.h>
-
-#ifndef JPEGXL_ENABLE_SKCMS
-#define JPEGXL_ENABLE_SKCMS 0
-#endif
-
-#include <jxl/cms_interface.h>
-
-#include <algorithm>
-#include <array>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <memory>
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/cms/jxl_cms.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/matrix_ops.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/cms/jxl_cms_internal.h"
-#include "lib/jxl/cms/transfer_functions-inl.h"
-#include "lib/jxl/color_encoding_internal.h"
-#if JPEGXL_ENABLE_SKCMS
-#include "skcms.h"
-#else  // JPEGXL_ENABLE_SKCMS
-#include "lcms2.h"
-#include "lcms2_plugin.h"
-#include "lib/jxl/base/span.h"
-#endif  // JPEGXL_ENABLE_SKCMS
-
-#define JXL_CMS_VERBOSE 0
-
-// Define these only once. We can't use HWY_ONCE here because it is defined as
-// 1 only on the last pass.
-#ifndef LIB_JXL_JXL_CMS_CC
-#define LIB_JXL_JXL_CMS_CC
-
-namespace jxl {
-namespace {
-
-using ::jxl::cms::ColorEncoding;
-
-struct JxlCms {
-#if JPEGXL_ENABLE_SKCMS
-  IccBytes icc_src, icc_dst;
-  skcms_ICCProfile profile_src, profile_dst;
-#else
-  void* lcms_transform;
-#endif
-
-  // These fields are used when the HLG OOTF or inverse OOTF must be applied.
-  bool apply_hlg_ootf;
-  size_t hlg_ootf_num_channels;
-  // Y component of the primaries.
-  std::array<float, 3> hlg_ootf_luminances;
-
-  size_t channels_src;
-  size_t channels_dst;
-
-  std::vector<float> src_storage;
-  std::vector<float*> buf_src;
-  std::vector<float> dst_storage;
-  std::vector<float*> buf_dst;
-
-  float intensity_target;
-  bool skip_lcms = false;
-  ExtraTF preprocess = ExtraTF::kNone;
-  ExtraTF postprocess = ExtraTF::kNone;
-};
-
-Status ApplyHlgOotf(JxlCms* t, float* JXL_RESTRICT buf, size_t xsize,
-                    bool forward);
-}  // namespace
-}  // namespace jxl
-
-#endif  // LIB_JXL_JXL_CMS_CC
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-#if JXL_CMS_VERBOSE >= 2
-const size_t kX = 0;  // pixel index, multiplied by 3 for RGB
-#endif
-
-// xform_src = UndoGammaCompression(buf_src).
-Status BeforeTransform(JxlCms* t, const float* buf_src, float* xform_src,
-                       size_t buf_size) {
-  switch (t->preprocess) {
-    case ExtraTF::kNone:
-      JXL_ENSURE(false);  // unreachable
-      break;
-
-    case ExtraTF::kPQ: {
-      HWY_FULL(float) df;
-      TF_PQ tf_pq(t->intensity_target);
-      for (size_t i = 0; i < buf_size; i += Lanes(df)) {
-        const auto val = Load(df, buf_src + i);
-        const auto result = tf_pq.DisplayFromEncoded(df, val);
-        Store(result, df, xform_src + i);
-      }
-#if JXL_CMS_VERBOSE >= 2
-      printf("pre in %.4f %.4f %.4f undoPQ %.4f %.4f %.4f\n", buf_src[3 * kX],
-             buf_src[3 * kX + 1], buf_src[3 * kX + 2], xform_src[3 * kX],
-             xform_src[3 * kX + 1], xform_src[3 * kX + 2]);
-#endif
-      break;
-    }
-
-    case ExtraTF::kHLG:
-      for (size_t i = 0; i < buf_size; ++i) {
-        xform_src[i] = static_cast<float>(
-            TF_HLG_Base::DisplayFromEncoded(static_cast<double>(buf_src[i])));
-      }
-      if (t->apply_hlg_ootf) {
-        JXL_RETURN_IF_ERROR(
-            ApplyHlgOotf(t, xform_src, buf_size, /*forward=*/true));
-      }
-#if JXL_CMS_VERBOSE >= 2
-      printf("pre in %.4f %.4f %.4f undoHLG %.4f %.4f %.4f\n", buf_src[3 * kX],
-             buf_src[3 * kX + 1], buf_src[3 * kX + 2], xform_src[3 * kX],
-             xform_src[3 * kX + 1], xform_src[3 * kX + 2]);
-#endif
-      break;
-
-    case ExtraTF::kSRGB:
-      HWY_FULL(float) df;
-      for (size_t i = 0; i < buf_size; i += Lanes(df)) {
-        const auto val = Load(df, buf_src + i);
-        const auto result = TF_SRGB().DisplayFromEncoded(val);
-        Store(result, df, xform_src + i);
-      }
-#if JXL_CMS_VERBOSE >= 2
-      printf("pre in %.4f %.4f %.4f undoSRGB %.4f %.4f %.4f\n", buf_src[3 * kX],
-             buf_src[3 * kX + 1], buf_src[3 * kX + 2], xform_src[3 * kX],
-             xform_src[3 * kX + 1], xform_src[3 * kX + 2]);
-#endif
-      break;
-  }
-  return true;
-}
-
-// Applies gamma compression in-place.
-Status AfterTransform(JxlCms* t, float* JXL_RESTRICT buf_dst, size_t buf_size) {
-  switch (t->postprocess) {
-    case ExtraTF::kNone:
-      JXL_DEBUG_ABORT("Unreachable");
-      break;
-    case ExtraTF::kPQ: {
-      HWY_FULL(float) df;
-      TF_PQ tf_pq(t->intensity_target);
-      for (size_t i = 0; i < buf_size; i += Lanes(df)) {
-        const auto val = Load(df, buf_dst + i);
-        const auto result = tf_pq.EncodedFromDisplay(df, val);
-        Store(result, df, buf_dst + i);
-      }
-#if JXL_CMS_VERBOSE >= 2
-      printf("after PQ enc %.4f %.4f %.4f\n", buf_dst[3 * kX],
-             buf_dst[3 * kX + 1], buf_dst[3 * kX + 2]);
-#endif
-      break;
-    }
-    case ExtraTF::kHLG:
-      if (t->apply_hlg_ootf) {
-        JXL_RETURN_IF_ERROR(
-            ApplyHlgOotf(t, buf_dst, buf_size, /*forward=*/false));
-      }
-      for (size_t i = 0; i < buf_size; ++i) {
-        buf_dst[i] = static_cast<float>(
-            TF_HLG_Base::EncodedFromDisplay(static_cast<double>(buf_dst[i])));
-      }
-#if JXL_CMS_VERBOSE >= 2
-      printf("after HLG enc %.4f %.4f %.4f\n", buf_dst[3 * kX],
-             buf_dst[3 * kX + 1], buf_dst[3 * kX + 2]);
-#endif
-      break;
-    case ExtraTF::kSRGB:
-      HWY_FULL(float) df;
-      for (size_t i = 0; i < buf_size; i += Lanes(df)) {
-        const auto val = Load(df, buf_dst + i);
-        const auto result = TF_SRGB().EncodedFromDisplay(df, val);
-        Store(result, df, buf_dst + i);
-      }
-#if JXL_CMS_VERBOSE >= 2
-      printf("after SRGB enc %.4f %.4f %.4f\n", buf_dst[3 * kX],
-             buf_dst[3 * kX + 1], buf_dst[3 * kX + 2]);
-#endif
-      break;
-  }
-  return true;
-}
-
-Status DoColorSpaceTransform(void* cms_data, const size_t thread,
-                             const float* buf_src, float* buf_dst,
-                             size_t xsize) {
-  // No lock needed.
-  JxlCms* t = reinterpret_cast<JxlCms*>(cms_data);
-
-  const float* xform_src = buf_src;  // Read-only.
-  if (t->preprocess != ExtraTF::kNone) {
-    float* mutable_xform_src = t->buf_src[thread];  // Writable buffer.
-    JXL_RETURN_IF_ERROR(BeforeTransform(t, buf_src, mutable_xform_src,
-                                        xsize * t->channels_src));
-    xform_src = mutable_xform_src;
-  }
-
-#if JPEGXL_ENABLE_SKCMS
-  if (t->channels_src == 1 && !t->skip_lcms) {
-    // Expand from 1 to 3 channels, starting from the end in case
-    // xform_src == t->buf_src[thread].
-    float* mutable_xform_src = t->buf_src[thread];
-    for (size_t i = 0; i < xsize; ++i) {
-      const size_t x = xsize - i - 1;
-      mutable_xform_src[x * 3] = mutable_xform_src[x * 3 + 1] =
-          mutable_xform_src[x * 3 + 2] = xform_src[x];
-    }
-    xform_src = mutable_xform_src;
-  }
-#else
-  if (t->channels_src == 4 && !t->skip_lcms) {
-    // LCMS does CMYK in a weird way: 0 = white, 100 = max ink
-    float* mutable_xform_src = t->buf_src[thread];
-    for (size_t x = 0; x < xsize * 4; ++x) {
-      mutable_xform_src[x] = 100.f - 100.f * mutable_xform_src[x];
-    }
-    xform_src = mutable_xform_src;
-  }
-#endif
-
-#if JXL_CMS_VERBOSE >= 2
-  // Save inputs for printing before in-place transforms overwrite them.
-  const float in0 = xform_src[3 * kX + 0];
-  const float in1 = xform_src[3 * kX + 1];
-  const float in2 = xform_src[3 * kX + 2];
-#endif
-
-  if (t->skip_lcms) {
-    if (buf_dst != xform_src) {
-      memcpy(buf_dst, xform_src, xsize * t->channels_src * sizeof(*buf_dst));
-    }  // else: in-place, no need to copy
-  } else {
-#if JPEGXL_ENABLE_SKCMS
-    JXL_ENSURE(
-        skcms_Transform(xform_src,
-                        (t->channels_src == 4 ? skcms_PixelFormat_RGBA_ffff
-                                              : skcms_PixelFormat_RGB_fff),
-                        skcms_AlphaFormat_Opaque, &t->profile_src, buf_dst,
-                        skcms_PixelFormat_RGB_fff, skcms_AlphaFormat_Opaque,
-                        &t->profile_dst, xsize));
-#else   // JPEGXL_ENABLE_SKCMS
-    cmsDoTransform(t->lcms_transform, xform_src, buf_dst,
-                   static_cast<cmsUInt32Number>(xsize));
-#endif  // JPEGXL_ENABLE_SKCMS
-  }
-#if JXL_CMS_VERBOSE >= 2
-  printf("xform skip%d: %.4f %.4f %.4f (%p) -> (%p) %.4f %.4f %.4f\n",
-         t->skip_lcms, in0, in1, in2, xform_src, buf_dst, buf_dst[3 * kX],
-         buf_dst[3 * kX + 1], buf_dst[3 * kX + 2]);
-#endif
-
-#if JPEGXL_ENABLE_SKCMS
-  if (t->channels_dst == 1 && !t->skip_lcms) {
-    // Contract back from 3 to 1 channel, this time forward.
-    float* grayscale_buf_dst = t->buf_dst[thread];
-    for (size_t x = 0; x < xsize; ++x) {
-      grayscale_buf_dst[x] = buf_dst[x * 3];
-    }
-    buf_dst = grayscale_buf_dst;
-  }
-#endif
-
-  if (t->postprocess != ExtraTF::kNone) {
-    JXL_RETURN_IF_ERROR(AfterTransform(t, buf_dst, xsize * t->channels_dst));
-  }
-  return true;
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-namespace {
-
-HWY_EXPORT(DoColorSpaceTransform);
-int DoColorSpaceTransform(void* t, size_t thread, const float* buf_src,
-                          float* buf_dst, size_t xsize) {
-  return HWY_DYNAMIC_DISPATCH(DoColorSpaceTransform)(t, thread, buf_src,
-                                                     buf_dst, xsize);
-}
-
-// Define to 1 on OS X as a workaround for older LCMS lacking MD5.
-#define JXL_CMS_OLD_VERSION 0
-
-#if JPEGXL_ENABLE_SKCMS
-
-JXL_MUST_USE_RESULT CIExy CIExyFromXYZ(const Color& XYZ) {
-  const float factor = 1.f / (XYZ[0] + XYZ[1] + XYZ[2]);
-  CIExy xy;
-  xy.x = XYZ[0] * factor;
-  xy.y = XYZ[1] * factor;
-  return xy;
-}
-
-#else  // JPEGXL_ENABLE_SKCMS
-// (LCMS interface requires xyY but we omit the Y for white points/primaries.)
-
-JXL_MUST_USE_RESULT CIExy CIExyFromxyY(const cmsCIExyY& xyY) {
-  CIExy xy;
-  xy.x = xyY.x;
-  xy.y = xyY.y;
-  return xy;
-}
-
-JXL_MUST_USE_RESULT CIExy CIExyFromXYZ(const cmsCIEXYZ& XYZ) {
-  cmsCIExyY xyY;
-  cmsXYZ2xyY(/*Dest=*/&xyY, /*Source=*/&XYZ);
-  return CIExyFromxyY(xyY);
-}
-
-JXL_MUST_USE_RESULT cmsCIEXYZ D50_XYZ() {
-  // Quantized D50 as stored in ICC profiles.
-  return {0.96420288, 1.0, 0.82490540};
-}
-
-// RAII
-
-struct ProfileDeleter {
-  void operator()(void* p) { cmsCloseProfile(p); }
-};
-using Profile = std::unique_ptr<void, ProfileDeleter>;
-
-struct TransformDeleter {
-  void operator()(void* p) { cmsDeleteTransform(p); }
-};
-using Transform = std::unique_ptr<void, TransformDeleter>;
-
-struct CurveDeleter {
-  void operator()(cmsToneCurve* p) { cmsFreeToneCurve(p); }
-};
-using Curve = std::unique_ptr<cmsToneCurve, CurveDeleter>;
-
-Status CreateProfileXYZ(const cmsContext context,
-                        Profile* JXL_RESTRICT profile) {
-  profile->reset(cmsCreateXYZProfileTHR(context));
-  if (profile->get() == nullptr) return JXL_FAILURE("Failed to create XYZ");
-  return true;
-}
-
-#endif  // !JPEGXL_ENABLE_SKCMS
-
-#if JPEGXL_ENABLE_SKCMS
-// IMPORTANT: icc must outlive profile.
-Status DecodeProfile(const uint8_t* icc, size_t size,
-                     skcms_ICCProfile* const profile) {
-  if (!skcms_Parse(icc, size, profile)) {
-    return JXL_FAILURE("Failed to parse ICC profile with %" PRIuS " bytes",
-                       size);
-  }
-  return true;
-}
-#else   // JPEGXL_ENABLE_SKCMS
-Status DecodeProfile(const cmsContext context, Span<const uint8_t> icc,
-                     Profile* profile) {
-  profile->reset(cmsOpenProfileFromMemTHR(context, icc.data(), icc.size()));
-  if (profile->get() == nullptr) {
-    return JXL_FAILURE("Failed to decode profile");
-  }
-
-  // WARNING: due to the LCMS MD5 issue mentioned above, many existing
-  // profiles have incorrect MD5, so do not even bother checking them nor
-  // generating warning clutter.
-
-  return true;
-}
-#endif  // JPEGXL_ENABLE_SKCMS
-
-#if JPEGXL_ENABLE_SKCMS
-
-ColorSpace ColorSpaceFromProfile(const skcms_ICCProfile& profile) {
-  switch (profile.data_color_space) {
-    case skcms_Signature_RGB:
-    case skcms_Signature_CMYK:
-      // spec says CMYK is encoded as RGB (the kBlack extra channel signals that
-      // it is actually CMYK)
-      return ColorSpace::kRGB;
-    case skcms_Signature_Gray:
-      return ColorSpace::kGray;
-    default:
-      return ColorSpace::kUnknown;
-  }
-}
-
-// vector_out := matmul(matrix, vector_in)
-void MatrixProduct(const skcms_Matrix3x3& matrix, const Color& vector_in,
-                   Color& vector_out) {
-  for (int i = 0; i < 3; ++i) {
-    vector_out[i] = 0;
-    for (int j = 0; j < 3; ++j) {
-      vector_out[i] += matrix.vals[i][j] * vector_in[j];
-    }
-  }
-}
-
-// Returns white point that was specified when creating the profile.
-JXL_MUST_USE_RESULT Status UnadaptedWhitePoint(const skcms_ICCProfile& profile,
-                                               CIExy* out) {
-  Color media_white_point_XYZ;
-  if (!skcms_GetWTPT(&profile, media_white_point_XYZ.data())) {
-    return JXL_FAILURE("ICC profile does not contain WhitePoint tag");
-  }
-  skcms_Matrix3x3 CHAD;
-  if (!skcms_GetCHAD(&profile, &CHAD)) {
-    // If there is no chromatic adaptation matrix, it means that the white point
-    // is already unadapted.
-    *out = CIExyFromXYZ(media_white_point_XYZ);
-    return true;
-  }
-  // Otherwise, it has been adapted to the PCS white point using said matrix,
-  // and the adaptation needs to be undone.
-  skcms_Matrix3x3 inverse_CHAD;
-  if (!skcms_Matrix3x3_invert(&CHAD, &inverse_CHAD)) {
-    return JXL_FAILURE("Non-invertible ChromaticAdaptation matrix");
-  }
-  Color unadapted_white_point_XYZ;
-  MatrixProduct(inverse_CHAD, media_white_point_XYZ, unadapted_white_point_XYZ);
-  *out = CIExyFromXYZ(unadapted_white_point_XYZ);
-  return true;
-}
-
-Status IdentifyPrimaries(const skcms_ICCProfile& profile,
-                         const CIExy& wp_unadapted, ColorEncoding* c) {
-  if (!c->HasPrimaries()) return true;
-
-  skcms_Matrix3x3 CHAD;
-  skcms_Matrix3x3 inverse_CHAD;
-  if (skcms_GetCHAD(&profile, &CHAD)) {
-    JXL_RETURN_IF_ERROR(skcms_Matrix3x3_invert(&CHAD, &inverse_CHAD));
-  } else {
-    static constexpr skcms_Matrix3x3 kLMSFromXYZ = {
-        {{0.8951, 0.2664, -0.1614},
-         {-0.7502, 1.7135, 0.0367},
-         {0.0389, -0.0685, 1.0296}}};
-    static constexpr skcms_Matrix3x3 kXYZFromLMS = {
-        {{0.9869929, -0.1470543, 0.1599627},
-         {0.4323053, 0.5183603, 0.0492912},
-         {-0.0085287, 0.0400428, 0.9684867}}};
-    static constexpr Color kWpD50XYZ{0.96420288, 1.0, 0.82490540};
-    Color wp_unadapted_XYZ;
-    JXL_RETURN_IF_ERROR(
-        CIEXYZFromWhiteCIExy(wp_unadapted.x, wp_unadapted.y, wp_unadapted_XYZ));
-    Color wp_D50_LMS;
-    Color wp_unadapted_LMS;
-    MatrixProduct(kLMSFromXYZ, kWpD50XYZ, wp_D50_LMS);
-    MatrixProduct(kLMSFromXYZ, wp_unadapted_XYZ, wp_unadapted_LMS);
-    inverse_CHAD = {{{wp_unadapted_LMS[0] / wp_D50_LMS[0], 0, 0},
-                     {0, wp_unadapted_LMS[1] / wp_D50_LMS[1], 0},
-                     {0, 0, wp_unadapted_LMS[2] / wp_D50_LMS[2]}}};
-    inverse_CHAD = skcms_Matrix3x3_concat(&kXYZFromLMS, &inverse_CHAD);
-    inverse_CHAD = skcms_Matrix3x3_concat(&inverse_CHAD, &kLMSFromXYZ);
-  }
-
-  Color XYZ;
-  PrimariesCIExy primaries;
-  CIExy* const chromaticities[] = {&primaries.r, &primaries.g, &primaries.b};
-  for (int i = 0; i < 3; ++i) {
-    float RGB[3] = {};
-    RGB[i] = 1;
-    skcms_Transform(RGB, skcms_PixelFormat_RGB_fff, skcms_AlphaFormat_Opaque,
-                    &profile, XYZ.data(), skcms_PixelFormat_RGB_fff,
-                    skcms_AlphaFormat_Opaque, skcms_XYZD50_profile(), 1);
-    Color unadapted_XYZ;
-    MatrixProduct(inverse_CHAD, XYZ, unadapted_XYZ);
-    *chromaticities[i] = CIExyFromXYZ(unadapted_XYZ);
-  }
-  return c->SetPrimaries(primaries);
-}
-
-bool IsApproximatelyEqual(const skcms_ICCProfile& profile,
-                          const ColorEncoding& JXL_RESTRICT c) {
-  IccBytes bytes;
-  if (!MaybeCreateProfile(c.ToExternal(), &bytes)) {
-    return false;
-  }
-
-  skcms_ICCProfile profile_test;
-  if (!DecodeProfile(bytes.data(), bytes.size(), &profile_test)) {
-    return false;
-  }
-
-  if (!skcms_ApproximatelyEqualProfiles(&profile_test, &profile)) {
-    return false;
-  }
-
-  return true;
-}
-
-Status DetectTransferFunction(const skcms_ICCProfile& profile,
-                              ColorEncoding* JXL_RESTRICT c) {
-  JXL_ENSURE(c->color_space != ColorSpace::kXYB);
-
-  float gamma[3] = {};
-  if (profile.has_trc) {
-    const auto IsGamma = [](const skcms_TransferFunction& tf) {
-      return tf.a == 1 && tf.b == 0 &&
-             /* if b and d are zero, it is fine for c not to be */ tf.d == 0 &&
-             tf.e == 0 && tf.f == 0;
-    };
-    for (int i = 0; i < 3; ++i) {
-      if (profile.trc[i].table_entries == 0 &&
-          IsGamma(profile.trc->parametric)) {
-        gamma[i] = 1.f / profile.trc->parametric.g;
-      } else {
-        skcms_TransferFunction approximate_tf;
-        float max_error;
-        if (skcms_ApproximateCurve(&profile.trc[i], &approximate_tf,
-                                   &max_error)) {
-          if (IsGamma(approximate_tf)) {
-            gamma[i] = 1.f / approximate_tf.g;
-          }
-        }
-      }
-    }
-  }
-  if (gamma[0] != 0 && std::abs(gamma[0] - gamma[1]) < 1e-4f &&
-      std::abs(gamma[1] - gamma[2]) < 1e-4f) {
-    if (c->tf.SetGamma(gamma[0])) {
-      if (IsApproximatelyEqual(profile, *c)) return true;
-    }
-  }
-
-  for (TransferFunction tf : Values<TransferFunction>()) {
-    // Can only create profile from known transfer function.
-    if (tf == TransferFunction::kUnknown) continue;
-    c->tf.SetTransferFunction(tf);
-    if (IsApproximatelyEqual(profile, *c)) return true;
-  }
-
-  c->tf.SetTransferFunction(TransferFunction::kUnknown);
-  return true;
-}
-
-#else  // JPEGXL_ENABLE_SKCMS
-
-uint32_t Type32(const ColorEncoding& c, bool cmyk) {
-  if (cmyk) return TYPE_CMYK_FLT;
-  if (c.color_space == ColorSpace::kGray) return TYPE_GRAY_FLT;
-  return TYPE_RGB_FLT;
-}
-
-uint32_t Type64(const ColorEncoding& c) {
-  if (c.color_space == ColorSpace::kGray) return TYPE_GRAY_DBL;
-  return TYPE_RGB_DBL;
-}
-
-ColorSpace ColorSpaceFromProfile(const Profile& profile) {
-  switch (cmsGetColorSpace(profile.get())) {
-    case cmsSigRgbData:
-    case cmsSigCmykData:
-      return ColorSpace::kRGB;
-    case cmsSigGrayData:
-      return ColorSpace::kGray;
-    default:
-      return ColorSpace::kUnknown;
-  }
-}
-
-// "profile1" is pre-decoded to save time in DetectTransferFunction.
-Status ProfileEquivalentToICC(const cmsContext context, const Profile& profile1,
-                              const IccBytes& icc, const ColorEncoding& c) {
-  const uint32_t type_src = Type64(c);
-
-  Profile profile2;
-  JXL_RETURN_IF_ERROR(DecodeProfile(context, Bytes(icc), &profile2));
-
-  Profile profile_xyz;
-  JXL_RETURN_IF_ERROR(CreateProfileXYZ(context, &profile_xyz));
-
-  const uint32_t intent = INTENT_RELATIVE_COLORIMETRIC;
-  const uint32_t flags = cmsFLAGS_NOOPTIMIZE | cmsFLAGS_BLACKPOINTCOMPENSATION |
-                         cmsFLAGS_HIGHRESPRECALC;
-  Transform xform1(cmsCreateTransformTHR(context, profile1.get(), type_src,
-                                         profile_xyz.get(), TYPE_XYZ_DBL,
-                                         intent, flags));
-  Transform xform2(cmsCreateTransformTHR(context, profile2.get(), type_src,
-                                         profile_xyz.get(), TYPE_XYZ_DBL,
-                                         intent, flags));
-  if (xform1 == nullptr || xform2 == nullptr) {
-    return JXL_FAILURE("Failed to create transform");
-  }
-
-  double in[3];
-  double out1[3];
-  double out2[3];
-
-  // Uniformly spaced samples from very dark to almost fully bright.
-  const double init = 1E-3;
-  const double step = 0.2;
-
-  if (c.color_space == ColorSpace::kGray) {
-    // Finer sampling and replicate each component.
-    for (in[0] = init; in[0] < 1.0; in[0] += step / 8) {
-      cmsDoTransform(xform1.get(), in, out1, 1);
-      cmsDoTransform(xform2.get(), in, out2, 1);
-      if (!cms::ApproxEq(out1[0], out2[0], 2E-4)) {
-        return false;
-      }
-    }
-  } else {
-    for (in[0] = init; in[0] < 1.0; in[0] += step) {
-      for (in[1] = init; in[1] < 1.0; in[1] += step) {
-        for (in[2] = init; in[2] < 1.0; in[2] += step) {
-          cmsDoTransform(xform1.get(), in, out1, 1);
-          cmsDoTransform(xform2.get(), in, out2, 1);
-          for (size_t i = 0; i < 3; ++i) {
-            if (!cms::ApproxEq(out1[i], out2[i], 2E-4)) {
-              return false;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  return true;
-}
-
-// Returns white point that was specified when creating the profile.
-// NOTE: we can't just use cmsSigMediaWhitePointTag because its interpretation
-// differs between ICC versions.
-JXL_MUST_USE_RESULT cmsCIEXYZ UnadaptedWhitePoint(const cmsContext context,
-                                                  const Profile& profile,
-                                                  const ColorEncoding& c) {
-  const cmsCIEXYZ* white_point = static_cast<const cmsCIEXYZ*>(
-      cmsReadTag(profile.get(), cmsSigMediaWhitePointTag));
-  if (white_point != nullptr &&
-      cmsReadTag(profile.get(), cmsSigChromaticAdaptationTag) == nullptr) {
-    // No chromatic adaptation matrix: the white point is already unadapted.
-    return *white_point;
-  }
-
-  cmsCIEXYZ XYZ = {1.0, 1.0, 1.0};
-  Profile profile_xyz;
-  if (!CreateProfileXYZ(context, &profile_xyz)) return XYZ;
-  // Array arguments are one per profile.
-  cmsHPROFILE profiles[2] = {profile.get(), profile_xyz.get()};
-  // Leave white point unchanged - that is what we're trying to extract.
-  cmsUInt32Number intents[2] = {INTENT_ABSOLUTE_COLORIMETRIC,
-                                INTENT_ABSOLUTE_COLORIMETRIC};
-  cmsBool black_compensation[2] = {0, 0};
-  cmsFloat64Number adaption[2] = {0.0, 0.0};
-  // Only transforming a single pixel, so skip expensive optimizations.
-  cmsUInt32Number flags = cmsFLAGS_NOOPTIMIZE | cmsFLAGS_HIGHRESPRECALC;
-  Transform xform(cmsCreateExtendedTransform(
-      context, 2, profiles, black_compensation, intents, adaption, nullptr, 0,
-      Type64(c), TYPE_XYZ_DBL, flags));
-  if (!xform) return XYZ;  // TODO(lode): return error
-
-  // xy are relative, so magnitude does not matter if we ignore output Y.
-  const cmsFloat64Number in[3] = {1.0, 1.0, 1.0};
-  cmsDoTransform(xform.get(), in, &XYZ.X, 1);
-  return XYZ;
-}
-
-Status IdentifyPrimaries(const cmsContext context, const Profile& profile,
-                         const cmsCIEXYZ& wp_unadapted, ColorEncoding* c) {
-  if (!c->HasPrimaries()) return true;
-  if (ColorSpaceFromProfile(profile) == ColorSpace::kUnknown) return true;
-
-  // These were adapted to the profile illuminant before storing in the profile.
-  const cmsCIEXYZ* adapted_r = static_cast<const cmsCIEXYZ*>(
-      cmsReadTag(profile.get(), cmsSigRedColorantTag));
-  const cmsCIEXYZ* adapted_g = static_cast<const cmsCIEXYZ*>(
-      cmsReadTag(profile.get(), cmsSigGreenColorantTag));
-  const cmsCIEXYZ* adapted_b = static_cast<const cmsCIEXYZ*>(
-      cmsReadTag(profile.get(), cmsSigBlueColorantTag));
-
-  cmsCIEXYZ converted_rgb[3];
-  if (adapted_r == nullptr || adapted_g == nullptr || adapted_b == nullptr) {
-    // No colorant tag, determine the XYZ coordinates of the primaries by
-    // converting from the colorspace.
-    Profile profile_xyz;
-    if (!CreateProfileXYZ(context, &profile_xyz)) {
-      return JXL_FAILURE("Failed to retrieve colorants");
-    }
-    // Array arguments are one per profile.
-    cmsHPROFILE profiles[2] = {profile.get(), profile_xyz.get()};
-    cmsUInt32Number intents[2] = {INTENT_RELATIVE_COLORIMETRIC,
-                                  INTENT_RELATIVE_COLORIMETRIC};
-    cmsBool black_compensation[2] = {0, 0};
-    cmsFloat64Number adaption[2] = {0.0, 0.0};
-    // Only transforming three pixels, so skip expensive optimizations.
-    cmsUInt32Number flags = cmsFLAGS_NOOPTIMIZE | cmsFLAGS_HIGHRESPRECALC;
-    Transform xform(cmsCreateExtendedTransform(
-        context, 2, profiles, black_compensation, intents, adaption, nullptr, 0,
-        Type64(*c), TYPE_XYZ_DBL, flags));
-    if (!xform) return JXL_FAILURE("Failed to retrieve colorants");
-
-    const cmsFloat64Number in[9] = {1.0, 0.0, 0.0, 0.0, 1.0,
-                                    0.0, 0.0, 0.0, 1.0};
-    cmsDoTransform(xform.get(), in, &converted_rgb->X, 3);
-    adapted_r = &converted_rgb[0];
-    adapted_g = &converted_rgb[1];
-    adapted_b = &converted_rgb[2];
-  }
-
-  // TODO(janwas): no longer assume Bradford and D50.
-  // Undo the chromatic adaptation.
-  const cmsCIEXYZ d50 = D50_XYZ();
-
-  cmsCIEXYZ r, g, b;
-  cmsAdaptToIlluminant(&r, &d50, &wp_unadapted, adapted_r);
-  cmsAdaptToIlluminant(&g, &d50, &wp_unadapted, adapted_g);
-  cmsAdaptToIlluminant(&b, &d50, &wp_unadapted, adapted_b);
-
-  const PrimariesCIExy rgb = {CIExyFromXYZ(r), CIExyFromXYZ(g),
-                              CIExyFromXYZ(b)};
-  return c->SetPrimaries(rgb);
-}
-
-Status DetectTransferFunction(const cmsContext context, const Profile& profile,
-                              ColorEncoding* JXL_RESTRICT c) {
-  JXL_ENSURE(c->color_space != ColorSpace::kXYB);
-
-  float gamma = 0;
-  if (const auto* gray_trc = reinterpret_cast<const cmsToneCurve*>(
-          cmsReadTag(profile.get(), cmsSigGrayTRCTag))) {
-    const double estimated_gamma =
-        cmsEstimateGamma(gray_trc, /*precision=*/1e-4);
-    if (estimated_gamma > 0) {
-      gamma = 1. / estimated_gamma;
-    }
-  } else {
-    float rgb_gamma[3] = {};
-    int i = 0;
-    for (const auto tag :
-         {cmsSigRedTRCTag, cmsSigGreenTRCTag, cmsSigBlueTRCTag}) {
-      if (const auto* trc = reinterpret_cast<const cmsToneCurve*>(
-              cmsReadTag(profile.get(), tag))) {
-        const double estimated_gamma =
-            cmsEstimateGamma(trc, /*precision=*/1e-4);
-        if (estimated_gamma > 0) {
-          rgb_gamma[i] = 1. / estimated_gamma;
-        }
-      }
-      ++i;
-    }
-    if (rgb_gamma[0] != 0 && std::abs(rgb_gamma[0] - rgb_gamma[1]) < 1e-4f &&
-        std::abs(rgb_gamma[1] - rgb_gamma[2]) < 1e-4f) {
-      gamma = rgb_gamma[0];
-    }
-  }
-
-  if (gamma != 0 && c->tf.SetGamma(gamma)) {
-    IccBytes icc_test;
-    if (MaybeCreateProfile(c->ToExternal(), &icc_test) &&
-        ProfileEquivalentToICC(context, profile, icc_test, *c)) {
-      return true;
-    }
-  }
-
-  for (TransferFunction tf : Values<TransferFunction>()) {
-    // Can only create profile from known transfer function.
-    if (tf == TransferFunction::kUnknown) continue;
-
-    c->tf.SetTransferFunction(tf);
-
-    IccBytes icc_test;
-    if (MaybeCreateProfile(c->ToExternal(), &icc_test) &&
-        ProfileEquivalentToICC(context, profile, icc_test, *c)) {
-      return true;
-    }
-  }
-
-  c->tf.SetTransferFunction(TransferFunction::kUnknown);
-  return true;
-}
-
-void ErrorHandler(cmsContext context, cmsUInt32Number code, const char* text) {
-  JXL_WARNING("LCMS error %u: %s", code, text);
-}
-
-// Returns a context for the current thread, creating it if necessary.
-cmsContext GetContext() {
-  static thread_local void* context_;
-  if (context_ == nullptr) {
-    context_ = cmsCreateContext(nullptr, nullptr);
-    JXL_DASSERT(context_ != nullptr);
-
-    cmsSetLogErrorHandlerTHR(static_cast<cmsContext>(context_), &ErrorHandler);
-  }
-  return static_cast<cmsContext>(context_);
-}
-
-#endif  // JPEGXL_ENABLE_SKCMS
-
-Status GetPrimariesLuminances(const ColorEncoding& encoding,
-                              float luminances[3]) {
-  // Explanation:
-  // We know that the three primaries must sum to white:
-  //
-  // [Xr, Xg, Xb;     [1;     [Xw;
-  //  Yr, Yg, Yb;  ×   1;  =   Yw;
-  //  Zr, Zg, Zb]      1]      Zw]
-  //
-  // By noting that X = x·(X+Y+Z), Y = y·(X+Y+Z) and Z = z·(X+Y+Z) (note the
-  // lower case indicating chromaticity), and factoring the totals (X+Y+Z) out
-  // of the left matrix and into the all-ones vector, we get:
-  //
-  // [xr, xg, xb;     [Xr + Yr + Zr;     [Xw;
-  //  yr, yg, yb;  ×   Xg + Yg + Zg;  =   Yw;
-  //  zr, zg, zb]      Xb + Yb + Zb]      Zw]
-  //
-  // Which makes it apparent that we can compute those totals as:
-  //
-  //                  [Xr + Yr + Zr;     inv([xr, xg, xb;      [Xw;
-  //                   Xg + Yg + Zg;  =       yr, yg, yb;   ×   Yw;
-  //                   Xb + Yb + Zb]          zr, zg, zb])      Zw]
-  //
-  // From there, by multiplying each total by its corresponding y, we get Y for
-  // that primary.
-
-  Color white_XYZ;
-  CIExy wp = encoding.GetWhitePoint();
-  JXL_RETURN_IF_ERROR(CIEXYZFromWhiteCIExy(wp.x, wp.y, white_XYZ));
-
-  PrimariesCIExy primaries;
-  JXL_RETURN_IF_ERROR(encoding.GetPrimaries(primaries));
-  Matrix3x3d chromaticities{
-      {{primaries.r.x, primaries.g.x, primaries.b.x},
-       {primaries.r.y, primaries.g.y, primaries.b.y},
-       {1 - primaries.r.x - primaries.r.y, 1 - primaries.g.x - primaries.g.y,
-        1 - primaries.b.x - primaries.b.y}}};
-  JXL_RETURN_IF_ERROR(Inv3x3Matrix(chromaticities));
-  const double ys[3] = {primaries.r.y, primaries.g.y, primaries.b.y};
-  for (size_t i = 0; i < 3; ++i) {
-    luminances[i] = ys[i] * (chromaticities[i][0] * white_XYZ[0] +
-                             chromaticities[i][1] * white_XYZ[1] +
-                             chromaticities[i][2] * white_XYZ[2]);
-  }
-  return true;
-}
-
-Status ApplyHlgOotf(JxlCms* t, float* JXL_RESTRICT buf, size_t xsize,
-                    bool forward) {
-  if (295 <= t->intensity_target && t->intensity_target <= 305) {
-    // The gamma is approximately 1 so this can essentially be skipped.
-    return true;
-  }
-  float gamma = 1.2f * std::pow(1.111f, std::log2(t->intensity_target * 1e-3f));
-  if (!forward) gamma = 1.f / gamma;
-
-  switch (t->hlg_ootf_num_channels) {
-    case 1:
-      for (size_t x = 0; x < xsize; ++x) {
-        buf[x] = std::pow(buf[x], gamma);
-      }
-      break;
-
-    case 3:
-      for (size_t x = 0; x < xsize; x += 3) {
-        const float luminance = buf[x] * t->hlg_ootf_luminances[0] +
-                                buf[x + 1] * t->hlg_ootf_luminances[1] +
-                                buf[x + 2] * t->hlg_ootf_luminances[2];
-        const float ratio = std::pow(luminance, gamma - 1);
-        if (std::isfinite(ratio)) {
-          buf[x] *= ratio;
-          buf[x + 1] *= ratio;
-          buf[x + 2] *= ratio;
-          if (forward && gamma < 1) {
-            // If gamma < 1, the ratio above will be > 1 which can push bright
-            // saturated highlights out of gamut. There are several possible
-            // ways to bring them back in-gamut; this one preserves hue and
-            // saturation at the slight expense of luminance. If !forward, the
-            // previously-applied forward OOTF with gamma > 1 already pushed
-            // those highlights down and we are simply putting them back where
-            // they were so this is not necessary.
-            const float maximum =
-                std::max(buf[x], std::max(buf[x + 1], buf[x + 2]));
-            if (maximum > 1) {
-              const float normalizer = 1.f / maximum;
-              buf[x] *= normalizer;
-              buf[x + 1] *= normalizer;
-              buf[x + 2] *= normalizer;
-            }
-          }
-        }
-      }
-      break;
-
-    default:
-      return JXL_FAILURE("HLG OOTF not implemented for %" PRIuS " channels",
-                         t->hlg_ootf_num_channels);
-  }
-  return true;
-}
-
-bool IsKnownTransferFunction(jxl::cms::TransferFunction tf) {
-  using TF = jxl::cms::TransferFunction;
-  // All but kUnknown
-  return tf == TF::k709 || tf == TF::kLinear || tf == TF::kSRGB ||
-         tf == TF::kPQ || tf == TF::kDCI || tf == TF::kHLG;
-}
-
-constexpr uint8_t kColorPrimariesP3_D65 = 12;
-
-bool IsKnownColorPrimaries(uint8_t color_primaries) {
-  using P = jxl::cms::Primaries;
-  // All but kCustom
-  if (color_primaries == kColorPrimariesP3_D65) return true;
-  const auto p = static_cast<Primaries>(color_primaries);
-  return p == P::kSRGB || p == P::k2100 || p == P::kP3;
-}
-
-bool ApplyCICP(const uint8_t color_primaries,
-               const uint8_t transfer_characteristics,
-               const uint8_t matrix_coefficients, const uint8_t full_range,
-               ColorEncoding* JXL_RESTRICT c) {
-  if (matrix_coefficients != 0) return false;
-  if (full_range != 1) return false;
-
-  const auto primaries = static_cast<Primaries>(color_primaries);
-  const auto tf = static_cast<TransferFunction>(transfer_characteristics);
-  if (!IsKnownTransferFunction(tf)) return false;
-  if (!IsKnownColorPrimaries(color_primaries)) return false;
-  c->color_space = ColorSpace::kRGB;
-  c->tf.SetTransferFunction(tf);
-  if (primaries == Primaries::kP3) {
-    c->white_point = WhitePoint::kDCI;
-    c->primaries = Primaries::kP3;
-  } else if (color_primaries == kColorPrimariesP3_D65) {
-    c->white_point = WhitePoint::kD65;
-    c->primaries = Primaries::kP3;
-  } else {
-    c->white_point = WhitePoint::kD65;
-    c->primaries = primaries;
-  }
-  return true;
-}
-
-JXL_BOOL JxlCmsSetFieldsFromICC(void* user_data, const uint8_t* icc_data,
-                                size_t icc_size, JxlColorEncoding* c,
-                                JXL_BOOL* cmyk) {
-  if (c == nullptr) return JXL_FALSE;
-  if (cmyk == nullptr) return JXL_FALSE;
-
-  *cmyk = JXL_FALSE;
-
-  // In case parsing fails, mark the ColorEncoding as invalid.
-  c->color_space = JXL_COLOR_SPACE_UNKNOWN;
-  c->transfer_function = JXL_TRANSFER_FUNCTION_UNKNOWN;
-
-  if (icc_size == 0) return JXL_FAILURE("Empty ICC profile");
-
-  ColorEncoding c_enc;
-
-#if JPEGXL_ENABLE_SKCMS
-  if (icc_size < 128) {
-    return JXL_FAILURE("ICC file too small");
-  }
-
-  skcms_ICCProfile profile;
-  JXL_RETURN_IF_ERROR(skcms_Parse(icc_data, icc_size, &profile));
-
-  // skcms does not return the rendering intent, so get it from the file. It
-  // should be encoded as big-endian 32-bit integer in bytes 60..63.
-  uint32_t big_endian_rendering_intent = icc_data[67] + (icc_data[66] << 8) +
-                                         (icc_data[65] << 16) +
-                                         (icc_data[64] << 24);
-  // Some files encode rendering intent as little endian, which is not spec
-  // compliant. However we accept those with a warning.
-  uint32_t little_endian_rendering_intent = (icc_data[67] << 24) +
-                                            (icc_data[66] << 16) +
-                                            (icc_data[65] << 8) + icc_data[64];
-  uint32_t candidate_rendering_intent =
-      std::min(big_endian_rendering_intent, little_endian_rendering_intent);
-  if (candidate_rendering_intent != big_endian_rendering_intent) {
-    JXL_WARNING(
-        "Invalid rendering intent bytes: [0x%02X 0x%02X 0x%02X 0x%02X], "
-        "assuming %u was meant",
-        icc_data[64], icc_data[65], icc_data[66], icc_data[67],
-        candidate_rendering_intent);
-  }
-  if (candidate_rendering_intent > 3) {
-    return JXL_FAILURE("Invalid rendering intent %u\n",
-                       candidate_rendering_intent);
-  }
-  // ICC and RenderingIntent have the same values (0..3).
-  c_enc.rendering_intent =
-      static_cast<RenderingIntent>(candidate_rendering_intent);
-
-  if (profile.has_CICP &&
-      ApplyCICP(profile.CICP.color_primaries,
-                profile.CICP.transfer_characteristics,
-                profile.CICP.matrix_coefficients,
-                profile.CICP.video_full_range_flag, &c_enc)) {
-    *c = c_enc.ToExternal();
-    return JXL_TRUE;
-  }
-
-  c_enc.color_space = ColorSpaceFromProfile(profile);
-  *cmyk = TO_JXL_BOOL(profile.data_color_space == skcms_Signature_CMYK);
-
-  CIExy wp_unadapted;
-  JXL_RETURN_IF_ERROR(UnadaptedWhitePoint(profile, &wp_unadapted));
-  JXL_RETURN_IF_ERROR(c_enc.SetWhitePoint(wp_unadapted));
-
-  // Relies on color_space.
-  JXL_RETURN_IF_ERROR(IdentifyPrimaries(profile, wp_unadapted, &c_enc));
-
-  // Relies on color_space/white point/primaries being set already.
-  JXL_RETURN_IF_ERROR(DetectTransferFunction(profile, &c_enc));
-#else  // JPEGXL_ENABLE_SKCMS
-
-  const cmsContext context = GetContext();
-
-  Profile profile;
-  JXL_RETURN_IF_ERROR(
-      DecodeProfile(context, Bytes(icc_data, icc_size), &profile));
-
-  const cmsUInt32Number rendering_intent32 =
-      cmsGetHeaderRenderingIntent(profile.get());
-  if (rendering_intent32 > 3) {
-    return JXL_FAILURE("Invalid rendering intent %u\n", rendering_intent32);
-  }
-  // ICC and RenderingIntent have the same values (0..3).
-  c_enc.rendering_intent = static_cast<RenderingIntent>(rendering_intent32);
-
-  static constexpr size_t kCICPSize = 12;
-  static constexpr auto kCICPSignature =
-      static_cast<cmsTagSignature>(0x63696370);
-  uint8_t cicp_buffer[kCICPSize];
-  if (cmsReadRawTag(profile.get(), kCICPSignature, cicp_buffer, kCICPSize) ==
-          kCICPSize &&
-      ApplyCICP(cicp_buffer[8], cicp_buffer[9], cicp_buffer[10],
-                cicp_buffer[11], &c_enc)) {
-    *c = c_enc.ToExternal();
-    return JXL_TRUE;
-  }
-
-  c_enc.color_space = ColorSpaceFromProfile(profile);
-  if (cmsGetColorSpace(profile.get()) == cmsSigCmykData) {
-    *cmyk = JXL_TRUE;
-    *c = c_enc.ToExternal();
-    return JXL_TRUE;
-  }
-
-  const cmsCIEXYZ wp_unadapted = UnadaptedWhitePoint(context, profile, c_enc);
-  JXL_RETURN_IF_ERROR(c_enc.SetWhitePoint(CIExyFromXYZ(wp_unadapted)));
-
-  // Relies on color_space.
-  JXL_RETURN_IF_ERROR(
-      IdentifyPrimaries(context, profile, wp_unadapted, &c_enc));
-
-  // Relies on color_space/white point/primaries being set already.
-  JXL_RETURN_IF_ERROR(DetectTransferFunction(context, profile, &c_enc));
-
-#endif  // JPEGXL_ENABLE_SKCMS
-
-  *c = c_enc.ToExternal();
-  return JXL_TRUE;
-}
-
-}  // namespace
-
-namespace {
-
-void JxlCmsDestroy(void* cms_data) {
-  if (cms_data == nullptr) return;
-  JxlCms* t = reinterpret_cast<JxlCms*>(cms_data);
-#if !JPEGXL_ENABLE_SKCMS
-  TransformDeleter()(t->lcms_transform);
-#endif
-  delete t;
-}
-
-void AllocateBuffer(size_t length, size_t num_threads,
-                    std::vector<float>* storage, std::vector<float*>* view) {
-  constexpr size_t kAlign = 128 / sizeof(float);
-  size_t stride = RoundUpTo(length, kAlign);
-  storage->resize(stride * num_threads + kAlign);
-  intptr_t addr = reinterpret_cast<intptr_t>(storage->data());
-  size_t offset =
-      (RoundUpTo(addr, kAlign * sizeof(float)) - addr) / sizeof(float);
-  view->clear();
-  view->reserve(num_threads);
-  for (size_t i = 0; i < num_threads; ++i) {
-    view->emplace_back(storage->data() + offset + i * stride);
-  }
-}
-
-void* JxlCmsInit(void* init_data, size_t num_threads, size_t xsize,
-                 const JxlColorProfile* input, const JxlColorProfile* output,
-                 float intensity_target) {
-  if (init_data == nullptr) {
-    JXL_NOTIFY_ERROR("JxlCmsInit: init_data is nullptr");
-    return nullptr;
-  }
-  const auto* cms = static_cast<const JxlCmsInterface*>(init_data);
-  auto t = jxl::make_unique<JxlCms>();
-  IccBytes icc_src;
-  IccBytes icc_dst;
-  if (input->icc.size == 0) {
-    JXL_NOTIFY_ERROR("JxlCmsInit: empty input ICC");
-    return nullptr;
-  }
-  if (output->icc.size == 0) {
-    JXL_NOTIFY_ERROR("JxlCmsInit: empty OUTPUT ICC");
-    return nullptr;
-  }
-  icc_src.assign(input->icc.data, input->icc.data + input->icc.size);
-  ColorEncoding c_src;
-  if (!c_src.SetFieldsFromICC(std::move(icc_src), *cms)) {
-    JXL_NOTIFY_ERROR("JxlCmsInit: failed to parse input ICC");
-    return nullptr;
-  }
-  icc_dst.assign(output->icc.data, output->icc.data + output->icc.size);
-  ColorEncoding c_dst;
-  if (!c_dst.SetFieldsFromICC(std::move(icc_dst), *cms)) {
-    JXL_NOTIFY_ERROR("JxlCmsInit: failed to parse output ICC");
-    return nullptr;
-  }
-#if JXL_CMS_VERBOSE
-  printf("%s -> %s\n", Description(c_src).c_str(), Description(c_dst).c_str());
-#endif
-
-#if JPEGXL_ENABLE_SKCMS
-  if (!DecodeProfile(input->icc.data, input->icc.size, &t->profile_src)) {
-    JXL_NOTIFY_ERROR("JxlCmsInit: skcms failed to parse input ICC");
-    return nullptr;
-  }
-  if (!DecodeProfile(output->icc.data, output->icc.size, &t->profile_dst)) {
-    JXL_NOTIFY_ERROR("JxlCmsInit: skcms failed to parse output ICC");
-    return nullptr;
-  }
-#else   // JPEGXL_ENABLE_SKCMS
-  const cmsContext context = GetContext();
-  Profile profile_src, profile_dst;
-  if (!DecodeProfile(context, Bytes(c_src.icc), &profile_src)) {
-    JXL_NOTIFY_ERROR("JxlCmsInit: lcms failed to parse input ICC");
-    return nullptr;
-  }
-  if (!DecodeProfile(context, Bytes(c_dst.icc), &profile_dst)) {
-    JXL_NOTIFY_ERROR("JxlCmsInit: lcms failed to parse output ICC");
-    return nullptr;
-  }
-#endif  // JPEGXL_ENABLE_SKCMS
-
-  t->skip_lcms = false;
-  if (c_src.SameColorEncoding(c_dst)) {
-    t->skip_lcms = true;
-#if JXL_CMS_VERBOSE
-    printf("Skip CMS\n");
-#endif
-  }
-
-  t->apply_hlg_ootf = c_src.tf.IsHLG() != c_dst.tf.IsHLG();
-  if (t->apply_hlg_ootf) {
-    const ColorEncoding* c_hlg = c_src.tf.IsHLG() ? &c_src : &c_dst;
-    t->hlg_ootf_num_channels = c_hlg->Channels();
-    if (t->hlg_ootf_num_channels == 3 &&
-        !GetPrimariesLuminances(*c_hlg, t->hlg_ootf_luminances.data())) {
-      JXL_NOTIFY_ERROR(
-          "JxlCmsInit: failed to compute the luminances of primaries");
-      return nullptr;
-    }
-  }
-
-  // Special-case SRGB <=> linear if the primaries / white point are the same,
-  // or any conversion where PQ or HLG is involved:
-  bool src_linear = c_src.tf.IsLinear();
-  const bool dst_linear = c_dst.tf.IsLinear();
-
-  if (c_src.tf.IsPQ() || c_src.tf.IsHLG() ||
-      (c_src.tf.IsSRGB() && dst_linear && c_src.SameColorSpace(c_dst))) {
-    // Construct new profile as if the data were already/still linear.
-    ColorEncoding c_linear_src = c_src;
-    c_linear_src.tf.SetTransferFunction(TransferFunction::kLinear);
-#if JPEGXL_ENABLE_SKCMS
-    skcms_ICCProfile new_src;
-#else   // JPEGXL_ENABLE_SKCMS
-    Profile new_src;
-#endif  // JPEGXL_ENABLE_SKCMS
-        // Only enable ExtraTF if profile creation succeeded.
-    if (MaybeCreateProfile(c_linear_src.ToExternal(), &icc_src) &&
-#if JPEGXL_ENABLE_SKCMS
-        DecodeProfile(icc_src.data(), icc_src.size(), &new_src)) {
-#else   // JPEGXL_ENABLE_SKCMS
-        DecodeProfile(context, Bytes(icc_src), &new_src)) {
-#endif  // JPEGXL_ENABLE_SKCMS
-#if JXL_CMS_VERBOSE
-      printf("Special HLG/PQ/sRGB -> linear\n");
-#endif
-#if JPEGXL_ENABLE_SKCMS
-      t->icc_src = std::move(icc_src);
-      t->profile_src = new_src;
-#else   // JPEGXL_ENABLE_SKCMS
-      profile_src.swap(new_src);
-#endif  // JPEGXL_ENABLE_SKCMS
-      t->preprocess = c_src.tf.IsSRGB()
-                          ? ExtraTF::kSRGB
-                          : (c_src.tf.IsPQ() ? ExtraTF::kPQ : ExtraTF::kHLG);
-      c_src = c_linear_src;
-      src_linear = true;
-    } else {
-      if (t->apply_hlg_ootf) {
-        JXL_NOTIFY_ERROR(
-            "Failed to create extra linear source profile, and HLG OOTF "
-            "required");
-        return nullptr;
-      }
-      JXL_WARNING("Failed to create extra linear destination profile");
-    }
-  }
-
-  if (c_dst.tf.IsPQ() || c_dst.tf.IsHLG() ||
-      (c_dst.tf.IsSRGB() && src_linear && c_src.SameColorSpace(c_dst))) {
-    ColorEncoding c_linear_dst = c_dst;
-    c_linear_dst.tf.SetTransferFunction(TransferFunction::kLinear);
-#if JPEGXL_ENABLE_SKCMS
-    skcms_ICCProfile new_dst;
-#else   // JPEGXL_ENABLE_SKCMS
-    Profile new_dst;
-#endif  // JPEGXL_ENABLE_SKCMS
-    // Only enable ExtraTF if profile creation succeeded.
-    if (MaybeCreateProfile(c_linear_dst.ToExternal(), &icc_dst) &&
-#if JPEGXL_ENABLE_SKCMS
-        DecodeProfile(icc_dst.data(), icc_dst.size(), &new_dst)) {
-#else   // JPEGXL_ENABLE_SKCMS
-        DecodeProfile(context, Bytes(icc_dst), &new_dst)) {
-#endif  // JPEGXL_ENABLE_SKCMS
-#if JXL_CMS_VERBOSE
-      printf("Special linear -> HLG/PQ/sRGB\n");
-#endif
-#if JPEGXL_ENABLE_SKCMS
-      t->icc_dst = std::move(icc_dst);
-      t->profile_dst = new_dst;
-#else   // JPEGXL_ENABLE_SKCMS
-      profile_dst.swap(new_dst);
-#endif  // JPEGXL_ENABLE_SKCMS
-      t->postprocess = c_dst.tf.IsSRGB()
-                           ? ExtraTF::kSRGB
-                           : (c_dst.tf.IsPQ() ? ExtraTF::kPQ : ExtraTF::kHLG);
-      c_dst = c_linear_dst;
-    } else {
-      if (t->apply_hlg_ootf) {
-        JXL_NOTIFY_ERROR(
-            "Failed to create extra linear destination profile, and inverse "
-            "HLG OOTF required");
-        return nullptr;
-      }
-      JXL_WARNING("Failed to create extra linear destination profile");
-    }
-  }
-
-  if (c_src.SameColorEncoding(c_dst)) {
-#if JXL_CMS_VERBOSE
-    printf("Same intermediary linear profiles, skipping CMS\n");
-#endif
-    t->skip_lcms = true;
-  }
-
-#if JPEGXL_ENABLE_SKCMS
-  if (!skcms_MakeUsableAsDestination(&t->profile_dst)) {
-    JXL_NOTIFY_ERROR(
-        "Failed to make %s usable as a color transform destination",
-        ColorEncodingDescription(c_dst.ToExternal()).c_str());
-    return nullptr;
-  }
-#endif  // JPEGXL_ENABLE_SKCMS
-
-  // Not including alpha channel (copied separately).
-  const size_t channels_src = (c_src.cmyk ? 4 : c_src.Channels());
-  const size_t channels_dst = c_dst.Channels();
-#if JXL_CMS_VERBOSE
-  printf("Channels: %" PRIuS "; Threads: %" PRIuS "\n", channels_src,
-         num_threads);
-#endif
-
-#if !JPEGXL_ENABLE_SKCMS
-  // Type includes color space (XYZ vs RGB), so can be different.
-  const uint32_t type_src = Type32(c_src, channels_src == 4);
-  const uint32_t type_dst = Type32(c_dst, false);
-  const uint32_t intent = static_cast<uint32_t>(c_dst.rendering_intent);
-  // Use cmsFLAGS_NOCACHE to disable the 1-pixel cache and make calling
-  // cmsDoTransform() thread-safe.
-  const uint32_t flags = cmsFLAGS_NOCACHE | cmsFLAGS_BLACKPOINTCOMPENSATION |
-                         cmsFLAGS_HIGHRESPRECALC;
-  t->lcms_transform =
-      cmsCreateTransformTHR(context, profile_src.get(), type_src,
-                            profile_dst.get(), type_dst, intent, flags);
-  if (t->lcms_transform == nullptr) {
-    JXL_NOTIFY_ERROR("Failed to create transform");
-    return nullptr;
-  }
-#endif  // !JPEGXL_ENABLE_SKCMS
-
-  // Ideally LCMS would convert directly from External to Image3. However,
-  // cmsDoTransformLineStride only accepts 32-bit BytesPerPlaneIn, whereas our
-  // planes can be more than 4 GiB apart. Hence, transform inputs/outputs must
-  // be interleaved. Calling cmsDoTransform for each pixel is expensive
-  // (indirect call). We therefore transform rows, which requires per-thread
-  // buffers. To avoid separate allocations, we use the rows of an image.
-  // Because LCMS apparently also cannot handle <= 16 bit inputs and 32-bit
-  // outputs (or vice versa), we use floating point input/output.
-  t->channels_src = channels_src;
-  t->channels_dst = channels_dst;
-#if !JPEGXL_ENABLE_SKCMS
-  size_t actual_channels_src = channels_src;
-  size_t actual_channels_dst = channels_dst;
-#else
-  // SkiaCMS doesn't support grayscale float buffers, so we create space for RGB
-  // float buffers anyway.
-  size_t actual_channels_src = (channels_src == 4 ? 4 : 3);
-  size_t actual_channels_dst = 3;
-#endif
-  AllocateBuffer(xsize * actual_channels_src, num_threads, &t->src_storage,
-                 &t->buf_src);
-  AllocateBuffer(xsize * actual_channels_dst, num_threads, &t->dst_storage,
-                 &t->buf_dst);
-  t->intensity_target = intensity_target;
-  return t.release();
-}
-
-float* JxlCmsGetSrcBuf(void* cms_data, size_t thread) {
-  JxlCms* t = reinterpret_cast<JxlCms*>(cms_data);
-  return t->buf_src[thread];
-}
-
-float* JxlCmsGetDstBuf(void* cms_data, size_t thread) {
-  JxlCms* t = reinterpret_cast<JxlCms*>(cms_data);
-  return t->buf_dst[thread];
-}
-
-}  // namespace
-
-extern "C" {
-
-JXL_CMS_EXPORT const JxlCmsInterface* JxlGetDefaultCms() {
-  static constexpr JxlCmsInterface kInterface = {
-      /*set_fields_data=*/nullptr,
-      /*set_fields_from_icc=*/&JxlCmsSetFieldsFromICC,
-      /*init_data=*/const_cast<void*>(static_cast<const void*>(&kInterface)),
-      /*init=*/&JxlCmsInit,
-      /*get_src_buf=*/&JxlCmsGetSrcBuf,
-      /*get_dst_buf=*/&JxlCmsGetDstBuf,
-      /*run=*/&DoColorSpaceTransform,
-      /*destroy=*/&JxlCmsDestroy};
-  return &kInterface;
-}
-
-}  // extern "C"
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/cms/jxl_cms_internal.h b/third_party/jpeg-xl/lib/jxl/cms/jxl_cms_internal.h
deleted file mode 100644
index 152f867ea3571..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/cms/jxl_cms_internal.h
+++ /dev/null
@@ -1,1129 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_CMS_JXL_CMS_INTERNAL_H_
-#define LIB_JXL_CMS_JXL_CMS_INTERNAL_H_
-
-// ICC profiles and color space conversions.
-
-#include <jxl/color_encoding.h>
-
-#include <algorithm>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <string>
-#include <vector>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/matrix_ops.h"
-#include "lib/jxl/base/span.h"  // Bytes
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/cms/opsin_params.h"
-#include "lib/jxl/cms/tone_mapping.h"
-#include "lib/jxl/cms/transfer_functions.h"
-
-#ifndef JXL_ENABLE_3D_ICC_TONEMAPPING
-#define JXL_ENABLE_3D_ICC_TONEMAPPING 1
-#endif
-
-namespace jxl {
-
-enum class ExtraTF {
-  kNone,
-  kPQ,
-  kHLG,
-  kSRGB,
-};
-
-static Status PrimariesToXYZ(float rx, float ry, float gx, float gy, float bx,
-                             float by, float wx, float wy, Matrix3x3& matrix) {
-  bool ok = (wx >= 0) && (wx <= 1) && (wy > 0) && (wy <= 1);
-  if (!ok) {
-    return JXL_FAILURE("Invalid white point");
-  }
-  // TODO(lode): also require rx, ry, gx, gy, bx, to be in range 0-1? ICC
-  // profiles in theory forbid negative XYZ values, but in practice the ACES P0
-  // color space uses a negative y for the blue primary.
-  Matrix3x3 primaries{{{rx, gx, bx},
-                       {ry, gy, by},
-                       {1.0f - rx - ry, 1.0f - gx - gy, 1.0f - bx - by}}};
-  Matrix3x3 primaries_inv;
-  primaries_inv = primaries;
-  JXL_RETURN_IF_ERROR(Inv3x3Matrix(primaries_inv));
-
-  Vector3 w{wx / wy, 1.0f, (1.0f - wx - wy) / wy};
-  // 1 / tiny float can still overflow
-  JXL_RETURN_IF_ERROR(std::isfinite(w[0]) && std::isfinite(w[2]));
-  Vector3 xyz;
-  Mul3x3Vector(primaries_inv, w, xyz);
-
-  Matrix3x3 a{{{xyz[0], 0, 0}, {0, xyz[1], 0}, {0, 0, xyz[2]}}};
-
-  Mul3x3Matrix(primaries, a, matrix);
-  return true;
-}
-
-/* Chromatic adaptation matrices*/
-constexpr Matrix3x3 kBradford{{{0.8951f, 0.2664f, -0.1614f},
-                               {-0.7502f, 1.7135f, 0.0367f},
-                               {0.0389f, -0.0685f, 1.0296f}}};
-constexpr Matrix3x3 kBradfordInv{{{0.9869929f, -0.1470543f, 0.1599627f},
-                                  {0.4323053f, 0.5183603f, 0.0492912f},
-                                  {-0.0085287f, 0.0400428f, 0.9684867f}}};
-
-// Adapts white point x, y to D50
-static Status AdaptToXYZD50(float wx, float wy, Matrix3x3& matrix) {
-  bool ok = (wx >= 0) && (wx <= 1) && (wy > 0) && (wy <= 1);
-  if (!ok) {
-    // Out of range values can cause division through zero
-    // further down with the bradford adaptation too.
-    return JXL_FAILURE("Invalid white point");
-  }
-  Vector3 w{wx / wy, 1.0f, (1.0f - wx - wy) / wy};
-  // 1 / tiny float can still overflow
-  JXL_RETURN_IF_ERROR(std::isfinite(w[0]) && std::isfinite(w[2]));
-  Vector3 w50{0.96422f, 1.0f, 0.82521f};
-
-  Vector3 lms;
-  Vector3 lms50;
-
-  Mul3x3Vector(kBradford, w, lms);
-  Mul3x3Vector(kBradford, w50, lms50);
-
-  if (lms[0] == 0 || lms[1] == 0 || lms[2] == 0) {
-    return JXL_FAILURE("Invalid white point");
-  }
-  Matrix3x3 a{{{lms50[0] / lms[0], 0, 0},
-               {0, lms50[1] / lms[1], 0},
-               {0, 0, lms50[2] / lms[2]}}};
-  if (!std::isfinite(a[0][0]) || !std::isfinite(a[1][1]) ||
-      !std::isfinite(a[2][2])) {
-    return JXL_FAILURE("Invalid white point");
-  }
-
-  Matrix3x3 b;
-  Mul3x3Matrix(a, kBradford, b);
-  Mul3x3Matrix(kBradfordInv, b, matrix);
-
-  return true;
-}
-
-static Status PrimariesToXYZD50(float rx, float ry, float gx, float gy,
-                                float bx, float by, float wx, float wy,
-                                Matrix3x3& matrix) {
-  Matrix3x3 toXYZ;
-  JXL_RETURN_IF_ERROR(PrimariesToXYZ(rx, ry, gx, gy, bx, by, wx, wy, toXYZ));
-  Matrix3x3 d50;
-  JXL_RETURN_IF_ERROR(AdaptToXYZD50(wx, wy, d50));
-
-  Mul3x3Matrix(d50, toXYZ, matrix);
-  return true;
-}
-
-static Status ToneMapPixel(const JxlColorEncoding& c, const float in[3],
-                           uint8_t pcslab_out[3]) {
-  Matrix3x3 primaries_XYZ;
-  JXL_RETURN_IF_ERROR(PrimariesToXYZ(
-      c.primaries_red_xy[0], c.primaries_red_xy[1], c.primaries_green_xy[0],
-      c.primaries_green_xy[1], c.primaries_blue_xy[0], c.primaries_blue_xy[1],
-      c.white_point_xy[0], c.white_point_xy[1], primaries_XYZ));
-  const Vector3 luminances = primaries_XYZ[1];
-  Color linear;
-  JxlTransferFunction tf = c.transfer_function;
-  if (tf == JXL_TRANSFER_FUNCTION_PQ) {
-    for (size_t i = 0; i < 3; ++i) {
-      linear[i] = TF_PQ_Base::DisplayFromEncoded(
-          /*display_intensity_target=*/10000.0, in[i]);
-    }
-  } else {
-    for (size_t i = 0; i < 3; ++i) {
-      linear[i] = TF_HLG_Base::DisplayFromEncoded(in[i]);
-    }
-  }
-  if (tf == JXL_TRANSFER_FUNCTION_PQ) {
-    Rec2408ToneMapperBase tone_mapper({0.0f, 10000.0f}, {0.0f, 250.0f},
-                                      luminances);
-    tone_mapper.ToneMap(linear);
-  } else {
-    HlgOOTF_Base ootf(/*source_luminance=*/300, /*target_luminance=*/80,
-                      luminances);
-    ootf.Apply(linear);
-  }
-  GamutMapScalar(linear, luminances,
-                 /*preserve_saturation=*/0.3f);
-
-  Matrix3x3 chad;
-  JXL_RETURN_IF_ERROR(
-      AdaptToXYZD50(c.white_point_xy[0], c.white_point_xy[1], chad));
-  Matrix3x3 to_xyzd50;
-  Mul3x3Matrix(chad, primaries_XYZ, to_xyzd50);
-
-  Vector3 xyz{0, 0, 0};
-  for (size_t xyz_c = 0; xyz_c < 3; ++xyz_c) {
-    for (size_t rgb_c = 0; rgb_c < 3; ++rgb_c) {
-      xyz[xyz_c] += linear[rgb_c] * to_xyzd50[xyz_c][rgb_c];
-    }
-  }
-
-  const auto lab_f = [](const float x) {
-    static constexpr float kDelta = 6. / 29;
-    return x <= kDelta * kDelta * kDelta
-               ? x * (1 / (3 * kDelta * kDelta)) + 4.f / 29
-               : std::cbrt(x);
-  };
-  static constexpr float kXn = 0.964212;
-  static constexpr float kYn = 1;
-  static constexpr float kZn = 0.825188;
-
-  const float f_x = lab_f(xyz[0] / kXn);
-  const float f_y = lab_f(xyz[1] / kYn);
-  const float f_z = lab_f(xyz[2] / kZn);
-
-  pcslab_out[0] = static_cast<uint8_t>(
-      std::lroundf(255.f * Clamp1(1.16f * f_y - .16f, 0.f, 1.f)));
-  pcslab_out[1] = static_cast<uint8_t>(
-      std::lroundf(128.f + Clamp1(500 * (f_x - f_y), -128.f, 127.f)));
-  pcslab_out[2] = static_cast<uint8_t>(
-      std::lroundf(128.f + Clamp1(200 * (f_y - f_z), -128.f, 127.f)));
-
-  return true;
-}
-
-template <size_t N, ExtraTF tf>
-static std::vector<uint16_t> CreateTableCurve(bool tone_map) {
-  // The generated PQ curve will make room for highlights up to this luminance.
-  // TODO(sboukortt): make this variable?
-  static constexpr float kPQIntensityTarget = 10000;
-
-  static_assert(N <= 4096);  // ICC MFT2 only allows 4K entries
-  static_assert(tf == ExtraTF::kPQ || tf == ExtraTF::kHLG);
-
-  static constexpr Vector3 kLuminances{1.f / 3, 1.f / 3, 1.f / 3};
-  Rec2408ToneMapperBase tone_mapper(
-      {0.0f, kPQIntensityTarget}, {0.0f, kDefaultIntensityTarget}, kLuminances);
-  // No point using float - LCMS converts to 16-bit for A2B/MFT.
-  std::vector<uint16_t> table(N);
-  for (uint32_t i = 0; i < N; ++i) {
-    const float x = static_cast<float>(i) / (N - 1);  // 1.0 at index N - 1.
-    const double dx = static_cast<double>(x);
-    // LCMS requires EOTF (e.g. 2.4 exponent).
-    double y = (tf == ExtraTF::kHLG)
-                   ? TF_HLG_Base::DisplayFromEncoded(dx)
-                   : TF_PQ_Base::DisplayFromEncoded(kPQIntensityTarget, dx);
-    if (tone_map && tf == ExtraTF::kPQ &&
-        kPQIntensityTarget > kDefaultIntensityTarget) {
-      float l = y * 10000 / kPQIntensityTarget;
-      Color gray{l, l, l};
-      tone_mapper.ToneMap(gray);
-      y = gray[0];
-    }
-    JXL_DASSERT(y >= 0.0);
-    // Clamp to table range - necessary for HLG.
-    y = Clamp1(y, 0.0, 1.0);
-    // 1.0 corresponds to table value 0xFFFF.
-    table[i] = static_cast<uint16_t>(roundf(y * 65535.0));
-  }
-  return table;
-}
-
-static Status CIEXYZFromWhiteCIExy(double wx, double wy, Color& XYZ) {
-  // Target Y = 1.
-  if (std::abs(wy) < 1e-12) return JXL_FAILURE("Y value is too small");
-  const float factor = 1 / wy;
-  XYZ[0] = wx * factor;
-  XYZ[1] = 1;
-  XYZ[2] = (1 - wx - wy) * factor;
-  return true;
-}
-
-namespace detail {
-
-constexpr bool kEnable3DToneMapping = JXL_ENABLE_3D_ICC_TONEMAPPING;
-
-static bool CanToneMap(const JxlColorEncoding& encoding) {
-  // If the color space cannot be represented by a CICP tag in the ICC profile
-  // then the rest of the profile must unambiguously identify it; we have less
-  // freedom to do use it for tone mapping.
-  JxlTransferFunction tf = encoding.transfer_function;
-  JxlPrimaries p = encoding.primaries;
-  JxlWhitePoint wp = encoding.white_point;
-  return encoding.color_space == JXL_COLOR_SPACE_RGB &&
-         (tf == JXL_TRANSFER_FUNCTION_PQ || tf == JXL_TRANSFER_FUNCTION_HLG) &&
-         ((p == JXL_PRIMARIES_P3 &&
-           (wp == JXL_WHITE_POINT_D65 || wp == JXL_WHITE_POINT_DCI)) ||
-          (p != JXL_PRIMARIES_CUSTOM && wp == JXL_WHITE_POINT_D65));
-}
-
-static void ICCComputeMD5(const std::vector<uint8_t>& data, uint8_t sum[16])
-    JXL_NO_SANITIZE("unsigned-integer-overflow") {
-  std::vector<uint8_t> data64 = data;
-  data64.push_back(128);
-  // Add bytes such that ((size + 8) & 63) == 0.
-  size_t extra = ((64 - ((data64.size() + 8) & 63)) & 63);
-  data64.resize(data64.size() + extra, 0);
-  for (uint64_t i = 0; i < 64; i += 8) {
-    data64.push_back(static_cast<uint64_t>(data.size() << 3u) >> i);
-  }
-
-  static const uint32_t sineparts[64] = {
-      0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee, 0xf57c0faf, 0x4787c62a,
-      0xa8304613, 0xfd469501, 0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be,
-      0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821, 0xf61e2562, 0xc040b340,
-      0x265e5a51, 0xe9b6c7aa, 0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8,
-      0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed, 0xa9e3e905, 0xfcefa3f8,
-      0x676f02d9, 0x8d2a4c8a, 0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c,
-      0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70, 0x289b7ec6, 0xeaa127fa,
-      0xd4ef3085, 0x04881d05, 0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665,
-      0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039, 0x655b59c3, 0x8f0ccc92,
-      0xffeff47d, 0x85845dd1, 0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1,
-      0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391,
-  };
-  static const uint32_t shift[64] = {
-      7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22,
-      5, 9,  14, 20, 5, 9,  14, 20, 5, 9,  14, 20, 5, 9,  14, 20,
-      4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23,
-      6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21,
-  };
-
-  uint32_t a0 = 0x67452301;
-  uint32_t b0 = 0xefcdab89;
-  uint32_t c0 = 0x98badcfe;
-  uint32_t d0 = 0x10325476;
-
-  for (size_t i = 0; i < data64.size(); i += 64) {
-    uint32_t a = a0;
-    uint32_t b = b0;
-    uint32_t c = c0;
-    uint32_t d = d0;
-    uint32_t f;
-    uint32_t g;
-    for (size_t j = 0; j < 64; j++) {
-      if (j < 16) {
-        f = (b & c) | ((~b) & d);
-        g = j;
-      } else if (j < 32) {
-        f = (d & b) | ((~d) & c);
-        g = (5 * j + 1) & 0xf;
-      } else if (j < 48) {
-        f = b ^ c ^ d;
-        g = (3 * j + 5) & 0xf;
-      } else {
-        f = c ^ (b | (~d));
-        g = (7 * j) & 0xf;
-      }
-      uint32_t dg0 = data64[i + g * 4 + 0];
-      uint32_t dg1 = data64[i + g * 4 + 1];
-      uint32_t dg2 = data64[i + g * 4 + 2];
-      uint32_t dg3 = data64[i + g * 4 + 3];
-      uint32_t u = dg0 | (dg1 << 8u) | (dg2 << 16u) | (dg3 << 24u);
-      f += a + sineparts[j] + u;
-      a = d;
-      d = c;
-      c = b;
-      b += (f << shift[j]) | (f >> (32u - shift[j]));
-    }
-    a0 += a;
-    b0 += b;
-    c0 += c;
-    d0 += d;
-  }
-  sum[0] = a0;
-  sum[1] = a0 >> 8u;
-  sum[2] = a0 >> 16u;
-  sum[3] = a0 >> 24u;
-  sum[4] = b0;
-  sum[5] = b0 >> 8u;
-  sum[6] = b0 >> 16u;
-  sum[7] = b0 >> 24u;
-  sum[8] = c0;
-  sum[9] = c0 >> 8u;
-  sum[10] = c0 >> 16u;
-  sum[11] = c0 >> 24u;
-  sum[12] = d0;
-  sum[13] = d0 >> 8u;
-  sum[14] = d0 >> 16u;
-  sum[15] = d0 >> 24u;
-}
-
-static Status CreateICCChadMatrix(double wx, double wy, Matrix3x3& result) {
-  Matrix3x3 m;
-  if (wy == 0) {  // WhitePoint can not be pitch-black.
-    return JXL_FAILURE("Invalid WhitePoint");
-  }
-  JXL_RETURN_IF_ERROR(AdaptToXYZD50(wx, wy, m));
-  result = m;
-  return true;
-}
-
-// Creates RGB to XYZ matrix given RGB primaries and white point in xy.
-static Status CreateICCRGBMatrix(double rx, double ry, double gx, double gy,
-                                 double bx, double by, double wx, double wy,
-                                 Matrix3x3& result) {
-  Matrix3x3 m;
-  JXL_RETURN_IF_ERROR(PrimariesToXYZD50(rx, ry, gx, gy, bx, by, wx, wy, m));
-  result = m;
-  return true;
-}
-
-static void WriteICCUint32(uint32_t value, size_t pos,
-                           std::vector<uint8_t>* icc) {
-  if (icc->size() < pos + 4) icc->resize(pos + 4);
-  (*icc)[pos + 0] = (value >> 24u) & 255;
-  (*icc)[pos + 1] = (value >> 16u) & 255;
-  (*icc)[pos + 2] = (value >> 8u) & 255;
-  (*icc)[pos + 3] = value & 255;
-}
-
-static void WriteICCUint16(uint16_t value, size_t pos,
-                           std::vector<uint8_t>* icc) {
-  if (icc->size() < pos + 2) icc->resize(pos + 2);
-  (*icc)[pos + 0] = (value >> 8u) & 255;
-  (*icc)[pos + 1] = value & 255;
-}
-
-static void WriteICCUint8(uint8_t value, size_t pos,
-                          std::vector<uint8_t>* icc) {
-  if (icc->size() < pos + 1) icc->resize(pos + 1);
-  (*icc)[pos] = value;
-}
-
-// Writes a 4-character tag
-static void WriteICCTag(const char* value, size_t pos,
-                        std::vector<uint8_t>* icc) {
-  if (icc->size() < pos + 4) icc->resize(pos + 4);
-  memcpy(icc->data() + pos, value, 4);
-}
-
-static Status WriteICCS15Fixed16(float value, size_t pos,
-                                 std::vector<uint8_t>* icc) {
-  // "nextafterf" for 32768.0f towards zero are:
-  // 32767.998046875, 32767.99609375, 32767.994140625
-  // Even the first value works well,...
-  bool ok = (-32767.995f <= value) && (value <= 32767.995f);
-  if (!ok) return JXL_FAILURE("ICC value is out of range / NaN");
-  int32_t i = static_cast<int32_t>(std::lround(value * 65536.0f));
-  // Use two's complement
-  uint32_t u = static_cast<uint32_t>(i);
-  WriteICCUint32(u, pos, icc);
-  return true;
-}
-
-static Status CreateICCHeader(const JxlColorEncoding& c,
-                              std::vector<uint8_t>* header) {
-  // TODO(lode): choose color management engine name, e.g. "skia" if
-  // integrated in skia.
-  static const char* kCmm = "jxl ";
-
-  header->resize(128, 0);
-
-  WriteICCUint32(0, 0, header);  // size, correct value filled in at end
-  WriteICCTag(kCmm, 4, header);
-  WriteICCUint32(0x04400000u, 8, header);
-  const char* profile_type =
-      c.color_space == JXL_COLOR_SPACE_XYB ? "scnr" : "mntr";
-  WriteICCTag(profile_type, 12, header);
-  WriteICCTag(c.color_space == JXL_COLOR_SPACE_GRAY ? "GRAY" : "RGB ", 16,
-              header);
-  if (kEnable3DToneMapping && CanToneMap(c)) {
-    // We are going to use a 3D LUT for tone mapping, which will be more compact
-    // with an 8-bit LUT to CIELAB than with a 16-bit LUT to XYZ. 8-bit XYZ
-    // would not be viable due to XYZ being linear, whereas it is fine with
-    // CIELAB's ~cube root.
-    WriteICCTag("Lab ", 20, header);
-  } else {
-    WriteICCTag("XYZ ", 20, header);
-  }
-
-  // Three uint32_t's date/time encoding.
-  // TODO(lode): encode actual date and time, this is a placeholder
-  uint32_t year = 2019;
-  uint32_t month = 12;
-  uint32_t day = 1;
-  uint32_t hour = 0;
-  uint32_t minute = 0;
-  uint32_t second = 0;
-  WriteICCUint16(year, 24, header);
-  WriteICCUint16(month, 26, header);
-  WriteICCUint16(day, 28, header);
-  WriteICCUint16(hour, 30, header);
-  WriteICCUint16(minute, 32, header);
-  WriteICCUint16(second, 34, header);
-
-  WriteICCTag("acsp", 36, header);
-  WriteICCTag("APPL", 40, header);
-  WriteICCUint32(0, 44, header);  // flags
-  WriteICCUint32(0, 48, header);  // device manufacturer
-  WriteICCUint32(0, 52, header);  // device model
-  WriteICCUint32(0, 56, header);  // device attributes
-  WriteICCUint32(0, 60, header);  // device attributes
-  WriteICCUint32(static_cast<uint32_t>(c.rendering_intent), 64, header);
-
-  // Mandatory D50 white point of profile connection space
-  WriteICCUint32(0x0000f6d6, 68, header);
-  WriteICCUint32(0x00010000, 72, header);
-  WriteICCUint32(0x0000d32d, 76, header);
-
-  WriteICCTag(kCmm, 80, header);
-
-  return true;
-}
-
-static void AddToICCTagTable(const char* tag, size_t offset, size_t size,
-                             std::vector<uint8_t>* tagtable,
-                             std::vector<size_t>* offsets) {
-  WriteICCTag(tag, tagtable->size(), tagtable);
-  // writing true offset deferred to later
-  WriteICCUint32(0, tagtable->size(), tagtable);
-  offsets->push_back(offset);
-  WriteICCUint32(size, tagtable->size(), tagtable);
-}
-
-static void FinalizeICCTag(std::vector<uint8_t>* tags, size_t* offset,
-                           size_t* size) {
-  while ((tags->size() & 3) != 0) {
-    tags->push_back(0);
-  }
-  *offset += *size;
-  *size = tags->size() - *offset;
-}
-
-// The input text must be ASCII, writing other characters to UTF-16 is not
-// implemented.
-static void CreateICCMlucTag(const std::string& text,
-                             std::vector<uint8_t>* tags) {
-  WriteICCTag("mluc", tags->size(), tags);
-  WriteICCUint32(0, tags->size(), tags);
-  WriteICCUint32(1, tags->size(), tags);
-  WriteICCUint32(12, tags->size(), tags);
-  WriteICCTag("enUS", tags->size(), tags);
-  WriteICCUint32(text.size() * 2, tags->size(), tags);
-  WriteICCUint32(28, tags->size(), tags);
-  for (char c : text) {
-    tags->push_back(0);  // prepend 0 for UTF-16
-    tags->push_back(c);
-  }
-}
-
-static Status CreateICCXYZTag(const Color& xyz, std::vector<uint8_t>* tags) {
-  WriteICCTag("XYZ ", tags->size(), tags);
-  WriteICCUint32(0, tags->size(), tags);
-  for (size_t i = 0; i < 3; ++i) {
-    JXL_RETURN_IF_ERROR(WriteICCS15Fixed16(xyz[i], tags->size(), tags));
-  }
-  return true;
-}
-
-static Status CreateICCChadTag(const Matrix3x3& chad,
-                               std::vector<uint8_t>* tags) {
-  WriteICCTag("sf32", tags->size(), tags);
-  WriteICCUint32(0, tags->size(), tags);
-  for (size_t j = 0; j < 3; j++) {
-    for (size_t i = 0; i < 3; i++) {
-      JXL_RETURN_IF_ERROR(WriteICCS15Fixed16(chad[j][i], tags->size(), tags));
-    }
-  }
-  return true;
-}
-
-static void MaybeCreateICCCICPTag(const JxlColorEncoding& c,
-                                  std::vector<uint8_t>* tags, size_t* offset,
-                                  size_t* size, std::vector<uint8_t>* tagtable,
-                                  std::vector<size_t>* offsets) {
-  if (c.color_space != JXL_COLOR_SPACE_RGB) {
-    return;
-  }
-  uint8_t primaries = 0;
-  if (c.primaries == JXL_PRIMARIES_P3) {
-    if (c.white_point == JXL_WHITE_POINT_D65) {
-      primaries = 12;
-    } else if (c.white_point == JXL_WHITE_POINT_DCI) {
-      primaries = 11;
-    } else {
-      return;
-    }
-  } else if (c.primaries != JXL_PRIMARIES_CUSTOM &&
-             c.white_point == JXL_WHITE_POINT_D65) {
-    primaries = static_cast<uint8_t>(c.primaries);
-  } else {
-    return;
-  }
-  JxlTransferFunction tf = c.transfer_function;
-  if (tf == JXL_TRANSFER_FUNCTION_UNKNOWN ||
-      tf == JXL_TRANSFER_FUNCTION_GAMMA) {
-    return;
-  }
-  WriteICCTag("cicp", tags->size(), tags);
-  WriteICCUint32(0, tags->size(), tags);
-  WriteICCUint8(primaries, tags->size(), tags);
-  WriteICCUint8(static_cast<uint8_t>(tf), tags->size(), tags);
-  // Matrix
-  WriteICCUint8(0, tags->size(), tags);
-  // Full range
-  WriteICCUint8(1, tags->size(), tags);
-  FinalizeICCTag(tags, offset, size);
-  AddToICCTagTable("cicp", *offset, *size, tagtable, offsets);
-}
-
-static void CreateICCCurvCurvTag(const std::vector<uint16_t>& curve,
-                                 std::vector<uint8_t>* tags) {
-  size_t pos = tags->size();
-  tags->resize(tags->size() + 12 + curve.size() * 2, 0);
-  WriteICCTag("curv", pos, tags);
-  WriteICCUint32(0, pos + 4, tags);
-  WriteICCUint32(curve.size(), pos + 8, tags);
-  for (size_t i = 0; i < curve.size(); i++) {
-    WriteICCUint16(curve[i], pos + 12 + i * 2, tags);
-  }
-}
-
-// Writes 12 + 4*params.size() bytes
-static Status CreateICCCurvParaTag(const std::vector<float>& params,
-                                   size_t curve_type,
-                                   std::vector<uint8_t>* tags) {
-  WriteICCTag("para", tags->size(), tags);
-  WriteICCUint32(0, tags->size(), tags);
-  WriteICCUint16(curve_type, tags->size(), tags);
-  WriteICCUint16(0, tags->size(), tags);
-  for (float param : params) {
-    JXL_RETURN_IF_ERROR(WriteICCS15Fixed16(param, tags->size(), tags));
-  }
-  return true;
-}
-
-static Status CreateICCLutAtoBTagForXYB(std::vector<uint8_t>* tags) {
-  WriteICCTag("mAB ", tags->size(), tags);
-  // 4 reserved bytes set to 0
-  WriteICCUint32(0, tags->size(), tags);
-  // number of input channels
-  WriteICCUint8(3, tags->size(), tags);
-  // number of output channels
-  WriteICCUint8(3, tags->size(), tags);
-  // 2 reserved bytes for padding
-  WriteICCUint16(0, tags->size(), tags);
-  // offset to first B curve
-  WriteICCUint32(32, tags->size(), tags);
-  // offset to matrix
-  WriteICCUint32(244, tags->size(), tags);
-  // offset to first M curve
-  WriteICCUint32(148, tags->size(), tags);
-  // offset to CLUT
-  WriteICCUint32(80, tags->size(), tags);
-  // offset to first A curve
-  // (reuse linear B curves)
-  WriteICCUint32(32, tags->size(), tags);
-
-  // offset = 32
-  // no-op curves
-  JXL_RETURN_IF_ERROR(CreateICCCurvParaTag({1.0f}, 0, tags));
-  JXL_RETURN_IF_ERROR(CreateICCCurvParaTag({1.0f}, 0, tags));
-  JXL_RETURN_IF_ERROR(CreateICCCurvParaTag({1.0f}, 0, tags));
-  // offset = 80
-  // number of grid points for each input channel
-  for (int i = 0; i < 16; ++i) {
-    WriteICCUint8(i < 3 ? 2 : 0, tags->size(), tags);
-  }
-  // precision = 2
-  WriteICCUint8(2, tags->size(), tags);
-  // 3 bytes of padding
-  WriteICCUint8(0, tags->size(), tags);
-  WriteICCUint16(0, tags->size(), tags);
-  // 2*2*2*3 entries of 2 bytes each = 48 bytes
-  const jxl::cms::ColorCube3D& cube = jxl::cms::UnscaledA2BCube();
-  for (size_t ix = 0; ix < 2; ++ix) {
-    for (size_t iy = 0; iy < 2; ++iy) {
-      for (size_t ib = 0; ib < 2; ++ib) {
-        const jxl::cms::ColorCube0D& out_f = cube[ix][iy][ib];
-        for (int i = 0; i < 3; ++i) {
-          int32_t val = static_cast<int32_t>(std::lroundf(65535 * out_f[i]));
-          JXL_DASSERT(val >= 0 && val <= 65535);
-          WriteICCUint16(val, tags->size(), tags);
-        }
-      }
-    }
-  }
-  // offset = 148
-  // 3 curves with 5 parameters = 3 * (12 + 5 * 4) = 96 bytes
-  for (size_t i = 0; i < 3; ++i) {
-    const float b = -jxl::cms::kXYBOffset[i] -
-                    std::cbrt(jxl::cms::kNegOpsinAbsorbanceBiasRGB[i]);
-    std::vector<float> params = {
-        3,
-        1.0f / jxl::cms::kXYBScale[i],
-        b,
-        0,                                           // unused
-        std::max(0.f, -b * jxl::cms::kXYBScale[i]),  // make skcms happy
-    };
-    JXL_RETURN_IF_ERROR(CreateICCCurvParaTag(params, 3, tags));
-  }
-  // offset = 244
-  const double matrix[] = {1.5170095, -1.1065225, 0.071623,
-                           -0.050022, 0.5683655,  -0.018344,
-                           -1.387676, 1.1145555,  0.6857255};
-  // 12 * 4 = 48 bytes
-  for (double v : matrix) {
-    JXL_RETURN_IF_ERROR(WriteICCS15Fixed16(v, tags->size(), tags));
-  }
-  for (size_t i = 0; i < 3; ++i) {
-    float intercept = 0;
-    for (size_t j = 0; j < 3; ++j) {
-      intercept += matrix[i * 3 + j] * jxl::cms::kNegOpsinAbsorbanceBiasRGB[j];
-    }
-    JXL_RETURN_IF_ERROR(WriteICCS15Fixed16(intercept, tags->size(), tags));
-  }
-  return true;
-}
-
-static Status CreateICCLutAtoBTagForHDR(JxlColorEncoding c,
-                                        std::vector<uint8_t>* tags) {
-  static constexpr size_t k3DLutDim = 9;
-  WriteICCTag("mft1", tags->size(), tags);
-  // 4 reserved bytes set to 0
-  WriteICCUint32(0, tags->size(), tags);
-  // number of input channels
-  WriteICCUint8(3, tags->size(), tags);
-  // number of output channels
-  WriteICCUint8(3, tags->size(), tags);
-  // number of CLUT grid points
-  WriteICCUint8(k3DLutDim, tags->size(), tags);
-  // 1 reserved bytes for padding
-  WriteICCUint8(0, tags->size(), tags);
-
-  // Matrix (per specification, must be identity if input is not XYZ)
-  for (size_t i = 0; i < 3; ++i) {
-    for (size_t j = 0; j < 3; ++j) {
-      JXL_RETURN_IF_ERROR(
-          WriteICCS15Fixed16(i == j ? 1.f : 0.f, tags->size(), tags));
-    }
-  }
-
-  // Input tables
-  for (size_t c = 0; c < 3; ++c) {
-    for (size_t i = 0; i < 256; ++i) {
-      WriteICCUint8(i, tags->size(), tags);
-    }
-  }
-
-  for (size_t ix = 0; ix < k3DLutDim; ++ix) {
-    for (size_t iy = 0; iy < k3DLutDim; ++iy) {
-      for (size_t ib = 0; ib < k3DLutDim; ++ib) {
-        float f[3] = {ix * (1.0f / (k3DLutDim - 1)),
-                      iy * (1.0f / (k3DLutDim - 1)),
-                      ib * (1.0f / (k3DLutDim - 1))};
-        uint8_t pcslab_out[3];
-        JXL_RETURN_IF_ERROR(ToneMapPixel(c, f, pcslab_out));
-        for (uint8_t val : pcslab_out) {
-          WriteICCUint8(val, tags->size(), tags);
-        }
-      }
-    }
-  }
-
-  // Output tables
-  for (size_t c = 0; c < 3; ++c) {
-    for (size_t i = 0; i < 256; ++i) {
-      WriteICCUint8(i, tags->size(), tags);
-    }
-  }
-
-  return true;
-}
-
-// Some software (Apple Safari, Preview) requires this.
-static Status CreateICCNoOpBToATag(std::vector<uint8_t>* tags) {
-  WriteICCTag("mBA ", tags->size(), tags);  // notypo
-  // 4 reserved bytes set to 0
-  WriteICCUint32(0, tags->size(), tags);
-  // number of input channels
-  WriteICCUint8(3, tags->size(), tags);
-  // number of output channels
-  WriteICCUint8(3, tags->size(), tags);
-  // 2 reserved bytes for padding
-  WriteICCUint16(0, tags->size(), tags);
-  // offset to first B curve
-  WriteICCUint32(32, tags->size(), tags);
-  // offset to matrix
-  WriteICCUint32(0, tags->size(), tags);
-  // offset to first M curve
-  WriteICCUint32(0, tags->size(), tags);
-  // offset to CLUT
-  WriteICCUint32(0, tags->size(), tags);
-  // offset to first A curve
-  WriteICCUint32(0, tags->size(), tags);
-
-  JXL_RETURN_IF_ERROR(CreateICCCurvParaTag({1.0f}, 0, tags));
-  JXL_RETURN_IF_ERROR(CreateICCCurvParaTag({1.0f}, 0, tags));
-  JXL_RETURN_IF_ERROR(CreateICCCurvParaTag({1.0f}, 0, tags));
-
-  return true;
-}
-
-// These strings are baked into Description - do not change.
-
-static std::string ToString(JxlColorSpace color_space) {
-  switch (color_space) {
-    case JXL_COLOR_SPACE_RGB:
-      return "RGB";
-    case JXL_COLOR_SPACE_GRAY:
-      return "Gra";
-    case JXL_COLOR_SPACE_XYB:
-      return "XYB";
-    case JXL_COLOR_SPACE_UNKNOWN:
-      return "CS?";
-    default:
-      // Should not happen - visitor fails if enum is invalid.
-      JXL_DEBUG_ABORT("Invalid ColorSpace %u",
-                      static_cast<uint32_t>(color_space));
-      return "Invalid";
-  }
-}
-
-static std::string ToString(JxlWhitePoint white_point) {
-  switch (white_point) {
-    case JXL_WHITE_POINT_D65:
-      return "D65";
-    case JXL_WHITE_POINT_CUSTOM:
-      return "Cst";
-    case JXL_WHITE_POINT_E:
-      return "EER";
-    case JXL_WHITE_POINT_DCI:
-      return "DCI";
-    default:
-      // Should not happen - visitor fails if enum is invalid.
-      JXL_DEBUG_ABORT("Invalid WhitePoint %u",
-                      static_cast<uint32_t>(white_point));
-      return "Invalid";
-  }
-}
-
-static std::string ToString(JxlPrimaries primaries) {
-  switch (primaries) {
-    case JXL_PRIMARIES_SRGB:
-      return "SRG";
-    case JXL_PRIMARIES_2100:
-      return "202";
-    case JXL_PRIMARIES_P3:
-      return "DCI";
-    case JXL_PRIMARIES_CUSTOM:
-      return "Cst";
-    default:
-      // Should not happen - visitor fails if enum is invalid.
-      JXL_DEBUG_ABORT("Invalid Primaries %u", static_cast<uint32_t>(primaries));
-      return "Invalid";
-  }
-}
-
-static std::string ToString(JxlTransferFunction transfer_function) {
-  switch (transfer_function) {
-    case JXL_TRANSFER_FUNCTION_SRGB:
-      return "SRG";
-    case JXL_TRANSFER_FUNCTION_LINEAR:
-      return "Lin";
-    case JXL_TRANSFER_FUNCTION_709:
-      return "709";
-    case JXL_TRANSFER_FUNCTION_PQ:
-      return "PeQ";
-    case JXL_TRANSFER_FUNCTION_HLG:
-      return "HLG";
-    case JXL_TRANSFER_FUNCTION_DCI:
-      return "DCI";
-    case JXL_TRANSFER_FUNCTION_UNKNOWN:
-      return "TF?";
-    case JXL_TRANSFER_FUNCTION_GAMMA:
-      JXL_DEBUG_ABORT("Invalid TransferFunction: gamma");
-      return "Invalid";
-    default:
-      // Should not happen - visitor fails if enum is invalid.
-      JXL_DEBUG_ABORT("Invalid TransferFunction %u",
-                      static_cast<uint32_t>(transfer_function));
-      return "Invalid";
-  }
-}
-
-static std::string ToString(JxlRenderingIntent rendering_intent) {
-  switch (rendering_intent) {
-    case JXL_RENDERING_INTENT_PERCEPTUAL:
-      return "Per";
-    case JXL_RENDERING_INTENT_RELATIVE:
-      return "Rel";
-    case JXL_RENDERING_INTENT_SATURATION:
-      return "Sat";
-    case JXL_RENDERING_INTENT_ABSOLUTE:
-      return "Abs";
-  }
-  // Should not happen - visitor fails if enum is invalid.
-  JXL_DEBUG_ABORT("Invalid RenderingIntent %u",
-                  static_cast<uint32_t>(rendering_intent));
-  return "Invalid";
-}
-
-static std::string ColorEncodingDescriptionImpl(const JxlColorEncoding& c) {
-  if (c.color_space == JXL_COLOR_SPACE_RGB &&
-      c.white_point == JXL_WHITE_POINT_D65) {
-    if (c.rendering_intent == JXL_RENDERING_INTENT_PERCEPTUAL &&
-        c.transfer_function == JXL_TRANSFER_FUNCTION_SRGB) {
-      if (c.primaries == JXL_PRIMARIES_SRGB) return "sRGB";
-      if (c.primaries == JXL_PRIMARIES_P3) return "DisplayP3";
-    }
-    if (c.rendering_intent == JXL_RENDERING_INTENT_RELATIVE &&
-        c.primaries == JXL_PRIMARIES_2100) {
-      if (c.transfer_function == JXL_TRANSFER_FUNCTION_PQ) return "Rec2100PQ";
-      if (c.transfer_function == JXL_TRANSFER_FUNCTION_HLG) return "Rec2100HLG";
-    }
-  }
-
-  std::string d = ToString(c.color_space);
-
-  bool explicit_wp_tf = (c.color_space != JXL_COLOR_SPACE_XYB);
-  if (explicit_wp_tf) {
-    d += '_';
-    if (c.white_point == JXL_WHITE_POINT_CUSTOM) {
-      d += jxl::ToString(c.white_point_xy[0]) + ';';
-      d += jxl::ToString(c.white_point_xy[1]);
-    } else {
-      d += ToString(c.white_point);
-    }
-  }
-
-  if ((c.color_space != JXL_COLOR_SPACE_GRAY) &&
-      (c.color_space != JXL_COLOR_SPACE_XYB)) {
-    d += '_';
-    if (c.primaries == JXL_PRIMARIES_CUSTOM) {
-      d += jxl::ToString(c.primaries_red_xy[0]) + ';';
-      d += jxl::ToString(c.primaries_red_xy[1]) + ';';
-      d += jxl::ToString(c.primaries_green_xy[0]) + ';';
-      d += jxl::ToString(c.primaries_green_xy[1]) + ';';
-      d += jxl::ToString(c.primaries_blue_xy[0]) + ';';
-      d += jxl::ToString(c.primaries_blue_xy[1]);
-    } else {
-      d += ToString(c.primaries);
-    }
-  }
-
-  d += '_';
-  d += ToString(c.rendering_intent);
-
-  if (explicit_wp_tf) {
-    JxlTransferFunction tf = c.transfer_function;
-    d += '_';
-    if (tf == JXL_TRANSFER_FUNCTION_GAMMA) {
-      d += 'g';
-      d += jxl::ToString(c.gamma);
-    } else {
-      d += ToString(tf);
-    }
-  }
-  return d;
-}
-
-static Status MaybeCreateProfileImpl(const JxlColorEncoding& c,
-                                     std::vector<uint8_t>* icc) {
-  std::vector<uint8_t> header;
-  std::vector<uint8_t> tagtable;
-  std::vector<uint8_t> tags;
-  JxlTransferFunction tf = c.transfer_function;
-  if (c.color_space == JXL_COLOR_SPACE_UNKNOWN ||
-      tf == JXL_TRANSFER_FUNCTION_UNKNOWN) {
-    return false;  // Not an error
-  }
-
-  switch (c.color_space) {
-    case JXL_COLOR_SPACE_RGB:
-    case JXL_COLOR_SPACE_GRAY:
-    case JXL_COLOR_SPACE_XYB:
-      break;  // OK
-    default:
-      return JXL_FAILURE("Invalid CS %u",
-                         static_cast<unsigned int>(c.color_space));
-  }
-
-  if (c.color_space == JXL_COLOR_SPACE_XYB &&
-      c.rendering_intent != JXL_RENDERING_INTENT_PERCEPTUAL) {
-    return JXL_FAILURE(
-        "Only perceptual rendering intent implemented for XYB "
-        "ICC profile.");
-  }
-
-  JXL_RETURN_IF_ERROR(CreateICCHeader(c, &header));
-
-  std::vector<size_t> offsets;
-  // tag count, deferred to later
-  WriteICCUint32(0, tagtable.size(), &tagtable);
-
-  size_t tag_offset = 0;
-  size_t tag_size = 0;
-
-  CreateICCMlucTag(ColorEncodingDescriptionImpl(c), &tags);
-  FinalizeICCTag(&tags, &tag_offset, &tag_size);
-  AddToICCTagTable("desc", tag_offset, tag_size, &tagtable, &offsets);
-
-  const std::string copyright = "CC0";
-  CreateICCMlucTag(copyright, &tags);
-  FinalizeICCTag(&tags, &tag_offset, &tag_size);
-  AddToICCTagTable("cprt", tag_offset, tag_size, &tagtable, &offsets);
-
-  // TODO(eustas): isn't it the other way round: gray image has d50 WhitePoint?
-  if (c.color_space == JXL_COLOR_SPACE_GRAY) {
-    Color wtpt;
-    JXL_RETURN_IF_ERROR(
-        CIEXYZFromWhiteCIExy(c.white_point_xy[0], c.white_point_xy[1], wtpt));
-    JXL_RETURN_IF_ERROR(CreateICCXYZTag(wtpt, &tags));
-  } else {
-    Color d50{0.964203, 1.0, 0.824905};
-    JXL_RETURN_IF_ERROR(CreateICCXYZTag(d50, &tags));
-  }
-  FinalizeICCTag(&tags, &tag_offset, &tag_size);
-  AddToICCTagTable("wtpt", tag_offset, tag_size, &tagtable, &offsets);
-
-  if (c.color_space != JXL_COLOR_SPACE_GRAY) {
-    // Chromatic adaptation matrix
-    Matrix3x3 chad;
-    JXL_RETURN_IF_ERROR(
-        CreateICCChadMatrix(c.white_point_xy[0], c.white_point_xy[1], chad));
-
-    JXL_RETURN_IF_ERROR(CreateICCChadTag(chad, &tags));
-    FinalizeICCTag(&tags, &tag_offset, &tag_size);
-    AddToICCTagTable("chad", tag_offset, tag_size, &tagtable, &offsets);
-  }
-
-  if (c.color_space == JXL_COLOR_SPACE_RGB) {
-    MaybeCreateICCCICPTag(c, &tags, &tag_offset, &tag_size, &tagtable,
-                          &offsets);
-
-    Matrix3x3 m;
-    JXL_RETURN_IF_ERROR(CreateICCRGBMatrix(
-        c.primaries_red_xy[0], c.primaries_red_xy[1], c.primaries_green_xy[0],
-        c.primaries_green_xy[1], c.primaries_blue_xy[0], c.primaries_blue_xy[1],
-        c.white_point_xy[0], c.white_point_xy[1], m));
-    Color r{m[0][0], m[1][0], m[2][0]};
-    Color g{m[0][1], m[1][1], m[2][1]};
-    Color b{m[0][2], m[1][2], m[2][2]};
-
-    JXL_RETURN_IF_ERROR(CreateICCXYZTag(r, &tags));
-    FinalizeICCTag(&tags, &tag_offset, &tag_size);
-    AddToICCTagTable("rXYZ", tag_offset, tag_size, &tagtable, &offsets);
-
-    JXL_RETURN_IF_ERROR(CreateICCXYZTag(g, &tags));
-    FinalizeICCTag(&tags, &tag_offset, &tag_size);
-    AddToICCTagTable("gXYZ", tag_offset, tag_size, &tagtable, &offsets);
-
-    JXL_RETURN_IF_ERROR(CreateICCXYZTag(b, &tags));
-    FinalizeICCTag(&tags, &tag_offset, &tag_size);
-    AddToICCTagTable("bXYZ", tag_offset, tag_size, &tagtable, &offsets);
-  }
-
-  if (c.color_space == JXL_COLOR_SPACE_XYB) {
-    JXL_RETURN_IF_ERROR(CreateICCLutAtoBTagForXYB(&tags));
-    FinalizeICCTag(&tags, &tag_offset, &tag_size);
-    AddToICCTagTable("A2B0", tag_offset, tag_size, &tagtable, &offsets);
-    JXL_RETURN_IF_ERROR(CreateICCNoOpBToATag(&tags));
-    FinalizeICCTag(&tags, &tag_offset, &tag_size);
-    AddToICCTagTable("B2A0", tag_offset, tag_size, &tagtable, &offsets);
-  } else if (kEnable3DToneMapping && CanToneMap(c)) {
-    JXL_RETURN_IF_ERROR(CreateICCLutAtoBTagForHDR(c, &tags));
-    FinalizeICCTag(&tags, &tag_offset, &tag_size);
-    AddToICCTagTable("A2B0", tag_offset, tag_size, &tagtable, &offsets);
-    JXL_RETURN_IF_ERROR(CreateICCNoOpBToATag(&tags));
-    FinalizeICCTag(&tags, &tag_offset, &tag_size);
-    AddToICCTagTable("B2A0", tag_offset, tag_size, &tagtable, &offsets);
-  } else {
-    if (tf == JXL_TRANSFER_FUNCTION_GAMMA) {
-      float gamma = 1.0 / c.gamma;
-      JXL_RETURN_IF_ERROR(CreateICCCurvParaTag({gamma}, 0, &tags));
-    } else if (c.color_space != JXL_COLOR_SPACE_XYB) {
-      switch (tf) {
-        case JXL_TRANSFER_FUNCTION_HLG:
-          CreateICCCurvCurvTag(
-              CreateTableCurve<64, ExtraTF::kHLG>(CanToneMap(c)), &tags);
-          break;
-        case JXL_TRANSFER_FUNCTION_PQ:
-          CreateICCCurvCurvTag(
-              CreateTableCurve<64, ExtraTF::kPQ>(CanToneMap(c)), &tags);
-          break;
-        case JXL_TRANSFER_FUNCTION_SRGB:
-          JXL_RETURN_IF_ERROR(CreateICCCurvParaTag(
-              {2.4, 1.0 / 1.055, 0.055 / 1.055, 1.0 / 12.92, 0.04045}, 3,
-              &tags));
-          break;
-        case JXL_TRANSFER_FUNCTION_709:
-          JXL_RETURN_IF_ERROR(CreateICCCurvParaTag(
-              {1.0 / 0.45, 1.0 / 1.099, 0.099 / 1.099, 1.0 / 4.5, 0.081}, 3,
-              &tags));
-          break;
-        case JXL_TRANSFER_FUNCTION_LINEAR:
-          JXL_RETURN_IF_ERROR(
-              CreateICCCurvParaTag({1.0, 1.0, 0.0, 1.0, 0.0}, 3, &tags));
-          break;
-        case JXL_TRANSFER_FUNCTION_DCI:
-          JXL_RETURN_IF_ERROR(
-              CreateICCCurvParaTag({2.6, 1.0, 0.0, 1.0, 0.0}, 3, &tags));
-          break;
-        default:
-          return JXL_UNREACHABLE("unknown TF %u",
-                                 static_cast<unsigned int>(tf));
-      }
-    }
-    FinalizeICCTag(&tags, &tag_offset, &tag_size);
-    if (c.color_space == JXL_COLOR_SPACE_GRAY) {
-      AddToICCTagTable("kTRC", tag_offset, tag_size, &tagtable, &offsets);
-    } else {
-      AddToICCTagTable("rTRC", tag_offset, tag_size, &tagtable, &offsets);
-      AddToICCTagTable("gTRC", tag_offset, tag_size, &tagtable, &offsets);
-      AddToICCTagTable("bTRC", tag_offset, tag_size, &tagtable, &offsets);
-    }
-  }
-
-  // Tag count
-  WriteICCUint32(offsets.size(), 0, &tagtable);
-  for (size_t i = 0; i < offsets.size(); i++) {
-    WriteICCUint32(offsets[i] + header.size() + tagtable.size(), 4 + 12 * i + 4,
-                   &tagtable);
-  }
-
-  // ICC profile size
-  WriteICCUint32(header.size() + tagtable.size() + tags.size(), 0, &header);
-
-  *icc = header;
-  Bytes(tagtable).AppendTo(*icc);
-  Bytes(tags).AppendTo(*icc);
-
-  // The MD5 checksum must be computed on the profile with profile flags,
-  // rendering intent, and region of the checksum itself, set to 0.
-  // TODO(lode): manually verify with a reliable tool that this creates correct
-  // signature (profile id) for ICC profiles.
-  std::vector<uint8_t> icc_sum = *icc;
-  if (icc_sum.size() >= 64 + 4) {
-    memset(icc_sum.data() + 44, 0, 4);
-    memset(icc_sum.data() + 64, 0, 4);
-  }
-  uint8_t checksum[16];
-  detail::ICCComputeMD5(icc_sum, checksum);
-
-  memcpy(icc->data() + 84, checksum, sizeof(checksum));
-
-  return true;
-}
-
-}  // namespace detail
-
-// Returns a representation of the ColorEncoding fields (not icc).
-// Example description: "RGB_D65_SRG_Rel_Lin"
-static JXL_MAYBE_UNUSED std::string ColorEncodingDescription(
-    const JxlColorEncoding& c) {
-  return detail::ColorEncodingDescriptionImpl(c);
-}
-
-// NOTE: for XYB colorspace, the created profile can be used to transform a
-// *scaled* XYB image (created by ScaleXYB()) to another colorspace.
-static JXL_MAYBE_UNUSED Status MaybeCreateProfile(const JxlColorEncoding& c,
-                                                  std::vector<uint8_t>* icc) {
-  return detail::MaybeCreateProfileImpl(c, icc);
-}
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_CMS_JXL_CMS_INTERNAL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/cms/opsin_params.h b/third_party/jpeg-xl/lib/jxl/cms/opsin_params.h
deleted file mode 100644
index 0af852c745f9b..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/cms/opsin_params.h
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_CMS_OPSIN_PARAMS_H_
-#define LIB_JXL_CMS_OPSIN_PARAMS_H_
-
-#include <array>
-#include <cstddef>
-
-#include "lib/jxl/base/matrix_ops.h"
-
-// Constants that define the XYB color space.
-
-namespace jxl {
-namespace cms {
-
-// Parameters for opsin absorbance.
-constexpr float kM02 = 0.078f;
-constexpr float kM00 = 0.30f;
-constexpr float kM01 = 1.0f - kM02 - kM00;
-
-constexpr float kM12 = 0.078f;
-constexpr float kM10 = 0.23f;
-constexpr float kM11 = 1.0f - kM12 - kM10;
-
-constexpr float kM20 = 0.24342268924547819f;
-constexpr float kM21 = 0.20476744424496821f;
-constexpr float kM22 = 1.0f - kM20 - kM21;
-
-constexpr float kBScale = 1.0f;
-constexpr float kYToBRatio = 1.0f;  // works better with 0.50017729543783418
-constexpr float kBToYRatio = 1.0f / kYToBRatio;
-
-constexpr float kOpsinAbsorbanceBias0 = 0.0037930732552754493f;
-constexpr float kOpsinAbsorbanceBias1 = kOpsinAbsorbanceBias0;
-constexpr float kOpsinAbsorbanceBias2 = kOpsinAbsorbanceBias0;
-
-// Opsin absorbance matrix is now frozen.
-constexpr Matrix3x3 kOpsinAbsorbanceMatrix{
-    {{kM00, kM01, kM02}, {kM10, kM11, kM12}, {kM20, kM21, kM22}}};
-
-constexpr Matrix3x3 kDefaultInverseOpsinAbsorbanceMatrix{
-    {{11.031566901960783f, -9.866943921568629f, -0.16462299647058826f},
-     {-3.254147380392157f, 4.418770392156863f, -0.16462299647058826f},
-     {-3.6588512862745097f, 2.7129230470588235f, 1.9459282392156863f}}};
-
-// Must be the inverse matrix of kOpsinAbsorbanceMatrix and match the spec.
-static inline const Matrix3x3& DefaultInverseOpsinAbsorbanceMatrix() {
-  return kDefaultInverseOpsinAbsorbanceMatrix;
-}
-
-constexpr Vector3 kOpsinAbsorbanceBias = {
-    kOpsinAbsorbanceBias0,
-    kOpsinAbsorbanceBias1,
-    kOpsinAbsorbanceBias2,
-};
-
-constexpr std::array<float, 4> kNegOpsinAbsorbanceBiasRGB = {
-    -kOpsinAbsorbanceBias0, -kOpsinAbsorbanceBias1, -kOpsinAbsorbanceBias2,
-    1.0f};
-
-constexpr float kScaledXYBOffset0 = 0.015386134f;
-constexpr float kScaledXYBOffset1 = 0.0f;
-constexpr float kScaledXYBOffset2 = 0.27770459f;
-
-constexpr Vector3 kScaledXYBOffset = {kScaledXYBOffset0, kScaledXYBOffset1,
-                                      kScaledXYBOffset2};
-
-constexpr float kScaledXYBScale0 = 22.995788804f;
-constexpr float kScaledXYBScale1 = 1.183000077f;
-constexpr float kScaledXYBScale2 = 1.502141333f;
-
-constexpr Vector3 kScaledXYBScale = {
-    kScaledXYBScale0,
-    kScaledXYBScale1,
-    kScaledXYBScale2,
-};
-
-// NB(eustas): following function/variable names are just "namos".
-
-// More precise calculation of 1 / ((1 / r1) + (1 / r2))
-constexpr float ReciprocialSum(float r1, float r2) {
-  return (r1 * r2) / (r1 + r2);
-}
-
-constexpr float kXYBOffset0 = kScaledXYBOffset0 + kScaledXYBOffset1;
-constexpr float kXYBOffset1 =
-    kScaledXYBOffset1 - kScaledXYBOffset0 + (1.0f / kScaledXYBScale0);
-constexpr float kXYBOffset2 = kScaledXYBOffset1 + kScaledXYBOffset2;
-
-constexpr std::array<float, 3> kXYBOffset = {kXYBOffset0, kXYBOffset1,
-                                             kXYBOffset2};
-
-constexpr float kXYBScale0 = ReciprocialSum(kScaledXYBScale0, kScaledXYBScale1);
-constexpr float kXYBScale1 = ReciprocialSum(kScaledXYBScale0, kScaledXYBScale1);
-constexpr float kXYBScale2 = ReciprocialSum(kScaledXYBScale1, kScaledXYBScale2);
-
-constexpr std::array<float, 3> kXYBScale = {kXYBScale0, kXYBScale1, kXYBScale2};
-
-template <size_t idx>
-constexpr float ScaledXYBScale() {
-  return (idx == 0)   ? kScaledXYBScale0
-         : (idx == 1) ? kScaledXYBScale1
-                      : kScaledXYBScale2;
-}
-
-template <size_t idx>
-constexpr float ScaledXYBOffset() {
-  return (idx == 0)   ? kScaledXYBOffset0
-         : (idx == 1) ? kScaledXYBOffset1
-                      : kScaledXYBOffset2;
-}
-
-template <size_t x, size_t y, size_t b, size_t idx>
-constexpr float XYBCorner() {
-  return (((idx == 0)   ? x
-           : (idx == 1) ? y
-                        : b) /
-          ScaledXYBScale<idx>()) -
-         ScaledXYBOffset<idx>();
-}
-
-template <size_t x, size_t y, size_t b, size_t idx>
-constexpr float ScaledA2BCorner() {
-  return (idx == 0)   ? (XYBCorner<x, y, b, 1>() + XYBCorner<x, y, b, 0>())
-         : (idx == 1) ? (XYBCorner<x, y, b, 1>() - XYBCorner<x, y, b, 0>())
-                      : (XYBCorner<x, y, b, 2>() + XYBCorner<x, y, b, 1>());
-}
-
-typedef std::array<float, 3> ColorCube0D;
-template <size_t x, size_t y, size_t b>
-constexpr ColorCube0D UnscaledA2BCorner() {
-  return {(ScaledA2BCorner<x, y, b, 0>() + kXYBOffset0) * kXYBScale0,
-          (ScaledA2BCorner<x, y, b, 1>() + kXYBOffset1) * kXYBScale1,
-          (ScaledA2BCorner<x, y, b, 2>() + kXYBOffset2) * kXYBScale2};
-}
-
-typedef std::array<ColorCube0D, 2> ColorCube1D;
-template <size_t x, size_t y>
-constexpr ColorCube1D UnscaledA2BCubeXY() {
-  return {UnscaledA2BCorner<x, y, 0>(), UnscaledA2BCorner<x, y, 1>()};
-}
-
-typedef std::array<ColorCube1D, 2> ColorCube2D;
-template <size_t x>
-constexpr ColorCube2D UnscaledA2BCubeX() {
-  return {UnscaledA2BCubeXY<x, 0>(), UnscaledA2BCubeXY<x, 1>()};
-}
-
-typedef std::array<ColorCube2D, 2> ColorCube3D;
-constexpr ColorCube3D UnscaledA2BCube() {
-  return {UnscaledA2BCubeX<0>(), UnscaledA2BCubeX<1>()};
-}
-
-constexpr ColorCube3D kUnscaledA2BCube = UnscaledA2BCube();
-
-}  // namespace cms
-}  // namespace jxl
-
-#endif  // LIB_JXL_CMS_OPSIN_PARAMS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/cms/tone_mapping-inl.h b/third_party/jpeg-xl/lib/jxl/cms/tone_mapping-inl.h
deleted file mode 100644
index 7d09beed32bae..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/cms/tone_mapping-inl.h
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#if defined(LIB_JXL_CMS_TONE_MAPPING_INL_H_) == defined(HWY_TARGET_TOGGLE)
-#ifdef LIB_JXL_CMS_TONE_MAPPING_INL_H_
-#undef LIB_JXL_CMS_TONE_MAPPING_INL_H_
-#else
-#define LIB_JXL_CMS_TONE_MAPPING_INL_H_
-#endif
-
-#include <hwy/highway.h>
-
-#include "lib/jxl/cms/tone_mapping.h"
-#include "lib/jxl/cms/transfer_functions-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-namespace {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Clamp;
-using hwy::HWY_NAMESPACE::Max;
-using hwy::HWY_NAMESPACE::ZeroIfNegative;
-
-template <typename D>
-class Rec2408ToneMapper : Rec2408ToneMapperBase {
- private:
-  using V = hwy::HWY_NAMESPACE::Vec<D>;
-
- public:
-  using Rec2408ToneMapperBase::Rec2408ToneMapperBase;
-
-  void ToneMap(V* red, V* green, V* blue) const {
-    const V luminance = Mul(Set(df_, source_range_.second),
-                            (MulAdd(Set(df_, red_Y_), *red,
-                                    MulAdd(Set(df_, green_Y_), *green,
-                                           Mul(Set(df_, blue_Y_), *blue)))));
-    const V pq_mastering_min = Set(df_, pq_mastering_min_);
-    const V inv_pq_mastering_range = Set(df_, inv_pq_mastering_range_);
-    const V normalized_pq = Min(
-        Set(df_, 1.f),
-        Mul(Sub(InvEOTF(luminance), pq_mastering_min), inv_pq_mastering_range));
-    const V ks = Set(df_, ks_);
-    const V e2 =
-        IfThenElse(Lt(normalized_pq, ks), normalized_pq, P(normalized_pq));
-    const V one_minus_e2 = Sub(Set(df_, 1), e2);
-    const V one_minus_e2_2 = Mul(one_minus_e2, one_minus_e2);
-    const V one_minus_e2_4 = Mul(one_minus_e2_2, one_minus_e2_2);
-    const V b = Set(df_, min_lum_);
-    const V e3 = MulAdd(b, one_minus_e2_4, e2);
-    const V pq_mastering_range = Set(df_, pq_mastering_range_);
-    const V e4 = MulAdd(e3, pq_mastering_range, pq_mastering_min);
-    const V new_luminance =
-        Min(Set(df_, target_range_.second),
-            ZeroIfNegative(tf_pq_.DisplayFromEncoded(df_, e4)));
-    const V min_luminance = Set(df_, 1e-6f);
-    const auto use_cap = Le(luminance, min_luminance);
-    const V ratio = Div(new_luminance, Max(luminance, min_luminance));
-    const V cap = Mul(new_luminance, Set(df_, inv_target_peak_));
-    const V normalizer = Set(df_, normalizer_);
-    const V multiplier = Mul(ratio, normalizer);
-    for (V* const val : {red, green, blue}) {
-      *val = IfThenElse(use_cap, cap, Mul(*val, multiplier));
-    }
-  }
-
- private:
-  V InvEOTF(const V luminance) const {
-    return tf_pq_.EncodedFromDisplay(df_, luminance);
-  }
-  V T(const V a) const {
-    const V ks = Set(df_, ks_);
-    const V inv_one_minus_ks = Set(df_, inv_one_minus_ks_);
-    return Mul(Sub(a, ks), inv_one_minus_ks);
-  }
-  V P(const V b) const {
-    const V t_b = T(b);
-    const V t_b_2 = Mul(t_b, t_b);
-    const V t_b_3 = Mul(t_b_2, t_b);
-    const V ks = Set(df_, ks_);
-    const V max_lum = Set(df_, max_lum_);
-    return MulAdd(
-        MulAdd(Set(df_, 2), t_b_3, MulAdd(Set(df_, -3), t_b_2, Set(df_, 1))),
-        ks,
-        MulAdd(Add(t_b_3, MulAdd(Set(df_, -2), t_b_2, t_b)),
-               Sub(Set(df_, 1), ks),
-               Mul(MulAdd(Set(df_, -2), t_b_3, Mul(Set(df_, 3), t_b_2)),
-                   max_lum)));
-  }
-
-  D df_;
-  const TF_PQ tf_pq_ = TF_PQ(/*display_intensity_target=*/1.0);
-};
-
-class HlgOOTF : HlgOOTF_Base {
- public:
-  using HlgOOTF_Base::HlgOOTF_Base;
-
-  static HlgOOTF FromSceneLight(float display_luminance,
-                                const Vector3& primaries_luminances) {
-    return HlgOOTF(/*gamma=*/1.2f *
-                       std::pow(1.111f, std::log2(display_luminance / 1000.f)),
-                   primaries_luminances);
-  }
-
-  static HlgOOTF ToSceneLight(float display_luminance,
-                              const Vector3& primaries_luminances) {
-    return HlgOOTF(
-        /*gamma=*/(1 / 1.2f) *
-            std::pow(1.111f, -std::log2(display_luminance / 1000.f)),
-        primaries_luminances);
-  }
-
-  template <typename V>
-  void Apply(V* red, V* green, V* blue) const {
-    hwy::HWY_NAMESPACE::DFromV<V> df;
-    if (!apply_ootf_) return;
-    const V luminance =
-        MulAdd(Set(df, red_Y_), *red,
-               MulAdd(Set(df, green_Y_), *green, Mul(Set(df, blue_Y_), *blue)));
-    const V ratio =
-        Min(FastPowf(df, luminance, Set(df, exponent_)), Set(df, 1e9));
-    *red = Mul(*red, ratio);
-    *green = Mul(*green, ratio);
-    *blue = Mul(*blue, ratio);
-  }
-
-  bool WarrantsGamutMapping() const { return apply_ootf_ && exponent_ < 0; }
-};
-
-template <typename V>
-void GamutMap(V* red, V* green, V* blue, const Vector3& primaries_luminances,
-              float preserve_saturation = 0.1f) {
-  hwy::HWY_NAMESPACE::DFromV<V> df;
-  const V luminance =
-      MulAdd(Set(df, primaries_luminances[0]), *red,
-             MulAdd(Set(df, primaries_luminances[1]), *green,
-                    Mul(Set(df, primaries_luminances[2]), *blue)));
-
-  // Desaturate out-of-gamut pixels. This is done by mixing each pixel
-  // with just enough gray of the target luminance to make all
-  // components non-negative.
-  // - For saturation preservation, if a component is still larger than
-  // 1 then the pixel is normalized to have a maximum component of 1.
-  // That will reduce its luminance.
-  // - For luminance preservation, getting all components below 1 is
-  // done by mixing in yet more gray. That will desaturate it further.
-  const V zero = Zero(df);
-  const V one = Set(df, 1);
-  V gray_mix_saturation = zero;
-  V gray_mix_luminance = zero;
-  for (const V* ch : {red, green, blue}) {
-    const V& val = *ch;
-    const V val_minus_gray = Sub(val, luminance);
-    const V inv_val_minus_gray =
-        Div(one, IfThenElse(Eq(val_minus_gray, zero), one, val_minus_gray));
-    const V val_over_val_minus_gray = Mul(val, inv_val_minus_gray);
-    gray_mix_saturation =
-        IfThenElse(Ge(val_minus_gray, zero), gray_mix_saturation,
-                   Max(gray_mix_saturation, val_over_val_minus_gray));
-    gray_mix_luminance =
-        Max(gray_mix_luminance,
-            IfThenElse(Le(val_minus_gray, zero), gray_mix_saturation,
-                       Sub(val_over_val_minus_gray, inv_val_minus_gray)));
-  }
-  const V gray_mix = Clamp(
-      MulAdd(Set(df, preserve_saturation),
-             Sub(gray_mix_saturation, gray_mix_luminance), gray_mix_luminance),
-      zero, one);
-  for (V* const ch : {red, green, blue}) {
-    V& val = *ch;
-    val = MulAdd(gray_mix, Sub(luminance, val), val);
-  }
-  const V max_clr = Max(Max(one, *red), Max(*green, *blue));
-  const V normalizer = Div(one, max_clr);
-  for (V* const ch : {red, green, blue}) {
-    V& val = *ch;
-    val = Mul(val, normalizer);
-  }
-}
-
-}  // namespace
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#endif  // LIB_JXL_CMS_TONE_MAPPING_INL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/cms/tone_mapping.h b/third_party/jpeg-xl/lib/jxl/cms/tone_mapping.h
deleted file mode 100644
index c1f43f4d3157f..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/cms/tone_mapping.h
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_CMS_TONE_MAPPING_H_
-#define LIB_JXL_CMS_TONE_MAPPING_H_
-
-#include <algorithm>
-#include <cmath>
-#include <cstddef>
-#include <utility>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/matrix_ops.h"
-#include "lib/jxl/cms/transfer_functions.h"
-
-namespace jxl {
-
-class Rec2408ToneMapperBase {
- public:
-  explicit Rec2408ToneMapperBase(std::pair<float, float> source_range,
-                                 std::pair<float, float> target_range,
-                                 const Vector3& primaries_luminances)
-      : source_range_(std::move(source_range)),
-        target_range_(std::move(target_range)),
-        red_Y_(primaries_luminances[0]),
-        green_Y_(primaries_luminances[1]),
-        blue_Y_(primaries_luminances[2]) {}
-
-  // TODO(eustas): test me
-  void ToneMap(Color& rgb) const {
-    const float luminance =
-        source_range_.second *
-        (red_Y_ * rgb[0] + green_Y_ * rgb[1] + blue_Y_ * rgb[2]);
-    const float normalized_pq =
-        std::min(1.f, (InvEOTF(luminance) - pq_mastering_min_) *
-                          inv_pq_mastering_range_);
-    const float e2 = (normalized_pq < ks_) ? normalized_pq : P(normalized_pq);
-    const float one_minus_e2 = 1 - e2;
-    const float one_minus_e2_2 = one_minus_e2 * one_minus_e2;
-    const float one_minus_e2_4 = one_minus_e2_2 * one_minus_e2_2;
-    const float e3 = min_lum_ * one_minus_e2_4 + e2;
-    const float e4 = e3 * pq_mastering_range_ + pq_mastering_min_;
-    const float d4 =
-        TF_PQ_Base::DisplayFromEncoded(/*display_intensity_target=*/1.0, e4);
-    const float new_luminance = Clamp1(d4, 0.f, target_range_.second);
-    const float min_luminance = 1e-6f;
-    const bool use_cap = (luminance <= min_luminance);
-    const float ratio = new_luminance / std::max(luminance, min_luminance);
-    const float cap = new_luminance * inv_target_peak_;
-    const float multiplier = ratio * normalizer_;
-    for (size_t idx : {0, 1, 2}) {
-      rgb[idx] = use_cap ? cap : rgb[idx] * multiplier;
-    }
-  }
-
- protected:
-  static float InvEOTF(const float luminance) {
-    return TF_PQ_Base::EncodedFromDisplay(/*display_intensity_target=*/1.0,
-                                          luminance);
-  }
-  float T(const float a) const { return (a - ks_) * inv_one_minus_ks_; }
-  float P(const float b) const {
-    const float t_b = T(b);
-    const float t_b_2 = t_b * t_b;
-    const float t_b_3 = t_b_2 * t_b;
-    return (2 * t_b_3 - 3 * t_b_2 + 1) * ks_ +
-           (t_b_3 - 2 * t_b_2 + t_b) * (1 - ks_) +
-           (-2 * t_b_3 + 3 * t_b_2) * max_lum_;
-  }
-
-  const std::pair<float, float> source_range_;
-  const std::pair<float, float> target_range_;
-  const float red_Y_;
-  const float green_Y_;
-  const float blue_Y_;
-
-  const float pq_mastering_min_ = InvEOTF(source_range_.first);
-  const float pq_mastering_max_ = InvEOTF(source_range_.second);
-  const float pq_mastering_range_ = pq_mastering_max_ - pq_mastering_min_;
-  const float inv_pq_mastering_range_ = 1.0f / pq_mastering_range_;
-  // TODO(eustas): divide instead of inverse-multiply?
-  const float min_lum_ = (InvEOTF(target_range_.first) - pq_mastering_min_) *
-                         inv_pq_mastering_range_;
-  // TODO(eustas): divide instead of inverse-multiply?
-  const float max_lum_ = (InvEOTF(target_range_.second) - pq_mastering_min_) *
-                         inv_pq_mastering_range_;
-  const float ks_ = 1.5f * max_lum_ - 0.5f;
-
-  const float inv_one_minus_ks_ = 1.0f / std::max(1e-6f, 1.0f - ks_);
-
-  const float normalizer_ = source_range_.second / target_range_.second;
-  const float inv_target_peak_ = 1.f / target_range_.second;
-};
-
-class HlgOOTF_Base {
- public:
-  explicit HlgOOTF_Base(float source_luminance, float target_luminance,
-                        const Vector3& primaries_luminances)
-      : HlgOOTF_Base(/*gamma=*/std::pow(1.111f, std::log2(target_luminance /
-                                                          source_luminance)),
-                     primaries_luminances) {}
-
-  // TODO(eustas): test me
-  void Apply(Color& rgb) const {
-    if (!apply_ootf_) return;
-    const float luminance =
-        red_Y_ * rgb[0] + green_Y_ * rgb[1] + blue_Y_ * rgb[2];
-    const float ratio = std::min<float>(powf(luminance, exponent_), 1e9);
-    rgb[0] *= ratio;
-    rgb[1] *= ratio;
-    rgb[2] *= ratio;
-  }
-
- protected:
-  explicit HlgOOTF_Base(float gamma, const Vector3& luminances)
-      : exponent_(gamma - 1),
-        red_Y_(luminances[0]),
-        green_Y_(luminances[1]),
-        blue_Y_(luminances[2]) {}
-  const float exponent_;
-  const bool apply_ootf_ = exponent_ < -0.01f || 0.01f < exponent_;
-  const float red_Y_;
-  const float green_Y_;
-  const float blue_Y_;
-};
-
-static JXL_MAYBE_UNUSED void GamutMapScalar(Color& rgb,
-                                            const Vector3& primaries_luminances,
-                                            float preserve_saturation = 0.1f) {
-  const float luminance = primaries_luminances[0] * rgb[0] +
-                          primaries_luminances[1] * rgb[1] +
-                          primaries_luminances[2] * rgb[2];
-
-  // Desaturate out-of-gamut pixels. This is done by mixing each pixel
-  // with just enough gray of the target luminance to make all
-  // components non-negative.
-  // - For saturation preservation, if a component is still larger than
-  // 1 then the pixel is normalized to have a maximum component of 1.
-  // That will reduce its luminance.
-  // - For luminance preservation, getting all components below 1 is
-  // done by mixing in yet more gray. That will desaturate it further.
-  float gray_mix_saturation = 0.0f;
-  float gray_mix_luminance = 0.0f;
-  for (size_t idx : {0, 1, 2}) {
-    const float& val = rgb[idx];
-    const float val_minus_gray = val - luminance;
-    const float inv_val_minus_gray =
-        1.0f / ((val_minus_gray == 0.0f) ? 1.0f : val_minus_gray);
-    const float val_over_val_minus_gray = val * inv_val_minus_gray;
-    gray_mix_saturation =
-        (val_minus_gray >= 0.0f)
-            ? gray_mix_saturation
-            : std::max(gray_mix_saturation, val_over_val_minus_gray);
-    gray_mix_luminance =
-        std::max(gray_mix_luminance,
-                 (val_minus_gray <= 0.0f)
-                     ? gray_mix_saturation
-                     : (val_over_val_minus_gray - inv_val_minus_gray));
-  }
-  const float gray_mix =
-      Clamp1((preserve_saturation * (gray_mix_saturation - gray_mix_luminance) +
-              gray_mix_luminance),
-             0.0f, 1.0f);
-  for (size_t idx : {0, 1, 2}) {
-    float& val = rgb[idx];
-    val = gray_mix * (luminance - val) + val;
-  }
-  const float max_clr = std::max({1.0f, rgb[0], rgb[1], rgb[2]});
-  const float normalizer = 1.0f / max_clr;
-  for (size_t idx : {0, 1, 2}) {
-    rgb[idx] *= normalizer;
-  }
-}
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_CMS_TONE_MAPPING_H_
diff --git a/third_party/jpeg-xl/lib/jxl/cms/tone_mapping_test.cc b/third_party/jpeg-xl/lib/jxl/cms/tone_mapping_test.cc
deleted file mode 100644
index a0d569640aa6c..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/cms/tone_mapping_test.cc
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/cms/tone_mapping_test.cc"
-#include "lib/jxl/cms/tone_mapping.h"
-
-#include <cstdio>
-#include <hwy/foreach_target.h>
-
-#include "lib/jxl/base/random.h"
-#include "lib/jxl/cms/tone_mapping-inl.h"
-#include "lib/jxl/testing.h"
-
-// Test utils
-#include <hwy/highway.h>
-#include <hwy/tests/hwy_gtest.h>
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-namespace {
-
-HWY_NOINLINE void TestRec2408ToneMap() {
-  constexpr size_t kNumTrials = 1 << 23;
-  Rng rng(1);
-  float max_abs_err = 0;
-  HWY_FULL(float) d;
-  for (size_t i = 0; i < kNumTrials; i++) {
-    float src = 11000.0 + rng.UniformF(-150.0f, 150.0f);
-    float tgt = 250 + rng.UniformF(-5.0f, 5.0f);
-    Vector3 luminances{rng.UniformF(0.2f, 0.4f), rng.UniformF(0.2f, 0.4f),
-                       rng.UniformF(0.2f, 0.4f)};
-    Color rgb{rng.UniformF(0.0f, 1.0f), rng.UniformF(0.0f, 1.0f),
-              rng.UniformF(0.0f, 1.0f)};
-    Rec2408ToneMapper<decltype(d)> tone_mapper({0.0f, src}, {0.0f, tgt},
-                                               luminances);
-    auto r = Set(d, rgb[0]);
-    auto g = Set(d, rgb[1]);
-    auto b = Set(d, rgb[2]);
-    tone_mapper.ToneMap(&r, &g, &b);
-    Rec2408ToneMapperBase tone_mapper_base({0.0f, src}, {0.0f, tgt},
-                                           luminances);
-    tone_mapper_base.ToneMap(rgb);
-    const float actual_r = GetLane(r);
-    const float expected_r = rgb[0];
-    const float abs_err_r = std::abs(expected_r - actual_r);
-    EXPECT_LT(abs_err_r, 2.75e-5);
-    const float actual_g = GetLane(g);
-    const float expected_g = rgb[1];
-    const float abs_err_g = std::abs(expected_g - actual_g);
-    EXPECT_LT(abs_err_g, 2.75e-5);
-    const float actual_b = GetLane(b);
-    const float expected_b = rgb[2];
-    const float abs_err_b = std::abs(expected_b - actual_b);
-    EXPECT_LT(abs_err_b, 2.75e-5);
-    max_abs_err = std::max({max_abs_err, abs_err_r, abs_err_g, abs_err_b});
-  }
-  printf("max abs err %e\n", static_cast<double>(max_abs_err));
-}
-
-HWY_NOINLINE void TestHlgOotfApply() {
-  constexpr size_t kNumTrials = 1 << 23;
-  Rng rng(1);
-  float max_abs_err = 0;
-  HWY_FULL(float) d;
-  for (size_t i = 0; i < kNumTrials; i++) {
-    float src = 300.0 + rng.UniformF(-50.0f, 50.0f);
-    float tgt = 80 + rng.UniformF(-5.0f, 5.0f);
-    Vector3 luminances{rng.UniformF(0.2f, 0.4f), rng.UniformF(0.2f, 0.4f),
-                       rng.UniformF(0.2f, 0.4f)};
-    Color rgb{rng.UniformF(0.0f, 1.0f), rng.UniformF(0.0f, 1.0f),
-              rng.UniformF(0.0f, 1.0f)};
-    HlgOOTF ootf(src, tgt, luminances);
-    auto r = Set(d, rgb[0]);
-    auto g = Set(d, rgb[1]);
-    auto b = Set(d, rgb[2]);
-    ootf.Apply(&r, &g, &b);
-    HlgOOTF_Base ootf_base(src, tgt, luminances);
-    ootf_base.Apply(rgb);
-    const float actual_r = GetLane(r);
-    const float expected_r = rgb[0];
-    const float abs_err_r = std::abs(expected_r - actual_r);
-    EXPECT_LT(abs_err_r, 7.2e-7);
-    const float actual_g = GetLane(g);
-    const float expected_g = rgb[1];
-    const float abs_err_g = std::abs(expected_g - actual_g);
-    EXPECT_LT(abs_err_g, 7.2e-7);
-    const float actual_b = GetLane(b);
-    const float expected_b = rgb[2];
-    const float abs_err_b = std::abs(expected_b - actual_b);
-    EXPECT_LT(abs_err_b, 7.2e-7);
-    max_abs_err = std::max({max_abs_err, abs_err_r, abs_err_g, abs_err_b});
-  }
-  printf("max abs err %e\n", static_cast<double>(max_abs_err));
-}
-
-HWY_NOINLINE void TestGamutMap() {
-  constexpr size_t kNumTrials = 1 << 23;
-  Rng rng(1);
-  float max_abs_err = 0;
-  HWY_FULL(float) d;
-  for (size_t i = 0; i < kNumTrials; i++) {
-    float preserve_saturation = rng.UniformF(0.2f, 0.4f);
-    Vector3 luminances{rng.UniformF(0.2f, 0.4f), rng.UniformF(0.2f, 0.4f),
-                       rng.UniformF(0.2f, 0.4f)};
-    Color rgb{rng.UniformF(0.0f, 1.0f), rng.UniformF(0.0f, 1.0f),
-              rng.UniformF(0.0f, 1.0f)};
-    auto r = Set(d, rgb[0]);
-    auto g = Set(d, rgb[1]);
-    auto b = Set(d, rgb[2]);
-    GamutMap(&r, &g, &b, luminances, preserve_saturation);
-    GamutMapScalar(rgb, luminances, preserve_saturation);
-    const float actual_r = GetLane(r);
-    const float expected_r = rgb[0];
-    const float abs_err_r = std::abs(expected_r - actual_r);
-    EXPECT_LT(abs_err_r, 1e-10);
-    const float actual_g = GetLane(g);
-    const float expected_g = rgb[1];
-    const float abs_err_g = std::abs(expected_g - actual_g);
-    EXPECT_LT(abs_err_g, 1e-10);
-    const float actual_b = GetLane(b);
-    const float expected_b = rgb[2];
-    const float abs_err_b = std::abs(expected_b - actual_b);
-    EXPECT_LT(abs_err_b, 1e-10);
-    max_abs_err = std::max({max_abs_err, abs_err_r, abs_err_g, abs_err_b});
-  }
-  printf("max abs err %e\n", static_cast<double>(max_abs_err));
-}
-
-}  // namespace
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-class ToneMappingTargetTest : public hwy::TestWithParamTarget {};
-HWY_TARGET_INSTANTIATE_TEST_SUITE_P(ToneMappingTargetTest);
-
-HWY_EXPORT_AND_TEST_P(ToneMappingTargetTest, TestRec2408ToneMap);
-HWY_EXPORT_AND_TEST_P(ToneMappingTargetTest, TestHlgOotfApply);
-HWY_EXPORT_AND_TEST_P(ToneMappingTargetTest, TestGamutMap);
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/cms/transfer_functions-inl.h b/third_party/jpeg-xl/lib/jxl/cms/transfer_functions-inl.h
deleted file mode 100644
index 9db6455c95cf6..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/cms/transfer_functions-inl.h
+++ /dev/null
@@ -1,322 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Transfer functions for color encodings.
-
-#if defined(LIB_JXL_CMS_TRANSFER_FUNCTIONS_INL_H_) == defined(HWY_TARGET_TOGGLE)
-#ifdef LIB_JXL_CMS_TRANSFER_FUNCTIONS_INL_H_
-#undef LIB_JXL_CMS_TRANSFER_FUNCTIONS_INL_H_
-#else
-#define LIB_JXL_CMS_TRANSFER_FUNCTIONS_INL_H_
-#endif
-
-#include <algorithm>
-#include <cmath>
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/fast_math-inl.h"
-#include "lib/jxl/base/rational_polynomial-inl.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/cms/transfer_functions.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::And;
-using hwy::HWY_NAMESPACE::AndNot;
-using hwy::HWY_NAMESPACE::Gt;
-using hwy::HWY_NAMESPACE::IfThenElse;
-using hwy::HWY_NAMESPACE::Lt;
-using hwy::HWY_NAMESPACE::Or;
-using hwy::HWY_NAMESPACE::Sqrt;
-using hwy::HWY_NAMESPACE::TableLookupBytes;
-
-// Definitions for BT.2100-2 transfer functions (used inside/outside SIMD):
-// "display" is linear light (nits) normalized to [0, 1].
-// "encoded" is a nonlinear encoding (e.g. PQ) in [0, 1].
-// "scene" is a linear function of photon counts, normalized to [0, 1].
-
-// Despite the stated ranges, we need unbounded transfer functions: see
-// http://www.littlecms.com/CIC18_UnboundedCMM.pdf. Inputs can be negative or
-// above 1 due to chromatic adaptation. To avoid severe round-trip errors caused
-// by clamping, we mirror negative inputs via copysign (f(-x) = -f(x), see
-// https://developer.apple.com/documentation/coregraphics/cgcolorspace/1644735-extendedsrgb)
-// and extend the function domains above 1.
-
-// Hybrid Log-Gamma.
-class TF_HLG : TF_HLG_Base {
- public:
-  // Maximum error 5e-7.
-  template <class D, class V>
-  JXL_INLINE V EncodedFromDisplay(D d, V x) const {
-    const hwy::HWY_NAMESPACE::Rebind<uint32_t, D> du;
-    const V kSign = BitCast(d, Set(du, 0x80000000u));
-    const V original_sign = And(x, kSign);
-    x = AndNot(kSign, x);  // abs
-    const V below_div12 = Sqrt(Mul(Set(d, 3.0f), x));
-    const V e =
-        MulAdd(Set(d, kA * 0.693147181f),
-               FastLog2f(d, MulAdd(Set(d, 12), x, Set(d, -kB))), Set(d, kC));
-    const V magnitude = IfThenElse(Le(x, Set(d, kDiv12)), below_div12, e);
-    return Or(AndNot(kSign, magnitude), original_sign);
-  }
-};
-
-class TF_709 {
- public:
-  static JXL_INLINE double EncodedFromDisplay(const double d) {
-    if (d < kThresh) return kMulLow * d;
-    return kMulHi * std::pow(d, kPowHi) + kSub;
-  }
-
-  // Maximum error 1e-6.
-  template <class D, class V>
-  JXL_INLINE V EncodedFromDisplay(D d, V x) const {
-    auto low = Mul(Set(d, kMulLow), x);
-    auto hi =
-        MulAdd(Set(d, kMulHi), FastPowf(d, x, Set(d, kPowHi)), Set(d, kSub));
-    return IfThenElse(Le(x, Set(d, kThresh)), low, hi);
-  }
-
-  template <class D, class V>
-  JXL_INLINE V DisplayFromEncoded(D d, V x) const {
-    auto low = Mul(Set(d, kInvMulLow), x);
-    auto hi = FastPowf(d, MulAdd(x, Set(d, kInvMulHi), Set(d, kInvAdd)),
-                       Set(d, kInvPowHi));
-    return IfThenElse(Lt(x, Set(d, kInvThresh)), low, hi);
-  }
-
- private:
-  static constexpr double kThresh = 0.018;
-  static constexpr double kMulLow = 4.5;
-  static constexpr double kMulHi = 1.099;
-  static constexpr double kPowHi = 0.45;
-  static constexpr double kSub = -0.099;
-
-  static constexpr double kInvThresh = 0.081;
-  static constexpr double kInvMulLow = 1 / 4.5;
-  static constexpr double kInvMulHi = 1 / 1.099;
-  static constexpr double kInvPowHi = 1 / 0.45;
-  static constexpr double kInvAdd = 0.099 * kInvMulHi;
-};
-
-// Perceptual Quantization
-class TF_PQ : TF_PQ_Base {
- public:
-  explicit TF_PQ(float display_intensity_target = kDefaultIntensityTarget)
-      : display_scaling_factor_to_10000_nits_(display_intensity_target *
-                                              (1.0f / 10000.0f)),
-        display_scaling_factor_from_10000_nits_(10000.0f /
-                                                display_intensity_target) {}
-
-  // Maximum error 3e-6
-  template <class D, class V>
-  JXL_INLINE V DisplayFromEncoded(D d, V x) const {
-    const hwy::HWY_NAMESPACE::Rebind<uint32_t, D> du;
-    const V kSign = BitCast(d, Set(du, 0x80000000u));
-    const V original_sign = And(x, kSign);
-    x = AndNot(kSign, x);  // abs
-    // 4-over-4-degree rational polynomial approximation on x+x*x. This improves
-    // the maximum error by about 5x over a rational polynomial for x.
-    auto xpxx = MulAdd(x, x, x);
-    HWY_ALIGN constexpr float p[(4 + 1) * 4] = {
-        HWY_REP4(2.62975656e-04f), HWY_REP4(-6.23553089e-03f),
-        HWY_REP4(7.38602301e-01f), HWY_REP4(2.64553172e+00f),
-        HWY_REP4(5.50034862e-01f),
-    };
-    HWY_ALIGN constexpr float q[(4 + 1) * 4] = {
-        HWY_REP4(4.21350107e+02f), HWY_REP4(-4.28736818e+02f),
-        HWY_REP4(1.74364667e+02f), HWY_REP4(-3.39078883e+01f),
-        HWY_REP4(2.67718770e+00f),
-    };
-    auto magnitude = EvalRationalPolynomial(d, xpxx, p, q);
-    return Or(
-        AndNot(kSign,
-               Mul(magnitude, Set(d, display_scaling_factor_from_10000_nits_))),
-        original_sign);
-  }
-
-  // Maximum error 7e-7.
-  template <class D, class V>
-  JXL_INLINE V EncodedFromDisplay(D d, V x) const {
-    const hwy::HWY_NAMESPACE::Rebind<uint32_t, D> du;
-    const V kSign = BitCast(d, Set(du, 0x80000000u));
-    const V original_sign = And(x, kSign);
-    x = AndNot(kSign, x);  // abs
-    // 4-over-4-degree rational polynomial approximation on x**0.25, with two
-    // different polynomials above and below 1e-4.
-    auto xto025 =
-        Sqrt(Sqrt(Mul(x, Set(d, display_scaling_factor_to_10000_nits_))));
-    HWY_ALIGN constexpr float p[(4 + 1) * 4] = {
-        HWY_REP4(1.351392e-02f), HWY_REP4(-1.095778e+00f),
-        HWY_REP4(5.522776e+01f), HWY_REP4(1.492516e+02f),
-        HWY_REP4(4.838434e+01f),
-    };
-    HWY_ALIGN constexpr float q[(4 + 1) * 4] = {
-        HWY_REP4(1.012416e+00f), HWY_REP4(2.016708e+01f),
-        HWY_REP4(9.263710e+01f), HWY_REP4(1.120607e+02f),
-        HWY_REP4(2.590418e+01f),
-    };
-
-    HWY_ALIGN constexpr float plo[(4 + 1) * 4] = {
-        HWY_REP4(9.863406e-06f),  HWY_REP4(3.881234e-01f),
-        HWY_REP4(1.352821e+02f),  HWY_REP4(6.889862e+04f),
-        HWY_REP4(-2.864824e+05f),
-    };
-    HWY_ALIGN constexpr float qlo[(4 + 1) * 4] = {
-        HWY_REP4(3.371868e+01f),  HWY_REP4(1.477719e+03f),
-        HWY_REP4(1.608477e+04f),  HWY_REP4(-4.389884e+04f),
-        HWY_REP4(-2.072546e+05f),
-    };
-
-    auto magnitude = IfThenElse(Lt(x, Set(d, 1e-4f)),
-                                EvalRationalPolynomial(d, xto025, plo, qlo),
-                                EvalRationalPolynomial(d, xto025, p, q));
-    return Or(AndNot(kSign, magnitude), original_sign);
-  }
-
- private:
-  const float display_scaling_factor_to_10000_nits_;
-  const float display_scaling_factor_from_10000_nits_;
-};
-
-// sRGB
-class TF_SRGB {
- public:
-  template <typename V>
-  JXL_INLINE V DisplayFromEncoded(V x) const {
-    const HWY_FULL(float) d;
-    const HWY_FULL(uint32_t) du;
-    const V kSign = BitCast(d, Set(du, 0x80000000u));
-    const V original_sign = And(x, kSign);
-    x = AndNot(kSign, x);  // abs
-
-    // TODO(janwas): range reduction
-    // Computed via af_cheb_rational (k=100); replicated 4x.
-    HWY_ALIGN constexpr float p[(4 + 1) * 4] = {
-        HWY_REP4(2.200248328e-04f), HWY_REP4(1.043637593e-02f),
-        HWY_REP4(1.624820318e-01f), HWY_REP4(7.961564959e-01f),
-        HWY_REP4(8.210152774e-01f),
-    };
-    HWY_ALIGN constexpr float q[(4 + 1) * 4] = {
-        HWY_REP4(2.631846970e-01f), HWY_REP4(1.076976492e+00f),
-        HWY_REP4(4.987528350e-01f), HWY_REP4(-5.512498495e-02f),
-        HWY_REP4(6.521209011e-03f),
-    };
-    const V linear = Mul(x, Set(d, kLowDivInv));
-    const V poly = EvalRationalPolynomial(d, x, p, q);
-    const V magnitude =
-        IfThenElse(Gt(x, Set(d, kThreshSRGBToLinear)), poly, linear);
-    return Or(AndNot(kSign, magnitude), original_sign);
-  }
-
-  // Error ~5e-07
-  template <class D, class V>
-  JXL_INLINE V EncodedFromDisplay(D d, V x) const {
-    const hwy::HWY_NAMESPACE::Rebind<uint32_t, D> du;
-    const V kSign = BitCast(d, Set(du, 0x80000000u));
-    const V original_sign = And(x, kSign);
-    x = AndNot(kSign, x);  // abs
-
-    // Computed via af_cheb_rational (k=100); replicated 4x.
-    HWY_ALIGN constexpr float p[(4 + 1) * 4] = {
-        HWY_REP4(-5.135152395e-04f), HWY_REP4(5.287254571e-03f),
-        HWY_REP4(3.903842876e-01f),  HWY_REP4(1.474205315e+00f),
-        HWY_REP4(7.352629620e-01f),
-    };
-    HWY_ALIGN constexpr float q[(4 + 1) * 4] = {
-        HWY_REP4(1.004519624e-02f), HWY_REP4(3.036675394e-01f),
-        HWY_REP4(1.340816930e+00f), HWY_REP4(9.258482155e-01f),
-        HWY_REP4(2.424867759e-02f),
-    };
-    const V linear = Mul(x, Set(d, kLowDiv));
-    const V poly = EvalRationalPolynomial(d, Sqrt(x), p, q);
-    const V magnitude =
-        IfThenElse(Gt(x, Set(d, kThreshLinearToSRGB)), poly, linear);
-    return Or(AndNot(kSign, magnitude), original_sign);
-  }
-
- private:
-  static constexpr float kThreshSRGBToLinear = 0.04045f;
-  static constexpr float kThreshLinearToSRGB = 0.0031308f;
-  static constexpr float kLowDiv = 12.92f;
-  static constexpr float kLowDivInv = 1.0f / kLowDiv;
-};
-
-// Linear to sRGB conversion with error of at most 1.2e-4.
-template <typename D, typename V>
-V FastLinearToSRGB(D d, V v) {
-  const hwy::HWY_NAMESPACE::Rebind<uint32_t, D> du;
-  const hwy::HWY_NAMESPACE::Rebind<int32_t, D> di;
-  // Convert to 0.25 - 0.5 range.
-  auto v025_05 = BitCast(
-      d, And(Or(BitCast(du, v), Set(du, 0x3e800000)), Set(du, 0x3effffff)));
-  // third degree polynomial approximation between 0.25 and 0.5
-  // of 1.055/2^(7/2.4) * x^(1/2.4) * 0.5. A degree 4 polynomial only improves
-  // accuracy by about 3x.
-  auto d1 = MulAdd(v025_05, Set(d, 0.059914046f), Set(d, -0.108894556f));
-  auto d2 = MulAdd(d1, v025_05, Set(d, 0.107963754f));
-  auto pow = MulAdd(d2, v025_05, Set(d, 0.018092343f));
-  // Compute extra multiplier depending on exponent. Valid exponent range for
-  // [0.0031308f, 1.0) is 0...8 after subtracting 118.
-  // The next three constants contain a representation of the powers of
-  // 2**(1/2.4) = 2**(5/12) times two; in particular, bits from 26 to 31 are
-  // always the same and in k2to512powers_basebits, and the two arrays contain
-  // the next groups of 8 bits. This ends up being a 22-bit representation (with
-  // a mantissa of 13 bits). The choice of polynomial to approximate is such
-  // that the multiplication factor has the highest 5 bits constant, and that
-  // the factor for the lowest possible exponent is a power of two (thus making
-  // the additional bits 0, which is used to correctly merge back together the
-  // floats).
-  constexpr uint32_t k2to512powers_basebits = 0x40000000;
-  HWY_ALIGN constexpr uint8_t k2to512powers_25to18bits[16] = {
-      0x0,  0xa,  0x19, 0x26, 0x32, 0x41, 0x4d, 0x5c,
-      0x68, 0x75, 0x83, 0x8f, 0xa0, 0xaa, 0xb9, 0xc6,
-  };
-  HWY_ALIGN constexpr uint8_t k2to512powers_17to10bits[16] = {
-      0x0,  0xb7, 0x4,  0xd,  0xcb, 0xe7, 0x41, 0x68,
-      0x51, 0xd1, 0xeb, 0xf2, 0x0,  0xb7, 0x4,  0xd,
-  };
-  // Note that vld1q_s8_x2 on ARM seems to actually be slower.
-#if HWY_TARGET != HWY_SCALAR
-  using hwy::HWY_NAMESPACE::ShiftLeft;
-  using hwy::HWY_NAMESPACE::ShiftRight;
-  // Every lane of exp is now (if cast to byte) {0, 0, 0, <index for lookup>}.
-  auto exp = Sub(ShiftRight<23>(BitCast(di, v)), Set(di, 118));
-  auto pow25to18bits = TableLookupBytes(
-      LoadDup128(di,
-                 reinterpret_cast<const int32_t*>(k2to512powers_25to18bits)),
-      exp);
-  auto pow17to10bits = TableLookupBytes(
-      LoadDup128(di,
-                 reinterpret_cast<const int32_t*>(k2to512powers_17to10bits)),
-      exp);
-  // Now, pow* contain {0, 0, 0, <part of float repr of multiplier>}. Here
-  // we take advantage of the fact that each table has its position 0 equal to
-  // 0.
-  // We can now just reassemble the float.
-  auto mul = BitCast(
-      d, Or(Or(ShiftLeft<18>(pow25to18bits), ShiftLeft<10>(pow17to10bits)),
-            Set(di, k2to512powers_basebits)));
-#else
-  // Fallback for scalar.
-  uint32_t exp = ((BitCast(di, v).raw >> 23) - 118) & 0xf;
-  auto mul = BitCast(d, Set(di, (k2to512powers_25to18bits[exp] << 18) |
-                                    (k2to512powers_17to10bits[exp] << 10) |
-                                    k2to512powers_basebits));
-#endif
-  return IfThenElse(Lt(v, Set(d, 0.0031308f)), Mul(v, Set(d, 12.92f)),
-                    MulAdd(pow, mul, Set(d, -0.055)));
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#endif  // LIB_JXL_CMS_TRANSFER_FUNCTIONS_INL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/cms/transfer_functions.h b/third_party/jpeg-xl/lib/jxl/cms/transfer_functions.h
deleted file mode 100644
index e620f940eb789..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/cms/transfer_functions.h
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Transfer functions for color encodings.
-
-#ifndef LIB_JXL_CMS_TRANSFER_FUNCTIONS_H_
-#define LIB_JXL_CMS_TRANSFER_FUNCTIONS_H_
-
-#include <algorithm>
-#include <cmath>
-
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-// Definitions for BT.2100-2 transfer functions (used inside/outside SIMD):
-// "display" is linear light (nits) normalized to [0, 1].
-// "encoded" is a nonlinear encoding (e.g. PQ) in [0, 1].
-// "scene" is a linear function of photon counts, normalized to [0, 1].
-
-// Despite the stated ranges, we need unbounded transfer functions: see
-// http://www.littlecms.com/CIC18_UnboundedCMM.pdf. Inputs can be negative or
-// above 1 due to chromatic adaptation. To avoid severe round-trip errors caused
-// by clamping, we mirror negative inputs via copysign (f(-x) = -f(x), see
-// https://developer.apple.com/documentation/coregraphics/cgcolorspace/1644735-extendedsrgb)
-// and extend the function domains above 1.
-
-// Hybrid Log-Gamma.
-class TF_HLG_Base {
- public:
-  // EOTF. e = encoded.
-  static double DisplayFromEncoded(const double e) { return OOTF(InvOETF(e)); }
-
-  // Inverse EOTF. d = display.
-  static double EncodedFromDisplay(const double d) { return OETF(InvOOTF(d)); }
-
- private:
-  // OETF (defines the HLG approach). s = scene, returns encoded.
-  static double OETF(double s) {
-    if (s == 0.0) return 0.0;
-    const double original_sign = s;
-    s = std::abs(s);
-
-    if (s <= kDiv12) return copysignf(std::sqrt(3.0 * s), original_sign);
-
-    const double e = kA * std::log(12 * s - kB) + kC;
-    JXL_DASSERT(e > 0.0);
-    return copysignf(e, original_sign);
-  }
-
-  // e = encoded, returns scene.
-  static double InvOETF(double e) {
-    if (e == 0.0) return 0.0;
-    const double original_sign = e;
-    e = std::abs(e);
-
-    if (e <= 0.5) return copysignf(e * e * (1.0 / 3), original_sign);
-
-    const double s = (std::exp((e - kC) * kRA) + kB) * kDiv12;
-    JXL_DASSERT(s >= 0);
-    return copysignf(s, original_sign);
-  }
-
-  // s = scene, returns display.
-  static double OOTF(const double s) {
-    // The actual (red channel) OOTF is RD = alpha * YS^(gamma-1) * RS, where
-    // YS = 0.2627 * RS + 0.6780 * GS + 0.0593 * BS. Let alpha = 1 so we return
-    // "display" (normalized [0, 1]) instead of nits. Our transfer function
-    // interface does not allow a dependency on YS. Fortunately, the system
-    // gamma at 334 nits is 1.0, so this reduces to RD = RS.
-    return s;
-  }
-
-  // d = display, returns scene.
-  static double InvOOTF(const double d) {
-    return d;  // see OOTF().
-  }
-
- protected:
-  static constexpr double kA = 0.17883277;
-  static constexpr double kRA = 1.0 / kA;
-  static constexpr double kB = 1 - 4 * kA;
-  static constexpr double kC = 0.5599107295;
-  static constexpr double kDiv12 = 1.0 / 12;
-};
-
-// Perceptual Quantization
-class TF_PQ_Base {
- public:
-  static double DisplayFromEncoded(float display_intensity_target, double e) {
-    if (e == 0.0) return 0.0;
-    const double original_sign = e;
-    e = std::abs(e);
-
-    const double xp = std::pow(e, 1.0 / kM2);
-    const double num = std::max(xp - kC1, 0.0);
-    const double den = kC2 - kC3 * xp;
-    JXL_DASSERT(den != 0.0);
-    const double d = std::pow(num / den, 1.0 / kM1);
-    JXL_DASSERT(d >= 0.0);  // Equal for e ~= 1E-9
-    return copysignf(d * (10000.0f / display_intensity_target), original_sign);
-  }
-
-  // Inverse EOTF. d = display.
-  static double EncodedFromDisplay(float display_intensity_target, double d) {
-    if (d == 0.0) return 0.0;
-    const double original_sign = d;
-    d = std::abs(d);
-
-    const double xp =
-        std::pow(d * (display_intensity_target * (1.0f / 10000.0f)), kM1);
-    const double num = kC1 + xp * kC2;
-    const double den = 1.0 + xp * kC3;
-    const double e = std::pow(num / den, kM2);
-    JXL_DASSERT(e > 0.0);
-    return copysignf(e, original_sign);
-  }
-
- protected:
-  static constexpr double kM1 = 2610.0 / 16384;
-  static constexpr double kM2 = (2523.0 / 4096) * 128;
-  static constexpr double kC1 = 3424.0 / 4096;
-  static constexpr double kC2 = (2413.0 / 4096) * 32;
-  static constexpr double kC3 = (2392.0 / 4096) * 32;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_CMS_TRANSFER_FUNCTIONS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/cms/transfer_functions_test.cc b/third_party/jpeg-xl/lib/jxl/cms/transfer_functions_test.cc
deleted file mode 100644
index 3a7bd7f43f64a..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/cms/transfer_functions_test.cc
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/cms/transfer_functions_test.cc"
-#include "lib/jxl/cms/transfer_functions.h"
-
-#include <cstdio>
-#include <hwy/foreach_target.h>
-
-#include "lib/jxl/base/random.h"
-#include "lib/jxl/cms/transfer_functions-inl.h"
-#include "lib/jxl/testing.h"
-
-// Test utils
-#include <hwy/highway.h>
-#include <hwy/tests/hwy_gtest.h>
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-namespace {
-
-HWY_NOINLINE void TestPqEncodedFromDisplay() {
-  constexpr size_t kNumTrials = 1 << 23;
-  Rng rng(1);
-  float max_abs_err = 0;
-  HWY_FULL(float) d;
-  for (size_t i = 0; i < kNumTrials; i++) {
-    double intensity = 11000.0 + rng.UniformF(-150.0f, 150.0f);
-    TF_PQ tf_pq(intensity);
-    const float f = rng.UniformF(0.0f, 1.0f);
-    const float actual = GetLane(tf_pq.EncodedFromDisplay(d, Set(d, f)));
-    const float expected = TF_PQ_Base::EncodedFromDisplay(intensity, f);
-    const float abs_err = std::abs(expected - actual);
-    EXPECT_LT(abs_err, 6e-7) << "f = " << f;
-    max_abs_err = std::max(max_abs_err, abs_err);
-  }
-  printf("max abs err %e\n", static_cast<double>(max_abs_err));
-}
-
-HWY_NOINLINE void TestHlgEncodedFromDisplay() {
-  constexpr size_t kNumTrials = 1 << 23;
-  Rng rng(1);
-  float max_abs_err = 0;
-  HWY_FULL(float) d;
-  for (size_t i = 0; i < kNumTrials; i++) {
-    const float f = rng.UniformF(0.0f, 1.0f);
-    const float actual = GetLane(TF_HLG().EncodedFromDisplay(d, Set(d, f)));
-    const float expected = TF_HLG_Base::EncodedFromDisplay(f);
-    const float abs_err = std::abs(expected - actual);
-    EXPECT_LT(abs_err, 4e-7) << "f = " << f;
-    max_abs_err = std::max(max_abs_err, abs_err);
-  }
-  printf("max abs err %e\n", static_cast<double>(max_abs_err));
-}
-
-HWY_NOINLINE void TestPqDisplayFromEncoded() {
-  constexpr size_t kNumTrials = 1 << 23;
-  Rng rng(1);
-  float max_abs_err = 0;
-  HWY_FULL(float) d;
-  for (size_t i = 0; i < kNumTrials; i++) {
-    double intensity = 11000.0 + rng.UniformF(-150.0f, 150.0f);
-    TF_PQ tf_pq(intensity);
-    const float f = rng.UniformF(0.0f, 1.0f);
-    const float actual = GetLane(tf_pq.DisplayFromEncoded(d, Set(d, f)));
-    const float expected = TF_PQ_Base::DisplayFromEncoded(intensity, f);
-    const float abs_err = std::abs(expected - actual);
-    EXPECT_LT(abs_err, 3E-6) << "f = " << f;
-    max_abs_err = std::max(max_abs_err, abs_err);
-  }
-  printf("max abs err %e\n", static_cast<double>(max_abs_err));
-}
-
-}  // namespace
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-class TransferFunctionsTargetTest : public hwy::TestWithParamTarget {};
-HWY_TARGET_INSTANTIATE_TEST_SUITE_P(TransferFunctionsTargetTest);
-
-HWY_EXPORT_AND_TEST_P(TransferFunctionsTargetTest, TestPqEncodedFromDisplay);
-HWY_EXPORT_AND_TEST_P(TransferFunctionsTargetTest, TestHlgEncodedFromDisplay);
-HWY_EXPORT_AND_TEST_P(TransferFunctionsTargetTest, TestPqDisplayFromEncoded);
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/codec_in_out.h b/third_party/jpeg-xl/lib/jxl/codec_in_out.h
deleted file mode 100644
index f71fa9643e63d..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/codec_in_out.h
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_CODEC_IN_OUT_H_
-#define LIB_JXL_CODEC_IN_OUT_H_
-
-// Holds inputs/outputs for decoding/encoding images.
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/headers.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/luminance.h"
-
-namespace jxl {
-
-// Optional text/EXIF metadata.
-struct Blobs {
-  std::vector<uint8_t> exif;
-  std::vector<uint8_t> iptc;
-  std::vector<uint8_t> jhgm;
-  std::vector<uint8_t> jumbf;
-  std::vector<uint8_t> xmp;
-};
-
-// Holds a preview, a main image or one or more frames, plus the inputs/outputs
-// to/from decoding/encoding.
-class CodecInOut {
- public:
-  explicit CodecInOut(JxlMemoryManager* memory_manager)
-      : memory_manager(memory_manager),
-        preview_frame(memory_manager, &metadata.m) {
-    frames.reserve(1);
-    frames.emplace_back(memory_manager, &metadata.m);
-  }
-
-  // Move-only.
-  CodecInOut(CodecInOut&&) = default;
-  CodecInOut& operator=(CodecInOut&&) = default;
-
-  size_t LastStillFrame() const {
-    JXL_DASSERT(!frames.empty());
-    size_t last = 0;
-    for (size_t i = 0; i < frames.size(); i++) {
-      last = i;
-      if (frames[i].duration > 0) break;
-    }
-    return last;
-  }
-
-  ImageBundle& Main() { return frames[LastStillFrame()]; }
-  const ImageBundle& Main() const { return frames[LastStillFrame()]; }
-
-  // If c_current.IsGray(), all planes must be identical.
-  Status SetFromImage(Image3F&& color, const ColorEncoding& c_current) {
-    JXL_RETURN_IF_ERROR(Main().SetFromImage(std::move(color), c_current));
-    SetIntensityTarget(&this->metadata.m);
-    JXL_RETURN_IF_ERROR(SetSize(Main().xsize(), Main().ysize()));
-    return true;
-  }
-
-  Status SetSize(size_t xsize, size_t ysize) {
-    JXL_RETURN_IF_ERROR(metadata.size.Set(xsize, ysize));
-    return true;
-  }
-
-  Status CheckMetadata() const {
-    JXL_ENSURE(metadata.m.bit_depth.bits_per_sample != 0);
-    JXL_ENSURE(!metadata.m.color_encoding.ICC().empty());
-
-    if (preview_frame.xsize() != 0) {
-      JXL_RETURN_IF_ERROR(preview_frame.VerifyMetadata());
-    }
-    JXL_ENSURE(preview_frame.metadata() == &metadata.m);
-
-    for (const ImageBundle& ib : frames) {
-      JXL_RETURN_IF_ERROR(ib.VerifyMetadata());
-      JXL_ENSURE(ib.metadata() == &metadata.m);
-    }
-    return true;
-  }
-
-  size_t xsize() const { return metadata.size.xsize(); }
-  size_t ysize() const { return metadata.size.ysize(); }
-  Status ShrinkTo(size_t xsize, size_t ysize) {
-    // preview is unaffected.
-    for (ImageBundle& ib : frames) {
-      JXL_RETURN_IF_ERROR(ib.ShrinkTo(xsize, ysize));
-    }
-    JXL_RETURN_IF_ERROR(SetSize(xsize, ysize));
-    return true;
-  }
-
-  // -- DECODER OUTPUT, ENCODER INPUT:
-
-  // Metadata stored into / retrieved from bitstreams.
-
-  JxlMemoryManager* memory_manager;
-
-  Blobs blobs;
-
-  CodecMetadata metadata;  // applies to preview and all frames
-
-  // If metadata.have_preview:
-  ImageBundle preview_frame;
-
-  std::vector<ImageBundle> frames;  // size=1 if !metadata.have_animation
-
-  // If the image should be written to a JPEG, use this quality for encoding.
-  size_t jpeg_quality;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_CODEC_IN_OUT_H_
diff --git a/third_party/jpeg-xl/lib/jxl/coeff_order.cc b/third_party/jpeg-xl/lib/jxl/coeff_order.cc
deleted file mode 100644
index c741cbed91304..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/coeff_order.cc
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/coeff_order.h"
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/ac_strategy.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/coeff_order_fwd.h"
-#include "lib/jxl/dec_ans.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/lehmer_code.h"
-#include "lib/jxl/modular/encoding/encoding.h"
-
-namespace jxl {
-
-static_assert(AcStrategy::kNumValidStrategies == kStrategyOrder.size(),
-              "Update this array when adding or removing AC strategies.");
-
-uint32_t CoeffOrderContext(uint32_t val) {
-  uint32_t token, nbits, bits;
-  HybridUintConfig(0, 0, 0).Encode(val, &token, &nbits, &bits);
-  return std::min(token, kPermutationContexts - 1);
-}
-
-namespace {
-Status ReadPermutation(size_t skip, size_t size, coeff_order_t* order,
-                       BitReader* br, ANSSymbolReader* reader,
-                       const std::vector<uint8_t>& context_map) {
-  std::vector<LehmerT> lehmer(size);
-  // temp space needs to be as large as the next power of 2, so doubling the
-  // allocated size is enough.
-  std::vector<uint32_t> temp(size * 2);
-  uint32_t end =
-      reader->ReadHybridUint(CoeffOrderContext(size), br, context_map) + skip;
-  if (end > size) {
-    return JXL_FAILURE("Invalid permutation size");
-  }
-  uint32_t last = 0;
-  for (size_t i = skip; i < end; ++i) {
-    lehmer[i] =
-        reader->ReadHybridUint(CoeffOrderContext(last), br, context_map);
-    last = lehmer[i];
-    if (lehmer[i] >= size - i) {
-      return JXL_FAILURE("Invalid lehmer code");
-    }
-  }
-  if (order == nullptr) return true;
-  JXL_RETURN_IF_ERROR(
-      DecodeLehmerCode(lehmer.data(), temp.data(), size, order));
-  return true;
-}
-
-}  // namespace
-
-Status DecodePermutation(JxlMemoryManager* memory_manager, size_t skip,
-                         size_t size, coeff_order_t* order, BitReader* br) {
-  std::vector<uint8_t> context_map;
-  ANSCode code;
-  JXL_RETURN_IF_ERROR(DecodeHistograms(memory_manager, br, kPermutationContexts,
-                                       &code, &context_map));
-  JXL_ASSIGN_OR_RETURN(ANSSymbolReader reader,
-                       ANSSymbolReader::Create(&code, br));
-  JXL_RETURN_IF_ERROR(
-      ReadPermutation(skip, size, order, br, &reader, context_map));
-  if (!reader.CheckANSFinalState()) {
-    return JXL_FAILURE("Invalid ANS stream");
-  }
-  return true;
-}
-
-namespace {
-
-Status DecodeCoeffOrder(AcStrategy acs, coeff_order_t* order, BitReader* br,
-                        ANSSymbolReader* reader,
-                        std::vector<coeff_order_t>& natural_order,
-                        const std::vector<uint8_t>& context_map) {
-  const size_t llf = acs.covered_blocks_x() * acs.covered_blocks_y();
-  const size_t size = kDCTBlockSize * llf;
-
-  JXL_RETURN_IF_ERROR(
-      ReadPermutation(llf, size, order, br, reader, context_map));
-  if (order == nullptr) return true;
-  for (size_t k = 0; k < size; ++k) {
-    order[k] = natural_order[order[k]];
-  }
-  return true;
-}
-
-}  // namespace
-
-Status DecodeCoeffOrders(JxlMemoryManager* memory_manager, uint16_t used_orders,
-                         uint32_t used_acs, coeff_order_t* order,
-                         BitReader* br) {
-  uint16_t computed = 0;
-  std::vector<uint8_t> context_map;
-  ANSCode code;
-  ANSSymbolReader reader;
-  std::vector<coeff_order_t> natural_order;
-  // Bitstream does not have histograms if no coefficient order is used.
-  if (used_orders != 0) {
-    JXL_RETURN_IF_ERROR(DecodeHistograms(
-        memory_manager, br, kPermutationContexts, &code, &context_map));
-    JXL_ASSIGN_OR_RETURN(reader, ANSSymbolReader::Create(&code, br));
-  }
-  uint32_t acs_mask = 0;
-  for (uint8_t o = 0; o < AcStrategy::kNumValidStrategies; ++o) {
-    if ((used_acs & (1 << o)) == 0) continue;
-    acs_mask |= 1 << kStrategyOrder[o];
-  }
-  for (uint8_t o = 0; o < AcStrategy::kNumValidStrategies; ++o) {
-    uint8_t ord = kStrategyOrder[o];
-    if (computed & (1 << ord)) continue;
-    computed |= 1 << ord;
-    AcStrategy acs = AcStrategy::FromRawStrategy(o);
-    bool used = (acs_mask & (1 << ord)) != 0;
-
-    const size_t llf = acs.covered_blocks_x() * acs.covered_blocks_y();
-    const size_t size = kDCTBlockSize * llf;
-
-    if (used || (used_orders & (1 << ord))) {
-      if (natural_order.size() < size) natural_order.resize(size);
-      acs.ComputeNaturalCoeffOrder(natural_order.data());
-    }
-
-    if ((used_orders & (1 << ord)) == 0) {
-      // No need to set the default order if no ACS uses this order.
-      if (used) {
-        for (size_t c = 0; c < 3; c++) {
-          memcpy(&order[CoeffOrderOffset(ord, c)], natural_order.data(),
-                 size * sizeof(*order));
-        }
-      }
-    } else {
-      for (size_t c = 0; c < 3; c++) {
-        coeff_order_t* dest = used ? &order[CoeffOrderOffset(ord, c)] : nullptr;
-        JXL_RETURN_IF_ERROR(DecodeCoeffOrder(acs, dest, br, &reader,
-                                             natural_order, context_map));
-      }
-    }
-  }
-  if (used_orders && !reader.CheckANSFinalState()) {
-    return JXL_FAILURE("Invalid ANS stream");
-  }
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/coeff_order.h b/third_party/jpeg-xl/lib/jxl/coeff_order.h
deleted file mode 100644
index 2620d918e3b9a..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/coeff_order.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_COEFF_ORDER_H_
-#define LIB_JXL_COEFF_ORDER_H_
-
-#include <jxl/memory_manager.h>
-
-#include <array>
-#include <cstddef>
-#include <cstdint>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/coeff_order_fwd.h"
-#include "lib/jxl/frame_dimensions.h"
-
-namespace jxl {
-
-class BitReader;
-
-// Those offsets get multiplied by kDCTBlockSize.
-
-static constexpr size_t kCoeffOrderLimit = 6156;
-
-static constexpr std::array<size_t, 3 * kNumOrders + 1> JXL_MAYBE_UNUSED
-    kCoeffOrderOffset = {
-        0,    1,    2,    3,    4,    5,    6,    10,   14,   18,
-        34,   50,   66,   68,   70,   72,   76,   80,   84,   92,
-        100,  108,  172,  236,  300,  332,  364,  396,  652,  908,
-        1164, 1292, 1420, 1548, 2572, 3596, 4620, 5132, 5644, kCoeffOrderLimit};
-
-// TODO(eustas): rollback to constexpr once modern C++ becomes required.
-#define CoeffOrderOffset(O, C) \
-  (kCoeffOrderOffset[3 * (O) + (C)] * kDCTBlockSize)
-
-static JXL_MAYBE_UNUSED constexpr size_t kCoeffOrderMaxSize =
-    kCoeffOrderLimit * kDCTBlockSize;
-
-// Mapping from AC strategy to order bucket. Strategies with different natural
-// orders must have different buckets.
-constexpr std::array<uint8_t, 27> kStrategyOrder = {
-    0, 1, 1, 1, 2, 3, 4, 4, 5,  5,  6,  6,  1,  1,
-    1, 1, 1, 1, 7, 8, 8, 9, 10, 10, 11, 12, 12,
-};
-
-constexpr JXL_MAYBE_UNUSED uint32_t kPermutationContexts = 8;
-
-uint32_t CoeffOrderContext(uint32_t val);
-
-Status DecodeCoeffOrders(JxlMemoryManager* memory_manager, uint16_t used_orders,
-                         uint32_t used_acs, coeff_order_t* order,
-                         BitReader* br);
-
-Status DecodePermutation(JxlMemoryManager* memory_manager, size_t skip,
-                         size_t size, coeff_order_t* order, BitReader* br);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_COEFF_ORDER_H_
diff --git a/third_party/jpeg-xl/lib/jxl/coeff_order_fwd.h b/third_party/jpeg-xl/lib/jxl/coeff_order_fwd.h
deleted file mode 100644
index e5e72a4913c89..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/coeff_order_fwd.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_COEFF_ORDER_FWD_H_
-#define LIB_JXL_COEFF_ORDER_FWD_H_
-
-// Breaks circular dependency between ac_strategy and coeff_order.
-
-#include <cstddef>
-#include <cstdint>
-
-#include "lib/jxl/base/compiler_specific.h"
-
-namespace jxl {
-
-// Needs at least 16 bits. A 32-bit type speeds up DecodeAC by 2% at the cost of
-// more memory.
-using coeff_order_t = uint32_t;
-
-// Maximum number of orders to be used. Note that this needs to be multiplied by
-// the number of channels. One per "size class" (plus one extra for DCT8),
-// shared between transforms of size XxY and of size YxX.
-constexpr uint8_t kNumOrders = 13;
-
-// DCT coefficients are laid out in such a way that the number of rows of
-// coefficients is always the smaller coordinate.
-JXL_INLINE constexpr size_t CoefficientRows(size_t rows, size_t columns) {
-  return rows < columns ? rows : columns;
-}
-
-JXL_INLINE constexpr size_t CoefficientColumns(size_t rows, size_t columns) {
-  return rows < columns ? columns : rows;
-}
-
-JXL_INLINE void CoefficientLayout(size_t* JXL_RESTRICT rows,
-                                  size_t* JXL_RESTRICT columns) {
-  size_t r = *rows;
-  size_t c = *columns;
-  *rows = CoefficientRows(r, c);
-  *columns = CoefficientColumns(r, c);
-}
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_COEFF_ORDER_FWD_H_
diff --git a/third_party/jpeg-xl/lib/jxl/coeff_order_test.cc b/third_party/jpeg-xl/lib/jxl/coeff_order_test.cc
deleted file mode 100644
index 75aca356cce9f..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/coeff_order_test.cc
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/coeff_order.h"
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdio>
-#include <numeric>  // iota
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/random.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/coeff_order_fwd.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/enc_coeff_order.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-void RoundtripPermutation(coeff_order_t* perm, coeff_order_t* out, size_t len,
-                          size_t* size) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  BitWriter writer{memory_manager};
-  ASSERT_TRUE(
-      EncodePermutation(perm, 0, len, &writer, LayerType::Header, nullptr));
-  writer.ZeroPadToByte();
-  Status status = true;
-  Bytes bytes = writer.GetSpan();
-  {
-    BitReader reader(bytes);
-    BitReaderScopedCloser closer(reader, status);
-    ASSERT_TRUE(DecodePermutation(memory_manager, 0, len, out, &reader));
-  }
-  ASSERT_TRUE(status);
-  *size = bytes.size();
-}
-
-enum Permutation { kIdentity, kFewSwaps, kFewSlides, kRandom };
-
-constexpr size_t kSwaps = 32;
-
-void TestPermutation(Permutation kind, size_t len) {
-  std::vector<coeff_order_t> perm(len);
-  std::iota(perm.begin(), perm.end(), 0);
-  Rng rng(0);
-  if (kind == kFewSwaps) {
-    for (size_t i = 0; i < kSwaps; i++) {
-      size_t a = rng.UniformU(0, len - 1);
-      size_t b = rng.UniformU(0, len - 1);
-      std::swap(perm[a], perm[b]);
-    }
-  }
-  if (kind == kFewSlides) {
-    for (size_t i = 0; i < kSwaps; i++) {
-      size_t a = rng.UniformU(0, len - 1);
-      size_t b = rng.UniformU(0, len - 1);
-      size_t from = std::min(a, b);
-      size_t to = std::max(a, b);
-      size_t start = perm[from];
-      for (size_t j = from; j < to; j++) {
-        perm[j] = perm[j + 1];
-      }
-      perm[to] = start;
-    }
-  }
-  if (kind == kRandom) {
-    rng.Shuffle(perm.data(), perm.size());
-  }
-  std::vector<coeff_order_t> out(len);
-  size_t size = 0;
-  RoundtripPermutation(perm.data(), out.data(), len, &size);
-  for (size_t idx = 0; idx < len; idx++) {
-    EXPECT_EQ(perm[idx], out[idx]);
-  }
-  printf("Encoded size: %" PRIuS "\n", size);
-}
-
-TEST(CoeffOrderTest, IdentitySmall) { TestPermutation(kIdentity, 256); }
-TEST(CoeffOrderTest, FewSlidesSmall) { TestPermutation(kFewSlides, 256); }
-TEST(CoeffOrderTest, FewSwapsSmall) { TestPermutation(kFewSwaps, 256); }
-TEST(CoeffOrderTest, RandomSmall) { TestPermutation(kRandom, 256); }
-
-TEST(CoeffOrderTest, IdentityMedium) { TestPermutation(kIdentity, 1 << 12); }
-TEST(CoeffOrderTest, FewSlidesMedium) { TestPermutation(kFewSlides, 1 << 12); }
-TEST(CoeffOrderTest, FewSwapsMedium) { TestPermutation(kFewSwaps, 1 << 12); }
-TEST(CoeffOrderTest, RandomMedium) { TestPermutation(kRandom, 1 << 12); }
-
-TEST(CoeffOrderTest, IdentityBig) { TestPermutation(kIdentity, 1 << 16); }
-TEST(CoeffOrderTest, FewSlidesBig) { TestPermutation(kFewSlides, 1 << 16); }
-TEST(CoeffOrderTest, FewSwapsBig) { TestPermutation(kFewSwaps, 1 << 16); }
-TEST(CoeffOrderTest, RandomBig) { TestPermutation(kRandom, 1 << 16); }
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/color_encoding_internal.cc b/third_party/jpeg-xl/lib/jxl/color_encoding_internal.cc
deleted file mode 100644
index 43f34a65222cd..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/color_encoding_internal.cc
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/color_encoding_internal.h"
-
-#include <array>
-#include <vector>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/cms/color_encoding_cms.h"
-#include "lib/jxl/cms/jxl_cms_internal.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/pack_signed.h"
-
-namespace jxl {
-
-bool CustomTransferFunction::SetImplicit() {
-  if (nonserialized_color_space == ColorSpace::kXYB) {
-    JXL_RETURN_IF_ERROR(storage_.SetGamma(1.0 / 3));
-    return true;
-  }
-  return false;
-}
-
-std::array<ColorEncoding, 2> ColorEncoding::CreateC2(Primaries pr,
-                                                     TransferFunction tf) {
-  std::array<ColorEncoding, 2> c2;
-
-  ColorEncoding* c_rgb = c2.data() + 0;
-  c_rgb->SetColorSpace(ColorSpace::kRGB);
-  c_rgb->storage_.white_point = WhitePoint::kD65;
-  c_rgb->storage_.primaries = pr;
-  c_rgb->storage_.tf.SetTransferFunction(tf);
-  Status status = c_rgb->CreateICC();
-  (void)status;
-  JXL_DASSERT(status);
-
-  ColorEncoding* c_gray = c2.data() + 1;
-  c_gray->SetColorSpace(ColorSpace::kGray);
-  c_gray->storage_.white_point = WhitePoint::kD65;
-  c_gray->storage_.primaries = pr;
-  c_gray->storage_.tf.SetTransferFunction(tf);
-  status = c_gray->CreateICC();
-  (void)status;
-  JXL_DASSERT(status);
-
-  return c2;
-}
-
-const ColorEncoding& ColorEncoding::SRGB(bool is_gray) {
-  static std::array<ColorEncoding, 2> c2 =
-      CreateC2(Primaries::kSRGB, TransferFunction::kSRGB);
-  return c2[is_gray ? 1 : 0];
-}
-const ColorEncoding& ColorEncoding::LinearSRGB(bool is_gray) {
-  static std::array<ColorEncoding, 2> c2 =
-      CreateC2(Primaries::kSRGB, TransferFunction::kLinear);
-  return c2[is_gray ? 1 : 0];
-}
-
-Status ColorEncoding::SetWhitePointType(const WhitePoint& wp) {
-  JXL_ENSURE(storage_.have_fields);
-  storage_.white_point = wp;
-  return true;
-}
-
-Status ColorEncoding::SetPrimariesType(const Primaries& p) {
-  JXL_ENSURE(storage_.have_fields);
-  JXL_ENSURE(HasPrimaries());
-  storage_.primaries = p;
-  return true;
-}
-
-void ColorEncoding::DecideIfWantICC(const JxlCmsInterface& cms) {
-  if (storage_.icc.empty()) return;
-
-  JxlColorEncoding c;
-  JXL_BOOL cmyk;
-  if (!cms.set_fields_from_icc(cms.set_fields_data, storage_.icc.data(),
-                               storage_.icc.size(), &c, &cmyk)) {
-    return;
-  }
-  if (cmyk) return;
-
-  std::vector<uint8_t> icc;
-  if (!MaybeCreateProfile(c, &icc)) return;
-
-  want_icc_ = false;
-}
-
-Customxy::Customxy() { Bundle::Init(this); }
-Status Customxy::VisitFields(Visitor* JXL_RESTRICT visitor) {
-  uint32_t ux = PackSigned(storage_.x);
-  JXL_QUIET_RETURN_IF_ERROR(visitor->U32(Bits(19), BitsOffset(19, 524288),
-                                         BitsOffset(20, 1048576),
-                                         BitsOffset(21, 2097152), 0, &ux));
-  storage_.x = UnpackSigned(ux);
-  uint32_t uy = PackSigned(storage_.y);
-  JXL_QUIET_RETURN_IF_ERROR(visitor->U32(Bits(19), BitsOffset(19, 524288),
-                                         BitsOffset(20, 1048576),
-                                         BitsOffset(21, 2097152), 0, &uy));
-  storage_.y = UnpackSigned(uy);
-  return true;
-}
-
-CustomTransferFunction::CustomTransferFunction() { Bundle::Init(this); }
-Status CustomTransferFunction::VisitFields(Visitor* JXL_RESTRICT visitor) {
-  if (visitor->Conditional(!SetImplicit())) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &storage_.have_gamma));
-
-    if (visitor->Conditional(storage_.have_gamma)) {
-      // Gamma is represented as a 24-bit int, the exponent used is
-      // gamma_ / 1e7. Valid values are (0, 1]. On the low end side, we also
-      // limit it to kMaxGamma/1e7.
-      JXL_QUIET_RETURN_IF_ERROR(visitor->Bits(
-          24, ::jxl::cms::CustomTransferFunction::kGammaMul, &storage_.gamma));
-      if (storage_.gamma > ::jxl::cms::CustomTransferFunction::kGammaMul ||
-          static_cast<uint64_t>(storage_.gamma) *
-                  ::jxl::cms::CustomTransferFunction::kMaxGamma <
-              ::jxl::cms::CustomTransferFunction::kGammaMul) {
-        return JXL_FAILURE("Invalid gamma %u", storage_.gamma);
-      }
-    }
-
-    if (visitor->Conditional(!storage_.have_gamma)) {
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->Enum(TransferFunction::kSRGB, &storage_.transfer_function));
-    }
-  }
-
-  return true;
-}
-
-ColorEncoding::ColorEncoding() { Bundle::Init(this); }
-Status ColorEncoding::VisitFields(Visitor* JXL_RESTRICT visitor) {
-  if (visitor->AllDefault(*this, &all_default)) {
-    // Overwrite all serialized fields, but not any nonserialized_*.
-    visitor->SetDefault(this);
-    return true;
-  }
-
-  JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &want_icc_));
-
-  // Always send even if want_icc_ because this affects decoding.
-  // We can skip the white point/primaries because they do not.
-  JXL_QUIET_RETURN_IF_ERROR(
-      visitor->Enum(ColorSpace::kRGB, &storage_.color_space));
-
-  if (visitor->Conditional(!WantICC())) {
-    // Serialize enums. NOTE: we set the defaults to the most common values so
-    // ImageMetadata.all_default is true in the common case.
-
-    if (visitor->Conditional(!ImplicitWhitePoint())) {
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->Enum(WhitePoint::kD65, &storage_.white_point));
-      if (visitor->Conditional(storage_.white_point == WhitePoint::kCustom)) {
-        white_.storage_ = storage_.white;
-        JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&white_));
-        storage_.white = white_.storage_;
-      }
-    }
-
-    if (visitor->Conditional(HasPrimaries())) {
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->Enum(Primaries::kSRGB, &storage_.primaries));
-      if (visitor->Conditional(storage_.primaries == Primaries::kCustom)) {
-        red_.storage_ = storage_.red;
-        JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&red_));
-        storage_.red = red_.storage_;
-        green_.storage_ = storage_.green;
-        JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&green_));
-        storage_.green = green_.storage_;
-        blue_.storage_ = storage_.blue;
-        JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&blue_));
-        storage_.blue = blue_.storage_;
-      }
-    }
-
-    tf_.nonserialized_color_space = storage_.color_space;
-    tf_.storage_ = storage_.tf;
-    JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&tf_));
-    storage_.tf = tf_.storage_;
-
-    JXL_QUIET_RETURN_IF_ERROR(
-        visitor->Enum(RenderingIntent::kRelative, &storage_.rendering_intent));
-
-    // We didn't have ICC, so all fields should be known.
-    if (storage_.color_space == ColorSpace::kUnknown ||
-        storage_.tf.IsUnknown()) {
-      return JXL_FAILURE(
-          "No ICC but cs %u and tf %u%s",
-          static_cast<unsigned int>(storage_.color_space),
-          storage_.tf.have_gamma
-              ? 0
-              : static_cast<unsigned int>(storage_.tf.transfer_function),
-          storage_.tf.have_gamma ? "(gamma)" : "");
-    }
-
-    JXL_RETURN_IF_ERROR(CreateICC());
-  }
-
-  if (WantICC() && visitor->IsReading()) {
-    // Haven't called SetICC() yet, do nothing.
-  } else {
-    if (ICC().empty()) return JXL_FAILURE("Empty ICC");
-  }
-
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/color_encoding_internal.h b/third_party/jpeg-xl/lib/jxl/color_encoding_internal.h
deleted file mode 100644
index 73148b4ff7daf..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/color_encoding_internal.h
+++ /dev/null
@@ -1,364 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_COLOR_ENCODING_INTERNAL_H_
-#define LIB_JXL_COLOR_ENCODING_INTERNAL_H_
-
-// Metadata for color space conversions.
-
-#include <jxl/cms_interface.h>
-#include <jxl/color_encoding.h>
-#include <jxl/types.h>
-
-#include <array>
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>  // free
-#include <ostream>
-#include <string>
-#include <utility>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/cms/color_encoding_cms.h"
-#include "lib/jxl/cms/jxl_cms_internal.h"
-#include "lib/jxl/field_encodings.h"
-
-namespace jxl {
-
-using IccBytes = ::jxl::cms::IccBytes;
-using ColorSpace = ::jxl::cms::ColorSpace;
-using WhitePoint = ::jxl::cms::WhitePoint;
-using Primaries = ::jxl::cms::Primaries;
-using TransferFunction = ::jxl::cms::TransferFunction;
-using RenderingIntent = ::jxl::cms::RenderingIntent;
-using CIExy = ::jxl::cms::CIExy;
-using PrimariesCIExy = ::jxl::cms::PrimariesCIExy;
-
-namespace cms {
-
-static inline const char* EnumName(ColorSpace /*unused*/) {
-  return "ColorSpace";
-}
-static inline constexpr uint64_t EnumBits(ColorSpace /*unused*/) {
-  using CS = ColorSpace;
-  return MakeBit(CS::kRGB) | MakeBit(CS::kGray) | MakeBit(CS::kXYB) |
-         MakeBit(CS::kUnknown);
-}
-
-static inline const char* EnumName(WhitePoint /*unused*/) {
-  return "WhitePoint";
-}
-static inline constexpr uint64_t EnumBits(WhitePoint /*unused*/) {
-  return MakeBit(WhitePoint::kD65) | MakeBit(WhitePoint::kCustom) |
-         MakeBit(WhitePoint::kE) | MakeBit(WhitePoint::kDCI);
-}
-
-static inline const char* EnumName(Primaries /*unused*/) { return "Primaries"; }
-static inline constexpr uint64_t EnumBits(Primaries /*unused*/) {
-  using Pr = Primaries;
-  return MakeBit(Pr::kSRGB) | MakeBit(Pr::kCustom) | MakeBit(Pr::k2100) |
-         MakeBit(Pr::kP3);
-}
-
-static inline const char* EnumName(TransferFunction /*unused*/) {
-  return "TransferFunction";
-}
-
-static inline constexpr uint64_t EnumBits(TransferFunction /*unused*/) {
-  using TF = TransferFunction;
-  return MakeBit(TF::k709) | MakeBit(TF::kLinear) | MakeBit(TF::kSRGB) |
-         MakeBit(TF::kPQ) | MakeBit(TF::kDCI) | MakeBit(TF::kHLG) |
-         MakeBit(TF::kUnknown);
-}
-
-static inline const char* EnumName(RenderingIntent /*unused*/) {
-  return "RenderingIntent";
-}
-static inline constexpr uint64_t EnumBits(RenderingIntent /*unused*/) {
-  using RI = RenderingIntent;
-  return MakeBit(RI::kPerceptual) | MakeBit(RI::kRelative) |
-         MakeBit(RI::kSaturation) | MakeBit(RI::kAbsolute);
-}
-
-}  // namespace cms
-
-struct ColorEncoding;
-
-// Serializable form of CIExy.
-struct Customxy : public Fields {
-  Customxy();
-  JXL_FIELDS_NAME(Customxy)
-
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override;
-
- private:
-  friend struct ColorEncoding;
-  ::jxl::cms::Customxy storage_;
-};
-
-struct CustomTransferFunction : public Fields {
-  CustomTransferFunction();
-  JXL_FIELDS_NAME(CustomTransferFunction)
-
-  // Sets fields and returns true if nonserialized_color_space has an implicit
-  // transfer function, otherwise leaves fields unchanged and returns false.
-  bool SetImplicit();
-
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override;
-
-  // Must be set before calling VisitFields!
-  ColorSpace nonserialized_color_space = ColorSpace::kRGB;
-
- private:
-  friend struct ColorEncoding;
-  ::jxl::cms::CustomTransferFunction storage_;
-};
-
-// Compact encoding of data required to interpret and translate pixels to a
-// known color space. Stored in Metadata. Thread-compatible.
-struct ColorEncoding : public Fields {
-  ColorEncoding();
-  JXL_FIELDS_NAME(ColorEncoding)
-
-  // Returns ready-to-use color encodings (initialized on-demand).
-  static const ColorEncoding& SRGB(bool is_gray = false);
-  static const ColorEncoding& LinearSRGB(bool is_gray = false);
-
-  // Returns true if an ICC profile was successfully created from fields.
-  // Must be called after modifying fields. Defined in color_management.cc.
-  Status CreateICC() {
-    storage_.icc.clear();
-    const JxlColorEncoding external = ToExternal();
-    if (!MaybeCreateProfile(external, &storage_.icc)) {
-      storage_.icc.clear();
-      return JXL_FAILURE("Failed to create ICC profile");
-    }
-    return true;
-  }
-
-  // Returns non-empty and valid ICC profile, unless:
-  // - WantICC() == true and SetICC() was not yet called;
-  // - after a failed call to SetSRGB(), SetICC(), or CreateICC().
-  const IccBytes& ICC() const { return storage_.icc; }
-
-  // Returns true if `icc` is assigned and decoded successfully. If so,
-  // subsequent WantICC() will return true until DecideIfWantICC() changes it.
-  // Returning false indicates data has been lost.
-  Status SetICC(IccBytes&& icc, const JxlCmsInterface* cms) {
-    JXL_ENSURE(cms != nullptr);
-    JXL_ENSURE(!icc.empty());
-    want_icc_ = storage_.SetFieldsFromICC(std::move(icc), *cms);
-    return want_icc_;
-  }
-
-  // Sets the raw ICC profile bytes, without parsing the ICC, and without
-  // updating the direct fields such as white point, primaries and color
-  // space. Functions to get and set fields, such as SetWhitePoint, cannot be
-  // used anymore after this and functions such as IsSRGB return false no matter
-  // what the contents of the icc profile.
-  void SetICCRaw(IccBytes&& icc) {
-    JXL_DASSERT(!icc.empty());
-    storage_.icc = std::move(icc);
-    storage_.have_fields = false;
-    want_icc_ = true;
-  }
-
-  // Returns whether to send the ICC profile in the codestream.
-  bool WantICC() const { return want_icc_; }
-
-  // Return whether the direct fields are set, if false but ICC is set, only
-  // raw ICC bytes are known.
-  bool HaveFields() const { return storage_.have_fields; }
-
-  // Causes WantICC() to return false if ICC() can be reconstructed from fields.
-  void DecideIfWantICC(const JxlCmsInterface& cms);
-
-  bool IsGray() const { return storage_.color_space == ColorSpace::kGray; }
-  bool IsCMYK() const { return storage_.cmyk; }
-  size_t Channels() const { return storage_.Channels(); }
-
-  // Returns false if the field is invalid and unusable.
-  bool HasPrimaries() const { return storage_.HasPrimaries(); }
-
-  // Returns true after setting the field to a value defined by color_space,
-  // otherwise false and leaves the field unchanged.
-  bool ImplicitWhitePoint() {
-    // TODO(eustas): inline
-    if (storage_.color_space == ColorSpace::kXYB) {
-      storage_.white_point = WhitePoint::kD65;
-      return true;
-    }
-    return false;
-  }
-
-  // Returns whether the color space is known to be sRGB. If a raw unparsed ICC
-  // profile is set without the fields being set, this returns false, even if
-  // the content of the ICC profile would match sRGB.
-  bool IsSRGB() const {
-    if (!storage_.have_fields) return false;
-    if (!IsGray() && storage_.color_space != ColorSpace::kRGB) return false;
-    if (storage_.white_point != WhitePoint::kD65) return false;
-    if (storage_.primaries != Primaries::kSRGB) return false;
-    if (!storage_.tf.IsSRGB()) return false;
-    return true;
-  }
-
-  // Returns whether the color space is known to be linear sRGB. If a raw
-  // unparsed ICC profile is set without the fields being set, this returns
-  // false, even if the content of the ICC profile would match linear sRGB.
-  bool IsLinearSRGB() const {
-    if (!storage_.have_fields) return false;
-    if (!IsGray() && storage_.color_space != ColorSpace::kRGB) return false;
-    if (storage_.white_point != WhitePoint::kD65) return false;
-    if (storage_.primaries != Primaries::kSRGB) return false;
-    if (!storage_.tf.IsLinear()) return false;
-    return true;
-  }
-
-  Status SetSRGB(const ColorSpace cs,
-                 const RenderingIntent ri = RenderingIntent::kRelative) {
-    storage_.icc.clear();
-    JXL_ENSURE(cs == ColorSpace::kGray || cs == ColorSpace::kRGB);
-    storage_.color_space = cs;
-    storage_.white_point = WhitePoint::kD65;
-    storage_.primaries = Primaries::kSRGB;
-    storage_.tf.transfer_function = TransferFunction::kSRGB;
-    storage_.rendering_intent = ri;
-    return CreateICC();
-  }
-
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override;
-
-  // Accessors ensure tf.nonserialized_color_space is updated at the same time.
-  ColorSpace GetColorSpace() const { return storage_.color_space; }
-  void SetColorSpace(const ColorSpace cs) { storage_.color_space = cs; }
-  CIExy GetWhitePoint() const { return storage_.GetWhitePoint(); }
-
-  WhitePoint GetWhitePointType() const { return storage_.white_point; }
-  Status SetWhitePointType(const WhitePoint& wp);
-  Status GetPrimaries(PrimariesCIExy& p) const {
-    return storage_.GetPrimaries(p);
-  }
-
-  Primaries GetPrimariesType() const { return storage_.primaries; }
-  Status SetPrimariesType(const Primaries& p);
-
-  jxl::cms::CustomTransferFunction& Tf() { return storage_.tf; }
-  const jxl::cms::CustomTransferFunction& Tf() const { return storage_.tf; }
-
-  RenderingIntent GetRenderingIntent() const {
-    return storage_.rendering_intent;
-  }
-  void SetRenderingIntent(const RenderingIntent& ri) {
-    storage_.rendering_intent = ri;
-  }
-
-  bool SameColorEncoding(const ColorEncoding& other) const {
-    return storage_.SameColorEncoding(other.storage_);
-  }
-
-  mutable bool all_default;
-
-  JxlColorEncoding ToExternal() const { return storage_.ToExternal(); }
-  Status FromExternal(const JxlColorEncoding& external) {
-    JXL_RETURN_IF_ERROR(storage_.FromExternal(external));
-    (void)CreateICC();
-    return true;
-  }
-  const jxl::cms::ColorEncoding& View() const { return storage_; }
-  std::string Description() const;
-
- private:
-  static std::array<ColorEncoding, 2> CreateC2(Primaries pr,
-                                               TransferFunction tf);
-
-  // If true, the codestream contains an ICC profile and we do not serialize
-  // fields. Otherwise, fields are serialized and we create an ICC profile.
-  bool want_icc_;
-
-  ::jxl::cms::ColorEncoding storage_;
-  // Only used if white_point == kCustom.
-  Customxy white_;
-
-  // Only valid if HaveFields()
-  CustomTransferFunction tf_;
-
-  // Only used if primaries == kCustom.
-  Customxy red_;
-  Customxy green_;
-  Customxy blue_;
-};
-
-static inline std::string Description(const ColorEncoding& c) {
-  const JxlColorEncoding external = c.View().ToExternal();
-  return ColorEncodingDescription(external);
-}
-
-static inline std::ostream& operator<<(std::ostream& os,
-                                       const ColorEncoding& c) {
-  return os << Description(c);
-}
-
-class ColorSpaceTransform {
- public:
-  explicit ColorSpaceTransform(const JxlCmsInterface& cms) : cms_(cms) {}
-  ~ColorSpaceTransform() {
-    if (cms_data_ != nullptr) {
-      cms_.destroy(cms_data_);
-    }
-  }
-
-  // Cannot copy.
-  ColorSpaceTransform(const ColorSpaceTransform&) = delete;
-  ColorSpaceTransform& operator=(const ColorSpaceTransform&) = delete;
-
-  Status Init(const ColorEncoding& c_src, const ColorEncoding& c_dst,
-              float intensity_target, size_t xsize, size_t num_threads) {
-    JxlColorProfile input_profile;
-    icc_src_ = c_src.ICC();
-    input_profile.icc.data = icc_src_.data();
-    input_profile.icc.size = icc_src_.size();
-    input_profile.color_encoding = c_src.ToExternal();
-    input_profile.num_channels = c_src.IsCMYK() ? 4 : c_src.Channels();
-    JxlColorProfile output_profile;
-    icc_dst_ = c_dst.ICC();
-    output_profile.icc.data = icc_dst_.data();
-    output_profile.icc.size = icc_dst_.size();
-    output_profile.color_encoding = c_dst.ToExternal();
-    if (c_dst.IsCMYK())
-      return JXL_FAILURE("Conversion to CMYK is not supported");
-    output_profile.num_channels = c_dst.Channels();
-    cms_data_ = cms_.init(cms_.init_data, num_threads, xsize, &input_profile,
-                          &output_profile, intensity_target);
-    JXL_RETURN_IF_ERROR(cms_data_ != nullptr);
-    return true;
-  }
-
-  float* BufSrc(const size_t thread) const {
-    return cms_.get_src_buf(cms_data_, thread);
-  }
-
-  float* BufDst(const size_t thread) const {
-    return cms_.get_dst_buf(cms_data_, thread);
-  }
-
-  Status Run(const size_t thread, const float* buf_src, float* buf_dst,
-             size_t xsize) {
-    // TODO(eustas): convert false to Status?
-    return FROM_JXL_BOOL(cms_.run(cms_data_, thread, buf_src, buf_dst, xsize));
-  }
-
- private:
-  JxlCmsInterface cms_;
-  void* cms_data_ = nullptr;
-  // The interface may retain pointers into these.
-  IccBytes icc_src_;
-  IccBytes icc_dst_;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_COLOR_ENCODING_INTERNAL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/color_encoding_internal_test.cc b/third_party/jpeg-xl/lib/jxl/color_encoding_internal_test.cc
deleted file mode 100644
index a7ce308b2657f..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/color_encoding_internal_test.cc
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/color_encoding_internal.h"
-
-#include <jxl/color_encoding.h>
-
-#include <cstdlib>  // rand
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/cms/color_encoding_cms.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-using ::jxl::cms::ColorEncoding;
-
-TEST(ColorEncodingTest, RoundTripAll) {
-  for (const test::ColorEncodingDescriptor& cdesc : test::AllEncodings()) {
-    ColorEncoding c_original = test::ColorEncodingFromDescriptor(cdesc).View();
-    // Verify Set(Get) yields the same white point/primaries/gamma.
-    {
-      ColorEncoding c;
-      EXPECT_TRUE(c.SetWhitePoint(c_original.GetWhitePoint()));
-      EXPECT_EQ(c_original.white_point, c.white_point);
-    }
-    {
-      ColorEncoding c;
-      PrimariesCIExy p;
-      ASSERT_TRUE(c_original.GetPrimaries(p));
-      EXPECT_TRUE(c.SetPrimaries(p));
-      EXPECT_EQ(c_original.primaries, c.primaries);
-    }
-    if (c_original.tf.have_gamma) {
-      ColorEncoding c;
-      EXPECT_TRUE(c.tf.SetGamma(c_original.tf.GetGamma()));
-      EXPECT_TRUE(c_original.tf.IsSame(c.tf));
-    }
-  }
-}
-
-TEST(ColorEncodingTest, CustomWhitePoint) {
-  ColorEncoding c;
-  // Nonsensical values
-  CIExy xy_in;
-  xy_in.x = 0.8;
-  xy_in.y = 0.01;
-  EXPECT_TRUE(c.SetWhitePoint(xy_in));
-  const CIExy xy = c.GetWhitePoint();
-
-  ColorEncoding c2;
-  EXPECT_TRUE(c2.SetWhitePoint(xy));
-  EXPECT_TRUE(c.SameColorSpace(c2));
-}
-
-TEST(ColorEncodingTest, CustomPrimaries) {
-  ColorEncoding c;
-  PrimariesCIExy xy_in;
-  // Nonsensical values
-  xy_in.r.x = -0.01;
-  xy_in.r.y = 0.2;
-  xy_in.g.x = 0.4;
-  xy_in.g.y = 0.401;
-  xy_in.b.x = 1.1;
-  xy_in.b.y = -1.2;
-  EXPECT_TRUE(c.SetPrimaries(xy_in));
-  PrimariesCIExy xy;
-  ASSERT_TRUE(c.GetPrimaries(xy));
-
-  ColorEncoding c2;
-  EXPECT_TRUE(c2.SetPrimaries(xy));
-  EXPECT_TRUE(c.SameColorSpace(c2));
-}
-
-TEST(ColorEncodingTest, CustomGamma) {
-  ColorEncoding c;
-  if (!JXL_CRASH_ON_ERROR) {
-    EXPECT_FALSE(c.tf.SetGamma(0.0));
-    EXPECT_FALSE(c.tf.SetGamma(-1E-6));
-    EXPECT_FALSE(c.tf.SetGamma(1.001));
-  }
-
-  EXPECT_TRUE(c.tf.SetGamma(1.0));
-  EXPECT_FALSE(c.tf.have_gamma);
-  EXPECT_TRUE(c.tf.IsLinear());
-
-  EXPECT_TRUE(c.tf.SetGamma(0.123));
-  EXPECT_TRUE(c.tf.have_gamma);
-  const double gamma = c.tf.GetGamma();
-
-  ColorEncoding c2;
-  EXPECT_TRUE(c2.tf.SetGamma(gamma));
-  EXPECT_TRUE(c.SameColorEncoding(c2));
-  EXPECT_TRUE(c2.tf.have_gamma);
-}
-
-TEST(ColorEncodingTest, InternalExternalConversion) {
-  ColorEncoding source_internal;
-  ColorEncoding destination_internal;
-
-  const auto rand_float = []() {
-    return (static_cast<float>(rand()) / static_cast<float>(RAND_MAX) * 0.5) +
-           0.25;
-  };
-
-  for (int i = 0; i < 100; i++) {
-    source_internal.color_space = static_cast<ColorSpace>(rand() % 4);
-    CIExy wp;
-    wp.x = rand_float();
-    wp.y = rand_float();
-    EXPECT_TRUE(source_internal.SetWhitePoint(wp));
-    if (source_internal.HasPrimaries()) {
-      PrimariesCIExy primaries;
-      primaries.r.x = rand_float();
-      primaries.r.y = rand_float();
-      primaries.g.x = rand_float();
-      primaries.g.y = rand_float();
-      primaries.b.x = rand_float();
-      primaries.b.y = rand_float();
-      EXPECT_TRUE(source_internal.SetPrimaries(primaries));
-    }
-    jxl::cms::CustomTransferFunction tf;
-    EXPECT_TRUE(tf.SetGamma(rand_float()));
-    source_internal.tf = tf;
-    source_internal.rendering_intent = static_cast<RenderingIntent>(rand() % 4);
-
-    JxlColorEncoding external = source_internal.ToExternal();
-    EXPECT_TRUE(destination_internal.FromExternal(external));
-
-    EXPECT_EQ(source_internal.color_space, destination_internal.color_space);
-    EXPECT_EQ(source_internal.white_point, destination_internal.white_point);
-    CIExy src_wp = source_internal.GetWhitePoint();
-    CIExy dst_wp = destination_internal.GetWhitePoint();
-    EXPECT_EQ(src_wp.x, dst_wp.x);
-    EXPECT_EQ(src_wp.y, dst_wp.y);
-    if (source_internal.HasPrimaries()) {
-      PrimariesCIExy src_p;
-      ASSERT_TRUE(source_internal.GetPrimaries(src_p));
-      PrimariesCIExy dst_p;
-      ASSERT_TRUE(destination_internal.GetPrimaries(dst_p));
-      EXPECT_EQ(src_p.r.x, dst_p.r.x);
-      EXPECT_EQ(src_p.r.y, dst_p.r.y);
-      EXPECT_EQ(src_p.g.x, dst_p.g.x);
-      EXPECT_EQ(src_p.g.y, dst_p.g.y);
-      EXPECT_EQ(src_p.b.x, dst_p.b.x);
-      EXPECT_EQ(src_p.b.y, dst_p.b.y);
-    }
-    EXPECT_EQ(source_internal.tf.have_gamma,
-              destination_internal.tf.have_gamma);
-    if (source_internal.tf.have_gamma) {
-      EXPECT_EQ(source_internal.tf.GetGamma(),
-                destination_internal.tf.GetGamma());
-    } else {
-      EXPECT_EQ(source_internal.tf.GetTransferFunction(),
-                destination_internal.tf.GetTransferFunction());
-    }
-    EXPECT_EQ(source_internal.rendering_intent,
-              destination_internal.rendering_intent);
-  }
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/color_management_test.cc b/third_party/jpeg-xl/lib/jxl/color_management_test.cc
deleted file mode 100644
index 2a56edd316b0e..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/color_management_test.cc
+++ /dev/null
@@ -1,469 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/cms.h>
-#include <jxl/cms_interface.h>
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-#include <ostream>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/cms/color_encoding_cms.h"
-#include "lib/jxl/cms/opsin_params.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/enc_xyb.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/image_test_utils.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-
-std::ostream& operator<<(std::ostream& os, const CIExy& xy) {
-  return os << "{x=" << xy.x << ", y=" << xy.y << "}";
-}
-
-std::ostream& operator<<(std::ostream& os, const PrimariesCIExy& primaries) {
-  return os << "{r=" << primaries.r << ", g=" << primaries.g
-            << ", b=" << primaries.b << "}";
-}
-
-namespace {
-
-// Small enough to be fast. If changed, must update Generate*.
-constexpr size_t kWidth = 16;
-
-constexpr size_t kNumThreads = 1;  // only have a single row.
-
-struct Globals {
-  // TODO(deymo): Make this a const.
-  static Globals* GetInstance() {
-    static Globals ret;
-    return &ret;
-  }
-
- private:
-  Globals() {
-    JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-    in_gray = GenerateGray();
-    in_color = GenerateColor();
-    JXL_TEST_ASSIGN_OR_DIE(out_gray, ImageF::Create(memory_manager, kWidth, 1));
-    JXL_TEST_ASSIGN_OR_DIE(out_color,
-                           ImageF::Create(memory_manager, kWidth * 3, 1));
-
-    c_native = ColorEncoding::LinearSRGB(/*is_gray=*/false);
-    c_gray = ColorEncoding::LinearSRGB(/*is_gray=*/true);
-  }
-
-  static ImageF GenerateGray() {
-    JXL_TEST_ASSIGN_OR_DIE(
-        ImageF gray, ImageF::Create(jxl::test::MemoryManager(), kWidth, 1));
-    float* JXL_RESTRICT row = gray.Row(0);
-    // Increasing left to right
-    for (uint32_t x = 0; x < kWidth; ++x) {
-      row[x] = x * 1.0f / (kWidth - 1);  // [0, 1]
-    }
-    return gray;
-  }
-
-  static ImageF GenerateColor() {
-    JXL_TEST_ASSIGN_OR_DIE(
-        ImageF image,
-        ImageF::Create(jxl::test::MemoryManager(), kWidth * 3, 1));
-    float* JXL_RESTRICT interleaved = image.Row(0);
-    std::fill(interleaved, interleaved + kWidth * 3, 0.0f);
-
-    // [0, 4): neutral
-    for (int32_t x = 0; x < 4; ++x) {
-      interleaved[3 * x + 0] = x * 1.0f / 3;  // [0, 1]
-      interleaved[3 * x + 2] = interleaved[3 * x + 1] = interleaved[3 * x + 0];
-    }
-
-    // [4, 13): pure RGB with low/medium/high saturation
-    for (int32_t c = 0; c < 3; ++c) {
-      interleaved[3 * (4 + c) + c] = 0.08f + c * 0.01f;
-      interleaved[3 * (7 + c) + c] = 0.75f + c * 0.01f;
-      interleaved[3 * (10 + c) + c] = 1.0f;
-    }
-
-    // [13, 16): impure, not quite saturated RGB
-    interleaved[3 * 13 + 0] = 0.86f;
-    interleaved[3 * 13 + 2] = interleaved[3 * 13 + 1] = 0.16f;
-    interleaved[3 * 14 + 1] = 0.87f;
-    interleaved[3 * 14 + 2] = interleaved[3 * 14 + 0] = 0.16f;
-    interleaved[3 * 15 + 2] = 0.88f;
-    interleaved[3 * 15 + 1] = interleaved[3 * 15 + 0] = 0.16f;
-
-    return image;
-  }
-
- public:
-  // ImageF so we can use VerifyRelativeError; all are interleaved RGB.
-  ImageF in_gray;
-  ImageF in_color;
-  ImageF out_gray;
-  ImageF out_color;
-  ColorEncoding c_native;
-  ColorEncoding c_gray;
-};
-
-class ColorManagementTest
-    : public ::testing::TestWithParam<test::ColorEncodingDescriptor> {
- public:
-  // "Same" pixels after converting g->c_native -> c -> g->c_native.
-  static void VerifyPixelRoundTrip(const ColorEncoding& c) {
-    Globals* g = Globals::GetInstance();
-    const ColorEncoding& c_native = c.IsGray() ? g->c_gray : g->c_native;
-    const JxlCmsInterface& cms = *JxlGetDefaultCms();
-    ColorSpaceTransform xform_fwd(cms);
-    ColorSpaceTransform xform_rev(cms);
-    const float intensity_target =
-        c.Tf().IsHLG() ? 1000 : kDefaultIntensityTarget;
-    ASSERT_TRUE(
-        xform_fwd.Init(c_native, c, intensity_target, kWidth, kNumThreads));
-    ASSERT_TRUE(
-        xform_rev.Init(c, c_native, intensity_target, kWidth, kNumThreads));
-
-    const size_t thread = 0;
-    const ImageF& in = c.IsGray() ? g->in_gray : g->in_color;
-    ImageF* JXL_RESTRICT out = c.IsGray() ? &g->out_gray : &g->out_color;
-    ASSERT_TRUE(
-        xform_fwd.Run(thread, in.Row(0), xform_fwd.BufDst(thread), kWidth));
-    ASSERT_TRUE(
-        xform_rev.Run(thread, xform_fwd.BufDst(thread), out->Row(0), kWidth));
-
-    // With lcms2, this value is lower: 5E-5
-    double max_l1 = 7E-4;
-    // Most are lower; reached 3E-7 with D60 AP0.
-    double max_rel = 4E-7;
-    if (c.IsGray()) max_rel = 2E-5;
-    JXL_TEST_ASSERT_OK(VerifyRelativeError(in, *out, max_l1, max_rel, _));
-  }
-};
-JXL_GTEST_INSTANTIATE_TEST_SUITE_P(ColorManagementTestInstantiation,
-                                   ColorManagementTest,
-                                   ::testing::ValuesIn(test::AllEncodings()));
-
-// Exercises the ColorManagement interface for ALL ColorEncoding synthesizable
-// via enums.
-TEST_P(ColorManagementTest, VerifyAllProfiles) {
-  ColorEncoding actual = ColorEncodingFromDescriptor(GetParam());
-  printf("%s\n", Description(actual).c_str());
-
-  // Can create profile.
-  ASSERT_TRUE(actual.CreateICC());
-
-  // Can set an equivalent ColorEncoding from the generated ICC profile.
-  ColorEncoding expected;
-  ASSERT_TRUE(expected.SetICC(IccBytes(actual.ICC()), JxlGetDefaultCms()));
-
-  EXPECT_EQ(actual.GetRenderingIntent(), expected.GetRenderingIntent())
-      << "different rendering intent: " << ToString(actual.GetRenderingIntent())
-      << " instead of " << ToString(expected.GetRenderingIntent());
-  EXPECT_EQ(actual.GetColorSpace(), expected.GetColorSpace())
-      << "different color space: " << ToString(actual.GetColorSpace())
-      << " instead of " << ToString(expected.GetColorSpace());
-  EXPECT_EQ(actual.GetWhitePointType(), expected.GetWhitePointType())
-      << "different white point: " << ToString(actual.GetWhitePointType())
-      << " instead of " << ToString(expected.GetWhitePointType());
-  EXPECT_EQ(actual.HasPrimaries(), expected.HasPrimaries());
-  if (actual.HasPrimaries()) {
-    EXPECT_EQ(actual.GetPrimariesType(), expected.GetPrimariesType())
-        << "different primaries: " << ToString(actual.GetPrimariesType())
-        << " instead of " << ToString(expected.GetPrimariesType());
-  }
-
-  static const auto tf_to_string =
-      [](const jxl::cms::CustomTransferFunction& tf) {
-        if (tf.have_gamma) {
-          return "g" + ToString(tf.GetGamma());
-        }
-        return ToString(tf.transfer_function);
-      };
-  EXPECT_TRUE(actual.Tf().IsSame(expected.Tf()))
-      << "different transfer function: " << tf_to_string(actual.Tf())
-      << " instead of " << tf_to_string(expected.Tf());
-
-  VerifyPixelRoundTrip(actual);
-}
-
-#define EXPECT_CIEXY_NEAR(A, E, T)                                       \
-  {                                                                      \
-    CIExy _actual = (A);                                                 \
-    CIExy _expected = (E);                                               \
-    double _tolerance = (T);                                             \
-    EXPECT_NEAR(_actual.x, _expected.x, _tolerance) << "x is different"; \
-    EXPECT_NEAR(_actual.y, _expected.y, _tolerance) << "y is different"; \
-  }
-
-#define EXPECT_PRIMARIES_NEAR(A, E, T)                                         \
-  {                                                                            \
-    PrimariesCIExy _actual = (A);                                              \
-    PrimariesCIExy _expected = (E);                                            \
-    double _tolerance = (T);                                                   \
-    EXPECT_NEAR(_actual.r.x, _expected.r.x, _tolerance) << "r.x is different"; \
-    EXPECT_NEAR(_actual.r.y, _expected.r.y, _tolerance) << "r.y is different"; \
-    EXPECT_NEAR(_actual.g.x, _expected.g.x, _tolerance) << "g.x is different"; \
-    EXPECT_NEAR(_actual.g.y, _expected.g.y, _tolerance) << "g.y is different"; \
-    EXPECT_NEAR(_actual.b.x, _expected.b.x, _tolerance) << "b.x is different"; \
-    EXPECT_NEAR(_actual.b.y, _expected.b.y, _tolerance) << "b.y is different"; \
-  }
-
-TEST_F(ColorManagementTest, sRGBChromaticity) {
-  const ColorEncoding sRGB = ColorEncoding::SRGB();
-  EXPECT_CIEXY_NEAR(sRGB.GetWhitePoint(), CIExy(0.3127, 0.3290), 1e-4);
-  PrimariesCIExy srgb_primaries = {{0.64, 0.33}, {0.30, 0.60}, {0.15, 0.06}};
-  PrimariesCIExy p;
-  ASSERT_TRUE(sRGB.GetPrimaries(p));
-  EXPECT_PRIMARIES_NEAR(p, srgb_primaries, 1e-4);
-}
-
-TEST_F(ColorManagementTest, D2700Chromaticity) {
-  std::vector<uint8_t> icc_data =
-      jxl::test::ReadTestData("jxl/color_management/sRGB-D2700.icc");
-  IccBytes icc;
-  Bytes(icc_data).AppendTo(icc);
-  ColorEncoding sRGB_D2700;
-  ASSERT_TRUE(sRGB_D2700.SetICC(std::move(icc), JxlGetDefaultCms()));
-
-  EXPECT_CIEXY_NEAR(sRGB_D2700.GetWhitePoint(), CIExy(0.45986, 0.41060), 1e-4);
-  // The illuminant-relative chromaticities of this profile's primaries are the
-  // same as for sRGB. It is the PCS-relative chromaticities that would be
-  // different.
-  PrimariesCIExy srgb_primaries = {{0.64, 0.33}, {0.30, 0.60}, {0.15, 0.06}};
-  PrimariesCIExy p;
-  ASSERT_TRUE(sRGB_D2700.GetPrimaries(p));
-  EXPECT_PRIMARIES_NEAR(p, srgb_primaries, 1e-4);
-}
-
-TEST_F(ColorManagementTest, D2700ToSRGB) {
-  std::vector<uint8_t> icc_data =
-      jxl::test::ReadTestData("jxl/color_management/sRGB-D2700.icc");
-  IccBytes icc;
-  Bytes(icc_data).AppendTo(icc);
-  ColorEncoding sRGB_D2700;
-  ASSERT_TRUE(sRGB_D2700.SetICC(std::move(icc), JxlGetDefaultCms()));
-
-  ColorSpaceTransform transform(*JxlGetDefaultCms());
-  ASSERT_TRUE(transform.Init(sRGB_D2700, ColorEncoding::SRGB(),
-                             kDefaultIntensityTarget, 1, 1));
-  Color sRGB_D2700_values{0.863, 0.737, 0.490};
-  Color sRGB_values;
-  ASSERT_TRUE(
-      transform.Run(0, sRGB_D2700_values.data(), sRGB_values.data(), 1));
-  Color sRGB_expected{0.914, 0.745, 0.601};
-  EXPECT_ARRAY_NEAR(sRGB_values, sRGB_expected, 1e-3);
-}
-
-TEST_F(ColorManagementTest, P3HlgTo2020Hlg) {
-  ColorEncoding p3_hlg;
-  p3_hlg.SetColorSpace(ColorSpace::kRGB);
-  ASSERT_TRUE(p3_hlg.SetWhitePointType(WhitePoint::kD65));
-  ASSERT_TRUE(p3_hlg.SetPrimariesType(Primaries::kP3));
-  p3_hlg.Tf().SetTransferFunction(TransferFunction::kHLG);
-  ASSERT_TRUE(p3_hlg.CreateICC());
-
-  ColorEncoding rec2020_hlg = p3_hlg;
-  ASSERT_TRUE(rec2020_hlg.SetPrimariesType(Primaries::k2100));
-  ASSERT_TRUE(rec2020_hlg.CreateICC());
-
-  ColorSpaceTransform transform(*JxlGetDefaultCms());
-  ASSERT_TRUE(transform.Init(p3_hlg, rec2020_hlg, 1000, 1, 1));
-  Color p3_hlg_values{0., 0.75, 0.};
-  Color rec2020_hlg_values;
-  ASSERT_TRUE(
-      transform.Run(0, p3_hlg_values.data(), rec2020_hlg_values.data(), 1));
-  Color rec2020_hlg_expected{0.3973, 0.7382, 0.1183};
-  EXPECT_ARRAY_NEAR(rec2020_hlg_values, rec2020_hlg_expected, 1e-4);
-}
-
-TEST_F(ColorManagementTest, HlgOotf) {
-  ColorEncoding p3_hlg;
-  p3_hlg.SetColorSpace(ColorSpace::kRGB);
-  ASSERT_TRUE(p3_hlg.SetWhitePointType(WhitePoint::kD65));
-  ASSERT_TRUE(p3_hlg.SetPrimariesType(Primaries::kP3));
-  p3_hlg.Tf().SetTransferFunction(TransferFunction::kHLG);
-  ASSERT_TRUE(p3_hlg.CreateICC());
-
-  ColorSpaceTransform transform_to_1000(*JxlGetDefaultCms());
-  ASSERT_TRUE(
-      transform_to_1000.Init(p3_hlg, ColorEncoding::LinearSRGB(), 1000, 1, 1));
-  // HDR reference white: https://www.itu.int/pub/R-REP-BT.2408-4-2021
-  Color p3_hlg_values{0.75, 0.75, 0.75};
-  Color linear_srgb_values;
-  ASSERT_TRUE(transform_to_1000.Run(0, p3_hlg_values.data(),
-                                    linear_srgb_values.data(), 1));
-  // On a 1000-nit display, HDR reference white should be 203 cd/m² which is
-  // 0.203 times the maximum.
-  EXPECT_ARRAY_NEAR(linear_srgb_values, (Color{0.203, 0.203, 0.203}), 1e-3);
-
-  ColorSpaceTransform transform_to_400(*JxlGetDefaultCms());
-  ASSERT_TRUE(
-      transform_to_400.Init(p3_hlg, ColorEncoding::LinearSRGB(), 400, 1, 1));
-  ASSERT_TRUE(transform_to_400.Run(0, p3_hlg_values.data(),
-                                   linear_srgb_values.data(), 1));
-  // On a 400-nit display, it should be 100 cd/m².
-  EXPECT_ARRAY_NEAR(linear_srgb_values, (Color{0.250, 0.250, 0.250}), 1e-3);
-
-  p3_hlg_values[2] = 0.50;
-  ASSERT_TRUE(transform_to_1000.Run(0, p3_hlg_values.data(),
-                                    linear_srgb_values.data(), 1));
-  EXPECT_ARRAY_NEAR(linear_srgb_values, (Color{0.201, 0.201, 0.050}), 1e-3);
-
-  ColorSpaceTransform transform_from_400(*JxlGetDefaultCms());
-  ASSERT_TRUE(
-      transform_from_400.Init(ColorEncoding::LinearSRGB(), p3_hlg, 400, 1, 1));
-  linear_srgb_values[0] = linear_srgb_values[1] = linear_srgb_values[2] = 0.250;
-  ASSERT_TRUE(transform_from_400.Run(0, linear_srgb_values.data(),
-                                     p3_hlg_values.data(), 1));
-  EXPECT_ARRAY_NEAR(p3_hlg_values, (Color{0.75, 0.75, 0.75}), 1e-3);
-
-  ColorEncoding grayscale_hlg;
-  grayscale_hlg.SetColorSpace(ColorSpace::kGray);
-  ASSERT_TRUE(grayscale_hlg.SetWhitePointType(WhitePoint::kD65));
-  grayscale_hlg.Tf().SetTransferFunction(TransferFunction::kHLG);
-  ASSERT_TRUE(grayscale_hlg.CreateICC());
-
-  ColorSpaceTransform grayscale_transform(*JxlGetDefaultCms());
-  ASSERT_TRUE(grayscale_transform.Init(
-      grayscale_hlg, ColorEncoding::LinearSRGB(/*is_gray=*/true), 1000, 1, 1));
-  const float grayscale_hlg_value = 0.75;
-  float linear_grayscale_value;
-  ASSERT_TRUE(grayscale_transform.Run(0, &grayscale_hlg_value,
-                                      &linear_grayscale_value, 1));
-  EXPECT_NEAR(linear_grayscale_value, 0.203, 1e-3);
-}
-
-TEST_F(ColorManagementTest, XYBProfile) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  ColorEncoding c_xyb;
-  c_xyb.SetColorSpace(ColorSpace::kXYB);
-  c_xyb.SetRenderingIntent(RenderingIntent::kPerceptual);
-  ASSERT_TRUE(c_xyb.CreateICC());
-  ColorEncoding c_native = ColorEncoding::LinearSRGB(false);
-
-  static const size_t kGridDim = 17;
-  static const size_t kNumColors = kGridDim * kGridDim * kGridDim;
-  const JxlCmsInterface& cms = *JxlGetDefaultCms();
-  ColorSpaceTransform xform(cms);
-  ASSERT_TRUE(
-      xform.Init(c_xyb, c_native, kDefaultIntensityTarget, kNumColors, 1));
-
-  ImageMetadata metadata;
-  metadata.color_encoding = c_native;
-  ImageBundle ib(memory_manager, &metadata);
-  JXL_TEST_ASSIGN_OR_DIE(Image3F native,
-                         Image3F::Create(memory_manager, kNumColors, 1));
-  float mul = 1.0f / (kGridDim - 1);
-  for (size_t ir = 0, x = 0; ir < kGridDim; ++ir) {
-    for (size_t ig = 0; ig < kGridDim; ++ig) {
-      for (size_t ib = 0; ib < kGridDim; ++ib, ++x) {
-        native.PlaneRow(0, 0)[x] = ir * mul;
-        native.PlaneRow(1, 0)[x] = ig * mul;
-        native.PlaneRow(2, 0)[x] = ib * mul;
-      }
-    }
-  }
-  ASSERT_TRUE(ib.SetFromImage(std::move(native), c_native));
-  const Image3F& in = *ib.color();
-  JXL_TEST_ASSIGN_OR_DIE(Image3F opsin,
-                         Image3F::Create(memory_manager, kNumColors, 1));
-  ASSERT_TRUE(ToXYB(ib, nullptr, &opsin, cms, nullptr));
-
-  JXL_TEST_ASSIGN_OR_DIE(Image3F opsin2,
-                         Image3F::Create(memory_manager, kNumColors, 1));
-  ASSERT_TRUE(CopyImageTo(opsin, &opsin2));
-  ScaleXYB(&opsin2);
-
-  float* src = xform.BufSrc(0);
-  for (size_t i = 0; i < kNumColors; ++i) {
-    for (size_t c = 0; c < 3; ++c) {
-      src[3 * i + c] = opsin2.PlaneRow(c, 0)[i];
-    }
-  }
-
-  float* dst = xform.BufDst(0);
-  ASSERT_TRUE(xform.Run(0, src, dst, kNumColors));
-
-  JXL_TEST_ASSIGN_OR_DIE(Image3F out,
-                         Image3F::Create(memory_manager, kNumColors, 1));
-  for (size_t i = 0; i < kNumColors; ++i) {
-    for (size_t c = 0; c < 3; ++c) {
-      out.PlaneRow(c, 0)[i] = dst[3 * i + c];
-    }
-  }
-
-  auto debug_print_color = [&](size_t i) {
-    printf(
-        "(%f, %f, %f) -> (%9.6f, %f, %f) -> (%f, %f, %f) -> "
-        "(%9.6f, %9.6f, %9.6f)",
-        in.PlaneRow(0, 0)[i], in.PlaneRow(1, 0)[i], in.PlaneRow(2, 0)[i],
-        opsin.PlaneRow(0, 0)[i], opsin.PlaneRow(1, 0)[i],
-        opsin.PlaneRow(2, 0)[i], opsin2.PlaneRow(0, 0)[i],
-        opsin2.PlaneRow(1, 0)[i], opsin2.PlaneRow(2, 0)[i],
-        out.PlaneRow(0, 0)[i], out.PlaneRow(1, 0)[i], out.PlaneRow(2, 0)[i]);
-  };
-
-  float max_err[3] = {};
-  size_t max_err_i[3] = {};
-  for (size_t i = 0; i < kNumColors; ++i) {
-    for (size_t c = 0; c < 3; ++c) {
-      // debug_print_color(i); printf("\n");
-      float err = std::abs(in.PlaneRow(c, 0)[i] - out.PlaneRow(c, 0)[i]);
-      if (err > max_err[c]) {
-        max_err[c] = err;
-        max_err_i[c] = i;
-      }
-    }
-  }
-  static float kMaxError[3] = {8.7e-4, 4.4e-4, 5.2e-4};
-  printf("Maximum errors:\n");
-  for (size_t c = 0; c < 3; ++c) {
-    debug_print_color(max_err_i[c]);
-    printf("    %f\n", max_err[c]);
-    EXPECT_LT(max_err[c], kMaxError[c]);
-  }
-}
-
-TEST_F(ColorManagementTest, GoldenXYBCube) {
-  std::vector<int32_t> actual;
-  const jxl::cms::ColorCube3D& cube = jxl::cms::UnscaledA2BCube();
-  for (size_t ix = 0; ix < 2; ++ix) {
-    for (size_t iy = 0; iy < 2; ++iy) {
-      for (size_t ib = 0; ib < 2; ++ib) {
-        const jxl::cms::ColorCube0D& out_f = cube[ix][iy][ib];
-        for (int i = 0; i < 3; ++i) {
-          int32_t val = static_cast<int32_t>(std::lroundf(65535 * out_f[i]));
-          ASSERT_TRUE(val >= 0 && val <= 65535);
-          actual.push_back(val);
-        }
-      }
-    }
-  }
-
-  std::vector<int32_t> expected = {0,     3206,  0,     0,     3206,  28873,
-                                   62329, 65535, 36662, 62329, 65535, 65535,
-                                   3206,  0,     0,     3206,  0,     28873,
-                                   65535, 62329, 36662, 65535, 62329, 65535};
-  EXPECT_EQ(actual, expected);
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/common.h b/third_party/jpeg-xl/lib/jxl/common.h
deleted file mode 100644
index d5932444330e1..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/common.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_COMMON_H_
-#define LIB_JXL_COMMON_H_
-
-// Shared constants.
-
-#include <cstddef>
-
-#ifndef JXL_HIGH_PRECISION
-#define JXL_HIGH_PRECISION 1
-#endif
-
-// Macro that defines whether support for decoding JXL files to JPEG is enabled.
-#ifndef JPEGXL_ENABLE_TRANSCODE_JPEG
-#define JPEGXL_ENABLE_TRANSCODE_JPEG 1
-#endif  // JPEGXL_ENABLE_TRANSCODE_JPEG
-
-// Macro that defines whether support for decoding boxes is enabled.
-#ifndef JPEGXL_ENABLE_BOXES
-#define JPEGXL_ENABLE_BOXES 1
-#endif  // JPEGXL_ENABLE_BOXES
-
-namespace jxl {
-// Some enums and typedefs used by more than one header file.
-
-// Maximum number of passes in an image.
-constexpr size_t kMaxNumPasses = 11;
-
-// Maximum number of reference frames.
-constexpr size_t kMaxNumReferenceFrames = 4;
-
-enum class SpeedTier {
-  // Try multiple combinations of Glacier flags for modular mode. Otherwise
-  // like kGlacier.
-  kTectonicPlate = -1,
-  // Learn a global tree in Modular mode.
-  kGlacier = 0,
-  // Turns on FindBestQuantizationHQ loop. Equivalent to "guetzli" mode.
-  kTortoise = 1,
-  // Turns on FindBestQuantization butteraugli loop.
-  kKitten = 2,
-  // Turns on dots, patches, and spline detection by default, as well as full
-  // context clustering. Default.
-  kSquirrel = 3,
-  // Turns on error diffusion and full AC strategy heuristics. Equivalent to
-  // "fast" mode.
-  kWombat = 4,
-  // Turns on gaborish by default, non-default cmap, initial quant field.
-  kHare = 5,
-  // Turns on simple heuristics for AC strategy, quant field, and clustering;
-  // also enables coefficient reordering.
-  kCheetah = 6,
-  // Turns off most encoder features. Does context clustering.
-  // Modular: uses fixed tree with Weighted predictor.
-  kFalcon = 7,
-  // Currently fastest possible setting for VarDCT.
-  // Modular: uses fixed tree with Gradient predictor.
-  kThunder = 8,
-  // VarDCT: same as kThunder.
-  // Modular: no tree, Gradient predictor, fast histograms
-  kLightning = 9
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_COMMON_H_
diff --git a/third_party/jpeg-xl/lib/jxl/compressed_dc.cc b/third_party/jpeg-xl/lib/jxl/compressed_dc.cc
deleted file mode 100644
index 994232c8e4605..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/compressed_dc.cc
+++ /dev/null
@@ -1,311 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/compressed_dc.h"
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
-#include <vector>
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/compressed_dc.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/image.h"
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-using D = HWY_FULL(float);
-using DScalar = HWY_CAPPED(float, 1);
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Abs;
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::Div;
-using hwy::HWY_NAMESPACE::Max;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::MulAdd;
-using hwy::HWY_NAMESPACE::Rebind;
-using hwy::HWY_NAMESPACE::Sub;
-using hwy::HWY_NAMESPACE::Vec;
-using hwy::HWY_NAMESPACE::ZeroIfNegative;
-
-// TODO(veluca): optimize constants.
-const float w1 = 0.20345139757231578f;
-const float w2 = 0.0334829185968739f;
-const float w0 = 1.0f - 4.0f * (w1 + w2);
-
-template <class V>
-V MaxWorkaround(V a, V b) {
-#if (HWY_TARGET == HWY_AVX3) && HWY_COMPILER_CLANG <= 800
-  // Prevents "Do not know how to split the result of this operator" error
-  return IfThenElse(a > b, a, b);
-#else
-  return Max(a, b);
-#endif
-}
-
-template <typename D>
-JXL_INLINE void ComputePixelChannel(const D d, const float dc_factor,
-                                    const float* JXL_RESTRICT row_top,
-                                    const float* JXL_RESTRICT row,
-                                    const float* JXL_RESTRICT row_bottom,
-                                    Vec<D>* JXL_RESTRICT mc,
-                                    Vec<D>* JXL_RESTRICT sm,
-                                    Vec<D>* JXL_RESTRICT gap, size_t x) {
-  const auto tl = LoadU(d, row_top + x - 1);
-  const auto tc = Load(d, row_top + x);
-  const auto tr = LoadU(d, row_top + x + 1);
-
-  const auto ml = LoadU(d, row + x - 1);
-  *mc = Load(d, row + x);
-  const auto mr = LoadU(d, row + x + 1);
-
-  const auto bl = LoadU(d, row_bottom + x - 1);
-  const auto bc = Load(d, row_bottom + x);
-  const auto br = LoadU(d, row_bottom + x + 1);
-
-  const auto w_center = Set(d, w0);
-  const auto w_side = Set(d, w1);
-  const auto w_corner = Set(d, w2);
-
-  const auto corner = Add(Add(tl, tr), Add(bl, br));
-  const auto side = Add(Add(ml, mr), Add(tc, bc));
-  *sm = MulAdd(corner, w_corner, MulAdd(side, w_side, Mul(*mc, w_center)));
-
-  const auto dc_quant = Set(d, dc_factor);
-  *gap = MaxWorkaround(*gap, Abs(Div(Sub(*mc, *sm), dc_quant)));
-}
-
-template <typename D>
-JXL_INLINE void ComputePixel(
-    const float* JXL_RESTRICT dc_factors,
-    const float* JXL_RESTRICT* JXL_RESTRICT rows_top,
-    const float* JXL_RESTRICT* JXL_RESTRICT rows,
-    const float* JXL_RESTRICT* JXL_RESTRICT rows_bottom,
-    float* JXL_RESTRICT* JXL_RESTRICT out_rows, size_t x) {
-  const D d;
-  auto mc_x = Undefined(d);
-  auto mc_y = Undefined(d);
-  auto mc_b = Undefined(d);
-  auto sm_x = Undefined(d);
-  auto sm_y = Undefined(d);
-  auto sm_b = Undefined(d);
-  auto gap = Set(d, 0.5f);
-  ComputePixelChannel(d, dc_factors[0], rows_top[0], rows[0], rows_bottom[0],
-                      &mc_x, &sm_x, &gap, x);
-  ComputePixelChannel(d, dc_factors[1], rows_top[1], rows[1], rows_bottom[1],
-                      &mc_y, &sm_y, &gap, x);
-  ComputePixelChannel(d, dc_factors[2], rows_top[2], rows[2], rows_bottom[2],
-                      &mc_b, &sm_b, &gap, x);
-  auto factor = MulAdd(Set(d, -4.0f), gap, Set(d, 3.0f));
-  factor = ZeroIfNegative(factor);
-
-  auto out = MulAdd(Sub(sm_x, mc_x), factor, mc_x);
-  Store(out, d, out_rows[0] + x);
-  out = MulAdd(Sub(sm_y, mc_y), factor, mc_y);
-  Store(out, d, out_rows[1] + x);
-  out = MulAdd(Sub(sm_b, mc_b), factor, mc_b);
-  Store(out, d, out_rows[2] + x);
-}
-
-Status AdaptiveDCSmoothing(JxlMemoryManager* memory_manager,
-                           const float* dc_factors, Image3F* dc,
-                           ThreadPool* pool) {
-  const size_t xsize = dc->xsize();
-  const size_t ysize = dc->ysize();
-  if (ysize <= 2 || xsize <= 2) return true;
-
-  // TODO(veluca): use tile-based processing?
-  // TODO(veluca): decide if changes to the y channel should be propagated to
-  // the x and b channels through color correlation.
-  JXL_ENSURE(w1 + w2 < 0.25f);
-
-  JXL_ASSIGN_OR_RETURN(Image3F smoothed,
-                       Image3F::Create(memory_manager, xsize, ysize));
-  // Fill in borders that the loop below will not. First and last are unused.
-  for (size_t c = 0; c < 3; c++) {
-    for (size_t y : {static_cast<size_t>(0), ysize - 1}) {
-      memcpy(smoothed.PlaneRow(c, y), dc->PlaneRow(c, y),
-             xsize * sizeof(float));
-    }
-  }
-  auto process_row = [&](const uint32_t y, size_t /*thread*/) -> Status {
-    const float* JXL_RESTRICT rows_top[3]{
-        dc->ConstPlaneRow(0, y - 1),
-        dc->ConstPlaneRow(1, y - 1),
-        dc->ConstPlaneRow(2, y - 1),
-    };
-    const float* JXL_RESTRICT rows[3] = {
-        dc->ConstPlaneRow(0, y),
-        dc->ConstPlaneRow(1, y),
-        dc->ConstPlaneRow(2, y),
-    };
-    const float* JXL_RESTRICT rows_bottom[3] = {
-        dc->ConstPlaneRow(0, y + 1),
-        dc->ConstPlaneRow(1, y + 1),
-        dc->ConstPlaneRow(2, y + 1),
-    };
-    float* JXL_RESTRICT rows_out[3] = {
-        smoothed.PlaneRow(0, y),
-        smoothed.PlaneRow(1, y),
-        smoothed.PlaneRow(2, y),
-    };
-    for (size_t x : {static_cast<size_t>(0), xsize - 1}) {
-      for (size_t c = 0; c < 3; c++) {
-        rows_out[c][x] = rows[c][x];
-      }
-    }
-
-    size_t x = 1;
-    // First pixels
-    const size_t N = Lanes(D());
-    for (; x < std::min(N, xsize - 1); x++) {
-      ComputePixel<DScalar>(dc_factors, rows_top, rows, rows_bottom, rows_out,
-                            x);
-    }
-    // Full vectors.
-    for (; x + N <= xsize - 1; x += N) {
-      ComputePixel<D>(dc_factors, rows_top, rows, rows_bottom, rows_out, x);
-    }
-    // Last pixels.
-    for (; x < xsize - 1; x++) {
-      ComputePixel<DScalar>(dc_factors, rows_top, rows, rows_bottom, rows_out,
-                            x);
-    }
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 1, ysize - 1, ThreadPool::NoInit,
-                                process_row, "DCSmoothingRow"));
-  dc->Swap(smoothed);
-  return true;
-}
-
-// DC dequantization.
-void DequantDC(const Rect& r, Image3F* dc, ImageB* quant_dc, const Image& in,
-               const float* dc_factors, float mul, const float* cfl_factors,
-               const YCbCrChromaSubsampling& chroma_subsampling,
-               const BlockCtxMap& bctx) {
-  const HWY_FULL(float) df;
-  const Rebind<pixel_type, HWY_FULL(float)> di;  // assumes pixel_type <= float
-  if (chroma_subsampling.Is444()) {
-    const auto fac_x = Set(df, dc_factors[0] * mul);
-    const auto fac_y = Set(df, dc_factors[1] * mul);
-    const auto fac_b = Set(df, dc_factors[2] * mul);
-    const auto cfl_fac_x = Set(df, cfl_factors[0]);
-    const auto cfl_fac_b = Set(df, cfl_factors[2]);
-    for (size_t y = 0; y < r.ysize(); y++) {
-      float* dec_row_x = r.PlaneRow(dc, 0, y);
-      float* dec_row_y = r.PlaneRow(dc, 1, y);
-      float* dec_row_b = r.PlaneRow(dc, 2, y);
-      const int32_t* quant_row_x = in.channel[1].plane.Row(y);
-      const int32_t* quant_row_y = in.channel[0].plane.Row(y);
-      const int32_t* quant_row_b = in.channel[2].plane.Row(y);
-      for (size_t x = 0; x < r.xsize(); x += Lanes(di)) {
-        const auto in_q_x = Load(di, quant_row_x + x);
-        const auto in_q_y = Load(di, quant_row_y + x);
-        const auto in_q_b = Load(di, quant_row_b + x);
-        const auto in_x = Mul(ConvertTo(df, in_q_x), fac_x);
-        const auto in_y = Mul(ConvertTo(df, in_q_y), fac_y);
-        const auto in_b = Mul(ConvertTo(df, in_q_b), fac_b);
-        Store(in_y, df, dec_row_y + x);
-        Store(MulAdd(in_y, cfl_fac_x, in_x), df, dec_row_x + x);
-        Store(MulAdd(in_y, cfl_fac_b, in_b), df, dec_row_b + x);
-      }
-    }
-  } else {
-    for (size_t c : {1, 0, 2}) {
-      Rect rect(r.x0() >> chroma_subsampling.HShift(c),
-                r.y0() >> chroma_subsampling.VShift(c),
-                r.xsize() >> chroma_subsampling.HShift(c),
-                r.ysize() >> chroma_subsampling.VShift(c));
-      const auto fac = Set(df, dc_factors[c] * mul);
-      const Channel& ch = in.channel[c < 2 ? c ^ 1 : c];
-      for (size_t y = 0; y < rect.ysize(); y++) {
-        const int32_t* quant_row = ch.plane.Row(y);
-        float* row = rect.PlaneRow(dc, c, y);
-        for (size_t x = 0; x < rect.xsize(); x += Lanes(di)) {
-          const auto in_q = Load(di, quant_row + x);
-          const auto in = Mul(ConvertTo(df, in_q), fac);
-          Store(in, df, row + x);
-        }
-      }
-    }
-  }
-  if (bctx.num_dc_ctxs <= 1) {
-    for (size_t y = 0; y < r.ysize(); y++) {
-      uint8_t* qdc_row = r.Row(quant_dc, y);
-      memset(qdc_row, 0, sizeof(*qdc_row) * r.xsize());
-    }
-  } else {
-    for (size_t y = 0; y < r.ysize(); y++) {
-      uint8_t* qdc_row_val = r.Row(quant_dc, y);
-      const int32_t* quant_row_x =
-          in.channel[1].plane.Row(y >> chroma_subsampling.VShift(0));
-      const int32_t* quant_row_y =
-          in.channel[0].plane.Row(y >> chroma_subsampling.VShift(1));
-      const int32_t* quant_row_b =
-          in.channel[2].plane.Row(y >> chroma_subsampling.VShift(2));
-      for (size_t x = 0; x < r.xsize(); x++) {
-        int bucket_x = 0;
-        int bucket_y = 0;
-        int bucket_b = 0;
-        for (int t : bctx.dc_thresholds[0]) {
-          if (quant_row_x[x >> chroma_subsampling.HShift(0)] > t) bucket_x++;
-        }
-        for (int t : bctx.dc_thresholds[1]) {
-          if (quant_row_y[x >> chroma_subsampling.HShift(1)] > t) bucket_y++;
-        }
-        for (int t : bctx.dc_thresholds[2]) {
-          if (quant_row_b[x >> chroma_subsampling.HShift(2)] > t) bucket_b++;
-        }
-        int bucket = bucket_x;
-        bucket *= bctx.dc_thresholds[2].size() + 1;
-        bucket += bucket_b;
-        bucket *= bctx.dc_thresholds[1].size() + 1;
-        bucket += bucket_y;
-        qdc_row_val[x] = bucket;
-      }
-    }
-  }
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(DequantDC);
-HWY_EXPORT(AdaptiveDCSmoothing);
-Status AdaptiveDCSmoothing(JxlMemoryManager* memory_manager,
-                           const float* dc_factors, Image3F* dc,
-                           ThreadPool* pool) {
-  return HWY_DYNAMIC_DISPATCH(AdaptiveDCSmoothing)(memory_manager, dc_factors,
-                                                   dc, pool);
-}
-
-void DequantDC(const Rect& r, Image3F* dc, ImageB* quant_dc, const Image& in,
-               const float* dc_factors, float mul, const float* cfl_factors,
-               const YCbCrChromaSubsampling& chroma_subsampling,
-               const BlockCtxMap& bctx) {
-  HWY_DYNAMIC_DISPATCH(DequantDC)
-  (r, dc, quant_dc, in, dc_factors, mul, cfl_factors, chroma_subsampling, bctx);
-}
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/compressed_dc.h b/third_party/jpeg-xl/lib/jxl/compressed_dc.h
deleted file mode 100644
index 12e70d84cfd36..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/compressed_dc.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_COMPRESSED_DC_H_
-#define LIB_JXL_COMPRESSED_DC_H_
-
-#include <jxl/memory_manager.h>
-
-#include "lib/jxl/ac_context.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/modular/modular_image.h"
-
-// DC handling functions: encoding and decoding of DC to and from bitstream, and
-// related function to initialize the per-group decoder cache.
-
-namespace jxl {
-
-// Smooth DC in already-smooth areas, to counteract banding.
-Status AdaptiveDCSmoothing(JxlMemoryManager* memory_manager,
-                           const float* dc_factors, Image3F* dc,
-                           ThreadPool* pool);
-
-void DequantDC(const Rect& r, Image3F* dc, ImageB* quant_dc, const Image& in,
-               const float* dc_factors, float mul, const float* cfl_factors,
-               const YCbCrChromaSubsampling& chroma_subsampling,
-               const BlockCtxMap& bctx);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_COMPRESSED_DC_H_
diff --git a/third_party/jpeg-xl/lib/jxl/convolve-inl.h b/third_party/jpeg-xl/lib/jxl/convolve-inl.h
deleted file mode 100644
index 3d515b4c45ecc..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/convolve-inl.h
+++ /dev/null
@@ -1,303 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#if defined(LIB_JXL_CONVOLVE_INL_H_) == defined(HWY_TARGET_TOGGLE)
-#ifdef LIB_JXL_CONVOLVE_INL_H_
-#undef LIB_JXL_CONVOLVE_INL_H_
-#else
-#define LIB_JXL_CONVOLVE_INL_H_
-#endif
-
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/image_ops.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-namespace {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Broadcast;
-#if HWY_TARGET != HWY_SCALAR
-using hwy::HWY_NAMESPACE::CombineShiftRightBytes;
-#endif
-using hwy::HWY_NAMESPACE::TableLookupLanes;
-using hwy::HWY_NAMESPACE::Vec;
-
-// Synthesizes left/right neighbors from a vector of center pixels.
-class Neighbors {
- public:
-  using D = HWY_CAPPED(float, 16);
-  using V = Vec<D>;
-
-  // Returns l[i] == c[Mirror(i - 1)].
-  HWY_INLINE HWY_MAYBE_UNUSED static V FirstL1(const V c) {
-#if HWY_CAP_GE256
-    const D d;
-    HWY_ALIGN constexpr int32_t lanes[16] = {0, 0, 1, 2,  3,  4,  5,  6,
-                                             7, 8, 9, 10, 11, 12, 13, 14};
-    const auto indices = SetTableIndices(d, lanes);
-    // c = PONM'LKJI
-    return TableLookupLanes(c, indices);  // ONML'KJII
-#elif HWY_TARGET == HWY_SCALAR
-    return c;  // Same (the first mirrored value is the last valid one)
-#else  // 128 bit
-    // c = LKJI
-#if HWY_TARGET <= (1 << HWY_HIGHEST_TARGET_BIT_X86)
-    return V{_mm_shuffle_ps(c.raw, c.raw, _MM_SHUFFLE(2, 1, 0, 0))};  // KJII
-#else
-    const D d;
-    // TODO(deymo): Figure out if this can be optimized using a single vsri
-    // instruction to convert LKJI to KJII.
-    HWY_ALIGN constexpr int lanes[4] = {0, 0, 1, 2};  // KJII
-    const auto indices = SetTableIndices(d, lanes);
-    return TableLookupLanes(c, indices);
-#endif
-#endif
-  }
-
-  // Returns l[i] == c[Mirror(i - 2)].
-  HWY_INLINE HWY_MAYBE_UNUSED static V FirstL2(const V c) {
-#if HWY_CAP_GE256
-    const D d;
-    HWY_ALIGN constexpr int32_t lanes[16] = {1, 0, 0, 1, 2,  3,  4,  5,
-                                             6, 7, 8, 9, 10, 11, 12, 13};
-    const auto indices = SetTableIndices(d, lanes);
-    // c = PONM'LKJI
-    return TableLookupLanes(c, indices);  // NMLK'JIIJ
-#elif HWY_TARGET == HWY_SCALAR
-    const D d;
-    JXL_DEBUG_ABORT("Unsupported");
-    return Zero(d);
-#else  // 128 bit
-    // c = LKJI
-#if HWY_TARGET <= (1 << HWY_HIGHEST_TARGET_BIT_X86)
-    return V{_mm_shuffle_ps(c.raw, c.raw, _MM_SHUFFLE(1, 0, 0, 1))};  // JIIJ
-#else
-    const D d;
-    HWY_ALIGN constexpr int lanes[4] = {1, 0, 0, 1};  // JIIJ
-    const auto indices = SetTableIndices(d, lanes);
-    return TableLookupLanes(c, indices);
-#endif
-#endif
-  }
-
-  // Returns l[i] == c[Mirror(i - 3)].
-  HWY_INLINE HWY_MAYBE_UNUSED static V FirstL3(const V c) {
-#if HWY_CAP_GE256
-    const D d;
-    HWY_ALIGN constexpr int32_t lanes[16] = {2, 1, 0, 0, 1, 2,  3,  4,
-                                             5, 6, 7, 8, 9, 10, 11, 12};
-    const auto indices = SetTableIndices(d, lanes);
-    // c = PONM'LKJI
-    return TableLookupLanes(c, indices);  // MLKJ'IIJK
-#elif HWY_TARGET == HWY_SCALAR
-    const D d;
-    JXL_DEBUG_ABORT("Unsipported");
-    return Zero(d);
-#else  // 128 bit
-    // c = LKJI
-#if HWY_TARGET <= (1 << HWY_HIGHEST_TARGET_BIT_X86)
-    return V{_mm_shuffle_ps(c.raw, c.raw, _MM_SHUFFLE(0, 0, 1, 2))};  // IIJK
-#else
-    const D d;
-    HWY_ALIGN constexpr int lanes[4] = {2, 1, 0, 0};  // IIJK
-    const auto indices = SetTableIndices(d, lanes);
-    return TableLookupLanes(c, indices);
-#endif
-#endif
-  }
-};
-
-#if HWY_TARGET != HWY_SCALAR
-
-// Returns indices for SetTableIndices such that TableLookupLanes on the
-// rightmost unaligned vector (rightmost sample in its most-significant lane)
-// returns the mirrored values, with the mirror outside the last valid sample.
-inline const int32_t* MirrorLanes(const size_t mod) {
-  const HWY_CAPPED(float, 16) d;
-  constexpr size_t kN = MaxLanes(d);
-  // typo:off
-  // For mod = `image width mod 16` 0..15:
-  // last full vec     mirrored (mem order)  loadedVec  mirrorVec  idxVec
-  // 0123456789abcdef| fedcba9876543210      fed..210   012..def   012..def
-  // 0123456789abcdef|0 0fedcba98765432      0fe..321   234..f00   123..eff
-  // 0123456789abcdef|01 10fedcba987654      10f..432   456..110   234..ffe
-  // 0123456789abcdef|012 210fedcba9876      210..543   67..2210   34..ffed
-  // 0123456789abcdef|0123 3210fedcba98      321..654   8..33210   4..ffedc
-  // 0123456789abcdef|01234 43210fedcba
-  // 0123456789abcdef|012345 543210fedc
-  // 0123456789abcdef|0123456 6543210fe
-  // 0123456789abcdef|01234567 76543210
-  // 0123456789abcdef|012345678 8765432
-  // 0123456789abcdef|0123456789 987654
-  // 0123456789abcdef|0123456789A A9876
-  // 0123456789abcdef|0123456789AB BA98
-  // 0123456789abcdef|0123456789ABC CBA
-  // 0123456789abcdef|0123456789ABCD DC
-  // 0123456789abcdef|0123456789ABCDE E      EDC..10f   EED..210   ffe..321
-  // typo:on
-#if HWY_CAP_GE512
-  HWY_ALIGN static constexpr int32_t idx_lanes[2 * kN - 1] = {
-      1,  2,  3,  4,  5,  6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 15,  //
-      14, 13, 12, 11, 10, 9, 8, 7, 6, 5,  4,  3,  2,  1,  0};
-#elif HWY_CAP_GE256
-  HWY_ALIGN static constexpr int32_t idx_lanes[2 * kN - 1] = {
-      1, 2, 3, 4, 5, 6, 7, 7,  //
-      6, 5, 4, 3, 2, 1, 0};
-#else  // 128-bit
-  HWY_ALIGN static constexpr int32_t idx_lanes[2 * kN - 1] = {1, 2, 3, 3,  //
-                                                              2, 1, 0};
-#endif
-  return idx_lanes + kN - 1 - mod;
-}
-
-#endif  // HWY_TARGET != HWY_SCALAR
-
-// Single entry point for convolution.
-// "Strategy" (Direct*/Separable*) decides kernel size and how to evaluate it.
-template <class Strategy>
-class ConvolveT {
-  static constexpr int64_t kRadius = Strategy::kRadius;
-  using Simd = HWY_CAPPED(float, 16);
-
- public:
-  static size_t MinWidth() {
-#if HWY_TARGET == HWY_SCALAR
-    // First/Last use mirrored loads of up to +/- kRadius.
-    return 2 * kRadius;
-#else
-    return Lanes(Simd()) + kRadius;
-#endif
-  }
-
-  // "Image" is ImageF or Image3F.
-  template <class Image, class Weights>
-  static void Run(const Image& in, const Rect& rect, const Weights& weights,
-                  ThreadPool* pool, Image* out) {
-    JXL_DASSERT(SameSize(rect, *out));
-    JXL_DASSERT(rect.xsize() >= MinWidth());
-
-    static_assert(static_cast<int64_t>(kRadius) <= 3,
-                  "Must handle [0, kRadius) and >= kRadius");
-    switch (rect.xsize() % Lanes(Simd())) {
-      case 0:
-        return RunRows<0>(in, rect, weights, pool, out);
-      case 1:
-        return RunRows<1>(in, rect, weights, pool, out);
-      case 2:
-        return RunRows<2>(in, rect, weights, pool, out);
-      default:
-        return RunRows<3>(in, rect, weights, pool, out);
-    }
-  }
-
- private:
-  template <size_t kSizeModN, class WrapRow, class Weights>
-  static JXL_INLINE void RunRow(const float* JXL_RESTRICT in,
-                                const size_t xsize, const int64_t stride,
-                                const WrapRow& wrap_row, const Weights& weights,
-                                float* JXL_RESTRICT out) {
-    Strategy::template ConvolveRow<kSizeModN>(in, xsize, stride, wrap_row,
-                                              weights, out);
-  }
-
-  template <size_t kSizeModN, class Weights>
-  static JXL_INLINE void RunBorderRows(const ImageF& in, const Rect& rect,
-                                       const int64_t ybegin, const int64_t yend,
-                                       const Weights& weights, ImageF* out) {
-    const int64_t stride = in.PixelsPerRow();
-    const WrapRowMirror wrap_row(in, rect.ysize());
-    for (int64_t y = ybegin; y < yend; ++y) {
-      RunRow<kSizeModN>(rect.ConstRow(in, y), rect.xsize(), stride, wrap_row,
-                        weights, out->Row(y));
-    }
-  }
-
-  // Image3F.
-  template <size_t kSizeModN, class Weights>
-  static JXL_INLINE void RunBorderRows(const Image3F& in, const Rect& rect,
-                                       const int64_t ybegin, const int64_t yend,
-                                       const Weights& weights, Image3F* out) {
-    const int64_t stride = in.PixelsPerRow();
-    for (int64_t y = ybegin; y < yend; ++y) {
-      for (size_t c = 0; c < 3; ++c) {
-        const WrapRowMirror wrap_row(in.Plane(c), rect.ysize());
-        RunRow<kSizeModN>(rect.ConstPlaneRow(in, c, y), rect.xsize(), stride,
-                          wrap_row, weights, out->PlaneRow(c, y));
-      }
-    }
-  }
-
-  template <size_t kSizeModN, class Weights>
-  static JXL_INLINE void RunInteriorRows(const ImageF& in, const Rect& rect,
-                                         const int64_t ybegin,
-                                         const int64_t yend,
-                                         const Weights& weights,
-                                         ThreadPool* pool, ImageF* out) {
-    const int64_t stride = in.PixelsPerRow();
-    const auto process_row = [&](const uint32_t y, size_t /*thread*/) HWY_ATTR {
-      RunRow<kSizeModN>(rect.ConstRow(in, y), rect.xsize(), stride,
-                        WrapRowUnchanged(), weights, out->Row(y));
-      return true;
-    };
-    Status status = RunOnPool(pool, ybegin, yend, ThreadPool::NoInit,
-                              process_row, "Convolve");
-    (void)status;
-    JXL_DASSERT(status);
-  }
-
-  // Image3F.
-  template <size_t kSizeModN, class Weights>
-  static JXL_INLINE void RunInteriorRows(const Image3F& in, const Rect& rect,
-                                         const int64_t ybegin,
-                                         const int64_t yend,
-                                         const Weights& weights,
-                                         ThreadPool* pool, Image3F* out) {
-    const int64_t stride = in.PixelsPerRow();
-    const auto process_row = [&](const uint32_t y, size_t /*thread*/) HWY_ATTR {
-      for (size_t c = 0; c < 3; ++c) {
-        RunRow<kSizeModN>(rect.ConstPlaneRow(in, c, y), rect.xsize(), stride,
-                          WrapRowUnchanged(), weights, out->PlaneRow(c, y));
-      }
-      return true;
-    };
-    Status status = RunOnPool(pool, ybegin, yend, ThreadPool::NoInit,
-                              process_row, "Convolve3");
-    (void)status;
-    JXL_DASSERT(status);
-  }
-
-  template <size_t kSizeModN, class Image, class Weights>
-  static JXL_INLINE void RunRows(const Image& in, const Rect& rect,
-                                 const Weights& weights, ThreadPool* pool,
-                                 Image* out) {
-    const int64_t ysize = rect.ysize();
-    RunBorderRows<kSizeModN>(in, rect, 0,
-                             std::min(static_cast<int64_t>(kRadius), ysize),
-                             weights, out);
-    if (ysize > 2 * static_cast<int64_t>(kRadius)) {
-      RunInteriorRows<kSizeModN>(in, rect, static_cast<int64_t>(kRadius),
-                                 ysize - static_cast<int64_t>(kRadius), weights,
-                                 pool, out);
-    }
-    if (ysize > static_cast<int64_t>(kRadius)) {
-      RunBorderRows<kSizeModN>(in, rect, ysize - static_cast<int64_t>(kRadius),
-                               ysize, weights, out);
-    }
-  }
-};
-
-}  // namespace
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#endif  // LIB_JXL_CONVOLVE_INL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/convolve.h b/third_party/jpeg-xl/lib/jxl/convolve.h
deleted file mode 100644
index e9b3ae66f6aeb..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/convolve.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_CONVOLVE_H_
-#define LIB_JXL_CONVOLVE_H_
-
-// 2D convolution.
-
-#include <cstddef>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/image.h"
-
-namespace jxl {
-
-// No valid values outside [0, xsize), but the strategy may still safely load
-// the preceding vector, and/or round xsize up to the vector lane count. This
-// avoids needing PadImage.
-// Requires xsize >= kConvolveLanes + kConvolveMaxRadius.
-static constexpr size_t kConvolveMaxRadius = 3;
-
-// Weights must already be normalized.
-
-struct WeightsSymmetric3 {
-  // d r d (each replicated 4x)
-  // r c r
-  // d r d
-  float c[4];
-  float r[4];
-  float d[4];
-};
-
-struct WeightsSymmetric5 {
-  // The lower-right quadrant is: c r R  (each replicated 4x)
-  //                              r d L
-  //                              R L D
-  float c[4];
-  float r[4];
-  float R[4];
-  float d[4];
-  float D[4];
-  float L[4];
-};
-
-// Weights for separable 5x5 filters (typically but not necessarily the same
-// values for horizontal and vertical directions). The kernel must already be
-// normalized, but note that values for negative offsets are omitted, so the
-// given values do not sum to 1.
-struct WeightsSeparable5 {
-  // Horizontal 1D, distances 0..2 (each replicated 4x)
-  float horz[3 * 4];
-  float vert[3 * 4];
-};
-
-const WeightsSymmetric3& WeightsSymmetric3Lowpass();
-const WeightsSeparable5& WeightsSeparable5Lowpass();
-const WeightsSymmetric5& WeightsSymmetric5Lowpass();
-
-Status SlowSymmetric3(const ImageF& in, const Rect& rect,
-                      const WeightsSymmetric3& weights, ThreadPool* pool,
-                      ImageF* JXL_RESTRICT out);
-
-Status SlowSeparable5(const ImageF& in, const Rect& in_rect,
-                      const WeightsSeparable5& weights, ThreadPool* pool,
-                      ImageF* out, const Rect& out_rect);
-
-Status Symmetric3(const ImageF& in, const Rect& rect,
-                  const WeightsSymmetric3& weights, ThreadPool* pool,
-                  ImageF* out);
-
-Status Symmetric5(const ImageF& in, const Rect& in_rect,
-                  const WeightsSymmetric5& weights, ThreadPool* pool,
-                  ImageF* JXL_RESTRICT out, const Rect& out_rect);
-
-Status Symmetric5(const ImageF& in, const Rect& rect,
-                  const WeightsSymmetric5& weights, ThreadPool* pool,
-                  ImageF* JXL_RESTRICT out);
-
-Status Separable5(const ImageF& in, const Rect& rect,
-                  const WeightsSeparable5& weights, ThreadPool* pool,
-                  ImageF* out);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_CONVOLVE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/convolve_separable5.cc b/third_party/jpeg-xl/lib/jxl/convolve_separable5.cc
deleted file mode 100644
index 0331da30ee9da..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/convolve_separable5.cc
+++ /dev/null
@@ -1,267 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/convolve.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/convolve_separable5.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/convolve-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::MulAdd;
-using hwy::HWY_NAMESPACE::Vec;
-
-// 5x5 convolution by separable kernel with a single scan through the input.
-// This is more cache-efficient than separate horizontal/vertical passes, and
-// possibly faster (given enough registers) than tiling and/or transposing.
-//
-// Overview: imagine a 5x5 window around a central pixel. First convolve the
-// rows by multiplying the pixels with the corresponding weights from
-// WeightsSeparable5.horz[abs(x_offset) * 4]. Then multiply each of these
-// intermediate results by the corresponding vertical weight, i.e.
-// vert[abs(y_offset) * 4]. Finally, store the sum of these values as the
-// convolution result at the position of the central pixel in the output.
-//
-// Each of these operations uses SIMD vectors. The central pixel and most
-// importantly the output are aligned, so neighnoring pixels (e.g. x_offset=1)
-// require unaligned loads. Because weights are supplied in identical groups of
-// 4, we can use LoadDup128 to load them (slightly faster).
-//
-// Uses mirrored boundary handling. Until x >= kRadius, the horizontal
-// convolution uses Neighbors class to shuffle vectors as if each of its lanes
-// had been loaded from the mirrored offset. Similarly, the last full vector to
-// write uses mirroring. In the case of scalar vectors, Neighbors is not usable
-// and the value is loaded directly. Otherwise, the number of valid pixels
-// modulo the vector size enables a small optimization: for smaller offsets,
-// a non-mirrored load is sufficient.
-class Separable5Strategy {
-  using D = HWY_CAPPED(float, 16);
-  using V = Vec<D>;
-
- public:
-  static constexpr int64_t kRadius = 2;
-
-  template <size_t kSizeModN, class WrapRow>
-  static JXL_MAYBE_INLINE void ConvolveRow(
-      const float* const JXL_RESTRICT row_m, const size_t xsize,
-      const int64_t stride, const WrapRow& wrap_row,
-      const WeightsSeparable5& weights, float* const JXL_RESTRICT row_out) {
-    const D d;
-    const int64_t neg_stride = -stride;  // allows LEA addressing.
-    const float* const JXL_RESTRICT row_t2 =
-        wrap_row(row_m + 2 * neg_stride, stride);
-    const float* const JXL_RESTRICT row_t1 =
-        wrap_row(row_m + 1 * neg_stride, stride);
-    const float* const JXL_RESTRICT row_b1 =
-        wrap_row(row_m + 1 * stride, stride);
-    const float* const JXL_RESTRICT row_b2 =
-        wrap_row(row_m + 2 * stride, stride);
-
-    const V wh0 = LoadDup128(d, weights.horz + 0 * 4);
-    const V wh1 = LoadDup128(d, weights.horz + 1 * 4);
-    const V wh2 = LoadDup128(d, weights.horz + 2 * 4);
-    const V wv0 = LoadDup128(d, weights.vert + 0 * 4);
-    const V wv1 = LoadDup128(d, weights.vert + 1 * 4);
-    const V wv2 = LoadDup128(d, weights.vert + 2 * 4);
-
-    size_t x = 0;
-
-    // More than one iteration for scalars.
-    for (; x < kRadius; x += Lanes(d)) {
-      const V conv0 =
-          Mul(HorzConvolveFirst(row_m, x, xsize, wh0, wh1, wh2), wv0);
-
-      const V conv1t = HorzConvolveFirst(row_t1, x, xsize, wh0, wh1, wh2);
-      const V conv1b = HorzConvolveFirst(row_b1, x, xsize, wh0, wh1, wh2);
-      const V conv1 = MulAdd(Add(conv1t, conv1b), wv1, conv0);
-
-      const V conv2t = HorzConvolveFirst(row_t2, x, xsize, wh0, wh1, wh2);
-      const V conv2b = HorzConvolveFirst(row_b2, x, xsize, wh0, wh1, wh2);
-      const V conv2 = MulAdd(Add(conv2t, conv2b), wv2, conv1);
-      Store(conv2, d, row_out + x);
-    }
-
-    // Main loop: load inputs without padding
-    for (; x + Lanes(d) + kRadius <= xsize; x += Lanes(d)) {
-      const V conv0 = Mul(HorzConvolve(row_m + x, wh0, wh1, wh2), wv0);
-
-      const V conv1t = HorzConvolve(row_t1 + x, wh0, wh1, wh2);
-      const V conv1b = HorzConvolve(row_b1 + x, wh0, wh1, wh2);
-      const V conv1 = MulAdd(Add(conv1t, conv1b), wv1, conv0);
-
-      const V conv2t = HorzConvolve(row_t2 + x, wh0, wh1, wh2);
-      const V conv2b = HorzConvolve(row_b2 + x, wh0, wh1, wh2);
-      const V conv2 = MulAdd(Add(conv2t, conv2b), wv2, conv1);
-      Store(conv2, d, row_out + x);
-    }
-
-    // Last full vector to write (the above loop handled mod >= kRadius)
-#if HWY_TARGET == HWY_SCALAR
-    while (x < xsize) {
-#else
-    if (kSizeModN < kRadius) {
-#endif
-      const V conv0 =
-          Mul(HorzConvolveLast<kSizeModN>(row_m, x, xsize, wh0, wh1, wh2), wv0);
-
-      const V conv1t =
-          HorzConvolveLast<kSizeModN>(row_t1, x, xsize, wh0, wh1, wh2);
-      const V conv1b =
-          HorzConvolveLast<kSizeModN>(row_b1, x, xsize, wh0, wh1, wh2);
-      const V conv1 = MulAdd(Add(conv1t, conv1b), wv1, conv0);
-
-      const V conv2t =
-          HorzConvolveLast<kSizeModN>(row_t2, x, xsize, wh0, wh1, wh2);
-      const V conv2b =
-          HorzConvolveLast<kSizeModN>(row_b2, x, xsize, wh0, wh1, wh2);
-      const V conv2 = MulAdd(Add(conv2t, conv2b), wv2, conv1);
-      Store(conv2, d, row_out + x);
-      x += Lanes(d);
-    }
-
-    // If mod = 0, the above vector was the last.
-    if (kSizeModN != 0) {
-      for (; x < xsize; ++x) {
-        float mul = 0.0f;
-        for (int64_t dy = -kRadius; dy <= kRadius; ++dy) {
-          const float wy = weights.vert[std::abs(dy) * 4];
-          const float* clamped_row = wrap_row(row_m + dy * stride, stride);
-          for (int64_t dx = -kRadius; dx <= kRadius; ++dx) {
-            const float wx = weights.horz[std::abs(dx) * 4];
-            const int64_t clamped_x = Mirror(x + dx, xsize);
-            mul += clamped_row[clamped_x] * wx * wy;
-          }
-        }
-        row_out[x] = mul;
-      }
-    }
-  }
-
- private:
-  // Same as HorzConvolve for the first/last vector in a row.
-  static JXL_MAYBE_INLINE V HorzConvolveFirst(
-      const float* const JXL_RESTRICT row, const int64_t x, const int64_t xsize,
-      const V wh0, const V wh1, const V wh2) {
-    const D d;
-    const V c = LoadU(d, row + x);
-    const V mul0 = Mul(c, wh0);
-
-#if HWY_TARGET == HWY_SCALAR
-    const V l1 = LoadU(d, row + Mirror(x - 1, xsize));
-    const V l2 = LoadU(d, row + Mirror(x - 2, xsize));
-#else
-    (void)xsize;
-    const V l1 = Neighbors::FirstL1(c);
-    const V l2 = Neighbors::FirstL2(c);
-#endif
-
-    const V r1 = LoadU(d, row + x + 1);
-    const V r2 = LoadU(d, row + x + 2);
-
-    const V mul1 = MulAdd(Add(l1, r1), wh1, mul0);
-    const V mul2 = MulAdd(Add(l2, r2), wh2, mul1);
-    return mul2;
-  }
-
-  template <size_t kSizeModN>
-  static JXL_MAYBE_INLINE V
-  HorzConvolveLast(const float* const JXL_RESTRICT row, const int64_t x,
-                   const int64_t xsize, const V wh0, const V wh1, const V wh2) {
-    const D d;
-    const V c = LoadU(d, row + x);
-    const V mul0 = Mul(c, wh0);
-
-    const V l1 = LoadU(d, row + x - 1);
-    const V l2 = LoadU(d, row + x - 2);
-
-    V r1;
-    V r2;
-#if HWY_TARGET == HWY_SCALAR
-    r1 = LoadU(d, row + Mirror(x + 1, xsize));
-    r2 = LoadU(d, row + Mirror(x + 2, xsize));
-#else
-    const size_t N = Lanes(d);
-    if (kSizeModN == 0) {
-      r2 = TableLookupLanes(c, SetTableIndices(d, MirrorLanes(N - 2)));
-      r1 = TableLookupLanes(c, SetTableIndices(d, MirrorLanes(N - 1)));
-    } else {  // == 1
-      const auto last = LoadU(d, row + xsize - N);
-      r2 = TableLookupLanes(last, SetTableIndices(d, MirrorLanes(N - 1)));
-      r1 = last;
-    }
-#endif
-
-    // Sum of pixels with Manhattan distance i, multiplied by weights[i].
-    const V sum1 = Add(l1, r1);
-    const V mul1 = MulAdd(sum1, wh1, mul0);
-    const V sum2 = Add(l2, r2);
-    const V mul2 = MulAdd(sum2, wh2, mul1);
-    return mul2;
-  }
-
-  // Requires kRadius valid pixels before/after pos.
-  static JXL_MAYBE_INLINE V HorzConvolve(const float* const JXL_RESTRICT pos,
-                                         const V wh0, const V wh1,
-                                         const V wh2) {
-    const D d;
-    const V c = LoadU(d, pos);
-    const V mul0 = Mul(c, wh0);
-
-    // Loading anew is faster than combining vectors.
-    const V l1 = LoadU(d, pos - 1);
-    const V r1 = LoadU(d, pos + 1);
-    const V l2 = LoadU(d, pos - 2);
-    const V r2 = LoadU(d, pos + 2);
-    // Sum of pixels with Manhattan distance i, multiplied by weights[i].
-    const V sum1 = Add(l1, r1);
-    const V mul1 = MulAdd(sum1, wh1, mul0);
-    const V sum2 = Add(l2, r2);
-    const V mul2 = MulAdd(sum2, wh2, mul1);
-    return mul2;
-  }
-};
-
-Status Separable5(const ImageF& in, const Rect& rect,
-                  const WeightsSeparable5& weights, ThreadPool* pool,
-                  ImageF* out) {
-  using Conv = ConvolveT<Separable5Strategy>;
-  if (rect.xsize() >= Conv::MinWidth()) {
-    JXL_ENSURE(SameSize(rect, *out));
-    JXL_ENSURE(rect.xsize() >= Conv::MinWidth());
-
-    Conv::Run(in, rect, weights, pool, out);
-    return true;
-  }
-
-  return SlowSeparable5(in, rect, weights, pool, out, Rect(*out));
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(Separable5);
-Status Separable5(const ImageF& in, const Rect& rect,
-                  const WeightsSeparable5& weights, ThreadPool* pool,
-                  ImageF* out) {
-  return HWY_DYNAMIC_DISPATCH(Separable5)(in, rect, weights, pool, out);
-}
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/convolve_slow.cc b/third_party/jpeg-xl/lib/jxl/convolve_slow.cc
deleted file mode 100644
index 7c7dbe6935d4a..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/convolve_slow.cc
+++ /dev/null
@@ -1,208 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <atomic>
-
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/convolve-inl.h"
-#include "lib/jxl/convolve.h"
-
-namespace jxl {
-
-//------------------------------------------------------------------------------
-// Kernels
-
-// 4 instances of a given literal value, useful as input to LoadDup128.
-#define JXL_REP4(literal) literal, literal, literal, literal
-
-// Concentrates energy in low-frequency components (e.g. for antialiasing).
-const WeightsSymmetric3& WeightsSymmetric3Lowpass() {
-  // Computed by research/convolve_weights.py's cubic spline approximations of
-  // prolate spheroidal wave functions.
-  constexpr float w0 = 0.36208932f;
-  constexpr float w1 = 0.12820096f;
-  constexpr float w2 = 0.03127668f;
-  static constexpr WeightsSymmetric3 weights = {
-      {JXL_REP4(w0)}, {JXL_REP4(w1)}, {JXL_REP4(w2)}};
-  return weights;
-}
-
-const WeightsSeparable5& WeightsSeparable5Lowpass() {
-  constexpr float w0 = 0.41714928f;
-  constexpr float w1 = 0.25539268f;
-  constexpr float w2 = 0.03603267f;
-  static constexpr WeightsSeparable5 weights = {
-      {JXL_REP4(w0), JXL_REP4(w1), JXL_REP4(w2)},
-      {JXL_REP4(w0), JXL_REP4(w1), JXL_REP4(w2)}};
-  return weights;
-}
-
-const WeightsSymmetric5& WeightsSymmetric5Lowpass() {
-  static constexpr WeightsSymmetric5 weights = {
-      {JXL_REP4(0.1740135f)}, {JXL_REP4(0.1065369f)}, {JXL_REP4(0.0150310f)},
-      {JXL_REP4(0.0652254f)}, {JXL_REP4(0.0012984f)}, {JXL_REP4(0.0092025f)}};
-  return weights;
-}
-
-const WeightsSeparable5& WeightsSeparable5Gaussian1() {
-  constexpr float w0 = 0.38774f;
-  constexpr float w1 = 0.24477f;
-  constexpr float w2 = 0.06136f;
-  static constexpr WeightsSeparable5 weights = {
-      {JXL_REP4(w0), JXL_REP4(w1), JXL_REP4(w2)},
-      {JXL_REP4(w0), JXL_REP4(w1), JXL_REP4(w2)}};
-  return weights;
-}
-
-const WeightsSeparable5& WeightsSeparable5Gaussian2() {
-  constexpr float w0 = 0.250301f;
-  constexpr float w1 = 0.221461f;
-  constexpr float w2 = 0.153388f;
-  static constexpr WeightsSeparable5 weights = {
-      {JXL_REP4(w0), JXL_REP4(w1), JXL_REP4(w2)},
-      {JXL_REP4(w0), JXL_REP4(w1), JXL_REP4(w2)}};
-  return weights;
-}
-
-#undef JXL_REP4
-
-//------------------------------------------------------------------------------
-// Slow
-
-namespace {
-
-template <class WrapX, class WrapY>
-float SlowSymmetric3Pixel(const ImageF& in, const int64_t ix, const int64_t iy,
-                          const int64_t xsize, const int64_t ysize,
-                          const WeightsSymmetric3& weights) {
-  float sum = 0.0f;
-
-  // ix: image; kx: kernel
-  for (int64_t ky = -1; ky <= 1; ky++) {
-    const int64_t y = WrapY()(iy + ky, ysize);
-    const float* JXL_RESTRICT row_in = in.ConstRow(static_cast<size_t>(y));
-
-    const float wc = ky == 0 ? weights.c[0] : weights.r[0];
-    const float wlr = ky == 0 ? weights.r[0] : weights.d[0];
-
-    const int64_t xm1 = WrapX()(ix - 1, xsize);
-    const int64_t xp1 = WrapX()(ix + 1, xsize);
-    sum += row_in[ix] * wc + (row_in[xm1] + row_in[xp1]) * wlr;
-  }
-  return sum;
-}
-
-template <class WrapY>
-void SlowSymmetric3Row(const ImageF& in, const int64_t iy, const int64_t xsize,
-                       const int64_t ysize, const WeightsSymmetric3& weights,
-                       float* JXL_RESTRICT row_out) {
-  row_out[0] =
-      SlowSymmetric3Pixel<WrapMirror, WrapY>(in, 0, iy, xsize, ysize, weights);
-  for (int64_t ix = 1; ix < xsize - 1; ix++) {
-    row_out[ix] = SlowSymmetric3Pixel<WrapUnchanged, WrapY>(in, ix, iy, xsize,
-                                                            ysize, weights);
-  }
-  {
-    const int64_t ix = xsize - 1;
-    row_out[ix] = SlowSymmetric3Pixel<WrapMirror, WrapY>(in, ix, iy, xsize,
-                                                         ysize, weights);
-  }
-}
-
-}  // namespace
-
-Status SlowSymmetric3(const ImageF& in, const Rect& rect,
-                      const WeightsSymmetric3& weights, ThreadPool* pool,
-                      ImageF* JXL_RESTRICT out) {
-  const int64_t xsize = static_cast<int64_t>(rect.xsize());
-  const int64_t ysize = static_cast<int64_t>(rect.ysize());
-  const int64_t kRadius = 1;
-
-  const auto process_row = [&](const uint32_t task,
-                               size_t /*thread*/) -> Status {
-    const int64_t iy = task;
-    float* JXL_RESTRICT out_row = out->Row(static_cast<size_t>(iy));
-
-    if (iy < kRadius || iy >= ysize - kRadius) {
-      SlowSymmetric3Row<WrapMirror>(in, iy, xsize, ysize, weights, out_row);
-    } else {
-      SlowSymmetric3Row<WrapUnchanged>(in, iy, xsize, ysize, weights, out_row);
-    }
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, static_cast<uint32_t>(ysize),
-                                ThreadPool::NoInit, process_row,
-                                "SlowSymmetric3"));
-  return true;
-}
-
-namespace {
-
-// Separable kernels, any radius.
-StatusOr<float> SlowSeparablePixel(const ImageF& in, const Rect& rect,
-                                   const int64_t x, const int64_t y,
-                                   const int64_t radius,
-                                   const float* JXL_RESTRICT horz_weights,
-                                   const float* JXL_RESTRICT vert_weights) {
-  const size_t xsize = in.xsize();
-  const size_t ysize = in.ysize();
-  const WrapMirror wrap;
-
-  float mul = 0.0f;
-  for (int dy = -radius; dy <= radius; ++dy) {
-    const float wy = vert_weights[std::abs(dy) * 4];
-    const size_t sy = wrap(rect.y0() + y + dy, ysize);
-    JXL_ENSURE(sy < ysize);
-    const float* const JXL_RESTRICT row = in.ConstRow(sy);
-    for (int dx = -radius; dx <= radius; ++dx) {
-      const float wx = horz_weights[std::abs(dx) * 4];
-      const size_t sx = wrap(rect.x0() + x + dx, xsize);
-      JXL_ENSURE(sx < xsize);
-      mul += row[sx] * wx * wy;
-    }
-  }
-  return mul;
-}
-
-template <int R, typename Weights>
-Status SlowSeparable(const ImageF& in, const Rect& in_rect,
-                     const Weights& weights, ThreadPool* pool, ImageF* out,
-                     const Rect& out_rect) {
-  JXL_ENSURE(in_rect.xsize() == out_rect.xsize());
-  JXL_ENSURE(in_rect.ysize() == out_rect.ysize());
-  JXL_ENSURE(in_rect.IsInside(Rect(in)));
-  JXL_ENSURE(out_rect.IsInside(Rect(*out)));
-  const float* horz_weights = &weights.horz[0];
-  const float* vert_weights = &weights.vert[0];
-
-  const auto process_row = [&](const uint32_t task,
-                               size_t /*thread*/) -> Status {
-    const int64_t y = task;
-
-    float* const JXL_RESTRICT row_out = out_rect.Row(out, y);
-    for (size_t x = 0; x < in_rect.xsize(); ++x) {
-      JXL_ASSIGN_OR_RETURN(row_out[x],
-                           SlowSeparablePixel(in, in_rect, x, y, /*radius=*/R,
-                                              horz_weights, vert_weights));
-    }
-    return true;
-  };
-  const size_t ysize = in_rect.ysize();
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, static_cast<uint32_t>(ysize),
-                                ThreadPool::NoInit, process_row,
-                                "SlowSeparable"));
-  return true;
-}
-
-}  // namespace
-
-Status SlowSeparable5(const ImageF& in, const Rect& in_rect,
-                      const WeightsSeparable5& weights, ThreadPool* pool,
-                      ImageF* out, const Rect& out_rect) {
-  return SlowSeparable<2>(in, in_rect, weights, pool, out, out_rect);
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/convolve_symmetric3.cc b/third_party/jpeg-xl/lib/jxl/convolve_symmetric3.cc
deleted file mode 100644
index 4adf4ad3469fd..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/convolve_symmetric3.cc
+++ /dev/null
@@ -1,202 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/convolve.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/convolve_symmetric3.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/convolve-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::MulAdd;
-using hwy::HWY_NAMESPACE::Vec;
-
-template <class WrapY, class V>
-static V WeightedSum(const ImageF& in, const WrapY wrap_y, const size_t ix,
-                     const int64_t iy, const size_t ysize, const V wx0,
-                     const V wx1, const V wx2) {
-  const HWY_FULL(float) d;
-  const float* JXL_RESTRICT center = in.ConstRow(wrap_y(iy, ysize)) + ix;
-  const auto in_m2 = LoadU(d, center - 2);
-  const auto in_p2 = LoadU(d, center + 2);
-  const auto in_m1 = LoadU(d, center - 1);
-  const auto in_p1 = LoadU(d, center + 1);
-  const auto in_00 = Load(d, center);
-  const auto sum_2 = Mul(wx2, Add(in_m2, in_p2));
-  const auto sum_1 = Mul(wx1, Add(in_m1, in_p1));
-  const auto sum_0 = Mul(wx0, in_00);
-  return Add(sum_2, Add(sum_1, sum_0));
-}
-
-// 3x3 convolution by symmetric kernel with a single scan through the input.
-class Symmetric3Strategy {
-  using D = HWY_CAPPED(float, 16);
-  using V = Vec<D>;
-
- public:
-  static constexpr int64_t kRadius = 1;
-
-  // Only accesses pixels in [0, xsize).
-  template <size_t kSizeModN, class WrapRow>
-  static JXL_MAYBE_INLINE void ConvolveRow(
-      const float* const JXL_RESTRICT row_m, const size_t xsize,
-      const int64_t stride, const WrapRow& wrap_row,
-      const WeightsSymmetric3& weights, float* const JXL_RESTRICT row_out) {
-    const D d;
-    // t, m, b = top, middle, bottom row;
-    const float* const JXL_RESTRICT row_t = wrap_row(row_m - stride, stride);
-    const float* const JXL_RESTRICT row_b = wrap_row(row_m + stride, stride);
-
-    // Must load in advance - compiler doesn't understand LoadDup128 and
-    // schedules them too late.
-    const V w0 = LoadDup128(d, weights.c);
-    const V w1 = LoadDup128(d, weights.r);
-    const V w2 = LoadDup128(d, weights.d);
-
-    // l, c, r = left, center, right. Leftmost vector: need FirstL1.
-    {
-      const V tc = LoadU(d, row_t + 0);
-      const V mc = LoadU(d, row_m + 0);
-      const V bc = LoadU(d, row_b + 0);
-      const V tl = Neighbors::FirstL1(tc);
-      const V tr = LoadU(d, row_t + 0 + 1);
-      const V ml = Neighbors::FirstL1(mc);
-      const V mr = LoadU(d, row_m + 0 + 1);
-      const V bl = Neighbors::FirstL1(bc);
-      const V br = LoadU(d, row_b + 0 + 1);
-      const V conv =
-          WeightedSum(tl, tc, tr, ml, mc, mr, bl, bc, br, w0, w1, w2);
-      Store(conv, d, row_out + 0);
-    }
-
-    // Loop as long as we can load enough new values:
-    const size_t N = Lanes(d);
-    size_t x = N;
-    for (; x + N + kRadius <= xsize; x += N) {
-      const auto conv = ConvolveValid(row_t, row_m, row_b, x, w0, w1, w2);
-      Store(conv, d, row_out + x);
-    }
-
-    // For final (partial) vector:
-    const V tc = LoadU(d, row_t + x);
-    const V mc = LoadU(d, row_m + x);
-    const V bc = LoadU(d, row_b + x);
-
-    V tr;
-    V mr;
-    V br;
-#if HWY_TARGET == HWY_SCALAR
-    tr = tc;  // Single-lane => mirrored right neighbor = center value.
-    mr = mc;
-    br = bc;
-#else
-    if (kSizeModN == 0) {
-      // The above loop didn't handle the last vector because it needs an
-      // additional right neighbor (generated via mirroring).
-      auto mirror = SetTableIndices(d, MirrorLanes(N - 1));
-      tr = TableLookupLanes(tc, mirror);
-      mr = TableLookupLanes(mc, mirror);
-      br = TableLookupLanes(bc, mirror);
-    } else {
-      auto mirror = SetTableIndices(d, MirrorLanes((xsize % N) - 1));
-      // Loads last valid value into uppermost lane and mirrors.
-      tr = TableLookupLanes(LoadU(d, row_t + xsize - N), mirror);
-      mr = TableLookupLanes(LoadU(d, row_m + xsize - N), mirror);
-      br = TableLookupLanes(LoadU(d, row_b + xsize - N), mirror);
-    }
-#endif
-
-    const V tl = LoadU(d, row_t + x - 1);
-    const V ml = LoadU(d, row_m + x - 1);
-    const V bl = LoadU(d, row_b + x - 1);
-    const V conv = WeightedSum(tl, tc, tr, ml, mc, mr, bl, bc, br, w0, w1, w2);
-    Store(conv, d, row_out + x);
-  }
-
- private:
-  // Returns sum{x_i * w_i}.
-  template <class V>
-  static JXL_MAYBE_INLINE V WeightedSum(const V tl, const V tc, const V tr,
-                                        const V ml, const V mc, const V mr,
-                                        const V bl, const V bc, const V br,
-                                        const V w0, const V w1, const V w2) {
-    const V sum_tb = Add(tc, bc);
-
-    // Faster than 5 mul + 4 FMA.
-    const V mul0 = Mul(mc, w0);
-    const V sum_lr = Add(ml, mr);
-
-    const V x1 = Add(sum_tb, sum_lr);
-    const V mul1 = MulAdd(x1, w1, mul0);
-
-    const V sum_t2 = Add(tl, tr);
-    const V sum_b2 = Add(bl, br);
-    const V x2 = Add(sum_t2, sum_b2);
-    const V mul2 = MulAdd(x2, w2, mul1);
-    return mul2;
-  }
-
-  static JXL_MAYBE_INLINE V ConvolveValid(const float* JXL_RESTRICT row_t,
-                                          const float* JXL_RESTRICT row_m,
-                                          const float* JXL_RESTRICT row_b,
-                                          const int64_t x, const V w0,
-                                          const V w1, const V w2) {
-    const D d;
-    const V tc = LoadU(d, row_t + x);
-    const V mc = LoadU(d, row_m + x);
-    const V bc = LoadU(d, row_b + x);
-    const V tl = LoadU(d, row_t + x - 1);
-    const V tr = LoadU(d, row_t + x + 1);
-    const V ml = LoadU(d, row_m + x - 1);
-    const V mr = LoadU(d, row_m + x + 1);
-    const V bl = LoadU(d, row_b + x - 1);
-    const V br = LoadU(d, row_b + x + 1);
-    return WeightedSum(tl, tc, tr, ml, mc, mr, bl, bc, br, w0, w1, w2);
-  }
-};
-
-Status Symmetric3(const ImageF& in, const Rect& rect,
-                  const WeightsSymmetric3& weights, ThreadPool* pool,
-                  ImageF* out) {
-  using Conv = ConvolveT<Symmetric3Strategy>;
-  if (rect.xsize() >= Conv::MinWidth()) {
-    JXL_ENSURE(SameSize(rect, *out));
-    JXL_ENSURE(rect.xsize() >= Conv::MinWidth());
-    Conv::Run(in, rect, weights, pool, out);
-    return true;
-  }
-
-  JXL_RETURN_IF_ERROR(SlowSymmetric3(in, rect, weights, pool, out));
-  return true;
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(Symmetric3);
-Status Symmetric3(const ImageF& in, const Rect& rect,
-                  const WeightsSymmetric3& weights, ThreadPool* pool,
-                  ImageF* out) {
-  return HWY_DYNAMIC_DISPATCH(Symmetric3)(in, rect, weights, pool, out);
-}
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/convolve_symmetric5.cc b/third_party/jpeg-xl/lib/jxl/convolve_symmetric5.cc
deleted file mode 100644
index 327ca286020e5..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/convolve_symmetric5.cc
+++ /dev/null
@@ -1,194 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/convolve.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/convolve_symmetric5.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/convolve-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::Vec;
-
-// Weighted sum of 1x5 pixels around ix, iy with [wx2 wx1 wx0 wx1 wx2].
-template <class WrapY>
-static float WeightedSumBorder(const ImageF& in, const WrapY wrap_y,
-                               const int64_t ix, const int64_t iy,
-                               const size_t xsize, const size_t ysize,
-                               const float wx0, const float wx1,
-                               const float wx2) {
-  const WrapMirror wrap_x;
-  const float* JXL_RESTRICT row = in.ConstRow(wrap_y(iy, ysize));
-  const float in_m2 = row[wrap_x(ix - 2, xsize)];
-  const float in_p2 = row[wrap_x(ix + 2, xsize)];
-  const float in_m1 = row[wrap_x(ix - 1, xsize)];
-  const float in_p1 = row[wrap_x(ix + 1, xsize)];
-  const float in_00 = row[ix];
-  const float sum_2 = wx2 * (in_m2 + in_p2);
-  const float sum_1 = wx1 * (in_m1 + in_p1);
-  const float sum_0 = wx0 * in_00;
-  return sum_2 + (sum_1 + sum_0);
-}
-
-template <class WrapY, class V>
-static V WeightedSum(const ImageF& in, const WrapY wrap_y, const size_t ix,
-                     const int64_t iy, const size_t ysize, const V wx0,
-                     const V wx1, const V wx2) {
-  const HWY_FULL(float) d;
-  const float* JXL_RESTRICT center = in.ConstRow(wrap_y(iy, ysize)) + ix;
-  const auto in_m2 = LoadU(d, center - 2);
-  const auto in_p2 = LoadU(d, center + 2);
-  const auto in_m1 = LoadU(d, center - 1);
-  const auto in_p1 = LoadU(d, center + 1);
-  const auto in_00 = LoadU(d, center);
-  const auto sum_2 = Mul(wx2, Add(in_m2, in_p2));
-  const auto sum_1 = Mul(wx1, Add(in_m1, in_p1));
-  const auto sum_0 = Mul(wx0, in_00);
-  return Add(sum_2, Add(sum_1, sum_0));
-}
-
-// Produces result for one pixel
-template <class WrapY>
-float Symmetric5Border(const ImageF& in, const int64_t ix, const int64_t iy,
-                       const WeightsSymmetric5& weights) {
-  const float w0 = weights.c[0];
-  const float w1 = weights.r[0];
-  const float w2 = weights.R[0];
-  const float w4 = weights.d[0];
-  const float w5 = weights.L[0];
-  const float w8 = weights.D[0];
-
-  const size_t xsize = in.xsize();
-  const size_t ysize = in.ysize();
-  const WrapY wrap_y;
-  // Unrolled loop over all 5 rows of the kernel.
-  float sum0 = WeightedSumBorder(in, wrap_y, ix, iy, xsize, ysize, w0, w1, w2);
-
-  sum0 += WeightedSumBorder(in, wrap_y, ix, iy - 2, xsize, ysize, w2, w5, w8);
-  float sum1 =
-      WeightedSumBorder(in, wrap_y, ix, iy + 2, xsize, ysize, w2, w5, w8);
-
-  sum0 += WeightedSumBorder(in, wrap_y, ix, iy - 1, xsize, ysize, w1, w4, w5);
-  sum1 += WeightedSumBorder(in, wrap_y, ix, iy + 1, xsize, ysize, w1, w4, w5);
-
-  return sum0 + sum1;
-}
-
-// Produces result for one vector's worth of pixels
-template <class WrapY>
-static void Symmetric5Interior(const ImageF& in, const int64_t ix,
-                               const int64_t rix, const int64_t iy,
-                               const WeightsSymmetric5& weights,
-                               float* JXL_RESTRICT row_out) {
-  const HWY_FULL(float) d;
-
-  const auto w0 = LoadDup128(d, weights.c);
-  const auto w1 = LoadDup128(d, weights.r);
-  const auto w2 = LoadDup128(d, weights.R);
-  const auto w4 = LoadDup128(d, weights.d);
-  const auto w5 = LoadDup128(d, weights.L);
-  const auto w8 = LoadDup128(d, weights.D);
-
-  const size_t ysize = in.ysize();
-  const WrapY wrap_y;
-  // Unrolled loop over all 5 rows of the kernel.
-  auto sum0 = WeightedSum(in, wrap_y, ix, iy, ysize, w0, w1, w2);
-
-  sum0 = Add(sum0, WeightedSum(in, wrap_y, ix, iy - 2, ysize, w2, w5, w8));
-  auto sum1 = WeightedSum(in, wrap_y, ix, iy + 2, ysize, w2, w5, w8);
-
-  sum0 = Add(sum0, WeightedSum(in, wrap_y, ix, iy - 1, ysize, w1, w4, w5));
-  sum1 = Add(sum1, WeightedSum(in, wrap_y, ix, iy + 1, ysize, w1, w4, w5));
-
-  StoreU(Add(sum0, sum1), d, row_out + rix);
-}
-
-template <class WrapY>
-static void Symmetric5Row(const ImageF& in, const Rect& rect, const int64_t iy,
-                          const WeightsSymmetric5& weights,
-                          float* JXL_RESTRICT row_out) {
-  const int64_t kRadius = 2;
-  const size_t xend = rect.x1();
-
-  size_t rix = 0;
-  size_t ix = rect.x0();
-  const HWY_FULL(float) d;
-  const size_t N = Lanes(d);
-  const size_t aligned_x = RoundUpTo(kRadius, N);
-  for (; ix < std::min(aligned_x, xend); ++ix, ++rix) {
-    row_out[rix] = Symmetric5Border<WrapY>(in, ix, iy, weights);
-  }
-  for (; ix + N + kRadius <= xend; ix += N, rix += N) {
-    Symmetric5Interior<WrapY>(in, ix, rix, iy, weights, row_out);
-  }
-  for (; ix < xend; ++ix, ++rix) {
-    row_out[rix] = Symmetric5Border<WrapY>(in, ix, iy, weights);
-  }
-}
-
-// Semi-vectorized (interior pixels Fonly); called directly like slow::, unlike
-// the fully vectorized strategies below.
-Status Symmetric5(const ImageF& in, const Rect& in_rect,
-                  const WeightsSymmetric5& weights, ThreadPool* pool,
-                  ImageF* JXL_RESTRICT out, const Rect& out_rect) {
-  JXL_ENSURE(in_rect.xsize() == out_rect.xsize());
-  JXL_ENSURE(in_rect.ysize() == out_rect.ysize());
-  const size_t ysize = in_rect.ysize();
-  const auto process_row = [&](const uint32_t task,
-                               size_t /*thread*/) -> Status {
-    const int64_t riy = task;
-    const int64_t iy = in_rect.y0() + riy;
-
-    if (iy < 2 || iy >= static_cast<ssize_t>(in.ysize()) - 2) {
-      Symmetric5Row<WrapMirror>(in, in_rect, iy, weights,
-                                out_rect.Row(out, riy));
-    } else {
-      Symmetric5Row<WrapUnchanged>(in, in_rect, iy, weights,
-                                   out_rect.Row(out, riy));
-    }
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, static_cast<uint32_t>(ysize),
-                                ThreadPool::NoInit, process_row,
-                                "Symmetric5x5Convolution"));
-  return true;
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(Symmetric5);
-Status Symmetric5(const ImageF& in, const Rect& in_rect,
-                  const WeightsSymmetric5& weights, ThreadPool* pool,
-                  ImageF* JXL_RESTRICT out, const Rect& out_rect) {
-  return HWY_DYNAMIC_DISPATCH(Symmetric5)(in, in_rect, weights, pool, out,
-                                          out_rect);
-}
-
-Status Symmetric5(const ImageF& in, const Rect& rect,
-                  const WeightsSymmetric5& weights, ThreadPool* pool,
-                  ImageF* JXL_RESTRICT out) {
-  return Symmetric5(in, rect, weights, pool, out, Rect(*out));
-}
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/convolve_test.cc b/third_party/jpeg-xl/lib/jxl/convolve_test.cc
deleted file mode 100644
index 0a8ff1f29686c..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/convolve_test.cc
+++ /dev/null
@@ -1,292 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/convolve.h"
-
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-
-#include <cinttypes>  // PRIx64
-#include <ctime>
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/convolve_test.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-#include <hwy/nanobenchmark.h>
-#include <hwy/tests/hwy_gtest.h>
-#include <vector>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/random.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/image_test_utils.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-#ifndef JXL_DEBUG_CONVOLVE
-#define JXL_DEBUG_CONVOLVE 0
-#endif
-
-#include "lib/jxl/convolve-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-void TestNeighbors() {
-  const Neighbors::D d;
-  const Neighbors::V v = Iota(d, 0);
-  constexpr size_t kMaxVectorSize = 64;
-  constexpr size_t M = kMaxVectorSize / sizeof(float);
-  HWY_ALIGN float actual[M] = {0};
-
-  HWY_ALIGN float first_l1[M] = {0, 0, 1, 2,  3,  4,  5,  6,
-                                 7, 8, 9, 10, 11, 12, 13, 14};
-  Store(Neighbors::FirstL1(v), d, actual);
-  const size_t N = Lanes(d);
-  ASSERT_LE(N, M);
-  EXPECT_EQ(std::vector<float>(first_l1, first_l1 + N),
-            std::vector<float>(actual, actual + N));
-
-#if HWY_TARGET != HWY_SCALAR
-  HWY_ALIGN float first_l2[M] = {1, 0, 0, 1, 2,  3,  4,  5,
-                                 6, 7, 8, 9, 10, 11, 12, 13};
-  Store(Neighbors::FirstL2(v), d, actual);
-  EXPECT_EQ(std::vector<float>(first_l2, first_l2 + N),
-            std::vector<float>(actual, actual + N));
-
-  HWY_ALIGN float first_l3[] = {2, 1, 0, 0, 1, 2,  3,  4,
-                                5, 6, 7, 8, 9, 10, 11, 12};
-  Store(Neighbors::FirstL3(v), d, actual);
-  EXPECT_EQ(std::vector<float>(first_l3, first_l3 + N),
-            std::vector<float>(actual, actual + N));
-#endif  // HWY_TARGET != HWY_SCALAR
-}
-
-void VerifySymmetric3(const size_t xsize, const size_t ysize, ThreadPool* pool,
-                      Rng* rng) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const Rect rect(0, 0, xsize, ysize);
-
-  JXL_TEST_ASSIGN_OR_DIE(ImageF in,
-                         ImageF::Create(memory_manager, xsize, ysize));
-  GenerateImage(*rng, &in, 0.0f, 1.0f);
-
-  JXL_TEST_ASSIGN_OR_DIE(ImageF out_expected,
-                         ImageF::Create(memory_manager, xsize, ysize));
-  JXL_TEST_ASSIGN_OR_DIE(ImageF out_actual,
-                         ImageF::Create(memory_manager, xsize, ysize));
-
-  const WeightsSymmetric3& weights = WeightsSymmetric3Lowpass();
-  ASSERT_TRUE(Symmetric3(in, rect, weights, pool, &out_expected));
-  ASSERT_TRUE(SlowSymmetric3(in, rect, weights, pool, &out_actual));
-
-  JXL_TEST_ASSERT_OK(
-      VerifyRelativeError(out_expected, out_actual, 1E-5f, 1E-5f, _));
-}
-
-std::vector<Rect> GenerateTestRectangles(size_t xsize, size_t ysize) {
-  std::vector<Rect> out;
-  for (size_t tl : {0, 1, 13}) {
-    for (size_t br : {0, 1, 13}) {
-      if (xsize > tl + br && ysize > tl + br) {
-        out.emplace_back(tl, tl, xsize - tl - br, ysize - tl - br);
-      }
-    }
-  }
-  return out;
-}
-
-// Ensures Symmetric and Separable give the same result.
-void VerifySymmetric5(const size_t xsize, const size_t ysize, ThreadPool* pool,
-                      Rng* rng) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  JXL_TEST_ASSIGN_OR_DIE(ImageF in,
-                         ImageF::Create(memory_manager, xsize, ysize));
-  GenerateImage(*rng, &in, 0.0f, 1.0f);
-
-  for (const Rect& in_rect : GenerateTestRectangles(xsize, ysize)) {
-    JXL_DEBUG(JXL_DEBUG_CONVOLVE,
-              "in_rect: %" PRIuS "x%" PRIuS "+%" PRIuS ",%" PRIuS "",
-              in_rect.xsize(), in_rect.ysize(), in_rect.x0(), in_rect.y0());
-    {
-      Rect out_rect = in_rect;
-      JXL_TEST_ASSIGN_OR_DIE(ImageF out_expected,
-                             ImageF::Create(memory_manager, xsize, ysize));
-      JXL_TEST_ASSIGN_OR_DIE(ImageF out_actual,
-                             ImageF::Create(memory_manager, xsize, ysize));
-      FillImage(-1.0f, &out_expected);
-      FillImage(-1.0f, &out_actual);
-
-      ASSERT_TRUE(SlowSeparable5(in, in_rect, WeightsSeparable5Lowpass(), pool,
-                                 &out_expected, out_rect));
-      ASSERT_TRUE(Symmetric5(in, in_rect, WeightsSymmetric5Lowpass(), pool,
-                             &out_actual, out_rect));
-
-      JXL_TEST_ASSERT_OK(
-          VerifyRelativeError(out_expected, out_actual, 1E-5f, 1E-5f, _));
-    }
-    {
-      Rect out_rect(0, 0, in_rect.xsize(), in_rect.ysize());
-      JXL_TEST_ASSIGN_OR_DIE(
-          ImageF out_expected,
-          ImageF::Create(memory_manager, out_rect.xsize(), out_rect.ysize()));
-      JXL_TEST_ASSIGN_OR_DIE(
-          ImageF out_actual,
-          ImageF::Create(memory_manager, out_rect.xsize(), out_rect.ysize()));
-
-      ASSERT_TRUE(SlowSeparable5(in, in_rect, WeightsSeparable5Lowpass(), pool,
-                                 &out_expected, out_rect));
-      ASSERT_TRUE(Symmetric5(in, in_rect, WeightsSymmetric5Lowpass(), pool,
-                             &out_actual, out_rect));
-
-      JXL_TEST_ASSERT_OK(
-          VerifyRelativeError(out_expected, out_actual, 1E-5f, 1E-5f, _));
-    }
-  }
-}
-
-void VerifySeparable5(const size_t xsize, const size_t ysize, ThreadPool* pool,
-                      Rng* rng) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const Rect rect(0, 0, xsize, ysize);
-
-  JXL_TEST_ASSIGN_OR_DIE(ImageF in,
-                         ImageF::Create(memory_manager, xsize, ysize));
-  GenerateImage(*rng, &in, 0.0f, 1.0f);
-
-  JXL_TEST_ASSIGN_OR_DIE(ImageF out_expected,
-                         ImageF::Create(memory_manager, xsize, ysize));
-  JXL_TEST_ASSIGN_OR_DIE(ImageF out_actual,
-                         ImageF::Create(memory_manager, xsize, ysize));
-
-  const WeightsSeparable5& weights = WeightsSeparable5Lowpass();
-  ASSERT_TRUE(SlowSeparable5(in, rect, weights, pool, &out_expected, rect));
-  ASSERT_TRUE(Separable5(in, rect, weights, pool, &out_actual));
-
-  JXL_TEST_ASSERT_OK(
-      VerifyRelativeError(out_expected, out_actual, 1E-5f, 1E-5f, _));
-}
-
-// For all xsize/ysize and kernels:
-void TestConvolve() {
-  TestNeighbors();
-
-  test::ThreadPoolForTests pool(4);
-  const auto do_test = [](const uint32_t task, size_t /*thread*/) -> Status {
-    const size_t xsize = task;
-    Rng rng(129 + 13 * xsize);
-
-    ThreadPool* null_pool = nullptr;
-    test::ThreadPoolForTests pool3(3);
-    for (size_t ysize = kConvolveMaxRadius; ysize < 16; ++ysize) {
-      JXL_DEBUG(JXL_DEBUG_CONVOLVE,
-                "%" PRIuS " x %" PRIuS " (target %" PRIx64
-                ")===============================",
-                xsize, ysize, static_cast<int64_t>(HWY_TARGET));
-
-      JXL_DEBUG(JXL_DEBUG_CONVOLVE, "Sym3------------------");
-      VerifySymmetric3(xsize, ysize, null_pool, &rng);
-      VerifySymmetric3(xsize, ysize, pool3.get(), &rng);
-
-      JXL_DEBUG(JXL_DEBUG_CONVOLVE, "Sym5------------------");
-      VerifySymmetric5(xsize, ysize, null_pool, &rng);
-      VerifySymmetric5(xsize, ysize, pool3.get(), &rng);
-
-      JXL_DEBUG(JXL_DEBUG_CONVOLVE, "Sep5------------------");
-      VerifySeparable5(xsize, ysize, null_pool, &rng);
-      VerifySeparable5(xsize, ysize, pool3.get(), &rng);
-    }
-    return true;
-  };
-  EXPECT_EQ(true, RunOnPool(pool.get(), kConvolveMaxRadius, 40,
-                            ThreadPool::NoInit, do_test, "TestConvolve"));
-}
-
-// Measures durations, verifies results, prints timings. `unpredictable1`
-// must have value 1 (unknown to the compiler to prevent elision).
-template <class Conv>
-void BenchmarkConv(const char* caption, const Conv& conv,
-                   const hwy::FuncInput unpredictable1) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const size_t kNumInputs = 1;
-  const hwy::FuncInput inputs[kNumInputs] = {unpredictable1};
-  hwy::Result results[kNumInputs];
-
-  const size_t kDim = 160;  // in+out fit in L2
-  JXL_TEST_ASSIGN_OR_DIE(ImageF in, ImageF::Create(memory_manager, kDim, kDim));
-  ZeroFillImage(&in);
-  in.Row(kDim / 2)[kDim / 2] = unpredictable1;
-  JXL_TEST_ASSIGN_OR_DIE(ImageF out,
-                         ImageF::Create(memory_manager, kDim, kDim));
-
-  hwy::Params p;
-  p.verbose = false;
-  p.max_evals = 7;
-  p.target_rel_mad = 0.002;
-  const size_t num_results = MeasureClosure(
-      [&in, &conv, &out](const hwy::FuncInput input) {
-        conv(in, &out);
-        return out.Row(input)[0];
-      },
-      inputs, kNumInputs, results, p);
-  if (num_results != kNumInputs) {
-    fprintf(stderr, "MeasureClosure failed.\n");
-  }
-  for (size_t i = 0; i < num_results; ++i) {
-    const double seconds = static_cast<double>(results[i].ticks) /
-                           hwy::platform::InvariantTicksPerSecond();
-    printf("%12s: %7.2f MP/s (MAD=%4.2f%%)\n", caption,
-           kDim * kDim * 1E-6 / seconds,
-           static_cast<double>(results[i].variability) * 100.0);
-  }
-}
-
-struct ConvSymmetric3 {
-  void operator()(const ImageF& in, ImageF* JXL_RESTRICT out) const {
-    ThreadPool* null_pool = nullptr;
-    ASSERT_TRUE(
-        Symmetric3(in, Rect(in), WeightsSymmetric3Lowpass(), null_pool, out));
-  }
-};
-
-struct ConvSeparable5 {
-  void operator()(const ImageF& in, ImageF* JXL_RESTRICT out) const {
-    ThreadPool* null_pool = nullptr;
-    ASSERT_TRUE(
-        Separable5(in, Rect(in), WeightsSeparable5Lowpass(), null_pool, out));
-  }
-};
-
-void BenchmarkAll() {
-#if JXL_FALSE  // disabled to avoid test timeouts, run manually on demand
-  const hwy::FuncInput unpredictable1 = time(nullptr) != 1234;
-  BenchmarkConv("Symmetric3", ConvSymmetric3(), unpredictable1);
-  BenchmarkConv("Separable5", ConvSeparable5(), unpredictable1);
-#endif
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-class ConvolveTest : public hwy::TestWithParamTarget {};
-HWY_TARGET_INSTANTIATE_TEST_SUITE_P(ConvolveTest);
-
-HWY_EXPORT_AND_TEST_P(ConvolveTest, TestConvolve);
-
-HWY_EXPORT_AND_TEST_P(ConvolveTest, BenchmarkAll);
-
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl/data_parallel_test.cc b/third_party/jpeg-xl/lib/jxl/data_parallel_test.cc
deleted file mode 100644
index 1f81d0309e69a..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/data_parallel_test.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/base/data_parallel.h"
-
-#include <jxl/parallel_runner.h>
-
-#include <cstddef>
-#include <cstdint>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-class DataParallelTest : public ::testing::Test {
- protected:
-  // A fake class to verify that DataParallel is properly calling the
-  // client-provided runner functions.
-  static int FakeRunner(void* runner_opaque, void* jpegxl_opaque,
-                        JxlParallelRunInit init, JxlParallelRunFunction func,
-                        uint32_t start_range, uint32_t end_range) {
-    DataParallelTest* self = static_cast<DataParallelTest*>(runner_opaque);
-    self->runner_called_++;
-    self->jpegxl_opaque_ = jpegxl_opaque;
-    self->init_ = init;
-    self->func_ = func;
-    self->start_range_ = start_range;
-    self->end_range_ = end_range;
-    return self->runner_return_;
-  }
-
-  ThreadPool pool_{&DataParallelTest::FakeRunner, this};
-
-  // Number of times FakeRunner() was called.
-  int runner_called_ = 0;
-
-  // Parameters passed to FakeRunner.
-  void* jpegxl_opaque_ = nullptr;
-  JxlParallelRunInit init_ = nullptr;
-  JxlParallelRunFunction func_ = nullptr;
-  uint32_t start_range_ = -1;
-  uint32_t end_range_ = -1;
-
-  // Return value that FakeRunner will return.
-  int runner_return_ = 0;
-};
-
-// JxlParallelRunInit interface.
-typedef int (*JxlParallelRunInit)();
-
-}  // namespace
-
-TEST_F(DataParallelTest, RunnerCalledParameters) {
-  EXPECT_TRUE(pool_.Run(
-      1234, 5678, [](size_t /* num_threads */) -> Status { return true; },
-      [](uint32_t /* task */, size_t /* thread */) -> Status { return true; },
-      "Test"));
-  EXPECT_EQ(1, runner_called_);
-  EXPECT_NE(nullptr, init_);
-  EXPECT_NE(nullptr, func_);
-  EXPECT_NE(nullptr, jpegxl_opaque_);
-  EXPECT_EQ(1234u, start_range_);
-  EXPECT_EQ(5678u, end_range_);
-}
-
-TEST_F(DataParallelTest, RunnerFailurePropagates) {
-  runner_return_ = -1;  // FakeRunner return value.
-  EXPECT_FALSE(pool_.Run(
-      1234, 5678,
-      [](size_t /* num_threads */) -> Status { return JXL_FAILURE("init"); },
-      [](uint32_t /* task */, size_t /* thread */) -> Status { return true; },
-      "TestA"));
-  EXPECT_FALSE(RunOnPool(
-      nullptr, 1234, 5678,
-      [](size_t /* num_threads */) -> Status { return JXL_FAILURE("init"); },
-      [](uint32_t /* task */, size_t /* thread */) -> Status { return true; },
-      "TestB"));
-}
-
-TEST_F(DataParallelTest, RunnerNotCalledOnEmptyRange) {
-  runner_return_ = -1;  // FakeRunner return value.
-  EXPECT_TRUE(pool_.Run(
-      123, 123,
-      [](size_t /* num_threads */) -> Status { return JXL_FAILURE("init"); },
-      [](uint32_t /* task */, size_t /* thread */) -> Status { return true; },
-      "TestA"));
-  EXPECT_TRUE(RunOnPool(
-      nullptr, 123, 123,
-      [](size_t /* num_threads */) -> Status { return JXL_FAILURE("init"); },
-      [](uint32_t /* task */, size_t /* thread */) -> Status { return true; },
-      "TestB"));
-  // We don't call the external runner when the range is empty. We don't even
-  // need to call the init function.
-  EXPECT_EQ(0, runner_called_);
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/dct-inl.h b/third_party/jpeg-xl/lib/jxl/dct-inl.h
deleted file mode 100644
index 8e1b3bd6aa2ae..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dct-inl.h
+++ /dev/null
@@ -1,339 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Fast SIMD floating-point (I)DCT, any power of two.
-
-#if defined(LIB_JXL_DCT_INL_H_) == defined(HWY_TARGET_TOGGLE)
-#ifdef LIB_JXL_DCT_INL_H_
-#undef LIB_JXL_DCT_INL_H_
-#else
-#define LIB_JXL_DCT_INL_H_
-#endif
-
-#include <stddef.h>
-
-#include <hwy/highway.h>
-
-#include "lib/jxl/dct_block-inl.h"
-#include "lib/jxl/dct_scales.h"
-#include "lib/jxl/transpose-inl.h"
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-namespace {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::MulAdd;
-using hwy::HWY_NAMESPACE::NegMulAdd;
-using hwy::HWY_NAMESPACE::Sub;
-
-template <size_t SZ>
-struct FVImpl {
-  using type = HWY_CAPPED(float, SZ);
-};
-
-template <>
-struct FVImpl<0> {
-  using type = HWY_FULL(float);
-};
-
-template <size_t SZ>
-using FV = typename FVImpl<SZ>::type;
-
-// Implementation of Lowest Complexity Self Recursive Radix-2 DCT II/III
-// Algorithms, by Siriani M. Perera and Jianhua Liu.
-
-template <size_t N, size_t SZ>
-struct CoeffBundle {
-  static void AddReverse(const float* JXL_RESTRICT a_in1,
-                         const float* JXL_RESTRICT a_in2,
-                         float* JXL_RESTRICT a_out) {
-    for (size_t i = 0; i < N; i++) {
-      auto in1 = Load(FV<SZ>(), a_in1 + i * SZ);
-      auto in2 = Load(FV<SZ>(), a_in2 + (N - i - 1) * SZ);
-      Store(Add(in1, in2), FV<SZ>(), a_out + i * SZ);
-    }
-  }
-  static void SubReverse(const float* JXL_RESTRICT a_in1,
-                         const float* JXL_RESTRICT a_in2,
-                         float* JXL_RESTRICT a_out) {
-    for (size_t i = 0; i < N; i++) {
-      auto in1 = Load(FV<SZ>(), a_in1 + i * SZ);
-      auto in2 = Load(FV<SZ>(), a_in2 + (N - i - 1) * SZ);
-      Store(Sub(in1, in2), FV<SZ>(), a_out + i * SZ);
-    }
-  }
-  static void B(float* JXL_RESTRICT coeff) {
-    auto sqrt2 = Set(FV<SZ>(), kSqrt2);
-    auto in1 = Load(FV<SZ>(), coeff);
-    auto in2 = Load(FV<SZ>(), coeff + SZ);
-    Store(MulAdd(in1, sqrt2, in2), FV<SZ>(), coeff);
-    for (size_t i = 1; i + 1 < N; i++) {
-      auto in1 = Load(FV<SZ>(), coeff + i * SZ);
-      auto in2 = Load(FV<SZ>(), coeff + (i + 1) * SZ);
-      Store(Add(in1, in2), FV<SZ>(), coeff + i * SZ);
-    }
-  }
-  static void BTranspose(float* JXL_RESTRICT coeff) {
-    for (size_t i = N - 1; i > 0; i--) {
-      auto in1 = Load(FV<SZ>(), coeff + i * SZ);
-      auto in2 = Load(FV<SZ>(), coeff + (i - 1) * SZ);
-      Store(Add(in1, in2), FV<SZ>(), coeff + i * SZ);
-    }
-    auto sqrt2 = Set(FV<SZ>(), kSqrt2);
-    auto in1 = Load(FV<SZ>(), coeff);
-    Store(Mul(in1, sqrt2), FV<SZ>(), coeff);
-  }
-  // Ideally optimized away by compiler (except the multiply).
-  static void InverseEvenOdd(const float* JXL_RESTRICT a_in,
-                             float* JXL_RESTRICT a_out) {
-    for (size_t i = 0; i < N / 2; i++) {
-      auto in1 = Load(FV<SZ>(), a_in + i * SZ);
-      Store(in1, FV<SZ>(), a_out + 2 * i * SZ);
-    }
-    for (size_t i = N / 2; i < N; i++) {
-      auto in1 = Load(FV<SZ>(), a_in + i * SZ);
-      Store(in1, FV<SZ>(), a_out + (2 * (i - N / 2) + 1) * SZ);
-    }
-  }
-  // Ideally optimized away by compiler.
-  static void ForwardEvenOdd(const float* JXL_RESTRICT a_in, size_t a_in_stride,
-                             float* JXL_RESTRICT a_out) {
-    for (size_t i = 0; i < N / 2; i++) {
-      auto in1 = LoadU(FV<SZ>(), a_in + 2 * i * a_in_stride);
-      Store(in1, FV<SZ>(), a_out + i * SZ);
-    }
-    for (size_t i = N / 2; i < N; i++) {
-      auto in1 = LoadU(FV<SZ>(), a_in + (2 * (i - N / 2) + 1) * a_in_stride);
-      Store(in1, FV<SZ>(), a_out + i * SZ);
-    }
-  }
-  // Invoked on full vector.
-  static void Multiply(float* JXL_RESTRICT coeff) {
-    for (size_t i = 0; i < N / 2; i++) {
-      auto in1 = Load(FV<SZ>(), coeff + (N / 2 + i) * SZ);
-      auto mul = Set(FV<SZ>(), WcMultipliers<N>::kMultipliers[i]);
-      Store(Mul(in1, mul), FV<SZ>(), coeff + (N / 2 + i) * SZ);
-    }
-  }
-  static void MultiplyAndAdd(const float* JXL_RESTRICT coeff,
-                             float* JXL_RESTRICT out, size_t out_stride) {
-    for (size_t i = 0; i < N / 2; i++) {
-      auto mul = Set(FV<SZ>(), WcMultipliers<N>::kMultipliers[i]);
-      auto in1 = Load(FV<SZ>(), coeff + i * SZ);
-      auto in2 = Load(FV<SZ>(), coeff + (N / 2 + i) * SZ);
-      auto out1 = MulAdd(mul, in2, in1);
-      auto out2 = NegMulAdd(mul, in2, in1);
-      StoreU(out1, FV<SZ>(), out + i * out_stride);
-      StoreU(out2, FV<SZ>(), out + (N - i - 1) * out_stride);
-    }
-  }
-  template <typename Block>
-  static void LoadFromBlock(const Block& in, size_t off,
-                            float* JXL_RESTRICT coeff) {
-    for (size_t i = 0; i < N; i++) {
-      Store(in.LoadPart(FV<SZ>(), i, off), FV<SZ>(), coeff + i * SZ);
-    }
-  }
-  template <typename Block>
-  static void StoreToBlockAndScale(const float* JXL_RESTRICT coeff,
-                                   const Block& out, size_t off) {
-    auto mul = Set(FV<SZ>(), 1.0f / N);
-    for (size_t i = 0; i < N; i++) {
-      out.StorePart(FV<SZ>(), Mul(mul, Load(FV<SZ>(), coeff + i * SZ)), i, off);
-    }
-  }
-};
-
-template <size_t N, size_t SZ>
-struct DCT1DImpl;
-
-template <size_t SZ>
-struct DCT1DImpl<1, SZ> {
-  JXL_INLINE void operator()(float* JXL_RESTRICT mem, float* /* tmp */) {}
-};
-
-template <size_t SZ>
-struct DCT1DImpl<2, SZ> {
-  JXL_INLINE void operator()(float* JXL_RESTRICT mem, float* /* tmp */) {
-    auto in1 = Load(FV<SZ>(), mem);
-    auto in2 = Load(FV<SZ>(), mem + SZ);
-    Store(Add(in1, in2), FV<SZ>(), mem);
-    Store(Sub(in1, in2), FV<SZ>(), mem + SZ);
-  }
-};
-
-template <size_t N, size_t SZ>
-struct DCT1DImpl {
-  void operator()(float* JXL_RESTRICT mem, float* JXL_RESTRICT tmp) {
-    CoeffBundle<N / 2, SZ>::AddReverse(mem, mem + N / 2 * SZ, tmp);
-    DCT1DImpl<N / 2, SZ>()(tmp, tmp + N * SZ);
-    CoeffBundle<N / 2, SZ>::SubReverse(mem, mem + N / 2 * SZ, tmp + N / 2 * SZ);
-    CoeffBundle<N, SZ>::Multiply(tmp);
-    DCT1DImpl<N / 2, SZ>()(tmp + N / 2 * SZ, tmp + N * SZ);
-    CoeffBundle<N / 2, SZ>::B(tmp + N / 2 * SZ);
-    CoeffBundle<N, SZ>::InverseEvenOdd(tmp, mem);
-  }
-};
-
-template <size_t N, size_t SZ>
-struct IDCT1DImpl;
-
-template <size_t SZ>
-struct IDCT1DImpl<1, SZ> {
-  JXL_INLINE void operator()(const float* from, size_t from_stride, float* to,
-                             size_t to_stride, float* JXL_RESTRICT /* tmp */) {
-    StoreU(LoadU(FV<SZ>(), from), FV<SZ>(), to);
-  }
-};
-
-template <size_t SZ>
-struct IDCT1DImpl<2, SZ> {
-  JXL_INLINE void operator()(const float* from, size_t from_stride, float* to,
-                             size_t to_stride, float* JXL_RESTRICT /* tmp */) {
-    JXL_DASSERT(from_stride >= SZ);
-    JXL_DASSERT(to_stride >= SZ);
-    auto in1 = LoadU(FV<SZ>(), from);
-    auto in2 = LoadU(FV<SZ>(), from + from_stride);
-    StoreU(Add(in1, in2), FV<SZ>(), to);
-    StoreU(Sub(in1, in2), FV<SZ>(), to + to_stride);
-  }
-};
-
-template <size_t N, size_t SZ>
-struct IDCT1DImpl {
-  void operator()(const float* from, size_t from_stride, float* to,
-                  size_t to_stride, float* JXL_RESTRICT tmp) {
-    JXL_DASSERT(from_stride >= SZ);
-    JXL_DASSERT(to_stride >= SZ);
-    CoeffBundle<N, SZ>::ForwardEvenOdd(from, from_stride, tmp);
-    IDCT1DImpl<N / 2, SZ>()(tmp, SZ, tmp, SZ, tmp + N * SZ);
-    CoeffBundle<N / 2, SZ>::BTranspose(tmp + N / 2 * SZ);
-    IDCT1DImpl<N / 2, SZ>()(tmp + N / 2 * SZ, SZ, tmp + N / 2 * SZ, SZ,
-                            tmp + N * SZ);
-    CoeffBundle<N, SZ>::MultiplyAndAdd(tmp, to, to_stride);
-  }
-};
-
-template <size_t N, size_t M_or_0, typename FromBlock, typename ToBlock>
-void DCT1DWrapper(const FromBlock& from, const ToBlock& to, size_t Mp,
-                  float* JXL_RESTRICT tmp) {
-  size_t M = M_or_0 != 0 ? M_or_0 : Mp;
-  constexpr size_t SZ = MaxLanes(FV<M_or_0>());
-  for (size_t i = 0; i < M; i += Lanes(FV<M_or_0>())) {
-    // TODO(veluca): consider removing the temporary memory here (as is done in
-    // IDCT), if it turns out that some compilers don't optimize away the loads
-    // and this is performance-critical.
-    CoeffBundle<N, SZ>::LoadFromBlock(from, i, tmp);
-    DCT1DImpl<N, SZ>()(tmp, tmp + N * SZ);
-    CoeffBundle<N, SZ>::StoreToBlockAndScale(tmp, to, i);
-  }
-}
-
-template <size_t N, size_t M_or_0, typename FromBlock, typename ToBlock>
-void IDCT1DWrapper(const FromBlock& from, const ToBlock& to, size_t Mp,
-                   float* JXL_RESTRICT tmp) {
-  size_t M = M_or_0 != 0 ? M_or_0 : Mp;
-  constexpr size_t SZ = MaxLanes(FV<M_or_0>());
-  for (size_t i = 0; i < M; i += Lanes(FV<M_or_0>())) {
-    IDCT1DImpl<N, SZ>()(from.Address(0, i), from.Stride(), to.Address(0, i),
-                        to.Stride(), tmp);
-  }
-}
-
-template <size_t N, size_t M, typename = void>
-struct DCT1D {
-  template <typename FromBlock, typename ToBlock>
-  void operator()(const FromBlock& from, const ToBlock& to,
-                  float* JXL_RESTRICT tmp) {
-    return DCT1DWrapper<N, M>(from, to, M, tmp);
-  }
-};
-
-template <size_t N, size_t M>
-struct DCT1D<N, M, typename std::enable_if<(M > MaxLanes(FV<0>()))>::type> {
-  template <typename FromBlock, typename ToBlock>
-  void operator()(const FromBlock& from, const ToBlock& to,
-                  float* JXL_RESTRICT tmp) {
-    return NoInlineWrapper(DCT1DWrapper<N, 0, FromBlock, ToBlock>, from, to, M,
-                           tmp);
-  }
-};
-
-template <size_t N, size_t M, typename = void>
-struct IDCT1D {
-  template <typename FromBlock, typename ToBlock>
-  void operator()(const FromBlock& from, const ToBlock& to,
-                  float* JXL_RESTRICT tmp) {
-    return IDCT1DWrapper<N, M>(from, to, M, tmp);
-  }
-};
-
-template <size_t N, size_t M>
-struct IDCT1D<N, M, typename std::enable_if<(M > MaxLanes(FV<0>()))>::type> {
-  template <typename FromBlock, typename ToBlock>
-  void operator()(const FromBlock& from, const ToBlock& to,
-                  float* JXL_RESTRICT tmp) {
-    return NoInlineWrapper(IDCT1DWrapper<N, 0, FromBlock, ToBlock>, from, to, M,
-                           tmp);
-  }
-};
-
-// Computes the maybe-transposed, scaled DCT of a block, that needs to be
-// HWY_ALIGN'ed.
-template <size_t ROWS, size_t COLS>
-struct ComputeScaledDCT {
-  // scratch_space must be aligned, and should have space for ROWS*COLS
-  // floats.
-  template <class From>
-  HWY_MAYBE_UNUSED void operator()(const From& from, float* to,
-                                   float* JXL_RESTRICT scratch_space) {
-    float* JXL_RESTRICT block = scratch_space;
-    float* JXL_RESTRICT tmp = scratch_space + ROWS * COLS;
-    if (ROWS < COLS) {
-      DCT1D<ROWS, COLS>()(from, DCTTo(block, COLS), tmp);
-      Transpose<ROWS, COLS>::Run(DCTFrom(block, COLS), DCTTo(to, ROWS));
-      DCT1D<COLS, ROWS>()(DCTFrom(to, ROWS), DCTTo(block, ROWS), tmp);
-      Transpose<COLS, ROWS>::Run(DCTFrom(block, ROWS), DCTTo(to, COLS));
-    } else {
-      DCT1D<ROWS, COLS>()(from, DCTTo(to, COLS), tmp);
-      Transpose<ROWS, COLS>::Run(DCTFrom(to, COLS), DCTTo(block, ROWS));
-      DCT1D<COLS, ROWS>()(DCTFrom(block, ROWS), DCTTo(to, ROWS), tmp);
-    }
-  }
-};
-// Computes the maybe-transposed, scaled IDCT of a block, that needs to be
-// HWY_ALIGN'ed.
-template <size_t ROWS, size_t COLS>
-struct ComputeScaledIDCT {
-  // scratch_space must be aligned, and should have space for ROWS*COLS
-  // floats.
-  template <class To>
-  HWY_MAYBE_UNUSED void operator()(float* JXL_RESTRICT from, const To& to,
-                                   float* JXL_RESTRICT scratch_space) {
-    float* JXL_RESTRICT block = scratch_space;
-    float* JXL_RESTRICT tmp = scratch_space + ROWS * COLS;
-    // Reverse the steps done in ComputeScaledDCT.
-    if (ROWS < COLS) {
-      Transpose<ROWS, COLS>::Run(DCTFrom(from, COLS), DCTTo(block, ROWS));
-      IDCT1D<COLS, ROWS>()(DCTFrom(block, ROWS), DCTTo(from, ROWS), tmp);
-      Transpose<COLS, ROWS>::Run(DCTFrom(from, ROWS), DCTTo(block, COLS));
-      IDCT1D<ROWS, COLS>()(DCTFrom(block, COLS), to, tmp);
-    } else {
-      IDCT1D<COLS, ROWS>()(DCTFrom(from, ROWS), DCTTo(block, ROWS), tmp);
-      Transpose<COLS, ROWS>::Run(DCTFrom(block, ROWS), DCTTo(from, COLS));
-      IDCT1D<ROWS, COLS>()(DCTFrom(from, COLS), to, tmp);
-    }
-  }
-};
-
-}  // namespace
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-#endif  // LIB_JXL_DCT_INL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/dct_block-inl.h b/third_party/jpeg-xl/lib/jxl/dct_block-inl.h
deleted file mode 100644
index 6db5f0e7c826a..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dct_block-inl.h
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Adapters for DCT input/output: from/to contiguous blocks or image rows.
-
-#if defined(LIB_JXL_DCT_BLOCK_INL_H_) == defined(HWY_TARGET_TOGGLE)
-#ifdef LIB_JXL_DCT_BLOCK_INL_H_
-#undef LIB_JXL_DCT_BLOCK_INL_H_
-#else
-#define LIB_JXL_DCT_BLOCK_INL_H_
-#endif
-
-#include <stddef.h>
-
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/status.h"
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-namespace {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Vec;
-
-// Block: (x, y) <-> (N * y + x)
-// Lines: (x, y) <-> (stride * y + x)
-//
-// I.e. Block is a specialization of Lines with fixed stride.
-//
-// FromXXX should implement Read and Load (Read vector).
-// ToXXX should implement Write and Store (Write vector).
-
-template <size_t N>
-using BlockDesc = HWY_CAPPED(float, N);
-
-// Here and in the following, the SZ template parameter specifies the number of
-// values to load/store. Needed because we want to handle 4x4 sub-blocks of
-// 16x16 blocks.
-class DCTFrom {
- public:
-  DCTFrom(const float* data, size_t stride) : stride_(stride), data_(data) {}
-
-  template <typename D>
-  HWY_INLINE Vec<D> LoadPart(D /* tag */, const size_t row, size_t i) const {
-    JXL_DASSERT(Lanes(D()) <= stride_);
-    // Since these functions are used also for DC, no alignment at all is
-    // guaranteed in the case of floating blocks.
-    // TODO(veluca): consider using a different class for DC-to-LF and
-    // DC-from-LF, or copying DC values to/from a temporary aligned location.
-    return LoadU(D(), Address(row, i));
-  }
-
-  HWY_INLINE float Read(const size_t row, const size_t i) const {
-    return *Address(row, i);
-  }
-
-  constexpr HWY_INLINE const float* Address(const size_t row,
-                                            const size_t i) const {
-    return data_ + row * stride_ + i;
-  }
-
-  size_t Stride() const { return stride_; }
-
- private:
-  size_t stride_;
-  const float* JXL_RESTRICT data_;
-};
-
-class DCTTo {
- public:
-  DCTTo(float* data, size_t stride) : stride_(stride), data_(data) {}
-
-  template <typename D>
-  HWY_INLINE void StorePart(D /* tag */, const Vec<D>& v, const size_t row,
-                            size_t i) const {
-    JXL_DASSERT(Lanes(D()) <= stride_);
-    // Since these functions are used also for DC, no alignment at all is
-    // guaranteed in the case of floating blocks.
-    // TODO(veluca): consider using a different class for DC-to-LF and
-    // DC-from-LF, or copying DC values to/from a temporary aligned location.
-    StoreU(v, D(), Address(row, i));
-  }
-
-  HWY_INLINE void Write(float v, const size_t row, const size_t i) const {
-    *Address(row, i) = v;
-  }
-
-  constexpr HWY_INLINE float* Address(const size_t row, const size_t i) const {
-    return data_ + row * stride_ + i;
-  }
-
-  size_t Stride() const { return stride_; }
-
- private:
-  size_t stride_;
-  float* JXL_RESTRICT data_;
-};
-
-}  // namespace
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#endif  // LIB_JXL_DCT_BLOCK_INL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/dct_for_test.h b/third_party/jpeg-xl/lib/jxl/dct_for_test.h
deleted file mode 100644
index 29c189261d2ad..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dct_for_test.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_DCT_FOR_TEST_H_
-#define LIB_JXL_DCT_FOR_TEST_H_
-
-// Unoptimized DCT only for use in tests.
-
-#include <cmath>
-#include <cstring>  // memcpy
-#include <vector>
-
-#include "lib/jxl/base/common.h"
-
-namespace jxl {
-
-namespace test {
-static inline double alpha(int u) { return u == 0 ? 0.7071067811865475 : 1.0; }
-
-// N-DCT on M columns, divided by sqrt(N). Matches the definition in the spec.
-template <size_t N, size_t M>
-void DCT1D(const double block[N * M], double out[N * M]) {
-  std::vector<double> matrix(N * N);
-  const double scale = std::sqrt(2.0) / N;
-  for (size_t y = 0; y < N; y++) {
-    for (size_t u = 0; u < N; u++) {
-      matrix[N * u + y] = alpha(u) * cos((y + 0.5) * u * Pi(1.0 / N)) * scale;
-    }
-  }
-  for (size_t x = 0; x < M; x++) {
-    for (size_t u = 0; u < N; u++) {
-      out[M * u + x] = 0;
-      for (size_t y = 0; y < N; y++) {
-        out[M * u + x] += matrix[N * u + y] * block[M * y + x];
-      }
-    }
-  }
-}
-
-// N-IDCT on M columns, multiplied by sqrt(N). Matches the definition in the
-// spec.
-template <size_t N, size_t M>
-void IDCT1D(const double block[N * M], double out[N * M]) {
-  std::vector<double> matrix(N * N);
-  const double scale = std::sqrt(2.0);
-  for (size_t y = 0; y < N; y++) {
-    for (size_t u = 0; u < N; u++) {
-      // Transpose of DCT matrix.
-      matrix[N * y + u] = alpha(u) * cos((y + 0.5) * u * Pi(1.0 / N)) * scale;
-    }
-  }
-  for (size_t x = 0; x < M; x++) {
-    for (size_t u = 0; u < N; u++) {
-      out[M * u + x] = 0;
-      for (size_t y = 0; y < N; y++) {
-        out[M * u + x] += matrix[N * u + y] * block[M * y + x];
-      }
-    }
-  }
-}
-
-template <size_t N, size_t M>
-void TransposeBlock(const double in[N * M], double out[M * N]) {
-  for (size_t x = 0; x < N; x++) {
-    for (size_t y = 0; y < M; y++) {
-      out[y * N + x] = in[x * M + y];
-    }
-  }
-}
-}  // namespace test
-
-// Untransposed DCT.
-template <size_t N>
-void DCTSlow(double block[N * N]) {
-  constexpr size_t kBlockSize = N * N;
-  std::vector<double> g(kBlockSize);
-  test::DCT1D<N, N>(block, g.data());
-  test::TransposeBlock<N, N>(g.data(), block);
-  test::DCT1D<N, N>(block, g.data());
-  test::TransposeBlock<N, N>(g.data(), block);
-}
-
-// Untransposed IDCT.
-template <size_t N>
-void IDCTSlow(double block[N * N]) {
-  constexpr size_t kBlockSize = N * N;
-  std::vector<double> g(kBlockSize);
-  test::IDCT1D<N, N>(block, g.data());
-  test::TransposeBlock<N, N>(g.data(), block);
-  test::IDCT1D<N, N>(block, g.data());
-  test::TransposeBlock<N, N>(g.data(), block);
-}
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_DCT_FOR_TEST_H_
diff --git a/third_party/jpeg-xl/lib/jxl/dct_scales.cc b/third_party/jpeg-xl/lib/jxl/dct_scales.cc
deleted file mode 100644
index da92734e266ab..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dct_scales.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/dct_scales.h"
-
-#include "lib/jxl/base/compiler_specific.h"
-
-namespace jxl {
-
-#if JXL_CXX_LANG < JXL_CXX_17
-constexpr float DCTResampleScales<1, 8>::kScales[];
-constexpr float DCTResampleScales<2, 16>::kScales[];
-constexpr float DCTResampleScales<4, 32>::kScales[];
-constexpr float DCTResampleScales<8, 64>::kScales[];
-constexpr float DCTResampleScales<16, 128>::kScales[];
-constexpr float DCTResampleScales<32, 256>::kScales[];
-constexpr float DCTResampleScales<8, 1>::kScales[];
-constexpr float DCTResampleScales<16, 2>::kScales[];
-constexpr float DCTResampleScales<32, 4>::kScales[];
-constexpr float DCTResampleScales<64, 8>::kScales[];
-constexpr float DCTResampleScales<128, 16>::kScales[];
-constexpr float DCTResampleScales<256, 32>::kScales[];
-constexpr float WcMultipliers<4>::kMultipliers[];
-constexpr float WcMultipliers<8>::kMultipliers[];
-constexpr float WcMultipliers<16>::kMultipliers[];
-constexpr float WcMultipliers<32>::kMultipliers[];
-constexpr float WcMultipliers<64>::kMultipliers[];
-constexpr float WcMultipliers<128>::kMultipliers[];
-constexpr float WcMultipliers<256>::kMultipliers[];
-#endif
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/dct_scales.h b/third_party/jpeg-xl/lib/jxl/dct_scales.h
deleted file mode 100644
index 23af03d60ff7e..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dct_scales.h
+++ /dev/null
@@ -1,379 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_DCT_SCALES_H_
-#define LIB_JXL_DCT_SCALES_H_
-
-// Scaling factors.
-
-#include <stddef.h>
-
-namespace jxl {
-
-static constexpr float kSqrt2 = 1.41421356237f;
-static constexpr float kSqrt0_5 = 0.70710678118f;
-
-// For n != 0, the n-th basis function of a N-DCT, evaluated in pixel k, has a
-// value of cos((k+1/2) n/(2N) pi). When downsampling by 2x, we average
-// the values for pixel k and k+1 to get the value for pixel (k/2), thus we get
-//
-// [cos((k+1/2) n/N pi) + cos((k+3/2) n/N pi)]/2 =
-// cos(n/(2N) pi) cos((k+1) n/N pi) =
-// cos(n/(2N) pi) cos(((k/2)+1/2) n/(N/2) pi)
-//
-// which is exactly the same as the value of pixel k/2 of a N/2-sized DCT,
-// except for the cos(n/(2N) pi) scaling factor (which does *not*
-// depend on the pixel). Thus, when using the lower-frequency coefficients of a
-// DCT-N to compute a DCT-(N/2), they should be scaled by this constant. Scaling
-// factors for a DCT-(N/4) etc can then be obtained by successive
-// multiplications. The structs below contain the above-mentioned scaling
-// factors.
-//
-// Python code for the tables below:
-//
-// for i in range(N // 8):
-//    v = math.cos(i / (2 * N) * math.pi)
-//    v *= math.cos(i / (N) * math.pi)
-//    v *= math.cos(i / (N / 2) * math.pi)
-//    print(v, end=", ")
-
-template <size_t FROM, size_t TO>
-struct DCTResampleScales;
-
-template <>
-struct DCTResampleScales<8, 1> {
-  static constexpr float kScales[] = {
-      1.000000000000000000,
-  };
-};
-
-template <>
-struct DCTResampleScales<16, 2> {
-  static constexpr float kScales[] = {
-      1.000000000000000000,
-      0.901764195028874394,
-  };
-};
-
-template <>
-struct DCTResampleScales<32, 4> {
-  static constexpr float kScales[] = {
-      1.000000000000000000,
-      0.974886821136879522,
-      0.901764195028874394,
-      0.787054918159101335,
-  };
-};
-
-template <>
-struct DCTResampleScales<64, 8> {
-  static constexpr float kScales[] = {
-      1.0000000000000000, 0.9936866130906366, 0.9748868211368796,
-      0.9440180941651672, 0.9017641950288744, 0.8490574973847023,
-      0.7870549181591013, 0.7171081282466044,
-  };
-};
-
-template <>
-struct DCTResampleScales<128, 16> {
-  static constexpr float kScales[] = {
-      1.0,
-      0.9984194528776054,
-      0.9936866130906366,
-      0.9858278282666936,
-      0.9748868211368796,
-      0.9609244059440204,
-      0.9440180941651672,
-      0.9242615922757944,
-      0.9017641950288744,
-      0.8766500784429904,
-      0.8490574973847023,
-      0.8191378932865928,
-      0.7870549181591013,
-      0.7529833816270532,
-      0.7171081282466044,
-      0.6796228528314651,
-  };
-};
-
-template <>
-struct DCTResampleScales<256, 32> {
-  static constexpr float kScales[] = {
-      1.0,
-      0.9996047255830407,
-      0.9984194528776054,
-      0.9964458326264695,
-      0.9936866130906366,
-      0.9901456355893141,
-      0.9858278282666936,
-      0.9807391980963174,
-      0.9748868211368796,
-      0.9682788310563117,
-      0.9609244059440204,
-      0.9528337534340876,
-      0.9440180941651672,
-      0.9344896436056892,
-      0.9242615922757944,
-      0.913348084400198,
-      0.9017641950288744,
-      0.8895259056651056,
-      0.8766500784429904,
-      0.8631544288990163,
-      0.8490574973847023,
-      0.8343786191696513,
-      0.8191378932865928,
-      0.8033561501721485,
-      0.7870549181591013,
-      0.7702563888779096,
-      0.7529833816270532,
-      0.7352593067735488,
-      0.7171081282466044,
-      0.6985543251889097,
-      0.6796228528314651,
-      0.6603391026591464,
-  };
-};
-
-// Inverses of the above.
-template <>
-struct DCTResampleScales<1, 8> {
-  static constexpr float kScales[] = {
-      1.000000000000000000,
-  };
-};
-
-template <>
-struct DCTResampleScales<2, 16> {
-  static constexpr float kScales[] = {
-      1.000000000000000000,
-      1.108937353592731823,
-  };
-};
-
-template <>
-struct DCTResampleScales<4, 32> {
-  static constexpr float kScales[] = {
-      1.000000000000000000,
-      1.025760096781116015,
-      1.108937353592731823,
-      1.270559368765487251,
-  };
-};
-
-template <>
-struct DCTResampleScales<8, 64> {
-  static constexpr float kScales[] = {
-      1.0000000000000000, 1.0063534990068217, 1.0257600967811158,
-      1.0593017296817173, 1.1089373535927318, 1.1777765381970435,
-      1.2705593687654873, 1.3944898413647777,
-  };
-};
-
-template <>
-struct DCTResampleScales<16, 128> {
-  static constexpr float kScales[] = {
-      1.0,
-      1.0015830492062623,
-      1.0063534990068217,
-      1.0143759095928793,
-      1.0257600967811158,
-      1.0406645869480142,
-      1.0593017296817173,
-      1.0819447744633812,
-      1.1089373535927318,
-      1.1407059950032632,
-      1.1777765381970435,
-      1.2207956782315876,
-      1.2705593687654873,
-      1.3280505578213306,
-      1.3944898413647777,
-      1.4714043176061107,
-  };
-};
-
-template <>
-struct DCTResampleScales<32, 256> {
-  static constexpr float kScales[] = {
-      1.0,
-      1.0003954307206069,
-      1.0015830492062623,
-      1.0035668445360069,
-      1.0063534990068217,
-      1.009952439375063,
-      1.0143759095928793,
-      1.0196390660647288,
-      1.0257600967811158,
-      1.0327603660498115,
-      1.0406645869480142,
-      1.049501024072585,
-      1.0593017296817173,
-      1.0701028169146336,
-      1.0819447744633812,
-      1.0948728278734026,
-      1.1089373535927318,
-      1.124194353004584,
-      1.1407059950032632,
-      1.158541237256391,
-      1.1777765381970435,
-      1.1984966740820495,
-      1.2207956782315876,
-      1.244777922949508,
-      1.2705593687654873,
-      1.2982690107339132,
-      1.3280505578213306,
-      1.3600643892400104,
-      1.3944898413647777,
-      1.4315278911623237,
-      1.4714043176061107,
-      1.5143734423314616,
-  };
-};
-
-// Constants for DCT implementation. Generated by the following snippet:
-// for i in range(N // 2):
-//    print(1.0 / (2 * math.cos((i + 0.5) * math.pi / N)), end=", ")
-template <size_t N>
-struct WcMultipliers;
-
-template <>
-struct WcMultipliers<4> {
-  static constexpr float kMultipliers[] = {
-      0.541196100146197,
-      1.3065629648763764,
-  };
-};
-
-template <>
-struct WcMultipliers<8> {
-  static constexpr float kMultipliers[] = {
-      0.5097955791041592,
-      0.6013448869350453,
-      0.8999762231364156,
-      2.5629154477415055,
-  };
-};
-
-template <>
-struct WcMultipliers<16> {
-  static constexpr float kMultipliers[] = {
-      0.5024192861881557, 0.5224986149396889, 0.5669440348163577,
-      0.6468217833599901, 0.7881546234512502, 1.060677685990347,
-      1.7224470982383342, 5.101148618689155,
-  };
-};
-
-template <>
-struct WcMultipliers<32> {
-  static constexpr float kMultipliers[] = {
-      0.5006029982351963, 0.5054709598975436, 0.5154473099226246,
-      0.5310425910897841, 0.5531038960344445, 0.5829349682061339,
-      0.6225041230356648, 0.6748083414550057, 0.7445362710022986,
-      0.8393496454155268, 0.9725682378619608, 1.1694399334328847,
-      1.4841646163141662, 2.057781009953411,  3.407608418468719,
-      10.190008123548033,
-  };
-};
-template <>
-struct WcMultipliers<64> {
-  static constexpr float kMultipliers[] = {
-      0.500150636020651,  0.5013584524464084, 0.5037887256810443,
-      0.5074711720725553, 0.5124514794082247, 0.5187927131053328,
-      0.52657731515427,   0.535909816907992,  0.5469204379855088,
-      0.5597698129470802, 0.57465518403266,   0.5918185358574165,
-      0.6115573478825099, 0.6342389366884031, 0.6603198078137061,
-      0.6903721282002123, 0.7251205223771985, 0.7654941649730891,
-      0.8127020908144905, 0.8683447152233481, 0.9345835970364075,
-      1.0144082649970547, 1.1120716205797176, 1.233832737976571,
-      1.3892939586328277, 1.5939722833856311, 1.8746759800084078,
-      2.282050068005162,  2.924628428158216,  4.084611078129248,
-      6.796750711673633,  20.373878167231453,
-  };
-};
-template <>
-struct WcMultipliers<128> {
-  static constexpr float kMultipliers[] = {
-      0.5000376519155477, 0.5003390374428216, 0.5009427176380873,
-      0.5018505174842379, 0.5030651913013697, 0.5045904432216454,
-      0.5064309549285542, 0.5085924210498143, 0.5110815927066812,
-      0.5139063298475396, 0.5170756631334912, 0.5205998663018917,
-      0.524490540114724,  0.5287607092074876, 0.5334249333971333,
-      0.538499435291984,  0.5440022463817783, 0.549953374183236,
-      0.5563749934898856, 0.5632916653417023, 0.5707305880121454,
-      0.5787218851348208, 0.5872989370937893, 0.5964987630244563,
-      0.606362462272146,  0.6169357260050706, 0.6282694319707711,
-      0.6404203382416639, 0.6534518953751283, 0.6674352009263413,
-      0.6824501259764195, 0.6985866506472291, 0.7159464549705746,
-      0.7346448236478627, 0.7548129391165311, 0.776600658233963,
-      0.8001798956216941, 0.8257487738627852, 0.8535367510066064,
-      0.8838110045596234, 0.9168844461846523, 0.9531258743921193,
-      0.9929729612675466, 1.036949040910389,  1.0856850642580145,
-      1.1399486751015042, 1.2006832557294167, 1.2690611716991191,
-      1.346557628206286,  1.4350550884414341, 1.5369941008524954,
-      1.6555965242641195, 1.7952052190778898, 1.961817848571166,
-      2.163957818751979,  2.4141600002500763, 2.7316450287739396,
-      3.147462191781909,  3.7152427383269746, 4.5362909369693565,
-      5.827688377844654,  8.153848602466814,  13.58429025728446,
-      40.744688103351834,
-  };
-};
-
-template <>
-struct WcMultipliers<256> {
-  static constexpr float kMultipliers[128] = {
-      0.5000094125358878, 0.500084723455784,  0.5002354020255269,
-      0.5004615618093246, 0.5007633734146156, 0.5011410648064231,
-      0.5015949217281668, 0.502125288230386,  0.5027325673091954,
-      0.5034172216566842, 0.5041797745258774, 0.5050208107132756,
-      0.5059409776624396, 0.5069409866925212, 0.5080216143561264,
-      0.509183703931388,  0.5104281670536573, 0.5117559854927805,
-      0.5131682130825206, 0.5146659778093218, 0.516250484068288,
-      0.5179230150949777, 0.5196849355823947, 0.5215376944933958,
-      0.5234828280796439, 0.52552196311921,   0.5276568203859896,
-      0.5298892183652453, 0.5322210772308335, 0.5346544231010253,
-      0.537191392591309,  0.5398342376841637, 0.5425853309375497,
-      0.545447171055775,  0.5484223888484947, 0.551513753605893,
-      0.554724179920619,  0.5580567349898085, 0.5615146464335654,
-      0.5651013106696203, 0.5688203018875696, 0.5726753816701664,
-      0.5766705093136241, 0.5808098529038624, 0.5850978012111273,
-      0.58953897647151,   0.5941382481306648, 0.5989007476325463,
-      0.6038318843443582, 0.6089373627182432, 0.614223200800649,
-      0.6196957502119484, 0.6253617177319102, 0.6312281886412079,
-      0.6373026519855411, 0.6435930279473415, 0.6501076975307724,
-      0.6568555347890955, 0.6638459418498757, 0.6710888870233562,
-      0.6785949463131795, 0.6863753486870501, 0.6944420255086364,
-      0.7028076645818034, 0.7114857693151208, 0.7204907235796304,
-      0.7298378629074134, 0.7395435527641373, 0.749625274727372,
-      0.7601017215162176, 0.7709929019493761, 0.7823202570613161,
-      0.7941067887834509, 0.8063772028037925, 0.8191580674598145,
-      0.83247799080191,   0.8463678182968619, 0.860860854031955,
-      0.8759931087426972, 0.8918035785352535, 0.9083345588266809,
-      0.9256319988042384, 0.9437459026371479, 0.962730784794803,
-      0.9826461881778968, 1.0035572754078206, 1.0255355056139732,
-      1.048659411496106,  1.0730154944316674, 1.0986992590905857,
-      1.1258164135986009, 1.1544842669978943, 1.184833362908442,
-      1.217009397314603,  1.2511754798461228, 1.287514812536712,
-      1.326233878832723,  1.3675662599582539, 1.411777227500661,
-      1.459169302866857,  1.5100890297227016, 1.5649352798258847,
-      1.6241695131835794, 1.6883285509131505, 1.7580406092704062,
-      1.8340456094306077, 1.9172211551275689, 2.0086161135167564,
-      2.1094945286246385, 2.22139377701127,   2.346202662531156,
-      2.486267909203593,  2.644541877144861,  2.824791402350551,
-      3.0318994541759925, 3.2723115884254845, 3.5547153325075804,
-      3.891107790700307,  4.298537526449054,  4.802076008665048,
-      5.440166215091329,  6.274908408039339,  7.413566756422303,
-      9.058751453879703,  11.644627325175037, 16.300023088031555,
-      27.163977662448232, 81.48784219222516,
-  };
-};
-
-// Apply the DCT algorithm-intrinsic constants to DCTResampleScale.
-template <size_t FROM, size_t TO>
-constexpr float DCTTotalResampleScale(size_t x) {
-  return DCTResampleScales<FROM, TO>::kScales[x];
-}
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_DCT_SCALES_H_
diff --git a/third_party/jpeg-xl/lib/jxl/dct_test.cc b/third_party/jpeg-xl/lib/jxl/dct_test.cc
deleted file mode 100644
index 9e8f2544ab5fd..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dct_test.cc
+++ /dev/null
@@ -1,389 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <cmath>
-#include <cstring>
-#include <numeric>
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/dct_test.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-#include <hwy/tests/hwy_gtest.h>
-
-#include "lib/jxl/dct-inl.h"
-#include "lib/jxl/dct_for_test.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// Computes the in-place NxN DCT of block.
-// Requires that block is HWY_ALIGN'ed.
-//
-// Performs ComputeTransposedScaledDCT and then transposes and scales it to
-// obtain "vanilla" DCT.
-template <size_t N>
-void ComputeDCT(float block[N * N]) {
-  HWY_ALIGN float tmp_block[N * N];
-  HWY_ALIGN float scratch_space[4 * N * N];
-  ComputeScaledDCT<N, N>()(DCTFrom(block, N), tmp_block, scratch_space);
-
-  // Untranspose.
-  Transpose<N, N>::Run(DCTFrom(tmp_block, N), DCTTo(block, N));
-}
-
-// Computes the in-place 8x8 iDCT of block.
-// Requires that block is HWY_ALIGN'ed.
-template <int N>
-void ComputeIDCT(float block[N * N]) {
-  HWY_ALIGN float tmp_block[N * N];
-  HWY_ALIGN float scratch_space[4 * N * N];
-  // Untranspose.
-  Transpose<N, N>::Run(DCTFrom(block, N), DCTTo(tmp_block, N));
-
-  ComputeScaledIDCT<N, N>()(tmp_block, DCTTo(block, N), scratch_space);
-}
-
-template <size_t N>
-void TransposeTestT(float accuracy) {
-  constexpr size_t kBlockSize = N * N;
-  HWY_ALIGN float src[kBlockSize];
-  DCTTo to_src(src, N);
-  for (size_t y = 0; y < N; ++y) {
-    for (size_t x = 0; x < N; ++x) {
-      to_src.Write(y * N + x, y, x);
-    }
-  }
-  HWY_ALIGN float dst[kBlockSize];
-  Transpose<N, N>::Run(DCTFrom(src, N), DCTTo(dst, N));
-  DCTFrom from_dst(dst, N);
-  for (size_t y = 0; y < N; ++y) {
-    for (size_t x = 0; x < N; ++x) {
-      float expected = x * N + y;
-      float actual = from_dst.Read(y, x);
-      EXPECT_NEAR(expected, actual, accuracy) << "x = " << x << ", y = " << y;
-    }
-  }
-}
-
-void TransposeTest() {
-  TransposeTestT<8>(1e-7f);
-  TransposeTestT<16>(1e-7f);
-  TransposeTestT<32>(1e-7f);
-}
-
-template <size_t N>
-void ColumnDctRoundtripT(float accuracy) {
-  constexpr size_t kBlockSize = N * N;
-  // Though we are only interested in single column result, dct.h has built-in
-  // limit on minimal number of columns processed. So, to be safe, we do
-  // regular 8x8 block transformation. On the bright side - we could check all
-  // 8 basis vectors at once.
-  HWY_ALIGN float block[kBlockSize];
-  HWY_ALIGN float scratch[3 * kBlockSize];
-  DCTTo to(block, N);
-  DCTFrom from(block, N);
-  for (size_t i = 0; i < N; ++i) {
-    for (size_t j = 0; j < N; ++j) {
-      to.Write((i == j) ? 1.0f : 0.0f, i, j);
-    }
-  }
-
-  // Running (I)DCT on the same memory block seems to trigger a compiler bug on
-  // ARMv7 with clang6.
-  HWY_ALIGN float tmp[kBlockSize];
-  DCTTo to_tmp(tmp, N);
-  DCTFrom from_tmp(tmp, N);
-
-  DCT1D<N, N>()(from, to_tmp, scratch);
-  IDCT1D<N, N>()(from_tmp, to, scratch);
-
-  for (size_t i = 0; i < N; ++i) {
-    for (size_t j = 0; j < N; ++j) {
-      float expected = (i == j) ? 1.0f : 0.0f;
-      float actual = from.Read(i, j);
-      EXPECT_NEAR(expected, actual, accuracy) << " i=" << i << ", j=" << j;
-    }
-  }
-}
-
-void ColumnDctRoundtrip() {
-  ColumnDctRoundtripT<8>(1e-6f);
-  ColumnDctRoundtripT<16>(1e-6f);
-  ColumnDctRoundtripT<32>(1e-6f);
-}
-
-template <size_t N>
-void TestDctAccuracy(float accuracy, size_t start = 0, size_t end = N * N) {
-  constexpr size_t kBlockSize = N * N;
-  for (size_t i = start; i < end; i++) {
-    HWY_ALIGN float fast[kBlockSize] = {0.0f};
-    double slow[kBlockSize] = {0.0};
-    fast[i] = 1.0;
-    slow[i] = 1.0;
-    DCTSlow<N>(slow);
-    ComputeDCT<N>(fast);
-    for (size_t k = 0; k < kBlockSize; ++k) {
-      EXPECT_NEAR(fast[k], slow[k], accuracy / N)
-          << "i = " << i << ", k = " << k << ", N = " << N;
-    }
-  }
-}
-
-template <size_t N>
-void TestIdctAccuracy(float accuracy, size_t start = 0, size_t end = N * N) {
-  constexpr size_t kBlockSize = N * N;
-  for (size_t i = start; i < end; i++) {
-    HWY_ALIGN float fast[kBlockSize] = {0.0f};
-    double slow[kBlockSize] = {0.0};
-    fast[i] = 1.0;
-    slow[i] = 1.0;
-    IDCTSlow<N>(slow);
-    ComputeIDCT<N>(fast);
-    for (size_t k = 0; k < kBlockSize; ++k) {
-      EXPECT_NEAR(fast[k], slow[k], accuracy * N)
-          << "i = " << i << ", k = " << k << ", N = " << N;
-    }
-  }
-}
-
-template <size_t N>
-void TestInverseT(float accuracy) {
-  test::ThreadPoolForTests pool(N < 32 ? 0 : 8);
-  enum { kBlockSize = N * N };
-  const auto process_block = [accuracy](const uint32_t task,
-                                        size_t /*thread*/) -> Status {
-    const size_t i = static_cast<size_t>(task);
-    HWY_ALIGN float x[kBlockSize] = {0.0f};
-    x[i] = 1.0;
-
-    ComputeIDCT<N>(x);
-    ComputeDCT<N>(x);
-
-    for (size_t k = 0; k < kBlockSize; ++k) {
-      EXPECT_NEAR(x[k], (k == i) ? 1.0f : 0.0f, accuracy)
-          << "i = " << i << ", k = " << k;
-    }
-    return true;
-  };
-  EXPECT_TRUE(RunOnPool(pool.get(), 0, kBlockSize, ThreadPool::NoInit,
-                        process_block, "TestInverse"));
-}
-
-void InverseTest() {
-  TestInverseT<8>(1e-6f);
-  TestInverseT<16>(1e-6f);
-  TestInverseT<32>(3e-6f);
-}
-
-template <size_t N>
-void TestDctTranspose(float accuracy, size_t start = 0, size_t end = N * N) {
-  constexpr size_t kBlockSize = N * N;
-  for (size_t i = start; i < end; i++) {
-    for (size_t j = 0; j < kBlockSize; ++j) {
-      // We check that <e_i, Me_j> = <M^\dagger{}e_i, e_j>.
-      // That means (Me_j)_i = (M^\dagger{}e_i)_j
-
-      // x := Me_j
-      HWY_ALIGN float x[kBlockSize] = {0.0f};
-      x[j] = 1.0;
-      ComputeIDCT<N>(x);
-      // y := M^\dagger{}e_i
-      HWY_ALIGN float y[kBlockSize] = {0.0f};
-      y[i] = 1.0;
-      ComputeDCT<N>(y);
-
-      EXPECT_NEAR(x[i] / N, y[j] * N, accuracy) << "i = " << i << ", j = " << j;
-    }
-  }
-}
-
-template <size_t N>
-void TestSlowInverse(float accuracy, size_t start = 0, size_t end = N * N) {
-  constexpr size_t kBlockSize = N * N;
-  for (size_t i = start; i < end; i++) {
-    double x[kBlockSize] = {0.0f};
-    x[i] = 1.0;
-
-    DCTSlow<N>(x);
-    IDCTSlow<N>(x);
-
-    for (size_t k = 0; k < kBlockSize; ++k) {
-      EXPECT_NEAR(x[k], (k == i) ? 1.0f : 0.0f, accuracy)
-          << "i = " << i << ", k = " << k;
-    }
-  }
-}
-
-template <size_t ROWS, size_t COLS>
-void TestRectInverseT(float accuracy) {
-  constexpr size_t kBlockSize = ROWS * COLS;
-  for (size_t i = 0; i < kBlockSize; ++i) {
-    HWY_ALIGN float x[kBlockSize] = {0.0f};
-    HWY_ALIGN float out[kBlockSize] = {0.0f};
-    x[i] = 1.0;
-    HWY_ALIGN float coeffs[kBlockSize] = {0.0f};
-    HWY_ALIGN float scratch_space[kBlockSize * 5];
-
-    ComputeScaledDCT<ROWS, COLS>()(DCTFrom(x, COLS), coeffs, scratch_space);
-    ComputeScaledIDCT<ROWS, COLS>()(coeffs, DCTTo(out, COLS), scratch_space);
-
-    for (size_t k = 0; k < kBlockSize; ++k) {
-      EXPECT_NEAR(out[k], (k == i) ? 1.0f : 0.0f, accuracy)
-          << "i = " << i << ", k = " << k << " ROWS = " << ROWS
-          << " COLS = " << COLS;
-    }
-  }
-}
-
-void TestRectInverse() {
-  TestRectInverseT<16, 32>(1e-6f);
-  TestRectInverseT<8, 32>(1e-6f);
-  TestRectInverseT<8, 16>(1e-6f);
-  TestRectInverseT<4, 8>(1e-6f);
-  TestRectInverseT<2, 4>(1e-6f);
-  TestRectInverseT<1, 4>(1e-6f);
-  TestRectInverseT<1, 2>(1e-6f);
-
-  TestRectInverseT<32, 16>(1e-6f);
-  TestRectInverseT<32, 8>(1e-6f);
-  TestRectInverseT<16, 8>(1e-6f);
-  TestRectInverseT<8, 4>(1e-6f);
-  TestRectInverseT<4, 2>(1e-6f);
-  TestRectInverseT<4, 1>(1e-6f);
-  TestRectInverseT<2, 1>(1e-6f);
-}
-
-template <size_t ROWS, size_t COLS>
-void TestRectTransposeT(float accuracy) {
-  constexpr size_t kBlockSize = ROWS * COLS;
-  HWY_ALIGN float scratch_space[kBlockSize * 5];
-  for (size_t px = 0; px < COLS; ++px) {
-    for (size_t py = 0; py < ROWS; ++py) {
-      HWY_ALIGN float x1[kBlockSize] = {0.0f};
-      HWY_ALIGN float x2[kBlockSize] = {0.0f};
-      HWY_ALIGN float coeffs1[kBlockSize] = {0.0f};
-      HWY_ALIGN float coeffs2[kBlockSize] = {0.0f};
-      x1[py * COLS + px] = 1;
-      x2[px * ROWS + py] = 1;
-
-      constexpr size_t OUT_ROWS = ROWS < COLS ? ROWS : COLS;
-      constexpr size_t OUT_COLS = ROWS < COLS ? COLS : ROWS;
-
-      ComputeScaledDCT<ROWS, COLS>()(DCTFrom(x1, COLS), coeffs1, scratch_space);
-      ComputeScaledDCT<COLS, ROWS>()(DCTFrom(x2, ROWS), coeffs2, scratch_space);
-
-      for (size_t x = 0; x < OUT_COLS; ++x) {
-        for (size_t y = 0; y < OUT_ROWS; ++y) {
-          EXPECT_NEAR(coeffs1[y * OUT_COLS + x], coeffs2[y * OUT_COLS + x],
-                      accuracy)
-              << " px = " << px << ", py = " << py << ", x = " << x
-              << ", y = " << y;
-        }
-      }
-    }
-  }
-}
-
-void TestRectTranspose() {
-  TestRectTransposeT<16, 32>(1e-6f);
-  TestRectTransposeT<8, 32>(1e-6f);
-  TestRectTransposeT<8, 16>(1e-6f);
-  TestRectTransposeT<4, 8>(1e-6f);
-  TestRectTransposeT<2, 4>(1e-6f);
-  TestRectTransposeT<1, 4>(1e-6f);
-  TestRectTransposeT<1, 2>(1e-6f);
-
-  // Identical to 8, 16
-  //  TestRectTranspose<16, 8>(1e-6f);
-}
-
-void TestDctAccuracyShard(size_t shard) {
-  if (shard == 0) {
-    TestDctAccuracy<1>(1.1E-7f);
-    TestDctAccuracy<2>(1.1E-7f);
-    TestDctAccuracy<4>(1.1E-7f);
-    TestDctAccuracy<8>(1.1E-7f);
-    TestDctAccuracy<16>(1.3E-7f);
-  }
-  TestDctAccuracy<32>(1.1E-7f, 32 * shard, 32 * (shard + 1));
-}
-
-void TestIdctAccuracyShard(size_t shard) {
-  if (shard == 0) {
-    TestIdctAccuracy<1>(1E-7f);
-    TestIdctAccuracy<2>(1E-7f);
-    TestIdctAccuracy<4>(1E-7f);
-    TestIdctAccuracy<8>(1E-7f);
-    TestIdctAccuracy<16>(1E-7f);
-  }
-  TestIdctAccuracy<32>(1E-7f, 32 * shard, 32 * (shard + 1));
-}
-
-void TestDctTransposeShard(size_t shard) {
-  if (shard == 0) {
-    TestDctTranspose<8>(1E-6f);
-    TestDctTranspose<16>(1E-6f);
-  }
-  TestDctTranspose<32>(3E-6f, 32 * shard, 32 * (shard + 1));
-}
-
-void TestSlowInverseShard(size_t shard) {
-  if (shard == 0) {
-    TestSlowInverse<1>(1E-5f);
-    TestSlowInverse<2>(1E-5f);
-    TestSlowInverse<4>(1E-5f);
-    TestSlowInverse<8>(1E-5f);
-    TestSlowInverse<16>(1E-5f);
-  }
-  TestSlowInverse<32>(1E-5f, 32 * shard, 32 * (shard + 1));
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-class TransposeTest : public hwy::TestWithParamTarget {};
-
-HWY_TARGET_INSTANTIATE_TEST_SUITE_P(TransposeTest);
-
-HWY_EXPORT_AND_TEST_P(TransposeTest, TransposeTest);
-HWY_EXPORT_AND_TEST_P(TransposeTest, InverseTest);
-HWY_EXPORT_AND_TEST_P(TransposeTest, ColumnDctRoundtrip);
-HWY_EXPORT_AND_TEST_P(TransposeTest, TestRectInverse);
-HWY_EXPORT_AND_TEST_P(TransposeTest, TestRectTranspose);
-
-// Tests in the DctShardedTest class are sharded for N=32.
-class DctShardedTest : public ::hwy::TestWithParamTargetAndT<uint32_t> {};
-
-template <size_t n>
-std::vector<uint32_t> ShardRange() {
-#ifdef JXL_DISABLE_SLOW_TESTS
-  static_assert(n > 6);
-  std::vector<uint32_t> ret = {0, 1, 3, 5, n - 1};
-#else
-  std::vector<uint32_t> ret(n);
-  std::iota(ret.begin(), ret.end(), 0);
-#endif  // JXL_DISABLE_SLOW_TESTS
-  return ret;
-}
-
-HWY_TARGET_INSTANTIATE_TEST_SUITE_P_T(DctShardedTest,
-                                      ::testing::ValuesIn(ShardRange<32>()));
-
-HWY_EXPORT_AND_TEST_P_T(DctShardedTest, TestDctAccuracyShard);
-HWY_EXPORT_AND_TEST_P_T(DctShardedTest, TestIdctAccuracyShard);
-HWY_EXPORT_AND_TEST_P_T(DctShardedTest, TestDctTransposeShard);
-HWY_EXPORT_AND_TEST_P_T(DctShardedTest, TestSlowInverseShard);
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/dct_util.h b/third_party/jpeg-xl/lib/jxl/dct_util.h
deleted file mode 100644
index a0036db8c0103..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dct_util.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_DCT_UTIL_H_
-#define LIB_JXL_DCT_UTIL_H_
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <memory>
-#include <type_traits>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_ops.h"
-
-namespace jxl {
-
-union ACPtr {
-  int32_t* ptr32;
-  int16_t* ptr16;
-  ACPtr() = default;
-  explicit ACPtr(int16_t* p) : ptr16(p) {}
-  explicit ACPtr(int32_t* p) : ptr32(p) {}
-};
-
-union ConstACPtr {
-  const int32_t* ptr32;
-  const int16_t* ptr16;
-  ConstACPtr() = default;
-  explicit ConstACPtr(const int16_t* p) : ptr16(p) {}
-  explicit ConstACPtr(const int32_t* p) : ptr32(p) {}
-};
-
-enum class ACType { k16 = 0, k32 = 1 };
-
-class ACImage {
- public:
-  virtual ~ACImage() = default;
-  virtual ACType Type() const = 0;
-  virtual ACPtr PlaneRow(size_t c, size_t y, size_t xbase) = 0;
-  virtual ConstACPtr PlaneRow(size_t c, size_t y, size_t xbase) const = 0;
-  virtual size_t PixelsPerRow() const = 0;
-  virtual void ZeroFill() = 0;
-  virtual void ZeroFillPlane(size_t c) = 0;
-  virtual bool IsEmpty() const = 0;
-};
-
-template <typename T>
-class ACImageT final : public ACImage {
- public:
-  ACImageT() = default;
-
-  static StatusOr<std::unique_ptr<ACImageT>> Make(
-      JxlMemoryManager* memory_manager, size_t xsize, size_t ysize) {
-    static_assert(
-        std::is_same<T, int16_t>::value || std::is_same<T, int32_t>::value,
-        "ACImage must be either 32- or 16- bit");
-    std::unique_ptr<ACImageT> result = jxl::make_unique<ACImageT>();
-    JXL_ASSIGN_OR_RETURN(result->img_,
-                         Image3<T>::Create(memory_manager, xsize, ysize));
-    return result;
-  }
-
-  ACType Type() const override {
-    return sizeof(T) == 2 ? ACType::k16 : ACType::k32;
-  }
-  ACPtr PlaneRow(size_t c, size_t y, size_t xbase) override {
-    return ACPtr(img_.PlaneRow(c, y) + xbase);
-  }
-  ConstACPtr PlaneRow(size_t c, size_t y, size_t xbase) const override {
-    return ConstACPtr(img_.PlaneRow(c, y) + xbase);
-  }
-
-  size_t PixelsPerRow() const override { return img_.PixelsPerRow(); }
-
-  void ZeroFill() override { ZeroFillImage(&img_); }
-
-  void ZeroFillPlane(size_t c) override { ZeroFillImage(&img_.Plane(c)); }
-
-  bool IsEmpty() const override {
-    return img_.xsize() == 0 || img_.ysize() == 0;
-  }
-
- private:
-  Image3<T> img_;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_DCT_UTIL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/dec_ans.cc b/third_party/jpeg-xl/lib/jxl/dec_ans.cc
deleted file mode 100644
index d459d49181e38..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_ans.cc
+++ /dev/null
@@ -1,416 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/dec_ans.h"
-
-#include <jxl/memory_manager.h>
-
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/ans_common.h"
-#include "lib/jxl/ans_params.h"
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_context_map.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/memory_manager_internal.h"
-
-namespace jxl {
-namespace {
-
-// Decodes a number in the range [0..255], by reading 1 - 11 bits.
-inline int DecodeVarLenUint8(BitReader* input) {
-  if (input->ReadFixedBits<1>()) {
-    int nbits = static_cast<int>(input->ReadFixedBits<3>());
-    if (nbits == 0) {
-      return 1;
-    } else {
-      return static_cast<int>(input->ReadBits(nbits)) + (1 << nbits);
-    }
-  }
-  return 0;
-}
-
-// Decodes a number in the range [0..65535], by reading 1 - 21 bits.
-inline int DecodeVarLenUint16(BitReader* input) {
-  if (input->ReadFixedBits<1>()) {
-    int nbits = static_cast<int>(input->ReadFixedBits<4>());
-    if (nbits == 0) {
-      return 1;
-    } else {
-      return static_cast<int>(input->ReadBits(nbits)) + (1 << nbits);
-    }
-  }
-  return 0;
-}
-
-Status ReadHistogram(int precision_bits, std::vector<int32_t>* counts,
-                     BitReader* input) {
-  int range = 1 << precision_bits;
-  int simple_code = input->ReadBits(1);
-  if (simple_code == 1) {
-    int i;
-    int symbols[2] = {0};
-    int max_symbol = 0;
-    const int num_symbols = input->ReadBits(1) + 1;
-    for (i = 0; i < num_symbols; ++i) {
-      symbols[i] = DecodeVarLenUint8(input);
-      if (symbols[i] > max_symbol) max_symbol = symbols[i];
-    }
-    counts->resize(max_symbol + 1);
-    if (num_symbols == 1) {
-      (*counts)[symbols[0]] = range;
-    } else {
-      if (symbols[0] == symbols[1]) {  // corrupt data
-        return false;
-      }
-      (*counts)[symbols[0]] = input->ReadBits(precision_bits);
-      (*counts)[symbols[1]] = range - (*counts)[symbols[0]];
-    }
-  } else {
-    int is_flat = input->ReadBits(1);
-    if (is_flat == 1) {
-      int alphabet_size = DecodeVarLenUint8(input) + 1;
-      JXL_ENSURE(alphabet_size <= range);
-      *counts = CreateFlatHistogram(alphabet_size, range);
-      return true;
-    }
-
-    uint32_t shift;
-    {
-      // TODO(veluca): speed up reading with table lookups.
-      int upper_bound_log = FloorLog2Nonzero(ANS_LOG_TAB_SIZE + 1);
-      int log = 0;
-      for (; log < upper_bound_log; log++) {
-        if (input->ReadFixedBits<1>() == 0) break;
-      }
-      shift = (input->ReadBits(log) | (1 << log)) - 1;
-      if (shift > ANS_LOG_TAB_SIZE + 1) {
-        return JXL_FAILURE("Invalid shift value");
-      }
-    }
-
-    int length = DecodeVarLenUint8(input) + 3;
-    counts->resize(length);
-    int total_count = 0;
-
-    static const uint8_t huff[128][2] = {
-        {3, 10}, {7, 12}, {3, 7}, {4, 3}, {3, 6}, {3, 8}, {3, 9}, {4, 5},
-        {3, 10}, {4, 4},  {3, 7}, {4, 1}, {3, 6}, {3, 8}, {3, 9}, {4, 2},
-        {3, 10}, {5, 0},  {3, 7}, {4, 3}, {3, 6}, {3, 8}, {3, 9}, {4, 5},
-        {3, 10}, {4, 4},  {3, 7}, {4, 1}, {3, 6}, {3, 8}, {3, 9}, {4, 2},
-        {3, 10}, {6, 11}, {3, 7}, {4, 3}, {3, 6}, {3, 8}, {3, 9}, {4, 5},
-        {3, 10}, {4, 4},  {3, 7}, {4, 1}, {3, 6}, {3, 8}, {3, 9}, {4, 2},
-        {3, 10}, {5, 0},  {3, 7}, {4, 3}, {3, 6}, {3, 8}, {3, 9}, {4, 5},
-        {3, 10}, {4, 4},  {3, 7}, {4, 1}, {3, 6}, {3, 8}, {3, 9}, {4, 2},
-        {3, 10}, {7, 13}, {3, 7}, {4, 3}, {3, 6}, {3, 8}, {3, 9}, {4, 5},
-        {3, 10}, {4, 4},  {3, 7}, {4, 1}, {3, 6}, {3, 8}, {3, 9}, {4, 2},
-        {3, 10}, {5, 0},  {3, 7}, {4, 3}, {3, 6}, {3, 8}, {3, 9}, {4, 5},
-        {3, 10}, {4, 4},  {3, 7}, {4, 1}, {3, 6}, {3, 8}, {3, 9}, {4, 2},
-        {3, 10}, {6, 11}, {3, 7}, {4, 3}, {3, 6}, {3, 8}, {3, 9}, {4, 5},
-        {3, 10}, {4, 4},  {3, 7}, {4, 1}, {3, 6}, {3, 8}, {3, 9}, {4, 2},
-        {3, 10}, {5, 0},  {3, 7}, {4, 3}, {3, 6}, {3, 8}, {3, 9}, {4, 5},
-        {3, 10}, {4, 4},  {3, 7}, {4, 1}, {3, 6}, {3, 8}, {3, 9}, {4, 2},
-    };
-
-    std::vector<int> logcounts(counts->size());
-    int omit_log = -1;
-    int omit_pos = -1;
-    // This array remembers which symbols have an RLE length.
-    std::vector<int> same(counts->size(), 0);
-    for (size_t i = 0; i < logcounts.size(); ++i) {
-      input->Refill();  // for PeekFixedBits + Advance
-      int idx = input->PeekFixedBits<7>();
-      input->Consume(huff[idx][0]);
-      logcounts[i] = huff[idx][1];
-      // The RLE symbol.
-      if (logcounts[i] == ANS_LOG_TAB_SIZE + 1) {
-        int rle_length = DecodeVarLenUint8(input);
-        same[i] = rle_length + 5;
-        i += rle_length + 3;
-        continue;
-      }
-      if (logcounts[i] > omit_log) {
-        omit_log = logcounts[i];
-        omit_pos = i;
-      }
-    }
-    // Invalid input, e.g. due to invalid usage of RLE.
-    if (omit_pos < 0) return JXL_FAILURE("Invalid histogram.");
-    if (static_cast<size_t>(omit_pos) + 1 < logcounts.size() &&
-        logcounts[omit_pos + 1] == ANS_TAB_SIZE + 1) {
-      return JXL_FAILURE("Invalid histogram.");
-    }
-    int prev = 0;
-    int numsame = 0;
-    for (size_t i = 0; i < logcounts.size(); ++i) {
-      if (same[i]) {
-        // RLE sequence, let this loop output the same count for the next
-        // iterations.
-        numsame = same[i] - 1;
-        prev = i > 0 ? (*counts)[i - 1] : 0;
-      }
-      if (numsame > 0) {
-        (*counts)[i] = prev;
-        numsame--;
-      } else {
-        unsigned int code = logcounts[i];
-        // omit_pos may not be negative at this point (checked before).
-        if (i == static_cast<size_t>(omit_pos)) {
-          continue;
-        } else if (code == 0) {
-          continue;
-        } else if (code == 1) {
-          (*counts)[i] = 1;
-        } else {
-          int bitcount = GetPopulationCountPrecision(code - 1, shift);
-          (*counts)[i] = (1u << (code - 1)) +
-                         (input->ReadBits(bitcount) << (code - 1 - bitcount));
-        }
-      }
-      total_count += (*counts)[i];
-    }
-    (*counts)[omit_pos] = range - total_count;
-    if ((*counts)[omit_pos] <= 0) {
-      // The histogram we've read sums to more than total_count (including at
-      // least 1 for the omitted value).
-      return JXL_FAILURE("Invalid histogram count.");
-    }
-  }
-  return true;
-}
-
-}  // namespace
-
-Status DecodeANSCodes(JxlMemoryManager* memory_manager,
-                      const size_t num_histograms,
-                      const size_t max_alphabet_size, BitReader* in,
-                      ANSCode* result) {
-  result->memory_manager = memory_manager;
-  result->degenerate_symbols.resize(num_histograms, -1);
-  if (result->use_prefix_code) {
-    JXL_ENSURE(max_alphabet_size <= 1 << PREFIX_MAX_BITS);
-    result->huffman_data.resize(num_histograms);
-    std::vector<uint16_t> alphabet_sizes(num_histograms);
-    for (size_t c = 0; c < num_histograms; c++) {
-      alphabet_sizes[c] = DecodeVarLenUint16(in) + 1;
-      if (alphabet_sizes[c] > max_alphabet_size) {
-        return JXL_FAILURE("Alphabet size is too long: %u", alphabet_sizes[c]);
-      }
-    }
-    for (size_t c = 0; c < num_histograms; c++) {
-      if (alphabet_sizes[c] > 1) {
-        if (!result->huffman_data[c].ReadFromBitStream(alphabet_sizes[c], in)) {
-          if (!in->AllReadsWithinBounds()) {
-            return JXL_STATUS(StatusCode::kNotEnoughBytes,
-                              "Not enough bytes for huffman code");
-          }
-          return JXL_FAILURE("Invalid huffman tree number %" PRIuS
-                             ", alphabet size %u",
-                             c, alphabet_sizes[c]);
-        }
-      } else {
-        // 0-bit codes does not require extension tables.
-        result->huffman_data[c].table_.clear();
-        result->huffman_data[c].table_.resize(1u << kHuffmanTableBits);
-      }
-      for (const auto& h : result->huffman_data[c].table_) {
-        if (h.bits <= kHuffmanTableBits) {
-          result->UpdateMaxNumBits(c, h.value);
-        }
-      }
-    }
-  } else {
-    JXL_ENSURE(max_alphabet_size <= ANS_MAX_ALPHABET_SIZE);
-    size_t alloc_size = num_histograms * (1 << result->log_alpha_size) *
-                        sizeof(AliasTable::Entry);
-    JXL_ASSIGN_OR_RETURN(result->alias_tables,
-                         AlignedMemory::Create(memory_manager, alloc_size));
-    AliasTable::Entry* alias_tables =
-        result->alias_tables.address<AliasTable::Entry>();
-    for (size_t c = 0; c < num_histograms; ++c) {
-      std::vector<int32_t> counts;
-      if (!ReadHistogram(ANS_LOG_TAB_SIZE, &counts, in)) {
-        return JXL_FAILURE("Invalid histogram bitstream.");
-      }
-      if (counts.size() > max_alphabet_size) {
-        return JXL_FAILURE("Alphabet size is too long: %" PRIuS, counts.size());
-      }
-      while (!counts.empty() && counts.back() == 0) {
-        counts.pop_back();
-      }
-      for (size_t s = 0; s < counts.size(); s++) {
-        if (counts[s] != 0) {
-          result->UpdateMaxNumBits(c, s);
-        }
-      }
-      // InitAliasTable "fixes" empty counts to contain degenerate "0" symbol.
-      int degenerate_symbol = counts.empty() ? 0 : (counts.size() - 1);
-      for (int s = 0; s < degenerate_symbol; ++s) {
-        if (counts[s] != 0) {
-          degenerate_symbol = -1;
-          break;
-        }
-      }
-      result->degenerate_symbols[c] = degenerate_symbol;
-      JXL_RETURN_IF_ERROR(
-          InitAliasTable(counts, ANS_LOG_TAB_SIZE, result->log_alpha_size,
-                         alias_tables + c * (1 << result->log_alpha_size)));
-    }
-  }
-  return true;
-}
-Status DecodeUintConfig(size_t log_alpha_size, HybridUintConfig* uint_config,
-                        BitReader* br) {
-  br->Refill();
-  size_t split_exponent = br->ReadBits(CeilLog2Nonzero(log_alpha_size + 1));
-  size_t msb_in_token = 0;
-  size_t lsb_in_token = 0;
-  if (split_exponent != log_alpha_size) {
-    // otherwise, msb/lsb don't matter.
-    size_t nbits = CeilLog2Nonzero(split_exponent + 1);
-    msb_in_token = br->ReadBits(nbits);
-    if (msb_in_token > split_exponent) {
-      // This could be invalid here already and we need to check this before
-      // we use its value to read more bits.
-      return JXL_FAILURE("Invalid HybridUintConfig");
-    }
-    nbits = CeilLog2Nonzero(split_exponent - msb_in_token + 1);
-    lsb_in_token = br->ReadBits(nbits);
-  }
-  if (lsb_in_token + msb_in_token > split_exponent) {
-    return JXL_FAILURE("Invalid HybridUintConfig");
-  }
-  *uint_config = HybridUintConfig(split_exponent, msb_in_token, lsb_in_token);
-  return true;
-}
-
-Status DecodeUintConfigs(size_t log_alpha_size,
-                         std::vector<HybridUintConfig>* uint_config,
-                         BitReader* br) {
-  // TODO(veluca): RLE?
-  for (auto& cfg : *uint_config) {
-    JXL_RETURN_IF_ERROR(DecodeUintConfig(log_alpha_size, &cfg, br));
-  }
-  return true;
-}
-
-LZ77Params::LZ77Params() { Bundle::Init(this); }
-Status LZ77Params::VisitFields(Visitor* JXL_RESTRICT visitor) {
-  JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &enabled));
-  if (!visitor->Conditional(enabled)) return true;
-  JXL_QUIET_RETURN_IF_ERROR(visitor->U32(Val(224), Val(512), Val(4096),
-                                         BitsOffset(15, 8), 224, &min_symbol));
-  JXL_QUIET_RETURN_IF_ERROR(visitor->U32(Val(3), Val(4), BitsOffset(2, 5),
-                                         BitsOffset(8, 9), 3, &min_length));
-  return true;
-}
-
-void ANSCode::UpdateMaxNumBits(size_t ctx, size_t symbol) {
-  HybridUintConfig* cfg = &uint_config[ctx];
-  // LZ77 symbols use a different uint config.
-  if (lz77.enabled && lz77.nonserialized_distance_context != ctx &&
-      symbol >= lz77.min_symbol) {
-    symbol -= lz77.min_symbol;
-    cfg = &lz77.length_uint_config;
-  }
-  size_t split_token = cfg->split_token;
-  size_t msb_in_token = cfg->msb_in_token;
-  size_t lsb_in_token = cfg->lsb_in_token;
-  size_t split_exponent = cfg->split_exponent;
-  if (symbol < split_token) {
-    max_num_bits = std::max(max_num_bits, split_exponent);
-    return;
-  }
-  uint32_t n_extra_bits =
-      split_exponent - (msb_in_token + lsb_in_token) +
-      ((symbol - split_token) >> (msb_in_token + lsb_in_token));
-  size_t total_bits = msb_in_token + lsb_in_token + n_extra_bits + 1;
-  max_num_bits = std::max(max_num_bits, total_bits);
-}
-
-Status DecodeHistograms(JxlMemoryManager* memory_manager, BitReader* br,
-                        size_t num_contexts, ANSCode* code,
-                        std::vector<uint8_t>* context_map, bool disallow_lz77) {
-  JXL_RETURN_IF_ERROR(Bundle::Read(br, &code->lz77));
-  if (code->lz77.enabled) {
-    num_contexts++;
-    JXL_RETURN_IF_ERROR(DecodeUintConfig(/*log_alpha_size=*/8,
-                                         &code->lz77.length_uint_config, br));
-  }
-  if (code->lz77.enabled && disallow_lz77) {
-    return JXL_FAILURE("Using LZ77 when explicitly disallowed");
-  }
-  size_t num_histograms = 1;
-  context_map->resize(num_contexts);
-  if (num_contexts > 1) {
-    JXL_RETURN_IF_ERROR(
-        DecodeContextMap(memory_manager, context_map, &num_histograms, br));
-  }
-  JXL_DEBUG_V(
-      4, "Decoded context map of size %" PRIuS " and %" PRIuS " histograms",
-      num_contexts, num_histograms);
-  code->lz77.nonserialized_distance_context = context_map->back();
-  code->use_prefix_code = static_cast<bool>(br->ReadFixedBits<1>());
-  if (code->use_prefix_code) {
-    code->log_alpha_size = PREFIX_MAX_BITS;
-  } else {
-    code->log_alpha_size = br->ReadFixedBits<2>() + 5;
-  }
-  code->uint_config.resize(num_histograms);
-  JXL_RETURN_IF_ERROR(
-      DecodeUintConfigs(code->log_alpha_size, &code->uint_config, br));
-  const size_t max_alphabet_size = 1 << code->log_alpha_size;
-  JXL_RETURN_IF_ERROR(DecodeANSCodes(memory_manager, num_histograms,
-                                     max_alphabet_size, br, code));
-  return true;
-}
-
-StatusOr<ANSSymbolReader> ANSSymbolReader::Create(const ANSCode* code,
-                                                  BitReader* JXL_RESTRICT br,
-                                                  size_t distance_multiplier) {
-  AlignedMemory lz77_window_storage;
-  if (code->lz77.enabled) {
-    JxlMemoryManager* memory_manager = code->memory_manager;
-    JXL_ASSIGN_OR_RETURN(
-        lz77_window_storage,
-        AlignedMemory::Create(memory_manager, kWindowSize * sizeof(uint32_t)));
-  }
-  return ANSSymbolReader(code, br, distance_multiplier,
-                         std::move(lz77_window_storage));
-}
-
-ANSSymbolReader::ANSSymbolReader(const ANSCode* code,
-                                 BitReader* JXL_RESTRICT br,
-                                 size_t distance_multiplier,
-                                 AlignedMemory&& lz77_window_storage)
-    : alias_tables_(code->alias_tables.address<AliasTable::Entry>()),
-      huffman_data_(code->huffman_data.data()),
-      use_prefix_code_(code->use_prefix_code),
-      configs(code->uint_config.data()),
-      lz77_window_storage_(std::move(lz77_window_storage)) {
-  if (!use_prefix_code_) {
-    state_ = static_cast<uint32_t>(br->ReadFixedBits<32>());
-    log_alpha_size_ = code->log_alpha_size;
-    log_entry_size_ = ANS_LOG_TAB_SIZE - code->log_alpha_size;
-    entry_size_minus_1_ = (1 << log_entry_size_) - 1;
-  } else {
-    state_ = (ANS_SIGNATURE << 16u);
-  }
-  if (!code->lz77.enabled) return;
-  lz77_window_ = lz77_window_storage_.address<uint32_t>();
-  lz77_ctx_ = code->lz77.nonserialized_distance_context;
-  lz77_length_uint_ = code->lz77.length_uint_config;
-  lz77_threshold_ = code->lz77.min_symbol;
-  lz77_min_length_ = code->lz77.min_length;
-  num_special_distances_ = distance_multiplier == 0 ? 0 : kNumSpecialDistances;
-  for (size_t i = 0; i < num_special_distances_; i++) {
-    special_distances_[i] = SpecialDistance(i, distance_multiplier);
-  }
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/dec_ans.h b/third_party/jpeg-xl/lib/jxl/dec_ans.h
deleted file mode 100644
index 4e437fffa80fb..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_ans.h
+++ /dev/null
@@ -1,491 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_DEC_ANS_H_
-#define LIB_JXL_DEC_ANS_H_
-
-// Library to decode the ANS population counts from the bit-stream and build a
-// decoding table from them.
-
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <vector>
-
-#include "lib/jxl/ans_common.h"
-#include "lib/jxl/ans_params.h"
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/dec_huffman.h"
-#include "lib/jxl/field_encodings.h"
-#include "lib/jxl/memory_manager_internal.h"
-
-namespace jxl {
-
-class ANSSymbolReader;
-
-// Experiments show that best performance is typically achieved for a
-// split-exponent of 3 or 4. Trend seems to be that '4' is better
-// for large-ish pictures, and '3' better for rather small-ish pictures.
-// This is plausible - the more special symbols we have, the better
-// statistics we need to get a benefit out of them.
-
-// Our hybrid-encoding scheme has dedicated tokens for the smallest
-// (1 << split_exponents) numbers, and for the rest
-// encodes (number of bits) + (msb_in_token sub-leading binary digits) +
-// (lsb_in_token lowest binary digits) in the token, with the remaining bits
-// then being encoded as data.
-//
-// Example with split_exponent = 4, msb_in_token = 2, lsb_in_token = 0.
-//
-// Numbers N in [0 .. 15]:
-//   These get represented as (token=N, bits='').
-// Numbers N >= 16:
-//   If n is such that 2**n <= N < 2**(n+1),
-//   and m = N - 2**n is the 'mantissa',
-//   these get represented as:
-// (token=split_token +
-//        ((n - split_exponent) * 4) +
-//        (m >> (n - msb_in_token)),
-//  bits=m & (1 << (n - msb_in_token)) - 1)
-// Specifically, we would get:
-// N = 0 - 15:          (token=N, nbits=0, bits='')
-// N = 16 (10000):      (token=16, nbits=2, bits='00')
-// N = 17 (10001):      (token=16, nbits=2, bits='01')
-// N = 20 (10100):      (token=17, nbits=2, bits='00')
-// N = 24 (11000):      (token=18, nbits=2, bits='00')
-// N = 28 (11100):      (token=19, nbits=2, bits='00')
-// N = 32 (100000):     (token=20, nbits=3, bits='000')
-// N = 65535:           (token=63, nbits=13, bits='1111111111111')
-struct HybridUintConfig {
-  uint32_t split_exponent;
-  uint32_t split_token;
-  uint32_t msb_in_token;
-  uint32_t lsb_in_token;
-  JXL_INLINE void Encode(uint32_t value, uint32_t* JXL_RESTRICT token,
-                         uint32_t* JXL_RESTRICT nbits,
-                         uint32_t* JXL_RESTRICT bits) const {
-    if (value < split_token) {
-      *token = value;
-      *nbits = 0;
-      *bits = 0;
-    } else {
-      uint32_t n = FloorLog2Nonzero(value);
-      uint32_t m = value - (1 << n);
-      *token = split_token +
-               ((n - split_exponent) << (msb_in_token + lsb_in_token)) +
-               ((m >> (n - msb_in_token)) << lsb_in_token) +
-               (m & ((1 << lsb_in_token) - 1));
-      *nbits = n - msb_in_token - lsb_in_token;
-      *bits = (value >> lsb_in_token) & ((1UL << *nbits) - 1);
-    }
-  }
-
-  explicit HybridUintConfig(uint32_t split_exponent = 4,
-                            uint32_t msb_in_token = 2,
-                            uint32_t lsb_in_token = 0)
-      : split_exponent(split_exponent),
-        split_token(1 << split_exponent),
-        msb_in_token(msb_in_token),
-        lsb_in_token(lsb_in_token) {
-    JXL_DASSERT(split_exponent >= msb_in_token + lsb_in_token);
-  }
-};
-
-struct LZ77Params : public Fields {
-  LZ77Params();
-  JXL_FIELDS_NAME(LZ77Params)
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override;
-  bool enabled;
-
-  // Symbols above min_symbol use a special hybrid uint encoding and
-  // represent a length, to be added to min_length.
-  uint32_t min_symbol;
-  uint32_t min_length;
-
-  // Not serialized by VisitFields.
-  HybridUintConfig length_uint_config{0, 0, 0};
-
-  size_t nonserialized_distance_context;
-};
-
-static constexpr size_t kWindowSize = 1 << 20;
-static constexpr size_t kNumSpecialDistances = 120;
-// Table of special distance codes from WebP lossless.
-static constexpr int8_t kSpecialDistances[kNumSpecialDistances][2] = {
-    {0, 1},  {1, 0},  {1, 1},  {-1, 1}, {0, 2},  {2, 0},  {1, 2},  {-1, 2},
-    {2, 1},  {-2, 1}, {2, 2},  {-2, 2}, {0, 3},  {3, 0},  {1, 3},  {-1, 3},
-    {3, 1},  {-3, 1}, {2, 3},  {-2, 3}, {3, 2},  {-3, 2}, {0, 4},  {4, 0},
-    {1, 4},  {-1, 4}, {4, 1},  {-4, 1}, {3, 3},  {-3, 3}, {2, 4},  {-2, 4},
-    {4, 2},  {-4, 2}, {0, 5},  {3, 4},  {-3, 4}, {4, 3},  {-4, 3}, {5, 0},
-    {1, 5},  {-1, 5}, {5, 1},  {-5, 1}, {2, 5},  {-2, 5}, {5, 2},  {-5, 2},
-    {4, 4},  {-4, 4}, {3, 5},  {-3, 5}, {5, 3},  {-5, 3}, {0, 6},  {6, 0},
-    {1, 6},  {-1, 6}, {6, 1},  {-6, 1}, {2, 6},  {-2, 6}, {6, 2},  {-6, 2},
-    {4, 5},  {-4, 5}, {5, 4},  {-5, 4}, {3, 6},  {-3, 6}, {6, 3},  {-6, 3},
-    {0, 7},  {7, 0},  {1, 7},  {-1, 7}, {5, 5},  {-5, 5}, {7, 1},  {-7, 1},
-    {4, 6},  {-4, 6}, {6, 4},  {-6, 4}, {2, 7},  {-2, 7}, {7, 2},  {-7, 2},
-    {3, 7},  {-3, 7}, {7, 3},  {-7, 3}, {5, 6},  {-5, 6}, {6, 5},  {-6, 5},
-    {8, 0},  {4, 7},  {-4, 7}, {7, 4},  {-7, 4}, {8, 1},  {8, 2},  {6, 6},
-    {-6, 6}, {8, 3},  {5, 7},  {-5, 7}, {7, 5},  {-7, 5}, {8, 4},  {6, 7},
-    {-6, 7}, {7, 6},  {-7, 6}, {8, 5},  {7, 7},  {-7, 7}, {8, 6},  {8, 7}};
-static JXL_INLINE int SpecialDistance(size_t index, int multiplier) {
-  int dist = kSpecialDistances[index][0] +
-             static_cast<int>(multiplier) * kSpecialDistances[index][1];
-  return (dist > 1) ? dist : 1;
-}
-
-struct ANSCode {
-  AlignedMemory alias_tables;
-  std::vector<HuffmanDecodingData> huffman_data;
-  std::vector<HybridUintConfig> uint_config;
-  std::vector<int> degenerate_symbols;
-  bool use_prefix_code;
-  uint8_t log_alpha_size;  // for ANS.
-  LZ77Params lz77;
-  // Maximum number of bits necessary to represent the result of a
-  // ReadHybridUint call done with this ANSCode.
-  size_t max_num_bits = 0;
-  JxlMemoryManager* memory_manager;
-  void UpdateMaxNumBits(size_t ctx, size_t symbol);
-};
-
-class ANSSymbolReader {
- public:
-  // Invalid symbol reader, to be overwritten.
-  ANSSymbolReader() = default;
-  static StatusOr<ANSSymbolReader> Create(const ANSCode* code,
-                                          BitReader* JXL_RESTRICT br,
-                                          size_t distance_multiplier = 0);
-
-  JXL_INLINE size_t ReadSymbolANSWithoutRefill(const size_t histo_idx,
-                                               BitReader* JXL_RESTRICT br) {
-    const uint32_t res = state_ & (ANS_TAB_SIZE - 1u);
-
-    const AliasTable::Entry* table =
-        &alias_tables_[histo_idx << log_alpha_size_];
-    const AliasTable::Symbol symbol =
-        AliasTable::Lookup(table, res, log_entry_size_, entry_size_minus_1_);
-    state_ = symbol.freq * (state_ >> ANS_LOG_TAB_SIZE) + symbol.offset;
-
-#if JXL_TRUE
-    // Branchless version is about equally fast on SKX.
-    const uint32_t new_state =
-        (state_ << 16u) | static_cast<uint32_t>(br->PeekFixedBits<16>());
-    const bool normalize = state_ < (1u << 16u);
-    state_ = normalize ? new_state : state_;
-    br->Consume(normalize ? 16 : 0);
-#else
-    if (JXL_UNLIKELY(state_ < (1u << 16u))) {
-      state_ = (state_ << 16u) | br->PeekFixedBits<16>();
-      br->Consume(16);
-    }
-#endif
-    const uint32_t next_res = state_ & (ANS_TAB_SIZE - 1u);
-    AliasTable::Prefetch(table, next_res, log_entry_size_);
-
-    return symbol.value;
-  }
-
-  JXL_INLINE size_t ReadSymbolHuffWithoutRefill(const size_t histo_idx,
-                                                BitReader* JXL_RESTRICT br) {
-    return huffman_data_[histo_idx].ReadSymbol(br);
-  }
-
-  JXL_INLINE size_t ReadSymbolWithoutRefill(const size_t histo_idx,
-                                            BitReader* JXL_RESTRICT br) {
-    // TODO(veluca): hoist if in hotter loops.
-    if (JXL_UNLIKELY(use_prefix_code_)) {
-      return ReadSymbolHuffWithoutRefill(histo_idx, br);
-    }
-    return ReadSymbolANSWithoutRefill(histo_idx, br);
-  }
-
-  JXL_INLINE size_t ReadSymbol(const size_t histo_idx,
-                               BitReader* JXL_RESTRICT br) {
-    br->Refill();
-    return ReadSymbolWithoutRefill(histo_idx, br);
-  }
-
-#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
-  bool CheckANSFinalState() const { return true; }
-#else
-  bool CheckANSFinalState() const { return state_ == (ANS_SIGNATURE << 16u); }
-#endif
-
-  template <typename BitReader>
-  static JXL_INLINE uint32_t ReadHybridUintConfig(
-      const HybridUintConfig& config, size_t token, BitReader* br) {
-    size_t split_token = config.split_token;
-    size_t msb_in_token = config.msb_in_token;
-    size_t lsb_in_token = config.lsb_in_token;
-    size_t split_exponent = config.split_exponent;
-    // Fast-track version of hybrid integer decoding.
-    if (token < split_token) return token;
-    uint32_t nbits = split_exponent - (msb_in_token + lsb_in_token) +
-                     ((token - split_token) >> (msb_in_token + lsb_in_token));
-    // Max amount of bits for ReadBits is 32 and max valid left shift is 29
-    // bits. However, for speed no error is propagated here, instead limit the
-    // nbits size. If nbits > 29, the code stream is invalid, but no error is
-    // returned.
-    // Note that in most cases we will emit an error if the histogram allows
-    // representing numbers that would cause invalid shifts, but we need to
-    // keep this check as when LZ77 is enabled it might make sense to have an
-    // histogram that could in principle cause invalid shifts.
-    nbits &= 31u;
-    uint32_t low = token & ((1 << lsb_in_token) - 1);
-    token >>= lsb_in_token;
-    const size_t bits = br->PeekBits(nbits);
-    br->Consume(nbits);
-    size_t ret = (((((1 << msb_in_token) | (token & ((1 << msb_in_token) - 1)))
-                    << nbits) |
-                   bits)
-                  << lsb_in_token) |
-                 low;
-    // TODO(eustas): mark BitReader as unhealthy if nbits > 29 or ret does not
-    //               fit uint32_t
-    return static_cast<uint32_t>(ret);
-  }
-
-  // Takes a *clustered* idx. Can only use if HuffRleOnly() is true.
-  JXL_INLINE void ReadHybridUintClusteredHuffRleOnly(size_t ctx,
-                                                     BitReader* JXL_RESTRICT br,
-                                                     uint32_t* value,
-                                                     uint32_t* run) {
-    JXL_DASSERT(IsHuffRleOnly());
-    br->Refill();  // covers ReadSymbolWithoutRefill + PeekBits
-    size_t token = ReadSymbolHuffWithoutRefill(ctx, br);
-    if (JXL_UNLIKELY(token >= lz77_threshold_)) {
-      *run =
-          ReadHybridUintConfig(lz77_length_uint_, token - lz77_threshold_, br) +
-          lz77_min_length_ - 1;
-      return;
-    }
-    *value = ReadHybridUintConfig(configs[ctx], token, br);
-  }
-  bool IsHuffRleOnly() const {
-    if (lz77_window_ == nullptr) return false;
-    if (!use_prefix_code_) return false;
-    for (size_t i = 0; i < kHuffmanTableBits; i++) {
-      if (huffman_data_[lz77_ctx_].table_[i].bits) return false;
-      if (huffman_data_[lz77_ctx_].table_[i].value != 1) return false;
-    }
-    if (configs[lz77_ctx_].split_token > 1) return false;
-    return true;
-  }
-  bool UsesLZ77() { return lz77_window_ != nullptr; }
-
-  // Takes a *clustered* idx. Inlined, for use in hot paths.
-  template <bool uses_lz77>
-  JXL_INLINE size_t ReadHybridUintClusteredInlined(size_t ctx,
-                                                   BitReader* JXL_RESTRICT br) {
-    if (uses_lz77) {
-      if (JXL_UNLIKELY(num_to_copy_ > 0)) {
-        size_t ret = lz77_window_[(copy_pos_++) & kWindowMask];
-        num_to_copy_--;
-        lz77_window_[(num_decoded_++) & kWindowMask] = ret;
-        return ret;
-      }
-    }
-
-    br->Refill();  // covers ReadSymbolWithoutRefill + PeekBits
-    size_t token = ReadSymbolWithoutRefill(ctx, br);
-    if (uses_lz77) {
-      if (JXL_UNLIKELY(token >= lz77_threshold_)) {
-        num_to_copy_ = ReadHybridUintConfig(lz77_length_uint_,
-                                            token - lz77_threshold_, br) +
-                       lz77_min_length_;
-        br->Refill();  // covers ReadSymbolWithoutRefill + PeekBits
-        // Distance code.
-        size_t token = ReadSymbolWithoutRefill(lz77_ctx_, br);
-        size_t distance = ReadHybridUintConfig(configs[lz77_ctx_], token, br);
-        if (JXL_LIKELY(distance < num_special_distances_)) {
-          distance = special_distances_[distance];
-        } else {
-          distance = distance + 1 - num_special_distances_;
-        }
-        if (JXL_UNLIKELY(distance > num_decoded_)) {
-          distance = num_decoded_;
-        }
-        if (JXL_UNLIKELY(distance > kWindowSize)) {
-          distance = kWindowSize;
-        }
-        copy_pos_ = num_decoded_ - distance;
-        if (JXL_UNLIKELY(distance == 0)) {
-          JXL_DASSERT(lz77_window_ != nullptr);
-          // distance 0 -> num_decoded_ == copy_pos_ == 0
-          size_t to_fill = std::min<size_t>(num_to_copy_, kWindowSize);
-          memset(lz77_window_, 0, to_fill * sizeof(lz77_window_[0]));
-        }
-        // TODO(eustas): overflow; mark BitReader as unhealthy
-        if (num_to_copy_ < lz77_min_length_) return 0;
-        // the code below is the same as doing this:
-        //        return ReadHybridUintClustered<uses_lz77>(ctx, br);
-        // but gcc doesn't like recursive inlining
-
-        size_t ret = lz77_window_[(copy_pos_++) & kWindowMask];
-        num_to_copy_--;
-        lz77_window_[(num_decoded_++) & kWindowMask] = ret;
-        return ret;
-      }
-    }
-    size_t ret = ReadHybridUintConfig(configs[ctx], token, br);
-    if (uses_lz77 && lz77_window_)
-      lz77_window_[(num_decoded_++) & kWindowMask] = ret;
-    return ret;
-  }
-
-  // same but not inlined
-  template <bool uses_lz77>
-  size_t ReadHybridUintClustered(size_t ctx, BitReader* JXL_RESTRICT br) {
-    return ReadHybridUintClusteredInlined<uses_lz77>(ctx, br);
-  }
-
-  // inlined only in the no-lz77 case
-  template <bool uses_lz77>
-  JXL_INLINE size_t
-  ReadHybridUintClusteredMaybeInlined(size_t ctx, BitReader* JXL_RESTRICT br) {
-    if (uses_lz77) {
-      return ReadHybridUintClustered<uses_lz77>(ctx, br);
-    } else {
-      return ReadHybridUintClusteredInlined<uses_lz77>(ctx, br);
-    }
-  }
-
-  // inlined, for use in hot paths
-  template <bool uses_lz77>
-  JXL_INLINE size_t
-  ReadHybridUintInlined(size_t ctx, BitReader* JXL_RESTRICT br,
-                        const std::vector<uint8_t>& context_map) {
-    return ReadHybridUintClustered<uses_lz77>(context_map[ctx], br);
-  }
-
-  // not inlined, for use in non-hot paths
-  size_t ReadHybridUint(size_t ctx, BitReader* JXL_RESTRICT br,
-                        const std::vector<uint8_t>& context_map) {
-    return ReadHybridUintClustered</*uses_lz77=*/true>(context_map[ctx], br);
-  }
-
-  // ctx is a *clustered* context!
-  // This function will modify the ANS state as if `count` symbols have been
-  // decoded.
-  bool IsSingleValueAndAdvance(size_t ctx, uint32_t* value, size_t count) {
-    // TODO(veluca): No optimization for Huffman mode yet.
-    if (use_prefix_code_) return false;
-    // TODO(eustas): propagate "degenerate_symbol" to simplify this method.
-    const uint32_t res = state_ & (ANS_TAB_SIZE - 1u);
-    const AliasTable::Entry* table = &alias_tables_[ctx << log_alpha_size_];
-    AliasTable::Symbol symbol =
-        AliasTable::Lookup(table, res, log_entry_size_, entry_size_minus_1_);
-    if (symbol.freq != ANS_TAB_SIZE) return false;
-    if (configs[ctx].split_token <= symbol.value) return false;
-    if (symbol.value >= lz77_threshold_) return false;
-    *value = symbol.value;
-    if (lz77_window_) {
-      for (size_t i = 0; i < count; i++) {
-        lz77_window_[(num_decoded_++) & kWindowMask] = symbol.value;
-      }
-    }
-    return true;
-  }
-
-  static constexpr size_t kMaxCheckpointInterval = 512;
-  struct Checkpoint {
-    uint32_t state;
-    uint32_t num_to_copy;
-    uint32_t copy_pos;
-    uint32_t num_decoded;
-    uint32_t lz77_window[kMaxCheckpointInterval];
-  };
-  void Save(Checkpoint* checkpoint) {
-    checkpoint->state = state_;
-    checkpoint->num_decoded = num_decoded_;
-    checkpoint->num_to_copy = num_to_copy_;
-    checkpoint->copy_pos = copy_pos_;
-    if (lz77_window_) {
-      size_t win_start = num_decoded_ & kWindowMask;
-      size_t win_end = (num_decoded_ + kMaxCheckpointInterval) & kWindowMask;
-      if (win_end > win_start) {
-        memcpy(checkpoint->lz77_window, lz77_window_ + win_start,
-               (win_end - win_start) * sizeof(*lz77_window_));
-      } else {
-        memcpy(checkpoint->lz77_window, lz77_window_ + win_start,
-               (kWindowSize - win_start) * sizeof(*lz77_window_));
-        memcpy(checkpoint->lz77_window + (kWindowSize - win_start),
-               lz77_window_, win_end * sizeof(*lz77_window_));
-      }
-    }
-  }
-  void Restore(const Checkpoint& checkpoint) {
-    state_ = checkpoint.state;
-    JXL_DASSERT(num_decoded_ <=
-                checkpoint.num_decoded + kMaxCheckpointInterval);
-    num_decoded_ = checkpoint.num_decoded;
-    num_to_copy_ = checkpoint.num_to_copy;
-    copy_pos_ = checkpoint.copy_pos;
-    if (lz77_window_) {
-      size_t win_start = num_decoded_ & kWindowMask;
-      size_t win_end = (num_decoded_ + kMaxCheckpointInterval) & kWindowMask;
-      if (win_end > win_start) {
-        memcpy(lz77_window_ + win_start, checkpoint.lz77_window,
-               (win_end - win_start) * sizeof(*lz77_window_));
-      } else {
-        memcpy(lz77_window_ + win_start, checkpoint.lz77_window,
-               (kWindowSize - win_start) * sizeof(*lz77_window_));
-        memcpy(lz77_window_, checkpoint.lz77_window + (kWindowSize - win_start),
-               win_end * sizeof(*lz77_window_));
-      }
-    }
-  }
-
- private:
-  ANSSymbolReader(const ANSCode* code, BitReader* JXL_RESTRICT br,
-                  size_t distance_multiplier,
-                  AlignedMemory&& lz77_window_storage);
-
-  const AliasTable::Entry* JXL_RESTRICT alias_tables_;  // not owned
-  const HuffmanDecodingData* huffman_data_;
-  bool use_prefix_code_;
-  uint32_t state_ = ANS_SIGNATURE << 16u;
-  const HybridUintConfig* JXL_RESTRICT configs;
-  uint32_t log_alpha_size_{};
-  uint32_t log_entry_size_{};
-  uint32_t entry_size_minus_1_{};
-
-  // LZ77 structures and constants.
-  static constexpr size_t kWindowMask = kWindowSize - 1;
-  // a std::vector incurs unacceptable decoding speed loss because of
-  // initialization.
-  AlignedMemory lz77_window_storage_;
-  uint32_t* lz77_window_ = nullptr;
-  uint32_t num_decoded_ = 0;
-  uint32_t num_to_copy_ = 0;
-  uint32_t copy_pos_ = 0;
-  uint32_t lz77_ctx_ = 0;
-  uint32_t lz77_min_length_ = 0;
-  uint32_t lz77_threshold_ = 1 << 20;  // bigger than any symbol.
-  HybridUintConfig lz77_length_uint_;
-  uint32_t special_distances_[kNumSpecialDistances]{};
-  uint32_t num_special_distances_{};
-};
-
-Status DecodeHistograms(JxlMemoryManager* memory_manager, BitReader* br,
-                        size_t num_contexts, ANSCode* code,
-                        std::vector<uint8_t>* context_map,
-                        bool disallow_lz77 = false);
-
-// Exposed for tests.
-Status DecodeUintConfigs(size_t log_alpha_size,
-                         std::vector<HybridUintConfig>* uint_config,
-                         BitReader* br);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_DEC_ANS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/dec_bit_reader.h b/third_party/jpeg-xl/lib/jxl/dec_bit_reader.h
deleted file mode 100644
index f7f53c127accb..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_bit_reader.h
+++ /dev/null
@@ -1,333 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_DEC_BIT_READER_H_
-#define LIB_JXL_DEC_BIT_READER_H_
-
-// Bounds-checked bit reader; 64-bit buffer with support for deferred refills
-// and switching to reading byte-aligned words.
-
-#include <cstddef>
-#include <cstdint>
-#include <cstring>  // memcpy
-
-#ifdef __BMI2__
-#include <immintrin.h>
-#endif
-
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-// Reads bits previously written to memory by BitWriter. Uses unaligned 8-byte
-// little-endian loads.
-class BitReader {
- public:
-  static constexpr size_t kMaxBitsPerCall = 56;
-
-  // Constructs an invalid BitReader, to be overwritten before usage.
-  BitReader()
-      : buf_(0),
-        bits_in_buf_(0),
-        next_byte_{nullptr},
-        end_minus_8_{nullptr},
-        first_byte_(nullptr) {}
-  BitReader(const BitReader&) = delete;
-
-  // bytes need not be aligned nor padded!
-  template <class ArrayLike>
-  explicit BitReader(const ArrayLike& bytes)
-      : buf_(0),
-        bits_in_buf_(0),
-        next_byte_(bytes.data()),
-        // Assumes first_byte_ >= 8.
-        end_minus_8_(bytes.data() - 8 + bytes.size()),
-        first_byte_(bytes.data()) {
-    Refill();
-  }
-  ~BitReader() {
-    // Close() must be called before destroying an initialized bit reader.
-    // Invalid bit readers will have a nullptr in first_byte_.
-    JXL_DASSERT(close_called_ || !first_byte_);
-  }
-
-  // Move operator needs to invalidate the other BitReader such that it is
-  // irrelevant if we call Close() on it or not.
-  BitReader& operator=(BitReader&& other) noexcept {
-    // Ensure the current instance was already closed, before we overwrite it
-    // with other.
-    JXL_DASSERT(close_called_ || !first_byte_);
-
-    JXL_DASSERT(!other.close_called_);
-    buf_ = other.buf_;
-    bits_in_buf_ = other.bits_in_buf_;
-    next_byte_ = other.next_byte_;
-    end_minus_8_ = other.end_minus_8_;
-    first_byte_ = other.first_byte_;
-    overread_bytes_ = other.overread_bytes_;
-    close_called_ = other.close_called_;
-
-    other.first_byte_ = nullptr;
-    other.next_byte_ = nullptr;
-    return *this;
-  }
-  BitReader& operator=(const BitReader& other) = delete;
-
-  // For time-critical reads, refills can be shared by multiple reads.
-  // Based on variant 4 (plus bounds-checking), see
-  // fgiesen.wordpress.com/2018/02/20/reading-bits-in-far-too-many-ways-part-2/
-  JXL_INLINE void Refill() {
-    if (JXL_UNLIKELY(next_byte_ > end_minus_8_)) {
-      BoundsCheckedRefill();
-    } else {
-      // It's safe to load 64 bits; insert valid (possibly nonzero) bits above
-      // bits_in_buf_. The shift requires bits_in_buf_ < 64.
-      buf_ |= LoadLE64(next_byte_) << bits_in_buf_;
-
-      // Advance by bytes fully absorbed into the buffer.
-      next_byte_ += (63 - bits_in_buf_) >> 3;
-
-      // We absorbed a multiple of 8 bits, so the lower 3 bits of bits_in_buf_
-      // must remain unchanged, otherwise the next refill's shifted bits will
-      // not align with buf_. Set the three upper bits so the result >= 56.
-      bits_in_buf_ |= 56;
-      JXL_DASSERT(56 <= bits_in_buf_ && bits_in_buf_ < 64);
-    }
-  }
-
-  // Returns the bits that would be returned by Read without calling Advance().
-  // It is legal to PEEK at more bits than present in the bitstream (required
-  // by Huffman), and those bits will be zero.
-  template <size_t N>
-  JXL_INLINE uint64_t PeekFixedBits() const {
-    static_assert(N <= kMaxBitsPerCall, "Reading too many bits in one call.");
-    JXL_DASSERT(!close_called_);
-    return buf_ & ((1ULL << N) - 1);
-  }
-
-  JXL_INLINE uint64_t PeekBits(size_t nbits) const {
-    JXL_DASSERT(nbits <= kMaxBitsPerCall);
-    JXL_DASSERT(!close_called_);
-
-    // Slightly faster but requires BMI2. It is infeasible to make the many
-    // callers reside between begin/end_target, especially because only the
-    // callers in dec_ans are time-critical. Therefore only enabled if the
-    // entire binary is compiled for (and thus requires) BMI2.
-#if defined(__BMI2__) && defined(__x86_64__)
-    return _bzhi_u64(buf_, nbits);
-#else
-    const uint64_t mask = (1ULL << nbits) - 1;
-    return buf_ & mask;
-#endif
-  }
-
-  // Removes bits from the buffer. Need not match the previous Peek size, but
-  // the buffer must contain at least num_bits (this prevents consuming more
-  // than the total number of bits).
-  JXL_INLINE void Consume(size_t num_bits) {
-    JXL_DASSERT(!close_called_);
-    JXL_DASSERT(bits_in_buf_ >= num_bits);
-    if (JXL_CRASH_ON_ERROR) {
-      // When JXL_CRASH_ON_ERROR is defined, it is a fatal error to read more
-      // bits than available in the stream. A non-zero overread_bytes_ implies
-      // that next_byte_ is already at the end of the stream, so we don't need
-      // to check that.
-      JXL_DASSERT(bits_in_buf_ >= num_bits + overread_bytes_ * kBitsPerByte);
-    }
-    bits_in_buf_ -= num_bits;
-    buf_ >>= num_bits;
-  }
-
-  JXL_INLINE uint64_t ReadBits(size_t nbits) {
-    JXL_DASSERT(!close_called_);
-    Refill();
-    const uint64_t bits = PeekBits(nbits);
-    Consume(nbits);
-    return bits;
-  }
-
-  template <size_t N>
-  JXL_INLINE uint64_t ReadFixedBits() {
-    JXL_DASSERT(!close_called_);
-    Refill();
-    const uint64_t bits = PeekFixedBits<N>();
-    Consume(N);
-    return bits;
-  }
-
-  // Equivalent to calling ReadFixedBits(1) `skip` times, but much faster.
-  // `skip` is typically large.
-  void SkipBits(size_t skip) {
-    JXL_DASSERT(!close_called_);
-    // Buffer is large enough - don't zero buf_ below.
-    if (JXL_UNLIKELY(skip <= bits_in_buf_)) {
-      Consume(skip);
-      return;
-    }
-
-    // First deduct what we can satisfy from the buffer
-    skip -= bits_in_buf_;
-    bits_in_buf_ = 0;
-    // Not enough to call Advance - that may leave some bits in the buffer
-    // which were previously ABOVE bits_in_buf.
-    buf_ = 0;
-
-    // Skip whole bytes
-    const size_t whole_bytes = skip / kBitsPerByte;
-    skip %= kBitsPerByte;
-    if (JXL_UNLIKELY(whole_bytes >
-                     static_cast<size_t>(end_minus_8_ + 8 - next_byte_))) {
-      // This is already an overflow condition (skipping past the end of the bit
-      // stream). However if we increase next_byte_ too much we risk overflowing
-      // that value and potentially making it valid again (next_byte_ < end).
-      // This will set next_byte_ to the end of the stream and still consume
-      // some bits in overread_bytes_, however the TotalBitsConsumed() will be
-      // incorrect (still larger than the TotalBytes()).
-      next_byte_ = end_minus_8_ + 8;
-      skip += kBitsPerByte;
-    } else {
-      next_byte_ += whole_bytes;
-    }
-
-    Refill();
-    Consume(skip);
-  }
-
-  size_t TotalBitsConsumed() const {
-    const size_t bytes_read = static_cast<size_t>(next_byte_ - first_byte_);
-    return (bytes_read + overread_bytes_) * kBitsPerByte - bits_in_buf_;
-  }
-
-  Status JumpToByteBoundary() {
-    const size_t remainder = TotalBitsConsumed() % kBitsPerByte;
-    if (remainder == 0) return true;
-    if (JXL_UNLIKELY(ReadBits(kBitsPerByte - remainder) != 0)) {
-      return JXL_FAILURE("Non-zero padding bits");
-    }
-    return true;
-  }
-
-  // For interoperability with other bitreaders (for resuming at
-  // non-byte-aligned positions).
-  const uint8_t* FirstByte() const { return first_byte_; }
-  size_t TotalBytes() const {
-    return static_cast<size_t>(end_minus_8_ + 8 - first_byte_);
-  }
-
-  // Returns whether all the bits read so far have been within the input bounds.
-  // When reading past the EOF, the Read*() and Consume() functions return zeros
-  // but flag a failure when calling Close() without checking this function.
-  Status AllReadsWithinBounds() {
-    // Mark up to which point the user checked the out of bounds condition. If
-    // the user handles the condition at higher level (e.g. fetch more bytes
-    // from network, return a custom JXL_FAILURE, ...), Close() should not
-    // output a debug error (which would break tests with JXL_CRASH_ON_ERROR
-    // even when legitimately handling the situation at higher level). This is
-    // used by Bundle::CanRead.
-    checked_out_of_bounds_bits_ = TotalBitsConsumed();
-    if (TotalBitsConsumed() > TotalBytes() * kBitsPerByte) {
-      return false;
-    }
-    return true;
-  }
-
-  // Close the bit reader and return whether all the previous reads were
-  // successful. Close must be called once.
-  Status Close() {
-    JXL_DASSERT(!close_called_);
-    close_called_ = true;
-    if (!first_byte_) return true;
-    if (TotalBitsConsumed() > checked_out_of_bounds_bits_ &&
-        TotalBitsConsumed() > TotalBytes() * kBitsPerByte) {
-      return JXL_FAILURE("Read more bits than available in the bit_reader");
-    }
-    return true;
-  }
-
- private:
-  // Separate function avoids inlining this relatively cold code into callers.
-  JXL_NOINLINE void BoundsCheckedRefill() {
-    const uint8_t* end = end_minus_8_ + 8;
-
-    // Read whole bytes until we have [56, 64) bits (same as LoadLE64)
-    for (; bits_in_buf_ < 64 - kBitsPerByte; bits_in_buf_ += kBitsPerByte) {
-      if (next_byte_ >= end) break;
-      buf_ |= static_cast<uint64_t>(*next_byte_++) << bits_in_buf_;
-    }
-    JXL_DASSERT(bits_in_buf_ < 64);
-
-    // Add extra bytes as 0 at the end of the stream in the bit_buffer_. If
-    // these bits are read, Close() will return a failure.
-    size_t extra_bytes = (63 - bits_in_buf_) / kBitsPerByte;
-    overread_bytes_ += extra_bytes;
-    bits_in_buf_ += extra_bytes * kBitsPerByte;
-
-    JXL_DASSERT(bits_in_buf_ < 64);
-    JXL_DASSERT(bits_in_buf_ >= 56);
-  }
-
-  JXL_NOINLINE uint32_t BoundsCheckedReadByteAlignedWord() {
-    if (next_byte_ + 1 < end_minus_8_ + 8) {
-      uint32_t ret = LoadLE16(next_byte_);
-      next_byte_ += 2;
-      return ret;
-    }
-    overread_bytes_ += 2;
-    return 0;
-  }
-
-  uint64_t buf_;
-  size_t bits_in_buf_;  // [0, 64)
-  const uint8_t* JXL_RESTRICT next_byte_;
-  const uint8_t* end_minus_8_;  // for refill bounds check
-  const uint8_t* first_byte_;   // for GetSpan
-
-  // Number of bytes past the end that were loaded into the buf_. These bytes
-  // are not read from memory, but instead assumed 0. It is an error (likely due
-  // to an invalid stream) to Consume() more bits than specified in the range
-  // passed to the constructor.
-  uint64_t overread_bytes_{0};
-  bool close_called_{false};
-
-  uint64_t checked_out_of_bounds_bits_{0};
-};
-
-// Closes a BitReader when the BitReaderScopedCloser goes out of scope. When
-// closing the bit reader, if the status result was failure it sets this failure
-// to the passed variable pointer. Typical usage.
-//
-// Status ret = true;
-// {
-//   BitReader reader(...);
-//   BitReaderScopedCloser reader_closer(&reader, &ret);
-//
-//   // ... code that can return errors here ...
-// }
-// // ... more code that doesn't use the BitReader.
-// return ret;
-
-class BitReaderScopedCloser {
- public:
-  BitReaderScopedCloser(BitReader& reader, Status& status)
-      : reader_(&reader), status_(&status) {}
-  ~BitReaderScopedCloser() {
-    if (reader_ != nullptr) {
-      Status close_ret = reader_->Close();
-      if (!close_ret) *status_ = close_ret;
-    }
-  }
-  BitReaderScopedCloser(const BitReaderScopedCloser&) = delete;
-
- private:
-  BitReader* reader_;
-  Status* status_;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_DEC_BIT_READER_H_
diff --git a/third_party/jpeg-xl/lib/jxl/dec_cache.cc b/third_party/jpeg-xl/lib/jxl/dec_cache.cc
deleted file mode 100644
index 92a59c1487105..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_cache.cc
+++ /dev/null
@@ -1,350 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/dec_cache.h"
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-
-#include "lib/jxl/ac_strategy.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/blending.h"
-#include "lib/jxl/coeff_order.h"
-#include "lib/jxl/common.h"  // JXL_HIGH_PRECISION
-#include "lib/jxl/memory_manager_internal.h"
-#include "lib/jxl/render_pipeline/stage_blending.h"
-#include "lib/jxl/render_pipeline/stage_chroma_upsampling.h"
-#include "lib/jxl/render_pipeline/stage_cms.h"
-#include "lib/jxl/render_pipeline/stage_epf.h"
-#include "lib/jxl/render_pipeline/stage_from_linear.h"
-#include "lib/jxl/render_pipeline/stage_gaborish.h"
-#include "lib/jxl/render_pipeline/stage_noise.h"
-#include "lib/jxl/render_pipeline/stage_patches.h"
-#include "lib/jxl/render_pipeline/stage_splines.h"
-#include "lib/jxl/render_pipeline/stage_spot.h"
-#include "lib/jxl/render_pipeline/stage_to_linear.h"
-#include "lib/jxl/render_pipeline/stage_tone_mapping.h"
-#include "lib/jxl/render_pipeline/stage_upsampling.h"
-#include "lib/jxl/render_pipeline/stage_write.h"
-#include "lib/jxl/render_pipeline/stage_xyb.h"
-#include "lib/jxl/render_pipeline/stage_ycbcr.h"
-
-namespace jxl {
-
-Status GroupDecCache::InitOnce(JxlMemoryManager* memory_manager,
-                               size_t num_passes, size_t used_acs) {
-  for (size_t i = 0; i < num_passes; i++) {
-    if (num_nzeroes[i].xsize() == 0) {
-      // Allocate enough for a whole group - partial groups on the
-      // right/bottom border just use a subset. The valid size is passed via
-      // Rect.
-
-      JXL_ASSIGN_OR_RETURN(num_nzeroes[i],
-                           Image3I::Create(memory_manager, kGroupDimInBlocks,
-                                           kGroupDimInBlocks));
-    }
-  }
-  size_t max_block_area = 0;
-
-  for (uint8_t o = 0; o < AcStrategy::kNumValidStrategies; ++o) {
-    AcStrategy acs = AcStrategy::FromRawStrategy(o);
-    if ((used_acs & (1 << o)) == 0) continue;
-    size_t area =
-        acs.covered_blocks_x() * acs.covered_blocks_y() * kDCTBlockSize;
-    max_block_area = std::max(area, max_block_area);
-  }
-
-  if (max_block_area > max_block_area_) {
-    max_block_area_ = max_block_area;
-    // We need 3x float blocks for dequantized coefficients and 1x for scratch
-    // space for transforms.
-    JXL_ASSIGN_OR_RETURN(
-        float_memory_,
-        AlignedMemory::Create(memory_manager,
-                              max_block_area_ * 7 * sizeof(float)));
-    // We need 3x int32 or int16 blocks for quantized coefficients.
-    JXL_ASSIGN_OR_RETURN(
-        int32_memory_,
-        AlignedMemory::Create(memory_manager,
-                              max_block_area_ * 3 * sizeof(int32_t)));
-    JXL_ASSIGN_OR_RETURN(
-        int16_memory_,
-        AlignedMemory::Create(memory_manager,
-                              max_block_area_ * 3 * sizeof(int16_t)));
-  }
-
-  dec_group_block = float_memory_.address<float>();
-  scratch_space = dec_group_block + max_block_area_ * 3;
-  dec_group_qblock = int32_memory_.address<int32_t>();
-  dec_group_qblock16 = int16_memory_.address<int16_t>();
-  return true;
-}
-
-// Initialize the decoder state after all of DC is decoded.
-Status PassesDecoderState::InitForAC(size_t num_passes, ThreadPool* pool) {
-  shared_storage.coeff_order_size = 0;
-  for (uint8_t o = 0; o < AcStrategy::kNumValidStrategies; ++o) {
-    if (((1 << o) & used_acs) == 0) continue;
-    uint8_t ord = kStrategyOrder[o];
-    shared_storage.coeff_order_size =
-        std::max(kCoeffOrderOffset[3 * (ord + 1)] * kDCTBlockSize,
-                 shared_storage.coeff_order_size);
-  }
-  size_t sz = num_passes * shared_storage.coeff_order_size;
-  if (sz > shared_storage.coeff_orders.size()) {
-    shared_storage.coeff_orders.resize(sz);
-  }
-  return true;
-}
-
-Status PassesDecoderState::PreparePipeline(const FrameHeader& frame_header,
-                                           const ImageMetadata* metadata,
-                                           ImageBundle* decoded,
-                                           PipelineOptions options) {
-  JxlMemoryManager* memory_manager = this->memory_manager();
-  size_t num_c = 3 + frame_header.nonserialized_metadata->m.num_extra_channels;
-  bool render_noise =
-      (options.render_noise && (frame_header.flags & FrameHeader::kNoise) != 0);
-  size_t num_tmp_c = render_noise ? 3 : 0;
-
-  if (frame_header.CanBeReferenced()) {
-    // Necessary so that SetInputSizes() can allocate output buffers as needed.
-    frame_storage_for_referencing = ImageBundle(memory_manager, metadata);
-  }
-
-  RenderPipeline::Builder builder(memory_manager, num_c + num_tmp_c);
-
-  if (options.use_slow_render_pipeline) {
-    builder.UseSimpleImplementation();
-  }
-
-  if (!frame_header.chroma_subsampling.Is444()) {
-    for (size_t c = 0; c < 3; c++) {
-      if (frame_header.chroma_subsampling.HShift(c) != 0) {
-        JXL_RETURN_IF_ERROR(
-            builder.AddStage(GetChromaUpsamplingStage(c, /*horizontal=*/true)));
-      }
-      if (frame_header.chroma_subsampling.VShift(c) != 0) {
-        JXL_RETURN_IF_ERROR(builder.AddStage(
-            GetChromaUpsamplingStage(c, /*horizontal=*/false)));
-      }
-    }
-  }
-
-  if (frame_header.loop_filter.gab) {
-    JXL_RETURN_IF_ERROR(
-        builder.AddStage(GetGaborishStage(frame_header.loop_filter)));
-  }
-
-  {
-    const LoopFilter& lf = frame_header.loop_filter;
-    if (lf.epf_iters >= 3) {
-      JXL_RETURN_IF_ERROR(
-          builder.AddStage(GetEPFStage(lf, sigma, EpfStage::Zero)));
-    }
-    if (lf.epf_iters >= 1) {
-      JXL_RETURN_IF_ERROR(
-          builder.AddStage(GetEPFStage(lf, sigma, EpfStage::One)));
-    }
-    if (lf.epf_iters >= 2) {
-      JXL_RETURN_IF_ERROR(
-          builder.AddStage(GetEPFStage(lf, sigma, EpfStage::Two)));
-    }
-  }
-
-  bool late_ec_upsample = frame_header.upsampling != 1;
-  for (auto ecups : frame_header.extra_channel_upsampling) {
-    if (ecups != frame_header.upsampling) {
-      // If patches are applied, either frame_header.upsampling == 1 or
-      // late_ec_upsample is true.
-      late_ec_upsample = false;
-    }
-  }
-
-  if (!late_ec_upsample) {
-    for (size_t ec = 0; ec < frame_header.extra_channel_upsampling.size();
-         ec++) {
-      if (frame_header.extra_channel_upsampling[ec] != 1) {
-        JXL_RETURN_IF_ERROR(builder.AddStage(GetUpsamplingStage(
-            frame_header.nonserialized_metadata->transform_data, 3 + ec,
-            CeilLog2Nonzero(frame_header.extra_channel_upsampling[ec]))));
-      }
-    }
-  }
-
-  if ((frame_header.flags & FrameHeader::kPatches) != 0) {
-    JXL_RETURN_IF_ERROR(builder.AddStage(GetPatchesStage(
-        &shared->image_features.patches,
-        &frame_header.nonserialized_metadata->m.extra_channel_info)));
-  }
-  if ((frame_header.flags & FrameHeader::kSplines) != 0) {
-    JXL_RETURN_IF_ERROR(
-        builder.AddStage(GetSplineStage(&shared->image_features.splines)));
-  }
-
-  if (frame_header.upsampling != 1) {
-    size_t nb_channels =
-        3 +
-        (late_ec_upsample ? frame_header.extra_channel_upsampling.size() : 0);
-    for (size_t c = 0; c < nb_channels; c++) {
-      JXL_RETURN_IF_ERROR(builder.AddStage(GetUpsamplingStage(
-          frame_header.nonserialized_metadata->transform_data, c,
-          CeilLog2Nonzero(frame_header.upsampling))));
-    }
-  }
-  if (render_noise) {
-    JXL_RETURN_IF_ERROR(builder.AddStage(GetConvolveNoiseStage(num_c)));
-    JXL_RETURN_IF_ERROR(builder.AddStage(GetAddNoiseStage(
-        shared->image_features.noise_params, shared->cmap.base(), num_c)));
-  }
-  if (frame_header.dc_level != 0) {
-    JXL_RETURN_IF_ERROR(builder.AddStage(GetWriteToImage3FStage(
-        memory_manager, &shared_storage.dc_frames[frame_header.dc_level - 1])));
-  }
-
-  if (frame_header.CanBeReferenced() &&
-      frame_header.save_before_color_transform) {
-    JXL_RETURN_IF_ERROR(builder.AddStage(GetWriteToImageBundleStage(
-        &frame_storage_for_referencing, output_encoding_info)));
-  }
-
-  bool has_alpha = false;
-  size_t alpha_c = 0;
-  for (size_t i = 0; i < metadata->extra_channel_info.size(); i++) {
-    if (metadata->extra_channel_info[i].type == ExtraChannel::kAlpha) {
-      has_alpha = true;
-      alpha_c = 3 + i;
-      break;
-    }
-  }
-
-  if (fast_xyb_srgb8_conversion) {
-#if !JXL_HIGH_PRECISION
-    JXL_ENSURE(!NeedsBlending(frame_header));
-    JXL_ENSURE(!frame_header.CanBeReferenced() ||
-               frame_header.save_before_color_transform);
-    JXL_ENSURE(!options.render_spotcolors ||
-               !metadata->Find(ExtraChannel::kSpotColor));
-    bool is_rgba = (main_output.format.num_channels == 4);
-    uint8_t* rgb_output = reinterpret_cast<uint8_t*>(main_output.buffer);
-    JXL_RETURN_IF_ERROR(builder.AddStage(
-        GetFastXYBTosRGB8Stage(rgb_output, main_output.stride, width, height,
-                               is_rgba, has_alpha, alpha_c)));
-#endif
-  } else {
-    bool linear = false;
-    if (frame_header.color_transform == ColorTransform::kYCbCr) {
-      JXL_RETURN_IF_ERROR(builder.AddStage(GetYCbCrStage()));
-    } else if (frame_header.color_transform == ColorTransform::kXYB) {
-      JXL_RETURN_IF_ERROR(builder.AddStage(GetXYBStage(output_encoding_info)));
-      if (output_encoding_info.color_encoding.GetColorSpace() !=
-          ColorSpace::kXYB) {
-        linear = true;
-      }
-    }  // Nothing to do for kNone.
-
-    if (options.coalescing && NeedsBlending(frame_header)) {
-      if (linear) {
-        JXL_RETURN_IF_ERROR(
-            builder.AddStage(GetFromLinearStage(output_encoding_info)));
-        linear = false;
-      }
-      JXL_RETURN_IF_ERROR(builder.AddStage(GetBlendingStage(
-          frame_header, this, output_encoding_info.color_encoding)));
-    }
-
-    if (options.coalescing && frame_header.CanBeReferenced() &&
-        !frame_header.save_before_color_transform) {
-      if (linear) {
-        JXL_RETURN_IF_ERROR(
-            builder.AddStage(GetFromLinearStage(output_encoding_info)));
-        linear = false;
-      }
-      JXL_RETURN_IF_ERROR(builder.AddStage(GetWriteToImageBundleStage(
-          &frame_storage_for_referencing, output_encoding_info)));
-    }
-
-    if (options.render_spotcolors &&
-        frame_header.nonserialized_metadata->m.Find(ExtraChannel::kSpotColor)) {
-      for (size_t i = 0; i < metadata->extra_channel_info.size(); i++) {
-        // Don't use Find() because there may be multiple spot color channels.
-        const ExtraChannelInfo& eci = metadata->extra_channel_info[i];
-        if (eci.type == ExtraChannel::kSpotColor) {
-          JXL_RETURN_IF_ERROR(
-              builder.AddStage(GetSpotColorStage(i, eci.spot_color)));
-        }
-      }
-    }
-
-    auto tone_mapping_stage = GetToneMappingStage(output_encoding_info);
-    if (tone_mapping_stage) {
-      if (!linear) {
-        auto to_linear_stage = GetToLinearStage(output_encoding_info);
-        if (!to_linear_stage) {
-          if (!output_encoding_info.cms_set) {
-            return JXL_FAILURE("Cannot tonemap this colorspace without a CMS");
-          }
-          auto cms_stage = GetCmsStage(output_encoding_info);
-          if (cms_stage) {
-            JXL_RETURN_IF_ERROR(builder.AddStage(std::move(cms_stage)));
-          }
-        } else {
-          JXL_RETURN_IF_ERROR(builder.AddStage(std::move(to_linear_stage)));
-        }
-        linear = true;
-      }
-      JXL_RETURN_IF_ERROR(builder.AddStage(std::move(tone_mapping_stage)));
-    }
-
-    if (linear) {
-      const size_t channels_src =
-          (output_encoding_info.orig_color_encoding.IsCMYK()
-               ? 4
-               : output_encoding_info.orig_color_encoding.Channels());
-      const size_t channels_dst =
-          output_encoding_info.color_encoding.Channels();
-      bool mixing_color_and_grey = (channels_dst != channels_src);
-      if ((output_encoding_info.color_encoding_is_original) ||
-          (!output_encoding_info.cms_set) || mixing_color_and_grey) {
-        // in those cases we only need a linear stage in other cases we attempt
-        // to obtain a cms stage: the cases are
-        // - output_encoding_info.color_encoding_is_original: no cms stage
-        // needed because it would be a no-op
-        // - !output_encoding_info.cms_set: can't use the cms, so no point in
-        // trying to add a cms stage
-        // - mixing_color_and_grey: cms stage can't handle that
-        // TODO(firsching): remove "mixing_color_and_grey" condition after
-        // adding support for greyscale to cms stage.
-        JXL_RETURN_IF_ERROR(
-            builder.AddStage(GetFromLinearStage(output_encoding_info)));
-      } else {
-        if (!output_encoding_info.linear_color_encoding.CreateICC()) {
-          return JXL_FAILURE("Failed to create ICC");
-        }
-        auto cms_stage = GetCmsStage(output_encoding_info);
-        if (cms_stage) {
-          JXL_RETURN_IF_ERROR(builder.AddStage(std::move(cms_stage)));
-        }
-      }
-      linear = false;
-    }
-    (void)linear;
-
-    if (main_output.callback.IsPresent() || main_output.buffer) {
-      JXL_RETURN_IF_ERROR(builder.AddStage(GetWriteToOutputStage(
-          main_output, width, height, has_alpha, unpremul_alpha, alpha_c,
-          undo_orientation, extra_output, memory_manager)));
-    } else {
-      JXL_RETURN_IF_ERROR(builder.AddStage(
-          GetWriteToImageBundleStage(decoded, output_encoding_info)));
-    }
-  }
-  JXL_ASSIGN_OR_RETURN(render_pipeline,
-                       std::move(builder).Finalize(shared->frame_dim));
-  return render_pipeline->IsInitialized();
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/dec_cache.h b/third_party/jpeg-xl/lib/jxl/dec_cache.h
deleted file mode 100644
index 9d3204faa7311..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_cache.h
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_DEC_CACHE_H_
-#define LIB_JXL_DEC_CACHE_H_
-
-#include <jxl/decode.h>
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-
-#include <atomic>
-#include <cmath>
-#include <cstdint>
-#include <hwy/base.h>  // HWY_ALIGN_MAX
-#include <memory>
-#include <vector>
-
-#include "lib/jxl/base/common.h"  // kMaxNumPasses
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/common.h"
-#include "lib/jxl/dct_util.h"
-#include "lib/jxl/dec_ans.h"
-#include "lib/jxl/dec_xyb.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/memory_manager_internal.h"
-#include "lib/jxl/passes_state.h"
-#include "lib/jxl/render_pipeline/render_pipeline.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-#include "lib/jxl/render_pipeline/stage_upsampling.h"
-
-namespace jxl {
-
-constexpr size_t kSigmaBorder = 1;
-constexpr size_t kSigmaPadding = 2;
-
-struct PixelCallback {
-  PixelCallback() = default;
-  PixelCallback(JxlImageOutInitCallback init, JxlImageOutRunCallback run,
-                JxlImageOutDestroyCallback destroy, void* init_opaque)
-      : init(init), run(run), destroy(destroy), init_opaque(init_opaque) {
-#if (JXL_IS_DEBUG_BUILD)
-    const bool has_init = (init != nullptr);
-    const bool has_run = (run != nullptr);
-    const bool has_destroy = (destroy != nullptr);
-    const bool healthy = (has_init == has_run) && (has_run == has_destroy);
-    JXL_DASSERT(healthy);
-#endif
-  }
-
-  bool IsPresent() const { return run != nullptr; }
-
-  void* Init(size_t num_threads, size_t num_pixels) const {
-    return init(init_opaque, num_threads, num_pixels);
-  }
-
-  JxlImageOutInitCallback init = nullptr;
-  JxlImageOutRunCallback run = nullptr;
-  JxlImageOutDestroyCallback destroy = nullptr;
-  void* init_opaque = nullptr;
-};
-
-struct ImageOutput {
-  // Pixel format of the output pixels, used for buffer and callback output.
-  JxlPixelFormat format;
-  // Output bit depth for unsigned data types, used for float to int conversion.
-  size_t bits_per_sample;
-  // Callback for line-by-line output.
-  PixelCallback callback;
-  // Pixel buffer for image output.
-  void* buffer;
-  size_t buffer_size;
-  // Length of a row of image_buffer in bytes (based on oriented width).
-  size_t stride;
-};
-
-// Per-frame decoder state. All the images here should be accessed through a
-// group rect (either with block units or pixel units).
-struct PassesDecoderState {
-  explicit PassesDecoderState(JxlMemoryManager* memory_manager)
-      : shared_storage(memory_manager),
-        frame_storage_for_referencing(memory_manager) {}
-
-  PassesSharedState shared_storage;
-  // Allows avoiding copies for encoder loop.
-  const PassesSharedState* JXL_RESTRICT shared = &shared_storage;
-
-  // 8x upsampling stage for DC.
-  std::unique_ptr<RenderPipelineStage> upsampler8x;
-
-  // For ANS decoding.
-  std::vector<ANSCode> code;
-  std::vector<std::vector<uint8_t>> context_map;
-
-  // Multiplier to be applied to the quant matrices of the x channel.
-  float x_dm_multiplier;
-  float b_dm_multiplier;
-
-  // Sigma values for EPF.
-  ImageF sigma;
-
-  // Image dimensions before applying undo_orientation.
-  size_t width;
-  size_t height;
-  ImageOutput main_output;
-  std::vector<ImageOutput> extra_output;
-
-  // Whether to use int16 float-XYB-to-uint8-srgb conversion.
-  bool fast_xyb_srgb8_conversion;
-
-  // If true, the RGBA output will be unpremultiplied before writing to the
-  // output.
-  bool unpremul_alpha;
-
-  // The render pipeline will apply this orientation to bring the image to the
-  // intended display orientation.
-  Orientation undo_orientation;
-
-  // Used for seeding noise.
-  size_t visible_frame_index = 0;
-  size_t nonvisible_frame_index = 0;
-
-  // Keep track of the transform types used.
-  std::atomic<uint32_t> used_acs{0};
-
-  // Storage for coefficients if in "accumulate" mode.
-  std::unique_ptr<ACImage> coefficients = make_unique<ACImageT<int32_t>>();
-
-  // Rendering pipeline.
-  std::unique_ptr<RenderPipeline> render_pipeline;
-
-  // Storage for the current frame if it can be referenced by future frames.
-  ImageBundle frame_storage_for_referencing;
-
-  struct PipelineOptions {
-    bool use_slow_render_pipeline;
-    bool coalescing;
-    bool render_spotcolors;
-    bool render_noise;
-  };
-
-  JxlMemoryManager* memory_manager() const { return shared->memory_manager; }
-
-  Status PreparePipeline(const FrameHeader& frame_header,
-                         const ImageMetadata* metadata, ImageBundle* decoded,
-                         PipelineOptions options);
-
-  // Information for colour conversions.
-  OutputEncodingInfo output_encoding_info;
-
-  // Initializes decoder-specific structures using information from *shared.
-  Status Init(const FrameHeader& frame_header) {
-    JxlMemoryManager* memory_manager = this->memory_manager();
-    x_dm_multiplier = std::pow(1 / (1.25f), frame_header.x_qm_scale - 2.0f);
-    b_dm_multiplier = std::pow(1 / (1.25f), frame_header.b_qm_scale - 2.0f);
-
-    main_output.callback = PixelCallback();
-    main_output.buffer = nullptr;
-    extra_output.clear();
-
-    fast_xyb_srgb8_conversion = false;
-    unpremul_alpha = false;
-    undo_orientation = Orientation::kIdentity;
-
-    used_acs = 0;
-
-    upsampler8x = GetUpsamplingStage(shared->metadata->transform_data, 0, 3);
-    if (frame_header.loop_filter.epf_iters > 0) {
-      JXL_ASSIGN_OR_RETURN(
-          sigma,
-          ImageF::Create(memory_manager,
-                         shared->frame_dim.xsize_blocks + 2 * kSigmaPadding,
-                         shared->frame_dim.ysize_blocks + 2 * kSigmaPadding));
-    }
-    return true;
-  }
-
-  // Initialize the decoder state after all of DC is decoded.
-  Status InitForAC(size_t num_passes, ThreadPool* pool);
-};
-
-// Temp images required for decoding a single group. Reduces memory allocations
-// for large images because we only initialize min(#threads, #groups) instances.
-struct HWY_ALIGN_MAX GroupDecCache {
-  Status InitOnce(JxlMemoryManager* memory_manager, size_t num_passes,
-                  size_t used_acs);
-
-  Status InitDCBufferOnce(JxlMemoryManager* memory_manager) {
-    if (dc_buffer.xsize() == 0) {
-      JXL_ASSIGN_OR_RETURN(
-          dc_buffer,
-          ImageF::Create(memory_manager,
-                         kGroupDimInBlocks + kRenderPipelineXOffset * 2,
-                         kGroupDimInBlocks + 4));
-    }
-    return true;
-  }
-
-  // Scratch space used by DecGroupImpl().
-  float* dec_group_block;
-  int32_t* dec_group_qblock;
-  int16_t* dec_group_qblock16;
-
-  // For TransformToPixels.
-  float* scratch_space;
-  // Note that scratch_space is never used at the same time as dec_group_qblock.
-  // Moreover, only one of dec_group_qblock16 is ever used.
-  // TODO(veluca): figure out if we can save allocations.
-
-  // AC decoding
-  Image3I num_nzeroes[kMaxNumPasses];
-
-  // Buffer for DC upsampling.
-  ImageF dc_buffer;
-
- private:
-  AlignedMemory float_memory_;
-  AlignedMemory int32_memory_;
-  AlignedMemory int16_memory_;
-  size_t max_block_area_ = 0;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_DEC_CACHE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/dec_context_map.cc b/third_party/jpeg-xl/lib/jxl/dec_context_map.cc
deleted file mode 100644
index 2a2a6e5354172..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_context_map.cc
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/dec_context_map.h"
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_ans.h"
-#include "lib/jxl/inverse_mtf-inl.h"
-
-namespace jxl {
-
-namespace {
-
-// Context map uses uint8_t.
-constexpr size_t kMaxClusters = 256;
-
-Status VerifyContextMap(const std::vector<uint8_t>& context_map,
-                        const size_t num_htrees) {
-  std::vector<bool> have_htree(num_htrees);
-  size_t num_found = 0;
-  for (const uint8_t htree : context_map) {
-    if (htree >= num_htrees) {
-      return JXL_FAILURE("Invalid histogram index in context map.");
-    }
-    if (!have_htree[htree]) {
-      have_htree[htree] = true;
-      ++num_found;
-    }
-  }
-  if (num_found != num_htrees) {
-    return JXL_FAILURE("Incomplete context map.");
-  }
-  return true;
-}
-
-}  // namespace
-
-Status DecodeContextMap(JxlMemoryManager* memory_manager,
-                        std::vector<uint8_t>* context_map, size_t* num_htrees,
-                        BitReader* input) {
-  bool is_simple = static_cast<bool>(input->ReadFixedBits<1>());
-  if (is_simple) {
-    int bits_per_entry = input->ReadFixedBits<2>();
-    if (bits_per_entry != 0) {
-      for (uint8_t& entry : *context_map) {
-        entry = input->ReadBits(bits_per_entry);
-      }
-    } else {
-      std::fill(context_map->begin(), context_map->end(), 0);
-    }
-  } else {
-    bool use_mtf = static_cast<bool>(input->ReadFixedBits<1>());
-    ANSCode code;
-    std::vector<uint8_t> sink_ctx_map;
-    // Usage of LZ77 is disallowed if decoding only two symbols. This doesn't
-    // make sense in non-malicious bitstreams, and could cause a stack overflow
-    // in malicious bitstreams by making every context map require its own
-    // context map.
-    JXL_RETURN_IF_ERROR(
-        DecodeHistograms(memory_manager, input, 1, &code, &sink_ctx_map,
-                         /*disallow_lz77=*/context_map->size() <= 2));
-    JXL_ASSIGN_OR_RETURN(ANSSymbolReader reader,
-                         ANSSymbolReader::Create(&code, input));
-    size_t i = 0;
-    uint32_t maxsym = 0;
-    while (i < context_map->size()) {
-      uint32_t sym = reader.ReadHybridUintInlined</*uses_lz77=*/true>(
-          0, input, sink_ctx_map);
-      maxsym = sym > maxsym ? sym : maxsym;
-      (*context_map)[i] = sym;
-      i++;
-    }
-    if (maxsym >= kMaxClusters) {
-      return JXL_FAILURE("Invalid cluster ID");
-    }
-    if (!reader.CheckANSFinalState()) {
-      return JXL_FAILURE("Invalid context map");
-    }
-    if (use_mtf) {
-      InverseMoveToFrontTransform(context_map->data(), context_map->size());
-    }
-  }
-  *num_htrees = *std::max_element(context_map->begin(), context_map->end()) + 1;
-  return VerifyContextMap(*context_map, *num_htrees);
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/dec_context_map.h b/third_party/jpeg-xl/lib/jxl/dec_context_map.h
deleted file mode 100644
index 9f7ac4f87edbf..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_context_map.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_DEC_CONTEXT_MAP_H_
-#define LIB_JXL_DEC_CONTEXT_MAP_H_
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_bit_reader.h"
-
-namespace jxl {
-
-// Reads the context map from the bit stream. On calling this function,
-// context_map->size() must be the number of possible context ids.
-// Sets *num_htrees to the number of different histogram ids in
-// *context_map.
-Status DecodeContextMap(JxlMemoryManager* memory_manager,
-                        std::vector<uint8_t>* context_map, size_t* num_htrees,
-                        BitReader* input);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_DEC_CONTEXT_MAP_H_
diff --git a/third_party/jpeg-xl/lib/jxl/dec_external_image.cc b/third_party/jpeg-xl/lib/jxl/dec_external_image.cc
deleted file mode 100644
index 9e3da68edb98f..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_external_image.cc
+++ /dev/null
@@ -1,513 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/dec_external_image.h"
-
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-
-#include <algorithm>
-#include <cstring>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/image.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/dec_external_image.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/alpha.h"
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/sanitizers.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Clamp;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::NearestInt;
-
-// TODO(jon): check if this can be replaced by a FloatToU16 function
-void FloatToU32(const float* in, uint32_t* out, size_t num, float mul,
-                size_t bits_per_sample) {
-  const HWY_FULL(float) d;
-  const hwy::HWY_NAMESPACE::Rebind<uint32_t, decltype(d)> du;
-
-  // Unpoison accessing partially-uninitialized vectors with memory sanitizer.
-  // This is because we run NearestInt() on the vector, which triggers MSAN even
-  // it is safe to do so since the values are not mixed between lanes.
-  const size_t num_round_up = RoundUpTo(num, Lanes(d));
-  msan::UnpoisonMemory(in + num, sizeof(in[0]) * (num_round_up - num));
-
-  const auto one = Set(d, 1.0f);
-  const auto scale = Set(d, mul);
-  for (size_t x = 0; x < num; x += Lanes(d)) {
-    auto v = Load(d, in + x);
-    // Clamp turns NaN to 'min'.
-    v = Clamp(v, Zero(d), one);
-    auto i = NearestInt(Mul(v, scale));
-    Store(BitCast(du, i), du, out + x);
-  }
-
-  // Poison back the output.
-  msan::PoisonMemory(out + num, sizeof(out[0]) * (num_round_up - num));
-}
-
-void FloatToF16(const float* in, hwy::float16_t* out, size_t num) {
-  const HWY_FULL(float) d;
-  const hwy::HWY_NAMESPACE::Rebind<hwy::float16_t, decltype(d)> du;
-
-  // Unpoison accessing partially-uninitialized vectors with memory sanitizer.
-  // This is because we run DemoteTo() on the vector which triggers msan.
-  const size_t num_round_up = RoundUpTo(num, Lanes(d));
-  msan::UnpoisonMemory(in + num, sizeof(in[0]) * (num_round_up - num));
-
-  for (size_t x = 0; x < num; x += Lanes(d)) {
-    auto v = Load(d, in + x);
-    auto v16 = DemoteTo(du, v);
-    Store(v16, du, out + x);
-  }
-
-  // Poison back the output.
-  msan::PoisonMemory(out + num, sizeof(out[0]) * (num_round_up - num));
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-
-namespace jxl {
-namespace {
-
-// Stores a float in big endian
-void StoreBEFloat(float value, uint8_t* p) {
-  uint32_t u;
-  memcpy(&u, &value, 4);
-  StoreBE32(u, p);
-}
-
-// Stores a float in little endian
-void StoreLEFloat(float value, uint8_t* p) {
-  uint32_t u;
-  memcpy(&u, &value, 4);
-  StoreLE32(u, p);
-}
-
-// The orientation may not be identity.
-// TODO(lode): SIMDify where possible
-template <typename T>
-Status UndoOrientation(jxl::Orientation undo_orientation, const Plane<T>& image,
-                       Plane<T>& out, jxl::ThreadPool* pool) {
-  const size_t xsize = image.xsize();
-  const size_t ysize = image.ysize();
-  JxlMemoryManager* memory_manager = image.memory_manager();
-
-  if (undo_orientation == Orientation::kFlipHorizontal) {
-    JXL_ASSIGN_OR_RETURN(out, Plane<T>::Create(memory_manager, xsize, ysize));
-    const auto process_row = [&](const uint32_t task,
-                                 size_t /*thread*/) -> Status {
-      const int64_t y = task;
-      const T* JXL_RESTRICT row_in = image.Row(y);
-      T* JXL_RESTRICT row_out = out.Row(y);
-      for (size_t x = 0; x < xsize; ++x) {
-        row_out[xsize - x - 1] = row_in[x];
-      }
-      return true;
-    };
-    JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, static_cast<uint32_t>(ysize),
-                                  ThreadPool::NoInit, process_row,
-                                  "UndoOrientation"));
-  } else if (undo_orientation == Orientation::kRotate180) {
-    JXL_ASSIGN_OR_RETURN(out, Plane<T>::Create(memory_manager, xsize, ysize));
-    const auto process_row = [&](const uint32_t task,
-                                 size_t /*thread*/) -> Status {
-      const int64_t y = task;
-      const T* JXL_RESTRICT row_in = image.Row(y);
-      T* JXL_RESTRICT row_out = out.Row(ysize - y - 1);
-      for (size_t x = 0; x < xsize; ++x) {
-        row_out[xsize - x - 1] = row_in[x];
-      }
-      return true;
-    };
-    JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, static_cast<uint32_t>(ysize),
-                                  ThreadPool::NoInit, process_row,
-                                  "UndoOrientation"));
-  } else if (undo_orientation == Orientation::kFlipVertical) {
-    JXL_ASSIGN_OR_RETURN(out, Plane<T>::Create(memory_manager, xsize, ysize));
-    const auto process_row = [&](const uint32_t task,
-                                 size_t /*thread*/) -> Status {
-      const int64_t y = task;
-      const T* JXL_RESTRICT row_in = image.Row(y);
-      T* JXL_RESTRICT row_out = out.Row(ysize - y - 1);
-      for (size_t x = 0; x < xsize; ++x) {
-        row_out[x] = row_in[x];
-      }
-      return true;
-    };
-    JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, static_cast<uint32_t>(ysize),
-                                  ThreadPool::NoInit, process_row,
-                                  "UndoOrientation"));
-  } else if (undo_orientation == Orientation::kTranspose) {
-    JXL_ASSIGN_OR_RETURN(out, Plane<T>::Create(memory_manager, ysize, xsize));
-    const auto process_row = [&](const uint32_t task,
-                                 size_t /*thread*/) -> Status {
-      const int64_t y = task;
-      const T* JXL_RESTRICT row_in = image.Row(y);
-      for (size_t x = 0; x < xsize; ++x) {
-        out.Row(x)[y] = row_in[x];
-      }
-      return true;
-    };
-    JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, static_cast<uint32_t>(ysize),
-                                  ThreadPool::NoInit, process_row,
-                                  "UndoOrientation"));
-  } else if (undo_orientation == Orientation::kRotate90) {
-    JXL_ASSIGN_OR_RETURN(out, Plane<T>::Create(memory_manager, ysize, xsize));
-    const auto process_row = [&](const uint32_t task,
-                                 size_t /*thread*/) -> Status {
-      const int64_t y = task;
-      const T* JXL_RESTRICT row_in = image.Row(y);
-      for (size_t x = 0; x < xsize; ++x) {
-        out.Row(x)[ysize - y - 1] = row_in[x];
-      }
-      return true;
-    };
-    JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, static_cast<uint32_t>(ysize),
-                                  ThreadPool::NoInit, process_row,
-                                  "UndoOrientation"));
-  } else if (undo_orientation == Orientation::kAntiTranspose) {
-    JXL_ASSIGN_OR_RETURN(out, Plane<T>::Create(memory_manager, ysize, xsize));
-    const auto process_row = [&](const uint32_t task,
-                                 size_t /*thread*/) -> Status {
-      const int64_t y = task;
-      const T* JXL_RESTRICT row_in = image.Row(y);
-      for (size_t x = 0; x < xsize; ++x) {
-        out.Row(xsize - x - 1)[ysize - y - 1] = row_in[x];
-      }
-      return true;
-    };
-    JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, static_cast<uint32_t>(ysize),
-                                  ThreadPool::NoInit, process_row,
-                                  "UndoOrientation"));
-  } else if (undo_orientation == Orientation::kRotate270) {
-    JXL_ASSIGN_OR_RETURN(out, Plane<T>::Create(memory_manager, ysize, xsize));
-    const auto process_row = [&](const uint32_t task,
-                                 size_t /*thread*/) -> Status {
-      const int64_t y = task;
-      const T* JXL_RESTRICT row_in = image.Row(y);
-      for (size_t x = 0; x < xsize; ++x) {
-        out.Row(xsize - x - 1)[y] = row_in[x];
-      }
-      return true;
-    };
-    JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, static_cast<uint32_t>(ysize),
-                                  ThreadPool::NoInit, process_row,
-                                  "UndoOrientation"));
-  }
-  return true;
-}
-}  // namespace
-
-HWY_EXPORT(FloatToU32);
-HWY_EXPORT(FloatToF16);
-
-namespace {
-
-using StoreFuncType = void(uint32_t value, uint8_t* dest);
-template <StoreFuncType StoreFunc>
-void StoreUintRow(uint32_t* JXL_RESTRICT* rows_u32, size_t num_channels,
-                  size_t xsize, size_t bytes_per_sample,
-                  uint8_t* JXL_RESTRICT out) {
-  for (size_t x = 0; x < xsize; ++x) {
-    for (size_t c = 0; c < num_channels; c++) {
-      StoreFunc(rows_u32[c][x],
-                out + (num_channels * x + c) * bytes_per_sample);
-    }
-  }
-}
-
-template <void(StoreFunc)(float, uint8_t*)>
-void StoreFloatRow(const float* JXL_RESTRICT* rows_in, size_t num_channels,
-                   size_t xsize, uint8_t* JXL_RESTRICT out) {
-  for (size_t x = 0; x < xsize; ++x) {
-    for (size_t c = 0; c < num_channels; c++) {
-      StoreFunc(rows_in[c][x], out + (num_channels * x + c) * sizeof(float));
-    }
-  }
-}
-
-void JXL_INLINE Store8(uint32_t value, uint8_t* dest) { *dest = value & 0xff; }
-
-}  // namespace
-
-Status ConvertChannelsToExternal(const ImageF* in_channels[],
-                                 size_t num_channels, size_t bits_per_sample,
-                                 bool float_out, JxlEndianness endianness,
-                                 size_t stride, jxl::ThreadPool* pool,
-                                 void* out_image, size_t out_size,
-                                 const PixelCallback& out_callback,
-                                 jxl::Orientation undo_orientation) {
-  JXL_ENSURE(num_channels != 0 && num_channels <= kConvertMaxChannels);
-  JXL_ENSURE(in_channels[0] != nullptr);
-  JxlMemoryManager* memory_manager = in_channels[0]->memory_manager();
-  JXL_ENSURE(float_out ? bits_per_sample == 16 || bits_per_sample == 32
-                       : bits_per_sample > 0 && bits_per_sample <= 16);
-  const bool has_out_image = (out_image != nullptr);
-  if (has_out_image == out_callback.IsPresent()) {
-    return JXL_FAILURE(
-        "Must provide either an out_image or an out_callback, but not both.");
-  }
-  std::vector<const ImageF*> channels;
-  channels.assign(in_channels, in_channels + num_channels);
-
-  const size_t bytes_per_channel = DivCeil(bits_per_sample, jxl::kBitsPerByte);
-  const size_t bytes_per_pixel = num_channels * bytes_per_channel;
-
-  std::vector<std::vector<uint8_t>> row_out_callback;
-  const auto FreeCallbackOpaque = [&out_callback](void* p) {
-    out_callback.destroy(p);
-  };
-  std::unique_ptr<void, decltype(FreeCallbackOpaque)> out_run_opaque(
-      nullptr, FreeCallbackOpaque);
-  auto InitOutCallback = [&](size_t num_threads) -> Status {
-    if (out_callback.IsPresent()) {
-      out_run_opaque.reset(out_callback.Init(num_threads, stride));
-      JXL_RETURN_IF_ERROR(out_run_opaque != nullptr);
-      row_out_callback.resize(num_threads);
-      for (size_t i = 0; i < num_threads; ++i) {
-        row_out_callback[i].resize(stride);
-      }
-    }
-    return true;
-  };
-
-  // Channels used to store the transformed original channels if needed.
-  ImageF temp_channels[kConvertMaxChannels];
-  if (undo_orientation != Orientation::kIdentity) {
-    for (size_t c = 0; c < num_channels; ++c) {
-      if (channels[c]) {
-        JXL_RETURN_IF_ERROR(UndoOrientation(undo_orientation, *channels[c],
-                                            temp_channels[c], pool));
-        channels[c] = &(temp_channels[c]);
-      }
-    }
-  }
-
-  // First channel may not be nullptr.
-  size_t xsize = channels[0]->xsize();
-  size_t ysize = channels[0]->ysize();
-  if (stride < bytes_per_pixel * xsize) {
-    return JXL_FAILURE("stride is smaller than scanline width in bytes: %" PRIuS
-                       " vs %" PRIuS,
-                       stride, bytes_per_pixel * xsize);
-  }
-  if (!out_callback.IsPresent() &&
-      out_size < (ysize - 1) * stride + bytes_per_pixel * xsize) {
-    return JXL_FAILURE("out_size is too small to store image");
-  }
-
-  const bool little_endian =
-      endianness == JXL_LITTLE_ENDIAN ||
-      (endianness == JXL_NATIVE_ENDIAN && IsLittleEndian());
-
-  // Handle the case where a channel is nullptr by creating a single row with
-  // ones to use instead.
-  ImageF ones;
-  for (size_t c = 0; c < num_channels; ++c) {
-    if (!channels[c]) {
-      JXL_ASSIGN_OR_RETURN(ones, ImageF::Create(memory_manager, xsize, 1));
-      FillImage(1.0f, &ones);
-      break;
-    }
-  }
-
-  if (float_out) {
-    if (bits_per_sample == 16) {
-      bool swap_endianness = little_endian != IsLittleEndian();
-      Plane<hwy::float16_t> f16_cache;
-      const auto init_cache = [&](size_t num_threads) -> Status {
-        JXL_ASSIGN_OR_RETURN(
-            f16_cache, Plane<hwy::float16_t>::Create(
-                           memory_manager, xsize, num_channels * num_threads));
-        JXL_RETURN_IF_ERROR(InitOutCallback(num_threads));
-        return true;
-      };
-      const auto process_row = [&](const uint32_t task,
-                                   const size_t thread) -> Status {
-        const int64_t y = task;
-        const float* JXL_RESTRICT row_in[kConvertMaxChannels];
-        for (size_t c = 0; c < num_channels; c++) {
-          row_in[c] = channels[c] ? channels[c]->Row(y) : ones.Row(0);
-        }
-        hwy::float16_t* JXL_RESTRICT row_f16[kConvertMaxChannels];
-        for (size_t c = 0; c < num_channels; c++) {
-          row_f16[c] = f16_cache.Row(c + thread * num_channels);
-          HWY_DYNAMIC_DISPATCH(FloatToF16)
-          (row_in[c], row_f16[c], xsize);
-        }
-        uint8_t* row_out =
-            out_callback.IsPresent()
-                ? row_out_callback[thread].data()
-                : &(reinterpret_cast<uint8_t*>(out_image))[stride * y];
-        // interleave the one scanline
-        hwy::float16_t* row_f16_out =
-            reinterpret_cast<hwy::float16_t*>(row_out);
-        for (size_t x = 0; x < xsize; x++) {
-          for (size_t c = 0; c < num_channels; c++) {
-            row_f16_out[x * num_channels + c] = row_f16[c][x];
-          }
-        }
-        if (swap_endianness) {
-          size_t size = xsize * num_channels * 2;
-          for (size_t i = 0; i < size; i += 2) {
-            std::swap(row_out[i + 0], row_out[i + 1]);
-          }
-        }
-        if (out_callback.IsPresent()) {
-          out_callback.run(out_run_opaque.get(), thread, 0, y, xsize, row_out);
-        }
-        return true;
-      };
-      JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, static_cast<uint32_t>(ysize),
-                                    init_cache, process_row, "ConvertF16"));
-    } else if (bits_per_sample == 32) {
-      const auto init_cache = [&](size_t num_threads) -> Status {
-        JXL_RETURN_IF_ERROR(InitOutCallback(num_threads));
-        return true;
-      };
-      const auto process_row = [&](const uint32_t task,
-                                   const size_t thread) -> Status {
-        const int64_t y = task;
-        uint8_t* row_out =
-            out_callback.IsPresent()
-                ? row_out_callback[thread].data()
-                : &(reinterpret_cast<uint8_t*>(out_image))[stride * y];
-        const float* JXL_RESTRICT row_in[kConvertMaxChannels];
-        for (size_t c = 0; c < num_channels; c++) {
-          row_in[c] = channels[c] ? channels[c]->Row(y) : ones.Row(0);
-        }
-        if (little_endian) {
-          StoreFloatRow<StoreLEFloat>(row_in, num_channels, xsize, row_out);
-        } else {
-          StoreFloatRow<StoreBEFloat>(row_in, num_channels, xsize, row_out);
-        }
-        if (out_callback.IsPresent()) {
-          out_callback.run(out_run_opaque.get(), thread, 0, y, xsize, row_out);
-        }
-        return true;
-      };
-      JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, static_cast<uint32_t>(ysize),
-                                    init_cache, process_row, "ConvertFloat"));
-    } else {
-      return JXL_FAILURE("float other than 16-bit and 32-bit not supported");
-    }
-  } else {
-    // Multiplier to convert from floating point 0-1 range to the integer
-    // range.
-    float mul = (1ull << bits_per_sample) - 1;
-    Plane<uint32_t> u32_cache;
-    const auto init_cache = [&](size_t num_threads) -> Status {
-      JXL_ASSIGN_OR_RETURN(u32_cache,
-                           Plane<uint32_t>::Create(memory_manager, xsize,
-                                                   num_channels * num_threads));
-      JXL_RETURN_IF_ERROR(InitOutCallback(num_threads));
-      return true;
-    };
-    const auto process_row = [&](const uint32_t task,
-                                 const size_t thread) -> Status {
-      const int64_t y = task;
-      uint8_t* row_out =
-          out_callback.IsPresent()
-              ? row_out_callback[thread].data()
-              : &(reinterpret_cast<uint8_t*>(out_image))[stride * y];
-      const float* JXL_RESTRICT row_in[kConvertMaxChannels];
-      for (size_t c = 0; c < num_channels; c++) {
-        row_in[c] = channels[c] ? channels[c]->Row(y) : ones.Row(0);
-      }
-      uint32_t* JXL_RESTRICT row_u32[kConvertMaxChannels];
-      for (size_t c = 0; c < num_channels; c++) {
-        row_u32[c] = u32_cache.Row(c + thread * num_channels);
-        // row_u32[] is a per-thread temporary row storage, this isn't
-        // intended to be initialized on a previous run.
-        msan::PoisonMemory(row_u32[c], xsize * sizeof(row_u32[c][0]));
-        HWY_DYNAMIC_DISPATCH(FloatToU32)
-        (row_in[c], row_u32[c], xsize, mul, bits_per_sample);
-      }
-      if (bits_per_sample <= 8) {
-        StoreUintRow<Store8>(row_u32, num_channels, xsize, 1, row_out);
-      } else {
-        if (little_endian) {
-          StoreUintRow<StoreLE16>(row_u32, num_channels, xsize, 2, row_out);
-        } else {
-          StoreUintRow<StoreBE16>(row_u32, num_channels, xsize, 2, row_out);
-        }
-      }
-      if (out_callback.IsPresent()) {
-        out_callback.run(out_run_opaque.get(), thread, 0, y, xsize, row_out);
-      }
-      return true;
-    };
-    JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, static_cast<uint32_t>(ysize),
-                                  init_cache, process_row, "ConvertUint"));
-  }
-  return true;
-}
-
-Status ConvertToExternal(const jxl::ImageBundle& ib, size_t bits_per_sample,
-                         bool float_out, size_t num_channels,
-                         JxlEndianness endianness, size_t stride,
-                         jxl::ThreadPool* pool, void* out_image,
-                         size_t out_size, const PixelCallback& out_callback,
-                         jxl::Orientation undo_orientation,
-                         bool unpremul_alpha) {
-  bool want_alpha = num_channels == 2 || num_channels == 4;
-  size_t color_channels = num_channels <= 2 ? 1 : 3;
-
-  const Image3F* color = &ib.color();
-  JxlMemoryManager* memory_manager = color->memory_manager();
-  // Undo premultiplied alpha.
-  Image3F unpremul;
-  if (ib.AlphaIsPremultiplied() && ib.HasAlpha() && unpremul_alpha) {
-    JXL_ASSIGN_OR_RETURN(
-        unpremul,
-        Image3F::Create(memory_manager, color->xsize(), color->ysize()));
-    JXL_RETURN_IF_ERROR(CopyImageTo(*color, &unpremul));
-    const ImageF* alpha = ib.alpha();
-    for (size_t y = 0; y < unpremul.ysize(); y++) {
-      UnpremultiplyAlpha(unpremul.PlaneRow(0, y), unpremul.PlaneRow(1, y),
-                         unpremul.PlaneRow(2, y), alpha->Row(y),
-                         unpremul.xsize());
-    }
-    color = &unpremul;
-  }
-
-  const ImageF* channels[kConvertMaxChannels];
-  size_t c = 0;
-  for (; c < color_channels; c++) {
-    channels[c] = &color->Plane(c);
-  }
-  if (want_alpha) {
-    channels[c++] = ib.alpha();
-  }
-  JXL_ENSURE(num_channels == c);
-
-  return ConvertChannelsToExternal(
-      channels, num_channels, bits_per_sample, float_out, endianness, stride,
-      pool, out_image, out_size, out_callback, undo_orientation);
-}
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/dec_external_image.h b/third_party/jpeg-xl/lib/jxl/dec_external_image.h
deleted file mode 100644
index 7a29981694a56..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_external_image.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_DEC_EXTERNAL_IMAGE_H_
-#define LIB_JXL_DEC_EXTERNAL_IMAGE_H_
-
-// Interleaved image for color transforms and Codec.
-
-#include <jxl/types.h>
-#include <stddef.h>
-
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_cache.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_metadata.h"
-
-namespace jxl {
-
-// Maximum number of channels for the ConvertChannelsToExternal function.
-const size_t kConvertMaxChannels = 4;
-
-// Converts a list of channels to an interleaved image, applying transformations
-// when needed.
-// The input channels are given as a (non-const!) array of channel pointers and
-// interleaved in that order.
-//
-// Note: if a pointer in channels[] is nullptr, a 1.0 value will be used
-// instead. This is useful for handling when a user requests an alpha channel
-// from an image that doesn't have one. The first channel in the list may not
-// be nullptr, since it is used to determine the image size.
-Status ConvertChannelsToExternal(const ImageF* in_channels[],
-                                 size_t num_channels, size_t bits_per_sample,
-                                 bool float_out, JxlEndianness endianness,
-                                 size_t stride, jxl::ThreadPool* pool,
-                                 void* out_image, size_t out_size,
-                                 const PixelCallback& out_callback,
-                                 jxl::Orientation undo_orientation);
-
-// Converts ib to interleaved void* pixel buffer with the given format.
-// bits_per_sample: must be 16 or 32 if float_out is true, and at most 16
-// if it is false. No bit packing is done.
-// num_channels: must be 1, 2, 3 or 4 for gray, gray+alpha, RGB, RGB+alpha.
-// This supports the features needed for the C API and does not perform
-// color space conversion.
-// TODO(lode): support rectangle crop.
-// stride_out is output scanline size in bytes, must be >=
-// output_xsize * output_bytes_per_pixel.
-// undo_orientation is an EXIF orientation to undo. Depending on the
-// orientation, the output xsize and ysize are swapped compared to input
-// xsize and ysize.
-Status ConvertToExternal(const jxl::ImageBundle& ib, size_t bits_per_sample,
-                         bool float_out, size_t num_channels,
-                         JxlEndianness endianness, size_t stride_out,
-                         jxl::ThreadPool* thread_pool, void* out_image,
-                         size_t out_size, const PixelCallback& out_callback,
-                         jxl::Orientation undo_orientation,
-                         bool unpremul_alpha = false);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_DEC_EXTERNAL_IMAGE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/dec_external_image_gbench.cc b/third_party/jpeg-xl/lib/jxl/dec_external_image_gbench.cc
deleted file mode 100644
index 670f403668cdb..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_external_image_gbench.cc
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/memory_manager.h>
-
-#include "benchmark/benchmark.h"
-#include "lib/jxl/dec_external_image.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_ops.h"
-#include "tools/no_memory_manager.h"
-
-namespace jxl {
-namespace {
-
-#define QUIT(M)           \
-  state.SkipWithError(M); \
-  return;
-
-#define BM_CHECK(C) \
-  if (!(C)) {       \
-    QUIT(#C)        \
-  }
-
-// Decoder case, interleaves an internal float image.
-void BM_DecExternalImage_ConvertImageRGBA(benchmark::State& state) {
-  JxlMemoryManager* memory_manager = jpegxl::tools::NoMemoryManager();
-  const size_t kNumIter = 5;
-  size_t xsize = state.range();
-  size_t ysize = state.range();
-  size_t num_channels = 4;
-
-  ImageMetadata im;
-  im.SetAlphaBits(8);
-  ImageBundle ib(memory_manager, &im);
-  JXL_ASSIGN_OR_QUIT(Image3F color,
-                     Image3F::Create(memory_manager, xsize, ysize),
-                     "Failed to allocate color plane.");
-  ZeroFillImage(&color);
-  BM_CHECK(ib.SetFromImage(std::move(color), ColorEncoding::SRGB()));
-  JXL_ASSIGN_OR_QUIT(ImageF alpha, ImageF::Create(memory_manager, xsize, ysize),
-                     "Failed to allocate alpha plane.");
-  ZeroFillImage(&alpha);
-  BM_CHECK(ib.SetAlpha(std::move(alpha)));
-
-  const size_t bytes_per_row = xsize * num_channels;
-  std::vector<uint8_t> interleaved(bytes_per_row * ysize);
-
-  for (auto _ : state) {
-    (void)_;
-    for (size_t i = 0; i < kNumIter; ++i) {
-      BM_CHECK(ConvertToExternal(
-          ib,
-          /*bits_per_sample=*/8,
-          /*float_out=*/false, num_channels, JXL_NATIVE_ENDIAN,
-          /*stride*/ bytes_per_row,
-          /*thread_pool=*/nullptr, interleaved.data(), interleaved.size(),
-          /*out_callback=*/{},
-          /*undo_orientation=*/jxl::Orientation::kIdentity));
-    }
-  }
-
-  // Pixels per second.
-  state.SetItemsProcessed(kNumIter * state.iterations() * xsize * ysize);
-  state.SetBytesProcessed(kNumIter * state.iterations() * interleaved.size());
-}
-
-BENCHMARK(BM_DecExternalImage_ConvertImageRGBA)
-    ->RangeMultiplier(2)
-    ->Range(256, 2048);
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/dec_frame.cc b/third_party/jpeg-xl/lib/jxl/dec_frame.cc
deleted file mode 100644
index 04c3ee0c9c2f0..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_frame.cc
+++ /dev/null
@@ -1,880 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/dec_frame.h"
-
-#include <jxl/decode.h>
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/ac_context.h"
-#include "lib/jxl/ac_strategy.h"
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/chroma_from_luma.h"
-#include "lib/jxl/coeff_order.h"
-#include "lib/jxl/coeff_order_fwd.h"
-#include "lib/jxl/common.h"  // kMaxNumPasses
-#include "lib/jxl/compressed_dc.h"
-#include "lib/jxl/dct_util.h"
-#include "lib/jxl/dec_ans.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/dec_cache.h"
-#include "lib/jxl/dec_group.h"
-#include "lib/jxl/dec_modular.h"
-#include "lib/jxl/dec_noise.h"
-#include "lib/jxl/dec_patch_dictionary.h"
-#include "lib/jxl/entropy_coder.h"
-#include "lib/jxl/epf.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/jpeg/jpeg_data.h"
-#include "lib/jxl/loop_filter.h"
-#include "lib/jxl/passes_state.h"
-#include "lib/jxl/quant_weights.h"
-#include "lib/jxl/quantizer.h"
-#include "lib/jxl/render_pipeline/render_pipeline.h"
-#include "lib/jxl/splines.h"
-#include "lib/jxl/toc.h"
-
-namespace jxl {
-
-namespace {
-Status DecodeGlobalDCInfo(BitReader* reader, bool is_jpeg,
-                          PassesDecoderState* state, ThreadPool* pool) {
-  JXL_RETURN_IF_ERROR(state->shared_storage.quantizer.Decode(reader));
-
-  JXL_RETURN_IF_ERROR(DecodeBlockCtxMap(state->memory_manager(), reader,
-                                        &state->shared_storage.block_ctx_map));
-
-  JXL_RETURN_IF_ERROR(state->shared_storage.cmap.DecodeDC(reader));
-
-  // Pre-compute info for decoding a group.
-  if (is_jpeg) {
-    state->shared_storage.quantizer.ClearDCMul();  // Don't dequant DC
-  }
-
-  state->shared_storage.ac_strategy.FillInvalid();
-  return true;
-}
-}  // namespace
-
-Status DecodeFrame(PassesDecoderState* dec_state, ThreadPool* JXL_RESTRICT pool,
-                   const uint8_t* next_in, size_t avail_in,
-                   FrameHeader* frame_header, ImageBundle* decoded,
-                   const CodecMetadata& metadata,
-                   bool use_slow_rendering_pipeline) {
-  FrameDecoder frame_decoder(dec_state, metadata, pool,
-                             use_slow_rendering_pipeline);
-
-  BitReader reader(Bytes(next_in, avail_in));
-  JXL_RETURN_IF_ERROR(frame_decoder.InitFrame(&reader, decoded,
-                                              /*is_preview=*/false));
-  JXL_RETURN_IF_ERROR(frame_decoder.InitFrameOutput());
-  if (frame_header) {
-    *frame_header = frame_decoder.GetFrameHeader();
-  }
-
-  JXL_RETURN_IF_ERROR(reader.AllReadsWithinBounds());
-  size_t header_bytes = reader.TotalBitsConsumed() / kBitsPerByte;
-  JXL_RETURN_IF_ERROR(reader.Close());
-
-  size_t processed_bytes = header_bytes;
-  Status close_ok = true;
-  std::vector<std::unique_ptr<BitReader>> section_readers;
-  {
-    std::vector<std::unique_ptr<BitReaderScopedCloser>> section_closers;
-    std::vector<FrameDecoder::SectionInfo> section_info;
-    std::vector<FrameDecoder::SectionStatus> section_status;
-    size_t pos = header_bytes;
-    size_t index = 0;
-    for (auto toc_entry : frame_decoder.Toc()) {
-      JXL_RETURN_IF_ERROR(pos + toc_entry.size <= avail_in);
-      auto br = make_unique<BitReader>(Bytes(next_in + pos, toc_entry.size));
-      section_info.emplace_back(
-          FrameDecoder::SectionInfo{br.get(), toc_entry.id, index++});
-      section_closers.emplace_back(
-          make_unique<BitReaderScopedCloser>(*br, close_ok));
-      section_readers.emplace_back(std::move(br));
-      pos += toc_entry.size;
-    }
-    section_status.resize(section_info.size());
-    JXL_RETURN_IF_ERROR(frame_decoder.ProcessSections(
-        section_info.data(), section_info.size(), section_status.data()));
-    for (size_t i = 0; i < section_status.size(); i++) {
-      JXL_RETURN_IF_ERROR(section_status[i] == FrameDecoder::kDone);
-      processed_bytes += frame_decoder.Toc()[i].size;
-    }
-  }
-  JXL_RETURN_IF_ERROR(close_ok);
-  JXL_RETURN_IF_ERROR(frame_decoder.FinalizeFrame());
-  decoded->SetDecodedBytes(processed_bytes);
-  return true;
-}
-
-Status FrameDecoder::InitFrame(BitReader* JXL_RESTRICT br, ImageBundle* decoded,
-                               bool is_preview) {
-  decoded_ = decoded;
-  JXL_ENSURE(is_finalized_);
-  JxlMemoryManager* memory_manager = decoded_->memory_manager();
-
-  // Reset the dequantization matrices to their default values.
-  dec_state_->shared_storage.matrices = DequantMatrices();
-
-  frame_header_.nonserialized_is_preview = is_preview;
-  JXL_ENSURE(frame_header_.nonserialized_metadata != nullptr);
-  JXL_RETURN_IF_ERROR(ReadFrameHeader(br, &frame_header_));
-  frame_dim_ = frame_header_.ToFrameDimensions();
-  JXL_DEBUG_V(2, "FrameHeader: %s", frame_header_.DebugString().c_str());
-
-  const size_t num_passes = frame_header_.passes.num_passes;
-  const size_t num_groups = frame_dim_.num_groups;
-
-  // If the previous frame was not a kRegularFrame, `decoded` may have different
-  // dimensions; must reset to avoid errors.
-  decoded->RemoveColor();
-  decoded->ClearExtraChannels();
-
-  decoded->duration = frame_header_.animation_frame.duration;
-
-  if (!frame_header_.nonserialized_is_preview &&
-      (frame_header_.is_last || frame_header_.animation_frame.duration > 0) &&
-      (frame_header_.frame_type == kRegularFrame ||
-       frame_header_.frame_type == kSkipProgressive)) {
-    ++dec_state_->visible_frame_index;
-    dec_state_->nonvisible_frame_index = 0;
-  } else {
-    ++dec_state_->nonvisible_frame_index;
-  }
-
-  // Read TOC.
-  const size_t toc_entries =
-      NumTocEntries(num_groups, frame_dim_.num_dc_groups, num_passes);
-  std::vector<uint32_t> sizes;
-  std::vector<coeff_order_t> permutation;
-  JXL_RETURN_IF_ERROR(
-      ReadToc(memory_manager, toc_entries, br, &sizes, &permutation));
-  bool have_permutation = !permutation.empty();
-  toc_.resize(toc_entries);
-  section_sizes_sum_ = 0;
-  for (size_t i = 0; i < toc_entries; ++i) {
-    toc_[i].size = sizes[i];
-    size_t index = have_permutation ? permutation[i] : i;
-    toc_[index].id = i;
-    if (section_sizes_sum_ + toc_[i].size < section_sizes_sum_) {
-      return JXL_FAILURE("group offset overflow");
-    }
-    section_sizes_sum_ += toc_[i].size;
-  }
-
-  if (JXL_DEBUG_V_LEVEL >= 3) {
-    for (size_t i = 0; i < toc_entries; ++i) {
-      JXL_DEBUG_V(3, "TOC entry %" PRIuS " size %" PRIuS " id %" PRIuS "", i,
-                  toc_[i].size, toc_[i].id);
-    }
-  }
-
-  JXL_ENSURE((br->TotalBitsConsumed() % kBitsPerByte) == 0);
-  const size_t group_codes_begin = br->TotalBitsConsumed() / kBitsPerByte;
-  JXL_ENSURE(!toc_.empty());
-
-  // Overflow check.
-  if (group_codes_begin + section_sizes_sum_ < group_codes_begin) {
-    return JXL_FAILURE("Invalid group codes");
-  }
-
-  if (!frame_header_.chroma_subsampling.Is444() &&
-      !(frame_header_.flags & FrameHeader::kSkipAdaptiveDCSmoothing) &&
-      frame_header_.encoding == FrameEncoding::kVarDCT) {
-    return JXL_FAILURE(
-        "Non-444 chroma subsampling is not allowed when adaptive DC "
-        "smoothing is enabled");
-  }
-  return true;
-}
-
-Status FrameDecoder::InitFrameOutput() {
-  JXL_RETURN_IF_ERROR(
-      InitializePassesSharedState(frame_header_, &dec_state_->shared_storage));
-  JXL_RETURN_IF_ERROR(dec_state_->Init(frame_header_));
-  modular_frame_decoder_.Init(frame_dim_);
-
-  if (decoded_->IsJPEG()) {
-    if (frame_header_.encoding == FrameEncoding::kModular) {
-      return JXL_FAILURE("Cannot output JPEG from Modular");
-    }
-    jpeg::JPEGData* jpeg_data = decoded_->jpeg_data.get();
-    size_t num_components = jpeg_data->components.size();
-    if (num_components != 1 && num_components != 3) {
-      return JXL_FAILURE("Invalid number of components");
-    }
-    if (frame_header_.nonserialized_metadata->m.xyb_encoded) {
-      return JXL_FAILURE("Cannot decode to JPEG an XYB image");
-    }
-    auto jpeg_c_map = JpegOrder(ColorTransform::kYCbCr, num_components == 1);
-    decoded_->jpeg_data->width = frame_dim_.xsize;
-    decoded_->jpeg_data->height = frame_dim_.ysize;
-    for (size_t c = 0; c < num_components; c++) {
-      auto& component = jpeg_data->components[jpeg_c_map[c]];
-      component.width_in_blocks =
-          frame_dim_.xsize_blocks >> frame_header_.chroma_subsampling.HShift(c);
-      component.height_in_blocks =
-          frame_dim_.ysize_blocks >> frame_header_.chroma_subsampling.VShift(c);
-      component.h_samp_factor =
-          1 << frame_header_.chroma_subsampling.RawHShift(c);
-      component.v_samp_factor =
-          1 << frame_header_.chroma_subsampling.RawVShift(c);
-      component.coeffs.resize(component.width_in_blocks *
-                              component.height_in_blocks * jxl::kDCTBlockSize);
-    }
-  }
-
-  // Clear the state.
-  decoded_dc_global_ = false;
-  decoded_ac_global_ = false;
-  is_finalized_ = false;
-  finalized_dc_ = false;
-  num_sections_done_ = 0;
-  decoded_dc_groups_.clear();
-  decoded_dc_groups_.resize(frame_dim_.num_dc_groups);
-  decoded_passes_per_ac_group_.clear();
-  decoded_passes_per_ac_group_.resize(frame_dim_.num_groups, 0);
-  processed_section_.clear();
-  processed_section_.resize(toc_.size());
-  allocated_ = false;
-  return true;
-}
-
-Status FrameDecoder::ProcessDCGlobal(BitReader* br) {
-  PassesSharedState& shared = dec_state_->shared_storage;
-  JxlMemoryManager* memory_manager = shared.memory_manager;
-  if (frame_header_.flags & FrameHeader::kPatches) {
-    bool uses_extra_channels = false;
-    JXL_RETURN_IF_ERROR(shared.image_features.patches.Decode(
-        memory_manager, br, frame_dim_.xsize_padded, frame_dim_.ysize_padded,
-        shared.metadata->m.num_extra_channels, &uses_extra_channels));
-    if (uses_extra_channels && frame_header_.upsampling != 1) {
-      for (size_t ecups : frame_header_.extra_channel_upsampling) {
-        if (ecups != frame_header_.upsampling) {
-          return JXL_FAILURE(
-              "Cannot use extra channels in patches if color channels are "
-              "subsampled differently from extra channels");
-        }
-      }
-    }
-  } else {
-    shared.image_features.patches.Clear();
-  }
-  shared.image_features.splines.Clear();
-  if (frame_header_.flags & FrameHeader::kSplines) {
-    JXL_RETURN_IF_ERROR(shared.image_features.splines.Decode(
-        memory_manager, br, frame_dim_.xsize * frame_dim_.ysize));
-  }
-  if (frame_header_.flags & FrameHeader::kNoise) {
-    JXL_RETURN_IF_ERROR(DecodeNoise(br, &shared.image_features.noise_params));
-  }
-  JXL_RETURN_IF_ERROR(dec_state_->shared_storage.matrices.DecodeDC(br));
-
-  if (frame_header_.encoding == FrameEncoding::kVarDCT) {
-    JXL_RETURN_IF_ERROR(
-        jxl::DecodeGlobalDCInfo(br, decoded_->IsJPEG(), dec_state_, pool_));
-  }
-  // Splines' draw cache uses the color correlation map.
-  if (frame_header_.flags & FrameHeader::kSplines) {
-    JXL_RETURN_IF_ERROR(shared.image_features.splines.InitializeDrawCache(
-        frame_dim_.xsize_upsampled, frame_dim_.ysize_upsampled,
-        dec_state_->shared->cmap.base()));
-  }
-  Status dec_status = modular_frame_decoder_.DecodeGlobalInfo(
-      br, frame_header_, /*allow_truncated_group=*/false);
-  if (dec_status.IsFatalError()) return dec_status;
-  if (dec_status) {
-    decoded_dc_global_ = true;
-  }
-  return dec_status;
-}
-
-Status FrameDecoder::ProcessDCGroup(size_t dc_group_id, BitReader* br) {
-  const size_t gx = dc_group_id % frame_dim_.xsize_dc_groups;
-  const size_t gy = dc_group_id / frame_dim_.xsize_dc_groups;
-  const LoopFilter& lf = frame_header_.loop_filter;
-  if (frame_header_.encoding == FrameEncoding::kVarDCT &&
-      !(frame_header_.flags & FrameHeader::kUseDcFrame)) {
-    JXL_RETURN_IF_ERROR(modular_frame_decoder_.DecodeVarDCTDC(
-        frame_header_, dc_group_id, br, dec_state_));
-  }
-  const Rect mrect(gx * frame_dim_.dc_group_dim, gy * frame_dim_.dc_group_dim,
-                   frame_dim_.dc_group_dim, frame_dim_.dc_group_dim);
-  JXL_RETURN_IF_ERROR(modular_frame_decoder_.DecodeGroup(
-      frame_header_, mrect, br, 3, 1000,
-      ModularStreamId::ModularDC(dc_group_id),
-      /*zerofill=*/false, nullptr, nullptr,
-      /*allow_truncated=*/false));
-  if (frame_header_.encoding == FrameEncoding::kVarDCT) {
-    JXL_RETURN_IF_ERROR(modular_frame_decoder_.DecodeAcMetadata(
-        frame_header_, dc_group_id, br, dec_state_));
-  } else if (lf.epf_iters > 0) {
-    FillImage(kInvSigmaNum / lf.epf_sigma_for_modular, &dec_state_->sigma);
-  }
-  decoded_dc_groups_[dc_group_id] = JXL_TRUE;
-  return true;
-}
-
-Status FrameDecoder::FinalizeDC() {
-  // Do Adaptive DC smoothing if enabled. This *must* happen between all the
-  // ProcessDCGroup and ProcessACGroup.
-  JxlMemoryManager* memory_manager = dec_state_->memory_manager();
-  if (frame_header_.encoding == FrameEncoding::kVarDCT &&
-      !(frame_header_.flags & FrameHeader::kSkipAdaptiveDCSmoothing) &&
-      !(frame_header_.flags & FrameHeader::kUseDcFrame)) {
-    JXL_RETURN_IF_ERROR(AdaptiveDCSmoothing(
-        memory_manager, dec_state_->shared->quantizer.MulDC(),
-        &dec_state_->shared_storage.dc_storage, pool_));
-  }
-
-  finalized_dc_ = true;
-  return true;
-}
-
-Status FrameDecoder::AllocateOutput() {
-  if (allocated_) return true;
-  modular_frame_decoder_.MaybeDropFullImage();
-  decoded_->origin = frame_header_.frame_origin;
-  JXL_RETURN_IF_ERROR(
-      dec_state_->InitForAC(frame_header_.passes.num_passes, nullptr));
-  allocated_ = true;
-  return true;
-}
-
-Status FrameDecoder::ProcessACGlobal(BitReader* br) {
-  JXL_ENSURE(finalized_dc_);
-  JxlMemoryManager* memory_manager = dec_state_->memory_manager();
-
-  // Decode AC group.
-  if (frame_header_.encoding == FrameEncoding::kVarDCT) {
-    JXL_RETURN_IF_ERROR(dec_state_->shared_storage.matrices.Decode(
-        memory_manager, br, &modular_frame_decoder_));
-    JXL_RETURN_IF_ERROR(dec_state_->shared_storage.matrices.EnsureComputed(
-        memory_manager, dec_state_->used_acs));
-
-    size_t num_histo_bits =
-        CeilLog2Nonzero(dec_state_->shared->frame_dim.num_groups);
-    dec_state_->shared_storage.num_histograms =
-        1 + br->ReadBits(num_histo_bits);
-
-    JXL_DEBUG_V(3,
-                "Processing AC global with %d passes and %" PRIuS
-                " sets of histograms",
-                frame_header_.passes.num_passes,
-                dec_state_->shared_storage.num_histograms);
-
-    dec_state_->code.resize(kMaxNumPasses);
-    dec_state_->context_map.resize(kMaxNumPasses);
-    // Read coefficient orders and histograms.
-    size_t max_num_bits_ac = 0;
-    for (size_t i = 0; i < frame_header_.passes.num_passes; i++) {
-      uint16_t used_orders = U32Coder::Read(kOrderEnc, br);
-      JXL_RETURN_IF_ERROR(DecodeCoeffOrders(
-          memory_manager, used_orders, dec_state_->used_acs,
-          &dec_state_->shared_storage
-               .coeff_orders[i * dec_state_->shared_storage.coeff_order_size],
-          br));
-      size_t num_contexts =
-          dec_state_->shared->num_histograms *
-          dec_state_->shared_storage.block_ctx_map.NumACContexts();
-      JXL_RETURN_IF_ERROR(DecodeHistograms(memory_manager, br, num_contexts,
-                                           &dec_state_->code[i],
-                                           &dec_state_->context_map[i]));
-      // Add extra values to enable the cheat in hot loop of DecodeACVarBlock.
-      dec_state_->context_map[i].resize(
-          num_contexts + kZeroDensityContextLimit - kZeroDensityContextCount);
-      max_num_bits_ac =
-          std::max(max_num_bits_ac, dec_state_->code[i].max_num_bits);
-    }
-    max_num_bits_ac += CeilLog2Nonzero(frame_header_.passes.num_passes);
-    // 16-bit buffer for decoding to JPEG are not implemented.
-    // TODO(veluca): figure out the exact limit - 16 should still work with
-    // 16-bit buffers, but we are excluding it for safety.
-    bool use_16_bit = max_num_bits_ac < 16 && !decoded_->IsJPEG();
-    bool store = frame_header_.passes.num_passes > 1;
-    size_t xs = store ? kGroupDim * kGroupDim : 0;
-    size_t ys = store ? frame_dim_.num_groups : 0;
-    if (use_16_bit) {
-      JXL_ASSIGN_OR_RETURN(dec_state_->coefficients,
-                           ACImageT<int16_t>::Make(memory_manager, xs, ys));
-    } else {
-      JXL_ASSIGN_OR_RETURN(dec_state_->coefficients,
-                           ACImageT<int32_t>::Make(memory_manager, xs, ys));
-    }
-    if (store) {
-      dec_state_->coefficients->ZeroFill();
-    }
-  }
-
-  // Set JPEG decoding data.
-  if (decoded_->IsJPEG()) {
-    decoded_->color_transform = frame_header_.color_transform;
-    decoded_->chroma_subsampling = frame_header_.chroma_subsampling;
-    const std::vector<QuantEncoding>& qe =
-        dec_state_->shared_storage.matrices.encodings();
-    if (qe.empty() || qe[0].mode != QuantEncoding::Mode::kQuantModeRAW ||
-        std::abs(qe[0].qraw.qtable_den - 1.f / (8 * 255)) > 1e-8f) {
-      return JXL_FAILURE(
-          "Quantization table is not a JPEG quantization table.");
-    }
-    jpeg::JPEGData* jpeg_data = decoded_->jpeg_data.get();
-    size_t num_components = jpeg_data->components.size();
-    bool is_gray = (num_components == 1);
-    JXL_ENSURE(frame_header_.color_transform != ColorTransform::kXYB);
-    auto jpeg_c_map = JpegOrder(frame_header_.color_transform, is_gray);
-    size_t qt_set = 0;
-    JXL_ENSURE(num_components <= 3);
-    JXL_ENSURE(qe[0].qraw.qtable->size() == 3 * 8 * 8);
-    int* qtable = qe[0].qraw.qtable->data();
-    for (size_t c = 0; c < num_components; c++) {
-      // TODO(eustas): why 1-st quant table for gray?
-      size_t quant_c = is_gray ? 1 : c;
-      size_t qpos = jpeg_data->components[jpeg_c_map[c]].quant_idx;
-      JXL_ENSURE(qpos != jpeg_data->quant.size());
-      qt_set |= 1 << qpos;
-      for (size_t x = 0; x < 8; x++) {
-        for (size_t y = 0; y < 8; y++) {
-          jpeg_data->quant[qpos].values[x * 8 + y] =
-              qtable[quant_c * 64 + y * 8 + x];
-        }
-      }
-    }
-    for (size_t i = 0; i < jpeg_data->quant.size(); i++) {
-      if (qt_set & (1 << i)) continue;
-      if (i == 0) return JXL_FAILURE("First quant table unused.");
-      // Unused quant table is set to copy of previous quant table
-      for (size_t j = 0; j < 64; j++) {
-        jpeg_data->quant[i].values[j] = jpeg_data->quant[i - 1].values[j];
-      }
-    }
-  }
-  decoded_ac_global_ = true;
-  return true;
-}
-
-Status FrameDecoder::ProcessACGroup(size_t ac_group_id,
-                                    BitReader* JXL_RESTRICT* br,
-                                    size_t num_passes, size_t thread,
-                                    bool force_draw, bool dc_only) {
-  size_t group_dim = frame_dim_.group_dim;
-  const size_t gx = ac_group_id % frame_dim_.xsize_groups;
-  const size_t gy = ac_group_id / frame_dim_.xsize_groups;
-  const size_t x = gx * group_dim;
-  const size_t y = gy * group_dim;
-  JxlMemoryManager* memory_manager = dec_state_->memory_manager();
-  JXL_DEBUG_V(3,
-              "Processing AC group %" PRIuS "(%" PRIuS ",%" PRIuS
-              ") group_dim: %" PRIuS " decoded passes: %u new passes: %" PRIuS,
-              ac_group_id, gx, gy, group_dim,
-              decoded_passes_per_ac_group_[ac_group_id], num_passes);
-
-  RenderPipelineInput render_pipeline_input =
-      dec_state_->render_pipeline->GetInputBuffers(ac_group_id, thread);
-
-  bool should_run_pipeline = true;
-
-  if (frame_header_.encoding == FrameEncoding::kVarDCT) {
-    JXL_RETURN_IF_ERROR(group_dec_caches_[thread].InitOnce(
-        memory_manager, frame_header_.passes.num_passes, dec_state_->used_acs));
-    JXL_RETURN_IF_ERROR(DecodeGroup(
-        frame_header_, br, num_passes, ac_group_id, dec_state_,
-        &group_dec_caches_[thread], thread, render_pipeline_input,
-        decoded_->jpeg_data.get(), decoded_passes_per_ac_group_[ac_group_id],
-        force_draw, dc_only, &should_run_pipeline));
-  }
-
-  // don't limit to image dimensions here (is done in DecodeGroup)
-  const Rect mrect(x, y, group_dim, group_dim);
-  bool modular_ready = false;
-  size_t pass0 = decoded_passes_per_ac_group_[ac_group_id];
-  size_t pass1 =
-      force_draw ? frame_header_.passes.num_passes : pass0 + num_passes;
-  for (size_t i = pass0; i < pass1; ++i) {
-    int minShift;
-    int maxShift;
-    frame_header_.passes.GetDownsamplingBracket(i, minShift, maxShift);
-    bool modular_pass_ready = true;
-    JXL_DEBUG_V(2, "Decoding modular in group %d pass %d",
-                static_cast<int>(ac_group_id), static_cast<int>(i));
-    if (i < pass0 + num_passes) {
-      JXL_DEBUG_V(2, "Bit reader position: %" PRIuS " / %" PRIuS,
-                  br[i - pass0]->TotalBitsConsumed(),
-                  br[i - pass0]->TotalBytes() * kBitsPerByte);
-      JXL_RETURN_IF_ERROR(modular_frame_decoder_.DecodeGroup(
-          frame_header_, mrect, br[i - pass0], minShift, maxShift,
-          ModularStreamId::ModularAC(ac_group_id, i),
-          /*zerofill=*/false, dec_state_, &render_pipeline_input,
-          /*allow_truncated=*/false, &modular_pass_ready));
-    } else {
-      JXL_RETURN_IF_ERROR(modular_frame_decoder_.DecodeGroup(
-          frame_header_, mrect, nullptr, minShift, maxShift,
-          ModularStreamId::ModularAC(ac_group_id, i), /*zerofill=*/true,
-          dec_state_, &render_pipeline_input,
-          /*allow_truncated=*/false, &modular_pass_ready));
-    }
-    if (modular_pass_ready) modular_ready = true;
-  }
-  decoded_passes_per_ac_group_[ac_group_id] += num_passes;
-
-  if ((frame_header_.flags & FrameHeader::kNoise) != 0) {
-    PrepareNoiseInput(*dec_state_, frame_dim_, frame_header_, ac_group_id,
-                      thread);
-  }
-
-  if (!modular_frame_decoder_.UsesFullImage() && !decoded_->IsJPEG()) {
-    if (should_run_pipeline && modular_ready) {
-      JXL_RETURN_IF_ERROR(render_pipeline_input.Done());
-    } else if (force_draw) {
-      return JXL_FAILURE("Modular group decoding failed.");
-    }
-  }
-  return true;
-}
-
-void FrameDecoder::MarkSections(const SectionInfo* sections, size_t num,
-                                const SectionStatus* section_status) {
-  num_sections_done_ += num;
-  for (size_t i = 0; i < num; i++) {
-    if (section_status[i] != SectionStatus::kDone) {
-      processed_section_[sections[i].id] = JXL_FALSE;
-      num_sections_done_--;
-    }
-  }
-}
-
-Status FrameDecoder::ProcessSections(const SectionInfo* sections, size_t num,
-                                     SectionStatus* section_status) {
-  if (num == 0) return true;  // Nothing to process
-  std::fill(section_status, section_status + num, SectionStatus::kSkipped);
-  size_t dc_global_sec = num;
-  size_t ac_global_sec = num;
-  std::vector<size_t> dc_group_sec(frame_dim_.num_dc_groups, num);
-  std::vector<std::vector<size_t>> ac_group_sec(
-      frame_dim_.num_groups,
-      std::vector<size_t>(frame_header_.passes.num_passes, num));
-  // This keeps track of the number of ac passes we want to process during this
-  // call of ProcessSections.
-  std::vector<size_t> desired_num_ac_passes(frame_dim_.num_groups);
-  bool single_section =
-      frame_dim_.num_groups == 1 && frame_header_.passes.num_passes == 1;
-  if (single_section) {
-    JXL_ENSURE(num == 1);
-    JXL_ENSURE(sections[0].id == 0);
-    if (processed_section_[0] == JXL_FALSE) {
-      processed_section_[0] = JXL_TRUE;
-      ac_group_sec[0].resize(1);
-      dc_global_sec = ac_global_sec = dc_group_sec[0] = ac_group_sec[0][0] = 0;
-      desired_num_ac_passes[0] = 1;
-    } else {
-      section_status[0] = SectionStatus::kDuplicate;
-    }
-  } else {
-    size_t ac_global_index = frame_dim_.num_dc_groups + 1;
-    for (size_t i = 0; i < num; i++) {
-      JXL_ENSURE(sections[i].id < processed_section_.size());
-      if (processed_section_[sections[i].id]) {
-        section_status[i] = SectionStatus::kDuplicate;
-        continue;
-      }
-      if (sections[i].id == 0) {
-        dc_global_sec = i;
-      } else if (sections[i].id < ac_global_index) {
-        dc_group_sec[sections[i].id - 1] = i;
-      } else if (sections[i].id == ac_global_index) {
-        ac_global_sec = i;
-      } else {
-        size_t ac_idx = sections[i].id - ac_global_index - 1;
-        size_t acg = ac_idx % frame_dim_.num_groups;
-        size_t acp = ac_idx / frame_dim_.num_groups;
-        if (acp >= frame_header_.passes.num_passes) {
-          return JXL_FAILURE("Invalid section ID");
-        }
-        ac_group_sec[acg][acp] = i;
-      }
-      processed_section_[sections[i].id] = JXL_TRUE;
-    }
-    // Count number of new passes per group.
-    for (size_t g = 0; g < ac_group_sec.size(); g++) {
-      size_t j = 0;
-      for (; j + decoded_passes_per_ac_group_[g] <
-             frame_header_.passes.num_passes;
-           j++) {
-        if (ac_group_sec[g][j + decoded_passes_per_ac_group_[g]] == num) {
-          break;
-        }
-      }
-      desired_num_ac_passes[g] = j;
-    }
-  }
-  if (dc_global_sec != num) {
-    Status dc_global_status = ProcessDCGlobal(sections[dc_global_sec].br);
-    if (dc_global_status.IsFatalError()) return dc_global_status;
-    if (dc_global_status) {
-      section_status[dc_global_sec] = SectionStatus::kDone;
-    } else {
-      section_status[dc_global_sec] = SectionStatus::kPartial;
-    }
-  }
-
-  if (decoded_dc_global_) {
-    const auto process_section = [this, &dc_group_sec, &num, &sections,
-                                  &section_status](size_t i,
-                                                   size_t thread) -> Status {
-      if (dc_group_sec[i] != num) {
-        JXL_RETURN_IF_ERROR(ProcessDCGroup(i, sections[dc_group_sec[i]].br));
-        section_status[dc_group_sec[i]] = SectionStatus::kDone;
-      }
-      return true;
-    };
-    JXL_RETURN_IF_ERROR(RunOnPool(pool_, 0, dc_group_sec.size(),
-                                  ThreadPool::NoInit, process_section,
-                                  "DecodeDCGroup"));
-  }
-
-  if (!HasDcGroupToDecode() && !finalized_dc_) {
-    PassesDecoderState::PipelineOptions pipeline_options;
-    pipeline_options.use_slow_render_pipeline = use_slow_rendering_pipeline_;
-    pipeline_options.coalescing = coalescing_;
-    pipeline_options.render_spotcolors = render_spotcolors_;
-    pipeline_options.render_noise = true;
-    JXL_RETURN_IF_ERROR(dec_state_->PreparePipeline(
-        frame_header_, &frame_header_.nonserialized_metadata->m, decoded_,
-        pipeline_options));
-    JXL_RETURN_IF_ERROR(FinalizeDC());
-    JXL_RETURN_IF_ERROR(AllocateOutput());
-    if (progressive_detail_ >= JxlProgressiveDetail::kDC) {
-      MarkSections(sections, num, section_status);
-      return true;
-    }
-  }
-
-  if (finalized_dc_ && ac_global_sec != num && !decoded_ac_global_) {
-    JXL_RETURN_IF_ERROR(ProcessACGlobal(sections[ac_global_sec].br));
-    section_status[ac_global_sec] = SectionStatus::kDone;
-  }
-
-  if (progressive_detail_ >= JxlProgressiveDetail::kLastPasses) {
-    // Mark that we only want the next progression pass.
-    size_t target_complete_passes = NextNumPassesToPause();
-    for (size_t i = 0; i < ac_group_sec.size(); i++) {
-      desired_num_ac_passes[i] =
-          std::min(desired_num_ac_passes[i],
-                   target_complete_passes - decoded_passes_per_ac_group_[i]);
-    }
-  }
-
-  if (decoded_ac_global_) {
-    // Mark all the AC groups that we received as not complete yet.
-    for (size_t i = 0; i < ac_group_sec.size(); i++) {
-      if (desired_num_ac_passes[i] != 0) {
-        dec_state_->render_pipeline->ClearDone(i);
-      }
-    }
-
-    const auto prepare_storage = [this](size_t num_threads) -> Status {
-      JXL_RETURN_IF_ERROR(
-          PrepareStorage(num_threads, decoded_passes_per_ac_group_.size()));
-      return true;
-    };
-    const auto process_group = [this, &ac_group_sec, &desired_num_ac_passes,
-                                &num, &sections, &section_status](
-                                   size_t g, size_t thread) -> Status {
-      if (desired_num_ac_passes[g] == 0) {
-        // no new AC pass, nothing to do
-        return true;
-      }
-      (void)num;
-      size_t first_pass = decoded_passes_per_ac_group_[g];
-      BitReader* JXL_RESTRICT readers[kMaxNumPasses];
-      for (size_t i = 0; i < desired_num_ac_passes[g]; i++) {
-        JXL_ENSURE(ac_group_sec[g][first_pass + i] != num);
-        readers[i] = sections[ac_group_sec[g][first_pass + i]].br;
-      }
-      JXL_RETURN_IF_ERROR(ProcessACGroup(
-          g, readers, desired_num_ac_passes[g], GetStorageLocation(thread, g),
-          /*force_draw=*/false, /*dc_only=*/false));
-      for (size_t i = 0; i < desired_num_ac_passes[g]; i++) {
-        section_status[ac_group_sec[g][first_pass + i]] = SectionStatus::kDone;
-      }
-      return true;
-    };
-    JXL_RETURN_IF_ERROR(RunOnPool(pool_, 0, ac_group_sec.size(),
-                                  prepare_storage, process_group,
-                                  "DecodeGroup"));
-  }
-
-  MarkSections(sections, num, section_status);
-  return true;
-}
-
-Status FrameDecoder::Flush() {
-  bool has_blending = frame_header_.blending_info.mode != BlendMode::kReplace ||
-                      frame_header_.custom_size_or_origin;
-  for (const auto& blending_info_ec :
-       frame_header_.extra_channel_blending_info) {
-    if (blending_info_ec.mode != BlendMode::kReplace) has_blending = true;
-  }
-  // No early Flush() if blending is enabled.
-  if (has_blending && !is_finalized_) {
-    return false;
-  }
-  // No early Flush() - nothing to do - if the frame is a kSkipProgressive
-  // frame.
-  if (frame_header_.frame_type == FrameType::kSkipProgressive &&
-      !is_finalized_) {
-    return true;
-  }
-  if (decoded_->IsJPEG()) {
-    // Nothing to do.
-    return true;
-  }
-  JXL_RETURN_IF_ERROR(AllocateOutput());
-
-  uint32_t completely_decoded_ac_pass = *std::min_element(
-      decoded_passes_per_ac_group_.begin(), decoded_passes_per_ac_group_.end());
-  if (completely_decoded_ac_pass < frame_header_.passes.num_passes) {
-    // We don't have all AC yet: force a draw of all the missing areas.
-    // Mark all sections as not complete.
-    for (size_t i = 0; i < decoded_passes_per_ac_group_.size(); i++) {
-      if (decoded_passes_per_ac_group_[i] < frame_header_.passes.num_passes) {
-        dec_state_->render_pipeline->ClearDone(i);
-      }
-    }
-    const auto prepare_storage = [this](const size_t num_threads) -> Status {
-      JXL_RETURN_IF_ERROR(
-          PrepareStorage(num_threads, decoded_passes_per_ac_group_.size()));
-      return true;
-    };
-    const auto process_group = [this](const uint32_t g,
-                                      size_t thread) -> Status {
-      if (decoded_passes_per_ac_group_[g] == frame_header_.passes.num_passes) {
-        // This group was drawn already, nothing to do.
-        return true;
-      }
-      BitReader* JXL_RESTRICT readers[kMaxNumPasses] = {};
-      JXL_RETURN_IF_ERROR(ProcessACGroup(
-          g, readers, /*num_passes=*/0, GetStorageLocation(thread, g),
-          /*force_draw=*/true, /*dc_only=*/!decoded_ac_global_));
-      return true;
-    };
-    JXL_RETURN_IF_ERROR(RunOnPool(pool_, 0, decoded_passes_per_ac_group_.size(),
-                                  prepare_storage, process_group,
-                                  "ForceDrawGroup"));
-  }
-
-  // undo global modular transforms and copy int pixel buffers to float ones
-  JXL_RETURN_IF_ERROR(modular_frame_decoder_.FinalizeDecoding(
-      frame_header_, dec_state_, pool_, is_finalized_));
-
-  return true;
-}
-
-int FrameDecoder::SavedAs(const FrameHeader& header) {
-  if (header.frame_type == FrameType::kDCFrame) {
-    // bits 16, 32, 64, 128 for DC level
-    return 16 << (header.dc_level - 1);
-  } else if (header.CanBeReferenced()) {
-    // bits 1, 2, 4 and 8 for the references
-    return 1 << header.save_as_reference;
-  }
-
-  return 0;
-}
-
-bool FrameDecoder::HasEverything() const {
-  if (!decoded_dc_global_) return false;
-  if (!decoded_ac_global_) return false;
-  if (HasDcGroupToDecode()) return false;
-  for (const auto& nb_passes : decoded_passes_per_ac_group_) {
-    if (nb_passes < frame_header_.passes.num_passes) return false;
-  }
-  return true;
-}
-
-int FrameDecoder::References() const {
-  if (is_finalized_) {
-    return 0;
-  }
-  if (!HasEverything()) return 0;
-
-  int result = 0;
-
-  // Blending
-  if (frame_header_.frame_type == FrameType::kRegularFrame ||
-      frame_header_.frame_type == FrameType::kSkipProgressive) {
-    bool cropped = frame_header_.custom_size_or_origin;
-    if (cropped || frame_header_.blending_info.mode != BlendMode::kReplace) {
-      result |= (1 << frame_header_.blending_info.source);
-    }
-    const auto& extra = frame_header_.extra_channel_blending_info;
-    for (const auto& ecbi : extra) {
-      if (cropped || ecbi.mode != BlendMode::kReplace) {
-        result |= (1 << ecbi.source);
-      }
-    }
-  }
-
-  // Patches
-  if (frame_header_.flags & FrameHeader::kPatches) {
-    result |= dec_state_->shared->image_features.patches.GetReferences();
-  }
-
-  // DC Level
-  if (frame_header_.flags & FrameHeader::kUseDcFrame) {
-    // Reads from the next dc level
-    int dc_level = frame_header_.dc_level + 1;
-    // bits 16, 32, 64, 128 for DC level
-    result |= (16 << (dc_level - 1));
-  }
-
-  return result;
-}
-
-Status FrameDecoder::FinalizeFrame() {
-  if (is_finalized_) {
-    return JXL_FAILURE("FinalizeFrame called multiple times");
-  }
-  is_finalized_ = true;
-  if (decoded_->IsJPEG()) {
-    // Nothing to do.
-    return true;
-  }
-
-  // undo global modular transforms and copy int pixel buffers to float ones
-  JXL_RETURN_IF_ERROR(
-      modular_frame_decoder_.FinalizeDecoding(frame_header_, dec_state_, pool_,
-                                              /*inplace=*/true));
-
-  if (frame_header_.CanBeReferenced()) {
-    auto& info = dec_state_->shared_storage
-                     .reference_frames[frame_header_.save_as_reference];
-    *info.frame = std::move(dec_state_->frame_storage_for_referencing);
-    info.ib_is_in_xyb = frame_header_.save_before_color_transform;
-  }
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/dec_frame.h b/third_party/jpeg-xl/lib/jxl/dec_frame.h
deleted file mode 100644
index 26412fd2f1860..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_frame.h
+++ /dev/null
@@ -1,342 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_DEC_FRAME_H_
-#define LIB_JXL_DEC_FRAME_H_
-
-#include <jxl/decode.h>
-#include <jxl/types.h>
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <limits>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/common.h"  // JXL_HIGH_PRECISION
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/dec_cache.h"
-#include "lib/jxl/dec_modular.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_metadata.h"
-
-namespace jxl {
-
-// Decodes a frame. Groups may be processed in parallel by `pool`.
-// `metadata` is the metadata that applies to all frames of the codestream
-// `decoded->metadata` must already be set and must match metadata.m.
-// Used in the encoder to model decoder behaviour, and in tests.
-Status DecodeFrame(PassesDecoderState* dec_state, ThreadPool* JXL_RESTRICT pool,
-                   const uint8_t* next_in, size_t avail_in,
-                   FrameHeader* frame_header, ImageBundle* decoded,
-                   const CodecMetadata& metadata,
-                   bool use_slow_rendering_pipeline = false);
-
-// TODO(veluca): implement "forced drawing".
-class FrameDecoder {
- public:
-  // All parameters must outlive the FrameDecoder.
-  FrameDecoder(PassesDecoderState* dec_state, const CodecMetadata& metadata,
-               ThreadPool* pool, bool use_slow_rendering_pipeline)
-      : dec_state_(dec_state),
-        pool_(pool),
-        frame_header_(&metadata),
-        modular_frame_decoder_(dec_state_->memory_manager()),
-        use_slow_rendering_pipeline_(use_slow_rendering_pipeline) {}
-
-  void SetRenderSpotcolors(bool rsc) { render_spotcolors_ = rsc; }
-  void SetCoalescing(bool c) { coalescing_ = c; }
-
-  // Read FrameHeader and table of contents from the given BitReader.
-  Status InitFrame(BitReader* JXL_RESTRICT br, ImageBundle* decoded,
-                   bool is_preview);
-
-  // Checks frame dimensions for their limits, and sets the output
-  // image buffer.
-  Status InitFrameOutput();
-
-  struct SectionInfo {
-    BitReader* JXL_RESTRICT br;
-    // Logical index of the section, regardless of any permutation that may be
-    // applied in the table of contents or of the physical position in the file.
-    size_t id;
-    // Index of the section in the order of the bytes inside the frame.
-    size_t index;
-  };
-
-  struct TocEntry {
-    size_t size;
-    size_t id;
-  };
-
-  enum SectionStatus {
-    // Processed correctly.
-    kDone = 0,
-    // Skipped because other required sections were not yet processed.
-    kSkipped = 1,
-    // Skipped because the section was already processed.
-    kDuplicate = 2,
-    // Only partially decoded: the section will need to be processed again.
-    kPartial = 3,
-  };
-
-  // Processes `num` sections; each SectionInfo contains the index
-  // of the section and a BitReader that only contains the data of the section.
-  // `section_status` should point to `num` elements, and will be filled with
-  // information about whether each section was processed or not.
-  // A section is a part of the encoded file that is indexed by the TOC.
-  Status ProcessSections(const SectionInfo* sections, size_t num,
-                         SectionStatus* section_status);
-
-  // Flushes all the data decoded so far to pixels.
-  Status Flush();
-
-  // Runs final operations once a frame data is decoded.
-  // Must be called exactly once per frame, after all calls to ProcessSections.
-  Status FinalizeFrame();
-
-  // Returns dependencies of this frame on reference ids as a bit mask: bits 0-3
-  // indicate reference frame 0-3 for patches and blending, bits 4-7 indicate DC
-  // frames this frame depends on. Only returns a valid result after all calls
-  // to ProcessSections are finished and before FinalizeFrame.
-  int References() const;
-
-  // Returns reference id of storage location where this frame is stored as a
-  // bit flag, or 0 if not stored.
-  // Matches the bit mask used for GetReferences: bits 0-3 indicate it is stored
-  // for patching or blending, bits 4-7 indicate DC frame.
-  // Unlike References, can be ran at any time as
-  // soon as the frame header is known.
-  static int SavedAs(const FrameHeader& header);
-
-  uint64_t SumSectionSizes() const { return section_sizes_sum_; }
-  const std::vector<TocEntry>& Toc() const { return toc_; }
-
-  const FrameHeader& GetFrameHeader() const { return frame_header_; }
-
-  // Returns whether a DC image has been decoded, accessible at low resolution
-  // at passes.shared_storage.dc_storage
-  bool HasDecodedDC() const { return finalized_dc_; }
-  bool HasDecodedAll() const { return toc_.size() == num_sections_done_; }
-
-  size_t NumCompletePasses() const {
-    return *std::min_element(decoded_passes_per_ac_group_.begin(),
-                             decoded_passes_per_ac_group_.end());
-  }
-
-  // If enabled, ProcessSections will stop and return true when the DC
-  // sections have been processed, instead of starting the AC sections. This
-  // will only occur if supported (that is, flushing will produce a valid
-  // 1/8th*1/8th resolution image). The return value of true then does not mean
-  // all sections have been processed, use HasDecodedDC and HasDecodedAll
-  // to check the true finished state.
-  // Returns the progressive detail that will be effective for the frame.
-  JxlProgressiveDetail SetPauseAtProgressive(JxlProgressiveDetail prog_detail) {
-    bool single_section =
-        frame_dim_.num_groups == 1 && frame_header_.passes.num_passes == 1;
-    if (frame_header_.frame_type != kSkipProgressive &&
-        // If there's only one group and one pass, there is no separate section
-        // for DC and the entire full resolution image is available at once.
-        !single_section &&
-        // If extra channels are encoded with modular without squeeze, they
-        // don't support DC. If the are encoded with squeeze, DC works in theory
-        // but the implementation may not yet correctly support this for Flush.
-        // Therefore, can't correctly pause for a progressive step if there is
-        // an extra channel (including alpha channel)
-        // TODO(firsching): Check if this is still the case.
-        decoded_->metadata()->extra_channel_info.empty() &&
-        // DC is not guaranteed to be available in modular mode and may be a
-        // black image. If squeeze is used, it may be available depending on the
-        // current implementation.
-        // TODO(lode): do return DC if it's known that flushing at this point
-        // will produce a valid 1/8th downscaled image with modular encoding.
-        frame_header_.encoding == FrameEncoding::kVarDCT) {
-      progressive_detail_ = prog_detail;
-    } else {
-      progressive_detail_ = JxlProgressiveDetail::kFrames;
-    }
-    if (progressive_detail_ >= JxlProgressiveDetail::kPasses) {
-      for (size_t i = 1; i < frame_header_.passes.num_passes; ++i) {
-        passes_to_pause_.push_back(i);
-      }
-    } else if (progressive_detail_ >= JxlProgressiveDetail::kLastPasses) {
-      for (size_t i = 0; i < frame_header_.passes.num_downsample; ++i) {
-        passes_to_pause_.push_back(frame_header_.passes.last_pass[i] + 1);
-      }
-      // The format does not guarantee that these values are sorted.
-      std::sort(passes_to_pause_.begin(), passes_to_pause_.end());
-    }
-    return progressive_detail_;
-  }
-
-  size_t NextNumPassesToPause() const {
-    auto it = std::upper_bound(passes_to_pause_.begin(), passes_to_pause_.end(),
-                               NumCompletePasses());
-    return (it != passes_to_pause_.end() ? *it
-                                         : std::numeric_limits<size_t>::max());
-  }
-
-  // Sets the pixel callback or image buffer where the pixels will be decoded.
-  //
-  // @param undo_orientation: if true, indicates the frame decoder should apply
-  // the exif orientation to bring the image to the intended display
-  // orientation.
-  void SetImageOutput(const PixelCallback& pixel_callback, void* image_buffer,
-                      size_t image_buffer_size, size_t xsize, size_t ysize,
-                      JxlPixelFormat format, size_t bits_per_sample,
-                      bool unpremul_alpha, bool undo_orientation) const {
-    dec_state_->width = xsize;
-    dec_state_->height = ysize;
-    dec_state_->main_output.format = format;
-    dec_state_->main_output.bits_per_sample = bits_per_sample;
-    dec_state_->main_output.callback = pixel_callback;
-    dec_state_->main_output.buffer = image_buffer;
-    dec_state_->main_output.buffer_size = image_buffer_size;
-    dec_state_->main_output.stride = GetStride(xsize, format);
-    const jxl::ExtraChannelInfo* alpha =
-        decoded_->metadata()->Find(jxl::ExtraChannel::kAlpha);
-    if (alpha && alpha->alpha_associated && unpremul_alpha) {
-      dec_state_->unpremul_alpha = true;
-    }
-    if (undo_orientation) {
-      dec_state_->undo_orientation = decoded_->metadata()->GetOrientation();
-      if (static_cast<int>(dec_state_->undo_orientation) > 4) {
-        std::swap(dec_state_->width, dec_state_->height);
-      }
-    }
-    dec_state_->extra_output.clear();
-#if !JXL_HIGH_PRECISION
-    if (dec_state_->main_output.buffer &&
-        (format.data_type == JXL_TYPE_UINT8) && (format.num_channels >= 3) &&
-        !dec_state_->unpremul_alpha &&
-        (dec_state_->undo_orientation == Orientation::kIdentity) &&
-        decoded_->metadata()->xyb_encoded &&
-        dec_state_->output_encoding_info.color_encoding.IsSRGB() &&
-        dec_state_->output_encoding_info.all_default_opsin &&
-        (dec_state_->output_encoding_info.desired_intensity_target ==
-         dec_state_->output_encoding_info.orig_intensity_target) &&
-        HasFastXYBTosRGB8() && frame_header_.needs_color_transform()) {
-      dec_state_->fast_xyb_srgb8_conversion = true;
-    }
-#endif
-  }
-
-  void AddExtraChannelOutput(void* buffer, size_t buffer_size, size_t xsize,
-                             JxlPixelFormat format, size_t bits_per_sample) {
-    ImageOutput out;
-    out.format = format;
-    out.bits_per_sample = bits_per_sample;
-    out.buffer = buffer;
-    out.buffer_size = buffer_size;
-    out.stride = GetStride(xsize, format);
-    dec_state_->extra_output.push_back(out);
-  }
-
- private:
-  Status ProcessDCGlobal(BitReader* br);
-  Status ProcessDCGroup(size_t dc_group_id, BitReader* br);
-  Status FinalizeDC();
-  Status AllocateOutput();
-  Status ProcessACGlobal(BitReader* br);
-  Status ProcessACGroup(size_t ac_group_id, BitReader* JXL_RESTRICT* br,
-                        size_t num_passes, size_t thread, bool force_draw,
-                        bool dc_only);
-  void MarkSections(const SectionInfo* sections, size_t num,
-                    const SectionStatus* section_status);
-
-  // Allocates storage for parallel decoding using up to `num_threads` threads
-  // of up to `num_tasks` tasks. The value of `thread` passed to
-  // `GetStorageLocation` must be smaller than the `num_threads` value passed
-  // here. The value of `task` passed to `GetStorageLocation` must be smaller
-  // than the value of `num_tasks` passed here.
-  Status PrepareStorage(size_t num_threads, size_t num_tasks) {
-    size_t storage_size = std::min(num_threads, num_tasks);
-    if (storage_size > group_dec_caches_.size()) {
-      group_dec_caches_.resize(storage_size);
-    }
-    use_task_id_ = num_threads > num_tasks;
-    bool use_noise = (frame_header_.flags & FrameHeader::kNoise) != 0;
-    bool use_group_ids =
-        (modular_frame_decoder_.UsesFullImage() &&
-         (frame_header_.encoding == FrameEncoding::kVarDCT || use_noise));
-    if (dec_state_->render_pipeline) {
-      JXL_RETURN_IF_ERROR(dec_state_->render_pipeline->PrepareForThreads(
-          storage_size, use_group_ids));
-    }
-    return true;
-  }
-
-  size_t GetStorageLocation(size_t thread, size_t task) const {
-    if (use_task_id_) return task;
-    return thread;
-  }
-
-  static size_t BytesPerChannel(JxlDataType data_type) {
-    return (data_type == JXL_TYPE_UINT8   ? 1u
-            : data_type == JXL_TYPE_FLOAT ? 4u
-                                          : 2u);
-  }
-
-  static size_t GetStride(const size_t xsize, JxlPixelFormat format) {
-    size_t stride =
-        (xsize * BytesPerChannel(format.data_type) * format.num_channels);
-    if (format.align > 1) {
-      stride = (jxl::DivCeil(stride, format.align) * format.align);
-    }
-    return stride;
-  }
-
-  bool HasDcGroupToDecode() const {
-    return std::any_of(decoded_dc_groups_.cbegin(), decoded_dc_groups_.cend(),
-                       [](uint8_t ready) { return ready == 0; });
-  }
-
-  PassesDecoderState* dec_state_;
-  ThreadPool* pool_;
-  std::vector<TocEntry> toc_;
-  uint64_t section_sizes_sum_;
-  // TODO(veluca): figure out the duplication between these and dec_state_.
-  FrameHeader frame_header_;
-  FrameDimensions frame_dim_;
-  ImageBundle* decoded_;
-  ModularFrameDecoder modular_frame_decoder_;
-  bool render_spotcolors_ = true;
-  bool coalescing_ = true;
-
-  std::vector<uint8_t> processed_section_;
-  std::vector<uint8_t> decoded_passes_per_ac_group_;
-  std::vector<uint8_t> decoded_dc_groups_;
-  bool decoded_dc_global_;
-  bool decoded_ac_global_;
-  bool HasEverything() const;
-  bool finalized_dc_ = true;
-  size_t num_sections_done_ = 0;
-  bool is_finalized_ = true;
-  bool allocated_ = false;
-
-  std::vector<GroupDecCache> group_dec_caches_;
-
-  // Whether or not the task id should be used for storage indexing, instead of
-  // the thread id.
-  bool use_task_id_ = false;
-
-  // Testing setting: whether or not to use the slow rendering pipeline.
-  bool use_slow_rendering_pipeline_;
-
-  JxlProgressiveDetail progressive_detail_ = kFrames;
-  // Number of completed passes where section decoding should pause.
-  // Used for progressive details at least kLastPasses.
-  std::vector<int> passes_to_pause_;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_DEC_FRAME_H_
diff --git a/third_party/jpeg-xl/lib/jxl/dec_group.cc b/third_party/jpeg-xl/lib/jxl/dec_group.cc
deleted file mode 100644
index d1abe2fa7f983..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_group.cc
+++ /dev/null
@@ -1,829 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/dec_group.h"
-
-#include <algorithm>
-#include <cstdint>
-#include <cstring>
-#include <memory>
-#include <utility>
-
-#include "lib/jxl/chroma_from_luma.h"
-#include "lib/jxl/frame_header.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/dec_group.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/ac_context.h"
-#include "lib/jxl/ac_strategy.h"
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/coeff_order.h"
-#include "lib/jxl/common.h"  // kMaxNumPasses
-#include "lib/jxl/dec_cache.h"
-#include "lib/jxl/dec_transforms-inl.h"
-#include "lib/jxl/dec_xyb.h"
-#include "lib/jxl/entropy_coder.h"
-#include "lib/jxl/quant_weights.h"
-#include "lib/jxl/quantizer-inl.h"
-#include "lib/jxl/quantizer.h"
-
-#ifndef LIB_JXL_DEC_GROUP_CC
-#define LIB_JXL_DEC_GROUP_CC
-namespace jxl {
-
-struct AuxOut;
-
-// Interface for reading groups for DecodeGroupImpl.
-class GetBlock {
- public:
-  virtual void StartRow(size_t by) = 0;
-  virtual Status LoadBlock(size_t bx, size_t by, const AcStrategy& acs,
-                           size_t size, size_t log2_covered_blocks,
-                           ACPtr block[3], ACType ac_type) = 0;
-  virtual ~GetBlock() {}
-};
-
-// Controls whether DecodeGroupImpl renders to pixels or not.
-enum DrawMode {
-  // Render to pixels.
-  kDraw = 0,
-  // Don't render to pixels.
-  kDontDraw = 1,
-};
-
-}  // namespace jxl
-#endif  // LIB_JXL_DEC_GROUP_CC
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::AllFalse;
-using hwy::HWY_NAMESPACE::Gt;
-using hwy::HWY_NAMESPACE::Le;
-using hwy::HWY_NAMESPACE::MaskFromVec;
-using hwy::HWY_NAMESPACE::Or;
-using hwy::HWY_NAMESPACE::Rebind;
-using hwy::HWY_NAMESPACE::ShiftRight;
-
-using D = HWY_FULL(float);
-using DU = HWY_FULL(uint32_t);
-using DI = HWY_FULL(int32_t);
-using DI16 = Rebind<int16_t, DI>;
-using DI16_FULL = HWY_CAPPED(int16_t, kDCTBlockSize);
-constexpr D d;
-constexpr DI di;
-constexpr DI16 di16;
-constexpr DI16_FULL di16_full;
-
-// TODO(veluca): consider SIMDfying.
-void Transpose8x8InPlace(int32_t* JXL_RESTRICT block) {
-  for (size_t x = 0; x < 8; x++) {
-    for (size_t y = x + 1; y < 8; y++) {
-      std::swap(block[y * 8 + x], block[x * 8 + y]);
-    }
-  }
-}
-
-template <ACType ac_type>
-void DequantLane(Vec<D> scaled_dequant_x, Vec<D> scaled_dequant_y,
-                 Vec<D> scaled_dequant_b,
-                 const float* JXL_RESTRICT dequant_matrices, size_t size,
-                 size_t k, Vec<D> x_cc_mul, Vec<D> b_cc_mul,
-                 const float* JXL_RESTRICT biases, ACPtr qblock[3],
-                 float* JXL_RESTRICT block) {
-  const auto x_mul = Mul(Load(d, dequant_matrices + k), scaled_dequant_x);
-  const auto y_mul =
-      Mul(Load(d, dequant_matrices + size + k), scaled_dequant_y);
-  const auto b_mul =
-      Mul(Load(d, dequant_matrices + 2 * size + k), scaled_dequant_b);
-
-  Vec<DI> quantized_x_int;
-  Vec<DI> quantized_y_int;
-  Vec<DI> quantized_b_int;
-  if (ac_type == ACType::k16) {
-    Rebind<int16_t, DI> di16;
-    quantized_x_int = PromoteTo(di, Load(di16, qblock[0].ptr16 + k));
-    quantized_y_int = PromoteTo(di, Load(di16, qblock[1].ptr16 + k));
-    quantized_b_int = PromoteTo(di, Load(di16, qblock[2].ptr16 + k));
-  } else {
-    quantized_x_int = Load(di, qblock[0].ptr32 + k);
-    quantized_y_int = Load(di, qblock[1].ptr32 + k);
-    quantized_b_int = Load(di, qblock[2].ptr32 + k);
-  }
-
-  const auto dequant_x_cc =
-      Mul(AdjustQuantBias(di, 0, quantized_x_int, biases), x_mul);
-  const auto dequant_y =
-      Mul(AdjustQuantBias(di, 1, quantized_y_int, biases), y_mul);
-  const auto dequant_b_cc =
-      Mul(AdjustQuantBias(di, 2, quantized_b_int, biases), b_mul);
-
-  const auto dequant_x = MulAdd(x_cc_mul, dequant_y, dequant_x_cc);
-  const auto dequant_b = MulAdd(b_cc_mul, dequant_y, dequant_b_cc);
-  Store(dequant_x, d, block + k);
-  Store(dequant_y, d, block + size + k);
-  Store(dequant_b, d, block + 2 * size + k);
-}
-
-template <ACType ac_type>
-void DequantBlock(const AcStrategy& acs, float inv_global_scale, int quant,
-                  float x_dm_multiplier, float b_dm_multiplier, Vec<D> x_cc_mul,
-                  Vec<D> b_cc_mul, AcStrategyType kind, size_t size,
-                  const Quantizer& quantizer, size_t covered_blocks,
-                  const size_t* sbx,
-                  const float* JXL_RESTRICT* JXL_RESTRICT dc_row,
-                  size_t dc_stride, const float* JXL_RESTRICT biases,
-                  ACPtr qblock[3], float* JXL_RESTRICT block,
-                  float* JXL_RESTRICT scratch) {
-  const auto scaled_dequant_s = inv_global_scale / quant;
-
-  const auto scaled_dequant_x = Set(d, scaled_dequant_s * x_dm_multiplier);
-  const auto scaled_dequant_y = Set(d, scaled_dequant_s);
-  const auto scaled_dequant_b = Set(d, scaled_dequant_s * b_dm_multiplier);
-
-  const float* dequant_matrices = quantizer.DequantMatrix(kind, 0);
-
-  for (size_t k = 0; k < covered_blocks * kDCTBlockSize; k += Lanes(d)) {
-    DequantLane<ac_type>(scaled_dequant_x, scaled_dequant_y, scaled_dequant_b,
-                         dequant_matrices, size, k, x_cc_mul, b_cc_mul, biases,
-                         qblock, block);
-  }
-  for (size_t c = 0; c < 3; c++) {
-    LowestFrequenciesFromDC(acs.Strategy(), dc_row[c] + sbx[c], dc_stride,
-                            block + c * size, scratch);
-  }
-}
-
-Status DecodeGroupImpl(const FrameHeader& frame_header,
-                       GetBlock* JXL_RESTRICT get_block,
-                       GroupDecCache* JXL_RESTRICT group_dec_cache,
-                       PassesDecoderState* JXL_RESTRICT dec_state,
-                       size_t thread, size_t group_idx,
-                       RenderPipelineInput& render_pipeline_input,
-                       jpeg::JPEGData* jpeg_data, DrawMode draw) {
-  // TODO(veluca): investigate cache usage in this function.
-  const Rect block_rect =
-      dec_state->shared->frame_dim.BlockGroupRect(group_idx);
-  const AcStrategyImage& ac_strategy = dec_state->shared->ac_strategy;
-
-  const size_t xsize_blocks = block_rect.xsize();
-  const size_t ysize_blocks = block_rect.ysize();
-
-  const size_t dc_stride = dec_state->shared->dc->PixelsPerRow();
-
-  const float inv_global_scale = dec_state->shared->quantizer.InvGlobalScale();
-
-  const YCbCrChromaSubsampling& cs = frame_header.chroma_subsampling;
-
-  const auto kJpegDctMin = Set(di16_full, -4095);
-  const auto kJpegDctMax = Set(di16_full, 4095);
-
-  size_t idct_stride[3];
-  for (size_t c = 0; c < 3; c++) {
-    idct_stride[c] = render_pipeline_input.GetBuffer(c).first->PixelsPerRow();
-  }
-
-  HWY_ALIGN int32_t scaled_qtable[64 * 3];
-
-  ACType ac_type = dec_state->coefficients->Type();
-  auto dequant_block = ac_type == ACType::k16 ? DequantBlock<ACType::k16>
-                                              : DequantBlock<ACType::k32>;
-  // Whether or not coefficients should be stored for future usage, and/or read
-  // from past usage.
-  bool accumulate = !dec_state->coefficients->IsEmpty();
-  // Offset of the current block in the group.
-  size_t offset = 0;
-
-  std::array<int, 3> jpeg_c_map;
-  bool jpeg_is_gray = false;
-  std::array<int, 3> dcoff = {};
-
-  // TODO(veluca): all of this should be done only once per image.
-  const ColorCorrelation& color_correlation = dec_state->shared->cmap.base();
-  if (jpeg_data) {
-    if (!color_correlation.IsJPEGCompatible()) {
-      return JXL_FAILURE("The CfL map is not JPEG-compatible");
-    }
-    jpeg_is_gray = (jpeg_data->components.size() == 1);
-    JXL_ENSURE(frame_header.color_transform != ColorTransform::kXYB);
-    jpeg_c_map = JpegOrder(frame_header.color_transform, jpeg_is_gray);
-    const std::vector<QuantEncoding>& qe =
-        dec_state->shared->matrices.encodings();
-    if (qe.empty() || qe[0].mode != QuantEncoding::Mode::kQuantModeRAW ||
-        std::abs(qe[0].qraw.qtable_den - 1.f / (8 * 255)) > 1e-8f) {
-      return JXL_FAILURE(
-          "Quantization table is not a JPEG quantization table.");
-    }
-    JXL_ENSURE(qe[0].qraw.qtable->size() == 3 * 8 * 8);
-    int* qtable = qe[0].qraw.qtable->data();
-    for (size_t c = 0; c < 3; c++) {
-      if (frame_header.color_transform == ColorTransform::kNone) {
-        dcoff[c] = 1024 / qtable[64 * c];
-      }
-      for (size_t i = 0; i < 64; i++) {
-        // Transpose the matrix, as it will be used on the transposed block.
-        int n = qtable[64 + i];
-        int d = qtable[64 * c + i];
-        if (n <= 0 || d <= 0 || n >= 65536 || d >= 65536) {
-          return JXL_FAILURE("Invalid JPEG quantization table");
-        }
-        scaled_qtable[64 * c + (i % 8) * 8 + (i / 8)] =
-            (1 << kCFLFixedPointPrecision) * n / d;
-      }
-    }
-  }
-
-  size_t hshift[3] = {cs.HShift(0), cs.HShift(1), cs.HShift(2)};
-  size_t vshift[3] = {cs.VShift(0), cs.VShift(1), cs.VShift(2)};
-  Rect r[3];
-  for (size_t i = 0; i < 3; i++) {
-    r[i] =
-        Rect(block_rect.x0() >> hshift[i], block_rect.y0() >> vshift[i],
-             block_rect.xsize() >> hshift[i], block_rect.ysize() >> vshift[i]);
-    if (!r[i].IsInside({0, 0, dec_state->shared->dc->Plane(i).xsize(),
-                        dec_state->shared->dc->Plane(i).ysize()})) {
-      return JXL_FAILURE("Frame dimensions are too big for the image.");
-    }
-  }
-
-  for (size_t by = 0; by < ysize_blocks; ++by) {
-    get_block->StartRow(by);
-    size_t sby[3] = {by >> vshift[0], by >> vshift[1], by >> vshift[2]};
-
-    const int32_t* JXL_RESTRICT row_quant =
-        block_rect.ConstRow(dec_state->shared->raw_quant_field, by);
-
-    const float* JXL_RESTRICT dc_rows[3] = {
-        r[0].ConstPlaneRow(*dec_state->shared->dc, 0, sby[0]),
-        r[1].ConstPlaneRow(*dec_state->shared->dc, 1, sby[1]),
-        r[2].ConstPlaneRow(*dec_state->shared->dc, 2, sby[2]),
-    };
-
-    const size_t ty = (block_rect.y0() + by) / kColorTileDimInBlocks;
-    AcStrategyRow acs_row = ac_strategy.ConstRow(block_rect, by);
-
-    const int8_t* JXL_RESTRICT row_cmap[3] = {
-        dec_state->shared->cmap.ytox_map.ConstRow(ty),
-        nullptr,
-        dec_state->shared->cmap.ytob_map.ConstRow(ty),
-    };
-
-    float* JXL_RESTRICT idct_row[3];
-    int16_t* JXL_RESTRICT jpeg_row[3];
-    for (size_t c = 0; c < 3; c++) {
-      const auto& buffer = render_pipeline_input.GetBuffer(c);
-      idct_row[c] = buffer.second.Row(buffer.first, sby[c] * kBlockDim);
-      if (jpeg_data) {
-        auto& component = jpeg_data->components[jpeg_c_map[c]];
-        jpeg_row[c] =
-            component.coeffs.data() +
-            (component.width_in_blocks * (r[c].y0() + sby[c]) + r[c].x0()) *
-                kDCTBlockSize;
-      }
-    }
-
-    size_t bx = 0;
-    for (size_t tx = 0; tx < DivCeil(xsize_blocks, kColorTileDimInBlocks);
-         tx++) {
-      size_t abs_tx = tx + block_rect.x0() / kColorTileDimInBlocks;
-      auto x_cc_mul = Set(d, color_correlation.YtoXRatio(row_cmap[0][abs_tx]));
-      auto b_cc_mul = Set(d, color_correlation.YtoBRatio(row_cmap[2][abs_tx]));
-      // Increment bx by llf_x because those iterations would otherwise
-      // immediately continue (!IsFirstBlock). Reduces mispredictions.
-      for (; bx < xsize_blocks && bx < (tx + 1) * kColorTileDimInBlocks;) {
-        size_t sbx[3] = {bx >> hshift[0], bx >> hshift[1], bx >> hshift[2]};
-        AcStrategy acs = acs_row[bx];
-        const size_t llf_x = acs.covered_blocks_x();
-
-        // Can only happen in the second or lower rows of a varblock.
-        if (JXL_UNLIKELY(!acs.IsFirstBlock())) {
-          bx += llf_x;
-          continue;
-        }
-        const size_t log2_covered_blocks = acs.log2_covered_blocks();
-
-        const size_t covered_blocks = 1 << log2_covered_blocks;
-        const size_t size = covered_blocks * kDCTBlockSize;
-
-        ACPtr qblock[3];
-        if (accumulate) {
-          for (size_t c = 0; c < 3; c++) {
-            qblock[c] = dec_state->coefficients->PlaneRow(c, group_idx, offset);
-          }
-        } else {
-          // No point in reading from bitstream without accumulating and not
-          // drawing.
-          JXL_ENSURE(draw == kDraw);
-          if (ac_type == ACType::k16) {
-            memset(group_dec_cache->dec_group_qblock16, 0,
-                   size * 3 * sizeof(int16_t));
-            for (size_t c = 0; c < 3; c++) {
-              qblock[c].ptr16 = group_dec_cache->dec_group_qblock16 + c * size;
-            }
-          } else {
-            memset(group_dec_cache->dec_group_qblock, 0,
-                   size * 3 * sizeof(int32_t));
-            for (size_t c = 0; c < 3; c++) {
-              qblock[c].ptr32 = group_dec_cache->dec_group_qblock + c * size;
-            }
-          }
-        }
-        JXL_RETURN_IF_ERROR(get_block->LoadBlock(
-            bx, by, acs, size, log2_covered_blocks, qblock, ac_type));
-        offset += size;
-        if (draw == kDontDraw) {
-          bx += llf_x;
-          continue;
-        }
-
-        if (JXL_UNLIKELY(jpeg_data)) {
-          if (acs.Strategy() != AcStrategyType::DCT) {
-            return JXL_FAILURE(
-                "Can only decode to JPEG if only DCT-8 is used.");
-          }
-
-          HWY_ALIGN int32_t transposed_dct_y[64];
-          for (size_t c : {1, 0, 2}) {
-            // Propagate only Y for grayscale.
-            if (jpeg_is_gray && c != 1) {
-              continue;
-            }
-            if ((sbx[c] << hshift[c] != bx) || (sby[c] << vshift[c] != by)) {
-              continue;
-            }
-            int16_t* JXL_RESTRICT jpeg_pos =
-                jpeg_row[c] + sbx[c] * kDCTBlockSize;
-            // JPEG XL is transposed, JPEG is not.
-            auto* transposed_dct = qblock[c].ptr32;
-            Transpose8x8InPlace(transposed_dct);
-            // No CfL - no need to store the y block converted to integers.
-            if (!cs.Is444() ||
-                (row_cmap[0][abs_tx] == 0 && row_cmap[2][abs_tx] == 0)) {
-              for (size_t i = 0; i < 64; i += Lanes(d)) {
-                const auto ini = Load(di, transposed_dct + i);
-                const auto ini16 = DemoteTo(di16, ini);
-                StoreU(ini16, di16, jpeg_pos + i);
-              }
-            } else if (c == 1) {
-              // Y channel: save for restoring X/B, but nothing else to do.
-              for (size_t i = 0; i < 64; i += Lanes(d)) {
-                const auto ini = Load(di, transposed_dct + i);
-                Store(ini, di, transposed_dct_y + i);
-                const auto ini16 = DemoteTo(di16, ini);
-                StoreU(ini16, di16, jpeg_pos + i);
-              }
-            } else {
-              // transposed_dct_y contains the y channel block, transposed.
-              const auto scale =
-                  Set(di, ColorCorrelation::RatioJPEG(row_cmap[c][abs_tx]));
-              const auto round = Set(di, 1 << (kCFLFixedPointPrecision - 1));
-              for (int i = 0; i < 64; i += Lanes(d)) {
-                auto in = Load(di, transposed_dct + i);
-                auto in_y = Load(di, transposed_dct_y + i);
-                auto qt = Load(di, scaled_qtable + c * size + i);
-                auto coeff_scale = ShiftRight<kCFLFixedPointPrecision>(
-                    Add(Mul(qt, scale), round));
-                auto cfl_factor = ShiftRight<kCFLFixedPointPrecision>(
-                    Add(Mul(in_y, coeff_scale), round));
-                StoreU(DemoteTo(di16, Add(in, cfl_factor)), di16, jpeg_pos + i);
-              }
-            }
-            jpeg_pos[0] =
-                Clamp1<float>(dc_rows[c][sbx[c]] - dcoff[c], -2047, 2047);
-            auto overflow = MaskFromVec(Set(di16_full, 0));
-            auto underflow = MaskFromVec(Set(di16_full, 0));
-            for (int i = 0; i < 64; i += Lanes(di16_full)) {
-              auto in = LoadU(di16_full, jpeg_pos + i);
-              overflow = Or(overflow, Gt(in, kJpegDctMax));
-              underflow = Or(underflow, Lt(in, kJpegDctMin));
-            }
-            if (!AllFalse(di16_full, Or(overflow, underflow))) {
-              return JXL_FAILURE("JPEG DCT coefficients out of range");
-            }
-          }
-        } else {
-          HWY_ALIGN float* const block = group_dec_cache->dec_group_block;
-          // Dequantize and add predictions.
-          dequant_block(
-              acs, inv_global_scale, row_quant[bx], dec_state->x_dm_multiplier,
-              dec_state->b_dm_multiplier, x_cc_mul, b_cc_mul, acs.Strategy(),
-              size, dec_state->shared->quantizer,
-              acs.covered_blocks_y() * acs.covered_blocks_x(), sbx, dc_rows,
-              dc_stride,
-              dec_state->output_encoding_info.opsin_params.quant_biases, qblock,
-              block, group_dec_cache->scratch_space);
-
-          for (size_t c : {1, 0, 2}) {
-            if ((sbx[c] << hshift[c] != bx) || (sby[c] << vshift[c] != by)) {
-              continue;
-            }
-            // IDCT
-            float* JXL_RESTRICT idct_pos = idct_row[c] + sbx[c] * kBlockDim;
-            TransformToPixels(acs.Strategy(), block + c * size, idct_pos,
-                              idct_stride[c], group_dec_cache->scratch_space);
-          }
-        }
-        bx += llf_x;
-      }
-    }
-  }
-  return true;
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-namespace {
-// Decode quantized AC coefficients of DCT blocks.
-// LLF components in the output block will not be modified.
-template <ACType ac_type, bool uses_lz77>
-Status DecodeACVarBlock(size_t ctx_offset, size_t log2_covered_blocks,
-                        int32_t* JXL_RESTRICT row_nzeros,
-                        const int32_t* JXL_RESTRICT row_nzeros_top,
-                        size_t nzeros_stride, size_t c, size_t bx, size_t by,
-                        size_t lbx, AcStrategy acs,
-                        const coeff_order_t* JXL_RESTRICT coeff_order,
-                        BitReader* JXL_RESTRICT br,
-                        ANSSymbolReader* JXL_RESTRICT decoder,
-                        const std::vector<uint8_t>& context_map,
-                        const uint8_t* qdc_row, const int32_t* qf_row,
-                        const BlockCtxMap& block_ctx_map, ACPtr block,
-                        size_t shift = 0) {
-  // Equal to number of LLF coefficients.
-  const size_t covered_blocks = 1 << log2_covered_blocks;
-  const size_t size = covered_blocks * kDCTBlockSize;
-  int32_t predicted_nzeros =
-      PredictFromTopAndLeft(row_nzeros_top, row_nzeros, bx, 32);
-
-  size_t ord = kStrategyOrder[acs.RawStrategy()];
-  const coeff_order_t* JXL_RESTRICT order =
-      &coeff_order[CoeffOrderOffset(ord, c)];
-
-  size_t block_ctx = block_ctx_map.Context(qdc_row[lbx], qf_row[bx], ord, c);
-  const int32_t nzero_ctx =
-      block_ctx_map.NonZeroContext(predicted_nzeros, block_ctx) + ctx_offset;
-
-  size_t nzeros =
-      decoder->ReadHybridUintInlined<uses_lz77>(nzero_ctx, br, context_map);
-  if (nzeros > size - covered_blocks) {
-    return JXL_FAILURE("Invalid AC: nzeros %" PRIuS " too large for %" PRIuS
-                       " 8x8 blocks",
-                       nzeros, covered_blocks);
-  }
-  for (size_t y = 0; y < acs.covered_blocks_y(); y++) {
-    for (size_t x = 0; x < acs.covered_blocks_x(); x++) {
-      row_nzeros[bx + x + y * nzeros_stride] =
-          (nzeros + covered_blocks - 1) >> log2_covered_blocks;
-    }
-  }
-
-  const size_t histo_offset =
-      ctx_offset + block_ctx_map.ZeroDensityContextsOffset(block_ctx);
-
-  size_t prev = (nzeros > size / 16 ? 0 : 1);
-  for (size_t k = covered_blocks; k < size && nzeros != 0; ++k) {
-    const size_t ctx =
-        histo_offset + ZeroDensityContext(nzeros, k, covered_blocks,
-                                          log2_covered_blocks, prev);
-    const size_t u_coeff =
-        decoder->ReadHybridUintInlined<uses_lz77>(ctx, br, context_map);
-    // Hand-rolled version of UnpackSigned, shifting before the conversion to
-    // signed integer to avoid undefined behavior of shifting negative numbers.
-    const size_t magnitude = u_coeff >> 1;
-    const size_t neg_sign = (~u_coeff) & 1;
-    const intptr_t coeff =
-        static_cast<intptr_t>((magnitude ^ (neg_sign - 1)) << shift);
-    if (ac_type == ACType::k16) {
-      block.ptr16[order[k]] += coeff;
-    } else {
-      block.ptr32[order[k]] += coeff;
-    }
-    prev = static_cast<size_t>(u_coeff != 0);
-    nzeros -= prev;
-  }
-  if (JXL_UNLIKELY(nzeros != 0)) {
-    return JXL_FAILURE("Invalid AC: nzeros at end of block is %" PRIuS
-                       ", should be 0. Block (%" PRIuS ", %" PRIuS
-                       "), channel %" PRIuS,
-                       nzeros, bx, by, c);
-  }
-
-  return true;
-}
-
-// Structs used by DecodeGroupImpl to get a quantized block.
-// GetBlockFromBitstream uses ANS decoding (and thus keeps track of row
-// pointers in row_nzeros), GetBlockFromEncoder simply reads the coefficient
-// image provided by the encoder.
-
-struct GetBlockFromBitstream : public GetBlock {
-  void StartRow(size_t by) override {
-    qf_row = rect.ConstRow(*qf, by);
-    for (size_t c = 0; c < 3; c++) {
-      size_t sby = by >> vshift[c];
-      quant_dc_row = quant_dc->ConstRow(rect.y0() + by) + rect.x0();
-      for (size_t i = 0; i < num_passes; i++) {
-        row_nzeros[i][c] = group_dec_cache->num_nzeroes[i].PlaneRow(c, sby);
-        row_nzeros_top[i][c] =
-            sby == 0
-                ? nullptr
-                : group_dec_cache->num_nzeroes[i].ConstPlaneRow(c, sby - 1);
-      }
-    }
-  }
-
-  Status LoadBlock(size_t bx, size_t by, const AcStrategy& acs, size_t size,
-                   size_t log2_covered_blocks, ACPtr block[3],
-                   ACType ac_type) override {
-    ;
-    for (size_t c : {1, 0, 2}) {
-      size_t sbx = bx >> hshift[c];
-      size_t sby = by >> vshift[c];
-      if (JXL_UNLIKELY((sbx << hshift[c] != bx) || (sby << vshift[c] != by))) {
-        continue;
-      }
-
-      for (size_t pass = 0; JXL_UNLIKELY(pass < num_passes); pass++) {
-        auto decode_ac_varblock =
-            decoders[pass].UsesLZ77()
-                ? (ac_type == ACType::k16 ? DecodeACVarBlock<ACType::k16, 1>
-                                          : DecodeACVarBlock<ACType::k32, 1>)
-                : (ac_type == ACType::k16 ? DecodeACVarBlock<ACType::k16, 0>
-                                          : DecodeACVarBlock<ACType::k32, 0>);
-        JXL_RETURN_IF_ERROR(decode_ac_varblock(
-            ctx_offset[pass], log2_covered_blocks, row_nzeros[pass][c],
-            row_nzeros_top[pass][c], nzeros_stride, c, sbx, sby, bx, acs,
-            &coeff_orders[pass * coeff_order_size], readers[pass],
-            &decoders[pass], context_map[pass], quant_dc_row, qf_row,
-            *block_ctx_map, block[c], shift_for_pass[pass]));
-      }
-    }
-    return true;
-  }
-
-  Status Init(const FrameHeader& frame_header,
-              BitReader* JXL_RESTRICT* JXL_RESTRICT readers, size_t num_passes,
-              size_t group_idx, size_t histo_selector_bits, const Rect& rect,
-              GroupDecCache* JXL_RESTRICT group_dec_cache,
-              PassesDecoderState* dec_state, size_t first_pass) {
-    for (size_t i = 0; i < 3; i++) {
-      hshift[i] = frame_header.chroma_subsampling.HShift(i);
-      vshift[i] = frame_header.chroma_subsampling.VShift(i);
-    }
-    this->coeff_order_size = dec_state->shared->coeff_order_size;
-    this->coeff_orders =
-        dec_state->shared->coeff_orders.data() + first_pass * coeff_order_size;
-    this->context_map = dec_state->context_map.data() + first_pass;
-    this->readers = readers;
-    this->num_passes = num_passes;
-    this->shift_for_pass = frame_header.passes.shift + first_pass;
-    this->group_dec_cache = group_dec_cache;
-    this->rect = rect;
-    block_ctx_map = &dec_state->shared->block_ctx_map;
-    qf = &dec_state->shared->raw_quant_field;
-    quant_dc = &dec_state->shared->quant_dc;
-
-    for (size_t pass = 0; pass < num_passes; pass++) {
-      // Select which histogram set to use among those of the current pass.
-      size_t cur_histogram = 0;
-      if (histo_selector_bits != 0) {
-        cur_histogram = readers[pass]->ReadBits(histo_selector_bits);
-      }
-      if (cur_histogram >= dec_state->shared->num_histograms) {
-        return JXL_FAILURE("Invalid histogram selector");
-      }
-      ctx_offset[pass] = cur_histogram * block_ctx_map->NumACContexts();
-
-      JXL_ASSIGN_OR_RETURN(
-          decoders[pass],
-          ANSSymbolReader::Create(&dec_state->code[pass + first_pass],
-                                  readers[pass]));
-    }
-    nzeros_stride = group_dec_cache->num_nzeroes[0].PixelsPerRow();
-    for (size_t i = 0; i < num_passes; i++) {
-      JXL_ENSURE(
-          nzeros_stride ==
-          static_cast<size_t>(group_dec_cache->num_nzeroes[i].PixelsPerRow()));
-    }
-    return true;
-  }
-
-  const uint32_t* shift_for_pass = nullptr;  // not owned
-  const coeff_order_t* JXL_RESTRICT coeff_orders;
-  size_t coeff_order_size;
-  const std::vector<uint8_t>* JXL_RESTRICT context_map;
-  ANSSymbolReader decoders[kMaxNumPasses];
-  BitReader* JXL_RESTRICT* JXL_RESTRICT readers;
-  size_t num_passes;
-  size_t ctx_offset[kMaxNumPasses];
-  size_t nzeros_stride;
-  int32_t* JXL_RESTRICT row_nzeros[kMaxNumPasses][3];
-  const int32_t* JXL_RESTRICT row_nzeros_top[kMaxNumPasses][3];
-  GroupDecCache* JXL_RESTRICT group_dec_cache;
-  const BlockCtxMap* block_ctx_map;
-  const ImageI* qf;
-  const ImageB* quant_dc;
-  const int32_t* qf_row;
-  const uint8_t* quant_dc_row;
-  Rect rect;
-  size_t hshift[3], vshift[3];
-};
-
-struct GetBlockFromEncoder : public GetBlock {
-  void StartRow(size_t by) override {}
-
-  Status LoadBlock(size_t bx, size_t by, const AcStrategy& acs, size_t size,
-                   size_t log2_covered_blocks, ACPtr block[3],
-                   ACType ac_type) override {
-    JXL_ENSURE(ac_type == ACType::k32);
-    for (size_t c = 0; c < 3; c++) {
-      // for each pass
-      for (size_t i = 0; i < quantized_ac->size(); i++) {
-        for (size_t k = 0; k < size; k++) {
-          // TODO(veluca): SIMD.
-          block[c].ptr32[k] +=
-              rows[i][c][offset + k] * (1 << shift_for_pass[i]);
-        }
-      }
-    }
-    offset += size;
-    return true;
-  }
-
-  static StatusOr<GetBlockFromEncoder> Create(
-      const std::vector<std::unique_ptr<ACImage>>& ac, size_t group_idx,
-      const uint32_t* shift_for_pass) {
-    GetBlockFromEncoder result(ac, group_idx, shift_for_pass);
-    // TODO(veluca): not supported with chroma subsampling.
-    for (size_t i = 0; i < ac.size(); i++) {
-      JXL_ENSURE(ac[i]->Type() == ACType::k32);
-      for (size_t c = 0; c < 3; c++) {
-        result.rows[i][c] = ac[i]->PlaneRow(c, group_idx, 0).ptr32;
-      }
-    }
-    return result;
-  }
-
-  const std::vector<std::unique_ptr<ACImage>>* JXL_RESTRICT quantized_ac;
-  size_t offset = 0;
-  const int32_t* JXL_RESTRICT rows[kMaxNumPasses][3];
-  const uint32_t* shift_for_pass = nullptr;  // not owned
-
- private:
-  GetBlockFromEncoder(const std::vector<std::unique_ptr<ACImage>>& ac,
-                      size_t group_idx, const uint32_t* shift_for_pass)
-      : quantized_ac(&ac), shift_for_pass(shift_for_pass) {}
-};
-
-HWY_EXPORT(DecodeGroupImpl);
-
-}  // namespace
-
-Status DecodeGroup(const FrameHeader& frame_header,
-                   BitReader* JXL_RESTRICT* JXL_RESTRICT readers,
-                   size_t num_passes, size_t group_idx,
-                   PassesDecoderState* JXL_RESTRICT dec_state,
-                   GroupDecCache* JXL_RESTRICT group_dec_cache, size_t thread,
-                   RenderPipelineInput& render_pipeline_input,
-                   jpeg::JPEGData* JXL_RESTRICT jpeg_data, size_t first_pass,
-                   bool force_draw, bool dc_only, bool* should_run_pipeline) {
-  JxlMemoryManager* memory_manager = dec_state->memory_manager();
-  DrawMode draw =
-      (num_passes + first_pass == frame_header.passes.num_passes) || force_draw
-          ? kDraw
-          : kDontDraw;
-
-  if (should_run_pipeline) {
-    *should_run_pipeline = draw != kDontDraw;
-  }
-
-  if (draw == kDraw && num_passes == 0 && first_pass == 0) {
-    JXL_RETURN_IF_ERROR(group_dec_cache->InitDCBufferOnce(memory_manager));
-    const YCbCrChromaSubsampling& cs = frame_header.chroma_subsampling;
-    for (size_t c : {0, 1, 2}) {
-      size_t hs = cs.HShift(c);
-      size_t vs = cs.VShift(c);
-      // We reuse filter_input_storage here as it is not currently in use.
-      const Rect src_rect_precs =
-          dec_state->shared->frame_dim.BlockGroupRect(group_idx);
-      const Rect src_rect =
-          Rect(src_rect_precs.x0() >> hs, src_rect_precs.y0() >> vs,
-               src_rect_precs.xsize() >> hs, src_rect_precs.ysize() >> vs);
-      const Rect copy_rect(kRenderPipelineXOffset, 2, src_rect.xsize(),
-                           src_rect.ysize());
-      JXL_RETURN_IF_ERROR(
-          CopyImageToWithPadding(src_rect, dec_state->shared->dc->Plane(c), 2,
-                                 copy_rect, &group_dec_cache->dc_buffer));
-      // Mirrorpad. Interleaving left and right padding ensures that padding
-      // works out correctly even for images with DC size of 1.
-      for (size_t y = 0; y < src_rect.ysize() + 4; y++) {
-        size_t xend = kRenderPipelineXOffset +
-                      (dec_state->shared->dc->Plane(c).xsize() >> hs) -
-                      src_rect.x0();
-        for (size_t ix = 0; ix < 2; ix++) {
-          if (src_rect.x0() == 0) {
-            group_dec_cache->dc_buffer.Row(y)[kRenderPipelineXOffset - ix - 1] =
-                group_dec_cache->dc_buffer.Row(y)[kRenderPipelineXOffset + ix];
-          }
-          if (src_rect.x0() + src_rect.xsize() + 2 >=
-              (dec_state->shared->dc->xsize() >> hs)) {
-            group_dec_cache->dc_buffer.Row(y)[xend + ix] =
-                group_dec_cache->dc_buffer.Row(y)[xend - ix - 1];
-          }
-        }
-      }
-      const auto& buffer = render_pipeline_input.GetBuffer(c);
-      Rect dst_rect = buffer.second;
-      ImageF* upsampling_dst = buffer.first;
-      JXL_ENSURE(dst_rect.IsInside(*upsampling_dst));
-
-      RenderPipelineStage::RowInfo input_rows(1, std::vector<float*>(5));
-      RenderPipelineStage::RowInfo output_rows(1, std::vector<float*>(8));
-      for (size_t y = src_rect.y0(); y < src_rect.y0() + src_rect.ysize();
-           y++) {
-        for (ssize_t iy = 0; iy < 5; iy++) {
-          input_rows[0][iy] = group_dec_cache->dc_buffer.Row(
-              Mirror(static_cast<ssize_t>(y) + iy - 2,
-                     dec_state->shared->dc->Plane(c).ysize() >> vs) +
-              2 - src_rect.y0());
-        }
-        for (size_t iy = 0; iy < 8; iy++) {
-          output_rows[0][iy] =
-              dst_rect.Row(upsampling_dst, ((y - src_rect.y0()) << 3) + iy) -
-              kRenderPipelineXOffset;
-        }
-        // Arguments set to 0/nullptr are not used.
-        JXL_RETURN_IF_ERROR(dec_state->upsampler8x->ProcessRow(
-            input_rows, output_rows,
-            /*xextra=*/0, src_rect.xsize(), 0, 0, thread));
-      }
-    }
-    return true;
-  }
-
-  size_t histo_selector_bits = 0;
-  if (dc_only) {
-    JXL_ENSURE(num_passes == 0);
-  } else {
-    JXL_ENSURE(dec_state->shared->num_histograms > 0);
-    histo_selector_bits = CeilLog2Nonzero(dec_state->shared->num_histograms);
-  }
-
-  auto get_block = jxl::make_unique<GetBlockFromBitstream>();
-  JXL_RETURN_IF_ERROR(get_block->Init(
-      frame_header, readers, num_passes, group_idx, histo_selector_bits,
-      dec_state->shared->frame_dim.BlockGroupRect(group_idx), group_dec_cache,
-      dec_state, first_pass));
-
-  JXL_RETURN_IF_ERROR(HWY_DYNAMIC_DISPATCH(DecodeGroupImpl)(
-      frame_header, get_block.get(), group_dec_cache, dec_state, thread,
-      group_idx, render_pipeline_input, jpeg_data, draw));
-
-  for (size_t pass = 0; pass < num_passes; pass++) {
-    if (!get_block->decoders[pass].CheckANSFinalState()) {
-      return JXL_FAILURE("ANS checksum failure.");
-    }
-  }
-  return true;
-}
-
-Status DecodeGroupForRoundtrip(const FrameHeader& frame_header,
-                               const std::vector<std::unique_ptr<ACImage>>& ac,
-                               size_t group_idx,
-                               PassesDecoderState* JXL_RESTRICT dec_state,
-                               GroupDecCache* JXL_RESTRICT group_dec_cache,
-                               size_t thread,
-                               RenderPipelineInput& render_pipeline_input,
-                               jpeg::JPEGData* JXL_RESTRICT jpeg_data,
-                               AuxOut* aux_out) {
-  JxlMemoryManager* memory_manager = dec_state->memory_manager();
-  JXL_ASSIGN_OR_RETURN(
-      GetBlockFromEncoder get_block,
-      GetBlockFromEncoder::Create(ac, group_idx, frame_header.passes.shift));
-  JXL_RETURN_IF_ERROR(group_dec_cache->InitOnce(
-      memory_manager,
-      /*num_passes=*/0,
-      /*used_acs=*/(1u << AcStrategy::kNumValidStrategies) - 1));
-
-  return HWY_DYNAMIC_DISPATCH(DecodeGroupImpl)(
-      frame_header, &get_block, group_dec_cache, dec_state, thread, group_idx,
-      render_pipeline_input, jpeg_data, kDraw);
-}
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/dec_group.h b/third_party/jpeg-xl/lib/jxl/dec_group.h
deleted file mode 100644
index 9e954ba9914dd..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_group.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_DEC_GROUP_H_
-#define LIB_JXL_DEC_GROUP_H_
-
-#include <cstddef>
-#include <memory>
-#include <vector>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dct_util.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/dec_cache.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/jpeg/jpeg_data.h"
-#include "lib/jxl/render_pipeline/render_pipeline.h"
-
-namespace jxl {
-
-struct AuxOut;
-
-Status DecodeGroup(const FrameHeader& frame_header,
-                   BitReader* JXL_RESTRICT* JXL_RESTRICT readers,
-                   size_t num_passes, size_t group_idx,
-                   PassesDecoderState* JXL_RESTRICT dec_state,
-                   GroupDecCache* JXL_RESTRICT group_dec_cache, size_t thread,
-                   RenderPipelineInput& render_pipeline_input,
-                   jpeg::JPEGData* JXL_RESTRICT jpeg_data, size_t first_pass,
-                   bool force_draw, bool dc_only, bool* should_run_pipeline);
-
-Status DecodeGroupForRoundtrip(const FrameHeader& frame_header,
-                               const std::vector<std::unique_ptr<ACImage>>& ac,
-                               size_t group_idx,
-                               PassesDecoderState* JXL_RESTRICT dec_state,
-                               GroupDecCache* JXL_RESTRICT group_dec_cache,
-                               size_t thread,
-                               RenderPipelineInput& render_pipeline_input,
-                               jpeg::JPEGData* JXL_RESTRICT jpeg_data,
-                               AuxOut* aux_out);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_DEC_GROUP_H_
diff --git a/third_party/jpeg-xl/lib/jxl/dec_group_border.cc b/third_party/jpeg-xl/lib/jxl/dec_group_border.cc
deleted file mode 100644
index c9d105690cade..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_group_border.cc
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/dec_group_border.h"
-
-#include <atomic>
-#include <cstddef>
-#include <cstdint>
-#include <utility>
-
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/frame_dimensions.h"
-
-namespace jxl {
-
-void GroupBorderAssigner::Init(const FrameDimensions& frame_dim) {
-  frame_dim_ = frame_dim;
-  size_t num_corners =
-      (frame_dim_.xsize_groups + 1) * (frame_dim_.ysize_groups + 1);
-  { std::vector<std::atomic<uint8_t>>(num_corners).swap(counters_); }
-  // Initialize counters.
-  for (size_t y = 0; y < frame_dim_.ysize_groups + 1; y++) {
-    for (size_t x = 0; x < frame_dim_.xsize_groups + 1; x++) {
-      // Counters at image borders don't have anything on the other side, we
-      // pre-fill their value to have more uniform handling afterwards.
-      uint8_t init_value = 0;
-      if (x == 0) {
-        init_value |= kTopLeft | kBottomLeft;
-      }
-      if (x == frame_dim_.xsize_groups) {
-        init_value |= kTopRight | kBottomRight;
-      }
-      if (y == 0) {
-        init_value |= kTopLeft | kTopRight;
-      }
-      if (y == frame_dim_.ysize_groups) {
-        init_value |= kBottomLeft | kBottomRight;
-      }
-      counters_[y * (frame_dim_.xsize_groups + 1) + x] = init_value;
-    }
-  }
-}
-
-void GroupBorderAssigner::ClearDone(size_t group_id) {
-  size_t x = group_id % frame_dim_.xsize_groups;
-  size_t y = group_id / frame_dim_.xsize_groups;
-  size_t top_left_idx = y * (frame_dim_.xsize_groups + 1) + x;
-  size_t top_right_idx = y * (frame_dim_.xsize_groups + 1) + x + 1;
-  size_t bottom_right_idx = (y + 1) * (frame_dim_.xsize_groups + 1) + x + 1;
-  size_t bottom_left_idx = (y + 1) * (frame_dim_.xsize_groups + 1) + x;
-  counters_[top_left_idx].fetch_and(~kBottomRight);
-  counters_[top_right_idx].fetch_and(~kBottomLeft);
-  counters_[bottom_left_idx].fetch_and(~kTopRight);
-  counters_[bottom_right_idx].fetch_and(~kTopLeft);
-}
-
-// Looking at each corner between groups, we can guarantee that the four
-// involved groups will agree between each other regarding the order in which
-// each of the four groups terminated. Thus, the last of the four groups
-// gets the responsibility of handling the corner. For borders, every border
-// is assigned to its top corner (for vertical borders) or to its left corner
-// (for horizontal borders): the order as seen on those corners will decide who
-// handles that border.
-
-void GroupBorderAssigner::GroupDone(size_t group_id, size_t padx, size_t pady,
-                                    Rect* rects_to_finalize,
-                                    size_t* num_to_finalize) {
-  size_t x = group_id % frame_dim_.xsize_groups;
-  size_t y = group_id / frame_dim_.xsize_groups;
-  Rect block_rect(x * frame_dim_.group_dim / kBlockDim,
-                  y * frame_dim_.group_dim / kBlockDim,
-                  frame_dim_.group_dim / kBlockDim,
-                  frame_dim_.group_dim / kBlockDim, frame_dim_.xsize_blocks,
-                  frame_dim_.ysize_blocks);
-
-  size_t top_left_idx = y * (frame_dim_.xsize_groups + 1) + x;
-  size_t top_right_idx = y * (frame_dim_.xsize_groups + 1) + x + 1;
-  size_t bottom_right_idx = (y + 1) * (frame_dim_.xsize_groups + 1) + x + 1;
-  size_t bottom_left_idx = (y + 1) * (frame_dim_.xsize_groups + 1) + x;
-
-  auto fetch_status = [this](size_t idx, uint8_t bit) {
-    // Note that the acq-rel semantics of this fetch are actually needed to
-    // ensure that the pixel data of the group is already written to memory.
-    size_t status = counters_[idx].fetch_or(bit);
-    JXL_DASSERT((bit & status) == 0);
-    return bit | status;
-  };
-
-  size_t top_left_status = fetch_status(top_left_idx, kBottomRight);
-  size_t top_right_status = fetch_status(top_right_idx, kBottomLeft);
-  size_t bottom_right_status = fetch_status(bottom_right_idx, kTopLeft);
-  size_t bottom_left_status = fetch_status(bottom_left_idx, kTopRight);
-
-  size_t x1 = block_rect.x0() + block_rect.xsize();
-  size_t y1 = block_rect.y0() + block_rect.ysize();
-
-  bool is_last_group_x = frame_dim_.xsize_groups == x + 1;
-  bool is_last_group_y = frame_dim_.ysize_groups == y + 1;
-
-  // Start of border of neighbouring group, end of border of this group, start
-  // of border of this group (on the other side), end of border of next group.
-  size_t xpos[4] = {
-      block_rect.x0() == 0 ? 0 : block_rect.x0() * kBlockDim - padx,
-      block_rect.x0() == 0
-          ? 0
-          : std::min(frame_dim_.xsize, block_rect.x0() * kBlockDim + padx),
-      is_last_group_x ? frame_dim_.xsize : x1 * kBlockDim - padx,
-      std::min(frame_dim_.xsize, x1 * kBlockDim + padx)};
-  size_t ypos[4] = {
-      block_rect.y0() == 0 ? 0 : block_rect.y0() * kBlockDim - pady,
-      block_rect.y0() == 0
-          ? 0
-          : std::min(frame_dim_.ysize, block_rect.y0() * kBlockDim + pady),
-      is_last_group_y ? frame_dim_.ysize : y1 * kBlockDim - pady,
-      std::min(frame_dim_.ysize, y1 * kBlockDim + pady)};
-
-  *num_to_finalize = 0;
-  auto append_rect = [&](size_t x0, size_t x1, size_t y0, size_t y1) {
-    Rect rect(xpos[x0], ypos[y0], xpos[x1] - xpos[x0], ypos[y1] - ypos[y0]);
-    if (rect.xsize() == 0 || rect.ysize() == 0) return;
-    JXL_DASSERT(*num_to_finalize < kMaxToFinalize);
-    rects_to_finalize[(*num_to_finalize)++] = rect;
-  };
-
-  // Because of how group borders are assigned, it is impossible that we need to
-  // process the left and right side of some area but not the center area. Thus,
-  // we compute the first/last part to process in every horizontal strip and
-  // merge them together. We first collect a mask of what parts should be
-  // processed.
-  // We do this horizontally rather than vertically because horizontal borders
-  // are larger.
-  bool available_parts_mask[3][3] = {};  // [x][y]
-  // Center
-  available_parts_mask[1][1] = true;
-  // Corners
-  if (top_left_status == 0xF) available_parts_mask[0][0] = true;
-  if (top_right_status == 0xF) available_parts_mask[2][0] = true;
-  if (bottom_right_status == 0xF) available_parts_mask[2][2] = true;
-  if (bottom_left_status == 0xF) available_parts_mask[0][2] = true;
-  // Other borders
-  if (top_left_status & kTopRight) available_parts_mask[1][0] = true;
-  if (top_left_status & kBottomLeft) available_parts_mask[0][1] = true;
-  if (top_right_status & kBottomRight) available_parts_mask[2][1] = true;
-  if (bottom_left_status & kBottomRight) available_parts_mask[1][2] = true;
-
-  // Collect horizontal ranges.
-  constexpr size_t kNoSegment = 3;
-  std::pair<size_t, size_t> horizontal_segments[3] = {{kNoSegment, kNoSegment},
-                                                      {kNoSegment, kNoSegment},
-                                                      {kNoSegment, kNoSegment}};
-  for (size_t y = 0; y < 3; y++) {
-    for (size_t x = 0; x < 3; x++) {
-      if (!available_parts_mask[x][y]) continue;
-      JXL_DASSERT(horizontal_segments[y].second == kNoSegment ||
-                  horizontal_segments[y].second == x);
-      JXL_DASSERT((horizontal_segments[y].first == kNoSegment) ==
-                  (horizontal_segments[y].second == kNoSegment));
-      if (horizontal_segments[y].first == kNoSegment) {
-        horizontal_segments[y].first = x;
-      }
-      horizontal_segments[y].second = x + 1;
-    }
-  }
-  if (horizontal_segments[0] == horizontal_segments[1] &&
-      horizontal_segments[0] == horizontal_segments[2]) {
-    append_rect(horizontal_segments[0].first, horizontal_segments[0].second, 0,
-                3);
-  } else if (horizontal_segments[0] == horizontal_segments[1]) {
-    append_rect(horizontal_segments[0].first, horizontal_segments[0].second, 0,
-                2);
-    append_rect(horizontal_segments[2].first, horizontal_segments[2].second, 2,
-                3);
-  } else if (horizontal_segments[1] == horizontal_segments[2]) {
-    append_rect(horizontal_segments[0].first, horizontal_segments[0].second, 0,
-                1);
-    append_rect(horizontal_segments[1].first, horizontal_segments[1].second, 1,
-                3);
-  } else {
-    append_rect(horizontal_segments[0].first, horizontal_segments[0].second, 0,
-                1);
-    append_rect(horizontal_segments[1].first, horizontal_segments[1].second, 1,
-                2);
-    append_rect(horizontal_segments[2].first, horizontal_segments[2].second, 2,
-                3);
-  }
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/dec_group_border.h b/third_party/jpeg-xl/lib/jxl/dec_group_border.h
deleted file mode 100644
index 06b2fb5573830..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_group_border.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_DEC_GROUP_BORDER_H_
-#define LIB_JXL_DEC_GROUP_BORDER_H_
-
-#include <atomic>
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/frame_dimensions.h"
-
-namespace jxl {
-
-class GroupBorderAssigner {
- public:
-  // Prepare the GroupBorderAssigner to handle a given frame.
-  void Init(const FrameDimensions& frame_dim);
-  // Marks a group as done, and returns the (at most 3) rects to run
-  // FinalizeImageRect on. `block_rect` must be the rect corresponding
-  // to the given `group_id`, measured in blocks.
-  void GroupDone(size_t group_id, size_t padx, size_t pady,
-                 Rect* rects_to_finalize, size_t* num_to_finalize);
-  // Marks a group as not-done, for running re-paints.
-  void ClearDone(size_t group_id);
-
-  static constexpr size_t kMaxToFinalize = 3;
-
- private:
-  FrameDimensions frame_dim_;
-  std::vector<std::atomic<uint8_t>> counters_;
-
-  // Constants to identify group positions relative to the corners.
-  static constexpr uint8_t kTopLeft = 0x01;
-  static constexpr uint8_t kTopRight = 0x02;
-  static constexpr uint8_t kBottomRight = 0x04;
-  static constexpr uint8_t kBottomLeft = 0x08;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_DEC_GROUP_BORDER_H_
diff --git a/third_party/jpeg-xl/lib/jxl/dec_huffman.cc b/third_party/jpeg-xl/lib/jxl/dec_huffman.cc
deleted file mode 100644
index 849b1a5f647a1..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_huffman.cc
+++ /dev/null
@@ -1,258 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/dec_huffman.h"
-
-#include <jxl/types.h>
-#include <string.h> /* for memset */
-
-#include <vector>
-
-#include "lib/jxl/ans_params.h"
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/huffman_table.h"
-
-namespace jxl {
-
-static const int kCodeLengthCodes = 18;
-static const uint8_t kCodeLengthCodeOrder[kCodeLengthCodes] = {
-    1, 2, 3, 4, 0, 5, 17, 6, 16, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-};
-static const uint8_t kDefaultCodeLength = 8;
-static const uint8_t kCodeLengthRepeatCode = 16;
-
-JXL_BOOL ReadHuffmanCodeLengths(const uint8_t* code_length_code_lengths,
-                                int num_symbols, uint8_t* code_lengths,
-                                BitReader* br) {
-  int symbol = 0;
-  uint8_t prev_code_len = kDefaultCodeLength;
-  int repeat = 0;
-  uint8_t repeat_code_len = 0;
-  int space = 32768;
-  HuffmanCode table[32];
-
-  uint16_t counts[16] = {0};
-  for (int i = 0; i < kCodeLengthCodes; ++i) {
-    ++counts[code_length_code_lengths[i]];
-  }
-  if (!BuildHuffmanTable(table, 5, code_length_code_lengths, kCodeLengthCodes,
-                         &counts[0])) {
-    return JXL_FALSE;
-  }
-
-  while (symbol < num_symbols && space > 0) {
-    const HuffmanCode* p = table;
-    uint8_t code_len;
-    br->Refill();
-    p += br->PeekFixedBits<5>();
-    br->Consume(p->bits);
-    code_len = static_cast<uint8_t>(p->value);
-    if (code_len < kCodeLengthRepeatCode) {
-      repeat = 0;
-      code_lengths[symbol++] = code_len;
-      if (code_len != 0) {
-        prev_code_len = code_len;
-        space -= 32768u >> code_len;
-      }
-    } else {
-      const int extra_bits = code_len - 14;
-      int old_repeat;
-      int repeat_delta;
-      uint8_t new_len = 0;
-      if (code_len == kCodeLengthRepeatCode) {
-        new_len = prev_code_len;
-      }
-      if (repeat_code_len != new_len) {
-        repeat = 0;
-        repeat_code_len = new_len;
-      }
-      old_repeat = repeat;
-      if (repeat > 0) {
-        repeat -= 2;
-        repeat <<= extra_bits;
-      }
-      repeat += static_cast<int>(br->ReadBits(extra_bits) + 3);
-      repeat_delta = repeat - old_repeat;
-      if (symbol + repeat_delta > num_symbols) {
-        return 0;
-      }
-      memset(&code_lengths[symbol], repeat_code_len,
-             static_cast<size_t>(repeat_delta));
-      symbol += repeat_delta;
-      if (repeat_code_len != 0) {
-        space -= repeat_delta << (15 - repeat_code_len);
-      }
-    }
-  }
-  if (space != 0) {
-    return JXL_FALSE;
-  }
-  memset(&code_lengths[symbol], 0, static_cast<size_t>(num_symbols - symbol));
-  return JXL_TRUE;
-}
-
-static JXL_INLINE bool ReadSimpleCode(size_t alphabet_size, BitReader* br,
-                                      HuffmanCode* table) {
-  size_t max_bits =
-      (alphabet_size > 1u) ? FloorLog2Nonzero(alphabet_size - 1u) + 1 : 0;
-
-  size_t num_symbols = br->ReadFixedBits<2>() + 1;
-
-  uint16_t symbols[4] = {0};
-  for (size_t i = 0; i < num_symbols; ++i) {
-    uint16_t symbol = br->ReadBits(max_bits);
-    if (symbol >= alphabet_size) {
-      return false;
-    }
-    symbols[i] = symbol;
-  }
-
-  for (size_t i = 0; i < num_symbols - 1; ++i) {
-    for (size_t j = i + 1; j < num_symbols; ++j) {
-      if (symbols[i] == symbols[j]) return false;
-    }
-  }
-
-  // 4 symbols have to option to encode.
-  if (num_symbols == 4) num_symbols += br->ReadFixedBits<1>();
-
-  const auto swap_symbols = [&symbols](size_t i, size_t j) {
-    uint16_t t = symbols[j];
-    symbols[j] = symbols[i];
-    symbols[i] = t;
-  };
-
-  size_t table_size = 1;
-  switch (num_symbols) {
-    case 1:
-      table[0] = {0, symbols[0]};
-      break;
-    case 2:
-      if (symbols[0] > symbols[1]) swap_symbols(0, 1);
-      table[0] = {1, symbols[0]};
-      table[1] = {1, symbols[1]};
-      table_size = 2;
-      break;
-    case 3:
-      if (symbols[1] > symbols[2]) swap_symbols(1, 2);
-      table[0] = {1, symbols[0]};
-      table[2] = {1, symbols[0]};
-      table[1] = {2, symbols[1]};
-      table[3] = {2, symbols[2]};
-      table_size = 4;
-      break;
-    case 4: {
-      for (size_t i = 0; i < 3; ++i) {
-        for (size_t j = i + 1; j < 4; ++j) {
-          if (symbols[i] > symbols[j]) swap_symbols(i, j);
-        }
-      }
-      table[0] = {2, symbols[0]};
-      table[2] = {2, symbols[1]};
-      table[1] = {2, symbols[2]};
-      table[3] = {2, symbols[3]};
-      table_size = 4;
-      break;
-    }
-    case 5: {
-      if (symbols[2] > symbols[3]) swap_symbols(2, 3);
-      table[0] = {1, symbols[0]};
-      table[1] = {2, symbols[1]};
-      table[2] = {1, symbols[0]};
-      table[3] = {3, symbols[2]};
-      table[4] = {1, symbols[0]};
-      table[5] = {2, symbols[1]};
-      table[6] = {1, symbols[0]};
-      table[7] = {3, symbols[3]};
-      table_size = 8;
-      break;
-    }
-    default: {
-      // Unreachable.
-      return false;
-    }
-  }
-
-  const uint32_t goal_size = 1u << kHuffmanTableBits;
-  while (table_size != goal_size) {
-    memcpy(&table[table_size], &table[0],
-           static_cast<size_t>(table_size) * sizeof(table[0]));
-    table_size <<= 1;
-  }
-
-  return true;
-}
-
-bool HuffmanDecodingData::ReadFromBitStream(size_t alphabet_size,
-                                            BitReader* br) {
-  if (alphabet_size > (1 << PREFIX_MAX_BITS)) return false;
-
-  /* simple_code_or_skip is used as follows:
-     1 for simple code;
-     0 for no skipping, 2 skips 2 code lengths, 3 skips 3 code lengths */
-  uint32_t simple_code_or_skip = br->ReadFixedBits<2>();
-  if (simple_code_or_skip == 1u) {
-    table_.resize(1u << kHuffmanTableBits);
-    return ReadSimpleCode(alphabet_size, br, table_.data());
-  }
-
-  std::vector<uint8_t> code_lengths(alphabet_size, 0);
-  uint8_t code_length_code_lengths[kCodeLengthCodes] = {0};
-  int space = 32;
-  int num_codes = 0;
-  /* Static Huffman code for the code length code lengths */
-  static const HuffmanCode huff[16] = {
-      {2, 0}, {2, 4}, {2, 3}, {3, 2}, {2, 0}, {2, 4}, {2, 3}, {4, 1},
-      {2, 0}, {2, 4}, {2, 3}, {3, 2}, {2, 0}, {2, 4}, {2, 3}, {4, 5},
-  };
-  for (size_t i = simple_code_or_skip; i < kCodeLengthCodes && space > 0; ++i) {
-    const int code_len_idx = kCodeLengthCodeOrder[i];
-    const HuffmanCode* p = huff;
-    uint8_t v;
-    br->Refill();
-    p += br->PeekFixedBits<4>();
-    br->Consume(p->bits);
-    v = static_cast<uint8_t>(p->value);
-    code_length_code_lengths[code_len_idx] = v;
-    if (v != 0) {
-      space -= (32u >> v);
-      ++num_codes;
-    }
-  }
-  bool ok =
-      (num_codes == 1 || space == 0) &&
-      FROM_JXL_BOOL(ReadHuffmanCodeLengths(
-          code_length_code_lengths, alphabet_size, code_lengths.data(), br));
-
-  if (!ok) return false;
-  uint16_t counts[16] = {0};
-  for (size_t i = 0; i < alphabet_size; ++i) {
-    ++counts[code_lengths[i]];
-  }
-  table_.resize(alphabet_size + 376);
-  uint32_t table_size =
-      BuildHuffmanTable(table_.data(), kHuffmanTableBits, code_lengths.data(),
-                        alphabet_size, &counts[0]);
-  table_.resize(table_size);
-  return (table_size > 0);
-}
-
-// Decodes the next Huffman coded symbol from the bit-stream.
-uint16_t HuffmanDecodingData::ReadSymbol(BitReader* br) const {
-  size_t n_bits;
-  const HuffmanCode* table = table_.data();
-  table += br->PeekBits(kHuffmanTableBits);
-  n_bits = table->bits;
-  if (n_bits > kHuffmanTableBits) {
-    br->Consume(kHuffmanTableBits);
-    n_bits -= kHuffmanTableBits;
-    table += table->value;
-    table += br->PeekBits(n_bits);
-  }
-  br->Consume(table->bits);
-  return table->value;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/dec_huffman.h b/third_party/jpeg-xl/lib/jxl/dec_huffman.h
deleted file mode 100644
index 162c3e309c4d1..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_huffman.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_DEC_HUFFMAN_H_
-#define LIB_JXL_DEC_HUFFMAN_H_
-
-#include <memory>
-#include <vector>
-
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/huffman_table.h"
-
-namespace jxl {
-
-static constexpr size_t kHuffmanTableBits = 8u;
-
-struct HuffmanDecodingData {
-  // Decodes the Huffman code lengths from the bit-stream and fills in the
-  // pre-allocated table with the corresponding 2-level Huffman decoding table.
-  // Returns false if the Huffman code lengths can not de decoded.
-  bool ReadFromBitStream(size_t alphabet_size, BitReader* br);
-
-  uint16_t ReadSymbol(BitReader* br) const;
-
-  std::vector<HuffmanCode> table_;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_DEC_HUFFMAN_H_
diff --git a/third_party/jpeg-xl/lib/jxl/dec_modular.cc b/third_party/jpeg-xl/lib/jxl/dec_modular.cc
deleted file mode 100644
index e8dc17fa7dc49..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_modular.cc
+++ /dev/null
@@ -1,814 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/dec_modular.h"
-
-#include <jxl/memory_manager.h>
-
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/frame_header.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/dec_modular.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/compressed_dc.h"
-#include "lib/jxl/epf.h"
-#include "lib/jxl/modular/encoding/encoding.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/modular/transform/transform.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::Rebind;
-
-void MultiplySum(const size_t xsize,
-                 const pixel_type* const JXL_RESTRICT row_in,
-                 const pixel_type* const JXL_RESTRICT row_in_Y,
-                 const float factor, float* const JXL_RESTRICT row_out) {
-  const HWY_FULL(float) df;
-  const Rebind<pixel_type, HWY_FULL(float)> di;  // assumes pixel_type <= float
-  const auto factor_v = Set(df, factor);
-  for (size_t x = 0; x < xsize; x += Lanes(di)) {
-    const auto in = Add(Load(di, row_in + x), Load(di, row_in_Y + x));
-    const auto out = Mul(ConvertTo(df, in), factor_v);
-    Store(out, df, row_out + x);
-  }
-}
-
-void RgbFromSingle(const size_t xsize,
-                   const pixel_type* const JXL_RESTRICT row_in,
-                   const float factor, float* out_r, float* out_g,
-                   float* out_b) {
-  const HWY_FULL(float) df;
-  const Rebind<pixel_type, HWY_FULL(float)> di;  // assumes pixel_type <= float
-
-  const auto factor_v = Set(df, factor);
-  for (size_t x = 0; x < xsize; x += Lanes(di)) {
-    const auto in = Load(di, row_in + x);
-    const auto out = Mul(ConvertTo(df, in), factor_v);
-    Store(out, df, out_r + x);
-    Store(out, df, out_g + x);
-    Store(out, df, out_b + x);
-  }
-}
-
-void SingleFromSingle(const size_t xsize,
-                      const pixel_type* const JXL_RESTRICT row_in,
-                      const float factor, float* row_out) {
-  const HWY_FULL(float) df;
-  const Rebind<pixel_type, HWY_FULL(float)> di;  // assumes pixel_type <= float
-
-  const auto factor_v = Set(df, factor);
-  for (size_t x = 0; x < xsize; x += Lanes(di)) {
-    const auto in = Load(di, row_in + x);
-    const auto out = Mul(ConvertTo(df, in), factor_v);
-    Store(out, df, row_out + x);
-  }
-}
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-HWY_EXPORT(MultiplySum);       // Local function
-HWY_EXPORT(RgbFromSingle);     // Local function
-HWY_EXPORT(SingleFromSingle);  // Local function
-
-// Slow conversion using double precision multiplication, only
-// needed when the bit depth is too high for single precision
-void SingleFromSingleAccurate(const size_t xsize,
-                              const pixel_type* const JXL_RESTRICT row_in,
-                              const double factor, float* row_out) {
-  for (size_t x = 0; x < xsize; x++) {
-    row_out[x] = row_in[x] * factor;
-  }
-}
-
-// convert custom [bits]-bit float (with [exp_bits] exponent bits) stored as int
-// back to binary32 float
-Status int_to_float(const pixel_type* const JXL_RESTRICT row_in,
-                    float* const JXL_RESTRICT row_out, const size_t xsize,
-                    const int bits, const int exp_bits) {
-  static_assert(sizeof(pixel_type) == sizeof(float));
-  if (bits == 32) {
-    JXL_ENSURE(exp_bits == 8);
-    memcpy(row_out, row_in, xsize * sizeof(float));
-    return true;
-  }
-  int exp_bias = (1 << (exp_bits - 1)) - 1;
-  int sign_shift = bits - 1;
-  int mant_bits = bits - exp_bits - 1;
-  int mant_shift = 23 - mant_bits;
-  for (size_t x = 0; x < xsize; ++x) {
-    uint32_t f;
-    memcpy(&f, &row_in[x], 4);
-    int signbit = (f >> sign_shift);
-    f &= (1 << sign_shift) - 1;
-    if (f == 0) {
-      row_out[x] = (signbit ? -0.f : 0.f);
-      continue;
-    }
-    int exp = (f >> mant_bits);
-    int mantissa = (f & ((1 << mant_bits) - 1));
-    mantissa <<= mant_shift;
-    // Try to normalize only if there is space for maneuver.
-    if (exp == 0 && exp_bits < 8) {
-      // subnormal number
-      while ((mantissa & 0x800000) == 0) {
-        mantissa <<= 1;
-        exp--;
-      }
-      exp++;
-      // remove leading 1 because it is implicit now
-      mantissa &= 0x7fffff;
-    }
-    exp -= exp_bias;
-    // broke up the arbitrary float into its parts, now reassemble into
-    // binary32
-    exp += 127;
-    JXL_ENSURE(exp >= 0);
-    f = (signbit ? 0x80000000 : 0);
-    f |= (exp << 23);
-    f |= mantissa;
-    memcpy(&row_out[x], &f, 4);
-  }
-  return true;
-}
-
-#if JXL_DEBUG_V_LEVEL >= 1
-std::string ModularStreamId::DebugString() const {
-  std::ostringstream os;
-  os << (kind == GlobalData   ? "ModularGlobal"
-         : kind == VarDCTDC   ? "VarDCTDC"
-         : kind == ModularDC  ? "ModularDC"
-         : kind == ACMetadata ? "ACMeta"
-         : kind == QuantTable ? "QuantTable"
-         : kind == ModularAC  ? "ModularAC"
-                              : "");
-  if (kind == VarDCTDC || kind == ModularDC || kind == ACMetadata ||
-      kind == ModularAC) {
-    os << " group " << group_id;
-  }
-  if (kind == ModularAC) {
-    os << " pass " << pass_id;
-  }
-  if (kind == QuantTable) {
-    os << " " << quant_table_id;
-  }
-  return os.str();
-}
-#endif
-
-Status ModularFrameDecoder::DecodeGlobalInfo(BitReader* reader,
-                                             const FrameHeader& frame_header,
-                                             bool allow_truncated_group) {
-  JxlMemoryManager* memory_manager = this->memory_manager();
-  bool decode_color = frame_header.encoding == FrameEncoding::kModular;
-  const auto& metadata = frame_header.nonserialized_metadata->m;
-  bool is_gray = metadata.color_encoding.IsGray();
-  size_t nb_chans = 3;
-  if (is_gray && frame_header.color_transform == ColorTransform::kNone) {
-    nb_chans = 1;
-  }
-  do_color = decode_color;
-  size_t nb_extra = metadata.extra_channel_info.size();
-  bool has_tree = static_cast<bool>(reader->ReadBits(1));
-  if (!allow_truncated_group ||
-      reader->TotalBitsConsumed() < reader->TotalBytes() * kBitsPerByte) {
-    if (has_tree) {
-      size_t tree_size_limit =
-          std::min(static_cast<size_t>(1 << 22),
-                   1024 + frame_dim.xsize * frame_dim.ysize *
-                              (nb_chans + nb_extra) / 16);
-      JXL_RETURN_IF_ERROR(
-          DecodeTree(memory_manager, reader, &tree, tree_size_limit));
-      JXL_RETURN_IF_ERROR(DecodeHistograms(
-          memory_manager, reader, (tree.size() + 1) / 2, &code, &context_map));
-    }
-  }
-  if (!do_color) nb_chans = 0;
-
-  bool fp = metadata.bit_depth.floating_point_sample;
-
-  // bits_per_sample is just metadata for XYB images.
-  if (metadata.bit_depth.bits_per_sample >= 32 && do_color &&
-      frame_header.color_transform != ColorTransform::kXYB) {
-    if (metadata.bit_depth.bits_per_sample == 32 && fp == false) {
-      return JXL_FAILURE("uint32_t not supported in dec_modular");
-    } else if (metadata.bit_depth.bits_per_sample > 32) {
-      return JXL_FAILURE("bits_per_sample > 32 not supported");
-    }
-  }
-
-  JXL_ASSIGN_OR_RETURN(
-      Image gi,
-      Image::Create(memory_manager, frame_dim.xsize, frame_dim.ysize,
-                    metadata.bit_depth.bits_per_sample, nb_chans + nb_extra));
-
-  all_same_shift = true;
-  if (frame_header.color_transform == ColorTransform::kYCbCr) {
-    for (size_t c = 0; c < nb_chans; c++) {
-      gi.channel[c].hshift = frame_header.chroma_subsampling.HShift(c);
-      gi.channel[c].vshift = frame_header.chroma_subsampling.VShift(c);
-      size_t xsize_shifted =
-          DivCeil(frame_dim.xsize, 1 << gi.channel[c].hshift);
-      size_t ysize_shifted =
-          DivCeil(frame_dim.ysize, 1 << gi.channel[c].vshift);
-      JXL_RETURN_IF_ERROR(gi.channel[c].shrink(xsize_shifted, ysize_shifted));
-      if (gi.channel[c].hshift != gi.channel[0].hshift ||
-          gi.channel[c].vshift != gi.channel[0].vshift)
-        all_same_shift = false;
-    }
-  }
-
-  for (size_t ec = 0, c = nb_chans; ec < nb_extra; ec++, c++) {
-    size_t ecups = frame_header.extra_channel_upsampling[ec];
-    JXL_RETURN_IF_ERROR(
-        gi.channel[c].shrink(DivCeil(frame_dim.xsize_upsampled, ecups),
-                             DivCeil(frame_dim.ysize_upsampled, ecups)));
-    gi.channel[c].hshift = gi.channel[c].vshift =
-        CeilLog2Nonzero(ecups) - CeilLog2Nonzero(frame_header.upsampling);
-    if (gi.channel[c].hshift != gi.channel[0].hshift ||
-        gi.channel[c].vshift != gi.channel[0].vshift)
-      all_same_shift = false;
-  }
-
-  JXL_DEBUG_V(6, "DecodeGlobalInfo: full_image (w/o transforms) %s",
-              gi.DebugString().c_str());
-  ModularOptions options;
-  options.max_chan_size = frame_dim.group_dim;
-  options.group_dim = frame_dim.group_dim;
-  Status dec_status = ModularGenericDecompress(
-      reader, gi, &global_header, ModularStreamId::Global().ID(frame_dim),
-      &options,
-      /*undo_transforms=*/false, &tree, &code, &context_map,
-      allow_truncated_group);
-  if (!allow_truncated_group) JXL_RETURN_IF_ERROR(dec_status);
-  if (dec_status.IsFatalError()) {
-    return JXL_FAILURE("Failed to decode global modular info");
-  }
-
-  // TODO(eustas): are we sure this can be done after partial decode?
-  have_something = false;
-  for (size_t c = 0; c < gi.channel.size(); c++) {
-    Channel& gic = gi.channel[c];
-    if (c >= gi.nb_meta_channels && gic.w <= frame_dim.group_dim &&
-        gic.h <= frame_dim.group_dim)
-      have_something = true;
-  }
-  // move global transforms to groups if possible
-  if (!have_something && all_same_shift) {
-    if (gi.transform.size() == 1 && gi.transform[0].id == TransformId::kRCT) {
-      global_transform = gi.transform;
-      gi.transform.clear();
-      // TODO(jon): also move no-delta-palette out (trickier though)
-    }
-  }
-  full_image = std::move(gi);
-  JXL_DEBUG_V(6, "DecodeGlobalInfo: full_image (with transforms) %s",
-              full_image.DebugString().c_str());
-  return dec_status;
-}
-
-void ModularFrameDecoder::MaybeDropFullImage() {
-  if (full_image.transform.empty() && !have_something && all_same_shift) {
-    use_full_image = false;
-    JXL_DEBUG_V(6, "Dropping full image");
-    for (auto& ch : full_image.channel) {
-      // keep metadata on channels around, but dealloc their planes
-      ch.plane = Plane<pixel_type>();
-    }
-  }
-}
-
-Status ModularFrameDecoder::DecodeGroup(
-    const FrameHeader& frame_header, const Rect& rect, BitReader* reader,
-    int minShift, int maxShift, const ModularStreamId& stream, bool zerofill,
-    PassesDecoderState* dec_state, RenderPipelineInput* render_pipeline_input,
-    bool allow_truncated, bool* should_run_pipeline) {
-  JXL_DEBUG_V(6, "Decoding %s with rect %s and shift bracket %d..%d %s",
-              stream.DebugString().c_str(), Description(rect).c_str(), minShift,
-              maxShift, zerofill ? "using zerofill" : "");
-  JXL_ENSURE(stream.kind == ModularStreamId::Kind::ModularDC ||
-             stream.kind == ModularStreamId::Kind::ModularAC);
-  const size_t xsize = rect.xsize();
-  const size_t ysize = rect.ysize();
-  JXL_ASSIGN_OR_RETURN(Image gi, Image::Create(memory_manager_, xsize, ysize,
-                                               full_image.bitdepth, 0));
-  // start at the first bigger-than-groupsize non-metachannel
-  size_t c = full_image.nb_meta_channels;
-  for (; c < full_image.channel.size(); c++) {
-    Channel& fc = full_image.channel[c];
-    if (fc.w > frame_dim.group_dim || fc.h > frame_dim.group_dim) break;
-  }
-  size_t beginc = c;
-  for (; c < full_image.channel.size(); c++) {
-    Channel& fc = full_image.channel[c];
-    int shift = std::min(fc.hshift, fc.vshift);
-    if (shift > maxShift) continue;
-    if (shift < minShift) continue;
-    Rect r(rect.x0() >> fc.hshift, rect.y0() >> fc.vshift,
-           rect.xsize() >> fc.hshift, rect.ysize() >> fc.vshift, fc.w, fc.h);
-    if (r.xsize() == 0 || r.ysize() == 0) continue;
-    if (zerofill && use_full_image) {
-      for (size_t y = 0; y < r.ysize(); ++y) {
-        pixel_type* const JXL_RESTRICT row_out = r.Row(&fc.plane, y);
-        memset(row_out, 0, r.xsize() * sizeof(*row_out));
-      }
-    } else {
-      JXL_ASSIGN_OR_RETURN(
-          Channel gc, Channel::Create(memory_manager_, r.xsize(), r.ysize()));
-      if (zerofill) ZeroFillImage(&gc.plane);
-      gc.hshift = fc.hshift;
-      gc.vshift = fc.vshift;
-      gi.channel.emplace_back(std::move(gc));
-    }
-  }
-  if (zerofill && use_full_image) return true;
-  // Return early if there's nothing to decode. Otherwise there might be
-  // problems later (in ModularImageToDecodedRect).
-  if (gi.channel.empty()) {
-    if (dec_state && should_run_pipeline) {
-      const auto* metadata = frame_header.nonserialized_metadata;
-      if (do_color || metadata->m.num_extra_channels > 0) {
-        // Signal to FrameDecoder that we do not have some of the required input
-        // for the render pipeline.
-        *should_run_pipeline = false;
-      }
-    }
-    JXL_DEBUG_V(6, "Nothing to decode, returning early.");
-    return true;
-  }
-  ModularOptions options;
-  if (!zerofill) {
-    auto status = ModularGenericDecompress(
-        reader, gi, /*header=*/nullptr, stream.ID(frame_dim), &options,
-        /*undo_transforms=*/true, &tree, &code, &context_map, allow_truncated);
-    if (!allow_truncated) JXL_RETURN_IF_ERROR(status);
-    if (status.IsFatalError()) return status;
-  }
-  // Undo global transforms that have been pushed to the group level
-  if (!use_full_image) {
-    JXL_ENSURE(render_pipeline_input);
-    for (const auto& t : global_transform) {
-      JXL_RETURN_IF_ERROR(t.Inverse(gi, global_header.wp_header));
-    }
-    JXL_RETURN_IF_ERROR(ModularImageToDecodedRect(
-        frame_header, gi, dec_state, nullptr, *render_pipeline_input,
-        Rect(0, 0, gi.w, gi.h)));
-    return true;
-  }
-  int gic = 0;
-  for (c = beginc; c < full_image.channel.size(); c++) {
-    Channel& fc = full_image.channel[c];
-    int shift = std::min(fc.hshift, fc.vshift);
-    if (shift > maxShift) continue;
-    if (shift < minShift) continue;
-    Rect r(rect.x0() >> fc.hshift, rect.y0() >> fc.vshift,
-           rect.xsize() >> fc.hshift, rect.ysize() >> fc.vshift, fc.w, fc.h);
-    if (r.xsize() == 0 || r.ysize() == 0) continue;
-    JXL_ENSURE(use_full_image);
-    JXL_RETURN_IF_ERROR(
-        CopyImageTo(/*rect_from=*/Rect(0, 0, r.xsize(), r.ysize()),
-                    /*from=*/gi.channel[gic].plane,
-                    /*rect_to=*/r, /*to=*/&fc.plane));
-    gic++;
-  }
-  return true;
-}
-
-Status ModularFrameDecoder::DecodeVarDCTDC(const FrameHeader& frame_header,
-                                           size_t group_id, BitReader* reader,
-                                           PassesDecoderState* dec_state) {
-  JxlMemoryManager* memory_manager = dec_state->memory_manager();
-  const Rect r = dec_state->shared->frame_dim.DCGroupRect(group_id);
-  JXL_DEBUG_V(6, "Decoding VarDCT DC with rect %s", Description(r).c_str());
-  // TODO(eustas): investigate if we could reduce the impact of
-  //               EvalRationalPolynomial; generally speaking, the limit is
-  //               2**(128/(3*magic)), where 128 comes from IEEE 754 exponent,
-  //               3 comes from XybToRgb that cubes the values, and "magic" is
-  //               the sum of all other contributions. 2**18 is known to lead
-  //               to NaN on input found by fuzzing (see commit message).
-  JXL_ASSIGN_OR_RETURN(Image image,
-                       Image::Create(memory_manager, r.xsize(), r.ysize(),
-                                     full_image.bitdepth, 3));
-  size_t stream_id = ModularStreamId::VarDCTDC(group_id).ID(frame_dim);
-  reader->Refill();
-  size_t extra_precision = reader->ReadFixedBits<2>();
-  float mul = 1.0f / (1 << extra_precision);
-  ModularOptions options;
-  for (size_t c = 0; c < 3; c++) {
-    Channel& ch = image.channel[c < 2 ? c ^ 1 : c];
-    ch.w >>= frame_header.chroma_subsampling.HShift(c);
-    ch.h >>= frame_header.chroma_subsampling.VShift(c);
-    JXL_RETURN_IF_ERROR(ch.shrink());
-  }
-  if (!ModularGenericDecompress(
-          reader, image, /*header=*/nullptr, stream_id, &options,
-          /*undo_transforms=*/true, &tree, &code, &context_map)) {
-    return JXL_FAILURE("Failed to decode VarDCT DC group (DC group id %d)",
-                       static_cast<int>(group_id));
-  }
-  DequantDC(r, &dec_state->shared_storage.dc_storage,
-            &dec_state->shared_storage.quant_dc, image,
-            dec_state->shared->quantizer.MulDC(), mul,
-            dec_state->shared->cmap.base().DCFactors(),
-            frame_header.chroma_subsampling, dec_state->shared->block_ctx_map);
-  return true;
-}
-
-Status ModularFrameDecoder::DecodeAcMetadata(const FrameHeader& frame_header,
-                                             size_t group_id, BitReader* reader,
-                                             PassesDecoderState* dec_state) {
-  JxlMemoryManager* memory_manager = dec_state->memory_manager();
-  const Rect r = dec_state->shared->frame_dim.DCGroupRect(group_id);
-  JXL_DEBUG_V(6, "Decoding AcMetadata with rect %s", Description(r).c_str());
-  size_t upper_bound = r.xsize() * r.ysize();
-  reader->Refill();
-  size_t count = reader->ReadBits(CeilLog2Nonzero(upper_bound)) + 1;
-  size_t stream_id = ModularStreamId::ACMetadata(group_id).ID(frame_dim);
-  // YToX, YToB, ACS + QF, EPF
-  JXL_ASSIGN_OR_RETURN(Image image,
-                       Image::Create(memory_manager, r.xsize(), r.ysize(),
-                                     full_image.bitdepth, 4));
-  static_assert(kColorTileDimInBlocks == 8, "Color tile size changed");
-  Rect cr(r.x0() >> 3, r.y0() >> 3, (r.xsize() + 7) >> 3, (r.ysize() + 7) >> 3);
-  JXL_ASSIGN_OR_RETURN(
-      image.channel[0],
-      Channel::Create(memory_manager, cr.xsize(), cr.ysize(), 3, 3));
-  JXL_ASSIGN_OR_RETURN(
-      image.channel[1],
-      Channel::Create(memory_manager, cr.xsize(), cr.ysize(), 3, 3));
-  JXL_ASSIGN_OR_RETURN(image.channel[2],
-                       Channel::Create(memory_manager, count, 2, 0, 0));
-  ModularOptions options;
-  if (!ModularGenericDecompress(
-          reader, image, /*header=*/nullptr, stream_id, &options,
-          /*undo_transforms=*/true, &tree, &code, &context_map)) {
-    return JXL_FAILURE("Failed to decode AC metadata");
-  }
-  JXL_RETURN_IF_ERROR(
-      ConvertPlaneAndClamp(Rect(image.channel[0].plane), image.channel[0].plane,
-                           cr, &dec_state->shared_storage.cmap.ytox_map));
-  JXL_RETURN_IF_ERROR(
-      ConvertPlaneAndClamp(Rect(image.channel[1].plane), image.channel[1].plane,
-                           cr, &dec_state->shared_storage.cmap.ytob_map));
-  size_t num = 0;
-  bool is444 = frame_header.chroma_subsampling.Is444();
-  auto& ac_strategy = dec_state->shared_storage.ac_strategy;
-  size_t xlim = std::min(ac_strategy.xsize(), r.x0() + r.xsize());
-  size_t ylim = std::min(ac_strategy.ysize(), r.y0() + r.ysize());
-  uint32_t local_used_acs = 0;
-  for (size_t iy = 0; iy < r.ysize(); iy++) {
-    size_t y = r.y0() + iy;
-    int32_t* row_qf = r.Row(&dec_state->shared_storage.raw_quant_field, iy);
-    uint8_t* row_epf = r.Row(&dec_state->shared_storage.epf_sharpness, iy);
-    int32_t* row_in_1 = image.channel[2].plane.Row(0);
-    int32_t* row_in_2 = image.channel[2].plane.Row(1);
-    int32_t* row_in_3 = image.channel[3].plane.Row(iy);
-    for (size_t ix = 0; ix < r.xsize(); ix++) {
-      size_t x = r.x0() + ix;
-      int sharpness = row_in_3[ix];
-      if (sharpness < 0 || sharpness >= LoopFilter::kEpfSharpEntries) {
-        return JXL_FAILURE("Corrupted sharpness field");
-      }
-      row_epf[ix] = sharpness;
-      if (ac_strategy.IsValid(x, y)) {
-        continue;
-      }
-
-      if (num >= count) return JXL_FAILURE("Corrupted stream");
-
-      if (!AcStrategy::IsRawStrategyValid(row_in_1[num])) {
-        return JXL_FAILURE("Invalid AC strategy");
-      }
-      local_used_acs |= 1u << row_in_1[num];
-      AcStrategy acs = AcStrategy::FromRawStrategy(row_in_1[num]);
-      if ((acs.covered_blocks_x() > 1 || acs.covered_blocks_y() > 1) &&
-          !is444) {
-        return JXL_FAILURE(
-            "AC strategy not compatible with chroma subsampling");
-      }
-      // Ensure that blocks do not overflow *AC* groups.
-      size_t next_x_ac_block = (x / kGroupDimInBlocks + 1) * kGroupDimInBlocks;
-      size_t next_y_ac_block = (y / kGroupDimInBlocks + 1) * kGroupDimInBlocks;
-      size_t next_x_dct_block = x + acs.covered_blocks_x();
-      size_t next_y_dct_block = y + acs.covered_blocks_y();
-      if (next_x_dct_block > next_x_ac_block || next_x_dct_block > xlim) {
-        return JXL_FAILURE("Invalid AC strategy, x overflow");
-      }
-      if (next_y_dct_block > next_y_ac_block || next_y_dct_block > ylim) {
-        return JXL_FAILURE("Invalid AC strategy, y overflow");
-      }
-      JXL_RETURN_IF_ERROR(
-          ac_strategy.SetNoBoundsCheck(x, y, AcStrategyType(row_in_1[num])));
-      row_qf[ix] = 1 + std::max<int32_t>(0, std::min(Quantizer::kQuantMax - 1,
-                                                     row_in_2[num]));
-      num++;
-    }
-  }
-  dec_state->used_acs |= local_used_acs;
-  if (frame_header.loop_filter.epf_iters > 0) {
-    JXL_RETURN_IF_ERROR(ComputeSigma(frame_header.loop_filter, r, dec_state));
-  }
-  return true;
-}
-
-Status ModularFrameDecoder::ModularImageToDecodedRect(
-    const FrameHeader& frame_header, Image& gi, PassesDecoderState* dec_state,
-    jxl::ThreadPool* pool, RenderPipelineInput& render_pipeline_input,
-    Rect modular_rect) const {
-  const auto* metadata = frame_header.nonserialized_metadata;
-  JXL_ENSURE(gi.transform.empty());
-
-  auto get_row = [&](size_t c, size_t y) {
-    const auto& buffer = render_pipeline_input.GetBuffer(c);
-    return buffer.second.Row(buffer.first, y);
-  };
-
-  size_t c = 0;
-  if (do_color) {
-    const bool rgb_from_gray =
-        metadata->m.color_encoding.IsGray() &&
-        frame_header.color_transform == ColorTransform::kNone;
-    const bool fp = metadata->m.bit_depth.floating_point_sample &&
-                    frame_header.color_transform != ColorTransform::kXYB;
-    for (; c < 3; c++) {
-      double factor = full_image.bitdepth < 32
-                          ? 1.0 / ((1u << full_image.bitdepth) - 1)
-                          : 0;
-      size_t c_in = c;
-      if (frame_header.color_transform == ColorTransform::kXYB) {
-        factor = dec_state->shared->matrices.DCQuants()[c];
-        // XYB is encoded as YX(B-Y)
-        if (c < 2) c_in = 1 - c;
-      } else if (rgb_from_gray) {
-        c_in = 0;
-      }
-      JXL_ENSURE(c_in < gi.channel.size());
-      Channel& ch_in = gi.channel[c_in];
-      // TODO(eustas): could we detect it on earlier stage?
-      if (ch_in.w == 0 || ch_in.h == 0) {
-        return JXL_FAILURE("Empty image");
-      }
-      JXL_ENSURE(ch_in.hshift <= 3 && ch_in.vshift <= 3);
-      Rect r = render_pipeline_input.GetBuffer(c).second;
-      Rect mr(modular_rect.x0() >> ch_in.hshift,
-              modular_rect.y0() >> ch_in.vshift,
-              DivCeil(modular_rect.xsize(), 1 << ch_in.hshift),
-              DivCeil(modular_rect.ysize(), 1 << ch_in.vshift));
-      mr = mr.Crop(ch_in.plane);
-      size_t xsize_shifted = r.xsize();
-      size_t ysize_shifted = r.ysize();
-      if (r.ysize() != mr.ysize() || r.xsize() != mr.xsize()) {
-        return JXL_FAILURE("Dimension mismatch: trying to fit a %" PRIuS
-                           "x%" PRIuS
-                           " modular channel into "
-                           "a %" PRIuS "x%" PRIuS " rect",
-                           mr.xsize(), mr.ysize(), r.xsize(), r.ysize());
-      }
-      if (frame_header.color_transform == ColorTransform::kXYB && c == 2) {
-        JXL_ENSURE(!fp);
-        const auto process_row = [&](const uint32_t task,
-                                     size_t /* thread */) -> Status {
-          const size_t y = task;
-          const pixel_type* const JXL_RESTRICT row_in = mr.Row(&ch_in.plane, y);
-          const pixel_type* const JXL_RESTRICT row_in_Y =
-              mr.Row(&gi.channel[0].plane, y);
-          float* const JXL_RESTRICT row_out = get_row(c, y);
-          HWY_DYNAMIC_DISPATCH(MultiplySum)
-          (xsize_shifted, row_in, row_in_Y, factor, row_out);
-          return true;
-        };
-        JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, ysize_shifted,
-                                      ThreadPool::NoInit, process_row,
-                                      "ModularIntToFloat"));
-      } else if (fp) {
-        int bits = metadata->m.bit_depth.bits_per_sample;
-        int exp_bits = metadata->m.bit_depth.exponent_bits_per_sample;
-        const auto process_row = [&](const uint32_t task,
-                                     size_t /* thread */) -> Status {
-          const size_t y = task;
-          const pixel_type* const JXL_RESTRICT row_in = mr.Row(&ch_in.plane, y);
-          if (rgb_from_gray) {
-            for (size_t cc = 0; cc < 3; cc++) {
-              float* const JXL_RESTRICT row_out = get_row(cc, y);
-              JXL_RETURN_IF_ERROR(
-                  int_to_float(row_in, row_out, xsize_shifted, bits, exp_bits));
-            }
-          } else {
-            float* const JXL_RESTRICT row_out = get_row(c, y);
-            JXL_RETURN_IF_ERROR(
-                int_to_float(row_in, row_out, xsize_shifted, bits, exp_bits));
-          }
-          return true;
-        };
-        JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, ysize_shifted,
-                                      ThreadPool::NoInit, process_row,
-                                      "ModularIntToFloat_losslessfloat"));
-      } else {
-        const auto process_row = [&](const uint32_t task,
-                                     size_t /* thread */) -> Status {
-          const size_t y = task;
-          const pixel_type* const JXL_RESTRICT row_in = mr.Row(&ch_in.plane, y);
-          if (rgb_from_gray) {
-            if (full_image.bitdepth < 23) {
-              HWY_DYNAMIC_DISPATCH(RgbFromSingle)
-              (xsize_shifted, row_in, factor, get_row(0, y), get_row(1, y),
-               get_row(2, y));
-            } else {
-              SingleFromSingleAccurate(xsize_shifted, row_in, factor,
-                                       get_row(0, y));
-              SingleFromSingleAccurate(xsize_shifted, row_in, factor,
-                                       get_row(1, y));
-              SingleFromSingleAccurate(xsize_shifted, row_in, factor,
-                                       get_row(2, y));
-            }
-          } else {
-            float* const JXL_RESTRICT row_out = get_row(c, y);
-            if (full_image.bitdepth < 23) {
-              HWY_DYNAMIC_DISPATCH(SingleFromSingle)
-              (xsize_shifted, row_in, factor, row_out);
-            } else {
-              SingleFromSingleAccurate(xsize_shifted, row_in, factor, row_out);
-            }
-          }
-          return true;
-        };
-        JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, ysize_shifted,
-                                      ThreadPool::NoInit, process_row,
-                                      "ModularIntToFloat"));
-      }
-      if (rgb_from_gray) {
-        break;
-      }
-    }
-    if (rgb_from_gray) {
-      c = 1;
-    }
-  }
-  size_t num_extra_channels = metadata->m.num_extra_channels;
-  for (size_t ec = 0; ec < num_extra_channels; ec++, c++) {
-    const ExtraChannelInfo& eci = metadata->m.extra_channel_info[ec];
-    int bits = eci.bit_depth.bits_per_sample;
-    int exp_bits = eci.bit_depth.exponent_bits_per_sample;
-    bool fp = eci.bit_depth.floating_point_sample;
-    JXL_ENSURE(fp || bits < 32);
-    const double factor = fp ? 0 : (1.0 / ((1u << bits) - 1));
-    JXL_ENSURE(c < gi.channel.size());
-    Channel& ch_in = gi.channel[c];
-    const auto& buffer = render_pipeline_input.GetBuffer(3 + ec);
-    Rect r = buffer.second;
-    Rect mr(modular_rect.x0() >> ch_in.hshift,
-            modular_rect.y0() >> ch_in.vshift,
-            DivCeil(modular_rect.xsize(), 1 << ch_in.hshift),
-            DivCeil(modular_rect.ysize(), 1 << ch_in.vshift));
-    mr = mr.Crop(ch_in.plane);
-    if (r.ysize() != mr.ysize() || r.xsize() != mr.xsize()) {
-      return JXL_FAILURE("Dimension mismatch: trying to fit a %" PRIuS
-                         "x%" PRIuS
-                         " modular channel into "
-                         "a %" PRIuS "x%" PRIuS " rect",
-                         mr.xsize(), mr.ysize(), r.xsize(), r.ysize());
-    }
-    for (size_t y = 0; y < r.ysize(); ++y) {
-      float* const JXL_RESTRICT row_out = r.Row(buffer.first, y);
-      const pixel_type* const JXL_RESTRICT row_in = mr.Row(&ch_in.plane, y);
-      if (fp) {
-        JXL_RETURN_IF_ERROR(
-            int_to_float(row_in, row_out, r.xsize(), bits, exp_bits));
-      } else {
-        if (full_image.bitdepth < 23) {
-          HWY_DYNAMIC_DISPATCH(SingleFromSingle)
-          (r.xsize(), row_in, factor, row_out);
-        } else {
-          SingleFromSingleAccurate(r.xsize(), row_in, factor, row_out);
-        }
-      }
-    }
-  }
-  return true;
-}
-
-Status ModularFrameDecoder::FinalizeDecoding(const FrameHeader& frame_header,
-                                             PassesDecoderState* dec_state,
-                                             jxl::ThreadPool* pool,
-                                             bool inplace) {
-  if (!use_full_image) return true;
-  JxlMemoryManager* memory_manager = dec_state->memory_manager();
-  Image gi{memory_manager};
-  if (inplace) {
-    gi = std::move(full_image);
-  } else {
-    JXL_ASSIGN_OR_RETURN(gi, Image::Clone(full_image));
-  }
-  size_t xsize = gi.w;
-  size_t ysize = gi.h;
-
-  JXL_DEBUG_V(3, "Finalizing decoding for modular image: %s",
-              gi.DebugString().c_str());
-
-  // Don't use threads if total image size is smaller than a group
-  if (xsize * ysize < frame_dim.group_dim * frame_dim.group_dim) pool = nullptr;
-
-  // Undo the global transforms
-  gi.undo_transforms(global_header.wp_header, pool);
-  JXL_ENSURE(global_transform.empty());
-  if (gi.error) return JXL_FAILURE("Undoing transforms failed");
-
-  for (size_t i = 0; i < dec_state->shared->frame_dim.num_groups; i++) {
-    dec_state->render_pipeline->ClearDone(i);
-  }
-
-  const auto init = [&](size_t num_threads) -> Status {
-    bool use_group_ids = (frame_header.encoding == FrameEncoding::kVarDCT ||
-                          (frame_header.flags & FrameHeader::kNoise));
-    JXL_RETURN_IF_ERROR(dec_state->render_pipeline->PrepareForThreads(
-        num_threads, use_group_ids));
-    return true;
-  };
-  const auto process_group = [&](const uint32_t group,
-                                 size_t thread_id) -> Status {
-    RenderPipelineInput input =
-        dec_state->render_pipeline->GetInputBuffers(group, thread_id);
-    JXL_RETURN_IF_ERROR(ModularImageToDecodedRect(
-        frame_header, gi, dec_state, nullptr, input,
-        dec_state->shared->frame_dim.GroupRect(group)));
-    JXL_RETURN_IF_ERROR(input.Done());
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0,
-                                dec_state->shared->frame_dim.num_groups, init,
-                                process_group, "ModularToRect"));
-  return true;
-}
-
-static constexpr const float kAlmostZero = 1e-8f;
-
-Status ModularFrameDecoder::DecodeQuantTable(
-    JxlMemoryManager* memory_manager, size_t required_size_x,
-    size_t required_size_y, BitReader* br, QuantEncoding* encoding, size_t idx,
-    ModularFrameDecoder* modular_frame_decoder) {
-  JXL_RETURN_IF_ERROR(F16Coder::Read(br, &encoding->qraw.qtable_den));
-  if (encoding->qraw.qtable_den < kAlmostZero) {
-    // qtable[] values are already checked for <= 0 so the denominator may not
-    // be negative.
-    return JXL_FAILURE("Invalid qtable_den: value too small");
-  }
-  JXL_ASSIGN_OR_RETURN(
-      Image image,
-      Image::Create(memory_manager, required_size_x, required_size_y, 8, 3));
-  ModularOptions options;
-  if (modular_frame_decoder) {
-    JXL_ASSIGN_OR_RETURN(ModularStreamId qt, ModularStreamId::QuantTable(idx));
-    JXL_RETURN_IF_ERROR(ModularGenericDecompress(
-        br, image, /*header=*/nullptr, qt.ID(modular_frame_decoder->frame_dim),
-        &options, /*undo_transforms=*/true, &modular_frame_decoder->tree,
-        &modular_frame_decoder->code, &modular_frame_decoder->context_map));
-  } else {
-    JXL_RETURN_IF_ERROR(ModularGenericDecompress(br, image, /*header=*/nullptr,
-                                                 0, &options,
-                                                 /*undo_transforms=*/true));
-  }
-  if (!encoding->qraw.qtable) {
-    encoding->qraw.qtable =
-        new std::vector<int>(required_size_x * required_size_y * 3);
-  } else {
-    JXL_ENSURE(encoding->qraw.qtable->size() ==
-               required_size_x * required_size_y * 3);
-  }
-  int* qtable = encoding->qraw.qtable->data();
-  for (size_t c = 0; c < 3; c++) {
-    for (size_t y = 0; y < required_size_y; y++) {
-      int32_t* JXL_RESTRICT row = image.channel[c].Row(y);
-      for (size_t x = 0; x < required_size_x; x++) {
-        qtable[c * required_size_x * required_size_y + y * required_size_x +
-               x] = row[x];
-        if (row[x] <= 0) {
-          return JXL_FAILURE("Invalid raw quantization table");
-        }
-      }
-    }
-  }
-  return true;
-}
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/dec_modular.h b/third_party/jpeg-xl/lib/jxl/dec_modular.h
deleted file mode 100644
index 6081b52221f35..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_modular.h
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_DEC_MODULAR_H_
-#define LIB_JXL_DEC_MODULAR_H_
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <string>
-#include <vector>
-
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/dec_cache.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/modular/encoding/dec_ma.h"
-#include "lib/jxl/modular/encoding/encoding.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/quant_weights.h"
-#include "lib/jxl/render_pipeline/render_pipeline.h"
-
-namespace jxl {
-
-struct ModularStreamId {
-  enum class Kind {
-    GlobalData,
-    VarDCTDC,
-    ModularDC,
-    ACMetadata,
-    QuantTable,
-    ModularAC
-  };
-  Kind kind;
-  size_t quant_table_id;
-  size_t group_id;  // DC or AC group id.
-  size_t pass_id;   // Only for kModularAC.
-  size_t ID(const FrameDimensions& frame_dim) const {
-    size_t id = 0;
-    switch (kind) {
-      case Kind::GlobalData:
-        id = 0;
-        break;
-      case Kind::VarDCTDC:
-        id = 1 + group_id;
-        break;
-      case Kind::ModularDC:
-        id = 1 + frame_dim.num_dc_groups + group_id;
-        break;
-      case Kind::ACMetadata:
-        id = 1 + 2 * frame_dim.num_dc_groups + group_id;
-        break;
-      case Kind::QuantTable:
-        id = 1 + 3 * frame_dim.num_dc_groups + quant_table_id;
-        break;
-      case Kind::ModularAC:
-        id = 1 + 3 * frame_dim.num_dc_groups + kNumQuantTables +
-             frame_dim.num_groups * pass_id + group_id;
-        break;
-    };
-    return id;
-  }
-  static ModularStreamId Global() {
-    return ModularStreamId{Kind::GlobalData, 0, 0, 0};
-  }
-  static ModularStreamId VarDCTDC(size_t group_id) {
-    return ModularStreamId{Kind::VarDCTDC, 0, group_id, 0};
-  }
-  static ModularStreamId ModularDC(size_t group_id) {
-    return ModularStreamId{Kind::ModularDC, 0, group_id, 0};
-  }
-  static ModularStreamId ACMetadata(size_t group_id) {
-    return ModularStreamId{Kind::ACMetadata, 0, group_id, 0};
-  }
-  static StatusOr<ModularStreamId> QuantTable(size_t quant_table_id) {
-    JXL_ENSURE(quant_table_id < kNumQuantTables);
-    return ModularStreamId{Kind::QuantTable, quant_table_id, 0, 0};
-  }
-  static ModularStreamId ModularAC(size_t group_id, size_t pass_id) {
-    return ModularStreamId{Kind::ModularAC, 0, group_id, pass_id};
-  }
-  static size_t Num(const FrameDimensions& frame_dim, size_t passes) {
-    return ModularAC(0, passes).ID(frame_dim);
-  }
-  std::string DebugString() const;
-};
-
-class ModularFrameDecoder {
- public:
-  explicit ModularFrameDecoder(JxlMemoryManager* memory_manager)
-      : memory_manager_(memory_manager), full_image(memory_manager) {}
-  void Init(const FrameDimensions& frame_dim) { this->frame_dim = frame_dim; }
-  Status DecodeGlobalInfo(BitReader* reader, const FrameHeader& frame_header,
-                          bool allow_truncated_group);
-  Status DecodeGroup(const FrameHeader& frame_header, const Rect& rect,
-                     BitReader* reader, int minShift, int maxShift,
-                     const ModularStreamId& stream, bool zerofill,
-                     PassesDecoderState* dec_state,
-                     RenderPipelineInput* render_pipeline_input,
-                     bool allow_truncated, bool* should_run_pipeline = nullptr);
-  // Decodes a VarDCT DC group (`group_id`) from the given `reader`.
-  Status DecodeVarDCTDC(const FrameHeader& frame_header, size_t group_id,
-                        BitReader* reader, PassesDecoderState* dec_state);
-  // Decodes a VarDCT AC Metadata group (`group_id`) from the given `reader`.
-  Status DecodeAcMetadata(const FrameHeader& frame_header, size_t group_id,
-                          BitReader* reader, PassesDecoderState* dec_state);
-  // Decodes a RAW quant table from `br` into the given `encoding`, of size
-  // `required_size_x x required_size_y`. If `modular_frame_decoder` is passed,
-  // its global tree is used, otherwise no global tree is used.
-  static Status DecodeQuantTable(JxlMemoryManager* memory_manager,
-                                 size_t required_size_x, size_t required_size_y,
-                                 BitReader* br, QuantEncoding* encoding,
-                                 size_t idx,
-                                 ModularFrameDecoder* modular_frame_decoder);
-  // if inplace is true, this can only be called once
-  // if it is false, it can be called multiple times (e.g. for progressive
-  // steps)
-  Status FinalizeDecoding(const FrameHeader& frame_header,
-                          PassesDecoderState* dec_state, jxl::ThreadPool* pool,
-                          bool inplace);
-  bool have_dc() const { return have_something; }
-  void MaybeDropFullImage();
-  bool UsesFullImage() const { return use_full_image; }
-  JxlMemoryManager* memory_manager() const { return memory_manager_; }
-
- private:
-  Status ModularImageToDecodedRect(const FrameHeader& frame_header, Image& gi,
-                                   PassesDecoderState* dec_state,
-                                   jxl::ThreadPool* pool,
-                                   RenderPipelineInput& render_pipeline_input,
-                                   Rect modular_rect) const;
-  JxlMemoryManager* memory_manager_;
-  Image full_image;
-  std::vector<Transform> global_transform;
-  FrameDimensions frame_dim;
-  bool do_color;
-  bool have_something;
-  bool use_full_image = true;
-  bool all_same_shift;
-  Tree tree;
-  ANSCode code;
-  std::vector<uint8_t> context_map;
-  GroupHeader global_header;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_DEC_MODULAR_H_
diff --git a/third_party/jpeg-xl/lib/jxl/dec_noise.cc b/third_party/jpeg-xl/lib/jxl/dec_noise.cc
deleted file mode 100644
index 949ddc8237cf8..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_noise.cc
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/dec_noise.h"
-
-#include <cstdint>
-#include <cstdlib>
-#include <utility>
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/dec_noise.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/xorshift128plus-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Or;
-using hwy::HWY_NAMESPACE::ShiftRight;
-using hwy::HWY_NAMESPACE::Vec;
-
-using D = HWY_CAPPED(float, kBlockDim);
-using DI = hwy::HWY_NAMESPACE::Rebind<int, D>;
-using DI8 = hwy::HWY_NAMESPACE::Repartition<uint8_t, D>;
-
-// Converts one vector's worth of random bits to floats in [1, 2).
-// NOTE: as the convolution kernel sums to 0, it doesn't matter if inputs are in
-// [0, 1) or in [1, 2).
-void BitsToFloat(const uint32_t* JXL_RESTRICT random_bits,
-                 float* JXL_RESTRICT floats) {
-  const HWY_FULL(float) df;
-  const HWY_FULL(uint32_t) du;
-
-  const auto bits = Load(du, random_bits);
-  // 1.0 + 23 random mantissa bits = [1, 2)
-  const auto rand12 = BitCast(df, Or(ShiftRight<9>(bits), Set(du, 0x3F800000)));
-  Store(rand12, df, floats);
-}
-
-void RandomImage(Xorshift128Plus* rng, const Rect& rect,
-                 ImageF* JXL_RESTRICT noise) {
-  const size_t xsize = rect.xsize();
-  const size_t ysize = rect.ysize();
-
-  // May exceed the vector size, hence we have two loops over x below.
-  constexpr size_t kFloatsPerBatch =
-      Xorshift128Plus::N * sizeof(uint64_t) / sizeof(float);
-  HWY_ALIGN uint64_t batch[Xorshift128Plus::N] = {};
-
-  const HWY_FULL(float) df;
-  const size_t N = Lanes(df);
-
-  for (size_t y = 0; y < ysize; ++y) {
-    float* JXL_RESTRICT row = rect.Row(noise, y);
-
-    size_t x = 0;
-    // Only entire batches (avoids exceeding the image padding).
-    for (; x + kFloatsPerBatch < xsize; x += kFloatsPerBatch) {
-      rng->Fill(batch);
-      for (size_t i = 0; i < kFloatsPerBatch; i += Lanes(df)) {
-        BitsToFloat(reinterpret_cast<const uint32_t*>(batch) + i, row + x + i);
-      }
-    }
-
-    // Any remaining pixels, rounded up to vectors (safe due to padding).
-    rng->Fill(batch);
-    size_t batch_pos = 0;  // < kFloatsPerBatch
-    for (; x < xsize; x += N) {
-      BitsToFloat(reinterpret_cast<const uint32_t*>(batch) + batch_pos,
-                  row + x);
-      batch_pos += N;
-    }
-  }
-}
-void Random3Planes(size_t visible_frame_index, size_t nonvisible_frame_index,
-                   size_t x0, size_t y0, const std::pair<ImageF*, Rect>& plane0,
-                   const std::pair<ImageF*, Rect>& plane1,
-                   const std::pair<ImageF*, Rect>& plane2) {
-  HWY_ALIGN Xorshift128Plus rng(visible_frame_index, nonvisible_frame_index, x0,
-                                y0);
-  RandomImage(&rng, plane0.second, plane0.first);
-  RandomImage(&rng, plane1.second, plane1.first);
-  RandomImage(&rng, plane2.second, plane2.first);
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-namespace {
-HWY_EXPORT(Random3Planes);
-}  // namespace
-
-void PrepareNoiseInput(const PassesDecoderState& dec_state,
-                       const FrameDimensions& frame_dim,
-                       const FrameHeader& frame_header, size_t group_index,
-                       size_t thread) {
-  size_t group_dim = frame_dim.group_dim;
-  const size_t gx = group_index % frame_dim.xsize_groups;
-  const size_t gy = group_index / frame_dim.xsize_groups;
-  RenderPipelineInput input =
-      dec_state.render_pipeline->GetInputBuffers(group_index, thread);
-  size_t noise_c_start =
-      3 + frame_header.nonserialized_metadata->m.num_extra_channels;
-  // When the color channels are downsampled, we need to generate more noise
-  // input for the current group than just the group dimensions.
-  std::pair<ImageF*, Rect> rects[3];
-  for (size_t iy = 0; iy < frame_header.upsampling; iy++) {
-    for (size_t ix = 0; ix < frame_header.upsampling; ix++) {
-      for (size_t c = 0; c < 3; c++) {
-        auto r = input.GetBuffer(noise_c_start + c);
-        rects[c].first = r.first;
-        size_t x1 = r.second.x0() + r.second.xsize();
-        size_t y1 = r.second.y0() + r.second.ysize();
-        rects[c].second =
-            Rect(r.second.x0() + ix * group_dim, r.second.y0() + iy * group_dim,
-                 group_dim, group_dim, x1, y1);
-      }
-      HWY_DYNAMIC_DISPATCH(Random3Planes)
-      (dec_state.visible_frame_index, dec_state.nonvisible_frame_index,
-       (gx * frame_header.upsampling + ix) * group_dim,
-       (gy * frame_header.upsampling + iy) * group_dim, rects[0], rects[1],
-       rects[2]);
-    }
-  }
-}
-
-void DecodeFloatParam(float precision, float* val, BitReader* br) {
-  const int absval_quant = br->ReadFixedBits<10>();
-  *val = absval_quant / precision;
-}
-
-Status DecodeNoise(BitReader* br, NoiseParams* noise_params) {
-  for (float& i : noise_params->lut) {
-    DecodeFloatParam(kNoisePrecision, &i, br);
-  }
-  return true;
-}
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/dec_noise.h b/third_party/jpeg-xl/lib/jxl/dec_noise.h
deleted file mode 100644
index 8cefba9f08f7a..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_noise.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_DEC_NOISE_H_
-#define LIB_JXL_DEC_NOISE_H_
-
-// Noise synthesis. Currently disabled.
-
-#include <cstddef>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/dec_cache.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/noise.h"
-
-namespace jxl {
-
-void PrepareNoiseInput(const PassesDecoderState& dec_state,
-                       const FrameDimensions& frame_dim,
-                       const FrameHeader& frame_header, size_t group_index,
-                       size_t thread);
-
-// Must only call if FrameHeader.flags.kNoise.
-Status DecodeNoise(BitReader* br, NoiseParams* noise_params);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_DEC_NOISE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/dec_patch_dictionary.cc b/third_party/jpeg-xl/lib/jxl/dec_patch_dictionary.cc
deleted file mode 100644
index 41eb1cf170eec..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_patch_dictionary.cc
+++ /dev/null
@@ -1,356 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/dec_patch_dictionary.h"
-
-#include <jxl/memory_manager.h>
-#include <sys/types.h>
-
-#include <algorithm>
-#include <cstdint>
-#include <cstdlib>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/blending.h"
-#include "lib/jxl/common.h"  // kMaxNumReferenceFrames
-#include "lib/jxl/dec_ans.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/pack_signed.h"
-#include "lib/jxl/patch_dictionary_internal.h"
-
-namespace jxl {
-
-Status PatchDictionary::Decode(JxlMemoryManager* memory_manager, BitReader* br,
-                               size_t xsize, size_t ysize,
-                               size_t num_extra_channels,
-                               bool* uses_extra_channels) {
-  positions_.clear();
-  blendings_stride_ = num_extra_channels + 1;
-  std::vector<uint8_t> context_map;
-  ANSCode code;
-  JXL_RETURN_IF_ERROR(DecodeHistograms(
-      memory_manager, br, kNumPatchDictionaryContexts, &code, &context_map));
-  JXL_ASSIGN_OR_RETURN(ANSSymbolReader decoder,
-                       ANSSymbolReader::Create(&code, br));
-
-  auto read_num = [&](size_t context) {
-    size_t r = decoder.ReadHybridUint(context, br, context_map);
-    return r;
-  };
-
-  size_t num_ref_patch = read_num(kNumRefPatchContext);
-  // Limit max memory usage of patches to about 66 bytes per pixel (assuming 8
-  // bytes per size_t)
-  const size_t num_pixels = xsize * ysize;
-  const size_t max_ref_patches = 1024 + num_pixels / 4;
-  const size_t max_patches = max_ref_patches * 4;
-  const size_t max_blending_infos = max_patches * 4;
-  if (num_ref_patch > max_ref_patches) {
-    return JXL_FAILURE("Too many patches in dictionary");
-  }
-
-  size_t total_patches = 0;
-  size_t next_size = 1;
-
-  for (size_t id = 0; id < num_ref_patch; id++) {
-    PatchReferencePosition ref_pos;
-    ref_pos.ref = read_num(kReferenceFrameContext);
-    if (ref_pos.ref >= kMaxNumReferenceFrames ||
-        reference_frames_->at(ref_pos.ref).frame->xsize() == 0) {
-      return JXL_FAILURE("Invalid reference frame ID");
-    }
-    if (!reference_frames_->at(ref_pos.ref).ib_is_in_xyb) {
-      return JXL_FAILURE(
-          "Patches cannot use frames saved post color transforms");
-    }
-    const ImageBundle& ib = *reference_frames_->at(ref_pos.ref).frame;
-    ref_pos.x0 = read_num(kPatchReferencePositionContext);
-    ref_pos.y0 = read_num(kPatchReferencePositionContext);
-    ref_pos.xsize = read_num(kPatchSizeContext) + 1;
-    ref_pos.ysize = read_num(kPatchSizeContext) + 1;
-    if (ref_pos.x0 + ref_pos.xsize > ib.xsize()) {
-      return JXL_FAILURE("Invalid position specified in reference frame");
-    }
-    if (ref_pos.y0 + ref_pos.ysize > ib.ysize()) {
-      return JXL_FAILURE("Invalid position specified in reference frame");
-    }
-    size_t id_count = read_num(kPatchCountContext);
-    if (id_count > max_patches) {
-      return JXL_FAILURE("Too many patches in dictionary");
-    }
-    id_count++;
-    total_patches += id_count;
-    if (total_patches > max_patches) {
-      return JXL_FAILURE("Too many patches in dictionary");
-    }
-    if (next_size < total_patches) {
-      next_size *= 2;
-      next_size = std::min<size_t>(next_size, max_patches);
-    }
-    if (next_size * blendings_stride_ > max_blending_infos) {
-      return JXL_FAILURE("Too many patches in dictionary");
-    }
-    positions_.reserve(next_size);
-    blendings_.reserve(next_size * blendings_stride_);
-    bool choose_alpha = (num_extra_channels > 1);
-    for (size_t i = 0; i < id_count; i++) {
-      PatchPosition pos;
-      pos.ref_pos_idx = ref_positions_.size();
-      if (i == 0) {
-        pos.x = read_num(kPatchPositionContext);
-        pos.y = read_num(kPatchPositionContext);
-      } else {
-        ssize_t deltax = UnpackSigned(read_num(kPatchOffsetContext));
-        if (deltax < 0 && static_cast<size_t>(-deltax) > positions_.back().x) {
-          return JXL_FAILURE("Invalid patch: negative x coordinate (%" PRIuS
-                             " base x %" PRIdS " delta x)",
-                             positions_.back().x, deltax);
-        }
-        pos.x = positions_.back().x + deltax;
-        ssize_t deltay = UnpackSigned(read_num(kPatchOffsetContext));
-        if (deltay < 0 && static_cast<size_t>(-deltay) > positions_.back().y) {
-          return JXL_FAILURE("Invalid patch: negative y coordinate (%" PRIuS
-                             " base y %" PRIdS " delta y)",
-                             positions_.back().y, deltay);
-        }
-        pos.y = positions_.back().y + deltay;
-      }
-      if (pos.x + ref_pos.xsize > xsize) {
-        return JXL_FAILURE("Invalid patch x: at %" PRIuS " + %" PRIuS
-                           " > %" PRIuS,
-                           pos.x, ref_pos.xsize, xsize);
-      }
-      if (pos.y + ref_pos.ysize > ysize) {
-        return JXL_FAILURE("Invalid patch y: at %" PRIuS " + %" PRIuS
-                           " > %" PRIuS,
-                           pos.y, ref_pos.ysize, ysize);
-      }
-      for (size_t j = 0; j < blendings_stride_; j++) {
-        uint32_t blend_mode = read_num(kPatchBlendModeContext);
-        if (blend_mode >= kNumPatchBlendModes) {
-          return JXL_FAILURE("Invalid patch blend mode: %u", blend_mode);
-        }
-        PatchBlending info;
-        info.mode = static_cast<PatchBlendMode>(blend_mode);
-        if (UsesAlpha(info.mode)) {
-          *uses_extra_channels = true;
-        }
-        if (info.mode != PatchBlendMode::kNone && j > 0) {
-          *uses_extra_channels = true;
-        }
-        if (UsesAlpha(info.mode) && choose_alpha) {
-          info.alpha_channel = read_num(kPatchAlphaChannelContext);
-          if (info.alpha_channel >= num_extra_channels) {
-            return JXL_FAILURE(
-                "Invalid alpha channel for blending: %u out of %u\n",
-                info.alpha_channel, static_cast<uint32_t>(num_extra_channels));
-          }
-        } else {
-          info.alpha_channel = 0;
-        }
-        if (UsesClamp(info.mode)) {
-          info.clamp = static_cast<bool>(read_num(kPatchClampContext));
-        } else {
-          info.clamp = false;
-        }
-        blendings_.push_back(info);
-      }
-      positions_.emplace_back(pos);
-    }
-    ref_positions_.emplace_back(ref_pos);
-  }
-  positions_.shrink_to_fit();
-
-  if (!decoder.CheckANSFinalState()) {
-    return JXL_FAILURE("ANS checksum failure.");
-  }
-
-  ComputePatchTree();
-  return true;
-}
-
-int PatchDictionary::GetReferences() const {
-  int result = 0;
-  for (const auto& ref_pos : ref_positions_) {
-    result |= (1 << static_cast<int>(ref_pos.ref));
-  }
-  return result;
-}
-
-namespace {
-struct PatchInterval {
-  size_t idx;
-  size_t y0, y1;
-};
-}  // namespace
-
-void PatchDictionary::ComputePatchTree() {
-  patch_tree_.clear();
-  num_patches_.clear();
-  sorted_patches_y0_.clear();
-  sorted_patches_y1_.clear();
-  if (positions_.empty()) {
-    return;
-  }
-  // Create a y-interval for each patch.
-  std::vector<PatchInterval> intervals(positions_.size());
-  for (size_t i = 0; i < positions_.size(); ++i) {
-    const auto& pos = positions_[i];
-    intervals[i].idx = i;
-    intervals[i].y0 = pos.y;
-    intervals[i].y1 = pos.y + ref_positions_[pos.ref_pos_idx].ysize;
-  }
-  auto sort_by_y0 = [&intervals](size_t start, size_t end) {
-    std::sort(intervals.data() + start, intervals.data() + end,
-              [](const PatchInterval& i0, const PatchInterval& i1) {
-                return i0.y0 < i1.y0;
-              });
-  };
-  auto sort_by_y1 = [&intervals](size_t start, size_t end) {
-    std::sort(intervals.data() + start, intervals.data() + end,
-              [](const PatchInterval& i0, const PatchInterval& i1) {
-                return i0.y1 < i1.y1;
-              });
-  };
-  // Count the number of patches for each row.
-  sort_by_y1(0, intervals.size());
-  num_patches_.resize(intervals.back().y1);
-  for (auto iv : intervals) {
-    for (size_t y = iv.y0; y < iv.y1; ++y) num_patches_[y]++;
-  }
-  PatchTreeNode root;
-  root.start = 0;
-  root.num = intervals.size();
-  patch_tree_.push_back(root);
-  size_t next = 0;
-  while (next < patch_tree_.size()) {
-    auto& node = patch_tree_[next];
-    size_t start = node.start;
-    size_t end = node.start + node.num;
-    // Choose the y_center for this node to be the median of interval starts.
-    sort_by_y0(start, end);
-    size_t middle_idx = start + node.num / 2;
-    node.y_center = intervals[middle_idx].y0;
-    // Divide the intervals in [start, end) into three groups:
-    //   * those completely to the right of y_center: [right_start, end)
-    //   * those overlapping y_center: [left_end, right_start)
-    //   * those completely to the left of y_center: [start, left_end)
-    size_t right_start = middle_idx;
-    while (right_start < end && intervals[right_start].y0 == node.y_center) {
-      ++right_start;
-    }
-    sort_by_y1(start, right_start);
-    size_t left_end = right_start;
-    while (left_end > start && intervals[left_end - 1].y1 > node.y_center) {
-      --left_end;
-    }
-    // Fill in sorted_patches_y0_ and sorted_patches_y1_ for the current node.
-    node.num = right_start - left_end;
-    node.start = sorted_patches_y0_.size();
-    for (ssize_t i = static_cast<ssize_t>(right_start) - 1;
-         i >= static_cast<ssize_t>(left_end); --i) {
-      sorted_patches_y1_.emplace_back(intervals[i].y1, intervals[i].idx);
-    }
-    sort_by_y0(left_end, right_start);
-    for (size_t i = left_end; i < right_start; ++i) {
-      sorted_patches_y0_.emplace_back(intervals[i].y0, intervals[i].idx);
-    }
-    // Create the left and right nodes (if not empty).
-    node.left_child = node.right_child = -1;
-    if (left_end > start) {
-      PatchTreeNode left;
-      left.start = start;
-      left.num = left_end - left.start;
-      patch_tree_[next].left_child = patch_tree_.size();
-      patch_tree_.push_back(left);
-    }
-    if (right_start < end) {
-      PatchTreeNode right;
-      right.start = right_start;
-      right.num = end - right.start;
-      patch_tree_[next].right_child = patch_tree_.size();
-      patch_tree_.push_back(right);
-    }
-    ++next;
-  }
-}
-
-std::vector<size_t> PatchDictionary::GetPatchesForRow(size_t y) const {
-  std::vector<size_t> result;
-  if (y < num_patches_.size() && num_patches_[y] > 0) {
-    result.reserve(num_patches_[y]);
-    for (ssize_t tree_idx = 0; tree_idx != -1;) {
-      JXL_DASSERT(tree_idx < static_cast<ssize_t>(patch_tree_.size()));
-      const auto& node = patch_tree_[tree_idx];
-      if (y <= node.y_center) {
-        for (size_t i = 0; i < node.num; ++i) {
-          const auto& p = sorted_patches_y0_[node.start + i];
-          if (y < p.first) break;
-          result.push_back(p.second);
-        }
-        tree_idx = y < node.y_center ? node.left_child : -1;
-      } else {
-        for (size_t i = 0; i < node.num; ++i) {
-          const auto& p = sorted_patches_y1_[node.start + i];
-          if (y >= p.first) break;
-          result.push_back(p.second);
-        }
-        tree_idx = node.right_child;
-      }
-    }
-    // Ensure that he relative order of patches that affect the same pixels is
-    // preserved. This is important for patches that have a blend mode
-    // different from kAdd.
-    std::sort(result.begin(), result.end());
-  }
-  return result;
-}
-
-// Adds patches to a segment of `xsize` pixels, starting at `inout`, assumed
-// to be located at position (x0, y) in the frame.
-Status PatchDictionary::AddOneRow(
-    float* const* inout, size_t y, size_t x0, size_t xsize,
-    const std::vector<ExtraChannelInfo>& extra_channel_info) const {
-  size_t num_ec = extra_channel_info.size();
-  JXL_ENSURE(num_ec + 1 <= blendings_stride_);
-  std::vector<const float*> fg_ptrs(3 + num_ec);
-  for (size_t pos_idx : GetPatchesForRow(y)) {
-    const size_t blending_idx = pos_idx * blendings_stride_;
-    const PatchPosition& pos = positions_[pos_idx];
-    const PatchReferencePosition& ref_pos = ref_positions_[pos.ref_pos_idx];
-    size_t by = pos.y;
-    size_t bx = pos.x;
-    size_t patch_xsize = ref_pos.xsize;
-    JXL_ENSURE(y >= by);
-    JXL_ENSURE(y < by + ref_pos.ysize);
-    size_t iy = y - by;
-    size_t ref = ref_pos.ref;
-    if (bx >= x0 + xsize) continue;
-    if (bx + patch_xsize < x0) continue;
-    size_t patch_x0 = std::max(bx, x0);
-    size_t patch_x1 = std::min(bx + patch_xsize, x0 + xsize);
-    for (size_t c = 0; c < 3; c++) {
-      fg_ptrs[c] = reference_frames_->at(ref).frame->color()->ConstPlaneRow(
-                       c, ref_pos.y0 + iy) +
-                   ref_pos.x0 + x0 - bx;
-    }
-    for (size_t i = 0; i < num_ec; i++) {
-      fg_ptrs[3 + i] =
-          reference_frames_->at(ref).frame->extra_channels()[i].ConstRow(
-              ref_pos.y0 + iy) +
-          ref_pos.x0 + x0 - bx;
-    }
-    JXL_RETURN_IF_ERROR(PerformBlending(
-        memory_manager_, inout, fg_ptrs.data(), inout, patch_x0 - x0,
-        patch_x1 - patch_x0, blendings_[blending_idx],
-        blendings_.data() + blending_idx + 1, extra_channel_info));
-  }
-  return true;
-}
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/dec_patch_dictionary.h b/third_party/jpeg-xl/lib/jxl/dec_patch_dictionary.h
deleted file mode 100644
index ed20eae3225a6..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_patch_dictionary.h
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_DEC_PATCH_DICTIONARY_H_
-#define LIB_JXL_DEC_PATCH_DICTIONARY_H_
-
-// Chooses reference patches, and avoids encoding them once per occurrence.
-
-#include <jxl/memory_manager.h>
-#include <sys/types.h>
-
-#include <array>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_metadata.h"
-
-namespace jxl {
-
-struct ReferceFrame {
-  std::unique_ptr<ImageBundle> frame;
-  // ImageBundle doesn't yet have a simple way to state it is in XYB.
-  bool ib_is_in_xyb = false;
-};
-
-enum class PatchBlendMode : uint8_t {
-  // The new values are the old ones. Useful to skip some channels.
-  kNone = 0,
-  // The new values (in the crop) replace the old ones: sample = new
-  kReplace = 1,
-  // The new values (in the crop) get added to the old ones: sample = old + new
-  kAdd = 2,
-  // The new values (in the crop) get multiplied by the old ones:
-  // sample = old * new
-  // This blend mode is only supported if BlendColorSpace is kEncoded. The
-  // range of the new value matters for multiplication purposes, and its
-  // nominal range of 0..1 is computed the same way as this is done for the
-  // alpha values in kBlend and kAlphaWeightedAdd.
-  kMul = 3,
-  // The new values (in the crop) replace the old ones if alpha>0:
-  // For first alpha channel:
-  // alpha = old + new * (1 - old)
-  // For other channels if !alpha_associated:
-  // sample = ((1 - new_alpha) * old * old_alpha + new_alpha * new) / alpha
-  // For other channels if alpha_associated:
-  // sample = (1 - new_alpha) * old + new
-  // The alpha formula applies to the alpha used for the division in the other
-  // channels formula, and applies to the alpha channel itself if its
-  // blend_channel value matches itself.
-  // If using kBlendAbove, new is the patch and old is the original image; if
-  // using kBlendBelow, the meaning is inverted.
-  kBlendAbove = 4,
-  kBlendBelow = 5,
-  // The new values (in the crop) are added to the old ones if alpha>0:
-  // For first alpha channel: sample = sample = old + new * (1 - old)
-  // For other channels: sample = old + alpha * new
-  kAlphaWeightedAddAbove = 6,
-  kAlphaWeightedAddBelow = 7,
-};
-
-constexpr uint8_t kNumPatchBlendModes =
-    static_cast<uint8_t>(PatchBlendMode::kAlphaWeightedAddBelow) + 1;
-
-inline bool UsesAlpha(PatchBlendMode mode) {
-  return mode == PatchBlendMode::kBlendAbove ||
-         mode == PatchBlendMode::kBlendBelow ||
-         mode == PatchBlendMode::kAlphaWeightedAddAbove ||
-         mode == PatchBlendMode::kAlphaWeightedAddBelow;
-}
-inline bool UsesClamp(PatchBlendMode mode) {
-  return UsesAlpha(mode) || mode == PatchBlendMode::kMul;
-}
-
-struct PatchBlending {
-  PatchBlendMode mode;
-  uint32_t alpha_channel;
-  bool clamp;
-};
-
-// Position and size of the patch in the reference frame.
-struct PatchReferencePosition {
-  size_t ref, x0, y0, xsize, ysize;
-};
-
-struct PatchPosition {
-  // Position of top-left corner of the patch in the image.
-  size_t x, y;
-  size_t ref_pos_idx;
-};
-
-struct PassesSharedState;
-
-// Encoder-side helper class to encode the PatchesDictionary.
-class PatchDictionaryEncoder;
-
-class PatchDictionary {
- public:
-  explicit PatchDictionary(JxlMemoryManager* memory_manager)
-      : memory_manager_(memory_manager) {}
-
-  void SetShared(const std::array<ReferceFrame, 4>* reference_frames) {
-    reference_frames_ = reference_frames;
-  }
-
-  bool HasAny() const { return !positions_.empty(); }
-
-  Status Decode(JxlMemoryManager* memory_manager, BitReader* br, size_t xsize,
-                size_t ysize, size_t num_extra_channels,
-                bool* uses_extra_channels);
-
-  void Clear() {
-    positions_.clear();
-    ComputePatchTree();
-  }
-
-  // Adds patches to a segment of `xsize` pixels, starting at `inout`, assumed
-  // to be located at position (x0, y) in the frame.
-  Status AddOneRow(
-      float* const* inout, size_t y, size_t x0, size_t xsize,
-      const std::vector<ExtraChannelInfo>& extra_channel_info) const;
-
-  // Returns dependencies of this patch dictionary on reference frame ids as a
-  // bit mask: bits 0-3 indicate reference frame 0-3.
-  int GetReferences() const;
-
-  std::vector<size_t> GetPatchesForRow(size_t y) const;
-
- private:
-  friend class PatchDictionaryEncoder;
-
-  JxlMemoryManager* memory_manager_;
-  const std::array<ReferceFrame, 4>* reference_frames_;
-  std::vector<PatchPosition> positions_;
-  std::vector<PatchReferencePosition> ref_positions_;
-  std::vector<PatchBlending> blendings_;
-  size_t blendings_stride_;
-
-  // Interval tree on the y coordinates of the patches.
-  struct PatchTreeNode {
-    ssize_t left_child;
-    ssize_t right_child;
-    size_t y_center;
-    // Range of patches in sorted_patches_y0_ and sorted_patches_y1_ that
-    // contain the row y_center.
-    size_t start;
-    size_t num;
-  };
-  std::vector<PatchTreeNode> patch_tree_;
-  // Number of patches for each row.
-  std::vector<size_t> num_patches_;
-  std::vector<std::pair<size_t, size_t>> sorted_patches_y0_;
-  std::vector<std::pair<size_t, size_t>> sorted_patches_y1_;
-
-  void ComputePatchTree();
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_DEC_PATCH_DICTIONARY_H_
diff --git a/third_party/jpeg-xl/lib/jxl/dec_transforms-inl.h b/third_party/jpeg-xl/lib/jxl/dec_transforms-inl.h
deleted file mode 100644
index 24a1738077d68..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_transforms-inl.h
+++ /dev/null
@@ -1,821 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#if defined(LIB_JXL_DEC_TRANSFORMS_INL_H_) == defined(HWY_TARGET_TOGGLE)
-#ifdef LIB_JXL_DEC_TRANSFORMS_INL_H_
-#undef LIB_JXL_DEC_TRANSFORMS_INL_H_
-#else
-#define LIB_JXL_DEC_TRANSFORMS_INL_H_
-#endif
-
-#include <cstddef>
-#include <hwy/highway.h>
-
-#include "lib/jxl/ac_strategy.h"
-#include "lib/jxl/dct-inl.h"
-#include "lib/jxl/dct_scales.h"
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-namespace {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::MulAdd;
-
-// Computes the lowest-frequency LF_ROWSxLF_COLS-sized square in output, which
-// is a DCT_ROWS*DCT_COLS-sized DCT block, by doing a ROWS*COLS DCT on the
-// input block.
-template <size_t DCT_ROWS, size_t DCT_COLS, size_t LF_ROWS, size_t LF_COLS,
-          size_t ROWS, size_t COLS>
-JXL_INLINE void ReinterpretingDCT(const float* input, const size_t input_stride,
-                                  float* output, const size_t output_stride,
-                                  float* JXL_RESTRICT block,
-                                  float* JXL_RESTRICT scratch_space) {
-  static_assert(LF_ROWS == ROWS,
-                "ReinterpretingDCT should only be called with LF == N");
-  static_assert(LF_COLS == COLS,
-                "ReinterpretingDCT should only be called with LF == N");
-  ComputeScaledDCT<ROWS, COLS>()(DCTFrom(input, input_stride), block,
-                                 scratch_space);
-  if (ROWS < COLS) {
-    for (size_t y = 0; y < LF_ROWS; y++) {
-      for (size_t x = 0; x < LF_COLS; x++) {
-        output[y * output_stride + x] =
-            block[y * COLS + x] * DCTTotalResampleScale<ROWS, DCT_ROWS>(y) *
-            DCTTotalResampleScale<COLS, DCT_COLS>(x);
-      }
-    }
-  } else {
-    for (size_t y = 0; y < LF_COLS; y++) {
-      for (size_t x = 0; x < LF_ROWS; x++) {
-        output[y * output_stride + x] =
-            block[y * ROWS + x] * DCTTotalResampleScale<COLS, DCT_COLS>(y) *
-            DCTTotalResampleScale<ROWS, DCT_ROWS>(x);
-      }
-    }
-  }
-}
-
-template <size_t S>
-void IDCT2TopBlock(const float* block, size_t stride_out, float* out) {
-  static_assert(kBlockDim % S == 0, "S should be a divisor of kBlockDim");
-  static_assert(S % 2 == 0, "S should be even");
-  float temp[kDCTBlockSize];
-  constexpr size_t num_2x2 = S / 2;
-  for (size_t y = 0; y < num_2x2; y++) {
-    for (size_t x = 0; x < num_2x2; x++) {
-      float c00 = block[y * kBlockDim + x];
-      float c01 = block[y * kBlockDim + num_2x2 + x];
-      float c10 = block[(y + num_2x2) * kBlockDim + x];
-      float c11 = block[(y + num_2x2) * kBlockDim + num_2x2 + x];
-      float r00 = c00 + c01 + c10 + c11;
-      float r01 = c00 + c01 - c10 - c11;
-      float r10 = c00 - c01 + c10 - c11;
-      float r11 = c00 - c01 - c10 + c11;
-      temp[y * 2 * kBlockDim + x * 2] = r00;
-      temp[y * 2 * kBlockDim + x * 2 + 1] = r01;
-      temp[(y * 2 + 1) * kBlockDim + x * 2] = r10;
-      temp[(y * 2 + 1) * kBlockDim + x * 2 + 1] = r11;
-    }
-  }
-  for (size_t y = 0; y < S; y++) {
-    for (size_t x = 0; x < S; x++) {
-      out[y * stride_out + x] = temp[y * kBlockDim + x];
-    }
-  }
-}
-
-void AFVIDCT4x4(const float* JXL_RESTRICT coeffs, float* JXL_RESTRICT pixels) {
-  HWY_ALIGN static constexpr float k4x4AFVBasis[16][16] = {
-      {
-          0.25,
-          0.25,
-          0.25,
-          0.25,
-          0.25,
-          0.25,
-          0.25,
-          0.25,
-          0.25,
-          0.25,
-          0.25,
-          0.25,
-          0.25,
-          0.25,
-          0.25,
-          0.25,
-      },
-      {
-          0.876902929799142f,
-          0.2206518106944235f,
-          -0.10140050393753763f,
-          -0.1014005039375375f,
-          0.2206518106944236f,
-          -0.10140050393753777f,
-          -0.10140050393753772f,
-          -0.10140050393753763f,
-          -0.10140050393753758f,
-          -0.10140050393753769f,
-          -0.1014005039375375f,
-          -0.10140050393753768f,
-          -0.10140050393753768f,
-          -0.10140050393753759f,
-          -0.10140050393753763f,
-          -0.10140050393753741f,
-      },
-      {
-          0.0,
-          0.0,
-          0.40670075830260755f,
-          0.44444816619734445f,
-          0.0,
-          0.0,
-          0.19574399372042936f,
-          0.2929100136981264f,
-          -0.40670075830260716f,
-          -0.19574399372042872f,
-          0.0,
-          0.11379074460448091f,
-          -0.44444816619734384f,
-          -0.29291001369812636f,
-          -0.1137907446044814f,
-          0.0,
-      },
-      {
-          0.0,
-          0.0,
-          -0.21255748058288748f,
-          0.3085497062849767f,
-          0.0,
-          0.4706702258572536f,
-          -0.1621205195722993f,
-          0.0,
-          -0.21255748058287047f,
-          -0.16212051957228327f,
-          -0.47067022585725277f,
-          -0.1464291867126764f,
-          0.3085497062849487f,
-          0.0,
-          -0.14642918671266536f,
-          0.4251149611657548f,
-      },
-      {
-          0.0,
-          -0.7071067811865474f,
-          0.0,
-          0.0,
-          0.7071067811865476f,
-          0.0,
-          0.0,
-          0.0,
-          0.0,
-          0.0,
-          0.0,
-          0.0,
-          0.0,
-          0.0,
-          0.0,
-          0.0,
-      },
-      {
-          -0.4105377591765233f,
-          0.6235485373547691f,
-          -0.06435071657946274f,
-          -0.06435071657946266f,
-          0.6235485373547694f,
-          -0.06435071657946284f,
-          -0.0643507165794628f,
-          -0.06435071657946274f,
-          -0.06435071657946272f,
-          -0.06435071657946279f,
-          -0.06435071657946266f,
-          -0.06435071657946277f,
-          -0.06435071657946277f,
-          -0.06435071657946273f,
-          -0.06435071657946274f,
-          -0.0643507165794626f,
-      },
-      {
-          0.0,
-          0.0,
-          -0.4517556589999482f,
-          0.15854503551840063f,
-          0.0,
-          -0.04038515160822202f,
-          0.0074182263792423875f,
-          0.39351034269210167f,
-          -0.45175565899994635f,
-          0.007418226379244351f,
-          0.1107416575309343f,
-          0.08298163094882051f,
-          0.15854503551839705f,
-          0.3935103426921022f,
-          0.0829816309488214f,
-          -0.45175565899994796f,
-      },
-      {
-          0.0,
-          0.0,
-          -0.304684750724869f,
-          0.5112616136591823f,
-          0.0,
-          0.0,
-          -0.290480129728998f,
-          -0.06578701549142804f,
-          0.304684750724884f,
-          0.2904801297290076f,
-          0.0,
-          -0.23889773523344604f,
-          -0.5112616136592012f,
-          0.06578701549142545f,
-          0.23889773523345467f,
-          0.0,
-      },
-      {
-          0.0,
-          0.0,
-          0.3017929516615495f,
-          0.25792362796341184f,
-          0.0,
-          0.16272340142866204f,
-          0.09520022653475037f,
-          0.0,
-          0.3017929516615503f,
-          0.09520022653475055f,
-          -0.16272340142866173f,
-          -0.35312385449816297f,
-          0.25792362796341295f,
-          0.0,
-          -0.3531238544981624f,
-          -0.6035859033230976f,
-      },
-      {
-          0.0,
-          0.0,
-          0.40824829046386274f,
-          0.0,
-          0.0,
-          0.0,
-          0.0,
-          -0.4082482904638628f,
-          -0.4082482904638635f,
-          0.0,
-          0.0,
-          -0.40824829046386296f,
-          0.0,
-          0.4082482904638634f,
-          0.408248290463863f,
-          0.0,
-      },
-      {
-          0.0,
-          0.0,
-          0.1747866975480809f,
-          0.0812611176717539f,
-          0.0,
-          0.0,
-          -0.3675398009862027f,
-          -0.307882213957909f,
-          -0.17478669754808135f,
-          0.3675398009862011f,
-          0.0,
-          0.4826689115059883f,
-          -0.08126111767175039f,
-          0.30788221395790305f,
-          -0.48266891150598584f,
-          0.0,
-      },
-      {
-          0.0,
-          0.0,
-          -0.21105601049335784f,
-          0.18567180916109802f,
-          0.0,
-          0.0,
-          0.49215859013738733f,
-          -0.38525013709251915f,
-          0.21105601049335806f,
-          -0.49215859013738905f,
-          0.0,
-          0.17419412659916217f,
-          -0.18567180916109904f,
-          0.3852501370925211f,
-          -0.1741941265991621f,
-          0.0,
-      },
-      {
-          0.0,
-          0.0,
-          -0.14266084808807264f,
-          -0.3416446842253372f,
-          0.0,
-          0.7367497537172237f,
-          0.24627107722075148f,
-          -0.08574019035519306f,
-          -0.14266084808807344f,
-          0.24627107722075137f,
-          0.14883399227113567f,
-          -0.04768680350229251f,
-          -0.3416446842253373f,
-          -0.08574019035519267f,
-          -0.047686803502292804f,
-          -0.14266084808807242f,
-      },
-      {
-          0.0,
-          0.0,
-          -0.13813540350758585f,
-          0.3302282550303788f,
-          0.0,
-          0.08755115000587084f,
-          -0.07946706605909573f,
-          -0.4613374887461511f,
-          -0.13813540350758294f,
-          -0.07946706605910261f,
-          0.49724647109535086f,
-          0.12538059448563663f,
-          0.3302282550303805f,
-          -0.4613374887461554f,
-          0.12538059448564315f,
-          -0.13813540350758452f,
-      },
-      {
-          0.0,
-          0.0,
-          -0.17437602599651067f,
-          0.0702790691196284f,
-          0.0,
-          -0.2921026642334881f,
-          0.3623817333531167f,
-          0.0,
-          -0.1743760259965108f,
-          0.36238173335311646f,
-          0.29210266423348785f,
-          -0.4326608024727445f,
-          0.07027906911962818f,
-          0.0,
-          -0.4326608024727457f,
-          0.34875205199302267f,
-      },
-      {
-          0.0,
-          0.0,
-          0.11354987314994337f,
-          -0.07417504595810355f,
-          0.0,
-          0.19402893032594343f,
-          -0.435190496523228f,
-          0.21918684838857466f,
-          0.11354987314994257f,
-          -0.4351904965232251f,
-          0.5550443808910661f,
-          -0.25468277124066463f,
-          -0.07417504595810233f,
-          0.2191868483885728f,
-          -0.25468277124066413f,
-          0.1135498731499429f,
-      },
-  };
-
-  const HWY_CAPPED(float, 16) d;
-  for (size_t i = 0; i < 16; i += Lanes(d)) {
-    auto pixel = Zero(d);
-    for (size_t j = 0; j < 16; j++) {
-      auto cf = Set(d, coeffs[j]);
-      auto basis = Load(d, k4x4AFVBasis[j] + i);
-      pixel = MulAdd(cf, basis, pixel);
-    }
-    Store(pixel, d, pixels + i);
-  }
-}
-
-template <size_t afv_kind>
-void AFVTransformToPixels(const float* JXL_RESTRICT coefficients,
-                          float* JXL_RESTRICT pixels, size_t pixels_stride) {
-  HWY_ALIGN float scratch_space[4 * 8 * 4];
-  size_t afv_x = afv_kind & 1;
-  size_t afv_y = afv_kind / 2;
-  float dcs[3] = {};
-  float block00 = coefficients[0];
-  float block01 = coefficients[1];
-  float block10 = coefficients[8];
-  dcs[0] = (block00 + block10 + block01) * 4.0f;
-  dcs[1] = (block00 + block10 - block01);
-  dcs[2] = block00 - block10;
-  // IAFV: (even, even) positions.
-  HWY_ALIGN float coeff[4 * 4];
-  coeff[0] = dcs[0];
-  for (size_t iy = 0; iy < 4; iy++) {
-    for (size_t ix = 0; ix < 4; ix++) {
-      if (ix == 0 && iy == 0) continue;
-      coeff[iy * 4 + ix] = coefficients[iy * 2 * 8 + ix * 2];
-    }
-  }
-  HWY_ALIGN float block[4 * 8];
-  AFVIDCT4x4(coeff, block);
-  for (size_t iy = 0; iy < 4; iy++) {
-    for (size_t ix = 0; ix < 4; ix++) {
-      pixels[(iy + afv_y * 4) * pixels_stride + afv_x * 4 + ix] =
-          block[(afv_y == 1 ? 3 - iy : iy) * 4 + (afv_x == 1 ? 3 - ix : ix)];
-    }
-  }
-  // IDCT4x4 in (odd, even) positions.
-  block[0] = dcs[1];
-  for (size_t iy = 0; iy < 4; iy++) {
-    for (size_t ix = 0; ix < 4; ix++) {
-      if (ix == 0 && iy == 0) continue;
-      block[iy * 4 + ix] = coefficients[iy * 2 * 8 + ix * 2 + 1];
-    }
-  }
-  ComputeScaledIDCT<4, 4>()(
-      block,
-      DCTTo(pixels + afv_y * 4 * pixels_stride + (afv_x == 1 ? 0 : 4),
-            pixels_stride),
-      scratch_space);
-  // IDCT4x8.
-  block[0] = dcs[2];
-  for (size_t iy = 0; iy < 4; iy++) {
-    for (size_t ix = 0; ix < 8; ix++) {
-      if (ix == 0 && iy == 0) continue;
-      block[iy * 8 + ix] = coefficients[(1 + iy * 2) * 8 + ix];
-    }
-  }
-  ComputeScaledIDCT<4, 8>()(
-      block,
-      DCTTo(pixels + (afv_y == 1 ? 0 : 4) * pixels_stride, pixels_stride),
-      scratch_space);
-}
-
-HWY_MAYBE_UNUSED void TransformToPixels(const AcStrategyType strategy,
-                                        float* JXL_RESTRICT coefficients,
-                                        float* JXL_RESTRICT pixels,
-                                        size_t pixels_stride,
-                                        float* scratch_space) {
-  using Type = AcStrategyType;
-  switch (strategy) {
-    case Type::IDENTITY: {
-      float dcs[4] = {};
-      float block00 = coefficients[0];
-      float block01 = coefficients[1];
-      float block10 = coefficients[8];
-      float block11 = coefficients[9];
-      dcs[0] = block00 + block01 + block10 + block11;
-      dcs[1] = block00 + block01 - block10 - block11;
-      dcs[2] = block00 - block01 + block10 - block11;
-      dcs[3] = block00 - block01 - block10 + block11;
-      for (size_t y = 0; y < 2; y++) {
-        for (size_t x = 0; x < 2; x++) {
-          float block_dc = dcs[y * 2 + x];
-          float residual_sum = 0;
-          for (size_t iy = 0; iy < 4; iy++) {
-            for (size_t ix = 0; ix < 4; ix++) {
-              if (ix == 0 && iy == 0) continue;
-              residual_sum += coefficients[(y + iy * 2) * 8 + x + ix * 2];
-            }
-          }
-          pixels[(4 * y + 1) * pixels_stride + 4 * x + 1] =
-              block_dc - residual_sum * (1.0f / 16);
-          for (size_t iy = 0; iy < 4; iy++) {
-            for (size_t ix = 0; ix < 4; ix++) {
-              if (ix == 1 && iy == 1) continue;
-              pixels[(y * 4 + iy) * pixels_stride + x * 4 + ix] =
-                  coefficients[(y + iy * 2) * 8 + x + ix * 2] +
-                  pixels[(4 * y + 1) * pixels_stride + 4 * x + 1];
-            }
-          }
-          pixels[y * 4 * pixels_stride + x * 4] =
-              coefficients[(y + 2) * 8 + x + 2] +
-              pixels[(4 * y + 1) * pixels_stride + 4 * x + 1];
-        }
-      }
-      break;
-    }
-    case Type::DCT8X4: {
-      float dcs[2] = {};
-      float block0 = coefficients[0];
-      float block1 = coefficients[8];
-      dcs[0] = block0 + block1;
-      dcs[1] = block0 - block1;
-      for (size_t x = 0; x < 2; x++) {
-        HWY_ALIGN float block[4 * 8];
-        block[0] = dcs[x];
-        for (size_t iy = 0; iy < 4; iy++) {
-          for (size_t ix = 0; ix < 8; ix++) {
-            if (ix == 0 && iy == 0) continue;
-            block[iy * 8 + ix] = coefficients[(x + iy * 2) * 8 + ix];
-          }
-        }
-        ComputeScaledIDCT<8, 4>()(block, DCTTo(pixels + x * 4, pixels_stride),
-                                  scratch_space);
-      }
-      break;
-    }
-    case Type::DCT4X8: {
-      float dcs[2] = {};
-      float block0 = coefficients[0];
-      float block1 = coefficients[8];
-      dcs[0] = block0 + block1;
-      dcs[1] = block0 - block1;
-      for (size_t y = 0; y < 2; y++) {
-        HWY_ALIGN float block[4 * 8];
-        block[0] = dcs[y];
-        for (size_t iy = 0; iy < 4; iy++) {
-          for (size_t ix = 0; ix < 8; ix++) {
-            if (ix == 0 && iy == 0) continue;
-            block[iy * 8 + ix] = coefficients[(y + iy * 2) * 8 + ix];
-          }
-        }
-        ComputeScaledIDCT<4, 8>()(
-            block, DCTTo(pixels + y * 4 * pixels_stride, pixels_stride),
-            scratch_space);
-      }
-      break;
-    }
-    case Type::DCT4X4: {
-      float dcs[4] = {};
-      float block00 = coefficients[0];
-      float block01 = coefficients[1];
-      float block10 = coefficients[8];
-      float block11 = coefficients[9];
-      dcs[0] = block00 + block01 + block10 + block11;
-      dcs[1] = block00 + block01 - block10 - block11;
-      dcs[2] = block00 - block01 + block10 - block11;
-      dcs[3] = block00 - block01 - block10 + block11;
-      for (size_t y = 0; y < 2; y++) {
-        for (size_t x = 0; x < 2; x++) {
-          HWY_ALIGN float block[4 * 4];
-          block[0] = dcs[y * 2 + x];
-          for (size_t iy = 0; iy < 4; iy++) {
-            for (size_t ix = 0; ix < 4; ix++) {
-              if (ix == 0 && iy == 0) continue;
-              block[iy * 4 + ix] = coefficients[(y + iy * 2) * 8 + x + ix * 2];
-            }
-          }
-          ComputeScaledIDCT<4, 4>()(
-              block,
-              DCTTo(pixels + y * 4 * pixels_stride + x * 4, pixels_stride),
-              scratch_space);
-        }
-      }
-      break;
-    }
-    case Type::DCT2X2: {
-      HWY_ALIGN float coeffs[kDCTBlockSize];
-      memcpy(coeffs, coefficients, sizeof(float) * kDCTBlockSize);
-      IDCT2TopBlock<2>(coeffs, kBlockDim, coeffs);
-      IDCT2TopBlock<4>(coeffs, kBlockDim, coeffs);
-      IDCT2TopBlock<8>(coeffs, kBlockDim, coeffs);
-      for (size_t y = 0; y < kBlockDim; y++) {
-        for (size_t x = 0; x < kBlockDim; x++) {
-          pixels[y * pixels_stride + x] = coeffs[y * kBlockDim + x];
-        }
-      }
-      break;
-    }
-    case Type::DCT16X16: {
-      ComputeScaledIDCT<16, 16>()(coefficients, DCTTo(pixels, pixels_stride),
-                                  scratch_space);
-      break;
-    }
-    case Type::DCT16X8: {
-      ComputeScaledIDCT<16, 8>()(coefficients, DCTTo(pixels, pixels_stride),
-                                 scratch_space);
-      break;
-    }
-    case Type::DCT8X16: {
-      ComputeScaledIDCT<8, 16>()(coefficients, DCTTo(pixels, pixels_stride),
-                                 scratch_space);
-      break;
-    }
-    case Type::DCT32X8: {
-      ComputeScaledIDCT<32, 8>()(coefficients, DCTTo(pixels, pixels_stride),
-                                 scratch_space);
-      break;
-    }
-    case Type::DCT8X32: {
-      ComputeScaledIDCT<8, 32>()(coefficients, DCTTo(pixels, pixels_stride),
-                                 scratch_space);
-      break;
-    }
-    case Type::DCT32X16: {
-      ComputeScaledIDCT<32, 16>()(coefficients, DCTTo(pixels, pixels_stride),
-                                  scratch_space);
-      break;
-    }
-    case Type::DCT16X32: {
-      ComputeScaledIDCT<16, 32>()(coefficients, DCTTo(pixels, pixels_stride),
-                                  scratch_space);
-      break;
-    }
-    case Type::DCT32X32: {
-      ComputeScaledIDCT<32, 32>()(coefficients, DCTTo(pixels, pixels_stride),
-                                  scratch_space);
-      break;
-    }
-    case Type::DCT: {
-      ComputeScaledIDCT<8, 8>()(coefficients, DCTTo(pixels, pixels_stride),
-                                scratch_space);
-      break;
-    }
-    case Type::AFV0: {
-      AFVTransformToPixels<0>(coefficients, pixels, pixels_stride);
-      break;
-    }
-    case Type::AFV1: {
-      AFVTransformToPixels<1>(coefficients, pixels, pixels_stride);
-      break;
-    }
-    case Type::AFV2: {
-      AFVTransformToPixels<2>(coefficients, pixels, pixels_stride);
-      break;
-    }
-    case Type::AFV3: {
-      AFVTransformToPixels<3>(coefficients, pixels, pixels_stride);
-      break;
-    }
-    case Type::DCT64X32: {
-      ComputeScaledIDCT<64, 32>()(coefficients, DCTTo(pixels, pixels_stride),
-                                  scratch_space);
-      break;
-    }
-    case Type::DCT32X64: {
-      ComputeScaledIDCT<32, 64>()(coefficients, DCTTo(pixels, pixels_stride),
-                                  scratch_space);
-      break;
-    }
-    case Type::DCT64X64: {
-      ComputeScaledIDCT<64, 64>()(coefficients, DCTTo(pixels, pixels_stride),
-                                  scratch_space);
-      break;
-    }
-    case Type::DCT128X64: {
-      ComputeScaledIDCT<128, 64>()(coefficients, DCTTo(pixels, pixels_stride),
-                                   scratch_space);
-      break;
-    }
-    case Type::DCT64X128: {
-      ComputeScaledIDCT<64, 128>()(coefficients, DCTTo(pixels, pixels_stride),
-                                   scratch_space);
-      break;
-    }
-    case Type::DCT128X128: {
-      ComputeScaledIDCT<128, 128>()(coefficients, DCTTo(pixels, pixels_stride),
-                                    scratch_space);
-      break;
-    }
-    case Type::DCT256X128: {
-      ComputeScaledIDCT<256, 128>()(coefficients, DCTTo(pixels, pixels_stride),
-                                    scratch_space);
-      break;
-    }
-    case Type::DCT128X256: {
-      ComputeScaledIDCT<128, 256>()(coefficients, DCTTo(pixels, pixels_stride),
-                                    scratch_space);
-      break;
-    }
-    case Type::DCT256X256: {
-      ComputeScaledIDCT<256, 256>()(coefficients, DCTTo(pixels, pixels_stride),
-                                    scratch_space);
-      break;
-    }
-  }
-}
-
-HWY_MAYBE_UNUSED void LowestFrequenciesFromDC(const AcStrategyType strategy,
-                                              const float* dc, size_t dc_stride,
-                                              float* llf,
-                                              float* JXL_RESTRICT scratch) {
-  using Type = AcStrategyType;
-  HWY_ALIGN float warm_block[4 * 4];
-  HWY_ALIGN float warm_scratch_space[4 * 4 * 4];
-  switch (strategy) {
-    case Type::DCT16X8: {
-      ReinterpretingDCT</*DCT_ROWS=*/2 * kBlockDim, /*DCT_COLS=*/kBlockDim,
-                        /*LF_ROWS=*/2, /*LF_COLS=*/1, /*ROWS=*/2, /*COLS=*/1>(
-          dc, dc_stride, llf, 2 * kBlockDim, warm_block, warm_scratch_space);
-      break;
-    }
-    case Type::DCT8X16: {
-      ReinterpretingDCT</*DCT_ROWS=*/kBlockDim, /*DCT_COLS=*/2 * kBlockDim,
-                        /*LF_ROWS=*/1, /*LF_COLS=*/2, /*ROWS=*/1, /*COLS=*/2>(
-          dc, dc_stride, llf, 2 * kBlockDim, warm_block, warm_scratch_space);
-      break;
-    }
-    case Type::DCT16X16: {
-      ReinterpretingDCT</*DCT_ROWS=*/2 * kBlockDim, /*DCT_COLS=*/2 * kBlockDim,
-                        /*LF_ROWS=*/2, /*LF_COLS=*/2, /*ROWS=*/2, /*COLS=*/2>(
-          dc, dc_stride, llf, 2 * kBlockDim, warm_block, warm_scratch_space);
-      break;
-    }
-    case Type::DCT32X8: {
-      ReinterpretingDCT</*DCT_ROWS=*/4 * kBlockDim, /*DCT_COLS=*/kBlockDim,
-                        /*LF_ROWS=*/4, /*LF_COLS=*/1, /*ROWS=*/4, /*COLS=*/1>(
-          dc, dc_stride, llf, 4 * kBlockDim, warm_block, warm_scratch_space);
-      break;
-    }
-    case Type::DCT8X32: {
-      ReinterpretingDCT</*DCT_ROWS=*/kBlockDim, /*DCT_COLS=*/4 * kBlockDim,
-                        /*LF_ROWS=*/1, /*LF_COLS=*/4, /*ROWS=*/1, /*COLS=*/4>(
-          dc, dc_stride, llf, 4 * kBlockDim, warm_block, warm_scratch_space);
-      break;
-    }
-    case Type::DCT32X16: {
-      ReinterpretingDCT</*DCT_ROWS=*/4 * kBlockDim, /*DCT_COLS=*/2 * kBlockDim,
-                        /*LF_ROWS=*/4, /*LF_COLS=*/2, /*ROWS=*/4, /*COLS=*/2>(
-          dc, dc_stride, llf, 4 * kBlockDim, warm_block, warm_scratch_space);
-      break;
-    }
-    case Type::DCT16X32: {
-      ReinterpretingDCT</*DCT_ROWS=*/2 * kBlockDim, /*DCT_COLS=*/4 * kBlockDim,
-                        /*LF_ROWS=*/2, /*LF_COLS=*/4, /*ROWS=*/2, /*COLS=*/4>(
-          dc, dc_stride, llf, 4 * kBlockDim, warm_block, warm_scratch_space);
-      break;
-    }
-    case Type::DCT32X32: {
-      ReinterpretingDCT</*DCT_ROWS=*/4 * kBlockDim, /*DCT_COLS=*/4 * kBlockDim,
-                        /*LF_ROWS=*/4, /*LF_COLS=*/4, /*ROWS=*/4, /*COLS=*/4>(
-          dc, dc_stride, llf, 4 * kBlockDim, warm_block, warm_scratch_space);
-      break;
-    }
-    case Type::DCT64X32: {
-      ReinterpretingDCT</*DCT_ROWS=*/8 * kBlockDim, /*DCT_COLS=*/4 * kBlockDim,
-                        /*LF_ROWS=*/8, /*LF_COLS=*/4, /*ROWS=*/8, /*COLS=*/4>(
-          dc, dc_stride, llf, 8 * kBlockDim, scratch, scratch + 8 * 4);
-      break;
-    }
-    case Type::DCT32X64: {
-      ReinterpretingDCT</*DCT_ROWS=*/4 * kBlockDim, /*DCT_COLS=*/8 * kBlockDim,
-                        /*LF_ROWS=*/4, /*LF_COLS=*/8, /*ROWS=*/4, /*COLS=*/8>(
-          dc, dc_stride, llf, 8 * kBlockDim, scratch, scratch + 4 * 8);
-      break;
-    }
-    case Type::DCT64X64: {
-      ReinterpretingDCT</*DCT_ROWS=*/8 * kBlockDim, /*DCT_COLS=*/8 * kBlockDim,
-                        /*LF_ROWS=*/8, /*LF_COLS=*/8, /*ROWS=*/8, /*COLS=*/8>(
-          dc, dc_stride, llf, 8 * kBlockDim, scratch, scratch + 8 * 8);
-      break;
-    }
-    case Type::DCT128X64: {
-      ReinterpretingDCT</*DCT_ROWS=*/16 * kBlockDim, /*DCT_COLS=*/8 * kBlockDim,
-                        /*LF_ROWS=*/16, /*LF_COLS=*/8, /*ROWS=*/16, /*COLS=*/8>(
-          dc, dc_stride, llf, 16 * kBlockDim, scratch, scratch + 16 * 8);
-      break;
-    }
-    case Type::DCT64X128: {
-      ReinterpretingDCT</*DCT_ROWS=*/8 * kBlockDim, /*DCT_COLS=*/16 * kBlockDim,
-                        /*LF_ROWS=*/8, /*LF_COLS=*/16, /*ROWS=*/8, /*COLS=*/16>(
-          dc, dc_stride, llf, 16 * kBlockDim, scratch, scratch + 8 * 16);
-      break;
-    }
-    case Type::DCT128X128: {
-      ReinterpretingDCT<
-          /*DCT_ROWS=*/16 * kBlockDim, /*DCT_COLS=*/16 * kBlockDim,
-          /*LF_ROWS=*/16, /*LF_COLS=*/16, /*ROWS=*/16, /*COLS=*/16>(
-          dc, dc_stride, llf, 16 * kBlockDim, scratch, scratch + 16 * 16);
-      break;
-    }
-    case Type::DCT256X128: {
-      ReinterpretingDCT<
-          /*DCT_ROWS=*/32 * kBlockDim, /*DCT_COLS=*/16 * kBlockDim,
-          /*LF_ROWS=*/32, /*LF_COLS=*/16, /*ROWS=*/32, /*COLS=*/16>(
-          dc, dc_stride, llf, 32 * kBlockDim, scratch, scratch + 32 * 16);
-      break;
-    }
-    case Type::DCT128X256: {
-      ReinterpretingDCT<
-          /*DCT_ROWS=*/16 * kBlockDim, /*DCT_COLS=*/32 * kBlockDim,
-          /*LF_ROWS=*/16, /*LF_COLS=*/32, /*ROWS=*/16, /*COLS=*/32>(
-          dc, dc_stride, llf, 32 * kBlockDim, scratch, scratch + 16 * 32);
-      break;
-    }
-    case Type::DCT256X256: {
-      ReinterpretingDCT<
-          /*DCT_ROWS=*/32 * kBlockDim, /*DCT_COLS=*/32 * kBlockDim,
-          /*LF_ROWS=*/32, /*LF_COLS=*/32, /*ROWS=*/32, /*COLS=*/32>(
-          dc, dc_stride, llf, 32 * kBlockDim, scratch, scratch + 32 * 32);
-      break;
-    }
-    case Type::DCT:
-    case Type::DCT2X2:
-    case Type::DCT4X4:
-    case Type::DCT4X8:
-    case Type::DCT8X4:
-    case Type::AFV0:
-    case Type::AFV1:
-    case Type::AFV2:
-    case Type::AFV3:
-    case Type::IDENTITY:
-      llf[0] = dc[0];
-      break;
-  };
-}
-
-}  // namespace
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#endif  // LIB_JXL_DEC_TRANSFORMS_INL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/dec_transforms_testonly.cc b/third_party/jpeg-xl/lib/jxl/dec_transforms_testonly.cc
deleted file mode 100644
index bed47ee863f28..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_transforms_testonly.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/dec_transforms_testonly.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/dec_transforms_testonly.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/dec_transforms-inl.h"
-
-namespace jxl {
-
-#if HWY_ONCE
-HWY_EXPORT(TransformToPixels);
-void TransformToPixels(AcStrategyType strategy,
-                       float* JXL_RESTRICT coefficients,
-                       float* JXL_RESTRICT pixels, size_t pixels_stride,
-                       float* scratch_space) {
-  HWY_DYNAMIC_DISPATCH(TransformToPixels)
-  (strategy, coefficients, pixels, pixels_stride, scratch_space);
-}
-
-HWY_EXPORT(LowestFrequenciesFromDC);
-void LowestFrequenciesFromDC(const jxl::AcStrategyType strategy,
-                             const float* dc, size_t dc_stride, float* llf,
-                             float* JXL_RESTRICT scratch) {
-  HWY_DYNAMIC_DISPATCH(LowestFrequenciesFromDC)
-  (strategy, dc, dc_stride, llf, scratch);
-}
-
-HWY_EXPORT(AFVIDCT4x4);
-void AFVIDCT4x4(const float* JXL_RESTRICT coeffs, float* JXL_RESTRICT pixels) {
-  HWY_DYNAMIC_DISPATCH(AFVIDCT4x4)(coeffs, pixels);
-}
-#endif  // HWY_ONCE
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/dec_transforms_testonly.h b/third_party/jpeg-xl/lib/jxl/dec_transforms_testonly.h
deleted file mode 100644
index cbac3cc752234..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_transforms_testonly.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_DEC_TRANSFORMS_TESTONLY_H_
-#define LIB_JXL_DEC_TRANSFORMS_TESTONLY_H_
-
-// Facade for (non-inlined) inverse integral transforms.
-
-#include <cstddef>
-#include <cstdint>
-
-#include "lib/jxl/base/compiler_specific.h"
-
-namespace jxl {
-
-enum class AcStrategyType : uint32_t;
-
-void TransformToPixels(AcStrategyType strategy,
-                       float* JXL_RESTRICT coefficients,
-                       float* JXL_RESTRICT pixels, size_t pixels_stride,
-                       float* JXL_RESTRICT scratch_space);
-
-// Equivalent of the above for DC image.
-void LowestFrequenciesFromDC(AcStrategyType strategy, const float* dc,
-                             size_t dc_stride, float* llf,
-                             float* JXL_RESTRICT scratch);
-
-void AFVIDCT4x4(const float* JXL_RESTRICT coeffs, float* JXL_RESTRICT pixels);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_DEC_TRANSFORMS_TESTONLY_H_
diff --git a/third_party/jpeg-xl/lib/jxl/dec_xyb-inl.h b/third_party/jpeg-xl/lib/jxl/dec_xyb-inl.h
deleted file mode 100644
index c223e05e75400..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_xyb-inl.h
+++ /dev/null
@@ -1,347 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// XYB -> linear sRGB helper function.
-
-#if defined(LIB_JXL_DEC_XYB_INL_H_) == defined(HWY_TARGET_TOGGLE)
-#ifdef LIB_JXL_DEC_XYB_INL_H_
-#undef LIB_JXL_DEC_XYB_INL_H_
-#else
-#define LIB_JXL_DEC_XYB_INL_H_
-#endif
-
-#include <hwy/highway.h>
-
-#include "lib/jxl/dec_xyb.h"
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-namespace {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::Broadcast;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::MulAdd;
-using hwy::HWY_NAMESPACE::Sub;
-
-// Inverts the pixel-wise RGB->XYB conversion in OpsinDynamicsImage() (including
-// the gamma mixing and simple gamma). Avoids clamping to [0, 1] - out of (sRGB)
-// gamut values may be in-gamut after transforming to a wider space.
-// "inverse_matrix" points to 9 broadcasted vectors, which are the 3x3 entries
-// of the (row-major) opsin absorbance matrix inverse. Pre-multiplying its
-// entries by c is equivalent to multiplying linear_* by c afterwards.
-template <class D, class V>
-HWY_INLINE HWY_MAYBE_UNUSED void XybToRgb(D d, const V opsin_x, const V opsin_y,
-                                          const V opsin_b,
-                                          const OpsinParams& opsin_params,
-                                          V* const HWY_RESTRICT linear_r,
-                                          V* const HWY_RESTRICT linear_g,
-                                          V* const HWY_RESTRICT linear_b) {
-#if HWY_TARGET == HWY_SCALAR
-  const auto neg_bias_r = Set(d, opsin_params.opsin_biases[0]);
-  const auto neg_bias_g = Set(d, opsin_params.opsin_biases[1]);
-  const auto neg_bias_b = Set(d, opsin_params.opsin_biases[2]);
-#else
-  const auto neg_bias_rgb = LoadDup128(d, opsin_params.opsin_biases);
-  const auto neg_bias_r = Broadcast<0>(neg_bias_rgb);
-  const auto neg_bias_g = Broadcast<1>(neg_bias_rgb);
-  const auto neg_bias_b = Broadcast<2>(neg_bias_rgb);
-#endif
-
-  // Color space: XYB -> RGB
-  auto gamma_r = Add(opsin_y, opsin_x);
-  auto gamma_g = Sub(opsin_y, opsin_x);
-  auto gamma_b = opsin_b;
-
-  gamma_r = Sub(gamma_r, Set(d, opsin_params.opsin_biases_cbrt[0]));
-  gamma_g = Sub(gamma_g, Set(d, opsin_params.opsin_biases_cbrt[1]));
-  gamma_b = Sub(gamma_b, Set(d, opsin_params.opsin_biases_cbrt[2]));
-
-  // Undo gamma compression: linear = gamma^3 for efficiency.
-  const auto gamma_r2 = Mul(gamma_r, gamma_r);
-  const auto gamma_g2 = Mul(gamma_g, gamma_g);
-  const auto gamma_b2 = Mul(gamma_b, gamma_b);
-  const auto mixed_r = MulAdd(gamma_r2, gamma_r, neg_bias_r);
-  const auto mixed_g = MulAdd(gamma_g2, gamma_g, neg_bias_g);
-  const auto mixed_b = MulAdd(gamma_b2, gamma_b, neg_bias_b);
-
-  const float* HWY_RESTRICT inverse_matrix = opsin_params.inverse_opsin_matrix;
-
-  // Unmix (multiply by 3x3 inverse_matrix)
-  // TODO(eustas): ref would be more readable than pointer
-  *linear_r = Mul(LoadDup128(d, &inverse_matrix[0 * 4]), mixed_r);
-  *linear_g = Mul(LoadDup128(d, &inverse_matrix[3 * 4]), mixed_r);
-  *linear_b = Mul(LoadDup128(d, &inverse_matrix[6 * 4]), mixed_r);
-  *linear_r = MulAdd(LoadDup128(d, &inverse_matrix[1 * 4]), mixed_g, *linear_r);
-  *linear_g = MulAdd(LoadDup128(d, &inverse_matrix[4 * 4]), mixed_g, *linear_g);
-  *linear_b = MulAdd(LoadDup128(d, &inverse_matrix[7 * 4]), mixed_g, *linear_b);
-  *linear_r = MulAdd(LoadDup128(d, &inverse_matrix[2 * 4]), mixed_b, *linear_r);
-  *linear_g = MulAdd(LoadDup128(d, &inverse_matrix[5 * 4]), mixed_b, *linear_g);
-  *linear_b = MulAdd(LoadDup128(d, &inverse_matrix[8 * 4]), mixed_b, *linear_b);
-}
-
-inline HWY_MAYBE_UNUSED bool HasFastXYBTosRGB8() {
-#if HWY_TARGET == HWY_NEON
-  return true;
-#else
-  return false;
-#endif
-}
-
-inline HWY_MAYBE_UNUSED Status FastXYBTosRGB8(const float* input[4],
-                                              uint8_t* output, bool is_rgba,
-                                              size_t xsize) {
-  // This function is very NEON-specific. As such, it uses intrinsics directly.
-#if HWY_TARGET == HWY_NEON
-  // WARNING: doing fixed point arithmetic correctly is very complicated.
-  // Changes to this function should be thoroughly tested.
-
-  // Note that the input is assumed to have 13 bits of mantissa, and the output
-  // will have 14 bits.
-  auto srgb_tf = [&](int16x8_t v16) {
-    int16x8_t clz = vclzq_s16(v16);
-    // Convert to [0.25, 0.5) range.
-    int16x8_t v025_05_16 = vqshlq_s16(v16, vqsubq_s16(clz, vdupq_n_s16(2)));
-
-    // third degree polynomial approximation between 0.25 and 0.5
-    // of 1.055/2^(7/2.4) * x^(1/2.4) / 32.
-    // poly ~ ((0.95x-1.75)*x+1.72)*x+0.29
-    // We actually compute ~ ((0.47x-0.87)*x+0.86)*(2x)+0.29 as 1.75 and 1.72
-    // overflow our fixed point representation.
-
-    int16x8_t twov = vqaddq_s16(v025_05_16, v025_05_16);
-
-    // 0.47 * x
-    int16x8_t step1 = vqrdmulhq_n_s16(v025_05_16, 15706);
-    // - 0.87
-    int16x8_t step2 = vsubq_s16(step1, vdupq_n_s16(28546));
-    // * x
-    int16x8_t step3 = vqrdmulhq_s16(step2, v025_05_16);
-    // + 0.86
-    int16x8_t step4 = vaddq_s16(step3, vdupq_n_s16(28302));
-    // * 2x
-    int16x8_t step5 = vqrdmulhq_s16(step4, twov);
-    // + 0.29
-    int16x8_t mul16 = vaddq_s16(step5, vdupq_n_s16(9485));
-
-    int16x8_t exp16 = vsubq_s16(vdupq_n_s16(11), clz);
-    // Compute 2**(1/2.4*exp16)/32. Values of exp16 that would overflow are
-    // capped to 1.
-    // Generated with the following Python script:
-    // a = []
-    // b = []
-    //
-    // for i in range(0, 16):
-    //   v = 2**(5/12.*i)
-    //   v /= 16
-    //   v *= 256 * 128
-    //   v = int(v)
-    //   a.append(v // 256)
-    //   b.append(v % 256)
-    //
-    // print(", ".join("0x%02x" % x for x in a))
-    //
-    // print(", ".join("0x%02x" % x for x in b))
-
-    HWY_ALIGN constexpr uint8_t k2to512powersm1div32_high[16] = {
-        0x08, 0x0a, 0x0e, 0x13, 0x19, 0x21, 0x2d, 0x3c,
-        0x50, 0x6b, 0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8f,
-    };
-    HWY_ALIGN constexpr uint8_t k2to512powersm1div32_low[16] = {
-        0x00, 0xad, 0x41, 0x06, 0x65, 0xe7, 0x41, 0x68,
-        0xa2, 0xa2, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    };
-    // Using the highway implementation here since vqtbl1q is aarch64-only.
-    using hwy::HWY_NAMESPACE::Vec128;
-    uint8x16_t pow_low =
-        TableLookupBytes(
-            Vec128<uint8_t, 16>(vld1q_u8(k2to512powersm1div32_low)),
-            Vec128<uint8_t, 16>(vreinterpretq_u8_s16(exp16)))
-            .raw;
-    uint8x16_t pow_high =
-        TableLookupBytes(
-            Vec128<uint8_t, 16>(vld1q_u8(k2to512powersm1div32_high)),
-            Vec128<uint8_t, 16>(vreinterpretq_u8_s16(exp16)))
-            .raw;
-    int16x8_t pow16 = vreinterpretq_s16_u16(vsliq_n_u16(
-        vreinterpretq_u16_u8(pow_low), vreinterpretq_u16_u8(pow_high), 8));
-
-    // approximation of v * 12.92, divided by 2
-    // Note that our input is using 13 mantissa bits instead of 15.
-    int16x8_t v16_linear = vrshrq_n_s16(vmulq_n_s16(v16, 826), 5);
-    // 1.055*pow(v, 1/2.4) - 0.055, divided by 2
-    auto v16_pow = vsubq_s16(vqrdmulhq_s16(mul16, pow16), vdupq_n_s16(901));
-    // > 0.0031308f (note that v16 has 13 mantissa bits)
-    return vbslq_s16(vcgeq_s16(v16, vdupq_n_s16(26)), v16_pow, v16_linear);
-  };
-
-  const float* JXL_RESTRICT row_in_x = input[0];
-  const float* JXL_RESTRICT row_in_y = input[1];
-  const float* JXL_RESTRICT row_in_b = input[2];
-  const float* JXL_RESTRICT row_in_a = input[3];
-  for (size_t x = 0; x < xsize; x += 8) {
-    // Normal ranges for xyb for in-gamut sRGB colors:
-    // x: -0.015386 0.028100
-    // y: 0.000000 0.845308
-    // b: 0.000000 0.845308
-
-    // We actually want x * 8 to have some extra precision.
-    // TODO(veluca): consider different approaches here, like vld1q_f32_x2.
-    float32x4_t opsin_x_left = vld1q_f32(row_in_x + x);
-    int16x4_t opsin_x16_times8_left =
-        vqmovn_s32(vcvtq_n_s32_f32(opsin_x_left, 18));
-    float32x4_t opsin_x_right =
-        vld1q_f32(row_in_x + x + (x + 4 < xsize ? 4 : 0));
-    int16x4_t opsin_x16_times8_right =
-        vqmovn_s32(vcvtq_n_s32_f32(opsin_x_right, 18));
-    int16x8_t opsin_x16_times8 =
-        vcombine_s16(opsin_x16_times8_left, opsin_x16_times8_right);
-
-    float32x4_t opsin_y_left = vld1q_f32(row_in_y + x);
-    int16x4_t opsin_y16_left = vqmovn_s32(vcvtq_n_s32_f32(opsin_y_left, 15));
-    float32x4_t opsin_y_right =
-        vld1q_f32(row_in_y + x + (x + 4 < xsize ? 4 : 0));
-    int16x4_t opsin_y16_right = vqmovn_s32(vcvtq_n_s32_f32(opsin_y_right, 15));
-    int16x8_t opsin_y16 = vcombine_s16(opsin_y16_left, opsin_y16_right);
-
-    float32x4_t opsin_b_left = vld1q_f32(row_in_b + x);
-    int16x4_t opsin_b16_left = vqmovn_s32(vcvtq_n_s32_f32(opsin_b_left, 15));
-    float32x4_t opsin_b_right =
-        vld1q_f32(row_in_b + x + (x + 4 < xsize ? 4 : 0));
-    int16x4_t opsin_b16_right = vqmovn_s32(vcvtq_n_s32_f32(opsin_b_right, 15));
-    int16x8_t opsin_b16 = vcombine_s16(opsin_b16_left, opsin_b16_right);
-
-    int16x8_t neg_bias16 = vdupq_n_s16(-124);        // -0.0037930732552754493
-    int16x8_t neg_bias_cbrt16 = vdupq_n_s16(-5110);  // -0.155954201
-    int16x8_t neg_bias_half16 = vdupq_n_s16(-62);
-
-    // Color space: XYB -> RGB
-    // Compute ((y+x-bias_cbrt)^3-(y-x-bias_cbrt)^3)/2,
-    // ((y+x-bias_cbrt)^3+(y-x-bias_cbrt)^3)/2+bias, (b-bias_cbrt)^3+bias.
-    // Note that ignoring x2 in the formulas below (as x << y) results in
-    // errors of at least 3 in the final sRGB values.
-    int16x8_t opsin_yp16 = vqsubq_s16(opsin_y16, neg_bias_cbrt16);
-    int16x8_t ysq16 = vqrdmulhq_s16(opsin_yp16, opsin_yp16);
-    int16x8_t twentyfourx16 = vmulq_n_s16(opsin_x16_times8, 3);
-    int16x8_t twentyfourxy16 = vqrdmulhq_s16(opsin_yp16, twentyfourx16);
-    int16x8_t threexsq16 =
-        vrshrq_n_s16(vqrdmulhq_s16(opsin_x16_times8, twentyfourx16), 6);
-
-    // We can ignore x^3 here. Note that this is multiplied by 8.
-    int16x8_t mixed_rmg16 = vqrdmulhq_s16(twentyfourxy16, opsin_yp16);
-
-    int16x8_t mixed_rpg_sos_half = vhaddq_s16(ysq16, threexsq16);
-    int16x8_t mixed_rpg16 = vhaddq_s16(
-        vqrdmulhq_s16(opsin_yp16, mixed_rpg_sos_half), neg_bias_half16);
-
-    int16x8_t gamma_b16 = vqsubq_s16(opsin_b16, neg_bias_cbrt16);
-    int16x8_t gamma_bsq16 = vqrdmulhq_s16(gamma_b16, gamma_b16);
-    int16x8_t gamma_bcb16 = vqrdmulhq_s16(gamma_bsq16, gamma_b16);
-    int16x8_t mixed_b16 = vqaddq_s16(gamma_bcb16, neg_bias16);
-    // mixed_rpg and mixed_b are in 0-1 range.
-    // mixed_rmg has a smaller range (-0.035 to 0.035 for valid sRGB). Note
-    // that at this point it is already multiplied by 8.
-
-    // We multiply all the mixed values by 1/4 (i.e. shift them to 13-bit
-    // fixed point) to ensure intermediate quantities are in range. Note that
-    // r-g is not shifted, and was x8 before here; this corresponds to a x32
-    // overall multiplicative factor and ensures that all the matrix constants
-    // are in 0-1 range.
-    // Similarly, mixed_rpg16 is already multiplied by 1/4 because of the two
-    // vhadd + using neg_bias_half.
-    mixed_b16 = vshrq_n_s16(mixed_b16, 2);
-
-    // Unmix (multiply by 3x3 inverse_matrix)
-    // For increased precision, we use a matrix for converting from
-    // ((mixed_r - mixed_g)/2, (mixed_r + mixed_g)/2, mixed_b) to rgb. This
-    // avoids cancellation effects when computing (y+x)^3-(y-x)^3.
-    // We compute mixed_rpg - mixed_b because the (1+c)*mixed_rpg - c *
-    // mixed_b pattern is repeated frequently in the code below. This allows
-    // us to save a multiply per channel, and removes the presence of
-    // some constants above 1. Moreover, mixed_rmg - mixed_b is in (-1, 1)
-    // range, so the subtraction is safe.
-    // All the magic-looking constants here are derived by computing the
-    // inverse opsin matrix for the transformation modified as described
-    // above.
-
-    // Precomputation common to multiple color values.
-    int16x8_t mixed_rpgmb16 = vqsubq_s16(mixed_rpg16, mixed_b16);
-    int16x8_t mixed_rpgmb_times_016 = vqrdmulhq_n_s16(mixed_rpgmb16, 5394);
-    int16x8_t mixed_rg16 = vqaddq_s16(mixed_rpgmb_times_016, mixed_rpg16);
-
-    // R
-    int16x8_t linear_r16 =
-        vqaddq_s16(mixed_rg16, vqrdmulhq_n_s16(mixed_rmg16, 21400));
-
-    // G
-    int16x8_t linear_g16 =
-        vqaddq_s16(mixed_rg16, vqrdmulhq_n_s16(mixed_rmg16, -7857));
-
-    // B
-    int16x8_t linear_b16 = vqrdmulhq_n_s16(mixed_rpgmb16, -30996);
-    linear_b16 = vqaddq_s16(linear_b16, mixed_b16);
-    linear_b16 = vqaddq_s16(linear_b16, vqrdmulhq_n_s16(mixed_rmg16, -6525));
-
-    // Apply SRGB transfer function.
-    int16x8_t r = srgb_tf(linear_r16);
-    int16x8_t g = srgb_tf(linear_g16);
-    int16x8_t b = srgb_tf(linear_b16);
-
-    uint8x8_t r8 =
-        vqmovun_s16(vrshrq_n_s16(vsubq_s16(r, vshrq_n_s16(r, 8)), 6));
-    uint8x8_t g8 =
-        vqmovun_s16(vrshrq_n_s16(vsubq_s16(g, vshrq_n_s16(g, 8)), 6));
-    uint8x8_t b8 =
-        vqmovun_s16(vrshrq_n_s16(vsubq_s16(b, vshrq_n_s16(b, 8)), 6));
-
-    size_t n = xsize - x;
-    if (is_rgba) {
-      float32x4_t a_f32_left =
-          row_in_a ? vld1q_f32(row_in_a + x) : vdupq_n_f32(1.0f);
-      float32x4_t a_f32_right =
-          row_in_a ? vld1q_f32(row_in_a + x + (x + 4 < xsize ? 4 : 0))
-                   : vdupq_n_f32(1.0f);
-      int16x4_t a16_left = vqmovn_s32(vcvtq_n_s32_f32(a_f32_left, 8));
-      int16x4_t a16_right = vqmovn_s32(vcvtq_n_s32_f32(a_f32_right, 8));
-      uint8x8_t a8 = vqmovun_s16(vcombine_s16(a16_left, a16_right));
-      uint8_t* buf = output + 4 * x;
-      uint8x8x4_t data = {r8, g8, b8, a8};
-      if (n >= 8) {
-        vst4_u8(buf, data);
-      } else {
-        uint8_t tmp[8 * 4];
-        vst4_u8(tmp, data);
-        memcpy(buf, tmp, n * 4);
-      }
-    } else {
-      uint8_t* buf = output + 3 * x;
-      uint8x8x3_t data = {r8, g8, b8};
-      if (n >= 8) {
-        vst3_u8(buf, data);
-      } else {
-        uint8_t tmp[8 * 3];
-        vst3_u8(tmp, data);
-        memcpy(buf, tmp, n * 3);
-      }
-    }
-  }
-  return true;
-#else
-  (void)input;
-  (void)output;
-  (void)is_rgba;
-  (void)xsize;
-  return JXL_UNREACHABLE("unsupported platform");
-#endif
-}
-
-}  // namespace
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#endif  // LIB_JXL_DEC_XYB_INL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/dec_xyb.cc b/third_party/jpeg-xl/lib/jxl/dec_xyb.cc
deleted file mode 100644
index 66a45a7dde596..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_xyb.cc
+++ /dev/null
@@ -1,329 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/dec_xyb.h"
-
-#include <cstring>
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/dec_xyb.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/matrix_ops.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/sanitizers.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/cms/jxl_cms_internal.h"
-#include "lib/jxl/cms/opsin_params.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/dec_xyb-inl.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/opsin_params.h"
-#include "lib/jxl/quantizer.h"
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::MulAdd;
-
-Status OpsinToLinearInplace(Image3F* JXL_RESTRICT inout, ThreadPool* pool,
-                            const OpsinParams& opsin_params) {
-  JXL_CHECK_IMAGE_INITIALIZED(*inout, Rect(*inout));
-
-  const size_t xsize = inout->xsize();  // not padded
-  const auto process_row = [&](const uint32_t task,
-                               size_t /* thread */) -> Status {
-    const size_t y = task;
-
-    // Faster than adding via ByteOffset at end of loop.
-    float* JXL_RESTRICT row0 = inout->PlaneRow(0, y);
-    float* JXL_RESTRICT row1 = inout->PlaneRow(1, y);
-    float* JXL_RESTRICT row2 = inout->PlaneRow(2, y);
-
-    const HWY_FULL(float) d;
-
-    for (size_t x = 0; x < xsize; x += Lanes(d)) {
-      const auto in_opsin_x = Load(d, row0 + x);
-      const auto in_opsin_y = Load(d, row1 + x);
-      const auto in_opsin_b = Load(d, row2 + x);
-      auto linear_r = Undefined(d);
-      auto linear_g = Undefined(d);
-      auto linear_b = Undefined(d);
-      XybToRgb(d, in_opsin_x, in_opsin_y, in_opsin_b, opsin_params, &linear_r,
-               &linear_g, &linear_b);
-
-      Store(linear_r, d, row0 + x);
-      Store(linear_g, d, row1 + x);
-      Store(linear_b, d, row2 + x);
-    }
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, inout->ysize(), ThreadPool::NoInit,
-                                process_row, "OpsinToLinear"));
-  return true;
-}
-
-// Same, but not in-place.
-Status OpsinToLinear(const Image3F& opsin, const Rect& rect, ThreadPool* pool,
-                     Image3F* JXL_RESTRICT linear,
-                     const OpsinParams& opsin_params) {
-  JXL_ENSURE(SameSize(rect, *linear));
-  JXL_CHECK_IMAGE_INITIALIZED(opsin, rect);
-
-  const auto process_row = [&](const uint32_t task,
-                               size_t /*thread*/) -> Status {
-    const size_t y = static_cast<size_t>(task);
-
-    // Faster than adding via ByteOffset at end of loop.
-    const float* JXL_RESTRICT row_opsin_0 = rect.ConstPlaneRow(opsin, 0, y);
-    const float* JXL_RESTRICT row_opsin_1 = rect.ConstPlaneRow(opsin, 1, y);
-    const float* JXL_RESTRICT row_opsin_2 = rect.ConstPlaneRow(opsin, 2, y);
-    float* JXL_RESTRICT row_linear_0 = linear->PlaneRow(0, y);
-    float* JXL_RESTRICT row_linear_1 = linear->PlaneRow(1, y);
-    float* JXL_RESTRICT row_linear_2 = linear->PlaneRow(2, y);
-
-    const HWY_FULL(float) d;
-
-    for (size_t x = 0; x < rect.xsize(); x += Lanes(d)) {
-      const auto in_opsin_x = Load(d, row_opsin_0 + x);
-      const auto in_opsin_y = Load(d, row_opsin_1 + x);
-      const auto in_opsin_b = Load(d, row_opsin_2 + x);
-      auto linear_r = Undefined(d);
-      auto linear_g = Undefined(d);
-      auto linear_b = Undefined(d);
-      XybToRgb(d, in_opsin_x, in_opsin_y, in_opsin_b, opsin_params, &linear_r,
-               &linear_g, &linear_b);
-
-      Store(linear_r, d, row_linear_0 + x);
-      Store(linear_g, d, row_linear_1 + x);
-      Store(linear_b, d, row_linear_2 + x);
-    }
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, static_cast<int>(rect.ysize()),
-                                ThreadPool::NoInit, process_row,
-                                "OpsinToLinear(Rect)"));
-  JXL_CHECK_IMAGE_INITIALIZED(*linear, rect);
-  return true;
-}
-
-// Transform YCbCr to RGB.
-// Could be performed in-place (i.e. Y, Cb and Cr could alias R, B and B).
-void YcbcrToRgb(const Image3F& ycbcr, Image3F* rgb, const Rect& rect) {
-  JXL_CHECK_IMAGE_INITIALIZED(ycbcr, rect);
-  const HWY_CAPPED(float, kBlockDim) df;
-  const size_t S = Lanes(df);  // Step.
-
-  const size_t xsize = rect.xsize();
-  const size_t ysize = rect.ysize();
-  if ((xsize == 0) || (ysize == 0)) return;
-
-  // Full-range BT.601 as defined by JFIF Clause 7:
-  // https://www.itu.int/rec/T-REC-T.871-201105-I/en
-  const auto c128 = Set(df, 128.0f / 255);
-  const auto crcr = Set(df, 1.402f);
-  const auto cgcb = Set(df, -0.114f * 1.772f / 0.587f);
-  const auto cgcr = Set(df, -0.299f * 1.402f / 0.587f);
-  const auto cbcb = Set(df, 1.772f);
-
-  for (size_t y = 0; y < ysize; y++) {
-    const float* y_row = rect.ConstPlaneRow(ycbcr, 1, y);
-    const float* cb_row = rect.ConstPlaneRow(ycbcr, 0, y);
-    const float* cr_row = rect.ConstPlaneRow(ycbcr, 2, y);
-    float* r_row = rect.PlaneRow(rgb, 0, y);
-    float* g_row = rect.PlaneRow(rgb, 1, y);
-    float* b_row = rect.PlaneRow(rgb, 2, y);
-    for (size_t x = 0; x < xsize; x += S) {
-      const auto y_vec = Add(Load(df, y_row + x), c128);
-      const auto cb_vec = Load(df, cb_row + x);
-      const auto cr_vec = Load(df, cr_row + x);
-      const auto r_vec = MulAdd(crcr, cr_vec, y_vec);
-      const auto g_vec = MulAdd(cgcr, cr_vec, MulAdd(cgcb, cb_vec, y_vec));
-      const auto b_vec = MulAdd(cbcb, cb_vec, y_vec);
-      Store(r_vec, df, r_row + x);
-      Store(g_vec, df, g_row + x);
-      Store(b_vec, df, b_row + x);
-    }
-  }
-  JXL_CHECK_IMAGE_INITIALIZED(*rgb, rect);
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(OpsinToLinearInplace);
-Status OpsinToLinearInplace(Image3F* JXL_RESTRICT inout, ThreadPool* pool,
-                            const OpsinParams& opsin_params) {
-  return HWY_DYNAMIC_DISPATCH(OpsinToLinearInplace)(inout, pool, opsin_params);
-}
-
-HWY_EXPORT(OpsinToLinear);
-Status OpsinToLinear(const Image3F& opsin, const Rect& rect, ThreadPool* pool,
-                     Image3F* JXL_RESTRICT linear,
-                     const OpsinParams& opsin_params) {
-  return HWY_DYNAMIC_DISPATCH(OpsinToLinear)(opsin, rect, pool, linear,
-                                             opsin_params);
-}
-
-HWY_EXPORT(YcbcrToRgb);
-void YcbcrToRgb(const Image3F& ycbcr, Image3F* rgb, const Rect& rect) {
-  HWY_DYNAMIC_DISPATCH(YcbcrToRgb)(ycbcr, rgb, rect);
-}
-
-HWY_EXPORT(HasFastXYBTosRGB8);
-bool HasFastXYBTosRGB8() { return HWY_DYNAMIC_DISPATCH(HasFastXYBTosRGB8)(); }
-
-HWY_EXPORT(FastXYBTosRGB8);
-Status FastXYBTosRGB8(const float* input[4], uint8_t* output, bool is_rgba,
-                      size_t xsize) {
-  return HWY_DYNAMIC_DISPATCH(FastXYBTosRGB8)(input, output, is_rgba, xsize);
-}
-
-void OpsinParams::Init(float intensity_target) {
-  InitSIMDInverseMatrix(GetOpsinAbsorbanceInverseMatrix(), inverse_opsin_matrix,
-                        intensity_target);
-  memcpy(opsin_biases, jxl::cms::kNegOpsinAbsorbanceBiasRGB.data(),
-         sizeof(jxl::cms::kNegOpsinAbsorbanceBiasRGB));
-  memcpy(quant_biases, kDefaultQuantBias, sizeof(kDefaultQuantBias));
-  for (size_t c = 0; c < 4; c++) {
-    opsin_biases_cbrt[c] = cbrtf(opsin_biases[c]);
-  }
-}
-
-bool CanOutputToColorEncoding(const ColorEncoding& c_desired) {
-  if (!c_desired.HaveFields()) {
-    return false;
-  }
-  // TODO(veluca): keep in sync with dec_reconstruct.cc
-  const auto& tf = c_desired.Tf();
-  if (!tf.IsPQ() && !tf.IsSRGB() && !tf.have_gamma && !tf.IsLinear() &&
-      !tf.IsHLG() && !tf.IsDCI() && !tf.Is709()) {
-    return false;
-  }
-  if (c_desired.IsGray() && c_desired.GetWhitePointType() != WhitePoint::kD65) {
-    // TODO(veluca): figure out what should happen here.
-    return false;
-  }
-  return true;
-}
-
-Status OutputEncodingInfo::SetFromMetadata(const CodecMetadata& metadata) {
-  orig_color_encoding = metadata.m.color_encoding;
-  orig_intensity_target = metadata.m.IntensityTarget();
-  desired_intensity_target = orig_intensity_target;
-  const auto& im = metadata.transform_data.opsin_inverse_matrix;
-  orig_inverse_matrix = im.inverse_matrix;
-  default_transform = im.all_default;
-  xyb_encoded = metadata.m.xyb_encoded;
-  std::copy(std::begin(im.opsin_biases), std::end(im.opsin_biases),
-            opsin_params.opsin_biases);
-  for (int i = 0; i < 3; ++i) {
-    opsin_params.opsin_biases_cbrt[i] = cbrtf(opsin_params.opsin_biases[i]);
-  }
-  opsin_params.opsin_biases_cbrt[3] = opsin_params.opsin_biases[3] = 1;
-  std::copy(std::begin(im.quant_biases), std::end(im.quant_biases),
-            opsin_params.quant_biases);
-  bool orig_ok = CanOutputToColorEncoding(orig_color_encoding);
-  bool orig_grey = orig_color_encoding.IsGray();
-  return SetColorEncoding(!xyb_encoded || orig_ok
-                              ? orig_color_encoding
-                              : ColorEncoding::LinearSRGB(orig_grey));
-}
-
-Status OutputEncodingInfo::MaybeSetColorEncoding(
-    const ColorEncoding& c_desired) {
-  if (c_desired.GetColorSpace() == ColorSpace::kXYB &&
-      ((color_encoding.GetColorSpace() == ColorSpace::kRGB &&
-        color_encoding.GetPrimariesType() != Primaries::kSRGB) ||
-       color_encoding.Tf().IsPQ())) {
-    return false;
-  }
-  if (!xyb_encoded && !CanOutputToColorEncoding(c_desired)) {
-    return false;
-  }
-  return SetColorEncoding(c_desired);
-}
-
-Status OutputEncodingInfo::SetColorEncoding(const ColorEncoding& c_desired) {
-  color_encoding = c_desired;
-  linear_color_encoding = color_encoding;
-  linear_color_encoding.Tf().SetTransferFunction(TransferFunction::kLinear);
-  color_encoding_is_original = orig_color_encoding.SameColorEncoding(c_desired);
-
-  // Compute the opsin inverse matrix and luminances based on primaries and
-  // white point.
-  Matrix3x3 inverse_matrix;
-  bool inverse_matrix_is_default = default_transform;
-  inverse_matrix = orig_inverse_matrix;
-  constexpr Vector3 kSRGBLuminances{0.2126, 0.7152, 0.0722};
-  luminances = kSRGBLuminances;
-  if ((c_desired.GetPrimariesType() != Primaries::kSRGB ||
-       c_desired.GetWhitePointType() != WhitePoint::kD65) &&
-      !c_desired.IsGray()) {
-    Matrix3x3 srgb_to_xyzd50;
-    const auto& srgb = ColorEncoding::SRGB(/*is_gray=*/false);
-    PrimariesCIExy p;
-    JXL_RETURN_IF_ERROR(srgb.GetPrimaries(p));
-    CIExy w = srgb.GetWhitePoint();
-    JXL_RETURN_IF_ERROR(PrimariesToXYZD50(p.r.x, p.r.y, p.g.x, p.g.y, p.b.x,
-                                          p.b.y, w.x, w.y, srgb_to_xyzd50));
-    Matrix3x3 original_to_xyz;
-    JXL_RETURN_IF_ERROR(c_desired.GetPrimaries(p));
-    w = c_desired.GetWhitePoint();
-    if (!PrimariesToXYZ(p.r.x, p.r.y, p.g.x, p.g.y, p.b.x, p.b.y, w.x, w.y,
-                        original_to_xyz)) {
-      return JXL_FAILURE("PrimariesToXYZ failed");
-    }
-    luminances = original_to_xyz[1];
-    if (xyb_encoded) {
-      Matrix3x3 adapt_to_d50;
-      if (!AdaptToXYZD50(c_desired.GetWhitePoint().x,
-                         c_desired.GetWhitePoint().y, adapt_to_d50)) {
-        return JXL_FAILURE("AdaptToXYZD50 failed");
-      }
-      Matrix3x3 xyzd50_to_original;
-      Mul3x3Matrix(adapt_to_d50, original_to_xyz, xyzd50_to_original);
-      JXL_RETURN_IF_ERROR(Inv3x3Matrix(xyzd50_to_original));
-      Matrix3x3 srgb_to_original;
-      Mul3x3Matrix(xyzd50_to_original, srgb_to_xyzd50, srgb_to_original);
-      Mul3x3Matrix(srgb_to_original, orig_inverse_matrix, inverse_matrix);
-      inverse_matrix_is_default = false;
-    }
-  }
-
-  if (c_desired.IsGray()) {
-    Matrix3x3 tmp_inv_matrix = inverse_matrix;
-    Matrix3x3 srgb_to_luma{luminances, luminances, luminances};
-    Mul3x3Matrix(srgb_to_luma, tmp_inv_matrix, inverse_matrix);
-  }
-
-  // The internal XYB color space uses absolute luminance, so we scale back the
-  // opsin inverse matrix to relative luminance where 1.0 corresponds to the
-  // original intensity target.
-  if (xyb_encoded) {
-    InitSIMDInverseMatrix(inverse_matrix, opsin_params.inverse_opsin_matrix,
-                          orig_intensity_target);
-    all_default_opsin = (std::abs(orig_intensity_target - 255.0) <= 0.1f &&
-                         inverse_matrix_is_default);
-  }
-
-  // Set the inverse gamma based on color space transfer function.
-  const auto& tf = c_desired.Tf();
-  inverse_gamma = (tf.have_gamma ? tf.GetGamma()
-                   : tf.IsDCI()  ? 1.0f / 2.6f
-                                 : 1.0);
-  return true;
-}
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/dec_xyb.h b/third_party/jpeg-xl/lib/jxl/dec_xyb.h
deleted file mode 100644
index ee9a51f1dfef1..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/dec_xyb.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_DEC_XYB_H_
-#define LIB_JXL_DEC_XYB_H_
-
-// XYB -> linear sRGB.
-
-#include <jxl/cms_interface.h>
-
-#include <cstddef>
-#include <cstdint>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/matrix_ops.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_metadata.h"
-
-namespace jxl {
-
-// Parameters for XYB->sRGB conversion.
-struct OpsinParams {
-  float inverse_opsin_matrix[9 * 4];
-  float opsin_biases[4];
-  float opsin_biases_cbrt[4];
-  float quant_biases[4];
-  void Init(float intensity_target);
-};
-
-struct OutputEncodingInfo {
-  //
-  // Fields depending only on image metadata
-  //
-  ColorEncoding orig_color_encoding;
-  // Used for the HLG OOTF and PQ tone mapping.
-  float orig_intensity_target;
-  // Opsin inverse matrix taken from the metadata.
-  Matrix3x3 orig_inverse_matrix;
-  bool default_transform;
-  bool xyb_encoded;
-  //
-  // Fields depending on output color encoding
-  //
-  // The requested color encoding.
-  ColorEncoding color_encoding;
-  // This is expected as the output of the conversion from XYB.
-  // It is equal to `color_encoding`, but with a linear tone response curve.
-  ColorEncoding linear_color_encoding;
-  bool color_encoding_is_original;
-  // Contains an opsin matrix that converts to the primaries of the output
-  // encoding.
-  OpsinParams opsin_params;
-  bool all_default_opsin;
-  // Used for Gamma and DCI transfer functions.
-  float inverse_gamma;
-  // Luminances of color_encoding's primaries, used for the HLG inverse OOTF and
-  // for PQ tone mapping.
-  // Default to sRGB's.
-  Vector3 luminances;
-  // Used for the HLG inverse OOTF and PQ tone mapping.
-  float desired_intensity_target;
-  bool cms_set = false;
-  JxlCmsInterface color_management_system;
-
-  Status SetFromMetadata(const CodecMetadata& metadata);
-  Status MaybeSetColorEncoding(const ColorEncoding& c_desired);
-
- private:
-  Status SetColorEncoding(const ColorEncoding& c_desired);
-};
-
-// Converts `inout` (not padded) from opsin to linear sRGB in-place. Called from
-// per-pass postprocessing, hence parallelized.
-Status OpsinToLinearInplace(Image3F* JXL_RESTRICT inout, ThreadPool* pool,
-                            const OpsinParams& opsin_params);
-
-// Converts `opsin:rect` (opsin may be padded, rect.x0 must be vector-aligned)
-// to linear sRGB. Called from whole-frame encoder, hence parallelized.
-Status OpsinToLinear(const Image3F& opsin, const Rect& rect, ThreadPool* pool,
-                     Image3F* JXL_RESTRICT linear,
-                     const OpsinParams& opsin_params);
-
-// Bt.601 to match JPEG/JFIF. Inputs are _signed_ YCbCr values suitable for DCT,
-// see F.1.1.3 of T.81 (because our data type is float, there is no need to add
-// a bias to make the values unsigned).
-void YcbcrToRgb(const Image3F& ycbcr, Image3F* rgb, const Rect& rect);
-
-bool HasFastXYBTosRGB8();
-Status FastXYBTosRGB8(const float* input[4], uint8_t* output, bool is_rgba,
-                      size_t xsize);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_DEC_XYB_H_
diff --git a/third_party/jpeg-xl/lib/jxl/decode.cc b/third_party/jpeg-xl/lib/jxl/decode.cc
deleted file mode 100644
index 302e5115cd6c3..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/decode.cc
+++ /dev/null
@@ -1,2829 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/decode.h>
-#include <jxl/types.h>
-#include <jxl/version.h>
-
-#include <algorithm>
-#include <array>
-#include <functional>
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/padded_bytes.h"
-
-// JPEGXL_ENABLE_BOXES, JPEGXL_ENABLE_TRANSCODE_JPEG
-#include "lib/jxl/common.h"
-
-#if JPEGXL_ENABLE_BOXES || JPEGXL_ENABLE_TRANSCODE_JPEG
-#include "lib/jxl/box_content_decoder.h"
-#endif
-#include "lib/jxl/dec_frame.h"
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-#include "lib/jxl/decode_to_jpeg.h"
-#endif
-#include "lib/jxl/fields.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/headers.h"
-#include "lib/jxl/icc_codec.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/memory_manager_internal.h"
-
-namespace {
-
-// Checks if a + b > size, taking possible integer overflow into account.
-bool OutOfBounds(size_t a, size_t b, size_t size) {
-  size_t pos = a + b;
-  if (pos > size) return true;
-  if (pos < a) return true;  // overflow happened
-  return false;
-}
-
-JXL_INLINE size_t InitialBasicInfoSizeHint() {
-  // Amount of bytes before the start of the codestream in the container format,
-  // assuming that the codestream is the first box after the signature and
-  // filetype boxes. 12 bytes signature box + 20 bytes filetype box + 16 bytes
-  // codestream box length + name + optional XLBox length.
-  const size_t container_header_size = 48;
-
-  // Worst-case amount of bytes for basic info of the JPEG XL codestream header,
-  // that is all information up to and including extra_channel_bits. Up to
-  // around 2 bytes signature + 8 bytes SizeHeader + 31 bytes ColorEncoding + 4
-  // bytes rest of ImageMetadata + 5 bytes part of ImageMetadata2.
-  // TODO(lode): recompute and update this value when alpha_bits is moved to
-  // extra channels info.
-  const size_t max_codestream_basic_info_size = 50;
-
-  return container_header_size + max_codestream_basic_info_size;
-}
-
-// Debug-printing failure macro similar to JXL_FAILURE, but for the status code
-// JXL_DEC_ERROR
-#if (JXL_CRASH_ON_ERROR)
-#define JXL_API_ERROR(format, ...)                                           \
-  (::jxl::Debug(("%s:%d: " format "\n"), __FILE__, __LINE__, ##__VA_ARGS__), \
-   ::jxl::Abort(), JXL_DEC_ERROR)
-#else  // JXL_CRASH_ON_ERROR
-#define JXL_API_ERROR(format, ...)                                             \
-  (((JXL_IS_DEBUG_BUILD) &&                                                    \
-    ::jxl::Debug(("%s:%d: " format "\n"), __FILE__, __LINE__, ##__VA_ARGS__)), \
-   JXL_DEC_ERROR)
-#endif  // JXL_CRASH_ON_ERROR
-
-// Error caused by bad input (invalid file) rather than incorrect API usage.
-// For now there is no way to distinguish these two types of errors yet.
-#define JXL_INPUT_ERROR(format, ...) JXL_API_ERROR(format, ##__VA_ARGS__)
-
-JxlDecoderStatus ConvertStatus(JxlDecoderStatus status) { return status; }
-
-JxlDecoderStatus ConvertStatus(jxl::Status status) {
-  return status ? JXL_DEC_SUCCESS : JXL_DEC_ERROR;
-}
-
-#define JXL_API_RETURN_IF_ERROR(expr)               \
-  {                                                 \
-    JxlDecoderStatus status_ = ConvertStatus(expr); \
-    if (status_ != JXL_DEC_SUCCESS) return status_; \
-  }
-
-JxlSignature ReadSignature(const uint8_t* buf, size_t len, size_t* pos) {
-  if (*pos >= len) return JXL_SIG_NOT_ENOUGH_BYTES;
-
-  buf += *pos;
-  len -= *pos;
-
-  // JPEG XL codestream: 0xff 0x0a
-  if (len >= 1 && buf[0] == 0xff) {
-    if (len < 2) {
-      return JXL_SIG_NOT_ENOUGH_BYTES;
-    } else if (buf[1] == jxl::kCodestreamMarker) {
-      *pos += 2;
-      return JXL_SIG_CODESTREAM;
-    } else {
-      return JXL_SIG_INVALID;
-    }
-  }
-
-  // JPEG XL container
-  if (len >= 1 && buf[0] == 0) {
-    if (len < 12) {
-      return JXL_SIG_NOT_ENOUGH_BYTES;
-    } else if (buf[1] == 0 && buf[2] == 0 && buf[3] == 0xC && buf[4] == 'J' &&
-               buf[5] == 'X' && buf[6] == 'L' && buf[7] == ' ' &&
-               buf[8] == 0xD && buf[9] == 0xA && buf[10] == 0x87 &&
-               buf[11] == 0xA) {
-      *pos += 12;
-      return JXL_SIG_CONTAINER;
-    } else {
-      return JXL_SIG_INVALID;
-    }
-  }
-
-  return JXL_SIG_INVALID;
-}
-
-}  // namespace
-
-uint32_t JxlDecoderVersion(void) {
-  return JPEGXL_MAJOR_VERSION * 1000000 + JPEGXL_MINOR_VERSION * 1000 +
-         JPEGXL_PATCH_VERSION;
-}
-
-JxlSignature JxlSignatureCheck(const uint8_t* buf, size_t len) {
-  size_t pos = 0;
-  return ReadSignature(buf, len, &pos);
-}
-
-namespace {
-
-size_t BitsPerChannel(JxlDataType data_type) {
-  switch (data_type) {
-    case JXL_TYPE_UINT8:
-      return 8;
-    case JXL_TYPE_UINT16:
-      return 16;
-    case JXL_TYPE_FLOAT:
-      return 32;
-    case JXL_TYPE_FLOAT16:
-      return 16;
-    default:
-      return 0;  // signals unhandled JxlDataType
-  }
-}
-
-template <typename T>
-uint32_t GetBitDepth(JxlBitDepth bit_depth, const T& metadata,
-                     JxlPixelFormat format) {
-  if (bit_depth.type == JXL_BIT_DEPTH_FROM_PIXEL_FORMAT) {
-    return BitsPerChannel(format.data_type);
-  } else if (bit_depth.type == JXL_BIT_DEPTH_FROM_CODESTREAM) {
-    return metadata.bit_depth.bits_per_sample;
-  } else if (bit_depth.type == JXL_BIT_DEPTH_CUSTOM) {
-    return bit_depth.bits_per_sample;
-  }
-  return 0;
-}
-
-enum class DecoderStage : uint32_t {
-  kInited,              // Decoder created, no JxlDecoderProcessInput called yet
-  kStarted,             // Running JxlDecoderProcessInput calls
-  kCodestreamFinished,  // Codestream done, but other boxes could still occur.
-                        // This stage can also occur before having seen the
-                        // entire codestream if the user didn't subscribe to any
-                        // codestream events at all, e.g. only to box events,
-                        // or, the user only subscribed to basic info, and only
-                        // the header of the codestream was parsed.
-  kError,               // Error occurred, decoder object no longer usable
-};
-
-enum class FrameStage : uint32_t {
-  kHeader,  // Must parse frame header.
-  kTOC,     // Must parse TOC
-  kFull,    // Must parse full pixels
-};
-
-enum class BoxStage : uint32_t {
-  kHeader,      // Parsing box header of the next box, or start of non-container
-                // stream
-  kFtyp,        // The ftyp box
-  kSkip,        // Box whose contents are skipped
-  kCodestream,  // Handling codestream box contents, or non-container stream
-  kPartialCodestream,  // Handling the extra header of partial codestream box
-  kJpegRecon,          // Handling jpeg reconstruction box
-};
-
-enum class JpegReconStage : uint32_t {
-  kNone,             // Not outputting
-  kSettingMetadata,  // Ready to output, must set metadata to the jpeg_data
-  kOutputting,       // Currently outputting the JPEG bytes
-};
-
-// For each internal frame, which storage locations it references, and which
-// storage locations it is stored in, using the bit mask as defined in
-// FrameDecoder::References and FrameDecoder::SaveAs.
-typedef struct FrameRef {
-  int reference;
-  int saved_as;
-} FrameRef;
-
-/*
-Given list of frame references to storage slots, and storage slots in which this
-frame is saved, computes which frames are required to decode the frame at the
-given index and any frames after it. The frames on which this depends are
-returned as a vector of their indices, in no particular order. The given index
-must be smaller than saved_as.size(), and references.size() must equal
-saved_as.size(). Any frames beyond saved_as and references are considered
-unknown future frames and must be treated as if something depends on them.
-*/
-std::vector<size_t> GetFrameDependencies(size_t index,
-                                         const std::vector<FrameRef>& refs) {
-  JXL_DASSERT(index < refs.size());
-
-  std::vector<size_t> result;
-
-  constexpr size_t kNumStorage = 8;
-
-  // value which indicates nothing is stored in this storage slot
-  const size_t invalid = refs.size();
-  // for each of the 8 storage slots, a vector that translates frame index to
-  // frame stored in this storage slot at this point, that is, the last
-  // frame that was stored in this slot before or at this index.
-  std::array<std::vector<size_t>, kNumStorage> storage;
-  for (size_t s = 0; s < kNumStorage; ++s) {
-    storage[s].resize(refs.size());
-    int mask = 1 << s;
-    size_t id = invalid;
-    for (size_t i = 0; i < refs.size(); ++i) {
-      if (refs[i].saved_as & mask) {
-        id = i;
-      }
-      storage[s][i] = id;
-    }
-  }
-
-  std::vector<char> seen(index + 1, 0);
-  std::vector<size_t> stack;
-  stack.push_back(index);
-  seen[index] = 1;
-
-  // For frames after index, assume they can depend on any of the 8 storage
-  // slots, so push the frame for each stored reference to the stack and result.
-  // All frames after index are treated as having unknown references and with
-  // the possibility that there are more frames after the last known.
-  // TODO(lode): take values of saved_as and references after index, and a
-  // input flag indicating if they are all frames of the image, to further
-  // optimize this.
-  for (size_t s = 0; s < kNumStorage; ++s) {
-    size_t frame_ref = storage[s][index];
-    if (frame_ref == invalid) continue;
-    if (seen[frame_ref]) continue;
-    stack.push_back(frame_ref);
-    seen[frame_ref] = 1;
-    result.push_back(frame_ref);
-  }
-
-  while (!stack.empty()) {
-    size_t frame_index = stack.back();
-    stack.pop_back();
-    if (frame_index == 0) continue;  // first frame cannot have references
-    for (size_t s = 0; s < kNumStorage; ++s) {
-      int mask = 1 << s;
-      if (!(refs[frame_index].reference & mask)) continue;
-      size_t frame_ref = storage[s][frame_index - 1];
-      if (frame_ref == invalid) continue;
-      if (seen[frame_ref]) continue;
-      stack.push_back(frame_ref);
-      seen[frame_ref] = 1;
-      result.push_back(frame_ref);
-    }
-  }
-
-  return result;
-}
-
-// Parameters for user-requested extra channel output.
-struct ExtraChannelOutput {
-  JxlPixelFormat format;
-  void* buffer;
-  size_t buffer_size;
-};
-
-}  // namespace
-
-namespace jxl {
-
-typedef struct JxlDecoderFrameIndexBoxEntryStruct {
-  // OFFi: offset of start byte of this frame compared to start
-  // byte of previous frame from this index in the JPEG XL codestream. For the
-  // first frame, this is the offset from the first byte of the JPEG XL
-  // codestream.
-  uint64_t OFFi;
-  // Ti: duration in ticks between the start of this frame and
-  // the start of the next frame in the index. If this is the last frame in the
-  // index, this is the duration in ticks between the start of this frame and
-  // the end of the stream. A tick lasts TNUM / TDEN seconds.
-  uint32_t Ti;
-  // Fi: amount of frames the next frame in the index occurs
-  // after this frame. If this is the last frame in the index, this is the
-  // amount of frames after this frame in the remainder of the stream. Only
-  // frames that are presented by the decoder are counted for this purpose, this
-  // excludes frames that are not intended for display but for compositing with
-  // other frames, such as frames that aren't the last frame with a duration of
-  // 0 ticks.
-  uint32_t Fi;
-} JxlDecoderFrameIndexBoxEntry;
-
-typedef struct JxlDecoderFrameIndexBoxStruct {
-  int64_t NF() const { return entries.size(); }
-  int32_t TNUM = 1;
-  int32_t TDEN = 1000;
-
-  std::vector<JxlDecoderFrameIndexBoxEntry> entries;
-
-  // That way we can ensure that every index box will have the first frame.
-  // If the API user decides to mark it as an indexed frame, we call
-  // the AddFrame again, this time with requested.
-  void AddFrame(uint64_t OFFi, uint32_t Ti, uint32_t Fi) {
-    JxlDecoderFrameIndexBoxEntry e;
-    e.OFFi = OFFi;
-    e.Ti = Ti;
-    e.Fi = Fi;
-    entries.push_back(e);
-  }
-} JxlDecoderFrameIndexBox;
-
-}  // namespace jxl
-
-// NOLINTNEXTLINE(clang-analyzer-optin.performance.Padding)
-struct JxlDecoderStruct {
-  JxlDecoderStruct() = default;
-
-  JxlMemoryManager memory_manager;
-  std::unique_ptr<jxl::ThreadPool> thread_pool;
-
-  DecoderStage stage;
-
-  // Status of progression, internal.
-  bool got_signature;
-  // Indicates we know that we've seen the last codestream box: either this
-  // was a jxlc box, or a jxlp box that has its index indicated as last by
-  // having its most significant bit set, or no boxes are used at all. This
-  // does not indicate the full codestream has already been seen, only the
-  // last box of it has been initiated.
-  bool last_codestream_seen;
-  bool got_codestream_signature;
-  bool got_basic_info;
-  bool got_transform_data;  // To skip everything before ICC.
-  bool got_all_headers;     // Codestream metadata headers.
-  bool post_headers;        // Already decoding pixels.
-  std::unique_ptr<jxl::ICCReader> icc_reader;
-  jxl::JxlDecoderFrameIndexBox frame_index_box;
-  // This means either we actually got the preview image, or determined we
-  // cannot get it or there is none.
-  bool got_preview_image;
-  bool preview_frame;
-
-  // Position of next_in in the original file including box format if present
-  // (as opposed to position in the codestream)
-  size_t file_pos;
-
-  size_t box_contents_begin;
-  size_t box_contents_end;
-  size_t box_contents_size;
-  size_t box_size;
-  size_t header_size;
-  // Either a final box that runs until EOF, or the case of no container format
-  // at all.
-  bool box_contents_unbounded;
-
-  JxlBoxType box_type;
-  JxlBoxType box_decoded_type;  // Underlying type for brob boxes
-  // Set to true right after a JXL_DEC_BOX event only.
-  bool box_event;
-  bool decompress_boxes;
-
-  bool box_out_buffer_set;
-  // Whether the out buffer is set for the current box, if the user did not yet
-  // release the buffer while the next box is encountered, this will be set to
-  // false. If this is false, no JXL_DEC_NEED_MORE_INPUT is emitted
-  // (irrespective of the value of box_out_buffer_set), because not setting
-  // output indicates the user does not wish the data of this box.
-  bool box_out_buffer_set_current_box;
-  uint8_t* box_out_buffer;
-  size_t box_out_buffer_size;
-  // which byte of the full box content the start of the out buffer points to
-  size_t box_out_buffer_begin;
-  // which byte of box_out_buffer to write to next
-  size_t box_out_buffer_pos;
-
-  // Settings
-  bool keep_orientation;
-  bool unpremul_alpha;
-  bool render_spotcolors;
-  bool coalescing;
-  float desired_intensity_target;
-
-  // Bitfield, for which informative events (JXL_DEC_BASIC_INFO, etc...) the
-  // decoder returns a status. By default, do not return for any of the events,
-  // only return when the decoder cannot continue because it needs more input or
-  // output data.
-  int events_wanted;
-  int orig_events_wanted;
-
-  // Fields for reading the basic info from the header.
-  size_t basic_info_size_hint;
-  bool have_container;
-  size_t box_count;
-
-  // The level of progressive detail in frame decoding.
-  JxlProgressiveDetail prog_detail = kDC;
-  // The progressive detail of the current frame.
-  JxlProgressiveDetail frame_prog_detail;
-  // The intended downsampling ratio for the current progression step.
-  size_t downsampling_target;
-
-  // Set to true if either an image out buffer or an image out callback was set.
-  bool image_out_buffer_set;
-
-  // Owned by the caller, buffer for preview or full resolution image.
-  void* image_out_buffer;
-  JxlImageOutInitCallback image_out_init_callback;
-  JxlImageOutRunCallback image_out_run_callback;
-  JxlImageOutDestroyCallback image_out_destroy_callback;
-  void* image_out_init_opaque;
-  struct SimpleImageOutCallback {
-    JxlImageOutCallback callback;
-    void* opaque;
-  };
-  SimpleImageOutCallback simple_image_out_callback;
-
-  size_t image_out_size;
-
-  JxlPixelFormat image_out_format;
-  JxlBitDepth image_out_bit_depth;
-
-  // For extra channels. Empty if no extra channels are requested, and they are
-  // reset each frame
-  std::vector<ExtraChannelOutput> extra_channel_output;
-
-  jxl::CodecMetadata metadata;
-  // Same as metadata.m, except for the color_encoding, which is set to the
-  // output encoding.
-  jxl::ImageMetadata image_metadata;
-  std::unique_ptr<jxl::ImageBundle> ib;
-
-  std::unique_ptr<jxl::PassesDecoderState> passes_state;
-  std::unique_ptr<jxl::FrameDecoder> frame_dec;
-  size_t next_section;
-  std::vector<char> section_processed;
-
-  // headers and TOC for the current frame. When got_toc is true, this is
-  // always the frame header of the last frame of the current still series,
-  // that is, the displayed frame.
-  std::unique_ptr<jxl::FrameHeader> frame_header;
-
-  size_t remaining_frame_size;
-  FrameStage frame_stage;
-  bool dc_frame_progression_done;
-  // The currently processed frame is the last of the current composite still,
-  // and so must be returned as pixels
-  bool is_last_of_still;
-  // The currently processed frame is the last of the codestream
-  bool is_last_total;
-  // How many frames to skip.
-  size_t skip_frames;
-  // Skipping the current frame. May be false if skip_frames was just set to
-  // a positive value while already processing a current frame, then
-  // skipping_frame will be enabled only for the next frame.
-  bool skipping_frame;
-
-  // Amount of internal frames and external frames started. External frames are
-  // user-visible frames, internal frames includes all external frames and
-  // also invisible frames such as patches, blending-only and dc_level frames.
-  size_t internal_frames;
-  size_t external_frames;
-
-  std::vector<FrameRef> frame_refs;
-
-  // Translates external frame index to internal frame index. The external
-  // index is the index of user-visible frames. The internal index can be larger
-  // since non-visible frames (such as frames with patches, ...) are included.
-  std::vector<size_t> frame_external_to_internal;
-
-  // Whether the frame with internal index is required to decode the frame
-  // being skipped to or any frames after that. If no skipping is active,
-  // this vector is ignored. If the current internal frame index is beyond this
-  // vector, it must be treated as a required frame.
-  std::vector<char> frame_required;
-
-  // Codestream input data is copied here temporarily when the decoder needs
-  // more input bytes to process the next part of the stream. We copy the input
-  // data in order to be able to release it all through the API it when
-  // returning JXL_DEC_NEED_MORE_INPUT.
-  std::vector<uint8_t> codestream_copy;
-  // Number of bytes at the end of codestream_copy that were not yet consumed
-  // by calling AdvanceInput().
-  size_t codestream_unconsumed;
-  // Position in the codestream_copy vector that the decoder already finished
-  // processing. It can be greater than the current size of codestream_copy in
-  // case where the decoder skips some parts of the frame that were not yet
-  // provided.
-  size_t codestream_pos;
-  // Number of bits after codestream_pos that were already processed.
-  size_t codestream_bits_ahead;
-
-  BoxStage box_stage;
-
-#if JPEGXL_ENABLE_BOXES
-  jxl::JxlBoxContentDecoder box_content_decoder;
-#endif
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-  jxl::JxlToJpegDecoder jpeg_decoder;
-  // Decodes Exif or XMP metadata for JPEG reconstruction
-  jxl::JxlBoxContentDecoder metadata_decoder;
-  std::vector<uint8_t> exif_metadata;
-  std::vector<uint8_t> xmp_metadata;
-  // must store JPEG reconstruction metadata from the current box
-  // 0 = not stored, 1 = currently storing, 2 = finished
-  int store_exif;
-  int store_xmp;
-  size_t recon_out_buffer_pos;
-  size_t recon_exif_size;  // Expected exif size as read from the jbrd box
-  size_t recon_xmp_size;   // Expected exif size as read from the jbrd box
-  JpegReconStage recon_output_jpeg;
-
-  bool JbrdNeedMoreBoxes() const {
-    // jbrd box wants exif but exif box not yet seen
-    if (store_exif < 2 && recon_exif_size > 0) return true;
-    // jbrd box wants xmp but xmp box not yet seen
-    if (store_xmp < 2 && recon_xmp_size > 0) return true;
-    return false;
-  }
-#endif
-
-  const uint8_t* next_in;
-  size_t avail_in;
-  bool input_closed;
-
-  void AdvanceInput(size_t size) {
-    JXL_DASSERT(avail_in >= size);
-    next_in += size;
-    avail_in -= size;
-    file_pos += size;
-  }
-
-  size_t AvailableCodestream() const {
-    size_t avail_codestream = avail_in;
-    if (!box_contents_unbounded) {
-      avail_codestream =
-          std::min<size_t>(avail_codestream, box_contents_end - file_pos);
-    }
-    return avail_codestream;
-  }
-
-  void AdvanceCodestream(size_t size) {
-    size_t avail_codestream = AvailableCodestream();
-    if (codestream_copy.empty()) {
-      if (size <= avail_codestream) {
-        AdvanceInput(size);
-      } else {
-        codestream_pos = size - avail_codestream;
-        AdvanceInput(avail_codestream);
-      }
-    } else {
-      codestream_pos += size;
-      if (codestream_pos + codestream_unconsumed >= codestream_copy.size()) {
-        size_t advance = std::min(
-            codestream_unconsumed,
-            codestream_unconsumed + codestream_pos - codestream_copy.size());
-        AdvanceInput(advance);
-        codestream_pos -= std::min(codestream_pos, codestream_copy.size());
-        codestream_unconsumed = 0;
-        codestream_copy.clear();
-      }
-    }
-  }
-
-  JxlDecoderStatus RequestMoreInput() {
-    if (codestream_copy.empty()) {
-      size_t avail_codestream = AvailableCodestream();
-      codestream_copy.insert(codestream_copy.end(), next_in,
-                             next_in + avail_codestream);
-      AdvanceInput(avail_codestream);
-    } else {
-      AdvanceInput(codestream_unconsumed);
-      codestream_unconsumed = 0;
-    }
-    return JXL_DEC_NEED_MORE_INPUT;
-  }
-
-  JxlDecoderStatus GetCodestreamInput(jxl::Span<const uint8_t>* span) {
-    if (codestream_copy.empty() && codestream_pos > 0) {
-      size_t avail_codestream = AvailableCodestream();
-      size_t skip = std::min<size_t>(codestream_pos, avail_codestream);
-      AdvanceInput(skip);
-      codestream_pos -= skip;
-      if (codestream_pos > 0) {
-        return RequestMoreInput();
-      }
-    }
-    if (codestream_pos > codestream_copy.size()) {
-      return JXL_API_ERROR("Internal: codestream_pos > codestream_copy.size()");
-    }
-    if (codestream_unconsumed > codestream_copy.size()) {
-      return JXL_API_ERROR(
-          "Internal: codestream_unconsumed > codestream_copy.size()");
-    }
-    size_t avail_codestream = AvailableCodestream();
-    if (codestream_copy.empty()) {
-      if (avail_codestream == 0) {
-        return RequestMoreInput();
-      }
-      *span = jxl::Bytes(next_in, avail_codestream);
-      return JXL_DEC_SUCCESS;
-    } else {
-      codestream_copy.insert(codestream_copy.end(),
-                             next_in + codestream_unconsumed,
-                             next_in + avail_codestream);
-      codestream_unconsumed = avail_codestream;
-      *span = jxl::Bytes(codestream_copy.data() + codestream_pos,
-                         codestream_copy.size() - codestream_pos);
-      return JXL_DEC_SUCCESS;
-    }
-  }
-
-  // Whether the decoder can use more codestream input for a purpose it needs.
-  // This returns false if the user didn't subscribe to any events that
-  // require the codestream (e.g. only subscribed to metadata boxes), or all
-  // parts of the codestream that are subscribed to (e.g. only basic info) have
-  // already occurred.
-  bool CanUseMoreCodestreamInput() const {
-    // The decoder can set this to finished early if all relevant events were
-    // processed, so this check works.
-    return stage != DecoderStage::kCodestreamFinished;
-  }
-};
-
-namespace {
-
-bool CheckSizeLimit(JxlDecoder* dec, size_t xsize, size_t ysize) {
-  if (xsize == 0 || ysize == 0) return true;
-  size_t padded_xsize = jxl::DivCeil(xsize, 32) * 32;
-  if (padded_xsize < xsize) return false;  // overflow
-  size_t num_pixels = padded_xsize * ysize;
-  if (num_pixels / padded_xsize != ysize) return false;  // overflow
-  return true;
-}
-
-}  // namespace
-
-// Resets the state that must be reset for both Rewind and Reset
-void JxlDecoderRewindDecodingState(JxlDecoder* dec) {
-  dec->stage = DecoderStage::kInited;
-  dec->got_signature = false;
-  dec->last_codestream_seen = false;
-  dec->got_codestream_signature = false;
-  dec->got_basic_info = false;
-  dec->got_transform_data = false;
-  dec->got_all_headers = false;
-  dec->post_headers = false;
-  if (dec->icc_reader) dec->icc_reader->Reset();
-  dec->got_preview_image = false;
-  dec->preview_frame = false;
-  dec->file_pos = 0;
-  dec->box_contents_begin = 0;
-  dec->box_contents_end = 0;
-  dec->box_contents_size = 0;
-  dec->box_size = 0;
-  dec->header_size = 0;
-  dec->box_contents_unbounded = false;
-  memset(dec->box_type, 0, sizeof(dec->box_type));
-  memset(dec->box_decoded_type, 0, sizeof(dec->box_decoded_type));
-  dec->box_event = false;
-  dec->box_stage = BoxStage::kHeader;
-  dec->box_out_buffer_set = false;
-  dec->box_out_buffer_set_current_box = false;
-  dec->box_out_buffer = nullptr;
-  dec->box_out_buffer_size = 0;
-  dec->box_out_buffer_begin = 0;
-  dec->box_out_buffer_pos = 0;
-
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-  dec->exif_metadata.clear();
-  dec->xmp_metadata.clear();
-  dec->store_exif = 0;
-  dec->store_xmp = 0;
-  dec->recon_out_buffer_pos = 0;
-  dec->recon_exif_size = 0;
-  dec->recon_xmp_size = 0;
-  dec->recon_output_jpeg = JpegReconStage::kNone;
-#endif
-
-  dec->events_wanted = dec->orig_events_wanted;
-  dec->basic_info_size_hint = InitialBasicInfoSizeHint();
-  dec->have_container = false;
-  dec->box_count = 0;
-  dec->downsampling_target = 8;
-  dec->image_out_buffer_set = false;
-  dec->image_out_buffer = nullptr;
-  dec->image_out_init_callback = nullptr;
-  dec->image_out_run_callback = nullptr;
-  dec->image_out_destroy_callback = nullptr;
-  dec->image_out_init_opaque = nullptr;
-  dec->image_out_size = 0;
-  dec->image_out_bit_depth.type = JXL_BIT_DEPTH_FROM_PIXEL_FORMAT;
-  dec->extra_channel_output.clear();
-  dec->next_in = nullptr;
-  dec->avail_in = 0;
-  dec->input_closed = false;
-
-  dec->passes_state.reset();
-  dec->frame_dec.reset();
-  dec->next_section = 0;
-  dec->section_processed.clear();
-
-  dec->ib.reset();
-  dec->metadata = jxl::CodecMetadata();
-  dec->image_metadata = dec->metadata.m;
-  dec->frame_header = jxl::make_unique<jxl::FrameHeader>(&dec->metadata);
-
-  dec->codestream_copy.clear();
-  dec->codestream_unconsumed = 0;
-  dec->codestream_pos = 0;
-  dec->codestream_bits_ahead = 0;
-
-  dec->frame_stage = FrameStage::kHeader;
-  dec->remaining_frame_size = 0;
-  dec->is_last_of_still = false;
-  dec->is_last_total = false;
-  dec->skip_frames = 0;
-  dec->skipping_frame = false;
-  dec->internal_frames = 0;
-  dec->external_frames = 0;
-}
-
-void JxlDecoderReset(JxlDecoder* dec) {
-  JxlDecoderRewindDecodingState(dec);
-
-  dec->thread_pool.reset();
-  dec->keep_orientation = false;
-  dec->unpremul_alpha = false;
-  dec->render_spotcolors = true;
-  dec->coalescing = true;
-  dec->desired_intensity_target = 0;
-  dec->orig_events_wanted = 0;
-  dec->events_wanted = 0;
-  dec->frame_refs.clear();
-  dec->frame_external_to_internal.clear();
-  dec->frame_required.clear();
-  dec->decompress_boxes = false;
-}
-
-JxlDecoder* JxlDecoderCreate(const JxlMemoryManager* memory_manager) {
-  JxlMemoryManager local_memory_manager;
-  if (!jxl::MemoryManagerInit(&local_memory_manager, memory_manager))
-    return nullptr;
-
-  void* alloc =
-      jxl::MemoryManagerAlloc(&local_memory_manager, sizeof(JxlDecoder));
-  if (!alloc) return nullptr;
-  // Placement new constructor on allocated memory
-  JxlDecoder* dec = new (alloc) JxlDecoder();
-  dec->memory_manager = local_memory_manager;
-
-  JxlDecoderReset(dec);
-
-  return dec;
-}
-
-void JxlDecoderDestroy(JxlDecoder* dec) {
-  if (dec) {
-    JxlMemoryManager local_memory_manager = dec->memory_manager;
-    // Call destructor directly since custom free function is used.
-    dec->~JxlDecoder();
-    jxl::MemoryManagerFree(&local_memory_manager, dec);
-  }
-}
-
-void JxlDecoderRewind(JxlDecoder* dec) { JxlDecoderRewindDecodingState(dec); }
-
-void JxlDecoderSkipFrames(JxlDecoder* dec, size_t amount) {
-  // Increment amount, rather than set it: making the amount smaller is
-  // impossible because the decoder may already have skipped frames required to
-  // decode earlier frames, and making the amount larger compared to an existing
-  // amount is impossible because if JxlDecoderSkipFrames is called in the
-  // middle of already skipping frames, the user cannot know how many frames
-  // have already been skipped internally so far so an absolute value cannot
-  // be defined.
-  dec->skip_frames += amount;
-
-  dec->frame_required.clear();
-  size_t next_frame = dec->external_frames + dec->skip_frames;
-
-  // A frame that has been seen before a rewind
-  if (next_frame < dec->frame_external_to_internal.size()) {
-    size_t internal_index = dec->frame_external_to_internal[next_frame];
-    if (internal_index < dec->frame_refs.size()) {
-      std::vector<size_t> deps =
-          GetFrameDependencies(internal_index, dec->frame_refs);
-
-      dec->frame_required.resize(internal_index + 1, 0);
-      for (size_t idx : deps) {
-        if (idx < dec->frame_required.size()) {
-          dec->frame_required[idx] = 1;
-        } else {
-          JXL_DEBUG_ABORT("Unreachable");
-        }
-      }
-    }
-  }
-}
-
-JxlDecoderStatus JxlDecoderSkipCurrentFrame(JxlDecoder* dec) {
-  if (dec->frame_stage != FrameStage::kFull) {
-    return JXL_API_ERROR("JxlDecoderSkipCurrentFrame called at the wrong time");
-  }
-  JXL_DASSERT(dec->frame_dec);
-  dec->frame_stage = FrameStage::kHeader;
-  dec->AdvanceCodestream(dec->remaining_frame_size);
-  if (dec->is_last_of_still) {
-    dec->image_out_buffer_set = false;
-  }
-  return JXL_DEC_SUCCESS;
-}
-
-JXL_EXPORT JxlDecoderStatus
-JxlDecoderSetParallelRunner(JxlDecoder* dec, JxlParallelRunner parallel_runner,
-                            void* parallel_runner_opaque) {
-  if (dec->stage != DecoderStage::kInited) {
-    return JXL_API_ERROR(
-        "JxlDecoderSetParallelRunner must be called before starting");
-  }
-  dec->thread_pool = jxl::make_unique<jxl::ThreadPool>(parallel_runner,
-                                                       parallel_runner_opaque);
-  return JXL_DEC_SUCCESS;
-}
-
-size_t JxlDecoderSizeHintBasicInfo(const JxlDecoder* dec) {
-  if (dec->got_basic_info) return 0;
-  return dec->basic_info_size_hint;
-}
-
-JxlDecoderStatus JxlDecoderSubscribeEvents(JxlDecoder* dec, int events_wanted) {
-  if (dec->stage != DecoderStage::kInited) {
-    return JXL_DEC_ERROR;  // Cannot subscribe to events after having started.
-  }
-  if (events_wanted & 63) {
-    return JXL_DEC_ERROR;  // Can only subscribe to informative events.
-  }
-  dec->events_wanted = events_wanted;
-  dec->orig_events_wanted = events_wanted;
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderSetKeepOrientation(JxlDecoder* dec,
-                                              JXL_BOOL skip_reorientation) {
-  if (dec->stage != DecoderStage::kInited) {
-    return JXL_API_ERROR("Must set keep_orientation option before starting");
-  }
-  dec->keep_orientation = FROM_JXL_BOOL(skip_reorientation);
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderSetUnpremultiplyAlpha(JxlDecoder* dec,
-                                                 JXL_BOOL unpremul_alpha) {
-  if (dec->stage != DecoderStage::kInited) {
-    return JXL_API_ERROR("Must set unpremul_alpha option before starting");
-  }
-  dec->unpremul_alpha = FROM_JXL_BOOL(unpremul_alpha);
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderSetRenderSpotcolors(JxlDecoder* dec,
-                                               JXL_BOOL render_spotcolors) {
-  if (dec->stage != DecoderStage::kInited) {
-    return JXL_API_ERROR("Must set render_spotcolors option before starting");
-  }
-  dec->render_spotcolors = FROM_JXL_BOOL(render_spotcolors);
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderSetCoalescing(JxlDecoder* dec, JXL_BOOL coalescing) {
-  if (dec->stage != DecoderStage::kInited) {
-    return JXL_API_ERROR("Must set coalescing option before starting");
-  }
-  dec->coalescing = FROM_JXL_BOOL(coalescing);
-  return JXL_DEC_SUCCESS;
-}
-
-namespace {
-// helper function to get the dimensions of the current image buffer
-void GetCurrentDimensions(const JxlDecoder* dec, size_t& xsize, size_t& ysize) {
-  if (dec->frame_header->nonserialized_is_preview) {
-    xsize = dec->metadata.oriented_preview_xsize(dec->keep_orientation);
-    ysize = dec->metadata.oriented_preview_ysize(dec->keep_orientation);
-    return;
-  }
-  xsize = dec->metadata.oriented_xsize(dec->keep_orientation);
-  ysize = dec->metadata.oriented_ysize(dec->keep_orientation);
-  if (!dec->coalescing) {
-    const auto frame_dim = dec->frame_header->ToFrameDimensions();
-    xsize = frame_dim.xsize_upsampled;
-    ysize = frame_dim.ysize_upsampled;
-    if (!dec->keep_orientation &&
-        static_cast<int>(dec->metadata.m.GetOrientation()) > 4) {
-      std::swap(xsize, ysize);
-    }
-  }
-}
-}  // namespace
-
-namespace jxl {
-namespace {
-
-// Returns JXL_DEC_SUCCESS if the full bundle was successfully read, status
-// indicating either error or need more input otherwise.
-template <class T>
-JxlDecoderStatus ReadBundle(JxlDecoder* dec, Span<const uint8_t> data,
-                            BitReader* reader, T* JXL_RESTRICT t) {
-  // Use a copy of the bit reader because CanRead advances bits.
-  BitReader reader2(data);
-  reader2.SkipBits(reader->TotalBitsConsumed());
-  bool can_read = Bundle::CanRead(&reader2, t);
-  JXL_API_RETURN_IF_ERROR(reader2.Close());
-
-  if (!can_read) {
-    return dec->RequestMoreInput();
-  }
-  if (!Bundle::Read(reader, t)) {
-    return JXL_DEC_ERROR;
-  }
-  return JXL_DEC_SUCCESS;
-}
-
-std::unique_ptr<BitReader, std::function<void(BitReader*)>> GetBitReader(
-    Span<const uint8_t> span) {
-  BitReader* reader = new BitReader(span);
-  return std::unique_ptr<BitReader, std::function<void(BitReader*)>>(
-      reader, [](BitReader* reader) {
-        // We can't allow Close to abort the program if the reader is out of
-        // bounds, or all return paths in the code, even those that already
-        // return failure, would have to manually call AllReadsWithinBounds().
-        // Invalid JXL codestream should not cause program to quit.
-        (void)reader->AllReadsWithinBounds();
-        (void)reader->Close();
-        delete reader;
-      });
-}
-
-JxlDecoderStatus JxlDecoderReadBasicInfo(JxlDecoder* dec) {
-  if (!dec->got_codestream_signature) {
-    // Check and skip the codestream signature
-    Span<const uint8_t> span;
-    JXL_API_RETURN_IF_ERROR(dec->GetCodestreamInput(&span));
-    if (span.size() < 2) {
-      return dec->RequestMoreInput();
-    }
-    if (span.data()[0] != 0xff || span.data()[1] != jxl::kCodestreamMarker) {
-      return JXL_INPUT_ERROR("invalid signature");
-    }
-    dec->got_codestream_signature = true;
-    dec->AdvanceCodestream(2);
-  }
-
-  Span<const uint8_t> span;
-  JXL_API_RETURN_IF_ERROR(dec->GetCodestreamInput(&span));
-  auto reader = GetBitReader(span);
-  JXL_API_RETURN_IF_ERROR(
-      ReadBundle(dec, span, reader.get(), &dec->metadata.size));
-  JXL_API_RETURN_IF_ERROR(
-      ReadBundle(dec, span, reader.get(), &dec->metadata.m));
-  size_t total_bits = reader->TotalBitsConsumed();
-  dec->AdvanceCodestream(total_bits / jxl::kBitsPerByte);
-  dec->codestream_bits_ahead = total_bits % jxl::kBitsPerByte;
-  dec->got_basic_info = true;
-  dec->basic_info_size_hint = 0;
-  dec->image_metadata = dec->metadata.m;
-  JXL_DEBUG_V(2, "Decoded BasicInfo: %s", dec->metadata.DebugString().c_str());
-
-  if (!CheckSizeLimit(dec, dec->metadata.size.xsize(),
-                      dec->metadata.size.ysize())) {
-    return JXL_INPUT_ERROR("image is too large");
-  }
-
-  return JXL_DEC_SUCCESS;
-}
-
-// Reads all codestream headers (but not frame headers)
-JxlDecoderStatus JxlDecoderReadAllHeaders(JxlDecoder* dec) {
-  if (!dec->got_transform_data) {
-    Span<const uint8_t> span;
-    JXL_API_RETURN_IF_ERROR(dec->GetCodestreamInput(&span));
-    auto reader = GetBitReader(span);
-    reader->SkipBits(dec->codestream_bits_ahead);
-    dec->metadata.transform_data.nonserialized_xyb_encoded =
-        dec->metadata.m.xyb_encoded;
-    JXL_API_RETURN_IF_ERROR(
-        ReadBundle(dec, span, reader.get(), &dec->metadata.transform_data));
-    size_t total_bits = reader->TotalBitsConsumed();
-    dec->AdvanceCodestream(total_bits / jxl::kBitsPerByte);
-    dec->codestream_bits_ahead = total_bits % jxl::kBitsPerByte;
-    dec->got_transform_data = true;
-  }
-
-  Span<const uint8_t> span;
-  JXL_API_RETURN_IF_ERROR(dec->GetCodestreamInput(&span));
-  auto reader = GetBitReader(span);
-  reader->SkipBits(dec->codestream_bits_ahead);
-
-  if (dec->metadata.m.color_encoding.WantICC()) {
-    jxl::Status status = dec->icc_reader->Init(reader.get());
-    // Always check AllReadsWithinBounds, not all the C++ decoder implementation
-    // handles reader out of bounds correctly  yet (e.g. context map). Not
-    // checking AllReadsWithinBounds can cause reader->Close() to trigger an
-    // assert, but we don't want library to quit program for invalid codestream.
-    if (!reader->AllReadsWithinBounds() ||
-        status.code() == StatusCode::kNotEnoughBytes) {
-      return dec->RequestMoreInput();
-    }
-    if (!status) {
-      // Other non-successful status is an error
-      return JXL_DEC_ERROR;
-    }
-    PaddedBytes decoded_icc{&dec->memory_manager};
-    status = dec->icc_reader->Process(reader.get(), &decoded_icc);
-    if (status.code() == StatusCode::kNotEnoughBytes) {
-      return dec->RequestMoreInput();
-    }
-    if (!status) {
-      // Other non-successful status is an error
-      return JXL_DEC_ERROR;
-    }
-    if (decoded_icc.empty()) {
-      return JXL_DEC_ERROR;
-    }
-    IccBytes icc;
-    Bytes(decoded_icc).AppendTo(icc);
-    dec->metadata.m.color_encoding.SetICCRaw(std::move(icc));
-  }
-
-  dec->got_all_headers = true;
-  JXL_API_RETURN_IF_ERROR(reader->JumpToByteBoundary());
-
-  dec->AdvanceCodestream(reader->TotalBitsConsumed() / jxl::kBitsPerByte);
-  dec->codestream_bits_ahead = 0;
-
-  if (!dec->passes_state) {
-    dec->passes_state =
-        jxl::make_unique<jxl::PassesDecoderState>(&dec->memory_manager);
-  }
-
-  JXL_API_RETURN_IF_ERROR(
-      dec->passes_state->output_encoding_info.SetFromMetadata(dec->metadata));
-  if (dec->desired_intensity_target > 0) {
-    dec->passes_state->output_encoding_info.desired_intensity_target =
-        dec->desired_intensity_target;
-  }
-  dec->image_metadata = dec->metadata.m;
-
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderProcessSections(JxlDecoder* dec) {
-  Span<const uint8_t> span;
-  JXL_API_RETURN_IF_ERROR(dec->GetCodestreamInput(&span));
-  const auto& toc = dec->frame_dec->Toc();
-  size_t pos = 0;
-  std::vector<jxl::FrameDecoder::SectionInfo> section_info;
-  std::vector<jxl::FrameDecoder::SectionStatus> section_status;
-  for (size_t i = dec->next_section; i < toc.size(); ++i) {
-    if (dec->section_processed[i]) {
-      pos += toc[i].size;
-      continue;
-    }
-    size_t id = toc[i].id;
-    size_t size = toc[i].size;
-    if (OutOfBounds(pos, size, span.size())) {
-      break;
-    }
-    auto* br = new jxl::BitReader(jxl::Bytes(span.data() + pos, size));
-    section_info.emplace_back(jxl::FrameDecoder::SectionInfo{br, id, i});
-    section_status.emplace_back();
-    pos += size;
-  }
-  jxl::Status status = dec->frame_dec->ProcessSections(
-      section_info.data(), section_info.size(), section_status.data());
-  bool out_of_bounds = false;
-  bool has_error = false;
-  for (const auto& info : section_info) {
-    if (!info.br->AllReadsWithinBounds()) {
-      // Mark out of bounds section, but keep closing and deleting the next
-      // ones as well.
-      out_of_bounds = true;
-    }
-    if (!info.br->Close()) has_error = true;
-    delete info.br;
-  }
-  if (has_error) {
-    return JXL_INPUT_ERROR("internal: bit-reader failed to close");
-  }
-  if (out_of_bounds) {
-    // If any bit reader indicates out of bounds, it's an error, not just
-    // needing more input, since we ensure only bit readers containing
-    // a complete section are provided to the FrameDecoder.
-    return JXL_INPUT_ERROR("frame out of bounds");
-  }
-  if (!status) {
-    return JXL_INPUT_ERROR("frame processing failed");
-  }
-  for (size_t i = 0; i < section_status.size(); ++i) {
-    auto status = section_status[i];
-    if (status == jxl::FrameDecoder::kDone) {
-      dec->section_processed[section_info[i].index] = 1;
-    } else if (status != jxl::FrameDecoder::kSkipped) {
-      return JXL_INPUT_ERROR("unexpected section status");
-    }
-  }
-  size_t completed_prefix_bytes = 0;
-  while (dec->next_section < dec->section_processed.size() &&
-         dec->section_processed[dec->next_section] == 1) {
-    completed_prefix_bytes += toc[dec->next_section].size;
-    ++dec->next_section;
-  }
-  dec->remaining_frame_size -= completed_prefix_bytes;
-  dec->AdvanceCodestream(completed_prefix_bytes);
-  return JXL_DEC_SUCCESS;
-}
-
-// TODO(eustas): no CodecInOut -> no image size reinforcement -> possible OOM.
-JxlDecoderStatus JxlDecoderProcessCodestream(JxlDecoder* dec) {
-  // If no parallel runner is set, use the default
-  // TODO(lode): move this initialization to an appropriate location once the
-  // runner is used to decode pixels.
-  if (!dec->thread_pool) {
-    dec->thread_pool = jxl::make_unique<jxl::ThreadPool>(nullptr, nullptr);
-  }
-
-  // No matter what events are wanted, the basic info is always required.
-  if (!dec->got_basic_info) {
-    JxlDecoderStatus status = JxlDecoderReadBasicInfo(dec);
-    if (status != JXL_DEC_SUCCESS) return status;
-  }
-
-  if (dec->events_wanted & JXL_DEC_BASIC_INFO) {
-    dec->events_wanted &= ~JXL_DEC_BASIC_INFO;
-    return JXL_DEC_BASIC_INFO;
-  }
-
-  if (!dec->events_wanted) {
-    dec->stage = DecoderStage::kCodestreamFinished;
-    return JXL_DEC_SUCCESS;
-  }
-
-  if (!dec->icc_reader) {
-    dec->icc_reader = jxl::make_unique<ICCReader>(&dec->memory_manager);
-  }
-
-  if (!dec->got_all_headers) {
-    JxlDecoderStatus status = JxlDecoderReadAllHeaders(dec);
-    if (status != JXL_DEC_SUCCESS) return status;
-  }
-
-  if (dec->events_wanted & JXL_DEC_COLOR_ENCODING) {
-    dec->events_wanted &= ~JXL_DEC_COLOR_ENCODING;
-    return JXL_DEC_COLOR_ENCODING;
-  }
-
-  if (!dec->events_wanted) {
-    dec->stage = DecoderStage::kCodestreamFinished;
-    return JXL_DEC_SUCCESS;
-  }
-
-  dec->post_headers = true;
-
-  if (!dec->got_preview_image && dec->metadata.m.have_preview) {
-    dec->preview_frame = true;
-  }
-
-  // Handle frames
-  for (;;) {
-    bool parse_frames =
-        (dec->events_wanted &
-         (JXL_DEC_PREVIEW_IMAGE | JXL_DEC_FRAME | JXL_DEC_FULL_IMAGE));
-    if (!parse_frames) {
-      break;
-    }
-    if (dec->frame_stage == FrameStage::kHeader && dec->is_last_total) {
-      break;
-    }
-    if (dec->frame_stage == FrameStage::kHeader) {
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-      if (dec->recon_output_jpeg == JpegReconStage::kSettingMetadata ||
-          dec->recon_output_jpeg == JpegReconStage::kOutputting) {
-        // The image bundle contains the JPEG reconstruction frame, but the
-        // decoder is still waiting to decode an EXIF or XMP box. It's not
-        // implemented to decode additional frames during this, and a JPEG
-        // reconstruction image should have only one frame.
-        return JXL_API_ERROR(
-            "cannot decode a next frame after JPEG reconstruction frame");
-      }
-#endif
-      if (!dec->ib) {
-        dec->ib = jxl::make_unique<jxl::ImageBundle>(&dec->memory_manager,
-                                                     &dec->image_metadata);
-      }
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-      // If JPEG reconstruction is wanted and possible, set the jpeg_data of
-      // the ImageBundle.
-      if (!dec->jpeg_decoder.SetImageBundleJpegData(dec->ib.get()))
-        return JXL_DEC_ERROR;
-#endif
-      dec->frame_dec = jxl::make_unique<FrameDecoder>(
-          dec->passes_state.get(), dec->metadata, dec->thread_pool.get(),
-          /*use_slow_rendering_pipeline=*/false);
-      dec->frame_header = jxl::make_unique<FrameHeader>(&dec->metadata);
-      Span<const uint8_t> span;
-      JXL_API_RETURN_IF_ERROR(dec->GetCodestreamInput(&span));
-      auto reader = GetBitReader(span);
-      jxl::Status status = dec->frame_dec->InitFrame(
-          reader.get(), dec->ib.get(), dec->preview_frame);
-      if (!reader->AllReadsWithinBounds() ||
-          status.code() == StatusCode::kNotEnoughBytes) {
-        return dec->RequestMoreInput();
-      } else if (!status) {
-        return JXL_INPUT_ERROR("invalid frame header");
-      }
-      dec->AdvanceCodestream(reader->TotalBitsConsumed() / kBitsPerByte);
-      *dec->frame_header = dec->frame_dec->GetFrameHeader();
-      jxl::FrameDimensions frame_dim = dec->frame_header->ToFrameDimensions();
-      if (!CheckSizeLimit(dec, frame_dim.xsize_upsampled_padded,
-                          frame_dim.ysize_upsampled_padded)) {
-        return JXL_INPUT_ERROR("frame is too large");
-      }
-      int output_type =
-          dec->preview_frame ? JXL_DEC_PREVIEW_IMAGE : JXL_DEC_FULL_IMAGE;
-      bool output_needed = ((dec->events_wanted & output_type) != 0);
-      if (output_needed) {
-        JXL_API_RETURN_IF_ERROR(dec->frame_dec->InitFrameOutput());
-      }
-      dec->remaining_frame_size = dec->frame_dec->SumSectionSizes();
-
-      dec->frame_stage = FrameStage::kTOC;
-      if (dec->preview_frame) {
-        if (!(dec->events_wanted & JXL_DEC_PREVIEW_IMAGE)) {
-          dec->frame_stage = FrameStage::kHeader;
-          dec->AdvanceCodestream(dec->remaining_frame_size);
-          dec->got_preview_image = true;
-          dec->preview_frame = false;
-        }
-        continue;
-      }
-
-      int saved_as = FrameDecoder::SavedAs(*dec->frame_header);
-      // is last in entire codestream
-      dec->is_last_total = dec->frame_header->is_last;
-      // is last of current still
-      dec->is_last_of_still =
-          dec->is_last_total || dec->frame_header->animation_frame.duration > 0;
-      // is kRegularFrame and coalescing is disabled
-      dec->is_last_of_still |=
-          (!dec->coalescing &&
-           dec->frame_header->frame_type == FrameType::kRegularFrame);
-      const size_t internal_frame_index = dec->internal_frames;
-      const size_t external_frame_index = dec->external_frames;
-      if (dec->is_last_of_still) dec->external_frames++;
-      dec->internal_frames++;
-
-      if (dec->skip_frames > 0) {
-        dec->skipping_frame = true;
-        if (dec->is_last_of_still) {
-          dec->skip_frames--;
-        }
-      } else {
-        dec->skipping_frame = false;
-      }
-
-      if (external_frame_index >= dec->frame_external_to_internal.size()) {
-        dec->frame_external_to_internal.push_back(internal_frame_index);
-        if (dec->frame_external_to_internal.size() !=
-            external_frame_index + 1) {
-          return JXL_API_ERROR("internal");
-        }
-      }
-
-      if (internal_frame_index >= dec->frame_refs.size()) {
-        // add the value 0xff (which means all references) to new slots: we only
-        // know the references of the frame at FinalizeFrame, and fill in the
-        // correct values there. As long as this information is not known, the
-        // worst case where the frame depends on all storage slots is assumed.
-        dec->frame_refs.emplace_back(FrameRef{0xFF, saved_as});
-        if (dec->frame_refs.size() != internal_frame_index + 1) {
-          return JXL_API_ERROR("internal");
-        }
-      }
-
-      if (dec->skipping_frame) {
-        // Whether this frame could be referenced by any future frame: either
-        // because it's a frame saved for blending or patches, or because it's
-        // a DC frame.
-        bool referenceable =
-            dec->frame_header->CanBeReferenced() ||
-            dec->frame_header->frame_type == FrameType::kDCFrame;
-        if (internal_frame_index < dec->frame_required.size() &&
-            !dec->frame_required[internal_frame_index]) {
-          referenceable = false;
-        }
-        if (!referenceable) {
-          // Skip all decoding for this frame, since the user is skipping this
-          // frame and no future frames can reference it.
-          dec->frame_stage = FrameStage::kHeader;
-          dec->AdvanceCodestream(dec->remaining_frame_size);
-          continue;
-        }
-      }
-
-      if ((dec->events_wanted & JXL_DEC_FRAME) && dec->is_last_of_still) {
-        // Only return this for the last of a series of stills: patches frames
-        // etc... before this one do not contain the correct information such
-        // as animation timing, ...
-        if (!dec->skipping_frame) {
-          return JXL_DEC_FRAME;
-        }
-      }
-    }
-
-    if (dec->frame_stage == FrameStage::kTOC) {
-      dec->frame_dec->SetRenderSpotcolors(dec->render_spotcolors);
-      dec->frame_dec->SetCoalescing(dec->coalescing);
-
-      if (!dec->preview_frame &&
-          (dec->events_wanted & JXL_DEC_FRAME_PROGRESSION)) {
-        dec->frame_prog_detail =
-            dec->frame_dec->SetPauseAtProgressive(dec->prog_detail);
-      } else {
-        dec->frame_prog_detail = JxlProgressiveDetail::kFrames;
-      }
-      dec->dc_frame_progression_done = false;
-
-      dec->next_section = 0;
-      dec->section_processed.clear();
-      dec->section_processed.resize(dec->frame_dec->Toc().size(), 0);
-
-      // If we don't need pixels, we can skip actually decoding the frames.
-      if (dec->preview_frame || (dec->events_wanted & JXL_DEC_FULL_IMAGE)) {
-        dec->frame_stage = FrameStage::kFull;
-      } else if (!dec->is_last_total) {
-        dec->frame_stage = FrameStage::kHeader;
-        dec->AdvanceCodestream(dec->remaining_frame_size);
-        continue;
-      } else {
-        break;
-      }
-    }
-
-    if (dec->frame_stage == FrameStage::kFull) {
-      if (!dec->image_out_buffer_set) {
-        if (dec->preview_frame) {
-          return JXL_DEC_NEED_PREVIEW_OUT_BUFFER;
-        }
-        if (
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-            (!dec->jpeg_decoder.IsOutputSet() ||
-             dec->ib->jpeg_data == nullptr) &&
-#endif
-            dec->is_last_of_still && !dec->skipping_frame) {
-          // TODO(lode): remove the dec->is_last_of_still condition if the
-          // frame decoder needs the image buffer as working space for decoding
-          // non-visible or blending frames too
-          return JXL_DEC_NEED_IMAGE_OUT_BUFFER;
-        }
-      }
-
-      if (dec->image_out_buffer_set) {
-        size_t xsize;
-        size_t ysize;
-        GetCurrentDimensions(dec, xsize, ysize);
-        size_t bits_per_sample = GetBitDepth(
-            dec->image_out_bit_depth, dec->metadata.m, dec->image_out_format);
-        dec->frame_dec->SetImageOutput(
-            PixelCallback{
-                dec->image_out_init_callback, dec->image_out_run_callback,
-                dec->image_out_destroy_callback, dec->image_out_init_opaque},
-            reinterpret_cast<uint8_t*>(dec->image_out_buffer),
-            dec->image_out_size, xsize, ysize, dec->image_out_format,
-            bits_per_sample, dec->unpremul_alpha, !dec->keep_orientation);
-        for (size_t i = 0; i < dec->extra_channel_output.size(); ++i) {
-          const auto& extra = dec->extra_channel_output[i];
-          size_t ec_bits_per_sample =
-              GetBitDepth(dec->image_out_bit_depth,
-                          dec->metadata.m.extra_channel_info[i], extra.format);
-          dec->frame_dec->AddExtraChannelOutput(extra.buffer, extra.buffer_size,
-                                                xsize, extra.format,
-                                                ec_bits_per_sample);
-        }
-      }
-
-      size_t next_num_passes_to_pause = dec->frame_dec->NextNumPassesToPause();
-
-      JXL_API_RETURN_IF_ERROR(JxlDecoderProcessSections(dec));
-
-      bool all_sections_done = dec->frame_dec->HasDecodedAll();
-      bool got_dc_only = !all_sections_done && dec->frame_dec->HasDecodedDC();
-
-      if (dec->frame_prog_detail >= JxlProgressiveDetail::kDC &&
-          !dec->dc_frame_progression_done && got_dc_only) {
-        dec->dc_frame_progression_done = true;
-        dec->downsampling_target = 8;
-        return JXL_DEC_FRAME_PROGRESSION;
-      }
-
-      bool new_progression_step_done =
-          dec->frame_dec->NumCompletePasses() >= next_num_passes_to_pause;
-
-      if (!all_sections_done &&
-          dec->frame_prog_detail >= JxlProgressiveDetail::kLastPasses &&
-          new_progression_step_done) {
-        dec->downsampling_target =
-            dec->frame_header->passes.GetDownsamplingTargetForCompletedPasses(
-                dec->frame_dec->NumCompletePasses());
-        return JXL_DEC_FRAME_PROGRESSION;
-      }
-
-      if (!all_sections_done) {
-        // Not all sections have been processed yet
-        return dec->RequestMoreInput();
-      }
-
-      if (!dec->preview_frame) {
-        size_t internal_index = dec->internal_frames - 1;
-        if (dec->frame_refs.size() <= internal_index) {
-          return JXL_API_ERROR("internal");
-        }
-        // Always fill this in, even if it was already written, it could be that
-        // this frame was skipped before and set to 255, while only now we know
-        // the true value.
-        dec->frame_refs[internal_index].reference =
-            dec->frame_dec->References();
-      }
-
-      if (!dec->frame_dec->FinalizeFrame()) {
-        return JXL_INPUT_ERROR("decoding frame failed");
-      }
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-      // If jpeg output was requested, we merely return the JXL_DEC_FULL_IMAGE
-      // status without outputting pixels.
-      if (dec->jpeg_decoder.IsOutputSet() && dec->ib->jpeg_data != nullptr) {
-        dec->frame_stage = FrameStage::kHeader;
-        dec->recon_output_jpeg = JpegReconStage::kSettingMetadata;
-        return JXL_DEC_FULL_IMAGE;
-      }
-#endif
-      if (dec->preview_frame || dec->is_last_of_still) {
-        dec->image_out_buffer_set = false;
-        dec->extra_channel_output.clear();
-      }
-    }
-
-    dec->frame_stage = FrameStage::kHeader;
-
-    // The pixels have been output or are not needed, do not keep them in
-    // memory here.
-    dec->ib.reset();
-    if (dec->preview_frame) {
-      dec->got_preview_image = true;
-      dec->preview_frame = false;
-      dec->events_wanted &= ~JXL_DEC_PREVIEW_IMAGE;
-      return JXL_DEC_PREVIEW_IMAGE;
-    } else if (dec->is_last_of_still &&
-               (dec->events_wanted & JXL_DEC_FULL_IMAGE) &&
-               !dec->skipping_frame) {
-      return JXL_DEC_FULL_IMAGE;
-    }
-  }
-
-  dec->stage = DecoderStage::kCodestreamFinished;
-  // Return success, this means there is nothing more to do.
-  return JXL_DEC_SUCCESS;
-}
-
-}  // namespace
-}  // namespace jxl
-
-JxlDecoderStatus JxlDecoderSetInput(JxlDecoder* dec, const uint8_t* data,
-                                    size_t size) {
-  if (dec->next_in) {
-    return JXL_API_ERROR("already set input, use JxlDecoderReleaseInput first");
-  }
-  if (dec->input_closed) {
-    return JXL_API_ERROR("input already closed");
-  }
-
-  dec->next_in = data;
-  dec->avail_in = size;
-  return JXL_DEC_SUCCESS;
-}
-
-size_t JxlDecoderReleaseInput(JxlDecoder* dec) {
-  size_t result = dec->avail_in;
-  dec->next_in = nullptr;
-  dec->avail_in = 0;
-  return result;
-}
-
-void JxlDecoderCloseInput(JxlDecoder* dec) { dec->input_closed = true; }
-
-JxlDecoderStatus JxlDecoderSetJPEGBuffer(JxlDecoder* dec, uint8_t* data,
-                                         size_t size) {
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-  // JPEG reconstruction buffer can only set and updated before or during the
-  // first frame, the reconstruction box refers to the first frame and in
-  // theory multi-frame images should not be used with a jbrd box.
-  if (dec->internal_frames > 1) {
-    return JXL_API_ERROR("JPEG reconstruction only works for the first frame");
-  }
-  if (dec->jpeg_decoder.IsOutputSet()) {
-    return JXL_API_ERROR("Already set JPEG buffer");
-  }
-  return dec->jpeg_decoder.SetOutputBuffer(data, size);
-#else
-  return JXL_API_ERROR("JPEG reconstruction is not supported.");
-#endif
-}
-
-size_t JxlDecoderReleaseJPEGBuffer(JxlDecoder* dec) {
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-  return dec->jpeg_decoder.ReleaseOutputBuffer();
-#else
-  return JXL_API_ERROR("JPEG reconstruction is not supported.");
-#endif
-}
-
-// Parses the header of the box, outputting the 4-character type and the box
-// size, including header size, as stored in the box header.
-// @param in current input bytes.
-// @param size available input size.
-// @param pos position in the input, must begin at the header of the box.
-// @param file_pos position of pos since the start of the JXL file, rather than
-// the current input, used for integer overflow checking.
-// @param type the output box type.
-// @param box_size output the total box size, including header, in bytes, or 0
-// if it's a final unbounded box.
-// @param header_size output size of the box header.
-// @return JXL_DEC_SUCCESS if the box header was fully parsed. In that case the
-// parsing position must be incremented by header_size bytes.
-// JXL_DEC_NEED_MORE_INPUT if not enough input bytes available, in that case
-// header_size indicates a lower bound for the known size the header has to be
-// at least. JXL_DEC_ERROR if the box header is invalid.
-static JxlDecoderStatus ParseBoxHeader(const uint8_t* in, size_t size,
-                                       size_t pos, size_t file_pos,
-                                       JxlBoxType type, uint64_t* box_size,
-                                       uint64_t* header_size) {
-  if (OutOfBounds(pos, 8, size)) {
-    *header_size = 8;
-    return JXL_DEC_NEED_MORE_INPUT;
-  }
-  size_t box_start = pos;
-  // Box size, including this header itself.
-  *box_size = LoadBE32(in + pos);
-  pos += 4;
-  memcpy(type, in + pos, 4);
-  pos += 4;
-  if (*box_size == 1) {
-    *header_size = 16;
-    if (OutOfBounds(pos, 8, size)) return JXL_DEC_NEED_MORE_INPUT;
-    *box_size = LoadBE64(in + pos);
-    pos += 8;
-  }
-  *header_size = pos - box_start;
-  if (*box_size > 0 && *box_size < *header_size) {
-    return JXL_INPUT_ERROR("invalid box size");
-  }
-  if (file_pos + *box_size < file_pos) {
-    return JXL_INPUT_ERROR("Box size overflow");
-  }
-  return JXL_DEC_SUCCESS;
-}
-
-// This includes handling the codestream if it is not a box-based jxl file.
-static JxlDecoderStatus HandleBoxes(JxlDecoder* dec) {
-  // Box handling loop
-  for (;;) {
-    if (dec->box_stage != BoxStage::kHeader) {
-      dec->AdvanceInput(dec->header_size);
-      dec->header_size = 0;
-#if JPEGXL_ENABLE_BOXES
-      if ((dec->events_wanted & JXL_DEC_BOX) &&
-          dec->box_out_buffer_set_current_box) {
-        uint8_t* next_out = dec->box_out_buffer + dec->box_out_buffer_pos;
-        size_t avail_out = dec->box_out_buffer_size - dec->box_out_buffer_pos;
-
-        JxlDecoderStatus box_result = dec->box_content_decoder.Process(
-            dec->next_in, dec->avail_in,
-            dec->file_pos - dec->box_contents_begin, &next_out, &avail_out);
-        size_t produced =
-            next_out - (dec->box_out_buffer + dec->box_out_buffer_pos);
-        dec->box_out_buffer_pos += produced;
-
-        if (box_result == JXL_DEC_BOX_COMPLETE &&
-            !(dec->events_wanted & JXL_DEC_BOX_COMPLETE)) {
-          box_result = JXL_DEC_SUCCESS;
-        }
-
-        // Don't return JXL_DEC_NEED_MORE_INPUT: the box stages below, instead,
-        // handle the input progression, and the above only outputs the part of
-        // the box seen so far.
-        if (box_result != JXL_DEC_SUCCESS &&
-            box_result != JXL_DEC_NEED_MORE_INPUT) {
-          return box_result;
-        }
-      }
-#endif
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-      if (dec->store_exif == 1 || dec->store_xmp == 1) {
-        std::vector<uint8_t>& metadata =
-            (dec->store_exif == 1) ? dec->exif_metadata : dec->xmp_metadata;
-        for (;;) {
-          if (metadata.empty()) metadata.resize(64);
-          uint8_t* orig_next_out = metadata.data() + dec->recon_out_buffer_pos;
-          uint8_t* next_out = orig_next_out;
-          size_t avail_out = metadata.size() - dec->recon_out_buffer_pos;
-          JxlDecoderStatus box_result = dec->metadata_decoder.Process(
-              dec->next_in, dec->avail_in,
-              dec->file_pos - dec->box_contents_begin, &next_out, &avail_out);
-          size_t produced = next_out - orig_next_out;
-          dec->recon_out_buffer_pos += produced;
-          if (box_result == JXL_DEC_BOX_NEED_MORE_OUTPUT) {
-            metadata.resize(metadata.size() * 2);
-          } else if (box_result == JXL_DEC_NEED_MORE_INPUT) {
-            break;  // box stage handling below will handle this instead
-          } else if (box_result == JXL_DEC_BOX_COMPLETE) {
-            size_t needed_size = (dec->store_exif == 1) ? dec->recon_exif_size
-                                                        : dec->recon_xmp_size;
-            if (dec->box_contents_unbounded &&
-                dec->recon_out_buffer_pos < needed_size) {
-              // Unbounded box, but we know the expected size due to the jbrd
-              // box's data. Treat this as the JXL_DEC_NEED_MORE_INPUT case.
-              break;
-            } else {
-              metadata.resize(dec->recon_out_buffer_pos);
-              if (dec->store_exif == 1) dec->store_exif = 2;
-              if (dec->store_xmp == 1) dec->store_xmp = 2;
-              break;
-            }
-          } else {
-            // error
-            return box_result;
-          }
-        }
-      }
-#endif
-    }
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-    if (dec->recon_output_jpeg == JpegReconStage::kSettingMetadata &&
-        !dec->JbrdNeedMoreBoxes()) {
-      jxl::jpeg::JPEGData* jpeg_data = dec->ib->jpeg_data.get();
-      if (dec->recon_exif_size) {
-        JxlDecoderStatus status = jxl::JxlToJpegDecoder::SetExif(
-            dec->exif_metadata.data(), dec->exif_metadata.size(), jpeg_data);
-        if (status != JXL_DEC_SUCCESS) return status;
-      }
-      if (dec->recon_xmp_size) {
-        JxlDecoderStatus status = jxl::JxlToJpegDecoder::SetXmp(
-            dec->xmp_metadata.data(), dec->xmp_metadata.size(), jpeg_data);
-        if (status != JXL_DEC_SUCCESS) return status;
-      }
-      dec->recon_output_jpeg = JpegReconStage::kOutputting;
-    }
-
-    if (dec->recon_output_jpeg == JpegReconStage::kOutputting &&
-        !dec->JbrdNeedMoreBoxes()) {
-      JxlDecoderStatus status =
-          dec->jpeg_decoder.WriteOutput(*dec->ib->jpeg_data);
-      if (status != JXL_DEC_SUCCESS) return status;
-      dec->recon_output_jpeg = JpegReconStage::kNone;
-      dec->ib.reset();
-      if (dec->events_wanted & JXL_DEC_FULL_IMAGE) {
-        // Return the full image event here now, this may be delayed if this
-        // could only be done after decoding an exif or xmp box after the
-        // codestream.
-        return JXL_DEC_FULL_IMAGE;
-      }
-    }
-#endif
-
-    if (dec->box_stage == BoxStage::kHeader) {
-      if (!dec->have_container) {
-        if (dec->stage == DecoderStage::kCodestreamFinished)
-          return JXL_DEC_SUCCESS;
-        dec->box_stage = BoxStage::kCodestream;
-        dec->box_contents_unbounded = true;
-        continue;
-      }
-      if (dec->avail_in == 0) {
-        if (dec->stage != DecoderStage::kCodestreamFinished) {
-          // Not yet seen (all) codestream boxes.
-          return JXL_DEC_NEED_MORE_INPUT;
-        }
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-        if (dec->JbrdNeedMoreBoxes()) {
-          return JXL_DEC_NEED_MORE_INPUT;
-        }
-#endif
-        if (dec->input_closed) {
-          return JXL_DEC_SUCCESS;
-        }
-        if (!(dec->events_wanted & JXL_DEC_BOX)) {
-          // All codestream and jbrd metadata boxes finished, and no individual
-          // boxes requested by user, so no need to request any more input.
-          // This returns success for backwards compatibility, when
-          // JxlDecoderCloseInput and JXL_DEC_BOX did not exist, as well
-          // as for efficiency.
-          return JXL_DEC_SUCCESS;
-        }
-        // Even though we are exactly at a box end, there still may be more
-        // boxes. The user may call JxlDecoderCloseInput to indicate the input
-        // is finished and get success instead.
-        return JXL_DEC_NEED_MORE_INPUT;
-      }
-
-      bool boxed_codestream_done =
-          ((dec->events_wanted & JXL_DEC_BOX) &&
-           dec->stage == DecoderStage::kCodestreamFinished &&
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-           !dec->JbrdNeedMoreBoxes() &&
-#endif
-           dec->last_codestream_seen);
-      if (boxed_codestream_done && dec->avail_in >= 2 &&
-          dec->next_in[0] == 0xff &&
-          dec->next_in[1] == jxl::kCodestreamMarker) {
-        // We detected the start of the next naked codestream, so we can return
-        // success here.
-        return JXL_DEC_SUCCESS;
-      }
-
-      uint64_t box_size;
-      uint64_t header_size;
-      JxlDecoderStatus status =
-          ParseBoxHeader(dec->next_in, dec->avail_in, 0, dec->file_pos,
-                         dec->box_type, &box_size, &header_size);
-      if (status != JXL_DEC_SUCCESS) {
-        if (status == JXL_DEC_NEED_MORE_INPUT) {
-          dec->basic_info_size_hint =
-              InitialBasicInfoSizeHint() + header_size - dec->file_pos;
-        }
-        return status;
-      }
-      if (memcmp(dec->box_type, "brob", 4) == 0) {
-        if (dec->avail_in < header_size + 4) {
-          return JXL_DEC_NEED_MORE_INPUT;
-        }
-        memcpy(dec->box_decoded_type, dec->next_in + header_size,
-               sizeof(dec->box_decoded_type));
-      } else {
-        memcpy(dec->box_decoded_type, dec->box_type,
-               sizeof(dec->box_decoded_type));
-      }
-
-      // Box order validity checks
-      // The signature box at box_count == 1 is not checked here since that's
-      // already done at the beginning.
-      dec->box_count++;
-      if (boxed_codestream_done && memcmp(dec->box_type, "JXL ", 4) == 0) {
-        // We detected the start of the next boxed stream, so we can return
-        // success here.
-        return JXL_DEC_SUCCESS;
-      }
-      if (dec->box_count == 2 && memcmp(dec->box_type, "ftyp", 4) != 0) {
-        return JXL_INPUT_ERROR("the second box must be the ftyp box");
-      }
-      if (memcmp(dec->box_type, "ftyp", 4) == 0 && dec->box_count != 2) {
-        return JXL_INPUT_ERROR("the ftyp box must come second");
-      }
-
-      dec->box_contents_unbounded = (box_size == 0);
-      dec->box_contents_begin = dec->file_pos + header_size;
-      dec->box_contents_end =
-          dec->box_contents_unbounded ? 0 : (dec->file_pos + box_size);
-      dec->box_contents_size =
-          dec->box_contents_unbounded ? 0 : (box_size - header_size);
-      dec->box_size = box_size;
-      dec->header_size = header_size;
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-      if (dec->orig_events_wanted & JXL_DEC_JPEG_RECONSTRUCTION) {
-        // Initiate storing of Exif or XMP data for JPEG reconstruction
-        if (dec->store_exif == 0 &&
-            memcmp(dec->box_decoded_type, "Exif", 4) == 0) {
-          dec->store_exif = 1;
-          dec->recon_out_buffer_pos = 0;
-        }
-        if (dec->store_xmp == 0 &&
-            memcmp(dec->box_decoded_type, "xml ", 4) == 0) {
-          dec->store_xmp = 1;
-          dec->recon_out_buffer_pos = 0;
-        }
-      }
-#endif
-#if JPEGXL_ENABLE_BOXES
-      if (dec->events_wanted & JXL_DEC_BOX) {
-        bool decompress =
-            dec->decompress_boxes && memcmp(dec->box_type, "brob", 4) == 0;
-        dec->box_content_decoder.StartBox(
-            decompress, dec->box_contents_unbounded, dec->box_contents_size);
-      }
-#endif
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-      if (dec->store_exif == 1 || dec->store_xmp == 1) {
-        bool brob = memcmp(dec->box_type, "brob", 4) == 0;
-        dec->metadata_decoder.StartBox(brob, dec->box_contents_unbounded,
-                                       dec->box_contents_size);
-      }
-#endif
-      if (memcmp(dec->box_type, "ftyp", 4) == 0) {
-        dec->box_stage = BoxStage::kFtyp;
-      } else if (memcmp(dec->box_type, "jxlc", 4) == 0) {
-        if (dec->last_codestream_seen) {
-          return JXL_INPUT_ERROR("there can only be one jxlc box");
-        }
-        dec->last_codestream_seen = true;
-        dec->box_stage = BoxStage::kCodestream;
-      } else if (memcmp(dec->box_type, "jxlp", 4) == 0) {
-        dec->box_stage = BoxStage::kPartialCodestream;
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-      } else if ((dec->orig_events_wanted & JXL_DEC_JPEG_RECONSTRUCTION) &&
-                 memcmp(dec->box_type, "jbrd", 4) == 0) {
-        if (!(dec->events_wanted & JXL_DEC_JPEG_RECONSTRUCTION)) {
-          return JXL_INPUT_ERROR(
-              "multiple JPEG reconstruction boxes not supported");
-        }
-        dec->box_stage = BoxStage::kJpegRecon;
-#endif
-      } else {
-        dec->box_stage = BoxStage::kSkip;
-      }
-
-      if (dec->events_wanted & JXL_DEC_BOX) {
-        dec->box_event = true;
-        dec->box_out_buffer_set_current_box = false;
-        return JXL_DEC_BOX;
-      }
-    } else if (dec->box_stage == BoxStage::kFtyp) {
-      if (dec->box_contents_size < 12) {
-        return JXL_INPUT_ERROR("file type box too small");
-      }
-      if (dec->avail_in < 4) return JXL_DEC_NEED_MORE_INPUT;
-      if (memcmp(dec->next_in, "jxl ", 4) != 0) {
-        return JXL_INPUT_ERROR("file type box major brand must be \"jxl \"");
-      }
-      dec->AdvanceInput(4);
-      dec->box_stage = BoxStage::kSkip;
-    } else if (dec->box_stage == BoxStage::kPartialCodestream) {
-      if (dec->last_codestream_seen) {
-        return JXL_INPUT_ERROR("cannot have jxlp box after last jxlp box");
-      }
-      // TODO(lode): error if box is unbounded but last bit not set
-      if (dec->avail_in < 4) return JXL_DEC_NEED_MORE_INPUT;
-      if (!dec->box_contents_unbounded && dec->box_contents_size < 4) {
-        return JXL_INPUT_ERROR("jxlp box too small to contain index");
-      }
-      size_t jxlp_index = LoadBE32(dec->next_in);
-      // The high bit of jxlp_index indicates whether this is the last
-      // jxlp box.
-      if (jxlp_index & 0x80000000) {
-        dec->last_codestream_seen = true;
-      }
-      dec->AdvanceInput(4);
-      dec->box_stage = BoxStage::kCodestream;
-    } else if (dec->box_stage == BoxStage::kCodestream) {
-      JxlDecoderStatus status = jxl::JxlDecoderProcessCodestream(dec);
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-      if (status == JXL_DEC_FULL_IMAGE) {
-        if (dec->recon_output_jpeg != JpegReconStage::kNone) {
-          continue;
-        }
-      }
-#endif
-      if (status == JXL_DEC_NEED_MORE_INPUT) {
-        if (dec->file_pos == dec->box_contents_end &&
-            !dec->box_contents_unbounded) {
-          dec->box_stage = BoxStage::kHeader;
-          continue;
-        }
-      }
-
-      if (status == JXL_DEC_SUCCESS) {
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-        if (dec->JbrdNeedMoreBoxes()) {
-          dec->box_stage = BoxStage::kSkip;
-          continue;
-        }
-#endif
-        if (dec->box_contents_unbounded) {
-          // Last box reached and codestream done, nothing more to do.
-          break;
-        }
-        if (dec->events_wanted & JXL_DEC_BOX) {
-          // Codestream done, but there may be more other boxes.
-          dec->box_stage = BoxStage::kSkip;
-          continue;
-        }
-      }
-      return status;
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-    } else if (dec->box_stage == BoxStage::kJpegRecon) {
-      if (!dec->jpeg_decoder.IsParsingBox()) {
-        // This is a new JPEG reconstruction metadata box.
-        dec->jpeg_decoder.StartBox(dec->box_contents_unbounded,
-                                   dec->box_contents_size);
-      }
-      const uint8_t* next_in = dec->next_in;
-      size_t avail_in = dec->avail_in;
-      JxlDecoderStatus recon_result =
-          dec->jpeg_decoder.Process(&next_in, &avail_in);
-      size_t consumed = next_in - dec->next_in;
-      dec->AdvanceInput(consumed);
-      if (recon_result == JXL_DEC_JPEG_RECONSTRUCTION) {
-        jxl::jpeg::JPEGData* jpeg_data = dec->jpeg_decoder.GetJpegData();
-        size_t num_exif = jxl::JxlToJpegDecoder::NumExifMarkers(*jpeg_data);
-        size_t num_xmp = jxl::JxlToJpegDecoder::NumXmpMarkers(*jpeg_data);
-        if (num_exif) {
-          if (num_exif > 1) {
-            return JXL_INPUT_ERROR(
-                "multiple exif markers for JPEG reconstruction not supported");
-          }
-          if (JXL_DEC_SUCCESS != jxl::JxlToJpegDecoder::ExifBoxContentSize(
-                                     *jpeg_data, &dec->recon_exif_size)) {
-            return JXL_INPUT_ERROR("invalid jbrd exif size");
-          }
-        }
-        if (num_xmp) {
-          if (num_xmp > 1) {
-            return JXL_INPUT_ERROR(
-                "multiple XMP markers for JPEG reconstruction not supported");
-          }
-          if (JXL_DEC_SUCCESS != jxl::JxlToJpegDecoder::XmlBoxContentSize(
-                                     *jpeg_data, &dec->recon_xmp_size)) {
-            return JXL_INPUT_ERROR("invalid jbrd XMP size");
-          }
-        }
-
-        dec->box_stage = BoxStage::kHeader;
-        // If successful JPEG reconstruction, return the success if the user
-        // cares about it, otherwise continue.
-        if (dec->events_wanted & JXL_DEC_JPEG_RECONSTRUCTION) {
-          dec->events_wanted &= ~JXL_DEC_JPEG_RECONSTRUCTION;
-          return JXL_DEC_JPEG_RECONSTRUCTION;
-        }
-      } else {
-        // If anything else, return the result.
-        return recon_result;
-      }
-#endif
-    } else if (dec->box_stage == BoxStage::kSkip) {
-      if (dec->box_contents_unbounded) {
-        if (dec->input_closed) {
-          return JXL_DEC_SUCCESS;
-        }
-        if (!(dec->box_out_buffer_set)) {
-          // An unbounded box is always the last box. Not requesting box data,
-          // so return success even if JxlDecoderCloseInput was not called for
-          // backwards compatibility as well as efficiency since this box is
-          // being skipped.
-          return JXL_DEC_SUCCESS;
-        }
-        // Arbitrarily more bytes may follow, only JxlDecoderCloseInput can
-        // mark the end.
-        dec->AdvanceInput(dec->avail_in);
-        return JXL_DEC_NEED_MORE_INPUT;
-      }
-      // Amount of remaining bytes in the box that is being skipped.
-      size_t remaining = dec->box_contents_end - dec->file_pos;
-      if (dec->avail_in < remaining) {
-        // Indicate how many more bytes needed starting from next_in.
-        dec->basic_info_size_hint =
-            InitialBasicInfoSizeHint() + dec->box_contents_end - dec->file_pos;
-        // Don't have the full box yet, skip all we have so far
-        dec->AdvanceInput(dec->avail_in);
-        return JXL_DEC_NEED_MORE_INPUT;
-      } else {
-        // Full box available, skip all its remaining bytes
-        dec->AdvanceInput(remaining);
-        dec->box_stage = BoxStage::kHeader;
-      }
-    } else {
-      JXL_DEBUG_ABORT("Unreachable");
-    }
-  }
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderProcessInput(JxlDecoder* dec) {
-  if (dec->stage == DecoderStage::kInited) {
-    dec->stage = DecoderStage::kStarted;
-  }
-  if (dec->stage == DecoderStage::kError) {
-    return JXL_API_ERROR(
-        "Cannot keep using decoder after it encountered an error, use "
-        "JxlDecoderReset to reset it");
-  }
-
-  if (!dec->got_signature) {
-    JxlSignature sig = JxlSignatureCheck(dec->next_in, dec->avail_in);
-    if (sig == JXL_SIG_INVALID) return JXL_INPUT_ERROR("invalid signature");
-    if (sig == JXL_SIG_NOT_ENOUGH_BYTES) {
-      if (dec->input_closed) {
-        return JXL_INPUT_ERROR("file too small for signature");
-      }
-      return JXL_DEC_NEED_MORE_INPUT;
-    }
-
-    dec->got_signature = true;
-
-    if (sig == JXL_SIG_CONTAINER) {
-      dec->have_container = true;
-    } else {
-      dec->last_codestream_seen = true;
-    }
-  }
-
-  JxlDecoderStatus status = HandleBoxes(dec);
-
-  if (status == JXL_DEC_NEED_MORE_INPUT && dec->input_closed) {
-    return JXL_INPUT_ERROR("premature end of input");
-  }
-
-  // Even if the box handling returns success, certain types of
-  // data may be missing.
-  if (status == JXL_DEC_SUCCESS) {
-    if (dec->CanUseMoreCodestreamInput()) {
-      return JXL_INPUT_ERROR("codestream never finished");
-    }
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-    if (dec->JbrdNeedMoreBoxes()) {
-      return JXL_INPUT_ERROR("missing metadata boxes for jpeg reconstruction");
-    }
-#endif
-  }
-
-  return status;
-}
-
-// To ensure ABI forward-compatibility, this struct has a constant size.
-static_assert(sizeof(JxlBasicInfo) == 204,
-              "JxlBasicInfo struct size should remain constant");
-
-JxlDecoderStatus JxlDecoderGetBasicInfo(const JxlDecoder* dec,
-                                        JxlBasicInfo* info) {
-  if (!dec->got_basic_info) return JXL_DEC_NEED_MORE_INPUT;
-
-  if (info) {
-    memset(info, 0, sizeof(*info));
-
-    const jxl::ImageMetadata& meta = dec->metadata.m;
-
-    info->have_container = TO_JXL_BOOL(dec->have_container);
-    info->xsize = dec->metadata.size.xsize();
-    info->ysize = dec->metadata.size.ysize();
-    info->uses_original_profile = TO_JXL_BOOL(!meta.xyb_encoded);
-
-    info->bits_per_sample = meta.bit_depth.bits_per_sample;
-    info->exponent_bits_per_sample = meta.bit_depth.exponent_bits_per_sample;
-
-    info->have_preview = TO_JXL_BOOL(meta.have_preview);
-    info->have_animation = TO_JXL_BOOL(meta.have_animation);
-    info->orientation = static_cast<JxlOrientation>(meta.orientation);
-
-    if (!dec->keep_orientation) {
-      if (info->orientation >= JXL_ORIENT_TRANSPOSE) {
-        std::swap(info->xsize, info->ysize);
-      }
-      info->orientation = JXL_ORIENT_IDENTITY;
-    }
-
-    info->intensity_target = meta.IntensityTarget();
-    if (dec->desired_intensity_target > 0) {
-      info->intensity_target = dec->desired_intensity_target;
-    }
-    info->min_nits = meta.tone_mapping.min_nits;
-    info->relative_to_max_display =
-        TO_JXL_BOOL(meta.tone_mapping.relative_to_max_display);
-    info->linear_below = meta.tone_mapping.linear_below;
-
-    const jxl::ExtraChannelInfo* alpha = meta.Find(jxl::ExtraChannel::kAlpha);
-    if (alpha != nullptr) {
-      info->alpha_bits = alpha->bit_depth.bits_per_sample;
-      info->alpha_exponent_bits = alpha->bit_depth.exponent_bits_per_sample;
-      info->alpha_premultiplied = TO_JXL_BOOL(alpha->alpha_associated);
-    } else {
-      info->alpha_bits = 0;
-      info->alpha_exponent_bits = 0;
-      info->alpha_premultiplied = 0;
-    }
-
-    info->num_color_channels =
-        meta.color_encoding.GetColorSpace() == jxl::ColorSpace::kGray ? 1 : 3;
-
-    info->num_extra_channels = meta.num_extra_channels;
-
-    if (info->have_preview) {
-      info->preview.xsize = dec->metadata.m.preview_size.xsize();
-      info->preview.ysize = dec->metadata.m.preview_size.ysize();
-    }
-
-    if (info->have_animation) {
-      info->animation.tps_numerator = dec->metadata.m.animation.tps_numerator;
-      info->animation.tps_denominator =
-          dec->metadata.m.animation.tps_denominator;
-      info->animation.num_loops = dec->metadata.m.animation.num_loops;
-      info->animation.have_timecodes =
-          TO_JXL_BOOL(dec->metadata.m.animation.have_timecodes);
-    }
-
-    if (meta.have_intrinsic_size) {
-      info->intrinsic_xsize = dec->metadata.m.intrinsic_size.xsize();
-      info->intrinsic_ysize = dec->metadata.m.intrinsic_size.ysize();
-    } else {
-      info->intrinsic_xsize = info->xsize;
-      info->intrinsic_ysize = info->ysize;
-    }
-  }
-
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderGetExtraChannelInfo(const JxlDecoder* dec,
-                                               size_t index,
-                                               JxlExtraChannelInfo* info) {
-  if (!dec->got_basic_info) return JXL_DEC_NEED_MORE_INPUT;
-
-  const std::vector<jxl::ExtraChannelInfo>& channels =
-      dec->metadata.m.extra_channel_info;
-
-  if (index >= channels.size()) return JXL_DEC_ERROR;  // out of bounds
-  const jxl::ExtraChannelInfo& channel = channels[index];
-
-  info->type = static_cast<JxlExtraChannelType>(channel.type);
-  info->bits_per_sample = channel.bit_depth.bits_per_sample;
-  info->exponent_bits_per_sample =
-      channel.bit_depth.floating_point_sample
-          ? channel.bit_depth.exponent_bits_per_sample
-          : 0;
-  info->dim_shift = channel.dim_shift;
-  info->name_length = channel.name.size();
-  info->alpha_premultiplied = TO_JXL_BOOL(channel.alpha_associated);
-  info->spot_color[0] = channel.spot_color[0];
-  info->spot_color[1] = channel.spot_color[1];
-  info->spot_color[2] = channel.spot_color[2];
-  info->spot_color[3] = channel.spot_color[3];
-  info->cfa_channel = channel.cfa_channel;
-
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderGetExtraChannelName(const JxlDecoder* dec,
-                                               size_t index, char* name,
-                                               size_t size) {
-  if (!dec->got_basic_info) return JXL_DEC_NEED_MORE_INPUT;
-
-  const std::vector<jxl::ExtraChannelInfo>& channels =
-      dec->metadata.m.extra_channel_info;
-
-  if (index >= channels.size()) return JXL_DEC_ERROR;  // out of bounds
-  const jxl::ExtraChannelInfo& channel = channels[index];
-
-  // Also need null-termination character
-  if (channel.name.size() + 1 > size) return JXL_DEC_ERROR;
-
-  memcpy(name, channel.name.c_str(), channel.name.size() + 1);
-
-  return JXL_DEC_SUCCESS;
-}
-
-namespace {
-
-// Gets the jxl::ColorEncoding for the desired target, and checks errors.
-// Returns the object regardless of whether the actual color space is in ICC,
-// but ensures that if the color encoding is not the encoding from the
-// codestream header metadata, it cannot require ICC profile.
-JxlDecoderStatus GetColorEncodingForTarget(
-    const JxlDecoder* dec, JxlColorProfileTarget target,
-    const jxl::ColorEncoding** encoding) {
-  if (!dec->got_all_headers) return JXL_DEC_NEED_MORE_INPUT;
-  *encoding = nullptr;
-  if (target == JXL_COLOR_PROFILE_TARGET_DATA && dec->metadata.m.xyb_encoded) {
-    *encoding = &dec->passes_state->output_encoding_info.color_encoding;
-  } else {
-    *encoding = &dec->metadata.m.color_encoding;
-  }
-  return JXL_DEC_SUCCESS;
-}
-}  // namespace
-
-JxlDecoderStatus JxlDecoderGetColorAsEncodedProfile(
-    const JxlDecoder* dec, JxlColorProfileTarget target,
-    JxlColorEncoding* color_encoding) {
-  const jxl::ColorEncoding* jxl_color_encoding = nullptr;
-  JxlDecoderStatus status =
-      GetColorEncodingForTarget(dec, target, &jxl_color_encoding);
-  if (status) return status;
-
-  if (jxl_color_encoding->WantICC())
-    return JXL_DEC_ERROR;  // Indicate no encoded profile available.
-
-  if (color_encoding) {
-    *color_encoding = jxl_color_encoding->ToExternal();
-  }
-
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderGetICCProfileSize(const JxlDecoder* dec,
-                                             JxlColorProfileTarget target,
-                                             size_t* size) {
-  const jxl::ColorEncoding* jxl_color_encoding = nullptr;
-  JxlDecoderStatus status =
-      GetColorEncodingForTarget(dec, target, &jxl_color_encoding);
-  if (status != JXL_DEC_SUCCESS) return status;
-
-  if (jxl_color_encoding->WantICC()) {
-    jxl::ColorSpace color_space =
-        dec->metadata.m.color_encoding.GetColorSpace();
-    if (color_space == jxl::ColorSpace::kUnknown ||
-        color_space == jxl::ColorSpace::kXYB) {
-      // This indicates there's no ICC profile available
-      // TODO(lode): for the XYB case, do we want to craft an ICC profile that
-      // represents XYB as an RGB profile? It may be possible, but not with
-      // only 1D transfer functions.
-      return JXL_DEC_ERROR;
-    }
-  }
-
-  if (size) {
-    *size = jxl_color_encoding->ICC().size();
-  }
-
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderGetColorAsICCProfile(const JxlDecoder* dec,
-                                                JxlColorProfileTarget target,
-                                                uint8_t* icc_profile,
-                                                size_t size) {
-  size_t wanted_size;
-  // This also checks the NEED_MORE_INPUT and the unknown/xyb cases
-  JxlDecoderStatus status =
-      JxlDecoderGetICCProfileSize(dec, target, &wanted_size);
-  if (status != JXL_DEC_SUCCESS) return status;
-  if (size < wanted_size) return JXL_API_ERROR("ICC profile output too small");
-
-  const jxl::ColorEncoding* jxl_color_encoding = nullptr;
-  status = GetColorEncodingForTarget(dec, target, &jxl_color_encoding);
-  if (status != JXL_DEC_SUCCESS) return status;
-
-  memcpy(icc_profile, jxl_color_encoding->ICC().data(),
-         jxl_color_encoding->ICC().size());
-
-  return JXL_DEC_SUCCESS;
-}
-
-namespace {
-
-// Returns the amount of bits needed for getting memory buffer size, and does
-// all error checking required for size checking and format validity.
-JxlDecoderStatus PrepareSizeCheck(const JxlDecoder* dec,
-                                  const JxlPixelFormat* format, size_t* bits) {
-  if (!dec->got_basic_info) {
-    // Don't know image dimensions yet, cannot check for valid size.
-    return JXL_DEC_NEED_MORE_INPUT;
-  }
-  if (!dec->coalescing &&
-      (!dec->frame_header || dec->frame_stage == FrameStage::kHeader)) {
-    return JXL_API_ERROR("Don't know frame dimensions yet");
-  }
-  if (format->num_channels > 4) {
-    return JXL_API_ERROR("More than 4 channels not supported");
-  }
-
-  *bits = BitsPerChannel(format->data_type);
-
-  if (*bits == 0) {
-    return JXL_API_ERROR("Invalid/unsupported data type");
-  }
-
-  return JXL_DEC_SUCCESS;
-}
-
-}  // namespace
-
-size_t JxlDecoderGetIntendedDownsamplingRatio(JxlDecoder* dec) {
-  return dec->downsampling_target;
-}
-
-JxlDecoderStatus JxlDecoderFlushImage(JxlDecoder* dec) {
-  if (!dec->image_out_buffer_set) return JXL_DEC_ERROR;
-  if (dec->frame_stage != FrameStage::kFull) {
-    return JXL_DEC_ERROR;
-  }
-  JXL_DASSERT(dec->frame_dec);
-  if (!dec->frame_dec->HasDecodedDC()) {
-    // FrameDecoder::Flush currently requires DC to have been decoded already
-    // to work correctly.
-    return JXL_DEC_ERROR;
-  }
-
-  if (!dec->frame_dec->Flush()) {
-    return JXL_DEC_ERROR;
-  }
-
-  return JXL_DEC_SUCCESS;
-}
-
-JXL_EXPORT JxlDecoderStatus JxlDecoderSetCms(JxlDecoder* dec,
-                                             const JxlCmsInterface cms) {
-  if (!dec->passes_state) {
-    dec->passes_state =
-        jxl::make_unique<jxl::PassesDecoderState>(&dec->memory_manager);
-  }
-  dec->passes_state->output_encoding_info.color_management_system = cms;
-  dec->passes_state->output_encoding_info.cms_set = true;
-  return JXL_DEC_SUCCESS;
-}
-
-static JxlDecoderStatus GetMinSize(const JxlDecoder* dec,
-                                   const JxlPixelFormat* format,
-                                   size_t num_channels, size_t* min_size,
-                                   bool preview) {
-  size_t bits;
-  JxlDecoderStatus status = PrepareSizeCheck(dec, format, &bits);
-  if (status != JXL_DEC_SUCCESS) return status;
-  size_t xsize;
-  size_t ysize;
-  if (preview) {
-    xsize = dec->metadata.oriented_preview_xsize(dec->keep_orientation);
-    ysize = dec->metadata.oriented_preview_ysize(dec->keep_orientation);
-  } else {
-    GetCurrentDimensions(dec, xsize, ysize);
-  }
-  if (num_channels == 0) num_channels = format->num_channels;
-  size_t row_size =
-      jxl::DivCeil(xsize * num_channels * bits, jxl::kBitsPerByte);
-  size_t last_row_size = row_size;
-  if (format->align > 1) {
-    row_size = jxl::DivCeil(row_size, format->align) * format->align;
-  }
-  *min_size = row_size * (ysize - 1) + last_row_size;
-  return JXL_DEC_SUCCESS;
-}
-
-JXL_EXPORT JxlDecoderStatus JxlDecoderPreviewOutBufferSize(
-    const JxlDecoder* dec, const JxlPixelFormat* format, size_t* size) {
-  if (format->num_channels < 3 &&
-      !dec->image_metadata.color_encoding.IsGray()) {
-    return JXL_API_ERROR("Number of channels is too low for color output");
-  }
-  return GetMinSize(dec, format, 0, size, true);
-}
-
-JXL_EXPORT JxlDecoderStatus JxlDecoderSetPreviewOutBuffer(
-    JxlDecoder* dec, const JxlPixelFormat* format, void* buffer, size_t size) {
-  if (!dec->got_basic_info || !dec->metadata.m.have_preview ||
-      !(dec->orig_events_wanted & JXL_DEC_PREVIEW_IMAGE)) {
-    return JXL_API_ERROR("No preview out buffer needed at this time");
-  }
-  if (format->num_channels < 3 &&
-      !dec->image_metadata.color_encoding.IsGray()) {
-    return JXL_API_ERROR("Number of channels is too low for color output");
-  }
-
-  size_t min_size;
-  // This also checks whether the format is valid and supported and basic info
-  // is available.
-  JxlDecoderStatus status =
-      JxlDecoderPreviewOutBufferSize(dec, format, &min_size);
-  if (status != JXL_DEC_SUCCESS) return status;
-
-  if (size < min_size) return JXL_DEC_ERROR;
-
-  dec->image_out_buffer_set = true;
-  dec->image_out_buffer = buffer;
-  dec->image_out_size = size;
-  dec->image_out_format = *format;
-
-  return JXL_DEC_SUCCESS;
-}
-
-JXL_EXPORT JxlDecoderStatus JxlDecoderImageOutBufferSize(
-    const JxlDecoder* dec, const JxlPixelFormat* format, size_t* size) {
-  if (format->num_channels < 3 &&
-      !dec->image_metadata.color_encoding.IsGray()) {
-    return JXL_API_ERROR("Number of channels is too low for color output");
-  }
-
-  return GetMinSize(dec, format, 0, size, false);
-}
-
-JxlDecoderStatus JxlDecoderSetImageOutBuffer(JxlDecoder* dec,
-                                             const JxlPixelFormat* format,
-                                             void* buffer, size_t size) {
-  if (!dec->got_basic_info || !(dec->orig_events_wanted & JXL_DEC_FULL_IMAGE)) {
-    return JXL_API_ERROR("No image out buffer needed at this time");
-  }
-  if (dec->image_out_buffer_set && !!dec->image_out_run_callback) {
-    return JXL_API_ERROR(
-        "Cannot change from image out callback to image out buffer");
-  }
-  if (format->num_channels < 3 &&
-      !dec->image_metadata.color_encoding.IsGray()) {
-    return JXL_API_ERROR("Number of channels is too low for color output");
-  }
-  size_t min_size;
-  // This also checks whether the format is valid and supported and basic info
-  // is available.
-  JxlDecoderStatus status =
-      JxlDecoderImageOutBufferSize(dec, format, &min_size);
-  if (status != JXL_DEC_SUCCESS) return status;
-
-  if (size < min_size) return JXL_DEC_ERROR;
-
-  dec->image_out_buffer_set = true;
-  dec->image_out_buffer = buffer;
-  dec->image_out_size = size;
-  dec->image_out_format = *format;
-
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderExtraChannelBufferSize(const JxlDecoder* dec,
-                                                  const JxlPixelFormat* format,
-                                                  size_t* size,
-                                                  uint32_t index) {
-  if (!dec->got_basic_info || !(dec->orig_events_wanted & JXL_DEC_FULL_IMAGE)) {
-    return JXL_API_ERROR("No extra channel buffer needed at this time");
-  }
-
-  if (index >= dec->metadata.m.num_extra_channels) {
-    return JXL_API_ERROR("Invalid extra channel index");
-  }
-
-  return GetMinSize(dec, format, 1, size, false);
-}
-
-JxlDecoderStatus JxlDecoderSetExtraChannelBuffer(JxlDecoder* dec,
-                                                 const JxlPixelFormat* format,
-                                                 void* buffer, size_t size,
-                                                 uint32_t index) {
-  size_t min_size;
-  // This also checks whether the format and index are valid and supported and
-  // basic info is available.
-  JxlDecoderStatus status =
-      JxlDecoderExtraChannelBufferSize(dec, format, &min_size, index);
-  if (status != JXL_DEC_SUCCESS) return status;
-
-  if (size < min_size) return JXL_DEC_ERROR;
-
-  if (dec->extra_channel_output.size() <= index) {
-    dec->extra_channel_output.resize(dec->metadata.m.num_extra_channels,
-                                     {{}, nullptr, 0});
-  }
-  // Guaranteed correct thanks to check in JxlDecoderExtraChannelBufferSize.
-  JXL_DASSERT(dec->extra_channel_output.size() > index);
-
-  dec->extra_channel_output[index].format = *format;
-  dec->extra_channel_output[index].format.num_channels = 1;
-  dec->extra_channel_output[index].buffer = buffer;
-  dec->extra_channel_output[index].buffer_size = size;
-
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderSetImageOutCallback(JxlDecoder* dec,
-                                               const JxlPixelFormat* format,
-                                               JxlImageOutCallback callback,
-                                               void* opaque) {
-  dec->simple_image_out_callback.callback = callback;
-  dec->simple_image_out_callback.opaque = opaque;
-  const auto init_callback =
-      +[](void* init_opaque, size_t num_threads, size_t num_pixels_per_thread) {
-        // No initialization to do, just reuse init_opaque as run_opaque.
-        return init_opaque;
-      };
-  const auto run_callback =
-      +[](void* run_opaque, size_t thread_id, size_t x, size_t y,
-          size_t num_pixels, const void* pixels) {
-        const auto* const simple_callback =
-            static_cast<const JxlDecoder::SimpleImageOutCallback*>(run_opaque);
-        simple_callback->callback(simple_callback->opaque, x, y, num_pixels,
-                                  pixels);
-      };
-  const auto destroy_callback = +[](void* run_opaque) {};
-  return JxlDecoderSetMultithreadedImageOutCallback(
-      dec, format, init_callback, run_callback,
-      /*destroy_callback=*/destroy_callback, &dec->simple_image_out_callback);
-}
-
-JxlDecoderStatus JxlDecoderSetMultithreadedImageOutCallback(
-    JxlDecoder* dec, const JxlPixelFormat* format,
-    JxlImageOutInitCallback init_callback, JxlImageOutRunCallback run_callback,
-    JxlImageOutDestroyCallback destroy_callback, void* init_opaque) {
-  if (dec->image_out_buffer_set && !!dec->image_out_buffer) {
-    return JXL_API_ERROR(
-        "Cannot change from image out buffer to image out callback");
-  }
-
-  if (init_callback == nullptr || run_callback == nullptr ||
-      destroy_callback == nullptr) {
-    return JXL_API_ERROR("All callbacks are required");
-  }
-
-  // Perform error checking for invalid format.
-  size_t bits_sink;
-  JxlDecoderStatus status = PrepareSizeCheck(dec, format, &bits_sink);
-  if (status != JXL_DEC_SUCCESS) return status;
-
-  dec->image_out_buffer_set = true;
-  dec->image_out_init_callback = init_callback;
-  dec->image_out_run_callback = run_callback;
-  dec->image_out_destroy_callback = destroy_callback;
-  dec->image_out_init_opaque = init_opaque;
-  dec->image_out_format = *format;
-
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderGetFrameHeader(const JxlDecoder* dec,
-                                          JxlFrameHeader* header) {
-  if (!dec->frame_header || dec->frame_stage == FrameStage::kHeader) {
-    return JXL_API_ERROR("no frame header available");
-  }
-  const auto& metadata = dec->metadata.m;
-  memset(header, 0, sizeof(*header));
-  if (metadata.have_animation) {
-    header->duration = dec->frame_header->animation_frame.duration;
-    if (metadata.animation.have_timecodes) {
-      header->timecode = dec->frame_header->animation_frame.timecode;
-    }
-  }
-  header->name_length = dec->frame_header->name.size();
-  header->is_last = TO_JXL_BOOL(dec->frame_header->is_last);
-  size_t xsize;
-  size_t ysize;
-  GetCurrentDimensions(dec, xsize, ysize);
-  header->layer_info.xsize = xsize;
-  header->layer_info.ysize = ysize;
-  if (!dec->coalescing && dec->frame_header->custom_size_or_origin) {
-    header->layer_info.crop_x0 = dec->frame_header->frame_origin.x0;
-    header->layer_info.crop_y0 = dec->frame_header->frame_origin.y0;
-    header->layer_info.have_crop = JXL_TRUE;
-  } else {
-    header->layer_info.crop_x0 = 0;
-    header->layer_info.crop_y0 = 0;
-    header->layer_info.have_crop = JXL_FALSE;
-  }
-  if (!dec->keep_orientation && !dec->coalescing) {
-    // orient the crop offset
-    size_t W = dec->metadata.oriented_xsize(false);
-    size_t H = dec->metadata.oriented_ysize(false);
-    if (metadata.orientation > 4) {
-      std::swap(header->layer_info.crop_x0, header->layer_info.crop_y0);
-    }
-    size_t o = (metadata.orientation - 1) & 3;
-    if (o > 0 && o < 3) {
-      header->layer_info.crop_x0 = W - xsize - header->layer_info.crop_x0;
-    }
-    if (o > 1) {
-      header->layer_info.crop_y0 = H - ysize - header->layer_info.crop_y0;
-    }
-  }
-  if (dec->coalescing) {
-    header->layer_info.blend_info.blendmode = JXL_BLEND_REPLACE;
-    header->layer_info.blend_info.source = 0;
-    header->layer_info.blend_info.alpha = 0;
-    header->layer_info.blend_info.clamp = JXL_FALSE;
-    header->layer_info.save_as_reference = 0;
-  } else {
-    header->layer_info.blend_info.blendmode =
-        static_cast<JxlBlendMode>(dec->frame_header->blending_info.mode);
-    header->layer_info.blend_info.source =
-        dec->frame_header->blending_info.source;
-    header->layer_info.blend_info.alpha =
-        dec->frame_header->blending_info.alpha_channel;
-    header->layer_info.blend_info.clamp =
-        TO_JXL_BOOL(dec->frame_header->blending_info.clamp);
-    header->layer_info.save_as_reference = dec->frame_header->save_as_reference;
-  }
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderGetExtraChannelBlendInfo(const JxlDecoder* dec,
-                                                    size_t index,
-                                                    JxlBlendInfo* blend_info) {
-  if (!dec->frame_header || dec->frame_stage == FrameStage::kHeader) {
-    return JXL_API_ERROR("no frame header available");
-  }
-  const auto& metadata = dec->metadata.m;
-  if (index >= metadata.num_extra_channels) {
-    return JXL_API_ERROR("Invalid extra channel index");
-  }
-  blend_info->blendmode = static_cast<JxlBlendMode>(
-      dec->frame_header->extra_channel_blending_info[index].mode);
-  blend_info->source =
-      dec->frame_header->extra_channel_blending_info[index].source;
-  blend_info->alpha =
-      dec->frame_header->extra_channel_blending_info[index].alpha_channel;
-  blend_info->clamp =
-      TO_JXL_BOOL(dec->frame_header->extra_channel_blending_info[index].clamp);
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderGetFrameName(const JxlDecoder* dec, char* name,
-                                        size_t size) {
-  if (!dec->frame_header || dec->frame_stage == FrameStage::kHeader) {
-    return JXL_API_ERROR("no frame header available");
-  }
-  if (size < dec->frame_header->name.size() + 1) {
-    return JXL_API_ERROR("too small frame name output buffer");
-  }
-  memcpy(name, dec->frame_header->name.c_str(),
-         dec->frame_header->name.size() + 1);
-
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderSetPreferredColorProfile(
-    JxlDecoder* dec, const JxlColorEncoding* color_encoding) {
-  return JxlDecoderSetOutputColorProfile(dec, color_encoding,
-                                         /*icc_data=*/nullptr, /*icc_size=*/0);
-}
-
-JxlDecoderStatus JxlDecoderSetOutputColorProfile(
-    JxlDecoder* dec, const JxlColorEncoding* color_encoding,
-    const uint8_t* icc_data, size_t icc_size) {
-  if ((color_encoding != nullptr) && (icc_data != nullptr)) {
-    return JXL_API_ERROR("cannot set both color_encoding and icc_data");
-  }
-  if ((color_encoding == nullptr) && (icc_data == nullptr)) {
-    return JXL_API_ERROR("one of color_encoding and icc_data must be set");
-  }
-  if (!dec->got_all_headers) {
-    return JXL_API_ERROR("color info not yet available");
-  }
-  if (dec->post_headers) {
-    return JXL_API_ERROR("too late to set the color encoding");
-  }
-  if ((!dec->passes_state->output_encoding_info.cms_set) &&
-      (icc_data != nullptr)) {
-    return JXL_API_ERROR(
-        "must set color management system via JxlDecoderSetCms");
-  }
-  auto& output_encoding = dec->passes_state->output_encoding_info;
-  if (color_encoding) {
-    if (dec->image_metadata.color_encoding.IsGray() &&
-        color_encoding->color_space != JXL_COLOR_SPACE_GRAY &&
-        dec->image_out_buffer_set && dec->image_out_format.num_channels < 3) {
-      return JXL_API_ERROR("Number of channels is too low for color output");
-    }
-    if (color_encoding->color_space == JXL_COLOR_SPACE_UNKNOWN) {
-      return JXL_API_ERROR("Unknown output colorspace");
-    }
-    jxl::ColorEncoding c_out;
-    JXL_API_RETURN_IF_ERROR(c_out.FromExternal(*color_encoding));
-    JXL_API_RETURN_IF_ERROR(!c_out.ICC().empty());
-    if (!c_out.SameColorEncoding(output_encoding.color_encoding)) {
-      JXL_API_RETURN_IF_ERROR(output_encoding.MaybeSetColorEncoding(c_out));
-      dec->image_metadata.color_encoding = output_encoding.color_encoding;
-    }
-    return JXL_DEC_SUCCESS;
-  }
-  // icc_data != nullptr
-  // TODO(firsching): implement setting output color profile from icc_data.
-  jxl::ColorEncoding c_dst;
-  std::vector<uint8_t> padded_icc;
-  padded_icc.assign(icc_data, icc_data + icc_size);
-  if (!c_dst.SetICC(std::move(padded_icc),
-                    &output_encoding.color_management_system)) {
-    return JXL_API_ERROR(
-        "setting output color profile from icc_data not yet implemented.");
-  }
-  JXL_API_RETURN_IF_ERROR(
-      static_cast<int>(output_encoding.MaybeSetColorEncoding(c_dst)));
-
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderSetDesiredIntensityTarget(
-    JxlDecoder* dec, float desired_intensity_target) {
-  if (desired_intensity_target < 0) {
-    return JXL_API_ERROR("negative intensity target requested");
-  }
-  dec->desired_intensity_target = desired_intensity_target;
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderSetBoxBuffer(JxlDecoder* dec, uint8_t* data,
-                                        size_t size) {
-  if (dec->box_out_buffer_set) {
-    return JXL_API_ERROR("must release box buffer before setting it again");
-  }
-  if (!dec->box_event) {
-    return JXL_API_ERROR("can only set box buffer after box event");
-  }
-
-  dec->box_out_buffer_set = true;
-  dec->box_out_buffer_set_current_box = true;
-  dec->box_out_buffer = data;
-  dec->box_out_buffer_size = size;
-  dec->box_out_buffer_pos = 0;
-  return JXL_DEC_SUCCESS;
-}
-
-size_t JxlDecoderReleaseBoxBuffer(JxlDecoder* dec) {
-  if (!dec->box_out_buffer_set) {
-    return 0;
-  }
-  size_t result = dec->box_out_buffer_size - dec->box_out_buffer_pos;
-  dec->box_out_buffer_set = false;
-  dec->box_out_buffer = nullptr;
-  dec->box_out_buffer_size = 0;
-  if (!dec->box_out_buffer_set_current_box) {
-    dec->box_out_buffer_begin = 0;
-  } else {
-    dec->box_out_buffer_begin += dec->box_out_buffer_pos;
-  }
-  dec->box_out_buffer_set_current_box = false;
-  return result;
-}
-
-JxlDecoderStatus JxlDecoderSetDecompressBoxes(JxlDecoder* dec,
-                                              JXL_BOOL decompress) {
-  // TODO(lode): return error if libbrotli is not compiled in the jxl decoding
-  // library
-  dec->decompress_boxes = FROM_JXL_BOOL(decompress);
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderGetBoxType(JxlDecoder* dec, JxlBoxType type,
-                                      JXL_BOOL decompressed) {
-  if (!dec->box_event) {
-    return JXL_API_ERROR("can only get box info after JXL_DEC_BOX event");
-  }
-  if (decompressed) {
-    memcpy(type, dec->box_decoded_type, sizeof(dec->box_decoded_type));
-  } else {
-    memcpy(type, dec->box_type, sizeof(dec->box_type));
-  }
-
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderGetBoxSizeRaw(const JxlDecoder* dec,
-                                         uint64_t* size) {
-  if (!dec->box_event) {
-    return JXL_API_ERROR("can only get box info after JXL_DEC_BOX event");
-  }
-  if (size) {
-    *size = dec->box_size;
-  }
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderGetBoxSizeContents(const JxlDecoder* dec,
-                                              uint64_t* size) {
-  if (!dec->box_event) {
-    return JXL_API_ERROR("can only get box info after JXL_DEC_BOX event");
-  }
-  if (size) {
-    *size = dec->box_contents_size;
-  }
-  return JXL_DEC_SUCCESS;
-}
-
-JxlDecoderStatus JxlDecoderSetProgressiveDetail(JxlDecoder* dec,
-                                                JxlProgressiveDetail detail) {
-  if (detail != kDC && detail != kLastPasses && detail != kPasses) {
-    return JXL_API_ERROR(
-        "Values other than kDC (%d), kLastPasses (%d) and kPasses (%d), "
-        "like %d are not implemented.",
-        kDC, kLastPasses, kPasses, detail);
-  }
-  dec->prog_detail = detail;
-  return JXL_DEC_SUCCESS;
-}
-
-namespace {
-
-template <typename T>
-JxlDecoderStatus VerifyOutputBitDepth(JxlBitDepth bit_depth, const T& metadata,
-                                      JxlPixelFormat format) {
-  uint32_t bits_per_sample = GetBitDepth(bit_depth, metadata, format);
-  if (bits_per_sample == 0) return JXL_API_ERROR("Invalid output bit depth");
-  if (format.data_type == JXL_TYPE_UINT8 && bits_per_sample > 8) {
-    return JXL_API_ERROR("Invalid bit depth %u for uint8 output",
-                         bits_per_sample);
-  } else if (format.data_type == JXL_TYPE_UINT16 && bits_per_sample > 16) {
-    return JXL_API_ERROR("Invalid bit depth %u for uint16 output",
-                         bits_per_sample);
-  }
-  return JXL_DEC_SUCCESS;
-}
-
-}  // namespace
-
-JxlDecoderStatus JxlDecoderSetImageOutBitDepth(JxlDecoder* dec,
-                                               const JxlBitDepth* bit_depth) {
-  if (!dec->image_out_buffer_set) {
-    return JXL_API_ERROR("No image out buffer was set.");
-  }
-  JXL_API_RETURN_IF_ERROR(
-      VerifyOutputBitDepth(*bit_depth, dec->metadata.m, dec->image_out_format));
-  dec->image_out_bit_depth = *bit_depth;
-  return JXL_DEC_SUCCESS;
-}
diff --git a/third_party/jpeg-xl/lib/jxl/decode_test.cc b/third_party/jpeg-xl/lib/jxl/decode_test.cc
deleted file mode 100644
index d6e610b9a5cd6..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/decode_test.cc
+++ /dev/null
@@ -1,5679 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/dec/decode.h"
-
-#include <jxl/cms.h>
-#include <jxl/codestream_header.h>
-#include <jxl/color_encoding.h>
-#include <jxl/decode.h>
-#include <jxl/decode_cxx.h>
-#include <jxl/memory_manager.h>
-#include <jxl/parallel_runner.h>
-#include <jxl/resizable_parallel_runner.h>
-#include <jxl/resizable_parallel_runner_cxx.h>
-#include <jxl/thread_parallel_runner.h>
-#include <jxl/thread_parallel_runner_cxx.h>
-#include <jxl/types.h>
-
-#include <algorithm>
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <ostream>
-#include <set>
-#include <sstream>
-#include <string>
-#include <tuple>
-#include <utility>
-#include <vector>
-
-#include "lib/extras/dec/color_description.h"
-#include "lib/extras/enc/encode.h"
-#include "lib/extras/enc/jpg.h"
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/override.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/butteraugli/butteraugli.h"
-#include "lib/jxl/cms/color_encoding_cms.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/common.h"  // SpeedTier
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/dec_external_image.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_external_image.h"
-#include "lib/jxl/enc_fields.h"
-#include "lib/jxl/enc_frame.h"
-#include "lib/jxl/enc_icc_codec.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/enc_progressive_split.h"
-#include "lib/jxl/encode_internal.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/headers.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/jpeg/enc_jpeg_data.h"
-#include "lib/jxl/jpeg/jpeg_data.h"
-#include "lib/jxl/padded_bytes.h"
-#include "lib/jxl/test_image.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-#include "lib/jxl/toc.h"
-using ::jxl::test::GetIccTestProfile;
-////////////////////////////////////////////////////////////////////////////////
-
-namespace {
-void AppendU32BE(uint32_t u32, std::vector<uint8_t>* bytes) {
-  bytes->push_back(u32 >> 24);
-  bytes->push_back(u32 >> 16);
-  bytes->push_back(u32 >> 8);
-  bytes->push_back(u32 >> 0);
-}
-
-// What type of codestream format in the boxes to use for testing
-enum CodeStreamBoxFormat {
-  // Do not use box format at all, only pure codestream
-  kCSBF_None,
-  // Have a single codestream box, with its actual size given in the box
-  kCSBF_Single,
-  // Have a single codestream box, with box size 0 (final box running to end)
-  kCSBF_Single_Zero_Terminated,
-  // Single codestream box, with another unknown box behind it
-  kCSBF_Single_Other,
-  // Have multiple partial codestream boxes
-  kCSBF_Multi,
-  // Have multiple partial codestream boxes, with final box size 0 (running
-  // to end)
-  kCSBF_Multi_Zero_Terminated,
-  // Have multiple partial codestream boxes, terminated by non-codestream box
-  kCSBF_Multi_Other_Terminated,
-  // Have multiple partial codestream boxes, terminated by non-codestream box
-  // that has its size set to 0 (running to end)
-  kCSBF_Multi_Other_Zero_Terminated,
-  // Have multiple partial codestream boxes, and the first one has a content
-  // of zero length
-  kCSBF_Multi_First_Empty,
-  // Have multiple partial codestream boxes, and the last one has a content
-  // of zero length and there is an unknown empty box at the end
-  kCSBF_Multi_Last_Empty_Other,
-  // Have a compressed exif box before a regular codestream box
-  kCSBF_Brob_Exif,
-  // Not a value but used for counting amount of enum entries
-  kCSBF_NUM_ENTRIES,
-};
-
-// Unknown boxes for testing
-const char* unk1_box_type = "unk1";
-const char* unk1_box_contents = "abcdefghijklmnopqrstuvwxyz";
-const size_t unk1_box_size = strlen(unk1_box_contents);
-const char* unk2_box_type = "unk2";
-const char* unk2_box_contents = "0123456789";
-const size_t unk2_box_size = strlen(unk2_box_contents);
-const char* unk3_box_type = "unk3";
-const char* unk3_box_contents = "ABCDEF123456";
-const size_t unk3_box_size = strlen(unk3_box_contents);
-// Box with brob-compressed exif, including header
-const uint8_t* box_brob_exif = reinterpret_cast<const uint8_t*>(
-    "\0\0\0@brobExif\241\350\2\300\177\244v\2525\304\360\27=?\267{"
-    "\33\37\314\332\214QX17PT\"\256\0\0\202s\214\313t\333\310\320k\20\276\30"
-    "\204\277l$\326c#\1\b");
-size_t box_brob_exif_size = 64;
-// The uncompressed Exif data from the brob box
-const uint8_t* exif_uncompressed = reinterpret_cast<const uint8_t*>(
-    "\0\0\0\0MM\0*"
-    "\0\0\0\b\0\5\1\22\0\3\0\0\0\1\0\5\0\0\1\32\0\5\0\0\0\1\0\0\0J\1\33\0\5\0\0"
-    "\0\1\0\0\0R\1("
-    "\0\3\0\0\0\1\0\1\0\0\2\23\0\3\0\0\0\1\0\1\0\0\0\0\0\0\0\0\0\1\0\0\0\1\0\0"
-    "\0\1\0\0\0\1");
-size_t exif_uncompressed_size = 94;
-
-}  // namespace
-
-namespace jxl {
-namespace {
-
-void AppendTestBox(const char* type, const char* contents, size_t contents_size,
-                   bool unbounded, std::vector<uint8_t>* bytes) {
-  AppendU32BE(contents_size + 8, bytes);
-  bytes->push_back(type[0]);
-  bytes->push_back(type[1]);
-  bytes->push_back(type[2]);
-  bytes->push_back(type[3]);
-  const uint8_t* contents_u = reinterpret_cast<const uint8_t*>(contents);
-  Bytes(contents_u, contents_size).AppendTo(*bytes);
-}
-
-enum PreviewMode {
-  kNoPreview,
-  kSmallPreview,
-  kBigPreview,
-  kNumPreviewModes,
-};
-
-void GeneratePreview(PreviewMode preview_mode, ImageBundle* ib) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  if (preview_mode == kSmallPreview) {
-    ASSERT_TRUE(ib->ShrinkTo(ib->xsize() / 7, ib->ysize() / 7));
-  } else if (preview_mode == kBigPreview) {
-    auto upsample7 = [&](const ImageF& in, ImageF* out) {
-      for (size_t y = 0; y < out->ysize(); ++y) {
-        for (size_t x = 0; x < out->xsize(); ++x) {
-          out->Row(y)[x] = in.ConstRow(y / 7)[x / 7];
-        }
-      }
-    };
-    JXL_TEST_ASSIGN_OR_DIE(
-        Image3F preview,
-        Image3F::Create(memory_manager, ib->xsize() * 7, ib->ysize() * 7));
-    for (size_t c = 0; c < 3; ++c) {
-      upsample7(ib->color()->Plane(c), &preview.Plane(c));
-    }
-    std::vector<ImageF> extra_channels;
-    for (size_t i = 0; i < ib->extra_channels().size(); ++i) {
-      JXL_TEST_ASSIGN_OR_DIE(
-          ImageF ec,
-          ImageF::Create(memory_manager, ib->xsize() * 7, ib->ysize() * 7));
-      upsample7(ib->extra_channels()[i], &ec);
-      extra_channels.emplace_back(std::move(ec));
-    }
-    ib->RemoveColor();
-    ib->ClearExtraChannels();
-    ASSERT_TRUE(ib->SetFromImage(std::move(preview), ib->c_current()));
-    ASSERT_TRUE(ib->SetExtraChannels(std::move(extra_channels)));
-  }
-}
-
-struct TestCodestreamParams {
-  CompressParams cparams;
-  CodeStreamBoxFormat box_format = kCSBF_None;
-  JxlOrientation orientation = JXL_ORIENT_IDENTITY;
-  PreviewMode preview_mode = kNoPreview;
-  bool add_intrinsic_size = false;
-  bool add_icc_profile = false;
-  float intensity_target = 0.0;
-  std::string color_space;
-  std::vector<uint8_t>* jpeg_codestream = nullptr;
-};
-
-// Input pixels always given as 16-bit RGBA, 8 bytes per pixel.
-// include_alpha determines if the encoded image should contain the alpha
-// channel.
-// add_icc_profile: if false, encodes the image as sRGB using the JXL fields,
-// for grayscale or RGB images. If true, encodes the image using the ICC profile
-// returned by GetIccTestProfile, without the JXL fields, this requires the
-// image is RGB, not grayscale.
-// Providing jpeg_codestream will populate the jpeg_codestream with compressed
-// JPEG bytes, and make it possible to reconstruct those exact JPEG bytes using
-// the return value _if_ add_container indicates a box format.
-std::vector<uint8_t> CreateTestJXLCodestream(
-    Span<const uint8_t> pixels, size_t xsize, size_t ysize, size_t num_channels,
-    const TestCodestreamParams& params) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  // Compress the pixels with JPEG XL.
-  bool grayscale = (num_channels <= 2);
-  bool have_alpha = ((num_channels & 1) == 0);
-  bool include_alpha = have_alpha && params.jpeg_codestream == nullptr;
-  size_t bitdepth = params.jpeg_codestream == nullptr ? 16 : 8;
-  CodecInOut io{jxl::test::MemoryManager()};
-  EXPECT_TRUE(io.SetSize(xsize, ysize));
-  ColorEncoding color_encoding;
-  if (params.add_icc_profile) {
-    // the hardcoded ICC profile we attach requires RGB.
-    EXPECT_EQ(false, grayscale);
-    EXPECT_TRUE(params.color_space.empty());
-    EXPECT_TRUE(color_encoding.SetICC(GetIccTestProfile(), JxlGetDefaultCms()));
-  } else if (!params.color_space.empty()) {
-    JxlColorEncoding c;
-    EXPECT_TRUE(jxl::ParseDescription(params.color_space, &c));
-    EXPECT_TRUE(color_encoding.FromExternal(c));
-    EXPECT_EQ(color_encoding.IsGray(), grayscale);
-  } else {
-    color_encoding = jxl::ColorEncoding::SRGB(/*is_gray=*/grayscale);
-  }
-  io.metadata.m.SetUintSamples(bitdepth);
-  if (include_alpha) {
-    io.metadata.m.SetAlphaBits(bitdepth);
-  }
-  if (params.intensity_target != 0) {
-    io.metadata.m.SetIntensityTarget(params.intensity_target);
-  }
-  JxlPixelFormat format = {static_cast<uint32_t>(num_channels), JXL_TYPE_UINT16,
-                           JXL_BIG_ENDIAN, 0};
-  // Make the grayscale-ness of the io metadata color_encoding and the packed
-  // image match.
-  io.metadata.m.color_encoding = color_encoding;
-  EXPECT_TRUE(ConvertFromExternal(pixels, xsize, ysize, color_encoding,
-                                  /*bits_per_sample=*/16, format,
-                                  /* pool */ nullptr, &io.Main()));
-  std::vector<uint8_t> jpeg_data;
-  if (params.jpeg_codestream != nullptr) {
-    if (jxl::extras::CanDecode(jxl::extras::Codec::kJPG)) {
-      std::vector<uint8_t> jpeg_bytes;
-      extras::PackedPixelFile ppf;
-      JXL_TEST_ASSIGN_OR_DIE(extras::PackedFrame frame,
-                             extras::PackedFrame::Create(xsize, ysize, format));
-      EXPECT_TRUE(frame.color.pixels_size == pixels.size());
-      memcpy(frame.color.pixels(0, 0, 0), pixels.data(), pixels.size());
-      ppf.frames.emplace_back(std::move(frame));
-      ppf.info.xsize = xsize;
-      ppf.info.ysize = ysize;
-      ppf.info.num_color_channels = grayscale ? 1 : 3;
-      ppf.info.bits_per_sample = 16;
-      auto encoder = extras::GetJPEGEncoder();
-      encoder->SetOption("quality", "70");
-      extras::EncodedImage encoded;
-      EXPECT_TRUE(encoder->Encode(ppf, &encoded, nullptr));
-      jpeg_bytes = encoded.bitstreams[0];
-      Bytes(jpeg_bytes).AppendTo(*params.jpeg_codestream);
-      EXPECT_TRUE(jxl::jpeg::DecodeImageJPG(
-          jxl::Bytes(jpeg_bytes.data(), jpeg_bytes.size()), &io));
-      EXPECT_TRUE(EncodeJPEGData(memory_manager, *io.Main().jpeg_data,
-                                 &jpeg_data, params.cparams));
-      io.metadata.m.xyb_encoded = false;
-    } else {
-      ADD_FAILURE();
-    }
-  }
-  if (params.preview_mode) {
-    JXL_TEST_ASSIGN_OR_DIE(io.preview_frame, io.Main().Copy());
-    GeneratePreview(params.preview_mode, &io.preview_frame);
-    io.metadata.m.have_preview = true;
-    EXPECT_TRUE(io.metadata.m.preview_size.Set(io.preview_frame.xsize(),
-                                               io.preview_frame.ysize()));
-  }
-  if (params.add_intrinsic_size) {
-    EXPECT_TRUE(io.metadata.m.intrinsic_size.Set(xsize / 3, ysize / 3));
-  }
-  io.metadata.m.orientation = params.orientation;
-  std::vector<uint8_t> compressed;
-  EXPECT_TRUE(test::EncodeFile(params.cparams, &io, &compressed));
-  CodeStreamBoxFormat add_container = params.box_format;
-  if (add_container != kCSBF_None) {
-    // Header with signature box and ftyp box.
-    const uint8_t header[] = {0,    0,    0,    0xc,  0x4a, 0x58, 0x4c, 0x20,
-                              0xd,  0xa,  0x87, 0xa,  0,    0,    0,    0x14,
-                              0x66, 0x74, 0x79, 0x70, 0x6a, 0x78, 0x6c, 0x20,
-                              0,    0,    0,    0,    0x6a, 0x78, 0x6c, 0x20};
-
-    bool is_multi = add_container == kCSBF_Multi ||
-                    add_container == kCSBF_Multi_Zero_Terminated ||
-                    add_container == kCSBF_Multi_Other_Terminated ||
-                    add_container == kCSBF_Multi_Other_Zero_Terminated ||
-                    add_container == kCSBF_Multi_First_Empty ||
-                    add_container == kCSBF_Multi_Last_Empty_Other;
-
-    if (is_multi) {
-      size_t third = compressed.size() / 3;
-      std::vector<uint8_t> compressed0(compressed.data(),
-                                       compressed.data() + third);
-      std::vector<uint8_t> compressed1(compressed.data() + third,
-                                       compressed.data() + 2 * third);
-      std::vector<uint8_t> compressed2(compressed.data() + 2 * third,
-                                       compressed.data() + compressed.size());
-
-      std::vector<uint8_t> c;
-      Bytes(header).AppendTo(c);
-      if (params.jpeg_codestream != nullptr) {
-        jxl::AppendBoxHeader(jxl::MakeBoxType("jbrd"), jpeg_data.size(), false,
-                             &c);
-        Bytes(jpeg_data).AppendTo(c);
-      }
-      uint32_t jxlp_index = 0;
-      if (add_container == kCSBF_Multi_First_Empty) {
-        // Empty placeholder codestream part
-        AppendU32BE(12, &c);
-        c.push_back('j');
-        c.push_back('x');
-        c.push_back('l');
-        c.push_back('p');
-        AppendU32BE(jxlp_index++, &c);
-      }
-      // First codestream part
-      AppendU32BE(compressed0.size() + 12, &c);
-      c.push_back('j');
-      c.push_back('x');
-      c.push_back('l');
-      c.push_back('p');
-      AppendU32BE(jxlp_index++, &c);
-      Bytes(compressed0).AppendTo(c);
-      // A few non-codestream boxes in between
-      AppendTestBox(unk1_box_type, unk1_box_contents, unk1_box_size, false, &c);
-      AppendTestBox(unk2_box_type, unk2_box_contents, unk2_box_size, false, &c);
-      // Empty placeholder codestream part
-      AppendU32BE(12, &c);
-      c.push_back('j');
-      c.push_back('x');
-      c.push_back('l');
-      c.push_back('p');
-      AppendU32BE(jxlp_index++, &c);
-      // Second codestream part
-      AppendU32BE(compressed1.size() + 12, &c);
-      c.push_back('j');
-      c.push_back('x');
-      c.push_back('l');
-      c.push_back('p');
-      AppendU32BE(jxlp_index++, &c);
-      Bytes(compressed1).AppendTo(c);
-      // Third (last) codestream part
-      AppendU32BE(add_container == kCSBF_Multi_Zero_Terminated
-                      ? 0
-                      : (compressed2.size() + 12),
-                  &c);
-      c.push_back('j');
-      c.push_back('x');
-      c.push_back('l');
-      c.push_back('p');
-      if (add_container != kCSBF_Multi_Last_Empty_Other) {
-        AppendU32BE(jxlp_index++ | 0x80000000, &c);
-      } else {
-        AppendU32BE(jxlp_index++, &c);
-      }
-      Bytes(compressed2).AppendTo(c);
-      if (add_container == kCSBF_Multi_Last_Empty_Other) {
-        // Empty placeholder codestream part
-        AppendU32BE(12, &c);
-        c.push_back('j');
-        c.push_back('x');
-        c.push_back('l');
-        c.push_back('p');
-        AppendU32BE(jxlp_index++ | 0x80000000, &c);
-        AppendTestBox(unk3_box_type, unk3_box_contents, unk3_box_size, false,
-                      &c);
-      }
-      if (add_container == kCSBF_Multi_Other_Terminated) {
-        AppendTestBox(unk3_box_type, unk3_box_contents, unk3_box_size, false,
-                      &c);
-      }
-      if (add_container == kCSBF_Multi_Other_Zero_Terminated) {
-        AppendTestBox(unk3_box_type, unk3_box_contents, unk3_box_size, true,
-                      &c);
-      }
-      compressed.swap(c);
-    } else {
-      std::vector<uint8_t> c;
-      Bytes(header).AppendTo(c);
-      if (params.jpeg_codestream != nullptr) {
-        jxl::AppendBoxHeader(jxl::MakeBoxType("jbrd"), jpeg_data.size(), false,
-                             &c);
-        Bytes(jpeg_data).AppendTo(c);
-      }
-      if (add_container == kCSBF_Brob_Exif) {
-        Bytes(box_brob_exif, box_brob_exif_size).AppendTo(c);
-      }
-      AppendU32BE(add_container == kCSBF_Single_Zero_Terminated
-                      ? 0
-                      : (compressed.size() + 8),
-                  &c);
-      c.push_back('j');
-      c.push_back('x');
-      c.push_back('l');
-      c.push_back('c');
-      Bytes(compressed).AppendTo(c);
-      if (add_container == kCSBF_Single_Other) {
-        AppendTestBox(unk1_box_type, unk1_box_contents, unk1_box_size, false,
-                      &c);
-      }
-      compressed.swap(c);
-    }
-  }
-
-  return compressed;
-}
-
-JxlDecoderStatus ProcessInputIgnoreBoxes(JxlDecoder* dec) {
-  JxlDecoderStatus status = JXL_DEC_BOX;
-  while (status == JXL_DEC_BOX) {
-    status = JxlDecoderProcessInput(dec);
-  }
-  return status;
-}
-
-// Decodes one-shot with the API for non-streaming decoding tests.
-std::vector<uint8_t> DecodeWithAPI(JxlDecoder* dec,
-                                   Span<const uint8_t> compressed,
-                                   const JxlPixelFormat& format,
-                                   bool use_callback, bool set_buffer_early,
-                                   bool use_resizable_runner,
-                                   bool require_boxes, bool expect_success,
-                                   std::vector<uint8_t>* icc = nullptr) {
-  JxlThreadParallelRunnerPtr runner_fixed;
-  JxlResizableParallelRunnerPtr runner_resizable;
-  JxlParallelRunner runner_fn;
-  void* runner;
-
-  if (use_resizable_runner) {
-    runner_resizable = JxlResizableParallelRunnerMake(nullptr);
-    runner = runner_resizable.get();
-    runner_fn = JxlResizableParallelRunner;
-  } else {
-    size_t hw_threads = JxlThreadParallelRunnerDefaultNumWorkerThreads();
-    runner_fixed =
-        JxlThreadParallelRunnerMake(nullptr, std::min<size_t>(hw_threads, 16));
-    runner = runner_fixed.get();
-    runner_fn = JxlThreadParallelRunner;
-  }
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetParallelRunner(dec, runner_fn, runner));
-
-  auto process_input =
-      require_boxes ? ProcessInputIgnoreBoxes : JxlDecoderProcessInput;
-
-  EXPECT_EQ(
-      JXL_DEC_SUCCESS,
-      JxlDecoderSubscribeEvents(
-          dec, JXL_DEC_BASIC_INFO | (set_buffer_early ? JXL_DEC_FRAME : 0) |
-                   JXL_DEC_PREVIEW_IMAGE | JXL_DEC_FULL_IMAGE |
-                   (require_boxes ? JXL_DEC_BOX : 0) |
-                   (icc != nullptr ? JXL_DEC_COLOR_ENCODING : 0)));
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetInput(dec, compressed.data(), compressed.size()));
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, process_input(dec));
-  size_t buffer_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-  JxlBasicInfo info;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-  if (use_resizable_runner) {
-    JxlResizableParallelRunnerSetThreads(
-        runner,
-        JxlResizableParallelRunnerSuggestThreads(info.xsize, info.ysize));
-  }
-
-  std::vector<uint8_t> pixels(buffer_size);
-  size_t bytes_per_pixel = format.num_channels *
-                           test::GetDataBits(format.data_type) /
-                           jxl::kBitsPerByte;
-  size_t stride = bytes_per_pixel * info.xsize;
-  if (format.align > 1) {
-    stride = jxl::DivCeil(stride, format.align) * format.align;
-  }
-  auto callback = [&](size_t x, size_t y, size_t num_pixels,
-                      const void* pixels_row) {
-    memcpy(pixels.data() + stride * y + bytes_per_pixel * x, pixels_row,
-           num_pixels * bytes_per_pixel);
-  };
-
-  JxlDecoderStatus status = process_input(dec);
-
-  if (status == JXL_DEC_COLOR_ENCODING) {
-    size_t icc_size = 0;
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderGetICCProfileSize(dec, JXL_COLOR_PROFILE_TARGET_DATA,
-                                          &icc_size));
-    icc->resize(icc_size);
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderGetColorAsICCProfile(dec, JXL_COLOR_PROFILE_TARGET_DATA,
-                                             icc->data(), icc_size));
-
-    status = process_input(dec);
-  }
-
-  std::vector<uint8_t> preview;
-  if (status == JXL_DEC_NEED_PREVIEW_OUT_BUFFER) {
-    size_t buffer_size;
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderPreviewOutBufferSize(dec, &format, &buffer_size));
-    preview.resize(buffer_size);
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderSetPreviewOutBuffer(dec, &format, preview.data(),
-                                            preview.size()));
-    EXPECT_EQ(JXL_DEC_PREVIEW_IMAGE, process_input(dec));
-
-    status = process_input(dec);
-  }
-
-  if (set_buffer_early) {
-    EXPECT_EQ(JXL_DEC_FRAME, status);
-  } else {
-    EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, status);
-  }
-
-  if (use_callback) {
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderSetImageOutCallback(
-                  dec, &format,
-                  [](void* opaque, size_t x, size_t y, size_t xsize,
-                     const void* pixels_row) {
-                    auto cb = static_cast<decltype(&callback)>(opaque);
-                    (*cb)(x, y, xsize, pixels_row);
-                  },
-                  /*opaque=*/&callback));
-  } else {
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(
-                                   dec, &format, pixels.data(), pixels.size()));
-  }
-
-  EXPECT_EQ(JXL_DEC_FULL_IMAGE, process_input(dec));
-
-  // After the full image was output, JxlDecoderProcessInput should return
-  // success to indicate all is done, unless we requested boxes and the last
-  // box was not a terminal unbounded box, in which case it should ask for
-  // more input.
-  JxlDecoderStatus expected_status =
-      expect_success ? JXL_DEC_SUCCESS : JXL_DEC_NEED_MORE_INPUT;
-  EXPECT_EQ(expected_status, process_input(dec));
-
-  return pixels;
-}
-
-// Decodes one-shot with the API for non-streaming decoding tests.
-std::vector<uint8_t> DecodeWithAPI(Span<const uint8_t> compressed,
-                                   const JxlPixelFormat& format,
-                                   bool use_callback, bool set_buffer_early,
-                                   bool use_resizable_runner,
-                                   bool require_boxes, bool expect_success) {
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-  std::vector<uint8_t> pixels =
-      DecodeWithAPI(dec, compressed, format, use_callback, set_buffer_early,
-                    use_resizable_runner, require_boxes, expect_success);
-  JxlDecoderDestroy(dec);
-  return pixels;
-}
-
-}  // namespace
-}  // namespace jxl
-
-////////////////////////////////////////////////////////////////////////////////
-
-using ::jxl::Image3F;
-using ::jxl::ImageF;
-using ::jxl::test::BoolToCStr;
-using ::jxl::test::ButteraugliDistance;
-
-TEST(DecodeTest, JxlSignatureCheckTest) {
-  std::vector<std::pair<int, std::vector<uint8_t>>> tests = {
-      // No JPEGXL header starts with 'a'.
-      {JXL_SIG_INVALID, {'a'}},
-      {JXL_SIG_INVALID, {'a', 'b', 'c', 'd', 'e', 'f'}},
-
-      // Empty file is not enough bytes.
-      {JXL_SIG_NOT_ENOUGH_BYTES, {}},
-
-      // JPEGXL headers.
-      {JXL_SIG_NOT_ENOUGH_BYTES, {0xff}},  // Part of a signature.
-      {JXL_SIG_INVALID, {0xff, 0xD8}},     // JPEG-1
-      {JXL_SIG_CODESTREAM, {0xff, 0x0a}},
-
-      // JPEGXL container file.
-      {JXL_SIG_CONTAINER,
-       {0, 0, 0, 0xc, 'J', 'X', 'L', ' ', 0xD, 0xA, 0x87, 0xA}},
-      // Ending with invalid byte.
-      {JXL_SIG_INVALID, {0, 0, 0, 0xc, 'J', 'X', 'L', ' ', 0xD, 0xA, 0x87, 0}},
-      // Part of signature.
-      {JXL_SIG_NOT_ENOUGH_BYTES,
-       {0, 0, 0, 0xc, 'J', 'X', 'L', ' ', 0xD, 0xA, 0x87}},
-      {JXL_SIG_NOT_ENOUGH_BYTES, {0}},
-  };
-  for (const auto& test : tests) {
-    EXPECT_EQ(test.first,
-              JxlSignatureCheck(test.second.data(), test.second.size()))
-        << "Where test data is " << ::testing::PrintToString(test.second);
-  }
-}
-
-TEST(DecodeTest, DefaultAllocTest) {
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-  EXPECT_NE(nullptr, dec);
-  JxlDecoderDestroy(dec);
-}
-
-TEST(DecodeTest, CustomAllocTest) {
-  struct CalledCounters {
-    int allocs = 0;
-    int frees = 0;
-  } counters;
-
-  JxlMemoryManager mm;
-  mm.opaque = &counters;
-  mm.alloc = [](void* opaque, size_t size) {
-    reinterpret_cast<CalledCounters*>(opaque)->allocs++;
-    return malloc(size);
-  };
-  mm.free = [](void* opaque, void* address) {
-    reinterpret_cast<CalledCounters*>(opaque)->frees++;
-    free(address);
-  };
-
-  JxlDecoder* dec = JxlDecoderCreate(&mm);
-  EXPECT_NE(nullptr, dec);
-  EXPECT_LE(1, counters.allocs);
-  EXPECT_EQ(0, counters.frees);
-  JxlDecoderDestroy(dec);
-  EXPECT_LE(1, counters.frees);
-}
-
-// TODO(lode): add multi-threaded test when multithreaded pixel decoding from
-// API is implemented.
-TEST(DecodeTest, DefaultParallelRunnerTest) {
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-  EXPECT_NE(nullptr, dec);
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetParallelRunner(dec, nullptr, nullptr));
-  JxlDecoderDestroy(dec);
-}
-
-// Creates the header of a JPEG XL file with various custom parameters for
-// testing.
-// xsize, ysize: image dimensions to store in the SizeHeader, max 512.
-// bits_per_sample, orientation: a selection of header parameters to test with.
-// orientation: image orientation to set in the metadata
-// alpha_bits: if non-0, alpha extra channel bits to set in the metadata. Also
-//   gives the alpha channel the name "alpha_test"
-// have_container: add box container format around the codestream.
-// metadata_default: if true, ImageMetadata is set to default and
-//   bits_per_sample, orientation and alpha_bits are ignored.
-// insert_box: insert an extra box before the codestream box, making the header
-// farther away from the front than is ideal. Only used if have_container.
-std::vector<uint8_t> GetTestHeader(size_t xsize, size_t ysize,
-                                   size_t bits_per_sample, size_t orientation,
-                                   size_t alpha_bits, bool xyb_encoded,
-                                   bool have_container, bool metadata_default,
-                                   bool insert_extra_box,
-                                   const jxl::IccBytes& icc_profile) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  jxl::BitWriter writer{memory_manager};
-  EXPECT_TRUE(writer.WithMaxBits(
-      65536,  // Large enough
-      jxl::LayerType::Header, nullptr, [&] {
-        if (have_container) {
-          const std::vector<uint8_t> signature_box = {
-              0, 0, 0, 0xc, 'J', 'X', 'L', ' ', 0xd, 0xa, 0x87, 0xa};
-          const std::vector<uint8_t> filetype_box = {
-              0,   0,   0, 0x14, 'f', 't', 'y', 'p', 'j', 'x',
-              'l', ' ', 0, 0,    0,   0,   'j', 'x', 'l', ' '};
-          const std::vector<uint8_t> extra_box_header = {0,   0,   0,   0xff,
-                                                         't', 'e', 's', 't'};
-          // Beginning of codestream box, with an arbitrary size certainly large
-          // enough to contain the header
-          const std::vector<uint8_t> codestream_box_header = {
-              0, 0, 0, 0xff, 'j', 'x', 'l', 'c'};
-
-          for (uint8_t c : signature_box) {
-            writer.Write(8, c);
-          }
-          for (uint8_t c : filetype_box) {
-            writer.Write(8, c);
-          }
-          if (insert_extra_box) {
-            for (uint8_t c : extra_box_header) {
-              writer.Write(8, c);
-            }
-            for (size_t i = 0; i < 255 - 8; i++) {
-              writer.Write(8, 0);
-            }
-          }
-          for (uint8_t c : codestream_box_header) {
-            writer.Write(8, c);
-          }
-        }
-
-        // JXL signature
-        writer.Write(8, 0xff);
-        writer.Write(8, 0x0a);
-
-        // SizeHeader
-        jxl::CodecMetadata metadata;
-        EXPECT_TRUE(metadata.size.Set(xsize, ysize));
-        EXPECT_TRUE(WriteSizeHeader(metadata.size, &writer,
-                                    jxl::LayerType::Header, nullptr));
-
-        if (!metadata_default) {
-          metadata.m.SetUintSamples(bits_per_sample);
-          metadata.m.orientation = orientation;
-          metadata.m.SetAlphaBits(alpha_bits);
-          metadata.m.xyb_encoded = xyb_encoded;
-          if (alpha_bits != 0) {
-            metadata.m.extra_channel_info[0].name = "alpha_test";
-          }
-        }
-
-        if (!icc_profile.empty()) {
-          jxl::IccBytes copy = icc_profile;
-          EXPECT_TRUE(metadata.m.color_encoding.SetICC(std::move(copy),
-                                                       JxlGetDefaultCms()));
-        }
-
-        EXPECT_TRUE(jxl::Bundle::Write(metadata.m, &writer,
-                                       jxl::LayerType::Header, nullptr));
-        metadata.transform_data.nonserialized_xyb_encoded =
-            metadata.m.xyb_encoded;
-        EXPECT_TRUE(jxl::Bundle::Write(metadata.transform_data, &writer,
-                                       jxl::LayerType::Header, nullptr));
-
-        if (!icc_profile.empty()) {
-          EXPECT_TRUE(metadata.m.color_encoding.WantICC());
-          EXPECT_TRUE(jxl::WriteICC(jxl::Span<const uint8_t>(icc_profile),
-                                    &writer, jxl::LayerType::Header, nullptr));
-        }
-
-        writer.ZeroPadToByte();
-        return true;
-      }));
-  jxl::Bytes bytes = writer.GetSpan();
-  return std::vector<uint8_t>(bytes.data(), bytes.data() + bytes.size());
-}
-
-TEST(DecodeTest, BasicInfoTest) {
-  size_t xsize[2] = {50, 33};
-  size_t ysize[2] = {50, 77};
-  size_t bits_per_sample[2] = {8, 23};
-  size_t orientation[2] = {3, 5};
-  size_t alpha_bits[2] = {0, 8};
-  bool have_container[2] = {false, true};
-  bool xyb_encoded = false;
-
-  std::vector<std::vector<uint8_t>> test_samples;
-  // Test with direct codestream
-  test_samples.push_back(GetTestHeader(
-      xsize[0], ysize[0], bits_per_sample[0], orientation[0], alpha_bits[0],
-      xyb_encoded, have_container[0], /*metadata_default=*/false,
-      /*insert_extra_box=*/false, {}));
-  // Test with container and different parameters
-  test_samples.push_back(GetTestHeader(
-      xsize[1], ysize[1], bits_per_sample[1], orientation[1], alpha_bits[1],
-      xyb_encoded, have_container[1], /*metadata_default=*/false,
-      /*insert_extra_box=*/false, {}));
-
-  for (size_t i = 0; i < test_samples.size(); ++i) {
-    const std::vector<uint8_t>& data = test_samples[i];
-    // Test decoding too small header first, until we reach the final byte.
-    for (size_t size = 0; size <= data.size(); ++size) {
-      // Test with a new decoder for each tested byte size.
-      JxlDecoder* dec = JxlDecoderCreate(nullptr);
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderSubscribeEvents(dec, JXL_DEC_BASIC_INFO));
-      const uint8_t* next_in = data.data();
-      size_t avail_in = size;
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-      JxlDecoderStatus status = JxlDecoderProcessInput(dec);
-
-      JxlBasicInfo info;
-      JxlDecoderStatus bi_status = JxlDecoderGetBasicInfo(dec, &info);
-      bool have_basic_info = (bi_status == JXL_DEC_SUCCESS);
-
-      if (size == data.size()) {
-        EXPECT_EQ(JXL_DEC_BASIC_INFO, status);
-
-        // All header bytes given so the decoder must have the basic info.
-        EXPECT_EQ(true, have_basic_info);
-        EXPECT_EQ(have_container[i], FROM_JXL_BOOL(info.have_container));
-        EXPECT_EQ(alpha_bits[i], info.alpha_bits);
-        // Orientations 5..8 swap the dimensions
-        if (orientation[i] >= 5) {
-          EXPECT_EQ(xsize[i], info.ysize);
-          EXPECT_EQ(ysize[i], info.xsize);
-        } else {
-          EXPECT_EQ(xsize[i], info.xsize);
-          EXPECT_EQ(ysize[i], info.ysize);
-        }
-        // The API should set the orientation to identity by default since it
-        // already applies the transformation internally by default.
-        EXPECT_EQ(1u, info.orientation);
-
-        EXPECT_EQ(3u, info.num_color_channels);
-
-        if (alpha_bits[i] != 0) {
-          // Expect an extra channel
-          EXPECT_EQ(1u, info.num_extra_channels);
-          JxlExtraChannelInfo extra;
-          EXPECT_EQ(0, JxlDecoderGetExtraChannelInfo(dec, 0, &extra));
-          EXPECT_EQ(alpha_bits[i], extra.bits_per_sample);
-          EXPECT_EQ(JXL_CHANNEL_ALPHA, extra.type);
-          EXPECT_EQ(0, extra.alpha_premultiplied);
-          // Verify the name "alpha_test" given to the alpha channel
-          EXPECT_EQ(10u, extra.name_length);
-          char name[11];
-          EXPECT_EQ(0,
-                    JxlDecoderGetExtraChannelName(dec, 0, name, sizeof(name)));
-          EXPECT_EQ(std::string("alpha_test"), std::string(name));
-        } else {
-          EXPECT_EQ(0u, info.num_extra_channels);
-        }
-
-        EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderProcessInput(dec));
-      } else {
-        // If we did not give the full header, the basic info should not be
-        // available. Allow a few bytes of slack due to some bits for default
-        // opsinmatrix/extension bits.
-        if (size + 2 < data.size()) {
-          EXPECT_EQ(false, have_basic_info);
-          EXPECT_EQ(JXL_DEC_NEED_MORE_INPUT, status);
-        }
-      }
-
-      // Test that decoder doesn't allow setting a setting required at beginning
-      // unless it's reset
-      EXPECT_EQ(JXL_DEC_ERROR,
-                JxlDecoderSubscribeEvents(dec, JXL_DEC_BASIC_INFO));
-      JxlDecoderReset(dec);
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderSubscribeEvents(dec, JXL_DEC_BASIC_INFO));
-
-      JxlDecoderDestroy(dec);
-    }
-  }
-}
-
-TEST(DecodeTest, BufferSizeTest) {
-  size_t xsize = 33;
-  size_t ysize = 77;
-  size_t bits_per_sample = 8;
-  size_t orientation = 1;
-  size_t alpha_bits = 8;
-  bool have_container = false;
-  bool xyb_encoded = false;
-
-  std::vector<uint8_t> header =
-      GetTestHeader(xsize, ysize, bits_per_sample, orientation, alpha_bits,
-                    xyb_encoded, have_container, /*metadata_default=*/false,
-                    /*insert_extra_box=*/false, {});
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(dec, JXL_DEC_BASIC_INFO));
-  const uint8_t* next_in = header.data();
-  size_t avail_in = header.size();
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-  JxlDecoderStatus status = JxlDecoderProcessInput(dec);
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, status);
-
-  JxlBasicInfo info;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-  EXPECT_EQ(xsize, info.xsize);
-  EXPECT_EQ(ysize, info.ysize);
-
-  JxlPixelFormat format = {4, JXL_TYPE_UINT8, JXL_LITTLE_ENDIAN, 0};
-  size_t image_out_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderImageOutBufferSize(dec, &format, &image_out_size));
-  EXPECT_EQ(xsize * ysize * 4, image_out_size);
-
-  JxlDecoderDestroy(dec);
-}
-
-TEST(DecodeTest, BasicInfoSizeHintTest) {
-  // Test on a file where the size hint is too small initially due to inserting
-  // a box before the codestream (something that is normally not recommended)
-  size_t xsize = 50;
-  size_t ysize = 50;
-  size_t bits_per_sample = 16;
-  size_t orientation = 1;
-  size_t alpha_bits = 0;
-  bool xyb_encoded = false;
-  std::vector<uint8_t> data = GetTestHeader(
-      xsize, ysize, bits_per_sample, orientation, alpha_bits, xyb_encoded,
-      /*have_container=*/true, /*metadata_default=*/false,
-      /*insert_extra_box=*/true, {});
-
-  JxlDecoderStatus status;
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(dec, JXL_DEC_BASIC_INFO));
-
-  size_t hint0 = JxlDecoderSizeHintBasicInfo(dec);
-  // Test that the test works as intended: we construct a file on purpose to
-  // be larger than the first hint by having that extra box.
-  EXPECT_LT(hint0, data.size());
-  const uint8_t* next_in = data.data();
-  // Do as if we have only as many bytes as indicated by the hint available
-  size_t avail_in = std::min(hint0, data.size());
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-  status = JxlDecoderProcessInput(dec);
-  EXPECT_EQ(JXL_DEC_NEED_MORE_INPUT, status);
-  // Basic info cannot be available yet due to the extra inserted box.
-  EXPECT_EQ(false, !JxlDecoderGetBasicInfo(dec, nullptr));
-
-  size_t num_read = avail_in - JxlDecoderReleaseInput(dec);
-  EXPECT_LT(num_read, data.size());
-
-  size_t hint1 = JxlDecoderSizeHintBasicInfo(dec);
-  // The hint must be larger than the previous hint (taking already processed
-  // bytes into account, the hint is a hint for the next avail_in) since the
-  // decoder now knows there is a box in between.
-  EXPECT_GT(hint1 + num_read, hint0);
-  avail_in = std::min<size_t>(hint1, data.size() - num_read);
-  next_in += num_read;
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-  status = JxlDecoderProcessInput(dec);
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, status);
-  JxlBasicInfo info;
-  // We should have the basic info now, since we only added one box in-between,
-  // and the decoder should have known its size, its implementation can return
-  // a correct hint.
-  EXPECT_EQ(true, !JxlDecoderGetBasicInfo(dec, &info));
-
-  // Also test if the basic info is correct.
-  EXPECT_EQ(1, info.have_container);
-  EXPECT_EQ(xsize, info.xsize);
-  EXPECT_EQ(ysize, info.ysize);
-  EXPECT_EQ(orientation, info.orientation);
-  EXPECT_EQ(bits_per_sample, info.bits_per_sample);
-
-  JxlDecoderDestroy(dec);
-}
-
-std::vector<uint8_t> GetIccTestHeader(const jxl::IccBytes& icc_profile,
-                                      bool xyb_encoded) {
-  size_t xsize = 50;
-  size_t ysize = 50;
-  size_t bits_per_sample = 16;
-  size_t orientation = 1;
-  size_t alpha_bits = 0;
-  return GetTestHeader(xsize, ysize, bits_per_sample, orientation, alpha_bits,
-                       xyb_encoded,
-                       /*have_container=*/false, /*metadata_default=*/false,
-                       /*insert_extra_box=*/false, icc_profile);
-}
-
-// Tests the case where pixels and metadata ICC profile are the same
-TEST(DecodeTest, IccProfileTestOriginal) {
-  jxl::IccBytes icc_profile = GetIccTestProfile();
-  bool xyb_encoded = false;
-  std::vector<uint8_t> data = GetIccTestHeader(icc_profile, xyb_encoded);
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(
-                dec, JXL_DEC_BASIC_INFO | JXL_DEC_COLOR_ENCODING));
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, data.data(), data.size()));
-
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-
-  // Expect the opposite of xyb_encoded for uses_original_profile
-  JxlBasicInfo info;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-  EXPECT_EQ(JXL_TRUE, info.uses_original_profile);
-
-  EXPECT_EQ(JXL_DEC_COLOR_ENCODING, JxlDecoderProcessInput(dec));
-
-  // the encoded color profile expected to be not available, since the image
-  // has an ICC profile instead
-  EXPECT_EQ(JXL_DEC_ERROR,
-            JxlDecoderGetColorAsEncodedProfile(
-                dec, JXL_COLOR_PROFILE_TARGET_ORIGINAL, nullptr));
-
-  size_t dec_profile_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderGetICCProfileSize(dec, JXL_COLOR_PROFILE_TARGET_ORIGINAL,
-                                        &dec_profile_size));
-
-  // Check that can get return status with NULL size
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderGetICCProfileSize(dec, JXL_COLOR_PROFILE_TARGET_ORIGINAL,
-                                        nullptr));
-
-  // The profiles must be equal. This requires they have equal size, and if
-  // they do, we can get the profile and compare the contents.
-  EXPECT_EQ(icc_profile.size(), dec_profile_size);
-  if (icc_profile.size() == dec_profile_size) {
-    jxl::IccBytes icc_profile2(icc_profile.size());
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetColorAsICCProfile(
-                                   dec, JXL_COLOR_PROFILE_TARGET_ORIGINAL,
-                                   icc_profile2.data(), icc_profile2.size()));
-    EXPECT_EQ(icc_profile, icc_profile2);
-  }
-
-  // the data is not xyb_encoded, so same result expected for the pixel data
-  // color profile
-  EXPECT_EQ(JXL_DEC_ERROR, JxlDecoderGetColorAsEncodedProfile(
-                               dec, JXL_COLOR_PROFILE_TARGET_DATA, nullptr));
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderGetICCProfileSize(dec, JXL_COLOR_PROFILE_TARGET_DATA,
-                                        &dec_profile_size));
-  EXPECT_EQ(icc_profile.size(), dec_profile_size);
-
-  JxlDecoderDestroy(dec);
-}
-
-// Tests the case where pixels and metadata ICC profile are different
-TEST(DecodeTest, IccProfileTestXybEncoded) {
-  jxl::IccBytes icc_profile = GetIccTestProfile();
-  bool xyb_encoded = true;
-  std::vector<uint8_t> data = GetIccTestHeader(icc_profile, xyb_encoded);
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(
-                dec, JXL_DEC_BASIC_INFO | JXL_DEC_COLOR_ENCODING));
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, data.data(), data.size()));
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-
-  // Expect the opposite of xyb_encoded for uses_original_profile
-  JxlBasicInfo info;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-  EXPECT_EQ(JXL_FALSE, info.uses_original_profile);
-
-  EXPECT_EQ(JXL_DEC_COLOR_ENCODING, JxlDecoderProcessInput(dec));
-
-  // the encoded color profile expected to be not available, since the image
-  // has an ICC profile instead
-  EXPECT_EQ(JXL_DEC_ERROR,
-            JxlDecoderGetColorAsEncodedProfile(
-                dec, JXL_COLOR_PROFILE_TARGET_ORIGINAL, nullptr));
-
-  // Check that can get return status with NULL size
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderGetICCProfileSize(dec, JXL_COLOR_PROFILE_TARGET_ORIGINAL,
-                                        nullptr));
-
-  size_t dec_profile_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderGetICCProfileSize(dec, JXL_COLOR_PROFILE_TARGET_ORIGINAL,
-                                        &dec_profile_size));
-
-  // The profiles must be equal. This requires they have equal size, and if
-  // they do, we can get the profile and compare the contents.
-  EXPECT_EQ(icc_profile.size(), dec_profile_size);
-  if (icc_profile.size() == dec_profile_size) {
-    jxl::IccBytes icc_profile2(icc_profile.size());
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetColorAsICCProfile(
-                                   dec, JXL_COLOR_PROFILE_TARGET_ORIGINAL,
-                                   icc_profile2.data(), icc_profile2.size()));
-    EXPECT_EQ(icc_profile, icc_profile2);
-  }
-
-  // Data is xyb_encoded, so the data profile is a different profile, encoded
-  // as structured profile.
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetColorAsEncodedProfile(
-                                 dec, JXL_COLOR_PROFILE_TARGET_DATA, nullptr));
-  JxlColorEncoding pixel_encoding;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderGetColorAsEncodedProfile(
-                dec, JXL_COLOR_PROFILE_TARGET_DATA, &pixel_encoding));
-  EXPECT_EQ(JXL_PRIMARIES_SRGB, pixel_encoding.primaries);
-  // The API returns LINEAR by default when the colorspace cannot be represented
-  // by enum values.
-  EXPECT_EQ(JXL_TRANSFER_FUNCTION_LINEAR, pixel_encoding.transfer_function);
-
-  // Test the same but with integer format.
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderGetColorAsEncodedProfile(
-                dec, JXL_COLOR_PROFILE_TARGET_DATA, &pixel_encoding));
-  EXPECT_EQ(JXL_PRIMARIES_SRGB, pixel_encoding.primaries);
-  EXPECT_EQ(JXL_TRANSFER_FUNCTION_LINEAR, pixel_encoding.transfer_function);
-
-  // Test after setting the preferred color profile to non-linear sRGB:
-  // for XYB images with ICC profile, this setting is expected to take effect.
-  jxl::ColorEncoding temp_jxl_srgb = jxl::ColorEncoding::SRGB(false);
-  JxlColorEncoding pixel_encoding_srgb = temp_jxl_srgb.ToExternal();
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetPreferredColorProfile(dec, &pixel_encoding_srgb));
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderGetColorAsEncodedProfile(
-                dec, JXL_COLOR_PROFILE_TARGET_DATA, &pixel_encoding));
-  EXPECT_EQ(JXL_TRANSFER_FUNCTION_SRGB, pixel_encoding.transfer_function);
-
-  // The decoder can also output this as a generated ICC profile anyway, and
-  // we're certain that it will differ from the above defined profile since
-  // the sRGB data should not have swapped R/G/B primaries.
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderGetICCProfileSize(dec, JXL_COLOR_PROFILE_TARGET_DATA,
-                                        &dec_profile_size));
-  // We don't need to dictate exactly what size the generated ICC profile
-  // must be (since there are many ways to represent the same color space),
-  // but it should not be zero.
-  EXPECT_NE(0u, dec_profile_size);
-  jxl::IccBytes icc_profile2(dec_profile_size);
-  if (0 != dec_profile_size) {
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetColorAsICCProfile(
-                                   dec, JXL_COLOR_PROFILE_TARGET_DATA,
-                                   icc_profile2.data(), icc_profile2.size()));
-    // expected not equal
-    EXPECT_NE(icc_profile, icc_profile2);
-  }
-
-  // Test setting another different preferred profile, to verify that the
-  // returned JXL_COLOR_PROFILE_TARGET_DATA ICC profile is correctly
-  // updated.
-
-  jxl::ColorEncoding temp_jxl_linear = jxl::ColorEncoding::LinearSRGB(false);
-  JxlColorEncoding pixel_encoding_linear = temp_jxl_linear.ToExternal();
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetPreferredColorProfile(dec, &pixel_encoding_linear));
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderGetColorAsEncodedProfile(
-                dec, JXL_COLOR_PROFILE_TARGET_DATA, &pixel_encoding));
-  EXPECT_EQ(JXL_TRANSFER_FUNCTION_LINEAR, pixel_encoding.transfer_function);
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderGetICCProfileSize(dec, JXL_COLOR_PROFILE_TARGET_DATA,
-                                        &dec_profile_size));
-  EXPECT_NE(0u, dec_profile_size);
-  jxl::IccBytes icc_profile3(dec_profile_size);
-  if (0 != dec_profile_size) {
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetColorAsICCProfile(
-                                   dec, JXL_COLOR_PROFILE_TARGET_DATA,
-                                   icc_profile3.data(), icc_profile3.size()));
-    // expected not equal to the previously set preferred profile.
-    EXPECT_NE(icc_profile2, icc_profile3);
-  }
-
-  JxlDecoderDestroy(dec);
-}
-
-// Test decoding ICC from partial files byte for byte.
-// This test must pass also if JXL_CRASH_ON_ERROR is enabled, that is, the
-// decoding of the ANS histogram and stream of the encoded ICC profile must also
-// handle the case of not enough input bytes with StatusCode::kNotEnoughBytes
-// rather than fatal error status codes.
-TEST(DecodeTest, ICCPartialTest) {
-  jxl::IccBytes icc_profile = GetIccTestProfile();
-  std::vector<uint8_t> data = GetIccTestHeader(icc_profile, false);
-
-  const uint8_t* next_in = data.data();
-  size_t avail_in = 0;
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(
-                dec, JXL_DEC_BASIC_INFO | JXL_DEC_COLOR_ENCODING));
-
-  bool seen_basic_info = false;
-  bool seen_color_encoding = false;
-  size_t total_size = 0;
-
-  for (;;) {
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-    JxlDecoderStatus status = JxlDecoderProcessInput(dec);
-    size_t remaining = JxlDecoderReleaseInput(dec);
-    EXPECT_LE(remaining, avail_in);
-    next_in += avail_in - remaining;
-    avail_in = remaining;
-    if (status == JXL_DEC_NEED_MORE_INPUT) {
-      if (total_size >= data.size()) {
-        // End of partial codestream with codestrema headers and ICC profile
-        // reached, it should not require more input since full image is not
-        // requested
-        FAIL();
-        break;
-      }
-      size_t increment = 1;
-      if (total_size + increment > data.size()) {
-        increment = data.size() - total_size;
-      }
-      total_size += increment;
-      avail_in += increment;
-    } else if (status == JXL_DEC_BASIC_INFO) {
-      EXPECT_FALSE(seen_basic_info);
-      seen_basic_info = true;
-    } else if (status == JXL_DEC_COLOR_ENCODING) {
-      EXPECT_TRUE(seen_basic_info);
-      EXPECT_FALSE(seen_color_encoding);
-      seen_color_encoding = true;
-
-      // Sanity check that the ICC profile was decoded correctly
-      size_t dec_profile_size;
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderGetICCProfileSize(
-                    dec, JXL_COLOR_PROFILE_TARGET_ORIGINAL, &dec_profile_size));
-      EXPECT_EQ(icc_profile.size(), dec_profile_size);
-
-    } else if (status == JXL_DEC_SUCCESS) {
-      EXPECT_TRUE(seen_color_encoding);
-      break;
-    } else {
-      // We do not expect any other events or errors
-      FAIL();
-      break;
-    }
-  }
-
-  EXPECT_TRUE(seen_basic_info);
-  EXPECT_TRUE(seen_color_encoding);
-
-  JxlDecoderDestroy(dec);
-}
-
-struct PixelTestConfig {
-  // Input image definition.
-  bool grayscale;
-  bool include_alpha;
-  size_t xsize;
-  size_t ysize;
-  jxl::PreviewMode preview_mode;
-  bool add_intrinsic_size;
-  // Output format.
-  JxlEndianness endianness;
-  JxlDataType data_type;
-  uint32_t output_channels;
-  // Container options.
-  CodeStreamBoxFormat add_container;
-  // Decoding mode.
-  bool use_callback;
-  bool set_buffer_early;
-  bool use_resizable_runner;
-  // Exif orientation, 1-8
-  JxlOrientation orientation;
-  bool keep_orientation;
-  size_t upsampling;
-};
-
-class DecodeTestParam : public ::testing::TestWithParam<PixelTestConfig> {};
-
-TEST_P(DecodeTestParam, PixelTest) {
-  PixelTestConfig config = GetParam();
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-  if (config.keep_orientation) {
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetKeepOrientation(dec, JXL_TRUE));
-  }
-
-  size_t num_pixels = config.xsize * config.ysize;
-  uint32_t orig_channels =
-      (config.grayscale ? 1 : 3) + (config.include_alpha ? 1 : 0);
-  std::vector<uint8_t> pixels =
-      jxl::test::GetSomeTestImage(config.xsize, config.ysize, orig_channels, 0);
-  JxlPixelFormat format_orig = {orig_channels, JXL_TYPE_UINT16, JXL_BIG_ENDIAN,
-                                0};
-  jxl::TestCodestreamParams params;
-  // Lossless to verify pixels exactly after roundtrip.
-  params.cparams.SetLossless();
-  params.cparams.speed_tier = jxl::SpeedTier::kThunder;
-  params.cparams.resampling = config.upsampling;
-  params.cparams.ec_resampling = config.upsampling;
-  params.box_format = config.add_container;
-  params.orientation = config.orientation;
-  params.preview_mode = config.preview_mode;
-  params.add_intrinsic_size = config.add_intrinsic_size;
-  std::vector<uint8_t> compressed = jxl::CreateTestJXLCodestream(
-      jxl::Bytes(pixels.data(), pixels.size()), config.xsize, config.ysize,
-      orig_channels, params);
-
-  JxlPixelFormat format = {config.output_channels, config.data_type,
-                           config.endianness, 0};
-
-  bool swap_xy = !config.keep_orientation && (config.orientation > 4);
-  size_t xsize = swap_xy ? config.ysize : config.xsize;
-  size_t ysize = swap_xy ? config.xsize : config.ysize;
-
-  std::vector<uint8_t> pixels2 =
-      jxl::DecodeWithAPI(dec, jxl::Bytes(compressed.data(), compressed.size()),
-                         format, config.use_callback, config.set_buffer_early,
-                         config.use_resizable_runner, /*require_boxes=*/false,
-                         /*expect_success=*/true);
-  JxlDecoderReset(dec);
-  EXPECT_EQ(num_pixels * config.output_channels *
-                jxl::test::GetDataBits(config.data_type) / jxl::kBitsPerByte,
-            pixels2.size());
-
-  // If an orientation transformation is expected, to compare the pixels, also
-  // apply this transformation to the original pixels. ConvertToExternal is
-  // used to achieve this, with a temporary conversion to CodecInOut and back.
-  if (config.orientation > 1 && !config.keep_orientation) {
-    jxl::Span<const uint8_t> bytes(pixels.data(), pixels.size());
-    jxl::ColorEncoding color_encoding =
-        jxl::ColorEncoding::SRGB(config.grayscale);
-
-    jxl::CodecInOut io{jxl::test::MemoryManager()};
-    if (config.include_alpha) io.metadata.m.SetAlphaBits(16);
-    io.metadata.m.color_encoding = color_encoding;
-    ASSERT_TRUE(io.SetSize(config.xsize, config.ysize));
-
-    EXPECT_TRUE(ConvertFromExternal(bytes, config.xsize, config.ysize,
-                                    color_encoding, 16, format_orig, nullptr,
-                                    &io.Main()));
-
-    for (uint8_t& pixel : pixels) pixel = 0;
-    EXPECT_TRUE(ConvertToExternal(
-        io.Main(), 16,
-        /*float_out=*/false, orig_channels, JXL_BIG_ENDIAN,
-        xsize * 2 * orig_channels, nullptr, pixels.data(), pixels.size(),
-        /*out_callback=*/{},
-        static_cast<jxl::Orientation>(config.orientation)));
-  }
-  if (config.upsampling == 1) {
-    EXPECT_EQ(0u, jxl::test::ComparePixels(pixels.data(), pixels2.data(), xsize,
-                                           ysize, format_orig, format));
-  } else {
-    // resampling is of course not lossless, so as a rough check:
-    // count pixels that are more than off-by-25 in the 8-bit value of one of
-    // the channels
-    EXPECT_LE(
-        jxl::test::ComparePixels(
-            pixels.data(), pixels2.data(), xsize, ysize, format_orig, format,
-            50.0 * (config.data_type == JXL_TYPE_UINT8 ? 1.0 : 256.0)),
-        300u);
-  }
-
-  JxlDecoderDestroy(dec);
-}
-
-std::vector<PixelTestConfig> GeneratePixelTests() {
-  std::vector<PixelTestConfig> all_tests;
-  struct ChannelInfo {
-    bool grayscale;
-    bool include_alpha;
-    size_t output_channels;
-  };
-  ChannelInfo ch_info[] = {
-      {false, true, 4},   // RGBA -> RGBA
-      {true, false, 1},   // G -> G
-      {true, true, 1},    // GA -> G
-      {true, true, 2},    // GA -> GA
-      {false, false, 3},  // RGB -> RGB
-      {false, true, 3},   // RGBA -> RGB
-      {false, false, 4},  // RGB -> RGBA
-  };
-
-  struct OutputFormat {
-    JxlEndianness endianness;
-    JxlDataType data_type;
-  };
-  OutputFormat out_formats[] = {
-      {JXL_NATIVE_ENDIAN, JXL_TYPE_UINT8},
-      {JXL_LITTLE_ENDIAN, JXL_TYPE_UINT16},
-      {JXL_BIG_ENDIAN, JXL_TYPE_UINT16},
-      {JXL_NATIVE_ENDIAN, JXL_TYPE_FLOAT16},
-      {JXL_LITTLE_ENDIAN, JXL_TYPE_FLOAT},
-      {JXL_BIG_ENDIAN, JXL_TYPE_FLOAT},
-  };
-
-  auto make_test = [&](ChannelInfo ch, size_t xsize, size_t ysize,
-                       jxl::PreviewMode preview_mode, bool intrinsic_size,
-                       CodeStreamBoxFormat box, JxlOrientation orientation,
-                       bool keep_orientation, OutputFormat format,
-                       bool use_callback, bool set_buffer_early,
-                       bool resizable_runner, size_t upsampling) {
-    PixelTestConfig c;
-    c.grayscale = ch.grayscale;
-    c.include_alpha = ch.include_alpha;
-    c.preview_mode = preview_mode;
-    c.add_intrinsic_size = intrinsic_size;
-    c.xsize = xsize;
-    c.ysize = ysize;
-    c.add_container = box;
-    c.output_channels = ch.output_channels;
-    c.data_type = format.data_type;
-    c.endianness = format.endianness;
-    c.use_callback = use_callback;
-    c.set_buffer_early = set_buffer_early;
-    c.use_resizable_runner = resizable_runner;
-    c.orientation = orientation;
-    c.keep_orientation = keep_orientation;
-    c.upsampling = upsampling;
-    all_tests.push_back(c);
-  };
-
-  // Test output formats and methods.
-  for (ChannelInfo ch : ch_info) {
-    for (bool use_callback : {false, true}) {
-      for (size_t upsampling : {1, 2, 4, 8}) {
-        for (OutputFormat fmt : out_formats) {
-          make_test(ch, 301, 33, jxl::kNoPreview,
-                    /*add_intrinsic_size=*/false,
-                    CodeStreamBoxFormat::kCSBF_None, JXL_ORIENT_IDENTITY,
-                    /*keep_orientation=*/false, fmt, use_callback,
-                    /*set_buffer_early=*/false, /*resizable_runner=*/false,
-                    upsampling);
-        }
-      }
-    }
-  }
-  // Test codestream formats.
-  for (size_t box = 1; box < kCSBF_NUM_ENTRIES; ++box) {
-    make_test(ch_info[0], 77, 33, jxl::kNoPreview,
-              /*add_intrinsic_size=*/false,
-              static_cast<CodeStreamBoxFormat>(box), JXL_ORIENT_IDENTITY,
-              /*keep_orientation=*/false, out_formats[0],
-              /*use_callback=*/false,
-              /*set_buffer_early=*/false, /*resizable_runner=*/false, 1);
-  }
-  // Test previews.
-  for (int preview_mode = 0; preview_mode < jxl::kNumPreviewModes;
-       preview_mode++) {
-    make_test(ch_info[0], 77, 33, static_cast<jxl::PreviewMode>(preview_mode),
-              /*add_intrinsic_size=*/false, CodeStreamBoxFormat::kCSBF_None,
-              JXL_ORIENT_IDENTITY,
-              /*keep_orientation=*/false, out_formats[0],
-              /*use_callback=*/false, /*set_buffer_early=*/false,
-              /*resizable_runner=*/false, 1);
-  }
-  // Test intrinsic sizes.
-  for (bool add_intrinsic_size : {false, true}) {
-    make_test(ch_info[0], 55, 34, jxl::kNoPreview, add_intrinsic_size,
-              CodeStreamBoxFormat::kCSBF_None, JXL_ORIENT_IDENTITY,
-              /*keep_orientation=*/false, out_formats[0],
-              /*use_callback=*/false, /*set_buffer_early=*/false,
-              /*resizable_runner=*/false, 1);
-  }
-  // Test setting buffers early.
-  make_test(ch_info[0], 300, 33, jxl::kNoPreview,
-            /*add_intrinsic_size=*/false, CodeStreamBoxFormat::kCSBF_None,
-            JXL_ORIENT_IDENTITY,
-            /*keep_orientation=*/false, out_formats[0],
-            /*use_callback=*/false, /*set_buffer_early=*/true,
-            /*resizable_runner=*/false, 1);
-
-  // Test using the resizable runner
-  for (size_t i = 0; i < 4; i++) {
-    make_test(ch_info[0], 300 << i, 33 << i, jxl::kNoPreview,
-              /*add_intrinsic_size=*/false, CodeStreamBoxFormat::kCSBF_None,
-              JXL_ORIENT_IDENTITY,
-              /*keep_orientation=*/false, out_formats[0],
-              /*use_callback=*/false, /*set_buffer_early=*/false,
-              /*resizable_runner=*/true, 1);
-  }
-
-  // Test orientations.
-  for (int orientation = 2; orientation <= 8; ++orientation) {
-    for (bool keep_orientation : {false, true}) {
-      for (bool use_callback : {false, true}) {
-        for (ChannelInfo ch : ch_info) {
-          for (OutputFormat fmt : out_formats) {
-            make_test(ch, 280, 12, jxl::kNoPreview,
-                      /*add_intrinsic_size=*/false,
-                      CodeStreamBoxFormat::kCSBF_None,
-                      static_cast<JxlOrientation>(orientation),
-                      /*keep_orientation=*/keep_orientation, fmt,
-                      /*use_callback=*/use_callback, /*set_buffer_early=*/true,
-                      /*resizable_runner=*/false, 1);
-          }
-        }
-      }
-    }
-  }
-
-  return all_tests;
-}
-
-std::ostream& operator<<(std::ostream& os, const PixelTestConfig& c) {
-  os << c.xsize << "x" << c.ysize;
-  const char* colors[] = {"", "G", "GA", "RGB", "RGBA"};
-  os << colors[(c.grayscale ? 1 : 3) + (c.include_alpha ? 1 : 0)];
-  os << "to";
-  os << colors[c.output_channels];
-  switch (c.data_type) {
-    case JXL_TYPE_UINT8:
-      os << "u8";
-      break;
-    case JXL_TYPE_UINT16:
-      os << "u16";
-      break;
-    case JXL_TYPE_FLOAT:
-      os << "f32";
-      break;
-    case JXL_TYPE_FLOAT16:
-      os << "f16";
-      break;
-    default:
-      ADD_FAILURE();
-  };
-  if (jxl::test::GetDataBits(c.data_type) > jxl::kBitsPerByte) {
-    if (c.endianness == JXL_NATIVE_ENDIAN) {
-      // add nothing
-    } else if (c.endianness == JXL_BIG_ENDIAN) {
-      os << "BE";
-    } else if (c.endianness == JXL_LITTLE_ENDIAN) {
-      os << "LE";
-    }
-  }
-  if (c.add_container != CodeStreamBoxFormat::kCSBF_None) {
-    os << "Box";
-    os << static_cast<size_t>(c.add_container);
-  }
-  if (c.preview_mode == jxl::kSmallPreview) os << "Preview";
-  if (c.preview_mode == jxl::kBigPreview) os << "BigPreview";
-  if (c.add_intrinsic_size) os << "IntrinicSize";
-  if (c.use_callback) os << "Callback";
-  if (c.set_buffer_early) os << "EarlyBuffer";
-  if (c.use_resizable_runner) os << "ResizableRunner";
-  if (c.orientation != 1) os << "O" << c.orientation;
-  if (c.keep_orientation) os << "Keep";
-  if (c.upsampling > 1) os << "x" << c.upsampling;
-  return os;
-}
-
-std::string PixelTestDescription(
-    const testing::TestParamInfo<DecodeTestParam::ParamType>& info) {
-  std::stringstream name;
-  name << info.param;
-  return name.str();
-}
-
-JXL_GTEST_INSTANTIATE_TEST_SUITE_P(DecodeTest, DecodeTestParam,
-                                   testing::ValuesIn(GeneratePixelTests()),
-                                   PixelTestDescription);
-
-TEST(DecodeTest, PixelTestWithICCProfileLossless) {
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-  size_t xsize = 123;
-  size_t ysize = 77;
-  size_t num_pixels = xsize * ysize;
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 4, 0);
-  JxlPixelFormat format_orig = {4, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  jxl::TestCodestreamParams params;
-  // Lossless to verify pixels exactly after roundtrip.
-  params.cparams.SetLossless();
-  params.cparams.speed_tier = jxl::SpeedTier::kThunder;
-  params.add_icc_profile = true;
-  // For variation: some have container and no preview, others have preview
-  // and no container.
-  std::vector<uint8_t> compressed = jxl::CreateTestJXLCodestream(
-      jxl::Bytes(pixels.data(), pixels.size()), xsize, ysize, 4, params);
-
-  for (uint32_t channels = 3; channels <= 4; ++channels) {
-    {
-      JxlPixelFormat format = {channels, JXL_TYPE_UINT8, JXL_LITTLE_ENDIAN, 0};
-
-      std::vector<uint8_t> pixels2 = jxl::DecodeWithAPI(
-          dec, jxl::Bytes(compressed.data(), compressed.size()), format,
-          /*use_callback=*/false, /*set_buffer_early=*/false,
-          /*use_resizable_runner=*/false, /*require_boxes=*/false,
-          /*expect_success=*/true);
-      JxlDecoderReset(dec);
-      EXPECT_EQ(num_pixels * channels, pixels2.size());
-      EXPECT_EQ(0u,
-                jxl::test::ComparePixels(pixels.data(), pixels2.data(), xsize,
-                                         ysize, format_orig, format));
-    }
-    {
-      JxlPixelFormat format = {channels, JXL_TYPE_UINT16, JXL_LITTLE_ENDIAN, 0};
-
-      // Test with the container for one of the pixel formats.
-      std::vector<uint8_t> pixels2 = jxl::DecodeWithAPI(
-          dec, jxl::Bytes(compressed.data(), compressed.size()), format,
-          /*use_callback=*/true, /*set_buffer_early=*/true,
-          /*use_resizable_runner=*/false, /*require_boxes=*/false,
-          /*expect_success=*/true);
-      JxlDecoderReset(dec);
-      EXPECT_EQ(num_pixels * channels * 2, pixels2.size());
-      EXPECT_EQ(0u,
-                jxl::test::ComparePixels(pixels.data(), pixels2.data(), xsize,
-                                         ysize, format_orig, format));
-    }
-
-    {
-      JxlPixelFormat format = {channels, JXL_TYPE_FLOAT, JXL_LITTLE_ENDIAN, 0};
-
-      std::vector<uint8_t> pixels2 = jxl::DecodeWithAPI(
-          dec, jxl::Bytes(compressed.data(), compressed.size()), format,
-          /*use_callback=*/false, /*set_buffer_early=*/false,
-          /*use_resizable_runner=*/false, /*require_boxes=*/false,
-          /*expect_success=*/true);
-      JxlDecoderReset(dec);
-      EXPECT_EQ(num_pixels * channels * 4, pixels2.size());
-      EXPECT_EQ(0u,
-                jxl::test::ComparePixels(pixels.data(), pixels2.data(), xsize,
-                                         ysize, format_orig, format));
-    }
-  }
-
-  JxlDecoderDestroy(dec);
-}
-
-TEST(DecodeTest, PixelTestWithICCProfileLossy) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-  size_t xsize = 123;
-  size_t ysize = 77;
-  size_t num_pixels = xsize * ysize;
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 3, 0);
-  JxlPixelFormat format_orig = {3, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  jxl::TestCodestreamParams params;
-  params.add_icc_profile = true;
-  std::vector<uint8_t> compressed = jxl::CreateTestJXLCodestream(
-      jxl::Bytes(pixels.data(), pixels.size()), xsize, ysize, 3, params);
-  uint32_t channels = 3;
-
-  JxlPixelFormat format = {channels, JXL_TYPE_FLOAT, JXL_LITTLE_ENDIAN, 0};
-
-  std::vector<uint8_t> icc_data;
-  std::vector<uint8_t> pixels2 = jxl::DecodeWithAPI(
-      dec, jxl::Bytes(compressed.data(), compressed.size()), format,
-      /*use_callback=*/false, /*set_buffer_early=*/true,
-      /*use_resizable_runner=*/false, /*require_boxes=*/false,
-      /*expect_success=*/true, /*icc=*/&icc_data);
-  JxlDecoderReset(dec);
-  EXPECT_EQ(num_pixels * channels * 4, pixels2.size());
-
-  // The input pixels use the profile matching GetIccTestProfile, since we set
-  // add_icc_profile for CreateTestJXLCodestream to true.
-  jxl::ColorEncoding color_encoding0;
-  EXPECT_TRUE(color_encoding0.SetICC(GetIccTestProfile(), JxlGetDefaultCms()));
-  jxl::Span<const uint8_t> span0(pixels.data(), pixels.size());
-  jxl::CodecInOut io0{memory_manager};
-  ASSERT_TRUE(io0.SetSize(xsize, ysize));
-  EXPECT_TRUE(ConvertFromExternal(span0, xsize, ysize, color_encoding0,
-                                  /*bits_per_sample=*/16, format_orig,
-                                  /*pool=*/nullptr, &io0.Main()));
-
-  jxl::ColorEncoding color_encoding1;
-  jxl::IccBytes icc;
-  jxl::Bytes(icc_data).AppendTo(icc);
-  EXPECT_TRUE(color_encoding1.SetICC(std::move(icc), JxlGetDefaultCms()));
-  jxl::Span<const uint8_t> span1(pixels2.data(), pixels2.size());
-  jxl::CodecInOut io1{memory_manager};
-  ASSERT_TRUE(io1.SetSize(xsize, ysize));
-  EXPECT_TRUE(ConvertFromExternal(span1, xsize, ysize, color_encoding1,
-                                  /*bits_per_sample=*/32, format,
-                                  /*pool=*/nullptr, &io1.Main()));
-
-  jxl::ButteraugliParams butteraugli_params;
-  EXPECT_SLIGHTLY_BELOW(
-      ButteraugliDistance(io0.frames, io1.frames, butteraugli_params,
-                          *JxlGetDefaultCms(),
-                          /*distmap=*/nullptr, nullptr),
-      0.58f);
-
-  JxlDecoderDestroy(dec);
-}
-
-std::string ColorDescription(JxlColorEncoding c) {
-  jxl::ColorEncoding color_encoding;
-  EXPECT_TRUE(color_encoding.FromExternal(c));
-  return Description(color_encoding);
-}
-
-std::string GetOrigProfile(JxlDecoder* dec) {
-  JxlColorEncoding c;
-  JxlColorProfileTarget target = JXL_COLOR_PROFILE_TARGET_ORIGINAL;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderGetColorAsEncodedProfile(dec, target, &c));
-  return ColorDescription(c);
-}
-
-std::string GetDataProfile(JxlDecoder* dec) {
-  JxlColorEncoding c;
-  JxlColorProfileTarget target = JXL_COLOR_PROFILE_TARGET_DATA;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderGetColorAsEncodedProfile(dec, target, &c));
-  return ColorDescription(c);
-}
-
-double ButteraugliDistance(size_t xsize, size_t ysize,
-                           const std::vector<uint8_t>& pixels_in,
-                           const jxl::ColorEncoding& color_in,
-                           float intensity_in,
-                           const std::vector<uint8_t>& pixels_out,
-                           const jxl::ColorEncoding& color_out,
-                           float intensity_out) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  jxl::CodecInOut in{memory_manager};
-  in.metadata.m.color_encoding = color_in;
-  in.metadata.m.SetIntensityTarget(intensity_in);
-  JxlPixelFormat format_in = {static_cast<uint32_t>(color_in.Channels()),
-                              JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  EXPECT_TRUE(jxl::ConvertFromExternal(
-      jxl::Bytes(pixels_in.data(), pixels_in.size()), xsize, ysize, color_in,
-      /*bits_per_sample=*/16, format_in,
-      /*pool=*/nullptr, &in.Main()));
-  jxl::CodecInOut out{memory_manager};
-  out.metadata.m.color_encoding = color_out;
-  out.metadata.m.SetIntensityTarget(intensity_out);
-  JxlPixelFormat format_out = {static_cast<uint32_t>(color_out.Channels()),
-                               JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  EXPECT_TRUE(jxl::ConvertFromExternal(
-      jxl::Bytes(pixels_out.data(), pixels_out.size()), xsize, ysize, color_out,
-      /*bits_per_sample=*/16, format_out,
-      /*pool=*/nullptr, &out.Main()));
-  return ButteraugliDistance(in.frames, out.frames, jxl::ButteraugliParams(),
-                             *JxlGetDefaultCms(), nullptr, nullptr);
-}
-
-class DecodeAllEncodingsTest
-    : public ::testing::TestWithParam<jxl::test::ColorEncodingDescriptor> {};
-JXL_GTEST_INSTANTIATE_TEST_SUITE_P(
-    DecodeAllEncodingsTestInstantiation, DecodeAllEncodingsTest,
-    ::testing::ValuesIn(jxl::test::AllEncodings()));
-TEST_P(DecodeAllEncodingsTest, PreserveOriginalProfileTest) {
-  size_t xsize = 123;
-  size_t ysize = 77;
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 3, 0);
-  JxlPixelFormat format = {3, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  int events = JXL_DEC_BASIC_INFO | JXL_DEC_COLOR_ENCODING | JXL_DEC_FULL_IMAGE;
-  const auto& cdesc = GetParam();
-  jxl::ColorEncoding c_in = jxl::test::ColorEncodingFromDescriptor(cdesc);
-  if (c_in.GetRenderingIntent() != jxl::RenderingIntent::kRelative) return;
-  std::string color_space_in = Description(c_in);
-  float intensity_in = c_in.Tf().IsPQ() ? 10000 : 255;
-  printf("Testing input color space %s\n", color_space_in.c_str());
-  jxl::TestCodestreamParams params;
-  params.color_space = color_space_in;
-  params.intensity_target = intensity_in;
-  std::vector<uint8_t> data = jxl::CreateTestJXLCodestream(
-      jxl::Bytes(pixels.data(), pixels.size()), xsize, ysize, 3, params);
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSubscribeEvents(dec, events));
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, data.data(), data.size()));
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-  JxlBasicInfo info;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-  EXPECT_EQ(xsize, info.xsize);
-  EXPECT_EQ(ysize, info.ysize);
-  EXPECT_FALSE(info.uses_original_profile);
-  EXPECT_EQ(JXL_DEC_COLOR_ENCODING, JxlDecoderProcessInput(dec));
-  EXPECT_EQ(GetOrigProfile(dec), color_space_in);
-  EXPECT_EQ(GetDataProfile(dec), color_space_in);
-  EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-  std::vector<uint8_t> out(pixels.size());
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetImageOutBuffer(dec, &format, out.data(), out.size()));
-  EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-  double dist = ButteraugliDistance(xsize, ysize, pixels, c_in, intensity_in,
-                                    out, c_in, intensity_in);
-  EXPECT_LT(dist, 1.29);
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderProcessInput(dec));
-  JxlDecoderDestroy(dec);
-}
-
-namespace {
-void SetPreferredColorProfileTest(
-    const jxl::test::ColorEncodingDescriptor& from, bool icc_dst,
-    bool use_cms) {
-  size_t xsize = 123;
-  size_t ysize = 77;
-  int events = JXL_DEC_BASIC_INFO | JXL_DEC_COLOR_ENCODING | JXL_DEC_FULL_IMAGE;
-  jxl::ColorEncoding c_in = jxl::test::ColorEncodingFromDescriptor(from);
-  if (c_in.GetRenderingIntent() != jxl::RenderingIntent::kRelative) return;
-  if (c_in.GetWhitePointType() != jxl::WhitePoint::kD65) return;
-  uint32_t num_channels = c_in.Channels();
-  std::vector<uint8_t> pixels =
-      jxl::test::GetSomeTestImage(xsize, ysize, num_channels, 0);
-
-  JxlPixelFormat format = {num_channels, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  std::string color_space_in = Description(c_in);
-  float intensity_in = c_in.Tf().IsPQ() ? 10000 : 255;
-  jxl::TestCodestreamParams params;
-  params.color_space = color_space_in;
-  params.intensity_target = intensity_in;
-  std::vector<uint8_t> data =
-      jxl::CreateTestJXLCodestream(jxl::Bytes(pixels.data(), pixels.size()),
-                                   xsize, ysize, num_channels, params);
-  auto all_encodings = jxl::test::AllEncodings();
-  // TODO(firsching): understand why XYB does not work together with icc_dst.
-  if (!icc_dst) {
-    all_encodings.push_back(
-        {jxl::ColorSpace::kXYB, jxl::WhitePoint::kD65, jxl::Primaries::kCustom,
-         jxl::TransferFunction::kUnknown, jxl::RenderingIntent::kPerceptual});
-  }
-  for (const auto& c1 : all_encodings) {
-    jxl::ColorEncoding c_out = jxl::test::ColorEncodingFromDescriptor(c1);
-    float intensity_out = intensity_in;
-    if (c_out.GetColorSpace() != jxl::ColorSpace::kXYB) {
-      if (c_out.GetRenderingIntent() != jxl::RenderingIntent::kRelative) {
-        continue;
-      }
-      if ((c_in.GetPrimariesType() == jxl::Primaries::k2100 &&
-           c_out.GetPrimariesType() != jxl::Primaries::k2100) ||
-          (c_in.GetPrimariesType() == jxl::Primaries::kP3 &&
-           c_out.GetPrimariesType() == jxl::Primaries::kSRGB)) {
-        // Converting to a narrower gamut does not work without gamut mapping.
-        continue;
-      }
-    }
-    if (c_out.Tf().IsHLG() && intensity_out > 300) {
-      // The Linear->HLG OOTF function at this intensity level can push
-      // saturated colors out of gamut, so we would need gamut mapping in
-      // this case too.
-      continue;
-    }
-    std::string color_space_out = Description(c_out);
-    if (color_space_in == color_space_out) continue;
-    printf("Testing input color space %s with output color space %s\n",
-           color_space_in.c_str(), color_space_out.c_str());
-    JxlDecoder* dec = JxlDecoderCreate(nullptr);
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSubscribeEvents(dec, events));
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderSetInput(dec, data.data(), data.size()));
-    EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-    JxlBasicInfo info;
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-    EXPECT_EQ(xsize, info.xsize);
-    EXPECT_EQ(ysize, info.ysize);
-    EXPECT_FALSE(info.uses_original_profile);
-    EXPECT_EQ(JXL_DEC_COLOR_ENCODING, JxlDecoderProcessInput(dec));
-    EXPECT_EQ(GetOrigProfile(dec), color_space_in);
-    JxlColorEncoding encoding_out;
-    EXPECT_TRUE(jxl::ParseDescription(color_space_out, &encoding_out));
-    if (c_out.GetColorSpace() == jxl::ColorSpace::kXYB &&
-        (c_in.GetPrimariesType() != jxl::Primaries::kSRGB ||
-         c_in.Tf().IsPQ())) {
-      EXPECT_EQ(JXL_DEC_ERROR,
-                JxlDecoderSetPreferredColorProfile(dec, &encoding_out));
-      JxlDecoderDestroy(dec);
-      continue;
-    }
-    if (use_cms) {
-      JxlDecoderSetCms(dec, *JxlGetDefaultCms());
-    }
-    if (icc_dst) {
-      jxl::ColorEncoding internal_encoding_out;
-      EXPECT_TRUE(internal_encoding_out.FromExternal(encoding_out));
-      EXPECT_TRUE(internal_encoding_out.CreateICC());
-      std::vector<uint8_t> rewritten_icc = internal_encoding_out.ICC();
-
-      EXPECT_EQ(use_cms ? JXL_DEC_SUCCESS : JXL_DEC_ERROR,
-                JxlDecoderSetOutputColorProfile(
-                    dec, nullptr, rewritten_icc.data(), rewritten_icc.size()));
-      if (!use_cms) {
-        // continue if we don't have a cms here
-        JxlDecoderDestroy(dec);
-        continue;
-      }
-    } else {
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderSetPreferredColorProfile(dec, &encoding_out));
-    }
-    EXPECT_EQ(GetOrigProfile(dec), color_space_in);
-    if (icc_dst) {
-    } else {
-      EXPECT_EQ(GetDataProfile(dec), color_space_out);
-    }
-    EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-    size_t buffer_size;
-    JxlPixelFormat out_format = format;
-    out_format.num_channels = c_out.Channels();
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderImageOutBufferSize(dec, &out_format, &buffer_size));
-    std::vector<uint8_t> out(buffer_size);
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(
-                                   dec, &out_format, out.data(), out.size()));
-    EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-    double dist = ButteraugliDistance(xsize, ysize, pixels, c_in, intensity_in,
-                                      out, c_out, intensity_out);
-
-    if (c_in.GetWhitePointType() == c_out.GetWhitePointType()) {
-      EXPECT_LT(dist, 1.29);
-    } else {
-      EXPECT_LT(dist, 4.0);
-    }
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderProcessInput(dec));
-    JxlDecoderDestroy(dec);
-  }
-}
-}  // namespace
-
-TEST(DecodeTest, SetPreferredColorProfileTestFromGray) {
-  jxl::test::ColorEncodingDescriptor gray = {
-      jxl::ColorSpace::kGray, jxl::WhitePoint::kD65, jxl::Primaries::kSRGB,
-      jxl::TransferFunction::kSRGB, jxl::RenderingIntent::kRelative};
-  SetPreferredColorProfileTest(gray, true, true);
-  SetPreferredColorProfileTest(gray, false, true);
-  SetPreferredColorProfileTest(gray, true, false);
-  SetPreferredColorProfileTest(gray, false, false);
-}
-
-static std::string DecodeAllEncodingsVariantsTestName(
-    const ::testing::TestParamInfo<
-        std::tuple<jxl::test::ColorEncodingDescriptor, bool, bool>>& info) {
-  const auto& encoding = std::get<0>(info.param);
-  bool icc_dst = std::get<1>(info.param);
-  bool use_cms = std::get<2>(info.param);
-
-  std::string encoding_name =
-      Description(ColorEncodingFromDescriptor(encoding));
-
-  return "From_" + encoding_name +
-         (icc_dst ? "_with_icc_dst" : "_without_icc_dst") +
-         (use_cms ? "_with_cms" : "_without_cms");
-}
-
-class DecodeAllEncodingsVariantsTest
-    : public ::testing::TestWithParam<
-          std::tuple<jxl::test::ColorEncodingDescriptor, bool, bool>> {};
-JXL_GTEST_INSTANTIATE_TEST_SUITE_P(
-    DecodeAllEncodingsVariantsTestInstantiation, DecodeAllEncodingsVariantsTest,
-    ::testing::Combine(::testing::ValuesIn(jxl::test::AllEncodings()),
-                       ::testing::Bool(), ::testing::Bool()),
-    DecodeAllEncodingsVariantsTestName);
-TEST_P(DecodeAllEncodingsVariantsTest, SetPreferredColorProfileTest) {
-  const auto& from = std::get<0>(GetParam());
-  bool icc_dst = std::get<1>(GetParam());
-  bool use_cms = std::get<2>(GetParam());
-  SetPreferredColorProfileTest(from, icc_dst, use_cms);
-}
-
-void DecodeImageWithColorEncoding(const std::vector<uint8_t>& compressed,
-                                  jxl::ColorEncoding& color_encoding,
-                                  bool with_cms, std::vector<uint8_t>& out,
-                                  JxlBasicInfo& info) {
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-  int events = JXL_DEC_BASIC_INFO | JXL_DEC_COLOR_ENCODING | JXL_DEC_FULL_IMAGE;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSubscribeEvents(dec, events));
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetInput(dec, compressed.data(), compressed.size()));
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-  EXPECT_EQ(JXL_DEC_COLOR_ENCODING, JxlDecoderProcessInput(dec));
-  // TODO(eustas): why unused?
-  std::string color_space_in = GetOrigProfile(dec);
-  if (with_cms) {
-    JxlDecoderSetCms(dec, *JxlGetDefaultCms());
-    EXPECT_TRUE(color_encoding.CreateICC());
-    std::vector<uint8_t> rewritten_icc = color_encoding.ICC();
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderSetOutputColorProfile(
-                  dec, nullptr, rewritten_icc.data(), rewritten_icc.size()));
-  } else {
-    JxlColorEncoding external_color_encoding = color_encoding.ToExternal();
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetOutputColorProfile(
-                                   dec, &external_color_encoding, nullptr, 0));
-  }
-  EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-
-  size_t buffer_size;
-  JxlPixelFormat format = {3, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-
-  JxlPixelFormat out_format = format;
-  out_format.num_channels = color_encoding.Channels();
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderImageOutBufferSize(dec, &out_format, &buffer_size));
-  out.resize(buffer_size);
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(
-                                 dec, &out_format, out.data(), out.size()));
-  EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-  JxlDecoderDestroy(dec);
-}
-
-class DecodeAllEncodingsWithCMSTest
-    : public ::testing::TestWithParam<jxl::test::ColorEncodingDescriptor> {};
-
-JXL_GTEST_INSTANTIATE_TEST_SUITE_P(
-    AllEncodings, DecodeAllEncodingsWithCMSTest,
-    testing::ValuesIn(jxl::test::AllEncodings()));
-
-TEST_P(DecodeAllEncodingsWithCMSTest, DecodeWithCMS) {
-  auto all_encodings = jxl::test::AllEncodings();
-  uint32_t num_channels = 3;
-  size_t xsize = 177;
-  size_t ysize = 123;
-  std::vector<uint8_t> pixels =
-      jxl::test::GetSomeTestImage(xsize, ysize, num_channels, 0);
-  jxl::TestCodestreamParams params;
-  std::vector<uint8_t> data =
-      jxl::CreateTestJXLCodestream(jxl::Bytes(pixels.data(), pixels.size()),
-                                   xsize, ysize, num_channels, params);
-
-  jxl::ColorEncoding color_encoding =
-      jxl::test::ColorEncodingFromDescriptor(GetParam());
-  fprintf(stderr, "color_description: %s\n",
-          Description(color_encoding).c_str());
-
-  std::vector<uint8_t> out_with_cms;
-  JxlBasicInfo info_with_cms;
-  DecodeImageWithColorEncoding(data, color_encoding, true, out_with_cms,
-                               info_with_cms);
-
-  std::vector<uint8_t> out_without_cms;
-  JxlBasicInfo info_without_cms;
-  DecodeImageWithColorEncoding(data, color_encoding, false, out_without_cms,
-                               info_without_cms);
-
-  EXPECT_EQ(info_with_cms.xsize, info_without_cms.xsize);
-  EXPECT_EQ(info_with_cms.ysize, info_without_cms.ysize);
-  EXPECT_EQ(out_with_cms.size(), out_without_cms.size());
-  double dist = ButteraugliDistance(xsize, ysize, out_with_cms, color_encoding,
-                                    255, out_without_cms, color_encoding, 255);
-
-  EXPECT_LT(dist, .1);
-}
-
-// Tests the case of lossy sRGB image without alpha channel, decoded to RGB8
-// and to RGBA8
-TEST(DecodeTest, PixelTestOpaqueSrgbLossy) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  for (unsigned channels = 3; channels <= 4; channels++) {
-    JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-    size_t xsize = 123;
-    size_t ysize = 77;
-    size_t num_pixels = xsize * ysize;
-    std::vector<uint8_t> pixels =
-        jxl::test::GetSomeTestImage(xsize, ysize, 3, 0);
-    JxlPixelFormat format_orig = {3, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-    std::vector<uint8_t> compressed = jxl::CreateTestJXLCodestream(
-        jxl::Bytes(pixels.data(), pixels.size()), xsize, ysize, 3,
-        jxl::TestCodestreamParams());
-
-    JxlPixelFormat format = {channels, JXL_TYPE_UINT8, JXL_LITTLE_ENDIAN, 0};
-
-    std::vector<uint8_t> pixels2 = jxl::DecodeWithAPI(
-        dec, jxl::Bytes(compressed.data(), compressed.size()), format,
-        /*use_callback=*/true, /*set_buffer_early=*/false,
-        /*use_resizable_runner=*/false, /*require_boxes=*/false,
-        /*expect_success*/ true);
-    JxlDecoderReset(dec);
-    EXPECT_EQ(num_pixels * channels, pixels2.size());
-
-    jxl::ColorEncoding color_encoding0 = jxl::ColorEncoding::SRGB(false);
-    jxl::Span<const uint8_t> span0(pixels.data(), pixels.size());
-    jxl::CodecInOut io0{memory_manager};
-    ASSERT_TRUE(io0.SetSize(xsize, ysize));
-    EXPECT_TRUE(ConvertFromExternal(span0, xsize, ysize, color_encoding0,
-                                    /*bits_per_sample=*/16, format_orig,
-                                    /*pool=*/nullptr, &io0.Main()));
-
-    jxl::ColorEncoding color_encoding1 = jxl::ColorEncoding::SRGB(false);
-    jxl::Span<const uint8_t> span1(pixels2.data(), pixels2.size());
-    jxl::CodecInOut io1{memory_manager};
-    EXPECT_TRUE(ConvertFromExternal(span1, xsize, ysize, color_encoding1,
-                                    /*bits_per_sample=*/8, format,
-                                    /*pool=*/nullptr, &io1.Main()));
-
-    jxl::ButteraugliParams butteraugli_params;
-    EXPECT_SLIGHTLY_BELOW(
-        ButteraugliDistance(io0.frames, io1.frames, butteraugli_params,
-                            *JxlGetDefaultCms(),
-                            /*distmap=*/nullptr, nullptr),
-        0.6f);
-
-    JxlDecoderDestroy(dec);
-  }
-}
-
-// Opaque image with noise enabled, decoded to RGB8 and RGBA8.
-TEST(DecodeTest, PixelTestOpaqueSrgbLossyNoise) {
-  for (unsigned channels = 3; channels <= 4; channels++) {
-    JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-    size_t xsize = 512;
-    size_t ysize = 300;
-    size_t num_pixels = xsize * ysize;
-    std::vector<uint8_t> pixels =
-        jxl::test::GetSomeTestImage(xsize, ysize, 3, 0);
-    JxlPixelFormat format_orig = {3, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-    jxl::TestCodestreamParams params;
-    params.cparams.noise = jxl::Override::kOn;
-    std::vector<uint8_t> compressed = jxl::CreateTestJXLCodestream(
-        jxl::Bytes(pixels.data(), pixels.size()), xsize, ysize, 3, params);
-
-    JxlPixelFormat format = {channels, JXL_TYPE_UINT8, JXL_LITTLE_ENDIAN, 0};
-
-    std::vector<uint8_t> pixels2 = jxl::DecodeWithAPI(
-        dec, jxl::Bytes(compressed.data(), compressed.size()), format,
-        /*use_callback=*/false, /*set_buffer_early=*/true,
-        /*use_resizable_runner=*/false, /*require_boxes=*/false,
-        /*expect_success=*/true);
-    JxlDecoderReset(dec);
-    EXPECT_EQ(num_pixels * channels, pixels2.size());
-
-    jxl::ColorEncoding color_encoding0 = jxl::ColorEncoding::SRGB(false);
-    jxl::Span<const uint8_t> span0(pixels.data(), pixels.size());
-    jxl::CodecInOut io0{jxl::test::MemoryManager()};
-    ASSERT_TRUE(io0.SetSize(xsize, ysize));
-    EXPECT_TRUE(ConvertFromExternal(span0, xsize, ysize, color_encoding0,
-                                    /*bits_per_sample=*/16, format_orig,
-                                    /*pool=*/nullptr, &io0.Main()));
-
-    jxl::ColorEncoding color_encoding1 = jxl::ColorEncoding::SRGB(false);
-    jxl::Span<const uint8_t> span1(pixels2.data(), pixels2.size());
-    jxl::CodecInOut io1{jxl::test::MemoryManager()};
-    EXPECT_TRUE(ConvertFromExternal(span1, xsize, ysize, color_encoding1,
-                                    /*bits_per_sample=*/8, format,
-                                    /*pool=*/nullptr, &io1.Main()));
-
-    jxl::ButteraugliParams butteraugli_params;
-    EXPECT_SLIGHTLY_BELOW(
-        ButteraugliDistance(io0.frames, io1.frames, butteraugli_params,
-                            *JxlGetDefaultCms(),
-                            /*distmap=*/nullptr, nullptr),
-        1.4f);
-
-    JxlDecoderDestroy(dec);
-  }
-}
-
-TEST(DecodeTest, ProcessEmptyInputWithBoxes) {
-  size_t xsize = 123;
-  size_t ysize = 77;
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 3, 0);
-  jxl::CompressParams cparams;
-  uint32_t channels = 3;
-  JxlPixelFormat format = {channels, JXL_TYPE_FLOAT, JXL_LITTLE_ENDIAN, 0};
-  for (int i = 0; i < kCSBF_NUM_ENTRIES; ++i) {
-    JxlDecoder* dec = JxlDecoderCreate(nullptr);
-    jxl::TestCodestreamParams params;
-    params.box_format = static_cast<CodeStreamBoxFormat>(i);
-    printf("Testing empty input with box format %d\n",
-           static_cast<int>(params.box_format));
-    std::vector<uint8_t> compressed = jxl::CreateTestJXLCodestream(
-        jxl::Bytes(pixels.data(), pixels.size()), xsize, ysize, 3, params);
-    const int events =
-        JXL_DEC_BASIC_INFO | JXL_DEC_FULL_IMAGE | JXL_DEC_COLOR_ENCODING;
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSubscribeEvents(dec, events));
-    EXPECT_EQ(JXL_DEC_NEED_MORE_INPUT, JxlDecoderProcessInput(dec));
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderSetInput(dec, compressed.data(), compressed.size()));
-    EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-    EXPECT_EQ(JXL_DEC_COLOR_ENCODING, JxlDecoderProcessInput(dec));
-    size_t buffer_size;
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-    JxlBasicInfo info;
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-    const size_t remaining = JxlDecoderReleaseInput(dec);
-    EXPECT_LE(remaining, compressed.size());
-    EXPECT_EQ(JXL_DEC_NEED_MORE_INPUT, JxlDecoderProcessInput(dec));
-    JxlDecoderDestroy(dec);
-  }
-}
-
-TEST(DecodeTest, ExtraBytesAfterCompressedStream) {
-  size_t xsize = 123;
-  size_t ysize = 77;
-  size_t num_pixels = xsize * ysize;
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 3, 0);
-  jxl::CompressParams cparams;
-  for (int i = 0; i < kCSBF_NUM_ENTRIES; ++i) {
-    CodeStreamBoxFormat box_format = static_cast<CodeStreamBoxFormat>(i);
-    if (box_format == kCSBF_Multi_Other_Zero_Terminated) continue;
-    printf("Testing with box format %d\n", static_cast<int>(box_format));
-    size_t last_unknown_box_size = 0;
-    if (box_format == kCSBF_Single_Other) {
-      last_unknown_box_size = unk1_box_size + 8;
-    } else if (box_format == kCSBF_Multi_Other_Terminated) {
-      last_unknown_box_size = unk3_box_size + 8;
-    } else if (box_format == kCSBF_Multi_Last_Empty_Other) {
-      // If boxes are not required, the decoder won't consume the last empty
-      // jxlp box.
-      last_unknown_box_size = 12 + unk3_box_size + 8;
-    }
-    jxl::TestCodestreamParams params;
-    params.box_format = box_format;
-    std::vector<uint8_t> compressed = jxl::CreateTestJXLCodestream(
-        jxl::Bytes(pixels.data(), pixels.size()), xsize, ysize, 3, params);
-    // Add some more bytes after compressed data.
-    compressed.push_back(0);
-    compressed.push_back(1);
-    compressed.push_back(2);
-    JxlDecoder* dec = JxlDecoderCreate(nullptr);
-    uint32_t channels = 3;
-    JxlPixelFormat format = {channels, JXL_TYPE_FLOAT, JXL_LITTLE_ENDIAN, 0};
-    std::vector<uint8_t> pixels2 = jxl::DecodeWithAPI(
-        dec, jxl::Bytes(compressed.data(), compressed.size()), format,
-        /*use_callback=*/false, /*set_buffer_early=*/true,
-        /*use_resizable_runner=*/false, /*require_boxes=*/false,
-        /*expect_success=*/true);
-    size_t unconsumed_bytes = JxlDecoderReleaseInput(dec);
-    EXPECT_EQ(last_unknown_box_size + 3, unconsumed_bytes);
-    EXPECT_EQ(num_pixels * channels * 4, pixels2.size());
-    JxlDecoderDestroy(dec);
-  }
-}
-
-TEST(DecodeTest, ExtraBytesAfterCompressedStreamRequireBoxes) {
-  size_t xsize = 123;
-  size_t ysize = 77;
-  size_t num_pixels = xsize * ysize;
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 3, 0);
-  jxl::CompressParams cparams;
-  for (int i = 0; i < kCSBF_NUM_ENTRIES; ++i) {
-    CodeStreamBoxFormat box_format = static_cast<CodeStreamBoxFormat>(i);
-    if (box_format == kCSBF_Multi_Other_Zero_Terminated) continue;
-    printf("Testing with box format %d\n", static_cast<int>(box_format));
-    bool expect_success = (box_format == kCSBF_None ||
-                           box_format == kCSBF_Single_Zero_Terminated ||
-                           box_format == kCSBF_Multi_Zero_Terminated);
-    jxl::TestCodestreamParams params;
-    params.box_format = box_format;
-    std::vector<uint8_t> compressed = jxl::CreateTestJXLCodestream(
-        jxl::Bytes(pixels.data(), pixels.size()), xsize, ysize, 3, params);
-    // Add some more bytes after compressed data.
-    compressed.push_back(0);
-    compressed.push_back(1);
-    compressed.push_back(2);
-    JxlDecoder* dec = JxlDecoderCreate(nullptr);
-    uint32_t channels = 3;
-    JxlPixelFormat format = {channels, JXL_TYPE_FLOAT, JXL_LITTLE_ENDIAN, 0};
-    std::vector<uint8_t> pixels2 = jxl::DecodeWithAPI(
-        dec, jxl::Bytes(compressed.data(), compressed.size()), format,
-        /*use_callback=*/false, /*set_buffer_early=*/true,
-        /*use_resizable_runner=*/false, /*require_boxes=*/true, expect_success);
-    size_t unconsumed_bytes = JxlDecoderReleaseInput(dec);
-    EXPECT_EQ(3, unconsumed_bytes);
-    EXPECT_EQ(num_pixels * channels * 4, pixels2.size());
-    JxlDecoderDestroy(dec);
-  }
-}
-
-TEST(DecodeTest, ConcatenatedCompressedStreams) {
-  size_t xsize = 123;
-  size_t ysize = 77;
-  size_t num_pixels = xsize * ysize;
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 3, 0);
-  jxl::CompressParams cparams;
-  for (int i = 0; i < kCSBF_NUM_ENTRIES; ++i) {
-    CodeStreamBoxFormat first_box_format = static_cast<CodeStreamBoxFormat>(i);
-    if (first_box_format == kCSBF_Multi_Other_Zero_Terminated) continue;
-    jxl::TestCodestreamParams params1;
-    params1.box_format = first_box_format;
-    std::vector<uint8_t> compressed1 = jxl::CreateTestJXLCodestream(
-        jxl::Bytes(pixels.data(), pixels.size()), xsize, ysize, 3, params1);
-    for (int j = 0; j < kCSBF_NUM_ENTRIES; ++j) {
-      CodeStreamBoxFormat second_box_format =
-          static_cast<CodeStreamBoxFormat>(j);
-      if (second_box_format == kCSBF_Multi_Other_Zero_Terminated) continue;
-      printf("Testing with box format pair %d, %d\n",
-             static_cast<int>(first_box_format),
-             static_cast<int>(second_box_format));
-      jxl::TestCodestreamParams params2;
-      params2.box_format = second_box_format;
-      std::vector<uint8_t> compressed2 = jxl::CreateTestJXLCodestream(
-          jxl::Bytes(pixels.data(), pixels.size()), xsize, ysize, 3, params2);
-      std::vector<uint8_t> concat;
-      jxl::Bytes(compressed1).AppendTo(concat);
-      jxl::Bytes(compressed2).AppendTo(concat);
-      uint32_t channels = 3;
-      JxlPixelFormat format = {channels, JXL_TYPE_FLOAT, JXL_LITTLE_ENDIAN, 0};
-      size_t remaining = concat.size();
-      for (int part = 0; part < 2; ++part) {
-        printf("  Decoding part %d\n", part + 1);
-        JxlDecoder* dec = JxlDecoderCreate(nullptr);
-        size_t pos = concat.size() - remaining;
-        bool expect_success =
-            (part == 0 || second_box_format == kCSBF_None ||
-             second_box_format == kCSBF_Single_Zero_Terminated ||
-             second_box_format == kCSBF_Multi_Zero_Terminated);
-        std::vector<uint8_t> pixels2 = jxl::DecodeWithAPI(
-            dec, jxl::Bytes(concat.data() + pos, remaining), format,
-            /*use_callback=*/false, /*set_buffer_early=*/true,
-            /*use_resizable_runner=*/false, /*require_boxes=*/true,
-            expect_success);
-        EXPECT_EQ(num_pixels * channels * 4, pixels2.size());
-        remaining = JxlDecoderReleaseInput(dec);
-        JxlDecoderDestroy(dec);
-      }
-      EXPECT_EQ(0, remaining);
-    }
-  }
-}
-
-void TestPartialStream(bool reconstructible_jpeg) {
-  size_t xsize = 123;
-  size_t ysize = 77;
-  uint32_t channels = 4;
-  if (reconstructible_jpeg) {
-    channels = 3;
-  }
-  std::vector<uint8_t> pixels =
-      jxl::test::GetSomeTestImage(xsize, ysize, channels, 0);
-  JxlPixelFormat format_orig = {channels, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  jxl::TestCodestreamParams params;
-  if (reconstructible_jpeg) {
-    params.cparams.color_transform = jxl::ColorTransform::kNone;
-  } else {
-    // Lossless to verify pixels exactly after roundtrip.
-    params.cparams.SetLossless();
-  }
-
-  std::vector<uint8_t> pixels2;
-  pixels2.resize(pixels.size());
-
-  std::vector<uint8_t> jpeg_output(64);
-  size_t used_jpeg_output = 0;
-
-  std::vector<std::vector<uint8_t>> codestreams(kCSBF_NUM_ENTRIES);
-  std::vector<std::vector<uint8_t>> jpeg_codestreams(kCSBF_NUM_ENTRIES);
-  for (size_t i = 0; i < kCSBF_NUM_ENTRIES; ++i) {
-    params.box_format = static_cast<CodeStreamBoxFormat>(i);
-    if (reconstructible_jpeg) {
-      params.jpeg_codestream = &jpeg_codestreams[i];
-    }
-    codestreams[i] =
-        jxl::CreateTestJXLCodestream(jxl::Bytes(pixels.data(), pixels.size()),
-                                     xsize, ysize, channels, params);
-  }
-
-  // Test multiple step sizes, to test different combinations of the streaming
-  // box parsing.
-  std::vector<size_t> increments = {1, 3, 17, 23, 120, 700, 1050};
-
-  for (size_t increment : increments) {
-    for (size_t i = 0; i < kCSBF_NUM_ENTRIES; ++i) {
-      if (reconstructible_jpeg && static_cast<CodeStreamBoxFormat>(i) ==
-                                      CodeStreamBoxFormat::kCSBF_None) {
-        continue;
-      }
-      const std::vector<uint8_t>& data = codestreams[i];
-      const uint8_t* next_in = data.data();
-      size_t avail_in = 0;
-
-      JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderSubscribeEvents(
-                    dec, JXL_DEC_BASIC_INFO | JXL_DEC_FULL_IMAGE |
-                             JXL_DEC_JPEG_RECONSTRUCTION));
-
-      bool seen_basic_info = false;
-      bool seen_full_image = false;
-      bool seen_jpeg_recon = false;
-
-      size_t total_size = 0;
-
-      for (;;) {
-        EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-        JxlDecoderStatus status = JxlDecoderProcessInput(dec);
-        size_t remaining = JxlDecoderReleaseInput(dec);
-        EXPECT_LE(remaining, avail_in);
-        next_in += avail_in - remaining;
-        avail_in = remaining;
-        if (status == JXL_DEC_NEED_MORE_INPUT) {
-          if (total_size >= data.size()) {
-            // End of test data reached, it should have successfully decoded the
-            // image now.
-            FAIL();
-            break;
-          }
-
-          // End of the file reached, should be the final test.
-          if (total_size + increment > data.size()) {
-            increment = data.size() - total_size;
-          }
-          total_size += increment;
-          avail_in += increment;
-        } else if (status == JXL_DEC_BASIC_INFO) {
-          // This event should happen exactly once
-          EXPECT_FALSE(seen_basic_info);
-          if (seen_basic_info) break;
-          seen_basic_info = true;
-          JxlBasicInfo info;
-          EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-          EXPECT_EQ(info.xsize, xsize);
-          EXPECT_EQ(info.ysize, ysize);
-        } else if (status == JXL_DEC_JPEG_RECONSTRUCTION) {
-          EXPECT_FALSE(seen_basic_info);
-          EXPECT_FALSE(seen_full_image);
-          EXPECT_EQ(JXL_DEC_SUCCESS,
-                    JxlDecoderSetJPEGBuffer(dec, jpeg_output.data(),
-                                            jpeg_output.size()));
-          seen_jpeg_recon = true;
-        } else if (status == JXL_DEC_JPEG_NEED_MORE_OUTPUT) {
-          EXPECT_TRUE(seen_jpeg_recon);
-          used_jpeg_output =
-              jpeg_output.size() - JxlDecoderReleaseJPEGBuffer(dec);
-          jpeg_output.resize(jpeg_output.size() * 2);
-          EXPECT_EQ(JXL_DEC_SUCCESS,
-                    JxlDecoderSetJPEGBuffer(
-                        dec, jpeg_output.data() + used_jpeg_output,
-                        jpeg_output.size() - used_jpeg_output));
-        } else if (status == JXL_DEC_NEED_IMAGE_OUT_BUFFER) {
-          EXPECT_EQ(JXL_DEC_SUCCESS,
-                    JxlDecoderSetImageOutBuffer(
-                        dec, &format_orig, pixels2.data(), pixels2.size()));
-        } else if (status == JXL_DEC_FULL_IMAGE) {
-          // This event should happen exactly once
-          EXPECT_FALSE(seen_full_image);
-          if (seen_full_image) break;
-          // This event should happen after basic info
-          EXPECT_TRUE(seen_basic_info);
-          seen_full_image = true;
-          if (reconstructible_jpeg) {
-            used_jpeg_output =
-                jpeg_output.size() - JxlDecoderReleaseJPEGBuffer(dec);
-            EXPECT_EQ(used_jpeg_output, jpeg_codestreams[i].size());
-            EXPECT_EQ(0, memcmp(jpeg_output.data(), jpeg_codestreams[i].data(),
-                                used_jpeg_output));
-          } else {
-            EXPECT_EQ(pixels, pixels2);
-          }
-        } else if (status == JXL_DEC_SUCCESS) {
-          EXPECT_TRUE(seen_full_image);
-          break;
-        } else {
-          // We do not expect any other events or errors
-          FAIL();
-          break;
-        }
-      }
-
-      // Ensure the decoder emitted the basic info and full image events
-      EXPECT_TRUE(seen_basic_info);
-      EXPECT_TRUE(seen_full_image);
-
-      JxlDecoderDestroy(dec);
-    }
-  }
-}
-
-// Tests the return status when trying to decode pixels on incomplete file: it
-// should return JXL_DEC_NEED_MORE_INPUT, not error.
-TEST(DecodeTest, PixelPartialTest) { TestPartialStream(false); }
-
-// Tests the return status when trying to decode JPEG bytes on incomplete file.
-JXL_TRANSCODE_JPEG_TEST(DecodeTest, JPEGPartialTest) {
-  TEST_LIBJPEG_SUPPORT();
-  TestPartialStream(true);
-}
-
-// The DC event still exists, but is no longer implemented, it is deprecated.
-TEST(DecodeTest, DCNotGettableTest) {
-  // 1x1 pixel JXL image
-  std::string compressed(
-      "\377\n\0\20\260\23\0H\200("
-      "\0\334\0U\17\0\0\250P\31e\334\340\345\\\317\227\37:,"
-      "\246m\\gh\253m\vK\22E\306\261I\252C&pH\22\353 "
-      "\363\6\22\bp\0\200\237\34\231W2d\255$\1",
-      68);
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(dec, JXL_DEC_BASIC_INFO));
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetInput(
-                dec, reinterpret_cast<const uint8_t*>(compressed.data()),
-                compressed.size()));
-
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-
-  // Since the image is only 1x1 pixel, there is only 1 group, the decoder is
-  // unable to get DC size from this, and will not return the DC at all. Since
-  // no full image is requested either, it is expected to return success.
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderProcessInput(dec));
-
-  JxlDecoderDestroy(dec);
-}
-
-TEST(DecodeTest, PreviewTest) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  size_t xsize = 77;
-  size_t ysize = 120;
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 3, 0);
-  JxlPixelFormat format_orig = {3, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  for (jxl::PreviewMode mode : {jxl::kSmallPreview, jxl::kBigPreview}) {
-    jxl::TestCodestreamParams params;
-    params.preview_mode = mode;
-
-    std::vector<uint8_t> compressed = jxl::CreateTestJXLCodestream(
-        jxl::Bytes(pixels.data(), pixels.size()), xsize, ysize, 3, params);
-
-    JxlPixelFormat format = {3, JXL_TYPE_UINT8, JXL_LITTLE_ENDIAN, 0};
-
-    JxlDecoder* dec = JxlDecoderCreate(nullptr);
-    const uint8_t* next_in = compressed.data();
-    size_t avail_in = compressed.size();
-
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderSubscribeEvents(
-                  dec, JXL_DEC_BASIC_INFO | JXL_DEC_PREVIEW_IMAGE));
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-
-    EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-    JxlBasicInfo info;
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-    size_t buffer_size;
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderPreviewOutBufferSize(dec, &format, &buffer_size));
-
-    jxl::ColorEncoding c_srgb = jxl::ColorEncoding::SRGB(false);
-    jxl::CodecInOut io0{memory_manager};
-    EXPECT_TRUE(jxl::ConvertFromExternal(
-        jxl::Bytes(pixels.data(), pixels.size()), xsize, ysize, c_srgb,
-        /*bits_per_sample=*/16, format_orig, /*pool=*/nullptr, &io0.Main()));
-    GeneratePreview(params.preview_mode, &io0.Main());
-
-    size_t xsize_preview = io0.Main().xsize();
-    size_t ysize_preview = io0.Main().ysize();
-    EXPECT_EQ(xsize_preview, info.preview.xsize);
-    EXPECT_EQ(ysize_preview, info.preview.ysize);
-    EXPECT_EQ(xsize_preview * ysize_preview * 3, buffer_size);
-
-    EXPECT_EQ(JXL_DEC_NEED_PREVIEW_OUT_BUFFER, JxlDecoderProcessInput(dec));
-
-    std::vector<uint8_t> preview(buffer_size);
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderSetPreviewOutBuffer(dec, &format, preview.data(),
-                                            preview.size()));
-
-    EXPECT_EQ(JXL_DEC_PREVIEW_IMAGE, JxlDecoderProcessInput(dec));
-
-    jxl::CodecInOut io1{memory_manager};
-    EXPECT_TRUE(
-        jxl::ConvertFromExternal(jxl::Bytes(preview.data(), preview.size()),
-                                 xsize_preview, ysize_preview, c_srgb,
-                                 /*bits_per_sample=*/8, format,
-                                 /*pool=*/nullptr, &io1.Main()));
-
-    jxl::ButteraugliParams butteraugli_params;
-    // TODO(lode): this ButteraugliDistance silently returns 0 (dangerous for
-    // tests) if xsize or ysize is < 8, no matter how different the images, a
-    // tiny size that could happen for a preview. ButteraugliDiffmap does
-    // support smaller than 8x8, but jxl's ButteraugliDistance does not. Perhaps
-    // move butteraugli's <8x8 handling from ButteraugliDiffmap to
-    // ButteraugliComparator::Diffmap in butteraugli.cc.
-    EXPECT_LE(ButteraugliDistance(io0.frames, io1.frames, butteraugli_params,
-                                  *JxlGetDefaultCms(),
-                                  /*distmap=*/nullptr, nullptr),
-              mode == jxl::kSmallPreview ? 0.7f : 1.2f);
-
-    JxlDecoderDestroy(dec);
-  }
-}
-
-TEST(DecodeTest, AlignTest) {
-  size_t xsize = 123;
-  size_t ysize = 77;
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 4, 0);
-  JxlPixelFormat format_orig = {4, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-
-  jxl::TestCodestreamParams params;
-  // Lossless to verify pixels exactly after roundtrip.
-  params.cparams.SetLossless();
-  params.cparams.speed_tier = jxl::SpeedTier::kThunder;
-  std::vector<uint8_t> compressed = jxl::CreateTestJXLCodestream(
-      jxl::Bytes(pixels.data(), pixels.size()), xsize, ysize, 4, params);
-
-  size_t align = 17;
-  JxlPixelFormat format = {3, JXL_TYPE_UINT8, JXL_LITTLE_ENDIAN, align};
-  // On purpose not using jxl::RoundUpTo to test it independently.
-  size_t expected_line_size_last = 1 * 3 * xsize;
-  size_t expected_line_size =
-      ((expected_line_size_last + align - 1) / align) * align;
-  size_t expected_pixels_size =
-      expected_line_size * (ysize - 1) + expected_line_size_last;
-
-  for (bool use_callback : {false, true}) {
-    std::vector<uint8_t> pixels2 = jxl::DecodeWithAPI(
-        jxl::Bytes(compressed.data(), compressed.size()), format, use_callback,
-        /*set_buffer_early=*/false,
-        /*use_resizable_runner=*/false, /*require_boxes=*/false,
-        /*expect_success=*/true);
-    EXPECT_EQ(expected_pixels_size, pixels2.size());
-    EXPECT_EQ(0u, jxl::test::ComparePixels(pixels.data(), pixels2.data(), xsize,
-                                           ysize, format_orig, format));
-  }
-}
-
-TEST(DecodeTest, AnimationTest) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  size_t xsize = 123;
-  size_t ysize = 77;
-  static const size_t num_frames = 2;
-  std::vector<uint8_t> frames[2];
-  frames[0] = jxl::test::GetSomeTestImage(xsize, ysize, 3, 0);
-  frames[1] = jxl::test::GetSomeTestImage(xsize, ysize, 3, 1);
-  JxlPixelFormat format = {3, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-
-  jxl::CodecInOut io{memory_manager};
-  ASSERT_TRUE(io.SetSize(xsize, ysize));
-  io.metadata.m.SetUintSamples(16);
-  io.metadata.m.color_encoding = jxl::ColorEncoding::SRGB(false);
-  io.metadata.m.have_animation = true;
-  io.frames.clear();
-  io.frames.reserve(num_frames);
-  ASSERT_TRUE(io.SetSize(xsize, ysize));
-
-  std::vector<uint32_t> frame_durations(num_frames);
-  for (size_t i = 0; i < num_frames; ++i) {
-    frame_durations[i] = 5 + i;
-  }
-
-  for (size_t i = 0; i < num_frames; ++i) {
-    jxl::ImageBundle bundle(memory_manager, &io.metadata.m);
-
-    EXPECT_TRUE(ConvertFromExternal(
-        jxl::Bytes(frames[i].data(), frames[i].size()), xsize, ysize,
-        jxl::ColorEncoding::SRGB(/*is_gray=*/false),
-        /*bits_per_sample=*/16, format,
-        /*pool=*/nullptr, &bundle));
-    bundle.duration = frame_durations[i];
-    io.frames.push_back(std::move(bundle));
-  }
-
-  jxl::CompressParams cparams;
-  cparams.SetLossless();  // Lossless to verify pixels exactly after roundtrip.
-  cparams.speed_tier = jxl::SpeedTier::kThunder;
-  std::vector<uint8_t> compressed;
-  EXPECT_TRUE(jxl::test::EncodeFile(cparams, &io, &compressed));
-
-  // Decode and test the animation frames
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-  const uint8_t* next_in = compressed.data();
-  size_t avail_in = compressed.size();
-
-  void* runner = JxlThreadParallelRunnerCreate(
-      nullptr, JxlThreadParallelRunnerDefaultNumWorkerThreads());
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetParallelRunner(dec, JxlThreadParallelRunner, runner));
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(
-                dec, JXL_DEC_BASIC_INFO | JXL_DEC_FRAME | JXL_DEC_FULL_IMAGE));
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-  size_t buffer_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-  JxlBasicInfo info;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-
-  for (size_t i = 0; i < num_frames; ++i) {
-    std::vector<uint8_t> pixels(buffer_size);
-
-    EXPECT_EQ(JXL_DEC_FRAME, JxlDecoderProcessInput(dec));
-
-    JxlFrameHeader frame_header;
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetFrameHeader(dec, &frame_header));
-    EXPECT_EQ(frame_durations[i], frame_header.duration);
-    EXPECT_EQ(0u, frame_header.name_length);
-    // For now, test with empty name, there's currently no easy way to encode
-    // a jxl file with a frame name because ImageBundle doesn't have a
-    // jxl::FrameHeader to set the name in. We can test the null termination
-    // character though.
-    char name;
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetFrameName(dec, &name, 1));
-    EXPECT_EQ(0, name);
-
-    EXPECT_EQ(i + 1 == num_frames, frame_header.is_last);
-
-    EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(
-                                   dec, &format, pixels.data(), pixels.size()));
-
-    EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-    EXPECT_EQ(0u, jxl::test::ComparePixels(frames[i].data(), pixels.data(),
-                                           xsize, ysize, format, format));
-  }
-
-  // After all frames were decoded, JxlDecoderProcessInput should return
-  // success to indicate all is done.
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderProcessInput(dec));
-
-  JxlThreadParallelRunnerDestroy(runner);
-  JxlDecoderDestroy(dec);
-}
-
-TEST(DecodeTest, AnimationTestStreaming) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  size_t xsize = 123;
-  size_t ysize = 77;
-  static const size_t num_frames = 2;
-  std::vector<uint8_t> frames[2];
-  frames[0] = jxl::test::GetSomeTestImage(xsize, ysize, 3, 0);
-  frames[1] = jxl::test::GetSomeTestImage(xsize, ysize, 3, 1);
-  JxlPixelFormat format = {3, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-
-  jxl::CodecInOut io{memory_manager};
-  ASSERT_TRUE(io.SetSize(xsize, ysize));
-  io.metadata.m.SetUintSamples(16);
-  io.metadata.m.color_encoding = jxl::ColorEncoding::SRGB(false);
-  io.metadata.m.have_animation = true;
-  io.frames.clear();
-  io.frames.reserve(num_frames);
-  ASSERT_TRUE(io.SetSize(xsize, ysize));
-
-  std::vector<uint32_t> frame_durations(num_frames);
-  for (size_t i = 0; i < num_frames; ++i) {
-    frame_durations[i] = 5 + i;
-  }
-
-  for (size_t i = 0; i < num_frames; ++i) {
-    jxl::ImageBundle bundle(memory_manager, &io.metadata.m);
-
-    EXPECT_TRUE(ConvertFromExternal(
-        jxl::Bytes(frames[i].data(), frames[i].size()), xsize, ysize,
-        jxl::ColorEncoding::SRGB(/*is_gray=*/false),
-        /*bits_per_sample=*/16, format,
-        /*pool=*/nullptr, &bundle));
-    bundle.duration = frame_durations[i];
-    io.frames.push_back(std::move(bundle));
-  }
-
-  jxl::CompressParams cparams;
-  cparams.SetLossless();  // Lossless to verify pixels exactly after roundtrip.
-  cparams.speed_tier = jxl::SpeedTier::kThunder;
-  std::vector<uint8_t> compressed;
-  EXPECT_TRUE(jxl::test::EncodeFile(cparams, &io, &compressed));
-
-  // Decode and test the animation frames
-
-  const size_t step_size = 16;
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-  const uint8_t* next_in = compressed.data();
-  size_t avail_in = 0;
-  size_t frame_headers_seen = 0;
-  size_t frames_seen = 0;
-  bool seen_basic_info = false;
-
-  void* runner = JxlThreadParallelRunnerCreate(
-      nullptr, JxlThreadParallelRunnerDefaultNumWorkerThreads());
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetParallelRunner(dec, JxlThreadParallelRunner, runner));
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(
-                dec, JXL_DEC_BASIC_INFO | JXL_DEC_FRAME | JXL_DEC_FULL_IMAGE));
-
-  std::vector<uint8_t> frames2[2];
-  for (size_t i = 0; i < num_frames; ++i) {
-    frames2[i].resize(frames[i].size());
-  }
-
-  size_t total_in = 0;
-  size_t loop_count = 0;
-
-  for (;;) {
-    if (loop_count++ > compressed.size()) {
-      fprintf(stderr, "Too many loops\n");
-      FAIL();
-      break;
-    }
-
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-    auto status = JxlDecoderProcessInput(dec);
-    size_t remaining = JxlDecoderReleaseInput(dec);
-    EXPECT_LE(remaining, avail_in);
-    next_in += avail_in - remaining;
-    avail_in = remaining;
-
-    if (status == JXL_DEC_SUCCESS) {
-      break;
-    } else if (status == JXL_DEC_ERROR) {
-      FAIL();
-    } else if (status == JXL_DEC_NEED_MORE_INPUT) {
-      if (total_in >= compressed.size()) {
-        fprintf(stderr, "Already gave all input data\n");
-        FAIL();
-        break;
-      }
-      size_t amount = step_size;
-      if (total_in + amount > compressed.size()) {
-        amount = compressed.size() - total_in;
-      }
-      avail_in += amount;
-      total_in += amount;
-    } else if (status == JXL_DEC_NEED_IMAGE_OUT_BUFFER) {
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(
-                                     dec, &format, frames2[frames_seen].data(),
-                                     frames2[frames_seen].size()));
-    } else if (status == JXL_DEC_BASIC_INFO) {
-      EXPECT_EQ(false, seen_basic_info);
-      seen_basic_info = true;
-      JxlBasicInfo info;
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-      EXPECT_EQ(xsize, info.xsize);
-      EXPECT_EQ(ysize, info.ysize);
-    } else if (status == JXL_DEC_FRAME) {
-      EXPECT_EQ(true, seen_basic_info);
-      frame_headers_seen++;
-    } else if (status == JXL_DEC_FULL_IMAGE) {
-      frames_seen++;
-      EXPECT_EQ(frame_headers_seen, frames_seen);
-    } else {
-      fprintf(stderr, "Unexpected status: %d\n", static_cast<int>(status));
-      FAIL();
-    }
-  }
-
-  EXPECT_EQ(true, seen_basic_info);
-  EXPECT_EQ(num_frames, frames_seen);
-  EXPECT_EQ(num_frames, frame_headers_seen);
-  for (size_t i = 0; i < num_frames; ++i) {
-    EXPECT_EQ(frames[i], frames2[i]);
-  }
-
-  JxlThreadParallelRunnerDestroy(runner);
-  JxlDecoderDestroy(dec);
-}
-
-TEST(DecodeTest, ExtraChannelTest) {
-  size_t xsize = 55;
-  size_t ysize = 257;
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 4, 0);
-  JxlPixelFormat format_orig = {4, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-
-  jxl::TestCodestreamParams params;
-  // Lossless to verify pixels exactly after roundtrip.
-  params.cparams.SetLossless();
-  params.cparams.speed_tier = jxl::SpeedTier::kThunder;
-  std::vector<uint8_t> compressed = jxl::CreateTestJXLCodestream(
-      jxl::Bytes(pixels.data(), pixels.size()), xsize, ysize, 4, params);
-
-  size_t align = 17;
-  JxlPixelFormat format = {3, JXL_TYPE_UINT8, JXL_LITTLE_ENDIAN, align};
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSubscribeEvents(
-                                 dec, JXL_DEC_BASIC_INFO | JXL_DEC_FULL_IMAGE));
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetInput(dec, compressed.data(), compressed.size()));
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-  JxlBasicInfo info;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-  EXPECT_EQ(1u, info.num_extra_channels);
-  EXPECT_EQ(JXL_FALSE, info.alpha_premultiplied);
-
-  JxlExtraChannelInfo extra_info;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderGetExtraChannelInfo(dec, 0, &extra_info));
-  EXPECT_EQ(0, extra_info.type);
-
-  EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-  size_t buffer_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-  size_t extra_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderExtraChannelBufferSize(dec, &format, &extra_size, 0));
-
-  std::vector<uint8_t> image(buffer_size);
-  std::vector<uint8_t> extra(extra_size);
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(
-                                 dec, &format, image.data(), image.size()));
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetExtraChannelBuffer(
-                                 dec, &format, extra.data(), extra.size(), 0));
-
-  EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-
-  // After the full image was output, JxlDecoderProcessInput should return
-  // success to indicate all is done.
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderProcessInput(dec));
-  JxlDecoderDestroy(dec);
-
-  EXPECT_EQ(0u, jxl::test::ComparePixels(pixels.data(), image.data(), xsize,
-                                         ysize, format_orig, format));
-
-  // Compare the extracted extra channel with the original alpha channel
-
-  std::vector<uint8_t> alpha(pixels.size() / 4);
-  for (size_t i = 0; i < pixels.size(); i += 8) {
-    size_t index_alpha = i / 4;
-    alpha[index_alpha + 0] = pixels[i + 6];
-    alpha[index_alpha + 1] = pixels[i + 7];
-  }
-  JxlPixelFormat format_alpha = format;
-  format_alpha.num_channels = 1;
-  JxlPixelFormat format_orig_alpha = format_orig;
-  format_orig_alpha.num_channels = 1;
-
-  EXPECT_EQ(0u,
-            jxl::test::ComparePixels(alpha.data(), extra.data(), xsize, ysize,
-                                     format_orig_alpha, format_alpha));
-}
-
-TEST(DecodeTest, SkipCurrentFrameTest) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  size_t xsize = 90;
-  size_t ysize = 120;
-  constexpr size_t num_frames = 7;
-  std::vector<uint8_t> frames[num_frames];
-  for (size_t i = 0; i < num_frames; i++) {
-    frames[i] = jxl::test::GetSomeTestImage(xsize, ysize, 3, i);
-  }
-  JxlPixelFormat format = {3, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-
-  jxl::CodecInOut io{memory_manager};
-  ASSERT_TRUE(io.SetSize(xsize, ysize));
-  io.metadata.m.SetUintSamples(16);
-  io.metadata.m.color_encoding = jxl::ColorEncoding::SRGB(false);
-  io.metadata.m.have_animation = true;
-  io.frames.clear();
-  io.frames.reserve(num_frames);
-  ASSERT_TRUE(io.SetSize(xsize, ysize));
-
-  std::vector<uint32_t> frame_durations(num_frames);
-  for (size_t i = 0; i < num_frames; ++i) {
-    frame_durations[i] = 5 + i;
-  }
-
-  for (size_t i = 0; i < num_frames; ++i) {
-    jxl::ImageBundle bundle(memory_manager, &io.metadata.m);
-    if (i & 1) {
-      // Mark some frames as referenceable, others not.
-      bundle.use_for_next_frame = true;
-    }
-
-    EXPECT_TRUE(ConvertFromExternal(
-        jxl::Bytes(frames[i].data(), frames[i].size()), xsize, ysize,
-        jxl::ColorEncoding::SRGB(/*is_gray=*/false),
-        /*bits_per_sample=*/16, format,
-        /*pool=*/nullptr, &bundle));
-    bundle.duration = frame_durations[i];
-    io.frames.push_back(std::move(bundle));
-  }
-
-  jxl::CompressParams cparams;
-  cparams.speed_tier = jxl::SpeedTier::kThunder;
-  std::vector<uint8_t> compressed;
-  jxl::PassDefinition passes[] = {{2, 0, 4}, {4, 0, 4}, {8, 2, 2}, {8, 0, 1}};
-  jxl::ProgressiveMode progressive_mode{passes};
-  cparams.custom_progressive_mode = &progressive_mode;
-  EXPECT_TRUE(jxl::test::EncodeFile(cparams, &io, &compressed));
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-  const uint8_t* next_in = compressed.data();
-  size_t avail_in = compressed.size();
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(dec, JXL_DEC_BASIC_INFO | JXL_DEC_FRAME |
-                                               JXL_DEC_FRAME_PROGRESSION |
-                                               JXL_DEC_FULL_IMAGE));
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetProgressiveDetail(dec, kLastPasses));
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-  size_t buffer_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-  JxlBasicInfo info;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-
-  for (size_t i = 0; i < num_frames; ++i) {
-    printf("Decoding frame %d\n", static_cast<int>(i));
-    EXPECT_EQ(JXL_DEC_ERROR, JxlDecoderSkipCurrentFrame(dec));
-    std::vector<uint8_t> pixels(buffer_size);
-    EXPECT_EQ(JXL_DEC_FRAME, JxlDecoderProcessInput(dec));
-    EXPECT_EQ(JXL_DEC_ERROR, JxlDecoderSkipCurrentFrame(dec));
-    JxlFrameHeader frame_header;
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetFrameHeader(dec, &frame_header));
-    EXPECT_EQ(frame_durations[i], frame_header.duration);
-    EXPECT_EQ(i + 1 == num_frames, frame_header.is_last);
-    EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(
-                                   dec, &format, pixels.data(), pixels.size()));
-    if (i == 2) {
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSkipCurrentFrame(dec));
-      continue;
-    }
-    EXPECT_EQ(JXL_DEC_FRAME_PROGRESSION, JxlDecoderProcessInput(dec));
-    EXPECT_EQ(8, JxlDecoderGetIntendedDownsamplingRatio(dec));
-    if (i == 3) {
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSkipCurrentFrame(dec));
-      continue;
-    }
-    EXPECT_EQ(JXL_DEC_FRAME_PROGRESSION, JxlDecoderProcessInput(dec));
-    EXPECT_EQ(4, JxlDecoderGetIntendedDownsamplingRatio(dec));
-    if (i == 4) {
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSkipCurrentFrame(dec));
-      continue;
-    }
-    EXPECT_EQ(JXL_DEC_FRAME_PROGRESSION, JxlDecoderProcessInput(dec));
-    EXPECT_EQ(2, JxlDecoderGetIntendedDownsamplingRatio(dec));
-    if (i == 5) {
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSkipCurrentFrame(dec));
-      continue;
-    }
-    EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-    EXPECT_EQ(JXL_DEC_ERROR, JxlDecoderSkipCurrentFrame(dec));
-  }
-
-  // After all frames were decoded, JxlDecoderProcessInput should return
-  // success to indicate all is done.
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderProcessInput(dec));
-
-  JxlDecoderDestroy(dec);
-}
-
-TEST(DecodeTest, SkipFrameTest) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  size_t xsize = 90;
-  size_t ysize = 120;
-  constexpr size_t num_frames = 16;
-  std::vector<uint8_t> frames[num_frames];
-  for (size_t i = 0; i < num_frames; i++) {
-    frames[i] = jxl::test::GetSomeTestImage(xsize, ysize, 3, i);
-  }
-  JxlPixelFormat format = {3, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-
-  jxl::CodecInOut io{memory_manager};
-  ASSERT_TRUE(io.SetSize(xsize, ysize));
-  io.metadata.m.SetUintSamples(16);
-  io.metadata.m.color_encoding = jxl::ColorEncoding::SRGB(false);
-  io.metadata.m.have_animation = true;
-  io.frames.clear();
-  io.frames.reserve(num_frames);
-  ASSERT_TRUE(io.SetSize(xsize, ysize));
-
-  std::vector<uint32_t> frame_durations(num_frames);
-  for (size_t i = 0; i < num_frames; ++i) {
-    frame_durations[i] = 5 + i;
-  }
-
-  for (size_t i = 0; i < num_frames; ++i) {
-    jxl::ImageBundle bundle(memory_manager, &io.metadata.m);
-    if (i & 1) {
-      // Mark some frames as referenceable, others not.
-      bundle.use_for_next_frame = true;
-    }
-
-    EXPECT_TRUE(ConvertFromExternal(
-        jxl::Bytes(frames[i].data(), frames[i].size()), xsize, ysize,
-        jxl::ColorEncoding::SRGB(/*is_gray=*/false),
-        /*bits_per_sample=*/16, format,
-        /*pool=*/nullptr, &bundle));
-    bundle.duration = frame_durations[i];
-    io.frames.push_back(std::move(bundle));
-  }
-
-  jxl::CompressParams cparams;
-  cparams.SetLossless();  // Lossless to verify pixels exactly after roundtrip.
-  cparams.speed_tier = jxl::SpeedTier::kThunder;
-  std::vector<uint8_t> compressed;
-  EXPECT_TRUE(jxl::test::EncodeFile(cparams, &io, &compressed));
-
-  // Decode and test the animation frames
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-  const uint8_t* next_in = compressed.data();
-  size_t avail_in = compressed.size();
-
-  void* runner = JxlThreadParallelRunnerCreate(
-      nullptr, JxlThreadParallelRunnerDefaultNumWorkerThreads());
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetParallelRunner(dec, JxlThreadParallelRunner, runner));
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(
-                dec, JXL_DEC_BASIC_INFO | JXL_DEC_FRAME | JXL_DEC_FULL_IMAGE));
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-  size_t buffer_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-  JxlBasicInfo info;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-
-  for (size_t i = 0; i < num_frames; ++i) {
-    if (i == 3) {
-      JxlDecoderSkipFrames(dec, 5);
-      i += 5;
-    }
-    std::vector<uint8_t> pixels(buffer_size);
-
-    EXPECT_EQ(JXL_DEC_FRAME, JxlDecoderProcessInput(dec));
-
-    JxlFrameHeader frame_header;
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetFrameHeader(dec, &frame_header));
-    EXPECT_EQ(frame_durations[i], frame_header.duration);
-
-    EXPECT_EQ(i + 1 == num_frames, frame_header.is_last);
-
-    EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(
-                                   dec, &format, pixels.data(), pixels.size()));
-
-    EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-    EXPECT_EQ(0u, jxl::test::ComparePixels(frames[i].data(), pixels.data(),
-                                           xsize, ysize, format, format));
-  }
-
-  // After all frames were decoded, JxlDecoderProcessInput should return
-  // success to indicate all is done.
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderProcessInput(dec));
-
-  // Test rewinding the decoder and skipping different frames
-
-  JxlDecoderRewind(dec);
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(dec, JXL_DEC_FRAME | JXL_DEC_FULL_IMAGE));
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-
-  for (size_t i = 0; i < num_frames; ++i) {
-    int test_skipping = (i == 9) ? 3 : 0;
-    std::vector<uint8_t> pixels(buffer_size);
-
-    EXPECT_EQ(JXL_DEC_FRAME, JxlDecoderProcessInput(dec));
-
-    // Since this is after JXL_DEC_FRAME but before JXL_DEC_FULL_IMAGE, this
-    // should only skip the next frame, not the currently processed one.
-    if (test_skipping) JxlDecoderSkipFrames(dec, test_skipping);
-
-    JxlFrameHeader frame_header;
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetFrameHeader(dec, &frame_header));
-    EXPECT_EQ(frame_durations[i], frame_header.duration);
-
-    EXPECT_EQ(i + 1 == num_frames, frame_header.is_last);
-
-    EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(
-                                   dec, &format, pixels.data(), pixels.size()));
-
-    EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-    EXPECT_EQ(0u, jxl::test::ComparePixels(frames[i].data(), pixels.data(),
-                                           xsize, ysize, format, format));
-
-    if (test_skipping) i += test_skipping;
-  }
-
-  JxlThreadParallelRunnerDestroy(runner);
-  JxlDecoderDestroy(dec);
-}
-
-TEST(DecodeTest, SkipFrameWithBlendingTest) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  size_t xsize = 90;
-  size_t ysize = 120;
-  constexpr size_t num_frames = 16;
-  std::vector<uint8_t> frames[num_frames];
-  JxlPixelFormat format = {3, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-
-  jxl::CodecInOut io{memory_manager};
-  ASSERT_TRUE(io.SetSize(xsize, ysize));
-  io.metadata.m.SetUintSamples(16);
-  io.metadata.m.color_encoding = jxl::ColorEncoding::SRGB(false);
-  io.metadata.m.have_animation = true;
-  io.frames.clear();
-  io.frames.reserve(num_frames);
-  ASSERT_TRUE(io.SetSize(xsize, ysize));
-
-  std::vector<uint32_t> frame_durations(num_frames);
-
-  for (size_t i = 0; i < num_frames; ++i) {
-    if (i < 5) {
-      std::vector<uint8_t> frame_internal =
-          jxl::test::GetSomeTestImage(xsize, ysize, 3, i * 2 + 1);
-      // An internal frame with 0 duration, and use_for_next_frame, this is a
-      // frame that is not rendered and not output by the API, but on which the
-      // rendered frames depend
-      jxl::ImageBundle bundle_internal(memory_manager, &io.metadata.m);
-      EXPECT_TRUE(ConvertFromExternal(
-          jxl::Bytes(frame_internal.data(), frame_internal.size()), xsize,
-          ysize, jxl::ColorEncoding::SRGB(/*is_gray=*/false),
-          /*bits_per_sample=*/16, format,
-          /*pool=*/nullptr, &bundle_internal));
-      bundle_internal.duration = 0;
-      bundle_internal.use_for_next_frame = true;
-      io.frames.push_back(std::move(bundle_internal));
-    }
-
-    std::vector<uint8_t> frame =
-        jxl::test::GetSomeTestImage(xsize, ysize, 3, i * 2);
-    // Actual rendered frame
-    frame_durations[i] = 5 + i;
-    jxl::ImageBundle bundle(memory_manager, &io.metadata.m);
-    EXPECT_TRUE(ConvertFromExternal(jxl::Bytes(frame.data(), frame.size()),
-                                    xsize, ysize,
-                                    jxl::ColorEncoding::SRGB(/*is_gray=*/false),
-                                    /*bits_per_sample=*/16, format,
-                                    /*pool=*/nullptr, &bundle));
-    bundle.duration = frame_durations[i];
-    // Create some variation in which frames depend on which.
-    if (i != 3 && i != 9 && i != 10) {
-      bundle.use_for_next_frame = true;
-    }
-    if (i != 12) {
-      bundle.blend = true;
-      // Choose a blend mode that depends on the pixels of the saved frame and
-      // doesn't use alpha
-      bundle.blendmode = jxl::BlendMode::kMul;
-    }
-    io.frames.push_back(std::move(bundle));
-  }
-
-  jxl::CompressParams cparams;
-  cparams.SetLossless();  // Lossless to verify pixels exactly after roundtrip.
-  cparams.speed_tier = jxl::SpeedTier::kThunder;
-  std::vector<uint8_t> compressed;
-  EXPECT_TRUE(jxl::test::EncodeFile(cparams, &io, &compressed));
-
-  // Independently decode all frames without any skipping, to create the
-  // expected blended frames, for the actual tests below to compare with.
-  {
-    JxlDecoder* dec = JxlDecoderCreate(nullptr);
-    const uint8_t* next_in = compressed.data();
-    size_t avail_in = compressed.size();
-
-    void* runner = JxlThreadParallelRunnerCreate(
-        nullptr, JxlThreadParallelRunnerDefaultNumWorkerThreads());
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetParallelRunner(
-                                   dec, JxlThreadParallelRunner, runner));
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderSubscribeEvents(dec, JXL_DEC_FULL_IMAGE));
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-    for (auto& frame : frames) {
-      EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-      frame.resize(xsize * ysize * 6);
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(
-                                     dec, &format, frame.data(), frame.size()));
-      EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-    }
-
-    // After all frames were decoded, JxlDecoderProcessInput should return
-    // success to indicate all is done.
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderProcessInput(dec));
-    JxlThreadParallelRunnerDestroy(runner);
-    JxlDecoderDestroy(dec);
-  }
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-  const uint8_t* next_in = compressed.data();
-  size_t avail_in = compressed.size();
-
-  void* runner = JxlThreadParallelRunnerCreate(
-      nullptr, JxlThreadParallelRunnerDefaultNumWorkerThreads());
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetParallelRunner(dec, JxlThreadParallelRunner, runner));
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(
-                dec, JXL_DEC_BASIC_INFO | JXL_DEC_FRAME | JXL_DEC_FULL_IMAGE));
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-  size_t buffer_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-  JxlBasicInfo info;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-
-  for (size_t i = 0; i < num_frames; ++i) {
-    std::vector<uint8_t> pixels(buffer_size);
-
-    EXPECT_EQ(JXL_DEC_FRAME, JxlDecoderProcessInput(dec));
-
-    JxlFrameHeader frame_header;
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetFrameHeader(dec, &frame_header));
-    EXPECT_EQ(frame_durations[i], frame_header.duration);
-
-    EXPECT_EQ(i + 1 == num_frames, frame_header.is_last);
-
-    EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(
-                                   dec, &format, pixels.data(), pixels.size()));
-
-    EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-    EXPECT_EQ(0u, jxl::test::ComparePixels(frames[i].data(), pixels.data(),
-                                           xsize, ysize, format, format));
-
-    // Test rewinding mid-way, not decoding all frames.
-    if (i == 8) {
-      break;
-    }
-  }
-
-  JxlDecoderRewind(dec);
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(dec, JXL_DEC_FRAME | JXL_DEC_FULL_IMAGE));
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-
-  for (size_t i = 0; i < num_frames; ++i) {
-    if (i == 3) {
-      JxlDecoderSkipFrames(dec, 5);
-      i += 5;
-    }
-    std::vector<uint8_t> pixels(buffer_size);
-
-    EXPECT_EQ(JXL_DEC_FRAME, JxlDecoderProcessInput(dec));
-
-    JxlFrameHeader frame_header;
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetFrameHeader(dec, &frame_header));
-    EXPECT_EQ(frame_durations[i], frame_header.duration);
-
-    EXPECT_EQ(i + 1 == num_frames, frame_header.is_last);
-
-    EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(
-                                   dec, &format, pixels.data(), pixels.size()));
-
-    EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-    EXPECT_EQ(0u, jxl::test::ComparePixels(frames[i].data(), pixels.data(),
-                                           xsize, ysize, format, format));
-  }
-
-  // After all frames were decoded, JxlDecoderProcessInput should return
-  // success to indicate all is done.
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderProcessInput(dec));
-
-  // Test rewinding the decoder and skipping different frames
-
-  JxlDecoderRewind(dec);
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(dec, JXL_DEC_FRAME | JXL_DEC_FULL_IMAGE));
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-
-  for (size_t i = 0; i < num_frames; ++i) {
-    int test_skipping = (i == 9) ? 3 : 0;
-    std::vector<uint8_t> pixels(buffer_size);
-
-    EXPECT_EQ(JXL_DEC_FRAME, JxlDecoderProcessInput(dec));
-
-    // Since this is after JXL_DEC_FRAME but before JXL_DEC_FULL_IMAGE, this
-    // should only skip the next frame, not the currently processed one.
-    if (test_skipping) JxlDecoderSkipFrames(dec, test_skipping);
-
-    JxlFrameHeader frame_header;
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetFrameHeader(dec, &frame_header));
-    EXPECT_EQ(frame_durations[i], frame_header.duration);
-
-    EXPECT_EQ(i + 1 == num_frames, frame_header.is_last);
-
-    EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(
-                                   dec, &format, pixels.data(), pixels.size()));
-
-    EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-    EXPECT_EQ(0u, jxl::test::ComparePixels(frames[i].data(), pixels.data(),
-                                           xsize, ysize, format, format));
-
-    if (test_skipping) i += test_skipping;
-  }
-
-  JxlThreadParallelRunnerDestroy(runner);
-  JxlDecoderDestroy(dec);
-}
-
-TEST(DecodeTest, SkipFrameWithAlphaBlendingTest) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  size_t xsize = 90;
-  size_t ysize = 120;
-  constexpr size_t num_frames = 16;
-  std::vector<uint8_t> frames[num_frames + 5];
-  JxlPixelFormat format = {4, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-
-  jxl::CodecInOut io{memory_manager};
-  ASSERT_TRUE(io.SetSize(xsize, ysize));
-  io.metadata.m.SetUintSamples(16);
-  io.metadata.m.color_encoding = jxl::ColorEncoding::SRGB(false);
-  io.metadata.m.have_animation = true;
-  io.frames.clear();
-  io.frames.reserve(num_frames + 5);
-  ASSERT_TRUE(io.SetSize(xsize, ysize));
-
-  std::vector<uint32_t> frame_durations_c;
-  std::vector<uint32_t> frame_durations_nc;
-  std::vector<uint32_t> frame_xsize;
-  std::vector<uint32_t> frame_ysize;
-  std::vector<uint32_t> frame_x0;
-  std::vector<uint32_t> frame_y0;
-
-  for (size_t i = 0; i < num_frames; ++i) {
-    size_t cropxsize = 1 + xsize * 2 / (i + 1);
-    size_t cropysize = 1 + ysize * 3 / (i + 2);
-    int cropx0 = i * 3 - 8;
-    int cropy0 = i * 4 - 7;
-    if (i < 5) {
-      std::vector<uint8_t> frame_internal =
-          jxl::test::GetSomeTestImage(xsize / 2, ysize / 2, 4, i * 2 + 1);
-      // An internal frame with 0 duration, and use_for_next_frame, this is a
-      // frame that is not rendered and not output by default by the API, but on
-      // which the rendered frames depend
-      jxl::ImageBundle bundle_internal(memory_manager, &io.metadata.m);
-      EXPECT_TRUE(ConvertFromExternal(
-          jxl::Bytes(frame_internal.data(), frame_internal.size()), xsize / 2,
-          ysize / 2, jxl::ColorEncoding::SRGB(/*is_gray=*/false),
-          /*bits_per_sample=*/16, format,
-          /*pool=*/nullptr, &bundle_internal));
-      bundle_internal.duration = 0;
-      bundle_internal.use_for_next_frame = true;
-      bundle_internal.origin = {13, 17};
-      io.frames.push_back(std::move(bundle_internal));
-      frame_durations_nc.push_back(0);
-      frame_xsize.push_back(xsize / 2);
-      frame_ysize.push_back(ysize / 2);
-      frame_x0.push_back(13);
-      frame_y0.push_back(17);
-    }
-
-    std::vector<uint8_t> frame =
-        jxl::test::GetSomeTestImage(cropxsize, cropysize, 4, i * 2);
-    // Actual rendered frame
-    jxl::ImageBundle bundle(memory_manager, &io.metadata.m);
-    EXPECT_TRUE(ConvertFromExternal(jxl::Bytes(frame.data(), frame.size()),
-                                    cropxsize, cropysize,
-                                    jxl::ColorEncoding::SRGB(/*is_gray=*/false),
-                                    /*bits_per_sample=*/16, format,
-                                    /*pool=*/nullptr, &bundle));
-    bundle.duration = 5 + i;
-    frame_durations_nc.push_back(5 + i);
-    frame_durations_c.push_back(5 + i);
-    frame_xsize.push_back(cropxsize);
-    frame_ysize.push_back(cropysize);
-    frame_x0.push_back(cropx0);
-    frame_y0.push_back(cropy0);
-    bundle.origin = {cropx0, cropy0};
-    // Create some variation in which frames depend on which.
-    if (i != 3 && i != 9 && i != 10) {
-      bundle.use_for_next_frame = true;
-    }
-    if (i != 12) {
-      bundle.blend = true;
-      bundle.blendmode = jxl::BlendMode::kBlend;
-    }
-    io.frames.push_back(std::move(bundle));
-  }
-
-  jxl::CompressParams cparams;
-  cparams.SetLossless();  // Lossless to verify pixels exactly after roundtrip.
-  cparams.speed_tier = jxl::SpeedTier::kThunder;
-  std::vector<uint8_t> compressed;
-  EXPECT_TRUE(jxl::test::EncodeFile(cparams, &io, &compressed));
-  // try both with and without coalescing
-  for (auto coalescing : {JXL_TRUE, JXL_FALSE}) {
-    // Independently decode all frames without any skipping, to create the
-    // expected blended frames, for the actual tests below to compare with.
-    {
-      JxlDecoder* dec = JxlDecoderCreate(nullptr);
-      const uint8_t* next_in = compressed.data();
-      size_t avail_in = compressed.size();
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetCoalescing(dec, coalescing));
-      void* runner = JxlThreadParallelRunnerCreate(
-          nullptr, JxlThreadParallelRunnerDefaultNumWorkerThreads());
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetParallelRunner(
-                                     dec, JxlThreadParallelRunner, runner));
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderSubscribeEvents(dec, JXL_DEC_FULL_IMAGE));
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-      for (size_t i = 0; i < num_frames + (coalescing ? 0 : 5); ++i) {
-        EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-        size_t buffer_size;
-        EXPECT_EQ(JXL_DEC_SUCCESS,
-                  JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-        if (coalescing) {
-          EXPECT_EQ(xsize * ysize * 8, buffer_size);
-        } else {
-          EXPECT_EQ(frame_xsize[i] * frame_ysize[i] * 8, buffer_size);
-        }
-        frames[i].resize(buffer_size);
-        EXPECT_EQ(JXL_DEC_SUCCESS,
-                  JxlDecoderSetImageOutBuffer(dec, &format, frames[i].data(),
-                                              frames[i].size()));
-        EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-      }
-
-      // After all frames were decoded, JxlDecoderProcessInput should return
-      // success to indicate all is done.
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderProcessInput(dec));
-      JxlThreadParallelRunnerDestroy(runner);
-      JxlDecoderDestroy(dec);
-    }
-
-    JxlDecoder* dec = JxlDecoderCreate(nullptr);
-    const uint8_t* next_in = compressed.data();
-    size_t avail_in = compressed.size();
-
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetCoalescing(dec, coalescing));
-    void* runner = JxlThreadParallelRunnerCreate(
-        nullptr, JxlThreadParallelRunnerDefaultNumWorkerThreads());
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetParallelRunner(
-                                   dec, JxlThreadParallelRunner, runner));
-
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSubscribeEvents(
-                                   dec, JXL_DEC_BASIC_INFO | JXL_DEC_FRAME |
-                                            JXL_DEC_FULL_IMAGE));
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-    EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-    JxlBasicInfo info;
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-
-    for (size_t i = 0; i < num_frames; ++i) {
-      EXPECT_EQ(JXL_DEC_FRAME, JxlDecoderProcessInput(dec));
-
-      size_t buffer_size;
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-      std::vector<uint8_t> pixels(buffer_size);
-
-      JxlFrameHeader frame_header;
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetFrameHeader(dec, &frame_header));
-      EXPECT_EQ((coalescing ? frame_durations_c[i] : frame_durations_nc[i]),
-                frame_header.duration);
-
-      EXPECT_EQ(i + 1 == num_frames, frame_header.is_last);
-
-      EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderSetImageOutBuffer(dec, &format, pixels.data(),
-                                            pixels.size()));
-
-      EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-      if (coalescing) {
-        EXPECT_EQ(frame_header.layer_info.xsize, xsize);
-      } else {
-        EXPECT_EQ(frame_header.layer_info.xsize, frame_xsize[i]);
-      }
-      if (coalescing) {
-        EXPECT_EQ(frame_header.layer_info.ysize, ysize);
-      } else {
-        EXPECT_EQ(frame_header.layer_info.ysize, frame_ysize[i]);
-      }
-      EXPECT_EQ(0u, jxl::test::ComparePixels(frames[i].data(), pixels.data(),
-                                             frame_header.layer_info.xsize,
-                                             frame_header.layer_info.ysize,
-                                             format, format));
-
-      // Test rewinding mid-way, not decoding all frames.
-      if (i == 8) {
-        break;
-      }
-    }
-
-    JxlDecoderRewind(dec);
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSubscribeEvents(
-                                   dec, JXL_DEC_FRAME | JXL_DEC_FULL_IMAGE));
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-
-    for (size_t i = 0; i < num_frames + (coalescing ? 0 : 5); ++i) {
-      if (i == 3) {
-        JxlDecoderSkipFrames(dec, 5);
-        i += 5;
-      }
-
-      EXPECT_EQ(JXL_DEC_FRAME, JxlDecoderProcessInput(dec));
-      size_t buffer_size;
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-      std::vector<uint8_t> pixels(buffer_size);
-
-      JxlFrameHeader frame_header;
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetFrameHeader(dec, &frame_header));
-      EXPECT_EQ((coalescing ? frame_durations_c[i] : frame_durations_nc[i]),
-                frame_header.duration);
-
-      EXPECT_EQ(i + 1 == num_frames + (coalescing ? 0 : 5),
-                frame_header.is_last);
-
-      EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderSetImageOutBuffer(dec, &format, pixels.data(),
-                                            pixels.size()));
-
-      EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-      if (coalescing) {
-        EXPECT_EQ(frame_header.layer_info.xsize, xsize);
-        EXPECT_EQ(frame_header.layer_info.ysize, ysize);
-        EXPECT_EQ(frame_header.layer_info.crop_x0, 0);
-        EXPECT_EQ(frame_header.layer_info.crop_y0, 0);
-      } else {
-        EXPECT_EQ(frame_header.layer_info.xsize, frame_xsize[i]);
-        EXPECT_EQ(frame_header.layer_info.ysize, frame_ysize[i]);
-        EXPECT_EQ(frame_header.layer_info.crop_x0, frame_x0[i]);
-        EXPECT_EQ(frame_header.layer_info.crop_y0, frame_y0[i]);
-        EXPECT_EQ(frame_header.layer_info.blend_info.blendmode,
-                  i != 12 + 5 && frame_header.duration != 0
-                      ? 2
-                      : 0);  // kBlend or the default kReplace
-      }
-      EXPECT_EQ(0u, jxl::test::ComparePixels(frames[i].data(), pixels.data(),
-                                             frame_header.layer_info.xsize,
-                                             frame_header.layer_info.ysize,
-                                             format, format));
-    }
-
-    // After all frames were decoded, JxlDecoderProcessInput should return
-    // success to indicate all is done.
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderProcessInput(dec));
-
-    // Test rewinding the decoder and skipping different frames
-
-    JxlDecoderRewind(dec);
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSubscribeEvents(
-                                   dec, JXL_DEC_FRAME | JXL_DEC_FULL_IMAGE));
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-
-    for (size_t i = 0; i < num_frames + (coalescing ? 0 : 5); ++i) {
-      int test_skipping = (i == 9) ? 3 : 0;
-
-      EXPECT_EQ(JXL_DEC_FRAME, JxlDecoderProcessInput(dec));
-      size_t buffer_size;
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-      std::vector<uint8_t> pixels(buffer_size);
-
-      // Since this is after JXL_DEC_FRAME but before JXL_DEC_FULL_IMAGE, this
-      // should only skip the next frame, not the currently processed one.
-      if (test_skipping) JxlDecoderSkipFrames(dec, test_skipping);
-
-      JxlFrameHeader frame_header;
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetFrameHeader(dec, &frame_header));
-      EXPECT_EQ((coalescing ? frame_durations_c[i] : frame_durations_nc[i]),
-                frame_header.duration);
-
-      EXPECT_EQ(i + 1 == num_frames + (coalescing ? 0 : 5),
-                frame_header.is_last);
-
-      EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderSetImageOutBuffer(dec, &format, pixels.data(),
-                                            pixels.size()));
-
-      EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-      EXPECT_EQ(0u, jxl::test::ComparePixels(frames[i].data(), pixels.data(),
-                                             frame_header.layer_info.xsize,
-                                             frame_header.layer_info.ysize,
-                                             format, format));
-
-      if (test_skipping) i += test_skipping;
-    }
-
-    JxlThreadParallelRunnerDestroy(runner);
-    JxlDecoderDestroy(dec);
-  }
-}
-
-TEST(DecodeTest, OrientedCroppedFrameTest) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const auto test = [&](bool keep_orientation, uint32_t orientation,
-                        uint32_t resampling) {
-    size_t xsize = 90;
-    size_t ysize = 120;
-    JxlPixelFormat format = {4, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-    size_t oxsize = (!keep_orientation && orientation > 4 ? ysize : xsize);
-    size_t oysize = (!keep_orientation && orientation > 4 ? xsize : ysize);
-    jxl::CodecInOut io{memory_manager};
-    EXPECT_TRUE(io.SetSize(xsize, ysize));
-    io.metadata.m.SetUintSamples(16);
-    io.metadata.m.color_encoding = jxl::ColorEncoding::SRGB(false);
-    io.metadata.m.orientation = orientation;
-    io.frames.clear();
-    EXPECT_TRUE(io.SetSize(xsize, ysize));
-
-    for (size_t i = 0; i < 3; ++i) {
-      size_t cropxsize = 1 + xsize * 2 / (i + 1);
-      size_t cropysize = 1 + ysize * 3 / (i + 2);
-      int cropx0 = i * 3 - 8;
-      int cropy0 = i * 4 - 7;
-
-      std::vector<uint8_t> frame =
-          jxl::test::GetSomeTestImage(cropxsize, cropysize, 4, i * 2);
-      jxl::ImageBundle bundle(memory_manager, &io.metadata.m);
-      EXPECT_TRUE(ConvertFromExternal(
-          jxl::Bytes(frame.data(), frame.size()), cropxsize, cropysize,
-          jxl::ColorEncoding::SRGB(/*is_gray=*/false),
-          /*bits_per_sample=*/16, format,
-          /*pool=*/nullptr, &bundle));
-      bundle.origin = {cropx0, cropy0};
-      bundle.use_for_next_frame = true;
-      io.frames.push_back(std::move(bundle));
-    }
-
-    jxl::CompressParams cparams;
-    cparams
-        .SetLossless();  // Lossless to verify pixels exactly after roundtrip.
-    cparams.speed_tier = jxl::SpeedTier::kThunder;
-    cparams.resampling = resampling;
-    std::vector<uint8_t> compressed;
-    EXPECT_TRUE(jxl::test::EncodeFile(cparams, &io, &compressed));
-
-    // 0 is merged frame as decoded with coalescing enabled (default)
-    // 1-3 are non-coalesced frames as decoded with coalescing disabled
-    // 4 is the manually merged frame
-    std::vector<uint8_t> frames[5];
-    frames[4].resize(xsize * ysize * 8, 0);
-
-    // try both with and without coalescing
-    for (auto coalescing : {JXL_TRUE, JXL_FALSE}) {
-      // Independently decode all frames without any skipping, to create the
-      // expected blended frames, for the actual tests below to compare with.
-      {
-        JxlDecoder* dec = JxlDecoderCreate(nullptr);
-        const uint8_t* next_in = compressed.data();
-        size_t avail_in = compressed.size();
-        EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetCoalescing(dec, coalescing));
-        EXPECT_EQ(JXL_DEC_SUCCESS,
-                  JxlDecoderSetKeepOrientation(dec, keep_orientation));
-        void* runner = JxlThreadParallelRunnerCreate(
-            nullptr, JxlThreadParallelRunnerDefaultNumWorkerThreads());
-        EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetParallelRunner(
-                                       dec, JxlThreadParallelRunner, runner));
-        EXPECT_EQ(JXL_DEC_SUCCESS,
-                  JxlDecoderSubscribeEvents(dec, JXL_DEC_FULL_IMAGE));
-        EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-        for (size_t i = (coalescing ? 0 : 1); i < (coalescing ? 1 : 4); ++i) {
-          EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-          JxlFrameHeader frame_header;
-          EXPECT_EQ(JXL_DEC_SUCCESS,
-                    JxlDecoderGetFrameHeader(dec, &frame_header));
-          size_t buffer_size;
-          EXPECT_EQ(JXL_DEC_SUCCESS,
-                    JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-          if (coalescing) {
-            EXPECT_EQ(xsize * ysize * 8, buffer_size);
-          } else {
-            EXPECT_EQ(frame_header.layer_info.xsize *
-                          frame_header.layer_info.ysize * 8,
-                      buffer_size);
-          }
-          frames[i].resize(buffer_size);
-          EXPECT_EQ(JXL_DEC_SUCCESS,
-                    JxlDecoderSetImageOutBuffer(dec, &format, frames[i].data(),
-                                                frames[i].size()));
-          EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-          EXPECT_EQ(frame_header.layer_info.blend_info.blendmode,
-                    JXL_BLEND_REPLACE);
-          if (coalescing) {
-            EXPECT_EQ(frame_header.layer_info.xsize, oxsize);
-            EXPECT_EQ(frame_header.layer_info.ysize, oysize);
-            EXPECT_EQ(frame_header.layer_info.crop_x0, 0);
-            EXPECT_EQ(frame_header.layer_info.crop_y0, 0);
-          } else {
-            // manually merge this layer
-            int x0 = frame_header.layer_info.crop_x0;
-            int y0 = frame_header.layer_info.crop_y0;
-            int w = frame_header.layer_info.xsize;
-            int h = frame_header.layer_info.ysize;
-            for (int y = 0; y < static_cast<int>(oysize); y++) {
-              if (y < y0 || y >= y0 + h) continue;
-              // pointers do whole 16-bit RGBA pixels at a time
-              uint64_t* row_merged = reinterpret_cast<uint64_t*>(
-                  frames[4].data() + y * oxsize * 8);
-              uint64_t* row_layer = reinterpret_cast<uint64_t*>(
-                  frames[i].data() + (y - y0) * w * 8);
-              for (int x = 0; x < static_cast<int>(oxsize); x++) {
-                if (x < x0 || x >= x0 + w) continue;
-                row_merged[x] = row_layer[x - x0];
-              }
-            }
-          }
-        }
-
-        // After all frames were decoded, JxlDecoderProcessInput should return
-        // success to indicate all is done.
-        EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderProcessInput(dec));
-        JxlThreadParallelRunnerDestroy(runner);
-        JxlDecoderDestroy(dec);
-      }
-    }
-
-    EXPECT_EQ(0u, jxl::test::ComparePixels(frames[0].data(), frames[4].data(),
-                                           oxsize, oysize, format, format));
-  };
-
-  for (bool keep_orientation : {true, false}) {
-    for (uint32_t orientation = 1; orientation <= 8; orientation++) {
-      for (uint32_t resampling : {1, 2, 4, 8}) {
-        SCOPED_TRACE(testing::Message()
-                     << "keep_orientation: " << keep_orientation << ", "
-                     << "orientation: " << orientation << ", "
-                     << "resampling: " << resampling);
-        test(keep_orientation, orientation, resampling);
-      }
-    }
-  }
-}
-
-struct FramePositions {
-  size_t frame_start;
-  size_t header_end;
-  size_t toc_end;
-  std::vector<size_t> section_end;
-};
-
-struct StreamPositions {
-  size_t codestream_start;
-  size_t codestream_end;
-  size_t basic_info;
-  size_t jbrd_end = 0;
-  std::vector<size_t> box_start;
-  std::vector<FramePositions> frames;
-};
-
-void AnalyzeCodestream(const std::vector<uint8_t>& data,
-                       StreamPositions* streampos) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  // Unbox data to codestream and mark where it is broken up by boxes.
-  std::vector<uint8_t> codestream;
-  std::vector<std::pair<size_t, size_t>> breakpoints;
-  bool codestream_end = false;
-  ASSERT_LE(2, data.size());
-  if (data[0] == 0xff && data[1] == 0x0a) {
-    codestream = std::vector<uint8_t>(data.begin(), data.end());
-    streampos->codestream_start = 0;
-  } else {
-    const uint8_t* in = data.data();
-    size_t pos = 0;
-    while (pos < data.size()) {
-      ASSERT_LE(pos + 8, data.size());
-      streampos->box_start.push_back(pos);
-      size_t box_size = LoadBE32(in + pos);
-      if (box_size == 0) box_size = data.size() - pos;
-      ASSERT_LE(pos + box_size, data.size());
-      if (memcmp(in + pos + 4, "jxlc", 4) == 0) {
-        EXPECT_TRUE(codestream.empty());
-        streampos->codestream_start = pos + 8;
-        codestream.insert(codestream.end(), in + pos + 8, in + pos + box_size);
-        codestream_end = true;
-      } else if (memcmp(in + pos + 4, "jxlp", 4) == 0) {
-        codestream_end = ((LoadBE32(in + pos + 8) & 0x80000000) != 0);
-        if (codestream.empty()) {
-          streampos->codestream_start = pos + 12;
-        } else if (box_size > 12 || !codestream_end) {
-          breakpoints.emplace_back(codestream.size(), 12);
-        }
-        codestream.insert(codestream.end(), in + pos + 12, in + pos + box_size);
-      } else if (memcmp(in + pos + 4, "jbrd", 4) == 0) {
-        EXPECT_TRUE(codestream.empty());
-        streampos->jbrd_end = pos + box_size;
-      } else if (!codestream.empty() && !codestream_end) {
-        breakpoints.emplace_back(codestream.size(), box_size);
-      }
-      pos += box_size;
-    }
-    ASSERT_EQ(pos, data.size());
-  }
-  // Translate codestream positions to boxed stream positions.
-  size_t offset = streampos->codestream_start;
-  size_t bp = 0;
-  auto add_offset = [&](size_t pos) {
-    while (bp < breakpoints.size() && pos >= breakpoints[bp].first) {
-      offset += breakpoints[bp++].second;
-    }
-    return pos + offset;
-  };
-  // Analyze the unboxed codestream.
-  jxl::BitReader br(jxl::Bytes(codestream.data(), codestream.size()));
-  ASSERT_EQ(br.ReadFixedBits<16>(), 0x0AFF);
-  jxl::CodecMetadata metadata;
-  ASSERT_TRUE(ReadSizeHeader(&br, &metadata.size));
-  ASSERT_TRUE(ReadImageMetadata(&br, &metadata.m));
-  streampos->basic_info =
-      add_offset(br.TotalBitsConsumed() / jxl::kBitsPerByte);
-  metadata.transform_data.nonserialized_xyb_encoded = metadata.m.xyb_encoded;
-  ASSERT_TRUE(jxl::Bundle::Read(&br, &metadata.transform_data));
-  if (metadata.m.color_encoding.WantICC()) {
-    std::vector<uint8_t> icc;
-    ASSERT_TRUE(jxl::test::ReadICC(&br, &icc));
-    ASSERT_TRUE(!icc.empty());
-    metadata.m.color_encoding.SetICCRaw(std::move(icc));
-  }
-  ASSERT_TRUE(br.JumpToByteBoundary());
-  bool has_preview = metadata.m.have_preview;
-  while (br.TotalBitsConsumed() < br.TotalBytes() * jxl::kBitsPerByte) {
-    FramePositions p;
-    p.frame_start = add_offset(br.TotalBitsConsumed() / jxl::kBitsPerByte);
-    jxl::FrameHeader frame_header(&metadata);
-    if (has_preview) {
-      frame_header.nonserialized_is_preview = true;
-      has_preview = false;
-    }
-    ASSERT_TRUE(ReadFrameHeader(&br, &frame_header));
-    p.header_end =
-        add_offset(jxl::DivCeil(br.TotalBitsConsumed(), jxl::kBitsPerByte));
-    jxl::FrameDimensions frame_dim = frame_header.ToFrameDimensions();
-    uint64_t groups_total_size;
-    const size_t toc_entries =
-        jxl::NumTocEntries(frame_dim.num_groups, frame_dim.num_dc_groups,
-                           frame_header.passes.num_passes);
-    std::vector<uint64_t> section_offsets;
-    std::vector<uint32_t> section_sizes;
-    ASSERT_TRUE(ReadGroupOffsets(memory_manager, toc_entries, &br,
-                                 &section_offsets, &section_sizes,
-                                 &groups_total_size));
-    EXPECT_EQ(br.TotalBitsConsumed() % jxl::kBitsPerByte, 0);
-    size_t sections_start = br.TotalBitsConsumed() / jxl::kBitsPerByte;
-    p.toc_end = add_offset(sections_start);
-    for (size_t i = 0; i < toc_entries; ++i) {
-      size_t end = sections_start + section_offsets[i] + section_sizes[i];
-      p.section_end.push_back(add_offset(end));
-    }
-    br.SkipBits(groups_total_size * jxl::kBitsPerByte);
-    streampos->frames.push_back(p);
-  }
-  streampos->codestream_end = add_offset(codestream.size());
-  EXPECT_EQ(br.TotalBitsConsumed(), br.TotalBytes() * jxl::kBitsPerByte);
-  EXPECT_TRUE(br.Close());
-}
-
-enum ExpectedFlushState { NO_FLUSH, SAME_FLUSH, NEW_FLUSH };
-struct Breakpoint {
-  size_t file_pos;
-  ExpectedFlushState expect_flush;
-};
-
-void VerifyProgression(size_t xsize, size_t ysize, uint32_t num_channels,
-                       const std::vector<uint8_t>& pixels,
-                       const std::vector<uint8_t>& data,
-                       std::vector<Breakpoint> breakpoints) {
-  // Size large enough for multiple groups, required to have progressive stages.
-  ASSERT_LT(256, xsize);
-  ASSERT_LT(256, ysize);
-  std::vector<uint8_t> pixels2;
-  pixels2.resize(pixels.size());
-  JxlPixelFormat format = {num_channels, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(
-                dec, JXL_DEC_BASIC_INFO | JXL_DEC_FRAME | JXL_DEC_FULL_IMAGE));
-  int bp = 0;
-  const uint8_t* next_in = data.data();
-  size_t avail_in = breakpoints[bp].file_pos;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-  double prev_dist = 1.0;
-  for (;;) {
-    JxlDecoderStatus status = JxlDecoderProcessInput(dec);
-    printf("bp: %d  status: 0x%x\n", bp, static_cast<int>(status));
-    if (status == JXL_DEC_BASIC_INFO) {
-      JxlBasicInfo info;
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-      EXPECT_EQ(info.xsize, xsize);
-      EXPECT_EQ(info.ysize, ysize);
-      // Output buffer/callback not yet set
-      EXPECT_EQ(JXL_DEC_ERROR, JxlDecoderFlushImage(dec));
-      size_t buffer_size;
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-      EXPECT_EQ(pixels2.size(), buffer_size);
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderSetImageOutBuffer(dec, &format, pixels2.data(),
-                                            pixels2.size()));
-    } else if (status == JXL_DEC_FRAME) {
-      // Nothing to do.
-    } else if (status == JXL_DEC_SUCCESS) {
-      EXPECT_EQ(bp + 1, breakpoints.size());
-      break;
-    } else if (status == JXL_DEC_NEED_MORE_INPUT ||
-               status == JXL_DEC_FULL_IMAGE) {
-      if (breakpoints[bp].expect_flush == NO_FLUSH) {
-        EXPECT_EQ(JXL_DEC_ERROR, JxlDecoderFlushImage(dec));
-      } else {
-        if (status != JXL_DEC_FULL_IMAGE) {
-          EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderFlushImage(dec));
-        }
-        double dist = jxl::test::DistanceRMS(pixels2.data(), pixels.data(),
-                                             xsize, ysize, format);
-        if (breakpoints[bp].expect_flush == NEW_FLUSH) {
-          EXPECT_LT(dist, prev_dist);
-          prev_dist = dist;
-        } else {
-          EXPECT_EQ(dist, prev_dist);
-        }
-      }
-      if (status == JXL_DEC_FULL_IMAGE) {
-        EXPECT_EQ(bp + 1, breakpoints.size());
-        continue;
-      }
-      ASSERT_LT(++bp, breakpoints.size());
-      next_in += avail_in - JxlDecoderReleaseInput(dec);
-      avail_in = breakpoints[bp].file_pos - (next_in - data.data());
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-    } else {
-      printf("Unexpected status: 0x%x\n", static_cast<int>(status));
-      FAIL();  // unexpected returned status
-    }
-  }
-  JxlDecoderDestroy(dec);
-}
-
-TEST(DecodeTest, ProgressionTest) {
-  size_t xsize = 508;
-  size_t ysize = 470;
-  uint32_t num_channels = 3;
-  std::vector<uint8_t> pixels =
-      jxl::test::GetSomeTestImage(xsize, ysize, num_channels, 0);
-  jxl::TestCodestreamParams params;
-  params.cparams.progressive_dc = 1;
-  params.preview_mode = jxl::kSmallPreview;
-  std::vector<uint8_t> data =
-      jxl::CreateTestJXLCodestream(jxl::Bytes(pixels.data(), pixels.size()),
-                                   xsize, ysize, num_channels, params);
-  StreamPositions streampos;
-  AnalyzeCodestream(data, &streampos);
-  const std::vector<FramePositions>& fp = streampos.frames;
-  // We have preview, dc frame and regular frame.
-  EXPECT_EQ(3, fp.size());
-  EXPECT_EQ(7, fp[2].section_end.size());
-  EXPECT_EQ(data.size(), fp[2].section_end[6]);
-  std::vector<Breakpoint> breakpoints{
-      {fp[0].frame_start, NO_FLUSH},           // headers
-      {fp[1].frame_start, NO_FLUSH},           // preview
-      {fp[2].frame_start, NO_FLUSH},           // dc frame
-      {fp[2].section_end[0], NO_FLUSH},        // DC global
-      {fp[2].section_end[1] - 1, NO_FLUSH},    // partial DC group
-      {fp[2].section_end[1], NEW_FLUSH},       // DC group
-      {fp[2].section_end[2], SAME_FLUSH},      // AC global
-      {fp[2].section_end[3], NEW_FLUSH},       // AC group 0
-      {fp[2].section_end[4] - 1, SAME_FLUSH},  // partial AC group 1
-      {fp[2].section_end[4], NEW_FLUSH},       // AC group 1
-      {fp[2].section_end[5], NEW_FLUSH},       // AC group 2
-      {data.size() - 1, SAME_FLUSH},           // partial AC group 3
-      {data.size(), NEW_FLUSH}};               // full image
-  VerifyProgression(xsize, ysize, num_channels, pixels, data, breakpoints);
-}
-
-TEST(DecodeTest, ProgressionTestLosslessAlpha) {
-  size_t xsize = 508;
-  size_t ysize = 470;
-  uint32_t num_channels = 4;
-  std::vector<uint8_t> pixels =
-      jxl::test::GetSomeTestImage(xsize, ysize, num_channels, 0);
-  jxl::TestCodestreamParams params;
-  params.cparams.SetLossless();
-  params.cparams.speed_tier = jxl::SpeedTier::kThunder;
-  params.cparams.responsive = 1;
-  std::vector<uint8_t> data =
-      jxl::CreateTestJXLCodestream(jxl::Bytes(pixels.data(), pixels.size()),
-                                   xsize, ysize, num_channels, params);
-  StreamPositions streampos;
-  AnalyzeCodestream(data, &streampos);
-  const std::vector<FramePositions>& fp = streampos.frames;
-  // We have preview, dc frame and regular frame.
-  EXPECT_EQ(1, fp.size());
-  EXPECT_EQ(7, fp[0].section_end.size());
-  EXPECT_EQ(data.size(), fp[0].section_end[6]);
-  std::vector<Breakpoint> breakpoints{
-      {fp[0].frame_start, NO_FLUSH},           // headers
-      {fp[0].section_end[0] - 1, NO_FLUSH},    // partial DC global
-      {fp[0].section_end[0], NEW_FLUSH},       // DC global
-      {fp[0].section_end[1], SAME_FLUSH},      // DC group
-      {fp[0].section_end[2], SAME_FLUSH},      // AC global
-      {fp[0].section_end[3], NEW_FLUSH},       // AC group 0
-      {fp[0].section_end[4] - 1, SAME_FLUSH},  // partial AC group 1
-      {fp[0].section_end[4], NEW_FLUSH},       // AC group 1
-      {fp[0].section_end[5], NEW_FLUSH},       // AC group 2
-      {data.size() - 1, SAME_FLUSH},           // partial AC group 3
-      {data.size(), NEW_FLUSH}};               // full image
-  VerifyProgression(xsize, ysize, num_channels, pixels, data, breakpoints);
-}
-
-void VerifyFilePosition(size_t expected_pos, const std::vector<uint8_t>& data,
-                        JxlDecoder* dec) {
-  size_t remaining = JxlDecoderReleaseInput(dec);
-  size_t pos = data.size() - remaining;
-  EXPECT_EQ(expected_pos, pos);
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetInput(dec, data.data() + pos, remaining));
-}
-
-TEST(DecodeTest, InputHandlingTestOneShot) {
-  size_t xsize = 508;
-  size_t ysize = 470;
-  uint32_t num_channels = 3;
-  std::vector<uint8_t> pixels =
-      jxl::test::GetSomeTestImage(xsize, ysize, num_channels, 0);
-  for (int i = 0; i < kCSBF_NUM_ENTRIES; ++i) {
-    printf("Testing with box format %d\n", i);
-    jxl::TestCodestreamParams params;
-    params.cparams.progressive_dc = 1;
-    params.preview_mode = jxl::kSmallPreview;
-    params.box_format = static_cast<CodeStreamBoxFormat>(i);
-    std::vector<uint8_t> data =
-        jxl::CreateTestJXLCodestream(jxl::Bytes(pixels.data(), pixels.size()),
-                                     xsize, ysize, num_channels, params);
-    JxlPixelFormat format = {num_channels, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-    StreamPositions streampos;
-    AnalyzeCodestream(data, &streampos);
-    const std::vector<FramePositions>& fp = streampos.frames;
-    // We have preview, dc frame and regular frame.
-    EXPECT_EQ(3, fp.size());
-
-    std::vector<uint8_t> pixels2;
-    pixels2.resize(pixels.size());
-
-    int kNumEvents = 6;
-    int events[] = {
-        JXL_DEC_BASIC_INFO, JXL_DEC_COLOR_ENCODING, JXL_DEC_PREVIEW_IMAGE,
-        JXL_DEC_FRAME,      JXL_DEC_FULL_IMAGE,     JXL_DEC_FRAME_PROGRESSION,
-    };
-    size_t end_positions[] = {
-        streampos.basic_info,     fp[0].frame_start,
-        fp[1].frame_start,        fp[2].toc_end,
-        streampos.codestream_end, streampos.codestream_end};
-    int events_wanted = 0;
-    for (int j = 0; j < kNumEvents; ++j) {
-      events_wanted |= events[j];
-      size_t end_pos = end_positions[j];
-      JxlDecoder* dec = JxlDecoderCreate(nullptr);
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSubscribeEvents(dec, events_wanted));
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderSetInput(dec, data.data(), data.size()));
-      EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-      VerifyFilePosition(streampos.basic_info, data, dec);
-      if (j >= 1) {
-        EXPECT_EQ(JXL_DEC_COLOR_ENCODING, JxlDecoderProcessInput(dec));
-        VerifyFilePosition(fp[0].frame_start, data, dec);
-      }
-      if (j >= 2) {
-        EXPECT_EQ(JXL_DEC_NEED_PREVIEW_OUT_BUFFER, JxlDecoderProcessInput(dec));
-        VerifyFilePosition(fp[0].toc_end, data, dec);
-        size_t buffer_size;
-        EXPECT_EQ(JXL_DEC_SUCCESS,
-                  JxlDecoderPreviewOutBufferSize(dec, &format, &buffer_size));
-        EXPECT_GE(pixels2.size(), buffer_size);
-        EXPECT_EQ(JXL_DEC_SUCCESS,
-                  JxlDecoderSetPreviewOutBuffer(dec, &format, pixels2.data(),
-                                                buffer_size));
-        EXPECT_EQ(JXL_DEC_PREVIEW_IMAGE, JxlDecoderProcessInput(dec));
-        VerifyFilePosition(fp[1].frame_start, data, dec);
-      }
-      if (j >= 3) {
-        EXPECT_EQ(JXL_DEC_FRAME, JxlDecoderProcessInput(dec));
-        VerifyFilePosition(fp[2].toc_end, data, dec);
-        if (j >= 5) {
-          EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetProgressiveDetail(dec, kDC));
-        }
-      }
-      if (j >= 4) {
-        EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-        VerifyFilePosition(fp[2].toc_end, data, dec);
-        size_t buffer_size;
-        EXPECT_EQ(JXL_DEC_SUCCESS,
-                  JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-        EXPECT_EQ(pixels2.size(), buffer_size);
-        EXPECT_EQ(JXL_DEC_SUCCESS,
-                  JxlDecoderSetImageOutBuffer(dec, &format, pixels2.data(),
-                                              pixels2.size()));
-        if (j >= 5) {
-          EXPECT_EQ(JXL_DEC_FRAME_PROGRESSION, JxlDecoderProcessInput(dec));
-          VerifyFilePosition(fp[2].section_end[1], data, dec);
-        }
-        EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-        VerifyFilePosition(streampos.codestream_end, data, dec);
-      }
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderProcessInput(dec));
-      VerifyFilePosition(end_pos, data, dec);
-      JxlDecoderDestroy(dec);
-    }
-  }
-}
-
-JXL_TRANSCODE_JPEG_TEST(DecodeTest, InputHandlingTestJPEGOneshot) {
-  TEST_LIBJPEG_SUPPORT();
-  size_t xsize = 123;
-  size_t ysize = 77;
-  size_t channels = 3;
-  std::vector<uint8_t> pixels =
-      jxl::test::GetSomeTestImage(xsize, ysize, channels, /*seed=*/0);
-  for (int i = 1; i < kCSBF_NUM_ENTRIES; ++i) {
-    printf("Testing with box format %d\n", i);
-    std::vector<uint8_t> jpeg_codestream;
-    jxl::TestCodestreamParams params;
-    params.cparams.color_transform = jxl::ColorTransform::kNone;
-    params.jpeg_codestream = &jpeg_codestream;
-    params.preview_mode = jxl::kSmallPreview;
-    params.box_format = static_cast<CodeStreamBoxFormat>(i);
-    std::vector<uint8_t> data =
-        jxl::CreateTestJXLCodestream(jxl::Bytes(pixels.data(), pixels.size()),
-                                     xsize, ysize, channels, params);
-    JxlPixelFormat format = {3, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-    StreamPositions streampos;
-    AnalyzeCodestream(data, &streampos);
-    const std::vector<FramePositions>& fp = streampos.frames;
-    // We have preview and regular frame.
-    EXPECT_EQ(2, fp.size());
-    EXPECT_LT(0, streampos.jbrd_end);
-
-    std::vector<uint8_t> pixels2;
-    pixels2.resize(pixels.size());
-
-    int kNumEvents = 6;
-    int events[] = {JXL_DEC_BASIC_INFO,     JXL_DEC_JPEG_RECONSTRUCTION,
-                    JXL_DEC_COLOR_ENCODING, JXL_DEC_PREVIEW_IMAGE,
-                    JXL_DEC_FRAME,          JXL_DEC_FULL_IMAGE};
-    size_t end_positions[] = {streampos.basic_info, streampos.basic_info,
-                              fp[0].frame_start,    fp[1].frame_start,
-                              fp[1].toc_end,        streampos.codestream_end};
-    int events_wanted = 0;
-    for (int j = 0; j < kNumEvents; ++j) {
-      printf("j = %d\n", j);
-      events_wanted |= events[j];
-      size_t end_pos = end_positions[j];
-      JxlDecoder* dec = JxlDecoderCreate(nullptr);
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSubscribeEvents(dec, events_wanted));
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderSetInput(dec, data.data(), data.size()));
-      if (j >= 1) {
-        EXPECT_EQ(JXL_DEC_JPEG_RECONSTRUCTION, JxlDecoderProcessInput(dec));
-        VerifyFilePosition(streampos.jbrd_end, data, dec);
-      }
-      EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-      VerifyFilePosition(streampos.basic_info, data, dec);
-      if (j >= 2) {
-        EXPECT_EQ(JXL_DEC_COLOR_ENCODING, JxlDecoderProcessInput(dec));
-        VerifyFilePosition(fp[0].frame_start, data, dec);
-      }
-      if (j >= 3) {
-        EXPECT_EQ(JXL_DEC_NEED_PREVIEW_OUT_BUFFER, JxlDecoderProcessInput(dec));
-        VerifyFilePosition(fp[0].toc_end, data, dec);
-        size_t buffer_size;
-        EXPECT_EQ(JXL_DEC_SUCCESS,
-                  JxlDecoderPreviewOutBufferSize(dec, &format, &buffer_size));
-        EXPECT_GE(pixels2.size(), buffer_size);
-        EXPECT_EQ(JXL_DEC_SUCCESS,
-                  JxlDecoderSetPreviewOutBuffer(dec, &format, pixels2.data(),
-                                                buffer_size));
-        EXPECT_EQ(JXL_DEC_PREVIEW_IMAGE, JxlDecoderProcessInput(dec));
-        VerifyFilePosition(fp[1].frame_start, data, dec);
-      }
-      if (j >= 4) {
-        EXPECT_EQ(JXL_DEC_FRAME, JxlDecoderProcessInput(dec));
-        VerifyFilePosition(fp[1].toc_end, data, dec);
-      }
-      if (j >= 5) {
-        EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-        VerifyFilePosition(fp[1].toc_end, data, dec);
-        size_t buffer_size;
-        EXPECT_EQ(JXL_DEC_SUCCESS,
-                  JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-        EXPECT_EQ(pixels2.size(), buffer_size);
-        EXPECT_EQ(JXL_DEC_SUCCESS,
-                  JxlDecoderSetImageOutBuffer(dec, &format, pixels2.data(),
-                                              pixels2.size()));
-        EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-        VerifyFilePosition(streampos.codestream_end, data, dec);
-      }
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderProcessInput(dec));
-      VerifyFilePosition(end_pos, data, dec);
-      JxlDecoderDestroy(dec);
-    }
-  }
-}
-
-TEST(DecodeTest, InputHandlingTestStreaming) {
-  size_t xsize = 508;
-  size_t ysize = 470;
-  uint32_t num_channels = 3;
-  std::vector<uint8_t> pixels =
-      jxl::test::GetSomeTestImage(xsize, ysize, num_channels, 0);
-  for (int i = 0; i < kCSBF_NUM_ENTRIES; ++i) {
-    printf("Testing with box format %d\n", i);
-    fflush(stdout);
-    jxl::TestCodestreamParams params;
-    params.cparams.progressive_dc = 1;
-    params.box_format = static_cast<CodeStreamBoxFormat>(i);
-    params.preview_mode = jxl::kSmallPreview;
-    std::vector<uint8_t> data =
-        jxl::CreateTestJXLCodestream(jxl::Bytes(pixels.data(), pixels.size()),
-                                     xsize, ysize, num_channels, params);
-    JxlPixelFormat format = {num_channels, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-    StreamPositions streampos;
-    AnalyzeCodestream(data, &streampos);
-    const std::vector<FramePositions>& fp = streampos.frames;
-    // We have preview, dc frame and regular frame.
-    EXPECT_EQ(3, fp.size());
-    std::vector<uint8_t> pixels2;
-    pixels2.resize(pixels.size());
-    int events_wanted =
-        (JXL_DEC_BASIC_INFO | JXL_DEC_COLOR_ENCODING | JXL_DEC_PREVIEW_IMAGE |
-         JXL_DEC_FRAME | JXL_DEC_FULL_IMAGE | JXL_DEC_FRAME_PROGRESSION |
-         JXL_DEC_BOX);
-    for (size_t increment : {1, 7, 27, 1024}) {
-      JxlDecoder* dec = JxlDecoderCreate(nullptr);
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSubscribeEvents(dec, events_wanted));
-      size_t file_pos = 0;
-      size_t box_index = 0;
-      size_t avail_in = 0;
-      for (;;) {
-        const uint8_t* next_in = data.data() + file_pos;
-        EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-        JxlDecoderStatus status = JxlDecoderProcessInput(dec);
-        size_t remaining = JxlDecoderReleaseInput(dec);
-        size_t consumed = avail_in - remaining;
-        file_pos += consumed;
-        avail_in += increment;
-        avail_in = std::min<size_t>(avail_in, data.size() - file_pos);
-        if (status == JXL_DEC_BASIC_INFO) {
-          EXPECT_EQ(file_pos, streampos.basic_info);
-        } else if (status == JXL_DEC_COLOR_ENCODING) {
-          EXPECT_EQ(file_pos, streampos.frames[0].frame_start);
-        } else if (status == JXL_DEC_NEED_PREVIEW_OUT_BUFFER) {
-          EXPECT_EQ(file_pos, streampos.frames[0].toc_end);
-          size_t buffer_size;
-          EXPECT_EQ(JXL_DEC_SUCCESS,
-                    JxlDecoderPreviewOutBufferSize(dec, &format, &buffer_size));
-          EXPECT_GE(pixels2.size(), buffer_size);
-          EXPECT_EQ(JXL_DEC_SUCCESS,
-                    JxlDecoderSetPreviewOutBuffer(dec, &format, pixels2.data(),
-                                                  buffer_size));
-        } else if (status == JXL_DEC_PREVIEW_IMAGE) {
-          EXPECT_EQ(file_pos, streampos.frames[1].frame_start);
-        } else if (status == JXL_DEC_FRAME) {
-          EXPECT_EQ(file_pos, streampos.frames[2].toc_end);
-          EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetProgressiveDetail(dec, kDC));
-        } else if (status == JXL_DEC_NEED_IMAGE_OUT_BUFFER) {
-          EXPECT_EQ(file_pos, streampos.frames[2].toc_end);
-          size_t buffer_size;
-          EXPECT_EQ(JXL_DEC_SUCCESS,
-                    JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-          EXPECT_EQ(pixels2.size(), buffer_size);
-          EXPECT_EQ(JXL_DEC_SUCCESS,
-                    JxlDecoderSetImageOutBuffer(dec, &format, pixels2.data(),
-                                                pixels2.size()));
-        } else if (status == JXL_DEC_FRAME_PROGRESSION) {
-          EXPECT_EQ(file_pos, streampos.frames[2].section_end[1]);
-        } else if (status == JXL_DEC_FULL_IMAGE) {
-          EXPECT_EQ(file_pos, streampos.codestream_end);
-        } else if (status == JXL_DEC_SUCCESS) {
-          EXPECT_EQ(file_pos, streampos.codestream_end);
-          break;
-        } else if (status == JXL_DEC_NEED_MORE_INPUT) {
-          EXPECT_LT(remaining, 12);
-          if ((i == kCSBF_None && file_pos >= 2) ||
-              (box_index > 0 && box_index < streampos.box_start.size() &&
-               file_pos >= streampos.box_start[box_index - 1] + 12 &&
-               file_pos < streampos.box_start[box_index])) {
-            EXPECT_EQ(remaining, 0);
-          }
-          if (file_pos == data.size()) break;
-        } else if (status == JXL_DEC_BOX) {
-          ASSERT_LT(box_index, streampos.box_start.size());
-          EXPECT_EQ(file_pos, streampos.box_start[box_index++]);
-        } else {
-          printf("Unexpected status: 0x%x\n", static_cast<int>(status));
-          FAIL();
-        }
-      }
-      JxlDecoderDestroy(dec);
-    }
-  }
-}
-
-TEST(DecodeTest, FlushTest) {
-  // Size large enough for multiple groups, required to have progressive
-  // stages
-  size_t xsize = 333;
-  size_t ysize = 300;
-  uint32_t num_channels = 3;
-  std::vector<uint8_t> pixels =
-      jxl::test::GetSomeTestImage(xsize, ysize, num_channels, 0);
-  jxl::TestCodestreamParams params;
-  params.preview_mode = jxl::kSmallPreview;
-  std::vector<uint8_t> data =
-      jxl::CreateTestJXLCodestream(jxl::Bytes(pixels.data(), pixels.size()),
-                                   xsize, ysize, num_channels, params);
-  JxlPixelFormat format = {num_channels, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-
-  std::vector<uint8_t> pixels2;
-  pixels2.resize(pixels.size());
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(
-                dec, JXL_DEC_BASIC_INFO | JXL_DEC_FRAME | JXL_DEC_FULL_IMAGE));
-
-  // Ensure that the first part contains at least the full DC of the image,
-  // otherwise flush does not work.
-  size_t first_part = data.size() - 1;
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, data.data(), first_part));
-
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-  JxlBasicInfo info;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-  EXPECT_EQ(info.xsize, xsize);
-  EXPECT_EQ(info.ysize, ysize);
-
-  EXPECT_EQ(JXL_DEC_FRAME, JxlDecoderProcessInput(dec));
-
-  // Output buffer not yet set
-  EXPECT_EQ(JXL_DEC_ERROR, JxlDecoderFlushImage(dec));
-
-  size_t buffer_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-  EXPECT_EQ(pixels2.size(), buffer_size);
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(
-                                 dec, &format, pixels2.data(), pixels2.size()));
-
-  // Must process input further until we get JXL_DEC_NEED_MORE_INPUT, even if
-  // data was already input before, since the processing of the frame only
-  // happens at the JxlDecoderProcessInput call after JXL_DEC_FRAME.
-  EXPECT_EQ(JXL_DEC_NEED_MORE_INPUT, JxlDecoderProcessInput(dec));
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderFlushImage(dec));
-
-  // Crude test of actual pixel data: pixel threshold of about 4% (2560/65535).
-  // 29000 pixels can be above the threshold
-  EXPECT_LE(jxl::test::ComparePixels(pixels2.data(), pixels.data(), xsize,
-                                     ysize, format, format, 2560.0),
-            29000u);
-
-  EXPECT_EQ(JXL_DEC_NEED_MORE_INPUT, JxlDecoderProcessInput(dec));
-
-  size_t consumed = first_part - JxlDecoderReleaseInput(dec);
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, data.data() + consumed,
-                                                data.size() - consumed));
-  EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-  // Lower threshold for the final (still lossy) image
-  EXPECT_LE(jxl::test::ComparePixels(pixels2.data(), pixels.data(), xsize,
-                                     ysize, format, format, 2560.0),
-            11000u);
-
-  JxlDecoderDestroy(dec);
-}
-
-TEST(DecodeTest, FlushTestImageOutCallback) {
-  // Size large enough for multiple groups, required to have progressive
-  // stages
-  size_t xsize = 333;
-  size_t ysize = 300;
-  uint32_t num_channels = 3;
-  std::vector<uint8_t> pixels =
-      jxl::test::GetSomeTestImage(xsize, ysize, num_channels, 0);
-  jxl::TestCodestreamParams params;
-  params.preview_mode = jxl::kSmallPreview;
-  std::vector<uint8_t> data =
-      jxl::CreateTestJXLCodestream(jxl::Bytes(pixels.data(), pixels.size()),
-                                   xsize, ysize, num_channels, params);
-  JxlPixelFormat format = {num_channels, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-
-  std::vector<uint8_t> pixels2;
-  pixels2.resize(pixels.size());
-
-  size_t bytes_per_pixel = format.num_channels * 2;
-  size_t stride = bytes_per_pixel * xsize;
-  auto callback = [&](size_t x, size_t y, size_t num_pixels,
-                      const void* pixels_row) {
-    memcpy(pixels2.data() + stride * y + bytes_per_pixel * x, pixels_row,
-           num_pixels * bytes_per_pixel);
-  };
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(
-                dec, JXL_DEC_BASIC_INFO | JXL_DEC_FRAME | JXL_DEC_FULL_IMAGE));
-
-  // Ensure that the first part contains at least the full DC of the image,
-  // otherwise flush does not work.
-  size_t first_part = data.size() - 1;
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, data.data(), first_part));
-
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-  JxlBasicInfo info;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-  EXPECT_EQ(info.xsize, xsize);
-  EXPECT_EQ(info.ysize, ysize);
-
-  EXPECT_EQ(JXL_DEC_FRAME, JxlDecoderProcessInput(dec));
-
-  // Output callback not yet set
-  EXPECT_EQ(JXL_DEC_ERROR, JxlDecoderFlushImage(dec));
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutCallback(
-                                 dec, &format,
-                                 [](void* opaque, size_t x, size_t y,
-                                    size_t xsize, const void* pixels_row) {
-                                   auto cb =
-                                       static_cast<decltype(&callback)>(opaque);
-                                   (*cb)(x, y, xsize, pixels_row);
-                                 },
-                                 /*opaque=*/&callback));
-
-  // Must process input further until we get JXL_DEC_NEED_MORE_INPUT, even if
-  // data was already input before, since the processing of the frame only
-  // happens at the JxlDecoderProcessInput call after JXL_DEC_FRAME.
-  EXPECT_EQ(JXL_DEC_NEED_MORE_INPUT, JxlDecoderProcessInput(dec));
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderFlushImage(dec));
-
-  // Crude test of actual pixel data: pixel threshold of about 4% (2560/65535).
-  // 29000 pixels can be above the threshold
-  EXPECT_LE(jxl::test::ComparePixels(pixels2.data(), pixels.data(), xsize,
-                                     ysize, format, format, 2560.0),
-            29000u);
-
-  EXPECT_EQ(JXL_DEC_NEED_MORE_INPUT, JxlDecoderProcessInput(dec));
-
-  size_t consumed = first_part - JxlDecoderReleaseInput(dec);
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, data.data() + consumed,
-                                                data.size() - consumed));
-  EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-  // Lower threshold for the final (still lossy) image
-  EXPECT_LE(jxl::test::ComparePixels(pixels2.data(), pixels.data(), xsize,
-                                     ysize, format, format, 2560.0),
-            11000u);
-
-  JxlDecoderDestroy(dec);
-}
-
-TEST(DecodeTest, FlushTestLossyProgressiveAlpha) {
-  // Size large enough for multiple groups, required to have progressive
-  // stages
-  size_t xsize = 333;
-  size_t ysize = 300;
-  uint32_t num_channels = 4;
-  std::vector<uint8_t> pixels =
-      jxl::test::GetSomeTestImage(xsize, ysize, num_channels, 0);
-  jxl::TestCodestreamParams params;
-  params.preview_mode = jxl::kSmallPreview;
-  std::vector<uint8_t> data =
-      jxl::CreateTestJXLCodestream(jxl::Bytes(pixels.data(), pixels.size()),
-                                   xsize, ysize, num_channels, params);
-  JxlPixelFormat format = {num_channels, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-
-  std::vector<uint8_t> pixels2;
-  pixels2.resize(pixels.size());
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(
-                dec, JXL_DEC_BASIC_INFO | JXL_DEC_FRAME | JXL_DEC_FULL_IMAGE));
-
-  // Ensure that the first part contains at least the full DC of the image,
-  // otherwise flush does not work.
-  size_t first_part = data.size() - 1;
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, data.data(), first_part));
-
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-  JxlBasicInfo info;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-  EXPECT_EQ(info.xsize, xsize);
-  EXPECT_EQ(info.ysize, ysize);
-
-  EXPECT_EQ(JXL_DEC_FRAME, JxlDecoderProcessInput(dec));
-
-  // Output buffer not yet set
-  EXPECT_EQ(JXL_DEC_ERROR, JxlDecoderFlushImage(dec));
-
-  size_t buffer_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-  EXPECT_EQ(pixels2.size(), buffer_size);
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(
-                                 dec, &format, pixels2.data(), pixels2.size()));
-
-  // Must process input further until we get JXL_DEC_NEED_MORE_INPUT, even if
-  // data was already input before, since the processing of the frame only
-  // happens at the JxlDecoderProcessInput call after JXL_DEC_FRAME.
-  EXPECT_EQ(JXL_DEC_NEED_MORE_INPUT, JxlDecoderProcessInput(dec));
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderFlushImage(dec));
-
-  EXPECT_LE(jxl::test::ComparePixels(pixels2.data(), pixels.data(), xsize,
-                                     ysize, format, format, 2560.0),
-            30000u);
-
-  EXPECT_EQ(JXL_DEC_NEED_MORE_INPUT, JxlDecoderProcessInput(dec));
-
-  size_t consumed = first_part - JxlDecoderReleaseInput(dec);
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, data.data() + consumed,
-                                                data.size() - consumed));
-
-  EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-  EXPECT_LE(jxl::test::ComparePixels(pixels2.data(), pixels.data(), xsize,
-                                     ysize, format, format, 2560.0),
-            11000u);
-
-  JxlDecoderDestroy(dec);
-}
-TEST(DecodeTest, FlushTestLossyProgressiveAlphaUpsampling) {
-  size_t xsize = 533;
-  size_t ysize = 401;
-  uint32_t num_channels = 4;
-  std::vector<uint8_t> pixels =
-      jxl::test::GetSomeTestImage(xsize, ysize, num_channels, 0);
-  jxl::TestCodestreamParams params;
-  params.cparams.resampling = 2;
-  params.cparams.ec_resampling = 4;
-  params.preview_mode = jxl::kSmallPreview;
-  std::vector<uint8_t> data =
-      jxl::CreateTestJXLCodestream(jxl::Bytes(pixels.data(), pixels.size()),
-                                   xsize, ysize, num_channels, params);
-  JxlPixelFormat format = {num_channels, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-
-  std::vector<uint8_t> pixels2;
-  pixels2.resize(pixels.size());
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(
-                dec, JXL_DEC_BASIC_INFO | JXL_DEC_FRAME | JXL_DEC_FULL_IMAGE));
-
-  // Ensure that the first part contains at least the full DC of the image,
-  // otherwise flush does not work.
-  size_t first_part = data.size() * 2 / 3;
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, data.data(), first_part));
-
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-  JxlBasicInfo info;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-  EXPECT_EQ(info.xsize, xsize);
-  EXPECT_EQ(info.ysize, ysize);
-
-  EXPECT_EQ(JXL_DEC_FRAME, JxlDecoderProcessInput(dec));
-
-  // Output buffer not yet set
-  EXPECT_EQ(JXL_DEC_ERROR, JxlDecoderFlushImage(dec));
-
-  size_t buffer_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-  EXPECT_EQ(pixels2.size(), buffer_size);
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(
-                                 dec, &format, pixels2.data(), pixels2.size()));
-
-  // Must process input further until we get JXL_DEC_NEED_MORE_INPUT, even if
-  // data was already input before, since the processing of the frame only
-  // happens at the JxlDecoderProcessInput call after JXL_DEC_FRAME.
-  EXPECT_EQ(JXL_DEC_NEED_MORE_INPUT, JxlDecoderProcessInput(dec));
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderFlushImage(dec));
-
-  EXPECT_LE(jxl::test::ComparePixels(pixels2.data(), pixels.data(), xsize,
-                                     ysize, format, format, 2560.0),
-            125000u);
-
-  EXPECT_EQ(JXL_DEC_NEED_MORE_INPUT, JxlDecoderProcessInput(dec));
-
-  size_t consumed = first_part - JxlDecoderReleaseInput(dec);
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, data.data() + consumed,
-                                                data.size() - consumed));
-
-  EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-  EXPECT_LE(jxl::test::ComparePixels(pixels2.data(), pixels.data(), xsize,
-                                     ysize, format, format, 2560.0),
-            70000u);
-
-  JxlDecoderDestroy(dec);
-}
-TEST(DecodeTest, FlushTestLosslessProgressiveAlpha) {
-  // Size large enough for multiple groups, required to have progressive
-  // stages
-  size_t xsize = 333;
-  size_t ysize = 300;
-  uint32_t num_channels = 4;
-  std::vector<uint8_t> pixels =
-      jxl::test::GetSomeTestImage(xsize, ysize, num_channels, 0);
-  jxl::TestCodestreamParams params;
-  params.cparams.SetLossless();
-  params.cparams.speed_tier = jxl::SpeedTier::kThunder;
-  params.cparams.responsive = 1;
-  params.cparams.modular_group_size_shift = 1;
-  params.preview_mode = jxl::kSmallPreview;
-  std::vector<uint8_t> data =
-      jxl::CreateTestJXLCodestream(jxl::Bytes(pixels.data(), pixels.size()),
-                                   xsize, ysize, num_channels, params);
-  JxlPixelFormat format = {num_channels, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-
-  std::vector<uint8_t> pixels2;
-  pixels2.resize(pixels.size());
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(
-                dec, JXL_DEC_BASIC_INFO | JXL_DEC_FRAME | JXL_DEC_FULL_IMAGE));
-
-  // Ensure that the first part contains at least the full DC of the image,
-  // otherwise flush does not work.
-  size_t first_part = data.size() / 2;
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, data.data(), first_part));
-
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-  JxlBasicInfo info;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-  EXPECT_EQ(info.xsize, xsize);
-  EXPECT_EQ(info.ysize, ysize);
-
-  EXPECT_EQ(JXL_DEC_FRAME, JxlDecoderProcessInput(dec));
-
-  // Output buffer not yet set
-  EXPECT_EQ(JXL_DEC_ERROR, JxlDecoderFlushImage(dec));
-
-  size_t buffer_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-  EXPECT_EQ(pixels2.size(), buffer_size);
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(
-                                 dec, &format, pixels2.data(), pixels2.size()));
-
-  // Must process input further until we get JXL_DEC_NEED_MORE_INPUT, even if
-  // data was already input before, since the processing of the frame only
-  // happens at the JxlDecoderProcessInput call after JXL_DEC_FRAME.
-  EXPECT_EQ(JXL_DEC_NEED_MORE_INPUT, JxlDecoderProcessInput(dec));
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderFlushImage(dec));
-
-  EXPECT_LE(jxl::test::ComparePixels(pixels2.data(), pixels.data(), xsize,
-                                     ysize, format, format, 2560.0),
-            2700u);
-
-  EXPECT_EQ(JXL_DEC_NEED_MORE_INPUT, JxlDecoderProcessInput(dec));
-
-  size_t consumed = first_part - JxlDecoderReleaseInput(dec);
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, data.data() + consumed,
-                                                data.size() - consumed));
-
-  EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-  EXPECT_LE(jxl::test::ComparePixels(pixels2.data(), pixels.data(), xsize,
-                                     ysize, format, format),
-            0u);
-
-  JxlDecoderDestroy(dec);
-}
-
-class DecodeProgressiveTest : public ::testing::TestWithParam<int> {};
-JXL_GTEST_INSTANTIATE_TEST_SUITE_P(DecodeProgressiveTestInstantiation,
-                                   DecodeProgressiveTest,
-                                   ::testing::Range(0, 8));
-TEST_P(DecodeProgressiveTest, ProgressiveEventTest) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const int params = GetParam();
-  bool single_group = ((params & 1) != 0);
-  bool lossless = (((params >> 1) & 1) != 0);
-  uint32_t num_channels = 3 + ((params >> 2) & 1);
-  bool has_alpha = ((num_channels & 1) == 0);
-  std::set<JxlProgressiveDetail> progressive_details = {kDC, kLastPasses,
-                                                        kPasses};
-  for (auto prog_detail : progressive_details) {
-    // Only few combinations are expected to support outputting
-    // intermediate flushes for complete DC and complete passes.
-    // The test can be updated if more cases are expected to support it.
-    bool expect_flush = !has_alpha && !lossless;
-    size_t xsize;
-    size_t ysize;
-    if (single_group) {
-      // An image smaller than 256x256 ensures it contains only 1 group.
-      xsize = 99;
-      ysize = 100;
-    } else {
-      xsize = 277;
-      ysize = 280;
-    }
-    std::vector<uint8_t> pixels =
-        jxl::test::GetSomeTestImage(xsize, ysize, num_channels, 0);
-    JxlPixelFormat format = {num_channels, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-    jxl::ColorEncoding color_encoding = jxl::ColorEncoding::SRGB(false);
-    jxl::CodecInOut io{memory_manager};
-    EXPECT_TRUE(jxl::ConvertFromExternal(
-        jxl::Bytes(pixels.data(), pixels.size()), xsize, ysize, color_encoding,
-        /*bits_per_sample=*/16, format,
-        /*pool=*/nullptr, &io.Main()));
-    jxl::TestCodestreamParams params;
-    if (lossless) {
-      params.cparams.SetLossless();
-    } else {
-      params.cparams.butteraugli_distance = 0.5f;
-    }
-    jxl::PassDefinition passes[] = {
-        {2, 0, 4}, {4, 0, 4}, {8, 2, 2}, {8, 1, 2}, {8, 0, 1}};
-    const int kNumPasses = 5;
-    jxl::ProgressiveMode progressive_mode{passes};
-    params.cparams.custom_progressive_mode = &progressive_mode;
-    std::vector<uint8_t> data =
-        jxl::CreateTestJXLCodestream(jxl::Bytes(pixels.data(), pixels.size()),
-                                     xsize, ysize, num_channels, params);
-
-    for (size_t increment : {static_cast<size_t>(1), data.size()}) {
-      printf(
-          "Testing with single_group=%s, lossless=%s, "
-          "num_channels=%d, prog_detail=%d, increment=%d\n",
-          BoolToCStr(single_group), BoolToCStr(lossless),
-          static_cast<int>(num_channels), static_cast<int>(prog_detail),
-          static_cast<int>(increment));
-      std::vector<std::vector<uint8_t>> passes(kNumPasses + 1);
-      for (int i = 0; i <= kNumPasses; ++i) {
-        passes[i].resize(pixels.size());
-      }
-
-      JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderSubscribeEvents(
-                    dec, JXL_DEC_BASIC_INFO | JXL_DEC_FRAME |
-                             JXL_DEC_FULL_IMAGE | JXL_DEC_FRAME_PROGRESSION));
-      EXPECT_EQ(JXL_DEC_ERROR, JxlDecoderSetProgressiveDetail(dec, kFrames));
-      EXPECT_EQ(JXL_DEC_ERROR,
-                JxlDecoderSetProgressiveDetail(dec, kDCProgressive));
-      EXPECT_EQ(JXL_DEC_ERROR, JxlDecoderSetProgressiveDetail(dec, kDCGroups));
-      EXPECT_EQ(JXL_DEC_ERROR, JxlDecoderSetProgressiveDetail(dec, kGroups));
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderSetProgressiveDetail(dec, prog_detail));
-
-      uint8_t* next_in = data.data();
-      size_t avail_in = 0;
-      size_t pos = 0;
-
-      auto process_input = [&]() {
-        for (;;) {
-          EXPECT_EQ(JXL_DEC_SUCCESS,
-                    JxlDecoderSetInput(dec, next_in, avail_in));
-          JxlDecoderStatus status = JxlDecoderProcessInput(dec);
-          size_t remaining = JxlDecoderReleaseInput(dec);
-          EXPECT_LE(remaining, avail_in);
-          next_in += avail_in - remaining;
-          avail_in = remaining;
-          if (status == JXL_DEC_NEED_MORE_INPUT && pos < data.size()) {
-            size_t chunk = std::min<size_t>(increment, data.size() - pos);
-            pos += chunk;
-            avail_in += chunk;
-            continue;
-          }
-          return status;
-        }
-      };
-
-      EXPECT_EQ(JXL_DEC_BASIC_INFO, process_input());
-      JxlBasicInfo info;
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-      EXPECT_EQ(info.xsize, xsize);
-      EXPECT_EQ(info.ysize, ysize);
-
-      EXPECT_EQ(JXL_DEC_FRAME, process_input());
-
-      size_t buffer_size;
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-      EXPECT_EQ(pixels.size(), buffer_size);
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(
-                                     dec, &format, passes[kNumPasses].data(),
-                                     passes[kNumPasses].size()));
-
-      auto next_pass = [&](int pass) {
-        if (prog_detail <= kDC) return kNumPasses;
-        if (prog_detail <= kLastPasses) {
-          return std::min(pass + 2, kNumPasses);
-        }
-        return pass + 1;
-      };
-
-      if (expect_flush) {
-        // Return a particular downsampling ratio only after the last
-        // pass for that downsampling was processed.
-        int expected_downsampling_ratios[] = {8, 8, 4, 4, 2};
-        for (int p = 0; p < kNumPasses; p = next_pass(p)) {
-          EXPECT_EQ(JXL_DEC_FRAME_PROGRESSION, process_input());
-          EXPECT_EQ(expected_downsampling_ratios[p],
-                    JxlDecoderGetIntendedDownsamplingRatio(dec));
-          EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderFlushImage(dec));
-          passes[p] = passes[kNumPasses];
-        }
-      }
-
-      EXPECT_EQ(JXL_DEC_FULL_IMAGE, process_input());
-      EXPECT_EQ(JXL_DEC_SUCCESS, process_input());
-
-      JxlDecoderDestroy(dec);
-
-      if (!expect_flush) {
-        continue;
-      }
-      jxl::ButteraugliParams butteraugli_params;
-      std::vector<float> distances(kNumPasses + 1);
-      for (int p = 0;; p = next_pass(p)) {
-        jxl::CodecInOut io1{memory_manager};
-        EXPECT_TRUE(jxl::ConvertFromExternal(
-            jxl::Bytes(passes[p].data(), passes[p].size()), xsize, ysize,
-            color_encoding,
-            /*bits_per_sample=*/16, format,
-            /*pool=*/nullptr, &io1.Main()));
-        distances[p] =
-            ButteraugliDistance(io.frames, io1.frames, butteraugli_params,
-                                *JxlGetDefaultCms(), nullptr, nullptr);
-        if (p == kNumPasses) break;
-      }
-      const float kMaxDistance[kNumPasses + 1] = {30.0f, 20.0f, 10.0f,
-                                                  5.0f,  3.0f,  2.0f};
-      EXPECT_LT(distances[kNumPasses], kMaxDistance[kNumPasses]);
-      for (int p = 0; p < kNumPasses;) {
-        int next_p = next_pass(p);
-        EXPECT_LT(distances[p], kMaxDistance[p]);
-        // Verify that the returned pass image is actually not the
-        // same as the next pass image, by checking that it has a bit
-        // worse butteraugli score.
-        EXPECT_LT(distances[next_p] * 1.1f, distances[p]);
-        p = next_p;
-      }
-    }
-  }
-}
-
-void VerifyJPEGReconstruction(jxl::Span<const uint8_t> container,
-                              jxl::Span<const uint8_t> jpeg_bytes) {
-  JxlDecoderPtr dec = JxlDecoderMake(nullptr);
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(
-                dec.get(), JXL_DEC_JPEG_RECONSTRUCTION | JXL_DEC_FULL_IMAGE));
-  JxlDecoderSetInput(dec.get(), container.data(), container.size());
-  EXPECT_EQ(JXL_DEC_JPEG_RECONSTRUCTION, JxlDecoderProcessInput(dec.get()));
-  std::vector<uint8_t> reconstructed_buffer(128);
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetJPEGBuffer(dec.get(), reconstructed_buffer.data(),
-                                    reconstructed_buffer.size()));
-  size_t used = 0;
-  JxlDecoderStatus process_result = JXL_DEC_JPEG_NEED_MORE_OUTPUT;
-  while (process_result == JXL_DEC_JPEG_NEED_MORE_OUTPUT) {
-    used = reconstructed_buffer.size() - JxlDecoderReleaseJPEGBuffer(dec.get());
-    reconstructed_buffer.resize(reconstructed_buffer.size() * 2);
-    EXPECT_EQ(
-        JXL_DEC_SUCCESS,
-        JxlDecoderSetJPEGBuffer(dec.get(), reconstructed_buffer.data() + used,
-                                reconstructed_buffer.size() - used));
-    process_result = JxlDecoderProcessInput(dec.get());
-  }
-  ASSERT_EQ(JXL_DEC_FULL_IMAGE, process_result);
-  used = reconstructed_buffer.size() - JxlDecoderReleaseJPEGBuffer(dec.get());
-  ASSERT_EQ(used, jpeg_bytes.size());
-  EXPECT_EQ(0, memcmp(reconstructed_buffer.data(), jpeg_bytes.data(), used));
-}
-
-JXL_TRANSCODE_JPEG_TEST(DecodeTest, JPEGReconstructTestCodestream) {
-  TEST_LIBJPEG_SUPPORT();
-  size_t xsize = 123;
-  size_t ysize = 77;
-  size_t channels = 3;
-  std::vector<uint8_t> pixels =
-      jxl::test::GetSomeTestImage(xsize, ysize, channels, /*seed=*/0);
-  std::vector<uint8_t> jpeg_codestream;
-  jxl::TestCodestreamParams params;
-  params.cparams.color_transform = jxl::ColorTransform::kNone;
-  params.box_format = kCSBF_Single;
-  params.jpeg_codestream = &jpeg_codestream;
-  params.preview_mode = jxl::kSmallPreview;
-  std::vector<uint8_t> compressed = jxl::CreateTestJXLCodestream(
-      jxl::Bytes(pixels.data(), pixels.size()), xsize, ysize, channels, params);
-  VerifyJPEGReconstruction(jxl::Bytes(compressed), jxl::Bytes(jpeg_codestream));
-}
-
-JXL_TRANSCODE_JPEG_TEST(DecodeTest, JPEGReconstructionTest) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const std::string jpeg_path = "jxl/flower/flower.png.im_q85_420.jpg";
-  const std::vector<uint8_t> orig = jxl::test::ReadTestData(jpeg_path);
-  jxl::CodecInOut orig_io{memory_manager};
-  ASSERT_TRUE(jxl::jpeg::DecodeImageJPG(jxl::Bytes(orig), &orig_io));
-  jxl::jpeg::JPEGData jpeg_data_copy = *orig_io.Main().jpeg_data;
-  orig_io.metadata.m.xyb_encoded = false;
-  jxl::BitWriter writer{memory_manager};
-  ASSERT_TRUE(WriteCodestreamHeaders(&orig_io.metadata, &writer, nullptr));
-  writer.ZeroPadToByte();
-  jxl::CompressParams cparams;
-  cparams.color_transform = jxl::ColorTransform::kNone;
-  ASSERT_TRUE(jxl::EncodeFrame(memory_manager, cparams, jxl::FrameInfo{},
-                               &orig_io.metadata, orig_io.Main(),
-                               *JxlGetDefaultCms(),
-                               /*pool=*/nullptr, &writer,
-                               /*aux_out=*/nullptr));
-
-  std::vector<uint8_t> jpeg_data;
-  ASSERT_TRUE(
-      EncodeJPEGData(memory_manager, jpeg_data_copy, &jpeg_data, cparams));
-  std::vector<uint8_t> container;
-  jxl::Bytes(jxl::kContainerHeader).AppendTo(container);
-  jxl::AppendBoxHeader(jxl::MakeBoxType("jbrd"), jpeg_data.size(), false,
-                       &container);
-  jxl::Bytes(jpeg_data).AppendTo(container);
-  jxl::AppendBoxHeader(jxl::MakeBoxType("jxlc"), 0, true, &container);
-  jxl::PaddedBytes codestream = std::move(writer).TakeBytes();
-  jxl::Bytes(codestream).AppendTo(container);
-  VerifyJPEGReconstruction(jxl::Bytes(container), jxl::Bytes(orig));
-}
-
-JXL_TRANSCODE_JPEG_TEST(DecodeTest, JPEGReconstructionMetadataTest) {
-  const std::string jpeg_path = "jxl/jpeg_reconstruction/1x1_exif_xmp.jpg";
-  const std::string jxl_path = "jxl/jpeg_reconstruction/1x1_exif_xmp.jxl";
-  const std::vector<uint8_t> jpeg = jxl::test::ReadTestData(jpeg_path);
-  const std::vector<uint8_t> jxl = jxl::test::ReadTestData(jxl_path);
-  VerifyJPEGReconstruction(jxl::Bytes(jxl), jxl::Bytes(jpeg));
-}
-
-TEST(DecodeTest, ContinueFinalNonEssentialBoxTest) {
-  size_t xsize = 80;
-  size_t ysize = 90;
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 4, 0);
-  jxl::TestCodestreamParams params;
-  params.box_format = kCSBF_Multi_Other_Terminated;
-  params.add_icc_profile = true;
-  std::vector<uint8_t> compressed = jxl::CreateTestJXLCodestream(
-      jxl::Bytes(pixels.data(), pixels.size()), xsize, ysize, 4, params);
-  StreamPositions streampos;
-  AnalyzeCodestream(compressed, &streampos);
-
-  // The non-essential final box size including 8-byte header
-  size_t final_box_size = unk3_box_size + 8;
-  size_t last_box_begin = compressed.size() - final_box_size;
-  // Verify that the test is indeed setup correctly to be at the beginning of
-  // the 'unkn' box header.
-  ASSERT_EQ(compressed[last_box_begin + 3], final_box_size);
-  ASSERT_EQ(compressed[last_box_begin + 4], 'u');
-  ASSERT_EQ(compressed[last_box_begin + 5], 'n');
-  ASSERT_EQ(compressed[last_box_begin + 6], 'k');
-  ASSERT_EQ(compressed[last_box_begin + 7], '3');
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(dec, JXL_DEC_BASIC_INFO | JXL_DEC_FRAME));
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetInput(dec, compressed.data(), last_box_begin));
-
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-  EXPECT_EQ(JXL_DEC_FRAME, JxlDecoderProcessInput(dec));
-  // The decoder returns success despite not having seen the final unknown box
-  // yet. This is because calling JxlDecoderCloseInput is not mandatory for
-  // backwards compatibility, so it doesn't know more bytes follow, the current
-  // bytes ended at a perfectly valid place.
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderProcessInput(dec));
-
-  size_t remaining = JxlDecoderReleaseInput(dec);
-  // Since the test was set up to end exactly at the boundary of the final
-  // codestream box, and the decoder returned success, all bytes are expected to
-  // be consumed until the end of the  frame header.
-  EXPECT_EQ(remaining, last_box_begin - streampos.frames[0].toc_end);
-
-  // Now set the remaining non-codestream box as input.
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetInput(dec, compressed.data() + last_box_begin,
-                               compressed.size() - last_box_begin));
-  // Even though JxlDecoderProcessInput already returned JXL_DEC_SUCCESS before,
-  // when calling it again now after setting more input, success is expected, no
-  // event occurs but the box has been successfully skipped.
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderProcessInput(dec));
-
-  JxlDecoderDestroy(dec);
-}
-
-namespace {
-bool BoxTypeEquals(const std::string& type_string, const JxlBoxType type) {
-  return type_string.size() == 4 && type_string[0] == type[0] &&
-         type_string[1] == type[1] && type_string[2] == type[2] &&
-         type_string[3] == type[3];
-}
-}  // namespace
-
-TEST(DecodeTest, ExtendedBoxSizeTest) {
-  const std::string jxl_path = "jxl/boxes/square-extended-size-container.jxl";
-  const std::vector<uint8_t> orig = jxl::test::ReadTestData(jxl_path);
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSubscribeEvents(dec, JXL_DEC_BOX));
-
-  JxlBoxType type;
-  uint64_t box_size;
-  uint64_t contents_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, orig.data(), orig.size()));
-  EXPECT_EQ(JXL_DEC_BOX, JxlDecoderProcessInput(dec));
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBoxType(dec, type, JXL_FALSE));
-  EXPECT_TRUE(BoxTypeEquals("JXL ", type));
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBoxSizeRaw(dec, &box_size));
-  EXPECT_EQ(12, box_size);
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBoxSizeContents(dec, &contents_size));
-  EXPECT_EQ(contents_size + 8, box_size);
-  EXPECT_EQ(JXL_DEC_BOX, JxlDecoderProcessInput(dec));
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBoxType(dec, type, JXL_FALSE));
-  EXPECT_TRUE(BoxTypeEquals("ftyp", type));
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBoxSizeRaw(dec, &box_size));
-  EXPECT_EQ(20, box_size);
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBoxSizeContents(dec, &contents_size));
-  EXPECT_EQ(contents_size + 8, box_size);
-  EXPECT_EQ(JXL_DEC_BOX, JxlDecoderProcessInput(dec));
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBoxType(dec, type, JXL_FALSE));
-  EXPECT_TRUE(BoxTypeEquals("jxlc", type));
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBoxSizeRaw(dec, &box_size));
-  EXPECT_EQ(72, box_size);
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBoxSizeContents(dec, &contents_size));
-  // This is an extended box, hence the difference between `box_size` and
-  // `contents_size` is 16.
-  EXPECT_EQ(contents_size + 8 + 8, box_size);
-
-  JxlDecoderDestroy(dec);
-}
-
-JXL_BOXES_TEST(DecodeTest, BoxTest) {
-  size_t xsize = 1;
-  size_t ysize = 1;
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 4, 0);
-  jxl::TestCodestreamParams params;
-  params.box_format = kCSBF_Multi_Other_Terminated;
-  params.add_icc_profile = true;
-  std::vector<uint8_t> compressed = jxl::CreateTestJXLCodestream(
-      jxl::Bytes(pixels.data(), pixels.size()), xsize, ysize, 4, params);
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSubscribeEvents(dec, JXL_DEC_BOX));
-
-  std::vector<std::string> expected_box_types = {
-      "JXL ", "ftyp", "jxlp", "unk1", "unk2", "jxlp", "jxlp", "jxlp", "unk3"};
-
-  // Value 0 means to not test the size: codestream is not required to be a
-  // particular exact size.
-  std::vector<size_t> expected_box_sizes = {12, 20, 0, 34, 18, 0, 0, 0, 20};
-
-  JxlBoxType type;
-  uint64_t box_size;
-  uint64_t contents_size;
-  std::vector<uint8_t> contents(50);
-  size_t expected_release_size = 0;
-
-  // Cannot get these when decoding didn't start yet
-  EXPECT_EQ(JXL_DEC_ERROR, JxlDecoderGetBoxType(dec, type, JXL_FALSE));
-  EXPECT_EQ(JXL_DEC_ERROR, JxlDecoderGetBoxSizeRaw(dec, &box_size));
-
-  uint8_t* next_in = compressed.data();
-  size_t avail_in = compressed.size();
-  for (size_t i = 0; i < expected_box_types.size(); i++) {
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-    EXPECT_EQ(JXL_DEC_BOX, JxlDecoderProcessInput(dec));
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBoxType(dec, type, JXL_FALSE));
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBoxSizeRaw(dec, &box_size));
-    EXPECT_TRUE(BoxTypeEquals(expected_box_types[i], type));
-    if (expected_box_sizes[i]) {
-      EXPECT_EQ(expected_box_sizes[i], box_size);
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderGetBoxSizeContents(dec, &contents_size));
-      EXPECT_EQ(contents_size + 8, box_size);
-    }
-
-    if (expected_release_size > 0) {
-      EXPECT_EQ(expected_release_size, JxlDecoderReleaseBoxBuffer(dec));
-      expected_release_size = 0;
-    }
-
-    if (type[0] == 'u' && type[1] == 'n' && type[2] == 'k') {
-      JxlDecoderSetBoxBuffer(dec, contents.data(), contents.size());
-      size_t expected_box_contents_size =
-          type[3] == '1' ? unk1_box_size
-                         : (type[3] == '2' ? unk2_box_size : unk3_box_size);
-      expected_release_size = contents.size() - expected_box_contents_size;
-    }
-    size_t consumed = avail_in - JxlDecoderReleaseInput(dec);
-    next_in += consumed;
-    avail_in -= consumed;
-  }
-
-  // After the last DEC_BOX event, check that the input position is exactly at
-  // the stat of the box header.
-  EXPECT_EQ(avail_in, expected_box_sizes.back());
-
-  // Even though all input is given, the decoder cannot assume there aren't
-  // more boxes if the input was not closed.
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec, next_in, avail_in));
-  EXPECT_EQ(JXL_DEC_NEED_MORE_INPUT, JxlDecoderProcessInput(dec));
-  JxlDecoderCloseInput(dec);
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderProcessInput(dec));
-
-  JxlDecoderDestroy(dec);
-}
-
-JXL_BOXES_TEST(DecodeTest, ExifBrobBoxTest) {
-  size_t xsize = 1;
-  size_t ysize = 1;
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 4, 0);
-  jxl::TestCodestreamParams params;
-  // Lossless to verify pixels exactly after roundtrip.
-  params.cparams.SetLossless();
-  params.box_format = kCSBF_Brob_Exif;
-  params.add_icc_profile = true;
-  std::vector<uint8_t> compressed = jxl::CreateTestJXLCodestream(
-      jxl::Bytes(pixels.data(), pixels.size()), xsize, ysize, 4, params);
-
-  // Test raw brob box, not brotli-decompressing
-  for (int streaming = 0; streaming < 2; ++streaming) {
-    JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSubscribeEvents(dec, JXL_DEC_BOX));
-    if (!streaming) {
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderSetInput(dec, compressed.data(), compressed.size()));
-      JxlDecoderCloseInput(dec);
-    }
-    // for streaming input case
-    const uint8_t* next_in = compressed.data();
-    size_t avail_in = 0;
-    size_t total_in = 0;
-    size_t step_size = 64;
-
-    std::vector<uint8_t> box_buffer;
-    size_t box_num_output;
-    bool seen_brob_begin = false;
-    bool seen_brob_end = false;
-
-    for (;;) {
-      JxlDecoderStatus status = JxlDecoderProcessInput(dec);
-      if (status == JXL_DEC_NEED_MORE_INPUT) {
-        if (streaming) {
-          size_t remaining = JxlDecoderReleaseInput(dec);
-          EXPECT_LE(remaining, avail_in);
-          next_in += avail_in - remaining;
-          avail_in = remaining;
-          size_t amount = step_size;
-          if (total_in + amount > compressed.size()) {
-            amount = compressed.size() - total_in;
-          }
-          avail_in += amount;
-          total_in += amount;
-          EXPECT_EQ(JXL_DEC_SUCCESS,
-                    JxlDecoderSetInput(dec, next_in, avail_in));
-          if (total_in == compressed.size()) JxlDecoderCloseInput(dec);
-        } else {
-          FAIL();
-          break;
-        }
-      } else if (status == JXL_DEC_BOX || status == JXL_DEC_SUCCESS) {
-        if (!box_buffer.empty()) {
-          EXPECT_EQ(false, seen_brob_end);
-          seen_brob_end = true;
-          size_t remaining = JxlDecoderReleaseBoxBuffer(dec);
-          box_num_output = box_buffer.size() - remaining;
-          EXPECT_EQ(box_num_output, box_brob_exif_size - 8);
-          EXPECT_EQ(
-              0, memcmp(box_buffer.data(), box_brob_exif + 8, box_num_output));
-          box_buffer.clear();
-        }
-        if (status == JXL_DEC_SUCCESS) break;
-        JxlBoxType type;
-        EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBoxType(dec, type, JXL_FALSE));
-        if (BoxTypeEquals("brob", type)) {
-          EXPECT_EQ(false, seen_brob_begin);
-          seen_brob_begin = true;
-          box_buffer.resize(8);
-          JxlDecoderSetBoxBuffer(dec, box_buffer.data(), box_buffer.size());
-        }
-      } else if (status == JXL_DEC_BOX_NEED_MORE_OUTPUT) {
-        size_t remaining = JxlDecoderReleaseBoxBuffer(dec);
-        box_num_output = box_buffer.size() - remaining;
-        box_buffer.resize(box_buffer.size() * 2);
-        JxlDecoderSetBoxBuffer(dec, box_buffer.data() + box_num_output,
-                               box_buffer.size() - box_num_output);
-      } else {
-        // We do not expect any other events or errors
-        FAIL();
-        break;
-      }
-    }
-
-    EXPECT_EQ(true, seen_brob_begin);
-    EXPECT_EQ(true, seen_brob_end);
-
-    JxlDecoderDestroy(dec);
-  }
-
-  // Test decompressed brob box
-  for (int streaming = 0; streaming < 2; ++streaming) {
-    JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSubscribeEvents(dec, JXL_DEC_BOX));
-    if (!streaming) {
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderSetInput(dec, compressed.data(), compressed.size()));
-      JxlDecoderCloseInput(dec);
-    }
-    // for streaming input case
-    const uint8_t* next_in = compressed.data();
-    size_t avail_in = 0;
-    size_t total_in = 0;
-    size_t step_size = 64;
-
-    std::vector<uint8_t> box_buffer;
-    size_t box_num_output;
-    bool seen_exif_begin = false;
-    bool seen_exif_end = false;
-
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetDecompressBoxes(dec, JXL_TRUE));
-
-    for (;;) {
-      JxlDecoderStatus status = JxlDecoderProcessInput(dec);
-      if (status == JXL_DEC_NEED_MORE_INPUT) {
-        if (streaming) {
-          size_t remaining = JxlDecoderReleaseInput(dec);
-          EXPECT_LE(remaining, avail_in);
-          next_in += avail_in - remaining;
-          avail_in = remaining;
-          size_t amount = step_size;
-          if (total_in + amount > compressed.size()) {
-            amount = compressed.size() - total_in;
-          }
-          avail_in += amount;
-          total_in += amount;
-          EXPECT_EQ(JXL_DEC_SUCCESS,
-                    JxlDecoderSetInput(dec, next_in, avail_in));
-          if (total_in == compressed.size()) JxlDecoderCloseInput(dec);
-        } else {
-          FAIL();
-          break;
-        }
-      } else if (status == JXL_DEC_BOX || status == JXL_DEC_SUCCESS) {
-        if (!box_buffer.empty()) {
-          EXPECT_EQ(false, seen_exif_end);
-          seen_exif_end = true;
-          size_t remaining = JxlDecoderReleaseBoxBuffer(dec);
-          box_num_output = box_buffer.size() - remaining;
-          // Expect that the output has the same size and contents as the
-          // uncompressed exif data. Only check contents if the sizes match to
-          // avoid comparing uninitialized memory in the test.
-          EXPECT_EQ(box_num_output, exif_uncompressed_size);
-          if (box_num_output == exif_uncompressed_size) {
-            EXPECT_EQ(0, memcmp(box_buffer.data(), exif_uncompressed,
-                                exif_uncompressed_size));
-          }
-          box_buffer.clear();
-        }
-        if (status == JXL_DEC_SUCCESS) break;
-        JxlBoxType type;
-        EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBoxType(dec, type, JXL_TRUE));
-        if (BoxTypeEquals("Exif", type)) {
-          EXPECT_EQ(false, seen_exif_begin);
-          seen_exif_begin = true;
-          box_buffer.resize(8);
-          JxlDecoderSetBoxBuffer(dec, box_buffer.data(), box_buffer.size());
-        }
-      } else if (status == JXL_DEC_BOX_NEED_MORE_OUTPUT) {
-        size_t remaining = JxlDecoderReleaseBoxBuffer(dec);
-        box_num_output = box_buffer.size() - remaining;
-        box_buffer.resize(box_buffer.size() * 2);
-        JxlDecoderSetBoxBuffer(dec, box_buffer.data() + box_num_output,
-                               box_buffer.size() - box_num_output);
-      } else {
-        // We do not expect any other events or errors
-        FAIL();
-        break;
-      }
-    }
-
-    EXPECT_EQ(true, seen_exif_begin);
-    EXPECT_EQ(true, seen_exif_end);
-
-    JxlDecoderDestroy(dec);
-  }
-}
-
-JXL_BOXES_TEST(DecodeTest, PartialCodestreamBoxTest) {
-  size_t xsize = 23;
-  size_t ysize = 81;
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 4, 0);
-  JxlPixelFormat format_orig = {4, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  // Lossless to verify pixels exactly after roundtrip.
-  jxl::TestCodestreamParams params;
-  params.cparams.SetLossless();
-  params.cparams.speed_tier = jxl::SpeedTier::kThunder;
-  params.box_format = kCSBF_Multi;
-  params.add_icc_profile = true;
-  std::vector<uint8_t> compressed = jxl::CreateTestJXLCodestream(
-      jxl::Bytes(pixels.data(), pixels.size()), xsize, ysize, 4, params);
-
-  std::vector<uint8_t> extracted_codestream;
-
-  {
-    JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderSubscribeEvents(
-                  dec, JXL_DEC_BASIC_INFO | JXL_DEC_FULL_IMAGE | JXL_DEC_BOX));
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderSetInput(dec, compressed.data(), compressed.size()));
-    JxlDecoderCloseInput(dec);
-
-    size_t num_jxlp = 0;
-
-    std::vector<uint8_t> pixels2;
-    pixels2.resize(pixels.size());
-
-    std::vector<uint8_t> box_buffer;
-    size_t box_num_output;
-
-    for (;;) {
-      JxlDecoderStatus status = JxlDecoderProcessInput(dec);
-      if (status == JXL_DEC_NEED_MORE_INPUT) {
-        FAIL();
-        break;
-      } else if (status == JXL_DEC_BASIC_INFO) {
-        JxlBasicInfo info;
-        EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-        EXPECT_EQ(info.xsize, xsize);
-        EXPECT_EQ(info.ysize, ysize);
-      } else if (status == JXL_DEC_NEED_IMAGE_OUT_BUFFER) {
-        EXPECT_EQ(JXL_DEC_SUCCESS,
-                  JxlDecoderSetImageOutBuffer(dec, &format_orig, pixels2.data(),
-                                              pixels2.size()));
-      } else if (status == JXL_DEC_FULL_IMAGE) {
-        continue;
-      } else if (status == JXL_DEC_BOX || status == JXL_DEC_SUCCESS) {
-        if (!box_buffer.empty()) {
-          size_t remaining = JxlDecoderReleaseBoxBuffer(dec);
-          box_num_output = box_buffer.size() - remaining;
-          EXPECT_GE(box_num_output, 4);
-          // Do not insert the first 4 bytes, which are not part of the
-          // codestream, but the partial codestream box index
-          extracted_codestream.insert(extracted_codestream.end(),
-                                      box_buffer.begin() + 4,
-                                      box_buffer.begin() + box_num_output);
-          box_buffer.clear();
-        }
-        if (status == JXL_DEC_SUCCESS) break;
-        JxlBoxType type;
-        EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBoxType(dec, type, JXL_FALSE));
-        if (BoxTypeEquals("jxlp", type)) {
-          num_jxlp++;
-          box_buffer.resize(8);
-          JxlDecoderSetBoxBuffer(dec, box_buffer.data(), box_buffer.size());
-        }
-      } else if (status == JXL_DEC_BOX_NEED_MORE_OUTPUT) {
-        size_t remaining = JxlDecoderReleaseBoxBuffer(dec);
-        box_num_output = box_buffer.size() - remaining;
-        box_buffer.resize(box_buffer.size() * 2);
-        JxlDecoderSetBoxBuffer(dec, box_buffer.data() + box_num_output,
-                               box_buffer.size() - box_num_output);
-      } else {
-        // We do not expect any other events or errors
-        FAIL();
-        break;
-      }
-    }
-
-    // The test file created with kCSBF_Multi is expected to have 4 jxlp boxes.
-    EXPECT_EQ(4, num_jxlp);
-
-    EXPECT_EQ(0u, jxl::test::ComparePixels(pixels.data(), pixels2.data(), xsize,
-                                           ysize, format_orig, format_orig));
-
-    JxlDecoderDestroy(dec);
-  }
-
-  // Now test whether the codestream extracted from the jxlp boxes can itself
-  // also be decoded and gives the same pixels
-  {
-    JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderSubscribeEvents(
-                  dec, JXL_DEC_BASIC_INFO | JXL_DEC_FULL_IMAGE | JXL_DEC_BOX));
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderSetInput(dec, extracted_codestream.data(),
-                                 extracted_codestream.size()));
-    JxlDecoderCloseInput(dec);
-
-    size_t num_boxes = 0;
-
-    std::vector<uint8_t> pixels2;
-    pixels2.resize(pixels.size());
-
-    std::vector<uint8_t> box_buffer;
-    size_t box_num_output;
-
-    for (;;) {
-      JxlDecoderStatus status = JxlDecoderProcessInput(dec);
-      if (status == JXL_DEC_NEED_MORE_INPUT) {
-        FAIL();
-        break;
-      } else if (status == JXL_DEC_BASIC_INFO) {
-        JxlBasicInfo info;
-        EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-        EXPECT_EQ(info.xsize, xsize);
-        EXPECT_EQ(info.ysize, ysize);
-      } else if (status == JXL_DEC_NEED_IMAGE_OUT_BUFFER) {
-        EXPECT_EQ(JXL_DEC_SUCCESS,
-                  JxlDecoderSetImageOutBuffer(dec, &format_orig, pixels2.data(),
-                                              pixels2.size()));
-      } else if (status == JXL_DEC_FULL_IMAGE) {
-        continue;
-      } else if (status == JXL_DEC_BOX) {
-        num_boxes++;
-      } else if (status == JXL_DEC_BOX_NEED_MORE_OUTPUT) {
-        size_t remaining = JxlDecoderReleaseBoxBuffer(dec);
-        box_num_output = box_buffer.size() - remaining;
-        box_buffer.resize(box_buffer.size() * 2);
-        JxlDecoderSetBoxBuffer(dec, box_buffer.data() + box_num_output,
-                               box_buffer.size() - box_num_output);
-      } else if (status == JXL_DEC_SUCCESS) {
-        break;
-      } else {
-        // We do not expect any other events or errors
-        FAIL();
-        break;
-      }
-    }
-
-    EXPECT_EQ(0, num_boxes);  // The data does not use the container format.
-    EXPECT_EQ(0u, jxl::test::ComparePixels(pixels.data(), pixels2.data(), xsize,
-                                           ysize, format_orig, format_orig));
-
-    JxlDecoderDestroy(dec);
-  }
-}
-
-TEST(DecodeTest, SpotColorTest) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  jxl::CodecInOut io{memory_manager};
-  size_t xsize = 55;
-  size_t ysize = 257;
-  io.metadata.m.color_encoding = jxl::ColorEncoding::LinearSRGB();
-  JXL_TEST_ASSIGN_OR_DIE(Image3F main,
-                         Image3F::Create(memory_manager, xsize, ysize));
-  JXL_TEST_ASSIGN_OR_DIE(ImageF spot,
-                         ImageF::Create(memory_manager, xsize, ysize));
-  jxl::ZeroFillImage(&main);
-  jxl::ZeroFillImage(&spot);
-
-  for (size_t y = 0; y < ysize; y++) {
-    float* JXL_RESTRICT rowm = main.PlaneRow(1, y);
-    float* JXL_RESTRICT rows = spot.Row(y);
-    for (size_t x = 0; x < xsize; x++) {
-      rowm[x] = (x + y) * (1.f / 255.f);
-      rows[x] = ((x ^ y) & 255) * (1.f / 255.f);
-    }
-  }
-  ASSERT_TRUE(
-      io.SetFromImage(std::move(main), jxl::ColorEncoding::LinearSRGB()));
-  jxl::ExtraChannelInfo info;
-  info.bit_depth.bits_per_sample = 8;
-  info.dim_shift = 0;
-  info.type = jxl::ExtraChannel::kSpotColor;
-  info.spot_color[0] = 0.5f;
-  info.spot_color[1] = 0.2f;
-  info.spot_color[2] = 1.f;
-  info.spot_color[3] = 0.5f;
-
-  io.metadata.m.extra_channel_info.push_back(info);
-  std::vector<ImageF> ec;
-  ec.push_back(std::move(spot));
-  ASSERT_TRUE(io.frames[0].SetExtraChannels(std::move(ec)));
-
-  jxl::CompressParams cparams;
-  cparams.speed_tier = jxl::SpeedTier::kLightning;
-  cparams.modular_mode = true;
-  cparams.color_transform = jxl::ColorTransform::kNone;
-  cparams.butteraugli_distance = 0.f;
-
-  std::vector<uint8_t> compressed;
-  EXPECT_TRUE(jxl::test::EncodeFile(cparams, &io, &compressed));
-
-  for (size_t render_spot = 0; render_spot < 2; render_spot++) {
-    JxlPixelFormat format = {3, JXL_TYPE_UINT8, JXL_LITTLE_ENDIAN, 0};
-
-    JxlDecoder* dec = JxlDecoderCreate(nullptr);
-
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderSubscribeEvents(
-                  dec, JXL_DEC_BASIC_INFO | JXL_DEC_FULL_IMAGE));
-    if (!render_spot) {
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetRenderSpotcolors(dec, JXL_FALSE));
-    }
-
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderSetInput(dec, compressed.data(), compressed.size()));
-    EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-    JxlBasicInfo binfo;
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &binfo));
-    EXPECT_EQ(1u, binfo.num_extra_channels);
-    EXPECT_EQ(xsize, binfo.xsize);
-    EXPECT_EQ(ysize, binfo.ysize);
-
-    JxlExtraChannelInfo extra_info;
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderGetExtraChannelInfo(dec, 0, &extra_info));
-    EXPECT_EQ(static_cast<unsigned int>(jxl::ExtraChannel::kSpotColor),
-              extra_info.type);
-
-    EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-    size_t buffer_size;
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-    size_t extra_size;
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderExtraChannelBufferSize(dec, &format, &extra_size, 0));
-
-    std::vector<uint8_t> image(buffer_size);
-    std::vector<uint8_t> extra(extra_size);
-    size_t bytes_per_pixel = format.num_channels *
-                             jxl::test::GetDataBits(format.data_type) /
-                             jxl::kBitsPerByte;
-    size_t stride = bytes_per_pixel * binfo.xsize;
-
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(
-                                   dec, &format, image.data(), image.size()));
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderSetExtraChannelBuffer(dec, &format, extra.data(),
-                                              extra.size(), 0));
-
-    EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-
-    // After the full image was output, JxlDecoderProcessInput should return
-    // success to indicate all is done.
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderProcessInput(dec));
-    JxlDecoderDestroy(dec);
-
-    for (size_t y = 0; y < ysize; y++) {
-      uint8_t* JXL_RESTRICT rowm = image.data() + stride * y;
-      uint8_t* JXL_RESTRICT rows = extra.data() + xsize * y;
-      for (size_t x = 0; x < xsize; x++) {
-        if (!render_spot) {
-          // if spot color isn't rendered, main image should be as we made it
-          // (red and blue are all zeroes)
-
-          EXPECT_EQ(rowm[x * 3 + 0], 0);
-          EXPECT_EQ(rowm[x * 3 + 1], (x + y > 255 ? 255 : x + y));
-          EXPECT_EQ(rowm[x * 3 + 2], 0);
-        }
-        if (render_spot) {
-          // if spot color is rendered, expect red and blue to look like the
-          // spot color channel
-          EXPECT_LT(abs(rowm[x * 3 + 0] - (rows[x] * 0.25f)), 1);
-          EXPECT_LT(abs(rowm[x * 3 + 2] - (rows[x] * 0.5f)), 1);
-        }
-        EXPECT_EQ(rows[x], ((x ^ y) & 255));
-      }
-    }
-  }
-}
-
-TEST(DecodeTest, CloseInput) {
-  std::vector<uint8_t> partial_file = {0xff};
-
-  JxlDecoderPtr dec = JxlDecoderMake(nullptr);
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(dec.get(),
-                                      JXL_DEC_BASIC_INFO | JXL_DEC_FULL_IMAGE));
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetInput(dec.get(), partial_file.data(),
-                                                partial_file.size()));
-  EXPECT_EQ(JXL_DEC_NEED_MORE_INPUT, JxlDecoderProcessInput(dec.get()));
-  EXPECT_EQ(JXL_DEC_NEED_MORE_INPUT, JxlDecoderProcessInput(dec.get()));
-  JxlDecoderCloseInput(dec.get());
-  EXPECT_EQ(JXL_DEC_ERROR, JxlDecoderProcessInput(dec.get()));
-}
diff --git a/third_party/jpeg-xl/lib/jxl/decode_to_jpeg.cc b/third_party/jpeg-xl/lib/jxl/decode_to_jpeg.cc
deleted file mode 100644
index 78941a495b0f2..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/decode_to_jpeg.cc
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/decode_to_jpeg.h"
-
-#include <jxl/decode.h>
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/common.h"  // JPEGXL_ENABLE_TRANSCODE_JPEG
-#include "lib/jxl/jpeg/dec_jpeg_data.h"
-#include "lib/jxl/jpeg/jpeg_data.h"
-
-namespace jxl {
-
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-
-JxlDecoderStatus JxlToJpegDecoder::Process(const uint8_t** next_in,
-                                           size_t* avail_in) {
-  if (!inside_box_) {
-    JXL_WARNING(
-        "processing of JPEG reconstruction data outside JPEG reconstruction "
-        "box");
-    return JXL_DEC_ERROR;
-  }
-  Span<const uint8_t> to_decode;
-  if (box_until_eof_) {
-    // Until EOF means consume all data.
-    to_decode = Bytes(*next_in, *avail_in);
-    *next_in += *avail_in;
-    *avail_in = 0;
-  } else {
-    // Defined size means consume min(available, needed).
-    size_t avail_recon_in =
-        std::min<size_t>(*avail_in, box_size_ - buffer_.size());
-    to_decode = Bytes(*next_in, avail_recon_in);
-    *next_in += avail_recon_in;
-    *avail_in -= avail_recon_in;
-  }
-  bool old_data_exists = !buffer_.empty();
-  if (old_data_exists) {
-    // Append incoming data to buffer if we already had data in the buffer.
-    buffer_.insert(buffer_.end(), to_decode.data(),
-                   to_decode.data() + to_decode.size());
-    to_decode = Bytes(buffer_.data(), buffer_.size());
-  }
-  if (!box_until_eof_ && to_decode.size() > box_size_) {
-    JXL_WARNING("JPEG reconstruction data to decode larger than expected");
-    return JXL_DEC_ERROR;
-  }
-  if (box_until_eof_ || to_decode.size() == box_size_) {
-    // If undefined size, or the right size, try to decode.
-    jpeg_data_ = make_unique<jpeg::JPEGData>();
-    const auto status = jpeg::DecodeJPEGData(to_decode, jpeg_data_.get());
-    if (status.IsFatalError()) return JXL_DEC_ERROR;
-    if (status) {
-      // Successful decoding, emit event after updating state to track that we
-      // are no longer parsing JPEG reconstruction data.
-      inside_box_ = false;
-      return JXL_DEC_JPEG_RECONSTRUCTION;
-    }
-    if (box_until_eof_) {
-      // Unsuccessful decoding and undefined size, assume incomplete data. Copy
-      // the data if we haven't already.
-      if (!old_data_exists) {
-        buffer_.insert(buffer_.end(), to_decode.data(),
-                       to_decode.data() + to_decode.size());
-      }
-    } else {
-      // Unsuccessful decoding of correct amount of data, assume error.
-      return JXL_DEC_ERROR;
-    }
-  } else {
-    // Not enough data, copy the data if we haven't already.
-    if (!old_data_exists) {
-      buffer_.insert(buffer_.end(), to_decode.data(),
-                     to_decode.data() + to_decode.size());
-    }
-  }
-  return JXL_DEC_NEED_MORE_INPUT;
-}
-
-size_t JxlToJpegDecoder::NumExifMarkers(const jpeg::JPEGData& jpeg_data) {
-  size_t num = 0;
-  for (size_t i = 0; i < jpeg_data.app_data.size(); ++i) {
-    if (jpeg_data.app_marker_type[i] == jxl::jpeg::AppMarkerType::kExif) {
-      num++;
-    }
-  }
-  return num;
-}
-
-size_t JxlToJpegDecoder::NumXmpMarkers(const jpeg::JPEGData& jpeg_data) {
-  size_t num = 0;
-  for (size_t i = 0; i < jpeg_data.app_data.size(); ++i) {
-    if (jpeg_data.app_marker_type[i] == jxl::jpeg::AppMarkerType::kXMP) {
-      num++;
-    }
-  }
-  return num;
-}
-
-JxlDecoderStatus JxlToJpegDecoder::ExifBoxContentSize(
-    const jpeg::JPEGData& jpeg_data, size_t* size) {
-  for (size_t i = 0; i < jpeg_data.app_data.size(); ++i) {
-    if (jpeg_data.app_marker_type[i] == jxl::jpeg::AppMarkerType::kExif) {
-      if (jpeg_data.app_data[i].size() < 3 + sizeof(jpeg::kExifTag)) {
-        // too small for app marker header
-        return JXL_DEC_ERROR;
-      }
-      // The first 4 bytes are the TIFF header from the box contents, and are
-      // not included in the JPEG
-      *size = jpeg_data.app_data[i].size() + 4 - 3 - sizeof(jpeg::kExifTag);
-      return JXL_DEC_SUCCESS;
-    }
-  }
-  return JXL_DEC_ERROR;
-}
-
-JxlDecoderStatus JxlToJpegDecoder::XmlBoxContentSize(
-    const jpeg::JPEGData& jpeg_data, size_t* size) {
-  for (size_t i = 0; i < jpeg_data.app_data.size(); ++i) {
-    if (jpeg_data.app_marker_type[i] == jxl::jpeg::AppMarkerType::kXMP) {
-      if (jpeg_data.app_data[i].size() < 3 + sizeof(jpeg::kXMPTag)) {
-        // too small for app marker header
-        return JXL_DEC_ERROR;
-      }
-      *size = jpeg_data.app_data[i].size() - 3 - sizeof(jpeg::kXMPTag);
-      return JXL_DEC_SUCCESS;
-    }
-  }
-  return JXL_DEC_ERROR;
-}
-
-JxlDecoderStatus JxlToJpegDecoder::SetExif(const uint8_t* data, size_t size,
-                                           jpeg::JPEGData* jpeg_data) {
-  for (size_t i = 0; i < jpeg_data->app_data.size(); ++i) {
-    if (jpeg_data->app_marker_type[i] == jxl::jpeg::AppMarkerType::kExif) {
-      if (jpeg_data->app_data[i].size() !=
-          size + 3 + sizeof(jpeg::kExifTag) - 4)
-        return JXL_DEC_ERROR;
-      // The first 9 bytes are used for JPEG marker header.
-      jpeg_data->app_data[i][0] = 0xE1;
-      // The second and third byte are already filled in correctly
-      memcpy(jpeg_data->app_data[i].data() + 3, jpeg::kExifTag,
-             sizeof(jpeg::kExifTag));
-      // The first 4 bytes are the TIFF header from the box contents, and are
-      // not included in the JPEG
-      memcpy(jpeg_data->app_data[i].data() + 3 + sizeof(jpeg::kExifTag),
-             data + 4, size - 4);
-      return JXL_DEC_SUCCESS;
-    }
-  }
-  return JXL_DEC_ERROR;
-}
-JxlDecoderStatus JxlToJpegDecoder::SetXmp(const uint8_t* data, size_t size,
-                                          jpeg::JPEGData* jpeg_data) {
-  for (size_t i = 0; i < jpeg_data->app_data.size(); ++i) {
-    if (jpeg_data->app_marker_type[i] == jxl::jpeg::AppMarkerType::kXMP) {
-      if (jpeg_data->app_data[i].size() != size + 3 + sizeof(jpeg::kXMPTag))
-        return JXL_DEC_ERROR;
-      // The first 9 bytes are used for JPEG marker header.
-      jpeg_data->app_data[i][0] = 0xE1;
-      // The second and third byte are already filled in correctly
-      memcpy(jpeg_data->app_data[i].data() + 3, jpeg::kXMPTag,
-             sizeof(jpeg::kXMPTag));
-      memcpy(jpeg_data->app_data[i].data() + 3 + sizeof(jpeg::kXMPTag), data,
-             size);
-      return JXL_DEC_SUCCESS;
-    }
-  }
-  return JXL_DEC_ERROR;
-}
-
-#endif  // JPEGXL_ENABLE_TRANSCODE_JPEG
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/decode_to_jpeg.h b/third_party/jpeg-xl/lib/jxl/decode_to_jpeg.h
deleted file mode 100644
index 8dd32d63b4874..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/decode_to_jpeg.h
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_DECODE_TO_JPEG_H_
-#define LIB_JXL_DECODE_TO_JPEG_H_
-
-// JPEG XL to JPEG bytes decoder logic. The JxlToJpegDecoder class keeps track
-// of the decoder state needed to parse the JPEG reconstruction box and provide
-// the reconstructed JPEG to the output buffer.
-
-#include <jxl/decode.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#include <algorithm>
-#include <cstring>
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/common.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/jpeg/jpeg_data.h"
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-#include "lib/jxl/jpeg/dec_jpeg_data_writer.h"
-#endif  // JPEGXL_ENABLE_TRANSCODE_JPEG
-
-namespace jxl {
-
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-
-class JxlToJpegDecoder {
- public:
-  // Returns whether an output buffer is set.
-  bool IsOutputSet() const { return next_out_ != nullptr; }
-
-  // Returns whether the decoder is parsing a boxa JPEG box was parsed.
-  bool IsParsingBox() const { return inside_box_; }
-
-  // Sets the output buffer used when producing JPEG output.
-  JxlDecoderStatus SetOutputBuffer(uint8_t* data, size_t size) {
-    if (next_out_) return JXL_DEC_ERROR;
-    next_out_ = data;
-    avail_size_ = size;
-    return JXL_DEC_SUCCESS;
-  }
-
-  // Releases the buffer set with SetOutputBuffer().
-  size_t ReleaseOutputBuffer() {
-    size_t result = avail_size_;
-    next_out_ = nullptr;
-    avail_size_ = 0;
-    return result;
-  }
-
-  void StartBox(bool box_until_eof, size_t contents_size) {
-    // A new box implies that we clear the buffer.
-    buffer_.clear();
-    inside_box_ = true;
-    if (box_until_eof) {
-      box_until_eof_ = true;
-    } else {
-      box_size_ = contents_size;
-    }
-  }
-
-  // Consumes data from next_in/avail_in to reconstruct JPEG data.
-  // Uses box_size_, inside_box_ and box_until_eof_ to calculate how much to
-  // consume. Potentially stores unparsed data in buffer_.
-  // Potentially populates jpeg_data_. Potentially updates inside_box_.
-  // Returns JXL_DEC_JPEG_RECONSTRUCTION when finished, JXL_DEC_NEED_MORE_INPUT
-  // if more input is needed, JXL_DEC_ERROR on parsing error.
-  JxlDecoderStatus Process(const uint8_t** next_in, size_t* avail_in);
-
-  // Returns non-owned copy of the JPEGData, only after Process finished and
-  // the JPEGData was not yet moved to an image bundle with
-  // SetImageBundleJpegData.
-  jpeg::JPEGData* GetJpegData() { return jpeg_data_.get(); }
-
-  // Returns how many exif or xmp app markers are present in the JPEG data. A
-  // return value higher than 1 would require multiple exif boxes or multiple
-  // xmp boxes in the container format, and this is not supported by the API and
-  // considered an error. May only be called after Process returned success.
-  static size_t NumExifMarkers(const jpeg::JPEGData& jpeg_data);
-  static size_t NumXmpMarkers(const jpeg::JPEGData& jpeg_data);
-
-  // Returns box content size for metadata, using the known data from the app
-  // markers.
-  static JxlDecoderStatus ExifBoxContentSize(const jpeg::JPEGData& jpeg_data,
-                                             size_t* size);
-  static JxlDecoderStatus XmlBoxContentSize(const jpeg::JPEGData& jpeg_data,
-                                            size_t* size);
-
-  // Returns JXL_DEC_ERROR if there is no exif/XMP marker or the data size
-  // does not match, or this function is called before Process returned
-  // success, JXL_DEC_SUCCESS otherwise. As input, provide the full box contents
-  // but not the box header. In case of exif, this includes the 4-byte TIFF
-  // header, even though it won't be copied into the JPEG.
-  static JxlDecoderStatus SetExif(const uint8_t* data, size_t size,
-                                  jpeg::JPEGData* jpeg_data);
-  static JxlDecoderStatus SetXmp(const uint8_t* data, size_t size,
-                                 jpeg::JPEGData* jpeg_data);
-
-  // Sets the JpegData of the ImageBundle passed if there is anything to set.
-  // Releases the JpegData from this decoder if set.
-  Status SetImageBundleJpegData(ImageBundle* ib) {
-    if (IsOutputSet() && jpeg_data_ != nullptr) {
-      if (!jpeg::SetJPEGDataFromICC(ib->metadata()->color_encoding.ICC(),
-                                    jpeg_data_.get())) {
-        return false;
-      }
-      ib->jpeg_data = std::move(jpeg_data_);
-    }
-    return true;
-  }
-
-  JxlDecoderStatus WriteOutput(const jpeg::JPEGData& jpeg_data) {
-    // Copy JPEG bytestream if desired.
-    uint8_t* tmp_next_out = next_out_;
-    size_t tmp_avail_size = avail_size_;
-    auto write = [&tmp_next_out, &tmp_avail_size](const uint8_t* buf,
-                                                  size_t len) {
-      size_t to_write = std::min<size_t>(tmp_avail_size, len);
-      if (to_write != 0) memcpy(tmp_next_out, buf, to_write);
-      tmp_next_out += to_write;
-      tmp_avail_size -= to_write;
-      return to_write;
-    };
-    Status write_result = jpeg::WriteJpeg(jpeg_data, write);
-    if (!write_result) {
-      if (tmp_avail_size == 0) {
-        return JXL_DEC_JPEG_NEED_MORE_OUTPUT;
-      }
-      return JXL_DEC_ERROR;
-    }
-    next_out_ = tmp_next_out;
-    avail_size_ = tmp_avail_size;
-    return JXL_DEC_SUCCESS;
-  }
-
- private:
-  // Content of the most recently parsed JPEG reconstruction box if any.
-  std::vector<uint8_t> buffer_;
-
-  // Decoded content of the most recently parsed JPEG reconstruction box is
-  // stored here.
-  std::unique_ptr<jpeg::JPEGData> jpeg_data_;
-
-  // True if the decoder is currently reading bytes inside a JPEG reconstruction
-  // box.
-  bool inside_box_ = false;
-
-  // True if the JPEG reconstruction box had undefined size (all remaining
-  // bytes).
-  bool box_until_eof_ = false;
-  // Size of most recently parsed JPEG reconstruction box contents.
-  size_t box_size_ = 0;
-
-  // Next bytes to write JPEG reconstruction to.
-  uint8_t* next_out_ = nullptr;
-  // Available bytes to write JPEG reconstruction to.
-  size_t avail_size_ = 0;
-};
-
-#else
-
-// Fake class that disables support for decoding JPEG XL to JPEG.
-class JxlToJpegDecoder {
- public:
-  bool IsOutputSet() const { return false; }
-  bool IsParsingBox() const { return false; }
-
-  JxlDecoderStatus SetOutputBuffer(uint8_t* /* data */, size_t /* size */) {
-    return JXL_DEC_ERROR;
-  }
-  size_t ReleaseOutputBuffer() { return 0; }
-
-  void StartBox(bool /* box_until_eof */, size_t /* contents_size */) {}
-
-  JxlDecoderStatus Process(const uint8_t** next_in, size_t* avail_in) {
-    return JXL_DEC_ERROR;
-  }
-  jpeg::JPEGData* GetJpegData() { return nullptr; }
-
-  Status SetImageBundleJpegData(ImageBundle* /* ib */) { return true; }
-
-  static size_t NumExifMarkers(const jpeg::JPEGData& /*jpeg_data*/) {
-    return 0;
-  }
-  static size_t NumXmpMarkers(const jpeg::JPEGData& /*jpeg_data*/) { return 0; }
-  static size_t ExifBoxContentSize(const jpeg::JPEGData& /*jpeg_data*/,
-                                   size_t* /*size*/) {
-    return JXL_DEC_ERROR;
-  }
-  static size_t XmlBoxContentSize(const jpeg::JPEGData& /*jpeg_data*/,
-                                  size_t* /*size*/) {
-    return JXL_DEC_ERROR;
-  }
-  static JxlDecoderStatus SetExif(const uint8_t* /*data*/, size_t /*size*/,
-                                  jpeg::JPEGData* /*jpeg_data*/) {
-    return JXL_DEC_ERROR;
-  }
-  static JxlDecoderStatus SetXmp(const uint8_t* /*data*/, size_t /*size*/,
-                                 jpeg::JPEGData* /*jpeg_data*/) {
-    return JXL_DEC_ERROR;
-  }
-
-  JxlDecoderStatus WriteOutput(const jpeg::JPEGData& /* jpeg_data */) {
-    return JXL_DEC_SUCCESS;
-  }
-};
-
-#endif  // JPEGXL_ENABLE_TRANSCODE_JPEG
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_DECODE_TO_JPEG_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_ac_strategy.cc b/third_party/jpeg-xl/lib/jxl/enc_ac_strategy.cc
deleted file mode 100644
index 940c738a1179c..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_ac_strategy.cc
+++ /dev/null
@@ -1,1183 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_ac_strategy.h"
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <cmath>
-#include <cstdint>
-#include <cstdio>
-#include <cstring>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/memory_manager_internal.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/enc_ac_strategy.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/ac_strategy.h"
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/fast_math-inl.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_transforms-inl.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_debug_image.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/enc_transforms-inl.h"
-#include "lib/jxl/simd_util.h"
-
-// Some of the floating point constants in this file and in other
-// files in the libjxl project have been obtained using the
-// tools/optimizer/simplex_fork.py tool. It is a variation of
-// Nelder-Mead optimization, and we generally try to minimize
-// BPP * pnorm aggregate as reported by the benchmark_xl tool,
-// but occasionally the values are optimized by using additional
-// constraints such as maintaining a certain density, or ratio of
-// popularity of integral transforms. Jyrki visually reviews all
-// such changes and often makes manual changes to maintain good
-// visual quality to changes where butteraugli was not sufficiently
-// sensitive to some kind of degradation. Unfortunately image quality
-// is still more of an art than science.
-
-// Set JXL_DEBUG_AC_STRATEGY to 1 to enable debugging.
-#ifndef JXL_DEBUG_AC_STRATEGY
-#define JXL_DEBUG_AC_STRATEGY 0
-#endif
-
-// This must come before the begin/end_target, but HWY_ONCE is only true
-// after that, so use an "include guard".
-#ifndef LIB_JXL_ENC_AC_STRATEGY_
-#define LIB_JXL_ENC_AC_STRATEGY_
-// Parameters of the heuristic are marked with a OPTIMIZE comment.
-namespace jxl {
-namespace {
-
-// Debugging utilities.
-
-// Returns a linear sRGB color (as bytes) for each AC strategy.
-const uint8_t* TypeColor(uint8_t raw_strategy) {
-  JXL_DASSERT(AcStrategy::IsRawStrategyValid(raw_strategy));
-  static_assert(AcStrategy::kNumValidStrategies == 27, "Update colors");
-  static constexpr uint8_t kColors[AcStrategy::kNumValidStrategies + 1][3] = {
-      {0xFF, 0xFF, 0x00},  // DCT8       | yellow
-      {0xFF, 0x80, 0x80},  // HORNUSS    | vivid tangerine
-      {0xFF, 0x80, 0x80},  // DCT2x2     | vivid tangerine
-      {0xFF, 0x80, 0x80},  // DCT4x4     | vivid tangerine
-      {0x80, 0xFF, 0x00},  // DCT16x16   | chartreuse
-      {0x00, 0xC0, 0x00},  // DCT32x32   | waystone green
-      {0xC0, 0xFF, 0x00},  // DCT16x8    | lime
-      {0xC0, 0xFF, 0x00},  // DCT8x16    | lime
-      {0x00, 0xFF, 0x00},  // DCT32x8    | green
-      {0x00, 0xFF, 0x00},  // DCT8x32    | green
-      {0x00, 0xFF, 0x00},  // DCT32x16   | green
-      {0x00, 0xFF, 0x00},  // DCT16x32   | green
-      {0xFF, 0x80, 0x00},  // DCT4x8     | orange juice
-      {0xFF, 0x80, 0x00},  // DCT8x4     | orange juice
-      {0xFF, 0xFF, 0x80},  // AFV0       | butter
-      {0xFF, 0xFF, 0x80},  // AFV1       | butter
-      {0xFF, 0xFF, 0x80},  // AFV2       | butter
-      {0xFF, 0xFF, 0x80},  // AFV3       | butter
-      {0x00, 0xC0, 0xFF},  // DCT64x64   | capri
-      {0x00, 0xFF, 0xFF},  // DCT64x32   | aqua
-      {0x00, 0xFF, 0xFF},  // DCT32x64   | aqua
-      {0x00, 0x40, 0xFF},  // DCT128x128 | rare blue
-      {0x00, 0x80, 0xFF},  // DCT128x64  | magic ink
-      {0x00, 0x80, 0xFF},  // DCT64x128  | magic ink
-      {0x00, 0x00, 0xC0},  // DCT256x256 | keese blue
-      {0x00, 0x00, 0xFF},  // DCT256x128 | blue
-      {0x00, 0x00, 0xFF},  // DCT128x256 | blue
-      {0x00, 0x00, 0x00}   // invalid    | black
-  };
-  raw_strategy =
-      Clamp1<uint8_t>(raw_strategy, 0, AcStrategy::kNumValidStrategies);
-  return kColors[raw_strategy];
-}
-
-const uint8_t* TypeMask(uint8_t raw_strategy) {
-  JXL_DASSERT(AcStrategy::IsRawStrategyValid(raw_strategy));
-  static_assert(AcStrategy::kNumValidStrategies == 27, "Update masks");
-  // implicitly, first row and column is made dark
-  static constexpr uint8_t kMask[AcStrategy::kNumValidStrategies + 1][64] = {
-      {
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-      },                           // DCT8
-      {
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 1, 0, 0, 1, 0, 0,  //
-          0, 0, 1, 0, 0, 1, 0, 0,  //
-          0, 0, 1, 1, 1, 1, 0, 0,  //
-          0, 0, 1, 0, 0, 1, 0, 0,  //
-          0, 0, 1, 0, 0, 1, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-      },                           // HORNUSS
-      {
-          1, 1, 1, 1, 1, 1, 1, 1,  //
-          1, 0, 1, 0, 1, 0, 1, 0,  //
-          1, 1, 1, 1, 1, 1, 1, 1,  //
-          1, 0, 1, 0, 1, 0, 1, 0,  //
-          1, 1, 1, 1, 1, 1, 1, 1,  //
-          1, 0, 1, 0, 1, 0, 1, 0,  //
-          1, 1, 1, 1, 1, 1, 1, 1,  //
-          1, 0, 1, 0, 1, 0, 1, 0,  //
-      },                           // 2x2
-      {
-          0, 0, 0, 0, 1, 0, 0, 0,  //
-          0, 0, 0, 0, 1, 0, 0, 0,  //
-          0, 0, 0, 0, 1, 0, 0, 0,  //
-          0, 0, 0, 0, 1, 0, 0, 0,  //
-          1, 1, 1, 1, 1, 1, 1, 1,  //
-          0, 0, 0, 0, 1, 0, 0, 0,  //
-          0, 0, 0, 0, 1, 0, 0, 0,  //
-          0, 0, 0, 0, 1, 0, 0, 0,  //
-      },                           // 4x4
-      {},                          // DCT16x16 (unused)
-      {},                          // DCT32x32 (unused)
-      {},                          // DCT16x8 (unused)
-      {},                          // DCT8x16 (unused)
-      {},                          // DCT32x8 (unused)
-      {},                          // DCT8x32 (unused)
-      {},                          // DCT32x16 (unused)
-      {},                          // DCT16x32 (unused)
-      {
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          1, 1, 1, 1, 1, 1, 1, 1,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-      },                           // DCT4x8
-      {
-          0, 0, 0, 0, 1, 0, 0, 0,  //
-          0, 0, 0, 0, 1, 0, 0, 0,  //
-          0, 0, 0, 0, 1, 0, 0, 0,  //
-          0, 0, 0, 0, 1, 0, 0, 0,  //
-          0, 0, 0, 0, 1, 0, 0, 0,  //
-          0, 0, 0, 0, 1, 0, 0, 0,  //
-          0, 0, 0, 0, 1, 0, 0, 0,  //
-          0, 0, 0, 0, 1, 0, 0, 0,  //
-      },                           // DCT8x4
-      {
-          1, 1, 1, 1, 1, 0, 0, 0,  //
-          1, 1, 1, 1, 0, 0, 0, 0,  //
-          1, 1, 1, 0, 0, 0, 0, 0,  //
-          1, 1, 0, 0, 0, 0, 0, 0,  //
-          1, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-      },                           // AFV0
-      {
-          0, 0, 0, 0, 1, 1, 1, 1,  //
-          0, 0, 0, 0, 0, 1, 1, 1,  //
-          0, 0, 0, 0, 0, 0, 1, 1,  //
-          0, 0, 0, 0, 0, 0, 0, 1,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-      },                           // AFV1
-      {
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          1, 0, 0, 0, 0, 0, 0, 0,  //
-          1, 1, 0, 0, 0, 0, 0, 0,  //
-          1, 1, 1, 0, 0, 0, 0, 0,  //
-          1, 1, 1, 1, 0, 0, 0, 0,  //
-      },                           // AFV2
-      {
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 0,  //
-          0, 0, 0, 0, 0, 0, 0, 1,  //
-          0, 0, 0, 0, 0, 0, 1, 1,  //
-          0, 0, 0, 0, 0, 1, 1, 1,  //
-      },                           // AFV3
-      {}                           // invalid
-  };
-  raw_strategy =
-      Clamp1<uint8_t>(raw_strategy, 0, AcStrategy::kNumValidStrategies);
-  return kMask[raw_strategy];
-}
-
-Status DumpAcStrategy(const AcStrategyImage& ac_strategy, size_t xsize,
-                      size_t ysize, const char* tag, AuxOut* aux_out,
-                      const CompressParams& cparams) {
-  JxlMemoryManager* memory_manager = ac_strategy.memory_manager();
-  JXL_ASSIGN_OR_RETURN(Image3F color_acs,
-                       Image3F::Create(memory_manager, xsize, ysize));
-  for (size_t y = 0; y < ysize; y++) {
-    float* JXL_RESTRICT rows[3] = {
-        color_acs.PlaneRow(0, y),
-        color_acs.PlaneRow(1, y),
-        color_acs.PlaneRow(2, y),
-    };
-    const AcStrategyRow acs_row = ac_strategy.ConstRow(y / kBlockDim);
-    for (size_t x = 0; x < xsize; x++) {
-      AcStrategy acs = acs_row[x / kBlockDim];
-      const uint8_t* JXL_RESTRICT color = TypeColor(acs.RawStrategy());
-      for (size_t c = 0; c < 3; c++) {
-        rows[c][x] = color[c] / 255.f;
-      }
-    }
-  }
-  size_t stride = color_acs.PixelsPerRow();
-  for (size_t c = 0; c < 3; c++) {
-    for (size_t by = 0; by < DivCeil(ysize, kBlockDim); by++) {
-      float* JXL_RESTRICT row = color_acs.PlaneRow(c, by * kBlockDim);
-      const AcStrategyRow acs_row = ac_strategy.ConstRow(by);
-      for (size_t bx = 0; bx < DivCeil(xsize, kBlockDim); bx++) {
-        AcStrategy acs = acs_row[bx];
-        if (!acs.IsFirstBlock()) continue;
-        const uint8_t* JXL_RESTRICT color = TypeColor(acs.RawStrategy());
-        const uint8_t* JXL_RESTRICT mask = TypeMask(acs.RawStrategy());
-        if (acs.covered_blocks_x() == 1 && acs.covered_blocks_y() == 1) {
-          for (size_t iy = 0; iy < kBlockDim && by * kBlockDim + iy < ysize;
-               iy++) {
-            for (size_t ix = 0; ix < kBlockDim && bx * kBlockDim + ix < xsize;
-                 ix++) {
-              if (mask[iy * kBlockDim + ix]) {
-                row[iy * stride + bx * kBlockDim + ix] = color[c] / 800.f;
-              }
-            }
-          }
-        }
-        // draw block edges
-        for (size_t ix = 0; ix < kBlockDim * acs.covered_blocks_x() &&
-                            bx * kBlockDim + ix < xsize;
-             ix++) {
-          row[0 * stride + bx * kBlockDim + ix] = color[c] / 350.f;
-        }
-        for (size_t iy = 0; iy < kBlockDim * acs.covered_blocks_y() &&
-                            by * kBlockDim + iy < ysize;
-             iy++) {
-          row[iy * stride + bx * kBlockDim + 0] = color[c] / 350.f;
-        }
-      }
-    }
-  }
-  return DumpImage(cparams, tag, color_acs);
-}
-
-}  // namespace
-}  // namespace jxl
-#endif  // LIB_JXL_ENC_AC_STRATEGY_
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::AbsDiff;
-using hwy::HWY_NAMESPACE::Eq;
-using hwy::HWY_NAMESPACE::IfThenElseZero;
-using hwy::HWY_NAMESPACE::IfThenZeroElse;
-using hwy::HWY_NAMESPACE::Round;
-using hwy::HWY_NAMESPACE::Sqrt;
-
-bool MultiBlockTransformCrossesHorizontalBoundary(
-    const AcStrategyImage& ac_strategy, size_t start_x, size_t y,
-    size_t end_x) {
-  if (start_x >= ac_strategy.xsize() || y >= ac_strategy.ysize()) {
-    return false;
-  }
-  if (y % 8 == 0) {
-    // Nothing crosses 64x64 boundaries, and the memory on the other side
-    // of the 64x64 block may still uninitialized.
-    return false;
-  }
-  end_x = std::min(end_x, ac_strategy.xsize());
-  // The first multiblock might be before the start_x, let's adjust it
-  // to point to the first IsFirstBlock() == true block we find by backward
-  // tracing.
-  AcStrategyRow row = ac_strategy.ConstRow(y);
-  const size_t start_x_limit = start_x & ~7;
-  while (start_x != start_x_limit && !row[start_x].IsFirstBlock()) {
-    --start_x;
-  }
-  for (size_t x = start_x; x < end_x;) {
-    if (row[x].IsFirstBlock()) {
-      x += row[x].covered_blocks_x();
-    } else {
-      return true;
-    }
-  }
-  return false;
-}
-
-bool MultiBlockTransformCrossesVerticalBoundary(
-    const AcStrategyImage& ac_strategy, size_t x, size_t start_y,
-    size_t end_y) {
-  if (x >= ac_strategy.xsize() || start_y >= ac_strategy.ysize()) {
-    return false;
-  }
-  if (x % 8 == 0) {
-    // Nothing crosses 64x64 boundaries, and the memory on the other side
-    // of the 64x64 block may still uninitialized.
-    return false;
-  }
-  end_y = std::min(end_y, ac_strategy.ysize());
-  // The first multiblock might be before the start_y, let's adjust it
-  // to point to the first IsFirstBlock() == true block we find by backward
-  // tracing.
-  const size_t start_y_limit = start_y & ~7;
-  while (start_y != start_y_limit &&
-         !ac_strategy.ConstRow(start_y)[x].IsFirstBlock()) {
-    --start_y;
-  }
-
-  for (size_t y = start_y; y < end_y;) {
-    AcStrategyRow row = ac_strategy.ConstRow(y);
-    if (row[x].IsFirstBlock()) {
-      y += row[x].covered_blocks_y();
-    } else {
-      return true;
-    }
-  }
-  return false;
-}
-
-Status EstimateEntropy(const AcStrategy& acs, float entropy_mul, size_t x,
-                       size_t y, const ACSConfig& config,
-                       const float* JXL_RESTRICT cmap_factors, float* block,
-                       float* full_scratch_space, uint32_t* quantized,
-                       float& entropy) {
-  entropy = 0.0f;
-  float* mem = full_scratch_space;
-  float* scratch_space = full_scratch_space + AcStrategy::kMaxCoeffArea;
-  const size_t size = (1 << acs.log2_covered_blocks()) * kDCTBlockSize;
-
-  // Apply transform.
-  for (size_t c = 0; c < 3; c++) {
-    float* JXL_RESTRICT block_c = block + size * c;
-    TransformFromPixels(acs.Strategy(), &config.Pixel(c, x, y),
-                        config.src_stride, block_c, scratch_space);
-  }
-  HWY_FULL(float) df;
-
-  const size_t num_blocks = acs.covered_blocks_x() * acs.covered_blocks_y();
-  // avoid large blocks when there is a lot going on in red-green.
-  float quant_norm16 = 0;
-  if (num_blocks == 1) {
-    // When it is only one 8x8, we don't need aggregation of values.
-    quant_norm16 = config.Quant(x / 8, y / 8);
-  } else if (num_blocks == 2) {
-    // Taking max instead of 8th norm seems to work
-    // better for smallest blocks up to 16x8. Jyrki couldn't get
-    // improvements in trying the same for 16x16 blocks.
-    if (acs.covered_blocks_y() == 2) {
-      quant_norm16 =
-          std::max(config.Quant(x / 8, y / 8), config.Quant(x / 8, y / 8 + 1));
-    } else {
-      quant_norm16 =
-          std::max(config.Quant(x / 8, y / 8), config.Quant(x / 8 + 1, y / 8));
-    }
-  } else {
-    // Load QF value, calculate empirical heuristic on masking field
-    // for weighting the information loss. Information loss manifests
-    // itself as ringing, and masking could hide it.
-    for (size_t iy = 0; iy < acs.covered_blocks_y(); iy++) {
-      for (size_t ix = 0; ix < acs.covered_blocks_x(); ix++) {
-        float qval = config.Quant(x / 8 + ix, y / 8 + iy);
-        qval *= qval;
-        qval *= qval;
-        qval *= qval;
-        quant_norm16 += qval * qval;
-      }
-    }
-    quant_norm16 /= num_blocks;
-    quant_norm16 = FastPowf(quant_norm16, 1.0f / 16.0f);
-  }
-  const auto quant = Set(df, quant_norm16);
-
-  // Compute entropy.
-  const HWY_CAPPED(float, 8) df8;
-
-  auto loss = Zero(df8);
-  for (size_t c = 0; c < 3; c++) {
-    const float* inv_matrix = config.dequant->InvMatrix(acs.Strategy(), c);
-    const float* matrix = config.dequant->Matrix(acs.Strategy(), c);
-    const auto cmap_factor = Set(df, cmap_factors[c]);
-
-    auto entropy_v = Zero(df);
-    auto nzeros_v = Zero(df);
-    for (size_t i = 0; i < num_blocks * kDCTBlockSize; i += Lanes(df)) {
-      const auto in = Load(df, block + c * size + i);
-      const auto in_y = Mul(Load(df, block + size + i), cmap_factor);
-      const auto im = Load(df, inv_matrix + i);
-      const auto val = Mul(Sub(in, in_y), Mul(im, quant));
-      const auto rval = Round(val);
-      const auto diff = Sub(val, rval);
-      const auto m = Load(df, matrix + i);
-      Store(Mul(m, diff), df, &mem[i]);
-      const auto q = Abs(rval);
-      const auto q_is_zero = Eq(q, Zero(df));
-      // We used to have q * C here, but that cost model seems to
-      // be punishing large values more than necessary. Sqrt tries
-      // to avoid large values less aggressively.
-      entropy_v = Add(Sqrt(q), entropy_v);
-      nzeros_v = Add(nzeros_v, IfThenZeroElse(q_is_zero, Set(df, 1.0f)));
-    }
-
-    {
-      auto lossc = Zero(df8);
-      TransformToPixels(acs.Strategy(), &mem[0], block,
-                        acs.covered_blocks_x() * 8, scratch_space);
-
-      for (size_t iy = 0; iy < acs.covered_blocks_y(); iy++) {
-        for (size_t ix = 0; ix < acs.covered_blocks_x(); ix++) {
-          for (size_t dy = 0; dy < kBlockDim; ++dy) {
-            for (size_t dx = 0; dx < kBlockDim; dx += Lanes(df8)) {
-              auto in = Load(df8, block +
-                                      (iy * kBlockDim + dy) *
-                                          (acs.covered_blocks_x() * kBlockDim) +
-                                      ix * kBlockDim + dx);
-              if (x + ix * 8 + dx + Lanes(df8) <= config.mask1x1_xsize) {
-                auto masku =
-                    Abs(Load(df8, config.MaskingPtr1x1(x + ix * 8 + dx,
-                                                       y + iy * 8 + dy)));
-                in = Mul(masku, in);
-                in = Mul(in, in);
-                in = Mul(in, in);
-                in = Mul(in, in);
-                lossc = Add(lossc, in);
-              }
-            }
-          }
-        }
-      }
-      static const double kChannelMul[3] = {
-          pow(10.2, 8.0),
-          pow(1.0, 8.0),
-          pow(1.03, 8.0),
-      };
-      lossc = Mul(Set(df8, kChannelMul[c]), lossc);
-      loss = Add(loss, lossc);
-    }
-    entropy += config.cost_delta * GetLane(SumOfLanes(df, entropy_v));
-    size_t num_nzeros = GetLane(SumOfLanes(df, nzeros_v));
-    // Add #bit of num_nonzeros, as an estimate of the cost for encoding the
-    // number of non-zeros of the block.
-    size_t nbits = CeilLog2Nonzero(num_nzeros + 1) + 1;
-    // Also add #bit of #bit of num_nonzeros, to estimate the ANS cost, with a
-    // bias.
-    entropy += config.zeros_mul * (CeilLog2Nonzero(nbits + 17) + nbits);
-  }
-  float loss_scalar =
-      pow(GetLane(SumOfLanes(df8, loss)) / (num_blocks * kDCTBlockSize),
-          1.0 / 8.0) *
-      (num_blocks * kDCTBlockSize) / quant_norm16;
-  entropy *= entropy_mul;
-  entropy += config.info_loss_multiplier * loss_scalar;
-  return true;
-}
-
-Status FindBest8x8Transform(size_t x, size_t y, int encoding_speed_tier,
-                            float butteraugli_target, const ACSConfig& config,
-                            const float* JXL_RESTRICT cmap_factors,
-                            AcStrategyImage* JXL_RESTRICT ac_strategy,
-                            float* block, float* scratch_space,
-                            uint32_t* quantized, float* entropy_out,
-                            AcStrategyType& best_tx) {
-  struct TransformTry8x8 {
-    AcStrategyType type;
-    int encoding_speed_tier_max_limit;
-    double entropy_mul;
-  };
-  static const TransformTry8x8 kTransforms8x8[] = {
-      {
-          AcStrategyType::DCT,
-          9,
-          0.8,
-      },
-      {
-          AcStrategyType::DCT4X4,
-          5,
-          1.08,
-      },
-      {
-          AcStrategyType::DCT2X2,
-          5,
-          0.95,
-      },
-      {
-          AcStrategyType::DCT4X8,
-          4,
-          0.85931637428340035,
-      },
-      {
-          AcStrategyType::DCT8X4,
-          4,
-          0.85931637428340035,
-      },
-      {
-          AcStrategyType::IDENTITY,
-          5,
-          1.0427542510634957,
-      },
-      {
-          AcStrategyType::AFV0,
-          4,
-          0.81779489591359944,
-      },
-      {
-          AcStrategyType::AFV1,
-          4,
-          0.81779489591359944,
-      },
-      {
-          AcStrategyType::AFV2,
-          4,
-          0.81779489591359944,
-      },
-      {
-          AcStrategyType::AFV3,
-          4,
-          0.81779489591359944,
-      },
-  };
-  double best = 1e30;
-  best_tx = kTransforms8x8[0].type;
-  for (auto tx : kTransforms8x8) {
-    if (tx.encoding_speed_tier_max_limit < encoding_speed_tier) {
-      continue;
-    }
-    AcStrategy acs = AcStrategy::FromRawStrategy(tx.type);
-    float entropy_mul = tx.entropy_mul / kTransforms8x8[0].entropy_mul;
-    if ((tx.type == AcStrategyType::DCT2X2 ||
-         tx.type == AcStrategyType::IDENTITY) &&
-        butteraugli_target < 5.0) {
-      static const float kFavor2X2AtHighQuality = 0.4;
-      float weight = pow((5.0f - butteraugli_target) / 5.0f, 2.0);
-      entropy_mul -= kFavor2X2AtHighQuality * weight;
-    }
-    if ((tx.type != AcStrategyType::DCT && tx.type != AcStrategyType::DCT2X2 &&
-         tx.type != AcStrategyType::IDENTITY) &&
-        butteraugli_target > 4.0) {
-      static const float kAvoidEntropyOfTransforms = 0.5;
-      float mul = 1.0;
-      if (butteraugli_target < 12.0) {
-        mul *= (12.0 - 4.0) / (butteraugli_target - 4.0);
-      }
-      entropy_mul += kAvoidEntropyOfTransforms * mul;
-    }
-    float entropy;
-    JXL_RETURN_IF_ERROR(EstimateEntropy(acs, entropy_mul, x, y, config,
-                                        cmap_factors, block, scratch_space,
-                                        quantized, entropy));
-    if (entropy < best) {
-      best_tx = tx.type;
-      best = entropy;
-    }
-  }
-  *entropy_out = best;
-  return true;
-}
-
-// bx, by addresses the 64x64 block at 8x8 subresolution
-// cx, cy addresses the left, upper 8x8 block position of the candidate
-// transform.
-Status TryMergeAcs(AcStrategyType acs_raw, size_t bx, size_t by, size_t cx,
-                   size_t cy, const ACSConfig& config,
-                   const float* JXL_RESTRICT cmap_factors,
-                   AcStrategyImage* JXL_RESTRICT ac_strategy,
-                   const float entropy_mul, const uint8_t candidate_priority,
-                   uint8_t* priority, float* JXL_RESTRICT entropy_estimate,
-                   float* block, float* scratch_space, uint32_t* quantized) {
-  AcStrategy acs = AcStrategy::FromRawStrategy(acs_raw);
-  float entropy_current = 0;
-  for (size_t iy = 0; iy < acs.covered_blocks_y(); ++iy) {
-    for (size_t ix = 0; ix < acs.covered_blocks_x(); ++ix) {
-      if (priority[(cy + iy) * 8 + (cx + ix)] >= candidate_priority) {
-        // Transform would reuse already allocated blocks and
-        // lead to invalid overlaps, for example DCT64X32 vs.
-        // DCT32X64.
-        return true;
-      }
-      entropy_current += entropy_estimate[(cy + iy) * 8 + (cx + ix)];
-    }
-  }
-  float entropy_candidate;
-  JXL_RETURN_IF_ERROR(EstimateEntropy(
-      acs, entropy_mul, (bx + cx) * 8, (by + cy) * 8, config, cmap_factors,
-      block, scratch_space, quantized, entropy_candidate));
-  if (entropy_candidate >= entropy_current) return true;
-  // Accept the candidate.
-  for (size_t iy = 0; iy < acs.covered_blocks_y(); iy++) {
-    for (size_t ix = 0; ix < acs.covered_blocks_x(); ix++) {
-      entropy_estimate[(cy + iy) * 8 + cx + ix] = 0;
-      priority[(cy + iy) * 8 + cx + ix] = candidate_priority;
-    }
-  }
-  JXL_RETURN_IF_ERROR(ac_strategy->Set(bx + cx, by + cy, acs_raw));
-  entropy_estimate[cy * 8 + cx] = entropy_candidate;
-  return true;
-}
-
-static void SetEntropyForTransform(size_t cx, size_t cy,
-                                   const AcStrategyType acs_raw, float entropy,
-                                   float* JXL_RESTRICT entropy_estimate) {
-  const AcStrategy acs = AcStrategy::FromRawStrategy(acs_raw);
-  for (size_t dy = 0; dy < acs.covered_blocks_y(); ++dy) {
-    for (size_t dx = 0; dx < acs.covered_blocks_x(); ++dx) {
-      entropy_estimate[(cy + dy) * 8 + cx + dx] = 0.0;
-    }
-  }
-  entropy_estimate[cy * 8 + cx] = entropy;
-}
-
-AcStrategyType AcsSquare(size_t blocks) {
-  if (blocks == 2) {
-    return AcStrategyType::DCT16X16;
-  } else if (blocks == 4) {
-    return AcStrategyType::DCT32X32;
-  } else {
-    return AcStrategyType::DCT64X64;
-  }
-}
-
-AcStrategyType AcsVerticalSplit(size_t blocks) {
-  if (blocks == 2) {
-    return AcStrategyType::DCT16X8;
-  } else if (blocks == 4) {
-    return AcStrategyType::DCT32X16;
-  } else {
-    return AcStrategyType::DCT64X32;
-  }
-}
-
-AcStrategyType AcsHorizontalSplit(size_t blocks) {
-  if (blocks == 2) {
-    return AcStrategyType::DCT8X16;
-  } else if (blocks == 4) {
-    return AcStrategyType::DCT16X32;
-  } else {
-    return AcStrategyType::DCT32X64;
-  }
-}
-
-// The following function tries to merge smaller transforms into
-// squares and the rectangles originating from a single middle division
-// (horizontal or vertical) fairly.
-//
-// This is now generalized to concern about squares
-// of blocks X blocks size, where a block is 8x8 pixels.
-Status FindBestFirstLevelDivisionForSquare(
-    size_t blocks, bool allow_square_transform, size_t bx, size_t by, size_t cx,
-    size_t cy, const ACSConfig& config, const float* JXL_RESTRICT cmap_factors,
-    AcStrategyImage* JXL_RESTRICT ac_strategy, const float entropy_mul_JXK,
-    const float entropy_mul_JXJ, float* JXL_RESTRICT entropy_estimate,
-    float* block, float* scratch_space, uint32_t* quantized) {
-  // We denote J for the larger dimension here, and K for the smaller.
-  // For example, for 32x32 block splitting, J would be 32, K 16.
-  const size_t blocks_half = blocks / 2;
-  const AcStrategyType acs_rawJXK = AcsVerticalSplit(blocks);
-  const AcStrategyType acs_rawKXJ = AcsHorizontalSplit(blocks);
-  const AcStrategyType acs_rawJXJ = AcsSquare(blocks);
-  const AcStrategy acsJXK = AcStrategy::FromRawStrategy(acs_rawJXK);
-  const AcStrategy acsKXJ = AcStrategy::FromRawStrategy(acs_rawKXJ);
-  const AcStrategy acsJXJ = AcStrategy::FromRawStrategy(acs_rawJXJ);
-  AcStrategyRow row0 = ac_strategy->ConstRow(by + cy + 0);
-  AcStrategyRow row1 = ac_strategy->ConstRow(by + cy + blocks_half);
-  // Let's check if we can consider a JXJ block here at all.
-  // This is not necessary in the basic use of hierarchically merging
-  // blocks in the simplest possible way, but is needed when we try other
-  // 'floating' options of merging, possibly after a simple hierarchical
-  // merge has been explored.
-  if (MultiBlockTransformCrossesHorizontalBoundary(*ac_strategy, bx + cx,
-                                                   by + cy, bx + cx + blocks) ||
-      MultiBlockTransformCrossesHorizontalBoundary(
-          *ac_strategy, bx + cx, by + cy + blocks, bx + cx + blocks) ||
-      MultiBlockTransformCrossesVerticalBoundary(*ac_strategy, bx + cx, by + cy,
-                                                 by + cy + blocks) ||
-      MultiBlockTransformCrossesVerticalBoundary(*ac_strategy, bx + cx + blocks,
-                                                 by + cy, by + cy + blocks)) {
-    return true;  // not suitable for JxJ analysis, some transforms leak out.
-  }
-  // For floating transforms there may be
-  // already blocks selected that make either or both JXK and
-  // KXJ not feasible for this location.
-  const bool allow_JXK = !MultiBlockTransformCrossesVerticalBoundary(
-      *ac_strategy, bx + cx + blocks_half, by + cy, by + cy + blocks);
-  const bool allow_KXJ = !MultiBlockTransformCrossesHorizontalBoundary(
-      *ac_strategy, bx + cx, by + cy + blocks_half, bx + cx + blocks);
-  // Current entropies aggregated on NxN resolution.
-  float entropy[2][2] = {};
-  for (size_t dy = 0; dy < blocks; ++dy) {
-    for (size_t dx = 0; dx < blocks; ++dx) {
-      entropy[dy / blocks_half][dx / blocks_half] +=
-          entropy_estimate[(cy + dy) * 8 + (cx + dx)];
-    }
-  }
-  float entropy_JXK_left = std::numeric_limits<float>::max();
-  float entropy_JXK_right = std::numeric_limits<float>::max();
-  float entropy_KXJ_top = std::numeric_limits<float>::max();
-  float entropy_KXJ_bottom = std::numeric_limits<float>::max();
-  float entropy_JXJ = std::numeric_limits<float>::max();
-  if (allow_JXK) {
-    if (row0[bx + cx + 0].Strategy() != acs_rawJXK) {
-      JXL_RETURN_IF_ERROR(EstimateEntropy(
-          acsJXK, entropy_mul_JXK, (bx + cx + 0) * 8, (by + cy + 0) * 8, config,
-          cmap_factors, block, scratch_space, quantized, entropy_JXK_left));
-    }
-    if (row0[bx + cx + blocks_half].Strategy() != acs_rawJXK) {
-      JXL_RETURN_IF_ERROR(
-          EstimateEntropy(acsJXK, entropy_mul_JXK, (bx + cx + blocks_half) * 8,
-                          (by + cy + 0) * 8, config, cmap_factors, block,
-                          scratch_space, quantized, entropy_JXK_right));
-    }
-  }
-  if (allow_KXJ) {
-    if (row0[bx + cx].Strategy() != acs_rawKXJ) {
-      JXL_RETURN_IF_ERROR(EstimateEntropy(
-          acsKXJ, entropy_mul_JXK, (bx + cx + 0) * 8, (by + cy + 0) * 8, config,
-          cmap_factors, block, scratch_space, quantized, entropy_KXJ_top));
-    }
-    if (row1[bx + cx].Strategy() != acs_rawKXJ) {
-      JXL_RETURN_IF_ERROR(
-          EstimateEntropy(acsKXJ, entropy_mul_JXK, (bx + cx + 0) * 8,
-                          (by + cy + blocks_half) * 8, config, cmap_factors,
-                          block, scratch_space, quantized, entropy_KXJ_bottom));
-    }
-  }
-  if (allow_square_transform) {
-    // We control the exploration of the square transform separately so that
-    // we can turn it off at high decoding speeds for 32x32, but still allow
-    // exploring 16x32 and 32x16.
-    JXL_RETURN_IF_ERROR(EstimateEntropy(
-        acsJXJ, entropy_mul_JXJ, (bx + cx + 0) * 8, (by + cy + 0) * 8, config,
-        cmap_factors, block, scratch_space, quantized, entropy_JXJ));
-  }
-
-  // Test if this block should have JXK or KXJ transforms,
-  // because it can have only one or the other.
-  float costJxN = std::min(entropy_JXK_left, entropy[0][0] + entropy[1][0]) +
-                  std::min(entropy_JXK_right, entropy[0][1] + entropy[1][1]);
-  float costNxJ = std::min(entropy_KXJ_top, entropy[0][0] + entropy[0][1]) +
-                  std::min(entropy_KXJ_bottom, entropy[1][0] + entropy[1][1]);
-  if (entropy_JXJ < costJxN && entropy_JXJ < costNxJ) {
-    JXL_RETURN_IF_ERROR(ac_strategy->Set(bx + cx, by + cy, acs_rawJXJ));
-    SetEntropyForTransform(cx, cy, acs_rawJXJ, entropy_JXJ, entropy_estimate);
-  } else if (costJxN < costNxJ) {
-    if (entropy_JXK_left < entropy[0][0] + entropy[1][0]) {
-      JXL_RETURN_IF_ERROR(ac_strategy->Set(bx + cx, by + cy, acs_rawJXK));
-      SetEntropyForTransform(cx, cy, acs_rawJXK, entropy_JXK_left,
-                             entropy_estimate);
-    }
-    if (entropy_JXK_right < entropy[0][1] + entropy[1][1]) {
-      JXL_RETURN_IF_ERROR(
-          ac_strategy->Set(bx + cx + blocks_half, by + cy, acs_rawJXK));
-      SetEntropyForTransform(cx + blocks_half, cy, acs_rawJXK,
-                             entropy_JXK_right, entropy_estimate);
-    }
-  } else {
-    if (entropy_KXJ_top < entropy[0][0] + entropy[0][1]) {
-      JXL_RETURN_IF_ERROR(ac_strategy->Set(bx + cx, by + cy, acs_rawKXJ));
-      SetEntropyForTransform(cx, cy, acs_rawKXJ, entropy_KXJ_top,
-                             entropy_estimate);
-    }
-    if (entropy_KXJ_bottom < entropy[1][0] + entropy[1][1]) {
-      JXL_RETURN_IF_ERROR(
-          ac_strategy->Set(bx + cx, by + cy + blocks_half, acs_rawKXJ));
-      SetEntropyForTransform(cx, cy + blocks_half, acs_rawKXJ,
-                             entropy_KXJ_bottom, entropy_estimate);
-    }
-  }
-  return true;
-}
-
-Status ProcessRectACS(const CompressParams& cparams, const ACSConfig& config,
-                      const Rect& rect, const ColorCorrelationMap& cmap,
-                      float* JXL_RESTRICT block,
-                      uint32_t* JXL_RESTRICT quantized,
-                      AcStrategyImage* ac_strategy) {
-  // Main philosophy here:
-  // 1. First find best 8x8 transform for each area.
-  // 2. Merging them into larger transforms where possibly, but
-  // starting from the smallest transforms (16x8 and 8x16).
-  // Additional complication: 16x8 and 8x16 are considered
-  // simultaneously and fairly against each other.
-  // We are looking at 64x64 squares since the Y-to-X and Y-to-B
-  // maps happen to be at that resolution, and having
-  // integral transforms cross these boundaries leads to
-  // additional complications.
-  const float butteraugli_target = cparams.butteraugli_distance;
-  float* JXL_RESTRICT scratch_space = block + 3 * AcStrategy::kMaxCoeffArea;
-  size_t bx = rect.x0();
-  size_t by = rect.y0();
-  JXL_ENSURE(rect.xsize() <= 8);
-  JXL_ENSURE(rect.ysize() <= 8);
-  size_t tx = bx / kColorTileDimInBlocks;
-  size_t ty = by / kColorTileDimInBlocks;
-  const float cmap_factors[3] = {
-      cmap.base().YtoXRatio(cmap.ytox_map.ConstRow(ty)[tx]),
-      0.0f,
-      cmap.base().YtoBRatio(cmap.ytob_map.ConstRow(ty)[tx]),
-  };
-  if (cparams.speed_tier > SpeedTier::kHare) return true;
-  // First compute the best 8x8 transform for each square. Later, we do not
-  // experiment with different combinations, but only use the best of the 8x8s
-  // when DCT8X8 is specified in the tree search.
-  // 8x8 transforms have 10 variants, but every larger transform is just a DCT.
-  float entropy_estimate[64] = {};
-  // Favor all 8x8 transforms (against 16x8 and larger transforms)) at
-  // low butteraugli_target distances.
-  static const float k8x8mul1 = -0.4;
-  static const float k8x8mul2 = 1.0;
-  static const float k8x8base = 1.4;
-  const float mul8x8 = k8x8mul2 + k8x8mul1 / (butteraugli_target + k8x8base);
-  for (size_t iy = 0; iy < rect.ysize(); iy++) {
-    for (size_t ix = 0; ix < rect.xsize(); ix++) {
-      float entropy = 0.0;
-      AcStrategyType best_of_8x8s;
-      JXL_RETURN_IF_ERROR(FindBest8x8Transform(
-          8 * (bx + ix), 8 * (by + iy), static_cast<int>(cparams.speed_tier),
-          butteraugli_target, config, cmap_factors, ac_strategy, block,
-          scratch_space, quantized, &entropy, best_of_8x8s));
-      JXL_RETURN_IF_ERROR(ac_strategy->Set(bx + ix, by + iy, best_of_8x8s));
-      entropy_estimate[iy * 8 + ix] = entropy * mul8x8;
-    }
-  }
-  // Merge when a larger transform is better than the previously
-  // searched best combination of 8x8 transforms.
-  struct MergeTry {
-    AcStrategyType type;
-    uint8_t priority;
-    uint8_t decoding_speed_tier_max_limit;
-    uint8_t encoding_speed_tier_max_limit;
-    float entropy_mul;
-  };
-  // These numbers need to be figured out manually and looking at
-  // ringing next to sky etc. Optimization will find smaller numbers
-  // and produce more ringing than is ideal. Larger numbers will
-  // help stop ringing.
-  const float entropy_mul16X8 = 1.25;
-  const float entropy_mul16X16 = 1.35;
-  const float entropy_mul16X32 = 1.5;
-  const float entropy_mul32X32 = 1.5;
-  const float entropy_mul64X32 = 2.26;
-  const float entropy_mul64X64 = 2.26;
-  // TODO(jyrki): Consider this feedback in further changes:
-  // Also effectively when the multipliers for smaller blocks are
-  // below 1, this raises the bar for the bigger blocks even higher
-  // in that sense these constants are not independent (e.g. changing
-  // the constant for DCT16x32 by -5% (making it more likely) also
-  // means that DCT32x32 becomes harder to do when starting from
-  // two DCT16x32s). It might be better to make them more independent,
-  // e.g. by not applying the multiplier when storing the new entropy
-  // estimates in TryMergeToACSCandidate().
-  const MergeTry kTransformsForMerge[9] = {
-      {AcStrategyType::DCT16X8, 2, 4, 5, entropy_mul16X8},
-      {AcStrategyType::DCT8X16, 2, 4, 5, entropy_mul16X8},
-      // FindBestFirstLevelDivisionForSquare looks for DCT16X16 and its
-      // subdivisions. {AcStrategyType::DCT16X16, 3, entropy_mul16X16},
-      {AcStrategyType::DCT16X32, 4, 4, 4, entropy_mul16X32},
-      {AcStrategyType::DCT32X16, 4, 4, 4, entropy_mul16X32},
-      // FindBestFirstLevelDivisionForSquare looks for DCT32X32 and its
-      // subdivisions. {AcStrategyType::DCT32X32, 5, 1, 5,
-      // 0.9822994906548809f},
-      {AcStrategyType::DCT64X32, 6, 1, 3, entropy_mul64X32},
-      {AcStrategyType::DCT32X64, 6, 1, 3, entropy_mul64X32},
-      // {AcStrategyType::DCT64X64, 8, 1, 3, 2.0846542128012948f},
-  };
-  /*
-  These sizes not yet included in merge heuristic:
-  set(AcStrategyType::DCT32X8, 0.0f, 2.261390410971102f);
-  set(AcStrategyType::DCT8X32, 0.0f, 2.261390410971102f);
-  set(AcStrategyType::DCT128X128, 0.0f, 1.0f);
-  set(AcStrategyType::DCT128X64, 0.0f, 0.73f);
-  set(AcStrategyType::DCT64X128, 0.0f, 0.73f);
-  set(AcStrategyType::DCT256X256, 0.0f, 1.0f);
-  set(AcStrategyType::DCT256X128, 0.0f, 0.73f);
-  set(AcStrategyType::DCT128X256, 0.0f, 0.73f);
-  */
-
-  // Priority is a tricky kludge to avoid collisions so that transforms
-  // don't overlap.
-  uint8_t priority[64] = {};
-  bool enable_32x32 = cparams.decoding_speed_tier < 4;
-  for (auto tx : kTransformsForMerge) {
-    if (tx.decoding_speed_tier_max_limit < cparams.decoding_speed_tier) {
-      continue;
-    }
-    AcStrategy acs = AcStrategy::FromRawStrategy(tx.type);
-
-    for (size_t cy = 0; cy + acs.covered_blocks_y() - 1 < rect.ysize();
-         cy += acs.covered_blocks_y()) {
-      for (size_t cx = 0; cx + acs.covered_blocks_x() - 1 < rect.xsize();
-           cx += acs.covered_blocks_x()) {
-        if (cy + 7 < rect.ysize() && cx + 7 < rect.xsize()) {
-          if (cparams.decoding_speed_tier < 4 &&
-              tx.type == AcStrategyType::DCT32X64) {
-            // We handle both DCT8X16 and DCT16X8 at the same time.
-            if ((cy | cx) % 8 == 0) {
-              JXL_RETURN_IF_ERROR(FindBestFirstLevelDivisionForSquare(
-                  8, true, bx, by, cx, cy, config, cmap_factors, ac_strategy,
-                  tx.entropy_mul, entropy_mul64X64, entropy_estimate, block,
-                  scratch_space, quantized));
-            }
-            continue;
-          } else if (tx.type == AcStrategyType::DCT32X16) {
-            // We handled both DCT8X16 and DCT16X8 at the same time,
-            // and that is above. The last column and last row,
-            // when the last column or last row is odd numbered,
-            // are still handled by TryMergeAcs.
-            continue;
-          }
-        }
-        if ((tx.type == AcStrategyType::DCT16X32 && cy % 4 != 0) ||
-            (tx.type == AcStrategyType::DCT32X16 && cx % 4 != 0)) {
-          // already covered by FindBest32X32
-          continue;
-        }
-
-        if (cy + 3 < rect.ysize() && cx + 3 < rect.xsize()) {
-          if (tx.type == AcStrategyType::DCT16X32) {
-            // We handle both DCT8X16 and DCT16X8 at the same time.
-            if ((cy | cx) % 4 == 0) {
-              JXL_RETURN_IF_ERROR(FindBestFirstLevelDivisionForSquare(
-                  4, enable_32x32, bx, by, cx, cy, config, cmap_factors,
-                  ac_strategy, tx.entropy_mul, entropy_mul32X32,
-                  entropy_estimate, block, scratch_space, quantized));
-            }
-            continue;
-          } else if (tx.type == AcStrategyType::DCT32X16) {
-            // We handled both DCT8X16 and DCT16X8 at the same time,
-            // and that is above. The last column and last row,
-            // when the last column or last row is odd numbered,
-            // are still handled by TryMergeAcs.
-            continue;
-          }
-        }
-        if ((tx.type == AcStrategyType::DCT16X32 && cy % 4 != 0) ||
-            (tx.type == AcStrategyType::DCT32X16 && cx % 4 != 0)) {
-          // already covered by FindBest32X32
-          continue;
-        }
-        if (cy + 1 < rect.ysize() && cx + 1 < rect.xsize()) {
-          if (tx.type == AcStrategyType::DCT8X16) {
-            // We handle both DCT8X16 and DCT16X8 at the same time.
-            if ((cy | cx) % 2 == 0) {
-              JXL_RETURN_IF_ERROR(FindBestFirstLevelDivisionForSquare(
-                  2, true, bx, by, cx, cy, config, cmap_factors, ac_strategy,
-                  tx.entropy_mul, entropy_mul16X16, entropy_estimate, block,
-                  scratch_space, quantized));
-            }
-            continue;
-          } else if (tx.type == AcStrategyType::DCT16X8) {
-            // We handled both DCT8X16 and DCT16X8 at the same time,
-            // and that is above. The last column and last row,
-            // when the last column or last row is odd numbered,
-            // are still handled by TryMergeAcs.
-            continue;
-          }
-        }
-        if ((tx.type == AcStrategyType::DCT8X16 && cy % 2 == 1) ||
-            (tx.type == AcStrategyType::DCT16X8 && cx % 2 == 1)) {
-          // already covered by FindBestFirstLevelDivisionForSquare
-          continue;
-        }
-        // All other merge sizes are handled here.
-        // Some of the DCT16X8s and DCT8X16s will still leak through here
-        // when there is an odd number of 8x8 blocks, then the last row
-        // and column will get their DCT16X8s and DCT8X16s through the
-        // normal integral transform merging process.
-        JXL_RETURN_IF_ERROR(
-            TryMergeAcs(tx.type, bx, by, cx, cy, config, cmap_factors,
-                        ac_strategy, tx.entropy_mul, tx.priority, &priority[0],
-                        entropy_estimate, block, scratch_space, quantized));
-      }
-    }
-  }
-  if (cparams.speed_tier >= SpeedTier::kHare) {
-    return true;
-  }
-  // Here we still try to do some non-aligned matching, find a few more
-  // 16X8, 8X16 and 16X16s between the non-2-aligned blocks.
-  for (size_t cy = 0; cy + 1 < rect.ysize(); ++cy) {
-    for (size_t cx = 0; cx + 1 < rect.xsize(); ++cx) {
-      if ((cy | cx) % 2 != 0) {
-        JXL_RETURN_IF_ERROR(FindBestFirstLevelDivisionForSquare(
-            2, true, bx, by, cx, cy, config, cmap_factors, ac_strategy,
-            entropy_mul16X8, entropy_mul16X16, entropy_estimate, block,
-            scratch_space, quantized));
-      }
-    }
-  }
-  // Non-aligned matching for 32X32, 16X32 and 32X16.
-  size_t step = cparams.speed_tier >= SpeedTier::kTortoise ? 2 : 1;
-  for (size_t cy = 0; cy + 3 < rect.ysize(); cy += step) {
-    for (size_t cx = 0; cx + 3 < rect.xsize(); cx += step) {
-      if ((cy | cx) % 4 == 0) {
-        continue;  // Already tried with loop above (DCT16X32 case).
-      }
-      JXL_RETURN_IF_ERROR(FindBestFirstLevelDivisionForSquare(
-          4, enable_32x32, bx, by, cx, cy, config, cmap_factors, ac_strategy,
-          entropy_mul16X32, entropy_mul32X32, entropy_estimate, block,
-          scratch_space, quantized));
-    }
-  }
-  return true;
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-HWY_EXPORT(ProcessRectACS);
-
-Status AcStrategyHeuristics::Init(const Image3F& src, const Rect& rect_in,
-                                  const ImageF& quant_field, const ImageF& mask,
-                                  const ImageF& mask1x1,
-                                  DequantMatrices* matrices) {
-  config.dequant = matrices;
-
-  if (cparams.speed_tier >= SpeedTier::kCheetah) {
-    JXL_RETURN_IF_ERROR(
-        matrices->EnsureComputed(memory_manager, 1));  // DCT8 only
-  } else {
-    uint32_t acs_mask = 0;
-    // All transforms up to 64x64.
-    for (size_t i = 0; i < static_cast<size_t>(AcStrategyType::DCT128X128);
-         i++) {
-      acs_mask |= (1 << i);
-    }
-    JXL_RETURN_IF_ERROR(matrices->EnsureComputed(memory_manager, acs_mask));
-  }
-
-  // Image row pointers and strides.
-  config.quant_field_row = quant_field.Row(0);
-  config.quant_field_stride = quant_field.PixelsPerRow();
-  if (mask.xsize() > 0 && mask.ysize() > 0) {
-    config.masking_field_row = mask.Row(0);
-    config.masking_field_stride = mask.PixelsPerRow();
-  }
-  config.mask1x1_xsize = mask1x1.xsize();
-  if (mask1x1.xsize() > 0 && mask1x1.ysize() > 0) {
-    config.masking1x1_field_row = mask1x1.Row(0);
-    config.masking1x1_field_stride = mask1x1.PixelsPerRow();
-  }
-
-  config.src_rows[0] = rect_in.ConstPlaneRow(src, 0, 0);
-  config.src_rows[1] = rect_in.ConstPlaneRow(src, 1, 0);
-  config.src_rows[2] = rect_in.ConstPlaneRow(src, 2, 0);
-  config.src_stride = src.PixelsPerRow();
-
-  // Entropy estimate is composed of two factors:
-  //  - estimate of the number of bits that will be used by the block
-  //  - information loss due to quantization
-  // The following constant controls the relative weights of these components.
-  config.info_loss_multiplier = 1.2;
-  config.zeros_mul = 9.3089059022677905;
-  config.cost_delta = 10.833273317067883;
-
-  static const float kBias = 0.13731742964354549;
-  const float ratio = (cparams.butteraugli_distance + kBias) / (1.0f + kBias);
-
-  static const float kPow1 = 0.33677806662454718;
-  static const float kPow2 = 0.50990926717963703;
-  static const float kPow3 = 0.36702940662370243;
-  config.info_loss_multiplier *= std::pow(ratio, kPow1);
-  config.zeros_mul *= std::pow(ratio, kPow2);
-  config.cost_delta *= std::pow(ratio, kPow3);
-  return true;
-}
-
-Status AcStrategyHeuristics::PrepareForThreads(std::size_t num_threads) {
-  const size_t dct_scratch_size =
-      3 * (MaxVectorSize() / sizeof(float)) * AcStrategy::kMaxBlockDim;
-  mem_per_thread = 6 * AcStrategy::kMaxCoeffArea + dct_scratch_size;
-  size_t mem_bytes = num_threads * mem_per_thread * sizeof(float);
-  JXL_ASSIGN_OR_RETURN(mem, AlignedMemory::Create(memory_manager, mem_bytes));
-  qmem_per_thread = AcStrategy::kMaxCoeffArea;
-  size_t qmem_bytes = num_threads * qmem_per_thread * sizeof(uint32_t);
-  JXL_ASSIGN_OR_RETURN(qmem, AlignedMemory::Create(memory_manager, qmem_bytes));
-  return true;
-}
-
-Status AcStrategyHeuristics::ProcessRect(const Rect& rect,
-                                         const ColorCorrelationMap& cmap,
-                                         AcStrategyImage* ac_strategy,
-                                         size_t thread) {
-  // In Falcon mode, use DCT8 everywhere and uniform quantization.
-  if (cparams.speed_tier >= SpeedTier::kCheetah) {
-    ac_strategy->FillDCT8(rect);
-    return true;
-  }
-  return HWY_DYNAMIC_DISPATCH(ProcessRectACS)(
-      cparams, config, rect, cmap,
-      mem.address<float>() + thread * mem_per_thread,
-      qmem.address<uint32_t>() + thread * qmem_per_thread, ac_strategy);
-}
-
-Status AcStrategyHeuristics::Finalize(const FrameDimensions& frame_dim,
-                                      const AcStrategyImage& ac_strategy,
-                                      AuxOut* aux_out) {
-  // Accounting and debug output.
-  if (aux_out != nullptr) {
-    aux_out->num_small_blocks =
-        ac_strategy.CountBlocks(AcStrategyType::IDENTITY) +
-        ac_strategy.CountBlocks(AcStrategyType::DCT2X2) +
-        ac_strategy.CountBlocks(AcStrategyType::DCT4X4);
-    aux_out->num_dct4x8_blocks =
-        ac_strategy.CountBlocks(AcStrategyType::DCT4X8) +
-        ac_strategy.CountBlocks(AcStrategyType::DCT8X4);
-    aux_out->num_afv_blocks = ac_strategy.CountBlocks(AcStrategyType::AFV0) +
-                              ac_strategy.CountBlocks(AcStrategyType::AFV1) +
-                              ac_strategy.CountBlocks(AcStrategyType::AFV2) +
-                              ac_strategy.CountBlocks(AcStrategyType::AFV3);
-    aux_out->num_dct8_blocks = ac_strategy.CountBlocks(AcStrategyType::DCT);
-    aux_out->num_dct8x16_blocks =
-        ac_strategy.CountBlocks(AcStrategyType::DCT8X16) +
-        ac_strategy.CountBlocks(AcStrategyType::DCT16X8);
-    aux_out->num_dct8x32_blocks =
-        ac_strategy.CountBlocks(AcStrategyType::DCT8X32) +
-        ac_strategy.CountBlocks(AcStrategyType::DCT32X8);
-    aux_out->num_dct16_blocks =
-        ac_strategy.CountBlocks(AcStrategyType::DCT16X16);
-    aux_out->num_dct16x32_blocks =
-        ac_strategy.CountBlocks(AcStrategyType::DCT16X32) +
-        ac_strategy.CountBlocks(AcStrategyType::DCT32X16);
-    aux_out->num_dct32_blocks =
-        ac_strategy.CountBlocks(AcStrategyType::DCT32X32);
-    aux_out->num_dct32x64_blocks =
-        ac_strategy.CountBlocks(AcStrategyType::DCT32X64) +
-        ac_strategy.CountBlocks(AcStrategyType::DCT64X32);
-    aux_out->num_dct64_blocks =
-        ac_strategy.CountBlocks(AcStrategyType::DCT64X64);
-  }
-
-  if (JXL_DEBUG_AC_STRATEGY && WantDebugOutput(cparams)) {
-    JXL_RETURN_IF_ERROR(DumpAcStrategy(ac_strategy, frame_dim.xsize,
-                                       frame_dim.ysize, "ac_strategy", aux_out,
-                                       cparams));
-  }
-  return true;
-}
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/enc_ac_strategy.h b/third_party/jpeg-xl/lib/jxl/enc_ac_strategy.h
deleted file mode 100644
index 9d7ec6ca86b20..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_ac_strategy.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_AC_STRATEGY_H_
-#define LIB_JXL_ENC_AC_STRATEGY_H_
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/chroma_from_luma.h"
-#include "lib/jxl/enc_cache.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/memory_manager_internal.h"
-#include "lib/jxl/quant_weights.h"
-
-// `FindBestAcStrategy` uses heuristics to choose which AC strategy should be
-// used in each block, as well as the initial quantization field.
-
-namespace jxl {
-
-struct AuxOut;
-class AcStrategyImage;
-
-// AC strategy selection: utility struct.
-
-struct ACSConfig {
-  const DequantMatrices* JXL_RESTRICT dequant;
-  const float* JXL_RESTRICT quant_field_row;
-  size_t quant_field_stride;
-  const float* JXL_RESTRICT masking_field_row;
-  size_t masking_field_stride;
-  const float* JXL_RESTRICT masking1x1_field_row;
-  size_t masking1x1_field_stride;
-  size_t mask1x1_xsize;
-  const float* JXL_RESTRICT src_rows[3];
-  size_t src_stride;
-  float info_loss_multiplier;
-  float cost_delta;
-  float zeros_mul;
-  const float& Pixel(size_t c, size_t x, size_t y) const {
-    return src_rows[c][y * src_stride + x];
-  }
-  float Masking(size_t bx, size_t by) const {
-    JXL_DASSERT(masking_field_row[by * masking_field_stride + bx] > 0);
-    return masking_field_row[by * masking_field_stride + bx];
-  }
-  const float* MaskingPtr1x1(size_t bx, size_t by) const {
-    JXL_DASSERT(masking1x1_field_row[by * masking1x1_field_stride + bx] > 0);
-    return &masking1x1_field_row[by * masking1x1_field_stride + bx];
-  }
-  float Quant(size_t bx, size_t by) const {
-    JXL_DASSERT(quant_field_row[by * quant_field_stride + bx] > 0);
-    return quant_field_row[by * quant_field_stride + bx];
-  }
-};
-
-struct AcStrategyHeuristics {
-  explicit AcStrategyHeuristics(JxlMemoryManager* memory_manager,
-                                const CompressParams& cparams)
-      : memory_manager(memory_manager),
-        cparams(cparams),
-        mem_per_thread(0),
-        qmem_per_thread(0) {}
-  Status Init(const Image3F& src, const Rect& rect_in,
-              const ImageF& quant_field, const ImageF& mask,
-              const ImageF& mask1x1, DequantMatrices* matrices);
-  Status PrepareForThreads(std::size_t num_threads);
-  Status ProcessRect(const Rect& rect, const ColorCorrelationMap& cmap,
-                     AcStrategyImage* ac_strategy, size_t thread);
-  Status Finalize(const FrameDimensions& frame_dim,
-                  const AcStrategyImage& ac_strategy, AuxOut* aux_out);
-  JxlMemoryManager* memory_manager;
-  const CompressParams& cparams;
-  ACSConfig config = {};
-  size_t mem_per_thread;
-  AlignedMemory mem;
-  size_t qmem_per_thread;
-  AlignedMemory qmem;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_AC_STRATEGY_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_adaptive_quantization.cc b/third_party/jpeg-xl/lib/jxl/enc_adaptive_quantization.cc
deleted file mode 100644
index 98471fc618e26..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_adaptive_quantization.cc
+++ /dev/null
@@ -1,1297 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_adaptive_quantization.h"
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <atomic>
-#include <cmath>
-#include <cstddef>
-#include <cstdlib>
-#include <string>
-#include <vector>
-
-#include "lib/jxl/memory_manager_internal.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/enc_adaptive_quantization.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/ac_strategy.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/fast_math-inl.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/butteraugli/butteraugli.h"
-#include "lib/jxl/convolve.h"
-#include "lib/jxl/dec_cache.h"
-#include "lib/jxl/dec_group.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_butteraugli_comparator.h"
-#include "lib/jxl/enc_cache.h"
-#include "lib/jxl/enc_debug_image.h"
-#include "lib/jxl/enc_group.h"
-#include "lib/jxl/enc_modular.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/enc_transforms-inl.h"
-#include "lib/jxl/epf.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/quant_weights.h"
-
-// Set JXL_DEBUG_ADAPTIVE_QUANTIZATION to 1 to enable debugging.
-#ifndef JXL_DEBUG_ADAPTIVE_QUANTIZATION
-#define JXL_DEBUG_ADAPTIVE_QUANTIZATION 0
-#endif
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-namespace {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::AbsDiff;
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::And;
-using hwy::HWY_NAMESPACE::Gt;
-using hwy::HWY_NAMESPACE::IfThenElseZero;
-using hwy::HWY_NAMESPACE::Max;
-using hwy::HWY_NAMESPACE::Min;
-using hwy::HWY_NAMESPACE::Rebind;
-using hwy::HWY_NAMESPACE::Sqrt;
-using hwy::HWY_NAMESPACE::ZeroIfNegative;
-
-// The following functions modulate an exponent (out_val) and return the updated
-// value. Their descriptor is limited to 8 lanes for 8x8 blocks.
-
-// Hack for mask estimation. Eventually replace this code with butteraugli's
-// masking.
-float ComputeMaskForAcStrategyUse(const float out_val) {
-  const float kMul = 1.0f;
-  const float kOffset = 0.001f;
-  return kMul / (out_val + kOffset);
-}
-
-template <class D, class V>
-V ComputeMask(const D d, const V out_val) {
-  const auto kBase = Set(d, -0.7647f);
-  const auto kMul4 = Set(d, 9.4708735624378946f);
-  const auto kMul2 = Set(d, 17.35036561631863f);
-  const auto kOffset2 = Set(d, 302.59587815579727f);
-  const auto kMul3 = Set(d, 6.7943250517376494f);
-  const auto kOffset3 = Set(d, 3.7179635626140772f);
-  const auto kOffset4 = Mul(Set(d, 0.25f), kOffset3);
-  const auto kMul0 = Set(d, 0.80061762862741759f);
-  const auto k1 = Set(d, 1.0f);
-
-  // Avoid division by zero.
-  const auto v1 = Max(Mul(out_val, kMul0), Set(d, 1e-3f));
-  const auto v2 = Div(k1, Add(v1, kOffset2));
-  const auto v3 = Div(k1, MulAdd(v1, v1, kOffset3));
-  const auto v4 = Div(k1, MulAdd(v1, v1, kOffset4));
-  // TODO(jyrki):
-  // A log or two here could make sense. In butteraugli we have effectively
-  // log(log(x + C)) for this kind of use, as a single log is used in
-  // saturating visual masking and here the modulation values are exponential,
-  // another log would counter that.
-  return Add(kBase, MulAdd(kMul4, v4, MulAdd(kMul2, v2, Mul(kMul3, v3))));
-}
-
-// mul and mul2 represent a scaling difference between jxl and butteraugli.
-const float kSGmul = 226.77216153508914f;
-const float kSGmul2 = 1.0f / 73.377132366608819f;
-const float kLog2 = 0.693147181f;
-// Includes correction factor for std::log -> log2.
-const float kSGRetMul = kSGmul2 * 18.6580932135f * kLog2;
-const float kSGVOffset = 7.7825991679894591f;
-
-template <bool invert, typename D, typename V>
-V RatioOfDerivativesOfCubicRootToSimpleGamma(const D d, V v) {
-  // The opsin space in jxl is the cubic root of photons, i.e., v * v * v
-  // is related to the number of photons.
-  //
-  // SimpleGamma(v * v * v) is the psychovisual space in butteraugli.
-  // This ratio allows quantization to move from jxl's opsin space to
-  // butteraugli's log-gamma space.
-  float kEpsilon = 1e-2;
-  v = ZeroIfNegative(v);
-  const auto kNumMul = Set(d, kSGRetMul * 3 * kSGmul);
-  const auto kVOffset = Set(d, kSGVOffset * kLog2 + kEpsilon);
-  const auto kDenMul = Set(d, kLog2 * kSGmul);
-
-  const auto v2 = Mul(v, v);
-
-  const auto num = MulAdd(kNumMul, v2, Set(d, kEpsilon));
-  const auto den = MulAdd(Mul(kDenMul, v), v2, kVOffset);
-  return invert ? Div(num, den) : Div(den, num);
-}
-
-template <bool invert = false>
-float RatioOfDerivativesOfCubicRootToSimpleGamma(float v) {
-  using DScalar = HWY_CAPPED(float, 1);
-  auto vscalar = Load(DScalar(), &v);
-  return GetLane(
-      RatioOfDerivativesOfCubicRootToSimpleGamma<invert>(DScalar(), vscalar));
-}
-
-// TODO(veluca): this function computes an approximation of the derivative of
-// SimpleGamma with (f(x+eps)-f(x))/eps. Consider two-sided approximation or
-// exact derivatives. For reference, SimpleGamma was:
-/*
-template <typename D, typename V>
-V SimpleGamma(const D d, V v) {
-  // A simple HDR compatible gamma function.
-  const auto mul = Set(d, kSGmul);
-  const auto kRetMul = Set(d, kSGRetMul);
-  const auto kRetAdd = Set(d, kSGmul2 * -20.2789020414f);
-  const auto kVOffset = Set(d, kSGVOffset);
-
-  v *= mul;
-
-  // This should happen rarely, but may lead to a NaN, which is rather
-  // undesirable. Since negative photons don't exist we solve the NaNs by
-  // clamping here.
-  // TODO(veluca): with FastLog2f, this no longer leads to NaNs.
-  v = ZeroIfNegative(v);
-  return kRetMul * FastLog2f(d, v + kVOffset) + kRetAdd;
-}
-*/
-
-template <class D, class V>
-V GammaModulation(const D d, const size_t x, const size_t y,
-                  const ImageF& xyb_x, const ImageF& xyb_y, const Rect& rect,
-                  const V out_val) {
-  const float kBias = 0.16f;
-  JXL_DASSERT(kBias > jxl::cms::kOpsinAbsorbanceBias[0]);
-  JXL_DASSERT(kBias > jxl::cms::kOpsinAbsorbanceBias[1]);
-  JXL_DASSERT(kBias > jxl::cms::kOpsinAbsorbanceBias[2]);
-  auto overall_ratio = Zero(d);
-  auto bias = Set(d, kBias);
-  for (size_t dy = 0; dy < 8; ++dy) {
-    const float* const JXL_RESTRICT row_in_x = rect.ConstRow(xyb_x, y + dy);
-    const float* const JXL_RESTRICT row_in_y = rect.ConstRow(xyb_y, y + dy);
-    for (size_t dx = 0; dx < 8; dx += Lanes(d)) {
-      const auto iny = Add(Load(d, row_in_y + x + dx), bias);
-      const auto inx = Load(d, row_in_x + x + dx);
-
-      const auto r = Sub(iny, inx);
-      const auto ratio_r =
-          RatioOfDerivativesOfCubicRootToSimpleGamma</*invert=*/true>(d, r);
-      overall_ratio = Add(overall_ratio, ratio_r);
-
-      const auto g = Add(iny, inx);
-      const auto ratio_g =
-          RatioOfDerivativesOfCubicRootToSimpleGamma</*invert=*/true>(d, g);
-      overall_ratio = Add(overall_ratio, ratio_g);
-    }
-  }
-  overall_ratio = Mul(SumOfLanes(d, overall_ratio), Set(d, 0.5f / 64));
-  // ideally -1.0, but likely optimal correction adds some entropy, so slightly
-  // less than that.
-  const auto kGamma = Set(d, 0.1005613337192697f);
-  return MulAdd(kGamma, FastLog2f(d, overall_ratio), out_val);
-}
-
-// Change precision in 8x8 blocks that have significant amounts of blue
-// content (but are not close to solid blue).
-// This is based on the idea that M and L cone activations saturate the
-// S (blue) receptors, and the S reception becomes more important when
-// both M and L levels are low. In that case M and L receptors may be
-// observing S-spectra instead and viewing them with higher spatial
-// accuracy, justifying spending more bits here.
-template <class D, class V>
-V BlueModulation(const D d, const size_t x, const size_t y,
-                 const ImageF& planex, const ImageF& planey,
-                 const ImageF& planeb, const Rect& rect, const V out_val) {
-  auto sum = Zero(d);
-  static const float kLimit = 0.027121074570634722;
-  static const float kOffset = 0.084381641171960495;
-  for (size_t dy = 0; dy < 8; ++dy) {
-    const float* JXL_RESTRICT row_in_x = rect.ConstRow(planex, y + dy) + x;
-    const float* JXL_RESTRICT row_in_y = rect.ConstRow(planey, y + dy) + x;
-    const float* JXL_RESTRICT row_in_b = rect.ConstRow(planeb, y + dy) + x;
-    for (size_t dx = 0; dx < 8; dx += Lanes(d)) {
-      const auto p_x = Load(d, row_in_x + dx);
-      const auto p_b = Load(d, row_in_b + dx);
-      const auto p_y_raw = Add(Load(d, row_in_y + dx), Set(d, kOffset));
-      const auto p_y_effective = Add(p_y_raw, Abs(p_x));
-      sum = Add(sum,
-                IfThenElseZero(Gt(p_b, p_y_effective),
-                               Min(Sub(p_b, p_y_effective), Set(d, kLimit))));
-    }
-  }
-  static const float kMul = 0.14207000358439159;
-  sum = SumOfLanes(d, sum);
-  float scalar_sum = GetLane(sum);
-  // If it is all blue, don't boost the quantization.
-  // All blue likely means low frequency blue. Let's not make the most
-  // perfect sky ever.
-  if (scalar_sum >= 32 * kLimit) {
-    scalar_sum = 64 * kLimit - scalar_sum;
-  }
-  static const float kMaxLimit = 15.398788439047934f;
-  if (scalar_sum >= kMaxLimit * kLimit) {
-    scalar_sum = kMaxLimit * kLimit;
-  }
-  scalar_sum *= kMul;
-  return Add(Set(d, scalar_sum), out_val);
-}
-
-// Change precision in 8x8 blocks that have high frequency content.
-template <class D, class V>
-V HfModulation(const D d, const size_t x, const size_t y, const ImageF& xyb_y,
-               const Rect& rect, const V out_val) {
-  // Zero out the invalid differences for the rightmost value per row.
-  const Rebind<uint32_t, D> du;
-  HWY_ALIGN constexpr uint32_t kMaskRight[kBlockDim] = {~0u, ~0u, ~0u, ~0u,
-                                                        ~0u, ~0u, ~0u, 0};
-
-  // Sums of deltas of y and x components between (approximate)
-  // 4-connected pixels.
-  auto sum_y = Zero(d);
-  static const float valmin_y = 0.0206;
-  auto valminv_y = Set(d, valmin_y);
-  for (size_t dy = 0; dy < 8; ++dy) {
-    const float* JXL_RESTRICT row_in_y = rect.ConstRow(xyb_y, y + dy) + x;
-    const float* JXL_RESTRICT row_in_y_next =
-        dy == 7 ? row_in_y : rect.ConstRow(xyb_y, y + dy + 1) + x;
-
-    // In SCALAR, there is no guarantee of having extra row padding.
-    // Hence, we need to ensure we don't access pixels outside the row itself.
-    // In SIMD modes, however, rows are padded, so it's safe to access one
-    // garbage value after the row. The vector then gets masked with kMaskRight
-    // to remove the influence of that value.
-#if HWY_TARGET != HWY_SCALAR
-    for (size_t dx = 0; dx < 8; dx += Lanes(d)) {
-#else
-    for (size_t dx = 0; dx < 7; dx += Lanes(d)) {
-#endif
-      const auto mask = BitCast(d, Load(du, kMaskRight + dx));
-      {
-        const auto p_y = Load(d, row_in_y + dx);
-        const auto pr_y = LoadU(d, row_in_y + dx + 1);
-        sum_y = Add(sum_y, And(mask, Min(valminv_y, AbsDiff(p_y, pr_y))));
-        const auto pd_y = Load(d, row_in_y_next + dx);
-        sum_y = Add(sum_y, Min(valminv_y, AbsDiff(p_y, pd_y)));
-      }
-    }
-#if HWY_TARGET == HWY_SCALAR
-    const auto p_y = Load(d, row_in_y + 7);
-    const auto pd_y = Load(d, row_in_y_next + 7);
-    sum_y = Add(sum_y, Min(valminv_y, AbsDiff(p_y, pd_y)));
-#endif
-  }
-  static const float kMul_y = -0.38;
-  sum_y = SumOfLanes(d, sum_y);
-
-  float scalar_sum_y = GetLane(sum_y);
-  scalar_sum_y *= kMul_y;
-
-  // higher value -> more bpp
-  float kOffset = 0.42;
-  scalar_sum_y += kOffset;
-
-  return Add(Set(d, scalar_sum_y), out_val);
-}
-
-void PerBlockModulations(const float butteraugli_target, const ImageF& xyb_x,
-                         const ImageF& xyb_y, const ImageF& xyb_b,
-                         const Rect& rect_in, const float scale,
-                         const Rect& rect_out, ImageF* out) {
-  float base_level = 0.48f * scale;
-  float kDampenRampStart = 2.0f;
-  float kDampenRampEnd = 14.0f;
-  float dampen = 1.0f;
-  if (butteraugli_target >= kDampenRampStart) {
-    dampen = 1.0f - ((butteraugli_target - kDampenRampStart) /
-                     (kDampenRampEnd - kDampenRampStart));
-    if (dampen < 0) {
-      dampen = 0;
-    }
-  }
-  const float mul = scale * dampen;
-  const float add = (1.0f - dampen) * base_level;
-  for (size_t iy = rect_out.y0(); iy < rect_out.y1(); iy++) {
-    const size_t y = iy * 8;
-    float* const JXL_RESTRICT row_out = out->Row(iy);
-    const HWY_CAPPED(float, kBlockDim) df;
-    for (size_t ix = rect_out.x0(); ix < rect_out.x1(); ix++) {
-      size_t x = ix * 8;
-      auto out_val = Set(df, row_out[ix]);
-      out_val = ComputeMask(df, out_val);
-      out_val = HfModulation(df, x, y, xyb_y, rect_in, out_val);
-      out_val = GammaModulation(df, x, y, xyb_x, xyb_y, rect_in, out_val);
-      out_val = BlueModulation(df, x, y, xyb_x, xyb_y, xyb_b, rect_in, out_val);
-      // We want multiplicative quantization field, so everything
-      // until this point has been modulating the exponent.
-      row_out[ix] = FastPow2f(GetLane(out_val) * 1.442695041f) * mul + add;
-    }
-  }
-}
-
-template <typename D, typename V>
-V MaskingSqrt(const D d, V v) {
-  static const float kLogOffset = 27.505837037000106f;
-  static const float kMul = 211.66567973503678f;
-  const auto mul_v = Set(d, kMul * 1e8);
-  const auto offset_v = Set(d, kLogOffset);
-  return Mul(Set(d, 0.25f), Sqrt(MulAdd(v, Sqrt(mul_v), offset_v)));
-}
-
-float MaskingSqrt(const float v) {
-  using DScalar = HWY_CAPPED(float, 1);
-  auto vscalar = Load(DScalar(), &v);
-  return GetLane(MaskingSqrt(DScalar(), vscalar));
-}
-
-void StoreMin4(const float v, float& min0, float& min1, float& min2,
-               float& min3) {
-  if (v < min3) {
-    if (v < min0) {
-      min3 = min2;
-      min2 = min1;
-      min1 = min0;
-      min0 = v;
-    } else if (v < min1) {
-      min3 = min2;
-      min2 = min1;
-      min1 = v;
-    } else if (v < min2) {
-      min3 = min2;
-      min2 = v;
-    } else {
-      min3 = v;
-    }
-  }
-}
-
-// Look for smooth areas near the area of degradation.
-// If the areas are generally smooth, don't do masking.
-// Output is downsampled 2x.
-Status FuzzyErosion(const float butteraugli_target, const Rect& from_rect,
-                    const ImageF& from, const Rect& to_rect, ImageF* to) {
-  const size_t xsize = from.xsize();
-  const size_t ysize = from.ysize();
-  constexpr int kStep = 1;
-  static_assert(kStep == 1, "Step must be 1");
-  JXL_ENSURE(to_rect.xsize() * 2 == from_rect.xsize());
-  JXL_ENSURE(to_rect.ysize() * 2 == from_rect.ysize());
-  static const float kMulBase0 = 0.125;
-  static const float kMulBase1 = 0.10;
-  static const float kMulBase2 = 0.09;
-  static const float kMulBase3 = 0.06;
-  static const float kMulAdd0 = 0.0;
-  static const float kMulAdd1 = -0.10;
-  static const float kMulAdd2 = -0.09;
-  static const float kMulAdd3 = -0.06;
-
-  float mul = 0.0;
-  if (butteraugli_target < 2.0f) {
-    mul = (2.0f - butteraugli_target) * (1.0f / 2.0f);
-  }
-  float kMul0 = kMulBase0 + mul * kMulAdd0;
-  float kMul1 = kMulBase1 + mul * kMulAdd1;
-  float kMul2 = kMulBase2 + mul * kMulAdd2;
-  float kMul3 = kMulBase3 + mul * kMulAdd3;
-  static const float kTotal = 0.29959705784054957;
-  float norm = kTotal / (kMul0 + kMul1 + kMul2 + kMul3);
-  kMul0 *= norm;
-  kMul1 *= norm;
-  kMul2 *= norm;
-  kMul3 *= norm;
-
-  for (size_t fy = 0; fy < from_rect.ysize(); ++fy) {
-    size_t y = fy + from_rect.y0();
-    size_t ym1 = y >= kStep ? y - kStep : y;
-    size_t yp1 = y + kStep < ysize ? y + kStep : y;
-    const float* rowt = from.Row(ym1);
-    const float* row = from.Row(y);
-    const float* rowb = from.Row(yp1);
-    float* row_out = to_rect.Row(to, fy / 2);
-    for (size_t fx = 0; fx < from_rect.xsize(); ++fx) {
-      size_t x = fx + from_rect.x0();
-      size_t xm1 = x >= kStep ? x - kStep : x;
-      size_t xp1 = x + kStep < xsize ? x + kStep : x;
-      float min0 = row[x];
-      float min1 = row[xm1];
-      float min2 = row[xp1];
-      float min3 = rowt[xm1];
-      // Sort the first four values.
-      if (min0 > min1) std::swap(min0, min1);
-      if (min0 > min2) std::swap(min0, min2);
-      if (min0 > min3) std::swap(min0, min3);
-      if (min1 > min2) std::swap(min1, min2);
-      if (min1 > min3) std::swap(min1, min3);
-      if (min2 > min3) std::swap(min2, min3);
-      // The remaining five values of a 3x3 neighbourhood.
-      StoreMin4(rowt[x], min0, min1, min2, min3);
-      StoreMin4(rowt[xp1], min0, min1, min2, min3);
-      StoreMin4(rowb[xm1], min0, min1, min2, min3);
-      StoreMin4(rowb[x], min0, min1, min2, min3);
-      StoreMin4(rowb[xp1], min0, min1, min2, min3);
-
-      float v = kMul0 * min0 + kMul1 * min1 + kMul2 * min2 + kMul3 * min3;
-      if (fx % 2 == 0 && fy % 2 == 0) {
-        row_out[fx / 2] = v;
-      } else {
-        row_out[fx / 2] += v;
-      }
-    }
-  }
-  return true;
-}
-
-struct AdaptiveQuantizationImpl {
-  Status PrepareBuffers(JxlMemoryManager* memory_manager, size_t num_threads) {
-    JXL_ASSIGN_OR_RETURN(
-        diff_buffer,
-        ImageF::Create(memory_manager, kEncTileDim + 8, num_threads));
-    for (size_t i = pre_erosion.size(); i < num_threads; i++) {
-      JXL_ASSIGN_OR_RETURN(
-          ImageF tmp,
-          ImageF::Create(memory_manager, kEncTileDimInBlocks * 2 + 2,
-                         kEncTileDimInBlocks * 2 + 2));
-      pre_erosion.emplace_back(std::move(tmp));
-    }
-    return true;
-  }
-
-  Status ComputeTile(float butteraugli_target, float scale, const Image3F& xyb,
-                     const Rect& rect_in, const Rect& rect_out,
-                     const int thread, ImageF* mask, ImageF* mask1x1) {
-    JXL_ENSURE(rect_in.x0() % kBlockDim == 0);
-    JXL_ENSURE(rect_in.y0() % kBlockDim == 0);
-    const size_t xsize = xyb.xsize();
-    const size_t ysize = xyb.ysize();
-
-    // The XYB gamma is 3.0 to be able to decode faster with two muls.
-    // Butteraugli's gamma is matching the gamma of human eye, around 2.6.
-    // We approximate the gamma difference by adding one cubic root into
-    // the adaptive quantization. This gives us a total gamma of 2.6666
-    // for quantization uses.
-    const float match_gamma_offset = 0.019;
-
-    const HWY_FULL(float) df;
-
-    size_t y_start_1x1 = rect_in.y0() + rect_out.y0() * 8;
-    size_t y_end_1x1 = y_start_1x1 + rect_out.ysize() * 8;
-
-    size_t x_start_1x1 = rect_in.x0() + rect_out.x0() * 8;
-    size_t x_end_1x1 = x_start_1x1 + rect_out.xsize() * 8;
-
-    if (rect_in.x0() != 0 && rect_out.x0() == 0) x_start_1x1 -= 2;
-    if (rect_in.x1() < xsize && rect_out.x1() * 8 == rect_in.xsize()) {
-      x_end_1x1 += 2;
-    }
-    if (rect_in.y0() != 0 && rect_out.y0() == 0) y_start_1x1 -= 2;
-    if (rect_in.y1() < ysize && rect_out.y1() * 8 == rect_in.ysize()) {
-      y_end_1x1 += 2;
-    }
-
-    // Computes image (padded to multiple of 8x8) of local pixel differences.
-    // Subsample both directions by 4.
-    // 1x1 Laplacian of intensity.
-    for (size_t y = y_start_1x1; y < y_end_1x1; ++y) {
-      const size_t y2 = y + 1 < ysize ? y + 1 : y;
-      const size_t y1 = y > 0 ? y - 1 : y;
-      const float* row_in = xyb.ConstPlaneRow(1, y);
-      const float* row_in1 = xyb.ConstPlaneRow(1, y1);
-      const float* row_in2 = xyb.ConstPlaneRow(1, y2);
-      float* mask1x1_out = mask1x1->Row(y);
-      auto scalar_pixel1x1 = [&](size_t x) {
-        const size_t x2 = x + 1 < xsize ? x + 1 : x;
-        const size_t x1 = x > 0 ? x - 1 : x;
-        const float base =
-            0.25f * (row_in2[x] + row_in1[x] + row_in[x1] + row_in[x2]);
-        const float gammac = RatioOfDerivativesOfCubicRootToSimpleGamma(
-            row_in[x] + match_gamma_offset);
-        float diff = fabs(gammac * (row_in[x] - base));
-        static const double kScaler = 1.0;
-        diff *= kScaler;
-        diff = log1p(diff);
-        static const float kMul = 1.0;
-        static const float kOffset = 0.01;
-        mask1x1_out[x] = kMul / (diff + kOffset);
-      };
-      for (size_t x = x_start_1x1; x < x_end_1x1; ++x) {
-        scalar_pixel1x1(x);
-      }
-    }
-
-    size_t y_start = rect_in.y0() + rect_out.y0() * 8;
-    size_t y_end = y_start + rect_out.ysize() * 8;
-
-    size_t x_start = rect_in.x0() + rect_out.x0() * 8;
-    size_t x_end = x_start + rect_out.xsize() * 8;
-
-    if (x_start != 0) x_start -= 4;
-    if (x_end != xsize) x_end += 4;
-    if (y_start != 0) y_start -= 4;
-    if (y_end != ysize) y_end += 4;
-    JXL_RETURN_IF_ERROR(pre_erosion[thread].ShrinkTo((x_end - x_start) / 4,
-                                                     (y_end - y_start) / 4));
-
-    static const float limit = 0.2f;
-    for (size_t y = y_start; y < y_end; ++y) {
-      size_t y2 = y + 1 < ysize ? y + 1 : y;
-      size_t y1 = y > 0 ? y - 1 : y;
-
-      const float* row_in = xyb.ConstPlaneRow(1, y);
-      const float* row_in1 = xyb.ConstPlaneRow(1, y1);
-      const float* row_in2 = xyb.ConstPlaneRow(1, y2);
-      float* JXL_RESTRICT row_out = diff_buffer.Row(thread);
-
-      auto scalar_pixel = [&](size_t x) {
-        const size_t x2 = x + 1 < xsize ? x + 1 : x;
-        const size_t x1 = x > 0 ? x - 1 : x;
-        const float base =
-            0.25f * (row_in2[x] + row_in1[x] + row_in[x1] + row_in[x2]);
-        const float gammac = RatioOfDerivativesOfCubicRootToSimpleGamma(
-            row_in[x] + match_gamma_offset);
-        float diff = gammac * (row_in[x] - base);
-        diff *= diff;
-        if (diff >= limit) {
-          diff = limit;
-        }
-        diff = MaskingSqrt(diff);
-        if ((y % 4) != 0) {
-          row_out[x - x_start] += diff;
-        } else {
-          row_out[x - x_start] = diff;
-        }
-      };
-
-      size_t x = x_start;
-      // First pixel of the row.
-      if (x_start == 0) {
-        scalar_pixel(x_start);
-        ++x;
-      }
-      // SIMD
-      const auto match_gamma_offset_v = Set(df, match_gamma_offset);
-      const auto quarter = Set(df, 0.25f);
-      for (; x + 1 + Lanes(df) < x_end; x += Lanes(df)) {
-        const auto in = LoadU(df, row_in + x);
-        const auto in_r = LoadU(df, row_in + x + 1);
-        const auto in_l = LoadU(df, row_in + x - 1);
-        const auto in_t = LoadU(df, row_in2 + x);
-        const auto in_b = LoadU(df, row_in1 + x);
-        auto base = Mul(quarter, Add(Add(in_r, in_l), Add(in_t, in_b)));
-        auto gammacv =
-            RatioOfDerivativesOfCubicRootToSimpleGamma</*invert=*/false>(
-                df, Add(in, match_gamma_offset_v));
-        auto diff = Mul(gammacv, Sub(in, base));
-        diff = Mul(diff, diff);
-        diff = Min(diff, Set(df, limit));
-        diff = MaskingSqrt(df, diff);
-        if ((y & 3) != 0) {
-          diff = Add(diff, LoadU(df, row_out + x - x_start));
-        }
-        StoreU(diff, df, row_out + x - x_start);
-      }
-      // Scalar
-      for (; x < x_end; ++x) {
-        scalar_pixel(x);
-      }
-      if (y % 4 == 3) {
-        float* row_d_out = pre_erosion[thread].Row((y - y_start) / 4);
-        for (size_t x = 0; x < (x_end - x_start) / 4; x++) {
-          row_d_out[x] = (row_out[x * 4] + row_out[x * 4 + 1] +
-                          row_out[x * 4 + 2] + row_out[x * 4 + 3]) *
-                         0.25f;
-        }
-      }
-    }
-    JXL_ENSURE(x_start % (kBlockDim / 2) == 0);
-    JXL_ENSURE(y_start % (kBlockDim / 2) == 0);
-    Rect from_rect(x_start % 8 == 0 ? 0 : 1, y_start % 8 == 0 ? 0 : 1,
-                   rect_out.xsize() * 2, rect_out.ysize() * 2);
-    JXL_RETURN_IF_ERROR(FuzzyErosion(butteraugli_target, from_rect,
-                                     pre_erosion[thread], rect_out, &aq_map));
-    for (size_t y = 0; y < rect_out.ysize(); ++y) {
-      const float* aq_map_row = rect_out.ConstRow(aq_map, y);
-      float* mask_row = rect_out.Row(mask, y);
-      for (size_t x = 0; x < rect_out.xsize(); ++x) {
-        mask_row[x] = ComputeMaskForAcStrategyUse(aq_map_row[x]);
-      }
-    }
-    PerBlockModulations(butteraugli_target, xyb.Plane(0), xyb.Plane(1),
-                        xyb.Plane(2), rect_in, scale, rect_out, &aq_map);
-    return true;
-  }
-  std::vector<ImageF> pre_erosion;
-  ImageF aq_map;
-  ImageF diff_buffer;
-};
-
-Status Blur1x1Masking(JxlMemoryManager* memory_manager, ThreadPool* pool,
-                      ImageF* mask1x1, const Rect& rect) {
-  // Blur the mask1x1 to obtain the masking image.
-  // Before blurring it contains an image of absolute value of the
-  // Laplacian of the intensity channel.
-  static const float kFilterMask1x1[5] = {
-      static_cast<float>(0.25647067633737227),
-      static_cast<float>(0.2050056912354399075),
-      static_cast<float>(0.154082048668497307),
-      static_cast<float>(0.08149576591362004441),
-      static_cast<float>(0.0512750104812308467),
-  };
-  double sum =
-      1.0 + 4 * (kFilterMask1x1[0] + kFilterMask1x1[1] + kFilterMask1x1[2] +
-                 kFilterMask1x1[4] + 2 * kFilterMask1x1[3]);
-  if (sum < 1e-5) {
-    sum = 1e-5;
-  }
-  const float normalize = static_cast<float>(1.0 / sum);
-  const float normalize_mul = normalize;
-  WeightsSymmetric5 weights =
-      WeightsSymmetric5{{HWY_REP4(normalize)},
-                        {HWY_REP4(normalize_mul * kFilterMask1x1[0])},
-                        {HWY_REP4(normalize_mul * kFilterMask1x1[2])},
-                        {HWY_REP4(normalize_mul * kFilterMask1x1[1])},
-                        {HWY_REP4(normalize_mul * kFilterMask1x1[4])},
-                        {HWY_REP4(normalize_mul * kFilterMask1x1[3])}};
-  JXL_ASSIGN_OR_RETURN(
-      ImageF temp, ImageF::Create(memory_manager, rect.xsize(), rect.ysize()));
-  JXL_RETURN_IF_ERROR(Symmetric5(*mask1x1, rect, weights, pool, &temp));
-  *mask1x1 = std::move(temp);
-  return true;
-}
-
-StatusOr<ImageF> AdaptiveQuantizationMap(const float butteraugli_target,
-                                         const Image3F& xyb, const Rect& rect,
-                                         float scale, ThreadPool* pool,
-                                         ImageF* mask, ImageF* mask1x1) {
-  JXL_ENSURE(rect.xsize() % kBlockDim == 0);
-  JXL_ENSURE(rect.ysize() % kBlockDim == 0);
-  AdaptiveQuantizationImpl impl;
-  const size_t xsize_blocks = rect.xsize() / kBlockDim;
-  const size_t ysize_blocks = rect.ysize() / kBlockDim;
-  JxlMemoryManager* memory_manager = xyb.memory_manager();
-  JXL_ASSIGN_OR_RETURN(
-      impl.aq_map, ImageF::Create(memory_manager, xsize_blocks, ysize_blocks));
-  JXL_ASSIGN_OR_RETURN(
-      *mask, ImageF::Create(memory_manager, xsize_blocks, ysize_blocks));
-  JXL_ASSIGN_OR_RETURN(
-      *mask1x1, ImageF::Create(memory_manager, xyb.xsize(), xyb.ysize()));
-  const auto prepare = [&](const size_t num_threads) -> Status {
-    JXL_RETURN_IF_ERROR(impl.PrepareBuffers(memory_manager, num_threads));
-    return true;
-  };
-  const auto process_tile = [&](const uint32_t tid,
-                                const size_t thread) -> Status {
-    size_t n_enc_tiles = DivCeil(xsize_blocks, kEncTileDimInBlocks);
-    size_t tx = tid % n_enc_tiles;
-    size_t ty = tid / n_enc_tiles;
-    size_t by0 = ty * kEncTileDimInBlocks;
-    size_t by1 = std::min((ty + 1) * kEncTileDimInBlocks, ysize_blocks);
-    size_t bx0 = tx * kEncTileDimInBlocks;
-    size_t bx1 = std::min((tx + 1) * kEncTileDimInBlocks, xsize_blocks);
-    Rect rect_out(bx0, by0, bx1 - bx0, by1 - by0);
-    JXL_RETURN_IF_ERROR(impl.ComputeTile(butteraugli_target, scale, xyb, rect,
-                                         rect_out, thread, mask, mask1x1));
-    return true;
-  };
-  size_t num_tiles = DivCeil(xsize_blocks, kEncTileDimInBlocks) *
-                     DivCeil(ysize_blocks, kEncTileDimInBlocks);
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, num_tiles, prepare, process_tile,
-                                "AQ DiffPrecompute"));
-
-  JXL_RETURN_IF_ERROR(Blur1x1Masking(memory_manager, pool, mask1x1, rect));
-  return std::move(impl).aq_map;
-}
-
-}  // namespace
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-HWY_EXPORT(AdaptiveQuantizationMap);
-
-namespace {
-
-// If true, prints the quantization maps at each iteration.
-constexpr bool FLAGS_dump_quant_state = false;
-
-Status DumpHeatmap(const CompressParams& cparams, const AuxOut* aux_out,
-                   const std::string& label, const ImageF& image,
-                   float good_threshold, float bad_threshold) {
-  if (JXL_DEBUG_ADAPTIVE_QUANTIZATION) {
-    JXL_ASSIGN_OR_RETURN(
-        Image3F heatmap,
-        CreateHeatMapImage(image, good_threshold, bad_threshold));
-    char filename[200];
-    snprintf(filename, sizeof(filename), "%s%05d", label.c_str(),
-             aux_out->num_butteraugli_iters);
-    JXL_RETURN_IF_ERROR(DumpImage(cparams, filename, heatmap));
-  }
-  return true;
-}
-
-Status DumpHeatmaps(const CompressParams& cparams, const AuxOut* aux_out,
-                    float butteraugli_target, const ImageF& quant_field,
-                    const ImageF& tile_heatmap, const ImageF& bt_diffmap) {
-  if (JXL_DEBUG_ADAPTIVE_QUANTIZATION) {
-    JxlMemoryManager* memory_manager = quant_field.memory_manager();
-    if (!WantDebugOutput(cparams)) return true;
-    JXL_ASSIGN_OR_RETURN(ImageF inv_qmap,
-                         ImageF::Create(memory_manager, quant_field.xsize(),
-                                        quant_field.ysize()));
-    for (size_t y = 0; y < quant_field.ysize(); ++y) {
-      const float* JXL_RESTRICT row_q = quant_field.ConstRow(y);
-      float* JXL_RESTRICT row_inv_q = inv_qmap.Row(y);
-      for (size_t x = 0; x < quant_field.xsize(); ++x) {
-        row_inv_q[x] = 1.0f / row_q[x];  // never zero
-      }
-    }
-    JXL_RETURN_IF_ERROR(DumpHeatmap(cparams, aux_out, "quant_heatmap", inv_qmap,
-                                    4.0f * butteraugli_target,
-                                    6.0f * butteraugli_target));
-    JXL_RETURN_IF_ERROR(DumpHeatmap(cparams, aux_out, "tile_heatmap",
-                                    tile_heatmap, butteraugli_target,
-                                    1.5f * butteraugli_target));
-    // matches heat maps produced by the command line tool.
-    JXL_RETURN_IF_ERROR(DumpHeatmap(cparams, aux_out, "bt_diffmap", bt_diffmap,
-                                    ButteraugliFuzzyInverse(1.5),
-                                    ButteraugliFuzzyInverse(0.5)));
-  }
-  return true;
-}
-
-StatusOr<ImageF> TileDistMap(const ImageF& distmap, int tile_size, int margin,
-                             const AcStrategyImage& ac_strategy) {
-  const int tile_xsize = (distmap.xsize() + tile_size - 1) / tile_size;
-  const int tile_ysize = (distmap.ysize() + tile_size - 1) / tile_size;
-  JxlMemoryManager* memory_manager = distmap.memory_manager();
-  JXL_ASSIGN_OR_RETURN(ImageF tile_distmap,
-                       ImageF::Create(memory_manager, tile_xsize, tile_ysize));
-  size_t distmap_stride = tile_distmap.PixelsPerRow();
-  for (int tile_y = 0; tile_y < tile_ysize; ++tile_y) {
-    AcStrategyRow ac_strategy_row = ac_strategy.ConstRow(tile_y);
-    float* JXL_RESTRICT dist_row = tile_distmap.Row(tile_y);
-    for (int tile_x = 0; tile_x < tile_xsize; ++tile_x) {
-      AcStrategy acs = ac_strategy_row[tile_x];
-      if (!acs.IsFirstBlock()) continue;
-      int this_tile_xsize = acs.covered_blocks_x() * tile_size;
-      int this_tile_ysize = acs.covered_blocks_y() * tile_size;
-      int y_begin = std::max<int>(0, tile_size * tile_y - margin);
-      int y_end = std::min<int>(distmap.ysize(),
-                                tile_size * tile_y + this_tile_ysize + margin);
-      int x_begin = std::max<int>(0, tile_size * tile_x - margin);
-      int x_end = std::min<int>(distmap.xsize(),
-                                tile_size * tile_x + this_tile_xsize + margin);
-      float dist_norm = 0.0;
-      double pixels = 0;
-      for (int y = y_begin; y < y_end; ++y) {
-        float ymul = 1.0;
-        constexpr float kBorderMul = 0.98f;
-        constexpr float kCornerMul = 0.7f;
-        if (margin != 0 && (y == y_begin || y == y_end - 1)) {
-          ymul = kBorderMul;
-        }
-        const float* const JXL_RESTRICT row = distmap.Row(y);
-        for (int x = x_begin; x < x_end; ++x) {
-          float xmul = ymul;
-          if (margin != 0 && (x == x_begin || x == x_end - 1)) {
-            if (xmul == 1.0) {
-              xmul = kBorderMul;
-            } else {
-              xmul = kCornerMul;
-            }
-          }
-          float v = row[x];
-          v *= v;
-          v *= v;
-          v *= v;
-          v *= v;
-          dist_norm += xmul * v;
-          pixels += xmul;
-        }
-      }
-      if (pixels == 0) pixels = 1;
-      // 16th norm is less than the max norm, we reduce the difference
-      // with this normalization factor.
-      constexpr float kTileNorm = 1.2f;
-      const float tile_dist =
-          kTileNorm * std::pow(dist_norm / pixels, 1.0f / 16.0f);
-      dist_row[tile_x] = tile_dist;
-      for (size_t iy = 0; iy < acs.covered_blocks_y(); iy++) {
-        for (size_t ix = 0; ix < acs.covered_blocks_x(); ix++) {
-          dist_row[tile_x + distmap_stride * iy + ix] = tile_dist;
-        }
-      }
-    }
-  }
-  return tile_distmap;
-}
-
-const float kDcQuantPow = 0.83f;
-const float kDcQuant = 1.095924047623553f;
-const float kAcQuant = 0.725f;
-
-// Computes the decoded image for a given set of compression parameters.
-StatusOr<ImageBundle> RoundtripImage(const FrameHeader& frame_header,
-                                     const Image3F& opsin,
-                                     PassesEncoderState* enc_state,
-                                     const JxlCmsInterface& cms,
-                                     ThreadPool* pool) {
-  JxlMemoryManager* memory_manager = enc_state->memory_manager();
-  std::unique_ptr<PassesDecoderState> dec_state =
-      jxl::make_unique<PassesDecoderState>(memory_manager);
-  JXL_RETURN_IF_ERROR(dec_state->output_encoding_info.SetFromMetadata(
-      *enc_state->shared.metadata));
-  dec_state->shared = &enc_state->shared;
-  JXL_ENSURE(opsin.ysize() % kBlockDim == 0);
-
-  const size_t xsize_groups = DivCeil(opsin.xsize(), kGroupDim);
-  const size_t ysize_groups = DivCeil(opsin.ysize(), kGroupDim);
-  const size_t num_groups = xsize_groups * ysize_groups;
-
-  size_t num_special_frames = enc_state->special_frames.size();
-  size_t num_passes = enc_state->progressive_splitter.GetNumPasses();
-  JXL_ASSIGN_OR_RETURN(ModularFrameEncoder modular_frame_encoder,
-                       ModularFrameEncoder::Create(memory_manager, frame_header,
-                                                   enc_state->cparams, false));
-  JXL_RETURN_IF_ERROR(InitializePassesEncoder(frame_header, opsin, Rect(opsin),
-                                              cms, pool, enc_state,
-                                              &modular_frame_encoder, nullptr));
-  JXL_RETURN_IF_ERROR(dec_state->Init(frame_header));
-  JXL_RETURN_IF_ERROR(dec_state->InitForAC(num_passes, pool));
-
-  ImageBundle decoded(memory_manager, &enc_state->shared.metadata->m);
-  decoded.origin = frame_header.frame_origin;
-  JXL_ASSIGN_OR_RETURN(
-      Image3F tmp,
-      Image3F::Create(memory_manager, opsin.xsize(), opsin.ysize()));
-  JXL_RETURN_IF_ERROR(decoded.SetFromImage(
-      std::move(tmp), dec_state->output_encoding_info.color_encoding));
-
-  PassesDecoderState::PipelineOptions options;
-  options.use_slow_render_pipeline = false;
-  options.coalescing = false;
-  options.render_spotcolors = false;
-  options.render_noise = false;
-
-  // Same as frame_header.nonserialized_metadata->m
-  const ImageMetadata& metadata = *decoded.metadata();
-
-  JXL_RETURN_IF_ERROR(dec_state->PreparePipeline(
-      frame_header, &enc_state->shared.metadata->m, &decoded, options));
-
-  AlignedArray<GroupDecCache> group_dec_caches;
-  const auto allocate_storage = [&](const size_t num_threads) -> Status {
-    JXL_RETURN_IF_ERROR(
-        dec_state->render_pipeline->PrepareForThreads(num_threads,
-                                                      /*use_group_ids=*/false));
-    JXL_ASSIGN_OR_RETURN(group_dec_caches, AlignedArray<GroupDecCache>::Create(
-                                               memory_manager, num_threads));
-    return true;
-  };
-  const auto process_group = [&](const uint32_t group_index,
-                                 const size_t thread) -> Status {
-    if (frame_header.loop_filter.epf_iters > 0) {
-      JXL_RETURN_IF_ERROR(
-          ComputeSigma(frame_header.loop_filter,
-                       dec_state->shared->frame_dim.BlockGroupRect(group_index),
-                       dec_state.get()));
-    }
-    RenderPipelineInput input =
-        dec_state->render_pipeline->GetInputBuffers(group_index, thread);
-    JXL_RETURN_IF_ERROR(DecodeGroupForRoundtrip(
-        frame_header, enc_state->coeffs, group_index, dec_state.get(),
-        &group_dec_caches[thread], thread, input, nullptr, nullptr));
-    for (size_t c = 0; c < metadata.num_extra_channels; c++) {
-      std::pair<ImageF*, Rect> ri = input.GetBuffer(3 + c);
-      FillPlane(0.0f, ri.first, ri.second);
-    }
-    JXL_RETURN_IF_ERROR(input.Done());
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, num_groups, allocate_storage,
-                                process_group, "AQ loop"));
-
-  // Ensure we don't create any new special frames.
-  enc_state->special_frames.resize(num_special_frames);
-
-  return decoded;
-}
-
-constexpr int kMaxButteraugliIters = 4;
-
-Status FindBestQuantization(const FrameHeader& frame_header,
-                            const Image3F& linear, const Image3F& opsin,
-                            ImageF& quant_field, PassesEncoderState* enc_state,
-                            const JxlCmsInterface& cms, ThreadPool* pool,
-                            AuxOut* aux_out) {
-  const CompressParams& cparams = enc_state->cparams;
-  if (cparams.resampling > 1 &&
-      cparams.original_butteraugli_distance <= 4.0 * cparams.resampling) {
-    // For downsampled opsin image, the butteraugli based adaptive quantization
-    // loop would only make the size bigger without improving the distance much,
-    // so in this case we enable it only for very high butteraugli targets.
-    return true;
-  }
-  JxlMemoryManager* memory_manager = enc_state->memory_manager();
-  Quantizer& quantizer = enc_state->shared.quantizer;
-  ImageI& raw_quant_field = enc_state->shared.raw_quant_field;
-
-  const float butteraugli_target = cparams.butteraugli_distance;
-  const float original_butteraugli = cparams.original_butteraugli_distance;
-  ButteraugliParams params;
-  const auto& tf = frame_header.nonserialized_metadata->m.color_encoding.Tf();
-  params.intensity_target =
-      tf.IsPQ() || tf.IsHLG()
-          ? frame_header.nonserialized_metadata->m.IntensityTarget()
-          : 80.f;
-  JxlButteraugliComparator comparator(params, cms);
-  JXL_RETURN_IF_ERROR(comparator.SetLinearReferenceImage(linear));
-  bool lower_is_better =
-      (comparator.GoodQualityScore() < comparator.BadQualityScore());
-  const float initial_quant_dc = InitialQuantDC(butteraugli_target);
-  JXL_RETURN_IF_ERROR(AdjustQuantField(enc_state->shared.ac_strategy,
-                                       Rect(quant_field), original_butteraugli,
-                                       &quant_field));
-  ImageF tile_distmap;
-  JXL_ASSIGN_OR_RETURN(
-      ImageF initial_quant_field,
-      ImageF::Create(memory_manager, quant_field.xsize(), quant_field.ysize()));
-  JXL_RETURN_IF_ERROR(CopyImageTo(quant_field, &initial_quant_field));
-
-  float initial_qf_min;
-  float initial_qf_max;
-  ImageMinMax(initial_quant_field, &initial_qf_min, &initial_qf_max);
-  float initial_qf_ratio = initial_qf_max / initial_qf_min;
-  float qf_max_deviation_low = std::sqrt(250 / initial_qf_ratio);
-  float asymmetry = 2;
-  if (qf_max_deviation_low < asymmetry) asymmetry = qf_max_deviation_low;
-  float qf_lower = initial_qf_min / (asymmetry * qf_max_deviation_low);
-  float qf_higher = initial_qf_max * (qf_max_deviation_low / asymmetry);
-
-  JXL_ENSURE(qf_higher / qf_lower < 253);
-
-  constexpr int kOriginalComparisonRound = 1;
-  int iters = kMaxButteraugliIters;
-  if (cparams.speed_tier != SpeedTier::kTortoise) {
-    iters = 2;
-  }
-  for (int i = 0; i < iters + 1; ++i) {
-    if (JXL_DEBUG_ADAPTIVE_QUANTIZATION) {
-      printf("\nQuantization field:\n");
-      for (size_t y = 0; y < quant_field.ysize(); ++y) {
-        for (size_t x = 0; x < quant_field.xsize(); ++x) {
-          printf(" %.5f", quant_field.Row(y)[x]);
-        }
-        printf("\n");
-      }
-    }
-    JXL_RETURN_IF_ERROR(quantizer.SetQuantField(initial_quant_dc, quant_field,
-                                                &raw_quant_field));
-    JXL_ASSIGN_OR_RETURN(
-        ImageBundle dec_linear,
-        RoundtripImage(frame_header, opsin, enc_state, cms, pool));
-    float score;
-    ImageF diffmap;
-    JXL_RETURN_IF_ERROR(comparator.CompareWith(dec_linear, &diffmap, &score));
-    if (!lower_is_better) {
-      score = -score;
-      ScaleImage(-1.0f, &diffmap);
-    }
-    JXL_ASSIGN_OR_RETURN(tile_distmap,
-                         TileDistMap(diffmap, 8 * cparams.resampling, 0,
-                                     enc_state->shared.ac_strategy));
-    if (JXL_DEBUG_ADAPTIVE_QUANTIZATION && WantDebugOutput(cparams)) {
-      JXL_RETURN_IF_ERROR(DumpImage(cparams, ("dec" + ToString(i)).c_str(),
-                                    *dec_linear.color()));
-      JXL_RETURN_IF_ERROR(DumpHeatmaps(cparams, aux_out, butteraugli_target,
-                                       quant_field, tile_distmap, diffmap));
-    }
-    if (aux_out != nullptr) ++aux_out->num_butteraugli_iters;
-    if (JXL_DEBUG_ADAPTIVE_QUANTIZATION) {
-      float minval;
-      float maxval;
-      ImageMinMax(quant_field, &minval, &maxval);
-      printf("\nButteraugli iter: %d/%d\n", i, kMaxButteraugliIters);
-      printf("Butteraugli distance: %f  (target = %f)\n", score,
-             original_butteraugli);
-      printf("quant range: %f ... %f  DC quant: %f\n", minval, maxval,
-             initial_quant_dc);
-      if (FLAGS_dump_quant_state) {
-        quantizer.DumpQuantizationMap(raw_quant_field);
-      }
-    }
-
-    if (i == iters) break;
-
-    double kPow[8] = {
-        0.2, 0.2, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
-    };
-    double kPowMod[8] = {
-        0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
-    };
-    if (i == kOriginalComparisonRound) {
-      // Don't allow optimization to make the quant field a lot worse than
-      // what the initial guess was. This allows the AC field to have enough
-      // precision to reduce the oscillations due to the dc reconstruction.
-      double kInitMul = 0.6;
-      const double kOneMinusInitMul = 1.0 - kInitMul;
-      for (size_t y = 0; y < quant_field.ysize(); ++y) {
-        float* const JXL_RESTRICT row_q = quant_field.Row(y);
-        const float* const JXL_RESTRICT row_init = initial_quant_field.Row(y);
-        for (size_t x = 0; x < quant_field.xsize(); ++x) {
-          double clamp = kOneMinusInitMul * row_q[x] + kInitMul * row_init[x];
-          if (row_q[x] < clamp) {
-            row_q[x] = clamp;
-            if (row_q[x] > qf_higher) row_q[x] = qf_higher;
-            if (row_q[x] < qf_lower) row_q[x] = qf_lower;
-          }
-        }
-      }
-    }
-
-    double cur_pow = 0.0;
-    if (i < 7) {
-      cur_pow = kPow[i] + (original_butteraugli - 1.0) * kPowMod[i];
-      if (cur_pow < 0) {
-        cur_pow = 0;
-      }
-    }
-    if (cur_pow == 0.0) {
-      for (size_t y = 0; y < quant_field.ysize(); ++y) {
-        const float* const JXL_RESTRICT row_dist = tile_distmap.Row(y);
-        float* const JXL_RESTRICT row_q = quant_field.Row(y);
-        for (size_t x = 0; x < quant_field.xsize(); ++x) {
-          const float diff = row_dist[x] / original_butteraugli;
-          if (diff > 1.0f) {
-            float old = row_q[x];
-            row_q[x] *= diff;
-            int qf_old =
-                static_cast<int>(std::lround(old * quantizer.InvGlobalScale()));
-            int qf_new = static_cast<int>(
-                std::lround(row_q[x] * quantizer.InvGlobalScale()));
-            if (qf_old == qf_new) {
-              row_q[x] = old + quantizer.Scale();
-            }
-          }
-          if (row_q[x] > qf_higher) row_q[x] = qf_higher;
-          if (row_q[x] < qf_lower) row_q[x] = qf_lower;
-        }
-      }
-    } else {
-      for (size_t y = 0; y < quant_field.ysize(); ++y) {
-        const float* const JXL_RESTRICT row_dist = tile_distmap.Row(y);
-        float* const JXL_RESTRICT row_q = quant_field.Row(y);
-        for (size_t x = 0; x < quant_field.xsize(); ++x) {
-          const float diff = row_dist[x] / original_butteraugli;
-          if (diff <= 1.0f) {
-            row_q[x] *= std::pow(diff, cur_pow);
-          } else {
-            float old = row_q[x];
-            row_q[x] *= diff;
-            int qf_old =
-                static_cast<int>(std::lround(old * quantizer.InvGlobalScale()));
-            int qf_new = static_cast<int>(
-                std::lround(row_q[x] * quantizer.InvGlobalScale()));
-            if (qf_old == qf_new) {
-              row_q[x] = old + quantizer.Scale();
-            }
-          }
-          if (row_q[x] > qf_higher) row_q[x] = qf_higher;
-          if (row_q[x] < qf_lower) row_q[x] = qf_lower;
-        }
-      }
-    }
-  }
-  JXL_RETURN_IF_ERROR(
-      quantizer.SetQuantField(initial_quant_dc, quant_field, &raw_quant_field));
-  return true;
-}
-
-Status FindBestQuantizationMaxError(const FrameHeader& frame_header,
-                                    const Image3F& opsin, ImageF& quant_field,
-                                    PassesEncoderState* enc_state,
-                                    const JxlCmsInterface& cms,
-                                    ThreadPool* pool, AuxOut* aux_out) {
-  // TODO(szabadka): Make this work for non-opsin color spaces.
-  const CompressParams& cparams = enc_state->cparams;
-  Quantizer& quantizer = enc_state->shared.quantizer;
-  ImageI& raw_quant_field = enc_state->shared.raw_quant_field;
-
-  // TODO(veluca): better choice of this value.
-  const float initial_quant_dc =
-      16 * std::sqrt(0.1f / cparams.butteraugli_distance);
-  JXL_RETURN_IF_ERROR(
-      AdjustQuantField(enc_state->shared.ac_strategy, Rect(quant_field),
-                       cparams.original_butteraugli_distance, &quant_field));
-
-  const float inv_max_err[3] = {1.0f / enc_state->cparams.max_error[0],
-                                1.0f / enc_state->cparams.max_error[1],
-                                1.0f / enc_state->cparams.max_error[2]};
-
-  for (int i = 0; i < kMaxButteraugliIters + 1; ++i) {
-    JXL_RETURN_IF_ERROR(quantizer.SetQuantField(initial_quant_dc, quant_field,
-                                                &raw_quant_field));
-    if (JXL_DEBUG_ADAPTIVE_QUANTIZATION && aux_out) {
-      JXL_RETURN_IF_ERROR(
-          DumpXybImage(cparams, ("ops" + ToString(i)).c_str(), opsin));
-    }
-    JXL_ASSIGN_OR_RETURN(
-        ImageBundle decoded,
-        RoundtripImage(frame_header, opsin, enc_state, cms, pool));
-    if (JXL_DEBUG_ADAPTIVE_QUANTIZATION && aux_out) {
-      JXL_RETURN_IF_ERROR(DumpXybImage(cparams, ("dec" + ToString(i)).c_str(),
-                                       *decoded.color()));
-    }
-    for (size_t by = 0; by < enc_state->shared.frame_dim.ysize_blocks; by++) {
-      AcStrategyRow ac_strategy_row =
-          enc_state->shared.ac_strategy.ConstRow(by);
-      for (size_t bx = 0; bx < enc_state->shared.frame_dim.xsize_blocks; bx++) {
-        AcStrategy acs = ac_strategy_row[bx];
-        if (!acs.IsFirstBlock()) continue;
-        float max_error = 0;
-        for (size_t c = 0; c < 3; c++) {
-          for (size_t y = by * kBlockDim;
-               y < (by + acs.covered_blocks_y()) * kBlockDim; y++) {
-            if (y >= decoded.ysize()) continue;
-            const float* JXL_RESTRICT in_row = opsin.ConstPlaneRow(c, y);
-            const float* JXL_RESTRICT dec_row =
-                decoded.color()->ConstPlaneRow(c, y);
-            for (size_t x = bx * kBlockDim;
-                 x < (bx + acs.covered_blocks_x()) * kBlockDim; x++) {
-              if (x >= decoded.xsize()) continue;
-              max_error = std::max(
-                  std::abs(in_row[x] - dec_row[x]) * inv_max_err[c], max_error);
-            }
-          }
-        }
-        // Target an error between max_error/2 and max_error.
-        // If the error in the varblock is above the target, increase the qf to
-        // compensate. If the error is below the target, decrease the qf.
-        // However, to avoid an excessive increase of the qf, only do so if the
-        // error is less than half the maximum allowed error.
-        const float qf_mul = (max_error < 0.5f)   ? max_error * 2.0f
-                             : (max_error > 1.0f) ? max_error
-                                                  : 1.0f;
-        for (size_t qy = by; qy < by + acs.covered_blocks_y(); qy++) {
-          float* JXL_RESTRICT quant_field_row = quant_field.Row(qy);
-          for (size_t qx = bx; qx < bx + acs.covered_blocks_x(); qx++) {
-            quant_field_row[qx] *= qf_mul;
-          }
-        }
-      }
-    }
-  }
-  JXL_RETURN_IF_ERROR(
-      quantizer.SetQuantField(initial_quant_dc, quant_field, &raw_quant_field));
-  return true;
-}
-
-}  // namespace
-
-Status AdjustQuantField(const AcStrategyImage& ac_strategy, const Rect& rect,
-                        float butteraugli_target, ImageF* quant_field) {
-  // Replace the whole quant_field in non-8x8 blocks with the maximum of each
-  // 8x8 block.
-  size_t stride = quant_field->PixelsPerRow();
-
-  // At low distances it is great to use max, but mean works better
-  // at high distances. We interpolate between them for a distance
-  // range.
-  float mean_max_mixer = 1.0f;
-  {
-    static const float kLimit = 1.54138f;
-    static const float kMul = 0.56391f;
-    static const float kMin = 0.0f;
-    if (butteraugli_target > kLimit) {
-      mean_max_mixer -= (butteraugli_target - kLimit) * kMul;
-      if (mean_max_mixer < kMin) {
-        mean_max_mixer = kMin;
-      }
-    }
-  }
-  for (size_t y = 0; y < rect.ysize(); ++y) {
-    AcStrategyRow ac_strategy_row = ac_strategy.ConstRow(rect, y);
-    float* JXL_RESTRICT quant_row = rect.Row(quant_field, y);
-    for (size_t x = 0; x < rect.xsize(); ++x) {
-      AcStrategy acs = ac_strategy_row[x];
-      if (!acs.IsFirstBlock()) continue;
-      JXL_ENSURE(x + acs.covered_blocks_x() <= quant_field->xsize());
-      JXL_ENSURE(y + acs.covered_blocks_y() <= quant_field->ysize());
-      float max = quant_row[x];
-      float mean = 0.0;
-      for (size_t iy = 0; iy < acs.covered_blocks_y(); iy++) {
-        for (size_t ix = 0; ix < acs.covered_blocks_x(); ix++) {
-          mean += quant_row[x + ix + iy * stride];
-          max = std::max(quant_row[x + ix + iy * stride], max);
-        }
-      }
-      mean /= acs.covered_blocks_y() * acs.covered_blocks_x();
-      if (acs.covered_blocks_y() * acs.covered_blocks_x() >= 4) {
-        max *= mean_max_mixer;
-        max += (1.0f - mean_max_mixer) * mean;
-      }
-      for (size_t iy = 0; iy < acs.covered_blocks_y(); iy++) {
-        for (size_t ix = 0; ix < acs.covered_blocks_x(); ix++) {
-          quant_row[x + ix + iy * stride] = max;
-        }
-      }
-    }
-  }
-  return true;
-}
-
-float InitialQuantDC(float butteraugli_target) {
-  const float kDcMul = 0.3;  // Butteraugli target where non-linearity kicks in.
-  const float butteraugli_target_dc = std::max<float>(
-      0.5f * butteraugli_target,
-      std::min<float>(butteraugli_target,
-                      kDcMul * std::pow((1.0f / kDcMul) * butteraugli_target,
-                                        kDcQuantPow)));
-  // We want the maximum DC value to be at most 2**15 * kInvDCQuant / quant_dc.
-  // The maximum DC value might not be in the kXybRange because of inverse
-  // gaborish, so we add some slack to the maximum theoretical quant obtained
-  // this way (64).
-  return std::min(kDcQuant / butteraugli_target_dc, 50.f);
-}
-
-StatusOr<ImageF> InitialQuantField(const float butteraugli_target,
-                                   const Image3F& opsin, const Rect& rect,
-                                   ThreadPool* pool, float rescale,
-                                   ImageF* mask, ImageF* mask1x1) {
-  const float quant_ac = kAcQuant / butteraugli_target;
-  return HWY_DYNAMIC_DISPATCH(AdaptiveQuantizationMap)(
-      butteraugli_target, opsin, rect, quant_ac * rescale, pool, mask, mask1x1);
-}
-
-Status FindBestQuantizer(const FrameHeader& frame_header, const Image3F* linear,
-                         const Image3F& opsin, ImageF& quant_field,
-                         PassesEncoderState* enc_state,
-                         const JxlCmsInterface& cms, ThreadPool* pool,
-                         AuxOut* aux_out, double rescale) {
-  const CompressParams& cparams = enc_state->cparams;
-  if (cparams.max_error_mode) {
-    JXL_RETURN_IF_ERROR(FindBestQuantizationMaxError(
-        frame_header, opsin, quant_field, enc_state, cms, pool, aux_out));
-  } else if (linear && cparams.speed_tier <= SpeedTier::kKitten) {
-    // Normal encoding to a butteraugli score.
-    JXL_RETURN_IF_ERROR(FindBestQuantization(frame_header, *linear, opsin,
-                                             quant_field, enc_state, cms, pool,
-                                             aux_out));
-  }
-  return true;
-}
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/enc_adaptive_quantization.h b/third_party/jpeg-xl/lib/jxl/enc_adaptive_quantization.h
deleted file mode 100644
index 26f6965ac4507..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_adaptive_quantization.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_ADAPTIVE_QUANTIZATION_H_
-#define LIB_JXL_ENC_ADAPTIVE_QUANTIZATION_H_
-
-#include <jxl/cms_interface.h>
-
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_cache.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/image.h"
-
-// Heuristics to find a good quantizer for a given image. InitialQuantField
-// produces a quantization field (i.e. relative quantization amounts for each
-// block) out of an opsin-space image. `InitialQuantField` uses heuristics,
-// `FindBestQuantizer` (in non-fast mode) will run multiple encoding-decoding
-// steps and try to improve the given quant field.
-
-namespace jxl {
-
-struct AuxOut;
-class AcStrategyImage;
-
-// Returns an image subsampled by kBlockDim in each direction. If the value
-// at pixel (x,y) in the returned image is greater than 1.0, it means that
-// more fine-grained quantization should be used in the corresponding block
-// of the input image, while a value less than 1.0 indicates that less
-// fine-grained quantization should be enough. Returns a mask, too, which
-// can later be used to make better decisions about ac strategy.
-StatusOr<ImageF> InitialQuantField(float butteraugli_target,
-                                   const Image3F& opsin, const Rect& rect,
-                                   ThreadPool* pool, float rescale,
-                                   ImageF* initial_quant_mask,
-                                   ImageF* initial_quant_mask1x1);
-
-float InitialQuantDC(float butteraugli_target);
-
-Status AdjustQuantField(const AcStrategyImage& ac_strategy, const Rect& rect,
-                        float butteraugli_target, ImageF* quant_field);
-
-// Returns a quantizer that uses an adjusted version of the provided
-// quant_field. Also computes the dequant_map corresponding to the given
-// dequant_float_map and chosen quantization levels.
-// `linear` is only used in Kitten mode or slower.
-Status FindBestQuantizer(const FrameHeader& frame_header, const Image3F* linear,
-                         const Image3F& opsin, ImageF& quant_field,
-                         PassesEncoderState* enc_state,
-                         const JxlCmsInterface& cms, ThreadPool* pool,
-                         AuxOut* aux_out, double rescale = 1.0);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_ADAPTIVE_QUANTIZATION_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_ans.cc b/third_party/jpeg-xl/lib/jxl/enc_ans.cc
deleted file mode 100644
index f42fc6dd889d4..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_ans.cc
+++ /dev/null
@@ -1,1887 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_ans.h"
-
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-
-#include <algorithm>
-#include <cmath>
-#include <cstdint>
-#include <limits>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/ans_common.h"
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/base/fast_math-inl.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_ans.h"
-#include "lib/jxl/enc_ans_params.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_cluster.h"
-#include "lib/jxl/enc_context_map.h"
-#include "lib/jxl/enc_fields.h"
-#include "lib/jxl/enc_huffman.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/fields.h"
-
-namespace jxl {
-
-namespace {
-
-#if (!JXL_IS_DEBUG_BUILD)
-constexpr
-#endif
-    bool ans_fuzzer_friendly_ = false;
-
-const int kMaxNumSymbolsForSmallCode = 4;
-
-void ANSBuildInfoTable(const ANSHistBin* counts, const AliasTable::Entry* table,
-                       size_t alphabet_size, size_t log_alpha_size,
-                       ANSEncSymbolInfo* info) {
-  size_t log_entry_size = ANS_LOG_TAB_SIZE - log_alpha_size;
-  size_t entry_size_minus_1 = (1 << log_entry_size) - 1;
-  // create valid alias table for empty streams.
-  for (size_t s = 0; s < std::max<size_t>(1, alphabet_size); ++s) {
-    const ANSHistBin freq = s == alphabet_size ? ANS_TAB_SIZE : counts[s];
-    info[s].freq_ = static_cast<uint16_t>(freq);
-#ifdef USE_MULT_BY_RECIPROCAL
-    if (freq != 0) {
-      info[s].ifreq_ =
-          ((1ull << RECIPROCAL_PRECISION) + info[s].freq_ - 1) / info[s].freq_;
-    } else {
-      info[s].ifreq_ = 1;  // shouldn't matter (symbol shouldn't occur), but...
-    }
-#endif
-    info[s].reverse_map_.resize(freq);
-  }
-  for (int i = 0; i < ANS_TAB_SIZE; i++) {
-    AliasTable::Symbol s =
-        AliasTable::Lookup(table, i, log_entry_size, entry_size_minus_1);
-    info[s.value].reverse_map_[s.offset] = i;
-  }
-}
-
-float EstimateDataBits(const ANSHistBin* histogram, const ANSHistBin* counts,
-                       size_t len) {
-  float sum = 0.0f;
-  int total_histogram = 0;
-  int total_counts = 0;
-  for (size_t i = 0; i < len; ++i) {
-    total_histogram += histogram[i];
-    total_counts += counts[i];
-    if (histogram[i] > 0) {
-      JXL_DASSERT(counts[i] > 0);
-      // += histogram[i] * -log(counts[i]/total_counts)
-      sum += histogram[i] *
-             std::max(0.0f, ANS_LOG_TAB_SIZE - FastLog2f(counts[i]));
-    }
-  }
-  if (total_histogram > 0) {
-    // Used only in assert.
-    (void)total_counts;
-    JXL_DASSERT(total_counts == ANS_TAB_SIZE);
-  }
-  return sum;
-}
-
-float EstimateDataBitsFlat(const ANSHistBin* histogram, size_t len) {
-  const float flat_bits = std::max(FastLog2f(len), 0.0f);
-  float total_histogram = 0;
-  for (size_t i = 0; i < len; ++i) {
-    total_histogram += histogram[i];
-  }
-  return total_histogram * flat_bits;
-}
-
-// Static Huffman code for encoding logcounts. The last symbol is used as RLE
-// sequence.
-const uint8_t kLogCountBitLengths[ANS_LOG_TAB_SIZE + 2] = {
-    5, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 6, 7, 7,
-};
-const uint8_t kLogCountSymbols[ANS_LOG_TAB_SIZE + 2] = {
-    17, 11, 15, 3, 9, 7, 4, 2, 5, 6, 0, 33, 1, 65,
-};
-
-// Returns the difference between largest count that can be represented and is
-// smaller than "count" and smallest representable count larger than "count".
-int SmallestIncrement(uint32_t count, uint32_t shift) {
-  int bits = count == 0 ? -1 : FloorLog2Nonzero(count);
-  int drop_bits = bits - GetPopulationCountPrecision(bits, shift);
-  return drop_bits < 0 ? 1 : (1 << drop_bits);
-}
-
-template <bool minimize_error_of_sum>
-bool RebalanceHistogram(const float* targets, int max_symbol, int table_size,
-                        uint32_t shift, int* omit_pos, ANSHistBin* counts) {
-  int sum = 0;
-  float sum_nonrounded = 0.0;
-  int remainder_pos = 0;  // if all of them are handled in first loop
-  int remainder_log = -1;
-  for (int n = 0; n < max_symbol; ++n) {
-    if (targets[n] > 0 && targets[n] < 1.0f) {
-      counts[n] = 1;
-      sum_nonrounded += targets[n];
-      sum += counts[n];
-    }
-  }
-  const float discount_ratio =
-      (table_size - sum) / (table_size - sum_nonrounded);
-  JXL_ENSURE(discount_ratio > 0);
-  JXL_ENSURE(discount_ratio <= 1.0f);
-  // Invariant for minimize_error_of_sum == true:
-  // abs(sum - sum_nonrounded)
-  //   <= SmallestIncrement(max(targets[])) + max_symbol
-  for (int n = 0; n < max_symbol; ++n) {
-    if (targets[n] >= 1.0f) {
-      sum_nonrounded += targets[n];
-      counts[n] =
-          static_cast<ANSHistBin>(targets[n] * discount_ratio);  // truncate
-      if (counts[n] == 0) counts[n] = 1;
-      if (counts[n] == table_size) counts[n] = table_size - 1;
-      // Round the count to the closest nonzero multiple of SmallestIncrement
-      // (when minimize_error_of_sum is false) or one of two closest so as to
-      // keep the sum as close as possible to sum_nonrounded.
-      int inc = SmallestIncrement(counts[n], shift);
-      counts[n] -= counts[n] & (inc - 1);
-      // TODO(robryk): Should we rescale targets[n]?
-      const int target = minimize_error_of_sum
-                             ? (static_cast<int>(sum_nonrounded) - sum)
-                             : static_cast<int>(targets[n]);
-      if (counts[n] == 0 ||
-          (target >= counts[n] + inc / 2 && counts[n] + inc < table_size)) {
-        counts[n] += inc;
-      }
-      sum += counts[n];
-      const int count_log = FloorLog2Nonzero(static_cast<uint32_t>(counts[n]));
-      if (count_log > remainder_log) {
-        remainder_pos = n;
-        remainder_log = count_log;
-      }
-    }
-  }
-  JXL_ENSURE(remainder_pos != -1);
-  // NOTE: This is the only place where counts could go negative. We could
-  // detect that, return false and make ANSHistBin uint32_t.
-  counts[remainder_pos] -= sum - table_size;
-  *omit_pos = remainder_pos;
-  return counts[remainder_pos] > 0;
-}
-
-Status NormalizeCounts(ANSHistBin* counts, int* omit_pos, const int length,
-                       const int precision_bits, uint32_t shift,
-                       int* num_symbols, int* symbols) {
-  const int32_t table_size = 1 << precision_bits;  // target sum / table size
-  uint64_t total = 0;
-  int max_symbol = 0;
-  int symbol_count = 0;
-  for (int n = 0; n < length; ++n) {
-    total += counts[n];
-    if (counts[n] > 0) {
-      if (symbol_count < kMaxNumSymbolsForSmallCode) {
-        symbols[symbol_count] = n;
-      }
-      ++symbol_count;
-      max_symbol = n + 1;
-    }
-  }
-  *num_symbols = symbol_count;
-  if (symbol_count == 0) {
-    return true;
-  }
-  if (symbol_count == 1) {
-    counts[symbols[0]] = table_size;
-    return true;
-  }
-  if (symbol_count > table_size)
-    return JXL_FAILURE("Too many entries in an ANS histogram");
-
-  const float norm = 1.f * table_size / total;
-  std::vector<float> targets(max_symbol);
-  for (size_t n = 0; n < targets.size(); ++n) {
-    targets[n] = norm * counts[n];
-  }
-  if (!RebalanceHistogram<false>(targets.data(), max_symbol, table_size, shift,
-                                 omit_pos, counts)) {
-    // Use an alternative rebalancing mechanism if the one above failed
-    // to create a histogram that is positive wherever the original one was.
-    if (!RebalanceHistogram<true>(targets.data(), max_symbol, table_size, shift,
-                                  omit_pos, counts)) {
-      return JXL_FAILURE("Logic error: couldn't rebalance a histogram");
-    }
-  }
-  return true;
-}
-
-struct SizeWriter {
-  size_t size = 0;
-  void Write(size_t num, size_t bits) { size += num; }
-};
-
-template <typename Writer>
-void StoreVarLenUint8(size_t n, Writer* writer) {
-  JXL_DASSERT(n <= 255);
-  if (n == 0) {
-    writer->Write(1, 0);
-  } else {
-    writer->Write(1, 1);
-    size_t nbits = FloorLog2Nonzero(n);
-    writer->Write(3, nbits);
-    writer->Write(nbits, n - (1ULL << nbits));
-  }
-}
-
-template <typename Writer>
-void StoreVarLenUint16(size_t n, Writer* writer) {
-  JXL_DASSERT(n <= 65535);
-  if (n == 0) {
-    writer->Write(1, 0);
-  } else {
-    writer->Write(1, 1);
-    size_t nbits = FloorLog2Nonzero(n);
-    writer->Write(4, nbits);
-    writer->Write(nbits, n - (1ULL << nbits));
-  }
-}
-
-template <typename Writer>
-bool EncodeCounts(const ANSHistBin* counts, const int alphabet_size,
-                  const int omit_pos, const int num_symbols, uint32_t shift,
-                  const int* symbols, Writer* writer) {
-  bool ok = true;
-  if (num_symbols <= 2) {
-    // Small tree marker to encode 1-2 symbols.
-    writer->Write(1, 1);
-    if (num_symbols == 0) {
-      writer->Write(1, 0);
-      StoreVarLenUint8(0, writer);
-    } else {
-      writer->Write(1, num_symbols - 1);
-      for (int i = 0; i < num_symbols; ++i) {
-        StoreVarLenUint8(symbols[i], writer);
-      }
-    }
-    if (num_symbols == 2) {
-      writer->Write(ANS_LOG_TAB_SIZE, counts[symbols[0]]);
-    }
-  } else {
-    // Mark non-small tree.
-    writer->Write(1, 0);
-    // Mark non-flat histogram.
-    writer->Write(1, 0);
-
-    // Precompute sequences for RLE encoding. Contains the number of identical
-    // values starting at a given index. Only contains the value at the first
-    // element of the series.
-    std::vector<uint32_t> same(alphabet_size, 0);
-    int last = 0;
-    for (int i = 1; i < alphabet_size; i++) {
-      // Store the sequence length once different symbol reached, or we're at
-      // the end, or the length is longer than we can encode, or we are at
-      // the omit_pos. We don't support including the omit_pos in an RLE
-      // sequence because this value may use a different amount of log2 bits
-      // than standard, it is too complex to handle in the decoder.
-      if (counts[i] != counts[last] || i + 1 == alphabet_size ||
-          (i - last) >= 255 || i == omit_pos || i == omit_pos + 1) {
-        same[last] = (i - last);
-        last = i + 1;
-      }
-    }
-
-    int length = 0;
-    std::vector<int> logcounts(alphabet_size);
-    int omit_log = 0;
-    for (int i = 0; i < alphabet_size; ++i) {
-      JXL_ENSURE(counts[i] <= ANS_TAB_SIZE);
-      JXL_ENSURE(counts[i] >= 0);
-      if (i == omit_pos) {
-        length = i + 1;
-      } else if (counts[i] > 0) {
-        logcounts[i] = FloorLog2Nonzero(static_cast<uint32_t>(counts[i])) + 1;
-        length = i + 1;
-        if (i < omit_pos) {
-          omit_log = std::max(omit_log, logcounts[i] + 1);
-        } else {
-          omit_log = std::max(omit_log, logcounts[i]);
-        }
-      }
-    }
-    logcounts[omit_pos] = omit_log;
-
-    // Elias gamma-like code for shift. Only difference is that if the number
-    // of bits to be encoded is equal to FloorLog2(ANS_LOG_TAB_SIZE+1), we skip
-    // the terminating 0 in unary coding.
-    int upper_bound_log = FloorLog2Nonzero(ANS_LOG_TAB_SIZE + 1);
-    int log = FloorLog2Nonzero(shift + 1);
-    writer->Write(log, (1 << log) - 1);
-    if (log != upper_bound_log) writer->Write(1, 0);
-    writer->Write(log, ((1 << log) - 1) & (shift + 1));
-
-    // Since num_symbols >= 3, we know that length >= 3, therefore we encode
-    // length - 3.
-    if (length - 3 > 255) {
-      // Pretend that everything is OK, but complain about correctness later.
-      StoreVarLenUint8(255, writer);
-      ok = false;
-    } else {
-      StoreVarLenUint8(length - 3, writer);
-    }
-
-    // The logcount values are encoded with a static Huffman code.
-    static const size_t kMinReps = 4;
-    size_t rep = ANS_LOG_TAB_SIZE + 1;
-    for (int i = 0; i < length; ++i) {
-      if (i > 0 && same[i - 1] > kMinReps) {
-        // Encode the RLE symbol and skip the repeated ones.
-        writer->Write(kLogCountBitLengths[rep], kLogCountSymbols[rep]);
-        StoreVarLenUint8(same[i - 1] - kMinReps - 1, writer);
-        i += same[i - 1] - 2;
-        continue;
-      }
-      writer->Write(kLogCountBitLengths[logcounts[i]],
-                    kLogCountSymbols[logcounts[i]]);
-    }
-    for (int i = 0; i < length; ++i) {
-      if (i > 0 && same[i - 1] > kMinReps) {
-        // Skip symbols encoded by RLE.
-        i += same[i - 1] - 2;
-        continue;
-      }
-      if (logcounts[i] > 1 && i != omit_pos) {
-        int bitcount = GetPopulationCountPrecision(logcounts[i] - 1, shift);
-        int drop_bits = logcounts[i] - 1 - bitcount;
-        JXL_ENSURE((counts[i] & ((1 << drop_bits) - 1)) == 0);
-        writer->Write(bitcount, (counts[i] >> drop_bits) - (1 << bitcount));
-      }
-    }
-  }
-  return ok;
-}
-
-void EncodeFlatHistogram(const int alphabet_size, BitWriter* writer) {
-  // Mark non-small tree.
-  writer->Write(1, 0);
-  // Mark uniform histogram.
-  writer->Write(1, 1);
-  JXL_DASSERT(alphabet_size > 0);
-  // Encode alphabet size.
-  StoreVarLenUint8(alphabet_size - 1, writer);
-}
-
-StatusOr<float> ComputeHistoAndDataCost(const ANSHistBin* histogram,
-                                        size_t alphabet_size, uint32_t method) {
-  if (method == 0) {  // Flat code
-    return ANS_LOG_TAB_SIZE + 2 +
-           EstimateDataBitsFlat(histogram, alphabet_size);
-  }
-  // Non-flat: shift = method-1.
-  uint32_t shift = method - 1;
-  std::vector<ANSHistBin> counts(histogram, histogram + alphabet_size);
-  int omit_pos = 0;
-  int num_symbols;
-  int symbols[kMaxNumSymbolsForSmallCode] = {};
-  JXL_RETURN_IF_ERROR(NormalizeCounts(counts.data(), &omit_pos, alphabet_size,
-                                      ANS_LOG_TAB_SIZE, shift, &num_symbols,
-                                      symbols));
-  SizeWriter writer;
-  // Ignore the correctness, no real encoding happens at this stage.
-  (void)EncodeCounts(counts.data(), alphabet_size, omit_pos, num_symbols, shift,
-                     symbols, &writer);
-  return writer.size +
-         EstimateDataBits(histogram, counts.data(), alphabet_size);
-}
-
-StatusOr<uint32_t> ComputeBestMethod(
-    const ANSHistBin* histogram, size_t alphabet_size, float* cost,
-    HistogramParams::ANSHistogramStrategy ans_histogram_strategy) {
-  uint32_t method = 0;
-  JXL_ASSIGN_OR_RETURN(float fcost,
-                       ComputeHistoAndDataCost(histogram, alphabet_size, 0));
-  auto try_shift = [&](size_t shift) -> Status {
-    JXL_ASSIGN_OR_RETURN(
-        float c, ComputeHistoAndDataCost(histogram, alphabet_size, shift + 1));
-    if (c < fcost) {
-      method = shift + 1;
-      fcost = c;
-    }
-    return true;
-  };
-  switch (ans_histogram_strategy) {
-    case HistogramParams::ANSHistogramStrategy::kPrecise: {
-      for (uint32_t shift = 0; shift <= ANS_LOG_TAB_SIZE; shift++) {
-        JXL_RETURN_IF_ERROR(try_shift(shift));
-      }
-      break;
-    }
-    case HistogramParams::ANSHistogramStrategy::kApproximate: {
-      for (uint32_t shift = 0; shift <= ANS_LOG_TAB_SIZE; shift += 2) {
-        JXL_RETURN_IF_ERROR(try_shift(shift));
-      }
-      break;
-    }
-    case HistogramParams::ANSHistogramStrategy::kFast: {
-      JXL_RETURN_IF_ERROR(try_shift(0));
-      JXL_RETURN_IF_ERROR(try_shift(ANS_LOG_TAB_SIZE / 2));
-      JXL_RETURN_IF_ERROR(try_shift(ANS_LOG_TAB_SIZE));
-      break;
-    }
-  };
-  *cost = fcost;
-  return method;
-}
-
-}  // namespace
-
-// Returns an estimate of the cost of encoding this histogram and the
-// corresponding data.
-StatusOr<size_t> BuildAndStoreANSEncodingData(
-    JxlMemoryManager* memory_manager,
-    HistogramParams::ANSHistogramStrategy ans_histogram_strategy,
-    const ANSHistBin* histogram, size_t alphabet_size, size_t log_alpha_size,
-    bool use_prefix_code, ANSEncSymbolInfo* info, BitWriter* writer) {
-  if (use_prefix_code) {
-    size_t cost = 0;
-    if (alphabet_size <= 1) return 0;
-    std::vector<uint32_t> histo(alphabet_size);
-    for (size_t i = 0; i < alphabet_size; i++) {
-      histo[i] = histogram[i];
-      JXL_ENSURE(histogram[i] >= 0);
-    }
-    {
-      std::vector<uint8_t> depths(alphabet_size);
-      std::vector<uint16_t> bits(alphabet_size);
-      if (writer == nullptr) {
-        BitWriter tmp_writer{memory_manager};
-        JXL_RETURN_IF_ERROR(tmp_writer.WithMaxBits(
-            8 * alphabet_size + 8,  // safe upper bound
-            LayerType::Header, /*aux_out=*/nullptr, [&] {
-              return BuildAndStoreHuffmanTree(histo.data(), alphabet_size,
-                                              depths.data(), bits.data(),
-                                              &tmp_writer);
-            }));
-        cost = tmp_writer.BitsWritten();
-      } else {
-        size_t start = writer->BitsWritten();
-        JXL_RETURN_IF_ERROR(BuildAndStoreHuffmanTree(
-            histo.data(), alphabet_size, depths.data(), bits.data(), writer));
-        cost = writer->BitsWritten() - start;
-      }
-      for (size_t i = 0; i < alphabet_size; i++) {
-        info[i].bits = depths[i] == 0 ? 0 : bits[i];
-        info[i].depth = depths[i];
-      }
-    }
-    // Estimate data cost.
-    for (size_t i = 0; i < alphabet_size; i++) {
-      cost += histogram[i] * info[i].depth;
-    }
-    return cost;
-  }
-  JXL_ENSURE(alphabet_size <= ANS_TAB_SIZE);
-  float fcost;
-  JXL_ASSIGN_OR_RETURN(uint32_t method,
-                       ComputeBestMethod(histogram, alphabet_size, &fcost,
-                                         ans_histogram_strategy));
-  JXL_ENSURE(fcost >= 0);
-  int num_symbols;
-  int symbols[kMaxNumSymbolsForSmallCode] = {};
-  std::vector<ANSHistBin> counts(histogram, histogram + alphabet_size);
-  if (!counts.empty()) {
-    size_t sum = 0;
-    for (int count : counts) {
-      sum += count;
-    }
-    if (sum == 0) {
-      counts[0] = ANS_TAB_SIZE;
-    }
-  }
-  int omit_pos = 0;
-  uint32_t shift = method - 1;
-  if (method == 0) {
-    JXL_ENSURE(alphabet_size > 0);
-    counts = CreateFlatHistogram(alphabet_size, ANS_TAB_SIZE);
-  } else {
-    JXL_RETURN_IF_ERROR(NormalizeCounts(counts.data(), &omit_pos, alphabet_size,
-                                        ANS_LOG_TAB_SIZE, shift, &num_symbols,
-                                        symbols));
-  }
-  AliasTable::Entry a[ANS_MAX_ALPHABET_SIZE];
-  JXL_RETURN_IF_ERROR(
-      InitAliasTable(counts, ANS_LOG_TAB_SIZE, log_alpha_size, a));
-  ANSBuildInfoTable(counts.data(), a, alphabet_size, log_alpha_size, info);
-  if (writer != nullptr) {
-    if (method == 0) {
-      JXL_ENSURE(alphabet_size > 0);
-      EncodeFlatHistogram(alphabet_size, writer);
-    } else {
-      if (!EncodeCounts(counts.data(), alphabet_size, omit_pos, num_symbols,
-                        method - 1, symbols, writer)) {
-        return JXL_FAILURE("EncodeCounts failed");
-      }
-    }
-  }
-  return static_cast<size_t>(fcost);
-}
-
-StatusOr<float> ANSPopulationCost(const ANSHistBin* data,
-                                  size_t alphabet_size) {
-  float cost = 0.0f;
-  if (ANS_MAX_ALPHABET_SIZE < alphabet_size) {
-    return std::numeric_limits<float>::max();
-  }
-  JXL_ASSIGN_OR_RETURN(
-      uint32_t method,
-      ComputeBestMethod(data, alphabet_size, &cost,
-                        HistogramParams::ANSHistogramStrategy::kFast));
-  (void)method;
-  return cost;
-}
-
-template <typename Writer>
-void EncodeUintConfig(const HybridUintConfig uint_config, Writer* writer,
-                      size_t log_alpha_size) {
-  writer->Write(CeilLog2Nonzero(log_alpha_size + 1),
-                uint_config.split_exponent);
-  if (uint_config.split_exponent == log_alpha_size) {
-    return;  // msb/lsb don't matter.
-  }
-  size_t nbits = CeilLog2Nonzero(uint_config.split_exponent + 1);
-  writer->Write(nbits, uint_config.msb_in_token);
-  nbits = CeilLog2Nonzero(uint_config.split_exponent -
-                          uint_config.msb_in_token + 1);
-  writer->Write(nbits, uint_config.lsb_in_token);
-}
-template <typename Writer>
-void EncodeUintConfigs(const std::vector<HybridUintConfig>& uint_config,
-                       Writer* writer, size_t log_alpha_size) {
-  // TODO(veluca): RLE?
-  for (const auto& cfg : uint_config) {
-    EncodeUintConfig(cfg, writer, log_alpha_size);
-  }
-}
-template void EncodeUintConfigs(const std::vector<HybridUintConfig>&,
-                                BitWriter*, size_t);
-
-namespace {
-
-Status ChooseUintConfigs(const HistogramParams& params,
-                         const std::vector<std::vector<Token>>& tokens,
-                         const std::vector<uint8_t>& context_map,
-                         std::vector<Histogram>* clustered_histograms,
-                         EntropyEncodingData* codes, size_t* log_alpha_size) {
-  codes->uint_config.resize(clustered_histograms->size());
-  if (params.uint_method == HistogramParams::HybridUintMethod::kNone) {
-    return true;
-  }
-  if (params.uint_method == HistogramParams::HybridUintMethod::k000) {
-    codes->uint_config.clear();
-    codes->uint_config.resize(clustered_histograms->size(),
-                              HybridUintConfig(0, 0, 0));
-    return true;
-  }
-  if (params.uint_method == HistogramParams::HybridUintMethod::kContextMap) {
-    codes->uint_config.clear();
-    codes->uint_config.resize(clustered_histograms->size(),
-                              HybridUintConfig(2, 0, 1));
-    return true;
-  }
-
-  // If the uint config is adaptive, just stick with the default in streaming
-  // mode.
-  if (params.streaming_mode) {
-    return true;
-  }
-
-  // Brute-force method that tries a few options.
-  std::vector<HybridUintConfig> configs;
-  if (params.uint_method == HistogramParams::HybridUintMethod::kBest) {
-    configs = {
-        HybridUintConfig(4, 2, 0),  // default
-        HybridUintConfig(4, 1, 0),  // less precise
-        HybridUintConfig(4, 2, 1),  // add sign
-        HybridUintConfig(4, 2, 2),  // add sign+parity
-        HybridUintConfig(4, 1, 2),  // add parity but less msb
-        // Same as above, but more direct coding.
-        HybridUintConfig(5, 2, 0), HybridUintConfig(5, 1, 0),
-        HybridUintConfig(5, 2, 1), HybridUintConfig(5, 2, 2),
-        HybridUintConfig(5, 1, 2),
-        // Same as above, but less direct coding.
-        HybridUintConfig(3, 2, 0), HybridUintConfig(3, 1, 0),
-        HybridUintConfig(3, 2, 1), HybridUintConfig(3, 1, 2),
-        // For near-lossless.
-        HybridUintConfig(4, 1, 3), HybridUintConfig(5, 1, 4),
-        HybridUintConfig(5, 2, 3), HybridUintConfig(6, 1, 5),
-        HybridUintConfig(6, 2, 4), HybridUintConfig(6, 0, 0),
-        // Other
-        HybridUintConfig(0, 0, 0),   // varlenuint
-        HybridUintConfig(2, 0, 1),   // works well for ctx map
-        HybridUintConfig(7, 0, 0),   // direct coding
-        HybridUintConfig(8, 0, 0),   // direct coding
-        HybridUintConfig(9, 0, 0),   // direct coding
-        HybridUintConfig(10, 0, 0),  // direct coding
-        HybridUintConfig(11, 0, 0),  // direct coding
-        HybridUintConfig(12, 0, 0),  // direct coding
-    };
-  } else if (params.uint_method == HistogramParams::HybridUintMethod::kFast) {
-    configs = {
-        HybridUintConfig(4, 2, 0),  // default
-        HybridUintConfig(4, 1, 2),  // add parity but less msb
-        HybridUintConfig(0, 0, 0),  // smallest histograms
-        HybridUintConfig(2, 0, 1),  // works well for ctx map
-    };
-  }
-
-  std::vector<float> costs(clustered_histograms->size(),
-                           std::numeric_limits<float>::max());
-  std::vector<uint32_t> extra_bits(clustered_histograms->size());
-  std::vector<uint8_t> is_valid(clustered_histograms->size());
-  size_t max_alpha =
-      codes->use_prefix_code ? PREFIX_MAX_ALPHABET_SIZE : ANS_MAX_ALPHABET_SIZE;
-  for (HybridUintConfig cfg : configs) {
-    std::fill(is_valid.begin(), is_valid.end(), true);
-    std::fill(extra_bits.begin(), extra_bits.end(), 0);
-
-    for (auto& histo : *clustered_histograms) {
-      histo.Clear();
-    }
-    for (const auto& stream : tokens) {
-      for (const auto& token : stream) {
-        // TODO(veluca): do not ignore lz77 commands.
-        if (token.is_lz77_length) continue;
-        size_t histo = context_map[token.context];
-        uint32_t tok, nbits, bits;
-        cfg.Encode(token.value, &tok, &nbits, &bits);
-        if (tok >= max_alpha ||
-            (codes->lz77.enabled && tok >= codes->lz77.min_symbol)) {
-          is_valid[histo] = JXL_FALSE;
-          continue;
-        }
-        extra_bits[histo] += nbits;
-        (*clustered_histograms)[histo].Add(tok);
-      }
-    }
-
-    for (size_t i = 0; i < clustered_histograms->size(); i++) {
-      if (!is_valid[i]) continue;
-      JXL_ASSIGN_OR_RETURN(float cost,
-                           (*clustered_histograms)[i].PopulationCost());
-      cost += extra_bits[i];
-      // add signaling cost of the hybriduintconfig itself
-      cost += CeilLog2Nonzero(cfg.split_exponent + 1);
-      cost += CeilLog2Nonzero(cfg.split_exponent - cfg.msb_in_token + 1);
-      if (cost < costs[i]) {
-        codes->uint_config[i] = cfg;
-        costs[i] = cost;
-      }
-    }
-  }
-
-  // Rebuild histograms.
-  for (auto& histo : *clustered_histograms) {
-    histo.Clear();
-  }
-  *log_alpha_size = 4;
-  for (const auto& stream : tokens) {
-    for (const auto& token : stream) {
-      uint32_t tok, nbits, bits;
-      size_t histo = context_map[token.context];
-      (token.is_lz77_length ? codes->lz77.length_uint_config
-                            : codes->uint_config[histo])
-          .Encode(token.value, &tok, &nbits, &bits);
-      tok += token.is_lz77_length ? codes->lz77.min_symbol : 0;
-      (*clustered_histograms)[histo].Add(tok);
-      while (tok >= (1u << *log_alpha_size)) (*log_alpha_size)++;
-    }
-  }
-  size_t max_log_alpha_size = codes->use_prefix_code ? PREFIX_MAX_BITS : 8;
-  JXL_ENSURE(*log_alpha_size <= max_log_alpha_size);
-  return true;
-}
-
-Histogram HistogramFromSymbolInfo(
-    const std::vector<ANSEncSymbolInfo>& encoding_info, bool use_prefix_code) {
-  Histogram histo;
-  histo.data_.resize(DivCeil(encoding_info.size(), Histogram::kRounding) *
-                     Histogram::kRounding);
-  histo.total_count_ = 0;
-  for (size_t i = 0; i < encoding_info.size(); ++i) {
-    const ANSEncSymbolInfo& info = encoding_info[i];
-    int count = use_prefix_code
-                    ? (info.depth ? (1u << (PREFIX_MAX_BITS - info.depth)) : 0)
-                    : info.freq_;
-    histo.data_[i] = count;
-    histo.total_count_ += count;
-  }
-  return histo;
-}
-
-class HistogramBuilder {
- public:
-  explicit HistogramBuilder(const size_t num_contexts)
-      : histograms_(num_contexts) {}
-
-  void VisitSymbol(int symbol, size_t histo_idx) {
-    JXL_DASSERT(histo_idx < histograms_.size());
-    histograms_[histo_idx].Add(symbol);
-  }
-
-  // NOTE: `layer` is only for clustered_entropy; caller does ReclaimAndCharge.
-  // Returns cost (in bits).
-  StatusOr<size_t> BuildAndStoreEntropyCodes(
-      JxlMemoryManager* memory_manager, const HistogramParams& params,
-      const std::vector<std::vector<Token>>& tokens, EntropyEncodingData* codes,
-      std::vector<uint8_t>* context_map, BitWriter* writer, LayerType layer,
-      AuxOut* aux_out) const {
-    const size_t prev_histograms = codes->encoding_info.size();
-    std::vector<Histogram> clustered_histograms;
-    for (size_t i = 0; i < prev_histograms; ++i) {
-      clustered_histograms.push_back(HistogramFromSymbolInfo(
-          codes->encoding_info[i], codes->use_prefix_code));
-    }
-    size_t context_offset = context_map->size();
-    context_map->resize(context_offset + histograms_.size());
-    if (histograms_.size() > 1) {
-      if (!ans_fuzzer_friendly_) {
-        std::vector<uint32_t> histogram_symbols;
-        JXL_RETURN_IF_ERROR(
-            ClusterHistograms(params, histograms_, kClustersLimit,
-                              &clustered_histograms, &histogram_symbols));
-        for (size_t c = 0; c < histograms_.size(); ++c) {
-          (*context_map)[context_offset + c] =
-              static_cast<uint8_t>(histogram_symbols[c]);
-        }
-      } else {
-        JXL_ENSURE(codes->encoding_info.empty());
-        fill(context_map->begin(), context_map->end(), 0);
-        size_t max_symbol = 0;
-        for (const Histogram& h : histograms_) {
-          max_symbol = std::max(h.data_.size(), max_symbol);
-        }
-        size_t num_symbols = 1 << CeilLog2Nonzero(max_symbol + 1);
-        clustered_histograms.resize(1);
-        clustered_histograms[0].Clear();
-        for (size_t i = 0; i < num_symbols; i++) {
-          clustered_histograms[0].Add(i);
-        }
-      }
-      if (writer != nullptr) {
-        JXL_RETURN_IF_ERROR(EncodeContextMap(
-            *context_map, clustered_histograms.size(), writer, layer, aux_out));
-      }
-    } else {
-      JXL_ENSURE(codes->encoding_info.empty());
-      clustered_histograms.push_back(histograms_[0]);
-    }
-    if (aux_out != nullptr) {
-      for (size_t i = prev_histograms; i < clustered_histograms.size(); ++i) {
-        aux_out->layer(layer).clustered_entropy +=
-            clustered_histograms[i].ShannonEntropy();
-      }
-    }
-    size_t log_alpha_size = codes->lz77.enabled ? 8 : 7;  // Sane default.
-    if (ans_fuzzer_friendly_) {
-      codes->uint_config.clear();
-      codes->uint_config.resize(1, HybridUintConfig(7, 0, 0));
-    } else {
-      JXL_RETURN_IF_ERROR(ChooseUintConfigs(params, tokens, *context_map,
-                                            &clustered_histograms, codes,
-                                            &log_alpha_size));
-    }
-    if (log_alpha_size < 5) log_alpha_size = 5;
-    if (params.streaming_mode) {
-      // TODO(szabadka) Figure out if we can use lower values here.
-      log_alpha_size = 8;
-    }
-    SizeWriter size_writer;  // Used if writer == nullptr to estimate costs.
-    size_t cost = 1;
-    if (writer) writer->Write(1, TO_JXL_BOOL(codes->use_prefix_code));
-
-    if (codes->use_prefix_code) {
-      log_alpha_size = PREFIX_MAX_BITS;
-    } else {
-      cost += 2;
-    }
-    if (writer == nullptr) {
-      EncodeUintConfigs(codes->uint_config, &size_writer, log_alpha_size);
-    } else {
-      if (!codes->use_prefix_code) writer->Write(2, log_alpha_size - 5);
-      EncodeUintConfigs(codes->uint_config, writer, log_alpha_size);
-    }
-    if (codes->use_prefix_code) {
-      for (const auto& histo : clustered_histograms) {
-        size_t alphabet_size = histo.alphabet_size();
-        if (writer) {
-          StoreVarLenUint16(alphabet_size - 1, writer);
-        } else {
-          StoreVarLenUint16(alphabet_size - 1, &size_writer);
-        }
-      }
-    }
-    cost += size_writer.size;
-    for (size_t c = prev_histograms; c < clustered_histograms.size(); ++c) {
-      size_t alphabet_size = clustered_histograms[c].alphabet_size();
-      codes->encoding_info.emplace_back();
-      codes->encoding_info.back().resize(alphabet_size);
-      BitWriter* histo_writer = writer;
-      if (params.streaming_mode) {
-        codes->encoded_histograms.emplace_back(memory_manager);
-        histo_writer = &codes->encoded_histograms.back();
-      }
-      const auto& body = [&]() -> Status {
-        JXL_ASSIGN_OR_RETURN(
-            size_t ans_cost,
-            BuildAndStoreANSEncodingData(
-                memory_manager, params.ans_histogram_strategy,
-                clustered_histograms[c].data_.data(), alphabet_size,
-                log_alpha_size, codes->use_prefix_code,
-                codes->encoding_info.back().data(), histo_writer));
-        cost += ans_cost;
-        return true;
-      };
-      if (histo_writer) {
-        JXL_RETURN_IF_ERROR(histo_writer->WithMaxBits(
-            256 + alphabet_size * 24, layer, aux_out, body,
-            /*finished_histogram=*/true));
-      } else {
-        JXL_RETURN_IF_ERROR(body());
-      }
-      if (params.streaming_mode) {
-        JXL_RETURN_IF_ERROR(writer->AppendUnaligned(*histo_writer));
-      }
-    }
-    return cost;
-  }
-
-  const Histogram& Histo(size_t i) const { return histograms_[i]; }
-
- private:
-  std::vector<Histogram> histograms_;
-};
-
-class SymbolCostEstimator {
- public:
-  SymbolCostEstimator(size_t num_contexts, bool force_huffman,
-                      const std::vector<std::vector<Token>>& tokens,
-                      const LZ77Params& lz77) {
-    HistogramBuilder builder(num_contexts);
-    // Build histograms for estimating lz77 savings.
-    HybridUintConfig uint_config;
-    for (const auto& stream : tokens) {
-      for (const auto& token : stream) {
-        uint32_t tok, nbits, bits;
-        (token.is_lz77_length ? lz77.length_uint_config : uint_config)
-            .Encode(token.value, &tok, &nbits, &bits);
-        tok += token.is_lz77_length ? lz77.min_symbol : 0;
-        builder.VisitSymbol(tok, token.context);
-      }
-    }
-    max_alphabet_size_ = 0;
-    for (size_t i = 0; i < num_contexts; i++) {
-      max_alphabet_size_ =
-          std::max(max_alphabet_size_, builder.Histo(i).data_.size());
-    }
-    bits_.resize(num_contexts * max_alphabet_size_);
-    // TODO(veluca): SIMD?
-    add_symbol_cost_.resize(num_contexts);
-    for (size_t i = 0; i < num_contexts; i++) {
-      float inv_total = 1.0f / (builder.Histo(i).total_count_ + 1e-8f);
-      float total_cost = 0;
-      for (size_t j = 0; j < builder.Histo(i).data_.size(); j++) {
-        size_t cnt = builder.Histo(i).data_[j];
-        float cost = 0;
-        if (cnt != 0 && cnt != builder.Histo(i).total_count_) {
-          cost = -FastLog2f(cnt * inv_total);
-          if (force_huffman) cost = std::ceil(cost);
-        } else if (cnt == 0) {
-          cost = ANS_LOG_TAB_SIZE;  // Highest possible cost.
-        }
-        bits_[i * max_alphabet_size_ + j] = cost;
-        total_cost += cost * builder.Histo(i).data_[j];
-      }
-      // Penalty for adding a lz77 symbol to this contest (only used for static
-      // cost model). Higher penalty for contexts that have a very low
-      // per-symbol entropy.
-      add_symbol_cost_[i] = std::max(0.0f, 6.0f - total_cost * inv_total);
-    }
-  }
-  float Bits(size_t ctx, size_t sym) const {
-    return bits_[ctx * max_alphabet_size_ + sym];
-  }
-  float LenCost(size_t ctx, size_t len, const LZ77Params& lz77) const {
-    uint32_t nbits, bits, tok;
-    lz77.length_uint_config.Encode(len, &tok, &nbits, &bits);
-    tok += lz77.min_symbol;
-    return nbits + Bits(ctx, tok);
-  }
-  float DistCost(size_t len, const LZ77Params& lz77) const {
-    uint32_t nbits, bits, tok;
-    HybridUintConfig().Encode(len, &tok, &nbits, &bits);
-    return nbits + Bits(lz77.nonserialized_distance_context, tok);
-  }
-  float AddSymbolCost(size_t idx) const { return add_symbol_cost_[idx]; }
-
- private:
-  size_t max_alphabet_size_;
-  std::vector<float> bits_;
-  std::vector<float> add_symbol_cost_;
-};
-
-void ApplyLZ77_RLE(const HistogramParams& params, size_t num_contexts,
-                   const std::vector<std::vector<Token>>& tokens,
-                   LZ77Params& lz77,
-                   std::vector<std::vector<Token>>& tokens_lz77) {
-  // TODO(veluca): tune heuristics here.
-  SymbolCostEstimator sce(num_contexts, params.force_huffman, tokens, lz77);
-  float bit_decrease = 0;
-  size_t total_symbols = 0;
-  tokens_lz77.resize(tokens.size());
-  std::vector<float> sym_cost;
-  HybridUintConfig uint_config;
-  for (size_t stream = 0; stream < tokens.size(); stream++) {
-    size_t distance_multiplier =
-        params.image_widths.size() > stream ? params.image_widths[stream] : 0;
-    const auto& in = tokens[stream];
-    auto& out = tokens_lz77[stream];
-    total_symbols += in.size();
-    // Cumulative sum of bit costs.
-    sym_cost.resize(in.size() + 1);
-    for (size_t i = 0; i < in.size(); i++) {
-      uint32_t tok, nbits, unused_bits;
-      uint_config.Encode(in[i].value, &tok, &nbits, &unused_bits);
-      sym_cost[i + 1] = sce.Bits(in[i].context, tok) + nbits + sym_cost[i];
-    }
-    out.reserve(in.size());
-    for (size_t i = 0; i < in.size(); i++) {
-      size_t num_to_copy = 0;
-      size_t distance_symbol = 0;  // 1 for RLE.
-      if (distance_multiplier != 0) {
-        distance_symbol = 1;  // Special distance 1 if enabled.
-        JXL_DASSERT(kSpecialDistances[1][0] == 1);
-        JXL_DASSERT(kSpecialDistances[1][1] == 0);
-      }
-      if (i > 0) {
-        for (; i + num_to_copy < in.size(); num_to_copy++) {
-          if (in[i + num_to_copy].value != in[i - 1].value) {
-            break;
-          }
-        }
-      }
-      if (num_to_copy == 0) {
-        out.push_back(in[i]);
-        continue;
-      }
-      float cost = sym_cost[i + num_to_copy] - sym_cost[i];
-      // This subtraction might overflow, but that's OK.
-      size_t lz77_len = num_to_copy - lz77.min_length;
-      float lz77_cost = num_to_copy >= lz77.min_length
-                            ? CeilLog2Nonzero(lz77_len + 1) + 1
-                            : 0;
-      if (num_to_copy < lz77.min_length || cost <= lz77_cost) {
-        for (size_t j = 0; j < num_to_copy; j++) {
-          out.push_back(in[i + j]);
-        }
-        i += num_to_copy - 1;
-        continue;
-      }
-      // Output the LZ77 length
-      out.emplace_back(in[i].context, lz77_len);
-      out.back().is_lz77_length = true;
-      i += num_to_copy - 1;
-      bit_decrease += cost - lz77_cost;
-      // Output the LZ77 copy distance.
-      out.emplace_back(lz77.nonserialized_distance_context, distance_symbol);
-    }
-  }
-
-  if (bit_decrease > total_symbols * 0.2 + 16) {
-    lz77.enabled = true;
-  }
-}
-
-// Hash chain for LZ77 matching
-struct HashChain {
-  size_t size_;
-  std::vector<uint32_t> data_;
-
-  unsigned hash_num_values_ = 32768;
-  unsigned hash_mask_ = hash_num_values_ - 1;
-  unsigned hash_shift_ = 5;
-
-  std::vector<int> head;
-  std::vector<uint32_t> chain;
-  std::vector<int> val;
-
-  // Speed up repetitions of zero
-  std::vector<int> headz;
-  std::vector<uint32_t> chainz;
-  std::vector<uint32_t> zeros;
-  uint32_t numzeros = 0;
-
-  size_t window_size_;
-  size_t window_mask_;
-  size_t min_length_;
-  size_t max_length_;
-
-  // Map of special distance codes.
-  std::unordered_map<int, int> special_dist_table_;
-  size_t num_special_distances_ = 0;
-
-  uint32_t maxchainlength = 256;  // window_size_ to allow all
-
-  HashChain(const Token* data, size_t size, size_t window_size,
-            size_t min_length, size_t max_length, size_t distance_multiplier)
-      : size_(size),
-        window_size_(window_size),
-        window_mask_(window_size - 1),
-        min_length_(min_length),
-        max_length_(max_length) {
-    data_.resize(size);
-    for (size_t i = 0; i < size; i++) {
-      data_[i] = data[i].value;
-    }
-
-    head.resize(hash_num_values_, -1);
-    val.resize(window_size_, -1);
-    chain.resize(window_size_);
-    for (uint32_t i = 0; i < window_size_; ++i) {
-      chain[i] = i;  // same value as index indicates uninitialized
-    }
-
-    zeros.resize(window_size_);
-    headz.resize(window_size_ + 1, -1);
-    chainz.resize(window_size_);
-    for (uint32_t i = 0; i < window_size_; ++i) {
-      chainz[i] = i;
-    }
-    // Translate distance to special distance code.
-    if (distance_multiplier) {
-      // Count down, so if due to small distance multiplier multiple distances
-      // map to the same code, the smallest code will be used in the end.
-      for (int i = kNumSpecialDistances - 1; i >= 0; --i) {
-        special_dist_table_[SpecialDistance(i, distance_multiplier)] = i;
-      }
-      num_special_distances_ = kNumSpecialDistances;
-    }
-  }
-
-  uint32_t GetHash(size_t pos) const {
-    uint32_t result = 0;
-    if (pos + 2 < size_) {
-      // TODO(lode): take the MSB's of the uint32_t values into account as well,
-      // given that the hash code itself is less than 32 bits.
-      result ^= static_cast<uint32_t>(data_[pos + 0] << 0u);
-      result ^= static_cast<uint32_t>(data_[pos + 1] << hash_shift_);
-      result ^= static_cast<uint32_t>(data_[pos + 2] << (hash_shift_ * 2));
-    } else {
-      // No need to compute hash of last 2 bytes, the length 2 is too short.
-      return 0;
-    }
-    return result & hash_mask_;
-  }
-
-  uint32_t CountZeros(size_t pos, uint32_t prevzeros) const {
-    size_t end = pos + window_size_;
-    if (end > size_) end = size_;
-    if (prevzeros > 0) {
-      if (prevzeros >= window_mask_ && data_[end - 1] == 0 &&
-          end == pos + window_size_) {
-        return prevzeros;
-      } else {
-        return prevzeros - 1;
-      }
-    }
-    uint32_t num = 0;
-    while (pos + num < end && data_[pos + num] == 0) num++;
-    return num;
-  }
-
-  void Update(size_t pos) {
-    uint32_t hashval = GetHash(pos);
-    uint32_t wpos = pos & window_mask_;
-
-    val[wpos] = static_cast<int>(hashval);
-    if (head[hashval] != -1) chain[wpos] = head[hashval];
-    head[hashval] = wpos;
-
-    if (pos > 0 && data_[pos] != data_[pos - 1]) numzeros = 0;
-    numzeros = CountZeros(pos, numzeros);
-
-    zeros[wpos] = numzeros;
-    if (headz[numzeros] != -1) chainz[wpos] = headz[numzeros];
-    headz[numzeros] = wpos;
-  }
-
-  void Update(size_t pos, size_t len) {
-    for (size_t i = 0; i < len; i++) {
-      Update(pos + i);
-    }
-  }
-
-  template <typename CB>
-  void FindMatches(size_t pos, int max_dist, const CB& found_match) const {
-    uint32_t wpos = pos & window_mask_;
-    uint32_t hashval = GetHash(pos);
-    uint32_t hashpos = chain[wpos];
-
-    int prev_dist = 0;
-    int end = std::min<int>(pos + max_length_, size_);
-    uint32_t chainlength = 0;
-    uint32_t best_len = 0;
-    for (;;) {
-      int dist = (hashpos <= wpos) ? (wpos - hashpos)
-                                   : (wpos - hashpos + window_mask_ + 1);
-      if (dist < prev_dist) break;
-      prev_dist = dist;
-      uint32_t len = 0;
-      if (dist > 0) {
-        int i = pos;
-        int j = pos - dist;
-        if (numzeros > 3) {
-          int r = std::min<int>(numzeros - 1, zeros[hashpos]);
-          if (i + r >= end) r = end - i - 1;
-          i += r;
-          j += r;
-        }
-        while (i < end && data_[i] == data_[j]) {
-          i++;
-          j++;
-        }
-        len = i - pos;
-        // This can trigger even if the new length is slightly smaller than the
-        // best length, because it is possible for a slightly cheaper distance
-        // symbol to occur.
-        if (len >= min_length_ && len + 2 >= best_len) {
-          auto it = special_dist_table_.find(dist);
-          int dist_symbol = (it == special_dist_table_.end())
-                                ? (num_special_distances_ + dist - 1)
-                                : it->second;
-          found_match(len, dist_symbol);
-          if (len > best_len) best_len = len;
-        }
-      }
-
-      chainlength++;
-      if (chainlength >= maxchainlength) break;
-
-      if (numzeros >= 3 && len > numzeros) {
-        if (hashpos == chainz[hashpos]) break;
-        hashpos = chainz[hashpos];
-        if (zeros[hashpos] != numzeros) break;
-      } else {
-        if (hashpos == chain[hashpos]) break;
-        hashpos = chain[hashpos];
-        if (val[hashpos] != static_cast<int>(hashval)) {
-          // outdated hash value
-          break;
-        }
-      }
-    }
-  }
-  void FindMatch(size_t pos, int max_dist, size_t* result_dist_symbol,
-                 size_t* result_len) const {
-    *result_dist_symbol = 0;
-    *result_len = 1;
-    FindMatches(pos, max_dist, [&](size_t len, size_t dist_symbol) {
-      if (len > *result_len ||
-          (len == *result_len && *result_dist_symbol > dist_symbol)) {
-        *result_len = len;
-        *result_dist_symbol = dist_symbol;
-      }
-    });
-  }
-};
-
-float LenCost(size_t len) {
-  uint32_t nbits, bits, tok;
-  HybridUintConfig(1, 0, 0).Encode(len, &tok, &nbits, &bits);
-  constexpr float kCostTable[] = {
-      2.797667318563126,  3.213177690381199,  2.5706009246743737,
-      2.408392498667534,  2.829649191872326,  3.3923087753324577,
-      4.029267451554331,  4.415576699706408,  4.509357574741465,
-      9.21481543803004,   10.020590190114898, 11.858671627804766,
-      12.45853300490526,  11.713105831990857, 12.561996324849314,
-      13.775477692278367, 13.174027068768641,
-  };
-  size_t table_size = sizeof kCostTable / sizeof *kCostTable;
-  if (tok >= table_size) tok = table_size - 1;
-  return kCostTable[tok] + nbits;
-}
-
-// TODO(veluca): this does not take into account usage or non-usage of distance
-// multipliers.
-float DistCost(size_t dist) {
-  uint32_t nbits, bits, tok;
-  HybridUintConfig(7, 0, 0).Encode(dist, &tok, &nbits, &bits);
-  constexpr float kCostTable[] = {
-      6.368282626312716,  5.680793277090298,  8.347404197105247,
-      7.641619201599141,  6.914328374119438,  7.959808291537444,
-      8.70023120759855,   8.71378518934703,   9.379132523982769,
-      9.110472749092708,  9.159029569270908,  9.430936766731973,
-      7.278284055315169,  7.8278514904267755, 10.026641158289236,
-      9.976049229827066,  9.64351607048908,   9.563403863480442,
-      10.171474111762747, 10.45950155077234,  9.994813912104219,
-      10.322524683741156, 8.465808729388186,  8.756254166066853,
-      10.160930174662234, 10.247329273413435, 10.04090403724809,
-      10.129398517544082, 9.342311691539546,  9.07608009102374,
-      10.104799540677513, 10.378079384990906, 10.165828974075072,
-      10.337595322341553, 7.940557464567944,  10.575665823319431,
-      11.023344321751955, 10.736144698831827, 11.118277044595054,
-      7.468468230648442,  10.738305230932939, 10.906980780216568,
-      10.163468216353817, 10.17805759656433,  11.167283670483565,
-      11.147050200274544, 10.517921919244333, 10.651764778156886,
-      10.17074446448919,  11.217636876224745, 11.261630721139484,
-      11.403140815247259, 10.892472096873417, 11.1859607804481,
-      8.017346947551262,  7.895143720278828,  11.036577113822025,
-      11.170562110315794, 10.326988722591086, 10.40872184751056,
-      11.213498225466386, 11.30580635516863,  10.672272515665442,
-      10.768069466228063, 11.145257364153565, 11.64668307145549,
-      10.593156194627339, 11.207499484844943, 10.767517766396908,
-      10.826629811407042, 10.737764794499988, 10.6200448518045,
-      10.191315385198092, 8.468384171390085,  11.731295299170432,
-      11.824619886654398, 10.41518844301179,  10.16310536548649,
-      10.539423685097576, 10.495136599328031, 10.469112847728267,
-      11.72057686174922,  10.910326337834674, 11.378921834673758,
-      11.847759036098536, 11.92071647623854,  10.810628276345282,
-      11.008601085273893, 11.910326337834674, 11.949212023423133,
-      11.298614839104337, 11.611603659010392, 10.472930394619985,
-      11.835564720850282, 11.523267392285337, 12.01055816679611,
-      8.413029688994023,  11.895784139536406, 11.984679534970505,
-      11.220654278717394, 11.716311684833672, 10.61036646226114,
-      10.89849965960364,  10.203762898863669, 10.997560826267238,
-      11.484217379438984, 11.792836176993665, 12.24310468755171,
-      11.464858097919262, 12.212747017409377, 11.425595666074955,
-      11.572048533398757, 12.742093965163013, 11.381874288645637,
-      12.191870445817015, 11.683156920035426, 11.152442115262197,
-      11.90303691580457,  11.653292787169159, 11.938615382266098,
-      16.970641701570223, 16.853602280380002, 17.26240782594733,
-      16.644655390108507, 17.14310889757499,  16.910935455445955,
-      17.505678976959697, 17.213498225466388, 2.4162310293553024,
-      3.494587244462329,  3.5258600986408344, 3.4959806589517095,
-      3.098390886949687,  3.343454654302911,  3.588847442290287,
-      4.14614790111827,   5.152948641990529,  7.433696808092598,
-      9.716311684833672,
-  };
-  size_t table_size = sizeof kCostTable / sizeof *kCostTable;
-  if (tok >= table_size) tok = table_size - 1;
-  return kCostTable[tok] + nbits;
-}
-
-void ApplyLZ77_LZ77(const HistogramParams& params, size_t num_contexts,
-                    const std::vector<std::vector<Token>>& tokens,
-                    LZ77Params& lz77,
-                    std::vector<std::vector<Token>>& tokens_lz77) {
-  // TODO(veluca): tune heuristics here.
-  SymbolCostEstimator sce(num_contexts, params.force_huffman, tokens, lz77);
-  float bit_decrease = 0;
-  size_t total_symbols = 0;
-  tokens_lz77.resize(tokens.size());
-  HybridUintConfig uint_config;
-  std::vector<float> sym_cost;
-  for (size_t stream = 0; stream < tokens.size(); stream++) {
-    size_t distance_multiplier =
-        params.image_widths.size() > stream ? params.image_widths[stream] : 0;
-    const auto& in = tokens[stream];
-    auto& out = tokens_lz77[stream];
-    total_symbols += in.size();
-    // Cumulative sum of bit costs.
-    sym_cost.resize(in.size() + 1);
-    for (size_t i = 0; i < in.size(); i++) {
-      uint32_t tok, nbits, unused_bits;
-      uint_config.Encode(in[i].value, &tok, &nbits, &unused_bits);
-      sym_cost[i + 1] = sce.Bits(in[i].context, tok) + nbits + sym_cost[i];
-    }
-
-    out.reserve(in.size());
-    size_t max_distance = in.size();
-    size_t min_length = lz77.min_length;
-    JXL_DASSERT(min_length >= 3);
-    size_t max_length = in.size();
-
-    // Use next power of two as window size.
-    size_t window_size = 1;
-    while (window_size < max_distance && window_size < kWindowSize) {
-      window_size <<= 1;
-    }
-
-    HashChain chain(in.data(), in.size(), window_size, min_length, max_length,
-                    distance_multiplier);
-    size_t len;
-    size_t dist_symbol;
-
-    const size_t max_lazy_match_len = 256;  // 0 to disable lazy matching
-
-    // Whether the next symbol was already updated (to test lazy matching)
-    bool already_updated = false;
-    for (size_t i = 0; i < in.size(); i++) {
-      out.push_back(in[i]);
-      if (!already_updated) chain.Update(i);
-      already_updated = false;
-      chain.FindMatch(i, max_distance, &dist_symbol, &len);
-      if (len >= min_length) {
-        if (len < max_lazy_match_len && i + 1 < in.size()) {
-          // Try length at next symbol lazy matching
-          chain.Update(i + 1);
-          already_updated = true;
-          size_t len2, dist_symbol2;
-          chain.FindMatch(i + 1, max_distance, &dist_symbol2, &len2);
-          if (len2 > len) {
-            // Use the lazy match. Add literal, and use the next length starting
-            // from the next byte.
-            ++i;
-            already_updated = false;
-            len = len2;
-            dist_symbol = dist_symbol2;
-            out.push_back(in[i]);
-          }
-        }
-
-        float cost = sym_cost[i + len] - sym_cost[i];
-        size_t lz77_len = len - lz77.min_length;
-        float lz77_cost = LenCost(lz77_len) + DistCost(dist_symbol) +
-                          sce.AddSymbolCost(out.back().context);
-
-        if (lz77_cost <= cost) {
-          out.back().value = len - min_length;
-          out.back().is_lz77_length = true;
-          out.emplace_back(lz77.nonserialized_distance_context, dist_symbol);
-          bit_decrease += cost - lz77_cost;
-        } else {
-          // LZ77 match ignored, and symbol already pushed. Push all other
-          // symbols and skip.
-          for (size_t j = 1; j < len; j++) {
-            out.push_back(in[i + j]);
-          }
-        }
-
-        if (already_updated) {
-          chain.Update(i + 2, len - 2);
-          already_updated = false;
-        } else {
-          chain.Update(i + 1, len - 1);
-        }
-        i += len - 1;
-      } else {
-        // Literal, already pushed
-      }
-    }
-  }
-
-  if (bit_decrease > total_symbols * 0.2 + 16) {
-    lz77.enabled = true;
-  }
-}
-
-void ApplyLZ77_Optimal(const HistogramParams& params, size_t num_contexts,
-                       const std::vector<std::vector<Token>>& tokens,
-                       LZ77Params& lz77,
-                       std::vector<std::vector<Token>>& tokens_lz77) {
-  std::vector<std::vector<Token>> tokens_for_cost_estimate;
-  ApplyLZ77_LZ77(params, num_contexts, tokens, lz77, tokens_for_cost_estimate);
-  // If greedy-LZ77 does not give better compression than no-lz77, no reason to
-  // run the optimal matching.
-  if (!lz77.enabled) return;
-  SymbolCostEstimator sce(num_contexts + 1, params.force_huffman,
-                          tokens_for_cost_estimate, lz77);
-  tokens_lz77.resize(tokens.size());
-  HybridUintConfig uint_config;
-  std::vector<float> sym_cost;
-  std::vector<uint32_t> dist_symbols;
-  for (size_t stream = 0; stream < tokens.size(); stream++) {
-    size_t distance_multiplier =
-        params.image_widths.size() > stream ? params.image_widths[stream] : 0;
-    const auto& in = tokens[stream];
-    auto& out = tokens_lz77[stream];
-    // Cumulative sum of bit costs.
-    sym_cost.resize(in.size() + 1);
-    for (size_t i = 0; i < in.size(); i++) {
-      uint32_t tok, nbits, unused_bits;
-      uint_config.Encode(in[i].value, &tok, &nbits, &unused_bits);
-      sym_cost[i + 1] = sce.Bits(in[i].context, tok) + nbits + sym_cost[i];
-    }
-
-    out.reserve(in.size());
-    size_t max_distance = in.size();
-    size_t min_length = lz77.min_length;
-    JXL_DASSERT(min_length >= 3);
-    size_t max_length = in.size();
-
-    // Use next power of two as window size.
-    size_t window_size = 1;
-    while (window_size < max_distance && window_size < kWindowSize) {
-      window_size <<= 1;
-    }
-
-    HashChain chain(in.data(), in.size(), window_size, min_length, max_length,
-                    distance_multiplier);
-
-    struct MatchInfo {
-      uint32_t len;
-      uint32_t dist_symbol;
-      uint32_t ctx;
-      float total_cost = std::numeric_limits<float>::max();
-    };
-    // Total cost to encode the first N symbols.
-    std::vector<MatchInfo> prefix_costs(in.size() + 1);
-    prefix_costs[0].total_cost = 0;
-
-    size_t rle_length = 0;
-    size_t skip_lz77 = 0;
-    for (size_t i = 0; i < in.size(); i++) {
-      chain.Update(i);
-      float lit_cost =
-          prefix_costs[i].total_cost + sym_cost[i + 1] - sym_cost[i];
-      if (prefix_costs[i + 1].total_cost > lit_cost) {
-        prefix_costs[i + 1].dist_symbol = 0;
-        prefix_costs[i + 1].len = 1;
-        prefix_costs[i + 1].ctx = in[i].context;
-        prefix_costs[i + 1].total_cost = lit_cost;
-      }
-      if (skip_lz77 > 0) {
-        skip_lz77--;
-        continue;
-      }
-      dist_symbols.clear();
-      chain.FindMatches(i, max_distance,
-                        [&dist_symbols](size_t len, size_t dist_symbol) {
-                          if (dist_symbols.size() <= len) {
-                            dist_symbols.resize(len + 1, dist_symbol);
-                          }
-                          if (dist_symbol < dist_symbols[len]) {
-                            dist_symbols[len] = dist_symbol;
-                          }
-                        });
-      if (dist_symbols.size() <= min_length) continue;
-      {
-        size_t best_cost = dist_symbols.back();
-        for (size_t j = dist_symbols.size() - 1; j >= min_length; j--) {
-          if (dist_symbols[j] < best_cost) {
-            best_cost = dist_symbols[j];
-          }
-          dist_symbols[j] = best_cost;
-        }
-      }
-      for (size_t j = min_length; j < dist_symbols.size(); j++) {
-        // Cost model that uses results from lazy LZ77.
-        float lz77_cost = sce.LenCost(in[i].context, j - min_length, lz77) +
-                          sce.DistCost(dist_symbols[j], lz77);
-        float cost = prefix_costs[i].total_cost + lz77_cost;
-        if (prefix_costs[i + j].total_cost > cost) {
-          prefix_costs[i + j].len = j;
-          prefix_costs[i + j].dist_symbol = dist_symbols[j] + 1;
-          prefix_costs[i + j].ctx = in[i].context;
-          prefix_costs[i + j].total_cost = cost;
-        }
-      }
-      // We are in a RLE sequence: skip all the symbols except the first 8 and
-      // the last 8. This avoid quadratic costs for sequences with long runs of
-      // the same symbol.
-      if ((dist_symbols.back() == 0 && distance_multiplier == 0) ||
-          (dist_symbols.back() == 1 && distance_multiplier != 0)) {
-        rle_length++;
-      } else {
-        rle_length = 0;
-      }
-      if (rle_length >= 8 && dist_symbols.size() > 9) {
-        skip_lz77 = dist_symbols.size() - 10;
-        rle_length = 0;
-      }
-    }
-    size_t pos = in.size();
-    while (pos > 0) {
-      bool is_lz77_length = prefix_costs[pos].dist_symbol != 0;
-      if (is_lz77_length) {
-        size_t dist_symbol = prefix_costs[pos].dist_symbol - 1;
-        out.emplace_back(lz77.nonserialized_distance_context, dist_symbol);
-      }
-      size_t val = is_lz77_length ? prefix_costs[pos].len - min_length
-                                  : in[pos - 1].value;
-      out.emplace_back(prefix_costs[pos].ctx, val);
-      out.back().is_lz77_length = is_lz77_length;
-      pos -= prefix_costs[pos].len;
-    }
-    std::reverse(out.begin(), out.end());
-  }
-}
-
-void ApplyLZ77(const HistogramParams& params, size_t num_contexts,
-               const std::vector<std::vector<Token>>& tokens, LZ77Params& lz77,
-               std::vector<std::vector<Token>>& tokens_lz77) {
-  if (params.initialize_global_state) {
-    lz77.enabled = false;
-  }
-  if (params.force_huffman) {
-    lz77.min_symbol = std::min(PREFIX_MAX_ALPHABET_SIZE - 32, 512);
-  } else {
-    lz77.min_symbol = 224;
-  }
-  switch (params.lz77_method) {
-    case HistogramParams::LZ77Method::kNone:
-      return;
-    case HistogramParams::LZ77Method::kRLE:
-      ApplyLZ77_RLE(params, num_contexts, tokens, lz77, tokens_lz77);
-      return;
-    case HistogramParams::LZ77Method::kLZ77:
-      ApplyLZ77_LZ77(params, num_contexts, tokens, lz77, tokens_lz77);
-      return;
-    case HistogramParams::LZ77Method::kOptimal:
-      ApplyLZ77_Optimal(params, num_contexts, tokens, lz77, tokens_lz77);
-      return;
-  }
-}
-}  // namespace
-
-Status EncodeHistograms(const std::vector<uint8_t>& context_map,
-                        const EntropyEncodingData& codes, BitWriter* writer,
-                        LayerType layer, AuxOut* aux_out) {
-  return writer->WithMaxBits(
-      128 + kClustersLimit * 136, layer, aux_out,
-      [&]() -> Status {
-        JXL_RETURN_IF_ERROR(Bundle::Write(codes.lz77, writer, layer, aux_out));
-        if (codes.lz77.enabled) {
-          EncodeUintConfig(codes.lz77.length_uint_config, writer,
-                           /*log_alpha_size=*/8);
-        }
-        JXL_RETURN_IF_ERROR(EncodeContextMap(
-            context_map, codes.encoding_info.size(), writer, layer, aux_out));
-        writer->Write(1, TO_JXL_BOOL(codes.use_prefix_code));
-        size_t log_alpha_size = 8;
-        if (codes.use_prefix_code) {
-          log_alpha_size = PREFIX_MAX_BITS;
-        } else {
-          log_alpha_size = 8;  // streaming_mode
-          writer->Write(2, log_alpha_size - 5);
-        }
-        EncodeUintConfigs(codes.uint_config, writer, log_alpha_size);
-        if (codes.use_prefix_code) {
-          for (const auto& info : codes.encoding_info) {
-            StoreVarLenUint16(info.size() - 1, writer);
-          }
-        }
-        for (const auto& histo_writer : codes.encoded_histograms) {
-          JXL_RETURN_IF_ERROR(writer->AppendUnaligned(histo_writer));
-        }
-        return true;
-      },
-      /*finished_histogram=*/true);
-}
-
-StatusOr<size_t> BuildAndEncodeHistograms(
-    JxlMemoryManager* memory_manager, const HistogramParams& params,
-    size_t num_contexts, std::vector<std::vector<Token>>& tokens,
-    EntropyEncodingData* codes, std::vector<uint8_t>* context_map,
-    BitWriter* writer, LayerType layer, AuxOut* aux_out) {
-  size_t cost = 0;
-  codes->lz77.nonserialized_distance_context = num_contexts;
-  std::vector<std::vector<Token>> tokens_lz77;
-  ApplyLZ77(params, num_contexts, tokens, codes->lz77, tokens_lz77);
-  if (ans_fuzzer_friendly_) {
-    codes->lz77.length_uint_config = HybridUintConfig(10, 0, 0);
-    codes->lz77.min_symbol = 2048;
-  }
-
-  const size_t max_contexts = std::min(num_contexts, kClustersLimit);
-  const auto& body = [&]() -> Status {
-    if (writer) {
-      JXL_RETURN_IF_ERROR(Bundle::Write(codes->lz77, writer, layer, aux_out));
-    } else {
-      size_t ebits, bits;
-      JXL_RETURN_IF_ERROR(Bundle::CanEncode(codes->lz77, &ebits, &bits));
-      cost += bits;
-    }
-    if (codes->lz77.enabled) {
-      if (writer) {
-        size_t b = writer->BitsWritten();
-        EncodeUintConfig(codes->lz77.length_uint_config, writer,
-                         /*log_alpha_size=*/8);
-        cost += writer->BitsWritten() - b;
-      } else {
-        SizeWriter size_writer;
-        EncodeUintConfig(codes->lz77.length_uint_config, &size_writer,
-                         /*log_alpha_size=*/8);
-        cost += size_writer.size;
-      }
-      num_contexts += 1;
-      tokens = std::move(tokens_lz77);
-    }
-    size_t total_tokens = 0;
-    // Build histograms.
-    HistogramBuilder builder(num_contexts);
-    HybridUintConfig uint_config;  //  Default config for clustering.
-    // Unless we are using the kContextMap histogram option.
-    if (params.uint_method == HistogramParams::HybridUintMethod::kContextMap) {
-      uint_config = HybridUintConfig(2, 0, 1);
-    }
-    if (params.uint_method == HistogramParams::HybridUintMethod::k000) {
-      uint_config = HybridUintConfig(0, 0, 0);
-    }
-    if (ans_fuzzer_friendly_) {
-      uint_config = HybridUintConfig(10, 0, 0);
-    }
-    for (const auto& stream : tokens) {
-      if (codes->lz77.enabled) {
-        for (const auto& token : stream) {
-          total_tokens++;
-          uint32_t tok, nbits, bits;
-          (token.is_lz77_length ? codes->lz77.length_uint_config : uint_config)
-              .Encode(token.value, &tok, &nbits, &bits);
-          tok += token.is_lz77_length ? codes->lz77.min_symbol : 0;
-          builder.VisitSymbol(tok, token.context);
-        }
-      } else if (num_contexts == 1) {
-        for (const auto& token : stream) {
-          total_tokens++;
-          uint32_t tok, nbits, bits;
-          uint_config.Encode(token.value, &tok, &nbits, &bits);
-          builder.VisitSymbol(tok, /*token.context=*/0);
-        }
-      } else {
-        for (const auto& token : stream) {
-          total_tokens++;
-          uint32_t tok, nbits, bits;
-          uint_config.Encode(token.value, &tok, &nbits, &bits);
-          builder.VisitSymbol(tok, token.context);
-        }
-      }
-    }
-
-    if (params.add_missing_symbols) {
-      for (size_t c = 0; c < num_contexts; ++c) {
-        for (int symbol = 0; symbol < ANS_MAX_ALPHABET_SIZE; ++symbol) {
-          builder.VisitSymbol(symbol, c);
-        }
-      }
-    }
-
-    if (params.initialize_global_state) {
-      bool use_prefix_code =
-          params.force_huffman || total_tokens < 100 ||
-          params.clustering == HistogramParams::ClusteringType::kFastest ||
-          ans_fuzzer_friendly_;
-      if (!use_prefix_code) {
-        bool all_singleton = true;
-        for (size_t i = 0; i < num_contexts; i++) {
-          if (builder.Histo(i).ShannonEntropy() >= 1e-5) {
-            all_singleton = false;
-          }
-        }
-        if (all_singleton) {
-          use_prefix_code = true;
-        }
-      }
-      codes->use_prefix_code = use_prefix_code;
-    }
-
-    if (params.add_fixed_histograms) {
-      // TODO(szabadka) Add more fixed histograms.
-      // TODO(szabadka) Reduce alphabet size by choosing a non-default
-      // uint_config.
-      const size_t alphabet_size = ANS_MAX_ALPHABET_SIZE;
-      const size_t log_alpha_size = 8;
-      JXL_ENSURE(alphabet_size == 1u << log_alpha_size);
-      static_assert(ANS_MAX_ALPHABET_SIZE <= ANS_TAB_SIZE);
-      std::vector<int32_t> counts =
-          CreateFlatHistogram(alphabet_size, ANS_TAB_SIZE);
-      codes->encoding_info.emplace_back();
-      codes->encoding_info.back().resize(alphabet_size);
-      codes->encoded_histograms.emplace_back(memory_manager);
-      BitWriter* histo_writer = &codes->encoded_histograms.back();
-      JXL_RETURN_IF_ERROR(histo_writer->WithMaxBits(
-          256 + alphabet_size * 24, LayerType::Header, nullptr,
-          [&]() -> Status {
-            JXL_ASSIGN_OR_RETURN(
-                size_t ans_cost,
-                BuildAndStoreANSEncodingData(
-                    memory_manager, params.ans_histogram_strategy,
-                    counts.data(), alphabet_size, log_alpha_size,
-                    codes->use_prefix_code, codes->encoding_info.back().data(),
-                    histo_writer));
-            (void)ans_cost;
-            return true;
-          }));
-    }
-
-    // Encode histograms.
-    JXL_ASSIGN_OR_RETURN(
-        size_t entropy_bits,
-        builder.BuildAndStoreEntropyCodes(memory_manager, params, tokens, codes,
-                                          context_map, writer, layer, aux_out));
-    cost += entropy_bits;
-    return true;
-  };
-  if (writer) {
-    JXL_RETURN_IF_ERROR(writer->WithMaxBits(
-        128 + num_contexts * 40 + max_contexts * 96, layer, aux_out, body,
-        /*finished_histogram=*/true));
-  } else {
-    JXL_RETURN_IF_ERROR(body());
-  }
-
-  if (aux_out != nullptr) {
-    aux_out->layer(layer).num_clustered_histograms +=
-        codes->encoding_info.size();
-  }
-  return cost;
-}
-
-size_t WriteTokens(const std::vector<Token>& tokens,
-                   const EntropyEncodingData& codes,
-                   const std::vector<uint8_t>& context_map,
-                   size_t context_offset, BitWriter* writer) {
-  size_t num_extra_bits = 0;
-  if (codes.use_prefix_code) {
-    for (const auto& token : tokens) {
-      uint32_t tok, nbits, bits;
-      size_t histo = context_map[context_offset + token.context];
-      (token.is_lz77_length ? codes.lz77.length_uint_config
-                            : codes.uint_config[histo])
-          .Encode(token.value, &tok, &nbits, &bits);
-      tok += token.is_lz77_length ? codes.lz77.min_symbol : 0;
-      // Combine two calls to the BitWriter. Equivalent to:
-      // writer->Write(codes.encoding_info[histo][tok].depth,
-      //               codes.encoding_info[histo][tok].bits);
-      // writer->Write(nbits, bits);
-      uint64_t data = codes.encoding_info[histo][tok].bits;
-      data |= static_cast<uint64_t>(bits)
-              << codes.encoding_info[histo][tok].depth;
-      writer->Write(codes.encoding_info[histo][tok].depth + nbits, data);
-      num_extra_bits += nbits;
-    }
-    return num_extra_bits;
-  }
-  std::vector<uint64_t> out;
-  std::vector<uint8_t> out_nbits;
-  out.reserve(tokens.size());
-  out_nbits.reserve(tokens.size());
-  uint64_t allbits = 0;
-  size_t numallbits = 0;
-  // Writes in *reversed* order.
-  auto addbits = [&](size_t bits, size_t nbits) {
-    if (JXL_UNLIKELY(nbits)) {
-      JXL_DASSERT(bits >> nbits == 0);
-      if (JXL_UNLIKELY(numallbits + nbits > BitWriter::kMaxBitsPerCall)) {
-        out.push_back(allbits);
-        out_nbits.push_back(numallbits);
-        numallbits = allbits = 0;
-      }
-      allbits <<= nbits;
-      allbits |= bits;
-      numallbits += nbits;
-    }
-  };
-  const int end = tokens.size();
-  ANSCoder ans;
-  if (codes.lz77.enabled || context_map.size() > 1) {
-    for (int i = end - 1; i >= 0; --i) {
-      const Token token = tokens[i];
-      const uint8_t histo = context_map[context_offset + token.context];
-      uint32_t tok, nbits, bits;
-      (token.is_lz77_length ? codes.lz77.length_uint_config
-                            : codes.uint_config[histo])
-          .Encode(tokens[i].value, &tok, &nbits, &bits);
-      tok += token.is_lz77_length ? codes.lz77.min_symbol : 0;
-      const ANSEncSymbolInfo& info = codes.encoding_info[histo][tok];
-      JXL_DASSERT(info.freq_ > 0);
-      // Extra bits first as this is reversed.
-      addbits(bits, nbits);
-      num_extra_bits += nbits;
-      uint8_t ans_nbits = 0;
-      uint32_t ans_bits = ans.PutSymbol(info, &ans_nbits);
-      addbits(ans_bits, ans_nbits);
-    }
-  } else {
-    for (int i = end - 1; i >= 0; --i) {
-      uint32_t tok, nbits, bits;
-      codes.uint_config[0].Encode(tokens[i].value, &tok, &nbits, &bits);
-      const ANSEncSymbolInfo& info = codes.encoding_info[0][tok];
-      // Extra bits first as this is reversed.
-      addbits(bits, nbits);
-      num_extra_bits += nbits;
-      uint8_t ans_nbits = 0;
-      uint32_t ans_bits = ans.PutSymbol(info, &ans_nbits);
-      addbits(ans_bits, ans_nbits);
-    }
-  }
-  const uint32_t state = ans.GetState();
-  writer->Write(32, state);
-  writer->Write(numallbits, allbits);
-  for (int i = out.size(); i > 0; --i) {
-    writer->Write(out_nbits[i - 1], out[i - 1]);
-  }
-  return num_extra_bits;
-}
-
-Status WriteTokens(const std::vector<Token>& tokens,
-                   const EntropyEncodingData& codes,
-                   const std::vector<uint8_t>& context_map,
-                   size_t context_offset, BitWriter* writer, LayerType layer,
-                   AuxOut* aux_out) {
-  // Theoretically, we could have 15 prefix code bits + 31 extra bits.
-  return writer->WithMaxBits(
-      46 * tokens.size() + 32 * 1024 * 4, layer, aux_out, [&] {
-        size_t num_extra_bits =
-            WriteTokens(tokens, codes, context_map, context_offset, writer);
-        if (aux_out != nullptr) {
-          aux_out->layer(layer).extra_bits += num_extra_bits;
-        }
-        return true;
-      });
-}
-
-void SetANSFuzzerFriendly(bool ans_fuzzer_friendly) {
-#if JXL_IS_DEBUG_BUILD  // Guard against accidental / malicious changes.
-  ans_fuzzer_friendly_ = ans_fuzzer_friendly;
-#endif
-}
-
-HistogramParams HistogramParams::ForModular(
-    const CompressParams& cparams,
-    const std::vector<uint8_t>& extra_dc_precision, bool streaming_mode) {
-  HistogramParams params;
-  params.streaming_mode = streaming_mode;
-  if (cparams.speed_tier > SpeedTier::kKitten) {
-    params.clustering = HistogramParams::ClusteringType::kFast;
-    params.ans_histogram_strategy =
-        cparams.speed_tier > SpeedTier::kThunder
-            ? HistogramParams::ANSHistogramStrategy::kFast
-            : HistogramParams::ANSHistogramStrategy::kApproximate;
-    params.lz77_method =
-        cparams.decoding_speed_tier >= 3 && cparams.modular_mode
-            ? (cparams.speed_tier >= SpeedTier::kFalcon
-                   ? HistogramParams::LZ77Method::kRLE
-                   : HistogramParams::LZ77Method::kLZ77)
-            : HistogramParams::LZ77Method::kNone;
-    // Near-lossless DC, as well as modular mode, require choosing hybrid uint
-    // more carefully.
-    if ((!extra_dc_precision.empty() && extra_dc_precision[0] != 0) ||
-        (cparams.modular_mode && cparams.speed_tier < SpeedTier::kCheetah)) {
-      params.uint_method = HistogramParams::HybridUintMethod::kFast;
-    } else {
-      params.uint_method = HistogramParams::HybridUintMethod::kNone;
-    }
-  } else if (cparams.speed_tier <= SpeedTier::kTortoise) {
-    params.lz77_method = HistogramParams::LZ77Method::kOptimal;
-  } else {
-    params.lz77_method = HistogramParams::LZ77Method::kLZ77;
-  }
-  if (cparams.decoding_speed_tier >= 1) {
-    params.max_histograms = 12;
-  }
-  if (cparams.decoding_speed_tier >= 1 && cparams.responsive) {
-    params.lz77_method = cparams.speed_tier >= SpeedTier::kCheetah
-                             ? HistogramParams::LZ77Method::kRLE
-                         : cparams.speed_tier >= SpeedTier::kKitten
-                             ? HistogramParams::LZ77Method::kLZ77
-                             : HistogramParams::LZ77Method::kOptimal;
-  }
-  if (cparams.decoding_speed_tier >= 2 && cparams.responsive) {
-    params.uint_method = HistogramParams::HybridUintMethod::k000;
-    params.force_huffman = true;
-  }
-  return params;
-}
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_ans.h b/third_party/jpeg-xl/lib/jxl/enc_ans.h
deleted file mode 100644
index f5cdc019b44dc..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_ans.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_ANS_H_
-#define LIB_JXL_ENC_ANS_H_
-
-// Library to encode the ANS population counts to the bit-stream and encode
-// symbols based on the respective distributions.
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/ans_params.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_ans.h"
-#include "lib/jxl/enc_ans_params.h"
-#include "lib/jxl/enc_bit_writer.h"
-
-namespace jxl {
-
-struct AuxOut;
-enum class LayerType : uint8_t;
-
-#define USE_MULT_BY_RECIPROCAL
-
-// precision must be equal to:  #bits(state_) + #bits(freq)
-#define RECIPROCAL_PRECISION (32 + ANS_LOG_TAB_SIZE)
-
-// Data structure representing one element of the encoding table built
-// from a distribution.
-// TODO(veluca): split this up, or use an union.
-struct ANSEncSymbolInfo {
-  // ANS
-  uint16_t freq_;
-  std::vector<uint16_t> reverse_map_;
-#ifdef USE_MULT_BY_RECIPROCAL
-  uint64_t ifreq_;
-#endif
-  // Prefix coding.
-  uint8_t depth;
-  uint16_t bits;
-};
-
-class ANSCoder {
- public:
-  ANSCoder() : state_(ANS_SIGNATURE << 16) {}
-
-  uint32_t PutSymbol(const ANSEncSymbolInfo& t, uint8_t* nbits) {
-    uint32_t bits = 0;
-    *nbits = 0;
-    if ((state_ >> (32 - ANS_LOG_TAB_SIZE)) >= t.freq_) {
-      bits = state_ & 0xffff;
-      state_ >>= 16;
-      *nbits = 16;
-    }
-#ifdef USE_MULT_BY_RECIPROCAL
-    // We use mult-by-reciprocal trick, but that requires 64b calc.
-    const uint32_t v = (state_ * t.ifreq_) >> RECIPROCAL_PRECISION;
-    const uint32_t offset = t.reverse_map_[state_ - v * t.freq_];
-    state_ = (v << ANS_LOG_TAB_SIZE) + offset;
-#else
-    state_ = ((state_ / t.freq_) << ANS_LOG_TAB_SIZE) +
-             t.reverse_map_[state_ % t.freq_];
-#endif
-    return bits;
-  }
-
-  uint32_t GetState() const { return state_; }
-
- private:
-  uint32_t state_;
-};
-
-static const int kNumFixedHistograms = 1;
-
-struct EntropyEncodingData {
-  std::vector<std::vector<ANSEncSymbolInfo>> encoding_info;
-  bool use_prefix_code;
-  std::vector<HybridUintConfig> uint_config;
-  LZ77Params lz77;
-  std::vector<BitWriter> encoded_histograms;
-};
-
-// Integer to be encoded by an entropy coder, either ANS or Huffman.
-struct Token {
-  Token() = default;
-  Token(uint32_t c, uint32_t value)
-      : is_lz77_length(false), context(c), value(value) {}
-  uint32_t is_lz77_length : 1;
-  uint32_t context : 31;
-  uint32_t value;
-};
-
-// Returns an estimate of the number of bits required to encode the given
-// histogram (header bits plus data bits).
-StatusOr<float> ANSPopulationCost(const ANSHistBin* data, size_t alphabet_size);
-
-// Writes the context map to the bitstream and concatenates the individual
-// histogram bistreams in codes.encoded_histograms. Used in streaming mode.
-Status EncodeHistograms(const std::vector<uint8_t>& context_map,
-                        const EntropyEncodingData& codes, BitWriter* writer,
-                        LayerType layer, AuxOut* aux_out);
-
-// Apply context clustering, compute histograms and encode them. Returns an
-// estimate of the total bits used for encoding the stream. If `writer` ==
-// nullptr, the bit estimate will not take into account the context map (which
-// does not get written if `num_contexts` == 1).
-// Returns cost
-StatusOr<size_t> BuildAndEncodeHistograms(
-    JxlMemoryManager* memory_manager, const HistogramParams& params,
-    size_t num_contexts, std::vector<std::vector<Token>>& tokens,
-    EntropyEncodingData* codes, std::vector<uint8_t>* context_map,
-    BitWriter* writer, LayerType layer, AuxOut* aux_out);
-
-// Write the tokens to a string.
-Status WriteTokens(const std::vector<Token>& tokens,
-                   const EntropyEncodingData& codes,
-                   const std::vector<uint8_t>& context_map,
-                   size_t context_offset, BitWriter* writer, LayerType layer,
-                   AuxOut* aux_out);
-
-// Same as above, but assumes allotment created by caller.
-size_t WriteTokens(const std::vector<Token>& tokens,
-                   const EntropyEncodingData& codes,
-                   const std::vector<uint8_t>& context_map,
-                   size_t context_offset, BitWriter* writer);
-
-// Exposed for tests; to be used with Writer=BitWriter only.
-template <typename Writer>
-void EncodeUintConfigs(const std::vector<HybridUintConfig>& uint_config,
-                       Writer* writer, size_t log_alpha_size);
-extern template void EncodeUintConfigs(const std::vector<HybridUintConfig>&,
-                                       BitWriter*, size_t);
-
-// Globally set the option to create fuzzer-friendly ANS streams. Negatively
-// impacts compression. Not thread-safe.
-void SetANSFuzzerFriendly(bool ans_fuzzer_friendly);
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_ANS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_ans_params.h b/third_party/jpeg-xl/lib/jxl/enc_ans_params.h
deleted file mode 100644
index 23921097b48db..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_ans_params.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_ANS_PARAMS_H_
-#define LIB_JXL_ENC_ANS_PARAMS_H_
-
-// Encoder-only parameter needed for ANS entropy encoding methods.
-
-#include <stdint.h>
-#include <stdlib.h>
-
-#include <vector>
-
-#include "lib/jxl/common.h"
-
-namespace jxl {
-
-// Forward declaration to break include cycle.
-struct CompressParams;
-
-// RebalanceHistogram requires a signed type.
-using ANSHistBin = int32_t;
-
-struct HistogramParams {
-  enum class ClusteringType {
-    kFastest,  // Only 4 clusters.
-    kFast,
-    kBest,
-  };
-
-  enum class HybridUintMethod {
-    kNone,        // just use kHybridUint420Config.
-    k000,         // force the fastest option.
-    kFast,        // just try a couple of options.
-    kContextMap,  // fast choice for ctx map.
-    kBest,
-  };
-
-  enum class LZ77Method {
-    kNone,     // do not try lz77.
-    kRLE,      // only try doing RLE.
-    kLZ77,     // try lz77 with backward references.
-    kOptimal,  // optimal-matching LZ77 parsing.
-  };
-
-  enum class ANSHistogramStrategy {
-    kFast,         // Only try some methods, early exit.
-    kApproximate,  // Only try some methods.
-    kPrecise,      // Try all methods.
-  };
-
-  HistogramParams() = default;
-
-  HistogramParams(SpeedTier tier, size_t num_ctx) {
-    if (tier > SpeedTier::kFalcon) {
-      clustering = ClusteringType::kFastest;
-      lz77_method = LZ77Method::kNone;
-    } else if (tier > SpeedTier::kTortoise) {
-      clustering = ClusteringType::kFast;
-    } else {
-      clustering = ClusteringType::kBest;
-    }
-    if (tier > SpeedTier::kTortoise) {
-      uint_method = HybridUintMethod::kNone;
-    }
-    if (tier >= SpeedTier::kSquirrel) {
-      ans_histogram_strategy = ANSHistogramStrategy::kApproximate;
-    }
-  }
-
-  static HistogramParams ForModular(
-      const CompressParams& cparams,
-      const std::vector<uint8_t>& extra_dc_precision, bool streaming_mode);
-
-  ClusteringType clustering = ClusteringType::kBest;
-  HybridUintMethod uint_method = HybridUintMethod::kBest;
-  LZ77Method lz77_method = LZ77Method::kRLE;
-  ANSHistogramStrategy ans_histogram_strategy = ANSHistogramStrategy::kPrecise;
-  std::vector<size_t> image_widths;
-  size_t max_histograms = ~0;
-  bool force_huffman = false;
-  bool initialize_global_state = true;
-  bool streaming_mode = false;
-  bool add_missing_symbols = false;
-  bool add_fixed_histograms = false;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_ANS_PARAMS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_aux_out.cc b/third_party/jpeg-xl/lib/jxl/enc_aux_out.cc
deleted file mode 100644
index 78634f20f454a..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_aux_out.cc
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_aux_out.h"
-
-#include <cstddef>
-
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-const char* LayerName(LayerType layer) {
-  switch (layer) {
-    case LayerType::Header:
-      return "Headers";
-    case LayerType::Toc:
-      return "TOC";
-    case LayerType::Dictionary:
-      return "Patches";
-    case LayerType::Splines:
-      return "Splines";
-    case LayerType::Noise:
-      return "Noise";
-    case LayerType::Quant:
-      return "Quantizer";
-    case LayerType::ModularTree:
-      return "ModularTree";
-    case LayerType::ModularGlobal:
-      return "ModularGlobal";
-    case LayerType::Dc:
-      return "DC";
-    case LayerType::ModularDcGroup:
-      return "ModularDcGroup";
-    case LayerType::ControlFields:
-      return "ControlFields";
-    case LayerType::Order:
-      return "CoeffOrder";
-    case LayerType::Ac:
-      return "ACHistograms";
-    case LayerType::AcTokens:
-      return "ACTokens";
-    case LayerType::ModularAcGroup:
-      return "ModularAcGroup";
-  }
-  JXL_DEBUG_ABORT("internal: unexpected LayerType: %d",
-                  static_cast<int>(layer));
-  return "Invalid";
-}
-
-void AuxOut::LayerTotals::Print(size_t num_inputs) const {
-  if (JXL_DEBUG_V_LEVEL > 0) {
-    printf("%10" PRIuS, total_bits);
-    if (histogram_bits != 0) {
-      printf("   [c/i:%6.2f | hst:%8" PRIuS " | ex:%8" PRIuS " | h+c+e:%12.3f",
-             num_clustered_histograms * 1.0 / num_inputs, histogram_bits >> 3,
-             extra_bits >> 3,
-             (histogram_bits + clustered_entropy + extra_bits) / 8.0);
-      printf("]");
-    }
-    printf("\n");
-  }
-}
-
-void AuxOut::Assimilate(const AuxOut& victim) {
-  for (size_t i = 0; i < kNumImageLayers; ++i) {
-    LayerType l = static_cast<LayerType>(i);
-    layer(l).Assimilate(victim.layer(l));
-  }
-  num_blocks += victim.num_blocks;
-  num_small_blocks += victim.num_small_blocks;
-  num_dct4x8_blocks += victim.num_dct4x8_blocks;
-  num_afv_blocks += victim.num_afv_blocks;
-  num_dct8_blocks += victim.num_dct8_blocks;
-  num_dct8x16_blocks += victim.num_dct8x16_blocks;
-  num_dct8x32_blocks += victim.num_dct8x32_blocks;
-  num_dct16_blocks += victim.num_dct16_blocks;
-  num_dct16x32_blocks += victim.num_dct16x32_blocks;
-  num_dct32_blocks += victim.num_dct32_blocks;
-  num_dct32x64_blocks += victim.num_dct32x64_blocks;
-  num_dct64_blocks += victim.num_dct64_blocks;
-  num_butteraugli_iters += victim.num_butteraugli_iters;
-}
-
-void AuxOut::Print(size_t num_inputs) const {
-  if (JXL_DEBUG_V_LEVEL > 0) {
-    if (num_inputs == 0) return;
-
-    LayerTotals all_layers;
-    for (const auto& layer : layers) {
-      all_layers.Assimilate(layer);
-    }
-
-    printf("Average butteraugli iters: %10.2f\n",
-           num_butteraugli_iters * 1.0 / num_inputs);
-
-    for (size_t i = 0; i < kNumImageLayers; ++i) {
-      LayerType l = static_cast<LayerType>(i);
-      if (layer(l).total_bits != 0) {
-        printf("Total layer bits %-10s\t", LayerName(l));
-        printf("%10f%%", 100.0 * layer(l).total_bits / all_layers.total_bits);
-        layer(l).Print(num_inputs);
-      }
-    }
-    printf("Total image size           ");
-    all_layers.Print(num_inputs);
-
-    size_t total_blocks = 0;
-    size_t total_positions = 0;
-    if (total_blocks != 0 && total_positions != 0) {
-      printf("\n\t\t  Blocks\t\tPositions\t\t\tBlocks/Position\n");
-      printf(" Total:\t\t    %7" PRIuS "\t\t     %7" PRIuS " \t\t\t%10f%%\n\n",
-             total_blocks, total_positions,
-             100.0 * total_blocks / total_positions);
-    }
-  }
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_aux_out.h b/third_party/jpeg-xl/lib/jxl/enc_aux_out.h
deleted file mode 100644
index a5536a605da93..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_aux_out.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_AUX_OUT_H_
-#define LIB_JXL_AUX_OUT_H_
-
-// Optional output information for debugging and analyzing size usage.
-
-#include <array>
-#include <cstddef>
-#include <cstdint>
-
-namespace jxl {
-
-struct ColorEncoding;
-
-// For LayerName and AuxOut::layers[] index. Order does not matter.
-enum class LayerType : uint8_t {
-  Header = 0,
-  Toc,
-  Dictionary,
-  Splines,
-  Noise,
-  Quant,
-  ModularTree,
-  ModularGlobal,
-  Dc,
-  ModularDcGroup,
-  ControlFields,
-  Order,
-  Ac,
-  AcTokens,
-  ModularAcGroup,
-};
-
-constexpr uint8_t kNumImageLayers =
-    static_cast<uint8_t>(LayerType::ModularAcGroup) + 1;
-
-const char* LayerName(LayerType layer);
-
-// Statistics gathered during compression or decompression.
-struct AuxOut {
- private:
-  struct LayerTotals {
-    void Assimilate(const LayerTotals& victim) {
-      num_clustered_histograms += victim.num_clustered_histograms;
-      histogram_bits += victim.histogram_bits;
-      extra_bits += victim.extra_bits;
-      total_bits += victim.total_bits;
-      clustered_entropy += victim.clustered_entropy;
-    }
-    void Print(size_t num_inputs) const;
-
-    size_t num_clustered_histograms = 0;
-    size_t extra_bits = 0;
-
-    // Set via BitsWritten below
-    size_t histogram_bits = 0;
-    size_t total_bits = 0;
-
-    double clustered_entropy = 0.0;
-  };
-
- public:
-  AuxOut() = default;
-  AuxOut(const AuxOut&) = default;
-
-  void Assimilate(const AuxOut& victim);
-
-  void Print(size_t num_inputs) const;
-
-  size_t TotalBits() const {
-    size_t total = 0;
-    for (const auto& layer : layers) {
-      total += layer.total_bits;
-    }
-    return total;
-  }
-
-  std::array<LayerTotals, kNumImageLayers> layers;
-
-  const LayerTotals& layer(LayerType idx) const {
-    return layers[static_cast<uint8_t>(idx)];
-  }
-  LayerTotals& layer(LayerType idx) {
-    return layers[static_cast<uint8_t>(idx)];
-  }
-
-  size_t num_blocks = 0;
-
-  // Number of blocks that use larger DCT (set by ac_strategy).
-  size_t num_small_blocks = 0;
-  size_t num_dct4x8_blocks = 0;
-  size_t num_afv_blocks = 0;
-  size_t num_dct8_blocks = 0;
-  size_t num_dct8x16_blocks = 0;
-  size_t num_dct8x32_blocks = 0;
-  size_t num_dct16_blocks = 0;
-  size_t num_dct16x32_blocks = 0;
-  size_t num_dct32_blocks = 0;
-  size_t num_dct32x64_blocks = 0;
-  size_t num_dct64_blocks = 0;
-
-  int num_butteraugli_iters = 0;
-};
-}  // namespace jxl
-
-#endif  // LIB_JXL_AUX_OUT_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_bit_writer.cc b/third_party/jpeg-xl/lib/jxl/enc_bit_writer.cc
deleted file mode 100644
index 9d03d6d6d4ad2..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_bit_writer.cc
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_bit_writer.h"
-
-#include <jxl/types.h>
-
-#include <cstring>  // memcpy
-
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_aux_out.h"
-
-namespace jxl {
-
-Status BitWriter::WithMaxBits(size_t max_bits, LayerType layer, AuxOut* aux_out,
-                              const std::function<Status()>& function,
-                              bool finished_histogram) {
-  BitWriter::Allotment allotment(max_bits);
-  JXL_RETURN_IF_ERROR(allotment.Init(this));
-  const Status result = function();
-  if (result && finished_histogram) {
-    JXL_RETURN_IF_ERROR(allotment.FinishedHistogram(this));
-  }
-  JXL_RETURN_IF_ERROR(allotment.ReclaimAndCharge(this, layer, aux_out));
-  return result;
-}
-BitWriter::Allotment::Allotment(size_t max_bits) : max_bits_(max_bits) {}
-
-Status BitWriter::Allotment::Init(BitWriter* JXL_RESTRICT writer) {
-  prev_bits_written_ = writer->BitsWritten();
-  const size_t prev_bytes = writer->storage_.size();
-  const size_t next_bytes = DivCeil(max_bits_, kBitsPerByte);
-  if (!writer->storage_.resize(prev_bytes + next_bytes)) {
-    called_ = true;
-    return false;
-  }
-  parent_ = writer->current_allotment_;
-  writer->current_allotment_ = this;
-  return true;
-}
-
-BitWriter::Allotment::~Allotment() {
-  if (!called_) {
-    // Not calling is a bug - unused storage will not be reclaimed.
-    JXL_DEBUG_ABORT("Did not call Allotment::ReclaimUnused");
-  }
-}
-
-Status BitWriter::Allotment::FinishedHistogram(BitWriter* JXL_RESTRICT writer) {
-  if (writer == nullptr) return true;
-  JXL_ENSURE(!called_);              // Call before ReclaimUnused
-  JXL_ENSURE(histogram_bits_ == 0);  // Do not call twice
-  JXL_ENSURE(writer->BitsWritten() >= prev_bits_written_);
-  if (writer->BitsWritten() >= prev_bits_written_) {
-    histogram_bits_ = writer->BitsWritten() - prev_bits_written_;
-  }
-  return true;
-}
-
-Status BitWriter::Allotment::ReclaimAndCharge(BitWriter* JXL_RESTRICT writer,
-                                              LayerType layer,
-                                              AuxOut* JXL_RESTRICT aux_out) {
-  size_t used_bits = 0;
-  size_t unused_bits = 0;
-  JXL_RETURN_IF_ERROR(PrivateReclaim(writer, &used_bits, &unused_bits));
-
-  // This may be a nested call with aux_out == null. Whenever we know that
-  // aux_out is null, we can call ReclaimUnused directly.
-  if (aux_out != nullptr) {
-    aux_out->layer(layer).total_bits += used_bits;
-    aux_out->layer(layer).histogram_bits += HistogramBits();
-  }
-  return true;
-}
-
-Status BitWriter::Allotment::PrivateReclaim(BitWriter* JXL_RESTRICT writer,
-                                            size_t* JXL_RESTRICT used_bits,
-                                            size_t* JXL_RESTRICT unused_bits) {
-  JXL_DASSERT(!called_);  // Do not call twice
-  called_ = true;
-  if (writer == nullptr) return true;
-
-  JXL_DASSERT(writer->BitsWritten() >= prev_bits_written_);
-  *used_bits = writer->BitsWritten() - prev_bits_written_;
-  JXL_DASSERT(*used_bits <= max_bits_);
-  *unused_bits = max_bits_ - *used_bits;
-
-  // Reclaim unused bytes whole bytes from writer's allotment.
-  const size_t unused_bytes = *unused_bits / kBitsPerByte;  // truncate
-  JXL_ENSURE(writer->storage_.size() >= unused_bytes);
-  JXL_RETURN_IF_ERROR(
-      writer->storage_.resize(writer->storage_.size() - unused_bytes));
-  writer->current_allotment_ = parent_;
-  // Ensure we don't also charge the parent for these bits.
-  auto* parent = parent_;
-  while (parent != nullptr) {
-    parent->prev_bits_written_ += *used_bits;
-    parent = parent->parent_;
-  }
-  return true;
-}
-
-Status BitWriter::AppendByteAligned(const Span<const uint8_t>& span) {
-  if (span.empty()) return true;
-  JXL_RETURN_IF_ERROR(storage_.resize(storage_.size() + span.size() +
-                                      1));  // extra zero padding
-
-  // Concatenate by copying bytes because both source and destination are bytes.
-  JXL_ENSURE(BitsWritten() % kBitsPerByte == 0);
-  size_t pos = BitsWritten() / kBitsPerByte;
-  memcpy(storage_.data() + pos, span.data(), span.size());
-  pos += span.size();
-  JXL_ENSURE(pos < storage_.size());
-  storage_[pos++] = 0;  // for next Write
-  bits_written_ += span.size() * kBitsPerByte;
-  return true;
-}
-
-Status BitWriter::AppendUnaligned(const BitWriter& other) {
-  return WithMaxBits(other.BitsWritten(), LayerType::Header, nullptr, [&] {
-    size_t full_bytes = other.BitsWritten() / kBitsPerByte;
-    size_t remaining_bits = other.BitsWritten() % kBitsPerByte;
-    for (size_t i = 0; i < full_bytes; ++i) {
-      Write(8, other.storage_[i]);
-    }
-    if (remaining_bits > 0) {
-      Write(remaining_bits,
-            other.storage_[full_bytes] & ((1u << remaining_bits) - 1));
-    }
-    return true;
-  });
-}
-
-// TODO(lode): avoid code duplication
-Status BitWriter::AppendByteAligned(
-    const std::vector<std::unique_ptr<BitWriter>>& others) {
-  // Total size to add so we can preallocate
-  size_t other_bytes = 0;
-  for (const auto& writer : others) {
-    JXL_ENSURE(writer->BitsWritten() % kBitsPerByte == 0);
-    other_bytes += DivCeil(writer->BitsWritten(), kBitsPerByte);
-  }
-  if (other_bytes == 0) {
-    // No bytes to append: this happens for example when creating per-group
-    // storage for groups, but not writing anything in them for e.g. lossless
-    // images with no alpha. Do nothing.
-    return true;
-  }
-  JXL_RETURN_IF_ERROR(storage_.resize(storage_.size() + other_bytes +
-                                      1));  // extra zero padding
-
-  // Concatenate by copying bytes because both source and destination are bytes.
-  JXL_ENSURE(BitsWritten() % kBitsPerByte == 0);
-  size_t pos = DivCeil(BitsWritten(), kBitsPerByte);
-  for (const auto& writer : others) {
-    const Span<const uint8_t> span = writer->GetSpan();
-    memcpy(storage_.data() + pos, span.data(), span.size());
-    pos += span.size();
-  }
-  JXL_ENSURE(pos < storage_.size());
-  storage_[pos++] = 0;  // for next Write
-  bits_written_ += other_bytes * kBitsPerByte;
-  return true;
-}
-
-// Example: let's assume that 3 bits (Rs below) have been written already:
-// BYTE+0       BYTE+1       BYTE+2
-// 0000 0RRR    ???? ????    ???? ????
-//
-// Now, we could write up to 5 bits by just shifting them left by 3 bits and
-// OR'ing to BYTE-0.
-//
-// For n > 5 bits, we write the lowest 5 bits as above, then write the next
-// lowest bits into BYTE+1 starting from its lower bits and so on.
-void BitWriter::Write(size_t n_bits, uint64_t bits) {
-  JXL_DASSERT((bits >> n_bits) == 0);
-  JXL_DASSERT(n_bits <= kMaxBitsPerCall);
-  size_t bytes_written = bits_written_ / kBitsPerByte;
-  uint8_t* p = &storage_[bytes_written];
-  const size_t bits_in_first_byte = bits_written_ % kBitsPerByte;
-  bits <<= bits_in_first_byte;
-#if JXL_BYTE_ORDER_LITTLE
-  uint64_t v = *p;
-  // Last (partial) or next byte to write must be zero-initialized!
-  // PaddedBytes initializes the first, and Write/Append maintain this.
-  JXL_DASSERT(v >> bits_in_first_byte == 0);
-  v |= bits;
-  memcpy(p, &v, sizeof(v));  // Write bytes: possibly more than n_bits/8
-#else
-  *p++ |= static_cast<uint8_t>(bits & 0xFF);
-  for (size_t bits_left_to_write = n_bits + bits_in_first_byte;
-       bits_left_to_write >= 9; bits_left_to_write -= 8) {
-    bits >>= 8;
-    *p++ = static_cast<uint8_t>(bits & 0xFF);
-  }
-  *p = 0;
-#endif
-  bits_written_ += n_bits;
-}
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_bit_writer.h b/third_party/jpeg-xl/lib/jxl/enc_bit_writer.h
deleted file mode 100644
index 1ed7342477bea..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_bit_writer.h
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_BIT_WRITER_H_
-#define LIB_JXL_ENC_BIT_WRITER_H_
-
-// BitWriter class: unbuffered writes using unaligned 64-bit stores.
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <functional>
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/padded_bytes.h"
-
-namespace jxl {
-
-struct AuxOut;
-enum class LayerType : uint8_t;
-
-struct BitWriter {
-  // Upper bound on `n_bits` in each call to Write. We shift a 64-bit word by
-  // 7 bits (max already valid bits in the last byte) and at least 1 bit is
-  // needed to zero-initialize the bit-stream ahead (i.e. if 7 bits are valid
-  // and we write 57 bits, then the next write will access a byte that was not
-  // yet zero-initialized).
-  static constexpr size_t kMaxBitsPerCall = 56;
-
-  explicit BitWriter(JxlMemoryManager* memory_manager)
-      : bits_written_(0), storage_(memory_manager) {}
-
-  // Disallow copying - may lead to bugs.
-  BitWriter(const BitWriter&) = delete;
-  BitWriter& operator=(const BitWriter&) = delete;
-  BitWriter(BitWriter&&) = default;
-  BitWriter& operator=(BitWriter&&) = default;
-
-  size_t BitsWritten() const { return bits_written_; }
-
-  JxlMemoryManager* memory_manager() const { return storage_.memory_manager(); }
-
-  Span<const uint8_t> GetSpan() const {
-    // Callers must ensure byte alignment to avoid uninitialized bits.
-    JXL_DASSERT(bits_written_ % kBitsPerByte == 0);
-    return Bytes(storage_.data(), DivCeil(bits_written_, kBitsPerByte));
-  }
-
-  // Example usage: bytes = std::move(writer).TakeBytes(); Useful for the
-  // top-level encoder which returns PaddedBytes, not a BitWriter.
-  // *this must be an rvalue reference and is invalid afterwards.
-  PaddedBytes&& TakeBytes() && {
-    // Callers must ensure byte alignment to avoid uninitialized bits.
-    JXL_DASSERT(bits_written_ % kBitsPerByte == 0);
-    Status status = storage_.resize(DivCeil(bits_written_, kBitsPerByte));
-    JXL_DASSERT(status);
-    // Can never fail, because we are resizing to a lower size.
-    (void)status;
-    return std::move(storage_);
-  }
-
-  // Must be byte-aligned before calling.
-  Status AppendByteAligned(const Span<const uint8_t>& span);
-
-  // NOTE: no allotment needed, the other BitWriters have already been charged.
-  Status AppendByteAligned(
-      const std::vector<std::unique_ptr<BitWriter>>& others);
-
-  Status AppendUnaligned(const BitWriter& other);
-
-  // Writes bits into bytes in increasing addresses, and within a byte
-  // least-significant-bit first.
-  //
-  // The function can write up to 56 bits in one go.
-  void Write(size_t n_bits, uint64_t bits);
-
-  // This should only rarely be used - e.g. when the current location will be
-  // referenced via byte offset (TOCs point to groups), or byte-aligned reading
-  // is required for speed.
-  void ZeroPadToByte() {
-    const size_t remainder_bits =
-        RoundUpBitsToByteMultiple(bits_written_) - bits_written_;
-    if (remainder_bits == 0) return;
-    Write(remainder_bits, 0);
-    JXL_DASSERT(bits_written_ % kBitsPerByte == 0);
-  }
-
-  Status WithMaxBits(size_t max_bits, LayerType layer,
-                     AuxOut* JXL_RESTRICT aux_out,
-                     const std::function<Status()>& function,
-                     bool finished_histogram = false);
-
- private:
-  class Allotment {
-   public:
-    explicit Allotment(size_t max_bits);
-    ~Allotment();
-
-    Allotment(const Allotment& other) = delete;
-    Allotment(Allotment&& other) = delete;
-    Allotment& operator=(const Allotment&) = delete;
-    Allotment& operator=(Allotment&&) = delete;
-
-    // Call after writing a histogram, but before ReclaimUnused.
-    Status FinishedHistogram(BitWriter* JXL_RESTRICT writer);
-
-    size_t HistogramBits() const {
-      JXL_DASSERT(called_);
-      return histogram_bits_;
-    }
-
-    Status ReclaimAndCharge(BitWriter* JXL_RESTRICT writer, LayerType layer,
-                            AuxOut* JXL_RESTRICT aux_out);
-
-   private:
-    friend struct BitWriter;
-
-    // Expands a BitWriter's storage. Must happen before calling Write or
-    // ZeroPadToByte. Must call ReclaimUnused after writing to reclaim the
-    // unused storage so that BitWriter memory use remains tightly bounded.
-    Status Init(BitWriter* JXL_RESTRICT writer);
-
-    Status PrivateReclaim(BitWriter* JXL_RESTRICT writer,
-                          size_t* JXL_RESTRICT used_bits,
-                          size_t* JXL_RESTRICT unused_bits);
-
-    size_t prev_bits_written_;
-    const size_t max_bits_;
-    size_t histogram_bits_ = 0;
-    bool called_ = false;
-    Allotment* parent_;
-  };
-
-  size_t bits_written_;
-  PaddedBytes storage_;
-  Allotment* current_allotment_ = nullptr;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_BIT_WRITER_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_butteraugli_comparator.cc b/third_party/jpeg-xl/lib/jxl/enc_butteraugli_comparator.cc
deleted file mode 100644
index fa807ffcd0136..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_butteraugli_comparator.cc
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_butteraugli_comparator.h"
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_image_bundle.h"
-
-namespace jxl {
-
-JxlButteraugliComparator::JxlButteraugliComparator(
-    const ButteraugliParams& params, const JxlCmsInterface& cms)
-    : params_(params), cms_(cms) {}
-
-Status JxlButteraugliComparator::SetReferenceImage(const ImageBundle& ref) {
-  const ImageBundle* ref_linear_srgb;
-  JxlMemoryManager* memory_manager = ref.memory_manager();
-  ImageMetadata metadata = *ref.metadata();
-  ImageBundle store(memory_manager, &metadata);
-  if (!TransformIfNeeded(ref, ColorEncoding::LinearSRGB(ref.IsGray()), cms_,
-                         /*pool=*/nullptr, &store, &ref_linear_srgb)) {
-    return false;
-  }
-  JXL_ASSIGN_OR_RETURN(comparator_, ButteraugliComparator::Make(
-                                        ref_linear_srgb->color(), params_));
-  xsize_ = ref.xsize();
-  ysize_ = ref.ysize();
-  intensity_target_ = ref.metadata()->IntensityTarget();
-  return true;
-}
-
-Status JxlButteraugliComparator::SetLinearReferenceImage(
-    const Image3F& linear) {
-  JXL_ASSIGN_OR_RETURN(comparator_,
-                       ButteraugliComparator::Make(linear, params_));
-  xsize_ = linear.xsize();
-  ysize_ = linear.ysize();
-  return true;
-}
-
-Status JxlButteraugliComparator::CompareWith(const ImageBundle& actual,
-                                             ImageF* diffmap, float* score) {
-  if (!comparator_) {
-    return JXL_FAILURE("Must set reference image first");
-  }
-  if (xsize_ != actual.xsize() || ysize_ != actual.ysize()) {
-    return JXL_FAILURE("Images must have same size");
-  }
-  JxlMemoryManager* memory_manager = actual.memory_manager();
-
-  const ImageBundle* actual_linear_srgb;
-  ImageMetadata metadata = *actual.metadata();
-  ImageBundle store(memory_manager, &metadata);
-  if (!TransformIfNeeded(actual, ColorEncoding::LinearSRGB(actual.IsGray()),
-                         cms_,
-                         /*pool=*/nullptr, &store, &actual_linear_srgb)) {
-    return false;
-  }
-
-  JXL_ASSIGN_OR_RETURN(ImageF temp_diffmap,
-                       ImageF::Create(memory_manager, xsize_, ysize_));
-  const Image3F* scaled_actual_linear_srgb = &actual_linear_srgb->color();
-  Image3F scaled_actual_linear_srgb_store;
-  if (intensity_target_ != 0 &&
-      actual.metadata()->IntensityTarget() != intensity_target_) {
-    scaled_actual_linear_srgb = &scaled_actual_linear_srgb_store;
-    JXL_ASSIGN_OR_RETURN(scaled_actual_linear_srgb_store,
-                         Image3F::Create(memory_manager, xsize_, ysize_));
-    const float scale =
-        actual.metadata()->IntensityTarget() / intensity_target_;
-    for (size_t c = 0; c < 3; ++c) {
-      for (size_t y = 0; y < ysize_; ++y) {
-        const float* JXL_RESTRICT source_row =
-            actual_linear_srgb->color().ConstPlaneRow(c, y);
-        float* JXL_RESTRICT scaled_row =
-            scaled_actual_linear_srgb_store.PlaneRow(c, y);
-        for (size_t x = 0; x < xsize_; ++x) {
-          scaled_row[x] = scale * source_row[x];
-        }
-      }
-    }
-  }
-  JXL_RETURN_IF_ERROR(
-      comparator_->Diffmap(*scaled_actual_linear_srgb, temp_diffmap));
-
-  if (score != nullptr) {
-    *score = ButteraugliScoreFromDiffmap(temp_diffmap, &params_);
-  }
-  if (diffmap != nullptr) {
-    diffmap->Swap(temp_diffmap);
-  }
-
-  return true;
-}
-
-float JxlButteraugliComparator::GoodQualityScore() const {
-  return ButteraugliFuzzyInverse(1.5);
-}
-
-float JxlButteraugliComparator::BadQualityScore() const {
-  return ButteraugliFuzzyInverse(0.5);
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_butteraugli_comparator.h b/third_party/jpeg-xl/lib/jxl/enc_butteraugli_comparator.h
deleted file mode 100644
index f900503e9246e..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_butteraugli_comparator.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_BUTTERAUGLI_COMPARATOR_H_
-#define LIB_JXL_ENC_BUTTERAUGLI_COMPARATOR_H_
-
-#include <jxl/cms_interface.h>
-#include <stddef.h>
-
-#include <memory>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/butteraugli/butteraugli.h"
-#include "lib/jxl/enc_comparator.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-
-namespace jxl {
-
-class JxlButteraugliComparator : public Comparator {
- public:
-  explicit JxlButteraugliComparator(const ButteraugliParams& params,
-                                    const JxlCmsInterface& cms);
-
-  Status SetReferenceImage(const ImageBundle& ref) override;
-  Status SetLinearReferenceImage(const Image3F& linear);
-
-  Status CompareWith(const ImageBundle& actual, ImageF* diffmap,
-                     float* score) override;
-
-  float GoodQualityScore() const override;
-  float BadQualityScore() const override;
-
- private:
-  ButteraugliParams params_;
-  JxlCmsInterface cms_;
-  std::unique_ptr<ButteraugliComparator> comparator_;
-  size_t xsize_ = 0;
-  size_t ysize_ = 0;
-  float intensity_target_ = 0.f;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_BUTTERAUGLI_COMPARATOR_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_cache.cc b/third_party/jpeg-xl/lib/jxl/enc_cache.cc
deleted file mode 100644
index fee884a20b2ca..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_cache.cc
+++ /dev/null
@@ -1,235 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_cache.h"
-
-#include <cstddef>
-#include <cstdint>
-#include <memory>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/compressed_dc.h"
-#include "lib/jxl/dct_util.h"
-#include "lib/jxl/dec_frame.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_frame.h"
-#include "lib/jxl/enc_group.h"
-#include "lib/jxl/enc_modular.h"
-#include "lib/jxl/enc_quant_weights.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/passes_state.h"
-#include "lib/jxl/quantizer.h"
-
-namespace jxl {
-
-Status ComputeACMetadata(ThreadPool* pool, PassesEncoderState* enc_state,
-                         ModularFrameEncoder* modular_frame_encoder) {
-  PassesSharedState& shared = enc_state->shared;
-  auto compute_ac_meta = [&](int group_index, int /* thread */) -> Status {
-    const Rect r = shared.frame_dim.DCGroupRect(group_index);
-    int modular_group_index = group_index;
-    if (enc_state->streaming_mode) {
-      JXL_ENSURE(group_index == 0);
-      modular_group_index = enc_state->dc_group_index;
-    }
-    JXL_RETURN_IF_ERROR(modular_frame_encoder->AddACMetadata(
-        r, modular_group_index,
-        /*jpeg_transcode=*/false, enc_state));
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, shared.frame_dim.num_dc_groups,
-                                ThreadPool::NoInit, compute_ac_meta,
-                                "Compute AC Metadata"));
-  return true;
-}
-
-Status InitializePassesEncoder(const FrameHeader& frame_header,
-                               const Image3F& opsin, const Rect& rect,
-                               const JxlCmsInterface& cms, ThreadPool* pool,
-                               PassesEncoderState* enc_state,
-                               ModularFrameEncoder* modular_frame_encoder,
-                               AuxOut* aux_out) {
-  PassesSharedState& JXL_RESTRICT shared = enc_state->shared;
-  JxlMemoryManager* memory_manager = enc_state->memory_manager();
-
-  enc_state->x_qm_multiplier = std::pow(1.25f, frame_header.x_qm_scale - 2.0f);
-  enc_state->b_qm_multiplier = std::pow(1.25f, frame_header.b_qm_scale - 2.0f);
-
-  if (enc_state->coeffs.size() < frame_header.passes.num_passes) {
-    enc_state->coeffs.reserve(frame_header.passes.num_passes);
-    for (size_t i = enc_state->coeffs.size();
-         i < frame_header.passes.num_passes; i++) {
-      // Allocate enough coefficients for each group on every row.
-      JXL_ASSIGN_OR_RETURN(
-          std::unique_ptr<ACImageT<int32_t>> coeffs,
-          ACImageT<int32_t>::Make(memory_manager, kGroupDim * kGroupDim,
-                                  shared.frame_dim.num_groups));
-      enc_state->coeffs.emplace_back(std::move(coeffs));
-    }
-  }
-  while (enc_state->coeffs.size() > frame_header.passes.num_passes) {
-    enc_state->coeffs.pop_back();
-  }
-
-  if (enc_state->initialize_global_state) {
-    float scale =
-        shared.quantizer.ScaleGlobalScale(enc_state->cparams.quant_ac_rescale);
-    JXL_RETURN_IF_ERROR(
-        DequantMatricesScaleDC(memory_manager, &shared.matrices, scale));
-    shared.quantizer.RecomputeFromGlobalScale();
-  }
-
-  JXL_ASSIGN_OR_RETURN(
-      Image3F dc, Image3F::Create(memory_manager, shared.frame_dim.xsize_blocks,
-                                  shared.frame_dim.ysize_blocks));
-  const auto process_group = [&](size_t group_idx, size_t _) -> Status {
-    JXL_RETURN_IF_ERROR(
-        ComputeCoefficients(group_idx, enc_state, opsin, rect, &dc));
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, shared.frame_dim.num_groups,
-                                ThreadPool::NoInit, process_group,
-                                "Compute coeffs"));
-
-  if (frame_header.flags & FrameHeader::kUseDcFrame) {
-    CompressParams cparams = enc_state->cparams;
-    cparams.dots = Override::kOff;
-    cparams.noise = Override::kOff;
-    cparams.patches = Override::kOff;
-    cparams.gaborish = Override::kOff;
-    cparams.epf = 0;
-    cparams.resampling = 1;
-    cparams.ec_resampling = 1;
-    // The DC frame will have alpha=0. Don't erase its contents.
-    cparams.keep_invisible = Override::kOn;
-    JXL_ENSURE(cparams.progressive_dc > 0);
-    cparams.progressive_dc--;
-    // Use kVarDCT in max_error_mode for intermediate progressive DC,
-    // and kModular for the smallest DC (first in the bitstream)
-    if (cparams.progressive_dc == 0) {
-      cparams.modular_mode = true;
-      cparams.speed_tier = static_cast<SpeedTier>(
-          std::max(static_cast<int>(SpeedTier::kTortoise),
-                   static_cast<int>(cparams.speed_tier) - 1));
-      cparams.butteraugli_distance =
-          std::max(kMinButteraugliDistance,
-                   enc_state->cparams.butteraugli_distance * 0.02f);
-    } else {
-      cparams.max_error_mode = true;
-      for (size_t c = 0; c < 3; c++) {
-        cparams.max_error[c] = shared.quantizer.MulDC()[c];
-      }
-      // Guess a distance that produces good initial results.
-      cparams.butteraugli_distance =
-          std::max(kMinButteraugliDistance,
-                   enc_state->cparams.butteraugli_distance * 0.1f);
-    }
-    ImageBundle ib(memory_manager, &shared.metadata->m);
-    // This is a lie - dc is in XYB
-    // (but EncodeFrame will skip RGB->XYB conversion anyway)
-    JXL_RETURN_IF_ERROR(ib.SetFromImage(
-        std::move(dc),
-        ColorEncoding::LinearSRGB(shared.metadata->m.color_encoding.IsGray())));
-    if (!ib.metadata()->extra_channel_info.empty()) {
-      // Add placeholder extra channels to the patch image: dc_level frames do
-      // not yet support extra channels, but the codec expects that the amount
-      // of extra channels in frames matches that in the metadata of the
-      // codestream.
-      std::vector<ImageF> extra_channels;
-      extra_channels.reserve(ib.metadata()->extra_channel_info.size());
-      for (size_t i = 0; i < ib.metadata()->extra_channel_info.size(); i++) {
-        JXL_ASSIGN_OR_RETURN(
-            ImageF ch, ImageF::Create(memory_manager, ib.xsize(), ib.ysize()));
-        extra_channels.emplace_back(std::move(ch));
-        // Must initialize the image with data to not affect blending with
-        // uninitialized memory.
-        // TODO(lode): dc_level must copy and use the real extra channels
-        // instead.
-        ZeroFillImage(&extra_channels.back());
-      }
-      JXL_RETURN_IF_ERROR(ib.SetExtraChannels(std::move(extra_channels)));
-    }
-    auto special_frame = jxl::make_unique<BitWriter>(memory_manager);
-    FrameInfo dc_frame_info;
-    dc_frame_info.frame_type = FrameType::kDCFrame;
-    dc_frame_info.dc_level = frame_header.dc_level + 1;
-    dc_frame_info.ib_needs_color_transform = false;
-    dc_frame_info.save_before_color_transform = true;  // Implicitly true
-    AuxOut dc_aux_out;
-    JXL_RETURN_IF_ERROR(EncodeFrame(
-        memory_manager, cparams, dc_frame_info, shared.metadata, ib, cms, pool,
-        special_frame.get(), aux_out ? &dc_aux_out : nullptr));
-    if (aux_out) {
-      for (const auto& l : dc_aux_out.layers) {
-        aux_out->layer(LayerType::Dc).Assimilate(l);
-      }
-    }
-    const Span<const uint8_t> encoded = special_frame->GetSpan();
-    enc_state->special_frames.emplace_back(std::move(special_frame));
-
-    ImageBundle decoded(memory_manager, &shared.metadata->m);
-    std::unique_ptr<PassesDecoderState> dec_state =
-        jxl::make_unique<PassesDecoderState>(memory_manager);
-    JXL_RETURN_IF_ERROR(
-        dec_state->output_encoding_info.SetFromMetadata(*shared.metadata));
-    const uint8_t* frame_start = encoded.data();
-    size_t encoded_size = encoded.size();
-    for (int i = 0; i <= cparams.progressive_dc; ++i) {
-      JXL_RETURN_IF_ERROR(
-          DecodeFrame(dec_state.get(), pool, frame_start, encoded_size,
-                      /*frame_header=*/nullptr, &decoded, *shared.metadata));
-      frame_start += decoded.decoded_bytes();
-      encoded_size -= decoded.decoded_bytes();
-    }
-    // TODO(lode): frame_header.dc_level should be equal to
-    // dec_state.frame_header.dc_level - 1 here, since above we set
-    // dc_frame_info.dc_level = frame_header.dc_level + 1, and
-    // dc_frame_info.dc_level is used by EncodeFrame. However, if EncodeFrame
-    // outputs multiple frames, this assumption could be wrong.
-    const Image3F& dc_frame =
-        dec_state->shared->dc_frames[frame_header.dc_level];
-    JXL_ASSIGN_OR_RETURN(
-        shared.dc_storage,
-        Image3F::Create(memory_manager, dc_frame.xsize(), dc_frame.ysize()));
-    JXL_RETURN_IF_ERROR(CopyImageTo(dc_frame, &shared.dc_storage));
-    ZeroFillImage(&shared.quant_dc);
-    shared.dc = &shared.dc_storage;
-    JXL_ENSURE(encoded_size == 0);
-  } else {
-    auto compute_dc_coeffs = [&](int group_index, int /* thread */) -> Status {
-      const Rect r = enc_state->shared.frame_dim.DCGroupRect(group_index);
-      int modular_group_index = group_index;
-      if (enc_state->streaming_mode) {
-        JXL_ENSURE(group_index == 0);
-        modular_group_index = enc_state->dc_group_index;
-      }
-      JXL_RETURN_IF_ERROR(modular_frame_encoder->AddVarDCTDC(
-          frame_header, dc, r, modular_group_index,
-          enc_state->cparams.speed_tier < SpeedTier::kFalcon, enc_state,
-          /*jpeg_transcode=*/false));
-      return true;
-    };
-    JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, shared.frame_dim.num_dc_groups,
-                                  ThreadPool::NoInit, compute_dc_coeffs,
-                                  "Compute DC coeffs"));
-    // TODO(veluca): this is only useful in tests and if inspection is enabled.
-    if (!(frame_header.flags & FrameHeader::kSkipAdaptiveDCSmoothing)) {
-      JXL_RETURN_IF_ERROR(AdaptiveDCSmoothing(
-          memory_manager, shared.quantizer.MulDC(), &shared.dc_storage, pool));
-    }
-  }
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_cache.h b/third_party/jpeg-xl/lib/jxl/enc_cache.h
deleted file mode 100644
index 138a7c8ce897d..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_cache.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_CACHE_H_
-#define LIB_JXL_ENC_CACHE_H_
-
-#include <jxl/cms_interface.h>
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <memory>
-#include <vector>
-
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dct_util.h"
-#include "lib/jxl/enc_ans.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/enc_progressive_split.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/passes_state.h"
-#include "lib/jxl/quant_weights.h"
-
-namespace jxl {
-
-struct AuxOut;
-
-// Contains encoder state.
-struct PassesEncoderState {
-  explicit PassesEncoderState(JxlMemoryManager* memory_manager)
-      : shared(memory_manager) {}
-
-  PassesSharedState shared;
-
-  bool streaming_mode = false;
-  bool initialize_global_state = true;
-  size_t dc_group_index = 0;
-
-  // Per-pass DCT coefficients for the image. One row per group.
-  std::vector<std::unique_ptr<ACImage>> coeffs;
-
-  // Raw data for special (reference+DC) frames.
-  std::vector<std::unique_ptr<BitWriter>> special_frames;
-
-  // For splitting into passes.
-  ProgressiveSplitter progressive_splitter;
-
-  CompressParams cparams;
-
-  struct PassData {
-    std::vector<std::vector<Token>> ac_tokens;
-    std::vector<uint8_t> context_map;
-    EntropyEncodingData codes;
-  };
-
-  std::vector<PassData> passes;
-  std::vector<size_t> histogram_idx;
-
-  // Block sizes seen so far.
-  uint32_t used_acs = 0;
-  // Coefficient orders that are non-default.
-  std::vector<uint32_t> used_orders;
-
-  // Multiplier to be applied to the quant matrices of the x channel.
-  float x_qm_multiplier = 1.0f;
-  float b_qm_multiplier = 1.0f;
-
-  ImageF initial_quant_masking1x1;
-
-  JxlMemoryManager* memory_manager() const { return shared.memory_manager; }
-};
-
-// Initialize per-frame information.
-class ModularFrameEncoder;
-Status InitializePassesEncoder(const FrameHeader& frame_header,
-                               const Image3F& opsin, const Rect& rect,
-                               const JxlCmsInterface& cms, ThreadPool* pool,
-                               PassesEncoderState* passes_enc_state,
-                               ModularFrameEncoder* modular_frame_encoder,
-                               AuxOut* aux_out);
-
-Status ComputeACMetadata(ThreadPool* pool, PassesEncoderState* enc_state,
-                         ModularFrameEncoder* modular_frame_encoder);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_CACHE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_chroma_from_luma.cc b/third_party/jpeg-xl/lib/jxl/enc_chroma_from_luma.cc
deleted file mode 100644
index 2cf21bd73803f..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_chroma_from_luma.cc
+++ /dev/null
@@ -1,410 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_chroma_from_luma.h"
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <cfloat>
-#include <cmath>
-#include <cstdlib>
-#include <hwy/base.h>  // HWY_ALIGN_MAX
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/enc_chroma_from_luma.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/cms/opsin_params.h"
-#include "lib/jxl/dec_transforms-inl.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/enc_transforms-inl.h"
-#include "lib/jxl/quantizer.h"
-#include "lib/jxl/simd_util.h"
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Abs;
-using hwy::HWY_NAMESPACE::Ge;
-using hwy::HWY_NAMESPACE::GetLane;
-using hwy::HWY_NAMESPACE::IfThenElse;
-using hwy::HWY_NAMESPACE::Lt;
-
-static HWY_FULL(float) df;
-
-struct CFLFunction {
-  static constexpr float kCoeff = 1.f / 3;
-  static constexpr float kThres = 100.0f;
-  static constexpr float kInvColorFactor = 1.0f / kDefaultColorFactor;
-  CFLFunction(const float* values_m, const float* values_s, size_t num,
-              float base, float distance_mul)
-      : values_m(values_m),
-        values_s(values_s),
-        num(num),
-        base(base),
-        distance_mul(distance_mul) {
-    JXL_DASSERT(num % Lanes(df) == 0);
-  }
-
-  // Returns f'(x), where f is 1/3 * sum ((|color residual| + 1)^2-1) +
-  // distance_mul * x^2 * num.
-  float Compute(float x, float eps, float* fpeps, float* fmeps) const {
-    float first_derivative = 2 * distance_mul * num * x;
-    float first_derivative_peps = 2 * distance_mul * num * (x + eps);
-    float first_derivative_meps = 2 * distance_mul * num * (x - eps);
-
-    const auto inv_color_factor = Set(df, kInvColorFactor);
-    const auto thres = Set(df, kThres);
-    const auto coeffx2 = Set(df, kCoeff * 2.0f);
-    const auto one = Set(df, 1.0f);
-    const auto zero = Set(df, 0.0f);
-    const auto base_v = Set(df, base);
-    const auto x_v = Set(df, x);
-    const auto xpe_v = Set(df, x + eps);
-    const auto xme_v = Set(df, x - eps);
-    auto fd_v = Zero(df);
-    auto fdpe_v = Zero(df);
-    auto fdme_v = Zero(df);
-
-    for (size_t i = 0; i < num; i += Lanes(df)) {
-      // color residual = ax + b
-      const auto a = Mul(inv_color_factor, Load(df, values_m + i));
-      const auto b =
-          Sub(Mul(base_v, Load(df, values_m + i)), Load(df, values_s + i));
-      const auto v = MulAdd(a, x_v, b);
-      const auto vpe = MulAdd(a, xpe_v, b);
-      const auto vme = MulAdd(a, xme_v, b);
-      const auto av = Abs(v);
-      const auto avpe = Abs(vpe);
-      const auto avme = Abs(vme);
-      const auto acoeffx2 = Mul(coeffx2, a);
-      auto d = Mul(acoeffx2, Add(av, one));
-      auto dpe = Mul(acoeffx2, Add(avpe, one));
-      auto dme = Mul(acoeffx2, Add(avme, one));
-      d = IfThenElse(Lt(v, zero), Sub(zero, d), d);
-      dpe = IfThenElse(Lt(vpe, zero), Sub(zero, dpe), dpe);
-      dme = IfThenElse(Lt(vme, zero), Sub(zero, dme), dme);
-      const auto above = Ge(av, thres);
-      // TODO(eustas): use IfThenElseZero
-      fd_v = Add(fd_v, IfThenElse(above, zero, d));
-      fdpe_v = Add(fdpe_v, IfThenElse(above, zero, dpe));
-      fdme_v = Add(fdme_v, IfThenElse(above, zero, dme));
-    }
-
-    *fpeps = first_derivative_peps + GetLane(SumOfLanes(df, fdpe_v));
-    *fmeps = first_derivative_meps + GetLane(SumOfLanes(df, fdme_v));
-    return first_derivative + GetLane(SumOfLanes(df, fd_v));
-  }
-
-  const float* JXL_RESTRICT values_m;
-  const float* JXL_RESTRICT values_s;
-  size_t num;
-  float base;
-  float distance_mul;
-};
-
-// Chroma-from-luma search, values_m will have luma -- and values_s chroma.
-int32_t FindBestMultiplier(const float* values_m, const float* values_s,
-                           size_t num, float base, float distance_mul,
-                           bool fast) {
-  if (num == 0) {
-    return 0;
-  }
-  float x;
-  if (fast) {
-    static constexpr float kInvColorFactor = 1.0f / kDefaultColorFactor;
-    auto ca = Zero(df);
-    auto cb = Zero(df);
-    const auto inv_color_factor = Set(df, kInvColorFactor);
-    const auto base_v = Set(df, base);
-    for (size_t i = 0; i < num; i += Lanes(df)) {
-      // color residual = ax + b
-      const auto a = Mul(inv_color_factor, Load(df, values_m + i));
-      const auto b =
-          Sub(Mul(base_v, Load(df, values_m + i)), Load(df, values_s + i));
-      ca = MulAdd(a, a, ca);
-      cb = MulAdd(a, b, cb);
-    }
-    // + distance_mul * x^2 * num
-    x = -GetLane(SumOfLanes(df, cb)) /
-        (GetLane(SumOfLanes(df, ca)) + num * distance_mul * 0.5f);
-  } else {
-    constexpr float eps = 100;
-    constexpr float kClamp = 20.0f;
-    CFLFunction fn(values_m, values_s, num, base, distance_mul);
-    x = 0;
-    // Up to 20 Newton iterations, with approximate derivatives.
-    // Derivatives are approximate due to the high amount of noise in the exact
-    // derivatives.
-    for (size_t i = 0; i < 20; i++) {
-      float dfpeps;
-      float dfmeps;
-      float df = fn.Compute(x, eps, &dfpeps, &dfmeps);
-      float ddf = (dfpeps - dfmeps) / (2 * eps);
-      float kExperimentalInsignificantStabilizer = 0.85;
-      float step = df / (ddf + kExperimentalInsignificantStabilizer);
-      x -= std::min(kClamp, std::max(-kClamp, step));
-      if (std::abs(step) < 3e-3) break;
-    }
-  }
-  // CFL seems to be tricky for larger transforms for HF components
-  // close to zero. This heuristic brings the solutions closer to zero
-  // and reduces red-green oscillations. A better approach would
-  // look into variance of the multiplier within separate (e.g. 8x8)
-  // areas and only apply this heuristic where there is a high variance.
-  // This would give about 1 % more compression density.
-  float towards_zero = 2.6;
-  if (x >= towards_zero) {
-    x -= towards_zero;
-  } else if (x <= -towards_zero) {
-    x += towards_zero;
-  } else {
-    x = 0;
-  }
-  return std::max(-128.0f, std::min(127.0f, roundf(x)));
-}
-
-Status InitDCStorage(JxlMemoryManager* memory_manager, size_t num_blocks,
-                     ImageF* dc_values) {
-  // First row: Y channel
-  // Second row: X channel
-  // Third row: Y channel
-  // Fourth row: B channel
-  JXL_ASSIGN_OR_RETURN(
-      *dc_values,
-      ImageF::Create(memory_manager, RoundUpTo(num_blocks, Lanes(df)), 4));
-
-  JXL_ENSURE(dc_values->xsize() != 0);
-  // Zero-fill the last lanes
-  for (size_t y = 0; y < 4; y++) {
-    for (size_t x = dc_values->xsize() - Lanes(df); x < dc_values->xsize();
-         x++) {
-      dc_values->Row(y)[x] = 0;
-    }
-  }
-  return true;
-}
-
-Status ComputeTile(const Image3F& opsin, const Rect& opsin_rect,
-                   const DequantMatrices& dequant,
-                   const AcStrategyImage* ac_strategy,
-                   const ImageI* raw_quant_field, const Quantizer* quantizer,
-                   const Rect& rect, bool fast, bool use_dct8, ImageSB* map_x,
-                   ImageSB* map_b, ImageF* dc_values, float* mem) {
-  static_assert(kEncTileDimInBlocks == kColorTileDimInBlocks,
-                "Invalid color tile dim");
-  size_t xsize_blocks = opsin_rect.xsize() / kBlockDim;
-  constexpr float kDistanceMultiplierAC = 1e-9f;
-  const size_t dct_scratch_size =
-      3 * (MaxVectorSize() / sizeof(float)) * AcStrategy::kMaxBlockDim;
-
-  const size_t y0 = rect.y0();
-  const size_t x0 = rect.x0();
-  const size_t x1 = rect.x0() + rect.xsize();
-  const size_t y1 = rect.y0() + rect.ysize();
-
-  int ty = y0 / kColorTileDimInBlocks;
-  int tx = x0 / kColorTileDimInBlocks;
-
-  int8_t* JXL_RESTRICT row_out_x = map_x->Row(ty);
-  int8_t* JXL_RESTRICT row_out_b = map_b->Row(ty);
-
-  float* JXL_RESTRICT dc_values_yx = dc_values->Row(0);
-  float* JXL_RESTRICT dc_values_x = dc_values->Row(1);
-  float* JXL_RESTRICT dc_values_yb = dc_values->Row(2);
-  float* JXL_RESTRICT dc_values_b = dc_values->Row(3);
-
-  // All are aligned.
-  float* HWY_RESTRICT block_y = mem;
-  float* HWY_RESTRICT block_x = block_y + AcStrategy::kMaxCoeffArea;
-  float* HWY_RESTRICT block_b = block_x + AcStrategy::kMaxCoeffArea;
-  float* HWY_RESTRICT coeffs_yx = block_b + AcStrategy::kMaxCoeffArea;
-  float* HWY_RESTRICT coeffs_x = coeffs_yx + kColorTileDim * kColorTileDim;
-  float* HWY_RESTRICT coeffs_yb = coeffs_x + kColorTileDim * kColorTileDim;
-  float* HWY_RESTRICT coeffs_b = coeffs_yb + kColorTileDim * kColorTileDim;
-  float* HWY_RESTRICT scratch_space = coeffs_b + kColorTileDim * kColorTileDim;
-  float* scratch_space_end =
-      scratch_space + 2 * AcStrategy::kMaxCoeffArea + dct_scratch_size;
-  JXL_ENSURE(scratch_space_end == block_y + CfLHeuristics::ItemsPerThread());
-  (void)scratch_space_end;
-
-  // Small (~256 bytes each)
-  HWY_ALIGN_MAX float
-      dc_y[AcStrategy::kMaxCoeffBlocks * AcStrategy::kMaxCoeffBlocks] = {};
-  HWY_ALIGN_MAX float
-      dc_x[AcStrategy::kMaxCoeffBlocks * AcStrategy::kMaxCoeffBlocks] = {};
-  HWY_ALIGN_MAX float
-      dc_b[AcStrategy::kMaxCoeffBlocks * AcStrategy::kMaxCoeffBlocks] = {};
-  size_t num_ac = 0;
-
-  for (size_t y = y0; y < y1; ++y) {
-    const float* JXL_RESTRICT row_y =
-        opsin_rect.ConstPlaneRow(opsin, 1, y * kBlockDim);
-    const float* JXL_RESTRICT row_x =
-        opsin_rect.ConstPlaneRow(opsin, 0, y * kBlockDim);
-    const float* JXL_RESTRICT row_b =
-        opsin_rect.ConstPlaneRow(opsin, 2, y * kBlockDim);
-    size_t stride = opsin.PixelsPerRow();
-
-    for (size_t x = x0; x < x1; x++) {
-      AcStrategy acs = use_dct8
-                           ? AcStrategy::FromRawStrategy(AcStrategyType::DCT)
-                           : ac_strategy->ConstRow(y)[x];
-      if (!acs.IsFirstBlock()) continue;
-      size_t xs = acs.covered_blocks_x();
-      TransformFromPixels(acs.Strategy(), row_y + x * kBlockDim, stride,
-                          block_y, scratch_space);
-      DCFromLowestFrequencies(acs.Strategy(), block_y, dc_y, xs);
-      TransformFromPixels(acs.Strategy(), row_x + x * kBlockDim, stride,
-                          block_x, scratch_space);
-      DCFromLowestFrequencies(acs.Strategy(), block_x, dc_x, xs);
-      TransformFromPixels(acs.Strategy(), row_b + x * kBlockDim, stride,
-                          block_b, scratch_space);
-      DCFromLowestFrequencies(acs.Strategy(), block_b, dc_b, xs);
-      const float* const JXL_RESTRICT qm_x =
-          dequant.InvMatrix(acs.Strategy(), 0);
-      const float* const JXL_RESTRICT qm_b =
-          dequant.InvMatrix(acs.Strategy(), 2);
-      float q_dc_x = use_dct8 ? 1 : 1.0f / quantizer->GetInvDcStep(0);
-      float q_dc_b = use_dct8 ? 1 : 1.0f / quantizer->GetInvDcStep(2);
-
-      // Copy DCs in dc_values.
-      for (size_t iy = 0; iy < acs.covered_blocks_y(); iy++) {
-        for (size_t ix = 0; ix < xs; ix++) {
-          dc_values_yx[(iy + y) * xsize_blocks + ix + x] =
-              dc_y[iy * xs + ix] * q_dc_x;
-          dc_values_x[(iy + y) * xsize_blocks + ix + x] =
-              dc_x[iy * xs + ix] * q_dc_x;
-          dc_values_yb[(iy + y) * xsize_blocks + ix + x] =
-              dc_y[iy * xs + ix] * q_dc_b;
-          dc_values_b[(iy + y) * xsize_blocks + ix + x] =
-              dc_b[iy * xs + ix] * q_dc_b;
-        }
-      }
-
-      // Do not use this block for computing AC CfL.
-      if (acs.covered_blocks_x() + x0 > x1 ||
-          acs.covered_blocks_y() + y0 > y1) {
-        continue;
-      }
-
-      // Copy AC coefficients in the local block. The order in which
-      // coefficients get stored does not matter.
-      size_t cx = acs.covered_blocks_x();
-      size_t cy = acs.covered_blocks_y();
-      CoefficientLayout(&cy, &cx);
-      // Zero out LFs. This introduces terms in the optimization loop that
-      // don't affect the result, as they are all 0, but allow for simpler
-      // SIMDfication.
-      for (size_t iy = 0; iy < cy; iy++) {
-        for (size_t ix = 0; ix < cx; ix++) {
-          block_y[cx * kBlockDim * iy + ix] = 0;
-          block_x[cx * kBlockDim * iy + ix] = 0;
-          block_b[cx * kBlockDim * iy + ix] = 0;
-        }
-      }
-      // Unclear why this is like it is. (This works slightly better
-      // than the previous approach which was also a hack.)
-      const float qq =
-          (raw_quant_field == nullptr) ? 1.0f : raw_quant_field->Row(y)[x];
-      // Experimentally values 128-130 seem best -- I don't know why we
-      // need this multiplier.
-      const float kStrangeMultiplier = 128;
-      float q = use_dct8 ? 1 : quantizer->Scale() * kStrangeMultiplier * qq;
-      const auto qv = Set(df, q);
-      for (size_t i = 0; i < cx * cy * 64; i += Lanes(df)) {
-        const auto b_y = Load(df, block_y + i);
-        const auto b_x = Load(df, block_x + i);
-        const auto b_b = Load(df, block_b + i);
-        const auto qqm_x = Mul(qv, Load(df, qm_x + i));
-        const auto qqm_b = Mul(qv, Load(df, qm_b + i));
-        Store(Mul(b_y, qqm_x), df, coeffs_yx + num_ac);
-        Store(Mul(b_x, qqm_x), df, coeffs_x + num_ac);
-        Store(Mul(b_y, qqm_b), df, coeffs_yb + num_ac);
-        Store(Mul(b_b, qqm_b), df, coeffs_b + num_ac);
-        num_ac += Lanes(df);
-      }
-    }
-  }
-  JXL_ENSURE(num_ac % Lanes(df) == 0);
-  row_out_x[tx] = FindBestMultiplier(coeffs_yx, coeffs_x, num_ac, 0.0f,
-                                     kDistanceMultiplierAC, fast);
-  row_out_b[tx] =
-      FindBestMultiplier(coeffs_yb, coeffs_b, num_ac, jxl::cms::kYToBRatio,
-                         kDistanceMultiplierAC, fast);
-  return true;
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(InitDCStorage);
-HWY_EXPORT(ComputeTile);
-
-Status CfLHeuristics::Init(const Rect& rect) {
-  size_t xsize_blocks = rect.xsize() / kBlockDim;
-  size_t ysize_blocks = rect.ysize() / kBlockDim;
-  return HWY_DYNAMIC_DISPATCH(InitDCStorage)(
-      memory_manager, xsize_blocks * ysize_blocks, &dc_values);
-}
-
-Status CfLHeuristics::ComputeTile(const Rect& r, const Image3F& opsin,
-                                  const Rect& opsin_rect,
-                                  const DequantMatrices& dequant,
-                                  const AcStrategyImage* ac_strategy,
-                                  const ImageI* raw_quant_field,
-                                  const Quantizer* quantizer, bool fast,
-                                  size_t thread, ColorCorrelationMap* cmap) {
-  bool use_dct8 = ac_strategy == nullptr;
-  return HWY_DYNAMIC_DISPATCH(ComputeTile)(
-      opsin, opsin_rect, dequant, ac_strategy, raw_quant_field, quantizer, r,
-      fast, use_dct8, &cmap->ytox_map, &cmap->ytob_map, &dc_values,
-      mem.address<float>() + thread * ItemsPerThread());
-}
-
-Status ColorCorrelationEncodeDC(const ColorCorrelation& color_correlation,
-                                BitWriter* writer, LayerType layer,
-                                AuxOut* aux_out) {
-  float color_factor = color_correlation.GetColorFactor();
-  float base_correlation_x = color_correlation.GetBaseCorrelationX();
-  float base_correlation_b = color_correlation.GetBaseCorrelationB();
-  int32_t ytox_dc = color_correlation.GetYToXDC();
-  int32_t ytob_dc = color_correlation.GetYToBDC();
-
-  return writer->WithMaxBits(
-      1 + 2 * kBitsPerByte + 12 + 32, layer, aux_out, [&]() -> Status {
-        if (ytox_dc == 0 && ytob_dc == 0 &&
-            color_factor == kDefaultColorFactor && base_correlation_x == 0.0f &&
-            base_correlation_b == jxl::cms::kYToBRatio) {
-          writer->Write(1, 1);
-          return true;
-        }
-        writer->Write(1, 0);
-        JXL_RETURN_IF_ERROR(
-            U32Coder::Write(kColorFactorDist, color_factor, writer));
-        JXL_RETURN_IF_ERROR(F16Coder::Write(base_correlation_x, writer));
-        JXL_RETURN_IF_ERROR(F16Coder::Write(base_correlation_b, writer));
-        writer->Write(kBitsPerByte,
-                      ytox_dc - std::numeric_limits<int8_t>::min());
-        writer->Write(kBitsPerByte,
-                      ytob_dc - std::numeric_limits<int8_t>::min());
-        return true;
-      });
-}
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/enc_chroma_from_luma.h b/third_party/jpeg-xl/lib/jxl/enc_chroma_from_luma.h
deleted file mode 100644
index 54e6e623759ab..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_chroma_from_luma.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_CHROMA_FROM_LUMA_H_
-#define LIB_JXL_ENC_CHROMA_FROM_LUMA_H_
-
-// Chroma-from-luma, computed using heuristics to determine the best linear
-// model for the X and B channels from the Y channel.
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-
-#include "lib/jxl/ac_strategy.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/chroma_from_luma.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/memory_manager_internal.h"
-#include "lib/jxl/quant_weights.h"
-#include "lib/jxl/simd_util.h"
-
-namespace jxl {
-
-struct AuxOut;
-enum class LayerType : uint8_t;
-class Quantizer;
-
-Status ColorCorrelationEncodeDC(const ColorCorrelation& color_correlation,
-                                BitWriter* writer, LayerType layer,
-                                AuxOut* aux_out);
-
-struct CfLHeuristics {
-  explicit CfLHeuristics(JxlMemoryManager* memory_manager)
-      : memory_manager(memory_manager) {}
-
-  Status Init(const Rect& rect);
-
-  Status PrepareForThreads(size_t num_threads) {
-    size_t mem_bytes = num_threads * ItemsPerThread() * sizeof(float);
-    JXL_ASSIGN_OR_RETURN(mem, AlignedMemory::Create(memory_manager, mem_bytes));
-    return true;
-  }
-
-  Status ComputeTile(const Rect& r, const Image3F& opsin,
-                     const Rect& opsin_rect, const DequantMatrices& dequant,
-                     const AcStrategyImage* ac_strategy,
-                     const ImageI* raw_quant_field, const Quantizer* quantizer,
-                     bool fast, size_t thread, ColorCorrelationMap* cmap);
-
-  JxlMemoryManager* memory_manager;
-  ImageF dc_values;
-  AlignedMemory mem;
-
-  // Working set is too large for stack; allocate dynamically.
-  static size_t ItemsPerThread() {
-    const size_t dct_scratch_size =
-        3 * (MaxVectorSize() / sizeof(float)) * AcStrategy::kMaxBlockDim;
-    return AcStrategy::kMaxCoeffArea * 3        // Blocks
-           + kColorTileDim * kColorTileDim * 4  // AC coeff storage
-           + AcStrategy::kMaxCoeffArea * 2      // Scratch space
-           + dct_scratch_size;
-  }
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_CHROMA_FROM_LUMA_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_cluster.cc b/third_party/jpeg-xl/lib/jxl/enc_cluster.cc
deleted file mode 100644
index 65eb464cdc606..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_cluster.cc
+++ /dev/null
@@ -1,358 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_cluster.h"
-
-#include <algorithm>
-#include <cmath>
-#include <limits>
-#include <map>
-#include <numeric>
-#include <queue>
-#include <tuple>
-
-#include "lib/jxl/base/status.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/enc_cluster.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/fast_math-inl.h"
-#include "lib/jxl/enc_ans.h"
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Eq;
-using hwy::HWY_NAMESPACE::IfThenZeroElse;
-
-template <class V>
-V Entropy(V count, V inv_total, V total) {
-  const HWY_CAPPED(float, Histogram::kRounding) d;
-  const auto zero = Set(d, 0.0f);
-  // TODO(eustas): why (0 - x) instead of Neg(x)?
-  return IfThenZeroElse(
-      Eq(count, total),
-      Sub(zero, Mul(count, FastLog2f(d, Mul(inv_total, count)))));
-}
-
-void HistogramEntropy(const Histogram& a) {
-  a.entropy_ = 0.0f;
-  if (a.total_count_ == 0) return;
-
-  const HWY_CAPPED(float, Histogram::kRounding) df;
-  const HWY_CAPPED(int32_t, Histogram::kRounding) di;
-
-  const auto inv_tot = Set(df, 1.0f / a.total_count_);
-  auto entropy_lanes = Zero(df);
-  auto total = Set(df, a.total_count_);
-
-  for (size_t i = 0; i < a.data_.size(); i += Lanes(di)) {
-    const auto counts = LoadU(di, &a.data_[i]);
-    entropy_lanes =
-        Add(entropy_lanes, Entropy(ConvertTo(df, counts), inv_tot, total));
-  }
-  a.entropy_ += GetLane(SumOfLanes(df, entropy_lanes));
-}
-
-float HistogramDistance(const Histogram& a, const Histogram& b) {
-  if (a.total_count_ == 0 || b.total_count_ == 0) return 0;
-
-  const HWY_CAPPED(float, Histogram::kRounding) df;
-  const HWY_CAPPED(int32_t, Histogram::kRounding) di;
-
-  const auto inv_tot = Set(df, 1.0f / (a.total_count_ + b.total_count_));
-  auto distance_lanes = Zero(df);
-  auto total = Set(df, a.total_count_ + b.total_count_);
-
-  for (size_t i = 0; i < std::max(a.data_.size(), b.data_.size());
-       i += Lanes(di)) {
-    const auto a_counts =
-        a.data_.size() > i ? LoadU(di, &a.data_[i]) : Zero(di);
-    const auto b_counts =
-        b.data_.size() > i ? LoadU(di, &b.data_[i]) : Zero(di);
-    const auto counts = ConvertTo(df, Add(a_counts, b_counts));
-    distance_lanes = Add(distance_lanes, Entropy(counts, inv_tot, total));
-  }
-  const float total_distance = GetLane(SumOfLanes(df, distance_lanes));
-  return total_distance - a.entropy_ - b.entropy_;
-}
-
-constexpr const float kInfinity = std::numeric_limits<float>::infinity();
-
-float HistogramKLDivergence(const Histogram& actual, const Histogram& coding) {
-  if (actual.total_count_ == 0) return 0;
-  if (coding.total_count_ == 0) return kInfinity;
-
-  const HWY_CAPPED(float, Histogram::kRounding) df;
-  const HWY_CAPPED(int32_t, Histogram::kRounding) di;
-
-  const auto coding_inv = Set(df, 1.0f / coding.total_count_);
-  auto cost_lanes = Zero(df);
-
-  for (size_t i = 0; i < actual.data_.size(); i += Lanes(di)) {
-    const auto counts = LoadU(di, &actual.data_[i]);
-    const auto coding_counts =
-        coding.data_.size() > i ? LoadU(di, &coding.data_[i]) : Zero(di);
-    const auto coding_probs = Mul(ConvertTo(df, coding_counts), coding_inv);
-    const auto neg_coding_cost = BitCast(
-        df,
-        IfThenZeroElse(Eq(counts, Zero(di)),
-                       IfThenElse(Eq(coding_counts, Zero(di)),
-                                  BitCast(di, Set(df, -kInfinity)),
-                                  BitCast(di, FastLog2f(df, coding_probs)))));
-    cost_lanes = NegMulAdd(ConvertTo(df, counts), neg_coding_cost, cost_lanes);
-  }
-  const float total_cost = GetLane(SumOfLanes(df, cost_lanes));
-  return total_cost - actual.entropy_;
-}
-
-// First step of a k-means clustering with a fancy distance metric.
-Status FastClusterHistograms(const std::vector<Histogram>& in,
-                             size_t max_histograms, std::vector<Histogram>* out,
-                             std::vector<uint32_t>* histogram_symbols) {
-  const size_t prev_histograms = out->size();
-  out->reserve(max_histograms);
-  histogram_symbols->clear();
-  histogram_symbols->resize(in.size(), max_histograms);
-
-  std::vector<float> dists(in.size(), std::numeric_limits<float>::max());
-  size_t largest_idx = 0;
-  for (size_t i = 0; i < in.size(); i++) {
-    if (in[i].total_count_ == 0) {
-      (*histogram_symbols)[i] = 0;
-      dists[i] = 0.0f;
-      continue;
-    }
-    HistogramEntropy(in[i]);
-    if (in[i].total_count_ > in[largest_idx].total_count_) {
-      largest_idx = i;
-    }
-  }
-
-  if (prev_histograms > 0) {
-    for (size_t j = 0; j < prev_histograms; ++j) {
-      HistogramEntropy((*out)[j]);
-    }
-    for (size_t i = 0; i < in.size(); i++) {
-      if (dists[i] == 0.0f) continue;
-      for (size_t j = 0; j < prev_histograms; ++j) {
-        dists[i] = std::min(HistogramKLDivergence(in[i], (*out)[j]), dists[i]);
-      }
-    }
-    auto max_dist = std::max_element(dists.begin(), dists.end());
-    if (*max_dist > 0.0f) {
-      largest_idx = max_dist - dists.begin();
-    }
-  }
-
-  constexpr float kMinDistanceForDistinct = 48.0f;
-  while (out->size() < max_histograms) {
-    (*histogram_symbols)[largest_idx] = out->size();
-    out->push_back(in[largest_idx]);
-    dists[largest_idx] = 0.0f;
-    largest_idx = 0;
-    for (size_t i = 0; i < in.size(); i++) {
-      if (dists[i] == 0.0f) continue;
-      dists[i] = std::min(HistogramDistance(in[i], out->back()), dists[i]);
-      if (dists[i] > dists[largest_idx]) largest_idx = i;
-    }
-    if (dists[largest_idx] < kMinDistanceForDistinct) break;
-  }
-
-  for (size_t i = 0; i < in.size(); i++) {
-    if ((*histogram_symbols)[i] != max_histograms) continue;
-    size_t best = 0;
-    float best_dist = std::numeric_limits<float>::max();
-    for (size_t j = 0; j < out->size(); j++) {
-      float dist = j < prev_histograms ? HistogramKLDivergence(in[i], (*out)[j])
-                                       : HistogramDistance(in[i], (*out)[j]);
-      if (dist < best_dist) {
-        best = j;
-        best_dist = dist;
-      }
-    }
-    JXL_ENSURE(best_dist < std::numeric_limits<float>::max());
-    if (best >= prev_histograms) {
-      (*out)[best].AddHistogram(in[i]);
-      HistogramEntropy((*out)[best]);
-    }
-    (*histogram_symbols)[i] = best;
-  }
-  return true;
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-HWY_EXPORT(FastClusterHistograms);  // Local function
-HWY_EXPORT(HistogramEntropy);       // Local function
-
-StatusOr<float> Histogram::PopulationCost() const {
-  return ANSPopulationCost(data_.data(), data_.size());
-}
-
-float Histogram::ShannonEntropy() const {
-  HWY_DYNAMIC_DISPATCH(HistogramEntropy)(*this);
-  return entropy_;
-}
-
-namespace {
-// -----------------------------------------------------------------------------
-// Histogram refinement
-
-// Reorder histograms in *out so that the new symbols in *symbols come in
-// increasing order.
-void HistogramReindex(std::vector<Histogram>* out, size_t prev_histograms,
-                      std::vector<uint32_t>* symbols) {
-  std::vector<Histogram> tmp(*out);
-  std::map<int, int> new_index;
-  for (size_t i = 0; i < prev_histograms; ++i) {
-    new_index[i] = i;
-  }
-  int next_index = prev_histograms;
-  for (uint32_t symbol : *symbols) {
-    if (new_index.find(symbol) == new_index.end()) {
-      new_index[symbol] = next_index;
-      (*out)[next_index] = tmp[symbol];
-      ++next_index;
-    }
-  }
-  out->resize(next_index);
-  for (uint32_t& symbol : *symbols) {
-    symbol = new_index[symbol];
-  }
-}
-
-}  // namespace
-
-// Clusters similar histograms in 'in' together, the selected histograms are
-// placed in 'out', and for each index in 'in', *histogram_symbols will
-// indicate which of the 'out' histograms is the best approximation.
-Status ClusterHistograms(const HistogramParams& params,
-                         const std::vector<Histogram>& in,
-                         size_t max_histograms, std::vector<Histogram>* out,
-                         std::vector<uint32_t>* histogram_symbols) {
-  size_t prev_histograms = out->size();
-  max_histograms = std::min(max_histograms, params.max_histograms);
-  max_histograms = std::min(max_histograms, in.size());
-  if (params.clustering == HistogramParams::ClusteringType::kFastest) {
-    max_histograms = std::min(max_histograms, static_cast<size_t>(4));
-  }
-
-  JXL_RETURN_IF_ERROR(HWY_DYNAMIC_DISPATCH(FastClusterHistograms)(
-      in, prev_histograms + max_histograms, out, histogram_symbols));
-
-  if (prev_histograms == 0 &&
-      params.clustering == HistogramParams::ClusteringType::kBest) {
-    for (auto& histo : *out) {
-      JXL_ASSIGN_OR_RETURN(
-          histo.entropy_,
-          ANSPopulationCost(histo.data_.data(), histo.data_.size()));
-    }
-    uint32_t next_version = 2;
-    std::vector<uint32_t> version(out->size(), 1);
-    std::vector<uint32_t> renumbering(out->size());
-    std::iota(renumbering.begin(), renumbering.end(), 0);
-
-    // Try to pair up clusters if doing so reduces the total cost.
-
-    struct HistogramPair {
-      // validity of a pair: p.version == max(version[i], version[j])
-      float cost;
-      uint32_t first;
-      uint32_t second;
-      uint32_t version;
-      // We use > because priority queues sort in *decreasing* order, but we
-      // want lower cost elements to appear first.
-      bool operator<(const HistogramPair& other) const {
-        return std::make_tuple(cost, first, second, version) >
-               std::make_tuple(other.cost, other.first, other.second,
-                               other.version);
-      }
-    };
-
-    // Create list of all pairs by increasing merging cost.
-    std::priority_queue<HistogramPair> pairs_to_merge;
-    for (uint32_t i = 0; i < out->size(); i++) {
-      for (uint32_t j = i + 1; j < out->size(); j++) {
-        Histogram histo;
-        histo.AddHistogram((*out)[i]);
-        histo.AddHistogram((*out)[j]);
-        JXL_ASSIGN_OR_RETURN(float cost, ANSPopulationCost(histo.data_.data(),
-                                                           histo.data_.size()));
-        cost -= (*out)[i].entropy_ + (*out)[j].entropy_;
-        // Avoid enqueueing pairs that are not advantageous to merge.
-        if (cost >= 0) continue;
-        pairs_to_merge.push(
-            HistogramPair{cost, i, j, std::max(version[i], version[j])});
-      }
-    }
-
-    // Merge the best pair to merge, add new pairs that get formed as a
-    // consequence.
-    while (!pairs_to_merge.empty()) {
-      uint32_t first = pairs_to_merge.top().first;
-      uint32_t second = pairs_to_merge.top().second;
-      uint32_t ver = pairs_to_merge.top().version;
-      pairs_to_merge.pop();
-      if (ver != std::max(version[first], version[second]) ||
-          version[first] == 0 || version[second] == 0) {
-        continue;
-      }
-      (*out)[first].AddHistogram((*out)[second]);
-      JXL_ASSIGN_OR_RETURN(float cost,
-                           ANSPopulationCost((*out)[first].data_.data(),
-                                             (*out)[first].data_.size()));
-      (*out)[first].entropy_ = cost;
-      for (uint32_t& item : renumbering) {
-        if (item == second) {
-          item = first;
-        }
-      }
-      version[second] = 0;
-      version[first] = next_version++;
-      for (uint32_t j = 0; j < out->size(); j++) {
-        if (j == first) continue;
-        if (version[j] == 0) continue;
-        Histogram histo;
-        histo.AddHistogram((*out)[first]);
-        histo.AddHistogram((*out)[j]);
-        JXL_ASSIGN_OR_RETURN(float cost, ANSPopulationCost(histo.data_.data(),
-                                                           histo.data_.size()));
-        cost -= (*out)[first].entropy_ + (*out)[j].entropy_;
-        // Avoid enqueueing pairs that are not advantageous to merge.
-        if (cost >= 0) continue;
-        pairs_to_merge.push(
-            HistogramPair{cost, std::min(first, j), std::max(first, j),
-                          std::max(version[first], version[j])});
-      }
-    }
-    std::vector<uint32_t> reverse_renumbering(out->size(), -1);
-    size_t num_alive = 0;
-    for (size_t i = 0; i < out->size(); i++) {
-      if (version[i] == 0) continue;
-      (*out)[num_alive++] = (*out)[i];
-      reverse_renumbering[i] = num_alive - 1;
-    }
-    out->resize(num_alive);
-    for (uint32_t& item : *histogram_symbols) {
-      item = reverse_renumbering[renumbering[item]];
-    }
-  }
-
-  // Convert the context map to a canonical form.
-  HistogramReindex(out, prev_histograms, histogram_symbols);
-  return true;
-}
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/enc_cluster.h b/third_party/jpeg-xl/lib/jxl/enc_cluster.h
deleted file mode 100644
index 3182970d2823d..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_cluster.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Functions for clustering similar histograms together.
-
-#ifndef LIB_JXL_ENC_CLUSTER_H_
-#define LIB_JXL_ENC_CLUSTER_H_
-
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <vector>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_ans_params.h"
-
-namespace jxl {
-
-struct Histogram {
-  Histogram() {
-    total_count_ = 0;
-    entropy_ = 0.0;
-  }
-  void Clear() {
-    data_.clear();
-    total_count_ = 0;
-  }
-  void Add(size_t symbol) {
-    if (data_.size() <= symbol) {
-      data_.resize(DivCeil(symbol + 1, kRounding) * kRounding);
-    }
-    ++data_[symbol];
-    ++total_count_;
-  }
-  void AddHistogram(const Histogram& other) {
-    if (other.data_.size() > data_.size()) {
-      data_.resize(other.data_.size());
-    }
-    for (size_t i = 0; i < other.data_.size(); ++i) {
-      data_[i] += other.data_[i];
-    }
-    total_count_ += other.total_count_;
-  }
-  size_t alphabet_size() const {
-    for (int i = data_.size() - 1; i >= 0; --i) {
-      if (data_[i] > 0) {
-        return i + 1;
-      }
-    }
-    return 1;
-  }
-  StatusOr<float> PopulationCost() const;
-  float ShannonEntropy() const;
-
-  std::vector<ANSHistBin> data_;
-  size_t total_count_;
-  mutable float entropy_;  // WARNING: not kept up-to-date.
-  static constexpr size_t kRounding = 8;
-};
-
-Status ClusterHistograms(const HistogramParams& params,
-                         const std::vector<Histogram>& in,
-                         size_t max_histograms, std::vector<Histogram>* out,
-                         std::vector<uint32_t>* histogram_symbols);
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_CLUSTER_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_coeff_order.cc b/third_party/jpeg-xl/lib/jxl/enc_coeff_order.cc
deleted file mode 100644
index acc13f1225d4c..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_coeff_order.cc
+++ /dev/null
@@ -1,339 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/memory_manager.h>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/memory_manager_internal.h"
-
-// Suppress any -Wdeprecated-declarations warning that might be emitted by
-// GCC or Clang by std::stable_sort in C++17 or later mode
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#elif defined(__GNUC__)
-#pragma GCC push_options
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
-#include <algorithm>
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#pragma GCC pop_options
-#endif
-
-#include <cmath>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/ac_strategy.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/coeff_order.h"
-#include "lib/jxl/coeff_order_fwd.h"
-#include "lib/jxl/dct_util.h"
-#include "lib/jxl/enc_ans.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/lehmer_code.h"
-
-namespace jxl {
-
-struct AuxOut;
-enum class LayerType : uint8_t;
-
-std::pair<uint32_t, uint32_t> ComputeUsedOrders(
-    const SpeedTier speed, const AcStrategyImage& ac_strategy,
-    const Rect& rect) {
-  // No coefficient reordering in Falcon or faster.
-  // Only uses DCT8 = 0, so bitfield = 1.
-  if (speed >= SpeedTier::kFalcon) return {1, 1};
-
-  uint32_t ret = 0;
-  uint32_t ret_customize = 0;
-  size_t xsize_blocks = rect.xsize();
-  size_t ysize_blocks = rect.ysize();
-  // TODO(veluca): precompute when doing DCT.
-  for (size_t by = 0; by < ysize_blocks; ++by) {
-    AcStrategyRow acs_row = ac_strategy.ConstRow(rect, by);
-    for (size_t bx = 0; bx < xsize_blocks; ++bx) {
-      int ord = kStrategyOrder[acs_row[bx].RawStrategy()];
-      // Do not customize coefficient orders for blocks bigger than 32x32.
-      ret |= 1u << ord;
-      if (ord > 6) {
-        continue;
-      }
-      ret_customize |= 1u << ord;
-    }
-  }
-  // Use default orders for small images.
-  if (ac_strategy.xsize() < 5 && ac_strategy.ysize() < 5) return {ret, 0};
-  return {ret, ret_customize};
-}
-
-Status ComputeCoeffOrder(SpeedTier speed, const ACImage& acs,
-                         const AcStrategyImage& ac_strategy,
-                         const FrameDimensions& frame_dim,
-                         uint32_t& all_used_orders, uint32_t prev_used_acs,
-                         uint32_t current_used_acs,
-                         uint32_t current_used_orders,
-                         coeff_order_t* JXL_RESTRICT order) {
-  JxlMemoryManager* memory_manager = ac_strategy.memory_manager();
-  std::vector<int32_t> num_zeros(kCoeffOrderMaxSize);
-  // If compressing at high speed and only using 8x8 DCTs, only consider a
-  // subset of blocks.
-  double block_fraction = 1.0f;
-  // TODO(veluca): figure out why sampling blocks if non-8x8s are used makes
-  // encoding significantly less dense.
-  if (speed >= SpeedTier::kSquirrel && current_used_orders == 1) {
-    block_fraction = 0.5f;
-  }
-  // No need to compute number of zero coefficients if all orders are the
-  // default.
-  if (current_used_orders != 0) {
-    uint64_t threshold =
-        (std::numeric_limits<uint64_t>::max() >> 32) * block_fraction;
-    uint64_t s[2] = {static_cast<uint64_t>(0x94D049BB133111EBull),
-                     static_cast<uint64_t>(0xBF58476D1CE4E5B9ull)};
-    // Xorshift128+ adapted from xorshift128+-inl.h
-    auto use_sample = [&]() {
-      auto s1 = s[0];
-      const auto s0 = s[1];
-      const auto bits = s1 + s0;  // b, c
-      s[0] = s0;
-      s1 ^= s1 << 23;
-      s1 ^= s0 ^ (s1 >> 18) ^ (s0 >> 5);
-      s[1] = s1;
-      return (bits >> 32) <= threshold;
-    };
-
-    // Count number of zero coefficients, separately for each DCT band.
-    // TODO(veluca): precompute when doing DCT.
-    for (size_t group_index = 0; group_index < frame_dim.num_groups;
-         group_index++) {
-      const size_t gx = group_index % frame_dim.xsize_groups;
-      const size_t gy = group_index / frame_dim.xsize_groups;
-      const Rect rect(gx * kGroupDimInBlocks, gy * kGroupDimInBlocks,
-                      kGroupDimInBlocks, kGroupDimInBlocks,
-                      frame_dim.xsize_blocks, frame_dim.ysize_blocks);
-      ConstACPtr rows[3];
-      ACType type = acs.Type();
-      for (size_t c = 0; c < 3; c++) {
-        rows[c] = acs.PlaneRow(c, group_index, 0);
-      }
-      size_t ac_offset = 0;
-
-      // TODO(veluca): SIMDfy.
-      for (size_t by = 0; by < rect.ysize(); ++by) {
-        AcStrategyRow acs_row = ac_strategy.ConstRow(rect, by);
-        for (size_t bx = 0; bx < rect.xsize(); ++bx) {
-          AcStrategy acs = acs_row[bx];
-          if (!acs.IsFirstBlock()) continue;
-          if (!use_sample()) continue;
-          size_t size = kDCTBlockSize << acs.log2_covered_blocks();
-          for (size_t c = 0; c < 3; ++c) {
-            const size_t order_offset =
-                CoeffOrderOffset(kStrategyOrder[acs.RawStrategy()], c);
-            if (type == ACType::k16) {
-              for (size_t k = 0; k < size; k++) {
-                bool is_zero = rows[c].ptr16[ac_offset + k] == 0;
-                num_zeros[order_offset + k] += is_zero ? 1 : 0;
-              }
-            } else {
-              for (size_t k = 0; k < size; k++) {
-                bool is_zero = rows[c].ptr32[ac_offset + k] == 0;
-                num_zeros[order_offset + k] += is_zero ? 1 : 0;
-              }
-            }
-            // Ensure LLFs are first in the order.
-            size_t cx = acs.covered_blocks_x();
-            size_t cy = acs.covered_blocks_y();
-            CoefficientLayout(&cy, &cx);
-            for (size_t iy = 0; iy < cy; iy++) {
-              for (size_t ix = 0; ix < cx; ix++) {
-                num_zeros[order_offset + iy * kBlockDim * cx + ix] = -1;
-              }
-            }
-          }
-          ac_offset += size;
-        }
-      }
-    }
-  }
-  struct PosAndCount {
-    uint32_t pos;
-    uint32_t count;
-  };
-  size_t mem_bytes = AcStrategy::kMaxCoeffArea * sizeof(PosAndCount);
-  JXL_ASSIGN_OR_RETURN(auto mem,
-                       AlignedMemory::Create(memory_manager, mem_bytes));
-
-  std::vector<coeff_order_t> natural_order_buffer;
-
-  uint16_t computed = 0;
-  for (uint8_t o = 0; o < AcStrategy::kNumValidStrategies; ++o) {
-    uint8_t ord = kStrategyOrder[o];
-    if (computed & (1 << ord)) continue;
-    computed |= 1 << ord;
-    AcStrategy acs = AcStrategy::FromRawStrategy(o);
-    size_t sz = kDCTBlockSize * acs.covered_blocks_x() * acs.covered_blocks_y();
-
-    // Do nothing for transforms that don't appear.
-    if ((1 << ord) & ~current_used_acs) continue;
-
-    // Do nothing if we already committed to this custom order previously.
-    if ((1 << ord) & prev_used_acs) continue;
-    if ((1 << ord) & all_used_orders) continue;
-
-    if (natural_order_buffer.size() < sz) natural_order_buffer.resize(sz);
-    acs.ComputeNaturalCoeffOrder(natural_order_buffer.data());
-
-    // Ensure natural coefficient order is not permuted if the order is
-    // not transmitted.
-    if ((1 << ord) & ~current_used_orders) {
-      for (size_t c = 0; c < 3; c++) {
-        size_t offset = CoeffOrderOffset(ord, c);
-        JXL_ENSURE(CoeffOrderOffset(ord, c + 1) - offset == sz);
-        memcpy(&order[offset], natural_order_buffer.data(),
-               sz * sizeof(*order));
-      }
-      continue;
-    }
-
-    bool is_nondefault = false;
-    for (uint8_t c = 0; c < 3; c++) {
-      // Apply zig-zag order.
-      PosAndCount* pos_and_val = mem.address<PosAndCount>();
-      size_t offset = CoeffOrderOffset(ord, c);
-      JXL_ENSURE(CoeffOrderOffset(ord, c + 1) - offset == sz);
-      float inv_sqrt_sz = 1.0f / std::sqrt(sz);
-      for (size_t i = 0; i < sz; ++i) {
-        size_t pos = natural_order_buffer[i];
-        pos_and_val[i].pos = pos;
-        // We don't care for the exact number -> quantize number of zeros,
-        // to get less permuted order.
-        pos_and_val[i].count = num_zeros[offset + pos] * inv_sqrt_sz + 0.1f;
-      }
-
-      // Stable-sort -> elements with same number of zeros will preserve their
-      // order.
-      auto comparator = [](const PosAndCount& a, const PosAndCount& b) -> bool {
-        return a.count < b.count;
-      };
-      std::stable_sort(pos_and_val, pos_and_val + sz, comparator);
-
-      // Grab indices.
-      for (size_t i = 0; i < sz; ++i) {
-        order[offset + i] = pos_and_val[i].pos;
-        is_nondefault |= natural_order_buffer[i] != pos_and_val[i].pos;
-      }
-    }
-    if (!is_nondefault) {
-      current_used_orders &= ~(1 << ord);
-    }
-  }
-  all_used_orders |= current_used_orders;
-  return true;
-}
-
-namespace {
-
-Status TokenizePermutation(const coeff_order_t* JXL_RESTRICT order, size_t skip,
-                           size_t size, std::vector<Token>* tokens) {
-  std::vector<LehmerT> lehmer(size);
-  std::vector<uint32_t> temp(size + 1);
-  JXL_RETURN_IF_ERROR(
-      ComputeLehmerCode(order, temp.data(), size, lehmer.data()));
-  size_t end = size;
-  while (end > skip && lehmer[end - 1] == 0) {
-    --end;
-  }
-  tokens->emplace_back(CoeffOrderContext(size), end - skip);
-  uint32_t last = 0;
-  for (size_t i = skip; i < end; ++i) {
-    tokens->emplace_back(CoeffOrderContext(last), lehmer[i]);
-    last = lehmer[i];
-  }
-  return true;
-}
-
-}  // namespace
-
-Status EncodePermutation(const coeff_order_t* JXL_RESTRICT order, size_t skip,
-                         size_t size, BitWriter* writer, LayerType layer,
-                         AuxOut* aux_out) {
-  JxlMemoryManager* memory_manager = writer->memory_manager();
-  std::vector<std::vector<Token>> tokens(1);
-  JXL_RETURN_IF_ERROR(TokenizePermutation(order, skip, size, tokens.data()));
-  std::vector<uint8_t> context_map;
-  EntropyEncodingData codes;
-  JXL_ASSIGN_OR_RETURN(
-      size_t cost, BuildAndEncodeHistograms(
-                       memory_manager, HistogramParams(), kPermutationContexts,
-                       tokens, &codes, &context_map, writer, layer, aux_out));
-  (void)cost;
-  JXL_RETURN_IF_ERROR(
-      WriteTokens(tokens[0], codes, context_map, 0, writer, layer, aux_out));
-  return true;
-}
-
-namespace {
-Status EncodeCoeffOrder(const coeff_order_t* JXL_RESTRICT order, AcStrategy acs,
-                        std::vector<Token>* tokens, coeff_order_t* order_zigzag,
-                        std::vector<coeff_order_t>& natural_order_lut) {
-  const size_t llf = acs.covered_blocks_x() * acs.covered_blocks_y();
-  const size_t size = kDCTBlockSize * llf;
-  for (size_t i = 0; i < size; ++i) {
-    order_zigzag[i] = natural_order_lut[order[i]];
-  }
-  JXL_RETURN_IF_ERROR(TokenizePermutation(order_zigzag, llf, size, tokens));
-  return true;
-}
-}  // namespace
-
-Status EncodeCoeffOrders(uint16_t used_orders,
-                         const coeff_order_t* JXL_RESTRICT order,
-                         BitWriter* writer, LayerType layer,
-                         AuxOut* JXL_RESTRICT aux_out) {
-  JxlMemoryManager* memory_manager = writer->memory_manager();
-  size_t mem_bytes = AcStrategy::kMaxCoeffArea * sizeof(coeff_order_t);
-  JXL_ASSIGN_OR_RETURN(auto mem,
-                       AlignedMemory::Create(memory_manager, mem_bytes));
-  uint16_t computed = 0;
-  std::vector<std::vector<Token>> tokens(1);
-  std::vector<coeff_order_t> natural_order_lut;
-  for (uint8_t o = 0; o < AcStrategy::kNumValidStrategies; ++o) {
-    uint8_t ord = kStrategyOrder[o];
-    if (computed & (1 << ord)) continue;
-    computed |= 1 << ord;
-    if ((used_orders & (1 << ord)) == 0) continue;
-    AcStrategy acs = AcStrategy::FromRawStrategy(o);
-    const size_t llf = acs.covered_blocks_x() * acs.covered_blocks_y();
-    const size_t size = kDCTBlockSize * llf;
-    if (natural_order_lut.size() < size) natural_order_lut.resize(size);
-    acs.ComputeNaturalCoeffOrderLut(natural_order_lut.data());
-    for (size_t c = 0; c < 3; c++) {
-      JXL_RETURN_IF_ERROR(
-          EncodeCoeffOrder(&order[CoeffOrderOffset(ord, c)], acs, tokens.data(),
-                           mem.address<coeff_order_t>(), natural_order_lut));
-    }
-  }
-  // Do not write anything if no order is used.
-  if (used_orders != 0) {
-    std::vector<uint8_t> context_map;
-    EntropyEncodingData codes;
-    JXL_ASSIGN_OR_RETURN(
-        size_t cost,
-        BuildAndEncodeHistograms(memory_manager, HistogramParams(),
-                                 kPermutationContexts, tokens, &codes,
-                                 &context_map, writer, layer, aux_out));
-    (void)cost;
-    JXL_RETURN_IF_ERROR(
-        WriteTokens(tokens[0], codes, context_map, 0, writer, layer, aux_out));
-  }
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_coeff_order.h b/third_party/jpeg-xl/lib/jxl/enc_coeff_order.h
deleted file mode 100644
index 6c57a97cd7aad..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_coeff_order.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_COEFF_ORDER_H_
-#define LIB_JXL_ENC_COEFF_ORDER_H_
-
-#include <cstddef>
-#include <cstdint>
-#include <utility>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/coeff_order_fwd.h"
-#include "lib/jxl/common.h"
-#include "lib/jxl/dct_util.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/frame_dimensions.h"
-
-namespace jxl {
-
-struct AuxOut;
-class AcStrategyImage;
-enum class LayerType : uint8_t;
-
-// Orders that are actually used in part of image. `rect` is in block units.
-// Returns {orders that are used, orders that might be made non-default}.
-std::pair<uint32_t, uint32_t> ComputeUsedOrders(
-    SpeedTier speed, const AcStrategyImage& ac_strategy, const Rect& rect);
-
-// Modify zig-zag order, so that DCT bands with more zeros go later.
-// Order of DCT bands with same number of zeros is untouched, so
-// permutation will be cheaper to encode.
-Status ComputeCoeffOrder(SpeedTier speed, const ACImage& acs,
-                         const AcStrategyImage& ac_strategy,
-                         const FrameDimensions& frame_dim,
-                         uint32_t& all_used_orders, uint32_t prev_used_acs,
-                         uint32_t current_used_acs,
-                         uint32_t current_used_orders,
-                         coeff_order_t* JXL_RESTRICT order);
-
-Status EncodeCoeffOrders(uint16_t used_orders,
-                         const coeff_order_t* JXL_RESTRICT order,
-                         BitWriter* writer, LayerType layer,
-                         AuxOut* JXL_RESTRICT aux_out);
-
-// Encoding/decoding of a single permutation. `size`: number of elements in the
-// permutation. `skip`: number of elements to skip from the *beginning* of the
-// permutation.
-Status EncodePermutation(const coeff_order_t* JXL_RESTRICT order, size_t skip,
-                         size_t size, BitWriter* writer, LayerType layer,
-                         AuxOut* aux_out);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_COEFF_ORDER_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_comparator.cc b/third_party/jpeg-xl/lib/jxl/enc_comparator.cc
deleted file mode 100644
index 4bb722ac42510..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_comparator.cc
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_comparator.h"
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <cstddef>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_gamma_correct.h"
-#include "lib/jxl/enc_image_bundle.h"
-
-namespace jxl {
-namespace {
-
-// color is linear, but blending happens in gamma-compressed space using
-// (gamma-compressed) grayscale background color, alpha image represents
-// weights of the sRGB colors in the [0 .. (1 << bit_depth) - 1] interval,
-// output image is in linear space.
-void AlphaBlend(const Image3F& in, const size_t c, float background_linear,
-                const ImageF& alpha, Image3F* out) {
-  const float background = LinearToSrgb8Direct(background_linear);
-
-  for (size_t y = 0; y < out->ysize(); ++y) {
-    const float* JXL_RESTRICT row_a = alpha.ConstRow(y);
-    const float* JXL_RESTRICT row_i = in.ConstPlaneRow(c, y);
-    float* JXL_RESTRICT row_o = out->PlaneRow(c, y);
-    for (size_t x = 0; x < out->xsize(); ++x) {
-      const float a = row_a[x];
-      if (a <= 0.f) {
-        row_o[x] = background_linear;
-      } else if (a >= 1.f) {
-        row_o[x] = row_i[x];
-      } else {
-        const float w_fg = a;
-        const float w_bg = 1.0f - w_fg;
-        const float fg = w_fg * LinearToSrgb8Direct(row_i[x]);
-        const float bg = w_bg * background;
-        row_o[x] = Srgb8ToLinearDirect(fg + bg);
-      }
-    }
-  }
-}
-
-void AlphaBlend(float background_linear, ImageBundle* io_linear_srgb) {
-  // No alpha => all opaque.
-  if (!io_linear_srgb->HasAlpha()) return;
-
-  for (size_t c = 0; c < 3; ++c) {
-    AlphaBlend(*io_linear_srgb->color(), c, background_linear,
-               *io_linear_srgb->alpha(), io_linear_srgb->color());
-  }
-}
-
-Status ComputeScoreImpl(const ImageBundle& rgb0, const ImageBundle& rgb1,
-                        Comparator* comparator, ImageF* distmap, float& score) {
-  JXL_RETURN_IF_ERROR(comparator->SetReferenceImage(rgb0));
-  JXL_RETURN_IF_ERROR(comparator->CompareWith(rgb1, distmap, &score));
-  return true;
-}
-
-}  // namespace
-
-Status ComputeScore(const ImageBundle& rgb0, const ImageBundle& rgb1,
-                    Comparator* comparator, const JxlCmsInterface& cms,
-                    float* score, ImageF* diffmap, ThreadPool* pool,
-                    bool ignore_alpha) {
-  JxlMemoryManager* memory_manager = rgb0.memory_manager();
-  // Convert to linear sRGB (unless already in that space)
-  ImageMetadata metadata0 = *rgb0.metadata();
-  ImageBundle store0(memory_manager, &metadata0);
-  const ImageBundle* linear_srgb0;
-  JXL_RETURN_IF_ERROR(
-      TransformIfNeeded(rgb0, ColorEncoding::LinearSRGB(rgb0.IsGray()), cms,
-                        pool, &store0, &linear_srgb0));
-  ImageMetadata metadata1 = *rgb1.metadata();
-  ImageBundle store1(memory_manager, &metadata1);
-  const ImageBundle* linear_srgb1;
-  JXL_RETURN_IF_ERROR(
-      TransformIfNeeded(rgb1, ColorEncoding::LinearSRGB(rgb1.IsGray()), cms,
-                        pool, &store1, &linear_srgb1));
-
-  // No alpha: skip blending, only need a single call to Butteraugli.
-  if (ignore_alpha || (!rgb0.HasAlpha() && !rgb1.HasAlpha())) {
-    JXL_RETURN_IF_ERROR(ComputeScoreImpl(*linear_srgb0, *linear_srgb1,
-                                         comparator, diffmap, *score));
-    return true;
-  }
-
-  // Blend on black and white backgrounds
-
-  const float black = 0.0f;
-  JXL_ASSIGN_OR_RETURN(ImageBundle blended_black0, linear_srgb0->Copy());
-  JXL_ASSIGN_OR_RETURN(ImageBundle blended_black1, linear_srgb1->Copy());
-  AlphaBlend(black, &blended_black0);
-  AlphaBlend(black, &blended_black1);
-
-  const float white = 1.0f;
-  JXL_ASSIGN_OR_RETURN(ImageBundle blended_white0, linear_srgb0->Copy());
-  JXL_ASSIGN_OR_RETURN(ImageBundle blended_white1, linear_srgb1->Copy());
-
-  AlphaBlend(white, &blended_white0);
-  AlphaBlend(white, &blended_white1);
-
-  ImageF diffmap_black;
-  ImageF diffmap_white;
-  float dist_black;
-  JXL_RETURN_IF_ERROR(ComputeScoreImpl(blended_black0, blended_black1,
-                                       comparator, &diffmap_black, dist_black));
-  float dist_white;
-  JXL_RETURN_IF_ERROR(ComputeScoreImpl(blended_white0, blended_white1,
-                                       comparator, &diffmap_white, dist_white));
-
-  // diffmap and return values are the max of diffmap_black/white.
-  if (diffmap != nullptr) {
-    const size_t xsize = rgb0.xsize();
-    const size_t ysize = rgb0.ysize();
-    JXL_ASSIGN_OR_RETURN(*diffmap,
-                         ImageF::Create(memory_manager, xsize, ysize));
-    for (size_t y = 0; y < ysize; ++y) {
-      const float* JXL_RESTRICT row_black = diffmap_black.ConstRow(y);
-      const float* JXL_RESTRICT row_white = diffmap_white.ConstRow(y);
-      float* JXL_RESTRICT row_out = diffmap->Row(y);
-      for (size_t x = 0; x < xsize; ++x) {
-        row_out[x] = std::max(row_black[x], row_white[x]);
-      }
-    }
-  }
-  *score = std::max(dist_black, dist_white);
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_comparator.h b/third_party/jpeg-xl/lib/jxl/enc_comparator.h
deleted file mode 100644
index 6ae6913abe898..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_comparator.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_COMPARATOR_H_
-#define LIB_JXL_ENC_COMPARATOR_H_
-
-#include <jxl/cms_interface.h>
-
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-
-namespace jxl {
-
-class Comparator {
- public:
-  virtual ~Comparator() = default;
-
-  // Sets the reference image, the first to compare
-  // Image must be in linear sRGB (gamma expanded) in range 0.0f-1.0f as
-  // the range from standard black point to standard white point, but values
-  // outside permitted.
-  virtual Status SetReferenceImage(const ImageBundle& ref) = 0;
-
-  // Sets the actual image (with loss), the second to compare
-  // Image must be in linear sRGB (gamma expanded) in range 0.0f-1.0f as
-  // the range from standard black point to standard white point, but values
-  // outside permitted.
-  // In diffmap it outputs the local score per pixel, while in score it outputs
-  // a single score. Any one may be set to nullptr to not compute it.
-  virtual Status CompareWith(const ImageBundle& actual, ImageF* diffmap,
-                             float* score) = 0;
-
-  // Quality thresholds for diffmap and score values.
-  // The good score must represent a value where the images are considered to
-  // be perceptually indistinguishable (but not identical)
-  // The bad value must be larger than good to indicate "lower means better"
-  // and smaller than good to indicate "higher means better"
-  virtual float GoodQualityScore() const = 0;
-  virtual float BadQualityScore() const = 0;
-};
-
-// Computes the score given images in any RGB color model, optionally with
-// alpha channel.
-Status ComputeScore(const ImageBundle& rgb0, const ImageBundle& rgb1,
-                    Comparator* comparator, const JxlCmsInterface& cms,
-                    float* score, ImageF* diffmap = nullptr,
-                    ThreadPool* pool = nullptr, bool ignore_alpha = false);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_COMPARATOR_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_context_map.cc b/third_party/jpeg-xl/lib/jxl/enc_context_map.cc
deleted file mode 100644
index c5a9a515b162e..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_context_map.cc
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Library to encode the context map.
-
-#include "lib/jxl/enc_context_map.h"
-
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_ans.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/entropy_coder.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/pack_signed.h"
-
-namespace jxl {
-
-namespace {
-
-size_t IndexOf(const std::vector<uint8_t>& v, uint8_t value) {
-  size_t i = 0;
-  for (; i < v.size(); ++i) {
-    if (v[i] == value) return i;
-  }
-  return i;
-}
-
-void MoveToFront(std::vector<uint8_t>* v, size_t index) {
-  uint8_t value = (*v)[index];
-  for (size_t i = index; i != 0; --i) {
-    (*v)[i] = (*v)[i - 1];
-  }
-  (*v)[0] = value;
-}
-
-std::vector<uint8_t> MoveToFrontTransform(const std::vector<uint8_t>& v) {
-  if (v.empty()) return v;
-  uint8_t max_value = *std::max_element(v.begin(), v.end());
-  std::vector<uint8_t> mtf(max_value + 1);
-  for (size_t i = 0; i <= max_value; ++i) mtf[i] = i;
-  std::vector<uint8_t> result(v.size());
-  for (size_t i = 0; i < v.size(); ++i) {
-    size_t index = IndexOf(mtf, v[i]);
-    JXL_DASSERT(index < mtf.size());
-    result[i] = static_cast<uint8_t>(index);
-    MoveToFront(&mtf, index);
-  }
-  return result;
-}
-
-}  // namespace
-
-Status EncodeContextMap(const std::vector<uint8_t>& context_map,
-                        size_t num_histograms, BitWriter* writer,
-                        LayerType layer, AuxOut* aux_out) {
-  if (num_histograms == 1) {
-    // Simple code
-    writer->Write(1, 1);
-    // 0 bits per entry.
-    writer->Write(2, 0);
-    return true;
-  }
-
-  JxlMemoryManager* memory_manager = writer->memory_manager();
-  std::vector<uint8_t> transformed_symbols = MoveToFrontTransform(context_map);
-  std::vector<std::vector<Token>> tokens(1);
-  std::vector<std::vector<Token>> mtf_tokens(1);
-  for (const uint8_t& ctx : context_map) {
-    tokens[0].emplace_back(0, ctx);
-  }
-  for (const uint8_t& sym : transformed_symbols) {
-    mtf_tokens[0].emplace_back(0, sym);
-  }
-  HistogramParams params;
-  params.uint_method = HistogramParams::HybridUintMethod::kContextMap;
-  size_t ans_cost;
-  size_t mtf_cost;
-  {
-    EntropyEncodingData codes;
-    std::vector<uint8_t> sink_context_map;
-    JXL_ASSIGN_OR_RETURN(ans_cost, BuildAndEncodeHistograms(
-                                       memory_manager, params, 1, tokens,
-                                       &codes, &sink_context_map, nullptr,
-                                       LayerType::Header, /*aux_out*/ nullptr));
-  }
-  {
-    EntropyEncodingData codes;
-    std::vector<uint8_t> sink_context_map;
-    JXL_ASSIGN_OR_RETURN(mtf_cost, BuildAndEncodeHistograms(
-                                       memory_manager, params, 1, mtf_tokens,
-                                       &codes, &sink_context_map, nullptr,
-                                       LayerType::Header, /*aux_out*/ nullptr));
-  }
-  bool use_mtf = mtf_cost < ans_cost;
-  // Rebuild token list.
-  tokens[0].clear();
-  for (size_t i = 0; i < transformed_symbols.size(); i++) {
-    tokens[0].emplace_back(0,
-                           use_mtf ? transformed_symbols[i] : context_map[i]);
-  }
-  size_t entry_bits = CeilLog2Nonzero(num_histograms);
-  size_t simple_cost = entry_bits * context_map.size();
-  if (entry_bits < 4 && simple_cost < ans_cost && simple_cost < mtf_cost) {
-    JXL_RETURN_IF_ERROR(writer->WithMaxBits(
-        3 + entry_bits * context_map.size(), layer, aux_out, [&] {
-          writer->Write(1, 1);
-          writer->Write(2, entry_bits);
-          for (uint8_t entry : context_map) {
-            writer->Write(entry_bits, entry);
-          }
-          return true;
-        }));
-  } else {
-    JXL_RETURN_IF_ERROR(writer->WithMaxBits(
-        2 + tokens[0].size() * 24, layer, aux_out, [&]() -> Status {
-          writer->Write(1, 0);
-          writer->Write(1, TO_JXL_BOOL(use_mtf));  // Use/don't use MTF.
-          EntropyEncodingData codes;
-          std::vector<uint8_t> sink_context_map;
-          JXL_ASSIGN_OR_RETURN(size_t cost,
-                               BuildAndEncodeHistograms(
-                                   memory_manager, params, 1, tokens, &codes,
-                                   &sink_context_map, writer, layer, aux_out));
-          (void)cost;
-          WriteTokens(tokens[0], codes, sink_context_map, 0, writer);
-          return true;
-        }));
-  }
-  return true;
-}
-
-Status EncodeBlockCtxMap(const BlockCtxMap& block_ctx_map, BitWriter* writer,
-                         AuxOut* aux_out) {
-  const auto& dct = block_ctx_map.dc_thresholds;
-  const auto& qft = block_ctx_map.qf_thresholds;
-  const auto& ctx_map = block_ctx_map.ctx_map;
-  return writer->WithMaxBits(
-      (dct[0].size() + dct[1].size() + dct[2].size() + qft.size()) * 34 + 1 +
-          4 + 4 + ctx_map.size() * 10 + 1024,
-      LayerType::Ac, aux_out, [&]() -> Status {
-        if (dct[0].empty() && dct[1].empty() && dct[2].empty() && qft.empty() &&
-            ctx_map.size() == 21 &&
-            std::equal(ctx_map.begin(), ctx_map.end(),
-                       BlockCtxMap::kDefaultCtxMap)) {
-          writer->Write(1, 1);  // default
-          return true;
-        }
-        writer->Write(1, 0);
-        for (int j : {0, 1, 2}) {
-          writer->Write(4, dct[j].size());
-          for (int i : dct[j]) {
-            JXL_RETURN_IF_ERROR(
-                U32Coder::Write(kDCThresholdDist, PackSigned(i), writer));
-          }
-        }
-        writer->Write(4, qft.size());
-        for (uint32_t i : qft) {
-          JXL_RETURN_IF_ERROR(U32Coder::Write(kQFThresholdDist, i - 1, writer));
-        }
-        JXL_RETURN_IF_ERROR(EncodeContextMap(ctx_map, block_ctx_map.num_ctxs,
-                                             writer, LayerType::Ac, aux_out));
-        return true;
-      });
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_context_map.h b/third_party/jpeg-xl/lib/jxl/enc_context_map.h
deleted file mode 100644
index ba770a939bd3e..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_context_map.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_CONTEXT_MAP_H_
-#define LIB_JXL_ENC_CONTEXT_MAP_H_
-
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/ac_context.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_bit_writer.h"
-
-namespace jxl {
-
-struct AuxOut;
-enum class LayerType : uint8_t;
-
-// Max limit is 255 because encoding assumes numbers < 255
-// More clusters can help compression, but makes encode/decode somewhat slower
-static const size_t kClustersLimit = 128;
-
-// Encodes the given context map to the bit stream. The number of different
-// histogram ids is given by num_histograms.
-Status EncodeContextMap(const std::vector<uint8_t>& context_map,
-                        size_t num_histograms, BitWriter* writer,
-                        LayerType layer, AuxOut* aux_out);
-
-Status EncodeBlockCtxMap(const BlockCtxMap& block_ctx_map, BitWriter* writer,
-                         AuxOut* aux_out);
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_CONTEXT_MAP_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_debug_image.cc b/third_party/jpeg-xl/lib/jxl/enc_debug_image.cc
deleted file mode 100644
index a1fd910455085..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_debug_image.cc
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_debug_image.h"
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/dec_external_image.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/image_ops.h"
-
-namespace jxl {
-
-namespace {
-template <typename From>
-StatusOr<Image3F> ConvertToFloat(const Image3<From>& from) {
-  float factor = 1.0f / std::numeric_limits<From>::max();
-  if (std::is_same<From, double>::value || std::is_same<From, float>::value) {
-    factor = 1.0f;
-  }
-  JxlMemoryManager* memory_manager = from.memory_manager();
-  JXL_ASSIGN_OR_RETURN(
-      Image3F to, Image3F::Create(memory_manager, from.xsize(), from.ysize()));
-  for (size_t c = 0; c < 3; ++c) {
-    for (size_t y = 0; y < from.ysize(); ++y) {
-      const From* const JXL_RESTRICT row_from = from.ConstPlaneRow(c, y);
-      float* const JXL_RESTRICT row_to = to.PlaneRow(c, y);
-      for (size_t x = 0; x < from.xsize(); ++x) {
-        row_to[x] = row_from[x] * factor;
-      }
-    }
-  }
-  return to;
-}
-
-template <typename T>
-Status DumpImageT(const CompressParams& cparams, const char* label,
-                  const ColorEncoding& color_encoding, const Image3<T>& image) {
-  if (!cparams.debug_image) return true;
-  JXL_ASSIGN_OR_RETURN(Image3F float_image, ConvertToFloat(image));
-  JxlColorEncoding color = color_encoding.ToExternal();
-  size_t num_pixels = 3 * image.xsize() * image.ysize();
-  std::vector<uint16_t> pixels(num_pixels);
-  const ImageF* channels[3];
-  for (int c = 0; c < 3; ++c) {
-    channels[c] = &float_image.Plane(c);
-  }
-  JXL_RETURN_IF_ERROR(ConvertChannelsToExternal(
-      channels, 3, 16, false, JXL_BIG_ENDIAN, 6 * image.xsize(), nullptr,
-      pixels.data(), 2 * num_pixels, PixelCallback(), Orientation::kIdentity));
-  (*cparams.debug_image)(cparams.debug_image_opaque, label, image.xsize(),
-                         image.ysize(), &color, pixels.data());
-  return true;
-}
-
-template <typename T>
-Status DumpPlaneNormalizedT(const CompressParams& cparams, const char* label,
-                            const Plane<T>& image) {
-  T min;
-  T max;
-  ImageMinMax(image, &min, &max);
-  JxlMemoryManager* memory_manager = image.memory_manager();
-
-  JXL_ASSIGN_OR_RETURN(
-      Image3B normalized,
-      Image3B::Create(memory_manager, image.xsize(), image.ysize()));
-  for (size_t c = 0; c < 3; ++c) {
-    float mul = min == max ? 0 : (255.0f / (max - min));
-    for (size_t y = 0; y < image.ysize(); ++y) {
-      const T* JXL_RESTRICT row_in = image.ConstRow(y);
-      uint8_t* JXL_RESTRICT row_out = normalized.PlaneRow(c, y);
-      for (size_t x = 0; x < image.xsize(); ++x) {
-        row_out[x] = static_cast<uint8_t>((row_in[x] - min) * mul);
-      }
-    }
-  }
-  return DumpImageT(cparams, label, ColorEncoding::SRGB(), normalized);
-}
-
-}  // namespace
-
-Status DumpImage(const CompressParams& cparams, const char* label,
-                 const Image3<float>& image) {
-  return DumpImageT(cparams, label, ColorEncoding::SRGB(), image);
-}
-
-Status DumpImage(const CompressParams& cparams, const char* label,
-                 const Image3<uint8_t>& image) {
-  return DumpImageT(cparams, label, ColorEncoding::SRGB(), image);
-}
-
-Status DumpXybImage(const CompressParams& cparams, const char* label,
-                    const Image3F& image) {
-  if (!cparams.debug_image) return true;
-  JxlMemoryManager* memory_manager = image.memory_manager();
-
-  JXL_ASSIGN_OR_RETURN(
-      Image3F linear,
-      Image3F::Create(memory_manager, image.xsize(), image.ysize()));
-  OpsinParams opsin_params;
-  opsin_params.Init(kDefaultIntensityTarget);
-  JXL_RETURN_IF_ERROR(
-      OpsinToLinear(image, Rect(linear), nullptr, &linear, opsin_params));
-
-  return DumpImageT(cparams, label, ColorEncoding::LinearSRGB(), linear);
-}
-
-Status DumpPlaneNormalized(const CompressParams& cparams, const char* label,
-                           const Plane<float>& image) {
-  return DumpPlaneNormalizedT(cparams, label, image);
-}
-
-Status DumpPlaneNormalized(const CompressParams& cparams, const char* label,
-                           const Plane<uint8_t>& image) {
-  return DumpPlaneNormalizedT(cparams, label, image);
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_debug_image.h b/third_party/jpeg-xl/lib/jxl/enc_debug_image.h
deleted file mode 100644
index 98d27e705cdf2..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_debug_image.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_DEBUG_IMAGE_H_
-#define LIB_JXL_ENC_DEBUG_IMAGE_H_
-
-// Optional output images for debugging.
-
-#include <cstdint>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/image.h"
-
-namespace jxl {
-
-Status DumpImage(const CompressParams& cparams, const char* label,
-                 const Image3<float>& image);
-Status DumpImage(const CompressParams& cparams, const char* label,
-                 const Image3<uint8_t>& image);
-Status DumpXybImage(const CompressParams& cparams, const char* label,
-                    const Image3<float>& image);
-Status DumpPlaneNormalized(const CompressParams& cparams, const char* label,
-                           const Plane<float>& image);
-Status DumpPlaneNormalized(const CompressParams& cparams, const char* label,
-                           const Plane<uint8_t>& image);
-
-// Used to skip image creation if they won't be written to debug directory.
-static inline bool WantDebugOutput(const CompressParams& cparams) {
-  return cparams.debug_image != nullptr;
-}
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_DEBUG_IMAGE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_detect_dots.cc b/third_party/jpeg-xl/lib/jxl/enc_detect_dots.cc
deleted file mode 100644
index 6fde418f8b42d..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_detect_dots.cc
+++ /dev/null
@@ -1,617 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_detect_dots.h"
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <array>
-#include <cmath>
-#include <cstdint>
-#include <cstdio>
-#include <utility>
-#include <vector>
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/enc_detect_dots.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/convolve.h"
-#include "lib/jxl/enc_linalg.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_ops.h"
-
-// Set JXL_DEBUG_DOT_DETECT to 1 to enable debugging.
-#ifndef JXL_DEBUG_DOT_DETECT
-#define JXL_DEBUG_DOT_DETECT 0
-#endif
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::Sub;
-
-StatusOr<ImageF> SumOfSquareDifferences(const Image3F& forig,
-                                        const Image3F& smooth,
-                                        ThreadPool* pool) {
-  const HWY_FULL(float) d;
-  const auto color_coef0 = Set(d, 0.0f);
-  const auto color_coef1 = Set(d, 10.0f);
-  const auto color_coef2 = Set(d, 0.0f);
-  JxlMemoryManager* memory_manager = forig.memory_manager();
-
-  JXL_ASSIGN_OR_RETURN(
-      ImageF sum_of_squares,
-      ImageF::Create(memory_manager, forig.xsize(), forig.ysize()));
-  const auto process_row = [&](const uint32_t task, size_t thread) -> Status {
-    const size_t y = static_cast<size_t>(task);
-    const float* JXL_RESTRICT orig_row0 = forig.Plane(0).ConstRow(y);
-    const float* JXL_RESTRICT orig_row1 = forig.Plane(1).ConstRow(y);
-    const float* JXL_RESTRICT orig_row2 = forig.Plane(2).ConstRow(y);
-    const float* JXL_RESTRICT smooth_row0 = smooth.Plane(0).ConstRow(y);
-    const float* JXL_RESTRICT smooth_row1 = smooth.Plane(1).ConstRow(y);
-    const float* JXL_RESTRICT smooth_row2 = smooth.Plane(2).ConstRow(y);
-    float* JXL_RESTRICT sos_row = sum_of_squares.Row(y);
-
-    for (size_t x = 0; x < forig.xsize(); x += Lanes(d)) {
-      auto v0 = Sub(Load(d, orig_row0 + x), Load(d, smooth_row0 + x));
-      auto v1 = Sub(Load(d, orig_row1 + x), Load(d, smooth_row1 + x));
-      auto v2 = Sub(Load(d, orig_row2 + x), Load(d, smooth_row2 + x));
-      v0 = Mul(Mul(v0, v0), color_coef0);
-      v1 = Mul(Mul(v1, v1), color_coef1);
-      v2 = Mul(Mul(v2, v2), color_coef2);
-      const auto sos = Add(v0, Add(v1, v2));  // weighted sum of square diffs
-      Store(sos, d, sos_row + x);
-    }
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, forig.ysize(), ThreadPool::NoInit,
-                                process_row, "ComputeEnergyImage"));
-  return sum_of_squares;
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-HWY_EXPORT(SumOfSquareDifferences);  // Local function
-
-const int kEllipseWindowSize = 5;
-
-namespace {
-struct GaussianEllipse {
-  double x;                         // position in x
-  double y;                         // position in y
-  double sigma_x;                   // scale in x
-  double sigma_y;                   // scale in y
-  double angle;                     // ellipse rotation in radians
-  std::array<double, 3> intensity;  // intensity in each channel
-
-  // The following variables do not need to be encoded
-  double l2_loss;  // error after the Gaussian was fit
-  double l1_loss;
-  double ridge_loss;              // the l2_loss plus regularization term
-  double custom_loss;             // experimental custom loss
-  std::array<double, 3> bgColor;  // best background color
-  size_t neg_pixels;  // number of negative pixels when subtracting dot
-  std::array<double, 3> neg_value;  // debt due to channel truncation
-};
-double DotGaussianModel(double dx, double dy, double ct, double st,
-                        double sigma_x, double sigma_y, double intensity) {
-  double rx = ct * dx + st * dy;
-  double ry = -st * dx + ct * dy;
-  double md = (rx * rx / sigma_x) + (ry * ry / sigma_y);
-  double value = intensity * exp(-0.5 * md);
-  return value;
-}
-
-constexpr bool kOptimizeBackground = true;
-
-// Gaussian that smooths noise but preserves dots
-const WeightsSeparable5& WeightsSeparable5Gaussian0_65() {
-  constexpr float w0 = 0.558311f;
-  constexpr float w1 = 0.210395f;
-  constexpr float w2 = 0.010449f;
-  static constexpr WeightsSeparable5 weights = {
-      {HWY_REP4(w0), HWY_REP4(w1), HWY_REP4(w2)},
-      {HWY_REP4(w0), HWY_REP4(w1), HWY_REP4(w2)}};
-  return weights;
-}
-
-// (Iterated) Gaussian that removes dots.
-const WeightsSeparable5& WeightsSeparable5Gaussian3() {
-  constexpr float w0 = 0.222338f;
-  constexpr float w1 = 0.210431f;
-  constexpr float w2 = 0.1784f;
-  static constexpr WeightsSeparable5 weights = {
-      {HWY_REP4(w0), HWY_REP4(w1), HWY_REP4(w2)},
-      {HWY_REP4(w0), HWY_REP4(w1), HWY_REP4(w2)}};
-  return weights;
-}
-
-StatusOr<ImageF> ComputeEnergyImage(const Image3F& orig, Image3F* smooth,
-                                    ThreadPool* pool) {
-  JxlMemoryManager* memory_manager = orig.memory_manager();
-  // Prepare guidance images for dot selection.
-  JXL_ASSIGN_OR_RETURN(
-      Image3F forig,
-      Image3F::Create(memory_manager, orig.xsize(), orig.ysize()));
-  JXL_ASSIGN_OR_RETURN(
-      *smooth, Image3F::Create(memory_manager, orig.xsize(), orig.ysize()));
-  Rect rect(orig);
-
-  const auto& weights1 = WeightsSeparable5Gaussian0_65();
-  const auto& weights3 = WeightsSeparable5Gaussian3();
-
-  for (size_t c = 0; c < 3; ++c) {
-    // Use forig as temporary storage to reduce memory and keep it warmer.
-    JXL_RETURN_IF_ERROR(
-        Separable5(orig.Plane(c), rect, weights3, pool, &forig.Plane(c)));
-    JXL_RETURN_IF_ERROR(
-        Separable5(forig.Plane(c), rect, weights3, pool, &smooth->Plane(c)));
-    JXL_RETURN_IF_ERROR(
-        Separable5(orig.Plane(c), rect, weights1, pool, &forig.Plane(c)));
-  }
-
-  return HWY_DYNAMIC_DISPATCH(SumOfSquareDifferences)(forig, *smooth, pool);
-}
-
-struct Pixel {
-  int x;
-  int y;
-};
-
-Pixel operator+(const Pixel& a, const Pixel& b) {
-  return Pixel{a.x + b.x, a.y + b.y};
-}
-
-// Maximum area in pixels of a ellipse
-const size_t kMaxCCSize = 1000;
-
-// Extracts a connected component from a Binary image where seed is part
-// of the component
-bool ExtractComponent(const Rect& rect, ImageF* img, std::vector<Pixel>* pixels,
-                      const Pixel& seed, double threshold) {
-  static const std::vector<Pixel> neighbors{{1, -1}, {1, 0},   {1, 1},  {0, -1},
-                                            {0, 1},  {-1, -1}, {-1, 1}, {1, 0}};
-  std::vector<Pixel> q{seed};
-  while (!q.empty()) {
-    Pixel current = q.back();
-    q.pop_back();
-    pixels->push_back(current);
-    if (pixels->size() > kMaxCCSize) return false;
-    for (const Pixel& delta : neighbors) {
-      Pixel child = current + delta;
-      if (child.x >= 0 && static_cast<size_t>(child.x) < rect.xsize() &&
-          child.y >= 0 && static_cast<size_t>(child.y) < rect.ysize()) {
-        float* value = &rect.Row(img, child.y)[child.x];
-        if (*value > threshold) {
-          *value = 0.0;
-          q.push_back(child);
-        }
-      }
-    }
-  }
-  return true;
-}
-
-inline bool PointInRect(const Rect& r, const Pixel& p) {
-  return (static_cast<size_t>(p.x) >= r.x0() &&
-          static_cast<size_t>(p.x) < (r.x0() + r.xsize()) &&
-          static_cast<size_t>(p.y) >= r.y0() &&
-          static_cast<size_t>(p.y) < (r.y0() + r.ysize()));
-}
-
-struct ConnectedComponent {
-  ConnectedComponent(const Rect& bounds, const std::vector<Pixel>&& pixels)
-      : bounds(bounds), pixels(pixels) {}
-  Rect bounds;
-  std::vector<Pixel> pixels;
-  float maxEnergy;
-  float meanEnergy;
-  float varEnergy;
-  float meanBg;
-  float varBg;
-  float score;
-  Pixel mode;
-
-  void CompStats(const ImageF& energy, const Rect& rect, int extra) {
-    maxEnergy = 0.0;
-    meanEnergy = 0.0;
-    varEnergy = 0.0;
-    meanBg = 0.0;
-    varBg = 0.0;
-    int nIn = 0;
-    int nOut = 0;
-    mode.x = 0;
-    mode.y = 0;
-    for (int sy = -extra; sy < (static_cast<int>(bounds.ysize()) + extra);
-         sy++) {
-      int y = sy + static_cast<int>(bounds.y0());
-      if (y < 0 || static_cast<size_t>(y) >= rect.ysize()) continue;
-      const float* JXL_RESTRICT erow = rect.ConstRow(energy, y);
-      for (int sx = -extra; sx < (static_cast<int>(bounds.xsize()) + extra);
-           sx++) {
-        int x = sx + static_cast<int>(bounds.x0());
-        if (x < 0 || static_cast<size_t>(x) >= rect.xsize()) continue;
-        if (erow[x] > maxEnergy) {
-          maxEnergy = erow[x];
-          mode.x = x;
-          mode.y = y;
-        }
-        if (PointInRect(bounds, Pixel{x, y})) {
-          meanEnergy += erow[x];
-          varEnergy += erow[x] * erow[x];
-          nIn++;
-        } else {
-          meanBg += erow[x];
-          varBg += erow[x] * erow[x];
-          nOut++;
-        }
-      }
-    }
-    meanEnergy = meanEnergy / nIn;
-    meanBg = meanBg / nOut;
-    varEnergy = (varEnergy / nIn) - meanEnergy * meanEnergy;
-    varBg = (varBg / nOut) - meanBg * meanBg;
-    score = (meanEnergy - meanBg) / std::sqrt(varBg);
-  }
-};
-
-Rect BoundingRectangle(const std::vector<Pixel>& pixels) {
-  JXL_DASSERT(!pixels.empty());
-  int low_x;
-  int high_x;
-  int low_y;
-  int high_y;
-  low_x = high_x = pixels[0].x;
-  low_y = high_y = pixels[0].y;
-  for (const Pixel& p : pixels) {
-    low_x = std::min(low_x, p.x);
-    high_x = std::max(high_x, p.x);
-    low_y = std::min(low_y, p.y);
-    high_y = std::max(high_y, p.y);
-  }
-  return Rect(low_x, low_y, high_x - low_x + 1, high_y - low_y + 1);
-}
-
-StatusOr<std::vector<ConnectedComponent>> FindCC(const ImageF& energy,
-                                                 const Rect& rect, double t_low,
-                                                 double t_high,
-                                                 uint32_t maxWindow,
-                                                 double minScore) {
-  const int kExtraRect = 4;
-  JxlMemoryManager* memory_manager = energy.memory_manager();
-  JXL_ASSIGN_OR_RETURN(
-      ImageF img,
-      ImageF::Create(memory_manager, energy.xsize(), energy.ysize()));
-  JXL_RETURN_IF_ERROR(CopyImageTo(energy, &img));
-  std::vector<ConnectedComponent> ans;
-  for (size_t y = 0; y < rect.ysize(); y++) {
-    float* JXL_RESTRICT row = rect.Row(&img, y);
-    for (size_t x = 0; x < rect.xsize(); x++) {
-      if (row[x] > t_high) {
-        std::vector<Pixel> pixels;
-        row[x] = 0.0;
-        Pixel seed = Pixel{static_cast<int>(x), static_cast<int>(y)};
-        bool success = ExtractComponent(rect, &img, &pixels, seed, t_low);
-        if (!success) continue;
-#if JXL_DEBUG_DOT_DETECT
-        for (size_t i = 0; i < pixels.size(); i++) {
-          fprintf(stderr, "(%d,%d) ", pixels[i].x, pixels[i].y);
-        }
-        fprintf(stderr, "\n");
-#endif  // JXL_DEBUG_DOT_DETECT
-        Rect bounds = BoundingRectangle(pixels);
-        if (bounds.xsize() < maxWindow && bounds.ysize() < maxWindow) {
-          ConnectedComponent cc{bounds, std::move(pixels)};
-          cc.CompStats(energy, rect, kExtraRect);
-          if (cc.score < minScore) continue;
-          JXL_DEBUG(JXL_DEBUG_DOT_DETECT,
-                    "cc mode: (%d,%d), max: %f, bgMean: %f bgVar: "
-                    "%f bound:(%" PRIuS ",%" PRIuS ",%" PRIuS ",%" PRIuS ")\n",
-                    cc.mode.x, cc.mode.y, cc.maxEnergy, cc.meanEnergy,
-                    cc.varEnergy, cc.bounds.x0(), cc.bounds.y0(),
-                    cc.bounds.xsize(), cc.bounds.ysize());
-          ans.push_back(cc);
-        }
-      }
-    }
-  }
-  return ans;
-}
-
-// TODO(sggonzalez): Adapt this function for the different color spaces or
-// remove it if the color space with the best performance does not need it
-void ComputeDotLosses(GaussianEllipse* ellipse, const ConnectedComponent& cc,
-                      const Rect& rect, const Image3F& img,
-                      const Image3F& background) {
-  const int rectBounds = 2;
-  const double kIntensityR = 0.0;   // 0.015;
-  const double kSigmaR = 0.0;       // 0.01;
-  const double kZeroEpsilon = 0.1;  // Tolerance to consider a value negative
-  double ct = cos(ellipse->angle);
-  double st = sin(ellipse->angle);
-  const std::array<double, 3> channelGains{{1.0, 1.0, 1.0}};
-  int N = 0;
-  ellipse->l1_loss = 0.0;
-  ellipse->l2_loss = 0.0;
-  ellipse->neg_pixels = 0;
-  ellipse->neg_value.fill(0.0);
-  double distMeanModeSq = (cc.mode.x - ellipse->x) * (cc.mode.x - ellipse->x) +
-                          (cc.mode.y - ellipse->y) * (cc.mode.y - ellipse->y);
-  ellipse->custom_loss = 0.0;
-  for (int c = 0; c < 3; c++) {
-    for (int sy = -rectBounds;
-         sy < (static_cast<int>(cc.bounds.ysize()) + rectBounds); sy++) {
-      int y = sy + cc.bounds.y0();
-      if (y < 0 || static_cast<size_t>(y) >= rect.ysize()) continue;
-      const float* JXL_RESTRICT row = rect.ConstPlaneRow(img, c, y);
-      // bgrow is only used if kOptimizeBackground is false.
-      // NOLINTNEXTLINE(clang-analyzer-deadcode.DeadStores)
-      const float* JXL_RESTRICT bgrow = rect.ConstPlaneRow(background, c, y);
-      for (int sx = -rectBounds;
-           sx < (static_cast<int>(cc.bounds.xsize()) + rectBounds); sx++) {
-        int x = sx + cc.bounds.x0();
-        if (x < 0 || static_cast<size_t>(x) >= rect.xsize()) continue;
-        double target = row[x];
-        double dotDelta = DotGaussianModel(
-            x - ellipse->x, y - ellipse->y, ct, st, ellipse->sigma_x,
-            ellipse->sigma_y, ellipse->intensity[c]);
-        if (dotDelta > target + kZeroEpsilon) {
-          ellipse->neg_pixels++;
-          ellipse->neg_value[c] += dotDelta - target;
-        }
-        double bkg = kOptimizeBackground ? ellipse->bgColor[c] : bgrow[x];
-        double pred = bkg + dotDelta;
-        double diff = target - pred;
-        double l2 = channelGains[c] * diff * diff;
-        double l1 = channelGains[c] * std::fabs(diff);
-        ellipse->l2_loss += l2;
-        ellipse->l1_loss += l1;
-        double w = DotGaussianModel(x - cc.mode.x, y - cc.mode.y, 1.0, 0.0,
-                                    1.0 + ellipse->sigma_x,
-                                    1.0 + ellipse->sigma_y, 1.0);
-        ellipse->custom_loss += w * l2;
-        N++;
-      }
-    }
-  }
-  ellipse->l2_loss /= N;
-  ellipse->custom_loss /= N;
-  ellipse->custom_loss += 20.0 * distMeanModeSq + ellipse->neg_value[1];
-  ellipse->l1_loss /= N;
-  double ridgeTerm = kSigmaR * ellipse->sigma_x + kSigmaR * ellipse->sigma_y;
-  for (int c = 0; c < 3; c++) {
-    ridgeTerm += kIntensityR * ellipse->intensity[c] * ellipse->intensity[c];
-  }
-  ellipse->ridge_loss = ellipse->l2_loss + ridgeTerm;
-}
-
-StatusOr<GaussianEllipse> FitGaussianFast(const ConnectedComponent& cc,
-                                          const Rect& rect, const Image3F& img,
-                                          const Image3F& background) {
-  constexpr bool leastSqIntensity = true;
-  constexpr double kEpsilon = 1e-6;
-  GaussianEllipse ans;
-  constexpr int kRectBounds = (kEllipseWindowSize >> 1);
-
-  // Compute the 1st and 2nd moments of the CC
-  double sum = 0.0;
-  int N = 0;
-  std::array<double, 3> m1{{0.0, 0.0, 0.0}};
-  std::array<double, 3> m2{{0.0, 0.0, 0.0}};
-  std::array<double, 3> color{{0.0, 0.0, 0.0}};
-  std::array<double, 3> bgColor{{0.0, 0.0, 0.0}};
-
-  JXL_DEBUG(JXL_DEBUG_DOT_DETECT,
-            "%" PRIuS " %" PRIuS " %" PRIuS " %" PRIuS "\n", cc.bounds.x0(),
-            cc.bounds.y0(), cc.bounds.xsize(), cc.bounds.ysize());
-  for (int c = 0; c < 3; c++) {
-    color[c] = rect.ConstPlaneRow(img, c, cc.mode.y)[cc.mode.x] -
-               rect.ConstPlaneRow(background, c, cc.mode.y)[cc.mode.x];
-  }
-  double sign = (color[1] > 0) ? 1 : -1;
-  for (int sy = -kRectBounds; sy <= kRectBounds; sy++) {
-    int y = sy + cc.mode.y;
-    if (y < 0 || static_cast<size_t>(y) >= rect.ysize()) continue;
-    const float* JXL_RESTRICT row = rect.ConstPlaneRow(img, 1, y);
-    const float* JXL_RESTRICT bgrow = rect.ConstPlaneRow(background, 1, y);
-    for (int sx = -kRectBounds; sx <= kRectBounds; sx++) {
-      int x = sx + cc.mode.x;
-      if (x < 0 || static_cast<size_t>(x) >= rect.xsize()) continue;
-      double w = std::max(kEpsilon, sign * (row[x] - bgrow[x]));
-      sum += w;
-
-      m1[0] += w * x;
-      m1[1] += w * y;
-      m2[0] += w * x * x;
-      m2[1] += w * x * y;
-      m2[2] += w * y * y;
-      for (int c = 0; c < 3; c++) {
-        bgColor[c] += rect.ConstPlaneRow(background, c, y)[x];
-      }
-      N++;
-    }
-  }
-  JXL_ENSURE(N > 0);
-
-  for (int i = 0; i < 3; i++) {
-    m1[i] /= sum;
-    m2[i] /= sum;
-    bgColor[i] /= N;
-  }
-
-  // Some magic constants
-  constexpr double kSigmaMult = 1.0;
-  constexpr std::array<double, 3> kScaleMult{{1.1, 1.1, 1.1}};
-
-  // Now set the parameters of the Gaussian
-  ans.x = m1[0];
-  ans.y = m1[1];
-  for (int j = 0; j < 3; j++) {
-    ans.intensity[j] = kScaleMult[j] * color[j];
-  }
-
-  Matrix2x2 Sigma;
-  Vector2 d;
-  Matrix2x2 U;
-  Sigma[0][0] = m2[0] - m1[0] * m1[0];
-  Sigma[1][1] = m2[2] - m1[1] * m1[1];
-  Sigma[0][1] = Sigma[1][0] = m2[1] - m1[0] * m1[1];
-  ConvertToDiagonal(Sigma, d, U);
-  Vector2& u = U[1];
-  int p1 = 0;
-  int p2 = 1;
-  if (d[0] < d[1]) std::swap(p1, p2);
-  ans.sigma_x = kSigmaMult * d[p1];
-  ans.sigma_y = kSigmaMult * d[p2];
-  ans.angle = std::atan2(u[p1], u[p2]);
-  ans.l2_loss = 0.0;
-  ans.bgColor = bgColor;
-  if (leastSqIntensity) {
-    GaussianEllipse* ellipse = &ans;
-    double ct = cos(ans.angle);
-    double st = sin(ans.angle);
-    // Estimate intensity with least squares (fixed background)
-    for (int c = 0; c < 3; c++) {
-      double gg = 0.0;
-      double gd = 0.0;
-      int yc = static_cast<int>(cc.mode.y);
-      int xc = static_cast<int>(cc.mode.x);
-      for (int y = yc - kRectBounds; y <= yc + kRectBounds; y++) {
-        if (y < 0 || static_cast<size_t>(y) >= rect.ysize()) continue;
-        const float* JXL_RESTRICT row = rect.ConstPlaneRow(img, c, y);
-        const float* JXL_RESTRICT bgrow = rect.ConstPlaneRow(background, c, y);
-        for (int x = xc - kRectBounds; x <= xc + kRectBounds; x++) {
-          if (x < 0 || static_cast<size_t>(x) >= rect.xsize()) continue;
-          double target = row[x] - bgrow[x];
-          double gaussian =
-              DotGaussianModel(x - ellipse->x, y - ellipse->y, ct, st,
-                               ellipse->sigma_x, ellipse->sigma_y, 1.0);
-          gg += gaussian * gaussian;
-          gd += gaussian * target;
-        }
-      }
-      ans.intensity[c] = gd / (gg + 1e-6);  // Regularized least squares
-    }
-  }
-  ComputeDotLosses(&ans, cc, rect, img, background);
-  return ans;
-}
-
-StatusOr<GaussianEllipse> FitGaussian(const ConnectedComponent& cc,
-                                      const Rect& rect, const Image3F& img,
-                                      const Image3F& background) {
-  JXL_ASSIGN_OR_RETURN(GaussianEllipse ellipse,
-                       FitGaussianFast(cc, rect, img, background));
-  if (ellipse.sigma_x < ellipse.sigma_y) {
-    std::swap(ellipse.sigma_x, ellipse.sigma_y);
-    ellipse.angle += kPi / 2.0;
-  }
-  ellipse.angle -= kPi * std::floor(ellipse.angle / kPi);
-  if (fabs(ellipse.angle - kPi) < 1e-6 || fabs(ellipse.angle) < 1e-6) {
-    ellipse.angle = 0.0;
-  }
-  JXL_ENSURE(ellipse.angle >= 0 && ellipse.angle <= kPi &&
-             ellipse.sigma_x >= ellipse.sigma_y);
-  JXL_DEBUG(JXL_DEBUG_DOT_DETECT,
-            "Ellipse mu=(%lf,%lf) sigma=(%lf,%lf) angle=%lf "
-            "intensity=(%lf,%lf,%lf) bg=(%lf,%lf,%lf) l2_loss=%lf "
-            "custom_loss=%lf, neg_pix=%" PRIuS ", neg_v=(%lf,%lf,%lf)\n",
-            ellipse.x, ellipse.y, ellipse.sigma_x, ellipse.sigma_y,
-            ellipse.angle, ellipse.intensity[0], ellipse.intensity[1],
-            ellipse.intensity[2], ellipse.bgColor[0], ellipse.bgColor[1],
-            ellipse.bgColor[2], ellipse.l2_loss, ellipse.custom_loss,
-            ellipse.neg_pixels, ellipse.neg_value[0], ellipse.neg_value[1],
-            ellipse.neg_value[2]);
-  return ellipse;
-}
-
-}  // namespace
-
-StatusOr<std::vector<PatchInfo>> DetectGaussianEllipses(
-    const Image3F& opsin, const Rect& rect, const GaussianDetectParams& params,
-    const EllipseQuantParams& qParams, ThreadPool* pool) {
-  JxlMemoryManager* memory_manager = opsin.memory_manager();
-  std::vector<PatchInfo> dots;
-  JXL_ASSIGN_OR_RETURN(
-      Image3F smooth,
-      Image3F::Create(memory_manager, opsin.xsize(), opsin.ysize()));
-  JXL_ASSIGN_OR_RETURN(ImageF energy, ComputeEnergyImage(opsin, &smooth, pool));
-  JXL_ASSIGN_OR_RETURN(std::vector<ConnectedComponent> components,
-                       FindCC(energy, rect, params.t_low, params.t_high,
-                              params.maxWinSize, params.minScore));
-  size_t numCC =
-      std::min(params.maxCC, (components.size() * params.percCC) / 100);
-  if (components.size() > numCC) {
-    std::sort(
-        components.begin(), components.end(),
-        [](const ConnectedComponent& a, const ConnectedComponent& b) -> bool {
-          return a.score > b.score;
-        });
-    components.erase(components.begin() + numCC, components.end());
-  }
-  for (const auto& cc : components) {
-    JXL_ASSIGN_OR_RETURN(GaussianEllipse ellipse,
-                         FitGaussian(cc, rect, opsin, smooth));
-    if (ellipse.x < 0.0 ||
-        std::ceil(ellipse.x) >= static_cast<double>(rect.xsize()) ||
-        ellipse.y < 0.0 ||
-        std::ceil(ellipse.y) >= static_cast<double>(rect.ysize())) {
-      continue;
-    }
-    if (ellipse.neg_pixels > params.maxNegPixels) continue;
-    double intensity = 0.21 * ellipse.intensity[0] +
-                       0.72 * ellipse.intensity[1] +
-                       0.07 * ellipse.intensity[2];
-    double intensitySq = intensity * intensity;
-    // for (int c = 0; c < 3; c++) {
-    //  intensitySq += ellipse.intensity[c] * ellipse.intensity[c];
-    //}
-    double sqDistMeanMode = (ellipse.x - cc.mode.x) * (ellipse.x - cc.mode.x) +
-                            (ellipse.y - cc.mode.y) * (ellipse.y - cc.mode.y);
-    if (ellipse.l2_loss < params.maxL2Loss &&
-        ellipse.custom_loss < params.maxCustomLoss &&
-        intensitySq > (params.minIntensity * params.minIntensity) &&
-        sqDistMeanMode < params.maxDistMeanMode * params.maxDistMeanMode) {
-      size_t x0 = cc.bounds.x0();
-      size_t y0 = cc.bounds.y0();
-      dots.emplace_back();
-      dots.back().second.emplace_back(x0, y0);
-      QuantizedPatch& patch = dots.back().first;
-      patch.xsize = cc.bounds.xsize();
-      patch.ysize = cc.bounds.ysize();
-      for (size_t y = 0; y < patch.ysize; y++) {
-        for (size_t x = 0; x < patch.xsize; x++) {
-          for (size_t c = 0; c < 3; c++) {
-            patch.fpixels[c][y * patch.xsize + x] =
-                rect.ConstPlaneRow(opsin, c, y0 + y)[x0 + x] -
-                rect.ConstPlaneRow(smooth, c, y0 + y)[x0 + x];
-          }
-        }
-      }
-    }
-  }
-  return dots;
-}
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/enc_detect_dots.h b/third_party/jpeg-xl/lib/jxl/enc_detect_dots.h
deleted file mode 100644
index 91174463f74c6..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_detect_dots.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// We attempt to remove dots, or speckle from images using Gaussian blur.
-#ifndef LIB_JXL_ENC_DETECT_DOTS_H_
-#define LIB_JXL_ENC_DETECT_DOTS_H_
-
-#include <array>
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_patch_dictionary.h"
-#include "lib/jxl/image.h"
-
-namespace jxl {
-
-struct GaussianDetectParams {
-  double t_high = 0;  // at least one pixel must have larger energy than t_high
-  double t_low = 0;   // all pixels must have a larger energy than tLow
-  uint32_t maxWinSize = 0;  // discard dots larger than this containing window
-  double maxL2Loss = 0;
-  double maxCustomLoss = 0;
-  double minIntensity = 0;     // If the intensity is too low, discard it
-  double maxDistMeanMode = 0;  // The mean and the mode must be close
-  size_t maxNegPixels = 0;     // Maximum number of negative pixel
-  size_t minScore = 0;
-  size_t maxCC = 50;   // Maximum number of CC to keep
-  size_t percCC = 15;  // Percentage in [0,100] of CC to keep
-};
-
-// Ellipse Quantization Params
-struct EllipseQuantParams {
-  size_t xsize;      // Image size in x
-  size_t ysize;      // Image size in y
-  size_t qPosition;  // Position quantization delta
-  // Quantization for the Gaussian sigma parameters
-  double minSigma;
-  double maxSigma;
-  size_t qSigma;  // number of quantization levels
-  // Quantization for the rotation angle (between -pi and pi)
-  size_t qAngle;
-  // Quantization for the intensity
-  std::array<double, 3> minIntensity;
-  std::array<double, 3> maxIntensity;
-  std::array<size_t, 3> qIntensity;  // number of quantization levels
-  // Extra parameters for the encoding
-  bool subtractQuantized;  // Should we subtract quantized or detected dots?
-  float ytox;
-  float ytob;
-
-  void QuantPositionSize(size_t* xsize, size_t* ysize) const;
-};
-
-// Detects dots in XYB image.
-StatusOr<std::vector<PatchInfo>> DetectGaussianEllipses(
-    const Image3F& opsin, const Rect& rect, const GaussianDetectParams& params,
-    const EllipseQuantParams& qParams, ThreadPool* pool);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_DETECT_DOTS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.cc b/third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.cc
deleted file mode 100644
index f8d538fef3bb9..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.cc
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_dot_dictionary.h"
-
-#include <array>
-#include <cstddef>
-#include <cstring>
-
-#include "lib/jxl/base/override.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/chroma_from_luma.h"
-#include "lib/jxl/enc_detect_dots.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/image.h"
-
-namespace jxl {
-
-// Private implementation of Dictionary Encode/Decode
-namespace {
-
-/* Quantization constants for Ellipse dots */
-const size_t kEllipsePosQ = 2;        // Quantization level for the position
-const double kEllipseMinSigma = 0.1;  // Minimum sigma value
-const double kEllipseMaxSigma = 3.1;  // Maximum Sigma value
-const size_t kEllipseSigmaQ = 16;     // Number of quantization levels for sigma
-const size_t kEllipseAngleQ = 8;      // Quantization level for the angle
-// TODO(user): fix these values.
-const std::array<double, 3> kEllipseMinIntensity{{-0.05, 0.0, -0.5}};
-const std::array<double, 3> kEllipseMaxIntensity{{0.05, 1.0, 0.4}};
-const std::array<size_t, 3> kEllipseIntensityQ{{10, 36, 10}};
-}  // namespace
-
-StatusOr<std::vector<PatchInfo>> FindDotDictionary(
-    const CompressParams& cparams, const Image3F& opsin, const Rect& rect,
-    const ColorCorrelation& color_correlation, ThreadPool* pool) {
-  if (ApplyOverride(cparams.dots,
-                    cparams.butteraugli_distance >= kMinButteraugliForDots)) {
-    GaussianDetectParams ellipse_params;
-    ellipse_params.t_high = 0.04;
-    ellipse_params.t_low = 0.02;
-    ellipse_params.maxWinSize = 5;
-    ellipse_params.maxL2Loss = 0.005;
-    ellipse_params.maxCustomLoss = 300;
-    ellipse_params.minIntensity = 0.12;
-    ellipse_params.maxDistMeanMode = 1.0;
-    ellipse_params.maxNegPixels = 0;
-    ellipse_params.minScore = 12.0;
-    ellipse_params.maxCC = 100;
-    ellipse_params.percCC = 100;
-    EllipseQuantParams qParams{rect.xsize(),
-                               rect.ysize(),
-                               kEllipsePosQ,
-                               kEllipseMinSigma,
-                               kEllipseMaxSigma,
-                               kEllipseSigmaQ,
-                               kEllipseAngleQ,
-                               kEllipseMinIntensity,
-                               kEllipseMaxIntensity,
-                               kEllipseIntensityQ,
-                               kEllipsePosQ <= 5,
-                               color_correlation.YtoXRatio(0),
-                               color_correlation.YtoBRatio(0)};
-
-    return DetectGaussianEllipses(opsin, rect, ellipse_params, qParams, pool);
-  }
-  std::vector<PatchInfo> nothing;
-  return nothing;
-}
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.h b/third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.h
deleted file mode 100644
index 15eecc9853827..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_DOT_DICTIONARY_H_
-#define LIB_JXL_ENC_DOT_DICTIONARY_H_
-
-// Dots are stored in a dictionary to avoid storing similar dots multiple
-// times.
-
-#include <vector>
-
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/chroma_from_luma.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/enc_patch_dictionary.h"
-#include "lib/jxl/image.h"
-
-namespace jxl {
-
-StatusOr<std::vector<PatchInfo>> FindDotDictionary(
-    const CompressParams& cparams, const Image3F& opsin, const Rect& rect,
-    const ColorCorrelation& color_correlation, ThreadPool* pool);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_DOT_DICTIONARY_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_entropy_coder.cc b/third_party/jpeg-xl/lib/jxl/enc_entropy_coder.cc
deleted file mode 100644
index 8f7e67870b43b..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_entropy_coder.cc
+++ /dev/null
@@ -1,265 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_entropy_coder.h"
-
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/enc_entropy_coder.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/ac_context.h"
-#include "lib/jxl/ac_strategy.h"
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/coeff_order.h"
-#include "lib/jxl/coeff_order_fwd.h"
-#include "lib/jxl/entropy_coder.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/pack_signed.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::AndNot;
-using hwy::HWY_NAMESPACE::Eq;
-using hwy::HWY_NAMESPACE::GetLane;
-
-// Returns number of non-zero coefficients (but skip LLF).
-// We cannot rely on block[] being all-zero bits, so first truncate to integer.
-// Also writes the per-8x8 block nzeros starting at nzeros_pos.
-int32_t NumNonZeroExceptLLF(const size_t cx, const size_t cy,
-                            const AcStrategy acs, const size_t covered_blocks,
-                            const size_t log2_covered_blocks,
-                            const int32_t* JXL_RESTRICT block,
-                            const size_t nzeros_stride,
-                            int32_t* JXL_RESTRICT nzeros_pos) {
-  const HWY_CAPPED(int32_t, kBlockDim) di;
-
-  const auto zero = Zero(di);
-  // Add FF..FF for every zero coefficient, negate to get #zeros.
-  auto neg_sum_zero = zero;
-
-  {
-    // Mask sufficient for one row of coefficients.
-    HWY_ALIGN const int32_t
-        llf_mask_lanes[AcStrategy::kMaxCoeffBlocks * (1 + kBlockDim)] = {
-            -1, -1, -1, -1};
-    // First cx=1,2,4 elements are FF..FF, others 0.
-    const int32_t* llf_mask_pos =
-        llf_mask_lanes + AcStrategy::kMaxCoeffBlocks - cx;
-
-    // Rows with LLF: mask out the LLF
-    for (size_t y = 0; y < cy; y++) {
-      for (size_t x = 0; x < cx * kBlockDim; x += Lanes(di)) {
-        const auto llf_mask = LoadU(di, llf_mask_pos + x);
-
-        // LLF counts as zero so we don't include it in nzeros.
-        const auto coef =
-            AndNot(llf_mask, Load(di, &block[y * cx * kBlockDim + x]));
-
-        neg_sum_zero = Add(neg_sum_zero, VecFromMask(di, Eq(coef, zero)));
-      }
-    }
-  }
-
-  // Remaining rows: no mask
-  for (size_t y = cy; y < cy * kBlockDim; y++) {
-    for (size_t x = 0; x < cx * kBlockDim; x += Lanes(di)) {
-      const auto coef = Load(di, &block[y * cx * kBlockDim + x]);
-      neg_sum_zero = Add(neg_sum_zero, VecFromMask(di, Eq(coef, zero)));
-    }
-  }
-
-  // We want area - sum_zero, add because neg_sum_zero is already negated.
-  const int32_t nzeros = static_cast<int32_t>(cx * cy * kDCTBlockSize) +
-                         GetLane(SumOfLanes(di, neg_sum_zero));
-
-  const int32_t shifted_nzeros = static_cast<int32_t>(
-      (nzeros + covered_blocks - 1) >> log2_covered_blocks);
-  // Need non-canonicalized dimensions!
-  for (size_t y = 0; y < acs.covered_blocks_y(); y++) {
-    for (size_t x = 0; x < acs.covered_blocks_x(); x++) {
-      nzeros_pos[x + y * nzeros_stride] = shifted_nzeros;
-    }
-  }
-
-  return nzeros;
-}
-
-// Specialization for 8x8, where only top-left is LLF/DC.
-// About 1% overall speedup vs. NumNonZeroExceptLLF.
-int32_t NumNonZero8x8ExceptDC(const int32_t* JXL_RESTRICT block,
-                              int32_t* JXL_RESTRICT nzeros_pos) {
-  const HWY_CAPPED(int32_t, kBlockDim) di;
-
-  const auto zero = Zero(di);
-  // Add FF..FF for every zero coefficient, negate to get #zeros.
-  auto neg_sum_zero = zero;
-
-  {
-    // First row has DC, so mask
-    const size_t y = 0;
-    HWY_ALIGN const int32_t dc_mask_lanes[kBlockDim] = {-1};
-
-    for (size_t x = 0; x < kBlockDim; x += Lanes(di)) {
-      const auto dc_mask = Load(di, dc_mask_lanes + x);
-
-      // DC counts as zero so we don't include it in nzeros.
-      const auto coef = AndNot(dc_mask, Load(di, &block[y * kBlockDim + x]));
-
-      neg_sum_zero = Add(neg_sum_zero, VecFromMask(di, Eq(coef, zero)));
-    }
-  }
-
-  // Remaining rows: no mask
-  for (size_t y = 1; y < kBlockDim; y++) {
-    for (size_t x = 0; x < kBlockDim; x += Lanes(di)) {
-      const auto coef = Load(di, &block[y * kBlockDim + x]);
-      neg_sum_zero = Add(neg_sum_zero, VecFromMask(di, Eq(coef, zero)));
-    }
-  }
-
-  // We want 64 - sum_zero, add because neg_sum_zero is already negated.
-  const int32_t nzeros = static_cast<int32_t>(kDCTBlockSize) +
-                         GetLane(SumOfLanes(di, neg_sum_zero));
-
-  *nzeros_pos = nzeros;
-
-  return nzeros;
-}
-
-// The number of nonzeros of each block is predicted from the top and the left
-// blocks, with opportune scaling to take into account the number of blocks of
-// each strategy.  The predicted number of nonzeros divided by two is used as a
-// context; if this number is above 63, a specific context is used.  If the
-// number of nonzeros of a strategy is above 63, it is written directly using a
-// fixed number of bits (that depends on the size of the strategy).
-Status TokenizeCoefficients(const coeff_order_t* JXL_RESTRICT orders,
-                            const Rect& rect,
-                            const int32_t* JXL_RESTRICT* JXL_RESTRICT ac_rows,
-                            const AcStrategyImage& ac_strategy,
-                            const YCbCrChromaSubsampling& cs,
-                            Image3I* JXL_RESTRICT tmp_num_nzeroes,
-                            std::vector<Token>* JXL_RESTRICT output,
-                            const ImageB& qdc, const ImageI& qf,
-                            const BlockCtxMap& block_ctx_map) {
-  const size_t xsize_blocks = rect.xsize();
-  const size_t ysize_blocks = rect.ysize();
-  output->clear();
-  // TODO(user): update the estimate: usually less coefficients are used.
-  output->reserve(3 * xsize_blocks * ysize_blocks * kDCTBlockSize);
-
-  size_t offset[3] = {};
-  const size_t nzeros_stride = tmp_num_nzeroes->PixelsPerRow();
-  for (size_t by = 0; by < ysize_blocks; ++by) {
-    size_t sby[3] = {by >> cs.VShift(0), by >> cs.VShift(1),
-                     by >> cs.VShift(2)};
-    int32_t* JXL_RESTRICT row_nzeros[3] = {
-        tmp_num_nzeroes->PlaneRow(0, sby[0]),
-        tmp_num_nzeroes->PlaneRow(1, sby[1]),
-        tmp_num_nzeroes->PlaneRow(2, sby[2]),
-    };
-    const int32_t* JXL_RESTRICT row_nzeros_top[3] = {
-        sby[0] == 0 ? nullptr : tmp_num_nzeroes->ConstPlaneRow(0, sby[0] - 1),
-        sby[1] == 0 ? nullptr : tmp_num_nzeroes->ConstPlaneRow(1, sby[1] - 1),
-        sby[2] == 0 ? nullptr : tmp_num_nzeroes->ConstPlaneRow(2, sby[2] - 1),
-    };
-    const uint8_t* JXL_RESTRICT row_qdc =
-        qdc.ConstRow(rect.y0() + by) + rect.x0();
-    const int32_t* JXL_RESTRICT row_qf = rect.ConstRow(qf, by);
-    AcStrategyRow acs_row = ac_strategy.ConstRow(rect, by);
-    for (size_t bx = 0; bx < xsize_blocks; ++bx) {
-      AcStrategy acs = acs_row[bx];
-      if (!acs.IsFirstBlock()) continue;
-      size_t sbx[3] = {bx >> cs.HShift(0), bx >> cs.HShift(1),
-                       bx >> cs.HShift(2)};
-      size_t cx = acs.covered_blocks_x();
-      size_t cy = acs.covered_blocks_y();
-      const size_t covered_blocks = cx * cy;  // = #LLF coefficients
-      const size_t log2_covered_blocks =
-          Num0BitsBelowLS1Bit_Nonzero(covered_blocks);
-      const size_t size = covered_blocks * kDCTBlockSize;
-
-      CoefficientLayout(&cy, &cx);  // swap cx/cy to canonical order
-
-      for (int c : {1, 0, 2}) {
-        if (sbx[c] << cs.HShift(c) != bx) continue;
-        if (sby[c] << cs.VShift(c) != by) continue;
-        const int32_t* JXL_RESTRICT block = ac_rows[c] + offset[c];
-
-        int32_t nzeros =
-            (covered_blocks == 1)
-                ? NumNonZero8x8ExceptDC(block, row_nzeros[c] + sbx[c])
-                : NumNonZeroExceptLLF(cx, cy, acs, covered_blocks,
-                                      log2_covered_blocks, block, nzeros_stride,
-                                      row_nzeros[c] + sbx[c]);
-
-        int ord = kStrategyOrder[acs.RawStrategy()];
-        const coeff_order_t* JXL_RESTRICT order =
-            &orders[CoeffOrderOffset(ord, c)];
-
-        int32_t predicted_nzeros =
-            PredictFromTopAndLeft(row_nzeros_top[c], row_nzeros[c], sbx[c], 32);
-        size_t block_ctx =
-            block_ctx_map.Context(row_qdc[bx], row_qf[sbx[c]], ord, c);
-        const int32_t nzero_ctx =
-            block_ctx_map.NonZeroContext(predicted_nzeros, block_ctx);
-
-        output->emplace_back(nzero_ctx, nzeros);
-        const size_t histo_offset =
-            block_ctx_map.ZeroDensityContextsOffset(block_ctx);
-        // Skip LLF.
-        size_t prev = (nzeros > static_cast<ssize_t>(size / 16) ? 0 : 1);
-        for (size_t k = covered_blocks; k < size && nzeros != 0; ++k) {
-          int32_t coeff = block[order[k]];
-          size_t ctx =
-              histo_offset + ZeroDensityContext(nzeros, k, covered_blocks,
-                                                log2_covered_blocks, prev);
-          uint32_t u_coeff = PackSigned(coeff);
-          output->emplace_back(ctx, u_coeff);
-          prev = (coeff != 0) ? 1 : 0;
-          nzeros -= prev;
-        }
-        JXL_ENSURE(nzeros == 0);
-        offset[c] += size;
-      }
-    }
-  }
-  return true;
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-HWY_EXPORT(TokenizeCoefficients);
-Status TokenizeCoefficients(const coeff_order_t* JXL_RESTRICT orders,
-                            const Rect& rect,
-                            const int32_t* JXL_RESTRICT* JXL_RESTRICT ac_rows,
-                            const AcStrategyImage& ac_strategy,
-                            const YCbCrChromaSubsampling& cs,
-                            Image3I* JXL_RESTRICT tmp_num_nzeroes,
-                            std::vector<Token>* JXL_RESTRICT output,
-                            const ImageB& qdc, const ImageI& qf,
-                            const BlockCtxMap& block_ctx_map) {
-  return HWY_DYNAMIC_DISPATCH(TokenizeCoefficients)(
-      orders, rect, ac_rows, ac_strategy, cs, tmp_num_nzeroes, output, qdc, qf,
-      block_ctx_map);
-}
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/enc_entropy_coder.h b/third_party/jpeg-xl/lib/jxl/enc_entropy_coder.h
deleted file mode 100644
index 74941b913d86c..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_entropy_coder.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_ENTROPY_CODER_H_
-#define LIB_JXL_ENC_ENTROPY_CODER_H_
-
-#include <sys/types.h>
-
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/ac_context.h"  // BlockCtxMap
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/coeff_order_fwd.h"
-#include "lib/jxl/enc_ans.h"
-#include "lib/jxl/frame_header.h"  // YCbCrChromaSubsampling
-#include "lib/jxl/image.h"
-
-// Entropy coding and context modeling of DC and AC coefficients, as well as AC
-// strategy and quantization field.
-
-namespace jxl {
-
-class AcStrategyImage;
-
-// Generate DCT NxN quantized AC values tokens.
-// Only the subset "rect" [in units of blocks] within all images.
-// See also DecodeACVarBlock.
-Status TokenizeCoefficients(const coeff_order_t* JXL_RESTRICT orders,
-                            const Rect& rect,
-                            const int32_t* JXL_RESTRICT* JXL_RESTRICT ac_rows,
-                            const AcStrategyImage& ac_strategy,
-                            const YCbCrChromaSubsampling& cs,
-                            Image3I* JXL_RESTRICT tmp_num_nzeroes,
-                            std::vector<Token>* JXL_RESTRICT output,
-                            const ImageB& qdc, const ImageI& qf,
-                            const BlockCtxMap& block_ctx_map);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_ENTROPY_CODER_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_external_image.cc b/third_party/jpeg-xl/lib/jxl/enc_external_image.cc
deleted file mode 100644
index aafcf3860b28a..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_external_image.cc
+++ /dev/null
@@ -1,241 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_external_image.h"
-
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-
-#include <cstring>
-#include <utility>
-
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/float.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-namespace {
-
-size_t JxlDataTypeBytes(JxlDataType data_type) {
-  switch (data_type) {
-    case JXL_TYPE_UINT8:
-      return 1;
-    case JXL_TYPE_UINT16:
-      return 2;
-    case JXL_TYPE_FLOAT16:
-      return 2;
-    case JXL_TYPE_FLOAT:
-      return 4;
-    default:
-      return 0;
-  }
-}
-
-}  // namespace
-
-Status ConvertFromExternalNoSizeCheck(const uint8_t* data, size_t xsize,
-                                      size_t ysize, size_t stride,
-                                      size_t bits_per_sample,
-                                      JxlPixelFormat format, size_t c,
-                                      ThreadPool* pool, ImageF* channel) {
-  if (format.data_type == JXL_TYPE_UINT8) {
-    JXL_RETURN_IF_ERROR(bits_per_sample > 0 && bits_per_sample <= 8);
-  } else if (format.data_type == JXL_TYPE_UINT16) {
-    JXL_RETURN_IF_ERROR(bits_per_sample > 8 && bits_per_sample <= 16);
-  } else if (format.data_type != JXL_TYPE_FLOAT16 &&
-             format.data_type != JXL_TYPE_FLOAT) {
-    JXL_FAILURE("unsupported pixel format data type %d", format.data_type);
-  }
-
-  JXL_ENSURE(channel->xsize() == xsize);
-  JXL_ENSURE(channel->ysize() == ysize);
-
-  size_t bytes_per_channel = JxlDataTypeBytes(format.data_type);
-  size_t bytes_per_pixel = format.num_channels * bytes_per_channel;
-  size_t pixel_offset = c * bytes_per_channel;
-  // Only for uint8/16.
-  float scale = 1.0f / ((1ull << bits_per_sample) - 1);
-
-  const bool little_endian =
-      format.endianness == JXL_LITTLE_ENDIAN ||
-      (format.endianness == JXL_NATIVE_ENDIAN && IsLittleEndian());
-
-  const auto convert_row = [&](const uint32_t task,
-                               size_t /*thread*/) -> Status {
-    const size_t y = task;
-    size_t offset = y * stride + pixel_offset;
-    float* JXL_RESTRICT row_out = channel->Row(y);
-    const auto save_value = [&](size_t index, float value) {
-      row_out[index] = value;
-    };
-    JXL_RETURN_IF_ERROR(LoadFloatRow(data + offset, xsize, bytes_per_pixel,
-                                     format.data_type, little_endian, scale,
-                                     save_value));
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, static_cast<uint32_t>(ysize),
-                                ThreadPool::NoInit, convert_row,
-                                "ConvertExtraChannel"));
-  return true;
-}
-
-Status ConvertFromExternalNoSizeCheck(const uint8_t* data, size_t xsize,
-                                      size_t ysize, size_t stride,
-                                      const ColorEncoding& c_current,
-                                      size_t color_channels,
-                                      size_t bits_per_sample,
-                                      JxlPixelFormat format, ThreadPool* pool,
-                                      ImageBundle* ib) {
-  JxlMemoryManager* memory_manager = ib->memory_manager();
-  bool has_alpha = format.num_channels == 2 || format.num_channels == 4;
-  if (format.num_channels < color_channels) {
-    return JXL_FAILURE("Expected %" PRIuS
-                       " color channels, received only %u channels",
-                       color_channels, format.num_channels);
-  }
-
-  JXL_ASSIGN_OR_RETURN(Image3F color,
-                       Image3F::Create(memory_manager, xsize, ysize));
-  for (size_t c = 0; c < color_channels; ++c) {
-    JXL_RETURN_IF_ERROR(ConvertFromExternalNoSizeCheck(
-        data, xsize, ysize, stride, bits_per_sample, format, c, pool,
-        &color.Plane(c)));
-  }
-  if (color_channels == 1) {
-    JXL_RETURN_IF_ERROR(CopyImageTo(color.Plane(0), &color.Plane(1)));
-    JXL_RETURN_IF_ERROR(CopyImageTo(color.Plane(0), &color.Plane(2)));
-  }
-  JXL_RETURN_IF_ERROR(ib->SetFromImage(std::move(color), c_current));
-
-  // Passing an interleaved image with an alpha channel to an image that doesn't
-  // have alpha channel just discards the passed alpha channel.
-  if (has_alpha && ib->HasAlpha()) {
-    JXL_ASSIGN_OR_RETURN(ImageF alpha,
-                         ImageF::Create(memory_manager, xsize, ysize));
-    JXL_RETURN_IF_ERROR(ConvertFromExternalNoSizeCheck(
-        data, xsize, ysize, stride, bits_per_sample, format,
-        format.num_channels - 1, pool, &alpha));
-    JXL_RETURN_IF_ERROR(ib->SetAlpha(std::move(alpha)));
-  } else if (!has_alpha && ib->HasAlpha()) {
-    // if alpha is not passed, but it is expected, then assume
-    // it is all-opaque
-    JXL_ASSIGN_OR_RETURN(ImageF alpha,
-                         ImageF::Create(memory_manager, xsize, ysize));
-    FillImage(1.0f, &alpha);
-    JXL_RETURN_IF_ERROR(ib->SetAlpha(std::move(alpha)));
-  }
-
-  return true;
-}
-
-Status ConvertFromExternal(const uint8_t* data, size_t size, size_t xsize,
-                           size_t ysize, size_t bits_per_sample,
-                           JxlPixelFormat format, size_t c, ThreadPool* pool,
-                           ImageF* channel) {
-  size_t bytes_per_channel = JxlDataTypeBytes(format.data_type);
-  size_t bytes_per_pixel = format.num_channels * bytes_per_channel;
-  const size_t last_row_size = xsize * bytes_per_pixel;
-  const size_t align = format.align;
-  const size_t row_size =
-      (align > 1 ? jxl::DivCeil(last_row_size, align) * align : last_row_size);
-  const size_t bytes_to_read = row_size * (ysize - 1) + last_row_size;
-  if (xsize == 0 || ysize == 0) return JXL_FAILURE("Empty image");
-  if (size > 0 && size < bytes_to_read) {
-    return JXL_FAILURE("Buffer size is too small, expected: %" PRIuS
-                       " got: %" PRIuS " (Image: %" PRIuS "x%" PRIuS
-                       "x%u, bytes_per_channel: %" PRIuS ")",
-                       bytes_to_read, size, xsize, ysize, format.num_channels,
-                       bytes_per_channel);
-  }
-  // Too large buffer is likely an application bug, so also fail for that.
-  // Do allow padding to stride in last row though.
-  if (size > row_size * ysize) {
-    return JXL_FAILURE("Buffer size is too large");
-  }
-  return ConvertFromExternalNoSizeCheck(
-      data, xsize, ysize, row_size, bits_per_sample, format, c, pool, channel);
-}
-Status ConvertFromExternal(Span<const uint8_t> bytes, size_t xsize,
-                           size_t ysize, const ColorEncoding& c_current,
-                           size_t color_channels, size_t bits_per_sample,
-                           JxlPixelFormat format, ThreadPool* pool,
-                           ImageBundle* ib) {
-  JxlMemoryManager* memory_manager = ib->memory_manager();
-  bool has_alpha = format.num_channels == 2 || format.num_channels == 4;
-  if (format.num_channels < color_channels) {
-    return JXL_FAILURE("Expected %" PRIuS
-                       " color channels, received only %u channels",
-                       color_channels, format.num_channels);
-  }
-
-  JXL_ASSIGN_OR_RETURN(Image3F color,
-                       Image3F::Create(memory_manager, xsize, ysize));
-  for (size_t c = 0; c < color_channels; ++c) {
-    JXL_RETURN_IF_ERROR(ConvertFromExternal(bytes.data(), bytes.size(), xsize,
-                                            ysize, bits_per_sample, format, c,
-                                            pool, &color.Plane(c)));
-  }
-  if (color_channels == 1) {
-    JXL_RETURN_IF_ERROR(CopyImageTo(color.Plane(0), &color.Plane(1)));
-    JXL_RETURN_IF_ERROR(CopyImageTo(color.Plane(0), &color.Plane(2)));
-  }
-  JXL_RETURN_IF_ERROR(ib->SetFromImage(std::move(color), c_current));
-
-  // Passing an interleaved image with an alpha channel to an image that doesn't
-  // have alpha channel just discards the passed alpha channel.
-  if (has_alpha && ib->HasAlpha()) {
-    JXL_ASSIGN_OR_RETURN(ImageF alpha,
-                         ImageF::Create(memory_manager, xsize, ysize));
-    JXL_RETURN_IF_ERROR(ConvertFromExternal(
-        bytes.data(), bytes.size(), xsize, ysize, bits_per_sample, format,
-        format.num_channels - 1, pool, &alpha));
-    JXL_RETURN_IF_ERROR(ib->SetAlpha(std::move(alpha)));
-  } else if (!has_alpha && ib->HasAlpha()) {
-    // if alpha is not passed, but it is expected, then assume
-    // it is all-opaque
-    JXL_ASSIGN_OR_RETURN(ImageF alpha,
-                         ImageF::Create(memory_manager, xsize, ysize));
-    FillImage(1.0f, &alpha);
-    JXL_RETURN_IF_ERROR(ib->SetAlpha(std::move(alpha)));
-  }
-
-  return true;
-}
-
-Status ConvertFromExternal(Span<const uint8_t> bytes, size_t xsize,
-                           size_t ysize, const ColorEncoding& c_current,
-                           size_t bits_per_sample, JxlPixelFormat format,
-                           ThreadPool* pool, ImageBundle* ib) {
-  return ConvertFromExternal(bytes, xsize, ysize, c_current,
-                             c_current.Channels(), bits_per_sample, format,
-                             pool, ib);
-}
-
-Status BufferToImageF(const JxlPixelFormat& pixel_format, size_t xsize,
-                      size_t ysize, const void* buffer, size_t size,
-                      ThreadPool* pool, ImageF* channel) {
-  size_t bitdepth = JxlDataTypeBytes(pixel_format.data_type) * kBitsPerByte;
-  return ConvertFromExternal(reinterpret_cast<const uint8_t*>(buffer), size,
-                             xsize, ysize, bitdepth, pixel_format, 0, pool,
-                             channel);
-}
-
-Status BufferToImageBundle(const JxlPixelFormat& pixel_format, uint32_t xsize,
-                           uint32_t ysize, const void* buffer, size_t size,
-                           jxl::ThreadPool* pool,
-                           const jxl::ColorEncoding& c_current,
-                           jxl::ImageBundle* ib) {
-  size_t bitdepth = JxlDataTypeBytes(pixel_format.data_type) * kBitsPerByte;
-  JXL_RETURN_IF_ERROR(ConvertFromExternal(
-      jxl::Bytes(static_cast<const uint8_t*>(buffer), size), xsize, ysize,
-      c_current, bitdepth, pixel_format, pool, ib));
-  JXL_RETURN_IF_ERROR(ib->VerifyMetadata());
-
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_external_image.h b/third_party/jpeg-xl/lib/jxl/enc_external_image.h
deleted file mode 100644
index 0d0fb75c5d4b1..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_external_image.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_EXTERNAL_IMAGE_H_
-#define LIB_JXL_ENC_EXTERNAL_IMAGE_H_
-
-// Interleaved image for color transforms and Codec.
-
-#include <jxl/types.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-
-namespace jxl {
-Status ConvertFromExternalNoSizeCheck(const uint8_t* data, size_t xsize,
-                                      size_t ysize, size_t stride,
-                                      size_t bits_per_sample,
-                                      JxlPixelFormat format, size_t c,
-                                      ThreadPool* pool, ImageF* channel);
-
-Status ConvertFromExternalNoSizeCheck(const uint8_t* data, size_t xsize,
-                                      size_t ysize, size_t stride,
-                                      const ColorEncoding& c_current,
-                                      size_t color_channels,
-                                      size_t bits_per_sample,
-                                      JxlPixelFormat format, ThreadPool* pool,
-                                      ImageBundle* ib);
-
-Status ConvertFromExternal(const uint8_t* data, size_t size, size_t xsize,
-                           size_t ysize, size_t bits_per_sample,
-                           JxlPixelFormat format, size_t c, ThreadPool* pool,
-                           ImageF* channel);
-
-// Convert an interleaved pixel buffer to the internal ImageBundle
-// representation. This is the opposite of ConvertToExternal().
-Status ConvertFromExternal(Span<const uint8_t> bytes, size_t xsize,
-                           size_t ysize, const ColorEncoding& c_current,
-                           size_t color_channels, size_t bits_per_sample,
-                           JxlPixelFormat format, ThreadPool* pool,
-                           ImageBundle* ib);
-Status ConvertFromExternal(Span<const uint8_t> bytes, size_t xsize,
-                           size_t ysize, const ColorEncoding& c_current,
-                           size_t bits_per_sample, JxlPixelFormat format,
-                           ThreadPool* pool, ImageBundle* ib);
-Status BufferToImageF(const JxlPixelFormat& pixel_format, size_t xsize,
-                      size_t ysize, const void* buffer, size_t size,
-                      ThreadPool* pool, ImageF* channel);
-Status BufferToImageBundle(const JxlPixelFormat& pixel_format, uint32_t xsize,
-                           uint32_t ysize, const void* buffer, size_t size,
-                           jxl::ThreadPool* pool,
-                           const jxl::ColorEncoding& c_current,
-                           jxl::ImageBundle* ib);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_EXTERNAL_IMAGE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_external_image_gbench.cc b/third_party/jpeg-xl/lib/jxl/enc_external_image_gbench.cc
deleted file mode 100644
index 7f6aa7f49d88a..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_external_image_gbench.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/types.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#include "benchmark/benchmark.h"
-#include "lib/jxl/enc_external_image.h"
-#include "lib/jxl/image_metadata.h"
-#include "tools/no_memory_manager.h"
-
-namespace jxl {
-namespace {
-
-#define BM_CHECK(C)          \
-  if (!(C)) {                \
-    state.SkipWithError(#C); \
-    return;                  \
-  }
-
-// Encoder case, deinterleaves a buffer.
-void BM_EncExternalImage_ConvertImageRGBA(benchmark::State& state) {
-  const size_t kNumIter = 5;
-  size_t xsize = state.range();
-  size_t ysize = state.range();
-
-  ImageMetadata im;
-  im.SetAlphaBits(8);
-  ImageBundle ib(jpegxl::tools::NoMemoryManager(), &im);
-
-  std::vector<uint8_t> interleaved(xsize * ysize * 4);
-  JxlPixelFormat format = {4, JXL_TYPE_UINT8, JXL_NATIVE_ENDIAN, 0};
-  for (auto _ : state) {
-    (void)_;
-    for (size_t i = 0; i < kNumIter; ++i) {
-      BM_CHECK(ConvertFromExternal(
-          Bytes(interleaved.data(), interleaved.size()), xsize, ysize,
-          /*c_current=*/ColorEncoding::SRGB(),
-          /*bits_per_sample=*/8, format,
-          /*pool=*/nullptr, &ib));
-    }
-  }
-
-  // Pixels per second.
-  state.SetItemsProcessed(kNumIter * state.iterations() * xsize * ysize);
-  state.SetBytesProcessed(kNumIter * state.iterations() * interleaved.size());
-}
-
-BENCHMARK(BM_EncExternalImage_ConvertImageRGBA)
-    ->RangeMultiplier(2)
-    ->Range(256, 2048);
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_external_image_test.cc b/third_party/jpeg-xl/lib/jxl/enc_external_image_test.cc
deleted file mode 100644
index e620695a98d2b..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_external_image_test.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_external_image.h"
-
-#include <jxl/types.h>
-
-#include <cstddef>
-#include <cstdint>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-TEST(ExternalImageTest, InvalidSize) {
-  if (JXL_CRASH_ON_ERROR) {
-    GTEST_SKIP() << "Skipping due to JXL_CRASH_ON_ERROR";
-  }
-  ImageMetadata im;
-  im.SetAlphaBits(8);
-  ImageBundle ib(jxl::test::MemoryManager(), &im);
-
-  JxlPixelFormat format = {4, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  const uint8_t buf[10 * 100 * 8] = {};
-  EXPECT_FALSE(ConvertFromExternal(Bytes(buf, 10), /*xsize=*/10, /*ysize=*/100,
-                                   /*c_current=*/ColorEncoding::SRGB(),
-                                   /*bits_per_sample=*/16, format, nullptr,
-                                   &ib));
-  EXPECT_FALSE(ConvertFromExternal(
-      Bytes(buf, sizeof(buf) - 1), /*xsize=*/10, /*ysize=*/100,
-      /*c_current=*/ColorEncoding::SRGB(),
-      /*bits_per_sample=*/16, format, nullptr, &ib));
-  EXPECT_TRUE(
-      ConvertFromExternal(Bytes(buf, sizeof(buf)), /*xsize=*/10,
-                          /*ysize=*/100, /*c_current=*/ColorEncoding::SRGB(),
-                          /*bits_per_sample=*/16, format, nullptr, &ib));
-}
-
-TEST(ExternalImageTest, AlphaMissing) {
-  ImageMetadata im;
-  im.SetAlphaBits(0);  // No alpha
-  ImageBundle ib(jxl::test::MemoryManager(), &im);
-
-  const size_t xsize = 10;
-  const size_t ysize = 20;
-  const uint8_t buf[xsize * ysize * 4] = {};
-
-  JxlPixelFormat format = {4, JXL_TYPE_UINT8, JXL_BIG_ENDIAN, 0};
-  // has_alpha is true but the ImageBundle has no alpha. Alpha channel should
-  // be ignored.
-  EXPECT_TRUE(ConvertFromExternal(Bytes(buf, sizeof(buf)), xsize, ysize,
-                                  /*c_current=*/ColorEncoding::SRGB(),
-                                  /*bits_per_sample=*/8, format, nullptr, &ib));
-  EXPECT_FALSE(ib.HasAlpha());
-}
-
-TEST(ExternalImageTest, AlphaPremultiplied) {
-  ImageMetadata im;
-  im.SetAlphaBits(8, true);
-
-  ImageBundle ib(jxl::test::MemoryManager(), &im);
-  const size_t xsize = 10;
-  const size_t ysize = 20;
-  const size_t size = xsize * ysize * 8;
-  const uint8_t buf[size] = {};
-
-  JxlPixelFormat format = {4, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  EXPECT_TRUE(BufferToImageBundle(format, xsize, ysize, buf, size, nullptr,
-                                  ColorEncoding::SRGB(), &ib));
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_fast_lossless.cc b/third_party/jpeg-xl/lib/jxl/enc_fast_lossless.cc
deleted file mode 100644
index 16b3e608634e6..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_fast_lossless.cc
+++ /dev/null
@@ -1,4339 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/base/status.h"
-#ifndef FJXL_SELF_INCLUDE
-
-#include <assert.h>
-#include <stdint.h>
-#include <string.h>
-
-#include <algorithm>
-#include <array>
-#include <limits>
-#include <memory>
-#include <vector>
-
-#include "lib/jxl/enc_fast_lossless.h"
-
-#if FJXL_STANDALONE
-#if defined(_MSC_VER)
-using ssize_t = intptr_t;
-#endif
-#else  // FJXL_STANDALONE
-#include "lib/jxl/encode_internal.h"
-#endif  // FJXL_STANDALONE
-
-#if defined(__x86_64__) || defined(_M_X64)
-#define FJXL_ARCH_IS_X86_64 1
-#else
-#define FJXL_ARCH_IS_X86_64 0
-#endif
-
-#if defined(__i386__) || defined(_M_IX86) || FJXL_ARCH_IS_X86_64
-#define FJXL_ARCH_IS_X86 1
-#else
-#define FJXL_ARCH_IS_X86 0
-#endif
-
-#if FJXL_ARCH_IS_X86
-#if defined(_MSC_VER)
-#include <intrin.h>
-#else  // _MSC_VER
-#include <cpuid.h>
-#endif  // _MSC_VER
-#endif  // FJXL_ARCH_IS_X86
-
-// Enable NEON and AVX2/AVX512 if not asked to do otherwise and the compilers
-// support it.
-#if defined(__aarch64__) || defined(_M_ARM64)  // ARCH
-#include <arm_neon.h>
-
-#if !defined(FJXL_ENABLE_NEON)
-#define FJXL_ENABLE_NEON 1
-#endif  // !defined(FJXL_ENABLE_NEON)
-
-#elif FJXL_ARCH_IS_X86_64 && !defined(_MSC_VER)  // ARCH
-#include <immintrin.h>
-
-// manually add _mm512_cvtsi512_si32 definition if missing
-// (e.g. with Xcode on macOS Mojave)
-// copied from gcc 11.1.0 include/avx512fintrin.h line 14367-14373
-#if defined(__clang__) &&                                           \
-    ((!defined(__apple_build_version__) && __clang_major__ < 10) || \
-     (defined(__apple_build_version__) && __apple_build_version__ < 12000032))
-inline int __attribute__((__gnu_inline__, __always_inline__, __artificial__))
-_mm512_cvtsi512_si32(__m512i __A) {
-  __v16si __B = (__v16si)__A;
-  return __B[0];
-}
-#endif
-
-#if !defined(FJXL_ENABLE_AVX2)
-#define FJXL_ENABLE_AVX2 1
-#endif  // !defined(FJXL_ENABLE_AVX2)
-
-#if !defined(FJXL_ENABLE_AVX512)
-// On clang-7 or earlier, and gcc-10 or earlier, AVX512 seems broken.
-#if (defined(__clang__) &&                                             \
-         (!defined(__apple_build_version__) && __clang_major__ > 7) || \
-     (defined(__apple_build_version__) &&                              \
-      __apple_build_version__ > 10010046)) ||                          \
-    (defined(__GNUC__) && __GNUC__ > 10)
-#define FJXL_ENABLE_AVX512 1
-#endif
-#endif  // !defined(FJXL_ENABLE_AVX512)
-
-#endif  // ARCH
-
-#ifndef FJXL_ENABLE_NEON
-#define FJXL_ENABLE_NEON 0
-#endif
-
-#ifndef FJXL_ENABLE_AVX2
-#define FJXL_ENABLE_AVX2 0
-#endif
-
-#ifndef FJXL_ENABLE_AVX512
-#define FJXL_ENABLE_AVX512 0
-#endif
-
-namespace {
-
-enum class CpuFeature : uint32_t {
-  kAVX2 = 0,
-
-  kAVX512F,
-  kAVX512VL,
-  kAVX512CD,
-  kAVX512BW,
-
-  kVBMI,
-  kVBMI2
-};
-
-constexpr uint32_t CpuFeatureBit(CpuFeature feature) {
-  return 1u << static_cast<uint32_t>(feature);
-}
-
-#if FJXL_ARCH_IS_X86
-#if defined(_MSC_VER)
-void Cpuid(const uint32_t level, const uint32_t count,
-           std::array<uint32_t, 4>& abcd) {
-  int regs[4];
-  __cpuidex(regs, level, count);
-  for (int i = 0; i < 4; ++i) {
-    abcd[i] = regs[i];
-  }
-}
-uint32_t ReadXCR0() { return static_cast<uint32_t>(_xgetbv(0)); }
-#else   // _MSC_VER
-void Cpuid(const uint32_t level, const uint32_t count,
-           std::array<uint32_t, 4>& abcd) {
-  uint32_t a;
-  uint32_t b;
-  uint32_t c;
-  uint32_t d;
-  __cpuid_count(level, count, a, b, c, d);
-  abcd[0] = a;
-  abcd[1] = b;
-  abcd[2] = c;
-  abcd[3] = d;
-}
-uint32_t ReadXCR0() {
-  uint32_t xcr0;
-  uint32_t xcr0_high;
-  const uint32_t index = 0;
-  asm volatile(".byte 0x0F, 0x01, 0xD0"
-               : "=a"(xcr0), "=d"(xcr0_high)
-               : "c"(index));
-  return xcr0;
-}
-#endif  // _MSC_VER
-
-uint32_t DetectCpuFeatures() {
-  uint32_t flags = 0;  // return value
-  std::array<uint32_t, 4> abcd;
-  Cpuid(0, 0, abcd);
-  const uint32_t max_level = abcd[0];
-
-  const auto check_bit = [](uint32_t v, uint32_t idx) -> bool {
-    return (v & (1U << idx)) != 0;
-  };
-
-  // Extended features
-  if (max_level >= 7) {
-    Cpuid(7, 0, abcd);
-    flags |= check_bit(abcd[1], 5) ? CpuFeatureBit(CpuFeature::kAVX2) : 0;
-
-    flags |= check_bit(abcd[1], 16) ? CpuFeatureBit(CpuFeature::kAVX512F) : 0;
-    flags |= check_bit(abcd[1], 28) ? CpuFeatureBit(CpuFeature::kAVX512CD) : 0;
-    flags |= check_bit(abcd[1], 30) ? CpuFeatureBit(CpuFeature::kAVX512BW) : 0;
-    flags |= check_bit(abcd[1], 31) ? CpuFeatureBit(CpuFeature::kAVX512VL) : 0;
-
-    flags |= check_bit(abcd[2], 1) ? CpuFeatureBit(CpuFeature::kVBMI) : 0;
-    flags |= check_bit(abcd[2], 6) ? CpuFeatureBit(CpuFeature::kVBMI2) : 0;
-  }
-
-  Cpuid(1, 0, abcd);
-  const bool os_has_xsave = check_bit(abcd[2], 27);
-  if (os_has_xsave) {
-    const uint32_t xcr0 = ReadXCR0();
-    if (!check_bit(xcr0, 1) || !check_bit(xcr0, 2) || !check_bit(xcr0, 5) ||
-        !check_bit(xcr0, 6) || !check_bit(xcr0, 7)) {
-      flags = 0;  // TODO(eustas): be more selective?
-    }
-  }
-
-  return flags;
-}
-#else   // FJXL_ARCH_IS_X86
-uint32_t DetectCpuFeatures() { return 0; }
-#endif  // FJXL_ARCH_IS_X86
-
-#if defined(_MSC_VER)
-#define FJXL_UNUSED
-#else
-#define FJXL_UNUSED __attribute__((unused))
-#endif
-
-FJXL_UNUSED bool HasCpuFeature(CpuFeature feature) {
-  static uint32_t cpu_features = DetectCpuFeatures();
-  return (cpu_features & CpuFeatureBit(feature)) != 0;
-}
-
-#if defined(_MSC_VER) && !defined(__clang__)
-#define FJXL_INLINE __forceinline
-FJXL_INLINE uint32_t FloorLog2(uint32_t v) {
-  unsigned long index;
-  _BitScanReverse(&index, v);
-  return index;
-}
-FJXL_INLINE uint32_t CtzNonZero(uint64_t v) {
-  unsigned long index;
-  _BitScanForward(&index, v);
-  return index;
-}
-#else
-#define FJXL_INLINE inline __attribute__((always_inline))
-FJXL_INLINE uint32_t FloorLog2(uint32_t v) {
-  return v ? 31 - __builtin_clz(v) : 0;
-}
-FJXL_UNUSED FJXL_INLINE uint32_t CtzNonZero(uint64_t v) {
-  return __builtin_ctzll(v);
-}
-#endif
-
-// Compiles to a memcpy on little-endian systems.
-FJXL_INLINE void StoreLE64(uint8_t* tgt, uint64_t data) {
-#if (!defined(__BYTE_ORDER__) || (__BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__))
-  for (int i = 0; i < 8; i++) {
-    tgt[i] = (data >> (i * 8)) & 0xFF;
-  }
-#else
-  memcpy(tgt, &data, 8);
-#endif
-}
-
-FJXL_INLINE size_t AddBits(uint32_t count, uint64_t bits, uint8_t* data_buf,
-                           size_t& bits_in_buffer, uint64_t& bit_buffer) {
-  bit_buffer |= bits << bits_in_buffer;
-  bits_in_buffer += count;
-  StoreLE64(data_buf, bit_buffer);
-  size_t bytes_in_buffer = bits_in_buffer / 8;
-  bits_in_buffer -= bytes_in_buffer * 8;
-  bit_buffer >>= bytes_in_buffer * 8;
-  return bytes_in_buffer;
-}
-
-struct BitWriter {
-  void Allocate(size_t maximum_bit_size) {
-    assert(data == nullptr);
-    // Leave some padding.
-    data.reset(static_cast<uint8_t*>(malloc(maximum_bit_size / 8 + 64)));
-  }
-
-  void Write(uint32_t count, uint64_t bits) {
-    bytes_written += AddBits(count, bits, data.get() + bytes_written,
-                             bits_in_buffer, buffer);
-  }
-
-  void ZeroPadToByte() {
-    if (bits_in_buffer != 0) {
-      Write(8 - bits_in_buffer, 0);
-    }
-  }
-
-  FJXL_INLINE void WriteMultiple(const uint64_t* nbits, const uint64_t* bits,
-                                 size_t n) {
-    // Necessary because Write() is only guaranteed to work with <=56 bits.
-    // Trying to SIMD-fy this code results in lower speed (and definitely less
-    // clarity).
-    {
-      for (size_t i = 0; i < n; i++) {
-        this->buffer |= bits[i] << this->bits_in_buffer;
-        memcpy(this->data.get() + this->bytes_written, &this->buffer, 8);
-        uint64_t shift = 64 - this->bits_in_buffer;
-        this->bits_in_buffer += nbits[i];
-        // This `if` seems to be faster than using ternaries.
-        if (this->bits_in_buffer >= 64) {
-          uint64_t next_buffer = bits[i] >> shift;
-          this->buffer = next_buffer;
-          this->bits_in_buffer -= 64;
-          this->bytes_written += 8;
-        }
-      }
-      memcpy(this->data.get() + this->bytes_written, &this->buffer, 8);
-      size_t bytes_in_buffer = this->bits_in_buffer / 8;
-      this->bits_in_buffer -= bytes_in_buffer * 8;
-      this->buffer >>= bytes_in_buffer * 8;
-      this->bytes_written += bytes_in_buffer;
-    }
-  }
-
-  std::unique_ptr<uint8_t[], void (*)(void*)> data = {nullptr, free};
-  size_t bytes_written = 0;
-  size_t bits_in_buffer = 0;
-  uint64_t buffer = 0;
-};
-
-size_t SectionSize(const std::array<BitWriter, 4>& group_data) {
-  size_t sz = 0;
-  for (size_t j = 0; j < 4; j++) {
-    const auto& writer = group_data[j];
-    sz += writer.bytes_written * 8 + writer.bits_in_buffer;
-  }
-  sz = (sz + 7) / 8;
-  return sz;
-}
-
-constexpr size_t kMaxFrameHeaderSize = 5;
-
-constexpr size_t kGroupSizeOffset[4] = {
-    static_cast<size_t>(0),
-    static_cast<size_t>(1024),
-    static_cast<size_t>(17408),
-    static_cast<size_t>(4211712),
-};
-constexpr size_t kTOCBits[4] = {12, 16, 24, 32};
-
-size_t TOCBucket(size_t group_size) {
-  size_t bucket = 0;
-  while (bucket < 3 && group_size >= kGroupSizeOffset[bucket + 1]) ++bucket;
-  return bucket;
-}
-
-#if !FJXL_STANDALONE
-size_t TOCSize(const std::vector<size_t>& group_sizes) {
-  size_t toc_bits = 0;
-  for (size_t group_size : group_sizes) {
-    toc_bits += kTOCBits[TOCBucket(group_size)];
-  }
-  return (toc_bits + 7) / 8;
-}
-
-size_t FrameHeaderSize(bool have_alpha, bool is_last) {
-  size_t nbits = 28 + (have_alpha ? 4 : 0) + (is_last ? 0 : 2);
-  return (nbits + 7) / 8;
-}
-#endif
-
-void ComputeAcGroupDataOffset(size_t dc_global_size, size_t num_dc_groups,
-                              size_t num_ac_groups, size_t& min_dc_global_size,
-                              size_t& ac_group_offset) {
-  // Max AC group size is 768 kB, so max AC group TOC bits is 24.
-  size_t ac_toc_max_bits = num_ac_groups * 24;
-  size_t ac_toc_min_bits = num_ac_groups * 12;
-  size_t max_padding = 1 + (ac_toc_max_bits - ac_toc_min_bits + 7) / 8;
-  min_dc_global_size = dc_global_size;
-  size_t dc_global_bucket = TOCBucket(min_dc_global_size);
-  while (TOCBucket(min_dc_global_size + max_padding) > dc_global_bucket) {
-    dc_global_bucket = TOCBucket(min_dc_global_size + max_padding);
-    min_dc_global_size = kGroupSizeOffset[dc_global_bucket];
-  }
-  assert(TOCBucket(min_dc_global_size) == dc_global_bucket);
-  assert(TOCBucket(min_dc_global_size + max_padding) == dc_global_bucket);
-  size_t max_toc_bits =
-      kTOCBits[dc_global_bucket] + 12 * (1 + num_dc_groups) + ac_toc_max_bits;
-  size_t max_toc_size = (max_toc_bits + 7) / 8;
-  ac_group_offset = kMaxFrameHeaderSize + max_toc_size + min_dc_global_size;
-}
-
-#if !FJXL_STANDALONE
-size_t ComputeDcGlobalPadding(const std::vector<size_t>& group_sizes,
-                              size_t ac_group_data_offset,
-                              size_t min_dc_global_size, bool have_alpha,
-                              bool is_last) {
-  std::vector<size_t> new_group_sizes = group_sizes;
-  new_group_sizes[0] = min_dc_global_size;
-  size_t toc_size = TOCSize(new_group_sizes);
-  size_t actual_offset =
-      FrameHeaderSize(have_alpha, is_last) + toc_size + group_sizes[0];
-  return ac_group_data_offset - actual_offset;
-}
-#endif
-
-constexpr size_t kNumRawSymbols = 19;
-constexpr size_t kNumLZ77 = 33;
-constexpr size_t kLZ77CacheSize = 32;
-
-constexpr size_t kLZ77Offset = 224;
-constexpr size_t kLZ77MinLength = 7;
-
-void EncodeHybridUintLZ77(uint32_t value, uint32_t* token, uint32_t* nbits,
-                          uint32_t* bits) {
-  // 400 config
-  uint32_t n = FloorLog2(value);
-  *token = value < 16 ? value : 16 + n - 4;
-  *nbits = value < 16 ? 0 : n;
-  *bits = value < 16 ? 0 : value - (1 << *nbits);
-}
-
-struct PrefixCode {
-  uint8_t raw_nbits[kNumRawSymbols] = {};
-  uint8_t raw_bits[kNumRawSymbols] = {};
-
-  uint8_t lz77_nbits[kNumLZ77] = {};
-  uint16_t lz77_bits[kNumLZ77] = {};
-
-  uint64_t lz77_cache_bits[kLZ77CacheSize] = {};
-  uint8_t lz77_cache_nbits[kLZ77CacheSize] = {};
-
-  size_t numraw;
-
-  static uint16_t BitReverse(size_t nbits, uint16_t bits) {
-    constexpr uint16_t kNibbleLookup[16] = {
-        0b0000, 0b1000, 0b0100, 0b1100, 0b0010, 0b1010, 0b0110, 0b1110,
-        0b0001, 0b1001, 0b0101, 0b1101, 0b0011, 0b1011, 0b0111, 0b1111,
-    };
-    uint16_t rev16 = (kNibbleLookup[bits & 0xF] << 12) |
-                     (kNibbleLookup[(bits >> 4) & 0xF] << 8) |
-                     (kNibbleLookup[(bits >> 8) & 0xF] << 4) |
-                     (kNibbleLookup[bits >> 12]);
-    return rev16 >> (16 - nbits);
-  }
-
-  // Create the prefix codes given the code lengths.
-  // Supports the code lengths being split into two halves.
-  static void ComputeCanonicalCode(const uint8_t* first_chunk_nbits,
-                                   uint8_t* first_chunk_bits,
-                                   size_t first_chunk_size,
-                                   const uint8_t* second_chunk_nbits,
-                                   uint16_t* second_chunk_bits,
-                                   size_t second_chunk_size) {
-    constexpr size_t kMaxCodeLength = 15;
-    uint8_t code_length_counts[kMaxCodeLength + 1] = {};
-    for (size_t i = 0; i < first_chunk_size; i++) {
-      code_length_counts[first_chunk_nbits[i]]++;
-      assert(first_chunk_nbits[i] <= kMaxCodeLength);
-      assert(first_chunk_nbits[i] <= 8);
-      assert(first_chunk_nbits[i] > 0);
-    }
-    for (size_t i = 0; i < second_chunk_size; i++) {
-      code_length_counts[second_chunk_nbits[i]]++;
-      assert(second_chunk_nbits[i] <= kMaxCodeLength);
-    }
-
-    uint16_t next_code[kMaxCodeLength + 1] = {};
-
-    uint16_t code = 0;
-    for (size_t i = 1; i < kMaxCodeLength + 1; i++) {
-      code = (code + code_length_counts[i - 1]) << 1;
-      next_code[i] = code;
-    }
-
-    for (size_t i = 0; i < first_chunk_size; i++) {
-      first_chunk_bits[i] =
-          BitReverse(first_chunk_nbits[i], next_code[first_chunk_nbits[i]]++);
-    }
-    for (size_t i = 0; i < second_chunk_size; i++) {
-      second_chunk_bits[i] =
-          BitReverse(second_chunk_nbits[i], next_code[second_chunk_nbits[i]]++);
-    }
-  }
-
-  template <typename T>
-  static void ComputeCodeLengthsNonZeroImpl(const uint64_t* freqs, size_t n,
-                                            size_t precision, T infty,
-                                            const uint8_t* min_limit,
-                                            const uint8_t* max_limit,
-                                            uint8_t* nbits) {
-    assert(precision < 15);
-    assert(n <= kMaxNumSymbols);
-    std::vector<T> dynp(((1U << precision) + 1) * (n + 1), infty);
-    auto d = [&](size_t sym, size_t off) -> T& {
-      return dynp[sym * ((1 << precision) + 1) + off];
-    };
-    d(0, 0) = 0;
-    for (size_t sym = 0; sym < n; sym++) {
-      for (T bits = min_limit[sym]; bits <= max_limit[sym]; bits++) {
-        size_t off_delta = 1U << (precision - bits);
-        for (size_t off = 0; off + off_delta <= (1U << precision); off++) {
-          d(sym + 1, off + off_delta) =
-              std::min(d(sym, off) + static_cast<T>(freqs[sym]) * bits,
-                       d(sym + 1, off + off_delta));
-        }
-      }
-    }
-
-    size_t sym = n;
-    size_t off = 1U << precision;
-
-    assert(d(sym, off) != infty);
-
-    while (sym-- > 0) {
-      assert(off > 0);
-      for (size_t bits = min_limit[sym]; bits <= max_limit[sym]; bits++) {
-        size_t off_delta = 1U << (precision - bits);
-        if (off_delta <= off &&
-            d(sym + 1, off) == d(sym, off - off_delta) + freqs[sym] * bits) {
-          off -= off_delta;
-          nbits[sym] = bits;
-          break;
-        }
-      }
-    }
-  }
-
-  // Computes nbits[i] for i <= n, subject to min_limit[i] <= nbits[i] <=
-  // max_limit[i] and sum 2**-nbits[i] == 1, so to minimize sum(nbits[i] *
-  // freqs[i]).
-  static void ComputeCodeLengthsNonZero(const uint64_t* freqs, size_t n,
-                                        uint8_t* min_limit, uint8_t* max_limit,
-                                        uint8_t* nbits) {
-    size_t precision = 0;
-    size_t shortest_length = 255;
-    uint64_t freqsum = 0;
-    for (size_t i = 0; i < n; i++) {
-      assert(freqs[i] != 0);
-      freqsum += freqs[i];
-      if (min_limit[i] < 1) min_limit[i] = 1;
-      assert(min_limit[i] <= max_limit[i]);
-      precision = std::max<size_t>(max_limit[i], precision);
-      shortest_length = std::min<size_t>(min_limit[i], shortest_length);
-    }
-    // If all the minimum limits are greater than 1, shift precision so that we
-    // behave as if the shortest was 1.
-    precision -= shortest_length - 1;
-    uint64_t infty = freqsum * precision;
-    if (infty < std::numeric_limits<uint32_t>::max() / 2) {
-      ComputeCodeLengthsNonZeroImpl(freqs, n, precision,
-                                    static_cast<uint32_t>(infty), min_limit,
-                                    max_limit, nbits);
-    } else {
-      ComputeCodeLengthsNonZeroImpl(freqs, n, precision, infty, min_limit,
-                                    max_limit, nbits);
-    }
-  }
-
-  static constexpr size_t kMaxNumSymbols =
-      kNumRawSymbols + 1 < kNumLZ77 ? kNumLZ77 : kNumRawSymbols + 1;
-  static void ComputeCodeLengths(const uint64_t* freqs, size_t n,
-                                 const uint8_t* min_limit_in,
-                                 const uint8_t* max_limit_in, uint8_t* nbits) {
-    assert(n <= kMaxNumSymbols);
-    uint64_t compact_freqs[kMaxNumSymbols];
-    uint8_t min_limit[kMaxNumSymbols];
-    uint8_t max_limit[kMaxNumSymbols];
-    size_t ni = 0;
-    for (size_t i = 0; i < n; i++) {
-      if (freqs[i]) {
-        compact_freqs[ni] = freqs[i];
-        min_limit[ni] = min_limit_in[i];
-        max_limit[ni] = max_limit_in[i];
-        ni++;
-      }
-    }
-    uint8_t num_bits[kMaxNumSymbols] = {};
-    ComputeCodeLengthsNonZero(compact_freqs, ni, min_limit, max_limit,
-                              num_bits);
-    ni = 0;
-    for (size_t i = 0; i < n; i++) {
-      nbits[i] = 0;
-      if (freqs[i]) {
-        nbits[i] = num_bits[ni++];
-      }
-    }
-  }
-
-  // Invalid code, used to construct arrays.
-  PrefixCode() = default;
-
-  template <typename BitDepth>
-  PrefixCode(BitDepth /* bitdepth */, uint64_t* raw_counts,
-             uint64_t* lz77_counts) {
-    // "merge" together all the lz77 counts in a single symbol for the level 1
-    // table (containing just the raw symbols, up to length 7).
-    uint64_t level1_counts[kNumRawSymbols + 1];
-    memcpy(level1_counts, raw_counts, kNumRawSymbols * sizeof(uint64_t));
-    numraw = kNumRawSymbols;
-    while (numraw > 0 && level1_counts[numraw - 1] == 0) numraw--;
-
-    level1_counts[numraw] = 0;
-    for (size_t i = 0; i < kNumLZ77; i++) {
-      level1_counts[numraw] += lz77_counts[i];
-    }
-    uint8_t level1_nbits[kNumRawSymbols + 1] = {};
-    ComputeCodeLengths(level1_counts, numraw + 1, BitDepth::kMinRawLength,
-                       BitDepth::kMaxRawLength, level1_nbits);
-
-    uint8_t level2_nbits[kNumLZ77] = {};
-    uint8_t min_lengths[kNumLZ77] = {};
-    uint8_t l = 15 - level1_nbits[numraw];
-    uint8_t max_lengths[kNumLZ77];
-    for (uint8_t& max_length : max_lengths) {
-      max_length = l;
-    }
-    size_t num_lz77 = kNumLZ77;
-    while (num_lz77 > 0 && lz77_counts[num_lz77 - 1] == 0) num_lz77--;
-    ComputeCodeLengths(lz77_counts, num_lz77, min_lengths, max_lengths,
-                       level2_nbits);
-    for (size_t i = 0; i < numraw; i++) {
-      raw_nbits[i] = level1_nbits[i];
-    }
-    for (size_t i = 0; i < num_lz77; i++) {
-      lz77_nbits[i] =
-          level2_nbits[i] ? level1_nbits[numraw] + level2_nbits[i] : 0;
-    }
-
-    ComputeCanonicalCode(raw_nbits, raw_bits, numraw, lz77_nbits, lz77_bits,
-                         kNumLZ77);
-
-    // Prepare lz77 cache
-    for (size_t count = 0; count < kLZ77CacheSize; count++) {
-      unsigned token, nbits, bits;
-      EncodeHybridUintLZ77(count, &token, &nbits, &bits);
-      lz77_cache_nbits[count] = lz77_nbits[token] + nbits + raw_nbits[0];
-      lz77_cache_bits[count] =
-          (((bits << lz77_nbits[token]) | lz77_bits[token]) << raw_nbits[0]) |
-          raw_bits[0];
-    }
-  }
-
-  // Max bits written: 2 + 72 + 95 + 24 + 165 = 286
-  void WriteTo(BitWriter* writer) const {
-    uint64_t code_length_counts[18] = {};
-    code_length_counts[17] = 3 + 2 * (kNumLZ77 - 1);
-    for (uint8_t raw_nbit : raw_nbits) {
-      code_length_counts[raw_nbit]++;
-    }
-    for (uint8_t lz77_nbit : lz77_nbits) {
-      code_length_counts[lz77_nbit]++;
-    }
-    uint8_t code_length_nbits[18] = {};
-    uint8_t code_length_nbits_min[18] = {};
-    uint8_t code_length_nbits_max[18] = {
-        5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    };
-    ComputeCodeLengths(code_length_counts, 18, code_length_nbits_min,
-                       code_length_nbits_max, code_length_nbits);
-    writer->Write(2, 0b00);  // HSKIP = 0, i.e. don't skip code lengths.
-
-    // As per Brotli RFC.
-    uint8_t code_length_order[18] = {1, 2, 3, 4,  0,  5,  17, 6,  16,
-                                     7, 8, 9, 10, 11, 12, 13, 14, 15};
-    uint8_t code_length_length_nbits[] = {2, 4, 3, 2, 2, 4};
-    uint8_t code_length_length_bits[] = {0, 7, 3, 2, 1, 15};
-
-    // Encode lengths of code lengths.
-    size_t num_code_lengths = 18;
-    while (code_length_nbits[code_length_order[num_code_lengths - 1]] == 0) {
-      num_code_lengths--;
-    }
-    // Max bits written in this loop: 18 * 4 = 72
-    for (size_t i = 0; i < num_code_lengths; i++) {
-      int symbol = code_length_nbits[code_length_order[i]];
-      writer->Write(code_length_length_nbits[symbol],
-                    code_length_length_bits[symbol]);
-    }
-
-    // Compute the canonical codes for the codes that represent the lengths of
-    // the actual codes for data.
-    uint16_t code_length_bits[18] = {};
-    ComputeCanonicalCode(nullptr, nullptr, 0, code_length_nbits,
-                         code_length_bits, 18);
-    // Encode raw bit code lengths.
-    // Max bits written in this loop: 19 * 5 = 95
-    for (uint8_t raw_nbit : raw_nbits) {
-      writer->Write(code_length_nbits[raw_nbit], code_length_bits[raw_nbit]);
-    }
-    size_t num_lz77 = kNumLZ77;
-    while (lz77_nbits[num_lz77 - 1] == 0) {
-      num_lz77--;
-    }
-    // Encode 0s until 224 (start of LZ77 symbols). This is in total 224-19 =
-    // 205.
-    static_assert(kLZ77Offset == 224);
-    static_assert(kNumRawSymbols == 19);
-    {
-      // Max bits in this block: 24
-      writer->Write(code_length_nbits[17], code_length_bits[17]);
-      writer->Write(3, 0b010);  // 5
-      writer->Write(code_length_nbits[17], code_length_bits[17]);
-      writer->Write(3, 0b000);  // (5-2)*8 + 3 = 27
-      writer->Write(code_length_nbits[17], code_length_bits[17]);
-      writer->Write(3, 0b010);  // (27-2)*8 + 5 = 205
-    }
-    // Encode LZ77 symbols, with values 224+i.
-    // Max bits written in this loop: 33 * 5 = 165
-    for (size_t i = 0; i < num_lz77; i++) {
-      writer->Write(code_length_nbits[lz77_nbits[i]],
-                    code_length_bits[lz77_nbits[i]]);
-    }
-  }
-};
-
-}  // namespace
-
-extern "C" {
-
-struct JxlFastLosslessFrameState {
-  JxlChunkedFrameInputSource input;
-  size_t width;
-  size_t height;
-  size_t num_groups_x;
-  size_t num_groups_y;
-  size_t num_dc_groups_x;
-  size_t num_dc_groups_y;
-  size_t nb_chans;
-  size_t bitdepth;
-  int big_endian;
-  int effort;
-  bool collided;
-  PrefixCode hcode[4];
-  std::vector<int16_t> lookup;
-  BitWriter header;
-  std::vector<std::array<BitWriter, 4>> group_data;
-  std::vector<size_t> group_sizes;
-  size_t ac_group_data_offset = 0;
-  size_t min_dc_global_size = 0;
-  size_t current_bit_writer = 0;
-  size_t bit_writer_byte_pos = 0;
-  size_t bits_in_buffer = 0;
-  uint64_t bit_buffer = 0;
-  bool process_done = false;
-};
-
-size_t JxlFastLosslessOutputSize(const JxlFastLosslessFrameState* frame) {
-  size_t total_size_groups = 0;
-  for (const auto& section : frame->group_data) {
-    total_size_groups += SectionSize(section);
-  }
-  return frame->header.bytes_written + total_size_groups;
-}
-
-size_t JxlFastLosslessMaxRequiredOutput(
-    const JxlFastLosslessFrameState* frame) {
-  return JxlFastLosslessOutputSize(frame) + 32;
-}
-
-void JxlFastLosslessPrepareHeader(JxlFastLosslessFrameState* frame,
-                                  int add_image_header, int is_last) {
-  BitWriter* output = &frame->header;
-  output->Allocate(1000 + frame->group_sizes.size() * 32);
-
-  bool have_alpha = (frame->nb_chans == 2 || frame->nb_chans == 4);
-
-#if FJXL_STANDALONE
-  if (add_image_header) {
-    // Signature
-    output->Write(16, 0x0AFF);
-
-    // Size header, hand-crafted.
-    // Not small
-    output->Write(1, 0);
-
-    auto wsz = [output](size_t size) {
-      if (size - 1 < (1 << 9)) {
-        output->Write(2, 0b00);
-        output->Write(9, size - 1);
-      } else if (size - 1 < (1 << 13)) {
-        output->Write(2, 0b01);
-        output->Write(13, size - 1);
-      } else if (size - 1 < (1 << 18)) {
-        output->Write(2, 0b10);
-        output->Write(18, size - 1);
-      } else {
-        output->Write(2, 0b11);
-        output->Write(30, size - 1);
-      }
-    };
-
-    wsz(frame->height);
-
-    // No special ratio.
-    output->Write(3, 0);
-
-    wsz(frame->width);
-
-    // Hand-crafted ImageMetadata.
-    output->Write(1, 0);  // all_default
-    output->Write(1, 0);  // extra_fields
-    output->Write(1, 0);  // bit_depth.floating_point_sample
-    if (frame->bitdepth == 8) {
-      output->Write(2, 0b00);  // bit_depth.bits_per_sample = 8
-    } else if (frame->bitdepth == 10) {
-      output->Write(2, 0b01);  // bit_depth.bits_per_sample = 10
-    } else if (frame->bitdepth == 12) {
-      output->Write(2, 0b10);  // bit_depth.bits_per_sample = 12
-    } else {
-      output->Write(2, 0b11);  // 1 + u(6)
-      output->Write(6, frame->bitdepth - 1);
-    }
-    if (frame->bitdepth <= 14) {
-      output->Write(1, 1);  // 16-bit-buffer sufficient
-    } else {
-      output->Write(1, 0);  // 16-bit-buffer NOT sufficient
-    }
-    if (have_alpha) {
-      output->Write(2, 0b01);  // One extra channel
-      output->Write(1, 1);     // ... all_default (ie. 8-bit alpha)
-    } else {
-      output->Write(2, 0b00);  // No extra channel
-    }
-    output->Write(1, 0);  // Not XYB
-    if (frame->nb_chans > 2) {
-      output->Write(1, 1);  // color_encoding.all_default (sRGB)
-    } else {
-      output->Write(1, 0);     // color_encoding.all_default false
-      output->Write(1, 0);     // color_encoding.want_icc false
-      output->Write(2, 1);     // grayscale
-      output->Write(2, 1);     // D65
-      output->Write(1, 0);     // no gamma transfer function
-      output->Write(2, 0b10);  // tf: 2 + u(4)
-      output->Write(4, 11);    // tf of sRGB
-      output->Write(2, 1);     // relative rendering intent
-    }
-    output->Write(2, 0b00);  // No extensions.
-
-    output->Write(1, 1);  // all_default transform data
-
-    // No ICC, no preview. Frame should start at byte boundary.
-    output->ZeroPadToByte();
-  }
-#else
-  assert(!add_image_header);
-#endif
-  // Handcrafted frame header.
-  output->Write(1, 0);     // all_default
-  output->Write(2, 0b00);  // regular frame
-  output->Write(1, 1);     // modular
-  output->Write(2, 0b00);  // default flags
-  output->Write(1, 0);     // not YCbCr
-  output->Write(2, 0b00);  // no upsampling
-  if (have_alpha) {
-    output->Write(2, 0b00);  // no alpha upsampling
-  }
-  output->Write(2, 0b01);  // default group size
-  output->Write(2, 0b00);  // exactly one pass
-  output->Write(1, 0);     // no custom size or origin
-  output->Write(2, 0b00);  // kReplace blending mode
-  if (have_alpha) {
-    output->Write(2, 0b00);  // kReplace blending mode for alpha channel
-  }
-  output->Write(1, is_last);  // is_last
-  if (!is_last) {
-    output->Write(2, 0b00);  // can not be saved as reference
-  }
-  output->Write(2, 0b00);  // a frame has no name
-  output->Write(1, 0);     // loop filter is not all_default
-  output->Write(1, 0);     // no gaborish
-  output->Write(2, 0);     // 0 EPF iters
-  output->Write(2, 0b00);  // No LF extensions
-  output->Write(2, 0b00);  // No FH extensions
-
-  output->Write(1, 0);      // No TOC permutation
-  output->ZeroPadToByte();  // TOC is byte-aligned.
-  assert(add_image_header || output->bytes_written <= kMaxFrameHeaderSize);
-  for (size_t group_size : frame->group_sizes) {
-    size_t bucket = TOCBucket(group_size);
-    output->Write(2, bucket);
-    output->Write(kTOCBits[bucket] - 2, group_size - kGroupSizeOffset[bucket]);
-  }
-  output->ZeroPadToByte();  // Groups are byte-aligned.
-}
-
-#if !FJXL_STANDALONE
-bool JxlFastLosslessOutputAlignedSection(
-    const BitWriter& bw, JxlEncoderOutputProcessorWrapper* output_processor) {
-  assert(bw.bits_in_buffer == 0);
-  const uint8_t* data = bw.data.get();
-  size_t remaining_len = bw.bytes_written;
-  while (remaining_len > 0) {
-    JXL_ASSIGN_OR_RETURN(auto buffer,
-                         output_processor->GetBuffer(1, remaining_len));
-    size_t n = std::min(buffer.size(), remaining_len);
-    if (n == 0) break;
-    memcpy(buffer.data(), data, n);
-    JXL_RETURN_IF_ERROR(buffer.advance(n));
-    data += n;
-    remaining_len -= n;
-  };
-  return true;
-}
-
-bool JxlFastLosslessOutputHeaders(
-    JxlFastLosslessFrameState* frame_state,
-    JxlEncoderOutputProcessorWrapper* output_processor) {
-  JXL_RETURN_IF_ERROR(JxlFastLosslessOutputAlignedSection(frame_state->header,
-                                                          output_processor));
-  JXL_RETURN_IF_ERROR(JxlFastLosslessOutputAlignedSection(
-      frame_state->group_data[0][0], output_processor));
-  return true;
-}
-#endif
-
-#if FJXL_ENABLE_AVX512
-__attribute__((target("avx512vbmi2"))) static size_t AppendBytesWithBitOffset(
-    const uint8_t* data, size_t n, size_t bit_buffer_nbits,
-    unsigned char* output, uint64_t& bit_buffer) {
-  if (n < 128) {
-    return 0;
-  }
-
-  size_t i = 0;
-  __m512i shift = _mm512_set1_epi64(64 - bit_buffer_nbits);
-  __m512i carry = _mm512_set1_epi64(bit_buffer << (64 - bit_buffer_nbits));
-
-  for (; i + 64 <= n; i += 64) {
-    __m512i current = _mm512_loadu_si512(data + i);
-    __m512i previous_u64 = _mm512_alignr_epi64(current, carry, 7);
-    carry = current;
-    __m512i out = _mm512_shrdv_epi64(previous_u64, current, shift);
-    _mm512_storeu_si512(output + i, out);
-  }
-
-  bit_buffer = data[i - 1] >> (8 - bit_buffer_nbits);
-
-  return i;
-}
-#endif
-
-size_t JxlFastLosslessWriteOutput(JxlFastLosslessFrameState* frame,
-                                  unsigned char* output, size_t output_size) {
-  assert(output_size >= 32);
-  unsigned char* initial_output = output;
-  size_t (*append_bytes_with_bit_offset)(const uint8_t*, size_t, size_t,
-                                         unsigned char*, uint64_t&) = nullptr;
-
-#if FJXL_ENABLE_AVX512
-  if (HasCpuFeature(CpuFeature::kVBMI2)) {
-    append_bytes_with_bit_offset = AppendBytesWithBitOffset;
-  }
-#endif
-
-  while (true) {
-    size_t& cur = frame->current_bit_writer;
-    size_t& bw_pos = frame->bit_writer_byte_pos;
-    if (cur >= 1 + frame->group_data.size() * frame->nb_chans) {
-      return output - initial_output;
-    }
-    if (output_size <= 9) {
-      return output - initial_output;
-    }
-    size_t nbc = frame->nb_chans;
-    const BitWriter& writer =
-        cur == 0 ? frame->header
-                 : frame->group_data[(cur - 1) / nbc][(cur - 1) % nbc];
-    size_t full_byte_count =
-        std::min(output_size - 9, writer.bytes_written - bw_pos);
-    if (frame->bits_in_buffer == 0) {
-      memcpy(output, writer.data.get() + bw_pos, full_byte_count);
-    } else {
-      size_t i = 0;
-      if (append_bytes_with_bit_offset) {
-        i += append_bytes_with_bit_offset(
-            writer.data.get() + bw_pos, full_byte_count, frame->bits_in_buffer,
-            output, frame->bit_buffer);
-      }
-#if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-      // Copy 8 bytes at a time until we reach the border.
-      for (; i + 8 < full_byte_count; i += 8) {
-        uint64_t chunk;
-        memcpy(&chunk, writer.data.get() + bw_pos + i, 8);
-        uint64_t out = frame->bit_buffer | (chunk << frame->bits_in_buffer);
-        memcpy(output + i, &out, 8);
-        frame->bit_buffer = chunk >> (64 - frame->bits_in_buffer);
-      }
-#endif
-      for (; i < full_byte_count; i++) {
-        AddBits(8, writer.data.get()[bw_pos + i], output + i,
-                frame->bits_in_buffer, frame->bit_buffer);
-      }
-    }
-    output += full_byte_count;
-    output_size -= full_byte_count;
-    bw_pos += full_byte_count;
-    if (bw_pos == writer.bytes_written) {
-      auto write = [&](size_t num, uint64_t bits) {
-        size_t n = AddBits(num, bits, output, frame->bits_in_buffer,
-                           frame->bit_buffer);
-        output += n;
-        output_size -= n;
-      };
-      if (writer.bits_in_buffer) {
-        write(writer.bits_in_buffer, writer.buffer);
-      }
-      bw_pos = 0;
-      cur++;
-      if ((cur - 1) % nbc == 0 && frame->bits_in_buffer != 0) {
-        write(8 - frame->bits_in_buffer, 0);
-      }
-    }
-  }
-}
-
-void JxlFastLosslessFreeFrameState(JxlFastLosslessFrameState* frame) {
-  delete frame;
-}
-
-}  // extern "C"
-
-#endif
-
-#ifdef FJXL_SELF_INCLUDE
-
-namespace {
-
-template <typename T>
-struct VecPair {
-  T low;
-  T hi;
-};
-
-#ifdef FJXL_GENERIC_SIMD
-#undef FJXL_GENERIC_SIMD
-#endif
-
-#ifdef FJXL_AVX512
-#define FJXL_GENERIC_SIMD
-struct SIMDVec32;
-struct Mask32 {
-  __mmask16 mask;
-  SIMDVec32 IfThenElse(const SIMDVec32& if_true, const SIMDVec32& if_false);
-  size_t CountPrefix() const {
-    return CtzNonZero(~uint64_t{_cvtmask16_u32(mask)});
-  }
-};
-
-struct SIMDVec32 {
-  __m512i vec;
-
-  static constexpr size_t kLanes = 16;
-
-  FJXL_INLINE static SIMDVec32 Load(const uint32_t* data) {
-    return SIMDVec32{_mm512_loadu_si512((__m512i*)data)};
-  }
-  FJXL_INLINE void Store(uint32_t* data) {
-    _mm512_storeu_si512((__m512i*)data, vec);
-  }
-  FJXL_INLINE static SIMDVec32 Val(uint32_t v) {
-    return SIMDVec32{_mm512_set1_epi32(v)};
-  }
-  FJXL_INLINE SIMDVec32 ValToToken() const {
-    return SIMDVec32{
-        _mm512_sub_epi32(_mm512_set1_epi32(32), _mm512_lzcnt_epi32(vec))};
-  }
-  FJXL_INLINE SIMDVec32 SatSubU(const SIMDVec32& to_subtract) const {
-    return SIMDVec32{_mm512_sub_epi32(_mm512_max_epu32(vec, to_subtract.vec),
-                                      to_subtract.vec)};
-  }
-  FJXL_INLINE SIMDVec32 Sub(const SIMDVec32& to_subtract) const {
-    return SIMDVec32{_mm512_sub_epi32(vec, to_subtract.vec)};
-  }
-  FJXL_INLINE SIMDVec32 Add(const SIMDVec32& oth) const {
-    return SIMDVec32{_mm512_add_epi32(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec32 Xor(const SIMDVec32& oth) const {
-    return SIMDVec32{_mm512_xor_epi32(vec, oth.vec)};
-  }
-  FJXL_INLINE Mask32 Eq(const SIMDVec32& oth) const {
-    return Mask32{_mm512_cmpeq_epi32_mask(vec, oth.vec)};
-  }
-  FJXL_INLINE Mask32 Gt(const SIMDVec32& oth) const {
-    return Mask32{_mm512_cmpgt_epi32_mask(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec32 Pow2() const {
-    return SIMDVec32{_mm512_sllv_epi32(_mm512_set1_epi32(1), vec)};
-  }
-  template <size_t i>
-  FJXL_INLINE SIMDVec32 SignedShiftRight() const {
-    return SIMDVec32{_mm512_srai_epi32(vec, i)};
-  }
-};
-
-struct SIMDVec16;
-
-struct Mask16 {
-  __mmask32 mask;
-  SIMDVec16 IfThenElse(const SIMDVec16& if_true, const SIMDVec16& if_false);
-  Mask16 And(const Mask16& oth) const {
-    return Mask16{_kand_mask32(mask, oth.mask)};
-  }
-  size_t CountPrefix() const {
-    return CtzNonZero(~uint64_t{_cvtmask32_u32(mask)});
-  }
-};
-
-struct SIMDVec16 {
-  __m512i vec;
-
-  static constexpr size_t kLanes = 32;
-
-  FJXL_INLINE static SIMDVec16 Load(const uint16_t* data) {
-    return SIMDVec16{_mm512_loadu_si512((__m512i*)data)};
-  }
-  FJXL_INLINE void Store(uint16_t* data) {
-    _mm512_storeu_si512((__m512i*)data, vec);
-  }
-  FJXL_INLINE static SIMDVec16 Val(uint16_t v) {
-    return SIMDVec16{_mm512_set1_epi16(v)};
-  }
-  FJXL_INLINE static SIMDVec16 FromTwo32(const SIMDVec32& lo,
-                                         const SIMDVec32& hi) {
-    auto tmp = _mm512_packus_epi32(lo.vec, hi.vec);
-    alignas(64) uint64_t perm[8] = {0, 2, 4, 6, 1, 3, 5, 7};
-    return SIMDVec16{
-        _mm512_permutex2var_epi64(tmp, _mm512_load_si512((__m512i*)perm), tmp)};
-  }
-
-  FJXL_INLINE SIMDVec16 ValToToken() const {
-    auto c16 = _mm512_set1_epi32(16);
-    auto c32 = _mm512_set1_epi32(32);
-    auto low16bit = _mm512_set1_epi32(0x0000FFFF);
-    auto lzhi =
-        _mm512_sub_epi32(c16, _mm512_min_epu32(c16, _mm512_lzcnt_epi32(vec)));
-    auto lzlo = _mm512_sub_epi32(
-        c32, _mm512_lzcnt_epi32(_mm512_and_si512(low16bit, vec)));
-    return SIMDVec16{_mm512_or_si512(lzlo, _mm512_slli_epi32(lzhi, 16))};
-  }
-
-  FJXL_INLINE SIMDVec16 SatSubU(const SIMDVec16& to_subtract) const {
-    return SIMDVec16{_mm512_subs_epu16(vec, to_subtract.vec)};
-  }
-  FJXL_INLINE SIMDVec16 Sub(const SIMDVec16& to_subtract) const {
-    return SIMDVec16{_mm512_sub_epi16(vec, to_subtract.vec)};
-  }
-  FJXL_INLINE SIMDVec16 Add(const SIMDVec16& oth) const {
-    return SIMDVec16{_mm512_add_epi16(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec16 Min(const SIMDVec16& oth) const {
-    return SIMDVec16{_mm512_min_epu16(vec, oth.vec)};
-  }
-  FJXL_INLINE Mask16 Eq(const SIMDVec16& oth) const {
-    return Mask16{_mm512_cmpeq_epi16_mask(vec, oth.vec)};
-  }
-  FJXL_INLINE Mask16 Gt(const SIMDVec16& oth) const {
-    return Mask16{_mm512_cmpgt_epi16_mask(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec16 Pow2() const {
-    return SIMDVec16{_mm512_sllv_epi16(_mm512_set1_epi16(1), vec)};
-  }
-  FJXL_INLINE SIMDVec16 Or(const SIMDVec16& oth) const {
-    return SIMDVec16{_mm512_or_si512(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec16 Xor(const SIMDVec16& oth) const {
-    return SIMDVec16{_mm512_xor_si512(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec16 And(const SIMDVec16& oth) const {
-    return SIMDVec16{_mm512_and_si512(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec16 HAdd(const SIMDVec16& oth) const {
-    return SIMDVec16{_mm512_srai_epi16(_mm512_add_epi16(vec, oth.vec), 1)};
-  }
-  FJXL_INLINE SIMDVec16 PrepareForU8Lookup() const {
-    return SIMDVec16{_mm512_or_si512(vec, _mm512_set1_epi16(0xFF00))};
-  }
-  FJXL_INLINE SIMDVec16 U8Lookup(const uint8_t* table) const {
-    return SIMDVec16{_mm512_shuffle_epi8(
-        _mm512_broadcast_i32x4(_mm_loadu_si128((__m128i*)table)), vec)};
-  }
-  FJXL_INLINE VecPair<SIMDVec16> Interleave(const SIMDVec16& low) const {
-    auto lo = _mm512_unpacklo_epi16(low.vec, vec);
-    auto hi = _mm512_unpackhi_epi16(low.vec, vec);
-    alignas(64) uint64_t perm1[8] = {0, 1, 8, 9, 2, 3, 10, 11};
-    alignas(64) uint64_t perm2[8] = {4, 5, 12, 13, 6, 7, 14, 15};
-    return {SIMDVec16{_mm512_permutex2var_epi64(
-                lo, _mm512_load_si512((__m512i*)perm1), hi)},
-            SIMDVec16{_mm512_permutex2var_epi64(
-                lo, _mm512_load_si512((__m512i*)perm2), hi)}};
-  }
-  FJXL_INLINE VecPair<SIMDVec32> Upcast() const {
-    auto lo = _mm512_unpacklo_epi16(vec, _mm512_setzero_si512());
-    auto hi = _mm512_unpackhi_epi16(vec, _mm512_setzero_si512());
-    alignas(64) uint64_t perm1[8] = {0, 1, 8, 9, 2, 3, 10, 11};
-    alignas(64) uint64_t perm2[8] = {4, 5, 12, 13, 6, 7, 14, 15};
-    return {SIMDVec32{_mm512_permutex2var_epi64(
-                lo, _mm512_load_si512((__m512i*)perm1), hi)},
-            SIMDVec32{_mm512_permutex2var_epi64(
-                lo, _mm512_load_si512((__m512i*)perm2), hi)}};
-  }
-  template <size_t i>
-  FJXL_INLINE SIMDVec16 SignedShiftRight() const {
-    return SIMDVec16{_mm512_srai_epi16(vec, i)};
-  }
-
-  static std::array<SIMDVec16, 1> LoadG8(const unsigned char* data) {
-    __m256i bytes = _mm256_loadu_si256((__m256i*)data);
-    return {SIMDVec16{_mm512_cvtepu8_epi16(bytes)}};
-  }
-  static std::array<SIMDVec16, 1> LoadG16(const unsigned char* data) {
-    return {Load((const uint16_t*)data)};
-  }
-
-  static std::array<SIMDVec16, 2> LoadGA8(const unsigned char* data) {
-    __m512i bytes = _mm512_loadu_si512((__m512i*)data);
-    __m512i gray = _mm512_and_si512(bytes, _mm512_set1_epi16(0xFF));
-    __m512i alpha = _mm512_srli_epi16(bytes, 8);
-    return {SIMDVec16{gray}, SIMDVec16{alpha}};
-  }
-  static std::array<SIMDVec16, 2> LoadGA16(const unsigned char* data) {
-    __m512i bytes1 = _mm512_loadu_si512((__m512i*)data);
-    __m512i bytes2 = _mm512_loadu_si512((__m512i*)(data + 64));
-    __m512i g_mask = _mm512_set1_epi32(0xFFFF);
-    __m512i permuteidx = _mm512_set_epi64(7, 5, 3, 1, 6, 4, 2, 0);
-    __m512i g = _mm512_permutexvar_epi64(
-        permuteidx, _mm512_packus_epi32(_mm512_and_si512(bytes1, g_mask),
-                                        _mm512_and_si512(bytes2, g_mask)));
-    __m512i a = _mm512_permutexvar_epi64(
-        permuteidx, _mm512_packus_epi32(_mm512_srli_epi32(bytes1, 16),
-                                        _mm512_srli_epi32(bytes2, 16)));
-    return {SIMDVec16{g}, SIMDVec16{a}};
-  }
-
-  static std::array<SIMDVec16, 3> LoadRGB8(const unsigned char* data) {
-    __m512i bytes0 = _mm512_loadu_si512((__m512i*)data);
-    __m512i bytes1 =
-        _mm512_zextsi256_si512(_mm256_loadu_si256((__m256i*)(data + 64)));
-
-    // 0x7A = element of upper half of second vector = 0 after lookup; still in
-    // the upper half once we add 1 or 2.
-    uint8_t z = 0x7A;
-    __m512i ridx =
-        _mm512_set_epi8(z, 93, z, 90, z, 87, z, 84, z, 81, z, 78, z, 75, z, 72,
-                        z, 69, z, 66, z, 63, z, 60, z, 57, z, 54, z, 51, z, 48,
-                        z, 45, z, 42, z, 39, z, 36, z, 33, z, 30, z, 27, z, 24,
-                        z, 21, z, 18, z, 15, z, 12, z, 9, z, 6, z, 3, z, 0);
-    __m512i gidx = _mm512_add_epi8(ridx, _mm512_set1_epi8(1));
-    __m512i bidx = _mm512_add_epi8(gidx, _mm512_set1_epi8(1));
-    __m512i r = _mm512_permutex2var_epi8(bytes0, ridx, bytes1);
-    __m512i g = _mm512_permutex2var_epi8(bytes0, gidx, bytes1);
-    __m512i b = _mm512_permutex2var_epi8(bytes0, bidx, bytes1);
-    return {SIMDVec16{r}, SIMDVec16{g}, SIMDVec16{b}};
-  }
-  static std::array<SIMDVec16, 3> LoadRGB16(const unsigned char* data) {
-    __m512i bytes0 = _mm512_loadu_si512((__m512i*)data);
-    __m512i bytes1 = _mm512_loadu_si512((__m512i*)(data + 64));
-    __m512i bytes2 = _mm512_loadu_si512((__m512i*)(data + 128));
-
-    __m512i ridx_lo = _mm512_set_epi16(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 60, 57,
-                                       54, 51, 48, 45, 42, 39, 36, 33, 30, 27,
-                                       24, 21, 18, 15, 12, 9, 6, 3, 0);
-    // -1 is such that when adding 1 or 2, we get the correct index for
-    // green/blue.
-    __m512i ridx_hi =
-        _mm512_set_epi16(29, 26, 23, 20, 17, 14, 11, 8, 5, 2, -1, 0, 0, 0, 0, 0,
-                         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-    __m512i gidx_lo = _mm512_add_epi16(ridx_lo, _mm512_set1_epi16(1));
-    __m512i gidx_hi = _mm512_add_epi16(ridx_hi, _mm512_set1_epi16(1));
-    __m512i bidx_lo = _mm512_add_epi16(gidx_lo, _mm512_set1_epi16(1));
-    __m512i bidx_hi = _mm512_add_epi16(gidx_hi, _mm512_set1_epi16(1));
-
-    __mmask32 rmask = _cvtu32_mask32(0b11111111110000000000000000000000);
-    __mmask32 gbmask = _cvtu32_mask32(0b11111111111000000000000000000000);
-
-    __m512i rlo = _mm512_permutex2var_epi16(bytes0, ridx_lo, bytes1);
-    __m512i glo = _mm512_permutex2var_epi16(bytes0, gidx_lo, bytes1);
-    __m512i blo = _mm512_permutex2var_epi16(bytes0, bidx_lo, bytes1);
-    __m512i r = _mm512_mask_permutexvar_epi16(rlo, rmask, ridx_hi, bytes2);
-    __m512i g = _mm512_mask_permutexvar_epi16(glo, gbmask, gidx_hi, bytes2);
-    __m512i b = _mm512_mask_permutexvar_epi16(blo, gbmask, bidx_hi, bytes2);
-    return {SIMDVec16{r}, SIMDVec16{g}, SIMDVec16{b}};
-  }
-
-  static std::array<SIMDVec16, 4> LoadRGBA8(const unsigned char* data) {
-    __m512i bytes1 = _mm512_loadu_si512((__m512i*)data);
-    __m512i bytes2 = _mm512_loadu_si512((__m512i*)(data + 64));
-    __m512i rg_mask = _mm512_set1_epi32(0xFFFF);
-    __m512i permuteidx = _mm512_set_epi64(7, 5, 3, 1, 6, 4, 2, 0);
-    __m512i rg = _mm512_permutexvar_epi64(
-        permuteidx, _mm512_packus_epi32(_mm512_and_si512(bytes1, rg_mask),
-                                        _mm512_and_si512(bytes2, rg_mask)));
-    __m512i b_a = _mm512_permutexvar_epi64(
-        permuteidx, _mm512_packus_epi32(_mm512_srli_epi32(bytes1, 16),
-                                        _mm512_srli_epi32(bytes2, 16)));
-    __m512i r = _mm512_and_si512(rg, _mm512_set1_epi16(0xFF));
-    __m512i g = _mm512_srli_epi16(rg, 8);
-    __m512i b = _mm512_and_si512(b_a, _mm512_set1_epi16(0xFF));
-    __m512i a = _mm512_srli_epi16(b_a, 8);
-    return {SIMDVec16{r}, SIMDVec16{g}, SIMDVec16{b}, SIMDVec16{a}};
-  }
-  static std::array<SIMDVec16, 4> LoadRGBA16(const unsigned char* data) {
-    __m512i bytes0 = _mm512_loadu_si512((__m512i*)data);
-    __m512i bytes1 = _mm512_loadu_si512((__m512i*)(data + 64));
-    __m512i bytes2 = _mm512_loadu_si512((__m512i*)(data + 128));
-    __m512i bytes3 = _mm512_loadu_si512((__m512i*)(data + 192));
-
-    auto pack32 = [](__m512i a, __m512i b) {
-      __m512i permuteidx = _mm512_set_epi64(7, 5, 3, 1, 6, 4, 2, 0);
-      return _mm512_permutexvar_epi64(permuteidx, _mm512_packus_epi32(a, b));
-    };
-    auto packlow32 = [&pack32](__m512i a, __m512i b) {
-      __m512i mask = _mm512_set1_epi32(0xFFFF);
-      return pack32(_mm512_and_si512(a, mask), _mm512_and_si512(b, mask));
-    };
-    auto packhi32 = [&pack32](__m512i a, __m512i b) {
-      return pack32(_mm512_srli_epi32(a, 16), _mm512_srli_epi32(b, 16));
-    };
-
-    __m512i rb0 = packlow32(bytes0, bytes1);
-    __m512i rb1 = packlow32(bytes2, bytes3);
-    __m512i ga0 = packhi32(bytes0, bytes1);
-    __m512i ga1 = packhi32(bytes2, bytes3);
-
-    __m512i r = packlow32(rb0, rb1);
-    __m512i g = packlow32(ga0, ga1);
-    __m512i b = packhi32(rb0, rb1);
-    __m512i a = packhi32(ga0, ga1);
-    return {SIMDVec16{r}, SIMDVec16{g}, SIMDVec16{b}, SIMDVec16{a}};
-  }
-
-  void SwapEndian() {
-    auto indices = _mm512_broadcast_i32x4(
-        _mm_setr_epi8(1, 0, 3, 2, 5, 4, 7, 6, 9, 8, 11, 10, 13, 12, 15, 14));
-    vec = _mm512_shuffle_epi8(vec, indices);
-  }
-};
-
-SIMDVec16 Mask16::IfThenElse(const SIMDVec16& if_true,
-                             const SIMDVec16& if_false) {
-  return SIMDVec16{_mm512_mask_blend_epi16(mask, if_false.vec, if_true.vec)};
-}
-
-SIMDVec32 Mask32::IfThenElse(const SIMDVec32& if_true,
-                             const SIMDVec32& if_false) {
-  return SIMDVec32{_mm512_mask_blend_epi32(mask, if_false.vec, if_true.vec)};
-}
-
-struct Bits64 {
-  static constexpr size_t kLanes = 8;
-
-  __m512i nbits;
-  __m512i bits;
-
-  FJXL_INLINE void Store(uint64_t* nbits_out, uint64_t* bits_out) {
-    _mm512_storeu_si512((__m512i*)nbits_out, nbits);
-    _mm512_storeu_si512((__m512i*)bits_out, bits);
-  }
-};
-
-struct Bits32 {
-  __m512i nbits;
-  __m512i bits;
-
-  static Bits32 FromRaw(SIMDVec32 nbits, SIMDVec32 bits) {
-    return Bits32{nbits.vec, bits.vec};
-  }
-
-  Bits64 Merge() const {
-    auto nbits_hi32 = _mm512_srli_epi64(nbits, 32);
-    auto nbits_lo32 = _mm512_and_si512(nbits, _mm512_set1_epi64(0xFFFFFFFF));
-    auto bits_hi32 = _mm512_srli_epi64(bits, 32);
-    auto bits_lo32 = _mm512_and_si512(bits, _mm512_set1_epi64(0xFFFFFFFF));
-
-    auto nbits64 = _mm512_add_epi64(nbits_hi32, nbits_lo32);
-    auto bits64 =
-        _mm512_or_si512(_mm512_sllv_epi64(bits_hi32, nbits_lo32), bits_lo32);
-    return Bits64{nbits64, bits64};
-  }
-
-  void Interleave(const Bits32& low) {
-    bits = _mm512_or_si512(_mm512_sllv_epi32(bits, low.nbits), low.bits);
-    nbits = _mm512_add_epi32(nbits, low.nbits);
-  }
-
-  void ClipTo(size_t n) {
-    n = std::min<size_t>(n, 16);
-    constexpr uint32_t kMask[32] = {
-        ~0u, ~0u, ~0u, ~0u, ~0u, ~0u, ~0u, ~0u, ~0u, ~0u, ~0u,
-        ~0u, ~0u, ~0u, ~0u, ~0u, 0,   0,   0,   0,   0,   0,
-        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    };
-    __m512i mask = _mm512_loadu_si512((__m512i*)(kMask + 16 - n));
-    nbits = _mm512_and_si512(mask, nbits);
-    bits = _mm512_and_si512(mask, bits);
-  }
-  void Skip(size_t n) {
-    n = std::min<size_t>(n, 16);
-    constexpr uint32_t kMask[32] = {
-        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-        0,   0,   0,   0,   0,   ~0u, ~0u, ~0u, ~0u, ~0u, ~0u,
-        ~0u, ~0u, ~0u, ~0u, ~0u, ~0u, ~0u, ~0u, ~0u, ~0u,
-    };
-    __m512i mask = _mm512_loadu_si512((__m512i*)(kMask + 16 - n));
-    nbits = _mm512_and_si512(mask, nbits);
-    bits = _mm512_and_si512(mask, bits);
-  }
-};
-
-struct Bits16 {
-  __m512i nbits;
-  __m512i bits;
-
-  static Bits16 FromRaw(SIMDVec16 nbits, SIMDVec16 bits) {
-    return Bits16{nbits.vec, bits.vec};
-  }
-
-  Bits32 Merge() const {
-    auto nbits_hi16 = _mm512_srli_epi32(nbits, 16);
-    auto nbits_lo16 = _mm512_and_si512(nbits, _mm512_set1_epi32(0xFFFF));
-    auto bits_hi16 = _mm512_srli_epi32(bits, 16);
-    auto bits_lo16 = _mm512_and_si512(bits, _mm512_set1_epi32(0xFFFF));
-
-    auto nbits32 = _mm512_add_epi32(nbits_hi16, nbits_lo16);
-    auto bits32 =
-        _mm512_or_si512(_mm512_sllv_epi32(bits_hi16, nbits_lo16), bits_lo16);
-    return Bits32{nbits32, bits32};
-  }
-
-  void Interleave(const Bits16& low) {
-    bits = _mm512_or_si512(_mm512_sllv_epi16(bits, low.nbits), low.bits);
-    nbits = _mm512_add_epi16(nbits, low.nbits);
-  }
-
-  void ClipTo(size_t n) {
-    n = std::min<size_t>(n, 32);
-    constexpr uint16_t kMask[64] = {
-        0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
-        0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
-        0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
-        0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
-        0,      0,      0,      0,      0,      0,      0,      0,
-        0,      0,      0,      0,      0,      0,      0,      0,
-        0,      0,      0,      0,      0,      0,      0,      0,
-        0,      0,      0,      0,      0,      0,      0,      0,
-    };
-    __m512i mask = _mm512_loadu_si512((__m512i*)(kMask + 32 - n));
-    nbits = _mm512_and_si512(mask, nbits);
-    bits = _mm512_and_si512(mask, bits);
-  }
-  void Skip(size_t n) {
-    n = std::min<size_t>(n, 32);
-    constexpr uint16_t kMask[64] = {
-        0,      0,      0,      0,      0,      0,      0,      0,
-        0,      0,      0,      0,      0,      0,      0,      0,
-        0,      0,      0,      0,      0,      0,      0,      0,
-        0,      0,      0,      0,      0,      0,      0,      0,
-        0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
-        0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
-        0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
-        0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
-    };
-    __m512i mask = _mm512_loadu_si512((__m512i*)(kMask + 32 - n));
-    nbits = _mm512_and_si512(mask, nbits);
-    bits = _mm512_and_si512(mask, bits);
-  }
-};
-
-#endif
-
-#ifdef FJXL_AVX2
-#define FJXL_GENERIC_SIMD
-
-struct SIMDVec32;
-
-struct Mask32 {
-  __m256i mask;
-  SIMDVec32 IfThenElse(const SIMDVec32& if_true, const SIMDVec32& if_false);
-  size_t CountPrefix() const {
-    return CtzNonZero(~static_cast<uint64_t>(
-        static_cast<uint8_t>(_mm256_movemask_ps(_mm256_castsi256_ps(mask)))));
-  }
-};
-
-struct SIMDVec32 {
-  __m256i vec;
-
-  static constexpr size_t kLanes = 8;
-
-  FJXL_INLINE static SIMDVec32 Load(const uint32_t* data) {
-    return SIMDVec32{_mm256_loadu_si256((__m256i*)data)};
-  }
-  FJXL_INLINE void Store(uint32_t* data) {
-    _mm256_storeu_si256((__m256i*)data, vec);
-  }
-  FJXL_INLINE static SIMDVec32 Val(uint32_t v) {
-    return SIMDVec32{_mm256_set1_epi32(v)};
-  }
-  FJXL_INLINE SIMDVec32 ValToToken() const {
-    auto f32 = _mm256_castps_si256(_mm256_cvtepi32_ps(vec));
-    return SIMDVec32{_mm256_max_epi32(
-        _mm256_setzero_si256(),
-        _mm256_sub_epi32(_mm256_srli_epi32(f32, 23), _mm256_set1_epi32(126)))};
-  }
-  FJXL_INLINE SIMDVec32 SatSubU(const SIMDVec32& to_subtract) const {
-    return SIMDVec32{_mm256_sub_epi32(_mm256_max_epu32(vec, to_subtract.vec),
-                                      to_subtract.vec)};
-  }
-  FJXL_INLINE SIMDVec32 Sub(const SIMDVec32& to_subtract) const {
-    return SIMDVec32{_mm256_sub_epi32(vec, to_subtract.vec)};
-  }
-  FJXL_INLINE SIMDVec32 Add(const SIMDVec32& oth) const {
-    return SIMDVec32{_mm256_add_epi32(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec32 Xor(const SIMDVec32& oth) const {
-    return SIMDVec32{_mm256_xor_si256(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec32 Pow2() const {
-    return SIMDVec32{_mm256_sllv_epi32(_mm256_set1_epi32(1), vec)};
-  }
-  FJXL_INLINE Mask32 Eq(const SIMDVec32& oth) const {
-    return Mask32{_mm256_cmpeq_epi32(vec, oth.vec)};
-  }
-  FJXL_INLINE Mask32 Gt(const SIMDVec32& oth) const {
-    return Mask32{_mm256_cmpgt_epi32(vec, oth.vec)};
-  }
-  template <size_t i>
-  FJXL_INLINE SIMDVec32 SignedShiftRight() const {
-    return SIMDVec32{_mm256_srai_epi32(vec, i)};
-  }
-};
-
-struct SIMDVec16;
-
-struct Mask16 {
-  __m256i mask;
-  SIMDVec16 IfThenElse(const SIMDVec16& if_true, const SIMDVec16& if_false);
-  Mask16 And(const Mask16& oth) const {
-    return Mask16{_mm256_and_si256(mask, oth.mask)};
-  }
-  size_t CountPrefix() const {
-    return CtzNonZero(~static_cast<uint64_t>(
-               static_cast<uint32_t>(_mm256_movemask_epi8(mask)))) /
-           2;
-  }
-};
-
-struct SIMDVec16 {
-  __m256i vec;
-
-  static constexpr size_t kLanes = 16;
-
-  FJXL_INLINE static SIMDVec16 Load(const uint16_t* data) {
-    return SIMDVec16{_mm256_loadu_si256((__m256i*)data)};
-  }
-  FJXL_INLINE void Store(uint16_t* data) {
-    _mm256_storeu_si256((__m256i*)data, vec);
-  }
-  FJXL_INLINE static SIMDVec16 Val(uint16_t v) {
-    return SIMDVec16{_mm256_set1_epi16(v)};
-  }
-  FJXL_INLINE static SIMDVec16 FromTwo32(const SIMDVec32& lo,
-                                         const SIMDVec32& hi) {
-    auto tmp = _mm256_packus_epi32(lo.vec, hi.vec);
-    return SIMDVec16{_mm256_permute4x64_epi64(tmp, 0b11011000)};
-  }
-
-  FJXL_INLINE SIMDVec16 ValToToken() const {
-    auto nibble0 =
-        _mm256_or_si256(_mm256_and_si256(vec, _mm256_set1_epi16(0xF)),
-                        _mm256_set1_epi16(0xFF00));
-    auto nibble1 = _mm256_or_si256(
-        _mm256_and_si256(_mm256_srli_epi16(vec, 4), _mm256_set1_epi16(0xF)),
-        _mm256_set1_epi16(0xFF00));
-    auto nibble2 = _mm256_or_si256(
-        _mm256_and_si256(_mm256_srli_epi16(vec, 8), _mm256_set1_epi16(0xF)),
-        _mm256_set1_epi16(0xFF00));
-    auto nibble3 =
-        _mm256_or_si256(_mm256_srli_epi16(vec, 12), _mm256_set1_epi16(0xFF00));
-
-    auto lut0 = _mm256_broadcastsi128_si256(
-        _mm_setr_epi8(0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4));
-    auto lut1 = _mm256_broadcastsi128_si256(
-        _mm_setr_epi8(0, 5, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8));
-    auto lut2 = _mm256_broadcastsi128_si256(_mm_setr_epi8(
-        0, 9, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12));
-    auto lut3 = _mm256_broadcastsi128_si256(_mm_setr_epi8(
-        0, 13, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16));
-
-    auto token0 = _mm256_shuffle_epi8(lut0, nibble0);
-    auto token1 = _mm256_shuffle_epi8(lut1, nibble1);
-    auto token2 = _mm256_shuffle_epi8(lut2, nibble2);
-    auto token3 = _mm256_shuffle_epi8(lut3, nibble3);
-
-    auto token = _mm256_max_epi16(_mm256_max_epi16(token0, token1),
-                                  _mm256_max_epi16(token2, token3));
-    return SIMDVec16{token};
-  }
-
-  FJXL_INLINE SIMDVec16 SatSubU(const SIMDVec16& to_subtract) const {
-    return SIMDVec16{_mm256_subs_epu16(vec, to_subtract.vec)};
-  }
-  FJXL_INLINE SIMDVec16 Sub(const SIMDVec16& to_subtract) const {
-    return SIMDVec16{_mm256_sub_epi16(vec, to_subtract.vec)};
-  }
-  FJXL_INLINE SIMDVec16 Add(const SIMDVec16& oth) const {
-    return SIMDVec16{_mm256_add_epi16(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec16 Min(const SIMDVec16& oth) const {
-    return SIMDVec16{_mm256_min_epu16(vec, oth.vec)};
-  }
-  FJXL_INLINE Mask16 Eq(const SIMDVec16& oth) const {
-    return Mask16{_mm256_cmpeq_epi16(vec, oth.vec)};
-  }
-  FJXL_INLINE Mask16 Gt(const SIMDVec16& oth) const {
-    return Mask16{_mm256_cmpgt_epi16(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec16 Pow2() const {
-    auto pow2_lo_lut = _mm256_broadcastsi128_si256(
-        _mm_setr_epi8(1 << 0, 1 << 1, 1 << 2, 1 << 3, 1 << 4, 1 << 5, 1 << 6,
-                      1u << 7, 0, 0, 0, 0, 0, 0, 0, 0));
-    auto pow2_hi_lut = _mm256_broadcastsi128_si256(
-        _mm_setr_epi8(0, 0, 0, 0, 0, 0, 0, 0, 1 << 0, 1 << 1, 1 << 2, 1 << 3,
-                      1 << 4, 1 << 5, 1 << 6, 1u << 7));
-
-    auto masked = _mm256_or_si256(vec, _mm256_set1_epi16(0xFF00));
-
-    auto pow2_lo = _mm256_shuffle_epi8(pow2_lo_lut, masked);
-    auto pow2_hi = _mm256_shuffle_epi8(pow2_hi_lut, masked);
-
-    auto pow2 = _mm256_or_si256(_mm256_slli_epi16(pow2_hi, 8), pow2_lo);
-    return SIMDVec16{pow2};
-  }
-  FJXL_INLINE SIMDVec16 Or(const SIMDVec16& oth) const {
-    return SIMDVec16{_mm256_or_si256(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec16 Xor(const SIMDVec16& oth) const {
-    return SIMDVec16{_mm256_xor_si256(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec16 And(const SIMDVec16& oth) const {
-    return SIMDVec16{_mm256_and_si256(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec16 HAdd(const SIMDVec16& oth) const {
-    return SIMDVec16{_mm256_srai_epi16(_mm256_add_epi16(vec, oth.vec), 1)};
-  }
-  FJXL_INLINE SIMDVec16 PrepareForU8Lookup() const {
-    return SIMDVec16{_mm256_or_si256(vec, _mm256_set1_epi16(0xFF00))};
-  }
-  FJXL_INLINE SIMDVec16 U8Lookup(const uint8_t* table) const {
-    return SIMDVec16{_mm256_shuffle_epi8(
-        _mm256_broadcastsi128_si256(_mm_loadu_si128((__m128i*)table)), vec)};
-  }
-  FJXL_INLINE VecPair<SIMDVec16> Interleave(const SIMDVec16& low) const {
-    auto v02 = _mm256_unpacklo_epi16(low.vec, vec);
-    auto v13 = _mm256_unpackhi_epi16(low.vec, vec);
-    return {SIMDVec16{_mm256_permute2x128_si256(v02, v13, 0x20)},
-            SIMDVec16{_mm256_permute2x128_si256(v02, v13, 0x31)}};
-  }
-  FJXL_INLINE VecPair<SIMDVec32> Upcast() const {
-    auto v02 = _mm256_unpacklo_epi16(vec, _mm256_setzero_si256());
-    auto v13 = _mm256_unpackhi_epi16(vec, _mm256_setzero_si256());
-    return {SIMDVec32{_mm256_permute2x128_si256(v02, v13, 0x20)},
-            SIMDVec32{_mm256_permute2x128_si256(v02, v13, 0x31)}};
-  }
-  template <size_t i>
-  FJXL_INLINE SIMDVec16 SignedShiftRight() const {
-    return SIMDVec16{_mm256_srai_epi16(vec, i)};
-  }
-
-  static std::array<SIMDVec16, 1> LoadG8(const unsigned char* data) {
-    __m128i bytes = _mm_loadu_si128((__m128i*)data);
-    return {SIMDVec16{_mm256_cvtepu8_epi16(bytes)}};
-  }
-  static std::array<SIMDVec16, 1> LoadG16(const unsigned char* data) {
-    return {Load((const uint16_t*)data)};
-  }
-
-  static std::array<SIMDVec16, 2> LoadGA8(const unsigned char* data) {
-    __m256i bytes = _mm256_loadu_si256((__m256i*)data);
-    __m256i gray = _mm256_and_si256(bytes, _mm256_set1_epi16(0xFF));
-    __m256i alpha = _mm256_srli_epi16(bytes, 8);
-    return {SIMDVec16{gray}, SIMDVec16{alpha}};
-  }
-  static std::array<SIMDVec16, 2> LoadGA16(const unsigned char* data) {
-    __m256i bytes1 = _mm256_loadu_si256((__m256i*)data);
-    __m256i bytes2 = _mm256_loadu_si256((__m256i*)(data + 32));
-    __m256i g_mask = _mm256_set1_epi32(0xFFFF);
-    __m256i g = _mm256_permute4x64_epi64(
-        _mm256_packus_epi32(_mm256_and_si256(bytes1, g_mask),
-                            _mm256_and_si256(bytes2, g_mask)),
-        0b11011000);
-    __m256i a = _mm256_permute4x64_epi64(
-        _mm256_packus_epi32(_mm256_srli_epi32(bytes1, 16),
-                            _mm256_srli_epi32(bytes2, 16)),
-        0b11011000);
-    return {SIMDVec16{g}, SIMDVec16{a}};
-  }
-
-  static std::array<SIMDVec16, 3> LoadRGB8(const unsigned char* data) {
-    __m128i bytes0 = _mm_loadu_si128((__m128i*)data);
-    __m128i bytes1 = _mm_loadu_si128((__m128i*)(data + 16));
-    __m128i bytes2 = _mm_loadu_si128((__m128i*)(data + 32));
-
-    __m128i idx =
-        _mm_setr_epi8(0, 3, 6, 9, 12, 15, 2, 5, 8, 11, 14, 1, 4, 7, 10, 13);
-
-    __m128i r6b5g5_0 = _mm_shuffle_epi8(bytes0, idx);
-    __m128i g6r5b5_1 = _mm_shuffle_epi8(bytes1, idx);
-    __m128i b6g5r5_2 = _mm_shuffle_epi8(bytes2, idx);
-
-    __m128i mask010 = _mm_setr_epi8(0, 0, 0, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF,
-                                    0xFF, 0, 0, 0, 0, 0);
-    __m128i mask001 = _mm_setr_epi8(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF,
-                                    0xFF, 0xFF, 0xFF);
-
-    __m128i b2g2b1 = _mm_blendv_epi8(b6g5r5_2, g6r5b5_1, mask001);
-    __m128i b2b0b1 = _mm_blendv_epi8(b2g2b1, r6b5g5_0, mask010);
-
-    __m128i r0r1b1 = _mm_blendv_epi8(r6b5g5_0, g6r5b5_1, mask010);
-    __m128i r0r1r2 = _mm_blendv_epi8(r0r1b1, b6g5r5_2, mask001);
-
-    __m128i g1r1g0 = _mm_blendv_epi8(g6r5b5_1, r6b5g5_0, mask001);
-    __m128i g1g2g0 = _mm_blendv_epi8(g1r1g0, b6g5r5_2, mask010);
-
-    __m128i g0g1g2 = _mm_alignr_epi8(g1g2g0, g1g2g0, 11);
-    __m128i b0b1b2 = _mm_alignr_epi8(b2b0b1, b2b0b1, 6);
-
-    return {SIMDVec16{_mm256_cvtepu8_epi16(r0r1r2)},
-            SIMDVec16{_mm256_cvtepu8_epi16(g0g1g2)},
-            SIMDVec16{_mm256_cvtepu8_epi16(b0b1b2)}};
-  }
-  static std::array<SIMDVec16, 3> LoadRGB16(const unsigned char* data) {
-    auto load_and_split_lohi = [](const unsigned char* data) {
-      // LHLHLH...
-      __m256i bytes = _mm256_loadu_si256((__m256i*)data);
-      // L0L0L0...
-      __m256i lo = _mm256_and_si256(bytes, _mm256_set1_epi16(0xFF));
-      // H0H0H0...
-      __m256i hi = _mm256_srli_epi16(bytes, 8);
-      // LLLLLLLLHHHHHHHHLLLLLLLLHHHHHHHH
-      __m256i packed = _mm256_packus_epi16(lo, hi);
-      return _mm256_permute4x64_epi64(packed, 0b11011000);
-    };
-    __m256i bytes0 = load_and_split_lohi(data);
-    __m256i bytes1 = load_and_split_lohi(data + 32);
-    __m256i bytes2 = load_and_split_lohi(data + 64);
-
-    __m256i idx = _mm256_broadcastsi128_si256(
-        _mm_setr_epi8(0, 3, 6, 9, 12, 15, 2, 5, 8, 11, 14, 1, 4, 7, 10, 13));
-
-    __m256i r6b5g5_0 = _mm256_shuffle_epi8(bytes0, idx);
-    __m256i g6r5b5_1 = _mm256_shuffle_epi8(bytes1, idx);
-    __m256i b6g5r5_2 = _mm256_shuffle_epi8(bytes2, idx);
-
-    __m256i mask010 = _mm256_broadcastsi128_si256(_mm_setr_epi8(
-        0, 0, 0, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0, 0, 0, 0));
-    __m256i mask001 = _mm256_broadcastsi128_si256(_mm_setr_epi8(
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF));
-
-    __m256i b2g2b1 = _mm256_blendv_epi8(b6g5r5_2, g6r5b5_1, mask001);
-    __m256i b2b0b1 = _mm256_blendv_epi8(b2g2b1, r6b5g5_0, mask010);
-
-    __m256i r0r1b1 = _mm256_blendv_epi8(r6b5g5_0, g6r5b5_1, mask010);
-    __m256i r0r1r2 = _mm256_blendv_epi8(r0r1b1, b6g5r5_2, mask001);
-
-    __m256i g1r1g0 = _mm256_blendv_epi8(g6r5b5_1, r6b5g5_0, mask001);
-    __m256i g1g2g0 = _mm256_blendv_epi8(g1r1g0, b6g5r5_2, mask010);
-
-    __m256i g0g1g2 = _mm256_alignr_epi8(g1g2g0, g1g2g0, 11);
-    __m256i b0b1b2 = _mm256_alignr_epi8(b2b0b1, b2b0b1, 6);
-
-    // Now r0r1r2, g0g1g2, b0b1b2 have the low bytes of the RGB pixels in their
-    // lower half, and the high bytes in their upper half.
-
-    auto combine_low_hi = [](__m256i v) {
-      __m128i low = _mm256_extracti128_si256(v, 0);
-      __m128i hi = _mm256_extracti128_si256(v, 1);
-      __m256i low16 = _mm256_cvtepu8_epi16(low);
-      __m256i hi16 = _mm256_cvtepu8_epi16(hi);
-      return _mm256_or_si256(_mm256_slli_epi16(hi16, 8), low16);
-    };
-
-    return {SIMDVec16{combine_low_hi(r0r1r2)},
-            SIMDVec16{combine_low_hi(g0g1g2)},
-            SIMDVec16{combine_low_hi(b0b1b2)}};
-  }
-
-  static std::array<SIMDVec16, 4> LoadRGBA8(const unsigned char* data) {
-    __m256i bytes1 = _mm256_loadu_si256((__m256i*)data);
-    __m256i bytes2 = _mm256_loadu_si256((__m256i*)(data + 32));
-    __m256i rg_mask = _mm256_set1_epi32(0xFFFF);
-    __m256i rg = _mm256_permute4x64_epi64(
-        _mm256_packus_epi32(_mm256_and_si256(bytes1, rg_mask),
-                            _mm256_and_si256(bytes2, rg_mask)),
-        0b11011000);
-    __m256i b_a = _mm256_permute4x64_epi64(
-        _mm256_packus_epi32(_mm256_srli_epi32(bytes1, 16),
-                            _mm256_srli_epi32(bytes2, 16)),
-        0b11011000);
-    __m256i r = _mm256_and_si256(rg, _mm256_set1_epi16(0xFF));
-    __m256i g = _mm256_srli_epi16(rg, 8);
-    __m256i b = _mm256_and_si256(b_a, _mm256_set1_epi16(0xFF));
-    __m256i a = _mm256_srli_epi16(b_a, 8);
-    return {SIMDVec16{r}, SIMDVec16{g}, SIMDVec16{b}, SIMDVec16{a}};
-  }
-  static std::array<SIMDVec16, 4> LoadRGBA16(const unsigned char* data) {
-    __m256i bytes0 = _mm256_loadu_si256((__m256i*)data);
-    __m256i bytes1 = _mm256_loadu_si256((__m256i*)(data + 32));
-    __m256i bytes2 = _mm256_loadu_si256((__m256i*)(data + 64));
-    __m256i bytes3 = _mm256_loadu_si256((__m256i*)(data + 96));
-
-    auto pack32 = [](__m256i a, __m256i b) {
-      return _mm256_permute4x64_epi64(_mm256_packus_epi32(a, b), 0b11011000);
-    };
-    auto packlow32 = [&pack32](__m256i a, __m256i b) {
-      __m256i mask = _mm256_set1_epi32(0xFFFF);
-      return pack32(_mm256_and_si256(a, mask), _mm256_and_si256(b, mask));
-    };
-    auto packhi32 = [&pack32](__m256i a, __m256i b) {
-      return pack32(_mm256_srli_epi32(a, 16), _mm256_srli_epi32(b, 16));
-    };
-
-    __m256i rb0 = packlow32(bytes0, bytes1);
-    __m256i rb1 = packlow32(bytes2, bytes3);
-    __m256i ga0 = packhi32(bytes0, bytes1);
-    __m256i ga1 = packhi32(bytes2, bytes3);
-
-    __m256i r = packlow32(rb0, rb1);
-    __m256i g = packlow32(ga0, ga1);
-    __m256i b = packhi32(rb0, rb1);
-    __m256i a = packhi32(ga0, ga1);
-    return {SIMDVec16{r}, SIMDVec16{g}, SIMDVec16{b}, SIMDVec16{a}};
-  }
-
-  void SwapEndian() {
-    auto indices = _mm256_broadcastsi128_si256(
-        _mm_setr_epi8(1, 0, 3, 2, 5, 4, 7, 6, 9, 8, 11, 10, 13, 12, 15, 14));
-    vec = _mm256_shuffle_epi8(vec, indices);
-  }
-};
-
-SIMDVec16 Mask16::IfThenElse(const SIMDVec16& if_true,
-                             const SIMDVec16& if_false) {
-  return SIMDVec16{_mm256_blendv_epi8(if_false.vec, if_true.vec, mask)};
-}
-
-SIMDVec32 Mask32::IfThenElse(const SIMDVec32& if_true,
-                             const SIMDVec32& if_false) {
-  return SIMDVec32{_mm256_blendv_epi8(if_false.vec, if_true.vec, mask)};
-}
-
-struct Bits64 {
-  static constexpr size_t kLanes = 4;
-
-  __m256i nbits;
-  __m256i bits;
-
-  FJXL_INLINE void Store(uint64_t* nbits_out, uint64_t* bits_out) {
-    _mm256_storeu_si256((__m256i*)nbits_out, nbits);
-    _mm256_storeu_si256((__m256i*)bits_out, bits);
-  }
-};
-
-struct Bits32 {
-  __m256i nbits;
-  __m256i bits;
-
-  static Bits32 FromRaw(SIMDVec32 nbits, SIMDVec32 bits) {
-    return Bits32{nbits.vec, bits.vec};
-  }
-
-  Bits64 Merge() const {
-    auto nbits_hi32 = _mm256_srli_epi64(nbits, 32);
-    auto nbits_lo32 = _mm256_and_si256(nbits, _mm256_set1_epi64x(0xFFFFFFFF));
-    auto bits_hi32 = _mm256_srli_epi64(bits, 32);
-    auto bits_lo32 = _mm256_and_si256(bits, _mm256_set1_epi64x(0xFFFFFFFF));
-
-    auto nbits64 = _mm256_add_epi64(nbits_hi32, nbits_lo32);
-    auto bits64 =
-        _mm256_or_si256(_mm256_sllv_epi64(bits_hi32, nbits_lo32), bits_lo32);
-    return Bits64{nbits64, bits64};
-  }
-
-  void Interleave(const Bits32& low) {
-    bits = _mm256_or_si256(_mm256_sllv_epi32(bits, low.nbits), low.bits);
-    nbits = _mm256_add_epi32(nbits, low.nbits);
-  }
-
-  void ClipTo(size_t n) {
-    n = std::min<size_t>(n, 8);
-    constexpr uint32_t kMask[16] = {
-        ~0u, ~0u, ~0u, ~0u, ~0u, ~0u, ~0u, ~0u, 0, 0, 0, 0, 0, 0, 0, 0,
-    };
-    __m256i mask = _mm256_loadu_si256((__m256i*)(kMask + 8 - n));
-    nbits = _mm256_and_si256(mask, nbits);
-    bits = _mm256_and_si256(mask, bits);
-  }
-  void Skip(size_t n) {
-    n = std::min<size_t>(n, 8);
-    constexpr uint32_t kMask[16] = {
-        0, 0, 0, 0, 0, 0, 0, 0, ~0u, ~0u, ~0u, ~0u, ~0u, ~0u, ~0u, ~0u,
-    };
-    __m256i mask = _mm256_loadu_si256((__m256i*)(kMask + 8 - n));
-    nbits = _mm256_and_si256(mask, nbits);
-    bits = _mm256_and_si256(mask, bits);
-  }
-};
-
-struct Bits16 {
-  __m256i nbits;
-  __m256i bits;
-
-  static Bits16 FromRaw(SIMDVec16 nbits, SIMDVec16 bits) {
-    return Bits16{nbits.vec, bits.vec};
-  }
-
-  Bits32 Merge() const {
-    auto nbits_hi16 = _mm256_srli_epi32(nbits, 16);
-    auto nbits_lo16 = _mm256_and_si256(nbits, _mm256_set1_epi32(0xFFFF));
-    auto bits_hi16 = _mm256_srli_epi32(bits, 16);
-    auto bits_lo16 = _mm256_and_si256(bits, _mm256_set1_epi32(0xFFFF));
-
-    auto nbits32 = _mm256_add_epi32(nbits_hi16, nbits_lo16);
-    auto bits32 =
-        _mm256_or_si256(_mm256_sllv_epi32(bits_hi16, nbits_lo16), bits_lo16);
-    return Bits32{nbits32, bits32};
-  }
-
-  void Interleave(const Bits16& low) {
-    auto pow2_lo_lut = _mm256_broadcastsi128_si256(
-        _mm_setr_epi8(1 << 0, 1 << 1, 1 << 2, 1 << 3, 1 << 4, 1 << 5, 1 << 6,
-                      1u << 7, 0, 0, 0, 0, 0, 0, 0, 0));
-    auto low_nbits_masked =
-        _mm256_or_si256(low.nbits, _mm256_set1_epi16(0xFF00));
-
-    auto bits_shifted = _mm256_mullo_epi16(
-        bits, _mm256_shuffle_epi8(pow2_lo_lut, low_nbits_masked));
-
-    nbits = _mm256_add_epi16(nbits, low.nbits);
-    bits = _mm256_or_si256(bits_shifted, low.bits);
-  }
-
-  void ClipTo(size_t n) {
-    n = std::min<size_t>(n, 16);
-    constexpr uint16_t kMask[32] = {
-        0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
-        0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
-        0,      0,      0,      0,      0,      0,      0,      0,
-        0,      0,      0,      0,      0,      0,      0,      0,
-    };
-    __m256i mask = _mm256_loadu_si256((__m256i*)(kMask + 16 - n));
-    nbits = _mm256_and_si256(mask, nbits);
-    bits = _mm256_and_si256(mask, bits);
-  }
-
-  void Skip(size_t n) {
-    n = std::min<size_t>(n, 16);
-    constexpr uint16_t kMask[32] = {
-        0,      0,      0,      0,      0,      0,      0,      0,
-        0,      0,      0,      0,      0,      0,      0,      0,
-        0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
-        0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
-    };
-    __m256i mask = _mm256_loadu_si256((__m256i*)(kMask + 16 - n));
-    nbits = _mm256_and_si256(mask, nbits);
-    bits = _mm256_and_si256(mask, bits);
-  }
-};
-
-#endif
-
-#ifdef FJXL_NEON
-#define FJXL_GENERIC_SIMD
-
-struct SIMDVec32;
-
-struct Mask32 {
-  uint32x4_t mask;
-  SIMDVec32 IfThenElse(const SIMDVec32& if_true, const SIMDVec32& if_false);
-  Mask32 And(const Mask32& oth) const {
-    return Mask32{vandq_u32(mask, oth.mask)};
-  }
-  size_t CountPrefix() const {
-    uint32_t val_unset[4] = {0, 1, 2, 3};
-    uint32_t val_set[4] = {4, 4, 4, 4};
-    uint32x4_t val = vbslq_u32(mask, vld1q_u32(val_set), vld1q_u32(val_unset));
-    return vminvq_u32(val);
-  }
-};
-
-struct SIMDVec32 {
-  uint32x4_t vec;
-
-  static constexpr size_t kLanes = 4;
-
-  FJXL_INLINE static SIMDVec32 Load(const uint32_t* data) {
-    return SIMDVec32{vld1q_u32(data)};
-  }
-  FJXL_INLINE void Store(uint32_t* data) { vst1q_u32(data, vec); }
-  FJXL_INLINE static SIMDVec32 Val(uint32_t v) {
-    return SIMDVec32{vdupq_n_u32(v)};
-  }
-  FJXL_INLINE SIMDVec32 ValToToken() const {
-    return SIMDVec32{vsubq_u32(vdupq_n_u32(32), vclzq_u32(vec))};
-  }
-  FJXL_INLINE SIMDVec32 SatSubU(const SIMDVec32& to_subtract) const {
-    return SIMDVec32{vqsubq_u32(vec, to_subtract.vec)};
-  }
-  FJXL_INLINE SIMDVec32 Sub(const SIMDVec32& to_subtract) const {
-    return SIMDVec32{vsubq_u32(vec, to_subtract.vec)};
-  }
-  FJXL_INLINE SIMDVec32 Add(const SIMDVec32& oth) const {
-    return SIMDVec32{vaddq_u32(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec32 Xor(const SIMDVec32& oth) const {
-    return SIMDVec32{veorq_u32(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec32 Pow2() const {
-    return SIMDVec32{vshlq_u32(vdupq_n_u32(1), vreinterpretq_s32_u32(vec))};
-  }
-  FJXL_INLINE Mask32 Eq(const SIMDVec32& oth) const {
-    return Mask32{vceqq_u32(vec, oth.vec)};
-  }
-  FJXL_INLINE Mask32 Gt(const SIMDVec32& oth) const {
-    return Mask32{
-        vcgtq_s32(vreinterpretq_s32_u32(vec), vreinterpretq_s32_u32(oth.vec))};
-  }
-  template <size_t i>
-  FJXL_INLINE SIMDVec32 SignedShiftRight() const {
-    return SIMDVec32{
-        vreinterpretq_u32_s32(vshrq_n_s32(vreinterpretq_s32_u32(vec), i))};
-  }
-};
-
-struct SIMDVec16;
-
-struct Mask16 {
-  uint16x8_t mask;
-  SIMDVec16 IfThenElse(const SIMDVec16& if_true, const SIMDVec16& if_false);
-  Mask16 And(const Mask16& oth) const {
-    return Mask16{vandq_u16(mask, oth.mask)};
-  }
-  size_t CountPrefix() const {
-    uint16_t val_unset[8] = {0, 1, 2, 3, 4, 5, 6, 7};
-    uint16_t val_set[8] = {8, 8, 8, 8, 8, 8, 8, 8};
-    uint16x8_t val = vbslq_u16(mask, vld1q_u16(val_set), vld1q_u16(val_unset));
-    return vminvq_u16(val);
-  }
-};
-
-struct SIMDVec16 {
-  uint16x8_t vec;
-
-  static constexpr size_t kLanes = 8;
-
-  FJXL_INLINE static SIMDVec16 Load(const uint16_t* data) {
-    return SIMDVec16{vld1q_u16(data)};
-  }
-  FJXL_INLINE void Store(uint16_t* data) { vst1q_u16(data, vec); }
-  FJXL_INLINE static SIMDVec16 Val(uint16_t v) {
-    return SIMDVec16{vdupq_n_u16(v)};
-  }
-  FJXL_INLINE static SIMDVec16 FromTwo32(const SIMDVec32& lo,
-                                         const SIMDVec32& hi) {
-    return SIMDVec16{vmovn_high_u32(vmovn_u32(lo.vec), hi.vec)};
-  }
-
-  FJXL_INLINE SIMDVec16 ValToToken() const {
-    return SIMDVec16{vsubq_u16(vdupq_n_u16(16), vclzq_u16(vec))};
-  }
-  FJXL_INLINE SIMDVec16 SatSubU(const SIMDVec16& to_subtract) const {
-    return SIMDVec16{vqsubq_u16(vec, to_subtract.vec)};
-  }
-  FJXL_INLINE SIMDVec16 Sub(const SIMDVec16& to_subtract) const {
-    return SIMDVec16{vsubq_u16(vec, to_subtract.vec)};
-  }
-  FJXL_INLINE SIMDVec16 Add(const SIMDVec16& oth) const {
-    return SIMDVec16{vaddq_u16(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec16 Min(const SIMDVec16& oth) const {
-    return SIMDVec16{vminq_u16(vec, oth.vec)};
-  }
-  FJXL_INLINE Mask16 Eq(const SIMDVec16& oth) const {
-    return Mask16{vceqq_u16(vec, oth.vec)};
-  }
-  FJXL_INLINE Mask16 Gt(const SIMDVec16& oth) const {
-    return Mask16{
-        vcgtq_s16(vreinterpretq_s16_u16(vec), vreinterpretq_s16_u16(oth.vec))};
-  }
-  FJXL_INLINE SIMDVec16 Pow2() const {
-    return SIMDVec16{vshlq_u16(vdupq_n_u16(1), vreinterpretq_s16_u16(vec))};
-  }
-  FJXL_INLINE SIMDVec16 Or(const SIMDVec16& oth) const {
-    return SIMDVec16{vorrq_u16(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec16 Xor(const SIMDVec16& oth) const {
-    return SIMDVec16{veorq_u16(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec16 And(const SIMDVec16& oth) const {
-    return SIMDVec16{vandq_u16(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec16 HAdd(const SIMDVec16& oth) const {
-    return SIMDVec16{vhaddq_u16(vec, oth.vec)};
-  }
-  FJXL_INLINE SIMDVec16 PrepareForU8Lookup() const {
-    return SIMDVec16{vorrq_u16(vec, vdupq_n_u16(0xFF00))};
-  }
-  FJXL_INLINE SIMDVec16 U8Lookup(const uint8_t* table) const {
-    uint8x16_t tbl = vld1q_u8(table);
-    uint8x16_t indices = vreinterpretq_u8_u16(vec);
-    return SIMDVec16{vreinterpretq_u16_u8(vqtbl1q_u8(tbl, indices))};
-  }
-  FJXL_INLINE VecPair<SIMDVec16> Interleave(const SIMDVec16& low) const {
-    return {SIMDVec16{vzip1q_u16(low.vec, vec)},
-            SIMDVec16{vzip2q_u16(low.vec, vec)}};
-  }
-  FJXL_INLINE VecPair<SIMDVec32> Upcast() const {
-    uint32x4_t lo = vmovl_u16(vget_low_u16(vec));
-    uint32x4_t hi = vmovl_high_u16(vec);
-    return {SIMDVec32{lo}, SIMDVec32{hi}};
-  }
-  template <size_t i>
-  FJXL_INLINE SIMDVec16 SignedShiftRight() const {
-    return SIMDVec16{
-        vreinterpretq_u16_s16(vshrq_n_s16(vreinterpretq_s16_u16(vec), i))};
-  }
-
-  static std::array<SIMDVec16, 1> LoadG8(const unsigned char* data) {
-    uint8x8_t v = vld1_u8(data);
-    return {SIMDVec16{vmovl_u8(v)}};
-  }
-  static std::array<SIMDVec16, 1> LoadG16(const unsigned char* data) {
-    return {Load((const uint16_t*)data)};
-  }
-
-  static std::array<SIMDVec16, 2> LoadGA8(const unsigned char* data) {
-    uint8x8x2_t v = vld2_u8(data);
-    return {SIMDVec16{vmovl_u8(v.val[0])}, SIMDVec16{vmovl_u8(v.val[1])}};
-  }
-  static std::array<SIMDVec16, 2> LoadGA16(const unsigned char* data) {
-    uint16x8x2_t v = vld2q_u16((const uint16_t*)data);
-    return {SIMDVec16{v.val[0]}, SIMDVec16{v.val[1]}};
-  }
-
-  static std::array<SIMDVec16, 3> LoadRGB8(const unsigned char* data) {
-    uint8x8x3_t v = vld3_u8(data);
-    return {SIMDVec16{vmovl_u8(v.val[0])}, SIMDVec16{vmovl_u8(v.val[1])},
-            SIMDVec16{vmovl_u8(v.val[2])}};
-  }
-  static std::array<SIMDVec16, 3> LoadRGB16(const unsigned char* data) {
-    uint16x8x3_t v = vld3q_u16((const uint16_t*)data);
-    return {SIMDVec16{v.val[0]}, SIMDVec16{v.val[1]}, SIMDVec16{v.val[2]}};
-  }
-
-  static std::array<SIMDVec16, 4> LoadRGBA8(const unsigned char* data) {
-    uint8x8x4_t v = vld4_u8(data);
-    return {SIMDVec16{vmovl_u8(v.val[0])}, SIMDVec16{vmovl_u8(v.val[1])},
-            SIMDVec16{vmovl_u8(v.val[2])}, SIMDVec16{vmovl_u8(v.val[3])}};
-  }
-  static std::array<SIMDVec16, 4> LoadRGBA16(const unsigned char* data) {
-    uint16x8x4_t v = vld4q_u16((const uint16_t*)data);
-    return {SIMDVec16{v.val[0]}, SIMDVec16{v.val[1]}, SIMDVec16{v.val[2]},
-            SIMDVec16{v.val[3]}};
-  }
-
-  void SwapEndian() {
-    vec = vreinterpretq_u16_u8(vrev16q_u8(vreinterpretq_u8_u16(vec)));
-  }
-};
-
-SIMDVec16 Mask16::IfThenElse(const SIMDVec16& if_true,
-                             const SIMDVec16& if_false) {
-  return SIMDVec16{vbslq_u16(mask, if_true.vec, if_false.vec)};
-}
-
-SIMDVec32 Mask32::IfThenElse(const SIMDVec32& if_true,
-                             const SIMDVec32& if_false) {
-  return SIMDVec32{vbslq_u32(mask, if_true.vec, if_false.vec)};
-}
-
-struct Bits64 {
-  static constexpr size_t kLanes = 2;
-
-  uint64x2_t nbits;
-  uint64x2_t bits;
-
-  FJXL_INLINE void Store(uint64_t* nbits_out, uint64_t* bits_out) {
-    vst1q_u64(nbits_out, nbits);
-    vst1q_u64(bits_out, bits);
-  }
-};
-
-struct Bits32 {
-  uint32x4_t nbits;
-  uint32x4_t bits;
-
-  static Bits32 FromRaw(SIMDVec32 nbits, SIMDVec32 bits) {
-    return Bits32{nbits.vec, bits.vec};
-  }
-
-  Bits64 Merge() const {
-    // TODO(veluca): can probably be optimized.
-    uint64x2_t nbits_lo32 =
-        vandq_u64(vreinterpretq_u64_u32(nbits), vdupq_n_u64(0xFFFFFFFF));
-    uint64x2_t bits_hi32 =
-        vshlq_u64(vshrq_n_u64(vreinterpretq_u64_u32(bits), 32),
-                  vreinterpretq_s64_u64(nbits_lo32));
-    uint64x2_t bits_lo32 =
-        vandq_u64(vreinterpretq_u64_u32(bits), vdupq_n_u64(0xFFFFFFFF));
-    uint64x2_t nbits64 =
-        vsraq_n_u64(nbits_lo32, vreinterpretq_u64_u32(nbits), 32);
-    uint64x2_t bits64 = vorrq_u64(bits_hi32, bits_lo32);
-    return Bits64{nbits64, bits64};
-  }
-
-  void Interleave(const Bits32& low) {
-    bits =
-        vorrq_u32(vshlq_u32(bits, vreinterpretq_s32_u32(low.nbits)), low.bits);
-    nbits = vaddq_u32(nbits, low.nbits);
-  }
-
-  void ClipTo(size_t n) {
-    n = std::min<size_t>(n, 4);
-    constexpr uint32_t kMask[8] = {
-        ~0u, ~0u, ~0u, ~0u, 0, 0, 0, 0,
-    };
-    uint32x4_t mask = vld1q_u32(kMask + 4 - n);
-    nbits = vandq_u32(mask, nbits);
-    bits = vandq_u32(mask, bits);
-  }
-  void Skip(size_t n) {
-    n = std::min<size_t>(n, 4);
-    constexpr uint32_t kMask[8] = {
-        0, 0, 0, 0, ~0u, ~0u, ~0u, ~0u,
-    };
-    uint32x4_t mask = vld1q_u32(kMask + 4 - n);
-    nbits = vandq_u32(mask, nbits);
-    bits = vandq_u32(mask, bits);
-  }
-};
-
-struct Bits16 {
-  uint16x8_t nbits;
-  uint16x8_t bits;
-
-  static Bits16 FromRaw(SIMDVec16 nbits, SIMDVec16 bits) {
-    return Bits16{nbits.vec, bits.vec};
-  }
-
-  Bits32 Merge() const {
-    // TODO(veluca): can probably be optimized.
-    uint32x4_t nbits_lo16 =
-        vandq_u32(vreinterpretq_u32_u16(nbits), vdupq_n_u32(0xFFFF));
-    uint32x4_t bits_hi16 =
-        vshlq_u32(vshrq_n_u32(vreinterpretq_u32_u16(bits), 16),
-                  vreinterpretq_s32_u32(nbits_lo16));
-    uint32x4_t bits_lo16 =
-        vandq_u32(vreinterpretq_u32_u16(bits), vdupq_n_u32(0xFFFF));
-    uint32x4_t nbits32 =
-        vsraq_n_u32(nbits_lo16, vreinterpretq_u32_u16(nbits), 16);
-    uint32x4_t bits32 = vorrq_u32(bits_hi16, bits_lo16);
-    return Bits32{nbits32, bits32};
-  }
-
-  void Interleave(const Bits16& low) {
-    bits =
-        vorrq_u16(vshlq_u16(bits, vreinterpretq_s16_u16(low.nbits)), low.bits);
-    nbits = vaddq_u16(nbits, low.nbits);
-  }
-
-  void ClipTo(size_t n) {
-    n = std::min<size_t>(n, 8);
-    constexpr uint16_t kMask[16] = {
-        0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
-        0,      0,      0,      0,      0,      0,      0,      0,
-    };
-    uint16x8_t mask = vld1q_u16(kMask + 8 - n);
-    nbits = vandq_u16(mask, nbits);
-    bits = vandq_u16(mask, bits);
-  }
-  void Skip(size_t n) {
-    n = std::min<size_t>(n, 8);
-    constexpr uint16_t kMask[16] = {
-        0,      0,      0,      0,      0,      0,      0,      0,
-        0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
-    };
-    uint16x8_t mask = vld1q_u16(kMask + 8 - n);
-    nbits = vandq_u16(mask, nbits);
-    bits = vandq_u16(mask, bits);
-  }
-};
-
-#endif
-
-#ifdef FJXL_GENERIC_SIMD
-constexpr size_t SIMDVec32::kLanes;
-constexpr size_t SIMDVec16::kLanes;
-
-//  Each of these functions will process SIMDVec16::kLanes worth of values.
-
-FJXL_INLINE void TokenizeSIMD(const uint16_t* residuals, uint16_t* token_out,
-                              uint16_t* nbits_out, uint16_t* bits_out) {
-  SIMDVec16 res = SIMDVec16::Load(residuals);
-  SIMDVec16 token = res.ValToToken();
-  SIMDVec16 nbits = token.SatSubU(SIMDVec16::Val(1));
-  SIMDVec16 bits = res.SatSubU(nbits.Pow2());
-  token.Store(token_out);
-  nbits.Store(nbits_out);
-  bits.Store(bits_out);
-}
-
-FJXL_INLINE void TokenizeSIMD(const uint32_t* residuals, uint16_t* token_out,
-                              uint32_t* nbits_out, uint32_t* bits_out) {
-  static_assert(SIMDVec16::kLanes == 2 * SIMDVec32::kLanes, "");
-  SIMDVec32 res_lo = SIMDVec32::Load(residuals);
-  SIMDVec32 res_hi = SIMDVec32::Load(residuals + SIMDVec32::kLanes);
-  SIMDVec32 token_lo = res_lo.ValToToken();
-  SIMDVec32 token_hi = res_hi.ValToToken();
-  SIMDVec32 nbits_lo = token_lo.SatSubU(SIMDVec32::Val(1));
-  SIMDVec32 nbits_hi = token_hi.SatSubU(SIMDVec32::Val(1));
-  SIMDVec32 bits_lo = res_lo.SatSubU(nbits_lo.Pow2());
-  SIMDVec32 bits_hi = res_hi.SatSubU(nbits_hi.Pow2());
-  SIMDVec16 token = SIMDVec16::FromTwo32(token_lo, token_hi);
-  token.Store(token_out);
-  nbits_lo.Store(nbits_out);
-  nbits_hi.Store(nbits_out + SIMDVec32::kLanes);
-  bits_lo.Store(bits_out);
-  bits_hi.Store(bits_out + SIMDVec32::kLanes);
-}
-
-FJXL_INLINE void HuffmanSIMDUpTo13(const uint16_t* tokens,
-                                   const uint8_t* raw_nbits_simd,
-                                   const uint8_t* raw_bits_simd,
-                                   uint16_t* nbits_out, uint16_t* bits_out) {
-  SIMDVec16 tok = SIMDVec16::Load(tokens).PrepareForU8Lookup();
-  tok.U8Lookup(raw_nbits_simd).Store(nbits_out);
-  tok.U8Lookup(raw_bits_simd).Store(bits_out);
-}
-
-FJXL_INLINE void HuffmanSIMD14(const uint16_t* tokens,
-                               const uint8_t* raw_nbits_simd,
-                               const uint8_t* raw_bits_simd,
-                               uint16_t* nbits_out, uint16_t* bits_out) {
-  SIMDVec16 token_cap = SIMDVec16::Val(15);
-  SIMDVec16 tok = SIMDVec16::Load(tokens);
-  SIMDVec16 tok_index = tok.Min(token_cap).PrepareForU8Lookup();
-  SIMDVec16 huff_bits_pre = tok_index.U8Lookup(raw_bits_simd);
-  // Set the highest bit when token == 16; the Huffman code is constructed in
-  // such a way that the code for token 15 is the same as the code for 16,
-  // except for the highest bit.
-  Mask16 needs_high_bit = tok.Eq(SIMDVec16::Val(16));
-  SIMDVec16 huff_bits = needs_high_bit.IfThenElse(
-      huff_bits_pre.Or(SIMDVec16::Val(128)), huff_bits_pre);
-  huff_bits.Store(bits_out);
-  tok_index.U8Lookup(raw_nbits_simd).Store(nbits_out);
-}
-
-FJXL_INLINE void HuffmanSIMDAbove14(const uint16_t* tokens,
-                                    const uint8_t* raw_nbits_simd,
-                                    const uint8_t* raw_bits_simd,
-                                    uint16_t* nbits_out, uint16_t* bits_out) {
-  SIMDVec16 tok = SIMDVec16::Load(tokens);
-  // We assume `tok` fits in a *signed* 16-bit integer.
-  Mask16 above = tok.Gt(SIMDVec16::Val(12));
-  // 13, 14 -> 13
-  // 15, 16 -> 14
-  // 17, 18 -> 15
-  SIMDVec16 remap_tok = above.IfThenElse(tok.HAdd(SIMDVec16::Val(13)), tok);
-  SIMDVec16 tok_index = remap_tok.PrepareForU8Lookup();
-  SIMDVec16 huff_bits_pre = tok_index.U8Lookup(raw_bits_simd);
-  // Set the highest bit when token == 14, 16, 18.
-  Mask16 needs_high_bit = above.And(tok.Eq(tok.And(SIMDVec16::Val(0xFFFE))));
-  SIMDVec16 huff_bits = needs_high_bit.IfThenElse(
-      huff_bits_pre.Or(SIMDVec16::Val(128)), huff_bits_pre);
-  huff_bits.Store(bits_out);
-  tok_index.U8Lookup(raw_nbits_simd).Store(nbits_out);
-}
-
-FJXL_INLINE void StoreSIMDUpTo8(const uint16_t* nbits_tok,
-                                const uint16_t* bits_tok,
-                                const uint16_t* nbits_huff,
-                                const uint16_t* bits_huff, size_t n,
-                                size_t skip, Bits32* bits_out) {
-  Bits16 bits =
-      Bits16::FromRaw(SIMDVec16::Load(nbits_tok), SIMDVec16::Load(bits_tok));
-  Bits16 huff_bits =
-      Bits16::FromRaw(SIMDVec16::Load(nbits_huff), SIMDVec16::Load(bits_huff));
-  bits.Interleave(huff_bits);
-  bits.ClipTo(n);
-  bits.Skip(skip);
-  bits_out[0] = bits.Merge();
-}
-
-// Huffman and raw bits don't necessarily fit in a single u16 here.
-FJXL_INLINE void StoreSIMDUpTo14(const uint16_t* nbits_tok,
-                                 const uint16_t* bits_tok,
-                                 const uint16_t* nbits_huff,
-                                 const uint16_t* bits_huff, size_t n,
-                                 size_t skip, Bits32* bits_out) {
-  VecPair<SIMDVec16> bits =
-      SIMDVec16::Load(bits_tok).Interleave(SIMDVec16::Load(bits_huff));
-  VecPair<SIMDVec16> nbits =
-      SIMDVec16::Load(nbits_tok).Interleave(SIMDVec16::Load(nbits_huff));
-  Bits16 low = Bits16::FromRaw(nbits.low, bits.low);
-  Bits16 hi = Bits16::FromRaw(nbits.hi, bits.hi);
-  low.ClipTo(2 * n);
-  low.Skip(2 * skip);
-  hi.ClipTo(std::max(2 * n, SIMDVec16::kLanes) - SIMDVec16::kLanes);
-  hi.Skip(std::max(2 * skip, SIMDVec16::kLanes) - SIMDVec16::kLanes);
-
-  bits_out[0] = low.Merge();
-  bits_out[1] = hi.Merge();
-}
-
-FJXL_INLINE void StoreSIMDAbove14(const uint32_t* nbits_tok,
-                                  const uint32_t* bits_tok,
-                                  const uint16_t* nbits_huff,
-                                  const uint16_t* bits_huff, size_t n,
-                                  size_t skip, Bits32* bits_out) {
-  static_assert(SIMDVec16::kLanes == 2 * SIMDVec32::kLanes, "");
-  Bits32 bits_low =
-      Bits32::FromRaw(SIMDVec32::Load(nbits_tok), SIMDVec32::Load(bits_tok));
-  Bits32 bits_hi =
-      Bits32::FromRaw(SIMDVec32::Load(nbits_tok + SIMDVec32::kLanes),
-                      SIMDVec32::Load(bits_tok + SIMDVec32::kLanes));
-
-  VecPair<SIMDVec32> huff_bits = SIMDVec16::Load(bits_huff).Upcast();
-  VecPair<SIMDVec32> huff_nbits = SIMDVec16::Load(nbits_huff).Upcast();
-
-  Bits32 huff_low = Bits32::FromRaw(huff_nbits.low, huff_bits.low);
-  Bits32 huff_hi = Bits32::FromRaw(huff_nbits.hi, huff_bits.hi);
-
-  bits_low.Interleave(huff_low);
-  bits_low.ClipTo(n);
-  bits_low.Skip(skip);
-  bits_out[0] = bits_low;
-  bits_hi.Interleave(huff_hi);
-  bits_hi.ClipTo(std::max(n, SIMDVec32::kLanes) - SIMDVec32::kLanes);
-  bits_hi.Skip(std::max(skip, SIMDVec32::kLanes) - SIMDVec32::kLanes);
-  bits_out[1] = bits_hi;
-}
-
-#ifdef FJXL_AVX512
-FJXL_INLINE void StoreToWriterAVX512(const Bits32& bits32, BitWriter& output) {
-  __m512i bits = bits32.bits;
-  __m512i nbits = bits32.nbits;
-
-  // Insert the leftover bits from the bit buffer at the bottom of the vector
-  // and extract the top of the vector.
-  uint64_t trail_bits =
-      _mm512_cvtsi512_si32(_mm512_alignr_epi32(bits, bits, 15));
-  uint64_t trail_nbits =
-      _mm512_cvtsi512_si32(_mm512_alignr_epi32(nbits, nbits, 15));
-  __m512i lead_bits = _mm512_set1_epi32(output.buffer);
-  __m512i lead_nbits = _mm512_set1_epi32(output.bits_in_buffer);
-  bits = _mm512_alignr_epi32(bits, lead_bits, 15);
-  nbits = _mm512_alignr_epi32(nbits, lead_nbits, 15);
-
-  // Merge 32 -> 64 bits.
-  Bits32 b{nbits, bits};
-  Bits64 b64 = b.Merge();
-  bits = b64.bits;
-  nbits = b64.nbits;
-
-  __m512i zero = _mm512_setzero_si512();
-
-  auto sh1 = [zero](__m512i vec) { return _mm512_alignr_epi64(vec, zero, 7); };
-  auto sh2 = [zero](__m512i vec) { return _mm512_alignr_epi64(vec, zero, 6); };
-  auto sh4 = [zero](__m512i vec) { return _mm512_alignr_epi64(vec, zero, 4); };
-
-  // Compute first-past-end-bit-position.
-  __m512i end_intermediate0 = _mm512_add_epi64(nbits, sh1(nbits));
-  __m512i end_intermediate1 =
-      _mm512_add_epi64(end_intermediate0, sh2(end_intermediate0));
-  __m512i end = _mm512_add_epi64(end_intermediate1, sh4(end_intermediate1));
-
-  uint64_t simd_nbits = _mm512_cvtsi512_si32(_mm512_alignr_epi64(end, end, 7));
-
-  // Compute begin-bit-position.
-  __m512i begin = _mm512_sub_epi64(end, nbits);
-
-  // Index of the last bit in the chunk, or the end bit if nbits==0.
-  __m512i last = _mm512_mask_sub_epi64(
-      end, _mm512_cmpneq_epi64_mask(nbits, zero), end, _mm512_set1_epi64(1));
-
-  __m512i lane_offset_mask = _mm512_set1_epi64(63);
-
-  // Starting position of the chunk that each lane will ultimately belong to.
-  __m512i chunk_start = _mm512_andnot_si512(lane_offset_mask, last);
-
-  // For all lanes that contain bits belonging to two different 64-bit chunks,
-  // compute the number of bits that belong to the first chunk.
-  // total # of bits fit in a u16, so we can satsub_u16 here.
-  __m512i first_chunk_nbits = _mm512_subs_epu16(chunk_start, begin);
-
-  // Move all the previous-chunk-bits to the previous lane.
-  __m512i negnbits = _mm512_sub_epi64(_mm512_set1_epi64(64), first_chunk_nbits);
-  __m512i first_chunk_bits =
-      _mm512_srlv_epi64(_mm512_sllv_epi64(bits, negnbits), negnbits);
-  __m512i first_chunk_bits_down =
-      _mm512_alignr_epi32(zero, first_chunk_bits, 2);
-  bits = _mm512_srlv_epi64(bits, first_chunk_nbits);
-  nbits = _mm512_sub_epi64(nbits, first_chunk_nbits);
-  bits = _mm512_or_si512(bits, _mm512_sllv_epi64(first_chunk_bits_down, nbits));
-  begin = _mm512_add_epi64(begin, first_chunk_nbits);
-
-  // We now know that every lane should give bits to only one chunk. We can
-  // shift the bits and then horizontally-or-reduce them within the same chunk.
-  __m512i offset = _mm512_and_si512(begin, lane_offset_mask);
-  __m512i aligned_bits = _mm512_sllv_epi64(bits, offset);
-  // h-or-reduce within same chunk
-  __m512i red0 = _mm512_mask_or_epi64(
-      aligned_bits, _mm512_cmpeq_epi64_mask(sh1(chunk_start), chunk_start),
-      sh1(aligned_bits), aligned_bits);
-  __m512i red1 = _mm512_mask_or_epi64(
-      red0, _mm512_cmpeq_epi64_mask(sh2(chunk_start), chunk_start), sh2(red0),
-      red0);
-  __m512i reduced = _mm512_mask_or_epi64(
-      red1, _mm512_cmpeq_epi64_mask(sh4(chunk_start), chunk_start), sh4(red1),
-      red1);
-  // Extract the highest lane that belongs to each chunk (the lane that ends up
-  // with the OR-ed value of all the other lanes of that chunk).
-  __m512i next_chunk_start =
-      _mm512_alignr_epi32(_mm512_set1_epi64(~0), chunk_start, 2);
-  __m512i result = _mm512_maskz_compress_epi64(
-      _mm512_cmpneq_epi64_mask(chunk_start, next_chunk_start), reduced);
-
-  _mm512_storeu_si512((__m512i*)(output.data.get() + output.bytes_written),
-                      result);
-
-  // Update the bit writer and add the last 32-bit lane.
-  // Note that since trail_nbits was at most 32 to begin with, operating on
-  // trail_bits does not risk overflowing.
-  output.bytes_written += simd_nbits / 8;
-  // Here we are implicitly relying on the fact that simd_nbits < 512 to know
-  // that the byte of bitreader data we access is initialized. This is
-  // guaranteed because the remaining bits in the bitreader buffer are at most
-  // 7, so simd_nbits <= 505 always.
-  trail_bits = (trail_bits << (simd_nbits % 8)) +
-               output.data.get()[output.bytes_written];
-  trail_nbits += simd_nbits % 8;
-  StoreLE64(output.data.get() + output.bytes_written, trail_bits);
-  size_t trail_bytes = trail_nbits / 8;
-  output.bits_in_buffer = trail_nbits % 8;
-  output.buffer = trail_bits >> (trail_bytes * 8);
-  output.bytes_written += trail_bytes;
-}
-
-#endif
-
-template <size_t n>
-FJXL_INLINE void StoreToWriter(const Bits32* bits, BitWriter& output) {
-#ifdef FJXL_AVX512
-  static_assert(n <= 2, "");
-  StoreToWriterAVX512(bits[0], output);
-  if (n == 2) {
-    StoreToWriterAVX512(bits[1], output);
-  }
-  return;
-#endif
-  static_assert(n <= 4, "");
-  alignas(64) uint64_t nbits64[Bits64::kLanes * n];
-  alignas(64) uint64_t bits64[Bits64::kLanes * n];
-  bits[0].Merge().Store(nbits64, bits64);
-  if (n > 1) {
-    bits[1].Merge().Store(nbits64 + Bits64::kLanes, bits64 + Bits64::kLanes);
-  }
-  if (n > 2) {
-    bits[2].Merge().Store(nbits64 + 2 * Bits64::kLanes,
-                          bits64 + 2 * Bits64::kLanes);
-  }
-  if (n > 3) {
-    bits[3].Merge().Store(nbits64 + 3 * Bits64::kLanes,
-                          bits64 + 3 * Bits64::kLanes);
-  }
-  output.WriteMultiple(nbits64, bits64, Bits64::kLanes * n);
-}
-
-namespace detail {
-template <typename T>
-struct IntegerTypes;
-
-template <>
-struct IntegerTypes<SIMDVec16> {
-  using signed_ = int16_t;
-  using unsigned_ = uint16_t;
-};
-
-template <>
-struct IntegerTypes<SIMDVec32> {
-  using signed_ = int32_t;
-  using unsigned_ = uint32_t;
-};
-
-template <typename T>
-struct SIMDType;
-
-template <>
-struct SIMDType<int16_t> {
-  using type = SIMDVec16;
-};
-
-template <>
-struct SIMDType<int32_t> {
-  using type = SIMDVec32;
-};
-
-}  // namespace detail
-
-template <typename T>
-using signed_t = typename detail::IntegerTypes<T>::signed_;
-
-template <typename T>
-using unsigned_t = typename detail::IntegerTypes<T>::unsigned_;
-
-template <typename T>
-using simd_t = typename detail::SIMDType<T>::type;
-
-// This function will process exactly one vector worth of pixels.
-
-template <typename T>
-size_t PredictPixels(const signed_t<T>* pixels, const signed_t<T>* pixels_left,
-                     const signed_t<T>* pixels_top,
-                     const signed_t<T>* pixels_topleft,
-                     unsigned_t<T>* residuals) {
-  T px = T::Load((unsigned_t<T>*)pixels);
-  T left = T::Load((unsigned_t<T>*)pixels_left);
-  T top = T::Load((unsigned_t<T>*)pixels_top);
-  T topleft = T::Load((unsigned_t<T>*)pixels_topleft);
-  T ac = left.Sub(topleft);
-  T ab = left.Sub(top);
-  T bc = top.Sub(topleft);
-  T grad = ac.Add(top);
-  T d = ab.Xor(bc);
-  T zero = T::Val(0);
-  T clamp = zero.Gt(d).IfThenElse(top, left);
-  T s = ac.Xor(bc);
-  T pred = zero.Gt(s).IfThenElse(grad, clamp);
-  T res = px.Sub(pred);
-  T res_times_2 = res.Add(res);
-  res = zero.Gt(res).IfThenElse(T::Val(-1).Sub(res_times_2), res_times_2);
-  res.Store(residuals);
-  return res.Eq(T::Val(0)).CountPrefix();
-}
-
-#endif
-
-void EncodeHybridUint000(uint32_t value, uint32_t* token, uint32_t* nbits,
-                         uint32_t* bits) {
-  uint32_t n = FloorLog2(value);
-  *token = value ? n + 1 : 0;
-  *nbits = value ? n : 0;
-  *bits = value ? value - (1 << n) : 0;
-}
-
-#ifdef FJXL_AVX512
-constexpr static size_t kLogChunkSize = 5;
-#elif defined(FJXL_AVX2) || defined(FJXL_NEON)
-// Even if NEON only has 128-bit lanes, it is still significantly (~1.3x) faster
-// to process two vectors at a time.
-constexpr static size_t kLogChunkSize = 4;
-#else
-constexpr static size_t kLogChunkSize = 3;
-#endif
-
-constexpr static size_t kChunkSize = 1 << kLogChunkSize;
-
-template <typename Residual>
-void GenericEncodeChunk(const Residual* residuals, size_t n, size_t skip,
-                        const PrefixCode& code, BitWriter& output) {
-  for (size_t ix = skip; ix < n; ix++) {
-    unsigned token, nbits, bits;
-    EncodeHybridUint000(residuals[ix], &token, &nbits, &bits);
-    output.Write(code.raw_nbits[token] + nbits,
-                 code.raw_bits[token] | bits << code.raw_nbits[token]);
-  }
-}
-
-struct UpTo8Bits {
-  size_t bitdepth;
-  explicit UpTo8Bits(size_t bitdepth) : bitdepth(bitdepth) {
-    assert(bitdepth <= 8);
-  }
-  // Here we can fit up to 9 extra bits + 7 Huffman bits in a u16; for all other
-  // symbols, we could actually go up to 8 Huffman bits as we have at most 8
-  // extra bits; however, the SIMD bit merging logic for AVX2 assumes that no
-  // Huffman length is 8 or more, so we cap at 8 anyway. Last symbol is used for
-  // LZ77 lengths and has no limitations except allowing to represent 32 symbols
-  // in total.
-  static constexpr uint8_t kMinRawLength[12] = {};
-  static constexpr uint8_t kMaxRawLength[12] = {
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 10,
-  };
-  static size_t MaxEncodedBitsPerSample() { return 16; }
-  static constexpr size_t kInputBytes = 1;
-  using pixel_t = int16_t;
-  using upixel_t = uint16_t;
-
-  static void PrepareForSimd(const uint8_t* nbits, const uint8_t* bits,
-                             size_t n, uint8_t* nbits_simd,
-                             uint8_t* bits_simd) {
-    assert(n <= 16);
-    memcpy(nbits_simd, nbits, 16);
-    memcpy(bits_simd, bits, 16);
-  }
-
-#ifdef FJXL_GENERIC_SIMD
-  static void EncodeChunkSimd(upixel_t* residuals, size_t n, size_t skip,
-                              const uint8_t* raw_nbits_simd,
-                              const uint8_t* raw_bits_simd, BitWriter& output) {
-    Bits32 bits32[kChunkSize / SIMDVec16::kLanes];
-    alignas(64) uint16_t bits[SIMDVec16::kLanes];
-    alignas(64) uint16_t nbits[SIMDVec16::kLanes];
-    alignas(64) uint16_t bits_huff[SIMDVec16::kLanes];
-    alignas(64) uint16_t nbits_huff[SIMDVec16::kLanes];
-    alignas(64) uint16_t token[SIMDVec16::kLanes];
-    for (size_t i = 0; i < kChunkSize; i += SIMDVec16::kLanes) {
-      TokenizeSIMD(residuals + i, token, nbits, bits);
-      HuffmanSIMDUpTo13(token, raw_nbits_simd, raw_bits_simd, nbits_huff,
-                        bits_huff);
-      StoreSIMDUpTo8(nbits, bits, nbits_huff, bits_huff, std::max(n, i) - i,
-                     std::max(skip, i) - i, bits32 + i / SIMDVec16::kLanes);
-    }
-    StoreToWriter<kChunkSize / SIMDVec16::kLanes>(bits32, output);
-  }
-#endif
-
-  size_t NumSymbols(bool doing_ycocg_or_large_palette) const {
-    // values gain 1 bit for YCoCg, 1 bit for prediction.
-    // Maximum symbol is 1 + effective bit depth of residuals.
-    if (doing_ycocg_or_large_palette) {
-      return bitdepth + 3;
-    } else {
-      return bitdepth + 2;
-    }
-  }
-};
-constexpr uint8_t UpTo8Bits::kMinRawLength[];
-constexpr uint8_t UpTo8Bits::kMaxRawLength[];
-
-struct From9To13Bits {
-  size_t bitdepth;
-  explicit From9To13Bits(size_t bitdepth) : bitdepth(bitdepth) {
-    assert(bitdepth <= 13 && bitdepth >= 9);
-  }
-  // Last symbol is used for LZ77 lengths and has no limitations except allowing
-  // to represent 32 symbols in total.
-  // We cannot fit all the bits in a u16, so do not even try and use up to 8
-  // bits per raw symbol.
-  // There are at most 16 raw symbols, so Huffman coding can be SIMDfied without
-  // any special tricks.
-  static constexpr uint8_t kMinRawLength[17] = {};
-  static constexpr uint8_t kMaxRawLength[17] = {
-      8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 10,
-  };
-  static size_t MaxEncodedBitsPerSample() { return 21; }
-  static constexpr size_t kInputBytes = 2;
-  using pixel_t = int16_t;
-  using upixel_t = uint16_t;
-
-  static void PrepareForSimd(const uint8_t* nbits, const uint8_t* bits,
-                             size_t n, uint8_t* nbits_simd,
-                             uint8_t* bits_simd) {
-    assert(n <= 16);
-    memcpy(nbits_simd, nbits, 16);
-    memcpy(bits_simd, bits, 16);
-  }
-
-#ifdef FJXL_GENERIC_SIMD
-  static void EncodeChunkSimd(upixel_t* residuals, size_t n, size_t skip,
-                              const uint8_t* raw_nbits_simd,
-                              const uint8_t* raw_bits_simd, BitWriter& output) {
-    Bits32 bits32[2 * kChunkSize / SIMDVec16::kLanes];
-    alignas(64) uint16_t bits[SIMDVec16::kLanes];
-    alignas(64) uint16_t nbits[SIMDVec16::kLanes];
-    alignas(64) uint16_t bits_huff[SIMDVec16::kLanes];
-    alignas(64) uint16_t nbits_huff[SIMDVec16::kLanes];
-    alignas(64) uint16_t token[SIMDVec16::kLanes];
-    for (size_t i = 0; i < kChunkSize; i += SIMDVec16::kLanes) {
-      TokenizeSIMD(residuals + i, token, nbits, bits);
-      HuffmanSIMDUpTo13(token, raw_nbits_simd, raw_bits_simd, nbits_huff,
-                        bits_huff);
-      StoreSIMDUpTo14(nbits, bits, nbits_huff, bits_huff, std::max(n, i) - i,
-                      std::max(skip, i) - i,
-                      bits32 + 2 * i / SIMDVec16::kLanes);
-    }
-    StoreToWriter<2 * kChunkSize / SIMDVec16::kLanes>(bits32, output);
-  }
-#endif
-
-  size_t NumSymbols(bool doing_ycocg_or_large_palette) const {
-    // values gain 1 bit for YCoCg, 1 bit for prediction.
-    // Maximum symbol is 1 + effective bit depth of residuals.
-    if (doing_ycocg_or_large_palette) {
-      return bitdepth + 3;
-    } else {
-      return bitdepth + 2;
-    }
-  }
-};
-constexpr uint8_t From9To13Bits::kMinRawLength[];
-constexpr uint8_t From9To13Bits::kMaxRawLength[];
-
-void CheckHuffmanBitsSIMD(int bits1, int nbits1, int bits2, int nbits2) {
-  assert(nbits1 == 8);
-  assert(nbits2 == 8);
-  assert(bits2 == (bits1 | 128));
-}
-
-struct Exactly14Bits {
-  explicit Exactly14Bits(size_t bitdepth) { assert(bitdepth == 14); }
-  // Force LZ77 symbols to have at least 8 bits, and raw symbols 15 and 16 to
-  // have exactly 8, and no other symbol to have 8 or more. This ensures that
-  // the representation for 15 and 16 is identical up to one bit.
-  static constexpr uint8_t kMinRawLength[18] = {
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 7,
-  };
-  static constexpr uint8_t kMaxRawLength[18] = {
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 10,
-  };
-  static constexpr size_t bitdepth = 14;
-  static size_t MaxEncodedBitsPerSample() { return 22; }
-  static constexpr size_t kInputBytes = 2;
-  using pixel_t = int16_t;
-  using upixel_t = uint16_t;
-
-  static void PrepareForSimd(const uint8_t* nbits, const uint8_t* bits,
-                             size_t n, uint8_t* nbits_simd,
-                             uint8_t* bits_simd) {
-    assert(n == 17);
-    CheckHuffmanBitsSIMD(bits[15], nbits[15], bits[16], nbits[16]);
-    memcpy(nbits_simd, nbits, 16);
-    memcpy(bits_simd, bits, 16);
-  }
-
-#ifdef FJXL_GENERIC_SIMD
-  static void EncodeChunkSimd(upixel_t* residuals, size_t n, size_t skip,
-                              const uint8_t* raw_nbits_simd,
-                              const uint8_t* raw_bits_simd, BitWriter& output) {
-    Bits32 bits32[2 * kChunkSize / SIMDVec16::kLanes];
-    alignas(64) uint16_t bits[SIMDVec16::kLanes];
-    alignas(64) uint16_t nbits[SIMDVec16::kLanes];
-    alignas(64) uint16_t bits_huff[SIMDVec16::kLanes];
-    alignas(64) uint16_t nbits_huff[SIMDVec16::kLanes];
-    alignas(64) uint16_t token[SIMDVec16::kLanes];
-    for (size_t i = 0; i < kChunkSize; i += SIMDVec16::kLanes) {
-      TokenizeSIMD(residuals + i, token, nbits, bits);
-      HuffmanSIMD14(token, raw_nbits_simd, raw_bits_simd, nbits_huff,
-                    bits_huff);
-      StoreSIMDUpTo14(nbits, bits, nbits_huff, bits_huff, std::max(n, i) - i,
-                      std::max(skip, i) - i,
-                      bits32 + 2 * i / SIMDVec16::kLanes);
-    }
-    StoreToWriter<2 * kChunkSize / SIMDVec16::kLanes>(bits32, output);
-  }
-#endif
-
-  size_t NumSymbols(bool) const { return 17; }
-};
-constexpr uint8_t Exactly14Bits::kMinRawLength[];
-constexpr uint8_t Exactly14Bits::kMaxRawLength[];
-
-struct MoreThan14Bits {
-  size_t bitdepth;
-  explicit MoreThan14Bits(size_t bitdepth) : bitdepth(bitdepth) {
-    assert(bitdepth > 14);
-    assert(bitdepth <= 16);
-  }
-  // Force LZ77 symbols to have at least 8 bits, and raw symbols 13 to 18 to
-  // have exactly 8, and no other symbol to have 8 or more. This ensures that
-  // the representation for (13, 14), (15, 16), (17, 18) is identical up to one
-  // bit.
-  static constexpr uint8_t kMinRawLength[20] = {
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 7,
-  };
-  static constexpr uint8_t kMaxRawLength[20] = {
-      7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 10,
-  };
-  static size_t MaxEncodedBitsPerSample() { return 24; }
-  static constexpr size_t kInputBytes = 2;
-  using pixel_t = int32_t;
-  using upixel_t = uint32_t;
-
-  static void PrepareForSimd(const uint8_t* nbits, const uint8_t* bits,
-                             size_t n, uint8_t* nbits_simd,
-                             uint8_t* bits_simd) {
-    assert(n == 19);
-    CheckHuffmanBitsSIMD(bits[13], nbits[13], bits[14], nbits[14]);
-    CheckHuffmanBitsSIMD(bits[15], nbits[15], bits[16], nbits[16]);
-    CheckHuffmanBitsSIMD(bits[17], nbits[17], bits[18], nbits[18]);
-    for (size_t i = 0; i < 14; i++) {
-      nbits_simd[i] = nbits[i];
-      bits_simd[i] = bits[i];
-    }
-    nbits_simd[14] = nbits[15];
-    bits_simd[14] = bits[15];
-    nbits_simd[15] = nbits[17];
-    bits_simd[15] = bits[17];
-  }
-
-#ifdef FJXL_GENERIC_SIMD
-  static void EncodeChunkSimd(upixel_t* residuals, size_t n, size_t skip,
-                              const uint8_t* raw_nbits_simd,
-                              const uint8_t* raw_bits_simd, BitWriter& output) {
-    Bits32 bits32[2 * kChunkSize / SIMDVec16::kLanes];
-    alignas(64) uint32_t bits[SIMDVec16::kLanes];
-    alignas(64) uint32_t nbits[SIMDVec16::kLanes];
-    alignas(64) uint16_t bits_huff[SIMDVec16::kLanes];
-    alignas(64) uint16_t nbits_huff[SIMDVec16::kLanes];
-    alignas(64) uint16_t token[SIMDVec16::kLanes];
-    for (size_t i = 0; i < kChunkSize; i += SIMDVec16::kLanes) {
-      TokenizeSIMD(residuals + i, token, nbits, bits);
-      HuffmanSIMDAbove14(token, raw_nbits_simd, raw_bits_simd, nbits_huff,
-                         bits_huff);
-      StoreSIMDAbove14(nbits, bits, nbits_huff, bits_huff, std::max(n, i) - i,
-                       std::max(skip, i) - i,
-                       bits32 + 2 * i / SIMDVec16::kLanes);
-    }
-    StoreToWriter<2 * kChunkSize / SIMDVec16::kLanes>(bits32, output);
-  }
-#endif
-  size_t NumSymbols(bool) const { return 19; }
-};
-constexpr uint8_t MoreThan14Bits::kMinRawLength[];
-constexpr uint8_t MoreThan14Bits::kMaxRawLength[];
-
-void PrepareDCGlobalCommon(bool is_single_group, size_t width, size_t height,
-                           const PrefixCode code[4], BitWriter* output) {
-  output->Allocate(100000 + (is_single_group ? width * height * 16 : 0));
-  // No patches, spline or noise.
-  output->Write(1, 1);  // default DC dequantization factors (?)
-  output->Write(1, 1);  // use global tree / histograms
-  output->Write(1, 0);  // no lz77 for the tree
-
-  output->Write(1, 1);         // simple code for the tree's context map
-  output->Write(2, 0);         // all contexts clustered together
-  output->Write(1, 1);         // use prefix code for tree
-  output->Write(4, 0);         // 000 hybrid uint
-  output->Write(6, 0b100011);  // Alphabet size is 4 (var16)
-  output->Write(2, 1);         // simple prefix code
-  output->Write(2, 3);         // with 4 symbols
-  output->Write(2, 0);
-  output->Write(2, 1);
-  output->Write(2, 2);
-  output->Write(2, 3);
-  output->Write(1, 0);  // First tree encoding option
-
-  // Huffman table + extra bits for the tree.
-  uint8_t symbol_bits[6] = {0b00, 0b10, 0b001, 0b101, 0b0011, 0b0111};
-  uint8_t symbol_nbits[6] = {2, 2, 3, 3, 4, 4};
-  // Write a tree with a leaf per channel, and gradient predictor for every
-  // leaf.
-  for (auto v : {1, 2, 1, 4, 1, 0, 0, 5, 0, 0, 0, 0, 5,
-                 0, 0, 0, 0, 5, 0, 0, 0, 0, 5, 0, 0, 0}) {
-    output->Write(symbol_nbits[v], symbol_bits[v]);
-  }
-
-  output->Write(1, 1);     // Enable lz77 for the main bitstream
-  output->Write(2, 0b00);  // lz77 offset 224
-  static_assert(kLZ77Offset == 224, "");
-  output->Write(4, 0b1010);  // lz77 min length 7
-  // 400 hybrid uint config for lz77
-  output->Write(4, 4);
-  output->Write(3, 0);
-  output->Write(3, 0);
-
-  output->Write(1, 1);  // simple code for the context map
-  output->Write(2, 3);  // 3 bits per entry
-  output->Write(3, 4);  // channel 3
-  output->Write(3, 3);  // channel 2
-  output->Write(3, 2);  // channel 1
-  output->Write(3, 1);  // channel 0
-  output->Write(3, 0);  // distance histogram first
-
-  output->Write(1, 1);  // use prefix codes
-  output->Write(4, 0);  // 000 hybrid uint config for distances (only need 0)
-  for (size_t i = 0; i < 4; i++) {
-    output->Write(4, 0);  // 000 hybrid uint config for symbols (only <= 10)
-  }
-
-  // Distance alphabet size:
-  output->Write(5, 0b00001);  // 2: just need 1 for RLE (i.e. distance 1)
-  // Symbol + LZ77 alphabet size:
-  for (size_t i = 0; i < 4; i++) {
-    output->Write(1, 1);    // > 1
-    output->Write(4, 8);    // <= 512
-    output->Write(8, 256);  // == 512
-  }
-
-  // Distance histogram:
-  output->Write(2, 1);  // simple prefix code
-  output->Write(2, 0);  // with one symbol
-  output->Write(1, 1);  // 1
-
-  // Symbol + lz77 histogram:
-  for (size_t i = 0; i < 4; i++) {
-    code[i].WriteTo(output);
-  }
-
-  // Group header for global modular image.
-  output->Write(1, 1);  // Global tree
-  output->Write(1, 1);  // All default wp
-}
-
-void PrepareDCGlobal(bool is_single_group, size_t width, size_t height,
-                     size_t nb_chans, const PrefixCode code[4],
-                     BitWriter* output) {
-  PrepareDCGlobalCommon(is_single_group, width, height, code, output);
-  if (nb_chans > 2) {
-    output->Write(2, 0b01);     // 1 transform
-    output->Write(2, 0b00);     // RCT
-    output->Write(5, 0b00000);  // Starting from ch 0
-    output->Write(2, 0b00);     // YCoCg
-  } else {
-    output->Write(2, 0b00);  // no transforms
-  }
-  if (!is_single_group) {
-    output->ZeroPadToByte();
-  }
-}
-
-template <typename BitDepth>
-struct ChunkEncoder {
-  void PrepareForSimd() {
-    BitDepth::PrepareForSimd(code->raw_nbits, code->raw_bits, code->numraw,
-                             raw_nbits_simd, raw_bits_simd);
-  }
-  FJXL_INLINE static void EncodeRle(size_t count, const PrefixCode& code,
-                                    BitWriter& output) {
-    if (count == 0) return;
-    count -= kLZ77MinLength + 1;
-    if (count < kLZ77CacheSize) {
-      output.Write(code.lz77_cache_nbits[count], code.lz77_cache_bits[count]);
-    } else {
-      unsigned token, nbits, bits;
-      EncodeHybridUintLZ77(count, &token, &nbits, &bits);
-      uint64_t wbits = bits;
-      wbits = (wbits << code.lz77_nbits[token]) | code.lz77_bits[token];
-      wbits = (wbits << code.raw_nbits[0]) | code.raw_bits[0];
-      output.Write(code.lz77_nbits[token] + nbits + code.raw_nbits[0], wbits);
-    }
-  }
-
-  FJXL_INLINE void Chunk(size_t run, typename BitDepth::upixel_t* residuals,
-                         size_t skip, size_t n) {
-    EncodeRle(run, *code, *output);
-#ifdef FJXL_GENERIC_SIMD
-    BitDepth::EncodeChunkSimd(residuals, n, skip, raw_nbits_simd, raw_bits_simd,
-                              *output);
-#else
-    GenericEncodeChunk(residuals, n, skip, *code, *output);
-#endif
-  }
-
-  inline void Finalize(size_t run) { EncodeRle(run, *code, *output); }
-
-  const PrefixCode* code;
-  BitWriter* output;
-  alignas(64) uint8_t raw_nbits_simd[16] = {};
-  alignas(64) uint8_t raw_bits_simd[16] = {};
-};
-
-template <typename BitDepth>
-struct ChunkSampleCollector {
-  FJXL_INLINE void Rle(size_t count, uint64_t* lz77_counts) {
-    if (count == 0) return;
-    raw_counts[0] += 1;
-    count -= kLZ77MinLength + 1;
-    unsigned token, nbits, bits;
-    EncodeHybridUintLZ77(count, &token, &nbits, &bits);
-    lz77_counts[token]++;
-  }
-
-  FJXL_INLINE void Chunk(size_t run, typename BitDepth::upixel_t* residuals,
-                         size_t skip, size_t n) {
-    // Run is broken. Encode the run and encode the individual vector.
-    Rle(run, lz77_counts);
-    for (size_t ix = skip; ix < n; ix++) {
-      unsigned token, nbits, bits;
-      EncodeHybridUint000(residuals[ix], &token, &nbits, &bits);
-      raw_counts[token]++;
-    }
-  }
-
-  // don't count final run since we don't know how long it really is
-  void Finalize(size_t run) {}
-
-  uint64_t* raw_counts;
-  uint64_t* lz77_counts;
-};
-
-constexpr uint32_t PackSigned(int32_t value) {
-  return (static_cast<uint32_t>(value) << 1) ^
-         ((static_cast<uint32_t>(~value) >> 31) - 1);
-}
-
-template <typename T, typename BitDepth>
-struct ChannelRowProcessor {
-  using upixel_t = typename BitDepth::upixel_t;
-  using pixel_t = typename BitDepth::pixel_t;
-  T* t;
-  void ProcessChunk(const pixel_t* row, const pixel_t* row_left,
-                    const pixel_t* row_top, const pixel_t* row_topleft,
-                    size_t n) {
-    alignas(64) upixel_t residuals[kChunkSize] = {};
-    size_t prefix_size = 0;
-    size_t required_prefix_size = 0;
-#ifdef FJXL_GENERIC_SIMD
-    constexpr size_t kNum =
-        sizeof(pixel_t) == 2 ? SIMDVec16::kLanes : SIMDVec32::kLanes;
-    for (size_t ix = 0; ix < kChunkSize; ix += kNum) {
-      size_t c =
-          PredictPixels<simd_t<pixel_t>>(row + ix, row_left + ix, row_top + ix,
-                                         row_topleft + ix, residuals + ix);
-      prefix_size =
-          prefix_size == required_prefix_size ? prefix_size + c : prefix_size;
-      required_prefix_size += kNum;
-    }
-#else
-    for (size_t ix = 0; ix < kChunkSize; ix++) {
-      pixel_t px = row[ix];
-      pixel_t left = row_left[ix];
-      pixel_t top = row_top[ix];
-      pixel_t topleft = row_topleft[ix];
-      pixel_t ac = left - topleft;
-      pixel_t ab = left - top;
-      pixel_t bc = top - topleft;
-      pixel_t grad = static_cast<pixel_t>(static_cast<upixel_t>(ac) +
-                                          static_cast<upixel_t>(top));
-      pixel_t d = ab ^ bc;
-      pixel_t clamp = d < 0 ? top : left;
-      pixel_t s = ac ^ bc;
-      pixel_t pred = s < 0 ? grad : clamp;
-      residuals[ix] = PackSigned(px - pred);
-      prefix_size = prefix_size == required_prefix_size
-                        ? prefix_size + (residuals[ix] == 0)
-                        : prefix_size;
-      required_prefix_size += 1;
-    }
-#endif
-    prefix_size = std::min(n, prefix_size);
-    if (prefix_size == n && (run > 0 || prefix_size > kLZ77MinLength)) {
-      // Run continues, nothing to do.
-      run += prefix_size;
-    } else if (prefix_size + run > kLZ77MinLength) {
-      // Run is broken. Encode the run and encode the individual vector.
-      t->Chunk(run + prefix_size, residuals, prefix_size, n);
-      run = 0;
-    } else {
-      // There was no run to begin with.
-      t->Chunk(0, residuals, 0, n);
-    }
-  }
-
-  void ProcessRow(const pixel_t* row, const pixel_t* row_left,
-                  const pixel_t* row_top, const pixel_t* row_topleft,
-                  size_t xs) {
-    for (size_t x = 0; x < xs; x += kChunkSize) {
-      ProcessChunk(row + x, row_left + x, row_top + x, row_topleft + x,
-                   std::min(kChunkSize, xs - x));
-    }
-  }
-
-  void Finalize() { t->Finalize(run); }
-  // Invariant: run == 0 or run > kLZ77MinLength.
-  size_t run = 0;
-};
-
-uint16_t LoadLE16(const unsigned char* ptr) {
-  return uint16_t{ptr[0]} | (uint16_t{ptr[1]} << 8);
-}
-
-uint16_t SwapEndian(uint16_t in) { return (in >> 8) | (in << 8); }
-
-#ifdef FJXL_GENERIC_SIMD
-void StorePixels(SIMDVec16 p, int16_t* dest) { p.Store((uint16_t*)dest); }
-
-void StorePixels(SIMDVec16 p, int32_t* dest) {
-  VecPair<SIMDVec32> p_up = p.Upcast();
-  p_up.low.Store((uint32_t*)dest);
-  p_up.hi.Store((uint32_t*)dest + SIMDVec32::kLanes);
-}
-#endif
-
-template <typename pixel_t>
-void FillRowG8(const unsigned char* rgba, size_t oxs, pixel_t* luma) {
-  size_t x = 0;
-#ifdef FJXL_GENERIC_SIMD
-  for (; x + SIMDVec16::kLanes <= oxs; x += SIMDVec16::kLanes) {
-    auto rgb = SIMDVec16::LoadG8(rgba + x);
-    StorePixels(rgb[0], luma + x);
-  }
-#endif
-  for (; x < oxs; x++) {
-    luma[x] = rgba[x];
-  }
-}
-
-template <bool big_endian, typename pixel_t>
-void FillRowG16(const unsigned char* rgba, size_t oxs, pixel_t* luma) {
-  size_t x = 0;
-#ifdef FJXL_GENERIC_SIMD
-  for (; x + SIMDVec16::kLanes <= oxs; x += SIMDVec16::kLanes) {
-    auto rgb = SIMDVec16::LoadG16(rgba + 2 * x);
-    if (big_endian) {
-      rgb[0].SwapEndian();
-    }
-    StorePixels(rgb[0], luma + x);
-  }
-#endif
-  for (; x < oxs; x++) {
-    uint16_t val = LoadLE16(rgba + 2 * x);
-    if (big_endian) {
-      val = SwapEndian(val);
-    }
-    luma[x] = val;
-  }
-}
-
-template <typename pixel_t>
-void FillRowGA8(const unsigned char* rgba, size_t oxs, pixel_t* luma,
-                pixel_t* alpha) {
-  size_t x = 0;
-#ifdef FJXL_GENERIC_SIMD
-  for (; x + SIMDVec16::kLanes <= oxs; x += SIMDVec16::kLanes) {
-    auto rgb = SIMDVec16::LoadGA8(rgba + 2 * x);
-    StorePixels(rgb[0], luma + x);
-    StorePixels(rgb[1], alpha + x);
-  }
-#endif
-  for (; x < oxs; x++) {
-    luma[x] = rgba[2 * x];
-    alpha[x] = rgba[2 * x + 1];
-  }
-}
-
-template <bool big_endian, typename pixel_t>
-void FillRowGA16(const unsigned char* rgba, size_t oxs, pixel_t* luma,
-                 pixel_t* alpha) {
-  size_t x = 0;
-#ifdef FJXL_GENERIC_SIMD
-  for (; x + SIMDVec16::kLanes <= oxs; x += SIMDVec16::kLanes) {
-    auto rgb = SIMDVec16::LoadGA16(rgba + 4 * x);
-    if (big_endian) {
-      rgb[0].SwapEndian();
-      rgb[1].SwapEndian();
-    }
-    StorePixels(rgb[0], luma + x);
-    StorePixels(rgb[1], alpha + x);
-  }
-#endif
-  for (; x < oxs; x++) {
-    uint16_t l = LoadLE16(rgba + 4 * x);
-    uint16_t a = LoadLE16(rgba + 4 * x + 2);
-    if (big_endian) {
-      l = SwapEndian(l);
-      a = SwapEndian(a);
-    }
-    luma[x] = l;
-    alpha[x] = a;
-  }
-}
-
-template <typename pixel_t>
-void StoreYCoCg(pixel_t r, pixel_t g, pixel_t b, pixel_t* y, pixel_t* co,
-                pixel_t* cg) {
-  *co = r - b;
-  pixel_t tmp = b + (*co >> 1);
-  *cg = g - tmp;
-  *y = tmp + (*cg >> 1);
-}
-
-#ifdef FJXL_GENERIC_SIMD
-void StoreYCoCg(SIMDVec16 r, SIMDVec16 g, SIMDVec16 b, int16_t* y, int16_t* co,
-                int16_t* cg) {
-  SIMDVec16 co_v = r.Sub(b);
-  SIMDVec16 tmp = b.Add(co_v.SignedShiftRight<1>());
-  SIMDVec16 cg_v = g.Sub(tmp);
-  SIMDVec16 y_v = tmp.Add(cg_v.SignedShiftRight<1>());
-  y_v.Store(reinterpret_cast<uint16_t*>(y));
-  co_v.Store(reinterpret_cast<uint16_t*>(co));
-  cg_v.Store(reinterpret_cast<uint16_t*>(cg));
-}
-
-void StoreYCoCg(SIMDVec16 r, SIMDVec16 g, SIMDVec16 b, int32_t* y, int32_t* co,
-                int32_t* cg) {
-  VecPair<SIMDVec32> r_up = r.Upcast();
-  VecPair<SIMDVec32> g_up = g.Upcast();
-  VecPair<SIMDVec32> b_up = b.Upcast();
-  SIMDVec32 co_lo_v = r_up.low.Sub(b_up.low);
-  SIMDVec32 tmp_lo = b_up.low.Add(co_lo_v.SignedShiftRight<1>());
-  SIMDVec32 cg_lo_v = g_up.low.Sub(tmp_lo);
-  SIMDVec32 y_lo_v = tmp_lo.Add(cg_lo_v.SignedShiftRight<1>());
-  SIMDVec32 co_hi_v = r_up.hi.Sub(b_up.hi);
-  SIMDVec32 tmp_hi = b_up.hi.Add(co_hi_v.SignedShiftRight<1>());
-  SIMDVec32 cg_hi_v = g_up.hi.Sub(tmp_hi);
-  SIMDVec32 y_hi_v = tmp_hi.Add(cg_hi_v.SignedShiftRight<1>());
-  y_lo_v.Store(reinterpret_cast<uint32_t*>(y));
-  co_lo_v.Store(reinterpret_cast<uint32_t*>(co));
-  cg_lo_v.Store(reinterpret_cast<uint32_t*>(cg));
-  y_hi_v.Store(reinterpret_cast<uint32_t*>(y) + SIMDVec32::kLanes);
-  co_hi_v.Store(reinterpret_cast<uint32_t*>(co) + SIMDVec32::kLanes);
-  cg_hi_v.Store(reinterpret_cast<uint32_t*>(cg) + SIMDVec32::kLanes);
-}
-#endif
-
-template <typename pixel_t>
-void FillRowRGB8(const unsigned char* rgba, size_t oxs, pixel_t* y, pixel_t* co,
-                 pixel_t* cg) {
-  size_t x = 0;
-#ifdef FJXL_GENERIC_SIMD
-  for (; x + SIMDVec16::kLanes <= oxs; x += SIMDVec16::kLanes) {
-    auto rgb = SIMDVec16::LoadRGB8(rgba + 3 * x);
-    StoreYCoCg(rgb[0], rgb[1], rgb[2], y + x, co + x, cg + x);
-  }
-#endif
-  for (; x < oxs; x++) {
-    uint16_t r = rgba[3 * x];
-    uint16_t g = rgba[3 * x + 1];
-    uint16_t b = rgba[3 * x + 2];
-    StoreYCoCg<pixel_t>(r, g, b, y + x, co + x, cg + x);
-  }
-}
-
-template <bool big_endian, typename pixel_t>
-void FillRowRGB16(const unsigned char* rgba, size_t oxs, pixel_t* y,
-                  pixel_t* co, pixel_t* cg) {
-  size_t x = 0;
-#ifdef FJXL_GENERIC_SIMD
-  for (; x + SIMDVec16::kLanes <= oxs; x += SIMDVec16::kLanes) {
-    auto rgb = SIMDVec16::LoadRGB16(rgba + 6 * x);
-    if (big_endian) {
-      rgb[0].SwapEndian();
-      rgb[1].SwapEndian();
-      rgb[2].SwapEndian();
-    }
-    StoreYCoCg(rgb[0], rgb[1], rgb[2], y + x, co + x, cg + x);
-  }
-#endif
-  for (; x < oxs; x++) {
-    uint16_t r = LoadLE16(rgba + 6 * x);
-    uint16_t g = LoadLE16(rgba + 6 * x + 2);
-    uint16_t b = LoadLE16(rgba + 6 * x + 4);
-    if (big_endian) {
-      r = SwapEndian(r);
-      g = SwapEndian(g);
-      b = SwapEndian(b);
-    }
-    StoreYCoCg<pixel_t>(r, g, b, y + x, co + x, cg + x);
-  }
-}
-
-template <typename pixel_t>
-void FillRowRGBA8(const unsigned char* rgba, size_t oxs, pixel_t* y,
-                  pixel_t* co, pixel_t* cg, pixel_t* alpha) {
-  size_t x = 0;
-#ifdef FJXL_GENERIC_SIMD
-  for (; x + SIMDVec16::kLanes <= oxs; x += SIMDVec16::kLanes) {
-    auto rgb = SIMDVec16::LoadRGBA8(rgba + 4 * x);
-    StoreYCoCg(rgb[0], rgb[1], rgb[2], y + x, co + x, cg + x);
-    StorePixels(rgb[3], alpha + x);
-  }
-#endif
-  for (; x < oxs; x++) {
-    uint16_t r = rgba[4 * x];
-    uint16_t g = rgba[4 * x + 1];
-    uint16_t b = rgba[4 * x + 2];
-    uint16_t a = rgba[4 * x + 3];
-    StoreYCoCg<pixel_t>(r, g, b, y + x, co + x, cg + x);
-    alpha[x] = a;
-  }
-}
-
-template <bool big_endian, typename pixel_t>
-void FillRowRGBA16(const unsigned char* rgba, size_t oxs, pixel_t* y,
-                   pixel_t* co, pixel_t* cg, pixel_t* alpha) {
-  size_t x = 0;
-#ifdef FJXL_GENERIC_SIMD
-  for (; x + SIMDVec16::kLanes <= oxs; x += SIMDVec16::kLanes) {
-    auto rgb = SIMDVec16::LoadRGBA16(rgba + 8 * x);
-    if (big_endian) {
-      rgb[0].SwapEndian();
-      rgb[1].SwapEndian();
-      rgb[2].SwapEndian();
-      rgb[3].SwapEndian();
-    }
-    StoreYCoCg(rgb[0], rgb[1], rgb[2], y + x, co + x, cg + x);
-    StorePixels(rgb[3], alpha + x);
-  }
-#endif
-  for (; x < oxs; x++) {
-    uint16_t r = LoadLE16(rgba + 8 * x);
-    uint16_t g = LoadLE16(rgba + 8 * x + 2);
-    uint16_t b = LoadLE16(rgba + 8 * x + 4);
-    uint16_t a = LoadLE16(rgba + 8 * x + 6);
-    if (big_endian) {
-      r = SwapEndian(r);
-      g = SwapEndian(g);
-      b = SwapEndian(b);
-      a = SwapEndian(a);
-    }
-    StoreYCoCg<pixel_t>(r, g, b, y + x, co + x, cg + x);
-    alpha[x] = a;
-  }
-}
-
-template <typename Processor, typename BitDepth>
-void ProcessImageArea(const unsigned char* rgba, size_t x0, size_t y0,
-                      size_t xs, size_t yskip, size_t ys, size_t row_stride,
-                      BitDepth bitdepth, size_t nb_chans, bool big_endian,
-                      Processor* processors) {
-  constexpr size_t kPadding = 32;
-
-  using pixel_t = typename BitDepth::pixel_t;
-
-  constexpr size_t kAlign = 64;
-  constexpr size_t kAlignPixels = kAlign / sizeof(pixel_t);
-
-  auto align = [=](pixel_t* ptr) {
-    size_t offset = reinterpret_cast<uintptr_t>(ptr) % kAlign;
-    if (offset) {
-      ptr += offset / sizeof(pixel_t);
-    }
-    return ptr;
-  };
-
-  constexpr size_t kNumPx =
-      (256 + kPadding * 2 + kAlignPixels + kAlignPixels - 1) / kAlignPixels *
-      kAlignPixels;
-
-  std::vector<std::array<std::array<pixel_t, kNumPx>, 2>> group_data(nb_chans);
-
-  for (size_t y = 0; y < ys; y++) {
-    const auto rgba_row =
-        rgba + row_stride * (y0 + y) + x0 * nb_chans * BitDepth::kInputBytes;
-    pixel_t* crow[4] = {};
-    pixel_t* prow[4] = {};
-    for (size_t i = 0; i < nb_chans; i++) {
-      crow[i] = align(&group_data[i][y & 1][kPadding]);
-      prow[i] = align(&group_data[i][(y - 1) & 1][kPadding]);
-    }
-
-    // Pre-fill rows with YCoCg converted pixels.
-    if (nb_chans == 1) {
-      if (BitDepth::kInputBytes == 1) {
-        FillRowG8(rgba_row, xs, crow[0]);
-      } else if (big_endian) {
-        FillRowG16</*big_endian=*/true>(rgba_row, xs, crow[0]);
-      } else {
-        FillRowG16</*big_endian=*/false>(rgba_row, xs, crow[0]);
-      }
-    } else if (nb_chans == 2) {
-      if (BitDepth::kInputBytes == 1) {
-        FillRowGA8(rgba_row, xs, crow[0], crow[1]);
-      } else if (big_endian) {
-        FillRowGA16</*big_endian=*/true>(rgba_row, xs, crow[0], crow[1]);
-      } else {
-        FillRowGA16</*big_endian=*/false>(rgba_row, xs, crow[0], crow[1]);
-      }
-    } else if (nb_chans == 3) {
-      if (BitDepth::kInputBytes == 1) {
-        FillRowRGB8(rgba_row, xs, crow[0], crow[1], crow[2]);
-      } else if (big_endian) {
-        FillRowRGB16</*big_endian=*/true>(rgba_row, xs, crow[0], crow[1],
-                                          crow[2]);
-      } else {
-        FillRowRGB16</*big_endian=*/false>(rgba_row, xs, crow[0], crow[1],
-                                           crow[2]);
-      }
-    } else {
-      if (BitDepth::kInputBytes == 1) {
-        FillRowRGBA8(rgba_row, xs, crow[0], crow[1], crow[2], crow[3]);
-      } else if (big_endian) {
-        FillRowRGBA16</*big_endian=*/true>(rgba_row, xs, crow[0], crow[1],
-                                           crow[2], crow[3]);
-      } else {
-        FillRowRGBA16</*big_endian=*/false>(rgba_row, xs, crow[0], crow[1],
-                                            crow[2], crow[3]);
-      }
-    }
-    // Deal with x == 0.
-    for (size_t c = 0; c < nb_chans; c++) {
-      *(crow[c] - 1) = y > 0 ? *(prow[c]) : 0;
-      // Fix topleft.
-      *(prow[c] - 1) = y > 0 ? *(prow[c]) : 0;
-    }
-    if (y < yskip) continue;
-    for (size_t c = 0; c < nb_chans; c++) {
-      // Get pointers to px/left/top/topleft data to speedup loop.
-      const pixel_t* row = crow[c];
-      const pixel_t* row_left = crow[c] - 1;
-      const pixel_t* row_top = y == 0 ? row_left : prow[c];
-      const pixel_t* row_topleft = y == 0 ? row_left : prow[c] - 1;
-
-      processors[c].ProcessRow(row, row_left, row_top, row_topleft, xs);
-    }
-  }
-  for (size_t c = 0; c < nb_chans; c++) {
-    processors[c].Finalize();
-  }
-}
-
-template <typename BitDepth>
-void WriteACSection(const unsigned char* rgba, size_t x0, size_t y0, size_t xs,
-                    size_t ys, size_t row_stride, bool is_single_group,
-                    BitDepth bitdepth, size_t nb_chans, bool big_endian,
-                    const PrefixCode code[4],
-                    std::array<BitWriter, 4>& output) {
-  for (size_t i = 0; i < nb_chans; i++) {
-    if (is_single_group && i == 0) continue;
-    output[i].Allocate(xs * ys * bitdepth.MaxEncodedBitsPerSample() + 4);
-  }
-  if (!is_single_group) {
-    // Group header for modular image.
-    // When the image is single-group, the global modular image is the one
-    // that contains the pixel data, and there is no group header.
-    output[0].Write(1, 1);     // Global tree
-    output[0].Write(1, 1);     // All default wp
-    output[0].Write(2, 0b00);  // 0 transforms
-  }
-
-  ChunkEncoder<BitDepth> encoders[4];
-  ChannelRowProcessor<ChunkEncoder<BitDepth>, BitDepth> row_encoders[4];
-  for (size_t c = 0; c < nb_chans; c++) {
-    row_encoders[c].t = &encoders[c];
-    encoders[c].output = &output[c];
-    encoders[c].code = &code[c];
-    encoders[c].PrepareForSimd();
-  }
-  ProcessImageArea<ChannelRowProcessor<ChunkEncoder<BitDepth>, BitDepth>>(
-      rgba, x0, y0, xs, 0, ys, row_stride, bitdepth, nb_chans, big_endian,
-      row_encoders);
-}
-
-constexpr int kHashExp = 16;
-constexpr uint32_t kHashSize = 1 << kHashExp;
-constexpr uint32_t kHashMultiplier = 2654435761;
-constexpr int kMaxColors = 512;
-
-// can be any function that returns a value in 0 .. kHashSize-1
-// has to map 0 to 0
-inline uint32_t pixel_hash(uint32_t p) {
-  return (p * kHashMultiplier) >> (32 - kHashExp);
-}
-
-template <size_t nb_chans>
-void FillRowPalette(const unsigned char* inrow, size_t xs,
-                    const int16_t* lookup, int16_t* out) {
-  for (size_t x = 0; x < xs; x++) {
-    uint32_t p = 0;
-    for (size_t i = 0; i < nb_chans; ++i) {
-      p |= inrow[x * nb_chans + i] << (8 * i);
-    }
-    out[x] = lookup[pixel_hash(p)];
-  }
-}
-
-template <typename Processor>
-void ProcessImageAreaPalette(const unsigned char* rgba, size_t x0, size_t y0,
-                             size_t xs, size_t yskip, size_t ys,
-                             size_t row_stride, const int16_t* lookup,
-                             size_t nb_chans, Processor* processors) {
-  constexpr size_t kPadding = 32;
-
-  std::vector<std::array<int16_t, 256 + kPadding * 2>> group_data(2);
-  Processor& row_encoder = processors[0];
-
-  for (size_t y = 0; y < ys; y++) {
-    // Pre-fill rows with palette converted pixels.
-    const unsigned char* inrow = rgba + row_stride * (y0 + y) + x0 * nb_chans;
-    int16_t* outrow = &group_data[y & 1][kPadding];
-    if (nb_chans == 1) {
-      FillRowPalette<1>(inrow, xs, lookup, outrow);
-    } else if (nb_chans == 2) {
-      FillRowPalette<2>(inrow, xs, lookup, outrow);
-    } else if (nb_chans == 3) {
-      FillRowPalette<3>(inrow, xs, lookup, outrow);
-    } else if (nb_chans == 4) {
-      FillRowPalette<4>(inrow, xs, lookup, outrow);
-    }
-    // Deal with x == 0.
-    group_data[y & 1][kPadding - 1] =
-        y > 0 ? group_data[(y - 1) & 1][kPadding] : 0;
-    // Fix topleft.
-    group_data[(y - 1) & 1][kPadding - 1] =
-        y > 0 ? group_data[(y - 1) & 1][kPadding] : 0;
-    // Get pointers to px/left/top/topleft data to speedup loop.
-    const int16_t* row = &group_data[y & 1][kPadding];
-    const int16_t* row_left = &group_data[y & 1][kPadding - 1];
-    const int16_t* row_top =
-        y == 0 ? row_left : &group_data[(y - 1) & 1][kPadding];
-    const int16_t* row_topleft =
-        y == 0 ? row_left : &group_data[(y - 1) & 1][kPadding - 1];
-
-    row_encoder.ProcessRow(row, row_left, row_top, row_topleft, xs);
-  }
-  row_encoder.Finalize();
-}
-
-void WriteACSectionPalette(const unsigned char* rgba, size_t x0, size_t y0,
-                           size_t xs, size_t ys, size_t row_stride,
-                           bool is_single_group, const PrefixCode code[4],
-                           const int16_t* lookup, size_t nb_chans,
-                           BitWriter& output) {
-  if (!is_single_group) {
-    output.Allocate(16 * xs * ys + 4);
-    // Group header for modular image.
-    // When the image is single-group, the global modular image is the one
-    // that contains the pixel data, and there is no group header.
-    output.Write(1, 1);     // Global tree
-    output.Write(1, 1);     // All default wp
-    output.Write(2, 0b00);  // 0 transforms
-  }
-
-  ChunkEncoder<UpTo8Bits> encoder;
-  ChannelRowProcessor<ChunkEncoder<UpTo8Bits>, UpTo8Bits> row_encoder;
-
-  row_encoder.t = &encoder;
-  encoder.output = &output;
-  encoder.code = &code[is_single_group ? 1 : 0];
-  encoder.PrepareForSimd();
-  ProcessImageAreaPalette<
-      ChannelRowProcessor<ChunkEncoder<UpTo8Bits>, UpTo8Bits>>(
-      rgba, x0, y0, xs, 0, ys, row_stride, lookup, nb_chans, &row_encoder);
-}
-
-template <typename BitDepth>
-void CollectSamples(const unsigned char* rgba, size_t x0, size_t y0, size_t xs,
-                    size_t row_stride, size_t row_count,
-                    uint64_t raw_counts[4][kNumRawSymbols],
-                    uint64_t lz77_counts[4][kNumLZ77], bool is_single_group,
-                    bool palette, BitDepth bitdepth, size_t nb_chans,
-                    bool big_endian, const int16_t* lookup) {
-  if (palette) {
-    ChunkSampleCollector<UpTo8Bits> sample_collectors[4];
-    ChannelRowProcessor<ChunkSampleCollector<UpTo8Bits>, UpTo8Bits>
-        row_sample_collectors[4];
-    for (size_t c = 0; c < nb_chans; c++) {
-      row_sample_collectors[c].t = &sample_collectors[c];
-      sample_collectors[c].raw_counts = raw_counts[is_single_group ? 1 : 0];
-      sample_collectors[c].lz77_counts = lz77_counts[is_single_group ? 1 : 0];
-    }
-    ProcessImageAreaPalette<
-        ChannelRowProcessor<ChunkSampleCollector<UpTo8Bits>, UpTo8Bits>>(
-        rgba, x0, y0, xs, 1, 1 + row_count, row_stride, lookup, nb_chans,
-        row_sample_collectors);
-  } else {
-    ChunkSampleCollector<BitDepth> sample_collectors[4];
-    ChannelRowProcessor<ChunkSampleCollector<BitDepth>, BitDepth>
-        row_sample_collectors[4];
-    for (size_t c = 0; c < nb_chans; c++) {
-      row_sample_collectors[c].t = &sample_collectors[c];
-      sample_collectors[c].raw_counts = raw_counts[c];
-      sample_collectors[c].lz77_counts = lz77_counts[c];
-    }
-    ProcessImageArea<
-        ChannelRowProcessor<ChunkSampleCollector<BitDepth>, BitDepth>>(
-        rgba, x0, y0, xs, 1, 1 + row_count, row_stride, bitdepth, nb_chans,
-        big_endian, row_sample_collectors);
-  }
-}
-
-void PrepareDCGlobalPalette(bool is_single_group, size_t width, size_t height,
-                            size_t nb_chans, const PrefixCode code[4],
-                            const std::vector<uint32_t>& palette,
-                            size_t pcolors, BitWriter* output) {
-  PrepareDCGlobalCommon(is_single_group, width, height, code, output);
-  output->Write(2, 0b01);     // 1 transform
-  output->Write(2, 0b01);     // Palette
-  output->Write(5, 0b00000);  // Starting from ch 0
-  if (nb_chans == 1) {
-    output->Write(2, 0b00);  // 1-channel palette (Gray)
-  } else if (nb_chans == 3) {
-    output->Write(2, 0b01);  // 3-channel palette (RGB)
-  } else if (nb_chans == 4) {
-    output->Write(2, 0b10);  // 4-channel palette (RGBA)
-  } else {
-    output->Write(2, 0b11);
-    output->Write(13, nb_chans - 1);
-  }
-  // pcolors <= kMaxColors + kChunkSize - 1
-  static_assert(kMaxColors + kChunkSize < 1281,
-                "add code to signal larger palette sizes");
-  if (pcolors < 256) {
-    output->Write(2, 0b00);
-    output->Write(8, pcolors);
-  } else {
-    output->Write(2, 0b01);
-    output->Write(10, pcolors - 256);
-  }
-
-  output->Write(2, 0b00);  // nb_deltas == 0
-  output->Write(4, 0);     // Zero predictor for delta palette
-  // Encode palette
-  ChunkEncoder<UpTo8Bits> encoder;
-  ChannelRowProcessor<ChunkEncoder<UpTo8Bits>, UpTo8Bits> row_encoder;
-  row_encoder.t = &encoder;
-  encoder.output = output;
-  encoder.code = &code[0];
-  encoder.PrepareForSimd();
-  int16_t p[4][32 + 1024] = {};
-  size_t i = 0;
-  size_t have_zero = 1;
-  for (; i < pcolors; i++) {
-    p[0][16 + i + have_zero] = palette[i] & 0xFF;
-    p[1][16 + i + have_zero] = (palette[i] >> 8) & 0xFF;
-    p[2][16 + i + have_zero] = (palette[i] >> 16) & 0xFF;
-    p[3][16 + i + have_zero] = (palette[i] >> 24) & 0xFF;
-  }
-  p[0][15] = 0;
-  row_encoder.ProcessRow(p[0] + 16, p[0] + 15, p[0] + 15, p[0] + 15, pcolors);
-  p[1][15] = p[0][16];
-  p[0][15] = p[0][16];
-  if (nb_chans > 1) {
-    row_encoder.ProcessRow(p[1] + 16, p[1] + 15, p[0] + 16, p[0] + 15, pcolors);
-  }
-  p[2][15] = p[1][16];
-  p[1][15] = p[1][16];
-  if (nb_chans > 2) {
-    row_encoder.ProcessRow(p[2] + 16, p[2] + 15, p[1] + 16, p[1] + 15, pcolors);
-  }
-  p[3][15] = p[2][16];
-  p[2][15] = p[2][16];
-  if (nb_chans > 3) {
-    row_encoder.ProcessRow(p[3] + 16, p[3] + 15, p[2] + 16, p[2] + 15, pcolors);
-  }
-  row_encoder.Finalize();
-
-  if (!is_single_group) {
-    output->ZeroPadToByte();
-  }
-}
-
-template <size_t nb_chans>
-bool detect_palette(const unsigned char* r, size_t width,
-                    std::vector<uint32_t>& palette) {
-  size_t x = 0;
-  bool collided = false;
-  // this is just an unrolling of the next loop
-  size_t look_ahead = 7 + ((nb_chans == 1) ? 3 : ((nb_chans < 4) ? 1 : 0));
-  for (; x + look_ahead < width; x += 8) {
-    uint32_t p[8] = {}, index[8];
-    for (int i = 0; i < 8; i++) {
-      for (int j = 0; j < 4; ++j) {
-        p[i] |= r[(x + i) * nb_chans + j] << (8 * j);
-      }
-    }
-    for (int i = 0; i < 8; i++) p[i] &= ((1llu << (8 * nb_chans)) - 1);
-    for (int i = 0; i < 8; i++) index[i] = pixel_hash(p[i]);
-    for (int i = 0; i < 8; i++) {
-      collided |= (palette[index[i]] != 0 && p[i] != palette[index[i]]);
-    }
-    for (int i = 0; i < 8; i++) palette[index[i]] = p[i];
-  }
-  for (; x < width; x++) {
-    uint32_t p = 0;
-    for (size_t i = 0; i < nb_chans; ++i) {
-      p |= r[x * nb_chans + i] << (8 * i);
-    }
-    uint32_t index = pixel_hash(p);
-    collided |= (palette[index] != 0 && p != palette[index]);
-    palette[index] = p;
-  }
-  return collided;
-}
-
-template <typename BitDepth>
-JxlFastLosslessFrameState* LLPrepare(JxlChunkedFrameInputSource input,
-                                     size_t width, size_t height,
-                                     BitDepth bitdepth, size_t nb_chans,
-                                     bool big_endian, int effort, int oneshot) {
-  assert(width != 0);
-  assert(height != 0);
-
-  // Count colors to try palette
-  std::vector<uint32_t> palette(kHashSize);
-  std::vector<int16_t> lookup(kHashSize);
-  lookup[0] = 0;
-  int pcolors = 0;
-  bool collided = effort < 2 || bitdepth.bitdepth != 8 || !oneshot;
-  for (size_t y0 = 0; y0 < height && !collided; y0 += 256) {
-    size_t ys = std::min<size_t>(height - y0, 256);
-    for (size_t x0 = 0; x0 < width && !collided; x0 += 256) {
-      size_t xs = std::min<size_t>(width - x0, 256);
-      size_t stride;
-      // TODO(szabadka): Add RAII wrapper around this.
-      const void* buffer = input.get_color_channel_data_at(input.opaque, x0, y0,
-                                                           xs, ys, &stride);
-      auto rgba = reinterpret_cast<const unsigned char*>(buffer);
-      for (size_t y = 0; y < ys && !collided; y++) {
-        const unsigned char* r = rgba + stride * y;
-        if (nb_chans == 1) collided = detect_palette<1>(r, xs, palette);
-        if (nb_chans == 2) collided = detect_palette<2>(r, xs, palette);
-        if (nb_chans == 3) collided = detect_palette<3>(r, xs, palette);
-        if (nb_chans == 4) collided = detect_palette<4>(r, xs, palette);
-      }
-      input.release_buffer(input.opaque, buffer);
-    }
-  }
-  int nb_entries = 0;
-  if (!collided) {
-    pcolors = 1;  // always have all-zero as a palette color
-    bool have_color = false;
-    uint8_t minG = 255, maxG = 0;
-    for (uint32_t k = 0; k < kHashSize; k++) {
-      if (palette[k] == 0) continue;
-      uint8_t p[4];
-      for (int i = 0; i < 4; ++i) {
-        p[i] = (palette[k] >> (8 * i)) & 0xFF;
-      }
-      // move entries to front so sort has less work
-      palette[nb_entries] = palette[k];
-      if (p[0] != p[1] || p[0] != p[2]) have_color = true;
-      if (p[1] < minG) minG = p[1];
-      if (p[1] > maxG) maxG = p[1];
-      nb_entries++;
-      // don't do palette if too many colors are needed
-      if (nb_entries + pcolors > kMaxColors) {
-        collided = true;
-        break;
-      }
-    }
-    if (!have_color) {
-      // don't do palette if it's just grayscale without many holes
-      if (maxG - minG < nb_entries * 1.4f) collided = true;
-    }
-  }
-  if (!collided) {
-    std::sort(
-        palette.begin(), palette.begin() + nb_entries,
-        [&nb_chans](uint32_t ap, uint32_t bp) {
-          if (ap == 0) return false;
-          if (bp == 0) return true;
-          uint8_t a[4], b[4];
-          for (int i = 0; i < 4; ++i) {
-            a[i] = (ap >> (8 * i)) & 0xFF;
-            b[i] = (bp >> (8 * i)) & 0xFF;
-          }
-          float ay, by;
-          if (nb_chans == 4) {
-            ay = (0.299f * a[0] + 0.587f * a[1] + 0.114f * a[2] + 0.01f) * a[3];
-            by = (0.299f * b[0] + 0.587f * b[1] + 0.114f * b[2] + 0.01f) * b[3];
-          } else {
-            ay = (0.299f * a[0] + 0.587f * a[1] + 0.114f * a[2] + 0.01f);
-            by = (0.299f * b[0] + 0.587f * b[1] + 0.114f * b[2] + 0.01f);
-          }
-          return ay < by;  // sort on alpha*luma
-        });
-    for (int k = 0; k < nb_entries; k++) {
-      if (palette[k] == 0) break;
-      lookup[pixel_hash(palette[k])] = pcolors++;
-    }
-  }
-
-  size_t num_groups_x = (width + 255) / 256;
-  size_t num_groups_y = (height + 255) / 256;
-  size_t num_dc_groups_x = (width + 2047) / 2048;
-  size_t num_dc_groups_y = (height + 2047) / 2048;
-
-  uint64_t raw_counts[4][kNumRawSymbols] = {};
-  uint64_t lz77_counts[4][kNumLZ77] = {};
-
-  bool onegroup = num_groups_x == 1 && num_groups_y == 1;
-
-  auto sample_rows = [&](size_t xg, size_t yg, size_t num_rows) {
-    size_t y0 = yg * 256;
-    size_t x0 = xg * 256;
-    size_t ys = std::min<size_t>(height - y0, 256);
-    size_t xs = std::min<size_t>(width - x0, 256);
-    size_t stride;
-    const void* buffer =
-        input.get_color_channel_data_at(input.opaque, x0, y0, xs, ys, &stride);
-    auto rgba = reinterpret_cast<const unsigned char*>(buffer);
-    int y_begin_group =
-        std::max<ssize_t>(
-            0, static_cast<ssize_t>(ys) - static_cast<ssize_t>(num_rows)) /
-        2;
-    int y_count = std::min<int>(num_rows, ys - y_begin_group);
-    int x_max = xs / kChunkSize * kChunkSize;
-    CollectSamples(rgba, 0, y_begin_group, x_max, stride, y_count, raw_counts,
-                   lz77_counts, onegroup, !collided, bitdepth, nb_chans,
-                   big_endian, lookup.data());
-    input.release_buffer(input.opaque, buffer);
-  };
-
-  // TODO(veluca): that `64` is an arbitrary constant, meant to correspond to
-  // the point where the number of processed rows is large enough that loading
-  // the entire image is cost-effective.
-  if (oneshot || effort >= 64) {
-    for (size_t g = 0; g < num_groups_y * num_groups_x; g++) {
-      size_t xg = g % num_groups_x;
-      size_t yg = g / num_groups_x;
-      size_t y0 = yg * 256;
-      size_t ys = std::min<size_t>(height - y0, 256);
-      size_t num_rows = 2 * effort * ys / 256;
-      sample_rows(xg, yg, num_rows);
-    }
-  } else {
-    // sample the middle (effort * 2 * num_groups) rows of the center group
-    // (possibly all of them).
-    sample_rows((num_groups_x - 1) / 2, (num_groups_y - 1) / 2,
-                2 * effort * num_groups_x * num_groups_y);
-  }
-
-  // TODO(veluca): can probably improve this and make it bitdepth-dependent.
-  uint64_t base_raw_counts[kNumRawSymbols] = {
-      3843, 852, 1270, 1214, 1014, 727, 481, 300, 159, 51,
-      5,    1,   1,    1,    1,    1,   1,   1,   1};
-
-  bool doing_ycocg = nb_chans > 2 && collided;
-  bool large_palette = !collided || pcolors >= 256;
-  for (size_t i = bitdepth.NumSymbols(doing_ycocg || large_palette);
-       i < kNumRawSymbols; i++) {
-    base_raw_counts[i] = 0;
-  }
-
-  for (size_t c = 0; c < 4; c++) {
-    for (size_t i = 0; i < kNumRawSymbols; i++) {
-      raw_counts[c][i] = (raw_counts[c][i] << 8) + base_raw_counts[i];
-    }
-  }
-
-  if (!collided) {
-    unsigned token, nbits, bits;
-    EncodeHybridUint000(PackSigned(pcolors - 1), &token, &nbits, &bits);
-    // ensure all palette indices can actually be encoded
-    for (size_t i = 0; i < token + 1; i++)
-      raw_counts[0][i] = std::max<uint64_t>(raw_counts[0][i], 1);
-    // these tokens are only used for the palette itself so they can get a bad
-    // code
-    for (size_t i = token + 1; i < 10; i++) raw_counts[0][i] = 1;
-  }
-
-  uint64_t base_lz77_counts[kNumLZ77] = {
-      29, 27, 25,  23, 21, 21, 19, 18, 21, 17, 16, 15, 15, 14,
-      13, 13, 137, 98, 61, 34, 1,  1,  1,  1,  1,  1,  1,  1,
-  };
-
-  for (size_t c = 0; c < 4; c++) {
-    for (size_t i = 0; i < kNumLZ77; i++) {
-      lz77_counts[c][i] = (lz77_counts[c][i] << 8) + base_lz77_counts[i];
-    }
-  }
-
-  JxlFastLosslessFrameState* frame_state = new JxlFastLosslessFrameState();
-  for (size_t i = 0; i < 4; i++) {
-    frame_state->hcode[i] = PrefixCode(bitdepth, raw_counts[i], lz77_counts[i]);
-  }
-
-  size_t num_dc_groups = num_dc_groups_x * num_dc_groups_y;
-  size_t num_ac_groups = num_groups_x * num_groups_y;
-  size_t num_groups = onegroup ? 1 : (2 + num_dc_groups + num_ac_groups);
-  frame_state->input = input;
-  frame_state->width = width;
-  frame_state->height = height;
-  frame_state->num_groups_x = num_groups_x;
-  frame_state->num_groups_y = num_groups_y;
-  frame_state->num_dc_groups_x = num_dc_groups_x;
-  frame_state->num_dc_groups_y = num_dc_groups_y;
-  frame_state->nb_chans = nb_chans;
-  frame_state->bitdepth = bitdepth.bitdepth;
-  frame_state->big_endian = big_endian;
-  frame_state->effort = effort;
-  frame_state->collided = collided;
-  frame_state->lookup = lookup;
-
-  frame_state->group_data = std::vector<std::array<BitWriter, 4>>(num_groups);
-  frame_state->group_sizes.resize(num_groups);
-  if (collided) {
-    PrepareDCGlobal(onegroup, width, height, nb_chans, frame_state->hcode,
-                    &frame_state->group_data[0][0]);
-  } else {
-    PrepareDCGlobalPalette(onegroup, width, height, nb_chans,
-                           frame_state->hcode, palette, pcolors,
-                           &frame_state->group_data[0][0]);
-  }
-  frame_state->group_sizes[0] = SectionSize(frame_state->group_data[0]);
-  if (!onegroup) {
-    ComputeAcGroupDataOffset(frame_state->group_sizes[0], num_dc_groups,
-                             num_ac_groups, frame_state->min_dc_global_size,
-                             frame_state->ac_group_data_offset);
-  }
-
-  return frame_state;
-}
-
-template <typename BitDepth>
-jxl::Status LLProcess(JxlFastLosslessFrameState* frame_state, bool is_last,
-                      BitDepth bitdepth, void* runner_opaque,
-                      FJxlParallelRunner runner,
-                      JxlEncoderOutputProcessorWrapper* output_processor) {
-#if !FJXL_STANDALONE
-  if (frame_state->process_done) {
-    JxlFastLosslessPrepareHeader(frame_state, /*add_image_header=*/0, is_last);
-    if (output_processor) {
-      JXL_RETURN_IF_ERROR(
-          JxlFastLosslessOutputFrame(frame_state, output_processor));
-    }
-    return true;
-  }
-#endif
-  // The maximum number of groups that we process concurrently here.
-  // TODO(szabadka) Use the number of threads or some outside parameter for the
-  // maximum memory usage instead.
-  constexpr size_t kMaxLocalGroups = 16;
-  bool onegroup = frame_state->group_sizes.size() == 1;
-  bool streaming = !onegroup && output_processor;
-  size_t total_groups = frame_state->num_groups_x * frame_state->num_groups_y;
-  size_t max_groups = streaming ? kMaxLocalGroups : total_groups;
-#if !FJXL_STANDALONE
-  size_t start_pos = 0;
-  if (streaming) {
-    start_pos = output_processor->CurrentPosition();
-    JXL_RETURN_IF_ERROR(
-        output_processor->Seek(start_pos + frame_state->ac_group_data_offset));
-  }
-#endif
-  for (size_t offset = 0; offset < total_groups; offset += max_groups) {
-    size_t num_groups = std::min(max_groups, total_groups - offset);
-    JxlFastLosslessFrameState local_frame_state;
-    if (streaming) {
-      local_frame_state.group_data =
-          std::vector<std::array<BitWriter, 4>>(num_groups);
-    }
-    auto run_one = [&](size_t i) {
-      size_t g = offset + i;
-      size_t xg = g % frame_state->num_groups_x;
-      size_t yg = g / frame_state->num_groups_x;
-      size_t num_dc_groups =
-          frame_state->num_dc_groups_x * frame_state->num_dc_groups_y;
-      size_t group_id = onegroup ? 0 : (2 + num_dc_groups + g);
-      size_t xs = std::min<size_t>(frame_state->width - xg * 256, 256);
-      size_t ys = std::min<size_t>(frame_state->height - yg * 256, 256);
-      size_t x0 = xg * 256;
-      size_t y0 = yg * 256;
-      size_t stride;
-      JxlChunkedFrameInputSource input = frame_state->input;
-      const void* buffer = input.get_color_channel_data_at(input.opaque, x0, y0,
-                                                           xs, ys, &stride);
-      const unsigned char* rgba =
-          reinterpret_cast<const unsigned char*>(buffer);
-
-      auto& gd = streaming ? local_frame_state.group_data[i]
-                           : frame_state->group_data[group_id];
-      if (frame_state->collided) {
-        WriteACSection(rgba, 0, 0, xs, ys, stride, onegroup, bitdepth,
-                       frame_state->nb_chans, frame_state->big_endian,
-                       frame_state->hcode, gd);
-      } else {
-        WriteACSectionPalette(rgba, 0, 0, xs, ys, stride, onegroup,
-                              frame_state->hcode, frame_state->lookup.data(),
-                              frame_state->nb_chans, gd[0]);
-      }
-      frame_state->group_sizes[group_id] = SectionSize(gd);
-      input.release_buffer(input.opaque, buffer);
-    };
-    runner(
-        runner_opaque, &run_one,
-        +[](void* r, size_t i) {
-          (*reinterpret_cast<decltype(&run_one)>(r))(i);
-        },
-        num_groups);
-#if !FJXL_STANDALONE
-    if (streaming) {
-      local_frame_state.nb_chans = frame_state->nb_chans;
-      local_frame_state.current_bit_writer = 1;
-      JXL_RETURN_IF_ERROR(
-          JxlFastLosslessOutputFrame(&local_frame_state, output_processor));
-    }
-#endif
-  }
-#if !FJXL_STANDALONE
-  if (streaming) {
-    size_t end_pos = output_processor->CurrentPosition();
-    JXL_RETURN_IF_ERROR(output_processor->Seek(start_pos));
-    frame_state->group_data.resize(1);
-    bool have_alpha = frame_state->nb_chans == 2 || frame_state->nb_chans == 4;
-    size_t padding = ComputeDcGlobalPadding(
-        frame_state->group_sizes, frame_state->ac_group_data_offset,
-        frame_state->min_dc_global_size, have_alpha, is_last);
-
-    for (size_t i = 0; i < padding; ++i) {
-      frame_state->group_data[0][0].Write(8, 0);
-    }
-    frame_state->group_sizes[0] += padding;
-    JxlFastLosslessPrepareHeader(frame_state, /*add_image_header=*/0, is_last);
-    assert(frame_state->ac_group_data_offset ==
-           JxlFastLosslessOutputSize(frame_state));
-    JXL_RETURN_IF_ERROR(
-        JxlFastLosslessOutputHeaders(frame_state, output_processor));
-    JXL_RETURN_IF_ERROR(output_processor->Seek(end_pos));
-  } else if (output_processor) {
-    assert(onegroup);
-    JxlFastLosslessPrepareHeader(frame_state, /*add_image_header=*/0, is_last);
-    if (output_processor) {
-      JXL_RETURN_IF_ERROR(
-          JxlFastLosslessOutputFrame(frame_state, output_processor));
-    }
-  }
-  frame_state->process_done = true;
-#endif
-  return true;
-}
-
-JxlFastLosslessFrameState* JxlFastLosslessPrepareImpl(
-    JxlChunkedFrameInputSource input, size_t width, size_t height,
-    size_t nb_chans, size_t bitdepth, bool big_endian, int effort,
-    int oneshot) {
-  assert(bitdepth > 0);
-  assert(nb_chans <= 4);
-  assert(nb_chans != 0);
-  if (bitdepth <= 8) {
-    return LLPrepare(input, width, height, UpTo8Bits(bitdepth), nb_chans,
-                     big_endian, effort, oneshot);
-  }
-  if (bitdepth <= 13) {
-    return LLPrepare(input, width, height, From9To13Bits(bitdepth), nb_chans,
-                     big_endian, effort, oneshot);
-  }
-  if (bitdepth == 14) {
-    return LLPrepare(input, width, height, Exactly14Bits(bitdepth), nb_chans,
-                     big_endian, effort, oneshot);
-  }
-  return LLPrepare(input, width, height, MoreThan14Bits(bitdepth), nb_chans,
-                   big_endian, effort, oneshot);
-}
-
-jxl::Status JxlFastLosslessProcessFrameImpl(
-    JxlFastLosslessFrameState* frame_state, bool is_last, void* runner_opaque,
-    FJxlParallelRunner runner,
-    JxlEncoderOutputProcessorWrapper* output_processor) {
-  const size_t bitdepth = frame_state->bitdepth;
-  if (bitdepth <= 8) {
-    JXL_RETURN_IF_ERROR(LLProcess(frame_state, is_last, UpTo8Bits(bitdepth),
-                                  runner_opaque, runner, output_processor));
-  } else if (bitdepth <= 13) {
-    JXL_RETURN_IF_ERROR(LLProcess(frame_state, is_last, From9To13Bits(bitdepth),
-                                  runner_opaque, runner, output_processor));
-  } else if (bitdepth == 14) {
-    JXL_RETURN_IF_ERROR(LLProcess(frame_state, is_last, Exactly14Bits(bitdepth),
-                                  runner_opaque, runner, output_processor));
-  } else {
-    JXL_RETURN_IF_ERROR(LLProcess(frame_state, is_last,
-                                  MoreThan14Bits(bitdepth), runner_opaque,
-                                  runner, output_processor));
-  }
-  return true;
-}
-
-}  // namespace
-
-#endif  // FJXL_SELF_INCLUDE
-
-#ifndef FJXL_SELF_INCLUDE
-
-#define FJXL_SELF_INCLUDE
-
-// If we have NEON enabled, it is the default target.
-#if FJXL_ENABLE_NEON
-
-namespace default_implementation {
-#define FJXL_NEON
-#include "lib/jxl/enc_fast_lossless.cc"
-#undef FJXL_NEON
-}  // namespace default_implementation
-
-#else                                    // FJXL_ENABLE_NEON
-
-namespace default_implementation {
-#include "lib/jxl/enc_fast_lossless.cc"  // NOLINT
-}
-
-#if FJXL_ENABLE_AVX2
-#ifdef __clang__
-#pragma clang attribute push(__attribute__((target("avx,avx2"))), \
-                             apply_to = function)
-// Causes spurious warnings on clang5.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wmissing-braces"
-#elif defined(__GNUC__)
-#pragma GCC push_options
-// Seems to cause spurious errors on GCC8.
-#pragma GCC diagnostic ignored "-Wpsabi"
-#pragma GCC target "avx,avx2"
-#endif
-
-namespace AVX2 {
-#define FJXL_AVX2
-#include "lib/jxl/enc_fast_lossless.cc"  // NOLINT
-#undef FJXL_AVX2
-}  // namespace AVX2
-
-#ifdef __clang__
-#pragma clang attribute pop
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#pragma GCC pop_options
-#endif
-#endif  // FJXL_ENABLE_AVX2
-
-#if FJXL_ENABLE_AVX512
-#ifdef __clang__
-#pragma clang attribute push(                                                 \
-    __attribute__((target("avx512cd,avx512bw,avx512vl,avx512f,avx512vbmi"))), \
-    apply_to = function)
-#elif defined(__GNUC__)
-#pragma GCC push_options
-#pragma GCC target "avx512cd,avx512bw,avx512vl,avx512f,avx512vbmi"
-#endif
-
-namespace AVX512 {
-#define FJXL_AVX512
-#include "lib/jxl/enc_fast_lossless.cc"
-#undef FJXL_AVX512
-}  // namespace AVX512
-
-#ifdef __clang__
-#pragma clang attribute pop
-#elif defined(__GNUC__)
-#pragma GCC pop_options
-#endif
-#endif  // FJXL_ENABLE_AVX512
-
-#endif
-
-extern "C" {
-
-#if FJXL_STANDALONE
-class FJxlFrameInput {
- public:
-  FJxlFrameInput(const unsigned char* rgba, size_t row_stride, size_t nb_chans,
-                 size_t bitdepth)
-      : rgba_(rgba),
-        row_stride_(row_stride),
-        bytes_per_pixel_(bitdepth <= 8 ? nb_chans : 2 * nb_chans) {}
-
-  JxlChunkedFrameInputSource GetInputSource() {
-    return JxlChunkedFrameInputSource{this, GetDataAt,
-                                      [](void*, const void*) {}};
-  }
-
- private:
-  static const void* GetDataAt(void* opaque, size_t xpos, size_t ypos,
-                               size_t xsize, size_t ysize, size_t* row_offset) {
-    FJxlFrameInput* self = static_cast<FJxlFrameInput*>(opaque);
-    *row_offset = self->row_stride_;
-    return self->rgba_ + ypos * (*row_offset) + xpos * self->bytes_per_pixel_;
-  }
-
-  const uint8_t* rgba_;
-  size_t row_stride_;
-  size_t bytes_per_pixel_;
-};
-
-size_t JxlFastLosslessEncode(const unsigned char* rgba, size_t width,
-                             size_t row_stride, size_t height, size_t nb_chans,
-                             size_t bitdepth, bool big_endian, int effort,
-                             unsigned char** output, void* runner_opaque,
-                             FJxlParallelRunner runner) {
-  FJxlFrameInput input(rgba, row_stride, nb_chans, bitdepth);
-  auto frame_state = JxlFastLosslessPrepareFrame(
-      input.GetInputSource(), width, height, nb_chans, bitdepth, big_endian,
-      effort, /*oneshot=*/true);
-  if (!JxlFastLosslessProcessFrame(frame_state, /*is_last=*/true, runner_opaque,
-                                   runner, nullptr)) {
-    return 0;
-  }
-  JxlFastLosslessPrepareHeader(frame_state, /*add_image_header=*/1,
-                               /*is_last=*/1);
-  size_t output_size = JxlFastLosslessMaxRequiredOutput(frame_state);
-  *output = (unsigned char*)malloc(output_size);
-  size_t written = 0;
-  size_t total = 0;
-  while ((written = JxlFastLosslessWriteOutput(frame_state, *output + total,
-                                               output_size - total)) != 0) {
-    total += written;
-  }
-  JxlFastLosslessFreeFrameState(frame_state);
-  return total;
-}
-#endif
-
-JxlFastLosslessFrameState* JxlFastLosslessPrepareFrame(
-    JxlChunkedFrameInputSource input, size_t width, size_t height,
-    size_t nb_chans, size_t bitdepth, bool big_endian, int effort,
-    int oneshot) {
-#if FJXL_ENABLE_AVX512
-  if (HasCpuFeature(CpuFeature::kAVX512CD) &&
-      HasCpuFeature(CpuFeature::kVBMI) &&
-      HasCpuFeature(CpuFeature::kAVX512BW) &&
-      HasCpuFeature(CpuFeature::kAVX512F) &&
-      HasCpuFeature(CpuFeature::kAVX512VL)) {
-    return AVX512::JxlFastLosslessPrepareImpl(
-        input, width, height, nb_chans, bitdepth, big_endian, effort, oneshot);
-  }
-#endif
-#if FJXL_ENABLE_AVX2
-  if (HasCpuFeature(CpuFeature::kAVX2)) {
-    return AVX2::JxlFastLosslessPrepareImpl(
-        input, width, height, nb_chans, bitdepth, big_endian, effort, oneshot);
-  }
-#endif
-
-  return default_implementation::JxlFastLosslessPrepareImpl(
-      input, width, height, nb_chans, bitdepth, big_endian, effort, oneshot);
-}
-
-bool JxlFastLosslessProcessFrame(
-    JxlFastLosslessFrameState* frame_state, bool is_last, void* runner_opaque,
-    FJxlParallelRunner runner,
-    JxlEncoderOutputProcessorWrapper* output_processor) {
-  auto trivial_runner =
-      +[](void*, void* opaque, void fun(void*, size_t), size_t count) {
-        for (size_t i = 0; i < count; i++) {
-          fun(opaque, i);
-        }
-      };
-
-  if (runner == nullptr) {
-    runner = trivial_runner;
-  }
-
-#if FJXL_ENABLE_AVX512
-  if (HasCpuFeature(CpuFeature::kAVX512CD) &&
-      HasCpuFeature(CpuFeature::kVBMI) &&
-      HasCpuFeature(CpuFeature::kAVX512BW) &&
-      HasCpuFeature(CpuFeature::kAVX512F) &&
-      HasCpuFeature(CpuFeature::kAVX512VL)) {
-    JXL_RETURN_IF_ERROR(AVX512::JxlFastLosslessProcessFrameImpl(
-        frame_state, is_last, runner_opaque, runner, output_processor));
-    return true;
-  }
-#endif
-#if FJXL_ENABLE_AVX2
-  if (HasCpuFeature(CpuFeature::kAVX2)) {
-    JXL_RETURN_IF_ERROR(AVX2::JxlFastLosslessProcessFrameImpl(
-        frame_state, is_last, runner_opaque, runner, output_processor));
-    return true;
-  }
-#endif
-
-  JXL_RETURN_IF_ERROR(default_implementation::JxlFastLosslessProcessFrameImpl(
-      frame_state, is_last, runner_opaque, runner, output_processor));
-  return true;
-}
-
-}  // extern "C"
-
-#if !FJXL_STANDALONE
-bool JxlFastLosslessOutputFrame(
-    JxlFastLosslessFrameState* frame_state,
-    JxlEncoderOutputProcessorWrapper* output_processor) {
-  size_t fl_size = JxlFastLosslessOutputSize(frame_state);
-  size_t written = 0;
-  while (written < fl_size) {
-    JXL_ASSIGN_OR_RETURN(auto buffer,
-                         output_processor->GetBuffer(32, fl_size - written));
-    size_t n =
-        JxlFastLosslessWriteOutput(frame_state, buffer.data(), buffer.size());
-    if (n == 0) break;
-    JXL_RETURN_IF_ERROR(buffer.advance(n));
-    written += n;
-  };
-  return true;
-}
-#endif
-
-#endif  // FJXL_SELF_INCLUDE
diff --git a/third_party/jpeg-xl/lib/jxl/enc_fast_lossless.h b/third_party/jpeg-xl/lib/jxl/enc_fast_lossless.h
deleted file mode 100644
index 9c370ab60b354..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_fast_lossless.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_FAST_LOSSLESS_H_
-#define LIB_JXL_ENC_FAST_LOSSLESS_H_
-#include <stdlib.h>
-
-// FJXL_STANDALONE=1 for a stand-alone jxl encoder
-// FJXL_STANDALONE=0 for use in libjxl to encode frames (but no image header)
-#ifndef FJXL_STANDALONE
-#define FJXL_STANDALONE 0
-#endif
-
-#if !FJXL_STANDALONE
-#include <jxl/encode.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if FJXL_STANDALONE
-// Simplified version of the streaming input source from jxl/encode.h
-// We only need this part to wrap the full image buffer in the standalone mode
-// and this way we don't need to depend on the jxl headers.
-struct JxlChunkedFrameInputSource {
-  void* opaque;
-  const void* (*get_color_channel_data_at)(void* opaque, size_t xpos,
-                                           size_t ypos, size_t xsize,
-                                           size_t ysize, size_t* row_offset);
-  void (*release_buffer)(void* opaque, const void* buf);
-};
-// The standalone version does not use this struct, but we define it here so
-// that we don't have to clutter all the function signatures with defines.
-struct JxlEncoderOutputProcessorWrapper {
-  int unused;
-};
-#endif
-
-// Simple encoding API.
-
-// A FJxlParallelRunner must call fun(opaque, i) for all i from 0 to count. It
-// may do so in parallel.
-typedef void(FJxlParallelRunner)(void* runner_opaque, void* opaque,
-                                 void fun(void*, size_t), size_t count);
-
-#if FJXL_STANDALONE
-// You may pass `nullptr` as a runner: encoding will be sequential.
-size_t JxlFastLosslessEncode(const unsigned char* rgba, size_t width,
-                             size_t row_stride, size_t height, size_t nb_chans,
-                             size_t bitdepth, bool big_endian, int effort,
-                             unsigned char** output, void* runner_opaque,
-                             FJxlParallelRunner runner);
-#endif
-
-// More complex API for cases in which you may want to allocate your own buffer
-// and other advanced use cases.
-
-// Opaque struct that represents an intermediate state of the computation.
-struct JxlFastLosslessFrameState;
-
-// Returned JxlFastLosslessFrameState must be freed by calling
-// JxlFastLosslessFreeFrameState.
-JxlFastLosslessFrameState* JxlFastLosslessPrepareFrame(
-    JxlChunkedFrameInputSource input, size_t width, size_t height,
-    size_t nb_chans, size_t bitdepth, bool big_endian, int effort, int oneshot);
-
-#if !FJXL_STANDALONE
-class JxlEncoderOutputProcessorWrapper;
-#endif
-
-bool JxlFastLosslessProcessFrame(
-    JxlFastLosslessFrameState* frame_state, bool is_last, void* runner_opaque,
-    FJxlParallelRunner runner,
-    JxlEncoderOutputProcessorWrapper* output_processor);
-
-// Prepare the (image/frame) header. You may encode animations by concatenating
-// the output of multiple frames, of which the first one has add_image_header =
-// 1 and subsequent ones have add_image_header = 0, and all frames but the last
-// one have is_last = 0.
-// (when FJXL_STANDALONE=0, add_image_header has to be 0)
-void JxlFastLosslessPrepareHeader(JxlFastLosslessFrameState* frame,
-                                  int add_image_header, int is_last);
-
-// Upper bound on the required output size, including any padding that may be
-// required by JxlFastLosslessWriteOutput. Cannot be called before
-// JxlFastLosslessPrepareHeader.
-size_t JxlFastLosslessMaxRequiredOutput(const JxlFastLosslessFrameState* frame);
-
-// Actual size of the frame once it is encoded. This is not identical to
-// JxlFastLosslessMaxRequiredOutput because JxlFastLosslessWriteOutput may
-// require extra padding.
-size_t JxlFastLosslessOutputSize(const JxlFastLosslessFrameState* frame);
-
-// Writes the frame to the given output buffer. Returns the number of bytes that
-// were written, which is at least 1 unless the entire output has been written
-// already. It is required that `output_size >= 32` when calling this function.
-// This function must be called repeatedly until it returns 0.
-size_t JxlFastLosslessWriteOutput(JxlFastLosslessFrameState* frame,
-                                  unsigned char* output, size_t output_size);
-
-// Frees the provided frame state.
-void JxlFastLosslessFreeFrameState(JxlFastLosslessFrameState* frame);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif
-
-#if !FJXL_STANDALONE
-bool JxlFastLosslessOutputFrame(
-    JxlFastLosslessFrameState* frame_state,
-    JxlEncoderOutputProcessorWrapper* output_process);
-#endif
-
-#endif  // LIB_JXL_ENC_FAST_LOSSLESS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_fields.cc b/third_party/jpeg-xl/lib/jxl/enc_fields.cc
deleted file mode 100644
index 4b1fff00f2fe5..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_fields.cc
+++ /dev/null
@@ -1,243 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_fields.h"
-
-#include <cinttypes>  // PRIu64
-
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/fields.h"
-
-namespace jxl {
-
-namespace {
-using ::jxl::fields_internal::VisitorBase;
-class WriteVisitor : public VisitorBase {
- public:
-  WriteVisitor(const size_t extension_bits, BitWriter* JXL_RESTRICT writer)
-      : extension_bits_(extension_bits), writer_(writer) {}
-
-  Status Bits(const size_t bits, const uint32_t /*default_value*/,
-              uint32_t* JXL_RESTRICT value) override {
-    ok_ &= BitsCoder::Write(bits, *value, writer_);
-    return true;
-  }
-  Status U32(const U32Enc enc, const uint32_t /*default_value*/,
-             uint32_t* JXL_RESTRICT value) override {
-    ok_ &= U32Coder::Write(enc, *value, writer_);
-    return true;
-  }
-
-  Status U64(const uint64_t /*default_value*/,
-             uint64_t* JXL_RESTRICT value) override {
-    ok_ &= U64Coder::Write(*value, writer_);
-    return true;
-  }
-
-  Status F16(const float /*default_value*/,
-             float* JXL_RESTRICT value) override {
-    ok_ &= F16Coder::Write(*value, writer_);
-    return true;
-  }
-
-  Status BeginExtensions(uint64_t* JXL_RESTRICT extensions) override {
-    JXL_QUIET_RETURN_IF_ERROR(VisitorBase::BeginExtensions(extensions));
-    if (*extensions == 0) {
-      JXL_ENSURE(extension_bits_ == 0);
-      return true;
-    }
-    // TODO(janwas): extend API to pass in array of extension_bits, one per
-    // extension. We currently ascribe all bits to the first extension, but
-    // this is only an encoder limitation. NOTE: extension_bits_ can be zero
-    // if an extension does not require any additional fields.
-    ok_ &= U64Coder::Write(extension_bits_, writer_);
-    // For each nonzero bit except the lowest/first (already written):
-    for (uint64_t remaining_extensions = *extensions & (*extensions - 1);
-         remaining_extensions != 0;
-         remaining_extensions &= remaining_extensions - 1) {
-      ok_ &= U64Coder::Write(0, writer_);
-    }
-    return true;
-  }
-  // EndExtensions = default.
-
-  Status OK() const { return ok_; }
-
- private:
-  const size_t extension_bits_;
-  BitWriter* JXL_RESTRICT writer_;
-  bool ok_ = true;
-};
-}  // namespace
-
-Status Bundle::Write(const Fields& fields, BitWriter* writer, LayerType layer,
-                     AuxOut* aux_out) {
-  size_t extension_bits;
-  size_t total_bits;
-  JXL_RETURN_IF_ERROR(Bundle::CanEncode(fields, &extension_bits, &total_bits));
-
-  return writer->WithMaxBits(total_bits, layer, aux_out, [&] {
-    WriteVisitor visitor(extension_bits, writer);
-    JXL_RETURN_IF_ERROR(visitor.VisitConst(fields));
-    return visitor.OK();
-  });
-}
-
-// Returns false if the value is too large to encode.
-Status BitsCoder::Write(const size_t bits, const uint32_t value,
-                        BitWriter* JXL_RESTRICT writer) {
-  if (value >= (1ULL << bits)) {
-    return JXL_FAILURE("Value %d too large to encode in %" PRIu64 " bits",
-                       value, static_cast<uint64_t>(bits));
-  }
-  writer->Write(bits, value);
-  return true;
-}
-
-// Returns false if the value is too large to encode.
-Status U32Coder::Write(const U32Enc enc, const uint32_t value,
-                       BitWriter* JXL_RESTRICT writer) {
-  uint32_t selector;
-  size_t total_bits;
-  JXL_RETURN_IF_ERROR(ChooseSelector(enc, value, &selector, &total_bits));
-
-  writer->Write(2, selector);
-
-  const U32Distr d = enc.GetDistr(selector);
-  if (!d.IsDirect()) {  // Nothing more to write for direct encoding
-    const uint32_t offset = d.Offset();
-    JXL_ENSURE(value >= offset);
-    writer->Write(total_bits - 2, value - offset);
-  }
-
-  return true;
-}
-
-// Returns false if the value is too large to encode.
-Status U64Coder::Write(uint64_t value, BitWriter* JXL_RESTRICT writer) {
-  if (value == 0) {
-    // Selector: use 0 bits, value 0
-    writer->Write(2, 0);
-  } else if (value <= 16) {
-    // Selector: use 4 bits, value 1..16
-    writer->Write(2, 1);
-    writer->Write(4, value - 1);
-  } else if (value <= 272) {
-    // Selector: use 8 bits, value 17..272
-    writer->Write(2, 2);
-    writer->Write(8, value - 17);
-  } else {
-    // Selector: varint, first a 12-bit group, after that per 8-bit group.
-    writer->Write(2, 3);
-    writer->Write(12, value & 4095);
-    value >>= 12;
-    int shift = 12;
-    while (value > 0 && shift < 60) {
-      // Indicate varint not done
-      writer->Write(1, 1);
-      writer->Write(8, value & 255);
-      value >>= 8;
-      shift += 8;
-    }
-    if (value > 0) {
-      // This only could happen if shift == N - 4.
-      writer->Write(1, 1);
-      writer->Write(4, value & 15);
-      // Implicitly closed sequence, no extra stop bit is required.
-    } else {
-      // Indicate end of varint
-      writer->Write(1, 0);
-    }
-  }
-
-  return true;
-}
-
-Status F16Coder::Write(float value, BitWriter* JXL_RESTRICT writer) {
-  uint32_t bits32;
-  memcpy(&bits32, &value, sizeof(bits32));
-  const uint32_t sign = bits32 >> 31;
-  const uint32_t biased_exp32 = (bits32 >> 23) & 0xFF;
-  const uint32_t mantissa32 = bits32 & 0x7FFFFF;
-
-  const int32_t exp = static_cast<int32_t>(biased_exp32) - 127;
-  if (JXL_UNLIKELY(exp > 15)) {
-    return JXL_FAILURE("Too big to encode, CanEncode should return false");
-  }
-
-  // Tiny or zero => zero.
-  if (exp < -24) {
-    writer->Write(16, 0);
-    return true;
-  }
-
-  uint32_t biased_exp16;
-  uint32_t mantissa16;
-
-  // exp = [-24, -15] => subnormal
-  if (JXL_UNLIKELY(exp < -14)) {
-    biased_exp16 = 0;
-    const uint32_t sub_exp = static_cast<uint32_t>(-14 - exp);
-    JXL_ENSURE(1 <= sub_exp && sub_exp < 11);
-    mantissa16 = (1 << (10 - sub_exp)) + (mantissa32 >> (13 + sub_exp));
-  } else {
-    // exp = [-14, 15]
-    biased_exp16 = static_cast<uint32_t>(exp + 15);
-    JXL_ENSURE(1 <= biased_exp16 && biased_exp16 < 31);
-    mantissa16 = mantissa32 >> 13;
-  }
-
-  JXL_ENSURE(mantissa16 < 1024);
-  const uint32_t bits16 = (sign << 15) | (biased_exp16 << 10) | mantissa16;
-  JXL_ENSURE(bits16 < 0x10000);
-  writer->Write(16, bits16);
-  return true;
-}
-
-Status WriteCodestreamHeaders(CodecMetadata* metadata, BitWriter* writer,
-                              AuxOut* aux_out) {
-  // Marker/signature
-  JXL_RETURN_IF_ERROR(writer->WithMaxBits(16, LayerType::Header, aux_out, [&] {
-    writer->Write(8, 0xFF);
-    writer->Write(8, kCodestreamMarker);
-    return true;
-  }));
-
-  JXL_RETURN_IF_ERROR(
-      WriteSizeHeader(metadata->size, writer, LayerType::Header, aux_out));
-
-  JXL_RETURN_IF_ERROR(
-      WriteImageMetadata(metadata->m, writer, LayerType::Header, aux_out));
-
-  metadata->transform_data.nonserialized_xyb_encoded = metadata->m.xyb_encoded;
-  JXL_RETURN_IF_ERROR(Bundle::Write(metadata->transform_data, writer,
-                                    LayerType::Header, aux_out));
-
-  return true;
-}
-
-Status WriteFrameHeader(const FrameHeader& frame,
-                        BitWriter* JXL_RESTRICT writer, AuxOut* aux_out) {
-  return Bundle::Write(frame, writer, LayerType::Header, aux_out);
-}
-
-Status WriteImageMetadata(const ImageMetadata& metadata,
-                          BitWriter* JXL_RESTRICT writer, LayerType layer,
-                          AuxOut* aux_out) {
-  return Bundle::Write(metadata, writer, layer, aux_out);
-}
-
-Status WriteQuantizerParams(const QuantizerParams& params,
-                            BitWriter* JXL_RESTRICT writer, LayerType layer,
-                            AuxOut* aux_out) {
-  return Bundle::Write(params, writer, layer, aux_out);
-}
-
-Status WriteSizeHeader(const SizeHeader& size, BitWriter* JXL_RESTRICT writer,
-                       LayerType layer, AuxOut* aux_out) {
-  return Bundle::Write(size, writer, layer, aux_out);
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_fields.h b/third_party/jpeg-xl/lib/jxl/enc_fields.h
deleted file mode 100644
index 79d4eba257457..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_fields.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_FIELDS_H_
-#define LIB_JXL_ENC_FIELDS_H_
-
-#include <cstdint>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/headers.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/quantizer.h"
-
-namespace jxl {
-
-struct AuxOut;
-enum class LayerType : uint8_t;
-
-// Write headers from the CodecMetadata. Also may modify nonserialized_...
-// fields of the metadata.
-Status WriteCodestreamHeaders(CodecMetadata* metadata, BitWriter* writer,
-                              AuxOut* aux_out);
-
-Status WriteFrameHeader(const FrameHeader& frame,
-                        BitWriter* JXL_RESTRICT writer, AuxOut* aux_out);
-
-Status WriteQuantizerParams(const QuantizerParams& params,
-                            BitWriter* JXL_RESTRICT writer, LayerType layer,
-                            AuxOut* aux_out);
-
-Status WriteSizeHeader(const SizeHeader& size, BitWriter* JXL_RESTRICT writer,
-                       LayerType layer, AuxOut* aux_out);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_FIELDS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_frame.cc b/third_party/jpeg-xl/lib/jxl/enc_frame.cc
deleted file mode 100644
index 66d1a5e92a2af..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_frame.cc
+++ /dev/null
@@ -1,2546 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_frame.h"
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <array>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <memory>
-#include <numeric>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/ac_context.h"
-#include "lib/jxl/ac_strategy.h"
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/override.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/chroma_from_luma.h"
-#include "lib/jxl/coeff_order.h"
-#include "lib/jxl/coeff_order_fwd.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/common.h"  // kMaxNumPasses
-#include "lib/jxl/dct_util.h"
-#include "lib/jxl/dec_external_image.h"
-#include "lib/jxl/enc_ac_strategy.h"
-#include "lib/jxl/enc_adaptive_quantization.h"
-#include "lib/jxl/enc_ans.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/enc_cache.h"
-#include "lib/jxl/enc_chroma_from_luma.h"
-#include "lib/jxl/enc_coeff_order.h"
-#include "lib/jxl/enc_context_map.h"
-#include "lib/jxl/enc_entropy_coder.h"
-#include "lib/jxl/enc_external_image.h"
-#include "lib/jxl/enc_fields.h"
-#include "lib/jxl/enc_group.h"
-#include "lib/jxl/enc_heuristics.h"
-#include "lib/jxl/enc_modular.h"
-#include "lib/jxl/enc_noise.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/enc_patch_dictionary.h"
-#include "lib/jxl/enc_photon_noise.h"
-#include "lib/jxl/enc_quant_weights.h"
-#include "lib/jxl/enc_splines.h"
-#include "lib/jxl/enc_toc.h"
-#include "lib/jxl/enc_xyb.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/jpeg/enc_jpeg_data.h"
-#include "lib/jxl/loop_filter.h"
-#include "lib/jxl/modular/options.h"
-#include "lib/jxl/quant_weights.h"
-#include "lib/jxl/quantizer.h"
-#include "lib/jxl/splines.h"
-#include "lib/jxl/toc.h"
-
-namespace jxl {
-
-Status ParamsPostInit(CompressParams* p) {
-  if (!p->manual_noise.empty() &&
-      p->manual_noise.size() != NoiseParams::kNumNoisePoints) {
-    return JXL_FAILURE("Invalid number of noise lut entries");
-  }
-  if (!p->manual_xyb_factors.empty() && p->manual_xyb_factors.size() != 3) {
-    return JXL_FAILURE("Invalid number of XYB quantization factors");
-  }
-  if (!p->modular_mode && p->butteraugli_distance == 0.0) {
-    p->butteraugli_distance = kMinButteraugliDistance;
-  }
-  if (p->original_butteraugli_distance == -1.0) {
-    p->original_butteraugli_distance = p->butteraugli_distance;
-  }
-  if (p->resampling <= 0) {
-    p->resampling = 1;
-    // For very low bit rates, using 2x2 resampling gives better results on
-    // most photographic images, with an adjusted butteraugli score chosen to
-    // give roughly the same amount of bits per pixel.
-    if (!p->already_downsampled && p->butteraugli_distance >= 20) {
-      p->resampling = 2;
-      p->butteraugli_distance = 6 + ((p->butteraugli_distance - 20) * 0.25);
-    }
-  }
-  if (p->ec_resampling <= 0) {
-    p->ec_resampling = p->resampling;
-  }
-  return true;
-}
-
-namespace {
-
-template <typename T>
-uint32_t GetBitDepth(JxlBitDepth bit_depth, const T& metadata,
-                     JxlPixelFormat format) {
-  if (bit_depth.type == JXL_BIT_DEPTH_FROM_PIXEL_FORMAT) {
-    return BitsPerChannel(format.data_type);
-  } else if (bit_depth.type == JXL_BIT_DEPTH_FROM_CODESTREAM) {
-    return metadata.bit_depth.bits_per_sample;
-  } else if (bit_depth.type == JXL_BIT_DEPTH_CUSTOM) {
-    return bit_depth.bits_per_sample;
-  } else {
-    return 0;
-  }
-}
-
-Status CopyColorChannels(JxlChunkedFrameInputSource input, Rect rect,
-                         const FrameInfo& frame_info,
-                         const ImageMetadata& metadata, ThreadPool* pool,
-                         Image3F* color, ImageF* alpha,
-                         bool* has_interleaved_alpha) {
-  JxlPixelFormat format = {4, JXL_TYPE_UINT8, JXL_NATIVE_ENDIAN, 0};
-  input.get_color_channels_pixel_format(input.opaque, &format);
-  *has_interleaved_alpha = format.num_channels == 2 || format.num_channels == 4;
-  size_t bits_per_sample =
-      GetBitDepth(frame_info.image_bit_depth, metadata, format);
-  size_t row_offset;
-  auto buffer = GetColorBuffer(input, rect.x0(), rect.y0(), rect.xsize(),
-                               rect.ysize(), &row_offset);
-  if (!buffer) {
-    return JXL_FAILURE("no buffer for color channels given");
-  }
-  size_t color_channels = frame_info.ib_needs_color_transform
-                              ? metadata.color_encoding.Channels()
-                              : 3;
-  if (format.num_channels < color_channels) {
-    return JXL_FAILURE("Expected %" PRIuS
-                       " color channels, received only %u channels",
-                       color_channels, format.num_channels);
-  }
-  const uint8_t* data = reinterpret_cast<const uint8_t*>(buffer.get());
-  for (size_t c = 0; c < color_channels; ++c) {
-    JXL_RETURN_IF_ERROR(ConvertFromExternalNoSizeCheck(
-        data, rect.xsize(), rect.ysize(), row_offset, bits_per_sample, format,
-        c, pool, &color->Plane(c)));
-  }
-  if (color_channels == 1) {
-    JXL_RETURN_IF_ERROR(CopyImageTo(color->Plane(0), &color->Plane(1)));
-    JXL_RETURN_IF_ERROR(CopyImageTo(color->Plane(0), &color->Plane(2)));
-  }
-  if (alpha) {
-    if (*has_interleaved_alpha) {
-      JXL_RETURN_IF_ERROR(ConvertFromExternalNoSizeCheck(
-          data, rect.xsize(), rect.ysize(), row_offset, bits_per_sample, format,
-          format.num_channels - 1, pool, alpha));
-    } else {
-      // if alpha is not passed, but it is expected, then assume
-      // it is all-opaque
-      FillImage(1.0f, alpha);
-    }
-  }
-  return true;
-}
-
-Status CopyExtraChannels(JxlChunkedFrameInputSource input, Rect rect,
-                         const FrameInfo& frame_info,
-                         const ImageMetadata& metadata,
-                         bool has_interleaved_alpha, ThreadPool* pool,
-                         std::vector<ImageF>* extra_channels) {
-  for (size_t ec = 0; ec < metadata.num_extra_channels; ec++) {
-    if (has_interleaved_alpha &&
-        metadata.extra_channel_info[ec].type == ExtraChannel::kAlpha) {
-      // Skip this alpha channel, but still request additional alpha channels
-      // if they exist.
-      has_interleaved_alpha = false;
-      continue;
-    }
-    JxlPixelFormat ec_format = {1, JXL_TYPE_UINT8, JXL_NATIVE_ENDIAN, 0};
-    input.get_extra_channel_pixel_format(input.opaque, ec, &ec_format);
-    ec_format.num_channels = 1;
-    size_t row_offset;
-    auto buffer =
-        GetExtraChannelBuffer(input, ec, rect.x0(), rect.y0(), rect.xsize(),
-                              rect.ysize(), &row_offset);
-    if (!buffer) {
-      return JXL_FAILURE("no buffer for extra channel given");
-    }
-    size_t bits_per_sample = GetBitDepth(
-        frame_info.image_bit_depth, metadata.extra_channel_info[ec], ec_format);
-    if (!ConvertFromExternalNoSizeCheck(
-            reinterpret_cast<const uint8_t*>(buffer.get()), rect.xsize(),
-            rect.ysize(), row_offset, bits_per_sample, ec_format, 0, pool,
-            &(*extra_channels)[ec])) {
-      return JXL_FAILURE("Failed to set buffer for extra channel");
-    }
-  }
-  return true;
-}
-
-void SetProgressiveMode(const CompressParams& cparams,
-                        ProgressiveSplitter* progressive_splitter) {
-  constexpr PassDefinition progressive_passes_dc_vlf_lf_full_ac[] = {
-      {/*num_coefficients=*/2, /*shift=*/0,
-       /*suitable_for_downsampling_of_at_least=*/4},
-      {/*num_coefficients=*/3, /*shift=*/0,
-       /*suitable_for_downsampling_of_at_least=*/2},
-      {/*num_coefficients=*/8, /*shift=*/0,
-       /*suitable_for_downsampling_of_at_least=*/0},
-  };
-  constexpr PassDefinition progressive_passes_dc_quant_ac_full_ac[] = {
-      {/*num_coefficients=*/8, /*shift=*/1,
-       /*suitable_for_downsampling_of_at_least=*/2},
-      {/*num_coefficients=*/8, /*shift=*/0,
-       /*suitable_for_downsampling_of_at_least=*/0},
-  };
-  bool progressive_mode = ApplyOverride(cparams.progressive_mode, false);
-  bool qprogressive_mode = ApplyOverride(cparams.qprogressive_mode, false);
-  if (cparams.custom_progressive_mode) {
-    progressive_splitter->SetProgressiveMode(*cparams.custom_progressive_mode);
-  } else if (qprogressive_mode) {
-    progressive_splitter->SetProgressiveMode(
-        ProgressiveMode{progressive_passes_dc_quant_ac_full_ac});
-  } else if (progressive_mode) {
-    progressive_splitter->SetProgressiveMode(
-        ProgressiveMode{progressive_passes_dc_vlf_lf_full_ac});
-  }
-}
-
-uint64_t FrameFlagsFromParams(const CompressParams& cparams) {
-  uint64_t flags = 0;
-
-  const float dist = cparams.butteraugli_distance;
-
-  // We don't add noise at low butteraugli distances because the original
-  // noise is stored within the compressed image and adding noise makes things
-  // worse.
-  if (ApplyOverride(cparams.noise, dist >= kMinButteraugliForNoise) ||
-      cparams.photon_noise_iso > 0 ||
-      cparams.manual_noise.size() == NoiseParams::kNumNoisePoints) {
-    flags |= FrameHeader::kNoise;
-  }
-
-  if (cparams.progressive_dc > 0 && cparams.modular_mode == false) {
-    flags |= FrameHeader::kUseDcFrame;
-  }
-
-  return flags;
-}
-
-Status LoopFilterFromParams(const CompressParams& cparams, bool streaming_mode,
-                            FrameHeader* JXL_RESTRICT frame_header) {
-  LoopFilter* loop_filter = &frame_header->loop_filter;
-
-  // Gaborish defaults to enabled in Hare or slower.
-  loop_filter->gab = ApplyOverride(
-      cparams.gaborish, cparams.speed_tier <= SpeedTier::kHare &&
-                            frame_header->encoding == FrameEncoding::kVarDCT &&
-                            cparams.decoding_speed_tier < 4 &&
-                            cparams.butteraugli_distance > 0.5f &&
-                            !cparams.disable_perceptual_optimizations);
-
-  if (cparams.epf != -1) {
-    loop_filter->epf_iters = cparams.epf;
-  } else if (cparams.disable_perceptual_optimizations) {
-    loop_filter->epf_iters = 0;
-    return true;
-  } else {
-    if (frame_header->encoding == FrameEncoding::kModular) {
-      loop_filter->epf_iters = 0;
-    } else {
-      constexpr float kThresholds[3] = {0.7, 1.5, 4.0};
-      loop_filter->epf_iters = 0;
-      if (cparams.decoding_speed_tier < 3) {
-        for (size_t i = cparams.decoding_speed_tier == 2 ? 1 : 0; i < 3; i++) {
-          if (cparams.butteraugli_distance >= kThresholds[i]) {
-            loop_filter->epf_iters++;
-          }
-        }
-      }
-    }
-  }
-  // Strength of EPF in modular mode.
-  if (frame_header->encoding == FrameEncoding::kModular &&
-      !cparams.IsLossless()) {
-    // TODO(veluca): this formula is nonsense.
-    loop_filter->epf_sigma_for_modular =
-        std::max(cparams.butteraugli_distance, 1.0f);
-  }
-  if (frame_header->encoding == FrameEncoding::kModular &&
-      cparams.lossy_palette) {
-    loop_filter->epf_sigma_for_modular = 1.0f;
-  }
-
-  return true;
-}
-
-Status MakeFrameHeader(size_t xsize, size_t ysize,
-                       const CompressParams& cparams,
-                       const ProgressiveSplitter& progressive_splitter,
-                       const FrameInfo& frame_info,
-                       const jpeg::JPEGData* jpeg_data, bool streaming_mode,
-                       FrameHeader* JXL_RESTRICT frame_header) {
-  frame_header->nonserialized_is_preview = frame_info.is_preview;
-  frame_header->is_last = frame_info.is_last;
-  frame_header->save_before_color_transform =
-      frame_info.save_before_color_transform;
-  frame_header->frame_type = frame_info.frame_type;
-  frame_header->name = frame_info.name;
-
-  JXL_RETURN_IF_ERROR(progressive_splitter.InitPasses(&frame_header->passes));
-
-  if (cparams.modular_mode) {
-    frame_header->encoding = FrameEncoding::kModular;
-    if (cparams.modular_group_size_shift == -1) {
-      frame_header->group_size_shift = 1;
-      // no point using groups when only one group is full and the others are
-      // less than half full: multithreading will not really help much, while
-      // compression does suffer
-      if (xsize <= 400 && ysize <= 400) {
-        frame_header->group_size_shift = 2;
-      }
-    } else {
-      frame_header->group_size_shift = cparams.modular_group_size_shift;
-    }
-  }
-
-  if (jpeg_data) {
-    // we are transcoding a JPEG, so we don't get to choose
-    frame_header->encoding = FrameEncoding::kVarDCT;
-    frame_header->x_qm_scale = 2;
-    frame_header->b_qm_scale = 2;
-    JXL_RETURN_IF_ERROR(SetChromaSubsamplingFromJpegData(
-        *jpeg_data, &frame_header->chroma_subsampling));
-    JXL_RETURN_IF_ERROR(SetColorTransformFromJpegData(
-        *jpeg_data, &frame_header->color_transform));
-  } else {
-    frame_header->color_transform = cparams.color_transform;
-    if (!cparams.modular_mode &&
-        (frame_header->chroma_subsampling.MaxHShift() != 0 ||
-         frame_header->chroma_subsampling.MaxVShift() != 0)) {
-      return JXL_FAILURE(
-          "Chroma subsampling is not supported in VarDCT mode when not "
-          "recompressing JPEGs");
-    }
-  }
-  if (frame_header->color_transform != ColorTransform::kYCbCr &&
-      (frame_header->chroma_subsampling.MaxHShift() != 0 ||
-       frame_header->chroma_subsampling.MaxVShift() != 0)) {
-    return JXL_FAILURE(
-        "Chroma subsampling is not supported when color transform is not "
-        "YCbCr");
-  }
-
-  frame_header->flags = FrameFlagsFromParams(cparams);
-  // Non-photon noise is not supported in the Modular encoder for now.
-  if (frame_header->encoding != FrameEncoding::kVarDCT &&
-      cparams.photon_noise_iso == 0 && cparams.manual_noise.empty()) {
-    frame_header->UpdateFlag(false, FrameHeader::Flags::kNoise);
-  }
-
-  JXL_RETURN_IF_ERROR(
-      LoopFilterFromParams(cparams, streaming_mode, frame_header));
-
-  frame_header->dc_level = frame_info.dc_level;
-  if (frame_header->dc_level > 2) {
-    // With 3 or more progressive_dc frames, the implementation does not yet
-    // work, see enc_cache.cc.
-    return JXL_FAILURE("progressive_dc > 2 is not yet supported");
-  }
-  if (cparams.progressive_dc > 0 &&
-      (cparams.ec_resampling != 1 || cparams.resampling != 1)) {
-    return JXL_FAILURE("Resampling not supported with DC frames");
-  }
-  if (cparams.resampling != 1 && cparams.resampling != 2 &&
-      cparams.resampling != 4 && cparams.resampling != 8) {
-    return JXL_FAILURE("Invalid resampling factor");
-  }
-  if (cparams.ec_resampling != 1 && cparams.ec_resampling != 2 &&
-      cparams.ec_resampling != 4 && cparams.ec_resampling != 8) {
-    return JXL_FAILURE("Invalid ec_resampling factor");
-  }
-  // Resized frames.
-  if (frame_info.frame_type != FrameType::kDCFrame) {
-    frame_header->frame_origin = frame_info.origin;
-    size_t ups = 1;
-    if (cparams.already_downsampled) ups = cparams.resampling;
-
-    // TODO(lode): this is not correct in case of odd original image sizes in
-    // combination with cparams.already_downsampled. Likely these values should
-    // be set to respectively frame_header->default_xsize() and
-    // frame_header->default_ysize() instead, the original (non downsampled)
-    // intended decoded image dimensions. But it may be more subtle than that
-    // if combined with crop. This issue causes custom_size_or_origin to be
-    // incorrectly set to true in case of already_downsampled with odd output
-    // image size when no cropping is used.
-    frame_header->frame_size.xsize = xsize * ups;
-    frame_header->frame_size.ysize = ysize * ups;
-    if (frame_info.origin.x0 != 0 || frame_info.origin.y0 != 0 ||
-        frame_header->frame_size.xsize != frame_header->default_xsize() ||
-        frame_header->frame_size.ysize != frame_header->default_ysize()) {
-      frame_header->custom_size_or_origin = true;
-    }
-  }
-  // Upsampling.
-  frame_header->upsampling = cparams.resampling;
-  const std::vector<ExtraChannelInfo>& extra_channels =
-      frame_header->nonserialized_metadata->m.extra_channel_info;
-  frame_header->extra_channel_upsampling.clear();
-  frame_header->extra_channel_upsampling.resize(extra_channels.size(),
-                                                cparams.ec_resampling);
-  frame_header->save_as_reference = frame_info.save_as_reference;
-
-  // Set blending-related information.
-  if (frame_info.blend || frame_header->custom_size_or_origin) {
-    // Set blend_channel to the first alpha channel. These values are only
-    // encoded in case a blend mode involving alpha is used and there are more
-    // than one extra channels.
-    size_t index = 0;
-    if (frame_info.alpha_channel == -1) {
-      if (extra_channels.size() > 1) {
-        for (size_t i = 0; i < extra_channels.size(); i++) {
-          if (extra_channels[i].type == ExtraChannel::kAlpha) {
-            index = i;
-            break;
-          }
-        }
-      }
-    } else {
-      index = static_cast<size_t>(frame_info.alpha_channel);
-      JXL_ENSURE(index == 0 || index < extra_channels.size());
-    }
-    frame_header->blending_info.alpha_channel = index;
-    frame_header->blending_info.mode =
-        frame_info.blend ? frame_info.blendmode : BlendMode::kReplace;
-    frame_header->blending_info.source = frame_info.source;
-    frame_header->blending_info.clamp = frame_info.clamp;
-    const auto& extra_channel_info = frame_info.extra_channel_blending_info;
-    for (size_t i = 0; i < extra_channels.size(); i++) {
-      if (i < extra_channel_info.size()) {
-        frame_header->extra_channel_blending_info[i] = extra_channel_info[i];
-      } else {
-        frame_header->extra_channel_blending_info[i].alpha_channel = index;
-        BlendMode default_blend = frame_info.blendmode;
-        if (extra_channels[i].type != ExtraChannel::kBlack && i != index) {
-          // K needs to be blended, spot colors and other stuff gets added
-          default_blend = BlendMode::kAdd;
-        }
-        frame_header->extra_channel_blending_info[i].mode =
-            frame_info.blend ? default_blend : BlendMode::kReplace;
-        frame_header->extra_channel_blending_info[i].source = 1;
-      }
-    }
-  }
-
-  frame_header->animation_frame.duration = frame_info.duration;
-  frame_header->animation_frame.timecode = frame_info.timecode;
-
-  if (jpeg_data) {
-    frame_header->UpdateFlag(false, FrameHeader::kUseDcFrame);
-    frame_header->UpdateFlag(true, FrameHeader::kSkipAdaptiveDCSmoothing);
-  }
-
-  return true;
-}
-
-// Invisible (alpha = 0) pixels tend to be a mess in optimized PNGs.
-// Since they have no visual impact whatsoever, we can replace them with
-// something that compresses better and reduces artifacts near the edges. This
-// does some kind of smooth stuff that seems to work.
-// Replace invisible pixels with a weighted average of the pixel to the left,
-// the pixel to the topright, and non-invisible neighbours.
-// Produces downward-blurry smears, with in the upwards direction only a 1px
-// edge duplication but not more. It would probably be better to smear in all
-// directions. That requires an alpha-weighed convolution with a large enough
-// kernel though, which might be overkill...
-void SimplifyInvisible(Image3F* image, const ImageF& alpha, bool lossless) {
-  for (size_t c = 0; c < 3; ++c) {
-    for (size_t y = 0; y < image->ysize(); ++y) {
-      float* JXL_RESTRICT row = image->PlaneRow(c, y);
-      const float* JXL_RESTRICT prow =
-          (y > 0 ? image->PlaneRow(c, y - 1) : nullptr);
-      const float* JXL_RESTRICT nrow =
-          (y + 1 < image->ysize() ? image->PlaneRow(c, y + 1) : nullptr);
-      const float* JXL_RESTRICT a = alpha.Row(y);
-      const float* JXL_RESTRICT pa = (y > 0 ? alpha.Row(y - 1) : nullptr);
-      const float* JXL_RESTRICT na =
-          (y + 1 < image->ysize() ? alpha.Row(y + 1) : nullptr);
-      for (size_t x = 0; x < image->xsize(); ++x) {
-        if (a[x] == 0) {
-          if (lossless) {
-            row[x] = 0;
-            continue;
-          }
-          float d = 0.f;
-          row[x] = 0;
-          if (x > 0) {
-            row[x] += row[x - 1];
-            d++;
-            if (a[x - 1] > 0.f) {
-              row[x] += row[x - 1];
-              d++;
-            }
-          }
-          if (x + 1 < image->xsize()) {
-            if (y > 0) {
-              row[x] += prow[x + 1];
-              d++;
-            }
-            if (a[x + 1] > 0.f) {
-              row[x] += 2.f * row[x + 1];
-              d += 2.f;
-            }
-            if (y > 0 && pa[x + 1] > 0.f) {
-              row[x] += 2.f * prow[x + 1];
-              d += 2.f;
-            }
-            if (y + 1 < image->ysize() && na[x + 1] > 0.f) {
-              row[x] += 2.f * nrow[x + 1];
-              d += 2.f;
-            }
-          }
-          if (y > 0 && pa[x] > 0.f) {
-            row[x] += 2.f * prow[x];
-            d += 2.f;
-          }
-          if (y + 1 < image->ysize() && na[x] > 0.f) {
-            row[x] += 2.f * nrow[x];
-            d += 2.f;
-          }
-          if (d > 1.f) row[x] /= d;
-        }
-      }
-    }
-  }
-}
-
-struct PixelStatsForChromacityAdjustment {
-  float dx = 0;
-  float db = 0;
-  float exposed_blue = 0;
-  static float CalcPlane(const ImageF* JXL_RESTRICT plane, const Rect& rect) {
-    float xmax = 0;
-    float ymax = 0;
-    for (size_t ty = 1; ty < rect.ysize(); ++ty) {
-      for (size_t tx = 1; tx < rect.xsize(); ++tx) {
-        float cur = rect.Row(plane, ty)[tx];
-        float prev_row = rect.Row(plane, ty - 1)[tx];
-        float prev = rect.Row(plane, ty)[tx - 1];
-        xmax = std::max(xmax, std::abs(cur - prev));
-        ymax = std::max(ymax, std::abs(cur - prev_row));
-      }
-    }
-    return std::max(xmax, ymax);
-  }
-  void CalcExposedBlue(const ImageF* JXL_RESTRICT plane_y,
-                       const ImageF* JXL_RESTRICT plane_b, const Rect& rect) {
-    float eb = 0;
-    float xmax = 0;
-    float ymax = 0;
-    for (size_t ty = 1; ty < rect.ysize(); ++ty) {
-      for (size_t tx = 1; tx < rect.xsize(); ++tx) {
-        float cur_y = rect.Row(plane_y, ty)[tx];
-        float cur_b = rect.Row(plane_b, ty)[tx];
-        float exposed_b = cur_b - cur_y * 1.2;
-        float diff_b = cur_b - cur_y;
-        float prev_row = rect.Row(plane_b, ty - 1)[tx];
-        float prev = rect.Row(plane_b, ty)[tx - 1];
-        float diff_prev_row = prev_row - rect.Row(plane_y, ty - 1)[tx];
-        float diff_prev = prev - rect.Row(plane_y, ty)[tx - 1];
-        xmax = std::max(xmax, std::abs(diff_b - diff_prev));
-        ymax = std::max(ymax, std::abs(diff_b - diff_prev_row));
-        if (exposed_b >= 0) {
-          exposed_b *= fabs(cur_b - prev) + fabs(cur_b - prev_row);
-          eb = std::max(eb, exposed_b);
-        }
-      }
-    }
-    exposed_blue = eb;
-    db = std::max(xmax, ymax);
-  }
-  void Calc(const Image3F* JXL_RESTRICT opsin, const Rect& rect) {
-    dx = CalcPlane(&opsin->Plane(0), rect);
-    CalcExposedBlue(&opsin->Plane(1), &opsin->Plane(2), rect);
-  }
-  int HowMuchIsXChannelPixelized() const {
-    if (dx >= 0.026) {
-      return 3;
-    }
-    if (dx >= 0.022) {
-      return 2;
-    }
-    if (dx >= 0.015) {
-      return 1;
-    }
-    return 0;
-  }
-  int HowMuchIsBChannelPixelized() const {
-    int add = exposed_blue >= 0.13 ? 1 : 0;
-    if (db > 0.38) {
-      return 2 + add;
-    }
-    if (db > 0.33) {
-      return 1 + add;
-    }
-    if (db > 0.28) {
-      return add;
-    }
-    return 0;
-  }
-};
-
-void ComputeChromacityAdjustments(const CompressParams& cparams,
-                                  const Image3F& opsin, const Rect& rect,
-                                  FrameHeader* frame_header) {
-  if (frame_header->encoding != FrameEncoding::kVarDCT ||
-      cparams.max_error_mode) {
-    return;
-  }
-  // 1) Distance based approach for chromacity adjustment:
-  float x_qm_scale_steps[3] = {2.5f, 5.5f, 9.5f};
-  frame_header->x_qm_scale = 3;
-  for (float x_qm_scale_step : x_qm_scale_steps) {
-    if (cparams.original_butteraugli_distance > x_qm_scale_step) {
-      frame_header->x_qm_scale++;
-    }
-  }
-  // 2) Pixel-based approach for chromacity adjustment:
-  // look at the individual pixels and make a guess how difficult
-  // the image would be based on the worst case pixel.
-  PixelStatsForChromacityAdjustment pixel_stats;
-  if (cparams.speed_tier <= SpeedTier::kSquirrel) {
-    pixel_stats.Calc(&opsin, rect);
-  }
-  // For X take the most severe adjustment.
-  frame_header->x_qm_scale = std::max<int>(
-      frame_header->x_qm_scale, 2 + pixel_stats.HowMuchIsXChannelPixelized());
-  // B only adjusted by pixel-based approach.
-  frame_header->b_qm_scale = 2 + pixel_stats.HowMuchIsBChannelPixelized();
-}
-
-void ComputeNoiseParams(const CompressParams& cparams, bool streaming_mode,
-                        bool color_is_jpeg, const Image3F& opsin,
-                        const FrameDimensions& frame_dim,
-                        FrameHeader* frame_header, NoiseParams* noise_params) {
-  if (cparams.photon_noise_iso > 0) {
-    *noise_params = SimulatePhotonNoise(frame_dim.xsize, frame_dim.ysize,
-                                        cparams.photon_noise_iso);
-  } else if (cparams.manual_noise.size() == NoiseParams::kNumNoisePoints) {
-    for (size_t i = 0; i < NoiseParams::kNumNoisePoints; i++) {
-      noise_params->lut[i] = cparams.manual_noise[i];
-    }
-  } else if (frame_header->encoding == FrameEncoding::kVarDCT &&
-             frame_header->flags & FrameHeader::kNoise && !color_is_jpeg &&
-             !streaming_mode) {
-    // Don't start at zero amplitude since adding noise is expensive -- it
-    // significantly slows down decoding, and this is unlikely to
-    // completely go away even with advanced optimizations. After the
-    // kNoiseModelingRampUpDistanceRange we have reached the full level,
-    // i.e. noise is no longer represented by the compressed image, so we
-    // can add full noise by the noise modeling itself.
-    static const float kNoiseModelingRampUpDistanceRange = 0.6;
-    static const float kNoiseLevelAtStartOfRampUp = 0.25;
-    static const float kNoiseRampupStart = 1.0;
-    // TODO(user) test and properly select quality_coef with smooth
-    // filter
-    float quality_coef = 1.0f;
-    const float rampup = (cparams.butteraugli_distance - kNoiseRampupStart) /
-                         kNoiseModelingRampUpDistanceRange;
-    if (rampup < 1.0f) {
-      quality_coef = kNoiseLevelAtStartOfRampUp +
-                     (1.0f - kNoiseLevelAtStartOfRampUp) * rampup;
-    }
-    if (rampup < 0.0f) {
-      quality_coef = kNoiseRampupStart;
-    }
-    if (!GetNoiseParameter(opsin, noise_params, quality_coef)) {
-      frame_header->flags &= ~FrameHeader::kNoise;
-    }
-  }
-}
-
-Status DownsampleColorChannels(const CompressParams& cparams,
-                               const FrameHeader& frame_header,
-                               bool color_is_jpeg, Image3F* opsin) {
-  if (color_is_jpeg || frame_header.upsampling == 1 ||
-      cparams.already_downsampled) {
-    return true;
-  }
-  if (frame_header.encoding == FrameEncoding::kVarDCT &&
-      frame_header.upsampling == 2) {
-    // TODO(lode): use the regular DownsampleImage, or adapt to the custom
-    // coefficients, if there is are custom upscaling coefficients in
-    // CustomTransformData
-    if (cparams.speed_tier <= SpeedTier::kSquirrel) {
-      // TODO(lode): DownsampleImage2_Iterative is currently too slow to
-      // be used for squirrel, make it faster, and / or enable it only for
-      // kitten.
-      JXL_RETURN_IF_ERROR(DownsampleImage2_Iterative(opsin));
-    } else {
-      JXL_RETURN_IF_ERROR(DownsampleImage2_Sharper(opsin));
-    }
-  } else {
-    JXL_ASSIGN_OR_RETURN(*opsin,
-                         DownsampleImage(*opsin, frame_header.upsampling));
-  }
-  if (frame_header.encoding == FrameEncoding::kVarDCT) {
-    JXL_RETURN_IF_ERROR(PadImageToBlockMultipleInPlace(opsin));
-  }
-  return true;
-}
-
-template <size_t L, typename V, typename R>
-void FindIndexOfSumMaximum(const V* array, R* idx, V* sum) {
-  static_assert(L > 0);
-  V maxval = 0;
-  V val = 0;
-  R maxidx = 0;
-  for (size_t i = 0; i < L; ++i) {
-    val += array[i];
-    if (val > maxval) {
-      maxval = val;
-      maxidx = i;
-    }
-  }
-  *idx = maxidx;
-  *sum = maxval;
-}
-
-Status ComputeJPEGTranscodingData(const jpeg::JPEGData& jpeg_data,
-                                  const FrameHeader& frame_header,
-                                  ThreadPool* pool,
-                                  ModularFrameEncoder* enc_modular,
-                                  PassesEncoderState* enc_state) {
-  PassesSharedState& shared = enc_state->shared;
-  JxlMemoryManager* memory_manager = enc_state->memory_manager();
-  const FrameDimensions& frame_dim = shared.frame_dim;
-
-  const size_t xsize = frame_dim.xsize_padded;
-  const size_t ysize = frame_dim.ysize_padded;
-  const size_t xsize_blocks = frame_dim.xsize_blocks;
-  const size_t ysize_blocks = frame_dim.ysize_blocks;
-
-  // no-op chroma from luma
-  JXL_ASSIGN_OR_RETURN(shared.cmap, ColorCorrelationMap::Create(
-                                        memory_manager, xsize, ysize, false));
-  shared.ac_strategy.FillDCT8();
-  FillImage(static_cast<uint8_t>(0), &shared.epf_sharpness);
-
-  enc_state->coeffs.clear();
-  while (enc_state->coeffs.size() < enc_state->passes.size()) {
-    JXL_ASSIGN_OR_RETURN(
-        std::unique_ptr<ACImageT<int32_t>> coeffs,
-        ACImageT<int32_t>::Make(memory_manager, kGroupDim * kGroupDim,
-                                frame_dim.num_groups));
-    enc_state->coeffs.emplace_back(std::move(coeffs));
-  }
-
-  // convert JPEG quantization table to a Quantizer object
-  float dcquantization[3];
-  std::vector<QuantEncoding> qe(kNumQuantTables, QuantEncoding::Library<0>());
-
-  auto jpeg_c_map =
-      JpegOrder(frame_header.color_transform, jpeg_data.components.size() == 1);
-
-  std::vector<int> qt(192);
-  for (size_t c = 0; c < 3; c++) {
-    size_t jpeg_c = jpeg_c_map[c];
-    const int32_t* quant =
-        jpeg_data.quant[jpeg_data.components[jpeg_c].quant_idx].values.data();
-
-    dcquantization[c] = 255 * 8.0f / quant[0];
-    for (size_t y = 0; y < 8; y++) {
-      for (size_t x = 0; x < 8; x++) {
-        // JPEG XL transposes the DCT, JPEG doesn't.
-        qt[c * 64 + 8 * x + y] = quant[8 * y + x];
-      }
-    }
-  }
-  JXL_RETURN_IF_ERROR(DequantMatricesSetCustomDC(
-      memory_manager, &shared.matrices, dcquantization));
-  float dcquantization_r[3] = {1.0f / dcquantization[0],
-                               1.0f / dcquantization[1],
-                               1.0f / dcquantization[2]};
-
-  std::vector<int32_t> scaled_qtable(192);
-  for (size_t c = 0; c < 3; c++) {
-    for (size_t i = 0; i < 64; i++) {
-      scaled_qtable[64 * c + i] =
-          (1 << kCFLFixedPointPrecision) * qt[64 + i] / qt[64 * c + i];
-    }
-  }
-
-  qe[static_cast<size_t>(AcStrategyType::DCT)] =
-      QuantEncoding::RAW(std::move(qt));
-  JXL_RETURN_IF_ERROR(
-      DequantMatricesSetCustom(&shared.matrices, qe, enc_modular));
-
-  // Ensure that InvGlobalScale() is 1.
-  shared.quantizer = Quantizer(shared.matrices, 1, kGlobalScaleDenom);
-  // Recompute MulDC() and InvMulDC().
-  shared.quantizer.RecomputeFromGlobalScale();
-
-  // Per-block dequant scaling should be 1.
-  FillImage(static_cast<int32_t>(shared.quantizer.InvGlobalScale()),
-            &shared.raw_quant_field);
-
-  auto jpeg_row = [&](size_t c, size_t y) {
-    return jpeg_data.components[jpeg_c_map[c]].coeffs.data() +
-           jpeg_data.components[jpeg_c_map[c]].width_in_blocks * kDCTBlockSize *
-               y;
-  };
-
-  bool DCzero = (frame_header.color_transform == ColorTransform::kYCbCr);
-  // Compute chroma-from-luma for AC (doesn't seem to be useful for DC)
-  if (frame_header.chroma_subsampling.Is444() &&
-      enc_state->cparams.force_cfl_jpeg_recompression &&
-      jpeg_data.components.size() == 3) {
-    for (size_t c : {0, 2}) {
-      ImageSB* map = (c == 0 ? &shared.cmap.ytox_map : &shared.cmap.ytob_map);
-      const float kScale = kDefaultColorFactor;
-      const int kOffset = 127;
-      const float kBase = c == 0 ? shared.cmap.base().YtoXRatio(0)
-                                 : shared.cmap.base().YtoBRatio(0);
-      const float kZeroThresh =
-          kScale * kZeroBiasDefault[c] *
-          0.9999f;  // just epsilon less for better rounding
-
-      auto process_row = [&](const uint32_t task,
-                             const size_t thread) -> Status {
-        size_t ty = task;
-        int8_t* JXL_RESTRICT row_out = map->Row(ty);
-        for (size_t tx = 0; tx < map->xsize(); ++tx) {
-          const size_t y0 = ty * kColorTileDimInBlocks;
-          const size_t x0 = tx * kColorTileDimInBlocks;
-          const size_t y1 = std::min(frame_dim.ysize_blocks,
-                                     (ty + 1) * kColorTileDimInBlocks);
-          const size_t x1 = std::min(frame_dim.xsize_blocks,
-                                     (tx + 1) * kColorTileDimInBlocks);
-          int32_t d_num_zeros[257] = {0};
-          // TODO(veluca): this needs SIMD + fixed point adaptation, and/or
-          // conversion to the new CfL algorithm.
-          for (size_t y = y0; y < y1; ++y) {
-            const int16_t* JXL_RESTRICT row_m = jpeg_row(1, y);
-            const int16_t* JXL_RESTRICT row_s = jpeg_row(c, y);
-            for (size_t x = x0; x < x1; ++x) {
-              for (size_t coeffpos = 1; coeffpos < kDCTBlockSize; coeffpos++) {
-                const float scaled_m = row_m[x * kDCTBlockSize + coeffpos] *
-                                       scaled_qtable[64 * c + coeffpos] *
-                                       (1.0f / (1 << kCFLFixedPointPrecision));
-                const float scaled_s =
-                    kScale * row_s[x * kDCTBlockSize + coeffpos] +
-                    (kOffset - kBase * kScale) * scaled_m;
-                if (std::abs(scaled_m) > 1e-8f) {
-                  float from;
-                  float to;
-                  if (scaled_m > 0) {
-                    from = (scaled_s - kZeroThresh) / scaled_m;
-                    to = (scaled_s + kZeroThresh) / scaled_m;
-                  } else {
-                    from = (scaled_s + kZeroThresh) / scaled_m;
-                    to = (scaled_s - kZeroThresh) / scaled_m;
-                  }
-                  if (from < 0.0f) {
-                    from = 0.0f;
-                  }
-                  if (to > 255.0f) {
-                    to = 255.0f;
-                  }
-                  // Instead of clamping the both values
-                  // we just check that range is sane.
-                  if (from <= to) {
-                    d_num_zeros[static_cast<int>(std::ceil(from))]++;
-                    d_num_zeros[static_cast<int>(std::floor(to + 1))]--;
-                  }
-                }
-              }
-            }
-          }
-          int best = 0;
-          int32_t best_sum = 0;
-          FindIndexOfSumMaximum<256>(d_num_zeros, &best, &best_sum);
-          int32_t offset_sum = 0;
-          for (int i = 0; i < 256; ++i) {
-            if (i <= kOffset) {
-              offset_sum += d_num_zeros[i];
-            }
-          }
-          row_out[tx] = 0;
-          if (best_sum > offset_sum + 1) {
-            row_out[tx] = best - kOffset;
-          }
-        }
-        return true;
-      };
-
-      JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, map->ysize(), ThreadPool::NoInit,
-                                    process_row, "FindCorrelation"));
-    }
-  }
-
-  JXL_ASSIGN_OR_RETURN(
-      Image3F dc, Image3F::Create(memory_manager, xsize_blocks, ysize_blocks));
-  if (!frame_header.chroma_subsampling.Is444()) {
-    ZeroFillImage(&dc);
-    for (auto& coeff : enc_state->coeffs) {
-      coeff->ZeroFill();
-    }
-  }
-  // JPEG DC is from -1024 to 1023.
-  std::vector<size_t> dc_counts[3] = {};
-  dc_counts[0].resize(2048);
-  dc_counts[1].resize(2048);
-  dc_counts[2].resize(2048);
-  size_t total_dc[3] = {};
-  for (size_t c : {1, 0, 2}) {
-    if (jpeg_data.components.size() == 1 && c != 1) {
-      for (auto& coeff : enc_state->coeffs) {
-        coeff->ZeroFillPlane(c);
-      }
-      ZeroFillImage(&dc.Plane(c));
-      // Ensure no division by 0.
-      dc_counts[c][1024] = 1;
-      total_dc[c] = 1;
-      continue;
-    }
-    size_t hshift = frame_header.chroma_subsampling.HShift(c);
-    size_t vshift = frame_header.chroma_subsampling.VShift(c);
-    ImageSB& map = (c == 0 ? shared.cmap.ytox_map : shared.cmap.ytob_map);
-    for (size_t group_index = 0; group_index < frame_dim.num_groups;
-         group_index++) {
-      const size_t gx = group_index % frame_dim.xsize_groups;
-      const size_t gy = group_index / frame_dim.xsize_groups;
-      int32_t* coeffs[kMaxNumPasses];
-      for (size_t i = 0; i < enc_state->coeffs.size(); i++) {
-        coeffs[i] = enc_state->coeffs[i]->PlaneRow(c, group_index, 0).ptr32;
-      }
-      int32_t block[64];
-      for (size_t by = gy * kGroupDimInBlocks;
-           by < ysize_blocks && by < (gy + 1) * kGroupDimInBlocks; ++by) {
-        if ((by >> vshift) << vshift != by) continue;
-        const int16_t* JXL_RESTRICT inputjpeg = jpeg_row(c, by >> vshift);
-        const int16_t* JXL_RESTRICT inputjpegY = jpeg_row(1, by);
-        float* JXL_RESTRICT fdc = dc.PlaneRow(c, by >> vshift);
-        const int8_t* JXL_RESTRICT cm =
-            map.ConstRow(by / kColorTileDimInBlocks);
-        for (size_t bx = gx * kGroupDimInBlocks;
-             bx < xsize_blocks && bx < (gx + 1) * kGroupDimInBlocks; ++bx) {
-          if ((bx >> hshift) << hshift != bx) continue;
-          size_t base = (bx >> hshift) * kDCTBlockSize;
-          int idc;
-          if (DCzero) {
-            idc = inputjpeg[base];
-          } else {
-            idc = inputjpeg[base] + 1024 / qt[c * 64];
-          }
-          dc_counts[c][std::min(static_cast<uint32_t>(idc + 1024),
-                                static_cast<uint32_t>(2047))]++;
-          total_dc[c]++;
-          fdc[bx >> hshift] = idc * dcquantization_r[c];
-          if (c == 1 || !enc_state->cparams.force_cfl_jpeg_recompression ||
-              !frame_header.chroma_subsampling.Is444()) {
-            for (size_t y = 0; y < 8; y++) {
-              for (size_t x = 0; x < 8; x++) {
-                block[y * 8 + x] = inputjpeg[base + x * 8 + y];
-              }
-            }
-          } else {
-            const int32_t scale =
-                ColorCorrelation::RatioJPEG(cm[bx / kColorTileDimInBlocks]);
-
-            for (size_t y = 0; y < 8; y++) {
-              for (size_t x = 0; x < 8; x++) {
-                int Y = inputjpegY[kDCTBlockSize * bx + x * 8 + y];
-                int QChroma = inputjpeg[kDCTBlockSize * bx + x * 8 + y];
-                // Fixed-point multiply of CfL scale with quant table ratio
-                // first, and Y value second.
-                int coeff_scale = (scale * scaled_qtable[64 * c + y * 8 + x] +
-                                   (1 << (kCFLFixedPointPrecision - 1))) >>
-                                  kCFLFixedPointPrecision;
-                int cfl_factor =
-                    (Y * coeff_scale + (1 << (kCFLFixedPointPrecision - 1))) >>
-                    kCFLFixedPointPrecision;
-                int QCR = QChroma - cfl_factor;
-                block[y * 8 + x] = QCR;
-              }
-            }
-          }
-          enc_state->progressive_splitter.SplitACCoefficients(
-              block, AcStrategy::FromRawStrategy(AcStrategyType::DCT), bx, by,
-              coeffs);
-          for (size_t i = 0; i < enc_state->coeffs.size(); i++) {
-            coeffs[i] += kDCTBlockSize;
-          }
-        }
-      }
-    }
-  }
-
-  auto& dct = enc_state->shared.block_ctx_map.dc_thresholds;
-  auto& num_dc_ctxs = enc_state->shared.block_ctx_map.num_dc_ctxs;
-  num_dc_ctxs = 1;
-  for (size_t i = 0; i < 3; i++) {
-    dct[i].clear();
-    int num_thresholds = (CeilLog2Nonzero(total_dc[i]) - 12) / 2;
-    // up to 3 buckets per channel:
-    // dark/medium/bright, yellow/unsat/blue, green/unsat/red
-    num_thresholds = std::min(std::max(num_thresholds, 0), 2);
-    size_t cumsum = 0;
-    size_t cut = total_dc[i] / (num_thresholds + 1);
-    for (int j = 0; j < 2048; j++) {
-      cumsum += dc_counts[i][j];
-      if (cumsum > cut) {
-        dct[i].push_back(j - 1025);
-        cut = total_dc[i] * (dct[i].size() + 1) / (num_thresholds + 1);
-      }
-    }
-    num_dc_ctxs *= dct[i].size() + 1;
-  }
-
-  auto& ctx_map = enc_state->shared.block_ctx_map.ctx_map;
-  ctx_map.clear();
-  ctx_map.resize(3 * kNumOrders * num_dc_ctxs, 0);
-
-  int lbuckets = (dct[1].size() + 1);
-  for (size_t i = 0; i < num_dc_ctxs; i++) {
-    // up to 9 contexts for luma
-    ctx_map[i] = i / lbuckets;
-    // up to 3 contexts for chroma
-    ctx_map[kNumOrders * num_dc_ctxs + i] =
-        ctx_map[2 * kNumOrders * num_dc_ctxs + i] =
-            num_dc_ctxs / lbuckets + (i % lbuckets);
-  }
-  enc_state->shared.block_ctx_map.num_ctxs =
-      *std::max_element(ctx_map.begin(), ctx_map.end()) + 1;
-
-  // disable DC frame for now
-  auto compute_dc_coeffs = [&](const uint32_t group_index,
-                               size_t /* thread */) -> Status {
-    const Rect r = enc_state->shared.frame_dim.DCGroupRect(group_index);
-    JXL_RETURN_IF_ERROR(enc_modular->AddVarDCTDC(frame_header, dc, r,
-                                                 group_index,
-                                                 /*nl_dc=*/false, enc_state,
-                                                 /*jpeg_transcode=*/true));
-    JXL_RETURN_IF_ERROR(enc_modular->AddACMetadata(
-        r, group_index, /*jpeg_transcode=*/true, enc_state));
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, shared.frame_dim.num_dc_groups,
-                                ThreadPool::NoInit, compute_dc_coeffs,
-                                "Compute DC coeffs"));
-
-  return true;
-}
-
-Status ComputeVarDCTEncodingData(const FrameHeader& frame_header,
-                                 const Image3F* linear,
-                                 Image3F* JXL_RESTRICT opsin, const Rect& rect,
-                                 const JxlCmsInterface& cms, ThreadPool* pool,
-                                 ModularFrameEncoder* enc_modular,
-                                 PassesEncoderState* enc_state,
-                                 AuxOut* aux_out) {
-  JXL_ENSURE((rect.xsize() % kBlockDim) == 0 &&
-             (rect.ysize() % kBlockDim) == 0);
-  JxlMemoryManager* memory_manager = enc_state->memory_manager();
-  // Save pre-Gaborish opsin for AR control field heuristics computation.
-  Image3F orig_opsin;
-  JXL_ASSIGN_OR_RETURN(
-      orig_opsin, Image3F::Create(memory_manager, rect.xsize(), rect.ysize()));
-  JXL_RETURN_IF_ERROR(CopyImageTo(rect, *opsin, Rect(orig_opsin), &orig_opsin));
-  JXL_RETURN_IF_ERROR(orig_opsin.ShrinkTo(enc_state->shared.frame_dim.xsize,
-                                          enc_state->shared.frame_dim.ysize));
-
-  JXL_RETURN_IF_ERROR(LossyFrameHeuristics(frame_header, enc_state, enc_modular,
-                                           linear, opsin, rect, cms, pool,
-                                           aux_out));
-
-  JXL_RETURN_IF_ERROR(InitializePassesEncoder(
-      frame_header, *opsin, rect, cms, pool, enc_state, enc_modular, aux_out));
-
-  JXL_RETURN_IF_ERROR(
-      ComputeARHeuristics(frame_header, enc_state, orig_opsin, rect, pool));
-
-  JXL_RETURN_IF_ERROR(ComputeACMetadata(pool, enc_state, enc_modular));
-
-  return true;
-}
-
-Status ComputeAllCoeffOrders(PassesEncoderState& enc_state,
-                             const FrameDimensions& frame_dim) {
-  auto used_orders_info = ComputeUsedOrders(
-      enc_state.cparams.speed_tier, enc_state.shared.ac_strategy,
-      Rect(enc_state.shared.raw_quant_field));
-  enc_state.used_orders.resize(enc_state.progressive_splitter.GetNumPasses());
-  for (size_t i = 0; i < enc_state.progressive_splitter.GetNumPasses(); i++) {
-    JXL_RETURN_IF_ERROR(ComputeCoeffOrder(
-        enc_state.cparams.speed_tier, *enc_state.coeffs[i],
-        enc_state.shared.ac_strategy, frame_dim, enc_state.used_orders[i],
-        enc_state.used_acs, used_orders_info.first, used_orders_info.second,
-        &enc_state.shared.coeff_orders[i * enc_state.shared.coeff_order_size]));
-  }
-  enc_state.used_acs |= used_orders_info.first;
-  return true;
-}
-
-// Working area for TokenizeCoefficients (per-group!)
-struct EncCache {
-  // Allocates memory when first called.
-  Status InitOnce(JxlMemoryManager* memory_manager) {
-    if (num_nzeroes.xsize() == 0) {
-      JXL_ASSIGN_OR_RETURN(num_nzeroes,
-                           Image3I::Create(memory_manager, kGroupDimInBlocks,
-                                           kGroupDimInBlocks));
-    }
-    return true;
-  }
-  // TokenizeCoefficients
-  Image3I num_nzeroes;
-};
-
-Status TokenizeAllCoefficients(const FrameHeader& frame_header,
-                               ThreadPool* pool,
-                               PassesEncoderState* enc_state) {
-  PassesSharedState& shared = enc_state->shared;
-  std::vector<EncCache> group_caches;
-  JxlMemoryManager* memory_manager = enc_state->memory_manager();
-  const auto tokenize_group_init = [&](const size_t num_threads) -> Status {
-    group_caches.resize(num_threads);
-    return true;
-  };
-  const auto tokenize_group = [&](const uint32_t group_index,
-                                  const size_t thread) -> Status {
-    // Tokenize coefficients.
-    const Rect rect = shared.frame_dim.BlockGroupRect(group_index);
-    for (size_t idx_pass = 0; idx_pass < enc_state->passes.size(); idx_pass++) {
-      JXL_ENSURE(enc_state->coeffs[idx_pass]->Type() == ACType::k32);
-      const int32_t* JXL_RESTRICT ac_rows[3] = {
-          enc_state->coeffs[idx_pass]->PlaneRow(0, group_index, 0).ptr32,
-          enc_state->coeffs[idx_pass]->PlaneRow(1, group_index, 0).ptr32,
-          enc_state->coeffs[idx_pass]->PlaneRow(2, group_index, 0).ptr32,
-      };
-      // Ensure group cache is initialized.
-      JXL_RETURN_IF_ERROR(group_caches[thread].InitOnce(memory_manager));
-      JXL_RETURN_IF_ERROR(TokenizeCoefficients(
-          &shared.coeff_orders[idx_pass * shared.coeff_order_size], rect,
-          ac_rows, shared.ac_strategy, frame_header.chroma_subsampling,
-          &group_caches[thread].num_nzeroes,
-          &enc_state->passes[idx_pass].ac_tokens[group_index], shared.quant_dc,
-          shared.raw_quant_field, shared.block_ctx_map));
-    }
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, shared.frame_dim.num_groups,
-                                tokenize_group_init, tokenize_group,
-                                "TokenizeGroup"));
-  return true;
-}
-
-Status EncodeGlobalDCInfo(const PassesSharedState& shared, BitWriter* writer,
-                          AuxOut* aux_out) {
-  // Encode quantizer DC and global scale.
-  QuantizerParams params = shared.quantizer.GetParams();
-  JXL_RETURN_IF_ERROR(
-      WriteQuantizerParams(params, writer, LayerType::Quant, aux_out));
-  JXL_RETURN_IF_ERROR(EncodeBlockCtxMap(shared.block_ctx_map, writer, aux_out));
-  JXL_RETURN_IF_ERROR(ColorCorrelationEncodeDC(shared.cmap.base(), writer,
-                                               LayerType::Dc, aux_out));
-  return true;
-}
-
-// In streaming mode, this function only performs the histogram clustering and
-// saves the histogram bitstreams in enc_state, the actual AC global bitstream
-// is written in OutputAcGlobal() function after all the groups are processed.
-Status EncodeGlobalACInfo(PassesEncoderState* enc_state, BitWriter* writer,
-                          ModularFrameEncoder* enc_modular, AuxOut* aux_out) {
-  PassesSharedState& shared = enc_state->shared;
-  JxlMemoryManager* memory_manager = enc_state->memory_manager();
-  JXL_RETURN_IF_ERROR(DequantMatricesEncode(memory_manager, shared.matrices,
-                                            writer, LayerType::Quant, aux_out,
-                                            enc_modular));
-  size_t num_histo_bits = CeilLog2Nonzero(shared.frame_dim.num_groups);
-  if (!enc_state->streaming_mode && num_histo_bits != 0) {
-    JXL_RETURN_IF_ERROR(
-        writer->WithMaxBits(num_histo_bits, LayerType::Ac, aux_out, [&] {
-          writer->Write(num_histo_bits, shared.num_histograms - 1);
-          return true;
-        }));
-  }
-
-  for (size_t i = 0; i < enc_state->progressive_splitter.GetNumPasses(); i++) {
-    // Encode coefficient orders.
-    if (!enc_state->streaming_mode) {
-      size_t order_bits = 0;
-      JXL_RETURN_IF_ERROR(U32Coder::CanEncode(
-          kOrderEnc, enc_state->used_orders[i], &order_bits));
-      JXL_RETURN_IF_ERROR(
-          writer->WithMaxBits(order_bits, LayerType::Order, aux_out, [&] {
-            return U32Coder::Write(kOrderEnc, enc_state->used_orders[i],
-                                   writer);
-          }));
-      JXL_RETURN_IF_ERROR(
-          EncodeCoeffOrders(enc_state->used_orders[i],
-                            &shared.coeff_orders[i * shared.coeff_order_size],
-                            writer, LayerType::Order, aux_out));
-    }
-
-    // Encode histograms.
-    HistogramParams hist_params(enc_state->cparams.speed_tier,
-                                shared.block_ctx_map.NumACContexts());
-    if (enc_state->cparams.speed_tier > SpeedTier::kTortoise) {
-      hist_params.lz77_method = HistogramParams::LZ77Method::kNone;
-    }
-    if (enc_state->cparams.decoding_speed_tier >= 1) {
-      hist_params.max_histograms = 6;
-    }
-    size_t num_histogram_groups = shared.num_histograms;
-    if (enc_state->streaming_mode) {
-      size_t prev_num_histograms =
-          enc_state->passes[i].codes.encoding_info.size();
-      if (enc_state->initialize_global_state) {
-        prev_num_histograms += kNumFixedHistograms;
-        hist_params.add_fixed_histograms = true;
-      }
-      size_t remaining_histograms = kClustersLimit - prev_num_histograms;
-      // Heuristic to assign budget of new histograms to DC groups.
-      // TODO(szabadka) Tune this together with the DC group ordering.
-      size_t max_histograms = remaining_histograms < 20
-                                  ? std::min<size_t>(remaining_histograms, 4)
-                                  : remaining_histograms / 4;
-      hist_params.max_histograms =
-          std::min(max_histograms, hist_params.max_histograms);
-      num_histogram_groups = 1;
-    }
-    hist_params.streaming_mode = enc_state->streaming_mode;
-    hist_params.initialize_global_state = enc_state->initialize_global_state;
-    JXL_ASSIGN_OR_RETURN(
-        size_t cost,
-        BuildAndEncodeHistograms(
-            memory_manager, hist_params,
-            num_histogram_groups * shared.block_ctx_map.NumACContexts(),
-            enc_state->passes[i].ac_tokens, &enc_state->passes[i].codes,
-            &enc_state->passes[i].context_map, writer, LayerType::Ac, aux_out));
-    (void)cost;
-  }
-
-  return true;
-}
-
-Status EncodeGroups(const FrameHeader& frame_header,
-                    PassesEncoderState* enc_state,
-                    ModularFrameEncoder* enc_modular, ThreadPool* pool,
-                    std::vector<std::unique_ptr<BitWriter>>* group_codes,
-                    AuxOut* aux_out) {
-  const PassesSharedState& shared = enc_state->shared;
-  JxlMemoryManager* memory_manager = shared.memory_manager;
-  const FrameDimensions& frame_dim = shared.frame_dim;
-  const size_t num_groups = frame_dim.num_groups;
-  const size_t num_passes = enc_state->progressive_splitter.GetNumPasses();
-  const size_t global_ac_index = frame_dim.num_dc_groups + 1;
-  const bool is_small_image =
-      !enc_state->streaming_mode && num_groups == 1 && num_passes == 1;
-  const size_t num_toc_entries =
-      is_small_image ? 1
-                     : AcGroupIndex(0, 0, num_groups, frame_dim.num_dc_groups) +
-                           num_groups * num_passes;
-  JXL_ENSURE(group_codes->empty());
-  group_codes->reserve(num_toc_entries);
-  for (size_t i = 0; i < num_toc_entries; ++i) {
-    group_codes->emplace_back(jxl::make_unique<BitWriter>(memory_manager));
-  }
-
-  const auto get_output = [&](const size_t index) -> BitWriter* {
-    return (*group_codes)[is_small_image ? 0 : index].get();
-  };
-  auto ac_group_code = [&](size_t pass, size_t group) {
-    return get_output(AcGroupIndex(pass, group, frame_dim.num_groups,
-                                   frame_dim.num_dc_groups));
-  };
-
-  if (enc_state->initialize_global_state) {
-    if (frame_header.flags & FrameHeader::kPatches) {
-      JXL_RETURN_IF_ERROR(PatchDictionaryEncoder::Encode(
-          shared.image_features.patches, get_output(0), LayerType::Dictionary,
-          aux_out));
-    }
-    if (frame_header.flags & FrameHeader::kSplines) {
-      JXL_RETURN_IF_ERROR(EncodeSplines(shared.image_features.splines,
-                                        get_output(0), LayerType::Splines,
-                                        HistogramParams(), aux_out));
-    }
-    if (frame_header.flags & FrameHeader::kNoise) {
-      JXL_RETURN_IF_ERROR(EncodeNoise(shared.image_features.noise_params,
-                                      get_output(0), LayerType::Noise,
-                                      aux_out));
-    }
-
-    JXL_RETURN_IF_ERROR(DequantMatricesEncodeDC(shared.matrices, get_output(0),
-                                                LayerType::Quant, aux_out));
-    if (frame_header.encoding == FrameEncoding::kVarDCT) {
-      JXL_RETURN_IF_ERROR(EncodeGlobalDCInfo(shared, get_output(0), aux_out));
-    }
-    JXL_RETURN_IF_ERROR(enc_modular->EncodeGlobalInfo(enc_state->streaming_mode,
-                                                      get_output(0), aux_out));
-    JXL_RETURN_IF_ERROR(enc_modular->EncodeStream(get_output(0), aux_out,
-                                                  LayerType::ModularGlobal,
-                                                  ModularStreamId::Global()));
-  }
-
-  std::vector<std::unique_ptr<AuxOut>> aux_outs;
-  auto resize_aux_outs = [&aux_outs,
-                          aux_out](const size_t num_threads) -> Status {
-    if (aux_out == nullptr) {
-      aux_outs.resize(num_threads);
-    } else {
-      while (aux_outs.size() > num_threads) {
-        aux_out->Assimilate(*aux_outs.back());
-        aux_outs.pop_back();
-      }
-      while (num_threads > aux_outs.size()) {
-        aux_outs.emplace_back(jxl::make_unique<AuxOut>());
-      }
-    }
-    return true;
-  };
-
-  std::atomic<bool> has_error{false};
-  const auto process_dc_group = [&](const uint32_t group_index,
-                                    const size_t thread) -> Status {
-    AuxOut* my_aux_out = aux_outs[thread].get();
-    uint32_t input_index = enc_state->streaming_mode ? 0 : group_index;
-    BitWriter* output = get_output(input_index + 1);
-    if (frame_header.encoding == FrameEncoding::kVarDCT &&
-        !(frame_header.flags & FrameHeader::kUseDcFrame)) {
-      JXL_RETURN_IF_ERROR(
-          output->WithMaxBits(2, LayerType::Dc, my_aux_out, [&] {
-            output->Write(2, enc_modular->extra_dc_precision[group_index]);
-            return true;
-          }));
-      JXL_RETURN_IF_ERROR(
-          enc_modular->EncodeStream(output, my_aux_out, LayerType::Dc,
-                                    ModularStreamId::VarDCTDC(group_index)));
-    }
-    JXL_RETURN_IF_ERROR(
-        enc_modular->EncodeStream(output, my_aux_out, LayerType::ModularDcGroup,
-                                  ModularStreamId::ModularDC(group_index)));
-    if (frame_header.encoding == FrameEncoding::kVarDCT) {
-      const Rect& rect = enc_state->shared.frame_dim.DCGroupRect(input_index);
-      size_t nb_bits = CeilLog2Nonzero(rect.xsize() * rect.ysize());
-      if (nb_bits != 0) {
-        JXL_RETURN_IF_ERROR(output->WithMaxBits(
-            nb_bits, LayerType::ControlFields, my_aux_out, [&] {
-              output->Write(nb_bits,
-                            enc_modular->ac_metadata_size[group_index] - 1);
-              return true;
-            }));
-      }
-      JXL_RETURN_IF_ERROR(enc_modular->EncodeStream(
-          output, my_aux_out, LayerType::ControlFields,
-          ModularStreamId::ACMetadata(group_index)));
-    }
-    return true;
-  };
-  if (enc_state->streaming_mode) {
-    JXL_ENSURE(frame_dim.num_dc_groups == 1);
-    JXL_RETURN_IF_ERROR(resize_aux_outs(1));
-    JXL_RETURN_IF_ERROR(process_dc_group(enc_state->dc_group_index, 0));
-  } else {
-    JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, frame_dim.num_dc_groups,
-                                  resize_aux_outs, process_dc_group,
-                                  "EncodeDCGroup"));
-  }
-  if (has_error) return JXL_FAILURE("EncodeDCGroup failed");
-  if (frame_header.encoding == FrameEncoding::kVarDCT) {
-    JXL_RETURN_IF_ERROR(EncodeGlobalACInfo(
-        enc_state, get_output(global_ac_index), enc_modular, aux_out));
-  }
-
-  const auto process_group = [&](const uint32_t group_index,
-                                 const size_t thread) -> Status {
-    AuxOut* my_aux_out = aux_outs[thread].get();
-
-    size_t ac_group_id =
-        enc_state->streaming_mode
-            ? enc_modular->ComputeStreamingAbsoluteAcGroupId(
-                  enc_state->dc_group_index, group_index, shared.frame_dim)
-            : group_index;
-
-    for (size_t i = 0; i < num_passes; i++) {
-      JXL_DEBUG_V(2, "Encoding AC group %u [abs %" PRIuS "] pass %" PRIuS,
-                  group_index, ac_group_id, i);
-      if (frame_header.encoding == FrameEncoding::kVarDCT) {
-        JXL_RETURN_IF_ERROR(EncodeGroupTokenizedCoefficients(
-            group_index, i, enc_state->histogram_idx[group_index], *enc_state,
-            ac_group_code(i, group_index), my_aux_out));
-      }
-      // Write all modular encoded data (color?, alpha, depth, extra channels)
-      JXL_RETURN_IF_ERROR(enc_modular->EncodeStream(
-          ac_group_code(i, group_index), my_aux_out, LayerType::ModularAcGroup,
-          ModularStreamId::ModularAC(ac_group_id, i)));
-      JXL_DEBUG_V(2,
-                  "AC group %u [abs %" PRIuS "] pass %" PRIuS
-                  " encoded size is %" PRIuS " bits",
-                  group_index, ac_group_id, i,
-                  ac_group_code(i, group_index)->BitsWritten());
-    }
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, num_groups, resize_aux_outs,
-                                process_group, "EncodeGroupCoefficients"));
-  // Resizing aux_outs to 0 also Assimilates the array.
-  static_cast<void>(resize_aux_outs(0));
-
-  for (std::unique_ptr<BitWriter>& bw : *group_codes) {
-    JXL_RETURN_IF_ERROR(bw->WithMaxBits(8, LayerType::Ac, aux_out, [&] {
-      bw->ZeroPadToByte();  // end of group.
-      return true;
-    }));
-  }
-  return true;
-}
-
-Status ComputeEncodingData(
-    const CompressParams& cparams, const FrameInfo& frame_info,
-    const CodecMetadata* metadata, JxlEncoderChunkedFrameAdapter& frame_data,
-    const jpeg::JPEGData* jpeg_data, size_t x0, size_t y0, size_t xsize,
-    size_t ysize, const JxlCmsInterface& cms, ThreadPool* pool,
-    FrameHeader& mutable_frame_header, ModularFrameEncoder& enc_modular,
-    PassesEncoderState& enc_state,
-    std::vector<std::unique_ptr<BitWriter>>* group_codes, AuxOut* aux_out) {
-  JXL_ENSURE(x0 + xsize <= frame_data.xsize);
-  JXL_ENSURE(y0 + ysize <= frame_data.ysize);
-  JxlMemoryManager* memory_manager = enc_state.memory_manager();
-  const FrameHeader& frame_header = mutable_frame_header;
-  PassesSharedState& shared = enc_state.shared;
-  shared.metadata = metadata;
-  if (enc_state.streaming_mode) {
-    shared.frame_dim.Set(
-        xsize, ysize, frame_header.group_size_shift,
-        /*max_hshift=*/0, /*max_vshift=*/0,
-        mutable_frame_header.encoding == FrameEncoding::kModular,
-        /*upsampling=*/1);
-  } else {
-    shared.frame_dim = frame_header.ToFrameDimensions();
-  }
-
-  shared.image_features.patches.SetShared(&shared.reference_frames);
-  const FrameDimensions& frame_dim = shared.frame_dim;
-  JXL_ASSIGN_OR_RETURN(
-      shared.ac_strategy,
-      AcStrategyImage::Create(memory_manager, frame_dim.xsize_blocks,
-                              frame_dim.ysize_blocks));
-  JXL_ASSIGN_OR_RETURN(shared.raw_quant_field,
-                       ImageI::Create(memory_manager, frame_dim.xsize_blocks,
-                                      frame_dim.ysize_blocks));
-  JXL_ASSIGN_OR_RETURN(shared.epf_sharpness,
-                       ImageB::Create(memory_manager, frame_dim.xsize_blocks,
-                                      frame_dim.ysize_blocks));
-  JXL_ASSIGN_OR_RETURN(
-      shared.cmap, ColorCorrelationMap::Create(memory_manager, frame_dim.xsize,
-                                               frame_dim.ysize));
-  shared.coeff_order_size = kCoeffOrderMaxSize;
-  if (frame_header.encoding == FrameEncoding::kVarDCT) {
-    shared.coeff_orders.resize(frame_header.passes.num_passes *
-                               kCoeffOrderMaxSize);
-  }
-
-  JXL_ASSIGN_OR_RETURN(shared.quant_dc,
-                       ImageB::Create(memory_manager, frame_dim.xsize_blocks,
-                                      frame_dim.ysize_blocks));
-  JXL_ASSIGN_OR_RETURN(shared.dc_storage,
-                       Image3F::Create(memory_manager, frame_dim.xsize_blocks,
-                                       frame_dim.ysize_blocks));
-  shared.dc = &shared.dc_storage;
-
-  const size_t num_extra_channels = metadata->m.num_extra_channels;
-  const ExtraChannelInfo* alpha_eci = metadata->m.Find(ExtraChannel::kAlpha);
-  const ExtraChannelInfo* black_eci = metadata->m.Find(ExtraChannel::kBlack);
-  const size_t alpha_idx = alpha_eci - metadata->m.extra_channel_info.data();
-  const size_t black_idx = black_eci - metadata->m.extra_channel_info.data();
-  const ColorEncoding c_enc = metadata->m.color_encoding;
-
-  // Make the image patch bigger than the currently processed group in streaming
-  // mode so that we can take into account border pixels around the group when
-  // computing inverse Gaborish and adaptive quantization map.
-  int max_border = enc_state.streaming_mode ? kBlockDim : 0;
-  Rect frame_rect(0, 0, frame_data.xsize, frame_data.ysize);
-  Rect frame_area_rect = Rect(x0, y0, xsize, ysize);
-  Rect patch_rect = frame_area_rect.Extend(max_border, frame_rect);
-  JXL_ENSURE(patch_rect.IsInside(frame_rect));
-
-  // Allocating a large enough image avoids a copy when padding.
-  JXL_ASSIGN_OR_RETURN(
-      Image3F color,
-      Image3F::Create(memory_manager, RoundUpToBlockDim(patch_rect.xsize()),
-                      RoundUpToBlockDim(patch_rect.ysize())));
-  JXL_RETURN_IF_ERROR(color.ShrinkTo(patch_rect.xsize(), patch_rect.ysize()));
-  std::vector<ImageF> extra_channels(num_extra_channels);
-  for (auto& extra_channel : extra_channels) {
-    JXL_ASSIGN_OR_RETURN(
-        extra_channel,
-        ImageF::Create(memory_manager, patch_rect.xsize(), patch_rect.ysize()));
-  }
-  ImageF* alpha = alpha_eci ? &extra_channels[alpha_idx] : nullptr;
-  ImageF* black = black_eci ? &extra_channels[black_idx] : nullptr;
-  bool has_interleaved_alpha = false;
-  JxlChunkedFrameInputSource input = frame_data.GetInputSource();
-  if (!jpeg_data) {
-    JXL_RETURN_IF_ERROR(CopyColorChannels(input, patch_rect, frame_info,
-                                          metadata->m, pool, &color, alpha,
-                                          &has_interleaved_alpha));
-  }
-  JXL_RETURN_IF_ERROR(CopyExtraChannels(input, patch_rect, frame_info,
-                                        metadata->m, has_interleaved_alpha,
-                                        pool, &extra_channels));
-
-  enc_state.cparams = cparams;
-
-  Image3F linear_storage;
-  Image3F* linear = nullptr;
-
-  if (!jpeg_data) {
-    if (frame_header.color_transform == ColorTransform::kXYB &&
-        frame_info.ib_needs_color_transform) {
-      if (frame_header.encoding == FrameEncoding::kVarDCT &&
-          cparams.speed_tier <= SpeedTier::kKitten) {
-        JXL_ASSIGN_OR_RETURN(linear_storage,
-                             Image3F::Create(memory_manager, patch_rect.xsize(),
-                                             patch_rect.ysize()));
-        linear = &linear_storage;
-      }
-      JXL_RETURN_IF_ERROR(ToXYB(c_enc, metadata->m.IntensityTarget(), black,
-                                pool, &color, cms, linear));
-    } else {
-      // Nothing to do.
-      // RGB or YCbCr: forward YCbCr is not implemented, this is only used when
-      // the input is already in YCbCr
-      // If encoding a special DC or reference frame: input is already in XYB.
-    }
-    bool lossless = cparams.IsLossless();
-    if (alpha && !alpha_eci->alpha_associated &&
-        frame_header.frame_type == FrameType::kRegularFrame &&
-        !ApplyOverride(cparams.keep_invisible, cparams.IsLossless()) &&
-        cparams.ec_resampling == cparams.resampling &&
-        !cparams.disable_perceptual_optimizations) {
-      // simplify invisible pixels
-      SimplifyInvisible(&color, *alpha, lossless);
-      if (linear) {
-        SimplifyInvisible(linear, *alpha, lossless);
-      }
-    }
-    JXL_RETURN_IF_ERROR(PadImageToBlockMultipleInPlace(&color));
-  }
-
-  // Rectangle within color that corresponds to the currently processed group in
-  // streaming mode.
-  Rect group_rect(x0 - patch_rect.x0(), y0 - patch_rect.y0(),
-                  RoundUpToBlockDim(xsize), RoundUpToBlockDim(ysize));
-
-  if (enc_state.initialize_global_state && !jpeg_data) {
-    ComputeChromacityAdjustments(cparams, color, group_rect,
-                                 &mutable_frame_header);
-  }
-
-  bool has_jpeg_data = (jpeg_data != nullptr);
-  ComputeNoiseParams(cparams, enc_state.streaming_mode, has_jpeg_data, color,
-                     frame_dim, &mutable_frame_header,
-                     &shared.image_features.noise_params);
-
-  JXL_RETURN_IF_ERROR(
-      DownsampleColorChannels(cparams, frame_header, has_jpeg_data, &color));
-
-  if (cparams.ec_resampling != 1 && !cparams.already_downsampled) {
-    for (ImageF& ec : extra_channels) {
-      JXL_ASSIGN_OR_RETURN(ec, DownsampleImage(ec, cparams.ec_resampling));
-    }
-  }
-
-  if (!enc_state.streaming_mode) {
-    group_rect = Rect(color);
-  }
-
-  if (frame_header.encoding == FrameEncoding::kVarDCT) {
-    enc_state.passes.resize(enc_state.progressive_splitter.GetNumPasses());
-    for (PassesEncoderState::PassData& pass : enc_state.passes) {
-      pass.ac_tokens.resize(shared.frame_dim.num_groups);
-    }
-    if (jpeg_data) {
-      JXL_RETURN_IF_ERROR(ComputeJPEGTranscodingData(
-          *jpeg_data, frame_header, pool, &enc_modular, &enc_state));
-    } else {
-      JXL_RETURN_IF_ERROR(ComputeVarDCTEncodingData(
-          frame_header, linear, &color, group_rect, cms, pool, &enc_modular,
-          &enc_state, aux_out));
-    }
-    JXL_RETURN_IF_ERROR(ComputeAllCoeffOrders(enc_state, frame_dim));
-    if (!enc_state.streaming_mode) {
-      shared.num_histograms = 1;
-      enc_state.histogram_idx.resize(frame_dim.num_groups);
-    }
-    JXL_RETURN_IF_ERROR(
-        TokenizeAllCoefficients(frame_header, pool, &enc_state));
-  }
-
-  if (cparams.modular_mode || !extra_channels.empty()) {
-    JXL_RETURN_IF_ERROR(enc_modular.ComputeEncodingData(
-        frame_header, metadata->m, &color, extra_channels, group_rect,
-        frame_dim, frame_area_rect, &enc_state, cms, pool, aux_out,
-        /*do_color=*/cparams.modular_mode));
-  }
-
-  if (!enc_state.streaming_mode) {
-    if (cparams.speed_tier < SpeedTier::kTortoise ||
-        !cparams.ModularPartIsLossless() || cparams.responsive ||
-        !cparams.custom_fixed_tree.empty()) {
-      // Use local trees if doing lossless modular, unless at very slow speeds.
-      JXL_RETURN_IF_ERROR(enc_modular.ComputeTree(pool));
-      JXL_RETURN_IF_ERROR(enc_modular.ComputeTokens(pool));
-    }
-    mutable_frame_header.UpdateFlag(shared.image_features.patches.HasAny(),
-                                    FrameHeader::kPatches);
-    mutable_frame_header.UpdateFlag(shared.image_features.splines.HasAny(),
-                                    FrameHeader::kSplines);
-  }
-
-  JXL_RETURN_IF_ERROR(EncodeGroups(frame_header, &enc_state, &enc_modular, pool,
-                                   group_codes, aux_out));
-  if (enc_state.streaming_mode) {
-    const size_t group_index = enc_state.dc_group_index;
-    enc_modular.ClearStreamData(ModularStreamId::VarDCTDC(group_index));
-    enc_modular.ClearStreamData(ModularStreamId::ACMetadata(group_index));
-    enc_modular.ClearModularStreamData();
-  }
-  return true;
-}
-
-Status PermuteGroups(const CompressParams& cparams,
-                     const FrameDimensions& frame_dim, size_t num_passes,
-                     std::vector<coeff_order_t>* permutation,
-                     std::vector<std::unique_ptr<BitWriter>>* group_codes) {
-  const size_t num_groups = frame_dim.num_groups;
-  if (!cparams.centerfirst || (num_passes == 1 && num_groups == 1)) {
-    return true;
-  }
-  // Don't permute global DC/AC or DC.
-  permutation->resize(frame_dim.num_dc_groups + 2);
-  std::iota(permutation->begin(), permutation->end(), 0);
-  std::vector<coeff_order_t> ac_group_order(num_groups);
-  std::iota(ac_group_order.begin(), ac_group_order.end(), 0);
-  size_t group_dim = frame_dim.group_dim;
-
-  // The center of the image is either given by parameters or chosen
-  // to be the middle of the image by default if center_x, center_y resp.
-  // are not provided.
-
-  int64_t imag_cx;
-  if (cparams.center_x != static_cast<size_t>(-1)) {
-    JXL_RETURN_IF_ERROR(cparams.center_x < frame_dim.xsize);
-    imag_cx = cparams.center_x;
-  } else {
-    imag_cx = frame_dim.xsize / 2;
-  }
-
-  int64_t imag_cy;
-  if (cparams.center_y != static_cast<size_t>(-1)) {
-    JXL_RETURN_IF_ERROR(cparams.center_y < frame_dim.ysize);
-    imag_cy = cparams.center_y;
-  } else {
-    imag_cy = frame_dim.ysize / 2;
-  }
-
-  // The center of the group containing the center of the image.
-  int64_t cx = (imag_cx / group_dim) * group_dim + group_dim / 2;
-  int64_t cy = (imag_cy / group_dim) * group_dim + group_dim / 2;
-  // This identifies in what area of the central group the center of the image
-  // lies in.
-  double direction = -std::atan2(imag_cy - cy, imag_cx - cx);
-  // This identifies the side of the central group the center of the image
-  // lies closest to. This can take values 0, 1, 2, 3 corresponding to left,
-  // bottom, right, top.
-  int64_t side = std::fmod((direction + 5 * kPi / 4), 2 * kPi) * 2 / kPi;
-  auto get_distance_from_center = [&](size_t gid) {
-    Rect r = frame_dim.GroupRect(gid);
-    int64_t gcx = r.x0() + group_dim / 2;
-    int64_t gcy = r.y0() + group_dim / 2;
-    int64_t dx = gcx - cx;
-    int64_t dy = gcy - cy;
-    // The angle is determined by taking atan2 and adding an appropriate
-    // starting point depending on the side we want to start on.
-    double angle = std::remainder(
-        std::atan2(dy, dx) + kPi / 4 + side * (kPi / 2), 2 * kPi);
-    // Concentric squares in clockwise order.
-    return std::make_pair(std::max(std::abs(dx), std::abs(dy)), angle);
-  };
-  std::sort(ac_group_order.begin(), ac_group_order.end(),
-            [&](coeff_order_t a, coeff_order_t b) {
-              return get_distance_from_center(a) < get_distance_from_center(b);
-            });
-  std::vector<coeff_order_t> inv_ac_group_order(ac_group_order.size(), 0);
-  for (size_t i = 0; i < ac_group_order.size(); i++) {
-    inv_ac_group_order[ac_group_order[i]] = i;
-  }
-  for (size_t i = 0; i < num_passes; i++) {
-    size_t pass_start = permutation->size();
-    for (coeff_order_t v : inv_ac_group_order) {
-      permutation->push_back(pass_start + v);
-    }
-  }
-  std::vector<std::unique_ptr<BitWriter>> new_group_codes(group_codes->size());
-  for (size_t i = 0; i < permutation->size(); i++) {
-    new_group_codes[(*permutation)[i]] = std::move((*group_codes)[i]);
-  }
-  group_codes->swap(new_group_codes);
-  return true;
-}
-
-bool CanDoStreamingEncoding(const CompressParams& cparams,
-                            const FrameInfo& frame_info,
-                            const CodecMetadata& metadata,
-                            const JxlEncoderChunkedFrameAdapter& frame_data) {
-  if (cparams.buffering == 0) {
-    return false;
-  }
-  if (cparams.buffering == -1) {
-    if (cparams.speed_tier < SpeedTier::kTortoise) return false;
-    if (cparams.speed_tier < SpeedTier::kSquirrel &&
-        cparams.butteraugli_distance > 0.5f) {
-      return false;
-    }
-    if (cparams.speed_tier == SpeedTier::kSquirrel &&
-        cparams.butteraugli_distance >= 3.f) {
-      return false;
-    }
-  }
-
-  // TODO(veluca): handle different values of `buffering`.
-  if (frame_data.xsize <= 2048 && frame_data.ysize <= 2048) {
-    return false;
-  }
-  if (frame_data.IsJPEG()) {
-    return false;
-  }
-  if (cparams.noise == Override::kOn || cparams.patches == Override::kOn) {
-    return false;
-  }
-  if (cparams.progressive_dc != 0 || frame_info.dc_level != 0) {
-    return false;
-  }
-  if (cparams.resampling != 1 || cparams.ec_resampling != 1) {
-    return false;
-  }
-  if (cparams.max_error_mode) {
-    return false;
-  }
-  if (!cparams.ModularPartIsLossless() || cparams.responsive > 0) {
-    if (metadata.m.num_extra_channels > 0 || cparams.modular_mode) {
-      return false;
-    }
-  }
-  ColorTransform ok_color_transform =
-      cparams.modular_mode ? ColorTransform::kNone : ColorTransform::kXYB;
-  if (cparams.color_transform != ok_color_transform) {
-    return false;
-  }
-  return true;
-}
-
-Status ComputePermutationForStreaming(size_t xsize, size_t ysize,
-                                      size_t group_size, size_t num_passes,
-                                      std::vector<coeff_order_t>& permutation,
-                                      std::vector<size_t>& dc_group_order) {
-  // This is only valid in VarDCT mode, otherwise there can be group shift.
-  const size_t dc_group_size = group_size * kBlockDim;
-  const size_t group_xsize = DivCeil(xsize, group_size);
-  const size_t group_ysize = DivCeil(ysize, group_size);
-  const size_t dc_group_xsize = DivCeil(xsize, dc_group_size);
-  const size_t dc_group_ysize = DivCeil(ysize, dc_group_size);
-  const size_t num_groups = group_xsize * group_ysize;
-  const size_t num_dc_groups = dc_group_xsize * dc_group_ysize;
-  const size_t num_sections = 2 + num_dc_groups + num_passes * num_groups;
-  permutation.resize(num_sections);
-  size_t new_ix = 0;
-  // DC Global is first
-  permutation[0] = new_ix++;
-  // TODO(szabadka) Change the dc group order to center-first.
-  for (size_t dc_y = 0; dc_y < dc_group_ysize; ++dc_y) {
-    for (size_t dc_x = 0; dc_x < dc_group_xsize; ++dc_x) {
-      size_t dc_ix = dc_y * dc_group_xsize + dc_x;
-      dc_group_order.push_back(dc_ix);
-      permutation[1 + dc_ix] = new_ix++;
-      size_t ac_y0 = dc_y * kBlockDim;
-      size_t ac_x0 = dc_x * kBlockDim;
-      size_t ac_y1 = std::min<size_t>(group_ysize, ac_y0 + kBlockDim);
-      size_t ac_x1 = std::min<size_t>(group_xsize, ac_x0 + kBlockDim);
-      for (size_t pass = 0; pass < num_passes; ++pass) {
-        for (size_t ac_y = ac_y0; ac_y < ac_y1; ++ac_y) {
-          for (size_t ac_x = ac_x0; ac_x < ac_x1; ++ac_x) {
-            size_t group_ix = ac_y * group_xsize + ac_x;
-            size_t old_ix =
-                AcGroupIndex(pass, group_ix, num_groups, num_dc_groups);
-            permutation[old_ix] = new_ix++;
-          }
-        }
-      }
-    }
-  }
-  // AC Global is last
-  permutation[1 + num_dc_groups] = new_ix++;
-  JXL_ENSURE(new_ix == num_sections);
-  return true;
-}
-
-constexpr size_t kGroupSizeOffset[4] = {
-    static_cast<size_t>(0),
-    static_cast<size_t>(1024),
-    static_cast<size_t>(17408),
-    static_cast<size_t>(4211712),
-};
-constexpr size_t kTOCBits[4] = {12, 16, 24, 32};
-
-size_t TOCBucket(size_t group_size) {
-  size_t bucket = 0;
-  while (bucket < 3 && group_size >= kGroupSizeOffset[bucket + 1]) ++bucket;
-  return bucket;
-}
-
-size_t TOCSize(const std::vector<size_t>& group_sizes) {
-  size_t toc_bits = 0;
-  for (size_t group_size : group_sizes) {
-    toc_bits += kTOCBits[TOCBucket(group_size)];
-  }
-  return (toc_bits + 7) / 8;
-}
-
-StatusOr<PaddedBytes> EncodeTOC(JxlMemoryManager* memory_manager,
-                                const std::vector<size_t>& group_sizes,
-                                AuxOut* aux_out) {
-  BitWriter writer{memory_manager};
-  JXL_RETURN_IF_ERROR(writer.WithMaxBits(
-      32 * group_sizes.size(), LayerType::Toc, aux_out, [&]() -> Status {
-        for (size_t group_size : group_sizes) {
-          JXL_RETURN_IF_ERROR(U32Coder::Write(kTocDist, group_size, &writer));
-        }
-        writer.ZeroPadToByte();  // before first group
-        return true;
-      }));
-  return std::move(writer).TakeBytes();
-}
-
-Status ComputeGroupDataOffset(size_t frame_header_size, size_t dc_global_size,
-                              size_t num_sections, size_t& min_dc_global_size,
-                              size_t& group_offset) {
-  size_t max_toc_bits = (num_sections - 1) * 32;
-  size_t min_toc_bits = (num_sections - 1) * 12;
-  size_t max_padding = (max_toc_bits - min_toc_bits + 7) / 8;
-  min_dc_global_size = dc_global_size;
-  size_t dc_global_bucket = TOCBucket(min_dc_global_size);
-  while (TOCBucket(min_dc_global_size + max_padding) > dc_global_bucket) {
-    dc_global_bucket = TOCBucket(min_dc_global_size + max_padding);
-    min_dc_global_size = kGroupSizeOffset[dc_global_bucket];
-  }
-  JXL_ENSURE(TOCBucket(min_dc_global_size) == dc_global_bucket);
-  JXL_ENSURE(TOCBucket(min_dc_global_size + max_padding) == dc_global_bucket);
-  max_toc_bits += kTOCBits[dc_global_bucket];
-  size_t max_toc_size = (max_toc_bits + 7) / 8;
-  group_offset = frame_header_size + max_toc_size + min_dc_global_size;
-  return true;
-}
-
-size_t ComputeDcGlobalPadding(const std::vector<size_t>& group_sizes,
-                              size_t frame_header_size,
-                              size_t group_data_offset,
-                              size_t min_dc_global_size) {
-  std::vector<size_t> new_group_sizes = group_sizes;
-  new_group_sizes[0] = min_dc_global_size;
-  size_t toc_size = TOCSize(new_group_sizes);
-  size_t actual_offset = frame_header_size + toc_size + group_sizes[0];
-  return group_data_offset - actual_offset;
-}
-
-Status OutputGroups(std::vector<std::unique_ptr<BitWriter>>&& group_codes,
-                    std::vector<size_t>* group_sizes,
-                    JxlEncoderOutputProcessorWrapper* output_processor) {
-  JXL_ENSURE(group_codes.size() >= 4);
-  {
-    PaddedBytes dc_group = std::move(*group_codes[1]).TakeBytes();
-    group_sizes->push_back(dc_group.size());
-    JXL_RETURN_IF_ERROR(AppendData(*output_processor, dc_group));
-  }
-  for (size_t i = 3; i < group_codes.size(); ++i) {
-    PaddedBytes ac_group = std::move(*group_codes[i]).TakeBytes();
-    group_sizes->push_back(ac_group.size());
-    JXL_RETURN_IF_ERROR(AppendData(*output_processor, ac_group));
-  }
-  return true;
-}
-
-void RemoveUnusedHistograms(std::vector<uint8_t>& context_map,
-                            EntropyEncodingData& codes) {
-  std::vector<int> remap(256, -1);
-  std::vector<uint8_t> inv_remap;
-  for (uint8_t& context : context_map) {
-    const uint8_t histo_ix = context;
-    if (remap[histo_ix] == -1) {
-      remap[histo_ix] = inv_remap.size();
-      inv_remap.push_back(histo_ix);
-    }
-    context = remap[histo_ix];
-  }
-  EntropyEncodingData new_codes;
-  new_codes.use_prefix_code = codes.use_prefix_code;
-  new_codes.lz77 = codes.lz77;
-  for (uint8_t histo_idx : inv_remap) {
-    new_codes.encoding_info.emplace_back(
-        std::move(codes.encoding_info[histo_idx]));
-    new_codes.uint_config.emplace_back(codes.uint_config[histo_idx]);
-    new_codes.encoded_histograms.emplace_back(
-        std::move(codes.encoded_histograms[histo_idx]));
-  }
-  codes = std::move(new_codes);
-}
-
-Status OutputAcGlobal(PassesEncoderState& enc_state,
-                      const FrameDimensions& frame_dim,
-                      std::vector<size_t>* group_sizes,
-                      JxlEncoderOutputProcessorWrapper* output_processor,
-                      AuxOut* aux_out) {
-  JXL_ENSURE(frame_dim.num_groups > 1);
-  JxlMemoryManager* memory_manager = enc_state.memory_manager();
-  BitWriter writer{memory_manager};
-  {
-    size_t num_histo_bits = CeilLog2Nonzero(frame_dim.num_groups);
-    JXL_RETURN_IF_ERROR(
-        writer.WithMaxBits(num_histo_bits + 1, LayerType::Ac, aux_out, [&] {
-          writer.Write(1, 1);  // default dequant matrices
-          writer.Write(num_histo_bits, frame_dim.num_dc_groups - 1);
-          return true;
-        }));
-  }
-  const PassesSharedState& shared = enc_state.shared;
-  for (size_t i = 0; i < enc_state.progressive_splitter.GetNumPasses(); i++) {
-    // Encode coefficient orders.
-    size_t order_bits = 0;
-    JXL_RETURN_IF_ERROR(
-        U32Coder::CanEncode(kOrderEnc, enc_state.used_orders[i], &order_bits));
-    JXL_RETURN_IF_ERROR(
-        writer.WithMaxBits(order_bits, LayerType::Order, aux_out, [&] {
-          return U32Coder::Write(kOrderEnc, enc_state.used_orders[i], &writer);
-        }));
-    JXL_RETURN_IF_ERROR(
-        EncodeCoeffOrders(enc_state.used_orders[i],
-                          &shared.coeff_orders[i * shared.coeff_order_size],
-                          &writer, LayerType::Order, aux_out));
-    // Fix up context map and entropy codes to remove any fix histograms that
-    // were not selected by clustering.
-    RemoveUnusedHistograms(enc_state.passes[i].context_map,
-                           enc_state.passes[i].codes);
-    JXL_RETURN_IF_ERROR(EncodeHistograms(enc_state.passes[i].context_map,
-                                         enc_state.passes[i].codes, &writer,
-                                         LayerType::Ac, aux_out));
-  }
-  JXL_RETURN_IF_ERROR(writer.WithMaxBits(8, LayerType::Ac, aux_out, [&] {
-    writer.ZeroPadToByte();  // end of group.
-    return true;
-  }));
-  PaddedBytes ac_global = std::move(writer).TakeBytes();
-  group_sizes->push_back(ac_global.size());
-  JXL_RETURN_IF_ERROR(AppendData(*output_processor, ac_global));
-  return true;
-}
-
-Status EncodeFrameStreaming(JxlMemoryManager* memory_manager,
-                            const CompressParams& cparams,
-                            const FrameInfo& frame_info,
-                            const CodecMetadata* metadata,
-                            JxlEncoderChunkedFrameAdapter& frame_data,
-                            const JxlCmsInterface& cms, ThreadPool* pool,
-                            JxlEncoderOutputProcessorWrapper* output_processor,
-                            AuxOut* aux_out) {
-  PassesEncoderState enc_state{memory_manager};
-  SetProgressiveMode(cparams, &enc_state.progressive_splitter);
-  FrameHeader frame_header(metadata);
-  std::unique_ptr<jpeg::JPEGData> jpeg_data;
-  if (frame_data.IsJPEG()) {
-    jpeg_data = frame_data.TakeJPEGData();
-    JXL_ENSURE(jpeg_data);
-  }
-  JXL_RETURN_IF_ERROR(MakeFrameHeader(frame_data.xsize, frame_data.ysize,
-                                      cparams, enc_state.progressive_splitter,
-                                      frame_info, jpeg_data.get(), true,
-                                      &frame_header));
-  const size_t num_passes = enc_state.progressive_splitter.GetNumPasses();
-  JXL_ASSIGN_OR_RETURN(
-      ModularFrameEncoder enc_modular,
-      ModularFrameEncoder::Create(memory_manager, frame_header, cparams, true));
-  std::vector<coeff_order_t> permutation;
-  std::vector<size_t> dc_group_order;
-  size_t group_size = frame_header.ToFrameDimensions().group_dim;
-  JXL_RETURN_IF_ERROR(ComputePermutationForStreaming(
-      frame_data.xsize, frame_data.ysize, group_size, num_passes, permutation,
-      dc_group_order));
-  enc_state.shared.num_histograms = dc_group_order.size();
-  size_t dc_group_size = group_size * kBlockDim;
-  size_t dc_group_xsize = DivCeil(frame_data.xsize, dc_group_size);
-  size_t min_dc_global_size = 0;
-  size_t group_data_offset = 0;
-  PaddedBytes frame_header_bytes{memory_manager};
-  PaddedBytes dc_global_bytes{memory_manager};
-  std::vector<size_t> group_sizes;
-  size_t start_pos = output_processor->CurrentPosition();
-  for (size_t i = 0; i < dc_group_order.size(); ++i) {
-    size_t dc_ix = dc_group_order[i];
-    size_t dc_y = dc_ix / dc_group_xsize;
-    size_t dc_x = dc_ix % dc_group_xsize;
-    size_t y0 = dc_y * dc_group_size;
-    size_t x0 = dc_x * dc_group_size;
-    size_t ysize = std::min<size_t>(dc_group_size, frame_data.ysize - y0);
-    size_t xsize = std::min<size_t>(dc_group_size, frame_data.xsize - x0);
-    size_t group_xsize = DivCeil(xsize, group_size);
-    size_t group_ysize = DivCeil(ysize, group_size);
-    JXL_DEBUG_V(2,
-                "Encoding DC group #%" PRIuS " dc_y = %" PRIuS " dc_x = %" PRIuS
-                " (x0, y0) = (%" PRIuS ", %" PRIuS ") (xsize, ysize) = (%" PRIuS
-                ", %" PRIuS ")",
-                dc_ix, dc_y, dc_x, x0, y0, xsize, ysize);
-    enc_state.streaming_mode = true;
-    enc_state.initialize_global_state = (i == 0);
-    enc_state.dc_group_index = dc_ix;
-    enc_state.histogram_idx = std::vector<size_t>(group_xsize * group_ysize, i);
-    std::vector<std::unique_ptr<BitWriter>> group_codes;
-    JXL_RETURN_IF_ERROR(ComputeEncodingData(
-        cparams, frame_info, metadata, frame_data, jpeg_data.get(), x0, y0,
-        xsize, ysize, cms, pool, frame_header, enc_modular, enc_state,
-        &group_codes, aux_out));
-    JXL_ENSURE(enc_state.special_frames.empty());
-    if (i == 0) {
-      BitWriter writer{memory_manager};
-      JXL_RETURN_IF_ERROR(WriteFrameHeader(frame_header, &writer, aux_out));
-      JXL_RETURN_IF_ERROR(
-          writer.WithMaxBits(8, LayerType::Header, aux_out, [&]() -> Status {
-            writer.Write(1, 1);  // write permutation
-            JXL_RETURN_IF_ERROR(EncodePermutation(
-                permutation.data(), /*skip=*/0, permutation.size(), &writer,
-                LayerType::Header, aux_out));
-            writer.ZeroPadToByte();
-            return true;
-          }));
-      frame_header_bytes = std::move(writer).TakeBytes();
-      dc_global_bytes = std::move(*group_codes[0]).TakeBytes();
-      JXL_RETURN_IF_ERROR(ComputeGroupDataOffset(
-          frame_header_bytes.size(), dc_global_bytes.size(), permutation.size(),
-          min_dc_global_size, group_data_offset));
-      JXL_DEBUG_V(2, "Frame header size: %" PRIuS, frame_header_bytes.size());
-      JXL_DEBUG_V(2, "DC global size: %" PRIuS ", min size for TOC: %" PRIuS,
-                  dc_global_bytes.size(), min_dc_global_size);
-      JXL_DEBUG_V(2, "Num groups: %" PRIuS " group data offset: %" PRIuS,
-                  permutation.size(), group_data_offset);
-      group_sizes.push_back(dc_global_bytes.size());
-      JXL_RETURN_IF_ERROR(
-          output_processor->Seek(start_pos + group_data_offset));
-    }
-    JXL_RETURN_IF_ERROR(
-        OutputGroups(std::move(group_codes), &group_sizes, output_processor));
-  }
-  if (frame_header.encoding == FrameEncoding::kVarDCT) {
-    JXL_RETURN_IF_ERROR(
-        OutputAcGlobal(enc_state, frame_header.ToFrameDimensions(),
-                       &group_sizes, output_processor, aux_out));
-  } else {
-    group_sizes.push_back(0);
-  }
-  JXL_ENSURE(group_sizes.size() == permutation.size());
-  size_t end_pos = output_processor->CurrentPosition();
-  JXL_RETURN_IF_ERROR(output_processor->Seek(start_pos));
-  size_t padding_size =
-      ComputeDcGlobalPadding(group_sizes, frame_header_bytes.size(),
-                             group_data_offset, min_dc_global_size);
-  group_sizes[0] += padding_size;
-  JXL_ASSIGN_OR_RETURN(PaddedBytes toc_bytes,
-                       EncodeTOC(memory_manager, group_sizes, aux_out));
-  std::vector<uint8_t> padding_bytes(padding_size);
-  JXL_RETURN_IF_ERROR(AppendData(*output_processor, frame_header_bytes));
-  JXL_RETURN_IF_ERROR(AppendData(*output_processor, toc_bytes));
-  JXL_RETURN_IF_ERROR(AppendData(*output_processor, dc_global_bytes));
-  JXL_RETURN_IF_ERROR(AppendData(*output_processor, padding_bytes));
-  JXL_DEBUG_V(2, "TOC size: %" PRIuS " padding bytes after DC global: %" PRIuS,
-              toc_bytes.size(), padding_size);
-  JXL_ENSURE(output_processor->CurrentPosition() ==
-             start_pos + group_data_offset);
-  JXL_RETURN_IF_ERROR(output_processor->Seek(end_pos));
-  return true;
-}
-
-Status EncodeFrameOneShot(JxlMemoryManager* memory_manager,
-                          const CompressParams& cparams,
-                          const FrameInfo& frame_info,
-                          const CodecMetadata* metadata,
-                          JxlEncoderChunkedFrameAdapter& frame_data,
-                          const JxlCmsInterface& cms, ThreadPool* pool,
-                          JxlEncoderOutputProcessorWrapper* output_processor,
-                          AuxOut* aux_out) {
-  PassesEncoderState enc_state{memory_manager};
-  SetProgressiveMode(cparams, &enc_state.progressive_splitter);
-  FrameHeader frame_header(metadata);
-  std::unique_ptr<jpeg::JPEGData> jpeg_data;
-  if (frame_data.IsJPEG()) {
-    jpeg_data = frame_data.TakeJPEGData();
-    JXL_ENSURE(jpeg_data);
-  }
-  JXL_RETURN_IF_ERROR(MakeFrameHeader(frame_data.xsize, frame_data.ysize,
-                                      cparams, enc_state.progressive_splitter,
-                                      frame_info, jpeg_data.get(), false,
-                                      &frame_header));
-  const size_t num_passes = enc_state.progressive_splitter.GetNumPasses();
-  JXL_ASSIGN_OR_RETURN(ModularFrameEncoder enc_modular,
-                       ModularFrameEncoder::Create(memory_manager, frame_header,
-                                                   cparams, false));
-  std::vector<std::unique_ptr<BitWriter>> group_codes;
-  JXL_RETURN_IF_ERROR(ComputeEncodingData(
-      cparams, frame_info, metadata, frame_data, jpeg_data.get(), 0, 0,
-      frame_data.xsize, frame_data.ysize, cms, pool, frame_header, enc_modular,
-      enc_state, &group_codes, aux_out));
-
-  BitWriter writer{memory_manager};
-  JXL_RETURN_IF_ERROR(writer.AppendByteAligned(enc_state.special_frames));
-  JXL_RETURN_IF_ERROR(WriteFrameHeader(frame_header, &writer, aux_out));
-
-  std::vector<coeff_order_t> permutation;
-  JXL_RETURN_IF_ERROR(PermuteGroups(cparams, enc_state.shared.frame_dim,
-                                    num_passes, &permutation, &group_codes));
-
-  JXL_RETURN_IF_ERROR(
-      WriteGroupOffsets(group_codes, permutation, &writer, aux_out));
-
-  JXL_RETURN_IF_ERROR(writer.AppendByteAligned(group_codes));
-  PaddedBytes frame_bytes = std::move(writer).TakeBytes();
-  JXL_RETURN_IF_ERROR(AppendData(*output_processor, frame_bytes));
-
-  return true;
-}
-
-}  // namespace
-
-std::vector<CompressParams> TectonicPlateSettingsLessPalette(
-    const CompressParams& cparams_orig) {
-  std::vector<CompressParams> all_params;
-  CompressParams cparams_attempt = cparams_orig;
-  cparams_attempt.speed_tier = SpeedTier::kGlacier;
-
-  cparams_attempt.options.max_properties = 4;
-  cparams_attempt.options.nb_repeats = 1.0f;
-  cparams_attempt.modular_group_size_shift = 0;
-  cparams_attempt.channel_colors_percent = 0;
-  cparams_attempt.options.predictor = Predictor::Variable;
-  cparams_attempt.channel_colors_pre_transform_percent = 95.f;
-  cparams_attempt.palette_colors = 1024;
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kDefault;
-  cparams_attempt.patches = Override::kDefault;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.channel_colors_percent = 80.f;
-  cparams_attempt.modular_group_size_shift = 1;
-  cparams_attempt.palette_colors = 0;
-  cparams_attempt.channel_colors_pre_transform_percent = 0;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.channel_colors_pre_transform_percent = 95.f;
-  cparams_attempt.modular_group_size_shift = 2;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.modular_group_size_shift = 3;
-  cparams_attempt.patches = Override::kOff;
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kNoWP;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.palette_colors = 1024;
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kDefault;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.patches = Override::kDefault;
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kNoWP;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kDefault;
-  cparams_attempt.channel_colors_pre_transform_percent = 0;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.channel_colors_pre_transform_percent = 95.f;
-  cparams_attempt.options.nb_repeats = 0.9f;
-  cparams_attempt.modular_group_size_shift = 2;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.modular_group_size_shift = 3;
-  cparams_attempt.palette_colors = 0;
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kNoWP;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kDefault;
-  cparams_attempt.channel_colors_pre_transform_percent = 0;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.palette_colors = 1024;
-  cparams_attempt.options.nb_repeats = 0.95f;
-  cparams_attempt.modular_group_size_shift = 1;
-  cparams_attempt.channel_colors_percent = 0;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.modular_group_size_shift = 2;
-  cparams_attempt.palette_colors = 0;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.channel_colors_percent = 80.f;
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kNoWP;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.palette_colors = 1024;
-  cparams_attempt.channel_colors_pre_transform_percent = 95.f;
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kDefault;
-  cparams_attempt.modular_group_size_shift = 3;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.palette_colors = 0;
-  cparams_attempt.patches = Override::kOff;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.patches = Override::kDefault;
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kNoWP;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.palette_colors = 1024;
-  cparams_attempt.patches = Override::kOff;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.options.nb_repeats = 0.5f;
-  cparams_attempt.patches = Override::kDefault;
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kDefault;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.options.predictor = Predictor::Zero;
-  cparams_attempt.options.nb_repeats = 0;
-  cparams_attempt.channel_colors_percent = 0;
-  cparams_attempt.channel_colors_pre_transform_percent = 0;
-  cparams_attempt.patches = Override::kOff;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.channel_colors_percent = 80.f;
-  cparams_attempt.channel_colors_pre_transform_percent = 95.f;
-  cparams_attempt.options.nb_repeats = 1.0f;
-  cparams_attempt.palette_colors = 0;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.patches = Override::kDefault;
-  cparams_attempt.options.predictor = Predictor::Best;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.options.nb_repeats = 0.9f;
-  cparams_attempt.patches = Override::kOff;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.palette_colors = 1024;
-  cparams_attempt.patches = Override::kDefault;
-  cparams_attempt.options.predictor = Predictor::Weighted;
-  cparams_attempt.options.nb_repeats = 1.0f;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.options.nb_repeats = 0.95f;
-  cparams_attempt.modular_group_size_shift = 2;
-  cparams_attempt.palette_colors = 0;
-  cparams_attempt.channel_colors_pre_transform_percent = 0;
-  all_params.push_back(cparams_attempt);
-  return all_params;
-}
-
-std::vector<CompressParams> TectonicPlateSettingsMorePalette(
-    const CompressParams& cparams_orig) {
-  std::vector<CompressParams> all_params;
-  CompressParams cparams_attempt = cparams_orig;
-  cparams_attempt.speed_tier = SpeedTier::kGlacier;
-
-  cparams_attempt.options.max_properties = 4;
-  cparams_attempt.options.nb_repeats = 1.0f;
-  cparams_attempt.modular_group_size_shift = 0;
-  cparams_attempt.palette_colors = 70000;
-  cparams_attempt.options.predictor = Predictor::Variable;
-  cparams_attempt.channel_colors_percent = 80.f;
-  cparams_attempt.channel_colors_pre_transform_percent = 95.f;
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kDefault;
-  cparams_attempt.patches = Override::kDefault;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.modular_group_size_shift = 2;
-  cparams_attempt.channel_colors_percent = 0;
-  cparams_attempt.patches = Override::kOff;
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kNoWP;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.channel_colors_percent = 80.f;
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kDefault;
-  cparams_attempt.modular_group_size_shift = 3;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.options.nb_repeats = 0.9f;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.patches = Override::kDefault;
-  cparams_attempt.options.nb_repeats = 0.95f;
-  cparams_attempt.modular_group_size_shift = 0;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.modular_group_size_shift = 3;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.patches = Override::kOff;
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kNoWP;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.options.nb_repeats = 0.5f;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kDefault;
-  cparams_attempt.options.predictor = Predictor::Zero;
-  cparams_attempt.options.nb_repeats = 0;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.patches = Override::kDefault;
-  cparams_attempt.channel_colors_pre_transform_percent = 0;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.options.nb_repeats = 0.01f;
-  cparams_attempt.palette_colors = 0;
-  cparams_attempt.patches = Override::kOff;
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kNoWP;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.channel_colors_pre_transform_percent = 95.f;
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kDefault;
-  cparams_attempt.palette_colors = 70000;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.options.nb_repeats = 1.0f;
-  cparams_attempt.modular_group_size_shift = 0;
-  cparams_attempt.channel_colors_percent = 0;
-  cparams_attempt.channel_colors_pre_transform_percent = 0;
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kNoWP;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.channel_colors_pre_transform_percent = 95.f;
-  cparams_attempt.modular_group_size_shift = 1;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.modular_group_size_shift = 2;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.channel_colors_percent = 80.f;
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kDefault;
-  cparams_attempt.modular_group_size_shift = 3;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.options.nb_repeats = 0.5f;
-  cparams_attempt.modular_group_size_shift = 1;
-  cparams_attempt.channel_colors_percent = 0;
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kNoWP;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kDefault;
-  cparams_attempt.modular_group_size_shift = 2;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.channel_colors_percent = 80.f;
-  cparams_attempt.modular_group_size_shift = 3;
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kNoWP;
-  all_params.push_back(cparams_attempt);
-  cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kDefault;
-  cparams_attempt.options.predictor = Predictor::Select;
-  cparams_attempt.options.nb_repeats = 1.0f;
-  all_params.push_back(cparams_attempt);
-  return all_params;
-}
-
-Status EncodeFrame(JxlMemoryManager* memory_manager,
-                   const CompressParams& cparams_orig,
-                   const FrameInfo& frame_info, const CodecMetadata* metadata,
-                   JxlEncoderChunkedFrameAdapter& frame_data,
-                   const JxlCmsInterface& cms, ThreadPool* pool,
-                   JxlEncoderOutputProcessorWrapper* output_processor,
-                   AuxOut* aux_out) {
-  CompressParams cparams = cparams_orig;
-  if (cparams.speed_tier == SpeedTier::kTectonicPlate &&
-      !cparams.IsLossless()) {
-    cparams.speed_tier = SpeedTier::kGlacier;
-  }
-  // Lightning mode is handled externally, so switch to Thunder mode to handle
-  // potentially weird cases.
-  if (cparams.speed_tier == SpeedTier::kLightning) {
-    cparams.speed_tier = SpeedTier::kThunder;
-  }
-  if (cparams.speed_tier == SpeedTier::kTectonicPlate) {
-    // Test palette performance to inform later trials.
-    std::vector<CompressParams> all_params;
-    CompressParams cparams_attempt = cparams_orig;
-    cparams_attempt.speed_tier = SpeedTier::kGlacier;
-
-    cparams_attempt.options.max_properties = 4;
-    cparams_attempt.options.nb_repeats = 1.0f;
-    cparams_attempt.modular_group_size_shift = 3;
-    cparams_attempt.palette_colors = 0;
-    cparams_attempt.options.predictor = Predictor::Variable;
-    cparams_attempt.channel_colors_percent = 80.f;
-    cparams_attempt.channel_colors_pre_transform_percent = 95.f;
-    cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kDefault;
-    cparams_attempt.patches = Override::kDefault;
-    all_params.push_back(cparams_attempt);
-    cparams_attempt.options.predictor = Predictor::Zero;
-    cparams_attempt.options.nb_repeats = 0.01f;
-    cparams_attempt.palette_colors = 70000;
-    cparams_attempt.patches = Override::kOff;
-    cparams_attempt.options.wp_tree_mode = ModularOptions::TreeMode::kNoWP;
-    all_params.push_back(cparams_attempt);
-
-    std::vector<size_t> size;
-    size.resize(all_params.size());
-
-    const auto process_variant = [&](size_t task, size_t) -> Status {
-      std::vector<uint8_t> output(64);
-      uint8_t* next_out = output.data();
-      size_t avail_out = output.size();
-      JxlEncoderOutputProcessorWrapper local_output(memory_manager);
-      JXL_RETURN_IF_ERROR(local_output.SetAvailOut(&next_out, &avail_out));
-      JXL_RETURN_IF_ERROR(EncodeFrame(memory_manager, all_params[task],
-                                      frame_info, metadata, frame_data, cms,
-                                      nullptr, &local_output, aux_out));
-      size[task] = local_output.CurrentPosition();
-      return true;
-    };
-    JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, all_params.size(),
-                                  ThreadPool::NoInit, process_variant,
-                                  "Compress kTectonicPlate"));
-
-    std::vector<CompressParams> all_params_test = all_params;
-    std::vector<size_t> size_test = size;
-    size_t best_idx_test = 0;
-
-    if (size_test[0] <= size_test[1]) {
-      all_params = TectonicPlateSettingsLessPalette(cparams_orig);
-    } else {
-      best_idx_test = 1;
-      all_params = TectonicPlateSettingsMorePalette(cparams_orig);
-    }
-
-    size.clear();
-    size.resize(all_params.size());
-
-    JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, all_params.size(),
-                                  ThreadPool::NoInit, process_variant,
-                                  "Compress kTectonicPlate"));
-
-    size_t best_idx = 0;
-    for (size_t i = 1; i < all_params.size(); i++) {
-      if (size[best_idx] > size[i]) {
-        best_idx = i;
-      }
-    }
-    if (size[best_idx] < size_test[best_idx_test]) {
-      cparams = all_params[best_idx];
-    } else {
-      cparams = all_params_test[best_idx_test];
-    }
-  }
-
-  JXL_RETURN_IF_ERROR(ParamsPostInit(&cparams));
-
-  if (cparams.butteraugli_distance < 0) {
-    return JXL_FAILURE("Expected non-negative distance");
-  }
-
-  if (cparams.progressive_dc < 0) {
-    if (cparams.progressive_dc != -1) {
-      return JXL_FAILURE("Invalid progressive DC setting value (%d)",
-                         cparams.progressive_dc);
-    }
-    cparams.progressive_dc = 0;
-  }
-  if (cparams.ec_resampling < cparams.resampling) {
-    cparams.ec_resampling = cparams.resampling;
-  }
-  if (cparams.resampling > 1 || frame_info.is_preview) {
-    cparams.progressive_dc = 0;
-  }
-
-  if (frame_info.dc_level + cparams.progressive_dc > 4) {
-    return JXL_FAILURE("Too many levels of progressive DC");
-  }
-
-  if (cparams.butteraugli_distance != 0 &&
-      cparams.butteraugli_distance < kMinButteraugliDistance) {
-    return JXL_FAILURE("Butteraugli distance is too low (%f)",
-                       cparams.butteraugli_distance);
-  }
-
-  if (frame_data.IsJPEG()) {
-    cparams.gaborish = Override::kOff;
-    cparams.epf = 0;
-    cparams.modular_mode = false;
-  }
-
-  if (frame_data.xsize == 0 || frame_data.ysize == 0) {
-    return JXL_FAILURE("Empty image");
-  }
-
-  // Assert that this metadata is correctly set up for the compression params,
-  // this should have been done by enc_file.cc
-  JXL_ENSURE(metadata->m.xyb_encoded ==
-             (cparams.color_transform == ColorTransform::kXYB));
-
-  if (frame_data.IsJPEG() && cparams.color_transform == ColorTransform::kXYB) {
-    return JXL_FAILURE("Can't add JPEG frame to XYB codestream");
-  }
-
-  if (CanDoStreamingEncoding(cparams, frame_info, *metadata, frame_data)) {
-    return EncodeFrameStreaming(memory_manager, cparams, frame_info, metadata,
-                                frame_data, cms, pool, output_processor,
-                                aux_out);
-  } else {
-    return EncodeFrameOneShot(memory_manager, cparams, frame_info, metadata,
-                              frame_data, cms, pool, output_processor, aux_out);
-  }
-}
-
-Status EncodeFrame(JxlMemoryManager* memory_manager,
-                   const CompressParams& cparams_orig,
-                   const FrameInfo& frame_info, const CodecMetadata* metadata,
-                   ImageBundle& ib, const JxlCmsInterface& cms,
-                   ThreadPool* pool, BitWriter* writer, AuxOut* aux_out) {
-  JxlEncoderChunkedFrameAdapter frame_data(ib.xsize(), ib.ysize(),
-                                           ib.extra_channels().size());
-  std::vector<uint8_t> color;
-  if (ib.IsJPEG()) {
-    frame_data.SetJPEGData(std::move(ib.jpeg_data));
-  } else {
-    uint32_t num_channels =
-        ib.IsGray() && frame_info.ib_needs_color_transform ? 1 : 3;
-    size_t stride = ib.xsize() * num_channels * 4;
-    color.resize(ib.ysize() * stride);
-    JXL_RETURN_IF_ERROR(ConvertToExternal(
-        ib, /*bits_per_sample=*/32, /*float_out=*/true, num_channels,
-        JXL_NATIVE_ENDIAN, stride, pool, color.data(), color.size(),
-        /*out_callback=*/{}, Orientation::kIdentity));
-    JxlPixelFormat format{num_channels, JXL_TYPE_FLOAT, JXL_NATIVE_ENDIAN, 0};
-    frame_data.SetFromBuffer(0, color.data(), color.size(), format);
-  }
-  for (size_t ec = 0; ec < ib.extra_channels().size(); ++ec) {
-    JxlPixelFormat ec_format{1, JXL_TYPE_FLOAT, JXL_NATIVE_ENDIAN, 0};
-    size_t ec_stride = ib.xsize() * 4;
-    std::vector<uint8_t> ec_data(ib.ysize() * ec_stride);
-    const ImageF* channel = &ib.extra_channels()[ec];
-    JXL_RETURN_IF_ERROR(ConvertChannelsToExternal(
-        &channel, 1,
-        /*bits_per_sample=*/32,
-        /*float_out=*/true, JXL_NATIVE_ENDIAN, ec_stride, pool, ec_data.data(),
-        ec_data.size(), /*out_callback=*/{}, Orientation::kIdentity));
-    frame_data.SetFromBuffer(1 + ec, ec_data.data(), ec_data.size(), ec_format);
-  }
-  FrameInfo fi = frame_info;
-  fi.origin = ib.origin;
-  fi.blend = ib.blend;
-  fi.blendmode = ib.blendmode;
-  fi.duration = ib.duration;
-  fi.timecode = ib.timecode;
-  fi.name = ib.name;
-  std::vector<uint8_t> output(64);
-  uint8_t* next_out = output.data();
-  size_t avail_out = output.size();
-  JxlEncoderOutputProcessorWrapper output_processor(memory_manager);
-  JXL_RETURN_IF_ERROR(output_processor.SetAvailOut(&next_out, &avail_out));
-  JXL_RETURN_IF_ERROR(EncodeFrame(memory_manager, cparams_orig, fi, metadata,
-                                  frame_data, cms, pool, &output_processor,
-                                  aux_out));
-  JXL_RETURN_IF_ERROR(output_processor.SetFinalizedPosition());
-  JXL_RETURN_IF_ERROR(output_processor.CopyOutput(output, next_out, avail_out));
-  JXL_RETURN_IF_ERROR(writer->AppendByteAligned(Bytes(output)));
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_frame.h b/third_party/jpeg-xl/lib/jxl/enc_frame.h
deleted file mode 100644
index e96f077373de0..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_frame.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_FRAME_H_
-#define LIB_JXL_ENC_FRAME_H_
-
-#include <jxl/cms_interface.h>
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <string>
-#include <vector>
-
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/enc_cache.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/encode_internal.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_metadata.h"
-
-namespace jxl {
-
-struct AuxOut;
-
-// Information needed for encoding a frame that is not contained elsewhere and
-// does not belong to `cparams`.
-// TODO(lode): if possible, it might be better to replace FrameInfo and several
-// fields from ImageBundle (such as frame name and duration) by direct usage of
-// jxl::FrameHeader itself.
-struct FrameInfo {
-  // TODO(veluca): consider adding more parameters, such as custom patches.
-  bool save_before_color_transform = false;
-  // Whether or not the input image bundle is already in the codestream
-  // colorspace (as deduced by cparams).
-  // TODO(veluca): this is a hack - ImageBundle doesn't have a simple way to say
-  // "this is already in XYB".
-  bool ib_needs_color_transform = true;
-  FrameType frame_type = FrameType::kRegularFrame;
-  size_t dc_level = 0;
-  // Only used for kRegularFrame.
-  bool is_last = true;
-  bool is_preview = false;
-  // Information for storing this frame for future use (only for non-DC frames).
-  size_t save_as_reference = 0;
-  // The source frame for blending of a next frame, matching the
-  // save_as_reference value of a previous frame. Animated frames can use
-  // save_as_reference values 1, 2 and 3, while composite still frames can use
-  // save_as_reference values 0, 1, 2 and 3. The current C++ encoder
-  // implementation is assuming and using 1 for all frames of animations, so
-  // using that as the default value here.
-  // Corresponds to BlendingInfo::source from the FrameHeader.
-  size_t source = 1;
-  // Corresponds to BlendingInfo::clamp from the FrameHeader.
-  bool clamp = true;
-  // Corresponds to BlendingInfo::alpha_channel from the FrameHeader, or set to
-  // -1 to automatically choose it as the index of the first extra channel of
-  // type alpha.
-  int alpha_channel = -1;
-
-  FrameOrigin origin{0, 0};
-
-  bool blend = false;
-  BlendMode blendmode = BlendMode::kBlend;
-
-  JxlBitDepth image_bit_depth = {};
-
-  // Animation-related information, corresponding to the timecode and duration
-  // fields of the jxl::AnimationFrame of the jxl::FrameHeader.
-  uint32_t duration = 0;
-  uint32_t timecode = 0;
-
-  std::string name;
-
-  // If non-empty, uses this blending info for the extra channels, otherwise
-  // automatically chooses it. The encoder API will fill this vector with the
-  // extra channel info and allows more options. The non-API cjxl leaves it
-  // empty and relies on the default behavior.
-  std::vector<BlendingInfo> extra_channel_blending_info;
-};
-
-// Checks and adjusts CompressParams when they are all initialized.
-Status ParamsPostInit(CompressParams* p);
-
-// Encodes a single frame (including its header) into a byte stream.  Groups may
-// be processed in parallel by `pool`. metadata is the ImageMetadata encoded in
-// the codestream, and must be used for the FrameHeaders, do not use
-// ib.metadata.
-Status EncodeFrame(JxlMemoryManager* memory_manager,
-                   const CompressParams& cparams_orig,
-                   const FrameInfo& frame_info, const CodecMetadata* metadata,
-                   JxlEncoderChunkedFrameAdapter& frame_data,
-                   const JxlCmsInterface& cms, ThreadPool* pool,
-                   JxlEncoderOutputProcessorWrapper* output_processor,
-                   AuxOut* aux_out);
-
-Status EncodeFrame(JxlMemoryManager* memory_manager,
-                   const CompressParams& cparams_orig,
-                   const FrameInfo& frame_info, const CodecMetadata* metadata,
-                   ImageBundle& ib, const JxlCmsInterface& cms,
-                   ThreadPool* pool, BitWriter* writer, AuxOut* aux_out);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_FRAME_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_gaborish.cc b/third_party/jpeg-xl/lib/jxl/enc_gaborish.cc
deleted file mode 100644
index 4e24abf3ffd68..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_gaborish.cc
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_gaborish.h"
-
-#include <jxl/memory_manager.h>
-
-#include <hwy/base.h>
-
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/convolve.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_ops.h"
-
-namespace jxl {
-
-Status GaborishInverse(Image3F* in_out, const Rect& rect, const float mul[3],
-                       ThreadPool* pool) {
-  JxlMemoryManager* memory_manager = in_out->memory_manager();
-  WeightsSymmetric5 weights[3];
-  // Only an approximation. One or even two 3x3, and rank-1 (separable) 5x5
-  // are insufficient. The numbers here have been obtained by butteraugli
-  // based optimizing the whole system and the errors produced are likely
-  // more favorable for good rate-distortion compromises rather than
-  // just using mathematical optimization to find the inverse.
-  static const float kGaborish[5] = {
-      -0.09495815671340026, -0.041031725066768575,  0.013710004822696948,
-      0.006510206083837737, -0.0014789063378272242,
-  };
-  for (int i = 0; i < 3; ++i) {
-    double sum = 1.0 + mul[i] * 4 *
-                           (kGaborish[0] + kGaborish[1] + kGaborish[2] +
-                            kGaborish[4] + 2 * kGaborish[3]);
-    if (sum < 1e-5) {
-      sum = 1e-5;
-    }
-    const float normalize = static_cast<float>(1.0 / sum);
-    const float normalize_mul = mul[i] * normalize;
-    weights[i] = WeightsSymmetric5{{HWY_REP4(normalize)},
-                                   {HWY_REP4(normalize_mul * kGaborish[0])},
-                                   {HWY_REP4(normalize_mul * kGaborish[2])},
-                                   {HWY_REP4(normalize_mul * kGaborish[1])},
-                                   {HWY_REP4(normalize_mul * kGaborish[4])},
-                                   {HWY_REP4(normalize_mul * kGaborish[3])}};
-  }
-  // Reduce memory footprint by only allocating a single plane and swapping it
-  // into the output Image3F. Better still would be tiling.
-  // Note that we cannot *allocate* a plane, as doing so might cause Image3F to
-  // have planes of different stride. Instead, we copy one plane in a temporary
-  // image and reuse the existing planes of the in/out image.
-  ImageF temp;
-  JXL_ASSIGN_OR_RETURN(temp,
-                       ImageF::Create(memory_manager, in_out->Plane(2).xsize(),
-                                      in_out->Plane(2).ysize()));
-  JXL_RETURN_IF_ERROR(CopyImageTo(in_out->Plane(2), &temp));
-  Rect xrect = rect.Extend(3, Rect(*in_out));
-  JXL_RETURN_IF_ERROR(Symmetric5(in_out->Plane(0), xrect, weights[0], pool,
-                                 &in_out->Plane(2), xrect));
-  JXL_RETURN_IF_ERROR(Symmetric5(in_out->Plane(1), xrect, weights[1], pool,
-                                 &in_out->Plane(0), xrect));
-  JXL_RETURN_IF_ERROR(
-      Symmetric5(temp, xrect, weights[2], pool, &in_out->Plane(1), xrect));
-  // Now planes are 1, 2, 0.
-  in_out->Plane(0).Swap(in_out->Plane(1));
-  // 2 1 0
-  in_out->Plane(0).Swap(in_out->Plane(2));
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_gaborish.h b/third_party/jpeg-xl/lib/jxl/enc_gaborish.h
deleted file mode 100644
index ce1c211ffa4a2..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_gaborish.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_GABORISH_H_
-#define LIB_JXL_GABORISH_H_
-
-// Linear smoothing (3x3 convolution) for deblocking without too much blur.
-
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/image.h"
-
-namespace jxl {
-
-// Used in encoder to reduce the impact of the decoder's smoothing.
-// This is not exact. Works in-place to reduce memory use.
-// The input is typically in XYB space.
-Status GaborishInverse(Image3F* in_out, const Rect& rect, const float mul[3],
-                       ThreadPool* pool);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_GABORISH_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_gaborish_test.cc b/third_party/jpeg-xl/lib/jxl/enc_gaborish_test.cc
deleted file mode 100644
index 906a9a57103fe..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_gaborish_test.cc
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_gaborish.h"
-
-#include <jxl/types.h>
-
-#include <hwy/base.h>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/convolve.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/image_test_utils.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-// weight1,2 need not be normalized.
-WeightsSymmetric3 GaborishKernel(float weight1, float weight2) {
-  constexpr float weight0 = 1.0f;
-
-  // Normalize
-  const float mul = 1.0f / (weight0 + 4 * (weight1 + weight2));
-  const float w0 = weight0 * mul;
-  const float w1 = weight1 * mul;
-  const float w2 = weight2 * mul;
-
-  const WeightsSymmetric3 w = {{HWY_REP4(w0)}, {HWY_REP4(w1)}, {HWY_REP4(w2)}};
-  return w;
-}
-
-void ConvolveGaborish(const ImageF& in, float weight1, float weight2,
-                      ThreadPool* pool, ImageF* JXL_RESTRICT out) {
-  ASSERT_TRUE(SameSize(in, *out));
-  ASSERT_TRUE(
-      Symmetric3(in, Rect(in), GaborishKernel(weight1, weight2), pool, out));
-}
-
-void TestRoundTrip(const Image3F& in, float max_l1) {
-  JXL_TEST_ASSIGN_OR_DIE(
-      Image3F fwd,
-      Image3F::Create(jxl::test::MemoryManager(), in.xsize(), in.ysize()));
-  ThreadPool* null_pool = nullptr;
-  ConvolveGaborish(in.Plane(0), 0, 0, null_pool, &fwd.Plane(0));
-  ConvolveGaborish(in.Plane(1), 0, 0, null_pool, &fwd.Plane(1));
-  ConvolveGaborish(in.Plane(2), 0, 0, null_pool, &fwd.Plane(2));
-  float w = 0.92718927264540152f;
-  float weights[3] = {
-      w,
-      w,
-      w,
-  };
-  ASSERT_TRUE(GaborishInverse(&fwd, Rect(fwd), weights, null_pool));
-  JXL_TEST_ASSERT_OK(VerifyRelativeError(in, fwd, max_l1, 1E-4f, _));
-}
-
-TEST(GaborishTest, TestZero) {
-  JXL_TEST_ASSIGN_OR_DIE(Image3F in,
-                         Image3F::Create(jxl::test::MemoryManager(), 20, 20));
-  ZeroFillImage(&in);
-  TestRoundTrip(in, 0.0f);
-}
-
-// Disabled: large difference.
-#if JXL_FALSE
-TEST(GaborishTest, TestDirac) {
-  JXL_TEST_ASSIGN_OR_DIE(Image3F in,
-                         Image3F::Create(jxl::test::MemoryManager(), 20, 20));
-  ZeroFillImage(&in);
-  in.PlaneRow(1, 10)[10] = 10.0f;
-  TestRoundTrip(in, 0.26f);
-}
-#endif
-
-TEST(GaborishTest, TestFlat) {
-  JXL_TEST_ASSIGN_OR_DIE(Image3F in,
-                         Image3F::Create(jxl::test::MemoryManager(), 20, 20));
-  FillImage(1.0f, &in);
-  TestRoundTrip(in, 1E-5f);
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_gamma_correct.h b/third_party/jpeg-xl/lib/jxl/enc_gamma_correct.h
deleted file mode 100644
index 0d1b9123e057f..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_gamma_correct.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_GAMMA_CORRECT_H_
-#define LIB_JXL_ENC_GAMMA_CORRECT_H_
-
-// Deprecated: sRGB transfer function. Use JxlCms instead.
-
-#include <cmath>
-
-#include "lib/jxl/base/compiler_specific.h"
-
-namespace jxl {
-
-// Values are in [0, 1].
-static JXL_INLINE double Srgb8ToLinearDirect(double srgb) {
-  if (srgb <= 0.0) return 0.0;
-  if (srgb <= 0.04045) return srgb / 12.92;
-  if (srgb >= 1.0) return 1.0;
-  return std::pow((srgb + 0.055) / 1.055, 2.4);
-}
-
-// Values are in [0, 1].
-static JXL_INLINE double LinearToSrgb8Direct(double linear) {
-  if (linear <= 0.0) return 0.0;
-  if (linear >= 1.0) return 1.0;
-  if (linear <= 0.0031308) return linear * 12.92;
-  return std::pow(linear, 1.0 / 2.4) * 1.055 - 0.055;
-}
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_GAMMA_CORRECT_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_group.cc b/third_party/jpeg-xl/lib/jxl/enc_group.cc
deleted file mode 100644
index 8896ee3b28fed..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_group.cc
+++ /dev/null
@@ -1,561 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_group.h"
-
-#include <jxl/memory_manager.h>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/memory_manager_internal.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/enc_group.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/ac_strategy.h"
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/common.h"  // kMaxNumPasses
-#include "lib/jxl/dct_util.h"
-#include "lib/jxl/dec_transforms-inl.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_cache.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/enc_transforms-inl.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/quantizer-inl.h"
-#include "lib/jxl/quantizer.h"
-#include "lib/jxl/simd_util.h"
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Abs;
-using hwy::HWY_NAMESPACE::Ge;
-using hwy::HWY_NAMESPACE::IfThenElse;
-using hwy::HWY_NAMESPACE::IfThenElseZero;
-using hwy::HWY_NAMESPACE::MaskFromVec;
-using hwy::HWY_NAMESPACE::Round;
-
-// NOTE: caller takes care of extracting quant from rect of RawQuantField.
-void QuantizeBlockAC(const Quantizer& quantizer, const bool error_diffusion,
-                     size_t c, float qm_multiplier, AcStrategyType quant_kind,
-                     size_t xsize, size_t ysize, float* thresholds,
-                     const float* JXL_RESTRICT block_in, const int32_t* quant,
-                     int32_t* JXL_RESTRICT block_out) {
-  const float* JXL_RESTRICT qm = quantizer.InvDequantMatrix(quant_kind, c);
-  float qac = quantizer.Scale() * (*quant);
-  // Not SIMD-ified for now.
-  if (c != 1 && xsize * ysize >= 4) {
-    for (int i = 0; i < 4; ++i) {
-      thresholds[i] -= 0.00744f * xsize * ysize;
-      if (thresholds[i] < 0.5) {
-        thresholds[i] = 0.5;
-      }
-    }
-  }
-  HWY_CAPPED(float, kBlockDim) df;
-  HWY_CAPPED(int32_t, kBlockDim) di;
-  HWY_CAPPED(uint32_t, kBlockDim) du;
-  const auto quantv = Set(df, qac * qm_multiplier);
-  for (size_t y = 0; y < ysize * kBlockDim; y++) {
-    size_t yfix = static_cast<size_t>(y >= ysize * kBlockDim / 2) * 2;
-    const size_t off = y * kBlockDim * xsize;
-    for (size_t x = 0; x < xsize * kBlockDim; x += Lanes(df)) {
-      auto threshold = Zero(df);
-      if (xsize == 1) {
-        HWY_ALIGN uint32_t kMask[kBlockDim] = {0, 0, 0, 0, ~0u, ~0u, ~0u, ~0u};
-        const auto mask = MaskFromVec(BitCast(df, Load(du, kMask + x)));
-        threshold = IfThenElse(mask, Set(df, thresholds[yfix + 1]),
-                               Set(df, thresholds[yfix]));
-      } else {
-        // Same for all lanes in the vector.
-        threshold = Set(
-            df,
-            thresholds[yfix + static_cast<size_t>(x >= xsize * kBlockDim / 2)]);
-      }
-      const auto q = Mul(Load(df, qm + off + x), quantv);
-      const auto in = Load(df, block_in + off + x);
-      const auto val = Mul(q, in);
-      const auto nzero_mask = Ge(Abs(val), threshold);
-      const auto v = ConvertTo(di, IfThenElseZero(nzero_mask, Round(val)));
-      Store(v, di, block_out + off + x);
-    }
-  }
-}
-
-void AdjustQuantBlockAC(const Quantizer& quantizer, size_t c,
-                        float qm_multiplier, AcStrategyType quant_kind,
-                        size_t xsize, size_t ysize, float* thresholds,
-                        const float* JXL_RESTRICT block_in, int32_t* quant) {
-  // No quantization adjusting for these small blocks.
-  // Quantization adjusting attempts to fix some known issues
-  // with larger blocks and on the 8x8 dct's emerging 8x8 blockiness
-  // when there are not many non-zeros.
-  constexpr size_t kPartialBlockKinds =
-      (1 << static_cast<size_t>(AcStrategyType::IDENTITY)) |
-      (1 << static_cast<size_t>(AcStrategyType::DCT2X2)) |
-      (1 << static_cast<size_t>(AcStrategyType::DCT4X4)) |
-      (1 << static_cast<size_t>(AcStrategyType::DCT4X8)) |
-      (1 << static_cast<size_t>(AcStrategyType::DCT8X4)) |
-      (1 << static_cast<size_t>(AcStrategyType::AFV0)) |
-      (1 << static_cast<size_t>(AcStrategyType::AFV1)) |
-      (1 << static_cast<size_t>(AcStrategyType::AFV2)) |
-      (1 << static_cast<size_t>(AcStrategyType::AFV3));
-  if ((1 << static_cast<size_t>(quant_kind)) & kPartialBlockKinds) {
-    return;
-  }
-
-  const float* JXL_RESTRICT qm = quantizer.InvDequantMatrix(quant_kind, c);
-  float qac = quantizer.Scale() * (*quant);
-  if (xsize > 1 || ysize > 1) {
-    for (int i = 0; i < 4; ++i) {
-      thresholds[i] -= Clamp1(0.003f * xsize * ysize, 0.f, 0.08f);
-      if (thresholds[i] < 0.54) {
-        thresholds[i] = 0.54;
-      }
-    }
-  }
-  float sum_of_highest_freq_row_and_column = 0;
-  float sum_of_error = 0;
-  float sum_of_vals = 0;
-  float hfNonZeros[4] = {};
-  float hfMaxError[4] = {};
-
-  for (size_t y = 0; y < ysize * kBlockDim; y++) {
-    for (size_t x = 0; x < xsize * kBlockDim; x++) {
-      const size_t pos = y * kBlockDim * xsize + x;
-      if (x < xsize && y < ysize) {
-        continue;
-      }
-      const size_t hfix = (static_cast<size_t>(y >= ysize * kBlockDim / 2) * 2 +
-                           static_cast<size_t>(x >= xsize * kBlockDim / 2));
-      const float val = block_in[pos] * (qm[pos] * qac * qm_multiplier);
-      const float v = (std::abs(val) < thresholds[hfix]) ? 0 : rintf(val);
-      const float error = std::abs(val - v);
-      sum_of_error += error;
-      sum_of_vals += std::abs(v);
-      if (c == 1 && v == 0) {
-        if (hfMaxError[hfix] < error) {
-          hfMaxError[hfix] = error;
-        }
-      }
-      if (v != 0.0f) {
-        hfNonZeros[hfix] += std::abs(v);
-        bool in_corner = y >= 7 * ysize && x >= 7 * xsize;
-        bool on_border =
-            y == ysize * kBlockDim - 1 || x == xsize * kBlockDim - 1;
-        bool in_larger_corner = x >= 4 * xsize && y >= 4 * ysize;
-        if (in_corner || (on_border && in_larger_corner)) {
-          sum_of_highest_freq_row_and_column += std::abs(val);
-        }
-      }
-    }
-  }
-  if (c == 1 && sum_of_vals * 8 < xsize * ysize) {
-    static const double kLimit[4] = {
-        0.46,
-        0.46,
-        0.46,
-        0.46,
-    };
-    static const double kMul[4] = {
-        0.9999,
-        0.9999,
-        0.9999,
-        0.9999,
-    };
-    const int32_t orig_quant = *quant;
-    int32_t new_quant = *quant;
-    for (int i = 1; i < 4; ++i) {
-      if (hfNonZeros[i] == 0.0 && hfMaxError[i] > kLimit[i]) {
-        new_quant = orig_quant + 1;
-        break;
-      }
-    }
-    *quant = new_quant;
-    if (hfNonZeros[3] == 0.0 && hfMaxError[3] > kLimit[3]) {
-      thresholds[3] = kMul[3] * hfMaxError[3] * new_quant / orig_quant;
-    } else if ((hfNonZeros[1] == 0.0 && hfMaxError[1] > kLimit[1]) ||
-               (hfNonZeros[2] == 0.0 && hfMaxError[2] > kLimit[2])) {
-      thresholds[1] = kMul[1] * std::max(hfMaxError[1], hfMaxError[2]) *
-                      new_quant / orig_quant;
-      thresholds[2] = thresholds[1];
-    } else if (hfNonZeros[0] == 0.0 && hfMaxError[0] > kLimit[0]) {
-      thresholds[0] = kMul[0] * hfMaxError[0] * new_quant / orig_quant;
-    }
-  }
-  // Heuristic for improving accuracy of high-frequency patterns
-  // occurring in an environment with no medium-frequency masking
-  // patterns.
-  {
-    float all =
-        hfNonZeros[0] + hfNonZeros[1] + hfNonZeros[2] + hfNonZeros[3] + 1;
-    float mul[3] = {70, 30, 60};
-    if (mul[c] * sum_of_highest_freq_row_and_column >= all) {
-      *quant += mul[c] * sum_of_highest_freq_row_and_column / all;
-      if (*quant >= Quantizer::kQuantMax) {
-        *quant = Quantizer::kQuantMax - 1;
-      }
-    }
-  }
-  if (quant_kind == AcStrategyType::DCT) {
-    // If this 8x8 block is too flat, increase the adaptive quantization level
-    // a bit to reduce visible block boundaries and requantize the block.
-    if (hfNonZeros[0] + hfNonZeros[1] + hfNonZeros[2] + hfNonZeros[3] < 11) {
-      *quant += 1;
-      if (*quant >= Quantizer::kQuantMax) {
-        *quant = Quantizer::kQuantMax - 1;
-      }
-    }
-  }
-  {
-    static const double kMul1[4][3] = {
-        {
-            0.22080615753848404,
-            0.45797479824262011,
-            0.29859235095977965,
-        },
-        {
-            0.70109486510286834,
-            0.16185281305512639,
-            0.14387691730035473,
-        },
-        {
-            0.114985964456218638,
-            0.44656840441027695,
-            0.10587658215149048,
-        },
-        {
-            0.46849665264409396,
-            0.41239077937781954,
-            0.088667407767185444,
-        },
-    };
-    static const double kMul2[4][3] = {
-        {
-            0.27450281941822197,
-            1.1255766549984996,
-            0.98950459134128388,
-        },
-        {
-            0.4652168675598285,
-            0.40945807983455818,
-            0.36581899811751367,
-        },
-        {
-            0.28034972424715715,
-            0.9182653201929738,
-            1.5581531543057416,
-        },
-        {
-            0.26873118114033728,
-            0.68863712390392484,
-            1.2082185408666786,
-        },
-    };
-    static const double kQuantNormalizer = 2.2942708343284721;
-    sum_of_error *= kQuantNormalizer;
-    sum_of_vals *= kQuantNormalizer;
-    if (quant_kind >= AcStrategyType::DCT16X16) {
-      int ix = 3;
-      if (quant_kind == AcStrategyType::DCT32X16 ||
-          quant_kind == AcStrategyType::DCT16X32) {
-        ix = 1;
-      } else if (quant_kind == AcStrategyType::DCT16X16) {
-        ix = 0;
-      } else if (quant_kind == AcStrategyType::DCT32X32) {
-        ix = 2;
-      }
-      int step =
-          sum_of_error / (kMul1[ix][c] * xsize * ysize * kBlockDim * kBlockDim +
-                          kMul2[ix][c] * sum_of_vals);
-      if (step >= 2) {
-        step = 2;
-      }
-      if (step < 0) {
-        step = 0;
-      }
-      if (sum_of_error > kMul1[ix][c] * xsize * ysize * kBlockDim * kBlockDim +
-                             kMul2[ix][c] * sum_of_vals) {
-        *quant += step;
-        if (*quant >= Quantizer::kQuantMax) {
-          *quant = Quantizer::kQuantMax - 1;
-        }
-      }
-    }
-  }
-  {
-    // Reduce quant in highly active areas.
-    int32_t div = (xsize * ysize);
-    int32_t activity = (static_cast<int32_t>(hfNonZeros[0]) + div / 2) / div;
-    int32_t orig_qp_limit = std::max(4, *quant / 2);
-    for (int i = 1; i < 4; ++i) {
-      activity = std::min(
-          activity, (static_cast<int32_t>(hfNonZeros[i]) + div / 2) / div);
-    }
-    if (activity >= 15) {
-      activity = 15;
-    }
-    int32_t qp = *quant - activity;
-    if (c == 1) {
-      for (int i = 1; i < 4; ++i) {
-        thresholds[i] += 0.01 * activity;
-      }
-    }
-    if (qp < orig_qp_limit) {
-      qp = orig_qp_limit;
-    }
-    *quant = qp;
-  }
-}
-
-// NOTE: caller takes care of extracting quant from rect of RawQuantField.
-void QuantizeRoundtripYBlockAC(PassesEncoderState* enc_state, const size_t size,
-                               const Quantizer& quantizer,
-                               const bool error_diffusion,
-                               AcStrategyType quant_kind, size_t xsize,
-                               size_t ysize, const float* JXL_RESTRICT biases,
-                               int32_t* quant, float* JXL_RESTRICT inout,
-                               int32_t* JXL_RESTRICT quantized) {
-  float thres_y[4] = {0.58f, 0.64f, 0.64f, 0.64f};
-  if (enc_state->cparams.speed_tier <= SpeedTier::kHare) {
-    int32_t max_quant = 0;
-    int quant_orig = *quant;
-    float val[3] = {enc_state->x_qm_multiplier, 1.0f,
-                    enc_state->b_qm_multiplier};
-    for (int c : {1, 0, 2}) {
-      float thres[4] = {0.58f, 0.64f, 0.64f, 0.64f};
-      *quant = quant_orig;
-      AdjustQuantBlockAC(quantizer, c, val[c], quant_kind, xsize, ysize,
-                         &thres[0], inout + c * size, quant);
-      // Dead zone adjustment
-      if (c == 1) {
-        for (int k = 0; k < 4; ++k) {
-          thres_y[k] = thres[k];
-        }
-      }
-      max_quant = std::max(*quant, max_quant);
-    }
-    *quant = max_quant;
-  } else {
-    thres_y[0] = 0.56;
-    thres_y[1] = 0.62;
-    thres_y[2] = 0.62;
-    thres_y[3] = 0.62;
-  }
-
-  QuantizeBlockAC(quantizer, error_diffusion, 1, 1.0f, quant_kind, xsize, ysize,
-                  &thres_y[0], inout + size, quant, quantized + size);
-
-  const float* JXL_RESTRICT dequant_matrix =
-      quantizer.DequantMatrix(quant_kind, 1);
-
-  HWY_CAPPED(float, kDCTBlockSize) df;
-  HWY_CAPPED(int32_t, kDCTBlockSize) di;
-  const auto inv_qac = Set(df, quantizer.inv_quant_ac(*quant));
-  for (size_t k = 0; k < kDCTBlockSize * xsize * ysize; k += Lanes(df)) {
-    const auto quant = Load(di, quantized + size + k);
-    const auto adj_quant = AdjustQuantBias(di, 1, quant, biases);
-    const auto dequantm = Load(df, dequant_matrix + k);
-    Store(Mul(Mul(adj_quant, dequantm), inv_qac), df, inout + size + k);
-  }
-}
-
-Status ComputeCoefficients(size_t group_idx, PassesEncoderState* enc_state,
-                           const Image3F& opsin, const Rect& rect,
-                           Image3F* dc) {
-  JxlMemoryManager* memory_manager = opsin.memory_manager();
-  const Rect block_group_rect =
-      enc_state->shared.frame_dim.BlockGroupRect(group_idx);
-  const Rect cmap_rect(
-      block_group_rect.x0() / kColorTileDimInBlocks,
-      block_group_rect.y0() / kColorTileDimInBlocks,
-      DivCeil(block_group_rect.xsize(), kColorTileDimInBlocks),
-      DivCeil(block_group_rect.ysize(), kColorTileDimInBlocks));
-  const Rect group_rect =
-      enc_state->shared.frame_dim.GroupRect(group_idx).Translate(rect.x0(),
-                                                                 rect.y0());
-
-  const size_t xsize_blocks = block_group_rect.xsize();
-  const size_t ysize_blocks = block_group_rect.ysize();
-
-  const size_t dc_stride = static_cast<size_t>(dc->PixelsPerRow());
-  const size_t opsin_stride = static_cast<size_t>(opsin.PixelsPerRow());
-
-  ImageI& full_quant_field = enc_state->shared.raw_quant_field;
-  const CompressParams& cparams = enc_state->cparams;
-
-  const size_t dct_scratch_size =
-      3 * (MaxVectorSize() / sizeof(float)) * AcStrategy::kMaxBlockDim;
-
-  // TODO(veluca): consider strategies to reduce this memory.
-  size_t mem_bytes = 3 * AcStrategy::kMaxCoeffArea * sizeof(int32_t);
-  JXL_ASSIGN_OR_RETURN(auto mem,
-                       AlignedMemory::Create(memory_manager, mem_bytes));
-  size_t fmem_bytes =
-      (5 * AcStrategy::kMaxCoeffArea + dct_scratch_size) * sizeof(float);
-  JXL_ASSIGN_OR_RETURN(auto fmem,
-                       AlignedMemory::Create(memory_manager, fmem_bytes));
-  float* JXL_RESTRICT scratch_space =
-      fmem.address<float>() + 3 * AcStrategy::kMaxCoeffArea;
-  {
-    // Only use error diffusion in Squirrel mode or slower.
-    const bool error_diffusion = cparams.speed_tier <= SpeedTier::kSquirrel;
-    constexpr HWY_CAPPED(float, kDCTBlockSize) d;
-
-    int32_t* JXL_RESTRICT coeffs[3][kMaxNumPasses] = {};
-    size_t num_passes = enc_state->progressive_splitter.GetNumPasses();
-    JXL_ENSURE(num_passes > 0);
-    for (size_t i = 0; i < num_passes; i++) {
-      // TODO(veluca): 16-bit quantized coeffs are not implemented yet.
-      JXL_ENSURE(enc_state->coeffs[i]->Type() == ACType::k32);
-      for (size_t c = 0; c < 3; c++) {
-        coeffs[c][i] = enc_state->coeffs[i]->PlaneRow(c, group_idx, 0).ptr32;
-      }
-    }
-
-    HWY_ALIGN float* coeffs_in = fmem.address<float>();
-    HWY_ALIGN int32_t* quantized = mem.address<int32_t>();
-
-    for (size_t by = 0; by < ysize_blocks; ++by) {
-      int32_t* JXL_RESTRICT row_quant_ac =
-          block_group_rect.Row(&full_quant_field, by);
-      size_t ty = by / kColorTileDimInBlocks;
-      const int8_t* JXL_RESTRICT row_cmap[3] = {
-          cmap_rect.ConstRow(enc_state->shared.cmap.ytox_map, ty),
-          nullptr,
-          cmap_rect.ConstRow(enc_state->shared.cmap.ytob_map, ty),
-      };
-      const float* JXL_RESTRICT opsin_rows[3] = {
-          group_rect.ConstPlaneRow(opsin, 0, by * kBlockDim),
-          group_rect.ConstPlaneRow(opsin, 1, by * kBlockDim),
-          group_rect.ConstPlaneRow(opsin, 2, by * kBlockDim),
-      };
-      float* JXL_RESTRICT dc_rows[3] = {
-          block_group_rect.PlaneRow(dc, 0, by),
-          block_group_rect.PlaneRow(dc, 1, by),
-          block_group_rect.PlaneRow(dc, 2, by),
-      };
-      AcStrategyRow ac_strategy_row =
-          enc_state->shared.ac_strategy.ConstRow(block_group_rect, by);
-      for (size_t tx = 0; tx < DivCeil(xsize_blocks, kColorTileDimInBlocks);
-           tx++) {
-        const auto x_factor =
-            Set(d, enc_state->shared.cmap.base().YtoXRatio(row_cmap[0][tx]));
-        const auto b_factor =
-            Set(d, enc_state->shared.cmap.base().YtoBRatio(row_cmap[2][tx]));
-        for (size_t bx = tx * kColorTileDimInBlocks;
-             bx < xsize_blocks && bx < (tx + 1) * kColorTileDimInBlocks; ++bx) {
-          const AcStrategy acs = ac_strategy_row[bx];
-          if (!acs.IsFirstBlock()) continue;
-
-          size_t xblocks = acs.covered_blocks_x();
-          size_t yblocks = acs.covered_blocks_y();
-
-          CoefficientLayout(&yblocks, &xblocks);
-
-          size_t size = kDCTBlockSize * xblocks * yblocks;
-
-          // DCT Y channel, roundtrip-quantize it and set DC.
-          int32_t quant_ac = row_quant_ac[bx];
-          for (size_t c : {0, 1, 2}) {
-            TransformFromPixels(acs.Strategy(), opsin_rows[c] + bx * kBlockDim,
-                                opsin_stride, coeffs_in + c * size,
-                                scratch_space);
-          }
-          DCFromLowestFrequencies(acs.Strategy(), coeffs_in + size,
-                                  dc_rows[1] + bx, dc_stride);
-
-          QuantizeRoundtripYBlockAC(
-              enc_state, size, enc_state->shared.quantizer, error_diffusion,
-              acs.Strategy(), xblocks, yblocks, kDefaultQuantBias, &quant_ac,
-              coeffs_in, quantized);
-
-          // Unapply color correlation
-          for (size_t k = 0; k < size; k += Lanes(d)) {
-            const auto in_x = Load(d, coeffs_in + k);
-            const auto in_y = Load(d, coeffs_in + size + k);
-            const auto in_b = Load(d, coeffs_in + 2 * size + k);
-            const auto out_x = NegMulAdd(x_factor, in_y, in_x);
-            const auto out_b = NegMulAdd(b_factor, in_y, in_b);
-            Store(out_x, d, coeffs_in + k);
-            Store(out_b, d, coeffs_in + 2 * size + k);
-          }
-
-          // Quantize X and B channels and set DC.
-          for (size_t c : {0, 2}) {
-            float thres[4] = {0.58f, 0.62f, 0.62f, 0.62f};
-            QuantizeBlockAC(enc_state->shared.quantizer, error_diffusion, c,
-                            c == 0 ? enc_state->x_qm_multiplier
-                                   : enc_state->b_qm_multiplier,
-                            acs.Strategy(), xblocks, yblocks, &thres[0],
-                            coeffs_in + c * size, &quant_ac,
-                            quantized + c * size);
-            DCFromLowestFrequencies(acs.Strategy(), coeffs_in + c * size,
-                                    dc_rows[c] + bx, dc_stride);
-          }
-          row_quant_ac[bx] = quant_ac;
-          for (size_t c = 0; c < 3; c++) {
-            enc_state->progressive_splitter.SplitACCoefficients(
-                quantized + c * size, acs, bx, by, coeffs[c]);
-            for (size_t p = 0; p < num_passes; p++) {
-              coeffs[c][p] += size;
-            }
-          }
-        }
-      }
-    }
-  }
-  return true;
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-HWY_EXPORT(ComputeCoefficients);
-Status ComputeCoefficients(size_t group_idx, PassesEncoderState* enc_state,
-                           const Image3F& opsin, const Rect& rect,
-                           Image3F* dc) {
-  return HWY_DYNAMIC_DISPATCH(ComputeCoefficients)(group_idx, enc_state, opsin,
-                                                   rect, dc);
-}
-
-Status EncodeGroupTokenizedCoefficients(size_t group_idx, size_t pass_idx,
-                                        size_t histogram_idx,
-                                        const PassesEncoderState& enc_state,
-                                        BitWriter* writer, AuxOut* aux_out) {
-  // Select which histogram to use among those of the current pass.
-  const size_t num_histograms = enc_state.shared.num_histograms;
-  // num_histograms is 0 only for lossless.
-  JXL_ENSURE(num_histograms == 0 || histogram_idx < num_histograms);
-  size_t histo_selector_bits = CeilLog2Nonzero(num_histograms);
-
-  if (histo_selector_bits != 0) {
-    JXL_RETURN_IF_ERROR(
-        writer->WithMaxBits(histo_selector_bits, LayerType::Ac, aux_out, [&] {
-          writer->Write(histo_selector_bits, histogram_idx);
-          return true;
-        }));
-  }
-  size_t context_offset =
-      histogram_idx * enc_state.shared.block_ctx_map.NumACContexts();
-  JXL_RETURN_IF_ERROR(WriteTokens(
-      enc_state.passes[pass_idx].ac_tokens[group_idx],
-      enc_state.passes[pass_idx].codes, enc_state.passes[pass_idx].context_map,
-      context_offset, writer, LayerType::AcTokens, aux_out));
-
-  return true;
-}
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/enc_group.h b/third_party/jpeg-xl/lib/jxl/enc_group.h
deleted file mode 100644
index 884e3bdd0eea7..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_group.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_GROUP_H_
-#define LIB_JXL_ENC_GROUP_H_
-
-#include <cstddef>
-
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/image.h"
-
-namespace jxl {
-
-struct AuxOut;
-struct PassesEncoderState;
-
-// Fills DC
-Status ComputeCoefficients(size_t group_idx, PassesEncoderState* enc_state,
-                           const Image3F& opsin, const Rect& rect, Image3F* dc);
-
-Status EncodeGroupTokenizedCoefficients(size_t group_idx, size_t pass_idx,
-                                        size_t histogram_idx,
-                                        const PassesEncoderState& enc_state,
-                                        BitWriter* writer, AuxOut* aux_out);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_GROUP_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_heuristics.cc b/third_party/jpeg-xl/lib/jxl/enc_heuristics.cc
deleted file mode 100644
index a8bf24160f617..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_heuristics.cc
+++ /dev/null
@@ -1,1214 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_heuristics.h"
-
-#include <jxl/cms_interface.h>
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>
-#include <limits>
-#include <memory>
-#include <numeric>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/ac_context.h"
-#include "lib/jxl/ac_strategy.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/override.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/butteraugli/butteraugli.h"
-#include "lib/jxl/chroma_from_luma.h"
-#include "lib/jxl/coeff_order.h"
-#include "lib/jxl/coeff_order_fwd.h"
-#include "lib/jxl/common.h"
-#include "lib/jxl/dec_cache.h"
-#include "lib/jxl/dec_group.h"
-#include "lib/jxl/dec_noise.h"
-#include "lib/jxl/dec_xyb.h"
-#include "lib/jxl/enc_ac_strategy.h"
-#include "lib/jxl/enc_adaptive_quantization.h"
-#include "lib/jxl/enc_cache.h"
-#include "lib/jxl/enc_chroma_from_luma.h"
-#include "lib/jxl/enc_gaborish.h"
-#include "lib/jxl/enc_modular.h"
-#include "lib/jxl/enc_noise.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/enc_patch_dictionary.h"
-#include "lib/jxl/enc_quant_weights.h"
-#include "lib/jxl/enc_splines.h"
-#include "lib/jxl/epf.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/memory_manager_internal.h"
-#include "lib/jxl/passes_state.h"
-#include "lib/jxl/quant_weights.h"
-
-namespace jxl {
-
-struct AuxOut;
-
-void FindBestBlockEntropyModel(const CompressParams& cparams, const ImageI& rqf,
-                               const AcStrategyImage& ac_strategy,
-                               BlockCtxMap* block_ctx_map) {
-  if (cparams.decoding_speed_tier >= 1) {
-    static constexpr uint8_t kSimpleCtxMap[] = {
-        // Cluster all blocks together
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  //
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  //
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  //
-    };
-    static_assert(
-        3 * kNumOrders == sizeof(kSimpleCtxMap) / sizeof *kSimpleCtxMap,
-        "Update simple context map");
-
-    auto bcm = *block_ctx_map;
-    bcm.ctx_map.assign(std::begin(kSimpleCtxMap), std::end(kSimpleCtxMap));
-    bcm.num_ctxs = 2;
-    bcm.num_dc_ctxs = 1;
-    return;
-  }
-  if (cparams.speed_tier >= SpeedTier::kFalcon) {
-    return;
-  }
-  // No need to change context modeling for small images.
-  size_t tot = rqf.xsize() * rqf.ysize();
-  size_t size_for_ctx_model = (1 << 10) * cparams.butteraugli_distance;
-  if (tot < size_for_ctx_model) return;
-
-  struct OccCounters {
-    // count the occurrences of each qf value and each strategy type.
-    OccCounters(const ImageI& rqf, const AcStrategyImage& ac_strategy) {
-      for (size_t y = 0; y < rqf.ysize(); y++) {
-        const int32_t* qf_row = rqf.Row(y);
-        AcStrategyRow acs_row = ac_strategy.ConstRow(y);
-        for (size_t x = 0; x < rqf.xsize(); x++) {
-          int ord = kStrategyOrder[acs_row[x].RawStrategy()];
-          int qf = qf_row[x] - 1;
-          qf_counts[qf]++;
-          qf_ord_counts[ord][qf]++;
-          ord_counts[ord]++;
-        }
-      }
-    }
-
-    size_t qf_counts[256] = {};
-    size_t qf_ord_counts[kNumOrders][256] = {};
-    size_t ord_counts[kNumOrders] = {};
-  };
-  // The OccCounters struct is too big to allocate on the stack.
-  std::unique_ptr<OccCounters> counters(new OccCounters(rqf, ac_strategy));
-
-  // Splitting the context model according to the quantization field seems to
-  // mostly benefit only large images.
-  size_t size_for_qf_split = (1 << 13) * cparams.butteraugli_distance;
-  size_t num_qf_segments = tot < size_for_qf_split ? 1 : 2;
-  std::vector<uint32_t>& qft = block_ctx_map->qf_thresholds;
-  qft.clear();
-  // Divide the quant field in up to num_qf_segments segments.
-  size_t cumsum = 0;
-  size_t next = 1;
-  size_t last_cut = 256;
-  size_t cut = tot * next / num_qf_segments;
-  for (uint32_t j = 0; j < 256; j++) {
-    cumsum += counters->qf_counts[j];
-    if (cumsum > cut) {
-      if (j != 0) {
-        qft.push_back(j);
-      }
-      last_cut = j;
-      while (cumsum > cut) {
-        next++;
-        cut = tot * next / num_qf_segments;
-      }
-    } else if (next > qft.size() + 1) {
-      if (j - 1 == last_cut && j != 0) {
-        qft.push_back(j);
-      }
-    }
-  }
-
-  // Count the occurrences of each segment.
-  std::vector<size_t> counts(kNumOrders * (qft.size() + 1));
-  size_t qft_pos = 0;
-  for (size_t j = 0; j < 256; j++) {
-    if (qft_pos < qft.size() && j == qft[qft_pos]) {
-      qft_pos++;
-    }
-    for (size_t i = 0; i < kNumOrders; i++) {
-      counts[qft_pos + i * (qft.size() + 1)] += counters->qf_ord_counts[i][j];
-    }
-  }
-
-  // Repeatedly merge the lowest-count pair.
-  std::vector<uint8_t> remap((qft.size() + 1) * kNumOrders);
-  std::iota(remap.begin(), remap.end(), 0);
-  std::vector<uint8_t> clusters(remap);
-  size_t nb_clusters =
-      Clamp1(static_cast<int>(tot / size_for_ctx_model / 2), 2, 9);
-  size_t nb_clusters_chroma =
-      Clamp1(static_cast<int>(tot / size_for_ctx_model / 3), 1, 5);
-  // This is O(n^2 log n), but n is small.
-  while (clusters.size() > nb_clusters) {
-    std::sort(clusters.begin(), clusters.end(),
-              [&](int a, int b) { return counts[a] > counts[b]; });
-    counts[clusters[clusters.size() - 2]] += counts[clusters.back()];
-    counts[clusters.back()] = 0;
-    remap[clusters.back()] = clusters[clusters.size() - 2];
-    clusters.pop_back();
-  }
-  for (size_t i = 0; i < remap.size(); i++) {
-    while (remap[remap[i]] != remap[i]) {
-      remap[i] = remap[remap[i]];
-    }
-  }
-  // Relabel starting from 0.
-  std::vector<uint8_t> remap_remap(remap.size(), remap.size());
-  size_t num = 0;
-  for (size_t i = 0; i < remap.size(); i++) {
-    if (remap_remap[remap[i]] == remap.size()) {
-      remap_remap[remap[i]] = num++;
-    }
-    remap[i] = remap_remap[remap[i]];
-  }
-  // Write the block context map.
-  auto& ctx_map = block_ctx_map->ctx_map;
-  ctx_map = remap;
-  ctx_map.resize(remap.size() * 3);
-  // for chroma, only use up to nb_clusters_chroma separate block contexts
-  // (those for the biggest clusters)
-  for (size_t i = remap.size(); i < remap.size() * 3; i++) {
-    ctx_map[i] = num + Clamp1(static_cast<int>(remap[i % remap.size()]), 0,
-                              static_cast<int>(nb_clusters_chroma) - 1);
-  }
-  block_ctx_map->num_ctxs =
-      *std::max_element(ctx_map.begin(), ctx_map.end()) + 1;
-}
-
-namespace {
-
-Status FindBestDequantMatrices(JxlMemoryManager* memory_manager,
-                               const CompressParams& cparams,
-                               ModularFrameEncoder* modular_frame_encoder,
-                               DequantMatrices* dequant_matrices) {
-  // TODO(veluca): quant matrices for no-gaborish.
-  // TODO(veluca): heuristics for in-bitstream quant tables.
-  *dequant_matrices = DequantMatrices();
-  if (cparams.max_error_mode || cparams.disable_perceptual_optimizations) {
-    constexpr float kMSEWeights[3] = {0.001, 0.001, 0.001};
-    const float* wp = cparams.disable_perceptual_optimizations
-                          ? kMSEWeights
-                          : cparams.max_error;
-    // Set numerators of all quantization matrices to constant values.
-    float weights[3][1] = {{1.0f / wp[0]}, {1.0f / wp[1]}, {1.0f / wp[2]}};
-    DctQuantWeightParams dct_params(weights);
-    std::vector<QuantEncoding> encodings(kNumQuantTables,
-                                         QuantEncoding::DCT(dct_params));
-    JXL_RETURN_IF_ERROR(DequantMatricesSetCustom(dequant_matrices, encodings,
-                                                 modular_frame_encoder));
-    float dc_weights[3] = {1.0f / wp[0], 1.0f / wp[1], 1.0f / wp[2]};
-    JXL_RETURN_IF_ERROR(DequantMatricesSetCustomDC(
-        memory_manager, dequant_matrices, dc_weights));
-  }
-  return true;
-}
-
-void StoreMin2(const float v, float& min1, float& min2) {
-  if (v < min2) {
-    if (v < min1) {
-      min2 = min1;
-      min1 = v;
-    } else {
-      min2 = v;
-    }
-  }
-}
-
-void CreateMask(const ImageF& image, ImageF& mask) {
-  for (size_t y = 0; y < image.ysize(); y++) {
-    const auto* row_n = y > 0 ? image.Row(y - 1) : image.Row(y);
-    const auto* row_in = image.Row(y);
-    const auto* row_s = y + 1 < image.ysize() ? image.Row(y + 1) : image.Row(y);
-    auto* row_out = mask.Row(y);
-    for (size_t x = 0; x < image.xsize(); x++) {
-      // Center, west, east, north, south values and their absolute difference
-      float c = row_in[x];
-      float w = x > 0 ? row_in[x - 1] : row_in[x];
-      float e = x + 1 < image.xsize() ? row_in[x + 1] : row_in[x];
-      float n = row_n[x];
-      float s = row_s[x];
-      float dw = std::abs(c - w);
-      float de = std::abs(c - e);
-      float dn = std::abs(c - n);
-      float ds = std::abs(c - s);
-      float min = std::numeric_limits<float>::max();
-      float min2 = std::numeric_limits<float>::max();
-      StoreMin2(dw, min, min2);
-      StoreMin2(de, min, min2);
-      StoreMin2(dn, min, min2);
-      StoreMin2(ds, min, min2);
-      row_out[x] = min2;
-    }
-  }
-}
-
-// Downsamples the image by a factor of 2 with a kernel that's sharper than
-// the standard 2x2 box kernel used by DownsampleImage.
-// The kernel is optimized against the result of the 2x2 upsampling kernel used
-// by the decoder. Ringing is slightly reduced by clamping the values of the
-// resulting pixels within certain bounds of a small region in the original
-// image.
-Status DownsampleImage2_Sharper(const ImageF& input, ImageF* output) {
-  const int64_t kernelx = 12;
-  const int64_t kernely = 12;
-  JxlMemoryManager* memory_manager = input.memory_manager();
-
-  static const float kernel[144] = {
-      -0.000314256996835, -0.000314256996835, -0.000897597057705,
-      -0.000562751488849, -0.000176807273646, 0.001864627368902,
-      0.001864627368902,  -0.000176807273646, -0.000562751488849,
-      -0.000897597057705, -0.000314256996835, -0.000314256996835,
-      -0.000314256996835, -0.001527942804748, -0.000121760530512,
-      0.000191123989093,  0.010193185932466,  0.058637519197110,
-      0.058637519197110,  0.010193185932466,  0.000191123989093,
-      -0.000121760530512, -0.001527942804748, -0.000314256996835,
-      -0.000897597057705, -0.000121760530512, 0.000946363683751,
-      0.007113577630288,  0.000437956841058,  -0.000372823835211,
-      -0.000372823835211, 0.000437956841058,  0.007113577630288,
-      0.000946363683751,  -0.000121760530512, -0.000897597057705,
-      -0.000562751488849, 0.000191123989093,  0.007113577630288,
-      0.044592622228814,  0.000222278879007,  -0.162864473015945,
-      -0.162864473015945, 0.000222278879007,  0.044592622228814,
-      0.007113577630288,  0.000191123989093,  -0.000562751488849,
-      -0.000176807273646, 0.010193185932466,  0.000437956841058,
-      0.000222278879007,  -0.000913092543974, -0.017071696107902,
-      -0.017071696107902, -0.000913092543974, 0.000222278879007,
-      0.000437956841058,  0.010193185932466,  -0.000176807273646,
-      0.001864627368902,  0.058637519197110,  -0.000372823835211,
-      -0.162864473015945, -0.017071696107902, 0.414660099370354,
-      0.414660099370354,  -0.017071696107902, -0.162864473015945,
-      -0.000372823835211, 0.058637519197110,  0.001864627368902,
-      0.001864627368902,  0.058637519197110,  -0.000372823835211,
-      -0.162864473015945, -0.017071696107902, 0.414660099370354,
-      0.414660099370354,  -0.017071696107902, -0.162864473015945,
-      -0.000372823835211, 0.058637519197110,  0.001864627368902,
-      -0.000176807273646, 0.010193185932466,  0.000437956841058,
-      0.000222278879007,  -0.000913092543974, -0.017071696107902,
-      -0.017071696107902, -0.000913092543974, 0.000222278879007,
-      0.000437956841058,  0.010193185932466,  -0.000176807273646,
-      -0.000562751488849, 0.000191123989093,  0.007113577630288,
-      0.044592622228814,  0.000222278879007,  -0.162864473015945,
-      -0.162864473015945, 0.000222278879007,  0.044592622228814,
-      0.007113577630288,  0.000191123989093,  -0.000562751488849,
-      -0.000897597057705, -0.000121760530512, 0.000946363683751,
-      0.007113577630288,  0.000437956841058,  -0.000372823835211,
-      -0.000372823835211, 0.000437956841058,  0.007113577630288,
-      0.000946363683751,  -0.000121760530512, -0.000897597057705,
-      -0.000314256996835, -0.001527942804748, -0.000121760530512,
-      0.000191123989093,  0.010193185932466,  0.058637519197110,
-      0.058637519197110,  0.010193185932466,  0.000191123989093,
-      -0.000121760530512, -0.001527942804748, -0.000314256996835,
-      -0.000314256996835, -0.000314256996835, -0.000897597057705,
-      -0.000562751488849, -0.000176807273646, 0.001864627368902,
-      0.001864627368902,  -0.000176807273646, -0.000562751488849,
-      -0.000897597057705, -0.000314256996835, -0.000314256996835};
-
-  int64_t xsize = input.xsize();
-  int64_t ysize = input.ysize();
-
-  JXL_ASSIGN_OR_RETURN(ImageF box_downsample,
-                       ImageF::Create(memory_manager, xsize, ysize));
-  JXL_RETURN_IF_ERROR(CopyImageTo(input, &box_downsample));
-  JXL_ASSIGN_OR_RETURN(box_downsample, DownsampleImage(box_downsample, 2));
-
-  JXL_ASSIGN_OR_RETURN(ImageF mask,
-                       ImageF::Create(memory_manager, box_downsample.xsize(),
-                                      box_downsample.ysize()));
-  CreateMask(box_downsample, mask);
-
-  for (size_t y = 0; y < output->ysize(); y++) {
-    float* row_out = output->Row(y);
-    const float* row_in[kernely];
-    const float* row_mask = mask.Row(y);
-    // get the rows in the support
-    for (size_t ky = 0; ky < kernely; ky++) {
-      int64_t iy = y * 2 + ky - (kernely - 1) / 2;
-      if (iy < 0) iy = 0;
-      if (iy >= ysize) iy = ysize - 1;
-      row_in[ky] = input.Row(iy);
-    }
-
-    for (size_t x = 0; x < output->xsize(); x++) {
-      // get min and max values of the original image in the support
-      float min = std::numeric_limits<float>::max();
-      float max = std::numeric_limits<float>::min();
-      // kernelx - R and kernely - R are the radius of a rectangular region in
-      // which the values of a pixel are bounded to reduce ringing.
-      static constexpr int64_t R = 5;
-      for (int64_t ky = R; ky + R < kernely; ky++) {
-        for (int64_t kx = R; kx + R < kernelx; kx++) {
-          int64_t ix = x * 2 + kx - (kernelx - 1) / 2;
-          if (ix < 0) ix = 0;
-          if (ix >= xsize) ix = xsize - 1;
-          min = std::min<float>(min, row_in[ky][ix]);
-          max = std::max<float>(max, row_in[ky][ix]);
-        }
-      }
-
-      float sum = 0;
-      for (int64_t ky = 0; ky < kernely; ky++) {
-        for (int64_t kx = 0; kx < kernelx; kx++) {
-          int64_t ix = x * 2 + kx - (kernelx - 1) / 2;
-          if (ix < 0) ix = 0;
-          if (ix >= xsize) ix = xsize - 1;
-          sum += row_in[ky][ix] * kernel[ky * kernelx + kx];
-        }
-      }
-
-      row_out[x] = sum;
-
-      // Clamp the pixel within the value  of a small area to prevent ringning.
-      // The mask determines how much to clamp, clamp more to reduce more
-      // ringing in smooth areas, clamp less in noisy areas to get more
-      // sharpness. Higher mask_multiplier gives less clamping, so less
-      // ringing reduction.
-      const constexpr float mask_multiplier = 1;
-      float a = row_mask[x] * mask_multiplier;
-      float clip_min = min - a;
-      float clip_max = max + a;
-      if (row_out[x] < clip_min) {
-        row_out[x] = clip_min;
-      } else if (row_out[x] > clip_max) {
-        row_out[x] = clip_max;
-      }
-    }
-  }
-  return true;
-}
-
-}  // namespace
-
-Status DownsampleImage2_Sharper(Image3F* opsin) {
-  // Allocate extra space to avoid a reallocation when padding.
-  JxlMemoryManager* memory_manager = opsin->memory_manager();
-  JXL_ASSIGN_OR_RETURN(
-      Image3F downsampled,
-      Image3F::Create(memory_manager, DivCeil(opsin->xsize(), 2) + kBlockDim,
-                      DivCeil(opsin->ysize(), 2) + kBlockDim));
-  JXL_RETURN_IF_ERROR(downsampled.ShrinkTo(downsampled.xsize() - kBlockDim,
-                                           downsampled.ysize() - kBlockDim));
-
-  for (size_t c = 0; c < 3; c++) {
-    JXL_RETURN_IF_ERROR(
-        DownsampleImage2_Sharper(opsin->Plane(c), &downsampled.Plane(c)));
-  }
-  *opsin = std::move(downsampled);
-  return true;
-}
-
-namespace {
-
-// The default upsampling kernels used by Upsampler in the decoder.
-const constexpr int64_t kSize = 5;
-
-const float kernel00[25] = {
-    -0.01716200f, -0.03452303f, -0.04022174f, -0.02921014f, -0.00624645f,
-    -0.03452303f, 0.14111091f,  0.28896755f,  0.00278718f,  -0.01610267f,
-    -0.04022174f, 0.28896755f,  0.56661550f,  0.03777607f,  -0.01986694f,
-    -0.02921014f, 0.00278718f,  0.03777607f,  -0.03144731f, -0.01185068f,
-    -0.00624645f, -0.01610267f, -0.01986694f, -0.01185068f, -0.00213539f,
-};
-const float kernel01[25] = {
-    -0.00624645f, -0.01610267f, -0.01986694f, -0.01185068f, -0.00213539f,
-    -0.02921014f, 0.00278718f,  0.03777607f,  -0.03144731f, -0.01185068f,
-    -0.04022174f, 0.28896755f,  0.56661550f,  0.03777607f,  -0.01986694f,
-    -0.03452303f, 0.14111091f,  0.28896755f,  0.00278718f,  -0.01610267f,
-    -0.01716200f, -0.03452303f, -0.04022174f, -0.02921014f, -0.00624645f,
-};
-const float kernel10[25] = {
-    -0.00624645f, -0.02921014f, -0.04022174f, -0.03452303f, -0.01716200f,
-    -0.01610267f, 0.00278718f,  0.28896755f,  0.14111091f,  -0.03452303f,
-    -0.01986694f, 0.03777607f,  0.56661550f,  0.28896755f,  -0.04022174f,
-    -0.01185068f, -0.03144731f, 0.03777607f,  0.00278718f,  -0.02921014f,
-    -0.00213539f, -0.01185068f, -0.01986694f, -0.01610267f, -0.00624645f,
-};
-const float kernel11[25] = {
-    -0.00213539f, -0.01185068f, -0.01986694f, -0.01610267f, -0.00624645f,
-    -0.01185068f, -0.03144731f, 0.03777607f,  0.00278718f,  -0.02921014f,
-    -0.01986694f, 0.03777607f,  0.56661550f,  0.28896755f,  -0.04022174f,
-    -0.01610267f, 0.00278718f,  0.28896755f,  0.14111091f,  -0.03452303f,
-    -0.00624645f, -0.02921014f, -0.04022174f, -0.03452303f, -0.01716200f,
-};
-
-// Does exactly the same as the Upsampler in dec_upsampler for 2x2 pixels, with
-// default CustomTransformData.
-// TODO(lode): use Upsampler instead. However, it requires pre-initialization
-// and padding on the left side of the image which requires refactoring the
-// other code using this.
-void UpsampleImage(const ImageF& input, ImageF* output) {
-  int64_t xsize = input.xsize();
-  int64_t ysize = input.ysize();
-  int64_t xsize2 = output->xsize();
-  int64_t ysize2 = output->ysize();
-  for (int64_t y = 0; y < ysize2; y++) {
-    for (int64_t x = 0; x < xsize2; x++) {
-      const auto* kernel = kernel00;
-      if ((x & 1) && (y & 1)) {
-        kernel = kernel11;
-      } else if (x & 1) {
-        kernel = kernel10;
-      } else if (y & 1) {
-        kernel = kernel01;
-      }
-      float sum = 0;
-      int64_t x2 = x / 2;
-      int64_t y2 = y / 2;
-
-      // get min and max values of the original image in the support
-      float min = std::numeric_limits<float>::max();
-      float max = std::numeric_limits<float>::min();
-
-      for (int64_t ky = 0; ky < kSize; ky++) {
-        for (int64_t kx = 0; kx < kSize; kx++) {
-          int64_t xi = x2 - kSize / 2 + kx;
-          int64_t yi = y2 - kSize / 2 + ky;
-          if (xi < 0) xi = 0;
-          if (xi >= xsize) xi = input.xsize() - 1;
-          if (yi < 0) yi = 0;
-          if (yi >= ysize) yi = input.ysize() - 1;
-          min = std::min<float>(min, input.Row(yi)[xi]);
-          max = std::max<float>(max, input.Row(yi)[xi]);
-        }
-      }
-
-      for (int64_t ky = 0; ky < kSize; ky++) {
-        for (int64_t kx = 0; kx < kSize; kx++) {
-          int64_t xi = x2 - kSize / 2 + kx;
-          int64_t yi = y2 - kSize / 2 + ky;
-          if (xi < 0) xi = 0;
-          if (xi >= xsize) xi = input.xsize() - 1;
-          if (yi < 0) yi = 0;
-          if (yi >= ysize) yi = input.ysize() - 1;
-          sum += input.Row(yi)[xi] * kernel[ky * kSize + kx];
-        }
-      }
-      output->Row(y)[x] = sum;
-      if (output->Row(y)[x] < min) output->Row(y)[x] = min;
-      if (output->Row(y)[x] > max) output->Row(y)[x] = max;
-    }
-  }
-}
-
-// Returns the derivative of Upsampler, with respect to input pixel x2, y2, to
-// output pixel x, y (ignoring the clamping).
-float UpsamplerDeriv(int64_t x2, int64_t y2, int64_t x, int64_t y) {
-  const auto* kernel = kernel00;
-  if ((x & 1) && (y & 1)) {
-    kernel = kernel11;
-  } else if (x & 1) {
-    kernel = kernel10;
-  } else if (y & 1) {
-    kernel = kernel01;
-  }
-
-  int64_t ix = x / 2;
-  int64_t iy = y / 2;
-  int64_t kx = x2 - ix + kSize / 2;
-  int64_t ky = y2 - iy + kSize / 2;
-
-  // This should not happen.
-  if (kx < 0 || kx >= kSize || ky < 0 || ky >= kSize) return 0;
-
-  return kernel[ky * kSize + kx];
-}
-
-// Apply the derivative of the Upsampler to the input, reversing the effect of
-// its coefficients. The output image is 2x2 times smaller than the input.
-void AntiUpsample(const ImageF& input, ImageF* d) {
-  int64_t xsize = input.xsize();
-  int64_t ysize = input.ysize();
-  int64_t xsize2 = d->xsize();
-  int64_t ysize2 = d->ysize();
-  int64_t k0 = kSize - 1;
-  int64_t k1 = kSize;
-  for (int64_t y2 = 0; y2 < ysize2; ++y2) {
-    auto* row = d->Row(y2);
-    for (int64_t x2 = 0; x2 < xsize2; ++x2) {
-      int64_t x0 = x2 * 2 - k0;
-      if (x0 < 0) x0 = 0;
-      int64_t x1 = x2 * 2 + k1 + 1;
-      if (x1 > xsize) x1 = xsize;
-      int64_t y0 = y2 * 2 - k0;
-      if (y0 < 0) y0 = 0;
-      int64_t y1 = y2 * 2 + k1 + 1;
-      if (y1 > ysize) y1 = ysize;
-
-      float sum = 0;
-      for (int64_t y = y0; y < y1; ++y) {
-        const auto* row_in = input.Row(y);
-        for (int64_t x = x0; x < x1; ++x) {
-          double deriv = UpsamplerDeriv(x2, y2, x, y);
-          sum += deriv * row_in[x];
-        }
-      }
-      row[x2] = sum;
-    }
-  }
-}
-
-// Element-wise multiplies two images.
-template <typename T>
-Status ElwiseMul(const Plane<T>& image1, const Plane<T>& image2,
-                 Plane<T>* out) {
-  const size_t xsize = image1.xsize();
-  const size_t ysize = image1.ysize();
-  JXL_ENSURE(xsize == image2.xsize());
-  JXL_ENSURE(ysize == image2.ysize());
-  JXL_ENSURE(xsize == out->xsize());
-  JXL_ENSURE(ysize == out->ysize());
-  for (size_t y = 0; y < ysize; ++y) {
-    const T* const JXL_RESTRICT row1 = image1.Row(y);
-    const T* const JXL_RESTRICT row2 = image2.Row(y);
-    T* const JXL_RESTRICT row_out = out->Row(y);
-    for (size_t x = 0; x < xsize; ++x) {
-      row_out[x] = row1[x] * row2[x];
-    }
-  }
-  return true;
-}
-
-// Element-wise divides two images.
-template <typename T>
-Status ElwiseDiv(const Plane<T>& image1, const Plane<T>& image2,
-                 Plane<T>* out) {
-  const size_t xsize = image1.xsize();
-  const size_t ysize = image1.ysize();
-  JXL_ENSURE(xsize == image2.xsize());
-  JXL_ENSURE(ysize == image2.ysize());
-  JXL_ENSURE(xsize == out->xsize());
-  JXL_ENSURE(ysize == out->ysize());
-  for (size_t y = 0; y < ysize; ++y) {
-    const T* const JXL_RESTRICT row1 = image1.Row(y);
-    const T* const JXL_RESTRICT row2 = image2.Row(y);
-    T* const JXL_RESTRICT row_out = out->Row(y);
-    for (size_t x = 0; x < xsize; ++x) {
-      row_out[x] = row1[x] / row2[x];
-    }
-  }
-  return true;
-}
-
-void ReduceRinging(const ImageF& initial, const ImageF& mask, ImageF& down) {
-  int64_t xsize2 = down.xsize();
-  int64_t ysize2 = down.ysize();
-
-  for (size_t y = 0; y < down.ysize(); y++) {
-    const float* row_mask = mask.Row(y);
-    float* row_out = down.Row(y);
-    for (size_t x = 0; x < down.xsize(); x++) {
-      float v = down.Row(y)[x];
-      float min = initial.Row(y)[x];
-      float max = initial.Row(y)[x];
-      for (int64_t yi = -1; yi < 2; yi++) {
-        for (int64_t xi = -1; xi < 2; xi++) {
-          int64_t x2 = static_cast<int64_t>(x) + xi;
-          int64_t y2 = static_cast<int64_t>(y) + yi;
-          if (x2 < 0 || y2 < 0 || x2 >= xsize2 || y2 >= ysize2) continue;
-          min = std::min<float>(min, initial.Row(y2)[x2]);
-          max = std::max<float>(max, initial.Row(y2)[x2]);
-        }
-      }
-
-      row_out[x] = v;
-
-      // Clamp the pixel within the value  of a small area to prevent ringning.
-      // The mask determines how much to clamp, clamp more to reduce more
-      // ringing in smooth areas, clamp less in noisy areas to get more
-      // sharpness. Higher mask_multiplier gives less clamping, so less
-      // ringing reduction.
-      const constexpr float mask_multiplier = 2;
-      float a = row_mask[x] * mask_multiplier;
-      float clip_min = min - a;
-      float clip_max = max + a;
-      if (row_out[x] < clip_min) row_out[x] = clip_min;
-      if (row_out[x] > clip_max) row_out[x] = clip_max;
-    }
-  }
-}
-
-// TODO(lode): move this to a separate file enc_downsample.cc
-Status DownsampleImage2_Iterative(const ImageF& orig, ImageF* output) {
-  int64_t xsize = orig.xsize();
-  int64_t ysize = orig.ysize();
-  int64_t xsize2 = DivCeil(orig.xsize(), 2);
-  int64_t ysize2 = DivCeil(orig.ysize(), 2);
-  JxlMemoryManager* memory_manager = orig.memory_manager();
-
-  JXL_ASSIGN_OR_RETURN(ImageF box_downsample,
-                       ImageF::Create(memory_manager, xsize, ysize));
-  JXL_RETURN_IF_ERROR(CopyImageTo(orig, &box_downsample));
-  JXL_ASSIGN_OR_RETURN(box_downsample, DownsampleImage(box_downsample, 2));
-  JXL_ASSIGN_OR_RETURN(ImageF mask,
-                       ImageF::Create(memory_manager, box_downsample.xsize(),
-                                      box_downsample.ysize()));
-  CreateMask(box_downsample, mask);
-
-  JXL_RETURN_IF_ERROR(output->ShrinkTo(xsize2, ysize2));
-
-  // Initial result image using the sharper downsampling.
-  // Allocate extra space to avoid a reallocation when padding.
-  JXL_ASSIGN_OR_RETURN(
-      ImageF initial,
-      ImageF::Create(memory_manager, DivCeil(orig.xsize(), 2) + kBlockDim,
-                     DivCeil(orig.ysize(), 2) + kBlockDim));
-  JXL_RETURN_IF_ERROR(initial.ShrinkTo(initial.xsize() - kBlockDim,
-                                       initial.ysize() - kBlockDim));
-  JXL_RETURN_IF_ERROR(DownsampleImage2_Sharper(orig, &initial));
-
-  JXL_ASSIGN_OR_RETURN(
-      ImageF down,
-      ImageF::Create(memory_manager, initial.xsize(), initial.ysize()));
-  JXL_RETURN_IF_ERROR(CopyImageTo(initial, &down));
-  JXL_ASSIGN_OR_RETURN(ImageF up, ImageF::Create(memory_manager, xsize, ysize));
-  JXL_ASSIGN_OR_RETURN(ImageF corr,
-                       ImageF::Create(memory_manager, xsize, ysize));
-  JXL_ASSIGN_OR_RETURN(ImageF corr2,
-                       ImageF::Create(memory_manager, xsize2, ysize2));
-
-  // In the weights map, relatively higher values will allow less ringing but
-  // also less sharpness. With all constant values, it optimizes equally
-  // everywhere. Even in this case, the weights2 computed from
-  // this is still used and differs at the borders of the image.
-  // TODO(lode): Make use of the weights field for anti-ringing and clamping,
-  // the values are all set to 1 for now, but it is intended to be used for
-  // reducing ringing based on the mask, and taking clamping into account.
-  JXL_ASSIGN_OR_RETURN(ImageF weights,
-                       ImageF::Create(memory_manager, xsize, ysize));
-  for (size_t y = 0; y < weights.ysize(); y++) {
-    auto* row = weights.Row(y);
-    for (size_t x = 0; x < weights.xsize(); x++) {
-      row[x] = 1;
-    }
-  }
-  JXL_ASSIGN_OR_RETURN(ImageF weights2,
-                       ImageF::Create(memory_manager, xsize2, ysize2));
-  AntiUpsample(weights, &weights2);
-
-  const size_t num_it = 3;
-  for (size_t it = 0; it < num_it; ++it) {
-    UpsampleImage(down, &up);
-    JXL_ASSIGN_OR_RETURN(corr, LinComb<float>(1, orig, -1, up));
-    JXL_RETURN_IF_ERROR(ElwiseMul(corr, weights, &corr));
-    AntiUpsample(corr, &corr2);
-    JXL_RETURN_IF_ERROR(ElwiseDiv(corr2, weights2, &corr2));
-
-    JXL_ASSIGN_OR_RETURN(down, LinComb<float>(1, down, 1, corr2));
-  }
-
-  ReduceRinging(initial, mask, down);
-
-  // can't just use CopyImage, because the output image was prepared with
-  // padding.
-  for (size_t y = 0; y < down.ysize(); y++) {
-    for (size_t x = 0; x < down.xsize(); x++) {
-      float v = down.Row(y)[x];
-      output->Row(y)[x] = v;
-    }
-  }
-  return true;
-}
-
-}  // namespace
-
-Status DownsampleImage2_Iterative(Image3F* opsin) {
-  JxlMemoryManager* memory_manager = opsin->memory_manager();
-  // Allocate extra space to avoid a reallocation when padding.
-  JXL_ASSIGN_OR_RETURN(
-      Image3F downsampled,
-      Image3F::Create(memory_manager, DivCeil(opsin->xsize(), 2) + kBlockDim,
-                      DivCeil(opsin->ysize(), 2) + kBlockDim));
-  JXL_RETURN_IF_ERROR(downsampled.ShrinkTo(downsampled.xsize() - kBlockDim,
-                                           downsampled.ysize() - kBlockDim));
-
-  JXL_ASSIGN_OR_RETURN(
-      Image3F rgb,
-      Image3F::Create(memory_manager, opsin->xsize(), opsin->ysize()));
-  OpsinParams opsin_params;  // TODO(user): use the ones that are actually used
-  opsin_params.Init(kDefaultIntensityTarget);
-  JXL_RETURN_IF_ERROR(
-      OpsinToLinear(*opsin, Rect(rgb), nullptr, &rgb, opsin_params));
-
-  JXL_ASSIGN_OR_RETURN(
-      ImageF mask,
-      ImageF::Create(memory_manager, opsin->xsize(), opsin->ysize()));
-  ButteraugliParams butter_params;
-  JXL_ASSIGN_OR_RETURN(std::unique_ptr<ButteraugliComparator> butter,
-                       ButteraugliComparator::Make(rgb, butter_params));
-  JXL_RETURN_IF_ERROR(butter->Mask(&mask));
-  JXL_ASSIGN_OR_RETURN(
-      ImageF mask_fuzzy,
-      ImageF::Create(memory_manager, opsin->xsize(), opsin->ysize()));
-
-  for (size_t c = 0; c < 3; c++) {
-    JXL_RETURN_IF_ERROR(
-        DownsampleImage2_Iterative(opsin->Plane(c), &downsampled.Plane(c)));
-  }
-  *opsin = std::move(downsampled);
-  return true;
-}
-
-StatusOr<Image3F> ReconstructImage(
-    const FrameHeader& orig_frame_header, const PassesSharedState& shared,
-    const std::vector<std::unique_ptr<ACImage>>& coeffs, ThreadPool* pool) {
-  const FrameDimensions& frame_dim = shared.frame_dim;
-  JxlMemoryManager* memory_manager = shared.memory_manager;
-
-  FrameHeader frame_header = orig_frame_header;
-  frame_header.UpdateFlag(shared.image_features.patches.HasAny(),
-                          FrameHeader::kPatches);
-  frame_header.UpdateFlag(shared.image_features.splines.HasAny(),
-                          FrameHeader::kSplines);
-  frame_header.color_transform = ColorTransform::kNone;
-
-  CodecMetadata metadata = *frame_header.nonserialized_metadata;
-  metadata.m.extra_channel_info.clear();
-  metadata.m.num_extra_channels = metadata.m.extra_channel_info.size();
-  frame_header.nonserialized_metadata = &metadata;
-  frame_header.extra_channel_upsampling.clear();
-
-  const bool is_gray = shared.metadata->m.color_encoding.IsGray();
-  PassesDecoderState dec_state(memory_manager);
-  JXL_RETURN_IF_ERROR(
-      dec_state.output_encoding_info.SetFromMetadata(*shared.metadata));
-  JXL_RETURN_IF_ERROR(dec_state.output_encoding_info.MaybeSetColorEncoding(
-      ColorEncoding::LinearSRGB(is_gray)));
-  dec_state.shared = &shared;
-  JXL_RETURN_IF_ERROR(dec_state.Init(frame_header));
-
-  ImageBundle decoded(memory_manager, &shared.metadata->m);
-  decoded.origin = frame_header.frame_origin;
-  JXL_ASSIGN_OR_RETURN(
-      Image3F tmp,
-      Image3F::Create(memory_manager, frame_dim.xsize, frame_dim.ysize));
-  JXL_RETURN_IF_ERROR(decoded.SetFromImage(
-      std::move(tmp), dec_state.output_encoding_info.color_encoding));
-
-  PassesDecoderState::PipelineOptions options;
-  options.use_slow_render_pipeline = false;
-  options.coalescing = false;
-  options.render_spotcolors = false;
-  options.render_noise = true;
-
-  JXL_RETURN_IF_ERROR(dec_state.PreparePipeline(
-      frame_header, &shared.metadata->m, &decoded, options));
-
-  AlignedArray<GroupDecCache> group_dec_caches;
-  const auto allocate_storage = [&](const size_t num_threads) -> Status {
-    JXL_RETURN_IF_ERROR(
-        dec_state.render_pipeline->PrepareForThreads(num_threads,
-                                                     /*use_group_ids=*/false));
-    JXL_ASSIGN_OR_RETURN(group_dec_caches, AlignedArray<GroupDecCache>::Create(
-                                               memory_manager, num_threads));
-    return true;
-  };
-  const auto process_group = [&](const uint32_t group_index,
-                                 const size_t thread) -> Status {
-    if (frame_header.loop_filter.epf_iters > 0) {
-      JXL_RETURN_IF_ERROR(ComputeSigma(frame_header.loop_filter,
-                                       frame_dim.BlockGroupRect(group_index),
-                                       &dec_state));
-    }
-    RenderPipelineInput input =
-        dec_state.render_pipeline->GetInputBuffers(group_index, thread);
-    JXL_RETURN_IF_ERROR(DecodeGroupForRoundtrip(
-        frame_header, coeffs, group_index, &dec_state,
-        &group_dec_caches[thread], thread, input, nullptr, nullptr));
-    if ((frame_header.flags & FrameHeader::kNoise) != 0) {
-      PrepareNoiseInput(dec_state, shared.frame_dim, frame_header, group_index,
-                        thread);
-    }
-    JXL_RETURN_IF_ERROR(input.Done());
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, frame_dim.num_groups, allocate_storage,
-                                process_group, "ReconstructImage"));
-  return std::move(*decoded.color());
-}
-
-float ComputeBlockL2Distance(const Image3F& a, const Image3F& b,
-                             const ImageF& mask1x1, size_t by, size_t bx) {
-  Rect rect(bx * kBlockDim, by * kBlockDim, kBlockDim, kBlockDim, a.xsize(),
-            a.ysize());
-  float err2[3] = {0.0f};
-  for (size_t y = 0; y < rect.ysize(); ++y) {
-    const float* row_a[3] = {
-        rect.ConstPlaneRow(a, 0, y),
-        rect.ConstPlaneRow(a, 1, y),
-        rect.ConstPlaneRow(a, 2, y),
-    };
-    const float* row_b[3] = {
-        rect.ConstPlaneRow(b, 0, y),
-        rect.ConstPlaneRow(b, 1, y),
-        rect.ConstPlaneRow(b, 2, y),
-    };
-    const float* row_mask = rect.ConstRow(mask1x1, y);
-    for (size_t x = 0; x < rect.xsize(); ++x) {
-      float mask = row_mask[x];
-      float mask2 = mask * mask;
-      for (int i = 0; i < 3; ++i) {
-        float diff = row_a[i][x] - row_b[i][x];
-        err2[i] += mask2 * diff * diff;
-      }
-    }
-  }
-  static const double kW[] = {
-      12.339445295782363,
-      1.0,
-      0.2,
-  };
-  float retval = kW[0] * err2[0] + kW[1] * err2[1] + kW[2] * err2[2];
-  return retval;
-}
-
-Status ComputeARHeuristics(const FrameHeader& frame_header,
-                           PassesEncoderState* enc_state,
-                           const Image3F& orig_opsin, const Rect& rect,
-                           ThreadPool* pool) {
-  const CompressParams& cparams = enc_state->cparams;
-  PassesSharedState& shared = enc_state->shared;
-  const FrameDimensions& frame_dim = shared.frame_dim;
-  const ImageF& initial_quant_masking1x1 = enc_state->initial_quant_masking1x1;
-  ImageB& epf_sharpness = shared.epf_sharpness;
-  JxlMemoryManager* memory_manager = enc_state->memory_manager();
-
-  float clamped_butteraugli = std::min(5.0f, cparams.butteraugli_distance);
-  if (cparams.butteraugli_distance < kMinButteraugliForDynamicAR ||
-      cparams.speed_tier > SpeedTier::kWombat ||
-      frame_header.loop_filter.epf_iters == 0) {
-    FillPlane(static_cast<uint8_t>(4), &epf_sharpness, Rect(epf_sharpness));
-    return true;
-  }
-
-  std::vector<uint8_t> epf_steps;
-  if (cparams.butteraugli_distance > 4.5f) {
-    epf_steps.push_back(0);
-    epf_steps.push_back(4);
-  } else {
-    epf_steps.push_back(0);
-    epf_steps.push_back(2);
-    epf_steps.push_back(7);
-  }
-  static const int kNumEPFVals = 8;
-  size_t epf_steps_lut[kNumEPFVals] = {0};
-  {
-    for (size_t i = 0; i < epf_steps.size(); ++i) {
-      epf_steps_lut[epf_steps[i]] = i;
-    }
-  }
-  std::array<ImageF, kNumEPFVals> error_images;
-  for (uint8_t val : epf_steps) {
-    FillPlane(val, &epf_sharpness, Rect(epf_sharpness));
-    JXL_ASSIGN_OR_RETURN(
-        Image3F decoded,
-        ReconstructImage(frame_header, shared, enc_state->coeffs, pool));
-    JXL_ASSIGN_OR_RETURN(error_images[val],
-                         ImageF::Create(memory_manager, frame_dim.xsize_blocks,
-                                        frame_dim.ysize_blocks));
-    for (size_t by = 0; by < frame_dim.ysize_blocks; by++) {
-      float* error_row = error_images[val].Row(by);
-      for (size_t bx = 0; bx < frame_dim.xsize_blocks; bx++) {
-        error_row[bx] = ComputeBlockL2Distance(
-            orig_opsin, decoded, initial_quant_masking1x1, by, bx);
-      }
-    }
-  }
-  std::vector<std::vector<size_t>> histo(9, std::vector<size_t>(kNumEPFVals));
-  std::vector<size_t> totals(9, 1);
-  const float c5 = 0.007620386618483585f;
-  const float c6 = 0.0083224805679680686f;
-  const float c7 = 0.99663939685686753;
-  for (size_t by = 0; by < frame_dim.ysize_blocks; by++) {
-    uint8_t* JXL_RESTRICT out_row = epf_sharpness.Row(by);
-    uint8_t* JXL_RESTRICT prev_row = epf_sharpness.Row(by > 0 ? by - 1 : 0);
-    for (size_t bx = 0; bx < frame_dim.xsize_blocks; bx++) {
-      uint8_t best_val = 0;
-      float best_error = std::numeric_limits<float>::max();
-      uint8_t top_val = by > 0 ? prev_row[bx] : 0;
-      uint8_t left_val = bx > 0 ? out_row[bx - 1] : 0;
-      float top_error = error_images[top_val].Row(by)[bx];
-      float left_error = error_images[left_val].Row(by)[bx];
-      for (uint8_t val : epf_steps) {
-        float error = error_images[val].Row(by)[bx];
-        if (val == 0) {
-          error *= c7 - c5 * clamped_butteraugli;
-        }
-        if (error < best_error) {
-          best_val = val;
-          best_error = error;
-        }
-      }
-      if (best_error <
-          (1.0 - c6 * clamped_butteraugli) * std::min(top_error, left_error)) {
-        out_row[bx] = best_val;
-      } else if (top_error < left_error) {
-        out_row[bx] = top_val;
-      } else {
-        out_row[bx] = left_val;
-      }
-      int context = epf_steps_lut[top_val] * 3 + epf_steps_lut[left_val];
-      ++histo[context][out_row[bx]];
-      ++totals[context];
-    }
-  }
-  const float c1 = 0.059588212153340203f;
-  const float c2 = 0.10599497107315753f;
-  const float c3base = 0.97;
-  const float c3 = pow(c3base, clamped_butteraugli);
-  const float c4 = 1.247544678665836f;
-  const float context_weight = c1 + c2 * clamped_butteraugli;
-  for (size_t by = 0; by < frame_dim.ysize_blocks; by++) {
-    uint8_t* JXL_RESTRICT out_row = epf_sharpness.Row(by);
-    uint8_t* JXL_RESTRICT prev_row = epf_sharpness.Row(by > 0 ? by - 1 : 0);
-    for (size_t bx = 0; bx < frame_dim.xsize_blocks; bx++) {
-      uint8_t best_val = 0;
-      float best_error = std::numeric_limits<float>::max();
-      uint8_t top_val = by > 0 ? prev_row[bx] : 0;
-      uint8_t left_val = bx > 0 ? out_row[bx - 1] : 0;
-      int context = epf_steps_lut[top_val] * 3 + epf_steps_lut[left_val];
-      const auto& ctx_histo = histo[context];
-      for (uint8_t val : epf_steps) {
-        float error = error_images[val].Row(by)[bx] /
-                      (c4 + std::log1p(ctx_histo[val] * context_weight /
-                                       totals[context]));
-        if (val == 0) {
-          error *= c3;
-        }
-        if (error < best_error) {
-          best_val = val;
-          best_error = error;
-        }
-      }
-      out_row[bx] = best_val;
-    }
-  }
-
-  return true;
-}
-
-Status LossyFrameHeuristics(const FrameHeader& frame_header,
-                            PassesEncoderState* enc_state,
-                            ModularFrameEncoder* modular_frame_encoder,
-                            const Image3F* linear, Image3F* opsin,
-                            const Rect& rect, const JxlCmsInterface& cms,
-                            ThreadPool* pool, AuxOut* aux_out) {
-  const CompressParams& cparams = enc_state->cparams;
-  const bool streaming_mode = enc_state->streaming_mode;
-  const bool initialize_global_state = enc_state->initialize_global_state;
-  PassesSharedState& shared = enc_state->shared;
-  const FrameDimensions& frame_dim = shared.frame_dim;
-  ImageFeatures& image_features = shared.image_features;
-  DequantMatrices& matrices = shared.matrices;
-  Quantizer& quantizer = shared.quantizer;
-  ImageF& initial_quant_masking1x1 = enc_state->initial_quant_masking1x1;
-  ImageI& raw_quant_field = shared.raw_quant_field;
-  ColorCorrelationMap& cmap = shared.cmap;
-  AcStrategyImage& ac_strategy = shared.ac_strategy;
-  BlockCtxMap& block_ctx_map = shared.block_ctx_map;
-  JxlMemoryManager* memory_manager = enc_state->memory_manager();
-
-  // Find and subtract splines.
-  if (cparams.custom_splines.HasAny()) {
-    image_features.splines = cparams.custom_splines;
-  }
-  if (!streaming_mode && cparams.speed_tier <= SpeedTier::kSquirrel) {
-    if (!cparams.custom_splines.HasAny()) {
-      image_features.splines = FindSplines(*opsin);
-    }
-    JXL_RETURN_IF_ERROR(image_features.splines.InitializeDrawCache(
-        opsin->xsize(), opsin->ysize(), cmap.base()));
-    image_features.splines.SubtractFrom(opsin);
-  }
-
-  // Find and subtract patches/dots.
-  if (!streaming_mode &&
-      ApplyOverride(cparams.patches,
-                    cparams.speed_tier <= SpeedTier::kSquirrel)) {
-    JXL_RETURN_IF_ERROR(
-        FindBestPatchDictionary(*opsin, enc_state, cms, pool, aux_out));
-    JXL_RETURN_IF_ERROR(
-        PatchDictionaryEncoder::SubtractFrom(image_features.patches, opsin));
-  }
-
-  const float quant_dc = InitialQuantDC(cparams.butteraugli_distance);
-
-  // TODO(veluca): we can now run all the code from here to FindBestQuantizer
-  // (excluded) one rect at a time. Do that.
-
-  // Dependency graph:
-  //
-  // input: either XYB or input image
-  //
-  // input image -> XYB [optional]
-  // XYB -> initial quant field
-  // XYB -> Gaborished XYB
-  // Gaborished XYB -> CfL1
-  // initial quant field, Gaborished XYB, CfL1 -> ACS
-  // initial quant field, ACS, Gaborished XYB -> EPF control field
-  // initial quant field -> adjusted initial quant field
-  // adjusted initial quant field, ACS -> raw quant field
-  // raw quant field, ACS, Gaborished XYB -> CfL2
-  //
-  // output: Gaborished XYB, CfL, ACS, raw quant field, EPF control field.
-
-  AcStrategyHeuristics acs_heuristics(memory_manager, cparams);
-  CfLHeuristics cfl_heuristics(memory_manager);
-  ImageF initial_quant_field;
-  ImageF initial_quant_masking;
-
-  // Compute an initial estimate of the quantization field.
-  // Call InitialQuantField only in Hare mode or slower. Otherwise, rely
-  // on simple heuristics in FindBestAcStrategy, or set a constant for Falcon
-  // mode.
-  if (cparams.speed_tier > SpeedTier::kHare ||
-      cparams.disable_perceptual_optimizations) {
-    JXL_ASSIGN_OR_RETURN(initial_quant_field,
-                         ImageF::Create(memory_manager, frame_dim.xsize_blocks,
-                                        frame_dim.ysize_blocks));
-    JXL_ASSIGN_OR_RETURN(initial_quant_masking,
-                         ImageF::Create(memory_manager, frame_dim.xsize_blocks,
-                                        frame_dim.ysize_blocks));
-    float q = 0.79 / cparams.butteraugli_distance;
-    FillImage(q, &initial_quant_field);
-    float masking = 1.0f / (q + 0.001f);
-    FillImage(masking, &initial_quant_masking);
-    if (cparams.disable_perceptual_optimizations) {
-      JXL_ASSIGN_OR_RETURN(
-          initial_quant_masking1x1,
-          ImageF::Create(memory_manager, frame_dim.xsize, frame_dim.ysize));
-      FillImage(masking, &initial_quant_masking1x1);
-    }
-    quantizer.ComputeGlobalScaleAndQuant(quant_dc, q, 0);
-  } else {
-    // Call this here, as it relies on pre-gaborish values.
-    float butteraugli_distance_for_iqf = cparams.butteraugli_distance;
-    if (!frame_header.loop_filter.gab) {
-      butteraugli_distance_for_iqf *= 0.62f;
-    }
-    JXL_ASSIGN_OR_RETURN(
-        initial_quant_field,
-        InitialQuantField(butteraugli_distance_for_iqf, *opsin, rect, pool,
-                          1.0f, &initial_quant_masking,
-                          &initial_quant_masking1x1));
-    float q = 0.39 / cparams.butteraugli_distance;
-    quantizer.ComputeGlobalScaleAndQuant(quant_dc, q, 0);
-  }
-
-  // TODO(veluca): do something about animations.
-
-  // Apply inverse-gaborish.
-  if (frame_header.loop_filter.gab) {
-    // Changing the weight here to 0.99f would help to reduce ringing in
-    // generation loss.
-    float weight[3] = {
-        1.0f,
-        1.0f,
-        1.0f,
-    };
-    JXL_RETURN_IF_ERROR(GaborishInverse(opsin, rect, weight, pool));
-  }
-
-  if (initialize_global_state) {
-    JXL_RETURN_IF_ERROR(FindBestDequantMatrices(
-        memory_manager, cparams, modular_frame_encoder, &matrices));
-  }
-
-  JXL_RETURN_IF_ERROR(cfl_heuristics.Init(rect));
-  JXL_RETURN_IF_ERROR(acs_heuristics.Init(*opsin, rect, initial_quant_field,
-                                          initial_quant_masking,
-                                          initial_quant_masking1x1, &matrices));
-
-  auto process_tile = [&](const uint32_t tid, const size_t thread) -> Status {
-    size_t n_enc_tiles = DivCeil(frame_dim.xsize_blocks, kEncTileDimInBlocks);
-    size_t tx = tid % n_enc_tiles;
-    size_t ty = tid / n_enc_tiles;
-    size_t by0 = ty * kEncTileDimInBlocks;
-    size_t by1 =
-        std::min((ty + 1) * kEncTileDimInBlocks, frame_dim.ysize_blocks);
-    size_t bx0 = tx * kEncTileDimInBlocks;
-    size_t bx1 =
-        std::min((tx + 1) * kEncTileDimInBlocks, frame_dim.xsize_blocks);
-    Rect r(bx0, by0, bx1 - bx0, by1 - by0);
-
-    // For speeds up to Wombat, we only compute the color correlation map
-    // once we know the transform type and the quantization map.
-    if (cparams.speed_tier <= SpeedTier::kSquirrel) {
-      JXL_RETURN_IF_ERROR(cfl_heuristics.ComputeTile(
-          r, *opsin, rect, matrices,
-          /*ac_strategy=*/nullptr,
-          /*raw_quant_field=*/nullptr,
-          /*quantizer=*/nullptr, /*fast=*/false, thread, &cmap));
-    }
-
-    // Choose block sizes.
-    JXL_RETURN_IF_ERROR(
-        acs_heuristics.ProcessRect(r, cmap, &ac_strategy, thread));
-
-    // Always set the initial quant field, so we can compute the CfL map with
-    // more accuracy. The initial quant field might change in slower modes, but
-    // adjusting the quant field with butteraugli when all the other encoding
-    // parameters are fixed is likely a more reliable choice anyway.
-    JXL_RETURN_IF_ERROR(AdjustQuantField(
-        ac_strategy, r, cparams.butteraugli_distance, &initial_quant_field));
-    quantizer.SetQuantFieldRect(initial_quant_field, r, &raw_quant_field);
-
-    // Compute a non-default CfL map if we are at Hare speed, or slower.
-    if (cparams.speed_tier <= SpeedTier::kHare) {
-      JXL_RETURN_IF_ERROR(cfl_heuristics.ComputeTile(
-          r, *opsin, rect, matrices, &ac_strategy, &raw_quant_field, &quantizer,
-          /*fast=*/cparams.speed_tier >= SpeedTier::kWombat, thread, &cmap));
-    }
-    return true;
-  };
-  size_t num_tiles = DivCeil(frame_dim.xsize_blocks, kEncTileDimInBlocks) *
-                     DivCeil(frame_dim.ysize_blocks, kEncTileDimInBlocks);
-  const auto prepare = [&](const size_t num_threads) -> Status {
-    JXL_RETURN_IF_ERROR(acs_heuristics.PrepareForThreads(num_threads));
-    JXL_RETURN_IF_ERROR(cfl_heuristics.PrepareForThreads(num_threads));
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(
-      RunOnPool(pool, 0, num_tiles, prepare, process_tile, "Enc Heuristics"));
-
-  JXL_RETURN_IF_ERROR(acs_heuristics.Finalize(frame_dim, ac_strategy, aux_out));
-
-  // Refine quantization levels.
-  if (!streaming_mode && !cparams.disable_perceptual_optimizations) {
-    ImageB& epf_sharpness = shared.epf_sharpness;
-    FillPlane(static_cast<uint8_t>(4), &epf_sharpness, Rect(epf_sharpness));
-    JXL_RETURN_IF_ERROR(FindBestQuantizer(frame_header, linear, *opsin,
-                                          initial_quant_field, enc_state, cms,
-                                          pool, aux_out));
-  }
-
-  // Choose a context model that depends on the amount of quantization for AC.
-  if (cparams.speed_tier < SpeedTier::kFalcon && initialize_global_state) {
-    FindBestBlockEntropyModel(cparams, raw_quant_field, ac_strategy,
-                              &block_ctx_map);
-  }
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_heuristics.h b/third_party/jpeg-xl/lib/jxl/enc_heuristics.h
deleted file mode 100644
index a1843410ba1dc..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_heuristics.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_HEURISTICS_H_
-#define LIB_JXL_ENC_HEURISTICS_H_
-
-// Hook for custom encoder heuristics (VarDCT only for now).
-
-#include <jxl/cms_interface.h>
-
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/image.h"
-
-namespace jxl {
-
-struct AuxOut;
-struct PassesEncoderState;
-class DequantMatrices;
-class ImageBundle;
-class ModularFrameEncoder;
-
-// Initializes encoder structures in `enc_state` using the original image data
-// in `original_pixels`, and the XYB image data in `opsin`. Also modifies the
-// `opsin` image by applying Gaborish, and doing other modifications if
-// necessary. `pool` is used for running the computations on multiple threads.
-// `aux_out` collects statistics and can be used to print debug images.
-Status LossyFrameHeuristics(const FrameHeader& frame_header,
-                            PassesEncoderState* enc_state,
-                            ModularFrameEncoder* modular_frame_encoder,
-                            const Image3F* linear, Image3F* opsin,
-                            const Rect& rect, const JxlCmsInterface& cms,
-                            ThreadPool* pool, AuxOut* aux_out);
-
-Status ComputeARHeuristics(const FrameHeader& frame_header,
-                           PassesEncoderState* enc_state,
-                           const Image3F& orig_opsin, const Rect& rect,
-                           ThreadPool* pool);
-
-void FindBestBlockEntropyModel(PassesEncoderState& enc_state);
-
-Status DownsampleImage2_Iterative(Image3F* opsin);
-Status DownsampleImage2_Sharper(Image3F* opsin);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_HEURISTICS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_huffman.cc b/third_party/jpeg-xl/lib/jxl/enc_huffman.cc
deleted file mode 100644
index dbba42b198c66..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_huffman.cc
+++ /dev/null
@@ -1,222 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_huffman.h"
-
-#include <algorithm>
-#include <memory>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_huffman_tree.h"
-
-namespace jxl {
-
-namespace {
-
-constexpr int kCodeLengthCodes = 18;
-
-void StoreHuffmanTreeOfHuffmanTreeToBitMask(const int num_codes,
-                                            const uint8_t* code_length_bitdepth,
-                                            BitWriter* writer) {
-  static const uint8_t kStorageOrder[kCodeLengthCodes] = {
-      1, 2, 3, 4, 0, 5, 17, 6, 16, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-  // The bit lengths of the Huffman code over the code length alphabet
-  // are compressed with the following static Huffman code:
-  //   Symbol   Code
-  //   ------   ----
-  //   0          00
-  //   1        1110
-  //   2         110
-  //   3          01
-  //   4          10
-  //   5        1111
-  static const uint8_t kHuffmanBitLengthHuffmanCodeSymbols[6] = {0, 7, 3,
-                                                                 2, 1, 15};
-  static const uint8_t kHuffmanBitLengthHuffmanCodeBitLengths[6] = {2, 4, 3,
-                                                                    2, 2, 4};
-
-  // Throw away trailing zeros:
-  size_t codes_to_store = kCodeLengthCodes;
-  if (num_codes > 1) {
-    for (; codes_to_store > 0; --codes_to_store) {
-      if (code_length_bitdepth[kStorageOrder[codes_to_store - 1]] != 0) {
-        break;
-      }
-    }
-  }
-  size_t skip_some = 0;  // skips none.
-  if (code_length_bitdepth[kStorageOrder[0]] == 0 &&
-      code_length_bitdepth[kStorageOrder[1]] == 0) {
-    skip_some = 2;  // skips two.
-    if (code_length_bitdepth[kStorageOrder[2]] == 0) {
-      skip_some = 3;  // skips three.
-    }
-  }
-  writer->Write(2, skip_some);
-  for (size_t i = skip_some; i < codes_to_store; ++i) {
-    size_t l = code_length_bitdepth[kStorageOrder[i]];
-    writer->Write(kHuffmanBitLengthHuffmanCodeBitLengths[l],
-                  kHuffmanBitLengthHuffmanCodeSymbols[l]);
-  }
-}
-
-Status StoreHuffmanTreeToBitMask(const size_t huffman_tree_size,
-                                 const uint8_t* huffman_tree,
-                                 const uint8_t* huffman_tree_extra_bits,
-                                 const uint8_t* code_length_bitdepth,
-                                 const uint16_t* code_length_bitdepth_symbols,
-                                 BitWriter* writer) {
-  for (size_t i = 0; i < huffman_tree_size; ++i) {
-    size_t ix = huffman_tree[i];
-    writer->Write(code_length_bitdepth[ix], code_length_bitdepth_symbols[ix]);
-    JXL_ENSURE(ix <= 17);
-    // Extra bits
-    switch (ix) {
-      case 16:
-        writer->Write(2, huffman_tree_extra_bits[i]);
-        break;
-      case 17:
-        writer->Write(3, huffman_tree_extra_bits[i]);
-        break;
-      default:
-        // no-op
-        break;
-    }
-  }
-  return true;
-}
-
-void StoreSimpleHuffmanTree(const uint8_t* depths, size_t symbols[4],
-                            size_t num_symbols, size_t max_bits,
-                            BitWriter* writer) {
-  // value of 1 indicates a simple Huffman code
-  writer->Write(2, 1);
-  writer->Write(2, num_symbols - 1);  // NSYM - 1
-
-  // Sort
-  for (size_t i = 0; i < num_symbols; i++) {
-    for (size_t j = i + 1; j < num_symbols; j++) {
-      if (depths[symbols[j]] < depths[symbols[i]]) {
-        std::swap(symbols[j], symbols[i]);
-      }
-    }
-  }
-
-  if (num_symbols == 2) {
-    writer->Write(max_bits, symbols[0]);
-    writer->Write(max_bits, symbols[1]);
-  } else if (num_symbols == 3) {
-    writer->Write(max_bits, symbols[0]);
-    writer->Write(max_bits, symbols[1]);
-    writer->Write(max_bits, symbols[2]);
-  } else {
-    writer->Write(max_bits, symbols[0]);
-    writer->Write(max_bits, symbols[1]);
-    writer->Write(max_bits, symbols[2]);
-    writer->Write(max_bits, symbols[3]);
-    // tree-select
-    writer->Write(1, depths[symbols[0]] == 1 ? 1 : 0);
-  }
-}
-
-// num = alphabet size
-// depths = symbol depths
-Status StoreHuffmanTree(const uint8_t* depths, size_t num, BitWriter* writer) {
-  // Write the Huffman tree into the compact representation.
-  std::unique_ptr<uint8_t[]> arena(new uint8_t[2 * num]);
-  uint8_t* huffman_tree = arena.get();
-  uint8_t* huffman_tree_extra_bits = arena.get() + num;
-  size_t huffman_tree_size = 0;
-  WriteHuffmanTree(depths, num, &huffman_tree_size, huffman_tree,
-                   huffman_tree_extra_bits);
-
-  // Calculate the statistics of the Huffman tree in the compact representation.
-  uint32_t huffman_tree_histogram[kCodeLengthCodes] = {0};
-  for (size_t i = 0; i < huffman_tree_size; ++i) {
-    ++huffman_tree_histogram[huffman_tree[i]];
-  }
-
-  int num_codes = 0;
-  int code = 0;
-  for (int i = 0; i < kCodeLengthCodes; ++i) {
-    if (huffman_tree_histogram[i]) {
-      if (num_codes == 0) {
-        code = i;
-        num_codes = 1;
-      } else if (num_codes == 1) {
-        num_codes = 2;
-        break;
-      }
-    }
-  }
-
-  // Calculate another Huffman tree to use for compressing both the
-  // earlier Huffman tree with.
-  uint8_t code_length_bitdepth[kCodeLengthCodes] = {0};
-  uint16_t code_length_bitdepth_symbols[kCodeLengthCodes] = {0};
-  CreateHuffmanTree(&huffman_tree_histogram[0], kCodeLengthCodes, 5,
-                    &code_length_bitdepth[0]);
-  ConvertBitDepthsToSymbols(code_length_bitdepth, kCodeLengthCodes,
-                            &code_length_bitdepth_symbols[0]);
-
-  // Now, we have all the data, let's start storing it
-  StoreHuffmanTreeOfHuffmanTreeToBitMask(num_codes, code_length_bitdepth,
-                                         writer);
-
-  if (num_codes == 1) {
-    code_length_bitdepth[code] = 0;
-  }
-
-  // Store the real huffman tree now.
-  JXL_RETURN_IF_ERROR(StoreHuffmanTreeToBitMask(
-      huffman_tree_size, huffman_tree, huffman_tree_extra_bits,
-      &code_length_bitdepth[0], code_length_bitdepth_symbols, writer));
-  return true;
-}
-
-}  // namespace
-
-Status BuildAndStoreHuffmanTree(const uint32_t* histogram, const size_t length,
-                                uint8_t* depth, uint16_t* bits,
-                                BitWriter* writer) {
-  size_t count = 0;
-  size_t s4[4] = {0};
-  for (size_t i = 0; i < length; i++) {
-    if (histogram[i]) {
-      if (count < 4) {
-        s4[count] = i;
-      } else if (count > 4) {
-        break;
-      }
-      count++;
-    }
-  }
-
-  size_t max_bits_counter = length - 1;
-  size_t max_bits = 0;
-  while (max_bits_counter) {
-    max_bits_counter >>= 1;
-    ++max_bits;
-  }
-
-  if (count <= 1) {
-    // Output symbol bits and depths are initialized with 0, nothing to do.
-    writer->Write(4, 1);
-    writer->Write(max_bits, s4[0]);
-    return true;
-  }
-
-  CreateHuffmanTree(histogram, length, 15, depth);
-  ConvertBitDepthsToSymbols(depth, length, bits);
-
-  if (count <= 4) {
-    StoreSimpleHuffmanTree(depth, s4, count, max_bits, writer);
-  } else {
-    JXL_RETURN_IF_ERROR(StoreHuffmanTree(depth, length, writer));
-  }
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_huffman.h b/third_party/jpeg-xl/lib/jxl/enc_huffman.h
deleted file mode 100644
index 2787d357059a1..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_huffman.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_HUFFMAN_H_
-#define LIB_JXL_ENC_HUFFMAN_H_
-
-#include <cstddef>
-#include <cstdint>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_bit_writer.h"
-
-namespace jxl {
-
-// Builds a Huffman tree for the given histogram, and encodes it into writer
-// in a format that can be read by HuffmanDecodingData::ReadFromBitstream.
-// An allotment for `writer` must already have been created by the caller.
-Status BuildAndStoreHuffmanTree(const uint32_t* histogram, size_t length,
-                                uint8_t* depth, uint16_t* bits,
-                                BitWriter* writer);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_HUFFMAN_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_huffman_tree.cc b/third_party/jpeg-xl/lib/jxl/enc_huffman_tree.cc
deleted file mode 100644
index 1a5804969d2c7..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_huffman_tree.cc
+++ /dev/null
@@ -1,346 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_huffman_tree.h"
-
-// Suppress any -Wdeprecated-declarations warning that might be emitted by
-// GCC or Clang by std::stable_sort in C++17 or later mode
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#elif defined(__GNUC__)
-#pragma GCC push_options
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
-#include <algorithm>
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#pragma GCC pop_options
-#endif
-
-#include <limits>
-#include <vector>
-
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-void SetDepth(const HuffmanTree& p, HuffmanTree* pool, uint8_t* depth,
-              uint8_t level) {
-  if (p.index_left >= 0) {
-    ++level;
-    SetDepth(pool[p.index_left], pool, depth, level);
-    SetDepth(pool[p.index_right_or_value], pool, depth, level);
-  } else {
-    depth[p.index_right_or_value] = level;
-  }
-}
-
-// Sort the root nodes, least popular first.
-static JXL_INLINE bool Compare(const HuffmanTree& v0, const HuffmanTree& v1) {
-  return v0.total_count < v1.total_count;
-}
-
-// This function will create a Huffman tree.
-//
-// The catch here is that the tree cannot be arbitrarily deep.
-// Brotli specifies a maximum depth of 15 bits for "code trees"
-// and 7 bits for "code length code trees."
-//
-// count_limit is the value that is to be faked as the minimum value
-// and this minimum value is raised until the tree matches the
-// maximum length requirement.
-//
-// This algorithm is not of excellent performance for very long data blocks,
-// especially when population counts are longer than 2**tree_limit, but
-// we are not planning to use this with extremely long blocks.
-//
-// See http://en.wikipedia.org/wiki/Huffman_coding
-void CreateHuffmanTree(const uint32_t* data, const size_t length,
-                       const int tree_limit, uint8_t* depth) {
-  // For block sizes below 64 kB, we never need to do a second iteration
-  // of this loop. Probably all of our block sizes will be smaller than
-  // that, so this loop is mostly of academic interest. If we actually
-  // would need this, we would be better off with the Katajainen algorithm.
-  for (uint32_t count_limit = 1;; count_limit *= 2) {
-    std::vector<HuffmanTree> tree;
-    tree.reserve(2 * length + 1);
-
-    for (size_t i = length; i != 0;) {
-      --i;
-      if (data[i]) {
-        const uint32_t count = std::max(data[i], count_limit - 1);
-        tree.emplace_back(count, -1, static_cast<int16_t>(i));
-      }
-    }
-
-    const size_t n = tree.size();
-    if (n == 1) {
-      // Fake value; will be fixed on upper level.
-      depth[tree[0].index_right_or_value] = 1;
-      break;
-    }
-
-    std::stable_sort(tree.begin(), tree.end(), Compare);
-
-    // The nodes are:
-    // [0, n): the sorted leaf nodes that we start with.
-    // [n]: we add a sentinel here.
-    // [n + 1, 2n): new parent nodes are added here, starting from
-    //              (n+1). These are naturally in ascending order.
-    // [2n]: we add a sentinel at the end as well.
-    // There will be (2n+1) elements at the end.
-    const HuffmanTree sentinel(std::numeric_limits<uint32_t>::max(), -1, -1);
-    tree.push_back(sentinel);
-    tree.push_back(sentinel);
-
-    size_t i = 0;      // Points to the next leaf node.
-    size_t j = n + 1;  // Points to the next non-leaf node.
-    for (size_t k = n - 1; k != 0; --k) {
-      size_t left;
-      size_t right;
-      if (tree[i].total_count <= tree[j].total_count) {
-        left = i;
-        ++i;
-      } else {
-        left = j;
-        ++j;
-      }
-      if (tree[i].total_count <= tree[j].total_count) {
-        right = i;
-        ++i;
-      } else {
-        right = j;
-        ++j;
-      }
-
-      // The sentinel node becomes the parent node.
-      size_t j_end = tree.size() - 1;
-      tree[j_end].total_count =
-          tree[left].total_count + tree[right].total_count;
-      tree[j_end].index_left = static_cast<int16_t>(left);
-      tree[j_end].index_right_or_value = static_cast<int16_t>(right);
-
-      // Add back the last sentinel node.
-      tree.push_back(sentinel);
-    }
-    JXL_DASSERT(tree.size() == 2 * n + 1);
-    SetDepth(tree[2 * n - 1], tree.data(), depth, 0);
-
-    // We need to pack the Huffman tree in tree_limit bits.
-    // If this was not successful, add fake entities to the lowest values
-    // and retry.
-    if (*std::max_element(&depth[0], &depth[length]) <= tree_limit) {
-      break;
-    }
-  }
-}
-
-void Reverse(uint8_t* v, size_t start, size_t end) {
-  --end;
-  while (start < end) {
-    uint8_t tmp = v[start];
-    v[start] = v[end];
-    v[end] = tmp;
-    ++start;
-    --end;
-  }
-}
-
-void WriteHuffmanTreeRepetitions(const uint8_t previous_value,
-                                 const uint8_t value, size_t repetitions,
-                                 size_t* tree_size, uint8_t* tree,
-                                 uint8_t* extra_bits_data) {
-  JXL_DASSERT(repetitions > 0);
-  if (previous_value != value) {
-    tree[*tree_size] = value;
-    extra_bits_data[*tree_size] = 0;
-    ++(*tree_size);
-    --repetitions;
-  }
-  if (repetitions == 7) {
-    tree[*tree_size] = value;
-    extra_bits_data[*tree_size] = 0;
-    ++(*tree_size);
-    --repetitions;
-  }
-  if (repetitions < 3) {
-    for (size_t i = 0; i < repetitions; ++i) {
-      tree[*tree_size] = value;
-      extra_bits_data[*tree_size] = 0;
-      ++(*tree_size);
-    }
-  } else {
-    repetitions -= 3;
-    size_t start = *tree_size;
-    while (true) {
-      tree[*tree_size] = 16;
-      extra_bits_data[*tree_size] = repetitions & 0x3;
-      ++(*tree_size);
-      repetitions >>= 2;
-      if (repetitions == 0) {
-        break;
-      }
-      --repetitions;
-    }
-    Reverse(tree, start, *tree_size);
-    Reverse(extra_bits_data, start, *tree_size);
-  }
-}
-
-void WriteHuffmanTreeRepetitionsZeros(size_t repetitions, size_t* tree_size,
-                                      uint8_t* tree, uint8_t* extra_bits_data) {
-  if (repetitions == 11) {
-    tree[*tree_size] = 0;
-    extra_bits_data[*tree_size] = 0;
-    ++(*tree_size);
-    --repetitions;
-  }
-  if (repetitions < 3) {
-    for (size_t i = 0; i < repetitions; ++i) {
-      tree[*tree_size] = 0;
-      extra_bits_data[*tree_size] = 0;
-      ++(*tree_size);
-    }
-  } else {
-    repetitions -= 3;
-    size_t start = *tree_size;
-    while (true) {
-      tree[*tree_size] = 17;
-      extra_bits_data[*tree_size] = repetitions & 0x7;
-      ++(*tree_size);
-      repetitions >>= 3;
-      if (repetitions == 0) {
-        break;
-      }
-      --repetitions;
-    }
-    Reverse(tree, start, *tree_size);
-    Reverse(extra_bits_data, start, *tree_size);
-  }
-}
-
-static void DecideOverRleUse(const uint8_t* depth, const size_t length,
-                             bool* use_rle_for_non_zero,
-                             bool* use_rle_for_zero) {
-  size_t total_reps_zero = 0;
-  size_t total_reps_non_zero = 0;
-  size_t count_reps_zero = 1;
-  size_t count_reps_non_zero = 1;
-  for (size_t i = 0; i < length;) {
-    const uint8_t value = depth[i];
-    size_t reps = 1;
-    for (size_t k = i + 1; k < length && depth[k] == value; ++k) {
-      ++reps;
-    }
-    if (reps >= 3 && value == 0) {
-      total_reps_zero += reps;
-      ++count_reps_zero;
-    }
-    if (reps >= 4 && value != 0) {
-      total_reps_non_zero += reps;
-      ++count_reps_non_zero;
-    }
-    i += reps;
-  }
-  *use_rle_for_non_zero = total_reps_non_zero > count_reps_non_zero * 2;
-  *use_rle_for_zero = total_reps_zero > count_reps_zero * 2;
-}
-
-void WriteHuffmanTree(const uint8_t* depth, size_t length, size_t* tree_size,
-                      uint8_t* tree, uint8_t* extra_bits_data) {
-  uint8_t previous_value = 8;
-
-  // Throw away trailing zeros.
-  size_t new_length = length;
-  for (size_t i = 0; i < length; ++i) {
-    if (depth[length - i - 1] == 0) {
-      --new_length;
-    } else {
-      break;
-    }
-  }
-
-  // First gather statistics on if it is a good idea to do rle.
-  bool use_rle_for_non_zero = false;
-  bool use_rle_for_zero = false;
-  if (length > 50) {
-    // Find rle coding for longer codes.
-    // Shorter codes seem not to benefit from rle.
-    DecideOverRleUse(depth, new_length, &use_rle_for_non_zero,
-                     &use_rle_for_zero);
-  }
-
-  // Actual rle coding.
-  for (size_t i = 0; i < new_length;) {
-    const uint8_t value = depth[i];
-    size_t reps = 1;
-    if ((value != 0 && use_rle_for_non_zero) ||
-        (value == 0 && use_rle_for_zero)) {
-      for (size_t k = i + 1; k < new_length && depth[k] == value; ++k) {
-        ++reps;
-      }
-    }
-    if (value == 0) {
-      WriteHuffmanTreeRepetitionsZeros(reps, tree_size, tree, extra_bits_data);
-    } else {
-      WriteHuffmanTreeRepetitions(previous_value, value, reps, tree_size, tree,
-                                  extra_bits_data);
-      previous_value = value;
-    }
-    i += reps;
-  }
-}
-
-namespace {
-
-uint16_t ReverseBits(int num_bits, uint16_t bits) {
-  static const size_t kLut[16] = {// Pre-reversed 4-bit values.
-                                  0x0, 0x8, 0x4, 0xc, 0x2, 0xa, 0x6, 0xe,
-                                  0x1, 0x9, 0x5, 0xd, 0x3, 0xb, 0x7, 0xf};
-  size_t retval = kLut[bits & 0xf];
-  for (int i = 4; i < num_bits; i += 4) {
-    retval <<= 4;
-    bits = static_cast<uint16_t>(bits >> 4);
-    retval |= kLut[bits & 0xf];
-  }
-  retval >>= (-num_bits & 0x3);
-  return static_cast<uint16_t>(retval);
-}
-
-}  // namespace
-
-void ConvertBitDepthsToSymbols(const uint8_t* depth, size_t len,
-                               uint16_t* bits) {
-  // In Brotli, all bit depths are [1..15]
-  // 0 bit depth means that the symbol does not exist.
-  const int kMaxBits = 16;  // 0..15 are values for bits
-  uint16_t bl_count[kMaxBits] = {0};
-  {
-    for (size_t i = 0; i < len; ++i) {
-      ++bl_count[depth[i]];
-    }
-    bl_count[0] = 0;
-  }
-  uint16_t next_code[kMaxBits];
-  next_code[0] = 0;
-  {
-    int code = 0;
-    for (size_t i = 1; i < kMaxBits; ++i) {
-      code = (code + bl_count[i - 1]) << 1;
-      next_code[i] = static_cast<uint16_t>(code);
-    }
-  }
-  for (size_t i = 0; i < len; ++i) {
-    if (depth[i]) {
-      bits[i] = ReverseBits(depth[i], next_code[depth[i]]++);
-    }
-  }
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_huffman_tree.h b/third_party/jpeg-xl/lib/jxl/enc_huffman_tree.h
deleted file mode 100644
index 7d716cd3b51f4..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_huffman_tree.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Library for creating Huffman codes from population counts.
-
-#ifndef LIB_JXL_HUFFMAN_TREE_H_
-#define LIB_JXL_HUFFMAN_TREE_H_
-
-#include <stdint.h>
-#include <stdlib.h>
-
-namespace jxl {
-
-// A node of a Huffman tree.
-struct HuffmanTree {
-  HuffmanTree(uint32_t count, int16_t left, int16_t right)
-      : total_count(count), index_left(left), index_right_or_value(right) {}
-  uint32_t total_count;
-  int16_t index_left;
-  int16_t index_right_or_value;
-};
-
-void SetDepth(const HuffmanTree& p, HuffmanTree* pool, uint8_t* depth,
-              uint8_t level);
-
-// This function will create a Huffman tree.
-//
-// The (data,length) contains the population counts.
-// The tree_limit is the maximum bit depth of the Huffman codes.
-//
-// The depth contains the tree, i.e., how many bits are used for
-// the symbol.
-//
-// See http://en.wikipedia.org/wiki/Huffman_coding
-void CreateHuffmanTree(const uint32_t* data, size_t length, int tree_limit,
-                       uint8_t* depth);
-
-// Write a Huffman tree from bit depths into the bitstream representation
-// of a Huffman tree. The generated Huffman tree is to be compressed once
-// more using a Huffman tree
-void WriteHuffmanTree(const uint8_t* depth, size_t length, size_t* tree_size,
-                      uint8_t* tree, uint8_t* extra_bits_data);
-
-// Get the actual bit values for a tree of bit depths.
-void ConvertBitDepthsToSymbols(const uint8_t* depth, size_t len,
-                               uint16_t* bits);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_HUFFMAN_TREE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_icc_codec.cc b/third_party/jpeg-xl/lib/jxl/enc_icc_codec.cc
deleted file mode 100644
index e294de7c82ea5..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_icc_codec.cc
+++ /dev/null
@@ -1,483 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_icc_codec.h"
-
-#include <jxl/memory_manager.h>
-
-#include <cstdint>
-#include <limits>
-#include <map>
-#include <vector>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_ans.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/icc_codec_common.h"
-#include "lib/jxl/padded_bytes.h"
-
-namespace jxl {
-namespace {
-
-// Unshuffles or de-interleaves bytes, for example with width 2, turns
-// "AaBbCcDc" into "ABCDabcd", this for example de-interleaves UTF-16 bytes into
-// first all the high order bytes, then all the low order bytes.
-// Transposes a matrix of width columns and ceil(size / width) rows. There are
-// size elements, size may be < width * height, if so the
-// last elements of the bottom row are missing, the missing spots are
-// transposed along with the filled spots, and the result has the missing
-// elements at the bottom of the rightmost column. The input is the input matrix
-// in scanline order, the output is the result matrix in scanline order, with
-// missing elements skipped over (this may occur at multiple positions).
-Status Unshuffle(JxlMemoryManager* memory_manager, uint8_t* data, size_t size,
-                 size_t width) {
-  size_t height = (size + width - 1) / width;  // amount of rows of input
-  PaddedBytes result(memory_manager);
-  JXL_ASSIGN_OR_RETURN(result,
-                       PaddedBytes::WithInitialSpace(memory_manager, size));
-
-  // i = input index, j output index
-  size_t s = 0;
-  size_t j = 0;
-  for (size_t i = 0; i < size; i++) {
-    result[j] = data[i];
-    j += height;
-    if (j >= size) j = ++s;
-  }
-
-  for (size_t i = 0; i < size; i++) {
-    data[i] = result[i];
-  }
-  return true;
-}
-
-// This is performed by the encoder, the encoder must be able to encode any
-// random byte stream (not just byte streams that are a valid ICC profile), so
-// an error returned by this function is an implementation error.
-Status PredictAndShuffle(size_t stride, size_t width, int order, size_t num,
-                         const uint8_t* data, size_t size, size_t* pos,
-                         PaddedBytes* result) {
-  JXL_RETURN_IF_ERROR(CheckOutOfBounds(*pos, num, size));
-  JxlMemoryManager* memory_manager = result->memory_manager();
-  // Required by the specification, see decoder. stride * 4 must be < *pos.
-  if (!*pos || ((*pos - 1u) >> 2u) < stride) {
-    return JXL_FAILURE("Invalid stride");
-  }
-  if (*pos < stride * 4) return JXL_FAILURE("Too large stride");
-  size_t start = result->size();
-  for (size_t i = 0; i < num; i++) {
-    uint8_t predicted =
-        LinearPredictICCValue(data, *pos, i, stride, width, order);
-    JXL_RETURN_IF_ERROR(result->push_back(data[*pos + i] - predicted));
-  }
-  *pos += num;
-  if (width > 1) {
-    JXL_RETURN_IF_ERROR(
-        Unshuffle(memory_manager, result->data() + start, num, width));
-  }
-  return true;
-}
-
-inline Status EncodeVarInt(uint64_t value, PaddedBytes* data) {
-  size_t pos = data->size();
-  JXL_RETURN_IF_ERROR(data->resize(data->size() + 9));
-  size_t output_size = data->size();
-  uint8_t* output = data->data();
-
-  // While more than 7 bits of data are left,
-  // store 7 bits and set the next byte flag
-  while (value > 127) {
-    // TODO(eustas): should it be `<` ?
-    JXL_ENSURE(pos <= output_size);
-    // |128: Set the next byte flag
-    output[pos++] = (static_cast<uint8_t>(value & 127)) | 128;
-    // Remove the seven bits we just wrote
-    value >>= 7;
-  }
-  // TODO(eustas): should it be `<` ?
-  JXL_ENSURE(pos <= output_size);
-  output[pos++] = static_cast<uint8_t>(value & 127);
-
-  return data->resize(pos);
-}
-
-constexpr size_t kSizeLimit = std::numeric_limits<uint32_t>::max() >> 2;
-
-}  // namespace
-
-// Outputs a transformed form of the given icc profile. The result itself is
-// not particularly smaller than the input data in bytes, but it will be in a
-// form that is easier to compress (more zeroes, ...) and will compress better
-// with brotli.
-Status PredictICC(const uint8_t* icc, size_t size, PaddedBytes* result) {
-  JxlMemoryManager* memory_manager = result->memory_manager();
-  PaddedBytes commands{memory_manager};
-  PaddedBytes data{memory_manager};
-
-  static_assert(sizeof(size_t) >= 4, "size_t is too short");
-  // Fuzzer expects that PredictICC can accept any input,
-  // but 1GB should be enough for any purpose.
-  if (size > kSizeLimit) {
-    return JXL_FAILURE("ICC profile is too large");
-  }
-
-  JXL_RETURN_IF_ERROR(EncodeVarInt(size, result));
-
-  // Header
-  PaddedBytes header{memory_manager};
-  JXL_RETURN_IF_ERROR(header.append(ICCInitialHeaderPrediction(size)));
-  for (size_t i = 0; i < kICCHeaderSize && i < size; i++) {
-    ICCPredictHeader(icc, size, header.data(), i);
-    JXL_RETURN_IF_ERROR(data.push_back(icc[i] - header[i]));
-  }
-  if (size <= kICCHeaderSize) {
-    JXL_RETURN_IF_ERROR(EncodeVarInt(0, result));  // 0 commands
-    for (uint8_t b : data) {
-      JXL_RETURN_IF_ERROR(result->push_back(b));
-    }
-    return true;
-  }
-
-  std::vector<Tag> tags;
-  std::vector<size_t> tagstarts;
-  std::vector<size_t> tagsizes;
-  std::map<size_t, size_t> tagmap;
-
-  // Tag list
-  size_t pos = kICCHeaderSize;
-  if (pos + 4 <= size) {
-    uint64_t numtags = DecodeUint32(icc, size, pos);
-    pos += 4;
-    JXL_RETURN_IF_ERROR(EncodeVarInt(numtags + 1, &commands));
-    uint64_t prevtagstart = kICCHeaderSize + numtags * 12;
-    uint32_t prevtagsize = 0;
-    for (size_t i = 0; i < numtags; i++) {
-      if (pos + 12 > size) break;
-
-      Tag tag = DecodeKeyword(icc, size, pos + 0);
-      uint32_t tagstart = DecodeUint32(icc, size, pos + 4);
-      uint32_t tagsize = DecodeUint32(icc, size, pos + 8);
-      pos += 12;
-
-      tags.push_back(tag);
-      tagstarts.push_back(tagstart);
-      tagsizes.push_back(tagsize);
-      tagmap[tagstart] = tags.size() - 1;
-
-      uint8_t tagcode = kCommandTagUnknown;
-      for (size_t j = 0; j < kNumTagStrings; j++) {
-        if (tag == *kTagStrings[j]) {
-          tagcode = j + kCommandTagStringFirst;
-          break;
-        }
-      }
-
-      if (tag == kRtrcTag && pos + 24 < size) {
-        bool ok = true;
-        ok &= DecodeKeyword(icc, size, pos + 0) == kGtrcTag;
-        ok &= DecodeKeyword(icc, size, pos + 12) == kBtrcTag;
-        if (ok) {
-          for (size_t kk = 0; kk < 8; kk++) {
-            if (icc[pos - 8 + kk] != icc[pos + 4 + kk]) ok = false;
-            if (icc[pos - 8 + kk] != icc[pos + 16 + kk]) ok = false;
-          }
-        }
-        if (ok) {
-          tagcode = kCommandTagTRC;
-          pos += 24;
-          i += 2;
-        }
-      }
-
-      if (tag == kRxyzTag && pos + 24 < size) {
-        bool ok = true;
-        ok &= DecodeKeyword(icc, size, pos + 0) == kGxyzTag;
-        ok &= DecodeKeyword(icc, size, pos + 12) == kBxyzTag;
-        uint32_t offsetr = tagstart;
-        uint32_t offsetg = DecodeUint32(icc, size, pos + 4);
-        uint32_t offsetb = DecodeUint32(icc, size, pos + 16);
-        uint32_t sizer = tagsize;
-        uint32_t sizeg = DecodeUint32(icc, size, pos + 8);
-        uint32_t sizeb = DecodeUint32(icc, size, pos + 20);
-        ok &= sizer == 20;
-        ok &= sizeg == 20;
-        ok &= sizeb == 20;
-        ok &= (offsetg == offsetr + 20);
-        ok &= (offsetb == offsetr + 40);
-        if (ok) {
-          tagcode = kCommandTagXYZ;
-          pos += 24;
-          i += 2;
-        }
-      }
-
-      uint8_t command = tagcode;
-      uint64_t predicted_tagstart = prevtagstart + prevtagsize;
-      if (predicted_tagstart != tagstart) command |= kFlagBitOffset;
-      size_t predicted_tagsize = prevtagsize;
-      if (tag == kRxyzTag || tag == kGxyzTag || tag == kBxyzTag ||
-          tag == kKxyzTag || tag == kWtptTag || tag == kBkptTag ||
-          tag == kLumiTag) {
-        predicted_tagsize = 20;
-      }
-      if (predicted_tagsize != tagsize) command |= kFlagBitSize;
-      JXL_RETURN_IF_ERROR(commands.push_back(command));
-      if (tagcode == 1) {
-        JXL_RETURN_IF_ERROR(AppendKeyword(tag, &data));
-      }
-      if (command & kFlagBitOffset)
-        JXL_RETURN_IF_ERROR(EncodeVarInt(tagstart, &commands));
-      if (command & kFlagBitSize)
-        JXL_RETURN_IF_ERROR(EncodeVarInt(tagsize, &commands));
-
-      prevtagstart = tagstart;
-      prevtagsize = tagsize;
-    }
-  }
-  // Indicate end of tag list or varint indicating there's none
-  JXL_RETURN_IF_ERROR(commands.push_back(0));
-
-  // Main content
-  // The main content in a valid ICC profile contains tagged elements, with the
-  // tag types (4 letter names) given by the tag list above, and the tag list
-  // pointing to the start and indicating the size of each tagged element. It is
-  // allowed for tagged elements to overlap, e.g. the curve for R, G and B could
-  // all point to the same one.
-  Tag tag;
-  size_t tagstart = 0;
-  size_t tagsize = 0;
-  size_t clutstart = 0;
-
-  // Should always check tag_sane before doing math with tagsize.
-  const auto tag_sane = [&tagsize]() {
-    return (tagsize > 8) && (tagsize < kSizeLimit);
-  };
-
-  size_t last0 = pos;
-  // This loop appends commands to the output, processing some sub-section of a
-  // current tagged element each time. We need to keep track of the tagtype of
-  // the current element, and update it when we encounter the boundary of a
-  // next one.
-  // It is not required that the input data is a valid ICC profile, if the
-  // encoder does not recognize the data it will still be able to output bytes
-  // but will not predict as well.
-  while (pos <= size) {
-    size_t last1 = pos;
-    PaddedBytes commands_add{memory_manager};
-    PaddedBytes data_add{memory_manager};
-
-    // This means the loop brought the position beyond the tag end.
-    // If tagsize is nonsensical, any pos looks "ok-ish".
-    if ((pos > tagstart + tagsize) && (tagsize < kSizeLimit)) {
-      tag = {{0, 0, 0, 0}};  // nonsensical value
-    }
-
-    if (commands_add.empty() && data_add.empty() && tagmap.count(pos) &&
-        pos + 4 <= size) {
-      size_t index = tagmap[pos];
-      tag = DecodeKeyword(icc, size, pos);
-      tagstart = tagstarts[index];
-      tagsize = tagsizes[index];
-
-      if (tag == kMlucTag && tag_sane() && pos + tagsize <= size &&
-          icc[pos + 4] == 0 && icc[pos + 5] == 0 && icc[pos + 6] == 0 &&
-          icc[pos + 7] == 0) {
-        size_t num = tagsize - 8;
-        JXL_RETURN_IF_ERROR(commands_add.push_back(kCommandTypeStartFirst + 3));
-        pos += 8;
-        JXL_RETURN_IF_ERROR(commands_add.push_back(kCommandShuffle2));
-        JXL_RETURN_IF_ERROR(EncodeVarInt(num, &commands_add));
-        size_t start = data_add.size();
-        for (size_t i = 0; i < num; i++) {
-          JXL_RETURN_IF_ERROR(data_add.push_back(icc[pos]));
-          pos++;
-        }
-        JXL_RETURN_IF_ERROR(
-            Unshuffle(memory_manager, data_add.data() + start, num, 2));
-      }
-
-      if (tag == kCurvTag && tag_sane() && pos + tagsize <= size &&
-          icc[pos + 4] == 0 && icc[pos + 5] == 0 && icc[pos + 6] == 0 &&
-          icc[pos + 7] == 0) {
-        size_t num = tagsize - 8;
-        if (num > 16 && num < (1 << 28) && pos + num <= size && pos > 0) {
-          JXL_RETURN_IF_ERROR(
-              commands_add.push_back(kCommandTypeStartFirst + 5));
-          pos += 8;
-          JXL_RETURN_IF_ERROR(commands_add.push_back(kCommandPredict));
-          int order = 1;
-          int width = 2;
-          int stride = width;
-          JXL_RETURN_IF_ERROR(
-              commands_add.push_back((order << 2) | (width - 1)));
-          JXL_RETURN_IF_ERROR(EncodeVarInt(num, &commands_add));
-          JXL_RETURN_IF_ERROR(PredictAndShuffle(stride, width, order, num, icc,
-                                                size, &pos, &data_add));
-        }
-      }
-    }
-
-    if (tag == kMab_Tag || tag == kMba_Tag) {
-      Tag subTag = DecodeKeyword(icc, size, pos);
-      if (pos + 12 < size && (subTag == kCurvTag || subTag == kVcgtTag) &&
-          DecodeUint32(icc, size, pos + 4) == 0) {
-        uint32_t num = DecodeUint32(icc, size, pos + 8) * 2;
-        if (num > 16 && num < (1 << 28) && pos + 12 + num <= size) {
-          pos += 12;
-          last1 = pos;
-          JXL_RETURN_IF_ERROR(commands_add.push_back(kCommandPredict));
-          int order = 1;
-          int width = 2;
-          int stride = width;
-          JXL_RETURN_IF_ERROR(
-              commands_add.push_back((order << 2) | (width - 1)));
-          JXL_RETURN_IF_ERROR(EncodeVarInt(num, &commands_add));
-          JXL_RETURN_IF_ERROR(PredictAndShuffle(stride, width, order, num, icc,
-                                                size, &pos, &data_add));
-        }
-      }
-
-      if (pos == tagstart + 24 && pos + 4 < size) {
-        // Note that this value can be remembered for next iterations of the
-        // loop, so the "pos == clutstart" if below can trigger during a later
-        // iteration.
-        clutstart = tagstart + DecodeUint32(icc, size, pos);
-      }
-
-      if (pos == clutstart && clutstart + 16 < size) {
-        size_t numi = icc[tagstart + 8];
-        size_t numo = icc[tagstart + 9];
-        size_t width = icc[clutstart + 16];
-        size_t stride = width * numo;
-        size_t num = width * numo;
-        for (size_t i = 0; i < numi && clutstart + i < size; i++) {
-          num *= icc[clutstart + i];
-        }
-        if ((width == 1 || width == 2) && num > 64 && num < (1 << 28) &&
-            pos + num <= size && pos > stride * 4) {
-          JXL_RETURN_IF_ERROR(commands_add.push_back(kCommandPredict));
-          int order = 1;
-          uint8_t flags =
-              (order << 2) | (width - 1) | (stride == width ? 0 : 16);
-          JXL_RETURN_IF_ERROR(commands_add.push_back(flags));
-          if (flags & 16) {
-            JXL_RETURN_IF_ERROR(EncodeVarInt(stride, &commands_add));
-          }
-          JXL_RETURN_IF_ERROR(EncodeVarInt(num, &commands_add));
-          JXL_RETURN_IF_ERROR(PredictAndShuffle(stride, width, order, num, icc,
-                                                size, &pos, &data_add));
-        }
-      }
-    }
-
-    if (commands_add.empty() && data_add.empty() && tag == kGbd_Tag &&
-        tag_sane() && pos == tagstart + 8 && pos + tagsize - 8 <= size &&
-        pos > 16) {
-      size_t width = 4;
-      size_t order = 0;
-      size_t stride = width;
-      size_t num = tagsize - 8;
-      uint8_t flags = (order << 2) | (width - 1) | (stride == width ? 0 : 16);
-      JXL_RETURN_IF_ERROR(commands_add.push_back(kCommandPredict));
-      JXL_RETURN_IF_ERROR(commands_add.push_back(flags));
-      if (flags & 16) {
-        JXL_RETURN_IF_ERROR(EncodeVarInt(stride, &commands_add));
-      }
-      JXL_RETURN_IF_ERROR(EncodeVarInt(num, &commands_add));
-      JXL_RETURN_IF_ERROR(PredictAndShuffle(stride, width, order, num, icc,
-                                            size, &pos, &data_add));
-    }
-
-    if (commands_add.empty() && data_add.empty() && pos + 20 <= size) {
-      Tag subTag = DecodeKeyword(icc, size, pos);
-      if (subTag == kXyz_Tag && DecodeUint32(icc, size, pos + 4) == 0) {
-        JXL_RETURN_IF_ERROR(commands_add.push_back(kCommandXYZ));
-        pos += 8;
-        for (size_t j = 0; j < 12; j++) {
-          JXL_RETURN_IF_ERROR(data_add.push_back(icc[pos++]));
-        }
-      }
-    }
-
-    if (commands_add.empty() && data_add.empty() && pos + 8 <= size) {
-      if (DecodeUint32(icc, size, pos + 4) == 0) {
-        Tag subTag = DecodeKeyword(icc, size, pos);
-        for (size_t i = 0; i < kNumTypeStrings; i++) {
-          if (subTag == *kTypeStrings[i]) {
-            JXL_RETURN_IF_ERROR(
-                commands_add.push_back(kCommandTypeStartFirst + i));
-            pos += 8;
-            break;
-          }
-        }
-      }
-    }
-
-    if (!(commands_add.empty() && data_add.empty()) || pos == size) {
-      if (last0 < last1) {
-        JXL_RETURN_IF_ERROR(commands.push_back(kCommandInsert));
-        JXL_RETURN_IF_ERROR(EncodeVarInt(last1 - last0, &commands));
-        while (last0 < last1) {
-          JXL_RETURN_IF_ERROR(data.push_back(icc[last0++]));
-        }
-      }
-      for (uint8_t b : commands_add) {
-        JXL_RETURN_IF_ERROR(commands.push_back(b));
-      }
-      for (uint8_t b : data_add) {
-        JXL_RETURN_IF_ERROR(data.push_back(b));
-      }
-      last0 = pos;
-    }
-    if (commands_add.empty() && data_add.empty()) {
-      pos++;
-    }
-  }
-
-  JXL_RETURN_IF_ERROR(EncodeVarInt(commands.size(), result));
-  for (uint8_t b : commands) {
-    JXL_RETURN_IF_ERROR(result->push_back(b));
-  }
-  for (uint8_t b : data) {
-    JXL_RETURN_IF_ERROR(result->push_back(b));
-  }
-
-  return true;
-}
-
-Status WriteICC(const Span<const uint8_t> icc, BitWriter* JXL_RESTRICT writer,
-                LayerType layer, AuxOut* JXL_RESTRICT aux_out) {
-  if (icc.empty()) return JXL_FAILURE("ICC must be non-empty");
-  JxlMemoryManager* memory_manager = writer->memory_manager();
-  PaddedBytes enc{memory_manager};
-  JXL_RETURN_IF_ERROR(PredictICC(icc.data(), icc.size(), &enc));
-  std::vector<std::vector<Token>> tokens(1);
-  JXL_RETURN_IF_ERROR(writer->WithMaxBits(128, layer, aux_out, [&] {
-    return U64Coder::Write(enc.size(), writer);
-  }));
-
-  for (size_t i = 0; i < enc.size(); i++) {
-    tokens[0].emplace_back(
-        ICCANSContext(i, i > 0 ? enc[i - 1] : 0, i > 1 ? enc[i - 2] : 0),
-        enc[i]);
-  }
-  HistogramParams params;
-  params.lz77_method = enc.size() < 4096 ? HistogramParams::LZ77Method::kOptimal
-                                         : HistogramParams::LZ77Method::kLZ77;
-  EntropyEncodingData code;
-  std::vector<uint8_t> context_map;
-  params.force_huffman = true;
-  JXL_ASSIGN_OR_RETURN(
-      size_t cost,
-      BuildAndEncodeHistograms(memory_manager, params, kNumICCContexts, tokens,
-                               &code, &context_map, writer, layer, aux_out));
-  (void)cost;
-  JXL_RETURN_IF_ERROR(
-      WriteTokens(tokens[0], code, context_map, 0, writer, layer, aux_out));
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_icc_codec.h b/third_party/jpeg-xl/lib/jxl/enc_icc_codec.h
deleted file mode 100644
index 7141550267b02..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_icc_codec.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_ICC_CODEC_H_
-#define LIB_JXL_ENC_ICC_CODEC_H_
-
-// Compressed representation of ICC profiles.
-
-#include <cstdint>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_bit_writer.h"
-
-namespace jxl {
-
-struct AuxOut;
-enum class LayerType : uint8_t;
-class PaddedBytes;
-
-// Should still be called if `icc.empty()` - if so, writes only 1 bit.
-Status WriteICC(Span<const uint8_t> icc, BitWriter* JXL_RESTRICT writer,
-                LayerType layer, AuxOut* JXL_RESTRICT aux_out);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_ICC_CODEC_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_image_bundle.cc b/third_party/jpeg-xl/lib/jxl/enc_image_bundle.cc
deleted file mode 100644
index 1d9cb7acc02ae..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_image_bundle.cc
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_image_bundle.h"
-
-#include <jxl/cms_interface.h>
-#include <jxl/memory_manager.h>
-
-#include <utility>
-
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/image_bundle.h"
-
-namespace jxl {
-
-Status ApplyColorTransform(const ColorEncoding& c_current,
-                           float intensity_target, const Image3F& color,
-                           const ImageF* black, const Rect& rect,
-                           const ColorEncoding& c_desired,
-                           const JxlCmsInterface& cms, ThreadPool* pool,
-                           Image3F* out) {
-  ColorSpaceTransform c_transform(cms);
-  // Changing IsGray is probably a bug.
-  JXL_ENSURE(c_current.IsGray() == c_desired.IsGray());
-  bool is_gray = c_current.IsGray();
-  JxlMemoryManager* memory_amanger = color.memory_manager();
-  if (out->xsize() < rect.xsize() || out->ysize() < rect.ysize()) {
-    JXL_ASSIGN_OR_RETURN(
-        *out, Image3F::Create(memory_amanger, rect.xsize(), rect.ysize()));
-  } else {
-    JXL_RETURN_IF_ERROR(out->ShrinkTo(rect.xsize(), rect.ysize()));
-  }
-  const auto init = [&](const size_t num_threads) -> Status {
-    JXL_RETURN_IF_ERROR(c_transform.Init(c_current, c_desired, intensity_target,
-                                         rect.xsize(), num_threads));
-    return true;
-  };
-  const auto transform_row = [&](const uint32_t y,
-                                 const size_t thread) -> Status {
-    float* mutable_src_buf = c_transform.BufSrc(thread);
-    const float* src_buf = mutable_src_buf;
-    // Interleave input.
-    if (is_gray) {
-      src_buf = rect.ConstPlaneRow(color, 0, y);
-    } else if (c_current.IsCMYK()) {
-      if (!black)
-        return JXL_FAILURE("Black plane is missing for CMYK transform");
-      const float* JXL_RESTRICT row_in0 = rect.ConstPlaneRow(color, 0, y);
-      const float* JXL_RESTRICT row_in1 = rect.ConstPlaneRow(color, 1, y);
-      const float* JXL_RESTRICT row_in2 = rect.ConstPlaneRow(color, 2, y);
-      const float* JXL_RESTRICT row_in3 = rect.ConstRow(*black, y);
-      for (size_t x = 0; x < rect.xsize(); x++) {
-        // CMYK convention in JXL: 0 = max ink, 1 = white
-        mutable_src_buf[4 * x + 0] = row_in0[x];
-        mutable_src_buf[4 * x + 1] = row_in1[x];
-        mutable_src_buf[4 * x + 2] = row_in2[x];
-        mutable_src_buf[4 * x + 3] = row_in3[x];
-      }
-    } else {
-      const float* JXL_RESTRICT row_in0 = rect.ConstPlaneRow(color, 0, y);
-      const float* JXL_RESTRICT row_in1 = rect.ConstPlaneRow(color, 1, y);
-      const float* JXL_RESTRICT row_in2 = rect.ConstPlaneRow(color, 2, y);
-      for (size_t x = 0; x < rect.xsize(); x++) {
-        mutable_src_buf[3 * x + 0] = row_in0[x];
-        mutable_src_buf[3 * x + 1] = row_in1[x];
-        mutable_src_buf[3 * x + 2] = row_in2[x];
-      }
-    }
-    float* JXL_RESTRICT dst_buf = c_transform.BufDst(thread);
-    JXL_RETURN_IF_ERROR(
-        c_transform.Run(thread, src_buf, dst_buf, rect.xsize()));
-    float* JXL_RESTRICT row_out0 = out->PlaneRow(0, y);
-    float* JXL_RESTRICT row_out1 = out->PlaneRow(1, y);
-    float* JXL_RESTRICT row_out2 = out->PlaneRow(2, y);
-    // De-interleave output and convert type.
-    if (is_gray) {
-      for (size_t x = 0; x < rect.xsize(); x++) {
-        row_out0[x] = dst_buf[x];
-        row_out1[x] = dst_buf[x];
-        row_out2[x] = dst_buf[x];
-      }
-    } else {
-      for (size_t x = 0; x < rect.xsize(); x++) {
-        row_out0[x] = dst_buf[3 * x + 0];
-        row_out1[x] = dst_buf[3 * x + 1];
-        row_out2[x] = dst_buf[3 * x + 2];
-      }
-    }
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, rect.ysize(), init, transform_row,
-                                "Colorspace transform"));
-  return true;
-}
-
-namespace {
-
-// Copies ib:rect, converts, and copies into out.
-Status CopyToT(const ImageMetadata* metadata, const ImageBundle* ib,
-               const Rect& rect, const ColorEncoding& c_desired,
-               const JxlCmsInterface& cms, ThreadPool* pool, Image3F* out) {
-  return ApplyColorTransform(ib->c_current(), metadata->IntensityTarget(),
-                             ib->color(), ib->black(), rect, c_desired, cms,
-                             pool, out);
-}
-
-}  // namespace
-
-Status ImageBundle::TransformTo(const ColorEncoding& c_desired,
-                                const JxlCmsInterface& cms, ThreadPool* pool) {
-  JXL_RETURN_IF_ERROR(CopyTo(Rect(color_), c_desired, cms, &color_, pool));
-  c_current_ = c_desired;
-  return true;
-}
-Status ImageBundle::CopyTo(const Rect& rect, const ColorEncoding& c_desired,
-                           const JxlCmsInterface& cms, Image3F* out,
-                           ThreadPool* pool) const {
-  return CopyToT(metadata_, this, rect, c_desired, cms, pool, out);
-}
-Status TransformIfNeeded(const ImageBundle& in, const ColorEncoding& c_desired,
-                         const JxlCmsInterface& cms, ThreadPool* pool,
-                         ImageBundle* store, const ImageBundle** out) {
-  if (in.c_current().SameColorEncoding(c_desired) && !in.HasBlack()) {
-    *out = &in;
-    return true;
-  }
-  JxlMemoryManager* memory_manager = in.memory_manager();
-  // TODO(janwas): avoid copying via createExternal+copyBackToIO
-  // instead of copy+createExternal+copyBackToIO
-  JXL_ASSIGN_OR_RETURN(
-      Image3F color,
-      Image3F::Create(memory_manager, in.color().xsize(), in.color().ysize()));
-  JXL_RETURN_IF_ERROR(CopyImageTo(in.color(), &color));
-  JXL_RETURN_IF_ERROR(store->SetFromImage(std::move(color), in.c_current()));
-
-  // Must at least copy the alpha channel for use by external_image.
-  if (in.HasExtraChannels()) {
-    std::vector<ImageF> extra_channels;
-    for (const ImageF& extra_channel : in.extra_channels()) {
-      JXL_ASSIGN_OR_RETURN(ImageF ec,
-                           ImageF::Create(memory_manager, extra_channel.xsize(),
-                                          extra_channel.ysize()));
-      JXL_RETURN_IF_ERROR(CopyImageTo(extra_channel, &ec));
-      extra_channels.emplace_back(std::move(ec));
-    }
-    JXL_RETURN_IF_ERROR(store->SetExtraChannels(std::move(extra_channels)));
-  }
-
-  if (!store->TransformTo(c_desired, cms, pool)) {
-    return false;
-  }
-  *out = store;
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_image_bundle.h b/third_party/jpeg-xl/lib/jxl/enc_image_bundle.h
deleted file mode 100644
index c1180a6da8fbc..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_image_bundle.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_IMAGE_BUNDLE_H_
-#define LIB_JXL_ENC_IMAGE_BUNDLE_H_
-
-#include <jxl/cms_interface.h>
-
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-
-namespace jxl {
-
-Status ApplyColorTransform(const ColorEncoding& c_current,
-                           float intensity_target, const Image3F& color,
-                           const ImageF* black, const Rect& rect,
-                           const ColorEncoding& c_desired,
-                           const JxlCmsInterface& cms, ThreadPool* pool,
-                           Image3F* out);
-
-// Does color transformation from in.c_current() to c_desired if the color
-// encodings are different, or nothing if they are already the same.
-// If color transformation is done, stores the transformed values into store and
-// sets the out pointer to store, else leaves store untouched and sets the out
-// pointer to &in.
-// Returns false if color transform fails.
-Status TransformIfNeeded(const ImageBundle& in, const ColorEncoding& c_desired,
-                         const JxlCmsInterface& cms, ThreadPool* pool,
-                         ImageBundle* store, const ImageBundle** out);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_IMAGE_BUNDLE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_linalg.cc b/third_party/jpeg-xl/lib/jxl/enc_linalg.cc
deleted file mode 100644
index 1ca34a9ad5707..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_linalg.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_linalg.h"
-
-#include <cmath>
-
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-void ConvertToDiagonal(const Matrix2x2& A, Vector2& diag, Matrix2x2& U) {
-  // Check A is symmetric.
-  JXL_DASSERT(std::abs(A[0][1] - A[1][0]) < 1e-15);
-
-  double b = -(A[0][0] + A[1][1]);
-  double c = A[0][0] * A[1][1] - A[0][1] * A[0][1];
-  double d = b * b - 4.0 * c;
-
-  if (std::abs(A[0][1]) < 1e-10 || d < 0) {
-    // Already diagonal.
-    diag[0] = A[0][0];
-    diag[1] = A[1][1];
-    U[0][0] = U[1][1] = 1.0;
-    U[0][1] = U[1][0] = 0.0;
-    return;
-  }
-
-  double sqd = std::sqrt(d);
-  double l1 = (-b - sqd) * 0.5;
-  double l2 = (-b + sqd) * 0.5;
-
-  Vector2 v1 = {A[0][0] - l1, A[1][0]};
-  double v1n = 1.0 / std::hypot(v1[0], v1[1]);
-  v1[0] = v1[0] * v1n;
-  v1[1] = v1[1] * v1n;
-
-  diag[0] = l1;
-  diag[1] = l2;
-
-  U[0][0] = v1[1];
-  U[0][1] = -v1[0];
-  U[1][0] = v1[0];
-  U[1][1] = v1[1];
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_linalg.h b/third_party/jpeg-xl/lib/jxl/enc_linalg.h
deleted file mode 100644
index b9a36c7ca10f0..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_linalg.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_LINALG_H_
-#define LIB_JXL_LINALG_H_
-
-// Linear algebra.
-
-#include <array>
-
-namespace jxl {
-
-typedef std::array<double, 2> Vector2;
-// NB: matrix2x2[row][column]
-typedef std::array<Vector2, 2> Matrix2x2;
-
-// A is symmetric, U is orthogonal, and A = U * Diagonal(diag) * Transpose(U).
-void ConvertToDiagonal(const Matrix2x2& A, Vector2& diag, Matrix2x2& U);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_LINALG_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_linalg_test.cc b/third_party/jpeg-xl/lib/jxl/enc_linalg_test.cc
deleted file mode 100644
index b5678863dbf73..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_linalg_test.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_linalg.h"
-
-#include <cstddef>
-
-#include "lib/jxl/base/random.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-Matrix2x2 Diagonal(const Vector2& d) { return {{{d[0], 0.0}, {0.0, d[1]}}}; }
-
-Matrix2x2 Identity() { return Diagonal({1.0, 1.0}); }
-
-Matrix2x2 MatMul(const Matrix2x2& A, const Matrix2x2& B) {
-  Matrix2x2 out;
-  for (size_t y = 0; y < 2; ++y) {
-    for (size_t x = 0; x < 2; ++x) {
-      out[y][x] = A[0][x] * B[y][0] + A[1][x] * B[y][1];
-    }
-  }
-  return out;
-}
-
-Matrix2x2 Transpose(const Matrix2x2& A) {
-  return {{{A[0][0], A[1][0]}, {A[0][1], A[1][1]}}};
-}
-
-Matrix2x2 RandomSymmetricMatrix(Rng& rng, const double vmin,
-                                const double vmax) {
-  Matrix2x2 A;
-  A[0][0] = rng.UniformF(vmin, vmax);
-  A[0][1] = A[1][0] = rng.UniformF(vmin, vmax);
-  A[1][1] = rng.UniformF(vmin, vmax);
-  return A;
-}
-
-void VerifyMatrixEqual(const Matrix2x2& A, const Matrix2x2& B,
-                       const double eps) {
-  for (size_t y = 0; y < 2; ++y) {
-    for (size_t x = 0; x < 2; ++x) {
-      ASSERT_NEAR(A[y][x], B[y][x], eps);
-    }
-  }
-}
-
-void VerifyOrthogonal(const Matrix2x2& A, const double eps) {
-  VerifyMatrixEqual(Identity(), MatMul(Transpose(A), A), eps);
-}
-
-TEST(LinAlgTest, ConvertToDiagonal) {
-  {
-    Matrix2x2 I = Identity();
-    Matrix2x2 U;
-    Vector2 d;
-    ConvertToDiagonal(I, d, U);
-    VerifyMatrixEqual(I, U, 1e-15);
-    for (size_t k = 0; k < 2; ++k) {
-      ASSERT_NEAR(d[k], 1.0, 1e-15);
-    }
-  }
-  {
-    Matrix2x2 A = Identity();
-    A[0][1] = A[1][0] = 2.0;
-    Matrix2x2 U;
-    Vector2 d;
-    ConvertToDiagonal(A, d, U);
-    VerifyOrthogonal(U, 1e-12);
-    VerifyMatrixEqual(A, MatMul(U, MatMul(Diagonal(d), Transpose(U))), 1e-12);
-  }
-  {
-    Matrix2x2 A;
-    A[0] = {0.000208649, 1.13687e-12};
-    A[1] = {1.13687e-12, 0.000208649};
-    Matrix2x2 U;
-    Vector2 d;
-    ConvertToDiagonal(A, d, U);
-    VerifyOrthogonal(U, 1e-12);
-    VerifyMatrixEqual(A, MatMul(U, MatMul(Diagonal(d), Transpose(U))), 1e-11);
-  }
-  Rng rng(0);
-  for (size_t i = 0; i < 1000000; ++i) {
-    Matrix2x2 A = RandomSymmetricMatrix(rng, -1.0, 1.0);
-    Matrix2x2 U;
-    Vector2 d;
-    ConvertToDiagonal(A, d, U);
-    VerifyOrthogonal(U, 1e-12);
-    VerifyMatrixEqual(A, MatMul(U, MatMul(Diagonal(d), Transpose(U))), 5e-10);
-  }
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_modular.cc b/third_party/jpeg-xl/lib/jxl/enc_modular.cc
deleted file mode 100644
index 1620a5be640fd..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_modular.cc
+++ /dev/null
@@ -1,1796 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_modular.h"
-
-#include <jxl/memory_manager.h>
-
-#include <array>
-#include <cstddef>
-#include <cstdint>
-#include <limits>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/chroma_from_luma.h"
-#include "lib/jxl/compressed_dc.h"
-#include "lib/jxl/dec_ans.h"
-#include "lib/jxl/dec_modular.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/enc_cluster.h"
-#include "lib/jxl/enc_fields.h"
-#include "lib/jxl/enc_gaborish.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/enc_patch_dictionary.h"
-#include "lib/jxl/enc_quant_weights.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/modular/encoding/context_predict.h"
-#include "lib/jxl/modular/encoding/enc_encoding.h"
-#include "lib/jxl/modular/encoding/encoding.h"
-#include "lib/jxl/modular/encoding/ma_common.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/modular/options.h"
-#include "lib/jxl/modular/transform/enc_transform.h"
-#include "lib/jxl/pack_signed.h"
-#include "lib/jxl/quant_weights.h"
-#include "modular/options.h"
-
-namespace jxl {
-
-namespace {
-// constexpr bool kPrintTree = false;
-
-// Squeeze default quantization factors
-// these quantization factors are for -Q 50  (other qualities simply scale the
-// factors; things are rounded down and obviously cannot get below 1)
-const float squeeze_quality_factor =
-    0.35;  // for easy tweaking of the quality range (decrease this number for
-           // higher quality)
-const float squeeze_luma_factor =
-    1.1;  // for easy tweaking of the balance between luma (or anything
-          // non-chroma) and chroma (decrease this number for higher quality
-          // luma)
-const float squeeze_quality_factor_xyb = 4.8f;
-const float squeeze_xyb_qtable[3][16] = {
-    {163.84, 81.92, 40.96, 20.48, 10.24, 5.12, 2.56, 1.28, 0.64, 0.32, 0.16,
-     0.08, 0.04, 0.02, 0.01, 0.005},  // Y
-    {1024, 512, 256, 128, 64, 32, 16, 8, 4, 2, 1, 0.5, 0.5, 0.5, 0.5,
-     0.5},  // X
-    {2048, 1024, 512, 256, 128, 64, 32, 16, 8, 4, 2, 1, 0.5, 0.5, 0.5,
-     0.5},  // B-Y
-};
-
-const float squeeze_luma_qtable[16] = {163.84, 81.92, 40.96, 20.48, 10.24, 5.12,
-                                       2.56,   1.28,  0.64,  0.32,  0.16,  0.08,
-                                       0.04,   0.02,  0.01,  0.005};
-// for 8-bit input, the range of YCoCg chroma is -255..255 so basically this
-// does 4:2:0 subsampling (two most fine grained layers get quantized away)
-const float squeeze_chroma_qtable[16] = {
-    1024, 512, 256, 128, 64, 32, 16, 8, 4, 2, 1, 0.5, 0.5, 0.5, 0.5, 0.5};
-
-// Merges the trees in `trees` using nodes that decide on stream_id, as defined
-// by `tree_splits`.
-Status MergeTrees(const std::vector<Tree>& trees,
-                  const std::vector<size_t>& tree_splits, size_t begin,
-                  size_t end, Tree* tree) {
-  JXL_ENSURE(trees.size() + 1 == tree_splits.size());
-  JXL_ENSURE(end > begin);
-  JXL_ENSURE(end <= trees.size());
-  if (end == begin + 1) {
-    // Insert the tree, adding the opportune offset to all child nodes.
-    // This will make the leaf IDs wrong, but subsequent roundtripping will fix
-    // them.
-    size_t sz = tree->size();
-    tree->insert(tree->end(), trees[begin].begin(), trees[begin].end());
-    for (size_t i = sz; i < tree->size(); i++) {
-      (*tree)[i].lchild += sz;
-      (*tree)[i].rchild += sz;
-    }
-    return true;
-  }
-  size_t mid = (begin + end) / 2;
-  size_t splitval = tree_splits[mid] - 1;
-  size_t cur = tree->size();
-  tree->emplace_back(1 /*stream_id*/, splitval, 0, 0, Predictor::Zero, 0, 1);
-  (*tree)[cur].lchild = tree->size();
-  JXL_RETURN_IF_ERROR(MergeTrees(trees, tree_splits, mid, end, tree));
-  (*tree)[cur].rchild = tree->size();
-  JXL_RETURN_IF_ERROR(MergeTrees(trees, tree_splits, begin, mid, tree));
-  return true;
-}
-
-void QuantizeChannel(Channel& ch, const int q) {
-  if (q == 1) return;
-  for (size_t y = 0; y < ch.plane.ysize(); y++) {
-    pixel_type* row = ch.plane.Row(y);
-    for (size_t x = 0; x < ch.plane.xsize(); x++) {
-      if (row[x] < 0) {
-        row[x] = -((-row[x] + q / 2) / q) * q;
-      } else {
-        row[x] = ((row[x] + q / 2) / q) * q;
-      }
-    }
-  }
-}
-
-// convert binary32 float that corresponds to custom [bits]-bit float (with
-// [exp_bits] exponent bits) to a [bits]-bit integer representation that should
-// fit in pixel_type
-Status float_to_int(const float* const row_in, pixel_type* const row_out,
-                    size_t xsize, unsigned int bits, unsigned int exp_bits,
-                    bool fp, double dfactor) {
-  JXL_ENSURE(sizeof(pixel_type) * 8 >= bits);
-  if (!fp) {
-    if (bits > 22) {
-      for (size_t x = 0; x < xsize; ++x) {
-        row_out[x] = row_in[x] * dfactor + (row_in[x] < 0 ? -0.5 : 0.5);
-      }
-    } else {
-      float factor = dfactor;
-      for (size_t x = 0; x < xsize; ++x) {
-        row_out[x] = row_in[x] * factor + (row_in[x] < 0 ? -0.5f : 0.5f);
-      }
-    }
-    return true;
-  }
-  if (bits == 32 && fp) {
-    JXL_ENSURE(exp_bits == 8);
-    memcpy(static_cast<void*>(row_out), static_cast<const void*>(row_in),
-           4 * xsize);
-    return true;
-  }
-
-  JXL_ENSURE(bits > 0);
-  int exp_bias = (1 << (exp_bits - 1)) - 1;
-  int max_exp = (1 << exp_bits) - 1;
-  uint32_t sign = (1u << (bits - 1));
-  int mant_bits = bits - exp_bits - 1;
-  int mant_shift = 23 - mant_bits;
-  for (size_t x = 0; x < xsize; ++x) {
-    uint32_t f;
-    memcpy(&f, &row_in[x], 4);
-    int signbit = (f >> 31);
-    f &= 0x7fffffff;
-    if (f == 0) {
-      row_out[x] = (signbit ? sign : 0);
-      continue;
-    }
-    int exp = (f >> 23) - 127;
-    if (exp == 128) return JXL_FAILURE("Inf/NaN not allowed");
-    int mantissa = (f & 0x007fffff);
-    // broke up the binary32 into its parts, now reassemble into
-    // arbitrary float
-    exp += exp_bias;
-    if (exp < 0) {  // will become a subnormal number
-      // add implicit leading 1 to mantissa
-      mantissa |= 0x00800000;
-      if (exp < -mant_bits) {
-        return JXL_FAILURE(
-            "Invalid float number: %g cannot be represented with %i "
-            "exp_bits and %i mant_bits (exp %i)",
-            row_in[x], exp_bits, mant_bits, exp);
-      }
-      mantissa >>= 1 - exp;
-      exp = 0;
-    }
-    // exp should be representable in exp_bits, otherwise input was
-    // invalid
-    if (exp > max_exp) return JXL_FAILURE("Invalid float exponent");
-    if (mantissa & ((1 << mant_shift) - 1)) {
-      return JXL_FAILURE("%g is losing precision (mant: %x)", row_in[x],
-                         mantissa);
-    }
-    mantissa >>= mant_shift;
-    f = (signbit ? sign : 0);
-    f |= (exp << mant_bits);
-    f |= mantissa;
-    row_out[x] = static_cast<pixel_type>(f);
-  }
-  return true;
-}
-
-float EstimateWPCost(const Image& img, size_t i) {
-  size_t extra_bits = 0;
-  float histo_cost = 0;
-  HybridUintConfig config;
-  int32_t cutoffs[] = {-500, -392, -255, -191, -127, -95, -63, -47, -31,
-                       -23,  -15,  -11,  -7,   -4,   -3,  -1,  0,   1,
-                       3,    5,    7,    11,   15,   23,  31,  47,  63,
-                       95,   127,  191,  255,  392,  500};
-  constexpr size_t nc = sizeof(cutoffs) / sizeof(*cutoffs) + 1;
-  Histogram histo[nc] = {};
-  weighted::Header wp_header;
-  PredictorMode(i, &wp_header);
-  for (const Channel& ch : img.channel) {
-    const intptr_t onerow = ch.plane.PixelsPerRow();
-    weighted::State wp_state(wp_header, ch.w, ch.h);
-    Properties properties(1);
-    for (size_t y = 0; y < ch.h; y++) {
-      const pixel_type* JXL_RESTRICT r = ch.Row(y);
-      for (size_t x = 0; x < ch.w; x++) {
-        size_t offset = 0;
-        pixel_type_w left = (x ? r[x - 1] : y ? *(r + x - onerow) : 0);
-        pixel_type_w top = (y ? *(r + x - onerow) : left);
-        pixel_type_w topleft = (x && y ? *(r + x - 1 - onerow) : left);
-        pixel_type_w topright =
-            (x + 1 < ch.w && y ? *(r + x + 1 - onerow) : top);
-        pixel_type_w toptop = (y > 1 ? *(r + x - onerow - onerow) : top);
-        pixel_type guess = wp_state.Predict</*compute_properties=*/true>(
-            x, y, ch.w, top, left, topright, topleft, toptop, &properties,
-            offset);
-        size_t ctx = 0;
-        for (int c : cutoffs) {
-          ctx += (c >= properties[0]) ? 1 : 0;
-        }
-        pixel_type res = r[x] - guess;
-        uint32_t token;
-        uint32_t nbits;
-        uint32_t bits;
-        config.Encode(PackSigned(res), &token, &nbits, &bits);
-        histo[ctx].Add(token);
-        extra_bits += nbits;
-        wp_state.UpdateErrors(r[x], x, y, ch.w);
-      }
-    }
-    for (auto& h : histo) {
-      histo_cost += h.ShannonEntropy();
-      h.Clear();
-    }
-  }
-  return histo_cost + extra_bits;
-}
-
-float EstimateCost(const Image& img) {
-  // TODO(veluca): consider SIMDfication of this code.
-  size_t extra_bits = 0;
-  float histo_cost = 0;
-  HybridUintConfig config;
-  uint32_t cutoffs[] = {0,  1,  3,  5,   7,   11,  15,  23, 31,
-                        47, 63, 95, 127, 191, 255, 392, 500};
-  constexpr size_t nc = sizeof(cutoffs) / sizeof(*cutoffs) + 1;
-  Histogram histo[nc] = {};
-  for (const Channel& ch : img.channel) {
-    const intptr_t onerow = ch.plane.PixelsPerRow();
-    for (size_t y = 0; y < ch.h; y++) {
-      const pixel_type* JXL_RESTRICT r = ch.Row(y);
-      for (size_t x = 0; x < ch.w; x++) {
-        pixel_type_w left = (x ? r[x - 1] : y ? *(r + x - onerow) : 0);
-        pixel_type_w top = (y ? *(r + x - onerow) : left);
-        pixel_type_w topleft = (x && y ? *(r + x - 1 - onerow) : left);
-        size_t maxdiff = std::max(std::max(left, top), topleft) -
-                         std::min(std::min(left, top), topleft);
-        size_t ctx = 0;
-        for (uint32_t c : cutoffs) {
-          ctx += (c > maxdiff) ? 1 : 0;
-        }
-        pixel_type res = r[x] - ClampedGradient(top, left, topleft);
-        uint32_t token;
-        uint32_t nbits;
-        uint32_t bits;
-        config.Encode(PackSigned(res), &token, &nbits, &bits);
-        histo[ctx].Add(token);
-        extra_bits += nbits;
-      }
-    }
-    for (auto& h : histo) {
-      histo_cost += h.ShannonEntropy();
-      h.Clear();
-    }
-  }
-  return histo_cost + extra_bits;
-}
-
-bool do_transform(Image& image, const Transform& tr,
-                  const weighted::Header& wp_header,
-                  jxl::ThreadPool* pool = nullptr, bool force_jxlart = false) {
-  Transform t = tr;
-  bool did_it = true;
-  if (force_jxlart) {
-    if (!t.MetaApply(image)) return false;
-  } else {
-    did_it = TransformForward(t, image, wp_header, pool);
-  }
-  if (did_it) image.transform.push_back(t);
-  return did_it;
-}
-
-bool maybe_do_transform(Image& image, const Transform& tr,
-                        const CompressParams& cparams,
-                        const weighted::Header& wp_header, float cost_before,
-                        jxl::ThreadPool* pool = nullptr,
-                        bool force_jxlart = false) {
-  if (force_jxlart || cparams.speed_tier >= SpeedTier::kSquirrel) {
-    return do_transform(image, tr, wp_header, pool, force_jxlart);
-  }
-  bool did_it = do_transform(image, tr, wp_header, pool);
-  if (did_it) {
-    float cost_after = EstimateCost(image);
-    JXL_DEBUG_V(7, "Cost before: %f  cost after: %f", cost_before, cost_after);
-    if (cost_after > cost_before) {
-      Transform t = image.transform.back();
-      JXL_RETURN_IF_ERROR(t.Inverse(image, wp_header, pool));
-      image.transform.pop_back();
-      did_it = false;
-    }
-  }
-  return did_it;
-}
-
-void try_palettes(Image& gi, int& max_bitdepth, int& maxval,
-                  const CompressParams& cparams_, float channel_colors_percent,
-                  jxl::ThreadPool* pool = nullptr) {
-  float cost_before = 0.f;
-  size_t did_palette = 0;
-  float nb_pixels = gi.channel[0].w * gi.channel[0].h;
-  int nb_chans = gi.channel.size() - gi.nb_meta_channels;
-  // arbitrary estimate: 4.8 bpp for 8-bit RGB
-  float arbitrary_bpp_estimate = 0.2f * gi.bitdepth * nb_chans;
-
-  if (cparams_.palette_colors != 0 || cparams_.lossy_palette) {
-    // when not estimating, assume some arbitrary bpp
-    cost_before = cparams_.speed_tier <= SpeedTier::kSquirrel
-                      ? EstimateCost(gi)
-                      : nb_pixels * arbitrary_bpp_estimate;
-    // all-channel palette (e.g. RGBA)
-    if (nb_chans > 1) {
-      Transform maybe_palette(TransformId::kPalette);
-      maybe_palette.begin_c = gi.nb_meta_channels;
-      maybe_palette.num_c = nb_chans;
-      // Heuristic choice of max colors for a palette:
-      // max_colors = nb_pixels * estimated_bpp_without_palette * 0.0005 +
-      //              + nb_pixels / 128 + 128
-      //       (estimated_bpp_without_palette = cost_before / nb_pixels)
-      // Rationale: small image with large palette is not effective;
-      // also if the entropy (estimated bpp) is low (e.g. mostly solid/gradient
-      // areas), palette is less useful and may even be counterproductive.
-      maybe_palette.nb_colors = std::min(
-          static_cast<int>(cost_before * 0.0005f + nb_pixels / 128 + 128),
-          std::abs(cparams_.palette_colors));
-      maybe_palette.ordered_palette = cparams_.palette_colors >= 0;
-      maybe_palette.lossy_palette =
-          (cparams_.lossy_palette && maybe_palette.num_c == 3);
-      if (maybe_palette.lossy_palette) {
-        maybe_palette.predictor = Predictor::Average4;
-      }
-      // TODO(veluca): use a custom weighted header if using the weighted
-      // predictor.
-      if (maybe_do_transform(gi, maybe_palette, cparams_, weighted::Header(),
-                             cost_before, pool, cparams_.options.zero_tokens)) {
-        did_palette = 1;
-      };
-    }
-    // all-minus-one-channel palette (RGB with separate alpha, or CMY with
-    // separate K)
-    if (!did_palette && nb_chans > 3) {
-      Transform maybe_palette_3(TransformId::kPalette);
-      maybe_palette_3.begin_c = gi.nb_meta_channels;
-      maybe_palette_3.num_c = nb_chans - 1;
-      maybe_palette_3.nb_colors = std::min(
-          static_cast<int>(cost_before * 0.0005f + nb_pixels / 128 + 128),
-          std::abs(cparams_.palette_colors));
-      maybe_palette_3.ordered_palette = cparams_.palette_colors >= 0;
-      maybe_palette_3.lossy_palette = cparams_.lossy_palette;
-      if (maybe_palette_3.lossy_palette) {
-        maybe_palette_3.predictor = Predictor::Average4;
-      }
-      if (maybe_do_transform(gi, maybe_palette_3, cparams_, weighted::Header(),
-                             cost_before, pool, cparams_.options.zero_tokens)) {
-        did_palette = 1;
-      }
-    }
-  }
-
-  if (channel_colors_percent > 0) {
-    // single channel palette (like FLIF's ChannelCompact)
-    size_t nb_channels = gi.channel.size() - gi.nb_meta_channels - did_palette;
-    int orig_bitdepth = max_bitdepth;
-    max_bitdepth = 0;
-    if (nb_channels > 0 && (did_palette || cost_before == 0)) {
-      cost_before =
-          cparams_.speed_tier < SpeedTier::kSquirrel ? EstimateCost(gi) : 0;
-    }
-    for (size_t i = did_palette; i < nb_channels + did_palette; i++) {
-      int32_t min;
-      int32_t max;
-      compute_minmax(gi.channel[gi.nb_meta_channels + i], &min, &max);
-      int64_t colors = static_cast<int64_t>(max) - min + 1;
-      JXL_DEBUG_V(10, "Channel %" PRIuS ": range=%i..%i", i, min, max);
-      Transform maybe_palette_1(TransformId::kPalette);
-      maybe_palette_1.begin_c = i + gi.nb_meta_channels;
-      maybe_palette_1.num_c = 1;
-      // simple heuristic: if less than X percent of the values in the range
-      // actually occur, it is probably worth it to do a compaction
-      // (but only if the channel palette is less than 6% the size of the
-      // image itself)
-      maybe_palette_1.nb_colors =
-          std::min(static_cast<int>(nb_pixels / 16),
-                   static_cast<int>(channel_colors_percent / 100. * colors));
-      if (maybe_do_transform(gi, maybe_palette_1, cparams_, weighted::Header(),
-                             cost_before, pool)) {
-        // effective bit depth is lower, adjust quantization accordingly
-        compute_minmax(gi.channel[gi.nb_meta_channels + i], &min, &max);
-        if (max < maxval) maxval = max;
-        int ch_bitdepth =
-            (max > 0 ? CeilLog2Nonzero(static_cast<uint32_t>(max)) : 0);
-        if (ch_bitdepth > max_bitdepth) max_bitdepth = ch_bitdepth;
-      } else {
-        max_bitdepth = orig_bitdepth;
-      }
-    }
-  }
-}
-
-}  // namespace
-
-StatusOr<ModularFrameEncoder> ModularFrameEncoder::Create(
-    JxlMemoryManager* memory_manager, const FrameHeader& frame_header,
-    const CompressParams& cparams_orig, bool streaming_mode) {
-  ModularFrameEncoder self{memory_manager};
-  JXL_RETURN_IF_ERROR(self.Init(frame_header, cparams_orig, streaming_mode));
-  return self;
-}
-
-ModularFrameEncoder::ModularFrameEncoder(JxlMemoryManager* memory_manager)
-    : memory_manager_(memory_manager) {}
-
-Status ModularFrameEncoder::Init(const FrameHeader& frame_header,
-                                 const CompressParams& cparams_orig,
-                                 bool streaming_mode) {
-  frame_dim_ = frame_header.ToFrameDimensions();
-  cparams_ = cparams_orig;
-
-  size_t num_streams =
-      ModularStreamId::Num(frame_dim_, frame_header.passes.num_passes);
-  if (cparams_.ModularPartIsLossless()) {
-    switch (cparams_.decoding_speed_tier) {
-      case 0:
-        break;
-      case 1:
-        cparams_.options.wp_tree_mode = ModularOptions::TreeMode::kWPOnly;
-        break;
-      case 2: {
-        cparams_.options.wp_tree_mode = ModularOptions::TreeMode::kGradientOnly;
-        cparams_.options.predictor = Predictor::Gradient;
-        break;
-      }
-      case 3: {  // LZ77, no Gradient.
-        cparams_.options.nb_repeats = 0;
-        cparams_.options.predictor = Predictor::Gradient;
-        break;
-      }
-      default: {  // LZ77, no predictor.
-        cparams_.options.nb_repeats = 0;
-        cparams_.options.predictor = Predictor::Zero;
-        break;
-      }
-    }
-  }
-  if (cparams_.decoding_speed_tier >= 1 && cparams_.responsive &&
-      cparams_.ModularPartIsLossless()) {
-    cparams_.options.tree_kind =
-        ModularOptions::TreeKind::kTrivialTreeNoPredictor;
-    cparams_.options.nb_repeats = 0;
-  }
-  for (size_t i = 0; i < num_streams; ++i) {
-    stream_images_.emplace_back(memory_manager_);
-  }
-
-  // use a sensible default if nothing explicit is specified:
-  // Squeeze for lossy, no squeeze for lossless
-  if (cparams_.responsive < 0) {
-    if (cparams_.ModularPartIsLossless()) {
-      cparams_.responsive = 0;
-    } else {
-      cparams_.responsive = 1;
-    }
-  }
-
-  cparams_.options.splitting_heuristics_node_threshold =
-      82 + 14 * static_cast<int>(cparams_.speed_tier);
-
-  {
-    // Set properties.
-    std::vector<uint32_t> prop_order;
-    if (cparams_.responsive) {
-      // Properties in order of their likelihood of being useful for Squeeze
-      // residuals.
-      prop_order = {0, 1, 4, 5, 6, 7, 8, 15, 9, 10, 11, 12, 13, 14, 2, 3};
-    } else {
-      // Same, but for the non-Squeeze case.
-      prop_order = {0, 1, 15, 9, 10, 11, 12, 13, 14, 2, 3, 4, 5, 6, 7, 8};
-      // if few groups, don't use group as a property
-      if (num_streams < 30 && cparams_.speed_tier > SpeedTier::kTortoise &&
-          cparams_orig.ModularPartIsLossless()) {
-        prop_order.erase(prop_order.begin() + 1);
-      }
-    }
-    int max_properties = std::min<int>(
-        cparams_.options.max_properties,
-        static_cast<int>(
-            frame_header.nonserialized_metadata->m.num_extra_channels) +
-            (frame_header.encoding == FrameEncoding::kModular ? 2 : -1));
-    switch (cparams_.speed_tier) {
-      case SpeedTier::kHare:
-        cparams_.options.splitting_heuristics_properties.assign(
-            prop_order.begin(), prop_order.begin() + 4);
-        cparams_.options.max_property_values = 24;
-        break;
-      case SpeedTier::kWombat:
-        cparams_.options.splitting_heuristics_properties.assign(
-            prop_order.begin(), prop_order.begin() + 5);
-        cparams_.options.max_property_values = 32;
-        break;
-      case SpeedTier::kSquirrel:
-        cparams_.options.splitting_heuristics_properties.assign(
-            prop_order.begin(), prop_order.begin() + 7);
-        cparams_.options.max_property_values = 48;
-        break;
-      case SpeedTier::kKitten:
-        cparams_.options.splitting_heuristics_properties.assign(
-            prop_order.begin(), prop_order.begin() + 10);
-        cparams_.options.max_property_values = 96;
-        break;
-      case SpeedTier::kGlacier:
-      case SpeedTier::kTortoise:
-        cparams_.options.splitting_heuristics_properties = prop_order;
-        cparams_.options.max_property_values = 256;
-        break;
-      default:
-        cparams_.options.splitting_heuristics_properties.assign(
-            prop_order.begin(), prop_order.begin() + 3);
-        cparams_.options.max_property_values = 16;
-        break;
-    }
-    if (cparams_.speed_tier > SpeedTier::kTortoise) {
-      // Gradient in previous channels.
-      for (int i = 0; i < max_properties; i++) {
-        cparams_.options.splitting_heuristics_properties.push_back(
-            kNumNonrefProperties + i * 4 + 3);
-      }
-    } else {
-      // All the extra properties in Tortoise mode.
-      for (int i = 0; i < max_properties * 4; i++) {
-        cparams_.options.splitting_heuristics_properties.push_back(
-            kNumNonrefProperties + i);
-      }
-    }
-  }
-
-  if ((cparams_.options.predictor == Predictor::Average0 ||
-       cparams_.options.predictor == Predictor::Average1 ||
-       cparams_.options.predictor == Predictor::Average2 ||
-       cparams_.options.predictor == Predictor::Average3 ||
-       cparams_.options.predictor == Predictor::Average4 ||
-       cparams_.options.predictor == Predictor::Weighted) &&
-      !cparams_.ModularPartIsLossless()) {
-    // Lossy + Average/Weighted predictors does not work, so switch to default
-    // predictors.
-    cparams_.options.predictor = kUndefinedPredictor;
-  }
-
-  if (cparams_.options.predictor == kUndefinedPredictor) {
-    // no explicit predictor(s) given, set a good default
-    if ((cparams_.speed_tier <= SpeedTier::kGlacier ||
-         cparams_.modular_mode == false) &&
-        cparams_.IsLossless() && cparams_.responsive == JXL_FALSE) {
-      // TODO(veluca): allow all predictors that don't break residual
-      // multipliers in lossy mode.
-      cparams_.options.predictor = Predictor::Variable;
-    } else if (cparams_.responsive || cparams_.lossy_palette) {
-      // zero predictor for Squeeze residues and lossy palette
-      cparams_.options.predictor = Predictor::Zero;
-    } else if (!cparams_.IsLossless()) {
-      // If not responsive and lossy. TODO(veluca): use near_lossless instead?
-      cparams_.options.predictor = Predictor::Gradient;
-    } else if (cparams_.speed_tier < SpeedTier::kFalcon) {
-      // try median and weighted predictor for anything else
-      cparams_.options.predictor = Predictor::Best;
-    } else if (cparams_.speed_tier == SpeedTier::kFalcon) {
-      // just weighted predictor in falcon mode
-      cparams_.options.predictor = Predictor::Weighted;
-    } else if (cparams_.speed_tier > SpeedTier::kFalcon) {
-      // just gradient predictor in thunder mode
-      cparams_.options.predictor = Predictor::Gradient;
-    }
-  } else {
-    if (cparams_.lossy_palette) cparams_.options.predictor = Predictor::Zero;
-  }
-  if (!cparams_.ModularPartIsLossless()) {
-    if (cparams_.options.predictor == Predictor::Weighted ||
-        cparams_.options.predictor == Predictor::Variable ||
-        cparams_.options.predictor == Predictor::Best)
-      cparams_.options.predictor = Predictor::Zero;
-  }
-  tree_splits_.push_back(0);
-  if (cparams_.modular_mode == false) {
-    JXL_ASSIGN_OR_RETURN(ModularStreamId qt0, ModularStreamId::QuantTable(0));
-    cparams_.options.fast_decode_multiplier = 1.0f;
-    tree_splits_.push_back(ModularStreamId::VarDCTDC(0).ID(frame_dim_));
-    tree_splits_.push_back(ModularStreamId::ModularDC(0).ID(frame_dim_));
-    tree_splits_.push_back(ModularStreamId::ACMetadata(0).ID(frame_dim_));
-    tree_splits_.push_back(qt0.ID(frame_dim_));
-    tree_splits_.push_back(ModularStreamId::ModularAC(0, 0).ID(frame_dim_));
-    ac_metadata_size.resize(frame_dim_.num_dc_groups);
-    extra_dc_precision.resize(frame_dim_.num_dc_groups);
-  }
-  tree_splits_.push_back(num_streams);
-  cparams_.options.max_chan_size = frame_dim_.group_dim;
-  cparams_.options.group_dim = frame_dim_.group_dim;
-
-  // TODO(veluca): figure out how to use different predictor sets per channel.
-  stream_options_.resize(num_streams, cparams_.options);
-
-  stream_options_[0] = cparams_.options;
-  if (cparams_.speed_tier == SpeedTier::kFalcon) {
-    stream_options_[0].tree_kind = ModularOptions::TreeKind::kWPFixedDC;
-  } else if (cparams_.speed_tier == SpeedTier::kThunder) {
-    stream_options_[0].tree_kind = ModularOptions::TreeKind::kGradientFixedDC;
-  }
-  stream_options_[0].histogram_params =
-      HistogramParams::ForModular(cparams_, {}, streaming_mode);
-  return true;
-}
-
-Status ModularFrameEncoder::ComputeEncodingData(
-    const FrameHeader& frame_header, const ImageMetadata& metadata,
-    Image3F* JXL_RESTRICT color, const std::vector<ImageF>& extra_channels,
-    const Rect& group_rect, const FrameDimensions& patch_dim,
-    const Rect& frame_area_rect, PassesEncoderState* JXL_RESTRICT enc_state,
-    const JxlCmsInterface& cms, ThreadPool* pool, AuxOut* aux_out,
-    bool do_color) {
-  JxlMemoryManager* memory_manager = enc_state->memory_manager();
-  JXL_DEBUG_V(6, "Computing modular encoding data for frame %s",
-              frame_header.DebugString().c_str());
-
-  bool groupwise = enc_state->streaming_mode;
-
-  if (do_color && frame_header.loop_filter.gab && !groupwise) {
-    float w = 0.9908511000000001f;
-    float weights[3] = {w, w, w};
-    JXL_RETURN_IF_ERROR(GaborishInverse(color, Rect(*color), weights, pool));
-  }
-
-  if (do_color && metadata.bit_depth.bits_per_sample <= 16 &&
-      cparams_.speed_tier < SpeedTier::kCheetah &&
-      cparams_.decoding_speed_tier < 2 && !groupwise) {
-    JXL_RETURN_IF_ERROR(FindBestPatchDictionary(
-        *color, enc_state, cms, nullptr, aux_out,
-        cparams_.color_transform == ColorTransform::kXYB));
-    JXL_RETURN_IF_ERROR(PatchDictionaryEncoder::SubtractFrom(
-        enc_state->shared.image_features.patches, color));
-  }
-
-  if (cparams_.custom_splines.HasAny()) {
-    PassesSharedState& shared = enc_state->shared;
-    ImageFeatures& image_features = shared.image_features;
-    image_features.splines = cparams_.custom_splines;
-  }
-
-  // Convert ImageBundle to modular Image object
-  const size_t xsize = patch_dim.xsize;
-  const size_t ysize = patch_dim.ysize;
-
-  int nb_chans = 3;
-  if (metadata.color_encoding.IsGray() &&
-      cparams_.color_transform == ColorTransform::kNone) {
-    nb_chans = 1;
-  }
-  if (!do_color) nb_chans = 0;
-
-  nb_chans += extra_channels.size();
-
-  bool fp = metadata.bit_depth.floating_point_sample &&
-            cparams_.color_transform != ColorTransform::kXYB;
-
-  // bits_per_sample is just metadata for XYB images.
-  if (metadata.bit_depth.bits_per_sample >= 32 && do_color &&
-      cparams_.color_transform != ColorTransform::kXYB) {
-    if (metadata.bit_depth.bits_per_sample == 32 && fp == false) {
-      return JXL_FAILURE("uint32_t not supported in enc_modular");
-    } else if (metadata.bit_depth.bits_per_sample > 32) {
-      return JXL_FAILURE("bits_per_sample > 32 not supported");
-    }
-  }
-
-  // in the non-float case, there is an implicit 0 sign bit
-  int max_bitdepth =
-      do_color ? metadata.bit_depth.bits_per_sample + (fp ? 0 : 1) : 0;
-  Image& gi = stream_images_[0];
-  JXL_ASSIGN_OR_RETURN(
-      gi, Image::Create(memory_manager, xsize, ysize,
-                        metadata.bit_depth.bits_per_sample, nb_chans));
-  int c = 0;
-  if (cparams_.color_transform == ColorTransform::kXYB &&
-      cparams_.modular_mode == true) {
-    float enc_factors[3] = {65536.0f, 4096.0f, 4096.0f};
-    if (cparams_.butteraugli_distance > 0 && !cparams_.responsive) {
-      // quantize XYB here and then treat it as a lossless image
-      enc_factors[0] *= 1.f / (1.f + 23.f * cparams_.butteraugli_distance);
-      enc_factors[1] *= 1.f / (1.f + 14.f * cparams_.butteraugli_distance);
-      enc_factors[2] *= 1.f / (1.f + 14.f * cparams_.butteraugli_distance);
-      cparams_.butteraugli_distance = 0;
-    }
-    if (cparams_.manual_xyb_factors.size() == 3) {
-      JXL_RETURN_IF_ERROR(DequantMatricesSetCustomDC(
-          memory_manager, &enc_state->shared.matrices,
-          cparams_.manual_xyb_factors.data()));
-      // TODO(jon): update max_bitdepth in this case
-    } else {
-      JXL_RETURN_IF_ERROR(DequantMatricesSetCustomDC(
-          memory_manager, &enc_state->shared.matrices, enc_factors));
-      max_bitdepth = 12;
-    }
-  }
-  pixel_type maxval = gi.bitdepth < 32 ? (1u << gi.bitdepth) - 1 : 0;
-  if (do_color) {
-    for (; c < 3; c++) {
-      if (metadata.color_encoding.IsGray() &&
-          cparams_.color_transform == ColorTransform::kNone &&
-          c != (cparams_.color_transform == ColorTransform::kXYB ? 1 : 0))
-        continue;
-      int c_out = c;
-      // XYB is encoded as YX(B-Y)
-      if (cparams_.color_transform == ColorTransform::kXYB && c < 2)
-        c_out = 1 - c_out;
-      double factor = maxval;
-      if (cparams_.color_transform == ColorTransform::kXYB)
-        factor = enc_state->shared.matrices.InvDCQuant(c);
-      if (c == 2 && cparams_.color_transform == ColorTransform::kXYB) {
-        JXL_ENSURE(!fp);
-        for (size_t y = 0; y < ysize; ++y) {
-          const float* const JXL_RESTRICT row_in = color->PlaneRow(c, y);
-          pixel_type* const JXL_RESTRICT row_out = gi.channel[c_out].Row(y);
-          pixel_type* const JXL_RESTRICT row_Y = gi.channel[0].Row(y);
-          for (size_t x = 0; x < xsize; ++x) {
-            // TODO(eustas): check if std::roundf is appropriate
-            row_out[x] = row_in[x] * factor + 0.5f;
-            row_out[x] -= row_Y[x];
-          }
-        }
-      } else {
-        int bits = metadata.bit_depth.bits_per_sample;
-        int exp_bits = metadata.bit_depth.exponent_bits_per_sample;
-        gi.channel[c_out].hshift = frame_header.chroma_subsampling.HShift(c);
-        gi.channel[c_out].vshift = frame_header.chroma_subsampling.VShift(c);
-        size_t xsize_shifted = DivCeil(xsize, 1 << gi.channel[c_out].hshift);
-        size_t ysize_shifted = DivCeil(ysize, 1 << gi.channel[c_out].vshift);
-        JXL_RETURN_IF_ERROR(
-            gi.channel[c_out].shrink(xsize_shifted, ysize_shifted));
-        const auto process_row = [&](const int task,
-                                     const int thread) -> Status {
-          const size_t y = task;
-          const float* const JXL_RESTRICT row_in =
-              color->PlaneRow(c, y + group_rect.y0()) + group_rect.x0();
-          pixel_type* const JXL_RESTRICT row_out = gi.channel[c_out].Row(y);
-          JXL_RETURN_IF_ERROR(float_to_int(row_in, row_out, xsize_shifted, bits,
-                                           exp_bits, fp, factor));
-          return true;
-        };
-        JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, ysize_shifted,
-                                      ThreadPool::NoInit, process_row,
-                                      "float2int"));
-      }
-    }
-    if (metadata.color_encoding.IsGray() &&
-        cparams_.color_transform == ColorTransform::kNone)
-      c = 1;
-  }
-
-  for (size_t ec = 0; ec < extra_channels.size(); ec++, c++) {
-    const ExtraChannelInfo& eci = metadata.extra_channel_info[ec];
-    size_t ecups = frame_header.extra_channel_upsampling[ec];
-    JXL_RETURN_IF_ERROR(
-        gi.channel[c].shrink(DivCeil(patch_dim.xsize_upsampled, ecups),
-                             DivCeil(patch_dim.ysize_upsampled, ecups)));
-    gi.channel[c].hshift = gi.channel[c].vshift =
-        CeilLog2Nonzero(ecups) - CeilLog2Nonzero(frame_header.upsampling);
-
-    int bits = eci.bit_depth.bits_per_sample;
-    int exp_bits = eci.bit_depth.exponent_bits_per_sample;
-    bool fp = eci.bit_depth.floating_point_sample;
-    double factor = (fp ? 1 : ((1u << eci.bit_depth.bits_per_sample) - 1));
-    if (bits + (fp ? 0 : 1) > max_bitdepth) max_bitdepth = bits + (fp ? 0 : 1);
-    const auto process_row = [&](const int task, const int thread) -> Status {
-      const size_t y = task;
-      const float* const JXL_RESTRICT row_in =
-          extra_channels[ec].Row(y + group_rect.y0()) + group_rect.x0();
-      pixel_type* const JXL_RESTRICT row_out = gi.channel[c].Row(y);
-      JXL_RETURN_IF_ERROR(float_to_int(row_in, row_out,
-                                       gi.channel[c].plane.xsize(), bits,
-                                       exp_bits, fp, factor));
-      return true;
-    };
-    JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, gi.channel[c].plane.ysize(),
-                                  ThreadPool::NoInit, process_row,
-                                  "float2int"));
-  }
-  JXL_ENSURE(c == nb_chans);
-
-  int level_max_bitdepth = (cparams_.level == 5 ? 16 : 32);
-  if (max_bitdepth > level_max_bitdepth) {
-    return JXL_FAILURE(
-        "Bitdepth too high for level %i (need %i bits, have only %i in this "
-        "level)",
-        cparams_.level, max_bitdepth, level_max_bitdepth);
-  }
-
-  // Set options and apply transformations
-  if (!cparams_.ModularPartIsLossless()) {
-    if (cparams_.palette_colors != 0) {
-      JXL_DEBUG_V(3, "Lossy encode, not doing palette transforms");
-    }
-    if (cparams_.color_transform == ColorTransform::kXYB) {
-      cparams_.channel_colors_pre_transform_percent = 0;
-    }
-    cparams_.channel_colors_percent = 0;
-    cparams_.palette_colors = 0;
-    cparams_.lossy_palette = false;
-  }
-
-  // Global palette transforms
-  float channel_colors_percent = 0;
-  if (!cparams_.lossy_palette &&
-      (cparams_.speed_tier <= SpeedTier::kThunder ||
-       (do_color && metadata.bit_depth.bits_per_sample > 8))) {
-    channel_colors_percent = cparams_.channel_colors_pre_transform_percent;
-  }
-  if (!groupwise) {
-    try_palettes(gi, max_bitdepth, maxval, cparams_, channel_colors_percent,
-                 pool);
-  }
-
-  // don't do an RCT if we're short on bits
-  if (cparams_.color_transform == ColorTransform::kNone && do_color &&
-      gi.channel.size() - gi.nb_meta_channels >= 3 &&
-      max_bitdepth + 1 < level_max_bitdepth) {
-    if (cparams_.colorspace < 0 && (!cparams_.ModularPartIsLossless() ||
-                                    cparams_.speed_tier > SpeedTier::kHare)) {
-      Transform ycocg{TransformId::kRCT};
-      ycocg.rct_type = 6;
-      ycocg.begin_c = gi.nb_meta_channels;
-      do_transform(gi, ycocg, weighted::Header(), pool);
-      max_bitdepth++;
-    } else if (cparams_.colorspace > 0) {
-      Transform sg(TransformId::kRCT);
-      sg.begin_c = gi.nb_meta_channels;
-      sg.rct_type = cparams_.colorspace;
-      do_transform(gi, sg, weighted::Header(), pool);
-      max_bitdepth++;
-    }
-  }
-
-  if (cparams_.move_to_front_from_channel > 0) {
-    for (size_t tgt = 0;
-         tgt + cparams_.move_to_front_from_channel < gi.channel.size(); tgt++) {
-      size_t pos = cparams_.move_to_front_from_channel;
-      while (pos > 0) {
-        Transform move(TransformId::kRCT);
-        if (pos == 1) {
-          move.begin_c = tgt;
-          move.rct_type = 28;  // RGB -> GRB
-          pos -= 1;
-        } else {
-          move.begin_c = tgt + pos - 2;
-          move.rct_type = 14;  // RGB -> BRG
-          pos -= 2;
-        }
-        do_transform(gi, move, weighted::Header(), pool);
-      }
-    }
-  }
-
-  // don't do squeeze if we don't have some spare bits
-  if (!groupwise && cparams_.responsive && !gi.channel.empty() &&
-      max_bitdepth + 2 < level_max_bitdepth) {
-    Transform t(TransformId::kSqueeze);
-    do_transform(gi, t, weighted::Header(), pool);
-    max_bitdepth += 2;
-  }
-
-  if (max_bitdepth + 1 > level_max_bitdepth) {
-    // force no group RCTs if we don't have a spare bit
-    cparams_.colorspace = 0;
-  }
-  JXL_ENSURE(max_bitdepth <= level_max_bitdepth);
-
-  if (!cparams_.ModularPartIsLossless()) {
-    quants_.resize(gi.channel.size(), 1);
-    float quantizer = 0.25f;
-    if (!cparams_.responsive) {
-      JXL_DEBUG_V(1,
-                  "Warning: lossy compression without Squeeze "
-                  "transform is just color quantization.");
-      quantizer *= 0.1f;
-    }
-    float bitdepth_correction = 1.f;
-    if (cparams_.color_transform != ColorTransform::kXYB) {
-      bitdepth_correction = maxval / 255.f;
-    }
-    std::vector<float> quantizers;
-    for (size_t i = 0; i < 3; i++) {
-      float dist = cparams_.butteraugli_distance;
-      quantizers.push_back(quantizer * dist * bitdepth_correction);
-    }
-    for (size_t i = 0; i < extra_channels.size(); i++) {
-      int ec_bitdepth =
-          metadata.extra_channel_info[i].bit_depth.bits_per_sample;
-      pixel_type ec_maxval = ec_bitdepth < 32 ? (1u << ec_bitdepth) - 1 : 0;
-      bitdepth_correction = ec_maxval / 255.f;
-      float dist = 0;
-      if (i < cparams_.ec_distance.size()) dist = cparams_.ec_distance[i];
-      if (dist < 0) dist = cparams_.butteraugli_distance;
-      quantizers.push_back(quantizer * dist * bitdepth_correction);
-    }
-    if (cparams_.options.nb_repeats == 0) {
-      return JXL_FAILURE("nb_repeats = 0 not supported with modular lossy!");
-    }
-    for (uint32_t i = gi.nb_meta_channels; i < gi.channel.size(); i++) {
-      Channel& ch = gi.channel[i];
-      int shift = ch.hshift + ch.vshift;  // number of pixel halvings
-      if (shift > 16) shift = 16;
-      if (shift > 0) shift--;
-      int q;
-      // assuming default Squeeze here
-      int component =
-          (do_color ? 0 : 3) + ((i - gi.nb_meta_channels) % nb_chans);
-      // last 4 channels are final chroma residuals
-      if (nb_chans > 2 && i >= gi.channel.size() - 4 && cparams_.responsive) {
-        component = 1;
-      }
-      if (cparams_.color_transform == ColorTransform::kXYB && component < 3) {
-        q = quantizers[component] * squeeze_quality_factor_xyb *
-            squeeze_xyb_qtable[component][shift];
-      } else {
-        if (cparams_.colorspace != 0 && component > 0 && component < 3) {
-          q = quantizers[component] * squeeze_quality_factor *
-              squeeze_chroma_qtable[shift];
-        } else {
-          q = quantizers[component] * squeeze_quality_factor *
-              squeeze_luma_factor * squeeze_luma_qtable[shift];
-        }
-      }
-      if (q < 1) q = 1;
-      QuantizeChannel(gi.channel[i], q);
-      quants_[i] = q;
-    }
-  }
-
-  // Fill other groups.
-  // DC
-  for (size_t group_id = 0; group_id < patch_dim.num_dc_groups; group_id++) {
-    const size_t rgx = group_id % patch_dim.xsize_dc_groups;
-    const size_t rgy = group_id / patch_dim.xsize_dc_groups;
-    const Rect rect(rgx * patch_dim.dc_group_dim, rgy * patch_dim.dc_group_dim,
-                    patch_dim.dc_group_dim, patch_dim.dc_group_dim);
-    size_t gx = rgx + frame_area_rect.x0() / 2048;
-    size_t gy = rgy + frame_area_rect.y0() / 2048;
-    size_t real_group_id = gy * frame_dim_.xsize_dc_groups + gx;
-    // minShift==3 because (frame_dim.dc_group_dim >> 3) == frame_dim.group_dim
-    // maxShift==1000 is infinity
-    stream_params_.push_back(
-        GroupParams{rect, 3, 1000, ModularStreamId::ModularDC(real_group_id)});
-  }
-  // AC global -> nothing.
-  // AC
-  for (size_t group_id = 0; group_id < patch_dim.num_groups; group_id++) {
-    const size_t rgx = group_id % patch_dim.xsize_groups;
-    const size_t rgy = group_id / patch_dim.xsize_groups;
-    const Rect mrect(rgx * patch_dim.group_dim, rgy * patch_dim.group_dim,
-                     patch_dim.group_dim, patch_dim.group_dim);
-    size_t gx = rgx + frame_area_rect.x0() / (frame_dim_.group_dim);
-    size_t gy = rgy + frame_area_rect.y0() / (frame_dim_.group_dim);
-    size_t real_group_id = gy * frame_dim_.xsize_groups + gx;
-    for (size_t i = 0; i < enc_state->progressive_splitter.GetNumPasses();
-         i++) {
-      int maxShift;
-      int minShift;
-      frame_header.passes.GetDownsamplingBracket(i, minShift, maxShift);
-      stream_params_.push_back(
-          GroupParams{mrect, minShift, maxShift,
-                      ModularStreamId::ModularAC(real_group_id, i)});
-    }
-  }
-  // if there's only one group, everything ends up in GlobalModular
-  // in that case, also try RCTs/WP params for the one group
-  if (stream_params_.size() == 2) {
-    stream_params_.push_back(GroupParams{Rect(0, 0, xsize, ysize), 0, 1000,
-                                         ModularStreamId::Global()});
-  }
-  gi_channel_.resize(stream_images_.size());
-
-  const auto process_row = [&](const uint32_t i,
-                               size_t /* thread */) -> Status {
-    size_t stream = stream_params_[i].id.ID(frame_dim_);
-    if (stream != 0) {
-      stream_options_[stream] = stream_options_[0];
-    }
-    JXL_RETURN_IF_ERROR(PrepareStreamParams(
-        stream_params_[i].rect, cparams_, stream_params_[i].minShift,
-        stream_params_[i].maxShift, stream_params_[i].id, do_color, groupwise));
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, stream_params_.size(),
-                                ThreadPool::NoInit, process_row,
-                                "ChooseParams"));
-  {
-    // Clear out channels that have been copied to groups.
-    Image& full_image = stream_images_[0];
-    size_t c = full_image.nb_meta_channels;
-    for (; c < full_image.channel.size(); c++) {
-      Channel& fc = full_image.channel[c];
-      if (fc.w > frame_dim_.group_dim || fc.h > frame_dim_.group_dim) break;
-    }
-    for (; c < full_image.channel.size(); c++) {
-      full_image.channel[c].plane = ImageI();
-    }
-  }
-
-  JXL_RETURN_IF_ERROR(ValidateChannelDimensions(gi, stream_options_[0]));
-  return true;
-}
-
-Status ModularFrameEncoder::ComputeTree(ThreadPool* pool) {
-  std::vector<ModularMultiplierInfo> multiplier_info;
-  if (!quants_.empty()) {
-    for (uint32_t stream_id = 0; stream_id < stream_images_.size();
-         stream_id++) {
-      // skip non-modular stream_ids
-      if (stream_id > 0 && gi_channel_[stream_id].empty()) continue;
-      const Image& image = stream_images_[stream_id];
-      const ModularOptions& options = stream_options_[stream_id];
-      for (uint32_t i = image.nb_meta_channels; i < image.channel.size(); i++) {
-        if (i >= image.nb_meta_channels &&
-            (image.channel[i].w > options.max_chan_size ||
-             image.channel[i].h > options.max_chan_size)) {
-          continue;
-        }
-        if (stream_id > 0 && gi_channel_[stream_id].empty()) continue;
-        size_t ch_id = stream_id == 0
-                           ? i
-                           : gi_channel_[stream_id][i - image.nb_meta_channels];
-        uint32_t q = quants_[ch_id];
-        // Inform the tree splitting heuristics that each channel in each group
-        // used this quantization factor. This will produce a tree with the
-        // given multipliers.
-        if (multiplier_info.empty() ||
-            multiplier_info.back().range[1][0] != stream_id ||
-            multiplier_info.back().multiplier != q) {
-          StaticPropRange range;
-          range[0] = {{i, i + 1}};
-          range[1] = {{stream_id, stream_id + 1}};
-          multiplier_info.push_back({range, static_cast<uint32_t>(q)});
-        } else {
-          // Previous channel in the same group had the same quantization
-          // factor. Don't provide two different ranges, as that creates
-          // unnecessary nodes.
-          multiplier_info.back().range[0][1] = i + 1;
-        }
-      }
-    }
-    // Merge group+channel settings that have the same channels and quantization
-    // factors, to avoid unnecessary nodes.
-    std::sort(multiplier_info.begin(), multiplier_info.end(),
-              [](ModularMultiplierInfo a, ModularMultiplierInfo b) {
-                return std::make_tuple(a.range, a.multiplier) <
-                       std::make_tuple(b.range, b.multiplier);
-              });
-    size_t new_num = 1;
-    for (size_t i = 1; i < multiplier_info.size(); i++) {
-      ModularMultiplierInfo& prev = multiplier_info[new_num - 1];
-      ModularMultiplierInfo& cur = multiplier_info[i];
-      if (prev.range[0] == cur.range[0] && prev.multiplier == cur.multiplier &&
-          prev.range[1][1] == cur.range[1][0]) {
-        prev.range[1][1] = cur.range[1][1];
-      } else {
-        multiplier_info[new_num++] = multiplier_info[i];
-      }
-    }
-    multiplier_info.resize(new_num);
-  }
-
-  if (!cparams_.custom_fixed_tree.empty()) {
-    tree_ = cparams_.custom_fixed_tree;
-  } else if (cparams_.speed_tier < SpeedTier::kFalcon ||
-             !cparams_.modular_mode) {
-    // Avoid creating a tree with leaves that don't correspond to any pixels.
-    std::vector<size_t> useful_splits;
-    useful_splits.reserve(tree_splits_.size());
-    for (size_t chunk = 0; chunk < tree_splits_.size() - 1; chunk++) {
-      bool has_pixels = false;
-      size_t start = tree_splits_[chunk];
-      size_t stop = tree_splits_[chunk + 1];
-      for (size_t i = start; i < stop; i++) {
-        if (!stream_images_[i].empty()) has_pixels = true;
-      }
-      if (has_pixels) {
-        useful_splits.push_back(tree_splits_[chunk]);
-      }
-    }
-    // Don't do anything if modular mode does not have any pixels in this image
-    if (useful_splits.empty()) return true;
-    useful_splits.push_back(tree_splits_.back());
-
-    std::vector<Tree> trees(useful_splits.size() - 1);
-    const auto process_chunk = [&](const uint32_t chunk,
-                                   size_t /* thread */) -> Status {
-      // TODO(veluca): parallelize more.
-      size_t total_pixels = 0;
-      uint32_t start = useful_splits[chunk];
-      uint32_t stop = useful_splits[chunk + 1];
-      while (start < stop && stream_images_[start].empty()) ++start;
-      while (start < stop && stream_images_[stop - 1].empty()) --stop;
-      if (stream_options_[start].tree_kind !=
-          ModularOptions::TreeKind::kLearn) {
-        for (size_t i = start; i < stop; i++) {
-          for (const Channel& ch : stream_images_[i].channel) {
-            total_pixels += ch.w * ch.h;
-          }
-        }
-        trees[chunk] = PredefinedTree(stream_options_[start].tree_kind,
-                                      total_pixels, 8, 0);
-        return true;
-      }
-      TreeSamples tree_samples;
-      JXL_RETURN_IF_ERROR(
-          tree_samples.SetPredictor(stream_options_[start].predictor,
-                                    stream_options_[start].wp_tree_mode));
-      JXL_RETURN_IF_ERROR(tree_samples.SetProperties(
-          stream_options_[start].splitting_heuristics_properties,
-          stream_options_[start].wp_tree_mode));
-      uint32_t max_c = 0;
-      std::vector<pixel_type> pixel_samples;
-      std::vector<pixel_type> diff_samples;
-      std::vector<uint32_t> group_pixel_count;
-      std::vector<uint32_t> channel_pixel_count;
-      for (uint32_t i = start; i < stop; i++) {
-        max_c = std::max<uint32_t>(stream_images_[i].channel.size(), max_c);
-        CollectPixelSamples(stream_images_[i], stream_options_[i], i,
-                            group_pixel_count, channel_pixel_count,
-                            pixel_samples, diff_samples);
-      }
-      StaticPropRange range;
-      range[0] = {{0, max_c}};
-      range[1] = {{start, stop}};
-
-      tree_samples.PreQuantizeProperties(
-          range, multiplier_info, group_pixel_count, channel_pixel_count,
-          pixel_samples, diff_samples,
-          stream_options_[start].max_property_values);
-      for (size_t i = start; i < stop; i++) {
-        JXL_RETURN_IF_ERROR(
-            ModularGenericCompress(stream_images_[i], stream_options_[i],
-                                   /*writer=*/nullptr,
-                                   /*aux_out=*/nullptr, LayerType::Header, i,
-                                   &tree_samples, &total_pixels));
-      }
-
-      // TODO(veluca): parallelize more.
-      JXL_ASSIGN_OR_RETURN(
-          trees[chunk],
-          LearnTree(std::move(tree_samples), total_pixels,
-                    stream_options_[start], multiplier_info, range));
-      return true;
-    };
-    JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, useful_splits.size() - 1,
-                                  ThreadPool::NoInit, process_chunk,
-                                  "LearnTrees"));
-    tree_.clear();
-    JXL_RETURN_IF_ERROR(
-        MergeTrees(trees, useful_splits, 0, useful_splits.size() - 1, &tree_));
-  } else {
-    // Fixed tree.
-    size_t total_pixels = 0;
-    int max_bitdepth = 0;
-    for (const Image& img : stream_images_) {
-      max_bitdepth = std::max(max_bitdepth, img.bitdepth);
-      for (const Channel& ch : img.channel) {
-        total_pixels += ch.w * ch.h;
-      }
-    }
-    if (cparams_.speed_tier <= SpeedTier::kFalcon) {
-      tree_ = PredefinedTree(ModularOptions::TreeKind::kWPFixedDC, total_pixels,
-                             max_bitdepth, stream_options_[0].max_properties);
-    } else if (cparams_.speed_tier <= SpeedTier::kThunder) {
-      tree_ = PredefinedTree(ModularOptions::TreeKind::kGradientFixedDC,
-                             total_pixels, max_bitdepth,
-                             stream_options_[0].max_properties);
-    } else {
-      tree_ = {PropertyDecisionNode::Leaf(Predictor::Gradient)};
-    }
-  }
-  tree_tokens_.resize(1);
-  tree_tokens_[0].clear();
-  Tree decoded_tree;
-  JXL_RETURN_IF_ERROR(TokenizeTree(tree_, tree_tokens_.data(), &decoded_tree));
-  JXL_ENSURE(tree_.size() == decoded_tree.size());
-  tree_ = std::move(decoded_tree);
-
-  /* TODO(szabadka) Add text output callback to cparams
-  if (kPrintTree && WantDebugOutput(aux_out)) {
-    if (frame_header.dc_level > 0) {
-      PrintTree(tree_, aux_out->debug_prefix + "/dc_frame_level" +
-                           std::to_string(frame_header.dc_level) + "_tree");
-    } else {
-      PrintTree(tree_, aux_out->debug_prefix + "/global_tree");
-    }
-  } */
-  return true;
-}
-
-Status ModularFrameEncoder::ComputeTokens(ThreadPool* pool) {
-  size_t num_streams = stream_images_.size();
-  stream_headers_.resize(num_streams);
-  tokens_.resize(num_streams);
-  image_widths_.resize(num_streams);
-  const auto process_stream = [&](const uint32_t stream_id,
-                                  size_t /* thread */) -> Status {
-    AuxOut my_aux_out;
-    tokens_[stream_id].clear();
-    JXL_RETURN_IF_ERROR(ModularGenericCompress(
-        stream_images_[stream_id], stream_options_[stream_id],
-        /*writer=*/nullptr, &my_aux_out, LayerType::Header, stream_id,
-        /*tree_samples=*/nullptr,
-        /*total_pixels=*/nullptr,
-        /*tree=*/&tree_, /*header=*/&stream_headers_[stream_id],
-        /*tokens=*/&tokens_[stream_id],
-        /*widths=*/&image_widths_[stream_id]));
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, num_streams, ThreadPool::NoInit,
-                                process_stream, "ComputeTokens"));
-  return true;
-}
-
-Status ModularFrameEncoder::EncodeGlobalInfo(bool streaming_mode,
-                                             BitWriter* writer,
-                                             AuxOut* aux_out) {
-  JxlMemoryManager* memory_manager = writer->memory_manager();
-  bool skip_rest = false;
-  JXL_RETURN_IF_ERROR(
-      writer->WithMaxBits(1, LayerType::ModularTree, aux_out, [&] {
-        // If we are using brotli, or not using modular mode.
-        if (tree_tokens_.empty() || tree_tokens_[0].empty()) {
-          writer->Write(1, 0);
-          skip_rest = true;
-        } else {
-          writer->Write(1, 1);
-        }
-        return true;
-      }));
-  if (skip_rest) return true;
-
-  // Write tree
-  HistogramParams params =
-      HistogramParams::ForModular(cparams_, extra_dc_precision, streaming_mode);
-  {
-    EntropyEncodingData tree_code;
-    std::vector<uint8_t> tree_context_map;
-    JXL_ASSIGN_OR_RETURN(
-        size_t cost,
-        BuildAndEncodeHistograms(memory_manager, params, kNumTreeContexts,
-                                 tree_tokens_, &tree_code, &tree_context_map,
-                                 writer, LayerType::ModularTree, aux_out));
-    (void)cost;
-    JXL_RETURN_IF_ERROR(WriteTokens(tree_tokens_[0], tree_code,
-                                    tree_context_map, 0, writer,
-                                    LayerType::ModularTree, aux_out));
-  }
-  params.streaming_mode = streaming_mode;
-  params.add_missing_symbols = streaming_mode;
-  params.image_widths = image_widths_;
-  // Write histograms.
-  JXL_ASSIGN_OR_RETURN(
-      size_t cost,
-      BuildAndEncodeHistograms(memory_manager, params, (tree_.size() + 1) / 2,
-                               tokens_, &code_, &context_map_, writer,
-                               LayerType::ModularGlobal, aux_out));
-  (void)cost;
-  return true;
-}
-
-Status ModularFrameEncoder::EncodeStream(BitWriter* writer, AuxOut* aux_out,
-                                         LayerType layer,
-                                         const ModularStreamId& stream) {
-  size_t stream_id = stream.ID(frame_dim_);
-  if (stream_images_[stream_id].channel.empty()) {
-    JXL_DEBUG_V(10, "Modular stream %" PRIuS " is empty.", stream_id);
-    return true;  // Image with no channels, header never gets decoded.
-  }
-  if (tokens_.empty()) {
-    JXL_RETURN_IF_ERROR(ModularGenericCompress(
-        stream_images_[stream_id], stream_options_[stream_id], writer, aux_out,
-        layer, stream_id));
-  } else {
-    JXL_RETURN_IF_ERROR(
-        Bundle::Write(stream_headers_[stream_id], writer, layer, aux_out));
-    JXL_RETURN_IF_ERROR(WriteTokens(tokens_[stream_id], code_, context_map_, 0,
-                                    writer, layer, aux_out));
-  }
-  return true;
-}
-
-void ModularFrameEncoder::ClearStreamData(const ModularStreamId& stream) {
-  size_t stream_id = stream.ID(frame_dim_);
-  Image empty_image(stream_images_[stream_id].memory_manager());
-  std::swap(stream_images_[stream_id], empty_image);
-}
-
-void ModularFrameEncoder::ClearModularStreamData() {
-  for (const auto& group : stream_params_) {
-    ClearStreamData(group.id);
-  }
-  stream_params_.clear();
-}
-
-size_t ModularFrameEncoder::ComputeStreamingAbsoluteAcGroupId(
-    size_t dc_group_id, size_t ac_group_id,
-    const FrameDimensions& patch_dim) const {
-  size_t dc_group_x = dc_group_id % frame_dim_.xsize_dc_groups;
-  size_t dc_group_y = dc_group_id / frame_dim_.xsize_dc_groups;
-  size_t ac_group_x = ac_group_id % patch_dim.xsize_groups;
-  size_t ac_group_y = ac_group_id / patch_dim.xsize_groups;
-  return (dc_group_x * 8 + ac_group_x) +
-         (dc_group_y * 8 + ac_group_y) * frame_dim_.xsize_groups;
-}
-
-Status ModularFrameEncoder::PrepareStreamParams(const Rect& rect,
-                                                const CompressParams& cparams_,
-                                                int minShift, int maxShift,
-                                                const ModularStreamId& stream,
-                                                bool do_color, bool groupwise) {
-  size_t stream_id = stream.ID(frame_dim_);
-  if (stream_id == 0 && frame_dim_.num_groups != 1) {
-    // If we have multiple groups, then the stream with ID 0 holds the full
-    // image and we do not want to apply transforms or in general change the
-    // pixel values.
-    return true;
-  }
-  Image& full_image = stream_images_[0];
-  JxlMemoryManager* memory_manager = full_image.memory_manager();
-  const size_t xsize = rect.xsize();
-  const size_t ysize = rect.ysize();
-  Image& gi = stream_images_[stream_id];
-  if (stream_id > 0) {
-    JXL_ASSIGN_OR_RETURN(gi, Image::Create(memory_manager, xsize, ysize,
-                                           full_image.bitdepth, 0));
-    // start at the first bigger-than-frame_dim.group_dim non-metachannel
-    size_t c = full_image.nb_meta_channels;
-    if (!groupwise) {
-      for (; c < full_image.channel.size(); c++) {
-        Channel& fc = full_image.channel[c];
-        if (fc.w > frame_dim_.group_dim || fc.h > frame_dim_.group_dim) break;
-      }
-    }
-    for (; c < full_image.channel.size(); c++) {
-      Channel& fc = full_image.channel[c];
-      int shift = std::min(fc.hshift, fc.vshift);
-      if (shift > maxShift) continue;
-      if (shift < minShift) continue;
-      Rect r(rect.x0() >> fc.hshift, rect.y0() >> fc.vshift,
-             rect.xsize() >> fc.hshift, rect.ysize() >> fc.vshift, fc.w, fc.h);
-      if (r.xsize() == 0 || r.ysize() == 0) continue;
-      gi_channel_[stream_id].push_back(c);
-      JXL_ASSIGN_OR_RETURN(
-          Channel gc, Channel::Create(memory_manager, r.xsize(), r.ysize()));
-      gc.hshift = fc.hshift;
-      gc.vshift = fc.vshift;
-      for (size_t y = 0; y < r.ysize(); ++y) {
-        memcpy(gc.Row(y), r.ConstRow(fc.plane, y),
-               r.xsize() * sizeof(pixel_type));
-      }
-      gi.channel.emplace_back(std::move(gc));
-    }
-
-    if (gi.channel.empty()) return true;
-    // Do some per-group transforms
-
-    // Local palette transforms
-    // TODO(veluca): make this work with quantize-after-prediction in lossy
-    // mode.
-    if (cparams_.butteraugli_distance == 0.f && !cparams_.lossy_palette &&
-        cparams_.speed_tier < SpeedTier::kCheetah) {
-      int max_bitdepth = 0, maxval = 0;  // don't care about that here
-      float channel_color_percent = 0;
-      if (!(cparams_.responsive && cparams_.decoding_speed_tier >= 1)) {
-        channel_color_percent = cparams_.channel_colors_percent;
-      }
-      try_palettes(gi, max_bitdepth, maxval, cparams_, channel_color_percent);
-    }
-  }
-
-  // lossless and no specific color transform specified: try Nothing, YCoCg,
-  // and 17 RCTs
-  if (cparams_.color_transform == ColorTransform::kNone &&
-      cparams_.IsLossless() && cparams_.colorspace < 0 &&
-      gi.channel.size() - gi.nb_meta_channels >= 3 &&
-      cparams_.responsive == JXL_FALSE && do_color &&
-      cparams_.speed_tier <= SpeedTier::kHare) {
-    Transform sg(TransformId::kRCT);
-    sg.begin_c = gi.nb_meta_channels;
-    size_t nb_rcts_to_try = 0;
-    switch (cparams_.speed_tier) {
-      case SpeedTier::kLightning:
-      case SpeedTier::kThunder:
-      case SpeedTier::kFalcon:
-      case SpeedTier::kCheetah:
-        nb_rcts_to_try = 0;  // Just do global YCoCg
-        break;
-      case SpeedTier::kHare:
-        nb_rcts_to_try = 4;
-        break;
-      case SpeedTier::kWombat:
-        nb_rcts_to_try = 5;
-        break;
-      case SpeedTier::kSquirrel:
-        nb_rcts_to_try = 7;
-        break;
-      case SpeedTier::kKitten:
-        nb_rcts_to_try = 9;
-        break;
-      case SpeedTier::kTectonicPlate:
-      case SpeedTier::kGlacier:
-      case SpeedTier::kTortoise:
-        nb_rcts_to_try = 19;
-        break;
-    }
-    float best_cost = std::numeric_limits<float>::max();
-    size_t best_rct = 0;
-    // These should be 19 actually different transforms; the remaining ones
-    // are equivalent to one of these (note that the first two are do-nothing
-    // and YCoCg) modulo channel reordering (which only matters in the case of
-    // MA-with-prev-channels-properties) and/or sign (e.g. RmG vs GmR)
-    for (int i : {0 * 7 + 0, 0 * 7 + 6, 0 * 7 + 5, 1 * 7 + 3, 3 * 7 + 5,
-                  5 * 7 + 5, 1 * 7 + 5, 2 * 7 + 5, 1 * 7 + 1, 0 * 7 + 4,
-                  1 * 7 + 2, 2 * 7 + 1, 2 * 7 + 2, 2 * 7 + 3, 4 * 7 + 4,
-                  4 * 7 + 5, 0 * 7 + 2, 0 * 7 + 1, 0 * 7 + 3}) {
-      if (nb_rcts_to_try == 0) break;
-      sg.rct_type = i;
-      nb_rcts_to_try--;
-      if (do_transform(gi, sg, weighted::Header())) {
-        float cost = EstimateCost(gi);
-        if (cost < best_cost) {
-          best_rct = i;
-          best_cost = cost;
-        }
-        Transform t = gi.transform.back();
-        JXL_RETURN_IF_ERROR(t.Inverse(gi, weighted::Header(), nullptr));
-        gi.transform.pop_back();
-      }
-    }
-    // Apply the best RCT to the image for future encoding.
-    sg.rct_type = best_rct;
-    do_transform(gi, sg, weighted::Header());
-  } else {
-    // No need to try anything, just use the default options.
-  }
-  size_t nb_wp_modes = 1;
-  if (cparams_.speed_tier <= SpeedTier::kTortoise) {
-    nb_wp_modes = 5;
-  } else if (cparams_.speed_tier <= SpeedTier::kKitten) {
-    nb_wp_modes = 2;
-  }
-  if (nb_wp_modes > 1 &&
-      (stream_options_[stream_id].predictor == Predictor::Weighted ||
-       stream_options_[stream_id].predictor == Predictor::Best ||
-       stream_options_[stream_id].predictor == Predictor::Variable)) {
-    float best_cost = std::numeric_limits<float>::max();
-    stream_options_[stream_id].wp_mode = 0;
-    for (size_t i = 0; i < nb_wp_modes; i++) {
-      float cost = EstimateWPCost(gi, i);
-      if (cost < best_cost) {
-        best_cost = cost;
-        stream_options_[stream_id].wp_mode = i;
-      }
-    }
-  }
-  return true;
-}
-
-constexpr float q_deadzone = 0.62f;
-int QuantizeWP(const int32_t* qrow, size_t onerow, size_t c, size_t x, size_t y,
-               size_t w, weighted::State* wp_state, float value,
-               float inv_factor) {
-  float svalue = value * inv_factor;
-  PredictionResult pred =
-      PredictNoTreeWP(w, qrow + x, onerow, x, y, Predictor::Weighted, wp_state);
-  svalue -= pred.guess;
-  if (svalue > -q_deadzone && svalue < q_deadzone) svalue = 0;
-  int residual = roundf(svalue);
-  if (residual > 2 || residual < -2) residual = roundf(svalue * 0.5) * 2;
-  return residual + pred.guess;
-}
-
-int QuantizeGradient(const int32_t* qrow, size_t onerow, size_t c, size_t x,
-                     size_t y, size_t w, float value, float inv_factor) {
-  float svalue = value * inv_factor;
-  PredictionResult pred =
-      PredictNoTreeNoWP(w, qrow + x, onerow, x, y, Predictor::Gradient);
-  svalue -= pred.guess;
-  if (svalue > -q_deadzone && svalue < q_deadzone) svalue = 0;
-  int residual = roundf(svalue);
-  if (residual > 2 || residual < -2) residual = roundf(svalue * 0.5) * 2;
-  return residual + pred.guess;
-}
-
-Status ModularFrameEncoder::AddVarDCTDC(const FrameHeader& frame_header,
-                                        const Image3F& dc, const Rect& r,
-                                        size_t group_index, bool nl_dc,
-                                        PassesEncoderState* enc_state,
-                                        bool jpeg_transcode) {
-  JxlMemoryManager* memory_manager = dc.memory_manager();
-  extra_dc_precision[group_index] = nl_dc ? 1 : 0;
-  float mul = 1 << extra_dc_precision[group_index];
-
-  size_t stream_id = ModularStreamId::VarDCTDC(group_index).ID(frame_dim_);
-  stream_options_[stream_id].max_chan_size = 0xFFFFFF;
-  stream_options_[stream_id].predictor = Predictor::Weighted;
-  stream_options_[stream_id].wp_tree_mode = ModularOptions::TreeMode::kWPOnly;
-  if (cparams_.speed_tier >= SpeedTier::kSquirrel) {
-    stream_options_[stream_id].tree_kind = ModularOptions::TreeKind::kWPFixedDC;
-  }
-  if (cparams_.speed_tier < SpeedTier::kSquirrel && !nl_dc) {
-    stream_options_[stream_id].predictor =
-        (cparams_.speed_tier < SpeedTier::kKitten ? Predictor::Variable
-                                                  : Predictor::Best);
-    stream_options_[stream_id].wp_tree_mode =
-        ModularOptions::TreeMode::kDefault;
-    stream_options_[stream_id].tree_kind = ModularOptions::TreeKind::kLearn;
-  }
-  if (cparams_.decoding_speed_tier >= 1) {
-    stream_options_[stream_id].tree_kind =
-        ModularOptions::TreeKind::kGradientFixedDC;
-  }
-  stream_options_[stream_id].histogram_params =
-      stream_options_[0].histogram_params;
-
-  JXL_ASSIGN_OR_RETURN(
-      stream_images_[stream_id],
-      Image::Create(memory_manager, r.xsize(), r.ysize(), 8, 3));
-  const ColorCorrelation& color_correlation = enc_state->shared.cmap.base();
-  if (nl_dc && stream_options_[stream_id].tree_kind ==
-                   ModularOptions::TreeKind::kGradientFixedDC) {
-    JXL_ENSURE(frame_header.chroma_subsampling.Is444());
-    for (size_t c : {1, 0, 2}) {
-      float inv_factor = enc_state->shared.quantizer.GetInvDcStep(c) * mul;
-      float y_factor = enc_state->shared.quantizer.GetDcStep(1) / mul;
-      float cfl_factor = color_correlation.DCFactors()[c];
-      for (size_t y = 0; y < r.ysize(); y++) {
-        int32_t* quant_row =
-            stream_images_[stream_id].channel[c < 2 ? c ^ 1 : c].plane.Row(y);
-        size_t stride = stream_images_[stream_id]
-                            .channel[c < 2 ? c ^ 1 : c]
-                            .plane.PixelsPerRow();
-        const float* row = r.ConstPlaneRow(dc, c, y);
-        if (c == 1) {
-          for (size_t x = 0; x < r.xsize(); x++) {
-            quant_row[x] = QuantizeGradient(quant_row, stride, c, x, y,
-                                            r.xsize(), row[x], inv_factor);
-          }
-        } else {
-          int32_t* quant_row_y =
-              stream_images_[stream_id].channel[0].plane.Row(y);
-          for (size_t x = 0; x < r.xsize(); x++) {
-            quant_row[x] = QuantizeGradient(
-                quant_row, stride, c, x, y, r.xsize(),
-                row[x] - quant_row_y[x] * (y_factor * cfl_factor), inv_factor);
-          }
-        }
-      }
-    }
-  } else if (nl_dc) {
-    JXL_ENSURE(frame_header.chroma_subsampling.Is444());
-    for (size_t c : {1, 0, 2}) {
-      float inv_factor = enc_state->shared.quantizer.GetInvDcStep(c) * mul;
-      float y_factor = enc_state->shared.quantizer.GetDcStep(1) / mul;
-      float cfl_factor = color_correlation.DCFactors()[c];
-      weighted::Header header;
-      weighted::State wp_state(header, r.xsize(), r.ysize());
-      for (size_t y = 0; y < r.ysize(); y++) {
-        int32_t* quant_row =
-            stream_images_[stream_id].channel[c < 2 ? c ^ 1 : c].plane.Row(y);
-        size_t stride = stream_images_[stream_id]
-                            .channel[c < 2 ? c ^ 1 : c]
-                            .plane.PixelsPerRow();
-        const float* row = r.ConstPlaneRow(dc, c, y);
-        if (c == 1) {
-          for (size_t x = 0; x < r.xsize(); x++) {
-            quant_row[x] = QuantizeWP(quant_row, stride, c, x, y, r.xsize(),
-                                      &wp_state, row[x], inv_factor);
-            wp_state.UpdateErrors(quant_row[x], x, y, r.xsize());
-          }
-        } else {
-          int32_t* quant_row_y =
-              stream_images_[stream_id].channel[0].plane.Row(y);
-          for (size_t x = 0; x < r.xsize(); x++) {
-            quant_row[x] = QuantizeWP(
-                quant_row, stride, c, x, y, r.xsize(), &wp_state,
-                row[x] - quant_row_y[x] * (y_factor * cfl_factor), inv_factor);
-            wp_state.UpdateErrors(quant_row[x], x, y, r.xsize());
-          }
-        }
-      }
-    }
-  } else if (frame_header.chroma_subsampling.Is444()) {
-    for (size_t c : {1, 0, 2}) {
-      float inv_factor = enc_state->shared.quantizer.GetInvDcStep(c) * mul;
-      float y_factor = enc_state->shared.quantizer.GetDcStep(1) / mul;
-      float cfl_factor = color_correlation.DCFactors()[c];
-      for (size_t y = 0; y < r.ysize(); y++) {
-        int32_t* quant_row =
-            stream_images_[stream_id].channel[c < 2 ? c ^ 1 : c].plane.Row(y);
-        const float* row = r.ConstPlaneRow(dc, c, y);
-        if (c == 1) {
-          for (size_t x = 0; x < r.xsize(); x++) {
-            quant_row[x] = roundf(row[x] * inv_factor);
-          }
-        } else {
-          int32_t* quant_row_y =
-              stream_images_[stream_id].channel[0].plane.Row(y);
-          for (size_t x = 0; x < r.xsize(); x++) {
-            quant_row[x] =
-                roundf((row[x] - quant_row_y[x] * (y_factor * cfl_factor)) *
-                       inv_factor);
-          }
-        }
-      }
-    }
-  } else {
-    for (size_t c : {1, 0, 2}) {
-      Rect rect(r.x0() >> frame_header.chroma_subsampling.HShift(c),
-                r.y0() >> frame_header.chroma_subsampling.VShift(c),
-                r.xsize() >> frame_header.chroma_subsampling.HShift(c),
-                r.ysize() >> frame_header.chroma_subsampling.VShift(c));
-      float inv_factor = enc_state->shared.quantizer.GetInvDcStep(c) * mul;
-      size_t ys = rect.ysize();
-      size_t xs = rect.xsize();
-      Channel& ch = stream_images_[stream_id].channel[c < 2 ? c ^ 1 : c];
-      ch.w = xs;
-      ch.h = ys;
-      JXL_RETURN_IF_ERROR(ch.shrink());
-      for (size_t y = 0; y < ys; y++) {
-        int32_t* quant_row = ch.plane.Row(y);
-        const float* row = rect.ConstPlaneRow(dc, c, y);
-        for (size_t x = 0; x < xs; x++) {
-          quant_row[x] = roundf(row[x] * inv_factor);
-        }
-      }
-    }
-  }
-
-  DequantDC(r, &enc_state->shared.dc_storage, &enc_state->shared.quant_dc,
-            stream_images_[stream_id], enc_state->shared.quantizer.MulDC(),
-            1.0 / mul, color_correlation.DCFactors(),
-            frame_header.chroma_subsampling, enc_state->shared.block_ctx_map);
-  return true;
-}
-
-Status ModularFrameEncoder::AddACMetadata(const Rect& r, size_t group_index,
-                                          bool jpeg_transcode,
-                                          PassesEncoderState* enc_state) {
-  JxlMemoryManager* memory_manager = enc_state->memory_manager();
-  size_t stream_id = ModularStreamId::ACMetadata(group_index).ID(frame_dim_);
-  stream_options_[stream_id].max_chan_size = 0xFFFFFF;
-  if (stream_options_[stream_id].predictor != Predictor::Weighted) {
-    stream_options_[stream_id].wp_tree_mode = ModularOptions::TreeMode::kNoWP;
-  }
-  if (jpeg_transcode) {
-    stream_options_[stream_id].tree_kind =
-        ModularOptions::TreeKind::kJpegTranscodeACMeta;
-  } else if (cparams_.speed_tier >= SpeedTier::kFalcon) {
-    stream_options_[stream_id].tree_kind =
-        ModularOptions::TreeKind::kFalconACMeta;
-  } else if (cparams_.speed_tier > SpeedTier::kKitten) {
-    stream_options_[stream_id].tree_kind = ModularOptions::TreeKind::kACMeta;
-  }
-  // If we are using a non-constant CfL field, and are in a slow enough mode,
-  // re-enable tree computation for it.
-  if (cparams_.speed_tier < SpeedTier::kSquirrel &&
-      cparams_.force_cfl_jpeg_recompression) {
-    stream_options_[stream_id].tree_kind = ModularOptions::TreeKind::kLearn;
-  }
-  stream_options_[stream_id].histogram_params =
-      stream_options_[0].histogram_params;
-  // YToX, YToB, ACS + QF, EPF
-  Image& image = stream_images_[stream_id];
-  JXL_ASSIGN_OR_RETURN(
-      image, Image::Create(memory_manager, r.xsize(), r.ysize(), 8, 4));
-  static_assert(kColorTileDimInBlocks == 8, "Color tile size changed");
-  Rect cr(r.x0() >> 3, r.y0() >> 3, (r.xsize() + 7) >> 3, (r.ysize() + 7) >> 3);
-  JXL_ASSIGN_OR_RETURN(
-      image.channel[0],
-      Channel::Create(memory_manager, cr.xsize(), cr.ysize(), 3, 3));
-  JXL_ASSIGN_OR_RETURN(
-      image.channel[1],
-      Channel::Create(memory_manager, cr.xsize(), cr.ysize(), 3, 3));
-  JXL_ASSIGN_OR_RETURN(
-      image.channel[2],
-      Channel::Create(memory_manager, r.xsize() * r.ysize(), 2, 0, 0));
-  JXL_RETURN_IF_ERROR(ConvertPlaneAndClamp(cr, enc_state->shared.cmap.ytox_map,
-                                           Rect(image.channel[0].plane),
-                                           &image.channel[0].plane));
-  JXL_RETURN_IF_ERROR(ConvertPlaneAndClamp(cr, enc_state->shared.cmap.ytob_map,
-                                           Rect(image.channel[1].plane),
-                                           &image.channel[1].plane));
-  size_t num = 0;
-  for (size_t y = 0; y < r.ysize(); y++) {
-    AcStrategyRow row_acs = enc_state->shared.ac_strategy.ConstRow(r, y);
-    const int32_t* row_qf = r.ConstRow(enc_state->shared.raw_quant_field, y);
-    const uint8_t* row_epf = r.ConstRow(enc_state->shared.epf_sharpness, y);
-    int32_t* out_acs = image.channel[2].plane.Row(0);
-    int32_t* out_qf = image.channel[2].plane.Row(1);
-    int32_t* row_out_epf = image.channel[3].plane.Row(y);
-    for (size_t x = 0; x < r.xsize(); x++) {
-      row_out_epf[x] = row_epf[x];
-      if (!row_acs[x].IsFirstBlock()) continue;
-      out_acs[num] = row_acs[x].RawStrategy();
-      out_qf[num] = row_qf[x] - 1;
-      num++;
-    }
-  }
-  image.channel[2].w = num;
-  ac_metadata_size[group_index] = num;
-  return true;
-}
-
-Status ModularFrameEncoder::EncodeQuantTable(
-    JxlMemoryManager* memory_manager, size_t size_x, size_t size_y,
-    BitWriter* writer, const QuantEncoding& encoding, size_t idx,
-    ModularFrameEncoder* modular_frame_encoder) {
-  JXL_ENSURE(encoding.qraw.qtable);
-  JXL_ENSURE(size_x * size_y * 3 == encoding.qraw.qtable->size());
-  JXL_ENSURE(idx < kNumQuantTables);
-  int* qtable = encoding.qraw.qtable->data();
-  JXL_RETURN_IF_ERROR(F16Coder::Write(encoding.qraw.qtable_den, writer));
-  if (modular_frame_encoder) {
-    JXL_ASSIGN_OR_RETURN(ModularStreamId qt, ModularStreamId::QuantTable(idx));
-    JXL_RETURN_IF_ERROR(modular_frame_encoder->EncodeStream(
-        writer, nullptr, LayerType::Header, qt));
-    return true;
-  }
-  JXL_ASSIGN_OR_RETURN(Image image,
-                       Image::Create(memory_manager, size_x, size_y, 8, 3));
-  for (size_t c = 0; c < 3; c++) {
-    for (size_t y = 0; y < size_y; y++) {
-      int32_t* JXL_RESTRICT row = image.channel[c].Row(y);
-      for (size_t x = 0; x < size_x; x++) {
-        row[x] = qtable[c * size_x * size_y + y * size_x + x];
-      }
-    }
-  }
-  ModularOptions cfopts;
-  JXL_RETURN_IF_ERROR(ModularGenericCompress(image, cfopts, writer));
-  return true;
-}
-
-Status ModularFrameEncoder::AddQuantTable(size_t size_x, size_t size_y,
-                                          const QuantEncoding& encoding,
-                                          size_t idx) {
-  JXL_ENSURE(idx < kNumQuantTables);
-  JXL_ASSIGN_OR_RETURN(ModularStreamId qt, ModularStreamId::QuantTable(idx));
-  size_t stream_id = qt.ID(frame_dim_);
-  JXL_ENSURE(encoding.qraw.qtable);
-  JXL_ENSURE(size_x * size_y * 3 == encoding.qraw.qtable->size());
-  int* qtable = encoding.qraw.qtable->data();
-  Image& image = stream_images_[stream_id];
-  JxlMemoryManager* memory_manager = image.memory_manager();
-  JXL_ASSIGN_OR_RETURN(image,
-                       Image::Create(memory_manager, size_x, size_y, 8, 3));
-  for (size_t c = 0; c < 3; c++) {
-    for (size_t y = 0; y < size_y; y++) {
-      int32_t* JXL_RESTRICT row = image.channel[c].Row(y);
-      for (size_t x = 0; x < size_x; x++) {
-        row[x] = qtable[c * size_x * size_y + y * size_x + x];
-      }
-    }
-  }
-  return true;
-}
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_modular.h b/third_party/jpeg-xl/lib/jxl/enc_modular.h
deleted file mode 100644
index de5291736b98b..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_modular.h
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_MODULAR_H_
-#define LIB_JXL_ENC_MODULAR_H_
-
-#include <jxl/cms_interface.h>
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_modular.h"
-#include "lib/jxl/enc_ans.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/enc_cache.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/modular/encoding/dec_ma.h"
-#include "lib/jxl/modular/encoding/encoding.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/modular/options.h"
-#include "lib/jxl/quant_weights.h"
-
-namespace jxl {
-
-struct AuxOut;
-enum class LayerType : uint8_t;
-
-class ModularFrameEncoder {
- public:
-  static StatusOr<ModularFrameEncoder> Create(
-      JxlMemoryManager* memory_manager, const FrameHeader& frame_header,
-      const CompressParams& cparams_orig, bool streaming_mode);
-  Status ComputeEncodingData(
-      const FrameHeader& frame_header, const ImageMetadata& metadata,
-      Image3F* JXL_RESTRICT color, const std::vector<ImageF>& extra_channels,
-      const Rect& group_rect, const FrameDimensions& patch_dim,
-      const Rect& frame_area_rect, PassesEncoderState* JXL_RESTRICT enc_state,
-      const JxlCmsInterface& cms, ThreadPool* pool, AuxOut* aux_out,
-      bool do_color);
-  Status ComputeTree(ThreadPool* pool);
-  Status ComputeTokens(ThreadPool* pool);
-  // Encodes global info (tree + histograms) in the `writer`.
-  Status EncodeGlobalInfo(bool streaming_mode, BitWriter* writer,
-                          AuxOut* aux_out);
-  // Encodes a specific modular image (identified by `stream`) in the `writer`,
-  // assigning bits to the provided `layer`.
-  Status EncodeStream(BitWriter* writer, AuxOut* aux_out, LayerType layer,
-                      const ModularStreamId& stream);
-
-  void ClearStreamData(const ModularStreamId& stream);
-  void ClearModularStreamData();
-  size_t ComputeStreamingAbsoluteAcGroupId(
-      size_t dc_group_id, size_t ac_group_id,
-      const FrameDimensions& patch_dim) const;
-
-  // Creates a modular image for a given DC group of VarDCT mode. `dc` is the
-  // input DC image, not quantized; the group is specified by `group_index`, and
-  // `nl_dc` decides whether to apply a near-lossless processing to the DC or
-  // not.
-  Status AddVarDCTDC(const FrameHeader& frame_header, const Image3F& dc,
-                     const Rect& r, size_t group_index, bool nl_dc,
-                     PassesEncoderState* enc_state, bool jpeg_transcode);
-  // Creates a modular image for the AC metadata of the given group
-  // (`group_index`).
-  Status AddACMetadata(const Rect& r, size_t group_index, bool jpeg_transcode,
-                       PassesEncoderState* enc_state);
-  // Encodes a RAW quantization table in `writer`. If `modular_frame_encoder` is
-  // null, the quantization table in `encoding` is used, with dimensions `size_x
-  // x size_y`. Otherwise, the table with ID `idx` is encoded from the given
-  // `modular_frame_encoder`.
-  static Status EncodeQuantTable(JxlMemoryManager* memory_manager,
-                                 size_t size_x, size_t size_y,
-                                 BitWriter* writer,
-                                 const QuantEncoding& encoding, size_t idx,
-                                 ModularFrameEncoder* modular_frame_encoder);
-  // Stores a quantization table for future usage with `EncodeQuantTable`.
-  Status AddQuantTable(size_t size_x, size_t size_y,
-                       const QuantEncoding& encoding, size_t idx);
-
-  std::vector<size_t> ac_metadata_size;
-  std::vector<uint8_t> extra_dc_precision;
-
-  JxlMemoryManager* memory_manager() const { return memory_manager_; }
-
- private:
-  explicit ModularFrameEncoder(JxlMemoryManager* memory_manager);
-  Status Init(const FrameHeader& frame_header,
-              const CompressParams& cparams_orig, bool streaming_mode);
-
-  Status PrepareStreamParams(const Rect& rect, const CompressParams& cparams,
-                             int minShift, int maxShift,
-                             const ModularStreamId& stream, bool do_color,
-                             bool groupwise);
-  JxlMemoryManager* memory_manager_;
-  std::vector<Image> stream_images_;
-  std::vector<ModularOptions> stream_options_;
-  std::vector<uint32_t> quants_;
-
-  Tree tree_;
-  std::vector<std::vector<Token>> tree_tokens_;
-  std::vector<GroupHeader> stream_headers_;
-  std::vector<std::vector<Token>> tokens_;
-  EntropyEncodingData code_;
-  std::vector<uint8_t> context_map_;
-  FrameDimensions frame_dim_;
-  CompressParams cparams_;
-  std::vector<size_t> tree_splits_;
-  std::vector<std::vector<uint32_t>> gi_channel_;
-  std::vector<size_t> image_widths_;
-
-  struct GroupParams {
-    Rect rect;
-    int minShift;
-    int maxShift;
-    ModularStreamId id;
-  };
-  std::vector<GroupParams> stream_params_;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_MODULAR_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_noise.cc b/third_party/jpeg-xl/lib/jxl/enc_noise.cc
deleted file mode 100644
index f823652f74734..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_noise.cc
+++ /dev/null
@@ -1,371 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_noise.h"
-
-#include <algorithm>
-#include <cstdint>
-#include <cstdlib>
-#include <numeric>
-#include <utility>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_optimize.h"
-
-namespace jxl {
-namespace {
-
-using OptimizeArray = optimize::Array<double, NoiseParams::kNumNoisePoints>;
-
-float GetScoreSumsOfAbsoluteDifferences(const Image3F& opsin, const int x,
-                                        const int y, const int block_size) {
-  const int small_bl_size_x = 3;
-  const int small_bl_size_y = 4;
-  const int kNumSAD =
-      (block_size - small_bl_size_x) * (block_size - small_bl_size_y);
-  // block_size x block_size reference pixels
-  int counter = 0;
-  const int offset = 2;
-
-  std::vector<float> sad(kNumSAD, 0);
-  for (int y_bl = 0; y_bl + small_bl_size_y < block_size; ++y_bl) {
-    for (int x_bl = 0; x_bl + small_bl_size_x < block_size; ++x_bl) {
-      float sad_sum = 0;
-      // size of the center patch, we compare all the patches inside window with
-      // the center one
-      for (int cy = 0; cy < small_bl_size_y; ++cy) {
-        for (int cx = 0; cx < small_bl_size_x; ++cx) {
-          float wnd = 0.5f * (opsin.PlaneRow(1, y + y_bl + cy)[x + x_bl + cx] +
-                              opsin.PlaneRow(0, y + y_bl + cy)[x + x_bl + cx]);
-          float center =
-              0.5f * (opsin.PlaneRow(1, y + offset + cy)[x + offset + cx] +
-                      opsin.PlaneRow(0, y + offset + cy)[x + offset + cx]);
-          sad_sum += std::abs(center - wnd);
-        }
-      }
-      sad[counter++] = sad_sum;
-    }
-  }
-  const int kSamples = (kNumSAD) / 2;
-  // As with ROAD (rank order absolute distance), we keep the smallest half of
-  // the values in SAD (we use here the more robust patch SAD instead of
-  // absolute single-pixel differences).
-  std::sort(sad.begin(), sad.end());
-  const float total_sad_sum =
-      std::accumulate(sad.begin(), sad.begin() + kSamples, 0.0f);
-  return total_sad_sum / kSamples;
-}
-
-class NoiseHistogram {
- public:
-  static constexpr int kBins = 256;
-
-  NoiseHistogram() { std::fill(bins, bins + kBins, 0); }
-
-  void Increment(const float x) { bins[Index(x)] += 1; }
-  int Get(const float x) const { return bins[Index(x)]; }
-  int Bin(const size_t bin) const { return bins[bin]; }
-
-  int Mode() const {
-    size_t max_idx = 0;
-    for (size_t i = 0; i < kBins; i++) {
-      if (bins[i] > bins[max_idx]) max_idx = i;
-    }
-    return max_idx;
-  }
-
-  double Quantile(double q01) const {
-    const int64_t total = std::accumulate(bins, bins + kBins, int64_t{1});
-    const int64_t target = static_cast<int64_t>(q01 * total);
-    // Until sum >= target:
-    int64_t sum = 0;
-    size_t i = 0;
-    for (; i < kBins; ++i) {
-      sum += bins[i];
-      // Exact match: assume middle of bin i
-      if (sum == target) {
-        return i + 0.5;
-      }
-      if (sum > target) break;
-    }
-
-    // Next non-empty bin (in case histogram is sparsely filled)
-    size_t next = i + 1;
-    while (next < kBins && bins[next] == 0) {
-      ++next;
-    }
-
-    // Linear interpolation according to how far into next we went
-    const double excess = target - sum;
-    const double weight_next = bins[Index(next)] / excess;
-    return ClampX(next * weight_next + i * (1.0 - weight_next));
-  }
-
-  // Inter-quartile range
-  double IQR() const { return Quantile(0.75) - Quantile(0.25); }
-
- private:
-  template <typename T>
-  T ClampX(const T x) const {
-    return std::min(std::max(static_cast<T>(0), x), static_cast<T>(kBins - 1));
-  }
-  size_t Index(const float x) const { return ClampX(static_cast<int>(x)); }
-
-  uint32_t bins[kBins];
-};
-
-std::vector<float> GetSADScoresForPatches(const Image3F& opsin,
-                                          const size_t block_s,
-                                          const size_t num_bin,
-                                          NoiseHistogram* sad_histogram) {
-  std::vector<float> sad_scores(
-      (opsin.ysize() / block_s) * (opsin.xsize() / block_s), 0.0f);
-
-  int block_index = 0;
-
-  for (size_t y = 0; y + block_s <= opsin.ysize(); y += block_s) {
-    for (size_t x = 0; x + block_s <= opsin.xsize(); x += block_s) {
-      float sad_sc = GetScoreSumsOfAbsoluteDifferences(opsin, x, y, block_s);
-      sad_scores[block_index++] = sad_sc;
-      sad_histogram->Increment(sad_sc * num_bin);
-    }
-  }
-  return sad_scores;
-}
-
-float GetSADThreshold(const NoiseHistogram& histogram, const int num_bin) {
-  // Here we assume that the most patches with similar SAD value is a "flat"
-  // patches. However, some images might contain regular texture part and
-  // generate second strong peak at the histogram
-  // TODO(user) handle bimodal and heavy-tailed case
-  const int mode = histogram.Mode();
-  return static_cast<float>(mode) / NoiseHistogram::kBins;
-}
-
-// loss = sum asym * (F(x) - nl)^2 + kReg * num_points * sum (w[i] - w[i+1])^2
-// where asym = 1 if F(x) < nl, kAsym if F(x) > nl.
-struct LossFunction {
-  explicit LossFunction(std::vector<NoiseLevel> nl0) : nl(std::move(nl0)) {}
-
-  double Compute(const OptimizeArray& w, OptimizeArray* df,
-                 bool skip_regularization = false) const {
-    constexpr double kReg = 0.005;
-    constexpr double kAsym = 1.1;
-    double loss_function = 0;
-    for (size_t i = 0; i < w.size(); i++) {
-      (*df)[i] = 0;
-    }
-    for (auto ind : nl) {
-      std::pair<int, float> pos = IndexAndFrac(ind.intensity);
-      JXL_DASSERT(pos.first >= 0 && static_cast<size_t>(pos.first) <
-                                        NoiseParams::kNumNoisePoints - 1);
-      double low = w[pos.first];
-      double hi = w[pos.first + 1];
-      double val = low * (1.0f - pos.second) + hi * pos.second;
-      double dist = val - ind.noise_level;
-      if (dist > 0) {
-        loss_function += kAsym * dist * dist;
-        (*df)[pos.first] -= kAsym * (1.0f - pos.second) * dist;
-        (*df)[pos.first + 1] -= kAsym * pos.second * dist;
-      } else {
-        loss_function += dist * dist;
-        (*df)[pos.first] -= (1.0f - pos.second) * dist;
-        (*df)[pos.first + 1] -= pos.second * dist;
-      }
-    }
-    if (skip_regularization) return loss_function;
-    for (size_t i = 0; i + 1 < w.size(); i++) {
-      double diff = w[i] - w[i + 1];
-      loss_function += kReg * nl.size() * diff * diff;
-      (*df)[i] -= kReg * diff * nl.size();
-      (*df)[i + 1] += kReg * diff * nl.size();
-    }
-    return loss_function;
-  }
-
-  std::vector<NoiseLevel> nl;
-};
-
-void OptimizeNoiseParameters(const std::vector<NoiseLevel>& noise_level,
-                             NoiseParams* noise_params) {
-  constexpr double kMaxError = 1e-3;
-  static const double kPrecision = 1e-8;
-  static const int kMaxIter = 40;
-
-  float avg = 0;
-  for (const NoiseLevel& nl : noise_level) {
-    avg += nl.noise_level;
-  }
-  avg /= noise_level.size();
-
-  LossFunction loss_function(noise_level);
-  OptimizeArray parameter_vector;
-  for (size_t i = 0; i < parameter_vector.size(); i++) {
-    parameter_vector[i] = avg;
-  }
-
-  parameter_vector = optimize::OptimizeWithScaledConjugateGradientMethod(
-      loss_function, parameter_vector, kPrecision, kMaxIter);
-
-  OptimizeArray df = parameter_vector;
-  float loss = loss_function.Compute(parameter_vector, &df,
-                                     /*skip_regularization=*/true) /
-               noise_level.size();
-
-  // Approximation went too badly: escape with no noise at all.
-  if (loss > kMaxError) {
-    noise_params->Clear();
-    return;
-  }
-
-  for (size_t i = 0; i < parameter_vector.size(); i++) {
-    noise_params->lut[i] = std::max(parameter_vector[i], 0.0);
-  }
-}
-
-std::vector<NoiseLevel> GetNoiseLevel(
-    const Image3F& opsin, const std::vector<float>& texture_strength,
-    const float threshold, const size_t block_s) {
-  std::vector<NoiseLevel> noise_level_per_intensity;
-
-  const int filt_size = 1;
-  static const float kLaplFilter[filt_size * 2 + 1][filt_size * 2 + 1] = {
-      {-0.25f, -1.0f, -0.25f},
-      {-1.0f, 5.0f, -1.0f},
-      {-0.25f, -1.0f, -0.25f},
-  };
-
-  // The noise model is built based on channel 0.5 * (X+Y) as we notice that it
-  // is similar to the model 0.5 * (Y-X)
-  size_t patch_index = 0;
-
-  for (size_t y = 0; y + block_s <= opsin.ysize(); y += block_s) {
-    for (size_t x = 0; x + block_s <= opsin.xsize(); x += block_s) {
-      if (texture_strength[patch_index] <= threshold) {
-        // Calculate mean value
-        float mean_int = 0;
-        for (size_t y_bl = 0; y_bl < block_s; ++y_bl) {
-          for (size_t x_bl = 0; x_bl < block_s; ++x_bl) {
-            mean_int += 0.5f * (opsin.PlaneRow(1, y + y_bl)[x + x_bl] +
-                                opsin.PlaneRow(0, y + y_bl)[x + x_bl]);
-          }
-        }
-        mean_int /= block_s * block_s;
-
-        // Calculate Noise level
-        float noise_level = 0;
-        size_t count = 0;
-        for (size_t y_bl = 0; y_bl < block_s; ++y_bl) {
-          for (size_t x_bl = 0; x_bl < block_s; ++x_bl) {
-            float filtered_value = 0;
-            for (int y_f = -1 * filt_size; y_f <= filt_size; ++y_f) {
-              if ((static_cast<ssize_t>(y_bl) + y_f) >= 0 &&
-                  (y_bl + y_f) < block_s) {
-                for (int x_f = -1 * filt_size; x_f <= filt_size; ++x_f) {
-                  if ((static_cast<ssize_t>(x_bl) + x_f) >= 0 &&
-                      (x_bl + x_f) < block_s) {
-                    filtered_value +=
-                        0.5f *
-                        (opsin.PlaneRow(1, y + y_bl + y_f)[x + x_bl + x_f] +
-                         opsin.PlaneRow(0, y + y_bl + y_f)[x + x_bl + x_f]) *
-                        kLaplFilter[y_f + filt_size][x_f + filt_size];
-                  } else {
-                    filtered_value +=
-                        0.5f *
-                        (opsin.PlaneRow(1, y + y_bl + y_f)[x + x_bl - x_f] +
-                         opsin.PlaneRow(0, y + y_bl + y_f)[x + x_bl - x_f]) *
-                        kLaplFilter[y_f + filt_size][x_f + filt_size];
-                  }
-                }
-              } else {
-                for (int x_f = -1 * filt_size; x_f <= filt_size; ++x_f) {
-                  if ((static_cast<ssize_t>(x_bl) + x_f) >= 0 &&
-                      (x_bl + x_f) < block_s) {
-                    filtered_value +=
-                        0.5f *
-                        (opsin.PlaneRow(1, y + y_bl - y_f)[x + x_bl + x_f] +
-                         opsin.PlaneRow(0, y + y_bl - y_f)[x + x_bl + x_f]) *
-                        kLaplFilter[y_f + filt_size][x_f + filt_size];
-                  } else {
-                    filtered_value +=
-                        0.5f *
-                        (opsin.PlaneRow(1, y + y_bl - y_f)[x + x_bl - x_f] +
-                         opsin.PlaneRow(0, y + y_bl - y_f)[x + x_bl - x_f]) *
-                        kLaplFilter[y_f + filt_size][x_f + filt_size];
-                  }
-                }
-              }
-            }
-            noise_level += std::abs(filtered_value);
-            ++count;
-          }
-        }
-        noise_level /= count;
-        NoiseLevel nl;
-        nl.intensity = mean_int;
-        nl.noise_level = noise_level;
-        noise_level_per_intensity.push_back(nl);
-      }
-      ++patch_index;
-    }
-  }
-  return noise_level_per_intensity;
-}
-
-Status EncodeFloatParam(float val, float precision, BitWriter* writer) {
-  JXL_ENSURE(val >= 0);
-  const int absval_quant = static_cast<int>(std::lround(val * precision));
-  JXL_ENSURE(absval_quant < (1 << 10));
-  writer->Write(10, absval_quant);
-  return true;
-}
-
-}  // namespace
-
-Status GetNoiseParameter(const Image3F& opsin, NoiseParams* noise_params,
-                         float quality_coef) {
-  // The size of a patch in decoder might be different from encoder's patch
-  // size.
-  // For encoder: the patch size should be big enough to estimate
-  //              noise level, but, at the same time, it should be not too big
-  //              to be able to estimate intensity value of the patch
-  const size_t block_s = 8;
-  const size_t kNumBin = 256;
-  NoiseHistogram sad_histogram;
-  std::vector<float> sad_scores =
-      GetSADScoresForPatches(opsin, block_s, kNumBin, &sad_histogram);
-  float sad_threshold = GetSADThreshold(sad_histogram, kNumBin);
-  // If threshold is too large, the image has a strong pattern. This pattern
-  // fools our model and it will add too much noise. Therefore, we do not add
-  // noise for such images
-  if (sad_threshold > 0.15f || sad_threshold <= 0.0f) {
-    noise_params->Clear();
-    return false;
-  }
-  std::vector<NoiseLevel> nl =
-      GetNoiseLevel(opsin, sad_scores, sad_threshold, block_s);
-
-  OptimizeNoiseParameters(nl, noise_params);
-  for (float& i : noise_params->lut) {
-    i *= quality_coef * 1.4;
-  }
-  return noise_params->HasAny();
-}
-
-Status EncodeNoise(const NoiseParams& noise_params, BitWriter* writer,
-                   LayerType layer, AuxOut* aux_out) {
-  JXL_ENSURE(noise_params.HasAny());
-
-  return writer->WithMaxBits(
-      NoiseParams::kNumNoisePoints * 16, layer, aux_out, [&]() -> Status {
-        for (float i : noise_params.lut) {
-          JXL_RETURN_IF_ERROR(EncodeFloatParam(i, kNoisePrecision, writer));
-        }
-        return true;
-      });
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_noise.h b/third_party/jpeg-xl/lib/jxl/enc_noise.h
deleted file mode 100644
index 6b4bf73fc4a31..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_noise.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_NOISE_H_
-#define LIB_JXL_ENC_NOISE_H_
-
-// Noise parameter estimation.
-
-#include <cstdint>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/noise.h"
-
-namespace jxl {
-
-struct AuxOut;
-enum class LayerType : uint8_t;
-
-// Get parameters of the noise for NoiseParams model
-// Returns whether a valid noise model (with HasAny()) is set.
-Status GetNoiseParameter(const Image3F& opsin, NoiseParams* noise_params,
-                         float quality_coef);
-
-// Does not write anything if `noise_params` are empty. Otherwise, caller must
-// set FrameHeader.flags.kNoise.
-Status EncodeNoise(const NoiseParams& noise_params, BitWriter* writer,
-                   LayerType layer, AuxOut* aux_out);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_NOISE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_optimize.h b/third_party/jpeg-xl/lib/jxl/enc_optimize.h
deleted file mode 100644
index 561aa736a5cf4..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_optimize.h
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Utility functions for optimizing multi-dimensional nonlinear functions.
-
-#ifndef LIB_JXL_OPTIMIZE_H_
-#define LIB_JXL_OPTIMIZE_H_
-
-#include <cmath>
-#include <cstdio>
-
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-namespace optimize {
-
-// An array type of numeric values that supports math operations with operator-,
-// operator+, etc.
-template <typename T, size_t N>
-class Array {
- public:
-  Array() = default;
-  explicit Array(T v) {
-    for (size_t i = 0; i < N; i++) v_[i] = v;
-  }
-
-  size_t size() const { return N; }
-
-  T& operator[](size_t index) {
-    JXL_DASSERT(index < N);
-    return v_[index];
-  }
-  T operator[](size_t index) const {
-    JXL_DASSERT(index < N);
-    return v_[index];
-  }
-
- private:
-  // The values used by this Array.
-  T v_[N];
-};
-
-template <typename T, size_t N>
-Array<T, N> operator+(const Array<T, N>& x, const Array<T, N>& y) {
-  Array<T, N> z;
-  for (size_t i = 0; i < N; ++i) {
-    z[i] = x[i] + y[i];
-  }
-  return z;
-}
-
-template <typename T, size_t N>
-Array<T, N> operator-(const Array<T, N>& x, const Array<T, N>& y) {
-  Array<T, N> z;
-  for (size_t i = 0; i < N; ++i) {
-    z[i] = x[i] - y[i];
-  }
-  return z;
-}
-
-template <typename T, size_t N>
-Array<T, N> operator*(T v, const Array<T, N>& x) {
-  Array<T, N> y;
-  for (size_t i = 0; i < N; ++i) {
-    y[i] = v * x[i];
-  }
-  return y;
-}
-
-template <typename T, size_t N>
-T operator*(const Array<T, N>& x, const Array<T, N>& y) {
-  T r = 0.0;
-  for (size_t i = 0; i < N; ++i) {
-    r += x[i] * y[i];
-  }
-  return r;
-}
-
-// Implementation of the Scaled Conjugate Gradient method described in the
-// following paper:
-//   Moller, M. "A Scaled Conjugate Gradient Algorithm for Fast Supervised
-//   Learning", Neural Networks, Vol. 6. pp. 525-533, 1993
-//   http://sci2s.ugr.es/keel/pdf/algorithm/articulo/moller1990.pdf
-//
-// The Function template parameter is a class that has the following method:
-//
-//   // Returns the value of the function at point w and sets *df to be the
-//   // negative gradient vector of the function at point w.
-//   double Compute(const optimize::Array<T, N>& w,
-//                  optimize::Array<T, N>* df) const;
-//
-// Returns a vector w, such that |df(w)| < grad_norm_threshold.
-template <typename T, size_t N, typename Function>
-Array<T, N> OptimizeWithScaledConjugateGradientMethod(
-    const Function& f, const Array<T, N>& w0, const T grad_norm_threshold,
-    size_t max_iters) {
-  const size_t n = w0.size();
-  const T rsq_threshold = grad_norm_threshold * grad_norm_threshold;
-  const T sigma0 = static_cast<T>(0.0001);
-  const T l_min = static_cast<T>(1.0e-15);
-  const T l_max = static_cast<T>(1.0e15);
-
-  Array<T, N> w = w0;
-  Array<T, N> wp;
-  Array<T, N> r;
-  Array<T, N> rt;
-  Array<T, N> e;
-  Array<T, N> p;
-  T psq;
-  T fp;
-  T D;
-  T d;
-  T m;
-  T a;
-  T b;
-  T s;
-  T t;
-
-  T fw = f.Compute(w, &r);
-  T rsq = r * r;
-  e = r;
-  p = r;
-  T l = static_cast<T>(1.0);
-  bool success = true;
-  size_t n_success = 0;
-  size_t k = 0;
-
-  while (k++ < max_iters) {
-    if (success) {
-      m = -(p * r);
-      if (m >= 0) {
-        p = r;
-        m = -(p * r);
-      }
-      psq = p * p;
-      s = sigma0 / std::sqrt(psq);
-      f.Compute(w + (s * p), &rt);
-      t = (p * (r - rt)) / s;
-    }
-
-    d = t + l * psq;
-    if (d <= 0) {
-      d = l * psq;
-      l = l - t / psq;
-    }
-
-    a = -m / d;
-    wp = w + a * p;
-    fp = f.Compute(wp, &rt);
-
-    D = 2.0 * (fp - fw) / (a * m);
-    if (D >= 0.0) {
-      success = true;
-      n_success++;
-      w = wp;
-    } else {
-      success = false;
-    }
-
-    if (success) {
-      e = r;
-      r = rt;
-      rsq = r * r;
-      fw = fp;
-      if (rsq <= rsq_threshold) {
-        break;
-      }
-    }
-
-    if (D < 0.25) {
-      l = std::min(4.0 * l, l_max);
-    } else if (D > 0.75) {
-      l = std::max(0.25 * l, l_min);
-    }
-
-    if ((n_success % n) == 0) {
-      p = r;
-      l = 1.0;
-    } else if (success) {
-      b = ((e - r) * r) / m;
-      p = b * p + r;
-    }
-  }
-
-  return w;
-}
-
-}  // namespace optimize
-}  // namespace jxl
-
-#endif  // LIB_JXL_OPTIMIZE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_optimize_test.cc b/third_party/jpeg-xl/lib/jxl/enc_optimize_test.cc
deleted file mode 100644
index 4151c3eb831f6..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_optimize_test.cc
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_optimize.h"
-
-#include <cmath>
-#include <cstddef>
-#include <vector>
-
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace optimize {
-namespace {
-
-// The maximum number of iterations for the test.
-const size_t kMaxTestIter = 100000;
-
-// F(w) = (w - w_min)^2.
-struct SimpleQuadraticFunction {
-  typedef Array<double, 2> ArrayType;
-  explicit SimpleQuadraticFunction(const ArrayType& w0) : w_min(w0) {}
-
-  double Compute(const ArrayType& w, ArrayType* df) const {
-    ArrayType dw = w - w_min;
-    *df = -2.0 * dw;
-    return dw * dw;
-  }
-
-  ArrayType w_min;
-};
-
-// F(alpha, beta, gamma| x,y) = \sum_i(y_i - (alpha x_i ^ gamma + beta))^2.
-struct PowerFunction {
-  explicit PowerFunction(const std::vector<double>& x0,
-                         const std::vector<double>& y0)
-      : x(x0), y(y0) {}
-
-  typedef Array<double, 3> ArrayType;
-  double Compute(const ArrayType& w, ArrayType* df) const {
-    double loss_function = 0;
-    (*df)[0] = 0;
-    (*df)[1] = 0;
-    (*df)[2] = 0;
-    for (size_t ind = 0; ind < y.size(); ++ind) {
-      if (x[ind] != 0) {
-        double l_f = y[ind] - (w[0] * pow(x[ind], w[1]) + w[2]);
-        (*df)[0] += 2.0 * l_f * pow(x[ind], w[1]);
-        (*df)[1] += 2.0 * l_f * w[0] * pow(x[ind], w[1]) * log(x[ind]);
-        (*df)[2] += 2.0 * l_f * 1;
-        loss_function += l_f * l_f;
-      }
-    }
-    return loss_function;
-  }
-
-  std::vector<double> x;
-  std::vector<double> y;
-};
-
-TEST(OptimizeTest, SimpleQuadraticFunction) {
-  SimpleQuadraticFunction::ArrayType w_min;
-  w_min[0] = 1.0;
-  w_min[1] = 2.0;
-  SimpleQuadraticFunction f(w_min);
-  SimpleQuadraticFunction::ArrayType w(0.);
-  static const double kPrecision = 1e-8;
-  w = optimize::OptimizeWithScaledConjugateGradientMethod(f, w, kPrecision,
-                                                          kMaxTestIter);
-  EXPECT_NEAR(w[0], 1.0, kPrecision);
-  EXPECT_NEAR(w[1], 2.0, kPrecision);
-}
-
-TEST(OptimizeTest, PowerFunction) {
-  std::vector<double> x(10);
-  std::vector<double> y(10);
-  for (int ind = 0; ind < 10; ++ind) {
-    x[ind] = 1. * ind;
-    y[ind] = 2. * pow(x[ind], 3) + 5.;
-  }
-  PowerFunction f(x, y);
-  PowerFunction::ArrayType w(0.);
-
-  static const double kPrecision = 0.01;
-  w = optimize::OptimizeWithScaledConjugateGradientMethod(f, w, kPrecision,
-                                                          kMaxTestIter);
-  EXPECT_NEAR(w[0], 2.0, kPrecision);
-  EXPECT_NEAR(w[1], 3.0, kPrecision);
-  EXPECT_NEAR(w[2], 5.0, kPrecision);
-}
-
-}  // namespace
-}  // namespace optimize
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_params.h b/third_party/jpeg-xl/lib/jxl/enc_params.h
deleted file mode 100644
index 8c7e54ae77eda..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_params.h
+++ /dev/null
@@ -1,208 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_PARAMS_H_
-#define LIB_JXL_ENC_PARAMS_H_
-
-// Parameters and flags that govern JXL compression.
-
-#include <jxl/cms_interface.h>
-#include <jxl/encode.h>
-#include <stddef.h>
-
-#include <vector>
-
-#include "lib/jxl/base/override.h"
-#include "lib/jxl/common.h"
-#include "lib/jxl/enc_progressive_split.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/modular/encoding/dec_ma.h"
-#include "lib/jxl/modular/options.h"
-#include "lib/jxl/splines.h"
-
-namespace jxl {
-
-// NOLINTNEXTLINE(clang-analyzer-optin.performance.Padding)
-struct CompressParams {
-  float butteraugli_distance = 1.0f;
-
-  // explicit distances for extra channels (defaults to butteraugli_distance
-  // when not set; value of -1 can be used to represent 'default')
-  std::vector<float> ec_distance;
-
-  // Try to achieve a maximum pixel-by-pixel error on each channel.
-  bool max_error_mode = false;
-  float max_error[3] = {0.0, 0.0, 0.0};
-
-  bool disable_perceptual_optimizations = false;
-
-  SpeedTier speed_tier = SpeedTier::kSquirrel;
-  int brotli_effort = -1;
-
-  // 0 = default.
-  // 1 = slightly worse quality.
-  // 4 = fastest speed, lowest quality
-  size_t decoding_speed_tier = 0;
-
-  ColorTransform color_transform = ColorTransform::kXYB;
-
-  // If true, the "modular mode options" members below are used.
-  bool modular_mode = false;
-
-  // Change group size in modular mode (0=128, 1=256, 2=512, 3=1024, -1=encoder
-  // chooses).
-  int modular_group_size_shift = -1;
-
-  Override preview = Override::kDefault;
-  Override noise = Override::kDefault;
-  Override dots = Override::kDefault;
-  Override patches = Override::kDefault;
-  Override gaborish = Override::kDefault;
-  int epf = -1;
-
-  // Progressive mode.
-  Override progressive_mode = Override::kDefault;
-
-  // Quantized-progressive mode.
-  Override qprogressive_mode = Override::kDefault;
-
-  // Put center groups first in the bitstream.
-  bool centerfirst = false;
-
-  // Pixel coordinates of the center. First group will contain that center.
-  size_t center_x = static_cast<size_t>(-1);
-  size_t center_y = static_cast<size_t>(-1);
-
-  int progressive_dc = -1;
-
-  // If on: preserve color of invisible pixels (if off: don't care)
-  // Default: on
-  Override keep_invisible = Override::kDefault;
-
-  JxlCmsInterface cms;
-  bool cms_set = false;
-  void SetCms(const JxlCmsInterface& cms) {
-    this->cms = cms;
-    cms_set = true;
-  }
-
-  // Force usage of CfL when doing JPEG recompression. This can have unexpected
-  // effects on the decoded pixels, while still being JPEG-compliant and
-  // allowing reconstruction of the original JPEG.
-  bool force_cfl_jpeg_recompression = true;
-
-  // Use brotli compression for any boxes derived from a JPEG frame.
-  bool jpeg_compress_boxes = true;
-
-  // Preserve this metadata when doing JPEG recompression.
-  bool jpeg_keep_exif = true;
-  bool jpeg_keep_xmp = true;
-  bool jpeg_keep_jumbf = true;
-
-  // Set the noise to what it would approximately be if shooting at the nominal
-  // exposure for a given ISO setting on a 35mm camera.
-  float photon_noise_iso = 0;
-
-  // modular mode options below
-  ModularOptions options;
-
-  // TODO(eustas): use Override?
-  int responsive = -1;
-  int colorspace = -1;
-  int move_to_front_from_channel = -1;
-
-  // Use Global channel palette if #colors < this percentage of range
-  float channel_colors_pre_transform_percent = 95.f;
-  // Use Local channel palette if #colors < this percentage of range
-  float channel_colors_percent = 80.f;
-  int palette_colors = 1 << 10;  // up to 10-bit palette is probably worthwhile
-  bool lossy_palette = false;
-
-  // Returns whether these params are lossless as defined by SetLossless();
-  bool IsLossless() const { return modular_mode && ModularPartIsLossless(); }
-
-  bool ModularPartIsLossless() const {
-    if (modular_mode) {
-      // YCbCr is also considered lossless here since it's intended for
-      // source material that is already YCbCr (we don't do the fwd transform)
-      if (butteraugli_distance != 0 ||
-          color_transform == jxl::ColorTransform::kXYB)
-        return false;
-    }
-    for (float f : ec_distance) {
-      if (f > 0) return false;
-      if (f < 0 && butteraugli_distance != 0) return false;
-    }
-    // all modular channels are encoded at distance 0
-    return true;
-  }
-
-  // Sets the parameters required to make the codec lossless.
-  void SetLossless() {
-    modular_mode = true;
-    butteraugli_distance = 0.0f;
-    for (float& f : ec_distance) f = 0.0f;
-    color_transform = jxl::ColorTransform::kNone;
-  }
-
-  // Down/upsample the image before encoding / after decoding by this factor.
-  // The resampling value can also be set to <= 0 to automatically choose based
-  // on distance, however EncodeFrame doesn't support this, so it is
-  // required to call PostInit() to set a valid positive resampling
-  // value and altered butteraugli score if this is used.
-  int resampling = -1;
-  int ec_resampling = -1;
-  // Skip the downsampling before encoding if this is true.
-  bool already_downsampled = false;
-  // Butteraugli target distance on the original full size image, this can be
-  // different from butteraugli_distance if resampling was used.
-  float original_butteraugli_distance = -1.0f;
-
-  float quant_ac_rescale = 1.0;
-
-  // Codestream level to conform to.
-  // -1: don't care
-  int level = -1;
-
-  // See JXL_ENC_FRAME_SETTING_BUFFERING option value.
-  int buffering = -1;
-  // See JXL_ENC_FRAME_SETTING_USE_FULL_IMAGE_HEURISTICS option value.
-  bool use_full_image_heuristics = true;
-
-  std::vector<float> manual_noise;
-  std::vector<float> manual_xyb_factors;
-
-  // If not empty, this tree will be used for dc global section.
-  // Used in jxl_from_tree tool.
-  Tree custom_fixed_tree;
-  // If not empty, these custom splines will be used instead of the computed
-  // ones. Used in jxl_from_tee tool.
-  Splines custom_splines;
-  // If not null, overrides progressive mode settings. Used in decode_test.
-  const ProgressiveMode* custom_progressive_mode = nullptr;
-
-  JxlDebugImageCallback debug_image = nullptr;
-  void* debug_image_opaque;
-};
-
-static constexpr float kMinButteraugliForDynamicAR = 0.5f;
-static constexpr float kMinButteraugliForDots = 3.0f;
-static constexpr float kMinButteraugliToSubtractOriginalPatches = 3.0f;
-
-// Always off
-static constexpr float kMinButteraugliForNoise = 99.0f;
-
-// Minimum butteraugli distance the encoder accepts.
-static constexpr float kMinButteraugliDistance = 0.001f;
-
-// Tile size for encoder-side processing. Must be equal to color tile dim in the
-// current implementation.
-static constexpr size_t kEncTileDim = 64;
-static constexpr size_t kEncTileDimInBlocks = kEncTileDim / kBlockDim;
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_PARAMS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_patch_dictionary.cc b/third_party/jpeg-xl/lib/jxl/enc_patch_dictionary.cc
deleted file mode 100644
index 5fdfc57d587fb..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_patch_dictionary.cc
+++ /dev/null
@@ -1,870 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_patch_dictionary.h"
-
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-#include <sys/types.h>
-
-#include <algorithm>
-#include <atomic>
-#include <cstdint>
-#include <cstdlib>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/override.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/random.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_cache.h"
-#include "lib/jxl/dec_frame.h"
-#include "lib/jxl/enc_ans.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_cache.h"
-#include "lib/jxl/enc_debug_image.h"
-#include "lib/jxl/enc_dot_dictionary.h"
-#include "lib/jxl/enc_frame.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/pack_signed.h"
-#include "lib/jxl/patch_dictionary_internal.h"
-
-namespace jxl {
-
-static constexpr size_t kPatchFrameReferenceId = 3;
-
-// static
-Status PatchDictionaryEncoder::Encode(const PatchDictionary& pdic,
-                                      BitWriter* writer, LayerType layer,
-                                      AuxOut* aux_out) {
-  JXL_ENSURE(pdic.HasAny());
-  JxlMemoryManager* memory_manager = writer->memory_manager();
-  std::vector<std::vector<Token>> tokens(1);
-
-  auto add_num = [&](int context, size_t num) {
-    tokens[0].emplace_back(context, num);
-  };
-  size_t num_ref_patch = 0;
-  for (size_t i = 0; i < pdic.positions_.size();) {
-    size_t ref_pos_idx = pdic.positions_[i].ref_pos_idx;
-    while (i < pdic.positions_.size() &&
-           pdic.positions_[i].ref_pos_idx == ref_pos_idx) {
-      i++;
-    }
-    num_ref_patch++;
-  }
-  add_num(kNumRefPatchContext, num_ref_patch);
-  size_t blend_pos = 0;
-  size_t blending_stride = pdic.blendings_stride_;
-  // blending_stride == num_ec + 1; num_ec > 1 =>
-  bool choose_alpha = (blending_stride > 1 + 1);
-  for (size_t i = 0; i < pdic.positions_.size();) {
-    size_t i_start = i;
-    size_t ref_pos_idx = pdic.positions_[i].ref_pos_idx;
-    const auto& ref_pos = pdic.ref_positions_[ref_pos_idx];
-    while (i < pdic.positions_.size() &&
-           pdic.positions_[i].ref_pos_idx == ref_pos_idx) {
-      i++;
-    }
-    size_t num = i - i_start;
-    JXL_ENSURE(num > 0);
-    add_num(kReferenceFrameContext, ref_pos.ref);
-    add_num(kPatchReferencePositionContext, ref_pos.x0);
-    add_num(kPatchReferencePositionContext, ref_pos.y0);
-    add_num(kPatchSizeContext, ref_pos.xsize - 1);
-    add_num(kPatchSizeContext, ref_pos.ysize - 1);
-    add_num(kPatchCountContext, num - 1);
-    for (size_t j = i_start; j < i; j++) {
-      const PatchPosition& pos = pdic.positions_[j];
-      if (j == i_start) {
-        add_num(kPatchPositionContext, pos.x);
-        add_num(kPatchPositionContext, pos.y);
-      } else {
-        add_num(kPatchOffsetContext,
-                PackSigned(pos.x - pdic.positions_[j - 1].x));
-        add_num(kPatchOffsetContext,
-                PackSigned(pos.y - pdic.positions_[j - 1].y));
-      }
-      for (size_t j = 0; j < blending_stride; ++j, ++blend_pos) {
-        const PatchBlending& info = pdic.blendings_[blend_pos];
-        add_num(kPatchBlendModeContext, static_cast<uint32_t>(info.mode));
-        if (UsesAlpha(info.mode) && choose_alpha) {
-          add_num(kPatchAlphaChannelContext, info.alpha_channel);
-        }
-        if (UsesClamp(info.mode)) {
-          add_num(kPatchClampContext, TO_JXL_BOOL(info.clamp));
-        }
-      }
-    }
-  }
-
-  EntropyEncodingData codes;
-  std::vector<uint8_t> context_map;
-  JXL_ASSIGN_OR_RETURN(
-      size_t cost,
-      BuildAndEncodeHistograms(memory_manager, HistogramParams(),
-                               kNumPatchDictionaryContexts, tokens, &codes,
-                               &context_map, writer, layer, aux_out));
-  (void)cost;
-  JXL_RETURN_IF_ERROR(
-      WriteTokens(tokens[0], codes, context_map, 0, writer, layer, aux_out));
-  return true;
-}
-
-// static
-Status PatchDictionaryEncoder::SubtractFrom(const PatchDictionary& pdic,
-                                            Image3F* opsin) {
-  // TODO(veluca): this can likely be optimized knowing it runs on full images.
-  for (size_t y = 0; y < opsin->ysize(); y++) {
-    float* JXL_RESTRICT rows[3] = {
-        opsin->PlaneRow(0, y),
-        opsin->PlaneRow(1, y),
-        opsin->PlaneRow(2, y),
-    };
-    size_t blending_stride = pdic.blendings_stride_;
-    for (size_t pos_idx : pdic.GetPatchesForRow(y)) {
-      const size_t blending_idx = pos_idx * blending_stride;
-      const PatchPosition& pos = pdic.positions_[pos_idx];
-      const PatchReferencePosition& ref_pos =
-          pdic.ref_positions_[pos.ref_pos_idx];
-      const PatchBlendMode mode = pdic.blendings_[blending_idx].mode;
-      size_t by = pos.y;
-      size_t bx = pos.x;
-      size_t xsize = ref_pos.xsize;
-      JXL_ENSURE(y >= by);
-      JXL_ENSURE(y < by + ref_pos.ysize);
-      size_t iy = y - by;
-      size_t ref = ref_pos.ref;
-      const float* JXL_RESTRICT ref_rows[3] = {
-          pdic.reference_frames_->at(ref).frame->color()->ConstPlaneRow(
-              0, ref_pos.y0 + iy) +
-              ref_pos.x0,
-          pdic.reference_frames_->at(ref).frame->color()->ConstPlaneRow(
-              1, ref_pos.y0 + iy) +
-              ref_pos.x0,
-          pdic.reference_frames_->at(ref).frame->color()->ConstPlaneRow(
-              2, ref_pos.y0 + iy) +
-              ref_pos.x0,
-      };
-      for (size_t ix = 0; ix < xsize; ix++) {
-        for (size_t c = 0; c < 3; c++) {
-          if (mode == PatchBlendMode::kAdd) {
-            rows[c][bx + ix] -= ref_rows[c][ix];
-          } else if (mode == PatchBlendMode::kReplace) {
-            rows[c][bx + ix] = 0;
-          } else if (mode == PatchBlendMode::kNone) {
-            // Nothing to do.
-          } else {
-            return JXL_UNREACHABLE("blending mode %u not yet implemented",
-                                   static_cast<uint32_t>(mode));
-          }
-        }
-      }
-    }
-  }
-  return true;
-}
-
-namespace {
-
-struct PatchColorspaceInfo {
-  float kChannelDequant[3];
-  float kChannelWeights[3];
-
-  explicit PatchColorspaceInfo(bool is_xyb) {
-    if (is_xyb) {
-      kChannelDequant[0] = 0.01615;
-      kChannelDequant[1] = 0.08875;
-      kChannelDequant[2] = 0.1922;
-      kChannelWeights[0] = 30.0;
-      kChannelWeights[1] = 3.0;
-      kChannelWeights[2] = 1.0;
-    } else {
-      kChannelDequant[0] = 20.0f / 255;
-      kChannelDequant[1] = 22.0f / 255;
-      kChannelDequant[2] = 20.0f / 255;
-      kChannelWeights[0] = 0.017 * 255;
-      kChannelWeights[1] = 0.02 * 255;
-      kChannelWeights[2] = 0.017 * 255;
-    }
-  }
-
-  float ScaleForQuantization(float val, size_t c) {
-    return val / kChannelDequant[c];
-  }
-
-  int Quantize(float val, size_t c) {
-    return truncf(ScaleForQuantization(val, c));
-  }
-
-  bool is_similar_v(const float v1[3], const float v2[3], float threshold) {
-    float distance = 0;
-    for (size_t c = 0; c < 3; c++) {
-      distance += std::fabs(v1[c] - v2[c]) * kChannelWeights[c];
-    }
-    return distance <= threshold;
-  }
-};
-
-StatusOr<std::vector<PatchInfo>> FindTextLikePatches(
-    const CompressParams& cparams, const Image3F& opsin,
-    const PassesEncoderState* JXL_RESTRICT state, ThreadPool* pool,
-    AuxOut* aux_out, bool is_xyb) {
-  std::vector<PatchInfo> info;
-  if (state->cparams.patches == Override::kOff) return info;
-  const auto& frame_dim = state->shared.frame_dim;
-  JxlMemoryManager* memory_manager = opsin.memory_manager();
-
-  PatchColorspaceInfo pci(is_xyb);
-  float kSimilarThreshold = 0.8f;
-
-  auto is_similar_impl = [&pci](std::pair<uint32_t, uint32_t> p1,
-                                std::pair<uint32_t, uint32_t> p2,
-                                const float* JXL_RESTRICT rows[3],
-                                size_t stride, float threshold) {
-    float v1[3];
-    float v2[3];
-    for (size_t c = 0; c < 3; c++) {
-      v1[c] = rows[c][p1.second * stride + p1.first];
-      v2[c] = rows[c][p2.second * stride + p2.first];
-    }
-    return pci.is_similar_v(v1, v2, threshold);
-  };
-
-  std::atomic<bool> has_screenshot_areas{false};
-  const size_t opsin_stride = opsin.PixelsPerRow();
-  const float* JXL_RESTRICT opsin_rows[3] = {opsin.ConstPlaneRow(0, 0),
-                                             opsin.ConstPlaneRow(1, 0),
-                                             opsin.ConstPlaneRow(2, 0)};
-
-  auto is_same = [&opsin_rows, opsin_stride](std::pair<uint32_t, uint32_t> p1,
-                                             std::pair<uint32_t, uint32_t> p2) {
-    for (auto& opsin_row : opsin_rows) {
-      float v1 = opsin_row[p1.second * opsin_stride + p1.first];
-      float v2 = opsin_row[p2.second * opsin_stride + p2.first];
-      if (std::fabs(v1 - v2) > 1e-4) {
-        return false;
-      }
-    }
-    return true;
-  };
-
-  auto is_similar = [&](std::pair<uint32_t, uint32_t> p1,
-                        std::pair<uint32_t, uint32_t> p2) {
-    return is_similar_impl(p1, p2, opsin_rows, opsin_stride, kSimilarThreshold);
-  };
-
-  constexpr int64_t kPatchSide = 4;
-  constexpr int64_t kExtraSide = 4;
-
-  // Look for kPatchSide size squares, naturally aligned, that all have the same
-  // pixel values.
-  JXL_ASSIGN_OR_RETURN(
-      ImageB is_screenshot_like,
-      ImageB::Create(memory_manager, DivCeil(frame_dim.xsize, kPatchSide),
-                     DivCeil(frame_dim.ysize, kPatchSide)));
-  ZeroFillImage(&is_screenshot_like);
-  uint8_t* JXL_RESTRICT screenshot_row = is_screenshot_like.Row(0);
-  const size_t screenshot_stride = is_screenshot_like.PixelsPerRow();
-  const auto process_row = [&](const uint32_t y,
-                               size_t /* thread */) -> Status {
-    for (uint64_t x = 0; x < frame_dim.xsize / kPatchSide; x++) {
-      bool all_same = true;
-      for (size_t iy = 0; iy < static_cast<size_t>(kPatchSide); iy++) {
-        for (size_t ix = 0; ix < static_cast<size_t>(kPatchSide); ix++) {
-          size_t cx = x * kPatchSide + ix;
-          size_t cy = y * kPatchSide + iy;
-          if (!is_same({cx, cy}, {x * kPatchSide, y * kPatchSide})) {
-            all_same = false;
-            break;
-          }
-        }
-      }
-      if (!all_same) continue;
-      size_t num = 0;
-      size_t num_same = 0;
-      for (int64_t iy = -kExtraSide; iy < kExtraSide + kPatchSide; iy++) {
-        for (int64_t ix = -kExtraSide; ix < kExtraSide + kPatchSide; ix++) {
-          int64_t cx = x * kPatchSide + ix;
-          int64_t cy = y * kPatchSide + iy;
-          if (cx < 0 || static_cast<uint64_t>(cx) >= frame_dim.xsize ||  //
-              cy < 0 || static_cast<uint64_t>(cy) >= frame_dim.ysize) {
-            continue;
-          }
-          num++;
-          if (is_same({cx, cy}, {x * kPatchSide, y * kPatchSide})) num_same++;
-        }
-      }
-      // Too few equal pixels nearby.
-      if (num_same * 8 < num * 7) continue;
-      screenshot_row[y * screenshot_stride + x] = 1;
-      has_screenshot_areas = true;
-    }
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, frame_dim.ysize / kPatchSide,
-                                ThreadPool::NoInit, process_row,
-                                "IsScreenshotLike"));
-
-  // TODO(veluca): also parallelize the rest of this function.
-  if (WantDebugOutput(cparams)) {
-    JXL_RETURN_IF_ERROR(
-        DumpPlaneNormalized(cparams, "screenshot_like", is_screenshot_like));
-  }
-
-  constexpr int kSearchRadius = 1;
-
-  if (!ApplyOverride(state->cparams.patches, has_screenshot_areas)) {
-    return info;
-  }
-
-  // Search for "similar enough" pixels near the screenshot-like areas.
-  JXL_ASSIGN_OR_RETURN(
-      ImageB is_background,
-      ImageB::Create(memory_manager, frame_dim.xsize, frame_dim.ysize));
-  ZeroFillImage(&is_background);
-  JXL_ASSIGN_OR_RETURN(
-      Image3F background,
-      Image3F::Create(memory_manager, frame_dim.xsize, frame_dim.ysize));
-  ZeroFillImage(&background);
-  constexpr size_t kDistanceLimit = 50;
-  float* JXL_RESTRICT background_rows[3] = {
-      background.PlaneRow(0, 0),
-      background.PlaneRow(1, 0),
-      background.PlaneRow(2, 0),
-  };
-  const size_t background_stride = background.PixelsPerRow();
-  uint8_t* JXL_RESTRICT is_background_row = is_background.Row(0);
-  const size_t is_background_stride = is_background.PixelsPerRow();
-  std::vector<
-      std::pair<std::pair<uint32_t, uint32_t>, std::pair<uint32_t, uint32_t>>>
-      queue;
-  size_t queue_front = 0;
-  for (size_t y = 0; y < frame_dim.ysize; y++) {
-    for (size_t x = 0; x < frame_dim.xsize; x++) {
-      if (!screenshot_row[screenshot_stride * (y / kPatchSide) +
-                          (x / kPatchSide)])
-        continue;
-      queue.push_back({{x, y}, {x, y}});
-    }
-  }
-  while (queue.size() != queue_front) {
-    std::pair<uint32_t, uint32_t> cur = queue[queue_front].first;
-    std::pair<uint32_t, uint32_t> src = queue[queue_front].second;
-    queue_front++;
-    if (is_background_row[cur.second * is_background_stride + cur.first])
-      continue;
-    is_background_row[cur.second * is_background_stride + cur.first] = 1;
-    for (size_t c = 0; c < 3; c++) {
-      background_rows[c][cur.second * background_stride + cur.first] =
-          opsin_rows[c][src.second * opsin_stride + src.first];
-    }
-    for (int dx = -kSearchRadius; dx <= kSearchRadius; dx++) {
-      for (int dy = -kSearchRadius; dy <= kSearchRadius; dy++) {
-        if (dx == 0 && dy == 0) continue;
-        int next_first = cur.first + dx;
-        int next_second = cur.second + dy;
-        if (next_first < 0 || next_second < 0 ||
-            static_cast<uint32_t>(next_first) >= frame_dim.xsize ||
-            static_cast<uint32_t>(next_second) >= frame_dim.ysize) {
-          continue;
-        }
-        if (static_cast<uint32_t>(
-                std::abs(next_first - static_cast<int>(src.first)) +
-                std::abs(next_second - static_cast<int>(src.second))) >
-            kDistanceLimit) {
-          continue;
-        }
-        std::pair<uint32_t, uint32_t> next{next_first, next_second};
-        if (is_similar(src, next)) {
-          if (!screenshot_row[next.second / kPatchSide * screenshot_stride +
-                              next.first / kPatchSide] ||
-              is_same(src, next)) {
-            if (!is_background_row[next.second * is_background_stride +
-                                   next.first])
-              queue.emplace_back(next, src);
-          }
-        }
-      }
-    }
-  }
-  queue.clear();
-
-  ImageF ccs;
-  Rng rng(0);
-  bool paint_ccs = false;
-  if (WantDebugOutput(cparams)) {
-    JXL_RETURN_IF_ERROR(
-        DumpPlaneNormalized(cparams, "is_background", is_background));
-    if (is_xyb) {
-      JXL_RETURN_IF_ERROR(DumpXybImage(cparams, "background", background));
-    } else {
-      JXL_RETURN_IF_ERROR(DumpImage(cparams, "background", background));
-    }
-    JXL_ASSIGN_OR_RETURN(
-        ccs, ImageF::Create(memory_manager, frame_dim.xsize, frame_dim.ysize));
-    ZeroFillImage(&ccs);
-    paint_ccs = true;
-  }
-
-  constexpr float kVerySimilarThreshold = 0.03f;
-  constexpr float kHasSimilarThreshold = 0.03f;
-
-  const float* JXL_RESTRICT const_background_rows[3] = {
-      background_rows[0], background_rows[1], background_rows[2]};
-  auto is_similar_b = [&](std::pair<int, int> p1, std::pair<int, int> p2) {
-    return is_similar_impl(p1, p2, const_background_rows, background_stride,
-                           kVerySimilarThreshold);
-  };
-
-  constexpr int kMinPeak = 2;
-  constexpr int kHasSimilarRadius = 2;
-
-  // Find small CC outside the "similar enough" areas, compute bounding boxes,
-  // and run heuristics to exclude some patches.
-  JXL_ASSIGN_OR_RETURN(
-      ImageB visited,
-      ImageB::Create(memory_manager, frame_dim.xsize, frame_dim.ysize));
-  ZeroFillImage(&visited);
-  uint8_t* JXL_RESTRICT visited_row = visited.Row(0);
-  const size_t visited_stride = visited.PixelsPerRow();
-  std::vector<std::pair<uint32_t, uint32_t>> cc;
-  std::vector<std::pair<uint32_t, uint32_t>> stack;
-  for (size_t y = 0; y < frame_dim.ysize; y++) {
-    for (size_t x = 0; x < frame_dim.xsize; x++) {
-      if (is_background_row[y * is_background_stride + x]) continue;
-      cc.clear();
-      stack.clear();
-      stack.emplace_back(x, y);
-      size_t min_x = x;
-      size_t max_x = x;
-      size_t min_y = y;
-      size_t max_y = y;
-      std::pair<uint32_t, uint32_t> reference;
-      bool found_border = false;
-      bool all_similar = true;
-      while (!stack.empty()) {
-        std::pair<uint32_t, uint32_t> cur = stack.back();
-        stack.pop_back();
-        if (visited_row[cur.second * visited_stride + cur.first]) continue;
-        visited_row[cur.second * visited_stride + cur.first] = 1;
-        if (cur.first < min_x) min_x = cur.first;
-        if (cur.first > max_x) max_x = cur.first;
-        if (cur.second < min_y) min_y = cur.second;
-        if (cur.second > max_y) max_y = cur.second;
-        if (paint_ccs) {
-          cc.push_back(cur);
-        }
-        for (int dx = -kSearchRadius; dx <= kSearchRadius; dx++) {
-          for (int dy = -kSearchRadius; dy <= kSearchRadius; dy++) {
-            if (dx == 0 && dy == 0) continue;
-            int next_first = static_cast<int32_t>(cur.first) + dx;
-            int next_second = static_cast<int32_t>(cur.second) + dy;
-            if (next_first < 0 || next_second < 0 ||
-                static_cast<uint32_t>(next_first) >= frame_dim.xsize ||
-                static_cast<uint32_t>(next_second) >= frame_dim.ysize) {
-              continue;
-            }
-            std::pair<uint32_t, uint32_t> next{next_first, next_second};
-            if (!is_background_row[next.second * is_background_stride +
-                                   next.first]) {
-              stack.push_back(next);
-            } else {
-              if (!found_border) {
-                reference = next;
-                found_border = true;
-              } else {
-                if (!is_similar_b(next, reference)) all_similar = false;
-              }
-            }
-          }
-        }
-      }
-      if (!found_border || !all_similar || max_x - min_x >= kMaxPatchSize ||
-          max_y - min_y >= kMaxPatchSize) {
-        continue;
-      }
-      size_t bpos = background_stride * reference.second + reference.first;
-      float ref[3] = {background_rows[0][bpos], background_rows[1][bpos],
-                      background_rows[2][bpos]};
-      bool has_similar = false;
-      for (size_t iy = std::max<int>(
-               static_cast<int32_t>(min_y) - kHasSimilarRadius, 0);
-           iy < std::min(max_y + kHasSimilarRadius + 1, frame_dim.ysize);
-           iy++) {
-        for (size_t ix = std::max<int>(
-                 static_cast<int32_t>(min_x) - kHasSimilarRadius, 0);
-             ix < std::min(max_x + kHasSimilarRadius + 1, frame_dim.xsize);
-             ix++) {
-          size_t opos = opsin_stride * iy + ix;
-          float px[3] = {opsin_rows[0][opos], opsin_rows[1][opos],
-                         opsin_rows[2][opos]};
-          if (pci.is_similar_v(ref, px, kHasSimilarThreshold)) {
-            has_similar = true;
-          }
-        }
-      }
-      if (!has_similar) continue;
-      info.emplace_back();
-      info.back().second.emplace_back(min_x, min_y);
-      QuantizedPatch& patch = info.back().first;
-      patch.xsize = max_x - min_x + 1;
-      patch.ysize = max_y - min_y + 1;
-      int max_value = 0;
-      for (size_t c : {1, 0, 2}) {
-        for (size_t iy = min_y; iy <= max_y; iy++) {
-          for (size_t ix = min_x; ix <= max_x; ix++) {
-            size_t offset = (iy - min_y) * patch.xsize + ix - min_x;
-            patch.fpixels[c][offset] =
-                opsin_rows[c][iy * opsin_stride + ix] - ref[c];
-            int val = pci.Quantize(patch.fpixels[c][offset], c);
-            patch.pixels[c][offset] = val;
-            if (std::abs(val) > max_value) max_value = std::abs(val);
-          }
-        }
-      }
-      if (max_value < kMinPeak) {
-        info.pop_back();
-        continue;
-      }
-      if (paint_ccs) {
-        float cc_color = rng.UniformF(0.5, 1.0);
-        for (std::pair<uint32_t, uint32_t> p : cc) {
-          ccs.Row(p.second)[p.first] = cc_color;
-        }
-      }
-    }
-  }
-
-  if (paint_ccs) {
-    JXL_ENSURE(WantDebugOutput(cparams));
-    JXL_RETURN_IF_ERROR(DumpPlaneNormalized(cparams, "ccs", ccs));
-  }
-  if (info.empty()) {
-    return info;
-  }
-
-  // Remove duplicates.
-  constexpr size_t kMinPatchOccurrences = 2;
-  std::sort(info.begin(), info.end());
-  size_t unique = 0;
-  for (size_t i = 1; i < info.size(); i++) {
-    if (info[i].first == info[unique].first) {
-      info[unique].second.insert(info[unique].second.end(),
-                                 info[i].second.begin(), info[i].second.end());
-    } else {
-      if (info[unique].second.size() >= kMinPatchOccurrences) {
-        unique++;
-      }
-      info[unique] = info[i];
-    }
-  }
-  if (info[unique].second.size() >= kMinPatchOccurrences) {
-    unique++;
-  }
-  info.resize(unique);
-
-  size_t max_patch_size = 0;
-
-  for (const auto& patch : info) {
-    size_t pixels = patch.first.xsize * patch.first.ysize;
-    if (pixels > max_patch_size) max_patch_size = pixels;
-  }
-
-  // don't use patches if all patches are smaller than this
-  constexpr size_t kMinMaxPatchSize = 20;
-  if (max_patch_size < kMinMaxPatchSize) {
-    info.clear();
-  }
-
-  return info;
-}
-
-}  // namespace
-
-Status FindBestPatchDictionary(const Image3F& opsin,
-                               PassesEncoderState* JXL_RESTRICT state,
-                               const JxlCmsInterface& cms, ThreadPool* pool,
-                               AuxOut* aux_out, bool is_xyb) {
-  JXL_ASSIGN_OR_RETURN(
-      std::vector<PatchInfo> info,
-      FindTextLikePatches(state->cparams, opsin, state, pool, aux_out, is_xyb));
-  JxlMemoryManager* memory_manager = opsin.memory_manager();
-
-  // TODO(veluca): this doesn't work if both dots and patches are enabled.
-  // For now, since dots and patches are not likely to occur in the same kind of
-  // images, disable dots if some patches were found.
-  if (info.empty() &&
-      ApplyOverride(
-          state->cparams.dots,
-          state->cparams.speed_tier <= SpeedTier::kSquirrel &&
-              state->cparams.butteraugli_distance >= kMinButteraugliForDots &&
-              !state->cparams.disable_perceptual_optimizations)) {
-    Rect rect(0, 0, state->shared.frame_dim.xsize,
-              state->shared.frame_dim.ysize);
-    JXL_ASSIGN_OR_RETURN(info,
-                         FindDotDictionary(state->cparams, opsin, rect,
-                                           state->shared.cmap.base(), pool));
-  }
-
-  if (info.empty()) return true;
-
-  std::sort(
-      info.begin(), info.end(), [&](const PatchInfo& a, const PatchInfo& b) {
-        return a.first.xsize * a.first.ysize > b.first.xsize * b.first.ysize;
-      });
-
-  size_t max_x_size = 0;
-  size_t max_y_size = 0;
-  size_t total_pixels = 0;
-
-  for (const auto& patch : info) {
-    size_t pixels = patch.first.xsize * patch.first.ysize;
-    if (max_x_size < patch.first.xsize) max_x_size = patch.first.xsize;
-    if (max_y_size < patch.first.ysize) max_y_size = patch.first.ysize;
-    total_pixels += pixels;
-  }
-
-  // Bin-packing & conversion of patches.
-  constexpr float kBinPackingSlackness = 1.05f;
-  size_t ref_xsize = std::max<float>(max_x_size, std::sqrt(total_pixels));
-  size_t ref_ysize = std::max<float>(max_y_size, std::sqrt(total_pixels));
-  std::vector<std::pair<size_t, size_t>> ref_positions(info.size());
-  // TODO(veluca): allow partial overlaps of patches that have the same pixels.
-  size_t max_y = 0;
-  do {
-    max_y = 0;
-    // Increase packed image size.
-    ref_xsize = ref_xsize * kBinPackingSlackness + 1;
-    ref_ysize = ref_ysize * kBinPackingSlackness + 1;
-
-    JXL_ASSIGN_OR_RETURN(ImageB occupied,
-                         ImageB::Create(memory_manager, ref_xsize, ref_ysize));
-    ZeroFillImage(&occupied);
-    uint8_t* JXL_RESTRICT occupied_rows = occupied.Row(0);
-    size_t occupied_stride = occupied.PixelsPerRow();
-
-    bool success = true;
-    // For every patch...
-    for (size_t patch = 0; patch < info.size(); patch++) {
-      size_t x0 = 0;
-      size_t y0 = 0;
-      size_t xsize = info[patch].first.xsize;
-      size_t ysize = info[patch].first.ysize;
-      bool found = false;
-      // For every possible start position ...
-      for (; y0 + ysize <= ref_ysize; y0++) {
-        x0 = 0;
-        for (; x0 + xsize <= ref_xsize; x0++) {
-          bool has_occupied_pixel = false;
-          size_t x = x0;
-          // Check if it is possible to place the patch in this position in the
-          // reference frame.
-          for (size_t y = y0; y < y0 + ysize; y++) {
-            x = x0;
-            for (; x < x0 + xsize; x++) {
-              if (occupied_rows[y * occupied_stride + x]) {
-                has_occupied_pixel = true;
-                break;
-              }
-            }
-          }  // end of positioning check
-          if (!has_occupied_pixel) {
-            found = true;
-            break;
-          }
-          x0 = x;  // Jump to next pixel after the occupied one.
-        }
-        if (found) break;
-      }  // end of start position checking
-
-      // We didn't find a possible position: repeat from the beginning with a
-      // larger reference frame size.
-      if (!found) {
-        success = false;
-        break;
-      }
-
-      // We found a position: mark the corresponding positions in the reference
-      // image as used.
-      ref_positions[patch] = {x0, y0};
-      for (size_t y = y0; y < y0 + ysize; y++) {
-        for (size_t x = x0; x < x0 + xsize; x++) {
-          occupied_rows[y * occupied_stride + x] = JXL_TRUE;
-        }
-      }
-      max_y = std::max(max_y, y0 + ysize);
-    }
-
-    if (success) break;
-  } while (true);
-
-  JXL_ENSURE(ref_ysize >= max_y);
-
-  ref_ysize = max_y;
-
-  JXL_ASSIGN_OR_RETURN(Image3F reference_frame,
-                       Image3F::Create(memory_manager, ref_xsize, ref_ysize));
-  // TODO(veluca): figure out a better way to fill the image.
-  ZeroFillImage(&reference_frame);
-  std::vector<PatchPosition> positions;
-  std::vector<PatchReferencePosition> pref_positions;
-  std::vector<PatchBlending> blendings;
-  float* JXL_RESTRICT ref_rows[3] = {
-      reference_frame.PlaneRow(0, 0),
-      reference_frame.PlaneRow(1, 0),
-      reference_frame.PlaneRow(2, 0),
-  };
-  size_t ref_stride = reference_frame.PixelsPerRow();
-  size_t num_ec = state->shared.metadata->m.num_extra_channels;
-
-  for (size_t i = 0; i < info.size(); i++) {
-    PatchReferencePosition ref_pos;
-    ref_pos.xsize = info[i].first.xsize;
-    ref_pos.ysize = info[i].first.ysize;
-    ref_pos.x0 = ref_positions[i].first;
-    ref_pos.y0 = ref_positions[i].second;
-    ref_pos.ref = kPatchFrameReferenceId;
-    for (size_t y = 0; y < ref_pos.ysize; y++) {
-      for (size_t x = 0; x < ref_pos.xsize; x++) {
-        for (size_t c = 0; c < 3; c++) {
-          ref_rows[c][(y + ref_pos.y0) * ref_stride + x + ref_pos.x0] =
-              info[i].first.fpixels[c][y * ref_pos.xsize + x];
-        }
-      }
-    }
-    for (const auto& pos : info[i].second) {
-      JXL_DEBUG_V(4, "Patch %" PRIuS "x%" PRIuS " at position %u,%u",
-                  ref_pos.xsize, ref_pos.ysize, pos.first, pos.second);
-      positions.emplace_back(
-          PatchPosition{pos.first, pos.second, pref_positions.size()});
-      // Add blending for color channels, ignore other channels.
-      blendings.push_back({PatchBlendMode::kAdd, 0, false});
-      for (size_t j = 0; j < num_ec; ++j) {
-        blendings.push_back({PatchBlendMode::kNone, 0, false});
-      }
-    }
-    pref_positions.emplace_back(ref_pos);
-  }
-
-  CompressParams cparams = state->cparams;
-  // Recursive application of patches could create very weird issues.
-  cparams.patches = Override::kOff;
-
-  if (WantDebugOutput(cparams)) {
-    if (is_xyb) {
-      JXL_RETURN_IF_ERROR(
-          DumpXybImage(cparams, "patch_reference", reference_frame));
-    } else {
-      JXL_RETURN_IF_ERROR(
-          DumpImage(cparams, "patch_reference", reference_frame));
-    }
-  }
-
-  JXL_RETURN_IF_ERROR(RoundtripPatchFrame(&reference_frame, state,
-                                          kPatchFrameReferenceId, cparams, cms,
-                                          pool, aux_out, /*subtract=*/true));
-
-  // TODO(veluca): this assumes that applying patches is commutative, which is
-  // not true for all blending modes. This code only produces kAdd patches, so
-  // this works out.
-  PatchDictionaryEncoder::SetPositions(
-      &state->shared.image_features.patches, std::move(positions),
-      std::move(pref_positions), std::move(blendings), num_ec + 1);
-  return true;
-}
-
-Status RoundtripPatchFrame(Image3F* reference_frame,
-                           PassesEncoderState* JXL_RESTRICT state, int idx,
-                           CompressParams& cparams, const JxlCmsInterface& cms,
-                           ThreadPool* pool, AuxOut* aux_out, bool subtract) {
-  JxlMemoryManager* memory_manager = state->memory_manager();
-  FrameInfo patch_frame_info;
-  cparams.resampling = 1;
-  cparams.ec_resampling = 1;
-  cparams.dots = Override::kOff;
-  cparams.noise = Override::kOff;
-  cparams.modular_mode = true;
-  cparams.responsive = 0;
-  cparams.progressive_dc = 0;
-  cparams.progressive_mode = Override::kOff;
-  cparams.qprogressive_mode = Override::kOff;
-  // Use gradient predictor and not Predictor::Best.
-  cparams.options.predictor = Predictor::Gradient;
-  patch_frame_info.save_as_reference = idx;  // always saved.
-  patch_frame_info.frame_type = FrameType::kReferenceOnly;
-  patch_frame_info.save_before_color_transform = true;
-  ImageBundle ib(memory_manager, &state->shared.metadata->m);
-  // TODO(veluca): metadata.color_encoding is a lie: ib is in XYB, but there is
-  // no simple way to express that yet.
-  patch_frame_info.ib_needs_color_transform = false;
-  JXL_RETURN_IF_ERROR(ib.SetFromImage(
-      std::move(*reference_frame), state->shared.metadata->m.color_encoding));
-  if (!ib.metadata()->extra_channel_info.empty()) {
-    // Add placeholder extra channels to the patch image: patch encoding does
-    // not yet support extra channels, but the codec expects that the amount of
-    // extra channels in frames matches that in the metadata of the codestream.
-    std::vector<ImageF> extra_channels;
-    extra_channels.reserve(ib.metadata()->extra_channel_info.size());
-    for (size_t i = 0; i < ib.metadata()->extra_channel_info.size(); i++) {
-      JXL_ASSIGN_OR_RETURN(
-          ImageF ch, ImageF::Create(memory_manager, ib.xsize(), ib.ysize()));
-      extra_channels.emplace_back(std::move(ch));
-      // Must initialize the image with data to not affect blending with
-      // uninitialized memory.
-      // TODO(lode): patches must copy and use the real extra channels instead.
-      ZeroFillImage(&extra_channels.back());
-    }
-    JXL_RETURN_IF_ERROR(ib.SetExtraChannels(std::move(extra_channels)));
-  }
-  auto special_frame = jxl::make_unique<BitWriter>(memory_manager);
-  AuxOut patch_aux_out;
-  JXL_RETURN_IF_ERROR(EncodeFrame(
-      memory_manager, cparams, patch_frame_info, state->shared.metadata, ib,
-      cms, pool, special_frame.get(), aux_out ? &patch_aux_out : nullptr));
-  if (aux_out) {
-    for (const auto& l : patch_aux_out.layers) {
-      aux_out->layer(LayerType::Dictionary).Assimilate(l);
-    }
-  }
-  const Span<const uint8_t> encoded = special_frame->GetSpan();
-  state->special_frames.emplace_back(std::move(special_frame));
-  if (subtract) {
-    ImageBundle decoded(memory_manager, &state->shared.metadata->m);
-    PassesDecoderState dec_state(memory_manager);
-    JXL_RETURN_IF_ERROR(dec_state.output_encoding_info.SetFromMetadata(
-        *state->shared.metadata));
-    const uint8_t* frame_start = encoded.data();
-    size_t encoded_size = encoded.size();
-    JXL_RETURN_IF_ERROR(DecodeFrame(&dec_state, pool, frame_start, encoded_size,
-                                    /*frame_header=*/nullptr, &decoded,
-                                    *state->shared.metadata));
-    frame_start += decoded.decoded_bytes();
-    encoded_size -= decoded.decoded_bytes();
-    size_t ref_xsize =
-        dec_state.shared_storage.reference_frames[idx].frame->color()->xsize();
-    // if the frame itself uses patches, we need to decode another frame
-    if (!ref_xsize) {
-      JXL_RETURN_IF_ERROR(DecodeFrame(
-          &dec_state, pool, frame_start, encoded_size,
-          /*frame_header=*/nullptr, &decoded, *state->shared.metadata));
-    }
-    JXL_ENSURE(encoded_size == 0);
-    state->shared.reference_frames[idx] =
-        std::move(dec_state.shared_storage.reference_frames[idx]);
-  } else {
-    *state->shared.reference_frames[idx].frame = std::move(ib);
-  }
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_patch_dictionary.h b/third_party/jpeg-xl/lib/jxl/enc_patch_dictionary.h
deleted file mode 100644
index 2afb6959bc7db..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_patch_dictionary.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_PATCH_DICTIONARY_H_
-#define LIB_JXL_ENC_PATCH_DICTIONARY_H_
-
-// Chooses reference patches, and avoids encoding them once per occurrence.
-
-#include <jxl/cms_interface.h>
-#include <sys/types.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_patch_dictionary.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/enc_cache.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/image.h"
-
-namespace jxl {
-
-struct AuxOut;
-enum class LayerType : uint8_t;
-
-constexpr size_t kMaxPatchSize = 32;
-
-struct QuantizedPatch {
-  size_t xsize;
-  size_t ysize;
-  QuantizedPatch() {
-    for (size_t i = 0; i < 3; i++) {
-      pixels[i].resize(kMaxPatchSize * kMaxPatchSize);
-      fpixels[i].resize(kMaxPatchSize * kMaxPatchSize);
-    }
-  }
-  std::vector<int8_t> pixels[3] = {};
-  // Not compared. Used only to retrieve original pixels to construct the
-  // reference image.
-  std::vector<float> fpixels[3] = {};
-  bool operator==(const QuantizedPatch& other) const {
-    if (xsize != other.xsize) return false;
-    if (ysize != other.ysize) return false;
-    for (size_t c = 0; c < 3; c++) {
-      if (memcmp(pixels[c].data(), other.pixels[c].data(),
-                 sizeof(int8_t) * xsize * ysize) != 0)
-        return false;
-    }
-    return true;
-  }
-
-  bool operator<(const QuantizedPatch& other) const {
-    if (xsize != other.xsize) return xsize < other.xsize;
-    if (ysize != other.ysize) return ysize < other.ysize;
-    for (size_t c = 0; c < 3; c++) {
-      int cmp = memcmp(pixels[c].data(), other.pixels[c].data(),
-                       sizeof(int8_t) * xsize * ysize);
-      if (cmp > 0) return false;
-      if (cmp < 0) return true;
-    }
-    return false;
-  }
-};
-
-// Pair (patch, vector of occurrences).
-using PatchInfo =
-    std::pair<QuantizedPatch, std::vector<std::pair<uint32_t, uint32_t>>>;
-
-// Friend class of PatchDictionary.
-class PatchDictionaryEncoder {
- public:
-  // Only call if HasAny().
-  static Status Encode(const PatchDictionary& pdic, BitWriter* writer,
-                       LayerType layer, AuxOut* aux_out);
-
-  static void SetPositions(PatchDictionary* pdic,
-                           std::vector<PatchPosition> positions,
-                           std::vector<PatchReferencePosition> ref_positions,
-                           std::vector<PatchBlending> blendings,
-                           size_t blendings_stride) {
-    pdic->positions_ = std::move(positions);
-    pdic->ref_positions_ = std::move(ref_positions);
-    pdic->blendings_ = std::move(blendings);
-    pdic->blendings_stride_ = blendings_stride;
-    pdic->ComputePatchTree();
-  }
-
-  static Status SubtractFrom(const PatchDictionary& pdic, Image3F* opsin);
-};
-
-Status FindBestPatchDictionary(const Image3F& opsin,
-                               PassesEncoderState* JXL_RESTRICT state,
-                               const JxlCmsInterface& cms, ThreadPool* pool,
-                               AuxOut* aux_out, bool is_xyb = true);
-
-Status RoundtripPatchFrame(Image3F* reference_frame,
-                           PassesEncoderState* JXL_RESTRICT state, int idx,
-                           CompressParams& cparams, const JxlCmsInterface& cms,
-                           ThreadPool* pool, AuxOut* aux_out, bool subtract);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_PATCH_DICTIONARY_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_photon_noise.cc b/third_party/jpeg-xl/lib/jxl/enc_photon_noise.cc
deleted file mode 100644
index 1933435753b9c..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_photon_noise.cc
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_photon_noise.h"
-
-#include <algorithm>
-
-#include "lib/jxl/cms/opsin_params.h"
-
-namespace jxl {
-
-namespace {
-
-// Assumes a daylight-like spectrum.
-// https://www.strollswithmydog.com/effective-quantum-efficiency-of-sensor/#:~:text=11%2C260%20photons/um%5E2/lx-s
-constexpr float kPhotonsPerLxSPerUm2 = 11260;
-
-// Order of magnitude for cameras in the 2010-2020 decade, taking the CFA into
-// account.
-constexpr float kEffectiveQuantumEfficiency = 0.20;
-
-// TODO(sboukortt): reevaluate whether these are good defaults, notably whether
-// it would be worth making read noise higher at lower ISO settings.
-constexpr float kPhotoResponseNonUniformity = 0.005;
-constexpr float kInputReferredReadNoise = 3;
-
-// Assumes a 35mm sensor.
-constexpr float kSensorAreaUm2 = 36000.f * 24000;
-
-template <typename T>
-inline constexpr T Square(const T x) {
-  return x * x;
-}
-template <typename T>
-inline constexpr T Cube(const T x) {
-  return x * x * x;
-}
-
-}  // namespace
-
-NoiseParams SimulatePhotonNoise(const size_t xsize, const size_t ysize,
-                                const float iso) {
-  const float kOpsinAbsorbanceBiasCbrt =
-      std::cbrt(jxl::cms::kOpsinAbsorbanceBias[1]);
-
-  // Focal plane exposure for 18% of kDefaultIntensityTarget, in lx·s.
-  // (ISO = 10 lx·s ÷ H)
-  const float h_18 = 10 / iso;
-
-  const float pixel_area_um2 = kSensorAreaUm2 / (xsize * ysize);
-
-  const float electrons_per_pixel_18 = kEffectiveQuantumEfficiency *
-                                       kPhotonsPerLxSPerUm2 * h_18 *
-                                       pixel_area_um2;
-
-  NoiseParams params;
-
-  for (size_t i = 0; i < NoiseParams::kNumNoisePoints; ++i) {
-    const float scaled_index = i / (NoiseParams::kNumNoisePoints - 2.f);
-    // scaled_index is used for XYB = (0, 2·scaled_index, 2·scaled_index)
-    const float y = 2 * scaled_index;
-    // 1 = default intensity target
-    const float linear = std::max(0.f, Cube(y - kOpsinAbsorbanceBiasCbrt) +
-                                           jxl::cms::kOpsinAbsorbanceBias[1]);
-    const float electrons_per_pixel = electrons_per_pixel_18 * (linear / 0.18f);
-    // Quadrature sum of read noise, photon shot noise (sqrt(S) so simply not
-    // squared here) and photo response non-uniformity.
-    // https://doi.org/10.1117/3.725073
-    // Units are electrons rms.
-    const float noise =
-        std::sqrt(Square(kInputReferredReadNoise) + electrons_per_pixel +
-                  Square(kPhotoResponseNonUniformity * electrons_per_pixel));
-    const float linear_noise = noise * (0.18f / electrons_per_pixel_18);
-    const float opsin_derivative =
-        (1.f / 3) /
-        Square(std::cbrt(linear - jxl::cms::kOpsinAbsorbanceBias[1]));
-    const float opsin_noise = linear_noise * opsin_derivative;
-
-    // TODO(sboukortt): verify more thoroughly whether the denominator is
-    // correct.
-    params.lut[i] =
-        Clamp1(opsin_noise /
-                   (0.22f             // norm_const
-                    * std::sqrt(2.f)  // red_noise + green_noise
-                    * 1.13f  // standard deviation of a plane of generated noise
-                    ),
-               0.f, 1.f);
-  }
-
-  return params;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_photon_noise.h b/third_party/jpeg-xl/lib/jxl/enc_photon_noise.h
deleted file mode 100644
index d3c6d843afee6..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_photon_noise.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_PHOTON_NOISE_H_
-#define LIB_JXL_ENC_PHOTON_NOISE_H_
-
-#include <cstddef>
-
-#include "lib/jxl/noise.h"
-
-namespace jxl {
-
-// Constructs a NoiseParams representing the noise that would be seen at the
-// selected nominal exposure on a last-decade (as of 2021) color camera with a
-// 36×24mm sensor (“35mm format”).
-NoiseParams SimulatePhotonNoise(size_t xsize, size_t ysize, float iso);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_PHOTON_NOISE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_photon_noise_test.cc b/third_party/jpeg-xl/lib/jxl/enc_photon_noise_test.cc
deleted file mode 100644
index db172fb699617..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_photon_noise_test.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_photon_noise.h"
-
-#include "lib/jxl/noise.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-TEST(EncPhotonNoiseTest, LUTs) {
-  const double kTolerance = 1e-6;
-  EXPECT_ARRAY_NEAR(
-      SimulatePhotonNoise(/*xsize=*/6000, /*ysize=*/4000, /*iso=*/100).lut,
-      (NoiseParams::Lut{0.00259652, 0.0139648, 0.00681551, 0.00632582,
-                        0.00694917, 0.00803922, 0.00934574, 0.0107607}),
-      kTolerance);
-  EXPECT_ARRAY_NEAR(
-      SimulatePhotonNoise(/*xsize=*/6000, /*ysize=*/4000, /*iso=*/800).lut,
-      (NoiseParams::Lut{0.02077220, 0.0420923, 0.01820690, 0.01439020,
-                        0.01293670, 0.01254030, 0.01277390, 0.0134161}),
-      kTolerance);
-  EXPECT_ARRAY_NEAR(
-      SimulatePhotonNoise(/*xsize=*/6000, /*ysize=*/4000, /*iso=*/6400).lut,
-      (NoiseParams::Lut{0.1661770, 0.1691120, 0.05309080, 0.03963960,
-                        0.03357410, 0.03001650, 0.02776740, 0.0263478}),
-      kTolerance);
-
-  // Lower when measured on a per-pixel basis as there are fewer of them.
-  EXPECT_ARRAY_NEAR(
-      SimulatePhotonNoise(/*xsize=*/4000, /*ysize=*/3000, /*iso=*/6400).lut,
-      (NoiseParams::Lut{0.0830886, 0.1008720, 0.0367748, 0.0280305, 0.0240236,
-                        0.0218040, 0.0205771, 0.0200058}),
-      kTolerance);
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_progressive_split.cc b/third_party/jpeg-xl/lib/jxl/enc_progressive_split.cc
deleted file mode 100644
index 811c9455c213b..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_progressive_split.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_progressive_split.h"
-
-#include <string.h>
-
-#include <algorithm>
-#include <memory>
-
-#include "lib/jxl/ac_strategy.h"
-#include "lib/jxl/common.h"  // kMaxNumPasses
-#include "lib/jxl/image.h"
-
-namespace jxl {
-
-template <typename T>
-void ProgressiveSplitter::SplitACCoefficients(
-    const T* JXL_RESTRICT block, const AcStrategy& acs, size_t bx, size_t by,
-    T* JXL_RESTRICT output[kMaxNumPasses]) {
-  size_t size = acs.covered_blocks_x() * acs.covered_blocks_y() * kDCTBlockSize;
-  auto shift_right_round0 = [&](T v, int shift) {
-    T one_if_negative = static_cast<uint32_t>(v) >> 31;
-    T add = (one_if_negative << shift) - one_if_negative;
-    return (v + add) >> shift;
-  };
-  // Early quit for the simple case of only one pass.
-  if (mode_.num_passes == 1) {
-    memcpy(output[0], block, sizeof(T) * size);
-    return;
-  }
-  size_t ncoeffs_all_done_from_earlier_passes = 1;
-
-  int previous_pass_shift = 0;
-  for (size_t num_pass = 0; num_pass < mode_.num_passes; num_pass++) {  // pass
-    // Zero out output block.
-    memset(output[num_pass], 0, size * sizeof(T));
-    const int pass_shift = mode_.passes[num_pass].shift;
-    size_t frame_ncoeffs = mode_.passes[num_pass].num_coefficients;
-    size_t xsize = acs.covered_blocks_x();
-    size_t ysize = acs.covered_blocks_y();
-    CoefficientLayout(&ysize, &xsize);
-    for (size_t y = 0; y < ysize * frame_ncoeffs; y++) {    // superblk-y
-      for (size_t x = 0; x < xsize * frame_ncoeffs; x++) {  // superblk-x
-        size_t pos = y * xsize * kBlockDim + x;
-        if (x < xsize * ncoeffs_all_done_from_earlier_passes &&
-            y < ysize * ncoeffs_all_done_from_earlier_passes) {
-          // This coefficient was already included in an earlier pass,
-          // which included a genuinely smaller set of coefficients.
-          continue;
-        }
-        T v = block[pos];
-        // Previous pass discarded some bits: do not encode them again.
-        if (previous_pass_shift != 0) {
-          T previous_v = shift_right_round0(v, previous_pass_shift) *
-                         (1 << previous_pass_shift);
-          v -= previous_v;
-        }
-        output[num_pass][pos] = shift_right_round0(v, pass_shift);
-      }  // superblk-x
-    }    // superblk-y
-    // We just finished a pass.
-    // Hence, we are now guaranteed to have included all coeffs up to
-    // frame_ncoeffs in every block, unless the current pass is shifted.
-    if (mode_.passes[num_pass].shift == 0) {
-      ncoeffs_all_done_from_earlier_passes = frame_ncoeffs;
-    }
-    previous_pass_shift = mode_.passes[num_pass].shift;
-  }  // num_pass
-}
-
-template void ProgressiveSplitter::SplitACCoefficients<int32_t>(
-    const int32_t* JXL_RESTRICT, const AcStrategy&, size_t, size_t,
-    int32_t* JXL_RESTRICT[kMaxNumPasses]);
-
-template void ProgressiveSplitter::SplitACCoefficients<int16_t>(
-    const int16_t* JXL_RESTRICT, const AcStrategy&, size_t, size_t,
-    int16_t* JXL_RESTRICT[kMaxNumPasses]);
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_progressive_split.h b/third_party/jpeg-xl/lib/jxl/enc_progressive_split.h
deleted file mode 100644
index 2cd169752afcb..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_progressive_split.h
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_PROGRESSIVE_SPLIT_H_
-#define LIB_JXL_PROGRESSIVE_SPLIT_H_
-
-#include <cstddef>
-#include <cstdint>
-#include <limits>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/common.h"  // kMaxNumPasses
-#include "lib/jxl/frame_header.h"
-
-// Functions to split DCT coefficients in multiple passes. All the passes of a
-// single frame are added together.
-
-namespace jxl {
-
-class AcStrategy;
-
-constexpr size_t kNoDownsamplingFactor = std::numeric_limits<size_t>::max();
-
-struct PassDefinition {
-  // Side of the square of the coefficients that should be kept in each 8x8
-  // block. Must be greater than 1, and at most 8. Should be in non-decreasing
-  // order.
-  size_t num_coefficients;
-
-  // How much to shift the encoded values by, with rounding.
-  size_t shift;
-
-  // If specified, this indicates that if the requested downsampling factor is
-  // sufficiently high, then it is fine to stop decoding after this pass.
-  // By default, passes are not marked as being suitable for any downsampling.
-  size_t suitable_for_downsampling_of_at_least;
-};
-
-struct ProgressiveMode {
-  size_t num_passes = 1;
-  PassDefinition passes[kMaxNumPasses] = {
-      PassDefinition{/*num_coefficients=*/8, /*shift=*/0,
-                     /*suitable_for_downsampling_of_at_least=*/1}};
-
-  ProgressiveMode() = default;
-
-  template <size_t nump>
-  explicit ProgressiveMode(const PassDefinition (&p)[nump]) {
-    static_assert(nump <= kMaxNumPasses);
-    num_passes = nump;
-    PassDefinition previous_pass{
-        /*num_coefficients=*/1, /*shift=*/0,
-        /*suitable_for_downsampling_of_at_least=*/kNoDownsamplingFactor};
-    size_t last_downsampling_factor = kNoDownsamplingFactor;
-    for (size_t i = 0; i < nump; i++) {
-      JXL_DASSERT(p[i].num_coefficients > previous_pass.num_coefficients ||
-                  (p[i].num_coefficients == previous_pass.num_coefficients &&
-                   p[i].shift < previous_pass.shift));
-      JXL_DASSERT(p[i].suitable_for_downsampling_of_at_least ==
-                      kNoDownsamplingFactor ||
-                  p[i].suitable_for_downsampling_of_at_least <=
-                      last_downsampling_factor);
-      // Only used inside assert.
-      (void)last_downsampling_factor;
-      if (p[i].suitable_for_downsampling_of_at_least != kNoDownsamplingFactor) {
-        last_downsampling_factor = p[i].suitable_for_downsampling_of_at_least;
-      }
-      previous_pass = passes[i] = p[i];
-    }
-  }
-};
-
-class ProgressiveSplitter {
- public:
-  void SetProgressiveMode(ProgressiveMode mode) { mode_ = mode; }
-
-  size_t GetNumPasses() const { return mode_.num_passes; }
-
-  Status InitPasses(Passes* JXL_RESTRICT passes) const {
-    passes->num_passes = static_cast<uint32_t>(GetNumPasses());
-    passes->num_downsample = 0;
-    JXL_ENSURE(passes->num_passes != 0);
-    passes->shift[passes->num_passes - 1] = 0;
-    if (passes->num_passes == 1) return true;  // Done, arrays are empty
-
-    for (uint32_t i = 0; i < mode_.num_passes - 1; ++i) {
-      const size_t min_downsampling_factor =
-          mode_.passes[i].suitable_for_downsampling_of_at_least;
-      passes->shift[i] = mode_.passes[i].shift;
-      if (1 < min_downsampling_factor &&
-          min_downsampling_factor != kNoDownsamplingFactor) {
-        passes->downsample[passes->num_downsample] = min_downsampling_factor;
-        passes->last_pass[passes->num_downsample] = i;
-        if (mode_.passes[i + 1].suitable_for_downsampling_of_at_least <
-            min_downsampling_factor) {
-          passes->num_downsample += 1;
-        }
-      }
-    }
-    return true;
-  }
-
-  template <typename T>
-  void SplitACCoefficients(const T* JXL_RESTRICT block, const AcStrategy& acs,
-                           size_t bx, size_t by,
-                           T* JXL_RESTRICT output[kMaxNumPasses]);
-
- private:
-  ProgressiveMode mode_;
-};
-
-extern template void ProgressiveSplitter::SplitACCoefficients<int32_t>(
-    const int32_t* JXL_RESTRICT, const AcStrategy&, size_t, size_t,
-    int32_t* JXL_RESTRICT[kMaxNumPasses]);
-
-extern template void ProgressiveSplitter::SplitACCoefficients<int16_t>(
-    const int16_t* JXL_RESTRICT, const AcStrategy&, size_t, size_t,
-    int16_t* JXL_RESTRICT[kMaxNumPasses]);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_PROGRESSIVE_SPLIT_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_quant_weights.cc b/third_party/jpeg-xl/lib/jxl/enc_quant_weights.cc
deleted file mode 100644
index a74593a0e5ee9..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_quant_weights.cc
+++ /dev/null
@@ -1,224 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_quant_weights.h"
-
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-
-#include <cmath>
-#include <cstdlib>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/enc_modular.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/modular/encoding/encoding.h"
-
-namespace jxl {
-
-namespace {
-
-Status EncodeDctParams(const DctQuantWeightParams& params, BitWriter* writer) {
-  JXL_ENSURE(params.num_distance_bands >= 1);
-  writer->Write(DctQuantWeightParams::kLog2MaxDistanceBands,
-                params.num_distance_bands - 1);
-  for (size_t c = 0; c < 3; c++) {
-    for (size_t i = 0; i < params.num_distance_bands; i++) {
-      JXL_RETURN_IF_ERROR(F16Coder::Write(
-          params.distance_bands[c][i] * (i == 0 ? (1 / 64.0f) : 1.0f), writer));
-    }
-  }
-  return true;
-}
-
-Status EncodeQuant(JxlMemoryManager* memory_manager,
-                   const QuantEncoding& encoding, size_t idx, size_t size_x,
-                   size_t size_y, BitWriter* writer,
-                   ModularFrameEncoder* modular_frame_encoder) {
-  writer->Write(kLog2NumQuantModes, encoding.mode);
-  size_x *= kBlockDim;
-  size_y *= kBlockDim;
-  switch (encoding.mode) {
-    case QuantEncoding::kQuantModeLibrary: {
-      writer->Write(kCeilLog2NumPredefinedTables, encoding.predefined);
-      break;
-    }
-    case QuantEncoding::kQuantModeID: {
-      for (size_t c = 0; c < 3; c++) {
-        for (size_t i = 0; i < 3; i++) {
-          JXL_RETURN_IF_ERROR(
-              F16Coder::Write(encoding.idweights[c][i] * (1.0f / 64), writer));
-        }
-      }
-      break;
-    }
-    case QuantEncoding::kQuantModeDCT2: {
-      for (size_t c = 0; c < 3; c++) {
-        for (size_t i = 0; i < 6; i++) {
-          JXL_RETURN_IF_ERROR(F16Coder::Write(
-              encoding.dct2weights[c][i] * (1.0f / 64), writer));
-        }
-      }
-      break;
-    }
-    case QuantEncoding::kQuantModeDCT4X8: {
-      for (size_t c = 0; c < 3; c++) {
-        JXL_RETURN_IF_ERROR(
-            F16Coder::Write(encoding.dct4x8multipliers[c], writer));
-      }
-      JXL_RETURN_IF_ERROR(EncodeDctParams(encoding.dct_params, writer));
-      break;
-    }
-    case QuantEncoding::kQuantModeDCT4: {
-      for (size_t c = 0; c < 3; c++) {
-        for (size_t i = 0; i < 2; i++) {
-          JXL_RETURN_IF_ERROR(
-              F16Coder::Write(encoding.dct4multipliers[c][i], writer));
-        }
-      }
-      JXL_RETURN_IF_ERROR(EncodeDctParams(encoding.dct_params, writer));
-      break;
-    }
-    case QuantEncoding::kQuantModeDCT: {
-      JXL_RETURN_IF_ERROR(EncodeDctParams(encoding.dct_params, writer));
-      break;
-    }
-    case QuantEncoding::kQuantModeRAW: {
-      JXL_RETURN_IF_ERROR(ModularFrameEncoder::EncodeQuantTable(
-          memory_manager, size_x, size_y, writer, encoding, idx,
-          modular_frame_encoder));
-      break;
-    }
-    case QuantEncoding::kQuantModeAFV: {
-      for (size_t c = 0; c < 3; c++) {
-        for (size_t i = 0; i < 9; i++) {
-          JXL_RETURN_IF_ERROR(F16Coder::Write(
-              encoding.afv_weights[c][i] * (i < 6 ? 1.0f / 64 : 1.0f), writer));
-        }
-      }
-      JXL_RETURN_IF_ERROR(EncodeDctParams(encoding.dct_params, writer));
-      JXL_RETURN_IF_ERROR(EncodeDctParams(encoding.dct_params_afv_4x4, writer));
-      break;
-    }
-  }
-  return true;
-}
-
-}  // namespace
-
-Status DequantMatricesEncode(JxlMemoryManager* memory_manager,
-                             const DequantMatrices& matrices, BitWriter* writer,
-                             LayerType layer, AuxOut* aux_out,
-                             ModularFrameEncoder* modular_frame_encoder) {
-  bool all_default = true;
-  const std::vector<QuantEncoding>& encodings = matrices.encodings();
-
-  for (const auto& encoding : encodings) {
-    if (encoding.mode != QuantEncoding::kQuantModeLibrary ||
-        encoding.predefined != 0) {
-      all_default = false;
-    }
-  }
-  // TODO(janwas): better bound
-  return writer->WithMaxBits(512 * 1024, layer, aux_out, [&]() -> Status {
-    writer->Write(1, TO_JXL_BOOL(all_default));
-    if (!all_default) {
-      for (size_t i = 0; i < encodings.size(); i++) {
-        JXL_RETURN_IF_ERROR(EncodeQuant(memory_manager, encodings[i], i,
-                                        DequantMatrices::required_size_x[i],
-                                        DequantMatrices::required_size_y[i],
-                                        writer, modular_frame_encoder));
-      }
-    }
-    return true;
-  });
-}
-
-Status DequantMatricesEncodeDC(const DequantMatrices& matrices,
-                               BitWriter* writer, LayerType layer,
-                               AuxOut* aux_out) {
-  bool all_default = true;
-  const float* dc_quant = matrices.DCQuants();
-  for (size_t c = 0; c < 3; c++) {
-    if (dc_quant[c] != kDCQuant[c]) {
-      all_default = false;
-    }
-  }
-  return writer->WithMaxBits(
-      1 + sizeof(float) * kBitsPerByte * 3, layer, aux_out, [&]() -> Status {
-        writer->Write(1, TO_JXL_BOOL(all_default));
-        if (!all_default) {
-          for (size_t c = 0; c < 3; c++) {
-            JXL_RETURN_IF_ERROR(F16Coder::Write(dc_quant[c] * 128.0f, writer));
-          }
-        }
-        return true;
-      });
-}
-
-Status DequantMatricesSetCustomDC(JxlMemoryManager* memory_manager,
-                                  DequantMatrices* matrices, const float* dc) {
-  matrices->SetDCQuant(dc);
-  // Roundtrip encode/decode DC to ensure same values as decoder.
-  BitWriter writer{memory_manager};
-  // TODO(eustas): should it be LayerType::Quant?
-  JXL_RETURN_IF_ERROR(
-      DequantMatricesEncodeDC(*matrices, &writer, LayerType::Header, nullptr));
-  writer.ZeroPadToByte();
-  BitReader br(writer.GetSpan());
-  // Called only in the encoder: should fail only for programmer errors.
-  JXL_RETURN_IF_ERROR(matrices->DecodeDC(&br));
-  JXL_RETURN_IF_ERROR(br.Close());
-  return true;
-}
-
-Status DequantMatricesScaleDC(JxlMemoryManager* memory_manager,
-                              DequantMatrices* matrices, const float scale) {
-  float dc[3];
-  for (size_t c = 0; c < 3; ++c) {
-    dc[c] = matrices->InvDCQuant(c) * (1.0f / scale);
-  }
-  JXL_RETURN_IF_ERROR(DequantMatricesSetCustomDC(memory_manager, matrices, dc));
-  return true;
-}
-
-Status DequantMatricesRoundtrip(JxlMemoryManager* memory_manager,
-                                DequantMatrices* matrices) {
-  // Do not pass modular en/decoder, as they only change entropy and not
-  // values.
-  BitWriter writer{memory_manager};
-  // TODO(eustas): should it be LayerType::Quant?
-  JXL_RETURN_IF_ERROR(DequantMatricesEncode(memory_manager, *matrices, &writer,
-                                            LayerType::Header, nullptr));
-  writer.ZeroPadToByte();
-  BitReader br(writer.GetSpan());
-  // Called only in the encoder: should fail only for programmer errors.
-  JXL_RETURN_IF_ERROR(matrices->Decode(memory_manager, &br));
-  JXL_RETURN_IF_ERROR(br.Close());
-  return true;
-}
-
-Status DequantMatricesSetCustom(DequantMatrices* matrices,
-                                const std::vector<QuantEncoding>& encodings,
-                                ModularFrameEncoder* encoder) {
-  JXL_ENSURE(encoder != nullptr);
-  JXL_ENSURE(encodings.size() == kNumQuantTables);
-  JxlMemoryManager* memory_manager = encoder->memory_manager();
-  matrices->SetEncodings(encodings);
-  for (size_t i = 0; i < encodings.size(); i++) {
-    if (encodings[i].mode == QuantEncodingInternal::kQuantModeRAW) {
-      JXL_RETURN_IF_ERROR(encoder->AddQuantTable(
-          DequantMatrices::required_size_x[i] * kBlockDim,
-          DequantMatrices::required_size_y[i] * kBlockDim, encodings[i], i));
-    }
-  }
-  JXL_RETURN_IF_ERROR(DequantMatricesRoundtrip(memory_manager, matrices));
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_quant_weights.h b/third_party/jpeg-xl/lib/jxl/enc_quant_weights.h
deleted file mode 100644
index fac3cde2d8861..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_quant_weights.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_QUANT_WEIGHTS_H_
-#define LIB_JXL_ENC_QUANT_WEIGHTS_H_
-
-#include <jxl/memory_manager.h>
-
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/quant_weights.h"
-
-namespace jxl {
-
-struct AuxOut;
-enum class LayerType : uint8_t;
-struct BitWriter;
-
-Status DequantMatricesEncode(
-    JxlMemoryManager* memory_manager, const DequantMatrices& matrices,
-    BitWriter* writer, LayerType layer, AuxOut* aux_out,
-    ModularFrameEncoder* modular_frame_encoder = nullptr);
-Status DequantMatricesEncodeDC(const DequantMatrices& matrices,
-                               BitWriter* writer, LayerType layer,
-                               AuxOut* aux_out);
-// For consistency with QuantEncoding, higher values correspond to more
-// precision.
-Status DequantMatricesSetCustomDC(JxlMemoryManager* memory_manager,
-                                  DequantMatrices* matrices, const float* dc);
-
-Status DequantMatricesScaleDC(JxlMemoryManager* memory_manager,
-                              DequantMatrices* matrices, float scale);
-
-Status DequantMatricesSetCustom(DequantMatrices* matrices,
-                                const std::vector<QuantEncoding>& encodings,
-                                ModularFrameEncoder* encoder);
-
-// Roundtrip encode/decode the matrices to ensure same values as decoder.
-Status DequantMatricesRoundtrip(JxlMemoryManager* memory_manager,
-                                DequantMatrices* matrices);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_QUANT_WEIGHTS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_splines.cc b/third_party/jpeg-xl/lib/jxl/enc_splines.cc
deleted file mode 100644
index b354d8bbb62f3..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_splines.cc
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_ans.h"
-#include "lib/jxl/pack_signed.h"
-#include "lib/jxl/splines.h"
-
-namespace jxl {
-
-struct AuxOut;
-enum class LayerType : uint8_t;
-
-class QuantizedSplineEncoder {
- public:
-  // Only call if HasAny().
-  static void Tokenize(const QuantizedSpline& spline,
-                       std::vector<Token>* const tokens) {
-    tokens->emplace_back(kNumControlPointsContext,
-                         spline.control_points_.size());
-    for (const auto& point : spline.control_points_) {
-      tokens->emplace_back(kControlPointsContext, PackSigned(point.first));
-      tokens->emplace_back(kControlPointsContext, PackSigned(point.second));
-    }
-    const auto encode_dct = [tokens](const int dct[32]) {
-      for (int i = 0; i < 32; ++i) {
-        tokens->emplace_back(kDCTContext, PackSigned(dct[i]));
-      }
-    };
-    for (const auto& dct : spline.color_dct_) {
-      encode_dct(dct);
-    }
-    encode_dct(spline.sigma_dct_);
-  }
-};
-
-namespace {
-
-void EncodeAllStartingPoints(const std::vector<Spline::Point>& points,
-                             std::vector<Token>* tokens) {
-  int64_t last_x = 0;
-  int64_t last_y = 0;
-  for (size_t i = 0; i < points.size(); i++) {
-    const int64_t x = lroundf(points[i].x);
-    const int64_t y = lroundf(points[i].y);
-    if (i == 0) {
-      tokens->emplace_back(kStartingPositionContext, x);
-      tokens->emplace_back(kStartingPositionContext, y);
-    } else {
-      tokens->emplace_back(kStartingPositionContext, PackSigned(x - last_x));
-      tokens->emplace_back(kStartingPositionContext, PackSigned(y - last_y));
-    }
-    last_x = x;
-    last_y = y;
-  }
-}
-
-}  // namespace
-
-Status EncodeSplines(const Splines& splines, BitWriter* writer,
-                     const LayerType layer,
-                     const HistogramParams& histogram_params, AuxOut* aux_out) {
-  JXL_ENSURE(splines.HasAny());
-
-  const std::vector<QuantizedSpline>& quantized_splines =
-      splines.QuantizedSplines();
-  std::vector<std::vector<Token>> tokens(1);
-  tokens[0].emplace_back(kNumSplinesContext, quantized_splines.size() - 1);
-  EncodeAllStartingPoints(splines.StartingPoints(), tokens.data());
-
-  tokens[0].emplace_back(kQuantizationAdjustmentContext,
-                         PackSigned(splines.GetQuantizationAdjustment()));
-
-  for (const QuantizedSpline& spline : quantized_splines) {
-    QuantizedSplineEncoder::Tokenize(spline, tokens.data());
-  }
-
-  EntropyEncodingData codes;
-  std::vector<uint8_t> context_map;
-  JXL_ASSIGN_OR_RETURN(
-      size_t cost,
-      BuildAndEncodeHistograms(writer->memory_manager(), histogram_params,
-                               kNumSplineContexts, tokens, &codes, &context_map,
-                               writer, layer, aux_out));
-  (void)cost;
-  JXL_RETURN_IF_ERROR(
-      WriteTokens(tokens[0], codes, context_map, 0, writer, layer, aux_out));
-  return true;
-}
-
-Splines FindSplines(const Image3F& opsin) {
-  // TODO(user): implement spline detection.
-  return {};
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_splines.h b/third_party/jpeg-xl/lib/jxl/enc_splines.h
deleted file mode 100644
index f4aa4ae53dfe5..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_splines.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_SPLINES_H_
-#define LIB_JXL_ENC_SPLINES_H_
-
-#include <cstdint>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_ans_params.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/splines.h"
-
-namespace jxl {
-
-struct AuxOut;
-enum class LayerType : uint8_t;
-
-// Only call if splines.HasAny().
-Status EncodeSplines(const Splines& splines, BitWriter* writer, LayerType layer,
-                     const HistogramParams& histogram_params, AuxOut* aux_out);
-
-Splines FindSplines(const Image3F& opsin);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_SPLINES_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_toc.cc b/third_party/jpeg-xl/lib/jxl/enc_toc.cc
deleted file mode 100644
index d0237a01f3668..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_toc.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_toc.h"
-
-#include <memory>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_coeff_order.h"
-#include "lib/jxl/field_encodings.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/toc.h"
-
-namespace jxl {
-Status WriteGroupOffsets(
-    const std::vector<std::unique_ptr<BitWriter>>& group_codes,
-    const std::vector<coeff_order_t>& permutation,
-    BitWriter* JXL_RESTRICT writer, AuxOut* aux_out) {
-  return writer->WithMaxBits(
-      MaxBits(group_codes.size()), LayerType::Toc, aux_out, [&]() -> Status {
-        if (!permutation.empty() && !group_codes.empty()) {
-          // Don't write a permutation at all for an empty group_codes.
-          writer->Write(1, 1);  // permutation
-          JXL_ENSURE(permutation.size() == group_codes.size());
-          JXL_RETURN_IF_ERROR(EncodePermutation(permutation.data(), /*skip=*/0,
-                                                permutation.size(), writer,
-                                                LayerType::Header, aux_out));
-
-        } else {
-          writer->Write(1, 0);  // no permutation
-        }
-        writer->ZeroPadToByte();  // before TOC entries
-
-        for (const auto& bw : group_codes) {
-          JXL_ENSURE(bw->BitsWritten() % kBitsPerByte == 0);
-          const size_t group_size = bw->BitsWritten() / kBitsPerByte;
-          JXL_RETURN_IF_ERROR(U32Coder::Write(kTocDist, group_size, writer));
-        }
-        writer->ZeroPadToByte();  // before first group
-        return true;
-      });
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_toc.h b/third_party/jpeg-xl/lib/jxl/enc_toc.h
deleted file mode 100644
index 574439c6ced0f..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_toc.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_TOC_H_
-#define LIB_JXL_ENC_TOC_H_
-
-#include <memory>
-#include <vector>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/coeff_order_fwd.h"
-#include "lib/jxl/enc_bit_writer.h"
-
-namespace jxl {
-
-struct AuxOut;
-
-// Writes the group offsets. If the permutation vector is empty, the identity
-// permutation will be used.
-Status WriteGroupOffsets(
-    const std::vector<std::unique_ptr<BitWriter>>& group_codes,
-    const std::vector<coeff_order_t>& permutation,
-    BitWriter* JXL_RESTRICT writer, AuxOut* aux_out);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_TOC_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_transforms-inl.h b/third_party/jpeg-xl/lib/jxl/enc_transforms-inl.h
deleted file mode 100644
index cadd83b6de533..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_transforms-inl.h
+++ /dev/null
@@ -1,799 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#if defined(LIB_JXL_ENC_TRANSFORMS_INL_H_) == defined(HWY_TARGET_TOGGLE)
-#ifdef LIB_JXL_ENC_TRANSFORMS_INL_H_
-#undef LIB_JXL_ENC_TRANSFORMS_INL_H_
-#else
-#define LIB_JXL_ENC_TRANSFORMS_INL_H_
-#endif
-
-#include <cstddef>
-#include <cstdint>
-#include <hwy/highway.h>
-
-#include "lib/jxl/ac_strategy.h"
-#include "lib/jxl/dct-inl.h"
-#include "lib/jxl/dct_scales.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-
-enum class AcStrategyType : uint32_t;
-
-namespace HWY_NAMESPACE {
-namespace {
-
-// Inverse of ReinterpretingDCT.
-template <size_t DCT_ROWS, size_t DCT_COLS, size_t LF_ROWS, size_t LF_COLS,
-          size_t ROWS, size_t COLS>
-HWY_INLINE void ReinterpretingIDCT(const float* input,
-                                   const size_t input_stride, float* output,
-                                   const size_t output_stride) {
-  HWY_ALIGN float block[ROWS * COLS] = {};
-  if (ROWS < COLS) {
-    for (size_t y = 0; y < LF_ROWS; y++) {
-      for (size_t x = 0; x < LF_COLS; x++) {
-        block[y * COLS + x] = input[y * input_stride + x] *
-                              DCTTotalResampleScale<DCT_ROWS, ROWS>(y) *
-                              DCTTotalResampleScale<DCT_COLS, COLS>(x);
-      }
-    }
-  } else {
-    for (size_t y = 0; y < LF_COLS; y++) {
-      for (size_t x = 0; x < LF_ROWS; x++) {
-        block[y * ROWS + x] = input[y * input_stride + x] *
-                              DCTTotalResampleScale<DCT_COLS, COLS>(y) *
-                              DCTTotalResampleScale<DCT_ROWS, ROWS>(x);
-      }
-    }
-  }
-
-  // ROWS, COLS <= 8, so we can put scratch space on the stack.
-  HWY_ALIGN float scratch_space[ROWS * COLS * 3];
-  ComputeScaledIDCT<ROWS, COLS>()(block, DCTTo(output, output_stride),
-                                  scratch_space);
-}
-
-template <size_t S>
-void DCT2TopBlock(const float* block, size_t stride, float* out) {
-  static_assert(kBlockDim % S == 0, "S should be a divisor of kBlockDim");
-  static_assert(S % 2 == 0, "S should be even");
-  float temp[kDCTBlockSize];
-  constexpr size_t num_2x2 = S / 2;
-  for (size_t y = 0; y < num_2x2; y++) {
-    for (size_t x = 0; x < num_2x2; x++) {
-      float c00 = block[y * 2 * stride + x * 2];
-      float c01 = block[y * 2 * stride + x * 2 + 1];
-      float c10 = block[(y * 2 + 1) * stride + x * 2];
-      float c11 = block[(y * 2 + 1) * stride + x * 2 + 1];
-      float r00 = c00 + c01 + c10 + c11;
-      float r01 = c00 + c01 - c10 - c11;
-      float r10 = c00 - c01 + c10 - c11;
-      float r11 = c00 - c01 - c10 + c11;
-      r00 *= 0.25f;
-      r01 *= 0.25f;
-      r10 *= 0.25f;
-      r11 *= 0.25f;
-      temp[y * kBlockDim + x] = r00;
-      temp[y * kBlockDim + num_2x2 + x] = r01;
-      temp[(y + num_2x2) * kBlockDim + x] = r10;
-      temp[(y + num_2x2) * kBlockDim + num_2x2 + x] = r11;
-    }
-  }
-  for (size_t y = 0; y < S; y++) {
-    for (size_t x = 0; x < S; x++) {
-      out[y * kBlockDim + x] = temp[y * kBlockDim + x];
-    }
-  }
-}
-
-void AFVDCT4x4(const float* JXL_RESTRICT pixels, float* JXL_RESTRICT coeffs) {
-  HWY_ALIGN static constexpr float k4x4AFVBasisTranspose[16][16] = {
-      {
-          0.2500000000000000,
-          0.8769029297991420f,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          -0.4105377591765233f,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-      },
-      {
-          0.2500000000000000,
-          0.2206518106944235f,
-          0.0000000000000000,
-          0.0000000000000000,
-          -0.7071067811865474f,
-          0.6235485373547691f,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-      },
-      {
-          0.2500000000000000,
-          -0.1014005039375376f,
-          0.4067007583026075f,
-          -0.2125574805828875f,
-          0.0000000000000000,
-          -0.0643507165794627f,
-          -0.4517556589999482f,
-          -0.3046847507248690f,
-          0.3017929516615495f,
-          0.4082482904638627f,
-          0.1747866975480809f,
-          -0.2110560104933578f,
-          -0.1426608480880726f,
-          -0.1381354035075859f,
-          -0.1743760259965107f,
-          0.1135498731499434f,
-      },
-      {
-          0.2500000000000000,
-          -0.1014005039375375f,
-          0.4444481661973445f,
-          0.3085497062849767f,
-          0.0000000000000000f,
-          -0.0643507165794627f,
-          0.1585450355184006f,
-          0.5112616136591823f,
-          0.2579236279634118f,
-          0.0000000000000000,
-          0.0812611176717539f,
-          0.1856718091610980f,
-          -0.3416446842253372f,
-          0.3302282550303788f,
-          0.0702790691196284f,
-          -0.0741750459581035f,
-      },
-      {
-          0.2500000000000000,
-          0.2206518106944236f,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.7071067811865476f,
-          0.6235485373547694f,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-      },
-      {
-          0.2500000000000000,
-          -0.1014005039375378f,
-          0.0000000000000000,
-          0.4706702258572536f,
-          0.0000000000000000,
-          -0.0643507165794628f,
-          -0.0403851516082220f,
-          0.0000000000000000,
-          0.1627234014286620f,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.7367497537172237f,
-          0.0875511500058708f,
-          -0.2921026642334881f,
-          0.1940289303259434f,
-      },
-      {
-          0.2500000000000000,
-          -0.1014005039375377f,
-          0.1957439937204294f,
-          -0.1621205195722993f,
-          0.0000000000000000,
-          -0.0643507165794628f,
-          0.0074182263792424f,
-          -0.2904801297289980f,
-          0.0952002265347504f,
-          0.0000000000000000,
-          -0.3675398009862027f,
-          0.4921585901373873f,
-          0.2462710772207515f,
-          -0.0794670660590957f,
-          0.3623817333531167f,
-          -0.4351904965232280f,
-      },
-      {
-          0.2500000000000000,
-          -0.1014005039375376f,
-          0.2929100136981264f,
-          0.0000000000000000,
-          0.0000000000000000,
-          -0.0643507165794627f,
-          0.3935103426921017f,
-          -0.0657870154914280f,
-          0.0000000000000000,
-          -0.4082482904638628f,
-          -0.3078822139579090f,
-          -0.3852501370925192f,
-          -0.0857401903551931f,
-          -0.4613374887461511f,
-          0.0000000000000000,
-          0.2191868483885747f,
-      },
-      {
-          0.2500000000000000,
-          -0.1014005039375376f,
-          -0.4067007583026072f,
-          -0.2125574805828705f,
-          0.0000000000000000,
-          -0.0643507165794627f,
-          -0.4517556589999464f,
-          0.3046847507248840f,
-          0.3017929516615503f,
-          -0.4082482904638635f,
-          -0.1747866975480813f,
-          0.2110560104933581f,
-          -0.1426608480880734f,
-          -0.1381354035075829f,
-          -0.1743760259965108f,
-          0.1135498731499426f,
-      },
-      {
-          0.2500000000000000,
-          -0.1014005039375377f,
-          -0.1957439937204287f,
-          -0.1621205195722833f,
-          0.0000000000000000,
-          -0.0643507165794628f,
-          0.0074182263792444f,
-          0.2904801297290076f,
-          0.0952002265347505f,
-          0.0000000000000000,
-          0.3675398009862011f,
-          -0.4921585901373891f,
-          0.2462710772207514f,
-          -0.0794670660591026f,
-          0.3623817333531165f,
-          -0.4351904965232251f,
-      },
-      {
-          0.2500000000000000,
-          -0.1014005039375375f,
-          0.0000000000000000,
-          -0.4706702258572528f,
-          0.0000000000000000,
-          -0.0643507165794627f,
-          0.1107416575309343f,
-          0.0000000000000000,
-          -0.1627234014286617f,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.1488339922711357f,
-          0.4972464710953509f,
-          0.2921026642334879f,
-          0.5550443808910661f,
-      },
-      {
-          0.2500000000000000,
-          -0.1014005039375377f,
-          0.1137907446044809f,
-          -0.1464291867126764f,
-          0.0000000000000000,
-          -0.0643507165794628f,
-          0.0829816309488205f,
-          -0.2388977352334460f,
-          -0.3531238544981630f,
-          -0.4082482904638630f,
-          0.4826689115059883f,
-          0.1741941265991622f,
-          -0.0476868035022925f,
-          0.1253805944856366f,
-          -0.4326608024727445f,
-          -0.2546827712406646f,
-      },
-      {
-          0.2500000000000000,
-          -0.1014005039375377f,
-          -0.4444481661973438f,
-          0.3085497062849487f,
-          0.0000000000000000,
-          -0.0643507165794628f,
-          0.1585450355183970f,
-          -0.5112616136592012f,
-          0.2579236279634129f,
-          0.0000000000000000,
-          -0.0812611176717504f,
-          -0.1856718091610990f,
-          -0.3416446842253373f,
-          0.3302282550303805f,
-          0.0702790691196282f,
-          -0.0741750459581023f,
-      },
-      {
-          0.2500000000000000,
-          -0.1014005039375376f,
-          -0.2929100136981264f,
-          0.0000000000000000,
-          0.0000000000000000,
-          -0.0643507165794627f,
-          0.3935103426921022f,
-          0.0657870154914254f,
-          0.0000000000000000,
-          0.4082482904638634f,
-          0.3078822139579031f,
-          0.3852501370925211f,
-          -0.0857401903551927f,
-          -0.4613374887461554f,
-          0.0000000000000000,
-          0.2191868483885728f,
-      },
-      {
-          0.2500000000000000,
-          -0.1014005039375376f,
-          -0.1137907446044814f,
-          -0.1464291867126654f,
-          0.0000000000000000,
-          -0.0643507165794627f,
-          0.0829816309488214f,
-          0.2388977352334547f,
-          -0.3531238544981624f,
-          0.4082482904638630f,
-          -0.4826689115059858f,
-          -0.1741941265991621f,
-          -0.0476868035022928f,
-          0.1253805944856431f,
-          -0.4326608024727457f,
-          -0.2546827712406641f,
-      },
-      {
-          0.2500000000000000,
-          -0.1014005039375374f,
-          0.0000000000000000,
-          0.4251149611657548f,
-          0.0000000000000000,
-          -0.0643507165794626f,
-          -0.4517556589999480f,
-          0.0000000000000000,
-          -0.6035859033230976f,
-          0.0000000000000000,
-          0.0000000000000000,
-          0.0000000000000000,
-          -0.1426608480880724f,
-          -0.1381354035075845f,
-          0.3487520519930227f,
-          0.1135498731499429f,
-      },
-  };
-
-  const HWY_CAPPED(float, 16) d;
-  for (size_t i = 0; i < 16; i += Lanes(d)) {
-    auto scalar = Zero(d);
-    for (size_t j = 0; j < 16; j++) {
-      auto px = Set(d, pixels[j]);
-      auto basis = Load(d, k4x4AFVBasisTranspose[j] + i);
-      scalar = MulAdd(px, basis, scalar);
-    }
-    Store(scalar, d, coeffs + i);
-  }
-}
-
-// Coefficient layout:
-//  - (even, even) positions hold AFV coefficients
-//  - (odd, even) positions hold DCT4x4 coefficients
-//  - (any, odd) positions hold DCT4x8 coefficients
-template <size_t afv_kind>
-void AFVTransformFromPixels(const float* JXL_RESTRICT pixels,
-                            size_t pixels_stride,
-                            float* JXL_RESTRICT coefficients) {
-  HWY_ALIGN float scratch_space[4 * 8 * 5];
-  size_t afv_x = afv_kind & 1;
-  size_t afv_y = afv_kind / 2;
-  HWY_ALIGN float block[4 * 8] = {};
-  for (size_t iy = 0; iy < 4; iy++) {
-    for (size_t ix = 0; ix < 4; ix++) {
-      block[(afv_y == 1 ? 3 - iy : iy) * 4 + (afv_x == 1 ? 3 - ix : ix)] =
-          pixels[(iy + 4 * afv_y) * pixels_stride + ix + 4 * afv_x];
-    }
-  }
-  // AFV coefficients in (even, even) positions.
-  HWY_ALIGN float coeff[4 * 4];
-  AFVDCT4x4(block, coeff);
-  for (size_t iy = 0; iy < 4; iy++) {
-    for (size_t ix = 0; ix < 4; ix++) {
-      coefficients[iy * 2 * 8 + ix * 2] = coeff[iy * 4 + ix];
-    }
-  }
-  // 4x4 DCT of the block with same y and different x.
-  ComputeScaledDCT<4, 4>()(
-      DCTFrom(pixels + afv_y * 4 * pixels_stride + (afv_x == 1 ? 0 : 4),
-              pixels_stride),
-      block, scratch_space);
-  // ... in (odd, even) positions.
-  for (size_t iy = 0; iy < 4; iy++) {
-    for (size_t ix = 0; ix < 8; ix++) {
-      coefficients[iy * 2 * 8 + ix * 2 + 1] = block[iy * 4 + ix];
-    }
-  }
-  // 4x8 DCT of the other half of the block.
-  ComputeScaledDCT<4, 8>()(
-      DCTFrom(pixels + (afv_y == 1 ? 0 : 4) * pixels_stride, pixels_stride),
-      block, scratch_space);
-  for (size_t iy = 0; iy < 4; iy++) {
-    for (size_t ix = 0; ix < 8; ix++) {
-      coefficients[(1 + iy * 2) * 8 + ix] = block[iy * 8 + ix];
-    }
-  }
-  float block00 = coefficients[0] * 0.25f;
-  float block01 = coefficients[1];
-  float block10 = coefficients[8];
-  coefficients[0] = (block00 + block01 + 2 * block10) * 0.25f;
-  coefficients[1] = (block00 - block01) * 0.5f;
-  coefficients[8] = (block00 + block01 - 2 * block10) * 0.25f;
-}
-
-HWY_MAYBE_UNUSED void TransformFromPixels(const AcStrategyType strategy,
-                                          const float* JXL_RESTRICT pixels,
-                                          size_t pixels_stride,
-                                          float* JXL_RESTRICT coefficients,
-                                          float* JXL_RESTRICT scratch_space) {
-  using Type = AcStrategyType;
-  switch (strategy) {
-    case Type::IDENTITY: {
-      for (size_t y = 0; y < 2; y++) {
-        for (size_t x = 0; x < 2; x++) {
-          float block_dc = 0;
-          for (size_t iy = 0; iy < 4; iy++) {
-            for (size_t ix = 0; ix < 4; ix++) {
-              block_dc += pixels[(y * 4 + iy) * pixels_stride + x * 4 + ix];
-            }
-          }
-          block_dc *= 1.0f / 16;
-          for (size_t iy = 0; iy < 4; iy++) {
-            for (size_t ix = 0; ix < 4; ix++) {
-              if (ix == 1 && iy == 1) continue;
-              coefficients[(y + iy * 2) * 8 + x + ix * 2] =
-                  pixels[(y * 4 + iy) * pixels_stride + x * 4 + ix] -
-                  pixels[(y * 4 + 1) * pixels_stride + x * 4 + 1];
-            }
-          }
-          coefficients[(y + 2) * 8 + x + 2] = coefficients[y * 8 + x];
-          coefficients[y * 8 + x] = block_dc;
-        }
-      }
-      float block00 = coefficients[0];
-      float block01 = coefficients[1];
-      float block10 = coefficients[8];
-      float block11 = coefficients[9];
-      coefficients[0] = (block00 + block01 + block10 + block11) * 0.25f;
-      coefficients[1] = (block00 + block01 - block10 - block11) * 0.25f;
-      coefficients[8] = (block00 - block01 + block10 - block11) * 0.25f;
-      coefficients[9] = (block00 - block01 - block10 + block11) * 0.25f;
-      break;
-    }
-    case Type::DCT8X4: {
-      for (size_t x = 0; x < 2; x++) {
-        HWY_ALIGN float block[4 * 8];
-        ComputeScaledDCT<8, 4>()(DCTFrom(pixels + x * 4, pixels_stride), block,
-                                 scratch_space);
-        for (size_t iy = 0; iy < 4; iy++) {
-          for (size_t ix = 0; ix < 8; ix++) {
-            // Store transposed.
-            coefficients[(x + iy * 2) * 8 + ix] = block[iy * 8 + ix];
-          }
-        }
-      }
-      float block0 = coefficients[0];
-      float block1 = coefficients[8];
-      coefficients[0] = (block0 + block1) * 0.5f;
-      coefficients[8] = (block0 - block1) * 0.5f;
-      break;
-    }
-    case Type::DCT4X8: {
-      for (size_t y = 0; y < 2; y++) {
-        HWY_ALIGN float block[4 * 8];
-        ComputeScaledDCT<4, 8>()(
-            DCTFrom(pixels + y * 4 * pixels_stride, pixels_stride), block,
-            scratch_space);
-        for (size_t iy = 0; iy < 4; iy++) {
-          for (size_t ix = 0; ix < 8; ix++) {
-            coefficients[(y + iy * 2) * 8 + ix] = block[iy * 8 + ix];
-          }
-        }
-      }
-      float block0 = coefficients[0];
-      float block1 = coefficients[8];
-      coefficients[0] = (block0 + block1) * 0.5f;
-      coefficients[8] = (block0 - block1) * 0.5f;
-      break;
-    }
-    case Type::DCT4X4: {
-      for (size_t y = 0; y < 2; y++) {
-        for (size_t x = 0; x < 2; x++) {
-          HWY_ALIGN float block[4 * 4];
-          ComputeScaledDCT<4, 4>()(
-              DCTFrom(pixels + y * 4 * pixels_stride + x * 4, pixels_stride),
-              block, scratch_space);
-          for (size_t iy = 0; iy < 4; iy++) {
-            for (size_t ix = 0; ix < 4; ix++) {
-              coefficients[(y + iy * 2) * 8 + x + ix * 2] = block[iy * 4 + ix];
-            }
-          }
-        }
-      }
-      float block00 = coefficients[0];
-      float block01 = coefficients[1];
-      float block10 = coefficients[8];
-      float block11 = coefficients[9];
-      coefficients[0] = (block00 + block01 + block10 + block11) * 0.25f;
-      coefficients[1] = (block00 + block01 - block10 - block11) * 0.25f;
-      coefficients[8] = (block00 - block01 + block10 - block11) * 0.25f;
-      coefficients[9] = (block00 - block01 - block10 + block11) * 0.25f;
-      break;
-    }
-    case Type::DCT2X2: {
-      DCT2TopBlock<8>(pixels, pixels_stride, coefficients);
-      DCT2TopBlock<4>(coefficients, kBlockDim, coefficients);
-      DCT2TopBlock<2>(coefficients, kBlockDim, coefficients);
-      break;
-    }
-    case Type::DCT16X16: {
-      ComputeScaledDCT<16, 16>()(DCTFrom(pixels, pixels_stride), coefficients,
-                                 scratch_space);
-      break;
-    }
-    case Type::DCT16X8: {
-      ComputeScaledDCT<16, 8>()(DCTFrom(pixels, pixels_stride), coefficients,
-                                scratch_space);
-      break;
-    }
-    case Type::DCT8X16: {
-      ComputeScaledDCT<8, 16>()(DCTFrom(pixels, pixels_stride), coefficients,
-                                scratch_space);
-      break;
-    }
-    case Type::DCT32X8: {
-      ComputeScaledDCT<32, 8>()(DCTFrom(pixels, pixels_stride), coefficients,
-                                scratch_space);
-      break;
-    }
-    case Type::DCT8X32: {
-      ComputeScaledDCT<8, 32>()(DCTFrom(pixels, pixels_stride), coefficients,
-                                scratch_space);
-      break;
-    }
-    case Type::DCT32X16: {
-      ComputeScaledDCT<32, 16>()(DCTFrom(pixels, pixels_stride), coefficients,
-                                 scratch_space);
-      break;
-    }
-    case Type::DCT16X32: {
-      ComputeScaledDCT<16, 32>()(DCTFrom(pixels, pixels_stride), coefficients,
-                                 scratch_space);
-      break;
-    }
-    case Type::DCT32X32: {
-      ComputeScaledDCT<32, 32>()(DCTFrom(pixels, pixels_stride), coefficients,
-                                 scratch_space);
-      break;
-    }
-    case Type::DCT: {
-      ComputeScaledDCT<8, 8>()(DCTFrom(pixels, pixels_stride), coefficients,
-                               scratch_space);
-      break;
-    }
-    case Type::AFV0: {
-      AFVTransformFromPixels<0>(pixels, pixels_stride, coefficients);
-      break;
-    }
-    case Type::AFV1: {
-      AFVTransformFromPixels<1>(pixels, pixels_stride, coefficients);
-      break;
-    }
-    case Type::AFV2: {
-      AFVTransformFromPixels<2>(pixels, pixels_stride, coefficients);
-      break;
-    }
-    case Type::AFV3: {
-      AFVTransformFromPixels<3>(pixels, pixels_stride, coefficients);
-      break;
-    }
-    case Type::DCT64X64: {
-      ComputeScaledDCT<64, 64>()(DCTFrom(pixels, pixels_stride), coefficients,
-                                 scratch_space);
-      break;
-    }
-    case Type::DCT64X32: {
-      ComputeScaledDCT<64, 32>()(DCTFrom(pixels, pixels_stride), coefficients,
-                                 scratch_space);
-      break;
-    }
-    case Type::DCT32X64: {
-      ComputeScaledDCT<32, 64>()(DCTFrom(pixels, pixels_stride), coefficients,
-                                 scratch_space);
-      break;
-    }
-    case Type::DCT128X128: {
-      ComputeScaledDCT<128, 128>()(DCTFrom(pixels, pixels_stride), coefficients,
-                                   scratch_space);
-      break;
-    }
-    case Type::DCT128X64: {
-      ComputeScaledDCT<128, 64>()(DCTFrom(pixels, pixels_stride), coefficients,
-                                  scratch_space);
-      break;
-    }
-    case Type::DCT64X128: {
-      ComputeScaledDCT<64, 128>()(DCTFrom(pixels, pixels_stride), coefficients,
-                                  scratch_space);
-      break;
-    }
-    case Type::DCT256X256: {
-      ComputeScaledDCT<256, 256>()(DCTFrom(pixels, pixels_stride), coefficients,
-                                   scratch_space);
-      break;
-    }
-    case Type::DCT256X128: {
-      ComputeScaledDCT<256, 128>()(DCTFrom(pixels, pixels_stride), coefficients,
-                                   scratch_space);
-      break;
-    }
-    case Type::DCT128X256: {
-      ComputeScaledDCT<128, 256>()(DCTFrom(pixels, pixels_stride), coefficients,
-                                   scratch_space);
-      break;
-    }
-  }
-}
-
-HWY_MAYBE_UNUSED void DCFromLowestFrequencies(const AcStrategyType strategy,
-                                              const float* block, float* dc,
-                                              size_t dc_stride) {
-  using Type = AcStrategyType;
-  switch (strategy) {
-    case Type::DCT16X8: {
-      ReinterpretingIDCT</*DCT_ROWS=*/2 * kBlockDim, /*DCT_COLS=*/kBlockDim,
-                         /*LF_ROWS=*/2, /*LF_COLS=*/1, /*ROWS=*/2, /*COLS=*/1>(
-          block, 2 * kBlockDim, dc, dc_stride);
-      break;
-    }
-    case Type::DCT8X16: {
-      ReinterpretingIDCT</*DCT_ROWS=*/kBlockDim, /*DCT_COLS=*/2 * kBlockDim,
-                         /*LF_ROWS=*/1, /*LF_COLS=*/2, /*ROWS=*/1, /*COLS=*/2>(
-          block, 2 * kBlockDim, dc, dc_stride);
-      break;
-    }
-    case Type::DCT16X16: {
-      ReinterpretingIDCT</*DCT_ROWS=*/2 * kBlockDim, /*DCT_COLS=*/2 * kBlockDim,
-                         /*LF_ROWS=*/2, /*LF_COLS=*/2, /*ROWS=*/2, /*COLS=*/2>(
-          block, 2 * kBlockDim, dc, dc_stride);
-      break;
-    }
-    case Type::DCT32X8: {
-      ReinterpretingIDCT</*DCT_ROWS=*/4 * kBlockDim, /*DCT_COLS=*/kBlockDim,
-                         /*LF_ROWS=*/4, /*LF_COLS=*/1, /*ROWS=*/4, /*COLS=*/1>(
-          block, 4 * kBlockDim, dc, dc_stride);
-      break;
-    }
-    case Type::DCT8X32: {
-      ReinterpretingIDCT</*DCT_ROWS=*/kBlockDim, /*DCT_COLS=*/4 * kBlockDim,
-                         /*LF_ROWS=*/1, /*LF_COLS=*/4, /*ROWS=*/1, /*COLS=*/4>(
-          block, 4 * kBlockDim, dc, dc_stride);
-      break;
-    }
-    case Type::DCT32X16: {
-      ReinterpretingIDCT</*DCT_ROWS=*/4 * kBlockDim, /*DCT_COLS=*/2 * kBlockDim,
-                         /*LF_ROWS=*/4, /*LF_COLS=*/2, /*ROWS=*/4, /*COLS=*/2>(
-          block, 4 * kBlockDim, dc, dc_stride);
-      break;
-    }
-    case Type::DCT16X32: {
-      ReinterpretingIDCT</*DCT_ROWS=*/2 * kBlockDim, /*DCT_COLS=*/4 * kBlockDim,
-                         /*LF_ROWS=*/2, /*LF_COLS=*/4, /*ROWS=*/2, /*COLS=*/4>(
-          block, 4 * kBlockDim, dc, dc_stride);
-      break;
-    }
-    case Type::DCT32X32: {
-      ReinterpretingIDCT</*DCT_ROWS=*/4 * kBlockDim, /*DCT_COLS=*/4 * kBlockDim,
-                         /*LF_ROWS=*/4, /*LF_COLS=*/4, /*ROWS=*/4, /*COLS=*/4>(
-          block, 4 * kBlockDim, dc, dc_stride);
-      break;
-    }
-    case Type::DCT64X32: {
-      ReinterpretingIDCT</*DCT_ROWS=*/8 * kBlockDim, /*DCT_COLS=*/4 * kBlockDim,
-                         /*LF_ROWS=*/8, /*LF_COLS=*/4, /*ROWS=*/8, /*COLS=*/4>(
-          block, 8 * kBlockDim, dc, dc_stride);
-      break;
-    }
-    case Type::DCT32X64: {
-      ReinterpretingIDCT</*DCT_ROWS=*/4 * kBlockDim, /*DCT_COLS=*/8 * kBlockDim,
-                         /*LF_ROWS=*/4, /*LF_COLS=*/8, /*ROWS=*/4, /*COLS=*/8>(
-          block, 8 * kBlockDim, dc, dc_stride);
-      break;
-    }
-    case Type::DCT64X64: {
-      ReinterpretingIDCT</*DCT_ROWS=*/8 * kBlockDim, /*DCT_COLS=*/8 * kBlockDim,
-                         /*LF_ROWS=*/8, /*LF_COLS=*/8, /*ROWS=*/8, /*COLS=*/8>(
-          block, 8 * kBlockDim, dc, dc_stride);
-      break;
-    }
-    case Type::DCT128X64: {
-      ReinterpretingIDCT<
-          /*DCT_ROWS=*/16 * kBlockDim, /*DCT_COLS=*/8 * kBlockDim,
-          /*LF_ROWS=*/16, /*LF_COLS=*/8, /*ROWS=*/16, /*COLS=*/8>(
-          block, 16 * kBlockDim, dc, dc_stride);
-      break;
-    }
-    case Type::DCT64X128: {
-      ReinterpretingIDCT<
-          /*DCT_ROWS=*/8 * kBlockDim, /*DCT_COLS=*/16 * kBlockDim,
-          /*LF_ROWS=*/8, /*LF_COLS=*/16, /*ROWS=*/8, /*COLS=*/16>(
-          block, 16 * kBlockDim, dc, dc_stride);
-      break;
-    }
-    case Type::DCT128X128: {
-      ReinterpretingIDCT<
-          /*DCT_ROWS=*/16 * kBlockDim, /*DCT_COLS=*/16 * kBlockDim,
-          /*LF_ROWS=*/16, /*LF_COLS=*/16, /*ROWS=*/16, /*COLS=*/16>(
-          block, 16 * kBlockDim, dc, dc_stride);
-      break;
-    }
-    case Type::DCT256X128: {
-      ReinterpretingIDCT<
-          /*DCT_ROWS=*/32 * kBlockDim, /*DCT_COLS=*/16 * kBlockDim,
-          /*LF_ROWS=*/32, /*LF_COLS=*/16, /*ROWS=*/32, /*COLS=*/16>(
-          block, 32 * kBlockDim, dc, dc_stride);
-      break;
-    }
-    case Type::DCT128X256: {
-      ReinterpretingIDCT<
-          /*DCT_ROWS=*/16 * kBlockDim, /*DCT_COLS=*/32 * kBlockDim,
-          /*LF_ROWS=*/16, /*LF_COLS=*/32, /*ROWS=*/16, /*COLS=*/32>(
-          block, 32 * kBlockDim, dc, dc_stride);
-      break;
-    }
-    case Type::DCT256X256: {
-      ReinterpretingIDCT<
-          /*DCT_ROWS=*/32 * kBlockDim, /*DCT_COLS=*/32 * kBlockDim,
-          /*LF_ROWS=*/32, /*LF_COLS=*/32, /*ROWS=*/32, /*COLS=*/32>(
-          block, 32 * kBlockDim, dc, dc_stride);
-      break;
-    }
-    case Type::DCT:
-    case Type::DCT2X2:
-    case Type::DCT4X4:
-    case Type::DCT4X8:
-    case Type::DCT8X4:
-    case Type::AFV0:
-    case Type::AFV1:
-    case Type::AFV2:
-    case Type::AFV3:
-    case Type::IDENTITY:
-      dc[0] = block[0];
-      break;
-  }
-}
-
-}  // namespace
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#endif  // LIB_JXL_ENC_TRANSFORMS_INL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_transforms.cc b/third_party/jpeg-xl/lib/jxl/enc_transforms.cc
deleted file mode 100644
index 9f14c0eb99b58..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_transforms.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_transforms.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/enc_transforms.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/dct_scales.h"
-#include "lib/jxl/enc_transforms-inl.h"
-
-namespace jxl {
-
-#if HWY_ONCE
-HWY_EXPORT(TransformFromPixels);
-void TransformFromPixels(const AcStrategyType strategy,
-                         const float* JXL_RESTRICT pixels, size_t pixels_stride,
-                         float* JXL_RESTRICT coefficients,
-                         float* scratch_space) {
-  HWY_DYNAMIC_DISPATCH(TransformFromPixels)
-  (strategy, pixels, pixels_stride, coefficients, scratch_space);
-}
-
-HWY_EXPORT(DCFromLowestFrequencies);
-void DCFromLowestFrequencies(AcStrategyType strategy, const float* block,
-                             float* dc, size_t dc_stride) {
-  HWY_DYNAMIC_DISPATCH(DCFromLowestFrequencies)(strategy, block, dc, dc_stride);
-}
-
-HWY_EXPORT(AFVDCT4x4);
-void AFVDCT4x4(const float* JXL_RESTRICT pixels, float* JXL_RESTRICT coeffs) {
-  HWY_DYNAMIC_DISPATCH(AFVDCT4x4)(pixels, coeffs);
-}
-#endif  // HWY_ONCE
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/enc_transforms.h b/third_party/jpeg-xl/lib/jxl/enc_transforms.h
deleted file mode 100644
index 3ae0e71ff9375..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_transforms.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_TRANSFORMS_H_
-#define LIB_JXL_ENC_TRANSFORMS_H_
-
-// Facade for (non-inlined) integral transforms.
-
-#include <cstddef>
-#include <cstdint>
-
-#include "lib/jxl/base/compiler_specific.h"
-
-namespace jxl {
-
-enum class AcStrategyType : uint32_t;
-
-void TransformFromPixels(AcStrategyType strategy,
-                         const float* JXL_RESTRICT pixels, size_t pixels_stride,
-                         float* JXL_RESTRICT coefficients,
-                         float* JXL_RESTRICT scratch_space);
-
-// Equivalent of the above for DC image.
-void DCFromLowestFrequencies(AcStrategyType strategy, const float* block,
-                             float* dc, size_t dc_stride);
-
-void AFVDCT4x4(const float* JXL_RESTRICT pixels, float* JXL_RESTRICT coeffs);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_TRANSFORMS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/enc_xyb.cc b/third_party/jpeg-xl/lib/jxl/enc_xyb.cc
deleted file mode 100644
index 796855c113a79..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_xyb.cc
+++ /dev/null
@@ -1,408 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/enc_xyb.h"
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <cstdlib>
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/enc_xyb.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/fast_math-inl.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/cms/opsin_params.h"
-#include "lib/jxl/cms/transfer_functions-inl.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/enc_image_bundle.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_ops.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::MulAdd;
-using hwy::HWY_NAMESPACE::Sub;
-using hwy::HWY_NAMESPACE::ZeroIfNegative;
-
-// 4x3 matrix * 3x1 SIMD vectors
-template <class V>
-JXL_INLINE void OpsinAbsorbance(const V r, const V g, const V b,
-                                const float* JXL_RESTRICT premul_absorb,
-                                V* JXL_RESTRICT mixed0, V* JXL_RESTRICT mixed1,
-                                V* JXL_RESTRICT mixed2) {
-  const float* bias = jxl::cms::kOpsinAbsorbanceBias.data();
-  const HWY_FULL(float) d;
-  const size_t N = Lanes(d);
-  const auto m0 = Load(d, premul_absorb + 0 * N);
-  const auto m1 = Load(d, premul_absorb + 1 * N);
-  const auto m2 = Load(d, premul_absorb + 2 * N);
-  const auto m3 = Load(d, premul_absorb + 3 * N);
-  const auto m4 = Load(d, premul_absorb + 4 * N);
-  const auto m5 = Load(d, premul_absorb + 5 * N);
-  const auto m6 = Load(d, premul_absorb + 6 * N);
-  const auto m7 = Load(d, premul_absorb + 7 * N);
-  const auto m8 = Load(d, premul_absorb + 8 * N);
-  *mixed0 = MulAdd(m0, r, MulAdd(m1, g, MulAdd(m2, b, Set(d, bias[0]))));
-  *mixed1 = MulAdd(m3, r, MulAdd(m4, g, MulAdd(m5, b, Set(d, bias[1]))));
-  *mixed2 = MulAdd(m6, r, MulAdd(m7, g, MulAdd(m8, b, Set(d, bias[2]))));
-}
-
-template <class V>
-void StoreXYB(const V r, V g, const V b, float* JXL_RESTRICT valx,
-              float* JXL_RESTRICT valy, float* JXL_RESTRICT valz) {
-  const HWY_FULL(float) d;
-  const V half = Set(d, 0.5f);
-  Store(Mul(half, Sub(r, g)), d, valx);
-  Store(Mul(half, Add(r, g)), d, valy);
-  Store(b, d, valz);
-}
-
-// Converts one RGB vector to XYB.
-template <class V>
-void LinearRGBToXYB(const V r, const V g, const V b,
-                    const float* JXL_RESTRICT premul_absorb,
-                    float* JXL_RESTRICT valx, float* JXL_RESTRICT valy,
-                    float* JXL_RESTRICT valz) {
-  V mixed0;
-  V mixed1;
-  V mixed2;
-  OpsinAbsorbance(r, g, b, premul_absorb, &mixed0, &mixed1, &mixed2);
-
-  // mixed* should be non-negative even for wide-gamut, so clamp to zero.
-  mixed0 = ZeroIfNegative(mixed0);
-  mixed1 = ZeroIfNegative(mixed1);
-  mixed2 = ZeroIfNegative(mixed2);
-
-  const HWY_FULL(float) d;
-  const size_t N = Lanes(d);
-  mixed0 = CubeRootAndAdd(mixed0, Load(d, premul_absorb + 9 * N));
-  mixed1 = CubeRootAndAdd(mixed1, Load(d, premul_absorb + 10 * N));
-  mixed2 = CubeRootAndAdd(mixed2, Load(d, premul_absorb + 11 * N));
-  StoreXYB(mixed0, mixed1, mixed2, valx, valy, valz);
-
-  // For wide-gamut inputs, r/g/b and valx (but not y/z) are often negative.
-}
-
-void LinearRGBRowToXYB(float* JXL_RESTRICT row0, float* JXL_RESTRICT row1,
-                       float* JXL_RESTRICT row2,
-                       const float* JXL_RESTRICT premul_absorb, size_t xsize) {
-  const HWY_FULL(float) d;
-  for (size_t x = 0; x < xsize; x += Lanes(d)) {
-    const auto r = Load(d, row0 + x);
-    const auto g = Load(d, row1 + x);
-    const auto b = Load(d, row2 + x);
-    LinearRGBToXYB(r, g, b, premul_absorb, row0 + x, row1 + x, row2 + x);
-  }
-}
-
-// Input/output uses the codec.h scaling: nominally 0-1 if in-gamut.
-template <class V>
-V LinearFromSRGB(V encoded) {
-  return TF_SRGB().DisplayFromEncoded(encoded);
-}
-
-Status LinearSRGBToXYB(const float* JXL_RESTRICT premul_absorb,
-                       ThreadPool* pool, Image3F* JXL_RESTRICT image) {
-  const size_t xsize = image->xsize();
-
-  const HWY_FULL(float) d;
-  const auto process_row = [&](const uint32_t task,
-                               size_t /*thread*/) -> Status {
-    const size_t y = static_cast<size_t>(task);
-    float* JXL_RESTRICT row0 = image->PlaneRow(0, y);
-    float* JXL_RESTRICT row1 = image->PlaneRow(1, y);
-    float* JXL_RESTRICT row2 = image->PlaneRow(2, y);
-
-    for (size_t x = 0; x < xsize; x += Lanes(d)) {
-      const auto in_r = Load(d, row0 + x);
-      const auto in_g = Load(d, row1 + x);
-      const auto in_b = Load(d, row2 + x);
-      LinearRGBToXYB(in_r, in_g, in_b, premul_absorb, row0 + x, row1 + x,
-                     row2 + x);
-    }
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, static_cast<uint32_t>(image->ysize()),
-                                ThreadPool::NoInit, process_row,
-                                "LinearToXYB"));
-  return true;
-}
-
-Status SRGBToXYB(const float* JXL_RESTRICT premul_absorb, ThreadPool* pool,
-                 Image3F* JXL_RESTRICT image) {
-  const size_t xsize = image->xsize();
-
-  const HWY_FULL(float) d;
-  const auto process_row = [&](const uint32_t task,
-                               size_t /*thread*/) -> Status {
-    const size_t y = static_cast<size_t>(task);
-    float* JXL_RESTRICT row0 = image->PlaneRow(0, y);
-    float* JXL_RESTRICT row1 = image->PlaneRow(1, y);
-    float* JXL_RESTRICT row2 = image->PlaneRow(2, y);
-
-    for (size_t x = 0; x < xsize; x += Lanes(d)) {
-      const auto in_r = LinearFromSRGB(Load(d, row0 + x));
-      const auto in_g = LinearFromSRGB(Load(d, row1 + x));
-      const auto in_b = LinearFromSRGB(Load(d, row2 + x));
-      LinearRGBToXYB(in_r, in_g, in_b, premul_absorb, row0 + x, row1 + x,
-                     row2 + x);
-    }
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, static_cast<uint32_t>(image->ysize()),
-                                ThreadPool::NoInit, process_row, "SRGBToXYB"));
-  return true;
-}
-
-Status SRGBToXYBAndLinear(const float* JXL_RESTRICT premul_absorb,
-                          ThreadPool* pool, Image3F* JXL_RESTRICT image,
-                          Image3F* JXL_RESTRICT linear) {
-  const size_t xsize = image->xsize();
-
-  const HWY_FULL(float) d;
-  const auto process_row = [&](const uint32_t task,
-                               size_t /*thread*/) -> Status {
-    const size_t y = static_cast<size_t>(task);
-    float* JXL_RESTRICT row_image0 = image->PlaneRow(0, y);
-    float* JXL_RESTRICT row_image1 = image->PlaneRow(1, y);
-    float* JXL_RESTRICT row_image2 = image->PlaneRow(2, y);
-    float* JXL_RESTRICT row_linear0 = linear->PlaneRow(0, y);
-    float* JXL_RESTRICT row_linear1 = linear->PlaneRow(1, y);
-    float* JXL_RESTRICT row_linear2 = linear->PlaneRow(2, y);
-
-    for (size_t x = 0; x < xsize; x += Lanes(d)) {
-      const auto in_r = LinearFromSRGB(Load(d, row_image0 + x));
-      const auto in_g = LinearFromSRGB(Load(d, row_image1 + x));
-      const auto in_b = LinearFromSRGB(Load(d, row_image2 + x));
-
-      Store(in_r, d, row_linear0 + x);
-      Store(in_g, d, row_linear1 + x);
-      Store(in_b, d, row_linear2 + x);
-
-      LinearRGBToXYB(in_r, in_g, in_b, premul_absorb, row_image0 + x,
-                     row_image1 + x, row_image2 + x);
-    }
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, static_cast<uint32_t>(image->ysize()),
-                                ThreadPool::NoInit, process_row,
-                                "SRGBToXYBAndLinear"));
-  return true;
-}
-
-void ComputePremulAbsorb(float intensity_target, float* premul_absorb) {
-  const HWY_FULL(float) d;
-  const size_t N = Lanes(d);
-  const float mul = intensity_target / 255.0f;
-  for (size_t j = 0; j < 3; ++j) {
-    for (size_t i = 0; i < 3; ++i) {
-      const auto absorb = Set(d, jxl::cms::kOpsinAbsorbanceMatrix[j][i] * mul);
-      Store(absorb, d, premul_absorb + (j * 3 + i) * N);
-    }
-  }
-  for (size_t i = 0; i < 3; ++i) {
-    const auto neg_bias_cbrt =
-        Set(d, -cbrtf(jxl::cms::kOpsinAbsorbanceBias[i]));
-    Store(neg_bias_cbrt, d, premul_absorb + (9 + i) * N);
-  }
-}
-
-// This is different from Butteraugli's OpsinDynamicsImage() in the sense that
-// it does not contain a sensitivity multiplier based on the blurred image.
-Status ToXYB(const ColorEncoding& c_current, float intensity_target,
-             const ImageF* black, ThreadPool* pool, Image3F* JXL_RESTRICT image,
-             const JxlCmsInterface& cms, Image3F* const JXL_RESTRICT linear) {
-  if (black) JXL_ENSURE(SameSize(*image, *black));
-  if (linear) JXL_ENSURE(SameSize(*image, *linear));
-
-  const HWY_FULL(float) d;
-  // Pre-broadcasted constants
-  HWY_ALIGN float premul_absorb[MaxLanes(d) * 12];
-  ComputePremulAbsorb(intensity_target, premul_absorb);
-
-  const bool want_linear = linear != nullptr;
-
-  const ColorEncoding& c_linear_srgb =
-      ColorEncoding::LinearSRGB(c_current.IsGray());
-  // Linear sRGB inputs are rare but can be useful for the fastest encoders, for
-  // which undoing the sRGB transfer function would be a large part of the cost.
-  if (c_linear_srgb.SameColorEncoding(c_current)) {
-    // This only happens if kitten or slower, moving ImageBundle might be
-    // possible but the encoder is much slower than this copy.
-    if (want_linear) {
-      JXL_RETURN_IF_ERROR(CopyImageTo(*image, linear));
-    }
-    JXL_RETURN_IF_ERROR(LinearSRGBToXYB(premul_absorb, pool, image));
-    return true;
-  }
-
-  // Common case: already sRGB, can avoid the color transform
-  if (c_current.IsSRGB()) {
-    // Common case: can avoid allocating/copying
-    if (want_linear) {
-      // Slow encoder also wants linear sRGB.
-      JXL_RETURN_IF_ERROR(
-          SRGBToXYBAndLinear(premul_absorb, pool, image, linear));
-    } else {
-      JXL_RETURN_IF_ERROR(SRGBToXYB(premul_absorb, pool, image));
-    }
-    return true;
-  }
-
-  JXL_RETURN_IF_ERROR(ApplyColorTransform(
-      c_current, intensity_target, *image, black, Rect(*image), c_linear_srgb,
-      cms, pool, want_linear ? linear : image));
-  if (want_linear) {
-    JXL_RETURN_IF_ERROR(CopyImageTo(*linear, image));
-  }
-  JXL_RETURN_IF_ERROR(LinearSRGBToXYB(premul_absorb, pool, image));
-  return true;
-}
-
-// Transform RGB to YCbCr.
-// Could be performed in-place (i.e. Y, Cb and Cr could alias R, B and B).
-Status RgbToYcbcr(const ImageF& r_plane, const ImageF& g_plane,
-                  const ImageF& b_plane, ImageF* y_plane, ImageF* cb_plane,
-                  ImageF* cr_plane, ThreadPool* pool) {
-  const HWY_FULL(float) df;
-  const size_t S = Lanes(df);  // Step.
-
-  const size_t xsize = r_plane.xsize();
-  const size_t ysize = r_plane.ysize();
-  if ((xsize == 0) || (ysize == 0)) return true;
-
-  // Full-range BT.601 as defined by JFIF Clause 7:
-  // https://www.itu.int/rec/T-REC-T.871-201105-I/en
-  const auto k128 = Set(df, 128.0f / 255);
-  const auto kR = Set(df, 0.299f);  // NTSC luma
-  const auto kG = Set(df, 0.587f);
-  const auto kB = Set(df, 0.114f);
-  const auto kAmpR = Set(df, 0.701f);
-  const auto kAmpB = Set(df, 0.886f);
-  const auto kDiffR = Add(kAmpR, kR);
-  const auto kDiffB = Add(kAmpB, kB);
-  const auto kNormR = Div(Set(df, 1.0f), (Add(kAmpR, Add(kG, kB))));
-  const auto kNormB = Div(Set(df, 1.0f), (Add(kR, Add(kG, kAmpB))));
-
-  constexpr size_t kGroupArea = kGroupDim * kGroupDim;
-  const size_t lines_per_group = DivCeil(kGroupArea, xsize);
-  const size_t num_stripes = DivCeil(ysize, lines_per_group);
-  const auto transform = [&](int idx, int /* thread*/) -> Status {
-    const size_t y0 = idx * lines_per_group;
-    const size_t y1 = std::min<size_t>(y0 + lines_per_group, ysize);
-    for (size_t y = y0; y < y1; ++y) {
-      const float* r_row = r_plane.ConstRow(y);
-      const float* g_row = g_plane.ConstRow(y);
-      const float* b_row = b_plane.ConstRow(y);
-      float* y_row = y_plane->Row(y);
-      float* cb_row = cb_plane->Row(y);
-      float* cr_row = cr_plane->Row(y);
-      for (size_t x = 0; x < xsize; x += S) {
-        const auto r = Load(df, r_row + x);
-        const auto g = Load(df, g_row + x);
-        const auto b = Load(df, b_row + x);
-        const auto r_base = Mul(r, kR);
-        const auto r_diff = Mul(r, kDiffR);
-        const auto g_base = Mul(g, kG);
-        const auto b_base = Mul(b, kB);
-        const auto b_diff = Mul(b, kDiffB);
-        const auto y_base = Add(r_base, Add(g_base, b_base));
-        const auto y_vec = Sub(y_base, k128);
-        const auto cb_vec = Mul(Sub(b_diff, y_base), kNormB);
-        const auto cr_vec = Mul(Sub(r_diff, y_base), kNormR);
-        Store(y_vec, df, y_row + x);
-        Store(cb_vec, df, cb_row + x);
-        Store(cr_vec, df, cr_row + x);
-      }
-    }
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, static_cast<int>(num_stripes),
-                                ThreadPool::NoInit, transform, "RgbToYcbCr"));
-  return true;
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-HWY_EXPORT(ToXYB);
-Status ToXYB(const ColorEncoding& c_current, float intensity_target,
-             const ImageF* black, ThreadPool* pool, Image3F* JXL_RESTRICT image,
-             const JxlCmsInterface& cms, Image3F* const JXL_RESTRICT linear) {
-  return HWY_DYNAMIC_DISPATCH(ToXYB)(c_current, intensity_target, black, pool,
-                                     image, cms, linear);
-}
-
-Status ToXYB(const ImageBundle& in, ThreadPool* pool, Image3F* JXL_RESTRICT xyb,
-             const JxlCmsInterface& cms, Image3F* JXL_RESTRICT linear) {
-  JxlMemoryManager* memory_manager = in.memory_manager();
-  JXL_ASSIGN_OR_RETURN(*xyb,
-                       Image3F::Create(memory_manager, in.xsize(), in.ysize()));
-  JXL_RETURN_IF_ERROR(CopyImageTo(in.color(), xyb));
-  JXL_RETURN_IF_ERROR(ToXYB(in.c_current(), in.metadata()->IntensityTarget(),
-                            in.black(), pool, xyb, cms, linear));
-  return true;
-}
-
-HWY_EXPORT(LinearRGBRowToXYB);
-void LinearRGBRowToXYB(float* JXL_RESTRICT row0, float* JXL_RESTRICT row1,
-                       float* JXL_RESTRICT row2,
-                       const float* JXL_RESTRICT premul_absorb, size_t xsize) {
-  HWY_DYNAMIC_DISPATCH(LinearRGBRowToXYB)
-  (row0, row1, row2, premul_absorb, xsize);
-}
-
-HWY_EXPORT(ComputePremulAbsorb);
-void ComputePremulAbsorb(float intensity_target, float* premul_absorb) {
-  HWY_DYNAMIC_DISPATCH(ComputePremulAbsorb)(intensity_target, premul_absorb);
-}
-
-void ScaleXYBRow(float* JXL_RESTRICT row0, float* JXL_RESTRICT row1,
-                 float* JXL_RESTRICT row2, size_t xsize) {
-  for (size_t x = 0; x < xsize; x++) {
-    row2[x] = (row2[x] - row1[x] + jxl::cms::kScaledXYBOffset[2]) *
-              jxl::cms::kScaledXYBScale[2];
-    row0[x] = (row0[x] + jxl::cms::kScaledXYBOffset[0]) *
-              jxl::cms::kScaledXYBScale[0];
-    row1[x] = (row1[x] + jxl::cms::kScaledXYBOffset[1]) *
-              jxl::cms::kScaledXYBScale[1];
-  }
-}
-
-void ScaleXYB(Image3F* opsin) {
-  for (size_t y = 0; y < opsin->ysize(); y++) {
-    float* row0 = opsin->PlaneRow(0, y);
-    float* row1 = opsin->PlaneRow(1, y);
-    float* row2 = opsin->PlaneRow(2, y);
-    ScaleXYBRow(row0, row1, row2, opsin->xsize());
-  }
-}
-
-HWY_EXPORT(RgbToYcbcr);
-Status RgbToYcbcr(const ImageF& r_plane, const ImageF& g_plane,
-                  const ImageF& b_plane, ImageF* y_plane, ImageF* cb_plane,
-                  ImageF* cr_plane, ThreadPool* pool) {
-  return HWY_DYNAMIC_DISPATCH(RgbToYcbcr)(r_plane, g_plane, b_plane, y_plane,
-                                          cb_plane, cr_plane, pool);
-}
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/enc_xyb.h b/third_party/jpeg-xl/lib/jxl/enc_xyb.h
deleted file mode 100644
index 37ae66d024cf5..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/enc_xyb.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENC_XYB_H_
-#define LIB_JXL_ENC_XYB_H_
-
-// Converts to XYB color space.
-
-#include <jxl/cms_interface.h>
-
-#include <cstddef>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-
-namespace jxl {
-
-// Converts any color space to XYB in-place. If `linear` is not null, fills it
-// with a linear sRGB copy of `image`.
-Status ToXYB(const ColorEncoding& c_current, float intensity_target,
-             const ImageF* black, ThreadPool* pool, Image3F* JXL_RESTRICT image,
-             const JxlCmsInterface& cms, Image3F* JXL_RESTRICT linear);
-
-Status ToXYB(const ImageBundle& in, ThreadPool* pool, Image3F* JXL_RESTRICT xyb,
-             const JxlCmsInterface& cms,
-             Image3F* JXL_RESTRICT linear = nullptr);
-
-void LinearRGBRowToXYB(float* JXL_RESTRICT row0, float* JXL_RESTRICT row1,
-                       float* JXL_RESTRICT row2,
-                       const float* JXL_RESTRICT premul_absorb, size_t xsize);
-
-void ComputePremulAbsorb(float intensity_target, float* premul_absorb);
-
-// Transforms each color component of the given XYB image into the [0.0, 1.0]
-// interval with an affine transform.
-void ScaleXYB(Image3F* opsin);
-void ScaleXYBRow(float* row0, float* row1, float* row2, size_t xsize);
-
-// Bt.601 to match JPEG/JFIF. Outputs _signed_ YCbCr values suitable for DCT,
-// see F.1.1.3 of T.81 (because our data type is float, there is no need to add
-// a bias to make the values unsigned).
-Status RgbToYcbcr(const ImageF& r_plane, const ImageF& g_plane,
-                  const ImageF& b_plane, ImageF* y_plane, ImageF* cb_plane,
-                  ImageF* cr_plane, ThreadPool* pool);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENC_XYB_H_
diff --git a/third_party/jpeg-xl/lib/jxl/encode.cc b/third_party/jpeg-xl/lib/jxl/encode.cc
deleted file mode 100644
index 12e6f2bcd2321..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/encode.cc
+++ /dev/null
@@ -1,2785 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <brotli/encode.h>
-#include <jxl/cms.h>
-#include <jxl/codestream_header.h>
-#include <jxl/encode.h>
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-#include <jxl/version.h>
-
-#include <algorithm>
-#include <atomic>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <utility>
-
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/exif.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/sanitizers.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/codec_in_out.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/enc_cache.h"
-#include "lib/jxl/enc_fast_lossless.h"
-#include "lib/jxl/enc_fields.h"
-#include "lib/jxl/enc_frame.h"
-#include "lib/jxl/enc_icc_codec.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/encode_internal.h"
-#include "lib/jxl/jpeg/enc_jpeg_data.h"
-#include "lib/jxl/luminance.h"
-#include "lib/jxl/memory_manager_internal.h"
-#include "lib/jxl/padded_bytes.h"
-
-struct JxlErrorOrStatus {
-  // NOLINTNEXTLINE(google-explicit-constructor)
-  operator jxl::Status() const {
-    switch (error_) {
-      case JXL_ENC_SUCCESS:
-        return jxl::OkStatus();
-      case JXL_ENC_NEED_MORE_OUTPUT:
-        return jxl::StatusCode::kNotEnoughBytes;
-      default:
-        return jxl::StatusCode::kGenericError;
-    }
-  }
-  // NOLINTNEXTLINE(google-explicit-constructor)
-  operator JxlEncoderStatus() const { return error_; }
-
-  static JxlErrorOrStatus Success() {
-    return JxlErrorOrStatus(JXL_ENC_SUCCESS);
-  }
-
-  static JxlErrorOrStatus MoreOutput() {
-    return JxlErrorOrStatus(JXL_ENC_NEED_MORE_OUTPUT);
-  }
-
-  static JxlErrorOrStatus Error() { return JxlErrorOrStatus(JXL_ENC_ERROR); }
-
- private:
-  explicit JxlErrorOrStatus(JxlEncoderStatus error) : error_(error) {}
-  JxlEncoderStatus error_;
-};
-
-// Debug-printing failure macro similar to JXL_FAILURE, but for the status code
-// JXL_ENC_ERROR
-#if (JXL_CRASH_ON_ERROR)
-#define JXL_API_ERROR(enc, error_code, format, ...)                          \
-  (enc->error = error_code,                                                  \
-   ::jxl::Debug(("%s:%d: " format "\n"), __FILE__, __LINE__, ##__VA_ARGS__), \
-   ::jxl::Abort(), JxlErrorOrStatus::Error())
-#define JXL_API_ERROR_NOSET(format, ...)                                     \
-  (::jxl::Debug(("%s:%d: " format "\n"), __FILE__, __LINE__, ##__VA_ARGS__), \
-   ::jxl::Abort(), JxlErrorOrStatus::Error())
-#else  // JXL_CRASH_ON_ERROR
-#define JXL_API_ERROR(enc, error_code, format, ...)                            \
-  (enc->error = error_code,                                                    \
-   ((JXL_IS_DEBUG_BUILD) &&                                                    \
-    ::jxl::Debug(("%s:%d: " format "\n"), __FILE__, __LINE__, ##__VA_ARGS__)), \
-   JxlErrorOrStatus::Error())
-#define JXL_API_ERROR_NOSET(format, ...)                                     \
-  (::jxl::Debug(("%s:%d: " format "\n"), __FILE__, __LINE__, ##__VA_ARGS__), \
-   JxlErrorOrStatus::Error())
-#endif  // JXL_CRASH_ON_ERROR
-
-jxl::StatusOr<JxlOutputProcessorBuffer>
-JxlEncoderOutputProcessorWrapper::GetBuffer(size_t min_size,
-                                            size_t requested_size) {
-  JXL_ENSURE(min_size > 0);
-  JXL_ENSURE(!has_buffer_);
-  if (stop_requested_) return jxl::StatusCode::kNotEnoughBytes;
-  requested_size = std::max(min_size, requested_size);
-
-  // If we support seeking, output_position_ == position_.
-  if (external_output_processor_ && external_output_processor_->seek) {
-    JXL_ENSURE(output_position_ == position_);
-  }
-  // Otherwise, output_position_ <= position_.
-  JXL_ENSURE(output_position_ <= position_);
-  size_t additional_size = position_ - output_position_;
-  JXL_ENSURE(memory_manager_ != nullptr);
-
-  if (external_output_processor_) {
-    // TODO(veluca): here, we cannot just ask for a larger buffer, as it will be
-    // released with a prefix of the buffer that has not been written yet.
-    // Figure out if there is a good way to do this more efficiently.
-    if (additional_size == 0) {
-      size_t size = requested_size;
-      uint8_t* user_buffer =
-          static_cast<uint8_t*>(external_output_processor_->get_buffer(
-              external_output_processor_->opaque, &size));
-      if (size == 0 || user_buffer == nullptr) {
-        stop_requested_ = true;
-        return jxl::StatusCode::kNotEnoughBytes;
-      }
-      if (size < min_size) {
-        external_output_processor_->release_buffer(
-            external_output_processor_->opaque, 0);
-      } else {
-        internal_buffers_.emplace(position_, InternalBuffer(memory_manager_));
-        has_buffer_ = true;
-        return JxlOutputProcessorBuffer(user_buffer, size, 0, this);
-      }
-    }
-  } else {
-    if (min_size + additional_size < *avail_out_) {
-      internal_buffers_.emplace(position_, InternalBuffer(memory_manager_));
-      has_buffer_ = true;
-      return JxlOutputProcessorBuffer(*next_out_ + additional_size,
-                                      *avail_out_ - additional_size, 0, this);
-    }
-  }
-
-  // Otherwise, we need to allocate our own buffer.
-  auto it =
-      internal_buffers_.emplace(position_, InternalBuffer(memory_manager_))
-          .first;
-  InternalBuffer& buffer = it->second;
-  size_t alloc_size = requested_size;
-  it++;
-  if (it != internal_buffers_.end()) {
-    alloc_size = std::min(alloc_size, it->first - position_);
-    JXL_ENSURE(alloc_size >= min_size);
-  }
-  JXL_RETURN_IF_ERROR(buffer.owned_data.resize(alloc_size));
-  has_buffer_ = true;
-  return JxlOutputProcessorBuffer(buffer.owned_data.data(), alloc_size, 0,
-                                  this);
-}
-
-jxl::Status JxlEncoderOutputProcessorWrapper::Seek(size_t pos) {
-  JXL_ENSURE(!has_buffer_);
-  if (external_output_processor_ && external_output_processor_->seek) {
-    external_output_processor_->seek(external_output_processor_->opaque, pos);
-    output_position_ = pos;
-  }
-  JXL_ENSURE(pos >= finalized_position_);
-  position_ = pos;
-  return true;
-}
-
-jxl::Status JxlEncoderOutputProcessorWrapper::SetFinalizedPosition() {
-  JXL_ENSURE(!has_buffer_);
-  if (external_output_processor_ && external_output_processor_->seek) {
-    external_output_processor_->set_finalized_position(
-        external_output_processor_->opaque, position_);
-  }
-  finalized_position_ = position_;
-  JXL_RETURN_IF_ERROR(FlushOutput());
-  return true;
-}
-
-jxl::Status JxlEncoderOutputProcessorWrapper::SetAvailOut(uint8_t** next_out,
-                                                          size_t* avail_out) {
-  JXL_ENSURE(!external_output_processor_);
-  avail_out_ = avail_out;
-  next_out_ = next_out;
-  JXL_RETURN_IF_ERROR(FlushOutput());
-  return true;
-}
-
-jxl::Status JxlEncoderOutputProcessorWrapper::CopyOutput(
-    std::vector<uint8_t>& output, uint8_t* next_out, size_t& avail_out) {
-  while (HasOutputToWrite()) {
-    JXL_RETURN_IF_ERROR(SetAvailOut(&next_out, &avail_out));
-    if (avail_out == 0) {
-      size_t offset = next_out - output.data();
-      output.resize(output.size() * 2);
-      next_out = output.data() + offset;
-      avail_out = output.size() - offset;
-    }
-  }
-  output.resize(output.size() - avail_out);
-  return true;
-}
-
-jxl::Status JxlEncoderOutputProcessorWrapper::ReleaseBuffer(size_t bytes_used) {
-  JXL_ENSURE(has_buffer_);
-  has_buffer_ = false;
-  auto it = internal_buffers_.find(position_);
-  JXL_ENSURE(it != internal_buffers_.end());
-  if (bytes_used == 0) {
-    if (external_output_processor_) {
-      external_output_processor_->release_buffer(
-          external_output_processor_->opaque, bytes_used);
-    }
-    internal_buffers_.erase(it);
-    return true;
-  }
-  it->second.written_bytes = bytes_used;
-  position_ += bytes_used;
-
-  auto it_to_next = it;
-  it_to_next++;
-  if (it_to_next != internal_buffers_.end()) {
-    JXL_ENSURE(it_to_next->first >= position_);
-  }
-
-  if (external_output_processor_) {
-    // If the buffer was given by the user, tell the user it is not needed
-    // anymore.
-    if (it->second.owned_data.empty()) {
-      external_output_processor_->release_buffer(
-          external_output_processor_->opaque, bytes_used);
-      // If we don't support seeking, this implies we will never modify again
-      // the bytes that were written so far. Advance the finalized position and
-      // flush the output to clean up the internal buffers.
-      if (!external_output_processor_->seek) {
-        JXL_RETURN_IF_ERROR(SetFinalizedPosition());
-        JXL_ENSURE(output_position_ == finalized_position_);
-        JXL_ENSURE(output_position_ == position_);
-      } else {
-        // Otherwise, advance the output position accordingly.
-        output_position_ += bytes_used;
-        JXL_ENSURE(output_position_ >= finalized_position_);
-        JXL_ENSURE(output_position_ == position_);
-      }
-    } else if (external_output_processor_->seek) {
-      // If we had buffered the data internally, flush it out to the external
-      // processor if we can.
-      external_output_processor_->seek(external_output_processor_->opaque,
-                                       position_ - bytes_used);
-      output_position_ = position_ - bytes_used;
-      while (output_position_ < position_) {
-        size_t num_to_write = position_ - output_position_;
-        if (!AppendBufferToExternalProcessor(it->second.owned_data.data() +
-                                                 output_position_ - position_ +
-                                                 bytes_used,
-                                             num_to_write)) {
-          return true;
-        }
-      }
-      it->second.owned_data.clear();
-    }
-  }
-  return true;
-}
-
-// Tries to write all the bytes up to the finalized position.
-jxl::Status JxlEncoderOutputProcessorWrapper::FlushOutput() {
-  JXL_ENSURE(!has_buffer_);
-  while (output_position_ < finalized_position_ &&
-         (avail_out_ == nullptr || *avail_out_ > 0)) {
-    JXL_ENSURE(!internal_buffers_.empty());
-    auto it = internal_buffers_.begin();
-    // If this fails, we are trying to move the finalized position past data
-    // that was not written yet. This is a library programming error.
-    JXL_ENSURE(output_position_ >= it->first);
-    JXL_ENSURE(it->second.written_bytes != 0);
-    size_t buffer_last_byte = it->first + it->second.written_bytes;
-    if (!it->second.owned_data.empty()) {
-      size_t start_in_buffer = output_position_ - it->first;
-      // Guaranteed by the invariant on `internal_buffers_`.
-      JXL_ENSURE(buffer_last_byte > output_position_);
-      size_t num_to_write =
-          std::min(buffer_last_byte, finalized_position_) - output_position_;
-      if (avail_out_ != nullptr) {
-        size_t n = std::min(num_to_write, *avail_out_);
-        memcpy(*next_out_, it->second.owned_data.data() + start_in_buffer, n);
-        *avail_out_ -= n;
-        *next_out_ += n;
-        output_position_ += n;
-      } else {
-        JXL_ENSURE(external_output_processor_);
-        if (!AppendBufferToExternalProcessor(
-                it->second.owned_data.data() + start_in_buffer, num_to_write)) {
-          return true;
-        }
-      }
-    } else {
-      size_t advance =
-          std::min(buffer_last_byte, finalized_position_) - output_position_;
-      output_position_ += advance;
-      if (avail_out_ != nullptr) {
-        *next_out_ += advance;
-        *avail_out_ -= advance;
-      }
-    }
-    if (buffer_last_byte == output_position_) {
-      internal_buffers_.erase(it);
-    }
-    if (external_output_processor_ && !external_output_processor_->seek) {
-      external_output_processor_->set_finalized_position(
-          external_output_processor_->opaque, output_position_);
-    }
-  }
-  return true;
-}
-
-bool JxlEncoderOutputProcessorWrapper::AppendBufferToExternalProcessor(
-    void* data, size_t count) {
-  JXL_DASSERT(external_output_processor_);
-  size_t n = count;
-  void* user_buffer = external_output_processor_->get_buffer(
-      external_output_processor_->opaque, &n);
-  if (user_buffer == nullptr || n == 0) {
-    stop_requested_ = true;
-    return false;
-  }
-  n = std::min(n, count);
-  memcpy(user_buffer, data, n);
-  external_output_processor_->release_buffer(external_output_processor_->opaque,
-                                             n);
-  output_position_ += n;
-  return true;
-}
-
-namespace jxl {
-
-size_t WriteBoxHeader(const jxl::BoxType& type, size_t size, bool unbounded,
-                      bool force_large_box, uint8_t* output) {
-  uint64_t box_size = 0;
-  bool large_size = false;
-  if (!unbounded) {
-    if (box_size >= kLargeBoxContentSizeThreshold || force_large_box) {
-      large_size = true;
-      // TODO(firsching): send a separate CL for this (+ test),
-      // quick fix in the old code: box_size += 8
-      box_size = size + kLargeBoxHeaderSize;
-    } else {
-      box_size = size + kSmallBoxHeaderSize;
-    }
-  }
-
-  size_t idx = 0;
-  {
-    const uint64_t store = large_size ? 1 : box_size;
-    for (size_t i = 0; i < 4; i++) {
-      output[idx++] = store >> (8 * (3 - i)) & 0xff;
-    }
-  }
-  for (size_t i = 0; i < 4; i++) {
-    output[idx++] = type[i];
-  }
-
-  if (large_size) {
-    for (size_t i = 0; i < 8; i++) {
-      output[idx++] = box_size >> (8 * (7 - i)) & 0xff;
-    }
-  }
-  return idx;
-}
-}  // namespace jxl
-
-template <typename WriteBox>
-jxl::Status JxlEncoderStruct::AppendBox(const jxl::BoxType& type,
-                                        bool unbounded, size_t box_max_size,
-                                        const WriteBox& write_box) {
-  size_t current_position = output_processor.CurrentPosition();
-  bool large_box = false;
-  size_t box_header_size = 0;
-  if (box_max_size >= jxl::kLargeBoxContentSizeThreshold && !unbounded) {
-    box_header_size = jxl::kLargeBoxHeaderSize;
-    large_box = true;
-  } else {
-    box_header_size = jxl::kSmallBoxHeaderSize;
-  }
-  JXL_RETURN_IF_ERROR(
-      output_processor.Seek(current_position + box_header_size));
-  size_t box_contents_start = output_processor.CurrentPosition();
-  JXL_RETURN_IF_ERROR(write_box());
-  size_t box_contents_end = output_processor.CurrentPosition();
-  JXL_RETURN_IF_ERROR(output_processor.Seek(current_position));
-  JXL_ENSURE(box_contents_end >= box_contents_start);
-  if (box_contents_end - box_contents_start > box_max_size) {
-    return JXL_API_ERROR(this, JXL_ENC_ERR_GENERIC,
-                         "Internal error: upper bound on box size was "
-                         "violated, upper bound: %" PRIuS ", actual: %" PRIuS,
-                         box_max_size, box_contents_end - box_contents_start);
-  }
-  // We need to release the buffer before Seek.
-  {
-    JXL_ASSIGN_OR_RETURN(
-        auto buffer,
-        output_processor.GetBuffer(box_contents_start - current_position));
-    const size_t n =
-        jxl::WriteBoxHeader(type, box_contents_end - box_contents_start,
-                            unbounded, large_box, buffer.data());
-    JXL_ENSURE(n == box_header_size);
-    JXL_RETURN_IF_ERROR(buffer.advance(n));
-  }
-  JXL_RETURN_IF_ERROR(output_processor.Seek(box_contents_end));
-  JXL_RETURN_IF_ERROR(output_processor.SetFinalizedPosition());
-  return jxl::OkStatus();
-}
-
-template <typename BoxContents>
-jxl::Status JxlEncoderStruct::AppendBoxWithContents(
-    const jxl::BoxType& type, const BoxContents& contents) {
-  size_t size = std::end(contents) - std::begin(contents);
-  return AppendBox(type, /*unbounded=*/false, size,
-                   [&]() { return AppendData(output_processor, contents); });
-}
-
-uint32_t JxlEncoderVersion(void) {
-  return JPEGXL_MAJOR_VERSION * 1000000 + JPEGXL_MINOR_VERSION * 1000 +
-         JPEGXL_PATCH_VERSION;
-}
-
-namespace {
-
-void WriteJxlpBoxCounter(uint32_t counter, bool last, uint8_t* buffer) {
-  if (last) counter |= 0x80000000;
-  for (size_t i = 0; i < 4; i++) {
-    buffer[i] = counter >> (8 * (3 - i)) & 0xff;
-  }
-}
-
-jxl::Status WriteJxlpBoxCounter(uint32_t counter, bool last,
-                                JxlOutputProcessorBuffer& buffer) {
-  uint8_t buf[4];
-  WriteJxlpBoxCounter(counter, last, buf);
-  JXL_RETURN_IF_ERROR(buffer.append(buf, 4));
-  return true;
-}
-
-void QueueFrame(
-    const JxlEncoderFrameSettings* frame_settings,
-    jxl::MemoryManagerUniquePtr<jxl::JxlEncoderQueuedFrame>& frame) {
-  if (frame_settings->values.lossless) {
-    frame->option_values.cparams.SetLossless();
-  }
-
-  jxl::JxlEncoderQueuedInput queued_input(frame_settings->enc->memory_manager);
-  queued_input.frame = std::move(frame);
-  frame_settings->enc->input_queue.emplace_back(std::move(queued_input));
-  frame_settings->enc->num_queued_frames++;
-}
-
-void QueueFastLosslessFrame(const JxlEncoderFrameSettings* frame_settings,
-                            JxlFastLosslessFrameState* fast_lossless_frame) {
-  jxl::JxlEncoderQueuedInput queued_input(frame_settings->enc->memory_manager);
-  queued_input.fast_lossless_frame.reset(fast_lossless_frame);
-  frame_settings->enc->input_queue.emplace_back(std::move(queued_input));
-  frame_settings->enc->num_queued_frames++;
-}
-
-void QueueBox(JxlEncoder* enc,
-              jxl::MemoryManagerUniquePtr<jxl::JxlEncoderQueuedBox>& box) {
-  jxl::JxlEncoderQueuedInput queued_input(enc->memory_manager);
-  queued_input.box = std::move(box);
-  enc->input_queue.emplace_back(std::move(queued_input));
-  enc->num_queued_boxes++;
-}
-
-// TODO(lode): share this code and the Brotli compression code in enc_jpeg_data
-JxlEncoderStatus BrotliCompress(int quality, const uint8_t* in, size_t in_size,
-                                jxl::PaddedBytes* out) {
-  JxlMemoryManager* memory_manager = out->memory_manager();
-  std::unique_ptr<BrotliEncoderState, decltype(BrotliEncoderDestroyInstance)*>
-      enc(BrotliEncoderCreateInstance(nullptr, nullptr, nullptr),
-          BrotliEncoderDestroyInstance);
-  if (!enc) return JXL_API_ERROR_NOSET("BrotliEncoderCreateInstance failed");
-
-  BrotliEncoderSetParameter(enc.get(), BROTLI_PARAM_QUALITY, quality);
-  BrotliEncoderSetParameter(enc.get(), BROTLI_PARAM_SIZE_HINT, in_size);
-
-  constexpr size_t kBufferSize = 128 * 1024;
-#define QUIT(message) return JXL_API_ERROR_NOSET(message)
-  JXL_ASSIGN_OR_QUIT(
-      jxl::PaddedBytes temp_buffer,
-      jxl::PaddedBytes::WithInitialSpace(memory_manager, kBufferSize),
-      "Initialization of PaddedBytes failed");
-#undef QUIT
-
-  size_t avail_in = in_size;
-  const uint8_t* next_in = in;
-
-  size_t total_out = 0;
-
-  for (;;) {
-    size_t avail_out = kBufferSize;
-    uint8_t* next_out = temp_buffer.data();
-    jxl::msan::MemoryIsInitialized(next_in, avail_in);
-    if (!BrotliEncoderCompressStream(enc.get(), BROTLI_OPERATION_FINISH,
-                                     &avail_in, &next_in, &avail_out, &next_out,
-                                     &total_out)) {
-      return JXL_API_ERROR_NOSET("Brotli compression failed");
-    }
-    size_t out_size = next_out - temp_buffer.data();
-    jxl::msan::UnpoisonMemory(next_out - out_size, out_size);
-    if (!out->resize(out->size() + out_size)) {
-      return JXL_API_ERROR_NOSET("resizing of PaddedBytes failed");
-    }
-
-    memcpy(out->data() + out->size() - out_size, temp_buffer.data(), out_size);
-    if (BrotliEncoderIsFinished(enc.get())) break;
-  }
-
-  return JxlErrorOrStatus::Success();
-}
-
-// The JXL codestream can have level 5 or level 10. Levels have certain
-// restrictions such as max allowed image dimensions. This function checks the
-// level required to support the current encoder settings. The debug_string is
-// intended to be used for developer API error messages, and may be set to
-// nullptr.
-int VerifyLevelSettings(const JxlEncoder* enc, std::string* debug_string) {
-  const auto& m = enc->metadata.m;
-
-  uint64_t xsize = enc->metadata.size.xsize();
-  uint64_t ysize = enc->metadata.size.ysize();
-  // The uncompressed ICC size, if it is used.
-  size_t icc_size = 0;
-  if (m.color_encoding.WantICC()) {
-    icc_size = m.color_encoding.ICC().size();
-  }
-
-  // Level 10 checks
-
-  if (xsize > (1ull << 30ull) || ysize > (1ull << 30ull) ||
-      xsize * ysize > (1ull << 40ull)) {
-    if (debug_string) *debug_string = "Too large image dimensions";
-    return -1;
-  }
-  if (icc_size > (1ull << 28)) {
-    if (debug_string) *debug_string = "Too large ICC profile size";
-    return -1;
-  }
-  if (m.num_extra_channels > 256) {
-    if (debug_string) *debug_string = "Too many extra channels";
-    return -1;
-  }
-
-  // Level 5 checks
-
-  if (!m.modular_16_bit_buffer_sufficient) {
-    if (debug_string) *debug_string = "Too high modular bit depth";
-    return 10;
-  }
-  if (xsize > (1ull << 18ull) || ysize > (1ull << 18ull) ||
-      xsize * ysize > (1ull << 28ull)) {
-    if (debug_string) *debug_string = "Too large image dimensions";
-    return 10;
-  }
-  if (icc_size > (1ull << 22)) {
-    if (debug_string) *debug_string = "Too large ICC profile";
-    return 10;
-  }
-  if (m.num_extra_channels > 4) {
-    if (debug_string) *debug_string = "Too many extra channels";
-    return 10;
-  }
-  for (const auto& eci : m.extra_channel_info) {
-    if (eci.type == jxl::ExtraChannel::kBlack) {
-      if (debug_string) *debug_string = "CMYK channel not allowed";
-      return 10;
-    }
-  }
-
-  // TODO(lode): also need to check if consecutive composite-still frames total
-  // pixel amount doesn't exceed 2**28 in the case of level 5. This should be
-  // done when adding frame and requires ability to add composite still frames
-  // to be added first.
-
-  // TODO(lode): also need to check animation duration of a frame. This should
-  // be done when adding frame, but first requires implementing setting the
-  // JxlFrameHeader for a frame.
-
-  // TODO(lode): also need to check properties such as num_splines, num_patches,
-  // modular_16bit_buffers and multiple properties of modular trees. However
-  // these are not user-set properties so cannot be checked here, but decisions
-  // the C++ encoder should be able to make based on the level.
-
-  // All level 5 checks passes, so can return the more compatible level 5
-  return 5;
-}
-
-JxlEncoderStatus CheckValidBitdepth(uint32_t bits_per_sample,
-                                    uint32_t exponent_bits_per_sample) {
-  if (!exponent_bits_per_sample) {
-    // The spec allows up to 31 for bits_per_sample here, but
-    // the code does not (yet) support it.
-    if (!(bits_per_sample > 0 && bits_per_sample <= 24)) {
-      return JXL_API_ERROR_NOSET("Invalid value for bits_per_sample");
-    }
-  } else if ((exponent_bits_per_sample > 8) ||
-             (bits_per_sample > 24 + exponent_bits_per_sample) ||
-             (bits_per_sample < 3 + exponent_bits_per_sample)) {
-    return JXL_API_ERROR_NOSET(
-        "Invalid float description: bits per sample = %u, exp bits = %u",
-        bits_per_sample, exponent_bits_per_sample);
-  }
-  return JxlErrorOrStatus::Success();
-}
-
-JxlEncoderStatus VerifyInputBitDepth(JxlBitDepth bit_depth,
-                                     JxlPixelFormat format) {
-  return JxlErrorOrStatus::Success();
-}
-
-inline bool EncodeVarInt(uint64_t value, size_t output_size, size_t* output_pos,
-                         uint8_t* output) {
-  // While more than 7 bits of data are left,
-  // store 7 bits and set the next byte flag
-  while (value > 127) {
-    // TODO(eustas): should it be `>=` ?
-    if (*output_pos > output_size) return false;
-    // |128: Set the next byte flag
-    output[(*output_pos)++] = (static_cast<uint8_t>(value & 127)) | 128;
-    // Remove the seven bits we just wrote
-    value >>= 7;
-  }
-  // TODO(eustas): should it be `>=` ?
-  if (*output_pos > output_size) return false;
-  output[(*output_pos)++] = static_cast<uint8_t>(value & 127);
-  return true;
-}
-
-bool EncodeFrameIndexBox(const jxl::JxlEncoderFrameIndexBox& frame_index_box,
-                         std::vector<uint8_t>& buffer_vec) {
-  bool ok = true;
-  int NF = 0;
-  for (size_t i = 0; i < frame_index_box.entries.size(); ++i) {
-    if (i == 0 || frame_index_box.entries[i].to_be_indexed) {
-      ++NF;
-    }
-  }
-  // Frame index box contents varint + 8 bytes
-  // continue with NF * 3 * varint
-  // varint max length is 10 for 64 bit numbers, and these numbers
-  // are limited to 63 bits.
-  static const int kVarintMaxLength = 10;
-  static const int kFrameIndexBoxHeaderLength = kVarintMaxLength + 8;
-  static const int kFrameIndexBoxElementLength = 3 * kVarintMaxLength;
-  const int buffer_size =
-      kFrameIndexBoxHeaderLength + NF * kFrameIndexBoxElementLength;
-  buffer_vec.resize(buffer_size);
-  uint8_t* buffer = buffer_vec.data();
-  size_t output_pos = 0;
-  ok &= EncodeVarInt(NF, buffer_vec.size(), &output_pos, buffer);
-  StoreBE32(frame_index_box.TNUM, &buffer[output_pos]);
-  output_pos += 4;
-  StoreBE32(frame_index_box.TDEN, &buffer[output_pos]);
-  output_pos += 4;
-  // When we record a frame in the index, the record needs to know
-  // how many frames until the next indexed frame. That is why
-  // we store the 'prev' record. That 'prev' record needs to store
-  // the offset byte position to previously recorded indexed frame,
-  // that's why we also trace previous to the previous frame.
-  int prev_prev_ix = -1;  // For position offset (OFFi) delta coding.
-  int prev_ix = 0;
-  int T_prev = 0;
-  int T = 0;
-  for (size_t i = 1; i < frame_index_box.entries.size(); ++i) {
-    if (frame_index_box.entries[i].to_be_indexed) {
-      // Now we can record the previous entry, since we need to store
-      // there how many frames until the next one.
-      int64_t OFFi = frame_index_box.entries[prev_ix].OFFi;
-      if (prev_prev_ix != -1) {
-        // Offi needs to be offset of start byte of this frame compared to start
-        // byte of previous frame from this index in the JPEG XL codestream. For
-        // the first frame, this is the offset from the first byte of the JPEG
-        // XL codestream.
-        OFFi -= frame_index_box.entries[prev_prev_ix].OFFi;
-      }
-      int32_t Ti = T_prev;
-      int32_t Fi = i - prev_ix;
-      ok &= EncodeVarInt(OFFi, buffer_vec.size(), &output_pos, buffer);
-      ok &= EncodeVarInt(Ti, buffer_vec.size(), &output_pos, buffer);
-      ok &= EncodeVarInt(Fi, buffer_vec.size(), &output_pos, buffer);
-      prev_prev_ix = prev_ix;
-      prev_ix = i;
-      T_prev = T;
-      T += frame_index_box.entries[i].duration;
-    }
-  }
-  {
-    // Last frame.
-    size_t i = frame_index_box.entries.size();
-    int64_t OFFi = frame_index_box.entries[prev_ix].OFFi;
-    if (prev_prev_ix != -1) {
-      OFFi -= frame_index_box.entries[prev_prev_ix].OFFi;
-    }
-    int32_t Ti = T_prev;
-    int32_t Fi = i - prev_ix;
-    ok &= EncodeVarInt(OFFi, buffer_vec.size(), &output_pos, buffer);
-    ok &= EncodeVarInt(Ti, buffer_vec.size(), &output_pos, buffer);
-    ok &= EncodeVarInt(Fi, buffer_vec.size(), &output_pos, buffer);
-  }
-  if (ok) buffer_vec.resize(output_pos);
-  return ok;
-}
-
-struct RunnerTicket {
-  explicit RunnerTicket(jxl::ThreadPool* pool) : pool(pool) {}
-  jxl::ThreadPool* pool;
-  std::atomic<bool> has_error{false};
-};
-
-void FastLosslessRunnerAdapter(void* void_ticket, void* opaque,
-                               void fun(void*, size_t), size_t count) {
-  auto* ticket = reinterpret_cast<RunnerTicket*>(void_ticket);
-  if (!jxl::RunOnPool(
-          ticket->pool, 0, count, jxl::ThreadPool::NoInit,
-          [&](size_t i, size_t) -> jxl::Status {
-            fun(opaque, i);
-            return true;
-          },
-          "Encode fast lossless")) {
-    ticket->has_error = true;
-  }
-}
-
-}  // namespace
-
-jxl::Status JxlEncoderStruct::ProcessOneEnqueuedInput() {
-  jxl::PaddedBytes header_bytes{&memory_manager};
-
-  jxl::JxlEncoderQueuedInput& input = input_queue[0];
-
-  // TODO(lode): split this into 3 functions: for adding the signature and other
-  // initial headers (jbrd, ...), one for adding frame, and one for adding user
-  // box.
-
-  if (!wrote_bytes) {
-    // First time encoding any data, verify the level 5 vs level 10 settings
-    std::string level_message;
-    int required_level = VerifyLevelSettings(this, &level_message);
-    // Only level 5 and 10 are defined, and the function can return -1 to
-    // indicate full incompatibility.
-    JXL_ENSURE(required_level == -1 || required_level == 5 ||
-               required_level == 10);
-    // codestream_level == -1 means auto-set to the required level
-    if (codestream_level == -1) codestream_level = required_level;
-    if (codestream_level == 5 && required_level != 5) {
-      // If the required level is 10, return error rather than automatically
-      // setting the level to 10, to avoid inadvertently creating a level 10
-      // JXL file while intending to target a level 5 decoder.
-      return JXL_API_ERROR(
-          this, JXL_ENC_ERR_API_USAGE, "%s",
-          ("Codestream level verification for level 5 failed: " + level_message)
-              .c_str());
-    }
-    if (required_level == -1) {
-      return JXL_API_ERROR(
-          this, JXL_ENC_ERR_API_USAGE, "%s",
-          ("Codestream level verification for level 10 failed: " +
-           level_message)
-              .c_str());
-    }
-    jxl::AuxOut* aux_out =
-        input.frame ? input.frame->option_values.aux_out : nullptr;
-    jxl::BitWriter writer{&memory_manager};
-    if (!WriteCodestreamHeaders(&metadata, &writer, aux_out)) {
-      return JXL_API_ERROR(this, JXL_ENC_ERR_GENERIC,
-                           "Failed to write codestream header");
-    }
-    // Only send ICC (at least several hundred bytes) if fields aren't enough.
-    if (metadata.m.color_encoding.WantICC()) {
-      if (!jxl::WriteICC(
-              jxl::Span<const uint8_t>(metadata.m.color_encoding.ICC()),
-              &writer, jxl::LayerType::Header, aux_out)) {
-        return JXL_API_ERROR(this, JXL_ENC_ERR_GENERIC,
-                             "Failed to write ICC profile");
-      }
-    }
-    // TODO(lode): preview should be added here if a preview image is added
-
-    JXL_RETURN_IF_ERROR(
-        writer.WithMaxBits(8, jxl::LayerType::Header, aux_out, [&] {
-          writer.ZeroPadToByte();
-          return true;
-        }));
-
-    header_bytes = std::move(writer).TakeBytes();
-
-    // Not actually the end of frame, but the end of metadata/ICC, but helps
-    // the next frame to start here for indexing purposes.
-    codestream_bytes_written_end_of_frame += header_bytes.size();
-
-    if (MustUseContainer()) {
-      // Add "JXL " and ftyp box.
-      {
-        JXL_ASSIGN_OR_RETURN(auto buffer, output_processor.GetBuffer(
-                                              jxl::kContainerHeader.size()));
-        JXL_RETURN_IF_ERROR(buffer.append(jxl::kContainerHeader));
-      }
-      if (codestream_level != 5) {
-        // Add jxll box directly after the ftyp box to indicate the codestream
-        // level.
-        JXL_ASSIGN_OR_RETURN(auto buffer, output_processor.GetBuffer(
-                                              jxl::kLevelBoxHeader.size() + 1));
-        JXL_RETURN_IF_ERROR(buffer.append(jxl::kLevelBoxHeader));
-        uint8_t cl = codestream_level;
-        JXL_RETURN_IF_ERROR(buffer.append(&cl, 1));
-      }
-
-      // Whether to write the basic info and color profile header of the
-      // codestream into an early separate jxlp box, so that it comes before
-      // metadata or jpeg reconstruction boxes. In theory this could simply
-      // always be done, but there's no reason to add an extra box with box
-      // header overhead if the codestream will already come immediately after
-      // the signature and level boxes.
-      bool partial_header =
-          store_jpeg_metadata ||
-          (use_boxes && (!input.frame && !input.fast_lossless_frame));
-
-      if (partial_header) {
-        auto write_box = [&]() -> jxl::Status {
-          JXL_ASSIGN_OR_RETURN(
-              auto buffer, output_processor.GetBuffer(header_bytes.size() + 4));
-          JXL_RETURN_IF_ERROR(
-              WriteJxlpBoxCounter(jxlp_counter++, /*last=*/false, buffer));
-          JXL_RETURN_IF_ERROR(buffer.append(header_bytes));
-          return jxl::OkStatus();
-        };
-        JXL_RETURN_IF_ERROR(AppendBox(jxl::MakeBoxType("jxlp"),
-                                      /*unbounded=*/false,
-                                      header_bytes.size() + 4, write_box));
-        header_bytes.clear();
-      }
-
-      if (store_jpeg_metadata && !jpeg_metadata.empty()) {
-        JXL_RETURN_IF_ERROR(
-            AppendBoxWithContents(jxl::MakeBoxType("jbrd"), jpeg_metadata));
-      }
-    }
-    wrote_bytes = true;
-  }
-
-  JXL_RETURN_IF_ERROR(output_processor.SetFinalizedPosition());
-
-  // Choose frame or box processing: exactly one of the two unique pointers (box
-  // or frame) in the input queue item is non-null.
-  if (input.frame || input.fast_lossless_frame) {
-    jxl::MemoryManagerUniquePtr<jxl::JxlEncoderQueuedFrame> input_frame =
-        std::move(input.frame);
-    jxl::FJXLFrameUniquePtr fast_lossless_frame =
-        std::move(input.fast_lossless_frame);
-    input_queue.erase(input_queue.begin());
-    num_queued_frames--;
-    if (input_frame) {
-      for (unsigned idx = 0; idx < input_frame->ec_initialized.size(); idx++) {
-        if (!input_frame->ec_initialized[idx]) {
-          return JXL_API_ERROR(this, JXL_ENC_ERR_API_USAGE,
-                               "Extra channel %u is not initialized", idx);
-        }
-      }
-
-      // TODO(zond): If the input queue is empty and the frames_closed is true,
-      // then mark this frame as the last.
-
-      // TODO(zond): Handle progressive mode like EncodeFile does it.
-      // TODO(zond): Handle animation like EncodeFile does it, by checking if
-      //             JxlEncoderCloseFrames has been called and if the frame
-      //             queue is empty (to see if it's the last animation frame).
-
-      if (metadata.m.xyb_encoded) {
-        input_frame->option_values.cparams.color_transform =
-            jxl::ColorTransform::kXYB;
-      } else {
-        // TODO(zond): Figure out when to use kYCbCr instead.
-        input_frame->option_values.cparams.color_transform =
-            jxl::ColorTransform::kNone;
-      }
-    }
-
-    uint32_t duration;
-    uint32_t timecode;
-    if (input_frame && metadata.m.have_animation) {
-      duration = input_frame->option_values.header.duration;
-      timecode = input_frame->option_values.header.timecode;
-    } else {
-      // If have_animation is false, the encoder should ignore the duration and
-      // timecode values. However, assigning them to ib will cause the encoder
-      // to write an invalid frame header that can't be decoded so ensure
-      // they're the default value of 0 here.
-      duration = 0;
-      timecode = 0;
-    }
-
-    const bool last_frame = frames_closed && (num_queued_frames == 0);
-
-    uint32_t max_bits_per_sample = metadata.m.bit_depth.bits_per_sample;
-    for (const auto& info : metadata.m.extra_channel_info) {
-      max_bits_per_sample =
-          std::max(max_bits_per_sample, info.bit_depth.bits_per_sample);
-    }
-    // Heuristic upper bound on how many bits a single pixel in a single channel
-    // can use.
-    uint32_t bits_per_channels_estimate =
-        std::max(24u, max_bits_per_sample + 3);
-    size_t upper_bound_on_compressed_size_bits =
-        metadata.xsize() * metadata.ysize() *
-        (metadata.m.color_encoding.Channels() + metadata.m.num_extra_channels) *
-        bits_per_channels_estimate;
-    // Add a 1MB = 0x100000 for an heuristic upper bound on small sizes.
-    size_t upper_bound_on_compressed_size_bytes =
-        0x100000 + (upper_bound_on_compressed_size_bits >> 3);
-    bool use_large_box = upper_bound_on_compressed_size_bytes >=
-                         jxl::kLargeBoxContentSizeThreshold;
-    size_t box_header_size =
-        use_large_box ? jxl::kLargeBoxHeaderSize : jxl::kSmallBoxHeaderSize;
-
-    const size_t frame_start_pos = output_processor.CurrentPosition();
-    if (MustUseContainer()) {
-      if (!last_frame || jxlp_counter > 0) {
-        // If this is the last frame and no jxlp boxes were used yet, it's
-        // slightly more efficient to write a jxlc box since it has 4 bytes
-        // less overhead.
-        box_header_size += 4;  // jxlp_counter field
-      }
-      JXL_RETURN_IF_ERROR(
-          output_processor.Seek(frame_start_pos + box_header_size));
-    }
-    const size_t frame_codestream_start = output_processor.CurrentPosition();
-
-    JXL_RETURN_IF_ERROR(AppendData(output_processor, header_bytes));
-
-    if (input_frame) {
-      frame_index_box.AddFrame(codestream_bytes_written_end_of_frame, duration,
-                               input_frame->option_values.frame_index_box);
-
-      size_t save_as_reference =
-          input_frame->option_values.header.layer_info.save_as_reference;
-      if (save_as_reference >= 3) {
-        return JXL_API_ERROR(
-            this, JXL_ENC_ERR_API_USAGE,
-            "Cannot use save_as_reference values >=3 (found: %d)",
-            static_cast<int>(save_as_reference));
-      }
-
-      jxl::FrameInfo frame_info;
-      frame_info.is_last = last_frame;
-      frame_info.save_as_reference = save_as_reference;
-      frame_info.source =
-          input_frame->option_values.header.layer_info.blend_info.source;
-      frame_info.clamp = FROM_JXL_BOOL(
-          input_frame->option_values.header.layer_info.blend_info.clamp);
-      frame_info.alpha_channel =
-          input_frame->option_values.header.layer_info.blend_info.alpha;
-      frame_info.extra_channel_blending_info.resize(
-          metadata.m.num_extra_channels);
-      // If extra channel blend info has not been set, use the blend mode from
-      // the layer_info.
-      JxlBlendInfo default_blend_info =
-          input_frame->option_values.header.layer_info.blend_info;
-      for (size_t i = 0; i < metadata.m.num_extra_channels; ++i) {
-        auto& to = frame_info.extra_channel_blending_info[i];
-        const auto& from =
-            i < input_frame->option_values.extra_channel_blend_info.size()
-                ? input_frame->option_values.extra_channel_blend_info[i]
-                : default_blend_info;
-        to.mode = static_cast<jxl::BlendMode>(from.blendmode);
-        to.source = from.source;
-        to.alpha_channel = from.alpha;
-        to.clamp = (from.clamp != 0);
-      }
-      frame_info.origin.x0 =
-          input_frame->option_values.header.layer_info.crop_x0;
-      frame_info.origin.y0 =
-          input_frame->option_values.header.layer_info.crop_y0;
-      frame_info.blendmode = static_cast<jxl::BlendMode>(
-          input_frame->option_values.header.layer_info.blend_info.blendmode);
-      frame_info.blend =
-          input_frame->option_values.header.layer_info.blend_info.blendmode !=
-          JXL_BLEND_REPLACE;
-      frame_info.image_bit_depth = input_frame->option_values.image_bit_depth;
-      frame_info.duration = duration;
-      frame_info.timecode = timecode;
-      frame_info.name = input_frame->option_values.frame_name;
-
-      if (!jxl::EncodeFrame(&memory_manager, input_frame->option_values.cparams,
-                            frame_info, &metadata, input_frame->frame_data, cms,
-                            thread_pool.get(), &output_processor,
-                            input_frame->option_values.aux_out)) {
-        return JXL_API_ERROR(this, JXL_ENC_ERR_GENERIC,
-                             "Failed to encode frame");
-      }
-    } else {
-      JXL_ENSURE(fast_lossless_frame);
-      RunnerTicket ticket{thread_pool.get()};
-      bool ok = JxlFastLosslessProcessFrame(
-          fast_lossless_frame.get(), last_frame, &ticket,
-          &FastLosslessRunnerAdapter, &output_processor);
-      if (!ok || ticket.has_error) {
-        return JXL_API_ERROR(this, JXL_ENC_ERR_GENERIC,
-                             "Internal: JxlFastLosslessProcessFrame failed");
-      }
-    }
-
-    const size_t frame_codestream_end = output_processor.CurrentPosition();
-    const size_t frame_codestream_size =
-        frame_codestream_end - frame_codestream_start;
-
-    codestream_bytes_written_end_of_frame +=
-        frame_codestream_size - header_bytes.size();
-
-    if (MustUseContainer()) {
-      JXL_RETURN_IF_ERROR(output_processor.Seek(frame_start_pos));
-      std::vector<uint8_t> box_header(box_header_size);
-      if (!use_large_box &&
-          frame_codestream_size >= jxl::kLargeBoxContentSizeThreshold) {
-        // Assuming our upper bound estimate is correct, this should never
-        // happen.
-        return JXL_API_ERROR(
-            this, JXL_ENC_ERR_GENERIC,
-            "Box size was estimated to be small, but turned out to be large. "
-            "Please file this error in size estimation as a bug.");
-      }
-      if (last_frame && jxlp_counter == 0) {
-        size_t n = jxl::WriteBoxHeader(
-            jxl::MakeBoxType("jxlc"), frame_codestream_size,
-            /*unbounded=*/false, use_large_box, box_header.data());
-        JXL_ENSURE(n == box_header_size);
-      } else {
-        size_t n = jxl::WriteBoxHeader(
-            jxl::MakeBoxType("jxlp"), frame_codestream_size + 4,
-            /*unbounded=*/false, use_large_box, box_header.data());
-        JXL_ENSURE(n == box_header_size - 4);
-        WriteJxlpBoxCounter(jxlp_counter++, last_frame,
-                            &box_header[box_header_size - 4]);
-      }
-      JXL_RETURN_IF_ERROR(AppendData(output_processor, box_header));
-      JXL_ENSURE(output_processor.CurrentPosition() == frame_codestream_start);
-      JXL_RETURN_IF_ERROR(output_processor.Seek(frame_codestream_end));
-    }
-    JXL_RETURN_IF_ERROR(output_processor.SetFinalizedPosition());
-    if (input_frame) {
-      last_used_cparams = input_frame->option_values.cparams;
-    }
-    if (last_frame && frame_index_box.StoreFrameIndexBox()) {
-      std::vector<uint8_t> index_box_content;
-      // Enough buffer has been allocated, this function should never fail in
-      // writing.
-      JXL_ENSURE(EncodeFrameIndexBox(frame_index_box, index_box_content));
-      JXL_RETURN_IF_ERROR(AppendBoxWithContents(jxl::MakeBoxType("jxli"),
-                                                jxl::Bytes(index_box_content)));
-    }
-  } else {
-    // Not a frame, so is a box instead
-    jxl::MemoryManagerUniquePtr<jxl::JxlEncoderQueuedBox> box =
-        std::move(input.box);
-    input_queue.erase(input_queue.begin());
-    num_queued_boxes--;
-
-    if (box->compress_box) {
-      jxl::PaddedBytes compressed(&memory_manager);
-      // Prepend the original box type in the brob box contents
-      JXL_RETURN_IF_ERROR(compressed.append(box->type));
-      if (JXL_ENC_SUCCESS !=
-          BrotliCompress((brotli_effort >= 0 ? brotli_effort : 4),
-                         box->contents.data(), box->contents.size(),
-                         &compressed)) {
-        return JXL_API_ERROR(this, JXL_ENC_ERR_GENERIC,
-                             "Brotli compression for brob box failed");
-      }
-
-      JXL_RETURN_IF_ERROR(
-          AppendBoxWithContents(jxl::MakeBoxType("brob"), compressed));
-    } else {
-      JXL_RETURN_IF_ERROR(AppendBoxWithContents(box->type, box->contents));
-    }
-  }
-
-  return jxl::OkStatus();
-}
-
-JxlEncoderStatus JxlEncoderSetColorEncoding(JxlEncoder* enc,
-                                            const JxlColorEncoding* color) {
-  if (!enc->basic_info_set) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE, "Basic info not yet set");
-  }
-  if (enc->color_encoding_set) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                         "Color encoding is already set");
-  }
-  if (!enc->metadata.m.color_encoding.FromExternal(*color)) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_GENERIC, "Error in color conversion");
-  }
-  if (enc->metadata.m.color_encoding.GetColorSpace() ==
-      jxl::ColorSpace::kGray) {
-    if (enc->basic_info.num_color_channels != 1) {
-      return JXL_API_ERROR(
-          enc, JXL_ENC_ERR_API_USAGE,
-          "Cannot use grayscale color encoding with num_color_channels != 1");
-    }
-  } else {
-    if (enc->basic_info.num_color_channels != 3) {
-      return JXL_API_ERROR(
-          enc, JXL_ENC_ERR_API_USAGE,
-          "Cannot use RGB color encoding with num_color_channels != 3");
-    }
-  }
-  enc->color_encoding_set = true;
-  if (!enc->intensity_target_set) {
-    jxl::SetIntensityTarget(&enc->metadata.m);
-  }
-  return JxlErrorOrStatus::Success();
-}
-
-JxlEncoderStatus JxlEncoderSetICCProfile(JxlEncoder* enc,
-                                         const uint8_t* icc_profile,
-                                         size_t size) {
-  if (!enc->basic_info_set) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE, "Basic info not yet set");
-  }
-  if (enc->color_encoding_set) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                         "ICC profile is already set");
-  }
-  if (size == 0) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_BAD_INPUT, "Empty ICC profile");
-  }
-  jxl::IccBytes icc;
-  icc.assign(icc_profile, icc_profile + size);
-  if (enc->cms_set) {
-    if (!enc->metadata.m.color_encoding.SetICC(std::move(icc), &enc->cms)) {
-      return JXL_API_ERROR(enc, JXL_ENC_ERR_BAD_INPUT,
-                           "ICC profile could not be set");
-    }
-  } else {
-    enc->metadata.m.color_encoding.SetICCRaw(std::move(icc));
-  }
-  if (enc->metadata.m.color_encoding.GetColorSpace() ==
-      jxl::ColorSpace::kGray) {
-    if (enc->basic_info.num_color_channels != 1) {
-      return JXL_API_ERROR(
-          enc, JXL_ENC_ERR_BAD_INPUT,
-          "Cannot use grayscale ICC profile with num_color_channels != 1");
-    }
-  } else {
-    if (enc->basic_info.num_color_channels != 3) {
-      return JXL_API_ERROR(
-          enc, JXL_ENC_ERR_BAD_INPUT,
-          "Cannot use RGB ICC profile with num_color_channels != 3");
-    }
-    // TODO(jon): also check that a kBlack extra channel is provided in the CMYK
-    // case
-  }
-  enc->color_encoding_set = true;
-  if (!enc->intensity_target_set) {
-    jxl::SetIntensityTarget(&enc->metadata.m);
-  }
-
-  if (!enc->basic_info.uses_original_profile && enc->cms_set) {
-    enc->metadata.m.color_encoding.DecideIfWantICC(enc->cms);
-  }
-
-  return JxlErrorOrStatus::Success();
-}
-
-void JxlEncoderInitBasicInfo(JxlBasicInfo* info) {
-  info->have_container = JXL_FALSE;
-  info->xsize = 0;
-  info->ysize = 0;
-  info->bits_per_sample = 8;
-  info->exponent_bits_per_sample = 0;
-  info->intensity_target = 0.f;
-  info->min_nits = 0.f;
-  info->relative_to_max_display = JXL_FALSE;
-  info->linear_below = 0.f;
-  info->uses_original_profile = JXL_FALSE;
-  info->have_preview = JXL_FALSE;
-  info->have_animation = JXL_FALSE;
-  info->orientation = JXL_ORIENT_IDENTITY;
-  info->num_color_channels = 3;
-  info->num_extra_channels = 0;
-  info->alpha_bits = 0;
-  info->alpha_exponent_bits = 0;
-  info->alpha_premultiplied = JXL_FALSE;
-  info->preview.xsize = 0;
-  info->preview.ysize = 0;
-  info->intrinsic_xsize = 0;
-  info->intrinsic_ysize = 0;
-  info->animation.tps_numerator = 10;
-  info->animation.tps_denominator = 1;
-  info->animation.num_loops = 0;
-  info->animation.have_timecodes = JXL_FALSE;
-}
-
-void JxlEncoderInitFrameHeader(JxlFrameHeader* frame_header) {
-  // For each field, the default value of the specification is used. Depending
-  // on whether an animation frame, or a composite still blending frame,
-  // is used, different fields have to be set up by the user after initing
-  // the frame header.
-  frame_header->duration = 0;
-  frame_header->timecode = 0;
-  frame_header->name_length = 0;
-  // In the specification, the default value of is_last is !frame_type, and the
-  // default frame_type is kRegularFrame which has value 0, so is_last is true
-  // by default. However, the encoder does not use this value (the field exists
-  // for the decoder to set) since last frame is determined by usage of
-  // JxlEncoderCloseFrames instead.
-  frame_header->is_last = JXL_TRUE;
-  frame_header->layer_info.have_crop = JXL_FALSE;
-  frame_header->layer_info.crop_x0 = 0;
-  frame_header->layer_info.crop_y0 = 0;
-  // These must be set if have_crop is enabled, but the default value has
-  // have_crop false, and these dimensions 0. The user must set these to the
-  // desired size after enabling have_crop (which is not yet implemented).
-  frame_header->layer_info.xsize = 0;
-  frame_header->layer_info.ysize = 0;
-  JxlEncoderInitBlendInfo(&frame_header->layer_info.blend_info);
-  frame_header->layer_info.save_as_reference = 0;
-}
-
-void JxlEncoderInitBlendInfo(JxlBlendInfo* blend_info) {
-  // Default blend mode in the specification is 0. Note that combining
-  // blend mode of replace with a duration is not useful, but the user has to
-  // manually set duration in case of animation, or manually change the blend
-  // mode in case of composite stills, so initing to a combination that is not
-  // useful on its own is not an issue.
-  blend_info->blendmode = JXL_BLEND_REPLACE;
-  blend_info->source = 0;
-  blend_info->alpha = 0;
-  blend_info->clamp = 0;
-}
-
-JxlEncoderStatus JxlEncoderSetBasicInfo(JxlEncoder* enc,
-                                        const JxlBasicInfo* info) {
-  if (!enc->metadata.size.Set(info->xsize, info->ysize)) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE, "Invalid dimensions");
-  }
-  if (JXL_ENC_SUCCESS != CheckValidBitdepth(info->bits_per_sample,
-                                            info->exponent_bits_per_sample)) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE, "Invalid bit depth");
-  }
-
-  enc->metadata.m.bit_depth.bits_per_sample = info->bits_per_sample;
-  enc->metadata.m.bit_depth.exponent_bits_per_sample =
-      info->exponent_bits_per_sample;
-  enc->metadata.m.bit_depth.floating_point_sample =
-      (info->exponent_bits_per_sample != 0u);
-  enc->metadata.m.modular_16_bit_buffer_sufficient =
-      (!FROM_JXL_BOOL(info->uses_original_profile) ||
-       info->bits_per_sample <= 12) &&
-      info->alpha_bits <= 12;
-  if ((info->intrinsic_xsize > 0 || info->intrinsic_ysize > 0) &&
-      (info->intrinsic_xsize != info->xsize ||
-       info->intrinsic_ysize != info->ysize)) {
-    if (info->intrinsic_xsize > (1ull << 30ull) ||
-        info->intrinsic_ysize > (1ull << 30ull) ||
-        !enc->metadata.m.intrinsic_size.Set(info->intrinsic_xsize,
-                                            info->intrinsic_ysize)) {
-      return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                           "Invalid intrinsic dimensions");
-    }
-    enc->metadata.m.have_intrinsic_size = true;
-  }
-
-  // The number of extra channels includes the alpha channel, so for example and
-  // RGBA with no other extra channels, has exactly num_extra_channels == 1
-  enc->metadata.m.num_extra_channels = info->num_extra_channels;
-  enc->metadata.m.extra_channel_info.resize(enc->metadata.m.num_extra_channels);
-  if (info->num_extra_channels == 0 && info->alpha_bits) {
-    return JXL_API_ERROR(
-        enc, JXL_ENC_ERR_API_USAGE,
-        "when alpha_bits is non-zero, the number of channels must be at least "
-        "1");
-  }
-  // If the user provides non-zero alpha_bits, we make the channel info at index
-  // zero the appropriate alpha channel.
-  if (info->alpha_bits) {
-    JxlExtraChannelInfo channel_info;
-    JxlEncoderInitExtraChannelInfo(JXL_CHANNEL_ALPHA, &channel_info);
-    channel_info.bits_per_sample = info->alpha_bits;
-    channel_info.exponent_bits_per_sample = info->alpha_exponent_bits;
-    if (JxlEncoderSetExtraChannelInfo(enc, 0, &channel_info)) {
-      return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                           "Problem setting extra channel info for alpha");
-    }
-  }
-
-  enc->metadata.m.xyb_encoded = !FROM_JXL_BOOL(info->uses_original_profile);
-  if (info->orientation > 0 && info->orientation <= 8) {
-    enc->metadata.m.orientation = info->orientation;
-  } else {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                         "Invalid value for orientation field");
-  }
-  if (info->num_color_channels != 1 && info->num_color_channels != 3) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                         "Invalid number of color channels");
-  }
-  if (info->intensity_target != 0) {
-    enc->metadata.m.SetIntensityTarget(info->intensity_target);
-    enc->intensity_target_set = true;
-  } else if (enc->color_encoding_set) {
-    // If this is false, JxlEncoderSetColorEncoding will be called later and we
-    // will get one more chance to call jxl::SetIntensityTarget, after the color
-    // encoding is indeed set.
-    jxl::SetIntensityTarget(&enc->metadata.m);
-    enc->intensity_target_set = true;
-  }
-  enc->metadata.m.tone_mapping.min_nits = info->min_nits;
-  enc->metadata.m.tone_mapping.relative_to_max_display =
-      FROM_JXL_BOOL(info->relative_to_max_display);
-  enc->metadata.m.tone_mapping.linear_below = info->linear_below;
-  enc->basic_info = *info;
-  enc->basic_info_set = true;
-
-  enc->metadata.m.have_animation = FROM_JXL_BOOL(info->have_animation);
-  if (info->have_animation) {
-    if (info->animation.tps_denominator < 1) {
-      return JXL_API_ERROR(
-          enc, JXL_ENC_ERR_API_USAGE,
-          "If animation is used, tps_denominator must be >= 1");
-    }
-    if (info->animation.tps_numerator < 1) {
-      return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                           "If animation is used, tps_numerator must be >= 1");
-    }
-    enc->metadata.m.animation.tps_numerator = info->animation.tps_numerator;
-    enc->metadata.m.animation.tps_denominator = info->animation.tps_denominator;
-    enc->metadata.m.animation.num_loops = info->animation.num_loops;
-    enc->metadata.m.animation.have_timecodes =
-        FROM_JXL_BOOL(info->animation.have_timecodes);
-  }
-  std::string level_message;
-  int required_level = VerifyLevelSettings(enc, &level_message);
-  if (required_level == -1 ||
-      (static_cast<int>(enc->codestream_level) < required_level &&
-       enc->codestream_level != -1)) {
-    return JXL_API_ERROR(
-        enc, JXL_ENC_ERR_API_USAGE, "%s",
-        ("Codestream level verification for level " +
-         std::to_string(enc->codestream_level) + " failed: " + level_message)
-            .c_str());
-  }
-  return JxlErrorOrStatus::Success();
-}
-
-void JxlEncoderInitExtraChannelInfo(JxlExtraChannelType type,
-                                    JxlExtraChannelInfo* info) {
-  info->type = type;
-  info->bits_per_sample = 8;
-  info->exponent_bits_per_sample = 0;
-  info->dim_shift = 0;
-  info->name_length = 0;
-  info->alpha_premultiplied = JXL_FALSE;
-  info->spot_color[0] = 0;
-  info->spot_color[1] = 0;
-  info->spot_color[2] = 0;
-  info->spot_color[3] = 0;
-  info->cfa_channel = 0;
-}
-
-JXL_EXPORT JxlEncoderStatus JxlEncoderSetUpsamplingMode(JxlEncoder* enc,
-                                                        const int64_t factor,
-                                                        const int64_t mode) {
-  // for convenience, allow calling this with factor 1 and just make it a no-op
-  if (factor == 1) return JxlErrorOrStatus::Success();
-  if (factor != 2 && factor != 4 && factor != 8) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                         "Invalid upsampling factor");
-  }
-  if (mode < -1)
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE, "Invalid upsampling mode");
-  if (mode > 1) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_NOT_SUPPORTED,
-                         "Unsupported upsampling mode");
-  }
-
-  const size_t count = (factor == 2 ? 15 : (factor == 4 ? 55 : 210));
-  auto& td = enc->metadata.transform_data;
-  float* weights = (factor == 2 ? td.upsampling2_weights
-                                : (factor == 4 ? td.upsampling4_weights
-                                               : td.upsampling8_weights));
-  if (mode == -1) {
-    // Default fancy upsampling: don't signal custom weights
-    enc->metadata.transform_data.custom_weights_mask &= ~(factor >> 1);
-  } else if (mode == 0) {
-    // Nearest neighbor upsampling
-    enc->metadata.transform_data.custom_weights_mask |= (factor >> 1);
-    memset(weights, 0, sizeof(float) * count);
-    if (factor == 2) {
-      weights[9] = 1.f;
-    } else if (factor == 4) {
-      for (int i : {19, 24, 49}) weights[i] = 1.f;
-    } else if (factor == 8) {
-      for (int i : {39, 44, 49, 54, 119, 124, 129, 174, 179, 204}) {
-        weights[i] = 1.f;
-      }
-    }
-  } else if (mode == 1) {
-    // 'Pixel dots' upsampling (nearest-neighbor with cut corners)
-    JxlEncoderSetUpsamplingMode(enc, factor, 0);
-    if (factor == 4) {
-      weights[19] = 0.f;
-      weights[24] = 0.5f;
-    } else if (factor == 8) {
-      for (int i : {39, 44, 49, 119}) weights[i] = 0.f;
-      for (int i : {54, 124}) weights[i] = 0.5f;
-    }
-  }
-  return JxlErrorOrStatus::Success();
-}
-
-JXL_EXPORT JxlEncoderStatus JxlEncoderSetExtraChannelInfo(
-    JxlEncoder* enc, size_t index, const JxlExtraChannelInfo* info) {
-  if (index >= enc->metadata.m.num_extra_channels) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                         "Invalid value for the index of extra channel");
-  }
-  if (JXL_ENC_SUCCESS != CheckValidBitdepth(info->bits_per_sample,
-                                            info->exponent_bits_per_sample)) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE, "Invalid bit depth");
-  }
-
-  jxl::ExtraChannelInfo& channel = enc->metadata.m.extra_channel_info[index];
-  channel.type = static_cast<jxl::ExtraChannel>(info->type);
-  channel.bit_depth.bits_per_sample = info->bits_per_sample;
-  enc->metadata.m.modular_16_bit_buffer_sufficient &=
-      info->bits_per_sample <= 12;
-  channel.bit_depth.exponent_bits_per_sample = info->exponent_bits_per_sample;
-  channel.bit_depth.floating_point_sample = info->exponent_bits_per_sample != 0;
-  channel.dim_shift = info->dim_shift;
-  channel.name = "";
-  channel.alpha_associated = (info->alpha_premultiplied != 0);
-  channel.cfa_channel = info->cfa_channel;
-  channel.spot_color[0] = info->spot_color[0];
-  channel.spot_color[1] = info->spot_color[1];
-  channel.spot_color[2] = info->spot_color[2];
-  channel.spot_color[3] = info->spot_color[3];
-  std::string level_message;
-  int required_level = VerifyLevelSettings(enc, &level_message);
-  if (required_level == -1 ||
-      (static_cast<int>(enc->codestream_level) < required_level &&
-       enc->codestream_level != -1)) {
-    return JXL_API_ERROR(
-        enc, JXL_ENC_ERR_API_USAGE, "%s",
-        ("Codestream level verification for level " +
-         std::to_string(enc->codestream_level) + " failed: " + level_message)
-            .c_str());
-  }
-  return JxlErrorOrStatus::Success();
-}
-
-JXL_EXPORT JxlEncoderStatus JxlEncoderSetExtraChannelName(JxlEncoder* enc,
-                                                          size_t index,
-                                                          const char* name,
-                                                          size_t size) {
-  if (index >= enc->metadata.m.num_extra_channels) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                         "Invalid value for the index of extra channel");
-  }
-  enc->metadata.m.extra_channel_info[index].name =
-      std::string(name, name + size);
-  return JxlErrorOrStatus::Success();
-}
-
-JxlEncoderFrameSettings* JxlEncoderFrameSettingsCreate(
-    JxlEncoder* enc, const JxlEncoderFrameSettings* source) {
-  auto opts = jxl::MemoryManagerMakeUnique<JxlEncoderFrameSettings>(
-      &enc->memory_manager);
-  if (!opts) return nullptr;
-  opts->enc = enc;
-  if (source != nullptr) {
-    opts->values = source->values;
-  } else {
-    opts->values.lossless = false;
-  }
-  opts->values.cparams.level = enc->codestream_level;
-  opts->values.cparams.ec_distance.resize(enc->metadata.m.num_extra_channels,
-                                          0);
-
-  JxlEncoderFrameSettings* ret = opts.get();
-  enc->encoder_options.emplace_back(std::move(opts));
-  return ret;
-}
-
-JxlEncoderStatus JxlEncoderSetFrameLossless(
-    JxlEncoderFrameSettings* frame_settings, const JXL_BOOL lossless) {
-  if (lossless && frame_settings->enc->basic_info_set &&
-      frame_settings->enc->metadata.m.xyb_encoded) {
-    return JXL_API_ERROR(
-        frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-        "Set uses_original_profile=true for lossless encoding");
-  }
-  frame_settings->values.lossless = FROM_JXL_BOOL(lossless);
-  return JxlErrorOrStatus::Success();
-}
-
-JxlEncoderStatus JxlEncoderSetFrameDistance(
-    JxlEncoderFrameSettings* frame_settings, float distance) {
-  if (distance < 0.f || distance > 25.f) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                         "Distance has to be in [0.0..25.0] (corresponding to "
-                         "quality in [0.0..100.0])");
-  }
-  if (distance > 0.f && distance < 0.01f) {
-    distance = 0.01f;
-  }
-  frame_settings->values.cparams.butteraugli_distance = distance;
-  return JxlErrorOrStatus::Success();
-}
-
-JxlEncoderStatus JxlEncoderSetExtraChannelDistance(
-    JxlEncoderFrameSettings* frame_settings, size_t index, float distance) {
-  if (index >= frame_settings->enc->metadata.m.num_extra_channels) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                         "Invalid value for the index of extra channel");
-  }
-  if (distance != -1.f && (distance < 0.f || distance > 25.f)) {
-    return JXL_API_ERROR(
-        frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-        "Distance has to be -1 or in [0.0..25.0] (corresponding to "
-        "quality in [0.0..100.0])");
-  }
-  if (distance > 0.f && distance < 0.01f) {
-    distance = 0.01f;
-  }
-
-  if (index >= frame_settings->values.cparams.ec_distance.size()) {
-    // This can only happen if JxlEncoderFrameSettingsCreate() was called before
-    // JxlEncoderSetBasicInfo().
-    frame_settings->values.cparams.ec_distance.resize(
-        frame_settings->enc->metadata.m.num_extra_channels, 0);
-  }
-
-  frame_settings->values.cparams.ec_distance[index] = distance;
-  return JxlErrorOrStatus::Success();
-}
-
-float JxlEncoderDistanceFromQuality(float quality) {
-  return quality >= 100.0 ? 0.0
-         : quality >= 30
-             ? 0.1 + (100 - quality) * 0.09
-             : 53.0 / 3000.0 * quality * quality - 23.0 / 20.0 * quality + 25.0;
-}
-
-JxlEncoderStatus JxlEncoderFrameSettingsSetOption(
-    JxlEncoderFrameSettings* frame_settings, JxlEncoderFrameSettingId option,
-    int64_t value) {
-  // Tri-state to bool convertors.
-  const auto default_to_true = [](int64_t v) { return v != 0; };
-  const auto default_to_false = [](int64_t v) { return v == 1; };
-
-  // check if value is -1, 0 or 1 for Override-type options
-  switch (option) {
-    case JXL_ENC_FRAME_SETTING_NOISE:
-    case JXL_ENC_FRAME_SETTING_DOTS:
-    case JXL_ENC_FRAME_SETTING_PATCHES:
-    case JXL_ENC_FRAME_SETTING_GABORISH:
-    case JXL_ENC_FRAME_SETTING_MODULAR:
-    case JXL_ENC_FRAME_SETTING_KEEP_INVISIBLE:
-    case JXL_ENC_FRAME_SETTING_GROUP_ORDER:
-    case JXL_ENC_FRAME_SETTING_RESPONSIVE:
-    case JXL_ENC_FRAME_SETTING_PROGRESSIVE_AC:
-    case JXL_ENC_FRAME_SETTING_QPROGRESSIVE_AC:
-    case JXL_ENC_FRAME_SETTING_LOSSY_PALETTE:
-    case JXL_ENC_FRAME_SETTING_JPEG_RECON_CFL:
-    case JXL_ENC_FRAME_SETTING_JPEG_COMPRESS_BOXES:
-    case JXL_ENC_FRAME_SETTING_JPEG_KEEP_EXIF:
-    case JXL_ENC_FRAME_SETTING_JPEG_KEEP_XMP:
-    case JXL_ENC_FRAME_SETTING_JPEG_KEEP_JUMBF:
-      if (value < -1 || value > 1) {
-        return JXL_API_ERROR(
-            frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-            "Option value has to be -1 (default), 0 (off) or 1 (on)");
-      }
-      break;
-    default:
-      break;
-  }
-
-  switch (option) {
-    case JXL_ENC_FRAME_SETTING_EFFORT:
-      if (frame_settings->enc->allow_expert_options) {
-        if (value < 1 || value > 11) {
-          return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_NOT_SUPPORTED,
-                               "Encode effort has to be in [1..11]");
-        }
-      } else {
-        if (value < 1 || value > 10) {
-          return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_NOT_SUPPORTED,
-                               "Encode effort has to be in [1..10]");
-        }
-      }
-      frame_settings->values.cparams.speed_tier =
-          static_cast<jxl::SpeedTier>(10 - value);
-      break;
-    case JXL_ENC_FRAME_SETTING_BROTLI_EFFORT:
-      if (value < -1 || value > 11) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                             "Brotli effort has to be in [-1..11]");
-      }
-      // set cparams for brotli use in JPEG frames
-      frame_settings->values.cparams.brotli_effort = value;
-      // set enc option for brotli use in brob boxes
-      frame_settings->enc->brotli_effort = value;
-      break;
-    case JXL_ENC_FRAME_SETTING_DECODING_SPEED:
-      if (value < 0 || value > 4) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_NOT_SUPPORTED,
-                             "Decoding speed has to be in [0..4]");
-      }
-      frame_settings->values.cparams.decoding_speed_tier = value;
-      break;
-    case JXL_ENC_FRAME_SETTING_RESAMPLING:
-      if (value != -1 && value != 1 && value != 2 && value != 4 && value != 8) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                             "Resampling factor has to be 1, 2, 4 or 8");
-      }
-      frame_settings->values.cparams.resampling = value;
-      break;
-    case JXL_ENC_FRAME_SETTING_EXTRA_CHANNEL_RESAMPLING:
-      // TODO(lode): the jxl codestream allows choosing a different resampling
-      // factor for each extra channel, independently per frame. Move this
-      // option to a JxlEncoderFrameSettings-option that can be set per extra
-      // channel, so needs its own function rather than
-      // JxlEncoderFrameSettingsSetOption due to the extra channel index
-      // argument required.
-      if (value != -1 && value != 1 && value != 2 && value != 4 && value != 8) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                             "Resampling factor has to be 1, 2, 4 or 8");
-      }
-      frame_settings->values.cparams.ec_resampling = value;
-      break;
-    case JXL_ENC_FRAME_SETTING_ALREADY_DOWNSAMPLED:
-      if (value < 0 || value > 1) {
-        return JxlErrorOrStatus::Error();
-      }
-      frame_settings->values.cparams.already_downsampled = (value == 1);
-      break;
-    case JXL_ENC_FRAME_SETTING_NOISE:
-      frame_settings->values.cparams.noise = static_cast<jxl::Override>(value);
-      break;
-    case JXL_ENC_FRAME_SETTING_DOTS:
-      frame_settings->values.cparams.dots = static_cast<jxl::Override>(value);
-      break;
-    case JXL_ENC_FRAME_SETTING_PATCHES:
-      frame_settings->values.cparams.patches =
-          static_cast<jxl::Override>(value);
-      break;
-    case JXL_ENC_FRAME_SETTING_EPF:
-      if (value < -1 || value > 3) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                             "EPF value has to be in [-1..3]");
-      }
-      frame_settings->values.cparams.epf = static_cast<int>(value);
-      break;
-    case JXL_ENC_FRAME_SETTING_GABORISH:
-      frame_settings->values.cparams.gaborish =
-          static_cast<jxl::Override>(value);
-      break;
-    case JXL_ENC_FRAME_SETTING_MODULAR:
-      frame_settings->values.cparams.modular_mode = (value == 1);
-      break;
-    case JXL_ENC_FRAME_SETTING_KEEP_INVISIBLE:
-      frame_settings->values.cparams.keep_invisible =
-          static_cast<jxl::Override>(value);
-      break;
-    case JXL_ENC_FRAME_SETTING_GROUP_ORDER:
-      frame_settings->values.cparams.centerfirst = (value == 1);
-      break;
-    case JXL_ENC_FRAME_SETTING_GROUP_ORDER_CENTER_X:
-      if (value < -1) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                             "Center x coordinate has to be -1 or positive");
-      }
-      frame_settings->values.cparams.center_x = static_cast<size_t>(value);
-      break;
-    case JXL_ENC_FRAME_SETTING_GROUP_ORDER_CENTER_Y:
-      if (value < -1) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                             "Center y coordinate has to be -1 or positive");
-      }
-      frame_settings->values.cparams.center_y = static_cast<size_t>(value);
-      break;
-    case JXL_ENC_FRAME_SETTING_RESPONSIVE:
-      frame_settings->values.cparams.responsive = value;
-      break;
-    case JXL_ENC_FRAME_SETTING_PROGRESSIVE_AC:
-      frame_settings->values.cparams.progressive_mode =
-          static_cast<jxl::Override>(value);
-      break;
-    case JXL_ENC_FRAME_SETTING_QPROGRESSIVE_AC:
-      frame_settings->values.cparams.qprogressive_mode =
-          static_cast<jxl::Override>(value);
-      break;
-    case JXL_ENC_FRAME_SETTING_PROGRESSIVE_DC:
-      if (value < -1 || value > 2) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                             "Progressive DC has to be in [-1..2]");
-      }
-      frame_settings->values.cparams.progressive_dc = value;
-      break;
-    case JXL_ENC_FRAME_SETTING_PALETTE_COLORS:
-      if (value < -1 || value > 70913) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                             "Option value has to be in [-1..70913]");
-      }
-      if (value == -1) {
-        frame_settings->values.cparams.palette_colors = 1 << 10;
-      } else {
-        frame_settings->values.cparams.palette_colors = value;
-      }
-      break;
-    case JXL_ENC_FRAME_SETTING_LOSSY_PALETTE:
-      // TODO(lode): the defaults of some palette settings depend on others.
-      // See the logic in cjxl. Similar for other settings. This should be
-      // handled in the encoder during JxlEncoderProcessOutput (or,
-      // alternatively, in the cjxl binary like now)
-      frame_settings->values.cparams.lossy_palette = default_to_false(value);
-      break;
-    case JXL_ENC_FRAME_SETTING_COLOR_TRANSFORM:
-      if (value < -1 || value > 2) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                             "Option value has to be in [-1..2]");
-      }
-      if (value == -1) {
-        frame_settings->values.cparams.color_transform =
-            jxl::ColorTransform::kXYB;
-      } else {
-        frame_settings->values.cparams.color_transform =
-            static_cast<jxl::ColorTransform>(value);
-      }
-      break;
-    case JXL_ENC_FRAME_SETTING_MODULAR_COLOR_SPACE:
-      if (value < -1 || value > 41) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                             "Option value has to be in [-1..41]");
-      }
-      frame_settings->values.cparams.colorspace = value;
-      break;
-    case JXL_ENC_FRAME_SETTING_MODULAR_GROUP_SIZE:
-      if (value < -1 || value > 3) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                             "Option value has to be in [-1..3]");
-      }
-      frame_settings->values.cparams.modular_group_size_shift = value;
-      break;
-    case JXL_ENC_FRAME_SETTING_MODULAR_PREDICTOR:
-      if (value < -1 || value > 15) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                             "Option value has to be in [-1..15]");
-      }
-      frame_settings->values.cparams.options.predictor =
-          static_cast<jxl::Predictor>(value);
-      break;
-    case JXL_ENC_FRAME_SETTING_MODULAR_NB_PREV_CHANNELS:
-      // The max allowed value can in theory be higher. However, it depends on
-      // the effort setting. 11 is the highest safe value that doesn't cause
-      // tree_samples to be >= 64 in the encoder. The specification may allow
-      // more than this. With more fine tuning higher values could be allowed.
-      // For N-channel images, the largest useful value is N-1.
-      if (value < -1 || value > 11) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                             "Option value has to be in [-1..11]");
-      }
-      if (value == -1) {
-        frame_settings->values.cparams.options.max_properties = 0;
-      } else {
-        frame_settings->values.cparams.options.max_properties = value;
-      }
-      break;
-    case JXL_ENC_FRAME_SETTING_JPEG_RECON_CFL:
-      frame_settings->values.cparams.force_cfl_jpeg_recompression =
-          default_to_true(value);
-      break;
-    case JXL_ENC_FRAME_INDEX_BOX:
-      if (value < 0 || value > 1) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_NOT_SUPPORTED,
-                             "Option value has to be 0 or 1");
-      }
-      frame_settings->values.frame_index_box = true;
-      break;
-    case JXL_ENC_FRAME_SETTING_PHOTON_NOISE:
-      return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_NOT_SUPPORTED,
-                           "Float option, try setting it with "
-                           "JxlEncoderFrameSettingsSetFloatOption");
-    case JXL_ENC_FRAME_SETTING_JPEG_COMPRESS_BOXES:
-      frame_settings->values.cparams.jpeg_compress_boxes =
-          default_to_true(value);
-      break;
-    case JXL_ENC_FRAME_SETTING_BUFFERING:
-      if (value < -1 || value > 3) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_NOT_SUPPORTED,
-                             "Buffering has to be in [-1..3]");
-      }
-      frame_settings->values.cparams.buffering = value;
-      break;
-    case JXL_ENC_FRAME_SETTING_JPEG_KEEP_EXIF:
-      frame_settings->values.cparams.jpeg_keep_exif = default_to_true(value);
-      break;
-    case JXL_ENC_FRAME_SETTING_JPEG_KEEP_XMP:
-      frame_settings->values.cparams.jpeg_keep_xmp = default_to_true(value);
-      break;
-    case JXL_ENC_FRAME_SETTING_JPEG_KEEP_JUMBF:
-      frame_settings->values.cparams.jpeg_keep_jumbf = default_to_true(value);
-      break;
-    case JXL_ENC_FRAME_SETTING_USE_FULL_IMAGE_HEURISTICS:
-      if (value < 0 || value > 1) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_NOT_SUPPORTED,
-                             "Option value has to be 0 or 1");
-      }
-      frame_settings->values.cparams.use_full_image_heuristics =
-          default_to_false(value);
-      break;
-    case JXL_ENC_FRAME_SETTING_DISABLE_PERCEPTUAL_HEURISTICS:
-      if (value < 0 || value > 1) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_NOT_SUPPORTED,
-                             "Option value has to be 0 or 1");
-      }
-      frame_settings->values.cparams.disable_perceptual_optimizations =
-          default_to_false(value);
-      if (frame_settings->values.cparams.disable_perceptual_optimizations &&
-          frame_settings->enc->basic_info_set &&
-          frame_settings->enc->metadata.m.xyb_encoded) {
-        return JXL_API_ERROR(
-            frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-            "Set uses_original_profile=true for non-perceptual encoding");
-      }
-      break;
-
-    default:
-      return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_NOT_SUPPORTED,
-                           "Unknown option");
-  }
-  return JxlErrorOrStatus::Success();
-}
-
-JxlEncoderStatus JxlEncoderFrameSettingsSetFloatOption(
-    JxlEncoderFrameSettings* frame_settings, JxlEncoderFrameSettingId option,
-    float value) {
-  switch (option) {
-    case JXL_ENC_FRAME_SETTING_PHOTON_NOISE:
-      if (value < 0) return JXL_ENC_ERROR;
-      // TODO(lode): add encoder setting to set the 8 floating point values of
-      // the noise synthesis parameters per frame for more fine grained control.
-      frame_settings->values.cparams.photon_noise_iso = value;
-      return JxlErrorOrStatus::Success();
-    case JXL_ENC_FRAME_SETTING_MODULAR_MA_TREE_LEARNING_PERCENT:
-      if (value < -1.f || value > 100.f) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                             "Option value has to be smaller than 100");
-      }
-      // This value is called "iterations" or "nb_repeats" in cjxl, but is in
-      // fact a fraction in range 0.0-1.0, with the default value 0.5.
-      // Convert from floating point percentage to floating point fraction here.
-      if (value < -.5f) {
-        // TODO(lode): for this and many other settings (also in
-        // JxlEncoderFrameSettingsSetOption), avoid duplicating the default
-        // values here and in enc_params.h and options.h, have one location
-        // where the defaults are specified.
-        frame_settings->values.cparams.options.nb_repeats = 0.5f;
-      } else {
-        frame_settings->values.cparams.options.nb_repeats = value * 0.01f;
-      }
-      return JxlErrorOrStatus::Success();
-    case JXL_ENC_FRAME_SETTING_CHANNEL_COLORS_GLOBAL_PERCENT:
-      if (value < -1.f || value > 100.f) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                             "Option value has to be in [-1..100]");
-      }
-      if (value < -.5f) {
-        frame_settings->values.cparams.channel_colors_pre_transform_percent =
-            95.0f;
-      } else {
-        frame_settings->values.cparams.channel_colors_pre_transform_percent =
-            value;
-      }
-      return JxlErrorOrStatus::Success();
-    case JXL_ENC_FRAME_SETTING_CHANNEL_COLORS_GROUP_PERCENT:
-      if (value < -1.f || value > 100.f) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                             "Option value has to be in [-1..100]");
-      }
-      if (value < -.5f) {
-        frame_settings->values.cparams.channel_colors_percent = 80.0f;
-      } else {
-        frame_settings->values.cparams.channel_colors_percent = value;
-      }
-      return JxlErrorOrStatus::Success();
-    case JXL_ENC_FRAME_SETTING_EFFORT:
-    case JXL_ENC_FRAME_SETTING_DECODING_SPEED:
-    case JXL_ENC_FRAME_SETTING_RESAMPLING:
-    case JXL_ENC_FRAME_SETTING_EXTRA_CHANNEL_RESAMPLING:
-    case JXL_ENC_FRAME_SETTING_ALREADY_DOWNSAMPLED:
-    case JXL_ENC_FRAME_SETTING_NOISE:
-    case JXL_ENC_FRAME_SETTING_DOTS:
-    case JXL_ENC_FRAME_SETTING_PATCHES:
-    case JXL_ENC_FRAME_SETTING_EPF:
-    case JXL_ENC_FRAME_SETTING_GABORISH:
-    case JXL_ENC_FRAME_SETTING_MODULAR:
-    case JXL_ENC_FRAME_SETTING_KEEP_INVISIBLE:
-    case JXL_ENC_FRAME_SETTING_GROUP_ORDER:
-    case JXL_ENC_FRAME_SETTING_GROUP_ORDER_CENTER_X:
-    case JXL_ENC_FRAME_SETTING_GROUP_ORDER_CENTER_Y:
-    case JXL_ENC_FRAME_SETTING_RESPONSIVE:
-    case JXL_ENC_FRAME_SETTING_PROGRESSIVE_AC:
-    case JXL_ENC_FRAME_SETTING_QPROGRESSIVE_AC:
-    case JXL_ENC_FRAME_SETTING_PROGRESSIVE_DC:
-    case JXL_ENC_FRAME_SETTING_PALETTE_COLORS:
-    case JXL_ENC_FRAME_SETTING_LOSSY_PALETTE:
-    case JXL_ENC_FRAME_SETTING_COLOR_TRANSFORM:
-    case JXL_ENC_FRAME_SETTING_MODULAR_COLOR_SPACE:
-    case JXL_ENC_FRAME_SETTING_MODULAR_GROUP_SIZE:
-    case JXL_ENC_FRAME_SETTING_MODULAR_PREDICTOR:
-    case JXL_ENC_FRAME_SETTING_MODULAR_NB_PREV_CHANNELS:
-    case JXL_ENC_FRAME_SETTING_JPEG_RECON_CFL:
-    case JXL_ENC_FRAME_INDEX_BOX:
-    case JXL_ENC_FRAME_SETTING_BROTLI_EFFORT:
-    case JXL_ENC_FRAME_SETTING_FILL_ENUM:
-    case JXL_ENC_FRAME_SETTING_JPEG_COMPRESS_BOXES:
-    case JXL_ENC_FRAME_SETTING_BUFFERING:
-    case JXL_ENC_FRAME_SETTING_JPEG_KEEP_EXIF:
-    case JXL_ENC_FRAME_SETTING_JPEG_KEEP_XMP:
-    case JXL_ENC_FRAME_SETTING_JPEG_KEEP_JUMBF:
-    case JXL_ENC_FRAME_SETTING_USE_FULL_IMAGE_HEURISTICS:
-      return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_NOT_SUPPORTED,
-                           "Int option, try setting it with "
-                           "JxlEncoderFrameSettingsSetOption");
-    default:
-      return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_NOT_SUPPORTED,
-                           "Unknown option");
-  }
-}
-JxlEncoder* JxlEncoderCreate(const JxlMemoryManager* memory_manager) {
-  JxlMemoryManager local_memory_manager;
-  if (!jxl::MemoryManagerInit(&local_memory_manager, memory_manager)) {
-    return nullptr;
-  }
-
-  void* alloc =
-      jxl::MemoryManagerAlloc(&local_memory_manager, sizeof(JxlEncoder));
-  if (!alloc) return nullptr;
-  JxlEncoder* enc = new (alloc) JxlEncoder();
-  enc->memory_manager = local_memory_manager;
-  // TODO(sboukortt): add an API function to set this.
-  enc->cms = *JxlGetDefaultCms();
-  enc->cms_set = true;
-
-  // Initialize all the field values.
-  JxlEncoderReset(enc);
-
-  return enc;
-}
-
-void JxlEncoderReset(JxlEncoder* enc) {
-  enc->thread_pool.reset();
-  enc->input_queue.clear();
-  enc->num_queued_frames = 0;
-  enc->num_queued_boxes = 0;
-  enc->encoder_options.clear();
-  enc->codestream_bytes_written_end_of_frame = 0;
-  enc->wrote_bytes = false;
-  enc->jxlp_counter = 0;
-  enc->metadata = jxl::CodecMetadata();
-  enc->last_used_cparams = jxl::CompressParams();
-  enc->frames_closed = false;
-  enc->boxes_closed = false;
-  enc->basic_info_set = false;
-  enc->color_encoding_set = false;
-  enc->intensity_target_set = false;
-  enc->use_container = false;
-  enc->use_boxes = false;
-  enc->store_jpeg_metadata = false;
-  enc->codestream_level = -1;
-  enc->output_processor =
-      JxlEncoderOutputProcessorWrapper(&enc->memory_manager);
-  JxlEncoderInitBasicInfo(&enc->basic_info);
-
-  // jxl::JxlEncoderFrameIndexBox frame_index_box;
-  // JxlEncoderError error = JxlEncoderError::JXL_ENC_ERR_OK;
-  // bool allow_expert_options = false;
-  // int brotli_effort = -1;
-}
-
-void JxlEncoderDestroy(JxlEncoder* enc) {
-  if (enc) {
-    JxlMemoryManager local_memory_manager = enc->memory_manager;
-    // Call destructor directly since custom free function is used.
-    enc->~JxlEncoder();
-    jxl::MemoryManagerFree(&local_memory_manager, enc);
-  }
-}
-
-JxlEncoderError JxlEncoderGetError(JxlEncoder* enc) { return enc->error; }
-
-JxlEncoderStatus JxlEncoderUseContainer(JxlEncoder* enc,
-                                        JXL_BOOL use_container) {
-  if (enc->wrote_bytes) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                         "this setting can only be set at the beginning");
-  }
-  enc->use_container = FROM_JXL_BOOL(use_container);
-  return JxlErrorOrStatus::Success();
-}
-
-JxlEncoderStatus JxlEncoderStoreJPEGMetadata(JxlEncoder* enc,
-                                             JXL_BOOL store_jpeg_metadata) {
-  if (enc->wrote_bytes) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                         "this setting can only be set at the beginning");
-  }
-  enc->store_jpeg_metadata = FROM_JXL_BOOL(store_jpeg_metadata);
-  return JxlErrorOrStatus::Success();
-}
-
-JxlEncoderStatus JxlEncoderSetCodestreamLevel(JxlEncoder* enc, int level) {
-  if (level != -1 && level != 5 && level != 10) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_NOT_SUPPORTED, "invalid level");
-  }
-  if (enc->wrote_bytes) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                         "this setting can only be set at the beginning");
-  }
-  enc->codestream_level = level;
-  return JxlErrorOrStatus::Success();
-}
-
-int JxlEncoderGetRequiredCodestreamLevel(const JxlEncoder* enc) {
-  return VerifyLevelSettings(enc, nullptr);
-}
-
-void JxlEncoderSetCms(JxlEncoder* enc, JxlCmsInterface cms) {
-  jxl::msan::MemoryIsInitialized(&cms, sizeof(cms));
-  enc->cms = cms;
-  enc->cms_set = true;
-}
-
-JxlEncoderStatus JxlEncoderSetParallelRunner(JxlEncoder* enc,
-                                             JxlParallelRunner parallel_runner,
-                                             void* parallel_runner_opaque) {
-  if (enc->thread_pool) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                         "parallel runner already set");
-  }
-  enc->thread_pool = jxl::MemoryManagerMakeUnique<jxl::ThreadPool>(
-      &enc->memory_manager, parallel_runner, parallel_runner_opaque);
-  if (!enc->thread_pool) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_GENERIC,
-                         "error setting parallel runner");
-  }
-  return JxlErrorOrStatus::Success();
-}
-
-namespace {
-JxlEncoderStatus GetCurrentDimensions(
-    const JxlEncoderFrameSettings* frame_settings, size_t& xsize,
-    size_t& ysize) {
-  xsize = frame_settings->enc->metadata.xsize();
-  ysize = frame_settings->enc->metadata.ysize();
-  if (frame_settings->values.header.layer_info.have_crop) {
-    xsize = frame_settings->values.header.layer_info.xsize;
-    ysize = frame_settings->values.header.layer_info.ysize;
-  }
-  if (frame_settings->values.cparams.already_downsampled) {
-    size_t factor = frame_settings->values.cparams.resampling;
-    xsize = jxl::DivCeil(xsize, factor);
-    ysize = jxl::DivCeil(ysize, factor);
-  }
-  if (xsize == 0 || ysize == 0) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                         "zero-sized frame is not allowed");
-  }
-  return JxlErrorOrStatus::Success();
-}
-}  // namespace
-
-JxlEncoderStatus JxlEncoderAddJPEGFrame(
-    const JxlEncoderFrameSettings* frame_settings, const uint8_t* buffer,
-    size_t size) {
-  if (frame_settings->enc->frames_closed) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                         "Frame input is already closed");
-  }
-
-  jxl::CodecInOut io{&frame_settings->enc->memory_manager};
-  if (!jxl::jpeg::DecodeImageJPG(jxl::Bytes(buffer, size), &io)) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_BAD_INPUT,
-                         "Error during decode of input JPEG");
-  }
-
-  if (!frame_settings->enc->color_encoding_set) {
-    if (!SetColorEncodingFromJpegData(
-            *io.Main().jpeg_data,
-            &frame_settings->enc->metadata.m.color_encoding)) {
-      return JXL_API_ERROR(
-          frame_settings->enc, JXL_ENC_ERR_BAD_INPUT,
-          "Error decoding the ICC profile embedded in the input JPEG");
-    }
-    frame_settings->enc->color_encoding_set = true;
-  }
-
-  if (!frame_settings->enc->basic_info_set) {
-    JxlBasicInfo basic_info;
-    JxlEncoderInitBasicInfo(&basic_info);
-    basic_info.xsize = io.Main().jpeg_data->width;
-    basic_info.ysize = io.Main().jpeg_data->height;
-    basic_info.uses_original_profile = JXL_TRUE;
-    if (JxlEncoderSetBasicInfo(frame_settings->enc, &basic_info) !=
-        JXL_ENC_SUCCESS) {
-      return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_GENERIC,
-                           "Error setting basic info");
-    }
-  }
-
-  size_t xsize;
-  size_t ysize;
-  if (GetCurrentDimensions(frame_settings, xsize, ysize) != JXL_ENC_SUCCESS) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_GENERIC,
-                         "bad dimensions");
-  }
-  if (xsize != static_cast<size_t>(io.Main().jpeg_data->width) ||
-      ysize != static_cast<size_t>(io.Main().jpeg_data->height)) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_GENERIC,
-                         "JPEG dimensions don't match frame dimensions");
-  }
-
-  if (frame_settings->enc->metadata.m.xyb_encoded) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                         "Can't XYB encode a lossless JPEG");
-  }
-  if (!io.blobs.exif.empty()) {
-    JxlOrientation orientation = static_cast<JxlOrientation>(
-        frame_settings->enc->metadata.m.orientation);
-    jxl::InterpretExif(io.blobs.exif, &orientation);
-    frame_settings->enc->metadata.m.orientation = orientation;
-  }
-  if (!io.blobs.exif.empty() && frame_settings->values.cparams.jpeg_keep_exif) {
-    size_t exif_size = io.blobs.exif.size();
-    // Exif data in JPEG is limited to 64k
-    if (exif_size > 0xFFFF) {
-      return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_GENERIC,
-                           "Exif larger than possible in JPEG?");
-    }
-    exif_size += 4;  // prefix 4 zero bytes for tiff offset
-    std::vector<uint8_t> exif(exif_size);
-    memcpy(exif.data() + 4, io.blobs.exif.data(), io.blobs.exif.size());
-    JxlEncoderUseBoxes(frame_settings->enc);
-    JxlEncoderAddBox(
-        frame_settings->enc, "Exif", exif.data(), exif_size,
-        TO_JXL_BOOL(frame_settings->values.cparams.jpeg_compress_boxes));
-  }
-  if (!io.blobs.xmp.empty() && frame_settings->values.cparams.jpeg_keep_xmp) {
-    JxlEncoderUseBoxes(frame_settings->enc);
-    JxlEncoderAddBox(
-        frame_settings->enc, "xml ", io.blobs.xmp.data(), io.blobs.xmp.size(),
-        TO_JXL_BOOL(frame_settings->values.cparams.jpeg_compress_boxes));
-  }
-  if (!io.blobs.jumbf.empty() &&
-      frame_settings->values.cparams.jpeg_keep_jumbf) {
-    JxlEncoderUseBoxes(frame_settings->enc);
-    JxlEncoderAddBox(
-        frame_settings->enc, "jumb", io.blobs.jumbf.data(),
-        io.blobs.jumbf.size(),
-        TO_JXL_BOOL(frame_settings->values.cparams.jpeg_compress_boxes));
-  }
-  if (frame_settings->enc->store_jpeg_metadata) {
-    if (!frame_settings->values.cparams.jpeg_keep_exif ||
-        !frame_settings->values.cparams.jpeg_keep_xmp) {
-      return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                           "Need to preserve EXIF and XMP to allow JPEG "
-                           "bitstream reconstruction");
-    }
-    jxl::jpeg::JPEGData data_in = *io.Main().jpeg_data;
-    std::vector<uint8_t> jpeg_data;
-    if (!jxl::jpeg::EncodeJPEGData(&frame_settings->enc->memory_manager,
-                                   data_in, &jpeg_data,
-                                   frame_settings->values.cparams)) {
-      return JXL_API_ERROR(
-          frame_settings->enc, JXL_ENC_ERR_JBRD,
-          "JPEG bitstream reconstruction data cannot be encoded");
-    }
-    frame_settings->enc->jpeg_metadata = jpeg_data;
-  }
-
-  jxl::JxlEncoderChunkedFrameAdapter frame_data(
-      xsize, ysize, frame_settings->enc->metadata.m.num_extra_channels);
-  frame_data.SetJPEGData(std::move(io.Main().jpeg_data));
-
-  auto queued_frame = jxl::MemoryManagerMakeUnique<jxl::JxlEncoderQueuedFrame>(
-      &frame_settings->enc->memory_manager,
-      // JxlEncoderQueuedFrame is a struct with no constructors, so we use the
-      // default move constructor there.
-      jxl::JxlEncoderQueuedFrame{
-          frame_settings->values, std::move(frame_data), {}});
-  if (!queued_frame) {
-    // TODO(jon): when can this happen? is this an API usage error?
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_GENERIC,
-                         "No frame queued?");
-  }
-  queued_frame->ec_initialized.resize(
-      frame_settings->enc->metadata.m.num_extra_channels);
-
-  QueueFrame(frame_settings, queued_frame);
-  return JxlErrorOrStatus::Success();
-}
-
-static bool CanDoFastLossless(const JxlEncoderFrameSettings* frame_settings,
-                              const JxlPixelFormat* pixel_format,
-                              bool has_alpha) {
-  if (!frame_settings->values.lossless) {
-    return false;
-  }
-  // TODO(veluca): many of the following options could be made to work, but are
-  // just not implemented in FJXL's frame header handling yet.
-  if (frame_settings->values.frame_index_box) {
-    return false;
-  }
-  if (frame_settings->values.header.layer_info.have_crop) {
-    return false;
-  }
-  if (frame_settings->enc->metadata.m.have_animation) {
-    return false;
-  }
-  if (frame_settings->values.cparams.speed_tier != jxl::SpeedTier::kLightning) {
-    return false;
-  }
-  if (frame_settings->values.image_bit_depth.type ==
-          JxlBitDepthType::JXL_BIT_DEPTH_CUSTOM &&
-      frame_settings->values.image_bit_depth.bits_per_sample !=
-          frame_settings->enc->metadata.m.bit_depth.bits_per_sample) {
-    return false;
-  }
-  // TODO(veluca): implement support for LSB-padded input in fast_lossless.
-  if (frame_settings->values.image_bit_depth.type ==
-          JxlBitDepthType::JXL_BIT_DEPTH_FROM_PIXEL_FORMAT &&
-      frame_settings->enc->metadata.m.bit_depth.bits_per_sample % 8 != 0) {
-    return false;
-  }
-  if (!frame_settings->values.frame_name.empty()) {
-    return false;
-  }
-  // No extra channels other than alpha.
-  if (!(has_alpha && frame_settings->enc->metadata.m.num_extra_channels == 1) &&
-      frame_settings->enc->metadata.m.num_extra_channels != 0) {
-    return false;
-  }
-  if (frame_settings->enc->metadata.m.bit_depth.bits_per_sample > 16) {
-    return false;
-  }
-  if (pixel_format->data_type != JxlDataType::JXL_TYPE_FLOAT16 &&
-      pixel_format->data_type != JxlDataType::JXL_TYPE_UINT16 &&
-      pixel_format->data_type != JxlDataType::JXL_TYPE_UINT8) {
-    return false;
-  }
-  if ((frame_settings->enc->metadata.m.bit_depth.bits_per_sample > 8) !=
-      (pixel_format->data_type == JxlDataType::JXL_TYPE_UINT16 ||
-       pixel_format->data_type == JxlDataType::JXL_TYPE_FLOAT16)) {
-    return false;
-  }
-  if (!((pixel_format->num_channels == 1 || pixel_format->num_channels == 3) &&
-        !has_alpha) &&
-      !((pixel_format->num_channels == 2 || pixel_format->num_channels == 4) &&
-        has_alpha)) {
-    return false;
-  }
-
-  return true;
-}
-
-namespace {
-JxlEncoderStatus JxlEncoderAddImageFrameInternal(
-    const JxlEncoderFrameSettings* frame_settings, size_t xsize, size_t ysize,
-    bool streaming, jxl::JxlEncoderChunkedFrameAdapter&& frame_data) {
-  JxlPixelFormat pixel_format = {4, JXL_TYPE_UINT8, JXL_NATIVE_ENDIAN, 0};
-  {
-    JxlChunkedFrameInputSource input = frame_data.GetInputSource();
-    input.get_color_channels_pixel_format(input.opaque, &pixel_format);
-  }
-  uint32_t num_channels = pixel_format.num_channels;
-  size_t has_interleaved_alpha =
-      static_cast<size_t>(num_channels == 2 || num_channels == 4);
-
-  if (!frame_settings->enc->basic_info_set) {
-    // Basic Info must be set. Otherwise, this is an API misuse.
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                         "Basic info or color encoding not set yet");
-  }
-  if (frame_settings->enc->frames_closed) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                         "Frame input already closed");
-  }
-  if (num_channels < 3) {
-    if (frame_settings->enc->basic_info.num_color_channels != 1) {
-      return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                           "Grayscale pixel format input for an RGB image");
-    }
-  } else {
-    if (frame_settings->enc->basic_info.num_color_channels != 3) {
-      return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                           "RGB pixel format input for a grayscale image");
-    }
-  }
-  if (frame_settings->values.lossless &&
-      frame_settings->enc->metadata.m.xyb_encoded) {
-    return JXL_API_ERROR(
-        frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-        "Set uses_original_profile=true for lossless encoding");
-  }
-  if (frame_settings->values.cparams.disable_perceptual_optimizations &&
-      frame_settings->enc->metadata.m.xyb_encoded) {
-    return JXL_API_ERROR(
-        frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-        "Set uses_original_profile=true for non-perceptual encoding");
-  }
-  if (JXL_ENC_SUCCESS !=
-      VerifyInputBitDepth(frame_settings->values.image_bit_depth,
-                          pixel_format)) {
-    return JXL_API_ERROR_NOSET("Invalid input bit depth");
-  }
-  if (has_interleaved_alpha >
-      frame_settings->enc->metadata.m.num_extra_channels) {
-    return JXL_API_ERROR(
-        frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-        "number of extra channels mismatch (need 1 extra channel for alpha)");
-  }
-
-  bool has_alpha = frame_settings->enc->metadata.m.HasAlpha();
-
-  // All required conditions to do fast-lossless.
-  if (CanDoFastLossless(frame_settings, &pixel_format, has_alpha)) {
-    const bool big_endian =
-        pixel_format.endianness == JXL_BIG_ENDIAN ||
-        (pixel_format.endianness == JXL_NATIVE_ENDIAN && !IsLittleEndian());
-
-    RunnerTicket ticket{frame_settings->enc->thread_pool.get()};
-    JXL_BOOL oneshot = TO_JXL_BOOL(!frame_data.StreamingInput());
-    auto* frame_state = JxlFastLosslessPrepareFrame(
-        frame_data.GetInputSource(), xsize, ysize, num_channels,
-        frame_settings->enc->metadata.m.bit_depth.bits_per_sample, big_endian,
-        /*effort=*/2, oneshot);
-    if (!streaming) {
-      bool ok =
-          JxlFastLosslessProcessFrame(frame_state, /*is_last=*/false, &ticket,
-                                      &FastLosslessRunnerAdapter, nullptr);
-      if (!ok || ticket.has_error) {
-        return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_GENERIC,
-                             "Internal: JxlFastLosslessProcessFrame failed");
-      }
-    }
-    QueueFastLosslessFrame(frame_settings, frame_state);
-    return JxlErrorOrStatus::Success();
-  }
-
-  if (!streaming) {
-    // The input callbacks are only guaranteed to be available during frame
-    // encoding when both the input and the output is streaming. In all other
-    // cases we need to create an internal copy of the frame data.
-    if (!frame_data.CopyBuffers()) {
-      return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                           "Invalid chunked frame input source");
-    }
-  }
-
-  if (!frame_settings->enc->color_encoding_set) {
-    jxl::ColorEncoding c_current;
-    if ((pixel_format.data_type == JXL_TYPE_FLOAT) ||
-        (pixel_format.data_type == JXL_TYPE_FLOAT16)) {
-      c_current = jxl::ColorEncoding::LinearSRGB(num_channels < 3);
-    } else {
-      c_current = jxl::ColorEncoding::SRGB(num_channels < 3);
-    }
-    frame_settings->enc->metadata.m.color_encoding = c_current;
-  }
-
-  auto queued_frame = jxl::MemoryManagerMakeUnique<jxl::JxlEncoderQueuedFrame>(
-      &frame_settings->enc->memory_manager,
-      // JxlEncoderQueuedFrame is a struct with no constructors, so we use the
-      // default move constructor there.
-      jxl::JxlEncoderQueuedFrame{
-          frame_settings->values, std::move(frame_data), {}});
-
-  if (!queued_frame) {
-    // TODO(jon): when can this happen? is this an API usage error?
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_GENERIC,
-                         "No frame queued?");
-  }
-
-  for (auto& ec_info : frame_settings->enc->metadata.m.extra_channel_info) {
-    if (has_interleaved_alpha && ec_info.type == jxl::ExtraChannel::kAlpha) {
-      queued_frame->ec_initialized.push_back(1);
-      has_interleaved_alpha = 0;  // only first Alpha is initialized
-    } else {
-      queued_frame->ec_initialized.push_back(0);
-    }
-  }
-  queued_frame->option_values.cparams.level =
-      frame_settings->enc->codestream_level;
-
-  QueueFrame(frame_settings, queued_frame);
-  return JxlErrorOrStatus::Success();
-}
-}  // namespace
-
-JxlEncoderStatus JxlEncoderAddImageFrame(
-    const JxlEncoderFrameSettings* frame_settings,
-    const JxlPixelFormat* pixel_format, const void* buffer, size_t size) {
-  size_t xsize;
-  size_t ysize;
-  if (GetCurrentDimensions(frame_settings, xsize, ysize) != JXL_ENC_SUCCESS) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_GENERIC,
-                         "bad dimensions");
-  }
-  jxl::JxlEncoderChunkedFrameAdapter frame_data(
-      xsize, ysize, frame_settings->enc->metadata.m.num_extra_channels);
-  if (!frame_data.SetFromBuffer(0, reinterpret_cast<const uint8_t*>(buffer),
-                                size, *pixel_format)) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                         "provided image buffer too small");
-  }
-  return JxlEncoderAddImageFrameInternal(frame_settings, xsize, ysize,
-                                         /*streaming=*/false,
-                                         std::move(frame_data));
-}
-
-JxlEncoderStatus JxlEncoderAddChunkedFrame(
-    const JxlEncoderFrameSettings* frame_settings, JXL_BOOL is_last_frame,
-    JxlChunkedFrameInputSource chunked_frame_input) {
-  size_t xsize;
-  size_t ysize;
-  if (GetCurrentDimensions(frame_settings, xsize, ysize) != JXL_ENC_SUCCESS) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_GENERIC,
-                         "bad dimensions");
-  }
-  bool streaming = frame_settings->enc->output_processor.OutputProcessorSet();
-  jxl::JxlEncoderChunkedFrameAdapter frame_data(
-      xsize, ysize, frame_settings->enc->metadata.m.num_extra_channels);
-  frame_data.SetInputSource(chunked_frame_input);
-  auto status = JxlEncoderAddImageFrameInternal(
-      frame_settings, xsize, ysize, streaming, std::move(frame_data));
-  if (status != JXL_ENC_SUCCESS) return status;
-
-  auto& queued_frame = frame_settings->enc->input_queue.back();
-  if (queued_frame.frame) {
-    for (auto& val : queued_frame.frame->ec_initialized) val = 1;
-  }
-
-  if (is_last_frame) {
-    JxlEncoderCloseInput(frame_settings->enc);
-  }
-  if (streaming) {
-    return JxlEncoderFlushInput(frame_settings->enc);
-  }
-  return JxlErrorOrStatus::Success();
-}
-
-JxlEncoderStatus JxlEncoderUseBoxes(JxlEncoder* enc) {
-  if (enc->wrote_bytes) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                         "this setting can only be set at the beginning");
-  }
-  enc->use_boxes = true;
-  return JxlErrorOrStatus::Success();
-}
-
-JxlEncoderStatus JxlEncoderAddBox(JxlEncoder* enc, const JxlBoxType type,
-                                  const uint8_t* contents, size_t size,
-                                  JXL_BOOL compress_box) {
-  if (!enc->use_boxes) {
-    return JXL_API_ERROR(
-        enc, JXL_ENC_ERR_API_USAGE,
-        "must set JxlEncoderUseBoxes at the beginning to add boxes");
-  }
-  if (enc->boxes_closed) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                         "Box input already closed");
-  }
-  if (compress_box) {
-    if (memcmp("jxl", type, 3) == 0) {
-      return JXL_API_ERROR(
-          enc, JXL_ENC_ERR_API_USAGE,
-          "brob box may not contain a type starting with \"jxl\"");
-    }
-    if (memcmp("jbrd", type, 4) == 0) {
-      return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                           "jbrd box may not be brob compressed");
-    }
-    if (memcmp("brob", type, 4) == 0) {
-      // The compress_box will compress an existing non-brob box into a brob
-      // box. If already giving a valid brotli-compressed brob box, set
-      // compress_box to false since it is already compressed.
-      return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                           "a brob box cannot contain another brob box");
-    }
-  }
-
-  auto box = jxl::MemoryManagerMakeUnique<jxl::JxlEncoderQueuedBox>(
-      &enc->memory_manager);
-
-  box->type = jxl::MakeBoxType(type);
-  box->contents.assign(contents, contents + size);
-  box->compress_box = FROM_JXL_BOOL(compress_box);
-  QueueBox(enc, box);
-  return JxlErrorOrStatus::Success();
-}
-
-JXL_EXPORT JxlEncoderStatus JxlEncoderSetExtraChannelBuffer(
-    const JxlEncoderFrameSettings* frame_settings,
-    const JxlPixelFormat* pixel_format, const void* buffer, size_t size,
-    uint32_t index) {
-  if (index >= frame_settings->enc->metadata.m.num_extra_channels) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                         "Invalid value for the index of extra channel");
-  }
-  if (!frame_settings->enc->basic_info_set ||
-      !frame_settings->enc->color_encoding_set) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                         "Basic info has to be set first");
-  }
-  if (frame_settings->enc->input_queue.empty()) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                         "First add image frame, then extra channels");
-  }
-  if (frame_settings->enc->frames_closed) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                         "Frame input already closed");
-  }
-  JxlPixelFormat ec_format = *pixel_format;
-  ec_format.num_channels = 1;
-  if (JXL_ENC_SUCCESS !=
-      VerifyInputBitDepth(frame_settings->values.image_bit_depth, ec_format)) {
-    return JXL_API_ERROR_NOSET("Invalid input bit depth");
-  }
-  const uint8_t* uint8_buffer = reinterpret_cast<const uint8_t*>(buffer);
-  auto* queued_frame = frame_settings->enc->input_queue.back().frame.get();
-  if (!queued_frame->frame_data.SetFromBuffer(1 + index, uint8_buffer, size,
-                                              ec_format)) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                         "provided image buffer too small");
-  }
-  queued_frame->ec_initialized[index] = 1;
-
-  return JxlErrorOrStatus::Success();
-}
-
-void JxlEncoderCloseFrames(JxlEncoder* enc) { enc->frames_closed = true; }
-
-void JxlEncoderCloseBoxes(JxlEncoder* enc) { enc->boxes_closed = true; }
-
-void JxlEncoderCloseInput(JxlEncoder* enc) {
-  JxlEncoderCloseFrames(enc);
-  JxlEncoderCloseBoxes(enc);
-}
-
-JXL_EXPORT JxlEncoderStatus JxlEncoderFlushInput(JxlEncoder* enc) {
-  if (!enc->output_processor.OutputProcessorSet()) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                         "Cannot flush input without setting output "
-                         "processor with JxlEncoderSetOutputProcessor");
-  }
-  while (!enc->input_queue.empty()) {
-    if (!enc->ProcessOneEnqueuedInput()) {
-      return JxlErrorOrStatus::Error();
-    }
-  }
-  return JxlErrorOrStatus::Success();
-}
-
-JXL_EXPORT JxlEncoderStatus JxlEncoderSetOutputProcessor(
-    JxlEncoder* enc, JxlEncoderOutputProcessor output_processor) {
-  if (enc->output_processor.HasAvailOut()) {
-    return JXL_API_ERROR(
-        enc, JXL_ENC_ERR_API_USAGE,
-        "Cannot set an output processor when some output was already produced");
-  }
-  if (!output_processor.set_finalized_position ||
-      !output_processor.get_buffer || !output_processor.release_buffer) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                         "Missing output processor functions");
-  }
-  enc->output_processor =
-      JxlEncoderOutputProcessorWrapper(&enc->memory_manager, output_processor);
-  return JxlErrorOrStatus::Success();
-}
-
-JxlEncoderStatus JxlEncoderProcessOutput(JxlEncoder* enc, uint8_t** next_out,
-                                         size_t* avail_out) {
-  if (enc->output_processor.OutputProcessorSet()) {
-    return JXL_API_ERROR(enc, JXL_ENC_ERR_API_USAGE,
-                         "Cannot call JxlEncoderProcessOutput after calling "
-                         "JxlEncoderSetOutputProcessor");
-  }
-  if (!enc->output_processor.SetAvailOut(next_out, avail_out)) {
-    return JxlErrorOrStatus::Error();
-  }
-  while (*avail_out != 0 && !enc->input_queue.empty()) {
-    if (!enc->ProcessOneEnqueuedInput()) {
-      return JxlErrorOrStatus::Error();
-    }
-  }
-
-  if (!enc->input_queue.empty() || enc->output_processor.HasOutputToWrite()) {
-    return JxlErrorOrStatus::MoreOutput();
-  }
-  return JxlErrorOrStatus::Success();
-}
-
-JxlEncoderStatus JxlEncoderSetFrameHeader(
-    JxlEncoderFrameSettings* frame_settings,
-    const JxlFrameHeader* frame_header) {
-  if (frame_header->layer_info.blend_info.source > 3) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                         "invalid blending source index");
-  }
-  // If there are no extra channels, it's ok for the value to be 0.
-  if (frame_header->layer_info.blend_info.alpha != 0 &&
-      frame_header->layer_info.blend_info.alpha >=
-          frame_settings->enc->metadata.m.extra_channel_info.size()) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                         "alpha blend channel index out of bounds");
-  }
-
-  frame_settings->values.header = *frame_header;
-  // Setting the frame header resets the frame name, it must be set again with
-  // JxlEncoderSetFrameName if desired.
-  frame_settings->values.frame_name = "";
-
-  return JxlErrorOrStatus::Success();
-}
-
-JxlEncoderStatus JxlEncoderSetExtraChannelBlendInfo(
-    JxlEncoderFrameSettings* frame_settings, size_t index,
-    const JxlBlendInfo* blend_info) {
-  if (index >= frame_settings->enc->metadata.m.num_extra_channels) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                         "Invalid value for the index of extra channel");
-  }
-
-  if (frame_settings->values.extra_channel_blend_info.size() !=
-      frame_settings->enc->metadata.m.num_extra_channels) {
-    JxlBlendInfo default_blend_info;
-    JxlEncoderInitBlendInfo(&default_blend_info);
-    frame_settings->values.extra_channel_blend_info.resize(
-        frame_settings->enc->metadata.m.num_extra_channels, default_blend_info);
-  }
-  frame_settings->values.extra_channel_blend_info[index] = *blend_info;
-  return JxlErrorOrStatus::Success();
-}
-
-JxlEncoderStatus JxlEncoderSetFrameName(JxlEncoderFrameSettings* frame_settings,
-                                        const char* frame_name) {
-  std::string str = frame_name ? frame_name : "";
-  if (str.size() > 1071) {
-    return JXL_API_ERROR(frame_settings->enc, JXL_ENC_ERR_API_USAGE,
-                         "frame name can be max 1071 bytes long");
-  }
-  frame_settings->values.frame_name = str;
-  frame_settings->values.header.name_length = str.size();
-  return JxlErrorOrStatus::Success();
-}
-
-JxlEncoderStatus JxlEncoderSetFrameBitDepth(
-    JxlEncoderFrameSettings* frame_settings, const JxlBitDepth* bit_depth) {
-  if (bit_depth->type != JXL_BIT_DEPTH_FROM_PIXEL_FORMAT &&
-      bit_depth->type != JXL_BIT_DEPTH_FROM_CODESTREAM) {
-    return JXL_API_ERROR_NOSET(
-        "Only JXL_BIT_DEPTH_FROM_PIXEL_FORMAT and "
-        "JXL_BIT_DEPTH_FROM_CODESTREAM is implemented "
-        "for input buffers.");
-  }
-  frame_settings->values.image_bit_depth = *bit_depth;
-  return JxlErrorOrStatus::Success();
-}
-
-void JxlColorEncodingSetToSRGB(JxlColorEncoding* color_encoding,
-                               JXL_BOOL is_gray) {
-  *color_encoding =
-      jxl::ColorEncoding::SRGB(FROM_JXL_BOOL(is_gray)).ToExternal();
-}
-
-void JxlColorEncodingSetToLinearSRGB(JxlColorEncoding* color_encoding,
-                                     JXL_BOOL is_gray) {
-  *color_encoding =
-      jxl::ColorEncoding::LinearSRGB(FROM_JXL_BOOL(is_gray)).ToExternal();
-}
-
-void JxlEncoderAllowExpertOptions(JxlEncoder* enc) {
-  enc->allow_expert_options = true;
-}
-
-JXL_EXPORT void JxlEncoderSetDebugImageCallback(
-    JxlEncoderFrameSettings* frame_settings, JxlDebugImageCallback callback,
-    void* opaque) {
-  frame_settings->values.cparams.debug_image = callback;
-  frame_settings->values.cparams.debug_image_opaque = opaque;
-}
-
-JXL_EXPORT JxlEncoderStats* JxlEncoderStatsCreate() {
-  JxlEncoderStats* result = new JxlEncoderStats();
-  result->aux_out = jxl::make_unique<jxl::AuxOut>();
-  return result;
-}
-
-JXL_EXPORT void JxlEncoderStatsDestroy(JxlEncoderStats* stats) { delete stats; }
-
-JXL_EXPORT void JxlEncoderCollectStats(JxlEncoderFrameSettings* frame_settings,
-                                       JxlEncoderStats* stats) {
-  if (!stats) return;
-  frame_settings->values.aux_out = stats->aux_out.get();
-}
-
-JXL_EXPORT size_t JxlEncoderStatsGet(const JxlEncoderStats* stats,
-                                     JxlEncoderStatsKey key) {
-  if (!stats) return 0;
-  const jxl::AuxOut& aux_out = *stats->aux_out;
-  switch (key) {
-    case JXL_ENC_STAT_HEADER_BITS:
-      return aux_out.layer(jxl::LayerType::Header).total_bits;
-    case JXL_ENC_STAT_TOC_BITS:
-      return aux_out.layer(jxl::LayerType::Toc).total_bits;
-    case JXL_ENC_STAT_DICTIONARY_BITS:
-      return aux_out.layer(jxl::LayerType::Dictionary).total_bits;
-    case JXL_ENC_STAT_SPLINES_BITS:
-      return aux_out.layer(jxl::LayerType::Splines).total_bits;
-    case JXL_ENC_STAT_NOISE_BITS:
-      return aux_out.layer(jxl::LayerType::Noise).total_bits;
-    case JXL_ENC_STAT_QUANT_BITS:
-      return aux_out.layer(jxl::LayerType::Quant).total_bits;
-    case JXL_ENC_STAT_MODULAR_TREE_BITS:
-      return aux_out.layer(jxl::LayerType::ModularTree).total_bits;
-    case JXL_ENC_STAT_MODULAR_GLOBAL_BITS:
-      return aux_out.layer(jxl::LayerType::ModularGlobal).total_bits;
-    case JXL_ENC_STAT_DC_BITS:
-      return aux_out.layer(jxl::LayerType::Dc).total_bits;
-    case JXL_ENC_STAT_MODULAR_DC_GROUP_BITS:
-      return aux_out.layer(jxl::LayerType::ModularDcGroup).total_bits;
-    case JXL_ENC_STAT_CONTROL_FIELDS_BITS:
-      return aux_out.layer(jxl::LayerType::ControlFields).total_bits;
-    case JXL_ENC_STAT_COEF_ORDER_BITS:
-      return aux_out.layer(jxl::LayerType::Order).total_bits;
-    case JXL_ENC_STAT_AC_HISTOGRAM_BITS:
-      return aux_out.layer(jxl::LayerType::Ac).total_bits;
-    case JXL_ENC_STAT_AC_BITS:
-      return aux_out.layer(jxl::LayerType::AcTokens).total_bits;
-    case JXL_ENC_STAT_MODULAR_AC_GROUP_BITS:
-      return aux_out.layer(jxl::LayerType::ModularAcGroup).total_bits;
-    case JXL_ENC_STAT_NUM_SMALL_BLOCKS:
-      return aux_out.num_small_blocks;
-    case JXL_ENC_STAT_NUM_DCT4X8_BLOCKS:
-      return aux_out.num_dct4x8_blocks;
-    case JXL_ENC_STAT_NUM_AFV_BLOCKS:
-      return aux_out.num_afv_blocks;
-    case JXL_ENC_STAT_NUM_DCT8_BLOCKS:
-      return aux_out.num_dct8_blocks;
-    case JXL_ENC_STAT_NUM_DCT8X32_BLOCKS:
-      return aux_out.num_dct16_blocks;
-    case JXL_ENC_STAT_NUM_DCT16_BLOCKS:
-      return aux_out.num_dct16x32_blocks;
-    case JXL_ENC_STAT_NUM_DCT16X32_BLOCKS:
-      return aux_out.num_dct32_blocks;
-    case JXL_ENC_STAT_NUM_DCT32_BLOCKS:
-      return aux_out.num_dct32x64_blocks;
-    case JXL_ENC_STAT_NUM_DCT32X64_BLOCKS:
-      return aux_out.num_dct32x64_blocks;
-    case JXL_ENC_STAT_NUM_DCT64_BLOCKS:
-      return aux_out.num_dct64_blocks;
-    case JXL_ENC_STAT_NUM_BUTTERAUGLI_ITERS:
-      return aux_out.num_butteraugli_iters;
-    default:
-      return 0;
-  }
-}
-
-JXL_EXPORT void JxlEncoderStatsMerge(JxlEncoderStats* stats,
-                                     const JxlEncoderStats* other) {
-  if (!stats || !other) return;
-  stats->aux_out->Assimilate(*other->aux_out);
-}
diff --git a/third_party/jpeg-xl/lib/jxl/encode_internal.h b/third_party/jpeg-xl/lib/jxl/encode_internal.h
deleted file mode 100644
index 16ddd3205029b..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/encode_internal.h
+++ /dev/null
@@ -1,688 +0,0 @@
-/* Copyright (c) the JPEG XL Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
- */
-
-#ifndef LIB_JXL_ENCODE_INTERNAL_H_
-#define LIB_JXL_ENCODE_INTERNAL_H_
-
-#include <jxl/cms_interface.h>
-#include <jxl/codestream_header.h>
-#include <jxl/encode.h>
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-
-#include <algorithm>
-#include <array>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <functional>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/c_callback_support.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_fast_lossless.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/jpeg/jpeg_data.h"
-#include "lib/jxl/memory_manager_internal.h"
-#include "lib/jxl/padded_bytes.h"
-
-namespace jxl {
-
-/* Frame index box 'jxli' will start with Varint() for
-NF: has type Varint(): number of frames listed in the index.
-TNUM: has type u32: numerator of tick unit.
-TDEN: has type u32: denominator of tick unit. Value 0 means the file is
-ill-formed. per frame i listed: OFFi: has type Varint(): offset of start byte of
-this frame compared to start byte of previous frame from this index in the JPEG
-XL codestream. For the first frame, this is the offset from the first byte of
-the JPEG XL codestream. Ti: has type Varint(): duration in ticks between the
-start of this frame and the start of the next frame in the index. If this is the
-last frame in the index, this is the duration in ticks between the start of this
-frame and the end of the stream. A tick lasts TNUM / TDEN seconds. Fi: has type
-Varint(): amount of frames the next frame in the index occurs after this frame.
-If this is the last frame in the index, this is the amount of frames after this
-frame in the remainder of the stream. Only frames that are presented by the
-decoder are counted for this purpose, this excludes frames that are not intended
-for display but for compositing with other frames, such as frames that aren't
-the last frame with a duration of 0 ticks.
-
-All the frames listed in jxli are keyframes and the first frame is
-present in the list.
-There shall be either zero or one Frame Index boxes in a JPEG XL file.
-The offsets OFFi per frame are given as bytes in the codestream, not as
-bytes in the file format using the box structure. This means if JPEG XL Partial
-Codestream boxes are used, the offset is counted within the concatenated
-codestream, bytes from box headers or non-codestream boxes are not counted.
-*/
-
-typedef struct JxlEncoderFrameIndexBoxEntryStruct {
-  bool to_be_indexed;
-  uint32_t duration;
-  uint64_t OFFi;
-} JxlEncoderFrameIndexBoxEntry;
-
-typedef struct JxlEncoderFrameIndexBoxStruct {
-  // We always need to record the first frame entry, so presence of the
-  // first entry alone is not an indication if it was requested to be
-  // stored.
-  bool index_box_requested_through_api = false;
-
-  int64_t NF() const { return entries.size(); }
-  bool StoreFrameIndexBox() {
-    for (auto e : entries) {
-      if (e.to_be_indexed) {
-        return true;
-      }
-    }
-    return false;
-  }
-  int32_t TNUM = 1;
-  int32_t TDEN = 1000;
-
-  std::vector<JxlEncoderFrameIndexBoxEntry> entries;
-
-  // That way we can ensure that every index box will have the first frame.
-  // If the API user decides to mark it as an indexed frame, we call
-  // the AddFrame again, this time with requested.
-  void AddFrame(uint64_t OFFi, uint32_t duration, bool to_be_indexed) {
-    // We call AddFrame to every frame.
-    // Recording the first frame is required by the standard.
-    // Knowing the last frame is required, since the last indexed frame
-    // needs to know how many frames until the end.
-    // To be able to tell how many frames there are between each index
-    // entry we just record every frame here.
-    if (entries.size() == 1) {
-      if (OFFi == entries[0].OFFi) {
-        // API use for the first frame, let's clear the already recorded first
-        // frame.
-        entries.clear();
-      }
-    }
-    JxlEncoderFrameIndexBoxEntry e;
-    e.to_be_indexed = to_be_indexed;
-    e.OFFi = OFFi;
-    e.duration = duration;
-    entries.push_back(e);
-  }
-} JxlEncoderFrameIndexBox;
-
-// The encoder options (such as quality, compression speed, ...) for a single
-// frame, but not encoder-wide options such as box-related options.
-typedef struct JxlEncoderFrameSettingsValuesStruct {
-  // lossless is a separate setting from cparams because it is a combination
-  // setting that overrides multiple settings inside of cparams.
-  bool lossless;
-  CompressParams cparams;
-  JxlFrameHeader header;
-  std::vector<JxlBlendInfo> extra_channel_blend_info;
-  std::string frame_name;
-  JxlBitDepth image_bit_depth;
-  bool frame_index_box = false;
-  jxl::AuxOut* aux_out = nullptr;
-} JxlEncoderFrameSettingsValues;
-
-typedef std::array<uint8_t, 4> BoxType;
-
-// Utility function that makes a BoxType from a string literal. The string must
-// have 4 characters, a 5th null termination character is optional.
-constexpr BoxType MakeBoxType(const char* type) {
-  return BoxType(
-      {{static_cast<uint8_t>(type[0]), static_cast<uint8_t>(type[1]),
-        static_cast<uint8_t>(type[2]), static_cast<uint8_t>(type[3])}});
-}
-
-constexpr std::array<unsigned char, 32> kContainerHeader = {
-    0,   0,   0, 0xc, 'J',  'X', 'L', ' ', 0xd, 0xa, 0x87,
-    0xa, 0,   0, 0,   0x14, 'f', 't', 'y', 'p', 'j', 'x',
-    'l', ' ', 0, 0,   0,    0,   'j', 'x', 'l', ' '};
-
-constexpr std::array<unsigned char, 8> kLevelBoxHeader = {0,   0,   0,   0x9,
-                                                          'j', 'x', 'l', 'l'};
-
-static JXL_INLINE size_t BitsPerChannel(JxlDataType data_type) {
-  switch (data_type) {
-    case JXL_TYPE_UINT8:
-      return 8;
-    case JXL_TYPE_UINT16:
-      return 16;
-    case JXL_TYPE_FLOAT:
-      return 32;
-    case JXL_TYPE_FLOAT16:
-      return 16;
-    default:
-      return 0;  // signals unhandled JxlDataType
-  }
-}
-
-static JXL_INLINE size_t BytesPerPixel(JxlPixelFormat format) {
-  return format.num_channels * BitsPerChannel(format.data_type) / 8;
-}
-
-using ScopedInputBuffer =
-    std::unique_ptr<const void, std::function<void(const void*)>>;
-
-static JXL_INLINE ScopedInputBuffer
-GetColorBuffer(JxlChunkedFrameInputSource& input, size_t xpos, size_t ypos,
-               size_t xsize, size_t ysize, size_t* row_offset) {
-  return ScopedInputBuffer(
-      input.get_color_channel_data_at(input.opaque, xpos, ypos, xsize, ysize,
-                                      row_offset),
-      [&input](const void* p) { input.release_buffer(input.opaque, p); });
-}
-
-static JXL_INLINE ScopedInputBuffer GetExtraChannelBuffer(
-    JxlChunkedFrameInputSource& input, size_t ec_index, size_t xpos,
-    size_t ypos, size_t xsize, size_t ysize, size_t* row_offset) {
-  return ScopedInputBuffer(
-      input.get_extra_channel_data_at(input.opaque, ec_index, xpos, ypos, xsize,
-                                      ysize, row_offset),
-      [&input](const void* p) { input.release_buffer(input.opaque, p); });
-}
-
-// Common adapter for an existing frame input source or a whole-image input
-// buffer or a parsed JPEG file.
-class JxlEncoderChunkedFrameAdapter {
- public:
-  JxlEncoderChunkedFrameAdapter(size_t xs, size_t ys, size_t num_extra_channels)
-      : xsize(xs), ysize(ys), channels_(1 + num_extra_channels) {}
-
-  void SetInputSource(JxlChunkedFrameInputSource input_source) {
-    input_source_ = input_source;
-    has_input_source_ = true;
-  }
-
-  bool SetFromBuffer(size_t channel, const uint8_t* buffer, size_t size,
-                     JxlPixelFormat format) {
-    if (channel >= channels_.size()) return false;
-    if (!channels_[channel].SetFromBuffer(buffer, size, format, xsize, ysize)) {
-      return false;
-    }
-    if (channel > 0) channels_[channel].CopyBuffer();
-    return true;
-  }
-
-  void SetJPEGData(std::unique_ptr<jpeg::JPEGData> jpeg_data) {
-    jpeg_data_ = std::move(jpeg_data);
-  }
-
-  // NB: after TakeJPEGData it will return false!
-  bool IsJPEG() const { return jpeg_data_ != nullptr; }
-
-  std::unique_ptr<jpeg::JPEGData> TakeJPEGData() {
-    return std::move(jpeg_data_);
-  }
-
-  JxlChunkedFrameInputSource GetInputSource() {
-    if (has_input_source_) {
-      return input_source_;
-    }
-    return JxlChunkedFrameInputSource{
-        this,
-        METHOD_TO_C_CALLBACK(
-            &JxlEncoderChunkedFrameAdapter::GetColorChannelsPixelFormat),
-        METHOD_TO_C_CALLBACK(
-            &JxlEncoderChunkedFrameAdapter::GetColorChannelDataAt),
-        METHOD_TO_C_CALLBACK(
-            &JxlEncoderChunkedFrameAdapter::GetExtraChannelPixelFormat),
-        METHOD_TO_C_CALLBACK(
-            &JxlEncoderChunkedFrameAdapter::GetExtraChannelDataAt),
-        METHOD_TO_C_CALLBACK(
-            &JxlEncoderChunkedFrameAdapter::ReleaseCurrentData)};
-  }
-
-  bool CopyBuffers() {
-    if (has_input_source_) {
-      JxlPixelFormat format{4, JXL_TYPE_UINT8, JXL_NATIVE_ENDIAN, 0};
-      input_source_.get_color_channels_pixel_format(input_source_.opaque,
-                                                    &format);
-      size_t row_offset;
-      {
-        auto buffer =
-            GetColorBuffer(input_source_, 0, 0, xsize, ysize, &row_offset);
-        if (!buffer) return false;
-        channels_[0].CopyFromBuffer(buffer.get(), format, xsize, ysize,
-                                    row_offset);
-      }
-      for (size_t ec = 0; ec + 1 < channels_.size(); ++ec) {
-        input_source_.get_extra_channel_pixel_format(input_source_.opaque, ec,
-                                                     &format);
-        auto buffer = GetExtraChannelBuffer(input_source_, ec, 0, 0, xsize,
-                                            ysize, &row_offset);
-        if (!buffer) continue;
-        channels_[1 + ec].CopyFromBuffer(buffer.get(), format, xsize, ysize,
-                                         row_offset);
-      }
-      has_input_source_ = false;
-    } else {
-      channels_[0].CopyBuffer();
-    }
-    return true;
-  }
-
-  bool StreamingInput() const { return has_input_source_; }
-
-  const size_t xsize;
-  const size_t ysize;
-
- private:
-  void GetColorChannelsPixelFormat(JxlPixelFormat* pixel_format) {
-    *pixel_format = channels_[0].format_;
-  }
-
-  const void* GetColorChannelDataAt(size_t xpos, size_t ypos, size_t xsize,
-                                    size_t ysize, size_t* row_offset) {
-    return channels_[0].GetDataAt(xpos, ypos, xsize, ysize, row_offset);
-  }
-
-  void GetExtraChannelPixelFormat(size_t ec_index,
-                                  JxlPixelFormat* pixel_format) {
-    JXL_DASSERT(1 + ec_index < channels_.size());
-    *pixel_format = channels_[1 + ec_index].format_;
-  }
-
-  const void* GetExtraChannelDataAt(size_t ec_index, size_t xpos, size_t ypos,
-                                    size_t xsize, size_t ysize,
-                                    size_t* row_offset) {
-    JXL_DASSERT(1 + ec_index < channels_.size());
-    return channels_[1 + ec_index].GetDataAt(xpos, ypos, xsize, ysize,
-                                             row_offset);
-  }
-
-  void ReleaseCurrentData(const void* buffer) {
-    // No dynamic memory is allocated in GetColorChannelDataAt or
-    // GetExtraChannelDataAt. Therefore, no cleanup is required here.
-  }
-
-  JxlChunkedFrameInputSource input_source_ = {};
-  bool has_input_source_ = false;
-  std::unique_ptr<jpeg::JPEGData> jpeg_data_;
-  struct Channel {
-    const uint8_t* buffer_ = nullptr;
-    size_t buffer_size_;
-    JxlPixelFormat format_;
-    size_t xsize_;
-    size_t ysize_;
-    size_t bytes_per_pixel_;
-    size_t stride_;
-    std::vector<uint8_t> copy_;
-
-    void SetFormatAndDimensions(JxlPixelFormat format, size_t xsize,
-                                size_t ysize) {
-      format_ = format;
-      xsize_ = xsize;
-      ysize_ = ysize;
-      bytes_per_pixel_ = BytesPerPixel(format_);
-      const size_t last_row_size = xsize_ * bytes_per_pixel_;
-      const size_t align = format_.align;
-      stride_ = (align > 1 ? jxl::DivCeil(last_row_size, align) * align
-                           : last_row_size);
-    }
-
-    bool SetFromBuffer(const uint8_t* buffer, size_t size,
-                       JxlPixelFormat format, size_t xsize, size_t ysize) {
-      SetFormatAndDimensions(format, xsize, ysize);
-      buffer_ = buffer;
-      buffer_size_ = size;
-      const size_t min_buffer_size =
-          stride_ * (ysize_ - 1) + xsize_ * bytes_per_pixel_;
-      return min_buffer_size <= size;
-    }
-
-    void CopyFromBuffer(const void* buffer, JxlPixelFormat format, size_t xsize,
-                        size_t ysize, size_t row_offset) {
-      SetFormatAndDimensions(format, xsize, ysize);
-      buffer_ = nullptr;
-      copy_.resize(ysize * stride_);
-      for (size_t y = 0; y < ysize; ++y) {
-        memcpy(copy_.data() + y * stride_,
-               reinterpret_cast<const uint8_t*>(buffer) + y * row_offset,
-               stride_);
-      }
-    }
-
-    void CopyBuffer() {
-      if (buffer_) {
-        copy_ = std::vector<uint8_t>(buffer_, buffer_ + buffer_size_);
-        buffer_ = nullptr;
-      }
-    }
-
-    const void* GetDataAt(size_t xpos, size_t ypos, size_t xsize, size_t ysize,
-                          size_t* row_offset) const {
-      const uint8_t* buffer = copy_.empty() ? buffer_ : copy_.data();
-      JXL_DASSERT(ypos + ysize <= ysize_);
-      JXL_DASSERT(xpos + xsize <= xsize_);
-      JXL_DASSERT(buffer);
-      *row_offset = stride_;
-      return buffer + ypos * stride_ + xpos * bytes_per_pixel_;
-    }
-  };
-  std::vector<Channel> channels_;
-};
-
-struct JxlEncoderQueuedFrame {
-  JxlEncoderFrameSettingsValues option_values;
-  JxlEncoderChunkedFrameAdapter frame_data;
-  std::vector<uint8_t> ec_initialized;
-};
-
-struct JxlEncoderQueuedBox {
-  BoxType type;
-  std::vector<uint8_t> contents;
-  bool compress_box;
-};
-
-using FJXLFrameUniquePtr =
-    std::unique_ptr<JxlFastLosslessFrameState,
-                    decltype(&JxlFastLosslessFreeFrameState)>;
-
-// Either a frame, or a box, not both.
-// Can also be a FJXL frame.
-struct JxlEncoderQueuedInput {
-  explicit JxlEncoderQueuedInput(const JxlMemoryManager& memory_manager)
-      : frame(nullptr, jxl::MemoryManagerDeleteHelper(&memory_manager)),
-        box(nullptr, jxl::MemoryManagerDeleteHelper(&memory_manager)) {}
-  MemoryManagerUniquePtr<JxlEncoderQueuedFrame> frame;
-  MemoryManagerUniquePtr<JxlEncoderQueuedBox> box;
-  FJXLFrameUniquePtr fast_lossless_frame = {nullptr,
-                                            JxlFastLosslessFreeFrameState};
-};
-
-static constexpr size_t kSmallBoxHeaderSize = 8;
-static constexpr size_t kLargeBoxHeaderSize = 16;
-static constexpr size_t kLargeBoxContentSizeThreshold =
-    0x100000000ull - kSmallBoxHeaderSize;
-
-size_t WriteBoxHeader(const jxl::BoxType& type, size_t size, bool unbounded,
-                      bool force_large_box, uint8_t* output);
-
-// Appends a JXL container box header with given type, size, and unbounded
-// properties to output.
-template <typename T>
-void AppendBoxHeader(const jxl::BoxType& type, size_t size, bool unbounded,
-                     T* output) {
-  size_t current_size = output->size();
-  output->resize(current_size + kLargeBoxHeaderSize);
-  size_t header_size =
-      WriteBoxHeader(type, size, unbounded, /*force_large_box=*/false,
-                     output->data() + current_size);
-  output->resize(current_size + header_size);
-}
-
-}  // namespace jxl
-
-class JxlOutputProcessorBuffer;
-
-class JxlEncoderOutputProcessorWrapper {
-  friend class JxlOutputProcessorBuffer;
-
- public:
-  explicit JxlEncoderOutputProcessorWrapper(JxlMemoryManager* memory_manager)
-      : memory_manager_(memory_manager) {}
-  JxlEncoderOutputProcessorWrapper(JxlMemoryManager* memory_manager,
-                                   JxlEncoderOutputProcessor processor)
-      : memory_manager_(memory_manager),
-        external_output_processor_(
-            jxl::make_unique<JxlEncoderOutputProcessor>(processor)) {}
-
-  bool HasAvailOut() const { return avail_out_ != nullptr; }
-
-  // Caller can never overwrite a previously-written buffer. Asking for a buffer
-  // with `min_size` such that `position + min_size` overlaps with a
-  // previously-written buffer is invalid.
-  jxl::StatusOr<JxlOutputProcessorBuffer> GetBuffer(size_t min_size,
-                                                    size_t requested_size = 0);
-
-  jxl::Status Seek(size_t pos);
-
-  jxl::Status SetFinalizedPosition();
-
-  size_t CurrentPosition() const { return position_; }
-
-  jxl::Status SetAvailOut(uint8_t** next_out, size_t* avail_out);
-
-  bool WasStopRequested() const { return stop_requested_; }
-  bool OutputProcessorSet() const {
-    return external_output_processor_ != nullptr;
-  }
-  bool HasOutputToWrite() const {
-    return output_position_ < finalized_position_;
-  }
-
-  jxl::Status CopyOutput(std::vector<uint8_t>& output, uint8_t* next_out,
-                         size_t& avail_out);
-
- private:
-  jxl::Status ReleaseBuffer(size_t bytes_used);
-
-  // Tries to write all the bytes up to the finalized position.
-  jxl::Status FlushOutput();
-
-  bool AppendBufferToExternalProcessor(void* data, size_t count);
-
-  struct InternalBuffer {
-    explicit InternalBuffer(JxlMemoryManager* memory_manager)
-        : owned_data(memory_manager) {
-      JXL_DASSERT(memory_manager != nullptr);
-    }
-    // Bytes in the range `[output_position_ - start_of_the_buffer,
-    // written_bytes)` need to be flushed out.
-    size_t written_bytes = 0;
-    // If data has been buffered, it is stored in `owned_data`.
-    jxl::PaddedBytes owned_data;
-  };
-
-  // Invariant: `internal_buffers_` does not contain chunks that are entirely
-  // below the output position.
-  std::map<size_t, InternalBuffer> internal_buffers_;
-
-  uint8_t** next_out_ = nullptr;
-  size_t* avail_out_ = nullptr;
-  // Where the next GetBuffer call will write bytes to.
-  size_t position_ = 0;
-  // The position of the last SetFinalizedPosition call.
-  size_t finalized_position_ = 0;
-  // Either the position of the `external_output_processor_` or the position
-  // `next_out_` points to.
-  size_t output_position_ = 0;
-
-  bool stop_requested_ = false;
-  bool has_buffer_ = false;
-
-  JxlMemoryManager* memory_manager_;
-  std::unique_ptr<JxlEncoderOutputProcessor> external_output_processor_;
-};
-
-class JxlOutputProcessorBuffer {
- public:
-  size_t size() const { return size_; };
-  uint8_t* data() { return data_; }
-
-  JxlOutputProcessorBuffer(uint8_t* buffer, size_t size, size_t bytes_used,
-                           JxlEncoderOutputProcessorWrapper* wrapper)
-      : data_(buffer),
-        size_(size),
-        bytes_used_(bytes_used),
-        wrapper_(wrapper) {}
-  ~JxlOutputProcessorBuffer() {
-    jxl::Status result = release();
-    (void)result;
-    JXL_DASSERT(result);
-  }
-
-  JxlOutputProcessorBuffer(const JxlOutputProcessorBuffer&) = delete;
-  JxlOutputProcessorBuffer(JxlOutputProcessorBuffer&& other) noexcept
-      : JxlOutputProcessorBuffer(other.data_, other.size_, other.bytes_used_,
-                                 other.wrapper_) {
-    other.data_ = nullptr;
-    other.size_ = 0;
-  }
-
-  jxl::Status advance(size_t count) {
-    JXL_ENSURE(count <= size_);
-    data_ += count;
-    size_ -= count;
-    bytes_used_ += count;
-    return true;
-  }
-
-  jxl::Status release() {
-    jxl::Status result = jxl::OkStatus();
-    if (this->data_) {
-      result = wrapper_->ReleaseBuffer(bytes_used_);
-    }
-    data_ = nullptr;
-    size_ = 0;
-    return result;
-  }
-
-  jxl::Status append(const void* data, size_t count) {
-    memcpy(data_, data, count);
-    JXL_RETURN_IF_ERROR(advance(count));
-    return true;
-  }
-
-  template <typename T>
-  jxl::Status append(const T& data) {
-    static_assert(sizeof(*std::begin(data)) == 1, "Cannot append non-bytes");
-    JXL_RETURN_IF_ERROR(
-        append(&*std::begin(data), std::end(data) - std::begin(data)));
-    return true;
-  }
-
-  JxlOutputProcessorBuffer& operator=(const JxlOutputProcessorBuffer&) = delete;
-  JxlOutputProcessorBuffer& operator=(
-      JxlOutputProcessorBuffer&& other) noexcept {
-    data_ = other.data_;
-    size_ = other.size_;
-    wrapper_ = other.wrapper_;
-    return *this;
-  }
-
- private:
-  uint8_t* data_;
-  size_t size_;
-  size_t bytes_used_;
-  JxlEncoderOutputProcessorWrapper* wrapper_;
-};
-
-template <typename T>
-jxl::Status AppendData(JxlEncoderOutputProcessorWrapper& output_processor,
-                       const T& data) {
-  size_t size = std::end(data) - std::begin(data);
-  size_t written = 0;
-  while (written < size) {
-    JXL_ASSIGN_OR_RETURN(auto buffer,
-                         output_processor.GetBuffer(1, size - written));
-    size_t n = std::min(size - written, buffer.size());
-    JXL_RETURN_IF_ERROR(buffer.append(data.data() + written, n));
-    written += n;
-  }
-  return jxl::OkStatus();
-}
-
-// Internal use only struct, can only be initialized correctly by
-// JxlEncoderCreate.
-struct JxlEncoderStruct {
-  JxlEncoderStruct() : output_processor(&memory_manager) {}
-  JxlMemoryManager memory_manager;
-  jxl::MemoryManagerUniquePtr<jxl::ThreadPool> thread_pool{
-      nullptr, jxl::MemoryManagerDeleteHelper(&memory_manager)};
-  std::vector<jxl::MemoryManagerUniquePtr<JxlEncoderFrameSettings>>
-      encoder_options;
-
-  size_t num_queued_frames;
-  size_t num_queued_boxes;
-  std::vector<jxl::JxlEncoderQueuedInput> input_queue;
-  JxlEncoderOutputProcessorWrapper output_processor;
-
-  // How many codestream bytes have been written, i.e.,
-  // content of jxlc and jxlp boxes. Frame index box jxli
-  // requires position indices to point to codestream bytes,
-  // so we need to keep track of the total of flushed or queue
-  // codestream bytes. These bytes may be in a single jxlc box
-  // or across multiple jxlp boxes.
-  size_t codestream_bytes_written_end_of_frame;
-  jxl::JxlEncoderFrameIndexBox frame_index_box;
-
-  JxlCmsInterface cms;
-  bool cms_set;
-
-  // Force using the container even if not needed
-  bool use_container;
-  // User declared they will add metadata boxes
-  bool use_boxes;
-
-  // TODO(lode): move level into jxl::CompressParams since some C++
-  // implementation decisions should be based on it: level 10 allows more
-  // features to be used.
-  bool store_jpeg_metadata;
-  int32_t codestream_level;
-  jxl::CodecMetadata metadata;
-  std::vector<uint8_t> jpeg_metadata;
-
-  jxl::CompressParams last_used_cparams;
-  JxlBasicInfo basic_info;
-
-  JxlEncoderError error = JxlEncoderError::JXL_ENC_ERR_OK;
-
-  // Encoder wrote a jxlp (partial codestream) box, so any next codestream
-  // parts must also be written in jxlp boxes, a single jxlc box cannot be
-  // used. The counter is used for the 4-byte jxlp box index header.
-  size_t jxlp_counter;
-
-  // Wrote any output at all, so wrote the data before the first user added
-  // frame or box, such as signature, basic info, ICC profile or jpeg
-  // reconstruction box.
-  bool wrote_bytes;
-
-  bool frames_closed;
-  bool boxes_closed;
-  bool basic_info_set;
-  bool color_encoding_set;
-  bool intensity_target_set;
-  bool allow_expert_options = false;
-  int brotli_effort = -1;
-
-  // Takes the first frame in the input_queue, encodes it, and appends
-  // the bytes to the output_byte_queue.
-  jxl::Status ProcessOneEnqueuedInput();
-
-  bool MustUseContainer() const {
-    return use_container || (codestream_level != 5 && codestream_level != -1) ||
-           store_jpeg_metadata || use_boxes;
-  }
-
-  // `write_box` must never seek before the position the output wrapper was at
-  // the moment of the call, and must leave the output wrapper such that its
-  // position is one byte past the end of the written box.
-  template <typename WriteBox>
-  jxl::Status AppendBox(const jxl::BoxType& type, bool unbounded,
-                        size_t box_max_size, const WriteBox& write_box);
-
-  template <typename BoxContents>
-  jxl::Status AppendBoxWithContents(const jxl::BoxType& type,
-                                    const BoxContents& contents);
-};
-
-struct JxlEncoderFrameSettingsStruct {
-  JxlEncoder* enc;
-  jxl::JxlEncoderFrameSettingsValues values;
-};
-
-struct JxlEncoderStatsStruct {
-  std::unique_ptr<jxl::AuxOut> aux_out;
-};
-
-#endif  // LIB_JXL_ENCODE_INTERNAL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/encode_test.cc b/third_party/jpeg-xl/lib/jxl/encode_test.cc
deleted file mode 100644
index 3e79dde8bba9e..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/encode_test.cc
+++ /dev/null
@@ -1,2093 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/cms.h>
-#include <jxl/cms_interface.h>
-#include <jxl/codestream_header.h>
-#include <jxl/color_encoding.h>
-#include <jxl/decode.h>
-#include <jxl/decode_cxx.h>
-#include <jxl/encode.h>
-#include <jxl/encode_cxx.h>
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <mutex>
-#include <ostream>
-#include <set>
-#include <string>
-#include <tuple>
-#include <utility>
-#include <vector>
-
-#include "lib/extras/codec.h"
-#include "lib/extras/dec/jxl.h"
-#include "lib/extras/metrics.h"
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/c_callback_support.h"
-#include "lib/jxl/base/override.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/common.h"  // JXL_HIGH_PRECISION
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/encode_internal.h"
-#include "lib/jxl/modular/options.h"
-#include "lib/jxl/test_image.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace {
-bool SameDecodedPixels(const std::vector<uint8_t>& compressed0,
-                       const std::vector<uint8_t>& compressed1) {
-  jxl::extras::JXLDecompressParams dparams;
-  dparams.accepted_formats = {
-      {3, JXL_TYPE_UINT16, JXL_LITTLE_ENDIAN, 0},
-      {4, JXL_TYPE_UINT16, JXL_LITTLE_ENDIAN, 0},
-  };
-  jxl::extras::PackedPixelFile ppf0;
-  EXPECT_TRUE(DecodeImageJXL(compressed0.data(), compressed0.size(), dparams,
-                             nullptr, &ppf0, nullptr));
-  jxl::extras::PackedPixelFile ppf1;
-  EXPECT_TRUE(DecodeImageJXL(compressed1.data(), compressed1.size(), dparams,
-                             nullptr, &ppf1, nullptr));
-  return jxl::test::SamePixels(ppf0, ppf1);
-}
-}  // namespace
-
-TEST(EncodeTest, AddFrameAfterCloseInputTest) {
-  JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-  EXPECT_NE(nullptr, enc.get());
-
-  JxlEncoderCloseInput(enc.get());
-
-  size_t xsize = 64;
-  size_t ysize = 64;
-  JxlPixelFormat pixel_format = {4, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 4, 0);
-
-  jxl::CodecInOut input_io =
-      jxl::test::SomeTestImageToCodecInOut(pixels, 4, xsize, ysize);
-
-  JxlBasicInfo basic_info;
-  jxl::test::JxlBasicInfoSetFromPixelFormat(&basic_info, &pixel_format);
-  basic_info.xsize = xsize;
-  basic_info.ysize = ysize;
-  basic_info.uses_original_profile = 0;
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetCodestreamLevel(enc.get(), 10));
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetBasicInfo(enc.get(), &basic_info));
-  JxlColorEncoding color_encoding;
-  JXL_BOOL is_gray = TO_JXL_BOOL(pixel_format.num_channels < 3);
-  JxlColorEncodingSetToSRGB(&color_encoding, is_gray);
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderSetColorEncoding(enc.get(), &color_encoding));
-  JxlEncoderFrameSettings* frame_settings =
-      JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-  EXPECT_EQ(JXL_ENC_ERROR,
-            JxlEncoderAddImageFrame(frame_settings, &pixel_format,
-                                    pixels.data(), pixels.size()));
-}
-
-TEST(EncodeTest, AddJPEGAfterCloseTest) {
-  JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-  EXPECT_NE(nullptr, enc.get());
-
-  JxlEncoderCloseInput(enc.get());
-
-  const std::string jpeg_path = "jxl/flower/flower.png.im_q85_420.jpg";
-  const std::vector<uint8_t> orig = jxl::test::ReadTestData(jpeg_path);
-
-  JxlEncoderFrameSettings* frame_settings =
-      JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-
-  EXPECT_EQ(JXL_ENC_ERROR,
-            JxlEncoderAddJPEGFrame(frame_settings, orig.data(), orig.size()));
-}
-
-TEST(EncodeTest, AddFrameBeforeBasicInfoTest) {
-  JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-  EXPECT_NE(nullptr, enc.get());
-
-  size_t xsize = 64;
-  size_t ysize = 64;
-  JxlPixelFormat pixel_format = {4, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 4, 0);
-
-  jxl::CodecInOut input_io =
-      jxl::test::SomeTestImageToCodecInOut(pixels, 4, xsize, ysize);
-
-  JxlColorEncoding color_encoding;
-  JXL_BOOL is_gray = TO_JXL_BOOL(pixel_format.num_channels < 3);
-  JxlColorEncodingSetToSRGB(&color_encoding, is_gray);
-  EXPECT_EQ(JXL_ENC_ERROR,
-            JxlEncoderSetColorEncoding(enc.get(), &color_encoding));
-  JxlEncoderFrameSettings* frame_settings =
-      JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-  EXPECT_EQ(JXL_ENC_ERROR,
-            JxlEncoderAddImageFrame(frame_settings, &pixel_format,
-                                    pixels.data(), pixels.size()));
-}
-
-TEST(EncodeTest, DefaultAllocTest) {
-  JxlEncoder* enc = JxlEncoderCreate(nullptr);
-  EXPECT_NE(nullptr, enc);
-  JxlEncoderDestroy(enc);
-}
-
-TEST(EncodeTest, CustomAllocTest) {
-  struct CalledCounters {
-    int allocs = 0;
-    int frees = 0;
-  } counters;
-
-  JxlMemoryManager mm;
-  mm.opaque = &counters;
-  mm.alloc = [](void* opaque, size_t size) {
-    reinterpret_cast<CalledCounters*>(opaque)->allocs++;
-    return malloc(size);
-  };
-  mm.free = [](void* opaque, void* address) {
-    reinterpret_cast<CalledCounters*>(opaque)->frees++;
-    free(address);
-  };
-
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(&mm);
-    EXPECT_NE(nullptr, enc.get());
-    EXPECT_LE(1, counters.allocs);
-    EXPECT_EQ(0, counters.frees);
-  }
-  EXPECT_LE(1, counters.frees);
-}
-
-TEST(EncodeTest, DefaultParallelRunnerTest) {
-  JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-  EXPECT_NE(nullptr, enc.get());
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderSetParallelRunner(enc.get(), nullptr, nullptr));
-}
-
-void VerifyFrameEncoding(size_t xsize, size_t ysize, JxlEncoder* enc,
-                         const JxlEncoderFrameSettings* frame_settings,
-                         size_t max_compressed_size,
-                         bool lossy_use_original_profile) {
-  JxlPixelFormat pixel_format = {4, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 4, 0);
-
-  jxl::CodecInOut input_io =
-      jxl::test::SomeTestImageToCodecInOut(pixels, 4, xsize, ysize);
-
-  JxlBasicInfo basic_info;
-  jxl::test::JxlBasicInfoSetFromPixelFormat(&basic_info, &pixel_format);
-  basic_info.xsize = xsize;
-  basic_info.ysize = ysize;
-  if (frame_settings->values.lossless || lossy_use_original_profile) {
-    basic_info.uses_original_profile = JXL_TRUE;
-  } else {
-    basic_info.uses_original_profile = JXL_FALSE;
-  }
-  // 16-bit alpha means this requires level 10
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetCodestreamLevel(enc, 10));
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetBasicInfo(enc, &basic_info));
-  JxlColorEncoding color_encoding;
-  JxlColorEncodingSetToSRGB(&color_encoding, JXL_TRUE);
-  EXPECT_EQ(JXL_ENC_ERROR, JxlEncoderSetColorEncoding(enc, &color_encoding));
-  JxlColorEncodingSetToSRGB(&color_encoding, JXL_FALSE);
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetColorEncoding(enc, &color_encoding));
-  pixel_format.num_channels = 1;
-  EXPECT_EQ(JXL_ENC_ERROR,
-            JxlEncoderAddImageFrame(frame_settings, &pixel_format,
-                                    pixels.data(), pixels.size()));
-  pixel_format.num_channels = 4;
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderAddImageFrame(frame_settings, &pixel_format,
-                                    pixels.data(), pixels.size()));
-  JxlEncoderCloseInput(enc);
-
-  std::vector<uint8_t> compressed = std::vector<uint8_t>(64);
-  uint8_t* next_out = compressed.data();
-  size_t avail_out = compressed.size() - (next_out - compressed.data());
-  JxlEncoderStatus process_result = JXL_ENC_NEED_MORE_OUTPUT;
-  while (process_result == JXL_ENC_NEED_MORE_OUTPUT) {
-    process_result = JxlEncoderProcessOutput(enc, &next_out, &avail_out);
-    if (process_result == JXL_ENC_NEED_MORE_OUTPUT) {
-      size_t offset = next_out - compressed.data();
-      compressed.resize(compressed.size() * 2);
-      next_out = compressed.data() + offset;
-      avail_out = compressed.size() - offset;
-    }
-  }
-  compressed.resize(next_out - compressed.data());
-  EXPECT_LE(compressed.size(), max_compressed_size);
-  EXPECT_EQ(JXL_ENC_SUCCESS, process_result);
-  jxl::CodecInOut decoded_io{jxl::test::MemoryManager()};
-  EXPECT_TRUE(jxl::test::DecodeFile(
-      {}, jxl::Bytes(compressed.data(), compressed.size()), &decoded_io));
-
-  static constexpr double kMaxButteraugli =
-#if JXL_HIGH_PRECISION
-      3.2;
-#else
-      8.7;
-#endif
-  EXPECT_LE(
-      ComputeDistance2(input_io.Main(), decoded_io.Main(), *JxlGetDefaultCms()),
-      kMaxButteraugli);
-}
-
-void VerifyFrameEncoding(JxlEncoder* enc,
-                         const JxlEncoderFrameSettings* frame_settings) {
-  VerifyFrameEncoding(63, 129, enc, frame_settings, 27000,
-                      /*lossy_use_original_profile=*/false);
-}
-
-TEST(EncodeTest, FrameEncodingTest) {
-  JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-  EXPECT_NE(nullptr, enc.get());
-  VerifyFrameEncoding(enc.get(),
-                      JxlEncoderFrameSettingsCreate(enc.get(), nullptr));
-}
-
-TEST(EncodeTest, EncoderResetTest) {
-  JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-  EXPECT_NE(nullptr, enc.get());
-  VerifyFrameEncoding(50, 200, enc.get(),
-                      JxlEncoderFrameSettingsCreate(enc.get(), nullptr), 4599,
-                      false);
-  // Encoder should become reusable for a new image from scratch after using
-  // reset.
-  JxlEncoderReset(enc.get());
-  VerifyFrameEncoding(157, 77, enc.get(),
-                      JxlEncoderFrameSettingsCreate(enc.get(), nullptr), 2300,
-                      false);
-}
-
-TEST(EncodeTest, CmsTest) {
-  JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-  EXPECT_NE(nullptr, enc.get());
-  bool cms_called = false;
-  JxlCmsInterface cms = *JxlGetDefaultCms();
-  struct InitData {
-    void* original_init_data;
-    jpegxl_cms_init_func original_init;
-    bool* cms_called;
-  };
-  InitData init_data = {/*original_init_data=*/cms.init_data,
-                        /*original_init=*/cms.init,
-                        /*cms_called=*/&cms_called};
-  cms.init_data = &init_data;
-  cms.init = +[](void* raw_init_data, size_t num_threads,
-                 size_t pixels_per_thread, const JxlColorProfile* input_profile,
-                 const JxlColorProfile* output_profile,
-                 float intensity_target) {
-    const InitData* init_data = static_cast<const InitData*>(raw_init_data);
-    *init_data->cms_called = true;
-    return init_data->original_init(init_data->original_init_data, num_threads,
-                                    pixels_per_thread, input_profile,
-                                    output_profile, intensity_target);
-  };
-  JxlEncoderSetCms(enc.get(), cms);
-  JxlEncoderFrameSettings* frame_settings =
-      JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-  JxlEncoderSetFrameLossless(frame_settings, JXL_FALSE);
-  ASSERT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderFrameSettingsSetOption(frame_settings,
-                                             JXL_ENC_FRAME_SETTING_EFFORT, 8));
-  VerifyFrameEncoding(enc.get(), frame_settings);
-  EXPECT_TRUE(cms_called);
-}
-
-TEST(EncodeTest, FrameSettingsTest) {
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    EXPECT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_EFFORT, 5));
-    VerifyFrameEncoding(enc.get(), frame_settings);
-    EXPECT_EQ(jxl::SpeedTier::kHare, enc->last_used_cparams.speed_tier);
-  }
-
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    EXPECT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    const size_t nb_options = 23;
-    const JxlEncoderFrameSettingId options[nb_options] = {
-        JXL_ENC_FRAME_SETTING_EFFORT,
-        JXL_ENC_FRAME_SETTING_BROTLI_EFFORT,
-        JXL_ENC_FRAME_SETTING_DECODING_SPEED,
-        JXL_ENC_FRAME_SETTING_RESAMPLING,
-        JXL_ENC_FRAME_SETTING_EXTRA_CHANNEL_RESAMPLING,
-        JXL_ENC_FRAME_SETTING_ALREADY_DOWNSAMPLED,
-        JXL_ENC_FRAME_SETTING_EPF,
-        JXL_ENC_FRAME_SETTING_GROUP_ORDER_CENTER_X,
-        JXL_ENC_FRAME_SETTING_GROUP_ORDER_CENTER_Y,
-        JXL_ENC_FRAME_SETTING_PROGRESSIVE_DC,
-        JXL_ENC_FRAME_SETTING_PALETTE_COLORS,
-        JXL_ENC_FRAME_SETTING_COLOR_TRANSFORM,
-        JXL_ENC_FRAME_SETTING_MODULAR_COLOR_SPACE,
-        JXL_ENC_FRAME_SETTING_MODULAR_GROUP_SIZE,
-        JXL_ENC_FRAME_SETTING_MODULAR_PREDICTOR,
-        JXL_ENC_FRAME_SETTING_MODULAR_NB_PREV_CHANNELS,
-        JXL_ENC_FRAME_SETTING_JPEG_RECON_CFL,
-        JXL_ENC_FRAME_INDEX_BOX,
-        JXL_ENC_FRAME_SETTING_JPEG_COMPRESS_BOXES,
-        JXL_ENC_FRAME_SETTING_BUFFERING,
-        JXL_ENC_FRAME_SETTING_JPEG_KEEP_EXIF,
-        JXL_ENC_FRAME_SETTING_JPEG_KEEP_XMP,
-        JXL_ENC_FRAME_SETTING_JPEG_KEEP_JUMBF};
-    const int too_low[nb_options] = {0,  -2, -2, 3,  -2, -2, -2, -2,
-                                     -2, -2, -2, -2, -2, -2, -2, -2,
-                                     -2, -1, -2, -2, -2, -2, -2};
-    const int too_high[nb_options] = {11, 12, 5,     16, 6,  2, 4,  -3,
-                                      -3, 3,  70914, 3,  42, 4, 16, 12,
-                                      2,  2,  2,     4,  2,  2, 2};
-    const int in_range[nb_options] = {5,  5, 3,  1,  1,  1,  3,  -1,
-                                      0,  1, -1, -1, 3,  2,  15, -1,
-                                      -1, 1, 0,  0,  -1, -1, -1};
-    for (size_t i = 0; i < nb_options; i++) {
-      // Lower than currently supported values
-      EXPECT_EQ(JXL_ENC_ERROR, JxlEncoderFrameSettingsSetOption(
-                                   frame_settings, options[i], too_low[i]));
-      // Higher than currently supported values
-      EXPECT_EQ(JXL_ENC_ERROR, JxlEncoderFrameSettingsSetOption(
-                                   frame_settings, options[i], too_high[i]));
-      // Using SetFloatOption on integer options
-      EXPECT_EQ(JXL_ENC_ERROR, JxlEncoderFrameSettingsSetFloatOption(
-                                   frame_settings, options[i], 1.0f));
-      // Within range of the currently supported values
-      EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderFrameSettingsSetOption(
-                                     frame_settings, options[i], in_range[i]));
-    }
-    // Effort 11 should only work when expert options are allowed
-    EXPECT_EQ(JXL_ENC_ERROR,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_EFFORT, 11));
-    JxlEncoderAllowExpertOptions(enc.get());
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_EFFORT, 11));
-
-    // Non-existing option
-    EXPECT_EQ(JXL_ENC_ERROR,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_FILL_ENUM, 0));
-    EXPECT_EQ(JXL_ENC_ERROR,
-              JxlEncoderFrameSettingsSetFloatOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_FILL_ENUM, 0.f));
-
-    // Float options
-    EXPECT_EQ(JXL_ENC_ERROR,
-              JxlEncoderFrameSettingsSetFloatOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_PHOTON_NOISE, -1.0f));
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetFloatOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_PHOTON_NOISE, 100.0f));
-    EXPECT_EQ(
-        JXL_ENC_ERROR,
-        JxlEncoderFrameSettingsSetFloatOption(
-            frame_settings,
-            JXL_ENC_FRAME_SETTING_MODULAR_MA_TREE_LEARNING_PERCENT, 101.0f));
-    EXPECT_EQ(
-        JXL_ENC_ERROR,
-        JxlEncoderFrameSettingsSetFloatOption(
-            frame_settings,
-            JXL_ENC_FRAME_SETTING_MODULAR_MA_TREE_LEARNING_PERCENT, -2.0f));
-    EXPECT_EQ(
-        JXL_ENC_SUCCESS,
-        JxlEncoderFrameSettingsSetFloatOption(
-            frame_settings,
-            JXL_ENC_FRAME_SETTING_MODULAR_MA_TREE_LEARNING_PERCENT, -1.0f));
-    EXPECT_EQ(JXL_ENC_ERROR,
-              JxlEncoderFrameSettingsSetFloatOption(
-                  frame_settings,
-                  JXL_ENC_FRAME_SETTING_CHANNEL_COLORS_GLOBAL_PERCENT, 101.0f));
-    EXPECT_EQ(JXL_ENC_ERROR,
-              JxlEncoderFrameSettingsSetFloatOption(
-                  frame_settings,
-                  JXL_ENC_FRAME_SETTING_CHANNEL_COLORS_GLOBAL_PERCENT, -2.0f));
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetFloatOption(
-                  frame_settings,
-                  JXL_ENC_FRAME_SETTING_CHANNEL_COLORS_GLOBAL_PERCENT, -1.0f));
-    EXPECT_EQ(JXL_ENC_ERROR,
-              JxlEncoderFrameSettingsSetFloatOption(
-                  frame_settings,
-                  JXL_ENC_FRAME_SETTING_CHANNEL_COLORS_GROUP_PERCENT, 101.0f));
-    EXPECT_EQ(JXL_ENC_ERROR,
-              JxlEncoderFrameSettingsSetFloatOption(
-                  frame_settings,
-                  JXL_ENC_FRAME_SETTING_CHANNEL_COLORS_GROUP_PERCENT, -2.0f));
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetFloatOption(
-                  frame_settings,
-                  JXL_ENC_FRAME_SETTING_CHANNEL_COLORS_GROUP_PERCENT, -1.0f));
-    EXPECT_EQ(JXL_ENC_ERROR,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings,
-                  JXL_ENC_FRAME_SETTING_CHANNEL_COLORS_GROUP_PERCENT, 50.0f));
-    EXPECT_EQ(JXL_ENC_ERROR,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_PHOTON_NOISE, 50.0f));
-
-    VerifyFrameEncoding(63, 129, enc.get(), frame_settings, 3700, false);
-  }
-
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    EXPECT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderSetFrameLossless(frame_settings, JXL_TRUE));
-    VerifyFrameEncoding(63, 129, enc.get(), frame_settings, 3600, false);
-    EXPECT_EQ(true, enc->last_used_cparams.IsLossless());
-  }
-
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    EXPECT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetFrameDistance(frame_settings, 0.5));
-    VerifyFrameEncoding(63, 129, enc.get(), frame_settings, 3200, false);
-    EXPECT_EQ(0.5, enc->last_used_cparams.butteraugli_distance);
-  }
-
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    // Disallowed negative distance
-    EXPECT_EQ(JXL_ENC_ERROR, JxlEncoderSetFrameDistance(frame_settings, -1));
-  }
-
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    EXPECT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_DECODING_SPEED, 2));
-    VerifyFrameEncoding(enc.get(), frame_settings);
-    EXPECT_EQ(2u, enc->last_used_cparams.decoding_speed_tier);
-  }
-
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    EXPECT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    EXPECT_EQ(JXL_ENC_ERROR,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_GROUP_ORDER, 100));
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_GROUP_ORDER, 1));
-    EXPECT_EQ(
-        JXL_ENC_SUCCESS,
-        JxlEncoderFrameSettingsSetOption(
-            frame_settings, JXL_ENC_FRAME_SETTING_GROUP_ORDER_CENTER_X, 5));
-    VerifyFrameEncoding(enc.get(), frame_settings);
-    EXPECT_EQ(true, enc->last_used_cparams.centerfirst);
-    EXPECT_EQ(5, enc->last_used_cparams.center_x);
-  }
-
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    EXPECT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_RESPONSIVE, 0));
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_PROGRESSIVE_AC, 1));
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_QPROGRESSIVE_AC, -1));
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_PROGRESSIVE_DC, 2));
-    VerifyFrameEncoding(63, 129, enc.get(), frame_settings, 3430,
-                        /*lossy_use_original_profile=*/false);
-    EXPECT_EQ(false, enc->last_used_cparams.responsive);
-    EXPECT_EQ(jxl::Override::kOn, enc->last_used_cparams.progressive_mode);
-    EXPECT_EQ(2, enc->last_used_cparams.progressive_dc);
-  }
-
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    EXPECT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    EXPECT_EQ(
-        JXL_ENC_SUCCESS,
-        JxlEncoderFrameSettingsSetFloatOption(
-            frame_settings, JXL_ENC_FRAME_SETTING_PHOTON_NOISE, 1777.777));
-    VerifyFrameEncoding(enc.get(), frame_settings);
-    EXPECT_NEAR(1777.777f, enc->last_used_cparams.photon_noise_iso, 1E-4);
-  }
-
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    EXPECT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetFloatOption(
-                  frame_settings,
-                  JXL_ENC_FRAME_SETTING_CHANNEL_COLORS_GLOBAL_PERCENT, 55.0f));
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetFloatOption(
-                  frame_settings,
-                  JXL_ENC_FRAME_SETTING_CHANNEL_COLORS_GROUP_PERCENT, 25.0f));
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_PALETTE_COLORS, 70000));
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_LOSSY_PALETTE, 1));
-    VerifyFrameEncoding(enc.get(), frame_settings);
-    EXPECT_NEAR(55.0f,
-                enc->last_used_cparams.channel_colors_pre_transform_percent,
-                1E-6);
-    EXPECT_NEAR(25.0f, enc->last_used_cparams.channel_colors_percent, 1E-6);
-    EXPECT_EQ(70000, enc->last_used_cparams.palette_colors);
-    EXPECT_EQ(true, enc->last_used_cparams.lossy_palette);
-  }
-
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    EXPECT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    EXPECT_EQ(
-        JXL_ENC_SUCCESS,
-        JxlEncoderFrameSettingsSetOption(
-            frame_settings, JXL_ENC_FRAME_SETTING_MODULAR_COLOR_SPACE, 30));
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_MODULAR_GROUP_SIZE, 2));
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_MODULAR_PREDICTOR, 14));
-    EXPECT_EQ(
-        JXL_ENC_SUCCESS,
-        JxlEncoderFrameSettingsSetFloatOption(
-            frame_settings,
-            JXL_ENC_FRAME_SETTING_MODULAR_MA_TREE_LEARNING_PERCENT, 77.0f));
-    EXPECT_EQ(
-        JXL_ENC_SUCCESS,
-        JxlEncoderFrameSettingsSetOption(
-            frame_settings, JXL_ENC_FRAME_SETTING_MODULAR_NB_PREV_CHANNELS, 7));
-    VerifyFrameEncoding(enc.get(), frame_settings);
-    EXPECT_EQ(30, enc->last_used_cparams.colorspace);
-    EXPECT_EQ(2, enc->last_used_cparams.modular_group_size_shift);
-    EXPECT_EQ(jxl::Predictor::Best, enc->last_used_cparams.options.predictor);
-    EXPECT_NEAR(0.77f, enc->last_used_cparams.options.nb_repeats, 1E-6);
-    EXPECT_EQ(7, enc->last_used_cparams.options.max_properties);
-  }
-
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    EXPECT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_JPEG_RECON_CFL, 0));
-    VerifyFrameEncoding(enc.get(), frame_settings);
-    EXPECT_EQ(false, enc->last_used_cparams.force_cfl_jpeg_recompression);
-  }
-
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    EXPECT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_JPEG_RECON_CFL, 1));
-    VerifyFrameEncoding(enc.get(), frame_settings);
-    EXPECT_EQ(true, enc->last_used_cparams.force_cfl_jpeg_recompression);
-  }
-}
-
-TEST(EncodeTest, LossyEncoderUseOriginalProfileTest) {
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    ASSERT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    VerifyFrameEncoding(63, 129, enc.get(), frame_settings, 7897, true);
-  }
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    ASSERT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_PROGRESSIVE_DC, 2));
-    VerifyFrameEncoding(63, 129, enc.get(), frame_settings, 8310, true);
-  }
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    ASSERT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    ASSERT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_EFFORT, 8));
-    VerifyFrameEncoding(63, 129, enc.get(), frame_settings, 7228, true);
-  }
-}
-
-namespace {
-// Returns a copy of buf from offset to offset+size, or a new zeroed vector if
-// the result would have been out of bounds taking integer overflow into
-// account.
-std::vector<uint8_t> SliceSpan(const jxl::Span<const uint8_t>& buf,
-                               size_t offset, size_t size) {
-  if (offset + size >= buf.size()) {
-    return std::vector<uint8_t>(size, 0);
-  }
-  if (offset + size < offset) {
-    return std::vector<uint8_t>(size, 0);
-  }
-  return std::vector<uint8_t>(buf.data() + offset, buf.data() + offset + size);
-}
-
-struct Box {
-  // The type of the box.
-  // If "uuid", use extended_type instead
-  char type[4] = {0, 0, 0, 0};
-
-  // The extended_type is only used when type == "uuid".
-  // Extended types are not used in JXL. However, the box format itself
-  // supports this so they are handled correctly.
-  char extended_type[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-
-  // Box data.
-  jxl::Span<const uint8_t> data = jxl::Bytes(nullptr, 0);
-
-  // If the size is not given, the datasize extends to the end of the file.
-  // If this field is false, the size field is not encoded when the box is
-  // serialized.
-  bool data_size_given = true;
-
-  // If successful, returns true and sets `in` to be the rest data (if any).
-  // If `in` contains a box with a size larger than `in.size()`, will not
-  // modify `in`, and will return true but the data `Span<uint8_t>` will
-  // remain set to nullptr.
-  // If unsuccessful, returns error and doesn't modify `in`.
-  jxl::Status Decode(jxl::Span<const uint8_t>* in) {
-    // Total box_size including this header itself.
-    uint64_t box_size = LoadBE32(SliceSpan(*in, 0, 4).data());
-    size_t pos = 4;
-
-    memcpy(type, SliceSpan(*in, pos, 4).data(), 4);
-    pos += 4;
-
-    if (box_size == 1) {
-      // If the size is 1, it indicates extended size read from 64-bit integer.
-      box_size = LoadBE64(SliceSpan(*in, pos, 8).data());
-      pos += 8;
-    }
-
-    if (!memcmp("uuid", type, 4)) {
-      memcpy(extended_type, SliceSpan(*in, pos, 16).data(), 16);
-      pos += 16;
-    }
-
-    // This is the end of the box header, the box data begins here. Handle
-    // the data size now.
-    const size_t header_size = pos;
-
-    if (box_size != 0) {
-      if (box_size < header_size) {
-        return JXL_FAILURE("Invalid box size");
-      }
-      if (box_size > in->size()) {
-        // The box is fine, but the input is too short.
-        return true;
-      }
-      data_size_given = true;
-      data = jxl::Bytes(in->data() + header_size, box_size - header_size);
-    } else {
-      data_size_given = false;
-      data = jxl::Bytes(in->data() + header_size, in->size() - header_size);
-    }
-
-    *in = jxl::Bytes(in->data() + header_size + data.size(),
-                     in->size() - header_size - data.size());
-    return true;
-  }
-};
-
-struct Container {
-  std::vector<Box> boxes;
-
-  // If successful, returns true and sets `in` to be the rest data (if any).
-  // If unsuccessful, returns error and doesn't modify `in`.
-  jxl::Status Decode(jxl::Span<const uint8_t>* in) {
-    boxes.clear();
-
-    Box signature_box;
-    JXL_RETURN_IF_ERROR(signature_box.Decode(in));
-    if (memcmp("JXL ", signature_box.type, 4) != 0) {
-      return JXL_FAILURE("Invalid magic signature");
-    }
-    if (signature_box.data.size() != 4)
-      return JXL_FAILURE("Invalid magic signature");
-    if (signature_box.data[0] != 0xd || signature_box.data[1] != 0xa ||
-        signature_box.data[2] != 0x87 || signature_box.data[3] != 0xa) {
-      return JXL_FAILURE("Invalid magic signature");
-    }
-
-    Box ftyp_box;
-    JXL_RETURN_IF_ERROR(ftyp_box.Decode(in));
-    if (memcmp("ftyp", ftyp_box.type, 4) != 0) {
-      return JXL_FAILURE("Invalid ftyp");
-    }
-    if (ftyp_box.data.size() != 12) return JXL_FAILURE("Invalid ftyp");
-    const char* expected = "jxl \0\0\0\0jxl ";
-    if (memcmp(expected, ftyp_box.data.data(), 12) != 0)
-      return JXL_FAILURE("Invalid ftyp");
-
-    while (!in->empty()) {
-      Box box = {};
-      JXL_RETURN_IF_ERROR(box.Decode(in));
-      if (box.data.data() == nullptr) {
-        // The decoding encountered a box, but not enough data yet.
-        return true;
-      }
-      boxes.emplace_back(box);
-    }
-
-    return true;
-  }
-};
-
-}  // namespace
-
-TEST(EncodeTest, SingleFrameBoundedJXLCTest) {
-  JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-  EXPECT_NE(nullptr, enc.get());
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderUseContainer(enc.get(), true));
-  JxlEncoderFrameSettings* frame_settings =
-      JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-
-  size_t xsize = 71;
-  size_t ysize = 23;
-  JxlPixelFormat pixel_format = {4, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 4, 0);
-
-  JxlBasicInfo basic_info;
-  jxl::test::JxlBasicInfoSetFromPixelFormat(&basic_info, &pixel_format);
-  basic_info.xsize = xsize;
-  basic_info.ysize = ysize;
-  basic_info.uses_original_profile = JXL_FALSE;
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetCodestreamLevel(enc.get(), 10));
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetBasicInfo(enc.get(), &basic_info));
-  JxlColorEncoding color_encoding;
-  JxlColorEncodingSetToSRGB(&color_encoding,
-                            /*is_gray=*/JXL_FALSE);
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderSetColorEncoding(enc.get(), &color_encoding));
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderAddImageFrame(frame_settings, &pixel_format,
-                                    pixels.data(), pixels.size()));
-  JxlEncoderCloseInput(enc.get());
-
-  std::vector<uint8_t> compressed = std::vector<uint8_t>(64);
-  uint8_t* next_out = compressed.data();
-  size_t avail_out = compressed.size() - (next_out - compressed.data());
-  JxlEncoderStatus process_result = JXL_ENC_NEED_MORE_OUTPUT;
-  while (process_result == JXL_ENC_NEED_MORE_OUTPUT) {
-    process_result = JxlEncoderProcessOutput(enc.get(), &next_out, &avail_out);
-    if (process_result == JXL_ENC_NEED_MORE_OUTPUT) {
-      size_t offset = next_out - compressed.data();
-      compressed.resize(compressed.size() * 2);
-      next_out = compressed.data() + offset;
-      avail_out = compressed.size() - offset;
-    }
-  }
-  compressed.resize(next_out - compressed.data());
-  EXPECT_EQ(JXL_ENC_SUCCESS, process_result);
-
-  Container container = {};
-  jxl::Span<const uint8_t> encoded_span =
-      jxl::Bytes(compressed.data(), compressed.size());
-  EXPECT_TRUE(container.Decode(&encoded_span));
-  EXPECT_EQ(0u, encoded_span.size());
-  bool found_jxlc = false;
-  bool found_jxlp = false;
-  // The encoder is allowed to either emit a jxlc or one or more jxlp.
-  for (const auto& box : container.boxes) {
-    if (memcmp("jxlc", box.type, 4) == 0) {
-      EXPECT_EQ(false, found_jxlc);  // Max 1 jxlc
-      EXPECT_EQ(false, found_jxlp);  // Can't mix jxlc and jxlp
-      found_jxlc = true;
-    }
-    if (memcmp("jxlp", box.type, 4) == 0) {
-      EXPECT_EQ(false, found_jxlc);  // Can't mix jxlc and jxlp
-      found_jxlp = true;
-    }
-    // The encoder shouldn't create an unbounded box in this case, with the
-    // single frame it knows the full size in time, so can help make decoding
-    // more efficient by giving the full box size of the final box.
-    EXPECT_EQ(true, box.data_size_given);
-  }
-  EXPECT_EQ(true, found_jxlc || found_jxlp);
-}
-
-TEST(EncodeTest, CodestreamLevelTest) {
-  size_t xsize = 64;
-  size_t ysize = 64;
-  JxlPixelFormat pixel_format = {4, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 4, 0);
-
-  jxl::CodecInOut input_io =
-      jxl::test::SomeTestImageToCodecInOut(pixels, 4, xsize, ysize);
-
-  JxlBasicInfo basic_info;
-  jxl::test::JxlBasicInfoSetFromPixelFormat(&basic_info, &pixel_format);
-  basic_info.xsize = xsize;
-  basic_info.ysize = ysize;
-  basic_info.uses_original_profile = 0;
-
-  JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetCodestreamLevel(enc.get(), 10));
-  JxlEncoderFrameSettings* frame_settings =
-      JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetBasicInfo(enc.get(), &basic_info));
-  JxlColorEncoding color_encoding;
-  JXL_BOOL is_gray = TO_JXL_BOOL(pixel_format.num_channels < 3);
-  JxlColorEncodingSetToSRGB(&color_encoding, is_gray);
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderSetColorEncoding(enc.get(), &color_encoding));
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderAddImageFrame(frame_settings, &pixel_format,
-                                    pixels.data(), pixels.size()));
-  JxlEncoderCloseInput(enc.get());
-
-  std::vector<uint8_t> compressed = std::vector<uint8_t>(64);
-  uint8_t* next_out = compressed.data();
-  size_t avail_out = compressed.size() - (next_out - compressed.data());
-  JxlEncoderStatus process_result = JXL_ENC_NEED_MORE_OUTPUT;
-  while (process_result == JXL_ENC_NEED_MORE_OUTPUT) {
-    process_result = JxlEncoderProcessOutput(enc.get(), &next_out, &avail_out);
-    if (process_result == JXL_ENC_NEED_MORE_OUTPUT) {
-      size_t offset = next_out - compressed.data();
-      compressed.resize(compressed.size() * 2);
-      next_out = compressed.data() + offset;
-      avail_out = compressed.size() - offset;
-    }
-  }
-  compressed.resize(next_out - compressed.data());
-  EXPECT_EQ(JXL_ENC_SUCCESS, process_result);
-
-  Container container = {};
-  jxl::Span<const uint8_t> encoded_span =
-      jxl::Bytes(compressed.data(), compressed.size());
-  EXPECT_TRUE(container.Decode(&encoded_span));
-  EXPECT_EQ(0u, encoded_span.size());
-  EXPECT_EQ(0, memcmp("jxll", container.boxes[0].type, 4));
-}
-
-TEST(EncodeTest, CodestreamLevelVerificationTest) {
-  JxlPixelFormat pixel_format = {4, JXL_TYPE_UINT8, JXL_BIG_ENDIAN, 0};
-
-  JxlBasicInfo basic_info;
-  jxl::test::JxlBasicInfoSetFromPixelFormat(&basic_info, &pixel_format);
-  basic_info.xsize = 64;
-  basic_info.ysize = 64;
-  basic_info.uses_original_profile = JXL_FALSE;
-
-  JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetBasicInfo(enc.get(), &basic_info));
-
-  EXPECT_EQ(5, JxlEncoderGetRequiredCodestreamLevel(enc.get()));
-
-  // Set an image dimension that is too large for level 5, but fits in level 10
-
-  basic_info.xsize = 1ull << 30ull;
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetCodestreamLevel(enc.get(), 5));
-  EXPECT_EQ(JXL_ENC_ERROR, JxlEncoderSetBasicInfo(enc.get(), &basic_info));
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetCodestreamLevel(enc.get(), 10));
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetBasicInfo(enc.get(), &basic_info));
-  EXPECT_EQ(10, JxlEncoderGetRequiredCodestreamLevel(enc.get()));
-
-  // Set an image dimension that is too large even for level 10
-
-  basic_info.xsize = 1ull << 31ull;
-  EXPECT_EQ(JXL_ENC_ERROR, JxlEncoderSetBasicInfo(enc.get(), &basic_info));
-}
-
-JXL_TRANSCODE_JPEG_TEST(EncodeTest, JPEGReconstructionTest) {
-  const std::string jpeg_path = "jxl/flower/flower.png.im_q85_420.jpg";
-  const std::vector<uint8_t> orig = jxl::test::ReadTestData(jpeg_path);
-
-  JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-  JxlEncoderFrameSettings* frame_settings =
-      JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderStoreJPEGMetadata(enc.get(), JXL_TRUE));
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderAddJPEGFrame(frame_settings, orig.data(), orig.size()));
-  JxlEncoderCloseInput(enc.get());
-
-  std::vector<uint8_t> compressed = std::vector<uint8_t>(64);
-  uint8_t* next_out = compressed.data();
-  size_t avail_out = compressed.size() - (next_out - compressed.data());
-  JxlEncoderStatus process_result = JXL_ENC_NEED_MORE_OUTPUT;
-  while (process_result == JXL_ENC_NEED_MORE_OUTPUT) {
-    process_result = JxlEncoderProcessOutput(enc.get(), &next_out, &avail_out);
-    if (process_result == JXL_ENC_NEED_MORE_OUTPUT) {
-      size_t offset = next_out - compressed.data();
-      compressed.resize(compressed.size() * 2);
-      next_out = compressed.data() + offset;
-      avail_out = compressed.size() - offset;
-    }
-  }
-  compressed.resize(next_out - compressed.data());
-  EXPECT_EQ(JXL_ENC_SUCCESS, process_result);
-
-  jxl::extras::JXLDecompressParams dparams;
-  jxl::test::DefaultAcceptedFormats(dparams);
-  std::vector<uint8_t> decoded_jpeg_bytes;
-  jxl::extras::PackedPixelFile ppf;
-  EXPECT_TRUE(DecodeImageJXL(compressed.data(), compressed.size(), dparams,
-                             nullptr, &ppf, &decoded_jpeg_bytes));
-
-  EXPECT_EQ(decoded_jpeg_bytes.size(), orig.size());
-  EXPECT_EQ(0, memcmp(decoded_jpeg_bytes.data(), orig.data(), orig.size()));
-}
-
-JXL_TRANSCODE_JPEG_TEST(EncodeTest, ProgressiveJPEGReconstructionTest) {
-  const std::string jpeg_path = "jxl/flower/flower.png.im_q85_420.jpg";
-  const std::vector<uint8_t> orig = jxl::test::ReadTestData(jpeg_path);
-
-  JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-  JxlEncoderFrameSettings* frame_settings =
-      JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-
-  frame_settings->values.cparams.progressive_mode = jxl::Override::kOn;
-
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderStoreJPEGMetadata(enc.get(), JXL_TRUE));
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderAddJPEGFrame(frame_settings, orig.data(), orig.size()));
-  JxlEncoderCloseInput(enc.get());
-
-  std::vector<uint8_t> compressed = std::vector<uint8_t>(64);
-  uint8_t* next_out = compressed.data();
-  size_t avail_out = compressed.size() - (next_out - compressed.data());
-  JxlEncoderStatus process_result = JXL_ENC_NEED_MORE_OUTPUT;
-  while (process_result == JXL_ENC_NEED_MORE_OUTPUT) {
-    process_result = JxlEncoderProcessOutput(enc.get(), &next_out, &avail_out);
-    if (process_result == JXL_ENC_NEED_MORE_OUTPUT) {
-      size_t offset = next_out - compressed.data();
-      compressed.resize(compressed.size() * 2);
-      next_out = compressed.data() + offset;
-      avail_out = compressed.size() - offset;
-    }
-  }
-  compressed.resize(next_out - compressed.data());
-  EXPECT_EQ(JXL_ENC_SUCCESS, process_result);
-
-  jxl::extras::JXLDecompressParams dparams;
-  jxl::test::DefaultAcceptedFormats(dparams);
-  std::vector<uint8_t> decoded_jpeg_bytes;
-  jxl::extras::PackedPixelFile ppf;
-  EXPECT_TRUE(DecodeImageJXL(compressed.data(), compressed.size(), dparams,
-                             nullptr, &ppf, &decoded_jpeg_bytes));
-
-  EXPECT_EQ(decoded_jpeg_bytes.size(), orig.size());
-  EXPECT_EQ(0, memcmp(decoded_jpeg_bytes.data(), orig.data(), orig.size()));
-}
-
-static void ProcessEncoder(JxlEncoder* enc, std::vector<uint8_t>& compressed,
-                           uint8_t*& next_out, size_t& avail_out) {
-  JxlEncoderStatus process_result = JXL_ENC_NEED_MORE_OUTPUT;
-  while (process_result == JXL_ENC_NEED_MORE_OUTPUT) {
-    process_result = JxlEncoderProcessOutput(enc, &next_out, &avail_out);
-    if (process_result == JXL_ENC_NEED_MORE_OUTPUT) {
-      size_t offset = next_out - compressed.data();
-      compressed.resize(compressed.size() * 2);
-      next_out = compressed.data() + offset;
-      avail_out = compressed.size() - offset;
-    }
-  }
-  size_t offset = next_out - compressed.data();
-  compressed.resize(next_out - compressed.data());
-  next_out = compressed.data() + offset;
-  avail_out = compressed.size() - offset;
-  EXPECT_EQ(JXL_ENC_SUCCESS, process_result);
-}
-
-TEST(EncodeTest, BasicInfoTest) {
-  JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-  EXPECT_NE(nullptr, enc.get());
-
-  JxlEncoderFrameSettings* frame_settings =
-      JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-  size_t xsize = 1;
-  size_t ysize = 1;
-  JxlPixelFormat pixel_format = {4, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 4, 0);
-  JxlBasicInfo basic_info;
-  jxl::test::JxlBasicInfoSetFromPixelFormat(&basic_info, &pixel_format);
-  basic_info.xsize = xsize;
-  basic_info.ysize = ysize;
-  basic_info.uses_original_profile = 0;
-  basic_info.have_animation = 1;
-  basic_info.intensity_target = 123.4;
-  basic_info.min_nits = 5.0;
-  basic_info.linear_below = 12.7;
-  basic_info.orientation = JXL_ORIENT_ROTATE_90_CW;
-  basic_info.intrinsic_xsize = 88;
-  basic_info.intrinsic_ysize = 99;
-  basic_info.animation.tps_numerator = 55;
-  basic_info.animation.tps_denominator = 77;
-  basic_info.animation.num_loops = 10;
-  basic_info.animation.have_timecodes = JXL_TRUE;
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetCodestreamLevel(enc.get(), 10));
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetBasicInfo(enc.get(), &basic_info));
-  JxlColorEncoding color_encoding;
-  JxlColorEncodingSetToSRGB(&color_encoding, /*is_gray=*/JXL_FALSE);
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderSetColorEncoding(enc.get(), &color_encoding));
-
-  std::vector<uint8_t> compressed = std::vector<uint8_t>(64);
-  uint8_t* next_out = compressed.data();
-  size_t avail_out = compressed.size() - (next_out - compressed.data());
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderAddImageFrame(frame_settings, &pixel_format,
-                                    pixels.data(), pixels.size()));
-  JxlEncoderCloseFrames(enc.get());
-  ProcessEncoder(enc.get(), compressed, next_out, avail_out);
-
-  // Decode to verify the boxes, we don't decode to pixels, only the boxes.
-  JxlDecoderPtr dec = JxlDecoderMake(nullptr);
-  EXPECT_NE(nullptr, dec.get());
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(dec.get(), JXL_DEC_BASIC_INFO));
-  // Allow testing the orientation field, without this setting it will be
-  // overridden to identity.
-  JxlDecoderSetKeepOrientation(dec.get(), JXL_TRUE);
-  JxlDecoderSetInput(dec.get(), compressed.data(), compressed.size());
-  JxlDecoderCloseInput(dec.get());
-
-  for (;;) {
-    JxlDecoderStatus status = JxlDecoderProcessInput(dec.get());
-    if (status == JXL_DEC_ERROR) {
-      FAIL();
-    } else if (status == JXL_DEC_SUCCESS) {
-      break;
-    } else if (status == JXL_DEC_BASIC_INFO) {
-      JxlBasicInfo basic_info2;
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderGetBasicInfo(dec.get(), &basic_info2));
-      EXPECT_EQ(basic_info.xsize, basic_info2.xsize);
-      EXPECT_EQ(basic_info.ysize, basic_info2.ysize);
-      EXPECT_EQ(basic_info.bits_per_sample, basic_info2.bits_per_sample);
-      EXPECT_EQ(basic_info.exponent_bits_per_sample,
-                basic_info2.exponent_bits_per_sample);
-      EXPECT_NEAR(basic_info.intensity_target, basic_info2.intensity_target,
-                  0.5);
-      EXPECT_NEAR(basic_info.min_nits, basic_info2.min_nits, 0.5);
-      EXPECT_NEAR(basic_info.linear_below, basic_info2.linear_below, 0.5);
-      EXPECT_EQ(basic_info.relative_to_max_display,
-                basic_info2.relative_to_max_display);
-      EXPECT_EQ(basic_info.uses_original_profile,
-                basic_info2.uses_original_profile);
-      EXPECT_EQ(basic_info.orientation, basic_info2.orientation);
-      EXPECT_EQ(basic_info.intrinsic_xsize, basic_info2.intrinsic_xsize);
-      EXPECT_EQ(basic_info.intrinsic_ysize, basic_info2.intrinsic_ysize);
-      EXPECT_EQ(basic_info.num_color_channels, basic_info2.num_color_channels);
-      // TODO(lode): also test num_extra_channels, but currently there may be a
-      // mismatch between 0 and 1 if there is alpha, until encoder support for
-      // extra channels is fully implemented.
-      EXPECT_EQ(basic_info.alpha_bits, basic_info2.alpha_bits);
-      EXPECT_EQ(basic_info.alpha_exponent_bits,
-                basic_info2.alpha_exponent_bits);
-      EXPECT_EQ(basic_info.alpha_premultiplied,
-                basic_info2.alpha_premultiplied);
-
-      EXPECT_EQ(basic_info.have_preview, basic_info2.have_preview);
-      if (basic_info.have_preview) {
-        EXPECT_EQ(basic_info.preview.xsize, basic_info2.preview.xsize);
-        EXPECT_EQ(basic_info.preview.ysize, basic_info2.preview.ysize);
-      }
-
-      EXPECT_EQ(basic_info.have_animation, basic_info2.have_animation);
-      if (basic_info.have_animation) {
-        EXPECT_EQ(basic_info.animation.tps_numerator,
-                  basic_info2.animation.tps_numerator);
-        EXPECT_EQ(basic_info.animation.tps_denominator,
-                  basic_info2.animation.tps_denominator);
-        EXPECT_EQ(basic_info.animation.num_loops,
-                  basic_info2.animation.num_loops);
-        EXPECT_EQ(basic_info.animation.have_timecodes,
-                  basic_info2.animation.have_timecodes);
-      }
-    } else {
-      FAIL();  // unexpected status
-    }
-  }
-}
-
-TEST(EncodeTest, AnimationHeaderTest) {
-  JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-  EXPECT_NE(nullptr, enc.get());
-
-  JxlEncoderFrameSettings* frame_settings =
-      JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-  size_t xsize = 1;
-  size_t ysize = 1;
-  JxlPixelFormat pixel_format = {4, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 4, 0);
-  JxlBasicInfo basic_info;
-  jxl::test::JxlBasicInfoSetFromPixelFormat(&basic_info, &pixel_format);
-  basic_info.xsize = xsize;
-  basic_info.ysize = ysize;
-  basic_info.have_animation = JXL_TRUE;
-  basic_info.animation.tps_numerator = 1000;
-  basic_info.animation.tps_denominator = 1;
-  basic_info.animation.have_timecodes = JXL_TRUE;
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetCodestreamLevel(enc.get(), 10));
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetBasicInfo(enc.get(), &basic_info));
-  JxlColorEncoding color_encoding;
-  JxlColorEncodingSetToSRGB(&color_encoding, /*is_gray=*/JXL_FALSE);
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderSetColorEncoding(enc.get(), &color_encoding));
-
-  std::string frame_name = "test frame";
-  JxlFrameHeader header;
-  JxlEncoderInitFrameHeader(&header);
-  header.duration = 50;
-  header.timecode = 800;
-  header.layer_info.blend_info.blendmode = JXL_BLEND_BLEND;
-  header.layer_info.blend_info.source = 2;
-  header.layer_info.blend_info.clamp = 1;
-  JxlBlendInfo extra_channel_blend_info;
-  JxlEncoderInitBlendInfo(&extra_channel_blend_info);
-  extra_channel_blend_info.blendmode = JXL_BLEND_MULADD;
-  JxlEncoderSetFrameHeader(frame_settings, &header);
-  JxlEncoderSetExtraChannelBlendInfo(frame_settings, 0,
-                                     &extra_channel_blend_info);
-  JxlEncoderSetFrameName(frame_settings, frame_name.c_str());
-
-  std::vector<uint8_t> compressed = std::vector<uint8_t>(64);
-  uint8_t* next_out = compressed.data();
-  size_t avail_out = compressed.size() - (next_out - compressed.data());
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderAddImageFrame(frame_settings, &pixel_format,
-                                    pixels.data(), pixels.size()));
-  JxlEncoderCloseFrames(enc.get());
-  ProcessEncoder(enc.get(), compressed, next_out, avail_out);
-
-  // Decode to verify the boxes, we don't decode to pixels, only the boxes.
-  JxlDecoderPtr dec = JxlDecoderMake(nullptr);
-  EXPECT_NE(nullptr, dec.get());
-
-  // To test the blend_info fields, coalescing must be set to false in the
-  // decoder.
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetCoalescing(dec.get(), JXL_FALSE));
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(dec.get(), JXL_DEC_FRAME));
-  JxlDecoderSetInput(dec.get(), compressed.data(), compressed.size());
-  JxlDecoderCloseInput(dec.get());
-
-  bool seen_frame = false;
-
-  for (;;) {
-    JxlDecoderStatus status = JxlDecoderProcessInput(dec.get());
-    if (status == JXL_DEC_ERROR) {
-      FAIL();
-    } else if (status == JXL_DEC_SUCCESS) {
-      break;
-    } else if (status == JXL_DEC_FRAME) {
-      seen_frame = true;
-      JxlFrameHeader header2;
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetFrameHeader(dec.get(), &header2));
-      EXPECT_EQ(header.duration, header2.duration);
-      EXPECT_EQ(header.timecode, header2.timecode);
-      EXPECT_EQ(header.layer_info.blend_info.blendmode,
-                header2.layer_info.blend_info.blendmode);
-      EXPECT_EQ(header.layer_info.blend_info.clamp,
-                header2.layer_info.blend_info.clamp);
-      EXPECT_EQ(header.layer_info.blend_info.source,
-                header2.layer_info.blend_info.source);
-      EXPECT_EQ(frame_name.size(), header2.name_length);
-      JxlBlendInfo extra_channel_blend_info2;
-      JxlDecoderGetExtraChannelBlendInfo(dec.get(), 0,
-                                         &extra_channel_blend_info2);
-      EXPECT_EQ(extra_channel_blend_info.blendmode,
-                extra_channel_blend_info2.blendmode);
-      if (header2.name_length > 0) {
-        std::string frame_name2(header2.name_length + 1, '\0');
-        EXPECT_EQ(JXL_DEC_SUCCESS,
-                  JxlDecoderGetFrameName(dec.get(), &frame_name2.front(),
-                                         frame_name2.size()));
-        frame_name2.resize(header2.name_length);
-        EXPECT_EQ(frame_name, frame_name2);
-      }
-    } else {
-      FAIL();  // unexpected status
-    }
-  }
-
-  EXPECT_EQ(true, seen_frame);
-}
-TEST(EncodeTest, CroppedFrameTest) {
-  JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-  EXPECT_NE(nullptr, enc.get());
-
-  JxlEncoderFrameSettings* frame_settings =
-      JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-  size_t xsize = 300;
-  size_t ysize = 300;
-  JxlPixelFormat pixel_format = {4, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 4, 0);
-  std::vector<uint8_t> pixels2(pixels.size());
-  JxlBasicInfo basic_info;
-  jxl::test::JxlBasicInfoSetFromPixelFormat(&basic_info, &pixel_format);
-  // Encoding a 300x300 frame in an image that is only 100x100
-  basic_info.xsize = 100;
-  basic_info.ysize = 100;
-  basic_info.uses_original_profile = JXL_TRUE;
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetCodestreamLevel(enc.get(), 10));
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetBasicInfo(enc.get(), &basic_info));
-  JxlColorEncoding color_encoding;
-  JxlColorEncodingSetToSRGB(&color_encoding, /*is_gray=*/JXL_FALSE);
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderSetColorEncoding(enc.get(), &color_encoding));
-
-  JxlFrameHeader header;
-  JxlEncoderInitFrameHeader(&header);
-  header.layer_info.have_crop = JXL_TRUE;
-  header.layer_info.xsize = xsize;
-  header.layer_info.ysize = ysize;
-  header.layer_info.crop_x0 = -50;
-  header.layer_info.crop_y0 = -250;
-  JxlEncoderSetFrameLossless(frame_settings, JXL_TRUE);
-  JxlEncoderSetFrameHeader(frame_settings, &header);
-  JxlEncoderFrameSettingsSetOption(frame_settings, JXL_ENC_FRAME_SETTING_EFFORT,
-                                   1);
-
-  std::vector<uint8_t> compressed = std::vector<uint8_t>(100);
-  uint8_t* next_out = compressed.data();
-  size_t avail_out = compressed.size() - (next_out - compressed.data());
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderAddImageFrame(frame_settings, &pixel_format,
-                                    pixels.data(), pixels.size()));
-  JxlEncoderCloseFrames(enc.get());
-  ProcessEncoder(enc.get(), compressed, next_out, avail_out);
-
-  JxlDecoderPtr dec = JxlDecoderMake(nullptr);
-  EXPECT_NE(nullptr, dec.get());
-  // Non-coalesced decoding so we can get the full uncropped frame
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetCoalescing(dec.get(), JXL_FALSE));
-  EXPECT_EQ(
-      JXL_DEC_SUCCESS,
-      JxlDecoderSubscribeEvents(dec.get(), JXL_DEC_FRAME | JXL_DEC_FULL_IMAGE));
-  JxlDecoderSetInput(dec.get(), compressed.data(), compressed.size());
-  JxlDecoderCloseInput(dec.get());
-
-  bool seen_frame = false;
-  bool checked_frame = false;
-  for (;;) {
-    JxlDecoderStatus status = JxlDecoderProcessInput(dec.get());
-    if (status == JXL_DEC_ERROR) {
-      FAIL();
-    } else if (status == JXL_DEC_SUCCESS) {
-      break;
-    } else if (status == JXL_DEC_FRAME) {
-      seen_frame = true;
-      JxlFrameHeader header2;
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetFrameHeader(dec.get(), &header2));
-      EXPECT_EQ(header.layer_info.xsize, header2.layer_info.xsize);
-      EXPECT_EQ(header.layer_info.ysize, header2.layer_info.ysize);
-      EXPECT_EQ(header.layer_info.crop_x0, header2.layer_info.crop_x0);
-      EXPECT_EQ(header.layer_info.crop_y0, header2.layer_info.crop_y0);
-    } else if (status == JXL_DEC_NEED_IMAGE_OUT_BUFFER) {
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderSetImageOutBuffer(dec.get(), &pixel_format,
-                                            pixels2.data(), pixels2.size()));
-    } else if (status == JXL_DEC_FULL_IMAGE) {
-      EXPECT_EQ(0, memcmp(pixels.data(), pixels2.data(), pixels.size()));
-      checked_frame = true;
-    } else {
-      FAIL();  // unexpected status
-    }
-  }
-  EXPECT_EQ(true, checked_frame);
-  EXPECT_EQ(true, seen_frame);
-}
-
-struct EncodeBoxTest : public testing::TestWithParam<std::tuple<bool, size_t>> {
-};
-
-JXL_BOXES_TEST_P(EncodeBoxTest, BoxTest) {
-  // Test with uncompressed boxes and with brob boxes
-  bool compress_box = std::get<0>(GetParam());
-  size_t xml_box_size = std::get<1>(GetParam());
-  // TODO(firsching): use xml_box_size
-  (void)xml_box_size;
-  // Tests adding two metadata boxes with the encoder: an exif box before the
-  // image frame, and an xml box after the image frame. Then verifies the
-  // decoder can decode them, they are in the expected place, and have the
-  // correct content after decoding.
-  JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-  EXPECT_NE(nullptr, enc.get());
-
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderUseBoxes(enc.get()));
-
-  JxlEncoderFrameSettings* frame_settings =
-      JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-  size_t xsize = 50;
-  size_t ysize = 17;
-  JxlPixelFormat pixel_format = {4, JXL_TYPE_UINT16, JXL_BIG_ENDIAN, 0};
-  std::vector<uint8_t> pixels = jxl::test::GetSomeTestImage(xsize, ysize, 4, 0);
-  JxlBasicInfo basic_info;
-  jxl::test::JxlBasicInfoSetFromPixelFormat(&basic_info, &pixel_format);
-  basic_info.xsize = xsize;
-  basic_info.ysize = ysize;
-  basic_info.uses_original_profile = JXL_FALSE;
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetCodestreamLevel(enc.get(), 10));
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetBasicInfo(enc.get(), &basic_info));
-  JxlColorEncoding color_encoding;
-  JxlColorEncodingSetToSRGB(&color_encoding,
-                            /*is_gray=*/JXL_FALSE);
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderSetColorEncoding(enc.get(), &color_encoding));
-
-  std::vector<uint8_t> compressed = std::vector<uint8_t>(64);
-  uint8_t* next_out = compressed.data();
-  size_t avail_out = compressed.size() - (next_out - compressed.data());
-
-  // Add an early metadata box. Also add a valid 4-byte TIFF offset header
-  // before the fake exif data of these box contents.
-  constexpr const char* exif_test_string = "\0\0\0\0exif test data";
-  const uint8_t* exif_data = reinterpret_cast<const uint8_t*>(exif_test_string);
-  // Skip the 4 zeroes for strlen
-  const size_t exif_size = 4 + strlen(exif_test_string + 4);
-  JxlEncoderAddBox(enc.get(), "Exif", exif_data, exif_size,
-                   TO_JXL_BOOL(compress_box));
-
-  // Write to output
-  ProcessEncoder(enc.get(), compressed, next_out, avail_out);
-
-  // Add image frame
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderAddImageFrame(frame_settings, &pixel_format,
-                                    pixels.data(), pixels.size()));
-  // Indicate this is the last frame
-  JxlEncoderCloseFrames(enc.get());
-
-  // Write to output
-  ProcessEncoder(enc.get(), compressed, next_out, avail_out);
-
-  // Add a late metadata box
-  constexpr const char* xml_test_string = "<some random xml data>";
-  const uint8_t* xml_data = reinterpret_cast<const uint8_t*>(xml_test_string);
-  size_t xml_size = strlen(xml_test_string);
-  JxlEncoderAddBox(enc.get(), "XML ", xml_data, xml_size,
-                   TO_JXL_BOOL(compress_box));
-
-  // Indicate this is the last box
-  JxlEncoderCloseBoxes(enc.get());
-
-  // Write to output
-  ProcessEncoder(enc.get(), compressed, next_out, avail_out);
-
-  // Decode to verify the boxes, we don't decode to pixels, only the boxes.
-  JxlDecoderPtr dec = JxlDecoderMake(nullptr);
-  EXPECT_NE(nullptr, dec.get());
-
-  if (compress_box) {
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderSetDecompressBoxes(dec.get(), JXL_TRUE));
-  }
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(dec.get(), JXL_DEC_FRAME | JXL_DEC_BOX));
-
-  JxlDecoderSetInput(dec.get(), compressed.data(), compressed.size());
-  JxlDecoderCloseInput(dec.get());
-
-  std::vector<uint8_t> dec_exif_box(exif_size);
-  std::vector<uint8_t> dec_xml_box(xml_size);
-
-  for (bool post_frame = false;;) {
-    JxlDecoderStatus status = JxlDecoderProcessInput(dec.get());
-    if (status == JXL_DEC_ERROR) {
-      FAIL();
-    } else if (status == JXL_DEC_SUCCESS) {
-      EXPECT_EQ(0, JxlDecoderReleaseBoxBuffer(dec.get()));
-      break;
-    } else if (status == JXL_DEC_FRAME) {
-      post_frame = true;
-    } else if (status == JXL_DEC_BOX) {
-      // Since we gave the exif/xml box output buffer of the exact known
-      // correct size, 0 bytes should be released. Same when no buffer was
-      // set.
-      EXPECT_EQ(0, JxlDecoderReleaseBoxBuffer(dec.get()));
-      JxlBoxType type;
-      EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBoxType(dec.get(), type, true));
-      if (memcmp(type, "Exif", 4) == 0) {
-        // This box should have been encoded before the image frame
-        EXPECT_EQ(false, post_frame);
-        JxlDecoderSetBoxBuffer(dec.get(), dec_exif_box.data(),
-                               dec_exif_box.size());
-      } else if (memcmp(type, "XML ", 4) == 0) {
-        // This box should have been encoded after the image frame
-        EXPECT_EQ(true, post_frame);
-        JxlDecoderSetBoxBuffer(dec.get(), dec_xml_box.data(),
-                               dec_xml_box.size());
-      }
-    } else {
-      FAIL();  // unexpected status
-    }
-  }
-
-  EXPECT_EQ(0, memcmp(exif_data, dec_exif_box.data(), exif_size));
-  EXPECT_EQ(0, memcmp(xml_data, dec_xml_box.data(), xml_size));
-}
-
-std::string nameBoxTest(
-    const ::testing::TestParamInfo<std::tuple<bool, size_t>>& info) {
-  return (std::get<0>(info.param) ? "C" : "Unc") + std::string("ompressed") +
-         "_BoxSize_" + std::to_string((std::get<1>(info.param)));
-}
-
-JXL_GTEST_INSTANTIATE_TEST_SUITE_P(
-    EncodeBoxParamsTest, EncodeBoxTest,
-    testing::Combine(testing::Values(false, true),
-                     testing::Values(256,
-                                     jxl::kLargeBoxContentSizeThreshold + 77)),
-    nameBoxTest);
-
-JXL_TRANSCODE_JPEG_TEST(EncodeTest, JPEGFrameTest) {
-  TEST_LIBJPEG_SUPPORT();
-  for (int skip_basic_info = 0; skip_basic_info < 2; skip_basic_info++) {
-    for (int skip_color_encoding = 0; skip_color_encoding < 2;
-         skip_color_encoding++) {
-      // cannot set color encoding if basic info is not set
-      if (skip_basic_info && !skip_color_encoding) continue;
-      const std::string jpeg_path = "jxl/flower/flower_cropped.jpg";
-      const std::vector<uint8_t> orig = jxl::test::ReadTestData(jpeg_path);
-      jxl::extras::PackedPixelFile orig_ppf;
-      ASSERT_TRUE(
-          DecodeBytes(jxl::Bytes(orig), jxl::extras::ColorHints(), &orig_ppf));
-
-      JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-      JxlEncoderFrameSettings* frame_settings =
-          JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-      JxlEncoderFrameSettingsSetOption(frame_settings,
-                                       JXL_ENC_FRAME_SETTING_EFFORT, 1);
-      if (!skip_basic_info) {
-        JxlBasicInfo basic_info;
-        JxlEncoderInitBasicInfo(&basic_info);
-        basic_info.xsize = orig_ppf.xsize();
-        basic_info.ysize = orig_ppf.ysize();
-        basic_info.uses_original_profile = JXL_TRUE;
-        EXPECT_EQ(JXL_ENC_SUCCESS,
-                  JxlEncoderSetBasicInfo(enc.get(), &basic_info));
-      }
-      if (!skip_color_encoding) {
-        JxlColorEncoding color_encoding;
-        JxlColorEncodingSetToSRGB(&color_encoding, /*is_gray=*/JXL_FALSE);
-        EXPECT_EQ(JXL_ENC_SUCCESS,
-                  JxlEncoderSetColorEncoding(enc.get(), &color_encoding));
-      }
-      EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderAddJPEGFrame(
-                                     frame_settings, orig.data(), orig.size()));
-      JxlEncoderCloseInput(enc.get());
-
-      std::vector<uint8_t> compressed = std::vector<uint8_t>(64);
-      uint8_t* next_out = compressed.data();
-      size_t avail_out = compressed.size() - (next_out - compressed.data());
-      JxlEncoderStatus process_result = JXL_ENC_NEED_MORE_OUTPUT;
-      while (process_result == JXL_ENC_NEED_MORE_OUTPUT) {
-        process_result =
-            JxlEncoderProcessOutput(enc.get(), &next_out, &avail_out);
-        if (process_result == JXL_ENC_NEED_MORE_OUTPUT) {
-          size_t offset = next_out - compressed.data();
-          compressed.resize(compressed.size() * 2);
-          next_out = compressed.data() + offset;
-          avail_out = compressed.size() - offset;
-        }
-      }
-      compressed.resize(next_out - compressed.data());
-      EXPECT_EQ(JXL_ENC_SUCCESS, process_result);
-
-      jxl::extras::PackedPixelFile decoded_ppf;
-      EXPECT_TRUE(DecodeBytes(jxl::Bytes(compressed.data(), compressed.size()),
-                              jxl::extras::ColorHints(), &decoded_ppf));
-
-      EXPECT_LE(jxl::test::ComputeDistance2(orig_ppf, decoded_ppf), 3.5);
-    }
-  }
-}
-
-namespace {
-class JxlStreamingAdapter {
- public:
-  JxlStreamingAdapter(JxlEncoder* encoder, bool return_large_buffers,
-                      bool can_seek)
-      : return_large_buffers_(return_large_buffers) {
-    struct JxlEncoderOutputProcessor output_processor;
-    output_processor.opaque = this;
-    output_processor.get_buffer =
-        METHOD_TO_C_CALLBACK(&JxlStreamingAdapter::GetBuffer);
-    if (can_seek) {
-      output_processor.seek = METHOD_TO_C_CALLBACK(&JxlStreamingAdapter::Seek);
-    } else {
-      output_processor.seek = nullptr;
-    }
-    output_processor.set_finalized_position =
-        METHOD_TO_C_CALLBACK(&JxlStreamingAdapter::SetFinalizedPosition);
-    output_processor.release_buffer =
-        METHOD_TO_C_CALLBACK(&JxlStreamingAdapter::ReleaseBuffer);
-    EXPECT_EQ(JxlEncoderSetOutputProcessor(encoder, output_processor),
-              JXL_ENC_SUCCESS);
-  }
-
-  std::vector<uint8_t> output() && {
-    output_.resize(position_);
-    return std::move(output_);
-  }
-
-  void* GetBuffer(size_t* size) {
-    if (!return_large_buffers_) {
-      *size = 1;
-    }
-    if (position_ + *size > output_.size()) {
-      output_.resize(position_ + *size, 0xDA);
-    }
-    if (return_large_buffers_) {
-      *size = output_.size() - position_;
-    }
-    return output_.data() + position_;
-  }
-
-  void ReleaseBuffer(size_t written_bytes) {
-    // TODO(veluca): check no more bytes were written.
-    Seek(position_ + written_bytes);
-  }
-
-  void Seek(uint64_t position) {
-    EXPECT_GE(position, finalized_position_);
-    position_ = position;
-  }
-
-  void SetFinalizedPosition(uint64_t finalized_position) {
-    EXPECT_GE(finalized_position, finalized_position_);
-    finalized_position_ = finalized_position;
-    EXPECT_GE(position_, finalized_position_);
-  }
-
-  void CheckFinalWatermarkPosition() const {
-    EXPECT_EQ(finalized_position_, position_);
-  }
-
- private:
-  std::vector<uint8_t> output_;
-  size_t position_ = 0;
-  size_t finalized_position_ = 0;
-  bool return_large_buffers_;
-};
-
-class JxlChunkedFrameInputSourceAdapter {
- private:
-  static const void* GetDataAt(const jxl::extras::PackedImage& image,
-                               size_t xpos, size_t ypos, size_t* row_offset) {
-    JxlDataType data_type = image.format.data_type;
-    size_t num_channels = image.format.num_channels;
-    size_t bytes_per_pixel =
-        num_channels * jxl::extras::PackedImage::BitsPerChannel(data_type) / 8;
-    *row_offset = image.stride;
-    return static_cast<uint8_t*>(image.pixels()) + bytes_per_pixel * xpos +
-           ypos * image.stride;
-  }
-
- public:
-  // Constructor to wrap the image data or any other state
-  explicit JxlChunkedFrameInputSourceAdapter(
-      jxl::extras::PackedImage color_channel,
-      jxl::extras::PackedImage extra_channel)
-      : colorchannel_(std::move(color_channel)),
-        extra_channel_(std::move(extra_channel)) {}
-  ~JxlChunkedFrameInputSourceAdapter() { EXPECT_TRUE(active_buffers_.empty()); }
-
-  void GetColorChannelsPixelFormat(JxlPixelFormat* pixel_format) {
-    *pixel_format = colorchannel_.format;
-  }
-
-  const void* GetColorChannelDataAt(size_t xpos, size_t ypos, size_t xsize,
-                                    size_t ysize, size_t* row_offset) {
-    const void* p = GetDataAt(colorchannel_, xpos, ypos, row_offset);
-    std::lock_guard<std::mutex> lock(mtx_);
-    active_buffers_.insert(p);
-    return p;
-  }
-
-  void GetExtraChannelPixelFormat(size_t ec_index,
-                                  JxlPixelFormat* pixel_format) {
-    // In this test, we we the same color channel data, so `ec_index` is never
-    // used
-    *pixel_format = extra_channel_.format;
-  }
-
-  const void* GetExtraChannelDataAt(size_t ec_index, size_t xpos, size_t ypos,
-                                    size_t xsize, size_t ysize,
-                                    size_t* row_offset) {
-    // In this test, we we the same color channel data, so `ec_index` is never
-    // used
-    const void* p = GetDataAt(extra_channel_, xpos, ypos, row_offset);
-    std::lock_guard<std::mutex> lock(mtx_);
-    active_buffers_.insert(p);
-    return p;
-  }
-  void ReleaseCurrentData(const void* buffer) {
-    std::lock_guard<std::mutex> lock(mtx_);
-    auto iter = active_buffers_.find(buffer);
-    if (iter != active_buffers_.end()) {
-      active_buffers_.erase(iter);
-    }
-  }
-
-  JxlChunkedFrameInputSource GetInputSource() {
-    return JxlChunkedFrameInputSource{
-        this,
-        METHOD_TO_C_CALLBACK(
-            &JxlChunkedFrameInputSourceAdapter::GetColorChannelsPixelFormat),
-        METHOD_TO_C_CALLBACK(
-            &JxlChunkedFrameInputSourceAdapter::GetColorChannelDataAt),
-        METHOD_TO_C_CALLBACK(
-            &JxlChunkedFrameInputSourceAdapter::GetExtraChannelPixelFormat),
-        METHOD_TO_C_CALLBACK(
-            &JxlChunkedFrameInputSourceAdapter::GetExtraChannelDataAt),
-        METHOD_TO_C_CALLBACK(
-            &JxlChunkedFrameInputSourceAdapter::ReleaseCurrentData)};
-  }
-
- private:
-  const jxl::extras::PackedImage colorchannel_;
-  const jxl::extras::PackedImage extra_channel_;
-  std::mutex mtx_;
-  std::set<const void*> active_buffers_;
-};
-
-struct StreamingTestParam {
-  size_t bitmask;
-  bool use_container() const { return static_cast<bool>(bitmask & 0x1); }
-  bool return_large_buffers() const { return static_cast<bool>(bitmask & 0x2); }
-  bool multiple_frames() const { return static_cast<bool>(bitmask & 0x4); }
-  bool fast_lossless() const { return static_cast<bool>(bitmask & 0x8); }
-  bool can_seek() const { return static_cast<bool>(bitmask & 0x10); }
-  bool with_extra_channels() const { return static_cast<bool>(bitmask & 0x20); }
-  bool color_includes_alpha() const {
-    return static_cast<bool>(bitmask & 0x40);
-  }
-  bool onegroup() const { return static_cast<bool>(bitmask & 0x80); }
-
-  bool is_lossless() const { return fast_lossless(); }
-
-  static std::vector<StreamingTestParam> All() {
-    std::vector<StreamingTestParam> params;
-    for (size_t bitmask = 0; bitmask < 256; bitmask++) {
-      params.push_back(StreamingTestParam{bitmask});
-    }
-    return params;
-  }
-};
-
-std::ostream& operator<<(std::ostream& out, StreamingTestParam p) {
-  if (p.use_container()) {
-    out << "WithContainer_";
-  } else {
-    out << "WithoutContainer_";
-  }
-  if (p.return_large_buffers()) {
-    out << "WithLargeBuffers_";
-  } else {
-    out << "WithSmallBuffers_";
-  }
-  if (p.multiple_frames()) out << "WithMultipleFrames_";
-  if (p.fast_lossless()) out << "FastLossless_";
-  if (!p.can_seek()) {
-    out << "CannotSeek_";
-  } else {
-    out << "CanSeek_";
-  }
-  if (p.with_extra_channels()) {
-    out << "WithExtraChannels_";
-  } else {
-    out << "WithoutExtraChannels_";
-  }
-  if (p.color_includes_alpha()) {
-    out << "ColorIncludesAlpha_";
-  } else {
-    out << "ColorWithoutAlpha_";
-  }
-  if (p.onegroup()) {
-    out << "OneGroup_";
-  } else {
-    out << "MultiGroup_";
-  }
-  return out;
-}
-
-}  // namespace
-
-class EncoderStreamingTest : public testing::TestWithParam<StreamingTestParam> {
- public:
-  static void SetupImage(const StreamingTestParam& p, size_t xsize,
-                         size_t ysize, size_t num_channels,
-                         size_t bits_per_sample, jxl::test::TestImage& image) {
-    ASSERT_TRUE(image.SetDimensions(xsize, ysize));
-    image.SetDataType(JXL_TYPE_UINT8);
-    ASSERT_TRUE(image.SetChannels(num_channels));
-    image.SetAllBitDepths(bits_per_sample);
-    if (p.onegroup()) {
-      image.SetRowAlignment(128);
-    }
-    JXL_TEST_ASSIGN_OR_DIE(auto frame, image.AddFrame());
-    frame.RandomFill();
-  }
-  static void SetUpBasicInfo(JxlBasicInfo& basic_info, size_t xsize,
-                             size_t ysize, size_t number_extra_channels,
-                             bool include_alpha, bool is_lossless) {
-    basic_info.xsize = xsize;
-    basic_info.ysize = ysize;
-    basic_info.num_extra_channels =
-        number_extra_channels + (include_alpha ? 1 : 0);
-    basic_info.uses_original_profile = TO_JXL_BOOL(is_lossless);
-  }
-
-  static void SetupEncoder(JxlEncoderFrameSettings* frame_settings,
-                           const StreamingTestParam& p,
-                           const JxlBasicInfo& basic_info,
-                           size_t number_extra_channels, bool streaming) {
-    JxlEncoderStruct* enc = frame_settings->enc;
-    EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetBasicInfo(enc, &basic_info));
-    if (p.fast_lossless()) {
-      EXPECT_EQ(JXL_ENC_SUCCESS,
-                JxlEncoderSetFrameLossless(frame_settings, JXL_TRUE));
-      EXPECT_EQ(JXL_ENC_SUCCESS,
-                JxlEncoderFrameSettingsSetOption(
-                    frame_settings, JXL_ENC_FRAME_SETTING_EFFORT, 1));
-    }
-    JxlColorEncoding color_encoding;
-    JxlColorEncodingSetToSRGB(&color_encoding, /*is_gray=*/JXL_FALSE);
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderSetColorEncoding(enc, &color_encoding));
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetOption(frame_settings,
-                                               JXL_ENC_FRAME_SETTING_BUFFERING,
-                                               streaming ? 3 : 0));
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings,
-                  JXL_ENC_FRAME_SETTING_USE_FULL_IMAGE_HEURISTICS, 0));
-    if (p.use_container()) {
-      EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetCodestreamLevel(enc, 10));
-    }
-    for (size_t i = 0; i < number_extra_channels; i++) {
-      JxlExtraChannelInfo channel_info;
-      JxlExtraChannelType channel_type = JXL_CHANNEL_THERMAL;
-      JxlEncoderInitExtraChannelInfo(channel_type, &channel_info);
-      EXPECT_EQ(JXL_ENC_SUCCESS,
-                JxlEncoderSetExtraChannelInfo(enc, i, &channel_info));
-    }
-  }
-
-  static void SetupInputNonStreaming(JxlEncoderFrameSettings* frame_settings,
-                                     const StreamingTestParam& p,
-                                     size_t number_extra_channels,
-                                     const jxl::extras::PackedImage& frame,
-                                     const jxl::extras::PackedImage& ec_frame) {
-    size_t frame_count = static_cast<int>(p.multiple_frames()) + 1;
-    for (size_t i = 0; i < frame_count; i++) {
-      {
-        // Copy pixel data here because it is only guaranteed to be available
-        // during the call to JxlEncoderAddImageFrame().
-        std::vector<uint8_t> pixels(frame.pixels_size);
-        memcpy(pixels.data(), frame.pixels(), pixels.size());
-        EXPECT_EQ(JXL_ENC_SUCCESS,
-                  JxlEncoderAddImageFrame(frame_settings, &frame.format,
-                                          pixels.data(), pixels.size()));
-      }
-      for (size_t i = 0; i < number_extra_channels; i++) {
-        // Copy pixel data here because it is only guaranteed to be available
-        // during the call to JxlEncoderSetExtraChannelBuffer().
-        std::vector<uint8_t> ec_pixels(ec_frame.pixels_size);
-        memcpy(ec_pixels.data(), ec_frame.pixels(), ec_pixels.size());
-        EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetExtraChannelBuffer(
-                                       frame_settings, &ec_frame.format,
-                                       ec_pixels.data(), ec_pixels.size(), i));
-      }
-    }
-    JxlEncoderCloseInput(frame_settings->enc);
-  }
-
-  static void SetupInputStreaming(JxlEncoderFrameSettings* frame_settings,
-                                  const StreamingTestParam& p,
-                                  size_t number_extra_channels,
-                                  const jxl::extras::PackedImage& frame,
-                                  const jxl::extras::PackedImage& ec_frame) {
-    size_t frame_count = static_cast<int>(p.multiple_frames()) + 1;
-    for (size_t i = 0; i < frame_count; i++) {
-      // Create local copy of pixels and adapter because they are only
-      // guarantted to be available during the JxlEncoderAddChunkedFrame() call.
-      JxlChunkedFrameInputSourceAdapter chunked_frame_adapter(frame.Copy(),
-                                                              ec_frame.Copy());
-      EXPECT_EQ(JXL_ENC_SUCCESS,
-                JxlEncoderAddChunkedFrame(
-                    // should only set `JXL_TRUE` in the lass pass of the loop
-                    frame_settings, i + 1 == frame_count ? JXL_TRUE : JXL_FALSE,
-                    chunked_frame_adapter.GetInputSource()));
-    }
-  }
-};
-
-TEST_P(EncoderStreamingTest, OutputCallback) {
-  const StreamingTestParam p = GetParam();
-  size_t xsize = p.onegroup() ? 17 : 257;
-  size_t ysize = p.onegroup() ? 19 : 259;
-  size_t number_extra_channels = p.with_extra_channels() ? 5 : 0;
-  jxl::test::TestImage image;
-  SetupImage(p, xsize, ysize, p.color_includes_alpha() ? 4 : 3,
-             p.use_container() ? 16 : 8, image);
-  jxl::test::TestImage ec_image;
-  SetupImage(p, xsize, ysize, 1, 8, ec_image);
-  const auto& frame = image.ppf().frames[0].color;
-  const auto& ec_frame = ec_image.ppf().frames[0].color;
-  JxlBasicInfo basic_info = image.ppf().info;
-  SetUpBasicInfo(basic_info, xsize, ysize, number_extra_channels,
-                 p.color_includes_alpha(), p.is_lossless());
-
-  std::vector<uint8_t> compressed = std::vector<uint8_t>(64);
-  // without streaming
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    ASSERT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    SetupEncoder(frame_settings, p, basic_info, number_extra_channels, false);
-    SetupInputNonStreaming(frame_settings, p, number_extra_channels, frame,
-                           ec_frame);
-    uint8_t* next_out = compressed.data();
-    size_t avail_out = compressed.size();
-    ProcessEncoder(enc.get(), compressed, next_out, avail_out);
-  }
-
-  std::vector<uint8_t> streaming_compressed;
-  // with streaming
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    ASSERT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    SetupEncoder(frame_settings, p, basic_info, number_extra_channels, true);
-    SetupInputNonStreaming(frame_settings, p, number_extra_channels, frame,
-                           ec_frame);
-    JxlStreamingAdapter streaming_adapter(enc.get(), p.return_large_buffers(),
-                                          p.can_seek());
-    EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderFlushInput(enc.get()));
-    streaming_adapter.CheckFinalWatermarkPosition();
-    streaming_compressed = std::move(streaming_adapter).output();
-  }
-
-  EXPECT_TRUE(SameDecodedPixels(compressed, streaming_compressed));
-  EXPECT_LE(streaming_compressed.size(), compressed.size() + 1024);
-}
-
-TEST_P(EncoderStreamingTest, ChunkedFrame) {
-  const StreamingTestParam p = GetParam();
-  size_t xsize = p.onegroup() ? 17 : 257;
-  size_t ysize = p.onegroup() ? 19 : 259;
-  size_t number_extra_channels = p.with_extra_channels() ? 5 : 0;
-  jxl::test::TestImage image;
-  SetupImage(p, xsize, ysize, p.color_includes_alpha() ? 4 : 3,
-             p.use_container() ? 16 : 8, image);
-  jxl::test::TestImage ec_image;
-  SetupImage(p, xsize, ysize, 1, 8, ec_image);
-  const auto& frame = image.ppf().frames[0].color;
-  const auto& ec_frame = ec_image.ppf().frames[0].color;
-  JxlBasicInfo basic_info = image.ppf().info;
-  SetUpBasicInfo(basic_info, xsize, ysize, number_extra_channels,
-                 p.color_includes_alpha(), p.is_lossless());
-  std::vector<uint8_t> compressed = std::vector<uint8_t>(64);
-  std::vector<uint8_t> streaming_compressed = std::vector<uint8_t>(64);
-
-  // without streaming
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    ASSERT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    SetupEncoder(frame_settings, p, basic_info, number_extra_channels, false);
-    SetupInputNonStreaming(frame_settings, p, number_extra_channels, frame,
-                           ec_frame);
-    uint8_t* next_out = compressed.data();
-    size_t avail_out = compressed.size();
-    ProcessEncoder(enc.get(), compressed, next_out, avail_out);
-  }
-
-  // with streaming
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    ASSERT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    SetupEncoder(frame_settings, p, basic_info, number_extra_channels, true);
-    SetupInputStreaming(frame_settings, p, number_extra_channels, frame,
-                        ec_frame);
-    uint8_t* next_out = streaming_compressed.data();
-    size_t avail_out = streaming_compressed.size();
-    ProcessEncoder(enc.get(), streaming_compressed, next_out, avail_out);
-  }
-
-  EXPECT_TRUE(SameDecodedPixels(compressed, streaming_compressed));
-  EXPECT_LE(streaming_compressed.size(), compressed.size() + 1024);
-}
-
-TEST_P(EncoderStreamingTest, ChunkedAndOutputCallback) {
-  const StreamingTestParam p = GetParam();
-  size_t xsize = p.onegroup() ? 17 : 257;
-  size_t ysize = p.onegroup() ? 19 : 259;
-  size_t number_extra_channels = p.with_extra_channels() ? 5 : 0;
-  jxl::test::TestImage image;
-  SetupImage(p, xsize, ysize, p.color_includes_alpha() ? 4 : 3,
-             p.use_container() ? 16 : 8, image);
-  jxl::test::TestImage ec_image;
-  SetupImage(p, xsize, ysize, 1, 8, ec_image);
-  const auto& frame = image.ppf().frames[0].color;
-  const auto& ec_frame = ec_image.ppf().frames[0].color;
-  JxlBasicInfo basic_info = image.ppf().info;
-  SetUpBasicInfo(basic_info, xsize, ysize, number_extra_channels,
-                 p.color_includes_alpha(), p.is_lossless());
-
-  std::vector<uint8_t> compressed = std::vector<uint8_t>(64);
-
-  // without streaming
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    ASSERT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    SetupEncoder(frame_settings, p, basic_info, number_extra_channels, false);
-    SetupInputNonStreaming(frame_settings, p, number_extra_channels, frame,
-                           ec_frame);
-    uint8_t* next_out = compressed.data();
-    size_t avail_out = compressed.size();
-    ProcessEncoder(enc.get(), compressed, next_out, avail_out);
-  }
-
-  std::vector<uint8_t> streaming_compressed;
-  // with streaming
-  {
-    JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-    ASSERT_NE(nullptr, enc.get());
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-    SetupEncoder(frame_settings, p, basic_info, number_extra_channels, true);
-    JxlStreamingAdapter streaming_adapter =
-        JxlStreamingAdapter(enc.get(), p.return_large_buffers(), p.can_seek());
-    SetupInputStreaming(frame_settings, p, number_extra_channels, frame,
-                        ec_frame);
-    streaming_adapter.CheckFinalWatermarkPosition();
-    streaming_compressed = std::move(streaming_adapter).output();
-  }
-
-  EXPECT_TRUE(SameDecodedPixels(compressed, streaming_compressed));
-  EXPECT_LE(streaming_compressed.size(), compressed.size() + 1024);
-}
-
-JXL_GTEST_INSTANTIATE_TEST_SUITE_P(
-    EncoderStreamingTest, EncoderStreamingTest,
-    testing::ValuesIn(StreamingTestParam::All()));
-
-TEST(EncoderTest, CMYK) {
-  size_t xsize = 257;
-  size_t ysize = 259;
-  jxl::test::TestImage image;
-  ASSERT_TRUE(image.SetDimensions(xsize, ysize));
-  image.SetDataType(JXL_TYPE_UINT8);
-  ASSERT_TRUE(image.SetChannels(3));
-  image.SetAllBitDepths(8);
-  JXL_TEST_ASSIGN_OR_DIE(auto frame0, image.AddFrame());
-  frame0.RandomFill();
-  jxl::test::TestImage ec_image;
-  ec_image.SetDataType(JXL_TYPE_UINT8);
-  ASSERT_TRUE(ec_image.SetDimensions(xsize, ysize));
-  ASSERT_TRUE(ec_image.SetChannels(1));
-  ec_image.SetAllBitDepths(8);
-  JXL_TEST_ASSIGN_OR_DIE(auto frame1, ec_image.AddFrame());
-  frame1.RandomFill();
-  const auto& frame = image.ppf().frames[0].color;
-  const auto& ec_frame = ec_image.ppf().frames[0].color;
-  JxlBasicInfo basic_info = image.ppf().info;
-  basic_info.xsize = xsize;
-  basic_info.ysize = ysize;
-  basic_info.num_extra_channels = 1;
-  basic_info.uses_original_profile = JXL_TRUE;
-
-  std::vector<uint8_t> compressed = std::vector<uint8_t>(64);
-  JxlEncoderPtr enc_ptr = JxlEncoderMake(nullptr);
-  JxlEncoderStruct* enc = enc_ptr.get();
-  ASSERT_NE(nullptr, enc);
-  JxlEncoderFrameSettings* frame_settings =
-      JxlEncoderFrameSettingsCreate(enc, nullptr);
-
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetBasicInfo(enc, &basic_info));
-  JxlExtraChannelInfo channel_info;
-  JxlExtraChannelType channel_type = JXL_CHANNEL_BLACK;
-  JxlEncoderInitExtraChannelInfo(channel_type, &channel_info);
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderSetExtraChannelInfo(enc, 0, &channel_info));
-  const std::vector<uint8_t> icc = jxl::test::ReadTestData(
-      "external/Compact-ICC-Profiles/profiles/"
-      "CGATS001Compat-v2-micro.icc");
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderSetICCProfile(enc, icc.data(), icc.size()));
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderAddImageFrame(frame_settings, &frame.format,
-                                    frame.pixels(), frame.pixels_size));
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetExtraChannelBuffer(
-                                 frame_settings, &ec_frame.format,
-                                 ec_frame.pixels(), ec_frame.pixels_size, 0));
-  JxlEncoderCloseInput(frame_settings->enc);
-  uint8_t* next_out = compressed.data();
-  size_t avail_out = compressed.size();
-  ProcessEncoder(enc, compressed, next_out, avail_out);
-
-  jxl::extras::JXLDecompressParams dparams;
-  dparams.accepted_formats = {
-      {3, JXL_TYPE_UINT8, JXL_LITTLE_ENDIAN, 0},
-  };
-  jxl::extras::PackedPixelFile ppf;
-  EXPECT_TRUE(DecodeImageJXL(compressed.data(), compressed.size(), dparams,
-                             nullptr, &ppf, nullptr));
-}
diff --git a/third_party/jpeg-xl/lib/jxl/entropy_coder.cc b/third_party/jpeg-xl/lib/jxl/entropy_coder.cc
deleted file mode 100644
index 3d86546557701..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/entropy_coder.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/entropy_coder.h"
-
-#include <jxl/memory_manager.h>
-
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/ac_context.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/coeff_order.h"
-#include "lib/jxl/coeff_order_fwd.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/dec_context_map.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/pack_signed.h"
-
-namespace jxl {
-
-Status DecodeBlockCtxMap(JxlMemoryManager* memory_manager, BitReader* br,
-                         BlockCtxMap* block_ctx_map) {
-  auto& dct = block_ctx_map->dc_thresholds;
-  auto& qft = block_ctx_map->qf_thresholds;
-  auto& ctx_map = block_ctx_map->ctx_map;
-  bool is_default = static_cast<bool>(br->ReadFixedBits<1>());
-  if (is_default) {
-    *block_ctx_map = BlockCtxMap();
-    return true;
-  }
-  block_ctx_map->num_dc_ctxs = 1;
-  for (int j : {0, 1, 2}) {
-    dct[j].resize(br->ReadFixedBits<4>());
-    block_ctx_map->num_dc_ctxs *= dct[j].size() + 1;
-    for (int& i : dct[j]) {
-      i = UnpackSigned(U32Coder::Read(kDCThresholdDist, br));
-    }
-  }
-  qft.resize(br->ReadFixedBits<4>());
-  for (uint32_t& i : qft) {
-    i = U32Coder::Read(kQFThresholdDist, br) + 1;
-  }
-
-  if (block_ctx_map->num_dc_ctxs * (qft.size() + 1) > 64) {
-    return JXL_FAILURE("Invalid block context map: too big");
-  }
-
-  ctx_map.resize(3 * kNumOrders * block_ctx_map->num_dc_ctxs *
-                 (qft.size() + 1));
-  JXL_RETURN_IF_ERROR(
-      DecodeContextMap(memory_manager, &ctx_map, &block_ctx_map->num_ctxs, br));
-  if (block_ctx_map->num_ctxs > 16) {
-    return JXL_FAILURE("Invalid block context map: too many distinct contexts");
-  }
-  return true;
-}
-
-#if JXL_CXX_LANG < JXL_CXX_17
-constexpr uint8_t BlockCtxMap::kDefaultCtxMap[];  // from ac_context.h
-#endif
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/entropy_coder.h b/third_party/jpeg-xl/lib/jxl/entropy_coder.h
deleted file mode 100644
index f66f54840d451..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/entropy_coder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ENTROPY_CODER_H_
-#define LIB_JXL_ENTROPY_CODER_H_
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-
-#include "lib/jxl/ac_context.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/field_encodings.h"
-
-// Entropy coding and context modeling of DC and AC coefficients, as well as AC
-// strategy and quantization field.
-
-namespace jxl {
-
-static JXL_INLINE int32_t PredictFromTopAndLeft(
-    const int32_t* const JXL_RESTRICT row_top,
-    const int32_t* const JXL_RESTRICT row, size_t x, int32_t default_val) {
-  if (x == 0) {
-    return row_top == nullptr ? default_val : row_top[x];
-  }
-  if (row_top == nullptr) {
-    return row[x - 1];
-  }
-  return (row_top[x] + row[x - 1] + 1) / 2;
-}
-
-static constexpr U32Enc kDCThresholdDist(Bits(4), BitsOffset(8, 16),
-                                         BitsOffset(16, 272),
-                                         BitsOffset(32, 65808));
-
-static constexpr U32Enc kQFThresholdDist(Bits(2), BitsOffset(3, 4),
-                                         BitsOffset(5, 12), BitsOffset(8, 44));
-
-Status DecodeBlockCtxMap(JxlMemoryManager* memory_manager, BitReader* br,
-                         BlockCtxMap* block_ctx_map);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ENTROPY_CODER_H_
diff --git a/third_party/jpeg-xl/lib/jxl/entropy_coder_test.cc b/third_party/jpeg-xl/lib/jxl/entropy_coder_test.cc
deleted file mode 100644
index 0389490d8eb31..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/entropy_coder_test.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// TODO(deymo): Move these tests to dec_ans.h and common.h
-
-#include <stdint.h>
-
-#include "lib/jxl/base/random.h"
-#include "lib/jxl/dec_ans.h"
-#include "lib/jxl/pack_signed.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-TEST(EntropyCoderTest, PackUnpack) {
-  for (int32_t i = -31; i < 32; ++i) {
-    uint32_t packed = PackSigned(i);
-    EXPECT_LT(packed, 63u);
-    int32_t unpacked = UnpackSigned(packed);
-    EXPECT_EQ(i, unpacked);
-  }
-}
-
-struct MockBitReader {
-  uint32_t nbits, bits;
-  void Consume(uint32_t nbits) {}
-  uint32_t PeekBits(uint32_t n) const {
-    EXPECT_EQ(n, nbits);
-    return bits;
-  }
-};
-
-void HybridUintRoundtrip(HybridUintConfig config, size_t limit = 1 << 24) {
-  Rng rng(0);
-  constexpr size_t kNumIntegers = 1 << 20;
-  std::vector<uint32_t> integers(kNumIntegers);
-  std::vector<uint32_t> token(kNumIntegers);
-  std::vector<uint32_t> nbits(kNumIntegers);
-  std::vector<uint32_t> bits(kNumIntegers);
-  for (size_t i = 0; i < kNumIntegers; i++) {
-    integers[i] = rng.UniformU(0, limit + 1);
-    config.Encode(integers[i], &token[i], &nbits[i], &bits[i]);
-  }
-  for (size_t i = 0; i < kNumIntegers; i++) {
-    MockBitReader br{nbits[i], bits[i]};
-    EXPECT_EQ(integers[i],
-              ANSSymbolReader::ReadHybridUintConfig(config, token[i], &br));
-  }
-}
-
-TEST(HybridUintTest, Test000) {
-  HybridUintRoundtrip(HybridUintConfig{0, 0, 0});
-}
-TEST(HybridUintTest, Test411) {
-  HybridUintRoundtrip(HybridUintConfig{4, 1, 1});
-}
-TEST(HybridUintTest, Test420) {
-  HybridUintRoundtrip(HybridUintConfig{4, 2, 0});
-}
-TEST(HybridUintTest, Test421) {
-  HybridUintRoundtrip(HybridUintConfig{4, 2, 1}, 256);
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/epf.cc b/third_party/jpeg-xl/lib/jxl/epf.cc
deleted file mode 100644
index cc1d81e842ea0..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/epf.cc
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Edge-preserving smoothing: weighted average based on L1 patch similarity.
-
-#include "lib/jxl/epf.h"
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-
-#include "lib/jxl/ac_strategy.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_cache.h"
-#include "lib/jxl/loop_filter.h"
-#include "lib/jxl/quantizer.h"
-
-namespace jxl {
-
-// Mirror n floats starting at *p and store them before p.
-JXL_INLINE void LeftMirror(float* p, size_t n) {
-  for (size_t i = 0; i < n; i++) {
-    *(p - 1 - i) = p[i];
-  }
-}
-
-// Mirror n floats starting at *(p - n) and store them at *p.
-JXL_INLINE void RightMirror(float* p, size_t n) {
-  for (size_t i = 0; i < n; i++) {
-    p[i] = *(p - 1 - i);
-  }
-}
-
-Status ComputeSigma(const LoopFilter& lf, const Rect& block_rect,
-                    PassesDecoderState* state) {
-  JXL_ENSURE(lf.epf_iters > 0);
-  const AcStrategyImage& ac_strategy = state->shared->ac_strategy;
-  const float quant_scale = state->shared->quantizer.Scale();
-
-  const size_t sigma_stride = state->sigma.PixelsPerRow();
-  const size_t sharpness_stride = state->shared->epf_sharpness.PixelsPerRow();
-
-  for (size_t by = 0; by < block_rect.ysize(); ++by) {
-    float* JXL_RESTRICT sigma_row = block_rect.Row(&state->sigma, by);
-    const uint8_t* JXL_RESTRICT sharpness_row =
-        block_rect.ConstRow(state->shared->epf_sharpness, by);
-    AcStrategyRow acs_row = ac_strategy.ConstRow(block_rect, by);
-    const int32_t* const JXL_RESTRICT row_quant =
-        block_rect.ConstRow(state->shared->raw_quant_field, by);
-
-    for (size_t bx = 0; bx < block_rect.xsize(); bx++) {
-      AcStrategy acs = acs_row[bx];
-      size_t llf_x = acs.covered_blocks_x();
-      if (!acs.IsFirstBlock()) continue;
-      // quant_scale is smaller for low quality.
-      // quant_scale is roughly 0.08 / butteraugli score.
-      //
-      // row_quant is smaller for low quality.
-      // row_quant is a quantization multiplier of form 1.0 /
-      // row_quant[bx]
-      //
-      // lf.epf_quant_mul is a parameter in the format
-      // kInvSigmaNum is a constant
-      float sigma_quant =
-          lf.epf_quant_mul / (quant_scale * row_quant[bx] * kInvSigmaNum);
-      for (size_t iy = 0; iy < acs.covered_blocks_y(); iy++) {
-        for (size_t ix = 0; ix < acs.covered_blocks_x(); ix++) {
-          float sigma =
-              sigma_quant *
-              lf.epf_sharp_lut[sharpness_row[bx + ix + iy * sharpness_stride]];
-          // Avoid infinities.
-          sigma = std::min(-1e-4f, sigma);  // TODO(veluca): remove this.
-          sigma_row[bx + ix + kSigmaPadding +
-                    (iy + kSigmaPadding) * sigma_stride] = 1.0f / sigma;
-        }
-      }
-      // TODO(veluca): remove this padding.
-      // Left padding with mirroring.
-      if (bx + block_rect.x0() == 0) {
-        for (size_t iy = 0; iy < acs.covered_blocks_y(); iy++) {
-          LeftMirror(
-              sigma_row + kSigmaPadding + (iy + kSigmaPadding) * sigma_stride,
-              kSigmaBorder);
-        }
-      }
-      // Right padding with mirroring.
-      if (bx + block_rect.x0() + llf_x ==
-          state->shared->frame_dim.xsize_blocks) {
-        for (size_t iy = 0; iy < acs.covered_blocks_y(); iy++) {
-          RightMirror(sigma_row + kSigmaPadding + bx + llf_x +
-                          (iy + kSigmaPadding) * sigma_stride,
-                      kSigmaBorder);
-        }
-      }
-      // Offsets for row copying, in blocks.
-      size_t offset_before = bx + block_rect.x0() == 0 ? 1 : bx + kSigmaPadding;
-      size_t offset_after =
-          bx + block_rect.x0() + llf_x == state->shared->frame_dim.xsize_blocks
-              ? kSigmaPadding + llf_x + bx + kSigmaBorder
-              : kSigmaPadding + llf_x + bx;
-      size_t num = offset_after - offset_before;
-      // Above
-      if (by + block_rect.y0() == 0) {
-        for (size_t iy = 0; iy < kSigmaBorder; iy++) {
-          memcpy(
-              sigma_row + offset_before +
-                  (kSigmaPadding - 1 - iy) * sigma_stride,
-              sigma_row + offset_before + (kSigmaPadding + iy) * sigma_stride,
-              num * sizeof(*sigma_row));
-        }
-      }
-      // Below
-      if (by + block_rect.y0() + acs.covered_blocks_y() ==
-          state->shared->frame_dim.ysize_blocks) {
-        for (size_t iy = 0; iy < kSigmaBorder; iy++) {
-          memcpy(
-              sigma_row + offset_before +
-                  sigma_stride * (acs.covered_blocks_y() + kSigmaPadding + iy),
-              sigma_row + offset_before +
-                  sigma_stride *
-                      (acs.covered_blocks_y() + kSigmaPadding - 1 - iy),
-              num * sizeof(*sigma_row));
-        }
-      }
-    }
-  }
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/epf.h b/third_party/jpeg-xl/lib/jxl/epf.h
deleted file mode 100644
index 6e4f056680c33..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/epf.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_EPF_H_
-#define LIB_JXL_EPF_H_
-
-// Fast SIMD "in-loop" edge preserving filter (adaptive, nonlinear).
-
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_cache.h"
-#include "lib/jxl/loop_filter.h"
-
-namespace jxl {
-
-// 4 * (sqrt(0.5)-1), so that Weight(sigma) = 0.5.
-static constexpr float kInvSigmaNum = -1.1715728752538099024f;
-
-// kInvSigmaNum / 0.3
-constexpr float kMinSigma = -3.90524291751269967465540850526868f;
-
-// Fills the `state->filter_weights.sigma` image with the precomputed sigma
-// values in the area inside `block_rect`. Accesses the AC strategy, quant field
-// and epf_sharpness fields in the corresponding positions.
-Status ComputeSigma(const LoopFilter& lf, const Rect& block_rect,
-                    PassesDecoderState* state);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_EPF_H_
diff --git a/third_party/jpeg-xl/lib/jxl/fake_parallel_runner_testonly.h b/third_party/jpeg-xl/lib/jxl/fake_parallel_runner_testonly.h
deleted file mode 100644
index 4ca422e9a48d1..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/fake_parallel_runner_testonly.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_FAKE_PARALLEL_RUNNER_TESTONLY_H_
-#define LIB_JXL_FAKE_PARALLEL_RUNNER_TESTONLY_H_
-
-#include <jxl/parallel_runner.h>
-
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/random.h"
-
-namespace jxl {
-
-// A parallel runner implementation that runs all the jobs in a single thread
-// (the caller thread) but runs them pretending to use multiple threads and
-// potentially out of order. This is useful for testing conditions that only
-// occur under heavy load where the order of operations is different.
-class FakeParallelRunner {
- public:
-  FakeParallelRunner(uint32_t order_seed, uint32_t num_threads)
-      : order_seed_(order_seed), rng_(order_seed), num_threads_(num_threads) {
-    if (num_threads_ < 1) num_threads_ = 1;
-  }
-
-  JxlParallelRetCode Run(void* jxl_opaque, JxlParallelRunInit init,
-                         JxlParallelRunFunction func, uint32_t start,
-                         uint32_t end) {
-    JxlParallelRetCode ret = init(jxl_opaque, num_threads_);
-    if (ret != 0) return ret;
-
-    if (order_seed_ == 0) {
-      for (uint32_t i = start; i < end; i++) {
-        func(jxl_opaque, i, i % num_threads_);
-      }
-    } else {
-      std::vector<uint32_t> order(end - start);
-      for (uint32_t i = start; i < end; i++) {
-        order[i - start] = i;
-      }
-      rng_.Shuffle(order.data(), order.size());
-      for (uint32_t i = start; i < end; i++) {
-        func(jxl_opaque, order[i - start], i % num_threads_);
-      }
-    }
-    return ret;
-  }
-
- private:
-  // Seed for the RNG for defining the execution order. A value of 0 means
-  // sequential order from start to end.
-  uint32_t order_seed_;
-
-  // The PRNG object, initialized with the order_seed_. Only used if the seed is
-  // not 0.
-  Rng rng_;
-
-  // Number of fake threads. All the tasks are run on the same thread, but using
-  // different thread_id values based on this num_threads.
-  uint32_t num_threads_;
-};
-
-}  // namespace jxl
-
-extern "C" {
-// Function to pass as the parallel runner.
-JXL_INLINE JxlParallelRetCode JxlFakeParallelRunner(
-    void* runner_opaque, void* jpegxl_opaque, JxlParallelRunInit init,
-    JxlParallelRunFunction func, uint32_t start_range, uint32_t end_range) {
-  return static_cast<jxl::FakeParallelRunner*>(runner_opaque)
-      ->Run(jpegxl_opaque, init, func, start_range, end_range);
-}
-}
-
-#endif  // LIB_JXL_FAKE_PARALLEL_RUNNER_TESTONLY_H_
diff --git a/third_party/jpeg-xl/lib/jxl/fast_math_test.cc b/third_party/jpeg-xl/lib/jxl/fast_math_test.cc
deleted file mode 100644
index 30029567cd7d4..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/fast_math_test.cc
+++ /dev/null
@@ -1,244 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/fast_math_test.cc"
-#include <jxl/cms.h>
-
-#include <hwy/foreach_target.h>
-
-#include "lib/jxl/base/random.h"
-#include "lib/jxl/cms/transfer_functions-inl.h"
-#include "lib/jxl/dec_xyb-inl.h"
-#include "lib/jxl/enc_xyb.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-// Test utils
-#include <hwy/highway.h>
-#include <hwy/tests/hwy_gtest.h>
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-namespace {
-
-HWY_NOINLINE void TestFastLog2() {
-  constexpr size_t kNumTrials = 1 << 23;
-  Rng rng(1);
-  float max_abs_err = 0;
-  HWY_FULL(float) d;
-  for (size_t i = 0; i < kNumTrials; i++) {
-    const float f = rng.UniformF(1e-7f, 1e3f);
-    const auto actual_v = FastLog2f(d, Set(d, f));
-    const float actual = GetLane(actual_v);
-    const float abs_err = std::abs(std::log2(f) - actual);
-    EXPECT_LT(abs_err, 3.1E-6) << "f = " << f;
-    max_abs_err = std::max(max_abs_err, abs_err);
-  }
-  printf("max abs err %e\n", static_cast<double>(max_abs_err));
-}
-
-HWY_NOINLINE void TestFastPow2() {
-  constexpr size_t kNumTrials = 1 << 23;
-  Rng rng(1);
-  float max_rel_err = 0;
-  HWY_FULL(float) d;
-  for (size_t i = 0; i < kNumTrials; i++) {
-    const float f = rng.UniformF(-100, 100);
-    const auto actual_v = FastPow2f(d, Set(d, f));
-    const float actual = GetLane(actual_v);
-    const float expected = std::pow(2, f);
-    const float rel_err = std::abs(expected - actual) / expected;
-    EXPECT_LT(rel_err, 3.1E-6) << "f = " << f;
-    max_rel_err = std::max(max_rel_err, rel_err);
-  }
-  printf("max rel err %e\n", static_cast<double>(max_rel_err));
-}
-
-HWY_NOINLINE void TestFastPow() {
-  constexpr size_t kNumTrials = 1 << 23;
-  Rng rng(1);
-  float max_rel_err = 0;
-  HWY_FULL(float) d;
-  for (size_t i = 0; i < kNumTrials; i++) {
-    const float b = rng.UniformF(1e-3f, 1e3f);
-    const float e = rng.UniformF(-10, 10);
-    const auto actual_v = FastPowf(d, Set(d, b), Set(d, e));
-    const float actual = GetLane(actual_v);
-    const float expected = std::pow(b, e);
-    const float rel_err = std::abs(expected - actual) / expected;
-    EXPECT_LT(rel_err, 3E-5) << "b = " << b << " e = " << e;
-    max_rel_err = std::max(max_rel_err, rel_err);
-  }
-  printf("max rel err %e\n", static_cast<double>(max_rel_err));
-}
-
-HWY_NOINLINE void TestFastCos() {
-  constexpr size_t kNumTrials = 1 << 23;
-  Rng rng(1);
-  float max_abs_err = 0;
-  HWY_FULL(float) d;
-  for (size_t i = 0; i < kNumTrials; i++) {
-    const float f = rng.UniformF(-1e3f, 1e3f);
-    const auto actual_v = FastCosf(d, Set(d, f));
-    const float actual = GetLane(actual_v);
-    const float abs_err = std::abs(std::cos(f) - actual);
-    EXPECT_LT(abs_err, 7E-5) << "f = " << f;
-    max_abs_err = std::max(max_abs_err, abs_err);
-  }
-  printf("max abs err %e\n", static_cast<double>(max_abs_err));
-}
-
-HWY_NOINLINE void TestFastErf() {
-  constexpr size_t kNumTrials = 1 << 23;
-  Rng rng(1);
-  float max_abs_err = 0;
-  HWY_FULL(float) d;
-  for (size_t i = 0; i < kNumTrials; i++) {
-    const float f = rng.UniformF(-5.f, 5.f);
-    const auto actual_v = FastErff(d, Set(d, f));
-    const float actual = GetLane(actual_v);
-    const float abs_err = std::abs(std::erf(f) - actual);
-    EXPECT_LT(abs_err, 7E-4) << "f = " << f;
-    max_abs_err = std::max(max_abs_err, abs_err);
-  }
-  printf("max abs err %e\n", static_cast<double>(max_abs_err));
-}
-
-HWY_NOINLINE void TestCubeRoot() {
-  const HWY_FULL(float) d;
-  for (uint64_t x5 = 0; x5 < 2000000; x5++) {
-    const float x = x5 * 1E-5f;
-    const float expected = cbrtf(x);
-    HWY_ALIGN float approx[MaxLanes(d)];
-    Store(CubeRootAndAdd(Set(d, x), Zero(d)), d, approx);
-
-    // All lanes are same
-    for (size_t i = 1; i < Lanes(d); ++i) {
-      EXPECT_NEAR(approx[0], approx[i], 5E-7f);
-    }
-    EXPECT_NEAR(approx[0], expected, 8E-7f);
-  }
-}
-
-HWY_NOINLINE void TestFastSRGB() {
-  constexpr size_t kNumTrials = 1 << 23;
-  Rng rng(1);
-  float max_abs_err = 0;
-  HWY_FULL(float) d;
-  for (size_t i = 0; i < kNumTrials; i++) {
-    const float f = rng.UniformF(0.0f, 1.0f);
-    const auto actual_v = FastLinearToSRGB(d, Set(d, f));
-    const float actual = GetLane(actual_v);
-    const float expected = GetLane(TF_SRGB().EncodedFromDisplay(d, Set(d, f)));
-    const float abs_err = std::abs(expected - actual);
-    EXPECT_LT(abs_err, 1.2E-4) << "f = " << f;
-    max_abs_err = std::max(max_abs_err, abs_err);
-  }
-  printf("max abs err %e\n", static_cast<double>(max_abs_err));
-}
-
-HWY_NOINLINE void TestFast709EFD() {
-  constexpr size_t kNumTrials = 1 << 23;
-  Rng rng(1);
-  float max_abs_err = 0;
-  HWY_FULL(float) d;
-  for (size_t i = 0; i < kNumTrials; i++) {
-    const float f = rng.UniformF(0.0f, 1.0f);
-    const float actual = GetLane(TF_709().EncodedFromDisplay(d, Set(d, f)));
-    const float expected = TF_709().EncodedFromDisplay(f);
-    const float abs_err = std::abs(expected - actual);
-    EXPECT_LT(abs_err, 2e-6) << "f = " << f;
-    max_abs_err = std::max(max_abs_err, abs_err);
-  }
-  printf("max abs err %e\n", static_cast<double>(max_abs_err));
-}
-
-HWY_NOINLINE void TestFastXYB() {
-  if (!HasFastXYBTosRGB8()) return;
-  ImageMetadata metadata;
-  ImageBundle ib(jxl::test::MemoryManager(), &metadata);
-  int scaling = 1;
-  int n = 256 * scaling;
-  float inv_scaling = 1.0f / scaling;
-  int kChunk = 32;
-  // The image is divided in chunks to reduce total memory usage.
-  for (int cr = 0; cr < n; cr += kChunk) {
-    for (int cg = 0; cg < n; cg += kChunk) {
-      for (int cb = 0; cb < n; cb += kChunk) {
-        JXL_TEST_ASSIGN_OR_DIE(Image3F chunk,
-                               Image3F::Create(jxl::test::MemoryManager(),
-                                               kChunk * kChunk, kChunk));
-        for (int ir = 0; ir < kChunk; ir++) {
-          for (int ig = 0; ig < kChunk; ig++) {
-            for (int ib = 0; ib < kChunk; ib++) {
-              float r = (cr + ir) * inv_scaling;
-              float g = (cg + ig) * inv_scaling;
-              float b = (cb + ib) * inv_scaling;
-              chunk.PlaneRow(0, ir)[ig * kChunk + ib] = r * (1.0f / 255);
-              chunk.PlaneRow(1, ir)[ig * kChunk + ib] = g * (1.0f / 255);
-              chunk.PlaneRow(2, ir)[ig * kChunk + ib] = b * (1.0f / 255);
-            }
-          }
-        }
-        ASSERT_TRUE(ib.SetFromImage(std::move(chunk), ColorEncoding::SRGB()));
-        JXL_TEST_ASSIGN_OR_DIE(Image3F xyb,
-                               Image3F::Create(jxl::test::MemoryManager(),
-                                               kChunk * kChunk, kChunk));
-        std::vector<uint8_t> roundtrip(kChunk * kChunk * kChunk * 3);
-        ASSERT_TRUE(ToXYB(ib, nullptr, &xyb, *JxlGetDefaultCms()));
-        for (int y = 0; y < kChunk; y++) {
-          const float* xyba[4] = {xyb.PlaneRow(0, y), xyb.PlaneRow(1, y),
-                                  xyb.PlaneRow(2, y), nullptr};
-          ASSERT_TRUE(jxl::HWY_NAMESPACE::FastXYBTosRGB8(
-              xyba, roundtrip.data() + 3 * xyb.xsize() * y, false,
-              xyb.xsize()));
-        }
-        for (int ir = 0; ir < kChunk; ir++) {
-          for (int ig = 0; ig < kChunk; ig++) {
-            for (int ib = 0; ib < kChunk; ib++) {
-              float r = (cr + ir) * inv_scaling;
-              float g = (cg + ig) * inv_scaling;
-              float b = (cb + ib) * inv_scaling;
-              size_t idx = ir * kChunk * kChunk + ig * kChunk + ib;
-              int rr = roundtrip[3 * idx];
-              int rg = roundtrip[3 * idx + 1];
-              int rb = roundtrip[3 * idx + 2];
-              EXPECT_LT(abs(r - rr), 2) << "expected " << r << " got " << rr;
-              EXPECT_LT(abs(g - rg), 2) << "expected " << g << " got " << rg;
-              EXPECT_LT(abs(b - rb), 2) << "expected " << b << " got " << rb;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-}  // namespace
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-class FastMathTargetTest : public hwy::TestWithParamTarget {};
-HWY_TARGET_INSTANTIATE_TEST_SUITE_P(FastMathTargetTest);
-
-HWY_EXPORT_AND_TEST_P(FastMathTargetTest, TestFastLog2);
-HWY_EXPORT_AND_TEST_P(FastMathTargetTest, TestFastPow2);
-HWY_EXPORT_AND_TEST_P(FastMathTargetTest, TestFastPow);
-HWY_EXPORT_AND_TEST_P(FastMathTargetTest, TestFastCos);
-HWY_EXPORT_AND_TEST_P(FastMathTargetTest, TestFastErf);
-HWY_EXPORT_AND_TEST_P(FastMathTargetTest, TestCubeRoot);
-HWY_EXPORT_AND_TEST_P(FastMathTargetTest, TestFastSRGB);
-HWY_EXPORT_AND_TEST_P(FastMathTargetTest, TestFast709EFD);
-HWY_EXPORT_AND_TEST_P(FastMathTargetTest, TestFastXYB);
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/field_encodings.h b/third_party/jpeg-xl/lib/jxl/field_encodings.h
deleted file mode 100644
index 6da6db3d39350..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/field_encodings.h
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_FIELD_ENCODINGS_H_
-#define LIB_JXL_FIELD_ENCODINGS_H_
-
-// Constants needed to encode/decode fields; avoids including the full fields.h.
-
-#include <cstddef>
-#include <cstdint>
-#include <hwy/base.h>
-#include <vector>
-
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-// Macro to define the Fields' derived class Name when compiling with debug
-// names.
-#if (JXL_IS_DEBUG_BUILD)
-#define JXL_FIELDS_NAME(X) \
-  const char* Name() const override { return #X; }
-#else
-#define JXL_FIELDS_NAME(X)
-#endif  // JXL_IS_DEBUG_BUILD
-
-class Visitor;
-class Fields {
- public:
-  virtual ~Fields() = default;
-#if (JXL_IS_DEBUG_BUILD)
-  virtual const char* Name() const = 0;
-#endif  // JXL_IS_DEBUG_BUILD
-  virtual Status VisitFields(Visitor* JXL_RESTRICT visitor) = 0;
-};
-
-// Distribution of U32 values for one particular selector. Represents either a
-// power of two-sized range, or a single value. A separate type ensures this is
-// only passed to the U32Enc ctor.
-struct U32Distr {
-  // No need to validate - all `d` are legitimate.
-  constexpr explicit U32Distr(uint32_t d) : d(d) {}
-
-  static constexpr uint32_t kDirect = 0x80000000u;
-
-  constexpr bool IsDirect() const { return (d & kDirect) != 0; }
-
-  // Only call if IsDirect().
-  constexpr uint32_t Direct() const { return d & (kDirect - 1); }
-
-  // Only call if !IsDirect().
-  constexpr size_t ExtraBits() const { return (d & 0x1F) + 1; }
-  uint32_t Offset() const { return (d >> 5) & 0x3FFFFFF; }
-
-  uint32_t d;
-};
-
-// A direct-coded 31-bit value occupying 2 bits in the bitstream.
-constexpr U32Distr Val(uint32_t value) {
-  return U32Distr(value | U32Distr::kDirect);
-}
-
-// Value - `offset` will be signaled in `bits` extra bits.
-constexpr U32Distr BitsOffset(uint32_t bits, uint32_t offset) {
-  return U32Distr(((bits - 1) & 0x1F) + ((offset & 0x3FFFFFF) << 5));
-}
-
-// Value will be signaled in `bits` extra bits.
-constexpr U32Distr Bits(uint32_t bits) { return BitsOffset(bits, 0); }
-
-// See U32Coder documentation in fields.h.
-class U32Enc {
- public:
-  constexpr U32Enc(const U32Distr d0, const U32Distr d1, const U32Distr d2,
-                   const U32Distr d3)
-      : d_{d0, d1, d2, d3} {}
-
-  // Returns the U32Distr at `selector` = 0..3, least-significant first.
-  U32Distr GetDistr(const uint32_t selector) const {
-    JXL_DASSERT(selector < 4);
-    return d_[selector];
-  }
-
- private:
-  U32Distr d_[4];
-};
-
-// Returns bit with the given `index` (0 = least significant).
-template <typename T>
-static inline constexpr uint64_t MakeBit(T index) {
-  return 1ULL << static_cast<uint32_t>(index);
-}
-
-// Returns vector of all possible values of an Enum type. Relies on each Enum
-// providing an overload of EnumBits() that returns a bit array of its values,
-// which implies values must be in [0, 64).
-template <typename Enum>
-std::vector<Enum> Values() {
-  uint64_t bits = EnumBits(Enum());
-
-  std::vector<Enum> values;
-  values.reserve(hwy::PopCount(bits));
-
-  // For each 1-bit in bits: add its index as value
-  while (bits != 0) {
-    const int index = Num0BitsBelowLS1Bit_Nonzero(bits);
-    values.push_back(static_cast<Enum>(index));
-    bits &= bits - 1;  // clear least-significant bit
-  }
-  return values;
-}
-
-// Returns true if value is one of Values<Enum>().
-template <class Enum>
-Status EnumValid(const Enum value) {
-  if (static_cast<uint32_t>(value) >= 64) {
-    return JXL_FAILURE("Value %u too large for %s\n",
-                       static_cast<uint32_t>(value), EnumName(Enum()));
-  }
-  const uint64_t bit = MakeBit(value);
-  if ((EnumBits(Enum()) & bit) == 0) {
-    return JXL_FAILURE("Invalid value %u for %s\n",
-                       static_cast<uint32_t>(value), EnumName(Enum()));
-  }
-  return true;
-}
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_FIELD_ENCODINGS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/fields.cc b/third_party/jpeg-xl/lib/jxl/fields.cc
deleted file mode 100644
index 6cbdd2edaa747..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/fields.cc
+++ /dev/null
@@ -1,651 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/fields.h"
-
-#include <algorithm>
-#include <cinttypes>  // PRIu64
-#include <cmath>
-#include <cstddef>
-#include <hwy/base.h>
-
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/base/printf_macros.h"
-
-namespace jxl {
-
-namespace {
-
-using ::jxl::fields_internal::VisitorBase;
-
-struct InitVisitor : public VisitorBase {
-  Status Bits(const size_t /*unused*/, const uint32_t default_value,
-              uint32_t* JXL_RESTRICT value) override {
-    *value = default_value;
-    return true;
-  }
-
-  Status U32(const U32Enc /*unused*/, const uint32_t default_value,
-             uint32_t* JXL_RESTRICT value) override {
-    *value = default_value;
-    return true;
-  }
-
-  Status U64(const uint64_t default_value,
-             uint64_t* JXL_RESTRICT value) override {
-    *value = default_value;
-    return true;
-  }
-
-  Status Bool(bool default_value, bool* JXL_RESTRICT value) override {
-    *value = default_value;
-    return true;
-  }
-
-  Status F16(const float default_value, float* JXL_RESTRICT value) override {
-    *value = default_value;
-    return true;
-  }
-
-  // Always visit conditional fields to ensure they are initialized.
-  Status Conditional(bool /*condition*/) override { return true; }
-
-  Status AllDefault(const Fields& /*fields*/,
-                    bool* JXL_RESTRICT all_default) override {
-    // Just initialize this field and don't skip initializing others.
-    JXL_RETURN_IF_ERROR(Bool(true, all_default));
-    return false;
-  }
-
-  Status VisitNested(Fields* /*fields*/) override {
-    // Avoid re-initializing nested bundles (their ctors already called
-    // Bundle::Init for their fields).
-    return true;
-  }
-};
-
-// Similar to InitVisitor, but also initializes nested fields.
-struct SetDefaultVisitor : public VisitorBase {
-  Status Bits(const size_t /*unused*/, const uint32_t default_value,
-              uint32_t* JXL_RESTRICT value) override {
-    *value = default_value;
-    return true;
-  }
-
-  Status U32(const U32Enc /*unused*/, const uint32_t default_value,
-             uint32_t* JXL_RESTRICT value) override {
-    *value = default_value;
-    return true;
-  }
-
-  Status U64(const uint64_t default_value,
-             uint64_t* JXL_RESTRICT value) override {
-    *value = default_value;
-    return true;
-  }
-
-  Status Bool(bool default_value, bool* JXL_RESTRICT value) override {
-    *value = default_value;
-    return true;
-  }
-
-  Status F16(const float default_value, float* JXL_RESTRICT value) override {
-    *value = default_value;
-    return true;
-  }
-
-  // Always visit conditional fields to ensure they are initialized.
-  Status Conditional(bool /*condition*/) override { return true; }
-
-  Status AllDefault(const Fields& /*fields*/,
-                    bool* JXL_RESTRICT all_default) override {
-    // Just initialize this field and don't skip initializing others.
-    JXL_RETURN_IF_ERROR(Bool(true, all_default));
-    return false;
-  }
-};
-
-class AllDefaultVisitor : public VisitorBase {
- public:
-  explicit AllDefaultVisitor() = default;
-
-  Status Bits(const size_t bits, const uint32_t default_value,
-              uint32_t* JXL_RESTRICT value) override {
-    all_default_ &= *value == default_value;
-    return true;
-  }
-
-  Status U32(const U32Enc /*unused*/, const uint32_t default_value,
-             uint32_t* JXL_RESTRICT value) override {
-    all_default_ &= *value == default_value;
-    return true;
-  }
-
-  Status U64(const uint64_t default_value,
-             uint64_t* JXL_RESTRICT value) override {
-    all_default_ &= *value == default_value;
-    return true;
-  }
-
-  Status F16(const float default_value, float* JXL_RESTRICT value) override {
-    all_default_ &= std::abs(*value - default_value) < 1E-6f;
-    return true;
-  }
-
-  Status AllDefault(const Fields& /*fields*/,
-                    bool* JXL_RESTRICT /*all_default*/) override {
-    // Visit all fields so we can compute the actual all_default_ value.
-    return false;
-  }
-
-  bool AllDefault() const { return all_default_; }
-
- private:
-  bool all_default_ = true;
-};
-
-class ReadVisitor : public VisitorBase {
- public:
-  explicit ReadVisitor(BitReader* reader) : reader_(reader) {}
-
-  Status Bits(const size_t bits, const uint32_t /*default_value*/,
-              uint32_t* JXL_RESTRICT value) override {
-    *value = BitsCoder::Read(bits, reader_);
-    if (!reader_->AllReadsWithinBounds()) {
-      return JXL_STATUS(StatusCode::kNotEnoughBytes,
-                        "Not enough bytes for header");
-    }
-    return true;
-  }
-
-  Status U32(const U32Enc dist, const uint32_t /*default_value*/,
-             uint32_t* JXL_RESTRICT value) override {
-    *value = U32Coder::Read(dist, reader_);
-    if (!reader_->AllReadsWithinBounds()) {
-      return JXL_STATUS(StatusCode::kNotEnoughBytes,
-                        "Not enough bytes for header");
-    }
-    return true;
-  }
-
-  Status U64(const uint64_t /*default_value*/,
-             uint64_t* JXL_RESTRICT value) override {
-    *value = U64Coder::Read(reader_);
-    if (!reader_->AllReadsWithinBounds()) {
-      return JXL_STATUS(StatusCode::kNotEnoughBytes,
-                        "Not enough bytes for header");
-    }
-    return true;
-  }
-
-  Status F16(const float /*default_value*/,
-             float* JXL_RESTRICT value) override {
-    ok_ &= F16Coder::Read(reader_, value);
-    if (!reader_->AllReadsWithinBounds()) {
-      return JXL_STATUS(StatusCode::kNotEnoughBytes,
-                        "Not enough bytes for header");
-    }
-    return true;
-  }
-
-  void SetDefault(Fields* fields) override { Bundle::SetDefault(fields); }
-
-  bool IsReading() const override { return true; }
-
-  // This never fails because visitors are expected to keep reading until
-  // EndExtensions, see comment there.
-  Status BeginExtensions(uint64_t* JXL_RESTRICT extensions) override {
-    JXL_QUIET_RETURN_IF_ERROR(VisitorBase::BeginExtensions(extensions));
-    if (*extensions == 0) return true;
-
-    // For each nonzero bit, i.e. extension that is present:
-    for (uint64_t remaining_extensions = *extensions; remaining_extensions != 0;
-         remaining_extensions &= remaining_extensions - 1) {
-      const size_t idx_extension =
-          Num0BitsBelowLS1Bit_Nonzero(remaining_extensions);
-      // Read additional U64 (one per extension) indicating the number of bits
-      // (allows skipping individual extensions).
-      JXL_RETURN_IF_ERROR(U64(0, &extension_bits_[idx_extension]));
-      if (!SafeAdd(total_extension_bits_, extension_bits_[idx_extension],
-                   total_extension_bits_)) {
-        return JXL_FAILURE("Extension bits overflowed, invalid codestream");
-      }
-    }
-    // Used by EndExtensions to skip past any _remaining_ extensions.
-    pos_after_ext_size_ = reader_->TotalBitsConsumed();
-    JXL_ENSURE(pos_after_ext_size_ != 0);
-    return true;
-  }
-
-  Status EndExtensions() override {
-    JXL_QUIET_RETURN_IF_ERROR(VisitorBase::EndExtensions());
-    // Happens if extensions == 0: don't read size, done.
-    if (pos_after_ext_size_ == 0) return true;
-
-    // Not enough bytes as set by BeginExtensions or earlier. Do not return
-    // this as a JXL_FAILURE or false (which can also propagate to error
-    // through e.g. JXL_RETURN_IF_ERROR), since this may be used while
-    // silently checking whether there are enough bytes. If this case must be
-    // treated as an error, reader_>Close() will do this, just like is already
-    // done for non-extension fields.
-    if (!enough_bytes_) return true;
-
-    // Skip new fields this (old?) decoder didn't know about, if any.
-    const size_t bits_read = reader_->TotalBitsConsumed();
-    uint64_t end;
-    if (!SafeAdd(pos_after_ext_size_, total_extension_bits_, end)) {
-      return JXL_FAILURE("Invalid extension size, caused overflow");
-    }
-    if (bits_read > end) {
-      return JXL_FAILURE("Read more extension bits than budgeted");
-    }
-    const size_t remaining_bits = end - bits_read;
-    if (remaining_bits != 0) {
-      JXL_WARNING("Skipping %" PRIuS "-bit extension(s)", remaining_bits);
-      reader_->SkipBits(remaining_bits);
-      if (!reader_->AllReadsWithinBounds()) {
-        return JXL_STATUS(StatusCode::kNotEnoughBytes,
-                          "Not enough bytes for header");
-      }
-    }
-    return true;
-  }
-
-  Status OK() const { return ok_; }
-
- private:
-  // Whether any error other than not enough bytes occurred.
-  bool ok_ = true;
-
-  // Whether there are enough input bytes to read from.
-  bool enough_bytes_ = true;
-  BitReader* const reader_;
-  // May be 0 even if the corresponding extension is present.
-  uint64_t extension_bits_[Bundle::kMaxExtensions] = {0};
-  uint64_t total_extension_bits_ = 0;
-  size_t pos_after_ext_size_ = 0;  // 0 iff extensions == 0.
-
-  friend Status jxl::CheckHasEnoughBits(Visitor* /* visitor */,
-                                        size_t /* bits */);
-};
-
-class MaxBitsVisitor : public VisitorBase {
- public:
-  Status Bits(const size_t bits, const uint32_t /*default_value*/,
-              uint32_t* JXL_RESTRICT /*value*/) override {
-    max_bits_ += BitsCoder::MaxEncodedBits(bits);
-    return true;
-  }
-
-  Status U32(const U32Enc enc, const uint32_t /*default_value*/,
-             uint32_t* JXL_RESTRICT /*value*/) override {
-    max_bits_ += U32Coder::MaxEncodedBits(enc);
-    return true;
-  }
-
-  Status U64(const uint64_t /*default_value*/,
-             uint64_t* JXL_RESTRICT /*value*/) override {
-    max_bits_ += U64Coder::MaxEncodedBits();
-    return true;
-  }
-
-  Status F16(const float /*default_value*/,
-             float* JXL_RESTRICT /*value*/) override {
-    max_bits_ += F16Coder::MaxEncodedBits();
-    return true;
-  }
-
-  Status AllDefault(const Fields& /*fields*/,
-                    bool* JXL_RESTRICT all_default) override {
-    JXL_RETURN_IF_ERROR(Bool(true, all_default));
-    return false;  // For max bits, assume nothing is default
-  }
-
-  // Always visit conditional fields to get a (loose) upper bound.
-  Status Conditional(bool /*condition*/) override { return true; }
-
-  Status BeginExtensions(uint64_t* JXL_RESTRICT /*extensions*/) override {
-    // Skip - extensions are not included in "MaxBits" because their length
-    // is potentially unbounded.
-    return true;
-  }
-
-  Status EndExtensions() override { return true; }
-
-  size_t MaxBits() const { return max_bits_; }
-
- private:
-  size_t max_bits_ = 0;
-};
-
-class CanEncodeVisitor : public VisitorBase {
- public:
-  explicit CanEncodeVisitor() = default;
-
-  Status Bits(const size_t bits, const uint32_t /*default_value*/,
-              uint32_t* JXL_RESTRICT value) override {
-    size_t encoded_bits = 0;
-    ok_ &= BitsCoder::CanEncode(bits, *value, &encoded_bits);
-    encoded_bits_ += encoded_bits;
-    return true;
-  }
-
-  Status U32(const U32Enc enc, const uint32_t /*default_value*/,
-             uint32_t* JXL_RESTRICT value) override {
-    size_t encoded_bits = 0;
-    ok_ &= U32Coder::CanEncode(enc, *value, &encoded_bits);
-    encoded_bits_ += encoded_bits;
-    return true;
-  }
-
-  Status U64(const uint64_t /*default_value*/,
-             uint64_t* JXL_RESTRICT value) override {
-    size_t encoded_bits = 0;
-    ok_ &= U64Coder::CanEncode(*value, &encoded_bits);
-    encoded_bits_ += encoded_bits;
-    return true;
-  }
-
-  Status F16(const float /*default_value*/,
-             float* JXL_RESTRICT value) override {
-    size_t encoded_bits = 0;
-    ok_ &= F16Coder::CanEncode(*value, &encoded_bits);
-    encoded_bits_ += encoded_bits;
-    return true;
-  }
-
-  Status AllDefault(const Fields& fields,
-                    bool* JXL_RESTRICT all_default) override {
-    *all_default = Bundle::AllDefault(fields);
-    JXL_RETURN_IF_ERROR(Bool(true, all_default));
-    return *all_default;
-  }
-
-  Status BeginExtensions(uint64_t* JXL_RESTRICT extensions) override {
-    JXL_QUIET_RETURN_IF_ERROR(VisitorBase::BeginExtensions(extensions));
-    extensions_ = *extensions;
-    if (*extensions != 0) {
-      JXL_ENSURE(pos_after_ext_ == 0);
-      pos_after_ext_ = encoded_bits_;
-      JXL_ENSURE(pos_after_ext_ != 0);  // visited "extensions"
-    }
-    return true;
-  }
-  // EndExtensions = default.
-
-  Status GetSizes(size_t* JXL_RESTRICT extension_bits,
-                  size_t* JXL_RESTRICT total_bits) {
-    JXL_RETURN_IF_ERROR(ok_);
-    *extension_bits = 0;
-    *total_bits = encoded_bits_;
-    // Only if extension field was nonzero will we encode their sizes.
-    if (pos_after_ext_ != 0) {
-      JXL_ENSURE(encoded_bits_ >= pos_after_ext_);
-      *extension_bits = encoded_bits_ - pos_after_ext_;
-      // Also need to encode *extension_bits and bill it to *total_bits.
-      size_t encoded_bits = 0;
-      ok_ &= U64Coder::CanEncode(*extension_bits, &encoded_bits);
-      *total_bits += encoded_bits;
-
-      // TODO(janwas): support encoding individual extension sizes. We
-      // currently ascribe all bits to the first and send zeros for the
-      // others.
-      for (size_t i = 1; i < hwy::PopCount(extensions_); ++i) {
-        encoded_bits = 0;
-        ok_ &= U64Coder::CanEncode(0, &encoded_bits);
-        *total_bits += encoded_bits;
-      }
-    }
-    return true;
-  }
-
- private:
-  bool ok_ = true;
-  size_t encoded_bits_ = 0;
-  uint64_t extensions_ = 0;
-  // Snapshot of encoded_bits_ after visiting the extension field, but NOT
-  // including the hidden extension sizes.
-  uint64_t pos_after_ext_ = 0;
-};
-}  // namespace
-
-void Bundle::Init(Fields* fields) {
-  InitVisitor visitor;
-  if (!visitor.Visit(fields)) {
-    JXL_DEBUG_ABORT("Init should never fail");
-  }
-}
-void Bundle::SetDefault(Fields* fields) {
-  SetDefaultVisitor visitor;
-  if (!visitor.Visit(fields)) {
-    JXL_DEBUG_ABORT("SetDefault should never fail");
-  }
-}
-bool Bundle::AllDefault(const Fields& fields) {
-  AllDefaultVisitor visitor;
-  if (!visitor.VisitConst(fields)) {
-    JXL_DEBUG_ABORT("AllDefault should never fail");
-  }
-  return visitor.AllDefault();
-}
-size_t Bundle::MaxBits(const Fields& fields) {
-  MaxBitsVisitor visitor;
-  Status ret = visitor.VisitConst(fields);
-  (void)ret;
-  JXL_DASSERT(ret);
-  return visitor.MaxBits();
-}
-Status Bundle::CanEncode(const Fields& fields, size_t* extension_bits,
-                         size_t* total_bits) {
-  CanEncodeVisitor visitor;
-  JXL_QUIET_RETURN_IF_ERROR(visitor.VisitConst(fields));
-  JXL_QUIET_RETURN_IF_ERROR(visitor.GetSizes(extension_bits, total_bits));
-  return true;
-}
-Status Bundle::Read(BitReader* reader, Fields* fields) {
-  ReadVisitor visitor(reader);
-  JXL_RETURN_IF_ERROR(visitor.Visit(fields));
-  return visitor.OK();
-}
-bool Bundle::CanRead(BitReader* reader, Fields* fields) {
-  ReadVisitor visitor(reader);
-  Status status = visitor.Visit(fields);
-  // We are only checking here whether there are enough bytes. We still return
-  // true for other errors because it means there are enough bytes to determine
-  // there's an error. Use Read() to determine which error it is.
-  return status.code() != StatusCode::kNotEnoughBytes;
-}
-
-size_t BitsCoder::MaxEncodedBits(const size_t bits) { return bits; }
-
-Status BitsCoder::CanEncode(const size_t bits, const uint32_t value,
-                            size_t* JXL_RESTRICT encoded_bits) {
-  *encoded_bits = bits;
-  if (value >= (1ULL << bits)) {
-    return JXL_FAILURE("Value %u too large for %" PRIu64 " bits", value,
-                       static_cast<uint64_t>(bits));
-  }
-  return true;
-}
-
-uint32_t BitsCoder::Read(const size_t bits, BitReader* JXL_RESTRICT reader) {
-  return reader->ReadBits(bits);
-}
-
-size_t U32Coder::MaxEncodedBits(const U32Enc enc) {
-  size_t extra_bits = 0;
-  for (uint32_t selector = 0; selector < 4; ++selector) {
-    const U32Distr d = enc.GetDistr(selector);
-    if (d.IsDirect()) {
-      continue;
-    } else {
-      extra_bits = std::max<size_t>(extra_bits, d.ExtraBits());
-    }
-  }
-  return 2 + extra_bits;
-}
-
-Status U32Coder::CanEncode(const U32Enc enc, const uint32_t value,
-                           size_t* JXL_RESTRICT encoded_bits) {
-  uint32_t selector;
-  size_t total_bits;
-  const Status ok = ChooseSelector(enc, value, &selector, &total_bits);
-  *encoded_bits = ok ? total_bits : 0;
-  return ok;
-}
-
-uint32_t U32Coder::Read(const U32Enc enc, BitReader* JXL_RESTRICT reader) {
-  const uint32_t selector = reader->ReadFixedBits<2>();
-  const U32Distr d = enc.GetDistr(selector);
-  if (d.IsDirect()) {
-    return d.Direct();
-  } else {
-    return reader->ReadBits(d.ExtraBits()) + d.Offset();
-  }
-}
-
-Status U32Coder::ChooseSelector(const U32Enc enc, const uint32_t value,
-                                uint32_t* JXL_RESTRICT selector,
-                                size_t* JXL_RESTRICT total_bits) {
-  const size_t bits_required = 32 - Num0BitsAboveMS1Bit(value);
-  JXL_ENSURE(bits_required <= 32);
-
-  *selector = 0;
-  *total_bits = 0;
-
-  // It is difficult to verify whether Dist32Byte are sorted, so check all
-  // selectors and keep the one with the fewest total_bits.
-  *total_bits = 64;  // more than any valid encoding
-  for (uint32_t s = 0; s < 4; ++s) {
-    const U32Distr d = enc.GetDistr(s);
-    if (d.IsDirect()) {
-      if (d.Direct() == value) {
-        *selector = s;
-        *total_bits = 2;
-        return true;  // Done, direct is always the best possible.
-      }
-      continue;
-    }
-    const size_t extra_bits = d.ExtraBits();
-    const uint32_t offset = d.Offset();
-    if (value < offset || value >= offset + (1ULL << extra_bits)) continue;
-
-    // Better than prior encoding, remember it:
-    if (2 + extra_bits < *total_bits) {
-      *selector = s;
-      *total_bits = 2 + extra_bits;
-    }
-  }
-
-  if (*total_bits == 64) {
-    return JXL_FAILURE("No feasible selector for %u", value);
-  }
-
-  return true;
-}
-
-uint64_t U64Coder::Read(BitReader* JXL_RESTRICT reader) {
-  uint64_t selector = reader->ReadFixedBits<2>();
-  if (selector == 0) {
-    return 0;
-  }
-  if (selector == 1) {
-    return 1 + reader->ReadFixedBits<4>();
-  }
-  if (selector == 2) {
-    return 17 + reader->ReadFixedBits<8>();
-  }
-
-  // selector 3, varint, groups have first 12, then 8, and last 4 bits.
-  uint64_t result = reader->ReadFixedBits<12>();
-
-  uint64_t shift = 12;
-  while (reader->ReadFixedBits<1>()) {
-    if (shift == 60) {
-      result |= static_cast<uint64_t>(reader->ReadFixedBits<4>()) << shift;
-      break;
-    }
-    result |= static_cast<uint64_t>(reader->ReadFixedBits<8>()) << shift;
-    shift += 8;
-  }
-
-  return result;
-}
-
-// Can always encode, but useful because it also returns bit size.
-Status U64Coder::CanEncode(uint64_t value, size_t* JXL_RESTRICT encoded_bits) {
-  if (value == 0) {
-    *encoded_bits = 2;  // 2 selector bits
-  } else if (value <= 16) {
-    *encoded_bits = 2 + 4;  // 2 selector bits + 4 payload bits
-  } else if (value <= 272) {
-    *encoded_bits = 2 + 8;  // 2 selector bits + 8 payload bits
-  } else {
-    *encoded_bits = 2 + 12;  // 2 selector bits + 12 payload bits
-    value >>= 12;
-    int shift = 12;
-    while (value > 0 && shift < 60) {
-      *encoded_bits += 1 + 8;  // 1 continuation bit + 8 payload bits
-      value >>= 8;
-      shift += 8;
-    }
-    if (value > 0) {
-      // This only could happen if shift == N - 4.
-      *encoded_bits += 1 + 4;  // 1 continuation bit + 4 payload bits
-    } else {
-      *encoded_bits += 1;  // 1 stop bit
-    }
-  }
-
-  return true;
-}
-
-Status F16Coder::Read(BitReader* JXL_RESTRICT reader,
-                      float* JXL_RESTRICT value) {
-  const uint32_t bits16 = reader->ReadFixedBits<16>();
-  const uint32_t sign = bits16 >> 15;
-  const uint32_t biased_exp = (bits16 >> 10) & 0x1F;
-  const uint32_t mantissa = bits16 & 0x3FF;
-
-  if (JXL_UNLIKELY(biased_exp == 31)) {
-    return JXL_FAILURE("F16 infinity or NaN are not supported");
-  }
-
-  // Subnormal or zero
-  if (JXL_UNLIKELY(biased_exp == 0)) {
-    *value = (1.0f / 16384) * (mantissa * (1.0f / 1024));
-    if (sign) *value = -*value;
-    return true;
-  }
-
-  // Normalized: convert the representation directly (faster than ldexp/tables).
-  const uint32_t biased_exp32 = biased_exp + (127 - 15);
-  const uint32_t mantissa32 = mantissa << (23 - 10);
-  const uint32_t bits32 = (sign << 31) | (biased_exp32 << 23) | mantissa32;
-  memcpy(value, &bits32, sizeof(bits32));
-  return true;
-}
-
-Status F16Coder::CanEncode(float value, size_t* JXL_RESTRICT encoded_bits) {
-  *encoded_bits = MaxEncodedBits();
-  if (std::isnan(value) || std::isinf(value)) {
-    return JXL_FAILURE("Should not attempt to store NaN and infinity");
-  }
-  return std::abs(value) <= 65504.0f;
-}
-
-Status CheckHasEnoughBits(Visitor* visitor, size_t bits) {
-  if (!visitor->IsReading()) return false;
-  ReadVisitor* rv = static_cast<ReadVisitor*>(visitor);
-  size_t have_bits = rv->reader_->TotalBytes() * kBitsPerByte;
-  size_t want_bits = bits + rv->reader_->TotalBitsConsumed();
-  if (have_bits < want_bits) {
-    return JXL_STATUS(StatusCode::kNotEnoughBytes,
-                      "Not enough bytes for header");
-  }
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/fields.h b/third_party/jpeg-xl/lib/jxl/fields.h
deleted file mode 100644
index e1c37e2ca3f30..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/fields.h
+++ /dev/null
@@ -1,372 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_FIELDS_H_
-#define LIB_JXL_FIELDS_H_
-
-// Forward/backward-compatible 'bundles' with auto-serialized 'fields'.
-
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/field_encodings.h"
-
-namespace jxl {
-
-struct AuxOut;
-enum class LayerType : uint8_t;
-struct BitWriter;
-
-// Integer coders: BitsCoder (raw), U32Coder (table), U64Coder (varint).
-
-// Reads/writes a given (fixed) number of bits <= 32.
-namespace BitsCoder {
-size_t MaxEncodedBits(size_t bits);
-
-Status CanEncode(size_t bits, uint32_t value,
-                 size_t* JXL_RESTRICT encoded_bits);
-
-uint32_t Read(size_t bits, BitReader* JXL_RESTRICT reader);
-
-// Returns false if the value is too large to encode.
-Status Write(size_t bits, uint32_t value, BitWriter* JXL_RESTRICT writer);
-}  // namespace BitsCoder
-
-// Encodes u32 using a lookup table and/or extra bits, governed by a per-field
-// encoding `enc` which consists of four distributions `d` chosen via a 2-bit
-// selector (least significant = 0). Each d may have two modes:
-// - direct: if d.IsDirect(), the value is d.Direct();
-// - offset: the value is derived from d.ExtraBits() extra bits plus d.Offset();
-// This encoding is denser than Exp-Golomb or Gamma codes when both small and
-// large values occur.
-//
-// Examples:
-// Direct: U32Enc(Val(8), Val(16), Val(32), Bits(6)), value 32 => 10b.
-// Offset: U32Enc(Val(0), BitsOffset(1, 1), BitsOffset(2, 3), BitsOffset(8, 8))
-//   defines the following prefix code:
-//   00 -> 0
-//   01x -> 1..2
-//   10xx -> 3..7
-//   11xxxxxxxx -> 8..263
-namespace U32Coder {
-size_t MaxEncodedBits(U32Enc enc);
-Status CanEncode(U32Enc enc, uint32_t value, size_t* JXL_RESTRICT encoded_bits);
-uint32_t Read(U32Enc enc, BitReader* JXL_RESTRICT reader);
-
-// Returns false if the value is too large to encode.
-Status Write(U32Enc enc, uint32_t value, BitWriter* JXL_RESTRICT writer);
-
-// "private"
-Status ChooseSelector(U32Enc enc, uint32_t value,
-                      uint32_t* JXL_RESTRICT selector,
-                      size_t* JXL_RESTRICT total_bits);
-}  // namespace U32Coder
-
-// Encodes 64-bit unsigned integers with a fixed distribution, taking 2 bits
-// to encode 0, 6 bits to encode 1 to 16, 10 bits to encode 17 to 272, 15 bits
-// to encode up to 4095, and on the order of log2(value) * 1.125 bits for
-// larger values.
-namespace U64Coder {
-constexpr size_t MaxEncodedBits() { return 2 + 12 + 6 * (8 + 1) + (4 + 1); }
-
-uint64_t Read(BitReader* JXL_RESTRICT reader);
-
-// Returns false if the value is too large to encode.
-Status Write(uint64_t value, BitWriter* JXL_RESTRICT writer);
-
-// Can always encode, but useful because it also returns bit size.
-Status CanEncode(uint64_t value, size_t* JXL_RESTRICT encoded_bits);
-}  // namespace U64Coder
-
-// IEEE 754 half-precision (binary16). Refuses to read/write NaN/Inf.
-namespace F16Coder {
-constexpr size_t MaxEncodedBits() { return 16; }
-
-// Returns false if the bit representation is NaN or infinity
-Status Read(BitReader* JXL_RESTRICT reader, float* JXL_RESTRICT value);
-
-// Returns false if the value is too large to encode.
-Status Write(float value, BitWriter* JXL_RESTRICT writer);
-Status CanEncode(float value, size_t* JXL_RESTRICT encoded_bits);
-}  // namespace F16Coder
-
-// A "bundle" is a forward- and backward compatible collection of fields.
-// They are used for SizeHeader/FrameHeader/GroupHeader. Bundles can be
-// extended by appending(!) fields. Optional fields may be omitted from the
-// bitstream by conditionally visiting them. When reading new bitstreams with
-// old code, we skip unknown fields at the end of the bundle. This requires
-// storing the amount of extra appended bits, and that fields are visited in
-// chronological order of being added to the format, because old decoders
-// cannot skip some future fields and resume reading old fields. Similarly,
-// new readers query bits in an "extensions" field to skip (groups of) fields
-// not present in old bitstreams. Note that each bundle must include an
-// "extensions" field prior to freezing the format, otherwise it cannot be
-// extended.
-//
-// To ensure interoperability, there will be no opaque fields.
-//
-// HOWTO:
-// - basic usage: define a struct with member variables ("fields") and a
-//   VisitFields(v) member function that calls v->U32/Bool etc. for each
-//   field, specifying their default values. The ctor must call
-//   Bundle::Init(this).
-//
-// - print a trace of visitors: ensure each bundle has a static Name() member
-//   function, and change Bundle::Print* to return true.
-//
-// - optional fields: in VisitFields, add if (v->Conditional(your_condition))
-//   { v->Bool(default, &field); }. This prevents reading/writing field
-//   if !your_condition, which is typically computed from a prior field.
-//   WARNING: to ensure all fields are initialized, do not add an else branch;
-//   instead add another if (v->Conditional(!your_condition)).
-//
-// - repeated fields: for dynamic sizes, use e.g. std::vector and in
-//   VisitFields, if (v->IsReading()) field.resize(size) before accessing field.
-//   For static or bounded sizes, use an array or std::array. In all cases,
-//   simply visit each array element as if it were a normal field.
-//
-// - nested bundles: add a bundle as a normal field and in VisitFields call
-//   JXL_RETURN_IF_ERROR(v->VisitNested(&nested));
-//
-// - allow future extensions: define a "uint64_t extensions" field and call
-//   v->BeginExtensions(&extensions) after visiting all non-extension fields,
-//   and `return v->EndExtensions();` after the last extension field.
-//
-// - encode an entire bundle in one bit if ALL its fields equal their default
-//   values: add a "mutable bool all_default" field and as the first visitor:
-//   if (v->AllDefault(*this, &all_default)) {
-//     // Overwrite all serialized fields, but not any nonserialized_*.
-//     v->SetDefault(this);
-//     return true;
-//   }
-//   Note: if extensions are present, AllDefault() == false.
-
-namespace Bundle {
-constexpr size_t kMaxExtensions = 64;  // bits in u64
-
-// Initializes fields to the default values. It is not recursive to nested
-// fields, this function is intended to be called in the constructors so
-// each nested field will already Init itself.
-void Init(Fields* JXL_RESTRICT fields);
-
-// Similar to Init, but recursive to nested fields.
-void SetDefault(Fields* JXL_RESTRICT fields);
-
-// Returns whether ALL fields (including `extensions`, if present) are equal
-// to their default value.
-bool AllDefault(const Fields& fields);
-
-// Returns max number of bits required to encode a T.
-size_t MaxBits(const Fields& fields);
-
-// Returns whether a header's fields can all be encoded, i.e. they have a
-// valid representation. If so, "*total_bits" is the exact number of bits
-// required. Called by Write.
-Status CanEncode(const Fields& fields, size_t* JXL_RESTRICT extension_bits,
-                 size_t* JXL_RESTRICT total_bits);
-
-Status Read(BitReader* reader, Fields* JXL_RESTRICT fields);
-
-// Returns whether enough bits are available to fully read this bundle using
-// Read. Also returns true in case of a codestream error (other than not being
-// large enough): that means enough bits are available to determine there's an
-// error, use Read to get such error status.
-// NOTE: this advances the BitReader, a different one pointing back at the
-// original bit position in the codestream must be created to use Read after
-// this.
-bool CanRead(BitReader* reader, Fields* JXL_RESTRICT fields);
-
-Status Write(const Fields& fields, BitWriter* JXL_RESTRICT writer,
-             LayerType layer, AuxOut* aux_out);
-}  // namespace Bundle
-
-// Different subclasses of Visitor are passed to implementations of Fields
-// throughout their lifetime. Templates used to be used for this but dynamic
-// polymorphism produces more compact executables than template reification did.
-class Visitor {
- public:
-  virtual ~Visitor() = default;
-  virtual Status Visit(Fields* fields) = 0;
-
-  virtual Status Bool(bool default_value, bool* JXL_RESTRICT value) = 0;
-  virtual Status U32(U32Enc, uint32_t, uint32_t*) = 0;
-
-  // Helper to construct U32Enc from U32Distr.
-  Status U32(const U32Distr d0, const U32Distr d1, const U32Distr d2,
-             const U32Distr d3, const uint32_t default_value,
-             uint32_t* JXL_RESTRICT value) {
-    return U32(U32Enc(d0, d1, d2, d3), default_value, value);
-  }
-
-  template <typename EnumT>
-  Status Enum(const EnumT default_value, EnumT* JXL_RESTRICT value) {
-    uint32_t u32 = static_cast<uint32_t>(*value);
-    // 00 -> 0
-    // 01 -> 1
-    // 10xxxx -> 2..17
-    // 11yyyyyy -> 18..81
-    JXL_RETURN_IF_ERROR(U32(Val(0), Val(1), BitsOffset(4, 2), BitsOffset(6, 18),
-                            static_cast<uint32_t>(default_value), &u32));
-    *value = static_cast<EnumT>(u32);
-    return EnumValid(*value);
-  }
-
-  virtual Status Bits(size_t bits, uint32_t default_value,
-                      uint32_t* JXL_RESTRICT value) = 0;
-  virtual Status U64(uint64_t default_value, uint64_t* JXL_RESTRICT value) = 0;
-  virtual Status F16(float default_value, float* JXL_RESTRICT value) = 0;
-
-  // Returns whether VisitFields should visit some subsequent fields.
-  // "condition" is typically from prior fields, e.g. flags.
-  // Overridden by InitVisitor and MaxBitsVisitor.
-  virtual Status Conditional(bool condition) { return condition; }
-
-  // Overridden by InitVisitor, AllDefaultVisitor and CanEncodeVisitor.
-  virtual Status AllDefault(const Fields& /*fields*/,
-                            bool* JXL_RESTRICT all_default) {
-    JXL_RETURN_IF_ERROR(Bool(true, all_default));
-    return *all_default;
-  }
-
-  virtual void SetDefault(Fields* /*fields*/) {
-    // Do nothing by default, this is overridden by ReadVisitor.
-  }
-
-  // Returns the result of visiting a nested Bundle.
-  // Overridden by InitVisitor.
-  virtual Status VisitNested(Fields* fields) { return Visit(fields); }
-
-  // Overridden by ReadVisitor. Enables dynamically-sized fields.
-  virtual bool IsReading() const { return false; }
-
-  virtual Status BeginExtensions(uint64_t* JXL_RESTRICT extensions) = 0;
-  virtual Status EndExtensions() = 0;
-};
-
-namespace fields_internal {
-// A bundle can be in one of three states concerning extensions: not-begun,
-// active, ended. Bundles may be nested, so we need a stack of states.
-class ExtensionStates {
- public:
-  void Push() {
-    // Initial state = not-begun.
-    begun_ <<= 1;
-    ended_ <<= 1;
-  }
-
-  // Clears current state; caller must check IsEnded beforehand.
-  void Pop() {
-    begun_ >>= 1;
-    ended_ >>= 1;
-  }
-
-  // Returns true if state == active || state == ended.
-  Status IsBegun() const { return (begun_ & 1) != 0; }
-  // Returns true if state != not-begun && state != active.
-  Status IsEnded() const { return (ended_ & 1) != 0; }
-
-  void Begin() {
-    JXL_DASSERT(!IsBegun());
-    JXL_DASSERT(!IsEnded());
-    begun_ += 1;
-  }
-
-  void End() {
-    JXL_DASSERT(IsBegun());
-    JXL_DASSERT(!IsEnded());
-    ended_ += 1;
-  }
-
- private:
-  // Current state := least-significant bit of begun_ and ended_.
-  uint64_t begun_ = 0;
-  uint64_t ended_ = 0;
-};
-
-// Visitors generate Init/AllDefault/Read/Write logic for all fields. Each
-// bundle's VisitFields member function calls visitor->U32 etc. We do not
-// overload operator() because a function name is easier to search for.
-
-class VisitorBase : public Visitor {
- public:
-  explicit VisitorBase() = default;
-  ~VisitorBase() override { JXL_DASSERT(depth_ == 0); }
-
-  // This is the only call site of Fields::VisitFields.
-  // Ensures EndExtensions was called.
-  Status Visit(Fields* fields) override {
-    JXL_ENSURE(depth_ < Bundle::kMaxExtensions);
-    depth_ += 1;
-    extension_states_.Push();
-
-    const Status ok = fields->VisitFields(this);
-
-    if (ok) {
-      // If VisitFields called BeginExtensions, must also call
-      // EndExtensions.
-      JXL_DASSERT(!extension_states_.IsBegun() || extension_states_.IsEnded());
-    } else {
-      // Failed, undefined state: don't care whether EndExtensions was
-      // called.
-    }
-
-    extension_states_.Pop();
-    JXL_DASSERT(depth_ != 0);
-    depth_ -= 1;
-
-    return ok;
-  }
-
-  // For visitors accepting a const Visitor, need to const-cast so we can call
-  // the non-const Visitor::VisitFields. NOTE: C is not modified except the
-  // `all_default` field by CanEncodeVisitor.
-  Status VisitConst(const Fields& t) { return Visit(const_cast<Fields*>(&t)); }
-
-  // Derived types (overridden by InitVisitor because it is unsafe to read
-  // from *value there)
-
-  Status Bool(bool default_value, bool* JXL_RESTRICT value) override {
-    uint32_t bits = *value ? 1 : 0;
-    JXL_RETURN_IF_ERROR(Bits(1, static_cast<uint32_t>(default_value), &bits));
-    JXL_DASSERT(bits <= 1);
-    *value = bits == 1;
-    return true;
-  }
-
-  // Overridden by ReadVisitor and WriteVisitor.
-  // Called before any conditional visit based on "extensions".
-  // Overridden by ReadVisitor, CanEncodeVisitor and WriteVisitor.
-  Status BeginExtensions(uint64_t* JXL_RESTRICT extensions) override {
-    JXL_RETURN_IF_ERROR(U64(0, extensions));
-
-    extension_states_.Begin();
-    return true;
-  }
-
-  // Called after all extension fields (if any). Although non-extension
-  // fields could be visited afterward, we prefer the convention that
-  // extension fields are always the last to be visited. Overridden by
-  // ReadVisitor.
-  Status EndExtensions() override {
-    extension_states_.End();
-    return true;
-  }
-
- private:
-  size_t depth_ = 0;  // to check nesting
-  ExtensionStates extension_states_;
-};
-}  // namespace fields_internal
-
-Status CheckHasEnoughBits(Visitor* visitor, size_t bits);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_FIELDS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/fields_test.cc b/third_party/jpeg-xl/lib/jxl/fields_test.cc
deleted file mode 100644
index 8358bd6cdc16d..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/fields_test.cc
+++ /dev/null
@@ -1,456 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/fields.h"
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_fields.h"
-#include "lib/jxl/field_encodings.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/headers.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-// Ensures `value` round-trips and in exactly `expected_bits_written`.
-void TestU32Coder(const uint32_t value, const size_t expected_bits_written) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const U32Enc enc(Val(0), Bits(4), Val(0x7FFFFFFF), Bits(32));
-
-  BitWriter writer{memory_manager};
-  ASSERT_TRUE(writer.WithMaxBits(
-      RoundUpBitsToByteMultiple(U32Coder::MaxEncodedBits(enc)),
-      LayerType::Header, nullptr, [&] {
-        size_t precheck_pos;
-        EXPECT_TRUE(U32Coder::CanEncode(enc, value, &precheck_pos));
-        EXPECT_EQ(expected_bits_written, precheck_pos);
-
-        EXPECT_TRUE(U32Coder::Write(enc, value, &writer));
-        EXPECT_EQ(expected_bits_written, writer.BitsWritten());
-        writer.ZeroPadToByte();
-        return true;
-      }));
-
-  BitReader reader(writer.GetSpan());
-  const uint32_t decoded_value = U32Coder::Read(enc, &reader);
-  EXPECT_EQ(value, decoded_value);
-  EXPECT_TRUE(reader.Close());
-}
-
-TEST(FieldsTest, U32CoderTest) {
-  TestU32Coder(0, 2);
-  TestU32Coder(1, 6);
-  TestU32Coder(15, 6);
-  TestU32Coder(0x7FFFFFFF, 2);
-  TestU32Coder(128, 34);
-  TestU32Coder(0x7FFFFFFEu, 34);
-  TestU32Coder(0x80000000u, 34);
-  TestU32Coder(0xFFFFFFFFu, 34);
-}
-
-void TestU64Coder(const uint64_t value, const size_t expected_bits_written) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  BitWriter writer{memory_manager};
-  ASSERT_TRUE(writer.WithMaxBits(
-      RoundUpBitsToByteMultiple(U64Coder::MaxEncodedBits()), LayerType::Header,
-      nullptr, [&] {
-        size_t precheck_pos;
-        EXPECT_TRUE(U64Coder::CanEncode(value, &precheck_pos));
-        EXPECT_EQ(expected_bits_written, precheck_pos);
-
-        EXPECT_TRUE(U64Coder::Write(value, &writer));
-        EXPECT_EQ(expected_bits_written, writer.BitsWritten());
-
-        writer.ZeroPadToByte();
-        return true;
-      }));
-
-  BitReader reader(writer.GetSpan());
-  const uint64_t decoded_value = U64Coder::Read(&reader);
-  EXPECT_EQ(value, decoded_value);
-  EXPECT_TRUE(reader.Close());
-}
-
-TEST(FieldsTest, U64CoderTest) {
-  // Values that should take 2 bits (selector 00): 0
-  TestU64Coder(0, 2);
-
-  // Values that should take 6 bits (2 for selector, 4 for value): 1..16
-  TestU64Coder(1, 6);
-  TestU64Coder(2, 6);
-  TestU64Coder(8, 6);
-  TestU64Coder(15, 6);
-  TestU64Coder(16, 6);
-
-  // Values that should take 10 bits (2 for selector, 8 for value): 17..272
-  TestU64Coder(17, 10);
-  TestU64Coder(18, 10);
-  TestU64Coder(100, 10);
-  TestU64Coder(271, 10);
-  TestU64Coder(272, 10);
-
-  // Values that should take 15 bits (2 for selector, 12 for value, 1 for varint
-  // end): (0)..273..4095
-  TestU64Coder(273, 15);
-  TestU64Coder(274, 15);
-  TestU64Coder(1000, 15);
-  TestU64Coder(4094, 15);
-  TestU64Coder(4095, 15);
-
-  // Take 24 bits (of which 20 actual value): (0)..4096..1048575
-  TestU64Coder(4096, 24);
-  TestU64Coder(4097, 24);
-  TestU64Coder(10000, 24);
-  TestU64Coder(1048574, 24);
-  TestU64Coder(1048575, 24);
-
-  // Take 33 bits (of which 28 actual value): (0)..1048576..268435455
-  TestU64Coder(1048576, 33);
-  TestU64Coder(1048577, 33);
-  TestU64Coder(10000000, 33);
-  TestU64Coder(268435454, 33);
-  TestU64Coder(268435455, 33);
-
-  // Take 42 bits (of which 36 actual value): (0)..268435456..68719476735
-  TestU64Coder(268435456ull, 42);
-  TestU64Coder(268435457ull, 42);
-  TestU64Coder(1000000000ull, 42);
-  TestU64Coder(68719476734ull, 42);
-  TestU64Coder(68719476735ull, 42);
-
-  // Take 51 bits (of which 44 actual value): (0)..68719476736..17592186044415
-  TestU64Coder(68719476736ull, 51);
-  TestU64Coder(68719476737ull, 51);
-  TestU64Coder(1000000000000ull, 51);
-  TestU64Coder(17592186044414ull, 51);
-  TestU64Coder(17592186044415ull, 51);
-
-  // Take 60 bits (of which 52 actual value):
-  // (0)..17592186044416..4503599627370495
-  TestU64Coder(17592186044416ull, 60);
-  TestU64Coder(17592186044417ull, 60);
-  TestU64Coder(100000000000000ull, 60);
-  TestU64Coder(4503599627370494ull, 60);
-  TestU64Coder(4503599627370495ull, 60);
-
-  // Take 69 bits (of which 60 actual value):
-  // (0)..4503599627370496..1152921504606846975
-  TestU64Coder(4503599627370496ull, 69);
-  TestU64Coder(4503599627370497ull, 69);
-  TestU64Coder(10000000000000000ull, 69);
-  TestU64Coder(1152921504606846974ull, 69);
-  TestU64Coder(1152921504606846975ull, 69);
-
-  // Take 73 bits (of which 64 actual value):
-  // (0)..1152921504606846976..18446744073709551615
-  TestU64Coder(1152921504606846976ull, 73);
-  TestU64Coder(1152921504606846977ull, 73);
-  TestU64Coder(10000000000000000000ull, 73);
-  TestU64Coder(18446744073709551614ull, 73);
-  TestU64Coder(18446744073709551615ull, 73);
-}
-
-Status TestF16Coder(const float value) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  size_t max_encoded_bits;
-  // It is not a fatal error if it can't be encoded.
-  if (!F16Coder::CanEncode(value, &max_encoded_bits)) return false;
-  EXPECT_EQ(F16Coder::MaxEncodedBits(), max_encoded_bits);
-
-  BitWriter writer{memory_manager};
-  EXPECT_TRUE(writer.WithMaxBits(RoundUpBitsToByteMultiple(max_encoded_bits),
-                                 LayerType::Header, nullptr, [&] {
-                                   EXPECT_TRUE(F16Coder::Write(value, &writer));
-                                   EXPECT_EQ(F16Coder::MaxEncodedBits(),
-                                             writer.BitsWritten());
-                                   writer.ZeroPadToByte();
-                                   return true;
-                                 }));
-
-  BitReader reader(writer.GetSpan());
-  float decoded_value;
-  EXPECT_TRUE(F16Coder::Read(&reader, &decoded_value));
-  // All values we test can be represented exactly.
-  EXPECT_EQ(value, decoded_value);
-  EXPECT_TRUE(reader.Close());
-  return true;
-}
-
-TEST(FieldsTest, F16CoderTest) {
-  for (float sign : {-1.0f, 1.0f}) {
-    // (anything less than 1E-3 are subnormals)
-    for (float mag : {0.0f, 0.5f, 1.0f, 2.0f, 2.5f, 16.015625f, 1.0f / 4096,
-                      1.0f / 16384, 65504.0f}) {
-      EXPECT_TRUE(TestF16Coder(sign * mag));
-    }
-  }
-
-  // Out of range
-  EXPECT_FALSE(TestF16Coder(65504.01f));
-  EXPECT_FALSE(TestF16Coder(-65505.0f));
-}
-
-// Ensures Read(Write()) returns the same fields.
-TEST(FieldsTest, TestRoundtripSize) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  for (int i = 0; i < 8; i++) {
-    SizeHeader size;
-    ASSERT_TRUE(size.Set(123 + 77 * i, 7 + i));
-
-    size_t extension_bits = 999;
-    size_t total_bits = 999;  // Initialize as garbage.
-    ASSERT_TRUE(Bundle::CanEncode(size, &extension_bits, &total_bits));
-    EXPECT_EQ(0u, extension_bits);
-
-    BitWriter writer{memory_manager};
-    ASSERT_TRUE(WriteSizeHeader(size, &writer, LayerType::Header, nullptr));
-    EXPECT_EQ(total_bits, writer.BitsWritten());
-    writer.ZeroPadToByte();
-
-    SizeHeader size2;
-    BitReader reader(writer.GetSpan());
-    ASSERT_TRUE(ReadSizeHeader(&reader, &size2));
-    EXPECT_EQ(total_bits, reader.TotalBitsConsumed());
-    EXPECT_TRUE(reader.Close());
-
-    EXPECT_EQ(size.xsize(), size2.xsize());
-    EXPECT_EQ(size.ysize(), size2.ysize());
-  }
-}
-
-// Ensure all values can be reached by the encoding.
-TEST(FieldsTest, TestCropRect) {
-  CodecMetadata metadata;
-  for (int32_t i = -999; i < 19000; ++i) {
-    FrameHeader f(&metadata);
-    f.custom_size_or_origin = true;
-    f.frame_origin.x0 = i;
-    f.frame_origin.y0 = i;
-    f.frame_size.xsize = 1000 + i;
-    f.frame_size.ysize = 1000 + i;
-    size_t extension_bits = 0;
-    size_t total_bits = 0;
-    ASSERT_TRUE(Bundle::CanEncode(f, &extension_bits, &total_bits));
-    EXPECT_EQ(0u, extension_bits);
-    EXPECT_GE(total_bits, 9u);
-  }
-}
-TEST(FieldsTest, TestPreview) {
-  // (div8 cannot represent 4360, but !div8 can go a little higher)
-  for (uint32_t i = 1; i < 4360; ++i) {
-    PreviewHeader p;
-    ASSERT_TRUE(p.Set(i, i));
-    size_t extension_bits = 0;
-    size_t total_bits = 0;
-    ASSERT_TRUE(Bundle::CanEncode(p, &extension_bits, &total_bits));
-    EXPECT_EQ(0u, extension_bits);
-    EXPECT_GE(total_bits, 6u);
-  }
-}
-
-// Ensures Read(Write()) returns the same fields.
-TEST(FieldsTest, TestRoundtripFrame) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  CodecMetadata metadata;
-  FrameHeader h(&metadata);
-  h.extensions = 0x800;
-
-  size_t extension_bits = 999;
-  size_t total_bits = 999;  // Initialize as garbage.
-  ASSERT_TRUE(Bundle::CanEncode(h, &extension_bits, &total_bits));
-  EXPECT_EQ(0u, extension_bits);
-  BitWriter writer{memory_manager};
-  ASSERT_TRUE(WriteFrameHeader(h, &writer, nullptr));
-  EXPECT_EQ(total_bits, writer.BitsWritten());
-  writer.ZeroPadToByte();
-
-  FrameHeader h2(&metadata);
-  BitReader reader(writer.GetSpan());
-  ASSERT_TRUE(ReadFrameHeader(&reader, &h2));
-  EXPECT_EQ(total_bits, reader.TotalBitsConsumed());
-  EXPECT_TRUE(reader.Close());
-
-  EXPECT_EQ(h.extensions, h2.extensions);
-  EXPECT_EQ(h.flags, h2.flags);
-}
-
-// Ensure out-of-bounds values cause an error.
-TEST(FieldsTest, TestOutOfRange) {
-  if (JXL_CRASH_ON_ERROR) {
-    GTEST_SKIP() << "Skipping due to JXL_CRASH_ON_ERROR";
-  }
-  SizeHeader h;
-  ASSERT_TRUE(h.Set(0xFFFFFFFFull, 0xFFFFFFFFull));
-  size_t extension_bits = 999;
-  size_t total_bits = 999;  // Initialize as garbage.
-  ASSERT_FALSE(Bundle::CanEncode(h, &extension_bits, &total_bits));
-}
-
-struct OldBundle : public Fields {
-  OldBundle() { Bundle::Init(this); }
-  JXL_FIELDS_NAME(OldBundle)
-
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override {
-    JXL_QUIET_RETURN_IF_ERROR(
-        visitor->U32(Val(1), Bits(2), Bits(3), Bits(4), 1, &old_small));
-    JXL_QUIET_RETURN_IF_ERROR(visitor->F16(1.125f, &old_f));
-    JXL_QUIET_RETURN_IF_ERROR(
-        visitor->U32(Bits(7), Bits(12), Bits(16), Bits(32), 0, &old_large));
-
-    JXL_QUIET_RETURN_IF_ERROR(visitor->BeginExtensions(&extensions));
-    return visitor->EndExtensions();
-  }
-
-  uint32_t old_small;
-  float old_f;
-  uint32_t old_large;
-  uint64_t extensions;
-};
-
-struct NewBundle : public Fields {
-  NewBundle() { Bundle::Init(this); }
-  JXL_FIELDS_NAME(NewBundle)
-
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override {
-    JXL_QUIET_RETURN_IF_ERROR(
-        visitor->U32(Val(1), Bits(2), Bits(3), Bits(4), 1, &old_small));
-    JXL_QUIET_RETURN_IF_ERROR(visitor->F16(1.125f, &old_f));
-    JXL_QUIET_RETURN_IF_ERROR(
-        visitor->U32(Bits(7), Bits(12), Bits(16), Bits(32), 0, &old_large));
-
-    JXL_QUIET_RETURN_IF_ERROR(visitor->BeginExtensions(&extensions));
-    if (visitor->Conditional((extensions & 1) != 0)) {
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->U32(Val(2), Bits(2), Bits(3), Bits(4), 2, &new_small));
-      JXL_QUIET_RETURN_IF_ERROR(visitor->F16(-2.0f, &new_f));
-    }
-    if (visitor->Conditional((extensions & 2) != 0)) {
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->U32(Bits(9), Bits(12), Bits(16), Bits(32), 0, &new_large));
-    }
-    return visitor->EndExtensions();
-  }
-
-  uint32_t old_small;
-  float old_f;
-  uint32_t old_large;
-  uint64_t extensions;
-
-  // If extensions & 1
-  uint32_t new_small = 2;
-  float new_f = -2.0f;
-  // If extensions & 2
-  uint32_t new_large = 0;
-};
-
-TEST(FieldsTest, TestNewDecoderOldData) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  OldBundle old_bundle;
-  old_bundle.old_large = 123;
-  old_bundle.old_f = 3.75f;
-  old_bundle.extensions = 0;
-
-  // Write to bit stream
-  const size_t kMaxOutBytes = 999;
-  BitWriter writer{memory_manager};
-  // Make sure values are initialized by code under test.
-  size_t extension_bits = 12345;
-  size_t total_bits = 12345;
-  ASSERT_TRUE(Bundle::CanEncode(old_bundle, &extension_bits, &total_bits));
-  ASSERT_LE(total_bits, kMaxOutBytes * kBitsPerByte);
-  EXPECT_EQ(0u, extension_bits);
-  AuxOut aux_out;
-  ASSERT_TRUE(Bundle::Write(old_bundle, &writer, LayerType::Header, &aux_out));
-
-  ASSERT_TRUE(writer.WithMaxBits(kMaxOutBytes * kBitsPerByte - total_bits,
-                                 LayerType::Header, nullptr, [&] {
-                                   writer.Write(20, 0xA55A);  // sentinel
-                                   writer.ZeroPadToByte();
-                                   return true;
-                                 }));
-
-  Bytes bytes = writer.GetSpan();
-  ASSERT_LE(bytes.size(), kMaxOutBytes);
-  BitReader reader(bytes);
-  NewBundle new_bundle;
-  ASSERT_TRUE(Bundle::Read(&reader, &new_bundle));
-  EXPECT_EQ(reader.TotalBitsConsumed(),
-            aux_out.layer(LayerType::Header).total_bits);
-  EXPECT_EQ(reader.ReadBits(20), 0xA55Au);
-  EXPECT_TRUE(reader.Close());
-
-  // Old fields are the same in both
-  EXPECT_EQ(old_bundle.extensions, new_bundle.extensions);
-  EXPECT_EQ(old_bundle.old_small, new_bundle.old_small);
-  EXPECT_EQ(old_bundle.old_f, new_bundle.old_f);
-  EXPECT_EQ(old_bundle.old_large, new_bundle.old_large);
-  // New fields match their defaults
-  EXPECT_EQ(2u, new_bundle.new_small);
-  EXPECT_EQ(-2.0f, new_bundle.new_f);
-  EXPECT_EQ(0u, new_bundle.new_large);
-}
-
-TEST(FieldsTest, TestOldDecoderNewData) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  NewBundle new_bundle;
-  new_bundle.old_large = 123;
-  new_bundle.extensions = 3;
-  new_bundle.new_f = 999.0f;
-  new_bundle.new_large = 456;
-
-  // Write to bit stream
-  constexpr size_t kMaxOutBytes = 999;
-  BitWriter writer{memory_manager};
-  // Make sure values are initialized by code under test.
-  size_t extension_bits = 12345;
-  size_t total_bits = 12345;
-  ASSERT_TRUE(Bundle::CanEncode(new_bundle, &extension_bits, &total_bits));
-  EXPECT_NE(0u, extension_bits);
-  AuxOut aux_out;
-  ASSERT_TRUE(Bundle::Write(new_bundle, &writer, LayerType::Header, &aux_out));
-  ASSERT_LE(aux_out.layer(LayerType::Header).total_bits,
-            kMaxOutBytes * kBitsPerByte);
-
-  ASSERT_TRUE(writer.WithMaxBits(
-      kMaxOutBytes * kBitsPerByte - aux_out.layer(LayerType::Header).total_bits,
-      LayerType::Header, nullptr, [&] {
-        // Ensure Read skips the additional fields
-        writer.Write(20, 0xA55A);  // sentinel
-        writer.ZeroPadToByte();
-        return true;
-      }));
-
-  BitReader reader(writer.GetSpan());
-  OldBundle old_bundle;
-  ASSERT_TRUE(Bundle::Read(&reader, &old_bundle));
-  EXPECT_EQ(reader.TotalBitsConsumed(),
-            aux_out.layer(LayerType::Header).total_bits);
-  EXPECT_EQ(reader.ReadBits(20), 0xA55Au);
-  EXPECT_TRUE(reader.Close());
-
-  // Old fields are the same in both
-  EXPECT_EQ(new_bundle.extensions, old_bundle.extensions);
-  EXPECT_EQ(new_bundle.old_small, old_bundle.old_small);
-  EXPECT_EQ(new_bundle.old_f, old_bundle.old_f);
-  EXPECT_EQ(new_bundle.old_large, old_bundle.old_large);
-  // (Can't check new fields because old decoder doesn't know about them)
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/frame_dimensions.h b/third_party/jpeg-xl/lib/jxl/frame_dimensions.h
deleted file mode 100644
index f7493f88b2256..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/frame_dimensions.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_FRAME_DIMENSIONS_H_
-#define LIB_JXL_FRAME_DIMENSIONS_H_
-
-// FrameDimensions struct, block and group dimensions constants.
-
-#include <cstddef>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/rect.h"
-
-namespace jxl {
-// Some enums and typedefs used by more than one header file.
-
-// Block is the square grid of pixels to which an "energy compaction"
-// transformation (e.g. DCT) is applied. Each block has its own AC quantizer.
-constexpr size_t kBlockDim = 8;
-
-constexpr size_t kDCTBlockSize = kBlockDim * kBlockDim;
-
-constexpr size_t kGroupDim = 256;
-static_assert(kGroupDim % kBlockDim == 0,
-              "Group dim should be divisible by block dim");
-constexpr size_t kGroupDimInBlocks = kGroupDim / kBlockDim;
-
-// Dimensions of a frame, in pixels, and other derived dimensions.
-// Computed from FrameHeader.
-// TODO(veluca): add extra channels.
-struct FrameDimensions {
-  void Set(size_t xsize, size_t ysize, size_t group_size_shift,
-           size_t max_hshift, size_t max_vshift, bool modular_mode,
-           size_t upsampling) {
-    group_dim = (kGroupDim >> 1) << group_size_shift;
-    dc_group_dim = group_dim * kBlockDim;
-    xsize_upsampled = xsize;
-    ysize_upsampled = ysize;
-    this->xsize = DivCeil(xsize, upsampling);
-    this->ysize = DivCeil(ysize, upsampling);
-    xsize_blocks = DivCeil(this->xsize, kBlockDim << max_hshift) << max_hshift;
-    ysize_blocks = DivCeil(this->ysize, kBlockDim << max_vshift) << max_vshift;
-    xsize_padded = xsize_blocks * kBlockDim;
-    ysize_padded = ysize_blocks * kBlockDim;
-    if (modular_mode) {
-      // Modular mode doesn't have any padding.
-      xsize_padded = this->xsize;
-      ysize_padded = this->ysize;
-    }
-    xsize_upsampled_padded = xsize_padded * upsampling;
-    ysize_upsampled_padded = ysize_padded * upsampling;
-    xsize_groups = DivCeil(this->xsize, group_dim);
-    ysize_groups = DivCeil(this->ysize, group_dim);
-    xsize_dc_groups = DivCeil(xsize_blocks, group_dim);
-    ysize_dc_groups = DivCeil(ysize_blocks, group_dim);
-    num_groups = xsize_groups * ysize_groups;
-    num_dc_groups = xsize_dc_groups * ysize_dc_groups;
-  }
-
-  Rect GroupRect(size_t group_index) const {
-    const size_t gx = group_index % xsize_groups;
-    const size_t gy = group_index / xsize_groups;
-    const Rect rect(gx * group_dim, gy * group_dim, group_dim, group_dim, xsize,
-                    ysize);
-    return rect;
-  }
-
-  Rect BlockGroupRect(size_t group_index) const {
-    const size_t gx = group_index % xsize_groups;
-    const size_t gy = group_index / xsize_groups;
-    const Rect rect(gx * (group_dim >> 3), gy * (group_dim >> 3),
-                    group_dim >> 3, group_dim >> 3, xsize_blocks, ysize_blocks);
-    return rect;
-  }
-
-  Rect DCGroupRect(size_t group_index) const {
-    const size_t gx = group_index % xsize_dc_groups;
-    const size_t gy = group_index / xsize_dc_groups;
-    const Rect rect(gx * group_dim, gy * group_dim, group_dim, group_dim,
-                    xsize_blocks, ysize_blocks);
-    return rect;
-  }
-
-  // Image size without any upsampling, i.e. original_size / upsampling.
-  size_t xsize;
-  size_t ysize;
-  // Original image size.
-  size_t xsize_upsampled;
-  size_t ysize_upsampled;
-  // Image size after upsampling the padded image.
-  size_t xsize_upsampled_padded;
-  size_t ysize_upsampled_padded;
-  // Image size after padding to a multiple of kBlockDim (if VarDCT mode).
-  size_t xsize_padded;
-  size_t ysize_padded;
-  // Image size in kBlockDim blocks.
-  size_t xsize_blocks;
-  size_t ysize_blocks;
-  // Image size in number of groups.
-  size_t xsize_groups;
-  size_t ysize_groups;
-  // Image size in number of DC groups.
-  size_t xsize_dc_groups;
-  size_t ysize_dc_groups;
-  // Number of AC or DC groups.
-  size_t num_groups;
-  size_t num_dc_groups;
-  // Size of a group.
-  size_t group_dim;
-  size_t dc_group_dim;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_FRAME_DIMENSIONS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/frame_header.cc b/third_party/jpeg-xl/lib/jxl/frame_header.cc
deleted file mode 100644
index afb578a1a68b4..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/frame_header.cc
+++ /dev/null
@@ -1,506 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/frame_header.h"
-
-#if JXL_DEBUG_V_LEVEL >= 1
-#include <sstream>
-#include <string>
-#endif
-
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/common.h"  // kMaxNumPasses
-#include "lib/jxl/fields.h"
-#include "lib/jxl/pack_signed.h"
-
-namespace jxl {
-
-constexpr uint8_t YCbCrChromaSubsampling::kHShift[] = {0, 1, 1, 0};
-constexpr uint8_t YCbCrChromaSubsampling::kVShift[] = {0, 1, 0, 1};
-
-static Status VisitBlendMode(Visitor* JXL_RESTRICT visitor,
-                             BlendMode default_value, BlendMode* blend_mode) {
-  uint32_t encoded = static_cast<uint32_t>(*blend_mode);
-
-  JXL_QUIET_RETURN_IF_ERROR(visitor->U32(
-      Val(static_cast<uint32_t>(BlendMode::kReplace)),
-      Val(static_cast<uint32_t>(BlendMode::kAdd)),
-      Val(static_cast<uint32_t>(BlendMode::kBlend)), BitsOffset(2, 3),
-      static_cast<uint32_t>(default_value), &encoded));
-  if (encoded > static_cast<uint32_t>(BlendMode::kMul)) {
-    return JXL_FAILURE("Invalid blend_mode");
-  }
-  *blend_mode = static_cast<BlendMode>(encoded);
-  return true;
-}
-
-static Status VisitFrameType(Visitor* JXL_RESTRICT visitor,
-                             FrameType default_value, FrameType* frame_type) {
-  uint32_t encoded = static_cast<uint32_t>(*frame_type);
-
-  JXL_QUIET_RETURN_IF_ERROR(
-      visitor->U32(Val(static_cast<uint32_t>(FrameType::kRegularFrame)),
-                   Val(static_cast<uint32_t>(FrameType::kDCFrame)),
-                   Val(static_cast<uint32_t>(FrameType::kReferenceOnly)),
-                   Val(static_cast<uint32_t>(FrameType::kSkipProgressive)),
-                   static_cast<uint32_t>(default_value), &encoded));
-  *frame_type = static_cast<FrameType>(encoded);
-  return true;
-}
-
-BlendingInfo::BlendingInfo() { Bundle::Init(this); }
-
-Status BlendingInfo::VisitFields(Visitor* JXL_RESTRICT visitor) {
-  JXL_QUIET_RETURN_IF_ERROR(
-      VisitBlendMode(visitor, BlendMode::kReplace, &mode));
-  if (visitor->Conditional(nonserialized_num_extra_channels > 0 &&
-                           (mode == BlendMode::kBlend ||
-                            mode == BlendMode::kAlphaWeightedAdd))) {
-    // Up to 11 alpha channels for blending.
-    JXL_QUIET_RETURN_IF_ERROR(visitor->U32(
-        Val(0), Val(1), Val(2), BitsOffset(3, 3), 0, &alpha_channel));
-    if (visitor->IsReading() &&
-        alpha_channel >= nonserialized_num_extra_channels) {
-      return JXL_FAILURE("Invalid alpha channel for blending");
-    }
-  }
-  if (visitor->Conditional((nonserialized_num_extra_channels > 0 &&
-                            (mode == BlendMode::kBlend ||
-                             mode == BlendMode::kAlphaWeightedAdd)) ||
-                           mode == BlendMode::kMul)) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &clamp));
-  }
-  // 'old' frame for blending. Only necessary if this is not a full frame, or
-  // blending is not kReplace.
-  if (visitor->Conditional(mode != BlendMode::kReplace ||
-                           nonserialized_is_partial_frame)) {
-    JXL_QUIET_RETURN_IF_ERROR(
-        visitor->U32(Val(0), Val(1), Val(2), Val(3), 0, &source));
-  }
-  return true;
-}
-
-#if JXL_DEBUG_V_LEVEL >= 1
-std::string BlendingInfo::DebugString() const {
-  std::ostringstream os;
-  os << (mode == BlendMode::kReplace            ? "Replace"
-         : mode == BlendMode::kAdd              ? "Add"
-         : mode == BlendMode::kBlend            ? "Blend"
-         : mode == BlendMode::kAlphaWeightedAdd ? "AlphaWeightedAdd"
-                                                : "Mul");
-  if (nonserialized_num_extra_channels > 0 &&
-      (mode == BlendMode::kBlend || mode == BlendMode::kAlphaWeightedAdd)) {
-    os << ",alpha=" << alpha_channel << ",clamp=" << clamp;
-  } else if (mode == BlendMode::kMul) {
-    os << ",clamp=" << clamp;
-  }
-  if (mode != BlendMode::kReplace || nonserialized_is_partial_frame) {
-    os << ",source=" << source;
-  }
-  return os.str();
-}
-#endif
-
-AnimationFrame::AnimationFrame(const CodecMetadata* metadata)
-    : nonserialized_metadata(metadata) {
-  Bundle::Init(this);
-}
-Status AnimationFrame::VisitFields(Visitor* JXL_RESTRICT visitor) {
-  if (visitor->Conditional(nonserialized_metadata != nullptr &&
-                           nonserialized_metadata->m.have_animation)) {
-    JXL_QUIET_RETURN_IF_ERROR(
-        visitor->U32(Val(0), Val(1), Bits(8), Bits(32), 0, &duration));
-  }
-
-  if (visitor->Conditional(
-          nonserialized_metadata != nullptr &&
-          nonserialized_metadata->m.animation.have_timecodes)) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bits(32, 0, &timecode));
-  }
-  return true;
-}
-
-YCbCrChromaSubsampling::YCbCrChromaSubsampling() { Bundle::Init(this); }
-Passes::Passes() { Bundle::Init(this); }
-Status Passes::VisitFields(Visitor* JXL_RESTRICT visitor) {
-  JXL_QUIET_RETURN_IF_ERROR(
-      visitor->U32(Val(1), Val(2), Val(3), BitsOffset(3, 4), 1, &num_passes));
-  JXL_ENSURE(num_passes <= kMaxNumPasses);  // Cannot happen when reading
-
-  if (visitor->Conditional(num_passes != 1)) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->U32(
-        Val(0), Val(1), Val(2), BitsOffset(1, 3), 0, &num_downsample));
-    JXL_ENSURE(num_downsample <= 4);  // 1,2,4,8
-    if (num_downsample > num_passes) {
-      return JXL_FAILURE("num_downsample %u > num_passes %u", num_downsample,
-                         num_passes);
-    }
-
-    for (uint32_t i = 0; i < num_passes - 1; i++) {
-      JXL_QUIET_RETURN_IF_ERROR(visitor->Bits(2, 0, &shift[i]));
-    }
-    shift[num_passes - 1] = 0;
-
-    for (uint32_t i = 0; i < num_downsample; ++i) {
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->U32(Val(1), Val(2), Val(4), Val(8), 1, &downsample[i]));
-      if (i > 0 && downsample[i] >= downsample[i - 1]) {
-        return JXL_FAILURE("downsample sequence should be decreasing");
-      }
-    }
-    for (uint32_t i = 0; i < num_downsample; ++i) {
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->U32(Val(0), Val(1), Val(2), Bits(3), 0, &last_pass[i]));
-      if (i > 0 && last_pass[i] <= last_pass[i - 1]) {
-        return JXL_FAILURE("last_pass sequence should be increasing");
-      }
-      if (last_pass[i] >= num_passes) {
-        return JXL_FAILURE("last_pass %u >= num_passes %u", last_pass[i],
-                           num_passes);
-      }
-    }
-  }
-
-  return true;
-}
-
-#if JXL_DEBUG_V_LEVEL >= 1
-std::string Passes::DebugString() const {
-  std::ostringstream os;
-  os << "p=" << num_passes;
-  if (num_downsample) {
-    os << ",ds=";
-    for (uint32_t i = 0; i < num_downsample; ++i) {
-      os << last_pass[i] << ":" << downsample[i];
-      if (i + 1 < num_downsample) os << ";";
-    }
-  }
-  bool have_shifts = false;
-  for (uint32_t i = 0; i < num_passes; ++i) {
-    if (shift[i]) have_shifts = true;
-  }
-  if (have_shifts) {
-    os << ",shifts=";
-    for (uint32_t i = 0; i < num_passes; ++i) {
-      os << shift[i];
-      if (i + 1 < num_passes) os << ";";
-    }
-  }
-  return os.str();
-}
-#endif
-
-FrameHeader::FrameHeader(const CodecMetadata* metadata)
-    : animation_frame(metadata), nonserialized_metadata(metadata) {
-  Bundle::Init(this);
-}
-
-Status ReadFrameHeader(BitReader* JXL_RESTRICT reader,
-                       FrameHeader* JXL_RESTRICT frame) {
-  return Bundle::Read(reader, frame);
-}
-
-Status FrameHeader::VisitFields(Visitor* JXL_RESTRICT visitor) {
-  if (visitor->AllDefault(*this, &all_default)) {
-    // Overwrite all serialized fields, but not any nonserialized_*.
-    visitor->SetDefault(this);
-    return true;
-  }
-
-  JXL_QUIET_RETURN_IF_ERROR(
-      VisitFrameType(visitor, FrameType::kRegularFrame, &frame_type));
-  if (visitor->IsReading() && nonserialized_is_preview &&
-      frame_type != kRegularFrame) {
-    return JXL_FAILURE("Only regular frame could be a preview");
-  }
-
-  // FrameEncoding.
-  bool is_modular = (encoding == FrameEncoding::kModular);
-  JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &is_modular));
-  encoding = (is_modular ? FrameEncoding::kModular : FrameEncoding::kVarDCT);
-
-  // Flags
-  JXL_QUIET_RETURN_IF_ERROR(visitor->U64(0, &flags));
-
-  // Color transform
-  bool xyb_encoded = nonserialized_metadata == nullptr ||
-                     nonserialized_metadata->m.xyb_encoded;
-
-  if (xyb_encoded) {
-    color_transform = ColorTransform::kXYB;
-  } else {
-    // Alternate if kYCbCr.
-    bool alternate = color_transform == ColorTransform::kYCbCr;
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &alternate));
-    color_transform =
-        (alternate ? ColorTransform::kYCbCr : ColorTransform::kNone);
-  }
-
-  // Chroma subsampling for YCbCr, if no DC frame is used.
-  if (visitor->Conditional(color_transform == ColorTransform::kYCbCr &&
-                           ((flags & kUseDcFrame) == 0))) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&chroma_subsampling));
-  }
-
-  size_t num_extra_channels =
-      nonserialized_metadata != nullptr
-          ? nonserialized_metadata->m.extra_channel_info.size()
-          : 0;
-
-  // Upsampling
-  if (visitor->Conditional((flags & kUseDcFrame) == 0)) {
-    JXL_QUIET_RETURN_IF_ERROR(
-        visitor->U32(Val(1), Val(2), Val(4), Val(8), 1, &upsampling));
-    if (nonserialized_metadata != nullptr &&
-        visitor->Conditional(num_extra_channels != 0)) {
-      const std::vector<ExtraChannelInfo>& extra_channels =
-          nonserialized_metadata->m.extra_channel_info;
-      extra_channel_upsampling.resize(extra_channels.size(), 1);
-      for (size_t i = 0; i < extra_channels.size(); ++i) {
-        uint32_t dim_shift =
-            nonserialized_metadata->m.extra_channel_info[i].dim_shift;
-        uint32_t& ec_upsampling = extra_channel_upsampling[i];
-        ec_upsampling >>= dim_shift;
-        JXL_QUIET_RETURN_IF_ERROR(
-            visitor->U32(Val(1), Val(2), Val(4), Val(8), 1, &ec_upsampling));
-        ec_upsampling <<= dim_shift;
-        if (ec_upsampling < upsampling) {
-          return JXL_FAILURE(
-              "EC upsampling (%u) < color upsampling (%u), which is invalid.",
-              ec_upsampling, upsampling);
-        }
-        if (ec_upsampling > 8) {
-          return JXL_FAILURE("EC upsampling too large (%u)", ec_upsampling);
-        }
-      }
-    } else {
-      extra_channel_upsampling.clear();
-    }
-  }
-
-  // Modular- or VarDCT-specific data.
-  if (visitor->Conditional(encoding == FrameEncoding::kModular)) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bits(2, 1, &group_size_shift));
-  }
-  if (visitor->Conditional(encoding == FrameEncoding::kVarDCT &&
-                           color_transform == ColorTransform::kXYB)) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bits(3, 3, &x_qm_scale));
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bits(3, 2, &b_qm_scale));
-  } else {
-    x_qm_scale = b_qm_scale = 2;  // noop
-  }
-
-  // Not useful for kPatchSource
-  if (visitor->Conditional(frame_type != FrameType::kReferenceOnly)) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&passes));
-  }
-
-  if (visitor->Conditional(frame_type == FrameType::kDCFrame)) {
-    // Up to 4 pyramid levels - for up to 16384x downsampling.
-    JXL_QUIET_RETURN_IF_ERROR(
-        visitor->U32(Val(1), Val(2), Val(3), Val(4), 1, &dc_level));
-  }
-  if (frame_type != FrameType::kDCFrame) {
-    dc_level = 0;
-  }
-
-  bool is_partial_frame = false;
-  if (visitor->Conditional(frame_type != FrameType::kDCFrame)) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &custom_size_or_origin));
-    if (visitor->Conditional(custom_size_or_origin)) {
-      const U32Enc enc(Bits(8), BitsOffset(11, 256), BitsOffset(14, 2304),
-                       BitsOffset(30, 18688));
-      // Frame offset, only if kRegularFrame or kSkipProgressive.
-      if (visitor->Conditional(frame_type == FrameType::kRegularFrame ||
-                               frame_type == FrameType::kSkipProgressive)) {
-        uint32_t ux0 = PackSigned(frame_origin.x0);
-        uint32_t uy0 = PackSigned(frame_origin.y0);
-        JXL_QUIET_RETURN_IF_ERROR(visitor->U32(enc, 0, &ux0));
-        JXL_QUIET_RETURN_IF_ERROR(visitor->U32(enc, 0, &uy0));
-        frame_origin.x0 = UnpackSigned(ux0);
-        frame_origin.y0 = UnpackSigned(uy0);
-      }
-      // Frame size
-      JXL_QUIET_RETURN_IF_ERROR(visitor->U32(enc, 0, &frame_size.xsize));
-      JXL_QUIET_RETURN_IF_ERROR(visitor->U32(enc, 0, &frame_size.ysize));
-      if (custom_size_or_origin &&
-          (frame_size.xsize == 0 || frame_size.ysize == 0)) {
-        return JXL_FAILURE(
-            "Invalid crop dimensions for frame: zero width or height");
-      }
-      int32_t image_xsize = default_xsize();
-      int32_t image_ysize = default_ysize();
-      if (frame_type == FrameType::kRegularFrame ||
-          frame_type == FrameType::kSkipProgressive) {
-        is_partial_frame |= frame_origin.x0 > 0;
-        is_partial_frame |= frame_origin.y0 > 0;
-        is_partial_frame |= (static_cast<int32_t>(frame_size.xsize) +
-                             frame_origin.x0) < image_xsize;
-        is_partial_frame |= (static_cast<int32_t>(frame_size.ysize) +
-                             frame_origin.y0) < image_ysize;
-      }
-    }
-  }
-
-  // Blending info, animation info and whether this is the last frame or not.
-  if (visitor->Conditional(frame_type == FrameType::kRegularFrame ||
-                           frame_type == FrameType::kSkipProgressive)) {
-    blending_info.nonserialized_num_extra_channels = num_extra_channels;
-    blending_info.nonserialized_is_partial_frame = is_partial_frame;
-    JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&blending_info));
-    bool replace_all = (blending_info.mode == BlendMode::kReplace);
-    extra_channel_blending_info.resize(num_extra_channels);
-    for (size_t i = 0; i < num_extra_channels; i++) {
-      auto& ec_blending_info = extra_channel_blending_info[i];
-      ec_blending_info.nonserialized_is_partial_frame = is_partial_frame;
-      ec_blending_info.nonserialized_num_extra_channels = num_extra_channels;
-      JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&ec_blending_info));
-      replace_all &= (ec_blending_info.mode == BlendMode::kReplace);
-    }
-    if (visitor->IsReading() && nonserialized_is_preview) {
-      if (!replace_all || custom_size_or_origin) {
-        return JXL_FAILURE("Preview is not compatible with blending");
-      }
-    }
-    if (visitor->Conditional(nonserialized_metadata != nullptr &&
-                             nonserialized_metadata->m.have_animation)) {
-      animation_frame.nonserialized_metadata = nonserialized_metadata;
-      JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&animation_frame));
-    }
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(true, &is_last));
-  } else {
-    is_last = false;
-  }
-
-  // ID of that can be used to refer to this frame. 0 for a non-zero-duration
-  // frame means that it will not be referenced. Not necessary for the last
-  // frame.
-  if (visitor->Conditional(frame_type != kDCFrame && !is_last)) {
-    JXL_QUIET_RETURN_IF_ERROR(
-        visitor->U32(Val(0), Val(1), Val(2), Val(3), 0, &save_as_reference));
-  }
-
-  // If this frame is not blended on another frame post-color-transform, it may
-  // be stored for being referenced either before or after the color transform.
-  // If it is blended post-color-transform, it must be blended after. It must
-  // also be blended after if this is a kRegular frame that does not cover the
-  // full frame, as samples outside the partial region are from a
-  // post-color-transform frame.
-  if (frame_type != FrameType::kDCFrame) {
-    if (visitor->Conditional(CanBeReferenced() &&
-                             blending_info.mode == BlendMode::kReplace &&
-                             !is_partial_frame &&
-                             (frame_type == FrameType::kRegularFrame ||
-                              frame_type == FrameType::kSkipProgressive))) {
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->Bool(false, &save_before_color_transform));
-    } else if (visitor->Conditional(frame_type == FrameType::kReferenceOnly)) {
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->Bool(true, &save_before_color_transform));
-      size_t xsize = custom_size_or_origin ? frame_size.xsize
-                                           : nonserialized_metadata->xsize();
-      size_t ysize = custom_size_or_origin ? frame_size.ysize
-                                           : nonserialized_metadata->ysize();
-      if (!save_before_color_transform &&
-          (xsize < nonserialized_metadata->xsize() ||
-           ysize < nonserialized_metadata->ysize() || frame_origin.x0 != 0 ||
-           frame_origin.y0 != 0)) {
-        return JXL_FAILURE(
-            "non-patch reference frame with invalid crop: %" PRIuS "x%" PRIuS
-            "%+d%+d",
-            xsize, ysize, static_cast<int>(frame_origin.x0),
-            static_cast<int>(frame_origin.y0));
-      }
-    }
-  } else {
-    save_before_color_transform = true;
-  }
-
-  JXL_QUIET_RETURN_IF_ERROR(VisitNameString(visitor, &name));
-
-  loop_filter.nonserialized_is_modular = is_modular;
-  JXL_RETURN_IF_ERROR(visitor->VisitNested(&loop_filter));
-
-  JXL_QUIET_RETURN_IF_ERROR(visitor->BeginExtensions(&extensions));
-  // Extensions: in chronological order of being added to the format.
-  return visitor->EndExtensions();
-}
-
-#if JXL_DEBUG_V_LEVEL >= 1
-std::string FrameHeader::DebugString() const {
-  std::ostringstream os;
-  os << (encoding == FrameEncoding::kVarDCT ? "VarDCT" : "Modular");
-  os << ",";
-  os << (frame_type == FrameType::kRegularFrame    ? "Regular"
-         : frame_type == FrameType::kDCFrame       ? "DC"
-         : frame_type == FrameType::kReferenceOnly ? "Reference"
-                                                   : "SkipProgressive");
-  if (frame_type == FrameType::kDCFrame) {
-    os << "(lv" << dc_level << ")";
-  }
-
-  if (flags) {
-    os << ",";
-    uint32_t remaining = flags;
-
-#define TEST_FLAG(name)           \
-  if (flags & Flags::k##name) {   \
-    remaining &= ~Flags::k##name; \
-    os << #name;                  \
-    if (remaining) os << "|";     \
-  }
-    TEST_FLAG(Noise);
-    TEST_FLAG(Patches);
-    TEST_FLAG(Splines);
-    TEST_FLAG(UseDcFrame);
-    TEST_FLAG(SkipAdaptiveDCSmoothing);
-#undef TEST_FLAG
-  }
-
-  os << ",";
-  os << (color_transform == ColorTransform::kXYB     ? "XYB"
-         : color_transform == ColorTransform::kYCbCr ? "YCbCr"
-                                                     : "None");
-
-  if (encoding == FrameEncoding::kModular) {
-    os << ",shift=" << group_size_shift;
-  } else if (color_transform == ColorTransform::kXYB) {
-    os << ",qm=" << x_qm_scale << ";" << b_qm_scale;
-  }
-  if (frame_type != FrameType::kReferenceOnly) {
-    os << "," << passes.DebugString();
-  }
-  if (custom_size_or_origin) {
-    os << ",xs=" << frame_size.xsize;
-    os << ",ys=" << frame_size.ysize;
-    if (frame_type == FrameType::kRegularFrame ||
-        frame_type == FrameType::kSkipProgressive) {
-      os << ",x0=" << frame_origin.x0;
-      os << ",y0=" << frame_origin.y0;
-    }
-  }
-  if (upsampling > 1) os << ",up=" << upsampling;
-  if (loop_filter.gab) os << ",Gaborish";
-  if (loop_filter.epf_iters > 0) os << ",epf=" << loop_filter.epf_iters;
-  if (animation_frame.duration > 0) os << ",dur=" << animation_frame.duration;
-  if (frame_type == FrameType::kRegularFrame ||
-      frame_type == FrameType::kSkipProgressive) {
-    os << ",";
-    os << blending_info.DebugString();
-    for (size_t i = 0; i < extra_channel_blending_info.size(); ++i) {
-      os << (i == 0 ? "[" : ";");
-      os << extra_channel_blending_info[i].DebugString();
-      if (i + 1 == extra_channel_blending_info.size()) os << "]";
-    }
-  }
-  if (save_as_reference > 0) os << ",ref=" << save_as_reference;
-  os << "," << (save_before_color_transform ? "before" : "after") << "_ct";
-  if (is_last) os << ",last";
-  return os.str();
-}
-#endif
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/frame_header.h b/third_party/jpeg-xl/lib/jxl/frame_header.h
deleted file mode 100644
index d60a908350a17..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/frame_header.h
+++ /dev/null
@@ -1,508 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_FRAME_HEADER_H_
-#define LIB_JXL_FRAME_HEADER_H_
-
-// Frame header with backward and forward-compatible extension capability and
-// compressed integer fields.
-
-#include <algorithm>
-#include <array>
-#include <cstddef>
-#include <cstdint>
-#include <string>
-#include <vector>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/coeff_order_fwd.h"
-#include "lib/jxl/common.h"  // kMaxNumPasses
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/field_encodings.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/loop_filter.h"
-
-namespace jxl {
-
-// TODO(eustas): move to proper place?
-// Also used by extra channel names.
-static inline Status VisitNameString(Visitor* JXL_RESTRICT visitor,
-                                     std::string* name) {
-  uint32_t name_length = static_cast<uint32_t>(name->length());
-  // Allows layer name lengths up to 1071 bytes
-  JXL_QUIET_RETURN_IF_ERROR(visitor->U32(Val(0), Bits(4), BitsOffset(5, 16),
-                                         BitsOffset(10, 48), 0, &name_length));
-  if (visitor->IsReading()) {
-    name->resize(name_length);
-  }
-  for (size_t i = 0; i < name_length; i++) {
-    uint32_t c = static_cast<uint8_t>((*name)[i]);
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bits(8, 0, &c));
-    (*name)[i] = static_cast<char>(c);
-  }
-  return true;
-}
-
-enum class FrameEncoding : uint32_t {
-  kVarDCT,
-  kModular,
-};
-
-enum class ColorTransform : uint32_t {
-  kXYB,    // Values are encoded with XYB. May only be used if
-           // ImageBundle::xyb_encoded.
-  kNone,   // Values are encoded according to the attached color profile. May
-           // only be used if !ImageBundle::xyb_encoded.
-  kYCbCr,  // Values are encoded according to the attached color profile, but
-           // transformed to YCbCr. May only be used if
-           // !ImageBundle::xyb_encoded.
-};
-
-inline std::array<int, 3> JpegOrder(ColorTransform ct, bool is_gray) {
-  if (is_gray) {
-    return {{0, 0, 0}};
-  }
-  if (ct == ColorTransform::kYCbCr) {
-    return {{1, 0, 2}};
-  } else if (ct == ColorTransform::kNone) {
-    return {{0, 1, 2}};
-  } else {
-    JXL_DEBUG_ABORT("Internal logic error");
-    return {{0, 1, 2}};
-  }
-}
-
-struct YCbCrChromaSubsampling : public Fields {
-  YCbCrChromaSubsampling();
-  JXL_FIELDS_NAME(YCbCrChromaSubsampling)
-  size_t HShift(size_t c) const { return maxhs_ - kHShift[channel_mode_[c]]; }
-  size_t VShift(size_t c) const { return maxvs_ - kVShift[channel_mode_[c]]; }
-
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override {
-    // TODO(veluca): consider allowing 4x downsamples
-    for (uint32_t& ch : channel_mode_) {
-      JXL_QUIET_RETURN_IF_ERROR(visitor->Bits(2, 0, &ch));
-    }
-    Recompute();
-    return true;
-  }
-
-  uint8_t MaxHShift() const { return maxhs_; }
-  uint8_t MaxVShift() const { return maxvs_; }
-
-  uint8_t RawHShift(size_t c) const { return kHShift[channel_mode_[c]]; }
-  uint8_t RawVShift(size_t c) const { return kVShift[channel_mode_[c]]; }
-
-  // Uses JPEG channel order (Y, Cb, Cr).
-  Status Set(const uint8_t* hsample, const uint8_t* vsample) {
-    for (size_t c = 0; c < 3; c++) {
-      size_t cjpeg = c < 2 ? c ^ 1 : c;
-      size_t i = 0;
-      for (; i < 4; i++) {
-        if (1 << kHShift[i] == hsample[cjpeg] &&
-            1 << kVShift[i] == vsample[cjpeg]) {
-          channel_mode_[c] = i;
-          break;
-        }
-      }
-      if (i == 4) {
-        return JXL_FAILURE("Invalid subsample mode");
-      }
-    }
-    Recompute();
-    return true;
-  }
-
-  bool Is444() const {
-    return HShift(0) == 0 && VShift(0) == 0 &&  // Cb
-           HShift(2) == 0 && VShift(2) == 0 &&  // Cr
-           HShift(1) == 0 && VShift(1) == 0;    // Y
-  }
-
-  bool Is420() const {
-    return HShift(0) == 1 && VShift(0) == 1 &&  // Cb
-           HShift(2) == 1 && VShift(2) == 1 &&  // Cr
-           HShift(1) == 0 && VShift(1) == 0;    // Y
-  }
-
-  bool Is422() const {
-    return HShift(0) == 1 && VShift(0) == 0 &&  // Cb
-           HShift(2) == 1 && VShift(2) == 0 &&  // Cr
-           HShift(1) == 0 && VShift(1) == 0;    // Y
-  }
-
-  bool Is440() const {
-    return HShift(0) == 0 && VShift(0) == 1 &&  // Cb
-           HShift(2) == 0 && VShift(2) == 1 &&  // Cr
-           HShift(1) == 0 && VShift(1) == 0;    // Y
-  }
-
-  std::string DebugString() const {
-    if (Is444()) return "444";
-    if (Is420()) return "420";
-    if (Is422()) return "422";
-    if (Is440()) return "440";
-    return "cs" + std::to_string(channel_mode_[0]) +
-           std::to_string(channel_mode_[1]) + std::to_string(channel_mode_[2]);
-  }
-
- private:
-  void Recompute() {
-    maxhs_ = 0;
-    maxvs_ = 0;
-    for (uint32_t ch : channel_mode_) {
-      maxhs_ = std::max(maxhs_, kHShift[ch]);
-      maxvs_ = std::max(maxvs_, kVShift[ch]);
-    }
-  }
-  static const uint8_t kHShift[4];
-  static const uint8_t kVShift[4];
-  uint32_t channel_mode_[3];
-  uint8_t maxhs_;
-  uint8_t maxvs_;
-};
-
-// Indicates how to combine the current frame with a previously-saved one. Can
-// be independently controlled for color and extra channels. Formulas are
-// indicative and treat alpha as if it is in range 0.0-1.0. In descriptions
-// below, alpha channel is the extra channel of type alpha used for blending
-// according to the blend_channel, or fully opaque if there is no alpha channel.
-// The blending specified here is used for performing blending *after* color
-// transforms - in linear sRGB if blending a XYB-encoded frame on another
-// XYB-encoded frame, in sRGB if blending a frame with kColorSpace == kSRGB, or
-// in the original colorspace otherwise. Blending in XYB or YCbCr is done by
-// using patches.
-enum class BlendMode {
-  // The new values (in the crop) replace the old ones: sample = new
-  kReplace = 0,
-  // The new values (in the crop) get added to the old ones: sample = old + new
-  kAdd = 1,
-  // The new values (in the crop) replace the old ones if alpha>0:
-  // For the alpha channel that is used as source:
-  // alpha = old + new * (1 - old)
-  // For other channels if !alpha_associated:
-  // sample = ((1 - new_alpha) * old * old_alpha + new_alpha * new) / alpha
-  // For other channels if alpha_associated:
-  // sample = (1 - new_alpha) * old + new
-  // The alpha formula applies to the alpha used for the division in the other
-  // channels formula, and applies to the alpha channel itself if its
-  // blend_channel value matches itself.
-  kBlend = 2,
-  // The new values (in the crop) are added to the old ones if alpha>0:
-  // For the alpha channel that is used as source:
-  // sample = sample = old + new * (1 - old)
-  // For other channels: sample = old + alpha * new
-  kAlphaWeightedAdd = 3,
-  // The new values (in the crop) get multiplied by the old ones:
-  // sample = old * new
-  // The range of the new value matters for multiplication purposes, and its
-  // nominal range of 0..1 is computed the same way as this is done for the
-  // alpha values in kBlend and kAlphaWeightedAdd.
-  // If using kMul as a blend mode for color channels, no color transform is
-  // performed on the current frame.
-  kMul = 4,
-};
-
-struct BlendingInfo : public Fields {
-  BlendingInfo();
-  JXL_FIELDS_NAME(BlendingInfo)
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override;
-  BlendMode mode;
-  // Which extra channel to use as alpha channel for blending, only encoded
-  // for blend modes that involve alpha and if there are more than 1 extra
-  // channels.
-  uint32_t alpha_channel;
-  // Clamp alpha or channel values to 0-1 range.
-  bool clamp;
-  // Frame ID to copy from (0-3). Only encoded if blend_mode is not kReplace.
-  uint32_t source;
-
-  std::string DebugString() const;
-
-  size_t nonserialized_num_extra_channels = 0;
-  bool nonserialized_is_partial_frame = false;
-};
-
-// Origin of the current frame. Not present for frames of type
-// kOnlyPatches.
-struct FrameOrigin {
-  int32_t x0, y0;  // can be negative.
-};
-
-// Size of the current frame.
-struct FrameSize {
-  uint32_t xsize, ysize;
-};
-
-// AnimationFrame defines duration of animation frames.
-struct AnimationFrame : public Fields {
-  explicit AnimationFrame(const CodecMetadata* metadata);
-  JXL_FIELDS_NAME(AnimationFrame)
-
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override;
-
-  // How long to wait [in ticks, see Animation{}] after rendering.
-  // May be 0 if the current frame serves as a foundation for another frame.
-  uint32_t duration;
-
-  uint32_t timecode;  // 0xHHMMSSFF
-
-  // Must be set to the one ImageMetadata acting as the full codestream header,
-  // with correct xyb_encoded, list of extra channels, etc...
-  const CodecMetadata* nonserialized_metadata = nullptr;
-};
-
-// For decoding to lower resolutions. Only used for kRegular frames.
-struct Passes : public Fields {
-  Passes();
-  JXL_FIELDS_NAME(Passes)
-
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override;
-
-  void GetDownsamplingBracket(size_t pass, int& minShift, int& maxShift) const {
-    maxShift = 2;
-    minShift = 3;
-    for (size_t i = 0;; i++) {
-      for (uint32_t j = 0; j < num_downsample; ++j) {
-        if (i == last_pass[j]) {
-          if (downsample[j] == 8) minShift = 3;
-          if (downsample[j] == 4) minShift = 2;
-          if (downsample[j] == 2) minShift = 1;
-          if (downsample[j] == 1) minShift = 0;
-        }
-      }
-      if (i == num_passes - 1) minShift = 0;
-      if (i == pass) return;
-      maxShift = minShift - 1;
-    }
-  }
-
-  uint32_t GetDownsamplingTargetForCompletedPasses(uint32_t num_p) const {
-    if (num_p >= num_passes) return 1;
-    uint32_t retval = 8;
-    for (uint32_t i = 0; i < num_downsample; ++i) {
-      if (num_p > last_pass[i]) {
-        retval = std::min(retval, downsample[i]);
-      }
-    }
-    return retval;
-  }
-
-  std::string DebugString() const;
-
-  uint32_t num_passes;      // <= kMaxNumPasses
-  uint32_t num_downsample;  // <= num_passes
-
-  // Array of num_downsample pairs. downsample=1/last_pass=num_passes-1 and
-  // downsample=8/last_pass=0 need not be specified; they are implicit.
-  uint32_t downsample[kMaxNumPasses];
-  uint32_t last_pass[kMaxNumPasses];
-  // Array of shift values for each pass. It is implicitly assumed to be 0 for
-  // the last pass.
-  uint32_t shift[kMaxNumPasses];
-};
-
-enum FrameType {
-  // A "regular" frame: might be a crop, and will be blended on a previous
-  // frame, if any, and displayed or blended in future frames.
-  kRegularFrame = 0,
-  // A DC frame: this frame is downsampled and will be *only* used as the DC of
-  // a future frame and, possibly, for previews. Cannot be cropped, blended, or
-  // referenced by patches or blending modes. Frames that *use* a DC frame
-  // cannot have non-default sizes either.
-  kDCFrame = 1,
-  // A PatchesSource frame: this frame will be only used as a source frame for
-  // taking patches. Can be cropped, but cannot have non-(0, 0) x0 and y0.
-  kReferenceOnly = 2,
-  // Same as kRegularFrame, but not used for progressive rendering. This also
-  // implies no early display of DC.
-  kSkipProgressive = 3,
-};
-
-// Image/frame := one of more of these, where the last has is_last = true.
-// Starts at a byte-aligned address "a"; the next pass starts at "a + size".
-struct FrameHeader : public Fields {
-  // Optional postprocessing steps. These flags are the source of truth;
-  // Override must set/clear them rather than change their meaning. Values
-  // chosen such that typical flags == 0 (encoded in only two bits).
-  enum Flags {
-    // Often but not always off => low bit value:
-
-    // Inject noise into decoded output.
-    kNoise = 1,
-
-    // Overlay patches.
-    kPatches = 2,
-
-    // 4, 8 = reserved for future sometimes-off
-
-    // Overlay splines.
-    kSplines = 16,
-
-    kUseDcFrame = 32,  // Implies kSkipAdaptiveDCSmoothing.
-
-    // 64 = reserved for future often-off
-
-    // Almost always on => negated:
-
-    kSkipAdaptiveDCSmoothing = 128,
-  };
-
-  explicit FrameHeader(const CodecMetadata* metadata);
-  JXL_FIELDS_NAME(FrameHeader)
-
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override;
-
-  // Sets/clears `flag` based upon `condition`.
-  void UpdateFlag(const bool condition, const uint64_t flag) {
-    if (condition) {
-      flags |= flag;
-    } else {
-      flags &= ~flag;
-    }
-  }
-
-  // Returns true if this frame is supposed to be saved for future usage by
-  // other frames.
-  bool CanBeReferenced() const {
-    // DC frames cannot be referenced. The last frame cannot be referenced. A
-    // duration 0 frame makes little sense if it is not referenced. A
-    // non-duration 0 frame may or may not be referenced.
-    return !is_last && frame_type != FrameType::kDCFrame &&
-           (animation_frame.duration == 0 || save_as_reference != 0);
-  }
-
-  mutable bool all_default;
-
-  // Always present
-  FrameEncoding encoding;
-  // Some versions of UBSAN complain in VisitFrameType if not initialized.
-  FrameType frame_type = FrameType::kRegularFrame;
-
-  uint64_t flags;
-
-  ColorTransform color_transform;
-  YCbCrChromaSubsampling chroma_subsampling;
-
-  uint32_t group_size_shift;  // only if encoding == kModular;
-
-  uint32_t x_qm_scale;  // only if VarDCT and color_transform == kXYB
-  uint32_t b_qm_scale;  // only if VarDCT and color_transform == kXYB
-
-  std::string name;
-
-  // Skipped for kReferenceOnly.
-  Passes passes;
-
-  // Skipped for kDCFrame
-  bool custom_size_or_origin;
-  FrameSize frame_size;
-
-  // upsampling factors for color and extra channels.
-  // Upsampling is always performed before applying any inverse color transform.
-  // Skipped (1) if kUseDCFrame
-  uint32_t upsampling;
-  std::vector<uint32_t> extra_channel_upsampling;
-
-  // Only for kRegular frames.
-  FrameOrigin frame_origin;
-
-  BlendingInfo blending_info;
-  std::vector<BlendingInfo> extra_channel_blending_info;
-
-  // Animation info for this frame.
-  AnimationFrame animation_frame;
-
-  // This is the last frame.
-  bool is_last;
-
-  // ID to refer to this frame with. 0-3, not present if kDCFrame.
-  // 0 has a special meaning for kRegular frames of nonzero duration: it defines
-  // a frame that will not be referenced in the future.
-  uint32_t save_as_reference;
-
-  // Whether to save this frame before or after the color transform. A frame
-  // that is saved before the color transform can only be used for blending
-  // through patches. On the contrary, a frame that is saved after the color
-  // transform can only be used for blending through blending modes.
-  // Irrelevant for extra channel blending. Can only be true if
-  // blending_info.mode == kReplace and this is not a partial kRegularFrame; if
-  // this is a DC frame, it is always true.
-  bool save_before_color_transform;
-
-  uint32_t dc_level;  // 1-4 if kDCFrame (0 otherwise).
-
-  // Must be set to the one ImageMetadata acting as the full codestream header,
-  // with correct xyb_encoded, list of extra channels, etc...
-  const CodecMetadata* nonserialized_metadata = nullptr;
-
-  // NOTE: This is ignored by AllDefault.
-  LoopFilter loop_filter;
-
-  bool nonserialized_is_preview = false;
-
-  size_t default_xsize() const {
-    if (!nonserialized_metadata) return 0;
-    if (nonserialized_is_preview) {
-      return nonserialized_metadata->m.preview_size.xsize();
-    }
-    return nonserialized_metadata->xsize();
-  }
-
-  size_t default_ysize() const {
-    if (!nonserialized_metadata) return 0;
-    if (nonserialized_is_preview) {
-      return nonserialized_metadata->m.preview_size.ysize();
-    }
-    return nonserialized_metadata->ysize();
-  }
-
-  FrameDimensions ToFrameDimensions() const {
-    size_t xsize = default_xsize();
-    size_t ysize = default_ysize();
-
-    xsize = frame_size.xsize ? frame_size.xsize : xsize;
-    ysize = frame_size.ysize ? frame_size.ysize : ysize;
-
-    if (dc_level != 0) {
-      xsize = DivCeil(xsize, 1 << (3 * dc_level));
-      ysize = DivCeil(ysize, 1 << (3 * dc_level));
-    }
-
-    FrameDimensions frame_dim;
-    frame_dim.Set(xsize, ysize, group_size_shift,
-                  chroma_subsampling.MaxHShift(),
-                  chroma_subsampling.MaxVShift(),
-                  encoding == FrameEncoding::kModular, upsampling);
-    return frame_dim;
-  }
-
-  // True if a color transform should be applied to this frame.
-  bool needs_color_transform() const {
-    return !save_before_color_transform ||
-           frame_type == FrameType::kRegularFrame ||
-           frame_type == FrameType::kSkipProgressive;
-  }
-
-  std::string DebugString() const;
-
-  uint64_t extensions;
-};
-
-Status ReadFrameHeader(BitReader* JXL_RESTRICT reader,
-                       FrameHeader* JXL_RESTRICT frame);
-
-// Shared by enc/dec. 5F and 13 are by far the most common for d1/2/4/8, 0
-// ensures low overhead for small images.
-static constexpr U32Enc kOrderEnc =
-    U32Enc(Val(0x5F), Val(0x13), Val(0), Bits(kNumOrders));
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_FRAME_HEADER_H_
diff --git a/third_party/jpeg-xl/lib/jxl/fuzztest.h b/third_party/jpeg-xl/lib/jxl/fuzztest.h
deleted file mode 100644
index 870ecf1b140dd..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/fuzztest.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_FUZZTEST_H_
-#define LIB_JXL_FUZZTEST_H_
-
-#include "lib/jxl/base/compiler_specific.h"
-
-#if !defined(FUZZ_TEST)
-struct FuzzTestSink {
-  template <typename F>
-  FuzzTestSink WithSeeds(F /*f*/) {
-    return *this;
-  }
-};
-#define FUZZ_TEST(A, B) \
-  const JXL_MAYBE_UNUSED FuzzTestSink unused##A##B = FuzzTestSink()
-#endif
-
-#endif  // LIB_JXL_FUZZTEST_H_
diff --git a/third_party/jpeg-xl/lib/jxl/gamma_correct_test.cc b/third_party/jpeg-xl/lib/jxl/gamma_correct_test.cc
deleted file mode 100644
index 131ec4fa83d50..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/gamma_correct_test.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <stdlib.h>
-
-#include <algorithm>
-
-#include "lib/jxl/enc_gamma_correct.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-TEST(GammaCorrectTest, TestLinearToSrgbEdgeCases) {
-  EXPECT_EQ(0, LinearToSrgb8Direct(0.0));
-  EXPECT_NEAR(0, LinearToSrgb8Direct(1E-6f), 2E-5);
-  EXPECT_EQ(0, LinearToSrgb8Direct(-1E-6f));
-  EXPECT_EQ(0, LinearToSrgb8Direct(-1E6));
-  EXPECT_NEAR(1, LinearToSrgb8Direct(1 - 1E-6f), 1E-5);
-  EXPECT_EQ(1, LinearToSrgb8Direct(1 + 1E-6f));
-  EXPECT_EQ(1, LinearToSrgb8Direct(1E6));
-}
-
-TEST(GammaCorrectTest, TestRoundTrip) {
-  // NOLINTNEXTLINE(clang-analyzer-security.FloatLoopCounter)
-  for (double linear = 0.0; linear <= 1.0; linear += 1E-7) {
-    const double srgb = LinearToSrgb8Direct(linear);
-    const double linear2 = Srgb8ToLinearDirect(srgb);
-    ASSERT_LT(std::abs(linear - linear2), 2E-13)
-        << "linear = " << linear << ", linear2 = " << linear2;
-  }
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/gradient_test.cc b/third_party/jpeg-xl/lib/jxl/gradient_test.cc
deleted file mode 100644
index f1be2ac6dca0b..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/gradient_test.cc
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/cms.h>
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/codec_in_out.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/common.h"  // SpeedTier
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-
-struct AuxOut;
-
-namespace {
-
-// Returns distance of point p to line p0..p1, the result is signed and is not
-// normalized.
-double PointLineDist(double x0, double y0, double x1, double y1, double x,
-                     double y) {
-  return (y1 - y0) * x - (x1 - x0) * y + x1 * y0 - y1 * x0;
-}
-
-// Generates a test image with a gradient from one color to another.
-// Angle in degrees, colors can be given in hex as 0xRRGGBB. The angle is the
-// angle in which the change direction happens.
-Image3F GenerateTestGradient(uint32_t color0, uint32_t color1, double angle,
-                             size_t xsize, size_t ysize) {
-  JXL_TEST_ASSIGN_OR_DIE(
-      Image3F image, Image3F::Create(jxl::test::MemoryManager(), xsize, ysize));
-
-  double x0 = xsize / 2.0;
-  double y0 = ysize / 2.0;
-  double x1 = x0 + std::sin(angle / 360.0 * 2.0 * kPi);
-  double y1 = y0 + std::cos(angle / 360.0 * 2.0 * kPi);
-
-  double maxdist =
-      std::max<double>(fabs(PointLineDist(x0, y0, x1, y1, 0, 0)),
-                       fabs(PointLineDist(x0, y0, x1, y1, xsize, 0)));
-
-  for (size_t c = 0; c < 3; ++c) {
-    float c0 = ((color0 >> (8 * (2 - c))) & 255);
-    float c1 = ((color1 >> (8 * (2 - c))) & 255);
-    for (size_t y = 0; y < ysize; ++y) {
-      float* row = image.PlaneRow(c, y);
-      for (size_t x = 0; x < xsize; ++x) {
-        double dist = PointLineDist(x0, y0, x1, y1, x, y);
-        double v = ((dist / maxdist) + 1.0) / 2.0;
-        float color = c0 * (1.0 - v) + c1 * v;
-        row[x] = color;
-      }
-    }
-  }
-
-  return image;
-}
-
-// Computes the max of the horizontal and vertical second derivative for each
-// pixel, where second derivative means absolute value of difference of left
-// delta and right delta (top/bottom for vertical direction).
-// The radius over which the derivative is computed is only 1 pixel and it only
-// checks two angles (hor and ver), but this approximation works well enough.
-Image3F Gradient2(const Image3F& image) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  size_t xsize = image.xsize();
-  size_t ysize = image.ysize();
-  JXL_TEST_ASSIGN_OR_DIE(Image3F image2,
-                         Image3F::Create(memory_manager, xsize, ysize));
-  for (size_t c = 0; c < 3; ++c) {
-    for (size_t y = 1; y + 1 < ysize; y++) {
-      const auto* JXL_RESTRICT row0 = image.ConstPlaneRow(c, y - 1);
-      const auto* JXL_RESTRICT row1 = image.ConstPlaneRow(c, y);
-      const auto* JXL_RESTRICT row2 = image.ConstPlaneRow(c, y + 1);
-      auto* row_out = image2.PlaneRow(c, y);
-      for (size_t x = 1; x + 1 < xsize; x++) {
-        float ddx = (row1[x] - row1[x - 1]) - (row1[x + 1] - row1[x]);
-        float ddy = (row1[x] - row0[x]) - (row2[x] - row1[x]);
-        row_out[x] = std::max(fabsf(ddx), fabsf(ddy));
-      }
-    }
-    // Copy to the borders
-    if (ysize > 2) {
-      auto* JXL_RESTRICT row0 = image2.PlaneRow(c, 0);
-      const auto* JXL_RESTRICT row1 = image2.PlaneRow(c, 1);
-      const auto* JXL_RESTRICT row2 = image2.PlaneRow(c, ysize - 2);
-      auto* JXL_RESTRICT row3 = image2.PlaneRow(c, ysize - 1);
-      for (size_t x = 1; x + 1 < xsize; x++) {
-        row0[x] = row1[x];
-        row3[x] = row2[x];
-      }
-    } else {
-      const auto* row0_in = image.ConstPlaneRow(c, 0);
-      const auto* row1_in = image.ConstPlaneRow(c, ysize - 1);
-      auto* row0_out = image2.PlaneRow(c, 0);
-      auto* row1_out = image2.PlaneRow(c, ysize - 1);
-      for (size_t x = 1; x + 1 < xsize; x++) {
-        // Image too narrow, take first derivative instead
-        row0_out[x] = row1_out[x] = fabsf(row0_in[x] - row1_in[x]);
-      }
-    }
-    if (xsize > 2) {
-      for (size_t y = 0; y < ysize; y++) {
-        auto* row = image2.PlaneRow(c, y);
-        row[0] = row[1];
-        row[xsize - 1] = row[xsize - 2];
-      }
-    } else {
-      for (size_t y = 0; y < ysize; y++) {
-        const auto* JXL_RESTRICT row_in = image.ConstPlaneRow(c, y);
-        auto* row_out = image2.PlaneRow(c, y);
-        // Image too narrow, take first derivative instead
-        row_out[0] = row_out[xsize - 1] = fabsf(row_in[0] - row_in[xsize - 1]);
-      }
-    }
-  }
-  return image2;
-}
-
-/*
-Tests if roundtrip with jxl on a gradient image doesn't cause banding.
-Only tests if use_gradient is true. Set to false for debugging to see the
-distance values.
-Angle in degrees, colors can be given in hex as 0xRRGGBB.
-*/
-void TestGradient(ThreadPool* pool, uint32_t color0, uint32_t color1,
-                  size_t xsize, size_t ysize, float angle, bool fast_mode,
-                  float butteraugli_distance, bool use_gradient = true) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  CompressParams cparams;
-  cparams.butteraugli_distance = butteraugli_distance;
-  if (fast_mode) {
-    cparams.speed_tier = SpeedTier::kSquirrel;
-  }
-  Image3F gradient = GenerateTestGradient(color0, color1, angle, xsize, ysize);
-
-  CodecInOut io{memory_manager};
-  io.metadata.m.SetUintSamples(8);
-  io.metadata.m.color_encoding = ColorEncoding::SRGB();
-  ASSERT_TRUE(
-      io.SetFromImage(std::move(gradient), io.metadata.m.color_encoding));
-
-  CodecInOut io2{memory_manager};
-
-  std::vector<uint8_t> compressed;
-  EXPECT_TRUE(test::EncodeFile(cparams, &io, &compressed, pool));
-  EXPECT_TRUE(test::DecodeFile({}, Bytes(compressed), &io2, pool));
-  EXPECT_TRUE(io2.Main().TransformTo(io2.metadata.m.color_encoding,
-                                     *JxlGetDefaultCms(), pool));
-
-  if (use_gradient) {
-    // Test that the gradient map worked. For that, we take a second derivative
-    // of the image with Gradient2 to measure how linear the change is in x and
-    // y direction. For a well handled gradient, we expect max values around
-    // 0.1, while if there is noticeable banding, which means the gradient map
-    // failed, the values are around 0.5-1.0 (regardless of
-    // butteraugli_distance).
-    Image3F gradient2 = Gradient2(*io2.Main().color());
-
-    // TODO(jyrki): These values used to work with 0.2, 0.2, 0.2.
-    float image_min;
-    float image_max;
-    ImageMinMax(gradient2.Plane(0), &image_min, &image_max);
-    EXPECT_LE(image_max, 3.15);
-    ImageMinMax(gradient2.Plane(1), &image_min, &image_max);
-    EXPECT_LE(image_max, 1.72);
-    ImageMinMax(gradient2.Plane(2), &image_min, &image_max);
-    EXPECT_LE(image_max, 5.05);
-  }
-}
-
-constexpr bool fast_mode = true;
-
-TEST(GradientTest, SteepGradient) {
-  test::ThreadPoolForTests pool(8);
-  // Relatively steep gradients, colors from the sky of stp.png
-  TestGradient(pool.get(), 0xd99d58, 0x889ab1, 512, 512, 90, fast_mode, 3.0);
-}
-
-TEST(GradientTest, SubtleGradient) {
-  test::ThreadPoolForTests pool(8);
-  // Very subtle gradient
-  TestGradient(pool.get(), 0xb89b7b, 0xa89b8d, 512, 512, 90, fast_mode, 4.0);
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/headers.cc b/third_party/jpeg-xl/lib/jxl/headers.cc
deleted file mode 100644
index e6ac044c5cc3e..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/headers.cc
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/headers.h"
-
-#include <cstdint>
-#include <limits>
-
-#include "lib/jxl/fields.h"
-#include "lib/jxl/frame_dimensions.h"
-
-namespace jxl {
-namespace {
-
-struct Rational {
-  constexpr explicit Rational(uint32_t num, uint32_t den)
-      : num(num), den(den) {}
-
-  // Returns floor(multiplicand * rational).
-  constexpr uint32_t MulTruncate(uint32_t multiplicand) const {
-    return static_cast<uint64_t>(multiplicand) * num / den;
-  }
-
-  uint32_t num;
-  uint32_t den;
-};
-
-Rational FixedAspectRatios(uint32_t ratio) {
-  JXL_DASSERT(0 != ratio && ratio < 8);
-  // Other candidates: 5/4, 7/5, 14/9, 16/10, 5/3, 21/9, 12/5
-  constexpr Rational kRatios[7] = {Rational(1, 1),    // square
-                                   Rational(12, 10),  //
-                                   Rational(4, 3),    // camera
-                                   Rational(3, 2),    // mobile camera
-                                   Rational(16, 9),   // camera/display
-                                   Rational(5, 4),    //
-                                   Rational(2, 1)};   //
-  return kRatios[ratio - 1];
-}
-
-uint32_t FindAspectRatio(uint32_t xsize, uint32_t ysize) {
-  for (uint32_t r = 1; r < 8; ++r) {
-    if (xsize == FixedAspectRatios(r).MulTruncate(ysize)) {
-      return r;
-    }
-  }
-  return 0;  // Must send xsize instead
-}
-
-}  // namespace
-
-size_t SizeHeader::xsize() const {
-  if (ratio_ != 0) {
-    return FixedAspectRatios(ratio_).MulTruncate(
-        static_cast<uint32_t>(ysize()));
-  }
-  return small_ ? ((xsize_div8_minus_1_ + 1) * 8) : xsize_;
-}
-
-Status SizeHeader::Set(size_t xsize64, size_t ysize64) {
-  constexpr size_t kDimensionCap = std::numeric_limits<uint32_t>::max();
-  if (xsize64 > kDimensionCap || ysize64 > kDimensionCap) {
-    return JXL_FAILURE("Image too large");
-  }
-  const uint32_t xsize32 = static_cast<uint32_t>(xsize64);
-  const uint32_t ysize32 = static_cast<uint32_t>(ysize64);
-  if (xsize64 == 0 || ysize64 == 0) return JXL_FAILURE("Empty image");
-  ratio_ = FindAspectRatio(xsize32, ysize32);
-  small_ = ysize64 <= 256 && (ysize64 % kBlockDim) == 0 &&
-           (ratio_ != 0 || (xsize64 <= 256 && (xsize64 % kBlockDim) == 0));
-  if (small_) {
-    ysize_div8_minus_1_ = ysize32 / 8 - 1;
-  } else {
-    ysize_ = ysize32;
-  }
-
-  if (ratio_ == 0) {
-    if (small_) {
-      xsize_div8_minus_1_ = xsize32 / 8 - 1;
-    } else {
-      xsize_ = xsize32;
-    }
-  }
-  JXL_ENSURE(xsize() == xsize64);
-  JXL_ENSURE(ysize() == ysize64);
-  return true;
-}
-
-Status PreviewHeader::Set(size_t xsize64, size_t ysize64) {
-  const uint32_t xsize32 = static_cast<uint32_t>(xsize64);
-  const uint32_t ysize32 = static_cast<uint32_t>(ysize64);
-  if (xsize64 == 0 || ysize64 == 0) return JXL_FAILURE("Empty preview");
-  div8_ = (xsize64 % kBlockDim) == 0 && (ysize64 % kBlockDim) == 0;
-  if (div8_) {
-    ysize_div8_ = ysize32 / 8;
-  } else {
-    ysize_ = ysize32;
-  }
-
-  ratio_ = FindAspectRatio(xsize32, ysize32);
-  if (ratio_ == 0) {
-    if (div8_) {
-      xsize_div8_ = xsize32 / 8;
-    } else {
-      xsize_ = xsize32;
-    }
-  }
-  JXL_ENSURE(xsize() == xsize64);
-  JXL_ENSURE(ysize() == ysize64);
-  return true;
-}
-
-size_t PreviewHeader::xsize() const {
-  if (ratio_ != 0) {
-    return FixedAspectRatios(ratio_).MulTruncate(
-        static_cast<uint32_t>(ysize()));
-  }
-  return div8_ ? (xsize_div8_ * 8) : xsize_;
-}
-
-SizeHeader::SizeHeader() { Bundle::Init(this); }
-Status SizeHeader::VisitFields(Visitor* JXL_RESTRICT visitor) {
-  JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &small_));
-
-  if (visitor->Conditional(small_)) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bits(5, 0, &ysize_div8_minus_1_));
-  }
-  if (visitor->Conditional(!small_)) {
-    // (Could still be small, but non-multiple of 8.)
-    JXL_QUIET_RETURN_IF_ERROR(visitor->U32(BitsOffset(9, 1), BitsOffset(13, 1),
-                                           BitsOffset(18, 1), BitsOffset(30, 1),
-                                           1, &ysize_));
-  }
-
-  JXL_QUIET_RETURN_IF_ERROR(visitor->Bits(3, 0, &ratio_));
-  if (visitor->Conditional(ratio_ == 0 && small_)) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bits(5, 0, &xsize_div8_minus_1_));
-  }
-  if (visitor->Conditional(ratio_ == 0 && !small_)) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->U32(BitsOffset(9, 1), BitsOffset(13, 1),
-                                           BitsOffset(18, 1), BitsOffset(30, 1),
-                                           1, &xsize_));
-  }
-
-  return true;
-}
-
-PreviewHeader::PreviewHeader() { Bundle::Init(this); }
-Status PreviewHeader::VisitFields(Visitor* JXL_RESTRICT visitor) {
-  JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &div8_));
-
-  if (visitor->Conditional(div8_)) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->U32(Val(16), Val(32), BitsOffset(5, 1),
-                                           BitsOffset(9, 33), 1, &ysize_div8_));
-  }
-  if (visitor->Conditional(!div8_)) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->U32(BitsOffset(6, 1), BitsOffset(8, 65),
-                                           BitsOffset(10, 321),
-                                           BitsOffset(12, 1345), 1, &ysize_));
-  }
-
-  JXL_QUIET_RETURN_IF_ERROR(visitor->Bits(3, 0, &ratio_));
-  if (visitor->Conditional(ratio_ == 0 && div8_)) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->U32(Val(16), Val(32), BitsOffset(5, 1),
-                                           BitsOffset(9, 33), 1, &xsize_div8_));
-  }
-  if (visitor->Conditional(ratio_ == 0 && !div8_)) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->U32(BitsOffset(6, 1), BitsOffset(8, 65),
-                                           BitsOffset(10, 321),
-                                           BitsOffset(12, 1345), 1, &xsize_));
-  }
-
-  return true;
-}
-
-AnimationHeader::AnimationHeader() { Bundle::Init(this); }
-Status AnimationHeader::VisitFields(Visitor* JXL_RESTRICT visitor) {
-  JXL_QUIET_RETURN_IF_ERROR(visitor->U32(Val(100), Val(1000), BitsOffset(10, 1),
-                                         BitsOffset(30, 1), 1, &tps_numerator));
-  JXL_QUIET_RETURN_IF_ERROR(visitor->U32(Val(1), Val(1001), BitsOffset(8, 1),
-                                         BitsOffset(10, 1), 1,
-                                         &tps_denominator));
-
-  JXL_QUIET_RETURN_IF_ERROR(
-      visitor->U32(Val(0), Bits(3), Bits(16), Bits(32), 0, &num_loops));
-
-  JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &have_timecodes));
-  return true;
-}
-
-Status ReadSizeHeader(BitReader* JXL_RESTRICT reader,
-                      SizeHeader* JXL_RESTRICT size) {
-  return Bundle::Read(reader, size);
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/headers.h b/third_party/jpeg-xl/lib/jxl/headers.h
deleted file mode 100644
index 3cce84dabcd6c..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/headers.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_HEADERS_H_
-#define LIB_JXL_HEADERS_H_
-
-// Codestream headers.
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/field_encodings.h"
-
-namespace jxl {
-
-// Reserved by ISO/IEC 10918-1. LF causes files opened in text mode to be
-// rejected because the marker changes to 0x0D instead. The 0xFF prefix also
-// ensures there were no 7-bit transmission limitations.
-static constexpr uint8_t kCodestreamMarker = 0x0A;
-
-// Compact representation of image dimensions (best case: 9 bits) so decoders
-// can preallocate early.
-class SizeHeader : public Fields {
- public:
-  SizeHeader();
-  JXL_FIELDS_NAME(SizeHeader)
-
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override;
-
-  Status Set(size_t xsize, size_t ysize);
-
-  size_t xsize() const;
-  size_t ysize() const {
-    return small_ ? ((ysize_div8_minus_1_ + 1) * 8) : ysize_;
-  }
-
- private:
-  bool small_;  // xsize and ysize <= 256 and divisible by 8.
-
-  uint32_t ysize_div8_minus_1_;
-  uint32_t ysize_;
-
-  uint32_t ratio_;
-  uint32_t xsize_div8_minus_1_;
-  uint32_t xsize_;
-};
-
-// (Similar to SizeHeader but different encoding because previews are smaller)
-class PreviewHeader : public Fields {
- public:
-  PreviewHeader();
-  JXL_FIELDS_NAME(PreviewHeader)
-
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override;
-
-  Status Set(size_t xsize, size_t ysize);
-
-  size_t xsize() const;
-  size_t ysize() const { return div8_ ? (ysize_div8_ * 8) : ysize_; }
-
- private:
-  bool div8_;  // xsize and ysize divisible by 8.
-
-  uint32_t ysize_div8_;
-  uint32_t ysize_;
-
-  uint32_t ratio_;
-  uint32_t xsize_div8_;
-  uint32_t xsize_;
-};
-
-struct AnimationHeader : public Fields {
-  AnimationHeader();
-  JXL_FIELDS_NAME(AnimationHeader)
-
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override;
-
-  // Ticks per second (expressed as rational number to support NTSC)
-  uint32_t tps_numerator;
-  uint32_t tps_denominator;
-
-  uint32_t num_loops;  // 0 means to repeat infinitely.
-
-  bool have_timecodes;
-};
-
-Status ReadSizeHeader(BitReader* JXL_RESTRICT reader,
-                      SizeHeader* JXL_RESTRICT size);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_HEADERS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/huffman_table.cc b/third_party/jpeg-xl/lib/jxl/huffman_table.cc
deleted file mode 100644
index 9ae7865af62c5..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/huffman_table.cc
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/huffman_table.h"
-
-#include <cstring> /* for memcpy */
-#include <vector>
-
-#include "lib/jxl/ans_params.h"
-#include "lib/jxl/dec_huffman.h"
-
-namespace jxl {
-
-/* Returns reverse(reverse(key, len) + 1, len), where reverse(key, len) is the
-   bit-wise reversal of the len least significant bits of key. */
-static inline int GetNextKey(int key, int len) {
-  int step = 1u << (len - 1);
-  while (key & step) {
-    step >>= 1;
-  }
-  return (key & (step - 1)) + step;
-}
-
-/* Stores code in table[0], table[step], table[2*step], ..., table[end] */
-/* Assumes that end is an integer multiple of step */
-static inline void ReplicateValue(HuffmanCode* table, int step, int end,
-                                  HuffmanCode code) {
-  do {
-    end -= step;
-    table[end] = code;
-  } while (end > 0);
-}
-
-/* Returns the table width of the next 2nd level table. count is the histogram
-   of bit lengths for the remaining symbols, len is the code length of the next
-   processed symbol */
-static inline size_t NextTableBitSize(const uint16_t* const count, size_t len,
-                                      int root_bits) {
-  size_t left = 1u << (len - root_bits);
-  while (len < PREFIX_MAX_BITS) {
-    if (left <= count[len]) break;
-    left -= count[len];
-    ++len;
-    left <<= 1;
-  }
-  return len - root_bits;
-}
-
-uint32_t BuildHuffmanTable(HuffmanCode* root_table, int root_bits,
-                           const uint8_t* const code_lengths,
-                           size_t code_lengths_size, uint16_t* count) {
-  HuffmanCode code;   /* current table entry */
-  HuffmanCode* table; /* next available space in table */
-  size_t len;         /* current code length */
-  size_t symbol;      /* symbol index in original or sorted table */
-  int key;            /* reversed prefix code */
-  int step;           /* step size to replicate values in current table */
-  int low;            /* low bits for current root entry */
-  int mask;           /* mask for low bits */
-  size_t table_bits;  /* key length of current table */
-  int table_size;     /* size of current table */
-  int total_size;     /* sum of root table size and 2nd level table sizes */
-  /* offsets in sorted table for each length */
-  uint16_t offset[PREFIX_MAX_BITS + 1];
-  size_t max_length = 1;
-
-  if (code_lengths_size > 1u << PREFIX_MAX_BITS) return 0;
-
-  /* symbols sorted by code length */
-  std::vector<uint16_t> sorted_storage(code_lengths_size);
-  uint16_t* sorted = sorted_storage.data();
-
-  /* generate offsets into sorted symbol table by code length */
-  {
-    uint16_t sum = 0;
-    for (len = 1; len <= PREFIX_MAX_BITS; len++) {
-      offset[len] = sum;
-      if (count[len]) {
-        sum = static_cast<uint16_t>(sum + count[len]);
-        max_length = len;
-      }
-    }
-  }
-
-  /* sort symbols by length, by symbol order within each length */
-  for (symbol = 0; symbol < code_lengths_size; symbol++) {
-    if (code_lengths[symbol] != 0) {
-      sorted[offset[code_lengths[symbol]]++] = symbol;
-    }
-  }
-
-  table = root_table;
-  table_bits = root_bits;
-  table_size = 1u << table_bits;
-  total_size = table_size;
-
-  /* special case code with only one value */
-  if (offset[PREFIX_MAX_BITS] == 1) {
-    code.bits = 0;
-    code.value = static_cast<uint16_t>(sorted[0]);
-    for (key = 0; key < total_size; ++key) {
-      table[key] = code;
-    }
-    return total_size;
-  }
-
-  /* fill in root table */
-  /* let's reduce the table size to a smaller size if possible, and */
-  /* create the repetitions by memcpy if possible in the coming loop */
-  if (table_bits > max_length) {
-    table_bits = max_length;
-    table_size = 1u << table_bits;
-  }
-  key = 0;
-  symbol = 0;
-  code.bits = 1;
-  step = 2;
-  do {
-    for (; count[code.bits] != 0; --count[code.bits]) {
-      code.value = static_cast<uint16_t>(sorted[symbol++]);
-      ReplicateValue(&table[key], step, table_size, code);
-      key = GetNextKey(key, code.bits);
-    }
-    step <<= 1;
-  } while (++code.bits <= table_bits);
-
-  /* if root_bits != table_bits we only created one fraction of the */
-  /* table, and we need to replicate it now. */
-  while (total_size != table_size) {
-    memcpy(&table[table_size], &table[0], table_size * sizeof(table[0]));
-    table_size <<= 1;
-  }
-
-  /* fill in 2nd level tables and add pointers to root table */
-  mask = total_size - 1;
-  low = -1;
-  for (len = root_bits + 1, step = 2; len <= max_length; ++len, step <<= 1) {
-    for (; count[len] != 0; --count[len]) {
-      if ((key & mask) != low) {
-        table += table_size;
-        table_bits = NextTableBitSize(count, len, root_bits);
-        table_size = 1u << table_bits;
-        total_size += table_size;
-        low = key & mask;
-        root_table[low].bits = static_cast<uint8_t>(table_bits + root_bits);
-        root_table[low].value =
-            static_cast<uint16_t>((table - root_table) - low);
-      }
-      code.bits = static_cast<uint8_t>(len - root_bits);
-      code.value = static_cast<uint16_t>(sorted[symbol++]);
-      ReplicateValue(&table[key >> root_bits], step, table_size, code);
-      key = GetNextKey(key, len);
-    }
-  }
-
-  return total_size;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/huffman_table.h b/third_party/jpeg-xl/lib/jxl/huffman_table.h
deleted file mode 100644
index 11cdb2fc45961..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/huffman_table.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_HUFFMAN_TABLE_H_
-#define LIB_JXL_HUFFMAN_TABLE_H_
-
-#include <stdint.h>
-#include <stdlib.h>
-
-namespace jxl {
-
-struct HuffmanCode {
-  uint8_t bits;   /* number of bits used for this symbol */
-  uint16_t value; /* symbol value or table offset */
-};
-
-/* Builds Huffman lookup table assuming code lengths are in symbol order. */
-/* Returns 0 in case of error (invalid tree or memory error), otherwise
-   populated size of table. */
-uint32_t BuildHuffmanTable(HuffmanCode* root_table, int root_bits,
-                           const uint8_t* code_lengths,
-                           size_t code_lengths_size, uint16_t* count);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_HUFFMAN_TABLE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/iaca_test.cc b/third_party/jpeg-xl/lib/jxl/iaca_test.cc
deleted file mode 100644
index e25d9316d59b2..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/iaca_test.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/base/iaca.h"
-
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-TEST(IacaTest, MarkersDefaultToDisabledAndDoNotCrash) {
-  BeginIACA();
-  EndIACA();
-}
-
-TEST(IacaTest, ScopeDefaultToDisabledAndDoNotCrash) { ScopeIACA iaca; }
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/icc_codec.cc b/third_party/jpeg-xl/lib/jxl/icc_codec.cc
deleted file mode 100644
index 24b57532bf14f..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/icc_codec.cc
+++ /dev/null
@@ -1,414 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/icc_codec.h"
-
-#include <jxl/memory_manager.h>
-
-#include <cstdint>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_ans.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/icc_codec_common.h"
-#include "lib/jxl/padded_bytes.h"
-
-namespace jxl {
-namespace {
-
-// Shuffles or interleaves bytes, for example with width 2, turns "ABCDabcd"
-// into "AaBbCcDd". Transposes a matrix of ceil(size / width) columns and
-// width rows. There are size elements, size may be < width * height, if so the
-// last elements of the rightmost column are missing, the missing spots are
-// transposed along with the filled spots, and the result has the missing
-// elements at the end of the bottom row. The input is the input matrix in
-// scanline order but with missing elements skipped (which may occur in multiple
-// locations), the output is the result matrix in scanline order (with
-// no need to skip missing elements as they are past the end of the data).
-Status Shuffle(JxlMemoryManager* memory_manager, uint8_t* data, size_t size,
-               size_t width) {
-  size_t height = (size + width - 1) / width;  // amount of rows of output
-  PaddedBytes result(memory_manager);
-  JXL_ASSIGN_OR_RETURN(result,
-                       PaddedBytes::WithInitialSpace(memory_manager, size));
-  // i = output index, j input index
-  size_t s = 0;
-  size_t j = 0;
-  for (size_t i = 0; i < size; i++) {
-    result[i] = data[j];
-    j += height;
-    if (j >= size) j = ++s;
-  }
-
-  for (size_t i = 0; i < size; i++) {
-    data[i] = result[i];
-  }
-  return true;
-}
-
-// TODO(eustas): should be 20, or even 18, once DecodeVarInt is improved;
-//               currently DecodeVarInt does not signal the errors, and marks
-//               11 bytes as used even if only 10 are used (and 9 is enough for
-//               63-bit values).
-constexpr const size_t kPreambleSize = 22;  // enough for reading 2 VarInts
-
-uint64_t DecodeVarInt(const uint8_t* input, size_t inputSize, size_t* pos) {
-  size_t i;
-  uint64_t ret = 0;
-  for (i = 0; *pos + i < inputSize && i < 10; ++i) {
-    ret |= static_cast<uint64_t>(input[*pos + i] & 127)
-           << static_cast<uint64_t>(7 * i);
-    // If the next-byte flag is not set, stop
-    if ((input[*pos + i] & 128) == 0) break;
-  }
-  // TODO(user): Return a decoding error if i == 10.
-  *pos += i + 1;
-  return ret;
-}
-
-}  // namespace
-
-// Mimics the beginning of UnpredictICC for quick validity check.
-// At least kPreambleSize bytes of data should be valid at invocation time.
-Status CheckPreamble(const PaddedBytes& data, size_t enc_size) {
-  const uint8_t* enc = data.data();
-  size_t size = data.size();
-  size_t pos = 0;
-  uint64_t osize = DecodeVarInt(enc, size, &pos);
-  JXL_RETURN_IF_ERROR(CheckIs32Bit(osize));
-  if (pos >= size) return JXL_FAILURE("Out of bounds");
-  uint64_t csize = DecodeVarInt(enc, size, &pos);
-  JXL_RETURN_IF_ERROR(CheckIs32Bit(csize));
-  JXL_RETURN_IF_ERROR(CheckOutOfBounds(pos, csize, size));
-  // We expect that UnpredictICC inflates input, not the other way round.
-  if (osize + 65536 < enc_size) return JXL_FAILURE("Malformed ICC");
-
-  // NB(eustas): 64 MiB ICC should be enough for everything!?
-  const size_t output_limit = 1 << 28;
-  if (output_limit && osize > output_limit) {
-    return JXL_FAILURE("Decoded ICC is too large");
-  }
-  return true;
-}
-
-// Decodes the result of PredictICC back to a valid ICC profile.
-Status UnpredictICC(const uint8_t* enc, size_t size, PaddedBytes* result) {
-  if (!result->empty()) return JXL_FAILURE("result must be empty initially");
-  JxlMemoryManager* memory_manager = result->memory_manager();
-  size_t pos = 0;
-  // TODO(lode): technically speaking we need to check that the entire varint
-  // decoding never goes out of bounds, not just the first byte. This requires
-  // a DecodeVarInt function that returns an error code. It is safe to use
-  // DecodeVarInt with out of bounds values, it silently returns, but the
-  // specification requires an error. Idem for all DecodeVarInt below.
-  if (pos >= size) return JXL_FAILURE("Out of bounds");
-  uint64_t osize = DecodeVarInt(enc, size, &pos);  // Output size
-  JXL_RETURN_IF_ERROR(CheckIs32Bit(osize));
-  if (pos >= size) return JXL_FAILURE("Out of bounds");
-  uint64_t csize = DecodeVarInt(enc, size, &pos);  // Commands size
-  // Every command is translated to at least on byte.
-  JXL_RETURN_IF_ERROR(CheckIs32Bit(csize));
-  size_t cpos = pos;  // pos in commands stream
-  JXL_RETURN_IF_ERROR(CheckOutOfBounds(pos, csize, size));
-  size_t commands_end = cpos + csize;
-  pos = commands_end;  // pos in data stream
-
-  // Header
-  PaddedBytes header{memory_manager};
-  JXL_RETURN_IF_ERROR(header.append(ICCInitialHeaderPrediction(osize)));
-  for (size_t i = 0; i <= kICCHeaderSize; i++) {
-    if (result->size() == osize) {
-      if (cpos != commands_end) return JXL_FAILURE("Not all commands used");
-      if (pos != size) return JXL_FAILURE("Not all data used");
-      return true;  // Valid end
-    }
-    if (i == kICCHeaderSize) break;  // Done
-    ICCPredictHeader(result->data(), result->size(), header.data(), i);
-    if (pos >= size) return JXL_FAILURE("Out of bounds");
-    JXL_RETURN_IF_ERROR(result->push_back(enc[pos++] + header[i]));
-  }
-  if (cpos >= commands_end) return JXL_FAILURE("Out of bounds");
-
-  // Tag list
-  uint64_t numtags = DecodeVarInt(enc, size, &cpos);
-
-  if (numtags != 0) {
-    numtags--;
-    JXL_RETURN_IF_ERROR(CheckIs32Bit(numtags));
-    JXL_RETURN_IF_ERROR(AppendUint32(numtags, result));
-    uint64_t prevtagstart = kICCHeaderSize + numtags * 12;
-    uint64_t prevtagsize = 0;
-    for (;;) {
-      if (result->size() > osize) return JXL_FAILURE("Invalid result size");
-      if (cpos > commands_end) return JXL_FAILURE("Out of bounds");
-      if (cpos == commands_end) break;  // Valid end
-      uint8_t command = enc[cpos++];
-      uint8_t tagcode = command & 63;
-      Tag tag;
-      if (tagcode == 0) {
-        break;
-      } else if (tagcode == kCommandTagUnknown) {
-        JXL_RETURN_IF_ERROR(CheckOutOfBounds(pos, 4, size));
-        tag = DecodeKeyword(enc, size, pos);
-        pos += 4;
-      } else if (tagcode == kCommandTagTRC) {
-        tag = kRtrcTag;
-      } else if (tagcode == kCommandTagXYZ) {
-        tag = kRxyzTag;
-      } else {
-        if (tagcode - kCommandTagStringFirst >= kNumTagStrings) {
-          return JXL_FAILURE("Unknown tagcode");
-        }
-        tag = *kTagStrings[tagcode - kCommandTagStringFirst];
-      }
-      JXL_RETURN_IF_ERROR(AppendKeyword(tag, result));
-
-      uint64_t tagstart;
-      uint64_t tagsize = prevtagsize;
-      if (tag == kRxyzTag || tag == kGxyzTag || tag == kBxyzTag ||
-          tag == kKxyzTag || tag == kWtptTag || tag == kBkptTag ||
-          tag == kLumiTag) {
-        tagsize = 20;
-      }
-
-      if (command & kFlagBitOffset) {
-        if (cpos >= commands_end) return JXL_FAILURE("Out of bounds");
-        tagstart = DecodeVarInt(enc, size, &cpos);
-      } else {
-        JXL_RETURN_IF_ERROR(CheckIs32Bit(prevtagstart));
-        tagstart = prevtagstart + prevtagsize;
-      }
-      JXL_RETURN_IF_ERROR(CheckIs32Bit(tagstart));
-      JXL_RETURN_IF_ERROR(AppendUint32(tagstart, result));
-      if (command & kFlagBitSize) {
-        if (cpos >= commands_end) return JXL_FAILURE("Out of bounds");
-        tagsize = DecodeVarInt(enc, size, &cpos);
-      }
-      JXL_RETURN_IF_ERROR(CheckIs32Bit(tagsize));
-      JXL_RETURN_IF_ERROR(AppendUint32(tagsize, result));
-      prevtagstart = tagstart;
-      prevtagsize = tagsize;
-
-      if (tagcode == kCommandTagTRC) {
-        JXL_RETURN_IF_ERROR(AppendKeyword(kGtrcTag, result));
-        JXL_RETURN_IF_ERROR(AppendUint32(tagstart, result));
-        JXL_RETURN_IF_ERROR(AppendUint32(tagsize, result));
-        JXL_RETURN_IF_ERROR(AppendKeyword(kBtrcTag, result));
-        JXL_RETURN_IF_ERROR(AppendUint32(tagstart, result));
-        JXL_RETURN_IF_ERROR(AppendUint32(tagsize, result));
-      }
-
-      if (tagcode == kCommandTagXYZ) {
-        JXL_RETURN_IF_ERROR(CheckIs32Bit(tagstart + tagsize * 2));
-        JXL_RETURN_IF_ERROR(AppendKeyword(kGxyzTag, result));
-        JXL_RETURN_IF_ERROR(AppendUint32(tagstart + tagsize, result));
-        JXL_RETURN_IF_ERROR(AppendUint32(tagsize, result));
-        JXL_RETURN_IF_ERROR(AppendKeyword(kBxyzTag, result));
-        JXL_RETURN_IF_ERROR(AppendUint32(tagstart + tagsize * 2, result));
-        JXL_RETURN_IF_ERROR(AppendUint32(tagsize, result));
-      }
-    }
-  }
-
-  // Main Content
-  for (;;) {
-    if (result->size() > osize) return JXL_FAILURE("Invalid result size");
-    if (cpos > commands_end) return JXL_FAILURE("Out of bounds");
-    if (cpos == commands_end) break;  // Valid end
-    uint8_t command = enc[cpos++];
-    if (command == kCommandInsert) {
-      if (cpos >= commands_end) return JXL_FAILURE("Out of bounds");
-      uint64_t num = DecodeVarInt(enc, size, &cpos);
-      JXL_RETURN_IF_ERROR(CheckOutOfBounds(pos, num, size));
-      for (size_t i = 0; i < num; i++) {
-        JXL_RETURN_IF_ERROR(result->push_back(enc[pos++]));
-      }
-    } else if (command == kCommandShuffle2 || command == kCommandShuffle4) {
-      if (cpos >= commands_end) return JXL_FAILURE("Out of bounds");
-      uint64_t num = DecodeVarInt(enc, size, &cpos);
-      JXL_RETURN_IF_ERROR(CheckOutOfBounds(pos, num, size));
-      PaddedBytes shuffled(memory_manager);
-      JXL_ASSIGN_OR_RETURN(shuffled,
-                           PaddedBytes::WithInitialSpace(memory_manager, num));
-      for (size_t i = 0; i < num; i++) {
-        shuffled[i] = enc[pos + i];
-      }
-      if (command == kCommandShuffle2) {
-        JXL_RETURN_IF_ERROR(Shuffle(memory_manager, shuffled.data(), num, 2));
-      } else if (command == kCommandShuffle4) {
-        JXL_RETURN_IF_ERROR(Shuffle(memory_manager, shuffled.data(), num, 4));
-      }
-      for (size_t i = 0; i < num; i++) {
-        JXL_RETURN_IF_ERROR(result->push_back(shuffled[i]));
-        pos++;
-      }
-    } else if (command == kCommandPredict) {
-      JXL_RETURN_IF_ERROR(CheckOutOfBounds(cpos, 2, commands_end));
-      uint8_t flags = enc[cpos++];
-
-      size_t width = (flags & 3) + 1;
-      if (width == 3) return JXL_FAILURE("Invalid width");
-
-      int order = (flags & 12) >> 2;
-      if (order == 3) return JXL_FAILURE("Invalid order");
-
-      uint64_t stride = width;
-      if (flags & 16) {
-        if (cpos >= commands_end) return JXL_FAILURE("Out of bounds");
-        stride = DecodeVarInt(enc, size, &cpos);
-        if (stride < width) {
-          return JXL_FAILURE("Invalid stride");
-        }
-      }
-      // If stride * 4 >= result->size(), return failure. The check
-      // "size == 0 || ((size - 1) >> 2) < stride" corresponds to
-      // "stride * 4 >= size", but does not suffer from integer overflow.
-      // This check is more strict than necessary but follows the specification
-      // and the encoder should ensure this is followed.
-      if (result->empty() || ((result->size() - 1u) >> 2u) < stride) {
-        return JXL_FAILURE("Invalid stride");
-      }
-
-      if (cpos >= commands_end) return JXL_FAILURE("Out of bounds");
-      uint64_t num = DecodeVarInt(enc, size, &cpos);  // in bytes
-      JXL_RETURN_IF_ERROR(CheckOutOfBounds(pos, num, size));
-
-      PaddedBytes shuffled(memory_manager);
-      JXL_ASSIGN_OR_RETURN(shuffled,
-                           PaddedBytes::WithInitialSpace(memory_manager, num));
-
-      for (size_t i = 0; i < num; i++) {
-        shuffled[i] = enc[pos + i];
-      }
-      if (width > 1) {
-        JXL_RETURN_IF_ERROR(
-            Shuffle(memory_manager, shuffled.data(), num, width));
-      }
-
-      size_t start = result->size();
-      for (size_t i = 0; i < num; i++) {
-        uint8_t predicted = LinearPredictICCValue(result->data(), start, i,
-                                                  stride, width, order);
-        JXL_RETURN_IF_ERROR(result->push_back(predicted + shuffled[i]));
-      }
-      pos += num;
-    } else if (command == kCommandXYZ) {
-      JXL_RETURN_IF_ERROR(AppendKeyword(kXyz_Tag, result));
-      for (int i = 0; i < 4; i++) {
-        JXL_RETURN_IF_ERROR(result->push_back(0));
-      }
-      JXL_RETURN_IF_ERROR(CheckOutOfBounds(pos, 12, size));
-      for (size_t i = 0; i < 12; i++) {
-        JXL_RETURN_IF_ERROR(result->push_back(enc[pos++]));
-      }
-    } else if (command >= kCommandTypeStartFirst &&
-               command < kCommandTypeStartFirst + kNumTypeStrings) {
-      JXL_RETURN_IF_ERROR(AppendKeyword(
-          *kTypeStrings[command - kCommandTypeStartFirst], result));
-      for (size_t i = 0; i < 4; i++) {
-        JXL_RETURN_IF_ERROR(result->push_back(0));
-      }
-    } else {
-      return JXL_FAILURE("Unknown command");
-    }
-  }
-
-  if (pos != size) return JXL_FAILURE("Not all data used");
-  if (result->size() != osize) return JXL_FAILURE("Invalid result size");
-
-  return true;
-}
-
-Status ICCReader::Init(BitReader* reader) {
-  JXL_RETURN_IF_ERROR(CheckEOI(reader));
-  JxlMemoryManager* memory_manager = decompressed_.memory_manager();
-  used_bits_base_ = reader->TotalBitsConsumed();
-  if (bits_to_skip_ == 0) {
-    enc_size_ = U64Coder::Read(reader);
-    if (enc_size_ > 268435456) {
-      // Avoid too large memory allocation for invalid file.
-      return JXL_FAILURE("Too large encoded profile");
-    }
-    JXL_RETURN_IF_ERROR(DecodeHistograms(
-        memory_manager, reader, kNumICCContexts, &code_, &context_map_));
-    JXL_ASSIGN_OR_RETURN(ans_reader_, ANSSymbolReader::Create(&code_, reader));
-    i_ = 0;
-    JXL_RETURN_IF_ERROR(
-        decompressed_.resize(std::min<size_t>(i_ + 0x400, enc_size_)));
-    for (; i_ < std::min<size_t>(2, enc_size_); i_++) {
-      decompressed_[i_] = ans_reader_.ReadHybridUint(
-          ICCANSContext(i_, i_ > 0 ? decompressed_[i_ - 1] : 0,
-                        i_ > 1 ? decompressed_[i_ - 2] : 0),
-          reader, context_map_);
-    }
-    if (enc_size_ > kPreambleSize) {
-      for (; i_ < kPreambleSize; i_++) {
-        decompressed_[i_] = ans_reader_.ReadHybridUint(
-            ICCANSContext(i_, decompressed_[i_ - 1], decompressed_[i_ - 2]),
-            reader, context_map_);
-      }
-      JXL_RETURN_IF_ERROR(CheckEOI(reader));
-      JXL_RETURN_IF_ERROR(CheckPreamble(decompressed_, enc_size_));
-    }
-    bits_to_skip_ = reader->TotalBitsConsumed() - used_bits_base_;
-  } else {
-    reader->SkipBits(bits_to_skip_);
-  }
-  return true;
-}
-
-Status ICCReader::Process(BitReader* reader, PaddedBytes* icc) {
-  ANSSymbolReader::Checkpoint checkpoint;
-  size_t saved_i = 0;
-  auto save = [&]() {
-    ans_reader_.Save(&checkpoint);
-    bits_to_skip_ = reader->TotalBitsConsumed() - used_bits_base_;
-    saved_i = i_;
-  };
-  save();
-  auto check_and_restore = [&]() {
-    Status status = CheckEOI(reader);
-    if (!status) {
-      // not enough bytes.
-      ans_reader_.Restore(checkpoint);
-      i_ = saved_i;
-      return status;
-    }
-    return Status(true);
-  };
-  for (; i_ < enc_size_; i_++) {
-    if (i_ % ANSSymbolReader::kMaxCheckpointInterval == 0 && i_ > 0) {
-      JXL_RETURN_IF_ERROR(check_and_restore());
-      save();
-      if ((i_ > 0) && (((i_ & 0xFFFF) == 0))) {
-        float used_bytes =
-            (reader->TotalBitsConsumed() - used_bits_base_) / 8.0f;
-        if (i_ > used_bytes * 256) return JXL_FAILURE("Corrupted stream");
-      }
-      JXL_RETURN_IF_ERROR(
-          decompressed_.resize(std::min<size_t>(i_ + 0x400, enc_size_)));
-    }
-    JXL_ENSURE(i_ >= 2);
-    decompressed_[i_] = ans_reader_.ReadHybridUint(
-        ICCANSContext(i_, decompressed_[i_ - 1], decompressed_[i_ - 2]), reader,
-        context_map_);
-  }
-  JXL_RETURN_IF_ERROR(check_and_restore());
-  bits_to_skip_ = reader->TotalBitsConsumed() - used_bits_base_;
-  if (!ans_reader_.CheckANSFinalState()) {
-    return JXL_FAILURE("Corrupted ICC profile");
-  }
-
-  icc->clear();
-  return UnpredictICC(decompressed_.data(), decompressed_.size(), icc);
-}
-
-Status ICCReader::CheckEOI(BitReader* reader) {
-  if (reader->AllReadsWithinBounds()) return true;
-  return JXL_STATUS(StatusCode::kNotEnoughBytes,
-                    "Not enough bytes for reading ICC profile");
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/icc_codec.h b/third_party/jpeg-xl/lib/jxl/icc_codec.h
deleted file mode 100644
index 046487e6c3570..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/icc_codec.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ICC_CODEC_H_
-#define LIB_JXL_ICC_CODEC_H_
-
-// Compressed representation of ICC profiles.
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_ans.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/padded_bytes.h"
-
-namespace jxl {
-
-struct ICCReader {
-  explicit ICCReader(JxlMemoryManager* memory_manager)
-      : decompressed_(memory_manager) {}
-
-  Status Init(BitReader* reader);
-  Status Process(BitReader* reader, PaddedBytes* icc);
-  void Reset() {
-    bits_to_skip_ = 0;
-    decompressed_.clear();
-  }
-
- private:
-  static Status CheckEOI(BitReader* reader);
-  size_t i_ = 0;
-  size_t bits_to_skip_ = 0;
-  size_t used_bits_base_ = 0;
-  uint64_t enc_size_ = 0;
-  std::vector<uint8_t> context_map_;
-  ANSCode code_;
-  ANSSymbolReader ans_reader_;
-  PaddedBytes decompressed_;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ICC_CODEC_H_
diff --git a/third_party/jpeg-xl/lib/jxl/icc_codec_common.cc b/third_party/jpeg-xl/lib/jxl/icc_codec_common.cc
deleted file mode 100644
index 0583396ada7a8..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/icc_codec_common.cc
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/icc_codec_common.h"
-
-#include <cstdint>
-#include <tuple>
-
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/padded_bytes.h"
-
-namespace jxl {
-namespace {
-uint8_t ByteKind1(uint8_t b) {
-  if ('a' <= b && b <= 'z') return 0;
-  if ('A' <= b && b <= 'Z') return 0;
-  if ('0' <= b && b <= '9') return 1;
-  if (b == '.' || b == ',') return 1;
-  if (b == 0) return 2;
-  if (b == 1) return 3;
-  if (b < 16) return 4;
-  if (b == 255) return 6;
-  if (b > 240) return 5;
-  return 7;
-}
-
-uint8_t ByteKind2(uint8_t b) {
-  if ('a' <= b && b <= 'z') return 0;
-  if ('A' <= b && b <= 'Z') return 0;
-  if ('0' <= b && b <= '9') return 1;
-  if (b == '.' || b == ',') return 1;
-  if (b < 16) return 2;
-  if (b > 240) return 3;
-  return 4;
-}
-
-template <typename T>
-T PredictValue(T p1, T p2, T p3, int order) {
-  if (order == 0) return p1;
-  if (order == 1) return 2 * p1 - p2;
-  if (order == 2) return 3 * p1 - 3 * p2 + p3;
-  return 0;
-}
-}  // namespace
-
-uint32_t DecodeUint32(const uint8_t* data, size_t size, size_t pos) {
-  return pos + 4 > size ? 0 : LoadBE32(data + pos);
-}
-
-Status AppendUint32(uint32_t value, PaddedBytes* data) {
-  size_t pos = data->size();
-  JXL_RETURN_IF_ERROR(data->resize(pos + 4));
-  StoreBE32(value, data->data() + pos);
-  return true;
-}
-
-typedef std::array<uint8_t, 4> Tag;
-
-Tag DecodeKeyword(const uint8_t* data, size_t size, size_t pos) {
-  if (pos + 4 > size) return {{' ', ' ', ' ', ' '}};
-  return {{data[pos], data[pos + 1], data[pos + 2], data[pos + 3]}};
-}
-
-void EncodeKeyword(const Tag& keyword, uint8_t* data, size_t size, size_t pos) {
-  if (keyword.size() != 4 || pos + 3 >= size) return;
-  for (size_t i = 0; i < 4; ++i) data[pos + i] = keyword[i];
-}
-
-Status AppendKeyword(const Tag& keyword, PaddedBytes* data) {
-  static_assert(std::tuple_size<Tag>{} == 4);
-  return data->append(keyword);
-}
-
-// Checks if a + b > size, taking possible integer overflow into account.
-Status CheckOutOfBounds(uint64_t a, uint64_t b, uint64_t size) {
-  uint64_t pos = a + b;
-  if (pos > size) return JXL_FAILURE("Out of bounds");
-  if (pos < a) return JXL_FAILURE("Out of bounds");  // overflow happened
-  return true;
-}
-
-Status CheckIs32Bit(uint64_t v) {
-  static constexpr const uint64_t kUpper32 = ~static_cast<uint64_t>(0xFFFFFFFF);
-  if ((v & kUpper32) != 0) return JXL_FAILURE("32-bit value expected");
-  return true;
-}
-
-const std::array<uint8_t, kICCHeaderSize> kIccInitialHeaderPrediction = {
-    0,   0,   0,   0,   0,   0,   0,   0,   4, 0, 0, 0, 'm', 'n', 't', 'r',
-    'R', 'G', 'B', ' ', 'X', 'Y', 'Z', ' ', 0, 0, 0, 0, 0,   0,   0,   0,
-    0,   0,   0,   0,   'a', 'c', 's', 'p', 0, 0, 0, 0, 0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0, 0, 0, 0, 0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   246, 214, 0, 1, 0, 0, 0,   0,   211, 45,
-    0,   0,   0,   0,   0,   0,   0,   0,   0, 0, 0, 0, 0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0, 0, 0, 0, 0,   0,   0,   0,
-    0,   0,   0,   0,   0,   0,   0,   0,   0, 0, 0, 0, 0,   0,   0,   0,
-};
-
-std::array<uint8_t, kICCHeaderSize> ICCInitialHeaderPrediction(uint32_t size) {
-  std::array<uint8_t, kICCHeaderSize> copy(kIccInitialHeaderPrediction);
-  StoreBE32(size, copy.data());
-  return copy;
-}
-
-void ICCPredictHeader(const uint8_t* icc, size_t size, uint8_t* header,
-                      size_t pos) {
-  if (pos == 8 && size >= 8) {
-    header[80] = icc[4];
-    header[81] = icc[5];
-    header[82] = icc[6];
-    header[83] = icc[7];
-  }
-  if (pos == 41 && size >= 41) {
-    if (icc[40] == 'A') {
-      header[41] = 'P';
-      header[42] = 'P';
-      header[43] = 'L';
-    }
-    if (icc[40] == 'M') {
-      header[41] = 'S';
-      header[42] = 'F';
-      header[43] = 'T';
-    }
-  }
-  if (pos == 42 && size >= 42) {
-    if (icc[40] == 'S' && icc[41] == 'G') {
-      header[42] = 'I';
-      header[43] = ' ';
-    }
-    if (icc[40] == 'S' && icc[41] == 'U') {
-      header[42] = 'N';
-      header[43] = 'W';
-    }
-  }
-}
-
-// Predicts a value with linear prediction of given order (0-2), for integers
-// with width bytes and given stride in bytes between values.
-// The start position is at start + i, and the relevant modulus of i describes
-// which byte of the multi-byte integer is being handled.
-// The value start + i must be at least stride * 4.
-uint8_t LinearPredictICCValue(const uint8_t* data, size_t start, size_t i,
-                              size_t stride, size_t width, int order) {
-  size_t pos = start + i;
-  if (width == 1) {
-    uint8_t p1 = data[pos - stride];
-    uint8_t p2 = data[pos - stride * 2];
-    uint8_t p3 = data[pos - stride * 3];
-    return PredictValue(p1, p2, p3, order);
-  } else if (width == 2) {
-    size_t p = start + (i & ~1);
-    uint16_t p1 = (data[p - stride * 1] << 8) + data[p - stride * 1 + 1];
-    uint16_t p2 = (data[p - stride * 2] << 8) + data[p - stride * 2 + 1];
-    uint16_t p3 = (data[p - stride * 3] << 8) + data[p - stride * 3 + 1];
-    uint16_t pred = PredictValue(p1, p2, p3, order);
-    return (i & 1) ? (pred & 255) : ((pred >> 8) & 255);
-  } else {
-    size_t p = start + (i & ~3);
-    uint32_t p1 = DecodeUint32(data, pos, p - stride);
-    uint32_t p2 = DecodeUint32(data, pos, p - stride * 2);
-    uint32_t p3 = DecodeUint32(data, pos, p - stride * 3);
-    uint32_t pred = PredictValue(p1, p2, p3, order);
-    unsigned shiftbytes = 3 - (i & 3);
-    return (pred >> (shiftbytes * 8)) & 255;
-  }
-}
-
-size_t ICCANSContext(size_t i, size_t b1, size_t b2) {
-  if (i <= 128) return 0;
-  return 1 + ByteKind1(b1) + ByteKind2(b2) * 8;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/icc_codec_common.h b/third_party/jpeg-xl/lib/jxl/icc_codec_common.h
deleted file mode 100644
index 2401f341406a5..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/icc_codec_common.h
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_ICC_CODEC_COMMON_H_
-#define LIB_JXL_ICC_CODEC_COMMON_H_
-
-// Compressed representation of ICC profiles.
-
-#include <array>
-#include <cstddef>
-#include <cstdint>
-
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-class PaddedBytes;
-
-static constexpr size_t kICCHeaderSize = 128;
-
-typedef std::array<uint8_t, 4> Tag;
-
-static const Tag kAcspTag = {{'a', 'c', 's', 'p'}};
-static const Tag kBkptTag = {{'b', 'k', 'p', 't'}};
-static const Tag kBtrcTag = {{'b', 'T', 'R', 'C'}};
-static const Tag kBxyzTag = {{'b', 'X', 'Y', 'Z'}};
-static const Tag kChadTag = {{'c', 'h', 'a', 'd'}};
-static const Tag kChrmTag = {{'c', 'h', 'r', 'm'}};
-static const Tag kCprtTag = {{'c', 'p', 'r', 't'}};
-static const Tag kCurvTag = {{'c', 'u', 'r', 'v'}};
-static const Tag kDescTag = {{'d', 'e', 's', 'c'}};
-static const Tag kDmddTag = {{'d', 'm', 'd', 'd'}};
-static const Tag kDmndTag = {{'d', 'm', 'n', 'd'}};
-static const Tag kGbd_Tag = {{'g', 'b', 'd', ' '}};
-static const Tag kGtrcTag = {{'g', 'T', 'R', 'C'}};
-static const Tag kGxyzTag = {{'g', 'X', 'Y', 'Z'}};
-static const Tag kKtrcTag = {{'k', 'T', 'R', 'C'}};
-static const Tag kKxyzTag = {{'k', 'X', 'Y', 'Z'}};
-static const Tag kLumiTag = {{'l', 'u', 'm', 'i'}};
-static const Tag kMab_Tag = {{'m', 'A', 'B', ' '}};
-static const Tag kMba_Tag = {{'m', 'B', 'A', ' '}};
-static const Tag kMlucTag = {{'m', 'l', 'u', 'c'}};
-static const Tag kMntrTag = {{'m', 'n', 't', 'r'}};
-static const Tag kParaTag = {{'p', 'a', 'r', 'a'}};
-static const Tag kRgb_Tag = {{'R', 'G', 'B', ' '}};
-static const Tag kRtrcTag = {{'r', 'T', 'R', 'C'}};
-static const Tag kRxyzTag = {{'r', 'X', 'Y', 'Z'}};
-static const Tag kSf32Tag = {{'s', 'f', '3', '2'}};
-static const Tag kTextTag = {{'t', 'e', 'x', 't'}};
-static const Tag kVcgtTag = {{'v', 'c', 'g', 't'}};
-static const Tag kWtptTag = {{'w', 't', 'p', 't'}};
-static const Tag kXyz_Tag = {{'X', 'Y', 'Z', ' '}};
-
-// Tag names focused on RGB and GRAY monitor profiles
-static constexpr size_t kNumTagStrings = 17;
-static constexpr const Tag* kTagStrings[kNumTagStrings] = {
-    &kCprtTag, &kWtptTag, &kBkptTag, &kRxyzTag, &kGxyzTag, &kBxyzTag,
-    &kKxyzTag, &kRtrcTag, &kGtrcTag, &kBtrcTag, &kKtrcTag, &kChadTag,
-    &kDescTag, &kChrmTag, &kDmndTag, &kDmddTag, &kLumiTag};
-
-static constexpr size_t kCommandTagUnknown = 1;
-static constexpr size_t kCommandTagTRC = 2;
-static constexpr size_t kCommandTagXYZ = 3;
-static constexpr size_t kCommandTagStringFirst = 4;
-
-// Tag types focused on RGB and GRAY monitor profiles
-static constexpr size_t kNumTypeStrings = 8;
-static constexpr const Tag* kTypeStrings[kNumTypeStrings] = {
-    &kXyz_Tag, &kDescTag, &kTextTag, &kMlucTag,
-    &kParaTag, &kCurvTag, &kSf32Tag, &kGbd_Tag};
-
-static constexpr size_t kCommandInsert = 1;
-static constexpr size_t kCommandShuffle2 = 2;
-static constexpr size_t kCommandShuffle4 = 3;
-static constexpr size_t kCommandPredict = 4;
-static constexpr size_t kCommandXYZ = 10;
-static constexpr size_t kCommandTypeStartFirst = 16;
-
-static constexpr size_t kFlagBitOffset = 64;
-static constexpr size_t kFlagBitSize = 128;
-
-static constexpr size_t kNumICCContexts = 41;
-
-uint32_t DecodeUint32(const uint8_t* data, size_t size, size_t pos);
-Status AppendUint32(uint32_t value, PaddedBytes* data);
-Tag DecodeKeyword(const uint8_t* data, size_t size, size_t pos);
-void EncodeKeyword(const Tag& keyword, uint8_t* data, size_t size, size_t pos);
-Status AppendKeyword(const Tag& keyword, PaddedBytes* data);
-
-// Checks if a + b > size, taking possible integer overflow into account.
-Status CheckOutOfBounds(uint64_t a, uint64_t b, uint64_t size);
-Status CheckIs32Bit(uint64_t v);
-
-std::array<uint8_t, kICCHeaderSize> ICCInitialHeaderPrediction(uint32_t size);
-void ICCPredictHeader(const uint8_t* icc, size_t size, uint8_t* header,
-                      size_t pos);
-uint8_t LinearPredictICCValue(const uint8_t* data, size_t start, size_t i,
-                              size_t stride, size_t width, int order);
-size_t ICCANSContext(size_t i, size_t b1, size_t b2);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_ICC_CODEC_COMMON_H_
diff --git a/third_party/jpeg-xl/lib/jxl/icc_codec_test.cc b/third_party/jpeg-xl/lib/jxl/icc_codec_test.cc
deleted file mode 100644
index 3044452717101..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/icc_codec_test.cc
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <string>
-#include <vector>
-
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/enc_icc_codec.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-void TestProfile(const IccBytes& icc) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  BitWriter writer{memory_manager};
-  ASSERT_TRUE(WriteICC(Span<const uint8_t>(icc), &writer,
-                       jxl::LayerType::Header, nullptr));
-  writer.ZeroPadToByte();
-  std::vector<uint8_t> dec;
-  BitReader reader(writer.GetSpan());
-  ASSERT_TRUE(test::ReadICC(&reader, &dec));
-  ASSERT_TRUE(reader.Close());
-  EXPECT_EQ(icc.size(), dec.size());
-  if (icc.size() == dec.size()) {
-    for (size_t i = 0; i < icc.size(); i++) {
-      EXPECT_EQ(icc[i], dec[i]);
-      if (icc[i] != dec[i]) break;  // One output is enough
-    }
-  }
-}
-
-void TestProfile(const std::string& icc) {
-  IccBytes data;
-  Bytes(icc).AppendTo(data);
-  TestProfile(data);
-}
-
-// Valid profile from one of the images output by the decoder.
-const unsigned char kTestProfile[] = {
-    0x00, 0x00, 0x03, 0x80, 0x6c, 0x63, 0x6d, 0x73, 0x04, 0x30, 0x00, 0x00,
-    0x6d, 0x6e, 0x74, 0x72, 0x52, 0x47, 0x42, 0x20, 0x58, 0x59, 0x5a, 0x20,
-    0x07, 0xe3, 0x00, 0x04, 0x00, 0x1d, 0x00, 0x0f, 0x00, 0x32, 0x00, 0x2e,
-    0x61, 0x63, 0x73, 0x70, 0x41, 0x50, 0x50, 0x4c, 0x00, 0x00, 0x00, 0x01,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xf6, 0xd6,
-    0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, 0x6c, 0x63, 0x6d, 0x73,
-    0x5f, 0x07, 0x0d, 0x3e, 0x4d, 0x32, 0xf2, 0x6e, 0x5d, 0x77, 0x26, 0xcc,
-    0x23, 0xb0, 0x6a, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d,
-    0x64, 0x65, 0x73, 0x63, 0x00, 0x00, 0x01, 0x20, 0x00, 0x00, 0x00, 0x42,
-    0x63, 0x70, 0x72, 0x74, 0x00, 0x00, 0x01, 0x64, 0x00, 0x00, 0x01, 0x00,
-    0x77, 0x74, 0x70, 0x74, 0x00, 0x00, 0x02, 0x64, 0x00, 0x00, 0x00, 0x14,
-    0x63, 0x68, 0x61, 0x64, 0x00, 0x00, 0x02, 0x78, 0x00, 0x00, 0x00, 0x2c,
-    0x72, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x02, 0xa4, 0x00, 0x00, 0x00, 0x14,
-    0x62, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x02, 0xb8, 0x00, 0x00, 0x00, 0x14,
-    0x67, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x02, 0xcc, 0x00, 0x00, 0x00, 0x14,
-    0x72, 0x54, 0x52, 0x43, 0x00, 0x00, 0x02, 0xe0, 0x00, 0x00, 0x00, 0x20,
-    0x67, 0x54, 0x52, 0x43, 0x00, 0x00, 0x02, 0xe0, 0x00, 0x00, 0x00, 0x20,
-    0x62, 0x54, 0x52, 0x43, 0x00, 0x00, 0x02, 0xe0, 0x00, 0x00, 0x00, 0x20,
-    0x63, 0x68, 0x72, 0x6d, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x24,
-    0x64, 0x6d, 0x6e, 0x64, 0x00, 0x00, 0x03, 0x24, 0x00, 0x00, 0x00, 0x28,
-    0x64, 0x6d, 0x64, 0x64, 0x00, 0x00, 0x03, 0x4c, 0x00, 0x00, 0x00, 0x32,
-    0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-    0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x26,
-    0x00, 0x00, 0x00, 0x1c, 0x00, 0x52, 0x00, 0x47, 0x00, 0x42, 0x00, 0x5f,
-    0x00, 0x44, 0x00, 0x36, 0x00, 0x35, 0x00, 0x5f, 0x00, 0x53, 0x00, 0x52,
-    0x00, 0x47, 0x00, 0x5f, 0x00, 0x52, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x5f,
-    0x00, 0x37, 0x00, 0x30, 0x00, 0x39, 0x00, 0x00, 0x6d, 0x6c, 0x75, 0x63,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0c,
-    0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x00, 0x00, 0x1c,
-    0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69,
-    0x00, 0x67, 0x00, 0x68, 0x00, 0x74, 0x00, 0x20, 0x00, 0x32, 0x00, 0x30,
-    0x00, 0x31, 0x00, 0x38, 0x00, 0x20, 0x00, 0x47, 0x00, 0x6f, 0x00, 0x6f,
-    0x00, 0x67, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x20, 0x00, 0x4c, 0x00, 0x4c,
-    0x00, 0x43, 0x00, 0x2c, 0x00, 0x20, 0x00, 0x43, 0x00, 0x43, 0x00, 0x2d,
-    0x00, 0x42, 0x00, 0x59, 0x00, 0x2d, 0x00, 0x53, 0x00, 0x41, 0x00, 0x20,
-    0x00, 0x33, 0x00, 0x2e, 0x00, 0x30, 0x00, 0x20, 0x00, 0x55, 0x00, 0x6e,
-    0x00, 0x70, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x74, 0x00, 0x65, 0x00, 0x64,
-    0x00, 0x20, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x63, 0x00, 0x65, 0x00, 0x6e,
-    0x00, 0x73, 0x00, 0x65, 0x00, 0x28, 0x00, 0x68, 0x00, 0x74, 0x00, 0x74,
-    0x00, 0x70, 0x00, 0x73, 0x00, 0x3a, 0x00, 0x2f, 0x00, 0x2f, 0x00, 0x63,
-    0x00, 0x72, 0x00, 0x65, 0x00, 0x61, 0x00, 0x74, 0x00, 0x69, 0x00, 0x76,
-    0x00, 0x65, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x6d, 0x00, 0x6d, 0x00, 0x6f,
-    0x00, 0x6e, 0x00, 0x73, 0x00, 0x2e, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x67,
-    0x00, 0x2f, 0x00, 0x6c, 0x00, 0x69, 0x00, 0x63, 0x00, 0x65, 0x00, 0x6e,
-    0x00, 0x73, 0x00, 0x65, 0x00, 0x73, 0x00, 0x2f, 0x00, 0x62, 0x00, 0x79,
-    0x00, 0x2d, 0x00, 0x73, 0x00, 0x61, 0x00, 0x2f, 0x00, 0x33, 0x00, 0x2e,
-    0x00, 0x30, 0x00, 0x2f, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x67, 0x00, 0x61,
-    0x00, 0x6c, 0x00, 0x63, 0x00, 0x6f, 0x00, 0x64, 0x00, 0x65, 0x00, 0x29,
-    0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6,
-    0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d, 0x73, 0x66, 0x33, 0x32,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0c, 0x42, 0x00, 0x00, 0x05, 0xde,
-    0xff, 0xff, 0xf3, 0x25, 0x00, 0x00, 0x07, 0x93, 0x00, 0x00, 0xfd, 0x90,
-    0xff, 0xff, 0xfb, 0xa1, 0xff, 0xff, 0xfd, 0xa2, 0x00, 0x00, 0x03, 0xdc,
-    0x00, 0x00, 0xc0, 0x6e, 0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x6f, 0xa0, 0x00, 0x00, 0x38, 0xf5, 0x00, 0x00, 0x03, 0x90,
-    0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x9f,
-    0x00, 0x00, 0x0f, 0x84, 0x00, 0x00, 0xb6, 0xc4, 0x58, 0x59, 0x5a, 0x20,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x97, 0x00, 0x00, 0xb7, 0x87,
-    0x00, 0x00, 0x18, 0xd9, 0x70, 0x61, 0x72, 0x61, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x38, 0xe4, 0x00, 0x00, 0xe8, 0xf0,
-    0x00, 0x00, 0x17, 0x10, 0x00, 0x00, 0x38, 0xe4, 0x00, 0x00, 0x14, 0xbc,
-    0x63, 0x68, 0x72, 0x6d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00,
-    0x00, 0x00, 0xa3, 0xd7, 0x00, 0x00, 0x54, 0x7c, 0x00, 0x00, 0x4c, 0xcd,
-    0x00, 0x00, 0x99, 0x9a, 0x00, 0x00, 0x26, 0x67, 0x00, 0x00, 0x0f, 0x5c,
-    0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-    0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53, 0x00, 0x00, 0x00, 0x0c,
-    0x00, 0x00, 0x00, 0x1c, 0x00, 0x47, 0x00, 0x6f, 0x00, 0x6f, 0x00, 0x67,
-    0x00, 0x6c, 0x00, 0x65, 0x6d, 0x6c, 0x75, 0x63, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0c, 0x65, 0x6e, 0x55, 0x53,
-    0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x49, 0x00, 0x6d,
-    0x00, 0x61, 0x00, 0x67, 0x00, 0x65, 0x00, 0x20, 0x00, 0x63, 0x00, 0x6f,
-    0x00, 0x64, 0x00, 0x65, 0x00, 0x63, 0x00, 0x00,
-};
-
-}  // namespace
-
-TEST(IccCodecTest, Icc) {
-  // Empty string cannot be tested, encoder checks against writing it.
-  TestProfile("a");
-  TestProfile("ab");
-  TestProfile("aaaa");
-
-  {
-    // Exactly the ICC header size
-    IccBytes profile(128);
-    for (size_t i = 0; i < 128; i++) {
-      profile[i] = 0;
-    }
-    TestProfile(profile);
-  }
-
-  {
-    IccBytes profile;
-    Bytes(kTestProfile, sizeof(kTestProfile)).AppendTo(profile);
-    TestProfile(profile);
-  }
-
-  // Test substrings of full profile
-  {
-    IccBytes profile;
-    for (size_t i = 0; i <= 256; i++) {
-      profile.push_back(kTestProfile[i]);
-      TestProfile(profile);
-    }
-  }
-}
-
-// kTestProfile after encoding with the ICC codec
-static const unsigned char kEncodedTestProfile[] = {
-    0x1f, 0x8b, 0x1,  0x13, 0x10, 0x0,  0x0,  0x0,  0x20, 0x4c, 0xcc, 0x3,
-    0xe7, 0xa0, 0xa5, 0xa2, 0x90, 0xa4, 0x27, 0xe8, 0x79, 0x1d, 0xe3, 0x26,
-    0x57, 0x54, 0xef, 0x0,  0xe8, 0x97, 0x2,  0xce, 0xa1, 0xd7, 0x85, 0x16,
-    0xb4, 0x29, 0x94, 0x58, 0xf2, 0x56, 0xc0, 0x76, 0xea, 0x23, 0xec, 0x7c,
-    0x73, 0x51, 0x41, 0x40, 0x23, 0x21, 0x95, 0x4,  0x75, 0x12, 0xc9, 0xcc,
-    0x16, 0xbd, 0xb6, 0x99, 0xad, 0xf8, 0x75, 0x35, 0xb6, 0x42, 0xae, 0xae,
-    0xae, 0x86, 0x56, 0xf8, 0xcc, 0x16, 0x30, 0xb3, 0x45, 0xad, 0xd,  0x40,
-    0xd6, 0xd1, 0xd6, 0x99, 0x40, 0xbe, 0xe2, 0xdc, 0x31, 0x7,  0xa6, 0xb9,
-    0x27, 0x92, 0x38, 0x0,  0x3,  0x5e, 0x2c, 0xbe, 0xe6, 0xfb, 0x19, 0xbf,
-    0xf3, 0x6d, 0xbc, 0x4d, 0x64, 0xe5, 0xba, 0x76, 0xde, 0x31, 0x65, 0x66,
-    0x14, 0xa6, 0x3a, 0xc5, 0x8f, 0xb1, 0xb4, 0xba, 0x1f, 0xb1, 0xb8, 0xd4,
-    0x75, 0xba, 0x18, 0x86, 0x95, 0x3c, 0x26, 0xf6, 0x25, 0x62, 0x53, 0xfd,
-    0x9c, 0x94, 0x76, 0xf6, 0x95, 0x2c, 0xb1, 0xfd, 0xdc, 0xc0, 0xe4, 0x3f,
-    0xb3, 0xff, 0x67, 0xde, 0xd5, 0x94, 0xcc, 0xb0, 0x83, 0x2f, 0x28, 0x93,
-    0x92, 0x3,  0xa1, 0x41, 0x64, 0x60, 0x62, 0x70, 0x80, 0x87, 0xaf, 0xe7,
-    0x60, 0x4a, 0x20, 0x23, 0xb3, 0x11, 0x7,  0x38, 0x38, 0xd4, 0xa,  0x66,
-    0xb5, 0x93, 0x41, 0x90, 0x19, 0x17, 0x18, 0x60, 0xa5, 0xb,  0x7a, 0x24,
-    0xaa, 0x20, 0x81, 0xac, 0xa9, 0xa1, 0x70, 0xa6, 0x12, 0x8a, 0x4a, 0xa3,
-    0xa0, 0xf9, 0x9a, 0x97, 0xe7, 0xa8, 0xac, 0x8,  0xa8, 0xc4, 0x2a, 0x86,
-    0xa7, 0x69, 0x1e, 0x67, 0xe6, 0xbe, 0xa4, 0xd3, 0xff, 0x91, 0x61, 0xf6,
-    0x8a, 0xe6, 0xb5, 0xb3, 0x61, 0x9f, 0x19, 0x17, 0x98, 0x27, 0x6b, 0xe9,
-    0x8,  0x98, 0xe1, 0x21, 0x4a, 0x9,  0xb5, 0xd7, 0xca, 0xfa, 0x94, 0xd0,
-    0x69, 0x1a, 0xeb, 0x52, 0x1,  0x4e, 0xf5, 0xf6, 0xdf, 0x7f, 0xe7, 0x29,
-    0x70, 0xee, 0x4,  0xda, 0x2f, 0xa4, 0xff, 0xfe, 0xbb, 0x6f, 0xa8, 0xff,
-    0xfe, 0xdb, 0xaf, 0x8,  0xf6, 0x72, 0xa1, 0x40, 0x5d, 0xf0, 0x2d, 0x8,
-    0x82, 0x5b, 0x87, 0xbd, 0x10, 0x8,  0xe9, 0x7,  0xee, 0x4b, 0x80, 0xda,
-    0x4a, 0x4,  0xc5, 0x5e, 0xa0, 0xb7, 0x1e, 0x60, 0xb0, 0x59, 0x76, 0x60,
-    0xb,  0x2e, 0x19, 0x8a, 0x2e, 0x1c, 0xe6, 0x6,  0x20, 0xb8, 0x64, 0x18,
-    0x2a, 0xcf, 0x51, 0x94, 0xd4, 0xee, 0xc3, 0xfe, 0x39, 0x74, 0xd4, 0x2b,
-    0x48, 0xc9, 0x83, 0x4c, 0x9b, 0xd0, 0x4c, 0x35, 0x10, 0xe3, 0x9,  0xf7,
-    0x72, 0xf0, 0x7a, 0xe,  0xbf, 0x7d, 0x36, 0x2e, 0x19, 0x7e, 0x3f, 0xc,
-    0xf7, 0x93, 0xe7, 0xf4, 0x1d, 0x32, 0xc6, 0xb0, 0x89, 0xad, 0xe0, 0x28,
-    0xc1, 0xa7, 0x59, 0xe3, 0x0,
-};
-
-// Tests that the decoded kEncodedTestProfile matches kTestProfile.
-TEST(IccCodecTest, EncodedIccProfile) {
-  jxl::BitReader reader(
-      jxl::Bytes(kEncodedTestProfile, sizeof(kEncodedTestProfile)));
-  std::vector<uint8_t> dec;
-  ASSERT_TRUE(test::ReadICC(&reader, &dec));
-  ASSERT_TRUE(reader.Close());
-  EXPECT_EQ(sizeof(kTestProfile), dec.size());
-  if (sizeof(kTestProfile) == dec.size()) {
-    for (size_t i = 0; i < dec.size(); i++) {
-      EXPECT_EQ(kTestProfile[i], dec[i]);
-      if (kTestProfile[i] != dec[i]) break;  // One output is enough
-    }
-  }
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/image.cc b/third_party/jpeg-xl/lib/jxl/image.cc
deleted file mode 100644
index f7a05c82745a3..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/image.cc
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/image.h"
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>  // fill, swap
-#include <cstddef>
-#include <cstdint>
-#include <limits>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/memory_manager_internal.h"
-
-#if defined(MEMORY_SANITIZER)
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/sanitizers.h"
-#include "lib/jxl/simd_util.h"
-#endif
-
-namespace jxl {
-namespace detail {
-
-namespace {
-
-// Initializes the minimum bytes required to suppress MSAN warnings from
-// legitimate vector loads/stores on the right border, where some lanes are
-// uninitialized and assumed to be unused.
-void InitializePadding(PlaneBase& plane, const size_t sizeof_t) {
-#if defined(MEMORY_SANITIZER)
-  size_t xsize = plane.xsize();
-  size_t ysize = plane.ysize();
-  if (xsize == 0 || ysize == 0) return;
-
-  const size_t vec_size = MaxVectorSize();
-  if (vec_size == 0) return;  // Scalar mode: no padding needed
-
-  const size_t valid_size = xsize * sizeof_t;
-  const size_t initialize_size = RoundUpTo(valid_size, vec_size);
-  if (valid_size == initialize_size) return;
-
-  for (size_t y = 0; y < ysize; ++y) {
-    uint8_t* JXL_RESTRICT row = plane.bytes() + y * plane.bytes_per_row();
-#if defined(__clang__) &&                                           \
-    ((!defined(__apple_build_version__) && __clang_major__ <= 6) || \
-     (defined(__apple_build_version__) &&                           \
-      __apple_build_version__ <= 10001145))
-    // There's a bug in MSAN in clang-6 when handling AVX2 operations. This
-    // workaround allows tests to pass on MSAN, although it is slower and
-    // prevents MSAN warnings from uninitialized images.
-    std::fill(row, msan::kSanitizerSentinelByte, initialize_size);
-#else
-    memset(row + valid_size, msan::kSanitizerSentinelByte,
-           initialize_size - valid_size);
-#endif  // clang6
-  }
-#endif  // MEMORY_SANITIZER
-}
-
-}  // namespace
-
-PlaneBase::PlaneBase(const uint32_t xsize, const uint32_t ysize,
-                     const size_t sizeof_t)
-    : xsize_(xsize),
-      ysize_(ysize),
-      orig_xsize_(xsize),
-      orig_ysize_(ysize),
-      bytes_per_row_(BytesPerRow(xsize_, sizeof_t)),
-      sizeof_t_(sizeof_t) {}
-
-Status PlaneBase::Allocate(JxlMemoryManager* memory_manager,
-                           size_t pre_padding) {
-  JXL_ENSURE(bytes_.address<void>() == nullptr);
-
-  // Dimensions can be zero, e.g. for lazily-allocated images. Only allocate
-  // if nonzero, because "zero" bytes still have padding/bookkeeping overhead.
-  if (xsize_ == 0 || ysize_ == 0) {
-    return true;
-  }
-
-  size_t max_y_size = std::numeric_limits<size_t>::max() / bytes_per_row_;
-  if (ysize_ > max_y_size) {
-    return JXL_FAILURE("Image dimensions are too large");
-  }
-
-  JXL_ASSIGN_OR_RETURN(
-      bytes_, AlignedMemory::Create(memory_manager, bytes_per_row_ * ysize_,
-                                    pre_padding * sizeof_t_));
-
-  InitializePadding(*this, sizeof_t_);
-
-  return true;
-}
-
-void PlaneBase::Swap(PlaneBase& other) {
-  std::swap(xsize_, other.xsize_);
-  std::swap(ysize_, other.ysize_);
-  std::swap(orig_xsize_, other.orig_xsize_);
-  std::swap(orig_ysize_, other.orig_ysize_);
-  std::swap(bytes_per_row_, other.bytes_per_row_);
-  std::swap(bytes_, other.bytes_);
-}
-
-}  // namespace detail
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/image.h b/third_party/jpeg-xl/lib/jxl/image.h
deleted file mode 100644
index 633213d25731e..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/image.h
+++ /dev/null
@@ -1,331 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_IMAGE_H_
-#define LIB_JXL_IMAGE_H_
-
-// SIMD/multicore-friendly planar image representation with row accessors.
-
-#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) || \
-    defined(THREAD_SANITIZER)
-#include <cinttypes>  // PRIu64
-#endif
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <utility>  // std::move
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/memory_manager_internal.h"
-
-namespace jxl {
-
-// DO NOT use PlaneBase outside of image.{h|cc}
-namespace detail {
-
-// Type-independent parts of Plane<> - reduces code duplication and facilitates
-// moving member function implementations to cc file.
-struct PlaneBase {
-  PlaneBase()
-      : xsize_(0),
-        ysize_(0),
-        orig_xsize_(0),
-        orig_ysize_(0),
-        bytes_per_row_(0),
-        sizeof_t_(0) {}
-
-  // Copy construction/assignment is forbidden to avoid inadvertent copies,
-  // which can be very expensive. Use CopyImageTo() instead.
-  PlaneBase(const PlaneBase& other) = delete;
-  PlaneBase& operator=(const PlaneBase& other) = delete;
-
-  // Move constructor (required for returning Image from function)
-  PlaneBase(PlaneBase&& other) noexcept = default;
-
-  // Move assignment (required for std::vector)
-  PlaneBase& operator=(PlaneBase&& other) noexcept = default;
-
-  ~PlaneBase() = default;
-
-  void Swap(PlaneBase& other);
-
-  // Useful for pre-allocating image with some padding for alignment purposes
-  // and later reporting the actual valid dimensions. May also be used to
-  // un-shrink the image. Caller is responsible for ensuring xsize/ysize are <=
-  // the original dimensions.
-  Status ShrinkTo(const size_t xsize, const size_t ysize) {
-    JXL_ENSURE(xsize <= orig_xsize_);
-    JXL_ENSURE(ysize <= orig_ysize_);
-    xsize_ = static_cast<uint32_t>(xsize);
-    ysize_ = static_cast<uint32_t>(ysize);
-    // NOTE: we can't recompute bytes_per_row for more compact storage and
-    // better locality because that would invalidate the image contents.
-    return true;
-  }
-
-  // How many pixels.
-  JXL_INLINE size_t xsize() const { return xsize_; }
-  JXL_INLINE size_t ysize() const { return ysize_; }
-
-  // NOTE: do not use this for copying rows - the valid xsize may be much less.
-  JXL_INLINE size_t bytes_per_row() const { return bytes_per_row_; }
-
-  JXL_INLINE JxlMemoryManager* memory_manager() const {
-    return bytes_.memory_manager();
-  }
-
-  // Raw access to byte contents, for interfacing with other libraries.
-  // Unsigned char instead of char to avoid surprises (sign extension).
-  JXL_INLINE uint8_t* bytes() {
-    uint8_t* p = bytes_.address<uint8_t>();
-    return static_cast<uint8_t * JXL_RESTRICT>(JXL_ASSUME_ALIGNED(p, 64));
-  }
-  JXL_INLINE const uint8_t* bytes() const {
-    const uint8_t* p = bytes_.address<uint8_t>();
-    return static_cast<const uint8_t * JXL_RESTRICT>(JXL_ASSUME_ALIGNED(p, 64));
-  }
-
- protected:
-  PlaneBase(uint32_t xsize, uint32_t ysize, size_t sizeof_t);
-  Status Allocate(JxlMemoryManager* memory_manager, size_t pre_padding);
-
-  // Returns pointer to the start of a row.
-  JXL_INLINE void* VoidRow(const size_t y) const {
-    JXL_DASSERT(y < ysize_);
-    uint8_t* row = bytes_.address<uint8_t>() + y * bytes_per_row_;
-    return JXL_ASSUME_ALIGNED(row, 64);
-  }
-
-  // (Members are non-const to enable assignment during move-assignment.)
-  uint32_t xsize_;  // In valid pixels, not including any padding.
-  uint32_t ysize_;
-  uint32_t orig_xsize_;
-  uint32_t orig_ysize_;
-  size_t bytes_per_row_;  // Includes padding.
-  AlignedMemory bytes_;
-  size_t sizeof_t_;
-};
-
-}  // namespace detail
-
-// Single channel, aligned rows separated by padding. T must be POD.
-//
-// 'Single channel' (one 2D array per channel) simplifies vectorization
-// (repeating the same operation on multiple adjacent components) without the
-// complexity of a hybrid layout (8 R, 8 G, 8 B, ...). In particular, clients
-// can easily iterate over all components in a row and Image requires no
-// knowledge of the pixel format beyond the component type "T".
-//
-// 'Aligned' means each row is aligned to the L1 cache line size. This prevents
-// false sharing between two threads operating on adjacent rows.
-//
-// 'Padding' is still relevant because vectors could potentially be larger than
-// a cache line. By rounding up row sizes to the vector size, we allow
-// reading/writing ALIGNED vectors whose first lane is a valid sample. This
-// avoids needing a separate loop to handle remaining unaligned lanes.
-//
-// This image layout could also be achieved with a vector and a row accessor
-// function, but a class wrapper with support for "deleter" allows wrapping
-// existing memory allocated by clients without copying the pixels. It also
-// provides convenient accessors for xsize/ysize, which shortens function
-// argument lists. Supports move-construction so it can be stored in containers.
-template <typename ComponentType>
-class Plane : public detail::PlaneBase {
- public:
-  using T = ComponentType;
-  static constexpr size_t kNumPlanes = 1;
-
-  Plane() = default;
-
-  static StatusOr<Plane> Create(JxlMemoryManager* memory_manager,
-                                const size_t xsize, const size_t ysize,
-                                const size_t pre_padding = 0) {
-    static_assert(sizeof(T) == 1 || sizeof(T) == 2 || sizeof(T) == 4 ||
-                  sizeof(T) == 8);
-    uint32_t xsize32 = static_cast<uint32_t>(xsize);
-    uint32_t ysize32 = static_cast<uint32_t>(ysize);
-    JXL_ENSURE(xsize32 == xsize);
-    JXL_ENSURE(ysize32 == ysize);
-    Plane plane(xsize32, ysize32, sizeof(T));
-    JXL_RETURN_IF_ERROR(plane.Allocate(memory_manager, pre_padding));
-    return plane;
-  }
-
-  JXL_INLINE T* Row(const size_t y) { return static_cast<T*>(VoidRow(y)); }
-
-  // Returns pointer to const (see above).
-  JXL_INLINE const T* Row(const size_t y) const {
-    return static_cast<const T*>(VoidRow(y));
-  }
-
-  // Documents that the access is const.
-  JXL_INLINE const T* ConstRow(const size_t y) const {
-    return static_cast<const T*>(VoidRow(y));
-  }
-
-  // Returns number of pixels (some of which are padding) per row. Useful for
-  // computing other rows via pointer arithmetic. WARNING: this must
-  // NOT be used to determine xsize.
-  JXL_INLINE intptr_t PixelsPerRow() const {
-    return static_cast<intptr_t>(bytes_per_row_ / sizeof(T));
-  }
-
- private:
-  Plane(uint32_t xsize, uint32_t ysize, size_t sizeof_t)
-      : detail::PlaneBase(xsize, ysize, sizeof_t) {}
-};
-
-using ImageSB = Plane<int8_t>;
-using ImageB = Plane<uint8_t>;
-using ImageS = Plane<int16_t>;  // signed integer or half-float
-using ImageU = Plane<uint16_t>;
-using ImageI = Plane<int32_t>;
-using ImageF = Plane<float>;
-using ImageD = Plane<double>;
-
-// Currently, we abuse Image to either refer to an image that owns its storage
-// or one that doesn't. In similar vein, we abuse Image* function parameters to
-// either mean "assign to me" or "fill the provided image with data".
-// Hopefully, the "assign to me" meaning will go away and most images in the
-// codebase will not be backed by own storage. When this happens we can redesign
-// Image to be a non-storage-holding view class and introduce BackedImage in
-// those places that actually need it.
-
-// NOTE: we can't use Image as a view because invariants are violated
-// (alignment and the presence of padding before/after each "row").
-
-// A bundle of 3 same-sized images. Typically constructed by moving from three
-// rvalue references to Image. To overwrite an existing Image3 using
-// single-channel producers, we also need access to Image*. Constructing
-// temporary non-owning Image pointing to one plane of an existing Image3 risks
-// dangling references, especially if the wrapper is moved. Therefore, we
-// store an array of Image (which are compact enough that size is not a concern)
-// and provide Plane+Row accessors.
-template <typename ComponentType>
-class Image3 {
- public:
-  using T = ComponentType;
-  using PlaneT = jxl::Plane<T>;
-  static constexpr size_t kNumPlanes = 3;
-
-  Image3() : planes_{PlaneT(), PlaneT(), PlaneT()} {}
-
-  // Copy construction/assignment is forbidden to avoid inadvertent copies,
-  // which can be very expensive. Use CopyImageTo instead.
-  Image3(const Image3& other) = delete;
-  Image3& operator=(const Image3& other) = delete;
-
-  Image3(Image3&& other) noexcept {
-    for (size_t i = 0; i < kNumPlanes; i++) {
-      planes_[i] = std::move(other.planes_[i]);
-    }
-  }
-  Image3& operator=(Image3&& other) noexcept {
-    for (size_t i = 0; i < kNumPlanes; i++) {
-      planes_[i] = std::move(other.planes_[i]);
-    }
-    return *this;
-  }
-
-  static StatusOr<Image3> Create(JxlMemoryManager* memory_manager,
-                                 const size_t xsize, const size_t ysize) {
-    JXL_ASSIGN_OR_RETURN(PlaneT plane0,
-                         PlaneT::Create(memory_manager, xsize, ysize));
-    JXL_ASSIGN_OR_RETURN(PlaneT plane1,
-                         PlaneT::Create(memory_manager, xsize, ysize));
-    JXL_ASSIGN_OR_RETURN(PlaneT plane2,
-                         PlaneT::Create(memory_manager, xsize, ysize));
-    return Image3(std::move(plane0), std::move(plane1), std::move(plane2));
-  }
-
-  // Returns row pointer; usage: PlaneRow(idx_plane, y)[x] = val.
-  JXL_INLINE T* PlaneRow(const size_t c, const size_t y) {
-    // Custom implementation instead of calling planes_[c].Row ensures only a
-    // single multiplication is needed for PlaneRow(0..2, y).
-    PlaneRowBoundsCheck(c, y);
-    const size_t row_offset = y * planes_[0].bytes_per_row();
-    void* row = planes_[c].bytes() + row_offset;
-    return static_cast<T * JXL_RESTRICT>(JXL_ASSUME_ALIGNED(row, 64));
-  }
-
-  // Returns const row pointer; usage: val = PlaneRow(idx_plane, y)[x].
-  JXL_INLINE const T* PlaneRow(const size_t c, const size_t y) const {
-    PlaneRowBoundsCheck(c, y);
-    const size_t row_offset = y * planes_[0].bytes_per_row();
-    const void* row = planes_[c].bytes() + row_offset;
-    return static_cast<const T * JXL_RESTRICT>(JXL_ASSUME_ALIGNED(row, 64));
-  }
-
-  // Returns const row pointer, even if called from a non-const Image3.
-  JXL_INLINE const T* ConstPlaneRow(const size_t c, const size_t y) const {
-    PlaneRowBoundsCheck(c, y);
-    return PlaneRow(c, y);
-  }
-
-  JXL_INLINE const PlaneT& Plane(size_t idx) const { return planes_[idx]; }
-
-  JXL_INLINE PlaneT& Plane(size_t idx) { return planes_[idx]; }
-
-  void Swap(Image3& other) {
-    for (size_t c = 0; c < 3; ++c) {
-      other.planes_[c].Swap(planes_[c]);
-    }
-  }
-
-  // Useful for pre-allocating image with some padding for alignment purposes
-  // and later reporting the actual valid dimensions. May also be used to
-  // un-shrink the image. Caller is responsible for ensuring xsize/ysize are <=
-  // the original dimensions.
-  Status ShrinkTo(const size_t xsize, const size_t ysize) {
-    for (PlaneT& plane : planes_) {
-      JXL_RETURN_IF_ERROR(plane.ShrinkTo(xsize, ysize));
-    }
-    return true;
-  }
-
-  // Sizes of all three images are guaranteed to be equal.
-  JXL_INLINE JxlMemoryManager* memory_manager() const {
-    return planes_[0].memory_manager();
-  }
-  JXL_INLINE size_t xsize() const { return planes_[0].xsize(); }
-  JXL_INLINE size_t ysize() const { return planes_[0].ysize(); }
-  // Returns offset [bytes] from one row to the next row of the same plane.
-  // WARNING: this must NOT be used to determine xsize, nor for copying rows -
-  // the valid xsize may be much less.
-  JXL_INLINE size_t bytes_per_row() const { return planes_[0].bytes_per_row(); }
-  // Returns number of pixels (some of which are padding) per row. Useful for
-  // computing other rows via pointer arithmetic. WARNING: this must NOT be used
-  // to determine xsize.
-  JXL_INLINE intptr_t PixelsPerRow() const { return planes_[0].PixelsPerRow(); }
-
- private:
-  Image3(PlaneT&& plane0, PlaneT&& plane1, PlaneT&& plane2) {
-    planes_[0] = std::move(plane0);
-    planes_[1] = std::move(plane1);
-    planes_[2] = std::move(plane2);
-  }
-
-  void PlaneRowBoundsCheck(const size_t c, const size_t y) const {
-    JXL_DASSERT(c < kNumPlanes && y < ysize());
-  }
-
-  PlaneT planes_[kNumPlanes];
-};
-
-using Image3B = Image3<uint8_t>;
-using Image3S = Image3<int16_t>;
-using Image3U = Image3<uint16_t>;
-using Image3I = Image3<int32_t>;
-using Image3F = Image3<float>;
-using Image3D = Image3<double>;
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_IMAGE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/image_bundle.cc b/third_party/jpeg-xl/lib/jxl/image_bundle.cc
deleted file mode 100644
index d6953c6a566a2..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/image_bundle.cc
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/image_bundle.h"
-
-#include <utility>
-
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/image.h"
-
-namespace jxl {
-
-Status ImageBundle::ShrinkTo(size_t xsize, size_t ysize) {
-  if (HasColor()) {
-    JXL_RETURN_IF_ERROR(color_.ShrinkTo(xsize, ysize));
-  }
-  for (ImageF& ec : extra_channels_) {
-    JXL_RETURN_IF_ERROR(ec.ShrinkTo(xsize, ysize));
-  }
-  return true;
-}
-
-// Called by all other SetFrom*.
-Status ImageBundle::SetFromImage(Image3F&& color,
-                                 const ColorEncoding& c_current) {
-  JXL_ENSURE(color.xsize() != 0 && color.ysize() != 0);
-  JXL_ENSURE(metadata_->color_encoding.IsGray() == c_current.IsGray());
-  color_ = std::move(color);
-  c_current_ = c_current;
-  JXL_RETURN_IF_ERROR(VerifySizes());
-  return true;
-}
-
-Status ImageBundle::VerifyMetadata() const {
-  JXL_ENSURE(!c_current_.ICC().empty());
-  JXL_ENSURE(metadata_->color_encoding.IsGray() == IsGray());
-
-  if (metadata_->HasAlpha()) {
-    const ImageF* a = alpha();
-    if (a->xsize() == 0) {
-      return JXL_UNREACHABLE("MD alpha_bits %u IB alpha %" PRIuS " x %" PRIuS
-                             "\n",
-                             metadata_->GetAlphaBits(), a->xsize(), a->ysize());
-    }
-  }
-  const uint32_t alpha_bits = metadata_->GetAlphaBits();
-  JXL_ENSURE(alpha_bits <= 32);
-
-  // metadata_->num_extra_channels may temporarily differ from
-  // extra_channels_.size(), e.g. after SetAlpha. They are synced by the next
-  // call to VisitFields.
-  return true;
-}
-
-Status ImageBundle::VerifySizes() const {
-  const size_t xs = xsize();
-  const size_t ys = ysize();
-
-  if (HasExtraChannels()) {
-    JXL_ENSURE(xs != 0 && ys != 0);
-    for (const ImageF& ec : extra_channels_) {
-      JXL_ENSURE(ec.xsize() == xs);
-      JXL_ENSURE(ec.ysize() == ys);
-    }
-  }
-  return true;
-}
-
-size_t ImageBundle::DetectRealBitdepth() const {
-  return metadata_->bit_depth.bits_per_sample;
-
-  // TODO(lode): let this function return lower bit depth if possible, e.g.
-  // return 8 bits in case the original image came from a 16-bit PNG that
-  // was in fact representable as 8-bit PNG. Ensure that the implementation
-  // returns 16 if e.g. two consecutive 16-bit values appeared in the original
-  // image (such as 32768 and 32769), take into account that e.g. the values
-  // 3-bit can represent is not a superset of the values 2-bit can represent,
-  // and there may be slight imprecisions in the floating point image.
-}
-
-const ImageF* ImageBundle::black() const {
-  if (!HasBlack()) return nullptr;
-  const size_t ec = metadata_->Find(ExtraChannel::kBlack) -
-                    metadata_->extra_channel_info.data();
-  JXL_DASSERT(ec < extra_channels_.size());
-  return &extra_channels_[ec];
-}
-const ImageF* ImageBundle::alpha() const {
-  if (!HasAlpha()) return nullptr;
-  const size_t ec = metadata_->Find(ExtraChannel::kAlpha) -
-                    metadata_->extra_channel_info.data();
-  JXL_DASSERT(ec < extra_channels_.size());
-  return &extra_channels_[ec];
-}
-ImageF* ImageBundle::alpha() {
-  if (!HasAlpha()) return nullptr;
-  const size_t ec = metadata_->Find(ExtraChannel::kAlpha) -
-                    metadata_->extra_channel_info.data();
-  JXL_DASSERT(ec < extra_channels_.size());
-  return &extra_channels_[ec];
-}
-
-Status ImageBundle::SetAlpha(ImageF&& alpha) {
-  const ExtraChannelInfo* eci = metadata_->Find(ExtraChannel::kAlpha);
-  // Must call SetAlphaBits first, otherwise we don't know which channel index
-  JXL_ENSURE(eci != nullptr);
-  JXL_ENSURE(alpha.xsize() != 0 && alpha.ysize() != 0);
-  if (extra_channels_.size() < metadata_->extra_channel_info.size()) {
-    // TODO(jon): get rid of this case
-    extra_channels_.insert(
-        extra_channels_.begin() + (eci - metadata_->extra_channel_info.data()),
-        std::move(alpha));
-  } else {
-    extra_channels_[eci - metadata_->extra_channel_info.data()] =
-        std::move(alpha);
-  }
-  // num_extra_channels is automatically set in visitor
-  JXL_RETURN_IF_ERROR(VerifySizes());
-  return true;
-}
-
-Status ImageBundle::SetExtraChannels(std::vector<ImageF>&& extra_channels) {
-  for (const ImageF& plane : extra_channels) {
-    JXL_ENSURE(plane.xsize() != 0 && plane.ysize() != 0);
-  }
-  extra_channels_ = std::move(extra_channels);
-  JXL_RETURN_IF_ERROR(VerifySizes());
-  return true;
-}
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/image_bundle.h b/third_party/jpeg-xl/lib/jxl/image_bundle.h
deleted file mode 100644
index 1da70e318fb68..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/image_bundle.h
+++ /dev/null
@@ -1,265 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_IMAGE_BUNDLE_H_
-#define LIB_JXL_IMAGE_BUNDLE_H_
-
-// The main image or frame consists of a bundle of associated images.
-
-#include <jxl/cms_interface.h>
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/common.h"  // JPEGXL_ENABLE_TRANSCODE_JPEG
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/jpeg/jpeg_data.h"
-
-namespace jxl {
-
-// A bundle of color/alpha/depth/plane images.
-class ImageBundle {
- public:
-  // Uninitialized state for use as output parameter.
-  explicit ImageBundle(JxlMemoryManager* memory_manager)
-      : memory_manager_(memory_manager), metadata_(nullptr) {}
-  // Caller is responsible for setting metadata before calling Set*.
-  ImageBundle(JxlMemoryManager* memory_manager, const ImageMetadata* metadata)
-      : memory_manager_(memory_manager), metadata_(metadata) {}
-
-  // Move-only (allows storing in std::vector).
-  ImageBundle(ImageBundle&&) = default;
-  ImageBundle& operator=(ImageBundle&&) = default;
-
-  StatusOr<ImageBundle> Copy() const {
-    JxlMemoryManager* memory_manager = this->memory_manager();
-    ImageBundle copy(memory_manager, metadata_);
-    JXL_ASSIGN_OR_RETURN(
-        copy.color_,
-        Image3F::Create(memory_manager, color_.xsize(), color_.ysize()));
-    JXL_RETURN_IF_ERROR(CopyImageTo(color_, &copy.color_));
-    copy.c_current_ = c_current_;
-    copy.extra_channels_.reserve(extra_channels_.size());
-    for (const ImageF& plane : extra_channels_) {
-      JXL_ASSIGN_OR_RETURN(
-          ImageF ec,
-          ImageF::Create(memory_manager, plane.xsize(), plane.ysize()));
-      JXL_RETURN_IF_ERROR(CopyImageTo(plane, &ec));
-      copy.extra_channels_.emplace_back(std::move(ec));
-    }
-
-    copy.jpeg_data =
-        jpeg_data ? make_unique<jpeg::JPEGData>(*jpeg_data) : nullptr;
-    copy.color_transform = color_transform;
-    copy.chroma_subsampling = chroma_subsampling;
-
-    return copy;
-  }
-
-  // -- SIZE
-
-  size_t xsize() const {
-    if (IsJPEG()) return jpeg_data->width;
-    if (color_.xsize() != 0) return color_.xsize();
-    return extra_channels_.empty() ? 0 : extra_channels_[0].xsize();
-  }
-  size_t ysize() const {
-    if (IsJPEG()) return jpeg_data->height;
-    if (color_.ysize() != 0) return color_.ysize();
-    return extra_channels_.empty() ? 0 : extra_channels_[0].ysize();
-  }
-  Status ShrinkTo(size_t xsize, size_t ysize);
-
-  // sizes taking orientation into account
-  size_t oriented_xsize() const {
-    if (static_cast<uint32_t>(metadata_->GetOrientation()) > 4) {
-      return ysize();
-    } else {
-      return xsize();
-    }
-  }
-  size_t oriented_ysize() const {
-    if (static_cast<uint32_t>(metadata_->GetOrientation()) > 4) {
-      return xsize();
-    } else {
-      return ysize();
-    }
-  }
-
-  JxlMemoryManager* memory_manager_;
-
-  // -- COLOR
-
-  JxlMemoryManager* memory_manager() const { return memory_manager_; }
-
-  // Whether color() is valid/usable. Returns true in most cases. Even images
-  // with spot colors (one example of when !planes().empty()) typically have a
-  // part that can be converted to RGB.
-  bool HasColor() const { return color_.xsize() != 0; }
-
-  // For resetting the size when switching from a reference to main frame.
-  void RemoveColor() { color_ = Image3F(); }
-
-  // Do not use if !HasColor().
-  const Image3F& color() const {
-    // If this fails, Set* was not called - perhaps because decoding failed?
-    JXL_DASSERT(HasColor());
-    return color_;
-  }
-
-  // Do not use if !HasColor().
-  Image3F* color() {
-    JXL_DASSERT(HasColor());
-    return &color_;
-  }
-
-  // If c_current.IsGray(), all planes must be identical. NOTE: c_current is
-  // independent of metadata()->color_encoding, which is the original, whereas
-  // a decoder might return pixels in a different c_current.
-  // This only sets the color channels, you must also make extra channels
-  // match the amount that is in the metadata.
-  Status SetFromImage(Image3F&& color, const ColorEncoding& c_current);
-
-  // -- COLOR ENCODING
-
-  const ColorEncoding& c_current() const { return c_current_; }
-
-  // Returns whether the color image has identical planes. Once established by
-  // Set*, remains unchanged until a subsequent Set* or TransformTo.
-  bool IsGray() const { return c_current_.IsGray(); }
-
-  bool IsSRGB() const { return c_current_.IsSRGB(); }
-  bool IsLinearSRGB() const { return c_current_.IsLinearSRGB(); }
-
-  // Set the c_current profile without doing any transformation, e.g. if the
-  // transformation was already applied.
-  void OverrideProfile(const ColorEncoding& new_c_current) {
-    c_current_ = new_c_current;
-  }
-
-  // TODO(lode): TransformTo and CopyTo are implemented in enc_image_bundle.cc,
-  // move these functions out of this header file and class, to
-  // enc_image_bundle.h.
-
-  // Transforms color to c_desired and sets c_current to c_desired. Alpha and
-  // metadata remains unchanged.
-  Status TransformTo(const ColorEncoding& c_desired, const JxlCmsInterface& cms,
-                     ThreadPool* pool = nullptr);
-  // Copies this:rect, converts to c_desired, and allocates+fills out.
-  Status CopyTo(const Rect& rect, const ColorEncoding& c_desired,
-                const JxlCmsInterface& cms, Image3F* out,
-                ThreadPool* pool = nullptr) const;
-
-  // Detect 'real' bit depth, which can be lower than nominal bit depth
-  // (this is common in PNG), returns 'real' bit depth
-  size_t DetectRealBitdepth() const;
-
-  // -- ALPHA
-
-  Status SetAlpha(ImageF&& alpha);
-  bool HasAlpha() const {
-    return metadata_->Find(ExtraChannel::kAlpha) != nullptr;
-  }
-  bool AlphaIsPremultiplied() const {
-    const ExtraChannelInfo* eci = metadata_->Find(ExtraChannel::kAlpha);
-    return (eci == nullptr) ? false : eci->alpha_associated;
-  }
-  const ImageF* alpha() const;
-  ImageF* alpha();
-
-  // -- EXTRA CHANNELS
-  bool HasBlack() const {
-    return metadata_->Find(ExtraChannel::kBlack) != nullptr;
-  }
-  const ImageF* black() const;
-
-  // Extra channels of unknown interpretation (e.g. spot colors).
-  Status SetExtraChannels(std::vector<ImageF>&& extra_channels);
-  void ClearExtraChannels() { extra_channels_.clear(); }
-  bool HasExtraChannels() const { return !extra_channels_.empty(); }
-  const std::vector<ImageF>& extra_channels() const { return extra_channels_; }
-  std::vector<ImageF>& extra_channels() { return extra_channels_; }
-
-  const ImageMetadata* metadata() const { return metadata_; }
-
-  Status VerifyMetadata() const;
-
-  void SetDecodedBytes(size_t decoded_bytes) { decoded_bytes_ = decoded_bytes; }
-  size_t decoded_bytes() const { return decoded_bytes_; }
-
-  // -- JPEG transcoding:
-
-  // Returns true if image does or will represent quantized DCT-8 coefficients,
-  // stored in 8x8 pixel regions.
-  bool IsJPEG() const {
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-    return jpeg_data != nullptr;
-#else   // JPEGXL_ENABLE_TRANSCODE_JPEG
-    return false;
-#endif  // JPEGXL_ENABLE_TRANSCODE_JPEG
-  }
-
-  std::unique_ptr<jpeg::JPEGData> jpeg_data;
-  // these fields are used to signal the input JPEG color space
-  // NOTE: JPEG doesn't actually provide a way to determine whether YCbCr was
-  // applied or not.
-  ColorTransform color_transform = ColorTransform::kNone;
-  YCbCrChromaSubsampling chroma_subsampling;
-
-  FrameOrigin origin{0, 0};
-
-  // Animation-related information, corresponding to the timecode and duration
-  // fields of the jxl::AnimationFrame of the jxl::FrameHeader.
-  // TODO(lode): ImageBundle is used here to carry the information from
-  // jxl::FrameHeader, consider instead passing a jxl::FrameHeader directly to
-  // EncodeFrame or having a field of that type here.
-  uint32_t duration = 0;
-  uint32_t timecode = 0;
-
-  // TODO(lode): these fields do not match the JXL frame header, it should be
-  // possible to specify up to 4 (3 if nonzero duration) slots to save this
-  // frame as reference (see save_as_reference).
-  bool use_for_next_frame = false;
-  bool blend = false;
-  BlendMode blendmode = BlendMode::kBlend;
-
-  std::string name;
-
- private:
-  // Called after any Set* to ensure their sizes are compatible.
-  Status VerifySizes() const;
-
-  // Required for TransformTo so that an ImageBundle is self-sufficient. Always
-  // points to the same thing, but cannot be const-pointer because that prevents
-  // the compiler from generating a move ctor.
-  const ImageMetadata* metadata_;
-
-  // Initialized by Set*:
-  Image3F color_;  // If empty, planes_ is not; all planes equal if IsGray().
-  ColorEncoding c_current_;  // of color_
-
-  // Initialized by SetPlanes; size = ImageMetadata.num_extra_channels
-  std::vector<ImageF> extra_channels_;
-
-  // How many bytes of the input were actually read.
-  size_t decoded_bytes_ = 0;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_IMAGE_BUNDLE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/image_bundle_test.cc b/third_party/jpeg-xl/lib/jxl/image_bundle_test.cc
deleted file mode 100644
index c92449968eefd..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/image_bundle_test.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/memory_manager.h>
-
-#include <utility>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-TEST(ImageBundleTest, ExtraChannelName) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  AuxOut aux_out;
-  BitWriter writer{memory_manager};
-  ASSERT_TRUE(
-      writer.WithMaxBits(99, LayerType::Header, &aux_out, [&]() -> Status {
-        ImageMetadata metadata;
-        ExtraChannelInfo eci;
-        eci.type = ExtraChannel::kBlack;
-        eci.name = "testK";
-        metadata.extra_channel_info.push_back(std::move(eci));
-        JXL_RETURN_IF_ERROR(
-            WriteImageMetadata(metadata, &writer, LayerType::Header, &aux_out));
-        writer.ZeroPadToByte();
-        return true;
-      }));
-
-  BitReader reader(writer.GetSpan());
-  ImageMetadata metadata_out;
-  ASSERT_TRUE(ReadImageMetadata(&reader, &metadata_out));
-  EXPECT_TRUE(reader.Close());
-  EXPECT_EQ("testK", metadata_out.Find(ExtraChannel::kBlack)->name);
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/image_metadata.cc b/third_party/jpeg-xl/lib/jxl/image_metadata.cc
deleted file mode 100644
index 14fac9d685dd2..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/image_metadata.cc
+++ /dev/null
@@ -1,483 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/image_metadata.h"
-
-#include <limits>
-#include <utility>
-
-#include "lib/jxl/alpha.h"
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/matrix_ops.h"
-#include "lib/jxl/cms/opsin_params.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/quantizer.h"
-
-namespace jxl {
-BitDepth::BitDepth() { Bundle::Init(this); }
-Status BitDepth::VisitFields(Visitor* JXL_RESTRICT visitor) {
-  JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &floating_point_sample));
-  // The same fields (bits_per_sample and exponent_bits_per_sample) are read
-  // in a different way depending on floating_point_sample's value. It's still
-  // default-initialized correctly so using visitor->Conditional is not
-  // required.
-  if (!floating_point_sample) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->U32(
-        Val(8), Val(10), Val(12), BitsOffset(6, 1), 8, &bits_per_sample));
-    exponent_bits_per_sample = 0;
-  } else {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->U32(
-        Val(32), Val(16), Val(24), BitsOffset(6, 1), 32, &bits_per_sample));
-    // The encoded value is exponent_bits_per_sample - 1, encoded in 3 bits
-    // so the value can be in range [1, 8].
-    const uint32_t offset = 1;
-    exponent_bits_per_sample -= offset;
-    JXL_QUIET_RETURN_IF_ERROR(
-        visitor->Bits(4, 8 - offset, &exponent_bits_per_sample));
-    exponent_bits_per_sample += offset;
-  }
-
-  // Error-checking for floating point ranges.
-  if (floating_point_sample) {
-    if (exponent_bits_per_sample < 2 || exponent_bits_per_sample > 8) {
-      return JXL_FAILURE("Invalid exponent_bits_per_sample: %u",
-                         exponent_bits_per_sample);
-    }
-    int mantissa_bits =
-        static_cast<int>(bits_per_sample) - exponent_bits_per_sample - 1;
-    if (mantissa_bits < 2 || mantissa_bits > 23) {
-      return JXL_FAILURE("Invalid bits_per_sample: %u", bits_per_sample);
-    }
-  } else {
-    if (bits_per_sample > 31) {
-      return JXL_FAILURE("Invalid bits_per_sample: %u", bits_per_sample);
-    }
-  }
-  return true;
-}
-
-#if JXL_DEBUG_V_LEVEL >= 1
-std::string BitDepth::DebugString() const {
-  std::ostringstream os;
-  os << (floating_point_sample ? "F" : "U");
-  os << bits_per_sample;
-  if (floating_point_sample) os << "." << exponent_bits_per_sample;
-  return os.str();
-}
-#endif
-
-CustomTransformData::CustomTransformData() { Bundle::Init(this); }
-Status CustomTransformData::VisitFields(Visitor* JXL_RESTRICT visitor) {
-  if (visitor->AllDefault(*this, &all_default)) {
-    // Overwrite all serialized fields, but not any nonserialized_*.
-    visitor->SetDefault(this);
-    return true;
-  }
-  if (visitor->Conditional(nonserialized_xyb_encoded)) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&opsin_inverse_matrix));
-  }
-  JXL_QUIET_RETURN_IF_ERROR(visitor->Bits(3, 0, &custom_weights_mask));
-  if (visitor->Conditional((custom_weights_mask & 0x1) != 0)) {
-    // 4 5x5 kernels, but all of them can be obtained by symmetry from one,
-    // which is symmetric along its main diagonal. The top-left kernel is
-    // defined by
-    //
-    // 0  1  2  3  4
-    // 1  5  6  7  8
-    // 2  6  9 10 11
-    // 3  7 10 12 13
-    // 4  8 11 13 14
-    float constexpr kWeights2[15] = {
-        -0.01716200f, -0.03452303f, -0.04022174f, -0.02921014f, -0.00624645f,
-        0.14111091f,  0.28896755f,  0.00278718f,  -0.01610267f, 0.56661550f,
-        0.03777607f,  -0.01986694f, -0.03144731f, -0.01185068f, -0.00213539f};
-    for (size_t i = 0; i < 15; i++) {
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->F16(kWeights2[i], &upsampling2_weights[i]));
-    }
-  }
-  if (visitor->Conditional((custom_weights_mask & 0x2) != 0)) {
-    // 16 5x5 kernels, but all of them can be obtained by symmetry from
-    // three, two of which are symmetric along their main diagonals. The top
-    // left 4 kernels are defined by
-    //
-    // 0  1  2  3  4   5  6  7  8  9
-    // 1 10 11 12 13  14 15 16 17 18
-    // 2 11 19 20 21  22 23 24 25 26
-    // 3 12 20 27 28  29 30 31 32 33
-    // 4 13 21 28 34  35 36 37 38 39
-    //
-    // 5 14 22 29 35  40 41 42 43 44
-    // 6 15 23 30 36  41 45 46 47 48
-    // 7 16 24 31 37  42 46 49 50 51
-    // 8 17 25 32 38  43 47 50 52 53
-    // 9 18 26 33 39  44 48 51 53 54
-    constexpr float kWeights4[55] = {
-        -0.02419067f, -0.03491987f, -0.03693351f, -0.03094285f, -0.00529785f,
-        -0.01663432f, -0.03556863f, -0.03888905f, -0.03516850f, -0.00989469f,
-        0.23651958f,  0.33392945f,  -0.01073543f, -0.01313181f, -0.03556694f,
-        0.13048175f,  0.40103025f,  0.03951150f,  -0.02077584f, 0.46914198f,
-        -0.00209270f, -0.01484589f, -0.04064806f, 0.18942530f,  0.56279892f,
-        0.06674400f,  -0.02335494f, -0.03551682f, -0.00754830f, -0.02267919f,
-        -0.02363578f, 0.00315804f,  -0.03399098f, -0.01359519f, -0.00091653f,
-        -0.00335467f, -0.01163294f, -0.01610294f, -0.00974088f, -0.00191622f,
-        -0.01095446f, -0.03198464f, -0.04455121f, -0.02799790f, -0.00645912f,
-        0.06390599f,  0.22963888f,  0.00630981f,  -0.01897349f, 0.67537268f,
-        0.08483369f,  -0.02534994f, -0.02205197f, -0.01667999f, -0.00384443f};
-    for (size_t i = 0; i < 55; i++) {
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->F16(kWeights4[i], &upsampling4_weights[i]));
-    }
-  }
-  if (visitor->Conditional((custom_weights_mask & 0x4) != 0)) {
-    // typo:off
-    // 64 5x5 kernels, all of them can be obtained by symmetry from
-    // 10, 4 of which are symmetric along their main diagonals. The top
-    // left 16 kernels are defined by
-    //  0  1  2  3  4   5  6  7  8  9   a  b  c  d  e   f 10 11 12 13
-    //  1 14 15 16 17  18 19 1a 1b 1c  1d 1e 1f 20 21  22 23 24 25 26
-    //  2 15 27 28 29  2a 2b 2c 2d 2e  2f 30 31 32 33  34 35 36 37 38
-    //  3 16 28 39 3a  3b 3c 3d 3e 3f  40 41 42 43 44  45 46 47 48 49
-    //  4 17 29 3a 4a  4b 4c 4d 4e 4f  50 51 52 53 54  55 56 57 58 59
-
-    //  5 18 2a 3b 4b  5a 5b 5c 5d 5e  5f 60 61 62 63  64 65 66 67 68
-    //  6 19 2b 3c 4c  5b 69 6a 6b 6c  6d 6e 6f 70 71  72 73 74 75 76
-    //  7 1a 2c 3d 4d  5c 6a 77 78 79  7a 7b 7c 7d 7e  7f 80 81 82 83
-    //  8 1b 2d 3e 4e  5d 6b 78 84 85  86 87 88 89 8a  8b 8c 8d 8e 8f
-    //  9 1c 2e 3f 4f  5e 6c 79 85 90  91 92 93 94 95  96 97 98 99 9a
-
-    //  a 1d 2f 40 50  5f 6d 7a 86 91  9b 9c 9d 9e 9f  a0 a1 a2 a3 a4
-    //  b 1e 30 41 51  60 6e 7b 87 92  9c a5 a6 a7 a8  a9 aa ab ac ad
-    //  c 1f 31 42 52  61 6f 7c 88 93  9d a6 ae af b0  b1 b2 b3 b4 b5
-    //  d 20 32 43 53  62 70 7d 89 94  9e a7 af b6 b7  b8 b9 ba bb bc
-    //  e 21 33 44 54  63 71 7e 8a 95  9f a8 b0 b7 bd  be bf c0 c1 c2
-
-    //  f 22 34 45 55  64 72 7f 8b 96  a0 a9 b1 b8 be  c3 c4 c5 c6 c7
-    // 10 23 35 46 56  65 73 80 8c 97  a1 aa b2 b9 bf  c4 c8 c9 ca cb
-    // 11 24 36 47 57  66 74 81 8d 98  a2 ab b3 ba c0  c5 c9 cc cd ce
-    // 12 25 37 48 58  67 75 82 8e 99  a3 ac b4 bb c1  c6 ca cd cf d0
-    // 13 26 38 49 59  68 76 83 8f 9a  a4 ad b5 bc c2  c7 cb ce d0 d1
-    // typo:on
-    constexpr float kWeights8[210] = {
-        -0.02928613f, -0.03706353f, -0.03783812f, -0.03324558f, -0.00447632f,
-        -0.02519406f, -0.03752601f, -0.03901508f, -0.03663285f, -0.00646649f,
-        -0.02066407f, -0.03838633f, -0.04002101f, -0.03900035f, -0.00901973f,
-        -0.01626393f, -0.03954148f, -0.04046620f, -0.03979621f, -0.01224485f,
-        0.29895328f,  0.35757708f,  -0.02447552f, -0.01081748f, -0.04314594f,
-        0.23903219f,  0.41119301f,  -0.00573046f, -0.01450239f, -0.04246845f,
-        0.17567618f,  0.45220643f,  0.02287757f,  -0.01936783f, -0.03583255f,
-        0.11572472f,  0.47416733f,  0.06284440f,  -0.02685066f, 0.42720050f,
-        -0.02248939f, -0.01155273f, -0.04562755f, 0.28689496f,  0.49093869f,
-        -0.00007891f, -0.01545926f, -0.04562659f, 0.21238920f,  0.53980934f,
-        0.03369474f,  -0.02070211f, -0.03866988f, 0.14229550f,  0.56593398f,
-        0.08045181f,  -0.02888298f, -0.03680918f, -0.00542229f, -0.02920477f,
-        -0.02788574f, -0.02118180f, -0.03942402f, -0.00775547f, -0.02433614f,
-        -0.03193943f, -0.02030828f, -0.04044014f, -0.01074016f, -0.01930822f,
-        -0.03620399f, -0.01974125f, -0.03919545f, -0.01456093f, -0.00045072f,
-        -0.00360110f, -0.01020207f, -0.01231907f, -0.00638988f, -0.00071592f,
-        -0.00279122f, -0.00957115f, -0.01288327f, -0.00730937f, -0.00107783f,
-        -0.00210156f, -0.00890705f, -0.01317668f, -0.00813895f, -0.00153491f,
-        -0.02128481f, -0.04173044f, -0.04831487f, -0.03293190f, -0.00525260f,
-        -0.01720322f, -0.04052736f, -0.05045706f, -0.03607317f, -0.00738030f,
-        -0.01341764f, -0.03965629f, -0.05151616f, -0.03814886f, -0.01005819f,
-        0.18968273f,  0.33063684f,  -0.01300105f, -0.01372950f, -0.04017465f,
-        0.13727832f,  0.36402234f,  0.01027890f,  -0.01832107f, -0.03365072f,
-        0.08734506f,  0.38194295f,  0.04338228f,  -0.02525993f, 0.56408126f,
-        0.00458352f,  -0.01648227f, -0.04887868f, 0.24585519f,  0.62026135f,
-        0.04314807f,  -0.02213737f, -0.04158014f, 0.16637289f,  0.65027023f,
-        0.09621636f,  -0.03101388f, -0.04082742f, -0.00904519f, -0.02790922f,
-        -0.02117818f, 0.00798662f,  -0.03995711f, -0.01243427f, -0.02231705f,
-        -0.02946266f, 0.00992055f,  -0.03600283f, -0.01684920f, -0.00111684f,
-        -0.00411204f, -0.01297130f, -0.01723725f, -0.01022545f, -0.00165306f,
-        -0.00313110f, -0.01218016f, -0.01763266f, -0.01125620f, -0.00231663f,
-        -0.01374149f, -0.03797620f, -0.05142937f, -0.03117307f, -0.00581914f,
-        -0.01064003f, -0.03608089f, -0.05272168f, -0.03375670f, -0.00795586f,
-        0.09628104f,  0.27129991f,  -0.00353779f, -0.01734151f, -0.03153981f,
-        0.05686230f,  0.28500998f,  0.02230594f,  -0.02374955f, 0.68214326f,
-        0.05018048f,  -0.02320852f, -0.04383616f, 0.18459474f,  0.71517975f,
-        0.10805613f,  -0.03263677f, -0.03637639f, -0.01394373f, -0.02511203f,
-        -0.01728636f, 0.05407331f,  -0.02867568f, -0.01893131f, -0.00240854f,
-        -0.00446511f, -0.01636187f, -0.02377053f, -0.01522848f, -0.00333334f,
-        -0.00819975f, -0.02964169f, -0.04499287f, -0.02745350f, -0.00612408f,
-        0.02727416f,  0.19446600f,  0.00159832f,  -0.02232473f, 0.74982506f,
-        0.11452620f,  -0.03348048f, -0.01605681f, -0.02070339f, -0.00458223f};
-    for (size_t i = 0; i < 210; i++) {
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->F16(kWeights8[i], &upsampling8_weights[i]));
-    }
-  }
-  return true;
-}
-
-ExtraChannelInfo::ExtraChannelInfo() { Bundle::Init(this); }
-Status ExtraChannelInfo::VisitFields(Visitor* JXL_RESTRICT visitor) {
-  if (visitor->AllDefault(*this, &all_default)) {
-    // Overwrite all serialized fields, but not any nonserialized_*.
-    visitor->SetDefault(this);
-    return true;
-  }
-
-  // General
-  JXL_QUIET_RETURN_IF_ERROR(visitor->Enum(ExtraChannel::kAlpha, &type));
-
-  JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&bit_depth));
-
-  JXL_QUIET_RETURN_IF_ERROR(
-      visitor->U32(Val(0), Val(3), Val(4), BitsOffset(3, 1), 0, &dim_shift));
-  if ((1U << dim_shift) > 8) {
-    return JXL_FAILURE("dim_shift %u too large", dim_shift);
-  }
-
-  JXL_QUIET_RETURN_IF_ERROR(VisitNameString(visitor, &name));
-
-  // Conditional
-  if (visitor->Conditional(type == ExtraChannel::kAlpha)) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &alpha_associated));
-  }
-  if (visitor->Conditional(type == ExtraChannel::kSpotColor)) {
-    for (float& c : spot_color) {
-      JXL_QUIET_RETURN_IF_ERROR(visitor->F16(0, &c));
-    }
-  }
-  if (visitor->Conditional(type == ExtraChannel::kCFA)) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->U32(Val(1), Bits(2), BitsOffset(4, 3),
-                                           BitsOffset(8, 19), 1, &cfa_channel));
-  }
-
-  if (type == ExtraChannel::kUnknown ||
-      (static_cast<int>(ExtraChannel::kReserved0) <= static_cast<int>(type) &&
-       static_cast<int>(type) <= static_cast<int>(ExtraChannel::kReserved7))) {
-    return JXL_FAILURE("Unknown extra channel (bits %u, shift %u, name '%s')\n",
-                       bit_depth.bits_per_sample, dim_shift, name.c_str());
-  }
-  return true;
-}
-
-#if JXL_DEBUG_V_LEVEL >= 1
-std::string ExtraChannelInfo::DebugString() const {
-  std::ostringstream os;
-  os << (type == ExtraChannel::kAlpha           ? "Alpha"
-         : type == ExtraChannel::kDepth         ? "Depth"
-         : type == ExtraChannel::kSpotColor     ? "Spot"
-         : type == ExtraChannel::kSelectionMask ? "Mask"
-         : type == ExtraChannel::kBlack         ? "Black"
-         : type == ExtraChannel::kCFA           ? "CFA"
-         : type == ExtraChannel::kThermal       ? "Thermal"
-                                                : "Unknown");
-  if (type == ExtraChannel::kAlpha && alpha_associated) os << "(premul)";
-  os << " " << bit_depth.DebugString();
-  os << " shift: " << dim_shift;
-  return os.str();
-}
-#endif
-
-ImageMetadata::ImageMetadata() { Bundle::Init(this); }
-Status ImageMetadata::VisitFields(Visitor* JXL_RESTRICT visitor) {
-  if (visitor->AllDefault(*this, &all_default)) {
-    // Overwrite all serialized fields, but not any nonserialized_*.
-    visitor->SetDefault(this);
-    return true;
-  }
-
-  // Bundle::AllDefault does not allow usage when reading (it may abort the
-  // program when a codestream has invalid values), but when reading we
-  // overwrite the extra_fields value, so do not need to call AllDefault.
-  bool tone_mapping_default =
-      visitor->IsReading() ? false : Bundle::AllDefault(tone_mapping);
-
-  bool extra_fields = (orientation != 1 || have_preview || have_animation ||
-                       have_intrinsic_size || !tone_mapping_default);
-  JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &extra_fields));
-  if (visitor->Conditional(extra_fields)) {
-    orientation--;
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bits(3, 0, &orientation));
-    orientation++;
-    // (No need for bounds checking because we read exactly 3 bits)
-
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &have_intrinsic_size));
-    if (visitor->Conditional(have_intrinsic_size)) {
-      JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&intrinsic_size));
-    }
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &have_preview));
-    if (visitor->Conditional(have_preview)) {
-      JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&preview_size));
-    }
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &have_animation));
-    if (visitor->Conditional(have_animation)) {
-      JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&animation));
-    }
-  } else {
-    orientation = 1;  // identity
-    have_intrinsic_size = false;
-    have_preview = false;
-    have_animation = false;
-  }
-
-  JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&bit_depth));
-  JXL_QUIET_RETURN_IF_ERROR(
-      visitor->Bool(true, &modular_16_bit_buffer_sufficient));
-
-  num_extra_channels = extra_channel_info.size();
-  JXL_QUIET_RETURN_IF_ERROR(visitor->U32(Val(0), Val(1), BitsOffset(4, 2),
-                                         BitsOffset(12, 1), 0,
-                                         &num_extra_channels));
-
-  if (visitor->Conditional(num_extra_channels != 0)) {
-    if (visitor->IsReading()) {
-      extra_channel_info.resize(num_extra_channels);
-    }
-    for (ExtraChannelInfo& eci : extra_channel_info) {
-      JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&eci));
-    }
-  }
-
-  JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(true, &xyb_encoded));
-  JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&color_encoding));
-  if (visitor->Conditional(extra_fields)) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&tone_mapping));
-  }
-
-  // Treat as if only the fields up to extra channels exist.
-  if (visitor->IsReading() && nonserialized_only_parse_basic_info) {
-    return true;
-  }
-
-  JXL_QUIET_RETURN_IF_ERROR(visitor->BeginExtensions(&extensions));
-  // Extensions: in chronological order of being added to the format.
-  return visitor->EndExtensions();
-}
-
-OpsinInverseMatrix::OpsinInverseMatrix() { Bundle::Init(this); }
-Status OpsinInverseMatrix::VisitFields(Visitor* JXL_RESTRICT visitor) {
-  if (visitor->AllDefault(*this, &all_default)) {
-    // Overwrite all serialized fields, but not any nonserialized_*.
-    visitor->SetDefault(this);
-    return true;
-  }
-  const Matrix3x3& default_inverse =
-      jxl::cms::DefaultInverseOpsinAbsorbanceMatrix();
-  for (int j = 0; j < 3; ++j) {
-    for (int i = 0; i < 3; ++i) {
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->F16(default_inverse[j][i], &inverse_matrix[j][i]));
-    }
-  }
-  for (int i = 0; i < 3; ++i) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->F16(
-        jxl::cms::kNegOpsinAbsorbanceBiasRGB[i], &opsin_biases[i]));
-  }
-  for (int i = 0; i < 4; ++i) {
-    JXL_QUIET_RETURN_IF_ERROR(
-        visitor->F16(kDefaultQuantBias[i], &quant_biases[i]));
-  }
-  return true;
-}
-
-ToneMapping::ToneMapping() { Bundle::Init(this); }
-Status ToneMapping::VisitFields(Visitor* JXL_RESTRICT visitor) {
-  if (visitor->AllDefault(*this, &all_default)) {
-    // Overwrite all serialized fields, but not any nonserialized_*.
-    visitor->SetDefault(this);
-    return true;
-  }
-
-  JXL_QUIET_RETURN_IF_ERROR(
-      visitor->F16(kDefaultIntensityTarget, &intensity_target));
-  if (intensity_target <= 0.f) {
-    return JXL_FAILURE("invalid intensity target");
-  }
-
-  JXL_QUIET_RETURN_IF_ERROR(visitor->F16(0.0f, &min_nits));
-  if (min_nits < 0.f || min_nits > intensity_target) {
-    return JXL_FAILURE("invalid min %f vs max %f", min_nits, intensity_target);
-  }
-
-  JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &relative_to_max_display));
-
-  JXL_QUIET_RETURN_IF_ERROR(visitor->F16(0.0f, &linear_below));
-  if (linear_below < 0 || (relative_to_max_display && linear_below > 1.0f)) {
-    return JXL_FAILURE("invalid linear_below %f (%s)", linear_below,
-                       relative_to_max_display ? "relative" : "absolute");
-  }
-
-  return true;
-}
-
-Status ReadImageMetadata(BitReader* JXL_RESTRICT reader,
-                         ImageMetadata* JXL_RESTRICT metadata) {
-  return Bundle::Read(reader, metadata);
-}
-
-void ImageMetadata::SetAlphaBits(uint32_t bits, bool alpha_is_premultiplied) {
-  std::vector<ExtraChannelInfo>& eciv = extra_channel_info;
-  ExtraChannelInfo* alpha = Find(ExtraChannel::kAlpha);
-  if (bits == 0) {
-    if (alpha != nullptr) {
-      // Remove the alpha channel from the extra channel info. It's
-      // theoretically possible that there are multiple, remove all in that
-      // case. This ensure a next HasAlpha() will return false.
-      const auto is_alpha = [](const ExtraChannelInfo& eci) {
-        return eci.type == ExtraChannel::kAlpha;
-      };
-      eciv.erase(std::remove_if(eciv.begin(), eciv.end(), is_alpha),
-                 eciv.end());
-    }
-  } else {
-    if (alpha == nullptr) {
-      ExtraChannelInfo info;
-      info.type = ExtraChannel::kAlpha;
-      info.bit_depth.bits_per_sample = bits;
-      info.dim_shift = 0;
-      info.alpha_associated = alpha_is_premultiplied;
-      // Prepend rather than append: in case there already are other extra
-      // channels, prefer alpha channel to be listed first.
-      eciv.insert(eciv.begin(), info);
-    } else {
-      // Ignores potential extra alpha channels, only sets to first one.
-      alpha->bit_depth.bits_per_sample = bits;
-      alpha->bit_depth.floating_point_sample = false;
-      alpha->bit_depth.exponent_bits_per_sample = 0;
-      alpha->alpha_associated = alpha_is_premultiplied;
-    }
-  }
-  num_extra_channels = extra_channel_info.size();
-  if (bits > 12) modular_16_bit_buffer_sufficient = false;
-}
-
-#if JXL_DEBUG_V_LEVEL >= 1
-std::string ImageMetadata::DebugString() const {
-  std::ostringstream os;
-  os << bit_depth.DebugString();
-  if (modular_16_bit_buffer_sufficient) {
-    os << " (modular 16)";
-  }
-  os << (xyb_encoded ? " xyb encoded" : " orig profile");
-  os << " " << Description(color_encoding);
-  if (num_extra_channels > 0) {
-    os << " extra channels:";
-    for (size_t i = 0; i < num_extra_channels; ++i) {
-      os << " (" << extra_channel_info[i].DebugString() << ")";
-      if (i + 1 < num_extra_channels) os << ",";
-    }
-  }
-  if (have_preview) {
-    os << " preview: " << preview_size.xsize() << "x" << preview_size.ysize();
-  }
-  if (orientation != 1) {
-    os << " orientation: " << orientation;
-  }
-  return os.str();
-}
-
-std::string CodecMetadata::DebugString() const {
-  std::ostringstream os;
-  os << size.xsize() << "x" << size.ysize();
-  os << " " << m.DebugString();
-  return os.str();
-}
-#endif
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/image_metadata.h b/third_party/jpeg-xl/lib/jxl/image_metadata.h
deleted file mode 100644
index 5e5bf6dc7e090..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/image_metadata.h
+++ /dev/null
@@ -1,429 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Main codestream header bundles, the metadata that applies to all frames.
-// Enums must align with the C API definitions in codestream_header.h.
-
-#ifndef LIB_JXL_IMAGE_METADATA_H_
-#define LIB_JXL_IMAGE_METADATA_H_
-
-#include <jxl/codestream_header.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <string>
-#include <vector>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/matrix_ops.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/field_encodings.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/headers.h"
-
-namespace jxl {
-
-struct AuxOut;
-enum class LayerType : uint8_t;
-
-// EXIF orientation of the image. This field overrides any field present in
-// actual EXIF metadata. The value tells which transformation the decoder must
-// apply after decoding to display the image with the correct orientation.
-enum class Orientation : uint32_t {
-  // Values 1..8 match the EXIF definitions.
-  kIdentity = JXL_ORIENT_IDENTITY,
-  kFlipHorizontal = JXL_ORIENT_FLIP_HORIZONTAL,
-  kRotate180 = JXL_ORIENT_ROTATE_180,
-  kFlipVertical = JXL_ORIENT_FLIP_VERTICAL,
-  kTranspose = JXL_ORIENT_TRANSPOSE,
-  kRotate90 = JXL_ORIENT_ROTATE_90_CW,
-  kAntiTranspose = JXL_ORIENT_ANTI_TRANSPOSE,
-  kRotate270 = JXL_ORIENT_ROTATE_90_CCW,
-};
-// Don't need an EnumBits because Orientation is not read via Enum().
-
-enum class ExtraChannel : uint32_t {
-  // First two enumerators (most common) are cheaper to encode
-  kAlpha = JXL_CHANNEL_ALPHA,
-  kDepth = JXL_CHANNEL_DEPTH,
-
-  kSpotColor = JXL_CHANNEL_SPOT_COLOR,
-  kSelectionMask = JXL_CHANNEL_SELECTION_MASK,
-  kBlack = JXL_CHANNEL_BLACK,  // for CMYK
-  kCFA = JXL_CHANNEL_CFA,      // Bayer channel
-  kThermal = JXL_CHANNEL_THERMAL,
-  kReserved0 = JXL_CHANNEL_RESERVED0,
-  kReserved1 = JXL_CHANNEL_RESERVED1,
-  kReserved2 = JXL_CHANNEL_RESERVED2,
-  kReserved3 = JXL_CHANNEL_RESERVED3,
-  kReserved4 = JXL_CHANNEL_RESERVED4,
-  kReserved5 = JXL_CHANNEL_RESERVED5,
-  kReserved6 = JXL_CHANNEL_RESERVED6,
-  kReserved7 = JXL_CHANNEL_RESERVED7,
-  // disambiguated via name string, raise warning if unsupported
-  kUnknown = JXL_CHANNEL_UNKNOWN,
-  // like kUnknown but can silently be ignored
-  kOptional = JXL_CHANNEL_OPTIONAL
-};
-static inline const char* EnumName(ExtraChannel /*unused*/) {
-  return "ExtraChannel";
-}
-static inline constexpr uint64_t EnumBits(ExtraChannel /*unused*/) {
-  using EC = ExtraChannel;
-  return MakeBit(EC::kAlpha) | MakeBit(EC::kDepth) | MakeBit(EC::kSpotColor) |
-         MakeBit(EC::kSelectionMask) | MakeBit(EC::kBlack) | MakeBit(EC::kCFA) |
-         MakeBit(EC::kThermal) | MakeBit(EC::kUnknown) | MakeBit(EC::kOptional);
-}
-
-// Used in ImageMetadata and ExtraChannelInfo.
-struct BitDepth : public Fields {
-  BitDepth();
-  JXL_FIELDS_NAME(BitDepth)
-
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override;
-
-  std::string DebugString() const;
-
-  // Whether the original (uncompressed) samples are floating point or
-  // unsigned integer.
-  bool floating_point_sample;
-
-  // Bit depth of the original (uncompressed) image samples. Must be in the
-  // range [1, 32].
-  uint32_t bits_per_sample;
-
-  // Floating point exponent bits of the original (uncompressed) image samples,
-  // only used if floating_point_sample is true.
-  // If used, the samples are floating point with:
-  // - 1 sign bit
-  // - exponent_bits_per_sample exponent bits
-  // - (bits_per_sample - exponent_bits_per_sample - 1) mantissa bits
-  // If used, exponent_bits_per_sample must be in the range
-  // [2, 8] and amount of mantissa bits must be in the range [2, 23].
-  // NOTE: exponent_bits_per_sample is 8 for single precision binary32
-  // point, 5 for half precision binary16, 7 for fp24.
-  uint32_t exponent_bits_per_sample;
-};
-
-// Describes one extra channel.
-struct ExtraChannelInfo : public Fields {
-  ExtraChannelInfo();
-  JXL_FIELDS_NAME(ExtraChannelInfo)
-
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override;
-
-  std::string DebugString() const;
-
-  mutable bool all_default;
-
-  ExtraChannel type;
-  BitDepth bit_depth;
-  uint32_t dim_shift;  // downsampled by 2^dim_shift on each axis
-
-  std::string name;  // UTF-8
-
-  // Conditional:
-  bool alpha_associated;  // i.e. premultiplied
-  float spot_color[4];    // spot color in linear RGBA
-  uint32_t cfa_channel;
-};
-
-struct OpsinInverseMatrix : public Fields {
-  OpsinInverseMatrix();
-  JXL_FIELDS_NAME(OpsinInverseMatrix)
-
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override;
-
-  mutable bool all_default;
-
-  Matrix3x3 inverse_matrix;
-  float opsin_biases[3];
-  float quant_biases[4];
-};
-
-// Information useful for mapping HDR images to lower dynamic range displays.
-struct ToneMapping : public Fields {
-  ToneMapping();
-  JXL_FIELDS_NAME(ToneMapping)
-
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override;
-
-  mutable bool all_default;
-
-  // Upper bound on the intensity level present in the image. For unsigned
-  // integer pixel encodings, this is the brightness of the largest
-  // representable value. The image does not necessarily contain a pixel
-  // actually this bright. An encoder is allowed to set 255 for SDR images
-  // without computing a histogram.
-  float intensity_target;  // [nits]
-
-  // Lower bound on the intensity level present in the image. This may be
-  // loose, i.e. lower than the actual darkest pixel. When tone mapping, a
-  // decoder will map [min_nits, intensity_target] to the display range.
-  float min_nits;
-
-  bool relative_to_max_display;  // see below
-  // The tone mapping will leave unchanged (linear mapping) any pixels whose
-  // brightness is strictly below this. The interpretation depends on
-  // relative_to_max_display. If true, this is a ratio [0, 1] of the maximum
-  // display brightness [nits], otherwise an absolute brightness [nits].
-  float linear_below;
-};
-
-// Contains weights to customize some transforms - in particular, XYB and
-// upsampling.
-struct CustomTransformData : public Fields {
-  CustomTransformData();
-  JXL_FIELDS_NAME(CustomTransformData)
-
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override;
-
-  // Must be set before calling VisitFields. Must equal xyb_encoded of
-  // ImageMetadata, should be set by ImageMetadata during VisitFields.
-  bool nonserialized_xyb_encoded = false;
-
-  mutable bool all_default;
-
-  OpsinInverseMatrix opsin_inverse_matrix;
-
-  uint32_t custom_weights_mask;
-  float upsampling2_weights[15];
-  float upsampling4_weights[55];
-  float upsampling8_weights[210];
-};
-
-// Properties of the original image bundle. This enables Encode(Decode()) to
-// re-create an equivalent image without user input.
-struct ImageMetadata : public Fields {
-  ImageMetadata();
-  JXL_FIELDS_NAME(ImageMetadata)
-
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override;
-
-  // Returns bit depth of the JPEG XL compressed alpha channel, or 0 if no alpha
-  // channel present. In the theoretical case that there are multiple alpha
-  // channels, returns the bit depth of the first.
-  uint32_t GetAlphaBits() const {
-    const ExtraChannelInfo* alpha = Find(ExtraChannel::kAlpha);
-    if (alpha == nullptr) return 0;
-    JXL_DASSERT(alpha->bit_depth.bits_per_sample != 0);
-    return alpha->bit_depth.bits_per_sample;
-  }
-
-  // Sets bit depth of alpha channel, adding extra channel if needed, or
-  // removing all alpha channels if bits is 0.
-  // Assumes integer alpha channel and not designed to support multiple
-  // alpha channels (it's possible to use those features by manipulating
-  // extra_channel_info directly).
-  //
-  // Callers must insert the actual channel image at the same index before any
-  // further modifications to extra_channel_info.
-  void SetAlphaBits(uint32_t bits, bool alpha_is_premultiplied = false);
-
-  bool HasAlpha() const { return GetAlphaBits() != 0; }
-
-  // Sets the original bit depth fields to indicate unsigned integer of the
-  // given bit depth.
-  // TODO(lode): move function to BitDepth
-  void SetUintSamples(uint32_t bits) {
-    bit_depth.bits_per_sample = bits;
-    bit_depth.exponent_bits_per_sample = 0;
-    bit_depth.floating_point_sample = false;
-    // RCT / Squeeze may add one bit each, and this is about int16_t,
-    // so uint13 should still be OK but limiting it to 12 seems safer.
-    // TODO(jon): figure out a better way to set this header field.
-    // (in particular, if modular mode is not used it doesn't matter,
-    // and if transforms are restricted, up to 15-bit could be done)
-    if (bits > 12) modular_16_bit_buffer_sufficient = false;
-  }
-  // Sets the original bit depth fields to indicate single precision floating
-  // point.
-  // TODO(lode): move function to BitDepth
-  void SetFloat32Samples() {
-    bit_depth.bits_per_sample = 32;
-    bit_depth.exponent_bits_per_sample = 8;
-    bit_depth.floating_point_sample = true;
-    modular_16_bit_buffer_sufficient = false;
-  }
-
-  void SetFloat16Samples() {
-    bit_depth.bits_per_sample = 16;
-    bit_depth.exponent_bits_per_sample = 5;
-    bit_depth.floating_point_sample = true;
-    modular_16_bit_buffer_sufficient = false;
-  }
-
-  void SetIntensityTarget(float intensity_target) {
-    tone_mapping.intensity_target = intensity_target;
-  }
-  float IntensityTarget() const {
-    JXL_DASSERT(tone_mapping.intensity_target != 0.0f);
-    return tone_mapping.intensity_target;
-  }
-
-  // Returns first ExtraChannelInfo of the given type, or nullptr if none.
-  const ExtraChannelInfo* Find(ExtraChannel type) const {
-    for (const ExtraChannelInfo& eci : extra_channel_info) {
-      if (eci.type == type) return &eci;
-    }
-    return nullptr;
-  }
-
-  // Returns first ExtraChannelInfo of the given type, or nullptr if none.
-  ExtraChannelInfo* Find(ExtraChannel type) {
-    for (ExtraChannelInfo& eci : extra_channel_info) {
-      if (eci.type == type) return &eci;
-    }
-    return nullptr;
-  }
-
-  Orientation GetOrientation() const {
-    return static_cast<Orientation>(orientation);
-  }
-
-  bool ExtraFieldsDefault() const;
-
-  std::string DebugString() const;
-
-  mutable bool all_default;
-
-  BitDepth bit_depth;
-  bool modular_16_bit_buffer_sufficient;  // otherwise 32 is.
-
-  // Whether the colors values of the pixels of frames are encoded in the
-  // codestream using the absolute XYB color space, or the using values that
-  // follow the color space defined by the ColorEncoding or ICC profile. This
-  // determines when or whether a CMS (Color Management System) is needed to get
-  // the pixels in a desired color space. In one case, the pixels have one known
-  // color space and a CMS is needed to convert them to the original image's
-  // color space, in the other case the pixels have the color space of the
-  // original image and a CMS is required if a different display space, or a
-  // single known consistent color space for multiple decoded images, is
-  // desired. In all cases, the color space of all frames from a single image is
-  // the same, both VarDCT and modular frames.
-  //
-  // If true: then frames can be decoded to XYB (which can also be converted to
-  // linear and non-linear sRGB with the built in conversion without CMS). The
-  // attached ColorEncoding or ICC profile has no effect on the meaning of the
-  // pixel's color values, but instead indicates what the color profile of the
-  // original image was, and what color profile one should convert to when
-  // decoding to integers to prevent clipping and precision loss. To do that
-  // conversion requires a CMS.
-  //
-  // If false: then the color values of decoded frames are in the space defined
-  // by the attached ColorEncoding or ICC profile. To instead get the pixels in
-  // a chosen known color space, such as sRGB, requires a CMS, since the
-  // attached ColorEncoding or ICC profile could be any arbitrary color space.
-  // This mode is typically used for lossless images encoded as integers.
-  // Frames can also use YCbCr encoding, some frames may and some may not, but
-  // this is not a different color space but a certain encoding of the RGB
-  // values.
-  //
-  // Note: if !xyb_encoded, but the attached color profile indicates XYB (which
-  // can happen either if it's a ColorEncoding with color_space_ ==
-  // ColorSpace::kXYB, or if it's an ICC Profile that has been crafted to
-  // represent XYB), then the frames still may not use ColorEncoding kXYB, they
-  // must still use kNone (or kYCbCr, which would mean applying the YCbCr
-  // transform to the 3-channel XYB data), since with !xyb_encoded, the 3
-  // channels are stored as-is, no matter what meaning the color profile assigns
-  // to them. To use ColorSpace::kXYB, xyb_encoded must be true.
-  //
-  // This value is defined in image metadata because this is the global
-  // codestream header. This value does not affect the image itself, so is not
-  // image metadata per se, it only affects the encoding, and what color space
-  // the decoder can receive the pixels in without needing a CMS.
-  bool xyb_encoded;
-
-  ColorEncoding color_encoding;
-
-  // These values are initialized to defaults such that the 'extra_fields'
-  // condition in VisitFields uses correctly initialized values.
-  uint32_t orientation = 1;
-  bool have_preview = false;
-  bool have_animation = false;
-  bool have_intrinsic_size = false;
-
-  // If present, the stored image has the dimensions of the first SizeHeader,
-  // but decoders are advised to resample or display per `intrinsic_size`.
-  SizeHeader intrinsic_size;  // only if have_intrinsic_size
-
-  ToneMapping tone_mapping;
-
-  // When reading: deserialized. When writing: automatically set from vector.
-  uint32_t num_extra_channels;
-  std::vector<ExtraChannelInfo> extra_channel_info;
-
-  // Only present if m.have_preview.
-  PreviewHeader preview_size;
-  // Only present if m.have_animation.
-  AnimationHeader animation;
-
-  uint64_t extensions;
-
-  // Option to stop parsing after basic info, and treat as if the later
-  // fields do not participate. Use to parse only basic image information
-  // excluding the final larger or variable sized data.
-  bool nonserialized_only_parse_basic_info = false;
-};
-
-Status ReadImageMetadata(BitReader* JXL_RESTRICT reader,
-                         ImageMetadata* JXL_RESTRICT metadata);
-
-Status WriteImageMetadata(const ImageMetadata& metadata,
-                          BitWriter* JXL_RESTRICT writer, LayerType layer,
-                          AuxOut* aux_out);
-
-// All metadata applicable to the entire codestream (dimensions, extra channels,
-// ...)
-struct CodecMetadata {
-  // TODO(lode): use the preview and animation fields too, in place of the
-  // nonserialized_ ones in ImageMetadata.
-  ImageMetadata m;
-  // The size of the codestream: this is the nominal size applicable to all
-  // frames, although some frames can have a different effective size through
-  // crop, dc_level or representing a the preview.
-  SizeHeader size;
-  // Often default.
-  CustomTransformData transform_data;
-
-  size_t xsize() const { return size.xsize(); }
-  size_t ysize() const { return size.ysize(); }
-  size_t oriented_xsize(bool keep_orientation) const {
-    if (static_cast<uint32_t>(m.GetOrientation()) > 4 && !keep_orientation) {
-      return ysize();
-    } else {
-      return xsize();
-    }
-  }
-  size_t oriented_preview_xsize(bool keep_orientation) const {
-    if (static_cast<uint32_t>(m.GetOrientation()) > 4 && !keep_orientation) {
-      return m.preview_size.ysize();
-    } else {
-      return m.preview_size.xsize();
-    }
-  }
-  size_t oriented_ysize(bool keep_orientation) const {
-    if (static_cast<uint32_t>(m.GetOrientation()) > 4 && !keep_orientation) {
-      return xsize();
-    } else {
-      return ysize();
-    }
-  }
-  size_t oriented_preview_ysize(bool keep_orientation) const {
-    if (static_cast<uint32_t>(m.GetOrientation()) > 4 && !keep_orientation) {
-      return m.preview_size.xsize();
-    } else {
-      return m.preview_size.ysize();
-    }
-  }
-
-  std::string DebugString() const;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_IMAGE_METADATA_H_
diff --git a/third_party/jpeg-xl/lib/jxl/image_ops.cc b/third_party/jpeg-xl/lib/jxl/image_ops.cc
deleted file mode 100644
index c87643a869d64..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/image_ops.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/image_ops.h"
-
-#include <cstddef>
-#include <cstring>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/image.h"
-
-namespace jxl {
-
-Status PadImageToBlockMultipleInPlace(Image3F* JXL_RESTRICT in,
-                                      size_t block_dim) {
-  const size_t xsize_orig = in->xsize();
-  const size_t ysize_orig = in->ysize();
-  const size_t xsize = RoundUpTo(xsize_orig, block_dim);
-  const size_t ysize = RoundUpTo(ysize_orig, block_dim);
-  // Expands image size to the originally-allocated size.
-  JXL_RETURN_IF_ERROR(in->ShrinkTo(xsize, ysize));
-  for (size_t c = 0; c < 3; c++) {
-    for (size_t y = 0; y < ysize_orig; y++) {
-      float* JXL_RESTRICT row = in->PlaneRow(c, y);
-      for (size_t x = xsize_orig; x < xsize; x++) {
-        row[x] = row[xsize_orig - 1];
-      }
-    }
-    const float* JXL_RESTRICT row_src = in->ConstPlaneRow(c, ysize_orig - 1);
-    for (size_t y = ysize_orig; y < ysize; y++) {
-      memcpy(in->PlaneRow(c, y), row_src, xsize * sizeof(float));
-    }
-  }
-  return true;
-}
-
-static Status DoDownsampleImage(const ImageF& input, size_t factor,
-                                ImageF* output) {
-  JXL_ENSURE(factor != 1);
-  JXL_RETURN_IF_ERROR(output->ShrinkTo(DivCeil(input.xsize(), factor),
-                                       DivCeil(input.ysize(), factor)));
-  size_t in_stride = input.PixelsPerRow();
-  for (size_t y = 0; y < output->ysize(); y++) {
-    float* row_out = output->Row(y);
-    const float* row_in = input.Row(factor * y);
-    for (size_t x = 0; x < output->xsize(); x++) {
-      size_t cnt = 0;
-      float sum = 0;
-      for (size_t iy = 0; iy < factor && iy + factor * y < input.ysize();
-           iy++) {
-        for (size_t ix = 0; ix < factor && ix + factor * x < input.xsize();
-             ix++) {
-          sum += row_in[iy * in_stride + x * factor + ix];
-          cnt++;
-        }
-      }
-      row_out[x] = sum / cnt;
-    }
-  }
-  return true;
-}
-
-StatusOr<ImageF> DownsampleImage(const ImageF& image, size_t factor) {
-  ImageF downsampled;
-  // Allocate extra space to avoid a reallocation when padding.
-  JxlMemoryManager* memory_manager = image.memory_manager();
-  JXL_ASSIGN_OR_RETURN(
-      downsampled,
-      ImageF::Create(memory_manager, DivCeil(image.xsize(), factor) + kBlockDim,
-                     DivCeil(image.ysize(), factor) + kBlockDim));
-  JXL_RETURN_IF_ERROR(DoDownsampleImage(image, factor, &downsampled));
-  return downsampled;
-}
-
-StatusOr<Image3F> DownsampleImage(const Image3F& opsin, size_t factor) {
-  JXL_ENSURE(factor != 1);
-  // Allocate extra space to avoid a reallocation when padding.
-  Image3F downsampled;
-  JxlMemoryManager* memory_manager = opsin.memory_manager();
-  JXL_ASSIGN_OR_RETURN(
-      downsampled, Image3F::Create(memory_manager,
-                                   DivCeil(opsin.xsize(), factor) + kBlockDim,
-                                   DivCeil(opsin.ysize(), factor) + kBlockDim));
-  JXL_RETURN_IF_ERROR(downsampled.ShrinkTo(downsampled.xsize() - kBlockDim,
-                                           downsampled.ysize() - kBlockDim));
-  for (size_t c = 0; c < 3; c++) {
-    JXL_RETURN_IF_ERROR(
-        DoDownsampleImage(opsin.Plane(c), factor, &downsampled.Plane(c)));
-  }
-  return downsampled;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/image_ops.h b/third_party/jpeg-xl/lib/jxl/image_ops.h
deleted file mode 100644
index 0dc4948e8ecc2..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/image_ops.h
+++ /dev/null
@@ -1,309 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_IMAGE_OPS_H_
-#define LIB_JXL_IMAGE_OPS_H_
-
-// Operations on images.
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <limits>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/image.h"
-
-namespace jxl {
-
-// Works for mixed image-like argument types.
-template <class Image1, class Image2>
-bool SameSize(const Image1& image1, const Image2& image2) {
-  return image1.xsize() == image2.xsize() && image1.ysize() == image2.ysize();
-}
-
-template <typename T>
-Status CopyImageTo(const Plane<T>& from, Plane<T>* JXL_RESTRICT to) {
-  JXL_ENSURE(SameSize(from, *to));
-  if (from.ysize() == 0 || from.xsize() == 0) return true;
-  for (size_t y = 0; y < from.ysize(); ++y) {
-    const T* JXL_RESTRICT row_from = from.ConstRow(y);
-    T* JXL_RESTRICT row_to = to->Row(y);
-    memcpy(row_to, row_from, from.xsize() * sizeof(T));
-  }
-  return true;
-}
-
-// Copies `from:rect_from` to `to:rect_to`.
-template <typename T>
-Status CopyImageTo(const Rect& rect_from, const Plane<T>& from,
-                   const Rect& rect_to, Plane<T>* JXL_RESTRICT to) {
-  JXL_ENSURE(SameSize(rect_from, rect_to));
-  JXL_ENSURE(rect_from.IsInside(from));
-  JXL_ENSURE(rect_to.IsInside(*to));
-  if (rect_from.xsize() == 0) return true;
-  for (size_t y = 0; y < rect_from.ysize(); ++y) {
-    const T* JXL_RESTRICT row_from = rect_from.ConstRow(from, y);
-    T* JXL_RESTRICT row_to = rect_to.Row(to, y);
-    memcpy(row_to, row_from, rect_from.xsize() * sizeof(T));
-  }
-  return true;
-}
-
-// Copies `from:rect_from` to `to:rect_to`.
-template <typename T>
-Status CopyImageTo(const Rect& rect_from, const Image3<T>& from,
-                   const Rect& rect_to, Image3<T>* JXL_RESTRICT to) {
-  JXL_ENSURE(SameSize(rect_from, rect_to));
-  for (size_t c = 0; c < 3; c++) {
-    JXL_RETURN_IF_ERROR(
-        CopyImageTo(rect_from, from.Plane(c), rect_to, &to->Plane(c)));
-  }
-  return true;
-}
-
-template <typename T, typename U>
-Status ConvertPlaneAndClamp(const Rect& rect_from, const Plane<T>& from,
-                            const Rect& rect_to, Plane<U>* JXL_RESTRICT to) {
-  JXL_ENSURE(SameSize(rect_from, rect_to));
-  using M = decltype(T() + U());
-  for (size_t y = 0; y < rect_to.ysize(); ++y) {
-    const T* JXL_RESTRICT row_from = rect_from.ConstRow(from, y);
-    U* JXL_RESTRICT row_to = rect_to.Row(to, y);
-    for (size_t x = 0; x < rect_to.xsize(); ++x) {
-      row_to[x] =
-          std::min<M>(std::max<M>(row_from[x], std::numeric_limits<U>::min()),
-                      std::numeric_limits<U>::max());
-    }
-  }
-  return true;
-}
-
-// Copies `from` to `to`.
-template <typename T>
-Status CopyImageTo(const T& from, T* JXL_RESTRICT to) {
-  return CopyImageTo(Rect(from), from, Rect(*to), to);
-}
-
-// Copies `from:rect_from` to `to:rect_to`; also copies `padding` pixels of
-// border around `from:rect_from`, in all directions, whenever they are inside
-// the first image.
-template <typename T>
-Status CopyImageToWithPadding(const Rect& from_rect, const T& from,
-                              size_t padding, const Rect& to_rect, T* to) {
-  size_t xextra0 = std::min(padding, from_rect.x0());
-  size_t xextra1 =
-      std::min(padding, from.xsize() - from_rect.x0() - from_rect.xsize());
-  size_t yextra0 = std::min(padding, from_rect.y0());
-  size_t yextra1 =
-      std::min(padding, from.ysize() - from_rect.y0() - from_rect.ysize());
-  JXL_ENSURE(to_rect.x0() >= xextra0);
-  JXL_ENSURE(to_rect.y0() >= yextra0);
-
-  return CopyImageTo(Rect(from_rect.x0() - xextra0, from_rect.y0() - yextra0,
-                          from_rect.xsize() + xextra0 + xextra1,
-                          from_rect.ysize() + yextra0 + yextra1),
-                     from,
-                     Rect(to_rect.x0() - xextra0, to_rect.y0() - yextra0,
-                          to_rect.xsize() + xextra0 + xextra1,
-                          to_rect.ysize() + yextra0 + yextra1),
-                     to);
-}
-
-// Returns linear combination of two grayscale images.
-template <typename T>
-StatusOr<Plane<T>> LinComb(const T lambda1, const Plane<T>& image1,
-                           const T lambda2, const Plane<T>& image2) {
-  const size_t xsize = image1.xsize();
-  const size_t ysize = image1.ysize();
-  JXL_ENSURE(xsize == image2.xsize());
-  JXL_ENSURE(ysize == image2.ysize());
-  JxlMemoryManager* memory_manager = image1.memory_manager();
-  JXL_ASSIGN_OR_RETURN(Plane<T> out,
-                       Plane<T>::Create(memory_manager, xsize, ysize));
-  for (size_t y = 0; y < ysize; ++y) {
-    const T* const JXL_RESTRICT row1 = image1.Row(y);
-    const T* const JXL_RESTRICT row2 = image2.Row(y);
-    T* const JXL_RESTRICT row_out = out.Row(y);
-    for (size_t x = 0; x < xsize; ++x) {
-      row_out[x] = lambda1 * row1[x] + lambda2 * row2[x];
-    }
-  }
-  return out;
-}
-
-// Multiplies image by lambda in-place
-template <typename T>
-void ScaleImage(const T lambda, Plane<T>* image) {
-  for (size_t y = 0; y < image->ysize(); ++y) {
-    T* const JXL_RESTRICT row = image->Row(y);
-    for (size_t x = 0; x < image->xsize(); ++x) {
-      row[x] = lambda * row[x];
-    }
-  }
-}
-
-// Multiplies image by lambda in-place
-template <typename T>
-void ScaleImage(const T lambda, Image3<T>* image) {
-  for (size_t c = 0; c < 3; ++c) {
-    ScaleImage(lambda, &image->Plane(c));
-  }
-}
-
-template <typename T>
-void FillImage(const T value, Plane<T>* image) {
-  for (size_t y = 0; y < image->ysize(); ++y) {
-    T* const JXL_RESTRICT row = image->Row(y);
-    for (size_t x = 0; x < image->xsize(); ++x) {
-      row[x] = value;
-    }
-  }
-}
-
-template <typename T>
-void ZeroFillImage(Plane<T>* image) {
-  if (image->xsize() == 0) return;
-  for (size_t y = 0; y < image->ysize(); ++y) {
-    T* const JXL_RESTRICT row = image->Row(y);
-    memset(row, 0, image->xsize() * sizeof(T));
-  }
-}
-
-// Mirrors out of bounds coordinates and returns valid coordinates unchanged.
-// We assume the radius (distance outside the image) is small compared to the
-// image size, otherwise this might not terminate.
-// The mirror is outside the last column (border pixel is also replicated).
-static inline int64_t Mirror(int64_t x, const int64_t xsize) {
-  JXL_DASSERT(xsize != 0);
-
-  // TODO(janwas): replace with branchless version
-  while (x < 0 || x >= xsize) {
-    if (x < 0) {
-      x = -x - 1;
-    } else {
-      x = 2 * xsize - 1 - x;
-    }
-  }
-  return x;
-}
-
-// Wrap modes for ensuring X/Y coordinates are in the valid range [0, size):
-
-// Mirrors (repeating the edge pixel once). Useful for convolutions.
-struct WrapMirror {
-  JXL_INLINE int64_t operator()(const int64_t coord, const int64_t size) const {
-    return Mirror(coord, size);
-  }
-};
-
-// Returns the same coordinate: required for TFNode with Border(), or useful
-// when we know "coord" is already valid (e.g. interior of an image).
-struct WrapUnchanged {
-  JXL_INLINE int64_t operator()(const int64_t coord, int64_t /*size*/) const {
-    return coord;
-  }
-};
-
-// Similar to Wrap* but for row pointers (reduces Row() multiplications).
-
-class WrapRowMirror {
- public:
-  template <class ImageOrView>
-  WrapRowMirror(const ImageOrView& image, size_t ysize)
-      : first_row_(image.ConstRow(0)), last_row_(image.ConstRow(ysize - 1)) {}
-
-  const float* operator()(const float* const JXL_RESTRICT row,
-                          const int64_t stride) const {
-    if (row < first_row_) {
-      const int64_t num_before = first_row_ - row;
-      // Mirrored; one row before => row 0, two before = row 1, ...
-      return first_row_ + num_before - stride;
-    }
-    if (row > last_row_) {
-      const int64_t num_after = row - last_row_;
-      // Mirrored; one row after => last row, two after = last - 1, ...
-      return last_row_ - num_after + stride;
-    }
-    return row;
-  }
-
- private:
-  const float* const JXL_RESTRICT first_row_;
-  const float* const JXL_RESTRICT last_row_;
-};
-
-struct WrapRowUnchanged {
-  JXL_INLINE const float* operator()(const float* const JXL_RESTRICT row,
-                                     int64_t /*stride*/) const {
-    return row;
-  }
-};
-
-// Computes the minimum and maximum pixel value.
-template <typename T>
-void ImageMinMax(const Plane<T>& image, T* const JXL_RESTRICT min,
-                 T* const JXL_RESTRICT max) {
-  *min = std::numeric_limits<T>::max();
-  *max = std::numeric_limits<T>::lowest();
-  for (size_t y = 0; y < image.ysize(); ++y) {
-    const T* const JXL_RESTRICT row = image.Row(y);
-    for (size_t x = 0; x < image.xsize(); ++x) {
-      *min = std::min(*min, row[x]);
-      *max = std::max(*max, row[x]);
-    }
-  }
-}
-
-// Initializes all planes to the same "value".
-template <typename T>
-void FillImage(const T value, Image3<T>* image) {
-  for (size_t c = 0; c < 3; ++c) {
-    for (size_t y = 0; y < image->ysize(); ++y) {
-      T* JXL_RESTRICT row = image->PlaneRow(c, y);
-      for (size_t x = 0; x < image->xsize(); ++x) {
-        row[x] = value;
-      }
-    }
-  }
-}
-
-template <typename T>
-void FillPlane(const T value, Plane<T>* image, Rect rect) {
-  for (size_t y = 0; y < rect.ysize(); ++y) {
-    T* JXL_RESTRICT row = rect.Row(image, y);
-    for (size_t x = 0; x < rect.xsize(); ++x) {
-      row[x] = value;
-    }
-  }
-}
-
-template <typename T>
-void ZeroFillImage(Image3<T>* image) {
-  for (size_t c = 0; c < 3; ++c) {
-    for (size_t y = 0; y < image->ysize(); ++y) {
-      T* JXL_RESTRICT row = image->PlaneRow(c, y);
-      if (image->xsize() != 0) memset(row, 0, image->xsize() * sizeof(T));
-    }
-  }
-}
-
-// Same as above, but operates in-place. Assumes that the `in` image was
-// allocated large enough.
-Status PadImageToBlockMultipleInPlace(Image3F* JXL_RESTRICT in,
-                                      size_t block_dim = kBlockDim);
-
-// Downsamples an image by a given factor.
-StatusOr<Image3F> DownsampleImage(const Image3F& opsin, size_t factor);
-StatusOr<ImageF> DownsampleImage(const ImageF& image, size_t factor);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_IMAGE_OPS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/image_ops_test.cc b/third_party/jpeg-xl/lib/jxl/image_ops_test.cc
deleted file mode 100644
index 7c17660de9897..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/image_ops_test.cc
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/image_ops.h"
-
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-template <typename T>
-void TestFillImpl(Image3<T>* img, const char* layout) {
-  FillImage(static_cast<T>(1), img);
-  for (size_t y = 0; y < img->ysize(); ++y) {
-    for (size_t c = 0; c < 3; ++c) {
-      T* JXL_RESTRICT row = img->PlaneRow(c, y);
-      for (size_t x = 0; x < img->xsize(); ++x) {
-        if (row[x] != static_cast<T>(1)) {
-          printf("Not 1 at c=%" PRIuS " %" PRIuS ", %" PRIuS " (%" PRIuS
-                 " x %" PRIuS ") (%s)\n",
-                 c, x, y, img->xsize(), img->ysize(), layout);
-          abort();
-        }
-        row[x] = static_cast<T>(2);
-      }
-    }
-  }
-
-  // Same for ZeroFillImage and swapped c/y loop ordering.
-  ZeroFillImage(img);
-  for (size_t c = 0; c < 3; ++c) {
-    for (size_t y = 0; y < img->ysize(); ++y) {
-      T* JXL_RESTRICT row = img->PlaneRow(c, y);
-      for (size_t x = 0; x < img->xsize(); ++x) {
-        if (row[x] != static_cast<T>(0)) {
-          printf("Not 0 at c=%" PRIuS " %" PRIuS ", %" PRIuS " (%" PRIuS
-                 " x %" PRIuS ") (%s)\n",
-                 c, x, y, img->xsize(), img->ysize(), layout);
-          abort();
-        }
-        row[x] = static_cast<T>(3);
-      }
-    }
-  }
-}
-
-template <typename T>
-void TestFillT() {
-  for (uint32_t xsize : {0, 1, 15, 16, 31, 32}) {
-    for (uint32_t ysize : {0, 1, 15, 16, 31, 32}) {
-      JXL_TEST_ASSIGN_OR_DIE(
-          Image3<T> image,
-          Image3<T>::Create(jxl::test::MemoryManager(), xsize, ysize));
-      TestFillImpl(&image, "size ctor");
-    }
-  }
-}
-
-// Ensure y/c/x and c/y/x loops visit pixels no more than once.
-TEST(ImageTest, TestFill) {
-  TestFillT<uint8_t>();
-  TestFillT<int16_t>();
-  TestFillT<float>();
-  TestFillT<double>();
-}
-
-TEST(ImageTest, CopyImageToWithPaddingTest) {
-  JXL_TEST_ASSIGN_OR_DIE(
-      Plane<uint32_t> src,
-      Plane<uint32_t>::Create(jxl::test::MemoryManager(), 100, 61));
-  for (size_t y = 0; y < src.ysize(); y++) {
-    for (size_t x = 0; x < src.xsize(); x++) {
-      src.Row(y)[x] = x * 1000 + y;
-    }
-  }
-  Rect src_rect(10, 20, 30, 40);
-  EXPECT_TRUE(src_rect.IsInside(src));
-
-  JXL_TEST_ASSIGN_OR_DIE(
-      Plane<uint32_t> dst,
-      Plane<uint32_t>::Create(jxl::test::MemoryManager(), 60, 50));
-  FillImage(0u, &dst);
-  Rect dst_rect(20, 5, 30, 40);
-  EXPECT_TRUE(dst_rect.IsInside(dst));
-
-  ASSERT_TRUE(
-      CopyImageToWithPadding(src_rect, src, /*padding=*/2, dst_rect, &dst));
-
-  // ysize is + 3 instead of + 4 because we are at the y image boundary on the
-  // source image.
-  Rect padded_dst_rect(20 - 2, 5 - 2, 30 + 4, 40 + 3);
-  for (size_t y = 0; y < dst.ysize(); y++) {
-    for (size_t x = 0; x < dst.xsize(); x++) {
-      if (Rect(x, y, 1, 1).IsInside(padded_dst_rect)) {
-        EXPECT_EQ((x - dst_rect.x0() + src_rect.x0()) * 1000 +
-                      (y - dst_rect.y0() + src_rect.y0()),
-                  dst.Row(y)[x]);
-      } else {
-        EXPECT_EQ(0u, dst.Row(y)[x]);
-      }
-    }
-  }
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/image_test_utils.h b/third_party/jpeg-xl/lib/jxl/image_test_utils.h
deleted file mode 100644
index 3b2aaae074212..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/image_test_utils.h
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_IMAGE_TEST_UTILS_H_
-#define LIB_JXL_IMAGE_TEST_UTILS_H_
-
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <limits>
-#include <sstream>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/random.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/image.h"
-
-namespace jxl {
-
-template <typename T>
-bool SamePixels(const Plane<T>& image1, const Plane<T>& image2,
-                std::stringstream& failures) {
-  const Rect rect(image1);
-  if (!SameSize(image1, image2)) {
-    failures << "size mismatch\n";
-    return false;
-  }
-  size_t mismatches = 0;
-  for (size_t y = rect.y0(); y < rect.ysize(); ++y) {
-    const T* const JXL_RESTRICT row1 = image1.Row(y);
-    const T* const JXL_RESTRICT row2 = image2.Row(y);
-    for (size_t x = rect.x0(); x < rect.xsize(); ++x) {
-      if (row1[x] != row2[x]) {
-        failures << "pixel mismatch" << x << ", " << y << ": "
-                 << static_cast<double>(row1[x])
-                 << " != " << static_cast<double>(row2[x]) << "\n";
-        if (++mismatches > 4) {
-          return false;
-        }
-      }
-    }
-  }
-  return mismatches == 0;
-}
-
-template <typename T>
-bool SamePixels(const Image3<T>& image1, const Image3<T>& image2,
-                std::stringstream& failures) {
-  if (!SameSize(image1, image2)) {
-    failures << "size mismatch\n";
-    return false;
-  }
-  for (size_t c = 0; c < 3; ++c) {
-    if (!SamePixels(image1.Plane(c), image2.Plane(c), failures)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-// Use for floating-point images with fairly large numbers; tolerates small
-// absolute errors and/or small relative errors.
-template <typename T>
-bool VerifyRelativeError(const Plane<T>& expected, const Plane<T>& actual,
-                         const double threshold_l1,
-                         const double threshold_relative,
-                         std::stringstream& failures, const intptr_t border = 0,
-                         const int c = 0) {
-  if (!SameSize(expected, actual)) {
-    failures << "size mismatch\n";
-    return false;
-  }
-  const intptr_t xsize = expected.xsize();
-  const intptr_t ysize = expected.ysize();
-
-  // Max over current scanline to give a better idea whether there are
-  // systematic errors or just one outlier. Invalid if negative.
-  double max_l1 = -1;
-  double max_relative = -1;
-  bool any_bad = false;
-  for (intptr_t y = border; y < ysize - border; ++y) {
-    const T* const JXL_RESTRICT row_expected = expected.Row(y);
-    const T* const JXL_RESTRICT row_actual = actual.Row(y);
-    for (intptr_t x = border; x < xsize - border; ++x) {
-      const double l1 = std::abs(row_expected[x] - row_actual[x]);
-
-      // Cannot compute relative, only check/update L1.
-      if (std::abs(row_expected[x]) < 1E-10) {
-        if (l1 > threshold_l1) {
-          any_bad = true;
-          max_l1 = std::max(max_l1, l1);
-        }
-      } else {
-        const double relative =
-            l1 / std::abs(static_cast<double>(row_expected[x]));
-        if (l1 > threshold_l1 && relative > threshold_relative) {
-          // Fails both tolerances => will exit below, update max_*.
-          any_bad = true;
-          max_l1 = std::max(max_l1, l1);
-          max_relative = std::max(max_relative, relative);
-        }
-      }
-    }
-  }
-  if (!any_bad) {
-    return true;
-  }
-  // Never had a valid relative value, don't print it.
-  if (max_relative < 0) {
-    fprintf(stderr, "c=%d: max +/- %E exceeds +/- %.2E\n", c, max_l1,
-            threshold_l1);
-  } else {
-    fprintf(stderr, "c=%d: max +/- %E, x %E exceeds +/- %.2E, x %.2E\n", c,
-            max_l1, max_relative, threshold_l1, threshold_relative);
-  }
-  // Dump the expected image and actual image if the region is small enough.
-  const intptr_t kMaxTestDumpSize = 16;
-  if (xsize <= kMaxTestDumpSize + 2 * border &&
-      ysize <= kMaxTestDumpSize + 2 * border) {
-    fprintf(stderr, "Expected image:\n");
-    for (intptr_t y = border; y < ysize - border; ++y) {
-      const T* const JXL_RESTRICT row_expected = expected.Row(y);
-      for (intptr_t x = border; x < xsize - border; ++x) {
-        fprintf(stderr, "%10lf ", static_cast<double>(row_expected[x]));
-      }
-      fprintf(stderr, "\n");
-    }
-
-    fprintf(stderr, "Actual image:\n");
-    for (intptr_t y = border; y < ysize - border; ++y) {
-      const T* const JXL_RESTRICT row_expected = expected.Row(y);
-      const T* const JXL_RESTRICT row_actual = actual.Row(y);
-      for (intptr_t x = border; x < xsize - border; ++x) {
-        const double l1 = std::abs(row_expected[x] - row_actual[x]);
-
-        bool bad = l1 > threshold_l1;
-        if (row_expected[x] > 1E-10) {
-          const double relative =
-              l1 / std::abs(static_cast<double>(row_expected[x]));
-          bad &= relative > threshold_relative;
-        }
-        if (bad) {
-          fprintf(stderr, "%10lf ", static_cast<double>(row_actual[x]));
-        } else {
-          fprintf(stderr, "%10s ", "==");
-        }
-      }
-      fprintf(stderr, "\n");
-    }
-  }
-
-  // Find first failing x for further debugging.
-  for (intptr_t y = border; y < ysize - border; ++y) {
-    const T* const JXL_RESTRICT row_expected = expected.Row(y);
-    const T* const JXL_RESTRICT row_actual = actual.Row(y);
-
-    for (intptr_t x = border; x < xsize - border; ++x) {
-      const double l1 = std::abs(row_expected[x] - row_actual[x]);
-
-      bool bad = l1 > threshold_l1;
-      if (row_expected[x] > 1E-10) {
-        const double relative =
-            l1 / std::abs(static_cast<double>(row_expected[x]));
-        bad &= relative > threshold_relative;
-      }
-      if (bad) {
-        failures << x << ", " << y << " (" << expected.xsize() << " x "
-                 << expected.ysize() << ") expected "
-                 << static_cast<double>(row_expected[x]) << " actual "
-                 << static_cast<double>(row_actual[x]);
-        return false;
-      }
-    }
-  }
-  return false;
-}
-
-template <typename T>
-bool VerifyRelativeError(const Image3<T>& expected, const Image3<T>& actual,
-                         const float threshold_l1,
-                         const float threshold_relative,
-                         std::stringstream& failures,
-                         const intptr_t border = 0) {
-  for (size_t c = 0; c < 3; ++c) {
-    bool ok = VerifyRelativeError(expected.Plane(c), actual.Plane(c),
-                                  threshold_l1, threshold_relative, failures,
-                                  border, static_cast<int>(c));
-    if (!ok) {
-      return false;
-    }
-  }
-  return true;
-}
-
-template <typename T, typename U = T>
-void GenerateImage(Rng& rng, Plane<T>* image, U begin, U end) {
-  for (size_t y = 0; y < image->ysize(); ++y) {
-    T* const JXL_RESTRICT row = image->Row(y);
-    for (size_t x = 0; x < image->xsize(); ++x) {
-      if (std::is_same<T, float>::value || std::is_same<T, double>::value) {
-        row[x] = rng.UniformF(begin, end);
-      } else if (std::is_signed<T>::value) {
-        row[x] = rng.UniformI(begin, end);
-      } else {
-        row[x] = rng.UniformU(begin, end);
-      }
-    }
-  }
-}
-
-template <typename T>
-void RandomFillImage(Plane<T>* image, const T begin, const T end,
-                     const uint64_t seed = 129) {
-  Rng rng(seed);
-  GenerateImage(rng, image, begin, end);
-}
-
-template <typename T>
-typename std::enable_if<std::is_integral<T>::value>::type RandomFillImage(
-    Plane<T>* image) {
-  Rng rng(129);
-  GenerateImage(rng, image, static_cast<int64_t>(0),
-                static_cast<int64_t>(std::numeric_limits<T>::max()) + 1);
-}
-
-JXL_INLINE void RandomFillImage(Plane<float>* image) {
-  Rng rng(129);
-  GenerateImage(rng, image, 0.0f, std::numeric_limits<float>::max());
-}
-
-template <typename T, typename U>
-void GenerateImage(Rng& rng, Image3<T>* image, U begin, U end) {
-  for (size_t c = 0; c < 3; ++c) {
-    GenerateImage(rng, &image->Plane(c), begin, end);
-  }
-}
-
-template <typename T>
-typename std::enable_if<std::is_integral<T>::value>::type RandomFillImage(
-    Image3<T>* image) {
-  Rng rng(129);
-  GenerateImage(rng, image, static_cast<int64_t>(0),
-                static_cast<int64_t>(std::numeric_limits<T>::max()) + 1);
-}
-
-JXL_INLINE void RandomFillImage(Image3F* image) {
-  Rng rng(129);
-  GenerateImage(rng, image, 0.0f, std::numeric_limits<float>::max());
-}
-
-template <typename T, typename U>
-void RandomFillImage(Image3<T>* image, const U begin, const U end,
-                     const uint64_t seed = 129) {
-  Rng rng(seed);
-  GenerateImage(rng, image, begin, end);
-}
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_IMAGE_TEST_UTILS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/inverse_mtf-inl.h b/third_party/jpeg-xl/lib/jxl/inverse_mtf-inl.h
deleted file mode 100644
index 8c63316f3f102..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/inverse_mtf-inl.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// SIMDified inverse-move-to-front transform.
-
-#if defined(LIB_JXL_INVERSE_MTF_INL_H_) == defined(HWY_TARGET_TOGGLE)
-#ifdef LIB_JXL_INVERSE_MTF_INL_H_
-#undef LIB_JXL_INVERSE_MTF_INL_H_
-#else
-#define LIB_JXL_INVERSE_MTF_INL_H_
-#endif
-
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/sanitizers.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::FirstN;
-using hwy::HWY_NAMESPACE::IfThenElse;
-using hwy::HWY_NAMESPACE::Load;
-using hwy::HWY_NAMESPACE::LoadU;
-using hwy::HWY_NAMESPACE::StoreU;
-
-inline void MoveToFront(uint8_t* v, uint8_t index) {
-  uint8_t value = v[index];
-  uint8_t i = index;
-  if (i < 4) {
-    for (; i; --i) v[i] = v[i - 1];
-  } else {
-    const HWY_CAPPED(uint8_t, 64) d;
-    int tail = i & (Lanes(d) - 1);
-    if (tail) {
-      i -= tail;
-      const auto vec = Load(d, v + i);
-      const auto prev = LoadU(d, v + i + 1);
-      StoreU(IfThenElse(FirstN(d, tail), vec, prev), d, v + i + 1);
-    }
-    while (i) {
-      i -= Lanes(d);
-      const auto vec = Load(d, v + i);
-      StoreU(vec, d, v + i + 1);
-    }
-  }
-  v[0] = value;
-}
-
-inline void InverseMoveToFrontTransform(uint8_t* v, int v_len) {
-  HWY_ALIGN uint8_t mtf[256 + 64];
-  int i;
-  for (i = 0; i < 256; ++i) {
-    mtf[i] = static_cast<uint8_t>(i);
-  }
-#if JXL_MEMORY_SANITIZER
-  const HWY_CAPPED(uint8_t, 64) d;
-  for (size_t j = 0; j < Lanes(d); ++j) {
-    mtf[256 + j] = 0;
-  }
-#endif  // JXL_MEMORY_SANITIZER
-  for (i = 0; i < v_len; ++i) {
-    uint8_t index = v[i];
-    v[i] = mtf[index];
-    if (index) MoveToFront(mtf, index);
-  }
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#endif  // LIB_JXL_INVERSE_MTF_INL_H_
-
-#if HWY_ONCE
-#ifndef INVERSE_MTF_ONCE
-#define INVERSE_MTF_ONCE
-
-namespace jxl {
-inline void InverseMoveToFrontTransform(uint8_t* v, int v_len) {
-  HWY_STATIC_DISPATCH(InverseMoveToFrontTransform)(v, v_len);
-}
-}  // namespace jxl
-
-#endif  // INVERSE_MTF_ONCE
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data.cc b/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data.cc
deleted file mode 100644
index 4b896f55240f1..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data.cc
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/jpeg/dec_jpeg_data.h"
-
-#include <brotli/decode.h>
-
-#include "lib/jxl/base/sanitizers.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_bit_reader.h"
-
-namespace jxl {
-namespace jpeg {
-Status DecodeJPEGData(Span<const uint8_t> encoded, JPEGData* jpeg_data) {
-  Status ret = true;
-  const uint8_t* in = encoded.data();
-  size_t available_in = encoded.size();
-  {
-    BitReader br(encoded);
-    BitReaderScopedCloser br_closer(br, ret);
-    JXL_RETURN_IF_ERROR(Bundle::Read(&br, jpeg_data));
-    JXL_RETURN_IF_ERROR(br.JumpToByteBoundary());
-    in += br.TotalBitsConsumed() / 8;
-    available_in -= br.TotalBitsConsumed() / 8;
-  }
-  JXL_RETURN_IF_ERROR(ret);
-
-  BrotliDecoderState* brotli_dec =
-      BrotliDecoderCreateInstance(nullptr, nullptr, nullptr);
-
-  struct BrotliDecDeleter {
-    BrotliDecoderState* brotli_dec;
-    ~BrotliDecDeleter() { BrotliDecoderDestroyInstance(brotli_dec); }
-  } brotli_dec_deleter{brotli_dec};
-
-  BrotliDecoderResult result =
-      BrotliDecoderResult::BROTLI_DECODER_RESULT_SUCCESS;
-
-  auto br_read = [&](std::vector<uint8_t>& data) -> Status {
-    size_t available_out = data.size();
-    uint8_t* out = data.data();
-    while (available_out != 0) {
-      if (BrotliDecoderIsFinished(brotli_dec)) {
-        return JXL_FAILURE("Not enough decompressed output");
-      }
-      uint8_t* next_out_before = out;
-      size_t avail_out_before = available_out;
-      msan::MemoryIsInitialized(in, available_in);
-      result = BrotliDecoderDecompressStream(brotli_dec, &available_in, &in,
-                                             &available_out, &out, nullptr);
-      if (result !=
-              BrotliDecoderResult::BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT &&
-          result != BrotliDecoderResult::BROTLI_DECODER_RESULT_SUCCESS) {
-        return JXL_FAILURE(
-            "Brotli decoding error: %s\n",
-            BrotliDecoderErrorString(BrotliDecoderGetErrorCode(brotli_dec)));
-      }
-      msan::UnpoisonMemory(next_out_before, avail_out_before - available_out);
-    }
-    return true;
-  };
-  size_t num_icc = 0;
-  for (size_t i = 0; i < jpeg_data->app_data.size(); i++) {
-    auto& marker = jpeg_data->app_data[i];
-    if (jpeg_data->app_marker_type[i] != AppMarkerType::kUnknown) {
-      // Set the size of the marker.
-      size_t size_minus_1 = marker.size() - 1;
-      marker[1] = size_minus_1 >> 8;
-      marker[2] = size_minus_1 & 0xFF;
-      if (jpeg_data->app_marker_type[i] == AppMarkerType::kICC) {
-        if (marker.size() < 17) {
-          return JXL_FAILURE("ICC markers must be at least 17 bytes");
-        }
-        marker[0] = 0xE2;
-        memcpy(&marker[3], kIccProfileTag, sizeof kIccProfileTag);
-        marker[15] = ++num_icc;
-      }
-    } else {
-      JXL_RETURN_IF_ERROR(br_read(marker));
-      if (marker[1] * 256u + marker[2] + 1u != marker.size()) {
-        return JXL_FAILURE("Incorrect marker size");
-      }
-    }
-  }
-  for (size_t i = 0; i < jpeg_data->app_data.size(); i++) {
-    auto& marker = jpeg_data->app_data[i];
-    if (jpeg_data->app_marker_type[i] == AppMarkerType::kICC) {
-      marker[16] = num_icc;
-    }
-    if (jpeg_data->app_marker_type[i] == AppMarkerType::kExif) {
-      marker[0] = 0xE1;
-      if (marker.size() < 3 + sizeof kExifTag) {
-        return JXL_FAILURE("Incorrect Exif marker size");
-      }
-      memcpy(&marker[3], kExifTag, sizeof kExifTag);
-    }
-    if (jpeg_data->app_marker_type[i] == AppMarkerType::kXMP) {
-      marker[0] = 0xE1;
-      if (marker.size() < 3 + sizeof kXMPTag) {
-        return JXL_FAILURE("Incorrect XMP marker size");
-      }
-      memcpy(&marker[3], kXMPTag, sizeof kXMPTag);
-    }
-  }
-  // TODO(eustas): actually inject ICC profile and check it fits perfectly.
-  for (auto& marker : jpeg_data->com_data) {
-    JXL_RETURN_IF_ERROR(br_read(marker));
-    if (marker[1] * 256u + marker[2] + 1u != marker.size()) {
-      return JXL_FAILURE("Incorrect marker size");
-    }
-  }
-  for (auto& data : jpeg_data->inter_marker_data) {
-    JXL_RETURN_IF_ERROR(br_read(data));
-  }
-  JXL_RETURN_IF_ERROR(br_read(jpeg_data->tail_data));
-
-  // Check if there is more decompressed output.
-  size_t available_out = 1;
-  uint64_t sink;
-  uint8_t* next_out = reinterpret_cast<uint8_t*>(&sink);
-  result = BrotliDecoderDecompressStream(brotli_dec, &available_in, &in,
-                                         &available_out, &next_out, nullptr);
-  if (available_out == 0 ||
-      result == BrotliDecoderResult::BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT) {
-    return JXL_FAILURE("Excess data in compressed stream");
-  }
-  if (result == BrotliDecoderResult::BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT) {
-    return JXL_FAILURE("Incomplete brotli-stream");
-  }
-  if (!BrotliDecoderIsFinished(brotli_dec) ||
-      result != BrotliDecoderResult::BROTLI_DECODER_RESULT_SUCCESS) {
-    return JXL_FAILURE("Corrupted brotli-stream");
-  }
-  if (available_in != 0) {
-    return JXL_FAILURE("Unused data after brotli stream");
-  }
-
-  return true;
-}
-}  // namespace jpeg
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data.h b/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data.h
deleted file mode 100644
index b9d50bf9f8401..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_JPEG_DEC_JPEG_DATA_H_
-#define LIB_JXL_JPEG_DEC_JPEG_DATA_H_
-
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/jpeg/jpeg_data.h"
-
-namespace jxl {
-namespace jpeg {
-Status DecodeJPEGData(Span<const uint8_t> encoded, JPEGData* jpeg_data);
-}
-}  // namespace jxl
-
-#endif  // LIB_JXL_JPEG_DEC_JPEG_DATA_H_
diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data_writer.cc b/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data_writer.cc
deleted file mode 100644
index 9fb664d3667a0..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data_writer.cc
+++ /dev/null
@@ -1,1065 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/jpeg/dec_jpeg_data_writer.h"
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>
-#include <cstring> /* for memset, memcpy */
-#include <deque>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/jpeg/dec_jpeg_serialization_state.h"
-#include "lib/jxl/jpeg/jpeg_data.h"
-
-namespace jxl {
-namespace jpeg {
-
-namespace {
-
-enum struct SerializationStatus {
-  NEEDS_MORE_INPUT,
-  NEEDS_MORE_OUTPUT,
-  ERROR,
-  DONE
-};
-
-const int kJpegPrecision = 8;
-
-// JpegBitWriter: buffer size
-const size_t kJpegBitWriterChunkSize = 16384;
-
-// Returns non-zero if and only if x has a zero byte, i.e. one of
-// x & 0xff, x & 0xff00, ..., x & 0xff00000000000000 is zero.
-JXL_INLINE uint64_t HasZeroByte(uint64_t x) {
-  return (x - 0x0101010101010101ULL) & ~x & 0x8080808080808080ULL;
-}
-
-void JpegBitWriterInit(JpegBitWriter* bw,
-                       std::deque<OutputChunk>* output_queue) {
-  bw->output = output_queue;
-  bw->chunk = OutputChunk(kJpegBitWriterChunkSize);
-  bw->pos = 0;
-  bw->put_buffer = 0;
-  bw->put_bits = 64;
-  bw->healthy = true;
-  bw->data = bw->chunk.buffer->data();
-}
-
-JXL_NOINLINE void SwapBuffer(JpegBitWriter* bw) {
-  bw->chunk.len = bw->pos;
-  bw->output->emplace_back(std::move(bw->chunk));
-  bw->chunk = OutputChunk(kJpegBitWriterChunkSize);
-  bw->data = bw->chunk.buffer->data();
-  bw->pos = 0;
-}
-
-JXL_INLINE void Reserve(JpegBitWriter* bw, size_t n_bytes) {
-  if (JXL_UNLIKELY((bw->pos + n_bytes) > kJpegBitWriterChunkSize)) {
-    SwapBuffer(bw);
-  }
-}
-
-/**
- * Writes the given byte to the output, writes an extra zero if byte is 0xFF.
- *
- * This method is "careless" - caller must make sure that there is enough
- * space in the output buffer. Emits up to 2 bytes to buffer.
- */
-JXL_INLINE void EmitByte(JpegBitWriter* bw, int byte) {
-  bw->data[bw->pos] = byte;
-  bw->data[bw->pos + 1] = 0;
-  bw->pos += (byte != 0xFF ? 1 : 2);
-}
-
-JXL_INLINE void DischargeBitBuffer(JpegBitWriter* bw, int nbits,
-                                   uint64_t bits) {
-  // At this point we are ready to emit the put_buffer to the output.
-  // The JPEG format requires that after every 0xff byte in the entropy
-  // coded section, there is a zero byte, therefore we first check if any of
-  // the 8 bytes of put_buffer is 0xFF.
-  bw->put_buffer |= (bits >> -bw->put_bits);
-  if (JXL_UNLIKELY(HasZeroByte(~bw->put_buffer))) {
-    // We have a 0xFF byte somewhere, examine each byte and append a zero
-    // byte if necessary.
-    EmitByte(bw, (bw->put_buffer >> 56) & 0xFF);
-    EmitByte(bw, (bw->put_buffer >> 48) & 0xFF);
-    EmitByte(bw, (bw->put_buffer >> 40) & 0xFF);
-    EmitByte(bw, (bw->put_buffer >> 32) & 0xFF);
-    EmitByte(bw, (bw->put_buffer >> 24) & 0xFF);
-    EmitByte(bw, (bw->put_buffer >> 16) & 0xFF);
-    EmitByte(bw, (bw->put_buffer >> 8) & 0xFF);
-    EmitByte(bw, (bw->put_buffer) & 0xFF);
-  } else {
-    // We don't have any 0xFF bytes, output all 8 bytes without checking.
-    StoreBE64(bw->put_buffer, bw->data + bw->pos);
-    bw->pos += 8;
-  }
-
-  bw->put_bits += 64;
-  bw->put_buffer = bits << bw->put_bits;
-}
-
-JXL_INLINE void WriteBits(JpegBitWriter* bw, int nbits, uint64_t bits) {
-  JXL_DASSERT(nbits > 0);
-  bw->put_bits -= nbits;
-  if (JXL_UNLIKELY(bw->put_bits < 0)) {
-    if (JXL_UNLIKELY(nbits > 64)) {
-      bw->put_bits += nbits;
-      bw->healthy = false;
-    } else {
-      DischargeBitBuffer(bw, nbits, bits);
-    }
-  } else {
-    bw->put_buffer |= (bits << bw->put_bits);
-  }
-}
-
-void EmitMarker(JpegBitWriter* bw, int marker) {
-  Reserve(bw, 2);
-  JXL_DASSERT(marker != 0xFF);
-  bw->data[bw->pos++] = 0xFF;
-  bw->data[bw->pos++] = marker;
-}
-
-bool JumpToByteBoundary(JpegBitWriter* bw, const uint8_t** pad_bits,
-                        const uint8_t* pad_bits_end) {
-  size_t n_bits = bw->put_bits & 7u;
-  uint8_t dangling_bits = 0;
-  uint8_t pad_pattern;
-  if (*pad_bits == nullptr) {
-    pad_pattern = (1u << n_bits) - 1;
-  } else {
-    pad_pattern = 0;
-    const uint8_t* src = *pad_bits;
-    // TODO(eustas): bitwise reading looks insanely ineffective!
-    while (n_bits--) {
-      pad_pattern <<= 1;
-      if (src >= pad_bits_end) return false;
-      uint8_t bit = *src;
-      src++;
-      dangling_bits |= bit;
-      pad_pattern |= bit;
-    }
-    *pad_bits = src;
-  }
-  if ((dangling_bits & ~1) != 0) return false;
-
-  Reserve(bw, 16);
-
-  while (bw->put_bits <= 56) {
-    int c = (bw->put_buffer >> 56) & 0xFF;
-    EmitByte(bw, c);
-    bw->put_buffer <<= 8;
-    bw->put_bits += 8;
-  }
-  if (bw->put_bits < 64) {
-    int pad_mask = 0xFFu >> (64 - bw->put_bits);
-    int c = ((bw->put_buffer >> 56) & ~pad_mask) | pad_pattern;
-    EmitByte(bw, c);
-  }
-  bw->put_buffer = 0;
-  bw->put_bits = 64;
-
-  return true;
-}
-
-void JpegBitWriterFinish(JpegBitWriter* bw) {
-  if (bw->pos == 0) return;
-  bw->chunk.len = bw->pos;
-  bw->output->emplace_back(std::move(bw->chunk));
-  bw->chunk = OutputChunk(nullptr, 0);
-  bw->data = nullptr;
-  bw->pos = 0;
-}
-
-void DCTCodingStateInit(DCTCodingState* s) {
-  s->eob_run_ = 0;
-  s->cur_ac_huff_ = nullptr;
-  s->refinement_bits_.clear();
-  s->refinement_bits_.reserve(64);
-}
-
-JXL_INLINE void WriteSymbol(int symbol, HuffmanCodeTable* table,
-                            JpegBitWriter* bw) {
-  WriteBits(bw, table->depth[symbol], table->code[symbol]);
-}
-
-JXL_INLINE void WriteSymbolBits(int symbol, HuffmanCodeTable* table,
-                                JpegBitWriter* bw, int nbits, uint64_t bits) {
-  WriteBits(bw, nbits + table->depth[symbol],
-            bits | (table->code[symbol] << nbits));
-}
-
-// Emit all buffered data to the bit stream using the given Huffman code and
-// bit writer.
-JXL_INLINE void Flush(DCTCodingState* s, JpegBitWriter* bw) {
-  if (s->eob_run_ > 0) {
-    Reserve(bw, 16);
-    int nbits = FloorLog2Nonzero<uint32_t>(s->eob_run_);
-    int symbol = nbits << 4u;
-    WriteSymbol(symbol, s->cur_ac_huff_, bw);
-    if (nbits > 0) {
-      WriteBits(bw, nbits, s->eob_run_ & ((1 << nbits) - 1));
-    }
-    s->eob_run_ = 0;
-  }
-  const size_t kStride = 124;  // (515 - 16) / 2 / 2
-  size_t num_words = s->refinement_bits_count_ >> 4;
-  size_t i = 0;
-  while (i < num_words) {
-    size_t limit = std::min(i + kStride, num_words);
-    Reserve(bw, 512);
-    for (; i < limit; ++i) {
-      WriteBits(bw, 16, s->refinement_bits_[i]);
-    }
-  }
-  Reserve(bw, 16);
-  size_t tail = s->refinement_bits_count_ & 0xF;
-  if (tail) {
-    WriteBits(bw, tail, s->refinement_bits_.back());
-  }
-  s->refinement_bits_.clear();
-  s->refinement_bits_count_ = 0;
-}
-
-// Buffer some more data at the end-of-band (the last non-zero or newly
-// non-zero coefficient within the [Ss, Se] spectral band).
-JXL_INLINE void BufferEndOfBand(DCTCodingState* s, HuffmanCodeTable* ac_huff,
-                                const int* new_bits_array,
-                                size_t new_bits_count, JpegBitWriter* bw) {
-  if (s->eob_run_ == 0) {
-    s->cur_ac_huff_ = ac_huff;
-  }
-  ++s->eob_run_;
-  if (new_bits_count) {
-    uint64_t new_bits = 0;
-    for (size_t i = 0; i < new_bits_count; ++i) {
-      new_bits = (new_bits << 1) | new_bits_array[i];
-    }
-    size_t tail = s->refinement_bits_count_ & 0xF;
-    if (tail) {  // First stuff the tail item
-      size_t stuff_bits_count = std::min(16 - tail, new_bits_count);
-      uint16_t stuff_bits = new_bits >> (new_bits_count - stuff_bits_count);
-      stuff_bits &= ((1u << stuff_bits_count) - 1);
-      s->refinement_bits_.back() =
-          (s->refinement_bits_.back() << stuff_bits_count) | stuff_bits;
-      new_bits_count -= stuff_bits_count;
-      s->refinement_bits_count_ += stuff_bits_count;
-    }
-    while (new_bits_count >= 16) {
-      s->refinement_bits_.push_back(new_bits >> (new_bits_count - 16));
-      new_bits_count -= 16;
-      s->refinement_bits_count_ += 16;
-    }
-    if (new_bits_count) {
-      s->refinement_bits_.push_back(new_bits & ((1u << new_bits_count) - 1));
-      s->refinement_bits_count_ += new_bits_count;
-    }
-  }
-
-  if (s->eob_run_ == 0x7FFF) {
-    Flush(s, bw);
-  }
-}
-
-bool BuildHuffmanCodeTable(const JPEGHuffmanCode& huff,
-                           HuffmanCodeTable* table) {
-  int huff_code[kJpegHuffmanAlphabetSize];
-  // +1 for a sentinel element.
-  uint32_t huff_size[kJpegHuffmanAlphabetSize + 1];
-  int p = 0;
-  for (size_t l = 1; l <= kJpegHuffmanMaxBitLength; ++l) {
-    int i = huff.counts[l];
-    if (p + i > kJpegHuffmanAlphabetSize + 1) {
-      return false;
-    }
-    while (i--) huff_size[p++] = l;
-  }
-
-  if (p == 0) {
-    return true;
-  }
-
-  // Reuse sentinel element.
-  int last_p = p - 1;
-  huff_size[last_p] = 0;
-
-  int code = 0;
-  uint32_t si = huff_size[0];
-  p = 0;
-  while (huff_size[p]) {
-    while ((huff_size[p]) == si) {
-      huff_code[p++] = code;
-      code++;
-    }
-    code <<= 1;
-    si++;
-  }
-  for (p = 0; p < last_p; p++) {
-    int i = huff.values[p];
-    table->depth[i] = huff_size[p];
-    table->code[i] = huff_code[p];
-  }
-  return true;
-}
-
-bool EncodeSOI(SerializationState* state) {
-  state->output_queue.push_back(OutputChunk({0xFF, 0xD8}));
-  return true;
-}
-
-bool EncodeEOI(const JPEGData& jpg, SerializationState* state) {
-  state->output_queue.push_back(OutputChunk({0xFF, 0xD9}));
-  state->output_queue.emplace_back(jpg.tail_data);
-  return true;
-}
-
-bool EncodeSOF(const JPEGData& jpg, uint8_t marker, SerializationState* state) {
-  if (marker <= 0xC2) state->is_progressive = (marker == 0xC2);
-
-  const size_t n_comps = jpg.components.size();
-  const size_t marker_len = 8 + 3 * n_comps;
-  state->output_queue.emplace_back(marker_len + 2);
-  uint8_t* data = state->output_queue.back().buffer->data();
-  size_t pos = 0;
-  data[pos++] = 0xFF;
-  data[pos++] = marker;
-  data[pos++] = marker_len >> 8u;
-  data[pos++] = marker_len & 0xFFu;
-  data[pos++] = kJpegPrecision;
-  data[pos++] = jpg.height >> 8u;
-  data[pos++] = jpg.height & 0xFFu;
-  data[pos++] = jpg.width >> 8u;
-  data[pos++] = jpg.width & 0xFFu;
-  data[pos++] = n_comps;
-  for (size_t i = 0; i < n_comps; ++i) {
-    data[pos++] = jpg.components[i].id;
-    data[pos++] = ((jpg.components[i].h_samp_factor << 4u) |
-                   (jpg.components[i].v_samp_factor));
-    const size_t quant_idx = jpg.components[i].quant_idx;
-    if (quant_idx >= jpg.quant.size()) return false;
-    data[pos++] = jpg.quant[quant_idx].index;
-  }
-  return true;
-}
-
-bool EncodeSOS(const JPEGData& jpg, const JPEGScanInfo& scan_info,
-               SerializationState* state) {
-  const size_t n_scans = scan_info.num_components;
-  const size_t marker_len = 6 + 2 * n_scans;
-  state->output_queue.emplace_back(marker_len + 2);
-  uint8_t* data = state->output_queue.back().buffer->data();
-  size_t pos = 0;
-  data[pos++] = 0xFF;
-  data[pos++] = 0xDA;
-  data[pos++] = marker_len >> 8u;
-  data[pos++] = marker_len & 0xFFu;
-  data[pos++] = n_scans;
-  for (size_t i = 0; i < n_scans; ++i) {
-    const JPEGComponentScanInfo& si = scan_info.components[i];
-    if (si.comp_idx >= jpg.components.size()) return false;
-    data[pos++] = jpg.components[si.comp_idx].id;
-    data[pos++] = (si.dc_tbl_idx << 4u) + si.ac_tbl_idx;
-  }
-  data[pos++] = scan_info.Ss;
-  data[pos++] = scan_info.Se;
-  data[pos++] = ((scan_info.Ah << 4u) | (scan_info.Al));
-  return true;
-}
-
-bool EncodeDHT(const JPEGData& jpg, SerializationState* state) {
-  const std::vector<JPEGHuffmanCode>& huffman_code = jpg.huffman_code;
-
-  size_t marker_len = 2;
-  for (size_t i = state->dht_index; i < huffman_code.size(); ++i) {
-    const JPEGHuffmanCode& huff = huffman_code[i];
-    marker_len += kJpegHuffmanMaxBitLength;
-    for (uint32_t count : huff.counts) {
-      marker_len += count;
-    }
-    if (huff.is_last) break;
-  }
-  state->output_queue.emplace_back(marker_len + 2);
-  uint8_t* data = state->output_queue.back().buffer->data();
-  size_t pos = 0;
-  data[pos++] = 0xFF;
-  data[pos++] = 0xC4;
-  data[pos++] = marker_len >> 8u;
-  data[pos++] = marker_len & 0xFFu;
-  while (true) {
-    const size_t huffman_code_index = state->dht_index++;
-    if (huffman_code_index >= huffman_code.size()) {
-      return false;
-    }
-    const JPEGHuffmanCode& huff = huffman_code[huffman_code_index];
-    size_t index = huff.slot_id;
-    HuffmanCodeTable* huff_table;
-    if (index & 0x10) {
-      index -= 0x10;
-      huff_table = &state->ac_huff_table[index];
-    } else {
-      huff_table = &state->dc_huff_table[index];
-    }
-    // TODO(eustas): cache
-    huff_table->InitDepths(127);
-    if (!BuildHuffmanCodeTable(huff, huff_table)) {
-      return false;
-    }
-    huff_table->initialized = true;
-    size_t total_count = 0;
-    size_t max_length = 0;
-    for (size_t i = 0; i < huff.counts.size(); ++i) {
-      if (huff.counts[i] != 0) {
-        max_length = i;
-      }
-      total_count += huff.counts[i];
-    }
-    --total_count;
-    data[pos++] = huff.slot_id;
-    for (size_t i = 1; i <= kJpegHuffmanMaxBitLength; ++i) {
-      data[pos++] = (i == max_length ? huff.counts[i] - 1 : huff.counts[i]);
-    }
-    for (size_t i = 0; i < total_count; ++i) {
-      data[pos++] = huff.values[i];
-    }
-    if (huff.is_last) break;
-  }
-  return true;
-}
-
-bool EncodeDQT(const JPEGData& jpg, SerializationState* state) {
-  int marker_len = 2;
-  for (size_t i = state->dqt_index; i < jpg.quant.size(); ++i) {
-    const JPEGQuantTable& table = jpg.quant[i];
-    marker_len += 1 + (table.precision ? 2 : 1) * kDCTBlockSize;
-    if (table.is_last) break;
-  }
-  state->output_queue.emplace_back(marker_len + 2);
-  uint8_t* data = state->output_queue.back().buffer->data();
-  size_t pos = 0;
-  data[pos++] = 0xFF;
-  data[pos++] = 0xDB;
-  data[pos++] = marker_len >> 8u;
-  data[pos++] = marker_len & 0xFFu;
-  while (true) {
-    const size_t idx = state->dqt_index++;
-    if (idx >= jpg.quant.size()) {
-      return false;  // corrupt input
-    }
-    const JPEGQuantTable& table = jpg.quant[idx];
-    data[pos++] = (table.precision << 4u) + table.index;
-    for (size_t i = 0; i < kDCTBlockSize; ++i) {
-      int val_idx = kJPEGNaturalOrder[i];
-      int val = table.values[val_idx];
-      if (table.precision) {
-        data[pos++] = val >> 8u;
-      }
-      data[pos++] = val & 0xFFu;
-    }
-    if (table.is_last) break;
-  }
-  return true;
-}
-
-bool EncodeDRI(const JPEGData& jpg, SerializationState* state) {
-  state->seen_dri_marker = true;
-  OutputChunk dri_marker = {0xFF,
-                            0xDD,
-                            0,
-                            4,
-                            static_cast<uint8_t>(jpg.restart_interval >> 8),
-                            static_cast<uint8_t>(jpg.restart_interval & 0xFF)};
-  state->output_queue.push_back(std::move(dri_marker));
-  return true;
-}
-
-bool EncodeRestart(uint8_t marker, SerializationState* state) {
-  state->output_queue.push_back(OutputChunk({0xFF, marker}));
-  return true;
-}
-
-bool EncodeAPP(const JPEGData& jpg, uint8_t marker, SerializationState* state) {
-  // TODO(eustas): check that marker corresponds to payload?
-  (void)marker;
-
-  size_t app_index = state->app_index++;
-  if (app_index >= jpg.app_data.size()) return false;
-  state->output_queue.push_back(OutputChunk({0xFF}));
-  state->output_queue.emplace_back(jpg.app_data[app_index]);
-  return true;
-}
-
-bool EncodeCOM(const JPEGData& jpg, SerializationState* state) {
-  size_t com_index = state->com_index++;
-  if (com_index >= jpg.com_data.size()) return false;
-  state->output_queue.push_back(OutputChunk({0xFF}));
-  state->output_queue.emplace_back(jpg.com_data[com_index]);
-  return true;
-}
-
-bool EncodeInterMarkerData(const JPEGData& jpg, SerializationState* state) {
-  size_t index = state->data_index++;
-  if (index >= jpg.inter_marker_data.size()) return false;
-  state->output_queue.emplace_back(jpg.inter_marker_data[index]);
-  return true;
-}
-
-bool EncodeDCTBlockSequential(const coeff_t* coeffs, HuffmanCodeTable* dc_huff,
-                              HuffmanCodeTable* ac_huff, int num_zero_runs,
-                              coeff_t* last_dc_coeff, JpegBitWriter* bw) {
-  coeff_t temp2;
-  coeff_t temp;
-  coeff_t litmus = 0;
-  temp2 = coeffs[0];
-  temp = temp2 - *last_dc_coeff;
-  *last_dc_coeff = temp2;
-  temp2 = temp >> (8 * sizeof(coeff_t) - 1);
-  temp += temp2;
-  temp2 ^= temp;
-
-  int dc_nbits = (temp2 == 0) ? 0 : (FloorLog2Nonzero<uint32_t>(temp2) + 1);
-  WriteSymbol(dc_nbits, dc_huff, bw);
-#if JXL_FALSE
-  // If the input is corrupt, this could be triggered. Checking is
-  // costly though, so it makes more sense to avoid this branch.
-  // (producing a corrupt JPEG when the input is corrupt, instead
-  // of catching it and returning error)
-  if (dc_nbits >= 12) return false;
-#endif
-  if (dc_nbits) {
-    WriteBits(bw, dc_nbits, temp & ((1u << dc_nbits) - 1));
-  }
-  int16_t r = 0;
-
-  for (size_t i = 1; i < 64; i++) {
-    temp = coeffs[kJPEGNaturalOrder[i]];
-    if (temp == 0) {
-      r++;
-    } else {
-      temp2 = temp >> (8 * sizeof(coeff_t) - 1);
-      temp += temp2;
-      temp2 ^= temp;
-      if (JXL_UNLIKELY(r > 15)) {
-        WriteSymbol(0xf0, ac_huff, bw);
-        r -= 16;
-        if (r > 15) {
-          WriteSymbol(0xf0, ac_huff, bw);
-          r -= 16;
-        }
-        if (r > 15) {
-          WriteSymbol(0xf0, ac_huff, bw);
-          r -= 16;
-        }
-      }
-      litmus |= temp2;
-      int ac_nbits =
-          FloorLog2Nonzero<uint32_t>(static_cast<uint16_t>(temp2)) + 1;
-      int symbol = (r << 4u) + ac_nbits;
-      WriteSymbolBits(symbol, ac_huff, bw, ac_nbits,
-                      temp & ((1 << ac_nbits) - 1));
-      r = 0;
-    }
-  }
-
-  for (int i = 0; i < num_zero_runs; ++i) {
-    WriteSymbol(0xf0, ac_huff, bw);
-    r -= 16;
-  }
-  if (r > 0) {
-    WriteSymbol(0, ac_huff, bw);
-  }
-  return (litmus >= 0);
-}
-
-bool EncodeDCTBlockProgressive(const coeff_t* coeffs, HuffmanCodeTable* dc_huff,
-                               HuffmanCodeTable* ac_huff, int Ss, int Se,
-                               int Al, int num_zero_runs,
-                               DCTCodingState* coding_state,
-                               coeff_t* last_dc_coeff, JpegBitWriter* bw) {
-  bool eob_run_allowed = Ss > 0;
-  coeff_t temp2;
-  coeff_t temp;
-  if (Ss == 0) {
-    temp2 = coeffs[0] >> Al;
-    temp = temp2 - *last_dc_coeff;
-    *last_dc_coeff = temp2;
-    temp2 = temp;
-    if (temp < 0) {
-      temp = -temp;
-      if (temp < 0) return false;
-      temp2--;
-    }
-    int nbits = (temp == 0) ? 0 : (FloorLog2Nonzero<uint32_t>(temp) + 1);
-    WriteSymbol(nbits, dc_huff, bw);
-    if (nbits) {
-      WriteBits(bw, nbits, temp2 & ((1 << nbits) - 1));
-    }
-    ++Ss;
-  }
-  if (Ss > Se) {
-    return true;
-  }
-  int r = 0;
-  for (int k = Ss; k <= Se; ++k) {
-    temp = coeffs[kJPEGNaturalOrder[k]];
-    if (temp == 0) {
-      r++;
-      continue;
-    }
-    if (temp < 0) {
-      temp = -temp;
-      if (temp < 0) return false;
-      temp >>= Al;
-      temp2 = ~temp;
-    } else {
-      temp >>= Al;
-      temp2 = temp;
-    }
-    if (temp == 0) {
-      r++;
-      continue;
-    }
-    Flush(coding_state, bw);
-    while (r > 15) {
-      WriteSymbol(0xf0, ac_huff, bw);
-      r -= 16;
-    }
-    int nbits = FloorLog2Nonzero<uint32_t>(temp) + 1;
-    int symbol = (r << 4u) + nbits;
-    WriteSymbol(symbol, ac_huff, bw);
-    WriteBits(bw, nbits, temp2 & ((1 << nbits) - 1));
-    r = 0;
-  }
-  if (num_zero_runs > 0) {
-    Flush(coding_state, bw);
-    for (int i = 0; i < num_zero_runs; ++i) {
-      WriteSymbol(0xf0, ac_huff, bw);
-      r -= 16;
-    }
-  }
-  if (r > 0) {
-    BufferEndOfBand(coding_state, ac_huff, nullptr, 0, bw);
-    if (!eob_run_allowed) {
-      Flush(coding_state, bw);
-    }
-  }
-  return true;
-}
-
-bool EncodeRefinementBits(const coeff_t* coeffs, HuffmanCodeTable* ac_huff,
-                          int Ss, int Se, int Al, DCTCodingState* coding_state,
-                          JpegBitWriter* bw) {
-  bool eob_run_allowed = Ss > 0;
-  if (Ss == 0) {
-    // Emit next bit of DC component.
-    WriteBits(bw, 1, (coeffs[0] >> Al) & 1);
-    ++Ss;
-  }
-  if (Ss > Se) {
-    return true;
-  }
-  int abs_values[kDCTBlockSize];
-  int eob = 0;
-  for (int k = Ss; k <= Se; k++) {
-    const coeff_t abs_val = std::abs(coeffs[kJPEGNaturalOrder[k]]);
-    abs_values[k] = abs_val >> Al;
-    if (abs_values[k] == 1) {
-      eob = k;
-    }
-  }
-  int r = 0;
-  int refinement_bits[kDCTBlockSize];
-  size_t refinement_bits_count = 0;
-  for (int k = Ss; k <= Se; k++) {
-    if (abs_values[k] == 0) {
-      r++;
-      continue;
-    }
-    while (r > 15 && k <= eob) {
-      Flush(coding_state, bw);
-      WriteSymbol(0xf0, ac_huff, bw);
-      r -= 16;
-      for (size_t i = 0; i < refinement_bits_count; ++i) {
-        WriteBits(bw, 1, refinement_bits[i]);
-      }
-      refinement_bits_count = 0;
-    }
-    if (abs_values[k] > 1) {
-      refinement_bits[refinement_bits_count++] = abs_values[k] & 1u;
-      continue;
-    }
-    Flush(coding_state, bw);
-    int symbol = (r << 4u) + 1;
-    int new_non_zero_bit = (coeffs[kJPEGNaturalOrder[k]] < 0) ? 0 : 1;
-    WriteSymbol(symbol, ac_huff, bw);
-    WriteBits(bw, 1, new_non_zero_bit);
-    for (size_t i = 0; i < refinement_bits_count; ++i) {
-      WriteBits(bw, 1, refinement_bits[i]);
-    }
-    refinement_bits_count = 0;
-    r = 0;
-  }
-  if (r > 0 || refinement_bits_count) {
-    BufferEndOfBand(coding_state, ac_huff, refinement_bits,
-                    refinement_bits_count, bw);
-    if (!eob_run_allowed) {
-      Flush(coding_state, bw);
-    }
-  }
-  return true;
-}
-
-template <int kMode>
-SerializationStatus JXL_NOINLINE DoEncodeScan(const JPEGData& jpg,
-                                              SerializationState* state) {
-  const JPEGScanInfo& scan_info = jpg.scan_info[state->scan_index];
-  EncodeScanState& ss = state->scan_state;
-
-  const int restart_interval =
-      state->seen_dri_marker ? jpg.restart_interval : 0;
-
-  const auto get_next_extra_zero_run_index = [&ss, &scan_info]() -> int {
-    if (ss.extra_zero_runs_pos < scan_info.extra_zero_runs.size()) {
-      return scan_info.extra_zero_runs[ss.extra_zero_runs_pos].block_idx;
-    } else {
-      return -1;
-    }
-  };
-
-  const auto get_next_reset_point = [&ss, &scan_info]() -> int {
-    if (ss.next_reset_point_pos < scan_info.reset_points.size()) {
-      return scan_info.reset_points[ss.next_reset_point_pos++];
-    } else {
-      return -1;
-    }
-  };
-
-  if (ss.stage == EncodeScanState::HEAD) {
-    if (!EncodeSOS(jpg, scan_info, state)) return SerializationStatus::ERROR;
-    JpegBitWriterInit(&ss.bw, &state->output_queue);
-    DCTCodingStateInit(&ss.coding_state);
-    ss.restarts_to_go = restart_interval;
-    ss.next_restart_marker = 0;
-    ss.block_scan_index = 0;
-    ss.extra_zero_runs_pos = 0;
-    ss.next_extra_zero_run_index = get_next_extra_zero_run_index();
-    ss.next_reset_point_pos = 0;
-    ss.next_reset_point = get_next_reset_point();
-    ss.mcu_y = 0;
-    memset(ss.last_dc_coeff, 0, sizeof(ss.last_dc_coeff));
-    ss.stage = EncodeScanState::BODY;
-  }
-  JpegBitWriter* bw = &ss.bw;
-  DCTCodingState* coding_state = &ss.coding_state;
-
-  if (ss.stage != EncodeScanState::BODY) return SerializationStatus::ERROR;
-
-  // "Non-interleaved" means color data comes in separate scans, in other words
-  // each scan can contain only one color component.
-  const bool is_interleaved = (scan_info.num_components > 1);
-  int MCUs_per_row = 0;
-  int MCU_rows = 0;
-  jpg.CalculateMcuSize(scan_info, &MCUs_per_row, &MCU_rows);
-  const bool is_progressive = state->is_progressive;
-  const int Al = is_progressive ? scan_info.Al : 0;
-  const int Ss = is_progressive ? scan_info.Ss : 0;
-  const int Se = is_progressive ? scan_info.Se : 63;
-
-  // DC-only is defined by [0..0] spectral range.
-  const bool want_ac = ((Ss != 0) || (Se != 0));
-  const bool want_dc = (Ss == 0);
-  // TODO(user): support streaming decoding again.
-  const bool complete_ac = true;
-  const bool has_ac = true;
-  if (want_ac && !has_ac) return SerializationStatus::NEEDS_MORE_INPUT;
-
-  // |has_ac| implies |complete_dc| but not vice versa; for the sake of
-  // simplicity we pretend they are equal, because they are separated by just a
-  // few bytes of input.
-  const bool complete_dc = has_ac;
-  const bool complete = want_ac ? complete_ac : complete_dc;
-  // When "incomplete" |ac_dc| tracks information about current ("incomplete")
-  // band parsing progress.
-
-  // FIXME: Is this always complete?
-  // const int last_mcu_y =
-  //     complete ? MCU_rows : parsing_state.internal->ac_dc.next_mcu_y *
-  //     v_group;
-  (void)complete;
-  const int last_mcu_y = complete ? MCU_rows : 0;
-
-  for (; ss.mcu_y < last_mcu_y; ++ss.mcu_y) {
-    for (int mcu_x = 0; mcu_x < MCUs_per_row; ++mcu_x) {
-      // Possibly emit a restart marker.
-      if (restart_interval > 0 && ss.restarts_to_go == 0) {
-        Flush(coding_state, bw);
-        if (!JumpToByteBoundary(bw, &state->pad_bits, state->pad_bits_end)) {
-          return SerializationStatus::ERROR;
-        }
-        EmitMarker(bw, 0xD0 + ss.next_restart_marker);
-        ss.next_restart_marker += 1;
-        ss.next_restart_marker &= 0x7;
-        ss.restarts_to_go = restart_interval;
-        memset(ss.last_dc_coeff, 0, sizeof(ss.last_dc_coeff));
-      }
-
-      // Encode one MCU
-      for (size_t i = 0; i < scan_info.num_components; ++i) {
-        const JPEGComponentScanInfo& si = scan_info.components[i];
-        const JPEGComponent& c = jpg.components[si.comp_idx];
-        size_t dc_tbl_idx = si.dc_tbl_idx;
-        size_t ac_tbl_idx = si.ac_tbl_idx;
-        HuffmanCodeTable* dc_huff = &state->dc_huff_table[dc_tbl_idx];
-        HuffmanCodeTable* ac_huff = &state->ac_huff_table[ac_tbl_idx];
-        if (want_dc && !dc_huff->initialized) {
-          return SerializationStatus::ERROR;
-        }
-        if (want_ac && !ac_huff->initialized) {
-          return SerializationStatus::ERROR;
-        }
-        int n_blocks_y = is_interleaved ? c.v_samp_factor : 1;
-        int n_blocks_x = is_interleaved ? c.h_samp_factor : 1;
-        for (int iy = 0; iy < n_blocks_y; ++iy) {
-          for (int ix = 0; ix < n_blocks_x; ++ix) {
-            int block_y = ss.mcu_y * n_blocks_y + iy;
-            int block_x = mcu_x * n_blocks_x + ix;
-            int block_idx = block_y * c.width_in_blocks + block_x;
-            if (ss.block_scan_index == ss.next_reset_point) {
-              Flush(coding_state, bw);
-              ss.next_reset_point = get_next_reset_point();
-            }
-            int num_zero_runs = 0;
-            if (ss.block_scan_index == ss.next_extra_zero_run_index) {
-              num_zero_runs = scan_info.extra_zero_runs[ss.extra_zero_runs_pos]
-                                  .num_extra_zero_runs;
-              ++ss.extra_zero_runs_pos;
-              ss.next_extra_zero_run_index = get_next_extra_zero_run_index();
-            }
-            const coeff_t* coeffs = &c.coeffs[block_idx << 6];
-            bool ok;
-            // compressed size per block cannot be more than 512 bytes
-            Reserve(bw, 512);
-            if (kMode == 0) {
-              ok = EncodeDCTBlockSequential(coeffs, dc_huff, ac_huff,
-                                            num_zero_runs,
-                                            ss.last_dc_coeff + si.comp_idx, bw);
-            } else if (kMode == 1) {
-              ok = EncodeDCTBlockProgressive(
-                  coeffs, dc_huff, ac_huff, Ss, Se, Al, num_zero_runs,
-                  coding_state, ss.last_dc_coeff + si.comp_idx, bw);
-            } else {
-              ok = EncodeRefinementBits(coeffs, ac_huff, Ss, Se, Al,
-                                        coding_state, bw);
-            }
-            if (!ok) return SerializationStatus::ERROR;
-            ++ss.block_scan_index;
-          }
-        }
-      }
-      --ss.restarts_to_go;
-    }
-  }
-  if (ss.mcu_y < MCU_rows) {
-    if (!bw->healthy) return SerializationStatus::ERROR;
-    return SerializationStatus::NEEDS_MORE_INPUT;
-  }
-  Flush(coding_state, bw);
-  if (!JumpToByteBoundary(bw, &state->pad_bits, state->pad_bits_end)) {
-    return SerializationStatus::ERROR;
-  }
-  JpegBitWriterFinish(bw);
-  ss.stage = EncodeScanState::HEAD;
-  state->scan_index++;
-  if (!bw->healthy) return SerializationStatus::ERROR;
-
-  return SerializationStatus::DONE;
-}
-
-SerializationStatus JXL_INLINE EncodeScan(const JPEGData& jpg,
-                                          SerializationState* state) {
-  const JPEGScanInfo& scan_info = jpg.scan_info[state->scan_index];
-  const bool is_progressive = state->is_progressive;
-  const int Al = is_progressive ? scan_info.Al : 0;
-  const int Ah = is_progressive ? scan_info.Ah : 0;
-  const int Ss = is_progressive ? scan_info.Ss : 0;
-  const int Se = is_progressive ? scan_info.Se : 63;
-  const bool need_sequential =
-      !is_progressive || (Ah == 0 && Al == 0 && Ss == 0 && Se == 63);
-  if (need_sequential) {
-    return DoEncodeScan<0>(jpg, state);
-  } else if (Ah == 0) {
-    return DoEncodeScan<1>(jpg, state);
-  } else {
-    return DoEncodeScan<2>(jpg, state);
-  }
-}
-
-SerializationStatus SerializeSection(uint8_t marker, SerializationState* state,
-                                     const JPEGData& jpg) {
-  const auto to_status = [](bool result) {
-    return result ? SerializationStatus::DONE : SerializationStatus::ERROR;
-  };
-  // TODO(eustas): add and use marker enum
-  switch (marker) {
-    case 0xC0:
-    case 0xC1:
-    case 0xC2:
-    case 0xC9:
-    case 0xCA:
-      return to_status(EncodeSOF(jpg, marker, state));
-
-    case 0xC4:
-      return to_status(EncodeDHT(jpg, state));
-
-    case 0xD0:
-    case 0xD1:
-    case 0xD2:
-    case 0xD3:
-    case 0xD4:
-    case 0xD5:
-    case 0xD6:
-    case 0xD7:
-      return to_status(EncodeRestart(marker, state));
-
-    case 0xD9:
-      return to_status(EncodeEOI(jpg, state));
-
-    case 0xDA:
-      return EncodeScan(jpg, state);
-
-    case 0xDB:
-      return to_status(EncodeDQT(jpg, state));
-
-    case 0xDD:
-      return to_status(EncodeDRI(jpg, state));
-
-    case 0xE0:
-    case 0xE1:
-    case 0xE2:
-    case 0xE3:
-    case 0xE4:
-    case 0xE5:
-    case 0xE6:
-    case 0xE7:
-    case 0xE8:
-    case 0xE9:
-    case 0xEA:
-    case 0xEB:
-    case 0xEC:
-    case 0xED:
-    case 0xEE:
-    case 0xEF:
-      return to_status(EncodeAPP(jpg, marker, state));
-
-    case 0xFE:
-      return to_status(EncodeCOM(jpg, state));
-
-    case 0xFF:
-      return to_status(EncodeInterMarkerData(jpg, state));
-
-    default:
-      return SerializationStatus::ERROR;
-  }
-}
-
-// TODO(veluca): add streaming support again.
-Status WriteJpegInternal(const JPEGData& jpg, const JPEGOutput& out,
-                         SerializationState* ss) {
-  const auto maybe_push_output = [&]() -> Status {
-    if (ss->stage != SerializationState::STAGE_ERROR) {
-      while (!ss->output_queue.empty()) {
-        auto& chunk = ss->output_queue.front();
-        size_t num_written = out(chunk.next, chunk.len);
-        if (num_written == 0 && chunk.len > 0) {
-          return StatusMessage(Status(StatusCode::kNotEnoughBytes),
-                               "Failed to write output");
-        }
-        chunk.len -= num_written;
-        if (chunk.len == 0) {
-          ss->output_queue.pop_front();
-        }
-      }
-    }
-    return true;
-  };
-
-  while (true) {
-    switch (ss->stage) {
-      case SerializationState::STAGE_INIT: {
-        // Valid Brunsli requires, at least, 0xD9 marker.
-        // This might happen on corrupted stream, or on unconditioned JPEGData.
-        // TODO(eustas): check D9 in the only one and is the last one.
-        if (jpg.marker_order.empty()) {
-          ss->stage = SerializationState::STAGE_ERROR;
-          break;
-        }
-        ss->dc_huff_table.resize(kMaxHuffmanTables);
-        ss->ac_huff_table.resize(kMaxHuffmanTables);
-        if (jpg.has_zero_padding_bit) {
-          ss->pad_bits = jpg.padding_bits.data();
-          ss->pad_bits_end = ss->pad_bits + jpg.padding_bits.size();
-        }
-
-        EncodeSOI(ss);
-        JXL_QUIET_RETURN_IF_ERROR(maybe_push_output());
-        ss->stage = SerializationState::STAGE_SERIALIZE_SECTION;
-        break;
-      }
-
-      case SerializationState::STAGE_SERIALIZE_SECTION: {
-        if (ss->section_index >= jpg.marker_order.size()) {
-          ss->stage = SerializationState::STAGE_DONE;
-          break;
-        }
-        uint8_t marker = jpg.marker_order[ss->section_index];
-        SerializationStatus status = SerializeSection(marker, ss, jpg);
-        if (status == SerializationStatus::ERROR) {
-          JXL_WARNING("Failed to encode marker 0x%.2x", marker);
-          ss->stage = SerializationState::STAGE_ERROR;
-          break;
-        }
-        JXL_QUIET_RETURN_IF_ERROR(maybe_push_output());
-        if (status == SerializationStatus::NEEDS_MORE_INPUT) {
-          return JXL_FAILURE("Incomplete serialization data");
-        } else if (status != SerializationStatus::DONE) {
-          ss->stage = SerializationState::STAGE_ERROR;
-          return JXL_FAILURE("Internal logic error");
-          break;
-        }
-        ++ss->section_index;
-        break;
-      }
-
-      case SerializationState::STAGE_DONE:
-        JXL_ENSURE(ss->output_queue.empty());
-        if (ss->pad_bits != nullptr && ss->pad_bits != ss->pad_bits_end) {
-          return JXL_FAILURE("Invalid number of padding bits.");
-        }
-        return true;
-
-      case SerializationState::STAGE_ERROR:
-        return JXL_FAILURE("JPEG serialization error");
-    }
-  }
-}
-
-}  // namespace
-
-Status WriteJpeg(const JPEGData& jpg, const JPEGOutput& out) {
-  auto ss = jxl::make_unique<SerializationState>();
-  return WriteJpegInternal(jpg, out, ss.get());
-}
-
-}  // namespace jpeg
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data_writer.h b/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data_writer.h
deleted file mode 100644
index c6f70ff8b1740..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_data_writer.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Functions for writing a JPEGData object into a jpeg byte stream.
-
-#ifndef LIB_JXL_JPEG_DEC_JPEG_DATA_WRITER_H_
-#define LIB_JXL_JPEG_DEC_JPEG_DATA_WRITER_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include <functional>
-
-#include "lib/jxl/jpeg/dec_jpeg_serialization_state.h"
-#include "lib/jxl/jpeg/jpeg_data.h"
-
-namespace jxl {
-namespace jpeg {
-
-// Function type used to write len bytes into buf. Returns the number of bytes
-// written.
-using JPEGOutput = std::function<size_t(const uint8_t* buf, size_t len)>;
-
-Status WriteJpeg(const JPEGData& jpg, const JPEGOutput& out);
-
-}  // namespace jpeg
-}  // namespace jxl
-
-#endif  // LIB_JXL_JPEG_DEC_JPEG_DATA_WRITER_H_
diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_output_chunk.h b/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_output_chunk.h
deleted file mode 100644
index 70aa8df949465..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_output_chunk.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_JPEG_DEC_JPEG_OUTPUT_CHUNK_H_
-#define LIB_JXL_JPEG_DEC_JPEG_OUTPUT_CHUNK_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include <initializer_list>
-#include <memory>
-#include <vector>
-
-#include "lib/jxl/base/common.h"
-
-namespace jxl {
-namespace jpeg {
-
-/**
- * A chunk of output data.
- *
- * Data producer creates OutputChunks and adds them to the end output queue.
- * Once control flow leaves the producer code, it is considered that chunk of
- * data is final and can not be changed; to underline this fact |next| is a
- * const-pointer.
- *
- * Data consumer removes OutputChunks from the beginning of the output queue.
- * It is possible to consume OutputChunks partially, by updating |next| and
- * |len|.
- *
- * There are 2 types of output chunks:
- *  - owning: actual data is stored in |buffer| field; producer fills data after
- *    the instance it created; it is legal to reduce |len| to show that not all
- *    the capacity of |buffer| is used
- *  - non-owning: represents the data stored (owned) somewhere else
- */
-struct OutputChunk {
-  // Non-owning
-  template <typename Bytes>
-  explicit OutputChunk(Bytes& bytes) : len(bytes.size()) {
-    // Deal both with const qualifier and data type.
-    const void* src = bytes.data();
-    next = reinterpret_cast<const uint8_t*>(src);
-  }
-
-  // Non-owning
-  OutputChunk(const uint8_t* data, size_t size) : next(data), len(size) {}
-
-  // Owning
-  explicit OutputChunk(size_t size = 0) {
-    buffer = jxl::make_unique<std::vector<uint8_t>>(size);
-    next = buffer->data();
-    len = size;
-  }
-
-  // Owning
-  OutputChunk(std::initializer_list<uint8_t> bytes) {
-    buffer = jxl::make_unique<std::vector<uint8_t>>(bytes);
-    next = buffer->data();
-    len = bytes.size();
-  }
-
-  const uint8_t* next;
-  size_t len;
-  // TODO(veluca): consider removing the unique_ptr.
-  std::unique_ptr<std::vector<uint8_t>> buffer;
-};
-
-}  // namespace jpeg
-}  // namespace jxl
-
-#endif  // LIB_JXL_JPEG_DEC_JPEG_OUTPUT_CHUNK_H_
diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_serialization_state.h b/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_serialization_state.h
deleted file mode 100644
index 9950dc1744759..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/jpeg/dec_jpeg_serialization_state.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_JPEG_DEC_JPEG_SERIALIZATION_STATE_H_
-#define LIB_JXL_JPEG_DEC_JPEG_SERIALIZATION_STATE_H_
-
-#include <algorithm>
-#include <deque>
-#include <vector>
-
-#include "lib/jxl/jpeg/dec_jpeg_output_chunk.h"
-#include "lib/jxl/jpeg/jpeg_data.h"
-
-namespace jxl {
-namespace jpeg {
-
-struct HuffmanCodeTable {
-  int8_t depth[256];
-  uint16_t code[256];
-  bool initialized = false;
-  void InitDepths(int8_t value = 0) {
-    std::fill(std::begin(depth), std::end(depth), value);
-  }
-};
-
-// Handles the packing of bits into output bytes.
-struct JpegBitWriter {
-  bool healthy;
-  std::deque<OutputChunk>* output;
-  OutputChunk chunk;
-  uint8_t* data;
-  size_t pos;
-  uint64_t put_buffer;
-  int put_bits;
-};
-
-// Holds data that is buffered between 8x8 blocks in progressive mode.
-struct DCTCodingState {
-  // The run length of end-of-band symbols in a progressive scan.
-  int eob_run_;
-  // The huffman table to be used when flushing the state.
-  HuffmanCodeTable* cur_ac_huff_;
-  // The sequence of currently buffered refinement bits for a successive
-  // approximation scan (one where Ah > 0).
-  std::vector<uint16_t> refinement_bits_;
-  size_t refinement_bits_count_ = 0;
-};
-
-struct EncodeScanState {
-  enum Stage { HEAD, BODY };
-
-  Stage stage = HEAD;
-
-  int mcu_y;
-  JpegBitWriter bw;
-  coeff_t last_dc_coeff[kMaxComponents] = {0};
-  int restarts_to_go;
-  int next_restart_marker;
-  int block_scan_index;
-  DCTCodingState coding_state;
-  size_t extra_zero_runs_pos;
-  int next_extra_zero_run_index;
-  size_t next_reset_point_pos;
-  int next_reset_point;
-};
-
-struct SerializationState {
-  enum Stage {
-    STAGE_INIT,
-    STAGE_SERIALIZE_SECTION,
-    STAGE_DONE,
-    STAGE_ERROR,
-  };
-
-  Stage stage = STAGE_INIT;
-
-  std::deque<OutputChunk> output_queue;
-
-  size_t section_index = 0;
-  int dht_index = 0;
-  int dqt_index = 0;
-  int app_index = 0;
-  int com_index = 0;
-  int data_index = 0;
-  int scan_index = 0;
-  std::vector<HuffmanCodeTable> dc_huff_table;
-  std::vector<HuffmanCodeTable> ac_huff_table;
-  const uint8_t* pad_bits = nullptr;
-  const uint8_t* pad_bits_end = nullptr;
-  bool seen_dri_marker = false;
-  bool is_progressive = false;
-
-  EncodeScanState scan_state;
-};
-
-}  // namespace jpeg
-}  // namespace jxl
-
-#endif  // LIB_JXL_JPEG_DEC_JPEG_SERIALIZATION_STATE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data.cc b/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data.cc
deleted file mode 100644
index 3aeeb68047ad0..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data.cc
+++ /dev/null
@@ -1,424 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/jpeg/enc_jpeg_data.h"
-
-#include <brotli/encode.h>
-#include <jxl/cms.h>
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-
-#include <cstdint>
-
-#include "lib/jxl/base/sanitizers.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/codec_in_out.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/jpeg/enc_jpeg_data_reader.h"
-#include "lib/jxl/luminance.h"
-
-namespace jxl {
-namespace jpeg {
-
-namespace {
-
-constexpr int BITS_IN_JSAMPLE = 8;
-using ByteSpan = Span<const uint8_t>;
-
-// TODO(eustas): move to jpeg_data, to use from codec_jpg as well.
-// See if there is a canonically chunked ICC profile and mark corresponding
-// app-tags with AppMarkerType::kICC.
-Status DetectIccProfile(JPEGData& jpeg_data) {
-  JXL_ENSURE(jpeg_data.app_data.size() == jpeg_data.app_marker_type.size());
-  size_t num_icc = 0;
-  size_t num_icc_jpeg = 0;
-  for (size_t i = 0; i < jpeg_data.app_data.size(); i++) {
-    const auto& app = jpeg_data.app_data[i];
-    size_t pos = 0;
-    if (app[pos++] != 0xE2) continue;
-    // At least APPn + size; otherwise it should be intermarker-data.
-    JXL_ENSURE(app.size() >= 3);
-    size_t tag_length = (app[pos] << 8) + app[pos + 1];
-    pos += 2;
-    JXL_ENSURE(app.size() == tag_length + 1);
-    // Empty payload is 2 bytes for tag length itself + signature
-    if (tag_length < 2 + sizeof kIccProfileTag) continue;
-
-    if (memcmp(&app[pos], kIccProfileTag, sizeof kIccProfileTag) != 0) continue;
-    pos += sizeof kIccProfileTag;
-    uint8_t chunk_id = app[pos++];
-    uint8_t num_chunks = app[pos++];
-    if (chunk_id != num_icc + 1) continue;
-    if (num_icc_jpeg == 0) num_icc_jpeg = num_chunks;
-    if (num_icc_jpeg != num_chunks) continue;
-    num_icc++;
-    jpeg_data.app_marker_type[i] = AppMarkerType::kICC;
-  }
-  if (num_icc != num_icc_jpeg) {
-    return JXL_FAILURE("Invalid ICC chunks");
-  }
-  return true;
-}
-
-bool GetMarkerPayload(const uint8_t* data, size_t size, ByteSpan* payload) {
-  if (size < 3) {
-    return false;
-  }
-  size_t hi = data[1];
-  size_t lo = data[2];
-  size_t internal_size = (hi << 8u) | lo;
-  // Second byte of marker is not counted towards size.
-  if (internal_size != size - 1) {
-    return false;
-  }
-  // cut second marker byte and "length" from payload.
-  *payload = ByteSpan(data, size);
-  if (!payload->remove_prefix(3)) return false;
-  return true;
-}
-
-Status DetectBlobs(jpeg::JPEGData& jpeg_data) {
-  JXL_ENSURE(jpeg_data.app_data.size() == jpeg_data.app_marker_type.size());
-  bool have_exif = false;
-  bool have_xmp = false;
-  for (size_t i = 0; i < jpeg_data.app_data.size(); i++) {
-    auto& marker = jpeg_data.app_data[i];
-    if (marker.empty() || marker[0] != kApp1) {
-      continue;
-    }
-    ByteSpan payload;
-    if (!GetMarkerPayload(marker.data(), marker.size(), &payload)) {
-      // Something is wrong with this marker; does not care.
-      continue;
-    }
-    if (!have_exif && payload.size() > sizeof kExifTag &&
-        !memcmp(payload.data(), kExifTag, sizeof kExifTag)) {
-      jpeg_data.app_marker_type[i] = AppMarkerType::kExif;
-      have_exif = true;
-    }
-    if (!have_xmp && payload.size() >= sizeof kXMPTag &&
-        !memcmp(payload.data(), kXMPTag, sizeof kXMPTag)) {
-      jpeg_data.app_marker_type[i] = AppMarkerType::kXMP;
-      have_xmp = true;
-    }
-  }
-  return true;
-}
-
-Status ParseChunkedMarker(const jpeg::JPEGData& src, uint8_t marker_type,
-                          const ByteSpan& tag, IccBytes* output,
-                          bool allow_permutations = false) {
-  output->clear();
-
-  std::vector<ByteSpan> chunks;
-  std::vector<bool> presence;
-  size_t expected_number_of_parts = 0;
-  bool is_first_chunk = true;
-  size_t ordinal = 0;
-  for (const auto& marker : src.app_data) {
-    if (marker.empty() || marker[0] != marker_type) {
-      continue;
-    }
-    ByteSpan payload;
-    if (!GetMarkerPayload(marker.data(), marker.size(), &payload)) {
-      // Something is wrong with this marker; does not care.
-      continue;
-    }
-    if ((payload.size() < tag.size()) ||
-        memcmp(payload.data(), tag.data(), tag.size()) != 0) {
-      continue;
-    }
-    JXL_RETURN_IF_ERROR(payload.remove_prefix(tag.size()));
-    if (payload.size() < 2) {
-      return JXL_FAILURE("Chunk is too small.");
-    }
-    uint8_t index = payload[0];
-    uint8_t total = payload[1];
-    ordinal++;
-    if (!allow_permutations) {
-      if (index != ordinal) return JXL_FAILURE("Invalid chunk order.");
-    }
-
-    JXL_RETURN_IF_ERROR(payload.remove_prefix(2));
-
-    JXL_RETURN_IF_ERROR(total != 0);
-    if (is_first_chunk) {
-      is_first_chunk = false;
-      expected_number_of_parts = total;
-      // 1-based indices; 0-th element is added for convenience.
-      chunks.resize(total + 1);
-      presence.resize(total + 1);
-    } else {
-      JXL_RETURN_IF_ERROR(expected_number_of_parts == total);
-    }
-
-    if (index == 0 || index > total) {
-      return JXL_FAILURE("Invalid chunk index.");
-    }
-
-    if (presence[index]) {
-      return JXL_FAILURE("Duplicate chunk.");
-    }
-    presence[index] = true;
-    chunks[index] = payload;
-  }
-
-  for (size_t i = 0; i < expected_number_of_parts; ++i) {
-    // 0-th element is not used.
-    size_t index = i + 1;
-    if (!presence[index]) {
-      return JXL_FAILURE("Missing chunk.");
-    }
-    chunks[index].AppendTo(*output);
-  }
-
-  return true;
-}
-
-Status SetBlobsFromJpegData(const jpeg::JPEGData& jpeg_data, Blobs* blobs) {
-  for (const auto& marker : jpeg_data.app_data) {
-    if (marker.empty() || marker[0] != kApp1) {
-      continue;
-    }
-    ByteSpan payload;
-    if (!GetMarkerPayload(marker.data(), marker.size(), &payload)) {
-      // Something is wrong with this marker; does not care.
-      continue;
-    }
-    if (payload.size() >= sizeof kExifTag &&
-        !memcmp(payload.data(), kExifTag, sizeof kExifTag)) {
-      if (blobs->exif.empty()) {
-        blobs->exif.resize(payload.size() - sizeof kExifTag);
-        memcpy(blobs->exif.data(), payload.data() + sizeof kExifTag,
-               payload.size() - sizeof kExifTag);
-      } else {
-        JXL_WARNING(
-            "ReJPEG: multiple Exif blobs, storing only first one in the JPEG "
-            "XL container\n");
-      }
-    }
-    if (payload.size() >= sizeof kXMPTag &&
-        !memcmp(payload.data(), kXMPTag, sizeof kXMPTag)) {
-      if (blobs->xmp.empty()) {
-        blobs->xmp.resize(payload.size() - sizeof kXMPTag);
-        memcpy(blobs->xmp.data(), payload.data() + sizeof kXMPTag,
-               payload.size() - sizeof kXMPTag);
-      } else {
-        JXL_WARNING(
-            "ReJPEG: multiple XMP blobs, storing only first one in the JPEG "
-            "XL container\n");
-      }
-    }
-  }
-  return true;
-}
-
-inline bool IsJPG(const Span<const uint8_t> bytes) {
-  return bytes.size() >= 2 && bytes[0] == 0xFF && bytes[1] == 0xD8;
-}
-
-}  // namespace
-
-Status SetColorEncodingFromJpegData(const jpeg::JPEGData& jpg,
-                                    ColorEncoding* color_encoding) {
-  IccBytes icc_profile;
-  if (!ParseChunkedMarker(jpg, kApp2, ByteSpan(kIccProfileTag), &icc_profile)) {
-    JXL_WARNING("ReJPEG: corrupted ICC profile\n");
-    icc_profile.clear();
-  }
-
-  if (icc_profile.empty()) {
-    bool is_gray = (jpg.components.size() == 1);
-    *color_encoding = ColorEncoding::SRGB(is_gray);
-  } else {
-    JXL_RETURN_IF_ERROR(
-        color_encoding->SetICC(std::move(icc_profile), JxlGetDefaultCms()));
-  }
-  return true;
-}
-
-Status SetChromaSubsamplingFromJpegData(const JPEGData& jpg,
-                                        YCbCrChromaSubsampling* cs) {
-  size_t nbcomp = jpg.components.size();
-  if (nbcomp != 1 && nbcomp != 3) {
-    return JXL_FAILURE("Cannot recompress JPEGs with neither 1 nor 3 channels");
-  }
-  if (nbcomp == 3) {
-    uint8_t hsample[3];
-    uint8_t vsample[3];
-    for (size_t i = 0; i < nbcomp; i++) {
-      hsample[i] = jpg.components[i].h_samp_factor;
-      vsample[i] = jpg.components[i].v_samp_factor;
-    }
-    JXL_RETURN_IF_ERROR(cs->Set(hsample, vsample));
-  } else if (nbcomp == 1) {
-    uint8_t hsample[3];
-    uint8_t vsample[3];
-    for (size_t i = 0; i < 3; i++) {
-      hsample[i] = jpg.components[0].h_samp_factor;
-      vsample[i] = jpg.components[0].v_samp_factor;
-    }
-    JXL_RETURN_IF_ERROR(cs->Set(hsample, vsample));
-  }
-  return true;
-}
-
-Status SetColorTransformFromJpegData(const JPEGData& jpg,
-                                     ColorTransform* color_transform) {
-  size_t nbcomp = jpg.components.size();
-  if (nbcomp != 1 && nbcomp != 3) {
-    return JXL_FAILURE("Cannot recompress JPEGs with neither 1 nor 3 channels");
-  }
-  bool is_rgb = false;
-  {
-    const auto& markers = jpg.marker_order;
-    // If there is a JFIF marker, this is YCbCr. Otherwise...
-    if (std::find(markers.begin(), markers.end(), 0xE0) == markers.end()) {
-      // Try to find an 'Adobe' marker.
-      size_t app_markers = 0;
-      size_t i = 0;
-      for (; i < markers.size(); i++) {
-        // This is an APP marker.
-        if ((markers[i] & 0xF0) == 0xE0) {
-          JXL_ENSURE(app_markers < jpg.app_data.size());
-          // APP14 marker
-          if (markers[i] == 0xEE) {
-            const auto& data = jpg.app_data[app_markers];
-            if (data.size() == 15 && data[3] == 'A' && data[4] == 'd' &&
-                data[5] == 'o' && data[6] == 'b' && data[7] == 'e') {
-              // 'Adobe' marker.
-              is_rgb = data[14] == 0;
-              break;
-            }
-          }
-          app_markers++;
-        }
-      }
-
-      if (i == markers.size()) {
-        // No 'Adobe' marker, guess from component IDs.
-        is_rgb = nbcomp == 3 && jpg.components[0].id == 'R' &&
-                 jpg.components[1].id == 'G' && jpg.components[2].id == 'B';
-      }
-    }
-  }
-  *color_transform =
-      (!is_rgb || nbcomp == 1) ? ColorTransform::kYCbCr : ColorTransform::kNone;
-  return true;
-}
-
-Status EncodeJPEGData(JxlMemoryManager* memory_manager, JPEGData& jpeg_data,
-                      std::vector<uint8_t>* bytes,
-                      const CompressParams& cparams) {
-  bytes->clear();
-  jpeg_data.app_marker_type.resize(jpeg_data.app_data.size(),
-                                   AppMarkerType::kUnknown);
-  JXL_RETURN_IF_ERROR(DetectIccProfile(jpeg_data));
-  JXL_RETURN_IF_ERROR(DetectBlobs(jpeg_data));
-
-  size_t total_data = 0;
-  for (size_t i = 0; i < jpeg_data.app_data.size(); i++) {
-    if (jpeg_data.app_marker_type[i] != AppMarkerType::kUnknown) {
-      continue;
-    }
-    total_data += jpeg_data.app_data[i].size();
-  }
-  for (const auto& data : jpeg_data.com_data) {
-    total_data += data.size();
-  }
-  for (const auto& data : jpeg_data.inter_marker_data) {
-    total_data += data.size();
-  }
-  total_data += jpeg_data.tail_data.size();
-  size_t brotli_capacity = BrotliEncoderMaxCompressedSize(total_data);
-
-  BitWriter writer{memory_manager};
-  JXL_RETURN_IF_ERROR(
-      Bundle::Write(jpeg_data, &writer, LayerType::Header, nullptr));
-  writer.ZeroPadToByte();
-  {
-    PaddedBytes serialized_jpeg_data = std::move(writer).TakeBytes();
-    bytes->reserve(serialized_jpeg_data.size() + brotli_capacity);
-    Bytes(serialized_jpeg_data).AppendTo(*bytes);
-  }
-
-  BrotliEncoderState* brotli_enc =
-      BrotliEncoderCreateInstance(nullptr, nullptr, nullptr);
-  int effort = cparams.brotli_effort;
-  if (effort < 0) effort = 11 - static_cast<int>(cparams.speed_tier);
-  BrotliEncoderSetParameter(brotli_enc, BROTLI_PARAM_QUALITY, effort);
-  size_t initial_size = bytes->size();
-  BrotliEncoderSetParameter(brotli_enc, BROTLI_PARAM_SIZE_HINT, total_data);
-  bytes->resize(initial_size + brotli_capacity);
-  size_t enc_size = 0;
-  auto br_append = [&](const std::vector<uint8_t>& data, bool last) -> Status {
-    size_t available_in = data.size();
-    const uint8_t* in = data.data();
-    uint8_t* out = &(*bytes)[initial_size + enc_size];
-    do {
-      uint8_t* out_before = out;
-      msan::MemoryIsInitialized(in, available_in);
-      JXL_ENSURE(BrotliEncoderCompressStream(
-          brotli_enc, last ? BROTLI_OPERATION_FINISH : BROTLI_OPERATION_PROCESS,
-          &available_in, &in, &brotli_capacity, &out, &enc_size));
-      msan::UnpoisonMemory(out_before, out - out_before);
-    } while (FROM_JXL_BOOL(BrotliEncoderHasMoreOutput(brotli_enc)) ||
-             available_in > 0);
-    return true;
-  };
-
-  for (size_t i = 0; i < jpeg_data.app_data.size(); i++) {
-    if (jpeg_data.app_marker_type[i] != AppMarkerType::kUnknown) {
-      continue;
-    }
-    JXL_RETURN_IF_ERROR(br_append(jpeg_data.app_data[i], /*last=*/false));
-  }
-  for (const auto& data : jpeg_data.com_data) {
-    JXL_RETURN_IF_ERROR(br_append(data, /*last=*/false));
-  }
-  for (const auto& data : jpeg_data.inter_marker_data) {
-    JXL_RETURN_IF_ERROR(br_append(data, /*last=*/false));
-  }
-  JXL_RETURN_IF_ERROR(br_append(jpeg_data.tail_data, /*last=*/true));
-  BrotliEncoderDestroyInstance(brotli_enc);
-  bytes->resize(initial_size + enc_size);
-  return true;
-}
-
-Status DecodeImageJPG(const Span<const uint8_t> bytes, CodecInOut* io) {
-  if (!IsJPG(bytes)) return false;
-  JxlMemoryManager* memory_manager = io->memory_manager;
-  io->frames.clear();
-  io->frames.reserve(1);
-  io->frames.emplace_back(memory_manager, &io->metadata.m);
-  io->Main().jpeg_data = make_unique<jpeg::JPEGData>();
-  jpeg::JPEGData* jpeg_data = io->Main().jpeg_data.get();
-  if (!jpeg::ReadJpeg(bytes.data(), bytes.size(), jpeg::JpegReadMode::kReadAll,
-                      jpeg_data)) {
-    return JXL_FAILURE("Error reading JPEG");
-  }
-  JXL_RETURN_IF_ERROR(
-      SetColorEncodingFromJpegData(*jpeg_data, &io->metadata.m.color_encoding));
-  JXL_RETURN_IF_ERROR(SetBlobsFromJpegData(*jpeg_data, &io->blobs));
-  JXL_RETURN_IF_ERROR(SetChromaSubsamplingFromJpegData(
-      *jpeg_data, &io->Main().chroma_subsampling));
-  JXL_RETURN_IF_ERROR(
-      SetColorTransformFromJpegData(*jpeg_data, &io->Main().color_transform));
-
-  io->metadata.m.SetIntensityTarget(kDefaultIntensityTarget);
-  io->metadata.m.SetUintSamples(BITS_IN_JSAMPLE);
-  JXL_ASSIGN_OR_RETURN(
-      Image3F tmp,
-      Image3F::Create(memory_manager, jpeg_data->width, jpeg_data->height));
-  JXL_RETURN_IF_ERROR(
-      io->SetFromImage(std::move(tmp), io->metadata.m.color_encoding));
-  SetIntensityTarget(&io->metadata.m);
-  return true;
-}
-
-}  // namespace jpeg
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data.h b/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data.h
deleted file mode 100644
index fe5fe75a019cc..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_JPEG_ENC_JPEG_DATA_H_
-#define LIB_JXL_JPEG_ENC_JPEG_DATA_H_
-
-#include <jxl/memory_manager.h>
-
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/jpeg/jpeg_data.h"
-
-namespace jxl {
-
-class CodecInOut;
-
-namespace jpeg {
-Status EncodeJPEGData(JxlMemoryManager* memory_manager, JPEGData& jpeg_data,
-                      std::vector<uint8_t>* bytes,
-                      const CompressParams& cparams);
-
-Status SetColorEncodingFromJpegData(const jpeg::JPEGData& jpg,
-                                    ColorEncoding* color_encoding);
-Status SetChromaSubsamplingFromJpegData(const JPEGData& jpg,
-                                        YCbCrChromaSubsampling* cs);
-Status SetColorTransformFromJpegData(const JPEGData& jpg,
-                                     ColorTransform* color_transform);
-
-/**
- * Decodes bytes containing JPEG codestream into a CodecInOut as coefficients
- * only, for lossless JPEG transcoding.
- */
-Status DecodeImageJPG(Span<const uint8_t> bytes, CodecInOut* io);
-
-}  // namespace jpeg
-}  // namespace jxl
-
-#endif  // LIB_JXL_JPEG_ENC_JPEG_DATA_H_
diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data_reader.cc b/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data_reader.cc
deleted file mode 100644
index 149bde1cda196..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data_reader.cc
+++ /dev/null
@@ -1,1051 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/jpeg/enc_jpeg_data_reader.h"
-
-#include <inttypes.h>
-#include <string.h>
-
-#include <algorithm>
-#include <string>
-#include <vector>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/jpeg/enc_jpeg_huffman_decode.h"
-#include "lib/jxl/jpeg/jpeg_data.h"
-
-namespace jxl {
-namespace jpeg {
-
-namespace {
-const int kBrunsliMaxSampling = 15;
-
-// Macros for commonly used error conditions.
-
-#define JXL_JPEG_VERIFY_LEN(n)                                \
-  if (*pos + (n) > len) {                                     \
-    return JXL_FAILURE("Unexpected end of input: pos=%" PRIuS \
-                       " need=%d len=%" PRIuS,                \
-                       *pos, static_cast<int>(n), len);       \
-  }
-
-#define JXL_JPEG_VERIFY_INPUT(var, low, high, code)                    \
-  if ((var) < (low) || (var) > (high)) {                               \
-    return JXL_FAILURE("Invalid " #var ": %d", static_cast<int>(var)); \
-  }
-
-#define JXL_JPEG_VERIFY_MARKER_END()                             \
-  if (start_pos + marker_len != *pos) {                          \
-    return JXL_FAILURE("Invalid marker length: declared=%" PRIuS \
-                       " actual=%" PRIuS,                        \
-                       marker_len, (*pos - start_pos));          \
-  }
-
-#define JXL_JPEG_EXPECT_MARKER()                                 \
-  if (pos + 2 > len || data[pos] != 0xff) {                      \
-    return JXL_FAILURE(                                          \
-        "Marker byte (0xff) expected, found: 0x%.2x pos=%" PRIuS \
-        " len=%" PRIuS,                                          \
-        (pos < len ? data[pos] : 0), pos, len);                  \
-  }
-
-inline int ReadUint8(const uint8_t* data, size_t* pos) {
-  return data[(*pos)++];
-}
-
-inline int ReadUint16(const uint8_t* data, size_t* pos) {
-  int v = (data[*pos] << 8) + data[*pos + 1];
-  *pos += 2;
-  return v;
-}
-
-// Reads the Start of Frame (SOF) marker segment and fills in *jpg with the
-// parsed data.
-bool ProcessSOF(const uint8_t* data, const size_t len, JpegReadMode mode,
-                size_t* pos, JPEGData* jpg) {
-  if (jpg->width != 0) {
-    return JXL_FAILURE("Duplicate SOF marker.");
-  }
-  const size_t start_pos = *pos;
-  JXL_JPEG_VERIFY_LEN(8);
-  size_t marker_len = ReadUint16(data, pos);
-  int precision = ReadUint8(data, pos);
-  int height = ReadUint16(data, pos);
-  int width = ReadUint16(data, pos);
-  int num_components = ReadUint8(data, pos);
-  // 'jbrd' is hardcoded for 8bits:
-  JXL_JPEG_VERIFY_INPUT(precision, 8, 8, PRECISION);
-  JXL_JPEG_VERIFY_INPUT(height, 1, kMaxDimPixels, HEIGHT);
-  JXL_JPEG_VERIFY_INPUT(width, 1, kMaxDimPixels, WIDTH);
-  JXL_JPEG_VERIFY_INPUT(num_components, 1, kMaxComponents, NUMCOMP);
-  JXL_JPEG_VERIFY_LEN(3 * num_components);
-  jpg->height = height;
-  jpg->width = width;
-  jpg->components.resize(num_components);
-
-  // Read sampling factors and quant table index for each component.
-  std::vector<bool> ids_seen(256, false);
-  int max_h_samp_factor = 1;
-  int max_v_samp_factor = 1;
-  for (auto& component : jpg->components) {
-    const int id = ReadUint8(data, pos);
-    if (ids_seen[id]) {  // (cf. section B.2.2, syntax of Ci)
-      return JXL_FAILURE("Duplicate ID %d in SOF.", id);
-    }
-    ids_seen[id] = true;
-    component.id = id;
-    int factor = ReadUint8(data, pos);
-    int h_samp_factor = factor >> 4;
-    int v_samp_factor = factor & 0xf;
-    JXL_JPEG_VERIFY_INPUT(h_samp_factor, 1, kBrunsliMaxSampling, SAMP_FACTOR);
-    JXL_JPEG_VERIFY_INPUT(v_samp_factor, 1, kBrunsliMaxSampling, SAMP_FACTOR);
-    component.h_samp_factor = h_samp_factor;
-    component.v_samp_factor = v_samp_factor;
-    component.quant_idx = ReadUint8(data, pos);
-    max_h_samp_factor = std::max(max_h_samp_factor, h_samp_factor);
-    max_v_samp_factor = std::max(max_v_samp_factor, v_samp_factor);
-  }
-
-  // We have checked above that none of the sampling factors are 0, so the max
-  // sampling factors can not be 0.
-  int MCU_rows = DivCeil(jpg->height, max_v_samp_factor * 8);
-  int MCU_cols = DivCeil(jpg->width, max_h_samp_factor * 8);
-  // Compute the block dimensions for each component.
-  for (JPEGComponent& c : jpg->components) {
-    if (max_h_samp_factor % c.h_samp_factor != 0 ||
-        max_v_samp_factor % c.v_samp_factor != 0) {
-      return JXL_FAILURE("Non-integral subsampling ratios.");
-    }
-    c.width_in_blocks = MCU_cols * c.h_samp_factor;
-    c.height_in_blocks = MCU_rows * c.v_samp_factor;
-    const uint64_t num_blocks =
-        static_cast<uint64_t>(c.width_in_blocks) * c.height_in_blocks;
-    if (mode == JpegReadMode::kReadAll) {
-      c.coeffs.resize(num_blocks * kDCTBlockSize);
-    }
-  }
-  JXL_JPEG_VERIFY_MARKER_END();
-  return true;
-}
-
-// Reads the Start of Scan (SOS) marker segment and fills in *scan_info with the
-// parsed data.
-bool ProcessSOS(const uint8_t* data, const size_t len, size_t* pos,
-                JPEGData* jpg) {
-  const size_t start_pos = *pos;
-  JXL_JPEG_VERIFY_LEN(3);
-  size_t marker_len = ReadUint16(data, pos);
-  size_t comps_in_scan = ReadUint8(data, pos);
-  JXL_JPEG_VERIFY_INPUT(comps_in_scan, 1, jpg->components.size(),
-                        COMPS_IN_SCAN);
-
-  JPEGScanInfo scan_info;
-  scan_info.num_components = comps_in_scan;
-  JXL_JPEG_VERIFY_LEN(2 * comps_in_scan);
-  std::vector<bool> ids_seen(256, false);
-  for (size_t i = 0; i < comps_in_scan; ++i) {
-    uint32_t id = ReadUint8(data, pos);
-    if (ids_seen[id]) {  // (cf. section B.2.3, regarding CSj)
-      return JXL_FAILURE("Duplicate ID %d in SOS.", id);
-    }
-    ids_seen[id] = true;
-    bool found_index = false;
-    for (size_t j = 0; j < jpg->components.size(); ++j) {
-      if (jpg->components[j].id == id) {
-        scan_info.components[i].comp_idx = j;
-        found_index = true;
-      }
-    }
-    if (!found_index) {
-      return JXL_FAILURE("SOS marker: Could not find component with id %d", id);
-    }
-    int c = ReadUint8(data, pos);
-    int dc_tbl_idx = c >> 4;
-    int ac_tbl_idx = c & 0xf;
-    JXL_JPEG_VERIFY_INPUT(dc_tbl_idx, 0, 3, HUFFMAN_INDEX);
-    JXL_JPEG_VERIFY_INPUT(ac_tbl_idx, 0, 3, HUFFMAN_INDEX);
-    scan_info.components[i].dc_tbl_idx = dc_tbl_idx;
-    scan_info.components[i].ac_tbl_idx = ac_tbl_idx;
-  }
-  JXL_JPEG_VERIFY_LEN(3);
-  scan_info.Ss = ReadUint8(data, pos);
-  scan_info.Se = ReadUint8(data, pos);
-  JXL_JPEG_VERIFY_INPUT(static_cast<int>(scan_info.Ss), 0, 63, START_OF_SCAN);
-  JXL_JPEG_VERIFY_INPUT(scan_info.Se, scan_info.Ss, 63, END_OF_SCAN);
-  int c = ReadUint8(data, pos);
-  scan_info.Ah = c >> 4;
-  scan_info.Al = c & 0xf;
-  if (scan_info.Ah != 0 && scan_info.Al != scan_info.Ah - 1) {
-    // section G.1.1.1.2 : Successive approximation control only improves
-    // by one bit at a time. But it's not always respected, so we just issue
-    // a warning.
-    JXL_WARNING("Invalid progressive parameters: Al=%d Ah=%d", scan_info.Al,
-                scan_info.Ah);
-  }
-  // Check that all the Huffman tables needed for this scan are defined.
-  for (size_t i = 0; i < comps_in_scan; ++i) {
-    bool found_dc_table = false;
-    bool found_ac_table = false;
-    for (const auto& code : jpg->huffman_code) {
-      uint32_t slot_id = code.slot_id;
-      if (slot_id == scan_info.components[i].dc_tbl_idx) {
-        found_dc_table = true;
-      } else if (slot_id == scan_info.components[i].ac_tbl_idx + 16) {
-        found_ac_table = true;
-      }
-    }
-    if (scan_info.Ss == 0 && !found_dc_table) {
-      return JXL_FAILURE(
-          "SOS marker: Could not find DC Huffman table with index %d",
-          scan_info.components[i].dc_tbl_idx);
-    }
-    if (scan_info.Se > 0 && !found_ac_table) {
-      return JXL_FAILURE(
-          "SOS marker: Could not find AC Huffman table with index %d",
-          scan_info.components[i].ac_tbl_idx);
-    }
-  }
-  jpg->scan_info.push_back(scan_info);
-  JXL_JPEG_VERIFY_MARKER_END();
-  return true;
-}
-
-// Reads the Define Huffman Table (DHT) marker segment and fills in *jpg with
-// the parsed data. Builds the Huffman decoding table in either dc_huff_lut or
-// ac_huff_lut, depending on the type and solt_id of Huffman code being read.
-bool ProcessDHT(const uint8_t* data, const size_t len, JpegReadMode mode,
-                std::vector<HuffmanTableEntry>* dc_huff_lut,
-                std::vector<HuffmanTableEntry>* ac_huff_lut, size_t* pos,
-                JPEGData* jpg) {
-  const size_t start_pos = *pos;
-  JXL_JPEG_VERIFY_LEN(2);
-  size_t marker_len = ReadUint16(data, pos);
-  if (marker_len == 2) {
-    return JXL_FAILURE("DHT marker: no Huffman table found");
-  }
-  while (*pos < start_pos + marker_len) {
-    JXL_JPEG_VERIFY_LEN(1 + kJpegHuffmanMaxBitLength);
-    JPEGHuffmanCode huff;
-    huff.slot_id = ReadUint8(data, pos);
-    int huffman_index = huff.slot_id;
-    bool is_ac_table = ((huff.slot_id & 0x10) != 0);
-    HuffmanTableEntry* huff_lut;
-    if (is_ac_table) {
-      huffman_index -= 0x10;
-      JXL_JPEG_VERIFY_INPUT(huffman_index, 0, 3, HUFFMAN_INDEX);
-      huff_lut = &(*ac_huff_lut)[huffman_index * kJpegHuffmanLutSize];
-    } else {
-      JXL_JPEG_VERIFY_INPUT(huffman_index, 0, 3, HUFFMAN_INDEX);
-      huff_lut = &(*dc_huff_lut)[huffman_index * kJpegHuffmanLutSize];
-    }
-    huff.counts[0] = 0;
-    int total_count = 0;
-    int space = 1 << kJpegHuffmanMaxBitLength;
-    int max_depth = 1;
-    for (size_t i = 1; i <= kJpegHuffmanMaxBitLength; ++i) {
-      int count = ReadUint8(data, pos);
-      if (count != 0) {
-        max_depth = i;
-      }
-      huff.counts[i] = count;
-      total_count += count;
-      space -= count * (1 << (kJpegHuffmanMaxBitLength - i));
-    }
-    if (is_ac_table) {
-      JXL_JPEG_VERIFY_INPUT(total_count, 0, kJpegHuffmanAlphabetSize,
-                            HUFFMAN_CODE);
-    } else {
-      JXL_JPEG_VERIFY_INPUT(total_count, 0, kJpegDCAlphabetSize, HUFFMAN_CODE);
-    }
-    JXL_JPEG_VERIFY_LEN(total_count);
-    std::vector<bool> values_seen(256, false);
-    for (int i = 0; i < total_count; ++i) {
-      int value = ReadUint8(data, pos);
-      if (!is_ac_table) {
-        JXL_JPEG_VERIFY_INPUT(value, 0, kJpegDCAlphabetSize - 1, HUFFMAN_CODE);
-      }
-      if (values_seen[value]) {
-        return JXL_FAILURE("Duplicate Huffman code value %d", value);
-      }
-      values_seen[value] = true;
-      huff.values[i] = value;
-    }
-    // Add an invalid symbol that will have the all 1 code.
-    ++huff.counts[max_depth];
-    huff.values[total_count] = kJpegHuffmanAlphabetSize;
-    space -= (1 << (kJpegHuffmanMaxBitLength - max_depth));
-    if (space < 0) {
-      return JXL_FAILURE("Invalid Huffman code lengths.");
-    } else if (space > 0 && huff_lut[0].value != 0xffff) {
-      // Re-initialize the values to an invalid symbol so that we can recognize
-      // it when reading the bit stream using a Huffman code with space > 0.
-      for (int i = 0; i < kJpegHuffmanLutSize; ++i) {
-        huff_lut[i].bits = 0;
-        huff_lut[i].value = 0xffff;
-      }
-    }
-    huff.is_last = (*pos == start_pos + marker_len);
-    if (mode == JpegReadMode::kReadAll) {
-      BuildJpegHuffmanTable(huff.counts.data(), huff.values.data(), huff_lut);
-    }
-    jpg->huffman_code.push_back(huff);
-  }
-  JXL_JPEG_VERIFY_MARKER_END();
-  return true;
-}
-
-// Reads the Define Quantization Table (DQT) marker segment and fills in *jpg
-// with the parsed data.
-bool ProcessDQT(const uint8_t* data, const size_t len, size_t* pos,
-                JPEGData* jpg) {
-  const size_t start_pos = *pos;
-  JXL_JPEG_VERIFY_LEN(2);
-  size_t marker_len = ReadUint16(data, pos);
-  if (marker_len == 2) {
-    return JXL_FAILURE("DQT marker: no quantization table found");
-  }
-  while (*pos < start_pos + marker_len && jpg->quant.size() < kMaxQuantTables) {
-    JXL_JPEG_VERIFY_LEN(1);
-    int quant_table_index = ReadUint8(data, pos);
-    int quant_table_precision = quant_table_index >> 4;
-    JXL_JPEG_VERIFY_INPUT(quant_table_precision, 0, 1, QUANT_TBL_PRECISION);
-    quant_table_index &= 0xf;
-    JXL_JPEG_VERIFY_INPUT(quant_table_index, 0, 3, QUANT_TBL_INDEX);
-    JXL_JPEG_VERIFY_LEN((quant_table_precision + 1) * kDCTBlockSize);
-    JPEGQuantTable table;
-    table.index = quant_table_index;
-    table.precision = quant_table_precision;
-    for (size_t i = 0; i < kDCTBlockSize; ++i) {
-      int quant_val =
-          quant_table_precision ? ReadUint16(data, pos) : ReadUint8(data, pos);
-      JXL_JPEG_VERIFY_INPUT(quant_val, 1, 65535, QUANT_VAL);
-      table.values[kJPEGNaturalOrder[i]] = quant_val;
-    }
-    table.is_last = (*pos == start_pos + marker_len);
-    jpg->quant.push_back(table);
-  }
-  JXL_JPEG_VERIFY_MARKER_END();
-  return true;
-}
-
-// Reads the DRI marker and saves the restart interval into *jpg.
-bool ProcessDRI(const uint8_t* data, const size_t len, size_t* pos,
-                bool* found_dri, JPEGData* jpg) {
-  if (*found_dri) {
-    return JXL_FAILURE("Duplicate DRI marker.");
-  }
-  *found_dri = true;
-  const size_t start_pos = *pos;
-  JXL_JPEG_VERIFY_LEN(4);
-  size_t marker_len = ReadUint16(data, pos);
-  int restart_interval = ReadUint16(data, pos);
-  jpg->restart_interval = restart_interval;
-  JXL_JPEG_VERIFY_MARKER_END();
-  return true;
-}
-
-// Saves the APP marker segment as a string to *jpg.
-bool ProcessAPP(const uint8_t* data, const size_t len, size_t* pos,
-                JPEGData* jpg) {
-  JXL_JPEG_VERIFY_LEN(2);
-  size_t marker_len = ReadUint16(data, pos);
-  JXL_JPEG_VERIFY_INPUT(marker_len, 2, 65535, MARKER_LEN);
-  JXL_JPEG_VERIFY_LEN(marker_len - 2);
-  JXL_ENSURE(*pos >= 3);
-  // Save the marker type together with the app data.
-  const uint8_t* app_str_start = data + *pos - 3;
-  std::vector<uint8_t> app_str(app_str_start, app_str_start + marker_len + 1);
-  *pos += marker_len - 2;
-  jpg->app_data.push_back(app_str);
-  return true;
-}
-
-// Saves the COM marker segment as a string to *jpg.
-bool ProcessCOM(const uint8_t* data, const size_t len, size_t* pos,
-                JPEGData* jpg) {
-  JXL_JPEG_VERIFY_LEN(2);
-  size_t marker_len = ReadUint16(data, pos);
-  JXL_JPEG_VERIFY_INPUT(marker_len, 2, 65535, MARKER_LEN);
-  JXL_JPEG_VERIFY_LEN(marker_len - 2);
-  const uint8_t* com_str_start = data + *pos - 3;
-  std::vector<uint8_t> com_str(com_str_start, com_str_start + marker_len + 1);
-  *pos += marker_len - 2;
-  jpg->com_data.push_back(com_str);
-  return true;
-}
-
-// Helper structure to read bits from the entropy coded data segment.
-struct BitReaderState {
-  BitReaderState(const uint8_t* data, const size_t len, size_t pos)
-      : data_(data), len_(len) {
-    Reset(pos);
-  }
-
-  void Reset(size_t pos) {
-    pos_ = pos;
-    val_ = 0;
-    bits_left_ = 0;
-    next_marker_pos_ = len_ - 2;
-    FillBitWindow();
-  }
-
-  // Returns the next byte and skips the 0xff/0x00 escape sequences.
-  uint8_t GetNextByte() {
-    if (pos_ >= next_marker_pos_) {
-      ++pos_;
-      return 0;
-    }
-    uint8_t c = data_[pos_++];
-    if (c == 0xff) {
-      uint8_t escape = data_[pos_];
-      if (escape == 0) {
-        ++pos_;
-      } else {
-        // 0xff was followed by a non-zero byte, which means that we found the
-        // start of the next marker segment.
-        next_marker_pos_ = pos_ - 1;
-      }
-    }
-    return c;
-  }
-
-  void FillBitWindow() {
-    if (bits_left_ <= 16) {
-      while (bits_left_ <= 56) {
-        val_ <<= 8;
-        val_ |= static_cast<uint64_t>(GetNextByte());
-        bits_left_ += 8;
-      }
-    }
-  }
-
-  int ReadBits(int nbits) {
-    FillBitWindow();
-    uint64_t val = (val_ >> (bits_left_ - nbits)) & ((1ULL << nbits) - 1);
-    bits_left_ -= nbits;
-    return val;
-  }
-
-  // Sets *pos to the next stream position where parsing should continue.
-  // Enqueue the padding bits seen (0 or 1).
-  // Returns false if there is inconsistent or invalid padding or the stream
-  // ended too early.
-  bool FinishStream(JPEGData* jpg, size_t* pos) {
-    int npadbits = bits_left_ & 7;
-    if (npadbits > 0) {
-      uint64_t padmask = (1ULL << npadbits) - 1;
-      uint64_t padbits = (val_ >> (bits_left_ - npadbits)) & padmask;
-      if (padbits != padmask) {
-        jpg->has_zero_padding_bit = true;
-      }
-      for (int i = npadbits - 1; i >= 0; --i) {
-        jpg->padding_bits.push_back((padbits >> i) & 1);
-      }
-    }
-    // Give back some bytes that we did not use.
-    int unused_bytes_left = bits_left_ >> 3;
-    while (unused_bytes_left-- > 0) {
-      --pos_;
-      // If we give back a 0 byte, we need to check if it was a 0xff/0x00 escape
-      // sequence, and if yes, we need to give back one more byte.
-      if (pos_ < next_marker_pos_ && data_[pos_] == 0 &&
-          data_[pos_ - 1] == 0xff) {
-        --pos_;
-      }
-    }
-    if (pos_ > next_marker_pos_) {
-      // Data ran out before the scan was complete.
-      return JXL_FAILURE("Unexpected end of scan.");
-    }
-    *pos = pos_;
-    return true;
-  }
-
-  const uint8_t* data_;
-  const size_t len_;
-  size_t pos_;
-  uint64_t val_;
-  int bits_left_;
-  size_t next_marker_pos_;
-};
-
-// Returns the next Huffman-coded symbol.
-int ReadSymbol(const HuffmanTableEntry* table, BitReaderState* br) {
-  int nbits;
-  br->FillBitWindow();
-  int val = (br->val_ >> (br->bits_left_ - 8)) & 0xff;
-  table += val;
-  nbits = table->bits - 8;
-  if (nbits > 0) {
-    br->bits_left_ -= 8;
-    table += table->value;
-    val = (br->val_ >> (br->bits_left_ - nbits)) & ((1 << nbits) - 1);
-    table += val;
-  }
-  br->bits_left_ -= table->bits;
-  return table->value;
-}
-
-/**
- * Returns the DC diff or AC value for extra bits value x and prefix code s.
- *
- * CCITT Rec. T.81 (1992 E)
- * Table F.1 – Difference magnitude categories for DC coding
- *  SSSS | DIFF values
- * ------+--------------------------
- *     0 | 0
- *     1 | –1, 1
- *     2 | –3, –2, 2, 3
- *     3 | –7..–4, 4..7
- * ......|..........................
- *    11 | –2047..–1024, 1024..2047
- *
- * CCITT Rec. T.81 (1992 E)
- * Table F.2 – Categories assigned to coefficient values
- * [ Same as Table F.1, but does not include SSSS equal to 0 and 11]
- *
- *
- * CCITT Rec. T.81 (1992 E)
- * F.1.2.1.1 Structure of DC code table
- * For each category,... additional bits... appended... to uniquely identify
- * which difference... occurred... When DIFF is positive... SSSS... bits of DIFF
- * are appended. When DIFF is negative... SSSS... bits of (DIFF – 1) are
- * appended... Most significant bit... is 0 for negative differences and 1 for
- * positive differences.
- *
- * In other words the upper half of extra bits range represents DIFF as is.
- * The lower half represents the negative DIFFs with an offset.
- */
-int HuffExtend(int x, int s) {
-  JXL_DASSERT(s >= 1);
-  int half = 1 << (s - 1);
-  if (x >= half) {
-    JXL_DASSERT(x < (1 << s));
-    return x;
-  } else {
-    return x - (1 << s) + 1;
-  }
-}
-
-// Decodes one 8x8 block of DCT coefficients from the bit stream.
-bool DecodeDCTBlock(const HuffmanTableEntry* dc_huff,
-                    const HuffmanTableEntry* ac_huff, int Ss, int Se, int Al,
-                    int* eobrun, bool* reset_state, int* num_zero_runs,
-                    BitReaderState* br, JPEGData* jpg, coeff_t* last_dc_coeff,
-                    coeff_t* coeffs) {
-  // Nowadays multiplication is even faster than variable shift.
-  int Am = 1 << Al;
-  bool eobrun_allowed = Ss > 0;
-  if (Ss == 0) {
-    int s = ReadSymbol(dc_huff, br);
-    if (s >= kJpegDCAlphabetSize) {
-      return JXL_FAILURE("Invalid Huffman symbol %d  for DC coefficient.", s);
-    }
-    int diff = 0;
-    if (s > 0) {
-      int bits = br->ReadBits(s);
-      diff = HuffExtend(bits, s);
-    }
-    int coeff = diff + *last_dc_coeff;
-    const int dc_coeff = coeff * Am;
-    coeffs[0] = dc_coeff;
-    // TODO(eustas): is there a more elegant / explicit way to check this?
-    if (dc_coeff != coeffs[0]) {
-      return JXL_FAILURE("Invalid DC coefficient %d", dc_coeff);
-    }
-    *last_dc_coeff = coeff;
-    ++Ss;
-  }
-  if (Ss > Se) {
-    return true;
-  }
-  if (*eobrun > 0) {
-    --(*eobrun);
-    return true;
-  }
-  *num_zero_runs = 0;
-  for (int k = Ss; k <= Se; k++) {
-    int sr = ReadSymbol(ac_huff, br);
-    if (sr >= kJpegHuffmanAlphabetSize) {
-      return JXL_FAILURE("Invalid Huffman symbol %d for AC coefficient %d", sr,
-                         k);
-    }
-    int r = sr >> 4;
-    int s = sr & 15;
-    if (s > 0) {
-      k += r;
-      if (k > Se) {
-        return JXL_FAILURE("Out-of-band coefficient %d band was %d-%d", k, Ss,
-                           Se);
-      }
-      if (s + Al >= kJpegDCAlphabetSize) {
-        return JXL_FAILURE(
-            "Out of range AC coefficient value: s = %d Al = %d k = %d", s, Al,
-            k);
-      }
-      int bits = br->ReadBits(s);
-      int coeff = HuffExtend(bits, s);
-      coeffs[kJPEGNaturalOrder[k]] = coeff * Am;
-      *num_zero_runs = 0;
-    } else if (r == 15) {
-      k += 15;
-      ++(*num_zero_runs);
-    } else {
-      if (eobrun_allowed && k == Ss && *eobrun == 0) {
-        // We have two end-of-block runs right after each other, so we signal
-        // the jpeg encoder to force a state reset at this point.
-        *reset_state = true;
-      }
-      *eobrun = 1 << r;
-      if (r > 0) {
-        if (!eobrun_allowed) {
-          return JXL_FAILURE("End-of-block run crossing DC coeff.");
-        }
-        *eobrun += br->ReadBits(r);
-      }
-      break;
-    }
-  }
-  --(*eobrun);
-  return true;
-}
-
-bool RefineDCTBlock(const HuffmanTableEntry* ac_huff, int Ss, int Se, int Al,
-                    int* eobrun, bool* reset_state, BitReaderState* br,
-                    JPEGData* jpg, coeff_t* coeffs) {
-  // Nowadays multiplication is even faster than variable shift.
-  int Am = 1 << Al;
-  bool eobrun_allowed = Ss > 0;
-  if (Ss == 0) {
-    int s = br->ReadBits(1);
-    coeff_t dc_coeff = coeffs[0];
-    dc_coeff |= s * Am;
-    coeffs[0] = dc_coeff;
-    ++Ss;
-  }
-  if (Ss > Se) {
-    return true;
-  }
-  int p1 = Am;
-  int m1 = -Am;
-  int k = Ss;
-  int r;
-  int s;
-  bool in_zero_run = false;
-  if (*eobrun <= 0) {
-    for (; k <= Se; k++) {
-      s = ReadSymbol(ac_huff, br);
-      if (s >= kJpegHuffmanAlphabetSize) {
-        return JXL_FAILURE("Invalid Huffman symbol %d for AC coefficient %d", s,
-                           k);
-      }
-      r = s >> 4;
-      s &= 15;
-      if (s) {
-        if (s != 1) {
-          return JXL_FAILURE("Invalid Huffman symbol %d for AC coefficient %d",
-                             s, k);
-        }
-        s = br->ReadBits(1) ? p1 : m1;
-        in_zero_run = false;
-      } else {
-        if (r != 15) {
-          if (eobrun_allowed && k == Ss && *eobrun == 0) {
-            // We have two end-of-block runs right after each other, so we
-            // signal the jpeg encoder to force a state reset at this point.
-            *reset_state = true;
-          }
-          *eobrun = 1 << r;
-          if (r > 0) {
-            if (!eobrun_allowed) {
-              return JXL_FAILURE("End-of-block run crossing DC coeff.");
-            }
-            *eobrun += br->ReadBits(r);
-          }
-          break;
-        }
-        in_zero_run = true;
-      }
-      do {
-        coeff_t thiscoef = coeffs[kJPEGNaturalOrder[k]];
-        if (thiscoef != 0) {
-          if (br->ReadBits(1)) {
-            if ((thiscoef & p1) == 0) {
-              if (thiscoef >= 0) {
-                thiscoef += p1;
-              } else {
-                thiscoef += m1;
-              }
-            }
-          }
-          coeffs[kJPEGNaturalOrder[k]] = thiscoef;
-        } else {
-          if (--r < 0) {
-            break;
-          }
-        }
-        k++;
-      } while (k <= Se);
-      if (s) {
-        if (k > Se) {
-          return JXL_FAILURE("Out-of-band coefficient %d band was %d-%d", k, Ss,
-                             Se);
-        }
-        coeffs[kJPEGNaturalOrder[k]] = s;
-      }
-    }
-  }
-  if (in_zero_run) {
-    return JXL_FAILURE("Extra zero run before end-of-block.");
-  }
-  if (*eobrun > 0) {
-    for (; k <= Se; k++) {
-      coeff_t thiscoef = coeffs[kJPEGNaturalOrder[k]];
-      if (thiscoef != 0) {
-        if (br->ReadBits(1)) {
-          if ((thiscoef & p1) == 0) {
-            if (thiscoef >= 0) {
-              thiscoef += p1;
-            } else {
-              thiscoef += m1;
-            }
-          }
-        }
-        coeffs[kJPEGNaturalOrder[k]] = thiscoef;
-      }
-    }
-  }
-  --(*eobrun);
-  return true;
-}
-
-bool ProcessRestart(const uint8_t* data, const size_t len,
-                    int* next_restart_marker, BitReaderState* br,
-                    JPEGData* jpg) {
-  size_t pos = 0;
-  if (!br->FinishStream(jpg, &pos)) {
-    return JXL_FAILURE("Invalid scan");
-  }
-  int expected_marker = 0xd0 + *next_restart_marker;
-  JXL_JPEG_EXPECT_MARKER();
-  int marker = data[pos + 1];
-  if (marker != expected_marker) {
-    return JXL_FAILURE("Did not find expected restart marker %d actual %d",
-                       expected_marker, marker);
-  }
-  br->Reset(pos + 2);
-  *next_restart_marker += 1;
-  *next_restart_marker &= 0x7;
-  return true;
-}
-
-bool ProcessScan(const uint8_t* data, const size_t len,
-                 const std::vector<HuffmanTableEntry>& dc_huff_lut,
-                 const std::vector<HuffmanTableEntry>& ac_huff_lut,
-                 uint16_t scan_progression[kMaxComponents][kDCTBlockSize],
-                 bool is_progressive, size_t* pos, JPEGData* jpg) {
-  if (!ProcessSOS(data, len, pos, jpg)) {
-    return false;
-  }
-  JPEGScanInfo* scan_info = &jpg->scan_info.back();
-  bool is_interleaved = (scan_info->num_components > 1);
-  int max_h_samp_factor = 1;
-  int max_v_samp_factor = 1;
-  for (const auto& component : jpg->components) {
-    max_h_samp_factor = std::max(max_h_samp_factor, component.h_samp_factor);
-    max_v_samp_factor = std::max(max_v_samp_factor, component.v_samp_factor);
-  }
-
-  int MCU_rows = DivCeil(jpg->height, max_v_samp_factor * 8);
-  int MCUs_per_row = DivCeil(jpg->width, max_h_samp_factor * 8);
-  if (!is_interleaved) {
-    const JPEGComponent& c = jpg->components[scan_info->components[0].comp_idx];
-    MCUs_per_row = DivCeil(jpg->width * c.h_samp_factor, 8 * max_h_samp_factor);
-    MCU_rows = DivCeil(jpg->height * c.v_samp_factor, 8 * max_v_samp_factor);
-  }
-  coeff_t last_dc_coeff[kMaxComponents] = {0};
-  BitReaderState br(data, len, *pos);
-  int restarts_to_go = jpg->restart_interval;
-  int next_restart_marker = 0;
-  int eobrun = -1;
-  int block_scan_index = 0;
-  const int Al = is_progressive ? scan_info->Al : 0;
-  const int Ah = is_progressive ? scan_info->Ah : 0;
-  const int Ss = is_progressive ? scan_info->Ss : 0;
-  const int Se = is_progressive ? scan_info->Se : 63;
-  const uint16_t scan_bitmask = Ah == 0 ? (0xffff << Al) : (1u << Al);
-  const uint16_t refinement_bitmask = (1 << Al) - 1;
-  for (size_t i = 0; i < scan_info->num_components; ++i) {
-    int comp_idx = scan_info->components[i].comp_idx;
-    for (int k = Ss; k <= Se; ++k) {
-      if (scan_progression[comp_idx][k] & scan_bitmask) {
-        return JXL_FAILURE(
-            "Overlapping scans: component=%d k=%d prev_mask: %u cur_mask %u",
-            comp_idx, k, scan_progression[i][k], scan_bitmask);
-      }
-      if (scan_progression[comp_idx][k] & refinement_bitmask) {
-        return JXL_FAILURE(
-            "Invalid scan order, a more refined scan was already done: "
-            "component=%d k=%d prev_mask=%u cur_mask=%u",
-            comp_idx, k, scan_progression[i][k], scan_bitmask);
-      }
-      scan_progression[comp_idx][k] |= scan_bitmask;
-    }
-  }
-  if (Al > 10) {
-    return JXL_FAILURE("Scan parameter Al=%d is not supported.", Al);
-  }
-  for (int mcu_y = 0; mcu_y < MCU_rows; ++mcu_y) {
-    for (int mcu_x = 0; mcu_x < MCUs_per_row; ++mcu_x) {
-      // Handle the restart intervals.
-      if (jpg->restart_interval > 0) {
-        if (restarts_to_go == 0) {
-          if (ProcessRestart(data, len, &next_restart_marker, &br, jpg)) {
-            restarts_to_go = jpg->restart_interval;
-            memset(static_cast<void*>(last_dc_coeff), 0, sizeof(last_dc_coeff));
-            if (eobrun > 0) {
-              return JXL_FAILURE("End-of-block run too long.");
-            }
-            eobrun = -1;  // fresh start
-          } else {
-            return JXL_FAILURE("Could not process restart.");
-          }
-        }
-        --restarts_to_go;
-      }
-      // Decode one MCU.
-      for (size_t i = 0; i < scan_info->num_components; ++i) {
-        JPEGComponentScanInfo* si = &scan_info->components[i];
-        JPEGComponent* c = &jpg->components[si->comp_idx];
-        const HuffmanTableEntry* dc_lut =
-            &dc_huff_lut[si->dc_tbl_idx * kJpegHuffmanLutSize];
-        const HuffmanTableEntry* ac_lut =
-            &ac_huff_lut[si->ac_tbl_idx * kJpegHuffmanLutSize];
-        int nblocks_y = is_interleaved ? c->v_samp_factor : 1;
-        int nblocks_x = is_interleaved ? c->h_samp_factor : 1;
-        for (int iy = 0; iy < nblocks_y; ++iy) {
-          for (int ix = 0; ix < nblocks_x; ++ix) {
-            int block_y = mcu_y * nblocks_y + iy;
-            int block_x = mcu_x * nblocks_x + ix;
-            int block_idx = block_y * c->width_in_blocks + block_x;
-            bool reset_state = false;
-            int num_zero_runs = 0;
-            coeff_t* coeffs = &c->coeffs[block_idx * kDCTBlockSize];
-            if (Ah == 0) {
-              if (!DecodeDCTBlock(dc_lut, ac_lut, Ss, Se, Al, &eobrun,
-                                  &reset_state, &num_zero_runs, &br, jpg,
-                                  &last_dc_coeff[si->comp_idx], coeffs)) {
-                return false;
-              }
-            } else {
-              if (!RefineDCTBlock(ac_lut, Ss, Se, Al, &eobrun, &reset_state,
-                                  &br, jpg, coeffs)) {
-                return false;
-              }
-            }
-            if (reset_state) {
-              scan_info->reset_points.emplace_back(block_scan_index);
-            }
-            if (num_zero_runs > 0) {
-              JPEGScanInfo::ExtraZeroRunInfo info;
-              info.block_idx = block_scan_index;
-              info.num_extra_zero_runs = num_zero_runs;
-              scan_info->extra_zero_runs.push_back(info);
-            }
-            ++block_scan_index;
-          }
-        }
-      }
-    }
-  }
-  if (eobrun > 0) {
-    return JXL_FAILURE("End-of-block run too long.");
-  }
-  if (!br.FinishStream(jpg, pos)) {
-    return JXL_FAILURE("Invalid scan.");
-  }
-  if (*pos > len) {
-    return JXL_FAILURE("Unexpected end of file during scan. pos=%" PRIuS
-                       " len=%" PRIuS,
-                       *pos, len);
-  }
-  return true;
-}
-
-// Changes the quant_idx field of the components to refer to the index of the
-// quant table in the jpg->quant array.
-bool FixupIndexes(JPEGData* jpg) {
-  for (size_t i = 0; i < jpg->components.size(); ++i) {
-    JPEGComponent* c = &jpg->components[i];
-    bool found_index = false;
-    for (size_t j = 0; j < jpg->quant.size(); ++j) {
-      if (jpg->quant[j].index == c->quant_idx) {
-        c->quant_idx = j;
-        found_index = true;
-        break;
-      }
-    }
-    if (!found_index) {
-      return JXL_FAILURE("Quantization table with index %u not found",
-                         c->quant_idx);
-    }
-  }
-  return true;
-}
-
-size_t FindNextMarker(const uint8_t* data, const size_t len, size_t pos) {
-  // kIsValidMarker[i] == 1 means (0xc0 + i) is a valid marker.
-  static const uint8_t kIsValidMarker[] = {
-      1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1,
-      1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-      1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
-  };
-  size_t num_skipped = 0;
-  while (pos + 1 < len && (data[pos] != 0xff || data[pos + 1] < 0xc0 ||
-                           !kIsValidMarker[data[pos + 1] - 0xc0])) {
-    ++pos;
-    ++num_skipped;
-  }
-  return num_skipped;
-}
-
-}  // namespace
-
-bool ReadJpeg(const uint8_t* data, const size_t len, JpegReadMode mode,
-              JPEGData* jpg) {
-  size_t pos = 0;
-  // Check SOI marker.
-  JXL_JPEG_EXPECT_MARKER();
-  int marker = data[pos + 1];
-  pos += 2;
-  if (marker != 0xd8) {
-    return JXL_FAILURE("Did not find expected SOI marker, actual=%d", marker);
-  }
-  int lut_size = kMaxHuffmanTables * kJpegHuffmanLutSize;
-  std::vector<HuffmanTableEntry> dc_huff_lut(lut_size);
-  std::vector<HuffmanTableEntry> ac_huff_lut(lut_size);
-  bool found_sof = false;
-  bool found_dri = false;
-  uint16_t scan_progression[kMaxComponents][kDCTBlockSize] = {{0}};
-
-  jpg->padding_bits.resize(0);
-  bool is_progressive = false;  // default
-  do {
-    // Read next marker.
-    size_t num_skipped = FindNextMarker(data, len, pos);
-    if (num_skipped > 0) {
-      // Add a fake marker to indicate arbitrary in-between-markers data.
-      jpg->marker_order.push_back(0xff);
-      jpg->inter_marker_data.emplace_back(data + pos, data + pos + num_skipped);
-      pos += num_skipped;
-    }
-    JXL_JPEG_EXPECT_MARKER();
-    marker = data[pos + 1];
-    pos += 2;
-    bool ok = true;
-    switch (marker) {
-      case 0xc0:
-      case 0xc1:
-      case 0xc2:
-        is_progressive = (marker == 0xc2);
-        ok = ProcessSOF(data, len, mode, &pos, jpg);
-        found_sof = true;
-        break;
-      case 0xc4:
-        ok = ProcessDHT(data, len, mode, &dc_huff_lut, &ac_huff_lut, &pos, jpg);
-        break;
-      case 0xd0:
-      case 0xd1:
-      case 0xd2:
-      case 0xd3:
-      case 0xd4:
-      case 0xd5:
-      case 0xd6:
-      case 0xd7:
-        // RST markers do not have any data.
-        break;
-      case 0xd9:
-        // Found end marker.
-        break;
-      case 0xda:
-        if (mode == JpegReadMode::kReadAll) {
-          ok = ProcessScan(data, len, dc_huff_lut, ac_huff_lut,
-                           scan_progression, is_progressive, &pos, jpg);
-        }
-        break;
-      case 0xdb:
-        ok = ProcessDQT(data, len, &pos, jpg);
-        break;
-      case 0xdd:
-        ok = ProcessDRI(data, len, &pos, &found_dri, jpg);
-        break;
-      case 0xe0:
-      case 0xe1:
-      case 0xe2:
-      case 0xe3:
-      case 0xe4:
-      case 0xe5:
-      case 0xe6:
-      case 0xe7:
-      case 0xe8:
-      case 0xe9:
-      case 0xea:
-      case 0xeb:
-      case 0xec:
-      case 0xed:
-      case 0xee:
-      case 0xef:
-        if (mode != JpegReadMode::kReadTables) {
-          ok = ProcessAPP(data, len, &pos, jpg);
-        }
-        break;
-      case 0xfe:
-        if (mode != JpegReadMode::kReadTables) {
-          ok = ProcessCOM(data, len, &pos, jpg);
-        }
-        break;
-      default:
-        return JXL_FAILURE("Unsupported marker: %d pos=%" PRIuS " len=%" PRIuS,
-                           marker, pos, len);
-    }
-    if (!ok) {
-      return false;
-    }
-    jpg->marker_order.push_back(marker);
-    if (mode == JpegReadMode::kReadHeader && found_sof) {
-      break;
-    }
-  } while (marker != 0xd9);
-
-  if (!found_sof) {
-    return JXL_FAILURE("Missing SOF marker.");
-  }
-
-  // Supplemental checks.
-  if (mode == JpegReadMode::kReadAll) {
-    if (pos < len) {
-      jpg->tail_data = std::vector<uint8_t>(data + pos, data + len);
-    }
-    if (!FixupIndexes(jpg)) {
-      return false;
-    }
-    if (jpg->huffman_code.empty()) {
-      // Section B.2.4.2: "If a table has never been defined for a particular
-      // destination, then when this destination is specified in a scan header,
-      // the results are unpredictable."
-      return JXL_FAILURE("Need at least one Huffman code table.");
-    }
-    if (jpg->huffman_code.size() >= kMaxDHTMarkers) {
-      return JXL_FAILURE("Too many Huffman tables.");
-    }
-  }
-  return true;
-}
-
-}  // namespace jpeg
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data_reader.h b/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data_reader.h
deleted file mode 100644
index 4389b2ffe3bfe..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_data_reader.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Functions for reading a jpeg byte stream into a JPEGData object.
-
-#ifndef LIB_JXL_JPEG_ENC_JPEG_DATA_READER_H_
-#define LIB_JXL_JPEG_ENC_JPEG_DATA_READER_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "lib/jxl/jpeg/jpeg_data.h"
-
-namespace jxl {
-namespace jpeg {
-
-enum class JpegReadMode {
-  kReadHeader,  // only basic headers
-  kReadTables,  // headers and tables (quant, Huffman, ...)
-  kReadAll,     // everything
-};
-
-// Parses the JPEG stream contained in data[*pos ... len) and fills in *jpg with
-// the parsed information.
-// If mode is kReadHeader, it fills in only the image dimensions in *jpg.
-// Returns false if the data is not valid JPEG, or if it contains an unsupported
-// JPEG feature.
-bool ReadJpeg(const uint8_t* data, size_t len, JpegReadMode mode,
-              JPEGData* jpg);
-
-}  // namespace jpeg
-}  // namespace jxl
-
-#endif  // LIB_JXL_JPEG_ENC_JPEG_DATA_READER_H_
diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_huffman_decode.cc b/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_huffman_decode.cc
deleted file mode 100644
index 38282e640a6d0..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_huffman_decode.cc
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/jpeg/enc_jpeg_huffman_decode.h"
-
-#include "lib/jxl/jpeg/jpeg_data.h"
-
-namespace jxl {
-namespace jpeg {
-
-// Returns the table width of the next 2nd level table, count is the histogram
-// of bit lengths for the remaining symbols, len is the code length of the next
-// processed symbol.
-static inline int NextTableBitSize(const int* count, int len) {
-  int left = 1 << (len - kJpegHuffmanRootTableBits);
-  while (len < static_cast<int>(kJpegHuffmanMaxBitLength)) {
-    left -= count[len];
-    if (left <= 0) break;
-    ++len;
-    left <<= 1;
-  }
-  return len - kJpegHuffmanRootTableBits;
-}
-
-void BuildJpegHuffmanTable(const uint32_t* count, const uint32_t* symbols,
-                           HuffmanTableEntry* lut) {
-  HuffmanTableEntry code;    // current table entry
-  HuffmanTableEntry* table;  // next available space in table
-  int len;                   // current code length
-  int idx;                   // symbol index
-  int key;                   // prefix code
-  int reps;                  // number of replicate key values in current table
-  int low;                   // low bits for current root entry
-  int table_bits;            // key length of current table
-  int table_size;            // size of current table
-
-  // Make a local copy of the input bit length histogram.
-  int tmp_count[kJpegHuffmanMaxBitLength + 1] = {0};
-  int total_count = 0;
-  for (len = 1; len <= static_cast<int>(kJpegHuffmanMaxBitLength); ++len) {
-    tmp_count[len] = count[len];
-    total_count += tmp_count[len];
-  }
-
-  table = lut;
-  table_bits = kJpegHuffmanRootTableBits;
-  table_size = 1 << table_bits;
-
-  // Special case code with only one value.
-  if (total_count == 1) {
-    code.bits = 0;
-    code.value = symbols[0];
-    for (key = 0; key < table_size; ++key) {
-      table[key] = code;
-    }
-    return;
-  }
-
-  // Fill in root table.
-  key = 0;
-  idx = 0;
-  for (len = 1; len <= kJpegHuffmanRootTableBits; ++len) {
-    for (; tmp_count[len] > 0; --tmp_count[len]) {
-      code.bits = len;
-      code.value = symbols[idx++];
-      reps = 1 << (kJpegHuffmanRootTableBits - len);
-      while (reps--) {
-        table[key++] = code;
-      }
-    }
-  }
-
-  // Fill in 2nd level tables and add pointers to root table.
-  table += table_size;
-  table_size = 0;
-  low = 0;
-  for (len = kJpegHuffmanRootTableBits + 1;
-       len <= static_cast<int>(kJpegHuffmanMaxBitLength); ++len) {
-    for (; tmp_count[len] > 0; --tmp_count[len]) {
-      // Start a new sub-table if the previous one is full.
-      if (low >= table_size) {
-        table += table_size;
-        table_bits = NextTableBitSize(tmp_count, len);
-        table_size = 1 << table_bits;
-        low = 0;
-        lut[key].bits = table_bits + kJpegHuffmanRootTableBits;
-        lut[key].value = (table - lut) - key;
-        ++key;
-      }
-      code.bits = len - kJpegHuffmanRootTableBits;
-      code.value = symbols[idx++];
-      reps = 1 << (table_bits - code.bits);
-      while (reps--) {
-        table[low++] = code;
-      }
-    }
-  }
-}
-
-}  // namespace jpeg
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_huffman_decode.h b/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_huffman_decode.h
deleted file mode 100644
index fc9bd17baa0b8..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/jpeg/enc_jpeg_huffman_decode.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Utility function for building a Huffman lookup table for the jpeg decoder.
-
-#ifndef LIB_JXL_JPEG_ENC_JPEG_HUFFMAN_DECODE_H_
-#define LIB_JXL_JPEG_ENC_JPEG_HUFFMAN_DECODE_H_
-
-#include <stdint.h>
-
-namespace jxl {
-namespace jpeg {
-
-constexpr int kJpegHuffmanRootTableBits = 8;
-// Maximum huffman lookup table size.
-// Requirements: alphabet of 257 symbols (256 + 1 special symbol for the all 1s
-// code) and max bit length 16, the root table has 8 bits.
-// zlib/examples/enough.c works with an assumption that Huffman code is
-// "complete". Input JPEGs might have this assumption broken, hence the
-// following sum is used as estimate:
-//  + number of 1-st level cells
-//  + number of symbols
-//  + asymptotic amount of repeated 2nd level cells
-// The third number is 1 + 3 + ... + 255 i.e. it is assumed that sub-table of
-// each "size" might be almost completely be filled with repetitions.
-// Total sum is slightly less than 1024,...
-constexpr int kJpegHuffmanLutSize = 1024;
-
-struct HuffmanTableEntry {
-  // Initialize the value to an invalid symbol so that we can recognize it
-  // when reading the bit stream using a Huffman code with space > 0.
-  HuffmanTableEntry() : bits(0), value(0xffff) {}
-
-  uint8_t bits;    // number of bits used for this symbol
-  uint16_t value;  // symbol value or table offset
-};
-
-// Builds jpeg-style Huffman lookup table from the given symbols.
-// The symbols are in order of increasing bit lengths. The number of symbols
-// with bit length n is given in counts[n] for each n >= 1.
-void BuildJpegHuffmanTable(const uint32_t* counts, const uint32_t* symbols,
-                           HuffmanTableEntry* lut);
-
-}  // namespace jpeg
-}  // namespace jxl
-
-#endif  // LIB_JXL_JPEG_ENC_JPEG_HUFFMAN_DECODE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/jpeg_data.cc b/third_party/jpeg-xl/lib/jxl/jpeg/jpeg_data.cc
deleted file mode 100644
index f3144dd6c2da0..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/jpeg/jpeg_data.cc
+++ /dev/null
@@ -1,483 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/jpeg/jpeg_data.h"
-
-#include <jxl/types.h>
-
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/common.h"  // kMaxNumPasses, JPEGXL_ENABLE_TRANSCODE_JPEG
-
-namespace jxl {
-namespace jpeg {
-
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-
-namespace {
-enum JPEGComponentType : uint32_t {
-  kGray = 0,
-  kYCbCr = 1,
-  kRGB = 2,
-  kCustom = 3,
-};
-
-struct JPEGInfo {
-  size_t num_app_markers = 0;
-  size_t num_com_markers = 0;
-  size_t num_scans = 0;
-  size_t num_intermarker = 0;
-  bool has_dri = false;
-};
-
-Status VisitMarker(uint8_t* marker, Visitor* visitor, JPEGInfo* info) {
-  uint32_t marker32 = *marker - 0xc0;
-  JXL_RETURN_IF_ERROR(visitor->Bits(6, 0x00, &marker32));
-  *marker = marker32 + 0xc0;
-  if ((*marker & 0xf0) == 0xe0) {
-    info->num_app_markers++;
-  }
-  if (*marker == 0xfe) {
-    info->num_com_markers++;
-  }
-  if (*marker == 0xda) {
-    info->num_scans++;
-  }
-  // We use a fake 0xff marker to signal intermarker data.
-  if (*marker == 0xff) {
-    info->num_intermarker++;
-  }
-  if (*marker == 0xdd) {
-    info->has_dri = true;
-  }
-  return true;
-}
-
-}  // namespace
-
-Status JPEGData::VisitFields(Visitor* visitor) {
-  bool is_gray = components.size() == 1;
-  JXL_RETURN_IF_ERROR(visitor->Bool(false, &is_gray));
-  if (visitor->IsReading()) {
-    components.resize(is_gray ? 1 : 3);
-  }
-  JPEGInfo info;
-  if (visitor->IsReading()) {
-    uint8_t marker = 0xc0;
-    do {
-      JXL_RETURN_IF_ERROR(VisitMarker(&marker, visitor, &info));
-      marker_order.push_back(marker);
-      if (marker_order.size() > 16384) {
-        return JXL_FAILURE("Too many markers: %" PRIuS "\n",
-                           marker_order.size());
-      }
-    } while (marker != 0xd9);
-  } else {
-    if (marker_order.size() > 16384) {
-      return JXL_FAILURE("Too many markers: %" PRIuS "\n", marker_order.size());
-    }
-    for (uint8_t& marker : marker_order) {
-      JXL_RETURN_IF_ERROR(VisitMarker(&marker, visitor, &info));
-    }
-    if (!marker_order.empty()) {
-      // Last marker should always be EOI marker.
-      JXL_ENSURE(marker_order.back() == 0xd9);
-    }
-  }
-
-  // Size of the APP and COM markers.
-  if (visitor->IsReading()) {
-    app_data.resize(info.num_app_markers);
-    app_marker_type.resize(info.num_app_markers);
-    com_data.resize(info.num_com_markers);
-    scan_info.resize(info.num_scans);
-  }
-  JXL_ENSURE(app_data.size() == info.num_app_markers);
-  JXL_ENSURE(app_marker_type.size() == info.num_app_markers);
-  JXL_ENSURE(com_data.size() == info.num_com_markers);
-  JXL_ENSURE(scan_info.size() == info.num_scans);
-  for (size_t i = 0; i < app_data.size(); i++) {
-    auto& app = app_data[i];
-    // Encodes up to 8 different values.
-    JXL_RETURN_IF_ERROR(
-        visitor->U32(Val(0), Val(1), BitsOffset(1, 2), BitsOffset(2, 4), 0,
-                     reinterpret_cast<uint32_t*>(&app_marker_type[i])));
-    if (app_marker_type[i] != AppMarkerType::kUnknown &&
-        app_marker_type[i] != AppMarkerType::kICC &&
-        app_marker_type[i] != AppMarkerType::kExif &&
-        app_marker_type[i] != AppMarkerType::kXMP) {
-      return JXL_FAILURE("Unknown app marker type %u",
-                         static_cast<uint32_t>(app_marker_type[i]));
-    }
-    uint32_t len = app.size() - 1;
-    JXL_RETURN_IF_ERROR(visitor->Bits(16, 0, &len));
-    if (visitor->IsReading()) app.resize(len + 1);
-    if (app.size() < 3) {
-      return JXL_FAILURE("Invalid marker size: %" PRIuS "\n", app.size());
-    }
-  }
-  for (auto& com : com_data) {
-    uint32_t len = com.size() - 1;
-    JXL_RETURN_IF_ERROR(visitor->Bits(16, 0, &len));
-    if (visitor->IsReading()) com.resize(len + 1);
-    if (com.size() < 3) {
-      return JXL_FAILURE("Invalid marker size: %" PRIuS "\n", com.size());
-    }
-  }
-
-  uint32_t num_quant_tables = quant.size();
-  JXL_RETURN_IF_ERROR(
-      visitor->U32(Val(1), Val(2), Val(3), Val(4), 2, &num_quant_tables));
-  if (num_quant_tables == 4) {
-    return JXL_FAILURE("Invalid number of quant tables");
-  }
-  if (visitor->IsReading()) {
-    quant.resize(num_quant_tables);
-  }
-  for (size_t i = 0; i < num_quant_tables; i++) {
-    if (quant[i].precision > 1) {
-      return JXL_FAILURE(
-          "Quant tables with more than 16 bits are not supported");
-    }
-    JXL_RETURN_IF_ERROR(visitor->Bits(1, 0, &quant[i].precision));
-    JXL_RETURN_IF_ERROR(visitor->Bits(2, i, &quant[i].index));
-    JXL_RETURN_IF_ERROR(visitor->Bool(true, &quant[i].is_last));
-  }
-
-  JPEGComponentType component_type =
-      components.size() == 1 && components[0].id == 1 ? JPEGComponentType::kGray
-      : components.size() == 3 && components[0].id == 1 &&
-              components[1].id == 2 && components[2].id == 3
-          ? JPEGComponentType::kYCbCr
-      : components.size() == 3 && components[0].id == 'R' &&
-              components[1].id == 'G' && components[2].id == 'B'
-          ? JPEGComponentType::kRGB
-          : JPEGComponentType::kCustom;
-  JXL_RETURN_IF_ERROR(
-      visitor->Bits(2, JPEGComponentType::kYCbCr,
-                    reinterpret_cast<uint32_t*>(&component_type)));
-  uint32_t num_components;
-  if (component_type == JPEGComponentType::kGray) {
-    num_components = 1;
-  } else if (component_type != JPEGComponentType::kCustom) {
-    num_components = 3;
-  } else {
-    num_components = components.size();
-    JXL_RETURN_IF_ERROR(
-        visitor->U32(Val(1), Val(2), Val(3), Val(4), 3, &num_components));
-    if (num_components != 1 && num_components != 3) {
-      return JXL_FAILURE("Invalid number of components: %u", num_components);
-    }
-  }
-  if (visitor->IsReading()) {
-    components.resize(num_components);
-  }
-  if (component_type == JPEGComponentType::kCustom) {
-    for (auto& component : components) {
-      JXL_RETURN_IF_ERROR(visitor->Bits(8, 0, &component.id));
-    }
-  } else if (component_type == JPEGComponentType::kGray) {
-    components[0].id = 1;
-  } else if (component_type == JPEGComponentType::kRGB) {
-    components[0].id = 'R';
-    components[1].id = 'G';
-    components[2].id = 'B';
-  } else {
-    components[0].id = 1;
-    components[1].id = 2;
-    components[2].id = 3;
-  }
-  size_t used_tables = 0;
-  for (size_t i = 0; i < components.size(); i++) {
-    JXL_RETURN_IF_ERROR(visitor->Bits(2, 0, &components[i].quant_idx));
-    if (components[i].quant_idx >= quant.size()) {
-      return JXL_FAILURE("Invalid quant table for component %" PRIuS ": %u\n",
-                         i, components[i].quant_idx);
-    }
-    used_tables |= 1U << components[i].quant_idx;
-  }
-  for (size_t i = 0; i < quant.size(); i++) {
-    if (used_tables & (1 << i)) continue;
-    if (i == 0) return JXL_FAILURE("First quant table unused.");
-    // Unused quant table has to be set to copy of previous quant table
-    for (size_t j = 0; j < 64; j++) {
-      if (quant[i].values[j] != quant[i - 1].values[j]) {
-        return JXL_FAILURE("Non-trivial unused quant table");
-      }
-    }
-  }
-
-  uint32_t num_huff = huffman_code.size();
-  JXL_RETURN_IF_ERROR(visitor->U32(Val(4), BitsOffset(3, 2), BitsOffset(4, 10),
-                                   BitsOffset(6, 26), 4, &num_huff));
-  if (visitor->IsReading()) {
-    huffman_code.resize(num_huff);
-  }
-  for (JPEGHuffmanCode& hc : huffman_code) {
-    bool is_ac = ((hc.slot_id >> 4) != 0);
-    uint32_t id = hc.slot_id & 0xF;
-    JXL_RETURN_IF_ERROR(visitor->Bool(false, &is_ac));
-    JXL_RETURN_IF_ERROR(visitor->Bits(2, 0, &id));
-    hc.slot_id = (static_cast<uint32_t>(is_ac) << 4) | id;
-    JXL_RETURN_IF_ERROR(visitor->Bool(true, &hc.is_last));
-    size_t num_symbols = 0;
-    for (size_t i = 0; i <= 16; i++) {
-      JXL_RETURN_IF_ERROR(visitor->U32(Val(0), Val(1), BitsOffset(3, 2),
-                                       Bits(8), 0, &hc.counts[i]));
-      num_symbols += hc.counts[i];
-    }
-    if (num_symbols < 1) {
-      // Actually, at least 2 symbols are required, since one of them is EOI.
-      return JXL_FAILURE("Empty Huffman table");
-    }
-    if (num_symbols > hc.values.size()) {
-      return JXL_FAILURE("Huffman code too large (%" PRIuS ")", num_symbols);
-    }
-    // Presence flags for 4 * 64 + 1 values.
-    uint64_t value_slots[5] = {};
-    for (size_t i = 0; i < num_symbols; i++) {
-      // Goes up to 256, included. Might have the same symbol appear twice...
-      JXL_RETURN_IF_ERROR(visitor->U32(Bits(2), BitsOffset(2, 4),
-                                       BitsOffset(4, 8), BitsOffset(8, 1), 0,
-                                       &hc.values[i]));
-      value_slots[hc.values[i] >> 6] |= static_cast<uint64_t>(1)
-                                        << (hc.values[i] & 0x3F);
-    }
-    if (hc.values[num_symbols - 1] != kJpegHuffmanAlphabetSize) {
-      return JXL_FAILURE("Missing EOI symbol");
-    }
-    // Last element, denoting EOI, have to be 1 after the loop.
-    JXL_ENSURE(value_slots[4] == 1);
-    size_t num_values = 1;
-    for (size_t i = 0; i < 4; ++i) num_values += hwy::PopCount(value_slots[i]);
-    if (num_values != num_symbols) {
-      return JXL_FAILURE("Duplicate Huffman symbols");
-    }
-    if (!is_ac) {
-      bool only_dc = ((value_slots[0] >> kJpegDCAlphabetSize) | value_slots[1] |
-                      value_slots[2] | value_slots[3]) == 0;
-      if (!only_dc) return JXL_FAILURE("Huffman symbols out of DC range");
-    }
-  }
-
-  for (auto& scan : scan_info) {
-    JXL_RETURN_IF_ERROR(
-        visitor->U32(Val(1), Val(2), Val(3), Val(4), 1, &scan.num_components));
-    if (scan.num_components >= 4) {
-      return JXL_FAILURE("Invalid number of components in SOS marker");
-    }
-    JXL_RETURN_IF_ERROR(visitor->Bits(6, 0, &scan.Ss));
-    JXL_RETURN_IF_ERROR(visitor->Bits(6, 63, &scan.Se));
-    JXL_RETURN_IF_ERROR(visitor->Bits(4, 0, &scan.Al));
-    JXL_RETURN_IF_ERROR(visitor->Bits(4, 0, &scan.Ah));
-    for (size_t i = 0; i < scan.num_components; i++) {
-      JXL_RETURN_IF_ERROR(visitor->Bits(2, 0, &scan.components[i].comp_idx));
-      if (scan.components[i].comp_idx >= components.size()) {
-        return JXL_FAILURE("Invalid component idx in SOS marker");
-      }
-      JXL_RETURN_IF_ERROR(visitor->Bits(2, 0, &scan.components[i].ac_tbl_idx));
-      JXL_RETURN_IF_ERROR(visitor->Bits(2, 0, &scan.components[i].dc_tbl_idx));
-    }
-    // TODO(veluca): actually set and use this value.
-    JXL_RETURN_IF_ERROR(visitor->U32(Val(0), Val(1), Val(2), BitsOffset(3, 3),
-                                     kMaxNumPasses - 1,
-                                     &scan.last_needed_pass));
-  }
-
-  // From here on, this is data that is not strictly necessary to get a valid
-  // JPEG, but necessary for bit-exact JPEG reconstruction.
-  if (info.has_dri) {
-    JXL_RETURN_IF_ERROR(visitor->Bits(16, 0, &restart_interval));
-  }
-
-  for (auto& scan : scan_info) {
-    uint32_t num_reset_points = scan.reset_points.size();
-    JXL_RETURN_IF_ERROR(visitor->U32(Val(0), BitsOffset(2, 1), BitsOffset(4, 4),
-                                     BitsOffset(16, 20), 0, &num_reset_points));
-    if (visitor->IsReading()) {
-      scan.reset_points.resize(num_reset_points);
-    }
-    int last_block_idx = -1;
-    for (auto& block_idx : scan.reset_points) {
-      block_idx -= last_block_idx + 1;
-      JXL_RETURN_IF_ERROR(visitor->U32(Val(0), BitsOffset(3, 1),
-                                       BitsOffset(5, 9), BitsOffset(28, 41), 0,
-                                       &block_idx));
-      block_idx += last_block_idx + 1;
-      if (block_idx >= (3u << 26)) {
-        // At most 8K x 8K x num_channels blocks are possible in a JPEG.
-        // So valid block indices are below 3 * 2^26.
-        return JXL_FAILURE("Invalid block ID: %u", block_idx);
-      }
-      last_block_idx = block_idx;
-    }
-
-    uint32_t num_extra_zero_runs = scan.extra_zero_runs.size();
-    JXL_RETURN_IF_ERROR(visitor->U32(Val(0), BitsOffset(2, 1), BitsOffset(4, 4),
-                                     BitsOffset(16, 20), 0,
-                                     &num_extra_zero_runs));
-    if (visitor->IsReading()) {
-      scan.extra_zero_runs.resize(num_extra_zero_runs);
-    }
-    last_block_idx = -1;
-    for (auto& extra_zero_run : scan.extra_zero_runs) {
-      uint32_t& block_idx = extra_zero_run.block_idx;
-      JXL_RETURN_IF_ERROR(visitor->U32(Val(1), BitsOffset(2, 2),
-                                       BitsOffset(4, 5), BitsOffset(8, 20), 1,
-                                       &extra_zero_run.num_extra_zero_runs));
-      block_idx -= last_block_idx + 1;
-      JXL_RETURN_IF_ERROR(visitor->U32(Val(0), BitsOffset(3, 1),
-                                       BitsOffset(5, 9), BitsOffset(28, 41), 0,
-                                       &block_idx));
-      block_idx += last_block_idx + 1;
-      if (block_idx > (3u << 26)) {
-        return JXL_FAILURE("Invalid block ID: %u", block_idx);
-      }
-      last_block_idx = block_idx;
-    }
-  }
-  std::vector<uint32_t> inter_marker_data_sizes;
-  inter_marker_data_sizes.reserve(info.num_intermarker);
-  for (size_t i = 0; i < info.num_intermarker; ++i) {
-    uint32_t len = visitor->IsReading() ? 0 : inter_marker_data[i].size();
-    JXL_RETURN_IF_ERROR(visitor->Bits(16, 0, &len));
-    if (visitor->IsReading()) inter_marker_data_sizes.emplace_back(len);
-  }
-  uint32_t tail_data_len = tail_data.size();
-  if (!visitor->IsReading() && tail_data_len > 4260096) {
-    return JXL_FAILURE("Tail data too large (max size = 4260096, size = %u)",
-                       tail_data_len);
-  }
-  JXL_RETURN_IF_ERROR(visitor->U32(Val(0), BitsOffset(8, 1),
-                                   BitsOffset(16, 257), BitsOffset(22, 65793),
-                                   0, &tail_data_len));
-
-  JXL_RETURN_IF_ERROR(visitor->Bool(false, &has_zero_padding_bit));
-  if (has_zero_padding_bit) {
-    uint32_t nbit = padding_bits.size();
-    JXL_RETURN_IF_ERROR(visitor->Bits(24, 0, &nbit));
-    if (visitor->IsReading()) {
-      JXL_RETURN_IF_ERROR(CheckHasEnoughBits(visitor, nbit));
-      padding_bits.reserve(std::min<uint32_t>(1024u, nbit));
-      for (uint32_t i = 0; i < nbit; i++) {
-        bool bbit = false;
-        JXL_RETURN_IF_ERROR(visitor->Bool(false, &bbit));
-        padding_bits.push_back(TO_JXL_BOOL(bbit));
-      }
-    } else {
-      for (uint8_t& bit : padding_bits) {
-        bool bbit = FROM_JXL_BOOL(bit);
-        JXL_RETURN_IF_ERROR(visitor->Bool(false, &bbit));
-        bit = TO_JXL_BOOL(bbit);
-      }
-    }
-  }
-
-  {
-    size_t dht_index = 0;
-    size_t scan_index = 0;
-    bool is_progressive = false;
-    bool ac_ok[kMaxHuffmanTables] = {false};
-    bool dc_ok[kMaxHuffmanTables] = {false};
-    for (uint8_t marker : marker_order) {
-      if (marker == 0xC2) {
-        is_progressive = true;
-      } else if (marker == 0xC4) {
-        for (; dht_index < huffman_code.size();) {
-          const JPEGHuffmanCode& huff = huffman_code[dht_index++];
-          size_t index = huff.slot_id;
-          if (index & 0x10) {
-            index -= 0x10;
-            ac_ok[index] = true;
-          } else {
-            dc_ok[index] = true;
-          }
-          if (huff.is_last) break;
-        }
-      } else if (marker == 0xDA) {
-        const JPEGScanInfo& si = scan_info[scan_index++];
-        for (size_t i = 0; i < si.num_components; ++i) {
-          const JPEGComponentScanInfo& csi = si.components[i];
-          size_t dc_tbl_idx = csi.dc_tbl_idx;
-          size_t ac_tbl_idx = csi.ac_tbl_idx;
-          bool want_dc = !is_progressive || (si.Ss == 0);
-          if (want_dc && !dc_ok[dc_tbl_idx]) {
-            return JXL_FAILURE("DC Huffman table used before defined");
-          }
-          bool want_ac = !is_progressive || (si.Ss != 0) || (si.Se != 0);
-          if (want_ac && !ac_ok[ac_tbl_idx]) {
-            return JXL_FAILURE("AC Huffman table used before defined");
-          }
-        }
-      }
-    }
-  }
-
-  // Apply postponed actions.
-  if (visitor->IsReading()) {
-    tail_data.resize(tail_data_len);
-    JXL_ENSURE(inter_marker_data_sizes.size() == info.num_intermarker);
-    inter_marker_data.reserve(info.num_intermarker);
-    for (size_t i = 0; i < info.num_intermarker; ++i) {
-      inter_marker_data.emplace_back(inter_marker_data_sizes[i]);
-    }
-  }
-
-  return true;
-}
-
-#endif  // JPEGXL_ENABLE_TRANSCODE_JPEG
-
-void JPEGData::CalculateMcuSize(const JPEGScanInfo& scan, int* MCUs_per_row,
-                                int* MCU_rows) const {
-  const bool is_interleaved = (scan.num_components > 1);
-  const JPEGComponent& base_component = components[scan.components[0].comp_idx];
-  // h_group / v_group act as numerators for converting number of blocks to
-  // number of MCU. In interleaved mode it is 1, so MCU is represented with
-  // max_*_samp_factor blocks. In non-interleaved mode we choose numerator to
-  // be the samping factor, consequently MCU is always represented with single
-  // block.
-  const int h_group = is_interleaved ? 1 : base_component.h_samp_factor;
-  const int v_group = is_interleaved ? 1 : base_component.v_samp_factor;
-  int max_h_samp_factor = 1;
-  int max_v_samp_factor = 1;
-  for (const auto& c : components) {
-    max_h_samp_factor = std::max(c.h_samp_factor, max_h_samp_factor);
-    max_v_samp_factor = std::max(c.v_samp_factor, max_v_samp_factor);
-  }
-  *MCUs_per_row = DivCeil(width * h_group, 8 * max_h_samp_factor);
-  *MCU_rows = DivCeil(height * v_group, 8 * max_v_samp_factor);
-}
-
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-
-Status SetJPEGDataFromICC(const std::vector<uint8_t>& icc,
-                          jpeg::JPEGData* jpeg_data) {
-  size_t icc_pos = 0;
-  for (size_t i = 0; i < jpeg_data->app_data.size(); i++) {
-    if (jpeg_data->app_marker_type[i] != jpeg::AppMarkerType::kICC) {
-      continue;
-    }
-    size_t len = jpeg_data->app_data[i].size() - 17;
-    if (icc_pos + len > icc.size()) {
-      return JXL_FAILURE(
-          "ICC length is less than APP markers: requested %" PRIuS
-          " more bytes, "
-          "%" PRIuS " available",
-          len, icc.size() - icc_pos);
-    }
-    memcpy(&jpeg_data->app_data[i][17], icc.data() + icc_pos, len);
-    icc_pos += len;
-  }
-  if (icc_pos != icc.size() && icc_pos != 0) {
-    return JXL_FAILURE("ICC length is more than APP markers");
-  }
-  return true;
-}
-
-#endif  // JPEGXL_ENABLE_TRANSCODE_JPEG
-
-}  // namespace jpeg
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/jpeg/jpeg_data.h b/third_party/jpeg-xl/lib/jxl/jpeg/jpeg_data.h
deleted file mode 100644
index 8f1dceb06a859..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/jpeg/jpeg_data.h
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Data structures that represent the non-pixel contents of a jpeg file.
-
-#ifndef LIB_JXL_JPEG_JPEG_DATA_H_
-#define LIB_JXL_JPEG_JPEG_DATA_H_
-
-#include <array>
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/common.h"  // JPEGXL_ENABLE_TRANSCODE_JPEG
-#include "lib/jxl/field_encodings.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/frame_dimensions.h"
-
-namespace jxl {
-namespace jpeg {
-
-constexpr int kMaxComponents = 4;
-constexpr int kMaxQuantTables = 4;
-constexpr int kMaxHuffmanTables = 4;
-constexpr size_t kJpegHuffmanMaxBitLength = 16;
-constexpr int kJpegHuffmanAlphabetSize = 256;
-constexpr int kJpegDCAlphabetSize = 12;
-constexpr int kMaxDHTMarkers = 512;
-constexpr int kMaxDimPixels = 65535;
-constexpr uint8_t kApp1 = 0xE1;
-constexpr uint8_t kApp2 = 0xE2;
-const uint8_t kIccProfileTag[12] = "ICC_PROFILE";
-const uint8_t kExifTag[6] = "Exif\0";
-const uint8_t kXMPTag[29] = "http://ns.adobe.com/xap/1.0/";
-
-/* clang-format off */
-constexpr uint32_t kJPEGNaturalOrder[80] = {
-  0,   1,  8, 16,  9,  2,  3, 10,
-  17, 24, 32, 25, 18, 11,  4,  5,
-  12, 19, 26, 33, 40, 48, 41, 34,
-  27, 20, 13,  6,  7, 14, 21, 28,
-  35, 42, 49, 56, 57, 50, 43, 36,
-  29, 22, 15, 23, 30, 37, 44, 51,
-  58, 59, 52, 45, 38, 31, 39, 46,
-  53, 60, 61, 54, 47, 55, 62, 63,
-  // extra entries for safety in decoder
-  63, 63, 63, 63, 63, 63, 63, 63,
-  63, 63, 63, 63, 63, 63, 63, 63
-};
-
-constexpr uint32_t kJPEGZigZagOrder[64] = {
-  0,   1,  5,  6, 14, 15, 27, 28,
-  2,   4,  7, 13, 16, 26, 29, 42,
-  3,   8, 12, 17, 25, 30, 41, 43,
-  9,  11, 18, 24, 31, 40, 44, 53,
-  10, 19, 23, 32, 39, 45, 52, 54,
-  20, 22, 33, 38, 46, 51, 55, 60,
-  21, 34, 37, 47, 50, 56, 59, 61,
-  35, 36, 48, 49, 57, 58, 62, 63
-};
-/* clang-format on */
-
-// Quantization values for an 8x8 pixel block.
-struct JPEGQuantTable {
-  std::array<int32_t, kDCTBlockSize> values;
-  uint32_t precision = 0;
-  // The index of this quantization table as it was parsed from the input JPEG.
-  // Each DQT marker segment contains an 'index' field, and we save this index
-  // here. Valid values are 0 to 3.
-  uint32_t index = 0;
-  // Set to true if this table is the last one within its marker segment.
-  bool is_last = true;
-};
-
-// Huffman code and decoding lookup table used for DC and AC coefficients.
-struct JPEGHuffmanCode {
-  // Bit length histogram.
-  std::array<uint32_t, kJpegHuffmanMaxBitLength + 1> counts = {};
-  // Symbol values sorted by increasing bit lengths.
-  std::array<uint32_t, kJpegHuffmanAlphabetSize + 1> values = {};
-  // The index of the Huffman code in the current set of Huffman codes. For AC
-  // component Huffman codes, 0x10 is added to the index.
-  int slot_id = 0;
-  // Set to true if this Huffman code is the last one within its marker segment.
-  bool is_last = true;
-};
-
-// Huffman table indexes used for one component of one scan.
-struct JPEGComponentScanInfo {
-  uint32_t comp_idx;
-  uint32_t dc_tbl_idx;
-  uint32_t ac_tbl_idx;
-};
-
-// Contains information that is used in one scan.
-struct JPEGScanInfo {
-  // Parameters used for progressive scans (named the same way as in the spec):
-  //   Ss : Start of spectral band in zig-zag sequence.
-  //   Se : End of spectral band in zig-zag sequence.
-  //   Ah : Successive approximation bit position, high.
-  //   Al : Successive approximation bit position, low.
-  uint32_t Ss;
-  uint32_t Se;
-  uint32_t Ah;
-  uint32_t Al;
-  uint32_t num_components = 0;
-  std::array<JPEGComponentScanInfo, 4> components;
-  // Last codestream pass that is needed to write this scan.
-  uint32_t last_needed_pass = 0;
-
-  // Extra information required for bit-precise JPEG file reconstruction.
-
-  // Set of block indexes where the JPEG encoder has to flush the end-of-block
-  // runs and refinement bits.
-  std::vector<uint32_t> reset_points;
-  // The number of extra zero runs (Huffman symbol 0xf0) before the end of
-  // block (if nonzero), indexed by block index.
-  // All of these symbols can be omitted without changing the pixel values, but
-  // some jpeg encoders put these at the end of blocks.
-  typedef struct {
-    uint32_t block_idx;
-    uint32_t num_extra_zero_runs;
-  } ExtraZeroRunInfo;
-  std::vector<ExtraZeroRunInfo> extra_zero_runs;
-};
-
-typedef int16_t coeff_t;
-
-// Represents one component of a jpeg file.
-struct JPEGComponent {
-  JPEGComponent()
-      : id(0),
-        h_samp_factor(1),
-        v_samp_factor(1),
-        quant_idx(0),
-        width_in_blocks(0),
-        height_in_blocks(0) {}
-
-  // One-byte id of the component.
-  uint32_t id;
-  // Horizontal and vertical sampling factors.
-  // In interleaved mode, each minimal coded unit (MCU) has
-  // h_samp_factor x v_samp_factor DCT blocks from this component.
-  int h_samp_factor;
-  int v_samp_factor;
-  // The index of the quantization table used for this component.
-  uint32_t quant_idx;
-  // The dimensions of the component measured in 8x8 blocks.
-  uint32_t width_in_blocks;
-  uint32_t height_in_blocks;
-  // The DCT coefficients of this component, laid out block-by-block, divided
-  // through the quantization matrix values.
-  std::vector<coeff_t> coeffs;
-};
-
-enum class AppMarkerType : uint32_t {
-  kUnknown = 0,
-  kICC = 1,
-  kExif = 2,
-  kXMP = 3,
-};
-
-// Represents a parsed jpeg file.
-struct JPEGData : public Fields {
-  JPEGData()
-      : width(0), height(0), restart_interval(0), has_zero_padding_bit(false) {}
-
-  JXL_FIELDS_NAME(JPEGData)
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-  // Doesn't serialize everything - skips brotli-encoded data and what is
-  // already encoded in the codestream.
-  Status VisitFields(Visitor* visitor) override;
-#else
-  Status VisitFields(Visitor* /* visitor */) override {
-    return JXL_UNREACHABLE("JPEG transcoding support not enabled");
-  }
-#endif  // JPEGXL_ENABLE_TRANSCODE_JPEG
-
-  void CalculateMcuSize(const JPEGScanInfo& scan, int* MCUs_per_row,
-                        int* MCU_rows) const;
-
-  int width;
-  int height;
-  uint32_t restart_interval;
-  std::vector<std::vector<uint8_t>> app_data;
-  std::vector<AppMarkerType> app_marker_type;
-  std::vector<std::vector<uint8_t>> com_data;
-  std::vector<JPEGQuantTable> quant;
-  std::vector<JPEGHuffmanCode> huffman_code;
-  std::vector<JPEGComponent> components;
-  std::vector<JPEGScanInfo> scan_info;
-  std::vector<uint8_t> marker_order;
-  std::vector<std::vector<uint8_t>> inter_marker_data;
-  std::vector<uint8_t> tail_data;
-
-  // Extra information required for bit-precise JPEG file reconstruction.
-
-  bool has_zero_padding_bit;
-  std::vector<uint8_t> padding_bits;
-};
-
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-// Set ICC profile in jpeg_data.
-Status SetJPEGDataFromICC(const std::vector<uint8_t>& icc,
-                          jpeg::JPEGData* jpeg_data);
-#else
-static JXL_INLINE Status SetJPEGDataFromICC(
-    const std::vector<uint8_t>& /* icc */, jpeg::JPEGData* /* jpeg_data */) {
-  return JXL_UNREACHABLE("JPEG transcoding support not enabled");
-}
-#endif  // JPEGXL_ENABLE_TRANSCODE_JPEG
-
-}  // namespace jpeg
-}  // namespace jxl
-
-#endif  // LIB_JXL_JPEG_JPEG_DATA_H_
diff --git a/third_party/jpeg-xl/lib/jxl/jxl.syms b/third_party/jpeg-xl/lib/jxl/jxl.syms
deleted file mode 100644
index 0f398d71519f2..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/jxl.syms
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  extern "C" {
-    jpegxl_*;
-  };
-};
diff --git a/third_party/jpeg-xl/lib/jxl/jxl.version b/third_party/jpeg-xl/lib/jxl/jxl.version
deleted file mode 100644
index 26b0e9e54d9b1..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/jxl.version
+++ /dev/null
@@ -1,17 +0,0 @@
-JXL_0 {
-  global:
-    Jxl*;
-
-  local:
-    # Hide all the std namespace symbols. std namespace is explicitly marked
-    # as visibility(default) and header-only functions or methods (such as those
-    # from templates) should be exposed in shared libraries as weak symbols but
-    # this is only needed when we expose those types in the shared library API
-    # in any way. We don't use C++ std types in the API and we also don't
-    # support exceptions in the library.
-    # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36022 for a discussion
-    # about this.
-    extern "C++" {
-      *std::*;
-    };
-};
diff --git a/third_party/jpeg-xl/lib/jxl/jxl_osx.syms b/third_party/jpeg-xl/lib/jxl/jxl_osx.syms
deleted file mode 100644
index 96bc568025d6b..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/jxl_osx.syms
+++ /dev/null
@@ -1 +0,0 @@
-_Jxl*
diff --git a/third_party/jpeg-xl/lib/jxl/jxl_test.cc b/third_party/jpeg-xl/lib/jxl/jxl_test.cc
deleted file mode 100644
index ddf98427b1f3d..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/jxl_test.cc
+++ /dev/null
@@ -1,1937 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/extras/dec/jxl.h"
-
-#include <jxl/cms.h>
-#include <jxl/color_encoding.h>
-#include <jxl/encode.h>
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#include <cstring>
-#include <future>
-#include <ostream>
-#include <string>
-#include <tuple>
-#include <vector>
-
-#include "lib/extras/codec.h"
-#include "lib/extras/dec/decode.h"
-#include "lib/extras/enc/encode.h"
-#include "lib/extras/enc/jxl.h"
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/alpha.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/sanitizer_definitions.h"  // JXL_MEMORY_SANITIZER
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/codec_in_out.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/common.h"  // JXL_HIGH_PRECISION
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/fake_parallel_runner_testonly.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/jpeg/enc_jpeg_data.h"
-#include "lib/jxl/test_image.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-
-struct AuxOut;
-
-namespace {
-using ::jxl::extras::JXLCompressParams;
-using ::jxl::extras::JXLDecompressParams;
-using ::jxl::extras::PackedPixelFile;
-using ::jxl::test::ButteraugliDistance;
-using ::jxl::test::ComputeDistance2;
-using ::jxl::test::ReadTestData;
-using ::jxl::test::Roundtrip;
-using ::jxl::test::TestImage;
-using ::jxl::test::ThreadPoolForTests;
-
-#define JXL_TEST_NL 0  // Disabled in code
-
-TEST(JxlTest, RoundtripSinglePixel) {
-  TestImage t;
-  ASSERT_TRUE(t.SetDimensions(1, 1));
-  JXL_TEST_ASSIGN_OR_DIE(auto frame, t.AddFrame());
-  frame.ZeroFill();
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), {}, {}, nullptr, &ppf_out), 54, 10);
-}
-
-TEST(JxlTest, RoundtripSinglePixelWithAlpha) {
-  TestImage t;
-  ASSERT_TRUE(t.SetDimensions(1, 1));
-  ASSERT_TRUE(t.SetChannels(4));
-  JXL_TEST_ASSIGN_OR_DIE(auto frame, t.AddFrame());
-  frame.ZeroFill();
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), {}, {}, nullptr, &ppf_out), 57, 10);
-}
-
-// Changing serialized signature causes Decode to fail.
-TEST(JxlTest, RoundtripMarker) {
-  if (JXL_CRASH_ON_ERROR) {
-    GTEST_SKIP() << "Skipping due to JXL_CRASH_ON_ERROR";
-  }
-  TestImage t;
-  ASSERT_TRUE(t.SetDimensions(1, 1));
-  JXL_TEST_ASSIGN_OR_DIE(auto frame, t.AddFrame());
-  frame.ZeroFill();
-  for (size_t i = 0; i < 2; ++i) {
-    std::vector<uint8_t> compressed;
-    EXPECT_TRUE(extras::EncodeImageJXL({}, t.ppf(), /*jpeg_bytes=*/nullptr,
-                                       &compressed));
-    compressed[i] ^= 0xFF;
-    PackedPixelFile ppf_out;
-    EXPECT_FALSE(extras::DecodeImageJXL(compressed.data(), compressed.size(),
-                                        {}, /* decoded_bytes */ nullptr,
-                                        &ppf_out));
-  }
-}
-
-TEST(JxlTest, RoundtripTinyFast) {
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  ASSERT_TRUE(t.SetDimensions(32, 32));
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 7);
-  cparams.distance = 4.0f;
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool, &ppf_out), 181, 15);
-}
-
-TEST(JxlTest, RoundtripSmallD1) {
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  size_t xsize = t.ppf().info.xsize / 8;
-  size_t ysize = t.ppf().info.ysize / 8;
-  ASSERT_TRUE(t.SetDimensions(xsize, ysize));
-
-  {
-    PackedPixelFile ppf_out;
-    EXPECT_NEAR(Roundtrip(t.ppf(), {}, {}, pool, &ppf_out), 916, 40);
-    EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 0.92);
-  }
-
-  // With a lower intensity target than the default, the bitrate should be
-  // smaller.
-  t.ppf().info.intensity_target = 100.0f;
-
-  {
-    PackedPixelFile ppf_out;
-    EXPECT_NEAR(Roundtrip(t.ppf(), {}, {}, pool, &ppf_out), 723, 20);
-    EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 1.3);
-    EXPECT_EQ(ppf_out.info.intensity_target, t.ppf().info.intensity_target);
-  }
-}
-TEST(JxlTest, RoundtripResample2) {
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_RESAMPLING, 2);
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 3);  // kFalcon
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool, &ppf_out), 17300, 500);
-  EXPECT_SLIGHTLY_BELOW(ComputeDistance2(t.ppf(), ppf_out), 90);
-}
-
-TEST(JxlTest, RoundtripResample2Slow) {
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_RESAMPLING, 2);
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 9);  // kTortoise
-  cparams.distance = 10.0;
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool, &ppf_out), 3888, 200);
-  EXPECT_SLIGHTLY_BELOW(ComputeDistance2(t.ppf(), ppf_out), 270);
-}
-
-TEST(JxlTest, RoundtripResample2MT) {
-  ThreadPoolForTests pool(4);
-  const std::vector<uint8_t> orig = ReadTestData("jxl/flower/flower.png");
-  // image has to be large enough to have multiple groups after downsampling
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_RESAMPLING, 2);
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 3);  // kFalcon
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool.get(), &ppf_out), 206917,
-              2000);
-  EXPECT_SLIGHTLY_BELOW(ComputeDistance2(t.ppf(), ppf_out), 340);
-}
-
-// Roundtrip the image using a parallel runner that executes single-threaded but
-// in random order.
-TEST(JxlTest, RoundtripOutOfOrderProcessing) {
-  FakeParallelRunner fake_pool(/*order_seed=*/123, /*num_threads=*/8);
-  ThreadPool pool(&JxlFakeParallelRunner, &fake_pool);
-  const std::vector<uint8_t> orig = ReadTestData("jxl/flower/flower.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  // Image size is selected so that the block border needed is larger than the
-  // amount of pixels available on the next block.
-  ASSERT_TRUE(t.SetDimensions(513, 515));
-
-  JXLCompressParams cparams;
-  // Force epf so we end up needing a lot of border.
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EPF, 3);
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, &pool, &ppf_out), 26933, 400);
-  EXPECT_LE(ButteraugliDistance(t.ppf(), ppf_out), 1.35);
-}
-
-TEST(JxlTest, RoundtripOutOfOrderProcessingBorder) {
-  FakeParallelRunner fake_pool(/*order_seed=*/47, /*num_threads=*/8);
-  ThreadPool pool(&JxlFakeParallelRunner, &fake_pool);
-  const std::vector<uint8_t> orig = ReadTestData("jxl/flower/flower.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  // Image size is selected so that the block border needed is larger than the
-  // amount of pixels available on the next block.
-  ASSERT_TRUE(t.SetDimensions(513, 515));
-
-  JXLCompressParams cparams;
-  // Force epf so we end up needing a lot of border.
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EPF, 3);
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_RESAMPLING, 2);
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, &pool, &ppf_out), 9947, 200);
-  EXPECT_LE(ButteraugliDistance(t.ppf(), ppf_out), 2.9);
-}
-
-TEST(JxlTest, RoundtripResample4) {
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_RESAMPLING, 4);
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool, &ppf_out), 5888, 100);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 22);
-}
-
-TEST(JxlTest, RoundtripResample8) {
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_RESAMPLING, 8);
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool, &ppf_out), 2036, 50);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 50);
-}
-
-TEST(JxlTest, RoundtripUnalignedD2) {
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  size_t xsize = t.ppf().info.xsize / 12;
-  size_t ysize = t.ppf().info.ysize / 7;
-  ASSERT_TRUE(t.SetDimensions(xsize, ysize));
-
-  JXLCompressParams cparams;
-  cparams.distance = 2.0;
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool, &ppf_out), 506, 30);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 1.72);
-}
-
-TEST(JxlTest, RoundtripMultiGroup) {
-  const std::vector<uint8_t> orig = ReadTestData("jxl/flower/flower.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  ASSERT_TRUE(t.SetDimensions(600, 1024));
-
-  auto test = [&](jxl::SpeedTier speed_tier, float target_distance,
-                  size_t expected_size, float expected_distance) {
-    ThreadPoolForTests pool(4);
-    JXLCompressParams cparams;
-    int64_t effort = 10 - static_cast<int>(speed_tier);
-    cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, effort);
-    cparams.distance = target_distance;
-
-    PackedPixelFile ppf_out;
-    EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool.get(), &ppf_out),
-                expected_size, 700);
-    EXPECT_SLIGHTLY_BELOW(ComputeDistance2(t.ppf(), ppf_out),
-                          expected_distance);
-  };
-
-  auto run_kitten = std::async(std::launch::async, test, SpeedTier::kKitten,
-                               1.0f, 64624u, 8.5);
-  auto run_wombat = std::async(std::launch::async, test, SpeedTier::kWombat,
-                               2.0f, 38887u, 15.5);
-}
-
-TEST(JxlTest, RoundtripRGBToGrayscale) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  ThreadPoolForTests pool(4);
-  const std::vector<uint8_t> orig = ReadTestData("jxl/flower/flower.png");
-  CodecInOut io{memory_manager};
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io, pool.get()));
-  ASSERT_TRUE(io.ShrinkTo(600, 1024));
-
-  CompressParams cparams;
-  cparams.butteraugli_distance = 1.0f;
-  cparams.speed_tier = SpeedTier::kFalcon;
-
-  JXLDecompressParams dparams;
-  dparams.color_space = "Gra_D65_Rel_SRG";
-
-  CodecInOut io2{memory_manager};
-  EXPECT_FALSE(io.Main().IsGray());
-  size_t compressed_size;
-  JXL_EXPECT_OK(
-      Roundtrip(&io, cparams, dparams, &io2, _, &compressed_size, pool.get()));
-  EXPECT_LE(compressed_size, 65000u);
-  EXPECT_TRUE(io2.Main().IsGray());
-
-  // Convert original to grayscale here, because TransformTo refuses to
-  // convert between grayscale and RGB.
-  ColorEncoding srgb_lin = ColorEncoding::LinearSRGB(/*is_gray=*/false);
-  ASSERT_TRUE(io.frames[0].TransformTo(srgb_lin, *JxlGetDefaultCms()));
-  Image3F* color = io.Main().color();
-  for (size_t y = 0; y < color->ysize(); ++y) {
-    float* row_r = color->PlaneRow(0, y);
-    float* row_g = color->PlaneRow(1, y);
-    float* row_b = color->PlaneRow(2, y);
-    for (size_t x = 0; x < color->xsize(); ++x) {
-      float luma = 0.2126 * row_r[x] + 0.7152 * row_g[x] + 0.0722 * row_b[x];
-      row_r[x] = row_g[x] = row_b[x] = luma;
-    }
-  }
-  ColorEncoding srgb_gamma = ColorEncoding::SRGB(/*is_gray=*/false);
-  ASSERT_TRUE(io.frames[0].TransformTo(srgb_gamma, *JxlGetDefaultCms()));
-  io.metadata.m.color_encoding = io2.Main().c_current();
-  io.Main().OverrideProfile(io2.Main().c_current());
-  EXPECT_SLIGHTLY_BELOW(
-      ButteraugliDistance(io.frames, io2.frames, ButteraugliParams(),
-                          *JxlGetDefaultCms(),
-                          /*distmap=*/nullptr, pool.get()),
-      1.4);
-}
-
-TEST(JxlTest, RoundtripLargeFast) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig = ReadTestData("jxl/flower/flower.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 7);  // kSquirrel
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool.get(), &ppf_out), 503000,
-              12000);
-  EXPECT_SLIGHTLY_BELOW(ComputeDistance2(t.ppf(), ppf_out), 78);
-}
-
-JXL_X86_64_TEST(JxlTest, RoundtripLargeEmptyModular) {
-  ThreadPoolForTests pool(8);
-  TestImage t;
-  ASSERT_TRUE(t.SetDimensions(4096, 4096));
-  t.SetDataType(JXL_TYPE_UINT8);
-  ASSERT_TRUE(t.SetChannels(4));
-  JXL_TEST_ASSIGN_OR_DIE(auto frame, t.AddFrame());
-  frame.ZeroFill();
-  for (size_t c = 0; c < 4; ++c) {
-    for (size_t y = 0; y < 1024; y += (c + 1)) {
-      for (size_t x = 0; x < 1024; x += ((y % 4) + 3)) {
-        ASSERT_TRUE(frame.SetValue(y, x, c, 0.88));
-      }
-    }
-  }
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 1);
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_MODULAR, 1);
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_RESPONSIVE, 1);
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_DECODING_SPEED, 2);
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool.get(), &ppf_out), 669009,
-              100000);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 0.19);
-}
-
-TEST(JxlTest, RoundtripOutputColorSpace) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig = ReadTestData("jxl/flower/flower.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 7);  // kSquirrel
-
-  JXLDecompressParams dparams;
-  dparams.color_space = "RGB_D65_DCI_Rel_709";
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, dparams, pool.get(), &ppf_out),
-              503000, 12000);
-  EXPECT_SLIGHTLY_BELOW(ComputeDistance2(t.ppf(), ppf_out), 78);
-}
-
-TEST(JxlTest, RoundtripDotsForceEpf) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/cvo9xd_keong_macan_srgb8.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 7);  // kSquirrel
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EPF, 2);
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_DOTS, 1);
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool.get(), &ppf_out), 41777,
-              700);
-  EXPECT_SLIGHTLY_BELOW(ComputeDistance2(t.ppf(), ppf_out), 18);
-}
-
-// Checks for differing size/distance in two consecutive runs of distance 2,
-// which involves additional processing including adaptive reconstruction.
-// Failing this may be a sign of race conditions or invalid memory accesses.
-TEST(JxlTest, RoundtripD2Consistent) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig = ReadTestData("jxl/flower/flower.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 7);  // kSquirrel
-  cparams.distance = 2.0;
-
-  // Try each xsize mod kBlockDim to verify right border handling.
-  for (size_t xsize = 48; xsize > 40; --xsize) {
-    ASSERT_TRUE(t.SetDimensions(xsize, 15));
-
-    PackedPixelFile ppf2;
-    const size_t size2 = Roundtrip(t.ppf(), cparams, {}, pool.get(), &ppf2);
-
-    PackedPixelFile ppf3;
-    const size_t size3 = Roundtrip(t.ppf(), cparams, {}, pool.get(), &ppf3);
-
-    // Exact same compressed size.
-    EXPECT_EQ(size2, size3);
-
-    // Exact same distance.
-    const float dist2 = ComputeDistance2(t.ppf(), ppf2);
-    const float dist3 = ComputeDistance2(t.ppf(), ppf3);
-    EXPECT_EQ(dist2, dist3);
-  }
-}
-
-// Same as above, but for full image, testing multiple groups.
-TEST(JxlTest, RoundtripLargeConsistent) {
-  const std::vector<uint8_t> orig = ReadTestData("jxl/flower/flower.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 7);  // kSquirrel
-  cparams.distance = 2.0;
-
-  auto roundtrip_and_compare = [&]() {
-    ThreadPoolForTests pool(8);
-    PackedPixelFile ppf2;
-    size_t size = Roundtrip(t.ppf(), cparams, {}, pool.get(), &ppf2);
-    double dist = ComputeDistance2(t.ppf(), ppf2);
-    return std::tuple<size_t, double>(size, dist);
-  };
-
-  // Try each xsize mod kBlockDim to verify right border handling.
-  auto future2 = std::async(std::launch::async, roundtrip_and_compare);
-  auto future3 = std::async(std::launch::async, roundtrip_and_compare);
-
-  const auto result2 = future2.get();
-  const auto result3 = future3.get();
-
-  // Exact same compressed size.
-  EXPECT_EQ(std::get<0>(result2), std::get<0>(result3));
-
-  // Exact same distance.
-  EXPECT_EQ(std::get<1>(result2), std::get<1>(result3));
-}
-
-TEST(JxlTest, RoundtripSmallNL) {
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  size_t xsize = t.ppf().info.xsize / 8;
-  size_t ysize = t.ppf().info.ysize / 8;
-  ASSERT_TRUE(t.SetDimensions(xsize, ysize));
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), {}, {}, pool, &ppf_out), 916, 45);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 0.92);
-}
-
-TEST(JxlTest, RoundtripNoGaborishNoAR) {
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EPF, 0);
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_GABORISH, 0);
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool, &ppf_out), 45241, 400);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 1.55);
-}
-
-TEST(JxlTest, RoundtripSmallNoGaborish) {
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  size_t xsize = t.ppf().info.xsize / 8;
-  size_t ysize = t.ppf().info.ysize / 8;
-  ASSERT_TRUE(t.SetDimensions(xsize, ysize));
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_GABORISH, 0);
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool, &ppf_out), 1042, 20);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 1.0);
-}
-
-TEST(JxlTest, RoundtripSmallPatchesAlpha) {
-  ThreadPool* pool = nullptr;
-  TestImage t;
-  ASSERT_TRUE(t.SetDimensions(256, 256));
-  ASSERT_TRUE(t.SetChannels(4));
-  ASSERT_TRUE(t.SetColorEncoding("RGB_D65_SRG_Rel_Lin"));
-  JXL_TEST_ASSIGN_OR_DIE(auto frame, t.AddFrame());
-  frame.ZeroFill();
-  // This pattern should be picked up by the patch detection heuristics.
-  for (size_t y = 0; y < t.ppf().info.ysize; ++y) {
-    for (size_t x = 0; x < t.ppf().info.xsize; ++x) {
-      if (x % 4 == 0 && (y / 32) % 4 == 0) {
-        ASSERT_TRUE(frame.SetValue(y, x, 1, 127.0f / 255.0f));
-      }
-      ASSERT_TRUE(frame.SetValue(y, x, 3, 1.0f));
-    }
-  }
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 7);  // kSquirrel
-  cparams.distance = 0.1f;
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool, &ppf_out), 462, 100);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 0.016f);
-}
-
-TEST(JxlTest, RoundtripSmallPatches) {
-  ThreadPool* pool = nullptr;
-  TestImage t;
-  ASSERT_TRUE(t.SetDimensions(256, 256));
-  ASSERT_TRUE(t.SetColorEncoding("RGB_D65_SRG_Rel_Lin"));
-  JXL_TEST_ASSIGN_OR_DIE(auto frame, t.AddFrame());
-  frame.ZeroFill();
-  // This pattern should be picked up by the patch detection heuristics.
-  for (size_t y = 0; y < t.ppf().info.ysize; ++y) {
-    for (size_t x = 0; x < t.ppf().info.xsize; ++x) {
-      if (x % 4 == 0 && (y / 32) % 4 == 0) {
-        ASSERT_TRUE(frame.SetValue(y, x, 1, 127.0f / 255.0f));
-      }
-    }
-  }
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 7);  // kSquirrel
-  cparams.distance = 0.1f;
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool, &ppf_out), 486, 100);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 0.015f);
-}
-
-// TODO(szabadka) Add encoder and decoder API functions that accept frame
-// buffers in arbitrary unsigned and floating point formats, and then roundtrip
-// test the lossless codepath to make sure the exact binary representations
-// are preserved.
-#if JXL_FALSE
-TEST(JxlTest, RoundtripImageBundleOriginalBits) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  // Image does not matter, only io.metadata.m and io2.metadata.m are tested.
-  JXL_TEST_ASSIGN_OR_DIE(Image3F image, Image3F::Create(memory_manager, 1, 1));
-  ZeroFillImage(&image);
-  CodecInOut io{memory_manager};
-  io.metadata.m.color_encoding = ColorEncoding::LinearSRGB();
-  io.SetFromImage(std::move(image), ColorEncoding::LinearSRGB());
-
-  CompressParams cparams;
-
-  // Test unsigned integers from 1 to 32 bits
-  for (uint32_t bit_depth = 1; bit_depth <= 32; bit_depth++) {
-    if (bit_depth == 32) {
-      // TODO(lode): allow testing 32, however the code below ends up in
-      // enc_modular which does not support 32. We only want to test the header
-      // encoding though, so try without modular.
-      break;
-    }
-
-    io.metadata.m.SetUintSamples(bit_depth);
-    CodecInOut io2{memory_manager};
-    JXL_EXPECT_OK(Roundtrip(&io, cparams, {}, &io2, _));
-
-    EXPECT_EQ(bit_depth, io2.metadata.m.bit_depth.bits_per_sample);
-    EXPECT_FALSE(io2.metadata.m.bit_depth.floating_point_sample);
-    EXPECT_EQ(0u, io2.metadata.m.bit_depth.exponent_bits_per_sample);
-    EXPECT_EQ(0u, io2.metadata.m.GetAlphaBits());
-  }
-
-  // Test various existing and non-existing floating point formats
-  for (uint32_t bit_depth = 8; bit_depth <= 32; bit_depth++) {
-    if (bit_depth != 32) {
-      // TODO(user): test other float types once they work
-      break;
-    }
-
-    uint32_t exponent_bit_depth;
-    if (bit_depth < 10) {
-      exponent_bit_depth = 2;
-    } else if (bit_depth < 12) {
-      exponent_bit_depth = 3;
-    } else if (bit_depth < 16) {
-      exponent_bit_depth = 4;
-    } else if (bit_depth < 20) {
-      exponent_bit_depth = 5;
-    } else if (bit_depth < 24) {
-      exponent_bit_depth = 6;
-    } else if (bit_depth < 28) {
-      exponent_bit_depth = 7;
-    } else {
-      exponent_bit_depth = 8;
-    }
-
-    io.metadata.m.bit_depth.bits_per_sample = bit_depth;
-    io.metadata.m.bit_depth.floating_point_sample = true;
-    io.metadata.m.bit_depth.exponent_bits_per_sample = exponent_bit_depth;
-
-    CodecInOut io2{memory_manager};
-    JXL_EXPECT_OK(Roundtrip(&io, cparams, {}, &io2));
-
-    EXPECT_EQ(bit_depth, io2.metadata.m.bit_depth.bits_per_sample);
-    EXPECT_TRUE(io2.metadata.m.bit_depth.floating_point_sample);
-    EXPECT_EQ(exponent_bit_depth,
-              io2.metadata.m.bit_depth.exponent_bits_per_sample);
-    EXPECT_EQ(0u, io2.metadata.m.GetAlphaBits());
-  }
-}
-#endif
-
-TEST(JxlTest, RoundtripGrayscale) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const std::vector<uint8_t> orig = ReadTestData(
-      "external/wesaturate/500px/cvo9xd_keong_macan_grayscale.png");
-  CodecInOut io{memory_manager};
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io));
-  ASSERT_NE(io.xsize(), 0u);
-  ASSERT_TRUE(io.ShrinkTo(128, 128));
-  EXPECT_TRUE(io.Main().IsGray());
-  EXPECT_EQ(8u, io.metadata.m.bit_depth.bits_per_sample);
-  EXPECT_FALSE(io.metadata.m.bit_depth.floating_point_sample);
-  EXPECT_EQ(0u, io.metadata.m.bit_depth.exponent_bits_per_sample);
-  EXPECT_TRUE(io.metadata.m.color_encoding.Tf().IsSRGB());
-
-  {
-    CompressParams cparams;
-    cparams.butteraugli_distance = 1.0;
-
-    std::vector<uint8_t> compressed;
-    EXPECT_TRUE(test::EncodeFile(cparams, &io, &compressed));
-    CodecInOut io2{memory_manager};
-    EXPECT_TRUE(test::DecodeFile({}, Bytes(compressed), &io2));
-    EXPECT_TRUE(io2.Main().IsGray());
-
-    EXPECT_LE(compressed.size(), 7000u);
-    EXPECT_SLIGHTLY_BELOW(
-        ButteraugliDistance(io.frames, io2.frames, ButteraugliParams(),
-                            *JxlGetDefaultCms(),
-                            /*distmap=*/nullptr),
-        1.6);
-  }
-
-  // Test with larger butteraugli distance and other settings enabled so
-  // different jxl codepaths trigger.
-  {
-    CompressParams cparams;
-    cparams.butteraugli_distance = 8.0;
-
-    std::vector<uint8_t> compressed;
-    EXPECT_TRUE(test::EncodeFile(cparams, &io, &compressed));
-    CodecInOut io2{memory_manager};
-    EXPECT_TRUE(test::DecodeFile({}, Bytes(compressed), &io2));
-    EXPECT_TRUE(io2.Main().IsGray());
-
-    EXPECT_LE(compressed.size(), 1300u);
-    EXPECT_SLIGHTLY_BELOW(
-        ButteraugliDistance(io.frames, io2.frames, ButteraugliParams(),
-                            *JxlGetDefaultCms(),
-                            /*distmap=*/nullptr),
-        6.7);
-  }
-
-  {
-    CompressParams cparams;
-    cparams.butteraugli_distance = 1.0;
-
-    std::vector<uint8_t> compressed;
-    EXPECT_TRUE(test::EncodeFile(cparams, &io, &compressed));
-
-    CodecInOut io2{memory_manager};
-    JXLDecompressParams dparams;
-    dparams.color_space = "RGB_D65_SRG_Rel_SRG";
-    EXPECT_TRUE(test::DecodeFile(dparams, Bytes(compressed), &io2));
-    EXPECT_FALSE(io2.Main().IsGray());
-
-    EXPECT_LE(compressed.size(), 7000u);
-    EXPECT_SLIGHTLY_BELOW(
-        ButteraugliDistance(io.frames, io2.frames, ButteraugliParams(),
-                            *JxlGetDefaultCms(),
-                            /*distmap=*/nullptr),
-        1.6);
-  }
-}
-
-TEST(JxlTest, RoundtripAlpha) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/tmshre_riaphotographs_alpha.png");
-  CodecInOut io{memory_manager};
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io));
-
-  ASSERT_NE(io.xsize(), 0u);
-  ASSERT_TRUE(io.metadata.m.HasAlpha());
-  ASSERT_TRUE(io.Main().HasAlpha());
-  ASSERT_TRUE(io.ShrinkTo(300, 300));
-
-  CompressParams cparams;
-  cparams.butteraugli_distance = 1.0;
-
-  EXPECT_EQ(8u, io.metadata.m.bit_depth.bits_per_sample);
-  EXPECT_FALSE(io.metadata.m.bit_depth.floating_point_sample);
-  EXPECT_EQ(0u, io.metadata.m.bit_depth.exponent_bits_per_sample);
-  EXPECT_TRUE(io.metadata.m.color_encoding.Tf().IsSRGB());
-  std::vector<uint8_t> compressed;
-  EXPECT_TRUE(test::EncodeFile(cparams, &io, &compressed));
-
-  EXPECT_LE(compressed.size(), 20000u);
-
-  for (bool use_image_callback : {false, true}) {
-    for (bool unpremul_alpha : {false, true}) {
-      CodecInOut io2{memory_manager};
-      JXLDecompressParams dparams;
-      dparams.use_image_callback = use_image_callback;
-      dparams.unpremultiply_alpha = unpremul_alpha;
-      EXPECT_TRUE(test::DecodeFile(dparams, Bytes(compressed), &io2));
-      EXPECT_SLIGHTLY_BELOW(
-          ButteraugliDistance(io.frames, io2.frames, ButteraugliParams(),
-                              *JxlGetDefaultCms(),
-                              /*distmap=*/nullptr),
-          1.15);
-    }
-  }
-}
-
-namespace {
-// Performs "PremultiplyAlpha" for each ImageBundle (preview/frames).
-Status PremultiplyAlpha(CodecInOut& io) {
-  const auto doPremultiplyAlpha = [](ImageBundle& bundle) -> Status {
-    if (!bundle.HasAlpha()) return true;
-    if (!bundle.HasColor()) return true;
-    auto* color = bundle.color();
-    const auto* alpha = bundle.alpha();
-    JXL_ENSURE(color->ysize() == alpha->ysize());
-    JXL_ENSURE(color->xsize() == alpha->xsize());
-    for (size_t y = 0; y < color->ysize(); y++) {
-      ::jxl::PremultiplyAlpha(color->PlaneRow(0, y), color->PlaneRow(1, y),
-                              color->PlaneRow(2, y), alpha->Row(y),
-                              color->xsize());
-    }
-    return true;
-  };
-  ExtraChannelInfo* eci = io.metadata.m.Find(ExtraChannel::kAlpha);
-  JXL_ENSURE(eci != nullptr && !eci->alpha_associated);
-  if (io.metadata.m.have_preview) {
-    JXL_RETURN_IF_ERROR(doPremultiplyAlpha(io.preview_frame));
-  }
-  for (ImageBundle& ib : io.frames) {
-    JXL_RETURN_IF_ERROR(doPremultiplyAlpha(ib));
-  }
-  eci->alpha_associated = true;
-  return true;
-}
-
-Status UnpremultiplyAlpha(CodecInOut& io) {
-  const auto doUnpremultiplyAlpha = [](ImageBundle& bundle) -> Status {
-    if (!bundle.HasAlpha()) return true;
-    if (!bundle.HasColor()) return true;
-    auto* color = bundle.color();
-    const auto* alpha = bundle.alpha();
-    JXL_ENSURE(color->ysize() == alpha->ysize());
-    JXL_ENSURE(color->xsize() == alpha->xsize());
-    for (size_t y = 0; y < color->ysize(); y++) {
-      ::jxl::UnpremultiplyAlpha(color->PlaneRow(0, y), color->PlaneRow(1, y),
-                                color->PlaneRow(2, y), alpha->Row(y),
-                                color->xsize());
-    }
-    return true;
-  };
-  ExtraChannelInfo* eci = io.metadata.m.Find(ExtraChannel::kAlpha);
-  JXL_ENSURE(eci != nullptr && eci->alpha_associated);
-  if (io.metadata.m.have_preview) {
-    JXL_RETURN_IF_ERROR(doUnpremultiplyAlpha(io.preview_frame));
-  }
-  for (ImageBundle& ib : io.frames) {
-    JXL_RETURN_IF_ERROR(doUnpremultiplyAlpha(ib));
-  }
-  eci->alpha_associated = false;
-  return true;
-}
-}  // namespace
-
-TEST(JxlTest, RoundtripAlphaPremultiplied) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/tmshre_riaphotographs_alpha.png");
-  CodecInOut io{memory_manager};
-  CodecInOut io_nopremul{memory_manager};
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io));
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io_nopremul));
-
-  ASSERT_NE(io.xsize(), 0u);
-  ASSERT_TRUE(io.metadata.m.HasAlpha());
-  ASSERT_TRUE(io.Main().HasAlpha());
-  ASSERT_TRUE(io.ShrinkTo(300, 300));
-  ASSERT_TRUE(io_nopremul.ShrinkTo(300, 300));
-
-  CompressParams cparams;
-  cparams.butteraugli_distance = 1.0;
-  cparams.SetCms(*JxlGetDefaultCms());
-
-  EXPECT_FALSE(io.Main().AlphaIsPremultiplied());
-  EXPECT_TRUE(PremultiplyAlpha(io));
-  EXPECT_TRUE(io.Main().AlphaIsPremultiplied());
-
-  EXPECT_FALSE(io_nopremul.Main().AlphaIsPremultiplied());
-
-  std::vector<uint8_t> compressed;
-  EXPECT_TRUE(test::EncodeFile(cparams, &io, &compressed));
-  EXPECT_LE(compressed.size(), 18000u);
-
-  for (bool use_image_callback : {false, true}) {
-    for (bool unpremul_alpha : {false, true}) {
-      for (bool use_uint8 : {false, true}) {
-        printf(
-            "Testing premultiplied alpha using %s %s requesting "
-            "%spremultiplied output.\n",
-            use_uint8 ? "uint8" : "float",
-            use_image_callback ? "image callback" : "image_buffer",
-            unpremul_alpha ? "un" : "");
-        CodecInOut io2{memory_manager};
-        JXLDecompressParams dparams;
-        dparams.use_image_callback = use_image_callback;
-        dparams.unpremultiply_alpha = unpremul_alpha;
-        if (use_uint8) {
-          dparams.accepted_formats = {
-              {4, JXL_TYPE_UINT8, JXL_LITTLE_ENDIAN, 0}};
-        }
-        EXPECT_TRUE(test::DecodeFile(dparams, Bytes(compressed), &io2));
-
-        EXPECT_EQ(unpremul_alpha, !io2.Main().AlphaIsPremultiplied());
-        if (!unpremul_alpha) {
-          EXPECT_SLIGHTLY_BELOW(
-              ButteraugliDistance(io.frames, io2.frames, ButteraugliParams(),
-                                  *JxlGetDefaultCms(),
-                                  /*distmap=*/nullptr),
-              1.111);
-          EXPECT_TRUE(UnpremultiplyAlpha(io2));
-          EXPECT_FALSE(io2.Main().AlphaIsPremultiplied());
-        }
-        EXPECT_SLIGHTLY_BELOW(
-            ButteraugliDistance(io_nopremul.frames, io2.frames,
-                                ButteraugliParams(), *JxlGetDefaultCms(),
-                                /*distmap=*/nullptr),
-            1.1);
-      }
-    }
-  }
-}
-
-TEST(JxlTest, RoundtripAlphaResampling) {
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/tmshre_riaphotographs_alpha.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  ASSERT_NE(t.ppf().info.xsize, 0);
-  ASSERT_TRUE(t.ppf().info.alpha_bits > 0);
-
-  JXLCompressParams cparams;
-  cparams.alpha_distance = 1.0;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 5);  // kHare
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_RESAMPLING, 2);
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EXTRA_CHANNEL_RESAMPLING, 2);
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool, &ppf_out), 13600, 130);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 5.0);
-}
-
-TEST(JxlTest, RoundtripAlphaResamplingOnlyAlpha) {
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/tmshre_riaphotographs_alpha.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  ASSERT_NE(t.ppf().info.xsize, 0);
-  ASSERT_TRUE(t.ppf().info.alpha_bits > 0);
-
-  JXLCompressParams cparams;
-  cparams.alpha_distance = 1.0;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 3);  // kFalcon
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EXTRA_CHANNEL_RESAMPLING, 2);
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool, &ppf_out), 33179, 1000);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 1.52);
-}
-
-TEST(JxlTest, RoundtripAlphaNonMultipleOf8) {
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/tmshre_riaphotographs_alpha.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  ASSERT_TRUE(t.SetDimensions(12, 12));
-  ASSERT_NE(t.ppf().info.xsize, 0);
-  ASSERT_TRUE(t.ppf().info.alpha_bits > 0);
-  EXPECT_EQ(t.ppf().frames[0].color.format.data_type, JXL_TYPE_UINT8);
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), {}, {}, pool, &ppf_out), 107, 10);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 0.006);
-}
-
-TEST(JxlTest, RoundtripAlpha16) {
-  ThreadPoolForTests pool(4);
-  // The image is wider than 512 pixels to ensure multiple groups are tested.
-  size_t xsize = 1200;
-  size_t ysize = 160;
-  TestImage t;
-  ASSERT_TRUE(t.SetDimensions(xsize, ysize));
-  ASSERT_TRUE(t.SetChannels(4));
-  t.SetAllBitDepths(16);
-  JXL_TEST_ASSIGN_OR_DIE(auto frame, t.AddFrame());
-  // Generate 16-bit pattern that uses various colors and alpha values.
-  const float mul = 1.0f / 65535;
-  for (size_t y = 0; y < ysize; y++) {
-    for (size_t x = 0; x < xsize; x++) {
-      uint16_t r = y * 65535 / ysize;
-      uint16_t g = x * 65535 / xsize;
-      uint16_t b = (y + x) * 65535 / (xsize + ysize);
-      ASSERT_TRUE(frame.SetValue(y, x, 0, r * mul));
-      ASSERT_TRUE(frame.SetValue(y, x, 1, g * mul));
-      ASSERT_TRUE(frame.SetValue(y, x, 2, b * mul));
-      ASSERT_TRUE(frame.SetValue(y, x, 3, g * mul));
-    }
-  }
-
-  ASSERT_NE(t.ppf().info.xsize, 0);
-  ASSERT_EQ(t.ppf().info.alpha_bits, 16);
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 6);  // kWombat
-  cparams.distance = 0.5;
-  cparams.alpha_distance = 0.5;
-
-  PackedPixelFile ppf_out;
-  // TODO(szabadka) Investigate big size difference on i686
-  // This still keeps happening (2023-04-18).
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool.get(), &ppf_out), 4013, 120);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 0.6);
-}
-
-JXL_SLOW_TEST(JxlTest, RoundtripLossless8) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/tmshre_riaphotographs_srgb8.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-
-  JXLCompressParams cparams = test::CompressParamsForLossless();
-  JXLDecompressParams dparams;
-  dparams.accepted_formats.push_back(t.ppf().frames[0].color.format);
-
-  PackedPixelFile ppf_out;
-  EXPECT_EQ(Roundtrip(t.ppf(), cparams, dparams, pool.get(), &ppf_out), 223058);
-  EXPECT_EQ(ComputeDistance2(t.ppf(), ppf_out), 0.0);
-}
-
-JXL_SLOW_TEST(JxlTest, RoundtripLossless8ThunderGradient) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/tmshre_riaphotographs_srgb8.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-
-  JXLCompressParams cparams = test::CompressParamsForLossless();
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 2);             // kThunder
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_MODULAR_PREDICTOR, 5);  // Gradient
-  JXLDecompressParams dparams;
-  dparams.accepted_formats.push_back(t.ppf().frames[0].color.format);
-
-  PackedPixelFile ppf_out;
-  EXPECT_EQ(Roundtrip(t.ppf(), cparams, dparams, pool.get(), &ppf_out), 261684);
-  EXPECT_EQ(ComputeDistance2(t.ppf(), ppf_out), 0.0);
-}
-
-JXL_SLOW_TEST(JxlTest, RoundtripLossless8LightningGradient) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/tmshre_riaphotographs_srgb8.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-
-  JXLCompressParams cparams = test::CompressParamsForLossless();
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 1);  // kLightning
-  JXLDecompressParams dparams;
-  dparams.accepted_formats.push_back(t.ppf().frames[0].color.format);
-
-  PackedPixelFile ppf_out;
-  // Lax comparison because different SIMD will cause different compression.
-  EXPECT_SLIGHTLY_BELOW(
-      Roundtrip(t.ppf(), cparams, dparams, pool.get(), &ppf_out), 286848u);
-  EXPECT_EQ(ComputeDistance2(t.ppf(), ppf_out), 0.0);
-}
-
-JXL_SLOW_TEST(JxlTest, RoundtripLossless8Falcon) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/tmshre_riaphotographs_srgb8.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-
-  JXLCompressParams cparams = test::CompressParamsForLossless();
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 3);  // kFalcon
-  JXLDecompressParams dparams;
-  dparams.accepted_formats.push_back(t.ppf().frames[0].color.format);
-
-  PackedPixelFile ppf_out;
-  EXPECT_EQ(Roundtrip(t.ppf(), cparams, dparams, pool.get(), &ppf_out), 230766);
-  EXPECT_EQ(ComputeDistance2(t.ppf(), ppf_out), 0.0);
-}
-
-TEST(JxlTest, RoundtripLossless8Alpha) {
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/tmshre_riaphotographs_alpha.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  ASSERT_EQ(t.ppf().info.alpha_bits, 8);
-  EXPECT_EQ(t.ppf().frames[0].color.format.data_type, JXL_TYPE_UINT8);
-
-  JXLCompressParams cparams = test::CompressParamsForLossless();
-
-  JXLDecompressParams dparams;
-  dparams.accepted_formats.push_back(t.ppf().frames[0].color.format);
-
-  PackedPixelFile ppf_out;
-  EXPECT_EQ(Roundtrip(t.ppf(), cparams, dparams, pool, &ppf_out), 251470);
-  EXPECT_EQ(ComputeDistance2(t.ppf(), ppf_out), 0.0);
-  EXPECT_EQ(ppf_out.info.alpha_bits, 8);
-  EXPECT_TRUE(test::SameAlpha(t.ppf(), ppf_out));
-}
-
-TEST(JxlTest, RoundtripLossless16Alpha) {
-  ThreadPool* pool = nullptr;
-  size_t xsize = 1200;
-  size_t ysize = 160;
-  TestImage t;
-  ASSERT_TRUE(t.SetDimensions(xsize, ysize));
-  ASSERT_TRUE(t.SetChannels(4));
-  t.SetAllBitDepths(16);
-  JXL_TEST_ASSIGN_OR_DIE(auto frame, t.AddFrame());
-  frame.ZeroFill();
-  // Generate 16-bit pattern that uses various colors and alpha values.
-  const float mul = 1.0f / 65535;
-  for (size_t y = 0; y < ysize; y++) {
-    for (size_t x = 0; x < xsize; x++) {
-      uint16_t r = y * 65535 / ysize;
-      uint16_t g = x * 65535 / xsize + 37;
-      uint16_t b = (y + x) * 65535 / (xsize + ysize);
-      ASSERT_TRUE(frame.SetValue(y, x, 0, r * mul));
-      ASSERT_TRUE(frame.SetValue(y, x, 1, g * mul));
-      ASSERT_TRUE(frame.SetValue(y, x, 2, b * mul));
-      ASSERT_TRUE(frame.SetValue(y, x, 3, g * mul));
-    }
-  }
-  ASSERT_EQ(t.ppf().info.bits_per_sample, 16);
-  ASSERT_EQ(t.ppf().info.alpha_bits, 16);
-
-  JXLCompressParams cparams = test::CompressParamsForLossless();
-
-  JXLDecompressParams dparams;
-  dparams.accepted_formats.push_back(t.ppf().frames[0].color.format);
-
-  PackedPixelFile ppf_out;
-  // TODO(szabadka) Investigate big size difference on i686
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, dparams, pool, &ppf_out), 4665, 100);
-  EXPECT_EQ(ComputeDistance2(t.ppf(), ppf_out), 0.0);
-  EXPECT_EQ(ppf_out.info.alpha_bits, 16);
-  EXPECT_TRUE(test::SameAlpha(t.ppf(), ppf_out));
-}
-
-TEST(JxlTest, RoundtripLossless16AlphaNotMisdetectedAs8Bit) {
-  ThreadPool* pool = nullptr;
-  size_t xsize = 128;
-  size_t ysize = 128;
-  TestImage t;
-  ASSERT_TRUE(t.SetDimensions(xsize, ysize));
-  ASSERT_TRUE(t.SetChannels(4));
-  t.SetAllBitDepths(16);
-  JXL_TEST_ASSIGN_OR_DIE(auto frame, t.AddFrame());
-  // All 16-bit values, both color and alpha, of this image are below 64.
-  // This allows testing if a code path wrongly concludes it's an 8-bit instead
-  // of 16-bit image (or even 6-bit).
-  const float mul = 1.0f / 65535;
-  for (size_t y = 0; y < ysize; y++) {
-    for (size_t x = 0; x < xsize; x++) {
-      uint16_t r = y * 64 / ysize;
-      uint16_t g = x * 64 / xsize + 37;
-      uint16_t b = (y + x) * 64 / (xsize + ysize);
-      ASSERT_TRUE(frame.SetValue(y, x, 0, r * mul));
-      ASSERT_TRUE(frame.SetValue(y, x, 1, g * mul));
-      ASSERT_TRUE(frame.SetValue(y, x, 2, b * mul));
-      ASSERT_TRUE(frame.SetValue(y, x, 3, g * mul));
-    }
-  }
-  ASSERT_EQ(t.ppf().info.bits_per_sample, 16);
-  ASSERT_EQ(t.ppf().info.alpha_bits, 16);
-
-  JXLCompressParams cparams = test::CompressParamsForLossless();
-
-  JXLDecompressParams dparams;
-  dparams.accepted_formats.push_back(t.ppf().frames[0].color.format);
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, dparams, pool, &ppf_out), 280, 50);
-  EXPECT_EQ(ComputeDistance2(t.ppf(), ppf_out), 0.0);
-  EXPECT_EQ(ppf_out.info.bits_per_sample, 16);
-  EXPECT_EQ(ppf_out.info.alpha_bits, 16);
-  EXPECT_TRUE(test::SameAlpha(t.ppf(), ppf_out));
-}
-
-TEST(JxlTest, RoundtripDots) {
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/cvo9xd_keong_macan_srgb8.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  ASSERT_NE(t.ppf().info.xsize, 0);
-  EXPECT_EQ(t.ppf().info.bits_per_sample, 8);
-  EXPECT_EQ(t.ppf().color_encoding.transfer_function,
-            JXL_TRANSFER_FUNCTION_SRGB);
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 7);  // kSquirrel
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_DOTS, 1);
-  cparams.distance = 0.04;
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool, &ppf_out), 276166, 4000);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 0.14);
-}
-
-TEST(JxlTest, RoundtripDisablePerceptual) {
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig = ReadTestData("jxl/flower/flower.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  ASSERT_NE(t.ppf().info.xsize, 0);
-  EXPECT_EQ(t.ppf().info.bits_per_sample, 8);
-  EXPECT_EQ(t.ppf().color_encoding.transfer_function,
-            JXL_TRANSFER_FUNCTION_SRGB);
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 7);  // kSquirrel
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_DISABLE_PERCEPTUAL_HEURISTICS, 1);
-  cparams.distance = 1.0;
-
-  PackedPixelFile ppf_out;
-
-  size_t expected_size = 477778;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool, &ppf_out), expected_size,
-              4000);
-  // TODO(veluca): figure out why we can't get below this value.
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 11.0);
-}
-
-TEST(JxlTest, RoundtripNoise) {
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  ASSERT_NE(t.ppf().info.xsize, 0);
-  EXPECT_EQ(t.ppf().info.bits_per_sample, 8);
-  EXPECT_EQ(t.ppf().color_encoding.transfer_function,
-            JXL_TRANSFER_FUNCTION_SRGB);
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 7);  // kSquirrel
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_NOISE, 1);
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool, &ppf_out), 41009, 750);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 1.42);
-}
-
-TEST(JxlTest, RoundtripLossless8Gray) {
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig = ReadTestData(
-      "external/wesaturate/500px/cvo9xd_keong_macan_grayscale.png");
-  TestImage t;
-  ASSERT_TRUE(t.SetColorEncoding("Gra_D65_Rel_SRG"));
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  EXPECT_EQ(t.ppf().color_encoding.color_space, JXL_COLOR_SPACE_GRAY);
-  EXPECT_EQ(t.ppf().info.bits_per_sample, 8);
-
-  JXLCompressParams cparams = test::CompressParamsForLossless();
-
-  JXLDecompressParams dparams;
-  dparams.accepted_formats.push_back(t.ppf().frames[0].color.format);
-
-  PackedPixelFile ppf_out;
-  EXPECT_EQ(Roundtrip(t.ppf(), cparams, dparams, pool, &ppf_out), 92185);
-  EXPECT_EQ(ComputeDistance2(t.ppf(), ppf_out), 0.0);
-  EXPECT_EQ(ppf_out.color_encoding.color_space, JXL_COLOR_SPACE_GRAY);
-  EXPECT_EQ(ppf_out.info.bits_per_sample, 8);
-}
-
-TEST(JxlTest, RoundtripAnimation) {
-  if (!jxl::extras::CanDecode(jxl::extras::Codec::kGIF)) {
-    fprintf(stderr, "Skipping test because of missing GIF decoder.\n");
-    return;
-  }
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig = ReadTestData("jxl/traffic_light.gif");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  EXPECT_EQ(4, t.ppf().frames.size());
-
-  JXLDecompressParams dparams;
-  dparams.accepted_formats.push_back(t.ppf().frames[0].color.format);
-
-  PackedPixelFile ppf_out;
-  EXPECT_SLIGHTLY_BELOW(Roundtrip(t.ppf(), {}, dparams, pool, &ppf_out), 3370);
-
-  ASSERT_TRUE(t.CoalesceGIFAnimationWithAlpha());
-  ASSERT_EQ(ppf_out.frames.size(), t.ppf().frames.size());
-  static constexpr double kMaxButteraugli =
-#if JXL_HIGH_PRECISION
-      1.55;
-#else
-      1.75;
-#endif
-  EXPECT_LE(ButteraugliDistance(t.ppf(), ppf_out), kMaxButteraugli);
-}
-
-TEST(JxlTest, RoundtripLosslessAnimation) {
-  if (!jxl::extras::CanDecode(jxl::extras::Codec::kGIF)) {
-    fprintf(stderr, "Skipping test because of missing GIF decoder.\n");
-    return;
-  }
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig = ReadTestData("jxl/traffic_light.gif");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  EXPECT_EQ(4, t.ppf().frames.size());
-
-  JXLCompressParams cparams = test::CompressParamsForLossless();
-
-  JXLDecompressParams dparams;
-  dparams.accepted_formats.push_back(t.ppf().frames[0].color.format);
-
-  PackedPixelFile ppf_out;
-  EXPECT_SLIGHTLY_BELOW(Roundtrip(t.ppf(), cparams, dparams, pool, &ppf_out),
-                        958);
-
-  ASSERT_TRUE(t.CoalesceGIFAnimationWithAlpha());
-  ASSERT_EQ(ppf_out.frames.size(), t.ppf().frames.size());
-  EXPECT_LE(ButteraugliDistance(t.ppf(), ppf_out), 5e-4);
-}
-
-TEST(JxlTest, RoundtripAnimationPatches) {
-  if (!jxl::extras::CanDecode(jxl::extras::Codec::kGIF)) {
-    fprintf(stderr, "Skipping test because of missing GIF decoder.\n");
-    return;
-  }
-  ThreadPool* pool = nullptr;
-  const std::vector<uint8_t> orig = ReadTestData("jxl/animation_patches.gif");
-
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  ASSERT_EQ(2u, t.ppf().frames.size());
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_PATCHES, 1);
-
-  JXLDecompressParams dparams;
-  dparams.accepted_formats.push_back(t.ppf().frames[0].color.format);
-
-  PackedPixelFile ppf_out;
-  // 40k with no patches, 27k with patch frames encoded multiple times.
-  EXPECT_SLIGHTLY_BELOW(Roundtrip(t.ppf(), cparams, dparams, pool, &ppf_out),
-                        21220);
-  EXPECT_EQ(ppf_out.frames.size(), t.ppf().frames.size());
-  // >10 with broken patches; not all patches are detected on borders.
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 1.85);
-}
-
-size_t RoundtripJpeg(const std::vector<uint8_t>& jpeg_in, ThreadPool* pool) {
-  std::vector<uint8_t> compressed;
-  EXPECT_TRUE(extras::EncodeImageJXL({}, extras::PackedPixelFile(), &jpeg_in,
-                                     &compressed));
-
-  jxl::JXLDecompressParams dparams;
-  test::SetThreadParallelRunner(dparams, pool);
-  {
-    std::vector<uint8_t> out;
-    jxl::PackedPixelFile ppf;
-    EXPECT_FALSE(DecodeImageJXL(compressed.data(), compressed.size() - 1,
-                                dparams, nullptr, &ppf, &out));
-  }
-  std::vector<uint8_t> out;
-  jxl::PackedPixelFile ppf;
-  EXPECT_TRUE(DecodeImageJXL(compressed.data(), compressed.size(), dparams,
-                             nullptr, &ppf, &out));
-  EXPECT_EQ(out.size(), jpeg_in.size());
-  size_t failures = 0;
-  for (size_t i = 0; i < std::min(out.size(), jpeg_in.size()); i++) {
-    if (out[i] != jpeg_in[i]) {
-      EXPECT_EQ(out[i], jpeg_in[i])
-          << "byte mismatch " << i << " " << out[i] << " != " << jpeg_in[i];
-      if (++failures > 4) {
-        return compressed.size();
-      }
-    }
-  }
-  return compressed.size();
-}
-
-void RoundtripJpegToPixels(const std::vector<uint8_t>& jpeg_in,
-                           JXLDecompressParams dparams, ThreadPool* pool,
-                           PackedPixelFile* ppf_out) {
-  std::vector<uint8_t> jpeg_bytes(jpeg_in.data(),
-                                  jpeg_in.data() + jpeg_in.size());
-  std::vector<uint8_t> compressed;
-  EXPECT_TRUE(extras::EncodeImageJXL({}, extras::PackedPixelFile(), &jpeg_bytes,
-                                     &compressed));
-
-  test::DefaultAcceptedFormats(dparams);
-  test::SetThreadParallelRunner(dparams, pool);
-  EXPECT_TRUE(DecodeImageJXL(compressed.data(), compressed.size(), dparams,
-                             nullptr, ppf_out, nullptr));
-}
-
-JXL_TRANSCODE_JPEG_TEST(JxlTest, RoundtripJpegRecompression444) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("jxl/flower/flower.png.im_q85_444.jpg");
-  // JPEG size is 696,659 bytes.
-  EXPECT_NEAR(RoundtripJpeg(orig, pool.get()), 568891u, 20);
-}
-
-JXL_TRANSCODE_JPEG_TEST(JxlTest, RoundtripJpegRecompressionToPixels) {
-  TEST_LIBJPEG_SUPPORT();
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("jxl/flower/flower.png.im_q85_444.jpg");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-
-  PackedPixelFile ppf_out;
-  RoundtripJpegToPixels(orig, {}, pool.get(), &ppf_out);
-  EXPECT_SLIGHTLY_BELOW(ComputeDistance2(t.ppf(), ppf_out), 12);
-}
-
-JXL_TRANSCODE_JPEG_TEST(JxlTest, RoundtripJpegRecompressionToPixels420) {
-  TEST_LIBJPEG_SUPPORT();
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("jxl/flower/flower.png.im_q85_420.jpg");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-
-  PackedPixelFile ppf_out;
-  RoundtripJpegToPixels(orig, {}, pool.get(), &ppf_out);
-  EXPECT_SLIGHTLY_BELOW(ComputeDistance2(t.ppf(), ppf_out), 11);
-}
-
-JXL_TRANSCODE_JPEG_TEST(JxlTest,
-                        RoundtripJpegRecompressionToPixels420EarlyFlush) {
-  TEST_LIBJPEG_SUPPORT();
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("jxl/flower/flower.png.im_q85_420.jpg");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-
-  JXLDecompressParams dparams;
-  dparams.max_downsampling = 8;
-
-  PackedPixelFile ppf_out;
-  RoundtripJpegToPixels(orig, dparams, pool.get(), &ppf_out);
-  EXPECT_SLIGHTLY_BELOW(ComputeDistance2(t.ppf(), ppf_out), 4410);
-}
-
-JXL_TRANSCODE_JPEG_TEST(JxlTest, RoundtripJpegRecompressionToPixels420Mul16) {
-  TEST_LIBJPEG_SUPPORT();
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("jxl/flower/flower_cropped.jpg");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-
-  PackedPixelFile ppf_out;
-  RoundtripJpegToPixels(orig, {}, pool.get(), &ppf_out);
-  EXPECT_SLIGHTLY_BELOW(ComputeDistance2(t.ppf(), ppf_out), 4);
-}
-
-JXL_TRANSCODE_JPEG_TEST(JxlTest, RoundtripJpegRecompressionToPixelsAsymmetric) {
-  TEST_LIBJPEG_SUPPORT();
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("jxl/flower/flower.png.im_q85_asymmetric.jpg");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-
-  PackedPixelFile ppf_out;
-  RoundtripJpegToPixels(orig, {}, pool.get(), &ppf_out);
-  EXPECT_SLIGHTLY_BELOW(ComputeDistance2(t.ppf(), ppf_out), 10);
-}
-
-JXL_TRANSCODE_JPEG_TEST(JxlTest, RoundtripJpegRecompressionGray) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("jxl/flower/flower.png.im_q85_gray.jpg");
-  // JPEG size is 456,528 bytes.
-  EXPECT_NEAR(RoundtripJpeg(orig, pool.get()), 387496u, 200);
-}
-
-JXL_TRANSCODE_JPEG_TEST(JxlTest, RoundtripJpegRecompression420) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("jxl/flower/flower.png.im_q85_420.jpg");
-  // JPEG size is 546,797 bytes.
-  EXPECT_NEAR(RoundtripJpeg(orig, pool.get()), 455510u, 20);
-}
-
-JXL_TRANSCODE_JPEG_TEST(JxlTest, RoundtripJpegRecompressionLumaSubsample) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("jxl/flower/flower.png.im_q85_luma_subsample.jpg");
-  // JPEG size is 400,724 bytes.
-  EXPECT_NEAR(RoundtripJpeg(orig, pool.get()), 325310u, 20);
-}
-
-JXL_TRANSCODE_JPEG_TEST(JxlTest, RoundtripJpegRecompression444wh12) {
-  // 444 JPEG that has an interesting sampling-factor (1x2, 1x2, 1x2).
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("jxl/flower/flower.png.im_q85_444_1x2.jpg");
-  // JPEG size is 703,874 bytes.
-  EXPECT_NEAR(RoundtripJpeg(orig, pool.get()), 569630u, 20);
-}
-
-JXL_TRANSCODE_JPEG_TEST(JxlTest, RoundtripJpegRecompression422) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("jxl/flower/flower.png.im_q85_422.jpg");
-  // JPEG size is 522,057 bytes.
-  EXPECT_NEAR(RoundtripJpeg(orig, pool.get()), 499236u, 20);
-}
-
-JXL_TRANSCODE_JPEG_TEST(JxlTest, RoundtripJpegRecompression440) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("jxl/flower/flower.png.im_q85_440.jpg");
-  // JPEG size is 603,623 bytes.
-  EXPECT_NEAR(RoundtripJpeg(orig, pool.get()), 501101u, 20);
-}
-
-JXL_TRANSCODE_JPEG_TEST(JxlTest, RoundtripJpegRecompressionAsymmetric) {
-  // 2x vertical downsample of one chroma channel, 2x horizontal downsample of
-  // the other.
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("jxl/flower/flower.png.im_q85_asymmetric.jpg");
-  // JPEG size is 604,601 bytes.
-  EXPECT_NEAR(RoundtripJpeg(orig, pool.get()), 500548u, 20);
-}
-
-JXL_TRANSCODE_JPEG_TEST(JxlTest, RoundtripJpegRecompression420Progr) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("jxl/flower/flower.png.im_q85_420_progr.jpg");
-  // JPEG size is 522,057 bytes.
-  EXPECT_NEAR(RoundtripJpeg(orig, pool.get()), 455454u, 20);
-}
-
-JXL_TRANSCODE_JPEG_TEST(JxlTest, RoundtripJpegRecompressionMetadata) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("jxl/jpeg_reconstruction/1x1_exif_xmp.jpg");
-  // JPEG size is 4290 bytes
-  // 1370 on 386, so higher margin.
-  EXPECT_NEAR(RoundtripJpeg(orig, pool.get()), 1334u, 100);
-}
-
-JXL_TRANSCODE_JPEG_TEST(JxlTest, RoundtripJpegRecompressionEmptyExif) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig = {
-      // SOI
-      0xff, 0xd8,  //
-      // APP1
-      0xff, 0xe1, 0x00, 0x08, 0x45, 0x78, 0x69, 0x66, 0x00, 0x00,  //
-      // DQT
-      0xff, 0xdb, 0x00, 0x43, 0x00, 0x03, 0x02, 0x02, 0x03, 0x02,  //
-      0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x03, 0x03, 0x04, 0x05,  //
-      0x08, 0x05, 0x05, 0x04, 0x04, 0x05, 0x0a, 0x07, 0x07, 0x06,  //
-      0x08, 0x0c, 0x0a, 0x0c, 0x0c, 0x0b, 0x0a, 0x0b, 0x0b, 0x0d,  //
-      0x0e, 0x12, 0x10, 0x0d, 0x0e, 0x11, 0x0e, 0x0b, 0x0b, 0x10,  //
-      0x16, 0x10, 0x11, 0x13, 0x14, 0x15, 0x15, 0x15, 0x0c, 0x0f,  //
-      0x17, 0x18, 0x16, 0x14, 0x18, 0x12, 0x14, 0x15, 0x14,        //
-      // SOF
-      0xff, 0xc0, 0x00, 0x0b, 0x08, 0x00, 0x01, 0x00, 0x01, 0x01,  //
-      0x01, 0x11, 0x00,                                            //
-      // DHT
-      0xff, 0xc4, 0x00, 0xd2, 0x00, 0x00, 0x01, 0x05, 0x01, 0x01,  //
-      0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  //
-      0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,  //
-      0x09, 0x0a, 0x0b, 0x10, 0x00, 0x02, 0x01, 0x03, 0x03, 0x02,  //
-      0x04, 0x03, 0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7d,  //
-      0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 0x21, 0x31,  //
-      0x41, 0x06, 0x13, 0x51, 0x61, 0x07, 0x22, 0x71, 0x14, 0x32,  //
-      0x81, 0x91, 0xa1, 0x08, 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52,  //
-      0xd1, 0xf0, 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,  //
-      0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a,  //
-      0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x43, 0x44, 0x45,  //
-      0x46, 0x47, 0x48, 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57,  //
-      0x58, 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,  //
-      0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x83,  //
-      0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94,  //
-      0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,  //
-      0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,  //
-      0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,  //
-      0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8,  //
-      0xd9, 0xda, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8,  //
-      0xe9, 0xea, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,  //
-      0xf9, 0xfa,                                                  //
-      // SOS
-      0xff, 0xda, 0x00, 0x08, 0x01, 0x01, 0x00, 0x00, 0x3f, 0x00,  //
-      // entropy coded data
-      0xfc, 0xaa, 0xaf,  //
-      // EOI
-      0xff, 0xd9,  //
-  };
-  EXPECT_NEAR(RoundtripJpeg(orig, pool.get()), 466u, 100);
-}
-
-JXL_TRANSCODE_JPEG_TEST(JxlTest, RoundtripJpegRecompressionRestarts) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("jxl/jpeg_reconstruction/bicycles_restarts.jpg");
-  // JPEG size is 87478 bytes
-  EXPECT_NEAR(RoundtripJpeg(orig, pool.get()), 76054u, 30);
-}
-
-JXL_TRANSCODE_JPEG_TEST(JxlTest, RoundtripJpegRecompressionOrientationICC) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("jxl/jpeg_reconstruction/sideways_bench.jpg");
-  // JPEG size is 15252 bytes
-  EXPECT_NEAR(RoundtripJpeg(orig, pool.get()), 12000u, 470);
-  // TODO(jon): investigate why 'Cross-compiling i686-linux-gnu' produces a
-  // larger result
-}
-
-TEST(JxlTest, RoundtripProgressive) {
-  ThreadPoolForTests pool(4);
-  const std::vector<uint8_t> orig = ReadTestData("jxl/flower/flower.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  ASSERT_TRUE(t.SetDimensions(600, 1024));
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_PROGRESSIVE_DC, 1);
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_PROGRESSIVE_AC, 1);
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_RESPONSIVE, 1);
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool.get(), &ppf_out), 71544,
-              750);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 1.4);
-}
-
-TEST(JxlTest, RoundtripProgressiveLevel2Slow) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig = ReadTestData("jxl/flower/flower.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  ASSERT_TRUE(t.SetDimensions(600, 1024));
-
-  JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 9);  // kTortoise
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_PROGRESSIVE_DC, 2);
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_PROGRESSIVE_AC, 1);
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_RESPONSIVE, 1);
-
-  PackedPixelFile ppf_out;
-  EXPECT_NEAR(Roundtrip(t.ppf(), cparams, {}, pool.get(), &ppf_out), 76666,
-              1000);
-  EXPECT_SLIGHTLY_BELOW(ButteraugliDistance(t.ppf(), ppf_out), 1.17);
-}
-
-TEST(JxlTest, RoundtripUnsignedCustomBitdepthLossless) {
-  ThreadPool* pool = nullptr;
-  for (uint32_t num_channels = 1; num_channels < 6; ++num_channels) {
-    for (JxlEndianness endianness : {JXL_LITTLE_ENDIAN, JXL_BIG_ENDIAN}) {
-      for (uint32_t bitdepth = 3; bitdepth <= 16; ++bitdepth) {
-        if (bitdepth <= 8 && endianness == JXL_BIG_ENDIAN) continue;
-        printf("Testing %u channel unsigned %u bit %s endian lossless.\n",
-               num_channels, bitdepth,
-               endianness == JXL_LITTLE_ENDIAN ? "little" : "big");
-        TestImage t;
-        ASSERT_TRUE(t.SetDimensions(256, 256));
-        ASSERT_TRUE(t.SetChannels(num_channels));
-        t.SetAllBitDepths(bitdepth).SetEndianness(endianness);
-        JXL_TEST_ASSIGN_OR_DIE(auto frame, t.AddFrame());
-        frame.RandomFill();
-        t.ppf().input_bitdepth.type = JXL_BIT_DEPTH_FROM_CODESTREAM;
-
-        JXLCompressParams cparams = test::CompressParamsForLossless();
-
-        JXLDecompressParams dparams;
-        dparams.accepted_formats.push_back(t.ppf().frames[0].color.format);
-        dparams.output_bitdepth.type = JXL_BIT_DEPTH_FROM_CODESTREAM;
-
-        PackedPixelFile ppf_out;
-        Roundtrip(t.ppf(), cparams, dparams, pool, &ppf_out);
-
-        ASSERT_TRUE(test::SamePixels(t.ppf(), ppf_out));
-      }
-    }
-  }
-}
-
-TEST(JxlTest, LosslessPNMRoundtrip) {
-  static const char* kChannels[] = {"", "g", "ga", "rgb", "rgba"};
-  static const char* kExtension[] = {"", ".pgm", ".pam", ".ppm", ".pam"};
-  for (size_t bit_depth = 1; bit_depth <= 16; ++bit_depth) {
-    for (size_t channels = 1; channels <= 4; ++channels) {
-      if (bit_depth == 1 && (channels == 2 || channels == 4)) continue;
-      std::string extension(kExtension[channels]);
-      std::string filename = "jxl/flower/flower_small." +
-                             std::string(kChannels[channels]) + ".depth" +
-                             std::to_string(bit_depth) + extension;
-      const std::vector<uint8_t> orig = ReadTestData(filename);
-      test::TestImage t;
-      if (channels < 3) {
-        ASSERT_TRUE(t.SetColorEncoding("Gra_D65_Rel_SRG"));
-      }
-      ASSERT_TRUE(t.DecodeFromBytes(orig));
-
-      JXLCompressParams cparams = test::CompressParamsForLossless();
-      cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 1);  // kLightning
-
-      JXLDecompressParams dparams;
-      dparams.accepted_formats.push_back(t.ppf().frames[0].color.format);
-      dparams.output_bitdepth.type = JXL_BIT_DEPTH_FROM_CODESTREAM;
-
-      PackedPixelFile ppf_out;
-      Roundtrip(t.ppf(), cparams, dparams, nullptr, &ppf_out);
-
-      extras::EncodedImage encoded;
-      auto encoder = extras::Encoder::FromExtension(extension);
-      ASSERT_TRUE(encoder.get());
-      ASSERT_TRUE(encoder->Encode(ppf_out, &encoded, nullptr));
-      ASSERT_EQ(encoded.bitstreams.size(), 1);
-      ASSERT_EQ(orig.size(), encoded.bitstreams[0].size());
-      EXPECT_EQ(0,
-                memcmp(orig.data(), encoded.bitstreams[0].data(), orig.size()));
-    }
-  }
-}
-
-class JxlTest : public ::testing::TestWithParam<const char*> {};
-
-TEST_P(JxlTest, LosslessSmallFewColors) {
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig = ReadTestData(GetParam());
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-
-  JXLCompressParams cparams;
-  cparams.distance = 0;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 1);
-  JXLDecompressParams dparams;
-  dparams.accepted_formats.push_back(t.ppf().frames[0].color.format);
-
-  PackedPixelFile ppf_out;
-  Roundtrip(t.ppf(), cparams, dparams, pool.get(), &ppf_out);
-  EXPECT_EQ(ComputeDistance2(t.ppf(), ppf_out), 0.0);
-}
-
-JXL_GTEST_INSTANTIATE_TEST_SUITE_P(
-    ImageTests, JxlTest,
-    ::testing::Values("jxl/blending/cropped_traffic_light_frame-0.png",
-                      "palette/358colors.png"));
-
-struct StreamingTestParam {
-  size_t xsize;
-  size_t ysize;
-  bool is_grey;
-  bool has_alpha;
-  int effort;
-  bool progressive;
-
-  size_t num_channels() const {
-    return (is_grey ? 1 : 3) + (has_alpha ? 1 : 0);
-  }
-
-  float max_psnr() const { return is_grey ? 90 : 50; }
-
-  static std::vector<StreamingTestParam> All() {
-    std::vector<StreamingTestParam> params;
-    for (int e : {1, 3, 4, 7}) {
-      for (bool g : {false, true}) {
-        params.push_back(StreamingTestParam{357, 517, g, false, e, false});
-        params.push_back(StreamingTestParam{2247, 2357, g, false, e, false});
-      }
-    }
-    params.push_back(StreamingTestParam{2247, 2357, false, false, 1, true});
-    params.push_back(StreamingTestParam{2247, 2157, false, false, 5, false});
-    params.push_back(StreamingTestParam{2247, 2157, false, true, 5, false});
-    return params;
-  }
-};
-
-std::ostream& operator<<(std::ostream& out, StreamingTestParam p) {
-  out << (p.is_grey ? "Grey" : "RGB");
-  out << p.xsize << "x" << p.ysize;
-  out << "e" << p.effort;
-  if (p.progressive) {
-    out << "Progressive";
-  }
-  return out;
-}
-
-class JxlStreamingTest : public ::testing::TestWithParam<StreamingTestParam> {};
-
-TEST_P(JxlStreamingTest, Roundtrip) {
-  const StreamingTestParam& p = GetParam();
-
-  jxl::test::TestImage image;
-  ASSERT_TRUE(image.SetDimensions(p.xsize, p.ysize));
-  image.SetDataType(JXL_TYPE_UINT8);
-  ASSERT_TRUE(image.SetChannels(p.num_channels()));
-  image.SetAllBitDepths(8);
-  JXL_TEST_ASSIGN_OR_DIE(auto frame, image.AddFrame());
-  frame.RandomFill();
-  JXLCompressParams cparams;
-  cparams.distance = 0.1;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, p.effort);
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_BUFFERING, 3);
-  if (p.progressive) {
-    cparams.AddOption(JXL_ENC_FRAME_SETTING_PROGRESSIVE_AC, 1);
-  }
-
-  ThreadPoolForTests pool(8);
-  PackedPixelFile ppf_out;
-  Roundtrip(image.ppf(), cparams, {}, pool.get(), &ppf_out);
-  EXPECT_GT(jxl::test::ComputePSNR(image.ppf(), ppf_out), p.max_psnr());
-}
-
-JXL_GTEST_INSTANTIATE_TEST_SUITE_P(
-    JxlStreamingTest, JxlStreamingTest,
-    testing::ValuesIn(StreamingTestParam::All()));
-
-struct StreamingEncodingTestParam {
-  std::string file;
-  int effort;
-  float distance;
-  int group_size;
-  float palette_percent;
-
-  static std::vector<StreamingEncodingTestParam> All() {
-    std::vector<StreamingEncodingTestParam> params;
-    for (const auto* file :
-         {"jxl/flower/flower.png", "jxl/flower/flower_alpha.png"}) {
-      for (int effort : {1, 3, 5, 6}) {
-        if (effort != 1) {
-          params.push_back(
-              StreamingEncodingTestParam{file, effort, 1.0, 1, -1});
-          params.push_back(
-              StreamingEncodingTestParam{file, effort, 4.0, 1, -1});
-        }
-        for (auto group_size : {-1, 0}) {
-          for (float palette_percent : {-1, 50, 100}) {
-            params.push_back(StreamingEncodingTestParam{
-                file, effort, 0.0, group_size, palette_percent});
-          }
-        }
-      }
-    }
-    return params;
-  }
-};
-
-std::ostream& operator<<(std::ostream& out,
-                         const StreamingEncodingTestParam& p) {
-  out << p.file << "-";
-  out << "e" << p.effort;
-  if (p.distance == 0) {
-    out << "Lossless";
-    out << "G" << p.group_size << "P" << p.palette_percent;
-  } else {
-    out << "D" << p.distance;
-  }
-  return out;
-}
-
-class JxlStreamingEncodingTest
-    : public ::testing::TestWithParam<StreamingEncodingTestParam> {};
-
-// This is broken on mingw32, so we only enable it for x86_64 now.
-JXL_X86_64_TEST_P(JxlStreamingEncodingTest, StreamingSamePixels) {
-  const auto param = GetParam();
-
-  const std::vector<uint8_t> orig = ReadTestData(param.file);
-  jxl::test::TestImage image;
-  ASSERT_TRUE(image.DecodeFromBytes(orig));
-
-  JXLCompressParams cparams;
-  cparams.distance = param.distance;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, param.effort);
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_MODULAR_GROUP_SIZE, param.group_size);
-  cparams.AddFloatOption(JXL_ENC_FRAME_SETTING_CHANNEL_COLORS_GROUP_PERCENT,
-                         param.palette_percent);
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_USE_FULL_IMAGE_HEURISTICS, 0);
-
-  ThreadPoolForTests pool(8);
-  PackedPixelFile ppf_out;
-  Roundtrip(image.ppf(), cparams, {}, pool.get(), &ppf_out);
-
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_BUFFERING, 3);
-  PackedPixelFile ppf_out_streaming;
-  Roundtrip(image.ppf(), cparams, {}, pool.get(), &ppf_out_streaming);
-
-  EXPECT_TRUE(jxl::test::SamePixels(ppf_out, ppf_out_streaming));
-}
-
-JXL_GTEST_INSTANTIATE_TEST_SUITE_P(
-    JxlStreamingTest, JxlStreamingEncodingTest,
-    testing::ValuesIn(StreamingEncodingTestParam::All()));
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/lehmer_code.h b/third_party/jpeg-xl/lib/jxl/lehmer_code.h
deleted file mode 100644
index c2de2981c77cc..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/lehmer_code.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_LEHMER_CODE_H_
-#define LIB_JXL_LEHMER_CODE_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-// Permutation <=> factorial base representation (Lehmer code).
-
-using LehmerT = uint32_t;
-
-template <typename T>
-constexpr T ValueOfLowest1Bit(T t) {
-  return t & -t;
-}
-
-// Computes the Lehmer (factorial basis) code of permutation, an array of n
-// unique indices in [0..n), and stores it in code[0..len). N*logN time.
-// temp must have n + 1 elements but need not be initialized.
-template <typename PermutationT>
-Status ComputeLehmerCode(const PermutationT* JXL_RESTRICT permutation,
-                         uint32_t* JXL_RESTRICT temp, const size_t n,
-                         LehmerT* JXL_RESTRICT code) {
-  for (size_t idx = 0; idx < n + 1; ++idx) temp[idx] = 0;
-
-  for (size_t idx = 0; idx < n; ++idx) {
-    const PermutationT s = permutation[idx];
-
-    // Compute sum in Fenwick tree
-    uint32_t penalty = 0;
-    uint32_t i = s + 1;
-    while (i != 0) {
-      penalty += temp[i];
-      i &= i - 1;  // clear lowest bit
-    }
-    JXL_ENSURE(s >= penalty);
-    code[idx] = s - penalty;
-    i = s + 1;
-    // Add operation in Fenwick tree
-    while (i < n + 1) {
-      temp[i] += 1;
-      i += ValueOfLowest1Bit(i);
-    }
-  }
-  return true;
-}
-
-// Decodes the Lehmer code in code[0..n) into permutation[0..n).
-// temp must have 1 << CeilLog2(n) elements but need not be initialized.
-template <typename PermutationT>
-Status DecodeLehmerCode(const LehmerT* JXL_RESTRICT code,
-                        uint32_t* JXL_RESTRICT temp, size_t n,
-                        PermutationT* JXL_RESTRICT permutation) {
-  JXL_ENSURE(n != 0);
-  const size_t log2n = CeilLog2Nonzero(n);
-  const size_t padded_n = 1ull << log2n;
-
-  for (size_t i = 0; i < padded_n; i++) {
-    const int32_t i1 = static_cast<int32_t>(i + 1);
-    temp[i] = static_cast<uint32_t>(ValueOfLowest1Bit(i1));
-  }
-
-  for (size_t i = 0; i < n; i++) {
-    JXL_ENSURE(code[i] + i < n);
-    uint32_t rank = code[i] + 1;
-
-    // Extract i-th unused element via implicit order-statistics tree.
-    size_t bit = padded_n;
-    size_t next = 0;
-    for (size_t i = 0; i <= log2n; i++) {
-      const size_t cand = next + bit;
-      JXL_ENSURE(cand >= 1);
-      bit >>= 1;
-      if (temp[cand - 1] < rank) {
-        next = cand;
-        rank -= temp[cand - 1];
-      }
-    }
-
-    permutation[i] = next;
-
-    // Mark as used
-    next += 1;
-    while (next <= padded_n) {
-      temp[next - 1] -= 1;
-      next += ValueOfLowest1Bit(next);
-    }
-  }
-  return true;
-}
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_LEHMER_CODE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/lehmer_code_test.cc b/third_party/jpeg-xl/lib/jxl/lehmer_code_test.cc
deleted file mode 100644
index 3275b27dd4ec8..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/lehmer_code_test.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/lehmer_code.h"
-
-#include <cstdint>
-#include <cstring>
-#include <numeric>
-#include <vector>
-
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/random.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-template <typename PermutationT>
-struct WorkingSet {
-  explicit WorkingSet(size_t max_n)
-      : padded_n(1ull << CeilLog2Nonzero(max_n + 1)),
-        permutation(max_n),
-        temp(padded_n),
-        lehmer(max_n),
-        decoded(max_n) {}
-
-  size_t padded_n;
-  std::vector<PermutationT> permutation;
-  std::vector<uint32_t> temp;
-  std::vector<LehmerT> lehmer;
-  std::vector<PermutationT> decoded;
-};
-
-template <typename PermutationT>
-void Roundtrip(uint32_t n, WorkingSet<PermutationT>* ws) {
-  EXPECT_TRUE(n != 0);
-  const size_t padded_n = 1ull << CeilLog2Nonzero(n);
-
-  Rng rng(static_cast<uint64_t>(n) * 65537 + 13);
-
-  // Ensure indices fit into PermutationT
-  EXPECT_LE(n, 1ULL << (sizeof(PermutationT) * 8));
-
-  std::iota(ws->permutation.begin(), ws->permutation.begin() + n, 0);
-
-  // For various random permutations:
-  for (size_t rep = 0; rep < 3; ++rep) {
-    rng.Shuffle(ws->permutation.data(), n);
-
-    // Must decode to the same permutation
-    EXPECT_TRUE(ComputeLehmerCode(ws->permutation.data(), ws->temp.data(), n,
-                                  ws->lehmer.data()));
-    memset(ws->temp.data(), 0, padded_n * 4);
-    EXPECT_TRUE(DecodeLehmerCode(ws->lehmer.data(), ws->temp.data(), n,
-                                 ws->decoded.data()));
-
-    for (size_t i = 0; i < n; ++i) {
-      EXPECT_EQ(ws->permutation[i], ws->decoded[i]);
-    }
-  }
-}
-
-// Preallocates arrays and tests n = [begin, end).
-template <typename PermutationT>
-void RoundtripSizeRange(ThreadPool* pool, uint32_t begin, uint32_t end) {
-  ASSERT_NE(0u, begin);  // n = 0 not allowed.
-  std::vector<WorkingSet<PermutationT>> working_sets;
-
-  const auto init = [&working_sets, end](const size_t num_threads) -> Status {
-    for (size_t i = 0; i < num_threads; i++) {
-      working_sets.emplace_back(end - 1);
-    }
-    return true;
-  };
-  const auto do_roundtrip = [&working_sets](const uint32_t n,
-                                            const size_t thread) -> Status {
-    Roundtrip(n, &working_sets[thread]);
-    return true;
-  };
-  ASSERT_TRUE(RunOnPool(pool, begin, end, init, do_roundtrip, "lehmer test"));
-}
-
-TEST(LehmerCodeTest, TestRoundtrips) {
-  test::ThreadPoolForTests pool(8);
-
-  RoundtripSizeRange<uint16_t>(pool.get(), 1, 1026);
-
-  // Ensures PermutationT can fit > 16 bit values.
-  RoundtripSizeRange<uint32_t>(pool.get(), 65536, 65540);
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/libjxl.pc.in b/third_party/jpeg-xl/lib/jxl/libjxl.pc.in
deleted file mode 100644
index f5a9c43650f24..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/libjxl.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=@PKGCONFIG_TARGET_LIBS@
-includedir=@PKGCONFIG_TARGET_INCLUDES@
-
-Name: libjxl
-Description: Loads and saves JPEG XL files
-Version: @JPEGXL_LIBRARY_VERSION@
-@JPEGXL_REQUIRES_TYPE@: @JPEGXL_LIBRARY_REQUIRES@
-Libs: -L${libdir} -ljxl @JPEGXL_PUBLIC_LIBS@
-Libs.private: @JPEGXL_PRIVATE_LIBS@
-Cflags: -I${includedir}
-Cflags.private: -DJXL_STATIC_DEFINE
diff --git a/third_party/jpeg-xl/lib/jxl/libjxl_cms.pc.in b/third_party/jpeg-xl/lib/jxl/libjxl_cms.pc.in
deleted file mode 100644
index deab7367ac004..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/libjxl_cms.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=@PKGCONFIG_TARGET_LIBS@
-includedir=@PKGCONFIG_TARGET_INCLUDES@
-
-Name: libjxl_cms
-Description: CMS support library for libjxl
-Version: @JPEGXL_LIBRARY_VERSION@
-@JPEGXL_REQUIRES_TYPE@: @JPEGXL_CMS_LIBRARY_REQUIRES@
-Libs: -L${libdir} -ljxl_cms @JPEGXL_CMS_PUBLIC_LIBS@
-Libs.private: @JPEGXL_CMS_PRIVATE_LIBS@
-Cflags: -I${includedir}
-Cflags.private: -DJXL_CMS_STATIC_DEFINE
diff --git a/third_party/jpeg-xl/lib/jxl/loop_filter.cc b/third_party/jpeg-xl/lib/jxl/loop_filter.cc
deleted file mode 100644
index 566ddd670089e..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/loop_filter.cc
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/loop_filter.h"
-
-#include <cmath>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/fields.h"
-
-namespace jxl {
-
-LoopFilter::LoopFilter() { Bundle::Init(this); }
-Status LoopFilter::VisitFields(Visitor* JXL_RESTRICT visitor) {
-  // Must come before AllDefault.
-
-  if (visitor->AllDefault(*this, &all_default)) {
-    // Overwrite all serialized fields, but not any nonserialized_*.
-    visitor->SetDefault(this);
-    return true;
-  }
-
-  JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(true, &gab));
-  if (visitor->Conditional(gab)) {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &gab_custom));
-    if (visitor->Conditional(gab_custom)) {
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->F16(1.1 * 0.104699568f, &gab_x_weight1));
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->F16(1.1 * 0.055680538f, &gab_x_weight2));
-      if (std::abs(1.0f + (gab_x_weight1 + gab_x_weight2) * 4) < 1e-8) {
-        return JXL_FAILURE(
-            "Gaborish x weights lead to near 0 unnormalized kernel");
-      }
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->F16(1.1 * 0.104699568f, &gab_y_weight1));
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->F16(1.1 * 0.055680538f, &gab_y_weight2));
-      if (std::abs(1.0f + (gab_y_weight1 + gab_y_weight2) * 4) < 1e-8) {
-        return JXL_FAILURE(
-            "Gaborish y weights lead to near 0 unnormalized kernel");
-      }
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->F16(1.1 * 0.104699568f, &gab_b_weight1));
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->F16(1.1 * 0.055680538f, &gab_b_weight2));
-      if (std::abs(1.0f + (gab_b_weight1 + gab_b_weight2) * 4) < 1e-8) {
-        return JXL_FAILURE(
-            "Gaborish b weights lead to near 0 unnormalized kernel");
-      }
-    }
-  }
-
-  JXL_QUIET_RETURN_IF_ERROR(visitor->Bits(2, 2, &epf_iters));
-  if (visitor->Conditional(epf_iters > 0)) {
-    if (visitor->Conditional(!nonserialized_is_modular)) {
-      JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &epf_sharp_custom));
-      if (visitor->Conditional(epf_sharp_custom)) {
-        for (size_t i = 0; i < kEpfSharpEntries; ++i) {
-          JXL_QUIET_RETURN_IF_ERROR(visitor->F16(
-              float(i) / float(kEpfSharpEntries - 1), &epf_sharp_lut[i]));
-        }
-      }
-    }
-
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &epf_weight_custom));
-    if (visitor->Conditional(epf_weight_custom)) {
-      JXL_QUIET_RETURN_IF_ERROR(visitor->F16(40.0f, &epf_channel_scale[0]));
-      JXL_QUIET_RETURN_IF_ERROR(visitor->F16(5.0f, &epf_channel_scale[1]));
-      JXL_QUIET_RETURN_IF_ERROR(visitor->F16(3.5f, &epf_channel_scale[2]));
-      JXL_QUIET_RETURN_IF_ERROR(visitor->F16(0.45f, &epf_pass1_zeroflush));
-      JXL_QUIET_RETURN_IF_ERROR(visitor->F16(0.6f, &epf_pass2_zeroflush));
-    }
-
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &epf_sigma_custom));
-    if (visitor->Conditional(epf_sigma_custom)) {
-      if (visitor->Conditional(!nonserialized_is_modular)) {
-        JXL_QUIET_RETURN_IF_ERROR(visitor->F16(0.46f, &epf_quant_mul));
-      }
-      JXL_QUIET_RETURN_IF_ERROR(visitor->F16(0.9f, &epf_pass0_sigma_scale));
-      JXL_QUIET_RETURN_IF_ERROR(visitor->F16(6.5f, &epf_pass2_sigma_scale));
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->F16(0.6666666666666666f, &epf_border_sad_mul));
-    }
-    if (visitor->Conditional(nonserialized_is_modular)) {
-      JXL_QUIET_RETURN_IF_ERROR(visitor->F16(1.0f, &epf_sigma_for_modular));
-      if (epf_sigma_for_modular < 1e-8) {
-        return JXL_FAILURE("EPF: sigma for modular is too small");
-      }
-    }
-  }
-
-  JXL_QUIET_RETURN_IF_ERROR(visitor->BeginExtensions(&extensions));
-  // Extensions: in chronological order of being added to the format.
-  return visitor->EndExtensions();
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/loop_filter.h b/third_party/jpeg-xl/lib/jxl/loop_filter.h
deleted file mode 100644
index bebc046738282..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/loop_filter.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_LOOP_FILTER_H_
-#define LIB_JXL_LOOP_FILTER_H_
-
-// Parameters for loop filter(s), stored in each frame.
-
-#include <cstddef>
-#include <cstdint>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/field_encodings.h"
-
-namespace jxl {
-
-struct LoopFilter : public Fields {
-  LoopFilter();
-  JXL_FIELDS_NAME(LoopFilter)
-
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override;
-
-  size_t Padding() const {
-    static const size_t padding_per_epf_iter[4] = {0, 2, 3, 6};
-    return padding_per_epf_iter[epf_iters] + (gab ? 1 : 0);
-  }
-
-  mutable bool all_default;
-
-  // --- Gaborish convolution
-  bool gab;
-
-  bool gab_custom;
-  float gab_x_weight1;
-  float gab_x_weight2;
-  float gab_y_weight1;
-  float gab_y_weight2;
-  float gab_b_weight1;
-  float gab_b_weight2;
-
-  // --- Edge-preserving filter
-
-  // Number of EPF stages to apply. 0 means EPF disabled. 1 applies only the
-  // first stage, 2 applies both stages and 3 applies the first stage twice and
-  // the second stage once.
-  uint32_t epf_iters;
-
-  bool epf_sharp_custom;
-  enum { kEpfSharpEntries = 8 };
-  float epf_sharp_lut[kEpfSharpEntries];
-
-  bool epf_weight_custom;      // Custom weight params
-  float epf_channel_scale[3];  // Relative weight of each channel
-  float epf_pass1_zeroflush;   // Minimum weight for first pass
-  float epf_pass2_zeroflush;   // Minimum weight for second pass
-
-  bool epf_sigma_custom;        // Custom sigma parameters
-  float epf_quant_mul;          // Sigma is ~ this * quant
-  float epf_pass0_sigma_scale;  // Multiplier for sigma in pass 0
-  float epf_pass2_sigma_scale;  // Multiplier for sigma in the second pass
-  float epf_border_sad_mul;     // (inverse) multiplier for sigma on borders
-
-  float epf_sigma_for_modular;
-
-  uint64_t extensions;
-
-  bool nonserialized_is_modular = false;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_LOOP_FILTER_H_
diff --git a/third_party/jpeg-xl/lib/jxl/luminance.cc b/third_party/jpeg-xl/lib/jxl/luminance.cc
deleted file mode 100644
index 7af4b2f9a940f..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/luminance.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/luminance.h"
-
-#include "lib/jxl/image_metadata.h"
-
-namespace jxl {
-
-void SetIntensityTarget(ImageMetadata* m) {
-  if (m->color_encoding.Tf().IsPQ()) {
-    // Peak luminance of PQ as defined by SMPTE ST 2084:2014.
-    m->SetIntensityTarget(10000);
-  } else if (m->color_encoding.Tf().IsHLG()) {
-    // Nominal display peak luminance used as a reference by
-    // Rec. ITU-R BT.2100-2.
-    m->SetIntensityTarget(1000);
-  } else {
-    // SDR
-    m->SetIntensityTarget(kDefaultIntensityTarget);
-  }
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/luminance.h b/third_party/jpeg-xl/lib/jxl/luminance.h
deleted file mode 100644
index 31815768231ba..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/luminance.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_LUMINANCE_H_
-#define LIB_JXL_LUMINANCE_H_
-
-namespace jxl {
-
-// Chooses a default intensity target based on the transfer function of the
-// image, if known. For SDR images or images not known to be HDR, returns
-// kDefaultIntensityTarget, for images known to have PQ or HLG transfer function
-// returns a higher value.
-
-struct ImageMetadata;
-// TODO(eustas): rename
-void SetIntensityTarget(ImageMetadata* m);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_LUMINANCE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/memory_manager_internal.cc b/third_party/jpeg-xl/lib/jxl/memory_manager_internal.cc
deleted file mode 100644
index 8806d246c90ca..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/memory_manager_internal.cc
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/memory_manager_internal.h"
-
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-
-#include <atomic>
-#include <cstddef>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>     // memcpy
-#include <hwy/base.h>  // kMaxVectorSize
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/simd_util.h"
-
-namespace jxl {
-
-namespace {
-
-void* MemoryManagerDefaultAlloc(void* opaque, size_t size) {
-  return malloc(size);
-}
-
-void MemoryManagerDefaultFree(void* opaque, void* address) { free(address); }
-
-}  // namespace
-
-void* MemoryManagerAlloc(const JxlMemoryManager* memory_manager, size_t size) {
-  return memory_manager->alloc(memory_manager->opaque, size);
-}
-
-void MemoryManagerFree(const JxlMemoryManager* memory_manager, void* address) {
-  memory_manager->free(memory_manager->opaque, address);
-}
-
-Status MemoryManagerInit(JxlMemoryManager* self,
-                         const JxlMemoryManager* memory_manager) {
-  if (memory_manager) {
-    *self = *memory_manager;
-  } else {
-    memset(self, 0, sizeof(*self));
-  }
-  bool is_default_alloc = (self->alloc == nullptr);
-  bool is_default_free = (self->free == nullptr);
-  if (is_default_alloc != is_default_free) {
-    return false;
-  }
-  if (is_default_alloc) self->alloc = jxl::MemoryManagerDefaultAlloc;
-  if (is_default_free) self->free = jxl::MemoryManagerDefaultFree;
-
-  return true;
-}
-
-size_t BytesPerRow(const size_t xsize, const size_t sizeof_t) {
-  // Special case: we don't allow any ops -> don't need extra padding/
-  if (xsize == 0) {
-    return 0;
-  }
-
-  const size_t vec_size = MaxVectorSize();
-  size_t valid_bytes = xsize * sizeof_t;
-
-  // Allow unaligned accesses starting at the last valid value.
-  // Skip for the scalar case because no extra lanes will be loaded.
-  if (vec_size != 0) {
-    valid_bytes += vec_size - sizeof_t;
-  }
-
-  // Round up to vector and cache line size.
-  const size_t align = std::max(vec_size, memory_manager_internal::kAlignment);
-  size_t bytes_per_row = RoundUpTo(valid_bytes, align);
-
-  // During the lengthy window before writes are committed to memory, CPUs
-  // guard against read after write hazards by checking the address, but
-  // only the lower 11 bits. We avoid a false dependency between writes to
-  // consecutive rows by ensuring their sizes are not multiples of 2 KiB.
-  // Avoid2K prevents the same problem for the planes of an Image3.
-  if (bytes_per_row % memory_manager_internal::kAlias == 0) {
-    bytes_per_row += align;
-  }
-
-  JXL_DASSERT(bytes_per_row % align == 0);
-  return bytes_per_row;
-}
-
-StatusOr<AlignedMemory> AlignedMemory::Create(JxlMemoryManager* memory_manager,
-                                              size_t size, size_t pre_padding) {
-  JXL_ENSURE(pre_padding <= memory_manager_internal::kAlias);
-  size_t allocation_size = size + pre_padding + memory_manager_internal::kAlias;
-  if (size > allocation_size) {
-    return JXL_FAILURE("Requested allocation is too large");
-  }
-  JXL_ENSURE(memory_manager);
-  void* allocated =
-      memory_manager->alloc(memory_manager->opaque, allocation_size);
-  if (allocated == nullptr) {
-    return JXL_FAILURE("Allocation failed");
-  }
-  return AlignedMemory(memory_manager, allocated, pre_padding);
-}
-
-AlignedMemory::AlignedMemory(JxlMemoryManager* memory_manager, void* allocation,
-                             size_t pre_padding)
-    : allocation_(allocation), memory_manager_(memory_manager) {
-  // Congruence to `offset` (mod kAlias) reduces cache conflicts and load/store
-  // stalls, especially with large allocations that would otherwise have similar
-  // alignments.
-  static std::atomic<uint32_t> next_group{0};
-  size_t group =
-      static_cast<size_t>(next_group.fetch_add(1, std::memory_order_relaxed));
-  group &= (memory_manager_internal::kNumAlignmentGroups - 1);
-  size_t offset = memory_manager_internal::kAlignment * group;
-
-  // Actual allocation.
-  uintptr_t address = reinterpret_cast<uintptr_t>(allocation) + pre_padding;
-
-  // Aligned address, but might land before allocation (50%/50%) or not have
-  // enough pre-padding.
-  uintptr_t aligned_address =
-      (address & ~(memory_manager_internal::kAlias - 1)) + offset;
-  if (aligned_address < address)
-    aligned_address += memory_manager_internal::kAlias;
-
-  address_ = reinterpret_cast<void*>(aligned_address);  // NOLINT
-}
-
-AlignedMemory::AlignedMemory(AlignedMemory&& other) noexcept {
-  allocation_ = other.allocation_;
-  memory_manager_ = other.memory_manager_;
-  address_ = other.address_;
-  other.memory_manager_ = nullptr;
-}
-
-AlignedMemory& AlignedMemory::operator=(AlignedMemory&& other) noexcept {
-  if (this == &other) return *this;
-  if (memory_manager_ && allocation_) {
-    memory_manager_->free(memory_manager_->opaque, allocation_);
-  }
-  allocation_ = other.allocation_;
-  memory_manager_ = other.memory_manager_;
-  address_ = other.address_;
-  other.memory_manager_ = nullptr;
-  return *this;
-}
-
-AlignedMemory::~AlignedMemory() {
-  if (memory_manager_ == nullptr) return;
-  memory_manager_->free(memory_manager_->opaque, allocation_);
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/memory_manager_internal.h b/third_party/jpeg-xl/lib/jxl/memory_manager_internal.h
deleted file mode 100644
index 30d2d86026276..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/memory_manager_internal.h
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_MEMORY_MANAGER_INTERNAL_H_
-#define LIB_JXL_MEMORY_MANAGER_INTERNAL_H_
-
-// Memory allocator with support for alignment + misalignment.
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <memory>
-#include <utility>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-
-namespace memory_manager_internal {
-
-// To avoid RFOs, match L2 fill size (pairs of lines); 2 x cache line size.
-static constexpr size_t kAlignment = 2 * 64;
-static_assert((kAlignment & (kAlignment - 1)) == 0,
-              "kAlignment must be a power of 2");
-
-// Minimum multiple for which cache set conflicts and/or loads blocked by
-// preceding stores can occur.
-static constexpr size_t kNumAlignmentGroups = 16;
-static constexpr size_t kAlias = kNumAlignmentGroups * kAlignment;
-static_assert((kNumAlignmentGroups & (kNumAlignmentGroups - 1)) == 0,
-              "kNumAlignmentGroups must be a power of 2");
-
-}  // namespace memory_manager_internal
-
-// Initializes the memory manager instance with the passed one. The
-// MemoryManager passed in |memory_manager| may be NULL or contain NULL
-// functions which will be initialized with the default ones. If either alloc
-// or free are NULL, then both must be NULL, otherwise this function returns an
-// error.
-Status MemoryManagerInit(JxlMemoryManager* self,
-                         const JxlMemoryManager* memory_manager);
-
-void* MemoryManagerAlloc(const JxlMemoryManager* memory_manager, size_t size);
-void MemoryManagerFree(const JxlMemoryManager* memory_manager, void* address);
-
-// Helper class to be used as a deleter in a unique_ptr<T> call.
-class MemoryManagerDeleteHelper {
- public:
-  explicit MemoryManagerDeleteHelper(const JxlMemoryManager* memory_manager)
-      : memory_manager_(memory_manager) {}
-
-  // Delete and free the passed pointer using the memory_manager.
-  template <typename T>
-  void operator()(T* address) const {
-    if (!address) {
-      return;
-    }
-    address->~T();
-    return memory_manager_->free(memory_manager_->opaque, address);
-  }
-
- private:
-  const JxlMemoryManager* memory_manager_;
-};
-
-template <typename T>
-using MemoryManagerUniquePtr = std::unique_ptr<T, MemoryManagerDeleteHelper>;
-
-// Creates a new object T allocating it with the memory allocator into a
-// unique_ptr.
-template <typename T, typename... Args>
-JXL_INLINE MemoryManagerUniquePtr<T> MemoryManagerMakeUnique(
-    const JxlMemoryManager* memory_manager, Args&&... args) {
-  T* mem =
-      static_cast<T*>(memory_manager->alloc(memory_manager->opaque, sizeof(T)));
-  if (!mem) {
-    // Allocation error case.
-    return MemoryManagerUniquePtr<T>(nullptr,
-                                     MemoryManagerDeleteHelper(memory_manager));
-  }
-  return MemoryManagerUniquePtr<T>(new (mem) T(std::forward<Args>(args)...),
-                                   MemoryManagerDeleteHelper(memory_manager));
-}
-
-// Returns recommended distance in bytes between the start of two consecutive
-// rows.
-size_t BytesPerRow(size_t xsize, size_t sizeof_t);
-
-class AlignedMemory {
- public:
-  AlignedMemory()
-      : allocation_(nullptr), memory_manager_(nullptr), address_(nullptr) {}
-
-  // Copy disallowed.
-  AlignedMemory(const AlignedMemory& other) = delete;
-  AlignedMemory& operator=(const AlignedMemory& other) = delete;
-
-  // Custom move.
-  AlignedMemory(AlignedMemory&& other) noexcept;
-  AlignedMemory& operator=(AlignedMemory&& other) noexcept;
-
-  ~AlignedMemory();
-
-  static StatusOr<AlignedMemory> Create(JxlMemoryManager* memory_manager,
-                                        size_t size, size_t pre_padding = 0);
-
-  explicit operator bool() const noexcept { return (address_ != nullptr); }
-
-  template <typename T>
-  T* address() const {
-    return reinterpret_cast<T*>(address_);
-  }
-  JxlMemoryManager* memory_manager() const { return memory_manager_; }
-
-  // TODO(eustas): we can offer "actually accessible" size; it is 0-2KiB bigger
-  //               than requested size, due to generous alignment;
-  //               might be useful for resizeable containers (e.g. PaddedBytes)
-
- private:
-  AlignedMemory(JxlMemoryManager* memory_manager, void* allocation,
-                size_t pre_padding);
-
-  void* allocation_;
-  JxlMemoryManager* memory_manager_;
-  void* address_;
-};
-
-template <typename T>
-class AlignedArray {
- public:
-  AlignedArray() : size_(0) {}
-
-  static StatusOr<AlignedArray> Create(JxlMemoryManager* memory_manager,
-                                       size_t size) {
-    size_t storage_size = size * sizeof(T);
-    JXL_ASSIGN_OR_RETURN(AlignedMemory storage,
-                         AlignedMemory::Create(memory_manager, storage_size));
-    T* items = storage.address<T>();
-    for (size_t i = 0; i < size; ++i) {
-      new (items + i) T();
-    }
-    return AlignedArray<T>(std::move(storage), size);
-  }
-
-  // Copy disallowed.
-  AlignedArray(const AlignedArray& other) = delete;
-  AlignedArray& operator=(const AlignedArray& other) = delete;
-
-  // Custom move.
-  AlignedArray(AlignedArray&& other) noexcept {
-    size_ = other.size_;
-    storage_ = std::move(other.storage_);
-    other.size_ = 0;
-  }
-
-  AlignedArray& operator=(AlignedArray&& other) noexcept {
-    if (this == &other) return *this;
-    size_ = other.size_;
-    storage_ = std::move(other.storage_);
-    other.size_ = 0;
-    return *this;
-  }
-
-  ~AlignedArray() {
-    if (!size_) return;
-    T* items = storage_.address<T>();
-    for (size_t i = 0; i < size_; ++i) {
-      items[i].~T();
-    }
-  }
-
-  T& operator[](const size_t i) {
-    JXL_DASSERT(i < size_);
-    return *(storage_.address<T>() + i);
-  }
-  const T& operator[](const size_t i) const {
-    JXL_DASSERT(i < size_);
-    return *(storage_.address<T>() + i);
-  }
-
- private:
-  explicit AlignedArray(AlignedMemory&& storage, size_t size)
-      : size_(size), storage_(std::move(storage)) {}
-  size_t size_;
-  AlignedMemory storage_;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_MEMORY_MANAGER_INTERNAL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/context_predict.h b/third_party/jpeg-xl/lib/jxl/modular/encoding/context_predict.h
deleted file mode 100644
index 0a71bec24faf5..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/encoding/context_predict.h
+++ /dev/null
@@ -1,682 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_MODULAR_ENCODING_CONTEXT_PREDICT_H_
-#define LIB_JXL_MODULAR_ENCODING_CONTEXT_PREDICT_H_
-
-#include <algorithm>
-#include <array>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/base/bits.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/field_encodings.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/modular/options.h"
-
-namespace jxl {
-
-namespace weighted {
-constexpr static size_t kNumPredictors = 4;
-constexpr static int64_t kPredExtraBits = 3;
-constexpr static int64_t kPredictionRound = ((1 << kPredExtraBits) >> 1) - 1;
-constexpr static size_t kNumProperties = 1;
-
-struct Header : public Fields {
-  JXL_FIELDS_NAME(WeightedPredictorHeader)
-  // TODO(janwas): move to cc file, avoid including fields.h.
-  Header() { Bundle::Init(this); }
-
-  Status VisitFields(Visitor *JXL_RESTRICT visitor) override {
-    if (visitor->AllDefault(*this, &all_default)) {
-      // Overwrite all serialized fields, but not any nonserialized_*.
-      visitor->SetDefault(this);
-      return true;
-    }
-    auto visit_p = [visitor](pixel_type val, pixel_type *p) {
-      uint32_t up = *p;
-      JXL_QUIET_RETURN_IF_ERROR(visitor->Bits(5, val, &up));
-      *p = up;
-      return Status(true);
-    };
-    JXL_QUIET_RETURN_IF_ERROR(visit_p(16, &p1C));
-    JXL_QUIET_RETURN_IF_ERROR(visit_p(10, &p2C));
-    JXL_QUIET_RETURN_IF_ERROR(visit_p(7, &p3Ca));
-    JXL_QUIET_RETURN_IF_ERROR(visit_p(7, &p3Cb));
-    JXL_QUIET_RETURN_IF_ERROR(visit_p(7, &p3Cc));
-    JXL_QUIET_RETURN_IF_ERROR(visit_p(0, &p3Cd));
-    JXL_QUIET_RETURN_IF_ERROR(visit_p(0, &p3Ce));
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bits(4, 0xd, &w[0]));
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bits(4, 0xc, &w[1]));
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bits(4, 0xc, &w[2]));
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bits(4, 0xc, &w[3]));
-    return true;
-  }
-
-  bool all_default;
-  pixel_type p1C = 0, p2C = 0, p3Ca = 0, p3Cb = 0, p3Cc = 0, p3Cd = 0, p3Ce = 0;
-  uint32_t w[kNumPredictors] = {};
-};
-
-struct State {
-  pixel_type_w prediction[kNumPredictors] = {};
-  pixel_type_w pred = 0;  // *before* removing the added bits.
-  std::vector<uint32_t> pred_errors[kNumPredictors];
-  std::vector<int32_t> error;
-  const Header &header;
-
-  // Allows to approximate division by a number from 1 to 64.
-  //  for (int i = 0; i < 64; i++) divlookup[i] = (1 << 24) / (i + 1);
-
-  const uint32_t divlookup[64] = {
-      16777216, 8388608, 5592405, 4194304, 3355443, 2796202, 2396745, 2097152,
-      1864135,  1677721, 1525201, 1398101, 1290555, 1198372, 1118481, 1048576,
-      986895,   932067,  883011,  838860,  798915,  762600,  729444,  699050,
-      671088,   645277,  621378,  599186,  578524,  559240,  541200,  524288,
-      508400,   493447,  479349,  466033,  453438,  441505,  430185,  419430,
-      409200,   399457,  390167,  381300,  372827,  364722,  356962,  349525,
-      342392,   335544,  328965,  322638,  316551,  310689,  305040,  299593,
-      294337,   289262,  284359,  279620,  275036,  270600,  266305,  262144};
-
-  constexpr static pixel_type_w AddBits(pixel_type_w x) {
-    return static_cast<uint64_t>(x) << kPredExtraBits;
-  }
-
-  State(const Header &header, size_t xsize, size_t ysize) : header(header) {
-    // Extra margin to avoid out-of-bounds writes.
-    // All have space for two rows of data.
-    for (auto &pred_error : pred_errors) {
-      pred_error.resize((xsize + 2) * 2);
-    }
-    error.resize((xsize + 2) * 2);
-  }
-
-  // Approximates 4+(maxweight<<24)/(x+1), avoiding division
-  JXL_INLINE uint32_t ErrorWeight(uint64_t x, uint32_t maxweight) const {
-    int shift = static_cast<int>(FloorLog2Nonzero(x + 1)) - 5;
-    if (shift < 0) shift = 0;
-    return 4 + ((maxweight * divlookup[x >> shift]) >> shift);
-  }
-
-  // Approximates the weighted average of the input values with the given
-  // weights, avoiding division. Weights must sum to at least 16.
-  JXL_INLINE pixel_type_w
-  WeightedAverage(const pixel_type_w *JXL_RESTRICT p,
-                  std::array<uint32_t, kNumPredictors> w) const {
-    uint32_t weight_sum = 0;
-    for (size_t i = 0; i < kNumPredictors; i++) {
-      weight_sum += w[i];
-    }
-    JXL_DASSERT(weight_sum > 15);
-    uint32_t log_weight = FloorLog2Nonzero(weight_sum);  // at least 4.
-    weight_sum = 0;
-    for (size_t i = 0; i < kNumPredictors; i++) {
-      w[i] >>= log_weight - 4;
-      weight_sum += w[i];
-    }
-    // for rounding.
-    pixel_type_w sum = (weight_sum >> 1) - 1;
-    for (size_t i = 0; i < kNumPredictors; i++) {
-      sum += p[i] * w[i];
-    }
-    return (sum * divlookup[weight_sum - 1]) >> 24;
-  }
-
-  template <bool compute_properties>
-  JXL_INLINE pixel_type_w Predict(size_t x, size_t y, size_t xsize,
-                                  pixel_type_w N, pixel_type_w W,
-                                  pixel_type_w NE, pixel_type_w NW,
-                                  pixel_type_w NN, Properties *properties,
-                                  size_t offset) {
-    size_t cur_row = y & 1 ? 0 : (xsize + 2);
-    size_t prev_row = y & 1 ? (xsize + 2) : 0;
-    size_t pos_N = prev_row + x;
-    size_t pos_NE = x < xsize - 1 ? pos_N + 1 : pos_N;
-    size_t pos_NW = x > 0 ? pos_N - 1 : pos_N;
-    std::array<uint32_t, kNumPredictors> weights;
-    for (size_t i = 0; i < kNumPredictors; i++) {
-      // pred_errors[pos_N] also contains the error of pixel W.
-      // pred_errors[pos_NW] also contains the error of pixel WW.
-      weights[i] = pred_errors[i][pos_N] + pred_errors[i][pos_NE] +
-                   pred_errors[i][pos_NW];
-      weights[i] = ErrorWeight(weights[i], header.w[i]);
-    }
-
-    N = AddBits(N);
-    W = AddBits(W);
-    NE = AddBits(NE);
-    NW = AddBits(NW);
-    NN = AddBits(NN);
-
-    pixel_type_w teW = x == 0 ? 0 : error[cur_row + x - 1];
-    pixel_type_w teN = error[pos_N];
-    pixel_type_w teNW = error[pos_NW];
-    pixel_type_w sumWN = teN + teW;
-    pixel_type_w teNE = error[pos_NE];
-
-    if (compute_properties) {
-      pixel_type_w p = teW;
-      if (std::abs(teN) > std::abs(p)) p = teN;
-      if (std::abs(teNW) > std::abs(p)) p = teNW;
-      if (std::abs(teNE) > std::abs(p)) p = teNE;
-      (*properties)[offset++] = p;
-    }
-
-    prediction[0] = W + NE - N;
-    prediction[1] = N - (((sumWN + teNE) * header.p1C) >> 5);
-    prediction[2] = W - (((sumWN + teNW) * header.p2C) >> 5);
-    prediction[3] =
-        N - ((teNW * header.p3Ca + teN * header.p3Cb + teNE * header.p3Cc +
-              (NN - N) * header.p3Cd + (NW - W) * header.p3Ce) >>
-             5);
-
-    pred = WeightedAverage(prediction, weights);
-
-    // If all three have the same sign, skip clamping.
-    if (((teN ^ teW) | (teN ^ teNW)) > 0) {
-      return (pred + kPredictionRound) >> kPredExtraBits;
-    }
-
-    // Otherwise, clamp to min/max of neighbouring pixels (just W, NE, N).
-    pixel_type_w mx = std::max(W, std::max(NE, N));
-    pixel_type_w mn = std::min(W, std::min(NE, N));
-    pred = std::max(mn, std::min(mx, pred));
-    return (pred + kPredictionRound) >> kPredExtraBits;
-  }
-
-  JXL_INLINE void UpdateErrors(pixel_type_w val, size_t x, size_t y,
-                               size_t xsize) {
-    size_t cur_row = y & 1 ? 0 : (xsize + 2);
-    size_t prev_row = y & 1 ? (xsize + 2) : 0;
-    val = AddBits(val);
-    error[cur_row + x] = pred - val;
-    for (size_t i = 0; i < kNumPredictors; i++) {
-      pixel_type_w err =
-          (std::abs(prediction[i] - val) + kPredictionRound) >> kPredExtraBits;
-      // For predicting in the next row.
-      pred_errors[i][cur_row + x] = err;
-      // Add the error on this pixel to the error on the NE pixel. This has the
-      // effect of adding the error on this pixel to the E and EE pixels.
-      pred_errors[i][prev_row + x + 1] += err;
-    }
-  }
-};
-
-// Encoder helper function to set the parameters to some presets.
-inline void PredictorMode(int i, Header *header) {
-  switch (i) {
-    case 0:
-      // ~ lossless16 predictor
-      header->w[0] = 0xd;
-      header->w[1] = 0xc;
-      header->w[2] = 0xc;
-      header->w[3] = 0xc;
-      header->p1C = 16;
-      header->p2C = 10;
-      header->p3Ca = 7;
-      header->p3Cb = 7;
-      header->p3Cc = 7;
-      header->p3Cd = 0;
-      header->p3Ce = 0;
-      break;
-    case 1:
-      // ~ default lossless8 predictor
-      header->w[0] = 0xd;
-      header->w[1] = 0xc;
-      header->w[2] = 0xc;
-      header->w[3] = 0xb;
-      header->p1C = 8;
-      header->p2C = 8;
-      header->p3Ca = 4;
-      header->p3Cb = 0;
-      header->p3Cc = 3;
-      header->p3Cd = 23;
-      header->p3Ce = 2;
-      break;
-    case 2:
-      // ~ west lossless8 predictor
-      header->w[0] = 0xd;
-      header->w[1] = 0xc;
-      header->w[2] = 0xd;
-      header->w[3] = 0xc;
-      header->p1C = 10;
-      header->p2C = 9;
-      header->p3Ca = 7;
-      header->p3Cb = 0;
-      header->p3Cc = 0;
-      header->p3Cd = 16;
-      header->p3Ce = 9;
-      break;
-    case 3:
-      // ~ north lossless8 predictor
-      header->w[0] = 0xd;
-      header->w[1] = 0xd;
-      header->w[2] = 0xc;
-      header->w[3] = 0xc;
-      header->p1C = 16;
-      header->p2C = 8;
-      header->p3Ca = 0;
-      header->p3Cb = 16;
-      header->p3Cc = 0;
-      header->p3Cd = 23;
-      header->p3Ce = 0;
-      break;
-    case 4:
-    default:
-      // something else, because why not
-      header->w[0] = 0xd;
-      header->w[1] = 0xc;
-      header->w[2] = 0xc;
-      header->w[3] = 0xc;
-      header->p1C = 10;
-      header->p2C = 10;
-      header->p3Ca = 5;
-      header->p3Cb = 5;
-      header->p3Cc = 5;
-      header->p3Cd = 12;
-      header->p3Ce = 4;
-      break;
-  }
-}
-}  // namespace weighted
-
-// Stores a node and its two children at the same time. This significantly
-// reduces the number of branches needed during decoding.
-struct FlatDecisionNode {
-  // Property + splitval of the top node.
-  int32_t property0;  // -1 if leaf.
-  union {
-    PropertyVal splitval0;
-    Predictor predictor;
-  };
-  // Property+splitval of the two child nodes.
-  union {
-    PropertyVal splitvals[2];
-    int32_t multiplier;
-  };
-  uint32_t childID;  // childID is ctx id if leaf.
-  union {
-    int16_t properties[2];
-    int32_t predictor_offset;
-  };
-};
-using FlatTree = std::vector<FlatDecisionNode>;
-
-class MATreeLookup {
- public:
-  explicit MATreeLookup(const FlatTree &tree) : nodes_(tree) {}
-  struct LookupResult {
-    uint32_t context;
-    Predictor predictor;
-    int32_t offset;
-    int32_t multiplier;
-  };
-  JXL_INLINE LookupResult Lookup(const Properties &properties) const {
-    uint32_t pos = 0;
-    while (true) {
-#define TRAVERSE_THE_TREE                                                      \
-  {                                                                            \
-    const FlatDecisionNode &node = nodes_[pos];                                \
-    if (node.property0 < 0) {                                                  \
-      return {node.childID, node.predictor, node.predictor_offset,             \
-              node.multiplier};                                                \
-    }                                                                          \
-    bool p0 = properties[node.property0] <= node.splitval0;                    \
-    uint32_t off0 = properties[node.properties[0]] <= node.splitvals[0];       \
-    uint32_t off1 = 2 | (properties[node.properties[1]] <= node.splitvals[1]); \
-    pos = node.childID + (p0 ? off1 : off0);                                   \
-  }
-
-      TRAVERSE_THE_TREE;
-      TRAVERSE_THE_TREE;
-    }
-  }
-
- private:
-  const FlatTree &nodes_;
-};
-
-static constexpr size_t kExtraPropsPerChannel = 4;
-static constexpr size_t kNumNonrefProperties =
-    kNumStaticProperties + 13 + weighted::kNumProperties;
-
-constexpr size_t kWPProp = kNumNonrefProperties - weighted::kNumProperties;
-constexpr size_t kGradientProp = 9;
-
-// Clamps gradient to the min/max of n, w (and l, implicitly).
-static JXL_INLINE int32_t ClampedGradient(const int32_t n, const int32_t w,
-                                          const int32_t l) {
-  const int32_t m = std::min(n, w);
-  const int32_t M = std::max(n, w);
-  // The end result of this operation doesn't overflow or underflow if the
-  // result is between m and M, but the intermediate value may overflow, so we
-  // do the intermediate operations in uint32_t and check later if we had an
-  // overflow or underflow condition comparing m, M and l directly.
-  // grad = M + m - l = n + w - l
-  const int32_t grad =
-      static_cast<int32_t>(static_cast<uint32_t>(n) + static_cast<uint32_t>(w) -
-                           static_cast<uint32_t>(l));
-  // We use two sets of ternary operators to force the evaluation of them in
-  // any case, allowing the compiler to avoid branches and use cmovl/cmovg in
-  // x86.
-  const int32_t grad_clamp_M = (l < m) ? M : grad;
-  return (l > M) ? m : grad_clamp_M;
-}
-
-inline pixel_type_w Select(pixel_type_w a, pixel_type_w b, pixel_type_w c) {
-  pixel_type_w p = a + b - c;
-  pixel_type_w pa = std::abs(p - a);
-  pixel_type_w pb = std::abs(p - b);
-  return pa < pb ? a : b;
-}
-
-inline void PrecomputeReferences(const Channel &ch, size_t y,
-                                 const Image &image, uint32_t i,
-                                 Channel *references) {
-  ZeroFillImage(&references->plane);
-  uint32_t offset = 0;
-  size_t num_extra_props = references->w;
-  intptr_t onerow = references->plane.PixelsPerRow();
-  for (int32_t j = static_cast<int32_t>(i) - 1;
-       j >= 0 && offset < num_extra_props; j--) {
-    if (image.channel[j].w != image.channel[i].w ||
-        image.channel[j].h != image.channel[i].h) {
-      continue;
-    }
-    if (image.channel[j].hshift != image.channel[i].hshift) continue;
-    if (image.channel[j].vshift != image.channel[i].vshift) continue;
-    pixel_type *JXL_RESTRICT rp = references->Row(0) + offset;
-    const pixel_type *JXL_RESTRICT rpp = image.channel[j].Row(y);
-    const pixel_type *JXL_RESTRICT rpprev = image.channel[j].Row(y ? y - 1 : 0);
-    for (size_t x = 0; x < ch.w; x++, rp += onerow) {
-      pixel_type_w v = rpp[x];
-      rp[0] = std::abs(v);
-      rp[1] = v;
-      pixel_type_w vleft = (x ? rpp[x - 1] : 0);
-      pixel_type_w vtop = (y ? rpprev[x] : vleft);
-      pixel_type_w vtopleft = (x && y ? rpprev[x - 1] : vleft);
-      pixel_type_w vpredicted = ClampedGradient(vleft, vtop, vtopleft);
-      rp[2] = std::abs(v - vpredicted);
-      rp[3] = v - vpredicted;
-    }
-
-    offset += kExtraPropsPerChannel;
-  }
-}
-
-struct PredictionResult {
-  int context = 0;
-  pixel_type_w guess = 0;
-  Predictor predictor;
-  int32_t multiplier;
-};
-
-inline void InitPropsRow(
-    Properties *p,
-    const std::array<pixel_type, kNumStaticProperties> &static_props,
-    const int y) {
-  for (size_t i = 0; i < kNumStaticProperties; i++) {
-    (*p)[i] = static_props[i];
-  }
-  (*p)[2] = y;
-  (*p)[9] = 0;  // local gradient.
-}
-
-namespace detail {
-enum PredictorMode {
-  kUseTree = 1,
-  kUseWP = 2,
-  kForceComputeProperties = 4,
-  kAllPredictions = 8,
-  kNoEdgeCases = 16
-};
-
-JXL_INLINE pixel_type_w PredictOne(Predictor p, pixel_type_w left,
-                                   pixel_type_w top, pixel_type_w toptop,
-                                   pixel_type_w topleft, pixel_type_w topright,
-                                   pixel_type_w leftleft,
-                                   pixel_type_w toprightright,
-                                   pixel_type_w wp_pred) {
-  switch (p) {
-    case Predictor::Zero:
-      return pixel_type_w{0};
-    case Predictor::Left:
-      return left;
-    case Predictor::Top:
-      return top;
-    case Predictor::Select:
-      return Select(left, top, topleft);
-    case Predictor::Weighted:
-      return wp_pred;
-    case Predictor::Gradient:
-      return pixel_type_w{ClampedGradient(left, top, topleft)};
-    case Predictor::TopLeft:
-      return topleft;
-    case Predictor::TopRight:
-      return topright;
-    case Predictor::LeftLeft:
-      return leftleft;
-    case Predictor::Average0:
-      return (left + top) / 2;
-    case Predictor::Average1:
-      return (left + topleft) / 2;
-    case Predictor::Average2:
-      return (topleft + top) / 2;
-    case Predictor::Average3:
-      return (top + topright) / 2;
-    case Predictor::Average4:
-      return (6 * top - 2 * toptop + 7 * left + 1 * leftleft +
-              1 * toprightright + 3 * topright + 8) /
-             16;
-    default:
-      return pixel_type_w{0};
-  }
-}
-
-template <int mode>
-JXL_INLINE PredictionResult Predict(
-    Properties *p, size_t w, const pixel_type *JXL_RESTRICT pp,
-    const intptr_t onerow, const size_t x, const size_t y, Predictor predictor,
-    const MATreeLookup *lookup, const Channel *references,
-    weighted::State *wp_state, pixel_type_w *predictions) {
-  // We start in position 3 because of 2 static properties + y.
-  size_t offset = 3;
-  constexpr bool compute_properties =
-      mode & kUseTree || mode & kForceComputeProperties;
-  constexpr bool nec = mode & kNoEdgeCases;
-  pixel_type_w left = (nec || x ? pp[-1] : (y ? pp[-onerow] : 0));
-  pixel_type_w top = (nec || y ? pp[-onerow] : left);
-  pixel_type_w topleft = (nec || (x && y) ? pp[-1 - onerow] : left);
-  pixel_type_w topright = (nec || (x + 1 < w && y) ? pp[1 - onerow] : top);
-  pixel_type_w leftleft = (nec || x > 1 ? pp[-2] : left);
-  pixel_type_w toptop = (nec || y > 1 ? pp[-onerow - onerow] : top);
-  pixel_type_w toprightright =
-      (nec || (x + 2 < w && y) ? pp[2 - onerow] : topright);
-
-  if (compute_properties) {
-    // location
-    (*p)[offset++] = x;
-    // neighbors
-    (*p)[offset++] = top > 0 ? top : -top;
-    (*p)[offset++] = left > 0 ? left : -left;
-    (*p)[offset++] = top;
-    (*p)[offset++] = left;
-
-    // local gradient
-    (*p)[offset] = left - (*p)[offset + 1];
-    offset++;
-    // local gradient
-    (*p)[offset++] = left + top - topleft;
-
-    // FFV1 context properties
-    (*p)[offset++] = left - topleft;
-    (*p)[offset++] = topleft - top;
-    (*p)[offset++] = top - topright;
-    (*p)[offset++] = top - toptop;
-    (*p)[offset++] = left - leftleft;
-  }
-
-  pixel_type_w wp_pred = 0;
-  if (mode & kUseWP) {
-    wp_pred = wp_state->Predict<compute_properties>(
-        x, y, w, top, left, topright, topleft, toptop, p, offset);
-  }
-  if (!nec && compute_properties) {
-    offset += weighted::kNumProperties;
-    // Extra properties.
-    const pixel_type *JXL_RESTRICT rp = references->Row(x);
-    for (size_t i = 0; i < references->w; i++) {
-      (*p)[offset++] = rp[i];
-    }
-  }
-  PredictionResult result;
-  if (mode & kUseTree) {
-    MATreeLookup::LookupResult lr = lookup->Lookup(*p);
-    result.context = lr.context;
-    result.guess = lr.offset;
-    result.multiplier = lr.multiplier;
-    predictor = lr.predictor;
-  }
-  if (mode & kAllPredictions) {
-    for (size_t i = 0; i < kNumModularPredictors; i++) {
-      predictions[i] =
-          PredictOne(static_cast<Predictor>(i), left, top, toptop, topleft,
-                     topright, leftleft, toprightright, wp_pred);
-    }
-  }
-  result.guess += PredictOne(predictor, left, top, toptop, topleft, topright,
-                             leftleft, toprightright, wp_pred);
-  result.predictor = predictor;
-
-  return result;
-}
-}  // namespace detail
-
-inline PredictionResult PredictNoTreeNoWP(size_t w,
-                                          const pixel_type *JXL_RESTRICT pp,
-                                          const intptr_t onerow, const int x,
-                                          const int y, Predictor predictor) {
-  return detail::Predict</*mode=*/0>(
-      /*p=*/nullptr, w, pp, onerow, x, y, predictor, /*lookup=*/nullptr,
-      /*references=*/nullptr, /*wp_state=*/nullptr, /*predictions=*/nullptr);
-}
-
-inline PredictionResult PredictNoTreeWP(size_t w,
-                                        const pixel_type *JXL_RESTRICT pp,
-                                        const intptr_t onerow, const int x,
-                                        const int y, Predictor predictor,
-                                        weighted::State *wp_state) {
-  return detail::Predict<detail::kUseWP>(
-      /*p=*/nullptr, w, pp, onerow, x, y, predictor, /*lookup=*/nullptr,
-      /*references=*/nullptr, wp_state, /*predictions=*/nullptr);
-}
-
-inline PredictionResult PredictTreeNoWP(Properties *p, size_t w,
-                                        const pixel_type *JXL_RESTRICT pp,
-                                        const intptr_t onerow, const int x,
-                                        const int y,
-                                        const MATreeLookup &tree_lookup,
-                                        const Channel &references) {
-  return detail::Predict<detail::kUseTree>(
-      p, w, pp, onerow, x, y, Predictor::Zero, &tree_lookup, &references,
-      /*wp_state=*/nullptr, /*predictions=*/nullptr);
-}
-// Only use for y > 1, x > 1, x < w-2, and empty references
-JXL_INLINE PredictionResult
-PredictTreeNoWPNEC(Properties *p, size_t w, const pixel_type *JXL_RESTRICT pp,
-                   const intptr_t onerow, const int x, const int y,
-                   const MATreeLookup &tree_lookup, const Channel &references) {
-  return detail::Predict<detail::kUseTree | detail::kNoEdgeCases>(
-      p, w, pp, onerow, x, y, Predictor::Zero, &tree_lookup, &references,
-      /*wp_state=*/nullptr, /*predictions=*/nullptr);
-}
-
-inline PredictionResult PredictTreeWP(Properties *p, size_t w,
-                                      const pixel_type *JXL_RESTRICT pp,
-                                      const intptr_t onerow, const int x,
-                                      const int y,
-                                      const MATreeLookup &tree_lookup,
-                                      const Channel &references,
-                                      weighted::State *wp_state) {
-  return detail::Predict<detail::kUseTree | detail::kUseWP>(
-      p, w, pp, onerow, x, y, Predictor::Zero, &tree_lookup, &references,
-      wp_state, /*predictions=*/nullptr);
-}
-JXL_INLINE PredictionResult PredictTreeWPNEC(Properties *p, size_t w,
-                                             const pixel_type *JXL_RESTRICT pp,
-                                             const intptr_t onerow, const int x,
-                                             const int y,
-                                             const MATreeLookup &tree_lookup,
-                                             const Channel &references,
-                                             weighted::State *wp_state) {
-  return detail::Predict<detail::kUseTree | detail::kUseWP |
-                         detail::kNoEdgeCases>(
-      p, w, pp, onerow, x, y, Predictor::Zero, &tree_lookup, &references,
-      wp_state, /*predictions=*/nullptr);
-}
-
-inline PredictionResult PredictLearn(Properties *p, size_t w,
-                                     const pixel_type *JXL_RESTRICT pp,
-                                     const intptr_t onerow, const int x,
-                                     const int y, Predictor predictor,
-                                     const Channel &references,
-                                     weighted::State *wp_state) {
-  return detail::Predict<detail::kForceComputeProperties | detail::kUseWP>(
-      p, w, pp, onerow, x, y, predictor, /*lookup=*/nullptr, &references,
-      wp_state, /*predictions=*/nullptr);
-}
-
-inline void PredictLearnAll(Properties *p, size_t w,
-                            const pixel_type *JXL_RESTRICT pp,
-                            const intptr_t onerow, const int x, const int y,
-                            const Channel &references,
-                            weighted::State *wp_state,
-                            pixel_type_w *predictions) {
-  detail::Predict<detail::kForceComputeProperties | detail::kUseWP |
-                  detail::kAllPredictions>(
-      p, w, pp, onerow, x, y, Predictor::Zero,
-      /*lookup=*/nullptr, &references, wp_state, predictions);
-}
-inline PredictionResult PredictLearnNEC(Properties *p, size_t w,
-                                        const pixel_type *JXL_RESTRICT pp,
-                                        const intptr_t onerow, const int x,
-                                        const int y, Predictor predictor,
-                                        const Channel &references,
-                                        weighted::State *wp_state) {
-  return detail::Predict<detail::kForceComputeProperties | detail::kUseWP |
-                         detail::kNoEdgeCases>(
-      p, w, pp, onerow, x, y, predictor, /*lookup=*/nullptr, &references,
-      wp_state, /*predictions=*/nullptr);
-}
-
-inline void PredictLearnAllNEC(Properties *p, size_t w,
-                               const pixel_type *JXL_RESTRICT pp,
-                               const intptr_t onerow, const int x, const int y,
-                               const Channel &references,
-                               weighted::State *wp_state,
-                               pixel_type_w *predictions) {
-  detail::Predict<detail::kForceComputeProperties | detail::kUseWP |
-                  detail::kAllPredictions | detail::kNoEdgeCases>(
-      p, w, pp, onerow, x, y, Predictor::Zero,
-      /*lookup=*/nullptr, &references, wp_state, predictions);
-}
-
-inline void PredictAllNoWP(size_t w, const pixel_type *JXL_RESTRICT pp,
-                           const intptr_t onerow, const int x, const int y,
-                           pixel_type_w *predictions) {
-  detail::Predict<detail::kAllPredictions>(
-      /*p=*/nullptr, w, pp, onerow, x, y, Predictor::Zero,
-      /*lookup=*/nullptr,
-      /*references=*/nullptr, /*wp_state=*/nullptr, predictions);
-}
-}  // namespace jxl
-
-#endif  // LIB_JXL_MODULAR_ENCODING_CONTEXT_PREDICT_H_
diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/dec_ma.cc b/third_party/jpeg-xl/lib/jxl/modular/encoding/dec_ma.cc
deleted file mode 100644
index 8278005639c26..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/encoding/dec_ma.cc
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/modular/encoding/dec_ma.h"
-
-#include <jxl/memory_manager.h>
-
-#include <limits>
-#include <vector>
-
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_ans.h"
-#include "lib/jxl/modular/encoding/ma_common.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/pack_signed.h"
-
-namespace jxl {
-
-namespace {
-
-Status ValidateTree(const Tree &tree) {
-  int num_properties = 0;
-  for (auto node : tree) {
-    if (node.property >= num_properties) {
-      num_properties = node.property + 1;
-    }
-  }
-  std::vector<int> height(tree.size());
-  std::vector<std::pair<pixel_type, pixel_type>> property_ranges(
-      num_properties * tree.size());
-  for (int i = 0; i < num_properties; i++) {
-    property_ranges[i].first = std::numeric_limits<pixel_type>::min();
-    property_ranges[i].second = std::numeric_limits<pixel_type>::max();
-  }
-  const int kHeightLimit = 2048;
-  for (size_t i = 0; i < tree.size(); i++) {
-    if (height[i] > kHeightLimit) {
-      return JXL_FAILURE("Tree too tall: %d", height[i]);
-    }
-    if (tree[i].property == -1) continue;
-    height[tree[i].lchild] = height[i] + 1;
-    height[tree[i].rchild] = height[i] + 1;
-    for (size_t p = 0; p < static_cast<size_t>(num_properties); p++) {
-      if (p == static_cast<size_t>(tree[i].property)) {
-        pixel_type l = property_ranges[i * num_properties + p].first;
-        pixel_type u = property_ranges[i * num_properties + p].second;
-        pixel_type val = tree[i].splitval;
-        if (l > val || u <= val) {
-          return JXL_FAILURE("Invalid tree");
-        }
-        property_ranges[tree[i].lchild * num_properties + p] =
-            std::make_pair(val + 1, u);
-        property_ranges[tree[i].rchild * num_properties + p] =
-            std::make_pair(l, val);
-      } else {
-        property_ranges[tree[i].lchild * num_properties + p] =
-            property_ranges[i * num_properties + p];
-        property_ranges[tree[i].rchild * num_properties + p] =
-            property_ranges[i * num_properties + p];
-      }
-    }
-  }
-  return true;
-}
-
-Status DecodeTree(BitReader *br, ANSSymbolReader *reader,
-                  const std::vector<uint8_t> &context_map, Tree *tree,
-                  size_t tree_size_limit) {
-  size_t leaf_id = 0;
-  size_t to_decode = 1;
-  tree->clear();
-  while (to_decode > 0) {
-    JXL_RETURN_IF_ERROR(br->AllReadsWithinBounds());
-    if (tree->size() > tree_size_limit) {
-      return JXL_FAILURE("Tree is too large: %" PRIuS " nodes vs %" PRIuS
-                         " max nodes",
-                         tree->size(), tree_size_limit);
-    }
-    to_decode--;
-    uint32_t prop1 = reader->ReadHybridUint(kPropertyContext, br, context_map);
-    if (prop1 > 256) return JXL_FAILURE("Invalid tree property value");
-    int property = prop1 - 1;
-    if (property == -1) {
-      size_t predictor =
-          reader->ReadHybridUint(kPredictorContext, br, context_map);
-      if (predictor >= kNumModularPredictors) {
-        return JXL_FAILURE("Invalid predictor");
-      }
-      int64_t predictor_offset =
-          UnpackSigned(reader->ReadHybridUint(kOffsetContext, br, context_map));
-      uint32_t mul_log =
-          reader->ReadHybridUint(kMultiplierLogContext, br, context_map);
-      if (mul_log >= 31) {
-        return JXL_FAILURE("Invalid multiplier logarithm");
-      }
-      uint32_t mul_bits =
-          reader->ReadHybridUint(kMultiplierBitsContext, br, context_map);
-      if (mul_bits >= (1u << (31u - mul_log)) - 1u) {
-        return JXL_FAILURE("Invalid multiplier");
-      }
-      uint32_t multiplier = (mul_bits + 1U) << mul_log;
-      tree->emplace_back(-1, 0, leaf_id++, 0, static_cast<Predictor>(predictor),
-                         predictor_offset, multiplier);
-      continue;
-    }
-    int splitval =
-        UnpackSigned(reader->ReadHybridUint(kSplitValContext, br, context_map));
-    tree->emplace_back(property, splitval, tree->size() + to_decode + 1,
-                       tree->size() + to_decode + 2, Predictor::Zero, 0, 1);
-    to_decode += 2;
-  }
-  return ValidateTree(*tree);
-}
-}  // namespace
-
-Status DecodeTree(JxlMemoryManager *memory_manager, BitReader *br, Tree *tree,
-                  size_t tree_size_limit) {
-  std::vector<uint8_t> tree_context_map;
-  ANSCode tree_code;
-  JXL_RETURN_IF_ERROR(DecodeHistograms(memory_manager, br, kNumTreeContexts,
-                                       &tree_code, &tree_context_map));
-  // TODO(eustas): investigate more infinite tree cases.
-  if (tree_code.degenerate_symbols[tree_context_map[kPropertyContext]] > 0) {
-    return JXL_FAILURE("Infinite tree");
-  }
-  JXL_ASSIGN_OR_RETURN(ANSSymbolReader reader,
-                       ANSSymbolReader::Create(&tree_code, br));
-  JXL_RETURN_IF_ERROR(DecodeTree(br, &reader, tree_context_map, tree,
-                                 std::min(tree_size_limit, kMaxTreeSize)));
-  if (!reader.CheckANSFinalState()) {
-    return JXL_FAILURE("ANS decode final state failed");
-  }
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/dec_ma.h b/third_party/jpeg-xl/lib/jxl/modular/encoding/dec_ma.h
deleted file mode 100644
index 1bce21b32b833..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/encoding/dec_ma.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_MODULAR_ENCODING_DEC_MA_H_
-#define LIB_JXL_MODULAR_ENCODING_DEC_MA_H_
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/modular/options.h"
-
-namespace jxl {
-
-// inner nodes
-struct PropertyDecisionNode {
-  PropertyVal splitval;
-  int16_t property;  // -1: leaf node, lchild points to leaf node
-  uint32_t lchild;
-  uint32_t rchild;
-  Predictor predictor;
-  int64_t predictor_offset;
-  uint32_t multiplier;
-
-  PropertyDecisionNode(int p, int split_val, int lchild, int rchild,
-                       Predictor predictor, int64_t predictor_offset,
-                       uint32_t multiplier)
-      : splitval(split_val),
-        property(p),
-        lchild(lchild),
-        rchild(rchild),
-        predictor(predictor),
-        predictor_offset(predictor_offset),
-        multiplier(multiplier) {}
-  PropertyDecisionNode()
-      : splitval(0),
-        property(-1),
-        lchild(0),
-        rchild(0),
-        predictor(Predictor::Zero),
-        predictor_offset(0),
-        multiplier(1) {}
-  static PropertyDecisionNode Leaf(Predictor predictor, int64_t offset = 0,
-                                   uint32_t multiplier = 1) {
-    return PropertyDecisionNode(-1, 0, 0, 0, predictor, offset, multiplier);
-  }
-  static PropertyDecisionNode Split(int p, int split_val, int lchild,
-                                    int rchild = -1) {
-    if (rchild == -1) rchild = lchild + 1;
-    return PropertyDecisionNode(p, split_val, lchild, rchild, Predictor::Zero,
-                                0, 1);
-  }
-};
-
-using Tree = std::vector<PropertyDecisionNode>;
-
-Status DecodeTree(JxlMemoryManager *memory_manager, BitReader *br, Tree *tree,
-                  size_t tree_size_limit);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_MODULAR_ENCODING_DEC_MA_H_
diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_debug_tree.cc b/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_debug_tree.cc
deleted file mode 100644
index f6d73a9ded4d9..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_debug_tree.cc
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/modular/encoding/enc_debug_tree.h"
-
-#include <cinttypes>  // PRId64
-#include <cstdlib>
-#include <string>
-
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/modular/encoding/context_predict.h"
-#include "lib/jxl/modular/encoding/dec_ma.h"
-#include "lib/jxl/modular/options.h"
-
-namespace jxl {
-
-namespace {
-const char *PredictorName(Predictor p) {
-  switch (p) {
-    case Predictor::Zero:
-      return "Zero";
-    case Predictor::Left:
-      return "Left";
-    case Predictor::Top:
-      return "Top";
-    case Predictor::Average0:
-      return "Avg0";
-    case Predictor::Average1:
-      return "Avg1";
-    case Predictor::Average2:
-      return "Avg2";
-    case Predictor::Average3:
-      return "Avg3";
-    case Predictor::Average4:
-      return "Avg4";
-    case Predictor::Select:
-      return "Sel";
-    case Predictor::Gradient:
-      return "Grd";
-    case Predictor::Weighted:
-      return "Wgh";
-    case Predictor::TopLeft:
-      return "TopL";
-    case Predictor::TopRight:
-      return "TopR";
-    case Predictor::LeftLeft:
-      return "LL";
-    default:
-      return "INVALID";
-  };
-}
-
-std::string PropertyName(size_t i) {
-  static_assert(kNumNonrefProperties == 16, "Update this function");
-  switch (i) {
-    case 0:
-      return "c";
-    case 1:
-      return "g";
-    case 2:
-      return "y";
-    case 3:
-      return "x";
-    case 4:
-      return "|N|";
-    case 5:
-      return "|W|";
-    case 6:
-      return "N";
-    case 7:
-      return "W";
-    case 8:
-      return "W-WW-NW+NWW";
-    case 9:
-      return "W+N-NW";
-    case 10:
-      return "W-NW";
-    case 11:
-      return "NW-N";
-    case 12:
-      return "N-NE";
-    case 13:
-      return "N-NN";
-    case 14:
-      return "W-WW";
-    case 15:
-      return "WGH";
-    default:
-      return "ch[" + ToString(15 - static_cast<int>(i)) + "]";
-  }
-}
-
-}  // namespace
-
-void PrintTree(const Tree &tree, const std::string &path) {
-  FILE *f = fopen((path + ".dot").c_str(), "w");
-  fprintf(f, "graph{\n");
-  for (size_t cur = 0; cur < tree.size(); cur++) {
-    if (tree[cur].property < 0) {
-      fprintf(f, "n%05" PRIuS " [label=\"%s%+" PRId64 " (x%u)\"];\n", cur,
-              PredictorName(tree[cur].predictor), tree[cur].predictor_offset,
-              tree[cur].multiplier);
-    } else {
-      fprintf(f, "n%05" PRIuS " [label=\"%s>%d\"];\n", cur,
-              PropertyName(tree[cur].property).c_str(), tree[cur].splitval);
-      fprintf(f, "n%05" PRIuS " -- n%05d;\n", cur, tree[cur].lchild);
-      fprintf(f, "n%05" PRIuS " -- n%05d;\n", cur, tree[cur].rchild);
-    }
-  }
-  fprintf(f, "}\n");
-  fclose(f);
-#if JXL_ENABLE_DOT
-  system(("dot " + path + ".dot -T svg -o " + path + ".svg").c_str());
-#endif
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_debug_tree.h b/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_debug_tree.h
deleted file mode 100644
index a87960db228a5..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_debug_tree.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_MODULAR_ENCODING_ENC_DEBUG_TREE_H_
-#define LIB_JXL_MODULAR_ENCODING_ENC_DEBUG_TREE_H_
-
-#include <string>
-
-#include "lib/jxl/modular/encoding/dec_ma.h"
-
-namespace jxl {
-
-void PrintTree(const Tree &tree, const std::string &path);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_MODULAR_ENCODING_ENC_DEBUG_TREE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_encoding.cc b/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_encoding.cc
deleted file mode 100644
index 3fd845b9edbf5..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_encoding.cc
+++ /dev/null
@@ -1,761 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <array>
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>
-#include <limits>
-#include <queue>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_ans.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/enc_fields.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/modular/encoding/context_predict.h"
-#include "lib/jxl/modular/encoding/enc_ma.h"
-#include "lib/jxl/modular/encoding/encoding.h"
-#include "lib/jxl/modular/encoding/ma_common.h"
-#include "lib/jxl/modular/options.h"
-#include "lib/jxl/pack_signed.h"
-
-namespace jxl {
-
-namespace {
-// Plot tree (if enabled) and predictor usage map.
-constexpr bool kWantDebug = true;
-// constexpr bool kPrintTree = false;
-
-inline std::array<uint8_t, 3> PredictorColor(Predictor p) {
-  switch (p) {
-    case Predictor::Zero:
-      return {{0, 0, 0}};
-    case Predictor::Left:
-      return {{255, 0, 0}};
-    case Predictor::Top:
-      return {{0, 255, 0}};
-    case Predictor::Average0:
-      return {{0, 0, 255}};
-    case Predictor::Average4:
-      return {{192, 128, 128}};
-    case Predictor::Select:
-      return {{255, 255, 0}};
-    case Predictor::Gradient:
-      return {{255, 0, 255}};
-    case Predictor::Weighted:
-      return {{0, 255, 255}};
-      // TODO(jon)
-    default:
-      return {{255, 255, 255}};
-  };
-}
-
-// `cutoffs` must be sorted.
-Tree MakeFixedTree(int property, const std::vector<int32_t> &cutoffs,
-                   Predictor pred, size_t num_pixels, int bitdepth) {
-  size_t log_px = CeilLog2Nonzero(num_pixels);
-  size_t min_gap = 0;
-  // Reduce fixed tree height when encoding small images.
-  if (log_px < 14) {
-    min_gap = 8 * (14 - log_px);
-  }
-  const int shift = bitdepth > 11 ? std::min(4, bitdepth - 11) : 0;
-  const int mul = 1 << shift;
-  Tree tree;
-  struct NodeInfo {
-    size_t begin, end, pos;
-  };
-  std::queue<NodeInfo> q;
-  // Leaf IDs will be set by roundtrip decoding the tree.
-  tree.push_back(PropertyDecisionNode::Leaf(pred));
-  q.push(NodeInfo{0, cutoffs.size(), 0});
-  while (!q.empty()) {
-    NodeInfo info = q.front();
-    q.pop();
-    if (info.begin + min_gap >= info.end) continue;
-    uint32_t split = (info.begin + info.end) / 2;
-    int32_t cutoff = cutoffs[split] * mul;
-    tree[info.pos] = PropertyDecisionNode::Split(property, cutoff, tree.size());
-    q.push(NodeInfo{split + 1, info.end, tree.size()});
-    tree.push_back(PropertyDecisionNode::Leaf(pred));
-    q.push(NodeInfo{info.begin, split, tree.size()});
-    tree.push_back(PropertyDecisionNode::Leaf(pred));
-  }
-  return tree;
-}
-
-}  // namespace
-
-Status GatherTreeData(const Image &image, pixel_type chan, size_t group_id,
-                      const weighted::Header &wp_header,
-                      const ModularOptions &options, TreeSamples &tree_samples,
-                      size_t *total_pixels) {
-  const Channel &channel = image.channel[chan];
-  JxlMemoryManager *memory_manager = channel.memory_manager();
-
-  JXL_DEBUG_V(7, "Learning %" PRIuS "x%" PRIuS " channel %d", channel.w,
-              channel.h, chan);
-
-  std::array<pixel_type, kNumStaticProperties> static_props = {
-      {chan, static_cast<int>(group_id)}};
-  Properties properties(kNumNonrefProperties +
-                        kExtraPropsPerChannel * options.max_properties);
-  double pixel_fraction = std::min(1.0f, options.nb_repeats);
-  // a fraction of 0 is used to disable learning entirely.
-  if (pixel_fraction > 0) {
-    pixel_fraction = std::max(pixel_fraction,
-                              std::min(1.0, 1024.0 / (channel.w * channel.h)));
-  }
-  uint64_t threshold =
-      (std::numeric_limits<uint64_t>::max() >> 32) * pixel_fraction;
-  uint64_t s[2] = {static_cast<uint64_t>(0x94D049BB133111EBull),
-                   static_cast<uint64_t>(0xBF58476D1CE4E5B9ull)};
-  // Xorshift128+ adapted from xorshift128+-inl.h
-  auto use_sample = [&]() {
-    auto s1 = s[0];
-    const auto s0 = s[1];
-    const auto bits = s1 + s0;  // b, c
-    s[0] = s0;
-    s1 ^= s1 << 23;
-    s1 ^= s0 ^ (s1 >> 18) ^ (s0 >> 5);
-    s[1] = s1;
-    return (bits >> 32) <= threshold;
-  };
-
-  const intptr_t onerow = channel.plane.PixelsPerRow();
-  JXL_ASSIGN_OR_RETURN(
-      Channel references,
-      Channel::Create(memory_manager, properties.size() - kNumNonrefProperties,
-                      channel.w));
-  weighted::State wp_state(wp_header, channel.w, channel.h);
-  tree_samples.PrepareForSamples(pixel_fraction * channel.h * channel.w + 64);
-  const bool multiple_predictors = tree_samples.NumPredictors() != 1;
-  auto compute_sample = [&](const pixel_type *p, size_t x, size_t y) {
-    pixel_type_w pred[kNumModularPredictors];
-    if (multiple_predictors) {
-      PredictLearnAll(&properties, channel.w, p + x, onerow, x, y, references,
-                      &wp_state, pred);
-    } else {
-      pred[static_cast<int>(tree_samples.PredictorFromIndex(0))] =
-          PredictLearn(&properties, channel.w, p + x, onerow, x, y,
-                       tree_samples.PredictorFromIndex(0), references,
-                       &wp_state)
-              .guess;
-    }
-    (*total_pixels)++;
-    if (use_sample()) {
-      tree_samples.AddSample(p[x], properties, pred);
-    }
-    wp_state.UpdateErrors(p[x], x, y, channel.w);
-  };
-
-  for (size_t y = 0; y < channel.h; y++) {
-    const pixel_type *JXL_RESTRICT p = channel.Row(y);
-    PrecomputeReferences(channel, y, image, chan, &references);
-    InitPropsRow(&properties, static_props, y);
-
-    // TODO(veluca): avoid computing WP if we don't use its property or
-    // predictions.
-    if (y > 1 && channel.w > 8 && references.w == 0) {
-      for (size_t x = 0; x < 2; x++) {
-        compute_sample(p, x, y);
-      }
-      for (size_t x = 2; x < channel.w - 2; x++) {
-        pixel_type_w pred[kNumModularPredictors];
-        if (multiple_predictors) {
-          PredictLearnAllNEC(&properties, channel.w, p + x, onerow, x, y,
-                             references, &wp_state, pred);
-        } else {
-          pred[static_cast<int>(tree_samples.PredictorFromIndex(0))] =
-              PredictLearnNEC(&properties, channel.w, p + x, onerow, x, y,
-                              tree_samples.PredictorFromIndex(0), references,
-                              &wp_state)
-                  .guess;
-        }
-        (*total_pixels)++;
-        if (use_sample()) {
-          tree_samples.AddSample(p[x], properties, pred);
-        }
-        wp_state.UpdateErrors(p[x], x, y, channel.w);
-      }
-      for (size_t x = channel.w - 2; x < channel.w; x++) {
-        compute_sample(p, x, y);
-      }
-    } else {
-      for (size_t x = 0; x < channel.w; x++) {
-        compute_sample(p, x, y);
-      }
-    }
-  }
-  return true;
-}
-
-Tree PredefinedTree(ModularOptions::TreeKind tree_kind, size_t total_pixels,
-                    int bitdepth, int prevprop) {
-  switch (tree_kind) {
-    case ModularOptions::TreeKind::kJpegTranscodeACMeta:
-      // All the data is 0, so no need for a fancy tree.
-      return {PropertyDecisionNode::Leaf(Predictor::Zero)};
-    case ModularOptions::TreeKind::kTrivialTreeNoPredictor:
-      // All the data is 0, so no need for a fancy tree.
-      return {PropertyDecisionNode::Leaf(Predictor::Zero)};
-    case ModularOptions::TreeKind::kFalconACMeta:
-      // All the data is 0 except the quant field. TODO(veluca): make that 0
-      // too.
-      return {PropertyDecisionNode::Leaf(Predictor::Left)};
-    case ModularOptions::TreeKind::kACMeta: {
-      // Small image.
-      if (total_pixels < 1024) {
-        return {PropertyDecisionNode::Leaf(Predictor::Left)};
-      }
-      Tree tree;
-      // 0: c > 1
-      tree.push_back(PropertyDecisionNode::Split(0, 1, 1));
-      // 1: c > 2
-      tree.push_back(PropertyDecisionNode::Split(0, 2, 3));
-      // 2: c > 0
-      tree.push_back(PropertyDecisionNode::Split(0, 0, 5));
-      // 3: EPF control field (all 0 or 4), top > 3
-      tree.push_back(PropertyDecisionNode::Split(6, 3, 21));
-      // 4: ACS+QF, y > 0
-      tree.push_back(PropertyDecisionNode::Split(2, 0, 7));
-      // 5: CfL x
-      tree.push_back(PropertyDecisionNode::Leaf(Predictor::Gradient));
-      // 6: CfL b
-      tree.push_back(PropertyDecisionNode::Leaf(Predictor::Gradient));
-      // 7: QF: split according to the left quant value.
-      tree.push_back(PropertyDecisionNode::Split(7, 5, 9));
-      // 8: ACS: split in 4 segments (8x8 from 0 to 3, large square 4-5, large
-      // rectangular 6-11, 8x8 12+), according to previous ACS value.
-      tree.push_back(PropertyDecisionNode::Split(7, 5, 15));
-      // QF
-      tree.push_back(PropertyDecisionNode::Split(7, 11, 11));
-      tree.push_back(PropertyDecisionNode::Split(7, 3, 13));
-      tree.push_back(PropertyDecisionNode::Leaf(Predictor::Left));
-      tree.push_back(PropertyDecisionNode::Leaf(Predictor::Left));
-      tree.push_back(PropertyDecisionNode::Leaf(Predictor::Left));
-      tree.push_back(PropertyDecisionNode::Leaf(Predictor::Left));
-      // ACS
-      tree.push_back(PropertyDecisionNode::Split(7, 11, 17));
-      tree.push_back(PropertyDecisionNode::Split(7, 3, 19));
-      tree.push_back(PropertyDecisionNode::Leaf(Predictor::Zero));
-      tree.push_back(PropertyDecisionNode::Leaf(Predictor::Zero));
-      tree.push_back(PropertyDecisionNode::Leaf(Predictor::Zero));
-      tree.push_back(PropertyDecisionNode::Leaf(Predictor::Zero));
-      // EPF, left > 3
-      tree.push_back(PropertyDecisionNode::Split(7, 3, 23));
-      tree.push_back(PropertyDecisionNode::Split(7, 3, 25));
-      tree.push_back(PropertyDecisionNode::Leaf(Predictor::Zero));
-      tree.push_back(PropertyDecisionNode::Leaf(Predictor::Zero));
-      tree.push_back(PropertyDecisionNode::Leaf(Predictor::Zero));
-      tree.push_back(PropertyDecisionNode::Leaf(Predictor::Zero));
-      return tree;
-    }
-    case ModularOptions::TreeKind::kWPFixedDC: {
-      std::vector<int32_t> cutoffs = {
-          -500, -392, -255, -191, -127, -95, -63, -47, -31, -23, -15,
-          -11,  -7,   -4,   -3,   -1,   0,   1,   3,   5,   7,   11,
-          15,   23,   31,   47,   63,   95,  127, 191, 255, 392, 500};
-      return MakeFixedTree(kWPProp, cutoffs, Predictor::Weighted, total_pixels,
-                           bitdepth);
-    }
-    case ModularOptions::TreeKind::kGradientFixedDC: {
-      std::vector<int32_t> cutoffs = {
-          -500, -392, -255, -191, -127, -95, -63, -47, -31, -23, -15,
-          -11,  -7,   -4,   -3,   -1,   0,   1,   3,   5,   7,   11,
-          15,   23,   31,   47,   63,   95,  127, 191, 255, 392, 500};
-      return MakeFixedTree(
-          prevprop > 0 ? kNumNonrefProperties + 2 : kGradientProp, cutoffs,
-          Predictor::Gradient, total_pixels, bitdepth);
-    }
-    case ModularOptions::TreeKind::kLearn: {
-      JXL_DEBUG_ABORT("internal: kLearn is not predefined tree");
-      return {};
-    }
-  }
-  JXL_DEBUG_ABORT("internal: unexpected TreeKind: %d",
-                  static_cast<int>(tree_kind));
-  return {};
-}
-
-StatusOr<Tree> LearnTree(
-    TreeSamples &&tree_samples, size_t total_pixels,
-    const ModularOptions &options,
-    const std::vector<ModularMultiplierInfo> &multiplier_info = {},
-    StaticPropRange static_prop_range = {}) {
-  Tree tree;
-  for (size_t i = 0; i < kNumStaticProperties; i++) {
-    if (static_prop_range[i][1] == 0) {
-      static_prop_range[i][1] = std::numeric_limits<uint32_t>::max();
-    }
-  }
-  if (!tree_samples.HasSamples()) {
-    tree.emplace_back();
-    tree.back().predictor = tree_samples.PredictorFromIndex(0);
-    tree.back().property = -1;
-    tree.back().predictor_offset = 0;
-    tree.back().multiplier = 1;
-    return tree;
-  }
-  float pixel_fraction = tree_samples.NumSamples() * 1.0f / total_pixels;
-  float required_cost = pixel_fraction * 0.9 + 0.1;
-  tree_samples.AllSamplesDone();
-  JXL_RETURN_IF_ERROR(ComputeBestTree(
-      tree_samples, options.splitting_heuristics_node_threshold * required_cost,
-      multiplier_info, static_prop_range, options.fast_decode_multiplier,
-      &tree));
-  return tree;
-}
-
-Status EncodeModularChannelMAANS(const Image &image, pixel_type chan,
-                                 const weighted::Header &wp_header,
-                                 const Tree &global_tree, Token **tokenpp,
-                                 AuxOut *aux_out, size_t group_id,
-                                 bool skip_encoder_fast_path) {
-  const Channel &channel = image.channel[chan];
-  JxlMemoryManager *memory_manager = channel.memory_manager();
-  Token *tokenp = *tokenpp;
-  JXL_ENSURE(channel.w != 0 && channel.h != 0);
-
-  Image3F predictor_img;
-  if (kWantDebug) {
-    JXL_ASSIGN_OR_RETURN(predictor_img,
-                         Image3F::Create(memory_manager, channel.w, channel.h));
-  }
-
-  JXL_DEBUG_V(6,
-              "Encoding %" PRIuS "x%" PRIuS
-              " channel %d, "
-              "(shift=%i,%i)",
-              channel.w, channel.h, chan, channel.hshift, channel.vshift);
-
-  std::array<pixel_type, kNumStaticProperties> static_props = {
-      {chan, static_cast<int>(group_id)}};
-  bool use_wp;
-  bool is_wp_only;
-  bool is_gradient_only;
-  size_t num_props;
-  FlatTree tree = FilterTree(global_tree, static_props, &num_props, &use_wp,
-                             &is_wp_only, &is_gradient_only);
-  Properties properties(num_props);
-  MATreeLookup tree_lookup(tree);
-  JXL_DEBUG_V(3, "Encoding using a MA tree with %" PRIuS " nodes", tree.size());
-
-  // Check if this tree is a WP-only tree with a small enough property value
-  // range.
-  // Initialized to avoid clang-tidy complaining.
-  auto tree_lut = jxl::make_unique<TreeLut<uint16_t, false, false>>();
-  if (is_wp_only) {
-    is_wp_only = TreeToLookupTable(tree, *tree_lut);
-  }
-  if (is_gradient_only) {
-    is_gradient_only = TreeToLookupTable(tree, *tree_lut);
-  }
-
-  if (is_wp_only && !skip_encoder_fast_path) {
-    for (size_t c = 0; c < 3; c++) {
-      FillImage(static_cast<float>(PredictorColor(Predictor::Weighted)[c]),
-                &predictor_img.Plane(c));
-    }
-    const intptr_t onerow = channel.plane.PixelsPerRow();
-    weighted::State wp_state(wp_header, channel.w, channel.h);
-    Properties properties(1);
-    for (size_t y = 0; y < channel.h; y++) {
-      const pixel_type *JXL_RESTRICT r = channel.Row(y);
-      for (size_t x = 0; x < channel.w; x++) {
-        size_t offset = 0;
-        pixel_type_w left = (x ? r[x - 1] : y ? *(r + x - onerow) : 0);
-        pixel_type_w top = (y ? *(r + x - onerow) : left);
-        pixel_type_w topleft = (x && y ? *(r + x - 1 - onerow) : left);
-        pixel_type_w topright =
-            (x + 1 < channel.w && y ? *(r + x + 1 - onerow) : top);
-        pixel_type_w toptop = (y > 1 ? *(r + x - onerow - onerow) : top);
-        int32_t guess = wp_state.Predict</*compute_properties=*/true>(
-            x, y, channel.w, top, left, topright, topleft, toptop, &properties,
-            offset);
-        uint32_t pos =
-            kPropRangeFast + std::min(std::max(-kPropRangeFast, properties[0]),
-                                      kPropRangeFast - 1);
-        uint32_t ctx_id = tree_lut->context_lookup[pos];
-        int32_t residual = r[x] - guess;
-        *tokenp++ = Token(ctx_id, PackSigned(residual));
-        wp_state.UpdateErrors(r[x], x, y, channel.w);
-      }
-    }
-  } else if (tree.size() == 1 && tree[0].predictor == Predictor::Gradient &&
-             tree[0].multiplier == 1 && tree[0].predictor_offset == 0 &&
-             !skip_encoder_fast_path) {
-    for (size_t c = 0; c < 3; c++) {
-      FillImage(static_cast<float>(PredictorColor(Predictor::Gradient)[c]),
-                &predictor_img.Plane(c));
-    }
-    const intptr_t onerow = channel.plane.PixelsPerRow();
-    for (size_t y = 0; y < channel.h; y++) {
-      const pixel_type *JXL_RESTRICT r = channel.Row(y);
-      for (size_t x = 0; x < channel.w; x++) {
-        pixel_type_w left = (x ? r[x - 1] : y ? *(r + x - onerow) : 0);
-        pixel_type_w top = (y ? *(r + x - onerow) : left);
-        pixel_type_w topleft = (x && y ? *(r + x - 1 - onerow) : left);
-        int32_t guess = ClampedGradient(top, left, topleft);
-        int32_t residual = r[x] - guess;
-        *tokenp++ = Token(tree[0].childID, PackSigned(residual));
-      }
-    }
-  } else if (is_gradient_only && !skip_encoder_fast_path) {
-    for (size_t c = 0; c < 3; c++) {
-      FillImage(static_cast<float>(PredictorColor(Predictor::Gradient)[c]),
-                &predictor_img.Plane(c));
-    }
-    const intptr_t onerow = channel.plane.PixelsPerRow();
-    for (size_t y = 0; y < channel.h; y++) {
-      const pixel_type *JXL_RESTRICT r = channel.Row(y);
-      for (size_t x = 0; x < channel.w; x++) {
-        pixel_type_w left = (x ? r[x - 1] : y ? *(r + x - onerow) : 0);
-        pixel_type_w top = (y ? *(r + x - onerow) : left);
-        pixel_type_w topleft = (x && y ? *(r + x - 1 - onerow) : left);
-        int32_t guess = ClampedGradient(top, left, topleft);
-        uint32_t pos =
-            kPropRangeFast +
-            std::min<pixel_type_w>(
-                std::max<pixel_type_w>(-kPropRangeFast, top + left - topleft),
-                kPropRangeFast - 1);
-        uint32_t ctx_id = tree_lut->context_lookup[pos];
-        int32_t residual = r[x] - guess;
-        *tokenp++ = Token(ctx_id, PackSigned(residual));
-      }
-    }
-  } else if (tree.size() == 1 && tree[0].predictor == Predictor::Zero &&
-             tree[0].multiplier == 1 && tree[0].predictor_offset == 0 &&
-             !skip_encoder_fast_path) {
-    for (size_t c = 0; c < 3; c++) {
-      FillImage(static_cast<float>(PredictorColor(Predictor::Zero)[c]),
-                &predictor_img.Plane(c));
-    }
-    for (size_t y = 0; y < channel.h; y++) {
-      const pixel_type *JXL_RESTRICT p = channel.Row(y);
-      for (size_t x = 0; x < channel.w; x++) {
-        *tokenp++ = Token(tree[0].childID, PackSigned(p[x]));
-      }
-    }
-  } else if (tree.size() == 1 && tree[0].predictor != Predictor::Weighted &&
-             (tree[0].multiplier & (tree[0].multiplier - 1)) == 0 &&
-             tree[0].predictor_offset == 0 && !skip_encoder_fast_path) {
-    // multiplier is a power of 2.
-    for (size_t c = 0; c < 3; c++) {
-      FillImage(static_cast<float>(PredictorColor(tree[0].predictor)[c]),
-                &predictor_img.Plane(c));
-    }
-    uint32_t mul_shift =
-        FloorLog2Nonzero(static_cast<uint32_t>(tree[0].multiplier));
-    const intptr_t onerow = channel.plane.PixelsPerRow();
-    for (size_t y = 0; y < channel.h; y++) {
-      const pixel_type *JXL_RESTRICT r = channel.Row(y);
-      for (size_t x = 0; x < channel.w; x++) {
-        PredictionResult pred = PredictNoTreeNoWP(channel.w, r + x, onerow, x,
-                                                  y, tree[0].predictor);
-        pixel_type_w residual = r[x] - pred.guess;
-        JXL_DASSERT((residual >> mul_shift) * tree[0].multiplier == residual);
-        *tokenp++ = Token(tree[0].childID, PackSigned(residual >> mul_shift));
-      }
-    }
-
-  } else if (!use_wp && !skip_encoder_fast_path) {
-    const intptr_t onerow = channel.plane.PixelsPerRow();
-    JXL_ASSIGN_OR_RETURN(
-        Channel references,
-        Channel::Create(memory_manager,
-                        properties.size() - kNumNonrefProperties, channel.w));
-    for (size_t y = 0; y < channel.h; y++) {
-      const pixel_type *JXL_RESTRICT p = channel.Row(y);
-      PrecomputeReferences(channel, y, image, chan, &references);
-      float *pred_img_row[3];
-      if (kWantDebug) {
-        for (size_t c = 0; c < 3; c++) {
-          pred_img_row[c] = predictor_img.PlaneRow(c, y);
-        }
-      }
-      InitPropsRow(&properties, static_props, y);
-      for (size_t x = 0; x < channel.w; x++) {
-        PredictionResult res =
-            PredictTreeNoWP(&properties, channel.w, p + x, onerow, x, y,
-                            tree_lookup, references);
-        if (kWantDebug) {
-          for (size_t i = 0; i < 3; i++) {
-            pred_img_row[i][x] = PredictorColor(res.predictor)[i];
-          }
-        }
-        pixel_type_w residual = p[x] - res.guess;
-        JXL_DASSERT(residual % res.multiplier == 0);
-        *tokenp++ = Token(res.context, PackSigned(residual / res.multiplier));
-      }
-    }
-  } else {
-    const intptr_t onerow = channel.plane.PixelsPerRow();
-    JXL_ASSIGN_OR_RETURN(
-        Channel references,
-        Channel::Create(memory_manager,
-                        properties.size() - kNumNonrefProperties, channel.w));
-    weighted::State wp_state(wp_header, channel.w, channel.h);
-    for (size_t y = 0; y < channel.h; y++) {
-      const pixel_type *JXL_RESTRICT p = channel.Row(y);
-      PrecomputeReferences(channel, y, image, chan, &references);
-      float *pred_img_row[3];
-      if (kWantDebug) {
-        for (size_t c = 0; c < 3; c++) {
-          pred_img_row[c] = predictor_img.PlaneRow(c, y);
-        }
-      }
-      InitPropsRow(&properties, static_props, y);
-      for (size_t x = 0; x < channel.w; x++) {
-        PredictionResult res =
-            PredictTreeWP(&properties, channel.w, p + x, onerow, x, y,
-                          tree_lookup, references, &wp_state);
-        if (kWantDebug) {
-          for (size_t i = 0; i < 3; i++) {
-            pred_img_row[i][x] = PredictorColor(res.predictor)[i];
-          }
-        }
-        pixel_type_w residual = p[x] - res.guess;
-        JXL_DASSERT(residual % res.multiplier == 0);
-        *tokenp++ = Token(res.context, PackSigned(residual / res.multiplier));
-        wp_state.UpdateErrors(p[x], x, y, channel.w);
-      }
-    }
-  }
-  /* TODO(szabadka): Add cparams to the call stack here.
-  if (kWantDebug && WantDebugOutput(cparams)) {
-    DumpImage(
-        cparams,
-        ("pred_" + ToString(group_id) + "_" + ToString(chan)).c_str(),
-        predictor_img);
-  }
-  */
-  *tokenpp = tokenp;
-  return true;
-}
-
-Status ModularEncode(const Image &image, const ModularOptions &options,
-                     BitWriter *writer, AuxOut *aux_out, LayerType layer,
-                     size_t group_id, TreeSamples *tree_samples,
-                     size_t *total_pixels, const Tree *tree,
-                     GroupHeader *header, std::vector<Token> *tokens,
-                     size_t *width) {
-  if (image.error) return JXL_FAILURE("Invalid image");
-  JxlMemoryManager *memory_manager = image.memory_manager();
-  size_t nb_channels = image.channel.size();
-  JXL_DEBUG_V(
-      2, "Encoding %" PRIuS "-channel, %i-bit, %" PRIuS "x%" PRIuS " image.",
-      nb_channels, image.bitdepth, image.w, image.h);
-
-  if (nb_channels < 1) {
-    return true;  // is there any use for a zero-channel image?
-  }
-
-  // encode transforms
-  GroupHeader header_storage;
-  if (header == nullptr) header = &header_storage;
-  Bundle::Init(header);
-  if (options.predictor == Predictor::Weighted) {
-    weighted::PredictorMode(options.wp_mode, &header->wp_header);
-  }
-  header->transforms = image.transform;
-  // This doesn't actually work
-  if (tree != nullptr) {
-    header->use_global_tree = true;
-  }
-  if (tree_samples == nullptr && tree == nullptr) {
-    JXL_RETURN_IF_ERROR(Bundle::Write(*header, writer, layer, aux_out));
-  }
-
-  TreeSamples tree_samples_storage;
-  size_t total_pixels_storage = 0;
-  if (!total_pixels) total_pixels = &total_pixels_storage;
-  if (*total_pixels == 0) {
-    for (size_t i = 0; i < nb_channels; i++) {
-      if (i >= image.nb_meta_channels &&
-          (image.channel[i].w > options.max_chan_size ||
-           image.channel[i].h > options.max_chan_size)) {
-        break;
-      }
-      *total_pixels += image.channel[i].w * image.channel[i].h;
-    }
-    *total_pixels = std::max<size_t>(*total_pixels, 1);
-  }
-  // If there's no tree, compute one (or gather data to).
-  if (tree == nullptr &&
-      options.tree_kind == ModularOptions::TreeKind::kLearn) {
-    bool gather_data = tree_samples != nullptr;
-    if (tree_samples == nullptr) {
-      JXL_RETURN_IF_ERROR(tree_samples_storage.SetPredictor(
-          options.predictor, options.wp_tree_mode));
-      JXL_RETURN_IF_ERROR(tree_samples_storage.SetProperties(
-          options.splitting_heuristics_properties, options.wp_tree_mode));
-      std::vector<pixel_type> pixel_samples;
-      std::vector<pixel_type> diff_samples;
-      std::vector<uint32_t> group_pixel_count;
-      std::vector<uint32_t> channel_pixel_count;
-      CollectPixelSamples(image, options, 0, group_pixel_count,
-                          channel_pixel_count, pixel_samples, diff_samples);
-      std::vector<ModularMultiplierInfo> placeholder_multiplier_info;
-      StaticPropRange range;
-      tree_samples_storage.PreQuantizeProperties(
-          range, placeholder_multiplier_info, group_pixel_count,
-          channel_pixel_count, pixel_samples, diff_samples,
-          options.max_property_values);
-    }
-    for (size_t i = 0; i < nb_channels; i++) {
-      if (!image.channel[i].w || !image.channel[i].h) {
-        continue;  // skip empty channels
-      }
-      if (i >= image.nb_meta_channels &&
-          (image.channel[i].w > options.max_chan_size ||
-           image.channel[i].h > options.max_chan_size)) {
-        break;
-      }
-      JXL_RETURN_IF_ERROR(GatherTreeData(
-          image, i, group_id, header->wp_header, options,
-          gather_data ? *tree_samples : tree_samples_storage, total_pixels));
-    }
-    if (gather_data) return true;
-  }
-
-  JXL_ENSURE((tree == nullptr) == (tokens == nullptr));
-
-  Tree tree_storage;
-  std::vector<std::vector<Token>> tokens_storage(1);
-  // Compute tree.
-  if (tree == nullptr) {
-    EntropyEncodingData code;
-    std::vector<uint8_t> context_map;
-
-    std::vector<std::vector<Token>> tree_tokens(1);
-    if (options.tree_kind == ModularOptions::TreeKind::kLearn) {
-      JXL_ASSIGN_OR_RETURN(
-          tree_storage,
-          LearnTree(std::move(tree_samples_storage), *total_pixels, options));
-    } else {
-      tree_storage = PredefinedTree(options.tree_kind, *total_pixels,
-                                    image.bitdepth, options.max_properties);
-    }
-    tree = &tree_storage;
-    tokens = tokens_storage.data();
-
-    Tree decoded_tree;
-    JXL_RETURN_IF_ERROR(TokenizeTree(*tree, tree_tokens.data(), &decoded_tree));
-    JXL_ENSURE(tree->size() == decoded_tree.size());
-    tree_storage = std::move(decoded_tree);
-
-    /* TODO(szabadka) Add text output callback
-    if (kWantDebug && kPrintTree && WantDebugOutput(aux_out)) {
-      PrintTree(*tree, aux_out->debug_prefix + "/tree_" + ToString(group_id));
-    } */
-
-    // Write tree
-    JXL_ASSIGN_OR_RETURN(size_t cost,
-                         BuildAndEncodeHistograms(
-                             memory_manager, options.histogram_params,
-                             kNumTreeContexts, tree_tokens, &code, &context_map,
-                             writer, LayerType::ModularTree, aux_out));
-    (void)cost;
-    JXL_RETURN_IF_ERROR(WriteTokens(tree_tokens[0], code, context_map, 0,
-                                    writer, LayerType::ModularTree, aux_out));
-  }
-
-  size_t image_width = 0;
-  size_t total_tokens = 0;
-  for (size_t i = 0; i < nb_channels; i++) {
-    if (i >= image.nb_meta_channels &&
-        (image.channel[i].w > options.max_chan_size ||
-         image.channel[i].h > options.max_chan_size)) {
-      break;
-    }
-    if (image.channel[i].w > image_width) image_width = image.channel[i].w;
-    total_tokens += image.channel[i].w * image.channel[i].h;
-  }
-  if (options.zero_tokens) {
-    tokens->resize(tokens->size() + total_tokens, {0, 0});
-  } else {
-    // Do one big allocation for all the tokens we'll need,
-    // to avoid reallocs that might require copying.
-    size_t pos = tokens->size();
-    tokens->resize(pos + total_tokens);
-    Token *tokenp = tokens->data() + pos;
-    for (size_t i = 0; i < nb_channels; i++) {
-      if (!image.channel[i].w || !image.channel[i].h) {
-        continue;  // skip empty channels
-      }
-      if (i >= image.nb_meta_channels &&
-          (image.channel[i].w > options.max_chan_size ||
-           image.channel[i].h > options.max_chan_size)) {
-        break;
-      }
-      JXL_RETURN_IF_ERROR(EncodeModularChannelMAANS(
-          image, i, header->wp_header, *tree, &tokenp, aux_out, group_id,
-          options.skip_encoder_fast_path));
-    }
-    // Make sure we actually wrote all tokens
-    JXL_ENSURE(tokenp == tokens->data() + tokens->size());
-  }
-
-  // Write data if not using a global tree/ANS stream.
-  if (!header->use_global_tree) {
-    EntropyEncodingData code;
-    std::vector<uint8_t> context_map;
-    HistogramParams histo_params = options.histogram_params;
-    histo_params.image_widths.push_back(image_width);
-    JXL_ASSIGN_OR_RETURN(
-        size_t cost,
-        BuildAndEncodeHistograms(memory_manager, histo_params,
-                                 (tree->size() + 1) / 2, tokens_storage, &code,
-                                 &context_map, writer, layer, aux_out));
-    (void)cost;
-    JXL_RETURN_IF_ERROR(WriteTokens(tokens_storage[0], code, context_map, 0,
-                                    writer, layer, aux_out));
-  } else {
-    *width = image_width;
-  }
-  return true;
-}
-
-Status ModularGenericCompress(Image &image, const ModularOptions &opts,
-                              BitWriter *writer, AuxOut *aux_out,
-                              LayerType layer, size_t group_id,
-                              TreeSamples *tree_samples, size_t *total_pixels,
-                              const Tree *tree, GroupHeader *header,
-                              std::vector<Token> *tokens, size_t *width) {
-  if (image.w == 0 || image.h == 0) return true;
-  ModularOptions options = opts;  // Make a copy to modify it.
-
-  if (options.predictor == kUndefinedPredictor) {
-    options.predictor = Predictor::Gradient;
-  }
-
-  size_t bits = writer ? writer->BitsWritten() : 0;
-  JXL_RETURN_IF_ERROR(ModularEncode(image, options, writer, aux_out, layer,
-                                    group_id, tree_samples, total_pixels, tree,
-                                    header, tokens, width));
-  bits = writer ? writer->BitsWritten() - bits : 0;
-  if (writer) {
-    JXL_DEBUG_V(4,
-                "Modular-encoded a %" PRIuS "x%" PRIuS
-                " bitdepth=%i nbchans=%" PRIuS " image in %" PRIuS " bytes",
-                image.w, image.h, image.bitdepth, image.channel.size(),
-                bits / 8);
-  }
-  (void)bits;
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_encoding.h b/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_encoding.h
deleted file mode 100644
index 4c2d7358065bd..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_encoding.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_MODULAR_ENCODING_ENC_ENCODING_H_
-#define LIB_JXL_MODULAR_ENCODING_ENC_ENCODING_H_
-
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_ans.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/modular/encoding/dec_ma.h"
-#include "lib/jxl/modular/encoding/enc_ma.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/modular/options.h"
-
-namespace jxl {
-
-struct AuxOut;
-enum class LayerType : uint8_t;
-struct GroupHeader;
-
-Tree PredefinedTree(ModularOptions::TreeKind tree_kind, size_t total_pixels,
-                    int bitdepth, int prevprop);
-
-StatusOr<Tree> LearnTree(
-    TreeSamples &&tree_samples, size_t total_pixels,
-    const ModularOptions &options,
-    const std::vector<ModularMultiplierInfo> &multiplier_info = {},
-    StaticPropRange static_prop_range = {});
-
-// TODO(veluca): make cleaner interfaces.
-
-Status ModularGenericCompress(
-    Image &image, const ModularOptions &opts, BitWriter *writer,
-    AuxOut *aux_out = nullptr, LayerType layer = static_cast<LayerType>(0),
-    size_t group_id = 0,
-    // For gathering data for producing a global tree.
-    TreeSamples *tree_samples = nullptr, size_t *total_pixels = nullptr,
-    // For encoding with global tree.
-    const Tree *tree = nullptr, GroupHeader *header = nullptr,
-    std::vector<Token> *tokens = nullptr, size_t *widths = nullptr);
-}  // namespace jxl
-
-#endif  // LIB_JXL_MODULAR_ENCODING_ENC_ENCODING_H_
diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_ma.cc b/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_ma.cc
deleted file mode 100644
index 96f47dd19b73b..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_ma.cc
+++ /dev/null
@@ -1,1022 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/modular/encoding/enc_ma.h"
-
-#include <algorithm>
-#include <cstdlib>
-#include <limits>
-#include <numeric>
-#include <queue>
-#include <vector>
-
-#include "lib/jxl/modular/encoding/ma_common.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/modular/encoding/enc_ma.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/fast_math-inl.h"
-#include "lib/jxl/base/random.h"
-#include "lib/jxl/enc_ans.h"
-#include "lib/jxl/modular/encoding/context_predict.h"
-#include "lib/jxl/modular/options.h"
-#include "lib/jxl/pack_signed.h"
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Eq;
-using hwy::HWY_NAMESPACE::IfThenElse;
-using hwy::HWY_NAMESPACE::Lt;
-using hwy::HWY_NAMESPACE::Max;
-
-const HWY_FULL(float) df;
-const HWY_FULL(int32_t) di;
-size_t Padded(size_t x) { return RoundUpTo(x, Lanes(df)); }
-
-// Compute entropy of the histogram, taking into account the minimum probability
-// for symbols with non-zero counts.
-float EstimateBits(const int32_t *counts, size_t num_symbols) {
-  int32_t total = std::accumulate(counts, counts + num_symbols, 0);
-  const auto zero = Zero(df);
-  const auto minprob = Set(df, 1.0f / ANS_TAB_SIZE);
-  const auto inv_total = Set(df, 1.0f / total);
-  auto bits_lanes = Zero(df);
-  auto total_v = Set(di, total);
-  for (size_t i = 0; i < num_symbols; i += Lanes(df)) {
-    const auto counts_iv = LoadU(di, &counts[i]);
-    const auto counts_fv = ConvertTo(df, counts_iv);
-    const auto probs = Mul(counts_fv, inv_total);
-    const auto mprobs = Max(probs, minprob);
-    const auto nbps = IfThenElse(Eq(counts_iv, total_v), BitCast(di, zero),
-                                 BitCast(di, FastLog2f(df, mprobs)));
-    bits_lanes = Sub(bits_lanes, Mul(counts_fv, BitCast(df, nbps)));
-  }
-  return GetLane(SumOfLanes(df, bits_lanes));
-}
-
-void MakeSplitNode(size_t pos, int property, int splitval, Predictor lpred,
-                   int64_t loff, Predictor rpred, int64_t roff, Tree *tree) {
-  // Note that the tree splits on *strictly greater*.
-  (*tree)[pos].lchild = tree->size();
-  (*tree)[pos].rchild = tree->size() + 1;
-  (*tree)[pos].splitval = splitval;
-  (*tree)[pos].property = property;
-  tree->emplace_back();
-  tree->back().property = -1;
-  tree->back().predictor = rpred;
-  tree->back().predictor_offset = roff;
-  tree->back().multiplier = 1;
-  tree->emplace_back();
-  tree->back().property = -1;
-  tree->back().predictor = lpred;
-  tree->back().predictor_offset = loff;
-  tree->back().multiplier = 1;
-}
-
-enum class IntersectionType { kNone, kPartial, kInside };
-IntersectionType BoxIntersects(StaticPropRange needle, StaticPropRange haystack,
-                               uint32_t &partial_axis, uint32_t &partial_val) {
-  bool partial = false;
-  for (size_t i = 0; i < kNumStaticProperties; i++) {
-    if (haystack[i][0] >= needle[i][1]) {
-      return IntersectionType::kNone;
-    }
-    if (haystack[i][1] <= needle[i][0]) {
-      return IntersectionType::kNone;
-    }
-    if (haystack[i][0] <= needle[i][0] && haystack[i][1] >= needle[i][1]) {
-      continue;
-    }
-    partial = true;
-    partial_axis = i;
-    if (haystack[i][0] > needle[i][0] && haystack[i][0] < needle[i][1]) {
-      partial_val = haystack[i][0] - 1;
-    } else {
-      JXL_DASSERT(haystack[i][1] > needle[i][0] &&
-                  haystack[i][1] < needle[i][1]);
-      partial_val = haystack[i][1] - 1;
-    }
-  }
-  return partial ? IntersectionType::kPartial : IntersectionType::kInside;
-}
-
-void SplitTreeSamples(TreeSamples &tree_samples, size_t begin, size_t pos,
-                      size_t end, size_t prop) {
-  auto cmp = [&](size_t a, size_t b) {
-    return static_cast<int32_t>(tree_samples.Property(prop, a)) -
-           static_cast<int32_t>(tree_samples.Property(prop, b));
-  };
-  Rng rng(0);
-  while (end > begin + 1) {
-    {
-      size_t pivot = rng.UniformU(begin, end);
-      tree_samples.Swap(begin, pivot);
-    }
-    size_t pivot_begin = begin;
-    size_t pivot_end = pivot_begin + 1;
-    for (size_t i = begin + 1; i < end; i++) {
-      JXL_DASSERT(i >= pivot_end);
-      JXL_DASSERT(pivot_end > pivot_begin);
-      int32_t cmp_result = cmp(i, pivot_begin);
-      if (cmp_result < 0) {  // i < pivot, move pivot forward and put i before
-                             // the pivot.
-        tree_samples.ThreeShuffle(pivot_begin, pivot_end, i);
-        pivot_begin++;
-        pivot_end++;
-      } else if (cmp_result == 0) {
-        tree_samples.Swap(pivot_end, i);
-        pivot_end++;
-      }
-    }
-    JXL_DASSERT(pivot_begin >= begin);
-    JXL_DASSERT(pivot_end > pivot_begin);
-    JXL_DASSERT(pivot_end <= end);
-    for (size_t i = begin; i < pivot_begin; i++) {
-      JXL_DASSERT(cmp(i, pivot_begin) < 0);
-    }
-    for (size_t i = pivot_end; i < end; i++) {
-      JXL_DASSERT(cmp(i, pivot_begin) > 0);
-    }
-    for (size_t i = pivot_begin; i < pivot_end; i++) {
-      JXL_DASSERT(cmp(i, pivot_begin) == 0);
-    }
-    // We now have that [begin, pivot_begin) is < pivot, [pivot_begin,
-    // pivot_end) is = pivot, and [pivot_end, end) is > pivot.
-    // If pos falls in the first or the last interval, we continue in that
-    // interval; otherwise, we are done.
-    if (pivot_begin > pos) {
-      end = pivot_begin;
-    } else if (pivot_end < pos) {
-      begin = pivot_end;
-    } else {
-      break;
-    }
-  }
-}
-
-void FindBestSplit(TreeSamples &tree_samples, float threshold,
-                   const std::vector<ModularMultiplierInfo> &mul_info,
-                   StaticPropRange initial_static_prop_range,
-                   float fast_decode_multiplier, Tree *tree) {
-  struct NodeInfo {
-    size_t pos;
-    size_t begin;
-    size_t end;
-    uint64_t used_properties;
-    StaticPropRange static_prop_range;
-  };
-  std::vector<NodeInfo> nodes;
-  nodes.push_back(NodeInfo{0, 0, tree_samples.NumDistinctSamples(), 0,
-                           initial_static_prop_range});
-
-  size_t num_predictors = tree_samples.NumPredictors();
-  size_t num_properties = tree_samples.NumProperties();
-
-  // TODO(veluca): consider parallelizing the search (processing multiple nodes
-  // at a time).
-  while (!nodes.empty()) {
-    size_t pos = nodes.back().pos;
-    size_t begin = nodes.back().begin;
-    size_t end = nodes.back().end;
-    uint64_t used_properties = nodes.back().used_properties;
-    StaticPropRange static_prop_range = nodes.back().static_prop_range;
-    nodes.pop_back();
-    if (begin == end) continue;
-
-    struct SplitInfo {
-      size_t prop = 0;
-      uint32_t val = 0;
-      size_t pos = 0;
-      float lcost = std::numeric_limits<float>::max();
-      float rcost = std::numeric_limits<float>::max();
-      Predictor lpred = Predictor::Zero;
-      Predictor rpred = Predictor::Zero;
-      float Cost() const { return lcost + rcost; }
-    };
-
-    SplitInfo best_split_static_constant;
-    SplitInfo best_split_static;
-    SplitInfo best_split_nonstatic;
-    SplitInfo best_split_nowp;
-
-    JXL_DASSERT(begin <= end);
-    JXL_DASSERT(end <= tree_samples.NumDistinctSamples());
-
-    // Compute the maximum token in the range.
-    size_t max_symbols = 0;
-    for (size_t pred = 0; pred < num_predictors; pred++) {
-      for (size_t i = begin; i < end; i++) {
-        uint32_t tok = tree_samples.Token(pred, i);
-        max_symbols = max_symbols > tok + 1 ? max_symbols : tok + 1;
-      }
-    }
-    max_symbols = Padded(max_symbols);
-    std::vector<int32_t> counts(max_symbols * num_predictors);
-    std::vector<uint32_t> tot_extra_bits(num_predictors);
-    for (size_t pred = 0; pred < num_predictors; pred++) {
-      for (size_t i = begin; i < end; i++) {
-        counts[pred * max_symbols + tree_samples.Token(pred, i)] +=
-            tree_samples.Count(i);
-        tot_extra_bits[pred] +=
-            tree_samples.NBits(pred, i) * tree_samples.Count(i);
-      }
-    }
-
-    float base_bits;
-    {
-      size_t pred = tree_samples.PredictorIndex((*tree)[pos].predictor);
-      base_bits =
-          EstimateBits(counts.data() + pred * max_symbols, max_symbols) +
-          tot_extra_bits[pred];
-    }
-
-    SplitInfo *best = &best_split_nonstatic;
-
-    SplitInfo forced_split;
-    // The multiplier ranges cut halfway through the current ranges of static
-    // properties. We do this even if the current node is not a leaf, to
-    // minimize the number of nodes in the resulting tree.
-    for (const auto &mmi : mul_info) {
-      uint32_t axis;
-      uint32_t val;
-      IntersectionType t =
-          BoxIntersects(static_prop_range, mmi.range, axis, val);
-      if (t == IntersectionType::kNone) continue;
-      if (t == IntersectionType::kInside) {
-        (*tree)[pos].multiplier = mmi.multiplier;
-        break;
-      }
-      if (t == IntersectionType::kPartial) {
-        forced_split.val = tree_samples.QuantizeProperty(axis, val);
-        forced_split.prop = axis;
-        forced_split.lcost = forced_split.rcost = base_bits / 2 - threshold;
-        forced_split.lpred = forced_split.rpred = (*tree)[pos].predictor;
-        best = &forced_split;
-        best->pos = begin;
-        JXL_DASSERT(best->prop == tree_samples.PropertyFromIndex(best->prop));
-        for (size_t x = begin; x < end; x++) {
-          if (tree_samples.Property(best->prop, x) <= best->val) {
-            best->pos++;
-          }
-        }
-        break;
-      }
-    }
-
-    if (best != &forced_split) {
-      std::vector<int> prop_value_used_count;
-      std::vector<int> count_increase;
-      std::vector<size_t> extra_bits_increase;
-      // For each property, compute which of its values are used, and what
-      // tokens correspond to those usages. Then, iterate through the values,
-      // and compute the entropy of each side of the split (of the form `prop >
-      // threshold`). Finally, find the split that minimizes the cost.
-      struct CostInfo {
-        float cost = std::numeric_limits<float>::max();
-        float extra_cost = 0;
-        float Cost() const { return cost + extra_cost; }
-        Predictor pred;  // will be uninitialized in some cases, but never used.
-      };
-      std::vector<CostInfo> costs_l;
-      std::vector<CostInfo> costs_r;
-
-      std::vector<int32_t> counts_above(max_symbols);
-      std::vector<int32_t> counts_below(max_symbols);
-
-      // The lower the threshold, the higher the expected noisiness of the
-      // estimate. Thus, discourage changing predictors.
-      float change_pred_penalty = 800.0f / (100.0f + threshold);
-      for (size_t prop = 0; prop < num_properties && base_bits > threshold;
-           prop++) {
-        costs_l.clear();
-        costs_r.clear();
-        size_t prop_size = tree_samples.NumPropertyValues(prop);
-        if (extra_bits_increase.size() < prop_size) {
-          count_increase.resize(prop_size * max_symbols);
-          extra_bits_increase.resize(prop_size);
-        }
-        // Clear prop_value_used_count (which cannot be cleared "on the go")
-        prop_value_used_count.clear();
-        prop_value_used_count.resize(prop_size);
-
-        size_t first_used = prop_size;
-        size_t last_used = 0;
-
-        // TODO(veluca): consider finding multiple splits along a single
-        // property at the same time, possibly with a bottom-up approach.
-        for (size_t i = begin; i < end; i++) {
-          size_t p = tree_samples.Property(prop, i);
-          prop_value_used_count[p]++;
-          last_used = std::max(last_used, p);
-          first_used = std::min(first_used, p);
-        }
-        costs_l.resize(last_used - first_used);
-        costs_r.resize(last_used - first_used);
-        // For all predictors, compute the right and left costs of each split.
-        for (size_t pred = 0; pred < num_predictors; pred++) {
-          // Compute cost and histogram increments for each property value.
-          for (size_t i = begin; i < end; i++) {
-            size_t p = tree_samples.Property(prop, i);
-            size_t cnt = tree_samples.Count(i);
-            size_t sym = tree_samples.Token(pred, i);
-            count_increase[p * max_symbols + sym] += cnt;
-            extra_bits_increase[p] += tree_samples.NBits(pred, i) * cnt;
-          }
-          memcpy(counts_above.data(), counts.data() + pred * max_symbols,
-                 max_symbols * sizeof counts_above[0]);
-          memset(counts_below.data(), 0, max_symbols * sizeof counts_below[0]);
-          size_t extra_bits_below = 0;
-          // Exclude last used: this ensures neither counts_above nor
-          // counts_below is empty.
-          for (size_t i = first_used; i < last_used; i++) {
-            if (!prop_value_used_count[i]) continue;
-            extra_bits_below += extra_bits_increase[i];
-            // The increase for this property value has been used, and will not
-            // be used again: clear it. Also below.
-            extra_bits_increase[i] = 0;
-            for (size_t sym = 0; sym < max_symbols; sym++) {
-              counts_above[sym] -= count_increase[i * max_symbols + sym];
-              counts_below[sym] += count_increase[i * max_symbols + sym];
-              count_increase[i * max_symbols + sym] = 0;
-            }
-            float rcost = EstimateBits(counts_above.data(), max_symbols) +
-                          tot_extra_bits[pred] - extra_bits_below;
-            float lcost = EstimateBits(counts_below.data(), max_symbols) +
-                          extra_bits_below;
-            JXL_DASSERT(extra_bits_below <= tot_extra_bits[pred]);
-            float penalty = 0;
-            // Never discourage moving away from the Weighted predictor.
-            if (tree_samples.PredictorFromIndex(pred) !=
-                    (*tree)[pos].predictor &&
-                (*tree)[pos].predictor != Predictor::Weighted) {
-              penalty = change_pred_penalty;
-            }
-            // If everything else is equal, disfavour Weighted (slower) and
-            // favour Zero (faster if it's the only predictor used in a
-            // group+channel combination)
-            if (tree_samples.PredictorFromIndex(pred) == Predictor::Weighted) {
-              penalty += 1e-8;
-            }
-            if (tree_samples.PredictorFromIndex(pred) == Predictor::Zero) {
-              penalty -= 1e-8;
-            }
-            if (rcost + penalty < costs_r[i - first_used].Cost()) {
-              costs_r[i - first_used].cost = rcost;
-              costs_r[i - first_used].extra_cost = penalty;
-              costs_r[i - first_used].pred =
-                  tree_samples.PredictorFromIndex(pred);
-            }
-            if (lcost + penalty < costs_l[i - first_used].Cost()) {
-              costs_l[i - first_used].cost = lcost;
-              costs_l[i - first_used].extra_cost = penalty;
-              costs_l[i - first_used].pred =
-                  tree_samples.PredictorFromIndex(pred);
-            }
-          }
-        }
-        // Iterate through the possible splits and find the one with minimum sum
-        // of costs of the two sides.
-        size_t split = begin;
-        for (size_t i = first_used; i < last_used; i++) {
-          if (!prop_value_used_count[i]) continue;
-          split += prop_value_used_count[i];
-          float rcost = costs_r[i - first_used].cost;
-          float lcost = costs_l[i - first_used].cost;
-          // WP was not used + we would use the WP property or predictor
-          bool adds_wp =
-              (tree_samples.PropertyFromIndex(prop) == kWPProp &&
-               (used_properties & (1LU << prop)) == 0) ||
-              ((costs_l[i - first_used].pred == Predictor::Weighted ||
-                costs_r[i - first_used].pred == Predictor::Weighted) &&
-               (*tree)[pos].predictor != Predictor::Weighted);
-          bool zero_entropy_side = rcost == 0 || lcost == 0;
-
-          SplitInfo &best =
-              prop < kNumStaticProperties
-                  ? (zero_entropy_side ? best_split_static_constant
-                                       : best_split_static)
-                  : (adds_wp ? best_split_nonstatic : best_split_nowp);
-          if (lcost + rcost < best.Cost()) {
-            best.prop = prop;
-            best.val = i;
-            best.pos = split;
-            best.lcost = lcost;
-            best.lpred = costs_l[i - first_used].pred;
-            best.rcost = rcost;
-            best.rpred = costs_r[i - first_used].pred;
-          }
-        }
-        // Clear extra_bits_increase and cost_increase for last_used.
-        extra_bits_increase[last_used] = 0;
-        for (size_t sym = 0; sym < max_symbols; sym++) {
-          count_increase[last_used * max_symbols + sym] = 0;
-        }
-      }
-
-      // Try to avoid introducing WP.
-      if (best_split_nowp.Cost() + threshold < base_bits &&
-          best_split_nowp.Cost() <= fast_decode_multiplier * best->Cost()) {
-        best = &best_split_nowp;
-      }
-      // Split along static props if possible and not significantly more
-      // expensive.
-      if (best_split_static.Cost() + threshold < base_bits &&
-          best_split_static.Cost() <= fast_decode_multiplier * best->Cost()) {
-        best = &best_split_static;
-      }
-      // Split along static props to create constant nodes if possible.
-      if (best_split_static_constant.Cost() + threshold < base_bits) {
-        best = &best_split_static_constant;
-      }
-    }
-
-    if (best->Cost() + threshold < base_bits) {
-      uint32_t p = tree_samples.PropertyFromIndex(best->prop);
-      pixel_type dequant =
-          tree_samples.UnquantizeProperty(best->prop, best->val);
-      // Split node and try to split children.
-      MakeSplitNode(pos, p, dequant, best->lpred, 0, best->rpred, 0, tree);
-      // "Sort" according to winning property
-      SplitTreeSamples(tree_samples, begin, best->pos, end, best->prop);
-      if (p >= kNumStaticProperties) {
-        used_properties |= 1 << best->prop;
-      }
-      auto new_sp_range = static_prop_range;
-      if (p < kNumStaticProperties) {
-        JXL_DASSERT(static_cast<uint32_t>(dequant + 1) <= new_sp_range[p][1]);
-        new_sp_range[p][1] = dequant + 1;
-        JXL_DASSERT(new_sp_range[p][0] < new_sp_range[p][1]);
-      }
-      nodes.push_back(NodeInfo{(*tree)[pos].rchild, begin, best->pos,
-                               used_properties, new_sp_range});
-      new_sp_range = static_prop_range;
-      if (p < kNumStaticProperties) {
-        JXL_DASSERT(new_sp_range[p][0] <= static_cast<uint32_t>(dequant + 1));
-        new_sp_range[p][0] = dequant + 1;
-        JXL_DASSERT(new_sp_range[p][0] < new_sp_range[p][1]);
-      }
-      nodes.push_back(NodeInfo{(*tree)[pos].lchild, best->pos, end,
-                               used_properties, new_sp_range});
-    }
-  }
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(FindBestSplit);  // Local function.
-
-Status ComputeBestTree(TreeSamples &tree_samples, float threshold,
-                       const std::vector<ModularMultiplierInfo> &mul_info,
-                       StaticPropRange static_prop_range,
-                       float fast_decode_multiplier, Tree *tree) {
-  // TODO(veluca): take into account that different contexts can have different
-  // uint configs.
-  //
-  // Initialize tree.
-  tree->emplace_back();
-  tree->back().property = -1;
-  tree->back().predictor = tree_samples.PredictorFromIndex(0);
-  tree->back().predictor_offset = 0;
-  tree->back().multiplier = 1;
-  JXL_ENSURE(tree_samples.NumProperties() < 64);
-
-  JXL_ENSURE(tree_samples.NumDistinctSamples() <=
-             std::numeric_limits<uint32_t>::max());
-  HWY_DYNAMIC_DISPATCH(FindBestSplit)
-  (tree_samples, threshold, mul_info, static_prop_range, fast_decode_multiplier,
-   tree);
-  return true;
-}
-
-#if JXL_CXX_LANG < JXL_CXX_17
-constexpr int32_t TreeSamples::kPropertyRange;
-constexpr uint32_t TreeSamples::kDedupEntryUnused;
-#endif
-
-Status TreeSamples::SetPredictor(Predictor predictor,
-                                 ModularOptions::TreeMode wp_tree_mode) {
-  if (wp_tree_mode == ModularOptions::TreeMode::kWPOnly) {
-    predictors = {Predictor::Weighted};
-    residuals.resize(1);
-    return true;
-  }
-  if (wp_tree_mode == ModularOptions::TreeMode::kNoWP &&
-      predictor == Predictor::Weighted) {
-    return JXL_FAILURE("Invalid predictor settings");
-  }
-  if (predictor == Predictor::Variable) {
-    for (size_t i = 0; i < kNumModularPredictors; i++) {
-      predictors.push_back(static_cast<Predictor>(i));
-    }
-    std::swap(predictors[0], predictors[static_cast<int>(Predictor::Weighted)]);
-    std::swap(predictors[1], predictors[static_cast<int>(Predictor::Gradient)]);
-  } else if (predictor == Predictor::Best) {
-    predictors = {Predictor::Weighted, Predictor::Gradient};
-  } else {
-    predictors = {predictor};
-  }
-  if (wp_tree_mode == ModularOptions::TreeMode::kNoWP) {
-    auto wp_it =
-        std::find(predictors.begin(), predictors.end(), Predictor::Weighted);
-    if (wp_it != predictors.end()) {
-      predictors.erase(wp_it);
-    }
-  }
-  residuals.resize(predictors.size());
-  return true;
-}
-
-Status TreeSamples::SetProperties(const std::vector<uint32_t> &properties,
-                                  ModularOptions::TreeMode wp_tree_mode) {
-  props_to_use = properties;
-  if (wp_tree_mode == ModularOptions::TreeMode::kWPOnly) {
-    props_to_use = {static_cast<uint32_t>(kWPProp)};
-  }
-  if (wp_tree_mode == ModularOptions::TreeMode::kGradientOnly) {
-    props_to_use = {static_cast<uint32_t>(kGradientProp)};
-  }
-  if (wp_tree_mode == ModularOptions::TreeMode::kNoWP) {
-    auto it = std::find(props_to_use.begin(), props_to_use.end(), kWPProp);
-    if (it != props_to_use.end()) {
-      props_to_use.erase(it);
-    }
-  }
-  if (props_to_use.empty()) {
-    return JXL_FAILURE("Invalid property set configuration");
-  }
-  props.resize(props_to_use.size());
-  return true;
-}
-
-void TreeSamples::InitTable(size_t log_size) {
-  size_t size = 1ULL << log_size;
-  if (dedup_table_.size() == size) return;
-  dedup_table_.resize(size, kDedupEntryUnused);
-  for (size_t i = 0; i < NumDistinctSamples(); i++) {
-    if (sample_counts[i] != std::numeric_limits<uint16_t>::max()) {
-      AddToTable(i);
-    }
-  }
-}
-
-bool TreeSamples::AddToTableAndMerge(size_t a) {
-  size_t pos1 = Hash1(a);
-  size_t pos2 = Hash2(a);
-  if (dedup_table_[pos1] != kDedupEntryUnused &&
-      IsSameSample(a, dedup_table_[pos1])) {
-    JXL_DASSERT(sample_counts[a] == 1);
-    sample_counts[dedup_table_[pos1]]++;
-    // Remove from hash table samples that are saturated.
-    if (sample_counts[dedup_table_[pos1]] ==
-        std::numeric_limits<uint16_t>::max()) {
-      dedup_table_[pos1] = kDedupEntryUnused;
-    }
-    return true;
-  }
-  if (dedup_table_[pos2] != kDedupEntryUnused &&
-      IsSameSample(a, dedup_table_[pos2])) {
-    JXL_DASSERT(sample_counts[a] == 1);
-    sample_counts[dedup_table_[pos2]]++;
-    // Remove from hash table samples that are saturated.
-    if (sample_counts[dedup_table_[pos2]] ==
-        std::numeric_limits<uint16_t>::max()) {
-      dedup_table_[pos2] = kDedupEntryUnused;
-    }
-    return true;
-  }
-  AddToTable(a);
-  return false;
-}
-
-void TreeSamples::AddToTable(size_t a) {
-  size_t pos1 = Hash1(a);
-  size_t pos2 = Hash2(a);
-  if (dedup_table_[pos1] == kDedupEntryUnused) {
-    dedup_table_[pos1] = a;
-  } else if (dedup_table_[pos2] == kDedupEntryUnused) {
-    dedup_table_[pos2] = a;
-  }
-}
-
-void TreeSamples::PrepareForSamples(size_t num_samples) {
-  for (auto &res : residuals) {
-    res.reserve(res.size() + num_samples);
-  }
-  for (auto &p : props) {
-    p.reserve(p.size() + num_samples);
-  }
-  size_t total_num_samples = num_samples + sample_counts.size();
-  size_t next_size = CeilLog2Nonzero(total_num_samples * 3 / 2);
-  InitTable(next_size);
-}
-
-size_t TreeSamples::Hash1(size_t a) const {
-  constexpr uint64_t constant = 0x1e35a7bd;
-  uint64_t h = constant;
-  for (const auto &r : residuals) {
-    h = h * constant + r[a].tok;
-    h = h * constant + r[a].nbits;
-  }
-  for (const auto &p : props) {
-    h = h * constant + p[a];
-  }
-  return (h >> 16) & (dedup_table_.size() - 1);
-}
-size_t TreeSamples::Hash2(size_t a) const {
-  constexpr uint64_t constant = 0x1e35a7bd1e35a7bd;
-  uint64_t h = constant;
-  for (const auto &p : props) {
-    h = h * constant ^ p[a];
-  }
-  for (const auto &r : residuals) {
-    h = h * constant ^ r[a].tok;
-    h = h * constant ^ r[a].nbits;
-  }
-  return (h >> 16) & (dedup_table_.size() - 1);
-}
-
-bool TreeSamples::IsSameSample(size_t a, size_t b) const {
-  bool ret = true;
-  for (const auto &r : residuals) {
-    if (r[a].tok != r[b].tok) {
-      ret = false;
-    }
-    if (r[a].nbits != r[b].nbits) {
-      ret = false;
-    }
-  }
-  for (const auto &p : props) {
-    if (p[a] != p[b]) {
-      ret = false;
-    }
-  }
-  return ret;
-}
-
-void TreeSamples::AddSample(pixel_type_w pixel, const Properties &properties,
-                            const pixel_type_w *predictions) {
-  for (size_t i = 0; i < predictors.size(); i++) {
-    pixel_type v = pixel - predictions[static_cast<int>(predictors[i])];
-    uint32_t tok, nbits, bits;
-    HybridUintConfig(4, 1, 2).Encode(PackSigned(v), &tok, &nbits, &bits);
-    JXL_DASSERT(tok < 256);
-    JXL_DASSERT(nbits < 256);
-    residuals[i].emplace_back(
-        ResidualToken{static_cast<uint8_t>(tok), static_cast<uint8_t>(nbits)});
-  }
-  for (size_t i = 0; i < props_to_use.size(); i++) {
-    props[i].push_back(QuantizeProperty(i, properties[props_to_use[i]]));
-  }
-  sample_counts.push_back(1);
-  num_samples++;
-  if (AddToTableAndMerge(sample_counts.size() - 1)) {
-    for (auto &r : residuals) r.pop_back();
-    for (auto &p : props) p.pop_back();
-    sample_counts.pop_back();
-  }
-}
-
-void TreeSamples::Swap(size_t a, size_t b) {
-  if (a == b) return;
-  for (auto &r : residuals) {
-    std::swap(r[a], r[b]);
-  }
-  for (auto &p : props) {
-    std::swap(p[a], p[b]);
-  }
-  std::swap(sample_counts[a], sample_counts[b]);
-}
-
-void TreeSamples::ThreeShuffle(size_t a, size_t b, size_t c) {
-  if (b == c) {
-    Swap(a, b);
-    return;
-  }
-
-  for (auto &r : residuals) {
-    auto tmp = r[a];
-    r[a] = r[c];
-    r[c] = r[b];
-    r[b] = tmp;
-  }
-  for (auto &p : props) {
-    auto tmp = p[a];
-    p[a] = p[c];
-    p[c] = p[b];
-    p[b] = tmp;
-  }
-  auto tmp = sample_counts[a];
-  sample_counts[a] = sample_counts[c];
-  sample_counts[c] = sample_counts[b];
-  sample_counts[b] = tmp;
-}
-
-namespace {
-std::vector<int32_t> QuantizeHistogram(const std::vector<uint32_t> &histogram,
-                                       size_t num_chunks) {
-  if (histogram.empty()) return {};
-  // TODO(veluca): selecting distinct quantiles is likely not the best
-  // way to go about this.
-  std::vector<int32_t> thresholds;
-  uint64_t sum = std::accumulate(histogram.begin(), histogram.end(), 0LU);
-  uint64_t cumsum = 0;
-  uint64_t threshold = 1;
-  for (size_t i = 0; i + 1 < histogram.size(); i++) {
-    cumsum += histogram[i];
-    if (cumsum >= threshold * sum / num_chunks) {
-      thresholds.push_back(i);
-      while (cumsum > threshold * sum / num_chunks) threshold++;
-    }
-  }
-  return thresholds;
-}
-
-std::vector<int32_t> QuantizeSamples(const std::vector<int32_t> &samples,
-                                     size_t num_chunks) {
-  if (samples.empty()) return {};
-  int min = *std::min_element(samples.begin(), samples.end());
-  constexpr int kRange = 512;
-  min = std::min(std::max(min, -kRange), kRange);
-  std::vector<uint32_t> counts(2 * kRange + 1);
-  for (int s : samples) {
-    uint32_t sample_offset = std::min(std::max(s, -kRange), kRange) - min;
-    counts[sample_offset]++;
-  }
-  std::vector<int32_t> thresholds = QuantizeHistogram(counts, num_chunks);
-  for (auto &v : thresholds) v += min;
-  return thresholds;
-}
-}  // namespace
-
-void TreeSamples::PreQuantizeProperties(
-    const StaticPropRange &range,
-    const std::vector<ModularMultiplierInfo> &multiplier_info,
-    const std::vector<uint32_t> &group_pixel_count,
-    const std::vector<uint32_t> &channel_pixel_count,
-    std::vector<pixel_type> &pixel_samples,
-    std::vector<pixel_type> &diff_samples, size_t max_property_values) {
-  // If we have forced splits because of multipliers, choose channel and group
-  // thresholds accordingly.
-  std::vector<int32_t> group_multiplier_thresholds;
-  std::vector<int32_t> channel_multiplier_thresholds;
-  for (const auto &v : multiplier_info) {
-    if (v.range[0][0] != range[0][0]) {
-      channel_multiplier_thresholds.push_back(v.range[0][0] - 1);
-    }
-    if (v.range[0][1] != range[0][1]) {
-      channel_multiplier_thresholds.push_back(v.range[0][1] - 1);
-    }
-    if (v.range[1][0] != range[1][0]) {
-      group_multiplier_thresholds.push_back(v.range[1][0] - 1);
-    }
-    if (v.range[1][1] != range[1][1]) {
-      group_multiplier_thresholds.push_back(v.range[1][1] - 1);
-    }
-  }
-  std::sort(channel_multiplier_thresholds.begin(),
-            channel_multiplier_thresholds.end());
-  channel_multiplier_thresholds.resize(
-      std::unique(channel_multiplier_thresholds.begin(),
-                  channel_multiplier_thresholds.end()) -
-      channel_multiplier_thresholds.begin());
-  std::sort(group_multiplier_thresholds.begin(),
-            group_multiplier_thresholds.end());
-  group_multiplier_thresholds.resize(
-      std::unique(group_multiplier_thresholds.begin(),
-                  group_multiplier_thresholds.end()) -
-      group_multiplier_thresholds.begin());
-
-  compact_properties.resize(props_to_use.size());
-  auto quantize_channel = [&]() {
-    if (!channel_multiplier_thresholds.empty()) {
-      return channel_multiplier_thresholds;
-    }
-    return QuantizeHistogram(channel_pixel_count, max_property_values);
-  };
-  auto quantize_group_id = [&]() {
-    if (!group_multiplier_thresholds.empty()) {
-      return group_multiplier_thresholds;
-    }
-    return QuantizeHistogram(group_pixel_count, max_property_values);
-  };
-  auto quantize_coordinate = [&]() {
-    std::vector<int32_t> quantized;
-    quantized.reserve(max_property_values - 1);
-    for (size_t i = 0; i + 1 < max_property_values; i++) {
-      quantized.push_back((i + 1) * 256 / max_property_values - 1);
-    }
-    return quantized;
-  };
-  std::vector<int32_t> abs_pixel_thresholds;
-  std::vector<int32_t> pixel_thresholds;
-  auto quantize_pixel_property = [&]() {
-    if (pixel_thresholds.empty()) {
-      pixel_thresholds = QuantizeSamples(pixel_samples, max_property_values);
-    }
-    return pixel_thresholds;
-  };
-  auto quantize_abs_pixel_property = [&]() {
-    if (abs_pixel_thresholds.empty()) {
-      quantize_pixel_property();  // Compute the non-abs thresholds.
-      for (auto &v : pixel_samples) v = std::abs(v);
-      abs_pixel_thresholds =
-          QuantizeSamples(pixel_samples, max_property_values);
-    }
-    return abs_pixel_thresholds;
-  };
-  std::vector<int32_t> abs_diff_thresholds;
-  std::vector<int32_t> diff_thresholds;
-  auto quantize_diff_property = [&]() {
-    if (diff_thresholds.empty()) {
-      diff_thresholds = QuantizeSamples(diff_samples, max_property_values);
-    }
-    return diff_thresholds;
-  };
-  auto quantize_abs_diff_property = [&]() {
-    if (abs_diff_thresholds.empty()) {
-      quantize_diff_property();  // Compute the non-abs thresholds.
-      for (auto &v : diff_samples) v = std::abs(v);
-      abs_diff_thresholds = QuantizeSamples(diff_samples, max_property_values);
-    }
-    return abs_diff_thresholds;
-  };
-  auto quantize_wp = [&]() {
-    if (max_property_values < 32) {
-      return std::vector<int32_t>{-127, -63, -31, -15, -7, -3, -1, 0,
-                                  1,    3,   7,   15,  31, 63, 127};
-    }
-    if (max_property_values < 64) {
-      return std::vector<int32_t>{-255, -191, -127, -95, -63, -47, -31, -23,
-                                  -15,  -11,  -7,   -5,  -3,  -1,  0,   1,
-                                  3,    5,    7,    11,  15,  23,  31,  47,
-                                  63,   95,   127,  191, 255};
-    }
-    return std::vector<int32_t>{
-        -255, -223, -191, -159, -127, -111, -95, -79, -63, -55, -47,
-        -39,  -31,  -27,  -23,  -19,  -15,  -13, -11, -9,  -7,  -6,
-        -5,   -4,   -3,   -2,   -1,   0,    1,   2,   3,   4,   5,
-        6,    7,    9,    11,   13,   15,   19,  23,  27,  31,  39,
-        47,   55,   63,   79,   95,   111,  127, 159, 191, 223, 255};
-  };
-
-  property_mapping.resize(props_to_use.size());
-  for (size_t i = 0; i < props_to_use.size(); i++) {
-    if (props_to_use[i] == 0) {
-      compact_properties[i] = quantize_channel();
-    } else if (props_to_use[i] == 1) {
-      compact_properties[i] = quantize_group_id();
-    } else if (props_to_use[i] == 2 || props_to_use[i] == 3) {
-      compact_properties[i] = quantize_coordinate();
-    } else if (props_to_use[i] == 6 || props_to_use[i] == 7 ||
-               props_to_use[i] == 8 ||
-               (props_to_use[i] >= kNumNonrefProperties &&
-                (props_to_use[i] - kNumNonrefProperties) % 4 == 1)) {
-      compact_properties[i] = quantize_pixel_property();
-    } else if (props_to_use[i] == 4 || props_to_use[i] == 5 ||
-               (props_to_use[i] >= kNumNonrefProperties &&
-                (props_to_use[i] - kNumNonrefProperties) % 4 == 0)) {
-      compact_properties[i] = quantize_abs_pixel_property();
-    } else if (props_to_use[i] >= kNumNonrefProperties &&
-               (props_to_use[i] - kNumNonrefProperties) % 4 == 2) {
-      compact_properties[i] = quantize_abs_diff_property();
-    } else if (props_to_use[i] == kWPProp) {
-      compact_properties[i] = quantize_wp();
-    } else {
-      compact_properties[i] = quantize_diff_property();
-    }
-    property_mapping[i].resize(kPropertyRange * 2 + 1);
-    size_t mapped = 0;
-    for (size_t j = 0; j < property_mapping[i].size(); j++) {
-      while (mapped < compact_properties[i].size() &&
-             static_cast<int>(j) - kPropertyRange >
-                 compact_properties[i][mapped]) {
-        mapped++;
-      }
-      // property_mapping[i] of a value V is `mapped` if
-      // compact_properties[i][mapped] <= j and
-      // compact_properties[i][mapped-1] > j
-      // This is because the decision node in the tree splits on (property) > j,
-      // hence everything that is not > of a threshold should be clustered
-      // together.
-      property_mapping[i][j] = mapped;
-    }
-  }
-}
-
-void CollectPixelSamples(const Image &image, const ModularOptions &options,
-                         uint32_t group_id,
-                         std::vector<uint32_t> &group_pixel_count,
-                         std::vector<uint32_t> &channel_pixel_count,
-                         std::vector<pixel_type> &pixel_samples,
-                         std::vector<pixel_type> &diff_samples) {
-  if (options.nb_repeats == 0) return;
-  if (group_pixel_count.size() <= group_id) {
-    group_pixel_count.resize(group_id + 1);
-  }
-  if (channel_pixel_count.size() < image.channel.size()) {
-    channel_pixel_count.resize(image.channel.size());
-  }
-  Rng rng(group_id);
-  // Sample 10% of the final number of samples for property quantization.
-  float fraction = std::min(options.nb_repeats * 0.1, 0.99);
-  Rng::GeometricDistribution dist = Rng::MakeGeometric(fraction);
-  size_t total_pixels = 0;
-  std::vector<size_t> channel_ids;
-  for (size_t i = 0; i < image.channel.size(); i++) {
-    if (image.channel[i].w <= 1 || image.channel[i].h == 0) {
-      continue;  // skip empty or width-1 channels.
-    }
-    if (i >= image.nb_meta_channels &&
-        (image.channel[i].w > options.max_chan_size ||
-         image.channel[i].h > options.max_chan_size)) {
-      break;
-    }
-    channel_ids.push_back(i);
-    group_pixel_count[group_id] += image.channel[i].w * image.channel[i].h;
-    channel_pixel_count[i] += image.channel[i].w * image.channel[i].h;
-    total_pixels += image.channel[i].w * image.channel[i].h;
-  }
-  if (channel_ids.empty()) return;
-  pixel_samples.reserve(pixel_samples.size() + fraction * total_pixels);
-  diff_samples.reserve(diff_samples.size() + fraction * total_pixels);
-  size_t i = 0;
-  size_t y = 0;
-  size_t x = 0;
-  auto advance = [&](size_t amount) {
-    x += amount;
-    // Detect row overflow (rare).
-    while (x >= image.channel[channel_ids[i]].w) {
-      x -= image.channel[channel_ids[i]].w;
-      y++;
-      // Detect end-of-channel (even rarer).
-      if (y == image.channel[channel_ids[i]].h) {
-        i++;
-        y = 0;
-        if (i >= channel_ids.size()) {
-          return;
-        }
-      }
-    }
-  };
-  advance(rng.Geometric(dist));
-  for (; i < channel_ids.size(); advance(rng.Geometric(dist) + 1)) {
-    const pixel_type *row = image.channel[channel_ids[i]].Row(y);
-    pixel_samples.push_back(row[x]);
-    size_t xp = x == 0 ? 1 : x - 1;
-    diff_samples.push_back(static_cast<int64_t>(row[x]) - row[xp]);
-  }
-}
-
-// TODO(veluca): very simple encoding scheme. This should be improved.
-Status TokenizeTree(const Tree &tree, std::vector<Token> *tokens,
-                    Tree *decoder_tree) {
-  JXL_ENSURE(tree.size() <= kMaxTreeSize);
-  std::queue<int> q;
-  q.push(0);
-  size_t leaf_id = 0;
-  decoder_tree->clear();
-  while (!q.empty()) {
-    int cur = q.front();
-    q.pop();
-    JXL_ENSURE(tree[cur].property >= -1);
-    tokens->emplace_back(kPropertyContext, tree[cur].property + 1);
-    if (tree[cur].property == -1) {
-      tokens->emplace_back(kPredictorContext,
-                           static_cast<int>(tree[cur].predictor));
-      tokens->emplace_back(kOffsetContext,
-                           PackSigned(tree[cur].predictor_offset));
-      uint32_t mul_log = Num0BitsBelowLS1Bit_Nonzero(tree[cur].multiplier);
-      uint32_t mul_bits = (tree[cur].multiplier >> mul_log) - 1;
-      tokens->emplace_back(kMultiplierLogContext, mul_log);
-      tokens->emplace_back(kMultiplierBitsContext, mul_bits);
-      JXL_ENSURE(tree[cur].predictor < Predictor::Best);
-      decoder_tree->emplace_back(-1, 0, leaf_id++, 0, tree[cur].predictor,
-                                 tree[cur].predictor_offset,
-                                 tree[cur].multiplier);
-      continue;
-    }
-    decoder_tree->emplace_back(tree[cur].property, tree[cur].splitval,
-                               decoder_tree->size() + q.size() + 1,
-                               decoder_tree->size() + q.size() + 2,
-                               Predictor::Zero, 0, 1);
-    q.push(tree[cur].lchild);
-    q.push(tree[cur].rchild);
-    tokens->emplace_back(kSplitValContext, PackSigned(tree[cur].splitval));
-  }
-  return true;
-}
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_ma.h b/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_ma.h
deleted file mode 100644
index aaf823ef1ac48..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/encoding/enc_ma.h
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_MODULAR_ENCODING_ENC_MA_H_
-#define LIB_JXL_MODULAR_ENCODING_ENC_MA_H_
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/enc_ans.h"
-#include "lib/jxl/modular/encoding/dec_ma.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/modular/options.h"
-
-namespace jxl {
-
-// Struct to collect all the data needed to build a tree.
-struct TreeSamples {
-  bool HasSamples() const {
-    return !residuals.empty() && !residuals[0].empty();
-  }
-  size_t NumDistinctSamples() const { return sample_counts.size(); }
-  size_t NumSamples() const { return num_samples; }
-  // Set the predictor to use. Must be called before adding any samples.
-  Status SetPredictor(Predictor predictor,
-                      ModularOptions::TreeMode wp_tree_mode);
-  // Set the properties to use. Must be called before adding any samples.
-  Status SetProperties(const std::vector<uint32_t> &properties,
-                       ModularOptions::TreeMode wp_tree_mode);
-
-  size_t Token(size_t pred, size_t i) const { return residuals[pred][i].tok; }
-  size_t NBits(size_t pred, size_t i) const { return residuals[pred][i].nbits; }
-  size_t Count(size_t i) const { return sample_counts[i]; }
-  size_t PredictorIndex(Predictor predictor) const {
-    const auto predictor_elem =
-        std::find(predictors.begin(), predictors.end(), predictor);
-    JXL_DASSERT(predictor_elem != predictors.end());
-    return predictor_elem - predictors.begin();
-  }
-  size_t PropertyIndex(size_t property) const {
-    const auto property_elem =
-        std::find(props_to_use.begin(), props_to_use.end(), property);
-    JXL_DASSERT(property_elem != props_to_use.end());
-    return property_elem - props_to_use.begin();
-  }
-  size_t NumPropertyValues(size_t property_index) const {
-    return compact_properties[property_index].size() + 1;
-  }
-  // Returns the *quantized* property value.
-  size_t Property(size_t property_index, size_t i) const {
-    return props[property_index][i];
-  }
-  int UnquantizeProperty(size_t property_index, uint32_t quant) const {
-    JXL_DASSERT(quant < compact_properties[property_index].size());
-    return compact_properties[property_index][quant];
-  }
-
-  Predictor PredictorFromIndex(size_t index) const {
-    JXL_DASSERT(index < predictors.size());
-    return predictors[index];
-  }
-  size_t PropertyFromIndex(size_t index) const {
-    JXL_DASSERT(index < props_to_use.size());
-    return props_to_use[index];
-  }
-  size_t NumPredictors() const { return predictors.size(); }
-  size_t NumProperties() const { return props_to_use.size(); }
-
-  // Preallocate data for a given number of samples. MUST be called before
-  // adding any sample.
-  void PrepareForSamples(size_t num_samples);
-  // Add a sample.
-  void AddSample(pixel_type_w pixel, const Properties &properties,
-                 const pixel_type_w *predictions);
-  // Pre-cluster property values.
-  void PreQuantizeProperties(
-      const StaticPropRange &range,
-      const std::vector<ModularMultiplierInfo> &multiplier_info,
-      const std::vector<uint32_t> &group_pixel_count,
-      const std::vector<uint32_t> &channel_pixel_count,
-      std::vector<pixel_type> &pixel_samples,
-      std::vector<pixel_type> &diff_samples, size_t max_property_values);
-
-  void AllSamplesDone() { dedup_table_ = std::vector<uint32_t>(); }
-
-  uint32_t QuantizeProperty(uint32_t prop, pixel_type v) const {
-    v = std::min(std::max(v, -kPropertyRange), kPropertyRange) + kPropertyRange;
-    return property_mapping[prop][v];
-  }
-
-  // Swaps samples in position a and b. Does nothing if a == b.
-  void Swap(size_t a, size_t b);
-
-  // Cycles samples: a -> b -> c -> a. We assume a <= b <= c, so that we can
-  // just call Swap(a, b) if b==c.
-  void ThreeShuffle(size_t a, size_t b, size_t c);
-
- private:
-  // TODO(veluca): as the total number of properties and predictors are known
-  // before adding any samples, it might be better to interleave predictors,
-  // properties and counts in a single vector to improve locality.
-  // A first attempt at doing this actually results in much slower encoding,
-  // possibly because of the more complex addressing.
-  struct ResidualToken {
-    uint8_t tok;
-    uint8_t nbits;
-  };
-  // Residual information: token and number of extra bits, per predictor.
-  std::vector<std::vector<ResidualToken>> residuals;
-  // Number of occurrences of each sample.
-  std::vector<uint16_t> sample_counts;
-  // Property values, quantized to at most 256 distinct values.
-  std::vector<std::vector<uint8_t>> props;
-  // Decompactification info for `props`.
-  std::vector<std::vector<int32_t>> compact_properties;
-  // List of properties to use.
-  std::vector<uint32_t> props_to_use;
-  // List of predictors to use.
-  std::vector<Predictor> predictors;
-  // Mapping property value -> quantized property value.
-  static constexpr int32_t kPropertyRange = 511;
-  std::vector<std::vector<uint8_t>> property_mapping;
-  // Number of samples seen.
-  size_t num_samples = 0;
-  // Table for deduplication.
-  static constexpr uint32_t kDedupEntryUnused{static_cast<uint32_t>(-1)};
-  std::vector<uint32_t> dedup_table_;
-
-  // Functions for sample deduplication.
-  bool IsSameSample(size_t a, size_t b) const;
-  size_t Hash1(size_t a) const;
-  size_t Hash2(size_t a) const;
-  void InitTable(size_t log_size);
-  // Returns true if `a` was already present in the table.
-  bool AddToTableAndMerge(size_t a);
-  void AddToTable(size_t a);
-};
-
-Status TokenizeTree(const Tree &tree, std::vector<Token> *tokens,
-                    Tree *decoder_tree);
-
-void CollectPixelSamples(const Image &image, const ModularOptions &options,
-                         uint32_t group_id,
-                         std::vector<uint32_t> &group_pixel_count,
-                         std::vector<uint32_t> &channel_pixel_count,
-                         std::vector<pixel_type> &pixel_samples,
-                         std::vector<pixel_type> &diff_samples);
-
-Status ComputeBestTree(TreeSamples &tree_samples, float threshold,
-                       const std::vector<ModularMultiplierInfo> &mul_info,
-                       StaticPropRange static_prop_range,
-                       float fast_decode_multiplier, Tree *tree);
-
-}  // namespace jxl
-#endif  // LIB_JXL_MODULAR_ENCODING_ENC_MA_H_
diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/encoding.cc b/third_party/jpeg-xl/lib/jxl/modular/encoding/encoding.cc
deleted file mode 100644
index b2e4a00bc8c4f..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/encoding/encoding.cc
+++ /dev/null
@@ -1,702 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/modular/encoding/encoding.h"
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <array>
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>
-#include <queue>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/scope_guard.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_ans.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/modular/encoding/context_predict.h"
-#include "lib/jxl/modular/options.h"
-#include "lib/jxl/pack_signed.h"
-
-namespace jxl {
-
-// Removes all nodes that use a static property (i.e. channel or group ID) from
-// the tree and collapses each node on even levels with its two children to
-// produce a flatter tree. Also computes whether the resulting tree requires
-// using the weighted predictor.
-FlatTree FilterTree(const Tree &global_tree,
-                    std::array<pixel_type, kNumStaticProperties> &static_props,
-                    size_t *num_props, bool *use_wp, bool *wp_only,
-                    bool *gradient_only) {
-  *num_props = 0;
-  bool has_wp = false;
-  bool has_non_wp = false;
-  *gradient_only = true;
-  const auto mark_property = [&](int32_t p) {
-    if (p == kWPProp) {
-      has_wp = true;
-    } else if (p >= kNumStaticProperties) {
-      has_non_wp = true;
-    }
-    if (p >= kNumStaticProperties && p != kGradientProp) {
-      *gradient_only = false;
-    }
-  };
-  FlatTree output;
-  std::queue<size_t> nodes;
-  nodes.push(0);
-  // Produces a trimmed and flattened tree by doing a BFS visit of the original
-  // tree, ignoring branches that are known to be false and proceeding two
-  // levels at a time to collapse nodes in a flatter tree; if an inner parent
-  // node has a leaf as a child, the leaf is duplicated and an implicit fake
-  // node is added. This allows to reduce the number of branches when traversing
-  // the resulting flat tree.
-  while (!nodes.empty()) {
-    size_t cur = nodes.front();
-    nodes.pop();
-    // Skip nodes that we can decide now, by jumping directly to their children.
-    while (global_tree[cur].property < kNumStaticProperties &&
-           global_tree[cur].property != -1) {
-      if (static_props[global_tree[cur].property] > global_tree[cur].splitval) {
-        cur = global_tree[cur].lchild;
-      } else {
-        cur = global_tree[cur].rchild;
-      }
-    }
-    FlatDecisionNode flat;
-    if (global_tree[cur].property == -1) {
-      flat.property0 = -1;
-      flat.childID = global_tree[cur].lchild;
-      flat.predictor = global_tree[cur].predictor;
-      flat.predictor_offset = global_tree[cur].predictor_offset;
-      flat.multiplier = global_tree[cur].multiplier;
-      *gradient_only &= flat.predictor == Predictor::Gradient;
-      has_wp |= flat.predictor == Predictor::Weighted;
-      has_non_wp |= flat.predictor != Predictor::Weighted;
-      output.push_back(flat);
-      continue;
-    }
-    flat.childID = output.size() + nodes.size() + 1;
-
-    flat.property0 = global_tree[cur].property;
-    *num_props = std::max<size_t>(flat.property0 + 1, *num_props);
-    flat.splitval0 = global_tree[cur].splitval;
-
-    for (size_t i = 0; i < 2; i++) {
-      size_t cur_child =
-          i == 0 ? global_tree[cur].lchild : global_tree[cur].rchild;
-      // Skip nodes that we can decide now.
-      while (global_tree[cur_child].property < kNumStaticProperties &&
-             global_tree[cur_child].property != -1) {
-        if (static_props[global_tree[cur_child].property] >
-            global_tree[cur_child].splitval) {
-          cur_child = global_tree[cur_child].lchild;
-        } else {
-          cur_child = global_tree[cur_child].rchild;
-        }
-      }
-      // We ended up in a leaf, add a placeholder decision and two copies of the
-      // leaf.
-      if (global_tree[cur_child].property == -1) {
-        flat.properties[i] = 0;
-        flat.splitvals[i] = 0;
-        nodes.push(cur_child);
-        nodes.push(cur_child);
-      } else {
-        flat.properties[i] = global_tree[cur_child].property;
-        flat.splitvals[i] = global_tree[cur_child].splitval;
-        nodes.push(global_tree[cur_child].lchild);
-        nodes.push(global_tree[cur_child].rchild);
-        *num_props = std::max<size_t>(flat.properties[i] + 1, *num_props);
-      }
-    }
-
-    for (int16_t property : flat.properties) mark_property(property);
-    mark_property(flat.property0);
-    output.push_back(flat);
-  }
-  if (*num_props > kNumNonrefProperties) {
-    *num_props =
-        DivCeil(*num_props - kNumNonrefProperties, kExtraPropsPerChannel) *
-            kExtraPropsPerChannel +
-        kNumNonrefProperties;
-  } else {
-    *num_props = kNumNonrefProperties;
-  }
-  *use_wp = has_wp;
-  *wp_only = has_wp && !has_non_wp;
-
-  return output;
-}
-
-namespace detail {
-template <bool uses_lz77>
-Status DecodeModularChannelMAANS(BitReader *br, ANSSymbolReader *reader,
-                                 const std::vector<uint8_t> &context_map,
-                                 const Tree &global_tree,
-                                 const weighted::Header &wp_header,
-                                 pixel_type chan, size_t group_id,
-                                 TreeLut<uint8_t, false, false> &tree_lut,
-                                 Image *image, uint32_t &fl_run,
-                                 uint32_t &fl_v) {
-  JxlMemoryManager *memory_manager = image->memory_manager();
-  Channel &channel = image->channel[chan];
-
-  std::array<pixel_type, kNumStaticProperties> static_props = {
-      {chan, static_cast<int>(group_id)}};
-  // TODO(veluca): filter the tree according to static_props.
-
-  // zero pixel channel? could happen
-  if (channel.w == 0 || channel.h == 0) return true;
-
-  bool tree_has_wp_prop_or_pred = false;
-  bool is_wp_only = false;
-  bool is_gradient_only = false;
-  size_t num_props;
-  FlatTree tree =
-      FilterTree(global_tree, static_props, &num_props,
-                 &tree_has_wp_prop_or_pred, &is_wp_only, &is_gradient_only);
-
-  // From here on, tree lookup returns a *clustered* context ID.
-  // This avoids an extra memory lookup after tree traversal.
-  for (auto &node : tree) {
-    if (node.property0 == -1) {
-      node.childID = context_map[node.childID];
-    }
-  }
-
-  JXL_DEBUG_V(3, "Decoded MA tree with %" PRIuS " nodes", tree.size());
-
-  // MAANS decode
-  const auto make_pixel = [](uint64_t v, pixel_type multiplier,
-                             pixel_type_w offset) -> pixel_type {
-    JXL_DASSERT((v & 0xFFFFFFFF) == v);
-    pixel_type_w val = UnpackSigned(v);
-    // if it overflows, it overflows, and we have a problem anyway
-    return val * multiplier + offset;
-  };
-
-  if (tree.size() == 1) {
-    // special optimized case: no meta-adaptation, so no need
-    // to compute properties.
-    Predictor predictor = tree[0].predictor;
-    int64_t offset = tree[0].predictor_offset;
-    int32_t multiplier = tree[0].multiplier;
-    size_t ctx_id = tree[0].childID;
-    if (predictor == Predictor::Zero) {
-      uint32_t value;
-      if (reader->IsSingleValueAndAdvance(ctx_id, &value,
-                                          channel.w * channel.h)) {
-        // Special-case: histogram has a single symbol, with no extra bits, and
-        // we use ANS mode.
-        JXL_DEBUG_V(8, "Fastest track.");
-        pixel_type v = make_pixel(value, multiplier, offset);
-        for (size_t y = 0; y < channel.h; y++) {
-          pixel_type *JXL_RESTRICT r = channel.Row(y);
-          std::fill(r, r + channel.w, v);
-        }
-      } else {
-        JXL_DEBUG_V(8, "Fast track.");
-        if (multiplier == 1 && offset == 0) {
-          for (size_t y = 0; y < channel.h; y++) {
-            pixel_type *JXL_RESTRICT r = channel.Row(y);
-            for (size_t x = 0; x < channel.w; x++) {
-              uint32_t v =
-                  reader->ReadHybridUintClusteredInlined<uses_lz77>(ctx_id, br);
-              r[x] = UnpackSigned(v);
-            }
-          }
-        } else {
-          for (size_t y = 0; y < channel.h; y++) {
-            pixel_type *JXL_RESTRICT r = channel.Row(y);
-            for (size_t x = 0; x < channel.w; x++) {
-              uint32_t v =
-                  reader->ReadHybridUintClusteredMaybeInlined<uses_lz77>(ctx_id,
-                                                                         br);
-              r[x] = make_pixel(v, multiplier, offset);
-            }
-          }
-        }
-      }
-      return true;
-    } else if (uses_lz77 && predictor == Predictor::Gradient && offset == 0 &&
-               multiplier == 1 && reader->IsHuffRleOnly()) {
-      JXL_DEBUG_V(8, "Gradient RLE (fjxl) very fast track.");
-      pixel_type_w sv = UnpackSigned(fl_v);
-      for (size_t y = 0; y < channel.h; y++) {
-        pixel_type *JXL_RESTRICT r = channel.Row(y);
-        const pixel_type *JXL_RESTRICT rtop = (y ? channel.Row(y - 1) : r - 1);
-        const pixel_type *JXL_RESTRICT rtopleft =
-            (y ? channel.Row(y - 1) - 1 : r - 1);
-        pixel_type_w guess = (y ? rtop[0] : 0);
-        if (fl_run == 0) {
-          reader->ReadHybridUintClusteredHuffRleOnly(ctx_id, br, &fl_v,
-                                                     &fl_run);
-          sv = UnpackSigned(fl_v);
-        } else {
-          fl_run--;
-        }
-        r[0] = sv + guess;
-        for (size_t x = 1; x < channel.w; x++) {
-          pixel_type left = r[x - 1];
-          pixel_type top = rtop[x];
-          pixel_type topleft = rtopleft[x];
-          pixel_type_w guess = ClampedGradient(top, left, topleft);
-          if (!fl_run) {
-            reader->ReadHybridUintClusteredHuffRleOnly(ctx_id, br, &fl_v,
-                                                       &fl_run);
-            sv = UnpackSigned(fl_v);
-          } else {
-            fl_run--;
-          }
-          r[x] = sv + guess;
-        }
-      }
-      return true;
-    } else if (predictor == Predictor::Gradient && offset == 0 &&
-               multiplier == 1) {
-      JXL_DEBUG_V(8, "Gradient very fast track.");
-      const intptr_t onerow = channel.plane.PixelsPerRow();
-      for (size_t y = 0; y < channel.h; y++) {
-        pixel_type *JXL_RESTRICT r = channel.Row(y);
-        for (size_t x = 0; x < channel.w; x++) {
-          pixel_type left = (x ? r[x - 1] : y ? *(r + x - onerow) : 0);
-          pixel_type top = (y ? *(r + x - onerow) : left);
-          pixel_type topleft = (x && y ? *(r + x - 1 - onerow) : left);
-          pixel_type guess = ClampedGradient(top, left, topleft);
-          uint64_t v = reader->ReadHybridUintClusteredMaybeInlined<uses_lz77>(
-              ctx_id, br);
-          r[x] = make_pixel(v, 1, guess);
-        }
-      }
-      return true;
-    }
-  }
-
-  // Check if this tree is a WP-only tree with a small enough property value
-  // range.
-  if (is_wp_only) {
-    is_wp_only = TreeToLookupTable(tree, tree_lut);
-  }
-  if (is_gradient_only) {
-    is_gradient_only = TreeToLookupTable(tree, tree_lut);
-  }
-
-  if (is_gradient_only) {
-    JXL_DEBUG_V(8, "Gradient fast track.");
-    const intptr_t onerow = channel.plane.PixelsPerRow();
-    for (size_t y = 0; y < channel.h; y++) {
-      pixel_type *JXL_RESTRICT r = channel.Row(y);
-      for (size_t x = 0; x < channel.w; x++) {
-        pixel_type_w left = (x ? r[x - 1] : y ? *(r + x - onerow) : 0);
-        pixel_type_w top = (y ? *(r + x - onerow) : left);
-        pixel_type_w topleft = (x && y ? *(r + x - 1 - onerow) : left);
-        int32_t guess = ClampedGradient(top, left, topleft);
-        uint32_t pos =
-            kPropRangeFast +
-            std::min<pixel_type_w>(
-                std::max<pixel_type_w>(-kPropRangeFast, top + left - topleft),
-                kPropRangeFast - 1);
-        uint32_t ctx_id = tree_lut.context_lookup[pos];
-        uint64_t v =
-            reader->ReadHybridUintClusteredMaybeInlined<uses_lz77>(ctx_id, br);
-        r[x] = make_pixel(v, 1, guess);
-      }
-    }
-  } else if (!uses_lz77 && is_wp_only && channel.w > 8) {
-    JXL_DEBUG_V(8, "WP fast track.");
-    weighted::State wp_state(wp_header, channel.w, channel.h);
-    Properties properties(1);
-    for (size_t y = 0; y < channel.h; y++) {
-      pixel_type *JXL_RESTRICT r = channel.Row(y);
-      const pixel_type *JXL_RESTRICT rtop = (y ? channel.Row(y - 1) : r - 1);
-      const pixel_type *JXL_RESTRICT rtoptop =
-          (y > 1 ? channel.Row(y - 2) : rtop);
-      const pixel_type *JXL_RESTRICT rtopleft =
-          (y ? channel.Row(y - 1) - 1 : r - 1);
-      const pixel_type *JXL_RESTRICT rtopright =
-          (y ? channel.Row(y - 1) + 1 : r - 1);
-      size_t x = 0;
-      {
-        size_t offset = 0;
-        pixel_type_w left = y ? rtop[x] : 0;
-        pixel_type_w toptop = y ? rtoptop[x] : 0;
-        pixel_type_w topright = (x + 1 < channel.w && y ? rtop[x + 1] : left);
-        int32_t guess = wp_state.Predict</*compute_properties=*/true>(
-            x, y, channel.w, left, left, topright, left, toptop, &properties,
-            offset);
-        uint32_t pos =
-            kPropRangeFast + std::min(std::max(-kPropRangeFast, properties[0]),
-                                      kPropRangeFast - 1);
-        uint32_t ctx_id = tree_lut.context_lookup[pos];
-        uint64_t v =
-            reader->ReadHybridUintClusteredInlined<uses_lz77>(ctx_id, br);
-        r[x] = make_pixel(v, 1, guess);
-        wp_state.UpdateErrors(r[x], x, y, channel.w);
-      }
-      for (x = 1; x + 1 < channel.w; x++) {
-        size_t offset = 0;
-        int32_t guess = wp_state.Predict</*compute_properties=*/true>(
-            x, y, channel.w, rtop[x], r[x - 1], rtopright[x], rtopleft[x],
-            rtoptop[x], &properties, offset);
-        uint32_t pos =
-            kPropRangeFast + std::min(std::max(-kPropRangeFast, properties[0]),
-                                      kPropRangeFast - 1);
-        uint32_t ctx_id = tree_lut.context_lookup[pos];
-        uint64_t v =
-            reader->ReadHybridUintClusteredInlined<uses_lz77>(ctx_id, br);
-        r[x] = make_pixel(v, 1, guess);
-        wp_state.UpdateErrors(r[x], x, y, channel.w);
-      }
-      {
-        size_t offset = 0;
-        int32_t guess = wp_state.Predict</*compute_properties=*/true>(
-            x, y, channel.w, rtop[x], r[x - 1], rtop[x], rtopleft[x],
-            rtoptop[x], &properties, offset);
-        uint32_t pos =
-            kPropRangeFast + std::min(std::max(-kPropRangeFast, properties[0]),
-                                      kPropRangeFast - 1);
-        uint32_t ctx_id = tree_lut.context_lookup[pos];
-        uint64_t v =
-            reader->ReadHybridUintClusteredInlined<uses_lz77>(ctx_id, br);
-        r[x] = make_pixel(v, 1, guess);
-        wp_state.UpdateErrors(r[x], x, y, channel.w);
-      }
-    }
-  } else if (!tree_has_wp_prop_or_pred) {
-    // special optimized case: the weighted predictor and its properties are not
-    // used, so no need to compute weights and properties.
-    JXL_DEBUG_V(8, "Slow track.");
-    MATreeLookup tree_lookup(tree);
-    Properties properties = Properties(num_props);
-    const intptr_t onerow = channel.plane.PixelsPerRow();
-    JXL_ASSIGN_OR_RETURN(
-        Channel references,
-        Channel::Create(memory_manager,
-                        properties.size() - kNumNonrefProperties, channel.w));
-    for (size_t y = 0; y < channel.h; y++) {
-      pixel_type *JXL_RESTRICT p = channel.Row(y);
-      PrecomputeReferences(channel, y, *image, chan, &references);
-      InitPropsRow(&properties, static_props, y);
-      if (y > 1 && channel.w > 8 && references.w == 0) {
-        for (size_t x = 0; x < 2; x++) {
-          PredictionResult res =
-              PredictTreeNoWP(&properties, channel.w, p + x, onerow, x, y,
-                              tree_lookup, references);
-          uint64_t v =
-              reader->ReadHybridUintClustered<uses_lz77>(res.context, br);
-          p[x] = make_pixel(v, res.multiplier, res.guess);
-        }
-        for (size_t x = 2; x < channel.w - 2; x++) {
-          PredictionResult res =
-              PredictTreeNoWPNEC(&properties, channel.w, p + x, onerow, x, y,
-                                 tree_lookup, references);
-          uint64_t v = reader->ReadHybridUintClusteredInlined<uses_lz77>(
-              res.context, br);
-          p[x] = make_pixel(v, res.multiplier, res.guess);
-        }
-        for (size_t x = channel.w - 2; x < channel.w; x++) {
-          PredictionResult res =
-              PredictTreeNoWP(&properties, channel.w, p + x, onerow, x, y,
-                              tree_lookup, references);
-          uint64_t v =
-              reader->ReadHybridUintClustered<uses_lz77>(res.context, br);
-          p[x] = make_pixel(v, res.multiplier, res.guess);
-        }
-      } else {
-        for (size_t x = 0; x < channel.w; x++) {
-          PredictionResult res =
-              PredictTreeNoWP(&properties, channel.w, p + x, onerow, x, y,
-                              tree_lookup, references);
-          uint64_t v = reader->ReadHybridUintClusteredMaybeInlined<uses_lz77>(
-              res.context, br);
-          p[x] = make_pixel(v, res.multiplier, res.guess);
-        }
-      }
-    }
-  } else {
-    JXL_DEBUG_V(8, "Slowest track.");
-    MATreeLookup tree_lookup(tree);
-    Properties properties = Properties(num_props);
-    const intptr_t onerow = channel.plane.PixelsPerRow();
-    JXL_ASSIGN_OR_RETURN(
-        Channel references,
-        Channel::Create(memory_manager,
-                        properties.size() - kNumNonrefProperties, channel.w));
-    weighted::State wp_state(wp_header, channel.w, channel.h);
-    for (size_t y = 0; y < channel.h; y++) {
-      pixel_type *JXL_RESTRICT p = channel.Row(y);
-      InitPropsRow(&properties, static_props, y);
-      PrecomputeReferences(channel, y, *image, chan, &references);
-      if (!uses_lz77 && y > 1 && channel.w > 8 && references.w == 0) {
-        for (size_t x = 0; x < 2; x++) {
-          PredictionResult res =
-              PredictTreeWP(&properties, channel.w, p + x, onerow, x, y,
-                            tree_lookup, references, &wp_state);
-          uint64_t v =
-              reader->ReadHybridUintClustered<uses_lz77>(res.context, br);
-          p[x] = make_pixel(v, res.multiplier, res.guess);
-          wp_state.UpdateErrors(p[x], x, y, channel.w);
-        }
-        for (size_t x = 2; x < channel.w - 2; x++) {
-          PredictionResult res =
-              PredictTreeWPNEC(&properties, channel.w, p + x, onerow, x, y,
-                               tree_lookup, references, &wp_state);
-          uint64_t v = reader->ReadHybridUintClusteredInlined<uses_lz77>(
-              res.context, br);
-          p[x] = make_pixel(v, res.multiplier, res.guess);
-          wp_state.UpdateErrors(p[x], x, y, channel.w);
-        }
-        for (size_t x = channel.w - 2; x < channel.w; x++) {
-          PredictionResult res =
-              PredictTreeWP(&properties, channel.w, p + x, onerow, x, y,
-                            tree_lookup, references, &wp_state);
-          uint64_t v =
-              reader->ReadHybridUintClustered<uses_lz77>(res.context, br);
-          p[x] = make_pixel(v, res.multiplier, res.guess);
-          wp_state.UpdateErrors(p[x], x, y, channel.w);
-        }
-      } else {
-        for (size_t x = 0; x < channel.w; x++) {
-          PredictionResult res =
-              PredictTreeWP(&properties, channel.w, p + x, onerow, x, y,
-                            tree_lookup, references, &wp_state);
-          uint64_t v =
-              reader->ReadHybridUintClustered<uses_lz77>(res.context, br);
-          p[x] = make_pixel(v, res.multiplier, res.guess);
-          wp_state.UpdateErrors(p[x], x, y, channel.w);
-        }
-      }
-    }
-  }
-  return true;
-}
-}  // namespace detail
-
-Status DecodeModularChannelMAANS(BitReader *br, ANSSymbolReader *reader,
-                                 const std::vector<uint8_t> &context_map,
-                                 const Tree &global_tree,
-                                 const weighted::Header &wp_header,
-                                 pixel_type chan, size_t group_id,
-                                 TreeLut<uint8_t, false, false> &tree_lut,
-                                 Image *image, uint32_t &fl_run,
-                                 uint32_t &fl_v) {
-  if (reader->UsesLZ77()) {
-    return detail::DecodeModularChannelMAANS</*uses_lz77=*/true>(
-        br, reader, context_map, global_tree, wp_header, chan, group_id,
-        tree_lut, image, fl_run, fl_v);
-  } else {
-    return detail::DecodeModularChannelMAANS</*uses_lz77=*/false>(
-        br, reader, context_map, global_tree, wp_header, chan, group_id,
-        tree_lut, image, fl_run, fl_v);
-  }
-}
-
-GroupHeader::GroupHeader() { Bundle::Init(this); }
-
-Status ValidateChannelDimensions(const Image &image,
-                                 const ModularOptions &options) {
-  size_t nb_channels = image.channel.size();
-  for (bool is_dc : {true, false}) {
-    size_t group_dim = options.group_dim * (is_dc ? kBlockDim : 1);
-    size_t c = image.nb_meta_channels;
-    for (; c < nb_channels; c++) {
-      const Channel &ch = image.channel[c];
-      if (ch.w > options.group_dim || ch.h > options.group_dim) break;
-    }
-    for (; c < nb_channels; c++) {
-      const Channel &ch = image.channel[c];
-      if (ch.w == 0 || ch.h == 0) continue;  // skip empty
-      bool is_dc_channel = std::min(ch.hshift, ch.vshift) >= 3;
-      if (is_dc_channel != is_dc) continue;
-      size_t tile_dim = group_dim >> std::max(ch.hshift, ch.vshift);
-      if (tile_dim == 0) {
-        return JXL_FAILURE("Inconsistent transforms");
-      }
-    }
-  }
-  return true;
-}
-
-Status ModularDecode(BitReader *br, Image &image, GroupHeader &header,
-                     size_t group_id, ModularOptions *options,
-                     const Tree *global_tree, const ANSCode *global_code,
-                     const std::vector<uint8_t> *global_ctx_map,
-                     const bool allow_truncated_group) {
-  if (image.channel.empty()) return true;
-  JxlMemoryManager *memory_manager = image.memory_manager();
-
-  // decode transforms
-  Status status = Bundle::Read(br, &header);
-  if (!allow_truncated_group) JXL_RETURN_IF_ERROR(status);
-  if (status.IsFatalError()) return status;
-  if (!br->AllReadsWithinBounds()) {
-    // Don't do/undo transforms if header is incomplete.
-    header.transforms.clear();
-    image.transform = header.transforms;
-    for (auto &ch : image.channel) {
-      ZeroFillImage(&ch.plane);
-    }
-    return Status(StatusCode::kNotEnoughBytes);
-  }
-
-  JXL_DEBUG_V(3, "Image data underwent %" PRIuS " transformations: ",
-              header.transforms.size());
-  image.transform = header.transforms;
-  for (Transform &transform : image.transform) {
-    JXL_RETURN_IF_ERROR(transform.MetaApply(image));
-  }
-  if (image.error) {
-    return JXL_FAILURE("Corrupt file. Aborting.");
-  }
-  JXL_RETURN_IF_ERROR(ValidateChannelDimensions(image, *options));
-
-  size_t nb_channels = image.channel.size();
-
-  size_t num_chans = 0;
-  size_t distance_multiplier = 0;
-  for (size_t i = 0; i < nb_channels; i++) {
-    Channel &channel = image.channel[i];
-    if (!channel.w || !channel.h) {
-      continue;  // skip empty channels
-    }
-    if (i >= image.nb_meta_channels && (channel.w > options->max_chan_size ||
-                                        channel.h > options->max_chan_size)) {
-      break;
-    }
-    if (channel.w > distance_multiplier) {
-      distance_multiplier = channel.w;
-    }
-    num_chans++;
-  }
-  if (num_chans == 0) return true;
-
-  size_t next_channel = 0;
-  auto scope_guard = MakeScopeGuard([&]() {
-    for (size_t c = next_channel; c < image.channel.size(); c++) {
-      ZeroFillImage(&image.channel[c].plane);
-    }
-  });
-  // Do not do anything if truncated groups are not allowed.
-  if (allow_truncated_group) scope_guard.Disarm();
-
-  // Read tree.
-  Tree tree_storage;
-  std::vector<uint8_t> context_map_storage;
-  ANSCode code_storage;
-  const Tree *tree = &tree_storage;
-  const ANSCode *code = &code_storage;
-  const std::vector<uint8_t> *context_map = &context_map_storage;
-  if (!header.use_global_tree) {
-    uint64_t max_tree_size = 1024;
-    for (size_t i = 0; i < nb_channels; i++) {
-      Channel &channel = image.channel[i];
-      if (i >= image.nb_meta_channels && (channel.w > options->max_chan_size ||
-                                          channel.h > options->max_chan_size)) {
-        break;
-      }
-      uint64_t pixels = channel.w * channel.h;
-      max_tree_size += pixels;
-    }
-    max_tree_size = std::min(static_cast<uint64_t>(1 << 20), max_tree_size);
-    JXL_RETURN_IF_ERROR(
-        DecodeTree(memory_manager, br, &tree_storage, max_tree_size));
-    JXL_RETURN_IF_ERROR(DecodeHistograms(memory_manager, br,
-                                         (tree_storage.size() + 1) / 2,
-                                         &code_storage, &context_map_storage));
-  } else {
-    if (!global_tree || !global_code || !global_ctx_map ||
-        global_tree->empty()) {
-      return JXL_FAILURE("No global tree available but one was requested");
-    }
-    tree = global_tree;
-    code = global_code;
-    context_map = global_ctx_map;
-  }
-
-  // Read channels
-  JXL_ASSIGN_OR_RETURN(ANSSymbolReader reader,
-                       ANSSymbolReader::Create(code, br, distance_multiplier));
-  auto tree_lut = jxl::make_unique<TreeLut<uint8_t, false, false>>();
-  uint32_t fl_run = 0;
-  uint32_t fl_v = 0;
-  for (; next_channel < nb_channels; next_channel++) {
-    Channel &channel = image.channel[next_channel];
-    if (!channel.w || !channel.h) {
-      continue;  // skip empty channels
-    }
-    if (next_channel >= image.nb_meta_channels &&
-        (channel.w > options->max_chan_size ||
-         channel.h > options->max_chan_size)) {
-      break;
-    }
-    JXL_RETURN_IF_ERROR(DecodeModularChannelMAANS(
-        br, &reader, *context_map, *tree, header.wp_header, next_channel,
-        group_id, *tree_lut, &image, fl_run, fl_v));
-
-    // Truncated group.
-    if (!br->AllReadsWithinBounds()) {
-      if (!allow_truncated_group) return JXL_FAILURE("Truncated input");
-      return Status(StatusCode::kNotEnoughBytes);
-    }
-  }
-
-  // Make sure no zero-filling happens even if next_channel < nb_channels.
-  scope_guard.Disarm();
-
-  if (!reader.CheckANSFinalState()) {
-    return JXL_FAILURE("ANS decode final state failed");
-  }
-  return true;
-}
-
-Status ModularGenericDecompress(BitReader *br, Image &image,
-                                GroupHeader *header, size_t group_id,
-                                ModularOptions *options, bool undo_transforms,
-                                const Tree *tree, const ANSCode *code,
-                                const std::vector<uint8_t> *ctx_map,
-                                bool allow_truncated_group) {
-  std::vector<std::pair<uint32_t, uint32_t>> req_sizes;
-  req_sizes.reserve(image.channel.size());
-  for (const auto &c : image.channel) {
-    req_sizes.emplace_back(c.w, c.h);
-  }
-  GroupHeader local_header;
-  if (header == nullptr) header = &local_header;
-  size_t bit_pos = br->TotalBitsConsumed();
-  auto dec_status = ModularDecode(br, image, *header, group_id, options, tree,
-                                  code, ctx_map, allow_truncated_group);
-  if (!allow_truncated_group) JXL_RETURN_IF_ERROR(dec_status);
-  if (dec_status.IsFatalError()) return dec_status;
-  if (undo_transforms) image.undo_transforms(header->wp_header);
-  if (image.error) return JXL_FAILURE("Corrupt file. Aborting.");
-  JXL_DEBUG_V(4,
-              "Modular-decoded a %" PRIuS "x%" PRIuS " nbchans=%" PRIuS
-              " image from %" PRIuS " bytes",
-              image.w, image.h, image.channel.size(),
-              (br->TotalBitsConsumed() - bit_pos) / 8);
-  JXL_DEBUG_V(5, "Modular image: %s", image.DebugString().c_str());
-  (void)bit_pos;
-  // Check that after applying all transforms we are back to the requested
-  // image sizes, otherwise there's a programming error with the
-  // transformations.
-  if (undo_transforms) {
-    JXL_ENSURE(image.channel.size() == req_sizes.size());
-    for (size_t c = 0; c < req_sizes.size(); c++) {
-      JXL_ENSURE(req_sizes[c].first == image.channel[c].w);
-      JXL_ENSURE(req_sizes[c].second == image.channel[c].h);
-    }
-  }
-  return dec_status;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/encoding.h b/third_party/jpeg-xl/lib/jxl/modular/encoding/encoding.h
deleted file mode 100644
index 0127d79238778..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/encoding/encoding.h
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_MODULAR_ENCODING_ENCODING_H_
-#define LIB_JXL_MODULAR_ENCODING_ENCODING_H_
-
-#include <array>
-#include <cstddef>
-#include <cstdint>
-#include <limits>
-#include <vector>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/field_encodings.h"
-#include "lib/jxl/modular/encoding/context_predict.h"
-#include "lib/jxl/modular/encoding/dec_ma.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/modular/options.h"
-#include "lib/jxl/modular/transform/transform.h"
-
-namespace jxl {
-
-struct ANSCode;
-class BitReader;
-
-// Valid range of properties for using lookup tables instead of trees.
-constexpr int32_t kPropRangeFast = 512 << 4;
-
-struct GroupHeader : public Fields {
-  GroupHeader();
-
-  JXL_FIELDS_NAME(GroupHeader)
-
-  Status VisitFields(Visitor *JXL_RESTRICT visitor) override {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &use_global_tree));
-    JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&wp_header));
-    uint32_t num_transforms = static_cast<uint32_t>(transforms.size());
-    JXL_QUIET_RETURN_IF_ERROR(visitor->U32(Val(0), Val(1), BitsOffset(4, 2),
-                                           BitsOffset(8, 18), 0,
-                                           &num_transforms));
-    if (visitor->IsReading()) transforms.resize(num_transforms);
-    for (size_t i = 0; i < num_transforms; i++) {
-      JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&transforms[i]));
-    }
-    return true;
-  }
-
-  bool use_global_tree;
-  weighted::Header wp_header;
-
-  std::vector<Transform> transforms;
-};
-
-FlatTree FilterTree(const Tree &global_tree,
-                    std::array<pixel_type, kNumStaticProperties> &static_props,
-                    size_t *num_props, bool *use_wp, bool *wp_only,
-                    bool *gradient_only);
-
-template <typename T, bool HAS_OFFSETS, bool HAS_MULTIPLIERS>
-struct TreeLut {
-  std::array<T, 2 * kPropRangeFast> context_lookup;
-  std::array<int8_t, HAS_OFFSETS ? (2 * kPropRangeFast) : 0> offsets;
-  std::array<int8_t, HAS_MULTIPLIERS ? (2 * kPropRangeFast) : 0> multipliers;
-};
-
-template <typename T, bool HAS_OFFSETS, bool HAS_MULTIPLIERS>
-bool TreeToLookupTable(const FlatTree &tree,
-                       TreeLut<T, HAS_OFFSETS, HAS_MULTIPLIERS> &lut) {
-  struct TreeRange {
-    // Begin *excluded*, end *included*. This works best with > vs <= decision
-    // nodes.
-    int begin, end;
-    size_t pos;
-  };
-  std::vector<TreeRange> ranges;
-  ranges.push_back(TreeRange{-kPropRangeFast - 1, kPropRangeFast - 1, 0});
-  while (!ranges.empty()) {
-    TreeRange cur = ranges.back();
-    ranges.pop_back();
-    if (cur.begin < -kPropRangeFast - 1 || cur.begin >= kPropRangeFast - 1 ||
-        cur.end > kPropRangeFast - 1) {
-      // Tree is outside the allowed range, exit.
-      return false;
-    }
-    auto &node = tree[cur.pos];
-    // Leaf.
-    if (node.property0 == -1) {
-      if (node.predictor_offset < std::numeric_limits<int8_t>::min() ||
-          node.predictor_offset > std::numeric_limits<int8_t>::max()) {
-        return false;
-      }
-      if (node.multiplier < std::numeric_limits<int8_t>::min() ||
-          node.multiplier > std::numeric_limits<int8_t>::max()) {
-        return false;
-      }
-      if (!HAS_MULTIPLIERS && node.multiplier != 1) {
-        return false;
-      }
-      if (!HAS_OFFSETS && node.predictor_offset != 0) {
-        return false;
-      }
-      for (int i = cur.begin + 1; i < cur.end + 1; i++) {
-        lut.context_lookup[i + kPropRangeFast] = node.childID;
-        if (HAS_MULTIPLIERS) {
-          lut.multipliers[i + kPropRangeFast] = node.multiplier;
-        }
-        if (HAS_OFFSETS) {
-          lut.offsets[i + kPropRangeFast] = node.predictor_offset;
-        }
-      }
-      continue;
-    }
-    // > side of top node.
-    if (node.properties[0] >= kNumStaticProperties) {
-      ranges.push_back(TreeRange({node.splitvals[0], cur.end, node.childID}));
-      ranges.push_back(
-          TreeRange({node.splitval0, node.splitvals[0], node.childID + 1}));
-    } else {
-      ranges.push_back(TreeRange({node.splitval0, cur.end, node.childID}));
-    }
-    // <= side
-    if (node.properties[1] >= kNumStaticProperties) {
-      ranges.push_back(
-          TreeRange({node.splitvals[1], node.splitval0, node.childID + 2}));
-      ranges.push_back(
-          TreeRange({cur.begin, node.splitvals[1], node.childID + 3}));
-    } else {
-      ranges.push_back(
-          TreeRange({cur.begin, node.splitval0, node.childID + 2}));
-    }
-  }
-  return true;
-}
-// TODO(veluca): make cleaner interfaces.
-
-Status ValidateChannelDimensions(const Image &image,
-                                 const ModularOptions &options);
-
-Status ModularGenericDecompress(BitReader *br, Image &image,
-                                GroupHeader *header, size_t group_id,
-                                ModularOptions *options,
-                                bool undo_transforms = true,
-                                const Tree *tree = nullptr,
-                                const ANSCode *code = nullptr,
-                                const std::vector<uint8_t> *ctx_map = nullptr,
-                                bool allow_truncated_group = false);
-}  // namespace jxl
-
-#endif  // LIB_JXL_MODULAR_ENCODING_ENCODING_H_
diff --git a/third_party/jpeg-xl/lib/jxl/modular/encoding/ma_common.h b/third_party/jpeg-xl/lib/jxl/modular/encoding/ma_common.h
deleted file mode 100644
index 71b78473213f3..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/encoding/ma_common.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_MODULAR_ENCODING_MA_COMMON_H_
-#define LIB_JXL_MODULAR_ENCODING_MA_COMMON_H_
-
-#include <stddef.h>
-
-namespace jxl {
-
-enum MATreeContext : size_t {
-  kSplitValContext = 0,
-  kPropertyContext = 1,
-  kPredictorContext = 2,
-  kOffsetContext = 3,
-  kMultiplierLogContext = 4,
-  kMultiplierBitsContext = 5,
-
-  kNumTreeContexts = 6,
-};
-
-static constexpr size_t kMaxTreeSize = 1 << 22;
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_MODULAR_ENCODING_MA_COMMON_H_
diff --git a/third_party/jpeg-xl/lib/jxl/modular/modular_image.cc b/third_party/jpeg-xl/lib/jxl/modular/modular_image.cc
deleted file mode 100644
index 8e5ab61f1ff8d..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/modular_image.cc
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/modular/modular_image.h"
-
-#include <jxl/memory_manager.h>
-
-#if JXL_DEBUG_V_LEVEL >= 1
-#include <sstream>
-#endif
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/modular/transform/transform.h"
-
-namespace jxl {
-
-void Image::undo_transforms(const weighted::Header &wp_header,
-                            jxl::ThreadPool *pool) {
-  while (!transform.empty()) {
-    Transform t = transform.back();
-    JXL_DEBUG_V(4, "Undoing transform");
-    Status result = t.Inverse(*this, wp_header, pool);
-    if (result == false) {
-      JXL_NOTIFY_ERROR("Error while undoing transform.");
-      error = true;
-      return;
-    }
-    JXL_DEBUG_V(8, "Undoing transform: done");
-    transform.pop_back();
-  }
-}
-
-Image::Image(JxlMemoryManager *memory_manager, size_t iw, size_t ih,
-             int bitdepth)
-    : w(iw),
-      h(ih),
-      bitdepth(bitdepth),
-      nb_meta_channels(0),
-      error(false),
-      memory_manager_(memory_manager) {}
-
-StatusOr<Image> Image::Create(JxlMemoryManager *memory_manager, size_t iw,
-                              size_t ih, int bitdepth, int nb_chans) {
-  Image result(memory_manager, iw, ih, bitdepth);
-  for (int i = 0; i < nb_chans; i++) {
-    JXL_ASSIGN_OR_RETURN(Channel c, Channel::Create(memory_manager, iw, ih));
-    result.channel.emplace_back(std::move(c));
-  }
-  return result;
-}
-
-Image::Image(JxlMemoryManager *memory_manager)
-    : w(0),
-      h(0),
-      bitdepth(8),
-      nb_meta_channels(0),
-      error(true),
-      memory_manager_(memory_manager) {}
-
-Image &Image::operator=(Image &&other) noexcept {
-  w = other.w;
-  h = other.h;
-  bitdepth = other.bitdepth;
-  nb_meta_channels = other.nb_meta_channels;
-  error = other.error;
-  channel = std::move(other.channel);
-  transform = std::move(other.transform);
-  return *this;
-}
-
-StatusOr<Image> Image::Clone(const Image &that) {
-  JxlMemoryManager *memory_manager = that.memory_manager();
-  Image clone(memory_manager, that.w, that.h, that.bitdepth);
-  clone.nb_meta_channels = that.nb_meta_channels;
-  clone.error = that.error;
-  clone.transform = that.transform;
-  for (const Channel &ch : that.channel) {
-    JXL_ASSIGN_OR_RETURN(Channel a, Channel::Create(memory_manager, ch.w, ch.h,
-                                                    ch.hshift, ch.vshift));
-    JXL_RETURN_IF_ERROR(CopyImageTo(ch.plane, &a.plane));
-    clone.channel.push_back(std::move(a));
-  }
-  return clone;
-}
-
-#if JXL_DEBUG_V_LEVEL >= 1
-std::string Image::DebugString() const {
-  std::ostringstream os;
-  os << w << "x" << h << ", depth: " << bitdepth;
-  if (!channel.empty()) {
-    os << ", channels:";
-    for (size_t i = 0; i < channel.size(); ++i) {
-      os << " " << channel[i].w << "x" << channel[i].h
-         << "(shift: " << channel[i].hshift << "," << channel[i].vshift << ")";
-      if (i < nb_meta_channels) os << "*";
-    }
-  }
-  return os.str();
-}
-#endif
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/modular/modular_image.h b/third_party/jpeg-xl/lib/jxl/modular/modular_image.h
deleted file mode 100644
index fdae8b9c6b0f7..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/modular_image.h
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_MODULAR_MODULAR_IMAGE_H_
-#define LIB_JXL_MODULAR_MODULAR_IMAGE_H_
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/image.h"
-
-namespace jxl {
-
-typedef int32_t pixel_type;  // can use int16_t if it's only for 8-bit images.
-                             // Need some wiggle room for YCoCg / Squeeze etc
-
-typedef int64_t pixel_type_w;
-
-namespace weighted {
-struct Header;
-}
-
-class Channel {
- public:
-  jxl::Plane<pixel_type> plane;
-  size_t w, h;
-  int hshift, vshift;  // w ~= image.w >> hshift;  h ~= image.h >> vshift
-  Channel(const Channel& other) = delete;
-  Channel& operator=(const Channel& other) = delete;
-
-  static StatusOr<Channel> Create(JxlMemoryManager* memory_manager, size_t iw,
-                                  size_t ih, int hsh = 0, int vsh = 0) {
-    JXL_ASSIGN_OR_RETURN(Plane<pixel_type> plane,
-                         Plane<pixel_type>::Create(memory_manager, iw, ih));
-    return Channel(std::move(plane), iw, ih, hsh, vsh);
-  }
-
-  // Move assignment
-  Channel& operator=(Channel&& other) noexcept {
-    w = other.w;
-    h = other.h;
-    hshift = other.hshift;
-    vshift = other.vshift;
-    plane = std::move(other.plane);
-    return *this;
-  }
-
-  // Move constructor
-  Channel(Channel&& other) noexcept = default;
-
-  JxlMemoryManager* memory_manager() const { return plane.memory_manager(); };
-
-  Status shrink() {
-    if (plane.xsize() == w && plane.ysize() == h) return true;
-    JXL_ASSIGN_OR_RETURN(plane,
-                         Plane<pixel_type>::Create(memory_manager(), w, h));
-    return true;
-  }
-  Status shrink(int nw, int nh) {
-    w = nw;
-    h = nh;
-    return shrink();
-  }
-
-  JXL_INLINE pixel_type* Row(const size_t y) { return plane.Row(y); }
-  JXL_INLINE const pixel_type* Row(const size_t y) const {
-    return plane.Row(y);
-  }
-
- private:
-  Channel(jxl::Plane<pixel_type>&& p, size_t iw, size_t ih, int hsh, int vsh)
-      : plane(std::move(p)), w(iw), h(ih), hshift(hsh), vshift(vsh) {}
-};
-
-class Transform;
-
-class Image {
- public:
-  // image data, transforms can dramatically change the number of channels and
-  // their semantics
-  std::vector<Channel> channel;
-  // transforms that have been applied (and that have to be undone)
-  std::vector<Transform> transform;
-
-  // image dimensions (channels may have different dimensions due to transforms)
-  size_t w, h;
-  int bitdepth;
-  size_t nb_meta_channels;  // first few channels might contain palette(s)
-  bool error;               // true if a fatal error occurred, false otherwise
-
-  explicit Image(JxlMemoryManager* memory_manager);
-
-  Image(const Image& other) = delete;
-  Image& operator=(const Image& other) = delete;
-
-  Image& operator=(Image&& other) noexcept;
-  Image(Image&& other) noexcept = default;
-
-  static StatusOr<Image> Create(JxlMemoryManager* memory_manager, size_t iw,
-                                size_t ih, int bitdepth, int nb_chans);
-
-  JxlMemoryManager* memory_manager() const { return memory_manager_; }
-
-  bool empty() const {
-    for (const auto& ch : channel) {
-      if (ch.w && ch.h) return false;
-    }
-    return true;
-  }
-
-  static StatusOr<Image> Clone(const Image& that);
-
-  void undo_transforms(const weighted::Header& wp_header,
-                       jxl::ThreadPool* pool = nullptr);
-
-  std::string DebugString() const;
-
- private:
-  Image(JxlMemoryManager* memory_manager, size_t iw, size_t ih, int bitdepth);
-  JxlMemoryManager* memory_manager_;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_MODULAR_MODULAR_IMAGE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/modular/options.h b/third_party/jpeg-xl/lib/jxl/modular/options.h
deleted file mode 100644
index 5b08236ff2ff3..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/options.h
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_MODULAR_OPTIONS_H_
-#define LIB_JXL_MODULAR_OPTIONS_H_
-
-#include <array>
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/enc_ans_params.h"
-
-namespace jxl {
-
-using PropertyVal = int32_t;
-using Properties = std::vector<PropertyVal>;
-
-enum class Predictor : uint32_t {
-  Zero = 0,
-  Left = 1,
-  Top = 2,
-  Average0 = 3,
-  Select = 4,
-  Gradient = 5,
-  Weighted = 6,
-  TopRight = 7,
-  TopLeft = 8,
-  LeftLeft = 9,
-  Average1 = 10,
-  Average2 = 11,
-  Average3 = 12,
-  Average4 = 13,
-  // The following predictors are encoder-only.
-  Best = 14,  // Best of Gradient and Weighted
-  Variable =
-      15,  // Find the best decision tree for predictors/predictor per row
-};
-
-constexpr Predictor kUndefinedPredictor = static_cast<Predictor>(~0u);
-
-constexpr size_t kNumModularPredictors =
-    static_cast<size_t>(Predictor::Average4) + 1;
-constexpr size_t kNumModularEncoderPredictors =
-    static_cast<size_t>(Predictor::Variable) + 1;
-
-static constexpr ssize_t kNumStaticProperties = 2;  // channel, group_id.
-
-using StaticPropRange =
-    std::array<std::array<uint32_t, 2>, kNumStaticProperties>;
-
-struct ModularMultiplierInfo {
-  StaticPropRange range;
-  uint32_t multiplier;
-};
-
-struct ModularOptions {
-  /// Used in both encode and decode:
-
-  // Stop encoding/decoding when reaching a (non-meta) channel that has a
-  // dimension bigger than max_chan_size.
-  size_t max_chan_size = 0xFFFFFF;
-
-  // Used during decoding for validation of transforms (sqeeezing) scheme.
-  size_t group_dim = 0x1FFFFFFF;
-
-  /// Encode options:
-  // Fraction of pixels to look at to learn a MA tree
-  // Number of iterations to do to learn a MA tree
-  // (if zero there is no MA context model)
-  float nb_repeats = .5f;
-
-  // Maximum number of (previous channel) properties to use in the MA trees
-  int max_properties = 0;  // no previous channels
-
-  // Alternative heuristic tweaks.
-  // Properties default to channel, group, weighted, gradient residual, W-NW,
-  // NW-N, N-NE, N-NN
-  std::vector<uint32_t> splitting_heuristics_properties = {0,  1,  15, 9,
-                                                           10, 11, 12, 13};
-  float splitting_heuristics_node_threshold = 96;
-  size_t max_property_values = 32;
-
-  // Predictor to use for each channel.
-  Predictor predictor = kUndefinedPredictor;
-
-  int wp_mode = 0;
-
-  float fast_decode_multiplier = 1.01f;
-
-  // Forces the encoder to produce a tree that is compatible with the WP-only
-  // decode path (or with the no-wp path, or the gradient-only path).
-  enum class TreeMode { kGradientOnly, kWPOnly, kNoWP, kDefault };
-  TreeMode wp_tree_mode = TreeMode::kDefault;
-
-  // Skip fast paths in the encoder.
-  bool skip_encoder_fast_path = false;
-
-  // Kind of tree to use.
-  // TODO(veluca): add tree kinds for JPEG recompression with CfL enabled,
-  // general AC metadata, different DC qualities, and others.
-  enum class TreeKind {
-    kTrivialTreeNoPredictor,
-    kLearn,
-    kJpegTranscodeACMeta,
-    kFalconACMeta,
-    kACMeta,
-    kWPFixedDC,
-    kGradientFixedDC,
-  };
-  TreeKind tree_kind = TreeKind::kLearn;
-
-  HistogramParams histogram_params;
-
-  // Ignore the image and just pretend all tokens are zeroes
-  bool zero_tokens = false;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_MODULAR_OPTIONS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/enc_palette.cc b/third_party/jpeg-xl/lib/jxl/modular/transform/enc_palette.cc
deleted file mode 100644
index 3392b4f8b62d0..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/transform/enc_palette.cc
+++ /dev/null
@@ -1,653 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/modular/transform/enc_palette.h"
-
-#include <jxl/memory_manager.h>
-
-#include <array>
-#include <map>
-#include <set>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/modular/encoding/context_predict.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/modular/transform/enc_transform.h"
-#include "lib/jxl/modular/transform/palette.h"
-
-namespace jxl {
-
-namespace palette_internal {
-
-static constexpr bool kEncodeToHighQualityImplicitPalette = true;
-
-// Inclusive.
-static constexpr int kMinImplicitPaletteIndex = -(2 * 72 - 1);
-
-float ColorDistance(const std::vector<float> &JXL_RESTRICT a,
-                    const std::vector<pixel_type> &JXL_RESTRICT b) {
-  JXL_DASSERT(a.size() == b.size());
-  float distance = 0;
-  float ave3 = 0;
-  if (a.size() >= 3) {
-    ave3 = (a[0] + b[0] + a[1] + b[1] + a[2] + b[2]) * (1.21f / 3.0f);
-  }
-  float sum_a = 0;
-  float sum_b = 0;
-  for (size_t c = 0; c < a.size(); ++c) {
-    const float difference =
-        static_cast<float>(a[c]) - static_cast<float>(b[c]);
-    float weight = c == 0 ? 3 : c == 1 ? 5 : 2;
-    if (c < 3 && (a[c] + b[c] >= ave3)) {
-      const float add_w[3] = {
-          1.15,
-          1.15,
-          1.12,
-      };
-      weight += add_w[c];
-      if (c == 2 && ((a[2] + b[2]) < 1.22 * ave3)) {
-        weight -= 0.5;
-      }
-    }
-    distance += difference * difference * weight * weight;
-    const int sum_weight = c == 0 ? 3 : c == 1 ? 5 : 1;
-    sum_a += a[c] * sum_weight;
-    sum_b += b[c] * sum_weight;
-  }
-  distance *= 4;
-  float sum_difference = sum_a - sum_b;
-  distance += sum_difference * sum_difference;
-  return distance;
-}
-
-static int QuantizeColorToImplicitPaletteIndex(
-    const std::vector<pixel_type> &color, const int palette_size,
-    const int bit_depth, bool high_quality) {
-  int index = 0;
-  if (high_quality) {
-    int multiplier = 1;
-    for (int value : color) {
-      int quantized = ((kLargeCube - 1) * value + (1 << (bit_depth - 1))) /
-                      ((1 << bit_depth) - 1);
-      JXL_DASSERT((quantized % kLargeCube) == quantized);
-      index += quantized * multiplier;
-      multiplier *= kLargeCube;
-    }
-    return index + palette_size + kLargeCubeOffset;
-  } else {
-    int multiplier = 1;
-    for (int value : color) {
-      value -= 1 << (std::max(0, bit_depth - 3));
-      value = std::max(0, value);
-      int quantized = ((kLargeCube - 1) * value + (1 << (bit_depth - 1))) /
-                      ((1 << bit_depth) - 1);
-      JXL_DASSERT((quantized % kLargeCube) == quantized);
-      if (quantized > kSmallCube - 1) {
-        quantized = kSmallCube - 1;
-      }
-      index += quantized * multiplier;
-      multiplier *= kSmallCube;
-    }
-    return index + palette_size;
-  }
-}
-
-}  // namespace palette_internal
-
-int RoundInt(int value, int div) {  // symmetric rounding around 0
-  if (value < 0) return -RoundInt(-value, div);
-  return (value + div / 2) / div;
-}
-
-struct PaletteIterationData {
-  static constexpr int kMaxDeltas = 128;
-  bool final_run = false;
-  std::vector<pixel_type> deltas[3];
-  std::vector<double> delta_distances;
-  std::vector<pixel_type> frequent_deltas[3];
-
-  // Populates `frequent_deltas` with items from `deltas` based on frequencies
-  // and color distances.
-  void FindFrequentColorDeltas(int num_pixels, int bitdepth) {
-    using pixel_type_3d = std::array<pixel_type, 3>;
-    std::map<pixel_type_3d, double> delta_frequency_map;
-    pixel_type bucket_size = 3 << std::max(0, bitdepth - 8);
-    // Store frequency weighted by delta distance from quantized value.
-    for (size_t i = 0; i < deltas[0].size(); ++i) {
-      pixel_type_3d delta = {
-          {RoundInt(deltas[0][i], bucket_size),
-           RoundInt(deltas[1][i], bucket_size),
-           RoundInt(deltas[2][i], bucket_size)}};  // a basic form of clustering
-      if (delta[0] == 0 && delta[1] == 0 && delta[2] == 0) continue;
-      delta_frequency_map[delta] += sqrt(sqrt(delta_distances[i]));
-    }
-
-    const float delta_distance_multiplier = 1.0f / num_pixels;
-
-    // Weigh frequencies by magnitude and normalize.
-    for (auto &delta_frequency : delta_frequency_map) {
-      std::vector<pixel_type> current_delta = {delta_frequency.first[0],
-                                               delta_frequency.first[1],
-                                               delta_frequency.first[2]};
-      float delta_distance =
-          std::sqrt(palette_internal::ColorDistance({0, 0, 0}, current_delta)) +
-          1;
-      delta_frequency.second *= delta_distance * delta_distance_multiplier;
-    }
-
-    // Sort by weighted frequency.
-    using pixel_type_3d_frequency = std::pair<pixel_type_3d, double>;
-    std::vector<pixel_type_3d_frequency> sorted_delta_frequency_map(
-        delta_frequency_map.begin(), delta_frequency_map.end());
-    std::sort(
-        sorted_delta_frequency_map.begin(), sorted_delta_frequency_map.end(),
-        [](const pixel_type_3d_frequency &a, const pixel_type_3d_frequency &b) {
-          return a.second > b.second;
-        });
-
-    // Store the top deltas.
-    for (auto &delta_frequency : sorted_delta_frequency_map) {
-      if (frequent_deltas[0].size() >= kMaxDeltas) break;
-      // Number obtained by optimizing on jyrki31 corpus:
-      if (delta_frequency.second < 17) break;
-      for (int c = 0; c < 3; ++c) {
-        frequent_deltas[c].push_back(delta_frequency.first[c] * bucket_size);
-      }
-    }
-  }
-};
-
-Status FwdPaletteIteration(Image &input, uint32_t begin_c, uint32_t end_c,
-                           uint32_t &nb_colors, uint32_t &nb_deltas,
-                           bool ordered, bool lossy, Predictor &predictor,
-                           const weighted::Header &wp_header,
-                           PaletteIterationData &palette_iteration_data) {
-  JXL_QUIET_RETURN_IF_ERROR(CheckEqualChannels(input, begin_c, end_c));
-  JXL_ENSURE(begin_c >= input.nb_meta_channels);
-  JxlMemoryManager *memory_manager = input.memory_manager();
-  uint32_t nb = end_c - begin_c + 1;
-
-  size_t w = input.channel[begin_c].w;
-  size_t h = input.channel[begin_c].h;
-  if (input.bitdepth >= 32) return false;
-  if (!lossy && nb_colors < 2) return false;
-
-  if (!lossy && nb == 1) {
-    // Channel palette special case
-    if (nb_colors == 0) return false;
-    std::vector<pixel_type> lookup;
-    pixel_type minval;
-    pixel_type maxval;
-    compute_minmax(input.channel[begin_c], &minval, &maxval);
-    size_t lookup_table_size =
-        static_cast<int64_t>(maxval) - static_cast<int64_t>(minval) + 1;
-    if (lookup_table_size > palette_internal::kMaxPaletteLookupTableSize) {
-      // a lookup table would use too much memory, instead use a slower approach
-      // with std::set
-      std::set<pixel_type> chpalette;
-      pixel_type idx = 0;
-      for (size_t y = 0; y < h; y++) {
-        const pixel_type *p = input.channel[begin_c].Row(y);
-        for (size_t x = 0; x < w; x++) {
-          const bool new_color = chpalette.insert(p[x]).second;
-          if (new_color) {
-            idx++;
-            if (idx > static_cast<int>(nb_colors)) return false;
-          }
-        }
-      }
-      JXL_DEBUG_V(6, "Channel %i uses only %i colors.", begin_c, idx);
-      JXL_ASSIGN_OR_RETURN(Channel pch,
-                           Channel::Create(memory_manager, idx, 1));
-      pch.hshift = -1;
-      pch.vshift = -1;
-      nb_colors = idx;
-      idx = 0;
-      pixel_type *JXL_RESTRICT p_palette = pch.Row(0);
-      for (pixel_type p : chpalette) {
-        p_palette[idx++] = p;
-      }
-      for (size_t y = 0; y < h; y++) {
-        pixel_type *p = input.channel[begin_c].Row(y);
-        for (size_t x = 0; x < w; x++) {
-          for (idx = 0;
-               p[x] != p_palette[idx] && idx < static_cast<int>(nb_colors);
-               idx++) {
-            // no-op
-          }
-          JXL_DASSERT(idx < static_cast<int>(nb_colors));
-          p[x] = idx;
-        }
-      }
-      predictor = Predictor::Zero;
-      input.nb_meta_channels++;
-      input.channel.insert(input.channel.begin(), std::move(pch));
-
-      return true;
-    }
-    lookup.resize(lookup_table_size, 0);
-    pixel_type idx = 0;
-    for (size_t y = 0; y < h; y++) {
-      const pixel_type *p = input.channel[begin_c].Row(y);
-      for (size_t x = 0; x < w; x++) {
-        if (lookup[p[x] - minval] == 0) {
-          lookup[p[x] - minval] = 1;
-          idx++;
-          if (idx > static_cast<int>(nb_colors)) return false;
-        }
-      }
-    }
-    JXL_DEBUG_V(6, "Channel %i uses only %i colors.", begin_c, idx);
-    JXL_ASSIGN_OR_RETURN(Channel pch, Channel::Create(memory_manager, idx, 1));
-    pch.hshift = -1;
-    pch.vshift = -1;
-    nb_colors = idx;
-    idx = 0;
-    pixel_type *JXL_RESTRICT p_palette = pch.Row(0);
-    for (size_t i = 0; i < lookup_table_size; i++) {
-      if (lookup[i]) {
-        p_palette[idx] = i + minval;
-        lookup[i] = idx;
-        idx++;
-      }
-    }
-    for (size_t y = 0; y < h; y++) {
-      pixel_type *p = input.channel[begin_c].Row(y);
-      for (size_t x = 0; x < w; x++) p[x] = lookup[p[x] - minval];
-    }
-    predictor = Predictor::Zero;
-    input.nb_meta_channels++;
-    input.channel.insert(input.channel.begin(), std::move(pch));
-    return true;
-  }
-
-  Image quantized_input(memory_manager);
-  if (lossy) {
-    JXL_ASSIGN_OR_RETURN(quantized_input, Image::Create(memory_manager, w, h,
-                                                        input.bitdepth, nb));
-    for (size_t c = 0; c < nb; c++) {
-      JXL_RETURN_IF_ERROR(CopyImageTo(input.channel[begin_c + c].plane,
-                                      &quantized_input.channel[c].plane));
-    }
-  }
-
-  JXL_DEBUG_V(
-      7, "Trying to represent channels %i-%i using at most a %i-color palette.",
-      begin_c, end_c, nb_colors);
-  nb_deltas = 0;
-  bool delta_used = false;
-  std::set<std::vector<pixel_type>> candidate_palette;
-  std::vector<std::vector<pixel_type>> candidate_palette_imageorder;
-  std::vector<pixel_type> color(nb);
-  std::vector<float> color_with_error(nb);
-  std::vector<const pixel_type *> p_in(nb);
-  std::map<std::vector<pixel_type>, size_t> inv_palette;
-
-  if (lossy) {
-    palette_iteration_data.FindFrequentColorDeltas(w * h, input.bitdepth);
-    nb_deltas = palette_iteration_data.frequent_deltas[0].size();
-
-    // Count color frequency for colors that make a cross.
-    std::map<std::vector<pixel_type>, size_t> color_freq_map;
-    for (size_t y = 1; y + 1 < h; y++) {
-      for (uint32_t c = 0; c < nb; c++) {
-        p_in[c] = input.channel[begin_c + c].Row(y);
-      }
-      for (size_t x = 1; x + 1 < w; x++) {
-        for (uint32_t c = 0; c < nb; c++) {
-          color[c] = p_in[c][x];
-        }
-        int offsets[4][2] = {{1, 0}, {-1, 0}, {0, 1}, {0, -1}};
-        bool makes_cross = true;
-        for (int i = 0; i < 4 && makes_cross; ++i) {
-          int dx = offsets[i][0];
-          int dy = offsets[i][1];
-          for (uint32_t c = 0; c < nb && makes_cross; c++) {
-            if (input.channel[begin_c + c].Row(y + dy)[x + dx] != color[c]) {
-              makes_cross = false;
-            }
-          }
-        }
-        if (makes_cross) color_freq_map[color] += 1;
-      }
-    }
-    // Add colors satisfying frequency condition to the palette.
-    constexpr float kImageFraction = 0.01f;
-    size_t color_frequency_lower_bound = 5 + input.h * input.w * kImageFraction;
-    for (const auto &color_freq : color_freq_map) {
-      if (color_freq.second > color_frequency_lower_bound) {
-        candidate_palette.insert(color_freq.first);
-        candidate_palette_imageorder.push_back(color_freq.first);
-      }
-    }
-  }
-
-  std::map<std::vector<pixel_type>, bool> implicit_color;
-  std::vector<std::vector<pixel_type>> implicit_colors;
-  implicit_colors.reserve(palette_internal::kImplicitPaletteSize);
-  for (size_t k = 0; k < palette_internal::kImplicitPaletteSize; k++) {
-    for (size_t i = 0; i < nb; i++) {
-      color[i] = palette_internal::GetPaletteValue(nullptr, k, i, 0, 0,
-                                                   input.bitdepth);
-    }
-    implicit_color[color] = true;
-    implicit_colors.push_back(color);
-  }
-
-  std::map<std::vector<pixel_type>, size_t> color_freq_map;
-  uint32_t implicit_colors_used = 0;
-  for (size_t y = 0; y < h; y++) {
-    for (uint32_t c = 0; c < nb; c++) {
-      p_in[c] = input.channel[begin_c + c].Row(y);
-    }
-    for (size_t x = 0; x < w; x++) {
-      if (lossy && candidate_palette.size() >= nb_colors) break;
-      for (uint32_t c = 0; c < nb; c++) {
-        color[c] = p_in[c][x];
-      }
-      const bool new_color = candidate_palette.insert(color).second;
-      if (new_color) {
-        if (implicit_color[color]) {
-          implicit_colors_used++;
-        } else {
-          candidate_palette_imageorder.push_back(color);
-          if (candidate_palette_imageorder.size() > nb_colors) {
-            return false;  // too many colors
-          }
-        }
-      }
-      color_freq_map[color] += 1;
-    }
-  }
-
-  nb_colors = nb_deltas + candidate_palette_imageorder.size();
-
-  // not useful to make a single-color palette
-  if (!lossy && nb_colors + implicit_colors_used == 1) return false;
-  // TODO(jon): if this happens (e.g. solid white group), special-case it for
-  // faster encode
-
-  for (size_t k = 0; k < palette_internal::kImplicitPaletteSize; k++) {
-    color = implicit_colors[k];
-    // still add the color to the explicit palette if it is frequent enough
-    if (color_freq_map[color] > 10) {
-      nb_colors++;
-      candidate_palette_imageorder.push_back(color);
-    }
-  }
-  for (size_t k = 0; k < palette_internal::kImplicitPaletteSize; k++) {
-    color = implicit_colors[k];
-    inv_palette[color] = nb_colors + k;
-  }
-
-  JXL_DEBUG_V(6, "Channels %i-%i can be represented using a %i-color palette.",
-              begin_c, end_c, nb_colors);
-
-  JXL_ASSIGN_OR_RETURN(Channel pch,
-                       Channel::Create(memory_manager, nb_colors, nb));
-  pch.hshift = -1;
-  pch.vshift = -1;
-  pixel_type *JXL_RESTRICT p_palette = pch.Row(0);
-  intptr_t onerow = pch.plane.PixelsPerRow();
-  intptr_t onerow_image = input.channel[begin_c].plane.PixelsPerRow();
-  const int bit_depth = std::min(input.bitdepth, 24);
-
-  if (lossy) {
-    for (uint32_t i = 0; i < nb_deltas; i++) {
-      for (size_t c = 0; c < 3; c++) {
-        p_palette[c * onerow + i] =
-            palette_iteration_data.frequent_deltas[c][i];
-      }
-    }
-  }
-  // Separate the palette in two buckets, first the common colors, then the
-  // rare colors.
-  // Within each bucket, the colors are sorted on luma (times alpha).
-  float freq_threshold = 4;  // arbitrary threshold
-  int x = 0;
-  if (ordered && nb >= 3) {
-    JXL_DEBUG_V(7, "Palette of %i colors, using luma order", nb_colors);
-    // sort on luma (multiplied by alpha if available)
-    std::sort(candidate_palette_imageorder.begin(),
-              candidate_palette_imageorder.end(),
-              [&](std::vector<pixel_type> ap, std::vector<pixel_type> bp) {
-                float ay;
-                float by;
-                ay = (0.299f * ap[0] + 0.587f * ap[1] + 0.114f * ap[2] + 0.1f);
-                if (ap.size() > 3) ay *= 1.f + ap[3];
-                by = (0.299f * bp[0] + 0.587f * bp[1] + 0.114f * bp[2] + 0.1f);
-                if (bp.size() > 3) by *= 1.f + bp[3];
-                // put common colors first, transparent dark to opaque bright,
-                // then rare colors, bright to dark
-                ay = color_freq_map[ap] > freq_threshold ? -ay : ay;
-                by = color_freq_map[bp] > freq_threshold ? -by : by;
-                return ay < by;
-              });
-  } else {
-    JXL_DEBUG_V(7, "Palette of %i colors, using image order", nb_colors);
-  }
-
-  for (auto pcol : candidate_palette_imageorder) {
-    JXL_DEBUG_V(9, "  Color %i :  ", x);
-    for (size_t i = 0; i < nb; i++) {
-      p_palette[nb_deltas + i * onerow + x] = pcol[i];
-      JXL_DEBUG_V(9, "%i ", pcol[i]);
-    }
-    inv_palette[pcol] = x;
-    x++;
-  }
-  std::vector<weighted::State> wp_states;
-  for (size_t c = 0; c < nb; c++) {
-    wp_states.emplace_back(wp_header, w, h);
-  }
-  std::vector<pixel_type *> p_quant(nb);
-  // Three rows of error for dithering: y to y + 2.
-  // Each row has two pixels of padding in the ends, which is
-  // beneficial for both precision and encoding speed.
-  std::vector<std::vector<float>> error_row[3];
-  if (lossy) {
-    for (auto &row : error_row) {
-      row.resize(nb);
-      for (size_t c = 0; c < nb; ++c) {
-        row[c].resize(w + 4);
-      }
-    }
-  }
-  for (size_t y = 0; y < h; y++) {
-    for (size_t c = 0; c < nb; c++) {
-      p_in[c] = input.channel[begin_c + c].Row(y);
-      if (lossy) p_quant[c] = quantized_input.channel[c].Row(y);
-    }
-    pixel_type *JXL_RESTRICT p = input.channel[begin_c].Row(y);
-    for (size_t x = 0; x < w; x++) {
-      int index;
-      if (!lossy) {
-        for (size_t c = 0; c < nb; c++) color[c] = p_in[c][x];
-        index = inv_palette[color];
-      } else {
-        int best_index = 0;
-        bool best_is_delta = false;
-        float best_distance = std::numeric_limits<float>::infinity();
-        std::vector<pixel_type> best_val(nb, 0);
-        std::vector<pixel_type> ideal_residual(nb, 0);
-        std::vector<pixel_type> quantized_val(nb);
-        std::vector<pixel_type> predictions(nb);
-        for (double diffusion_multiplier : {0.55, 0.75}) {
-          for (size_t c = 0; c < nb; c++) {
-            color_with_error[c] =
-                p_in[c][x] + (palette_iteration_data.final_run ? 1 : 0) *
-                                 diffusion_multiplier * error_row[0][c][x + 2];
-            color[c] = Clamp1(lroundf(color_with_error[c]), 0l,
-                              (1l << input.bitdepth) - 1);
-          }
-
-          for (size_t c = 0; c < nb; ++c) {
-            predictions[c] = PredictNoTreeWP(w, p_quant[c] + x, onerow_image, x,
-                                             y, predictor, &wp_states[c])
-                                 .guess;
-          }
-          const auto TryIndex = [&](const int index) {
-            for (size_t c = 0; c < nb; c++) {
-              quantized_val[c] = palette_internal::GetPaletteValue(
-                  p_palette, index, /*c=*/c,
-                  /*palette_size=*/nb_colors,
-                  /*onerow=*/onerow, /*bit_depth=*/bit_depth);
-              if (index < static_cast<int>(nb_deltas)) {
-                quantized_val[c] += predictions[c];
-              }
-            }
-            const float color_distance =
-                32.0 / (1LL << std::max(0, 2 * (bit_depth - 8))) *
-                palette_internal::ColorDistance(color_with_error,
-                                                quantized_val);
-            float index_penalty = 0;
-            if (index == -1) {
-              index_penalty = -124;
-            } else if (index < 0) {
-              index_penalty = -2 * index;
-            } else if (index < static_cast<int>(nb_deltas)) {
-              index_penalty = 250;
-            } else if (index < static_cast<int>(nb_colors)) {
-              index_penalty = 150;
-            } else if (index < static_cast<int>(nb_colors) +
-                                   palette_internal::kLargeCubeOffset) {
-              index_penalty = 70;
-            } else {
-              index_penalty = 256;
-            }
-            const float distance = color_distance + index_penalty;
-            if (distance < best_distance) {
-              best_distance = distance;
-              best_index = index;
-              best_is_delta = index < static_cast<int>(nb_deltas);
-              best_val.swap(quantized_val);
-              for (size_t c = 0; c < nb; ++c) {
-                ideal_residual[c] = color_with_error[c] - predictions[c];
-              }
-            }
-          };
-          for (index = palette_internal::kMinImplicitPaletteIndex;
-               index < static_cast<int32_t>(nb_colors); index++) {
-            TryIndex(index);
-          }
-          TryIndex(palette_internal::QuantizeColorToImplicitPaletteIndex(
-              color, nb_colors, bit_depth,
-              /*high_quality=*/false));
-          if (palette_internal::kEncodeToHighQualityImplicitPalette) {
-            TryIndex(palette_internal::QuantizeColorToImplicitPaletteIndex(
-                color, nb_colors, bit_depth,
-                /*high_quality=*/true));
-          }
-        }
-        index = best_index;
-        delta_used |= best_is_delta;
-        if (!palette_iteration_data.final_run) {
-          for (size_t c = 0; c < 3; ++c) {
-            palette_iteration_data.deltas[c].push_back(ideal_residual[c]);
-          }
-          palette_iteration_data.delta_distances.push_back(best_distance);
-        }
-
-        for (size_t c = 0; c < nb; ++c) {
-          wp_states[c].UpdateErrors(best_val[c], x, y, w);
-          p_quant[c][x] = best_val[c];
-        }
-        float len_error = 0;
-        for (size_t c = 0; c < nb; ++c) {
-          float local_error = color_with_error[c] - best_val[c];
-          len_error += local_error * local_error;
-        }
-        len_error = std::sqrt(len_error);
-        float modulate = 1.0;
-        int len_limit = 38 << std::max(0, bit_depth - 8);
-        if (len_error > len_limit) {
-          modulate *= len_limit / len_error;
-        }
-        for (size_t c = 0; c < nb; ++c) {
-          float total_error = (color_with_error[c] - best_val[c]);
-
-          // If the neighboring pixels have some error in the opposite
-          // direction of total_error, cancel some or all of it out before
-          // spreading among them.
-          constexpr int offsets[12][2] = {{1, 2}, {0, 3}, {0, 4}, {1, 1},
-                                          {1, 3}, {2, 2}, {1, 0}, {1, 4},
-                                          {2, 1}, {2, 3}, {2, 0}, {2, 4}};
-          float total_available = 0;
-          for (int i = 0; i < 11; ++i) {
-            const int row = offsets[i][0];
-            const int col = offsets[i][1];
-            if (std::signbit(error_row[row][c][x + col]) !=
-                std::signbit(total_error)) {
-              total_available += error_row[row][c][x + col];
-            }
-          }
-          float weight =
-              std::abs(total_error) / (std::abs(total_available) + 1e-3);
-          weight = std::min(weight, 1.0f);
-          for (int i = 0; i < 11; ++i) {
-            const int row = offsets[i][0];
-            const int col = offsets[i][1];
-            if (std::signbit(error_row[row][c][x + col]) !=
-                std::signbit(total_error)) {
-              total_error += weight * error_row[row][c][x + col];
-              error_row[row][c][x + col] *= (1 - weight);
-            }
-          }
-          total_error *= modulate;
-          const float remaining_error = (1.0f / 14.) * total_error;
-          error_row[0][c][x + 3] += 2 * remaining_error;
-          error_row[0][c][x + 4] += remaining_error;
-          error_row[1][c][x + 0] += remaining_error;
-          for (int i = 0; i < 5; ++i) {
-            error_row[1][c][x + i] += remaining_error;
-            error_row[2][c][x + i] += remaining_error;
-          }
-        }
-      }
-      if (palette_iteration_data.final_run) p[x] = index;
-    }
-    if (lossy) {
-      for (size_t c = 0; c < nb; ++c) {
-        error_row[0][c].swap(error_row[1][c]);
-        error_row[1][c].swap(error_row[2][c]);
-        std::fill(error_row[2][c].begin(), error_row[2][c].end(), 0.f);
-      }
-    }
-  }
-  if (!delta_used) {
-    predictor = Predictor::Zero;
-  }
-  if (palette_iteration_data.final_run) {
-    input.nb_meta_channels++;
-    input.channel.erase(input.channel.begin() + begin_c + 1,
-                        input.channel.begin() + end_c + 1);
-    input.channel.insert(input.channel.begin(), std::move(pch));
-  }
-  nb_colors -= nb_deltas;
-  return true;
-}
-
-Status FwdPalette(Image &input, uint32_t begin_c, uint32_t end_c,
-                  uint32_t &nb_colors, uint32_t &nb_deltas, bool ordered,
-                  bool lossy, Predictor &predictor,
-                  const weighted::Header &wp_header) {
-  PaletteIterationData palette_iteration_data;
-  uint32_t nb_colors_orig = nb_colors;
-  uint32_t nb_deltas_orig = nb_deltas;
-  // preprocessing pass in case of lossy palette
-  if (lossy && input.bitdepth >= 8) {
-    JXL_RETURN_IF_ERROR(FwdPaletteIteration(
-        input, begin_c, end_c, nb_colors_orig, nb_deltas_orig, ordered, lossy,
-        predictor, wp_header, palette_iteration_data));
-  }
-  palette_iteration_data.final_run = true;
-  return FwdPaletteIteration(input, begin_c, end_c, nb_colors, nb_deltas,
-                             ordered, lossy, predictor, wp_header,
-                             palette_iteration_data);
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/enc_palette.h b/third_party/jpeg-xl/lib/jxl/modular/transform/enc_palette.h
deleted file mode 100644
index 0f3d66825b4a6..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/transform/enc_palette.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_MODULAR_TRANSFORM_ENC_PALETTE_H_
-#define LIB_JXL_MODULAR_TRANSFORM_ENC_PALETTE_H_
-
-#include "lib/jxl/fields.h"
-#include "lib/jxl/modular/encoding/context_predict.h"
-#include "lib/jxl/modular/modular_image.h"
-
-namespace jxl {
-
-Status FwdPalette(Image &input, uint32_t begin_c, uint32_t end_c,
-                  uint32_t &nb_colors, uint32_t &nb_deltas, bool ordered,
-                  bool lossy, Predictor &predictor,
-                  const weighted::Header &wp_header);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_MODULAR_TRANSFORM_ENC_PALETTE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/enc_rct.cc b/third_party/jpeg-xl/lib/jxl/modular/transform/enc_rct.cc
deleted file mode 100644
index 6de214e5a35b4..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/transform/enc_rct.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/modular/transform/enc_rct.h"
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/modular/transform/transform.h"  // CheckEqualChannels
-
-namespace jxl {
-
-Status FwdRCT(Image& input, size_t begin_c, size_t rct_type, ThreadPool* pool) {
-  JXL_RETURN_IF_ERROR(CheckEqualChannels(input, begin_c, begin_c + 2));
-  if (rct_type == 0) {  // noop
-    return false;
-  }
-  // Permutation: 0=RGB, 1=GBR, 2=BRG, 3=RBG, 4=GRB, 5=BGR
-  int permutation = rct_type / 7;
-  // 0-5 values have the low bit corresponding to Third and the high bits
-  // corresponding to Second. 6 corresponds to YCoCg.
-  //
-  // Second: 0=nop, 1=SubtractFirst, 2=SubtractAvgFirstThird
-  //
-  // Third: 0=nop, 1=SubtractFirst
-  int custom = rct_type % 7;
-  size_t m = begin_c;
-  size_t w = input.channel[m + 0].w;
-  size_t h = input.channel[m + 0].h;
-  int second = (custom % 7) >> 1;
-  int third = (custom % 7) & 1;
-  const auto do_rct = [&](const int y, const int thread) -> Status {
-    const pixel_type* in0 = input.channel[m + (permutation % 3)].Row(y);
-    const pixel_type* in1 =
-        input.channel[m + ((permutation + 1 + permutation / 3) % 3)].Row(y);
-    const pixel_type* in2 =
-        input.channel[m + ((permutation + 2 - permutation / 3) % 3)].Row(y);
-    pixel_type* out0 = input.channel[m].Row(y);
-    pixel_type* out1 = input.channel[m + 1].Row(y);
-    pixel_type* out2 = input.channel[m + 2].Row(y);
-    if (custom == 6) {
-      for (size_t x = 0; x < w; x++) {
-        pixel_type R = in0[x];
-        pixel_type G = in1[x];
-        pixel_type B = in2[x];
-        out1[x] = R - B;
-        pixel_type tmp = B + (out1[x] >> 1);
-        out2[x] = G - tmp;
-        out0[x] = tmp + (out2[x] >> 1);
-      }
-    } else {
-      for (size_t x = 0; x < w; x++) {
-        pixel_type First = in0[x];
-        pixel_type Second = in1[x];
-        pixel_type Third = in2[x];
-        if (second == 1) {
-          Second = Second - First;
-        } else if (second == 2) {
-          Second = Second - ((First + Third) >> 1);
-        }
-        if (third) Third = Third - First;
-        out0[x] = First;
-        out1[x] = Second;
-        out2[x] = Third;
-      }
-    }
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(
-      RunOnPool(pool, 0, h, ThreadPool::NoInit, do_rct, "FwdRCT"));
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/enc_rct.h b/third_party/jpeg-xl/lib/jxl/modular/transform/enc_rct.h
deleted file mode 100644
index cb5a193c8d9bd..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/transform/enc_rct.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_MODULAR_TRANSFORM_ENC_RCT_H_
-#define LIB_JXL_MODULAR_TRANSFORM_ENC_RCT_H_
-
-#include "lib/jxl/modular/modular_image.h"
-
-namespace jxl {
-
-Status FwdRCT(Image &input, size_t begin_c, size_t rct_type, ThreadPool *pool);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_MODULAR_TRANSFORM_ENC_RCT_H_
diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/enc_squeeze.cc b/third_party/jpeg-xl/lib/jxl/modular/transform/enc_squeeze.cc
deleted file mode 100644
index 34dcd868eecb0..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/transform/enc_squeeze.cc
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/modular/transform/enc_squeeze.h"
-
-#include <jxl/memory_manager.h>
-
-#include <cstdlib>
-
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/modular/transform/squeeze.h"
-#include "lib/jxl/modular/transform/transform.h"
-
-namespace jxl {
-
-#define AVERAGE(X, Y) (((X) + (Y) + (((X) > (Y)) ? 1 : 0)) >> 1)
-
-Status FwdHSqueeze(Image &input, int c, int rc) {
-  const Channel &chin = input.channel[c];
-  JxlMemoryManager *memory_manager = input.memory_manager();
-
-  JXL_DEBUG_V(4, "Doing horizontal squeeze of channel %i to new channel %i", c,
-              rc);
-
-  JXL_ASSIGN_OR_RETURN(Channel chout,
-                       Channel::Create(memory_manager, (chin.w + 1) / 2, chin.h,
-                                       chin.hshift + 1, chin.vshift));
-  JXL_ASSIGN_OR_RETURN(Channel chout_residual,
-                       Channel::Create(memory_manager, chin.w - chout.w,
-                                       chout.h, chin.hshift + 1, chin.vshift));
-
-  for (size_t y = 0; y < chout.h; y++) {
-    const pixel_type *JXL_RESTRICT p_in = chin.Row(y);
-    pixel_type *JXL_RESTRICT p_out = chout.Row(y);
-    pixel_type *JXL_RESTRICT p_res = chout_residual.Row(y);
-    for (size_t x = 0; x < chout_residual.w; x++) {
-      pixel_type A = p_in[x * 2];
-      pixel_type B = p_in[x * 2 + 1];
-      pixel_type avg = AVERAGE(A, B);
-      p_out[x] = avg;
-
-      pixel_type diff = A - B;
-
-      pixel_type next_avg = avg;
-      if (x + 1 < chout_residual.w) {
-        pixel_type C = p_in[x * 2 + 2];
-        pixel_type D = p_in[x * 2 + 3];
-        next_avg = AVERAGE(C, D);  // which will be chout.value(y,x+1)
-      } else if (chin.w & 1) {
-        next_avg = p_in[x * 2 + 2];
-      }
-      pixel_type left = (x > 0 ? p_in[x * 2 - 1] : avg);
-      pixel_type tendency = SmoothTendency(left, avg, next_avg);
-
-      p_res[x] = diff - tendency;
-    }
-    if (chin.w & 1) {
-      int x = chout.w - 1;
-      p_out[x] = p_in[x * 2];
-    }
-  }
-  input.channel[c] = std::move(chout);
-  input.channel.insert(input.channel.begin() + rc, std::move(chout_residual));
-  return true;
-}
-
-Status FwdVSqueeze(Image &input, int c, int rc) {
-  const Channel &chin = input.channel[c];
-  JxlMemoryManager *memory_manager = input.memory_manager();
-
-  JXL_DEBUG_V(4, "Doing vertical squeeze of channel %i to new channel %i", c,
-              rc);
-
-  JXL_ASSIGN_OR_RETURN(Channel chout,
-                       Channel::Create(memory_manager, chin.w, (chin.h + 1) / 2,
-                                       chin.hshift, chin.vshift + 1));
-  JXL_ASSIGN_OR_RETURN(Channel chout_residual,
-                       Channel::Create(memory_manager, chin.w, chin.h - chout.h,
-                                       chin.hshift, chin.vshift + 1));
-  intptr_t onerow_in = chin.plane.PixelsPerRow();
-  for (size_t y = 0; y < chout_residual.h; y++) {
-    const pixel_type *JXL_RESTRICT p_in = chin.Row(y * 2);
-    pixel_type *JXL_RESTRICT p_out = chout.Row(y);
-    pixel_type *JXL_RESTRICT p_res = chout_residual.Row(y);
-    for (size_t x = 0; x < chout.w; x++) {
-      pixel_type A = p_in[x];
-      pixel_type B = p_in[x + onerow_in];
-      pixel_type avg = AVERAGE(A, B);
-      p_out[x] = avg;
-
-      pixel_type diff = A - B;
-
-      pixel_type next_avg = avg;
-      if (y + 1 < chout_residual.h) {
-        pixel_type C = p_in[x + 2 * onerow_in];
-        pixel_type D = p_in[x + 3 * onerow_in];
-        next_avg = AVERAGE(C, D);  // which will be chout.value(y+1,x)
-      } else if (chin.h & 1) {
-        next_avg = p_in[x + 2 * onerow_in];
-      }
-      pixel_type top =
-          (y > 0 ? p_in[static_cast<ssize_t>(x) - onerow_in] : avg);
-      pixel_type tendency = SmoothTendency(top, avg, next_avg);
-
-      p_res[x] = diff - tendency;
-    }
-  }
-  if (chin.h & 1) {
-    size_t y = chout.h - 1;
-    const pixel_type *p_in = chin.Row(y * 2);
-    pixel_type *p_out = chout.Row(y);
-    for (size_t x = 0; x < chout.w; x++) {
-      p_out[x] = p_in[x];
-    }
-  }
-  input.channel[c] = std::move(chout);
-  input.channel.insert(input.channel.begin() + rc, std::move(chout_residual));
-  return true;
-}
-
-Status FwdSqueeze(Image &input, std::vector<SqueezeParams> parameters,
-                  ThreadPool *pool) {
-  if (parameters.empty()) {
-    DefaultSqueezeParameters(&parameters, input);
-  }
-  // if nothing to do, don't do squeeze
-  if (parameters.empty()) return false;
-  for (auto &parameter : parameters) {
-    JXL_RETURN_IF_ERROR(
-        CheckMetaSqueezeParams(parameter, input.channel.size()));
-    bool horizontal = parameter.horizontal;
-    bool in_place = parameter.in_place;
-    uint32_t beginc = parameter.begin_c;
-    uint32_t endc = parameter.begin_c + parameter.num_c - 1;
-    uint32_t offset;
-    if (in_place) {
-      offset = endc + 1;
-    } else {
-      offset = input.channel.size();
-    }
-    for (uint32_t c = beginc; c <= endc; c++) {
-      if (horizontal) {
-        JXL_RETURN_IF_ERROR(FwdHSqueeze(input, c, offset + c - beginc));
-      } else {
-        JXL_RETURN_IF_ERROR(FwdVSqueeze(input, c, offset + c - beginc));
-      }
-    }
-  }
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/enc_squeeze.h b/third_party/jpeg-xl/lib/jxl/modular/transform/enc_squeeze.h
deleted file mode 100644
index 39b001017b3d7..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/transform/enc_squeeze.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_MODULAR_TRANSFORM_ENC_SQUEEZE_H_
-#define LIB_JXL_MODULAR_TRANSFORM_ENC_SQUEEZE_H_
-
-#include "lib/jxl/fields.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/modular/transform/transform.h"
-
-namespace jxl {
-
-Status FwdSqueeze(Image &input, std::vector<SqueezeParams> parameters,
-                  ThreadPool *pool);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_MODULAR_TRANSFORM_ENC_SQUEEZE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/enc_transform.cc b/third_party/jpeg-xl/lib/jxl/modular/transform/enc_transform.cc
deleted file mode 100644
index bdaaf9f87eb6e..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/transform/enc_transform.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/modular/transform/enc_transform.h"
-
-#include "lib/jxl/modular/transform/enc_palette.h"
-#include "lib/jxl/modular/transform/enc_rct.h"
-#include "lib/jxl/modular/transform/enc_squeeze.h"
-
-namespace jxl {
-
-Status TransformForward(Transform &t, Image &input,
-                        const weighted::Header &wp_header, ThreadPool *pool) {
-  switch (t.id) {
-    case TransformId::kRCT:
-      return FwdRCT(input, t.begin_c, t.rct_type, pool);
-    case TransformId::kSqueeze:
-      return FwdSqueeze(input, t.squeezes, pool);
-    case TransformId::kPalette:
-      return FwdPalette(input, t.begin_c, t.begin_c + t.num_c - 1, t.nb_colors,
-                        t.nb_deltas, t.ordered_palette, t.lossy_palette,
-                        t.predictor, wp_header);
-    default:
-      return JXL_FAILURE("Unknown transformation (ID=%u)",
-                         static_cast<unsigned int>(t.id));
-  }
-}
-
-void compute_minmax(const Channel &ch, pixel_type *min, pixel_type *max) {
-  pixel_type realmin = std::numeric_limits<pixel_type>::max();
-  pixel_type realmax = std::numeric_limits<pixel_type>::min();
-  for (size_t y = 0; y < ch.h; y++) {
-    const pixel_type *JXL_RESTRICT p = ch.Row(y);
-    for (size_t x = 0; x < ch.w; x++) {
-      if (p[x] < realmin) realmin = p[x];
-      if (p[x] > realmax) realmax = p[x];
-    }
-  }
-
-  if (min) *min = realmin;
-  if (max) *max = realmax;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/enc_transform.h b/third_party/jpeg-xl/lib/jxl/modular/transform/enc_transform.h
deleted file mode 100644
index 07659e1b0a614..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/transform/enc_transform.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_MODULAR_TRANSFORM_ENC_TRANSFORM_H_
-#define LIB_JXL_MODULAR_TRANSFORM_ENC_TRANSFORM_H_
-
-#include "lib/jxl/fields.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/modular/transform/transform.h"
-
-namespace jxl {
-
-Status TransformForward(Transform &t, Image &input,
-                        const weighted::Header &wp_header, ThreadPool *pool);
-
-void compute_minmax(const Channel &ch, pixel_type *min, pixel_type *max);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_MODULAR_TRANSFORM_ENC_TRANSFORM_H_
diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/palette.cc b/third_party/jpeg-xl/lib/jxl/modular/transform/palette.cc
deleted file mode 100644
index ab4ff11002bc8..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/transform/palette.cc
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/modular/transform/palette.h"
-
-#include <jxl/memory_manager.h>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/modular/transform/transform.h"  // CheckEqualChannels
-
-namespace jxl {
-
-Status InvPalette(Image &input, uint32_t begin_c, uint32_t nb_colors,
-                  uint32_t nb_deltas, Predictor predictor,
-                  const weighted::Header &wp_header, ThreadPool *pool) {
-  JxlMemoryManager *memory_manager = input.memory_manager();
-  if (input.nb_meta_channels < 1) {
-    return JXL_FAILURE("Error: Palette transform without palette.");
-  }
-  int nb = input.channel[0].h;
-  uint32_t c0 = begin_c + 1;
-  if (c0 >= input.channel.size()) {
-    return JXL_FAILURE("Channel is out of range.");
-  }
-  size_t w = input.channel[c0].w;
-  size_t h = input.channel[c0].h;
-  if (nb < 1) return JXL_FAILURE("Corrupted transforms");
-  for (int i = 1; i < nb; i++) {
-    JXL_ASSIGN_OR_RETURN(Channel c, Channel::Create(memory_manager, w, h,
-                                                    input.channel[c0].hshift,
-                                                    input.channel[c0].vshift));
-    input.channel.insert(input.channel.begin() + c0 + 1, std::move(c));
-  }
-  const Channel &palette = input.channel[0];
-  const pixel_type *JXL_RESTRICT p_palette = input.channel[0].Row(0);
-  intptr_t onerow = input.channel[0].plane.PixelsPerRow();
-  intptr_t onerow_image = input.channel[c0].plane.PixelsPerRow();
-  const int bit_depth = std::min(input.bitdepth, 24);
-
-  if (w == 0) {
-    // Nothing to do.
-    // Avoid touching "empty" channels with non-zero height.
-  } else if (nb_deltas == 0 && predictor == Predictor::Zero) {
-    if (nb == 1) {
-      const auto process_row = [&](const uint32_t task,
-                                   size_t /* thread */) -> Status {
-        const size_t y = task;
-        pixel_type *p = input.channel[c0].Row(y);
-        for (size_t x = 0; x < w; x++) {
-          const int index =
-              Clamp1<int>(p[x], 0, static_cast<pixel_type>(palette.w) - 1);
-          p[x] = palette_internal::GetPaletteValue(p_palette, index, /*c=*/0,
-                                                   /*palette_size=*/palette.w,
-                                                   /*onerow=*/onerow,
-                                                   /*bit_depth=*/bit_depth);
-        }
-        return true;
-      };
-      JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, h, ThreadPool::NoInit, process_row,
-                                    "UndoChannelPalette"));
-    } else {
-      const auto process_row = [&](const uint32_t task,
-                                   size_t /* thread */) -> Status {
-        const size_t y = task;
-        std::vector<pixel_type *> p_out(nb);
-        const pixel_type *p_index = input.channel[c0].Row(y);
-        for (int c = 0; c < nb; c++) p_out[c] = input.channel[c0 + c].Row(y);
-        for (size_t x = 0; x < w; x++) {
-          const int index = p_index[x];
-          for (int c = 0; c < nb; c++) {
-            p_out[c][x] = palette_internal::GetPaletteValue(
-                p_palette, index, /*c=*/c,
-                /*palette_size=*/palette.w,
-                /*onerow=*/onerow, /*bit_depth=*/bit_depth);
-          }
-        }
-        return true;
-      };
-      JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, h, ThreadPool::NoInit, process_row,
-                                    "UndoPalette"));
-    }
-  } else {
-    // Parallelized per channel.
-    ImageI indices;
-    ImageI &plane = input.channel[c0].plane;
-    JXL_ASSIGN_OR_RETURN(
-        indices, ImageI::Create(memory_manager, plane.xsize(), plane.ysize()));
-    plane.Swap(indices);
-    if (predictor == Predictor::Weighted) {
-      const auto process_row = [&](const uint32_t c,
-                                   size_t /* thread */) -> Status {
-        Channel &channel = input.channel[c0 + c];
-        weighted::State wp_state(wp_header, channel.w, channel.h);
-        for (size_t y = 0; y < channel.h; y++) {
-          pixel_type *JXL_RESTRICT p = channel.Row(y);
-          const pixel_type *JXL_RESTRICT idx = indices.Row(y);
-          for (size_t x = 0; x < channel.w; x++) {
-            int index = idx[x];
-            pixel_type_w val = 0;
-            const pixel_type palette_entry = palette_internal::GetPaletteValue(
-                p_palette, index, /*c=*/c,
-                /*palette_size=*/palette.w, /*onerow=*/onerow,
-                /*bit_depth=*/bit_depth);
-            if (index < static_cast<int32_t>(nb_deltas)) {
-              PredictionResult pred = PredictNoTreeWP(
-                  channel.w, p + x, onerow_image, x, y, predictor, &wp_state);
-              val = pred.guess + palette_entry;
-            } else {
-              val = palette_entry;
-            }
-            p[x] = val;
-            wp_state.UpdateErrors(p[x], x, y, channel.w);
-          }
-        }
-        return true;
-      };
-      JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, nb, ThreadPool::NoInit,
-                                    process_row, "UndoDeltaPaletteWP"));
-    } else {
-      const auto process_row = [&](const uint32_t c,
-                                   size_t /* thread */) -> Status {
-        Channel &channel = input.channel[c0 + c];
-        for (size_t y = 0; y < channel.h; y++) {
-          pixel_type *JXL_RESTRICT p = channel.Row(y);
-          const pixel_type *JXL_RESTRICT idx = indices.Row(y);
-          for (size_t x = 0; x < channel.w; x++) {
-            int index = idx[x];
-            pixel_type_w val = 0;
-            const pixel_type palette_entry = palette_internal::GetPaletteValue(
-                p_palette, index, /*c=*/c,
-                /*palette_size=*/palette.w,
-                /*onerow=*/onerow, /*bit_depth=*/bit_depth);
-            if (index < static_cast<int32_t>(nb_deltas)) {
-              PredictionResult pred = PredictNoTreeNoWP(
-                  channel.w, p + x, onerow_image, x, y, predictor);
-              val = pred.guess + palette_entry;
-            } else {
-              val = palette_entry;
-            }
-            p[x] = val;
-          }
-        }
-        return true;
-      };
-      JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, nb, ThreadPool::NoInit,
-                                    process_row, "UndoDeltaPaletteNoWP"));
-    }
-  }
-  if (c0 >= input.nb_meta_channels) {
-    // Palette was done on normal channels
-    input.nb_meta_channels--;
-  } else {
-    // Palette was done on metachannels
-    JXL_ENSURE(static_cast<int>(input.nb_meta_channels) >= 2 - nb);
-    input.nb_meta_channels -= 2 - nb;
-    JXL_ENSURE(begin_c + nb - 1 < input.nb_meta_channels);
-  }
-  input.channel.erase(input.channel.begin(), input.channel.begin() + 1);
-  return true;
-}
-
-Status MetaPalette(Image &input, uint32_t begin_c, uint32_t end_c,
-                   uint32_t nb_colors, uint32_t nb_deltas, bool lossy) {
-  JXL_RETURN_IF_ERROR(CheckEqualChannels(input, begin_c, end_c));
-  JxlMemoryManager *memory_manager = input.memory_manager();
-
-  size_t nb = end_c - begin_c + 1;
-  if (begin_c >= input.nb_meta_channels) {
-    // Palette was done on normal channels
-    input.nb_meta_channels++;
-  } else {
-    // Palette was done on metachannels
-    JXL_ENSURE(end_c < input.nb_meta_channels);
-    // we remove nb-1 metachannels and add one
-    input.nb_meta_channels += 2 - nb;
-  }
-  input.channel.erase(input.channel.begin() + begin_c + 1,
-                      input.channel.begin() + end_c + 1);
-  JXL_ASSIGN_OR_RETURN(
-      Channel pch, Channel::Create(memory_manager, nb_colors + nb_deltas, nb));
-  pch.hshift = -1;
-  pch.vshift = -1;
-  input.channel.insert(input.channel.begin(), std::move(pch));
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/palette.h b/third_party/jpeg-xl/lib/jxl/modular/transform/palette.h
deleted file mode 100644
index 9daf83e743144..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/transform/palette.h
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_MODULAR_TRANSFORM_PALETTE_H_
-#define LIB_JXL_MODULAR_TRANSFORM_PALETTE_H_
-
-#include <algorithm>
-#include <array>
-#include <cstddef>
-#include <cstdint>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/modular/encoding/context_predict.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/modular/options.h"
-
-namespace jxl {
-
-namespace palette_internal {
-
-static constexpr int kMaxPaletteLookupTableSize = 1 << 16;
-
-static constexpr int kRgbChannels = 3;
-
-// 5x5x5 color cube for the larger cube.
-static constexpr int kLargeCube = 5;
-
-// Smaller interleaved color cube to fill the holes of the larger cube.
-static constexpr int kSmallCube = 4;
-static constexpr int kSmallCubeBits = 2;
-// kSmallCube ** 3
-static constexpr int kLargeCubeOffset = kSmallCube * kSmallCube * kSmallCube;
-static constexpr int kImplicitPaletteSize =
-    kLargeCubeOffset + kLargeCube * kLargeCube * kLargeCube;
-
-template <int denom>
-static inline pixel_type Scale(uint64_t value, uint64_t bit_depth) {
-  // return (value * ((static_cast<pixel_type_w>(1) << bit_depth) - 1)) / denom;
-  // We only call this function with kSmallCube or kLargeCube - 1 as denom,
-  // allowing us to avoid a division here.
-  static_assert(denom == 4);
-  return (value * ((static_cast<uint64_t>(1) << bit_depth) - 1)) >> 2;
-}
-
-// The purpose of this function is solely to extend the interpretation of
-// palette indices to implicit values. If index < nb_deltas, indicating that the
-// result is a delta palette entry, it is the responsibility of the caller to
-// treat it as such.
-static JXL_MAYBE_UNUSED pixel_type
-GetPaletteValue(const pixel_type *const palette, int index, const size_t c,
-                const int palette_size, const int onerow, const int bit_depth) {
-  if (index < 0) {
-    static constexpr std::array<std::array<pixel_type, 3>, 72> kDeltaPalette = {
-        {
-            {{0, 0, 0}},       {{4, 4, 4}},       {{11, 0, 0}},
-            {{0, 0, -13}},     {{0, -12, 0}},     {{-10, -10, -10}},
-            {{-18, -18, -18}}, {{-27, -27, -27}}, {{-18, -18, 0}},
-            {{0, 0, -32}},     {{-32, 0, 0}},     {{-37, -37, -37}},
-            {{0, -32, -32}},   {{24, 24, 45}},    {{50, 50, 50}},
-            {{-45, -24, -24}}, {{-24, -45, -45}}, {{0, -24, -24}},
-            {{-34, -34, 0}},   {{-24, 0, -24}},   {{-45, -45, -24}},
-            {{64, 64, 64}},    {{-32, 0, -32}},   {{0, -32, 0}},
-            {{-32, 0, 32}},    {{-24, -45, -24}}, {{45, 24, 45}},
-            {{24, -24, -45}},  {{-45, -24, 24}},  {{80, 80, 80}},
-            {{64, 0, 0}},      {{0, 0, -64}},     {{0, -64, -64}},
-            {{-24, -24, 45}},  {{96, 96, 96}},    {{64, 64, 0}},
-            {{45, -24, -24}},  {{34, -34, 0}},    {{112, 112, 112}},
-            {{24, -45, -45}},  {{45, 45, -24}},   {{0, -32, 32}},
-            {{24, -24, 45}},   {{0, 96, 96}},     {{45, -24, 24}},
-            {{24, -45, -24}},  {{-24, -45, 24}},  {{0, -64, 0}},
-            {{96, 0, 0}},      {{128, 128, 128}}, {{64, 0, 64}},
-            {{144, 144, 144}}, {{96, 96, 0}},     {{-36, -36, 36}},
-            {{45, -24, -45}},  {{45, -45, -24}},  {{0, 0, -96}},
-            {{0, 128, 128}},   {{0, 96, 0}},      {{45, 24, -45}},
-            {{-128, 0, 0}},    {{24, -45, 24}},   {{-45, 24, -45}},
-            {{64, 0, -64}},    {{64, -64, -64}},  {{96, 0, 96}},
-            {{45, -45, 24}},   {{24, 45, -45}},   {{64, 64, -64}},
-            {{128, 128, 0}},   {{0, 0, -128}},    {{-24, 45, -45}},
-        }};
-    if (c >= kRgbChannels) {
-      return 0;
-    }
-    // Do not open the brackets, otherwise INT32_MIN negation could overflow.
-    index = -(index + 1);
-    index %= 1 + 2 * (kDeltaPalette.size() - 1);
-    static constexpr int kMultiplier[] = {-1, 1};
-    pixel_type result =
-        kDeltaPalette[((index + 1) >> 1)][c] * kMultiplier[index & 1];
-    if (bit_depth > 8) {
-      result *= static_cast<pixel_type>(1) << (bit_depth - 8);
-    }
-    return result;
-  } else if (palette_size <= index && index < palette_size + kLargeCubeOffset) {
-    if (c >= kRgbChannels) return 0;
-    index -= palette_size;
-    index >>= c * kSmallCubeBits;
-    return Scale<kSmallCube>(index % kSmallCube, bit_depth) +
-           (1 << (std::max(0, bit_depth - 3)));
-  } else if (palette_size + kLargeCubeOffset <= index) {
-    if (c >= kRgbChannels) return 0;
-    index -= palette_size + kLargeCubeOffset;
-    // TODO(eustas): should we take care of ambiguity created by
-    //               index >= kLargeCube ** 3 ?
-    switch (c) {
-      case 0:
-      default:
-        break;
-      case 1:
-        index /= kLargeCube;
-        break;
-      case 2:
-        index /= kLargeCube * kLargeCube;
-        break;
-    }
-    return Scale<kLargeCube - 1>(index % kLargeCube, bit_depth);
-  }
-  return palette[c * onerow + static_cast<size_t>(index)];
-}
-
-}  // namespace palette_internal
-
-Status InvPalette(Image &input, uint32_t begin_c, uint32_t nb_colors,
-                  uint32_t nb_deltas, Predictor predictor,
-                  const weighted::Header &wp_header, ThreadPool *pool);
-
-Status MetaPalette(Image &input, uint32_t begin_c, uint32_t end_c,
-                   uint32_t nb_colors, uint32_t nb_deltas, bool lossy);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_MODULAR_TRANSFORM_PALETTE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/rct.cc b/third_party/jpeg-xl/lib/jxl/modular/transform/rct.cc
deleted file mode 100644
index ff77812e6745b..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/transform/rct.cc
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/modular/transform/rct.h"
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/modular/transform/rct.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::ShiftRight;
-using hwy::HWY_NAMESPACE::Sub;
-
-template <int transform_type>
-void InvRCTRow(const pixel_type* in0, const pixel_type* in1,
-               const pixel_type* in2, pixel_type* out0, pixel_type* out1,
-               pixel_type* out2, size_t w) {
-  static_assert(transform_type >= 0 && transform_type < 7,
-                "Invalid transform type");
-  int second = transform_type >> 1;
-  int third = transform_type & 1;
-
-  size_t x = 0;
-  const HWY_FULL(pixel_type) d;
-  const size_t N = Lanes(d);
-  for (; x + N - 1 < w; x += N) {
-    if (transform_type == 6) {
-      auto Y = Load(d, in0 + x);
-      auto Co = Load(d, in1 + x);
-      auto Cg = Load(d, in2 + x);
-      Y = Sub(Y, ShiftRight<1>(Cg));
-      auto G = Add(Cg, Y);
-      Y = Sub(Y, ShiftRight<1>(Co));
-      auto R = Add(Y, Co);
-      Store(R, d, out0 + x);
-      Store(G, d, out1 + x);
-      Store(Y, d, out2 + x);
-    } else {
-      auto First = Load(d, in0 + x);
-      auto Second = Load(d, in1 + x);
-      auto Third = Load(d, in2 + x);
-      if (third) Third = Add(Third, First);
-      if (second == 1) {
-        Second = Add(Second, First);
-      } else if (second == 2) {
-        Second = Add(Second, ShiftRight<1>(Add(First, Third)));
-      }
-      Store(First, d, out0 + x);
-      Store(Second, d, out1 + x);
-      Store(Third, d, out2 + x);
-    }
-  }
-  for (; x < w; x++) {
-    if (transform_type == 6) {
-      pixel_type Y = in0[x];
-      pixel_type Co = in1[x];
-      pixel_type Cg = in2[x];
-      pixel_type tmp = PixelAdd(Y, -(Cg >> 1));
-      pixel_type G = PixelAdd(Cg, tmp);
-      pixel_type B = PixelAdd(tmp, -(Co >> 1));
-      pixel_type R = PixelAdd(B, Co);
-      out0[x] = R;
-      out1[x] = G;
-      out2[x] = B;
-    } else {
-      pixel_type First = in0[x];
-      pixel_type Second = in1[x];
-      pixel_type Third = in2[x];
-      if (third) Third = PixelAdd(Third, First);
-      if (second == 1) {
-        Second = PixelAdd(Second, First);
-      } else if (second == 2) {
-        Second = PixelAdd(Second, (PixelAdd(First, Third) >> 1));
-      }
-      out0[x] = First;
-      out1[x] = Second;
-      out2[x] = Third;
-    }
-  }
-}
-
-Status InvRCT(Image& input, size_t begin_c, size_t rct_type, ThreadPool* pool) {
-  JXL_RETURN_IF_ERROR(CheckEqualChannels(input, begin_c, begin_c + 2));
-  size_t m = begin_c;
-  Channel& c0 = input.channel[m + 0];
-  size_t w = c0.w;
-  size_t h = c0.h;
-  if (rct_type == 0) {  // noop
-    return true;
-  }
-  // Permutation: 0=RGB, 1=GBR, 2=BRG, 3=RBG, 4=GRB, 5=BGR
-  int permutation = rct_type / 7;
-  JXL_ENSURE(permutation < 6);
-  // 0-5 values have the low bit corresponding to Third and the high bits
-  // corresponding to Second. 6 corresponds to YCoCg.
-  //
-  // Second: 0=nop, 1=SubtractFirst, 2=SubtractAvgFirstThird
-  //
-  // Third: 0=nop, 1=SubtractFirst
-  int custom = rct_type % 7;
-  // Special case: permute-only. Swap channels around.
-  if (custom == 0) {
-    Channel ch0 = std::move(input.channel[m]);
-    Channel ch1 = std::move(input.channel[m + 1]);
-    Channel ch2 = std::move(input.channel[m + 2]);
-    input.channel[m + (permutation % 3)] = std::move(ch0);
-    input.channel[m + ((permutation + 1 + permutation / 3) % 3)] =
-        std::move(ch1);
-    input.channel[m + ((permutation + 2 - permutation / 3) % 3)] =
-        std::move(ch2);
-    return true;
-  }
-  constexpr decltype(&InvRCTRow<0>) inv_rct_row[] = {
-      InvRCTRow<0>, InvRCTRow<1>, InvRCTRow<2>, InvRCTRow<3>,
-      InvRCTRow<4>, InvRCTRow<5>, InvRCTRow<6>};
-  const auto process_row = [&](const uint32_t task,
-                               size_t /* thread */) -> Status {
-    const size_t y = task;
-    const pixel_type* in0 = input.channel[m].Row(y);
-    const pixel_type* in1 = input.channel[m + 1].Row(y);
-    const pixel_type* in2 = input.channel[m + 2].Row(y);
-    pixel_type* out0 = input.channel[m + (permutation % 3)].Row(y);
-    pixel_type* out1 =
-        input.channel[m + ((permutation + 1 + permutation / 3) % 3)].Row(y);
-    pixel_type* out2 =
-        input.channel[m + ((permutation + 2 - permutation / 3) % 3)].Row(y);
-    inv_rct_row[custom](in0, in1, in2, out0, out1, out2, w);
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(
-      RunOnPool(pool, 0, h, ThreadPool::NoInit, process_row, "InvRCT"));
-  return true;
-}
-
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(InvRCT);
-Status InvRCT(Image& input, size_t begin_c, size_t rct_type, ThreadPool* pool) {
-  return HWY_DYNAMIC_DISPATCH(InvRCT)(input, begin_c, rct_type, pool);
-}
-
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/rct.h b/third_party/jpeg-xl/lib/jxl/modular/transform/rct.h
deleted file mode 100644
index 1ab57fec69e8f..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/transform/rct.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_MODULAR_TRANSFORM_RCT_H_
-#define LIB_JXL_MODULAR_TRANSFORM_RCT_H_
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/modular/transform/transform.h"  // CheckEqualChannels
-
-namespace jxl {
-
-Status InvRCT(Image& input, size_t begin_c, size_t rct_type, ThreadPool* pool);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_MODULAR_TRANSFORM_RCT_H_
diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/squeeze.cc b/third_party/jpeg-xl/lib/jxl/modular/transform/squeeze.cc
deleted file mode 100644
index de685f77bc2fb..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/transform/squeeze.cc
+++ /dev/null
@@ -1,496 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/modular/transform/squeeze.h"
-
-#include <jxl/memory_manager.h>
-
-#include <cstdlib>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/modular/transform/transform.h"
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/modular/transform/squeeze.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/simd_util-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Abs;
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::And;
-using hwy::HWY_NAMESPACE::Gt;
-using hwy::HWY_NAMESPACE::IfThenElse;
-using hwy::HWY_NAMESPACE::IfThenZeroElse;
-using hwy::HWY_NAMESPACE::Lt;
-using hwy::HWY_NAMESPACE::MulEven;
-using hwy::HWY_NAMESPACE::Ne;
-using hwy::HWY_NAMESPACE::Neg;
-using hwy::HWY_NAMESPACE::OddEven;
-using hwy::HWY_NAMESPACE::RebindToUnsigned;
-using hwy::HWY_NAMESPACE::ShiftLeft;
-using hwy::HWY_NAMESPACE::ShiftRight;
-using hwy::HWY_NAMESPACE::Sub;
-using hwy::HWY_NAMESPACE::Xor;
-
-#if HWY_TARGET != HWY_SCALAR
-
-JXL_INLINE void FastUnsqueeze(const pixel_type *JXL_RESTRICT p_residual,
-                              const pixel_type *JXL_RESTRICT p_avg,
-                              const pixel_type *JXL_RESTRICT p_navg,
-                              const pixel_type *p_pout,
-                              pixel_type *JXL_RESTRICT p_out,
-                              pixel_type *p_nout) {
-  const HWY_CAPPED(pixel_type, 8) d;
-  const RebindToUnsigned<decltype(d)> du;
-  const size_t N = Lanes(d);
-  auto onethird = Set(d, 0x55555556);
-  for (size_t x = 0; x < 8; x += N) {
-    auto avg = Load(d, p_avg + x);
-    auto next_avg = Load(d, p_navg + x);
-    auto top = Load(d, p_pout + x);
-    // Equivalent to SmoothTendency(top,avg,next_avg), but without branches
-    // typo:off
-    auto Ba = Sub(top, avg);
-    auto an = Sub(avg, next_avg);
-    auto nonmono = Xor(Ba, an);
-    auto absBa = Abs(Ba);
-    auto absan = Abs(an);
-    auto absBn = Abs(Sub(top, next_avg));
-    // Compute a3 = absBa / 3
-    auto a3e = BitCast(d, ShiftRight<32>(MulEven(absBa, onethird)));
-    auto a3oi = MulEven(Reverse(d, absBa), onethird);
-    auto a3o = BitCast(
-        d, Reverse(hwy::HWY_NAMESPACE::Repartition<pixel_type_w, decltype(d)>(),
-                   a3oi));
-    auto a3 = OddEven(a3o, a3e);
-    a3 = Add(a3, Add(absBn, Set(d, 2)));
-    auto absdiff = ShiftRight<2>(a3);
-    auto skipdiff = Ne(Ba, Zero(d));
-    skipdiff = And(skipdiff, Ne(an, Zero(d)));
-    skipdiff = And(skipdiff, Lt(nonmono, Zero(d)));
-    auto absBa2 = Add(ShiftLeft<1>(absBa), And(absdiff, Set(d, 1)));
-    absdiff = IfThenElse(Gt(absdiff, absBa2),
-                         Add(ShiftLeft<1>(absBa), Set(d, 1)), absdiff);
-    // typo:on
-    auto absan2 = ShiftLeft<1>(absan);
-    absdiff = IfThenElse(Gt(Add(absdiff, And(absdiff, Set(d, 1))), absan2),
-                         absan2, absdiff);
-    auto diff1 = IfThenElse(Lt(top, next_avg), Neg(absdiff), absdiff);
-    auto tendency = IfThenZeroElse(skipdiff, diff1);
-
-    auto diff_minus_tendency = Load(d, p_residual + x);
-    auto diff = Add(diff_minus_tendency, tendency);
-    auto out =
-        Add(avg, ShiftRight<1>(
-                     Add(diff, BitCast(d, ShiftRight<31>(BitCast(du, diff))))));
-    Store(out, d, p_out + x);
-    Store(Sub(out, diff), d, p_nout + x);
-  }
-}
-
-#endif
-
-Status InvHSqueeze(Image &input, uint32_t c, uint32_t rc, ThreadPool *pool) {
-  JXL_ENSURE(c < input.channel.size());
-  JXL_ENSURE(rc < input.channel.size());
-  Channel &chin = input.channel[c];
-  const Channel &chin_residual = input.channel[rc];
-  // These must be valid since we ran MetaApply already.
-  JXL_ENSURE(chin.w == DivCeil(chin.w + chin_residual.w, 2));
-  JXL_ENSURE(chin.h == chin_residual.h);
-  JxlMemoryManager *memory_manager = input.memory_manager();
-
-  if (chin_residual.w == 0) {
-    // Short-circuit: output channel has same dimensions as input.
-    input.channel[c].hshift--;
-    return true;
-  }
-
-  // Note: chin.w >= chin_residual.w and at most 1 different.
-  JXL_ASSIGN_OR_RETURN(Channel chout,
-                       Channel::Create(memory_manager, chin.w + chin_residual.w,
-                                       chin.h, chin.hshift - 1, chin.vshift));
-  JXL_DEBUG_V(4,
-              "Undoing horizontal squeeze of channel %i using residuals in "
-              "channel %i (going from width %" PRIuS " to %" PRIuS ")",
-              c, rc, chin.w, chout.w);
-
-  if (chin_residual.h == 0) {
-    // Short-circuit: channel with no pixels.
-    input.channel[c] = std::move(chout);
-    return true;
-  }
-  auto unsqueeze_row = [&](size_t y, size_t x0) {
-    const pixel_type *JXL_RESTRICT p_residual = chin_residual.Row(y);
-    const pixel_type *JXL_RESTRICT p_avg = chin.Row(y);
-    pixel_type *JXL_RESTRICT p_out = chout.Row(y);
-    for (size_t x = x0; x < chin_residual.w; x++) {
-      pixel_type_w diff_minus_tendency = p_residual[x];
-      pixel_type_w avg = p_avg[x];
-      pixel_type_w next_avg = (x + 1 < chin.w ? p_avg[x + 1] : avg);
-      pixel_type_w left = (x ? p_out[(x << 1) - 1] : avg);
-      pixel_type_w tendency = SmoothTendency(left, avg, next_avg);
-      pixel_type_w diff = diff_minus_tendency + tendency;
-      pixel_type_w A = avg + (diff / 2);
-      p_out[(x << 1)] = A;
-      pixel_type_w B = A - diff;
-      p_out[(x << 1) + 1] = B;
-    }
-    if (chout.w & 1) p_out[chout.w - 1] = p_avg[chin.w - 1];
-  };
-
-  // somewhat complicated trickery just to be able to SIMD this.
-  // Horizontal unsqueeze has horizontal data dependencies, so we do
-  // 8 rows at a time and treat it as a vertical unsqueeze of a
-  // transposed 8x8 block (or 9x8 for one input).
-  static constexpr const size_t kRowsPerThread = 8;
-  const auto unsqueeze_span = [&](const uint32_t task,
-                                  size_t /* thread */) -> Status {
-    const size_t y0 = task * kRowsPerThread;
-    const size_t rows = std::min(kRowsPerThread, chin.h - y0);
-    size_t x = 0;
-
-#if HWY_TARGET != HWY_SCALAR
-    intptr_t onerow_in = chin.plane.PixelsPerRow();
-    intptr_t onerow_inr = chin_residual.plane.PixelsPerRow();
-    intptr_t onerow_out = chout.plane.PixelsPerRow();
-    const pixel_type *JXL_RESTRICT p_residual = chin_residual.Row(y0);
-    const pixel_type *JXL_RESTRICT p_avg = chin.Row(y0);
-    pixel_type *JXL_RESTRICT p_out = chout.Row(y0);
-    HWY_ALIGN pixel_type b_p_avg[9 * kRowsPerThread];
-    HWY_ALIGN pixel_type b_p_residual[8 * kRowsPerThread];
-    HWY_ALIGN pixel_type b_p_out_even[8 * kRowsPerThread];
-    HWY_ALIGN pixel_type b_p_out_odd[8 * kRowsPerThread];
-    HWY_ALIGN pixel_type b_p_out_evenT[8 * kRowsPerThread];
-    HWY_ALIGN pixel_type b_p_out_oddT[8 * kRowsPerThread];
-    const HWY_CAPPED(pixel_type, 8) d;
-    const size_t N = Lanes(d);
-    if (chin_residual.w > 16 && rows == kRowsPerThread) {
-      for (; x < chin_residual.w - 9; x += 8) {
-        Transpose8x8Block(p_residual + x, b_p_residual, onerow_inr);
-        Transpose8x8Block(p_avg + x, b_p_avg, onerow_in);
-        for (size_t y = 0; y < kRowsPerThread; y++) {
-          b_p_avg[8 * 8 + y] = p_avg[x + 8 + onerow_in * y];
-        }
-        for (size_t i = 0; i < 8; i++) {
-          FastUnsqueeze(
-              b_p_residual + 8 * i, b_p_avg + 8 * i, b_p_avg + 8 * (i + 1),
-              (x + i ? b_p_out_odd + 8 * ((x + i - 1) & 7) : b_p_avg + 8 * i),
-              b_p_out_even + 8 * i, b_p_out_odd + 8 * i);
-        }
-
-        Transpose8x8Block(b_p_out_even, b_p_out_evenT, 8);
-        Transpose8x8Block(b_p_out_odd, b_p_out_oddT, 8);
-        for (size_t y = 0; y < kRowsPerThread; y++) {
-          for (size_t i = 0; i < kRowsPerThread; i += N) {
-            auto even = Load(d, b_p_out_evenT + 8 * y + i);
-            auto odd = Load(d, b_p_out_oddT + 8 * y + i);
-            StoreInterleaved(d, even, odd,
-                             p_out + ((x + i) << 1) + onerow_out * y);
-          }
-        }
-      }
-    }
-#endif
-    for (size_t y = 0; y < rows; y++) {
-      unsqueeze_row(y0 + y, x);
-    }
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, DivCeil(chin.h, kRowsPerThread),
-                                ThreadPool::NoInit, unsqueeze_span,
-                                "InvHorizontalSqueeze"));
-  input.channel[c] = std::move(chout);
-  return true;
-}
-
-Status InvVSqueeze(Image &input, uint32_t c, uint32_t rc, ThreadPool *pool) {
-  JXL_ENSURE(c < input.channel.size());
-  JXL_ENSURE(rc < input.channel.size());
-  const Channel &chin = input.channel[c];
-  const Channel &chin_residual = input.channel[rc];
-  // These must be valid since we ran MetaApply already.
-  JXL_ENSURE(chin.h == DivCeil(chin.h + chin_residual.h, 2));
-  JXL_ENSURE(chin.w == chin_residual.w);
-  JxlMemoryManager *memory_manager = input.memory_manager();
-
-  if (chin_residual.h == 0) {
-    // Short-circuit: output channel has same dimensions as input.
-    input.channel[c].vshift--;
-    return true;
-  }
-
-  // Note: chin.h >= chin_residual.h and at most 1 different.
-  JXL_ASSIGN_OR_RETURN(
-      Channel chout,
-      Channel::Create(memory_manager, chin.w, chin.h + chin_residual.h,
-                      chin.hshift, chin.vshift - 1));
-  JXL_DEBUG_V(
-      4,
-      "Undoing vertical squeeze of channel %i using residuals in channel "
-      "%i (going from height %" PRIuS " to %" PRIuS ")",
-      c, rc, chin.h, chout.h);
-
-  if (chin_residual.w == 0) {
-    // Short-circuit: channel with no pixels.
-    input.channel[c] = std::move(chout);
-    return true;
-  }
-
-  static constexpr const int kColsPerThread = 64;
-  const auto unsqueeze_slice = [&](const uint32_t task,
-                                   size_t /* thread */) -> Status {
-    const size_t x0 = task * kColsPerThread;
-    const size_t x1 =
-        std::min(static_cast<size_t>(task + 1) * kColsPerThread, chin.w);
-    const size_t w = x1 - x0;
-    // We only iterate up to std::min(chin_residual.h, chin.h) which is
-    // always chin_residual.h.
-    for (size_t y = 0; y < chin_residual.h; y++) {
-      const pixel_type *JXL_RESTRICT p_residual = chin_residual.Row(y) + x0;
-      const pixel_type *JXL_RESTRICT p_avg = chin.Row(y) + x0;
-      const pixel_type *JXL_RESTRICT p_navg =
-          chin.Row(y + 1 < chin.h ? y + 1 : y) + x0;
-      pixel_type *JXL_RESTRICT p_out = chout.Row(y << 1) + x0;
-      pixel_type *JXL_RESTRICT p_nout = chout.Row((y << 1) + 1) + x0;
-      const pixel_type *p_pout = y > 0 ? chout.Row((y << 1) - 1) + x0 : p_avg;
-      size_t x = 0;
-#if HWY_TARGET != HWY_SCALAR
-      for (; x + 7 < w; x += 8) {
-        FastUnsqueeze(p_residual + x, p_avg + x, p_navg + x, p_pout + x,
-                      p_out + x, p_nout + x);
-      }
-#endif
-      for (; x < w; x++) {
-        pixel_type_w avg = p_avg[x];
-        pixel_type_w next_avg = p_navg[x];
-        pixel_type_w top = p_pout[x];
-        pixel_type_w tendency = SmoothTendency(top, avg, next_avg);
-        pixel_type_w diff_minus_tendency = p_residual[x];
-        pixel_type_w diff = diff_minus_tendency + tendency;
-        pixel_type_w out = avg + (diff / 2);
-        p_out[x] = out;
-        // If the chin_residual.h == chin.h, the output has an even number
-        // of rows so the next line is fine. Otherwise, this loop won't
-        // write to the last output row which is handled separately.
-        p_nout[x] = out - diff;
-      }
-    }
-    return true;
-  };
-  JXL_RETURN_IF_ERROR(RunOnPool(pool, 0, DivCeil(chin.w, kColsPerThread),
-                                ThreadPool::NoInit, unsqueeze_slice,
-                                "InvVertSqueeze"));
-
-  if (chout.h & 1) {
-    size_t y = chin.h - 1;
-    const pixel_type *p_avg = chin.Row(y);
-    pixel_type *p_out = chout.Row(y << 1);
-    for (size_t x = 0; x < chin.w; x++) {
-      p_out[x] = p_avg[x];
-    }
-  }
-  input.channel[c] = std::move(chout);
-  return true;
-}
-
-Status InvSqueeze(Image &input, const std::vector<SqueezeParams> &parameters,
-                  ThreadPool *pool) {
-  for (int i = parameters.size() - 1; i >= 0; i--) {
-    JXL_RETURN_IF_ERROR(
-        CheckMetaSqueezeParams(parameters[i], input.channel.size()));
-    bool horizontal = parameters[i].horizontal;
-    bool in_place = parameters[i].in_place;
-    uint32_t beginc = parameters[i].begin_c;
-    uint32_t endc = parameters[i].begin_c + parameters[i].num_c - 1;
-    uint32_t offset;
-    if (in_place) {
-      offset = endc + 1;
-    } else {
-      offset = input.channel.size() + beginc - endc - 1;
-    }
-    if (beginc < input.nb_meta_channels) {
-      // This is checked in MetaSqueeze.
-      JXL_ENSURE(input.nb_meta_channels > parameters[i].num_c);
-      input.nb_meta_channels -= parameters[i].num_c;
-    }
-
-    for (uint32_t c = beginc; c <= endc; c++) {
-      uint32_t rc = offset + c - beginc;
-      // MetaApply should imply that `rc` is within range, otherwise there's a
-      // programming bug.
-      JXL_ENSURE(rc < input.channel.size());
-      if ((input.channel[c].w < input.channel[rc].w) ||
-          (input.channel[c].h < input.channel[rc].h)) {
-        return JXL_FAILURE("Corrupted squeeze transform");
-      }
-      if (horizontal) {
-        JXL_RETURN_IF_ERROR(InvHSqueeze(input, c, rc, pool));
-      } else {
-        JXL_RETURN_IF_ERROR(InvVSqueeze(input, c, rc, pool));
-      }
-    }
-    input.channel.erase(input.channel.begin() + offset,
-                        input.channel.begin() + offset + (endc - beginc + 1));
-  }
-  return true;
-}
-
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-
-namespace jxl {
-
-HWY_EXPORT(InvSqueeze);
-Status InvSqueeze(Image &input, const std::vector<SqueezeParams> &parameters,
-                  ThreadPool *pool) {
-  return HWY_DYNAMIC_DISPATCH(InvSqueeze)(input, parameters, pool);
-}
-
-void DefaultSqueezeParameters(std::vector<SqueezeParams> *parameters,
-                              const Image &image) {
-  int nb_channels = image.channel.size() - image.nb_meta_channels;
-
-  parameters->clear();
-  size_t w = image.channel[image.nb_meta_channels].w;
-  size_t h = image.channel[image.nb_meta_channels].h;
-  JXL_DEBUG_V(
-      7, "Default squeeze parameters for %" PRIuS "x%" PRIuS " image: ", w, h);
-
-  // do horizontal first on wide images; vertical first on tall images
-  bool wide = (w > h);
-
-  if (nb_channels > 2 && image.channel[image.nb_meta_channels + 1].w == w &&
-      image.channel[image.nb_meta_channels + 1].h == h) {
-    // assume channels 1 and 2 are chroma, and can be squeezed first for 4:2:0
-    // previews
-    JXL_DEBUG_V(7, "(4:2:0 chroma), %" PRIuS "x%" PRIuS " image", w, h);
-    SqueezeParams params;
-    // horizontal chroma squeeze
-    params.horizontal = true;
-    params.in_place = false;
-    params.begin_c = image.nb_meta_channels + 1;
-    params.num_c = 2;
-    parameters->push_back(params);
-    params.horizontal = false;
-    // vertical chroma squeeze
-    parameters->push_back(params);
-  }
-  SqueezeParams params;
-  params.begin_c = image.nb_meta_channels;
-  params.num_c = nb_channels;
-  params.in_place = true;
-
-  if (!wide) {
-    if (h > kMaxFirstPreviewSize) {
-      params.horizontal = false;
-      parameters->push_back(params);
-      h = (h + 1) / 2;
-      JXL_DEBUG_V(7, "Vertical (%" PRIuS "x%" PRIuS "), ", w, h);
-    }
-  }
-  while (w > kMaxFirstPreviewSize || h > kMaxFirstPreviewSize) {
-    if (w > kMaxFirstPreviewSize) {
-      params.horizontal = true;
-      parameters->push_back(params);
-      w = (w + 1) / 2;
-      JXL_DEBUG_V(7, "Horizontal (%" PRIuS "x%" PRIuS "), ", w, h);
-    }
-    if (h > kMaxFirstPreviewSize) {
-      params.horizontal = false;
-      parameters->push_back(params);
-      h = (h + 1) / 2;
-      JXL_DEBUG_V(7, "Vertical (%" PRIuS "x%" PRIuS "), ", w, h);
-    }
-  }
-  JXL_DEBUG_V(7, "that's it");
-}
-
-Status CheckMetaSqueezeParams(const SqueezeParams &parameter,
-                              int num_channels) {
-  int c1 = parameter.begin_c;
-  int c2 = parameter.begin_c + parameter.num_c - 1;
-  if (c1 < 0 || c1 >= num_channels || c2 < 0 || c2 >= num_channels || c2 < c1) {
-    return JXL_FAILURE("Invalid channel range");
-  }
-  return true;
-}
-
-Status MetaSqueeze(Image &image, std::vector<SqueezeParams> *parameters) {
-  JxlMemoryManager *memory_manager = image.memory_manager();
-  if (parameters->empty()) {
-    DefaultSqueezeParameters(parameters, image);
-  }
-
-  for (auto &parameter : *parameters) {
-    JXL_RETURN_IF_ERROR(
-        CheckMetaSqueezeParams(parameter, image.channel.size()));
-    bool horizontal = parameter.horizontal;
-    bool in_place = parameter.in_place;
-    uint32_t beginc = parameter.begin_c;
-    uint32_t endc = parameter.begin_c + parameter.num_c - 1;
-
-    uint32_t offset;
-    if (beginc < image.nb_meta_channels) {
-      if (endc >= image.nb_meta_channels) {
-        return JXL_FAILURE("Invalid squeeze: mix of meta and nonmeta channels");
-      }
-      if (!in_place) {
-        return JXL_FAILURE(
-            "Invalid squeeze: meta channels require in-place residuals");
-      }
-      image.nb_meta_channels += parameter.num_c;
-    }
-    if (in_place) {
-      offset = endc + 1;
-    } else {
-      offset = image.channel.size();
-    }
-    for (uint32_t c = beginc; c <= endc; c++) {
-      if (image.channel[c].hshift > 30 || image.channel[c].vshift > 30) {
-        return JXL_FAILURE("Too many squeezes: shift > 30");
-      }
-      size_t w = image.channel[c].w;
-      size_t h = image.channel[c].h;
-      if (w == 0 || h == 0) return JXL_FAILURE("Squeezing empty channel");
-      if (horizontal) {
-        image.channel[c].w = (w + 1) / 2;
-        if (image.channel[c].hshift >= 0) image.channel[c].hshift++;
-        w = w - (w + 1) / 2;
-      } else {
-        image.channel[c].h = (h + 1) / 2;
-        if (image.channel[c].vshift >= 0) image.channel[c].vshift++;
-        h = h - (h + 1) / 2;
-      }
-      JXL_RETURN_IF_ERROR(image.channel[c].shrink());
-      JXL_ASSIGN_OR_RETURN(Channel placeholder,
-                           Channel::Create(memory_manager, w, h));
-      placeholder.hshift = image.channel[c].hshift;
-      placeholder.vshift = image.channel[c].vshift;
-
-      image.channel.insert(image.channel.begin() + offset + (c - beginc),
-                           std::move(placeholder));
-      JXL_DEBUG_V(8, "MetaSqueeze applied, current image: %s",
-                  image.DebugString().c_str());
-    }
-  }
-  return true;
-}
-
-}  // namespace jxl
-
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/squeeze.h b/third_party/jpeg-xl/lib/jxl/modular/transform/squeeze.h
deleted file mode 100644
index f56d6dd7e98a8..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/transform/squeeze.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_MODULAR_TRANSFORM_SQUEEZE_H_
-#define LIB_JXL_MODULAR_TRANSFORM_SQUEEZE_H_
-
-// Haar-like transform: halves the resolution in one direction
-// A B   -> (A+B)>>1              in one channel (average)  -> same range as
-// original channel
-//          A-B - tendency        in a new channel ('residual' needed to make
-//          the transform reversible)
-//                                        -> theoretically range could be 2.5
-//                                        times larger (2 times without the
-//                                        'tendency'), but there should be lots
-//                                        of zeroes
-// Repeated application (alternating horizontal and vertical squeezes) results
-// in downscaling
-//
-// The default coefficient ordering is low-frequency to high-frequency, as in
-// M. Antonini, M. Barlaud, P. Mathieu and I. Daubechies, "Image coding using
-// wavelet transform", IEEE Transactions on Image Processing, vol. 1, no. 2, pp.
-// 205-220, April 1992, doi: 10.1109/83.136597.
-
-#include <cstdlib>
-#include <vector>
-
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/modular/transform/transform.h"
-
-namespace jxl {
-
-constexpr size_t kMaxFirstPreviewSize = 8;
-
-/*
-        int avg=(A+B)>>1;
-        int diff=(A-B);
-        int rA=(diff+(avg<<1)+(diff&1))>>1;
-        int rB=rA-diff;
-
-*/
-//         |A B|C D|E F|
-//           p   a   n             p=avg(A,B), a=avg(C,D), n=avg(E,F)
-//
-// Goal: estimate C-D (avoiding ringing artifacts)
-// (ensuring that in smooth areas, a zero residual corresponds to a smooth
-// gradient)
-
-// best estimate for C: (B + 2*a)/3
-// best estimate for D: (n + 3*a)/4
-// best estimate for C-D:  4*B - 3*n - a /12
-
-// avoid ringing by 1) only doing this if B <= a <= n  or  B >= a >= n
-// (otherwise, this is not a smooth area and we cannot really estimate C-D)
-//                  2) making sure that B <= C <= D <= n  or B >= C >= D >= n
-
-inline pixel_type_w SmoothTendency(pixel_type_w B, pixel_type_w a,
-                                   pixel_type_w n) {
-  pixel_type_w diff = 0;
-  if (B >= a && a >= n) {
-    diff = (4 * B - 3 * n - a + 6) / 12;
-    //      2C = a<<1 + diff - diff&1 <= 2B  so diff - diff&1 <= 2B - 2a
-    //      2D = a<<1 - diff - diff&1 >= 2n  so diff + diff&1 <= 2a - 2n
-    if (diff - (diff & 1) > 2 * (B - a)) diff = 2 * (B - a) + 1;
-    if (diff + (diff & 1) > 2 * (a - n)) diff = 2 * (a - n);
-  } else if (B <= a && a <= n) {
-    diff = (4 * B - 3 * n - a - 6) / 12;
-    //      2C = a<<1 + diff + diff&1 >= 2B  so diff + diff&1 >= 2B - 2a
-    //      2D = a<<1 - diff + diff&1 <= 2n  so diff - diff&1 >= 2a - 2n
-    if (diff + (diff & 1) < 2 * (B - a)) diff = 2 * (B - a) - 1;
-    if (diff - (diff & 1) < 2 * (a - n)) diff = 2 * (a - n);
-  }
-  return diff;
-}
-
-void DefaultSqueezeParameters(std::vector<SqueezeParams> *parameters,
-                              const Image &image);
-
-Status CheckMetaSqueezeParams(const SqueezeParams &parameter, int num_channels);
-
-Status MetaSqueeze(Image &image, std::vector<SqueezeParams> *parameters);
-
-Status InvSqueeze(Image &input, const std::vector<SqueezeParams> &parameters,
-                  ThreadPool *pool);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_MODULAR_TRANSFORM_SQUEEZE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/transform.cc b/third_party/jpeg-xl/lib/jxl/modular/transform/transform.cc
deleted file mode 100644
index 05a18215d1291..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/transform/transform.cc
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/modular/transform/transform.h"
-
-#include <cinttypes>  // PRIu32
-
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/modular/transform/palette.h"
-#include "lib/jxl/modular/transform/rct.h"
-#include "lib/jxl/modular/transform/squeeze.h"
-
-namespace jxl {
-
-SqueezeParams::SqueezeParams() { Bundle::Init(this); }
-Transform::Transform(TransformId id) {
-  Bundle::Init(this);
-  this->id = id;
-}
-
-Status Transform::Inverse(Image &input, const weighted::Header &wp_header,
-                          ThreadPool *pool) const {
-  JXL_DEBUG_V(6, "Input channels (%" PRIuS ", %" PRIuS " meta): ",
-              input.channel.size(), input.nb_meta_channels);
-  switch (id) {
-    case TransformId::kRCT:
-      return InvRCT(input, begin_c, rct_type, pool);
-    case TransformId::kSqueeze:
-      return InvSqueeze(input, squeezes, pool);
-    case TransformId::kPalette:
-      return InvPalette(input, begin_c, nb_colors, nb_deltas, predictor,
-                        wp_header, pool);
-    default:
-      return JXL_FAILURE("Unknown transformation (ID=%u)",
-                         static_cast<unsigned int>(id));
-  }
-}
-
-Status Transform::MetaApply(Image &input) {
-  JXL_DEBUG_V(6, "MetaApply input: %s", input.DebugString().c_str());
-  switch (id) {
-    case TransformId::kRCT:
-      JXL_DEBUG_V(2, "Transform: kRCT, rct_type=%" PRIu32, rct_type);
-      return CheckEqualChannels(input, begin_c, begin_c + 2);
-    case TransformId::kSqueeze:
-      JXL_DEBUG_V(2, "Transform: kSqueeze:");
-#if JXL_DEBUG_V_LEVEL >= 2
-      {
-        auto squeezes_copy = squeezes;
-        if (squeezes_copy.empty()) {
-          DefaultSqueezeParameters(&squeezes_copy, input);
-        }
-        for (const auto &params : squeezes_copy) {
-          JXL_DEBUG_V(
-              2,
-              "  squeeze params: horizontal=%d, in_place=%d, begin_c=%" PRIu32
-              ", num_c=%" PRIu32,
-              params.horizontal, params.in_place, params.begin_c, params.num_c);
-        }
-      }
-#endif
-      return MetaSqueeze(input, &squeezes);
-    case TransformId::kPalette:
-      JXL_DEBUG_V(2,
-                  "Transform: kPalette, begin_c=%" PRIu32 ", num_c=%" PRIu32
-                  ", nb_colors=%" PRIu32 ", nb_deltas=%" PRIu32,
-                  begin_c, num_c, nb_colors, nb_deltas);
-      return MetaPalette(input, begin_c, begin_c + num_c - 1, nb_colors,
-                         nb_deltas, lossy_palette);
-    default:
-      return JXL_FAILURE("Unknown transformation (ID=%u)",
-                         static_cast<unsigned int>(id));
-  }
-}
-
-Status CheckEqualChannels(const Image &image, uint32_t c1, uint32_t c2) {
-  if (c1 > image.channel.size() || c2 >= image.channel.size() || c2 < c1) {
-    return JXL_FAILURE("Invalid channel range: %u..%u (there are only %" PRIuS
-                       " channels)",
-                       c1, c2, image.channel.size());
-  }
-  if (c1 < image.nb_meta_channels && c2 >= image.nb_meta_channels) {
-    return JXL_FAILURE("Invalid: transforming mix of meta and nonmeta");
-  }
-  const auto &ch1 = image.channel[c1];
-  for (size_t c = c1 + 1; c <= c2; c++) {
-    const auto &ch2 = image.channel[c];
-    if (ch1.w != ch2.w || ch1.h != ch2.h || ch1.hshift != ch2.hshift ||
-        ch1.vshift != ch2.vshift) {
-      return false;
-    }
-  }
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/modular/transform/transform.h b/third_party/jpeg-xl/lib/jxl/modular/transform/transform.h
deleted file mode 100644
index cb46d0888f200..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular/transform/transform.h
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_MODULAR_TRANSFORM_TRANSFORM_H_
-#define LIB_JXL_MODULAR_TRANSFORM_TRANSFORM_H_
-
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/field_encodings.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/modular/encoding/context_predict.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/modular/options.h"
-
-namespace jxl {
-
-enum class TransformId : uint32_t {
-  // G, R-G, B-G and variants (including YCoCg).
-  kRCT = 0,
-
-  // Color palette. Parameters are: [begin_c] [end_c] [nb_colors]
-  kPalette = 1,
-
-  // Squeezing (Haar-style)
-  kSqueeze = 2,
-
-  // Invalid for now.
-  kInvalid = 3,
-};
-
-struct SqueezeParams : public Fields {
-  JXL_FIELDS_NAME(SqueezeParams)
-  bool horizontal;
-  bool in_place;
-  uint32_t begin_c;
-  uint32_t num_c;
-  SqueezeParams();
-  Status VisitFields(Visitor *JXL_RESTRICT visitor) override {
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &horizontal));
-    JXL_QUIET_RETURN_IF_ERROR(visitor->Bool(false, &in_place));
-    JXL_QUIET_RETURN_IF_ERROR(visitor->U32(Bits(3), BitsOffset(6, 8),
-                                           BitsOffset(10, 72),
-                                           BitsOffset(13, 1096), 0, &begin_c));
-    JXL_QUIET_RETURN_IF_ERROR(
-        visitor->U32(Val(1), Val(2), Val(3), BitsOffset(4, 4), 2, &num_c));
-    return true;
-  }
-};
-
-class Transform : public Fields {
- public:
-  TransformId id;
-  // for Palette and RCT.
-  uint32_t begin_c;
-  // for RCT. 42 possible values starting from 0.
-  uint32_t rct_type;
-  // Only for Palette and NearLossless.
-  uint32_t num_c;
-  // Only for Palette.
-  uint32_t nb_colors;
-  uint32_t nb_deltas;
-  // for Squeeze. Default squeeze if empty.
-  std::vector<SqueezeParams> squeezes;
-  // for NearLossless, not serialized.
-  int max_delta_error;
-  // Serialized for Palette.
-  Predictor predictor;
-  // for Palette, not serialized.
-  bool ordered_palette = true;
-  bool lossy_palette = false;
-
-  explicit Transform(TransformId id);
-  // default constructor for bundles.
-  Transform() : Transform(TransformId::kInvalid) {}
-
-  Status VisitFields(Visitor *JXL_RESTRICT visitor) override {
-    JXL_QUIET_RETURN_IF_ERROR(
-        visitor->U32(Val(static_cast<uint32_t>(TransformId::kRCT)),
-                     Val(static_cast<uint32_t>(TransformId::kPalette)),
-                     Val(static_cast<uint32_t>(TransformId::kSqueeze)),
-                     Val(static_cast<uint32_t>(TransformId::kInvalid)),
-                     static_cast<uint32_t>(TransformId::kRCT),
-                     reinterpret_cast<uint32_t *>(&id)));
-    if (id == TransformId::kInvalid) {
-      return JXL_FAILURE("Invalid transform ID");
-    }
-    if (visitor->Conditional(id == TransformId::kRCT ||
-                             id == TransformId::kPalette)) {
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->U32(Bits(3), BitsOffset(6, 8), BitsOffset(10, 72),
-                       BitsOffset(13, 1096), 0, &begin_c));
-    }
-    if (visitor->Conditional(id == TransformId::kRCT)) {
-      // 0-41, default YCoCg.
-      JXL_QUIET_RETURN_IF_ERROR(visitor->U32(Val(6), Bits(2), BitsOffset(4, 2),
-                                             BitsOffset(6, 10), 6, &rct_type));
-      if (rct_type >= 42) {
-        return JXL_FAILURE("Invalid transform RCT type");
-      }
-    }
-    if (visitor->Conditional(id == TransformId::kPalette)) {
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->U32(Val(1), Val(3), Val(4), BitsOffset(13, 1), 3, &num_c));
-      JXL_QUIET_RETURN_IF_ERROR(visitor->U32(
-          BitsOffset(8, 0), BitsOffset(10, 256), BitsOffset(12, 1280),
-          BitsOffset(16, 5376), 256, &nb_colors));
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->U32(Val(0), BitsOffset(8, 1), BitsOffset(10, 257),
-                       BitsOffset(16, 1281), 0, &nb_deltas));
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->Bits(4, static_cast<uint32_t>(Predictor::Zero),
-                        reinterpret_cast<uint32_t *>(&predictor)));
-      if (predictor >= Predictor::Best) {
-        return JXL_FAILURE("Invalid predictor");
-      }
-    }
-
-    if (visitor->Conditional(id == TransformId::kSqueeze)) {
-      uint32_t num_squeezes = static_cast<uint32_t>(squeezes.size());
-      JXL_QUIET_RETURN_IF_ERROR(
-          visitor->U32(Val(0), BitsOffset(4, 1), BitsOffset(6, 9),
-                       BitsOffset(8, 41), 0, &num_squeezes));
-      if (visitor->IsReading()) squeezes.resize(num_squeezes);
-      for (size_t i = 0; i < num_squeezes; i++) {
-        JXL_QUIET_RETURN_IF_ERROR(visitor->VisitNested(&squeezes[i]));
-      }
-    }
-    return true;
-  }
-
-  JXL_FIELDS_NAME(Transform)
-
-  Status Inverse(Image &input, const weighted::Header &wp_header,
-                 ThreadPool *pool = nullptr) const;
-  Status MetaApply(Image &input);
-};
-
-Status CheckEqualChannels(const Image &image, uint32_t c1, uint32_t c2);
-
-static inline pixel_type PixelAdd(pixel_type a, pixel_type b) {
-  return static_cast<pixel_type>(static_cast<uint32_t>(a) +
-                                 static_cast<uint32_t>(b));
-}
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_MODULAR_TRANSFORM_TRANSFORM_H_
diff --git a/third_party/jpeg-xl/lib/jxl/modular_test.cc b/third_party/jpeg-xl/lib/jxl/modular_test.cc
deleted file mode 100644
index 030e46aeac05d..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/modular_test.cc
+++ /dev/null
@@ -1,564 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/cms.h>
-#include <jxl/encode.h>
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <memory>
-#include <sstream>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "lib/extras/codec.h"
-#include "lib/extras/dec/jxl.h"
-#include "lib/extras/enc/jxl.h"
-#include "lib/extras/metrics.h"
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/random.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/codec_in_out.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/common.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/enc_fields.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/enc_toc.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/headers.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/image_test_utils.h"
-#include "lib/jxl/modular/encoding/enc_encoding.h"
-#include "lib/jxl/modular/encoding/encoding.h"
-#include "lib/jxl/modular/modular_image.h"
-#include "lib/jxl/modular/options.h"
-#include "lib/jxl/modular/transform/transform.h"
-#include "lib/jxl/padded_bytes.h"
-#include "lib/jxl/test_image.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-using ::jxl::test::ButteraugliDistance;
-using ::jxl::test::ReadTestData;
-using ::jxl::test::Roundtrip;
-using ::jxl::test::TestImage;
-
-void TestLosslessGroups(size_t group_size_shift) {
-  const std::vector<uint8_t> orig = ReadTestData("jxl/flower/flower.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  ASSERT_TRUE(t.SetDimensions(t.ppf().xsize() / 4, t.ppf().ysize() / 4));
-
-  extras::JXLCompressParams cparams;
-  cparams.distance = 0.0f;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_MODULAR_GROUP_SIZE, group_size_shift);
-  extras::JXLDecompressParams dparams;
-  dparams.accepted_formats = {{3, JXL_TYPE_UINT8, JXL_LITTLE_ENDIAN, 0}};
-
-  extras::PackedPixelFile ppf_out;
-  size_t compressed_size =
-      Roundtrip(t.ppf(), cparams, dparams, nullptr, &ppf_out);
-  EXPECT_LE(compressed_size, 280000u);
-  EXPECT_EQ(0.0f, test::ComputeDistance2(t.ppf(), ppf_out));
-}
-
-TEST(ModularTest, RoundtripLosslessGroups128) { TestLosslessGroups(0); }
-
-JXL_TSAN_SLOW_TEST(ModularTest, RoundtripLosslessGroups512) {
-  TestLosslessGroups(2);
-}
-
-JXL_TSAN_SLOW_TEST(ModularTest, RoundtripLosslessGroups1024) {
-  TestLosslessGroups(3);
-}
-
-TEST(ModularTest, RoundtripLosslessCustomWpPermuteRCT) {
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  ASSERT_TRUE(t.SetDimensions(100, 100));
-
-  extras::JXLCompressParams cparams;
-  cparams.distance = 0.0f;
-  // 9 = permute to GBR, to test the special case of permutation-only
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_MODULAR_COLOR_SPACE, 9);
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_MODULAR_PREDICTOR,
-                    static_cast<int64_t>(Predictor::Weighted));
-  // slowest speed so different WP modes are tried
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT, 9);
-  extras::JXLDecompressParams dparams;
-  dparams.accepted_formats = {{3, JXL_TYPE_UINT8, JXL_LITTLE_ENDIAN, 0}};
-
-  extras::PackedPixelFile ppf_out;
-  size_t compressed_size =
-      Roundtrip(t.ppf(), cparams, dparams, nullptr, &ppf_out);
-  EXPECT_LE(compressed_size, 10169u);
-  EXPECT_EQ(0.0f, test::ComputeDistance2(t.ppf(), ppf_out));
-}
-
-TEST(ModularTest, RoundtripLossyDeltaPalette) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  CompressParams cparams;
-  cparams.modular_mode = true;
-  cparams.color_transform = jxl::ColorTransform::kNone;
-  cparams.lossy_palette = true;
-  cparams.palette_colors = 0;
-
-  CodecInOut io_out{memory_manager};
-
-  CodecInOut io{memory_manager};
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io));
-  ASSERT_TRUE(io.ShrinkTo(300, 100));
-
-  size_t compressed_size;
-  JXL_EXPECT_OK(Roundtrip(&io, cparams, {}, &io_out, _, &compressed_size));
-  EXPECT_LE(compressed_size, 6800u);
-  EXPECT_SLIGHTLY_BELOW(
-      ButteraugliDistance(io.frames, io_out.frames, ButteraugliParams(),
-                          *JxlGetDefaultCms(),
-                          /*distmap=*/nullptr),
-      1.5);
-}
-TEST(ModularTest, RoundtripLossyDeltaPaletteWP) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  CompressParams cparams;
-  cparams.SetLossless();
-  cparams.lossy_palette = true;
-  cparams.palette_colors = 0;
-  // TODO(jon): this is currently ignored, and Avg4 is always used instead
-  cparams.options.predictor = jxl::Predictor::Weighted;
-
-  CodecInOut io_out{memory_manager};
-
-  CodecInOut io{memory_manager};
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io));
-  ASSERT_TRUE(io.ShrinkTo(300, 100));
-
-  size_t compressed_size;
-  JXL_EXPECT_OK(Roundtrip(&io, cparams, {}, &io_out, _, &compressed_size));
-  EXPECT_LE(compressed_size, 6500u);
-  EXPECT_SLIGHTLY_BELOW(
-      ButteraugliDistance(io.frames, io_out.frames, ButteraugliParams(),
-                          *JxlGetDefaultCms(),
-                          /*distmap=*/nullptr),
-      1.5);
-}
-
-TEST(ModularTest, RoundtripLossy) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  CompressParams cparams;
-  cparams.modular_mode = true;
-  cparams.butteraugli_distance = 2.f;
-  cparams.SetCms(*JxlGetDefaultCms());
-
-  CodecInOut io_out{memory_manager};
-
-  CodecInOut io{memory_manager};
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io));
-
-  size_t compressed_size;
-  JXL_EXPECT_OK(Roundtrip(&io, cparams, {}, &io_out, _, &compressed_size));
-  EXPECT_LE(compressed_size, 30000u);
-  EXPECT_SLIGHTLY_BELOW(
-      ButteraugliDistance(io.frames, io_out.frames, ButteraugliParams(),
-                          *JxlGetDefaultCms(),
-                          /*distmap=*/nullptr),
-      2.3);
-}
-
-TEST(ModularTest, RoundtripLossy16) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/raw.pixls/DJI-FC6310-16bit_709_v4_krita.png");
-  CompressParams cparams;
-  cparams.modular_mode = true;
-  cparams.butteraugli_distance = 2.f;
-
-  CodecInOut io_out{memory_manager};
-
-  CodecInOut io{memory_manager};
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io));
-  ASSERT_TRUE(!io.metadata.m.have_preview);
-  ASSERT_TRUE(io.frames.size() == 1);
-  ASSERT_TRUE(
-      io.frames[0].TransformTo(ColorEncoding::SRGB(), *JxlGetDefaultCms()));
-  io.metadata.m.color_encoding = ColorEncoding::SRGB();
-
-  size_t compressed_size;
-  JXL_EXPECT_OK(Roundtrip(&io, cparams, {}, &io_out, _, &compressed_size));
-  EXPECT_LE(compressed_size, 300u);
-  EXPECT_SLIGHTLY_BELOW(
-      ButteraugliDistance(io.frames, io_out.frames, ButteraugliParams(),
-                          *JxlGetDefaultCms(),
-                          /*distmap=*/nullptr),
-      1.6);
-}
-
-TEST(ModularTest, RoundtripExtraProperties) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  constexpr size_t kSize = 250;
-  JXL_TEST_ASSIGN_OR_DIE(Image image,
-                         Image::Create(memory_manager, kSize, kSize,
-                                       /*bitdepth=*/8, 3));
-  ModularOptions options;
-  options.max_properties = 4;
-  options.predictor = Predictor::Zero;
-  Rng rng(0);
-  for (size_t y = 0; y < kSize; y++) {
-    for (size_t x = 0; x < kSize; x++) {
-      image.channel[0].plane.Row(y)[x] = image.channel[2].plane.Row(y)[x] =
-          rng.UniformU(0, 9);
-    }
-  }
-  ZeroFillImage(&image.channel[1].plane);
-  BitWriter writer{memory_manager};
-  ASSERT_TRUE(ModularGenericCompress(image, options, &writer));
-  writer.ZeroPadToByte();
-  JXL_TEST_ASSIGN_OR_DIE(Image decoded,
-                         Image::Create(memory_manager, kSize, kSize,
-                                       /*bitdepth=*/8, image.channel.size()));
-  for (size_t i = 0; i < image.channel.size(); i++) {
-    const Channel& ch = image.channel[i];
-    JXL_TEST_ASSIGN_OR_DIE(
-        decoded.channel[i],
-        Channel::Create(memory_manager, ch.w, ch.h, ch.hshift, ch.vshift));
-  }
-  Status status = true;
-  {
-    BitReader reader(writer.GetSpan());
-    BitReaderScopedCloser closer(reader, status);
-    ASSERT_TRUE(ModularGenericDecompress(&reader, decoded, /*header=*/nullptr,
-                                         /*group_id=*/0, &options));
-  }
-  ASSERT_TRUE(status);
-  ASSERT_EQ(image.channel.size(), decoded.channel.size());
-  for (size_t c = 0; c < image.channel.size(); c++) {
-    for (size_t y = 0; y < image.channel[c].plane.ysize(); y++) {
-      for (size_t x = 0; x < image.channel[c].plane.xsize(); x++) {
-        EXPECT_EQ(image.channel[c].plane.Row(y)[x],
-                  decoded.channel[c].plane.Row(y)[x])
-            << "c = " << c << ", x = " << x << ",  y = " << y;
-      }
-    }
-  }
-}
-
-struct RoundtripLosslessConfig {
-  int bitdepth;
-  int responsive;
-};
-class ModularTestParam
-    : public ::testing::TestWithParam<RoundtripLosslessConfig> {};
-
-std::vector<RoundtripLosslessConfig> GenerateLosslessTests() {
-  std::vector<RoundtripLosslessConfig> all;
-  for (int responsive = 0; responsive <= 1; responsive++) {
-    for (int bitdepth = 1; bitdepth < 32; bitdepth++) {
-      if (responsive && bitdepth > 30) continue;
-      all.push_back({bitdepth, responsive});
-    }
-  }
-  return all;
-}
-std::string LosslessTestDescription(
-    const testing::TestParamInfo<ModularTestParam::ParamType>& info) {
-  std::stringstream name;
-  name << info.param.bitdepth << "bit";
-  if (info.param.responsive) name << "Squeeze";
-  return name.str();
-}
-
-JXL_GTEST_INSTANTIATE_TEST_SUITE_P(RoundtripLossless, ModularTestParam,
-                                   testing::ValuesIn(GenerateLosslessTests()),
-                                   LosslessTestDescription);
-
-TEST_P(ModularTestParam, RoundtripLossless) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  RoundtripLosslessConfig config = GetParam();
-  int bitdepth = config.bitdepth;
-  int responsive = config.responsive;
-
-  Rng generator(123);
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  extras::PackedPixelFile ppf1;
-  ASSERT_TRUE(DecodeBytes(Bytes(orig), extras::ColorHints(), &ppf1));
-
-  // vary the dimensions a bit, in case of bugs related to
-  // even vs odd width or height.
-  size_t xsize = 423 + bitdepth;
-  size_t ysize = 467 + bitdepth;
-
-  CodecInOut io{memory_manager};
-  ASSERT_TRUE(io.SetSize(xsize, ysize));
-  io.metadata.m.color_encoding = jxl::ColorEncoding::SRGB(false);
-  io.metadata.m.SetUintSamples(bitdepth);
-
-  double factor = ((1lu << bitdepth) - 1lu);
-  double ifactor = 1.0 / factor;
-  JXL_TEST_ASSIGN_OR_DIE(Image3F noise_added,
-                         Image3F::Create(memory_manager, xsize, ysize));
-
-  for (size_t c = 0; c < 3; c++) {
-    for (size_t y = 0; y < ysize; y++) {
-      float* out = noise_added.PlaneRow(c, y);
-      for (size_t x = 0; x < xsize; x++) {
-        // make the least significant bits random
-        float f = *ppf1.frames[0].color.const_pixels(y, x, c) +
-                  generator.UniformF(0.0f, 1.f / 255.f);
-        if (f > 1.f) f = 1.f;
-        // quantize to the bitdepth we're testing
-        unsigned int u = static_cast<unsigned int>(std::lround(f * factor));
-        out[x] = u * ifactor;
-      }
-    }
-  }
-  ASSERT_TRUE(
-      io.SetFromImage(std::move(noise_added), jxl::ColorEncoding::SRGB(false)));
-
-  CompressParams cparams;
-  cparams.modular_mode = true;
-  cparams.color_transform = jxl::ColorTransform::kNone;
-  cparams.butteraugli_distance = 0.f;
-  cparams.options.predictor = {Predictor::Zero};
-  cparams.speed_tier = SpeedTier::kThunder;
-  cparams.responsive = responsive;
-  CodecInOut io2{memory_manager};
-  size_t compressed_size;
-  JXL_EXPECT_OK(Roundtrip(&io, cparams, {}, &io2, _, &compressed_size));
-  EXPECT_LE(compressed_size, bitdepth * xsize * ysize / 3.0 * 1.1);
-  EXPECT_LE(0, ComputeDistance2(io.Main(), io2.Main(), *JxlGetDefaultCms()));
-  size_t different = 0;
-  for (size_t c = 0; c < 3; c++) {
-    for (size_t y = 0; y < ysize; y++) {
-      const float* in = io.Main().color()->PlaneRow(c, y);
-      const float* out = io2.Main().color()->PlaneRow(c, y);
-      for (size_t x = 0; x < xsize; x++) {
-        uint32_t uin = std::lroundf(in[x] * factor);
-        uint32_t uout = std::lroundf(out[x] * factor);
-        // check that the integer values are identical
-        if (uin != uout) different++;
-      }
-    }
-  }
-  EXPECT_EQ(different, 0);
-}
-
-TEST(ModularTest, RoundtripLosslessCustomFloat) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  CodecInOut io{memory_manager};
-  size_t xsize = 100;
-  size_t ysize = 300;
-  ASSERT_TRUE(io.SetSize(xsize, ysize));
-  io.metadata.m.bit_depth.bits_per_sample = 18;
-  io.metadata.m.bit_depth.exponent_bits_per_sample = 6;
-  io.metadata.m.bit_depth.floating_point_sample = true;
-  io.metadata.m.modular_16_bit_buffer_sufficient = false;
-  ColorEncoding color_encoding;
-  color_encoding.Tf().SetTransferFunction(TransferFunction::kLinear);
-  color_encoding.SetColorSpace(ColorSpace::kRGB);
-  JXL_TEST_ASSIGN_OR_DIE(Image3F testimage,
-                         Image3F::Create(memory_manager, xsize, ysize));
-  float factor = 1.f / (1 << 14);
-  for (size_t c = 0; c < 3; c++) {
-    for (size_t y = 0; y < ysize; y++) {
-      float* const JXL_RESTRICT row = testimage.PlaneRow(c, y);
-      for (size_t x = 0; x < xsize; x++) {
-        row[x] = factor * (x ^ y);
-      }
-    }
-  }
-  ASSERT_TRUE(io.SetFromImage(std::move(testimage), color_encoding));
-  io.metadata.m.color_encoding = color_encoding;
-  io.metadata.m.SetIntensityTarget(255);
-
-  CompressParams cparams;
-  cparams.modular_mode = true;
-  cparams.color_transform = jxl::ColorTransform::kNone;
-  cparams.butteraugli_distance = 0.f;
-  cparams.options.predictor = {Predictor::Zero};
-  cparams.speed_tier = SpeedTier::kThunder;
-  cparams.decoding_speed_tier = 2;
-
-  CodecInOut io2{memory_manager};
-  size_t compressed_size;
-  JXL_EXPECT_OK(Roundtrip(&io, cparams, {}, &io2, _, &compressed_size));
-  EXPECT_LE(compressed_size, 23000u);
-  JXL_EXPECT_OK(SamePixels(*io.Main().color(), *io2.Main().color(), _));
-}
-
-void WriteHeaders(BitWriter* writer, size_t xsize, size_t ysize) {
-  ASSERT_TRUE(writer->WithMaxBits(16, LayerType::Header, nullptr, [&] {
-    writer->Write(8, 0xFF);
-    writer->Write(8, kCodestreamMarker);
-    return true;
-  }));
-  CodecMetadata metadata;
-  EXPECT_TRUE(metadata.size.Set(xsize, ysize));
-  EXPECT_TRUE(
-      WriteSizeHeader(metadata.size, writer, LayerType::Header, nullptr));
-  metadata.m.color_encoding = ColorEncoding::LinearSRGB(/*is_gray=*/true);
-  metadata.m.xyb_encoded = false;
-  metadata.m.SetUintSamples(31);
-  EXPECT_TRUE(
-      WriteImageMetadata(metadata.m, writer, LayerType::Header, nullptr));
-  metadata.transform_data.nonserialized_xyb_encoded = metadata.m.xyb_encoded;
-  EXPECT_TRUE(Bundle::Write(metadata.transform_data, writer, LayerType::Header,
-                            nullptr));
-  writer->ZeroPadToByte();
-  FrameHeader frame_header(&metadata);
-  frame_header.encoding = FrameEncoding::kModular;
-  frame_header.loop_filter.gab = false;
-  frame_header.loop_filter.epf_iters = 0;
-  EXPECT_TRUE(WriteFrameHeader(frame_header, writer, nullptr));
-}
-
-// Tree with single node, zero predictor, offset is 1 and multiplier is 1,
-// entropy code is prefix tree with alphabet size 256 and all bits lengths 8.
-void WriteHistograms(BitWriter* writer) {
-  writer->Write(1, 1);  // default DC quant
-  writer->Write(1, 1);  // has_tree
-  // tree histograms
-  writer->Write(1, 0);         // LZ77 disabled
-  writer->Write(3, 1);         // simple context map
-  writer->Write(1, 1);         // prefix code
-  writer->Write(7, 0x63);      // UnintConfig(3, 2, 1)
-  writer->Write(12, 0xfef);    // alphabet_size = 256
-  writer->Write(32, 0x10003);  // all bit lengths 8
-  // tree tokens
-  writer->Write(8, 0);   // tree leaf
-  writer->Write(8, 0);   // zero predictor
-  writer->Write(8, 64);  // offset = UnpackSigned(ReverseBits(64)) = 1
-  writer->Write(16, 0);  // multiplier = 1
-  // histograms
-  writer->Write(1, 0);         // LZ77 disabled
-  writer->Write(1, 1);         // prefix code
-  writer->Write(7, 0x63);      // UnintConfig(3, 2, 1)
-  writer->Write(12, 0xfef);    // alphabet_size = 256
-  writer->Write(32, 0x10003);  // all bit lengths 8
-}
-
-TEST(ModularTest, PredictorIntegerOverflow) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const size_t xsize = 1;
-  const size_t ysize = 1;
-  BitWriter writer{memory_manager};
-  WriteHeaders(&writer, xsize, ysize);
-  std::vector<std::unique_ptr<BitWriter>> group_codes;
-  group_codes.emplace_back(jxl::make_unique<BitWriter>(memory_manager));
-  {
-    std::unique_ptr<BitWriter>& bw = group_codes[0];
-    ASSERT_TRUE(bw->WithMaxBits(1 << 20, LayerType::Header, nullptr, [&] {
-      WriteHistograms(bw.get());
-      GroupHeader header;
-      header.use_global_tree = true;
-      EXPECT_TRUE(Bundle::Write(header, bw.get(), LayerType::Header, nullptr));
-      // After UnpackSigned this becomes (1 << 31) - 1, the largest pixel_type,
-      // and after adding the offset we get -(1 << 31).
-      bw->Write(8, 119);
-      bw->Write(28, 0xfffffff);
-      bw->ZeroPadToByte();
-      return true;
-    }));
-  }
-  EXPECT_TRUE(WriteGroupOffsets(group_codes, {}, &writer, nullptr));
-  ASSERT_TRUE(writer.AppendByteAligned(group_codes));
-
-  PaddedBytes compressed = std::move(writer).TakeBytes();
-  extras::PackedPixelFile ppf;
-  extras::JXLDecompressParams params;
-  params.accepted_formats.push_back({1, JXL_TYPE_FLOAT, JXL_NATIVE_ENDIAN, 0});
-  EXPECT_TRUE(DecodeImageJXL(compressed.data(), compressed.size(), params,
-                             nullptr, &ppf));
-  ASSERT_EQ(1, ppf.frames.size());
-  const auto& img = ppf.frames[0].color;
-  const auto* pixels = reinterpret_cast<const float*>(img.pixels());
-  EXPECT_EQ(-1.0f, pixels[0]);
-}
-
-TEST(ModularTest, UnsqueezeIntegerOverflow) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  // Image width is 9 so we can test both the SIMD and non-vector code paths.
-  const size_t xsize = 9;
-  const size_t ysize = 2;
-  BitWriter writer{memory_manager};
-  WriteHeaders(&writer, xsize, ysize);
-  std::vector<std::unique_ptr<BitWriter>> group_codes;
-  group_codes.emplace_back(jxl::make_unique<BitWriter>(memory_manager));
-  {
-    std::unique_ptr<BitWriter>& bw = group_codes[0];
-    ASSERT_TRUE(bw->WithMaxBits(1 << 20, LayerType::Header, nullptr, [&] {
-      WriteHistograms(bw.get());
-      GroupHeader header;
-      header.use_global_tree = true;
-      header.transforms.emplace_back();
-      header.transforms[0].id = TransformId::kSqueeze;
-      SqueezeParams params;
-      params.horizontal = false;
-      params.in_place = true;
-      params.begin_c = 0;
-      params.num_c = 1;
-      header.transforms[0].squeezes.emplace_back(params);
-      EXPECT_TRUE(Bundle::Write(header, bw.get(), LayerType::Header, nullptr));
-      for (size_t i = 0; i < xsize * ysize; ++i) {
-        // After UnpackSigned and adding offset, this becomes (1 << 31) - 1,
-        // both in the image and in the residual channels, and unsqueeze makes
-        // them ~(3 << 30) and (1 << 30) (in pixel_type_w) and the first wraps
-        // around to about -(1 << 30).
-        bw->Write(8, 119);
-        bw->Write(28, 0xffffffe);
-      }
-      bw->ZeroPadToByte();
-      return true;
-    }));
-  }
-  EXPECT_TRUE(WriteGroupOffsets(group_codes, {}, &writer, nullptr));
-  ASSERT_TRUE(writer.AppendByteAligned(group_codes));
-
-  PaddedBytes compressed = std::move(writer).TakeBytes();
-  extras::PackedPixelFile ppf;
-  extras::JXLDecompressParams params;
-  params.accepted_formats.push_back({1, JXL_TYPE_FLOAT, JXL_NATIVE_ENDIAN, 0});
-  EXPECT_TRUE(DecodeImageJXL(compressed.data(), compressed.size(), params,
-                             nullptr, &ppf));
-  ASSERT_EQ(1, ppf.frames.size());
-  const auto& img = ppf.frames[0].color;
-  const float* pixels = reinterpret_cast<const float*>(img.pixels());
-  for (size_t x = 0; x < xsize; ++x) {
-    EXPECT_NEAR(-0.5f, pixels[x], 1e-10);
-    EXPECT_NEAR(0.5f, pixels[xsize + x], 1e-10);
-  }
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/noise.h b/third_party/jpeg-xl/lib/jxl/noise.h
deleted file mode 100644
index c588c59d33941..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/noise.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_NOISE_H_
-#define LIB_JXL_NOISE_H_
-
-// Noise parameters shared by encoder/decoder.
-
-#include <stddef.h>
-
-#include <algorithm>
-#include <array>
-#include <cmath>
-#include <utility>
-
-#include "lib/jxl/base/compiler_specific.h"
-
-namespace jxl {
-
-const float kNoisePrecision = 1 << 10;
-
-struct NoiseParams {
-  // LUT index is an intensity of pixel / mean intensity of patch
-  static constexpr size_t kNumNoisePoints = 8;
-  using Lut = std::array<float, kNumNoisePoints>;
-
-  Lut lut;
-
-  void Clear() {
-    for (float& i : lut) i = 0.f;
-  }
-  bool HasAny() const {
-    for (float i : lut) {
-      if (std::abs(i) > 1e-3f) return true;
-    }
-    return false;
-  }
-};
-
-static inline std::pair<int, float> IndexAndFrac(float x) {
-  constexpr size_t kScaleNumerator = NoiseParams::kNumNoisePoints - 2;
-  // TODO(user): instead of 1, this should be a proper Y range.
-  constexpr float kScale = kScaleNumerator / 1.0f;
-  float scaled_x = std::max(0.f, x * kScale);
-  float floor_x;
-  float frac_x = std::modf(scaled_x, &floor_x);
-  if (JXL_UNLIKELY(scaled_x >= kScaleNumerator + 1)) {
-    floor_x = kScaleNumerator;
-    frac_x = 1.f;
-  }
-  return std::make_pair(static_cast<int>(floor_x), frac_x);
-}
-
-struct NoiseLevel {
-  float noise_level;
-  float intensity;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_NOISE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/opsin_image_test.cc b/third_party/jpeg-xl/lib/jxl/opsin_image_test.cc
deleted file mode 100644
index a00df6b8b8dd8..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/opsin_image_test.cc
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/cms.h>
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <utility>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/matrix_ops.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/cms/opsin_params.h"
-#include "lib/jxl/dec_xyb.h"
-#include "lib/jxl/enc_xyb.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/opsin_params.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-// Convert a single linear sRGB color to xyb, using the exact image conversion
-// procedure that jpeg xl uses.
-void LinearSrgbToOpsin(float rgb_r, float rgb_g, float rgb_b,
-                       float* JXL_RESTRICT xyb_x, float* JXL_RESTRICT xyb_y,
-                       float* JXL_RESTRICT xyb_b) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  JXL_TEST_ASSIGN_OR_DIE(Image3F linear, Image3F::Create(memory_manager, 1, 1));
-  linear.PlaneRow(0, 0)[0] = rgb_r;
-  linear.PlaneRow(1, 0)[0] = rgb_g;
-  linear.PlaneRow(2, 0)[0] = rgb_b;
-
-  ImageMetadata metadata;
-  metadata.SetFloat32Samples();
-  metadata.color_encoding = ColorEncoding::LinearSRGB();
-  ImageBundle ib(memory_manager, &metadata);
-  ASSERT_TRUE(ib.SetFromImage(std::move(linear), metadata.color_encoding));
-  JXL_TEST_ASSIGN_OR_DIE(Image3F opsin, Image3F::Create(memory_manager, 1, 1));
-  (void)ToXYB(ib, /*pool=*/nullptr, &opsin, *JxlGetDefaultCms());
-
-  *xyb_x = opsin.PlaneRow(0, 0)[0];
-  *xyb_y = opsin.PlaneRow(1, 0)[0];
-  *xyb_b = opsin.PlaneRow(2, 0)[0];
-}
-
-// Convert a single XYB color to linear sRGB, using the exact image conversion
-// procedure that jpeg xl uses.
-void OpsinToLinearSrgb(float xyb_x, float xyb_y, float xyb_b,
-                       float* JXL_RESTRICT rgb_r, float* JXL_RESTRICT rgb_g,
-                       float* JXL_RESTRICT rgb_b) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  JXL_TEST_ASSIGN_OR_DIE(Image3F opsin, Image3F::Create(memory_manager, 1, 1));
-  opsin.PlaneRow(0, 0)[0] = xyb_x;
-  opsin.PlaneRow(1, 0)[0] = xyb_y;
-  opsin.PlaneRow(2, 0)[0] = xyb_b;
-  JXL_TEST_ASSIGN_OR_DIE(Image3F linear, Image3F::Create(memory_manager, 1, 1));
-  OpsinParams opsin_params;
-  opsin_params.Init(/*intensity_target=*/255.0f);
-  ASSERT_TRUE(
-      OpsinToLinear(opsin, Rect(opsin), nullptr, &linear, opsin_params));
-  *rgb_r = linear.PlaneRow(0, 0)[0];
-  *rgb_g = linear.PlaneRow(1, 0)[0];
-  *rgb_b = linear.PlaneRow(2, 0)[0];
-}
-
-void OpsinRoundtripTestRGB(float r, float g, float b) {
-  float xyb_x;
-  float xyb_y;
-  float xyb_b;
-  LinearSrgbToOpsin(r, g, b, &xyb_x, &xyb_y, &xyb_b);
-  float r2;
-  float g2;
-  float b2;
-  OpsinToLinearSrgb(xyb_x, xyb_y, xyb_b, &r2, &g2, &b2);
-  EXPECT_NEAR(r, r2, 1e-3);
-  EXPECT_NEAR(g, g2, 1e-3);
-  EXPECT_NEAR(b, b2, 1e-3);
-}
-
-TEST(OpsinImageTest, VerifyOpsinAbsorbanceInverseMatrix) {
-  Matrix3x3 matrix;  // writable copy
-  matrix = GetOpsinAbsorbanceInverseMatrix();
-  EXPECT_TRUE(Inv3x3Matrix(matrix));
-  for (int j = 0; j < 3; j++) {
-    for (int i = 0; i < 3; i++) {
-      EXPECT_NEAR(matrix[j][i], jxl::cms::kOpsinAbsorbanceMatrix[j][i], 1e-6);
-    }
-  }
-}
-
-TEST(OpsinImageTest, OpsinRoundtrip) {
-  OpsinRoundtripTestRGB(0, 0, 0);
-  OpsinRoundtripTestRGB(1. / 255, 1. / 255, 1. / 255);
-  OpsinRoundtripTestRGB(128. / 255, 128. / 255, 128. / 255);
-  OpsinRoundtripTestRGB(1, 1, 1);
-
-  OpsinRoundtripTestRGB(0, 0, 1. / 255);
-  OpsinRoundtripTestRGB(0, 0, 128. / 255);
-  OpsinRoundtripTestRGB(0, 0, 1);
-
-  OpsinRoundtripTestRGB(0, 1. / 255, 0);
-  OpsinRoundtripTestRGB(0, 128. / 255, 0);
-  OpsinRoundtripTestRGB(0, 1, 0);
-
-  OpsinRoundtripTestRGB(1. / 255, 0, 0);
-  OpsinRoundtripTestRGB(128. / 255, 0, 0);
-  OpsinRoundtripTestRGB(1, 0, 0);
-}
-
-TEST(OpsinImageTest, VerifyZero) {
-  // Test that black color (zero energy) is 0,0,0 in xyb.
-  float x;
-  float y;
-  float b;
-  LinearSrgbToOpsin(0, 0, 0, &x, &y, &b);
-  EXPECT_NEAR(0, x, 1e-9);
-  EXPECT_NEAR(0, y, 1e-7);
-  EXPECT_NEAR(0, b, 1e-7);
-}
-
-TEST(OpsinImageTest, VerifyGray) {
-  // Test that grayscale colors have a fixed y/b ratio and x==0.
-  for (size_t i = 1; i < 255; i++) {
-    float x;
-    float y;
-    float b;
-    LinearSrgbToOpsin(i / 255., i / 255., i / 255., &x, &y, &b);
-    EXPECT_NEAR(0, x, 1e-6);
-    EXPECT_NEAR(jxl::cms::kYToBRatio, b / y, 3e-5);
-  }
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/opsin_inverse_test.cc b/third_party/jpeg-xl/lib/jxl/opsin_inverse_test.cc
deleted file mode 100644
index aa1ae384c6b68..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/opsin_inverse_test.cc
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/cms.h>
-#include <jxl/memory_manager.h>
-
-#include <utility>
-
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/codec_in_out.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/dec_xyb.h"
-#include "lib/jxl/enc_xyb.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/image_test_utils.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-TEST(OpsinInverseTest, LinearInverseInverts) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  JXL_TEST_ASSIGN_OR_DIE(Image3F linear,
-                         Image3F::Create(memory_manager, 128, 128));
-  RandomFillImage(&linear, 0.0f, 1.0f);
-
-  CodecInOut io{memory_manager};
-  io.metadata.m.SetFloat32Samples();
-  io.metadata.m.color_encoding = ColorEncoding::LinearSRGB();
-  JXL_TEST_ASSIGN_OR_DIE(Image3F linear2,
-                         Image3F::Create(memory_manager, 128, 128));
-  ASSERT_TRUE(CopyImageTo(linear, &linear2));
-  ASSERT_TRUE(
-      io.SetFromImage(std::move(linear2), io.metadata.m.color_encoding));
-  ThreadPool* null_pool = nullptr;
-  JXL_TEST_ASSIGN_OR_DIE(
-      Image3F opsin, Image3F::Create(memory_manager, io.xsize(), io.ysize()));
-  (void)ToXYB(io.Main(), null_pool, &opsin, *JxlGetDefaultCms());
-
-  OpsinParams opsin_params;
-  opsin_params.Init(/*intensity_target=*/255.0f);
-  ASSERT_TRUE(OpsinToLinearInplace(&opsin, /*pool=*/nullptr, opsin_params));
-
-  JXL_TEST_ASSERT_OK(VerifyRelativeError(linear, opsin, 3E-3, 2E-4, _));
-}
-
-TEST(OpsinInverseTest, YcbCrInverts) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  JXL_TEST_ASSIGN_OR_DIE(Image3F rgb,
-                         Image3F::Create(memory_manager, 128, 128));
-  RandomFillImage(&rgb, 0.0f, 1.0f);
-
-  ThreadPool* null_pool = nullptr;
-  JXL_TEST_ASSIGN_OR_DIE(
-      Image3F ycbcr, Image3F::Create(memory_manager, rgb.xsize(), rgb.ysize()));
-  EXPECT_TRUE(RgbToYcbcr(rgb.Plane(0), rgb.Plane(1), rgb.Plane(2),
-                         &ycbcr.Plane(1), &ycbcr.Plane(0), &ycbcr.Plane(2),
-                         null_pool));
-
-  JXL_TEST_ASSIGN_OR_DIE(
-      Image3F rgb2, Image3F::Create(memory_manager, rgb.xsize(), rgb.ysize()));
-  YcbcrToRgb(ycbcr, &rgb2, Rect(rgb));
-
-  JXL_TEST_ASSERT_OK(VerifyRelativeError(rgb, rgb2, 4E-5, 4E-7, _));
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/opsin_params.cc b/third_party/jpeg-xl/lib/jxl/opsin_params.cc
deleted file mode 100644
index 8aae4e3597f64..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/opsin_params.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/opsin_params.h"
-
-#include "lib/jxl/cms/opsin_params.h"
-
-#define INVERSE_OPSIN_FROM_SPEC 1
-
-#include "lib/jxl/base/matrix_ops.h"
-
-namespace jxl {
-
-const Matrix3x3& GetOpsinAbsorbanceInverseMatrix() {
-#if INVERSE_OPSIN_FROM_SPEC
-  return jxl::cms::DefaultInverseOpsinAbsorbanceMatrix();
-#else   // INVERSE_OPSIN_FROM_SPEC
-  // Compute the inverse opsin matrix from the forward matrix. Less precise
-  // than taking the values from the specification, but must be used if the
-  // forward transform is changed and the spec will require updating.
-  static const Matrix3x3 const kInverse = [] {
-    static Matrix3x3 inverse = kOpsinAbsorbanceMatrix;
-    Inv3x3Matrix(inverse);
-    return inverse;
-  }();
-  return kInverse;
-#endif  // INVERSE_OPSIN_FROM_SPEC
-}
-
-void InitSIMDInverseMatrix(const Matrix3x3& inverse,
-                           float* JXL_RESTRICT simd_inverse,
-                           float intensity_target) {
-  for (size_t j = 0; j < 3; ++j) {
-    for (size_t i = 0; i < 3; ++i) {
-      size_t idx = (j * 3 + i) * 4;
-      simd_inverse[idx] = simd_inverse[idx + 1] = simd_inverse[idx + 2] =
-          simd_inverse[idx + 3] = inverse[j][i] * (255.0f / intensity_target);
-    }
-  }
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/opsin_params.h b/third_party/jpeg-xl/lib/jxl/opsin_params.h
deleted file mode 100644
index 4ed2124fd7174..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/opsin_params.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_OPSIN_PARAMS_H_
-#define LIB_JXL_OPSIN_PARAMS_H_
-
-// Constants that define the XYB color space.
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/matrix_ops.h"
-
-namespace jxl {
-
-// Returns 3x3 row-major matrix inverse of kOpsinAbsorbanceMatrix.
-// opsin_image_test verifies this is actually the inverse.
-const Matrix3x3& GetOpsinAbsorbanceInverseMatrix();
-
-void InitSIMDInverseMatrix(const Matrix3x3& inverse,
-                           float* JXL_RESTRICT simd_inverse,
-                           float intensity_target);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_OPSIN_PARAMS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/pack_signed.h b/third_party/jpeg-xl/lib/jxl/pack_signed.h
deleted file mode 100644
index 326f06e6f8709..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/pack_signed.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_PACK_H_
-#define LIB_JXL_PACK_H_
-
-// Pack/UnpackSigned utilities.
-
-#include <cstddef>
-#include <cstdint>
-
-#include "lib/jxl/base/compiler_specific.h"
-
-namespace jxl {
-// Encodes non-negative (X) into (2 * X), negative (-X) into (2 * X - 1)
-constexpr uint32_t PackSigned(int32_t value)
-    JXL_NO_SANITIZE("unsigned-integer-overflow") {
-  return (static_cast<uint32_t>(value) << 1) ^
-         ((static_cast<uint32_t>(~value) >> 31) - 1);
-}
-
-// Reverse to PackSigned, i.e. UnpackSigned(PackSigned(X)) == X.
-// (((~value) & 1) - 1) is either 0 or 0xFF...FF and it will have an expected
-// unsigned-integer-overflow.
-constexpr intptr_t UnpackSigned(size_t value)
-    JXL_NO_SANITIZE("unsigned-integer-overflow") {
-  return static_cast<intptr_t>((value >> 1) ^ (((~value) & 1) - 1));
-}
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_PACK_H_
diff --git a/third_party/jpeg-xl/lib/jxl/padded_bytes.h b/third_party/jpeg-xl/lib/jxl/padded_bytes.h
deleted file mode 100644
index 826b79d21d658..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/padded_bytes.h
+++ /dev/null
@@ -1,205 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_BASE_PADDED_BYTES_H_
-#define LIB_JXL_BASE_PADDED_BYTES_H_
-
-// std::vector replacement with padding to reduce bounds checks in WriteBits
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>  // max
-#include <cstddef>
-#include <cstdint>
-#include <cstring>  // memcpy
-#include <initializer_list>
-#include <utility>  // swap
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/memory_manager_internal.h"
-
-namespace jxl {
-
-// Provides a subset of the std::vector interface with some differences:
-// - allows BitWriter to write 64 bits at a time without bounds checking;
-// - ONLY zero-initializes the first byte (required by BitWriter);
-// - ensures cache-line alignment.
-class PaddedBytes {
- public:
-  // Required for output params.
-  explicit PaddedBytes(JxlMemoryManager* memory_manager)
-      : memory_manager_(memory_manager), size_(0), capacity_(0) {}
-
-  static StatusOr<PaddedBytes> WithInitialSpace(
-      JxlMemoryManager* memory_manager, size_t size) {
-    PaddedBytes result(memory_manager);
-    JXL_RETURN_IF_ERROR(result.Init(size));
-    return result;
-  }
-
-  // Deleting copy constructor and copy assignment operator to prevent copying
-  PaddedBytes(const PaddedBytes&) = delete;
-  PaddedBytes& operator=(const PaddedBytes&) = delete;
-
-  // default is not OK - need to set other.size_ to 0!
-  PaddedBytes(PaddedBytes&& other) noexcept
-      : memory_manager_(other.memory_manager_),
-        size_(other.size_),
-        capacity_(other.capacity_),
-        data_(std::move(other.data_)) {
-    other.size_ = other.capacity_ = 0;
-  }
-  PaddedBytes& operator=(PaddedBytes&& other) noexcept {
-    memory_manager_ = other.memory_manager_;
-    size_ = other.size_;
-    capacity_ = other.capacity_;
-    data_ = std::move(other.data_);
-
-    if (&other != this) {
-      other.size_ = other.capacity_ = 0;
-    }
-    return *this;
-  }
-
-  JxlMemoryManager* memory_manager() const { return memory_manager_; }
-
-  void swap(PaddedBytes& other) noexcept {
-    std::swap(memory_manager_, other.memory_manager_);
-    std::swap(size_, other.size_);
-    std::swap(capacity_, other.capacity_);
-    std::swap(data_, other.data_);
-  }
-
-  // If current capacity is greater than requested, then no-op. Otherwise
-  // copies existing data to newly allocated "data_".
-  // The new capacity will be at least 1.5 times the old capacity. This ensures
-  // that we avoid quadratic behaviour.
-  Status reserve(size_t capacity) {
-    if (capacity <= capacity_) return true;
-
-    size_t new_capacity = std::max(capacity, 3 * capacity_ / 2);
-    new_capacity = std::max<size_t>(64, new_capacity);
-
-    // BitWriter writes up to 7 bytes past the end.
-    JXL_ASSIGN_OR_RETURN(
-        AlignedMemory new_data,
-        AlignedMemory::Create(memory_manager_, new_capacity + 8));
-
-    if (data_.address<void>() == nullptr) {
-      // First allocation: ensure first byte is initialized (won't be copied).
-      new_data.address<uint8_t>()[0] = 0;
-    } else {
-      // Subsequent resize: copy existing data to new location.
-      memmove(new_data.address<void>(), data_.address<void>(), size_);
-      // Ensure that the first new byte is initialized, to allow write_bits to
-      // safely append to the newly-resized PaddedBytes.
-      new_data.address<uint8_t>()[size_] = 0;
-    }
-
-    capacity_ = new_capacity;
-    data_ = std::move(new_data);
-    return true;
-  }
-
-  // NOTE: unlike vector, this does not initialize the new data!
-  // However, we guarantee that write_bits can safely append after
-  // the resize, as we zero-initialize the first new byte of data.
-  // If size < capacity(), does not invalidate the memory.
-  Status resize(size_t size) {
-    JXL_RETURN_IF_ERROR(reserve(size));
-    size_ = size;
-    return true;
-  }
-
-  // resize(size) plus explicit initialization of the new data with `value`.
-  Status resize(size_t size, uint8_t value) {
-    size_t old_size = size_;
-    JXL_RETURN_IF_ERROR(resize(size));
-    if (size_ > old_size) {
-      memset(data() + old_size, value, size_ - old_size);
-    }
-    return true;
-  }
-
-  // Amortized constant complexity due to exponential growth.
-  Status push_back(uint8_t x) {
-    if (size_ == capacity_) {
-      JXL_RETURN_IF_ERROR(reserve(capacity_ + 1));
-    }
-
-    data_.address<uint8_t>()[size_++] = x;
-    return true;
-  }
-
-  size_t size() const { return size_; }
-  size_t capacity() const { return capacity_; }
-
-  uint8_t* data() { return data_.address<uint8_t>(); }
-  const uint8_t* data() const { return data_.address<uint8_t>(); }
-
-  // std::vector operations implemented in terms of the public interface above.
-
-  void clear() {
-    // Not passing on the Status, because resizing to 0 cannot fail.
-    static_cast<void>(resize(0));
-  }
-  bool empty() const { return size() == 0; }
-
-  Status assign(std::initializer_list<uint8_t> il) {
-    JXL_RETURN_IF_ERROR(resize(il.size()));
-    memcpy(data(), il.begin(), il.size());
-    return true;
-  }
-
-  uint8_t* begin() { return data(); }
-  const uint8_t* begin() const { return data(); }
-  uint8_t* end() { return begin() + size(); }
-  const uint8_t* end() const { return begin() + size(); }
-
-  uint8_t& operator[](const size_t i) {
-    BoundsCheck(i);
-    return data()[i];
-  }
-  const uint8_t& operator[](const size_t i) const {
-    BoundsCheck(i);
-    return data()[i];
-  }
-
-  template <typename T>
-  Status append(const T& other) {
-    return append(
-        reinterpret_cast<const uint8_t*>(other.data()),
-        reinterpret_cast<const uint8_t*>(other.data()) + other.size());
-  }
-
-  Status append(const uint8_t* begin, const uint8_t* end) {
-    if (end - begin > 0) {
-      size_t old_size = size();
-      JXL_RETURN_IF_ERROR(resize(size() + (end - begin)));
-      memcpy(data() + old_size, begin, end - begin);
-    }
-    return true;
-  }
-
- private:
-  Status Init(size_t size) {
-    size_ = size;
-    return reserve(size);
-  }
-
-  void BoundsCheck(size_t i) const {
-    // <= is safe due to padding and required by BitWriter.
-    JXL_DASSERT(i <= size());
-  }
-
-  JxlMemoryManager* memory_manager_;
-  size_t size_;
-  size_t capacity_;
-  AlignedMemory data_;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_BASE_PADDED_BYTES_H_
diff --git a/third_party/jpeg-xl/lib/jxl/padded_bytes_test.cc b/third_party/jpeg-xl/lib/jxl/padded_bytes_test.cc
deleted file mode 100644
index b6c7c184f3051..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/padded_bytes_test.cc
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/padded_bytes.h"
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-TEST(PaddedBytesTest, TestNonEmptyFirstByteZero) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  JXL_TEST_ASSIGN_OR_DIE(PaddedBytes pb,
-                         PaddedBytes::WithInitialSpace(memory_manager, 1));
-  EXPECT_EQ(0, pb[0]);
-  // Even after resizing..
-  EXPECT_TRUE(pb.resize(20));
-  EXPECT_EQ(0, pb[0]);
-  // And reserving.
-  EXPECT_TRUE(pb.reserve(200));
-  EXPECT_EQ(0, pb[0]);
-}
-
-TEST(PaddedBytesTest, TestEmptyFirstByteZero) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  JXL_TEST_ASSIGN_OR_DIE(PaddedBytes pb,
-                         PaddedBytes::WithInitialSpace(memory_manager, 0));
-  // After resizing - new zero is written despite there being nothing to copy.
-  ASSERT_TRUE(pb.resize(20));
-  EXPECT_EQ(0, pb[0]);
-}
-
-TEST(PaddedBytesTest, TestFillWithoutReserve) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  PaddedBytes pb{memory_manager};
-  for (size_t i = 0; i < 170u; ++i) {
-    EXPECT_TRUE(pb.push_back(i));
-  }
-  EXPECT_EQ(170u, pb.size());
-  EXPECT_GE(pb.capacity(), 170u);
-}
-
-TEST(PaddedBytesTest, TestFillWithExactReserve) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  PaddedBytes pb{memory_manager};
-  EXPECT_TRUE(pb.reserve(170));
-  for (size_t i = 0; i < 170u; ++i) {
-    EXPECT_TRUE(pb.push_back(i));
-  }
-  EXPECT_EQ(170u, pb.size());
-  EXPECT_EQ(pb.capacity(), 170u);
-}
-
-TEST(PaddedBytesTest, TestFillWithMoreReserve) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  PaddedBytes pb{memory_manager};
-  EXPECT_TRUE(pb.reserve(171));
-  for (size_t i = 0; i < 170u; ++i) {
-    EXPECT_TRUE(pb.push_back(i));
-  }
-  EXPECT_EQ(170u, pb.size());
-  EXPECT_GT(pb.capacity(), 170u);
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/passes_state.cc b/third_party/jpeg-xl/lib/jxl/passes_state.cc
deleted file mode 100644
index be6302bfe6e25..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/passes_state.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/passes_state.h"
-
-#include <jxl/memory_manager.h>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/chroma_from_luma.h"
-#include "lib/jxl/coeff_order.h"
-#include "lib/jxl/frame_dimensions.h"
-
-namespace jxl {
-
-Status InitializePassesSharedState(const FrameHeader& frame_header,
-                                   PassesSharedState* JXL_RESTRICT shared,
-                                   bool encoder) {
-  JXL_ENSURE(frame_header.nonserialized_metadata != nullptr);
-  shared->metadata = frame_header.nonserialized_metadata;
-  shared->frame_dim = frame_header.ToFrameDimensions();
-  shared->image_features.patches.SetShared(&shared->reference_frames);
-
-  const FrameDimensions& frame_dim = shared->frame_dim;
-  JxlMemoryManager* memory_manager = shared->memory_manager;
-
-  JXL_ASSIGN_OR_RETURN(
-      shared->ac_strategy,
-      AcStrategyImage::Create(memory_manager, frame_dim.xsize_blocks,
-                              frame_dim.ysize_blocks));
-  JXL_ASSIGN_OR_RETURN(shared->raw_quant_field,
-                       ImageI::Create(memory_manager, frame_dim.xsize_blocks,
-                                      frame_dim.ysize_blocks));
-  JXL_ASSIGN_OR_RETURN(shared->epf_sharpness,
-                       ImageB::Create(memory_manager, frame_dim.xsize_blocks,
-                                      frame_dim.ysize_blocks));
-  JXL_ASSIGN_OR_RETURN(
-      shared->cmap, ColorCorrelationMap::Create(memory_manager, frame_dim.xsize,
-                                                frame_dim.ysize));
-
-  // In the decoder, we allocate coeff orders afterwards, when we know how many
-  // we will actually need.
-  shared->coeff_order_size = kCoeffOrderMaxSize;
-  if (encoder &&
-      shared->coeff_orders.size() <
-          frame_header.passes.num_passes * kCoeffOrderMaxSize &&
-      frame_header.encoding == FrameEncoding::kVarDCT) {
-    shared->coeff_orders.resize(frame_header.passes.num_passes *
-                                kCoeffOrderMaxSize);
-  }
-
-  JXL_ASSIGN_OR_RETURN(shared->quant_dc,
-                       ImageB::Create(memory_manager, frame_dim.xsize_blocks,
-                                      frame_dim.ysize_blocks));
-
-  bool use_dc_frame = ((frame_header.flags & FrameHeader::kUseDcFrame) != 0u);
-  if (!encoder && use_dc_frame) {
-    if (frame_header.dc_level == 4) {
-      return JXL_FAILURE("Invalid DC level for kUseDcFrame: %u",
-                         frame_header.dc_level);
-    }
-    shared->dc_storage = Image3F();
-    shared->dc = &shared->dc_frames[frame_header.dc_level];
-    if (shared->dc->xsize() == 0) {
-      return JXL_FAILURE(
-          "kUseDcFrame specified for dc_level %u, but no frame was decoded "
-          "with level %u",
-          frame_header.dc_level, frame_header.dc_level + 1);
-    }
-    ZeroFillImage(&shared->quant_dc);
-  } else {
-    JXL_ASSIGN_OR_RETURN(shared->dc_storage,
-                         Image3F::Create(memory_manager, frame_dim.xsize_blocks,
-                                         frame_dim.ysize_blocks));
-    shared->dc = &shared->dc_storage;
-  }
-
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/passes_state.h b/third_party/jpeg-xl/lib/jxl/passes_state.h
deleted file mode 100644
index f3951583c566e..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/passes_state.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_PASSES_STATE_H_
-#define LIB_JXL_PASSES_STATE_H_
-
-#include <jxl/memory_manager.h>
-
-#include <array>
-#include <cstddef>
-#include <vector>
-
-#include "lib/jxl/ac_context.h"
-#include "lib/jxl/ac_strategy.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/chroma_from_luma.h"
-#include "lib/jxl/coeff_order_fwd.h"
-#include "lib/jxl/dec_patch_dictionary.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/noise.h"
-#include "lib/jxl/quant_weights.h"
-#include "lib/jxl/quantizer.h"
-#include "lib/jxl/splines.h"
-
-// Structures that hold the (en/de)coder state for a JPEG XL kVarDCT
-// (en/de)coder.
-
-namespace jxl {
-
-struct ImageFeatures {
-  explicit ImageFeatures(JxlMemoryManager* memory_manager_)
-      : patches(memory_manager_) {}
-  NoiseParams noise_params;
-  PatchDictionary patches;
-  Splines splines;
-};
-
-// State common to both encoder and decoder.
-// NOLINTNEXTLINE(clang-analyzer-optin.performance.Padding)
-struct PassesSharedState {
-  explicit PassesSharedState(JxlMemoryManager* memory_manager_)
-      : memory_manager(memory_manager_), image_features(memory_manager_) {
-    for (auto& reference_frame : reference_frames) {
-      reference_frame.frame = jxl::make_unique<ImageBundle>(memory_manager_);
-    }
-  }
-
-  JxlMemoryManager* memory_manager;
-  const CodecMetadata* metadata;
-
-  FrameDimensions frame_dim;
-
-  // Control fields and parameters.
-  AcStrategyImage ac_strategy;
-
-  // Dequant matrices + quantizer.
-  DequantMatrices matrices;
-  Quantizer quantizer{matrices};
-  ImageI raw_quant_field;
-
-  // Per-block side information for EPF detail preservation.
-  ImageB epf_sharpness;
-
-  ColorCorrelationMap cmap;
-
-  ImageFeatures image_features;
-
-  // Memory area for storing coefficient orders.
-  // `coeff_order_size` is the size used by *one* set of coefficient orders (at
-  // most kMaxCoeffOrderSize). A set of coefficient orders is present for each
-  // pass.
-  size_t coeff_order_size = 0;
-  std::vector<coeff_order_t> coeff_orders;
-
-  // Decoder-side DC and quantized DC.
-  ImageB quant_dc;
-  Image3F dc_storage;
-  const Image3F* JXL_RESTRICT dc = &dc_storage;
-
-  BlockCtxMap block_ctx_map;
-
-  Image3F dc_frames[4];
-
-  std::array<ReferceFrame, 4> reference_frames;
-
-  // Number of pre-clustered set of histograms (with the same ctx map), per
-  // pass. Encoded as num_histograms_ - 1.
-  size_t num_histograms = 0;
-};
-
-// Initialized the state information that is shared between encoder and decoder.
-Status InitializePassesSharedState(const FrameHeader& frame_header,
-                                   PassesSharedState* JXL_RESTRICT shared,
-                                   bool encoder = false);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_PASSES_STATE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/passes_test.cc b/third_party/jpeg-xl/lib/jxl/passes_test.cc
deleted file mode 100644
index 418f5d056d96b..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/passes_test.cc
+++ /dev/null
@@ -1,411 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/cms.h>
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <future>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "lib/extras/codec.h"
-#include "lib/extras/dec/jxl.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/override.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/common.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-
-using ::jxl::test::ButteraugliDistance;
-using ::jxl::test::ReadTestData;
-using ::jxl::test::Roundtrip;
-using ::jxl::test::ThreadPoolForTests;
-
-namespace {
-
-TEST(PassesTest, RoundtripSmallPasses) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  CodecInOut io{memory_manager};
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io));
-  ASSERT_TRUE(io.ShrinkTo(io.xsize() / 8, io.ysize() / 8));
-
-  CompressParams cparams;
-  cparams.butteraugli_distance = 1.0;
-  cparams.progressive_mode = Override::kOn;
-  cparams.SetCms(*JxlGetDefaultCms());
-
-  CodecInOut io2{memory_manager};
-  JXL_EXPECT_OK(Roundtrip(&io, cparams, {}, &io2, _));
-  EXPECT_SLIGHTLY_BELOW(
-      ButteraugliDistance(io.frames, io2.frames, ButteraugliParams(),
-                          *JxlGetDefaultCms(),
-                          /*distmap=*/nullptr),
-      1.0);
-}
-
-TEST(PassesTest, RoundtripUnalignedPasses) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  CodecInOut io{memory_manager};
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io));
-  ASSERT_TRUE(io.ShrinkTo(io.xsize() / 12, io.ysize() / 7));
-
-  CompressParams cparams;
-  cparams.butteraugli_distance = 2.0;
-  cparams.progressive_mode = Override::kOn;
-  cparams.SetCms(*JxlGetDefaultCms());
-
-  CodecInOut io2{memory_manager};
-  JXL_EXPECT_OK(Roundtrip(&io, cparams, {}, &io2, _));
-  EXPECT_SLIGHTLY_BELOW(
-      ButteraugliDistance(io.frames, io2.frames, ButteraugliParams(),
-                          *JxlGetDefaultCms(),
-                          /*distmap=*/nullptr),
-      1.72);
-}
-
-TEST(PassesTest, RoundtripMultiGroupPasses) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const std::vector<uint8_t> orig = ReadTestData("jxl/flower/flower.png");
-  CodecInOut io{memory_manager};
-  {
-    ThreadPoolForTests pool(4);
-    ASSERT_TRUE(SetFromBytes(Bytes(orig), &io, pool.get()));
-  }
-  ASSERT_TRUE(io.ShrinkTo(600, 1024));  // partial X, full Y group
-
-  auto test = [&](float target_distance, float threshold) {
-    ThreadPoolForTests pool(4);
-    CompressParams cparams;
-    cparams.butteraugli_distance = target_distance;
-    cparams.progressive_mode = Override::kOn;
-    cparams.SetCms(*JxlGetDefaultCms());
-    CodecInOut io2{memory_manager};
-    JXL_EXPECT_OK(Roundtrip(&io, cparams, {}, &io2, _,
-                            /* compressed_size */ nullptr, pool.get()));
-    EXPECT_SLIGHTLY_BELOW(
-        ButteraugliDistance(io.frames, io2.frames, ButteraugliParams(),
-                            *JxlGetDefaultCms(),
-                            /*distmap=*/nullptr, pool.get()),
-        target_distance + threshold);
-  };
-
-  auto run1 = std::async(std::launch::async, test, 1.0f, 0.25f);
-  auto run2 = std::async(std::launch::async, test, 2.0f, 0.0f);
-}
-
-TEST(PassesTest, RoundtripLargeFastPasses) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig = ReadTestData("jxl/flower/flower.png");
-  CodecInOut io{memory_manager};
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io, pool.get()));
-
-  CompressParams cparams;
-  cparams.speed_tier = SpeedTier::kSquirrel;
-  cparams.progressive_mode = Override::kOn;
-  cparams.SetCms(*JxlGetDefaultCms());
-
-  CodecInOut io2{memory_manager};
-  JXL_EXPECT_OK(Roundtrip(&io, cparams, {}, &io2, _,
-                          /* compressed_size */ nullptr, pool.get()));
-}
-
-// Checks for differing size/distance in two consecutive runs of distance 2,
-// which involves additional processing including adaptive reconstruction.
-// Failing this may be a sign of race conditions or invalid memory accesses.
-TEST(PassesTest, RoundtripProgressiveConsistent) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig = ReadTestData("jxl/flower/flower.png");
-  CodecInOut io{memory_manager};
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io, pool.get()));
-
-  CompressParams cparams;
-  cparams.speed_tier = SpeedTier::kSquirrel;
-  cparams.progressive_mode = Override::kOn;
-  cparams.butteraugli_distance = 2.0;
-  cparams.SetCms(*JxlGetDefaultCms());
-
-  // Try each xsize mod kBlockDim to verify right border handling.
-  for (size_t xsize = 48; xsize > 40; --xsize) {
-    ASSERT_TRUE(io.ShrinkTo(xsize, 15));
-
-    CodecInOut io2{memory_manager};
-    size_t size2;
-    JXL_EXPECT_OK(Roundtrip(&io, cparams, {}, &io2, _, &size2, pool.get()));
-
-    CodecInOut io3{memory_manager};
-    size_t size3;
-    JXL_EXPECT_OK(Roundtrip(&io, cparams, {}, &io3, _, &size3, pool.get()));
-
-    // Exact same compressed size.
-    EXPECT_EQ(size2, size3);
-
-    // Exact same distance.
-    const float dist2 = ButteraugliDistance(
-        io.frames, io2.frames, ButteraugliParams(), *JxlGetDefaultCms(),
-        /*distmap=*/nullptr, pool.get());
-    const float dist3 = ButteraugliDistance(
-        io.frames, io3.frames, ButteraugliParams(), *JxlGetDefaultCms(),
-        /*distmap=*/nullptr, pool.get());
-    EXPECT_EQ(dist2, dist3);
-  }
-}
-
-TEST(PassesTest, AllDownsampleFeasible) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  CodecInOut io{memory_manager};
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io, pool.get()));
-
-  std::vector<uint8_t> compressed;
-
-  CompressParams cparams;
-  cparams.speed_tier = SpeedTier::kSquirrel;
-  cparams.progressive_mode = Override::kOn;
-  cparams.butteraugli_distance = 1.0;
-  ASSERT_TRUE(test::EncodeFile(cparams, &io, &compressed, pool.get()));
-
-  EXPECT_LE(compressed.size(), 240000u);
-  float target_butteraugli[9] = {};
-  target_butteraugli[1] = 2.5f;
-  target_butteraugli[2] = 16.0f;
-  target_butteraugli[4] = 20.0f;
-  target_butteraugli[8] = 80.0f;
-
-  // The default progressive encoding scheme should make all these downsampling
-  // factors achievable.
-  // TODO(veluca): re-enable downsampling 16.
-  std::vector<size_t> downsamplings = {1, 2, 4, 8};  //, 16};
-
-  auto check = [&](const uint32_t task, size_t /* thread */) -> Status {
-    const size_t downsampling = downsamplings[task];
-    extras::JXLDecompressParams dparams;
-    dparams.max_downsampling = downsampling;
-    CodecInOut output{memory_manager};
-    JXL_RETURN_IF_ERROR(test::DecodeFile(dparams, Bytes(compressed), &output));
-    EXPECT_EQ(output.xsize(), io.xsize()) << "downsampling = " << downsampling;
-    EXPECT_EQ(output.ysize(), io.ysize()) << "downsampling = " << downsampling;
-    EXPECT_LE(ButteraugliDistance(io.frames, output.frames, ButteraugliParams(),
-                                  *JxlGetDefaultCms(),
-                                  /*distmap=*/nullptr, nullptr),
-              target_butteraugli[downsampling])
-        << "downsampling: " << downsampling;
-    return true;
-  };
-  EXPECT_TRUE(RunOnPool(pool.get(), 0, downsamplings.size(), ThreadPool::NoInit,
-                        check, "TestDownsampling"));
-}
-
-TEST(PassesTest, AllDownsampleFeasibleQProgressive) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  CodecInOut io{memory_manager};
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io, pool.get()));
-
-  std::vector<uint8_t> compressed;
-
-  CompressParams cparams;
-  cparams.speed_tier = SpeedTier::kSquirrel;
-  cparams.qprogressive_mode = Override::kOn;
-  cparams.butteraugli_distance = 1.0;
-  ASSERT_TRUE(test::EncodeFile(cparams, &io, &compressed, pool.get()));
-
-  EXPECT_LE(compressed.size(), 220000u);
-
-  float target_butteraugli[9] = {};
-  target_butteraugli[1] = 3.0f;
-  target_butteraugli[2] = 6.0f;
-  target_butteraugli[4] = 10.0f;
-  target_butteraugli[8] = 80.0f;
-
-  // The default progressive encoding scheme should make all these downsampling
-  // factors achievable.
-  std::vector<size_t> downsamplings = {1, 2, 4, 8};
-
-  auto check = [&](const uint32_t task, size_t /* thread */) -> Status {
-    const size_t downsampling = downsamplings[task];
-    extras::JXLDecompressParams dparams;
-    dparams.max_downsampling = downsampling;
-    CodecInOut output{memory_manager};
-    JXL_RETURN_IF_ERROR(test::DecodeFile(dparams, Bytes(compressed), &output));
-    EXPECT_EQ(output.xsize(), io.xsize()) << "downsampling = " << downsampling;
-    EXPECT_EQ(output.ysize(), io.ysize()) << "downsampling = " << downsampling;
-    EXPECT_LE(ButteraugliDistance(io.frames, output.frames, ButteraugliParams(),
-                                  *JxlGetDefaultCms(),
-                                  /*distmap=*/nullptr),
-              target_butteraugli[downsampling])
-        << "downsampling: " << downsampling;
-    return true;
-  };
-  EXPECT_TRUE(RunOnPool(pool.get(), 0, downsamplings.size(), ThreadPool::NoInit,
-                        check, "TestQProgressive"));
-}
-
-TEST(PassesTest, ProgressiveDownsample2DegradesCorrectlyGrayscale) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig = ReadTestData(
-      "external/wesaturate/500px/cvo9xd_keong_macan_grayscale.png");
-  CodecInOut io_orig{memory_manager};
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io_orig, pool.get()));
-  Rect rect(0, 0, io_orig.xsize(), 128);
-  // need 2 DC groups for the DC frame to actually be progressive.
-  JXL_TEST_ASSIGN_OR_DIE(Image3F large,
-                         Image3F::Create(memory_manager, 4242, rect.ysize()));
-  ZeroFillImage(&large);
-  ASSERT_TRUE(CopyImageTo(rect, *io_orig.Main().color(), rect, &large));
-  CodecInOut io{memory_manager};
-  io.metadata = io_orig.metadata;
-  ASSERT_TRUE(io.SetFromImage(std::move(large), io_orig.Main().c_current()));
-
-  std::vector<uint8_t> compressed;
-
-  CompressParams cparams;
-  cparams.speed_tier = SpeedTier::kSquirrel;
-  cparams.progressive_dc = 1;
-  cparams.responsive = JXL_TRUE;
-  cparams.qprogressive_mode = Override::kOn;
-  cparams.butteraugli_distance = 1.0;
-  ASSERT_TRUE(test::EncodeFile(cparams, &io, &compressed, pool.get()));
-
-  EXPECT_LE(compressed.size(), 10000u);
-
-  extras::JXLDecompressParams dparams;
-  dparams.max_downsampling = 1;
-  CodecInOut output{memory_manager};
-  ASSERT_TRUE(test::DecodeFile(dparams, Bytes(compressed), &output));
-
-  dparams.max_downsampling = 2;
-  CodecInOut output_d2{memory_manager};
-  ASSERT_TRUE(test::DecodeFile(dparams, Bytes(compressed), &output_d2));
-
-  // 0 if reading all the passes, ~15 if skipping the 8x pass.
-  float butteraugli_distance_down2_full = ButteraugliDistance(
-      output.frames, output_d2.frames, ButteraugliParams(), *JxlGetDefaultCms(),
-      /*distmap=*/nullptr);
-
-  EXPECT_LE(butteraugli_distance_down2_full, 3.2f);
-  EXPECT_GE(butteraugli_distance_down2_full, 1.0f);
-}
-
-TEST(PassesTest, ProgressiveDownsample2DegradesCorrectly) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig = ReadTestData("jxl/flower/flower.png");
-  CodecInOut io_orig{memory_manager};
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io_orig, pool.get()));
-  Rect rect(0, 0, io_orig.xsize(), 128);
-  // need 2 DC groups for the DC frame to actually be progressive.
-  JXL_TEST_ASSIGN_OR_DIE(Image3F large,
-                         Image3F::Create(memory_manager, 4242, rect.ysize()));
-  ZeroFillImage(&large);
-  ASSERT_TRUE(CopyImageTo(rect, *io_orig.Main().color(), rect, &large));
-  CodecInOut io{memory_manager};
-  ASSERT_TRUE(io.SetFromImage(std::move(large), io_orig.Main().c_current()));
-
-  std::vector<uint8_t> compressed;
-
-  CompressParams cparams;
-  cparams.speed_tier = SpeedTier::kSquirrel;
-  cparams.progressive_dc = 1;
-  cparams.responsive = JXL_TRUE;
-  cparams.qprogressive_mode = Override::kOn;
-  cparams.butteraugli_distance = 1.0;
-  ASSERT_TRUE(test::EncodeFile(cparams, &io, &compressed, pool.get()));
-
-  EXPECT_LE(compressed.size(), 220000u);
-
-  extras::JXLDecompressParams dparams;
-  dparams.max_downsampling = 1;
-  CodecInOut output{memory_manager};
-  ASSERT_TRUE(test::DecodeFile(dparams, Bytes(compressed), &output));
-
-  dparams.max_downsampling = 2;
-  CodecInOut output_d2{memory_manager};
-  ASSERT_TRUE(test::DecodeFile(dparams, Bytes(compressed), &output_d2));
-
-  // 0 if reading all the passes, ~15 if skipping the 8x pass.
-  float butteraugli_distance_down2_full = ButteraugliDistance(
-      output.frames, output_d2.frames, ButteraugliParams(), *JxlGetDefaultCms(),
-      /*distmap=*/nullptr);
-
-  EXPECT_LE(butteraugli_distance_down2_full, 3.0f);
-  EXPECT_GE(butteraugli_distance_down2_full, 1.0f);
-}
-
-TEST(PassesTest, NonProgressiveDCImage) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  ThreadPoolForTests pool(8);
-  const std::vector<uint8_t> orig = ReadTestData("jxl/flower/flower.png");
-  CodecInOut io{memory_manager};
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io, pool.get()));
-
-  std::vector<uint8_t> compressed;
-
-  CompressParams cparams;
-  cparams.speed_tier = SpeedTier::kSquirrel;
-  cparams.progressive_mode = Override::kOff;
-  cparams.butteraugli_distance = 2.0;
-  ASSERT_TRUE(test::EncodeFile(cparams, &io, &compressed, pool.get()));
-
-  // Even in non-progressive mode, it should be possible to return a DC-only
-  // image.
-  extras::JXLDecompressParams dparams;
-  dparams.max_downsampling = 100;
-  CodecInOut output{memory_manager};
-  ASSERT_TRUE(
-      test::DecodeFile(dparams, Bytes(compressed), &output, pool.get()));
-  EXPECT_EQ(output.xsize(), io.xsize());
-  EXPECT_EQ(output.ysize(), io.ysize());
-}
-
-TEST(PassesTest, RoundtripSmallNoGaborishPasses) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  CodecInOut io{memory_manager};
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io));
-  ASSERT_TRUE(io.ShrinkTo(io.xsize() / 8, io.ysize() / 8));
-
-  CompressParams cparams;
-  cparams.gaborish = Override::kOff;
-  cparams.butteraugli_distance = 1.0;
-  cparams.progressive_mode = Override::kOn;
-  cparams.SetCms(*JxlGetDefaultCms());
-
-  CodecInOut io2{memory_manager};
-  JXL_EXPECT_OK(Roundtrip(&io, cparams, {}, &io2, _));
-  EXPECT_SLIGHTLY_BELOW(
-      ButteraugliDistance(io.frames, io2.frames, ButteraugliParams(),
-                          *JxlGetDefaultCms(),
-                          /*distmap=*/nullptr),
-      1.0);
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/patch_dictionary_internal.h b/third_party/jpeg-xl/lib/jxl/patch_dictionary_internal.h
deleted file mode 100644
index 8c44bce2e9c5c..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/patch_dictionary_internal.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_PATCH_DICTIONARY_INTERNAL_H_
-#define LIB_JXL_PATCH_DICTIONARY_INTERNAL_H_
-
-namespace jxl {
-
-// Context numbers as specified in Section C.4.5, Listing C.2:
-enum Contexts {
-  kNumRefPatchContext = 0,
-  kReferenceFrameContext = 1,
-  kPatchSizeContext = 2,
-  kPatchReferencePositionContext = 3,
-  kPatchPositionContext = 4,
-  kPatchBlendModeContext = 5,
-  kPatchOffsetContext = 6,
-  kPatchCountContext = 7,
-  kPatchAlphaChannelContext = 8,
-  kPatchClampContext = 9,
-  kNumPatchDictionaryContexts
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_PATCH_DICTIONARY_INTERNAL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/patch_dictionary_test.cc b/third_party/jpeg-xl/lib/jxl/patch_dictionary_test.cc
deleted file mode 100644
index 32f021a764e91..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/patch_dictionary_test.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/cms.h>
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <vector>
-
-#include "lib/extras/codec.h"
-#include "lib/jxl/base/override.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/image_test_utils.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-using ::jxl::test::ButteraugliDistance;
-using ::jxl::test::GetImage;
-using ::jxl::test::ReadTestData;
-using ::jxl::test::Roundtrip;
-
-TEST(PatchDictionaryTest, GrayscaleModular) {
-  const std::vector<uint8_t> orig = ReadTestData("jxl/grayscale_patches.png");
-  extras::PackedPixelFile ppf;
-  ASSERT_TRUE(DecodeBytes(Bytes(orig), jxl::extras::ColorHints(), &ppf));
-
-  extras::JXLCompressParams cparams = jxl::test::CompressParamsForLossless();
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_PATCHES, 1);
-
-  extras::PackedPixelFile ppf2;
-  // Without patches: ~25k
-  size_t compressed_size = Roundtrip(ppf, cparams, {}, nullptr, &ppf2);
-  EXPECT_LE(compressed_size, 8000u);
-  JXL_TEST_ASSIGN_OR_DIE(ImageF image, GetImage(ppf));
-  JXL_TEST_ASSIGN_OR_DIE(ImageF image2, GetImage(ppf2));
-  JXL_TEST_ASSERT_OK(VerifyRelativeError(image, image2, 1e-7f, 0, _));
-}
-
-TEST(PatchDictionaryTest, GrayscaleVarDCT) {
-  const std::vector<uint8_t> orig = ReadTestData("jxl/grayscale_patches.png");
-  extras::PackedPixelFile ppf;
-  ASSERT_TRUE(DecodeBytes(Bytes(orig), jxl::extras::ColorHints(), &ppf));
-
-  extras::JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_PATCHES, 1);
-
-  extras::PackedPixelFile ppf2;
-  // Without patches: ~47k
-  size_t compressed_size = Roundtrip(ppf, cparams, {}, nullptr, &ppf2);
-  EXPECT_LE(compressed_size, 14000u);
-  // Without patches: ~1.2
-  EXPECT_LE(ButteraugliDistance(ppf, ppf2), 1.1);
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/preview_test.cc b/third_party/jpeg-xl/lib/jxl/preview_test.cc
deleted file mode 100644
index 9c49bc361ce24..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/preview_test.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/cms.h>
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <string>
-#include <vector>
-
-#include "lib/extras/codec.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/codec_in_out.h"
-#include "lib/jxl/common.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/headers.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-using ::jxl::test::ButteraugliDistance;
-using ::jxl::test::ReadTestData;
-using ::jxl::test::Roundtrip;
-
-TEST(PreviewTest, RoundtripGivenPreview) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const std::vector<uint8_t> orig =
-      ReadTestData("external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  CodecInOut io{memory_manager};
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io));
-  ASSERT_TRUE(io.ShrinkTo(io.xsize() / 8, io.ysize() / 8));
-  // Same as main image
-  JXL_TEST_ASSIGN_OR_DIE(io.preview_frame, io.Main().Copy());
-  const size_t preview_xsize = 15;
-  const size_t preview_ysize = 27;
-  ASSERT_TRUE(io.preview_frame.ShrinkTo(preview_xsize, preview_ysize));
-  io.metadata.m.have_preview = true;
-  ASSERT_TRUE(io.metadata.m.preview_size.Set(io.preview_frame.xsize(),
-                                             io.preview_frame.ysize()));
-
-  CompressParams cparams;
-  cparams.butteraugli_distance = 2.0;
-  cparams.speed_tier = SpeedTier::kSquirrel;
-  cparams.SetCms(*JxlGetDefaultCms());
-
-  CodecInOut io2{memory_manager};
-  JXL_EXPECT_OK(Roundtrip(&io, cparams, {}, &io2, _));
-  EXPECT_EQ(preview_xsize, io2.metadata.m.preview_size.xsize());
-  EXPECT_EQ(preview_ysize, io2.metadata.m.preview_size.ysize());
-  EXPECT_EQ(preview_xsize, io2.preview_frame.xsize());
-  EXPECT_EQ(preview_ysize, io2.preview_frame.ysize());
-
-  EXPECT_LE(ButteraugliDistance(io.preview_frame, io2.preview_frame,
-                                ButteraugliParams(), *JxlGetDefaultCms(),
-                                /*distmap=*/nullptr),
-            2.5);
-  EXPECT_LE(ButteraugliDistance(io.Main(), io2.Main(), ButteraugliParams(),
-                                *JxlGetDefaultCms(),
-                                /*distmap=*/nullptr),
-            2.5);
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/quant_weights.cc b/third_party/jpeg-xl/lib/jxl/quant_weights.cc
deleted file mode 100644
index 793ae4399834a..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/quant_weights.cc
+++ /dev/null
@@ -1,1263 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-#include "lib/jxl/quant_weights.h"
-
-#include <jxl/memory_manager.h>
-
-#include <cmath>
-#include <cstdio>
-#include <cstdlib>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dct_scales.h"
-#include "lib/jxl/dec_modular.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/memory_manager_internal.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/quant_weights.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/fast_math-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Lt;
-using hwy::HWY_NAMESPACE::MulAdd;
-using hwy::HWY_NAMESPACE::Sqrt;
-
-// kQuantWeights[N * N * c + N * y + x] is the relative weight of the (x, y)
-// coefficient in component c. Higher weights correspond to finer quantization
-// intervals and more bits spent in encoding.
-
-static constexpr const float kAlmostZero = 1e-8f;
-
-void GetQuantWeightsDCT2(const QuantEncoding::DCT2Weights& dct2weights,
-                         float* weights) {
-  for (size_t c = 0; c < 3; c++) {
-    size_t start = c * 64;
-    weights[start] = 0xBAD;
-    weights[start + 1] = weights[start + 8] = dct2weights[c][0];
-    weights[start + 9] = dct2weights[c][1];
-    for (size_t y = 0; y < 2; y++) {
-      for (size_t x = 0; x < 2; x++) {
-        weights[start + y * 8 + x + 2] = dct2weights[c][2];
-        weights[start + (y + 2) * 8 + x] = dct2weights[c][2];
-      }
-    }
-    for (size_t y = 0; y < 2; y++) {
-      for (size_t x = 0; x < 2; x++) {
-        weights[start + (y + 2) * 8 + x + 2] = dct2weights[c][3];
-      }
-    }
-    for (size_t y = 0; y < 4; y++) {
-      for (size_t x = 0; x < 4; x++) {
-        weights[start + y * 8 + x + 4] = dct2weights[c][4];
-        weights[start + (y + 4) * 8 + x] = dct2weights[c][4];
-      }
-    }
-    for (size_t y = 0; y < 4; y++) {
-      for (size_t x = 0; x < 4; x++) {
-        weights[start + (y + 4) * 8 + x + 4] = dct2weights[c][5];
-      }
-    }
-  }
-}
-
-void GetQuantWeightsIdentity(const QuantEncoding::IdWeights& idweights,
-                             float* weights) {
-  for (size_t c = 0; c < 3; c++) {
-    for (int i = 0; i < 64; i++) {
-      weights[64 * c + i] = idweights[c][0];
-    }
-    weights[64 * c + 1] = idweights[c][1];
-    weights[64 * c + 8] = idweights[c][1];
-    weights[64 * c + 9] = idweights[c][2];
-  }
-}
-
-StatusOr<float> Interpolate(float pos, float max, const float* array,
-                            size_t len) {
-  float scaled_pos = pos * (len - 1) / max;
-  size_t idx = scaled_pos;
-  JXL_ENSURE(idx + 1 < len);
-  float a = array[idx];
-  float b = array[idx + 1];
-  return a * FastPowf(b / a, scaled_pos - idx);
-}
-
-float Mult(float v) {
-  if (v > 0.0f) return 1.0f + v;
-  return 1.0f / (1.0f - v);
-}
-
-using DF4 = HWY_CAPPED(float, 4);
-
-hwy::HWY_NAMESPACE::Vec<DF4> InterpolateVec(
-    hwy::HWY_NAMESPACE::Vec<DF4> scaled_pos, const float* array) {
-  HWY_CAPPED(int32_t, 4) di;
-
-  auto idx = ConvertTo(di, scaled_pos);
-
-  auto frac = Sub(scaled_pos, ConvertTo(DF4(), idx));
-
-  // TODO(veluca): in theory, this could be done with 8 TableLookupBytes, but
-  // it's probably slower.
-  auto a = GatherIndex(DF4(), array, idx);
-  auto b = GatherIndex(DF4(), array + 1, idx);
-
-  return Mul(a, FastPowf(DF4(), Div(b, a), frac));
-}
-
-// Computes quant weights for a COLS*ROWS-sized transform, using num_bands
-// eccentricity bands and num_ebands eccentricity bands. If print_mode is 1,
-// prints the resulting matrix; if print_mode is 2, prints the matrix in a
-// format suitable for a 3d plot with gnuplot.
-Status GetQuantWeights(
-    size_t ROWS, size_t COLS,
-    const DctQuantWeightParams::DistanceBandsArray& distance_bands,
-    size_t num_bands, float* out) {
-  for (size_t c = 0; c < 3; c++) {
-    float bands[DctQuantWeightParams::kMaxDistanceBands] = {
-        distance_bands[c][0]};
-    if (bands[0] < kAlmostZero) return JXL_FAILURE("Invalid distance bands");
-    for (size_t i = 1; i < num_bands; i++) {
-      bands[i] = bands[i - 1] * Mult(distance_bands[c][i]);
-      if (bands[i] < kAlmostZero) return JXL_FAILURE("Invalid distance bands");
-    }
-    float scale = (num_bands - 1) / (kSqrt2 + 1e-6f);
-    float rcpcol = scale / (COLS - 1);
-    float rcprow = scale / (ROWS - 1);
-    JXL_ENSURE(COLS >= Lanes(DF4()));
-    HWY_ALIGN float l0123[4] = {0, 1, 2, 3};
-    for (uint32_t y = 0; y < ROWS; y++) {
-      float dy = y * rcprow;
-      float dy2 = dy * dy;
-      for (uint32_t x = 0; x < COLS; x += Lanes(DF4())) {
-        auto dx =
-            Mul(Add(Set(DF4(), x), Load(DF4(), l0123)), Set(DF4(), rcpcol));
-        auto scaled_distance = Sqrt(MulAdd(dx, dx, Set(DF4(), dy2)));
-        auto weight = num_bands == 1 ? Set(DF4(), bands[0])
-                                     : InterpolateVec(scaled_distance, bands);
-        StoreU(weight, DF4(), out + c * COLS * ROWS + y * COLS + x);
-      }
-    }
-  }
-  return true;
-}
-
-// TODO(veluca): SIMD-fy. With 256x256, this is actually slow.
-Status ComputeQuantTable(const QuantEncoding& encoding,
-                         float* JXL_RESTRICT table,
-                         float* JXL_RESTRICT inv_table, size_t table_num,
-                         QuantTable kind, size_t* pos) {
-  constexpr size_t N = kBlockDim;
-  size_t quant_table_idx = static_cast<size_t>(kind);
-  size_t wrows = 8 * DequantMatrices::required_size_x[quant_table_idx];
-  size_t wcols = 8 * DequantMatrices::required_size_y[quant_table_idx];
-  size_t num = wrows * wcols;
-
-  std::vector<float> weights(3 * num);
-
-  switch (encoding.mode) {
-    case QuantEncoding::kQuantModeLibrary: {
-      // Library and copy quant encoding should get replaced by the actual
-      // parameters by the caller.
-      JXL_ENSURE(false);
-      break;
-    }
-    case QuantEncoding::kQuantModeID: {
-      JXL_ENSURE(num == kDCTBlockSize);
-      GetQuantWeightsIdentity(encoding.idweights, weights.data());
-      break;
-    }
-    case QuantEncoding::kQuantModeDCT2: {
-      JXL_ENSURE(num == kDCTBlockSize);
-      GetQuantWeightsDCT2(encoding.dct2weights, weights.data());
-      break;
-    }
-    case QuantEncoding::kQuantModeDCT4: {
-      JXL_ENSURE(num == kDCTBlockSize);
-      float weights4x4[3 * 4 * 4];
-      // Always use 4x4 GetQuantWeights for DCT4 quantization tables.
-      JXL_RETURN_IF_ERROR(
-          GetQuantWeights(4, 4, encoding.dct_params.distance_bands,
-                          encoding.dct_params.num_distance_bands, weights4x4));
-      for (size_t c = 0; c < 3; c++) {
-        for (size_t y = 0; y < kBlockDim; y++) {
-          for (size_t x = 0; x < kBlockDim; x++) {
-            weights[c * num + y * kBlockDim + x] =
-                weights4x4[c * 16 + (y / 2) * 4 + (x / 2)];
-          }
-        }
-        weights[c * num + 1] /= encoding.dct4multipliers[c][0];
-        weights[c * num + N] /= encoding.dct4multipliers[c][0];
-        weights[c * num + N + 1] /= encoding.dct4multipliers[c][1];
-      }
-      break;
-    }
-    case QuantEncoding::kQuantModeDCT4X8: {
-      JXL_ENSURE(num == kDCTBlockSize);
-      float weights4x8[3 * 4 * 8];
-      // Always use 4x8 GetQuantWeights for DCT4X8 quantization tables.
-      JXL_RETURN_IF_ERROR(
-          GetQuantWeights(4, 8, encoding.dct_params.distance_bands,
-                          encoding.dct_params.num_distance_bands, weights4x8));
-      for (size_t c = 0; c < 3; c++) {
-        for (size_t y = 0; y < kBlockDim; y++) {
-          for (size_t x = 0; x < kBlockDim; x++) {
-            weights[c * num + y * kBlockDim + x] =
-                weights4x8[c * 32 + (y / 2) * 8 + x];
-          }
-        }
-        weights[c * num + N] /= encoding.dct4x8multipliers[c];
-      }
-      break;
-    }
-    case QuantEncoding::kQuantModeDCT: {
-      JXL_RETURN_IF_ERROR(GetQuantWeights(
-          wrows, wcols, encoding.dct_params.distance_bands,
-          encoding.dct_params.num_distance_bands, weights.data()));
-      break;
-    }
-    case QuantEncoding::kQuantModeRAW: {
-      if (!encoding.qraw.qtable || encoding.qraw.qtable->size() != 3 * num) {
-        return JXL_FAILURE("Invalid table encoding");
-      }
-      int* qtable = encoding.qraw.qtable->data();
-      for (size_t i = 0; i < 3 * num; i++) {
-        weights[i] = 1.f / (encoding.qraw.qtable_den * qtable[i]);
-      }
-      break;
-    }
-    case QuantEncoding::kQuantModeAFV: {
-      constexpr float kFreqs[] = {
-          0xBAD,
-          0xBAD,
-          0.8517778890324296,
-          5.37778436506804,
-          0xBAD,
-          0xBAD,
-          4.734747904497923,
-          5.449245381693219,
-          1.6598270267479331,
-          4,
-          7.275749096817861,
-          10.423227632456525,
-          2.662932286148962,
-          7.630657783650829,
-          8.962388608184032,
-          12.97166202570235,
-      };
-
-      float weights4x8[3 * 4 * 8];
-      JXL_RETURN_IF_ERROR((
-          GetQuantWeights(4, 8, encoding.dct_params.distance_bands,
-                          encoding.dct_params.num_distance_bands, weights4x8)));
-      float weights4x4[3 * 4 * 4];
-      JXL_RETURN_IF_ERROR((GetQuantWeights(
-          4, 4, encoding.dct_params_afv_4x4.distance_bands,
-          encoding.dct_params_afv_4x4.num_distance_bands, weights4x4)));
-
-      constexpr float lo = 0.8517778890324296;
-      constexpr float hi = 12.97166202570235f - lo + 1e-6f;
-      for (size_t c = 0; c < 3; c++) {
-        float bands[4];
-        bands[0] = encoding.afv_weights[c][5];
-        if (bands[0] < kAlmostZero) return JXL_FAILURE("Invalid AFV bands");
-        for (size_t i = 1; i < 4; i++) {
-          bands[i] = bands[i - 1] * Mult(encoding.afv_weights[c][i + 5]);
-          if (bands[i] < kAlmostZero) return JXL_FAILURE("Invalid AFV bands");
-        }
-        size_t start = c * 64;
-        auto set_weight = [&start, &weights](size_t x, size_t y, float val) {
-          weights[start + y * 8 + x] = val;
-        };
-        weights[start] = 1;  // Not used, but causes MSAN error otherwise.
-        // Weights for (0, 1) and (1, 0).
-        set_weight(0, 1, encoding.afv_weights[c][0]);
-        set_weight(1, 0, encoding.afv_weights[c][1]);
-        // AFV special weights for 3-pixel corner.
-        set_weight(0, 2, encoding.afv_weights[c][2]);
-        set_weight(2, 0, encoding.afv_weights[c][3]);
-        set_weight(2, 2, encoding.afv_weights[c][4]);
-
-        // All other AFV weights.
-        for (size_t y = 0; y < 4; y++) {
-          for (size_t x = 0; x < 4; x++) {
-            if (x < 2 && y < 2) continue;
-            JXL_ASSIGN_OR_RETURN(
-                float val, Interpolate(kFreqs[y * 4 + x] - lo, hi, bands, 4));
-            set_weight(2 * x, 2 * y, val);
-          }
-        }
-
-        // Put 4x8 weights in odd rows, except (1, 0).
-        for (size_t y = 0; y < kBlockDim / 2; y++) {
-          for (size_t x = 0; x < kBlockDim; x++) {
-            if (x == 0 && y == 0) continue;
-            weights[c * num + (2 * y + 1) * kBlockDim + x] =
-                weights4x8[c * 32 + y * 8 + x];
-          }
-        }
-        // Put 4x4 weights in even rows / odd columns, except (0, 1).
-        for (size_t y = 0; y < kBlockDim / 2; y++) {
-          for (size_t x = 0; x < kBlockDim / 2; x++) {
-            if (x == 0 && y == 0) continue;
-            weights[c * num + (2 * y) * kBlockDim + 2 * x + 1] =
-                weights4x4[c * 16 + y * 4 + x];
-          }
-        }
-      }
-      break;
-    }
-  }
-  size_t prev_pos = *pos;
-  HWY_CAPPED(float, 64) d;
-  for (size_t i = 0; i < num * 3; i += Lanes(d)) {
-    auto inv_val = LoadU(d, weights.data() + i);
-    if (JXL_UNLIKELY(!AllFalse(d, Ge(inv_val, Set(d, 1.0f / kAlmostZero))) ||
-                     !AllFalse(d, Lt(inv_val, Set(d, kAlmostZero))))) {
-      return JXL_FAILURE("Invalid quantization table");
-    }
-    auto val = Div(Set(d, 1.0f), inv_val);
-    StoreU(val, d, table + *pos + i);
-    StoreU(inv_val, d, inv_table + *pos + i);
-  }
-  (*pos) += 3 * num;
-
-  // Ensure that the lowest frequencies have a 0 inverse table.
-  // This does not affect en/decoding, but allows AC strategy selection to be
-  // slightly simpler.
-  size_t xs = DequantMatrices::required_size_x[quant_table_idx];
-  size_t ys = DequantMatrices::required_size_y[quant_table_idx];
-  CoefficientLayout(&ys, &xs);
-  for (size_t c = 0; c < 3; c++) {
-    for (size_t y = 0; y < ys; y++) {
-      for (size_t x = 0; x < xs; x++) {
-        inv_table[prev_pos + c * ys * xs * kDCTBlockSize + y * kBlockDim * xs +
-                  x] = 0;
-      }
-    }
-  }
-  return true;
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-
-namespace jxl {
-namespace {
-
-HWY_EXPORT(ComputeQuantTable);
-
-constexpr const float kAlmostZero = 1e-8f;
-
-Status DecodeDctParams(BitReader* br, DctQuantWeightParams* params) {
-  params->num_distance_bands =
-      br->ReadFixedBits<DctQuantWeightParams::kLog2MaxDistanceBands>() + 1;
-  for (size_t c = 0; c < 3; c++) {
-    for (size_t i = 0; i < params->num_distance_bands; i++) {
-      JXL_RETURN_IF_ERROR(F16Coder::Read(br, &params->distance_bands[c][i]));
-    }
-    if (params->distance_bands[c][0] < kAlmostZero) {
-      return JXL_FAILURE("Distance band seed is too small");
-    }
-    params->distance_bands[c][0] *= 64.0f;
-  }
-  return true;
-}
-
-Status Decode(JxlMemoryManager* memory_manager, BitReader* br,
-              QuantEncoding* encoding, size_t required_size_x,
-              size_t required_size_y, size_t idx,
-              ModularFrameDecoder* modular_frame_decoder) {
-  size_t required_size = required_size_x * required_size_y;
-  required_size_x *= kBlockDim;
-  required_size_y *= kBlockDim;
-  int mode = br->ReadFixedBits<kLog2NumQuantModes>();
-  switch (mode) {
-    case QuantEncoding::kQuantModeLibrary: {
-      encoding->predefined = br->ReadFixedBits<kCeilLog2NumPredefinedTables>();
-      if (encoding->predefined >= kNumPredefinedTables) {
-        return JXL_FAILURE("Invalid predefined table");
-      }
-      break;
-    }
-    case QuantEncoding::kQuantModeID: {
-      if (required_size != 1) return JXL_FAILURE("Invalid mode");
-      for (size_t c = 0; c < 3; c++) {
-        for (size_t i = 0; i < 3; i++) {
-          JXL_RETURN_IF_ERROR(F16Coder::Read(br, &encoding->idweights[c][i]));
-          if (std::abs(encoding->idweights[c][i]) < kAlmostZero) {
-            return JXL_FAILURE("ID Quantizer is too small");
-          }
-          encoding->idweights[c][i] *= 64;
-        }
-      }
-      break;
-    }
-    case QuantEncoding::kQuantModeDCT2: {
-      if (required_size != 1) return JXL_FAILURE("Invalid mode");
-      for (size_t c = 0; c < 3; c++) {
-        for (size_t i = 0; i < 6; i++) {
-          JXL_RETURN_IF_ERROR(F16Coder::Read(br, &encoding->dct2weights[c][i]));
-          if (std::abs(encoding->dct2weights[c][i]) < kAlmostZero) {
-            return JXL_FAILURE("Quantizer is too small");
-          }
-          encoding->dct2weights[c][i] *= 64;
-        }
-      }
-      break;
-    }
-    case QuantEncoding::kQuantModeDCT4X8: {
-      if (required_size != 1) return JXL_FAILURE("Invalid mode");
-      for (size_t c = 0; c < 3; c++) {
-        JXL_RETURN_IF_ERROR(
-            F16Coder::Read(br, &encoding->dct4x8multipliers[c]));
-        if (std::abs(encoding->dct4x8multipliers[c]) < kAlmostZero) {
-          return JXL_FAILURE("DCT4X8 multiplier is too small");
-        }
-      }
-      JXL_RETURN_IF_ERROR(DecodeDctParams(br, &encoding->dct_params));
-      break;
-    }
-    case QuantEncoding::kQuantModeDCT4: {
-      if (required_size != 1) return JXL_FAILURE("Invalid mode");
-      for (size_t c = 0; c < 3; c++) {
-        for (size_t i = 0; i < 2; i++) {
-          JXL_RETURN_IF_ERROR(
-              F16Coder::Read(br, &encoding->dct4multipliers[c][i]));
-          if (std::abs(encoding->dct4multipliers[c][i]) < kAlmostZero) {
-            return JXL_FAILURE("DCT4 multiplier is too small");
-          }
-        }
-      }
-      JXL_RETURN_IF_ERROR(DecodeDctParams(br, &encoding->dct_params));
-      break;
-    }
-    case QuantEncoding::kQuantModeAFV: {
-      if (required_size != 1) return JXL_FAILURE("Invalid mode");
-      for (size_t c = 0; c < 3; c++) {
-        for (size_t i = 0; i < 9; i++) {
-          JXL_RETURN_IF_ERROR(F16Coder::Read(br, &encoding->afv_weights[c][i]));
-        }
-        for (size_t i = 0; i < 6; i++) {
-          encoding->afv_weights[c][i] *= 64;
-        }
-      }
-      JXL_RETURN_IF_ERROR(DecodeDctParams(br, &encoding->dct_params));
-      JXL_RETURN_IF_ERROR(DecodeDctParams(br, &encoding->dct_params_afv_4x4));
-      break;
-    }
-    case QuantEncoding::kQuantModeDCT: {
-      JXL_RETURN_IF_ERROR(DecodeDctParams(br, &encoding->dct_params));
-      break;
-    }
-    case QuantEncoding::kQuantModeRAW: {
-      // Set mode early, to avoid mem-leak.
-      encoding->mode = QuantEncoding::kQuantModeRAW;
-      JXL_RETURN_IF_ERROR(ModularFrameDecoder::DecodeQuantTable(
-          memory_manager, required_size_x, required_size_y, br, encoding, idx,
-          modular_frame_decoder));
-      break;
-    }
-    default:
-      return JXL_FAILURE("Invalid quantization table encoding");
-  }
-  encoding->mode = static_cast<QuantEncoding::Mode>(mode);
-  return true;
-}
-
-}  // namespace
-
-#if JXL_CXX_LANG < JXL_CXX_17
-constexpr const std::array<int, 17> DequantMatrices::required_size_x;
-constexpr const std::array<int, 17> DequantMatrices::required_size_y;
-constexpr const size_t DequantMatrices::kSumRequiredXy;
-#endif
-
-Status DequantMatrices::Decode(JxlMemoryManager* memory_manager, BitReader* br,
-                               ModularFrameDecoder* modular_frame_decoder) {
-  size_t all_default = br->ReadBits(1);
-  size_t num_tables = all_default ? 0 : static_cast<size_t>(kNumQuantTables);
-  encodings_.clear();
-  encodings_.resize(kNumQuantTables, QuantEncoding::Library<0>());
-  for (size_t i = 0; i < num_tables; i++) {
-    JXL_RETURN_IF_ERROR(jxl::Decode(memory_manager, br, &encodings_[i],
-                                    required_size_x[i % kNumQuantTables],
-                                    required_size_y[i % kNumQuantTables], i,
-                                    modular_frame_decoder));
-  }
-  computed_mask_ = 0;
-  return true;
-}
-
-Status DequantMatrices::DecodeDC(BitReader* br) {
-  bool all_default = static_cast<bool>(br->ReadBits(1));
-  if (!br->AllReadsWithinBounds()) return JXL_FAILURE("EOS during DecodeDC");
-  if (!all_default) {
-    for (size_t c = 0; c < 3; c++) {
-      JXL_RETURN_IF_ERROR(F16Coder::Read(br, &dc_quant_[c]));
-      dc_quant_[c] *= 1.0f / 128.0f;
-      // Negative values and nearly zero are invalid values.
-      if (dc_quant_[c] < kAlmostZero) {
-        return JXL_FAILURE("Invalid dc_quant: coefficient is too small.");
-      }
-      inv_dc_quant_[c] = 1.0f / dc_quant_[c];
-    }
-  }
-  return true;
-}
-
-constexpr float V(float v) { return static_cast<float>(v); }
-
-namespace {
-struct DequantMatricesLibraryDef {
-  // DCT8
-  static constexpr QuantEncodingInternal DCT() {
-    return QuantEncodingInternal::DCT(DctQuantWeightParams({{{{
-                                                                 V(3150.0),
-                                                                 V(0.0),
-                                                                 V(-0.4),
-                                                                 V(-0.4),
-                                                                 V(-0.4),
-                                                                 V(-2.0),
-                                                             }},
-                                                             {{
-                                                                 V(560.0),
-                                                                 V(0.0),
-                                                                 V(-0.3),
-                                                                 V(-0.3),
-                                                                 V(-0.3),
-                                                                 V(-0.3),
-                                                             }},
-                                                             {{
-                                                                 V(512.0),
-                                                                 V(-2.0),
-                                                                 V(-1.0),
-                                                                 V(0.0),
-                                                                 V(-1.0),
-                                                                 V(-2.0),
-                                                             }}}},
-                                                           6));
-  }
-
-  // Identity
-  static constexpr QuantEncodingInternal IDENTITY() {
-    return QuantEncodingInternal::Identity({{{{
-                                                 V(280.0),
-                                                 V(3160.0),
-                                                 V(3160.0),
-                                             }},
-                                             {{
-                                                 V(60.0),
-                                                 V(864.0),
-                                                 V(864.0),
-                                             }},
-                                             {{
-                                                 V(18.0),
-                                                 V(200.0),
-                                                 V(200.0),
-                                             }}}});
-  }
-
-  // DCT2
-  static constexpr QuantEncodingInternal DCT2X2() {
-    return QuantEncodingInternal::DCT2({{{{
-                                             V(3840.0),
-                                             V(2560.0),
-                                             V(1280.0),
-                                             V(640.0),
-                                             V(480.0),
-                                             V(300.0),
-                                         }},
-                                         {{
-                                             V(960.0),
-                                             V(640.0),
-                                             V(320.0),
-                                             V(180.0),
-                                             V(140.0),
-                                             V(120.0),
-                                         }},
-                                         {{
-                                             V(640.0),
-                                             V(320.0),
-                                             V(128.0),
-                                             V(64.0),
-                                             V(32.0),
-                                             V(16.0),
-                                         }}}});
-  }
-
-  // DCT4 (quant_kind 3)
-  static constexpr QuantEncodingInternal DCT4X4() {
-    return QuantEncodingInternal::DCT4(DctQuantWeightParams({{{{
-                                                                  V(2200.0),
-                                                                  V(0.0),
-                                                                  V(0.0),
-                                                                  V(0.0),
-                                                              }},
-                                                              {{
-                                                                  V(392.0),
-                                                                  V(0.0),
-                                                                  V(0.0),
-                                                                  V(0.0),
-                                                              }},
-                                                              {{
-                                                                  V(112.0),
-                                                                  V(-0.25),
-                                                                  V(-0.25),
-                                                                  V(-0.5),
-                                                              }}}},
-                                                            4),
-                                       /* kMul */
-                                       {{{{
-                                             V(1.0),
-                                             V(1.0),
-                                         }},
-                                         {{
-                                             V(1.0),
-                                             V(1.0),
-                                         }},
-                                         {{
-                                             V(1.0),
-                                             V(1.0),
-                                         }}}});
-  }
-
-  // DCT16
-  static constexpr QuantEncodingInternal DCT16X16() {
-    return QuantEncodingInternal::DCT(
-        DctQuantWeightParams({{{{
-                                   V(8996.8725711814115328),
-                                   V(-1.3000777393353804),
-                                   V(-0.49424529824571225),
-                                   V(-0.439093774457103443),
-                                   V(-0.6350101832695744),
-                                   V(-0.90177264050827612),
-                                   V(-1.6162099239887414),
-                               }},
-                               {{
-                                   V(3191.48366296844234752),
-                                   V(-0.67424582104194355),
-                                   V(-0.80745813428471001),
-                                   V(-0.44925837484843441),
-                                   V(-0.35865440981033403),
-                                   V(-0.31322389111877305),
-                                   V(-0.37615025315725483),
-                               }},
-                               {{
-                                   V(1157.50408145487200256),
-                                   V(-2.0531423165804414),
-                                   V(-1.4),
-                                   V(-0.50687130033378396),
-                                   V(-0.42708730624733904),
-                                   V(-1.4856834539296244),
-                                   V(-4.9209142884401604),
-                               }}}},
-                             7));
-  }
-
-  // DCT32
-  static constexpr QuantEncodingInternal DCT32X32() {
-    return QuantEncodingInternal::DCT(
-        DctQuantWeightParams({{{{
-                                   V(15718.40830982518931456),
-                                   V(-1.025),
-                                   V(-0.98),
-                                   V(-0.9012),
-                                   V(-0.4),
-                                   V(-0.48819395464),
-                                   V(-0.421064),
-                                   V(-0.27),
-                               }},
-                               {{
-                                   V(7305.7636810695983104),
-                                   V(-0.8041958212306401),
-                                   V(-0.7633036457487539),
-                                   V(-0.55660379990111464),
-                                   V(-0.49785304658857626),
-                                   V(-0.43699592683512467),
-                                   V(-0.40180866526242109),
-                                   V(-0.27321683125358037),
-                               }},
-                               {{
-                                   V(3803.53173721215041536),
-                                   V(-3.060733579805728),
-                                   V(-2.0413270132490346),
-                                   V(-2.0235650159727417),
-                                   V(-0.5495389509954993),
-                                   V(-0.4),
-                                   V(-0.4),
-                                   V(-0.3),
-                               }}}},
-                             8));
-  }
-
-  // DCT16X8
-  static constexpr QuantEncodingInternal DCT8X16() {
-    return QuantEncodingInternal::DCT(
-        DctQuantWeightParams({{{{
-                                   V(7240.7734393502),
-                                   V(-0.7),
-                                   V(-0.7),
-                                   V(-0.2),
-                                   V(-0.2),
-                                   V(-0.2),
-                                   V(-0.5),
-                               }},
-                               {{
-                                   V(1448.15468787004),
-                                   V(-0.5),
-                                   V(-0.5),
-                                   V(-0.5),
-                                   V(-0.2),
-                                   V(-0.2),
-                                   V(-0.2),
-                               }},
-                               {{
-                                   V(506.854140754517),
-                                   V(-1.4),
-                                   V(-0.2),
-                                   V(-0.5),
-                                   V(-0.5),
-                                   V(-1.5),
-                                   V(-3.6),
-                               }}}},
-                             7));
-  }
-
-  // DCT32X8
-  static constexpr QuantEncodingInternal DCT8X32() {
-    return QuantEncodingInternal::DCT(
-        DctQuantWeightParams({{{{
-                                   V(16283.2494710648897),
-                                   V(-1.7812845336559429),
-                                   V(-1.6309059012653515),
-                                   V(-1.0382179034313539),
-                                   V(-0.85),
-                                   V(-0.7),
-                                   V(-0.9),
-                                   V(-1.2360638576849587),
-                               }},
-                               {{
-                                   V(5089.15750884921511936),
-                                   V(-0.320049391452786891),
-                                   V(-0.35362849922161446),
-                                   V(-0.30340000000000003),
-                                   V(-0.61),
-                                   V(-0.5),
-                                   V(-0.5),
-                                   V(-0.6),
-                               }},
-                               {{
-                                   V(3397.77603275308720128),
-                                   V(-0.321327362693153371),
-                                   V(-0.34507619223117997),
-                                   V(-0.70340000000000003),
-                                   V(-0.9),
-                                   V(-1.0),
-                                   V(-1.0),
-                                   V(-1.1754605576265209),
-                               }}}},
-                             8));
-  }
-
-  // DCT32X16
-  static constexpr QuantEncodingInternal DCT16X32() {
-    return QuantEncodingInternal::DCT(
-        DctQuantWeightParams({{{{
-                                   V(13844.97076442300573),
-                                   V(-0.97113799999999995),
-                                   V(-0.658),
-                                   V(-0.42026),
-                                   V(-0.22712),
-                                   V(-0.2206),
-                                   V(-0.226),
-                                   V(-0.6),
-                               }},
-                               {{
-                                   V(4798.964084220744293),
-                                   V(-0.61125308982767057),
-                                   V(-0.83770786552491361),
-                                   V(-0.79014862079498627),
-                                   V(-0.2692727459704829),
-                                   V(-0.38272769465388551),
-                                   V(-0.22924222653091453),
-                                   V(-0.20719098826199578),
-                               }},
-                               {{
-                                   V(1807.236946760964614),
-                                   V(-1.2),
-                                   V(-1.2),
-                                   V(-0.7),
-                                   V(-0.7),
-                                   V(-0.7),
-                                   V(-0.4),
-                                   V(-0.5),
-                               }}}},
-                             8));
-  }
-
-  // DCT4X8 and 8x4
-  static constexpr QuantEncodingInternal DCT4X8() {
-    return QuantEncodingInternal::DCT4X8(
-        DctQuantWeightParams({{
-                                 {{
-                                     V(2198.050556016380522),
-                                     V(-0.96269623020744692),
-                                     V(-0.76194253026666783),
-                                     V(-0.6551140670773547),
-                                 }},
-                                 {{
-                                     V(764.3655248643528689),
-                                     V(-0.92630200888366945),
-                                     V(-0.9675229603596517),
-                                     V(-0.27845290869168118),
-                                 }},
-                                 {{
-                                     V(527.107573587542228),
-                                     V(-1.4594385811273854),
-                                     V(-1.450082094097871593),
-                                     V(-1.5843722511996204),
-                                 }},
-                             }},
-                             4),
-        /* kMuls */
-        {{
-            V(1.0),
-            V(1.0),
-            V(1.0),
-        }});
-  }
-  // AFV
-  static QuantEncodingInternal AFV0() {
-    return QuantEncodingInternal::AFV(DCT4X8().dct_params, DCT4X4().dct_params,
-                                      {{{{
-                                            // 4x4/4x8 DC tendency.
-                                            V(3072.0),
-                                            V(3072.0),
-                                            // AFV corner.
-                                            V(256.0),
-                                            V(256.0),
-                                            V(256.0),
-                                            // AFV high freqs.
-                                            V(414.0),
-                                            V(0.0),
-                                            V(0.0),
-                                            V(0.0),
-                                        }},
-                                        {{
-                                            // 4x4/4x8 DC tendency.
-                                            V(1024.0),
-                                            V(1024.0),
-                                            // AFV corner.
-                                            V(50),
-                                            V(50),
-                                            V(50),
-                                            // AFV high freqs.
-                                            V(58.0),
-                                            V(0.0),
-                                            V(0.0),
-                                            V(0.0),
-                                        }},
-                                        {{
-                                            // 4x4/4x8 DC tendency.
-                                            V(384.0),
-                                            V(384.0),
-                                            // AFV corner.
-                                            V(12.0),
-                                            V(12.0),
-                                            V(12.0),
-                                            // AFV high freqs.
-                                            V(22.0),
-                                            V(-0.25),
-                                            V(-0.25),
-                                            V(-0.25),
-                                        }}}});
-  }
-
-  // DCT64
-  static QuantEncodingInternal DCT64X64() {
-    return QuantEncodingInternal::DCT(
-        DctQuantWeightParams({{{{
-                                   V(0.9 * 26629.073922049845),
-                                   V(-1.025),
-                                   V(-0.78),
-                                   V(-0.65012),
-                                   V(-0.19041574084286472),
-                                   V(-0.20819395464),
-                                   V(-0.421064),
-                                   V(-0.32733845535848671),
-                               }},
-                               {{
-                                   V(0.9 * 9311.3238710010046),
-                                   V(-0.3041958212306401),
-                                   V(-0.3633036457487539),
-                                   V(-0.35660379990111464),
-                                   V(-0.3443074455424403),
-                                   V(-0.33699592683512467),
-                                   V(-0.30180866526242109),
-                                   V(-0.27321683125358037),
-                               }},
-                               {{
-                                   V(0.9 * 4992.2486445538634),
-                                   V(-1.2),
-                                   V(-1.2),
-                                   V(-0.8),
-                                   V(-0.7),
-                                   V(-0.7),
-                                   V(-0.4),
-                                   V(-0.5),
-                               }}}},
-                             8));
-  }
-
-  // DCT64X32
-  static QuantEncodingInternal DCT32X64() {
-    return QuantEncodingInternal::DCT(
-        DctQuantWeightParams({{{{
-                                   V(0.65 * 23629.073922049845),
-                                   V(-1.025),
-                                   V(-0.78),
-                                   V(-0.65012),
-                                   V(-0.19041574084286472),
-                                   V(-0.20819395464),
-                                   V(-0.421064),
-                                   V(-0.32733845535848671),
-                               }},
-                               {{
-                                   V(0.65 * 8611.3238710010046),
-                                   V(-0.3041958212306401),
-                                   V(-0.3633036457487539),
-                                   V(-0.35660379990111464),
-                                   V(-0.3443074455424403),
-                                   V(-0.33699592683512467),
-                                   V(-0.30180866526242109),
-                                   V(-0.27321683125358037),
-                               }},
-                               {{
-                                   V(0.65 * 4492.2486445538634),
-                                   V(-1.2),
-                                   V(-1.2),
-                                   V(-0.8),
-                                   V(-0.7),
-                                   V(-0.7),
-                                   V(-0.4),
-                                   V(-0.5),
-                               }}}},
-                             8));
-  }
-  // DCT128X128
-  static QuantEncodingInternal DCT128X128() {
-    return QuantEncodingInternal::DCT(
-        DctQuantWeightParams({{{{
-                                   V(1.8 * 26629.073922049845),
-                                   V(-1.025),
-                                   V(-0.78),
-                                   V(-0.65012),
-                                   V(-0.19041574084286472),
-                                   V(-0.20819395464),
-                                   V(-0.421064),
-                                   V(-0.32733845535848671),
-                               }},
-                               {{
-                                   V(1.8 * 9311.3238710010046),
-                                   V(-0.3041958212306401),
-                                   V(-0.3633036457487539),
-                                   V(-0.35660379990111464),
-                                   V(-0.3443074455424403),
-                                   V(-0.33699592683512467),
-                                   V(-0.30180866526242109),
-                                   V(-0.27321683125358037),
-                               }},
-                               {{
-                                   V(1.8 * 4992.2486445538634),
-                                   V(-1.2),
-                                   V(-1.2),
-                                   V(-0.8),
-                                   V(-0.7),
-                                   V(-0.7),
-                                   V(-0.4),
-                                   V(-0.5),
-                               }}}},
-                             8));
-  }
-
-  // DCT128X64
-  static QuantEncodingInternal DCT64X128() {
-    return QuantEncodingInternal::DCT(
-        DctQuantWeightParams({{{{
-                                   V(1.3 * 23629.073922049845),
-                                   V(-1.025),
-                                   V(-0.78),
-                                   V(-0.65012),
-                                   V(-0.19041574084286472),
-                                   V(-0.20819395464),
-                                   V(-0.421064),
-                                   V(-0.32733845535848671),
-                               }},
-                               {{
-                                   V(1.3 * 8611.3238710010046),
-                                   V(-0.3041958212306401),
-                                   V(-0.3633036457487539),
-                                   V(-0.35660379990111464),
-                                   V(-0.3443074455424403),
-                                   V(-0.33699592683512467),
-                                   V(-0.30180866526242109),
-                                   V(-0.27321683125358037),
-                               }},
-                               {{
-                                   V(1.3 * 4492.2486445538634),
-                                   V(-1.2),
-                                   V(-1.2),
-                                   V(-0.8),
-                                   V(-0.7),
-                                   V(-0.7),
-                                   V(-0.4),
-                                   V(-0.5),
-                               }}}},
-                             8));
-  }
-  // DCT256X256
-  static QuantEncodingInternal DCT256X256() {
-    return QuantEncodingInternal::DCT(
-        DctQuantWeightParams({{{{
-                                   V(3.6 * 26629.073922049845),
-                                   V(-1.025),
-                                   V(-0.78),
-                                   V(-0.65012),
-                                   V(-0.19041574084286472),
-                                   V(-0.20819395464),
-                                   V(-0.421064),
-                                   V(-0.32733845535848671),
-                               }},
-                               {{
-                                   V(3.6 * 9311.3238710010046),
-                                   V(-0.3041958212306401),
-                                   V(-0.3633036457487539),
-                                   V(-0.35660379990111464),
-                                   V(-0.3443074455424403),
-                                   V(-0.33699592683512467),
-                                   V(-0.30180866526242109),
-                                   V(-0.27321683125358037),
-                               }},
-                               {{
-                                   V(3.6 * 4992.2486445538634),
-                                   V(-1.2),
-                                   V(-1.2),
-                                   V(-0.8),
-                                   V(-0.7),
-                                   V(-0.7),
-                                   V(-0.4),
-                                   V(-0.5),
-                               }}}},
-                             8));
-  }
-
-  // DCT256X128
-  static QuantEncodingInternal DCT128X256() {
-    return QuantEncodingInternal::DCT(
-        DctQuantWeightParams({{{{
-                                   V(2.6 * 23629.073922049845),
-                                   V(-1.025),
-                                   V(-0.78),
-                                   V(-0.65012),
-                                   V(-0.19041574084286472),
-                                   V(-0.20819395464),
-                                   V(-0.421064),
-                                   V(-0.32733845535848671),
-                               }},
-                               {{
-                                   V(2.6 * 8611.3238710010046),
-                                   V(-0.3041958212306401),
-                                   V(-0.3633036457487539),
-                                   V(-0.35660379990111464),
-                                   V(-0.3443074455424403),
-                                   V(-0.33699592683512467),
-                                   V(-0.30180866526242109),
-                                   V(-0.27321683125358037),
-                               }},
-                               {{
-                                   V(2.6 * 4492.2486445538634),
-                                   V(-1.2),
-                                   V(-1.2),
-                                   V(-0.8),
-                                   V(-0.7),
-                                   V(-0.7),
-                                   V(-0.4),
-                                   V(-0.5),
-                               }}}},
-                             8));
-  }
-};
-}  // namespace
-
-DequantMatrices::DequantLibraryInternal DequantMatrices::LibraryInit() {
-  static_assert(kNumQuantTables == 17,
-                "Update this function when adding new quantization kinds.");
-  static_assert(kNumPredefinedTables == 1,
-                "Update this function when adding new quantization matrices to "
-                "the library.");
-
-  // The library and the indices need to be kept in sync manually.
-  static_assert(0 == static_cast<uint8_t>(QuantTable::DCT),
-                "Update the DequantLibrary array below.");
-  static_assert(1 == static_cast<uint8_t>(QuantTable::IDENTITY),
-                "Update the DequantLibrary array below.");
-  static_assert(2 == static_cast<uint8_t>(QuantTable::DCT2X2),
-                "Update the DequantLibrary array below.");
-  static_assert(3 == static_cast<uint8_t>(QuantTable::DCT4X4),
-                "Update the DequantLibrary array below.");
-  static_assert(4 == static_cast<uint8_t>(QuantTable::DCT16X16),
-                "Update the DequantLibrary array below.");
-  static_assert(5 == static_cast<uint8_t>(QuantTable::DCT32X32),
-                "Update the DequantLibrary array below.");
-  static_assert(6 == static_cast<uint8_t>(QuantTable::DCT8X16),
-                "Update the DequantLibrary array below.");
-  static_assert(7 == static_cast<uint8_t>(QuantTable::DCT8X32),
-                "Update the DequantLibrary array below.");
-  static_assert(8 == static_cast<uint8_t>(QuantTable::DCT16X32),
-                "Update the DequantLibrary array below.");
-  static_assert(9 == static_cast<uint8_t>(QuantTable::DCT4X8),
-                "Update the DequantLibrary array below.");
-  static_assert(10 == static_cast<uint8_t>(QuantTable::AFV0),
-                "Update the DequantLibrary array below.");
-  static_assert(11 == static_cast<uint8_t>(QuantTable::DCT64X64),
-                "Update the DequantLibrary array below.");
-  static_assert(12 == static_cast<uint8_t>(QuantTable::DCT32X64),
-                "Update the DequantLibrary array below.");
-  static_assert(13 == static_cast<uint8_t>(QuantTable::DCT128X128),
-                "Update the DequantLibrary array below.");
-  static_assert(14 == static_cast<uint8_t>(QuantTable::DCT64X128),
-                "Update the DequantLibrary array below.");
-  static_assert(15 == static_cast<uint8_t>(QuantTable::DCT256X256),
-                "Update the DequantLibrary array below.");
-  static_assert(16 == static_cast<uint8_t>(QuantTable::DCT128X256),
-                "Update the DequantLibrary array below.");
-  return DequantMatrices::DequantLibraryInternal{{
-      DequantMatricesLibraryDef::DCT(),
-      DequantMatricesLibraryDef::IDENTITY(),
-      DequantMatricesLibraryDef::DCT2X2(),
-      DequantMatricesLibraryDef::DCT4X4(),
-      DequantMatricesLibraryDef::DCT16X16(),
-      DequantMatricesLibraryDef::DCT32X32(),
-      DequantMatricesLibraryDef::DCT8X16(),
-      DequantMatricesLibraryDef::DCT8X32(),
-      DequantMatricesLibraryDef::DCT16X32(),
-      DequantMatricesLibraryDef::DCT4X8(),
-      DequantMatricesLibraryDef::AFV0(),
-      DequantMatricesLibraryDef::DCT64X64(),
-      DequantMatricesLibraryDef::DCT32X64(),
-      // Same default for large transforms (128+) as for 64x* transforms.
-      DequantMatricesLibraryDef::DCT128X128(),
-      DequantMatricesLibraryDef::DCT64X128(),
-      DequantMatricesLibraryDef::DCT256X256(),
-      DequantMatricesLibraryDef::DCT128X256(),
-  }};
-}
-
-const QuantEncoding* DequantMatrices::Library() {
-  static const DequantMatrices::DequantLibraryInternal kDequantLibrary =
-      DequantMatrices::LibraryInit();
-  // Downcast the result to a const QuantEncoding* from QuantEncodingInternal*
-  // since the subclass (QuantEncoding) doesn't add any new members and users
-  // will need to upcast to QuantEncodingInternal to access the members of that
-  // class. This allows to have kDequantLibrary as a constexpr value while still
-  // allowing to create QuantEncoding::RAW() instances that use std::vector in
-  // C++11.
-  return reinterpret_cast<const QuantEncoding*>(kDequantLibrary.data());
-}
-
-DequantMatrices::DequantMatrices() {
-  encodings_.resize(kNumQuantTables, QuantEncoding::Library<0>());
-  size_t pos = 0;
-  size_t offsets[kNumQuantTables * 3];
-  for (size_t i = 0; i < static_cast<size_t>(kNumQuantTables); i++) {
-    size_t num = required_size_x[i] * required_size_y[i] * kDCTBlockSize;
-    for (size_t c = 0; c < 3; c++) {
-      offsets[3 * i + c] = pos + c * num;
-    }
-    pos += 3 * num;
-  }
-  for (size_t i = 0; i < AcStrategy::kNumValidStrategies; i++) {
-    for (size_t c = 0; c < 3; c++) {
-      table_offsets_[i * 3 + c] =
-          offsets[static_cast<size_t>(kAcStrategyToQuantTableMap[i]) * 3 + c];
-    }
-  }
-}
-
-Status DequantMatrices::EnsureComputed(JxlMemoryManager* memory_manager,
-                                       uint32_t acs_mask) {
-  const QuantEncoding* library = Library();
-
-  if (!table_storage_) {
-    size_t table_storage_bytes = 2 * kTotalTableSize * sizeof(float);
-    JXL_ASSIGN_OR_RETURN(
-        table_storage_,
-        AlignedMemory::Create(memory_manager, table_storage_bytes));
-    table_ = table_storage_.address<float>();
-    inv_table_ = table_ + kTotalTableSize;
-  }
-
-  size_t offsets[kNumQuantTables * 3 + 1];
-  size_t pos = 0;
-  for (size_t i = 0; i < kNumQuantTables; i++) {
-    size_t num = required_size_x[i] * required_size_y[i] * kDCTBlockSize;
-    for (size_t c = 0; c < 3; c++) {
-      offsets[3 * i + c] = pos + c * num;
-    }
-    pos += 3 * num;
-  }
-  offsets[kNumQuantTables * 3] = pos;
-  JXL_ENSURE(pos == kTotalTableSize);
-
-  uint32_t kind_mask = 0;
-  for (size_t i = 0; i < AcStrategy::kNumValidStrategies; i++) {
-    if (acs_mask & (1u << i)) {
-      kind_mask |= 1u << static_cast<uint32_t>(kAcStrategyToQuantTableMap[i]);
-    }
-  }
-  uint32_t computed_kind_mask = 0;
-  for (size_t i = 0; i < AcStrategy::kNumValidStrategies; i++) {
-    if (computed_mask_ & (1u << i)) {
-      computed_kind_mask |=
-          1u << static_cast<uint32_t>(kAcStrategyToQuantTableMap[i]);
-    }
-  }
-  for (size_t table = 0; table < kNumQuantTables; table++) {
-    if ((1 << table) & computed_kind_mask) continue;
-    if ((1 << table) & ~kind_mask) continue;
-    size_t pos = offsets[table * 3];
-    float* mutable_table = table_storage_.address<float>();
-    if (encodings_[table].mode == QuantEncoding::kQuantModeLibrary) {
-      JXL_RETURN_IF_ERROR(HWY_DYNAMIC_DISPATCH(ComputeQuantTable)(
-          library[table], mutable_table, mutable_table + kTotalTableSize, table,
-          QuantTable(table), &pos));
-    } else {
-      JXL_RETURN_IF_ERROR(HWY_DYNAMIC_DISPATCH(ComputeQuantTable)(
-          encodings_[table], mutable_table, mutable_table + kTotalTableSize,
-          table, QuantTable(table), &pos));
-    }
-    JXL_ENSURE(pos == offsets[table * 3 + 3]);
-  }
-  computed_mask_ |= acs_mask;
-
-  return true;
-}
-
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl/quant_weights.h b/third_party/jpeg-xl/lib/jxl/quant_weights.h
deleted file mode 100644
index 60c84abded553..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/quant_weights.h
+++ /dev/null
@@ -1,439 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_QUANT_WEIGHTS_H_
-#define LIB_JXL_QUANT_WEIGHTS_H_
-
-#include <jxl/memory_manager.h>
-
-#include <array>
-#include <cstdint>
-#include <cstring>
-#include <vector>
-
-#include "lib/jxl/ac_strategy.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/memory_manager_internal.h"
-
-namespace jxl {
-
-static constexpr size_t kMaxQuantTableSize = AcStrategy::kMaxCoeffArea;
-static constexpr size_t kNumPredefinedTables = 1;
-static constexpr size_t kCeilLog2NumPredefinedTables = 0;
-static constexpr size_t kLog2NumQuantModes = 3;
-
-struct DctQuantWeightParams {
-  static constexpr size_t kLog2MaxDistanceBands = 4;
-  static constexpr size_t kMaxDistanceBands = 1 + (1 << kLog2MaxDistanceBands);
-  typedef std::array<std::array<float, kMaxDistanceBands>, 3>
-      DistanceBandsArray;
-
-  size_t num_distance_bands = 0;
-  DistanceBandsArray distance_bands = {};
-
-  constexpr DctQuantWeightParams() : num_distance_bands(0) {}
-
-  constexpr DctQuantWeightParams(const DistanceBandsArray& dist_bands,
-                                 size_t num_dist_bands)
-      : num_distance_bands(num_dist_bands), distance_bands(dist_bands) {}
-
-  template <size_t num_dist_bands>
-  explicit DctQuantWeightParams(const float dist_bands[3][num_dist_bands]) {
-    num_distance_bands = num_dist_bands;
-    for (size_t c = 0; c < 3; c++) {
-      memcpy(distance_bands[c].data(), dist_bands[c],
-             sizeof(float) * num_dist_bands);
-    }
-  }
-};
-
-// NOLINTNEXTLINE(clang-analyzer-optin.performance.Padding)
-struct QuantEncodingInternal {
-  enum Mode {
-    kQuantModeLibrary,
-    kQuantModeID,
-    kQuantModeDCT2,
-    kQuantModeDCT4,
-    kQuantModeDCT4X8,
-    kQuantModeAFV,
-    kQuantModeDCT,
-    kQuantModeRAW,
-  };
-
-  template <Mode mode>
-  struct Tag {};
-
-  typedef std::array<std::array<float, 3>, 3> IdWeights;
-  typedef std::array<std::array<float, 6>, 3> DCT2Weights;
-  typedef std::array<std::array<float, 2>, 3> DCT4Multipliers;
-  typedef std::array<std::array<float, 9>, 3> AFVWeights;
-  typedef std::array<float, 3> DCT4x8Multipliers;
-
-  template <size_t A>
-  static constexpr QuantEncodingInternal Library() {
-    static_assert(A < kNumPredefinedTables);
-    return QuantEncodingInternal(Tag<kQuantModeLibrary>(), A);
-  }
-  constexpr QuantEncodingInternal(Tag<kQuantModeLibrary> /* tag */,
-                                  uint8_t predefined)
-      : mode(kQuantModeLibrary), predefined(predefined) {}
-
-  // Identity
-  // xybweights is an array of {xweights, yweights, bweights}.
-  static constexpr QuantEncodingInternal Identity(const IdWeights& xybweights) {
-    return QuantEncodingInternal(Tag<kQuantModeID>(), xybweights);
-  }
-  constexpr QuantEncodingInternal(Tag<kQuantModeID> /* tag */,
-                                  const IdWeights& xybweights)
-      : mode(kQuantModeID), idweights(xybweights) {}
-
-  // DCT2
-  static constexpr QuantEncodingInternal DCT2(const DCT2Weights& xybweights) {
-    return QuantEncodingInternal(Tag<kQuantModeDCT2>(), xybweights);
-  }
-  constexpr QuantEncodingInternal(Tag<kQuantModeDCT2> /* tag */,
-                                  const DCT2Weights& xybweights)
-      : mode(kQuantModeDCT2), dct2weights(xybweights) {}
-
-  // DCT4
-  static constexpr QuantEncodingInternal DCT4(
-      const DctQuantWeightParams& params, const DCT4Multipliers& xybmul) {
-    return QuantEncodingInternal(Tag<kQuantModeDCT4>(), params, xybmul);
-  }
-  constexpr QuantEncodingInternal(Tag<kQuantModeDCT4> /* tag */,
-                                  const DctQuantWeightParams& params,
-                                  const DCT4Multipliers& xybmul)
-      : mode(kQuantModeDCT4), dct_params(params), dct4multipliers(xybmul) {}
-
-  // DCT4x8
-  static constexpr QuantEncodingInternal DCT4X8(
-      const DctQuantWeightParams& params, const DCT4x8Multipliers& xybmul) {
-    return QuantEncodingInternal(Tag<kQuantModeDCT4X8>(), params, xybmul);
-  }
-  constexpr QuantEncodingInternal(Tag<kQuantModeDCT4X8> /* tag */,
-                                  const DctQuantWeightParams& params,
-                                  const DCT4x8Multipliers& xybmul)
-      : mode(kQuantModeDCT4X8), dct_params(params), dct4x8multipliers(xybmul) {}
-
-  // DCT
-  static constexpr QuantEncodingInternal DCT(
-      const DctQuantWeightParams& params) {
-    return QuantEncodingInternal(Tag<kQuantModeDCT>(), params);
-  }
-  constexpr QuantEncodingInternal(Tag<kQuantModeDCT> /* tag */,
-                                  const DctQuantWeightParams& params)
-      : mode(kQuantModeDCT), dct_params(params) {}
-
-  // AFV
-  static constexpr QuantEncodingInternal AFV(
-      const DctQuantWeightParams& params4x8,
-      const DctQuantWeightParams& params4x4, const AFVWeights& weights) {
-    return QuantEncodingInternal(Tag<kQuantModeAFV>(), params4x8, params4x4,
-                                 weights);
-  }
-  constexpr QuantEncodingInternal(Tag<kQuantModeAFV> /* tag */,
-                                  const DctQuantWeightParams& params4x8,
-                                  const DctQuantWeightParams& params4x4,
-                                  const AFVWeights& weights)
-      : mode(kQuantModeAFV),
-        dct_params(params4x8),
-        afv_weights(weights),
-        dct_params_afv_4x4(params4x4) {}
-
-  // This constructor is not constexpr so it can't be used in any of the
-  // constexpr cases above.
-  explicit QuantEncodingInternal(Mode mode) : mode(mode) {}
-
-  Mode mode;
-
-  // Weights for DCT4+ tables.
-  DctQuantWeightParams dct_params;
-
-  union {
-    // Weights for identity.
-    IdWeights idweights;
-
-    // Weights for DCT2.
-    DCT2Weights dct2weights;
-
-    // Extra multipliers for coefficients 01/10 and 11 for DCT4 and AFV.
-    DCT4Multipliers dct4multipliers;
-
-    // Weights for AFV. {0, 1} are used directly for coefficients (0, 1) and (1,
-    // 0);  {2, 3, 4} are used directly corner DC, (1,0) - (0,1) and (0, 1) +
-    // (1, 0) - (0, 0) inside the AFV block. Values from 5 to 8 are interpolated
-    // as in GetQuantWeights for DC and are used for other coefficients.
-    AFVWeights afv_weights = {};
-
-    // Extra multipliers for coefficients 01 or 10 for DCT4X8 and DCT8X4.
-    DCT4x8Multipliers dct4x8multipliers;
-
-    // Only used in kQuantModeRAW mode.
-    struct {
-      // explicit quantization table (like in JPEG)
-      std::vector<int>* qtable = nullptr;
-      float qtable_den = 1.f / (8 * 255);
-    } qraw;
-  };
-
-  // Weights for 4x4 sub-block in AFV.
-  DctQuantWeightParams dct_params_afv_4x4;
-
-  union {
-    // Which predefined table to use. Only used if mode is kQuantModeLibrary.
-    uint8_t predefined = 0;
-
-    // Which other quant table to copy; must copy from a table that comes before
-    // the current one. Only used if mode is kQuantModeCopy.
-    uint8_t source;
-  };
-};
-
-class QuantEncoding final : public QuantEncodingInternal {
- public:
-  QuantEncoding(const QuantEncoding& other)
-      : QuantEncodingInternal(
-            static_cast<const QuantEncodingInternal&>(other)) {
-    if (mode == kQuantModeRAW && qraw.qtable) {
-      // Need to make a copy of the passed *qtable.
-      qraw.qtable = new std::vector<int>(*other.qraw.qtable);
-    }
-  }
-  QuantEncoding(QuantEncoding&& other) noexcept
-      : QuantEncodingInternal(
-            static_cast<const QuantEncodingInternal&>(other)) {
-    // Steal the qtable from the other object if any.
-    if (mode == kQuantModeRAW) {
-      other.qraw.qtable = nullptr;
-    }
-  }
-  QuantEncoding& operator=(const QuantEncoding& other) {
-    if (mode == kQuantModeRAW && qraw.qtable) {
-      delete qraw.qtable;
-    }
-    *static_cast<QuantEncodingInternal*>(this) =
-        QuantEncodingInternal(static_cast<const QuantEncodingInternal&>(other));
-    if (mode == kQuantModeRAW && qraw.qtable) {
-      // Need to make a copy of the passed *qtable.
-      qraw.qtable = new std::vector<int>(*other.qraw.qtable);
-    }
-    return *this;
-  }
-
-  ~QuantEncoding() {
-    if (mode == kQuantModeRAW && qraw.qtable) {
-      delete qraw.qtable;
-    }
-  }
-
-  // Wrappers of the QuantEncodingInternal:: static functions that return a
-  // QuantEncoding instead. This is using the explicit and private cast from
-  // QuantEncodingInternal to QuantEncoding, which would be inlined anyway.
-  // In general, you should use this wrappers. The only reason to directly
-  // create a QuantEncodingInternal instance is if you need a constexpr version
-  // of this class. Note that RAW() is not supported in that case since it uses
-  // a std::vector.
-  template <size_t A>
-  static QuantEncoding Library() {
-    return QuantEncoding(QuantEncodingInternal::Library<A>());
-  }
-  static QuantEncoding Identity(const IdWeights& xybweights) {
-    return QuantEncoding(QuantEncodingInternal::Identity(xybweights));
-  }
-  static QuantEncoding DCT2(const DCT2Weights& xybweights) {
-    return QuantEncoding(QuantEncodingInternal::DCT2(xybweights));
-  }
-  static QuantEncoding DCT4(const DctQuantWeightParams& params,
-                            const DCT4Multipliers& xybmul) {
-    return QuantEncoding(QuantEncodingInternal::DCT4(params, xybmul));
-  }
-  static QuantEncoding DCT4X8(const DctQuantWeightParams& params,
-                              const DCT4x8Multipliers& xybmul) {
-    return QuantEncoding(QuantEncodingInternal::DCT4X8(params, xybmul));
-  }
-  static QuantEncoding DCT(const DctQuantWeightParams& params) {
-    return QuantEncoding(QuantEncodingInternal::DCT(params));
-  }
-  static QuantEncoding AFV(const DctQuantWeightParams& params4x8,
-                           const DctQuantWeightParams& params4x4,
-                           const AFVWeights& weights) {
-    return QuantEncoding(
-        QuantEncodingInternal::AFV(params4x8, params4x4, weights));
-  }
-
-  // RAW, note that this one is not a constexpr one.
-  static QuantEncoding RAW(std::vector<int>&& qtable, int shift = 0) {
-    QuantEncoding encoding(kQuantModeRAW);
-    encoding.qraw.qtable = new std::vector<int>();
-    *encoding.qraw.qtable = qtable;
-    encoding.qraw.qtable_den = (1 << shift) * (1.f / (8 * 255));
-    return encoding;
-  }
-
- private:
-  explicit QuantEncoding(const QuantEncodingInternal& other)
-      : QuantEncodingInternal(other) {}
-
-  explicit QuantEncoding(QuantEncodingInternal::Mode mode_arg)
-      : QuantEncodingInternal(mode_arg) {}
-};
-
-// A constexpr QuantEncodingInternal instance is often downcasted to the
-// QuantEncoding subclass even if the instance wasn't an instance of the
-// subclass. This is safe because user will upcast to QuantEncodingInternal to
-// access any of its members.
-static_assert(sizeof(QuantEncoding) == sizeof(QuantEncodingInternal),
-              "Don't add any members to QuantEncoding");
-
-// Let's try to keep these 2**N for possible future simplicity.
-const float kInvDCQuant[3] = {
-    4096.0f,
-    512.0f,
-    256.0f,
-};
-
-const float kDCQuant[3] = {
-    1.0f / kInvDCQuant[0],
-    1.0f / kInvDCQuant[1],
-    1.0f / kInvDCQuant[2],
-};
-
-class ModularFrameEncoder;
-class ModularFrameDecoder;
-
-enum class QuantTable : size_t {
-  DCT = 0,
-  IDENTITY,
-  DCT2X2,
-  DCT4X4,
-  DCT16X16,
-  DCT32X32,
-  // DCT16X8
-  DCT8X16,
-  // DCT32X8
-  DCT8X32,
-  // DCT32X16
-  DCT16X32,
-  DCT4X8,
-  // DCT8X4
-  AFV0,
-  // AFV1
-  // AFV2
-  // AFV3
-  DCT64X64,
-  // DCT64X32,
-  DCT32X64,
-  DCT128X128,
-  // DCT128X64,
-  DCT64X128,
-  DCT256X256,
-  // DCT256X128,
-  DCT128X256
-};
-
-static constexpr uint8_t kNumQuantTables =
-    static_cast<uint8_t>(QuantTable::DCT128X256) + 1;
-
-static const std::array<QuantTable, AcStrategy::kNumValidStrategies>
-    kAcStrategyToQuantTableMap = {
-        QuantTable::DCT,        QuantTable::IDENTITY,   QuantTable::DCT2X2,
-        QuantTable::DCT4X4,     QuantTable::DCT16X16,   QuantTable::DCT32X32,
-        QuantTable::DCT8X16,    QuantTable::DCT8X16,    QuantTable::DCT8X32,
-        QuantTable::DCT8X32,    QuantTable::DCT16X32,   QuantTable::DCT16X32,
-        QuantTable::DCT4X8,     QuantTable::DCT4X8,     QuantTable::AFV0,
-        QuantTable::AFV0,       QuantTable::AFV0,       QuantTable::AFV0,
-        QuantTable::DCT64X64,   QuantTable::DCT32X64,   QuantTable::DCT32X64,
-        QuantTable::DCT128X128, QuantTable::DCT64X128,  QuantTable::DCT64X128,
-        QuantTable::DCT256X256, QuantTable::DCT128X256, QuantTable::DCT128X256,
-};
-
-class DequantMatrices {
- public:
-  DequantMatrices();
-
-  static const QuantEncoding* Library();
-
-  typedef std::array<QuantEncodingInternal,
-                     kNumPredefinedTables * kNumQuantTables>
-      DequantLibraryInternal;
-  // Return the array of library kNumPredefinedTables QuantEncoding entries as
-  // a constexpr array. Use Library() to obtain a pointer to the copy in the
-  // .cc file.
-  static DequantLibraryInternal LibraryInit();
-
-  // Returns aligned memory.
-  JXL_INLINE const float* Matrix(AcStrategyType quant_kind, size_t c) const {
-    JXL_DASSERT((1 << static_cast<uint32_t>(quant_kind)) & computed_mask_);
-    return &table_[table_offsets_[static_cast<size_t>(quant_kind) * 3 + c]];
-  }
-
-  JXL_INLINE const float* InvMatrix(AcStrategyType quant_kind, size_t c) const {
-    size_t quant_table_idx = static_cast<uint32_t>(quant_kind);
-    JXL_DASSERT((1 << quant_table_idx) & computed_mask_);
-    return &inv_table_[table_offsets_[quant_table_idx * 3 + c]];
-  }
-
-  // DC quants are used in modular mode for XYB multipliers.
-  JXL_INLINE float DCQuant(size_t c) const { return dc_quant_[c]; }
-  JXL_INLINE const float* DCQuants() const { return dc_quant_; }
-
-  JXL_INLINE float InvDCQuant(size_t c) const { return inv_dc_quant_[c]; }
-
-  // For encoder.
-  void SetEncodings(const std::vector<QuantEncoding>& encodings) {
-    encodings_ = encodings;
-    computed_mask_ = 0;
-  }
-
-  // For encoder.
-  void SetDCQuant(const float dc[3]) {
-    for (size_t c = 0; c < 3; c++) {
-      dc_quant_[c] = 1.0f / dc[c];
-      inv_dc_quant_[c] = dc[c];
-    }
-  }
-
-  Status Decode(JxlMemoryManager* memory_manager, BitReader* br,
-                ModularFrameDecoder* modular_frame_decoder = nullptr);
-  Status DecodeDC(BitReader* br);
-
-  const std::vector<QuantEncoding>& encodings() const { return encodings_; }
-
-  static constexpr auto required_size_x =
-      to_array<int>({1, 1, 1, 1, 2, 4, 1, 1, 2, 1, 1, 8, 4, 16, 8, 32, 16});
-  static_assert(kNumQuantTables == required_size_x.size(),
-                "Update this array when adding or removing quant tables.");
-
-  static constexpr auto required_size_y =
-      to_array<int>({1, 1, 1, 1, 2, 4, 2, 4, 4, 1, 1, 8, 8, 16, 16, 32, 32});
-  static_assert(kNumQuantTables == required_size_y.size(),
-                "Update this array when adding or removing quant tables.");
-
-  // MUST be equal `sum(dot(required_size_x, required_size_y))`.
-  static constexpr size_t kSumRequiredXy = 2056;
-
-  Status EnsureComputed(JxlMemoryManager* memory_manager, uint32_t acs_mask);
-
- private:
-  static constexpr size_t kTotalTableSize = kSumRequiredXy * kDCTBlockSize * 3;
-
-  uint32_t computed_mask_ = 0;
-  // kTotalTableSize entries followed by kTotalTableSize for inv_table
-  AlignedMemory table_storage_;
-  const float* table_;
-  const float* inv_table_;
-  float dc_quant_[3] = {kDCQuant[0], kDCQuant[1], kDCQuant[2]};
-  float inv_dc_quant_[3] = {kInvDCQuant[0], kInvDCQuant[1], kInvDCQuant[2]};
-  size_t table_offsets_[AcStrategy::kNumValidStrategies * 3];
-  std::vector<QuantEncoding> encodings_;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_QUANT_WEIGHTS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/quant_weights_test.cc b/third_party/jpeg-xl/lib/jxl/quant_weights_test.cc
deleted file mode 100644
index 514c5ca1bc811..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/quant_weights_test.cc
+++ /dev/null
@@ -1,268 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-#include "lib/jxl/quant_weights.h"
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <cmath>
-#include <cstdlib>
-#include <hwy/base.h>  // HWY_ALIGN_MAX
-#include <hwy/tests/hwy_gtest.h>
-#include <iterator>
-#include <numeric>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/ac_strategy.h"
-#include "lib/jxl/base/random.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dct_for_test.h"
-#include "lib/jxl/dec_transforms_testonly.h"
-#include "lib/jxl/enc_modular.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/enc_quant_weights.h"
-#include "lib/jxl/enc_transforms.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-// This should have been static assert; not compiling though with C++<17.
-TEST(QuantWeightsTest, Invariant) {
-  size_t sum = 0;
-  ASSERT_EQ(DequantMatrices::required_size_x.size(),
-            DequantMatrices::required_size_y.size());
-  for (size_t i = 0; i < DequantMatrices::required_size_x.size(); ++i) {
-    sum += DequantMatrices::required_size_x[i] *
-           DequantMatrices::required_size_y[i];
-  }
-  ASSERT_EQ(DequantMatrices::kSumRequiredXy, sum);
-}
-
-template <typename T>
-void CheckSimilar(T a, T b) {
-  EXPECT_EQ(a, b);
-}
-// minimum exponent = -15.
-template <>
-void CheckSimilar(float a, float b) {
-  float m = std::max(std::abs(a), std::abs(b));
-  // 10 bits of precision are used in the format. Relative error should be
-  // below 2^-10.
-  EXPECT_LE(std::abs(a - b), m / 1024.0f) << "a: " << a << " b: " << b;
-}
-
-TEST(QuantWeightsTest, DC) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  DequantMatrices mat;
-  float dc_quant[3] = {1e+5, 1e+3, 1e+1};
-  ASSERT_TRUE(DequantMatricesSetCustomDC(memory_manager, &mat, dc_quant));
-  for (size_t c = 0; c < 3; c++) {
-    CheckSimilar(mat.InvDCQuant(c), dc_quant[c]);
-  }
-}
-
-void RoundtripMatrices(const std::vector<QuantEncoding>& encodings) {
-  ASSERT_TRUE(encodings.size() == kNumQuantTables);
-  DequantMatrices mat;
-  CodecMetadata metadata;
-  FrameHeader frame_header(&metadata);
-  JXL_ASSIGN_OR_QUIT(
-      ModularFrameEncoder encoder,
-      ModularFrameEncoder::Create(jxl::test::MemoryManager(), frame_header,
-                                  CompressParams{}, false),
-      "Failed to create ModularFrameEncoder.");
-  ASSERT_TRUE(DequantMatricesSetCustom(&mat, encodings, &encoder));
-  const std::vector<QuantEncoding>& encodings_dec = mat.encodings();
-  for (size_t i = 0; i < encodings.size(); i++) {
-    const QuantEncoding& e = encodings[i];
-    const QuantEncoding& d = encodings_dec[i];
-    // Check values roundtripped correctly.
-    EXPECT_EQ(e.mode, d.mode);
-    EXPECT_EQ(e.predefined, d.predefined);
-    EXPECT_EQ(e.source, d.source);
-
-    EXPECT_EQ(static_cast<uint64_t>(e.dct_params.num_distance_bands),
-              static_cast<uint64_t>(d.dct_params.num_distance_bands));
-    for (size_t c = 0; c < 3; c++) {
-      for (size_t j = 0; j < DctQuantWeightParams::kMaxDistanceBands; j++) {
-        CheckSimilar(e.dct_params.distance_bands[c][j],
-                     d.dct_params.distance_bands[c][j]);
-      }
-    }
-
-    if (e.mode == QuantEncoding::kQuantModeRAW) {
-      EXPECT_FALSE(!e.qraw.qtable);
-      EXPECT_FALSE(!d.qraw.qtable);
-      EXPECT_EQ(e.qraw.qtable->size(), d.qraw.qtable->size());
-      for (size_t j = 0; j < e.qraw.qtable->size(); j++) {
-        EXPECT_EQ(e.qraw.qtable->at(j), d.qraw.qtable->at(j));
-      }
-      EXPECT_NEAR(e.qraw.qtable_den, d.qraw.qtable_den, 1e-7f);
-    } else {
-      // modes different than kQuantModeRAW use one of the other fields used
-      // here, which all happen to be arrays of floats.
-      for (size_t c = 0; c < 3; c++) {
-        for (size_t j = 0; j < 3; j++) {
-          CheckSimilar(e.idweights[c][j], d.idweights[c][j]);
-        }
-        for (size_t j = 0; j < 6; j++) {
-          CheckSimilar(e.dct2weights[c][j], d.dct2weights[c][j]);
-        }
-        for (size_t j = 0; j < 2; j++) {
-          CheckSimilar(e.dct4multipliers[c][j], d.dct4multipliers[c][j]);
-        }
-        CheckSimilar(e.dct4x8multipliers[c], d.dct4x8multipliers[c]);
-        for (size_t j = 0; j < 9; j++) {
-          CheckSimilar(e.afv_weights[c][j], d.afv_weights[c][j]);
-        }
-        for (size_t j = 0; j < DctQuantWeightParams::kMaxDistanceBands; j++) {
-          CheckSimilar(e.dct_params_afv_4x4.distance_bands[c][j],
-                       d.dct_params_afv_4x4.distance_bands[c][j]);
-        }
-      }
-    }
-  }
-}
-
-TEST(QuantWeightsTest, AllDefault) {
-  std::vector<QuantEncoding> encodings(kNumQuantTables,
-                                       QuantEncoding::Library<0>());
-  RoundtripMatrices(encodings);
-}
-
-void TestSingleQuantMatrix(QuantTable kind) {
-  std::vector<QuantEncoding> encodings(kNumQuantTables,
-                                       QuantEncoding::Library<0>());
-  size_t quant_table_idx = static_cast<size_t>(kind);
-  encodings[quant_table_idx] = DequantMatrices::Library()[quant_table_idx];
-  RoundtripMatrices(encodings);
-}
-
-// Ensure we can reasonably represent default quant tables.
-TEST(QuantWeightsTest, DCT) { TestSingleQuantMatrix(QuantTable::DCT); }
-TEST(QuantWeightsTest, IDENTITY) {
-  TestSingleQuantMatrix(QuantTable::IDENTITY);
-}
-TEST(QuantWeightsTest, DCT2X2) { TestSingleQuantMatrix(QuantTable::DCT2X2); }
-TEST(QuantWeightsTest, DCT4X4) { TestSingleQuantMatrix(QuantTable::DCT4X4); }
-TEST(QuantWeightsTest, DCT16X16) {
-  TestSingleQuantMatrix(QuantTable::DCT16X16);
-}
-TEST(QuantWeightsTest, DCT32X32) {
-  TestSingleQuantMatrix(QuantTable::DCT32X32);
-}
-TEST(QuantWeightsTest, DCT8X16) { TestSingleQuantMatrix(QuantTable::DCT8X16); }
-TEST(QuantWeightsTest, DCT8X32) { TestSingleQuantMatrix(QuantTable::DCT8X32); }
-TEST(QuantWeightsTest, DCT16X32) {
-  TestSingleQuantMatrix(QuantTable::DCT16X32);
-}
-TEST(QuantWeightsTest, DCT4X8) { TestSingleQuantMatrix(QuantTable::DCT4X8); }
-TEST(QuantWeightsTest, AFV0) { TestSingleQuantMatrix(QuantTable::AFV0); }
-TEST(QuantWeightsTest, RAW) {
-  std::vector<QuantEncoding> encodings(kNumQuantTables,
-                                       QuantEncoding::Library<0>());
-  std::vector<int> matrix(3 * 32 * 32);
-  Rng rng(0);
-  for (int& v : matrix) v = rng.UniformI(1, 256);
-  QuantTable quant_table =
-      kAcStrategyToQuantTableMap[static_cast<size_t>(AcStrategyType::DCT32X32)];
-  encodings[static_cast<size_t>(quant_table)] =
-      QuantEncoding::RAW(std::move(matrix), 2);
-  RoundtripMatrices(encodings);
-}
-
-class QuantWeightsTargetTest : public hwy::TestWithParamTarget {};
-HWY_TARGET_INSTANTIATE_TEST_SUITE_P(QuantWeightsTargetTest);
-
-TEST_P(QuantWeightsTargetTest, DCTUniform) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  constexpr float kUniformQuant = 4;
-  float weights[3][2] = {{1.0f / kUniformQuant, 0},
-                         {1.0f / kUniformQuant, 0},
-                         {1.0f / kUniformQuant, 0}};
-  DctQuantWeightParams dct_params(weights);
-  std::vector<QuantEncoding> encodings(kNumQuantTables,
-                                       QuantEncoding::DCT(dct_params));
-  DequantMatrices dequant_matrices;
-  CodecMetadata metadata;
-  FrameHeader frame_header(&metadata);
-  JXL_ASSIGN_OR_QUIT(
-      ModularFrameEncoder encoder,
-      ModularFrameEncoder::Create(jxl::test::MemoryManager(), frame_header,
-                                  CompressParams{}, false),
-      "Failed to create ModularFrameEncoder.");
-  ASSERT_TRUE(DequantMatricesSetCustom(&dequant_matrices, encodings, &encoder));
-  ASSERT_TRUE(dequant_matrices.EnsureComputed(memory_manager, ~0u));
-
-  const float dc_quant[3] = {1.0f / kUniformQuant, 1.0f / kUniformQuant,
-                             1.0f / kUniformQuant};
-  ASSERT_TRUE(
-      DequantMatricesSetCustomDC(memory_manager, &dequant_matrices, dc_quant));
-
-  HWY_ALIGN_MAX float scratch_space[16 * 16 * 5];
-
-  // DCT8
-  {
-    HWY_ALIGN_MAX float pixels[64];
-    std::iota(std::begin(pixels), std::end(pixels), 0);
-    HWY_ALIGN_MAX float coeffs[64];
-    const AcStrategyType dct = AcStrategyType::DCT;
-    TransformFromPixels(dct, pixels, 8, coeffs, scratch_space);
-    HWY_ALIGN_MAX double slow_coeffs[64];
-    for (size_t i = 0; i < 64; i++) slow_coeffs[i] = pixels[i];
-    DCTSlow<8>(slow_coeffs);
-
-    for (size_t i = 0; i < 64; i++) {
-      // DCTSlow doesn't multiply/divide by 1/N, so we do it manually.
-      slow_coeffs[i] = roundf(slow_coeffs[i] / kUniformQuant) * kUniformQuant;
-      coeffs[i] = roundf(coeffs[i] / dequant_matrices.Matrix(dct, 0)[i]) *
-                  dequant_matrices.Matrix(dct, 0)[i];
-    }
-    IDCTSlow<8>(slow_coeffs);
-    TransformToPixels(dct, coeffs, pixels, 8, scratch_space);
-    for (size_t i = 0; i < 64; i++) {
-      EXPECT_NEAR(pixels[i], slow_coeffs[i], 1e-4);
-    }
-  }
-
-  // DCT16
-  {
-    HWY_ALIGN_MAX float pixels[64 * 4];
-    std::iota(std::begin(pixels), std::end(pixels), 0);
-    HWY_ALIGN_MAX float coeffs[64 * 4];
-    const AcStrategyType dct = AcStrategyType::DCT16X16;
-    TransformFromPixels(dct, pixels, 16, coeffs, scratch_space);
-    HWY_ALIGN_MAX double slow_coeffs[64 * 4];
-    for (size_t i = 0; i < 64 * 4; i++) slow_coeffs[i] = pixels[i];
-    DCTSlow<16>(slow_coeffs);
-
-    for (size_t i = 0; i < 64 * 4; i++) {
-      slow_coeffs[i] = roundf(slow_coeffs[i] / kUniformQuant) * kUniformQuant;
-      coeffs[i] = roundf(coeffs[i] / dequant_matrices.Matrix(dct, 0)[i]) *
-                  dequant_matrices.Matrix(dct, 0)[i];
-    }
-
-    IDCTSlow<16>(slow_coeffs);
-    TransformToPixels(dct, coeffs, pixels, 16, scratch_space);
-    for (size_t i = 0; i < 64 * 4; i++) {
-      EXPECT_NEAR(pixels[i], slow_coeffs[i], 1e-4);
-    }
-  }
-
-  // Check that all matrices have the same DC quantization, i.e. that they all
-  // have the same scaling.
-  for (size_t i = 0; i < AcStrategy::kNumValidStrategies; i++) {
-    AcStrategyType kind = static_cast<AcStrategyType>(i);
-    EXPECT_NEAR(dequant_matrices.Matrix(kind, 0)[0], kUniformQuant, 1e-6);
-  }
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/quantizer-inl.h b/third_party/jpeg-xl/lib/jxl/quantizer-inl.h
deleted file mode 100644
index 64d273c552603..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/quantizer-inl.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#if defined(LIB_JXL_QUANTIZER_INL_H_) == defined(HWY_TARGET_TOGGLE)
-#ifdef LIB_JXL_QUANTIZER_INL_H_
-#undef LIB_JXL_QUANTIZER_INL_H_
-#else
-#define LIB_JXL_QUANTIZER_INL_H_
-#endif
-
-#include <stddef.h>
-
-#include <hwy/highway.h>
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-namespace {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::And;
-using hwy::HWY_NAMESPACE::AndNot;
-using hwy::HWY_NAMESPACE::ApproximateReciprocal;
-using hwy::HWY_NAMESPACE::Gt;
-using hwy::HWY_NAMESPACE::IfThenElse;
-using hwy::HWY_NAMESPACE::IfThenElseZero;
-using hwy::HWY_NAMESPACE::Lt;
-using hwy::HWY_NAMESPACE::Rebind;
-using hwy::HWY_NAMESPACE::Vec;
-using hwy::HWY_NAMESPACE::Xor;
-
-template <class DI>
-HWY_INLINE HWY_MAYBE_UNUSED Vec<Rebind<float, DI>> AdjustQuantBias(
-    DI di, const size_t c, const Vec<DI> quant_i,
-    const float* HWY_RESTRICT biases) {
-  const Rebind<float, DI> df;
-
-  const auto quant = ConvertTo(df, quant_i);
-
-  // Compare |quant|, keep sign bit for negating result.
-  const auto kSign = BitCast(df, Set(di, INT32_MIN));
-  const auto sign = And(quant, kSign);  // TODO(janwas): = abs ^ orig
-  const auto abs_quant = AndNot(kSign, quant);
-
-  // If |x| is 1, kZeroBias creates a different bias for each channel.
-  // We're implementing the following:
-  // if (quant == 0) return 0;
-  // if (quant == 1) return biases[c];
-  // if (quant == -1) return -biases[c];
-  // return quant - biases[3] / quant;
-
-  // Integer comparison is not helpful because Clang incurs bypass penalties
-  // from unnecessarily mixing integer and float.
-  const auto is_01 = Lt(abs_quant, Set(df, 1.125f));
-  const auto not_0 = Gt(abs_quant, Zero(df));
-
-  // Bitwise logic is faster than quant * biases[c].
-  const auto one_bias = IfThenElseZero(not_0, Xor(Set(df, biases[c]), sign));
-
-  // About 2E-5 worse than ReciprocalNR or division.
-  const auto bias =
-      NegMulAdd(Set(df, biases[3]), ApproximateReciprocal(quant), quant);
-
-  return IfThenElse(is_01, one_bias, bias);
-}
-
-}  // namespace
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#endif  // LIB_JXL_QUANTIZER_INL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/quantizer.cc b/third_party/jpeg-xl/lib/jxl/quantizer.cc
deleted file mode 100644
index 41e2608d12c67..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/quantizer.cc
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/quantizer.h"
-
-#include <algorithm>
-#include <cstring>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/field_encodings.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/quant_weights.h"
-
-namespace jxl {
-
-static const int32_t kDefaultQuant = 64;
-
-#if JXL_CXX_LANG < JXL_CXX_17
-constexpr int32_t Quantizer::kQuantMax;
-#endif
-
-Quantizer::Quantizer(const DequantMatrices& dequant)
-    : Quantizer(dequant, kDefaultQuant, kGlobalScaleDenom / kDefaultQuant) {}
-
-Quantizer::Quantizer(const DequantMatrices& dequant, int quant_dc,
-                     int global_scale)
-    : global_scale_(global_scale), quant_dc_(quant_dc), dequant_(&dequant) {
-  RecomputeFromGlobalScale();
-  inv_quant_dc_ = inv_global_scale_ / quant_dc_;
-
-  memcpy(zero_bias_, kZeroBiasDefault, sizeof(kZeroBiasDefault));
-}
-
-void Quantizer::ComputeGlobalScaleAndQuant(float quant_dc, float quant_median,
-                                           float quant_median_absd) {
-  // Target value for the median value in the quant field.
-  const float kQuantFieldTarget = 5;
-  // We reduce the median of the quant field by the median absolute deviation:
-  // higher resolution on highly varying quant fields.
-  float scale = kGlobalScaleDenom * (quant_median - quant_median_absd) /
-                kQuantFieldTarget;
-  // Ensure that new_global_scale is positive and no more than 1<<15.
-  if (scale < 1) scale = 1;
-  if (scale > (1 << 15)) scale = 1 << 15;
-  int new_global_scale = static_cast<int>(scale);
-  // Ensure that quant_dc_ will always be at least
-  // 0.625 * kGlobalScaleDenom/kGlobalScaleNumerator = 10.
-  const int scaled_quant_dc =
-      static_cast<int>(quant_dc * kGlobalScaleNumerator * 1.6);
-  if (new_global_scale > scaled_quant_dc) {
-    new_global_scale = scaled_quant_dc;
-    if (new_global_scale <= 0) new_global_scale = 1;
-  }
-  global_scale_ = new_global_scale;
-  // Code below uses inv_global_scale_.
-  RecomputeFromGlobalScale();
-
-  float fval = quant_dc * inv_global_scale_ + 0.5f;
-  fval = std::min<float>(1 << 16, fval);
-  const int new_quant_dc = static_cast<int>(fval);
-  quant_dc_ = new_quant_dc;
-
-  // quant_dc_ was updated, recompute values.
-  RecomputeFromGlobalScale();
-}
-
-void Quantizer::SetQuantFieldRect(const ImageF& qf, const Rect& rect,
-                                  ImageI* JXL_RESTRICT raw_quant_field) const {
-  for (size_t y = 0; y < rect.ysize(); ++y) {
-    const float* JXL_RESTRICT row_qf = rect.ConstRow(qf, y);
-    int32_t* JXL_RESTRICT row_qi = rect.Row(raw_quant_field, y);
-    for (size_t x = 0; x < rect.xsize(); ++x) {
-      int val = ClampVal(row_qf[x] * inv_global_scale_ + 0.5f);
-      row_qi[x] = val;
-    }
-  }
-}
-
-Status Quantizer::SetQuantField(const float quant_dc, const ImageF& qf,
-                                ImageI* JXL_RESTRICT raw_quant_field) {
-  std::vector<float> data(qf.xsize() * qf.ysize());
-  for (size_t y = 0; y < qf.ysize(); ++y) {
-    const float* JXL_RESTRICT row_qf = qf.Row(y);
-    for (size_t x = 0; x < qf.xsize(); ++x) {
-      float quant = row_qf[x];
-      data[qf.xsize() * y + x] = quant;
-    }
-  }
-  std::nth_element(data.begin(), data.begin() + data.size() / 2, data.end());
-  const float quant_median = data[data.size() / 2];
-  std::vector<float> deviations(data.size());
-  for (size_t i = 0; i < data.size(); i++) {
-    deviations[i] = fabsf(data[i] - quant_median);
-  }
-  std::nth_element(deviations.begin(),
-                   deviations.begin() + deviations.size() / 2,
-                   deviations.end());
-  const float quant_median_absd = deviations[deviations.size() / 2];
-  ComputeGlobalScaleAndQuant(quant_dc, quant_median, quant_median_absd);
-  if (raw_quant_field) {
-    JXL_ENSURE(SameSize(*raw_quant_field, qf));
-    SetQuantFieldRect(qf, Rect(qf), raw_quant_field);
-  }
-  return true;
-}
-
-void Quantizer::SetQuant(float quant_dc, float quant_ac,
-                         ImageI* JXL_RESTRICT raw_quant_field) {
-  ComputeGlobalScaleAndQuant(quant_dc, quant_ac, 0);
-  int32_t val = ClampVal(quant_ac * inv_global_scale_ + 0.5f);
-  FillImage(val, raw_quant_field);
-}
-
-Status QuantizerParams::VisitFields(Visitor* JXL_RESTRICT visitor) {
-  JXL_QUIET_RETURN_IF_ERROR(visitor->U32(
-      BitsOffset(11, 1), BitsOffset(11, 2049), BitsOffset(12, 4097),
-      BitsOffset(16, 8193), 1, &global_scale));
-  JXL_QUIET_RETURN_IF_ERROR(visitor->U32(Val(16), BitsOffset(5, 1),
-                                         BitsOffset(8, 1), BitsOffset(16, 1), 1,
-                                         &quant_dc));
-  return true;
-}
-
-QuantizerParams Quantizer::GetParams() const {
-  QuantizerParams params;
-  params.global_scale = global_scale_;
-  params.quant_dc = quant_dc_;
-  return params;
-}
-
-Status Quantizer::Decode(BitReader* reader) {
-  QuantizerParams params;
-  JXL_RETURN_IF_ERROR(Bundle::Read(reader, &params));
-  global_scale_ = static_cast<int>(params.global_scale);
-  quant_dc_ = static_cast<int>(params.quant_dc);
-  RecomputeFromGlobalScale();
-  return true;
-}
-
-void Quantizer::DumpQuantizationMap(const ImageI& raw_quant_field) const {
-  printf("Global scale: %d (%.7f)\nDC quant: %d\n", global_scale_,
-         global_scale_ * 1.0 / kGlobalScaleDenom, quant_dc_);
-  printf("AC quantization Map:\n");
-  for (size_t y = 0; y < raw_quant_field.ysize(); ++y) {
-    for (size_t x = 0; x < raw_quant_field.xsize(); ++x) {
-      printf(" %3d", raw_quant_field.Row(y)[x]);
-    }
-    printf("\n");
-  }
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/quantizer.h b/third_party/jpeg-xl/lib/jxl/quantizer.h
deleted file mode 100644
index 8a28d627b43e9..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/quantizer.h
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_QUANTIZER_H_
-#define LIB_JXL_QUANTIZER_H_
-
-#include <algorithm>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/field_encodings.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/quant_weights.h"
-
-// Quantizes DC and AC coefficients, with separate quantization tables according
-// to the quant_kind (which is currently computed from the AC strategy and the
-// block index inside that strategy).
-
-namespace jxl {
-
-enum class AcStrategyType : uint32_t;
-
-static constexpr int kGlobalScaleDenom = 1 << 16;
-static constexpr int kGlobalScaleNumerator = 4096;
-
-// zero-biases for quantizing channels X, Y, B
-static constexpr float kZeroBiasDefault[3] = {0.5f, 0.5f, 0.5f};
-
-// Returns adjusted version of a quantized integer, such that its value is
-// closer to the expected value of the original.
-// The residuals of AC coefficients that we quantize are not uniformly
-// distributed. Numerical experiments show that they have a distribution with
-// the "shape" of 1/(1+x^2) [up to some coefficients]. This means that the
-// expected value of a coefficient that gets quantized to x will not be x
-// itself, but (at least with reasonable approximation):
-// - 0 if x is 0
-// - x * biases[c] if x is 1 or -1
-// - x - biases[3]/x otherwise
-// This follows from computing the distribution of the quantization bias, which
-// can be approximated fairly well by <constant>/x when |x| is at least two.
-static constexpr float kBiasNumerator = 0.145f;
-
-static constexpr float kDefaultQuantBias[4] = {
-    1.0f - 0.05465007330715401f,
-    1.0f - 0.07005449891748593f,
-    1.0f - 0.049935103337343655f,
-    0.145f,
-};
-
-struct QuantizerParams;
-
-class Quantizer {
- public:
-  explicit Quantizer(const DequantMatrices& dequant);
-  Quantizer(const DequantMatrices& dequant, int quant_dc, int global_scale);
-
-  static constexpr int32_t kQuantMax = 256;
-
-  static JXL_INLINE int32_t ClampVal(float val) {
-    return static_cast<int32_t>(
-        std::max(1.0f, std::min<float>(val, kQuantMax)));
-  }
-
-  float ScaleGlobalScale(const float scale) {
-    int new_global_scale = static_cast<int>(std::lround(global_scale_ * scale));
-    float scale_out = new_global_scale * 1.0f / global_scale_;
-    global_scale_ = new_global_scale;
-    RecomputeFromGlobalScale();
-    return scale_out;
-  }
-
-  // Recomputes other derived fields after global_scale_ has changed.
-  void RecomputeFromGlobalScale() {
-    global_scale_float_ = global_scale_ * (1.0 / kGlobalScaleDenom);
-    inv_global_scale_ = 1.0 * kGlobalScaleDenom / global_scale_;
-    inv_quant_dc_ = inv_global_scale_ / quant_dc_;
-    for (size_t c = 0; c < 3; c++) {
-      mul_dc_[c] = GetDcStep(c);
-      inv_mul_dc_[c] = GetInvDcStep(c);
-    }
-  }
-
-  // Returns scaling factor such that Scale() * (RawDC() or RawQuantField())
-  // pixels yields the same float values returned by GetQuantField.
-  JXL_INLINE float Scale() const { return global_scale_float_; }
-
-  // Reciprocal of Scale().
-  JXL_INLINE float InvGlobalScale() const { return inv_global_scale_; }
-
-  void SetQuantFieldRect(const ImageF& qf, const Rect& rect,
-                         ImageI* JXL_RESTRICT raw_quant_field) const;
-
-  Status SetQuantField(float quant_dc, const ImageF& qf,
-                       ImageI* JXL_RESTRICT raw_quant_field);
-
-  void SetQuant(float quant_dc, float quant_ac,
-                ImageI* JXL_RESTRICT raw_quant_field);
-
-  // Returns the DC quantization base value, which is currently global (not
-  // adaptive). The actual scale factor used to dequantize pixels in channel c
-  // is: inv_quant_dc() * dequant_->DCQuant(c).
-  float inv_quant_dc() const { return inv_quant_dc_; }
-
-  // Dequantize by multiplying with this times dequant_matrix.
-  float inv_quant_ac(int32_t quant) const { return inv_global_scale_ / quant; }
-
-  QuantizerParams GetParams() const;
-
-  Status Decode(BitReader* reader);
-
-  void DumpQuantizationMap(const ImageI& raw_quant_field) const;
-
-  JXL_INLINE const float* DequantMatrix(AcStrategyType quant_kind,
-                                        size_t c) const {
-    return dequant_->Matrix(quant_kind, c);
-  }
-
-  JXL_INLINE const float* InvDequantMatrix(AcStrategyType quant_kind,
-                                           size_t c) const {
-    return dequant_->InvMatrix(quant_kind, c);
-  }
-
-  // Calculates DC quantization step.
-  JXL_INLINE float GetDcStep(size_t c) const {
-    return inv_quant_dc_ * dequant_->DCQuant(c);
-  }
-  JXL_INLINE float GetInvDcStep(size_t c) const {
-    return dequant_->InvDCQuant(c) * (global_scale_float_ * quant_dc_);
-  }
-
-  JXL_INLINE const float* MulDC() const { return mul_dc_; }
-  JXL_INLINE const float* InvMulDC() const { return inv_mul_dc_; }
-
-  JXL_INLINE void ClearDCMul() {
-    std::fill(mul_dc_, mul_dc_ + 4, 1.f);
-    std::fill(inv_mul_dc_, inv_mul_dc_ + 4, 1.f);
-  }
-
-  void ComputeGlobalScaleAndQuant(float quant_dc, float quant_median,
-                                  float quant_median_absd);
-
- private:
-  float mul_dc_[4];
-  float inv_mul_dc_[4];
-
-  // These are serialized:
-  int global_scale_;
-  int quant_dc_;
-
-  // These are derived from global_scale_:
-  float inv_global_scale_;
-  float global_scale_float_;  // reciprocal of inv_global_scale_
-  float inv_quant_dc_;
-
-  float zero_bias_[3];
-  const DequantMatrices* dequant_;
-};
-
-struct QuantizerParams : public Fields {
-  QuantizerParams() { Bundle::Init(this); }
-  JXL_FIELDS_NAME(QuantizerParams)
-
-  Status VisitFields(Visitor* JXL_RESTRICT visitor) override;
-
-  uint32_t global_scale;
-  uint32_t quant_dc;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_QUANTIZER_H_
diff --git a/third_party/jpeg-xl/lib/jxl/quantizer_test.cc b/third_party/jpeg-xl/lib/jxl/quantizer_test.cc
deleted file mode 100644
index dcc3cbd586873..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/quantizer_test.cc
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/quantizer.h"
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/enc_fields.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_test_utils.h"
-#include "lib/jxl/quant_weights.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-void TestEquivalence(int qxsize, int qysize, const Quantizer& quantizer1,
-                     const Quantizer& quantizer2) {
-  ASSERT_NEAR(quantizer1.inv_quant_dc(), quantizer2.inv_quant_dc(), 1e-7);
-}
-
-TEST(QuantizerTest, QuantizerParams) {
-  for (uint32_t i = 1; i < 10000; ++i) {
-    QuantizerParams p;
-    p.global_scale = i;
-    size_t extension_bits = 0;
-    size_t total_bits = 0;
-    EXPECT_TRUE(Bundle::CanEncode(p, &extension_bits, &total_bits));
-    EXPECT_EQ(0u, extension_bits);
-    EXPECT_GE(total_bits, 4u);
-  }
-}
-
-TEST(QuantizerTest, BitStreamRoundtripSameQuant) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const int qxsize = 8;
-  const int qysize = 8;
-  DequantMatrices dequant;
-  Quantizer quantizer1(dequant);
-  JXL_TEST_ASSIGN_OR_DIE(
-      ImageI raw_quant_field,
-      ImageI::Create(jxl::test::MemoryManager(), qxsize, qysize));
-  quantizer1.SetQuant(0.17f, 0.17f, &raw_quant_field);
-  BitWriter writer{memory_manager};
-  QuantizerParams params = quantizer1.GetParams();
-  EXPECT_TRUE(
-      WriteQuantizerParams(params, &writer, LayerType::Header, nullptr));
-  writer.ZeroPadToByte();
-  const size_t bits_written = writer.BitsWritten();
-  Quantizer quantizer2(dequant);
-  BitReader reader(writer.GetSpan());
-  EXPECT_TRUE(quantizer2.Decode(&reader));
-  EXPECT_TRUE(reader.JumpToByteBoundary());
-  EXPECT_EQ(reader.TotalBitsConsumed(), bits_written);
-  EXPECT_TRUE(reader.Close());
-  TestEquivalence(qxsize, qysize, quantizer1, quantizer2);
-}
-
-TEST(QuantizerTest, BitStreamRoundtripRandomQuant) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  const int qxsize = 8;
-  const int qysize = 8;
-  DequantMatrices dequant;
-  Quantizer quantizer1(dequant);
-  JXL_TEST_ASSIGN_OR_DIE(ImageI raw_quant_field,
-                         ImageI::Create(memory_manager, qxsize, qysize));
-  quantizer1.SetQuant(0.17f, 0.17f, &raw_quant_field);
-  float quant_dc = 0.17f;
-  JXL_TEST_ASSIGN_OR_DIE(ImageF qf,
-                         ImageF::Create(memory_manager, qxsize, qysize));
-  RandomFillImage(&qf, 0.0f, 1.0f);
-  ASSERT_TRUE(quantizer1.SetQuantField(quant_dc, qf, &raw_quant_field));
-  BitWriter writer{memory_manager};
-  QuantizerParams params = quantizer1.GetParams();
-  EXPECT_TRUE(
-      WriteQuantizerParams(params, &writer, LayerType::Header, nullptr));
-  writer.ZeroPadToByte();
-  const size_t bits_written = writer.BitsWritten();
-  Quantizer quantizer2(dequant);
-  BitReader reader(writer.GetSpan());
-  EXPECT_TRUE(quantizer2.Decode(&reader));
-  EXPECT_TRUE(reader.JumpToByteBoundary());
-  EXPECT_EQ(reader.TotalBitsConsumed(), bits_written);
-  EXPECT_TRUE(reader.Close());
-  TestEquivalence(qxsize, qysize, quantizer1, quantizer2);
-}
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/rational_polynomial_test.cc b/third_party/jpeg-xl/lib/jxl/rational_polynomial_test.cc
deleted file mode 100644
index 0162887c7287d..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/rational_polynomial_test.cc
+++ /dev/null
@@ -1,239 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <cmath>
-#include <string>
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/rational_polynomial_test.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-#include <hwy/tests/hwy_gtest.h>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/rational_polynomial-inl.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/testing.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-using T = float;  // required by EvalLog2
-using D = HWY_FULL(T);
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Abs;
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::Eq;
-using hwy::HWY_NAMESPACE::GetLane;
-using hwy::HWY_NAMESPACE::ShiftLeft;
-using hwy::HWY_NAMESPACE::ShiftRight;
-using hwy::HWY_NAMESPACE::Sub;
-
-// Generic: only computes polynomial
-struct EvalPoly {
-  template <size_t NP, size_t NQ>
-  T operator()(T x, const T (&p)[NP], const T (&q)[NQ]) const {
-    const HWY_FULL(T) d;
-    const auto vx = Set(d, x);
-    const auto approx = EvalRationalPolynomial(d, vx, p, q);
-    return GetLane(approx);
-  }
-};
-
-// Range reduction for log2
-struct EvalLog2 {
-  template <size_t NP, size_t NQ>
-  T operator()(T x, const T (&p)[NP], const T (&q)[NQ]) const {
-    const HWY_FULL(T) d;
-    auto vx = Set(d, x);
-
-    const HWY_FULL(int32_t) di;
-    const auto x_bits = BitCast(di, vx);
-    // Cannot handle negative numbers / NaN.
-    EXPECT_TRUE(AllTrue(di, Eq(Abs(x_bits), x_bits)));
-
-    // Range reduction to [-1/3, 1/3] - 3 integer, 2 float ops
-    const auto exp_bits = Sub(x_bits, Set(di, 0x3f2aaaab));  // = 2/3
-    // Shifted exponent = log2; also used to clear mantissa.
-    const auto exp_shifted = ShiftRight<23>(exp_bits);
-    const auto mantissa = BitCast(d, Sub(x_bits, ShiftLeft<23>(exp_shifted)));
-    const auto exp_val = ConvertTo(d, exp_shifted);
-    vx = Sub(mantissa, Set(d, 1.0f));
-
-    const auto approx = Add(EvalRationalPolynomial(d, vx, p, q), exp_val);
-    return GetLane(approx);
-  }
-};
-
-// Functions to approximate:
-
-T LinearToSrgb8Direct(T val) {
-  if (val < 0.0) return 0.0;
-  if (val >= 255.0) return 255.0;
-  if (val <= 10.0 / 12.92) return val * 12.92;
-  return 255.0 * (std::pow(val / 255.0, 1.0 / 2.4) * 1.055 - 0.055);
-}
-
-T SimpleGamma(T v) {
-  static const T kGamma = 0.387494322593;
-  static const T limit = 43.01745241042018;
-  T bright = v - limit;
-  if (bright >= 0) {
-    static const T mul = 0.0383723643799;
-    v -= bright * mul;
-  }
-  static const T limit2 = 94.68634353321337;
-  T bright2 = v - limit2;
-  if (bright2 >= 0) {
-    static const T mul = 0.22885405968;
-    v -= bright2 * mul;
-  }
-  static const T offset = 0.156775786057;
-  static const T scale = 8.898059160493739;
-  T retval = scale * (offset + pow(v, kGamma));
-  return retval;
-}
-
-// Runs CaratheodoryFejer and verifies the polynomial using a lot of samples to
-// return the biggest error.
-template <size_t NP, size_t NQ, class Eval>
-T RunApproximation(T x0, T x1, const T (&p)[NP], const T (&q)[NQ],
-                   const Eval& eval, T func_to_approx(T)) {
-  float maxerr = 0;
-  T lastPrint = 0;
-  // NOLINTNEXTLINE(clang-analyzer-security.FloatLoopCounter)
-  for (T x = x0; x <= x1; x += (x1 - x0) / 10000.0) {
-    const T f = func_to_approx(x);
-    const T g = eval(x, p, q);
-    maxerr = std::max(fabsf(g - f), maxerr);
-    if (x == x0 || x - lastPrint > (x1 - x0) / 20.0) {
-      printf("x: %11.6f, f: %11.6f, g: %11.6f, e: %11.6f\n", x, f, g,
-             fabs(g - f));
-      lastPrint = x;
-    }
-  }
-  return maxerr;
-}
-
-void TestSimpleGamma() {
-  const T p[4 * (6 + 1)] = {
-      HWY_REP4(-5.0646949363741811E-05), HWY_REP4(6.7369380528439771E-05),
-      HWY_REP4(8.9376652530412794E-05),  HWY_REP4(2.1153513301520462E-06),
-      HWY_REP4(-6.9130322970386449E-08), HWY_REP4(3.9424752749293728E-10),
-      HWY_REP4(1.2360288207619576E-13)};
-
-  const T q[4 * (6 + 1)] = {
-      HWY_REP4(-6.6389733798591366E-06), HWY_REP4(1.3299859726565908E-05),
-      HWY_REP4(3.8538748358398873E-06),  HWY_REP4(-2.8707687262928236E-08),
-      HWY_REP4(-6.6897385800005434E-10), HWY_REP4(6.1428748869186003E-12),
-      HWY_REP4(-2.5475738169252870E-15)};
-
-  const T err = RunApproximation(0.77, 274.579999999999984, p, q, EvalPoly(),
-                                 SimpleGamma);
-  EXPECT_LT(err, 0.05);
-}
-
-void TestLinearToSrgb8Direct() {
-  const T p[4 * (5 + 1)] = {
-      HWY_REP4(-9.5357499040105154E-05), HWY_REP4(4.6761186249798248E-04),
-      HWY_REP4(2.5708174333943594E-04),  HWY_REP4(1.5250087770436082E-05),
-      HWY_REP4(1.1946768008931187E-07),  HWY_REP4(5.9916446295972850E-11)};
-
-  const T q[4 * (4 + 1)] = {
-      HWY_REP4(1.8932479758079768E-05), HWY_REP4(2.7312342474687321E-05),
-      HWY_REP4(4.3901204783327006E-06), HWY_REP4(1.0417787306920273E-07),
-      HWY_REP4(3.0084206762140419E-10)};
-
-  const T err =
-      RunApproximation(0.77, 255, p, q, EvalPoly(), LinearToSrgb8Direct);
-  EXPECT_LT(err, 0.05);
-}
-
-void TestExp() {
-  const T p[4 * (2 + 1)] = {HWY_REP4(9.6266879665530902E-01),
-                            HWY_REP4(4.8961265681586763E-01),
-                            HWY_REP4(8.2619259189548433E-02)};
-  const T q[4 * (2 + 1)] = {HWY_REP4(9.6259895571622622E-01),
-                            HWY_REP4(-4.7272457588933831E-01),
-                            HWY_REP4(7.4802088567547664E-02)};
-  const T err = RunApproximation(-1, 1, p, q, EvalPoly(),
-                                 [](T x) { return static_cast<T>(exp(x)); });
-  EXPECT_LT(err, 1E-4);
-}
-
-void TestNegExp() {
-  // 4,3 is the min required for monotonicity; max error in 0,10: 751 ppm
-  // no benefit for k>50.
-  const T p[4 * (4 + 1)] = {
-      HWY_REP4(5.9580258551150123E-02), HWY_REP4(-2.5073728806886408E-02),
-      HWY_REP4(4.1561830213689248E-03), HWY_REP4(-3.1815408488900372E-04),
-      HWY_REP4(9.3866690094906802E-06)};
-  const T q[4 * (3 + 1)] = {
-      HWY_REP4(5.9579108238812878E-02), HWY_REP4(3.4542074345478582E-02),
-      HWY_REP4(8.7263562483501714E-03), HWY_REP4(1.4095109143061216E-03)};
-
-  const T err = RunApproximation(0, 10, p, q, EvalPoly(),
-                                 [](T x) { return static_cast<T>(exp(-x)); });
-  EXPECT_LT(err, sizeof(T) == 8 ? 2E-5 : 3E-5);
-}
-
-void TestSin() {
-  const T p[4 * (6 + 1)] = {
-      HWY_REP4(1.5518122109203780E-05),  HWY_REP4(2.3388958643675966E+00),
-      HWY_REP4(-8.6705520940849157E-01), HWY_REP4(-1.9702294764873535E-01),
-      HWY_REP4(1.2193404314472320E-01),  HWY_REP4(-1.7373966109788839E-02),
-      HWY_REP4(7.8829435883034796E-04)};
-  const T q[4 * (5 + 1)] = {
-      HWY_REP4(2.3394371422557279E+00), HWY_REP4(-8.7028221081288615E-01),
-      HWY_REP4(2.0052872219658430E-01), HWY_REP4(-3.2460335995264836E-02),
-      HWY_REP4(3.1546157932479282E-03), HWY_REP4(-1.6692542019380155E-04)};
-
-  const T err = RunApproximation(0, Pi<T>(1) * 2, p, q, EvalPoly(),
-                                 [](T x) { return static_cast<T>(sin(x)); });
-  EXPECT_LT(err, sizeof(T) == 8 ? 5E-4 : 7E-4);
-}
-
-void TestLog() {
-  HWY_ALIGN const T p[4 * (2 + 1)] = {HWY_REP4(-1.8503833400518310E-06),
-                                      HWY_REP4(1.4287160470083755E+00),
-                                      HWY_REP4(7.4245873327820566E-01)};
-  HWY_ALIGN const T q[4 * (2 + 1)] = {HWY_REP4(9.9032814277590719E-01),
-                                      HWY_REP4(1.0096718572241148E+00),
-                                      HWY_REP4(1.7409343003366853E-01)};
-  const T err = RunApproximation(1E-6, 1000, p, q, EvalLog2(), std::log2);
-  printf("%E\n", err);
-}
-
-HWY_NOINLINE void TestRationalPolynomial() {
-  TestSimpleGamma();
-  TestLinearToSrgb8Direct();
-  TestExp();
-  TestNegExp();
-  TestSin();
-  TestLog();
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-class RationalPolynomialTest : public hwy::TestWithParamTarget {};
-HWY_TARGET_INSTANTIATE_TEST_SUITE_P(RationalPolynomialTest);
-
-HWY_EXPORT_AND_TEST_P(RationalPolynomialTest, TestSimpleGamma);
-HWY_EXPORT_AND_TEST_P(RationalPolynomialTest, TestLinearToSrgb8Direct);
-HWY_EXPORT_AND_TEST_P(RationalPolynomialTest, TestExp);
-HWY_EXPORT_AND_TEST_P(RationalPolynomialTest, TestNegExp);
-HWY_EXPORT_AND_TEST_P(RationalPolynomialTest, TestSin);
-HWY_EXPORT_AND_TEST_P(RationalPolynomialTest, TestLog);
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/low_memory_render_pipeline.cc b/third_party/jpeg-xl/lib/jxl/render_pipeline/low_memory_render_pipeline.cc
deleted file mode 100644
index 51bb489fc7f3b..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/low_memory_render_pipeline.cc
+++ /dev/null
@@ -1,909 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/render_pipeline/low_memory_render_pipeline.h"
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/arch_macros.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_ops.h"
-
-namespace jxl {
-std::pair<size_t, size_t>
-LowMemoryRenderPipeline::ColorDimensionsToChannelDimensions(
-    std::pair<size_t, size_t> in, size_t c, size_t stage) const {
-  std::pair<size_t, size_t> ret;
-  std::pair<size_t, size_t> shift = channel_shifts_[stage][c];
-  ret.first =
-      ((in.first << base_color_shift_) + (1 << shift.first) - 1) >> shift.first;
-  ret.second = ((in.second << base_color_shift_) + (1 << shift.second) - 1) >>
-               shift.second;
-  return ret;
-}
-
-std::pair<size_t, size_t> LowMemoryRenderPipeline::BorderToStore(
-    size_t c) const {
-  auto ret = ColorDimensionsToChannelDimensions(group_border_, c, 0);
-  ret.first += padding_[0][c].first;
-  ret.second += padding_[0][c].second;
-  return ret;
-}
-
-Status LowMemoryRenderPipeline::SaveBorders(size_t group_id, size_t c,
-                                            const ImageF& in) {
-  size_t gy = group_id / frame_dimensions_.xsize_groups;
-  size_t gx = group_id % frame_dimensions_.xsize_groups;
-  size_t hshift = channel_shifts_[0][c].first;
-  size_t vshift = channel_shifts_[0][c].second;
-  size_t x0 = gx * GroupInputXSize(c);
-  size_t x1 = std::min((gx + 1) * GroupInputXSize(c),
-                       DivCeil(frame_dimensions_.xsize_upsampled, 1 << hshift));
-  size_t y0 = gy * GroupInputYSize(c);
-  size_t y1 = std::min((gy + 1) * GroupInputYSize(c),
-                       DivCeil(frame_dimensions_.ysize_upsampled, 1 << vshift));
-
-  auto borders = BorderToStore(c);
-  size_t borderx_write = borders.first;
-  size_t bordery_write = borders.second;
-
-  if (gy > 0) {
-    Rect from(group_data_x_border_, group_data_y_border_, x1 - x0,
-              bordery_write);
-    Rect to(x0, (gy * 2 - 1) * bordery_write, x1 - x0, bordery_write);
-    JXL_RETURN_IF_ERROR(CopyImageTo(from, in, to, &borders_horizontal_[c]));
-  }
-  if (gy + 1 < frame_dimensions_.ysize_groups) {
-    Rect from(group_data_x_border_,
-              group_data_y_border_ + y1 - y0 - bordery_write, x1 - x0,
-              bordery_write);
-    Rect to(x0, (gy * 2) * bordery_write, x1 - x0, bordery_write);
-    JXL_RETURN_IF_ERROR(CopyImageTo(from, in, to, &borders_horizontal_[c]));
-  }
-  if (gx > 0) {
-    Rect from(group_data_x_border_, group_data_y_border_, borderx_write,
-              y1 - y0);
-    Rect to((gx * 2 - 1) * borderx_write, y0, borderx_write, y1 - y0);
-    JXL_RETURN_IF_ERROR(CopyImageTo(from, in, to, &borders_vertical_[c]));
-  }
-  if (gx + 1 < frame_dimensions_.xsize_groups) {
-    Rect from(group_data_x_border_ + x1 - x0 - borderx_write,
-              group_data_y_border_, borderx_write, y1 - y0);
-    Rect to((gx * 2) * borderx_write, y0, borderx_write, y1 - y0);
-    JXL_RETURN_IF_ERROR(CopyImageTo(from, in, to, &borders_vertical_[c]));
-  }
-  return true;
-}
-
-Status LowMemoryRenderPipeline::LoadBorders(size_t group_id, size_t c,
-                                            const Rect& r, ImageF* out) {
-  size_t gy = group_id / frame_dimensions_.xsize_groups;
-  size_t gx = group_id % frame_dimensions_.xsize_groups;
-  size_t hshift = channel_shifts_[0][c].first;
-  size_t vshift = channel_shifts_[0][c].second;
-  // Coordinates of the group in the image.
-  size_t x0 = gx * GroupInputXSize(c);
-  size_t x1 = std::min((gx + 1) * GroupInputXSize(c),
-                       DivCeil(frame_dimensions_.xsize_upsampled, 1 << hshift));
-  size_t y0 = gy * GroupInputYSize(c);
-  size_t y1 = std::min((gy + 1) * GroupInputYSize(c),
-                       DivCeil(frame_dimensions_.ysize_upsampled, 1 << vshift));
-
-  size_t paddingx = padding_[0][c].first;
-  size_t paddingy = padding_[0][c].second;
-
-  auto borders = BorderToStore(c);
-  size_t borderx_write = borders.first;
-  size_t bordery_write = borders.second;
-
-  // Limits of the area to copy from, in image coordinates.
-  JXL_ENSURE(r.x0() == 0 || (r.x0() << base_color_shift_) >= paddingx);
-  size_t x0src = DivCeil(r.x0() << base_color_shift_, 1 << hshift);
-  if (x0src != 0) {
-    x0src -= paddingx;
-  }
-  // r may be such that r.x1 (namely x0() + xsize()) is within paddingx of the
-  // right side of the image, so we use min() here.
-  size_t x1src =
-      DivCeil((r.x0() + r.xsize()) << base_color_shift_, 1 << hshift);
-  x1src = std::min(x1src + paddingx,
-                   DivCeil(frame_dimensions_.xsize_upsampled, 1 << hshift));
-
-  // Similar computation for y.
-  JXL_ENSURE(r.y0() == 0 || (r.y0() << base_color_shift_) >= paddingy);
-  size_t y0src = DivCeil(r.y0() << base_color_shift_, 1 << vshift);
-  if (y0src != 0) {
-    y0src -= paddingy;
-  }
-  size_t y1src =
-      DivCeil((r.y0() + r.ysize()) << base_color_shift_, 1 << vshift);
-  y1src = std::min(y1src + paddingy,
-                   DivCeil(frame_dimensions_.ysize_upsampled, 1 << vshift));
-
-  // Copy other groups' borders from the border storage.
-  if (y0src < y0) {
-    JXL_ENSURE(gy > 0);
-    JXL_RETURN_IF_ERROR(CopyImageTo(
-        Rect(x0src, (gy * 2 - 2) * bordery_write, x1src - x0src, bordery_write),
-        borders_horizontal_[c],
-        Rect(group_data_x_border_ + x0src - x0,
-             group_data_y_border_ - bordery_write, x1src - x0src,
-             bordery_write),
-        out));
-  }
-  if (y1src > y1) {
-    // When copying the bottom border we must not be on the bottom groups.
-    JXL_ENSURE(gy + 1 < frame_dimensions_.ysize_groups);
-    JXL_RETURN_IF_ERROR(CopyImageTo(
-        Rect(x0src, (gy * 2 + 1) * bordery_write, x1src - x0src, bordery_write),
-        borders_horizontal_[c],
-        Rect(group_data_x_border_ + x0src - x0, group_data_y_border_ + y1 - y0,
-             x1src - x0src, bordery_write),
-        out));
-  }
-  if (x0src < x0) {
-    JXL_ENSURE(gx > 0);
-    JXL_RETURN_IF_ERROR(CopyImageTo(
-        Rect((gx * 2 - 2) * borderx_write, y0src, borderx_write, y1src - y0src),
-        borders_vertical_[c],
-        Rect(group_data_x_border_ - borderx_write,
-             group_data_y_border_ + y0src - y0, borderx_write, y1src - y0src),
-        out));
-  }
-  if (x1src > x1) {
-    // When copying the right border we must not be on the rightmost groups.
-    JXL_ENSURE(gx + 1 < frame_dimensions_.xsize_groups);
-    JXL_RETURN_IF_ERROR(CopyImageTo(
-        Rect((gx * 2 + 1) * borderx_write, y0src, borderx_write, y1src - y0src),
-        borders_vertical_[c],
-        Rect(group_data_x_border_ + x1 - x0, group_data_y_border_ + y0src - y0,
-             borderx_write, y1src - y0src),
-        out));
-  }
-  return true;
-}
-
-size_t LowMemoryRenderPipeline::GroupInputXSize(size_t c) const {
-  return (frame_dimensions_.group_dim << base_color_shift_) >>
-         channel_shifts_[0][c].first;
-}
-
-size_t LowMemoryRenderPipeline::GroupInputYSize(size_t c) const {
-  return (frame_dimensions_.group_dim << base_color_shift_) >>
-         channel_shifts_[0][c].second;
-}
-
-Status LowMemoryRenderPipeline::EnsureBordersStorage() {
-  const auto& shifts = channel_shifts_[0];
-  if (borders_horizontal_.size() < shifts.size()) {
-    borders_horizontal_.resize(shifts.size());
-    borders_vertical_.resize(shifts.size());
-  }
-  for (size_t c = 0; c < shifts.size(); c++) {
-    auto borders = BorderToStore(c);
-    size_t borderx = borders.first;
-    size_t bordery = borders.second;
-    JXL_ENSURE(frame_dimensions_.xsize_groups > 0);
-    size_t num_xborders = (frame_dimensions_.xsize_groups - 1) * 2;
-    JXL_ENSURE(frame_dimensions_.ysize_groups > 0);
-    size_t num_yborders = (frame_dimensions_.ysize_groups - 1) * 2;
-    size_t downsampled_xsize =
-        DivCeil(frame_dimensions_.xsize_upsampled_padded, 1 << shifts[c].first);
-    size_t downsampled_ysize = DivCeil(frame_dimensions_.ysize_upsampled_padded,
-                                       1 << shifts[c].second);
-    Rect horizontal = Rect(0, 0, downsampled_xsize, bordery * num_yborders);
-    if (!SameSize(horizontal, borders_horizontal_[c])) {
-      JXL_ASSIGN_OR_RETURN(borders_horizontal_[c],
-                           ImageF::Create(memory_manager_, horizontal.xsize(),
-                                          horizontal.ysize()));
-    }
-    Rect vertical = Rect(0, 0, borderx * num_xborders, downsampled_ysize);
-    if (!SameSize(vertical, borders_vertical_[c])) {
-      JXL_ASSIGN_OR_RETURN(
-          borders_vertical_[c],
-          ImageF::Create(memory_manager_, vertical.xsize(), vertical.ysize()));
-    }
-  }
-  return true;
-}
-
-Status LowMemoryRenderPipeline::Init() {
-  group_border_ = {0, 0};
-  base_color_shift_ = CeilLog2Nonzero(frame_dimensions_.xsize_upsampled_padded /
-                                      frame_dimensions_.xsize_padded);
-
-  const auto& shifts = channel_shifts_[0];
-
-  // Ensure that each channel has enough many border pixels.
-  for (size_t c = 0; c < shifts.size(); c++) {
-    group_border_.first =
-        std::max(group_border_.first,
-                 DivCeil(padding_[0][c].first << channel_shifts_[0][c].first,
-                         1 << base_color_shift_));
-    group_border_.second =
-        std::max(group_border_.second,
-                 DivCeil(padding_[0][c].second << channel_shifts_[0][c].second,
-                         1 << base_color_shift_));
-  }
-
-  // Ensure that all channels have an integer number of border pixels in the
-  // input.
-  for (size_t c = 0; c < shifts.size(); c++) {
-    if (channel_shifts_[0][c].first >= base_color_shift_) {
-      group_border_.first =
-          RoundUpTo(group_border_.first,
-                    1 << (channel_shifts_[0][c].first - base_color_shift_));
-    }
-    if (channel_shifts_[0][c].second >= base_color_shift_) {
-      group_border_.second =
-          RoundUpTo(group_border_.second,
-                    1 << (channel_shifts_[0][c].second - base_color_shift_));
-    }
-  }
-  // Ensure that the X border on color channels is a multiple of kBlockDim or
-  // the vector size (required for EPF stages). Vectors on ARM NEON are never
-  // wider than 4 floats, so rounding to multiples of 4 is enough.
-#if JXL_ARCH_ARM
-  constexpr size_t kGroupXAlign = 4;
-#else
-  constexpr size_t kGroupXAlign = 16;
-#endif
-  group_border_.first = RoundUpTo(group_border_.first, kGroupXAlign);
-  // Allocate borders in group images that are just enough for storing the
-  // borders to be copied in, plus any rounding to ensure alignment.
-  std::pair<size_t, size_t> max_border = {0, 0};
-  for (size_t c = 0; c < shifts.size(); c++) {
-    max_border.first = std::max(BorderToStore(c).first, max_border.first);
-    max_border.second = std::max(BorderToStore(c).second, max_border.second);
-  }
-  group_data_x_border_ = RoundUpTo(max_border.first, kGroupXAlign);
-  group_data_y_border_ = max_border.second;
-
-  JXL_RETURN_IF_ERROR(EnsureBordersStorage());
-  group_border_assigner_.Init(frame_dimensions_);
-
-  for (first_trailing_stage_ = stages_.size(); first_trailing_stage_ > 0;
-       first_trailing_stage_--) {
-    bool has_inout_c = false;
-    for (size_t c = 0; c < shifts.size(); c++) {
-      if (stages_[first_trailing_stage_ - 1]->GetChannelMode(c) ==
-          RenderPipelineChannelMode::kInOut) {
-        has_inout_c = true;
-      }
-    }
-    if (has_inout_c) {
-      break;
-    }
-  }
-
-  first_image_dim_stage_ = stages_.size();
-  for (size_t i = 0; i < stages_.size(); i++) {
-    std::vector<std::pair<size_t, size_t>> input_sizes(shifts.size());
-    for (size_t c = 0; c < shifts.size(); c++) {
-      input_sizes[c] =
-          std::make_pair(DivCeil(frame_dimensions_.xsize_upsampled,
-                                 1 << channel_shifts_[i][c].first),
-                         DivCeil(frame_dimensions_.ysize_upsampled,
-                                 1 << channel_shifts_[i][c].second));
-    }
-    JXL_RETURN_IF_ERROR(stages_[i]->SetInputSizes(input_sizes));
-    if (stages_[i]->SwitchToImageDimensions()) {
-      // We don't allow kInOut after switching to image dimensions.
-      JXL_ENSURE(i >= first_trailing_stage_);
-      first_image_dim_stage_ = i + 1;
-      stages_[i]->GetImageDimensions(&full_image_xsize_, &full_image_ysize_,
-                                     &frame_origin_);
-      break;
-    }
-  }
-  for (size_t i = first_image_dim_stage_; i < stages_.size(); i++) {
-    if (stages_[i]->SwitchToImageDimensions()) {
-      return JXL_UNREACHABLE(
-          "cannot switch to image dimensions multiple times");
-    }
-    std::vector<std::pair<size_t, size_t>> input_sizes(shifts.size());
-    for (size_t c = 0; c < shifts.size(); c++) {
-      input_sizes[c] = {full_image_xsize_, full_image_ysize_};
-    }
-    JXL_RETURN_IF_ERROR(stages_[i]->SetInputSizes(input_sizes));
-  }
-
-  anyc_.resize(stages_.size());
-  for (size_t i = 0; i < stages_.size(); i++) {
-    for (size_t c = 0; c < shifts.size(); c++) {
-      if (stages_[i]->GetChannelMode(c) !=
-          RenderPipelineChannelMode::kIgnored) {
-        anyc_[i] = c;
-      }
-    }
-  }
-
-  stage_input_for_channel_ = std::vector<std::vector<int32_t>>(
-      stages_.size(), std::vector<int32_t>(shifts.size()));
-  for (size_t c = 0; c < shifts.size(); c++) {
-    int input = -1;
-    for (size_t i = 0; i < stages_.size(); i++) {
-      stage_input_for_channel_[i][c] = input;
-      if (stages_[i]->GetChannelMode(c) == RenderPipelineChannelMode::kInOut) {
-        input = i;
-      }
-    }
-  }
-
-  image_rect_.resize(stages_.size());
-  for (size_t i = 0; i < stages_.size(); i++) {
-    size_t x1 = DivCeil(frame_dimensions_.xsize_upsampled,
-                        1 << channel_shifts_[i][anyc_[i]].first);
-    size_t y1 = DivCeil(frame_dimensions_.ysize_upsampled,
-                        1 << channel_shifts_[i][anyc_[i]].second);
-    image_rect_[i] = Rect(0, 0, x1, y1);
-  }
-
-  virtual_ypadding_for_output_.resize(stages_.size());
-  xpadding_for_output_.resize(stages_.size());
-  for (size_t c = 0; c < shifts.size(); c++) {
-    int ypad = 0;
-    int xpad = 0;
-    for (size_t i = stages_.size(); i-- > 0;) {
-      if (stages_[i]->GetChannelMode(c) !=
-          RenderPipelineChannelMode::kIgnored) {
-        virtual_ypadding_for_output_[i] =
-            std::max(ypad, virtual_ypadding_for_output_[i]);
-        xpadding_for_output_[i] = std::max(xpad, xpadding_for_output_[i]);
-      }
-      if (stages_[i]->GetChannelMode(c) == RenderPipelineChannelMode::kInOut) {
-        ypad = (DivCeil(ypad, 1 << channel_shifts_[i][c].second) +
-                stages_[i]->settings_.border_y)
-               << channel_shifts_[i][c].second;
-        xpad = DivCeil(xpad, 1 << stages_[i]->settings_.shift_x) +
-               stages_[i]->settings_.border_x;
-      }
-    }
-  }
-  return true;
-}
-
-Status LowMemoryRenderPipeline::PrepareForThreadsInternal(size_t num,
-                                                          bool use_group_ids) {
-  const auto& shifts = channel_shifts_[0];
-  use_group_ids_ = use_group_ids;
-  size_t num_buffers = use_group_ids_ ? frame_dimensions_.num_groups : num;
-  for (size_t t = group_data_.size(); t < num_buffers; t++) {
-    group_data_.emplace_back();
-    group_data_[t].resize(shifts.size());
-    for (size_t c = 0; c < shifts.size(); c++) {
-      JXL_ASSIGN_OR_RETURN(
-          group_data_[t][c],
-          ImageF::Create(memory_manager_,
-                         GroupInputXSize(c) + group_data_x_border_ * 2,
-                         GroupInputYSize(c) + group_data_y_border_ * 2,
-                         kRenderPipelineXOffset));
-    }
-  }
-  // TODO(veluca): avoid reallocating buffers if not needed.
-  stage_data_.resize(num);
-  size_t upsampling = 1u << base_color_shift_;
-  size_t group_dim = frame_dimensions_.group_dim * upsampling;
-  size_t padding =
-      2 * group_data_x_border_ * upsampling +  // maximum size of a rect
-      2 * kRenderPipelineXOffset;              // extra padding for processing
-  size_t stage_buffer_xsize = group_dim + padding;
-  for (size_t t = 0; t < num; t++) {
-    stage_data_[t].resize(shifts.size());
-    for (size_t c = 0; c < shifts.size(); c++) {
-      stage_data_[t][c].resize(stages_.size());
-      size_t next_y_border = 0;
-      for (size_t i = stages_.size(); i-- > 0;) {
-        if (stages_[i]->GetChannelMode(c) ==
-            RenderPipelineChannelMode::kInOut) {
-          size_t stage_buffer_ysize =
-              2 * next_y_border + (1 << stages_[i]->settings_.shift_y);
-          stage_buffer_ysize = 1 << CeilLog2Nonzero(stage_buffer_ysize);
-          next_y_border = stages_[i]->settings_.border_y;
-          JXL_ASSIGN_OR_RETURN(
-              stage_data_[t][c][i],
-              ImageF::Create(memory_manager_, stage_buffer_xsize,
-                             stage_buffer_ysize));
-        }
-      }
-    }
-  }
-  if (first_image_dim_stage_ != stages_.size()) {
-    RectT<ssize_t> image_rect(0, 0, frame_dimensions_.xsize_upsampled,
-                              frame_dimensions_.ysize_upsampled);
-    RectT<ssize_t> full_image_rect(0, 0, full_image_xsize_, full_image_ysize_);
-    image_rect = image_rect.Translate(frame_origin_.x0, frame_origin_.y0);
-    image_rect = image_rect.Intersection(full_image_rect);
-    if (image_rect.xsize() == 0 || image_rect.ysize() == 0) {
-      image_rect = RectT<ssize_t>(0, 0, 0, 0);
-    }
-    size_t left_padding = image_rect.x0();
-    size_t middle_padding = group_dim;
-    size_t right_padding = full_image_xsize_ - image_rect.x1();
-    size_t out_of_frame_xsize =
-        padding +
-        std::max(left_padding, std::max(middle_padding, right_padding));
-    out_of_frame_data_.resize(num);
-    for (size_t t = 0; t < num; t++) {
-      JXL_ASSIGN_OR_RETURN(
-          out_of_frame_data_[t],
-          ImageF::Create(memory_manager_, out_of_frame_xsize, shifts.size()));
-    }
-  }
-  return true;
-}
-
-std::vector<std::pair<ImageF*, Rect>> LowMemoryRenderPipeline::PrepareBuffers(
-    size_t group_id, size_t thread_id) {
-  std::vector<std::pair<ImageF*, Rect>> ret(channel_shifts_[0].size());
-  const size_t gx = group_id % frame_dimensions_.xsize_groups;
-  const size_t gy = group_id / frame_dimensions_.xsize_groups;
-  for (size_t c = 0; c < channel_shifts_[0].size(); c++) {
-    ret[c].first = &group_data_[use_group_ids_ ? group_id : thread_id][c];
-    ret[c].second = Rect(group_data_x_border_, group_data_y_border_,
-                         GroupInputXSize(c), GroupInputYSize(c),
-                         DivCeil(frame_dimensions_.xsize_upsampled,
-                                 1 << channel_shifts_[0][c].first) -
-                             gx * GroupInputXSize(c) + group_data_x_border_,
-                         DivCeil(frame_dimensions_.ysize_upsampled,
-                                 1 << channel_shifts_[0][c].second) -
-                             gy * GroupInputYSize(c) + group_data_y_border_);
-  }
-  return ret;
-}
-
-namespace {
-
-JXL_INLINE int GetMirroredY(int y, ssize_t group_y0, ssize_t image_ysize) {
-  if (group_y0 == 0 && (y < 0 || y + group_y0 >= image_ysize)) {
-    return Mirror(y, image_ysize);
-  }
-  if (y + group_y0 >= image_ysize) {
-    // Here we know that the one mirroring step is sufficient.
-    return 2 * image_ysize - (y + group_y0) - 1 - group_y0;
-  }
-  return y;
-}
-
-JXL_INLINE void ApplyXMirroring(float* row, ssize_t borderx, ssize_t group_x0,
-                                ssize_t group_xsize, ssize_t image_xsize) {
-  if (image_xsize <= borderx) {
-    if (group_x0 == 0) {
-      for (ssize_t ix = 0; ix < borderx; ix++) {
-        row[kRenderPipelineXOffset - ix - 1] =
-            row[kRenderPipelineXOffset + Mirror(-ix - 1, image_xsize)];
-      }
-    }
-    if (group_xsize + borderx + group_x0 >= image_xsize) {
-      for (ssize_t ix = 0; ix < borderx; ix++) {
-        row[kRenderPipelineXOffset + image_xsize + ix - group_x0] =
-            row[kRenderPipelineXOffset + Mirror(image_xsize + ix, image_xsize) -
-                group_x0];
-      }
-    }
-  } else {
-    // Here we know that the one mirroring step is sufficient.
-    if (group_x0 == 0) {
-      for (ssize_t ix = 0; ix < borderx; ix++) {
-        row[kRenderPipelineXOffset - ix - 1] = row[kRenderPipelineXOffset + ix];
-      }
-    }
-    if (group_xsize + borderx + group_x0 >= image_xsize) {
-      for (ssize_t ix = 0; ix < borderx; ix++) {
-        row[kRenderPipelineXOffset + image_xsize - group_x0 + ix] =
-            row[kRenderPipelineXOffset + image_xsize - group_x0 - ix - 1];
-      }
-    }
-  }
-}
-
-// Information about where the *output* of each stage is stored.
-class Rows {
- public:
-  static StatusOr<Rows> Create(
-      const std::vector<std::unique_ptr<RenderPipelineStage>>& stages,
-      const Rect data_max_color_channel_rect, int group_data_x_border,
-      int group_data_y_border,
-      const std::vector<std::pair<size_t, size_t>>& group_data_shift,
-      size_t base_color_shift, std::vector<std::vector<ImageF>>& thread_data,
-      std::vector<ImageF>& input_data) {
-    size_t num_stages = stages.size();
-    size_t num_channels = input_data.size();
-
-    JXL_ENSURE(thread_data.size() == num_channels);
-    JXL_ENSURE(group_data_shift.size() == num_channels);
-
-    for (const auto& td : thread_data) {
-      JXL_ENSURE(td.size() == num_stages);
-    }
-
-    std::vector<std::vector<RowInfo>> rows;
-    rows.resize(num_stages + 1, std::vector<RowInfo>(num_channels));
-
-    for (size_t i = 0; i < num_stages; i++) {
-      for (size_t c = 0; c < input_data.size(); c++) {
-        if (stages[i]->GetChannelMode(c) == RenderPipelineChannelMode::kInOut) {
-          rows[i + 1][c].ymod_minus_1 = thread_data[c][i].ysize() - 1;
-          rows[i + 1][c].base_ptr = thread_data[c][i].Row(0);
-          rows[i + 1][c].stride = thread_data[c][i].PixelsPerRow();
-        }
-      }
-    }
-
-    for (size_t c = 0; c < input_data.size(); c++) {
-      auto tmp = data_max_color_channel_rect.As<ssize_t>()
-                     .Translate(-group_data_x_border, -group_data_y_border)
-                     .ShiftLeft(base_color_shift);
-      JXL_ASSIGN_OR_RETURN(tmp, tmp.CeilShiftRight(group_data_shift[c]));
-      auto channel_group_data_rect = tmp.Translate(
-          group_data_x_border - static_cast<ssize_t>(kRenderPipelineXOffset),
-          group_data_y_border);
-      rows[0][c].base_ptr = channel_group_data_rect.Row(&input_data[c], 0);
-      rows[0][c].stride = input_data[c].PixelsPerRow();
-      rows[0][c].ymod_minus_1 = -1;
-    }
-    return Rows(std::move(rows));
-  }
-
-  // Stage -1 refers to the input data; all other values must be nonnegative and
-  // refer to the data for the output of that stage.
-  JXL_INLINE float* GetBuffer(int stage, int y, size_t c) const {
-    JXL_DASSERT(stage >= -1);
-    const RowInfo& info = rows_[stage + 1][c];
-    return info.base_ptr +
-           static_cast<ssize_t>(info.stride) * (y & info.ymod_minus_1);
-  }
-
- private:
-  struct RowInfo {
-    // Pointer to beginning of the first row.
-    float* base_ptr;
-    // Modulo value for the y axis minus 1 (ymod is guaranteed to be a power of
-    // 2, which allows efficient mod computation by masking).
-    int ymod_minus_1;
-    // Number of floats per row.
-    size_t stride;
-  };
-
-  explicit Rows(std::vector<std::vector<RowInfo>>&& rows)
-      : rows_(std::move(rows)) {}
-
-  std::vector<std::vector<RowInfo>> rows_;
-};
-
-}  // namespace
-
-Status LowMemoryRenderPipeline::RenderRect(size_t thread_id,
-                                           std::vector<ImageF>& input_data,
-                                           Rect data_max_color_channel_rect,
-                                           Rect image_max_color_channel_rect) {
-  // For each stage, the rect corresponding to the image area currently being
-  // processed, in the coordinates of that stage (i.e. with the scaling factor
-  // that that stage has).
-  std::vector<Rect> group_rect;
-  group_rect.resize(stages_.size());
-  Rect image_area_rect =
-      image_max_color_channel_rect.ShiftLeft(base_color_shift_)
-          .Crop(frame_dimensions_.xsize_upsampled,
-                frame_dimensions_.ysize_upsampled);
-  for (size_t i = 0; i < stages_.size(); i++) {
-    JXL_ASSIGN_OR_RETURN(group_rect[i], image_area_rect.CeilShiftRight(
-                                            channel_shifts_[i][anyc_[i]]));
-  }
-
-  ssize_t frame_x0 =
-      first_image_dim_stage_ == stages_.size() ? 0 : frame_origin_.x0;
-  ssize_t frame_y0 =
-      first_image_dim_stage_ == stages_.size() ? 0 : frame_origin_.y0;
-  size_t full_image_xsize = first_image_dim_stage_ == stages_.size()
-                                ? frame_dimensions_.xsize_upsampled
-                                : full_image_xsize_;
-  size_t full_image_ysize = first_image_dim_stage_ == stages_.size()
-                                ? frame_dimensions_.ysize_upsampled
-                                : full_image_ysize_;
-
-  // Compute actual x-axis bounds for the current image area in the context of
-  // the full image this frame is part of. As the left boundary may be negative,
-  // we also create the x_pixels_skip value, defined as follows:
-  // - both x_pixels_skip and full_image_x0 are >= 0, and at least one is 0;
-  // - full_image_x0 - x_pixels_skip is the position of the current frame area
-  //   in the full image.
-  ssize_t full_image_x0 = frame_x0 + image_area_rect.x0();
-  ssize_t x_pixels_skip = 0;
-  if (full_image_x0 < 0) {
-    x_pixels_skip = -full_image_x0;
-    full_image_x0 = 0;
-  }
-  ssize_t full_image_x1 = frame_x0 + image_area_rect.x1();
-  full_image_x1 = std::min<ssize_t>(full_image_x1, full_image_xsize);
-
-  // If the current image area is entirely outside of the visible image, there
-  // is no point in proceeding. Note: this uses the assumption that if there is
-  // a stage with observable effects (i.e. a kInput stage), it only appears
-  // after the stage that switches to image dimensions.
-  if (full_image_x1 <= full_image_x0) return true;
-
-  // Data structures to hold information about input/output rows and their
-  // buffers.
-  JXL_ASSIGN_OR_RETURN(
-      Rows rows,
-      Rows::Create(stages_, data_max_color_channel_rect, group_data_x_border_,
-                   group_data_y_border_, channel_shifts_[0], base_color_shift_,
-                   stage_data_[thread_id], input_data));
-
-  std::vector<RenderPipelineStage::RowInfo> input_rows(first_trailing_stage_ +
-                                                       1);
-  for (size_t i = 0; i < first_trailing_stage_; i++) {
-    input_rows[i].resize(input_data.size());
-  }
-  input_rows[first_trailing_stage_].resize(input_data.size(),
-                                           std::vector<float*>(1));
-
-  // Maximum possible shift is 3.
-  RenderPipelineStage::RowInfo output_rows(input_data.size(),
-                                           std::vector<float*>(8));
-
-  // Fills in input_rows and output_rows for a given y value (relative to the
-  // start of the group, measured in actual pixels at the appropriate vertical
-  // scaling factor) and a given stage, applying mirroring if necessary. This
-  // function is somewhat inefficient for trailing kInOut or kInput stages,
-  // where just filling the input row once ought to be sufficient.
-  auto prepare_io_rows = [&](int y, size_t i) {
-    ssize_t bordery = stages_[i]->settings_.border_y;
-    size_t shifty = stages_[i]->settings_.shift_y;
-    auto make_row = [&](size_t c, ssize_t iy) {
-      size_t mirrored_y = GetMirroredY(y + iy - bordery, group_rect[i].y0(),
-                                       image_rect_[i].ysize());
-      input_rows[i][c][iy] =
-          rows.GetBuffer(stage_input_for_channel_[i][c], mirrored_y, c);
-      ApplyXMirroring(input_rows[i][c][iy], stages_[i]->settings_.border_x,
-                      group_rect[i].x0(), group_rect[i].xsize(),
-                      image_rect_[i].xsize());
-    };
-    for (size_t c = 0; c < input_data.size(); c++) {
-      RenderPipelineChannelMode mode = stages_[i]->GetChannelMode(c);
-      if (mode == RenderPipelineChannelMode::kIgnored) {
-        continue;
-      }
-      // If we already have rows from a previous iteration, we can just shift
-      // the rows by 1 and insert the new one.
-      if (input_rows[i][c].size() == 2 * static_cast<size_t>(bordery) + 1) {
-        for (ssize_t iy = 0; iy < 2 * bordery; iy++) {
-          input_rows[i][c][iy] = input_rows[i][c][iy + 1];
-        }
-        make_row(c, bordery * 2);
-      } else {
-        input_rows[i][c].resize(2 * bordery + 1);
-        for (ssize_t iy = 0; iy < 2 * bordery + 1; iy++) {
-          make_row(c, iy);
-        }
-      }
-
-      // If necessary, get the output buffers.
-      if (mode == RenderPipelineChannelMode::kInOut) {
-        for (size_t iy = 0; iy < (1u << shifty); iy++) {
-          output_rows[c][iy] = rows.GetBuffer(i, y * (1 << shifty) + iy, c);
-        }
-      }
-    }
-  };
-
-  // We pretend that every stage has a vertical shift of 0, i.e. it is as tall
-  // as the final image.
-  // We call each such row a "virtual" row, because it may or may not correspond
-  // to an actual row of the current processing stage; actual processing happens
-  // when vy % (1<<vshift) == 0.
-
-  int num_extra_rows = *std::max_element(virtual_ypadding_for_output_.begin(),
-                                         virtual_ypadding_for_output_.end());
-
-  for (int vy = -num_extra_rows;
-       vy < static_cast<int>(image_area_rect.ysize()) + num_extra_rows; vy++) {
-    for (size_t i = 0; i < first_trailing_stage_; i++) {
-      int stage_vy = vy - num_extra_rows + virtual_ypadding_for_output_[i];
-
-      if (stage_vy % (1 << channel_shifts_[i][anyc_[i]].second) != 0) {
-        continue;
-      }
-
-      if (stage_vy < -virtual_ypadding_for_output_[i]) {
-        continue;
-      }
-
-      int y = stage_vy >> channel_shifts_[i][anyc_[i]].second;
-
-      ssize_t image_y = static_cast<ssize_t>(group_rect[i].y0()) + y;
-      // Do not produce rows in out-of-bounds areas.
-      if (image_y < 0 ||
-          image_y >= static_cast<ssize_t>(image_rect_[i].ysize())) {
-        continue;
-      }
-
-      // Get the input/output rows and potentially apply mirroring to the input.
-      prepare_io_rows(y, i);
-
-      // Produce output rows.
-      JXL_RETURN_IF_ERROR(stages_[i]->ProcessRow(
-          input_rows[i], output_rows, xpadding_for_output_[i],
-          group_rect[i].xsize(), group_rect[i].x0(), image_y, thread_id));
-    }
-
-    // Process trailing stages, i.e. the final set of non-kInOut stages; they
-    // all have the same input buffer and no need to use any mirroring.
-
-    int y = vy - num_extra_rows;
-
-    for (size_t c = 0; c < input_data.size(); c++) {
-      // Skip pixels that are not part of the actual final image area.
-      input_rows[first_trailing_stage_][c][0] =
-          rows.GetBuffer(stage_input_for_channel_[first_trailing_stage_][c], y,
-                         c) +
-          x_pixels_skip;
-    }
-
-    // Check that we are not outside of the bounds for the current rendering
-    // rect. Not doing so might result in overwriting some rows that have been
-    // written (or will be written) by other threads.
-    if (y < 0 || y >= static_cast<ssize_t>(image_area_rect.ysize())) {
-      continue;
-    }
-
-    // Avoid running pipeline stages on pixels that are outside the full image
-    // area. As trailing stages have no borders, this is a free optimization
-    // (and may be necessary for correctness, as some stages assume coordinates
-    // are within bounds).
-    ssize_t full_image_y = frame_y0 + image_area_rect.y0() + y;
-    if (full_image_y < 0 ||
-        full_image_y >= static_cast<ssize_t>(full_image_ysize)) {
-      continue;
-    }
-
-    for (size_t i = first_trailing_stage_; i < stages_.size(); i++) {
-      // Before the first_image_dim_stage_, coordinates are relative to the
-      // current frame.
-      size_t x0 =
-          i < first_image_dim_stage_ ? full_image_x0 - frame_x0 : full_image_x0;
-      size_t y =
-          i < first_image_dim_stage_ ? full_image_y - frame_y0 : full_image_y;
-      JXL_RETURN_IF_ERROR(stages_[i]->ProcessRow(
-          input_rows[first_trailing_stage_], output_rows,
-          /*xextra=*/0, full_image_x1 - full_image_x0, x0, y, thread_id));
-    }
-  }
-  return true;
-}
-
-Status LowMemoryRenderPipeline::RenderPadding(size_t thread_id, Rect rect) {
-  if (rect.xsize() == 0) return true;
-  size_t numc = channel_shifts_[0].size();
-  RenderPipelineStage::RowInfo input_rows(numc, std::vector<float*>(1));
-  RenderPipelineStage::RowInfo output_rows;
-
-  for (size_t c = 0; c < numc; c++) {
-    input_rows[c][0] = out_of_frame_data_[thread_id].Row(c);
-  }
-
-  for (size_t y = 0; y < rect.ysize(); y++) {
-    stages_[first_image_dim_stage_ - 1]->ProcessPaddingRow(
-        input_rows, rect.xsize(), rect.x0(), rect.y0() + y);
-    for (size_t i = first_image_dim_stage_; i < stages_.size(); i++) {
-      JXL_RETURN_IF_ERROR(stages_[i]->ProcessRow(
-          input_rows, output_rows,
-          /*xextra=*/0, rect.xsize(), rect.x0(), rect.y0() + y, thread_id));
-    }
-  }
-  return true;
-}
-
-Status LowMemoryRenderPipeline::ProcessBuffers(size_t group_id,
-                                               size_t thread_id) {
-  std::vector<ImageF>& input_data =
-      group_data_[use_group_ids_ ? group_id : thread_id];
-
-  // Copy the group borders to the border storage.
-  for (size_t c = 0; c < input_data.size(); c++) {
-    JXL_RETURN_IF_ERROR(SaveBorders(group_id, c, input_data[c]));
-  }
-
-  size_t gy = group_id / frame_dimensions_.xsize_groups;
-  size_t gx = group_id % frame_dimensions_.xsize_groups;
-
-  if (first_image_dim_stage_ != stages_.size()) {
-    size_t group_dim = frame_dimensions_.group_dim << base_color_shift_;
-    RectT<ssize_t> group_rect(gx * group_dim, gy * group_dim, group_dim,
-                              group_dim);
-    RectT<ssize_t> image_rect(0, 0, frame_dimensions_.xsize_upsampled,
-                              frame_dimensions_.ysize_upsampled);
-    RectT<ssize_t> full_image_rect(0, 0, full_image_xsize_, full_image_ysize_);
-    group_rect = group_rect.Translate(frame_origin_.x0, frame_origin_.y0);
-    image_rect = image_rect.Translate(frame_origin_.x0, frame_origin_.y0);
-    image_rect = image_rect.Intersection(full_image_rect);
-    group_rect = group_rect.Intersection(image_rect);
-    size_t x0 = group_rect.x0();
-    size_t y0 = group_rect.y0();
-    size_t x1 = group_rect.x1();
-    size_t y1 = group_rect.y1();
-    JXL_DEBUG_V(6,
-                "Rendering padding for full image rect %s "
-                "outside group rect %s",
-                Description(full_image_rect).c_str(),
-                Description(group_rect).c_str());
-
-    if (group_id == 0 && (image_rect.xsize() == 0 || image_rect.ysize() == 0)) {
-      // If this frame does not intersect with the full image, we have to
-      // initialize the whole image area with RenderPadding.
-      JXL_RETURN_IF_ERROR(RenderPadding(
-          thread_id, Rect(0, 0, full_image_xsize_, full_image_ysize_)));
-    }
-
-    // Render padding for groups that intersect with the full image. The case
-    // where no groups intersect was handled above.
-    if (group_rect.xsize() > 0 && group_rect.ysize() > 0) {
-      if (gx == 0 && gy == 0) {
-        JXL_RETURN_IF_ERROR(RenderPadding(thread_id, Rect(0, 0, x0, y0)));
-      }
-      if (gy == 0) {
-        JXL_RETURN_IF_ERROR(RenderPadding(thread_id, Rect(x0, 0, x1 - x0, y0)));
-      }
-      if (gx == 0) {
-        JXL_RETURN_IF_ERROR(RenderPadding(thread_id, Rect(0, y0, x0, y1 - y0)));
-      }
-      if (gx == 0 && gy + 1 == frame_dimensions_.ysize_groups) {
-        JXL_RETURN_IF_ERROR(
-            RenderPadding(thread_id, Rect(0, y1, x0, full_image_ysize_ - y1)));
-      }
-      if (gy + 1 == frame_dimensions_.ysize_groups) {
-        JXL_RETURN_IF_ERROR(RenderPadding(
-            thread_id, Rect(x0, y1, x1 - x0, full_image_ysize_ - y1)));
-      }
-      if (gy == 0 && gx + 1 == frame_dimensions_.xsize_groups) {
-        JXL_RETURN_IF_ERROR(
-            RenderPadding(thread_id, Rect(x1, 0, full_image_xsize_ - x1, y0)));
-      }
-      if (gx + 1 == frame_dimensions_.xsize_groups) {
-        JXL_RETURN_IF_ERROR(RenderPadding(
-            thread_id, Rect(x1, y0, full_image_xsize_ - x1, y1 - y0)));
-      }
-      if (gy + 1 == frame_dimensions_.ysize_groups &&
-          gx + 1 == frame_dimensions_.xsize_groups) {
-        JXL_RETURN_IF_ERROR(RenderPadding(
-            thread_id,
-            Rect(x1, y1, full_image_xsize_ - x1, full_image_ysize_ - y1)));
-      }
-    }
-  }
-
-  Rect ready_rects[GroupBorderAssigner::kMaxToFinalize];
-  size_t num_ready_rects = 0;
-  group_border_assigner_.GroupDone(group_id, group_border_.first,
-                                   group_border_.second, ready_rects,
-                                   &num_ready_rects);
-  for (size_t i = 0; i < num_ready_rects; i++) {
-    const Rect& image_max_color_channel_rect = ready_rects[i];
-    for (size_t c = 0; c < input_data.size(); c++) {
-      JXL_RETURN_IF_ERROR(LoadBorders(group_id, c, image_max_color_channel_rect,
-                                      &input_data[c]));
-    }
-    Rect data_max_color_channel_rect(
-        group_data_x_border_ + image_max_color_channel_rect.x0() -
-            gx * frame_dimensions_.group_dim,
-        group_data_y_border_ + image_max_color_channel_rect.y0() -
-            gy * frame_dimensions_.group_dim,
-        image_max_color_channel_rect.xsize(),
-        image_max_color_channel_rect.ysize());
-    JXL_RETURN_IF_ERROR(RenderRect(thread_id, input_data,
-                                   data_max_color_channel_rect,
-                                   image_max_color_channel_rect));
-  }
-  return true;
-}
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/low_memory_render_pipeline.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/low_memory_render_pipeline.h
deleted file mode 100644
index b1d23b8bbffd3..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/low_memory_render_pipeline.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_RENDER_PIPELINE_LOW_MEMORY_RENDER_PIPELINE_H_
-#define LIB_JXL_RENDER_PIPELINE_LOW_MEMORY_RENDER_PIPELINE_H_
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_group_border.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/render_pipeline/render_pipeline.h"
-
-namespace jxl {
-
-// A multithreaded, low-memory rendering pipeline that only allocates a minimal
-// amount of buffers.
-class LowMemoryRenderPipeline final : public RenderPipeline {
- public:
-  explicit LowMemoryRenderPipeline(JxlMemoryManager* memory_manager)
-      : RenderPipeline(memory_manager) {}
-
- private:
-  std::vector<std::pair<ImageF*, Rect>> PrepareBuffers(
-      size_t group_id, size_t thread_id) override;
-
-  Status PrepareForThreadsInternal(size_t num, bool use_group_ids) override;
-
-  Status ProcessBuffers(size_t group_id, size_t thread_id) override;
-
-  void ClearDone(size_t i) override { group_border_assigner_.ClearDone(i); }
-
-  Status Init() override;
-
-  Status EnsureBordersStorage();
-  size_t GroupInputXSize(size_t c) const;
-  size_t GroupInputYSize(size_t c) const;
-  Status RenderRect(size_t thread_id, std::vector<ImageF>& input_data,
-                    Rect data_max_color_channel_rect,
-                    Rect image_max_color_channel_rect);
-  Status RenderPadding(size_t thread_id, Rect rect);
-
-  Status SaveBorders(size_t group_id, size_t c, const ImageF& in);
-  Status LoadBorders(size_t group_id, size_t c, const Rect& r, ImageF* out);
-
-  std::pair<size_t, size_t> ColorDimensionsToChannelDimensions(
-      std::pair<size_t, size_t> in, size_t c, size_t stage) const;
-
-  std::pair<size_t, size_t> BorderToStore(size_t c) const;
-
-  bool use_group_ids_;
-
-  // Storage for borders between groups. Borders of adjacent groups are stacked
-  // together, e.g. bottom border of current group is followed by top border
-  // of next group.
-  std::vector<ImageF> borders_horizontal_;
-  std::vector<ImageF> borders_vertical_;
-
-  // Manages the status of borders.
-  GroupBorderAssigner group_border_assigner_;
-
-  // Size (in color-channel-pixels) of the border around each group that might
-  // be assigned to that group.
-  std::pair<size_t, size_t> group_border_;
-  // base_color_shift_ defines the size of groups in terms of final image
-  // pixels.
-  size_t base_color_shift_;
-
-  // Buffer for decoded pixel data for a group, indexed by [thread][channel] or
-  // [group][channel] depending on `use_group_ids_`.
-  std::vector<std::vector<ImageF>> group_data_;
-
-  // Borders for storing group data.
-  size_t group_data_x_border_;
-  size_t group_data_y_border_;
-
-  // Buffers for intermediate rows for the various stages, indexed by
-  // [thread][channel][stage].
-  std::vector<std::vector<std::vector<ImageF>>> stage_data_;
-
-  // Buffers for out-of-frame data, indexed by [thread]; every row is a
-  // different channel.
-  std::vector<ImageF> out_of_frame_data_;
-
-  // For each stage, a non-kIgnored channel.
-  std::vector<int32_t> anyc_;
-
-  // Size of the image at each stage.
-  std::vector<Rect> image_rect_;
-
-  // For each stage, for each channel, keep track of the kInOut stage that
-  // produced the input to that stage (which corresponds to the buffer index
-  // containing the data). -1 if data comes from the original input.
-  std::vector<std::vector<int32_t>> stage_input_for_channel_;
-
-  // Number of (virtual) extra rows that must be processed at each stage
-  // to produce sufficient output for future stages.
-  std::vector<int> virtual_ypadding_for_output_;
-
-  // Same thing for columns, except these are real columns and not virtual ones.
-  std::vector<int> xpadding_for_output_;
-
-  // First stage that doesn't have any kInOut channel.
-  size_t first_trailing_stage_;
-
-  // Origin and size of the frame after switching to image dimensions.
-  FrameOrigin frame_origin_;
-  size_t full_image_xsize_;
-  size_t full_image_ysize_;
-  size_t first_image_dim_stage_;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_RENDER_PIPELINE_LOW_MEMORY_RENDER_PIPELINE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/render_pipeline.cc b/third_party/jpeg-xl/lib/jxl/render_pipeline/render_pipeline.cc
deleted file mode 100644
index 047470257e9e2..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/render_pipeline.cc
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/render_pipeline/render_pipeline.h"
-
-#include <jxl/memory_manager.h>
-
-#include <memory>
-#include <utility>
-
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/sanitizers.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/render_pipeline/low_memory_render_pipeline.h"
-#include "lib/jxl/render_pipeline/simple_render_pipeline.h"
-
-namespace jxl {
-
-Status RenderPipeline::Builder::AddStage(
-    std::unique_ptr<RenderPipelineStage> stage) {
-  if (!stage) return JXL_FAILURE("internal: no stage to add");
-  stages_.push_back(std::move(stage));
-  return true;
-}
-
-StatusOr<std::unique_ptr<RenderPipeline>> RenderPipeline::Builder::Finalize(
-    FrameDimensions frame_dimensions) && {
-  // Check that the last stage is not a kInOut stage for any channel, and that
-  // there is at least one stage.
-  JXL_ENSURE(!stages_.empty());
-  for (size_t c = 0; c < num_c_; c++) {
-    JXL_ENSURE(stages_.back()->GetChannelMode(c) !=
-               RenderPipelineChannelMode::kInOut);
-  }
-
-  std::unique_ptr<RenderPipeline> res;
-  if (use_simple_implementation_) {
-    res = jxl::make_unique<SimpleRenderPipeline>(memory_manager_);
-  } else {
-    res = jxl::make_unique<LowMemoryRenderPipeline>(memory_manager_);
-  }
-
-  res->padding_.resize(stages_.size());
-  for (size_t i = stages_.size(); i-- > 0;) {
-    const auto& stage = stages_[i];
-    res->padding_[i].resize(num_c_);
-    if (i + 1 == stages_.size()) {
-      continue;
-    }
-    for (size_t c = 0; c < num_c_; c++) {
-      if (stage->GetChannelMode(c) == RenderPipelineChannelMode::kInOut) {
-        res->padding_[i][c].first = DivCeil(res->padding_[i + 1][c].first,
-                                            1 << stage->settings_.shift_x) +
-                                    stage->settings_.border_x;
-        res->padding_[i][c].second = DivCeil(res->padding_[i + 1][c].second,
-                                             1 << stage->settings_.shift_y) +
-                                     stage->settings_.border_y;
-      } else {
-        res->padding_[i][c] = res->padding_[i + 1][c];
-      }
-    }
-  }
-
-  res->frame_dimensions_ = frame_dimensions;
-  res->group_completed_passes_.resize(frame_dimensions.num_groups);
-  res->channel_shifts_.resize(stages_.size());
-  res->channel_shifts_[0].resize(num_c_);
-  for (size_t i = 1; i < stages_.size(); i++) {
-    auto& stage = stages_[i - 1];
-    for (size_t c = 0; c < num_c_; c++) {
-      if (stage->GetChannelMode(c) == RenderPipelineChannelMode::kInOut) {
-        res->channel_shifts_[0][c].first += stage->settings_.shift_x;
-        res->channel_shifts_[0][c].second += stage->settings_.shift_y;
-      }
-    }
-  }
-  for (size_t i = 1; i < stages_.size(); i++) {
-    auto& stage = stages_[i - 1];
-    res->channel_shifts_[i].resize(num_c_);
-    for (size_t c = 0; c < num_c_; c++) {
-      if (stage->GetChannelMode(c) == RenderPipelineChannelMode::kInOut) {
-        res->channel_shifts_[i][c].first =
-            res->channel_shifts_[i - 1][c].first - stage->settings_.shift_x;
-        res->channel_shifts_[i][c].second =
-            res->channel_shifts_[i - 1][c].second - stage->settings_.shift_y;
-      } else {
-        res->channel_shifts_[i][c].first = res->channel_shifts_[i - 1][c].first;
-        res->channel_shifts_[i][c].second =
-            res->channel_shifts_[i - 1][c].second;
-      }
-    }
-  }
-  res->stages_ = std::move(stages_);
-  JXL_RETURN_IF_ERROR(res->Init());
-  return res;
-}
-
-RenderPipelineInput RenderPipeline::GetInputBuffers(size_t group_id,
-                                                    size_t thread_id) {
-  RenderPipelineInput ret;
-  JXL_DASSERT(group_id < group_completed_passes_.size());
-  ret.group_id_ = group_id;
-  ret.thread_id_ = thread_id;
-  ret.pipeline_ = this;
-  ret.buffers_ = PrepareBuffers(group_id, thread_id);
-  return ret;
-}
-
-Status RenderPipeline::InputReady(
-    size_t group_id, size_t thread_id,
-    const std::vector<std::pair<ImageF*, Rect>>& buffers) {
-  JXL_ENSURE(group_id < group_completed_passes_.size());
-  group_completed_passes_[group_id]++;
-  for (size_t i = 0; i < buffers.size(); ++i) {
-    (void)i;
-    JXL_CHECK_PLANE_INITIALIZED(*buffers[i].first, buffers[i].second, i);
-  }
-
-  JXL_RETURN_IF_ERROR(ProcessBuffers(group_id, thread_id));
-  return true;
-}
-
-Status RenderPipeline::PrepareForThreads(size_t num, bool use_group_ids) {
-  for (const auto& stage : stages_) {
-    JXL_RETURN_IF_ERROR(stage->PrepareForThreads(num));
-  }
-  JXL_RETURN_IF_ERROR(PrepareForThreadsInternal(num, use_group_ids));
-  return true;
-}
-
-Status RenderPipelineInput::Done() {
-  JXL_ENSURE(pipeline_);
-  JXL_RETURN_IF_ERROR(pipeline_->InputReady(group_id_, thread_id_, buffers_));
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/render_pipeline.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/render_pipeline.h
deleted file mode 100644
index 073f377f90d00..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/render_pipeline.h
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_RENDER_PIPELINE_RENDER_PIPELINE_H_
-#define LIB_JXL_RENDER_PIPELINE_RENDER_PIPELINE_H_
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <memory>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-
-namespace jxl {
-
-// Interface to provide input to the rendering pipeline. When this object is
-// destroyed, all the data in the provided ImageF's Rects must have been
-// initialized.
-class RenderPipelineInput {
- public:
-  RenderPipelineInput(const RenderPipelineInput&) = delete;
-  RenderPipelineInput(RenderPipelineInput&& other) noexcept {
-    *this = std::move(other);
-  }
-  RenderPipelineInput& operator=(RenderPipelineInput&& other) noexcept {
-    pipeline_ = other.pipeline_;
-    group_id_ = other.group_id_;
-    thread_id_ = other.thread_id_;
-    buffers_ = std::move(other.buffers_);
-    other.pipeline_ = nullptr;
-    return *this;
-  }
-
-  RenderPipelineInput() = default;
-  Status Done();
-
-  const std::pair<ImageF*, Rect>& GetBuffer(size_t c) const {
-    JXL_DASSERT(c < buffers_.size());
-    return buffers_[c];
-  }
-
- private:
-  RenderPipeline* pipeline_ = nullptr;
-  size_t group_id_;
-  size_t thread_id_;
-  std::vector<std::pair<ImageF*, Rect>> buffers_;
-  friend class RenderPipeline;
-};
-
-class RenderPipeline {
- public:
-  class Builder {
-   public:
-    explicit Builder(JxlMemoryManager* memory_manager, size_t num_c)
-        : memory_manager_(memory_manager), num_c_(num_c) {
-      JXL_DASSERT(num_c > 0);
-    }
-
-    // Adds a stage to the pipeline. Must be called at least once; the last
-    // added stage cannot have kInOut channels.
-    Status AddStage(std::unique_ptr<RenderPipelineStage> stage);
-
-    // Enables using the simple (i.e. non-memory-efficient) implementation of
-    // the pipeline.
-    void UseSimpleImplementation() { use_simple_implementation_ = true; }
-
-    // Finalizes setup of the pipeline. Shifts for all channels should be 0 at
-    // this point.
-    StatusOr<std::unique_ptr<RenderPipeline>> Finalize(
-        FrameDimensions frame_dimensions) &&;
-
-   private:
-    JxlMemoryManager* memory_manager_;
-    std::vector<std::unique_ptr<RenderPipelineStage>> stages_;
-    size_t num_c_;
-    bool use_simple_implementation_ = false;
-  };
-
-  friend class Builder;
-
-  virtual ~RenderPipeline() = default;
-
-  Status IsInitialized() const {
-    for (const auto& stage : stages_) {
-      JXL_RETURN_IF_ERROR(stage->IsInitialized());
-    }
-    return true;
-  }
-
-  // Allocates storage to run with `num` threads. If `use_group_ids` is true,
-  // storage is allocated for each group, not each thread. The behaviour is
-  // undefined if calling this function multiple times with a different value
-  // for `use_group_ids`.
-  Status PrepareForThreads(size_t num, bool use_group_ids);
-
-  // Retrieves a buffer where input data should be stored by the callee. When
-  // input has been provided for all buffers, the pipeline will complete its
-  // processing. This method may be called multiple times concurrently from
-  // different threads, provided that a different `thread_id` is given.
-  RenderPipelineInput GetInputBuffers(size_t group_id, size_t thread_id);
-
-  size_t PassesWithAllInput() const {
-    return *std::min_element(group_completed_passes_.begin(),
-                             group_completed_passes_.end());
-  }
-
-  virtual void ClearDone(size_t i) {}
-
- protected:
-  explicit RenderPipeline(JxlMemoryManager* memory_manager)
-      : memory_manager_(memory_manager) {}
-  JxlMemoryManager* memory_manager_;
-
-  std::vector<std::unique_ptr<RenderPipelineStage>> stages_;
-  // Shifts for every channel at the input of each stage.
-  std::vector<std::vector<std::pair<size_t, size_t>>> channel_shifts_;
-
-  // Amount of (cumulative) padding required by each stage and channel, in
-  // either direction.
-  std::vector<std::vector<std::pair<size_t, size_t>>> padding_;
-
-  FrameDimensions frame_dimensions_;
-
-  std::vector<uint8_t> group_completed_passes_;
-
-  friend class RenderPipelineInput;
-
- private:
-  Status InputReady(size_t group_id, size_t thread_id,
-                    const std::vector<std::pair<ImageF*, Rect>>& buffers);
-
-  virtual std::vector<std::pair<ImageF*, Rect>> PrepareBuffers(
-      size_t group_id, size_t thread_id) = 0;
-
-  virtual Status ProcessBuffers(size_t group_id, size_t thread_id) = 0;
-
-  // Note that this method may be called multiple times with different (or
-  // equal) `num`.
-  virtual Status PrepareForThreadsInternal(size_t num, bool use_group_ids) = 0;
-
-  // Called once frame dimensions and stages are known.
-  virtual Status Init() { return true; }
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_RENDER_PIPELINE_RENDER_PIPELINE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/render_pipeline_stage.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/render_pipeline_stage.h
deleted file mode 100644
index 3c9b83addd56d..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/render_pipeline_stage.h
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_RENDER_PIPELINE_RENDER_PIPELINE_STAGE_H_
-#define LIB_JXL_RENDER_PIPELINE_RENDER_PIPELINE_STAGE_H_
-
-#include <cstddef>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/arch_macros.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/frame_header.h"
-
-namespace jxl {
-
-// The first pixel in the input to RenderPipelineStage will be located at
-// this position. Pixels before this position may be accessed as padding.
-// This should be at least the RoundUpTo(maximum padding / 2, maximum vector
-// size) times 2: this is realized when using Gaborish + EPF + upsampling +
-// chroma subsampling.
-#if JXL_ARCH_ARM
-constexpr size_t kRenderPipelineXOffset = 16;
-#else
-constexpr size_t kRenderPipelineXOffset = 32;
-#endif
-
-enum class RenderPipelineChannelMode {
-  // This channel is not modified by this stage.
-  kIgnored = 0,
-  // This channel is modified in-place.
-  kInPlace = 1,
-  // This channel is modified and written to a new buffer.
-  kInOut = 2,
-  // This channel is only read. These are the only stages that are assumed to
-  // have observable effects, i.e. calls to ProcessRow for other stages may be
-  // omitted if it can be shown they can't affect any kInput stage ProcessRow
-  // call that happens inside image boundaries.
-  kInput = 3,
-};
-
-class RenderPipeline;
-
-class RenderPipelineStage {
- protected:
-  using Row = float*;
-  using ChannelRows = std::vector<Row>;
-
- public:
-  using RowInfo = std::vector<ChannelRows>;
-  struct Settings {
-    // Amount of padding required in the various directions by all channels
-    // that have kInOut mode.
-    size_t border_x = 0;
-    size_t border_y = 0;
-
-    // Log2 of the number of columns/rows of output that this stage will produce
-    // for every input row for kInOut channels.
-    size_t shift_x = 0;
-    size_t shift_y = 0;
-
-    static Settings ShiftX(size_t shift, size_t border) {
-      Settings settings;
-      settings.border_x = border;
-      settings.shift_x = shift;
-      return settings;
-    }
-
-    static Settings ShiftY(size_t shift, size_t border) {
-      Settings settings;
-      settings.border_y = border;
-      settings.shift_y = shift;
-      return settings;
-    }
-
-    static Settings Symmetric(size_t shift, size_t border) {
-      Settings settings;
-      settings.border_x = settings.border_y = border;
-      settings.shift_x = settings.shift_y = shift;
-      return settings;
-    }
-
-    static Settings SymmetricBorderOnly(size_t border) {
-      return Symmetric(0, border);
-    }
-  };
-
-  virtual ~RenderPipelineStage() = default;
-
-  // Processes one row of input, producing the appropriate number of rows of
-  // output. Input/output rows can be obtained by calls to
-  // `GetInputRow`/`GetOutputRow`. `xsize+2*xextra` represents the total number
-  // of pixels to be processed in the input row, where the first pixel is at
-  // position `kRenderPipelineXOffset-xextra`. All pixels in the
-  // `[kRenderPipelineXOffset-xextra-border_x,
-  // kRenderPipelineXOffset+xsize+xextra+border_x)` range are initialized and
-  // accessible. `xpos` and `ypos` represent the position of the first
-  // (non-extra, i.e. in position kRenderPipelineXOffset) pixel in the center
-  // row of the input in the full image. `xpos` is a multiple of
-  // `GroupBorderAssigner::kPaddingXRound`. If `settings_.temp_buffer_size` is
-  // nonzero, `temp` will point to an HWY-aligned buffer of at least that number
-  // of floats; concurrent calls will have different buffers.
-  virtual Status ProcessRow(const RowInfo& input_rows,
-                            const RowInfo& output_rows, size_t xextra,
-                            size_t xsize, size_t xpos, size_t ypos,
-                            size_t thread_id) const = 0;
-
-  // How each channel will be processed. Channels are numbered starting from
-  // color channels (always 3) and followed by all other channels.
-  virtual RenderPipelineChannelMode GetChannelMode(size_t c) const = 0;
-
- protected:
-  explicit RenderPipelineStage(Settings settings) : settings_(settings) {}
-
-  virtual Status IsInitialized() const { return true; }
-
-  // Informs the stage about the total size of each channel. Few stages will
-  // actually need to use this information.
-  virtual Status SetInputSizes(
-      const std::vector<std::pair<size_t, size_t>>& input_sizes) {
-    return true;
-  }
-
-  virtual Status PrepareForThreads(size_t num_threads) { return true; }
-
-  // Returns a pointer to the input row of channel `c` with offset `y`.
-  // `y` must be in [-settings_.border_y, settings_.border_y]. `c` must be such
-  // that `GetChannelMode(c) != kIgnored`. The returned pointer points to the
-  // offset-ed row (i.e. kRenderPipelineXOffset has been applied).
-  float* GetInputRow(const RowInfo& input_rows, size_t c, int offset) const {
-    JXL_DASSERT(GetChannelMode(c) != RenderPipelineChannelMode::kIgnored);
-    JXL_DASSERT(-offset <= static_cast<int>(settings_.border_y));
-    JXL_DASSERT(offset <= static_cast<int>(settings_.border_y));
-    return input_rows[c][settings_.border_y + offset] + kRenderPipelineXOffset;
-  }
-  // Similar to `GetInputRow`, but can only be used if `GetChannelMode(c) ==
-  // kInOut`. Offset must be less than `1<<settings_.shift_y`.. The returned
-  // pointer points to the offset-ed row (i.e. kRenderPipelineXOffset has been
-  // applied).
-  float* GetOutputRow(const RowInfo& output_rows, size_t c,
-                      size_t offset) const {
-    JXL_DASSERT(GetChannelMode(c) == RenderPipelineChannelMode::kInOut);
-    JXL_DASSERT(offset <= 1ul << settings_.shift_y);
-    return output_rows[c][offset] + kRenderPipelineXOffset;
-  }
-
-  // Indicates whether, from this stage on, the pipeline will operate on an
-  // image- rather than frame-sized buffer. Only one stage in the pipeline
-  // should return true, and it should implement ProcessPaddingRow below too.
-  // It is assumed that, if there is a SwitchToImageDimensions() == true stage,
-  // all kInput stages appear after it.
-  virtual bool SwitchToImageDimensions() const { return false; }
-
-  // If SwitchToImageDimensions returns true, then this should set xsize and
-  // ysize to the image size, and frame_origin to the location of the frame
-  // within the image. Otherwise, this is not called at all.
-  virtual void GetImageDimensions(size_t* xsize, size_t* ysize,
-                                  FrameOrigin* frame_origin) const {}
-
-  // Produces the appropriate output data outside of the frame dimensions. xpos
-  // and ypos are now relative to the full image.
-  virtual void ProcessPaddingRow(const RowInfo& output_rows, size_t xsize,
-                                 size_t xpos, size_t ypos) const {}
-
-  virtual const char* GetName() const = 0;
-
-  Settings settings_;
-  friend class RenderPipeline;
-  friend class SimpleRenderPipeline;
-  friend class LowMemoryRenderPipeline;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_RENDER_PIPELINE_RENDER_PIPELINE_STAGE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/render_pipeline_test.cc b/third_party/jpeg-xl/lib/jxl/render_pipeline/render_pipeline_test.cc
deleted file mode 100644
index 378588383d012..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/render_pipeline_test.cc
+++ /dev/null
@@ -1,600 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/render_pipeline/render_pipeline.h"
-
-#include <jxl/cms.h>
-
-#include <algorithm>
-#include <cctype>
-#include <cstdint>
-#include <cstdio>
-#include <ostream>
-#include <sstream>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "jxl/memory_manager.h"
-#include "lib/extras/codec.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/override.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/chroma_from_luma.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/common.h"  // JXL_HIGH_PRECISION, JPEGXL_ENABLE_TRANSCODE_JPEG
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/dec_cache.h"
-#include "lib/jxl/dec_frame.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/fake_parallel_runner_testonly.h"
-#include "lib/jxl/fields.h"
-#include "lib/jxl/frame_dimensions.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/headers.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/image_test_utils.h"
-#include "lib/jxl/jpeg/enc_jpeg_data.h"
-#include "lib/jxl/render_pipeline/test_render_pipeline_stages.h"
-#include "lib/jxl/splines.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-Status DecodeFile(const Span<const uint8_t> file, bool use_slow_pipeline,
-                  CodecInOut* io, ThreadPool* pool) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  Status ret = true;
-  {
-    BitReader reader(file);
-    BitReaderScopedCloser reader_closer(reader, ret);
-    JXL_RETURN_IF_ERROR(reader.ReadFixedBits<16>() == 0x0AFF);
-    JXL_RETURN_IF_ERROR(ReadSizeHeader(&reader, &io->metadata.size));
-    JXL_RETURN_IF_ERROR(ReadImageMetadata(&reader, &io->metadata.m));
-    io->metadata.transform_data.nonserialized_xyb_encoded =
-        io->metadata.m.xyb_encoded;
-    JXL_RETURN_IF_ERROR(Bundle::Read(&reader, &io->metadata.transform_data));
-    if (io->metadata.m.color_encoding.WantICC()) {
-      std::vector<uint8_t> icc;
-      JXL_RETURN_IF_ERROR(test::ReadICC(&reader, &icc));
-      JXL_RETURN_IF_ERROR(io->metadata.m.color_encoding.SetICC(
-          std::move(icc), JxlGetDefaultCms()));
-    }
-    PassesDecoderState dec_state(memory_manager);
-    JXL_RETURN_IF_ERROR(
-        dec_state.output_encoding_info.SetFromMetadata(io->metadata));
-    JXL_RETURN_IF_ERROR(reader.JumpToByteBoundary());
-    io->frames.clear();
-    FrameHeader frame_header(&io->metadata);
-    do {
-      io->frames.emplace_back(memory_manager, &io->metadata.m);
-      // Skip frames that are not displayed.
-      do {
-        size_t frame_start = reader.TotalBitsConsumed() / kBitsPerByte;
-        size_t size_left = file.size() - frame_start;
-        JXL_RETURN_IF_ERROR(DecodeFrame(&dec_state, pool,
-                                        file.data() + frame_start, size_left,
-                                        &frame_header, &io->frames.back(),
-                                        io->metadata, use_slow_pipeline));
-        reader.SkipBits(io->frames.back().decoded_bytes() * kBitsPerByte);
-      } while (frame_header.frame_type != FrameType::kRegularFrame &&
-               frame_header.frame_type != FrameType::kSkipProgressive);
-    } while (!frame_header.is_last);
-
-    if (io->frames.empty()) return JXL_FAILURE("Not enough data.");
-
-    if (reader.TotalBitsConsumed() != file.size() * kBitsPerByte) {
-      return JXL_FAILURE("Reader position not at EOF.");
-    }
-    if (!reader.AllReadsWithinBounds()) {
-      return JXL_FAILURE("Reader out of bounds read.");
-    }
-    JXL_RETURN_IF_ERROR(io->CheckMetadata());
-    // reader is closed here.
-  }
-  return ret;
-}
-
-TEST(RenderPipelineTest, Build) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  RenderPipeline::Builder builder(memory_manager, /*num_c=*/1);
-  ASSERT_TRUE(builder.AddStage(jxl::make_unique<UpsampleXSlowStage>()));
-  ASSERT_TRUE(builder.AddStage(jxl::make_unique<UpsampleYSlowStage>()));
-  ASSERT_TRUE(builder.AddStage(jxl::make_unique<Check0FinalStage>()));
-  builder.UseSimpleImplementation();
-  FrameDimensions frame_dimensions;
-  frame_dimensions.Set(/*xsize=*/1024, /*ysize=*/1024, /*group_size_shift=*/0,
-                       /*max_hshift=*/0, /*max_vshift=*/0,
-                       /*modular_mode=*/false, /*upsampling=*/1);
-  JXL_TEST_ASSIGN_OR_DIE(auto pipeline,
-                         std::move(builder).Finalize(frame_dimensions));
-  (void)pipeline;
-}
-
-TEST(RenderPipelineTest, CallAllGroups) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  RenderPipeline::Builder builder(memory_manager, /*num_c=*/1);
-  ASSERT_TRUE(builder.AddStage(jxl::make_unique<UpsampleXSlowStage>()));
-  ASSERT_TRUE(builder.AddStage(jxl::make_unique<UpsampleYSlowStage>()));
-  ASSERT_TRUE(builder.AddStage(jxl::make_unique<Check0FinalStage>()));
-  builder.UseSimpleImplementation();
-  FrameDimensions frame_dimensions;
-  frame_dimensions.Set(/*xsize=*/1024, /*ysize=*/1024, /*group_size_shift=*/0,
-                       /*max_hshift=*/0, /*max_vshift=*/0,
-                       /*modular_mode=*/false, /*upsampling=*/1);
-  JXL_TEST_ASSIGN_OR_DIE(auto pipeline,
-                         std::move(builder).Finalize(frame_dimensions));
-  ASSERT_TRUE(pipeline->PrepareForThreads(1, /*use_group_ids=*/false));
-
-  for (size_t i = 0; i < frame_dimensions.num_groups; i++) {
-    auto input_buffers = pipeline->GetInputBuffers(i, 0);
-    const auto& buffer = input_buffers.GetBuffer(0);
-    FillPlane(0.0f, buffer.first, buffer.second);
-    ASSERT_TRUE(input_buffers.Done());
-  }
-
-  EXPECT_EQ(pipeline->PassesWithAllInput(), 1);
-}
-
-TEST(RenderPipelineTest, BuildFast) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  RenderPipeline::Builder builder(memory_manager, /*num_c=*/1);
-  ASSERT_TRUE(builder.AddStage(jxl::make_unique<UpsampleXSlowStage>()));
-  ASSERT_TRUE(builder.AddStage(jxl::make_unique<UpsampleYSlowStage>()));
-  ASSERT_TRUE(builder.AddStage(jxl::make_unique<Check0FinalStage>()));
-  FrameDimensions frame_dimensions;
-  frame_dimensions.Set(/*xsize=*/1024, /*ysize=*/1024, /*group_size_shift=*/0,
-                       /*max_hshift=*/0, /*max_vshift=*/0,
-                       /*modular_mode=*/false, /*upsampling=*/1);
-  JXL_TEST_ASSIGN_OR_DIE(auto pipeline,
-                         std::move(builder).Finalize(frame_dimensions));
-  (void)pipeline;
-}
-
-TEST(RenderPipelineTest, CallAllGroupsFast) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  RenderPipeline::Builder builder(memory_manager, /*num_c=*/1);
-  ASSERT_TRUE(builder.AddStage(jxl::make_unique<UpsampleXSlowStage>()));
-  ASSERT_TRUE(builder.AddStage(jxl::make_unique<UpsampleYSlowStage>()));
-  ASSERT_TRUE(builder.AddStage(jxl::make_unique<Check0FinalStage>()));
-  builder.UseSimpleImplementation();
-  FrameDimensions frame_dimensions;
-  frame_dimensions.Set(/*xsize=*/1024, /*ysize=*/1024, /*group_size_shift=*/0,
-                       /*max_hshift=*/0, /*max_vshift=*/0,
-                       /*modular_mode=*/false, /*upsampling=*/1);
-  JXL_TEST_ASSIGN_OR_DIE(auto pipeline,
-                         std::move(builder).Finalize(frame_dimensions));
-  ASSERT_TRUE(pipeline->PrepareForThreads(1, /*use_group_ids=*/false));
-
-  for (size_t i = 0; i < frame_dimensions.num_groups; i++) {
-    auto input_buffers = pipeline->GetInputBuffers(i, 0);
-    const auto& buffer = input_buffers.GetBuffer(0);
-    FillPlane(0.0f, buffer.first, buffer.second);
-    ASSERT_TRUE(input_buffers.Done());
-  }
-
-  EXPECT_EQ(pipeline->PassesWithAllInput(), 1);
-}
-
-struct RenderPipelineTestInputSettings {
-  // Input image.
-  std::string input_path;
-  size_t xsize, ysize;
-  bool jpeg_transcode = false;
-  // Encoding settings.
-  CompressParams cparams;
-  // Short name for the encoder settings.
-  std::string cparams_descr;
-
-  bool add_spot_color = false;
-
-  Splines splines;
-};
-
-class RenderPipelineTestParam
-    : public ::testing::TestWithParam<RenderPipelineTestInputSettings> {};
-
-TEST_P(RenderPipelineTestParam, PipelineTest) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  RenderPipelineTestInputSettings config = GetParam();
-
-  // Use a parallel runner that randomly shuffles tasks to detect possible
-  // border handling bugs.
-  FakeParallelRunner fake_pool(/*order_seed=*/123, /*num_threads=*/8);
-  ThreadPool pool(&JxlFakeParallelRunner, &fake_pool);
-  const std::vector<uint8_t> orig = jxl::test::ReadTestData(config.input_path);
-
-  CodecInOut io{memory_manager};
-  if (config.jpeg_transcode) {
-    ASSERT_TRUE(jpeg::DecodeImageJPG(Bytes(orig), &io));
-  } else {
-    ASSERT_TRUE(SetFromBytes(Bytes(orig), &io, &pool));
-  }
-  ASSERT_TRUE(io.ShrinkTo(config.xsize, config.ysize));
-
-  if (config.add_spot_color) {
-    JXL_TEST_ASSIGN_OR_DIE(
-        ImageF spot,
-        ImageF::Create(memory_manager, config.xsize, config.ysize));
-    jxl::ZeroFillImage(&spot);
-
-    for (size_t y = 0; y < config.ysize; y++) {
-      float* JXL_RESTRICT row = spot.Row(y);
-      for (size_t x = 0; x < config.xsize; x++) {
-        row[x] = ((x ^ y) & 255) * (1.f / 255.f);
-      }
-    }
-    ExtraChannelInfo info;
-    info.bit_depth.bits_per_sample = 8;
-    info.dim_shift = 0;
-    info.type = jxl::ExtraChannel::kSpotColor;
-    info.spot_color[0] = 0.5f;
-    info.spot_color[1] = 0.2f;
-    info.spot_color[2] = 1.f;
-    info.spot_color[3] = 0.5f;
-
-    io.metadata.m.extra_channel_info.push_back(info);
-    std::vector<ImageF> ec;
-    ec.push_back(std::move(spot));
-    ASSERT_TRUE(io.frames[0].SetExtraChannels(std::move(ec)));
-  }
-
-  std::vector<uint8_t> compressed;
-
-  config.cparams.custom_splines = config.splines;
-  ASSERT_TRUE(test::EncodeFile(config.cparams, &io, &compressed, &pool));
-
-  CodecInOut io_default{memory_manager};
-  ASSERT_TRUE(DecodeFile(Bytes(compressed),
-                         /*use_slow_pipeline=*/false, &io_default, &pool));
-  CodecInOut io_slow_pipeline{memory_manager};
-  ASSERT_TRUE(DecodeFile(Bytes(compressed),
-                         /*use_slow_pipeline=*/true, &io_slow_pipeline, &pool));
-
-  ASSERT_EQ(io_default.frames.size(), io_slow_pipeline.frames.size());
-  for (size_t i = 0; i < io_default.frames.size(); i++) {
-#if JXL_HIGH_PRECISION
-    constexpr float kMaxError = 2e-4;
-#else
-    constexpr float kMaxError = 5e-4;
-#endif
-    Image3F def = std::move(*io_default.frames[i].color());
-    Image3F pip = std::move(*io_slow_pipeline.frames[i].color());
-    JXL_TEST_ASSERT_OK(VerifyRelativeError(pip, def, kMaxError, kMaxError, _));
-    for (size_t ec = 0; ec < io_default.frames[i].extra_channels().size();
-         ec++) {
-      JXL_TEST_ASSERT_OK(VerifyRelativeError(
-          io_slow_pipeline.frames[i].extra_channels()[ec],
-          io_default.frames[i].extra_channels()[ec], kMaxError, kMaxError, _));
-    }
-  }
-}
-
-StatusOr<Splines> CreateTestSplines() {
-  const ColorCorrelation color_correlation{};
-  std::vector<Spline::Point> control_points{{9, 54},  {118, 159}, {97, 3},
-                                            {10, 40}, {150, 25},  {120, 300}};
-  const Spline spline{control_points,
-                      /*color_dct=*/
-                      {Dct32{0.03125f, 0.00625f, 0.003125f},
-                       Dct32{1.f, 0.321875f}, Dct32{1.f, 0.24375f}},
-                      /*sigma_dct=*/{0.3125f, 0.f, 0.f, 0.0625f}};
-  std::vector<Spline> spline_data = {spline};
-  std::vector<QuantizedSpline> quantized_splines;
-  std::vector<Spline::Point> starting_points;
-  for (const Spline& spline : spline_data) {
-    JXL_ASSIGN_OR_RETURN(
-        QuantizedSpline qspline,
-        QuantizedSpline::Create(spline, /*quantization_adjustment=*/0,
-                                color_correlation.YtoXRatio(0),
-                                color_correlation.YtoBRatio(0)));
-    quantized_splines.emplace_back(std::move(qspline));
-    starting_points.push_back(spline.control_points.front());
-  }
-  return Splines(/*quantization_adjustment=*/0, std::move(quantized_splines),
-                 std::move(starting_points));
-}
-
-std::vector<RenderPipelineTestInputSettings> GeneratePipelineTests() {
-  std::vector<RenderPipelineTestInputSettings> all_tests;
-
-  std::pair<size_t, size_t> sizes[] = {
-      {3, 8}, {128, 128}, {256, 256}, {258, 258}, {533, 401}, {777, 777},
-  };
-
-  for (auto size : sizes) {
-    RenderPipelineTestInputSettings settings;
-    settings.input_path = "jxl/flower/flower.png";
-    settings.xsize = size.first;
-    settings.ysize = size.second;
-
-    // Base settings.
-    settings.cparams.butteraugli_distance = 1.0;
-    settings.cparams.patches = Override::kOff;
-    settings.cparams.dots = Override::kOff;
-    settings.cparams.gaborish = Override::kOff;
-    settings.cparams.epf = 0;
-    settings.cparams.color_transform = ColorTransform::kXYB;
-
-    {
-      auto s = settings;
-      s.cparams_descr = "NoGabNoEpfNoPatches";
-      all_tests.push_back(s);
-    }
-
-    {
-      auto s = settings;
-      s.cparams.color_transform = ColorTransform::kNone;
-      s.cparams_descr = "NoGabNoEpfNoPatchesNoXYB";
-      all_tests.push_back(s);
-    }
-
-    {
-      auto s = settings;
-      s.cparams.gaborish = Override::kOn;
-      s.cparams_descr = "GabNoEpfNoPatches";
-      all_tests.push_back(s);
-    }
-
-    {
-      auto s = settings;
-      s.cparams.epf = 1;
-      s.cparams_descr = "NoGabEpf1NoPatches";
-      all_tests.push_back(s);
-    }
-
-    {
-      auto s = settings;
-      s.cparams.epf = 2;
-      s.cparams_descr = "NoGabEpf2NoPatches";
-      all_tests.push_back(s);
-    }
-
-    {
-      auto s = settings;
-      s.cparams.epf = 3;
-      s.cparams_descr = "NoGabEpf3NoPatches";
-      all_tests.push_back(s);
-    }
-
-    {
-      auto s = settings;
-      s.cparams.gaborish = Override::kOn;
-      s.cparams.epf = 3;
-      s.cparams_descr = "GabEpf3NoPatches";
-      all_tests.push_back(s);
-    }
-
-    {
-      auto s = settings;
-      s.cparams_descr = "Splines";
-      JXL_TEST_ASSIGN_OR_DIE(s.splines, CreateTestSplines());
-      all_tests.push_back(s);
-    }
-
-    for (size_t ups : {2, 4, 8}) {
-      {
-        auto s = settings;
-        s.cparams.resampling = ups;
-        s.cparams_descr = "Ups" + std::to_string(ups);
-        all_tests.push_back(s);
-      }
-      {
-        auto s = settings;
-        s.cparams.resampling = ups;
-        s.cparams.epf = 1;
-        s.cparams_descr = "Ups" + std::to_string(ups) + "EPF1";
-        all_tests.push_back(s);
-      }
-      {
-        auto s = settings;
-        s.cparams.resampling = ups;
-        s.cparams.gaborish = Override::kOn;
-        s.cparams.epf = 1;
-        s.cparams_descr = "Ups" + std::to_string(ups) + "GabEPF1";
-        all_tests.push_back(s);
-      }
-    }
-
-    {
-      auto s = settings;
-      s.cparams_descr = "Noise";
-      s.cparams.photon_noise_iso = 3200;
-      all_tests.push_back(s);
-    }
-
-    {
-      auto s = settings;
-      s.cparams_descr = "NoiseUps";
-      s.cparams.photon_noise_iso = 3200;
-      s.cparams.resampling = 2;
-      all_tests.push_back(s);
-    }
-
-    {
-      auto s = settings;
-      s.cparams_descr = "ModularLossless";
-      s.cparams.modular_mode = true;
-      s.cparams.butteraugli_distance = 0;
-      all_tests.push_back(s);
-    }
-
-    {
-      auto s = settings;
-      s.cparams_descr = "ProgressiveDC";
-      s.cparams.progressive_dc = 1;
-      all_tests.push_back(s);
-    }
-
-    {
-      auto s = settings;
-      s.cparams_descr = "ModularLossy";
-      s.cparams.modular_mode = true;
-      s.cparams.butteraugli_distance = 1.f;
-      all_tests.push_back(s);
-    }
-
-    {
-      auto s = settings;
-      s.input_path = "jxl/flower/flower_alpha.png";
-      s.cparams_descr = "AlphaVarDCT";
-      all_tests.push_back(s);
-    }
-
-    {
-      auto s = settings;
-      s.input_path = "jxl/flower/flower_alpha.png";
-      s.cparams_descr = "AlphaVarDCTUpsamplingEPF";
-      s.cparams.epf = 1;
-      s.cparams.ec_resampling = 2;
-      all_tests.push_back(s);
-    }
-
-    {
-      auto s = settings;
-      s.cparams.modular_mode = true;
-      s.cparams.butteraugli_distance = 0;
-      s.input_path = "jxl/flower/flower_alpha.png";
-      s.cparams_descr = "AlphaLossless";
-      all_tests.push_back(s);
-    }
-
-    {
-      auto s = settings;
-      s.input_path = "jxl/flower/flower_alpha.png";
-      s.cparams_descr = "AlphaDownsample";
-      s.cparams.ec_resampling = 2;
-      all_tests.push_back(s);
-    }
-
-    {
-      auto s = settings;
-      s.cparams_descr = "SpotColor";
-      s.add_spot_color = true;
-      all_tests.push_back(s);
-    }
-  }
-
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-  for (const char* input : {"jxl/flower/flower.png.im_q85_444.jpg",
-                            "jxl/flower/flower.png.im_q85_420.jpg",
-                            "jxl/flower/flower.png.im_q85_422.jpg",
-                            "jxl/flower/flower.png.im_q85_440.jpg"}) {
-    RenderPipelineTestInputSettings settings;
-    settings.input_path = input;
-    settings.jpeg_transcode = true;
-    settings.xsize = 2268;
-    settings.ysize = 1512;
-    settings.cparams_descr = "Default";
-    all_tests.push_back(settings);
-  }
-
-#endif
-
-  {
-    RenderPipelineTestInputSettings settings;
-    settings.input_path = "jxl/grayscale_patches.png";
-    settings.xsize = 1011;
-    settings.ysize = 277;
-    settings.cparams_descr = "Patches";
-    all_tests.push_back(settings);
-  }
-
-  {
-    RenderPipelineTestInputSettings settings;
-    settings.input_path = "jxl/grayscale_patches.png";
-    settings.xsize = 1011;
-    settings.ysize = 277;
-    settings.cparams.photon_noise_iso = 1000;
-    settings.cparams_descr = "PatchesAndNoise";
-    all_tests.push_back(settings);
-  }
-
-  {
-    RenderPipelineTestInputSettings settings;
-    settings.input_path = "jxl/grayscale_patches.png";
-    settings.xsize = 1011;
-    settings.ysize = 277;
-    settings.cparams.resampling = 2;
-    settings.cparams_descr = "PatchesAndUps2";
-    all_tests.push_back(settings);
-  }
-
-  return all_tests;
-}
-
-std::ostream& operator<<(std::ostream& os,
-                         const RenderPipelineTestInputSettings& c) {
-  std::string filename;
-  size_t pos = c.input_path.find_last_of('/');
-  if (pos == std::string::npos) {
-    filename = c.input_path;
-  } else {
-    filename = c.input_path.substr(pos + 1);
-  }
-  std::replace_if(
-      filename.begin(), filename.end(), [](char c) { return isalnum(c) == 0; },
-      '_');
-  os << filename << "_" << (c.jpeg_transcode ? "JPEG_" : "") << c.xsize << "x"
-     << c.ysize << "_" << c.cparams_descr;
-  return os;
-}
-
-std::string PipelineTestDescription(
-    const testing::TestParamInfo<RenderPipelineTestParam::ParamType>& info) {
-  std::stringstream name;
-  name << info.param;
-  return name.str();
-}
-
-JXL_GTEST_INSTANTIATE_TEST_SUITE_P(RenderPipelineTest, RenderPipelineTestParam,
-                                   testing::ValuesIn(GeneratePipelineTests()),
-                                   PipelineTestDescription);
-
-TEST(RenderPipelineDecodingTest, Animation) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  FakeParallelRunner fake_pool(/*order_seed=*/123, /*num_threads=*/8);
-  ThreadPool pool(&JxlFakeParallelRunner, &fake_pool);
-
-  std::vector<uint8_t> compressed =
-      jxl::test::ReadTestData("jxl/blending/cropped_traffic_light.jxl");
-
-  CodecInOut io_default{memory_manager};
-  ASSERT_TRUE(DecodeFile(Bytes(compressed),
-                         /*use_slow_pipeline=*/false, &io_default, &pool));
-  CodecInOut io_slow_pipeline{memory_manager};
-  ASSERT_TRUE(DecodeFile(Bytes(compressed),
-                         /*use_slow_pipeline=*/true, &io_slow_pipeline, &pool));
-
-  ASSERT_EQ(io_default.frames.size(), io_slow_pipeline.frames.size());
-  for (size_t i = 0; i < io_default.frames.size(); i++) {
-#if JXL_HIGH_PRECISION
-    constexpr float kMaxError = 1e-5;
-#else
-    constexpr float kMaxError = 1e-4;
-#endif
-
-    Image3F fast_pipeline = std::move(*io_default.frames[i].color());
-    Image3F slow_pipeline = std::move(*io_slow_pipeline.frames[i].color());
-    JXL_TEST_ASSERT_OK(VerifyRelativeError(slow_pipeline, fast_pipeline,
-                                           kMaxError, kMaxError, _))
-    for (size_t ec = 0; ec < io_default.frames[i].extra_channels().size();
-         ec++) {
-      JXL_TEST_ASSERT_OK(VerifyRelativeError(
-          io_slow_pipeline.frames[i].extra_channels()[ec],
-          io_default.frames[i].extra_channels()[ec], kMaxError, kMaxError, _));
-    }
-  }
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/simple_render_pipeline.cc b/third_party/jpeg-xl/lib/jxl/render_pipeline/simple_render_pipeline.cc
deleted file mode 100644
index 2d34f2ce1b8e9..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/simple_render_pipeline.cc
+++ /dev/null
@@ -1,291 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/render_pipeline/simple_render_pipeline.h"
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <hwy/base.h>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/sanitizers.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-
-namespace jxl {
-
-Status SimpleRenderPipeline::PrepareForThreadsInternal(size_t num,
-                                                       bool use_group_ids) {
-  if (!channel_data_.empty()) {
-    return true;
-  }
-  auto ch_size = [](size_t frame_size, size_t shift) {
-    return DivCeil(frame_size, 1 << shift) + kRenderPipelineXOffset * 2;
-  };
-  for (auto& entry : channel_shifts_[0]) {
-    JXL_ASSIGN_OR_RETURN(
-        ImageF ch,
-        ImageF::Create(
-            memory_manager_,
-            ch_size(frame_dimensions_.xsize_upsampled, entry.first),
-            ch_size(frame_dimensions_.ysize_upsampled, entry.second)));
-    channel_data_.push_back(std::move(ch));
-    msan::PoisonImage(channel_data_.back());
-  }
-  return true;
-}
-
-Rect SimpleRenderPipeline::MakeChannelRect(size_t group_id, size_t channel) {
-  size_t base_color_shift =
-      CeilLog2Nonzero(frame_dimensions_.xsize_upsampled_padded /
-                      frame_dimensions_.xsize_padded);
-
-  const size_t gx = group_id % frame_dimensions_.xsize_groups;
-  const size_t gy = group_id / frame_dimensions_.xsize_groups;
-  size_t xgroupdim = (frame_dimensions_.group_dim << base_color_shift) >>
-                     channel_shifts_[0][channel].first;
-  size_t ygroupdim = (frame_dimensions_.group_dim << base_color_shift) >>
-                     channel_shifts_[0][channel].second;
-  return Rect(
-      kRenderPipelineXOffset + gx * xgroupdim,
-      kRenderPipelineXOffset + gy * ygroupdim, xgroupdim, ygroupdim,
-      kRenderPipelineXOffset + DivCeil(frame_dimensions_.xsize_upsampled,
-                                       1 << channel_shifts_[0][channel].first),
-      kRenderPipelineXOffset +
-          DivCeil(frame_dimensions_.ysize_upsampled,
-                  1 << channel_shifts_[0][channel].second));
-}
-
-std::vector<std::pair<ImageF*, Rect>> SimpleRenderPipeline::PrepareBuffers(
-    size_t group_id, size_t thread_id) {
-  std::vector<std::pair<ImageF*, Rect>> ret;
-  for (size_t c = 0; c < channel_data_.size(); c++) {
-    ret.emplace_back(&channel_data_[c], MakeChannelRect(group_id, c));
-  }
-  return ret;
-}
-
-Status SimpleRenderPipeline::ProcessBuffers(size_t group_id, size_t thread_id) {
-  for (size_t c = 0; c < channel_data_.size(); c++) {
-    Rect r = MakeChannelRect(group_id, c);
-    (void)r;
-    JXL_CHECK_PLANE_INITIALIZED(channel_data_[c], r, c);
-  }
-
-  if (PassesWithAllInput() <= processed_passes_) return true;
-  processed_passes_++;
-
-  for (size_t stage_id = 0; stage_id < stages_.size(); stage_id++) {
-    const auto& stage = stages_[stage_id];
-    // Prepare buffers for kInOut channels.
-    std::vector<ImageF> new_channels(channel_data_.size());
-    std::vector<ImageF*> output_channels(channel_data_.size());
-
-    std::vector<std::pair<size_t, size_t>> input_sizes(channel_data_.size());
-    for (size_t c = 0; c < channel_data_.size(); c++) {
-      input_sizes[c] =
-          std::make_pair(channel_data_[c].xsize() - kRenderPipelineXOffset * 2,
-                         channel_data_[c].ysize() - kRenderPipelineXOffset * 2);
-    }
-
-    for (size_t c = 0; c < channel_data_.size(); c++) {
-      if (stage->GetChannelMode(c) != RenderPipelineChannelMode::kInOut) {
-        continue;
-      }
-      // Ensure that the newly allocated channels are large enough to avoid
-      // problems with padding.
-      JXL_ASSIGN_OR_RETURN(
-          new_channels[c],
-          ImageF::Create(memory_manager_,
-                         frame_dimensions_.xsize_upsampled_padded +
-                             kRenderPipelineXOffset * 2 +
-                             hwy::kMaxVectorSize * 8,
-                         frame_dimensions_.ysize_upsampled_padded +
-                             kRenderPipelineXOffset * 2));
-      JXL_RETURN_IF_ERROR(new_channels[c].ShrinkTo(
-          (input_sizes[c].first << stage->settings_.shift_x) +
-              kRenderPipelineXOffset * 2,
-          (input_sizes[c].second << stage->settings_.shift_y) +
-              kRenderPipelineXOffset * 2));
-      output_channels[c] = &new_channels[c];
-    }
-
-    auto get_row = [&](size_t c, int64_t y) {
-      return channel_data_[c].Row(kRenderPipelineXOffset + y) +
-             kRenderPipelineXOffset;
-    };
-
-    // Add mirrored pixels to all kInOut channels.
-    for (size_t c = 0; c < channel_data_.size(); c++) {
-      if (stage->GetChannelMode(c) != RenderPipelineChannelMode::kInOut) {
-        continue;
-      }
-      // Horizontal mirroring.
-      for (size_t y = 0; y < input_sizes[c].second; y++) {
-        float* row = get_row(c, y);
-        for (size_t ix = 0; ix < stage->settings_.border_x; ix++) {
-          *(row - ix - 1) =
-              row[Mirror(-static_cast<ssize_t>(ix) - 1, input_sizes[c].first)];
-        }
-        for (size_t ix = 0; ix < stage->settings_.border_x; ix++) {
-          *(row + ix + input_sizes[c].first) =
-              row[Mirror(ix + input_sizes[c].first, input_sizes[c].first)];
-        }
-      }
-      // Vertical mirroring.
-      for (int y = 0; y < static_cast<int>(stage->settings_.border_y); y++) {
-        memcpy(get_row(c, -y - 1) - stage->settings_.border_x,
-               get_row(c, Mirror(-static_cast<ssize_t>(y) - 1,
-                                 input_sizes[c].second)) -
-                   stage->settings_.border_x,
-               sizeof(float) *
-                   (input_sizes[c].first + 2 * stage->settings_.border_x));
-      }
-      for (int y = 0; y < static_cast<int>(stage->settings_.border_y); y++) {
-        memcpy(
-            get_row(c, input_sizes[c].second + y) - stage->settings_.border_x,
-            get_row(c,
-                    Mirror(input_sizes[c].second + y, input_sizes[c].second)) -
-                stage->settings_.border_x,
-            sizeof(float) *
-                (input_sizes[c].first + 2 * stage->settings_.border_x));
-      }
-    }
-
-    size_t ysize = 0;
-    size_t xsize = 0;
-    for (size_t c = 0; c < channel_data_.size(); c++) {
-      if (stage->GetChannelMode(c) == RenderPipelineChannelMode::kIgnored) {
-        continue;
-      }
-      ysize = std::max(input_sizes[c].second, ysize);
-      xsize = std::max(input_sizes[c].first, xsize);
-    }
-
-    JXL_ENSURE(ysize != 0);
-    JXL_ENSURE(xsize != 0);
-
-    RenderPipelineStage::RowInfo input_rows(channel_data_.size());
-    RenderPipelineStage::RowInfo output_rows(channel_data_.size());
-
-    // Run the pipeline.
-    {
-      JXL_RETURN_IF_ERROR(stage->SetInputSizes(input_sizes));
-      int border_y = stage->settings_.border_y;
-      for (size_t y = 0; y < ysize; y++) {
-        // Prepare input rows.
-        for (size_t c = 0; c < channel_data_.size(); c++) {
-          if (stage->GetChannelMode(c) == RenderPipelineChannelMode::kIgnored) {
-            continue;
-          }
-          input_rows[c].resize(2 * border_y + 1);
-          for (int iy = -border_y; iy <= border_y; iy++) {
-            input_rows[c][iy + border_y] =
-                channel_data_[c].Row(y + kRenderPipelineXOffset + iy);
-          }
-        }
-        // Prepare output rows.
-        for (size_t c = 0; c < channel_data_.size(); c++) {
-          if (!output_channels[c]) continue;
-          output_rows[c].resize(1 << stage->settings_.shift_y);
-          for (size_t iy = 0; iy < output_rows[c].size(); iy++) {
-            output_rows[c][iy] = output_channels[c]->Row(
-                (y << stage->settings_.shift_y) + iy + kRenderPipelineXOffset);
-          }
-        }
-        JXL_RETURN_IF_ERROR(stage->ProcessRow(input_rows, output_rows,
-                                              /*xextra=*/0, xsize,
-                                              /*xpos=*/0, y, thread_id));
-      }
-    }
-
-    // Move new channels to current channels.
-    for (size_t c = 0; c < channel_data_.size(); c++) {
-      if (stage->GetChannelMode(c) != RenderPipelineChannelMode::kInOut) {
-        continue;
-      }
-      channel_data_[c] = std::move(new_channels[c]);
-    }
-    for (size_t c = 0; c < channel_data_.size(); c++) {
-      size_t next_stage = std::min(stage_id + 1, channel_shifts_.size() - 1);
-      size_t xsize = DivCeil(frame_dimensions_.xsize_upsampled,
-                             1 << channel_shifts_[next_stage][c].first);
-      size_t ysize = DivCeil(frame_dimensions_.ysize_upsampled,
-                             1 << channel_shifts_[next_stage][c].second);
-      JXL_RETURN_IF_ERROR(
-          channel_data_[c].ShrinkTo(xsize + 2 * kRenderPipelineXOffset,
-                                    ysize + 2 * kRenderPipelineXOffset));
-      JXL_CHECK_PLANE_INITIALIZED(
-          channel_data_[c],
-          Rect(kRenderPipelineXOffset, kRenderPipelineXOffset, xsize, ysize),
-          c);
-    }
-
-    if (stage->SwitchToImageDimensions()) {
-      size_t image_xsize;
-      size_t image_ysize;
-      FrameOrigin frame_origin;
-      stage->GetImageDimensions(&image_xsize, &image_ysize, &frame_origin);
-      frame_dimensions_.Set(image_xsize, image_ysize, 0, 0, 0, false, 1);
-      std::vector<ImageF> old_channels = std::move(channel_data_);
-      channel_data_.clear();
-      channel_data_.reserve(old_channels.size());
-      for (size_t c = 0; c < old_channels.size(); c++) {
-        JXL_ASSIGN_OR_RETURN(
-            ImageF ch,
-            ImageF::Create(memory_manager_,
-                           2 * kRenderPipelineXOffset + image_xsize,
-                           2 * kRenderPipelineXOffset + image_ysize));
-        channel_data_.emplace_back(std::move(ch));
-      }
-      for (size_t y = 0; y < image_ysize; ++y) {
-        for (size_t c = 0; c < channel_data_.size(); c++) {
-          output_rows[c].resize(1);
-          output_rows[c][0] = channel_data_[c].Row(kRenderPipelineXOffset + y);
-        }
-        // TODO(sboukortt): consider doing this only on the parts of the
-        // background that won't be occluded.
-        stage->ProcessPaddingRow(output_rows, image_xsize, 0, y);
-      }
-      ssize_t x0 = frame_origin.x0;
-      ssize_t y0 = frame_origin.y0;
-      size_t x0_fg = 0;
-      size_t y0_fg = 0;
-      if (x0 < 0) {
-        xsize += x0;
-        x0_fg -= x0;
-        x0 = 0;
-      }
-      if (x0 + xsize > image_xsize) {
-        xsize = image_xsize - x0;
-      }
-      if (y0 < 0) {
-        ysize += y0;
-        y0_fg -= x0;
-        y0 = 0;
-      }
-      if (y0 + ysize > image_ysize) {
-        ysize = image_ysize - y0;
-      }
-      const Rect rect_fg_relative_to_image =
-          Rect(x0, y0, xsize, ysize)
-              .Translate(kRenderPipelineXOffset, kRenderPipelineXOffset);
-      const Rect rect_fg =
-          Rect(x0_fg, y0_fg, xsize, ysize)
-              .Translate(kRenderPipelineXOffset, kRenderPipelineXOffset);
-      for (size_t c = 0; c < channel_data_.size(); c++) {
-        JXL_RETURN_IF_ERROR(CopyImageTo(rect_fg, old_channels[c],
-                                        rect_fg_relative_to_image,
-                                        &channel_data_[c]));
-      }
-    }
-  }
-  return true;
-}
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/simple_render_pipeline.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/simple_render_pipeline.h
deleted file mode 100644
index 6ddf0a9c9d196..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/simple_render_pipeline.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_RENDER_PIPELINE_SIMPLE_RENDER_PIPELINE_H_
-#define LIB_JXL_RENDER_PIPELINE_SIMPLE_RENDER_PIPELINE_H_
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/render_pipeline/render_pipeline.h"
-
-namespace jxl {
-
-// A RenderPipeline that is "obviously correct"; it may use potentially large
-// amounts of memory and be slow. It is intended to be used mostly for testing
-// purposes.
-class SimpleRenderPipeline : public RenderPipeline {
-  std::vector<std::pair<ImageF*, Rect>> PrepareBuffers(
-      size_t group_id, size_t thread_id) override;
-
-  Status ProcessBuffers(size_t group_id, size_t thread_id) override;
-
-  Status PrepareForThreadsInternal(size_t num, bool use_group_ids) override;
-
-  // Full frame buffers. Both X and Y dimensions are padded by
-  // kRenderPipelineXOffset.
-  std::vector<ImageF> channel_data_;
-  size_t processed_passes_ = 0;
-
- public:
-  explicit SimpleRenderPipeline(JxlMemoryManager* memory_manager)
-      : RenderPipeline(memory_manager) {}
-
- private:
-  Rect MakeChannelRect(size_t group_id, size_t channel);
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_RENDER_PIPELINE_SIMPLE_RENDER_PIPELINE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_blending.cc b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_blending.cc
deleted file mode 100644
index 96db74c8c0495..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_blending.cc
+++ /dev/null
@@ -1,251 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/render_pipeline/stage_blending.h"
-
-#include <jxl/memory_manager.h>
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/render_pipeline/stage_blending.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/blending.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-class BlendingStage : public RenderPipelineStage {
- public:
-  explicit BlendingStage(const FrameHeader& frame_header,
-                         const PassesDecoderState* dec_state,
-                         const ColorEncoding& frame_color_encoding)
-      : RenderPipelineStage(RenderPipelineStage::Settings()),
-        frame_header_(frame_header),
-        state_(*dec_state->shared) {
-    image_xsize_ = frame_header_.nonserialized_metadata->xsize();
-    image_ysize_ = frame_header_.nonserialized_metadata->ysize();
-    extra_channel_info_ =
-        &frame_header_.nonserialized_metadata->m.extra_channel_info;
-    info_ = frame_header_.blending_info;
-    const std::vector<BlendingInfo>& ec_info =
-        frame_header_.extra_channel_blending_info;
-    const ImageBundle& bg = *state_.reference_frames[info_.source].frame;
-    bg_ = &bg;
-    if (bg.xsize() == 0 || bg.ysize() == 0) {
-      zeroes_.resize(image_xsize_, 0.f);
-    } else if (state_.reference_frames[info_.source].ib_is_in_xyb) {
-      initialized_ = JXL_FAILURE(
-          "Trying to blend XYB reference frame %i and non-XYB frame",
-          info_.source);
-      return;
-    } else if (std::any_of(ec_info.begin(), ec_info.end(),
-                           [this](const BlendingInfo& info) {
-                             const ImageBundle& bg =
-                                 *state_.reference_frames[info.source].frame;
-                             return bg.xsize() == 0 || bg.ysize() == 0;
-                           })) {
-      zeroes_.resize(image_xsize_, 0.f);
-    }
-
-    auto verify_bg_size = [&](const ImageBundle& bg) -> Status {
-      if (bg.xsize() != 0 && bg.ysize() != 0 &&
-          (bg.xsize() < image_xsize_ || bg.ysize() < image_ysize_ ||
-           bg.origin.x0 != 0 || bg.origin.y0 != 0)) {
-        return JXL_FAILURE("Trying to use a %" PRIuS "x%" PRIuS
-                           " crop as a background",
-                           bg.xsize(), bg.ysize());
-      }
-      return true;
-    };
-
-    Status ok = verify_bg_size(bg);
-    for (const auto& info : ec_info) {
-      const ImageBundle& bg = *state_.reference_frames[info.source].frame;
-      if (!!ok) ok = verify_bg_size(bg);
-    }
-    if (!ok) {
-      initialized_ = ok;
-      return;
-    }
-
-    if (state_.metadata->m.xyb_encoded) {
-      if (!dec_state->output_encoding_info.color_encoding_is_original) {
-        initialized_ = JXL_FAILURE("Blending in unsupported color space");
-        return;
-      }
-    }
-
-    blending_info_.resize(ec_info.size() + 1);
-    auto make_blending = [&](const BlendingInfo& info, PatchBlending* pb) {
-      pb->alpha_channel = info.alpha_channel;
-      pb->clamp = info.clamp;
-      switch (info.mode) {
-        case BlendMode::kReplace: {
-          pb->mode = PatchBlendMode::kReplace;
-          break;
-        }
-        case BlendMode::kAdd: {
-          pb->mode = PatchBlendMode::kAdd;
-          break;
-        }
-        case BlendMode::kMul: {
-          pb->mode = PatchBlendMode::kMul;
-          break;
-        }
-        case BlendMode::kBlend: {
-          pb->mode = PatchBlendMode::kBlendAbove;
-          break;
-        }
-        case BlendMode::kAlphaWeightedAdd: {
-          pb->mode = PatchBlendMode::kAlphaWeightedAddAbove;
-          break;
-        }
-      }
-    };
-    make_blending(info_, blending_info_.data());
-    for (size_t i = 0; i < ec_info.size(); i++) {
-      make_blending(ec_info[i], &blending_info_[1 + i]);
-    }
-  }
-
-  Status IsInitialized() const override { return initialized_; }
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    JXL_ENSURE(initialized_);
-    JxlMemoryManager* memory_manager = state_.memory_manager;
-    const FrameOrigin& frame_origin = frame_header_.frame_origin;
-    ssize_t bg_xpos = frame_origin.x0 + static_cast<ssize_t>(xpos);
-    ssize_t bg_ypos = frame_origin.y0 + static_cast<ssize_t>(ypos);
-    int offset = 0;
-    if (bg_xpos + static_cast<ssize_t>(xsize) <= 0 ||
-        frame_origin.x0 >= static_cast<ssize_t>(image_xsize_) || bg_ypos < 0 ||
-        bg_ypos >= static_cast<ssize_t>(image_ysize_)) {
-      // TODO(eustas): or fail?
-      return true;
-    }
-    if (bg_xpos < 0) {
-      offset -= bg_xpos;
-      xsize += bg_xpos;
-      bg_xpos = 0;
-    }
-    if (bg_xpos + xsize > image_xsize_) {
-      xsize =
-          std::max<ssize_t>(0, static_cast<ssize_t>(image_xsize_) - bg_xpos);
-    }
-    std::vector<const float*> bg_row_ptrs_(input_rows.size());
-    std::vector<float*> fg_row_ptrs_(input_rows.size());
-    size_t num_c = std::min(input_rows.size(), extra_channel_info_->size() + 3);
-    for (size_t c = 0; c < num_c; ++c) {
-      fg_row_ptrs_[c] = GetInputRow(input_rows, c, 0) + offset;
-      if (c < 3) {
-        bg_row_ptrs_[c] = bg_->xsize() != 0 && bg_->ysize() != 0
-                              ? bg_->color().ConstPlaneRow(c, bg_ypos) + bg_xpos
-                              : zeroes_.data();
-      } else {
-        const ImageBundle& ec_bg =
-            *state_
-                 .reference_frames
-                     [frame_header_.extra_channel_blending_info[c - 3].source]
-                 .frame;
-        bg_row_ptrs_[c] =
-            ec_bg.xsize() != 0 && ec_bg.ysize() != 0
-                ? ec_bg.extra_channels()[c - 3].ConstRow(bg_ypos) + bg_xpos
-                : zeroes_.data();
-      }
-    }
-    return PerformBlending(memory_manager, bg_row_ptrs_.data(),
-                           fg_row_ptrs_.data(), fg_row_ptrs_.data(), 0, xsize,
-                           blending_info_[0], blending_info_.data() + 1,
-                           *extra_channel_info_);
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return RenderPipelineChannelMode::kInPlace;
-  }
-
-  bool SwitchToImageDimensions() const override { return true; }
-
-  void GetImageDimensions(size_t* xsize, size_t* ysize,
-                          FrameOrigin* frame_origin) const override {
-    *xsize = image_xsize_;
-    *ysize = image_ysize_;
-    *frame_origin = frame_header_.frame_origin;
-  }
-
-  void ProcessPaddingRow(const RowInfo& output_rows, size_t xsize, size_t xpos,
-                         size_t ypos) const override {
-    if (bg_->xsize() == 0 || bg_->ysize() == 0) {
-      for (size_t c = 0; c < 3; ++c) {
-        memset(GetInputRow(output_rows, c, 0), 0, xsize * sizeof(float));
-      }
-    } else {
-      for (size_t c = 0; c < 3; ++c) {
-        memcpy(GetInputRow(output_rows, c, 0),
-               bg_->color().ConstPlaneRow(c, ypos) + xpos,
-               xsize * sizeof(float));
-      }
-    }
-    for (size_t ec = 0; ec < extra_channel_info_->size(); ++ec) {
-      const ImageBundle& ec_bg =
-          *state_
-               .reference_frames[frame_header_.extra_channel_blending_info[ec]
-                                     .source]
-               .frame;
-      if (ec_bg.xsize() == 0 || ec_bg.ysize() == 0) {
-        memset(GetInputRow(output_rows, 3 + ec, 0), 0, xsize * sizeof(float));
-      } else {
-        memcpy(GetInputRow(output_rows, 3 + ec, 0),
-               ec_bg.extra_channels()[ec].ConstRow(ypos) + xpos,
-               xsize * sizeof(float));
-      }
-    }
-  }
-
-  const char* GetName() const override { return "Blending"; }
-
- private:
-  const FrameHeader& frame_header_;
-  const PassesSharedState& state_;
-  BlendingInfo info_;
-  const ImageBundle* bg_;
-  Status initialized_ = true;
-  size_t image_xsize_;
-  size_t image_ysize_;
-  std::vector<PatchBlending> blending_info_;
-  const std::vector<ExtraChannelInfo>* extra_channel_info_;
-  std::vector<float> zeroes_;
-};
-
-std::unique_ptr<RenderPipelineStage> GetBlendingStage(
-    const FrameHeader& frame_header, const PassesDecoderState* dec_state,
-    const ColorEncoding& frame_color_encoding) {
-  return jxl::make_unique<BlendingStage>(frame_header, dec_state,
-                                         frame_color_encoding);
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(GetBlendingStage);
-
-std::unique_ptr<RenderPipelineStage> GetBlendingStage(
-    const FrameHeader& frame_header, const PassesDecoderState* dec_state,
-    const ColorEncoding& frame_color_encoding) {
-  return HWY_DYNAMIC_DISPATCH(GetBlendingStage)(frame_header, dec_state,
-                                                frame_color_encoding);
-}
-
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_blending.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_blending.h
deleted file mode 100644
index aedc8c2e9972c..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_blending.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_RENDER_PIPELINE_STAGE_BLENDING_H_
-#define LIB_JXL_RENDER_PIPELINE_STAGE_BLENDING_H_
-
-#include <memory>
-
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/dec_cache.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-
-namespace jxl {
-
-// Applies blending if applicable.
-std::unique_ptr<RenderPipelineStage> GetBlendingStage(
-    const FrameHeader& frame_header, const PassesDecoderState* dec_state,
-    const ColorEncoding& frame_color_encoding);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_RENDER_PIPELINE_STAGE_BLENDING_H_
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_chroma_upsampling.cc b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_chroma_upsampling.cc
deleted file mode 100644
index 2bc88ada67783..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_chroma_upsampling.cc
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/render_pipeline/stage_chroma_upsampling.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/render_pipeline/stage_chroma_upsampling.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/simd_util-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::MulAdd;
-
-class HorizontalChromaUpsamplingStage : public RenderPipelineStage {
- public:
-  explicit HorizontalChromaUpsamplingStage(size_t channel)
-      : RenderPipelineStage(RenderPipelineStage::Settings::ShiftX(
-            /*shift=*/1, /*border=*/1)),
-        c_(channel) {}
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    HWY_FULL(float) df;
-    xextra = RoundUpTo(xextra, Lanes(df));
-    auto threefour = Set(df, 0.75f);
-    auto onefour = Set(df, 0.25f);
-    const float* row_in = GetInputRow(input_rows, c_, 0);
-    float* row_out = GetOutputRow(output_rows, c_, 0);
-    for (ssize_t x = -xextra; x < static_cast<ssize_t>(xsize + xextra);
-         x += Lanes(df)) {
-      auto current = Mul(LoadU(df, row_in + x), threefour);
-      auto prev = LoadU(df, row_in + x - 1);
-      auto next = LoadU(df, row_in + x + 1);
-      auto left = MulAdd(onefour, prev, current);
-      auto right = MulAdd(onefour, next, current);
-      StoreInterleaved(df, left, right, row_out + x * 2);
-    }
-    return true;
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return c == c_ ? RenderPipelineChannelMode::kInOut
-                   : RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "HChromaUps"; }
-
- private:
-  size_t c_;
-};
-
-class VerticalChromaUpsamplingStage : public RenderPipelineStage {
- public:
-  explicit VerticalChromaUpsamplingStage(size_t channel)
-      : RenderPipelineStage(RenderPipelineStage::Settings::ShiftY(
-            /*shift=*/1, /*border=*/1)),
-        c_(channel) {}
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    HWY_FULL(float) df;
-    xextra = RoundUpTo(xextra, Lanes(df));
-    auto threefour = Set(df, 0.75f);
-    auto onefour = Set(df, 0.25f);
-    const float* row_top = GetInputRow(input_rows, c_, -1);
-    const float* row_mid = GetInputRow(input_rows, c_, 0);
-    const float* row_bot = GetInputRow(input_rows, c_, 1);
-    float* row_out0 = GetOutputRow(output_rows, c_, 0);
-    float* row_out1 = GetOutputRow(output_rows, c_, 1);
-    for (ssize_t x = -xextra; x < static_cast<ssize_t>(xsize + xextra);
-         x += Lanes(df)) {
-      auto it = LoadU(df, row_top + x);
-      auto im = LoadU(df, row_mid + x);
-      auto ib = LoadU(df, row_bot + x);
-      auto im_scaled = Mul(im, threefour);
-      Store(MulAdd(it, onefour, im_scaled), df, row_out0 + x);
-      Store(MulAdd(ib, onefour, im_scaled), df, row_out1 + x);
-    }
-    return true;
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return c == c_ ? RenderPipelineChannelMode::kInOut
-                   : RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "VChromaUps"; }
-
- private:
-  size_t c_;
-};
-
-std::unique_ptr<RenderPipelineStage> GetChromaUpsamplingStage(size_t channel,
-                                                              bool horizontal) {
-  if (horizontal) {
-    return jxl::make_unique<HorizontalChromaUpsamplingStage>(channel);
-  } else {
-    return jxl::make_unique<VerticalChromaUpsamplingStage>(channel);
-  }
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(GetChromaUpsamplingStage);
-
-std::unique_ptr<RenderPipelineStage> GetChromaUpsamplingStage(size_t channel,
-                                                              bool horizontal) {
-  return HWY_DYNAMIC_DISPATCH(GetChromaUpsamplingStage)(channel, horizontal);
-}
-
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_chroma_upsampling.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_chroma_upsampling.h
deleted file mode 100644
index b4d0cbdfd3bc3..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_chroma_upsampling.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_RENDER_PIPELINE_STAGE_CHROMA_UPSAMPLING_H_
-#define LIB_JXL_RENDER_PIPELINE_STAGE_CHROMA_UPSAMPLING_H_
-#include <math.h>
-#include <stdint.h>
-
-#include <algorithm>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/loop_filter.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-
-namespace jxl {
-
-// Applies simple upsampling, either horizontal or vertical, to the given
-// channel.
-std::unique_ptr<RenderPipelineStage> GetChromaUpsamplingStage(size_t channel,
-                                                              bool horizontal);
-}  // namespace jxl
-
-#endif  // LIB_JXL_RENDER_PIPELINE_STAGE_CHROMA_UPSAMPLING_H_
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_cms.cc b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_cms.cc
deleted file mode 100644
index 15cce2b5eb705..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_cms.cc
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/render_pipeline/stage_cms.h"
-
-#include <memory>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/dec_xyb.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/render_pipeline/stage_cms.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/dec_xyb-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-class CmsStage : public RenderPipelineStage {
- public:
-  explicit CmsStage(OutputEncodingInfo output_encoding_info)
-      : RenderPipelineStage(RenderPipelineStage::Settings()),
-        output_encoding_info_(std::move(output_encoding_info)) {
-    c_src_ = output_encoding_info_.linear_color_encoding;
-  }
-
-  bool IsNeeded() const {
-    const size_t channels_src = (c_src_.IsCMYK() ? 4 : c_src_.Channels());
-    const size_t channels_dst = output_encoding_info_.color_encoding.Channels();
-    const bool not_mixing_color_and_grey =
-        (channels_src == channels_dst ||
-         (channels_src == 4 && channels_dst == 3));
-    return (output_encoding_info_.cms_set) &&
-           !c_src_.SameColorEncoding(output_encoding_info_.color_encoding) &&
-           not_mixing_color_and_grey;
-  }
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    JXL_ENSURE(xsize <= xsize_);
-    // TODO(firsching): handle grey case separately
-    //  interleave
-    float* JXL_RESTRICT row0 = GetInputRow(input_rows, 0, 0);
-    float* JXL_RESTRICT row1 = GetInputRow(input_rows, 1, 0);
-    float* JXL_RESTRICT row2 = GetInputRow(input_rows, 2, 0);
-    float* mutable_buf_src = color_space_transform->BufSrc(thread_id);
-
-    for (size_t x = 0; x < xsize; x++) {
-      mutable_buf_src[3 * x + 0] = row0[x];
-      mutable_buf_src[3 * x + 1] = row1[x];
-      mutable_buf_src[3 * x + 2] = row2[x];
-    }
-    const float* buf_src = mutable_buf_src;
-    float* JXL_RESTRICT buf_dst = color_space_transform->BufDst(thread_id);
-    JXL_RETURN_IF_ERROR(
-        color_space_transform->Run(thread_id, buf_src, buf_dst, xsize));
-    // de-interleave
-    for (size_t x = 0; x < xsize; x++) {
-      row0[x] = buf_dst[3 * x + 0];
-      row1[x] = buf_dst[3 * x + 1];
-      row2[x] = buf_dst[3 * x + 2];
-    }
-    return true;
-  }
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return c < 3 ? RenderPipelineChannelMode::kInPlace
-                 : RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "Cms"; }
-
- private:
-  OutputEncodingInfo output_encoding_info_;
-  size_t xsize_;
-  std::unique_ptr<jxl::ColorSpaceTransform> color_space_transform;
-  ColorEncoding c_src_;
-
-  Status SetInputSizes(
-      const std::vector<std::pair<size_t, size_t>>& input_sizes) override {
-    JXL_ENSURE(input_sizes.size() >= 3);
-    for (size_t c = 1; c < input_sizes.size(); c++) {
-      JXL_ENSURE(input_sizes[c].first == input_sizes[0].first);
-      JXL_ENSURE(input_sizes[c].second == input_sizes[0].second);
-    }
-    xsize_ = input_sizes[0].first;
-    return true;
-  }
-
-  Status PrepareForThreads(size_t num_threads) override {
-    color_space_transform = jxl::make_unique<jxl::ColorSpaceTransform>(
-        output_encoding_info_.color_management_system);
-    JXL_RETURN_IF_ERROR(color_space_transform->Init(
-        c_src_, output_encoding_info_.color_encoding,
-        output_encoding_info_.desired_intensity_target, xsize_, num_threads));
-    return true;
-  }
-};
-
-std::unique_ptr<RenderPipelineStage> GetCmsStage(
-    const OutputEncodingInfo& output_encoding_info) {
-  auto stage = jxl::make_unique<CmsStage>(output_encoding_info);
-  if (!stage->IsNeeded()) return nullptr;
-  return stage;
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(GetCmsStage);
-
-std::unique_ptr<RenderPipelineStage> GetCmsStage(
-    const OutputEncodingInfo& output_encoding_info) {
-  return HWY_DYNAMIC_DISPATCH(GetCmsStage)(output_encoding_info);
-}
-
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_cms.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_cms.h
deleted file mode 100644
index 23277ae6f735a..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_cms.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_RENDER_PIPELINE_STAGE_CMS_H_
-#define LIB_JXL_RENDER_PIPELINE_STAGE_CMS_H_
-
-#include <memory>
-
-#include "lib/jxl/dec_xyb.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-
-namespace jxl {
-
-std::unique_ptr<RenderPipelineStage> GetCmsStage(
-    const OutputEncodingInfo& output_encoding_info);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_RENDER_PIPELINE_STAGE_CMS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_epf.cc b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_epf.cc
deleted file mode 100644
index 66fef87c56a8c..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_epf.cc
+++ /dev/null
@@ -1,529 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/render_pipeline/stage_epf.h"
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/common.h"  // JXL_HIGH_PRECISION
-#include "lib/jxl/epf.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/render_pipeline/stage_epf.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-// TODO(veluca): In principle, vectors could be not capped, if we want to deal
-// with having two different sigma values in a single vector.
-using DF = HWY_CAPPED(float, 8);
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::AbsDiff;
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::Div;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::MulAdd;
-using hwy::HWY_NAMESPACE::Vec;
-using hwy::HWY_NAMESPACE::VFromD;
-using hwy::HWY_NAMESPACE::ZeroIfNegative;
-
-JXL_INLINE Vec<DF> Weight(Vec<DF> sad, Vec<DF> inv_sigma, Vec<DF> thres) {
-  auto v = MulAdd(sad, inv_sigma, Set(DF(), 1.0f));
-  return ZeroIfNegative(v);
-}
-
-// 5x5 plus-shaped kernel with 5 SADs per pixel (3x3 plus-shaped). So this makes
-// this filter a 7x7 filter.
-class EPF0Stage : public RenderPipelineStage {
- public:
-  EPF0Stage(LoopFilter lf, const ImageF& sigma)
-      : RenderPipelineStage(RenderPipelineStage::Settings::Symmetric(
-            /*shift=*/0, /*border=*/3)),
-        lf_(std::move(lf)),
-        sigma_(&sigma) {}
-
-  template <bool aligned>
-  JXL_INLINE void AddPixel(int row, float* JXL_RESTRICT rows[3][7], ssize_t x,
-                           Vec<DF> sad, Vec<DF> inv_sigma,
-                           Vec<DF>* JXL_RESTRICT X, Vec<DF>* JXL_RESTRICT Y,
-                           Vec<DF>* JXL_RESTRICT B,
-                           Vec<DF>* JXL_RESTRICT w) const {
-    auto cx = aligned ? Load(DF(), rows[0][3 + row] + x)
-                      : LoadU(DF(), rows[0][3 + row] + x);
-    auto cy = aligned ? Load(DF(), rows[1][3 + row] + x)
-                      : LoadU(DF(), rows[1][3 + row] + x);
-    auto cb = aligned ? Load(DF(), rows[2][3 + row] + x)
-                      : LoadU(DF(), rows[2][3 + row] + x);
-
-    auto weight = Weight(sad, inv_sigma, Set(DF(), lf_.epf_pass1_zeroflush));
-    *w = Add(*w, weight);
-    *X = MulAdd(weight, cx, *X);
-    *Y = MulAdd(weight, cy, *Y);
-    *B = MulAdd(weight, cb, *B);
-  }
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    DF df;
-
-    using V = decltype(Zero(df));
-    V t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, tA, tB;  // NOLINT
-    V* sads[12] = {&t0, &t1, &t2, &t3, &t4, &t5, &t6, &t7, &t8, &t9, &tA, &tB};
-
-    xextra = RoundUpTo(xextra, Lanes(df));
-    const float* JXL_RESTRICT row_sigma =
-        sigma_->Row(ypos / kBlockDim + kSigmaPadding);
-
-    float sm = lf_.epf_pass0_sigma_scale * 1.65;
-    float bsm = sm * lf_.epf_border_sad_mul;
-
-    HWY_ALIGN float sad_mul_center[kBlockDim] = {bsm, sm, sm, sm,
-                                                 sm,  sm, sm, bsm};
-    HWY_ALIGN float sad_mul_border[kBlockDim] = {bsm, bsm, bsm, bsm,
-                                                 bsm, bsm, bsm, bsm};
-    float* JXL_RESTRICT rows[3][7];
-    for (size_t c = 0; c < 3; c++) {
-      for (int i = 0; i < 7; i++) {
-        rows[c][i] = GetInputRow(input_rows, c, i - 3);
-      }
-    }
-
-    const float* sad_mul =
-        (ypos % kBlockDim == 0 || ypos % kBlockDim == kBlockDim - 1)
-            ? sad_mul_border
-            : sad_mul_center;
-
-    for (ssize_t x = -xextra; x < static_cast<ssize_t>(xsize + xextra);
-         x += Lanes(df)) {
-      size_t bx = (x + xpos + kSigmaPadding * kBlockDim) / kBlockDim;
-      size_t ix = (x + xpos) % kBlockDim;
-
-      if (row_sigma[bx] < kMinSigma) {
-        for (size_t c = 0; c < 3; c++) {
-          auto px = Load(df, rows[c][3 + 0] + x);
-          StoreU(px, df, GetOutputRow(output_rows, c, 0) + x);
-        }
-        continue;
-      }
-
-      const auto sm = Load(df, sad_mul + ix);
-      const auto inv_sigma = Mul(Set(df, row_sigma[bx]), sm);
-
-      for (auto& sad : sads) *sad = Zero(df);
-      constexpr std::array<int, 2> sads_off[12] = {
-          {{-2, 0}}, {{-1, -1}}, {{-1, 0}}, {{-1, 1}}, {{0, -2}}, {{0, -1}},
-          {{0, 1}},  {{0, 2}},   {{1, -1}}, {{1, 0}},  {{1, 1}},  {{2, 0}},
-      };
-
-      // compute sads
-      // TODO(veluca): consider unrolling and optimizing this.
-      for (size_t c = 0; c < 3; c++) {
-        auto scale = Set(df, lf_.epf_channel_scale[c]);
-        for (size_t i = 0; i < 12; i++) {
-          auto sad = Zero(df);
-          constexpr std::array<int, 2> plus_off[] = {
-              {{0, 0}}, {{-1, 0}}, {{0, -1}}, {{1, 0}}, {{0, 1}}};
-          for (const auto& off : plus_off) {
-            const auto r11 = LoadU(df, rows[c][3 + off[0]] + x + off[1]);
-            const auto c11 = LoadU(df, rows[c][3 + sads_off[i][0] + off[0]] +
-                                           x + sads_off[i][1] + off[1]);
-            sad = Add(sad, AbsDiff(r11, c11));
-          }
-          *sads[i] = MulAdd(sad, scale, *sads[i]);
-        }
-      }
-      const auto x_cc = Load(df, rows[0][3 + 0] + x);
-      const auto y_cc = Load(df, rows[1][3 + 0] + x);
-      const auto b_cc = Load(df, rows[2][3 + 0] + x);
-
-      auto w = Set(df, 1);
-      auto X = x_cc;
-      auto Y = y_cc;
-      auto B = b_cc;
-
-      for (size_t i = 0; i < 12; i++) {
-        AddPixel</*aligned=*/false>(/*row=*/sads_off[i][0], rows,
-                                    x + sads_off[i][1], *sads[i], inv_sigma, &X,
-                                    &Y, &B, &w);
-      }
-#if JXL_HIGH_PRECISION
-      auto inv_w = Div(Set(df, 1.0f), w);
-#else
-      auto inv_w = ApproximateReciprocal(w);
-#endif
-      StoreU(Mul(X, inv_w), df, GetOutputRow(output_rows, 0, 0) + x);
-      StoreU(Mul(Y, inv_w), df, GetOutputRow(output_rows, 1, 0) + x);
-      StoreU(Mul(B, inv_w), df, GetOutputRow(output_rows, 2, 0) + x);
-    }
-    return true;
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return c < 3 ? RenderPipelineChannelMode::kInOut
-                 : RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "EPF0"; }
-
- private:
-  LoopFilter lf_;
-  const ImageF* sigma_;
-};
-
-// 3x3 plus-shaped kernel with 5 SADs per pixel (also 3x3 plus-shaped). So this
-// makes this filter a 5x5 filter.
-class EPF1Stage : public RenderPipelineStage {
- public:
-  EPF1Stage(LoopFilter lf, const ImageF& sigma)
-      : RenderPipelineStage(RenderPipelineStage::Settings::Symmetric(
-            /*shift=*/0, /*border=*/2)),
-        lf_(std::move(lf)),
-        sigma_(&sigma) {}
-
-  template <bool aligned>
-  JXL_INLINE void AddPixel(int row, float* JXL_RESTRICT rows[3][5], ssize_t x,
-                           Vec<DF> sad, Vec<DF> inv_sigma,
-                           Vec<DF>* JXL_RESTRICT X, Vec<DF>* JXL_RESTRICT Y,
-                           Vec<DF>* JXL_RESTRICT B,
-                           Vec<DF>* JXL_RESTRICT w) const {
-    auto cx = aligned ? Load(DF(), rows[0][2 + row] + x)
-                      : LoadU(DF(), rows[0][2 + row] + x);
-    auto cy = aligned ? Load(DF(), rows[1][2 + row] + x)
-                      : LoadU(DF(), rows[1][2 + row] + x);
-    auto cb = aligned ? Load(DF(), rows[2][2 + row] + x)
-                      : LoadU(DF(), rows[2][2 + row] + x);
-
-    auto weight = Weight(sad, inv_sigma, Set(DF(), lf_.epf_pass1_zeroflush));
-    *w = Add(*w, weight);
-    *X = MulAdd(weight, cx, *X);
-    *Y = MulAdd(weight, cy, *Y);
-    *B = MulAdd(weight, cb, *B);
-  }
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    DF df;
-    xextra = RoundUpTo(xextra, Lanes(df));
-    const float* JXL_RESTRICT row_sigma =
-        sigma_->Row(ypos / kBlockDim + kSigmaPadding);
-
-    float sm = 1.65f;
-    float bsm = sm * lf_.epf_border_sad_mul;
-
-    HWY_ALIGN float sad_mul_center[kBlockDim] = {bsm, sm, sm, sm,
-                                                 sm,  sm, sm, bsm};
-    HWY_ALIGN float sad_mul_border[kBlockDim] = {bsm, bsm, bsm, bsm,
-                                                 bsm, bsm, bsm, bsm};
-
-    float* JXL_RESTRICT rows[3][5];
-    for (size_t c = 0; c < 3; c++) {
-      for (int i = 0; i < 5; i++) {
-        rows[c][i] = GetInputRow(input_rows, c, i - 2);
-      }
-    }
-
-    const float* sad_mul =
-        (ypos % kBlockDim == 0 || ypos % kBlockDim == kBlockDim - 1)
-            ? sad_mul_border
-            : sad_mul_center;
-
-    for (ssize_t x = -xextra; x < static_cast<ssize_t>(xsize + xextra);
-         x += Lanes(df)) {
-      size_t bx = (x + xpos + kSigmaPadding * kBlockDim) / kBlockDim;
-      size_t ix = (x + xpos) % kBlockDim;
-
-      if (row_sigma[bx] < kMinSigma) {
-        for (size_t c = 0; c < 3; c++) {
-          auto px = Load(df, rows[c][2 + 0] + x);
-          Store(px, df, GetOutputRow(output_rows, c, 0) + x);
-        }
-        continue;
-      }
-
-      const auto sm = Load(df, sad_mul + ix);
-      const auto inv_sigma = Mul(Set(df, row_sigma[bx]), sm);
-      auto sad0 = Zero(df);
-      auto sad1 = Zero(df);
-      auto sad2 = Zero(df);
-      auto sad3 = Zero(df);
-
-      // compute sads
-      for (size_t c = 0; c < 3; c++) {
-        // center px = 22, px above = 21
-        auto t = Undefined(df);
-
-        const auto p20 = Load(df, rows[c][2 + -2] + x);
-        const auto p21 = Load(df, rows[c][2 + -1] + x);
-        auto sad0c = AbsDiff(p20, p21);  // SAD 2, 1
-
-        const auto p11 = LoadU(df, rows[c][2 + -1] + x - 1);
-        auto sad1c = AbsDiff(p11, p21);  // SAD 1, 2
-
-        const auto p31 = LoadU(df, rows[c][2 + -1] + x + 1);
-        auto sad2c = AbsDiff(p31, p21);  // SAD 3, 2
-
-        const auto p02 = LoadU(df, rows[c][2 + 0] + x - 2);
-        const auto p12 = LoadU(df, rows[c][2 + 0] + x - 1);
-        sad1c = Add(sad1c, AbsDiff(p02, p12));  // SAD 1, 2
-        sad0c = Add(sad0c, AbsDiff(p11, p12));  // SAD 2, 1
-
-        const auto p22 = LoadU(df, rows[c][2 + 0] + x);
-        t = AbsDiff(p12, p22);
-        sad1c = Add(sad1c, t);  // SAD 1, 2
-        sad2c = Add(sad2c, t);  // SAD 3, 2
-        t = AbsDiff(p22, p21);
-        auto sad3c = t;  // SAD 2, 3
-        sad0c = Add(sad0c, t);  // SAD 2, 1
-
-        const auto p32 = LoadU(df, rows[c][2 + 0] + x + 1);
-        sad0c = Add(sad0c, AbsDiff(p31, p32));  // SAD 2, 1
-        t = AbsDiff(p22, p32);
-        sad1c = Add(sad1c, t);  // SAD 1, 2
-        sad2c = Add(sad2c, t);  // SAD 3, 2
-
-        const auto p42 = LoadU(df, rows[c][2 + 0] + x + 2);
-        sad2c = Add(sad2c, AbsDiff(p42, p32));  // SAD 3, 2
-
-        const auto p13 = LoadU(df, rows[c][2 + 1] + x - 1);
-        sad3c = Add(sad3c, AbsDiff(p13, p12));  // SAD 2, 3
-
-        const auto p23 = Load(df, rows[c][2 + 1] + x);
-        t = AbsDiff(p22, p23);
-        sad0c = Add(sad0c, t);                  // SAD 2, 1
-        sad3c = Add(sad3c, t);                  // SAD 2, 3
-        sad1c = Add(sad1c, AbsDiff(p13, p23));  // SAD 1, 2
-
-        const auto p33 = LoadU(df, rows[c][2 + 1] + x + 1);
-        sad2c = Add(sad2c, AbsDiff(p33, p23));  // SAD 3, 2
-        sad3c = Add(sad3c, AbsDiff(p33, p32));  // SAD 2, 3
-
-        const auto p24 = Load(df, rows[c][2 + 2] + x);
-        sad3c = Add(sad3c, AbsDiff(p24, p23));  // SAD 2, 3
-
-        auto scale = Set(df, lf_.epf_channel_scale[c]);
-        sad0 = MulAdd(sad0c, scale, sad0);
-        sad1 = MulAdd(sad1c, scale, sad1);
-        sad2 = MulAdd(sad2c, scale, sad2);
-        sad3 = MulAdd(sad3c, scale, sad3);
-      }
-      const auto x_cc = Load(df, rows[0][2 + 0] + x);
-      const auto y_cc = Load(df, rows[1][2 + 0] + x);
-      const auto b_cc = Load(df, rows[2][2 + 0] + x);
-
-      auto w = Set(df, 1);
-      auto X = x_cc;
-      auto Y = y_cc;
-      auto B = b_cc;
-
-      // Top row
-      AddPixel</*aligned=*/true>(/*row=*/-1, rows, x, sad0, inv_sigma, &X, &Y,
-                                 &B, &w);
-      // Center
-      AddPixel</*aligned=*/false>(/*row=*/0, rows, x - 1, sad1, inv_sigma, &X,
-                                  &Y, &B, &w);
-      AddPixel</*aligned=*/false>(/*row=*/0, rows, x + 1, sad2, inv_sigma, &X,
-                                  &Y, &B, &w);
-      // Bottom
-      AddPixel</*aligned=*/true>(/*row=*/1, rows, x, sad3, inv_sigma, &X, &Y,
-                                 &B, &w);
-#if JXL_HIGH_PRECISION
-      auto inv_w = Div(Set(df, 1.0f), w);
-#else
-      auto inv_w = ApproximateReciprocal(w);
-#endif
-      Store(Mul(X, inv_w), df, GetOutputRow(output_rows, 0, 0) + x);
-      Store(Mul(Y, inv_w), df, GetOutputRow(output_rows, 1, 0) + x);
-      Store(Mul(B, inv_w), df, GetOutputRow(output_rows, 2, 0) + x);
-    }
-    return true;
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return c < 3 ? RenderPipelineChannelMode::kInOut
-                 : RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "EPF1"; }
-
- private:
-  LoopFilter lf_;
-  const ImageF* sigma_;
-};
-
-// 3x3 plus-shaped kernel with 1 SAD per pixel. So this makes this filter a 3x3
-// filter.
-class EPF2Stage : public RenderPipelineStage {
- public:
-  EPF2Stage(LoopFilter lf, const ImageF& sigma)
-      : RenderPipelineStage(RenderPipelineStage::Settings::Symmetric(
-            /*shift=*/0, /*border=*/1)),
-        lf_(std::move(lf)),
-        sigma_(&sigma) {}
-
-  template <bool aligned>
-  JXL_INLINE void AddPixel(int row, float* JXL_RESTRICT rows[3][3], ssize_t x,
-                           Vec<DF> rx, Vec<DF> ry, Vec<DF> rb,
-                           Vec<DF> inv_sigma, Vec<DF>* JXL_RESTRICT X,
-                           Vec<DF>* JXL_RESTRICT Y, Vec<DF>* JXL_RESTRICT B,
-                           Vec<DF>* JXL_RESTRICT w) const {
-    auto cx = aligned ? Load(DF(), rows[0][1 + row] + x)
-                      : LoadU(DF(), rows[0][1 + row] + x);
-    auto cy = aligned ? Load(DF(), rows[1][1 + row] + x)
-                      : LoadU(DF(), rows[1][1 + row] + x);
-    auto cb = aligned ? Load(DF(), rows[2][1 + row] + x)
-                      : LoadU(DF(), rows[2][1 + row] + x);
-
-    auto sad = Mul(AbsDiff(cx, rx), Set(DF(), lf_.epf_channel_scale[0]));
-    sad = MulAdd(AbsDiff(cy, ry), Set(DF(), lf_.epf_channel_scale[1]), sad);
-    sad = MulAdd(AbsDiff(cb, rb), Set(DF(), lf_.epf_channel_scale[2]), sad);
-
-    auto weight = Weight(sad, inv_sigma, Set(DF(), lf_.epf_pass2_zeroflush));
-
-    *w = Add(*w, weight);
-    *X = MulAdd(weight, cx, *X);
-    *Y = MulAdd(weight, cy, *Y);
-    *B = MulAdd(weight, cb, *B);
-  }
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    DF df;
-    xextra = RoundUpTo(xextra, Lanes(df));
-    const float* JXL_RESTRICT row_sigma =
-        sigma_->Row(ypos / kBlockDim + kSigmaPadding);
-
-    float sm = lf_.epf_pass2_sigma_scale * 1.65;
-    float bsm = sm * lf_.epf_border_sad_mul;
-
-    HWY_ALIGN float sad_mul_center[kBlockDim] = {bsm, sm, sm, sm,
-                                                 sm,  sm, sm, bsm};
-    HWY_ALIGN float sad_mul_border[kBlockDim] = {bsm, bsm, bsm, bsm,
-                                                 bsm, bsm, bsm, bsm};
-
-    float* JXL_RESTRICT rows[3][3];
-    for (size_t c = 0; c < 3; c++) {
-      for (int i = 0; i < 3; i++) {
-        rows[c][i] = GetInputRow(input_rows, c, i - 1);
-      }
-    }
-
-    const float* sad_mul =
-        (ypos % kBlockDim == 0 || ypos % kBlockDim == kBlockDim - 1)
-            ? sad_mul_border
-            : sad_mul_center;
-
-    for (ssize_t x = -xextra; x < static_cast<ssize_t>(xsize + xextra);
-         x += Lanes(df)) {
-      size_t bx = (x + xpos + kSigmaPadding * kBlockDim) / kBlockDim;
-      size_t ix = (x + xpos) % kBlockDim;
-
-      if (row_sigma[bx] < kMinSigma) {
-        for (size_t c = 0; c < 3; c++) {
-          auto px = Load(df, rows[c][1 + 0] + x);
-          Store(px, df, GetOutputRow(output_rows, c, 0) + x);
-        }
-        continue;
-      }
-
-      const auto sm = Load(df, sad_mul + ix);
-      const auto inv_sigma = Mul(Set(df, row_sigma[bx]), sm);
-
-      const auto x_cc = Load(df, rows[0][1 + 0] + x);
-      const auto y_cc = Load(df, rows[1][1 + 0] + x);
-      const auto b_cc = Load(df, rows[2][1 + 0] + x);
-
-      auto w = Set(df, 1);
-      auto X = x_cc;
-      auto Y = y_cc;
-      auto B = b_cc;
-
-      // Top row
-      AddPixel</*aligned=*/true>(/*row=*/-1, rows, x, x_cc, y_cc, b_cc,
-                                 inv_sigma, &X, &Y, &B, &w);
-      // Center
-      AddPixel</*aligned=*/false>(/*row=*/0, rows, x - 1, x_cc, y_cc, b_cc,
-                                  inv_sigma, &X, &Y, &B, &w);
-      AddPixel</*aligned=*/false>(/*row=*/0, rows, x + 1, x_cc, y_cc, b_cc,
-                                  inv_sigma, &X, &Y, &B, &w);
-      // Bottom
-      AddPixel</*aligned=*/true>(/*row=*/1, rows, x, x_cc, y_cc, b_cc,
-                                 inv_sigma, &X, &Y, &B, &w);
-#if JXL_HIGH_PRECISION
-      auto inv_w = Div(Set(df, 1.0f), w);
-#else
-      auto inv_w = ApproximateReciprocal(w);
-#endif
-      Store(Mul(X, inv_w), df, GetOutputRow(output_rows, 0, 0) + x);
-      Store(Mul(Y, inv_w), df, GetOutputRow(output_rows, 1, 0) + x);
-      Store(Mul(B, inv_w), df, GetOutputRow(output_rows, 2, 0) + x);
-    }
-    return true;
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return c < 3 ? RenderPipelineChannelMode::kInOut
-                 : RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "EPF2"; }
-
- private:
-  LoopFilter lf_;
-  const ImageF* sigma_;
-};
-
-std::unique_ptr<RenderPipelineStage> GetEPFStage0(const LoopFilter& lf,
-                                                  const ImageF& sigma) {
-  return jxl::make_unique<EPF0Stage>(lf, sigma);
-}
-
-std::unique_ptr<RenderPipelineStage> GetEPFStage1(const LoopFilter& lf,
-                                                  const ImageF& sigma) {
-  return jxl::make_unique<EPF1Stage>(lf, sigma);
-}
-
-std::unique_ptr<RenderPipelineStage> GetEPFStage2(const LoopFilter& lf,
-                                                  const ImageF& sigma) {
-  return jxl::make_unique<EPF2Stage>(lf, sigma);
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(GetEPFStage0);
-HWY_EXPORT(GetEPFStage1);
-HWY_EXPORT(GetEPFStage2);
-
-std::unique_ptr<RenderPipelineStage> GetEPFStage(const LoopFilter& lf,
-                                                 const ImageF& sigma,
-                                                 EpfStage epf_stage) {
-  if (lf.epf_iters == 0) return nullptr;
-  switch (epf_stage) {
-    case EpfStage::Zero:
-      return HWY_DYNAMIC_DISPATCH(GetEPFStage0)(lf, sigma);
-    case EpfStage::One:
-      return HWY_DYNAMIC_DISPATCH(GetEPFStage1)(lf, sigma);
-    case EpfStage::Two:
-      return HWY_DYNAMIC_DISPATCH(GetEPFStage2)(lf, sigma);
-  }
-  JXL_DEBUG_ABORT("internal: unexpected EpfStage: %d",
-                  static_cast<int>(epf_stage));
-  return nullptr;
-}
-
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_epf.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_epf.h
deleted file mode 100644
index 0fd7b672b10ae..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_epf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_RENDER_PIPELINE_STAGE_EPF_H_
-#define LIB_JXL_RENDER_PIPELINE_STAGE_EPF_H_
-
-#include <cstdint>
-#include <memory>
-
-#include "lib/jxl/image.h"
-#include "lib/jxl/loop_filter.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-
-namespace jxl {
-
-enum class EpfStage : uint8_t { Zero, One, Two };
-
-// Applies the `epf_stage`-th EPF step with the given settings and `sigma`.
-// `sigma` will be accessed with an offset of (kSigmaPadding, kSigmaPadding),
-// and should have (kSigmaBorder, kSigmaBorder) mirrored sigma values available
-// around the main image. See also filters.(h|cc)
-std::unique_ptr<RenderPipelineStage> GetEPFStage(const LoopFilter& lf,
-                                                 const ImageF& sigma,
-                                                 EpfStage epf_stage);
-}  // namespace jxl
-
-#endif  // LIB_JXL_RENDER_PIPELINE_STAGE_EPF_H_
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_from_linear.cc b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_from_linear.cc
deleted file mode 100644
index daeefb23e06c1..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_from_linear.cc
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/render_pipeline/stage_from_linear.h"
-
-#include "lib/jxl/base/status.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/render_pipeline/stage_from_linear.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/sanitizers.h"
-#include "lib/jxl/cms/tone_mapping-inl.h"
-#include "lib/jxl/cms/transfer_functions-inl.h"
-#include "lib/jxl/common.h"  // JXL_HIGH_PRECISION
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-namespace {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::IfThenZeroElse;
-
-template <typename Op>
-struct PerChannelOp {
-  explicit PerChannelOp(Op op) : op(op) {}
-  template <typename D, typename T>
-  void Transform(D d, T* r, T* g, T* b) const {
-    *r = op.Transform(d, *r);
-    *g = op.Transform(d, *g);
-    *b = op.Transform(d, *b);
-  }
-
-  Op op;
-};
-template <typename Op>
-PerChannelOp<Op> MakePerChannelOp(Op&& op) {
-  return PerChannelOp<Op>(std::forward<Op>(op));
-}
-
-struct OpLinear {
-  template <typename D, typename T>
-  T Transform(D d, const T& linear) const {
-    return linear;
-  }
-};
-
-struct OpRgb {
-  template <typename D, typename T>
-  T Transform(D d, const T& linear) const {
-#if JXL_HIGH_PRECISION
-    return TF_SRGB().EncodedFromDisplay(d, linear);
-#else
-    return FastLinearToSRGB(d, linear);
-#endif
-  }
-};
-
-struct OpPq {
-  explicit OpPq(const float intensity_target) : tf_pq_(intensity_target) {}
-  template <typename D, typename T>
-  T Transform(D d, const T& linear) const {
-    return tf_pq_.EncodedFromDisplay(d, linear);
-  }
-  TF_PQ tf_pq_;
-};
-
-struct OpHlg {
-  explicit OpHlg(const Vector3& luminances, const float intensity_target)
-      : hlg_ootf_(HlgOOTF::ToSceneLight(/*display_luminance=*/intensity_target,
-                                        luminances)) {}
-
-  template <typename D, typename T>
-  void Transform(D d, T* r, T* g, T* b) const {
-    hlg_ootf_.Apply(r, g, b);
-    *r = TF_HLG().EncodedFromDisplay(d, *r);
-    *g = TF_HLG().EncodedFromDisplay(d, *g);
-    *b = TF_HLG().EncodedFromDisplay(d, *b);
-  }
-  HlgOOTF hlg_ootf_;
-};
-
-struct Op709 {
-  template <typename D, typename T>
-  T Transform(D d, const T& linear) const {
-    return TF_709().EncodedFromDisplay(d, linear);
-  }
-};
-
-struct OpGamma {
-  const float inverse_gamma;
-  template <typename D, typename T>
-  T Transform(D d, const T& linear) const {
-    return IfThenZeroElse(Le(linear, Set(d, 1e-5f)),
-                          FastPowf(d, linear, Set(d, inverse_gamma)));
-  }
-};
-
-template <typename Op>
-class FromLinearStage : public RenderPipelineStage {
- public:
-  explicit FromLinearStage(Op op)
-      : RenderPipelineStage(RenderPipelineStage::Settings()),
-        op_(std::move(op)) {}
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    const HWY_FULL(float) d;
-    const size_t xsize_v = RoundUpTo(xsize, Lanes(d));
-    float* JXL_RESTRICT row0 = GetInputRow(input_rows, 0, 0);
-    float* JXL_RESTRICT row1 = GetInputRow(input_rows, 1, 0);
-    float* JXL_RESTRICT row2 = GetInputRow(input_rows, 2, 0);
-    // All calculations are lane-wise, still some might require
-    // value-dependent behaviour (e.g. NearestInt). Temporary unpoison last
-    // vector tail.
-    msan::UnpoisonMemory(row0 + xsize, sizeof(float) * (xsize_v - xsize));
-    msan::UnpoisonMemory(row1 + xsize, sizeof(float) * (xsize_v - xsize));
-    msan::UnpoisonMemory(row2 + xsize, sizeof(float) * (xsize_v - xsize));
-    for (ssize_t x = -xextra; x < static_cast<ssize_t>(xsize + xextra);
-         x += Lanes(d)) {
-      auto r = LoadU(d, row0 + x);
-      auto g = LoadU(d, row1 + x);
-      auto b = LoadU(d, row2 + x);
-      op_.Transform(d, &r, &g, &b);
-      StoreU(r, d, row0 + x);
-      StoreU(g, d, row1 + x);
-      StoreU(b, d, row2 + x);
-    }
-    msan::PoisonMemory(row0 + xsize, sizeof(float) * (xsize_v - xsize));
-    msan::PoisonMemory(row1 + xsize, sizeof(float) * (xsize_v - xsize));
-    msan::PoisonMemory(row2 + xsize, sizeof(float) * (xsize_v - xsize));
-    return true;
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return c < 3 ? RenderPipelineChannelMode::kInPlace
-                 : RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "FromLinear"; }
-
- private:
-  Op op_;
-};
-
-template <typename Op>
-std::unique_ptr<FromLinearStage<Op>> MakeFromLinearStage(Op&& op) {
-  return jxl::make_unique<FromLinearStage<Op>>(std::forward<Op>(op));
-}
-
-std::unique_ptr<RenderPipelineStage> GetFromLinearStage(
-    const OutputEncodingInfo& output_encoding_info) {
-  const auto& tf = output_encoding_info.color_encoding.Tf();
-  if (tf.IsLinear()) {
-    return MakeFromLinearStage(MakePerChannelOp(OpLinear()));
-  } else if (tf.IsSRGB()) {
-    return MakeFromLinearStage(MakePerChannelOp(OpRgb()));
-  } else if (tf.IsPQ()) {
-    return MakeFromLinearStage(
-        MakePerChannelOp(OpPq(output_encoding_info.orig_intensity_target)));
-  } else if (tf.IsHLG()) {
-    return MakeFromLinearStage(
-        OpHlg(output_encoding_info.luminances,
-              output_encoding_info.desired_intensity_target));
-  } else if (tf.Is709()) {
-    return MakeFromLinearStage(MakePerChannelOp(Op709()));
-  } else if (tf.have_gamma || tf.IsDCI()) {
-    return MakeFromLinearStage(
-        MakePerChannelOp(OpGamma{output_encoding_info.inverse_gamma}));
-  } else {
-    // This is a programming error.
-    JXL_DEBUG_ABORT("Invalid target encoding");
-    return nullptr;
-  }
-}
-
-}  // namespace
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(GetFromLinearStage);
-
-std::unique_ptr<RenderPipelineStage> GetFromLinearStage(
-    const OutputEncodingInfo& output_encoding_info) {
-  return HWY_DYNAMIC_DISPATCH(GetFromLinearStage)(output_encoding_info);
-}
-
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_from_linear.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_from_linear.h
deleted file mode 100644
index 548ab50b8ce4d..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_from_linear.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_RENDER_PIPELINE_STAGE_FROM_LINEAR_H_
-#define LIB_JXL_RENDER_PIPELINE_STAGE_FROM_LINEAR_H_
-
-#include "lib/jxl/dec_xyb.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-
-namespace jxl {
-
-// Converts the color channels from linear to the specified output encoding.
-std::unique_ptr<RenderPipelineStage> GetFromLinearStage(
-    const OutputEncodingInfo& output_encoding_info);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_RENDER_PIPELINE_STAGE_FROM_LINEAR_H_
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_gaborish.cc b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_gaborish.cc
deleted file mode 100644
index e6313de05ec0d..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_gaborish.cc
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/render_pipeline/stage_gaborish.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/render_pipeline/stage_gaborish.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::MulAdd;
-
-class GaborishStage : public RenderPipelineStage {
- public:
-  explicit GaborishStage(const LoopFilter& lf)
-      : RenderPipelineStage(RenderPipelineStage::Settings::Symmetric(
-            /*shift=*/0, /*border=*/1)) {
-    weights_[0] = 1;
-    weights_[1] = lf.gab_x_weight1;
-    weights_[2] = lf.gab_x_weight2;
-    weights_[3] = 1;
-    weights_[4] = lf.gab_y_weight1;
-    weights_[5] = lf.gab_y_weight2;
-    weights_[6] = 1;
-    weights_[7] = lf.gab_b_weight1;
-    weights_[8] = lf.gab_b_weight2;
-    // Normalize
-    for (size_t c = 0; c < 3; c++) {
-      const float div =
-          weights_[3 * c] + 4 * (weights_[3 * c + 1] + weights_[3 * c + 2]);
-      const float mul = 1.0f / div;
-      weights_[3 * c] *= mul;
-      weights_[3 * c + 1] *= mul;
-      weights_[3 * c + 2] *= mul;
-    }
-  }
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    const HWY_FULL(float) d;
-    for (size_t c = 0; c < 3; c++) {
-      float* JXL_RESTRICT row_t = GetInputRow(input_rows, c, -1);
-      float* JXL_RESTRICT row_m = GetInputRow(input_rows, c, 0);
-      float* JXL_RESTRICT row_b = GetInputRow(input_rows, c, 1);
-      float* JXL_RESTRICT row_out = GetOutputRow(output_rows, c, 0);
-      const auto w0 = Set(d, weights_[3 * c + 0]);
-      const auto w1 = Set(d, weights_[3 * c + 1]);
-      const auto w2 = Set(d, weights_[3 * c + 2]);
-// Group data need only be aligned to a block; for >=512 bit vectors, this may
-// result in unaligned loads.
-#if HWY_CAP_GE512
-#define LoadMaybeU LoadU
-#else
-#define LoadMaybeU Load
-#endif
-      // Since GetInputRow(input_rows, c, {-1, 0, 1}) is aligned, rounding
-      // xextra up to Lanes(d) doesn't access anything problematic.
-      for (ssize_t x = -RoundUpTo(xextra, Lanes(d));
-           x < static_cast<ssize_t>(xsize + xextra); x += Lanes(d)) {
-        const auto t = LoadMaybeU(d, row_t + x);
-        const auto tl = LoadU(d, row_t + x - 1);
-        const auto tr = LoadU(d, row_t + x + 1);
-        const auto m = LoadMaybeU(d, row_m + x);
-        const auto l = LoadU(d, row_m + x - 1);
-        const auto r = LoadU(d, row_m + x + 1);
-        const auto b = LoadMaybeU(d, row_b + x);
-        const auto bl = LoadU(d, row_b + x - 1);
-        const auto br = LoadU(d, row_b + x + 1);
-        const auto sum0 = m;
-        const auto sum1 = Add(Add(l, r), Add(t, b));
-        const auto sum2 = Add(Add(tl, tr), Add(bl, br));
-        auto pixels = MulAdd(sum2, w2, MulAdd(sum1, w1, Mul(sum0, w0)));
-        Store(pixels, d, row_out + x);
-      }
-    }
-    return true;
-  }
-#undef LoadMaybeU
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return c < 3 ? RenderPipelineChannelMode::kInOut
-                 : RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "Gab"; }
-
- private:
-  float weights_[9];
-};
-
-std::unique_ptr<RenderPipelineStage> GetGaborishStage(const LoopFilter& lf) {
-  return jxl::make_unique<GaborishStage>(lf);
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(GetGaborishStage);
-
-std::unique_ptr<RenderPipelineStage> GetGaborishStage(const LoopFilter& lf) {
-  if (lf.gab != 1) return nullptr;
-  return HWY_DYNAMIC_DISPATCH(GetGaborishStage)(lf);
-}
-
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_gaborish.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_gaborish.h
deleted file mode 100644
index 55166e3ed8a92..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_gaborish.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_RENDER_PIPELINE_STAGE_GABORISH_H_
-#define LIB_JXL_RENDER_PIPELINE_STAGE_GABORISH_H_
-#include <math.h>
-#include <stdint.h>
-
-#include <algorithm>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/loop_filter.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-
-namespace jxl {
-
-// Applies decoder-side Gaborish with the given settings. `lf.gab` must be 1.
-std::unique_ptr<RenderPipelineStage> GetGaborishStage(const LoopFilter& lf);
-}  // namespace jxl
-
-#endif  // LIB_JXL_RENDER_PIPELINE_STAGE_GABORISH_H_
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_noise.cc b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_noise.cc
deleted file mode 100644
index 5a241183bedd5..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_noise.cc
+++ /dev/null
@@ -1,321 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/render_pipeline/stage_noise.h"
-
-#include "lib/jxl/base/sanitizers.h"
-#include "lib/jxl/noise.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/render_pipeline/stage_noise.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::And;
-using hwy::HWY_NAMESPACE::Floor;
-using hwy::HWY_NAMESPACE::Ge;
-using hwy::HWY_NAMESPACE::IfThenElse;
-using hwy::HWY_NAMESPACE::Max;
-using hwy::HWY_NAMESPACE::Min;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::MulAdd;
-using hwy::HWY_NAMESPACE::Or;
-using hwy::HWY_NAMESPACE::Sub;
-using hwy::HWY_NAMESPACE::TableLookupBytes;
-using hwy::HWY_NAMESPACE::Vec;
-using hwy::HWY_NAMESPACE::ZeroIfNegative;
-
-using D = HWY_CAPPED(float, kBlockDim);
-using DI = hwy::HWY_NAMESPACE::Rebind<int32_t, D>;
-using DI8 = hwy::HWY_NAMESPACE::Repartition<uint8_t, D>;
-
-// [0, max_value]
-template <class D, class V>
-static HWY_INLINE V Clamp0ToMax(D d, const V x, const V max_value) {
-  const auto clamped = Min(x, max_value);
-  return ZeroIfNegative(clamped);
-}
-
-// x is in [0+delta, 1+delta], delta ~= 0.06
-template <class StrengthEval>
-typename StrengthEval::V NoiseStrength(const StrengthEval& eval,
-                                       const typename StrengthEval::V x) {
-  return Clamp0ToMax(D(), eval(x), Set(D(), 1.0f));
-}
-
-// TODO(veluca): SIMD-fy.
-class StrengthEvalLut {
- public:
-  using V = Vec<D>;
-
-  explicit StrengthEvalLut(const NoiseParams& noise_params)
-#if HWY_TARGET == HWY_SCALAR
-      : noise_params_(noise_params)
-#endif
-  {
-#if HWY_TARGET != HWY_SCALAR
-    uint32_t lut[NoiseParams::kNumNoisePoints];
-    memcpy(lut, noise_params.lut.data(),
-           NoiseParams::kNumNoisePoints * sizeof(uint32_t));
-    for (size_t i = 0; i < NoiseParams::kNumNoisePoints; i++) {
-      low16_lut[2 * i] = (lut[i] >> 0) & 0xFF;
-      low16_lut[2 * i + 1] = (lut[i] >> 8) & 0xFF;
-      high16_lut[2 * i] = (lut[i] >> 16) & 0xFF;
-      high16_lut[2 * i + 1] = (lut[i] >> 24) & 0xFF;
-    }
-#endif
-  }
-
-  V operator()(const V vx) const {
-    constexpr size_t kScale = NoiseParams::kNumNoisePoints - 2;
-    auto scaled_vx = Max(Zero(D()), Mul(vx, Set(D(), kScale)));
-    auto floor_x = Floor(scaled_vx);
-    auto frac_x = Sub(scaled_vx, floor_x);
-    floor_x = IfThenElse(Ge(scaled_vx, Set(D(), kScale + 1)), Set(D(), kScale),
-                         floor_x);
-    frac_x =
-        IfThenElse(Ge(scaled_vx, Set(D(), kScale + 1)), Set(D(), 1), frac_x);
-    auto floor_x_int = ConvertTo(DI(), floor_x);
-#if HWY_TARGET == HWY_SCALAR
-    auto low = Set(D(), noise_params_.lut[floor_x_int.raw]);
-    auto hi = Set(D(), noise_params_.lut[floor_x_int.raw + 1]);
-#else
-    // Set each lane's bytes to {0, 0, 2x+1, 2x}.
-    auto floorx_indices_low =
-        Add(Mul(floor_x_int, Set(DI(), 0x0202)), Set(DI(), 0x0100));
-    // Set each lane's bytes to {2x+1, 2x, 0, 0}.
-    auto floorx_indices_hi =
-        Add(Mul(floor_x_int, Set(DI(), 0x02020000)), Set(DI(), 0x01000000));
-    // load LUT
-    auto low16 = BitCast(DI(), LoadDup128(DI8(), low16_lut));
-    auto lowm = Set(DI(), 0xFFFF);
-    auto hi16 = BitCast(DI(), LoadDup128(DI8(), high16_lut));
-    auto him = Set(DI(), 0xFFFF0000);
-    // low = noise_params.lut[floor_x]
-    auto low =
-        BitCast(D(), Or(And(TableLookupBytes(low16, floorx_indices_low), lowm),
-                        And(TableLookupBytes(hi16, floorx_indices_hi), him)));
-    // hi = noise_params.lut[floor_x+1]
-    floorx_indices_low = Add(floorx_indices_low, Set(DI(), 0x0202));
-    floorx_indices_hi = Add(floorx_indices_hi, Set(DI(), 0x02020000));
-    auto hi =
-        BitCast(D(), Or(And(TableLookupBytes(low16, floorx_indices_low), lowm),
-                        And(TableLookupBytes(hi16, floorx_indices_hi), him)));
-#endif
-    return MulAdd(Sub(hi, low), frac_x, low);
-  }
-
- private:
-#if HWY_TARGET != HWY_SCALAR
-  // noise_params.lut transformed into two 16-bit lookup tables.
-  HWY_ALIGN uint8_t high16_lut[16];
-  HWY_ALIGN uint8_t low16_lut[16];
-#else
-  const NoiseParams& noise_params_;
-#endif
-};
-
-template <class D>
-void AddNoiseToRGB(const D d, const Vec<D> rnd_noise_r,
-                   const Vec<D> rnd_noise_g, const Vec<D> rnd_noise_cor,
-                   const Vec<D> noise_strength_g, const Vec<D> noise_strength_r,
-                   float ytox, float ytob, float* JXL_RESTRICT out_x,
-                   float* JXL_RESTRICT out_y, float* JXL_RESTRICT out_b) {
-  const auto kRGCorr = Set(d, 0.9921875f);   // 127/128
-  const auto kRGNCorr = Set(d, 0.0078125f);  // 1/128
-
-  const auto red_noise =
-      Mul(noise_strength_r,
-          MulAdd(kRGNCorr, rnd_noise_r, Mul(kRGCorr, rnd_noise_cor)));
-  const auto green_noise =
-      Mul(noise_strength_g,
-          MulAdd(kRGNCorr, rnd_noise_g, Mul(kRGCorr, rnd_noise_cor)));
-
-  auto vx = LoadU(d, out_x);
-  auto vy = LoadU(d, out_y);
-  auto vb = LoadU(d, out_b);
-
-  const auto rg_noise = Add(red_noise, green_noise);
-  vx = Add(MulAdd(Set(d, ytox), rg_noise, Sub(red_noise, green_noise)), vx);
-  vy = Add(vy, rg_noise);
-  vb = MulAdd(Set(d, ytob), rg_noise, vb);
-
-  StoreU(vx, d, out_x);
-  StoreU(vy, d, out_y);
-  StoreU(vb, d, out_b);
-}
-
-class AddNoiseStage : public RenderPipelineStage {
- public:
-  AddNoiseStage(const NoiseParams& noise_params,
-                const ColorCorrelation& color_correlation, size_t first_c)
-      : RenderPipelineStage(RenderPipelineStage::Settings::Symmetric(
-            /*shift=*/0, /*border=*/0)),
-        noise_params_(noise_params),
-        color_correlation_(color_correlation),
-        first_c_(first_c) {}
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    if (!noise_params_.HasAny()) return true;
-    const StrengthEvalLut noise_model(noise_params_);
-    D d;
-    const auto half = Set(d, 0.5f);
-
-    // With the prior subtract-random Laplacian approximation, rnd_* ranges were
-    // about [-1.5, 1.6]; Laplacian3 about doubles this to [-3.6, 3.6], so the
-    // normalizer is half of what it was before (0.5).
-    const auto norm_const = Set(d, 0.22f);
-
-    float ytox = color_correlation_.YtoXRatio(0);
-    float ytob = color_correlation_.YtoBRatio(0);
-
-    const size_t xsize_v = RoundUpTo(xsize, Lanes(d));
-
-    float* JXL_RESTRICT row_x = GetInputRow(input_rows, 0, 0);
-    float* JXL_RESTRICT row_y = GetInputRow(input_rows, 1, 0);
-    float* JXL_RESTRICT row_b = GetInputRow(input_rows, 2, 0);
-    const float* JXL_RESTRICT row_rnd_r =
-        GetInputRow(input_rows, first_c_ + 0, 0);
-    const float* JXL_RESTRICT row_rnd_g =
-        GetInputRow(input_rows, first_c_ + 1, 0);
-    const float* JXL_RESTRICT row_rnd_c =
-        GetInputRow(input_rows, first_c_ + 2, 0);
-    // Needed by the calls to Floor() in StrengthEvalLut. Only arithmetic and
-    // shuffles are otherwise done on the data, so this is safe.
-    msan::UnpoisonMemory(row_x + xsize, (xsize_v - xsize) * sizeof(float));
-    msan::UnpoisonMemory(row_y + xsize, (xsize_v - xsize) * sizeof(float));
-    for (size_t x = 0; x < xsize_v; x += Lanes(d)) {
-      const auto vx = LoadU(d, row_x + x);
-      const auto vy = LoadU(d, row_y + x);
-      const auto in_g = Sub(vy, vx);
-      const auto in_r = Add(vy, vx);
-      const auto noise_strength_g = NoiseStrength(noise_model, Mul(in_g, half));
-      const auto noise_strength_r = NoiseStrength(noise_model, Mul(in_r, half));
-      const auto addit_rnd_noise_red = Mul(LoadU(d, row_rnd_r + x), norm_const);
-      const auto addit_rnd_noise_green =
-          Mul(LoadU(d, row_rnd_g + x), norm_const);
-      const auto addit_rnd_noise_correlated =
-          Mul(LoadU(d, row_rnd_c + x), norm_const);
-      AddNoiseToRGB(D(), addit_rnd_noise_red, addit_rnd_noise_green,
-                    addit_rnd_noise_correlated, noise_strength_g,
-                    noise_strength_r, ytox, ytob, row_x + x, row_y + x,
-                    row_b + x);
-    }
-    msan::PoisonMemory(row_x + xsize, (xsize_v - xsize) * sizeof(float));
-    msan::PoisonMemory(row_y + xsize, (xsize_v - xsize) * sizeof(float));
-    msan::PoisonMemory(row_b + xsize, (xsize_v - xsize) * sizeof(float));
-    return true;
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return c >= first_c_ ? RenderPipelineChannelMode::kInput
-           : c < 3       ? RenderPipelineChannelMode::kInPlace
-                         : RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "AddNoise"; }
-
- private:
-  const NoiseParams& noise_params_;
-  const ColorCorrelation& color_correlation_;
-  size_t first_c_;
-};
-
-std::unique_ptr<RenderPipelineStage> GetAddNoiseStage(
-    const NoiseParams& noise_params, const ColorCorrelation& color_correlation,
-    size_t noise_c_start) {
-  return jxl::make_unique<AddNoiseStage>(noise_params, color_correlation,
-                                         noise_c_start);
-}
-
-class ConvolveNoiseStage : public RenderPipelineStage {
- public:
-  explicit ConvolveNoiseStage(size_t first_c)
-      : RenderPipelineStage(RenderPipelineStage::Settings::Symmetric(
-            /*shift=*/0, /*border=*/2)),
-        first_c_(first_c) {}
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    const HWY_FULL(float) d;
-    for (size_t c = first_c_; c < first_c_ + 3; c++) {
-      float* JXL_RESTRICT rows[5];
-      for (size_t i = 0; i < 5; i++) {
-        rows[i] = GetInputRow(input_rows, c, i - 2);
-      }
-      float* JXL_RESTRICT row_out = GetOutputRow(output_rows, c, 0);
-      for (ssize_t x = -RoundUpTo(xextra, Lanes(d));
-           x < static_cast<ssize_t>(xsize + xextra); x += Lanes(d)) {
-        const auto p00 = LoadU(d, rows[2] + x);
-        auto others = Zero(d);
-        // TODO(eustas): sum loaded values to reduce the calculation chain
-        for (ssize_t i = -2; i <= 2; i++) {
-          others = Add(others, LoadU(d, rows[0] + x + i));
-          others = Add(others, LoadU(d, rows[1] + x + i));
-          others = Add(others, LoadU(d, rows[3] + x + i));
-          others = Add(others, LoadU(d, rows[4] + x + i));
-        }
-        others = Add(others, LoadU(d, rows[2] + x - 2));
-        others = Add(others, LoadU(d, rows[2] + x - 1));
-        others = Add(others, LoadU(d, rows[2] + x + 1));
-        others = Add(others, LoadU(d, rows[2] + x + 2));
-        // 4 * (1 - box kernel)
-        auto pixels = MulAdd(others, Set(d, 0.16), Mul(p00, Set(d, -3.84)));
-        StoreU(pixels, d, row_out + x);
-      }
-    }
-    return true;
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return c >= first_c_ ? RenderPipelineChannelMode::kInOut
-                         : RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "ConvNoise"; }
-
- private:
-  size_t first_c_;
-};
-
-std::unique_ptr<RenderPipelineStage> GetConvolveNoiseStage(
-    size_t noise_c_start) {
-  return jxl::make_unique<ConvolveNoiseStage>(noise_c_start);
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(GetAddNoiseStage);
-HWY_EXPORT(GetConvolveNoiseStage);
-
-std::unique_ptr<RenderPipelineStage> GetAddNoiseStage(
-    const NoiseParams& noise_params, const ColorCorrelation& color_correlation,
-    size_t noise_c_start) {
-  return HWY_DYNAMIC_DISPATCH(GetAddNoiseStage)(noise_params, color_correlation,
-                                                noise_c_start);
-}
-
-std::unique_ptr<RenderPipelineStage> GetConvolveNoiseStage(
-    size_t noise_c_start) {
-  return HWY_DYNAMIC_DISPATCH(GetConvolveNoiseStage)(noise_c_start);
-}
-
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_noise.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_noise.h
deleted file mode 100644
index 06b4cb6bdb5d1..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_noise.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_RENDER_PIPELINE_STAGE_NOISE_H_
-#define LIB_JXL_RENDER_PIPELINE_STAGE_NOISE_H_
-
-#include <cstddef>
-#include <memory>
-
-#include "lib/jxl/chroma_from_luma.h"
-#include "lib/jxl/noise.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-
-namespace jxl {
-
-// Adds noise to color channels.
-std::unique_ptr<RenderPipelineStage> GetAddNoiseStage(
-    const NoiseParams& noise_params, const ColorCorrelation& color_correlation,
-    size_t noise_c_start);
-
-// Applies a 5x5 subtract-box-filter convolution to the noise input channels.
-std::unique_ptr<RenderPipelineStage> GetConvolveNoiseStage(
-    size_t noise_c_start);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_RENDER_PIPELINE_STAGE_NOISE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_patches.cc b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_patches.cc
deleted file mode 100644
index 0f9863f026c29..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_patches.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/render_pipeline/stage_patches.h"
-
-#include <cstddef>
-#include <memory>
-#include <vector>
-
-#include "lib/jxl/dec_patch_dictionary.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-
-namespace jxl {
-namespace {
-class PatchDictionaryStage : public RenderPipelineStage {
- public:
-  PatchDictionaryStage(const PatchDictionary* patches,
-                       const std::vector<ExtraChannelInfo>* extra_channel_info)
-      : RenderPipelineStage(RenderPipelineStage::Settings()),
-        patches_(*patches),
-        extra_channel_info_(extra_channel_info) {}
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    JXL_ENSURE(xpos == 0 || xpos >= xextra);
-    size_t x0 = xpos ? xpos - xextra : 0;
-    size_t num_channels = 3 + extra_channel_info_->size();
-    std::vector<float*> row_ptrs(num_channels);
-    for (size_t i = 0; i < num_channels; i++) {
-      row_ptrs[i] = GetInputRow(input_rows, i, 0) + x0 - xpos;
-    }
-    return patches_.AddOneRow(row_ptrs.data(), ypos, x0,
-                              xsize + xextra + xpos - x0, *extra_channel_info_);
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    size_t num_channels = 3 + extra_channel_info_->size();
-    return c < num_channels ? RenderPipelineChannelMode::kInPlace
-                            : RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "Patches"; }
-
- private:
-  const PatchDictionary& patches_;
-  const std::vector<ExtraChannelInfo>* extra_channel_info_;
-};
-}  // namespace
-
-std::unique_ptr<RenderPipelineStage> GetPatchesStage(
-    const PatchDictionary* patches,
-    const std::vector<ExtraChannelInfo>* extra_channel_info) {
-  return jxl::make_unique<PatchDictionaryStage>(patches, extra_channel_info);
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_patches.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_patches.h
deleted file mode 100644
index 3280e813e8f91..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_patches.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_RENDER_PIPELINE_STAGE_PATCHES_H_
-#define LIB_JXL_RENDER_PIPELINE_STAGE_PATCHES_H_
-
-#include <memory>
-#include <vector>
-
-#include "lib/jxl/dec_patch_dictionary.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-
-namespace jxl {
-
-// Draws patches if applicable.
-std::unique_ptr<RenderPipelineStage> GetPatchesStage(
-    const PatchDictionary* patches,
-    const std::vector<ExtraChannelInfo>* extra_channel_info);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_RENDER_PIPELINE_STAGE_PATCHES_H_
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_splines.cc b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_splines.cc
deleted file mode 100644
index 670287ec8049b..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_splines.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/render_pipeline/stage_splines.h"
-
-#include <cstddef>
-#include <memory>
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/render_pipeline/stage_splines.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-#include "lib/jxl/splines.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-class SplineStage : public RenderPipelineStage {
- public:
-  explicit SplineStage(const Splines* splines)
-      : RenderPipelineStage(RenderPipelineStage::Settings()),
-        splines_(*splines) {}
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    float* row_x = GetInputRow(input_rows, 0, 0);
-    float* row_y = GetInputRow(input_rows, 1, 0);
-    float* row_b = GetInputRow(input_rows, 2, 0);
-    splines_.AddToRow(row_x, row_y, row_b, ypos, xpos, xpos + xsize);
-    return true;
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return c < 3 ? RenderPipelineChannelMode::kInPlace
-                 : RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "Splines"; }
-
- private:
-  const Splines& splines_;
-};
-
-std::unique_ptr<RenderPipelineStage> GetSplineStage(const Splines* splines) {
-  return jxl::make_unique<SplineStage>(splines);
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(GetSplineStage);
-
-std::unique_ptr<RenderPipelineStage> GetSplineStage(const Splines* splines) {
-  return HWY_DYNAMIC_DISPATCH(GetSplineStage)(splines);
-}
-
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_splines.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_splines.h
deleted file mode 100644
index 363af393ec3aa..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_splines.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_RENDER_PIPELINE_STAGE_SPLINES_H_
-#define LIB_JXL_RENDER_PIPELINE_STAGE_SPLINES_H_
-
-#include <utility>
-
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-#include "lib/jxl/splines.h"
-
-namespace jxl {
-
-// Draws splines if applicable.
-std::unique_ptr<RenderPipelineStage> GetSplineStage(const Splines* splines);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_RENDER_PIPELINE_STAGE_SPLINES_H_
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_spot.cc b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_spot.cc
deleted file mode 100644
index e69b3a4fee619..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_spot.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/render_pipeline/stage_spot.h"
-
-#include <cstddef>
-#include <memory>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-
-namespace jxl {
-class SpotColorStage : public RenderPipelineStage {
- public:
-  explicit SpotColorStage(size_t spot_c_offset, const float* spot_color)
-      : RenderPipelineStage(RenderPipelineStage::Settings()),
-        spot_c_(3 + spot_c_offset),
-        spot_color_(spot_color) {}
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    // TODO(veluca): add SIMD.
-    float scale = spot_color_[3];
-    for (size_t c = 0; c < 3; c++) {
-      float* JXL_RESTRICT p = GetInputRow(input_rows, c, 0);
-      const float* JXL_RESTRICT s = GetInputRow(input_rows, spot_c_, 0);
-      for (ssize_t x = -xextra; x < static_cast<ssize_t>(xsize + xextra); x++) {
-        float mix = scale * s[x];
-        p[x] = mix * spot_color_[c] + (1.0f - mix) * p[x];
-      }
-    }
-    return true;
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return c < 3          ? RenderPipelineChannelMode::kInPlace
-           : c == spot_c_ ? RenderPipelineChannelMode::kInput
-                          : RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "Spot"; }
-
- private:
-  size_t spot_c_;
-  const float* spot_color_;
-};
-
-std::unique_ptr<RenderPipelineStage> GetSpotColorStage(
-    size_t spot_c_offset, const float* spot_color) {
-  return jxl::make_unique<SpotColorStage>(spot_c_offset, spot_color);
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_spot.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_spot.h
deleted file mode 100644
index 639e6849530fc..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_spot.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_RENDER_PIPELINE_STAGE_SPOT_H_
-#define LIB_JXL_RENDER_PIPELINE_STAGE_SPOT_H_
-
-#include <cstddef>
-#include <memory>
-
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-
-namespace jxl {
-
-// Render the spot color channels.
-std::unique_ptr<RenderPipelineStage> GetSpotColorStage(size_t spot_c_offset,
-                                                       const float* spot_color);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_RENDER_PIPELINE_STAGE_SPOT_H_
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_to_linear.cc b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_to_linear.cc
deleted file mode 100644
index 96c90dd722bf2..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_to_linear.cc
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/render_pipeline/stage_to_linear.h"
-
-#include "lib/jxl/base/sanitizers.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/render_pipeline/stage_to_linear.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/cms/tone_mapping-inl.h"
-#include "lib/jxl/cms/transfer_functions-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-namespace {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::IfThenZeroElse;
-
-template <typename Op>
-struct PerChannelOp {
-  explicit PerChannelOp(Op op) : op(op) {}
-  template <typename D, typename T>
-  void Transform(D d, T* r, T* g, T* b) const {
-    *r = op.Transform(d, *r);
-    *g = op.Transform(d, *g);
-    *b = op.Transform(d, *b);
-  }
-
-  Op op;
-};
-template <typename Op>
-PerChannelOp<Op> MakePerChannelOp(Op&& op) {
-  return PerChannelOp<Op>(std::forward<Op>(op));
-}
-
-struct OpLinear {
-  template <typename D, typename T>
-  T Transform(D d, const T& encoded) const {
-    return encoded;
-  }
-};
-
-struct OpRgb {
-  template <typename D, typename T>
-  T Transform(D d, const T& encoded) const {
-    return TF_SRGB().DisplayFromEncoded(encoded);
-  }
-};
-
-struct OpPq {
-  explicit OpPq(const float intensity_target) : tf_pq_(intensity_target) {}
-  template <typename D, typename T>
-  T Transform(D d, const T& encoded) const {
-    return tf_pq_.DisplayFromEncoded(d, encoded);
-  }
-  TF_PQ tf_pq_;
-};
-
-struct OpHlg {
-  explicit OpHlg(const Vector3& luminances, const float intensity_target)
-      : hlg_ootf_(HlgOOTF::FromSceneLight(
-            /*display_luminance=*/intensity_target, luminances)) {}
-
-  template <typename D, typename T>
-  void Transform(D d, T* r, T* g, T* b) const {
-    for (T* val : {r, g, b}) {
-      HWY_ALIGN float vals[MaxLanes(d)];
-      Store(*val, d, vals);
-      for (size_t i = 0; i < Lanes(d); ++i) {
-        vals[i] = TF_HLG_Base::DisplayFromEncoded(vals[i]);
-      }
-      *val = Load(d, vals);
-    }
-    hlg_ootf_.Apply(r, g, b);
-  }
-  HlgOOTF hlg_ootf_;
-};
-
-struct Op709 {
-  template <typename D, typename T>
-  T Transform(D d, const T& encoded) const {
-    return TF_709().DisplayFromEncoded(d, encoded);
-  }
-};
-
-struct OpGamma {
-  const float gamma;
-  template <typename D, typename T>
-  T Transform(D d, const T& encoded) const {
-    return IfThenZeroElse(Le(encoded, Set(d, 1e-5f)),
-                          FastPowf(d, encoded, Set(d, gamma)));
-  }
-};
-
-struct OpInvalid {
-  template <typename D, typename T>
-  void Transform(D d, T* r, T* g, T* b) const {}
-};
-
-template <typename Op>
-class ToLinearStage : public RenderPipelineStage {
- public:
-  explicit ToLinearStage(Op op)
-      : RenderPipelineStage(RenderPipelineStage::Settings()),
-        op_(std::move(op)) {}
-
-  explicit ToLinearStage()
-      : RenderPipelineStage(RenderPipelineStage::Settings()), valid_(false) {}
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    const HWY_FULL(float) d;
-    const size_t xsize_v = RoundUpTo(xsize, Lanes(d));
-    float* JXL_RESTRICT row0 = GetInputRow(input_rows, 0, 0);
-    float* JXL_RESTRICT row1 = GetInputRow(input_rows, 1, 0);
-    float* JXL_RESTRICT row2 = GetInputRow(input_rows, 2, 0);
-    // All calculations are lane-wise, still some might require
-    // value-dependent behaviour (e.g. NearestInt). Temporary unpoison last
-    // vector tail.
-    msan::UnpoisonMemory(row0 + xsize, sizeof(float) * (xsize_v - xsize));
-    msan::UnpoisonMemory(row1 + xsize, sizeof(float) * (xsize_v - xsize));
-    msan::UnpoisonMemory(row2 + xsize, sizeof(float) * (xsize_v - xsize));
-    for (ssize_t x = -xextra; x < static_cast<ssize_t>(xsize + xextra);
-         x += Lanes(d)) {
-      auto r = LoadU(d, row0 + x);
-      auto g = LoadU(d, row1 + x);
-      auto b = LoadU(d, row2 + x);
-      op_.Transform(d, &r, &g, &b);
-      StoreU(r, d, row0 + x);
-      StoreU(g, d, row1 + x);
-      StoreU(b, d, row2 + x);
-    }
-    msan::PoisonMemory(row0 + xsize, sizeof(float) * (xsize_v - xsize));
-    msan::PoisonMemory(row1 + xsize, sizeof(float) * (xsize_v - xsize));
-    msan::PoisonMemory(row2 + xsize, sizeof(float) * (xsize_v - xsize));
-    return true;
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return c < 3 ? RenderPipelineChannelMode::kInPlace
-                 : RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "ToLinear"; }
-
- private:
-  Status IsInitialized() const override { return valid_; }
-
-  Op op_;
-  bool valid_ = true;
-};
-
-template <typename Op>
-std::unique_ptr<ToLinearStage<Op>> MakeToLinearStage(Op&& op) {
-  return jxl::make_unique<ToLinearStage<Op>>(std::forward<Op>(op));
-}
-
-std::unique_ptr<RenderPipelineStage> GetToLinearStage(
-    const OutputEncodingInfo& output_encoding_info) {
-  const auto& tf = output_encoding_info.color_encoding.Tf();
-  if (tf.IsLinear()) {
-    return MakeToLinearStage(MakePerChannelOp(OpLinear()));
-  } else if (tf.IsSRGB()) {
-    return MakeToLinearStage(MakePerChannelOp(OpRgb()));
-  } else if (tf.IsPQ()) {
-    return MakeToLinearStage(
-        MakePerChannelOp(OpPq(output_encoding_info.orig_intensity_target)));
-  } else if (tf.IsHLG()) {
-    return MakeToLinearStage(OpHlg(output_encoding_info.luminances,
-                                   output_encoding_info.orig_intensity_target));
-  } else if (tf.Is709()) {
-    return MakeToLinearStage(MakePerChannelOp(Op709()));
-  } else if (tf.have_gamma || tf.IsDCI()) {
-    return MakeToLinearStage(
-        MakePerChannelOp(OpGamma{1.f / output_encoding_info.inverse_gamma}));
-  } else {
-    return jxl::make_unique<ToLinearStage<OpInvalid>>();
-  }
-}
-
-}  // namespace
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(GetToLinearStage);
-
-std::unique_ptr<RenderPipelineStage> GetToLinearStage(
-    const OutputEncodingInfo& output_encoding_info) {
-  return HWY_DYNAMIC_DISPATCH(GetToLinearStage)(output_encoding_info);
-}
-
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_to_linear.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_to_linear.h
deleted file mode 100644
index ccee7b09f0a66..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_to_linear.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_RENDER_PIPELINE_STAGE_TO_LINEAR_H_
-#define LIB_JXL_RENDER_PIPELINE_STAGE_TO_LINEAR_H_
-
-#include "lib/jxl/dec_xyb.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-
-namespace jxl {
-
-// Converts the color channels from `output_encoding_info.color_encoding` to
-// linear.
-std::unique_ptr<RenderPipelineStage> GetToLinearStage(
-    const OutputEncodingInfo& output_encoding_info);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_RENDER_PIPELINE_STAGE_TO_LINEAR_H_
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_tone_mapping.cc b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_tone_mapping.cc
deleted file mode 100644
index 66744e6935b63..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_tone_mapping.cc
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/render_pipeline/stage_tone_mapping.h"
-
-#include "lib/jxl/base/sanitizers.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/render_pipeline/stage_tone_mapping.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/cms/tone_mapping-inl.h"
-#include "lib/jxl/dec_xyb-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-class ToneMappingStage : public RenderPipelineStage {
- public:
-  explicit ToneMappingStage(OutputEncodingInfo output_encoding_info)
-      : RenderPipelineStage(RenderPipelineStage::Settings()),
-        output_encoding_info_(std::move(output_encoding_info)) {
-    if (output_encoding_info_.desired_intensity_target ==
-        output_encoding_info_.orig_intensity_target) {
-      // No tone mapping requested.
-      return;
-    }
-    const auto& orig_tf = output_encoding_info_.orig_color_encoding.Tf();
-    const auto& dest_tf = output_encoding_info_.color_encoding.Tf();
-    if (orig_tf.IsPQ() && output_encoding_info_.desired_intensity_target <
-                              output_encoding_info_.orig_intensity_target) {
-      tone_mapper_ = jxl::make_unique<ToneMapper>(
-          /*source_range=*/std::pair<float, float>(
-              0.0f, output_encoding_info_.orig_intensity_target),
-          /*target_range=*/
-          std::pair<float, float>(
-              0.0f, output_encoding_info_.desired_intensity_target),
-          output_encoding_info_.luminances);
-    } else if (orig_tf.IsHLG() && !dest_tf.IsHLG()) {
-      hlg_ootf_ = jxl::make_unique<HlgOOTF>(
-          /*source_luminance=*/output_encoding_info_.orig_intensity_target,
-          /*target_luminance=*/output_encoding_info_.desired_intensity_target,
-          output_encoding_info_.luminances);
-    }
-
-    if (dest_tf.IsPQ() && (tone_mapper_ || hlg_ootf_)) {
-      to_intensity_target_ =
-          10000.f / output_encoding_info_.orig_intensity_target;
-      from_desired_intensity_target_ =
-          output_encoding_info_.desired_intensity_target / 10000.f;
-    }
-  }
-
-  bool IsNeeded() const { return tone_mapper_ || hlg_ootf_; }
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    if (!tone_mapper_ && !hlg_ootf_) return true;
-    // I.e. we have tone_mapper_ or hlg_ootf_ or both.
-    // Other inveriants: !tone_mapper_ means !!hlg_ootf_ and vice-versa.
-
-    const HWY_FULL(float) d;
-    const size_t xsize_v = RoundUpTo(xsize, Lanes(d));
-    float* JXL_RESTRICT row0 = GetInputRow(input_rows, 0, 0);
-    float* JXL_RESTRICT row1 = GetInputRow(input_rows, 1, 0);
-    float* JXL_RESTRICT row2 = GetInputRow(input_rows, 2, 0);
-    // All calculations are lane-wise, still some might require
-    // value-dependent behaviour (e.g. NearestInt). Temporary unpoison last
-    // vector tail.
-    msan::UnpoisonMemory(row0 + xsize, sizeof(float) * (xsize_v - xsize));
-    msan::UnpoisonMemory(row1 + xsize, sizeof(float) * (xsize_v - xsize));
-    msan::UnpoisonMemory(row2 + xsize, sizeof(float) * (xsize_v - xsize));
-    for (ssize_t x = -xextra; x < static_cast<ssize_t>(xsize + xextra);
-         x += Lanes(d)) {
-      auto r = LoadU(d, row0 + x);
-      auto g = LoadU(d, row1 + x);
-      auto b = LoadU(d, row2 + x);
-      r = Mul(r, Set(d, to_intensity_target_));
-      g = Mul(g, Set(d, to_intensity_target_));
-      b = Mul(b, Set(d, to_intensity_target_));
-      if (tone_mapper_) {
-        tone_mapper_->ToneMap(&r, &g, &b);
-      } else {
-        hlg_ootf_->Apply(&r, &g, &b);
-      }
-      if (tone_mapper_ || hlg_ootf_->WarrantsGamutMapping()) {
-        GamutMap(&r, &g, &b, output_encoding_info_.luminances);
-      }
-      r = Mul(r, Set(d, from_desired_intensity_target_));
-      g = Mul(g, Set(d, from_desired_intensity_target_));
-      b = Mul(b, Set(d, from_desired_intensity_target_));
-      StoreU(r, d, row0 + x);
-      StoreU(g, d, row1 + x);
-      StoreU(b, d, row2 + x);
-    }
-    msan::PoisonMemory(row0 + xsize, sizeof(float) * (xsize_v - xsize));
-    msan::PoisonMemory(row1 + xsize, sizeof(float) * (xsize_v - xsize));
-    msan::PoisonMemory(row2 + xsize, sizeof(float) * (xsize_v - xsize));
-    return true;
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return c < 3 ? RenderPipelineChannelMode::kInPlace
-                 : RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "ToneMapping"; }
-
- private:
-  using ToneMapper = Rec2408ToneMapper<HWY_FULL(float)>;
-  OutputEncodingInfo output_encoding_info_;
-  std::unique_ptr<ToneMapper> tone_mapper_;
-  std::unique_ptr<HlgOOTF> hlg_ootf_;
-  // When the target colorspace is PQ, 1 represents 10000 nits instead of
-  // orig_intensity_target. This temporarily changes this if the tone mappers
-  // require it.
-  float to_intensity_target_ = 1.f;
-  float from_desired_intensity_target_ = 1.f;
-};
-
-std::unique_ptr<RenderPipelineStage> GetToneMappingStage(
-    const OutputEncodingInfo& output_encoding_info) {
-  auto stage = jxl::make_unique<ToneMappingStage>(output_encoding_info);
-  if (!stage->IsNeeded()) return nullptr;
-  return stage;
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(GetToneMappingStage);
-
-std::unique_ptr<RenderPipelineStage> GetToneMappingStage(
-    const OutputEncodingInfo& output_encoding_info) {
-  return HWY_DYNAMIC_DISPATCH(GetToneMappingStage)(output_encoding_info);
-}
-
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_tone_mapping.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_tone_mapping.h
deleted file mode 100644
index 57eb9a9abfb89..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_tone_mapping.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_RENDER_PIPELINE_STAGE_TONE_MAPPING_H_
-#define LIB_JXL_RENDER_PIPELINE_STAGE_TONE_MAPPING_H_
-#include <math.h>
-#include <stdint.h>
-
-#include <algorithm>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/dec_xyb.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-
-namespace jxl {
-
-// Tone maps the image if appropriate. It must be in linear space and
-// `output_encoding_info.luminances` must contain the luminance for the
-// primaries of that space. It must also be encoded such that (1, 1, 1)
-// represents `output_encoding_info.orig_intensity_target` nits, unless
-// `output_encoding_info.color_encoding.tf.IsPQ()`, in which case (1, 1, 1) must
-// represent 10000 nits. This corresponds to what XYBStage outputs. After this
-// stage, (1, 1, 1) will represent
-// `output_encoding_info.desired_intensity_target` nits, except in the PQ
-// special case in which it remains 10000.
-//
-// If no tone mapping is necessary, this will return nullptr.
-std::unique_ptr<RenderPipelineStage> GetToneMappingStage(
-    const OutputEncodingInfo& output_encoding_info);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_RENDER_PIPELINE_STAGE_TONE_MAPPING_H_
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_upsampling.cc b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_upsampling.cc
deleted file mode 100644
index ad31d82be7c7d..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_upsampling.cc
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/render_pipeline/stage_upsampling.h"
-
-#include "lib/jxl/base/sanitizers.h"
-#include "lib/jxl/base/status.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/render_pipeline/stage_upsampling.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/simd_util-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Clamp;
-using hwy::HWY_NAMESPACE::Max;
-using hwy::HWY_NAMESPACE::Min;
-using hwy::HWY_NAMESPACE::MulAdd;
-
-class UpsamplingStage : public RenderPipelineStage {
- public:
-  explicit UpsamplingStage(const CustomTransformData& ups_factors, size_t c,
-                           size_t shift)
-      : RenderPipelineStage(RenderPipelineStage::Settings::Symmetric(
-            /*shift=*/shift, /*border=*/2)),
-        c_(c) {
-    const float* weights = shift == 1   ? ups_factors.upsampling2_weights
-                           : shift == 2 ? ups_factors.upsampling4_weights
-                                        : ups_factors.upsampling8_weights;
-    size_t N = 1 << (shift - 1);
-    for (size_t i = 0; i < 5 * N; i++) {
-      for (size_t j = 0; j < 5 * N; j++) {
-        size_t y = std::min(i, j);
-        size_t x = std::max(i, j);
-        kernel_[j / 5][i / 5][j % 5][i % 5] =
-            weights[5 * N * y - y * (y - 1) / 2 + x - y];
-      }
-    }
-  }
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    static HWY_FULL(float) df;
-    size_t shift = settings_.shift_x;
-    size_t N = 1 << shift;
-    const size_t xsize_v = RoundUpTo(xsize, Lanes(df));
-    for (ssize_t iy = -2; iy <= 2; iy++) {
-      msan::UnpoisonMemory(GetInputRow(input_rows, c_, iy) + xsize + 2,
-                           sizeof(float) * (xsize_v - xsize));
-    }
-    JXL_ENSURE(xextra == 0);
-    ssize_t x0 = 0;
-    ssize_t x1 = xsize;
-    if (N == 2) {
-      ProcessRowImpl<2>(input_rows, output_rows, x0, x1);
-    }
-    if (N == 4) {
-      ProcessRowImpl<4>(input_rows, output_rows, x0, x1);
-    }
-    if (N == 8) {
-      ProcessRowImpl<8>(input_rows, output_rows, x0, x1);
-    }
-    for (size_t oy = 0; oy < N; oy++) {
-      float* dst_row = GetOutputRow(output_rows, c_, oy);
-      msan::PoisonMemory(dst_row + xsize * N,
-                         sizeof(float) * (xsize_v - xsize) * N);
-    }
-    return true;
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return c == c_ ? RenderPipelineChannelMode::kInOut
-                   : RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "Upsample"; }
-
- private:
-  template <size_t N>
-  JXL_INLINE float Kernel(size_t x, size_t y, ssize_t ix, ssize_t iy) const {
-    static_assert(N == 2 || N == 4 || N == 8, "N must be 2, 4, or 8");
-    ix += 2;
-    iy += 2;
-    if (N == 2) {
-      return kernel_[0][0][y % 2 ? 4 - iy : iy][x % 2 ? 4 - ix : ix];
-    }
-    if (N == 4) {
-      return kernel_[y % 4 < 2 ? y % 2 : 1 - y % 2]
-                    [x % 4 < 2 ? x % 2 : 1 - x % 2][y % 4 < 2 ? iy : 4 - iy]
-                    [x % 4 < 2 ? ix : 4 - ix];
-    }
-    if (N == 8) {
-      return kernel_[y % 8 < 4 ? y % 4 : 3 - y % 4]
-                    [x % 8 < 4 ? x % 4 : 3 - x % 4][y % 8 < 4 ? iy : 4 - iy]
-                    [x % 8 < 4 ? ix : 4 - ix];
-    }
-  }
-
-  template <ssize_t N>
-  void ProcessRowImpl(const RowInfo& input_rows, const RowInfo& output_rows,
-                      ssize_t x0, ssize_t x1) const {
-    static HWY_FULL(float) df;
-    using V = hwy::HWY_NAMESPACE::Vec<HWY_FULL(float)>;
-    V ups0, ups1, ups2, ups3, ups4, ups5, ups6, ups7;  // NOLINT
-    (void)ups2, (void)ups3, (void)ups4, (void)ups5, (void)ups6, (void)ups7;
-    // Once we have C++17 available, change this back to `V* ups[N]` and
-    // initialize using `if constexpr` below.
-    V* ups[8] = {};
-    static_assert(N == 2 || N == 4 || N == 8, "N must be 2, 4, or 8");
-    if (N >= 2) {
-      ups[0] = &ups0;
-      ups[1] = &ups1;
-    }
-    if (N >= 4) {
-      ups[2] = &ups2;
-      ups[3] = &ups3;
-    }
-    if (N == 8) {
-      ups[4] = &ups4;
-      ups[5] = &ups5;
-      ups[6] = &ups6;
-      ups[7] = &ups7;
-    }
-
-    for (size_t oy = 0; oy < N; oy++) {
-      float* dst_row = GetOutputRow(output_rows, c_, oy);
-      for (ssize_t x = x0; x < x1; x += Lanes(df)) {
-        for (size_t ox = 0; ox < N; ox++) {
-          auto result = Zero(df);
-          auto min = LoadU(df, GetInputRow(input_rows, c_, 0) + x);
-          auto max = min;
-          for (ssize_t iy = -2; iy <= 2; iy++) {
-            for (ssize_t ix = -2; ix <= 2; ix++) {
-              auto v = LoadU(df, GetInputRow(input_rows, c_, iy) + x + ix);
-              result = MulAdd(Set(df, Kernel<N>(ox, oy, ix, iy)), v, result);
-              min = Min(v, min);
-              max = Max(v, max);
-            }
-          }
-          // Avoid overshooting.
-          *ups[ox] = Clamp(result, min, max);
-        }
-        if (N == 2) {
-          StoreInterleaved(df, ups0, ups1, dst_row + x * N);
-        }
-        if (N == 4) {
-          StoreInterleaved(df, ups0, ups1, ups2, ups3, dst_row + x * N);
-        }
-        if (N == 8) {
-          StoreInterleaved(df, ups0, ups1, ups2, ups3, ups4, ups5, ups6, ups7,
-                           dst_row + x * N);
-        }
-      }
-    }
-  }
-
-  size_t c_;
-  float kernel_[4][4][5][5];
-};
-
-std::unique_ptr<RenderPipelineStage> GetUpsamplingStage(
-    const CustomTransformData& ups_factors, size_t c, size_t shift) {
-  return jxl::make_unique<UpsamplingStage>(ups_factors, c, shift);
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(GetUpsamplingStage);
-
-std::unique_ptr<RenderPipelineStage> GetUpsamplingStage(
-    const CustomTransformData& ups_factors, size_t c, size_t shift) {
-  if ((shift < 1) || (shift > 3)) {
-    JXL_DEBUG_ABORT("internal: (shift != 0) && (shift <= 3)");
-    return nullptr;
-  }
-  return HWY_DYNAMIC_DISPATCH(GetUpsamplingStage)(ups_factors, c, shift);
-}
-
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_upsampling.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_upsampling.h
deleted file mode 100644
index 7d5defd23cfc6..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_upsampling.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_RENDER_PIPELINE_STAGE_UPSAMPLING_H_
-#define LIB_JXL_RENDER_PIPELINE_STAGE_UPSAMPLING_H_
-#include <math.h>
-#include <stdint.h>
-#include <stdio.h>
-
-#include <algorithm>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-
-namespace jxl {
-
-// Upsamples the given channel by the given factor.
-std::unique_ptr<RenderPipelineStage> GetUpsamplingStage(
-    const CustomTransformData& ups_factors, size_t c, size_t shift);
-}  // namespace jxl
-
-#endif  // LIB_JXL_RENDER_PIPELINE_STAGE_UPSAMPLING_H_
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_write.cc b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_write.cc
deleted file mode 100644
index 533ff5bd48294..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_write.cc
+++ /dev/null
@@ -1,698 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/render_pipeline/stage_write.h"
-
-#include <jxl/memory_manager.h>
-
-#include <cstdint>
-#include <type_traits>
-
-#include "lib/jxl/alpha.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/sanitizers.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dec_cache.h"
-#include "lib/jxl/dec_xyb.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/memory_manager_internal.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/render_pipeline/stage_write.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::Clamp;
-using hwy::HWY_NAMESPACE::Div;
-using hwy::HWY_NAMESPACE::Max;
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::NearestInt;
-using hwy::HWY_NAMESPACE::Or;
-using hwy::HWY_NAMESPACE::Rebind;
-using hwy::HWY_NAMESPACE::ShiftLeftSame;
-using hwy::HWY_NAMESPACE::ShiftRightSame;
-using hwy::HWY_NAMESPACE::VFromD;
-
-// 8x8 ordered dithering pattern from
-// https://en.wikipedia.org/wiki/Ordered_dithering
-// scaled to have an average of 0 and be fully contained in (-0.5, 0.5).
-// Matrix is duplicated in width to avoid inconsistencies or out-of-bound-reads
-// if doing unaligned operations.
-const float kDither[(2 * 8) * 8] = {
-    -0.4921875, 0.0078125, -0.3671875, 0.1328125,  //
-    -0.4609375, 0.0390625, -0.3359375, 0.1640625,  //
-    -0.4921875, 0.0078125, -0.3671875, 0.1328125,  //
-    -0.4609375, 0.0390625, -0.3359375, 0.1640625,  //
-                                                   //
-    0.2578125, -0.2421875, 0.3828125, -0.1171875,  //
-    0.2890625, -0.2109375, 0.4140625, -0.0859375,  //
-    0.2578125, -0.2421875, 0.3828125, -0.1171875,  //
-    0.2890625, -0.2109375, 0.4140625, -0.0859375,  //
-                                                   //
-    -0.3046875, 0.1953125, -0.4296875, 0.0703125,  //
-    -0.2734375, 0.2265625, -0.3984375, 0.1015625,  //
-    -0.3046875, 0.1953125, -0.4296875, 0.0703125,  //
-    -0.2734375, 0.2265625, -0.3984375, 0.1015625,  //
-                                                   //
-    0.4453125, -0.0546875, 0.3203125, -0.1796875,  //
-    0.4765625, -0.0234375, 0.3515625, -0.1484375,  //
-    0.4453125, -0.0546875, 0.3203125, -0.1796875,  //
-    0.4765625, -0.0234375, 0.3515625, -0.1484375,  //
-                                                   //
-    -0.4453125, 0.0546875, -0.3203125, 0.1796875,  //
-    -0.4765625, 0.0234375, -0.3515625, 0.1484375,  //
-    -0.4453125, 0.0546875, -0.3203125, 0.1796875,  //
-    -0.4765625, 0.0234375, -0.3515625, 0.1484375,  //
-                                                   //
-    0.3046875, -0.1953125, 0.4296875, -0.0703125,  //
-    0.2734375, -0.2265625, 0.3984375, -0.1015625,  //
-    0.3046875, -0.1953125, 0.4296875, -0.0703125,  //
-    0.2734375, -0.2265625, 0.3984375, -0.1015625,  //
-                                                   //
-    -0.2578125, 0.2421875, -0.3828125, 0.1171875,  //
-    -0.2890625, 0.2109375, -0.4140625, 0.0859375,  //
-    -0.2578125, 0.2421875, -0.3828125, 0.1171875,  //
-    -0.2890625, 0.2109375, -0.4140625, 0.0859375,  //
-                                                   //
-    0.4921875, -0.0078125, 0.3671875, -0.1328125,  //
-    0.4609375, -0.0390625, 0.3359375, -0.1640625,  //
-    0.4921875, -0.0078125, 0.3671875, -0.1328125,  //
-    0.4609375, -0.0390625, 0.3359375, -0.1640625,  //
-};
-
-using DF = HWY_FULL(float);
-
-// Converts `v` to an appropriate value for the given unsigned type.
-// If the unsigned type is an 8-bit type, performs ordered dithering.
-template <typename T>
-VFromD<Rebind<T, DF>> MakeUnsigned(VFromD<DF> v, size_t x0, size_t y0,
-                                   VFromD<DF> mul) {
-  static_assert(std::is_unsigned<T>::value, "T must be an unsigned type");
-  using DU = Rebind<T, DF>;
-  v = Mul(v, mul);
-  // TODO(veluca): if constexpr with C++17
-  if (sizeof(T) == 1) {
-    size_t pos = (y0 % 8) * (2 * 8) + (x0 % 8);
-#if HWY_TARGET != HWY_SCALAR
-    auto dither = LoadDup128(DF(), kDither + pos);
-#else
-    auto dither = LoadU(DF(), kDither + pos);
-#endif
-    v = Add(v, dither);
-  }
-  v = Clamp(Zero(DF()), v, mul);
-  return DemoteTo(DU(), NearestInt(v));
-}
-
-class WriteToOutputStage : public RenderPipelineStage {
- public:
-  WriteToOutputStage(const ImageOutput& main_output, size_t width,
-                     size_t height, bool has_alpha, bool unpremul_alpha,
-                     size_t alpha_c, Orientation undo_orientation,
-                     const std::vector<ImageOutput>& extra_output,
-                     JxlMemoryManager* memory_manager)
-      : RenderPipelineStage(RenderPipelineStage::Settings()),
-        width_(width),
-        height_(height),
-        main_(main_output),
-        num_color_(main_.num_channels_ < 3 ? 1 : 3),
-        want_alpha_(main_.num_channels_ == 2 || main_.num_channels_ == 4),
-        has_alpha_(has_alpha),
-        unpremul_alpha_(unpremul_alpha),
-        alpha_c_(alpha_c),
-        flip_x_(ShouldFlipX(undo_orientation)),
-        flip_y_(ShouldFlipY(undo_orientation)),
-        transpose_(ShouldTranspose(undo_orientation)),
-        opaque_alpha_(kMaxPixelsPerCall, 1.0f),
-        memory_manager_(memory_manager) {
-    for (size_t ec = 0; ec < extra_output.size(); ++ec) {
-      if (extra_output[ec].callback.IsPresent() || extra_output[ec].buffer) {
-        Output extra(extra_output[ec]);
-        extra.channel_index_ = 3 + ec;
-        extra_channels_.push_back(extra);
-      }
-    }
-  }
-
-  WriteToOutputStage(const WriteToOutputStage&) = delete;
-  WriteToOutputStage& operator=(const WriteToOutputStage&) = delete;
-  WriteToOutputStage(WriteToOutputStage&&) = delete;
-  WriteToOutputStage& operator=(WriteToOutputStage&&) = delete;
-
-  ~WriteToOutputStage() override {
-    if (main_.run_opaque_) {
-      main_.pixel_callback_.destroy(main_.run_opaque_);
-    }
-    for (auto& extra : extra_channels_) {
-      if (extra.run_opaque_) {
-        extra.pixel_callback_.destroy(extra.run_opaque_);
-      }
-    }
-  }
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    JXL_ENSURE(xextra == 0);
-    JXL_ENSURE(main_.run_opaque_ || main_.buffer_);
-    if (ypos >= height_) return true;
-    if (xpos >= width_) return true;
-    if (flip_y_) {
-      ypos = height_ - 1u - ypos;
-    }
-    size_t limit = std::min(xsize, width_ - xpos);
-    for (size_t x0 = 0; x0 < limit; x0 += kMaxPixelsPerCall) {
-      size_t xstart = xpos + x0;
-      size_t len = std::min<size_t>(kMaxPixelsPerCall, limit - x0);
-
-      const float* line_buffers[4];
-      for (size_t c = 0; c < num_color_; c++) {
-        line_buffers[c] = GetInputRow(input_rows, c, 0) + x0;
-      }
-      if (has_alpha_) {
-        line_buffers[num_color_] = GetInputRow(input_rows, alpha_c_, 0) + x0;
-      } else {
-        // opaque_alpha_ is a way to set all values to 1.0f.
-        line_buffers[num_color_] = opaque_alpha_.data();
-      }
-      if (has_alpha_ && want_alpha_ && unpremul_alpha_) {
-        UnpremulAlpha(thread_id, len, line_buffers);
-      }
-      OutputBuffers(main_, thread_id, ypos, xstart, len, line_buffers);
-      for (const auto& extra : extra_channels_) {
-        line_buffers[0] = GetInputRow(input_rows, extra.channel_index_, 0) + x0;
-        OutputBuffers(extra, thread_id, ypos, xstart, len, line_buffers);
-      }
-    }
-    return true;
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    if (c < num_color_ || (has_alpha_ && c == alpha_c_)) {
-      return RenderPipelineChannelMode::kInput;
-    }
-    for (const auto& extra : extra_channels_) {
-      if (c == extra.channel_index_) {
-        return RenderPipelineChannelMode::kInput;
-      }
-    }
-    return RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "WritePixelCB"; }
-
- private:
-  struct Output {
-    explicit Output(const ImageOutput& image_out)
-        : pixel_callback_(image_out.callback),
-          buffer_(image_out.buffer),
-          buffer_size_(image_out.buffer_size),
-          stride_(image_out.stride),
-          num_channels_(image_out.format.num_channels),
-          swap_endianness_(SwapEndianness(image_out.format.endianness)),
-          data_type_(image_out.format.data_type),
-          bits_per_sample_(image_out.bits_per_sample) {}
-
-    Status PrepareForThreads(size_t num_threads) {
-      if (pixel_callback_.IsPresent()) {
-        run_opaque_ =
-            pixel_callback_.Init(num_threads, /*num_pixels=*/kMaxPixelsPerCall);
-        JXL_RETURN_IF_ERROR(run_opaque_ != nullptr);
-      } else {
-        JXL_RETURN_IF_ERROR(buffer_ != nullptr);
-      }
-      return true;
-    }
-
-    PixelCallback pixel_callback_;
-    void* run_opaque_ = nullptr;
-    void* buffer_ = nullptr;
-    size_t buffer_size_;
-    size_t stride_;
-    size_t num_channels_;
-    bool swap_endianness_;
-    JxlDataType data_type_;
-    size_t bits_per_sample_;
-    size_t channel_index_;  // used for extra_channels
-  };
-
-  Status PrepareForThreads(size_t num_threads) override {
-    JXL_RETURN_IF_ERROR(main_.PrepareForThreads(num_threads));
-    for (auto& extra : extra_channels_) {
-      JXL_RETURN_IF_ERROR(extra.PrepareForThreads(num_threads));
-    }
-    temp_out_.resize(num_threads);
-    for (AlignedMemory& temp : temp_out_) {
-      size_t alloc_size =
-          sizeof(float) * kMaxPixelsPerCall * main_.num_channels_;
-      JXL_ASSIGN_OR_RETURN(temp,
-                           AlignedMemory::Create(memory_manager_, alloc_size));
-    }
-    if ((has_alpha_ && want_alpha_ && unpremul_alpha_) || flip_x_) {
-      temp_in_.resize(num_threads * main_.num_channels_);
-      for (AlignedMemory& temp : temp_in_) {
-        size_t alloc_size = sizeof(float) * kMaxPixelsPerCall;
-        JXL_ASSIGN_OR_RETURN(
-            temp, AlignedMemory::Create(memory_manager_, alloc_size));
-      }
-    }
-    return true;
-  }
-  static bool ShouldFlipX(Orientation undo_orientation) {
-    return (undo_orientation == Orientation::kFlipHorizontal ||
-            undo_orientation == Orientation::kRotate180 ||
-            undo_orientation == Orientation::kRotate270 ||
-            undo_orientation == Orientation::kAntiTranspose);
-  }
-  static bool ShouldFlipY(Orientation undo_orientation) {
-    return (undo_orientation == Orientation::kFlipVertical ||
-            undo_orientation == Orientation::kRotate180 ||
-            undo_orientation == Orientation::kRotate90 ||
-            undo_orientation == Orientation::kAntiTranspose);
-  }
-  static bool ShouldTranspose(Orientation undo_orientation) {
-    return (undo_orientation == Orientation::kTranspose ||
-            undo_orientation == Orientation::kRotate90 ||
-            undo_orientation == Orientation::kRotate270 ||
-            undo_orientation == Orientation::kAntiTranspose);
-  }
-
-  void UnpremulAlpha(size_t thread_id, size_t len,
-                     const float** line_buffers) const {
-    const HWY_FULL(float) d;
-    auto one = Set(d, 1.0f);
-    float* temp_in[4];
-    for (size_t c = 0; c < main_.num_channels_; ++c) {
-      size_t tix = thread_id * main_.num_channels_ + c;
-      temp_in[c] = temp_in_[tix].address<float>();
-      memcpy(temp_in[c], line_buffers[c], sizeof(float) * len);
-    }
-    auto small_alpha = Set(d, kSmallAlpha);
-    for (size_t ix = 0; ix < len; ix += Lanes(d)) {
-      auto alpha = LoadU(d, temp_in[num_color_] + ix);
-      auto mul = Div(one, Max(small_alpha, alpha));
-      for (size_t c = 0; c < num_color_; ++c) {
-        auto val = LoadU(d, temp_in[c] + ix);
-        StoreU(Mul(val, mul), d, temp_in[c] + ix);
-      }
-    }
-    for (size_t c = 0; c < main_.num_channels_; ++c) {
-      line_buffers[c] = temp_in[c];
-    }
-  }
-
-  void OutputBuffers(const Output& out, size_t thread_id, size_t ypos,
-                     size_t xstart, size_t len, const float* input[4]) const {
-    if (flip_x_) {
-      FlipX(out, thread_id, len, &xstart, input);
-    }
-    if (out.data_type_ == JXL_TYPE_UINT8) {
-      uint8_t* JXL_RESTRICT temp = temp_out_[thread_id].address<uint8_t>();
-      StoreUnsignedRow(out, input, len, temp, xstart, ypos);
-      WriteToOutput(out, thread_id, ypos, xstart, len, temp);
-    } else if (out.data_type_ == JXL_TYPE_UINT16 ||
-               out.data_type_ == JXL_TYPE_FLOAT16) {
-      uint16_t* JXL_RESTRICT temp = temp_out_[thread_id].address<uint16_t>();
-      if (out.data_type_ == JXL_TYPE_UINT16) {
-        StoreUnsignedRow(out, input, len, temp, xstart, ypos);
-      } else {
-        StoreFloat16Row(out, input, len, temp);
-      }
-      if (out.swap_endianness_) {
-        const HWY_FULL(uint16_t) du;
-        size_t output_len = len * out.num_channels_;
-        for (size_t j = 0; j < output_len; j += Lanes(du)) {
-          auto v = LoadU(du, temp + j);
-          auto vswap = Or(ShiftRightSame(v, 8), ShiftLeftSame(v, 8));
-          StoreU(vswap, du, temp + j);
-        }
-      }
-      WriteToOutput(out, thread_id, ypos, xstart, len, temp);
-    } else if (out.data_type_ == JXL_TYPE_FLOAT) {
-      float* JXL_RESTRICT temp = temp_out_[thread_id].address<float>();
-      StoreFloatRow(out, input, len, temp);
-      if (out.swap_endianness_) {
-        size_t output_len = len * out.num_channels_;
-        for (size_t j = 0; j < output_len; ++j) {
-          temp[j] = BSwapFloat(temp[j]);
-        }
-      }
-      WriteToOutput(out, thread_id, ypos, xstart, len, temp);
-    }
-  }
-
-  void FlipX(const Output& out, size_t thread_id, size_t len, size_t* xstart,
-             const float** line_buffers) const {
-    float* temp_in[4];
-    for (size_t c = 0; c < out.num_channels_; ++c) {
-      size_t tix = thread_id * main_.num_channels_ + c;
-      temp_in[c] = temp_in_[tix].address<float>();
-      if (temp_in[c] != line_buffers[c]) {
-        memcpy(temp_in[c], line_buffers[c], sizeof(float) * len);
-      }
-    }
-    size_t last = (len - 1u);
-    size_t num = (len / 2);
-    for (size_t i = 0; i < num; ++i) {
-      for (size_t c = 0; c < out.num_channels_; ++c) {
-        std::swap(temp_in[c][i], temp_in[c][last - i]);
-      }
-    }
-    for (size_t c = 0; c < out.num_channels_; ++c) {
-      line_buffers[c] = temp_in[c];
-    }
-    *xstart = width_ - *xstart - len;
-  }
-
-  template <typename T>
-  void StoreUnsignedRow(const Output& out, const float* input[4], size_t len,
-                        T* output, size_t xstart, size_t ypos) const {
-    const HWY_FULL(float) d;
-    auto mul = Set(d, (1u << (out.bits_per_sample_)) - 1);
-    const Rebind<T, decltype(d)> du;
-    const size_t padding = RoundUpTo(len, Lanes(d)) - len;
-    for (size_t c = 0; c < out.num_channels_; ++c) {
-      msan::UnpoisonMemory(input[c] + len, sizeof(input[c][0]) * padding);
-    }
-    if (out.num_channels_ == 1) {
-      for (size_t i = 0; i < len; i += Lanes(d)) {
-        StoreU(MakeUnsigned<T>(LoadU(d, &input[0][i]), xstart + i, ypos, mul),
-               du, &output[i]);
-      }
-    } else if (out.num_channels_ == 2) {
-      for (size_t i = 0; i < len; i += Lanes(d)) {
-        StoreInterleaved2(
-            MakeUnsigned<T>(LoadU(d, &input[0][i]), xstart + i, ypos, mul),
-            MakeUnsigned<T>(LoadU(d, &input[1][i]), xstart + i, ypos, mul), du,
-            &output[2 * i]);
-      }
-    } else if (out.num_channels_ == 3) {
-      for (size_t i = 0; i < len; i += Lanes(d)) {
-        StoreInterleaved3(
-            MakeUnsigned<T>(LoadU(d, &input[0][i]), xstart + i, ypos, mul),
-            MakeUnsigned<T>(LoadU(d, &input[1][i]), xstart + i, ypos, mul),
-            MakeUnsigned<T>(LoadU(d, &input[2][i]), xstart + i, ypos, mul), du,
-            &output[3 * i]);
-      }
-    } else if (out.num_channels_ == 4) {
-      for (size_t i = 0; i < len; i += Lanes(d)) {
-        StoreInterleaved4(
-            MakeUnsigned<T>(LoadU(d, &input[0][i]), xstart + i, ypos, mul),
-            MakeUnsigned<T>(LoadU(d, &input[1][i]), xstart + i, ypos, mul),
-            MakeUnsigned<T>(LoadU(d, &input[2][i]), xstart + i, ypos, mul),
-            MakeUnsigned<T>(LoadU(d, &input[3][i]), xstart + i, ypos, mul), du,
-            &output[4 * i]);
-      }
-    }
-    msan::PoisonMemory(output + out.num_channels_ * len,
-                       sizeof(output[0]) * out.num_channels_ * padding);
-  }
-
-  static void StoreFloat16Row(const Output& out, const float* input[4],
-                              size_t len, uint16_t* output) {
-    const HWY_FULL(float) d;
-    const Rebind<uint16_t, decltype(d)> du;
-    const Rebind<hwy::float16_t, decltype(d)> df16;
-    const size_t padding = RoundUpTo(len, Lanes(d)) - len;
-    for (size_t c = 0; c < out.num_channels_; ++c) {
-      msan::UnpoisonMemory(input[c] + len, sizeof(input[c][0]) * padding);
-    }
-    if (out.num_channels_ == 1) {
-      for (size_t i = 0; i < len; i += Lanes(d)) {
-        auto v0 = LoadU(d, &input[0][i]);
-        StoreU(BitCast(du, DemoteTo(df16, v0)), du, &output[i]);
-      }
-    } else if (out.num_channels_ == 2) {
-      for (size_t i = 0; i < len; i += Lanes(d)) {
-        auto v0 = LoadU(d, &input[0][i]);
-        auto v1 = LoadU(d, &input[1][i]);
-        StoreInterleaved2(BitCast(du, DemoteTo(df16, v0)),
-                          BitCast(du, DemoteTo(df16, v1)), du, &output[2 * i]);
-      }
-    } else if (out.num_channels_ == 3) {
-      for (size_t i = 0; i < len; i += Lanes(d)) {
-        auto v0 = LoadU(d, &input[0][i]);
-        auto v1 = LoadU(d, &input[1][i]);
-        auto v2 = LoadU(d, &input[2][i]);
-        StoreInterleaved3(BitCast(du, DemoteTo(df16, v0)),
-                          BitCast(du, DemoteTo(df16, v1)),
-                          BitCast(du, DemoteTo(df16, v2)), du, &output[3 * i]);
-      }
-    } else if (out.num_channels_ == 4) {
-      for (size_t i = 0; i < len; i += Lanes(d)) {
-        auto v0 = LoadU(d, &input[0][i]);
-        auto v1 = LoadU(d, &input[1][i]);
-        auto v2 = LoadU(d, &input[2][i]);
-        auto v3 = LoadU(d, &input[3][i]);
-        StoreInterleaved4(BitCast(du, DemoteTo(df16, v0)),
-                          BitCast(du, DemoteTo(df16, v1)),
-                          BitCast(du, DemoteTo(df16, v2)),
-                          BitCast(du, DemoteTo(df16, v3)), du, &output[4 * i]);
-      }
-    }
-    msan::PoisonMemory(output + out.num_channels_ * len,
-                       sizeof(output[0]) * out.num_channels_ * padding);
-  }
-
-  static void StoreFloatRow(const Output& out, const float* input[4],
-                            size_t len, float* output) {
-    const HWY_FULL(float) d;
-    if (out.num_channels_ == 1) {
-      memcpy(output, input[0], len * sizeof(output[0]));
-    } else if (out.num_channels_ == 2) {
-      for (size_t i = 0; i < len; i += Lanes(d)) {
-        StoreInterleaved2(LoadU(d, &input[0][i]), LoadU(d, &input[1][i]), d,
-                          &output[2 * i]);
-      }
-    } else if (out.num_channels_ == 3) {
-      for (size_t i = 0; i < len; i += Lanes(d)) {
-        StoreInterleaved3(LoadU(d, &input[0][i]), LoadU(d, &input[1][i]),
-                          LoadU(d, &input[2][i]), d, &output[3 * i]);
-      }
-    } else {
-      for (size_t i = 0; i < len; i += Lanes(d)) {
-        StoreInterleaved4(LoadU(d, &input[0][i]), LoadU(d, &input[1][i]),
-                          LoadU(d, &input[2][i]), LoadU(d, &input[3][i]), d,
-                          &output[4 * i]);
-      }
-    }
-  }
-
-  template <typename T>
-  void WriteToOutput(const Output& out, size_t thread_id, size_t ypos,
-                     size_t xstart, size_t len, T* output) const {
-    if (transpose_) {
-      // TODO(szabadka) Buffer 8x8 chunks and transpose with SIMD.
-      if (out.run_opaque_) {
-        for (size_t i = 0, j = 0; i < len; ++i, j += out.num_channels_) {
-          out.pixel_callback_.run(out.run_opaque_, thread_id, ypos, xstart + i,
-                                  1, output + j);
-        }
-      } else {
-        const size_t pixel_stride = out.num_channels_ * sizeof(T);
-        const size_t offset = xstart * out.stride_ + ypos * pixel_stride;
-        for (size_t i = 0, j = 0; i < len; ++i, j += out.num_channels_) {
-          const size_t ix = offset + i * out.stride_;
-          JXL_DASSERT(ix + pixel_stride <= out.buffer_size_);
-          memcpy(reinterpret_cast<uint8_t*>(out.buffer_) + ix, output + j,
-                 pixel_stride);
-        }
-      }
-    } else {
-      if (out.run_opaque_) {
-        out.pixel_callback_.run(out.run_opaque_, thread_id, xstart, ypos, len,
-                                output);
-      } else {
-        const size_t pixel_stride = out.num_channels_ * sizeof(T);
-        const size_t offset = ypos * out.stride_ + xstart * pixel_stride;
-        JXL_DASSERT(offset + len * pixel_stride <= out.buffer_size_);
-        memcpy(reinterpret_cast<uint8_t*>(out.buffer_) + offset, output,
-               len * pixel_stride);
-      }
-    }
-  }
-
-  static constexpr size_t kMaxPixelsPerCall = 1024;
-  size_t width_;
-  size_t height_;
-  Output main_;  // color + alpha
-  size_t num_color_;
-  bool want_alpha_;
-  bool has_alpha_;
-  bool unpremul_alpha_;
-  size_t alpha_c_;
-  bool flip_x_;
-  bool flip_y_;
-  bool transpose_;
-  std::vector<Output> extra_channels_;
-  std::vector<float> opaque_alpha_;
-  JxlMemoryManager* memory_manager_;
-  std::vector<AlignedMemory> temp_in_;
-  std::vector<AlignedMemory> temp_out_;
-};
-
-#if JXL_CXX_LANG < JXL_CXX_17
-constexpr size_t WriteToOutputStage::kMaxPixelsPerCall;
-#endif
-
-std::unique_ptr<RenderPipelineStage> GetWriteToOutputStage(
-    const ImageOutput& main_output, size_t width, size_t height, bool has_alpha,
-    bool unpremul_alpha, size_t alpha_c, Orientation undo_orientation,
-    std::vector<ImageOutput>& extra_output, JxlMemoryManager* memory_manager) {
-  return jxl::make_unique<WriteToOutputStage>(
-      main_output, width, height, has_alpha, unpremul_alpha, alpha_c,
-      undo_orientation, extra_output, memory_manager);
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-
-namespace jxl {
-
-HWY_EXPORT(GetWriteToOutputStage);
-
-namespace {
-class WriteToImageBundleStage : public RenderPipelineStage {
- public:
-  explicit WriteToImageBundleStage(
-      ImageBundle* image_bundle, const OutputEncodingInfo& output_encoding_info)
-      : RenderPipelineStage(RenderPipelineStage::Settings()),
-        image_bundle_(image_bundle),
-        color_encoding_(output_encoding_info.color_encoding) {}
-
-  Status SetInputSizes(
-      const std::vector<std::pair<size_t, size_t>>& input_sizes) override {
-    JxlMemoryManager* memory_manager = image_bundle_->memory_manager();
-    JXL_ENSURE(input_sizes.size() >= 3);
-    for (size_t c = 1; c < input_sizes.size(); c++) {
-      JXL_ENSURE(input_sizes[c].first == input_sizes[0].first);
-      JXL_ENSURE(input_sizes[c].second == input_sizes[0].second);
-    }
-    // TODO(eustas): what should we do in the case of "want only ECs"?
-    JXL_ASSIGN_OR_RETURN(Image3F tmp,
-                         Image3F::Create(memory_manager, input_sizes[0].first,
-                                         input_sizes[0].second));
-    JXL_RETURN_IF_ERROR(
-        image_bundle_->SetFromImage(std::move(tmp), color_encoding_));
-    // TODO(veluca): consider not reallocating ECs if not needed.
-    image_bundle_->extra_channels().clear();
-    for (size_t c = 3; c < input_sizes.size(); c++) {
-      JXL_ASSIGN_OR_RETURN(ImageF ch,
-                           ImageF::Create(memory_manager, input_sizes[c].first,
-                                          input_sizes[c].second));
-      image_bundle_->extra_channels().emplace_back(std::move(ch));
-    }
-    return true;
-  }
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    for (size_t c = 0; c < 3; c++) {
-      memcpy(image_bundle_->color()->PlaneRow(c, ypos) + xpos - xextra,
-             GetInputRow(input_rows, c, 0) - xextra,
-             sizeof(float) * (xsize + 2 * xextra));
-    }
-    for (size_t ec = 0; ec < image_bundle_->extra_channels().size(); ec++) {
-      JXL_ENSURE(image_bundle_->extra_channels()[ec].xsize() >=
-                 xpos + xsize + xextra);
-      memcpy(image_bundle_->extra_channels()[ec].Row(ypos) + xpos - xextra,
-             GetInputRow(input_rows, 3 + ec, 0) - xextra,
-             sizeof(float) * (xsize + 2 * xextra));
-    }
-    return true;
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return RenderPipelineChannelMode::kInput;
-  }
-
-  const char* GetName() const override { return "WriteIB"; }
-
- private:
-  ImageBundle* image_bundle_;
-  ColorEncoding color_encoding_;
-};
-
-class WriteToImage3FStage : public RenderPipelineStage {
- public:
-  WriteToImage3FStage(JxlMemoryManager* memory_manager, Image3F* image)
-      : RenderPipelineStage(RenderPipelineStage::Settings()),
-        memory_manager_(memory_manager),
-        image_(image) {}
-
-  Status SetInputSizes(
-      const std::vector<std::pair<size_t, size_t>>& input_sizes) override {
-    JXL_ENSURE(input_sizes.size() >= 3);
-    for (size_t c = 1; c < 3; ++c) {
-      JXL_ENSURE(input_sizes[c].first == input_sizes[0].first);
-      JXL_ENSURE(input_sizes[c].second == input_sizes[0].second);
-    }
-    JXL_ASSIGN_OR_RETURN(*image_,
-                         Image3F::Create(memory_manager_, input_sizes[0].first,
-                                         input_sizes[0].second));
-    return true;
-  }
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    for (size_t c = 0; c < 3; c++) {
-      memcpy(image_->PlaneRow(c, ypos) + xpos - xextra,
-             GetInputRow(input_rows, c, 0) - xextra,
-             sizeof(float) * (xsize + 2 * xextra));
-    }
-    return true;
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return c < 3 ? RenderPipelineChannelMode::kInput
-                 : RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "WriteI3F"; }
-
- private:
-  JxlMemoryManager* memory_manager_;
-  Image3F* image_;
-};
-
-}  // namespace
-
-std::unique_ptr<RenderPipelineStage> GetWriteToImageBundleStage(
-    ImageBundle* image_bundle, const OutputEncodingInfo& output_encoding_info) {
-  return jxl::make_unique<WriteToImageBundleStage>(image_bundle,
-                                                   output_encoding_info);
-}
-
-std::unique_ptr<RenderPipelineStage> GetWriteToImage3FStage(
-    JxlMemoryManager* memory_manager, Image3F* image) {
-  return jxl::make_unique<WriteToImage3FStage>(memory_manager, image);
-}
-
-std::unique_ptr<RenderPipelineStage> GetWriteToOutputStage(
-    const ImageOutput& main_output, size_t width, size_t height, bool has_alpha,
-    bool unpremul_alpha, size_t alpha_c, Orientation undo_orientation,
-    std::vector<ImageOutput>& extra_output, JxlMemoryManager* memory_manager) {
-  return HWY_DYNAMIC_DISPATCH(GetWriteToOutputStage)(
-      main_output, width, height, has_alpha, unpremul_alpha, alpha_c,
-      undo_orientation, extra_output, memory_manager);
-}
-
-}  // namespace jxl
-
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_write.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_write.h
deleted file mode 100644
index 9a7f2dbb10456..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_write.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_RENDER_PIPELINE_STAGE_WRITE_H_
-#define LIB_JXL_RENDER_PIPELINE_STAGE_WRITE_H_
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <memory>
-#include <vector>
-
-#include "lib/jxl/dec_cache.h"
-#include "lib/jxl/dec_xyb.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/image_metadata.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-
-namespace jxl {
-
-std::unique_ptr<RenderPipelineStage> GetWriteToImageBundleStage(
-    ImageBundle* image_bundle, const OutputEncodingInfo& output_encoding_info);
-
-// Gets a stage to write color channels to an Image3F.
-std::unique_ptr<RenderPipelineStage> GetWriteToImage3FStage(
-    JxlMemoryManager* memory_manager, Image3F* image);
-
-// Gets a stage to write to a pixel callback or image buffer.
-std::unique_ptr<RenderPipelineStage> GetWriteToOutputStage(
-    const ImageOutput& main_output, size_t width, size_t height, bool has_alpha,
-    bool unpremul_alpha, size_t alpha_c, Orientation undo_orientation,
-    std::vector<ImageOutput>& extra_output, JxlMemoryManager* memory_manager);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_RENDER_PIPELINE_STAGE_WRITE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_xyb.cc b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_xyb.cc
deleted file mode 100644
index 74d2899e5880f..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_xyb.cc
+++ /dev/null
@@ -1,182 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/render_pipeline/stage_xyb.h"
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/sanitizers.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/render_pipeline/stage_xyb.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/cms/opsin_params.h"
-#include "lib/jxl/common.h"  // JXL_HIGH_PRECISION
-#include "lib/jxl/dec_xyb-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-class XYBStage : public RenderPipelineStage {
- public:
-  explicit XYBStage(const OutputEncodingInfo& output_encoding_info)
-      : RenderPipelineStage(RenderPipelineStage::Settings()),
-        opsin_params_(output_encoding_info.opsin_params),
-        output_is_xyb_(output_encoding_info.color_encoding.GetColorSpace() ==
-                       ColorSpace::kXYB) {}
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    const HWY_FULL(float) d;
-    JXL_ENSURE(xextra == 0);
-    const size_t xsize_v = RoundUpTo(xsize, Lanes(d));
-    float* JXL_RESTRICT row0 = GetInputRow(input_rows, 0, 0);
-    float* JXL_RESTRICT row1 = GetInputRow(input_rows, 1, 0);
-    float* JXL_RESTRICT row2 = GetInputRow(input_rows, 2, 0);
-    // All calculations are lane-wise, still some might require
-    // value-dependent behaviour (e.g. NearestInt). Temporary unpoison last
-    // vector tail.
-    msan::UnpoisonMemory(row0 + xsize, sizeof(float) * (xsize_v - xsize));
-    msan::UnpoisonMemory(row1 + xsize, sizeof(float) * (xsize_v - xsize));
-    msan::UnpoisonMemory(row2 + xsize, sizeof(float) * (xsize_v - xsize));
-    // TODO(eustas): when using frame origin, addresses might be unaligned;
-    //               making them aligned will void performance penalty.
-    if (output_is_xyb_) {
-      const auto scale_x = Set(d, jxl::cms::kScaledXYBScale[0]);
-      const auto scale_y = Set(d, jxl::cms::kScaledXYBScale[1]);
-      const auto scale_bmy = Set(d, jxl::cms::kScaledXYBScale[2]);
-      const auto offset_x = Set(d, jxl::cms::kScaledXYBOffset[0]);
-      const auto offset_y = Set(d, jxl::cms::kScaledXYBOffset[1]);
-      const auto offset_bmy = Set(d, jxl::cms::kScaledXYBOffset[2]);
-      for (ssize_t x = -xextra; x < static_cast<ssize_t>(xsize + xextra);
-           x += Lanes(d)) {
-        const auto in_x = LoadU(d, row0 + x);
-        const auto in_y = LoadU(d, row1 + x);
-        const auto in_b = LoadU(d, row2 + x);
-        auto out_x = Mul(Add(in_x, offset_x), scale_x);
-        auto out_y = Mul(Add(in_y, offset_y), scale_y);
-        auto out_b = Mul(Add(Sub(in_b, in_y), offset_bmy), scale_bmy);
-        StoreU(out_x, d, row0 + x);
-        StoreU(out_y, d, row1 + x);
-        StoreU(out_b, d, row2 + x);
-      }
-    } else {
-      for (ssize_t x = -xextra; x < static_cast<ssize_t>(xsize + xextra);
-           x += Lanes(d)) {
-        const auto in_opsin_x = LoadU(d, row0 + x);
-        const auto in_opsin_y = LoadU(d, row1 + x);
-        const auto in_opsin_b = LoadU(d, row2 + x);
-        auto r = Undefined(d);
-        auto g = Undefined(d);
-        auto b = Undefined(d);
-        XybToRgb(d, in_opsin_x, in_opsin_y, in_opsin_b, opsin_params_, &r, &g,
-                 &b);
-        StoreU(r, d, row0 + x);
-        StoreU(g, d, row1 + x);
-        StoreU(b, d, row2 + x);
-      }
-    }
-    msan::PoisonMemory(row0 + xsize, sizeof(float) * (xsize_v - xsize));
-    msan::PoisonMemory(row1 + xsize, sizeof(float) * (xsize_v - xsize));
-    msan::PoisonMemory(row2 + xsize, sizeof(float) * (xsize_v - xsize));
-    return true;
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return c < 3 ? RenderPipelineChannelMode::kInPlace
-                 : RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "XYB"; }
-
- private:
-  const OpsinParams opsin_params_;
-  const bool output_is_xyb_;
-};
-
-std::unique_ptr<RenderPipelineStage> GetXYBStage(
-    const OutputEncodingInfo& output_encoding_info) {
-  return jxl::make_unique<XYBStage>(output_encoding_info);
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(GetXYBStage);
-
-std::unique_ptr<RenderPipelineStage> GetXYBStage(
-    const OutputEncodingInfo& output_encoding_info) {
-  return HWY_DYNAMIC_DISPATCH(GetXYBStage)(output_encoding_info);
-}
-
-#if !JXL_HIGH_PRECISION
-namespace {
-class FastXYBStage : public RenderPipelineStage {
- public:
-  FastXYBStage(uint8_t* rgb, size_t stride, size_t width, size_t height,
-               bool rgba, bool has_alpha, size_t alpha_c)
-      : RenderPipelineStage(RenderPipelineStage::Settings()),
-        rgb_(rgb),
-        stride_(stride),
-        width_(width),
-        height_(height),
-        rgba_(rgba),
-        has_alpha_(has_alpha),
-        alpha_c_(alpha_c) {}
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    if (ypos >= height_) return true;
-    JXL_ENSURE(xextra == 0);
-    const float* xyba[4] = {
-        GetInputRow(input_rows, 0, 0), GetInputRow(input_rows, 1, 0),
-        GetInputRow(input_rows, 2, 0),
-        has_alpha_ ? GetInputRow(input_rows, alpha_c_, 0) : nullptr};
-    uint8_t* out_buf = rgb_ + stride_ * ypos + (rgba_ ? 4 : 3) * xpos;
-    return FastXYBTosRGB8(xyba, out_buf, rgba_,
-                          xsize + xpos <= width_ ? xsize : width_ - xpos);
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return c < 3 || (has_alpha_ && c == alpha_c_)
-               ? RenderPipelineChannelMode::kInput
-               : RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "FastXYB"; }
-
- private:
-  uint8_t* rgb_;
-  size_t stride_;
-  size_t width_;
-  size_t height_;
-  bool rgba_;
-  bool has_alpha_;
-  size_t alpha_c_;
-  std::vector<float> opaque_alpha_;
-};
-
-}  // namespace
-
-std::unique_ptr<RenderPipelineStage> GetFastXYBTosRGB8Stage(
-    uint8_t* rgb, size_t stride, size_t width, size_t height, bool rgba,
-    bool has_alpha, size_t alpha_c) {
-  if (!HasFastXYBTosRGB8()) return nullptr;
-  return make_unique<FastXYBStage>(rgb, stride, width, height, rgba, has_alpha,
-                                   alpha_c);
-}
-#endif
-
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_xyb.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_xyb.h
deleted file mode 100644
index 7b06345c366f8..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_xyb.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_RENDER_PIPELINE_STAGE_XYB_H_
-#define LIB_JXL_RENDER_PIPELINE_STAGE_XYB_H_
-#include <stdint.h>
-
-#include "lib/jxl/dec_xyb.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-
-namespace jxl {
-
-// Converts the color channels from XYB to linear with appropriate primaries.
-std::unique_ptr<RenderPipelineStage> GetXYBStage(
-    const OutputEncodingInfo& output_encoding_info);
-
-// Gets a stage to convert with fixed point arithmetic from XYB to sRGB8 and
-// write to a uint8 buffer.
-std::unique_ptr<RenderPipelineStage> GetFastXYBTosRGB8Stage(
-    uint8_t* rgb, size_t stride, size_t width, size_t height, bool rgba,
-    bool has_alpha, size_t alpha_c);
-}  // namespace jxl
-
-#endif  // LIB_JXL_RENDER_PIPELINE_STAGE_XYB_H_
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_ycbcr.cc b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_ycbcr.cc
deleted file mode 100644
index f21a00c728f03..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_ycbcr.cc
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/render_pipeline/stage_ycbcr.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/render_pipeline/stage_ycbcr.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::MulAdd;
-
-class kYCbCrStage : public RenderPipelineStage {
- public:
-  kYCbCrStage() : RenderPipelineStage(RenderPipelineStage::Settings()) {}
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    const HWY_FULL(float) df;
-
-    // Full-range BT.601 as defined by JFIF Clause 7:
-    // https://www.itu.int/rec/T-REC-T.871-201105-I/en
-    const auto c128 = Set(df, 128.0f / 255);
-    const auto crcr = Set(df, 1.402f);
-    const auto cgcb = Set(df, -0.114f * 1.772f / 0.587f);
-    const auto cgcr = Set(df, -0.299f * 1.402f / 0.587f);
-    const auto cbcb = Set(df, 1.772f);
-
-    float* JXL_RESTRICT row0 = GetInputRow(input_rows, 0, 0);
-    float* JXL_RESTRICT row1 = GetInputRow(input_rows, 1, 0);
-    float* JXL_RESTRICT row2 = GetInputRow(input_rows, 2, 0);
-    // TODO(eustas): when using frame origin, addresses might be unaligned;
-    //               making them aligned will void performance penalty.
-    for (size_t x = 0; x < xsize; x += Lanes(df)) {
-      const auto y_vec = Add(LoadU(df, row1 + x), c128);
-      const auto cb_vec = LoadU(df, row0 + x);
-      const auto cr_vec = LoadU(df, row2 + x);
-      const auto r_vec = MulAdd(crcr, cr_vec, y_vec);
-      const auto g_vec = MulAdd(cgcr, cr_vec, MulAdd(cgcb, cb_vec, y_vec));
-      const auto b_vec = MulAdd(cbcb, cb_vec, y_vec);
-      StoreU(r_vec, df, row0 + x);
-      StoreU(g_vec, df, row1 + x);
-      StoreU(b_vec, df, row2 + x);
-    }
-    return true;
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return c < 3 ? RenderPipelineChannelMode::kInPlace
-                 : RenderPipelineChannelMode::kIgnored;
-  }
-
-  const char* GetName() const override { return "YCbCr"; }
-};
-
-std::unique_ptr<RenderPipelineStage> GetYCbCrStage() {
-  return jxl::make_unique<kYCbCrStage>();
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(GetYCbCrStage);
-
-std::unique_ptr<RenderPipelineStage> GetYCbCrStage() {
-  return HWY_DYNAMIC_DISPATCH(GetYCbCrStage)();
-}
-
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_ycbcr.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_ycbcr.h
deleted file mode 100644
index 3e99af7a38b0c..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/stage_ycbcr.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_RENDER_PIPELINE_STAGE_YCBCR_H_
-#define LIB_JXL_RENDER_PIPELINE_STAGE_YCBCR_H_
-#include <math.h>
-#include <stdint.h>
-
-#include <algorithm>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/dec_xyb.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-
-namespace jxl {
-
-// Converts the color channels from YCbCr to RGB.
-std::unique_ptr<RenderPipelineStage> GetYCbCrStage();
-}  // namespace jxl
-
-#endif  // LIB_JXL_RENDER_PIPELINE_STAGE_YCBCR_H_
diff --git a/third_party/jpeg-xl/lib/jxl/render_pipeline/test_render_pipeline_stages.h b/third_party/jpeg-xl/lib/jxl/render_pipeline/test_render_pipeline_stages.h
deleted file mode 100644
index 363079e3082f5..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/render_pipeline/test_render_pipeline_stages.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <cmath>
-#include <cstdint>
-#include <cstdio>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/render_pipeline/render_pipeline_stage.h"
-
-namespace jxl {
-
-class UpsampleXSlowStage : public RenderPipelineStage {
- public:
-  UpsampleXSlowStage()
-      : RenderPipelineStage(RenderPipelineStage::Settings::ShiftX(1, 1)) {}
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    for (size_t c = 0; c < input_rows.size(); c++) {
-      const float* row = GetInputRow(input_rows, c, 0);
-      float* row_out = GetOutputRow(output_rows, c, 0);
-      for (int64_t x = -xextra; x < static_cast<int64_t>(xsize + xextra); x++) {
-        float xp = *(row + x - 1);
-        float xc = *(row + x);
-        float xn = *(row + x + 1);
-        float xout0 = xp * 0.25f + xc * 0.75f;
-        float xout1 = xc * 0.75f + xn * 0.25f;
-        *(row_out + 2 * x + 0) = xout0;
-        *(row_out + 2 * x + 1) = xout1;
-      }
-    }
-    return true;
-  }
-
-  const char* GetName() const override { return "TEST::UpsampleXSlowStage"; }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return RenderPipelineChannelMode::kInOut;
-  }
-};
-
-class UpsampleYSlowStage : public RenderPipelineStage {
- public:
-  UpsampleYSlowStage()
-      : RenderPipelineStage(RenderPipelineStage::Settings::ShiftY(1, 1)) {}
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    for (size_t c = 0; c < input_rows.size(); c++) {
-      const float* rowp = GetInputRow(input_rows, c, -1);
-      const float* rowc = GetInputRow(input_rows, c, 0);
-      const float* rown = GetInputRow(input_rows, c, 1);
-      float* row_out0 = GetOutputRow(output_rows, c, 0);
-      float* row_out1 = GetOutputRow(output_rows, c, 1);
-      for (int64_t x = -xextra; x < static_cast<int64_t>(xsize + xextra); x++) {
-        float xp = *(rowp + x);
-        float xc = *(rowc + x);
-        float xn = *(rown + x);
-        float y_out0 = xp * 0.25f + xc * 0.75f;
-        float y_out1 = xc * 0.75f + xn * 0.25f;
-        *(row_out0 + x) = y_out0;
-        *(row_out1 + x) = y_out1;
-      }
-    }
-    return true;
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return RenderPipelineChannelMode::kInOut;
-  }
-
-  const char* GetName() const override { return "TEST::UpsampleYSlowStage"; }
-};
-
-class Check0FinalStage : public RenderPipelineStage {
- public:
-  Check0FinalStage() : RenderPipelineStage(RenderPipelineStage::Settings()) {}
-
-  Status ProcessRow(const RowInfo& input_rows, const RowInfo& output_rows,
-                    size_t xextra, size_t xsize, size_t xpos, size_t ypos,
-                    size_t thread_id) const final {
-    for (size_t c = 0; c < input_rows.size(); c++) {
-      for (size_t x = 0; x < xsize; x++) {
-        JXL_ENSURE(fabsf(GetInputRow(input_rows, c, 0)[x]) < 1e-8);
-      }
-    }
-    return true;
-  }
-
-  RenderPipelineChannelMode GetChannelMode(size_t c) const final {
-    return RenderPipelineChannelMode::kInput;
-  }
-  const char* GetName() const override { return "TEST::Check0FinalStage"; }
-};
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/roundtrip_test.cc b/third_party/jpeg-xl/lib/jxl/roundtrip_test.cc
deleted file mode 100644
index 56f040a6ff5bd..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/roundtrip_test.cc
+++ /dev/null
@@ -1,1099 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/cms.h>
-#include <jxl/codestream_header.h>
-#include <jxl/color_encoding.h>
-#include <jxl/decode.h>
-#include <jxl/decode_cxx.h>
-#include <jxl/encode.h>
-#include <jxl/encode_cxx.h>
-#include <jxl/types.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#include <cstring>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "lib/extras/codec.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/butteraugli/butteraugli.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/enc_external_image.h"
-#include "lib/jxl/encode_internal.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/image_test_utils.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace {
-
-using ::jxl::ImageF;
-using ::jxl::test::ButteraugliDistance;
-
-// Converts a test image to a CodecInOut.
-// icc_profile can be empty to automatically deduce profile from the pixel
-// format, or filled in to force this ICC profile
-jxl::CodecInOut ConvertTestImage(const std::vector<uint8_t>& buf,
-                                 const size_t xsize, const size_t ysize,
-                                 const JxlPixelFormat& pixel_format,
-                                 const jxl::Bytes& icc_profile) {
-  jxl::CodecInOut io{jxl::test::MemoryManager()};
-  jxl::test::Check(io.SetSize(xsize, ysize));
-
-  bool is_gray = pixel_format.num_channels < 3;
-  bool has_alpha =
-      pixel_format.num_channels == 2 || pixel_format.num_channels == 4;
-
-  io.metadata.m.color_encoding.SetColorSpace(is_gray ? jxl::ColorSpace::kGray
-                                                     : jxl::ColorSpace::kRGB);
-  if (has_alpha) {
-    // Note: alpha > 16 not yet supported by the C++ codec
-    switch (pixel_format.data_type) {
-      case JXL_TYPE_UINT8:
-        io.metadata.m.SetAlphaBits(8);
-        break;
-      case JXL_TYPE_UINT16:
-      case JXL_TYPE_FLOAT:
-      case JXL_TYPE_FLOAT16:
-        io.metadata.m.SetAlphaBits(16);
-        break;
-      default:
-        ADD_FAILURE() << "Roundtrip tests for data type "
-                      << pixel_format.data_type << " not yet implemented.";
-    }
-  }
-  size_t bitdepth = 0;
-  switch (pixel_format.data_type) {
-    case JXL_TYPE_FLOAT:
-      bitdepth = 32;
-      io.metadata.m.SetFloat32Samples();
-      break;
-    case JXL_TYPE_FLOAT16:
-      bitdepth = 16;
-      io.metadata.m.SetFloat16Samples();
-      break;
-    case JXL_TYPE_UINT8:
-      bitdepth = 8;
-      io.metadata.m.SetUintSamples(8);
-      break;
-    case JXL_TYPE_UINT16:
-      bitdepth = 16;
-      io.metadata.m.SetUintSamples(16);
-      break;
-    default:
-      ADD_FAILURE() << "Roundtrip tests for data type "
-                    << pixel_format.data_type << " not yet implemented.";
-  }
-  jxl::ColorEncoding color_encoding;
-  if (!icc_profile.empty()) {
-    jxl::IccBytes icc_profile_copy;
-    icc_profile.AppendTo(icc_profile_copy);
-    EXPECT_TRUE(
-        color_encoding.SetICC(std::move(icc_profile_copy), JxlGetDefaultCms()));
-  } else if (pixel_format.data_type == JXL_TYPE_FLOAT) {
-    color_encoding = jxl::ColorEncoding::LinearSRGB(is_gray);
-  } else {
-    color_encoding = jxl::ColorEncoding::SRGB(is_gray);
-  }
-  EXPECT_TRUE(ConvertFromExternal(jxl::Bytes(buf), xsize, ysize, color_encoding,
-                                  /*bits_per_sample=*/bitdepth, pixel_format,
-                                  /*pool=*/nullptr, &io.Main()));
-  return io;
-}
-
-template <typename T>
-T ConvertTestPixel(float val);
-
-template <>
-float ConvertTestPixel<float>(const float val) {
-  return val;
-}
-
-template <>
-uint16_t ConvertTestPixel<uint16_t>(const float val) {
-  return static_cast<uint16_t>(val * UINT16_MAX);
-}
-
-template <>
-uint8_t ConvertTestPixel<uint8_t>(const float val) {
-  return static_cast<uint8_t>(val * UINT8_MAX);
-}
-
-// Returns a test image.
-template <typename T>
-std::vector<uint8_t> GetTestImage(const size_t xsize, const size_t ysize,
-                                  const JxlPixelFormat& pixel_format) {
-  std::vector<T> pixels(xsize * ysize * pixel_format.num_channels);
-  for (size_t y = 0; y < ysize; y++) {
-    for (size_t x = 0; x < xsize; x++) {
-      for (size_t chan = 0; chan < pixel_format.num_channels; chan++) {
-        float val;
-        switch (chan % 4) {
-          case 0:
-            val = static_cast<float>(y) / static_cast<float>(ysize);
-            break;
-          case 1:
-            val = static_cast<float>(x) / static_cast<float>(xsize);
-            break;
-          case 2:
-            val = static_cast<float>(x + y) / static_cast<float>(xsize + ysize);
-            break;
-          case 3:
-          default:
-            val = static_cast<float>(x * y) / static_cast<float>(xsize * ysize);
-            break;
-        }
-        pixels[(y * xsize + x) * pixel_format.num_channels + chan] =
-            ConvertTestPixel<T>(val);
-      }
-    }
-  }
-  std::vector<uint8_t> bytes(pixels.size() * sizeof(T));
-  memcpy(bytes.data(), pixels.data(), sizeof(T) * pixels.size());
-  return bytes;
-}
-
-void EncodeWithEncoder(JxlEncoder* enc, std::vector<uint8_t>* compressed) {
-  compressed->resize(64);
-  uint8_t* next_out = compressed->data();
-  size_t avail_out = compressed->size() - (next_out - compressed->data());
-  JxlEncoderStatus process_result = JXL_ENC_NEED_MORE_OUTPUT;
-  while (process_result == JXL_ENC_NEED_MORE_OUTPUT) {
-    process_result = JxlEncoderProcessOutput(enc, &next_out, &avail_out);
-    if (process_result == JXL_ENC_NEED_MORE_OUTPUT) {
-      size_t offset = next_out - compressed->data();
-      compressed->resize(compressed->size() * 2);
-      next_out = compressed->data() + offset;
-      avail_out = compressed->size() - offset;
-    }
-  }
-  compressed->resize(next_out - compressed->data());
-  EXPECT_EQ(JXL_ENC_SUCCESS, process_result);
-}
-
-// Generates some pixels using some dimensions and pixel_format,
-// compresses them, and verifies that the decoded version is similar to the
-// original pixels.
-// TODO(firsching): change this to be a parameterized test, like in
-// decode_test.cc
-template <typename T>
-void VerifyRoundtripCompression(
-    const size_t xsize, const size_t ysize,
-    const JxlPixelFormat& input_pixel_format,
-    const JxlPixelFormat& output_pixel_format, const bool lossless,
-    const bool use_container, const uint32_t resampling = 1,
-    const bool already_downsampled = false,
-    const std::vector<std::pair<JxlExtraChannelType, std::string>>&
-        extra_channels = {},
-    const int upsampling_mode = -1) {
-  size_t orig_xsize = xsize;
-  size_t orig_ysize = ysize;
-  if (already_downsampled) {
-    orig_xsize = jxl::DivCeil(xsize, resampling);
-    orig_ysize = jxl::DivCeil(ysize, resampling);
-  }
-
-  JxlPixelFormat extra_channel_pixel_format = input_pixel_format;
-  extra_channel_pixel_format.num_channels = 1;
-  const std::vector<uint8_t> extra_channel_bytes =
-      GetTestImage<T>(xsize, ysize, extra_channel_pixel_format);
-  const std::vector<uint8_t> original_bytes =
-      GetTestImage<T>(orig_xsize, orig_ysize, input_pixel_format);
-  jxl::CodecInOut original_io = ConvertTestImage(
-      original_bytes, orig_xsize, orig_ysize, input_pixel_format, {});
-
-  JxlEncoder* enc = JxlEncoderCreate(nullptr);
-  EXPECT_NE(nullptr, enc);
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetCodestreamLevel(enc, 10));
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderUseContainer(enc, use_container));
-  JxlBasicInfo basic_info;
-  jxl::test::JxlBasicInfoSetFromPixelFormat(&basic_info, &input_pixel_format);
-  basic_info.xsize = xsize;
-  basic_info.ysize = ysize;
-  basic_info.uses_original_profile = lossless;
-  uint32_t num_channels = input_pixel_format.num_channels;
-  size_t has_interleaved_alpha = num_channels == 2 || num_channels == 4;
-  JxlPixelFormat output_pixel_format_with_extra_channel_alpha =
-      output_pixel_format;
-
-  // In the case where we have an alpha channel, but it is provided as an extra
-  // channel and not interleaved, we do two things here:
-  // 1. modify the original_io to have the correct alpha channel
-  // 2. change the output_format_with_extra_alpha to have an alpha channel
-  bool alpha_in_extra_channels_vector = false;
-  for (const auto& extra_channel : extra_channels) {
-    if (extra_channel.first == JXL_CHANNEL_ALPHA) {
-      alpha_in_extra_channels_vector = true;
-    }
-  }
-  if (alpha_in_extra_channels_vector && !has_interleaved_alpha) {
-    JXL_TEST_ASSIGN_OR_DIE(
-        ImageF alpha_channel,
-        ImageF::Create(jxl::test::MemoryManager(), xsize, ysize));
-    EXPECT_TRUE(jxl::ConvertFromExternal(
-        extra_channel_bytes.data(), extra_channel_bytes.size(), xsize, ysize,
-        basic_info.bits_per_sample, extra_channel_pixel_format, 0,
-        /*pool=*/nullptr, &alpha_channel));
-
-    original_io.metadata.m.SetAlphaBits(basic_info.bits_per_sample);
-    ASSERT_TRUE(original_io.Main().SetAlpha(std::move(alpha_channel)));
-    output_pixel_format_with_extra_channel_alpha.num_channels++;
-  }
-  // Those are the num_extra_channels including a potential alpha channel.
-  basic_info.num_extra_channels = extra_channels.size() + has_interleaved_alpha;
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetBasicInfo(enc, &basic_info));
-  EXPECT_EQ(enc->metadata.m.num_extra_channels,
-            extra_channels.size() + has_interleaved_alpha);
-  JxlColorEncoding color_encoding;
-  if (input_pixel_format.data_type == JXL_TYPE_FLOAT) {
-    JxlColorEncodingSetToLinearSRGB(
-        &color_encoding,
-        /*is_gray=*/input_pixel_format.num_channels < 3);
-  } else {
-    JxlColorEncodingSetToSRGB(&color_encoding,
-                              /*is_gray=*/input_pixel_format.num_channels < 3);
-  }
-
-  std::vector<JxlExtraChannelInfo> channel_infos;
-  for (const auto& extra_channel : extra_channels) {
-    auto channel_type = extra_channel.first;
-    JxlExtraChannelInfo channel_info;
-    JxlEncoderInitExtraChannelInfo(channel_type, &channel_info);
-    channel_info.bits_per_sample = (lossless ? basic_info.bits_per_sample : 8);
-    channel_info.exponent_bits_per_sample =
-        (lossless ? basic_info.exponent_bits_per_sample : 0);
-    channel_infos.push_back(channel_info);
-  }
-  for (size_t index = 0; index < channel_infos.size(); index++) {
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderSetExtraChannelInfo(enc, index + has_interleaved_alpha,
-                                            &channel_infos[index]));
-    std::string name = extra_channels[index].second;
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderSetExtraChannelName(enc, index + has_interleaved_alpha,
-                                            name.c_str(), name.length()));
-  }
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetColorEncoding(enc, &color_encoding));
-  if (resampling > 1) {
-    EXPECT_EQ(JXL_ENC_ERROR, JxlEncoderSetUpsamplingMode(enc, 3, 0));
-    EXPECT_EQ(JXL_ENC_ERROR, JxlEncoderSetUpsamplingMode(enc, resampling, -2));
-    EXPECT_EQ(JXL_ENC_ERROR, JxlEncoderSetUpsamplingMode(enc, resampling, 2));
-  }
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderSetUpsamplingMode(enc, resampling, upsampling_mode));
-  JxlEncoderFrameSettings* frame_settings =
-      JxlEncoderFrameSettingsCreate(enc, nullptr);
-  JxlEncoderSetFrameLossless(frame_settings, lossless);
-  if (resampling > 1) {
-    EXPECT_EQ(
-        JXL_ENC_SUCCESS,
-        JxlEncoderFrameSettingsSetOption(
-            frame_settings, JXL_ENC_FRAME_SETTING_RESAMPLING, resampling));
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderFrameSettingsSetOption(
-                  frame_settings, JXL_ENC_FRAME_SETTING_ALREADY_DOWNSAMPLED,
-                  already_downsampled));
-  }
-  EXPECT_EQ(
-      JXL_ENC_SUCCESS,
-      JxlEncoderAddImageFrame(frame_settings, &input_pixel_format,
-                              static_cast<const void*>(original_bytes.data()),
-                              original_bytes.size()));
-  EXPECT_EQ(frame_settings->enc->input_queue.empty(), false);
-  for (size_t index = 0; index < channel_infos.size(); index++) {
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderSetExtraChannelBuffer(
-                  frame_settings, &extra_channel_pixel_format,
-                  static_cast<const void*>(extra_channel_bytes.data()),
-                  extra_channel_bytes.size(), index + has_interleaved_alpha));
-  }
-  JxlEncoderCloseInput(enc);
-  std::vector<uint8_t> compressed;
-  EncodeWithEncoder(enc, &compressed);
-  JxlEncoderDestroy(enc);
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-  EXPECT_NE(nullptr, dec);
-
-  const uint8_t* next_in = compressed.data();
-  size_t avail_in = compressed.size();
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(dec, JXL_DEC_BASIC_INFO |
-                                               JXL_DEC_COLOR_ENCODING |
-                                               JXL_DEC_FULL_IMAGE));
-
-  JxlDecoderSetInput(dec, next_in, avail_in);
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-  size_t buffer_size;
-  EXPECT_EQ(
-      JXL_DEC_SUCCESS,
-      JxlDecoderImageOutBufferSize(
-          dec, &output_pixel_format_with_extra_channel_alpha, &buffer_size));
-  if (&input_pixel_format == &output_pixel_format_with_extra_channel_alpha &&
-      !already_downsampled) {
-    EXPECT_EQ(buffer_size, original_bytes.size());
-  }
-
-  JxlBasicInfo info;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-  EXPECT_EQ(xsize, info.xsize);
-  EXPECT_EQ(ysize, info.ysize);
-  EXPECT_EQ(extra_channels.size() + has_interleaved_alpha,
-            info.num_extra_channels);
-
-  EXPECT_EQ(JXL_DEC_COLOR_ENCODING, JxlDecoderProcessInput(dec));
-
-  size_t icc_profile_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderGetICCProfileSize(dec, JXL_COLOR_PROFILE_TARGET_DATA,
-                                        &icc_profile_size));
-  std::vector<uint8_t> icc_profile(icc_profile_size);
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetColorAsICCProfile(
-                                 dec, JXL_COLOR_PROFILE_TARGET_DATA,
-                                 icc_profile.data(), icc_profile.size()));
-
-  std::vector<uint8_t> decoded_bytes(buffer_size);
-
-  EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetImageOutBuffer(
-                dec, &output_pixel_format_with_extra_channel_alpha,
-                decoded_bytes.data(), decoded_bytes.size()));
-  std::vector<std::vector<uint8_t>> extra_channel_decoded_bytes(
-      info.num_extra_channels - has_interleaved_alpha);
-
-  for (size_t index = has_interleaved_alpha; index < info.num_extra_channels;
-       index++) {
-    JxlExtraChannelInfo channel_info;
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderGetExtraChannelInfo(dec, index, &channel_info));
-    EXPECT_EQ(channel_info.type,
-              extra_channels[index - has_interleaved_alpha].first);
-    std::string input_name =
-        extra_channels[index - has_interleaved_alpha].second;
-    const size_t name_length = channel_info.name_length;
-    EXPECT_EQ(input_name.size(), name_length);
-    std::vector<char> output_name(name_length + 1);
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderGetExtraChannelName(dec, index, output_name.data(),
-                                            output_name.size()));
-    EXPECT_EQ(0,
-              memcmp(input_name.data(), output_name.data(), input_name.size()));
-    size_t extra_buffer_size;
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderExtraChannelBufferSize(dec, &output_pixel_format,
-                                               &extra_buffer_size, index));
-    std::vector<uint8_t> extra_decoded_bytes(extra_buffer_size);
-    extra_channel_decoded_bytes[index - has_interleaved_alpha] =
-        std::move(extra_decoded_bytes);
-    EXPECT_EQ(
-        JXL_DEC_SUCCESS,
-        JxlDecoderSetExtraChannelBuffer(
-            dec, &output_pixel_format,
-            extra_channel_decoded_bytes[index - has_interleaved_alpha].data(),
-            extra_channel_decoded_bytes[index - has_interleaved_alpha].size(),
-            index));
-  }
-  EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-  // Check if there are no further errors after getting the full image, e.g.
-  // check that the final codestream box is actually marked as last.
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderProcessInput(dec));
-
-  JxlDecoderDestroy(dec);
-
-  jxl::CodecInOut decoded_io = ConvertTestImage(
-      decoded_bytes, xsize, ysize, output_pixel_format_with_extra_channel_alpha,
-      jxl::Bytes(icc_profile));
-
-  if (already_downsampled) {
-    jxl::Image3F* color = decoded_io.Main().color();
-    JXL_TEST_ASSIGN_OR_DIE(*color, jxl::DownsampleImage(*color, resampling));
-    if (decoded_io.Main().HasAlpha()) {
-      ImageF* alpha = decoded_io.Main().alpha();
-      JXL_TEST_ASSIGN_OR_DIE(*alpha, jxl::DownsampleImage(*alpha, resampling));
-    }
-    EXPECT_TRUE(decoded_io.SetSize(color->xsize(), color->ysize()));
-  }
-
-  if (lossless && !already_downsampled) {
-    JXL_EXPECT_OK(jxl::SamePixels(*original_io.Main().color(),
-                                  *decoded_io.Main().color(), _));
-  } else {
-    jxl::ButteraugliParams butteraugli_params;
-    float butteraugli_score =
-        ButteraugliDistance(original_io.frames, decoded_io.frames,
-                            butteraugli_params, *JxlGetDefaultCms(),
-                            /*distmap=*/nullptr, nullptr);
-    float target_score = 1.5f;
-    // upsampling mode 1 (unlike default and NN) does not downscale back to the
-    // already downsampled image
-    if (upsampling_mode == 1 && resampling >= 4 && already_downsampled)
-      target_score = 15.f;
-    EXPECT_LE(butteraugli_score, target_score);
-  }
-  JxlPixelFormat extra_channel_output_pixel_format = output_pixel_format;
-  extra_channel_output_pixel_format.num_channels = 1;
-  for (auto& extra_channel : extra_channel_decoded_bytes) {
-    EXPECT_EQ(extra_channel.size(), extra_channel_bytes.size());
-    if (lossless) {
-      EXPECT_EQ(jxl::test::ComparePixels(extra_channel.data(),
-                                         extra_channel_bytes.data(), xsize,
-                                         ysize, extra_channel_pixel_format,
-                                         extra_channel_output_pixel_format),
-                0u);
-      EXPECT_EQ(extra_channel, extra_channel_bytes);
-    }
-  }
-}
-
-}  // namespace
-
-TEST(RoundtripTest, FloatFrameRoundtripTest) {
-  std::vector<std::vector<std::pair<JxlExtraChannelType, std::string>>>
-      extra_channels_cases = {{},
-                              {{JXL_CHANNEL_ALPHA, "my extra alpha channel"}},
-                              {{JXL_CHANNEL_CFA, "my cfa channel"}},
-                              {{JXL_CHANNEL_DEPTH, "depth"},
-                               {JXL_CHANNEL_SELECTION_MASK, "mask"},
-                               {JXL_CHANNEL_BLACK, "black"},
-                               {JXL_CHANNEL_CFA, "my cfa channel"},
-                               {JXL_CHANNEL_OPTIONAL, "optional channel"}},
-                              {{JXL_CHANNEL_DEPTH, "very deep"}}};
-  for (bool use_container : {false, true}) {
-    for (bool lossless : {false, true}) {
-      for (uint32_t num_channels = 1; num_channels < 5; num_channels++) {
-        for (auto& extra_channels : extra_channels_cases) {
-          uint32_t has_alpha = static_cast<uint32_t>(num_channels % 2 == 0);
-          uint32_t total_extra_channels = has_alpha + extra_channels.size();
-          // There's no support (yet) for lossless extra float
-          // channels, so we don't test it.
-          if (total_extra_channels == 0 || !lossless) {
-            JxlPixelFormat pixel_format = JxlPixelFormat{
-                num_channels, JXL_TYPE_FLOAT, JXL_NATIVE_ENDIAN, 0};
-            VerifyRoundtripCompression<float>(
-                63, 129, pixel_format, pixel_format, lossless, use_container, 1,
-                false, extra_channels);
-          }
-        }
-      }
-    }
-  }
-}
-
-TEST(RoundtripTest, Uint16FrameRoundtripTest) {
-  std::vector<std::vector<std::pair<JxlExtraChannelType, std::string>>>
-      extra_channels_cases = {{},
-                              {{JXL_CHANNEL_ALPHA, "my extra alpha channel"}},
-                              {{JXL_CHANNEL_CFA, "my cfa channel"}},
-                              {{JXL_CHANNEL_CFA, "my cfa channel"},
-                               {JXL_CHANNEL_BLACK, "k_channel"}},
-                              {{JXL_CHANNEL_DEPTH, "very deep"}}};
-  for (int use_container = 0; use_container < 2; use_container++) {
-    for (int lossless = 0; lossless < 2; lossless++) {
-      for (uint32_t num_channels = 1; num_channels < 5; num_channels++) {
-        for (auto& extra_channels : extra_channels_cases) {
-          JxlPixelFormat pixel_format = JxlPixelFormat{
-              num_channels, JXL_TYPE_UINT16, JXL_NATIVE_ENDIAN, 0};
-          VerifyRoundtripCompression<uint16_t>(
-              63, 129, pixel_format, pixel_format, static_cast<bool>(lossless),
-              static_cast<bool>(use_container), 1, false, extra_channels);
-        }
-      }
-    }
-  }
-}
-
-TEST(RoundtripTest, Uint8FrameRoundtripTest) {
-  std::vector<std::vector<std::pair<JxlExtraChannelType, std::string>>>
-      extra_channels_cases = {{},
-                              {{JXL_CHANNEL_THERMAL, "temperature"}},
-                              {{JXL_CHANNEL_ALPHA, "my extra alpha channel"}},
-                              {{JXL_CHANNEL_CFA, "my cfa channel"}},
-                              {{JXL_CHANNEL_CFA, "my cfa channel"},
-                               {JXL_CHANNEL_BLACK, "k_channel"}},
-                              {{JXL_CHANNEL_DEPTH, "very deep"}}};
-  for (int use_container = 0; use_container < 2; use_container++) {
-    for (int lossless = 0; lossless < 2; lossless++) {
-      for (uint32_t num_channels = 1; num_channels < 5; num_channels++) {
-        for (auto& extra_channels : extra_channels_cases) {
-          JxlPixelFormat pixel_format = JxlPixelFormat{
-              num_channels, JXL_TYPE_UINT8, JXL_NATIVE_ENDIAN, 0};
-          VerifyRoundtripCompression<uint8_t>(
-              63, 129, pixel_format, pixel_format, static_cast<bool>(lossless),
-              static_cast<bool>(use_container), 1, false, extra_channels);
-        }
-      }
-    }
-  }
-}
-
-TEST(RoundtripTest, TestNonlinearSrgbAsXybEncoded) {
-  for (int use_container = 0; use_container < 2; use_container++) {
-    for (uint32_t num_channels = 1; num_channels < 5; num_channels++) {
-      JxlPixelFormat pixel_format_in =
-          JxlPixelFormat{num_channels, JXL_TYPE_UINT8, JXL_NATIVE_ENDIAN, 0};
-      JxlPixelFormat pixel_format_out =
-          JxlPixelFormat{num_channels, JXL_TYPE_FLOAT, JXL_NATIVE_ENDIAN, 0};
-      VerifyRoundtripCompression<uint8_t>(
-          63, 129, pixel_format_in, pixel_format_out,
-          /*lossless=*/false, static_cast<bool>(use_container), 1, false, {});
-    }
-  }
-}
-
-TEST(RoundtripTest, Resampling) {
-  JxlPixelFormat pixel_format =
-      JxlPixelFormat{3, JXL_TYPE_UINT8, JXL_NATIVE_ENDIAN, 0};
-  VerifyRoundtripCompression<uint8_t>(63, 129, pixel_format, pixel_format,
-                                      /*lossless=*/false,
-                                      /*use_container=*/false, 2,
-                                      /*already_downsampled=*/false);
-
-  // TODO(lode): also make this work for odd sizes. This requires a fix in
-  // enc_frame.cc to not set custom_size_or_origin to true due to even/odd
-  // mismatch.
-  for (int factor : {2, 4, 8}) {
-    for (int upsampling_mode : {-1, 0, 1}) {
-      VerifyRoundtripCompression<uint8_t>(
-          64, 128, pixel_format, pixel_format,
-          /*lossless=*/true,
-          /*use_container=*/false, factor,
-          /*already_downsampled=*/true, /*extra_channels=*/{}, upsampling_mode);
-    }
-  }
-}
-
-TEST(RoundtripTest, ExtraBoxesTest) {
-  JxlPixelFormat pixel_format =
-      JxlPixelFormat{4, JXL_TYPE_FLOAT, JXL_NATIVE_ENDIAN, 0};
-  const size_t xsize = 61;
-  const size_t ysize = 71;
-
-  const std::vector<uint8_t> original_bytes =
-      GetTestImage<float>(xsize, ysize, pixel_format);
-  jxl::CodecInOut original_io =
-      ConvertTestImage(original_bytes, xsize, ysize, pixel_format, {});
-
-  JxlEncoder* enc = JxlEncoderCreate(nullptr);
-  EXPECT_NE(nullptr, enc);
-
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderUseContainer(enc, true));
-  JxlBasicInfo basic_info;
-  jxl::test::JxlBasicInfoSetFromPixelFormat(&basic_info, &pixel_format);
-  basic_info.xsize = xsize;
-  basic_info.ysize = ysize;
-  basic_info.uses_original_profile = JXL_FALSE;
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetCodestreamLevel(enc, 10));
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetBasicInfo(enc, &basic_info));
-  JxlColorEncoding color_encoding;
-  JXL_BOOL is_gray = TO_JXL_BOOL(pixel_format.num_channels < 3);
-  if (pixel_format.data_type == JXL_TYPE_FLOAT) {
-    JxlColorEncodingSetToLinearSRGB(&color_encoding, is_gray);
-  } else {
-    JxlColorEncodingSetToSRGB(&color_encoding, is_gray);
-  }
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetColorEncoding(enc, &color_encoding));
-  JxlEncoderFrameSettings* frame_settings =
-      JxlEncoderFrameSettingsCreate(enc, nullptr);
-  JxlEncoderSetFrameLossless(frame_settings, JXL_FALSE);
-  EXPECT_EQ(
-      JXL_ENC_SUCCESS,
-      JxlEncoderAddImageFrame(frame_settings, &pixel_format,
-                              static_cast<const void*>(original_bytes.data()),
-                              original_bytes.size()));
-  JxlEncoderCloseInput(enc);
-
-  std::vector<uint8_t> compressed;
-  EncodeWithEncoder(enc, &compressed);
-  JxlEncoderDestroy(enc);
-
-  std::vector<uint8_t> extra_data(1023);
-  jxl::AppendBoxHeader(jxl::MakeBoxType("crud"), extra_data.size(), false,
-                       &compressed);
-  compressed.insert(compressed.end(), extra_data.begin(), extra_data.end());
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-  EXPECT_NE(nullptr, dec);
-
-  const uint8_t* next_in = compressed.data();
-  size_t avail_in = compressed.size();
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(dec, JXL_DEC_BASIC_INFO |
-                                               JXL_DEC_COLOR_ENCODING |
-                                               JXL_DEC_FULL_IMAGE));
-
-  JxlDecoderSetInput(dec, next_in, avail_in);
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-  size_t buffer_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderImageOutBufferSize(dec, &pixel_format, &buffer_size));
-  EXPECT_EQ(buffer_size, original_bytes.size());
-
-  JxlBasicInfo info;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-  EXPECT_EQ(xsize, info.xsize);
-  EXPECT_EQ(ysize, info.ysize);
-
-  EXPECT_EQ(JXL_DEC_COLOR_ENCODING, JxlDecoderProcessInput(dec));
-
-  size_t icc_profile_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderGetICCProfileSize(dec, JXL_COLOR_PROFILE_TARGET_DATA,
-                                        &icc_profile_size));
-  std::vector<uint8_t> icc_profile(icc_profile_size);
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetColorAsICCProfile(
-                                 dec, JXL_COLOR_PROFILE_TARGET_DATA,
-                                 icc_profile.data(), icc_profile.size()));
-
-  std::vector<uint8_t> decoded_bytes(buffer_size);
-
-  EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(dec, &pixel_format,
-                                                         decoded_bytes.data(),
-                                                         decoded_bytes.size()));
-
-  EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-
-  JxlDecoderDestroy(dec);
-
-  jxl::CodecInOut decoded_io = ConvertTestImage(
-      decoded_bytes, xsize, ysize, pixel_format, jxl::Bytes(icc_profile));
-
-  jxl::ButteraugliParams butteraugli_params;
-  float butteraugli_score =
-      ButteraugliDistance(original_io.frames, decoded_io.frames,
-                          butteraugli_params, *JxlGetDefaultCms(),
-                          /*distmap=*/nullptr, nullptr);
-  EXPECT_LE(butteraugli_score, 1.0f);
-}
-
-TEST(RoundtripTest, MultiFrameTest) {
-  JxlPixelFormat pixel_format =
-      JxlPixelFormat{4, JXL_TYPE_FLOAT, JXL_NATIVE_ENDIAN, 0};
-  const size_t xsize = 61;
-  const size_t ysize = 71;
-  const size_t nb_frames = 4;
-  size_t compressed_size = 0;
-
-  for (int index_frames : {0, 1}) {
-    // use a vertical filmstrip of nb_frames frames
-    const std::vector<uint8_t> original_bytes =
-        GetTestImage<float>(xsize, ysize * nb_frames, pixel_format);
-    jxl::CodecInOut original_io = ConvertTestImage(
-        original_bytes, xsize, ysize * nb_frames, pixel_format, {});
-
-    JxlEncoder* enc = JxlEncoderCreate(nullptr);
-    EXPECT_NE(nullptr, enc);
-
-    EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderUseContainer(enc, true));
-    JxlBasicInfo basic_info;
-    jxl::test::JxlBasicInfoSetFromPixelFormat(&basic_info, &pixel_format);
-    basic_info.xsize = xsize;
-    basic_info.ysize = ysize;
-    basic_info.uses_original_profile = JXL_FALSE;
-    basic_info.have_animation = JXL_TRUE;
-    basic_info.animation.tps_numerator = 1;
-    basic_info.animation.tps_denominator = 1;
-    EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetCodestreamLevel(enc, 10));
-
-    EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetBasicInfo(enc, &basic_info));
-    JxlColorEncoding color_encoding;
-    JXL_BOOL is_gray = TO_JXL_BOOL(pixel_format.num_channels < 3);
-    if (pixel_format.data_type == JXL_TYPE_FLOAT) {
-      JxlColorEncodingSetToLinearSRGB(&color_encoding, is_gray);
-    } else {
-      JxlColorEncodingSetToSRGB(&color_encoding, is_gray);
-    }
-    EXPECT_EQ(JXL_ENC_SUCCESS,
-              JxlEncoderSetColorEncoding(enc, &color_encoding));
-    JxlEncoderFrameSettings* frame_settings =
-        JxlEncoderFrameSettingsCreate(enc, nullptr);
-    JxlEncoderSetFrameLossless(frame_settings, JXL_FALSE);
-    if (index_frames == 1) {
-      EXPECT_EQ(JXL_ENC_SUCCESS,
-                JxlEncoderFrameSettingsSetOption(frame_settings,
-                                                 JXL_ENC_FRAME_INDEX_BOX, 1));
-    }
-
-    size_t oneframesize = original_bytes.size() / nb_frames;
-    JxlFrameHeader frame_header;
-    JxlEncoderInitFrameHeader(&frame_header);
-    frame_header.duration = 1;
-    frame_header.is_last = JXL_FALSE;
-
-    for (size_t i = 0; i < nb_frames; i++) {
-      if (i + 1 == nb_frames) frame_header.is_last = JXL_TRUE;
-      JxlEncoderSetFrameHeader(frame_settings, &frame_header);
-      EXPECT_EQ(
-          JXL_ENC_SUCCESS,
-          JxlEncoderAddImageFrame(frame_settings, &pixel_format,
-                                  static_cast<const void*>(
-                                      original_bytes.data() + oneframesize * i),
-                                  oneframesize));
-    }
-    JxlEncoderCloseInput(enc);
-
-    std::vector<uint8_t> compressed;
-    EncodeWithEncoder(enc, &compressed);
-    JxlEncoderDestroy(enc);
-
-    JxlDecoder* dec = JxlDecoderCreate(nullptr);
-    EXPECT_NE(nullptr, dec);
-
-    const uint8_t* next_in = compressed.data();
-    size_t avail_in = compressed.size();
-
-    if (index_frames == 0) {
-      compressed_size = avail_in;
-    } else {
-      // a non-empty jxli box should be added
-      EXPECT_LE(avail_in, compressed_size + 50);
-      EXPECT_GE(avail_in, compressed_size + 10);
-    }
-
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderSubscribeEvents(dec, JXL_DEC_BASIC_INFO |
-                                                 JXL_DEC_COLOR_ENCODING |
-                                                 JXL_DEC_FULL_IMAGE));
-
-    JxlDecoderSetInput(dec, next_in, avail_in);
-    EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-    size_t buffer_size;
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderImageOutBufferSize(dec, &pixel_format, &buffer_size));
-    EXPECT_EQ(buffer_size, oneframesize);
-
-    JxlBasicInfo info;
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-    EXPECT_EQ(xsize, info.xsize);
-    EXPECT_EQ(ysize, info.ysize);
-
-    EXPECT_EQ(JXL_DEC_COLOR_ENCODING, JxlDecoderProcessInput(dec));
-
-    size_t icc_profile_size;
-    EXPECT_EQ(JXL_DEC_SUCCESS,
-              JxlDecoderGetICCProfileSize(dec, JXL_COLOR_PROFILE_TARGET_DATA,
-                                          &icc_profile_size));
-    std::vector<uint8_t> icc_profile(icc_profile_size);
-    EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetColorAsICCProfile(
-                                   dec, JXL_COLOR_PROFILE_TARGET_DATA,
-                                   icc_profile.data(), icc_profile.size()));
-
-    std::vector<uint8_t> decoded_bytes(buffer_size * nb_frames);
-
-    EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-
-    for (size_t i = 0; i < nb_frames; i++) {
-      EXPECT_EQ(JXL_DEC_SUCCESS,
-                JxlDecoderSetImageOutBuffer(
-                    dec, &pixel_format, decoded_bytes.data() + i * oneframesize,
-                    buffer_size));
-
-      EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-    }
-    JxlDecoderDestroy(dec);
-    jxl::CodecInOut decoded_io =
-        ConvertTestImage(decoded_bytes, xsize, ysize * nb_frames, pixel_format,
-                         jxl::Bytes(icc_profile));
-
-    jxl::ButteraugliParams butteraugli_params;
-    float butteraugli_score =
-        ButteraugliDistance(original_io.frames, decoded_io.frames,
-                            butteraugli_params, *JxlGetDefaultCms(),
-                            /*distmap=*/nullptr, nullptr);
-    EXPECT_LE(butteraugli_score, 1.0f);
-  }
-}
-
-static const unsigned char kEncodedTestProfile[] = {
-    0x1f, 0x8b, 0x1,  0x13, 0x10, 0x0,  0x0,  0x0,  0x20, 0x4c, 0xcc, 0x3,
-    0xe7, 0xa0, 0xa5, 0xa2, 0x90, 0xa4, 0x27, 0xe8, 0x79, 0x1d, 0xe3, 0x26,
-    0x57, 0x54, 0xef, 0x0,  0xe8, 0x97, 0x2,  0xce, 0xa1, 0xd7, 0x85, 0x16,
-    0xb4, 0x29, 0x94, 0x58, 0xf2, 0x56, 0xc0, 0x76, 0xea, 0x23, 0xec, 0x7c,
-    0x73, 0x51, 0x41, 0x40, 0x23, 0x21, 0x95, 0x4,  0x75, 0x12, 0xc9, 0xcc,
-    0x16, 0xbd, 0xb6, 0x99, 0xad, 0xf8, 0x75, 0x35, 0xb6, 0x42, 0xae, 0xae,
-    0xae, 0x86, 0x56, 0xf8, 0xcc, 0x16, 0x30, 0xb3, 0x45, 0xad, 0xd,  0x40,
-    0xd6, 0xd1, 0xd6, 0x99, 0x40, 0xbe, 0xe2, 0xdc, 0x31, 0x7,  0xa6, 0xb9,
-    0x27, 0x92, 0x38, 0x0,  0x3,  0x5e, 0x2c, 0xbe, 0xe6, 0xfb, 0x19, 0xbf,
-    0xf3, 0x6d, 0xbc, 0x4d, 0x64, 0xe5, 0xba, 0x76, 0xde, 0x31, 0x65, 0x66,
-    0x14, 0xa6, 0x3a, 0xc5, 0x8f, 0xb1, 0xb4, 0xba, 0x1f, 0xb1, 0xb8, 0xd4,
-    0x75, 0xba, 0x18, 0x86, 0x95, 0x3c, 0x26, 0xf6, 0x25, 0x62, 0x53, 0xfd,
-    0x9c, 0x94, 0x76, 0xf6, 0x95, 0x2c, 0xb1, 0xfd, 0xdc, 0xc0, 0xe4, 0x3f,
-    0xb3, 0xff, 0x67, 0xde, 0xd5, 0x94, 0xcc, 0xb0, 0x83, 0x2f, 0x28, 0x93,
-    0x92, 0x3,  0xa1, 0x41, 0x64, 0x60, 0x62, 0x70, 0x80, 0x87, 0xaf, 0xe7,
-    0x60, 0x4a, 0x20, 0x23, 0xb3, 0x11, 0x7,  0x38, 0x38, 0xd4, 0xa,  0x66,
-    0xb5, 0x93, 0x41, 0x90, 0x19, 0x17, 0x18, 0x60, 0xa5, 0xb,  0x7a, 0x24,
-    0xaa, 0x20, 0x81, 0xac, 0xa9, 0xa1, 0x70, 0xa6, 0x12, 0x8a, 0x4a, 0xa3,
-    0xa0, 0xf9, 0x9a, 0x97, 0xe7, 0xa8, 0xac, 0x8,  0xa8, 0xc4, 0x2a, 0x86,
-    0xa7, 0x69, 0x1e, 0x67, 0xe6, 0xbe, 0xa4, 0xd3, 0xff, 0x91, 0x61, 0xf6,
-    0x8a, 0xe6, 0xb5, 0xb3, 0x61, 0x9f, 0x19, 0x17, 0x98, 0x27, 0x6b, 0xe9,
-    0x8,  0x98, 0xe1, 0x21, 0x4a, 0x9,  0xb5, 0xd7, 0xca, 0xfa, 0x94, 0xd0,
-    0x69, 0x1a, 0xeb, 0x52, 0x1,  0x4e, 0xf5, 0xf6, 0xdf, 0x7f, 0xe7, 0x29,
-    0x70, 0xee, 0x4,  0xda, 0x2f, 0xa4, 0xff, 0xfe, 0xbb, 0x6f, 0xa8, 0xff,
-    0xfe, 0xdb, 0xaf, 0x8,  0xf6, 0x72, 0xa1, 0x40, 0x5d, 0xf0, 0x2d, 0x8,
-    0x82, 0x5b, 0x87, 0xbd, 0x10, 0x8,  0xe9, 0x7,  0xee, 0x4b, 0x80, 0xda,
-    0x4a, 0x4,  0xc5, 0x5e, 0xa0, 0xb7, 0x1e, 0x60, 0xb0, 0x59, 0x76, 0x60,
-    0xb,  0x2e, 0x19, 0x8a, 0x2e, 0x1c, 0xe6, 0x6,  0x20, 0xb8, 0x64, 0x18,
-    0x2a, 0xcf, 0x51, 0x94, 0xd4, 0xee, 0xc3, 0xfe, 0x39, 0x74, 0xd4, 0x2b,
-    0x48, 0xc9, 0x83, 0x4c, 0x9b, 0xd0, 0x4c, 0x35, 0x10, 0xe3, 0x9,  0xf7,
-    0x72, 0xf0, 0x7a, 0xe,  0xbf, 0x7d, 0x36, 0x2e, 0x19, 0x7e, 0x3f, 0xc,
-    0xf7, 0x93, 0xe7, 0xf4, 0x1d, 0x32, 0xc6, 0xb0, 0x89, 0xad, 0xe0, 0x28,
-    0xc1, 0xa7, 0x59, 0xe3, 0x0,
-};
-
-TEST(RoundtripTest, TestICCProfile) {
-  // JxlEncoderSetICCProfile parses the ICC profile, so a valid profile is
-  // needed. The profile should be passed correctly through the roundtrip.
-  jxl::BitReader reader(
-      jxl::Bytes(kEncodedTestProfile, sizeof(kEncodedTestProfile)));
-  std::vector<uint8_t> icc;
-  ASSERT_TRUE(jxl::test::ReadICC(&reader, &icc));
-  ASSERT_TRUE(reader.Close());
-
-  JxlPixelFormat format =
-      JxlPixelFormat{3, JXL_TYPE_UINT8, JXL_NATIVE_ENDIAN, 0};
-
-  size_t xsize = 25;
-  size_t ysize = 37;
-  const std::vector<uint8_t> original_bytes =
-      GetTestImage<uint8_t>(xsize, ysize, format);
-
-  JxlEncoder* enc = JxlEncoderCreate(nullptr);
-  EXPECT_NE(nullptr, enc);
-
-  JxlBasicInfo basic_info;
-  jxl::test::JxlBasicInfoSetFromPixelFormat(&basic_info, &format);
-  basic_info.xsize = xsize;
-  basic_info.ysize = ysize;
-  basic_info.uses_original_profile = JXL_TRUE;
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderSetBasicInfo(enc, &basic_info));
-
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderSetICCProfile(enc, icc.data(), icc.size()));
-  JxlEncoderFrameSettings* frame_settings =
-      JxlEncoderFrameSettingsCreate(enc, nullptr);
-  EXPECT_EQ(
-      JXL_ENC_SUCCESS,
-      JxlEncoderAddImageFrame(frame_settings, &format,
-                              static_cast<const void*>(original_bytes.data()),
-                              original_bytes.size()));
-  JxlEncoderCloseInput(enc);
-
-  std::vector<uint8_t> compressed;
-  EncodeWithEncoder(enc, &compressed);
-  JxlEncoderDestroy(enc);
-
-  JxlDecoder* dec = JxlDecoderCreate(nullptr);
-  EXPECT_NE(nullptr, dec);
-
-  const uint8_t* next_in = compressed.data();
-  size_t avail_in = compressed.size();
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(dec, JXL_DEC_BASIC_INFO |
-                                               JXL_DEC_COLOR_ENCODING |
-                                               JXL_DEC_FULL_IMAGE));
-
-  JxlDecoderSetInput(dec, next_in, avail_in);
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec));
-  size_t buffer_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderImageOutBufferSize(dec, &format, &buffer_size));
-  EXPECT_EQ(buffer_size, original_bytes.size());
-
-  JxlBasicInfo info;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec, &info));
-  EXPECT_EQ(xsize, info.xsize);
-  EXPECT_EQ(ysize, info.ysize);
-
-  EXPECT_EQ(JXL_DEC_COLOR_ENCODING, JxlDecoderProcessInput(dec));
-
-  size_t dec_icc_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderGetICCProfileSize(dec, JXL_COLOR_PROFILE_TARGET_ORIGINAL,
-                                        &dec_icc_size));
-  EXPECT_EQ(icc.size(), dec_icc_size);
-  std::vector<uint8_t> dec_icc(dec_icc_size);
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetColorAsICCProfile(
-                                 dec, JXL_COLOR_PROFILE_TARGET_ORIGINAL,
-                                 dec_icc.data(), dec_icc.size()));
-
-  std::vector<uint8_t> decoded_bytes(buffer_size);
-
-  EXPECT_EQ(JXL_DEC_NEED_IMAGE_OUT_BUFFER, JxlDecoderProcessInput(dec));
-
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetImageOutBuffer(dec, &format, decoded_bytes.data(),
-                                        decoded_bytes.size()));
-
-  EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec));
-
-  EXPECT_EQ(icc, dec_icc);
-
-  JxlDecoderDestroy(dec);
-}
-
-JXL_TRANSCODE_JPEG_TEST(RoundtripTest, TestJPEGReconstruction) {
-  TEST_LIBJPEG_SUPPORT();
-  const std::string jpeg_path = "jxl/flower/flower.png.im_q85_420.jpg";
-  const std::vector<uint8_t> orig = jxl::test::ReadTestData(jpeg_path);
-
-  JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-  JxlEncoderFrameSettings* frame_settings =
-      JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderUseContainer(enc.get(), JXL_TRUE));
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderStoreJPEGMetadata(enc.get(), JXL_TRUE));
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderAddJPEGFrame(frame_settings, orig.data(), orig.size()));
-  JxlEncoderCloseInput(enc.get());
-
-  std::vector<uint8_t> compressed;
-  EncodeWithEncoder(enc.get(), &compressed);
-
-  JxlDecoderPtr dec = JxlDecoderMake(nullptr);
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(
-                dec.get(), JXL_DEC_JPEG_RECONSTRUCTION | JXL_DEC_FULL_IMAGE));
-  JxlDecoderSetInput(dec.get(), compressed.data(), compressed.size());
-  EXPECT_EQ(JXL_DEC_JPEG_RECONSTRUCTION, JxlDecoderProcessInput(dec.get()));
-  std::vector<uint8_t> reconstructed_buffer(128);
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetJPEGBuffer(dec.get(), reconstructed_buffer.data(),
-                                    reconstructed_buffer.size()));
-  size_t used = 0;
-  JxlDecoderStatus dec_process_result = JXL_DEC_JPEG_NEED_MORE_OUTPUT;
-  while (dec_process_result == JXL_DEC_JPEG_NEED_MORE_OUTPUT) {
-    used = reconstructed_buffer.size() - JxlDecoderReleaseJPEGBuffer(dec.get());
-    reconstructed_buffer.resize(reconstructed_buffer.size() * 2);
-    EXPECT_EQ(
-        JXL_DEC_SUCCESS,
-        JxlDecoderSetJPEGBuffer(dec.get(), reconstructed_buffer.data() + used,
-                                reconstructed_buffer.size() - used));
-    dec_process_result = JxlDecoderProcessInput(dec.get());
-  }
-  ASSERT_EQ(JXL_DEC_FULL_IMAGE, dec_process_result);
-  used = reconstructed_buffer.size() - JxlDecoderReleaseJPEGBuffer(dec.get());
-  ASSERT_EQ(used, orig.size());
-  EXPECT_EQ(0, memcmp(reconstructed_buffer.data(), orig.data(), used));
-}
-
-JXL_TRANSCODE_JPEG_TEST(RoundtripTest,
-                        TestJPEGReconstructionWithIncompleteHuffmanCode) {
-  TEST_LIBJPEG_SUPPORT();
-  static constexpr uint8_t kJPEGBytes[] = {
-      // SOI
-      0xff, 0xd8,  //
-      // SOF
-      0xff, 0xc0, 0x00, 0x0b, 0x08, 0x00, 0x01, 0x00, 0x01, 0x01,  //
-      0x01, 0x11, 0x00,                                            //
-      // DQT
-      0xff, 0xdb, 0x00, 0x43, 0x00, 0x03, 0x02, 0x02, 0x03, 0x02,  //
-      0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x03, 0x03, 0x04, 0x05,  //
-      0x08, 0x05, 0x05, 0x04, 0x04, 0x05, 0x0a, 0x07, 0x07, 0x06,  //
-      0x08, 0x0c, 0x0a, 0x0c, 0x0c, 0x0b, 0x0a, 0x0b, 0x0b, 0x0d,  //
-      0x0e, 0x12, 0x10, 0x0d, 0x0e, 0x11, 0x0e, 0x0b, 0x0b, 0x10,  //
-      0x16, 0x10, 0x11, 0x13, 0x14, 0x15, 0x15, 0x15, 0x0c, 0x0f,  //
-      0x17, 0x18, 0x16, 0x14, 0x18, 0x12, 0x14, 0x15, 0x14,        //
-      // DHT
-      0xff, 0xc4, 0x01, 0x30,  // marker, len
-      0x00,                    // slot id DC0
-      // counts for lengths 1 - 16 (total_count: 12)
-      0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,  //
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      // symbols: 0 - 11
-      0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,  //
-      0x0a, 0x0b,                                                  //
-      0x13,  // slot id AC3
-      // counts for lengths 1 - 16 (total_count: 256)
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,  //
-      0x01, 0x01, 0x01, 0x01, 0x01, 0xf9,                          //
-      // symbols: 0 - 255
-      0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,  //
-      0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13,  //
-      0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d,  //
-      0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,  //
-      0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31,  //
-      0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b,  //
-      0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45,  //
-      0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,  //
-      0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,  //
-      0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60, 0x61, 0x62, 0x63,  //
-      0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d,  //
-      0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,  //
-      0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81,  //
-      0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b,  //
-      0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95,  //
-      0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,  //
-      0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9,  //
-      0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3,  //
-      0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd,  //
-      0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,  //
-      0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1,  //
-      0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb,  //
-      0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5,  //
-      0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,  //
-      0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9,  //
-      0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
-      // SOS
-      0xff, 0xda, 0x00, 0x08, 0x01, 0x01, 0x03, 0x00, 0x3f, 0x00,  //
-      // entropy coded data (first 16 bit: DC 0, next 9 bits: AC eob)
-      0xfc, 0xaa, 0x00, 0x00,  //
-      // EOI
-      0xff, 0xd9,  //
-  };
-  static constexpr size_t kJPEGSize = sizeof(kJPEGBytes);
-
-  JxlEncoderPtr enc = JxlEncoderMake(nullptr);
-  JxlEncoderFrameSettings* frame_settings =
-      JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderUseContainer(enc.get(), JXL_TRUE));
-  EXPECT_EQ(JXL_ENC_SUCCESS, JxlEncoderStoreJPEGMetadata(enc.get(), JXL_TRUE));
-  EXPECT_EQ(JXL_ENC_SUCCESS,
-            JxlEncoderAddJPEGFrame(frame_settings, kJPEGBytes, kJPEGSize));
-  JxlEncoderCloseInput(enc.get());
-
-  std::vector<uint8_t> compressed;
-  EncodeWithEncoder(enc.get(), &compressed);
-
-  JxlDecoderPtr dec = JxlDecoderMake(nullptr);
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(
-                dec.get(), JXL_DEC_JPEG_RECONSTRUCTION | JXL_DEC_FULL_IMAGE));
-  JxlDecoderSetInput(dec.get(), compressed.data(), compressed.size());
-  EXPECT_EQ(JXL_DEC_JPEG_RECONSTRUCTION, JxlDecoderProcessInput(dec.get()));
-  std::vector<uint8_t> reconstructed_buffer(128);
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSetJPEGBuffer(dec.get(), reconstructed_buffer.data(),
-                                    reconstructed_buffer.size()));
-  size_t used = 0;
-  JxlDecoderStatus dec_process_result = JXL_DEC_JPEG_NEED_MORE_OUTPUT;
-  while (dec_process_result == JXL_DEC_JPEG_NEED_MORE_OUTPUT) {
-    used = reconstructed_buffer.size() - JxlDecoderReleaseJPEGBuffer(dec.get());
-    reconstructed_buffer.resize(reconstructed_buffer.size() * 2);
-    EXPECT_EQ(
-        JXL_DEC_SUCCESS,
-        JxlDecoderSetJPEGBuffer(dec.get(), reconstructed_buffer.data() + used,
-                                reconstructed_buffer.size() - used));
-    dec_process_result = JxlDecoderProcessInput(dec.get());
-  }
-  ASSERT_EQ(JXL_DEC_FULL_IMAGE, dec_process_result);
-  used = reconstructed_buffer.size() - JxlDecoderReleaseJPEGBuffer(dec.get());
-  ASSERT_EQ(used, kJPEGSize);
-  EXPECT_EQ(0, memcmp(reconstructed_buffer.data(), kJPEGBytes, used));
-}
diff --git a/third_party/jpeg-xl/lib/jxl/simd_util-inl.h b/third_party/jpeg-xl/lib/jxl/simd_util-inl.h
deleted file mode 100644
index 77b207ffe816f..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/simd_util-inl.h
+++ /dev/null
@@ -1,349 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Misc utilities for SIMD operations
-
-#if defined(LIB_JXL_SIMD_UTIL_INL_H_) == defined(HWY_TARGET_TOGGLE)
-#ifdef LIB_JXL_SIMD_UTIL_INL_H_
-#undef LIB_JXL_SIMD_UTIL_INL_H_
-#else
-#define LIB_JXL_SIMD_UTIL_INL_H_
-#endif
-
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/compiler_specific.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-#if HWY_CAP_GE512
-using hwy::HWY_NAMESPACE::Half;
-using hwy::HWY_NAMESPACE::Vec;
-template <size_t i, class DF, class V>
-HWY_INLINE Vec<Half<Half<DF>>> Quarter(const DF df, V v) {
-  using HF = Half<DF>;
-  using HHF = Half<HF>;
-  auto half = i >= 2 ? UpperHalf(HF(), v) : LowerHalf(HF(), v);
-  return i & 1 ? UpperHalf(HHF(), half) : LowerHalf(HHF(), half);
-}
-
-template <class DF, class V>
-HWY_INLINE Vec<DF> Concat4(const DF df, V v0, V v1, V v2, V v3) {
-  using HF = Half<DF>;
-  return Combine(DF(), Combine(HF(), v3, v2), Combine(HF(), v1, v0));
-}
-
-#endif
-
-// Stores v0[0], v1[0], v0[1], v1[1], ... to mem, in this order. Mem must be
-// aligned.
-template <class DF, class V, typename T>
-void StoreInterleaved(const DF df, V v0, V v1, T* mem) {
-  static_assert(sizeof(T) == 4, "only use StoreInterleaved for 4-byte types");
-#if HWY_TARGET == HWY_SCALAR
-  Store(v0, df, mem);
-  Store(v1, df, mem + 1);
-#elif !HWY_CAP_GE256
-  Store(InterleaveLower(df, v0, v1), df, mem);
-  Store(InterleaveUpper(df, v0, v1), df, mem + Lanes(df));
-#else
-  if (!HWY_CAP_GE512 || Lanes(df) == 8) {
-    auto t0 = InterleaveLower(df, v0, v1);
-    auto t1 = InterleaveUpper(df, v0, v1);
-    Store(ConcatLowerLower(df, t1, t0), df, mem);
-    Store(ConcatUpperUpper(df, t1, t0), df, mem + Lanes(df));
-  } else {
-#if HWY_CAP_GE512
-    auto t0 = InterleaveLower(df, v0, v1);
-    auto t1 = InterleaveUpper(df, v0, v1);
-    Store(Concat4(df, Quarter<0>(df, t0), Quarter<0>(df, t1),
-                  Quarter<1>(df, t0), Quarter<1>(df, t1)),
-          df, mem);
-    Store(Concat4(df, Quarter<2>(df, t0), Quarter<2>(df, t1),
-                  Quarter<3>(df, t0), Quarter<3>(df, t1)),
-          df, mem + Lanes(df));
-#endif
-  }
-#endif
-}
-
-// Stores v0[0], v1[0], v2[0], v3[0], v0[1] ... to mem, in this order. Mem must
-// be aligned.
-template <class DF, class V, typename T>
-void StoreInterleaved(const DF df, V v0, V v1, V v2, V v3, T* mem) {
-  static_assert(sizeof(T) == 4, "only use StoreInterleaved for 4-byte types");
-#if HWY_TARGET == HWY_SCALAR
-  Store(v0, df, mem);
-  Store(v1, df, mem + 1);
-  Store(v2, df, mem + 2);
-  Store(v3, df, mem + 3);
-#elif !HWY_CAP_GE256
-  auto t0 = InterleaveLower(df, v0, v2);
-  auto t1 = InterleaveLower(df, v1, v3);
-  auto t2 = InterleaveUpper(df, v0, v2);
-  auto t3 = InterleaveUpper(df, v1, v3);
-  Store(InterleaveLower(df, t0, t1), df, mem);
-  Store(InterleaveUpper(df, t0, t1), df, mem + Lanes(df));
-  Store(InterleaveLower(df, t2, t3), df, mem + 2 * Lanes(df));
-  Store(InterleaveUpper(df, t2, t3), df, mem + 3 * Lanes(df));
-#elif !HWY_CAP_GE512
-  auto t0 = InterleaveLower(df, v0, v2);
-  auto t1 = InterleaveLower(df, v1, v3);
-  auto t2 = InterleaveUpper(df, v0, v2);
-  auto t3 = InterleaveUpper(df, v1, v3);
-
-  auto m0 = InterleaveLower(df, t0, t1);
-  auto m1 = InterleaveUpper(df, t0, t1);
-  auto m2 = InterleaveLower(df, t2, t3);
-  auto m3 = InterleaveUpper(df, t2, t3);
-
-  Store(ConcatLowerLower(df, m1, m0), df, mem);
-  Store(ConcatLowerLower(df, m3, m2), df, mem + Lanes(df));
-  Store(ConcatUpperUpper(df, m1, m0), df, mem + 2 * Lanes(df));
-  Store(ConcatUpperUpper(df, m3, m2), df, mem + 3 * Lanes(df));
-#else
-  auto t0 = InterleaveLower(df, v0, v2);
-  auto t1 = InterleaveLower(df, v1, v3);
-  auto t2 = InterleaveUpper(df, v0, v2);
-  auto t3 = InterleaveUpper(df, v1, v3);
-
-  auto m0 = InterleaveLower(df, t0, t1);
-  auto m1 = InterleaveUpper(df, t0, t1);
-  auto m2 = InterleaveLower(df, t2, t3);
-  auto m3 = InterleaveUpper(df, t2, t3);
-
-  Store(Concat4(df, Quarter<0>(df, m0), Quarter<0>(df, m1), Quarter<0>(df, m2),
-                Quarter<0>(df, m3)),
-        df, mem);
-  Store(Concat4(df, Quarter<1>(df, m0), Quarter<1>(df, m1), Quarter<1>(df, m2),
-                Quarter<1>(df, m3)),
-        df, mem + Lanes(df));
-  Store(Concat4(df, Quarter<2>(df, m0), Quarter<2>(df, m1), Quarter<2>(df, m2),
-                Quarter<2>(df, m3)),
-        df, mem + 2 * Lanes(df));
-  Store(Concat4(df, Quarter<3>(df, m0), Quarter<3>(df, m1), Quarter<3>(df, m2),
-                Quarter<3>(df, m3)),
-        df, mem + 3 * Lanes(df));
-#endif
-}
-
-// Stores v0[0], v1[0], v2[0], v3[0], v4[0], v5[0], v6[0], v7[0], v0[1] ... to
-// mem, in this order. Mem must be aligned.
-template <class DF, class V>
-void StoreInterleaved(const DF df, V v0, V v1, V v2, V v3, V v4, V v5, V v6,
-                      V v7, float* mem) {
-#if HWY_TARGET == HWY_SCALAR
-  Store(v0, df, mem);
-  Store(v1, df, mem + 1);
-  Store(v2, df, mem + 2);
-  Store(v3, df, mem + 3);
-  Store(v4, df, mem + 4);
-  Store(v5, df, mem + 5);
-  Store(v6, df, mem + 6);
-  Store(v7, df, mem + 7);
-#elif !HWY_CAP_GE256
-  auto t0 = InterleaveLower(df, v0, v4);
-  auto t1 = InterleaveLower(df, v1, v5);
-  auto t2 = InterleaveLower(df, v2, v6);
-  auto t3 = InterleaveLower(df, v3, v7);
-  auto t4 = InterleaveUpper(df, v0, v4);
-  auto t5 = InterleaveUpper(df, v1, v5);
-  auto t6 = InterleaveUpper(df, v2, v6);
-  auto t7 = InterleaveUpper(df, v3, v7);
-
-  auto w0 = InterleaveLower(df, t0, t2);
-  auto w1 = InterleaveLower(df, t1, t3);
-  auto w2 = InterleaveUpper(df, t0, t2);
-  auto w3 = InterleaveUpper(df, t1, t3);
-  auto w4 = InterleaveLower(df, t4, t6);
-  auto w5 = InterleaveLower(df, t5, t7);
-  auto w6 = InterleaveUpper(df, t4, t6);
-  auto w7 = InterleaveUpper(df, t5, t7);
-
-  Store(InterleaveLower(df, w0, w1), df, mem);
-  Store(InterleaveUpper(df, w0, w1), df, mem + Lanes(df));
-  Store(InterleaveLower(df, w2, w3), df, mem + 2 * Lanes(df));
-  Store(InterleaveUpper(df, w2, w3), df, mem + 3 * Lanes(df));
-  Store(InterleaveLower(df, w4, w5), df, mem + 4 * Lanes(df));
-  Store(InterleaveUpper(df, w4, w5), df, mem + 5 * Lanes(df));
-  Store(InterleaveLower(df, w6, w7), df, mem + 6 * Lanes(df));
-  Store(InterleaveUpper(df, w6, w7), df, mem + 7 * Lanes(df));
-#elif !HWY_CAP_GE512
-  auto t0 = InterleaveLower(df, v0, v4);
-  auto t1 = InterleaveLower(df, v1, v5);
-  auto t2 = InterleaveLower(df, v2, v6);
-  auto t3 = InterleaveLower(df, v3, v7);
-  auto t4 = InterleaveUpper(df, v0, v4);
-  auto t5 = InterleaveUpper(df, v1, v5);
-  auto t6 = InterleaveUpper(df, v2, v6);
-  auto t7 = InterleaveUpper(df, v3, v7);
-
-  auto w0 = InterleaveLower(df, t0, t2);
-  auto w1 = InterleaveLower(df, t1, t3);
-  auto w2 = InterleaveUpper(df, t0, t2);
-  auto w3 = InterleaveUpper(df, t1, t3);
-  auto w4 = InterleaveLower(df, t4, t6);
-  auto w5 = InterleaveLower(df, t5, t7);
-  auto w6 = InterleaveUpper(df, t4, t6);
-  auto w7 = InterleaveUpper(df, t5, t7);
-
-  auto m0 = InterleaveLower(df, w0, w1);
-  auto m1 = InterleaveUpper(df, w0, w1);
-  auto m2 = InterleaveLower(df, w2, w3);
-  auto m3 = InterleaveUpper(df, w2, w3);
-  auto m4 = InterleaveLower(df, w4, w5);
-  auto m5 = InterleaveUpper(df, w4, w5);
-  auto m6 = InterleaveLower(df, w6, w7);
-  auto m7 = InterleaveUpper(df, w6, w7);
-
-  Store(ConcatLowerLower(df, m1, m0), df, mem);
-  Store(ConcatLowerLower(df, m3, m2), df, mem + Lanes(df));
-  Store(ConcatLowerLower(df, m5, m4), df, mem + 2 * Lanes(df));
-  Store(ConcatLowerLower(df, m7, m6), df, mem + 3 * Lanes(df));
-  Store(ConcatUpperUpper(df, m1, m0), df, mem + 4 * Lanes(df));
-  Store(ConcatUpperUpper(df, m3, m2), df, mem + 5 * Lanes(df));
-  Store(ConcatUpperUpper(df, m5, m4), df, mem + 6 * Lanes(df));
-  Store(ConcatUpperUpper(df, m7, m6), df, mem + 7 * Lanes(df));
-#else
-  auto t0 = InterleaveLower(df, v0, v4);
-  auto t1 = InterleaveLower(df, v1, v5);
-  auto t2 = InterleaveLower(df, v2, v6);
-  auto t3 = InterleaveLower(df, v3, v7);
-  auto t4 = InterleaveUpper(df, v0, v4);
-  auto t5 = InterleaveUpper(df, v1, v5);
-  auto t6 = InterleaveUpper(df, v2, v6);
-  auto t7 = InterleaveUpper(df, v3, v7);
-
-  auto w0 = InterleaveLower(df, t0, t2);
-  auto w1 = InterleaveLower(df, t1, t3);
-  auto w2 = InterleaveUpper(df, t0, t2);
-  auto w3 = InterleaveUpper(df, t1, t3);
-  auto w4 = InterleaveLower(df, t4, t6);
-  auto w5 = InterleaveLower(df, t5, t7);
-  auto w6 = InterleaveUpper(df, t4, t6);
-  auto w7 = InterleaveUpper(df, t5, t7);
-
-  auto m0 = InterleaveLower(df, w0, w1);
-  auto m1 = InterleaveUpper(df, w0, w1);
-  auto m2 = InterleaveLower(df, w2, w3);
-  auto m3 = InterleaveUpper(df, w2, w3);
-  auto m4 = InterleaveLower(df, w4, w5);
-  auto m5 = InterleaveUpper(df, w4, w5);
-  auto m6 = InterleaveLower(df, w6, w7);
-  auto m7 = InterleaveUpper(df, w6, w7);
-
-  Store(Concat4(df, Quarter<0>(df, m0), Quarter<0>(df, m1), Quarter<0>(df, m2),
-                Quarter<0>(df, m3)),
-        df, mem);
-  Store(Concat4(df, Quarter<0>(df, m4), Quarter<0>(df, m5), Quarter<0>(df, m6),
-                Quarter<0>(df, m7)),
-        df, mem + Lanes(df));
-  Store(Concat4(df, Quarter<1>(df, m0), Quarter<1>(df, m1), Quarter<1>(df, m2),
-                Quarter<1>(df, m3)),
-        df, mem + 2 * Lanes(df));
-  Store(Concat4(df, Quarter<1>(df, m4), Quarter<1>(df, m5), Quarter<1>(df, m6),
-                Quarter<1>(df, m7)),
-        df, mem + 3 * Lanes(df));
-  Store(Concat4(df, Quarter<2>(df, m0), Quarter<2>(df, m1), Quarter<2>(df, m2),
-                Quarter<2>(df, m3)),
-        df, mem + 4 * Lanes(df));
-  Store(Concat4(df, Quarter<2>(df, m4), Quarter<2>(df, m5), Quarter<2>(df, m6),
-                Quarter<2>(df, m7)),
-        df, mem + 5 * Lanes(df));
-  Store(Concat4(df, Quarter<3>(df, m0), Quarter<3>(df, m1), Quarter<3>(df, m2),
-                Quarter<3>(df, m3)),
-        df, mem + 6 * Lanes(df));
-  Store(Concat4(df, Quarter<3>(df, m4), Quarter<3>(df, m5), Quarter<3>(df, m6),
-                Quarter<3>(df, m7)),
-        df, mem + 7 * Lanes(df));
-#endif
-}
-
-#if HWY_CAP_GE256
-JXL_INLINE void Transpose8x8Block(const int32_t* JXL_RESTRICT from,
-                                  int32_t* JXL_RESTRICT to, size_t fromstride) {
-  const HWY_CAPPED(int32_t, 8) d;
-  auto i0 = Load(d, from);
-  auto i1 = Load(d, from + 1 * fromstride);
-  auto i2 = Load(d, from + 2 * fromstride);
-  auto i3 = Load(d, from + 3 * fromstride);
-  auto i4 = Load(d, from + 4 * fromstride);
-  auto i5 = Load(d, from + 5 * fromstride);
-  auto i6 = Load(d, from + 6 * fromstride);
-  auto i7 = Load(d, from + 7 * fromstride);
-
-  const auto q0 = InterleaveLower(d, i0, i2);
-  const auto q1 = InterleaveLower(d, i1, i3);
-  const auto q2 = InterleaveUpper(d, i0, i2);
-  const auto q3 = InterleaveUpper(d, i1, i3);
-  const auto q4 = InterleaveLower(d, i4, i6);
-  const auto q5 = InterleaveLower(d, i5, i7);
-  const auto q6 = InterleaveUpper(d, i4, i6);
-  const auto q7 = InterleaveUpper(d, i5, i7);
-
-  const auto r0 = InterleaveLower(d, q0, q1);
-  const auto r1 = InterleaveUpper(d, q0, q1);
-  const auto r2 = InterleaveLower(d, q2, q3);
-  const auto r3 = InterleaveUpper(d, q2, q3);
-  const auto r4 = InterleaveLower(d, q4, q5);
-  const auto r5 = InterleaveUpper(d, q4, q5);
-  const auto r6 = InterleaveLower(d, q6, q7);
-  const auto r7 = InterleaveUpper(d, q6, q7);
-
-  i0 = ConcatLowerLower(d, r4, r0);
-  i1 = ConcatLowerLower(d, r5, r1);
-  i2 = ConcatLowerLower(d, r6, r2);
-  i3 = ConcatLowerLower(d, r7, r3);
-  i4 = ConcatUpperUpper(d, r4, r0);
-  i5 = ConcatUpperUpper(d, r5, r1);
-  i6 = ConcatUpperUpper(d, r6, r2);
-  i7 = ConcatUpperUpper(d, r7, r3);
-
-  Store(i0, d, to);
-  Store(i1, d, to + 1 * 8);
-  Store(i2, d, to + 2 * 8);
-  Store(i3, d, to + 3 * 8);
-  Store(i4, d, to + 4 * 8);
-  Store(i5, d, to + 5 * 8);
-  Store(i6, d, to + 6 * 8);
-  Store(i7, d, to + 7 * 8);
-}
-#elif HWY_TARGET != HWY_SCALAR
-JXL_INLINE void Transpose8x8Block(const int32_t* JXL_RESTRICT from,
-                                  int32_t* JXL_RESTRICT to, size_t fromstride) {
-  const HWY_CAPPED(int32_t, 4) d;
-  for (size_t n = 0; n < 8; n += 4) {
-    for (size_t m = 0; m < 8; m += 4) {
-      auto p0 = Load(d, from + n * fromstride + m);
-      auto p1 = Load(d, from + (n + 1) * fromstride + m);
-      auto p2 = Load(d, from + (n + 2) * fromstride + m);
-      auto p3 = Load(d, from + (n + 3) * fromstride + m);
-      const auto q0 = InterleaveLower(d, p0, p2);
-      const auto q1 = InterleaveLower(d, p1, p3);
-      const auto q2 = InterleaveUpper(d, p0, p2);
-      const auto q3 = InterleaveUpper(d, p1, p3);
-
-      const auto r0 = InterleaveLower(d, q0, q1);
-      const auto r1 = InterleaveUpper(d, q0, q1);
-      const auto r2 = InterleaveLower(d, q2, q3);
-      const auto r3 = InterleaveUpper(d, q2, q3);
-      Store(r0, d, to + m * 8 + n);
-      Store(r1, d, to + (1 + m) * 8 + n);
-      Store(r2, d, to + (2 + m) * 8 + n);
-      Store(r3, d, to + (3 + m) * 8 + n);
-    }
-  }
-}
-
-#endif
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#endif  // LIB_JXL_SIMD_UTIL_INL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/simd_util.cc b/third_party/jpeg-xl/lib/jxl/simd_util.cc
deleted file mode 100644
index 8f33797877c6c..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/simd_util.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/simd_util.h"
-
-#include <cstddef>
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/simd_util.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-size_t MaxVectorSize() {
-  HWY_FULL(float) df;
-  return Lanes(df) * sizeof(float);
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-HWY_EXPORT(MaxVectorSize);
-
-size_t MaxVectorSize() {
-  // Ideally HWY framework should provide us this value.
-  // Less than ideal is to check all available targets and choose maximal.
-  // As for now, we just ask current active target, assuming it won't change.
-  return HWY_DYNAMIC_DISPATCH(MaxVectorSize)();
-}
-
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl/simd_util.h b/third_party/jpeg-xl/lib/jxl/simd_util.h
deleted file mode 100644
index a7ab50558df24..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/simd_util.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_SIMD_UTIL_H_
-#define LIB_JXL_SIMD_UTIL_H_
-
-#include <cstddef>
-
-namespace jxl {
-
-// Maximal vector size in bytes.
-size_t MaxVectorSize();
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_SIMD_UTIL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/simd_util_test.cc b/third_party/jpeg-xl/lib/jxl/simd_util_test.cc
deleted file mode 100644
index 94f7788a8e218..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/simd_util_test.cc
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/testing.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/simd_util_test.cc"
-#include <hwy/foreach_target.h>
-
-#include "lib/jxl/simd_util-inl.h"
-
-// Test utils
-#include <hwy/highway.h>
-#include <hwy/tests/hwy_gtest.h>
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-namespace {
-
-HWY_NOINLINE void TestInterleave2() {
-  HWY_FULL(float) d;
-  auto vec1 = Iota(d, 0 * 128.0);
-  auto vec2 = Iota(d, 1 * 128.0);
-  HWY_ALIGN float mem[MaxLanes(d) * 2];
-  StoreInterleaved(d, vec1, vec2, mem);
-  for (size_t i = 0; i < Lanes(d); i++) {
-    for (size_t j = 0; j < 2; j++) {
-      EXPECT_EQ(mem[2 * i + j], j * 128 + i) << "i: " << i << " j: " << j;
-    }
-  }
-}
-HWY_NOINLINE void TestInterleave4() {
-  HWY_FULL(float) d;
-  auto vec1 = Iota(d, 0 * 128.0);
-  auto vec2 = Iota(d, 1 * 128.0);
-  auto vec3 = Iota(d, 2 * 128.0);
-  auto vec4 = Iota(d, 3 * 128.0);
-  HWY_ALIGN float mem[MaxLanes(d) * 4];
-  StoreInterleaved(d, vec1, vec2, vec3, vec4, mem);
-  for (size_t i = 0; i < Lanes(d); i++) {
-    for (size_t j = 0; j < 4; j++) {
-      EXPECT_EQ(mem[4 * i + j], j * 128 + i) << "i: " << i << " j: " << j;
-    }
-  }
-}
-HWY_NOINLINE void TestInterleave8() {
-  HWY_FULL(float) d;
-  auto vec1 = Iota(d, 0 * 128.0);
-  auto vec2 = Iota(d, 1 * 128.0);
-  auto vec3 = Iota(d, 2 * 128.0);
-  auto vec4 = Iota(d, 3 * 128.0);
-  auto vec5 = Iota(d, 4 * 128.0);
-  auto vec6 = Iota(d, 5 * 128.0);
-  auto vec7 = Iota(d, 6 * 128.0);
-  auto vec8 = Iota(d, 7 * 128.0);
-  HWY_ALIGN float mem[MaxLanes(d) * 8];
-  StoreInterleaved(d, vec1, vec2, vec3, vec4, vec5, vec6, vec7, vec8, mem);
-  for (size_t i = 0; i < Lanes(d); i++) {
-    for (size_t j = 0; j < 8; j++) {
-      EXPECT_EQ(mem[8 * i + j], j * 128 + i) << "i: " << i << " j: " << j;
-    }
-  }
-}
-
-}  // namespace
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-class SimdUtilTargetTest : public hwy::TestWithParamTarget {};
-HWY_TARGET_INSTANTIATE_TEST_SUITE_P(SimdUtilTargetTest);
-
-HWY_EXPORT_AND_TEST_P(SimdUtilTargetTest, TestInterleave2);
-HWY_EXPORT_AND_TEST_P(SimdUtilTargetTest, TestInterleave4);
-HWY_EXPORT_AND_TEST_P(SimdUtilTargetTest, TestInterleave8);
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/speed_tier_test.cc b/third_party/jpeg-xl/lib/jxl/speed_tier_test.cc
deleted file mode 100644
index 4fedfaef6290d..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/speed_tier_test.cc
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/encode.h>
-#include <jxl/types.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <ios>
-#include <ostream>
-#include <string>
-#include <vector>
-
-#include "lib/extras/dec/jxl.h"
-#include "lib/extras/enc/jxl.h"
-#include "lib/jxl/common.h"
-#include "lib/jxl/test_image.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-struct SpeedTierTestParams {
-  explicit SpeedTierTestParams(const SpeedTier speed_tier,
-                               const bool shrink8 = false)
-      : speed_tier(speed_tier), shrink8(shrink8) {}
-  SpeedTier speed_tier;
-  bool shrink8;
-};
-
-std::ostream& operator<<(std::ostream& os, SpeedTierTestParams params) {
-  auto previous_flags = os.flags();
-  os << std::boolalpha;
-  os << "SpeedTierTestParams{" << static_cast<size_t>(params.speed_tier)
-     << ", /*shrink8=*/" << params.shrink8 << "}";
-  os.flags(previous_flags);
-  return os;
-}
-
-class SpeedTierTest : public testing::TestWithParam<SpeedTierTestParams> {};
-
-JXL_GTEST_INSTANTIATE_TEST_SUITE_P(
-    SpeedTierTestInstantiation, SpeedTierTest,
-    testing::Values(SpeedTierTestParams{SpeedTier::kCheetah,
-                                        /*shrink8=*/true},
-                    SpeedTierTestParams{SpeedTier::kCheetah,
-                                        /*shrink8=*/false},
-                    SpeedTierTestParams{SpeedTier::kThunder,
-                                        /*shrink8=*/true},
-                    SpeedTierTestParams{SpeedTier::kThunder,
-                                        /*shrink8=*/false},
-                    SpeedTierTestParams{SpeedTier::kLightning,
-                                        /*shrink8=*/true},
-                    SpeedTierTestParams{SpeedTier::kLightning,
-                                        /*shrink8=*/false},
-                    SpeedTierTestParams{SpeedTier::kFalcon,
-                                        /*shrink8=*/true},
-                    SpeedTierTestParams{SpeedTier::kFalcon,
-                                        /*shrink8=*/false},
-                    SpeedTierTestParams{SpeedTier::kHare,
-                                        /*shrink8=*/true},
-                    SpeedTierTestParams{SpeedTier::kHare,
-                                        /*shrink8=*/false},
-                    SpeedTierTestParams{SpeedTier::kWombat,
-                                        /*shrink8=*/true},
-                    SpeedTierTestParams{SpeedTier::kWombat,
-                                        /*shrink8=*/false},
-                    SpeedTierTestParams{SpeedTier::kSquirrel,
-                                        /*shrink8=*/true},
-                    SpeedTierTestParams{SpeedTier::kSquirrel,
-                                        /*shrink8=*/false},
-                    SpeedTierTestParams{SpeedTier::kKitten,
-                                        /*shrink8=*/false},
-                    // Only downscaled image for Tortoise mode.
-                    SpeedTierTestParams{SpeedTier::kTortoise,
-                                        /*shrink8=*/true},
-                    SpeedTierTestParams{SpeedTier::kGlacier,
-                                        /*shrink8=*/true}));
-
-TEST_P(SpeedTierTest, Roundtrip) {
-  const SpeedTierTestParams& params = GetParam();
-  const std::vector<uint8_t> orig = jxl::test::ReadTestData(
-      "external/wesaturate/500px/u76c0g_bliznaca_srgb8.png");
-  test::TestImage t;
-  ASSERT_TRUE(t.DecodeFromBytes(orig));
-  t.ClearMetadata();
-  if (params.speed_tier == SpeedTier::kGlacier) {
-    // just a few pixels will already take enough time at this setting
-    ASSERT_TRUE(t.SetDimensions(8, 8));
-  } else if (params.shrink8) {
-    ASSERT_TRUE(t.SetDimensions(t.ppf().xsize() / 8, t.ppf().ysize() / 8));
-  }
-
-  extras::JXLCompressParams cparams;
-  cparams.distance = 1.0f;
-  cparams.allow_expert_options = true;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_EFFORT,
-                    10 - static_cast<int>(params.speed_tier));
-  extras::JXLDecompressParams dparams;
-  dparams.accepted_formats = {{3, JXL_TYPE_UINT8, JXL_LITTLE_ENDIAN, 0}};
-
-  {
-    extras::PackedPixelFile ppf_out;
-    test::Roundtrip(t.ppf(), cparams, dparams, nullptr, &ppf_out);
-    EXPECT_LE(test::ButteraugliDistance(t.ppf(), ppf_out), 2.0);
-  }
-  if (params.shrink8) {
-    cparams.distance = 0.0f;
-    extras::PackedPixelFile ppf_out;
-    test::Roundtrip(t.ppf(), cparams, dparams, nullptr, &ppf_out);
-    EXPECT_EQ(0.0f, test::ComputeDistance2(t.ppf(), ppf_out));
-  }
-}
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/splines.cc b/third_party/jpeg-xl/lib/jxl/splines.cc
deleted file mode 100644
index 52b1c05402ddc..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/splines.cc
+++ /dev/null
@@ -1,727 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/splines.h"
-
-#include <jxl/memory_manager.h>
-
-#include <algorithm>
-#include <cinttypes>  // PRIu64
-#include <cmath>
-#include <limits>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/chroma_from_luma.h"
-#include "lib/jxl/common.h"  // JXL_HIGH_PRECISION
-#include "lib/jxl/dct_scales.h"
-#include "lib/jxl/dec_ans.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/pack_signed.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/splines.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/base/fast_math-inl.h"
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-namespace {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Mul;
-using hwy::HWY_NAMESPACE::MulAdd;
-using hwy::HWY_NAMESPACE::MulSub;
-using hwy::HWY_NAMESPACE::Sqrt;
-using hwy::HWY_NAMESPACE::Sub;
-
-// Given a set of DCT coefficients, this returns the result of performing cosine
-// interpolation on the original samples.
-float ContinuousIDCT(const Dct32& dct, const float t) {
-  // We compute here the DCT-3 of the `dct` vector, rescaled by a factor of
-  // sqrt(32). This is such that an input vector vector {x, 0, ..., 0} produces
-  // a constant result of x. dct[0] was scaled in Dequantize() to allow uniform
-  // treatment of all the coefficients.
-  constexpr float kMultipliers[32] = {
-      kPi / 32 * 0,  kPi / 32 * 1,  kPi / 32 * 2,  kPi / 32 * 3,  kPi / 32 * 4,
-      kPi / 32 * 5,  kPi / 32 * 6,  kPi / 32 * 7,  kPi / 32 * 8,  kPi / 32 * 9,
-      kPi / 32 * 10, kPi / 32 * 11, kPi / 32 * 12, kPi / 32 * 13, kPi / 32 * 14,
-      kPi / 32 * 15, kPi / 32 * 16, kPi / 32 * 17, kPi / 32 * 18, kPi / 32 * 19,
-      kPi / 32 * 20, kPi / 32 * 21, kPi / 32 * 22, kPi / 32 * 23, kPi / 32 * 24,
-      kPi / 32 * 25, kPi / 32 * 26, kPi / 32 * 27, kPi / 32 * 28, kPi / 32 * 29,
-      kPi / 32 * 30, kPi / 32 * 31,
-  };
-  HWY_CAPPED(float, 32) df;
-  auto result = Zero(df);
-  const auto tandhalf = Set(df, t + 0.5f);
-  for (int i = 0; i < 32; i += Lanes(df)) {
-    auto cos_arg = Mul(LoadU(df, kMultipliers + i), tandhalf);
-    auto cos = FastCosf(df, cos_arg);
-    auto local_res = Mul(LoadU(df, dct.data() + i), cos);
-    result = MulAdd(Set(df, kSqrt2), local_res, result);
-  }
-  return GetLane(SumOfLanes(df, result));
-}
-
-template <typename DF>
-void DrawSegment(DF df, const SplineSegment& segment, const bool add,
-                 const size_t y, const size_t x, float* JXL_RESTRICT rows[3]) {
-  Rebind<int32_t, DF> di;
-  const auto inv_sigma = Set(df, segment.inv_sigma);
-  const auto half = Set(df, 0.5f);
-  const auto one_over_2s2 = Set(df, 0.353553391f);
-  const auto sigma_over_4_times_intensity =
-      Set(df, segment.sigma_over_4_times_intensity);
-  const auto dx = Sub(ConvertTo(df, Iota(di, x)), Set(df, segment.center_x));
-  const auto dy = Set(df, y - segment.center_y);
-  const auto sqd = MulAdd(dx, dx, Mul(dy, dy));
-  const auto distance = Sqrt(sqd);
-  const auto one_dimensional_factor =
-      Sub(FastErff(df, Mul(MulAdd(distance, half, one_over_2s2), inv_sigma)),
-          FastErff(df, Mul(MulSub(distance, half, one_over_2s2), inv_sigma)));
-  auto local_intensity =
-      Mul(sigma_over_4_times_intensity,
-          Mul(one_dimensional_factor, one_dimensional_factor));
-  for (size_t c = 0; c < 3; ++c) {
-    const auto cm = Set(df, add ? segment.color[c] : -segment.color[c]);
-    const auto in = LoadU(df, rows[c] + x);
-    StoreU(MulAdd(cm, local_intensity, in), df, rows[c] + x);
-  }
-}
-
-void DrawSegment(const SplineSegment& segment, const bool add, const size_t y,
-                 const ssize_t x0, ssize_t x1, float* JXL_RESTRICT rows[3]) {
-  ssize_t x = std::max<ssize_t>(
-      x0, std::llround(segment.center_x - segment.maximum_distance));
-  // one-past-the-end
-  x1 = std::min<ssize_t>(
-      x1, std::llround(segment.center_x + segment.maximum_distance) + 1);
-  HWY_FULL(float) df;
-  for (; x + static_cast<ssize_t>(Lanes(df)) <= x1; x += Lanes(df)) {
-    DrawSegment(df, segment, add, y, x, rows);
-  }
-  for (; x < x1; ++x) {
-    DrawSegment(HWY_CAPPED(float, 1)(), segment, add, y, x, rows);
-  }
-}
-
-void ComputeSegments(const Spline::Point& center, const float intensity,
-                     const float color[3], const float sigma,
-                     std::vector<SplineSegment>& segments,
-                     std::vector<std::pair<size_t, size_t>>& segments_by_y) {
-  // Sanity check sigma, inverse sigma and intensity
-  if (!(std::isfinite(sigma) && sigma != 0.0f && std::isfinite(1.0f / sigma) &&
-        std::isfinite(intensity))) {
-    return;
-  }
-#if JXL_HIGH_PRECISION
-  constexpr float kDistanceExp = 5;
-#else
-  // About 30% faster.
-  constexpr float kDistanceExp = 3;
-#endif
-  // We cap from below colors to at least 0.01.
-  float max_color = 0.01f;
-  for (size_t c = 0; c < 3; c++) {
-    max_color = std::max(max_color, std::abs(color[c] * intensity));
-  }
-  // Distance beyond which max_color*intensity*exp(-d^2 / (2 * sigma^2)) drops
-  // below 10^-kDistanceExp.
-  const float maximum_distance =
-      std::sqrt(-2 * sigma * sigma *
-                (std::log(0.1) * kDistanceExp - std::log(max_color)));
-  SplineSegment segment;
-  segment.center_y = center.y;
-  segment.center_x = center.x;
-  memcpy(segment.color, color, sizeof(segment.color));
-  segment.inv_sigma = 1.0f / sigma;
-  segment.sigma_over_4_times_intensity = .25f * sigma * intensity;
-  segment.maximum_distance = maximum_distance;
-  ssize_t y0 = std::llround(center.y - maximum_distance);
-  ssize_t y1 =
-      std::llround(center.y + maximum_distance) + 1;  // one-past-the-end
-  for (ssize_t y = std::max<ssize_t>(y0, 0); y < y1; y++) {
-    segments_by_y.emplace_back(y, segments.size());
-  }
-  segments.push_back(segment);
-}
-
-void DrawSegments(float* JXL_RESTRICT row_x, float* JXL_RESTRICT row_y,
-                  float* JXL_RESTRICT row_b, size_t y, size_t x0, size_t x1,
-                  const bool add, const SplineSegment* segments,
-                  const size_t* segment_indices,
-                  const size_t* segment_y_start) {
-  float* JXL_RESTRICT rows[3] = {row_x - x0, row_y - x0, row_b - x0};
-  for (size_t i = segment_y_start[y]; i < segment_y_start[y + 1]; i++) {
-    DrawSegment(segments[segment_indices[i]], add, y, x0, x1, rows);
-  }
-}
-
-void SegmentsFromPoints(
-    const Spline& spline,
-    const std::vector<std::pair<Spline::Point, float>>& points_to_draw,
-    const float arc_length, std::vector<SplineSegment>& segments,
-    std::vector<std::pair<size_t, size_t>>& segments_by_y) {
-  const float inv_arc_length = 1.0f / arc_length;
-  int k = 0;
-  for (const auto& point_to_draw : points_to_draw) {
-    const Spline::Point& point = point_to_draw.first;
-    const float multiplier = point_to_draw.second;
-    const float progress_along_arc =
-        std::min(1.f, (k * kDesiredRenderingDistance) * inv_arc_length);
-    ++k;
-    float color[3];
-    for (size_t c = 0; c < 3; ++c) {
-      color[c] =
-          ContinuousIDCT(spline.color_dct[c], (32 - 1) * progress_along_arc);
-    }
-    const float sigma =
-        ContinuousIDCT(spline.sigma_dct, (32 - 1) * progress_along_arc);
-    ComputeSegments(point, multiplier, color, sigma, segments, segments_by_y);
-  }
-}
-}  // namespace
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-HWY_EXPORT(SegmentsFromPoints);
-HWY_EXPORT(DrawSegments);
-
-namespace {
-
-// It is not in spec, but reasonable limit to avoid overflows.
-template <typename T>
-Status ValidateSplinePointPos(const T& x, const T& y) {
-  constexpr T kSplinePosLimit = 1u << 23;
-  if ((x >= kSplinePosLimit) || (x <= -kSplinePosLimit) ||
-      (y >= kSplinePosLimit) || (y <= -kSplinePosLimit)) {
-    return JXL_FAILURE("Spline coordinates out of bounds");
-  }
-  return true;
-}
-
-// Maximum number of spline control points per frame is
-//   std::min(kMaxNumControlPoints, xsize * ysize / 2)
-constexpr size_t kMaxNumControlPoints = 1u << 20u;
-constexpr size_t kMaxNumControlPointsPerPixelRatio = 2;
-
-float AdjustedQuant(const int32_t adjustment) {
-  return (adjustment >= 0) ? (1.f + .125f * adjustment)
-                           : 1.f / (1.f - .125f * adjustment);
-}
-
-float InvAdjustedQuant(const int32_t adjustment) {
-  return (adjustment >= 0) ? 1.f / (1.f + .125f * adjustment)
-                           : (1.f - .125f * adjustment);
-}
-
-// X, Y, B, sigma.
-constexpr float kChannelWeight[] = {0.0042f, 0.075f, 0.07f, .3333f};
-
-Status DecodeAllStartingPoints(std::vector<Spline::Point>* const points,
-                               BitReader* const br, ANSSymbolReader* reader,
-                               const std::vector<uint8_t>& context_map,
-                               const size_t num_splines) {
-  points->clear();
-  points->reserve(num_splines);
-  int64_t last_x = 0;
-  int64_t last_y = 0;
-  for (size_t i = 0; i < num_splines; i++) {
-    int64_t x =
-        reader->ReadHybridUint(kStartingPositionContext, br, context_map);
-    int64_t y =
-        reader->ReadHybridUint(kStartingPositionContext, br, context_map);
-    if (i != 0) {
-      x = UnpackSigned(x) + last_x;
-      y = UnpackSigned(y) + last_y;
-    }
-    JXL_RETURN_IF_ERROR(ValidateSplinePointPos(x, y));
-    points->emplace_back(static_cast<float>(x), static_cast<float>(y));
-    last_x = x;
-    last_y = y;
-  }
-  return true;
-}
-
-struct Vector {
-  float x, y;
-  Vector operator-() const { return {-x, -y}; }
-  Vector operator+(const Vector& other) const {
-    return {x + other.x, y + other.y};
-  }
-  float SquaredNorm() const { return x * x + y * y; }
-};
-Vector operator*(const float k, const Vector& vec) {
-  return {k * vec.x, k * vec.y};
-}
-
-Spline::Point operator+(const Spline::Point& p, const Vector& vec) {
-  return {p.x + vec.x, p.y + vec.y};
-}
-Vector operator-(const Spline::Point& a, const Spline::Point& b) {
-  return {a.x - b.x, a.y - b.y};
-}
-
-// TODO(eustas): avoid making a copy of "points".
-void DrawCentripetalCatmullRomSpline(std::vector<Spline::Point> points,
-                                     std::vector<Spline::Point>& result) {
-  if (points.empty()) return;
-  if (points.size() == 1) {
-    result.push_back(points[0]);
-    return;
-  }
-  // Number of points to compute between each control point.
-  static constexpr int kNumPoints = 16;
-  result.reserve((points.size() - 1) * kNumPoints + 1);
-  points.insert(points.begin(), points[0] + (points[0] - points[1]));
-  points.push_back(points[points.size() - 1] +
-                   (points[points.size() - 1] - points[points.size() - 2]));
-  // points has at least 4 elements at this point.
-  for (size_t start = 0; start < points.size() - 3; ++start) {
-    // 4 of them are used, and we draw from p[1] to p[2].
-    const Spline::Point* const p = &points[start];
-    result.push_back(p[1]);
-    float d[3];
-    float t[4];
-    t[0] = 0;
-    for (int k = 0; k < 3; ++k) {
-      // TODO(eustas): for each segment delta is calculated 3 times...
-      // TODO(eustas): restrict d[k] with reasonable limit and spec it.
-      d[k] = std::sqrt(hypotf(p[k + 1].x - p[k].x, p[k + 1].y - p[k].y));
-      t[k + 1] = t[k] + d[k];
-    }
-    for (int i = 1; i < kNumPoints; ++i) {
-      const float tt = d[0] + (static_cast<float>(i) / kNumPoints) * d[1];
-      Spline::Point a[3];
-      for (int k = 0; k < 3; ++k) {
-        // TODO(eustas): reciprocal multiplication would be faster.
-        a[k] = p[k] + ((tt - t[k]) / d[k]) * (p[k + 1] - p[k]);
-      }
-      Spline::Point b[2];
-      for (int k = 0; k < 2; ++k) {
-        b[k] = a[k] + ((tt - t[k]) / (d[k] + d[k + 1])) * (a[k + 1] - a[k]);
-      }
-      result.push_back(b[0] + ((tt - t[1]) / d[1]) * (b[1] - b[0]));
-    }
-  }
-  result.push_back(points[points.size() - 2]);
-}
-
-// Move along the line segments defined by `points`, `kDesiredRenderingDistance`
-// pixels at a time, and call `functor` with each point and the actual distance
-// to the previous point (which will always be kDesiredRenderingDistance except
-// possibly for the very last point).
-// TODO(eustas): this method always adds the last point, but never the first
-//               (unless those are one); I believe both ends matter.
-template <typename Points, typename Functor>
-Status ForEachEquallySpacedPoint(const Points& points, const Functor& functor) {
-  JXL_ENSURE(!points.empty());
-  Spline::Point current = points.front();
-  functor(current, kDesiredRenderingDistance);
-  auto next = points.begin();
-  while (next != points.end()) {
-    const Spline::Point* previous = &current;
-    float arclength_from_previous = 0.f;
-    for (;;) {
-      if (next == points.end()) {
-        functor(*previous, arclength_from_previous);
-        return true;
-      }
-      const float arclength_to_next =
-          std::sqrt((*next - *previous).SquaredNorm());
-      if (arclength_from_previous + arclength_to_next >=
-          kDesiredRenderingDistance) {
-        current =
-            *previous + ((kDesiredRenderingDistance - arclength_from_previous) /
-                         arclength_to_next) *
-                            (*next - *previous);
-        functor(current, kDesiredRenderingDistance);
-        break;
-      }
-      arclength_from_previous += arclength_to_next;
-      previous = &*next;
-      ++next;
-    }
-  }
-  return true;
-}
-
-}  // namespace
-
-StatusOr<QuantizedSpline> QuantizedSpline::Create(
-    const Spline& original, const int32_t quantization_adjustment,
-    const float y_to_x, const float y_to_b) {
-  JXL_ENSURE(!original.control_points.empty());
-  QuantizedSpline result;
-  result.control_points_.reserve(original.control_points.size() - 1);
-  const Spline::Point& starting_point = original.control_points.front();
-  int previous_x = static_cast<int>(std::roundf(starting_point.x));
-  int previous_y = static_cast<int>(std::roundf(starting_point.y));
-  int previous_delta_x = 0;
-  int previous_delta_y = 0;
-  for (auto it = original.control_points.begin() + 1;
-       it != original.control_points.end(); ++it) {
-    const int new_x = static_cast<int>(std::roundf(it->x));
-    const int new_y = static_cast<int>(std::roundf(it->y));
-    const int new_delta_x = new_x - previous_x;
-    const int new_delta_y = new_y - previous_y;
-    result.control_points_.emplace_back(new_delta_x - previous_delta_x,
-                                        new_delta_y - previous_delta_y);
-    previous_delta_x = new_delta_x;
-    previous_delta_y = new_delta_y;
-    previous_x = new_x;
-    previous_y = new_y;
-  }
-
-  const auto to_int = [](float v) -> int {
-    // Maximal int representable with float.
-    constexpr float kMax = std::numeric_limits<int>::max() - 127;
-    constexpr float kMin = -kMax;
-    return static_cast<int>(std::roundf(Clamp1(v, kMin, kMax)));
-  };
-
-  const auto quant = AdjustedQuant(quantization_adjustment);
-  const auto inv_quant = InvAdjustedQuant(quantization_adjustment);
-  for (int c : {1, 0, 2}) {
-    float factor = (c == 0) ? y_to_x : (c == 1) ? 0 : y_to_b;
-    for (int i = 0; i < 32; ++i) {
-      const float dct_factor = (i == 0) ? kSqrt2 : 1.0f;
-      const float inv_dct_factor = (i == 0) ? kSqrt0_5 : 1.0f;
-      auto restored_y = result.color_dct_[1][i] * inv_dct_factor *
-                        kChannelWeight[1] * inv_quant;
-      auto decorrelated = original.color_dct[c][i] - factor * restored_y;
-      result.color_dct_[c][i] =
-          to_int(decorrelated * dct_factor * quant / kChannelWeight[c]);
-    }
-  }
-  for (int i = 0; i < 32; ++i) {
-    const float dct_factor = (i == 0) ? kSqrt2 : 1.0f;
-    result.sigma_dct_[i] =
-        to_int(original.sigma_dct[i] * dct_factor * quant / kChannelWeight[3]);
-  }
-  return result;
-}
-
-Status QuantizedSpline::Dequantize(const Spline::Point& starting_point,
-                                   const int32_t quantization_adjustment,
-                                   const float y_to_x, const float y_to_b,
-                                   const uint64_t image_size,
-                                   uint64_t* total_estimated_area_reached,
-                                   Spline& result) const {
-  constexpr uint64_t kOne = static_cast<uint64_t>(1);
-  const uint64_t area_limit =
-      std::min(1024 * image_size + (kOne << 32), kOne << 42);
-
-  result.control_points.clear();
-  result.control_points.reserve(control_points_.size() + 1);
-  float px = std::roundf(starting_point.x);
-  float py = std::roundf(starting_point.y);
-  JXL_RETURN_IF_ERROR(ValidateSplinePointPos(px, py));
-  int current_x = static_cast<int>(px);
-  int current_y = static_cast<int>(py);
-  result.control_points.emplace_back(static_cast<float>(current_x),
-                                     static_cast<float>(current_y));
-  int current_delta_x = 0;
-  int current_delta_y = 0;
-  uint64_t manhattan_distance = 0;
-  for (const auto& point : control_points_) {
-    current_delta_x += point.first;
-    current_delta_y += point.second;
-    manhattan_distance += std::abs(current_delta_x) + std::abs(current_delta_y);
-    if (manhattan_distance > area_limit) {
-      return JXL_FAILURE("Too large manhattan_distance reached: %" PRIu64,
-                         manhattan_distance);
-    }
-    JXL_RETURN_IF_ERROR(
-        ValidateSplinePointPos(current_delta_x, current_delta_y));
-    current_x += current_delta_x;
-    current_y += current_delta_y;
-    JXL_RETURN_IF_ERROR(ValidateSplinePointPos(current_x, current_y));
-    result.control_points.emplace_back(static_cast<float>(current_x),
-                                       static_cast<float>(current_y));
-  }
-
-  const auto inv_quant = InvAdjustedQuant(quantization_adjustment);
-  for (int c = 0; c < 3; ++c) {
-    for (int i = 0; i < 32; ++i) {
-      const float inv_dct_factor = (i == 0) ? kSqrt0_5 : 1.0f;
-      result.color_dct[c][i] =
-          color_dct_[c][i] * inv_dct_factor * kChannelWeight[c] * inv_quant;
-    }
-  }
-  for (int i = 0; i < 32; ++i) {
-    result.color_dct[0][i] += y_to_x * result.color_dct[1][i];
-    result.color_dct[2][i] += y_to_b * result.color_dct[1][i];
-  }
-  uint64_t width_estimate = 0;
-
-  uint64_t color[3] = {};
-  for (int c = 0; c < 3; ++c) {
-    for (int i = 0; i < 32; ++i) {
-      color[c] += static_cast<uint64_t>(
-          std::ceil(inv_quant * std::abs(color_dct_[c][i])));
-    }
-  }
-  color[0] += static_cast<uint64_t>(std::ceil(std::abs(y_to_x))) * color[1];
-  color[2] += static_cast<uint64_t>(std::ceil(std::abs(y_to_b))) * color[1];
-  // This is not taking kChannelWeight into account, but up to constant factors
-  // it gives an indication of the influence of the color values on the area
-  // that will need to be rendered.
-  const uint64_t max_color = std::max({color[1], color[0], color[2]});
-  uint64_t logcolor =
-      std::max(kOne, static_cast<uint64_t>(CeilLog2Nonzero(kOne + max_color)));
-
-  const float weight_limit =
-      std::ceil(std::sqrt((static_cast<float>(area_limit) / logcolor) /
-                          std::max<size_t>(1, manhattan_distance)));
-
-  for (int i = 0; i < 32; ++i) {
-    const float inv_dct_factor = (i == 0) ? kSqrt0_5 : 1.0f;
-    result.sigma_dct[i] =
-        sigma_dct_[i] * inv_dct_factor * kChannelWeight[3] * inv_quant;
-    // If we include the factor kChannelWeight[3]=.3333f here, we get a
-    // realistic area estimate. We leave it out to simplify the calculations,
-    // and understand that this way we underestimate the area by a factor of
-    // 1/(0.3333*0.3333). This is taken into account in the limits below.
-    float weight_f = std::ceil(inv_quant * std::abs(sigma_dct_[i]));
-    uint64_t weight =
-        static_cast<uint64_t>(std::min(weight_limit, std::max(1.0f, weight_f)));
-    width_estimate += weight * weight * logcolor;
-  }
-  *total_estimated_area_reached += (width_estimate * manhattan_distance);
-  if (*total_estimated_area_reached > area_limit) {
-    return JXL_FAILURE("Too large total_estimated_area eached: %" PRIu64,
-                       *total_estimated_area_reached);
-  }
-
-  return true;
-}
-
-Status QuantizedSpline::Decode(const std::vector<uint8_t>& context_map,
-                               ANSSymbolReader* const decoder,
-                               BitReader* const br,
-                               const size_t max_control_points,
-                               size_t* total_num_control_points) {
-  const size_t num_control_points =
-      decoder->ReadHybridUint(kNumControlPointsContext, br, context_map);
-  if (num_control_points > max_control_points) {
-    return JXL_FAILURE("Too many control points: %" PRIuS, num_control_points);
-  }
-  *total_num_control_points += num_control_points;
-  if (*total_num_control_points > max_control_points) {
-    return JXL_FAILURE("Too many control points: %" PRIuS,
-                       *total_num_control_points);
-  }
-  control_points_.resize(num_control_points);
-  // Maximal image dimension.
-  constexpr int64_t kDeltaLimit = 1u << 30;
-  for (std::pair<int64_t, int64_t>& control_point : control_points_) {
-    control_point.first = UnpackSigned(
-        decoder->ReadHybridUint(kControlPointsContext, br, context_map));
-    control_point.second = UnpackSigned(
-        decoder->ReadHybridUint(kControlPointsContext, br, context_map));
-    // Check delta-deltas are not outrageous; it is not in spec, but there is
-    // no reason to allow larger values.
-    if ((control_point.first >= kDeltaLimit) ||
-        (control_point.first <= -kDeltaLimit) ||
-        (control_point.second >= kDeltaLimit) ||
-        (control_point.second <= -kDeltaLimit)) {
-      return JXL_FAILURE("Spline delta-delta is out of bounds");
-    }
-  }
-
-  const auto decode_dct = [decoder, br, &context_map](int dct[32]) -> Status {
-    constexpr int kWeirdNumber = std::numeric_limits<int>::min();
-    for (int i = 0; i < 32; ++i) {
-      dct[i] =
-          UnpackSigned(decoder->ReadHybridUint(kDCTContext, br, context_map));
-      if (dct[i] == kWeirdNumber) {
-        return JXL_FAILURE("The weird number in spline DCT");
-      }
-    }
-    return true;
-  };
-  for (auto& dct : color_dct_) {
-    JXL_RETURN_IF_ERROR(decode_dct(dct));
-  }
-  JXL_RETURN_IF_ERROR(decode_dct(sigma_dct_));
-  return true;
-}
-
-void Splines::Clear() {
-  quantization_adjustment_ = 0;
-  splines_.clear();
-  starting_points_.clear();
-  segments_.clear();
-  segment_indices_.clear();
-  segment_y_start_.clear();
-}
-
-Status Splines::Decode(JxlMemoryManager* memory_manager, jxl::BitReader* br,
-                       const size_t num_pixels) {
-  std::vector<uint8_t> context_map;
-  ANSCode code;
-  JXL_RETURN_IF_ERROR(DecodeHistograms(memory_manager, br, kNumSplineContexts,
-                                       &code, &context_map));
-  JXL_ASSIGN_OR_RETURN(ANSSymbolReader decoder,
-                       ANSSymbolReader::Create(&code, br));
-  size_t num_splines =
-      decoder.ReadHybridUint(kNumSplinesContext, br, context_map);
-  size_t max_control_points = std::min(
-      kMaxNumControlPoints, num_pixels / kMaxNumControlPointsPerPixelRatio);
-  if (num_splines > max_control_points ||
-      num_splines + 1 > max_control_points) {
-    return JXL_FAILURE("Too many splines: %" PRIuS, num_splines);
-  }
-  num_splines++;
-  JXL_RETURN_IF_ERROR(DecodeAllStartingPoints(&starting_points_, br, &decoder,
-                                              context_map, num_splines));
-
-  quantization_adjustment_ = UnpackSigned(
-      decoder.ReadHybridUint(kQuantizationAdjustmentContext, br, context_map));
-
-  splines_.clear();
-  splines_.reserve(num_splines);
-  size_t num_control_points = num_splines;
-  for (size_t i = 0; i < num_splines; ++i) {
-    QuantizedSpline spline;
-    JXL_RETURN_IF_ERROR(spline.Decode(context_map, &decoder, br,
-                                      max_control_points, &num_control_points));
-    splines_.push_back(std::move(spline));
-  }
-
-  JXL_RETURN_IF_ERROR(decoder.CheckANSFinalState());
-
-  if (!HasAny()) {
-    return JXL_FAILURE("Decoded splines but got none");
-  }
-
-  return true;
-}
-
-void Splines::AddTo(Image3F* const opsin, const Rect& opsin_rect) const {
-  Apply</*add=*/true>(opsin, opsin_rect);
-}
-void Splines::AddToRow(float* JXL_RESTRICT row_x, float* JXL_RESTRICT row_y,
-                       float* JXL_RESTRICT row_b, size_t y, size_t x0,
-                       size_t x1) const {
-  ApplyToRow</*add=*/true>(row_x, row_y, row_b, y, x0, x1);
-}
-
-void Splines::SubtractFrom(Image3F* const opsin) const {
-  Apply</*add=*/false>(opsin, Rect(*opsin));
-}
-
-Status Splines::InitializeDrawCache(const size_t image_xsize,
-                                    const size_t image_ysize,
-                                    const ColorCorrelation& color_correlation) {
-  // TODO(veluca): avoid storing segments that are entirely outside image
-  // boundaries.
-  segments_.clear();
-  segment_indices_.clear();
-  segment_y_start_.clear();
-  std::vector<std::pair<size_t, size_t>> segments_by_y;
-  std::vector<Spline::Point> intermediate_points;
-  uint64_t total_estimated_area_reached = 0;
-  std::vector<Spline> splines;
-  for (size_t i = 0; i < splines_.size(); ++i) {
-    Spline spline;
-    JXL_RETURN_IF_ERROR(splines_[i].Dequantize(
-        starting_points_[i], quantization_adjustment_,
-        color_correlation.YtoXRatio(0), color_correlation.YtoBRatio(0),
-        image_xsize * image_ysize, &total_estimated_area_reached, spline));
-    if (std::adjacent_find(spline.control_points.begin(),
-                           spline.control_points.end()) !=
-        spline.control_points.end()) {
-      // Otherwise division by zero might occur. Once control points coincide,
-      // the direction of curve is undefined...
-      return JXL_FAILURE(
-          "identical successive control points in spline %" PRIuS, i);
-    }
-    splines.push_back(spline);
-  }
-  // TODO(firsching) Change this into a JXL_FAILURE for level 5 codestreams.
-  if (total_estimated_area_reached >
-      std::min(
-          (8 * image_xsize * image_ysize + (static_cast<uint64_t>(1) << 25)),
-          (static_cast<uint64_t>(1) << 30))) {
-    JXL_WARNING(
-        "Large total_estimated_area_reached, expect slower decoding: %" PRIu64,
-        total_estimated_area_reached);
-#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
-    return JXL_FAILURE("Total spline area is too large");
-#endif
-  }
-
-  for (Spline& spline : splines) {
-    std::vector<std::pair<Spline::Point, float>> points_to_draw;
-    auto add_point = [&](const Spline::Point& point, const float multiplier) {
-      points_to_draw.emplace_back(point, multiplier);
-    };
-    intermediate_points.clear();
-    DrawCentripetalCatmullRomSpline(spline.control_points, intermediate_points);
-    JXL_RETURN_IF_ERROR(
-        ForEachEquallySpacedPoint(intermediate_points, add_point));
-    const float arc_length =
-        (points_to_draw.size() - 2) * kDesiredRenderingDistance +
-        points_to_draw.back().second;
-    if (arc_length <= 0.f) {
-      // This spline wouldn't have any effect.
-      continue;
-    }
-    HWY_DYNAMIC_DISPATCH(SegmentsFromPoints)
-    (spline, points_to_draw, arc_length, segments_, segments_by_y);
-  }
-
-  // TODO(eustas): consider linear sorting here.
-  std::sort(segments_by_y.begin(), segments_by_y.end());
-  segment_indices_.resize(segments_by_y.size());
-  segment_y_start_.resize(image_ysize + 1);
-  for (size_t i = 0; i < segments_by_y.size(); i++) {
-    segment_indices_[i] = segments_by_y[i].second;
-    size_t y = segments_by_y[i].first;
-    if (y < image_ysize) {
-      segment_y_start_[y + 1]++;
-    }
-  }
-  for (size_t y = 0; y < image_ysize; y++) {
-    segment_y_start_[y + 1] += segment_y_start_[y];
-  }
-  return true;
-}
-
-template <bool add>
-void Splines::ApplyToRow(float* JXL_RESTRICT row_x, float* JXL_RESTRICT row_y,
-                         float* JXL_RESTRICT row_b, size_t y, size_t x0,
-                         size_t x1) const {
-  if (segments_.empty()) return;
-  HWY_DYNAMIC_DISPATCH(DrawSegments)
-  (row_x, row_y, row_b, y, x0, x1, add, segments_.data(),
-   segment_indices_.data(), segment_y_start_.data());
-}
-
-template <bool add>
-void Splines::Apply(Image3F* const opsin, const Rect& opsin_rect) const {
-  if (segments_.empty()) return;
-  const size_t y0 = opsin_rect.y0();
-  const size_t x0 = opsin_rect.x0();
-  const size_t x1 = opsin_rect.x1();
-  for (size_t y = 0; y < opsin_rect.ysize(); y++) {
-    ApplyToRow<add>(opsin->PlaneRow(0, y0 + y) + x0,
-                    opsin->PlaneRow(1, y0 + y) + x0,
-                    opsin->PlaneRow(2, y0 + y) + x0, y0 + y, x0, x1);
-  }
-}
-
-}  // namespace jxl
-#endif  // HWY_ONCE
diff --git a/third_party/jpeg-xl/lib/jxl/splines.h b/third_party/jpeg-xl/lib/jxl/splines.h
deleted file mode 100644
index b1de65a7312c0..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/splines.h
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_SPLINES_H_
-#define LIB_JXL_SPLINES_H_
-
-#include <jxl/memory_manager.h>
-
-#include <array>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <utility>
-#include <vector>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/chroma_from_luma.h"
-#include "lib/jxl/image.h"
-
-namespace jxl {
-
-class ANSSymbolReader;
-class BitReader;
-
-static constexpr float kDesiredRenderingDistance = 1.f;
-
-typedef std::array<float, 32> Dct32;
-
-enum SplineEntropyContexts : size_t {
-  kQuantizationAdjustmentContext = 0,
-  kStartingPositionContext,
-  kNumSplinesContext,
-  kNumControlPointsContext,
-  kControlPointsContext,
-  kDCTContext,
-  kNumSplineContexts
-};
-
-struct Spline {
-  struct Point {
-    Point() : x(0.0f), y(0.0f) {}
-    Point(float x, float y) : x(x), y(y) {}
-    float x, y;
-    bool operator==(const Point& other) const {
-      return std::fabs(x - other.x) < 1e-3f && std::fabs(y - other.y) < 1e-3f;
-    }
-  };
-  std::vector<Point> control_points;
-  // X, Y, B.
-  std::array<Dct32, 3> color_dct;
-  // Splines are draws by normalized Gaussian splatting. This controls the
-  // Gaussian's parameter along the spline.
-  Dct32 sigma_dct;
-};
-
-class QuantizedSplineEncoder;
-
-class QuantizedSpline {
- public:
-  QuantizedSpline() = default;
-
-  // TODO(eustas): move this out of library code
-  static StatusOr<QuantizedSpline> Create(const Spline& original,
-                                          int32_t quantization_adjustment,
-                                          float y_to_x, float y_to_b);
-
-  Status Dequantize(const Spline::Point& starting_point,
-                    int32_t quantization_adjustment, float y_to_x, float y_to_b,
-                    uint64_t image_size, uint64_t* total_estimated_area_reached,
-                    Spline& result) const;
-
-  Status Decode(const std::vector<uint8_t>& context_map,
-                ANSSymbolReader* decoder, BitReader* br,
-                size_t max_control_points, size_t* total_num_control_points);
-
- private:
-  friend class QuantizedSplineEncoder;
-
-  std::vector<std::pair<int64_t, int64_t>>
-      control_points_;  // Double delta-encoded.
-  int color_dct_[3][32] = {};
-  int sigma_dct_[32] = {};
-};
-
-// A single "drawable unit" of a spline, i.e. a line of the region in which we
-// render each Gaussian. The structure doesn't actually depend on the exact
-// row, which allows reuse for different y values (which are tracked
-// separately).
-struct SplineSegment {
-  float center_x, center_y;
-  float maximum_distance;
-  float inv_sigma;
-  float sigma_over_4_times_intensity;
-  float color[3];
-};
-
-class Splines {
- public:
-  Splines() = default;
-  explicit Splines(const int32_t quantization_adjustment,
-                   std::vector<QuantizedSpline> splines,
-                   std::vector<Spline::Point> starting_points)
-      : quantization_adjustment_(quantization_adjustment),
-        splines_(std::move(splines)),
-        starting_points_(std::move(starting_points)) {}
-
-  bool HasAny() const { return !splines_.empty(); }
-
-  void Clear();
-
-  Status Decode(JxlMemoryManager* memory_manager, BitReader* br,
-                size_t num_pixels);
-
-  void AddTo(Image3F* opsin, const Rect& opsin_rect) const;
-  void AddToRow(float* JXL_RESTRICT row_x, float* JXL_RESTRICT row_y,
-                float* JXL_RESTRICT row_b, size_t y, size_t x0,
-                size_t x1) const;
-  void SubtractFrom(Image3F* opsin) const;
-
-  const std::vector<QuantizedSpline>& QuantizedSplines() const {
-    return splines_;
-  }
-  const std::vector<Spline::Point>& StartingPoints() const {
-    return starting_points_;
-  }
-
-  int32_t GetQuantizationAdjustment() const { return quantization_adjustment_; }
-
-  Status InitializeDrawCache(size_t image_xsize, size_t image_ysize,
-                             const ColorCorrelation& color_correlation);
-
- private:
-  template <bool>
-  void ApplyToRow(float* JXL_RESTRICT row_x, float* JXL_RESTRICT row_y,
-                  float* JXL_RESTRICT row_b, size_t y, size_t x0,
-                  size_t x1) const;
-  template <bool>
-  void Apply(Image3F* opsin, const Rect& opsin_rect) const;
-
-  // If positive, quantization weights are multiplied by 1 + this/8, which
-  // increases precision. If negative, they are divided by 1 - this/8. If 0,
-  // they are unchanged.
-  int32_t quantization_adjustment_ = 0;
-  std::vector<QuantizedSpline> splines_;
-  std::vector<Spline::Point> starting_points_;
-  std::vector<SplineSegment> segments_;
-  std::vector<size_t> segment_indices_;
-  std::vector<size_t> segment_y_start_;
-};
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_SPLINES_H_
diff --git a/third_party/jpeg-xl/lib/jxl/splines_gbench.cc b/third_party/jpeg-xl/lib/jxl/splines_gbench.cc
deleted file mode 100644
index e61eabfdda60b..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/splines_gbench.cc
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <cstddef>
-#include <vector>
-
-#include "benchmark/benchmark.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/chroma_from_luma.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/splines.h"
-#include "tools/no_memory_manager.h"
-
-namespace jxl {
-namespace {
-
-#define QUIT(M)           \
-  state.SkipWithError(M); \
-  return;
-
-#define BM_CHECK(C) \
-  if (!(C)) {       \
-    QUIT(#C)        \
-  }
-
-constexpr int kQuantizationAdjustment = 0;
-const ColorCorrelation color_correlation{};
-const float kYToX = color_correlation.YtoXRatio(0);
-const float kYToB = color_correlation.YtoBRatio(0);
-
-void BM_Splines(benchmark::State& state) {
-  const size_t n = state.range();
-
-  Spline spline1{
-      /*control_points=*/{
-          {9, 54}, {118, 159}, {97, 3}, {10, 40}, {150, 25}, {120, 300}},
-      /*color_dct=*/
-      {Dct32{0.03125f, 0.00625f, 0.003125f}, Dct32{1.f, 0.321875f},
-       Dct32{1.f, 0.24375f}},
-      /*sigma_dct=*/{0.3125f, 0.f, 0.f, 0.0625f}};
-  std::vector<Spline> spline_data = {spline1};
-  std::vector<QuantizedSpline> quantized_splines;
-  std::vector<Spline::Point> starting_points;
-  for (const Spline& spline : spline_data) {
-    JXL_ASSIGN_OR_QUIT(
-        QuantizedSpline qspline,
-        QuantizedSpline::Create(spline, kQuantizationAdjustment, kYToX, kYToB),
-        "Failed to create spline.");
-    quantized_splines.emplace_back(std::move(qspline));
-    starting_points.push_back(spline.control_points.front());
-  }
-  Splines splines(kQuantizationAdjustment, std::move(quantized_splines),
-                  std::move(starting_points));
-
-  JXL_ASSIGN_OR_QUIT(
-      Image3F drawing_area,
-      Image3F::Create(jpegxl::tools::NoMemoryManager(), 320, 320),
-      "Failed to allocate drawing plane.");
-  ZeroFillImage(&drawing_area);
-  for (auto _ : state) {
-    (void)_;
-    for (size_t i = 0; i < n; ++i) {
-      BM_CHECK(splines.InitializeDrawCache(
-          drawing_area.xsize(), drawing_area.ysize(), color_correlation));
-      splines.AddTo(&drawing_area, Rect(drawing_area));
-    }
-  }
-
-  state.SetItemsProcessed(n * state.iterations());
-}
-
-BENCHMARK(BM_Splines)->Range(1, 1 << 10);
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/splines_test.cc b/third_party/jpeg-xl/lib/jxl/splines_test.cc
deleted file mode 100644
index 03c77599cf655..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/splines_test.cc
+++ /dev/null
@@ -1,369 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/splines.h"
-
-#include <jxl/cms.h>
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#include <ostream>
-#include <utility>
-#include <vector>
-
-#include "lib/extras/codec.h"
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/rect.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/chroma_from_luma.h"
-#include "lib/jxl/common.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/enc_splines.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_ops.h"
-#include "lib/jxl/image_test_utils.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-
-std::ostream& operator<<(std::ostream& os, const Spline::Point& p) {
-  return os << "(" << p.x << ", " << p.y << ")";
-}
-
-std::ostream& operator<<(std::ostream& os, const Spline& spline) {
-  return os << "(spline with " << spline.control_points.size()
-            << " control points)";
-}
-
-namespace {
-
-using ::jxl::test::ReadTestData;
-
-constexpr int kQuantizationAdjustment = 0;
-const ColorCorrelation color_correlation{};
-const float kYToX = color_correlation.YtoXRatio(0);
-const float kYToB = color_correlation.YtoBRatio(0);
-
-constexpr float kTolerance = 0.003125;
-
-Status DequantizeSplines(const Splines& splines,
-                         std::vector<Spline>& dequantized) {
-  const auto& quantized_splines = splines.QuantizedSplines();
-  const auto& starting_points = splines.StartingPoints();
-  JXL_ENSURE(quantized_splines.size() == starting_points.size());
-
-  uint64_t total = 0;
-  for (size_t i = 0; i < quantized_splines.size(); ++i) {
-    dequantized.emplace_back();
-    JXL_RETURN_IF_ERROR(quantized_splines[i].Dequantize(
-        starting_points[i], kQuantizationAdjustment, kYToX, kYToB, 2u << 30u,
-        &total, dequantized.back()));
-  }
-  return true;
-}
-
-}  // namespace
-
-TEST(SplinesTest, Serialization) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  Spline spline1{
-      /*control_points=*/{
-          {109, 54}, {218, 159}, {80, 3}, {110, 274}, {94, 185}, {17, 277}},
-      /*color_dct=*/
-      {Dct32{36.3, 39.7, 23.2, 67.5, 4.4,  71.5, 62.3, 32.3, 92.2, 10.1, 10.8,
-             9.2,  6.1,  10.5, 79.1, 7,    24.6, 90.8, 5.5,  84,   43.8, 49,
-             33.5, 78.9, 54.5, 77.9, 62.1, 51.4, 36.4, 14.3, 83.7, 35.4},
-       Dct32{9.4,  53.4, 9.5,  74.9, 72.7, 26.7, 7.9,  0.9, 84.9, 23.2, 26.5,
-             31.1, 91,   11.7, 74.1, 39.3, 23.7, 82.5, 4.8, 2.7,  61.2, 96.4,
-             13.7, 66.7, 62.9, 82.4, 5.9,  98.7, 21.5, 7.9, 51.7, 63.1},
-       Dct32{48,   39.3, 6.9,  26.3, 33.3, 6.2,  1.7,  98.9, 59.9, 59.6, 95,
-             61.3, 82.7, 53,   6.1,  30.4, 34.7, 96.9, 93.4, 17,   38.8, 80.8,
-             63,   18.6, 43.6, 32.3, 61,   20.2, 24.3, 28.3, 69.1, 62.4}},
-      /*sigma_dct=*/{32.7, 21.5, 44.4, 1.8,  45.8, 90.6, 29.3, 59.2,
-                     23.7, 85.2, 84.8, 27.2, 42.1, 84.1, 50.6, 17.6,
-                     93.7, 4.9,  2.6,  69.8, 94.9, 52,   24.3, 18.8,
-                     12.1, 95.7, 28.5, 81.4, 89.9, 31.4, 74.8, 52}};
-  Spline spline2{
-      /*control_points=*/{{172, 309},
-                          {196, 277},
-                          {42, 238},
-                          {114, 350},
-                          {307, 290},
-                          {316, 269},
-                          {124, 66},
-                          {233, 267}},
-      /*color_dct=*/
-      {Dct32{15,   28.9, 22, 6.6,  41.8, 83,   8.6,  56.8, 68.9, 9.7,  5.4,
-             19.8, 70.8, 90, 52.5, 65.2, 7.8,  23.5, 26.4, 72.2, 64.7, 87.1,
-             1.3,  67.5, 46, 68.4, 65.4, 35.5, 29.1, 13,   41.6, 23.9},
-       Dct32{47.7, 79.4, 62.7, 29.1, 96.8, 18.5, 17.6, 15.2, 80.5, 56,  96.2,
-             59.9, 26.7, 96.1, 92.3, 42.1, 35.8, 54,   23.2, 55,   76,  35.8,
-             58.4, 88.7, 2.4,  78.1, 95.6, 27.5, 6.6,  78.5, 24.1, 69.8},
-       Dct32{43.8, 96.5, 0.9,  95.1, 49.1, 71.2, 25.1, 33.6, 75.2, 95,  82.1,
-             19.7, 10.5, 44.9, 50,   93.3, 83.5, 99.5, 64.6, 54,   3.5, 99.7,
-             45.3, 82.1, 22.4, 37.9, 60,   32.2, 12.6, 4.6,  65.5, 96.4}},
-      /*sigma_dct=*/{72.5, 2.6,  41.7, 2.2,  39.7, 79.1, 69.6, 19.9,
-                     92.3, 71.5, 41.9, 62.1, 30,   49.4, 70.3, 45.3,
-                     62.5, 47.2, 46.7, 41.2, 90.8, 46.8, 91.2, 55,
-                     8.1,  69.6, 25.4, 84.7, 61.7, 27.6, 3.7,  46.9}};
-  Spline spline3{
-      /*control_points=*/{{100, 186},
-                          {257, 97},
-                          {170, 49},
-                          {25, 169},
-                          {309, 104},
-                          {232, 237},
-                          {385, 101},
-                          {122, 168},
-                          {26, 300},
-                          {390, 88}},
-      /*color_dct=*/
-      {Dct32{16.9, 64.8, 4.2,  10.6, 23.5, 17,   79.3, 5.7,  60.4, 16.6, 94.9,
-             63.7, 87.6, 10.5, 3.8,  61.1, 22.9, 81.9, 80.4, 40.5, 45.9, 25.4,
-             39.8, 30,   50.2, 90.4, 27.9, 93.7, 65.1, 48.2, 22.3, 43.9},
-       Dct32{24.9, 66,   3.5,  90.2, 97.1, 15.8, 35.6, 0.6,  68,   39.6, 24.4,
-             85.9, 57.7, 77.6, 47.5, 67.9, 4.3,  5.4,  91.2, 58.5, 0.1,  52.2,
-             3.5,  47.8, 63.2, 43.5, 85.8, 35.8, 50.2, 35.9, 19.2, 48.2},
-       Dct32{82.8, 44.9, 76.4, 39.5, 94.1, 14.3, 89.8, 10,   10.5, 74.5, 56.3,
-             65.8, 7.8,  23.3, 52.8, 99.3, 56.8, 46,   76.7, 13.5, 67,   22.4,
-             29.9, 43.3, 70.3, 26,   74.3, 53.9, 62,   19.1, 49.3, 46.7}},
-      /*sigma_dct=*/{83.5, 1.7,  25.1, 18.7, 46.5, 75.3, 28,   62.3,
-                     50.3, 23.3, 85.6, 96,   45.8, 33.1, 33.4, 52.9,
-                     26.3, 58.5, 19.6, 70,   92.6, 22.5, 57,   21.6,
-                     76.8, 87.5, 22.9, 66.3, 35.7, 35.6, 56.8, 67.2}};
-  std::vector<Spline> spline_data{spline1, spline2, spline3};
-
-  std::vector<QuantizedSpline> quantized_splines;
-  std::vector<Spline::Point> starting_points;
-  for (const Spline& spline : spline_data) {
-    JXL_ASSIGN_OR_QUIT(
-        QuantizedSpline qspline,
-        QuantizedSpline::Create(spline, kQuantizationAdjustment, kYToX, kYToB),
-        "Failed to create QuantizedSpline.");
-    quantized_splines.emplace_back(std::move(qspline));
-    starting_points.push_back(spline.control_points.front());
-  }
-
-  Splines splines(kQuantizationAdjustment, std::move(quantized_splines),
-                  std::move(starting_points));
-  std::vector<Spline> quantized_spline_data;
-  ASSERT_TRUE(DequantizeSplines(splines, quantized_spline_data));
-  EXPECT_EQ(quantized_spline_data.size(), spline_data.size());
-  for (size_t i = 0; i < quantized_spline_data.size(); ++i) {
-    const Spline& actual = quantized_spline_data[i];
-    const Spline& expected = spline_data[i];
-    const auto& actual_points = actual.control_points;
-    const auto& expected_points = expected.control_points;
-    EXPECT_EQ(actual_points.size(), expected_points.size());
-    for (size_t j = 0; j < actual_points.size(); ++j) {
-      EXPECT_NEAR(actual_points[j].x, expected_points[j].x, kTolerance)
-          << "spline " << i << " point " << j;
-      EXPECT_NEAR(actual_points[j].y, expected_points[j].y, kTolerance)
-          << "spline " << i << " point " << j;
-    }
-  }
-
-  BitWriter writer{memory_manager};
-  ASSERT_TRUE(EncodeSplines(splines, &writer, LayerType::Splines,
-                            HistogramParams(), nullptr));
-  writer.ZeroPadToByte();
-  const size_t bits_written = writer.BitsWritten();
-
-  printf("Wrote %" PRIuS " bits of splines.\n", bits_written);
-
-  BitReader reader(writer.GetSpan());
-  Splines decoded_splines;
-  ASSERT_TRUE(
-      decoded_splines.Decode(memory_manager, &reader, /*num_pixels=*/1000));
-  ASSERT_TRUE(reader.JumpToByteBoundary());
-  EXPECT_EQ(reader.TotalBitsConsumed(), bits_written);
-  ASSERT_TRUE(reader.Close());
-
-  std::vector<Spline> decoded_spline_data;
-  ASSERT_TRUE(DequantizeSplines(decoded_splines, decoded_spline_data));
-
-  EXPECT_EQ(decoded_spline_data.size(), quantized_spline_data.size());
-  for (size_t i = 0; i < decoded_spline_data.size(); ++i) {
-    const Spline& actual = decoded_spline_data[i];
-    const Spline& expected = quantized_spline_data[i];
-    const auto& actual_points = actual.control_points;
-    const auto& expected_points = expected.control_points;
-    EXPECT_EQ(actual_points.size(), expected_points.size());
-    for (size_t j = 0; j < actual_points.size(); ++j) {
-      EXPECT_NEAR(actual_points[j].x, expected_points[j].x, kTolerance)
-          << "spline " << i << " point " << j;
-      EXPECT_NEAR(actual_points[j].y, expected_points[j].y, kTolerance)
-          << "spline " << i << " point " << j;
-    }
-
-    const auto& actual_color_dct = actual.color_dct;
-    const auto& expected_color_dct = expected.color_dct;
-    for (size_t j = 0; j < actual_color_dct.size(); ++j) {
-      EXPECT_ARRAY_NEAR(actual_color_dct[j], expected_color_dct[j], kTolerance);
-    }
-    EXPECT_ARRAY_NEAR(actual.sigma_dct, expected.sigma_dct, kTolerance);
-  }
-}
-
-TEST(SplinesTest, TooManySplinesTest) {
-  if (JXL_CRASH_ON_ERROR) {
-    GTEST_SKIP() << "Skipping due to JXL_CRASH_ON_ERROR";
-  }
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  // This is more than the limit for 1000 pixels.
-  const size_t kNumSplines = 300;
-
-  std::vector<QuantizedSpline> quantized_splines;
-  std::vector<Spline::Point> starting_points;
-  for (size_t i = 0; i < kNumSplines; i++) {
-    Spline spline{
-        /*control_points=*/{{1.f + i, 2}, {10.f + i, 25}, {30.f + i, 300}},
-        /*color_dct=*/
-        {Dct32{1.f, 0.2f, 0.1f}, Dct32{35.7f, 10.3f}, Dct32{35.7f, 7.8f}},
-        /*sigma_dct=*/{10.f, 0.f, 0.f, 2.f}};
-    JXL_ASSIGN_OR_QUIT(
-        QuantizedSpline qspline,
-        QuantizedSpline::Create(spline, kQuantizationAdjustment, kYToX, kYToB),
-        "Failed to create QuantizedSpline.");
-    quantized_splines.emplace_back(std::move(qspline));
-    starting_points.push_back(spline.control_points.front());
-  }
-
-  Splines splines(kQuantizationAdjustment, std::move(quantized_splines),
-                  std::move(starting_points));
-  BitWriter writer{memory_manager};
-  ASSERT_TRUE(EncodeSplines(splines, &writer, LayerType::Splines,
-                            HistogramParams(SpeedTier::kFalcon, 1), nullptr));
-  writer.ZeroPadToByte();
-  // Re-read splines.
-  BitReader reader(writer.GetSpan());
-  Splines decoded_splines;
-  EXPECT_FALSE(
-      decoded_splines.Decode(memory_manager, &reader, /*num_pixels=*/1000));
-  EXPECT_TRUE(reader.Close());
-}
-
-TEST(SplinesTest, DuplicatePoints) {
-  if (JXL_CRASH_ON_ERROR) {
-    GTEST_SKIP() << "Skipping due to JXL_CRASH_ON_ERROR";
-  }
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  std::vector<Spline::Point> control_points{
-      {9, 54}, {118, 159}, {97, 3},  // Repeated.
-      {97, 3}, {10, 40},   {150, 25}, {120, 300}};
-  Spline spline{
-      control_points,
-      /*color_dct=*/
-      {Dct32{1.f, 0.2f, 0.1f}, Dct32{35.7f, 10.3f}, Dct32{35.7f, 7.8f}},
-      /*sigma_dct=*/{10.f, 0.f, 0.f, 2.f}};
-  std::vector<Spline> spline_data{spline};
-  std::vector<QuantizedSpline> quantized_splines;
-  std::vector<Spline::Point> starting_points;
-  for (const Spline& spline : spline_data) {
-    JXL_ASSIGN_OR_QUIT(
-        QuantizedSpline qspline,
-        QuantizedSpline::Create(spline, kQuantizationAdjustment, kYToX, kYToB),
-        "Failed to create QuantizedSpline.");
-    quantized_splines.emplace_back(std::move(qspline));
-    starting_points.push_back(spline.control_points.front());
-  }
-  Splines splines(kQuantizationAdjustment, std::move(quantized_splines),
-                  std::move(starting_points));
-
-  JXL_TEST_ASSIGN_OR_DIE(Image3F image,
-                         Image3F::Create(memory_manager, 320, 320));
-  ZeroFillImage(&image);
-  EXPECT_FALSE(splines.InitializeDrawCache(image.xsize(), image.ysize(),
-                                           color_correlation));
-}
-
-TEST(SplinesTest, Drawing) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  CodecInOut io_expected{memory_manager};
-  const std::vector<uint8_t> orig = ReadTestData("jxl/splines.pfm");
-  ASSERT_TRUE(SetFromBytes(Bytes(orig), &io_expected,
-                           /*pool=*/nullptr));
-
-  std::vector<Spline::Point> control_points{{9, 54},  {118, 159}, {97, 3},
-                                            {10, 40}, {150, 25},  {120, 300}};
-  // Use values that survive quant/decorellation roundtrip.
-  const Spline spline{
-      control_points,
-      /*color_dct=*/
-      {Dct32{0.4989345073699951171875000f, 0.4997999966144561767578125f},
-       Dct32{0.4772970676422119140625000f, 0.f, 0.5250000357627868652343750f},
-       Dct32{-0.0176776945590972900390625f, 0.4900000095367431640625000f,
-             0.5250000357627868652343750f}},
-      /*sigma_dct=*/
-      {0.9427147507667541503906250f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f,
-       0.6665999889373779296875000f}};
-  std::vector<Spline> spline_data = {spline};
-  std::vector<QuantizedSpline> quantized_splines;
-  std::vector<Spline::Point> starting_points;
-  for (const Spline& spline : spline_data) {
-    JXL_ASSIGN_OR_QUIT(
-        QuantizedSpline qspline,
-        QuantizedSpline::Create(spline, kQuantizationAdjustment, kYToX, kYToB),
-        "Failed to create QuantizedSpline.");
-    quantized_splines.emplace_back(std::move(qspline));
-    starting_points.push_back(spline.control_points.front());
-  }
-  Splines splines(kQuantizationAdjustment, std::move(quantized_splines),
-                  std::move(starting_points));
-
-  JXL_TEST_ASSIGN_OR_DIE(Image3F image,
-                         Image3F::Create(memory_manager, 320, 320));
-  ZeroFillImage(&image);
-  ASSERT_TRUE(splines.InitializeDrawCache(image.xsize(), image.ysize(),
-                                          color_correlation));
-  splines.AddTo(&image, Rect(image));
-
-  CodecInOut io_actual{memory_manager};
-  JXL_TEST_ASSIGN_OR_DIE(Image3F image2,
-                         Image3F::Create(memory_manager, 320, 320));
-  ASSERT_TRUE(CopyImageTo(image, &image2));
-  ASSERT_TRUE(io_actual.SetFromImage(std::move(image2), ColorEncoding::SRGB()));
-  ASSERT_TRUE(io_actual.frames[0].TransformTo(io_expected.Main().c_current(),
-                                              *JxlGetDefaultCms()));
-
-  JXL_TEST_ASSERT_OK(VerifyRelativeError(
-      *io_expected.Main().color(), *io_actual.Main().color(), 1e-2f, 1e-1f, _));
-}
-
-TEST(SplinesTest, ClearedEveryFrame) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  CodecInOut io_expected{memory_manager};
-  const std::vector<uint8_t> bytes_expected =
-      ReadTestData("jxl/spline_on_first_frame.png");
-  ASSERT_TRUE(SetFromBytes(Bytes(bytes_expected), &io_expected,
-                           /*pool=*/nullptr));
-  CodecInOut io_actual{memory_manager};
-  const std::vector<uint8_t> bytes_actual =
-      ReadTestData("jxl/spline_on_first_frame.jxl");
-  ASSERT_TRUE(test::DecodeFile({}, Bytes(bytes_actual), &io_actual));
-
-  ASSERT_TRUE(io_actual.frames[0].TransformTo(ColorEncoding::SRGB(),
-                                              *JxlGetDefaultCms()));
-  for (size_t c = 0; c < 3; ++c) {
-    for (size_t y = 0; y < io_actual.ysize(); ++y) {
-      float* const JXL_RESTRICT row = io_actual.Main().color()->PlaneRow(c, y);
-      for (size_t x = 0; x < io_actual.xsize(); ++x) {
-        row[x] = Clamp1(row[x], 0.f, 1.f);
-      }
-    }
-  }
-  JXL_TEST_ASSERT_OK(VerifyRelativeError(
-      *io_expected.Main().color(), *io_actual.Main().color(), 1e-2f, 1e-1f, _));
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/test_image.cc b/third_party/jpeg-xl/lib/jxl/test_image.cc
deleted file mode 100644
index ef09c2673778c..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/test_image.cc
+++ /dev/null
@@ -1,453 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/test_image.h"
-
-#include <jxl/encode.h>
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <utility>
-#include <vector>
-
-#include "lib/extras/dec/color_description.h"
-#include "lib/extras/dec/color_hints.h"
-#include "lib/extras/dec/decode.h"
-#include "lib/jxl/base/byte_order.h"
-#include "lib/jxl/base/random.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/test_utils.h"
-
-namespace jxl {
-namespace test {
-
-namespace {
-
-void StoreValue(float val, size_t bits_per_sample, JxlPixelFormat format,
-                uint8_t** out) {
-  const float mul = (1u << bits_per_sample) - 1;
-  if (format.data_type == JXL_TYPE_UINT8) {
-    **out = val * mul;
-  } else if (format.data_type == JXL_TYPE_UINT16) {
-    uint16_t uval = val * mul;
-    if (SwapEndianness(format.endianness)) {
-      uval = JXL_BSWAP16(uval);
-    }
-    memcpy(*out, &uval, 2);
-  } else if (format.data_type == JXL_TYPE_FLOAT) {
-    // TODO(szabadka) Add support for custom bits / exponent bits floats.
-    if (SwapEndianness(format.endianness)) {
-      val = BSwapFloat(val);
-    }
-    memcpy(*out, &val, 4);
-  } else {
-    // TODO(szabadka) Add support for FLOAT16.
-  }
-  *out += extras::PackedImage::BitsPerChannel(format.data_type) / 8;
-}
-
-void FillPackedImage(size_t bits_per_sample, uint16_t seed,
-                     extras::PackedImage* image) {
-  const size_t xsize = image->xsize;
-  const size_t ysize = image->ysize;
-  const JxlPixelFormat format = image->format;
-
-  // Cause more significant image difference for successive seeds.
-  Rng generator(seed);
-
-  // Returns random integer in interval [0, max_value)
-  auto rngu = [&generator](size_t max_value) -> size_t {
-    return generator.UniformU(0, max_value);
-  };
-
-  // Returns random float in interval [0.0, max_value)
-  auto rngf = [&generator](float max_value) {
-    return generator.UniformF(0.0f, max_value);
-  };
-
-  // Dark background gradient color
-  float r0 = rngf(0.5f);
-  float g0 = rngf(0.5f);
-  float b0 = rngf(0.5f);
-  float a0 = rngf(0.5f);
-  float r1 = rngf(0.5f);
-  float g1 = rngf(0.5f);
-  float b1 = rngf(0.5f);
-  float a1 = rngf(0.5f);
-
-  // Circle with different color
-  size_t circle_x = rngu(xsize);
-  size_t circle_y = rngu(ysize);
-  size_t circle_r = rngu(std::min(xsize, ysize));
-
-  // Rectangle with random noise
-  size_t rect_x0 = rngu(xsize);
-  size_t rect_y0 = rngu(ysize);
-  size_t rect_x1 = rngu(xsize);
-  size_t rect_y1 = rngu(ysize);
-  if (rect_x1 < rect_x0) std::swap(rect_x0, rect_y1);
-  if (rect_y1 < rect_y0) std::swap(rect_y0, rect_y1);
-
-  // Create pixel content to test, actual content does not matter as long as it
-  // can be compared after roundtrip.
-  const float imul16 = 1.0f / 65536.0f;
-  for (size_t y = 0; y < ysize; y++) {
-    uint8_t* out =
-        reinterpret_cast<uint8_t*>(image->pixels()) + y * image->stride;
-    for (size_t x = 0; x < xsize; x++) {
-      float r = r0 * (ysize - y - 1) / ysize + r1 * y / ysize;
-      float g = g0 * (ysize - y - 1) / ysize + g1 * y / ysize;
-      float b = b0 * (ysize - y - 1) / ysize + b1 * y / ysize;
-      float a = a0 * (ysize - y - 1) / ysize + a1 * y / ysize;
-      // put some shape in there for visual debugging
-      if ((x - circle_x) * (x - circle_x) + (y - circle_y) * (y - circle_y) <
-          circle_r * circle_r) {
-        r = std::min(1.0f, ((65535 - x * y) ^ seed) * imul16);
-        g = std::min(1.0f, ((x << 8) + y + seed) * imul16);
-        b = std::min(1.0f, ((y << 8) + x * seed) * imul16);
-        a = std::min(1.0f, (32768 + x * 256 - y) * imul16);
-      } else if (x > rect_x0 && x < rect_x1 && y > rect_y0 && y < rect_y1) {
-        r = rngf(1.0f);
-        g = rngf(1.0f);
-        b = rngf(1.0f);
-        a = rngf(1.0f);
-      }
-      if (format.num_channels == 1) {
-        StoreValue(g, bits_per_sample, format, &out);
-      } else if (format.num_channels == 2) {
-        StoreValue(g, bits_per_sample, format, &out);
-        StoreValue(a, bits_per_sample, format, &out);
-      } else if (format.num_channels == 3) {
-        StoreValue(r, bits_per_sample, format, &out);
-        StoreValue(g, bits_per_sample, format, &out);
-        StoreValue(b, bits_per_sample, format, &out);
-      } else if (format.num_channels == 4) {
-        StoreValue(r, bits_per_sample, format, &out);
-        StoreValue(g, bits_per_sample, format, &out);
-        StoreValue(b, bits_per_sample, format, &out);
-        StoreValue(a, bits_per_sample, format, &out);
-      }
-    }
-  }
-}
-
-}  // namespace
-
-std::vector<uint8_t> GetSomeTestImage(size_t xsize, size_t ysize,
-                                      size_t num_channels, uint16_t seed) {
-  // Cause more significant image difference for successive seeds.
-  Rng generator(seed);
-
-  // Returns random integer in interval [0, max_value)
-  auto rng = [&generator](size_t max_value) -> size_t {
-    return generator.UniformU(0, max_value);
-  };
-
-  // Dark background gradient color
-  uint16_t r0 = rng(32768);
-  uint16_t g0 = rng(32768);
-  uint16_t b0 = rng(32768);
-  uint16_t a0 = rng(32768);
-  uint16_t r1 = rng(32768);
-  uint16_t g1 = rng(32768);
-  uint16_t b1 = rng(32768);
-  uint16_t a1 = rng(32768);
-
-  // Circle with different color
-  size_t circle_x = rng(xsize);
-  size_t circle_y = rng(ysize);
-  size_t circle_r = rng(std::min(xsize, ysize));
-
-  // Rectangle with random noise
-  size_t rect_x0 = rng(xsize);
-  size_t rect_y0 = rng(ysize);
-  size_t rect_x1 = rng(xsize);
-  size_t rect_y1 = rng(ysize);
-  if (rect_x1 < rect_x0) std::swap(rect_x0, rect_y1);
-  if (rect_y1 < rect_y0) std::swap(rect_y0, rect_y1);
-
-  size_t num_pixels = xsize * ysize;
-  // 16 bits per channel, big endian, 4 channels
-  std::vector<uint8_t> pixels(num_pixels * num_channels * 2);
-  // Create pixel content to test, actual content does not matter as long as it
-  // can be compared after roundtrip.
-  for (size_t y = 0; y < ysize; y++) {
-    for (size_t x = 0; x < xsize; x++) {
-      uint16_t r = r0 * (ysize - y - 1) / ysize + r1 * y / ysize;
-      uint16_t g = g0 * (ysize - y - 1) / ysize + g1 * y / ysize;
-      uint16_t b = b0 * (ysize - y - 1) / ysize + b1 * y / ysize;
-      uint16_t a = a0 * (ysize - y - 1) / ysize + a1 * y / ysize;
-      // put some shape in there for visual debugging
-      if ((x - circle_x) * (x - circle_x) + (y - circle_y) * (y - circle_y) <
-          circle_r * circle_r) {
-        r = (65535 - x * y) ^ seed;
-        g = (x << 8) + y + seed;
-        b = (y << 8) + x * seed;
-        a = 32768 + x * 256 - y;
-      } else if (x > rect_x0 && x < rect_x1 && y > rect_y0 && y < rect_y1) {
-        r = rng(65536);
-        g = rng(65536);
-        b = rng(65536);
-        a = rng(65536);
-      }
-      size_t i = (y * xsize + x) * 2 * num_channels;
-      pixels[i + 0] = (r >> 8);
-      pixels[i + 1] = (r & 255);
-      if (num_channels >= 2) {
-        // This may store what is called 'g' in the alpha channel of a 2-channel
-        // image, but that's ok since the content is arbitrary
-        pixels[i + 2] = (g >> 8);
-        pixels[i + 3] = (g & 255);
-      }
-      if (num_channels >= 3) {
-        pixels[i + 4] = (b >> 8);
-        pixels[i + 5] = (b & 255);
-      }
-      if (num_channels >= 4) {
-        pixels[i + 6] = (a >> 8);
-        pixels[i + 7] = (a & 255);
-      }
-    }
-  }
-  return pixels;
-}
-
-TestImage::TestImage() {
-  Check(SetChannels(3));
-  SetAllBitDepths(8);
-  Check(SetColorEncoding("RGB_D65_SRG_Rel_SRG"));
-}
-
-Status TestImage::DecodeFromBytes(const std::vector<uint8_t>& bytes) {
-  ColorEncoding c_enc;
-  JXL_RETURN_IF_ERROR(c_enc.FromExternal(ppf_.color_encoding));
-  extras::ColorHints color_hints;
-  color_hints.Add("color_space", Description(c_enc));
-  JXL_RETURN_IF_ERROR(extras::DecodeBytes(Bytes(bytes), color_hints, &ppf_));
-  return true;
-}
-
-TestImage& TestImage::ClearMetadata() {
-  ppf_.metadata = extras::PackedMetadata();
-  return *this;
-}
-
-Status TestImage::SetDimensions(size_t xsize, size_t ysize) {
-  if (xsize <= ppf_.info.xsize && ysize <= ppf_.info.ysize) {
-    for (auto& frame : ppf_.frames) {
-      CropLayerInfo(xsize, ysize, &frame.frame_info.layer_info);
-      CropImage(xsize, ysize, &frame.color);
-      for (auto& ec : frame.extra_channels) {
-        CropImage(xsize, ysize, &ec);
-      }
-    }
-  } else {
-    JXL_ENSURE(ppf_.info.xsize == 0 && ppf_.info.ysize == 0);
-  }
-  ppf_.info.xsize = xsize;
-  ppf_.info.ysize = ysize;
-  return true;
-}
-
-Status TestImage::SetChannels(size_t num_channels) {
-  JXL_ENSURE(ppf_.frames.empty());
-  JXL_ENSURE(!ppf_.preview_frame);
-  ppf_.info.num_color_channels = num_channels < 3 ? 1 : 3;
-  ppf_.info.num_extra_channels = num_channels - ppf_.info.num_color_channels;
-  if (ppf_.info.num_extra_channels > 0 && ppf_.info.alpha_bits == 0) {
-    ppf_.info.alpha_bits = ppf_.info.bits_per_sample;
-    ppf_.info.alpha_exponent_bits = ppf_.info.exponent_bits_per_sample;
-  }
-  ppf_.extra_channels_info.clear();
-  for (size_t i = 1; i < ppf_.info.num_extra_channels; ++i) {
-    extras::PackedExtraChannel ec;
-    ec.index = i;
-    JxlEncoderInitExtraChannelInfo(JXL_CHANNEL_ALPHA, &ec.ec_info);
-    if (ec.ec_info.bits_per_sample == 0) {
-      ec.ec_info.bits_per_sample = ppf_.info.bits_per_sample;
-      ec.ec_info.exponent_bits_per_sample = ppf_.info.exponent_bits_per_sample;
-    }
-    ppf_.extra_channels_info.emplace_back(std::move(ec));
-  }
-  format_.num_channels = std::min(static_cast<size_t>(4), num_channels);
-  if (ppf_.info.num_color_channels == 1 &&
-      ppf_.color_encoding.color_space != JXL_COLOR_SPACE_GRAY) {
-    JXL_RETURN_IF_ERROR(SetColorEncoding("Gra_D65_Rel_SRG"));
-  }
-  return true;
-}
-
-// Sets the same bit depth on color, alpha and all extra channels.
-TestImage& TestImage::SetAllBitDepths(uint32_t bits_per_sample,
-                                      uint32_t exponent_bits_per_sample) {
-  ppf_.info.bits_per_sample = bits_per_sample;
-  ppf_.info.exponent_bits_per_sample = exponent_bits_per_sample;
-  if (ppf_.info.num_extra_channels > 0) {
-    ppf_.info.alpha_bits = bits_per_sample;
-    ppf_.info.alpha_exponent_bits = exponent_bits_per_sample;
-  }
-  for (auto& ec : ppf_.extra_channels_info) {
-    ec.ec_info.bits_per_sample = bits_per_sample;
-    ec.ec_info.exponent_bits_per_sample = exponent_bits_per_sample;
-  }
-  format_.data_type = DefaultDataType(ppf_.info);
-  return *this;
-}
-
-TestImage& TestImage::SetDataType(JxlDataType data_type) {
-  format_.data_type = data_type;
-  return *this;
-}
-
-TestImage& TestImage::SetEndianness(JxlEndianness endianness) {
-  format_.endianness = endianness;
-  return *this;
-}
-
-TestImage& TestImage::SetRowAlignment(size_t align) {
-  format_.align = align;
-  return *this;
-}
-
-Status TestImage::SetColorEncoding(const std::string& description) {
-  JXL_RETURN_IF_ERROR(ParseDescription(description, &ppf_.color_encoding));
-  ColorEncoding c_enc;
-  JXL_RETURN_IF_ERROR(c_enc.FromExternal(ppf_.color_encoding));
-  IccBytes icc = c_enc.ICC();
-  JXL_ENSURE(!icc.empty());
-  ppf_.icc.assign(icc.begin(), icc.end());
-  return true;
-}
-
-Status TestImage::CoalesceGIFAnimationWithAlpha() {
-  JXL_ASSIGN_OR_RETURN(extras::PackedFrame canvas, ppf_.frames[0].Copy());
-  JXL_ENSURE(canvas.color.format.num_channels == 3);
-  JXL_ENSURE(canvas.color.format.data_type == JXL_TYPE_UINT8);
-  JXL_ENSURE(canvas.extra_channels.size() == 1);
-  for (size_t i = 1; i < ppf_.frames.size(); i++) {
-    const extras::PackedFrame& frame = ppf_.frames[i];
-    JXL_ENSURE(frame.extra_channels.size() == 1);
-    const JxlLayerInfo& layer_info = frame.frame_info.layer_info;
-    JXL_ASSIGN_OR_RETURN(extras::PackedFrame rendered, canvas.Copy());
-    uint8_t* pixels_rendered =
-        reinterpret_cast<uint8_t*>(rendered.color.pixels());
-    const uint8_t* pixels_frame =
-        reinterpret_cast<const uint8_t*>(frame.color.pixels());
-    uint8_t* alpha_rendered =
-        reinterpret_cast<uint8_t*>(rendered.extra_channels[0].pixels());
-    const uint8_t* alpha_frame =
-        reinterpret_cast<const uint8_t*>(frame.extra_channels[0].pixels());
-    for (size_t y = 0; y < frame.color.ysize; y++) {
-      for (size_t x = 0; x < frame.color.xsize; x++) {
-        size_t idx_frame = y * frame.color.xsize + x;
-        size_t idx_rendered = ((layer_info.crop_y0 + y) * rendered.color.xsize +
-                               (layer_info.crop_x0 + x));
-        if (alpha_frame[idx_frame] != 0) {
-          memcpy(&pixels_rendered[idx_rendered * 3],
-                 &pixels_frame[idx_frame * 3], 3);
-          alpha_rendered[idx_rendered] = alpha_frame[idx_frame];
-        }
-      }
-    }
-    if (layer_info.save_as_reference != 0) {
-      JXL_ASSIGN_OR_RETURN(canvas, rendered.Copy());
-    }
-    ppf_.frames[i] = std::move(rendered);
-  }
-  return true;
-}
-
-TestImage::Frame::Frame(TestImage* parent, bool is_preview, size_t index)
-    : parent_(parent), is_preview_(is_preview), index_(index) {}
-
-void TestImage::Frame::ZeroFill() {
-  memset(frame().color.pixels(), 0, frame().color.pixels_size);
-  for (auto& ec : frame().extra_channels) {
-    memset(ec.pixels(), 0, ec.pixels_size);
-  }
-}
-
-void TestImage::Frame::RandomFill(uint16_t seed) {
-  FillPackedImage(ppf().info.bits_per_sample, seed, &frame().color);
-  for (size_t i = 0; i < ppf().extra_channels_info.size(); ++i) {
-    FillPackedImage(ppf().extra_channels_info[i].ec_info.bits_per_sample,
-                    seed + 1 + i, &frame().extra_channels[i]);
-  }
-}
-
-Status TestImage::Frame::SetValue(size_t y, size_t x, size_t c, float val) {
-  const extras::PackedImage& color = frame().color;
-  JxlPixelFormat format = color.format;
-  JXL_ENSURE(y < ppf().info.ysize);
-  JXL_ENSURE(x < ppf().info.xsize);
-  JXL_ENSURE(c < format.num_channels);
-  size_t pwidth = extras::PackedImage::BitsPerChannel(format.data_type) / 8;
-  size_t idx = ((y * color.xsize + x) * format.num_channels + c) * pwidth;
-  uint8_t* pixels = reinterpret_cast<uint8_t*>(frame().color.pixels());
-  uint8_t* p = pixels + idx;
-  StoreValue(val, ppf().info.bits_per_sample, frame().color.format, &p);
-  return true;
-}
-
-StatusOr<TestImage::Frame> TestImage::AddFrame() {
-  size_t index = ppf_.frames.size();
-  JXL_ASSIGN_OR_RETURN(
-      extras::PackedFrame frame,
-      extras::PackedFrame::Create(ppf_.info.xsize, ppf_.info.ysize, format_));
-  for (size_t i = 0; i < ppf_.extra_channels_info.size(); ++i) {
-    JxlPixelFormat ec_format = {1, format_.data_type, format_.endianness, 0};
-    JXL_ASSIGN_OR_RETURN(extras::PackedImage image,
-                         extras::PackedImage::Create(
-                             ppf_.info.xsize, ppf_.info.ysize, ec_format));
-    frame.extra_channels.emplace_back(std::move(image));
-  }
-  ppf_.frames.emplace_back(std::move(frame));
-  return Frame(this, false, index);
-}
-
-void TestImage::CropLayerInfo(size_t xsize, size_t ysize, JxlLayerInfo* info) {
-  if (info->crop_x0 < static_cast<ssize_t>(xsize)) {
-    info->xsize = std::min<size_t>(info->xsize, xsize - info->crop_x0);
-  } else {
-    info->xsize = 0;
-  }
-  if (info->crop_y0 < static_cast<ssize_t>(ysize)) {
-    info->ysize = std::min<size_t>(info->ysize, ysize - info->crop_y0);
-  } else {
-    info->ysize = 0;
-  }
-}
-
-void TestImage::CropImage(size_t xsize, size_t ysize,
-                          extras::PackedImage* image) {
-  size_t new_stride = (image->stride / image->xsize) * xsize;
-  uint8_t* buf = reinterpret_cast<uint8_t*>(image->pixels());
-  for (size_t y = 0; y < ysize; ++y) {
-    memmove(&buf[y * new_stride], &buf[y * image->stride], new_stride);
-  }
-  image->xsize = xsize;
-  image->ysize = ysize;
-  image->stride = new_stride;
-  image->pixels_size = ysize * new_stride;
-}
-
-JxlDataType TestImage::DefaultDataType(const JxlBasicInfo& info) {
-  if (info.bits_per_sample == 16 && info.exponent_bits_per_sample == 5) {
-    return JXL_TYPE_FLOAT16;
-  } else if (info.exponent_bits_per_sample > 0 || info.bits_per_sample > 16) {
-    return JXL_TYPE_FLOAT;
-  } else if (info.bits_per_sample > 8) {
-    return JXL_TYPE_UINT16;
-  } else {
-    return JXL_TYPE_UINT8;
-  }
-}
-
-}  // namespace test
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/test_image.h b/third_party/jpeg-xl/lib/jxl/test_image.h
deleted file mode 100644
index 48afe886607c5..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/test_image.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_TEST_IMAGE_H_
-#define LIB_JXL_TEST_IMAGE_H_
-
-#include <jxl/codestream_header.h>
-#include <jxl/types.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <string>
-#include <vector>
-
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/status.h"
-
-namespace jxl {
-namespace test {
-
-// Returns a test image with some autogenerated pixel content, using 16 bits per
-// channel, big endian order, 1 to 4 channels
-// The seed parameter allows to create images with different pixel content.
-std::vector<uint8_t> GetSomeTestImage(size_t xsize, size_t ysize,
-                                      size_t num_channels, uint16_t seed);
-
-class TestImage {
- public:
-  TestImage();
-
-  extras::PackedPixelFile& ppf() { return ppf_; }
-
-  Status DecodeFromBytes(const std::vector<uint8_t>& bytes);
-
-  TestImage& ClearMetadata();
-
-  Status SetDimensions(size_t xsize, size_t ysize);
-
-  Status SetChannels(size_t num_channels);
-
-  // Sets the same bit depth on color, alpha and all extra channels.
-  TestImage& SetAllBitDepths(uint32_t bits_per_sample,
-                             uint32_t exponent_bits_per_sample = 0);
-
-  TestImage& SetDataType(JxlDataType data_type);
-
-  TestImage& SetEndianness(JxlEndianness endianness);
-
-  TestImage& SetRowAlignment(size_t align);
-
-  Status SetColorEncoding(const std::string& description);
-
-  Status CoalesceGIFAnimationWithAlpha();
-
-  class Frame {
-   public:
-    Frame(TestImage* parent, bool is_preview, size_t index);
-
-    void ZeroFill();
-    void RandomFill(uint16_t seed = 177);
-
-    Status SetValue(size_t y, size_t x, size_t c, float val);
-
-   private:
-    extras::PackedPixelFile& ppf() const { return parent_->ppf(); }
-
-    extras::PackedFrame& frame() {
-      return is_preview_ ? *ppf().preview_frame : ppf().frames[index_];
-    }
-
-    TestImage* parent_;
-    bool is_preview_;
-    size_t index_;
-  };
-
-  StatusOr<Frame> AddFrame();
-
- private:
-  extras::PackedPixelFile ppf_;
-  JxlPixelFormat format_ = {3, JXL_TYPE_UINT8, JXL_LITTLE_ENDIAN, 0};
-
-  static void CropLayerInfo(size_t xsize, size_t ysize, JxlLayerInfo* info);
-
-  static void CropImage(size_t xsize, size_t ysize, extras::PackedImage* image);
-
-  static JxlDataType DefaultDataType(const JxlBasicInfo& info);
-};
-
-}  // namespace test
-}  // namespace jxl
-
-#endif  // LIB_JXL_TEST_IMAGE_H_
diff --git a/third_party/jpeg-xl/lib/jxl/test_memory_manager.cc b/third_party/jpeg-xl/lib/jxl/test_memory_manager.cc
deleted file mode 100644
index ab999e6b6f1c0..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/test_memory_manager.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/test_memory_manager.h"
-
-#include <jxl/memory_manager.h>
-
-#include <cstdlib>
-
-namespace jxl {
-namespace test {
-
-namespace {
-void* TestAlloc(void* /* opaque*/, size_t size) { return malloc(size); }
-void TestFree(void* /* opaque*/, void* address) { free(address); }
-JxlMemoryManager kMemoryManager{nullptr, &TestAlloc, &TestFree};
-}  // namespace
-
-JxlMemoryManager* MemoryManager() { return &kMemoryManager; };
-
-}  // namespace test
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/test_memory_manager.h b/third_party/jpeg-xl/lib/jxl/test_memory_manager.h
deleted file mode 100644
index 2a1ec6a5282b9..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/test_memory_manager.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_TEST_MEMORY_MANAGER_H_
-#define LIB_JXL_TEST_MEMORY_MANAGER_H_
-
-#include <jxl/memory_manager.h>
-
-namespace jxl {
-namespace test {
-
-JxlMemoryManager* MemoryManager();
-
-}  // namespace test
-}  // namespace jxl
-
-#endif  // LIB_JXL_TEST_MEMORY_MANAGER_H_
diff --git a/third_party/jpeg-xl/lib/jxl/test_utils.cc b/third_party/jpeg-xl/lib/jxl/test_utils.cc
deleted file mode 100644
index b45c69c4564e6..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/test_utils.cc
+++ /dev/null
@@ -1,922 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/test_utils.h"
-
-#include <jxl/cms.h>
-#include <jxl/cms_interface.h>
-#include <jxl/memory_manager.h>
-#include <jxl/types.h>
-
-#include <cstddef>
-#include <fstream>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "lib/extras/metrics.h"
-#include "lib/extras/packed_image_convert.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/float.h"
-#include "lib/jxl/base/printf_macros.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/codec_in_out.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/enc_butteraugli_comparator.h"
-#include "lib/jxl/enc_cache.h"
-#include "lib/jxl/enc_external_image.h"
-#include "lib/jxl/enc_fields.h"
-#include "lib/jxl/enc_frame.h"
-#include "lib/jxl/enc_icc_codec.h"
-#include "lib/jxl/enc_params.h"
-#include "lib/jxl/frame_header.h"
-#include "lib/jxl/icc_codec.h"
-#include "lib/jxl/image.h"
-#include "lib/jxl/image_bundle.h"
-#include "lib/jxl/padded_bytes.h"
-#include "lib/jxl/test_memory_manager.h"
-
-#if !defined(TEST_DATA_PATH)
-#include "tools/cpp/runfiles/runfiles.h"
-#endif
-
-namespace jxl {
-namespace test {
-
-void Check(bool ok) {
-  if (!ok) {
-    JXL_CRASH();
-  }
-}
-
-#if defined(TEST_DATA_PATH)
-std::string GetTestDataPath(const std::string& filename) {
-  return std::string(TEST_DATA_PATH "/") + filename;
-}
-#else
-using ::bazel::tools::cpp::runfiles::Runfiles;
-const std::unique_ptr<Runfiles> kRunfiles(Runfiles::Create(""));
-std::string GetTestDataPath(const std::string& filename) {
-  std::string root(JPEGXL_ROOT_PACKAGE "/testdata/");
-  return kRunfiles->Rlocation(root + filename);
-}
-#endif
-
-jxl::IccBytes GetIccTestProfile() {
-  return ReadTestData("external/Compact-ICC-Profiles/profiles/scRGB-v2.icc");
-}
-
-std::vector<uint8_t> GetCompressedIccTestProfile() {
-  BitWriter writer(MemoryManager());
-  const IccBytes icc = GetIccTestProfile();
-  Check(
-      WriteICC(Span<const uint8_t>(icc), &writer, LayerType::Header, nullptr));
-  writer.ZeroPadToByte();
-  jxl::Bytes bytes = writer.GetSpan();
-  return std::vector<uint8_t>(bytes.begin(), bytes.end());
-}
-
-std::vector<uint8_t> ReadTestData(const std::string& filename) {
-  std::string full_path = GetTestDataPath(filename);
-  fprintf(stderr, "ReadTestData %s\n", full_path.c_str());
-  std::ifstream file(full_path, std::ios::binary);
-  std::vector<char> str((std::istreambuf_iterator<char>(file)),
-                        std::istreambuf_iterator<char>());
-  Check(file.good());
-  const uint8_t* raw = reinterpret_cast<const uint8_t*>(str.data());
-  std::vector<uint8_t> data(raw, raw + str.size());
-  printf("Test data %s is %d bytes long.\n", filename.c_str(),
-         static_cast<int>(data.size()));
-  return data;
-}
-
-void DefaultAcceptedFormats(extras::JXLDecompressParams& dparams) {
-  if (dparams.accepted_formats.empty()) {
-    for (const uint32_t num_channels : {1, 2, 3, 4}) {
-      dparams.accepted_formats.push_back(
-          {num_channels, JXL_TYPE_FLOAT, JXL_LITTLE_ENDIAN, /*align=*/0});
-    }
-  }
-}
-
-Status DecodeFile(extras::JXLDecompressParams dparams,
-                  const Span<const uint8_t> file, CodecInOut* JXL_RESTRICT io,
-                  ThreadPool* pool) {
-  DefaultAcceptedFormats(dparams);
-  SetThreadParallelRunner(dparams, pool);
-  extras::PackedPixelFile ppf;
-  JXL_RETURN_IF_ERROR(DecodeImageJXL(file.data(), file.size(), dparams,
-                                     /*decoded_bytes=*/nullptr, &ppf));
-  JXL_RETURN_IF_ERROR(ConvertPackedPixelFileToCodecInOut(ppf, pool, io));
-  return true;
-}
-
-void JxlBasicInfoSetFromPixelFormat(JxlBasicInfo* basic_info,
-                                    const JxlPixelFormat* pixel_format) {
-  JxlEncoderInitBasicInfo(basic_info);
-  switch (pixel_format->data_type) {
-    case JXL_TYPE_FLOAT:
-      basic_info->bits_per_sample = 32;
-      basic_info->exponent_bits_per_sample = 8;
-      break;
-    case JXL_TYPE_FLOAT16:
-      basic_info->bits_per_sample = 16;
-      basic_info->exponent_bits_per_sample = 5;
-      break;
-    case JXL_TYPE_UINT8:
-      basic_info->bits_per_sample = 8;
-      basic_info->exponent_bits_per_sample = 0;
-      break;
-    case JXL_TYPE_UINT16:
-      basic_info->bits_per_sample = 16;
-      basic_info->exponent_bits_per_sample = 0;
-      break;
-    default:
-      Check(false);
-  }
-  if (pixel_format->num_channels < 3) {
-    basic_info->num_color_channels = 1;
-  } else {
-    basic_info->num_color_channels = 3;
-  }
-  if (pixel_format->num_channels == 2 || pixel_format->num_channels == 4) {
-    basic_info->alpha_exponent_bits = basic_info->exponent_bits_per_sample;
-    basic_info->alpha_bits = basic_info->bits_per_sample;
-    basic_info->num_extra_channels = 1;
-  } else {
-    basic_info->alpha_exponent_bits = 0;
-    basic_info->alpha_bits = 0;
-  }
-}
-
-ColorEncoding ColorEncodingFromDescriptor(const ColorEncodingDescriptor& desc) {
-  ColorEncoding c;
-  c.SetColorSpace(desc.color_space);
-  if (desc.color_space != ColorSpace::kXYB) {
-    Check(c.SetWhitePointType(desc.white_point));
-    if (desc.color_space != ColorSpace::kGray) {
-      Check(c.SetPrimariesType(desc.primaries));
-    }
-    c.Tf().SetTransferFunction(desc.tf);
-  }
-  c.SetRenderingIntent(desc.rendering_intent);
-  Check(c.CreateICC());
-  return c;
-}
-
-namespace {
-void CheckSameEncodings(const std::vector<ColorEncoding>& a,
-                        const std::vector<ColorEncoding>& b,
-                        const std::string& check_name,
-                        std::stringstream& failures) {
-  Check(a.size() == b.size());
-  for (size_t i = 0; i < a.size(); ++i) {
-    if ((a[i].ICC() == b[i].ICC()) ||
-        ((a[i].GetPrimariesType() == b[i].GetPrimariesType()) &&
-         a[i].Tf().IsSame(b[i].Tf()))) {
-      continue;
-    }
-    failures << "CheckSameEncodings " << check_name << ": " << i
-             << "-th encoding mismatch\n";
-  }
-}
-}  // namespace
-
-bool Roundtrip(CodecInOut* io, const CompressParams& cparams,
-               extras::JXLDecompressParams dparams,
-               CodecInOut* JXL_RESTRICT io2, std::stringstream& failures,
-               size_t* compressed_size, ThreadPool* pool) {
-  DefaultAcceptedFormats(dparams);
-  if (compressed_size) {
-    *compressed_size = static_cast<size_t>(-1);
-  }
-  std::vector<uint8_t> compressed;
-
-  std::vector<ColorEncoding> original_metadata_encodings;
-  std::vector<ColorEncoding> original_current_encodings;
-  std::vector<ColorEncoding> metadata_encodings_1;
-  std::vector<ColorEncoding> metadata_encodings_2;
-  std::vector<ColorEncoding> current_encodings_2;
-  original_metadata_encodings.reserve(io->frames.size());
-  original_current_encodings.reserve(io->frames.size());
-  metadata_encodings_1.reserve(io->frames.size());
-  metadata_encodings_2.reserve(io->frames.size());
-  current_encodings_2.reserve(io->frames.size());
-
-  for (const ImageBundle& ib : io->frames) {
-    // Remember original encoding, will be returned by decoder.
-    original_metadata_encodings.push_back(ib.metadata()->color_encoding);
-    // c_current should not change during encoding.
-    original_current_encodings.push_back(ib.c_current());
-  }
-
-  Check(test::EncodeFile(cparams, io, &compressed, pool));
-
-  for (const ImageBundle& ib1 : io->frames) {
-    metadata_encodings_1.push_back(ib1.metadata()->color_encoding);
-  }
-
-  // Should still be in the same color space after encoding.
-  CheckSameEncodings(metadata_encodings_1, original_metadata_encodings,
-                     "original vs after encoding", failures);
-
-  Check(DecodeFile(dparams, Bytes(compressed), io2, pool));
-  Check(io2->frames.size() == io->frames.size());
-
-  for (const ImageBundle& ib2 : io2->frames) {
-    metadata_encodings_2.push_back(ib2.metadata()->color_encoding);
-    current_encodings_2.push_back(ib2.c_current());
-  }
-
-  // We always produce the original color encoding if a color transform hook is
-  // set.
-  CheckSameEncodings(current_encodings_2, original_current_encodings,
-                     "current: original vs decoded", failures);
-
-  // Decoder returns the originals passed to the encoder.
-  CheckSameEncodings(metadata_encodings_2, original_metadata_encodings,
-                     "metadata: original vs decoded", failures);
-
-  if (compressed_size) {
-    *compressed_size = compressed.size();
-  }
-
-  return failures.str().empty();
-}
-
-size_t Roundtrip(const extras::PackedPixelFile& ppf_in,
-                 const extras::JXLCompressParams& cparams,
-                 extras::JXLDecompressParams dparams, ThreadPool* pool,
-                 extras::PackedPixelFile* ppf_out) {
-  DefaultAcceptedFormats(dparams);
-  SetThreadParallelRunner(cparams, pool);
-  SetThreadParallelRunner(dparams, pool);
-  std::vector<uint8_t> compressed;
-  Check(extras::EncodeImageJXL(cparams, ppf_in, /*jpeg_bytes=*/nullptr,
-                               &compressed));
-  size_t decoded_bytes = 0;
-  Check(extras::DecodeImageJXL(compressed.data(), compressed.size(), dparams,
-                               &decoded_bytes, ppf_out));
-  Check(decoded_bytes == compressed.size());
-  return compressed.size();
-}
-
-std::vector<ColorEncodingDescriptor> AllEncodings() {
-  std::vector<ColorEncodingDescriptor> all_encodings;
-  all_encodings.reserve(300);
-
-  for (ColorSpace cs : Values<ColorSpace>()) {
-    if (cs == ColorSpace::kUnknown || cs == ColorSpace::kXYB ||
-        cs == ColorSpace::kGray) {
-      continue;
-    }
-
-    for (WhitePoint wp : Values<WhitePoint>()) {
-      if (wp == WhitePoint::kCustom) continue;
-      for (Primaries primaries : Values<Primaries>()) {
-        if (primaries == Primaries::kCustom) continue;
-        for (TransferFunction tf : Values<TransferFunction>()) {
-          if (tf == TransferFunction::kUnknown) continue;
-          for (RenderingIntent ri : Values<RenderingIntent>()) {
-            ColorEncodingDescriptor cdesc;
-            cdesc.color_space = cs;
-            cdesc.white_point = wp;
-            cdesc.primaries = primaries;
-            cdesc.tf = tf;
-            cdesc.rendering_intent = ri;
-            all_encodings.push_back(cdesc);
-          }
-        }
-      }
-    }
-  }
-
-  return all_encodings;
-}
-
-jxl::CodecInOut SomeTestImageToCodecInOut(const std::vector<uint8_t>& buf,
-                                          size_t num_channels, size_t xsize,
-                                          size_t ysize) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  jxl::CodecInOut io{memory_manager};
-  Check(io.SetSize(xsize, ysize));
-  io.metadata.m.SetAlphaBits(16);
-  io.metadata.m.color_encoding = jxl::ColorEncoding::SRGB(
-      /*is_gray=*/num_channels == 1 || num_channels == 2);
-  JxlPixelFormat format = {static_cast<uint32_t>(num_channels), JXL_TYPE_UINT16,
-                           JXL_BIG_ENDIAN, 0};
-  Check(ConvertFromExternal(
-      jxl::Bytes(buf.data(), buf.size()), xsize, ysize,
-      jxl::ColorEncoding::SRGB(/*is_gray=*/num_channels < 3),
-      /*bits_per_sample=*/16, format,
-      /*pool=*/nullptr,
-      /*ib=*/&io.Main()));
-  return io;
-}
-
-bool Near(double expected, double value, double max_dist) {
-  double dist = expected > value ? expected - value : value - expected;
-  return dist <= max_dist;
-}
-
-float LoadLEFloat16(const uint8_t* p) {
-  uint16_t bits16 = LoadLE16(p);
-  return detail::LoadFloat16(bits16);
-}
-
-float LoadBEFloat16(const uint8_t* p) {
-  uint16_t bits16 = LoadBE16(p);
-  return detail::LoadFloat16(bits16);
-}
-
-size_t GetPrecision(JxlDataType data_type) {
-  switch (data_type) {
-    case JXL_TYPE_UINT8:
-      return 8;
-    case JXL_TYPE_UINT16:
-      return 16;
-    case JXL_TYPE_FLOAT:
-      // Floating point mantissa precision
-      return 24;
-    case JXL_TYPE_FLOAT16:
-      return 11;
-    default:
-      Check(false);
-      return 0;
-  }
-}
-
-size_t GetDataBits(JxlDataType data_type) {
-  switch (data_type) {
-    case JXL_TYPE_UINT8:
-      return 8;
-    case JXL_TYPE_UINT16:
-      return 16;
-    case JXL_TYPE_FLOAT:
-      return 32;
-    case JXL_TYPE_FLOAT16:
-      return 16;
-    default:
-      Check(false);
-      return 0;
-  }
-}
-
-std::vector<double> ConvertToRGBA32(const uint8_t* pixels, size_t xsize,
-                                    size_t ysize, const JxlPixelFormat& format,
-                                    double factor) {
-  std::vector<double> result(xsize * ysize * 4);
-  size_t num_channels = format.num_channels;
-  bool gray = num_channels == 1 || num_channels == 2;
-  bool alpha = num_channels == 2 || num_channels == 4;
-  JxlEndianness endianness = format.endianness;
-  // Compute actual type:
-  if (endianness == JXL_NATIVE_ENDIAN) {
-    endianness = IsLittleEndian() ? JXL_LITTLE_ENDIAN : JXL_BIG_ENDIAN;
-  }
-
-  size_t stride =
-      xsize * jxl::DivCeil(GetDataBits(format.data_type) * num_channels,
-                           jxl::kBitsPerByte);
-  if (format.align > 1) stride = jxl::RoundUpTo(stride, format.align);
-
-  if (format.data_type == JXL_TYPE_UINT8) {
-    // Multiplier to bring to 0-1.0 range
-    double mul = factor > 0.0 ? factor : 1.0 / 255.0;
-    for (size_t y = 0; y < ysize; ++y) {
-      for (size_t x = 0; x < xsize; ++x) {
-        size_t j = (y * xsize + x) * 4;
-        size_t i = y * stride + x * num_channels;
-        double r = pixels[i];
-        double g = gray ? r : pixels[i + 1];
-        double b = gray ? r : pixels[i + 2];
-        double a = alpha ? pixels[i + num_channels - 1] : 255;
-        result[j + 0] = r * mul;
-        result[j + 1] = g * mul;
-        result[j + 2] = b * mul;
-        result[j + 3] = a * mul;
-      }
-    }
-  } else if (format.data_type == JXL_TYPE_UINT16) {
-    Check(endianness != JXL_NATIVE_ENDIAN);
-    // Multiplier to bring to 0-1.0 range
-    double mul = factor > 0.0 ? factor : 1.0 / 65535.0;
-    for (size_t y = 0; y < ysize; ++y) {
-      for (size_t x = 0; x < xsize; ++x) {
-        size_t j = (y * xsize + x) * 4;
-        size_t i = y * stride + x * num_channels * 2;
-        double r;
-        double g;
-        double b;
-        double a;
-        if (endianness == JXL_BIG_ENDIAN) {
-          r = (pixels[i + 0] << 8) + pixels[i + 1];
-          g = gray ? r : (pixels[i + 2] << 8) + pixels[i + 3];
-          b = gray ? r : (pixels[i + 4] << 8) + pixels[i + 5];
-          a = alpha ? (pixels[i + num_channels * 2 - 2] << 8) +
-                          pixels[i + num_channels * 2 - 1]
-                    : 65535;
-        } else {
-          r = (pixels[i + 1] << 8) + pixels[i + 0];
-          g = gray ? r : (pixels[i + 3] << 8) + pixels[i + 2];
-          b = gray ? r : (pixels[i + 5] << 8) + pixels[i + 4];
-          a = alpha ? (pixels[i + num_channels * 2 - 1] << 8) +
-                          pixels[i + num_channels * 2 - 2]
-                    : 65535;
-        }
-        result[j + 0] = r * mul;
-        result[j + 1] = g * mul;
-        result[j + 2] = b * mul;
-        result[j + 3] = a * mul;
-      }
-    }
-  } else if (format.data_type == JXL_TYPE_FLOAT) {
-    Check(endianness != JXL_NATIVE_ENDIAN);
-    for (size_t y = 0; y < ysize; ++y) {
-      for (size_t x = 0; x < xsize; ++x) {
-        size_t j = (y * xsize + x) * 4;
-        size_t i = y * stride + x * num_channels * 4;
-        double r;
-        double g;
-        double b;
-        double a;
-        if (endianness == JXL_BIG_ENDIAN) {
-          r = LoadBEFloat(pixels + i);
-          g = gray ? r : LoadBEFloat(pixels + i + 4);
-          b = gray ? r : LoadBEFloat(pixels + i + 8);
-          a = alpha ? LoadBEFloat(pixels + i + num_channels * 4 - 4) : 1.0;
-        } else {
-          r = LoadLEFloat(pixels + i);
-          g = gray ? r : LoadLEFloat(pixels + i + 4);
-          b = gray ? r : LoadLEFloat(pixels + i + 8);
-          a = alpha ? LoadLEFloat(pixels + i + num_channels * 4 - 4) : 1.0;
-        }
-        result[j + 0] = r;
-        result[j + 1] = g;
-        result[j + 2] = b;
-        result[j + 3] = a;
-      }
-    }
-  } else if (format.data_type == JXL_TYPE_FLOAT16) {
-    Check(endianness != JXL_NATIVE_ENDIAN);
-    for (size_t y = 0; y < ysize; ++y) {
-      for (size_t x = 0; x < xsize; ++x) {
-        size_t j = (y * xsize + x) * 4;
-        size_t i = y * stride + x * num_channels * 2;
-        double r;
-        double g;
-        double b;
-        double a;
-        if (endianness == JXL_BIG_ENDIAN) {
-          r = LoadBEFloat16(pixels + i);
-          g = gray ? r : LoadBEFloat16(pixels + i + 2);
-          b = gray ? r : LoadBEFloat16(pixels + i + 4);
-          a = alpha ? LoadBEFloat16(pixels + i + num_channels * 2 - 2) : 1.0;
-        } else {
-          r = LoadLEFloat16(pixels + i);
-          g = gray ? r : LoadLEFloat16(pixels + i + 2);
-          b = gray ? r : LoadLEFloat16(pixels + i + 4);
-          a = alpha ? LoadLEFloat16(pixels + i + num_channels * 2 - 2) : 1.0;
-        }
-        result[j + 0] = r;
-        result[j + 1] = g;
-        result[j + 2] = b;
-        result[j + 3] = a;
-      }
-    }
-  } else {
-    Check(false);  // Unsupported type
-  }
-  return result;
-}
-
-size_t ComparePixels(const uint8_t* a, const uint8_t* b, size_t xsize,
-                     size_t ysize, const JxlPixelFormat& format_a,
-                     const JxlPixelFormat& format_b,
-                     double threshold_multiplier) {
-  // Convert both images to equal full precision for comparison.
-  std::vector<double> a_full = ConvertToRGBA32(a, xsize, ysize, format_a);
-  std::vector<double> b_full = ConvertToRGBA32(b, xsize, ysize, format_b);
-  bool gray_a = format_a.num_channels < 3;
-  bool gray_b = format_b.num_channels < 3;
-  bool alpha_a = ((format_a.num_channels & 1) == 0);
-  bool alpha_b = ((format_b.num_channels & 1) == 0);
-  size_t bits_a = GetPrecision(format_a.data_type);
-  size_t bits_b = GetPrecision(format_b.data_type);
-  size_t bits = std::min(bits_a, bits_b);
-  // How much distance is allowed in case of pixels with lower bit depths, given
-  // that the double precision float images use range 0-1.0.
-  // E.g. in case of 1-bit this is 0.5 since 0.499 must map to 0 and 0.501 must
-  // map to 1.
-  double precision = 0.5 * threshold_multiplier / ((1ull << bits) - 1ull);
-  if (format_a.data_type == JXL_TYPE_FLOAT16 ||
-      format_b.data_type == JXL_TYPE_FLOAT16) {
-    // Lower the precision for float16, because it currently looks like the
-    // scalar and wasm implementations of hwy have 1 less bit of precision
-    // than the x86 implementations.
-    // TODO(lode): Set the required precision back to 11 bits when possible.
-    precision = 0.5 * threshold_multiplier / ((1ull << (bits - 1)) - 1ull);
-  }
-  if (format_b.data_type == JXL_TYPE_UINT8) {
-    // Increase the threshold by the maximum difference introduced by dithering.
-    precision += 63.0 / 128.0;
-  }
-  size_t numdiff = 0;
-  for (size_t y = 0; y < ysize; y++) {
-    for (size_t x = 0; x < xsize; x++) {
-      size_t i = (y * xsize + x) * 4;
-      bool ok = true;
-      if (gray_a || gray_b) {
-        if (!Near(a_full[i + 0], b_full[i + 0], precision)) ok = false;
-        // If the input was grayscale and the output not, then the output must
-        // have all channels equal.
-        if (gray_a && b_full[i + 0] != b_full[i + 1] &&
-            b_full[i + 2] != b_full[i + 2]) {
-          ok = false;
-        }
-      } else {
-        if (!Near(a_full[i + 0], b_full[i + 0], precision) ||
-            !Near(a_full[i + 1], b_full[i + 1], precision) ||
-            !Near(a_full[i + 2], b_full[i + 2], precision)) {
-          ok = false;
-        }
-      }
-      if (alpha_a && alpha_b) {
-        if (!Near(a_full[i + 3], b_full[i + 3], precision)) ok = false;
-      } else {
-        // If the input had no alpha channel, the output should be opaque
-        // after roundtrip.
-        if (alpha_b && !Near(1.0, b_full[i + 3], precision)) ok = false;
-      }
-      if (!ok) numdiff++;
-    }
-  }
-  return numdiff;
-}
-
-double DistanceRMS(const uint8_t* a, const uint8_t* b, size_t xsize,
-                   size_t ysize, const JxlPixelFormat& format) {
-  // Convert both images to equal full precision for comparison.
-  std::vector<double> a_full = ConvertToRGBA32(a, xsize, ysize, format);
-  std::vector<double> b_full = ConvertToRGBA32(b, xsize, ysize, format);
-  double sum = 0.0;
-  for (size_t y = 0; y < ysize; y++) {
-    double row_sum = 0.0;
-    for (size_t x = 0; x < xsize; x++) {
-      size_t i = (y * xsize + x) * 4;
-      for (size_t c = 0; c < format.num_channels; ++c) {
-        double diff = a_full[i + c] - b_full[i + c];
-        row_sum += diff * diff;
-      }
-    }
-    sum += row_sum;
-  }
-  sum /= (xsize * ysize);
-  return sqrt(sum);
-}
-
-float ButteraugliDistance(const extras::PackedPixelFile& a,
-                          const extras::PackedPixelFile& b, ThreadPool* pool) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  CodecInOut io0{memory_manager};
-  Check(ConvertPackedPixelFileToCodecInOut(a, pool, &io0));
-  CodecInOut io1{memory_manager};
-  Check(ConvertPackedPixelFileToCodecInOut(b, pool, &io1));
-  // TODO(eustas): simplify?
-  return ButteraugliDistance(io0.frames, io1.frames, ButteraugliParams(),
-                             *JxlGetDefaultCms(),
-                             /*distmap=*/nullptr, pool);
-}
-
-float ButteraugliDistance(const ImageBundle& rgb0, const ImageBundle& rgb1,
-                          const ButteraugliParams& params,
-                          const JxlCmsInterface& cms, ImageF* distmap,
-                          ThreadPool* pool, bool ignore_alpha) {
-  JxlButteraugliComparator comparator(params, cms);
-  float distance;
-  Check(ComputeScore(rgb0, rgb1, &comparator, cms, &distance, distmap, pool,
-                     ignore_alpha));
-  return distance;
-}
-
-float ButteraugliDistance(const std::vector<ImageBundle>& frames0,
-                          const std::vector<ImageBundle>& frames1,
-                          const ButteraugliParams& params,
-                          const JxlCmsInterface& cms, ImageF* distmap,
-                          ThreadPool* pool) {
-  JxlButteraugliComparator comparator(params, cms);
-  Check(frames0.size() == frames1.size());
-  float max_dist = 0.0f;
-  for (size_t i = 0; i < frames0.size(); ++i) {
-    float frame_score;
-    Check(ComputeScore(frames0[i], frames1[i], &comparator, cms, &frame_score,
-                       distmap, pool));
-    max_dist = std::max(max_dist, frame_score);
-  }
-  return max_dist;
-}
-
-float Butteraugli3Norm(const extras::PackedPixelFile& a,
-                       const extras::PackedPixelFile& b, ThreadPool* pool) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  CodecInOut io0{memory_manager};
-  Check(ConvertPackedPixelFileToCodecInOut(a, pool, &io0));
-  CodecInOut io1{memory_manager};
-  Check(ConvertPackedPixelFileToCodecInOut(b, pool, &io1));
-  ButteraugliParams butteraugli_params;
-  ImageF distmap;
-  ButteraugliDistance(io0.frames, io1.frames, butteraugli_params,
-                      *JxlGetDefaultCms(), &distmap, pool);
-  return ComputeDistanceP(distmap, butteraugli_params, 3);
-}
-
-float ComputeDistance2(const extras::PackedPixelFile& a,
-                       const extras::PackedPixelFile& b) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  CodecInOut io0{memory_manager};
-  Check(ConvertPackedPixelFileToCodecInOut(a, nullptr, &io0));
-  CodecInOut io1{memory_manager};
-  Check(ConvertPackedPixelFileToCodecInOut(b, nullptr, &io1));
-  return ComputeDistance2(io0.Main(), io1.Main(), *JxlGetDefaultCms());
-}
-
-float ComputePSNR(const extras::PackedPixelFile& a,
-                  const extras::PackedPixelFile& b) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  CodecInOut io0{memory_manager};
-  Check(ConvertPackedPixelFileToCodecInOut(a, nullptr, &io0));
-  CodecInOut io1{memory_manager};
-  Check(ConvertPackedPixelFileToCodecInOut(b, nullptr, &io1));
-  return ComputePSNR(io0.Main(), io1.Main(), *JxlGetDefaultCms());
-}
-
-bool SameAlpha(const extras::PackedPixelFile& a,
-               const extras::PackedPixelFile& b) {
-  Check(a.info.xsize == b.info.xsize);
-  Check(a.info.ysize == b.info.ysize);
-  Check(a.info.alpha_bits == b.info.alpha_bits);
-  Check(a.info.alpha_exponent_bits == b.info.alpha_exponent_bits);
-  Check(a.info.alpha_bits > 0);
-  Check(a.frames.size() == b.frames.size());
-  for (size_t i = 0; i < a.frames.size(); ++i) {
-    const extras::PackedImage& color_a = a.frames[i].color;
-    const extras::PackedImage& color_b = b.frames[i].color;
-    Check(color_a.format.num_channels == color_b.format.num_channels);
-    Check(color_a.format.data_type == color_b.format.data_type);
-    Check(color_a.format.endianness == color_b.format.endianness);
-    Check(color_a.pixels_size == color_b.pixels_size);
-    size_t pwidth =
-        extras::PackedImage::BitsPerChannel(color_a.format.data_type) / 8;
-    size_t num_color = color_a.format.num_channels < 3 ? 1 : 3;
-    const uint8_t* p_a = reinterpret_cast<const uint8_t*>(color_a.pixels());
-    const uint8_t* p_b = reinterpret_cast<const uint8_t*>(color_b.pixels());
-    for (size_t y = 0; y < a.info.ysize; ++y) {
-      for (size_t x = 0; x < a.info.xsize; ++x) {
-        size_t idx =
-            ((y * a.info.xsize + x) * color_a.format.num_channels + num_color) *
-            pwidth;
-        if (memcmp(&p_a[idx], &p_b[idx], pwidth) != 0) {
-          return false;
-        }
-      }
-    }
-  }
-  return true;
-}
-
-bool SamePixels(const extras::PackedImage& a, const extras::PackedImage& b) {
-  Check(a.xsize == b.xsize);
-  Check(a.ysize == b.ysize);
-  Check(a.format.num_channels == b.format.num_channels);
-  Check(a.format.data_type == b.format.data_type);
-  Check(a.format.endianness == b.format.endianness);
-  Check(a.pixels_size == b.pixels_size);
-  const uint8_t* p_a = reinterpret_cast<const uint8_t*>(a.pixels());
-  const uint8_t* p_b = reinterpret_cast<const uint8_t*>(b.pixels());
-  for (size_t y = 0; y < a.ysize; ++y) {
-    for (size_t x = 0; x < a.xsize; ++x) {
-      size_t idx = (y * a.xsize + x) * a.pixel_stride();
-      if (memcmp(&p_a[idx], &p_b[idx], a.pixel_stride()) != 0) {
-        printf("Mismatch at row %" PRIuS " col %" PRIuS "\n", y, x);
-        printf("  a: ");
-        for (size_t j = 0; j < a.pixel_stride(); ++j) {
-          printf(" %3u", p_a[idx + j]);
-        }
-        printf("\n  b: ");
-        for (size_t j = 0; j < a.pixel_stride(); ++j) {
-          printf(" %3u", p_b[idx + j]);
-        }
-        printf("\n");
-        return false;
-      }
-    }
-  }
-  return true;
-}
-
-bool SamePixels(const extras::PackedPixelFile& a,
-                const extras::PackedPixelFile& b) {
-  Check(a.info.xsize == b.info.xsize);
-  Check(a.info.ysize == b.info.ysize);
-  Check(a.info.bits_per_sample == b.info.bits_per_sample);
-  Check(a.info.exponent_bits_per_sample == b.info.exponent_bits_per_sample);
-  Check(a.frames.size() == b.frames.size());
-  for (size_t i = 0; i < a.frames.size(); ++i) {
-    const auto& frame_a = a.frames[i];
-    const auto& frame_b = b.frames[i];
-    if (!SamePixels(frame_a.color, frame_b.color)) {
-      return false;
-    }
-    Check(frame_a.extra_channels.size() == frame_b.extra_channels.size());
-    for (size_t j = 0; j < frame_a.extra_channels.size(); ++j) {
-      if (!SamePixels(frame_a.extra_channels[i], frame_b.extra_channels[i])) {
-        return false;
-      }
-    }
-  }
-  return true;
-}
-
-Status ReadICC(BitReader* JXL_RESTRICT reader,
-               std::vector<uint8_t>* JXL_RESTRICT icc) {
-  JxlMemoryManager* memort_manager = jxl::test::MemoryManager();
-  icc->clear();
-  ICCReader icc_reader{memort_manager};
-  PaddedBytes icc_buffer{memort_manager};
-  JXL_RETURN_IF_ERROR(icc_reader.Init(reader));
-  JXL_RETURN_IF_ERROR(icc_reader.Process(reader, &icc_buffer));
-  Bytes(icc_buffer).AppendTo(*icc);
-  return true;
-}
-
-namespace {  // For EncodeFile
-Status PrepareCodecMetadataFromIO(const CompressParams& cparams,
-                                  const CodecInOut* io,
-                                  CodecMetadata* metadata) {
-  *metadata = io->metadata;
-  size_t ups = 1;
-  if (cparams.already_downsampled) ups = cparams.resampling;
-
-  JXL_RETURN_IF_ERROR(metadata->size.Set(io->xsize() * ups, io->ysize() * ups));
-
-  // Keep ICC profile in lossless modes because a reconstructed profile may be
-  // slightly different (quantization).
-  // Also keep ICC in JPEG reconstruction mode as we need byte-exact profiles.
-  if (!cparams.IsLossless() && !io->Main().IsJPEG() && cparams.cms_set) {
-    metadata->m.color_encoding.DecideIfWantICC(cparams.cms);
-  }
-
-  metadata->m.xyb_encoded =
-      cparams.color_transform == ColorTransform::kXYB ? true : false;
-
-  // TODO(firsching): move this EncodeFile to test_utils / re-implement this
-  // using API functions
-  return true;
-}
-
-Status EncodePreview(const CompressParams& cparams, ImageBundle& ib,
-                     const CodecMetadata* metadata, const JxlCmsInterface& cms,
-                     ThreadPool* pool, BitWriter* JXL_RESTRICT writer) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  BitWriter preview_writer{memory_manager};
-  // TODO(janwas): also support generating preview by downsampling
-  if (ib.HasColor()) {
-    AuxOut aux_out;
-    // TODO(lode): check if we want all extra channels and matching xyb_encoded
-    // for the preview, such that using the main ImageMetadata object for
-    // encoding this frame is warrented.
-    FrameInfo frame_info;
-    frame_info.is_preview = true;
-    JXL_RETURN_IF_ERROR(EncodeFrame(memory_manager, cparams, frame_info,
-                                    metadata, ib, cms, pool, &preview_writer,
-                                    &aux_out));
-    preview_writer.ZeroPadToByte();
-  }
-
-  if (preview_writer.BitsWritten() != 0) {
-    writer->ZeroPadToByte();
-    JXL_RETURN_IF_ERROR(writer->AppendByteAligned(preview_writer.GetSpan()));
-  }
-
-  return true;
-}
-
-}  // namespace
-
-Status EncodeFile(const CompressParams& params, CodecInOut* io,
-                  std::vector<uint8_t>* compressed, ThreadPool* pool) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  compressed->clear();
-  const JxlCmsInterface& cms = *JxlGetDefaultCms();
-  JXL_RETURN_IF_ERROR(io->CheckMetadata());
-  BitWriter writer{memory_manager};
-
-  CompressParams cparams = params;
-  if (io->Main().color_transform != ColorTransform::kNone) {
-    // Set the color transform to YCbCr or XYB if the original image is such.
-    cparams.color_transform = io->Main().color_transform;
-  }
-
-  JXL_RETURN_IF_ERROR(ParamsPostInit(&cparams));
-
-  std::unique_ptr<CodecMetadata> metadata = jxl::make_unique<CodecMetadata>();
-  JXL_RETURN_IF_ERROR(PrepareCodecMetadataFromIO(cparams, io, metadata.get()));
-  JXL_RETURN_IF_ERROR(
-      WriteCodestreamHeaders(metadata.get(), &writer, /*aux_out*/ nullptr));
-
-  // Only send ICC (at least several hundred bytes) if fields aren't enough.
-  if (metadata->m.color_encoding.WantICC()) {
-    JXL_RETURN_IF_ERROR(
-        WriteICC(Span<const uint8_t>(metadata->m.color_encoding.ICC()), &writer,
-                 LayerType::Header, /* aux_out */ nullptr));
-  }
-
-  if (metadata->m.have_preview) {
-    JXL_RETURN_IF_ERROR(EncodePreview(cparams, io->preview_frame,
-                                      metadata.get(), cms, pool, &writer));
-  }
-
-  // Each frame should start on byte boundaries.
-  JXL_RETURN_IF_ERROR(
-      writer.WithMaxBits(8, LayerType::Header, /*aux_out=*/nullptr, [&] {
-        writer.ZeroPadToByte();
-        return true;
-      }));
-
-  for (size_t i = 0; i < io->frames.size(); i++) {
-    FrameInfo info;
-    info.is_last = i == io->frames.size() - 1;
-    if (io->frames[i].use_for_next_frame) {
-      info.save_as_reference = 1;
-    }
-    JXL_RETURN_IF_ERROR(EncodeFrame(memory_manager, cparams, info,
-                                    metadata.get(), io->frames[i], cms, pool,
-                                    &writer,
-                                    /* aux_out */ nullptr));
-  }
-
-  PaddedBytes output = std::move(writer).TakeBytes();
-  Bytes(output).AppendTo(*compressed);
-  return true;
-}
-
-extras::JXLCompressParams CompressParamsForLossless() {
-  extras::JXLCompressParams cparams;
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_MODULAR, 1);
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_COLOR_TRANSFORM, 1);
-  cparams.AddOption(JXL_ENC_FRAME_SETTING_MODULAR_PREDICTOR, 6);  // Weighted
-  cparams.distance = 0.0;
-  return cparams;
-}
-
-StatusOr<ImageF> GetImage(const extras::PackedPixelFile& ppf) {
-  JxlMemoryManager* memory_manager = MemoryManager();
-  ImageF gray;
-  JXL_ENSURE(!ppf.frames.empty());
-  const extras::PackedImage& image = ppf.frames[0].color;
-  const JxlPixelFormat& format = image.format;
-  JXL_RETURN_IF_ERROR(format.num_channels == 1);
-  const uint8_t* pixels = reinterpret_cast<const uint8_t*>(image.pixels());
-  JXL_TEST_ASSIGN_OR_DIE(
-      gray, ImageF::Create(memory_manager, image.xsize, image.ysize));
-  JXL_RETURN_IF_ERROR(
-      ConvertFromExternal(pixels, image.pixels_size, image.xsize, image.ysize,
-                          ppf.info.bits_per_sample, format, 0, nullptr, &gray));
-  return gray;
-}
-
-StatusOr<Image3F> GetColorImage(const extras::PackedPixelFile& ppf) {
-  JxlMemoryManager* memory_manager = MemoryManager();
-  Image3F color;
-  JXL_ENSURE(!ppf.frames.empty());
-  const extras::PackedImage& image = ppf.frames[0].color;
-  const JxlPixelFormat& format = image.format;
-  JXL_RETURN_IF_ERROR(format.num_channels == 3);
-  const uint8_t* pixels = reinterpret_cast<const uint8_t*>(image.pixels());
-  JXL_TEST_ASSIGN_OR_DIE(
-      color, Image3F::Create(memory_manager, image.xsize, image.ysize));
-  for (size_t c = 0; c < format.num_channels; ++c) {
-    JXL_RETURN_IF_ERROR(ConvertFromExternal(
-        pixels, image.pixels_size, image.xsize, image.ysize,
-        ppf.info.bits_per_sample, format, c, nullptr, &color.Plane(c)));
-  }
-  return color;
-}
-
-}  // namespace test
-
-bool operator==(const jxl::Bytes& a, const jxl::Bytes& b) {
-  if (a.size() != b.size()) return false;
-  if (memcmp(a.data(), b.data(), a.size()) != 0) return false;
-  return true;
-}
-
-// Allow using EXPECT_EQ on jxl::Bytes
-bool operator!=(const jxl::Bytes& a, const jxl::Bytes& b) { return !(a == b); }
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/test_utils.h b/third_party/jpeg-xl/lib/jxl/test_utils.h
deleted file mode 100644
index a8d331221a0ce..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/test_utils.h
+++ /dev/null
@@ -1,243 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_TEST_UTILS_H_
-#define LIB_JXL_TEST_UTILS_H_
-
-// TODO(eustas): reduce includes (move to .cc)
-
-// Macros and functions useful for tests.
-
-#include <jxl/codestream_header.h>
-#include <jxl/memory_manager.h>
-#include <jxl/thread_parallel_runner_cxx.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <ostream>
-#include <vector>
-
-#include "lib/extras/dec/jxl.h"
-#include "lib/extras/enc/jxl.h"
-#include "lib/extras/packed_image.h"
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/span.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/butteraugli/butteraugli.h"
-#include "lib/jxl/codec_in_out.h"
-#include "lib/jxl/color_encoding_internal.h"
-#include "lib/jxl/enc_params.h"
-
-#define TEST_LIBJPEG_SUPPORT()                                              \
-  do {                                                                      \
-    if (!jxl::extras::CanDecode(jxl::extras::Codec::kJPG)) {                \
-      fprintf(stderr, "Skipping test because of missing libjpeg codec.\n"); \
-      return;                                                               \
-    }                                                                       \
-  } while (0)
-
-namespace jxl {
-
-struct AuxOut;
-class CodecInOut;
-class PaddedBytes;
-struct PassesEncoderState;
-class ThreadPool;
-
-namespace test {
-
-void Check(bool ok);
-
-#define JXL_TEST_ASSIGN_OR_DIE(lhs, statusor) \
-  PRIVATE_JXL_TEST_ASSIGN_OR_DIE_IMPL(        \
-      JXL_JOIN(assign_or_die_temporary_variable, __LINE__), lhs, statusor)
-
-// NOLINTBEGIN(bugprone-macro-parentheses)
-#define PRIVATE_JXL_TEST_ASSIGN_OR_DIE_IMPL(name, lhs, statusor) \
-  auto name = statusor;                                          \
-  ::jxl::test::Check(name.ok());                                 \
-  lhs = std::move(name).value_();
-// NOLINTEND(bugprone-macro-parentheses)
-
-std::string GetTestDataPath(const std::string& filename);
-
-// Returns an ICC profile output by the JPEG XL decoder for RGB_D65_SRG_Rel_Lin,
-// but with, on purpose, rXYZ, bXYZ and gXYZ (the RGB primaries) switched to a
-// different order to ensure the profile does not match any known profile, so
-// the encoder cannot encode it in a compact struct instead.
-jxl::IccBytes GetIccTestProfile();
-
-std::vector<uint8_t> GetCompressedIccTestProfile();
-
-std::vector<uint8_t> ReadTestData(const std::string& filename);
-
-void JxlBasicInfoSetFromPixelFormat(JxlBasicInfo* basic_info,
-                                    const JxlPixelFormat* pixel_format);
-
-void DefaultAcceptedFormats(extras::JXLDecompressParams& dparams);
-
-template <typename Params>
-void SetThreadParallelRunner(Params params, ThreadPool* pool) {
-  if (pool && !params.runner_opaque) {
-    params.runner = pool->runner();
-    params.runner_opaque = pool->runner_opaque();
-  }
-}
-
-Status DecodeFile(extras::JXLDecompressParams dparams, Span<const uint8_t> file,
-                  CodecInOut* JXL_RESTRICT io, ThreadPool* pool = nullptr);
-
-bool Roundtrip(CodecInOut* io, const CompressParams& cparams,
-               extras::JXLDecompressParams dparams,
-               CodecInOut* JXL_RESTRICT io2, std::stringstream& failures,
-               size_t* compressed_size = nullptr, ThreadPool* pool = nullptr);
-
-// Returns compressed size [bytes].
-size_t Roundtrip(const extras::PackedPixelFile& ppf_in,
-                 const extras::JXLCompressParams& cparams,
-                 extras::JXLDecompressParams dparams, ThreadPool* pool,
-                 extras::PackedPixelFile* ppf_out);
-
-// A POD descriptor of a ColorEncoding. Only used in tests as the return value
-// of AllEncodings().
-struct ColorEncodingDescriptor {
-  ColorSpace color_space;
-  WhitePoint white_point;
-  Primaries primaries;
-  TransferFunction tf;
-  RenderingIntent rendering_intent;
-};
-
-ColorEncoding ColorEncodingFromDescriptor(const ColorEncodingDescriptor& desc);
-
-// Define the operator<< for tests.
-static inline ::std::ostream& operator<<(::std::ostream& os,
-                                         const ColorEncodingDescriptor& c) {
-  return os << "ColorEncoding/" << Description(ColorEncodingFromDescriptor(c));
-}
-
-// Returns ColorEncodingDescriptors, which are only used in tests. To obtain a
-// ColorEncoding object call ColorEncodingFromDescriptor and then call
-// ColorEncoding::CreateProfile() on that object to generate a profile.
-std::vector<ColorEncodingDescriptor> AllEncodings();
-
-// Returns a CodecInOut based on the buf, xsize, ysize, and the assumption
-// that the buffer was created using `GetSomeTestImage`.
-jxl::CodecInOut SomeTestImageToCodecInOut(const std::vector<uint8_t>& buf,
-                                          size_t num_channels, size_t xsize,
-                                          size_t ysize);
-
-bool Near(double expected, double value, double max_dist);
-
-float LoadLEFloat16(const uint8_t* p);
-
-float LoadBEFloat16(const uint8_t* p);
-
-size_t GetPrecision(JxlDataType data_type);
-
-size_t GetDataBits(JxlDataType data_type);
-
-// Procedure to convert pixels to double precision, not efficient, but
-// well-controlled for testing. It uses double, to be able to represent all
-// precisions needed for the maximum data types the API supports: uint32_t
-// integers, and, single precision float. The values are in range 0-1 for SDR.
-std::vector<double> ConvertToRGBA32(const uint8_t* pixels, size_t xsize,
-                                    size_t ysize, const JxlPixelFormat& format,
-                                    double factor = 0.0);
-
-// Returns amount of pixels which differ between the two pictures. Image b is
-// the image after roundtrip after roundtrip, image a before roundtrip. There
-// are more strict requirements for the alpha channel and grayscale values of
-// the output image.
-size_t ComparePixels(const uint8_t* a, const uint8_t* b, size_t xsize,
-                     size_t ysize, const JxlPixelFormat& format_a,
-                     const JxlPixelFormat& format_b,
-                     double threshold_multiplier = 1.0);
-
-double DistanceRMS(const uint8_t* a, const uint8_t* b, size_t xsize,
-                   size_t ysize, const JxlPixelFormat& format);
-
-float ButteraugliDistance(const extras::PackedPixelFile& a,
-                          const extras::PackedPixelFile& b,
-                          ThreadPool* pool = nullptr);
-
-float ButteraugliDistance(const ImageBundle& rgb0, const ImageBundle& rgb1,
-                          const ButteraugliParams& params,
-                          const JxlCmsInterface& cms, ImageF* distmap = nullptr,
-                          ThreadPool* pool = nullptr,
-                          bool ignore_alpha = false);
-
-float ButteraugliDistance(const std::vector<ImageBundle>& frames0,
-                          const std::vector<ImageBundle>& frames1,
-                          const ButteraugliParams& params,
-                          const JxlCmsInterface& cms, ImageF* distmap = nullptr,
-                          ThreadPool* pool = nullptr);
-
-float Butteraugli3Norm(const extras::PackedPixelFile& a,
-                       const extras::PackedPixelFile& b,
-                       ThreadPool* pool = nullptr);
-
-float ComputeDistance2(const extras::PackedPixelFile& a,
-                       const extras::PackedPixelFile& b);
-
-float ComputePSNR(const extras::PackedPixelFile& a,
-                  const extras::PackedPixelFile& b);
-
-bool SameAlpha(const extras::PackedPixelFile& a,
-               const extras::PackedPixelFile& b);
-
-bool SamePixels(const extras::PackedImage& a, const extras::PackedImage& b);
-
-bool SamePixels(const extras::PackedPixelFile& a,
-                const extras::PackedPixelFile& b);
-
-extras::JXLCompressParams CompressParamsForLossless();
-
-StatusOr<ImageF> GetImage(const extras::PackedPixelFile& ppf);
-
-StatusOr<Image3F> GetColorImage(const extras::PackedPixelFile& ppf);
-
-class ThreadPoolForTests {
- public:
-  explicit ThreadPoolForTests(int num_threads) {
-    runner_ =
-        JxlThreadParallelRunnerMake(/* memory_manager */ nullptr, num_threads);
-    pool_ =
-        jxl::make_unique<ThreadPool>(JxlThreadParallelRunner, runner_.get());
-  }
-  ThreadPoolForTests(const ThreadPoolForTests&) = delete;
-  ThreadPoolForTests& operator&(const ThreadPoolForTests&) = delete;
-  ThreadPool* get() { return pool_.get(); }
-
- private:
-  JxlThreadParallelRunnerPtr runner_;
-  std::unique_ptr<ThreadPool> pool_;
-};
-
-// `icc` may be empty afterwards - if so, call CreateProfile. Does not append,
-// clears any original data that was in icc.
-// If `output_limit` is not 0, then returns error if resulting profile would be
-// longer than `output_limit`
-Status ReadICC(BitReader* JXL_RESTRICT reader,
-               std::vector<uint8_t>* JXL_RESTRICT icc);
-
-// Compresses pixels from `io` (given in any ColorEncoding).
-// `io->metadata.m.original` must be set.
-Status EncodeFile(const CompressParams& params, CodecInOut* io,
-                  std::vector<uint8_t>* compressed, ThreadPool* pool = nullptr);
-
-constexpr const char* BoolToCStr(bool b) { return b ? "true" : "false"; }
-
-}  // namespace test
-
-bool operator==(const jxl::Bytes& a, const jxl::Bytes& b);
-
-// Allow using EXPECT_EQ on jxl::Bytes
-bool operator!=(const jxl::Bytes& a, const jxl::Bytes& b);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_TEST_UTILS_H_
diff --git a/third_party/jpeg-xl/lib/jxl/testing.h b/third_party/jpeg-xl/lib/jxl/testing.h
deleted file mode 100644
index 492034760d737..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/testing.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_TESTING_H_
-#define LIB_JXL_TESTING_H_
-
-// GTest specific macros / wrappers.
-
-#include "gtest/gtest.h"
-// JPEGXL_ENABLE_BOXES, JPEGXL_ENABLE_TRANSCODE_JPEG
-#include "lib/jxl/common.h"
-
-#ifdef JXL_DISABLE_SLOW_TESTS
-#define JXL_SLOW_TEST(T, C) TEST(T, DISABLED_##C)
-#else
-#define JXL_SLOW_TEST(T, C) TEST(T, C)
-#endif  // JXL_DISABLE_SLOW_TESTS
-
-#if JPEGXL_ENABLE_TRANSCODE_JPEG
-#define JXL_TRANSCODE_JPEG_TEST(T, C) TEST(T, C)
-#else
-#define JXL_TRANSCODE_JPEG_TEST(T, C) TEST(T, DISABLED_##C)
-#endif  // JPEGXL_ENABLE_TRANSCODE_JPEG
-
-#if JPEGXL_ENABLE_BOXES
-#define JXL_BOXES_TEST(T, C) TEST(T, C)
-#define JXL_BOXES_TEST_P(T, C) TEST_P(T, C)
-#else
-#define JXL_BOXES_TEST(T, C) TEST(T, DISABLED_##C)
-#define JXL_BOXES_TEST_P(T, C) TEST_P(T, DISABLED_##C)
-#endif  // JPEGXL_ENABLE_BOXES
-
-#ifdef THREAD_SANITIZER
-#define JXL_TSAN_SLOW_TEST(T, C) TEST(T, DISABLED_##C)
-#else
-#define JXL_TSAN_SLOW_TEST(T, C) TEST(T, C)
-#endif  // THREAD_SANITIZER
-
-#if defined(__x86_64__)
-#define JXL_X86_64_TEST(T, C) TEST(T, C)
-#define JXL_X86_64_TEST_P(T, C) TEST_P(T, C)
-#else
-#define JXL_X86_64_TEST(T, C) TEST(T, DISABLED_##C)
-#define JXL_X86_64_TEST_P(T, C) TEST_P(T, C)
-#endif  // defined(__x86_64__)
-
-// googletest before 1.10 didn't define INSTANTIATE_TEST_SUITE_P() but instead
-// used INSTANTIATE_TEST_CASE_P which is now deprecated.
-#ifdef INSTANTIATE_TEST_SUITE_P
-#define JXL_GTEST_INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_SUITE_P
-#else
-#define JXL_GTEST_INSTANTIATE_TEST_SUITE_P INSTANTIATE_TEST_CASE_P
-#endif
-
-// Ensures that we don't make our test bounds too lax, effectively disabling the
-// tests.
-#define EXPECT_SLIGHTLY_BELOW(A, E)       \
-  {                                       \
-    double _actual = (A);                 \
-    double _expected = (E);               \
-    EXPECT_LE(_actual, _expected);        \
-    EXPECT_GE(_actual, 0.75 * _expected); \
-  }
-
-#define EXPECT_ARRAY_NEAR(A, E, T)                                         \
-  {                                                                        \
-    const auto _actual = (A);                                              \
-    const auto _expected = (E);                                            \
-    const auto _tolerance = (T);                                           \
-    size_t _n = _expected.size();                                          \
-    ASSERT_EQ(_actual.size(), _n);                                         \
-    for (size_t _i = 0; _i < _n; ++_i) {                                   \
-      EXPECT_NEAR(_actual[_i], _expected[_i], _tolerance)                  \
-          << "@" << _i << ": " << _actual[_i] << " !~= " << _expected[_i]; \
-    }                                                                      \
-  }
-
-#define JXL_EXPECT_OK(F)       \
-  {                            \
-    std::stringstream _;       \
-    EXPECT_TRUE(F) << _.str(); \
-  }
-
-#define JXL_TEST_ASSERT_OK(F)  \
-  {                            \
-    std::stringstream _;       \
-    ASSERT_TRUE(F) << _.str(); \
-  }
-
-#define QUIT(M) FAIL() << M;
-
-#endif  // LIB_JXL_TESTING_H_
diff --git a/third_party/jpeg-xl/lib/jxl/tf_gbench.cc b/third_party/jpeg-xl/lib/jxl/tf_gbench.cc
deleted file mode 100644
index 6cfd3734bb51a..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/tf_gbench.cc
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "benchmark/benchmark.h"
-#include "lib/jxl/image_ops.h"
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/tf_gbench.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-
-#include "lib/jxl/cms/transfer_functions-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-namespace {
-
-#define RUN_BENCHMARK(F)                                            \
-  constexpr size_t kNum = 1 << 12;                                  \
-  HWY_FULL(float) d;                                                \
-  /* Three parallel runs, as this will run on R, G and B. */        \
-  auto sum1 = Zero(d);                                              \
-  auto sum2 = Zero(d);                                              \
-  auto sum3 = Zero(d);                                              \
-  for (auto _ : state) {                                            \
-    auto x = Set(d, 1e-5);                                          \
-    auto v1 = Set(d, 1e-5);                                         \
-    auto v2 = Set(d, 1.1e-5);                                       \
-    auto v3 = Set(d, 1.2e-5);                                       \
-    for (size_t i = 0; i < kNum; i++) {                             \
-      sum1 += F(d, v1);                                             \
-      sum2 += F(d, v2);                                             \
-      sum3 += F(d, v3);                                             \
-      v1 += x;                                                      \
-      v2 += x;                                                      \
-      v3 += x;                                                      \
-    }                                                               \
-  }                                                                 \
-  /* floats per second */                                           \
-  state.SetItemsProcessed(kNum* state.iterations() * Lanes(d) * 3); \
-  benchmark::DoNotOptimize(sum1 + sum2 + sum3);
-
-#define RUN_BENCHMARK_SCALAR(F, I)                           \
-  constexpr size_t kNum = 1 << 12;                           \
-  /* Three parallel runs, as this will run on R, G and B. */ \
-  float sum1 = 0;                                            \
-  float sum2 = 0;                                            \
-  float sum3 = 0;                                            \
-  for (auto _ : state) {                                     \
-    float x = 1e-5;                                          \
-    float v1 = 1e-5;                                         \
-    float v2 = 1.1e-5;                                       \
-    float v3 = 1.2e-5;                                       \
-    for (size_t i = 0; i < kNum; i++) {                      \
-      sum1 += F(I, v1);                                      \
-      sum2 += F(I, v2);                                      \
-      sum3 += F(I, v3);                                      \
-      v1 += x;                                               \
-      v2 += x;                                               \
-      v3 += x;                                               \
-    }                                                        \
-  }                                                          \
-  /* floats per second */                                    \
-  state.SetItemsProcessed(kNum* state.iterations() * 3);     \
-  benchmark::DoNotOptimize(sum1 + sum2 + sum3);
-
-HWY_NOINLINE void BM_FastSRGB(benchmark::State& state) {
-  RUN_BENCHMARK(FastLinearToSRGB);
-}
-
-HWY_NOINLINE void BM_TFSRGB(benchmark::State& state) {
-  RUN_BENCHMARK(TF_SRGB().EncodedFromDisplay);
-}
-
-HWY_NOINLINE void BM_PQDFE(benchmark::State& state) {
-  TF_PQ tf_pq(10000.0);
-  RUN_BENCHMARK(tf_pq.DisplayFromEncoded);
-}
-
-HWY_NOINLINE void BM_PQEFD(benchmark::State& state) {
-  TF_PQ tf_pq(10000.0);
-  RUN_BENCHMARK(tf_pq.EncodedFromDisplay);
-}
-
-HWY_NOINLINE void BM_PQSlowDFE(benchmark::State& state) {
-  RUN_BENCHMARK_SCALAR(TF_PQ_Base::DisplayFromEncoded, 10000.0);
-}
-
-HWY_NOINLINE void BM_PQSlowEFD(benchmark::State& state) {
-  RUN_BENCHMARK_SCALAR(TF_PQ_Base::EncodedFromDisplay, 10000.0);
-}
-}  // namespace
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-namespace {
-
-HWY_EXPORT(BM_FastSRGB);
-HWY_EXPORT(BM_TFSRGB);
-HWY_EXPORT(BM_PQDFE);
-HWY_EXPORT(BM_PQEFD);
-HWY_EXPORT(BM_PQSlowDFE);
-HWY_EXPORT(BM_PQSlowEFD);
-
-float SRGB_pow(float _, float x) {
-  return x < 0.0031308f ? 12.92f * x : 1.055f * powf(x, 1.0f / 2.4f) - 0.055f;
-}
-
-void BM_FastSRGB(benchmark::State& state) {
-  HWY_DYNAMIC_DISPATCH(BM_FastSRGB)(state);
-}
-void BM_TFSRGB(benchmark::State& state) {
-  HWY_DYNAMIC_DISPATCH(BM_TFSRGB)(state);
-}
-void BM_PQDFE(benchmark::State& state) {
-  HWY_DYNAMIC_DISPATCH(BM_PQDFE)(state);
-}
-void BM_PQEFD(benchmark::State& state) {
-  HWY_DYNAMIC_DISPATCH(BM_PQEFD)(state);
-}
-void BM_PQSlowDFE(benchmark::State& state) {
-  HWY_DYNAMIC_DISPATCH(BM_PQSlowDFE)(state);
-}
-void BM_PQSlowEFD(benchmark::State& state) {
-  HWY_DYNAMIC_DISPATCH(BM_PQSlowEFD)(state);
-}
-
-void BM_SRGB_pow(benchmark::State& state) { RUN_BENCHMARK_SCALAR(SRGB_pow, 0); }
-
-BENCHMARK(BM_FastSRGB);
-BENCHMARK(BM_TFSRGB);
-BENCHMARK(BM_SRGB_pow);
-BENCHMARK(BM_PQDFE);
-BENCHMARK(BM_PQEFD);
-BENCHMARK(BM_PQSlowDFE);
-BENCHMARK(BM_PQSlowEFD);
-
-}  // namespace
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl/toc.cc b/third_party/jpeg-xl/lib/jxl/toc.cc
deleted file mode 100644
index 62b987f67f3ee..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/toc.cc
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/toc.h"
-
-#include <jxl/memory_manager.h>
-#include <stdint.h>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/coeff_order.h"
-#include "lib/jxl/coeff_order_fwd.h"
-#include "lib/jxl/fields.h"
-
-namespace jxl {
-size_t MaxBits(const size_t num_sizes) {
-  const size_t entry_bits = U32Coder::MaxEncodedBits(kTocDist) * num_sizes;
-  // permutation bit (not its tokens!), padding, entries, padding.
-  return 1 + kBitsPerByte + entry_bits + kBitsPerByte;
-}
-
-Status ReadToc(JxlMemoryManager* memory_manager, size_t toc_entries,
-               BitReader* JXL_RESTRICT reader,
-               std::vector<uint32_t>* JXL_RESTRICT sizes,
-               std::vector<coeff_order_t>* JXL_RESTRICT permutation) {
-  if (toc_entries > 65536) {
-    // Prevent out of memory if invalid JXL codestream causes a bogus amount
-    // of toc_entries such as 2720436919446 to be computed.
-    // TODO(lode): verify whether 65536 is a reasonable upper bound
-    return JXL_FAILURE("too many toc entries");
-  }
-
-  sizes->clear();
-  sizes->resize(toc_entries);
-  if (reader->TotalBitsConsumed() >= reader->TotalBytes() * kBitsPerByte) {
-    return JXL_STATUS(StatusCode::kNotEnoughBytes, "Not enough bytes for TOC");
-  }
-  const auto check_bit_budget = [&](size_t num_entries) -> Status {
-    // U32Coder reads 2 bits to recognize variant and kTocDist cheapest variant
-    // is Bits(10), this way at least 12 bits are required per toc-entry.
-    size_t minimal_bit_cost = num_entries * (2 + 10);
-    size_t bit_budget = reader->TotalBytes() * 8;
-    size_t expenses = reader->TotalBitsConsumed();
-    if ((expenses <= bit_budget) &&
-        (minimal_bit_cost <= bit_budget - expenses)) {
-      return true;
-    }
-    return JXL_STATUS(StatusCode::kNotEnoughBytes, "Not enough bytes for TOC");
-  };
-
-  JXL_ENSURE(toc_entries > 0);
-  if (reader->ReadFixedBits<1>() == 1) {
-    JXL_RETURN_IF_ERROR(check_bit_budget(toc_entries));
-    permutation->resize(toc_entries);
-    JXL_RETURN_IF_ERROR(DecodePermutation(
-        memory_manager, /*skip=*/0, toc_entries, permutation->data(), reader));
-  }
-  JXL_RETURN_IF_ERROR(reader->JumpToByteBoundary());
-  JXL_RETURN_IF_ERROR(check_bit_budget(toc_entries));
-  for (size_t i = 0; i < toc_entries; ++i) {
-    (*sizes)[i] = U32Coder::Read(kTocDist, reader);
-  }
-  JXL_RETURN_IF_ERROR(reader->JumpToByteBoundary());
-  JXL_RETURN_IF_ERROR(check_bit_budget(0));
-  return true;
-}
-
-Status ReadGroupOffsets(JxlMemoryManager* memory_manager, size_t toc_entries,
-                        BitReader* JXL_RESTRICT reader,
-                        std::vector<uint64_t>* JXL_RESTRICT offsets,
-                        std::vector<uint32_t>* JXL_RESTRICT sizes,
-                        uint64_t* total_size) {
-  std::vector<coeff_order_t> permutation;
-  JXL_RETURN_IF_ERROR(
-      ReadToc(memory_manager, toc_entries, reader, sizes, &permutation));
-
-  offsets->clear();
-  offsets->resize(toc_entries);
-
-  // Prefix sum starting with 0 and ending with the offset of the last group
-  uint64_t offset = 0;
-  for (size_t i = 0; i < toc_entries; ++i) {
-    if (offset + (*sizes)[i] < offset) {
-      return JXL_FAILURE("group offset overflow");
-    }
-    (*offsets)[i] = offset;
-    offset += (*sizes)[i];
-  }
-  if (total_size) {
-    *total_size = offset;
-  }
-
-  if (!permutation.empty()) {
-    std::vector<uint64_t> permuted_offsets;
-    std::vector<uint32_t> permuted_sizes;
-    permuted_offsets.reserve(toc_entries);
-    permuted_sizes.reserve(toc_entries);
-    for (coeff_order_t index : permutation) {
-      permuted_offsets.push_back((*offsets)[index]);
-      permuted_sizes.push_back((*sizes)[index]);
-    }
-    std::swap(*offsets, permuted_offsets);
-    std::swap(*sizes, permuted_sizes);
-  }
-
-  return true;
-}
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/toc.h b/third_party/jpeg-xl/lib/jxl/toc.h
deleted file mode 100644
index bbc0549e67ab2..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/toc.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef LIB_JXL_TOC_H_
-#define LIB_JXL_TOC_H_
-
-#include <jxl/memory_manager.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#include <vector>
-
-#include "lib/jxl/base/compiler_specific.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/coeff_order_fwd.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/field_encodings.h"
-
-namespace jxl {
-
-// (2+bits) = 2,3,4 bytes so encoders can patch TOC after encoding.
-// 30 is sufficient for 4K channels of uncompressed 16-bit samples.
-constexpr U32Enc kTocDist(Bits(10), BitsOffset(14, 1024), BitsOffset(22, 17408),
-                          BitsOffset(30, 4211712));
-
-size_t MaxBits(size_t num_sizes);
-
-// TODO(veluca): move these to FrameDimensions.
-static JXL_INLINE size_t AcGroupIndex(size_t pass, size_t group,
-                                      size_t num_groups, size_t num_dc_groups) {
-  return 2 + num_dc_groups + pass * num_groups + group;
-}
-
-static JXL_INLINE size_t NumTocEntries(size_t num_groups, size_t num_dc_groups,
-                                       size_t num_passes) {
-  if (num_groups == 1 && num_passes == 1) return 1;
-  return AcGroupIndex(0, 0, num_groups, num_dc_groups) +
-         num_groups * num_passes;
-}
-
-Status ReadToc(JxlMemoryManager* memory_manager, size_t toc_entries,
-               BitReader* JXL_RESTRICT reader,
-               std::vector<uint32_t>* JXL_RESTRICT sizes,
-               std::vector<coeff_order_t>* JXL_RESTRICT permutation);
-
-Status ReadGroupOffsets(JxlMemoryManager* memory_manager, size_t toc_entries,
-                        BitReader* JXL_RESTRICT reader,
-                        std::vector<uint64_t>* JXL_RESTRICT offsets,
-                        std::vector<uint32_t>* JXL_RESTRICT sizes,
-                        uint64_t* total_size);
-
-}  // namespace jxl
-
-#endif  // LIB_JXL_TOC_H_
diff --git a/third_party/jpeg-xl/lib/jxl/toc_test.cc b/third_party/jpeg-xl/lib/jxl/toc_test.cc
deleted file mode 100644
index 0494dc4d6b2d6..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/toc_test.cc
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/jxl/toc.h"
-
-#include <jxl/memory_manager.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <memory>
-#include <vector>
-
-#include "lib/jxl/base/common.h"
-#include "lib/jxl/base/random.h"
-#include "lib/jxl/coeff_order_fwd.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/enc_aux_out.h"
-#include "lib/jxl/enc_bit_writer.h"
-#include "lib/jxl/enc_toc.h"
-#include "lib/jxl/test_memory_manager.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-namespace jxl {
-namespace {
-
-void Roundtrip(size_t num_entries, bool permute, Rng* rng) {
-  JxlMemoryManager* memory_manager = jxl::test::MemoryManager();
-  // Generate a random permutation.
-  std::vector<coeff_order_t> permutation;
-  std::vector<coeff_order_t> inv_permutation(num_entries);
-  for (size_t i = 0; i < num_entries; i++) {
-    inv_permutation[i] = i;
-  }
-  if (permute) {
-    permutation.resize(num_entries);
-    for (size_t i = 0; i < num_entries; i++) {
-      permutation[i] = i;
-    }
-    rng->Shuffle(permutation.data(), permutation.size());
-    for (size_t i = 0; i < num_entries; i++) {
-      inv_permutation[permutation[i]] = i;
-    }
-  }
-
-  // Generate num_entries groups of random (byte-aligned) length
-  std::vector<std::unique_ptr<BitWriter>> group_codes;
-  group_codes.reserve(num_entries);
-  for (size_t i = 0; i < num_entries; ++i) {
-    group_codes.emplace_back(jxl::make_unique<BitWriter>(memory_manager));
-  }
-  for (std::unique_ptr<BitWriter>& writer : group_codes) {
-    const size_t max_bits = (*rng)() & 0xFFF;
-    AuxOut aux_out;
-    ASSERT_TRUE(writer->WithMaxBits(
-        max_bits + kBitsPerByte, LayerType::Header, &aux_out, [&] {
-          size_t i = 0;
-          for (; i + BitWriter::kMaxBitsPerCall < max_bits;
-               i += BitWriter::kMaxBitsPerCall) {
-            writer->Write(BitWriter::kMaxBitsPerCall, 0);
-          }
-          for (; i < max_bits; i += 1) {
-            writer->Write(/*n_bits=*/1, 0);
-          }
-          writer->ZeroPadToByte();
-          return true;
-        }));
-  }
-
-  BitWriter writer{memory_manager};
-  AuxOut aux_out;
-  ASSERT_TRUE(WriteGroupOffsets(group_codes, permutation, &writer, &aux_out));
-
-  BitReader reader(writer.GetSpan());
-  std::vector<uint64_t> group_offsets;
-  std::vector<uint32_t> group_sizes;
-  uint64_t total_size;
-  ASSERT_TRUE(ReadGroupOffsets(memory_manager, num_entries, &reader,
-                               &group_offsets, &group_sizes, &total_size));
-  ASSERT_EQ(num_entries, group_offsets.size());
-  ASSERT_EQ(num_entries, group_sizes.size());
-  EXPECT_TRUE(reader.Close());
-
-  uint64_t prefix_sum = 0;
-  for (size_t i = 0; i < num_entries; ++i) {
-    EXPECT_EQ(prefix_sum, group_offsets[inv_permutation[i]]);
-
-    EXPECT_EQ(0u, group_codes[i]->BitsWritten() % kBitsPerByte);
-    prefix_sum += group_codes[i]->BitsWritten() / kBitsPerByte;
-
-    if (i + 1 < num_entries) {
-      EXPECT_EQ(
-          group_offsets[inv_permutation[i]] + group_sizes[inv_permutation[i]],
-          group_offsets[inv_permutation[i + 1]]);
-    }
-  }
-  EXPECT_EQ(prefix_sum, total_size);
-}
-
-TEST(TocTest, Test) {
-  Rng rng(0);
-  for (size_t num_entries = 1; num_entries < 10; ++num_entries) {
-    for (bool permute : std::vector<bool>{false, true}) {
-      Roundtrip(num_entries, permute, &rng);
-    }
-  }
-}
-
-}  // namespace
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/lib/jxl/transpose-inl.h b/third_party/jpeg-xl/lib/jxl/transpose-inl.h
deleted file mode 100644
index efe7d90569d66..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/transpose-inl.h
+++ /dev/null
@@ -1,203 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Block transpose for DCT/IDCT
-
-#if defined(LIB_JXL_TRANSPOSE_INL_H_) == defined(HWY_TARGET_TOGGLE)
-#ifdef LIB_JXL_TRANSPOSE_INL_H_
-#undef LIB_JXL_TRANSPOSE_INL_H_
-#else
-#define LIB_JXL_TRANSPOSE_INL_H_
-#endif
-
-#include <stddef.h>
-
-#include <hwy/highway.h>
-#include <type_traits>
-
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/dct_block-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-namespace {
-
-#ifndef JXL_INLINE_TRANSPOSE
-// Workaround for issue #42 - (excessive?) inlining causes invalid codegen.
-#if defined(__arm__)
-#define JXL_INLINE_TRANSPOSE HWY_NOINLINE
-#else
-#define JXL_INLINE_TRANSPOSE HWY_INLINE
-#endif
-#endif  // JXL_INLINE_TRANSPOSE
-
-// Simple wrapper that ensures that a function will not be inlined.
-template <typename T, typename... Args>
-JXL_NOINLINE void NoInlineWrapper(const T& f, const Args&... args) {
-  return f(args...);
-}
-
-template <bool enabled>
-struct TransposeSimdTag {};
-
-// TODO(veluca): it's not super useful to have this in the SIMD namespace.
-template <size_t ROWS_or_0, size_t COLS_or_0, class From, class To>
-JXL_INLINE_TRANSPOSE void GenericTransposeBlock(
-    TransposeSimdTag<false> /* tag */, const From& from, const To& to,
-    size_t ROWSp, size_t COLSp) {
-  size_t ROWS = ROWS_or_0 == 0 ? ROWSp : ROWS_or_0;
-  size_t COLS = COLS_or_0 == 0 ? COLSp : COLS_or_0;
-  for (size_t n = 0; n < ROWS; ++n) {
-    for (size_t m = 0; m < COLS; ++m) {
-      to.Write(from.Read(n, m), m, n);
-    }
-  }
-}
-
-// TODO(veluca): AVX3?
-#if HWY_CAP_GE256
-constexpr bool TransposeUseSimd(size_t ROWS, size_t COLS) {
-  return ROWS % 8 == 0 && COLS % 8 == 0;
-}
-
-template <size_t ROWS_or_0, size_t COLS_or_0, class From, class To>
-JXL_INLINE_TRANSPOSE void GenericTransposeBlock(
-    TransposeSimdTag<true> /* tag */, const From& from, const To& to,
-    size_t ROWSp, size_t COLSp) {
-  size_t ROWS = ROWS_or_0 == 0 ? ROWSp : ROWS_or_0;
-  size_t COLS = COLS_or_0 == 0 ? COLSp : COLS_or_0;
-  static_assert(MaxLanes(BlockDesc<8>()) == 8, "Invalid descriptor size");
-  static_assert(ROWS_or_0 % 8 == 0, "Invalid number of rows");
-  static_assert(COLS_or_0 % 8 == 0, "Invalid number of columns");
-  for (size_t n = 0; n < ROWS; n += 8) {
-    for (size_t m = 0; m < COLS; m += 8) {
-      const BlockDesc<8> d;
-      auto i0 = from.LoadPart(d, n + 0, m + 0);
-      auto i1 = from.LoadPart(d, n + 1, m + 0);
-      auto i2 = from.LoadPart(d, n + 2, m + 0);
-      auto i3 = from.LoadPart(d, n + 3, m + 0);
-      auto i4 = from.LoadPart(d, n + 4, m + 0);
-      auto i5 = from.LoadPart(d, n + 5, m + 0);
-      auto i6 = from.LoadPart(d, n + 6, m + 0);
-      auto i7 = from.LoadPart(d, n + 7, m + 0);
-      // Surprisingly, this straightforward implementation (24 cycles on port5)
-      // is faster than load128+insert and LoadDup128+ConcatUpperLower+blend.
-      const auto q0 = InterleaveLower(d, i0, i2);
-      const auto q1 = InterleaveLower(d, i1, i3);
-      const auto q2 = InterleaveUpper(d, i0, i2);
-      const auto q3 = InterleaveUpper(d, i1, i3);
-      const auto q4 = InterleaveLower(d, i4, i6);
-      const auto q5 = InterleaveLower(d, i5, i7);
-      const auto q6 = InterleaveUpper(d, i4, i6);
-      const auto q7 = InterleaveUpper(d, i5, i7);
-
-      const auto r0 = InterleaveLower(d, q0, q1);
-      const auto r1 = InterleaveUpper(d, q0, q1);
-      const auto r2 = InterleaveLower(d, q2, q3);
-      const auto r3 = InterleaveUpper(d, q2, q3);
-      const auto r4 = InterleaveLower(d, q4, q5);
-      const auto r5 = InterleaveUpper(d, q4, q5);
-      const auto r6 = InterleaveLower(d, q6, q7);
-      const auto r7 = InterleaveUpper(d, q6, q7);
-
-      i0 = ConcatLowerLower(d, r4, r0);
-      i1 = ConcatLowerLower(d, r5, r1);
-      i2 = ConcatLowerLower(d, r6, r2);
-      i3 = ConcatLowerLower(d, r7, r3);
-      i4 = ConcatUpperUpper(d, r4, r0);
-      i5 = ConcatUpperUpper(d, r5, r1);
-      i6 = ConcatUpperUpper(d, r6, r2);
-      i7 = ConcatUpperUpper(d, r7, r3);
-      to.StorePart(d, i0, m + 0, n + 0);
-      to.StorePart(d, i1, m + 1, n + 0);
-      to.StorePart(d, i2, m + 2, n + 0);
-      to.StorePart(d, i3, m + 3, n + 0);
-      to.StorePart(d, i4, m + 4, n + 0);
-      to.StorePart(d, i5, m + 5, n + 0);
-      to.StorePart(d, i6, m + 6, n + 0);
-      to.StorePart(d, i7, m + 7, n + 0);
-    }
-  }
-}
-#elif HWY_TARGET != HWY_SCALAR
-constexpr bool TransposeUseSimd(size_t ROWS, size_t COLS) {
-  return ROWS % 4 == 0 && COLS % 4 == 0;
-}
-
-template <size_t ROWS_or_0, size_t COLS_or_0, class From, class To>
-JXL_INLINE_TRANSPOSE void GenericTransposeBlock(
-    TransposeSimdTag<true> /* tag */, const From& from, const To& to,
-    size_t ROWSp, size_t COLSp) {
-  size_t ROWS = ROWS_or_0 == 0 ? ROWSp : ROWS_or_0;
-  size_t COLS = COLS_or_0 == 0 ? COLSp : COLS_or_0;
-  static_assert(MaxLanes(BlockDesc<4>()) == 4, "Invalid descriptor size");
-  static_assert(ROWS_or_0 % 4 == 0, "Invalid number of rows");
-  static_assert(COLS_or_0 % 4 == 0, "Invalid number of columns");
-  for (size_t n = 0; n < ROWS; n += 4) {
-    for (size_t m = 0; m < COLS; m += 4) {
-      const BlockDesc<4> d;
-      const auto p0 = from.LoadPart(d, n + 0, m + 0);
-      const auto p1 = from.LoadPart(d, n + 1, m + 0);
-      const auto p2 = from.LoadPart(d, n + 2, m + 0);
-      const auto p3 = from.LoadPart(d, n + 3, m + 0);
-
-      const auto q0 = InterleaveLower(d, p0, p2);
-      const auto q1 = InterleaveLower(d, p1, p3);
-      const auto q2 = InterleaveUpper(d, p0, p2);
-      const auto q3 = InterleaveUpper(d, p1, p3);
-
-      const auto r0 = InterleaveLower(d, q0, q1);
-      const auto r1 = InterleaveUpper(d, q0, q1);
-      const auto r2 = InterleaveLower(d, q2, q3);
-      const auto r3 = InterleaveUpper(d, q2, q3);
-
-      to.StorePart(d, r0, m + 0, n + 0);
-      to.StorePart(d, r1, m + 1, n + 0);
-      to.StorePart(d, r2, m + 2, n + 0);
-      to.StorePart(d, r3, m + 3, n + 0);
-    }
-  }
-}
-#else
-constexpr bool TransposeUseSimd(size_t ROWS, size_t COLS) { return false; }
-#endif
-
-template <size_t N, size_t M, typename = void>
-struct Transpose {
-  template <typename From, typename To>
-  static void Run(const From& from, const To& to) {
-    // This does not guarantee anything, just saves from the most stupid
-    // mistakes.
-    JXL_DASSERT(from.Address(0, 0) != to.Address(0, 0));
-    TransposeSimdTag<TransposeUseSimd(N, M)> tag;
-    GenericTransposeBlock<N, M>(tag, from, to, N, M);
-  }
-};
-
-// Avoid inlining and unrolling transposes for large blocks.
-template <size_t N, size_t M>
-struct Transpose<
-    N, M, typename std::enable_if<(N >= 8 && M >= 8 && N * M >= 512)>::type> {
-  template <typename From, typename To>
-  static void Run(const From& from, const To& to) {
-    // This does not guarantee anything, just saves from the most stupid
-    // mistakes.
-    JXL_DASSERT(from.Address(0, 0) != to.Address(0, 0));
-    TransposeSimdTag<TransposeUseSimd(N, M)> tag;
-    constexpr void (*transpose)(TransposeSimdTag<TransposeUseSimd(N, M)>,
-                                const From&, const To&, size_t, size_t) =
-        GenericTransposeBlock<0, 0, From, To>;
-    NoInlineWrapper(transpose, tag, from, to, N, M);
-  }
-};
-
-}  // namespace
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#endif  // LIB_JXL_TRANSPOSE_INL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/version.h.in b/third_party/jpeg-xl/lib/jxl/version.h.in
deleted file mode 100644
index b5a462e52e187..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/version.h.in
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright (c) the JPEG XL Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
- */
-
-/** @addtogroup libjxl_common
- * @{
- * @file version.h
- * @brief libjxl version information
- */
-
-#ifndef JXL_VERSION_H_
-#define JXL_VERSION_H_
-
-#define JPEGXL_MAJOR_VERSION @JPEGXL_MAJOR_VERSION@ ///< JPEG XL Major version
-#define JPEGXL_MINOR_VERSION @JPEGXL_MINOR_VERSION@ ///< JPEG XL Minor version
-#define JPEGXL_PATCH_VERSION @JPEGXL_PATCH_VERSION@ ///< JPEG XL Patch version
-
-/** Can be used to conditionally compile code for a specific JXL version
- * @param[maj] major version
- * @param[min] minor version
- *
- * @code
- * #if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,8,0)
- * // use old/deprecated api
- * #else
- * // use current api
- * #endif
- * @endcode
- */
-#define JPEGXL_COMPUTE_NUMERIC_VERSION(major,minor,patch) (((major)<<24) | ((minor)<<16) | ((patch)<<8) | 0)
-
-/* Numeric representation of the version */
-#define JPEGXL_NUMERIC_VERSION JPEGXL_COMPUTE_NUMERIC_VERSION(JPEGXL_MAJOR_VERSION, JPEGXL_MINOR_VERSION, JPEGXL_PATCH_VERSION)
-
-#endif /* JXL_VERSION_H_ */
-
-/** @}*/
diff --git a/third_party/jpeg-xl/lib/jxl/xorshift128plus-inl.h b/third_party/jpeg-xl/lib/jxl/xorshift128plus-inl.h
deleted file mode 100644
index f7967655df1de..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/xorshift128plus-inl.h
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Fast but weak random generator.
-
-#if defined(LIB_JXL_XORSHIFT128PLUS_INL_H_) == defined(HWY_TARGET_TOGGLE)
-#ifdef LIB_JXL_XORSHIFT128PLUS_INL_H_
-#undef LIB_JXL_XORSHIFT128PLUS_INL_H_
-#else
-#define LIB_JXL_XORSHIFT128PLUS_INL_H_
-#endif
-
-#include <cstddef>
-#include <cstdint>
-#include <hwy/highway.h>
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-namespace {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Add;
-using hwy::HWY_NAMESPACE::ShiftLeft;
-using hwy::HWY_NAMESPACE::ShiftRight;
-using hwy::HWY_NAMESPACE::Xor;
-
-// Adapted from https://github.com/vpxyz/xorshift/blob/master/xorshift128plus/
-// (MIT-license)
-class Xorshift128Plus {
- public:
-  // 8 independent generators (= single iteration for AVX-512)
-  enum { N = 8 };
-
-  explicit HWY_MAYBE_UNUSED Xorshift128Plus(const uint64_t seed) {
-    // Init state using SplitMix64 generator
-    s0_[0] = SplitMix64(seed + 0x9E3779B97F4A7C15ull);
-    s1_[0] = SplitMix64(s0_[0]);
-    for (size_t i = 1; i < N; ++i) {
-      s0_[i] = SplitMix64(s1_[i - 1]);
-      s1_[i] = SplitMix64(s0_[i]);
-    }
-  }
-
-  HWY_MAYBE_UNUSED Xorshift128Plus(const uint32_t seed1, const uint32_t seed2,
-                                   const uint32_t seed3, const uint32_t seed4) {
-    // Init state using SplitMix64 generator
-    s0_[0] = SplitMix64(((static_cast<uint64_t>(seed1) << 32) + seed2) +
-                        0x9E3779B97F4A7C15ull);
-    s1_[0] = SplitMix64(((static_cast<uint64_t>(seed3) << 32) + seed4) +
-                        0x9E3779B97F4A7C15ull);
-    for (size_t i = 1; i < N; ++i) {
-      s0_[i] = SplitMix64(s0_[i - 1]);
-      s1_[i] = SplitMix64(s1_[i - 1]);
-    }
-  }
-
-  HWY_INLINE HWY_MAYBE_UNUSED void Fill(uint64_t* HWY_RESTRICT random_bits) {
-#if HWY_CAP_INTEGER64
-    const HWY_FULL(uint64_t) d;
-    for (size_t i = 0; i < N; i += Lanes(d)) {
-      auto s1 = Load(d, s0_ + i);
-      const auto s0 = Load(d, s1_ + i);
-      const auto bits = Add(s1, s0);  // b, c
-      Store(s0, d, s0_ + i);
-      s1 = Xor(s1, ShiftLeft<23>(s1));
-      Store(bits, d, random_bits + i);
-      s1 = Xor(s1, Xor(s0, Xor(ShiftRight<18>(s1), ShiftRight<5>(s0))));
-      Store(s1, d, s1_ + i);
-    }
-#else
-    for (size_t i = 0; i < N; ++i) {
-      auto s1 = s0_[i];
-      const auto s0 = s1_[i];
-      const auto bits = s1 + s0;  // b, c
-      s0_[i] = s0;
-      s1 ^= s1 << 23;
-      random_bits[i] = bits;
-      s1 ^= s0 ^ (s1 >> 18) ^ (s0 >> 5);
-      s1_[i] = s1;
-    }
-#endif
-  }
-
- private:
-  static uint64_t SplitMix64(uint64_t z) {
-    z = (z ^ (z >> 30)) * 0xBF58476D1CE4E5B9ull;
-    z = (z ^ (z >> 27)) * 0x94D049BB133111EBull;
-    return z ^ (z >> 31);
-  }
-
-  HWY_ALIGN uint64_t s0_[N];
-  HWY_ALIGN uint64_t s1_[N];
-};
-
-}  // namespace
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#endif  // LIB_JXL_XORSHIFT128PLUS_INL_H_
diff --git a/third_party/jpeg-xl/lib/jxl/xorshift128plus_test.cc b/third_party/jpeg-xl/lib/jxl/xorshift128plus_test.cc
deleted file mode 100644
index 4facf35f1bc46..0000000000000
--- a/third_party/jpeg-xl/lib/jxl/xorshift128plus_test.cc
+++ /dev/null
@@ -1,378 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <stdint.h>
-
-#include <algorithm>
-#include <vector>
-
-#undef HWY_TARGET_INCLUDE
-#define HWY_TARGET_INCLUDE "lib/jxl/xorshift128plus_test.cc"
-#include <hwy/foreach_target.h>
-#include <hwy/highway.h>
-#include <hwy/tests/hwy_gtest.h>
-
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-#include "lib/jxl/xorshift128plus-inl.h"
-
-HWY_BEFORE_NAMESPACE();
-namespace jxl {
-namespace HWY_NAMESPACE {
-
-// These templates are not found via ADL.
-using hwy::HWY_NAMESPACE::Or;
-using hwy::HWY_NAMESPACE::ShiftRight;
-using hwy::HWY_NAMESPACE::Sub;
-
-// Define to nonzero in order to print the (new) golden outputs.
-#define PRINT_RESULTS 0
-
-const size_t kVectors = 64;
-
-#if PRINT_RESULTS
-
-template <int kNumLanes>
-void Print(const uint64_t (&result)[kNumLanes]) {
-  printf("{ ");
-  for (int i = 0; i < kNumLanes; ++i) {
-    if (i != 0) {
-      printf(", ");
-    }
-    printf("0x%016llXull", result[i]);
-  }
-  printf("},\n");
-}
-
-#else  // PRINT_RESULTS
-
-const uint64_t kExpected[kVectors][Xorshift128Plus::N] = {
-    {0x6E901576D477CBB1ull, 0xE9E53789195DA2A2ull, 0xB681F6DDA5E0AE99ull,
-     0x8EFD18CE21FD6896ull, 0xA898A80DF75CF532ull, 0x50CEB2C9E2DE7E32ull,
-     0x3CA7C2FEB25C0DD0ull, 0xA4D0866B80B4D836ull},
-    {0x8CD6A1E6233D3A26ull, 0x3D4603ADE98B112Dull, 0xDC427AF674019E36ull,
-     0xE28B4D230705AC53ull, 0x7297E9BBA88783DDull, 0x34D3D23CFCD9B41Aull,
-     0x5A223615ADBE96B8ull, 0xE5EB529027CFBD01ull},
-    {0xC1894CF00DFAC6A2ull, 0x18EDF8AE9085E404ull, 0x8E936625296B4CCDull,
-     0x31971EF3A14A899Bull, 0xBE87535FCE0BF26Aull, 0x576F7A752BC6649Full,
-     0xA44CBADCE0C6B937ull, 0x3DBA819BB17A353Aull},
-    {0x27CE38DFCC1C5EB6ull, 0x920BEB5606340256ull, 0x3986CBC40C9AFC2Cull,
-     0xE22BCB3EEB1E191Eull, 0x6E1FCDD3602A8FBAull, 0x052CB044E5415A29ull,
-     0x46266646EFB9ECD7ull, 0x8F44914618D29335ull},
-    {0xDD30AEDF72A362C5ull, 0xBC1D824E16BB98F4ull, 0x9EA6009C2AA3D2F1ull,
-     0xF65C0FBBE17AF081ull, 0x22424D06A8738991ull, 0x8A62763F2B7611D2ull,
-     0x2F3E89F722637939ull, 0x84D338BEF50AFD50ull},
-    {0x00F46494898E2B0Bull, 0x81239DC4FB8E8003ull, 0x414AD93EC5773FE7ull,
-     0x791473C450E4110Full, 0x87F127BF68C959ACull, 0x6429282D695EF67Bull,
-     0x661082E11546CBA8ull, 0x5815D53FA5436BFDull},
-    {0xB3DEADAB9BE6E0F9ull, 0xAA1B7B8F7CED0202ull, 0x4C5ED437699D279Eull,
-     0xA4471727F1CB39D3ull, 0xE439DA193F802F70ull, 0xF89401BB04FA6493ull,
-     0x3B08045A4FE898BAull, 0x32137BFE98227950ull},
-    {0xFBAE4A092897FEF3ull, 0x0639F6CE56E71C8Eull, 0xF0AD6465C07F0C1Eull,
-     0xFF8E28563361DCE5ull, 0xC2013DB7F86BC6B9ull, 0x8EFCC0503330102Full,
-     0x3F6B767EA5C4DA40ull, 0xB9864B950B2232E1ull},
-    {0x76EB58DE8E5EC22Aull, 0x9BBBF49A18B32F4Full, 0xC8405F02B2B2FAB9ull,
-     0xC3E122A5F146BC34ull, 0xC90BB046660F5765ull, 0xB933981310DBECCFull,
-     0x5A2A7BFC9126FD1Cull, 0x8BB388C94DF87901ull},
-    {0x753EB89AD63EF3C3ull, 0xF24AAF40C89D65ADull, 0x23F68931C1A6AA6Dull,
-     0xF47E79BF702C6DD0ull, 0xA3AD113244EE7EAEull, 0xD42CBEA28F793DC3ull,
-     0xD896FCF1820F497Cull, 0x042B86D2818948C1ull},
-    {0x8F2A4FC5A4265763ull, 0xEC499E6F95EAA10Cull, 0xE3786D4ECCD0DEB5ull,
-     0xC725C53D3AC4CC43ull, 0x065A4ACBBF83610Eull, 0x35C61C9FEF167129ull,
-     0x7B720AEAA7D70048ull, 0x14206B841377D039ull},
-    {0xAD27D78BF96055F6ull, 0x5F43B20FF47ADCD4ull, 0xE184C2401E2BF71Eull,
-     0x30B263D78990045Dull, 0xC22F00EBFF9BA201ull, 0xAE7F86522B53A562ull,
-     0x2853312BC039F0A4ull, 0x868D619E6549C3C8ull},
-    {0xFD5493D8AE9A8371ull, 0x773D5E224DF61B3Bull, 0x5377C54FBB1A8280ull,
-     0xCAD4DE3B8265CAFAull, 0xCDF3F19C91EBD5F6ull, 0xC8EA0F182D73BD78ull,
-     0x220502D593433FF1ull, 0xB81205E612DC31B1ull},
-    {0x8F32A39EAEDA4C70ull, 0x1D4B0914AA4DAC7Full, 0x56EF1570F3A8B405ull,
-     0x29812CB17404A592ull, 0x97A2AAF69CAE90F2ull, 0x12BF5E02778BBFE5ull,
-     0x9D4B55AD42A05FD2ull, 0x06C2BAB5E6086620ull},
-    {0x8DB4B9648302B253ull, 0xD756AD9E3AEA12C7ull, 0x68709B7F11D4B188ull,
-     0x7CC299DDCD707A4Bull, 0x97B860C370A7661Dull, 0xCECD314FC20E64F5ull,
-     0x55F412CDFB4C7EC3ull, 0x55EE97591193B525ull},
-    {0xCF70F3ACA96E6254ull, 0x022FEDECA2E09F46ull, 0x686823DB60AE1ECFull,
-     0xFD36190D3739830Eull, 0x74E1C09027F68120ull, 0xB5883A835C093842ull,
-     0x93E1EFB927E9E4E3ull, 0xB2721E249D7E5EBEull},
-    {0x69B6E21C44188CB8ull, 0x5D6CFB853655A7AAull, 0x3E001A0B425A66DCull,
-     0x8C57451103A5138Full, 0x7BF8B4BE18EAB402ull, 0x494102EB8761A365ull,
-     0xB33796A9F6A81F0Eull, 0x10005AB3BCCFD960ull},
-    {0xB2CF25740AE965DCull, 0x6F7C1DF7EF53D670ull, 0x648DD6087AC2251Eull,
-     0x040955D9851D487Dull, 0xBD550FC7E21A7F66ull, 0x57408F484DEB3AB5ull,
-     0x481E24C150B506C1ull, 0x72C0C3EAF91A40D6ull},
-    {0x1997A481858A5D39ull, 0x539718F4BEF50DC1ull, 0x2EC4DC4787E7E368ull,
-     0xFF1CE78879419845ull, 0xE219A93DD6F6DD30ull, 0x85328618D02FEC1Aull,
-     0xC86E02D969181B20ull, 0xEBEC8CD8BBA34E6Eull},
-    {0x28B55088A16CE947ull, 0xDD25AC11E6350195ull, 0xBD1F176694257B1Cull,
-     0x09459CCF9FCC9402ull, 0xF8047341E386C4E4ull, 0x7E8E9A9AD984C6C0ull,
-     0xA4661E95062AA092ull, 0x70A9947005ED1152ull},
-    {0x4C01CF75DBE98CCDull, 0x0BA076CDFC7373B9ull, 0x6C5E7A004B57FB59ull,
-     0x336B82297FD3BC56ull, 0x7990C0BE74E8D60Full, 0xF0275CC00EC5C8C8ull,
-     0x6CF29E682DFAD2E9ull, 0xFA4361524BD95D72ull},
-    {0x631D2A19FF62F018ull, 0x41C43863B985B3FAull, 0xE052B2267038EFD9ull,
-     0xE2A535FAC575F430ull, 0xE004EEA90B1FF5B8ull, 0x42DFE2CA692A1F26ull,
-     0x90FB0BFC9A189ECCull, 0x4484102BD3536BD0ull},
-    {0xD027134E9ACCA5A5ull, 0xBBAB4F966D476A9Bull, 0x713794A96E03D693ull,
-     0x9F6335E6B94CD44Aull, 0xC5090C80E7471617ull, 0x6D9C1B0C87B58E33ull,
-     0x1969CE82E31185A5ull, 0x2099B97E87754EBEull},
-    {0x60EBAF4ED934350Full, 0xC26FBF0BA5E6ECFFull, 0x9E54150F0312EC57ull,
-     0x0973B48364ED0041ull, 0x800A523241426CFCull, 0x03AB5EC055F75989ull,
-     0x8CF315935DEEB40Aull, 0x83D3FC0190BD1409ull},
-    {0x26D35394CF720A51ull, 0xCE9EAA15243CBAFEull, 0xE2B45FBAF21B29E0ull,
-     0xDB92E98EDE73F9E0ull, 0x79B16F5101C26387ull, 0x1AC15959DE88C86Full,
-     0x387633AEC6D6A580ull, 0xA6FC05807BFC5EB8ull},
-    {0x2D26C8E47C6BADA9ull, 0x820E6EC832D52D73ull, 0xB8432C3E0ED0EE5Bull,
-     0x0F84B3C4063AAA87ull, 0xF393E4366854F651ull, 0x749E1B4D2366A567ull,
-     0x805EACA43480D004ull, 0x244EBF3AA54400A5ull},
-    {0xBFDC3763AA79F75Aull, 0x9E3A74CC751F41DBull, 0xF401302A149DBC55ull,
-     0x6B25F7973D7BF7BCull, 0x13371D34FDBC3DAEull, 0xC5E1998C8F484DCDull,
-     0x7031B8AE5C364464ull, 0x3847F0C4F3DA2C25ull},
-    {0x24C6387D2C0F1225ull, 0x77CCE960255C67A4ull, 0x21A0947E497B10EBull,
-     0xBB5DB73A825A9D7Eull, 0x26294A41999E553Dull, 0x3953E0089F87D925ull,
-     0x3DAE6E5D4E5EAAFEull, 0x74B545460341A7AAull},
-    {0x710E5EB08A7DB820ull, 0x7E43C4E77CAEA025ull, 0xD4C91529C8B060C1ull,
-     0x09AE26D8A7B0CA29ull, 0xAB9F356BB360A772ull, 0xB68834A25F19F6E9ull,
-     0x79B8D9894C5734E2ull, 0xC6847E7C8FFD265Full},
-    {0x10C4BCB06A5111E6ull, 0x57CB50955B6A2516ull, 0xEF53C87798B6995Full,
-     0xAB38E15BBD8D0197ull, 0xA51C6106EFF73C93ull, 0x83D7F0E2270A7134ull,
-     0x0923FD330397FCE5ull, 0xF9DE54EDFE58FB45ull},
-    {0x07D44833ACCD1A94ull, 0xAAD3C9E945E2F9F3ull, 0xABF4C879B876AA37ull,
-     0xF29C69A21B301619ull, 0x2DDCE959111C788Bull, 0x7CEDB48F8AC1729Bull,
-     0x93F3BA9A02B659BEull, 0xF20A87FF17933CBEull},
-    {0x8E96EBE93180CFE6ull, 0x94CAA12873937079ull, 0x05F613D9380D4189ull,
-     0xBCAB40C1DC79F38Aull, 0x0AD8907B7C61D19Eull, 0x88534E189D103910ull,
-     0x2DB2FAABA160AB8Full, 0xA070E7506B06F15Cull},
-    {0x6FB1FCDAFFEF87A9ull, 0xE735CF25337A090Dull, 0x172C6EDCEFEF1825ull,
-     0x76957EA49EF0542Dull, 0x819BF4CD250F7C49ull, 0xD6FF23E4AD00C4D4ull,
-     0xE79673C1EC358FF0ull, 0xAC9C048144337938ull},
-    {0x4C5387FF258B3AF4ull, 0xEDB68FAEC2CB1AA3ull, 0x02A624E67B4E1DA4ull,
-     0x5C44797A38E08AF2ull, 0x36546A70E9411B4Bull, 0x47C17B24D2FD9675ull,
-     0x101957AAA020CA26ull, 0x47A1619D4779F122ull},
-    {0xF84B8BCDC92D9A3Cull, 0x951D7D2C74B3066Bull, 0x7AC287C06EDDD9B2ull,
-     0x4C38FC476608D38Full, 0x224D793B19CB4BCDull, 0x835A255899BF1A41ull,
-     0x4AD250E9F62DB4ABull, 0xD9B44F4B58781096ull},
-    {0xABBAF99A8EB5C6B8ull, 0xFB568E900D3A9F56ull, 0x11EDF63D23C5DF11ull,
-     0xA9C3011D3FA7C5A8ull, 0xAEDD3CF11AFFF725ull, 0xABCA472B5F1EDD6Bull,
-     0x0600B6BB5D879804ull, 0xDB4DE007F22191A0ull},
-    {0xD76CC9EFF0CE9392ull, 0xF5E0A772B59BA49Aull, 0x7D1AE1ED0C1261B5ull,
-     0x79224A33B5EA4F4Aull, 0x6DD825D80C40EA60ull, 0x47FC8E747E51C953ull,
-     0x695C05F72888BF98ull, 0x1A012428440B9015ull},
-    {0xD754DD61F9B772BFull, 0xC4A2FCF4C0F9D4EBull, 0x461167CDF67A24A2ull,
-     0x434748490EBCB9D4ull, 0x274DD9CDCA5781DEull, 0x36BAC63BA9A85209ull,
-     0x30324DAFDA36B70Full, 0x337570DB4FE6DAB3ull},
-    {0xF46CBDD57C551546ull, 0x8E02507E676DA3E3ull, 0xD826245A8C15406Dull,
-     0xDFB38A5B71113B72ull, 0x5EA38454C95B16B5ull, 0x28C054FB87ABF3E1ull,
-     0xAA2724C0BA1A8096ull, 0xECA83EC980304F2Full},
-    {0x6AA76EC294EB3303ull, 0x42D4CDB2A8032E3Bull, 0x7999EDF75DCD8735ull,
-     0xB422BFFE696CCDCCull, 0x8F721461FD7CCDFEull, 0x148E1A5814FDE253ull,
-     0x4DC941F4375EF8FFull, 0x27B2A9E0EB5B49CFull},
-    {0xCEA592EF9343EBE1ull, 0xF7D38B5FA7698903ull, 0x6CCBF352203FEAB6ull,
-     0x830F3095FCCDA9C5ull, 0xDBEEF4B81B81C8F4ull, 0x6D7EB9BCEECA5CF9ull,
-     0xC58ABB0FBE436C69ull, 0xE4B97E6DB2041A4Bull},
-    {0x7E40FC772978AF14ull, 0xCDDA4BBAE28354A1ull, 0xE4F993B832C32613ull,
-     0xD3608093C68A4B35ull, 0x9A3B60E01BEE3699ull, 0x03BEF248F3288713ull,
-     0x70B9294318F3E9B4ull, 0x8D2ABB913B8610DEull},
-    {0x37F209128E7D8B2Cull, 0x81D2AB375BD874BCull, 0xA716A1B7373F7408ull,
-     0x0CEE97BEC4706540ull, 0xA40C5FD9CDBC1512ull, 0x73CAF6C8918409E7ull,
-     0x45E11BCEDF0BBAA1ull, 0x612C612BFF6E6605ull},
-    {0xF8ECB14A12D0F649ull, 0xDA683CD7C01BA1ACull, 0xA2203F7510E124C1ull,
-     0x7F83E52E162F3C78ull, 0x77D2BB73456ACADBull, 0x37FC34FC840BBA6Full,
-     0x3076BC7D4C6EBC1Full, 0x4F514123632B5FA9ull},
-    {0x44D789DED935E884ull, 0xF8291591E09FEC9Full, 0xD9CED2CF32A2E4B7ull,
-     0x95F70E1EB604904Aull, 0xDE438FE43C14F6ABull, 0x4C8D23E4FAFCF8D8ull,
-     0xC716910A3067EB86ull, 0x3D6B7915315095D3ull},
-    {0x3170FDBADAB92095ull, 0x8F1963933FC5650Bull, 0x72F94F00ABECFEABull,
-     0x6E3AE826C6AAB4CEull, 0xA677A2BF31068258ull, 0x9660CDC4F363AF10ull,
-     0xD81A15A152379EF1ull, 0x5D7D285E1080A3F9ull},
-    {0xDAD5DDFF9A2249B3ull, 0x6F9721D926103FAEull, 0x1418CBB83FFA349Aull,
-     0xE71A30AD48C012B2ull, 0xBE76376C63751132ull, 0x3496467ACA713AE6ull,
-     0x8D7EC01369F991A3ull, 0xD8C73A88B96B154Eull},
-    {0x8B5D9C74AEB4833Aull, 0xF914FB3F867B912Full, 0xB894EA034936B1DCull,
-     0x8A16D21BE51C4F5Bull, 0x31FF048ED582D98Eull, 0xB95AB2F4DC65B820ull,
-     0x04082B9170561AF7ull, 0xA215610A5DC836FAull},
-    {0xB2ADE592C092FAACull, 0x7A1E683BCBF13294ull, 0xC7A4DBF86858C096ull,
-     0x3A49940F97BFF316ull, 0xCAE5C06B82C46703ull, 0xC7F413A0F951E2BDull,
-     0x6665E7BB10EB5916ull, 0x86F84A5A94EDE319ull},
-    {0x4EA199D8FAA79CA3ull, 0xDFA26E5BF1981704ull, 0x0F5E081D37FA4E01ull,
-     0x9CB632F89CD675CDull, 0x4A09DB89D48C0304ull, 0x88142742EA3C7672ull,
-     0xAC4F149E6D2E9BDBull, 0x6D9E1C23F8B1C6C6ull},
-    {0xD58BE47B92DEC0E9ull, 0x8E57573645E34328ull, 0x4CC094CCB5FB5126ull,
-     0x5F1D66AF6FB40E3Cull, 0x2BA15509132D3B00ull, 0x0D6545646120E567ull,
-     0x3CF680C45C223666ull, 0x96B28E32930179DAull},
-    {0x5900C45853AC7990ull, 0x61881E3E8B7FF169ull, 0x4DE5F835DF2230FFull,
-     0x4427A9E7932F73FFull, 0x9B641BAD379A8C8Dull, 0xDF271E5BF98F4E5Cull,
-     0xDFDA16DB830FF5EEull, 0x371C7E7CFB89C0E9ull},
-    {0x4410A8576247A250ull, 0x6AD2DA12B45AC0D9ull, 0x18DFC72AAC85EECCull,
-     0x06FC8BB2A0EF25C8ull, 0xEB287619C85E6118ull, 0x19553ECA67F25A2Cull,
-     0x3B9557F1DCEC5BAAull, 0x7BAD9E8B710D1079ull},
-    {0x34F365D66BD22B28ull, 0xE6E124B9F10F835Dull, 0x0573C38ABF2B24DCull,
-     0xD32E6AF10A0125AEull, 0x383590ACEA979519ull, 0x8376ED7A39E28205ull,
-     0xF0B7F184DCBDA435ull, 0x062A203390E31794ull},
-    {0xA2AFFD7E41918760ull, 0x7F90FC1BD0819C86ull, 0x5033C08E5A969533ull,
-     0x2707AF5C6D039590ull, 0x57BBD5980F17DF9Cull, 0xD3FE6E61D763268Aull,
-     0x9E0A0AE40F335A3Bull, 0x43CF4EB0A99613C5ull},
-    {0xD4D2A397CE1A7C2Eull, 0x3DF7CE7CC3212DADull, 0x0880F0D5D356C75Aull,
-     0xA8AFC44DD03B1346ull, 0x79263B46C13A29E0ull, 0x11071B3C0ED58E7Aull,
-     0xED46DC9F538406BFull, 0x2C94974F2B94843Dull},
-    {0xE246E13C39AB5D5Eull, 0xAC1018489D955B20ull, 0x8601B558771852B8ull,
-     0x110BD4C06DB40173ull, 0x738FC8A18CCA0EBBull, 0x6673E09BE0EA76E5ull,
-     0x024BC7A0C7527877ull, 0x45E6B4652E2EC34Eull},
-    {0xD1ED26A1A375CDC8ull, 0xAABC4E896A617CB8ull, 0x0A9C9E8E57D753C6ull,
-     0xA3774A75FEB4C30Eull, 0x30B816C01C93E49Eull, 0xF405BABC06D2408Cull,
-     0xCC0CE6B4CE788ABCull, 0x75E7922D0447956Cull},
-    {0xD07C1676A698BC95ull, 0x5F9AEA4840E2D860ull, 0xD5FC10D58BDF6F02ull,
-     0xF190A2AD4BC2EEA7ull, 0x0C24D11F51726931ull, 0xDB646899A16B6512ull,
-     0x7BC10670047B1DD8ull, 0x2413A5ABCD45F092ull},
-    {0x4E66892190CFD923ull, 0xF10162440365EC8Eull, 0x158ACA5A6A2280AEull,
-     0x0D60ED11C0224166ull, 0x7CD2E9A71B9D7488ull, 0x450D7289706AB2A3ull,
-     0x88FAE34EC9A0D7DCull, 0x96FF9103575A97DAull},
-    {0x77990FAC6046C446ull, 0xB174B5FB30C76676ull, 0xE352CE3EB56CF82Aull,
-     0xC6039B6873A9A082ull, 0xE3F80F3AE333148Aull, 0xB853BA24BA3539B9ull,
-     0xE8863E52ECCB0C74ull, 0x309B4CC1092CC245ull},
-    {0xBC2B70BEE8388D9Full, 0xE48D92AE22216DCEull, 0xF15F3BF3E2C15D8Full,
-     0x1DD964D4812D8B24ull, 0xD56AF02FB4665E4Cull, 0x98002200595BD9A3ull,
-     0x049246D50BB8FA12ull, 0x1B542DF485B579B9ull},
-    {0x2347409ADFA8E497ull, 0x36015C2211D62498ull, 0xE9F141F32EB82690ull,
-     0x1F839912D0449FB9ull, 0x4E4DCFFF2D02D97Cull, 0xF8A03AB4C0F625C9ull,
-     0x0605F575795DAC5Cull, 0x4746C9BEA0DDA6B1ull},
-    {0xCA5BB519ECE7481Bull, 0xFD496155E55CA945ull, 0xF753B9DBB1515F81ull,
-     0x50549E8BAC0F70E7ull, 0x8614FB0271E21C60ull, 0x60C72947EB0F0070ull,
-     0xA6511C10AEE742B6ull, 0x48FB48F2CACCB43Eull}};
-
-#endif  // PRINT_RESULTS
-
-// Ensures Xorshift128+ returns consistent and unchanging values.
-void TestGolden() {
-  HWY_ALIGN Xorshift128Plus rng(12345);
-  for (uint64_t vector = 0; vector < kVectors; ++vector) {
-    HWY_ALIGN uint64_t lanes[Xorshift128Plus::N];
-    rng.Fill(lanes);
-#if PRINT_RESULTS
-    Print(lanes);
-#else
-    for (size_t i = 0; i < Xorshift128Plus::N; ++i) {
-      ASSERT_EQ(kExpected[vector][i], lanes[i])
-          << "Where vector=" << vector << " i=" << i;
-    }
-#endif
-  }
-}
-
-// Output changes when given different seeds
-void TestSeedChanges() {
-  HWY_ALIGN uint64_t lanes[Xorshift128Plus::N];
-
-  std::vector<uint64_t> first;
-  constexpr size_t kNumSeeds = 16384;
-  first.reserve(kNumSeeds);
-
-  // All 14-bit seeds
-  for (size_t seed = 0; seed < kNumSeeds; ++seed) {
-    HWY_ALIGN Xorshift128Plus rng(seed);
-
-    rng.Fill(lanes);
-    first.push_back(lanes[0]);
-  }
-
-  // All outputs are unique
-  ASSERT_EQ(kNumSeeds, first.size());
-  std::sort(first.begin(), first.end());
-  first.erase(std::unique(first.begin(), first.end()), first.end());
-  EXPECT_EQ(kNumSeeds, first.size());
-}
-
-void TestFloat() {
-  test::ThreadPoolForTests pool(8);
-
-#ifdef JXL_DISABLE_SLOW_TESTS
-  const uint32_t kMaxSeed = 256;
-#else   // JXL_DISABLE_SLOW_TESTS
-  const uint32_t kMaxSeed = 4096;
-#endif  // JXL_DISABLE_SLOW_TESTS
-  const auto test_seed = [](const uint32_t seed, size_t /*thread*/) -> Status {
-    HWY_ALIGN Xorshift128Plus rng(seed);
-
-    const HWY_FULL(uint32_t) du;
-    const HWY_FULL(float) df;
-    HWY_ALIGN uint64_t batch[Xorshift128Plus::N];
-    HWY_ALIGN float lanes[MaxLanes(df)];
-    double sum = 0.0;
-    size_t count = 0;
-    const size_t kReps = 2000;
-    for (size_t reps = 0; reps < kReps; ++reps) {
-      rng.Fill(batch);
-      for (size_t i = 0; i < Xorshift128Plus::N * 2; i += Lanes(df)) {
-        const auto bits =
-            Load(du, reinterpret_cast<const uint32_t*>(batch) + i);
-        // 1.0 + 23 random mantissa bits = [1, 2)
-        const auto rand12 =
-            BitCast(df, Or(ShiftRight<9>(bits), Set(du, 0x3F800000)));
-        const auto rand01 = Sub(rand12, Set(df, 1.0f));
-        Store(rand01, df, lanes);
-        for (float lane : lanes) {
-          sum += lane;
-          count += 1;
-          EXPECT_LE(lane, 1.0f);
-          EXPECT_GE(lane, 0.0f);
-        }
-      }
-    }
-
-    // Verify average (uniform distribution)
-    EXPECT_NEAR(0.5, sum / count, 0.00702);
-    return true;
-  };
-  EXPECT_TRUE(RunOnPool(pool.get(), 0, kMaxSeed, ThreadPool::NoInit, test_seed,
-                        "TestXorShift"));
-}
-
-// Not more than one 64-bit zero
-void TestNotZero() {
-  test::ThreadPoolForTests pool(8);
-
-#ifdef JXL_DISABLE_SLOW_TESTS
-  const uint32_t kMaxSeed = 500;
-#else   // JXL_DISABLE_SLOW_TESTS
-  const uint32_t kMaxSeed = 2000;
-#endif  // JXL_DISABLE_SLOW_TESTS
-  const auto test_seed = [](const uint32_t task, size_t /*thread*/) -> Status {
-    HWY_ALIGN uint64_t lanes[Xorshift128Plus::N];
-
-    HWY_ALIGN Xorshift128Plus rng(task);
-    size_t num_zero = 0;
-    for (size_t vectors = 0; vectors < 10000; ++vectors) {
-      rng.Fill(lanes);
-      for (uint64_t lane : lanes) {
-        num_zero += static_cast<size_t>(lane == 0);
-      }
-    }
-    EXPECT_LE(num_zero, 1u);
-    return true;
-  };
-  EXPECT_TRUE(RunOnPool(pool.get(), 0, kMaxSeed, ThreadPool::NoInit, test_seed,
-                        "TestNotZero"));
-}
-
-// NOLINTNEXTLINE(google-readability-namespace-comments)
-}  // namespace HWY_NAMESPACE
-}  // namespace jxl
-HWY_AFTER_NAMESPACE();
-
-#if HWY_ONCE
-namespace jxl {
-
-class Xorshift128Test : public hwy::TestWithParamTarget {};
-
-HWY_TARGET_INSTANTIATE_TEST_SUITE_P(Xorshift128Test);
-
-HWY_EXPORT_AND_TEST_P(Xorshift128Test, TestNotZero);
-HWY_EXPORT_AND_TEST_P(Xorshift128Test, TestGolden);
-HWY_EXPORT_AND_TEST_P(Xorshift128Test, TestSeedChanges);
-HWY_EXPORT_AND_TEST_P(Xorshift128Test, TestFloat);
-
-}  // namespace jxl
-#endif
diff --git a/third_party/jpeg-xl/lib/jxl_benchmark.cmake b/third_party/jpeg-xl/lib/jxl_benchmark.cmake
deleted file mode 100644
index d7a5a1144e80a..0000000000000
--- a/third_party/jpeg-xl/lib/jxl_benchmark.cmake
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include(jxl_lists.cmake)
-
-if(SANITIZER STREQUAL "msan")
-  message(STATUS "NOT building benchmarks under MSAN")
-  return()
-endif()
-
-# This is the Google benchmark project (https://github.com/google/benchmark).
-find_package(benchmark)
-
-if(benchmark_FOUND)
-  message(STATUS "benchmark found")
-  if(JPEGXL_STATIC AND NOT MINGW)
-    # benchmark::benchmark hardcodes the librt.so which obviously doesn't
-    # compile in static mode.
-    set_target_properties(benchmark::benchmark PROPERTIES
-      INTERFACE_LINK_LIBRARIES "Threads::Threads;-lrt")
-  endif()
-
-  list(APPEND JPEGXL_INTERNAL_TESTS
-    # TODO(eustas): Move this to tools/
-    ../tools/gauss_blur_gbench.cc
-  )
-
-  # Compiles all the benchmark files into a single binary. Individual benchmarks
-  # can be run with --benchmark_filter.
-  add_executable(jxl_gbench "${JPEGXL_INTERNAL_GBENCH_SOURCES}" gbench_main.cc)
-
-  target_compile_definitions(jxl_gbench PRIVATE
-    -DTEST_DATA_PATH="${JPEGXL_TEST_DATA_PATH}")
-  target_link_libraries(jxl_gbench
-    jxl_extras-internal
-    jxl-internal
-    jxl_tool
-    benchmark::benchmark
-  )
-else()
-  message(STATUS "benchmark NOT found")
-endif() # benchmark_FOUND
diff --git a/third_party/jpeg-xl/lib/jxl_cms.cmake b/third_party/jpeg-xl/lib/jxl_cms.cmake
deleted file mode 100644
index 62d5b651fd5fc..0000000000000
--- a/third_party/jpeg-xl/lib/jxl_cms.cmake
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include(jxl_lists.cmake)
-
-# Headers for exporting/importing public headers
-include(GenerateExportHeader)
-
-add_library(jxl_cms
-  ${JPEGXL_INTERNAL_CMS_SOURCES}
-)
-target_compile_options(jxl_cms PRIVATE "${JPEGXL_INTERNAL_FLAGS}")
-set_target_properties(jxl_cms PROPERTIES
-        POSITION_INDEPENDENT_CODE ON
-        CXX_VISIBILITY_PRESET hidden
-        VISIBILITY_INLINES_HIDDEN 1)
-target_link_libraries(jxl_cms PUBLIC jxl_base)
-target_include_directories(jxl_cms PRIVATE
-  ${JXL_HWY_INCLUDE_DIRS}
-)
-generate_export_header(jxl_cms
-  BASE_NAME JXL_CMS
-  EXPORT_FILE_NAME include/jxl/jxl_cms_export.h)
-target_include_directories(jxl_cms BEFORE PUBLIC
-  "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>")
-
-set(JPEGXL_CMS_LIBRARY_REQUIRES "")
-
-if (JPEGXL_ENABLE_SKCMS)
-  target_link_skcms(jxl_cms)
-else()
-  target_link_libraries(jxl_cms PRIVATE lcms2)
-  if (JPEGXL_FORCE_SYSTEM_LCMS2)
-    set(JPEGXL_CMS_LIBRARY_REQUIRES "lcms2")
-  endif()
-endif()
-
-target_link_libraries(jxl_cms PRIVATE hwy)
-
-set_target_properties(jxl_cms PROPERTIES
-        VERSION ${JPEGXL_LIBRARY_VERSION}
-        SOVERSION ${JPEGXL_LIBRARY_SOVERSION})
-
-# Check whether the linker support excluding libs
-set(LINKER_EXCLUDE_LIBS_FLAG "-Wl,--exclude-libs=ALL")
-include(CheckCSourceCompiles)
-list(APPEND CMAKE_EXE_LINKER_FLAGS ${LINKER_EXCLUDE_LIBS_FLAG})
-check_c_source_compiles("int main(){return 0;}" LINKER_SUPPORT_EXCLUDE_LIBS)
-list(REMOVE_ITEM CMAKE_EXE_LINKER_FLAGS ${LINKER_EXCLUDE_LIBS_FLAG})
-
-if(LINKER_SUPPORT_EXCLUDE_LIBS)
-  set_property(TARGET jxl_cms APPEND_STRING PROPERTY
-      LINK_FLAGS " ${LINKER_EXCLUDE_LIBS_FLAG}")
-endif()
-
-install(TARGETS jxl_cms
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-if (BUILD_SHARED_LIBS)
-  set(JPEGXL_REQUIRES_TYPE "Requires.private")
-  set(JPEGXL_CMS_PRIVATE_LIBS "-lm ${PKGCONFIG_CXX_LIB}")
-else()
-  set(JPEGXL_REQUIRES_TYPE "Requires")
-  set(JPEGXL_CMS_PRIVATE_LIBS "-lm ${PKGCONFIG_CXX_LIB}")
-endif()
-
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/jxl/libjxl_cms.pc.in"
-               "libjxl_cms.pc" @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libjxl_cms.pc"
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
diff --git a/third_party/jpeg-xl/lib/jxl_extras.cmake b/third_party/jpeg-xl/lib/jxl_extras.cmake
deleted file mode 100644
index 3a45d9c971ca2..0000000000000
--- a/third_party/jpeg-xl/lib/jxl_extras.cmake
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include(jxl_lists.cmake)
-
-# Object library for those parts of extras that do not depend on jxl internals
-# or jpegli. We will create two versions of these object files, one with and one
-# without external codec support compiled in.
-list(APPEND JPEGXL_EXTRAS_CORE_SOURCES
-  "${JPEGXL_INTERNAL_EXTRAS_SOURCES}"
-  "${JPEGXL_INTERNAL_CODEC_APNG_SOURCES}"
-  "${JPEGXL_INTERNAL_CODEC_EXR_SOURCES}"
-  "${JPEGXL_INTERNAL_CODEC_JPG_SOURCES}"
-  "${JPEGXL_INTERNAL_CODEC_JXL_SOURCES}"
-  "${JPEGXL_INTERNAL_CODEC_PGX_SOURCES}"
-  "${JPEGXL_INTERNAL_CODEC_PNM_SOURCES}"
-  "${JPEGXL_INTERNAL_CODEC_NPY_SOURCES}"
-  extras/dec/gif.cc
-  extras/dec/gif.h
-)
-foreach(LIB jxl_extras_core-obj jxl_extras_core_nocodec-obj)
-  add_library("${LIB}" OBJECT "${JPEGXL_EXTRAS_CORE_SOURCES}")
-  list(APPEND JXL_EXTRAS_OBJECT_LIBRARIES "${LIB}")
-endforeach()
-list(APPEND JXL_EXTRAS_OBJECTS $<TARGET_OBJECTS:jxl_extras_core-obj>)
-
-# Object library for those parts of extras that depend on jxl internals.
-add_library(jxl_extras_internal-obj OBJECT
-  "${JPEGXL_INTERNAL_EXTRAS_FOR_TOOLS_SOURCES}"
-)
-list(APPEND JXL_EXTRAS_OBJECT_LIBRARIES jxl_extras_internal-obj)
-list(APPEND JXL_EXTRAS_OBJECTS $<TARGET_OBJECTS:jxl_extras_internal-obj>)
-
-set(JXL_EXTRAS_CODEC_INTERNAL_LIBRARIES)
-
-find_package(GIF 5.1)
-if(GIF_FOUND)
-  target_include_directories(jxl_extras_core-obj PRIVATE "${GIF_INCLUDE_DIRS}")
-  target_compile_definitions(jxl_extras_core-obj PRIVATE -DJPEGXL_ENABLE_GIF=1)
-  list(APPEND JXL_EXTRAS_CODEC_INTERNAL_LIBRARIES ${GIF_LIBRARIES})
-  if(JPEGXL_DEP_LICENSE_DIR)
-    configure_file("${JPEGXL_DEP_LICENSE_DIR}/libgif-dev/copyright"
-                   ${PROJECT_BINARY_DIR}/LICENSE.libgif COPYONLY)
-  endif()  # JPEGXL_DEP_LICENSE_DIR
-endif()
-
-find_package(JPEG)
-if(JPEG_FOUND)
-  target_include_directories(jxl_extras_core-obj PRIVATE "${JPEG_INCLUDE_DIRS}")
-  target_compile_definitions(jxl_extras_core-obj PRIVATE -DJPEGXL_ENABLE_JPEG=1)
-  list(APPEND JXL_EXTRAS_CODEC_INTERNAL_LIBRARIES ${JPEG_LIBRARIES})
-  if(JPEGXL_DEP_LICENSE_DIR)
-    configure_file("${JPEGXL_DEP_LICENSE_DIR}/libjpeg-dev/copyright"
-                   ${PROJECT_BINARY_DIR}/LICENSE.libjpeg COPYONLY)
-  endif()  # JPEGXL_DEP_LICENSE_DIR
-endif()
-
-if (JPEGXL_ENABLE_SJPEG)
-  target_compile_definitions(jxl_extras_core-obj PRIVATE
-    -DJPEGXL_ENABLE_SJPEG=1)
-  target_include_directories(jxl_extras_core-obj PRIVATE
-    ../third_party/sjpeg/src)
-  list(APPEND JXL_EXTRAS_CODEC_INTERNAL_LIBRARIES sjpeg)
-endif()
-
-if(JPEGXL_ENABLE_JPEGLI)
-  add_library(jxl_extras_jpegli-obj OBJECT
-    "${JPEGXL_INTERNAL_CODEC_JPEGLI_SOURCES}"
-  )
-  target_include_directories(jxl_extras_jpegli-obj PRIVATE
-    "${CMAKE_CURRENT_BINARY_DIR}/include/jpegli"
-  )
-  list(APPEND JXL_EXTRAS_OBJECT_LIBRARIES jxl_extras_jpegli-obj)
-  list(APPEND JXL_EXTRAS_OBJECTS $<TARGET_OBJECTS:jxl_extras_jpegli-obj>)
-endif()
-
-if(NOT JPEGXL_BUNDLE_LIBPNG)
-  find_package(PNG)
-endif()
-if(PNG_FOUND)
-  target_include_directories(jxl_extras_core-obj PRIVATE "${PNG_INCLUDE_DIRS}")
-  target_compile_definitions(jxl_extras_core-obj PRIVATE -DJPEGXL_ENABLE_APNG=1)
-  list(APPEND JXL_EXTRAS_CODEC_INTERNAL_LIBRARIES ${PNG_LIBRARIES})
-  configure_file(extras/LICENSE.apngdis
-                 ${PROJECT_BINARY_DIR}/LICENSE.apngdis COPYONLY)
-endif()
-
-if (JPEGXL_ENABLE_OPENEXR)
-pkg_check_modules(OpenEXR IMPORTED_TARGET OpenEXR)
-if (OpenEXR_FOUND)
-  target_include_directories(jxl_extras_core-obj PRIVATE
-    "${OpenEXR_INCLUDE_DIRS}"
-  )
-  target_compile_definitions(jxl_extras_core-obj PRIVATE -DJPEGXL_ENABLE_EXR=1)
-  list(APPEND JXL_EXTRAS_CODEC_INTERNAL_LIBRARIES PkgConfig::OpenEXR)
-  if(JPEGXL_DEP_LICENSE_DIR)
-    configure_file("${JPEGXL_DEP_LICENSE_DIR}/libopenexr-dev/copyright"
-                   ${PROJECT_BINARY_DIR}/LICENSE.libopenexr COPYONLY)
-  endif()  # JPEGXL_DEP_LICENSE_DIR
-  # OpenEXR generates exceptions, so we need exception support to catch them.
-  # Actually those flags counteract the ones set in JPEGXL_INTERNAL_FLAGS.
-  if (NOT WIN32)
-    set_source_files_properties(
-      extras/dec/exr.cc extras/enc/exr.cc PROPERTIES COMPILE_FLAGS -fexceptions)
-    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-      set_source_files_properties(
-	extras/dec/exr.cc extras/enc/exr.cc PROPERTIES COMPILE_FLAGS
-	-fcxx-exceptions)
-    endif()
-  endif()
-endif() # OpenEXR_FOUND
-endif() # JPEGXL_ENABLE_OPENEXR
-
-# Common settings for the object libraries.
-foreach(LIB ${JXL_EXTRAS_OBJECT_LIBRARIES})
-  target_compile_options("${LIB}" PRIVATE "${JPEGXL_INTERNAL_FLAGS}")
-  target_compile_definitions("${LIB}" PRIVATE -DJXL_EXPORT=)
-  set_property(TARGET "${LIB}" PROPERTY POSITION_INDEPENDENT_CODE ON)
-  target_include_directories("${LIB}" BEFORE PRIVATE
-    ${PROJECT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${CMAKE_CURRENT_BINARY_DIR}/include
-    ${JXL_HWY_INCLUDE_DIRS}
-  )
-endforeach()
-
-# Define an extras library that does not have the image codecs, only the core
-# extras code. This is needed for some of the fuzzers.
-add_library(jxl_extras_nocodec-internal STATIC EXCLUDE_FROM_ALL
-  $<TARGET_OBJECTS:jxl_extras_core_nocodec-obj>
-  $<TARGET_OBJECTS:jxl_extras_internal-obj>
-)
-target_link_libraries(jxl_extras_nocodec-internal PRIVATE jxl_threads)
-target_link_libraries(jxl_extras_nocodec-internal PUBLIC jxl-internal)
-
-# We only define a static library jxl_extras since it uses internal parts of
-# jxl library which are not accessible from outside the library in the
-# shared library case.
-add_library(jxl_extras-internal STATIC EXCLUDE_FROM_ALL ${JXL_EXTRAS_OBJECTS})
-target_link_libraries(jxl_extras-internal PRIVATE
-  ${JXL_EXTRAS_CODEC_INTERNAL_LIBRARIES}
-  jxl_threads
-)
-target_link_libraries(jxl_extras-internal PUBLIC jxl-internal)
-if(JPEGXL_ENABLE_JPEGLI)
-  target_compile_definitions(jxl_extras-internal PUBLIC -DJPEGXL_ENABLE_JPEGLI=1)
-  target_link_libraries(jxl_extras-internal PRIVATE jpegli-static)
-endif()
-
-### Library that does not depend on internal parts of jxl library.
-### Used by cjxl and djxl binaries.
-add_library(jxl_extras_codec STATIC
-  $<TARGET_OBJECTS:jxl_extras_core-obj>
-)
-target_link_libraries(jxl_extras_codec PRIVATE
-  ${JXL_EXTRAS_CODEC_INTERNAL_LIBRARIES}
-)
-target_link_libraries(jxl_extras_codec PUBLIC jxl)
-set_target_properties(jxl_extras_codec PROPERTIES
-  VERSION ${JPEGXL_LIBRARY_VERSION}
-  SOVERSION ${JPEGXL_LIBRARY_SOVERSION}
-)
-install(TARGETS jxl_extras_codec
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-)
diff --git a/third_party/jpeg-xl/lib/jxl_lists.bzl b/third_party/jpeg-xl/lib/jxl_lists.bzl
deleted file mode 100644
index ae8b608f33fef..0000000000000
--- a/third_party/jpeg-xl/lib/jxl_lists.bzl
+++ /dev/null
@@ -1,656 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-"""
-This file is generated, do not modify by manually.
-Run `tools/scripts/build_cleaner.py --update` to regenerate it.
-"""
-
-libjxl_base_sources = [
-    "jxl/base/arch_macros.h",
-    "jxl/base/bits.h",
-    "jxl/base/byte_order.h",
-    "jxl/base/c_callback_support.h",
-    "jxl/base/common.h",
-    "jxl/base/compiler_specific.h",
-    "jxl/base/data_parallel.h",
-    "jxl/base/exif.h",
-    "jxl/base/fast_math-inl.h",
-    "jxl/base/float.h",
-    "jxl/base/iaca.h",
-    "jxl/base/include_jpeglib.h",
-    "jxl/base/matrix_ops.h",
-    "jxl/base/os_macros.h",
-    "jxl/base/override.h",
-    "jxl/base/printf_macros.h",
-    "jxl/base/random.h",
-    "jxl/base/rational_polynomial-inl.h",
-    "jxl/base/rect.h",
-    "jxl/base/sanitizer_definitions.h",
-    "jxl/base/sanitizers.h",
-    "jxl/base/scope_guard.h",
-    "jxl/base/span.h",
-    "jxl/base/status.h",
-]
-
-libjxl_cms_sources = [
-    "jxl/cms/color_encoding_cms.h",
-    "jxl/cms/jxl_cms.cc",
-    "jxl/cms/jxl_cms_internal.h",
-    "jxl/cms/opsin_params.h",
-    "jxl/cms/tone_mapping-inl.h",
-    "jxl/cms/tone_mapping.h",
-    "jxl/cms/transfer_functions-inl.h",
-    "jxl/cms/transfer_functions.h",
-]
-
-libjxl_codec_apng_sources = [
-    "extras/dec/apng.cc",
-    "extras/dec/apng.h",
-    "extras/enc/apng.cc",
-    "extras/enc/apng.h",
-]
-
-libjxl_codec_exr_sources = [
-    "extras/dec/exr.cc",
-    "extras/dec/exr.h",
-    "extras/enc/exr.cc",
-    "extras/enc/exr.h",
-]
-
-libjxl_codec_gif_sources = [
-    "extras/dec/gif.cc",
-    "extras/dec/gif.h",
-]
-
-libjxl_codec_jpegli_sources = [
-    "extras/dec/jpegli.cc",
-    "extras/dec/jpegli.h",
-    "extras/enc/jpegli.cc",
-    "extras/enc/jpegli.h",
-]
-
-libjxl_codec_jpg_sources = [
-    "extras/dec/jpg.cc",
-    "extras/dec/jpg.h",
-    "extras/enc/jpg.cc",
-    "extras/enc/jpg.h",
-]
-
-libjxl_codec_jxl_sources = [
-    "extras/dec/jxl.cc",
-    "extras/dec/jxl.h",
-    "extras/enc/jxl.cc",
-    "extras/enc/jxl.h",
-]
-
-libjxl_codec_npy_sources = [
-    "extras/enc/npy.cc",
-    "extras/enc/npy.h",
-]
-
-libjxl_codec_pgx_sources = [
-    "extras/dec/pgx.cc",
-    "extras/dec/pgx.h",
-    "extras/enc/pgx.cc",
-    "extras/enc/pgx.h",
-]
-
-libjxl_codec_pnm_sources = [
-    "extras/dec/pnm.cc",
-    "extras/dec/pnm.h",
-    "extras/enc/pnm.cc",
-    "extras/enc/pnm.h",
-]
-
-libjxl_dec_box_sources = [
-    "jxl/box_content_decoder.cc",
-    "jxl/box_content_decoder.h",
-]
-
-libjxl_dec_jpeg_sources = [
-    "jxl/decode_to_jpeg.cc",
-    "jxl/decode_to_jpeg.h",
-    "jxl/jpeg/dec_jpeg_data.cc",
-    "jxl/jpeg/dec_jpeg_data.h",
-    "jxl/jpeg/dec_jpeg_data_writer.cc",
-    "jxl/jpeg/dec_jpeg_data_writer.h",
-    "jxl/jpeg/dec_jpeg_output_chunk.h",
-    "jxl/jpeg/dec_jpeg_serialization_state.h",
-    "jxl/jpeg/jpeg_data.cc",
-    "jxl/jpeg/jpeg_data.h",
-]
-
-libjxl_dec_sources = [
-    "jxl/ac_context.h",
-    "jxl/ac_strategy.cc",
-    "jxl/ac_strategy.h",
-    "jxl/alpha.cc",
-    "jxl/alpha.h",
-    "jxl/ans_common.cc",
-    "jxl/ans_common.h",
-    "jxl/ans_params.h",
-    "jxl/blending.cc",
-    "jxl/blending.h",
-    "jxl/chroma_from_luma.cc",
-    "jxl/chroma_from_luma.h",
-    "jxl/codec_in_out.h",
-    "jxl/coeff_order.cc",
-    "jxl/coeff_order.h",
-    "jxl/coeff_order_fwd.h",
-    "jxl/color_encoding_internal.cc",
-    "jxl/color_encoding_internal.h",
-    "jxl/common.h",
-    "jxl/compressed_dc.cc",
-    "jxl/compressed_dc.h",
-    "jxl/convolve-inl.h",
-    "jxl/convolve.h",
-    "jxl/convolve_separable5.cc",
-    "jxl/convolve_slow.cc",
-    "jxl/convolve_symmetric3.cc",
-    "jxl/convolve_symmetric5.cc",
-    "jxl/dct-inl.h",
-    "jxl/dct_block-inl.h",
-    "jxl/dct_scales.cc",
-    "jxl/dct_scales.h",
-    "jxl/dct_util.h",
-    "jxl/dec_ans.cc",
-    "jxl/dec_ans.h",
-    "jxl/dec_bit_reader.h",
-    "jxl/dec_cache.cc",
-    "jxl/dec_cache.h",
-    "jxl/dec_context_map.cc",
-    "jxl/dec_context_map.h",
-    "jxl/dec_external_image.cc",
-    "jxl/dec_external_image.h",
-    "jxl/dec_frame.cc",
-    "jxl/dec_frame.h",
-    "jxl/dec_group.cc",
-    "jxl/dec_group.h",
-    "jxl/dec_group_border.cc",
-    "jxl/dec_group_border.h",
-    "jxl/dec_huffman.cc",
-    "jxl/dec_huffman.h",
-    "jxl/dec_modular.cc",
-    "jxl/dec_modular.h",
-    "jxl/dec_noise.cc",
-    "jxl/dec_noise.h",
-    "jxl/dec_patch_dictionary.cc",
-    "jxl/dec_patch_dictionary.h",
-    "jxl/dec_transforms-inl.h",
-    "jxl/dec_xyb-inl.h",
-    "jxl/dec_xyb.cc",
-    "jxl/dec_xyb.h",
-    "jxl/decode.cc",
-    "jxl/entropy_coder.cc",
-    "jxl/entropy_coder.h",
-    "jxl/epf.cc",
-    "jxl/epf.h",
-    "jxl/field_encodings.h",
-    "jxl/fields.cc",
-    "jxl/fields.h",
-    "jxl/frame_dimensions.h",
-    "jxl/frame_header.cc",
-    "jxl/frame_header.h",
-    "jxl/headers.cc",
-    "jxl/headers.h",
-    "jxl/huffman_table.cc",
-    "jxl/huffman_table.h",
-    "jxl/icc_codec.cc",
-    "jxl/icc_codec.h",
-    "jxl/icc_codec_common.cc",
-    "jxl/icc_codec_common.h",
-    "jxl/image.cc",
-    "jxl/image.h",
-    "jxl/image_bundle.cc",
-    "jxl/image_bundle.h",
-    "jxl/image_metadata.cc",
-    "jxl/image_metadata.h",
-    "jxl/image_ops.cc",
-    "jxl/image_ops.h",
-    "jxl/inverse_mtf-inl.h",
-    "jxl/lehmer_code.h",
-    "jxl/loop_filter.cc",
-    "jxl/loop_filter.h",
-    "jxl/luminance.cc",
-    "jxl/luminance.h",
-    "jxl/memory_manager_internal.cc",
-    "jxl/memory_manager_internal.h",
-    "jxl/modular/encoding/context_predict.h",
-    "jxl/modular/encoding/dec_ma.cc",
-    "jxl/modular/encoding/dec_ma.h",
-    "jxl/modular/encoding/encoding.cc",
-    "jxl/modular/encoding/encoding.h",
-    "jxl/modular/encoding/ma_common.h",
-    "jxl/modular/modular_image.cc",
-    "jxl/modular/modular_image.h",
-    "jxl/modular/options.h",
-    "jxl/modular/transform/palette.cc",
-    "jxl/modular/transform/palette.h",
-    "jxl/modular/transform/rct.cc",
-    "jxl/modular/transform/rct.h",
-    "jxl/modular/transform/squeeze.cc",
-    "jxl/modular/transform/squeeze.h",
-    "jxl/modular/transform/transform.cc",
-    "jxl/modular/transform/transform.h",
-    "jxl/noise.h",
-    "jxl/opsin_params.cc",
-    "jxl/opsin_params.h",
-    "jxl/pack_signed.h",
-    "jxl/padded_bytes.h",
-    "jxl/passes_state.cc",
-    "jxl/passes_state.h",
-    "jxl/patch_dictionary_internal.h",
-    "jxl/quant_weights.cc",
-    "jxl/quant_weights.h",
-    "jxl/quantizer-inl.h",
-    "jxl/quantizer.cc",
-    "jxl/quantizer.h",
-    "jxl/render_pipeline/low_memory_render_pipeline.cc",
-    "jxl/render_pipeline/low_memory_render_pipeline.h",
-    "jxl/render_pipeline/render_pipeline.cc",
-    "jxl/render_pipeline/render_pipeline.h",
-    "jxl/render_pipeline/render_pipeline_stage.h",
-    "jxl/render_pipeline/simple_render_pipeline.cc",
-    "jxl/render_pipeline/simple_render_pipeline.h",
-    "jxl/render_pipeline/stage_blending.cc",
-    "jxl/render_pipeline/stage_blending.h",
-    "jxl/render_pipeline/stage_chroma_upsampling.cc",
-    "jxl/render_pipeline/stage_chroma_upsampling.h",
-    "jxl/render_pipeline/stage_cms.cc",
-    "jxl/render_pipeline/stage_cms.h",
-    "jxl/render_pipeline/stage_epf.cc",
-    "jxl/render_pipeline/stage_epf.h",
-    "jxl/render_pipeline/stage_from_linear.cc",
-    "jxl/render_pipeline/stage_from_linear.h",
-    "jxl/render_pipeline/stage_gaborish.cc",
-    "jxl/render_pipeline/stage_gaborish.h",
-    "jxl/render_pipeline/stage_noise.cc",
-    "jxl/render_pipeline/stage_noise.h",
-    "jxl/render_pipeline/stage_patches.cc",
-    "jxl/render_pipeline/stage_patches.h",
-    "jxl/render_pipeline/stage_splines.cc",
-    "jxl/render_pipeline/stage_splines.h",
-    "jxl/render_pipeline/stage_spot.cc",
-    "jxl/render_pipeline/stage_spot.h",
-    "jxl/render_pipeline/stage_to_linear.cc",
-    "jxl/render_pipeline/stage_to_linear.h",
-    "jxl/render_pipeline/stage_tone_mapping.cc",
-    "jxl/render_pipeline/stage_tone_mapping.h",
-    "jxl/render_pipeline/stage_upsampling.cc",
-    "jxl/render_pipeline/stage_upsampling.h",
-    "jxl/render_pipeline/stage_write.cc",
-    "jxl/render_pipeline/stage_write.h",
-    "jxl/render_pipeline/stage_xyb.cc",
-    "jxl/render_pipeline/stage_xyb.h",
-    "jxl/render_pipeline/stage_ycbcr.cc",
-    "jxl/render_pipeline/stage_ycbcr.h",
-    "jxl/simd_util-inl.h",
-    "jxl/simd_util.cc",
-    "jxl/simd_util.h",
-    "jxl/splines.cc",
-    "jxl/splines.h",
-    "jxl/toc.cc",
-    "jxl/toc.h",
-    "jxl/transpose-inl.h",
-    "jxl/xorshift128plus-inl.h",
-]
-
-libjxl_enc_sources = [
-    "jxl/butteraugli/butteraugli.cc",
-    "jxl/butteraugli/butteraugli.h",
-    "jxl/enc_ac_strategy.cc",
-    "jxl/enc_ac_strategy.h",
-    "jxl/enc_adaptive_quantization.cc",
-    "jxl/enc_adaptive_quantization.h",
-    "jxl/enc_ans.cc",
-    "jxl/enc_ans.h",
-    "jxl/enc_ans_params.h",
-    "jxl/enc_aux_out.cc",
-    "jxl/enc_aux_out.h",
-    "jxl/enc_bit_writer.cc",
-    "jxl/enc_bit_writer.h",
-    "jxl/enc_butteraugli_comparator.cc",
-    "jxl/enc_butteraugli_comparator.h",
-    "jxl/enc_cache.cc",
-    "jxl/enc_cache.h",
-    "jxl/enc_chroma_from_luma.cc",
-    "jxl/enc_chroma_from_luma.h",
-    "jxl/enc_cluster.cc",
-    "jxl/enc_cluster.h",
-    "jxl/enc_coeff_order.cc",
-    "jxl/enc_coeff_order.h",
-    "jxl/enc_comparator.cc",
-    "jxl/enc_comparator.h",
-    "jxl/enc_context_map.cc",
-    "jxl/enc_context_map.h",
-    "jxl/enc_debug_image.cc",
-    "jxl/enc_debug_image.h",
-    "jxl/enc_detect_dots.cc",
-    "jxl/enc_detect_dots.h",
-    "jxl/enc_dot_dictionary.cc",
-    "jxl/enc_dot_dictionary.h",
-    "jxl/enc_entropy_coder.cc",
-    "jxl/enc_entropy_coder.h",
-    "jxl/enc_external_image.cc",
-    "jxl/enc_external_image.h",
-    "jxl/enc_fast_lossless.cc",
-    "jxl/enc_fast_lossless.h",
-    "jxl/enc_fields.cc",
-    "jxl/enc_fields.h",
-    "jxl/enc_frame.cc",
-    "jxl/enc_frame.h",
-    "jxl/enc_gaborish.cc",
-    "jxl/enc_gaborish.h",
-    "jxl/enc_gamma_correct.h",
-    "jxl/enc_group.cc",
-    "jxl/enc_group.h",
-    "jxl/enc_heuristics.cc",
-    "jxl/enc_heuristics.h",
-    "jxl/enc_huffman.cc",
-    "jxl/enc_huffman.h",
-    "jxl/enc_huffman_tree.cc",
-    "jxl/enc_huffman_tree.h",
-    "jxl/enc_icc_codec.cc",
-    "jxl/enc_icc_codec.h",
-    "jxl/enc_image_bundle.cc",
-    "jxl/enc_image_bundle.h",
-    "jxl/enc_linalg.cc",
-    "jxl/enc_linalg.h",
-    "jxl/enc_modular.cc",
-    "jxl/enc_modular.h",
-    "jxl/enc_noise.cc",
-    "jxl/enc_noise.h",
-    "jxl/enc_optimize.h",
-    "jxl/enc_params.h",
-    "jxl/enc_patch_dictionary.cc",
-    "jxl/enc_patch_dictionary.h",
-    "jxl/enc_photon_noise.cc",
-    "jxl/enc_photon_noise.h",
-    "jxl/enc_progressive_split.cc",
-    "jxl/enc_progressive_split.h",
-    "jxl/enc_quant_weights.cc",
-    "jxl/enc_quant_weights.h",
-    "jxl/enc_splines.cc",
-    "jxl/enc_splines.h",
-    "jxl/enc_toc.cc",
-    "jxl/enc_toc.h",
-    "jxl/enc_transforms-inl.h",
-    "jxl/enc_transforms.cc",
-    "jxl/enc_transforms.h",
-    "jxl/enc_xyb.cc",
-    "jxl/enc_xyb.h",
-    "jxl/encode.cc",
-    "jxl/encode_internal.h",
-    "jxl/jpeg/enc_jpeg_data.cc",
-    "jxl/jpeg/enc_jpeg_data.h",
-    "jxl/jpeg/enc_jpeg_data_reader.cc",
-    "jxl/jpeg/enc_jpeg_data_reader.h",
-    "jxl/jpeg/enc_jpeg_huffman_decode.cc",
-    "jxl/jpeg/enc_jpeg_huffman_decode.h",
-    "jxl/modular/encoding/enc_debug_tree.cc",
-    "jxl/modular/encoding/enc_debug_tree.h",
-    "jxl/modular/encoding/enc_encoding.cc",
-    "jxl/modular/encoding/enc_encoding.h",
-    "jxl/modular/encoding/enc_ma.cc",
-    "jxl/modular/encoding/enc_ma.h",
-    "jxl/modular/transform/enc_palette.cc",
-    "jxl/modular/transform/enc_palette.h",
-    "jxl/modular/transform/enc_rct.cc",
-    "jxl/modular/transform/enc_rct.h",
-    "jxl/modular/transform/enc_squeeze.cc",
-    "jxl/modular/transform/enc_squeeze.h",
-    "jxl/modular/transform/enc_transform.cc",
-    "jxl/modular/transform/enc_transform.h",
-]
-
-libjxl_extras_for_tools_sources = [
-    "extras/codec.cc",
-    "extras/codec.h",
-    "extras/hlg.cc",
-    "extras/hlg.h",
-    "extras/metrics.cc",
-    "extras/metrics.h",
-    "extras/packed_image_convert.cc",
-    "extras/packed_image_convert.h",
-    "extras/tone_mapping.cc",
-    "extras/tone_mapping.h",
-]
-
-libjxl_extras_sources = [
-    "extras/alpha_blend.cc",
-    "extras/alpha_blend.h",
-    "extras/common.cc",
-    "extras/common.h",
-    "extras/compressed_icc.cc",
-    "extras/dec/color_description.cc",
-    "extras/dec/color_description.h",
-    "extras/dec/color_hints.cc",
-    "extras/dec/color_hints.h",
-    "extras/dec/decode.cc",
-    "extras/dec/decode.h",
-    "extras/enc/encode.cc",
-    "extras/enc/encode.h",
-    "extras/exif.cc",
-    "extras/exif.h",
-    "extras/gain_map.cc",
-    "extras/mmap.cc",
-    "extras/mmap.h",
-    "extras/packed_image.h",
-    "extras/size_constraints.h",
-    "extras/time.cc",
-    "extras/time.h",
-]
-
-libjxl_gbench_sources = [
-    "extras/tone_mapping_gbench.cc",
-    "jxl/dec_external_image_gbench.cc",
-    "jxl/enc_external_image_gbench.cc",
-    "jxl/splines_gbench.cc",
-    "jxl/tf_gbench.cc",
-]
-
-libjxl_jpegli_lib_version = 62
-
-libjxl_jpegli_libjpeg_helper_files = [
-    "jpegli/libjpeg_test_util.cc",
-    "jpegli/libjpeg_test_util.h",
-]
-
-libjxl_jpegli_sources = [
-    "jpegli/adaptive_quantization.cc",
-    "jpegli/adaptive_quantization.h",
-    "jpegli/bit_writer.cc",
-    "jpegli/bit_writer.h",
-    "jpegli/bitstream.cc",
-    "jpegli/bitstream.h",
-    "jpegli/color_quantize.cc",
-    "jpegli/color_quantize.h",
-    "jpegli/color_transform.cc",
-    "jpegli/color_transform.h",
-    "jpegli/common.cc",
-    "jpegli/common.h",
-    "jpegli/common_internal.h",
-    "jpegli/dct-inl.h",
-    "jpegli/decode.cc",
-    "jpegli/decode.h",
-    "jpegli/decode_internal.h",
-    "jpegli/decode_marker.cc",
-    "jpegli/decode_marker.h",
-    "jpegli/decode_scan.cc",
-    "jpegli/decode_scan.h",
-    "jpegli/destination_manager.cc",
-    "jpegli/downsample.cc",
-    "jpegli/downsample.h",
-    "jpegli/encode.cc",
-    "jpegli/encode.h",
-    "jpegli/encode_finish.cc",
-    "jpegli/encode_finish.h",
-    "jpegli/encode_internal.h",
-    "jpegli/encode_streaming.cc",
-    "jpegli/encode_streaming.h",
-    "jpegli/entropy_coding-inl.h",
-    "jpegli/entropy_coding.cc",
-    "jpegli/entropy_coding.h",
-    "jpegli/error.cc",
-    "jpegli/error.h",
-    "jpegli/huffman.cc",
-    "jpegli/huffman.h",
-    "jpegli/idct.cc",
-    "jpegli/idct.h",
-    "jpegli/input.cc",
-    "jpegli/input.h",
-    "jpegli/memory_manager.cc",
-    "jpegli/memory_manager.h",
-    "jpegli/quant.cc",
-    "jpegli/quant.h",
-    "jpegli/render.cc",
-    "jpegli/render.h",
-    "jpegli/simd.cc",
-    "jpegli/simd.h",
-    "jpegli/source_manager.cc",
-    "jpegli/transpose-inl.h",
-    "jpegli/types.h",
-    "jpegli/upsample.cc",
-    "jpegli/upsample.h",
-]
-
-libjxl_jpegli_testlib_files = [
-    "jpegli/fuzztest.h",
-    "jpegli/test_params.h",
-    "jpegli/test_utils-inl.h",
-    "jpegli/test_utils.cc",
-    "jpegli/test_utils.h",
-]
-
-libjxl_jpegli_tests = [
-    "jpegli/decode_api_test.cc",
-    "jpegli/encode_api_test.cc",
-    "jpegli/error_handling_test.cc",
-    "jpegli/input_suspension_test.cc",
-    "jpegli/output_suspension_test.cc",
-    "jpegli/source_manager_test.cc",
-    "jpegli/streaming_test.cc",
-    "jpegli/transcode_api_test.cc",
-]
-
-libjxl_jpegli_wrapper_sources = [
-    "jpegli/libjpeg_wrapper.cc",
-]
-
-libjxl_major_version = 0
-
-libjxl_minor_version = 11
-
-libjxl_patch_version = 1
-
-libjxl_public_headers = [
-    "include/jxl/cms.h",
-    "include/jxl/cms_interface.h",
-    "include/jxl/codestream_header.h",
-    "include/jxl/color_encoding.h",
-    "include/jxl/compressed_icc.h",
-    "include/jxl/decode.h",
-    "include/jxl/decode_cxx.h",
-    "include/jxl/encode.h",
-    "include/jxl/encode_cxx.h",
-    "include/jxl/gain_map.h",
-    "include/jxl/memory_manager.h",
-    "include/jxl/parallel_runner.h",
-    "include/jxl/stats.h",
-    "include/jxl/types.h",
-]
-
-libjxl_testlib_files = [
-    "jxl/dct_for_test.h",
-    "jxl/dec_transforms_testonly.cc",
-    "jxl/dec_transforms_testonly.h",
-    "jxl/fake_parallel_runner_testonly.h",
-    "jxl/fuzztest.h",
-    "jxl/image_test_utils.h",
-    "jxl/render_pipeline/test_render_pipeline_stages.h",
-    "jxl/test_image.cc",
-    "jxl/test_image.h",
-    "jxl/test_memory_manager.cc",
-    "jxl/test_memory_manager.h",
-    "jxl/test_utils.cc",
-    "jxl/test_utils.h",
-]
-
-libjxl_tests = [
-    "extras/codec_test.cc",
-    "extras/compressed_icc_test.cc",
-    "extras/dec/color_description_test.cc",
-    "extras/dec/pgx_test.cc",
-    "extras/gain_map_test.cc",
-    "extras/jpegli_test.cc",
-    "jxl/ac_strategy_test.cc",
-    "jxl/alpha_test.cc",
-    "jxl/ans_common_test.cc",
-    "jxl/ans_test.cc",
-    "jxl/bit_reader_test.cc",
-    "jxl/bits_test.cc",
-    "jxl/blending_test.cc",
-    "jxl/butteraugli/butteraugli_test.cc",
-    "jxl/byte_order_test.cc",
-    "jxl/cms/tone_mapping_test.cc",
-    "jxl/cms/transfer_functions_test.cc",
-    "jxl/coeff_order_test.cc",
-    "jxl/color_encoding_internal_test.cc",
-    "jxl/color_management_test.cc",
-    "jxl/convolve_test.cc",
-    "jxl/data_parallel_test.cc",
-    "jxl/dct_test.cc",
-    "jxl/decode_test.cc",
-    "jxl/enc_external_image_test.cc",
-    "jxl/enc_gaborish_test.cc",
-    "jxl/enc_linalg_test.cc",
-    "jxl/enc_optimize_test.cc",
-    "jxl/enc_photon_noise_test.cc",
-    "jxl/encode_test.cc",
-    "jxl/entropy_coder_test.cc",
-    "jxl/fast_math_test.cc",
-    "jxl/fields_test.cc",
-    "jxl/gamma_correct_test.cc",
-    "jxl/gradient_test.cc",
-    "jxl/iaca_test.cc",
-    "jxl/icc_codec_test.cc",
-    "jxl/image_bundle_test.cc",
-    "jxl/image_ops_test.cc",
-    "jxl/jxl_test.cc",
-    "jxl/lehmer_code_test.cc",
-    "jxl/modular_test.cc",
-    "jxl/opsin_image_test.cc",
-    "jxl/opsin_inverse_test.cc",
-    "jxl/padded_bytes_test.cc",
-    "jxl/passes_test.cc",
-    "jxl/patch_dictionary_test.cc",
-    "jxl/preview_test.cc",
-    "jxl/quant_weights_test.cc",
-    "jxl/quantizer_test.cc",
-    "jxl/rational_polynomial_test.cc",
-    "jxl/render_pipeline/render_pipeline_test.cc",
-    "jxl/roundtrip_test.cc",
-    "jxl/simd_util_test.cc",
-    "jxl/speed_tier_test.cc",
-    "jxl/splines_test.cc",
-    "jxl/toc_test.cc",
-    "jxl/xorshift128plus_test.cc",
-    "threads/thread_parallel_runner_test.cc",
-]
-
-libjxl_threads_public_headers = [
-    "include/jxl/resizable_parallel_runner.h",
-    "include/jxl/resizable_parallel_runner_cxx.h",
-    "include/jxl/thread_parallel_runner.h",
-    "include/jxl/thread_parallel_runner_cxx.h",
-]
-
-libjxl_threads_sources = [
-    "threads/resizable_parallel_runner.cc",
-    "threads/thread_parallel_runner.cc",
-    "threads/thread_parallel_runner_internal.cc",
-    "threads/thread_parallel_runner_internal.h",
-]
diff --git a/third_party/jpeg-xl/lib/jxl_lists.cmake b/third_party/jpeg-xl/lib/jxl_lists.cmake
deleted file mode 100644
index ff0d780e49769..0000000000000
--- a/third_party/jpeg-xl/lib/jxl_lists.cmake
+++ /dev/null
@@ -1,645 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# This file is generated, do not modify by manually.
-# Run `tools/scripts/build_cleaner.py --update` to regenerate it.
-set(JPEGXL_INTERNAL_BASE_SOURCES
-  jxl/base/arch_macros.h
-  jxl/base/bits.h
-  jxl/base/byte_order.h
-  jxl/base/c_callback_support.h
-  jxl/base/common.h
-  jxl/base/compiler_specific.h
-  jxl/base/data_parallel.h
-  jxl/base/exif.h
-  jxl/base/fast_math-inl.h
-  jxl/base/float.h
-  jxl/base/iaca.h
-  jxl/base/include_jpeglib.h
-  jxl/base/matrix_ops.h
-  jxl/base/os_macros.h
-  jxl/base/override.h
-  jxl/base/printf_macros.h
-  jxl/base/random.h
-  jxl/base/rational_polynomial-inl.h
-  jxl/base/rect.h
-  jxl/base/sanitizer_definitions.h
-  jxl/base/sanitizers.h
-  jxl/base/scope_guard.h
-  jxl/base/span.h
-  jxl/base/status.h
-)
-
-set(JPEGXL_INTERNAL_CMS_SOURCES
-  jxl/cms/color_encoding_cms.h
-  jxl/cms/jxl_cms.cc
-  jxl/cms/jxl_cms_internal.h
-  jxl/cms/opsin_params.h
-  jxl/cms/tone_mapping-inl.h
-  jxl/cms/tone_mapping.h
-  jxl/cms/transfer_functions-inl.h
-  jxl/cms/transfer_functions.h
-)
-
-set(JPEGXL_INTERNAL_CODEC_APNG_SOURCES
-  extras/dec/apng.cc
-  extras/dec/apng.h
-  extras/enc/apng.cc
-  extras/enc/apng.h
-)
-
-set(JPEGXL_INTERNAL_CODEC_EXR_SOURCES
-  extras/dec/exr.cc
-  extras/dec/exr.h
-  extras/enc/exr.cc
-  extras/enc/exr.h
-)
-
-set(JPEGXL_INTERNAL_CODEC_GIF_SOURCES
-  extras/dec/gif.cc
-  extras/dec/gif.h
-)
-
-set(JPEGXL_INTERNAL_CODEC_JPEGLI_SOURCES
-  extras/dec/jpegli.cc
-  extras/dec/jpegli.h
-  extras/enc/jpegli.cc
-  extras/enc/jpegli.h
-)
-
-set(JPEGXL_INTERNAL_CODEC_JPG_SOURCES
-  extras/dec/jpg.cc
-  extras/dec/jpg.h
-  extras/enc/jpg.cc
-  extras/enc/jpg.h
-)
-
-set(JPEGXL_INTERNAL_CODEC_JXL_SOURCES
-  extras/dec/jxl.cc
-  extras/dec/jxl.h
-  extras/enc/jxl.cc
-  extras/enc/jxl.h
-)
-
-set(JPEGXL_INTERNAL_CODEC_NPY_SOURCES
-  extras/enc/npy.cc
-  extras/enc/npy.h
-)
-
-set(JPEGXL_INTERNAL_CODEC_PGX_SOURCES
-  extras/dec/pgx.cc
-  extras/dec/pgx.h
-  extras/enc/pgx.cc
-  extras/enc/pgx.h
-)
-
-set(JPEGXL_INTERNAL_CODEC_PNM_SOURCES
-  extras/dec/pnm.cc
-  extras/dec/pnm.h
-  extras/enc/pnm.cc
-  extras/enc/pnm.h
-)
-
-set(JPEGXL_INTERNAL_DEC_BOX_SOURCES
-  jxl/box_content_decoder.cc
-  jxl/box_content_decoder.h
-)
-
-set(JPEGXL_INTERNAL_DEC_JPEG_SOURCES
-  jxl/decode_to_jpeg.cc
-  jxl/decode_to_jpeg.h
-  jxl/jpeg/dec_jpeg_data.cc
-  jxl/jpeg/dec_jpeg_data.h
-  jxl/jpeg/dec_jpeg_data_writer.cc
-  jxl/jpeg/dec_jpeg_data_writer.h
-  jxl/jpeg/dec_jpeg_output_chunk.h
-  jxl/jpeg/dec_jpeg_serialization_state.h
-  jxl/jpeg/jpeg_data.cc
-  jxl/jpeg/jpeg_data.h
-)
-
-set(JPEGXL_INTERNAL_DEC_SOURCES
-  jxl/ac_context.h
-  jxl/ac_strategy.cc
-  jxl/ac_strategy.h
-  jxl/alpha.cc
-  jxl/alpha.h
-  jxl/ans_common.cc
-  jxl/ans_common.h
-  jxl/ans_params.h
-  jxl/blending.cc
-  jxl/blending.h
-  jxl/chroma_from_luma.cc
-  jxl/chroma_from_luma.h
-  jxl/codec_in_out.h
-  jxl/coeff_order.cc
-  jxl/coeff_order.h
-  jxl/coeff_order_fwd.h
-  jxl/color_encoding_internal.cc
-  jxl/color_encoding_internal.h
-  jxl/common.h
-  jxl/compressed_dc.cc
-  jxl/compressed_dc.h
-  jxl/convolve-inl.h
-  jxl/convolve.h
-  jxl/convolve_separable5.cc
-  jxl/convolve_slow.cc
-  jxl/convolve_symmetric3.cc
-  jxl/convolve_symmetric5.cc
-  jxl/dct-inl.h
-  jxl/dct_block-inl.h
-  jxl/dct_scales.cc
-  jxl/dct_scales.h
-  jxl/dct_util.h
-  jxl/dec_ans.cc
-  jxl/dec_ans.h
-  jxl/dec_bit_reader.h
-  jxl/dec_cache.cc
-  jxl/dec_cache.h
-  jxl/dec_context_map.cc
-  jxl/dec_context_map.h
-  jxl/dec_external_image.cc
-  jxl/dec_external_image.h
-  jxl/dec_frame.cc
-  jxl/dec_frame.h
-  jxl/dec_group.cc
-  jxl/dec_group.h
-  jxl/dec_group_border.cc
-  jxl/dec_group_border.h
-  jxl/dec_huffman.cc
-  jxl/dec_huffman.h
-  jxl/dec_modular.cc
-  jxl/dec_modular.h
-  jxl/dec_noise.cc
-  jxl/dec_noise.h
-  jxl/dec_patch_dictionary.cc
-  jxl/dec_patch_dictionary.h
-  jxl/dec_transforms-inl.h
-  jxl/dec_xyb-inl.h
-  jxl/dec_xyb.cc
-  jxl/dec_xyb.h
-  jxl/decode.cc
-  jxl/entropy_coder.cc
-  jxl/entropy_coder.h
-  jxl/epf.cc
-  jxl/epf.h
-  jxl/field_encodings.h
-  jxl/fields.cc
-  jxl/fields.h
-  jxl/frame_dimensions.h
-  jxl/frame_header.cc
-  jxl/frame_header.h
-  jxl/headers.cc
-  jxl/headers.h
-  jxl/huffman_table.cc
-  jxl/huffman_table.h
-  jxl/icc_codec.cc
-  jxl/icc_codec.h
-  jxl/icc_codec_common.cc
-  jxl/icc_codec_common.h
-  jxl/image.cc
-  jxl/image.h
-  jxl/image_bundle.cc
-  jxl/image_bundle.h
-  jxl/image_metadata.cc
-  jxl/image_metadata.h
-  jxl/image_ops.cc
-  jxl/image_ops.h
-  jxl/inverse_mtf-inl.h
-  jxl/lehmer_code.h
-  jxl/loop_filter.cc
-  jxl/loop_filter.h
-  jxl/luminance.cc
-  jxl/luminance.h
-  jxl/memory_manager_internal.cc
-  jxl/memory_manager_internal.h
-  jxl/modular/encoding/context_predict.h
-  jxl/modular/encoding/dec_ma.cc
-  jxl/modular/encoding/dec_ma.h
-  jxl/modular/encoding/encoding.cc
-  jxl/modular/encoding/encoding.h
-  jxl/modular/encoding/ma_common.h
-  jxl/modular/modular_image.cc
-  jxl/modular/modular_image.h
-  jxl/modular/options.h
-  jxl/modular/transform/palette.cc
-  jxl/modular/transform/palette.h
-  jxl/modular/transform/rct.cc
-  jxl/modular/transform/rct.h
-  jxl/modular/transform/squeeze.cc
-  jxl/modular/transform/squeeze.h
-  jxl/modular/transform/transform.cc
-  jxl/modular/transform/transform.h
-  jxl/noise.h
-  jxl/opsin_params.cc
-  jxl/opsin_params.h
-  jxl/pack_signed.h
-  jxl/padded_bytes.h
-  jxl/passes_state.cc
-  jxl/passes_state.h
-  jxl/patch_dictionary_internal.h
-  jxl/quant_weights.cc
-  jxl/quant_weights.h
-  jxl/quantizer-inl.h
-  jxl/quantizer.cc
-  jxl/quantizer.h
-  jxl/render_pipeline/low_memory_render_pipeline.cc
-  jxl/render_pipeline/low_memory_render_pipeline.h
-  jxl/render_pipeline/render_pipeline.cc
-  jxl/render_pipeline/render_pipeline.h
-  jxl/render_pipeline/render_pipeline_stage.h
-  jxl/render_pipeline/simple_render_pipeline.cc
-  jxl/render_pipeline/simple_render_pipeline.h
-  jxl/render_pipeline/stage_blending.cc
-  jxl/render_pipeline/stage_blending.h
-  jxl/render_pipeline/stage_chroma_upsampling.cc
-  jxl/render_pipeline/stage_chroma_upsampling.h
-  jxl/render_pipeline/stage_cms.cc
-  jxl/render_pipeline/stage_cms.h
-  jxl/render_pipeline/stage_epf.cc
-  jxl/render_pipeline/stage_epf.h
-  jxl/render_pipeline/stage_from_linear.cc
-  jxl/render_pipeline/stage_from_linear.h
-  jxl/render_pipeline/stage_gaborish.cc
-  jxl/render_pipeline/stage_gaborish.h
-  jxl/render_pipeline/stage_noise.cc
-  jxl/render_pipeline/stage_noise.h
-  jxl/render_pipeline/stage_patches.cc
-  jxl/render_pipeline/stage_patches.h
-  jxl/render_pipeline/stage_splines.cc
-  jxl/render_pipeline/stage_splines.h
-  jxl/render_pipeline/stage_spot.cc
-  jxl/render_pipeline/stage_spot.h
-  jxl/render_pipeline/stage_to_linear.cc
-  jxl/render_pipeline/stage_to_linear.h
-  jxl/render_pipeline/stage_tone_mapping.cc
-  jxl/render_pipeline/stage_tone_mapping.h
-  jxl/render_pipeline/stage_upsampling.cc
-  jxl/render_pipeline/stage_upsampling.h
-  jxl/render_pipeline/stage_write.cc
-  jxl/render_pipeline/stage_write.h
-  jxl/render_pipeline/stage_xyb.cc
-  jxl/render_pipeline/stage_xyb.h
-  jxl/render_pipeline/stage_ycbcr.cc
-  jxl/render_pipeline/stage_ycbcr.h
-  jxl/simd_util-inl.h
-  jxl/simd_util.cc
-  jxl/simd_util.h
-  jxl/splines.cc
-  jxl/splines.h
-  jxl/toc.cc
-  jxl/toc.h
-  jxl/transpose-inl.h
-  jxl/xorshift128plus-inl.h
-)
-
-set(JPEGXL_INTERNAL_ENC_SOURCES
-  jxl/butteraugli/butteraugli.cc
-  jxl/butteraugli/butteraugli.h
-  jxl/enc_ac_strategy.cc
-  jxl/enc_ac_strategy.h
-  jxl/enc_adaptive_quantization.cc
-  jxl/enc_adaptive_quantization.h
-  jxl/enc_ans.cc
-  jxl/enc_ans.h
-  jxl/enc_ans_params.h
-  jxl/enc_aux_out.cc
-  jxl/enc_aux_out.h
-  jxl/enc_bit_writer.cc
-  jxl/enc_bit_writer.h
-  jxl/enc_butteraugli_comparator.cc
-  jxl/enc_butteraugli_comparator.h
-  jxl/enc_cache.cc
-  jxl/enc_cache.h
-  jxl/enc_chroma_from_luma.cc
-  jxl/enc_chroma_from_luma.h
-  jxl/enc_cluster.cc
-  jxl/enc_cluster.h
-  jxl/enc_coeff_order.cc
-  jxl/enc_coeff_order.h
-  jxl/enc_comparator.cc
-  jxl/enc_comparator.h
-  jxl/enc_context_map.cc
-  jxl/enc_context_map.h
-  jxl/enc_debug_image.cc
-  jxl/enc_debug_image.h
-  jxl/enc_detect_dots.cc
-  jxl/enc_detect_dots.h
-  jxl/enc_dot_dictionary.cc
-  jxl/enc_dot_dictionary.h
-  jxl/enc_entropy_coder.cc
-  jxl/enc_entropy_coder.h
-  jxl/enc_external_image.cc
-  jxl/enc_external_image.h
-  jxl/enc_fast_lossless.cc
-  jxl/enc_fast_lossless.h
-  jxl/enc_fields.cc
-  jxl/enc_fields.h
-  jxl/enc_frame.cc
-  jxl/enc_frame.h
-  jxl/enc_gaborish.cc
-  jxl/enc_gaborish.h
-  jxl/enc_gamma_correct.h
-  jxl/enc_group.cc
-  jxl/enc_group.h
-  jxl/enc_heuristics.cc
-  jxl/enc_heuristics.h
-  jxl/enc_huffman.cc
-  jxl/enc_huffman.h
-  jxl/enc_huffman_tree.cc
-  jxl/enc_huffman_tree.h
-  jxl/enc_icc_codec.cc
-  jxl/enc_icc_codec.h
-  jxl/enc_image_bundle.cc
-  jxl/enc_image_bundle.h
-  jxl/enc_linalg.cc
-  jxl/enc_linalg.h
-  jxl/enc_modular.cc
-  jxl/enc_modular.h
-  jxl/enc_noise.cc
-  jxl/enc_noise.h
-  jxl/enc_optimize.h
-  jxl/enc_params.h
-  jxl/enc_patch_dictionary.cc
-  jxl/enc_patch_dictionary.h
-  jxl/enc_photon_noise.cc
-  jxl/enc_photon_noise.h
-  jxl/enc_progressive_split.cc
-  jxl/enc_progressive_split.h
-  jxl/enc_quant_weights.cc
-  jxl/enc_quant_weights.h
-  jxl/enc_splines.cc
-  jxl/enc_splines.h
-  jxl/enc_toc.cc
-  jxl/enc_toc.h
-  jxl/enc_transforms-inl.h
-  jxl/enc_transforms.cc
-  jxl/enc_transforms.h
-  jxl/enc_xyb.cc
-  jxl/enc_xyb.h
-  jxl/encode.cc
-  jxl/encode_internal.h
-  jxl/jpeg/enc_jpeg_data.cc
-  jxl/jpeg/enc_jpeg_data.h
-  jxl/jpeg/enc_jpeg_data_reader.cc
-  jxl/jpeg/enc_jpeg_data_reader.h
-  jxl/jpeg/enc_jpeg_huffman_decode.cc
-  jxl/jpeg/enc_jpeg_huffman_decode.h
-  jxl/modular/encoding/enc_debug_tree.cc
-  jxl/modular/encoding/enc_debug_tree.h
-  jxl/modular/encoding/enc_encoding.cc
-  jxl/modular/encoding/enc_encoding.h
-  jxl/modular/encoding/enc_ma.cc
-  jxl/modular/encoding/enc_ma.h
-  jxl/modular/transform/enc_palette.cc
-  jxl/modular/transform/enc_palette.h
-  jxl/modular/transform/enc_rct.cc
-  jxl/modular/transform/enc_rct.h
-  jxl/modular/transform/enc_squeeze.cc
-  jxl/modular/transform/enc_squeeze.h
-  jxl/modular/transform/enc_transform.cc
-  jxl/modular/transform/enc_transform.h
-)
-
-set(JPEGXL_INTERNAL_EXTRAS_FOR_TOOLS_SOURCES
-  extras/codec.cc
-  extras/codec.h
-  extras/hlg.cc
-  extras/hlg.h
-  extras/metrics.cc
-  extras/metrics.h
-  extras/packed_image_convert.cc
-  extras/packed_image_convert.h
-  extras/tone_mapping.cc
-  extras/tone_mapping.h
-)
-
-set(JPEGXL_INTERNAL_EXTRAS_SOURCES
-  extras/alpha_blend.cc
-  extras/alpha_blend.h
-  extras/common.cc
-  extras/common.h
-  extras/compressed_icc.cc
-  extras/dec/color_description.cc
-  extras/dec/color_description.h
-  extras/dec/color_hints.cc
-  extras/dec/color_hints.h
-  extras/dec/decode.cc
-  extras/dec/decode.h
-  extras/enc/encode.cc
-  extras/enc/encode.h
-  extras/exif.cc
-  extras/exif.h
-  extras/gain_map.cc
-  extras/mmap.cc
-  extras/mmap.h
-  extras/packed_image.h
-  extras/size_constraints.h
-  extras/time.cc
-  extras/time.h
-)
-
-set(JPEGXL_INTERNAL_GBENCH_SOURCES
-  extras/tone_mapping_gbench.cc
-  jxl/dec_external_image_gbench.cc
-  jxl/enc_external_image_gbench.cc
-  jxl/splines_gbench.cc
-  jxl/tf_gbench.cc
-)
-
-set(JPEGXL_INTERNAL_JPEGLI_LIBJPEG_HELPER_FILES
-  jpegli/libjpeg_test_util.cc
-  jpegli/libjpeg_test_util.h
-)
-
-set(JPEGXL_INTERNAL_JPEGLI_SOURCES
-  jpegli/adaptive_quantization.cc
-  jpegli/adaptive_quantization.h
-  jpegli/bit_writer.cc
-  jpegli/bit_writer.h
-  jpegli/bitstream.cc
-  jpegli/bitstream.h
-  jpegli/color_quantize.cc
-  jpegli/color_quantize.h
-  jpegli/color_transform.cc
-  jpegli/color_transform.h
-  jpegli/common.cc
-  jpegli/common.h
-  jpegli/common_internal.h
-  jpegli/dct-inl.h
-  jpegli/decode.cc
-  jpegli/decode.h
-  jpegli/decode_internal.h
-  jpegli/decode_marker.cc
-  jpegli/decode_marker.h
-  jpegli/decode_scan.cc
-  jpegli/decode_scan.h
-  jpegli/destination_manager.cc
-  jpegli/downsample.cc
-  jpegli/downsample.h
-  jpegli/encode.cc
-  jpegli/encode.h
-  jpegli/encode_finish.cc
-  jpegli/encode_finish.h
-  jpegli/encode_internal.h
-  jpegli/encode_streaming.cc
-  jpegli/encode_streaming.h
-  jpegli/entropy_coding-inl.h
-  jpegli/entropy_coding.cc
-  jpegli/entropy_coding.h
-  jpegli/error.cc
-  jpegli/error.h
-  jpegli/huffman.cc
-  jpegli/huffman.h
-  jpegli/idct.cc
-  jpegli/idct.h
-  jpegli/input.cc
-  jpegli/input.h
-  jpegli/memory_manager.cc
-  jpegli/memory_manager.h
-  jpegli/quant.cc
-  jpegli/quant.h
-  jpegli/render.cc
-  jpegli/render.h
-  jpegli/simd.cc
-  jpegli/simd.h
-  jpegli/source_manager.cc
-  jpegli/transpose-inl.h
-  jpegli/types.h
-  jpegli/upsample.cc
-  jpegli/upsample.h
-)
-
-set(JPEGXL_INTERNAL_JPEGLI_TESTLIB_FILES
-  jpegli/fuzztest.h
-  jpegli/test_params.h
-  jpegli/test_utils-inl.h
-  jpegli/test_utils.cc
-  jpegli/test_utils.h
-)
-
-set(JPEGXL_INTERNAL_JPEGLI_TESTS
-  jpegli/decode_api_test.cc
-  jpegli/encode_api_test.cc
-  jpegli/error_handling_test.cc
-  jpegli/input_suspension_test.cc
-  jpegli/output_suspension_test.cc
-  jpegli/source_manager_test.cc
-  jpegli/streaming_test.cc
-  jpegli/transcode_api_test.cc
-)
-
-set(JPEGXL_INTERNAL_JPEGLI_WRAPPER_SOURCES
-  jpegli/libjpeg_wrapper.cc
-)
-
-set(JPEGXL_INTERNAL_PUBLIC_HEADERS
-  include/jxl/cms.h
-  include/jxl/cms_interface.h
-  include/jxl/codestream_header.h
-  include/jxl/color_encoding.h
-  include/jxl/compressed_icc.h
-  include/jxl/decode.h
-  include/jxl/decode_cxx.h
-  include/jxl/encode.h
-  include/jxl/encode_cxx.h
-  include/jxl/gain_map.h
-  include/jxl/memory_manager.h
-  include/jxl/parallel_runner.h
-  include/jxl/stats.h
-  include/jxl/types.h
-)
-
-set(JPEGXL_INTERNAL_TESTLIB_FILES
-  jxl/dct_for_test.h
-  jxl/dec_transforms_testonly.cc
-  jxl/dec_transforms_testonly.h
-  jxl/fake_parallel_runner_testonly.h
-  jxl/fuzztest.h
-  jxl/image_test_utils.h
-  jxl/render_pipeline/test_render_pipeline_stages.h
-  jxl/test_image.cc
-  jxl/test_image.h
-  jxl/test_memory_manager.cc
-  jxl/test_memory_manager.h
-  jxl/test_utils.cc
-  jxl/test_utils.h
-)
-
-set(JPEGXL_INTERNAL_TESTS
-  extras/codec_test.cc
-  extras/compressed_icc_test.cc
-  extras/dec/color_description_test.cc
-  extras/dec/pgx_test.cc
-  extras/gain_map_test.cc
-  extras/jpegli_test.cc
-  jxl/ac_strategy_test.cc
-  jxl/alpha_test.cc
-  jxl/ans_common_test.cc
-  jxl/ans_test.cc
-  jxl/bit_reader_test.cc
-  jxl/bits_test.cc
-  jxl/blending_test.cc
-  jxl/butteraugli/butteraugli_test.cc
-  jxl/byte_order_test.cc
-  jxl/cms/tone_mapping_test.cc
-  jxl/cms/transfer_functions_test.cc
-  jxl/coeff_order_test.cc
-  jxl/color_encoding_internal_test.cc
-  jxl/color_management_test.cc
-  jxl/convolve_test.cc
-  jxl/data_parallel_test.cc
-  jxl/dct_test.cc
-  jxl/decode_test.cc
-  jxl/enc_external_image_test.cc
-  jxl/enc_gaborish_test.cc
-  jxl/enc_linalg_test.cc
-  jxl/enc_optimize_test.cc
-  jxl/enc_photon_noise_test.cc
-  jxl/encode_test.cc
-  jxl/entropy_coder_test.cc
-  jxl/fast_math_test.cc
-  jxl/fields_test.cc
-  jxl/gamma_correct_test.cc
-  jxl/gradient_test.cc
-  jxl/iaca_test.cc
-  jxl/icc_codec_test.cc
-  jxl/image_bundle_test.cc
-  jxl/image_ops_test.cc
-  jxl/jxl_test.cc
-  jxl/lehmer_code_test.cc
-  jxl/modular_test.cc
-  jxl/opsin_image_test.cc
-  jxl/opsin_inverse_test.cc
-  jxl/padded_bytes_test.cc
-  jxl/passes_test.cc
-  jxl/patch_dictionary_test.cc
-  jxl/preview_test.cc
-  jxl/quant_weights_test.cc
-  jxl/quantizer_test.cc
-  jxl/rational_polynomial_test.cc
-  jxl/render_pipeline/render_pipeline_test.cc
-  jxl/roundtrip_test.cc
-  jxl/simd_util_test.cc
-  jxl/speed_tier_test.cc
-  jxl/splines_test.cc
-  jxl/toc_test.cc
-  jxl/xorshift128plus_test.cc
-  threads/thread_parallel_runner_test.cc
-)
-
-set(JPEGXL_INTERNAL_THREADS_PUBLIC_HEADERS
-  include/jxl/resizable_parallel_runner.h
-  include/jxl/resizable_parallel_runner_cxx.h
-  include/jxl/thread_parallel_runner.h
-  include/jxl/thread_parallel_runner_cxx.h
-)
-
-set(JPEGXL_INTERNAL_THREADS_SOURCES
-  threads/resizable_parallel_runner.cc
-  threads/thread_parallel_runner.cc
-  threads/thread_parallel_runner_internal.cc
-  threads/thread_parallel_runner_internal.h
-)
diff --git a/third_party/jpeg-xl/lib/jxl_tests.cmake b/third_party/jpeg-xl/lib/jxl_tests.cmake
deleted file mode 100644
index 88ffde8a6913a..0000000000000
--- a/third_party/jpeg-xl/lib/jxl_tests.cmake
+++ /dev/null
@@ -1,96 +0,0 @@
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include(jxl_lists.cmake)
-
-if(BUILD_TESTING OR JPEGXL_ENABLE_TOOLS)
-# Library with test-only code shared between all tests / fuzzers.
-add_library(jxl_testlib-internal STATIC ${JPEGXL_INTERNAL_TESTLIB_FILES})
-target_compile_options(jxl_testlib-internal PRIVATE
-  ${JPEGXL_INTERNAL_FLAGS}
-  ${JPEGXL_COVERAGE_FLAGS}
-)
-target_compile_definitions(jxl_testlib-internal PUBLIC
-  -DTEST_DATA_PATH="${JPEGXL_TEST_DATA_PATH}")
-target_include_directories(jxl_testlib-internal PUBLIC
-  "${PROJECT_SOURCE_DIR}"
-)
-target_link_libraries(jxl_testlib-internal
-  hwy
-  jxl-internal
-  jxl_threads
-)
-endif()
-
-if(NOT BUILD_TESTING)
-  return()
-endif()
-
-list(APPEND JPEGXL_INTERNAL_TESTS
-  # TODO(deymo): Move this to tools/
-  ../tools/djxl_fuzzer_test.cc
-  ../tools/gauss_blur_test.cc
-)
-
-find_package(GTest)
-
-set(JXL_WASM_TEST_LINK_FLAGS "")
-if (EMSCRIPTEN)
-  # The emscripten linking step takes too much memory and crashes during the
-  # wasm-opt step when using -O2 optimization level
-  set(JXL_WASM_TEST_LINK_FLAGS "\
-    -O1 \
-    -s USE_LIBPNG=1 \
-    -s ALLOW_MEMORY_GROWTH=1 \
-    -s SINGLE_FILE=1 \
-    -s EXIT_RUNTIME=1 \
-    -s NODERAWFS=1 \
-  ")
-  if (JPEGXL_ENABLE_WASM_THREADS)
-    set(JXL_WASM_TEST_LINK_FLAGS "${JXL_WASM_TEST_LINK_FLAGS} \
-      -s PROXY_TO_PTHREAD \
-      -s USE_PTHREADS=1 \
-    ")
-  endif()
-endif()  # EMSCRIPTEN
-
-# Individual test binaries:
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tests)
-foreach (TESTFILE IN LISTS JPEGXL_INTERNAL_TESTS)
-  # The TESTNAME is the name without the extension or directory.
-  get_filename_component(TESTNAME ${TESTFILE} NAME_WE)
-  if(TESTFILE STREQUAL ../tools/djxl_fuzzer_test.cc)
-    add_executable(${TESTNAME} ${TESTFILE} ../tools/djxl_fuzzer.cc)
-    target_link_libraries(${TESTNAME} jxl_tool)
-  else()
-    add_executable(${TESTNAME} ${TESTFILE})
-  endif()
-  if(EMSCRIPTEN)
-    set_target_properties(${TESTNAME} PROPERTIES LINK_FLAGS "${JXL_WASM_TEST_LINK_FLAGS}")
-  else()
-    set_target_properties(${TESTNAME} PROPERTIES LINK_FLAGS "${JPEGXL_COVERAGE_LINK_FLAGS}")
-  endif()
-  target_compile_options(${TESTNAME} PRIVATE
-    ${JPEGXL_INTERNAL_FLAGS}
-    # Add coverage flags to the test binary so code in the private headers of
-    # the library is also instrumented when running tests that execute it.
-    ${JPEGXL_COVERAGE_FLAGS}
-  )
-  target_link_libraries(${TESTNAME}
-    GTest::GTest
-    GTest::Main
-    jxl_testlib-internal
-    jxl_extras-internal
-  )
-  if(TESTFILE STREQUAL ../tools/gauss_blur_test.cc)
-    target_link_libraries(${TESTNAME} jxl_gauss_blur)
-  endif()
-
-  # Output test targets in the test directory.
-  set_target_properties(${TESTNAME} PROPERTIES PREFIX "tests/")
-  if (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set_target_properties(${TESTNAME} PROPERTIES COMPILE_FLAGS "-Wno-error")
-  endif ()
-  # 240 seconds because some build types (e.g. coverage) can be quite slow.
-  gtest_discover_tests(${TESTNAME} DISCOVERY_TIMEOUT 240)
-endforeach ()
diff --git a/third_party/jpeg-xl/lib/jxl_threads.cmake b/third_party/jpeg-xl/lib/jxl_threads.cmake
deleted file mode 100644
index 43552fc0d04ad..0000000000000
--- a/third_party/jpeg-xl/lib/jxl_threads.cmake
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-find_package(Threads REQUIRED)
-
-include(jxl_lists.cmake)
-
-add_library(jxl_threads ${JPEGXL_INTERNAL_THREADS_SOURCES})
-target_compile_options(jxl_threads PRIVATE ${JPEGXL_INTERNAL_FLAGS})
-target_compile_options(jxl_threads PUBLIC ${JPEGXL_COVERAGE_FLAGS})
-set_property(TARGET jxl_threads PROPERTY POSITION_INDEPENDENT_CODE ON)
-
-target_include_directories(jxl_threads
-  PRIVATE
-    "${PROJECT_SOURCE_DIR}"
-  PUBLIC
-    "${CMAKE_CURRENT_SOURCE_DIR}/include"
-    "${CMAKE_CURRENT_BINARY_DIR}/include")
-
-target_link_libraries(jxl_threads
-  PUBLIC ${JPEGXL_COVERAGE_FLAGS} Threads::Threads
-)
-
-set_target_properties(jxl_threads PROPERTIES
-  CXX_VISIBILITY_PRESET hidden
-  VISIBILITY_INLINES_HIDDEN 1
-  DEFINE_SYMBOL JXL_THREADS_INTERNAL_LIBRARY_BUILD
-)
-
-install(TARGETS jxl_threads
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-set_target_properties(jxl_threads PROPERTIES
-  VERSION ${JPEGXL_LIBRARY_VERSION}
-  SOVERSION ${JPEGXL_LIBRARY_SOVERSION})
-
-set_target_properties(jxl_threads PROPERTIES
-    LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/jxl/jxl.version)
-if(APPLE)
-  set_property(TARGET ${target} APPEND_STRING PROPERTY
-      LINK_FLAGS "-Wl,-exported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/jxl/jxl_osx.syms")
-elseif(WIN32)
-# Nothing needed here, we use __declspec(dllexport) (jxl_threads_export.h)
-else()
-  set_property(TARGET jxl_threads APPEND_STRING PROPERTY
-      LINK_FLAGS " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/jxl/jxl.version")
-endif()  # APPLE
-
-# Compile the shared library such that the JXL_THREADS_EXPORT symbols are
-# exported. Users of the library will not set this flag and therefore import
-# those symbols.
-target_compile_definitions(jxl_threads
-  PRIVATE -DJXL_THREADS_INTERNAL_LIBRARY_BUILD)
-
-generate_export_header(jxl_threads
-  BASE_NAME JXL_THREADS
-  EXPORT_FILE_NAME include/jxl/jxl_threads_export.h)
-# Place all public headers in a single directory.
-foreach(path ${JPEGXL_INTERNAL_THREADS_PUBLIC_HEADERS})
-  configure_file(
-    ${path}
-    ${path}
-    COPYONLY
-  )
-endforeach()
-
-### Add a pkg-config file for libjxl_threads.
-
-# Allow adding prefix if CMAKE_INSTALL_INCLUDEDIR not absolute.
-if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
-    set(PKGCONFIG_TARGET_INCLUDES "${CMAKE_INSTALL_INCLUDEDIR}")
-else()
-    set(PKGCONFIG_TARGET_INCLUDES "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
-endif()
-# Allow adding prefix if CMAKE_INSTALL_LIBDIR not absolute.
-if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
-    set(PKGCONFIG_TARGET_LIBS "${CMAKE_INSTALL_LIBDIR}")
-else()
-    set(PKGCONFIG_TARGET_LIBS "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
-endif()
-
-if (BUILD_SHARED_LIBS)
-  set(JPEGXL_REQUIRES_TYPE "Requires.private")
-else()
-  set(JPEGXL_REQUIRES_TYPE "Requires")
-endif()
-
-set(JPEGXL_THREADS_LIBRARY_REQUIRES "")
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/threads/libjxl_threads.pc.in"
-               "libjxl_threads.pc" @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libjxl_threads.pc"
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
diff --git a/third_party/jpeg-xl/lib/jxl_vars.bzl b/third_party/jpeg-xl/lib/jxl_vars.bzl
deleted file mode 100644
index fb00f6e34cb4c..0000000000000
--- a/third_party/jpeg-xl/lib/jxl_vars.bzl
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# Extra build variables.
-
-libjxl_root_package = "libjxl"
-
-libjxl_deps_brotli = ["@brotli//:brotlidec", "@brotli//:brotlienc"]
-libjxl_deps_exr = ["@openexr//:OpenEXR"]
-libjxl_deps_gif = ["@giflib//:giflib"]
-libjxl_deps_gtest = ["@googletest//:gtest_main"]
-libjxl_deps_hwy = ["@highway//:hwy"]
-libjxl_deps_hwy_nanobenchmark = ["@highway//:nanobenchmark"]
-libjxl_deps_hwy_test_util = ["@highway//:hwy_test_util"]
-libjxl_deps_jpeg = ["@libjpeg_turbo//:jpeg"]
-libjxl_deps_png = ["@libpng//:png"]
-libjxl_deps_runfiles = ["@bazel_tools//tools/cpp/runfiles"]
-libjxl_deps_skcms = ["@skcms//:skcms"]
-libjxl_deps_testdata = ["//:testdata"]
-libjxl_deps_webp = ["@libwebp//:webp"]
-
-libjxl_test_shards = {
-    "jpegli/decode_api_test": 10,
-    "jpegli/encode_api_test": 4,
-    "jpegli/input_suspension_test": 6,
-    "jpegli/output_suspension_test": 2,
-    "jxl/ans_test": 2,
-    "jxl/linalg_test": 2,
-    "jxl/modular_test": 4,
-    "jxl/roundtrip_test": 4,
-    "jxl/xorshift128plus_test": 2,
-    "jxl/ac_strategy_test": 10,  # TODO(eustas): separate heavy shard
-    "jxl/dct_test": 32,
-    "jxl/decode_test": 10,  # TODO(eustas): separate heavy shard
-    "jxl/fast_dct_test": 8,  # TODO(eustas): separate ultra-heavy shard
-    "jxl/fast_math_test": 10,  # TODO(eustas): separate heavy shard
-    "jxl/jxl_test": 10,  # TODO(eustas): separate heavy shard
-    "jxl/render_pipeline/render_pipeline_test": 10,
-}
-
-libjxl_test_timeouts = {
-    "jxl/fast_dct_test": "long",
-    "jxl/dct_test": "long",
-}
diff --git a/third_party/jpeg-xl/lib/nothing.cc b/third_party/jpeg-xl/lib/nothing.cc
deleted file mode 100644
index e65f587da6b33..0000000000000
--- a/third_party/jpeg-xl/lib/nothing.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Copyright (c) the JPEG XL Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style
- * license that can be found in the LICENSE file.
- */
-
-// Nothing at all. Just a compilation unit.
diff --git a/third_party/jpeg-xl/lib/threads/libjxl_threads.pc.in b/third_party/jpeg-xl/lib/threads/libjxl_threads.pc.in
deleted file mode 100644
index dfbaa3ffb54c7..0000000000000
--- a/third_party/jpeg-xl/lib/threads/libjxl_threads.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=@PKGCONFIG_TARGET_LIBS@
-includedir=@PKGCONFIG_TARGET_INCLUDES@
-
-Name: libjxl_threads
-Description: JPEG XL multi-thread runner using std::threads.
-Version: @JPEGXL_LIBRARY_VERSION@
-@JPEGXL_REQUIRES_TYPE@: @JPEGXL_THREADS_LIBRARY_REQUIRES@
-Libs: -L${libdir} -ljxl_threads
-Libs.private: -lm
-Cflags: -I${includedir}
-Cflags.private: -DJXL_THREADS_STATIC_DEFINE
diff --git a/third_party/jpeg-xl/lib/threads/resizable_parallel_runner.cc b/third_party/jpeg-xl/lib/threads/resizable_parallel_runner.cc
deleted file mode 100644
index 238ccbf20c14c..0000000000000
--- a/third_party/jpeg-xl/lib/threads/resizable_parallel_runner.cc
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/jxl_threads_export.h>
-#include <jxl/memory_manager.h>
-#include <jxl/parallel_runner.h>
-#include <jxl/resizable_parallel_runner.h>
-
-#include <algorithm>
-#include <atomic>
-#include <condition_variable>
-#include <cstddef>
-#include <cstdint>
-#include <mutex>
-#include <thread>
-#include <vector>
-
-namespace jpegxl {
-namespace {
-
-// A thread pool that allows changing the number of threads it runs. It also
-// runs tasks on the calling thread, which can work better on schedulers for
-// heterogeneous architectures.
-struct ResizeableParallelRunner {
-  void SetNumThreads(size_t num) {
-    if (num > 0) {
-      num -= 1;
-    }
-    {
-      std::unique_lock<std::mutex> l(state_mutex_);
-      num_desired_workers_ = num;
-      workers_can_proceed_.notify_all();
-    }
-    if (workers_.size() < num) {
-      for (size_t i = workers_.size(); i < num; i++) {
-        workers_.emplace_back([this, i]() { WorkerBody(i); });
-      }
-    }
-    if (workers_.size() > num) {
-      for (size_t i = num; i < workers_.size(); i++) {
-        workers_[i].join();
-      }
-      workers_.resize(num);
-    }
-  }
-
-  ~ResizeableParallelRunner() { SetNumThreads(0); }
-
-  JxlParallelRetCode Run(void* jxl_opaque, JxlParallelRunInit init,
-                         JxlParallelRunFunction func, uint32_t start,
-                         uint32_t end) {
-    if (start + 1 == end) {
-      JxlParallelRetCode ret = init(jxl_opaque, 1);
-      if (ret != 0) return ret;
-
-      func(jxl_opaque, start, 0);
-      return ret;
-    }
-
-    size_t num_workers = std::min<size_t>(workers_.size() + 1, end - start);
-    JxlParallelRetCode ret = init(jxl_opaque, num_workers);
-    if (ret != 0) {
-      return ret;
-    }
-
-    {
-      std::unique_lock<std::mutex> l(state_mutex_);
-      // Avoid waking up more workers than needed.
-      max_running_workers_ = end - start - 1;
-      next_task_ = start;
-      end_task_ = end;
-      func_ = func;
-      jxl_opaque_ = jxl_opaque;
-      work_available_ = true;
-      num_running_workers_++;
-      workers_can_proceed_.notify_all();
-    }
-
-    DequeueTasks(0);
-
-    while (true) {
-      std::unique_lock<std::mutex> l(state_mutex_);
-      if (num_running_workers_ == 0) break;
-      work_done_.wait(l);
-    }
-
-    return ret;
-  }
-
- private:
-  void WorkerBody(size_t worker_id) {
-    while (true) {
-      {
-        std::unique_lock<std::mutex> l(state_mutex_);
-        // Worker pool was reduced, resize down.
-        if (worker_id >= num_desired_workers_) {
-          return;
-        }
-        // Nothing to do this time.
-        if (!work_available_ || worker_id >= max_running_workers_) {
-          workers_can_proceed_.wait(l);
-          continue;
-        }
-        num_running_workers_++;
-      }
-      DequeueTasks(worker_id + 1);
-    }
-  }
-
-  void DequeueTasks(size_t thread_id) {
-    while (true) {
-      uint32_t task = next_task_++;
-      if (task >= end_task_) {
-        std::unique_lock<std::mutex> l(state_mutex_);
-        num_running_workers_--;
-        work_available_ = false;
-        if (num_running_workers_ == 0) {
-          work_done_.notify_all();
-        }
-        break;
-      }
-      func_(jxl_opaque_, task, thread_id);
-    }
-  }
-
-  // Checks when the worker has something to do, which can be one of:
-  // - quitting (when worker_id >= num_desired_workers_)
-  // - having work available for them (work_available_ is true and worker_id >=
-  // max_running_workers_)
-  std::condition_variable workers_can_proceed_;
-
-  // Workers are done, and the main thread can proceed (num_running_workers_ ==
-  // 0)
-  std::condition_variable work_done_;
-
-  std::vector<std::thread> workers_;
-
-  // Protects all the remaining variables, except for func_, jxl_opaque_ and
-  // end_task_ (for which only the write by the main thread is protected, and
-  // subsequent uses by workers happen-after it) and next_task_ (which is
-  // atomic).
-  std::mutex state_mutex_;
-
-  // Range of tasks still need to be done.
-  std::atomic<uint32_t> next_task_;
-  uint32_t end_task_;
-
-  // Function to run and its argument.
-  JxlParallelRunFunction func_;
-  void* jxl_opaque_;  // not owned
-
-  // Variables that control the workers:
-  // - work_available_ is set to true after a call to Run() and to false at the
-  // end of it.
-  // - num_desired_workers_ represents the number of workers that should be
-  // present.
-  // - max_running_workers_ represents the number of workers that should be
-  // executing tasks.
-  // - num_running_workers_ represents the number of workers that are executing
-  // tasks.
-  size_t num_desired_workers_ = 0;
-  size_t max_running_workers_ = 0;
-  size_t num_running_workers_ = 0;
-  bool work_available_ = false;
-};
-}  // namespace
-}  // namespace jpegxl
-
-extern "C" {
-JXL_THREADS_EXPORT JxlParallelRetCode JxlResizableParallelRunner(
-    void* runner_opaque, void* jpegxl_opaque, JxlParallelRunInit init,
-    JxlParallelRunFunction func, uint32_t start_range, uint32_t end_range) {
-  return static_cast<jpegxl::ResizeableParallelRunner*>(runner_opaque)
-      ->Run(jpegxl_opaque, init, func, start_range, end_range);
-}
-
-JXL_THREADS_EXPORT void* JxlResizableParallelRunnerCreate(
-    const JxlMemoryManager* memory_manager) {
-  return new jpegxl::ResizeableParallelRunner();
-}
-
-JXL_THREADS_EXPORT void JxlResizableParallelRunnerSetThreads(
-    void* runner_opaque, size_t num_threads) {
-  static_cast<jpegxl::ResizeableParallelRunner*>(runner_opaque)
-      ->SetNumThreads(num_threads);
-}
-
-JXL_THREADS_EXPORT void JxlResizableParallelRunnerDestroy(void* runner_opaque) {
-  delete static_cast<jpegxl::ResizeableParallelRunner*>(runner_opaque);
-}
-
-JXL_THREADS_EXPORT uint32_t
-JxlResizableParallelRunnerSuggestThreads(uint64_t xsize, uint64_t ysize) {
-  // ~one thread per group.
-  return std::min<uint64_t>(std::thread::hardware_concurrency(),
-                            xsize * ysize / (256 * 256));
-}
-}
diff --git a/third_party/jpeg-xl/lib/threads/thread_parallel_runner.cc b/third_party/jpeg-xl/lib/threads/thread_parallel_runner.cc
deleted file mode 100644
index 558c9dbe42303..0000000000000
--- a/third_party/jpeg-xl/lib/threads/thread_parallel_runner.cc
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/memory_manager.h>
-#include <jxl/parallel_runner.h>
-#include <jxl/thread_parallel_runner.h>
-#include <string.h>
-
-#include <cstdint>
-#include <cstdlib>
-#include <thread>
-
-#include "lib/threads/thread_parallel_runner_internal.h"
-
-namespace {
-
-// Default JxlMemoryManager using malloc and free for the jpegxl_threads
-// library. Same as the default JxlMemoryManager for the jpegxl library
-// itself.
-
-// Default alloc and free functions.
-void* ThreadMemoryManagerDefaultAlloc(void* opaque, size_t size) {
-  return malloc(size);
-}
-
-void ThreadMemoryManagerDefaultFree(void* opaque, void* address) {
-  free(address);
-}
-
-// Initializes the memory manager instance with the passed one. The
-// MemoryManager passed in |memory_manager| may be NULL or contain NULL
-// functions which will be initialized with the default ones. If either alloc
-// or free are NULL, then both must be NULL, otherwise this function returns an
-// error.
-bool ThreadMemoryManagerInit(JxlMemoryManager* self,
-                             const JxlMemoryManager* memory_manager) {
-  if (memory_manager) {
-    *self = *memory_manager;
-  } else {
-    memset(self, 0, sizeof(*self));
-  }
-  bool is_default_alloc = (self->alloc == nullptr);
-  bool is_default_free = (self->free == nullptr);
-  if (is_default_alloc != is_default_free) {
-    return false;
-  }
-  if (is_default_alloc) self->alloc = ThreadMemoryManagerDefaultAlloc;
-  if (is_default_free) self->free = ThreadMemoryManagerDefaultFree;
-
-  return true;
-}
-
-void* ThreadMemoryManagerAlloc(const JxlMemoryManager* memory_manager,
-                               size_t size) {
-  return memory_manager->alloc(memory_manager->opaque, size);
-}
-
-void ThreadMemoryManagerFree(const JxlMemoryManager* memory_manager,
-                             void* address) {
-  memory_manager->free(memory_manager->opaque, address);
-}
-
-}  // namespace
-
-JxlParallelRetCode JxlThreadParallelRunner(
-    void* runner_opaque, void* jpegxl_opaque, JxlParallelRunInit init,
-    JxlParallelRunFunction func, uint32_t start_range, uint32_t end_range) {
-  return jpegxl::ThreadParallelRunner::Runner(
-      runner_opaque, jpegxl_opaque, init, func, start_range, end_range);
-}
-
-/// Starts the given number of worker threads and blocks until they are ready.
-/// "num_worker_threads" defaults to one per hyperthread. If zero, all tasks
-/// run on the main thread.
-void* JxlThreadParallelRunnerCreate(const JxlMemoryManager* memory_manager,
-                                    size_t num_worker_threads) {
-  JxlMemoryManager local_memory_manager;
-  if (!ThreadMemoryManagerInit(&local_memory_manager, memory_manager))
-    return nullptr;
-
-  void* alloc = ThreadMemoryManagerAlloc(&local_memory_manager,
-                                         sizeof(jpegxl::ThreadParallelRunner));
-  if (!alloc) return nullptr;
-  // Placement new constructor on allocated memory
-  jpegxl::ThreadParallelRunner* runner =
-      new (alloc) jpegxl::ThreadParallelRunner(num_worker_threads);
-  runner->memory_manager = local_memory_manager;
-
-  return runner;
-}
-
-void JxlThreadParallelRunnerDestroy(void* runner_opaque) {
-  jpegxl::ThreadParallelRunner* runner =
-      reinterpret_cast<jpegxl::ThreadParallelRunner*>(runner_opaque);
-  if (runner) {
-    JxlMemoryManager local_memory_manager = runner->memory_manager;
-    // Call destructor directly since custom free function is used.
-    runner->~ThreadParallelRunner();
-    ThreadMemoryManagerFree(&local_memory_manager, runner);
-  }
-}
-
-// Get default value for num_worker_threads parameter of
-// InitJxlThreadParallelRunner.
-size_t JxlThreadParallelRunnerDefaultNumWorkerThreads() {
-  return std::thread::hardware_concurrency();
-}
diff --git a/third_party/jpeg-xl/lib/threads/thread_parallel_runner_internal.cc b/third_party/jpeg-xl/lib/threads/thread_parallel_runner_internal.cc
deleted file mode 100644
index 47b9e14b67818..0000000000000
--- a/third_party/jpeg-xl/lib/threads/thread_parallel_runner_internal.cc
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "lib/threads/thread_parallel_runner_internal.h"
-
-#include <jxl/parallel_runner.h>
-#include <jxl/types.h>
-
-#include <algorithm>
-#include <atomic>
-#include <cstddef>
-#include <cstdint>
-#include <mutex>
-#include <thread>
-
-#include "lib/jxl/base/compiler_specific.h"
-
-namespace jpegxl {
-
-// static
-JxlParallelRetCode ThreadParallelRunner::Runner(
-    void* runner_opaque, void* jpegxl_opaque, JxlParallelRunInit init,
-    JxlParallelRunFunction func, uint32_t start_range, uint32_t end_range) {
-  ThreadParallelRunner* self =
-      static_cast<ThreadParallelRunner*>(runner_opaque);
-  if (start_range > end_range) return JXL_PARALLEL_RET_RUNNER_ERROR;
-  if (start_range == end_range) return JXL_PARALLEL_RET_SUCCESS;
-
-  int ret = init(jpegxl_opaque, std::max<size_t>(self->num_worker_threads_, 1));
-  if (ret != JXL_PARALLEL_RET_SUCCESS) return ret;
-
-  // Use a sequential run when num_worker_threads_ is zero since we have no
-  // worker threads.
-  if (self->num_worker_threads_ == 0) {
-    const size_t thread = 0;
-    for (uint32_t task = start_range; task < end_range; ++task) {
-      func(jpegxl_opaque, task, thread);
-    }
-    return JXL_PARALLEL_RET_SUCCESS;
-  }
-
-  if (self->depth_.fetch_add(1, std::memory_order_acq_rel) != 0) {
-    return JXL_PARALLEL_RET_RUNNER_ERROR;  // Must not re-enter.
-  }
-
-  const WorkerCommand worker_command =
-      (static_cast<WorkerCommand>(start_range) << 32) + end_range;
-  // Ensure the inputs do not result in a reserved command.
-  if ((worker_command == kWorkerWait) || (worker_command == kWorkerOnce) ||
-      (worker_command == kWorkerExit)) {
-    return JXL_PARALLEL_RET_RUNNER_ERROR;
-  }
-
-  self->data_func_ = func;
-  self->jpegxl_opaque_ = jpegxl_opaque;
-  self->num_reserved_.store(0, std::memory_order_relaxed);
-
-  self->StartWorkers(worker_command);
-  self->WorkersReadyBarrier();
-
-  if (self->depth_.fetch_add(-1, std::memory_order_acq_rel) != 1) {
-    return JXL_PARALLEL_RET_RUNNER_ERROR;
-  }
-  return JXL_PARALLEL_RET_SUCCESS;
-}
-
-// static
-void ThreadParallelRunner::RunRange(ThreadParallelRunner* self,
-                                    const WorkerCommand command,
-                                    const int thread) {
-  const uint32_t begin = command >> 32;
-  const uint32_t end = command & 0xFFFFFFFF;
-  const uint32_t num_tasks = end - begin;
-  const uint32_t num_worker_threads = self->num_worker_threads_;
-
-  // OpenMP introduced several "schedule" strategies:
-  // "single" (static assignment of exactly one chunk per thread): slower.
-  // "dynamic" (allocates k tasks at a time): competitive for well-chosen k.
-  // "guided" (allocates k tasks, decreases k): computing k = remaining/n
-  //   is faster than halving k each iteration. We prefer this strategy
-  //   because it avoids user-specified parameters.
-
-  for (;;) {
-#if JXL_FALSE
-    // dynamic
-    const uint32_t my_size = std::max(num_tasks / (num_worker_threads * 4), 1);
-#else
-    // guided
-    const uint32_t num_reserved =
-        self->num_reserved_.load(std::memory_order_relaxed);
-    // It is possible that more tasks are reserved than ready to run.
-    const uint32_t num_remaining =
-        num_tasks - std::min(num_reserved, num_tasks);
-    const uint32_t my_size =
-        std::max(num_remaining / (num_worker_threads * 4), 1u);
-#endif
-    const uint32_t my_begin = begin + self->num_reserved_.fetch_add(
-                                          my_size, std::memory_order_relaxed);
-    const uint32_t my_end = std::min(my_begin + my_size, begin + num_tasks);
-    // Another thread already reserved the last task.
-    if (my_begin >= my_end) {
-      break;
-    }
-    for (uint32_t task = my_begin; task < my_end; ++task) {
-      self->data_func_(self->jpegxl_opaque_, task, thread);
-    }
-  }
-}
-
-// static
-void ThreadParallelRunner::ThreadFunc(ThreadParallelRunner* self,
-                                      const int thread) {
-  // Until kWorkerExit command received:
-  for (;;) {
-    std::unique_lock<std::mutex> lock(self->mutex_);
-    // Notify main thread that this thread is ready.
-    if (++self->workers_ready_ == self->num_threads_) {
-      self->workers_ready_cv_.notify_one();
-    }
-  RESUME_WAIT:
-    // Wait for a command.
-    self->worker_start_cv_.wait(lock);
-    const WorkerCommand command = self->worker_start_command_;
-    switch (command) {
-      case kWorkerWait:    // spurious wakeup:
-        goto RESUME_WAIT;  // lock still held, avoid incrementing ready.
-      case kWorkerOnce:
-        lock.unlock();
-        self->data_func_(self->jpegxl_opaque_, thread, thread);
-        break;
-      case kWorkerExit:
-        return;  // exits thread
-      default:
-        lock.unlock();
-        RunRange(self, command, thread);
-        break;
-    }
-  }
-}
-
-ThreadParallelRunner::ThreadParallelRunner(const int num_worker_threads)
-    : num_worker_threads_(num_worker_threads),
-      num_threads_(std::max(num_worker_threads, 1)) {
-  threads_.reserve(num_worker_threads_);
-
-  // Suppress "unused-private-field" warning.
-  (void)padding1;
-  (void)padding2;
-
-  // Safely handle spurious worker wakeups.
-  worker_start_command_ = kWorkerWait;
-
-  for (uint32_t i = 0; i < num_worker_threads_; ++i) {
-    threads_.emplace_back(ThreadFunc, this, i);
-  }
-
-  if (num_worker_threads_ != 0) {
-    WorkersReadyBarrier();
-  }
-}
-
-ThreadParallelRunner::~ThreadParallelRunner() {
-  if (num_worker_threads_ != 0) {
-    StartWorkers(kWorkerExit);
-  }
-
-  for (std::thread& thread : threads_) {
-    if (thread.joinable()) {
-      thread.join();
-    } else {
-#if JXL_IS_DEBUG_BUILD
-      JXL_PRINT_STACK_TRACE();
-      JXL_CRASH();
-#endif
-    }
-  }
-}
-}  // namespace jpegxl
diff --git a/third_party/jpeg-xl/lib/threads/thread_parallel_runner_internal.h b/third_party/jpeg-xl/lib/threads/thread_parallel_runner_internal.h
deleted file mode 100644
index a26d481360b4e..0000000000000
--- a/third_party/jpeg-xl/lib/threads/thread_parallel_runner_internal.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-//
-
-// C++ implementation using std::thread of a ::JxlParallelRunner.
-
-// The main class in this module, ThreadParallelRunner, implements a static
-// method ThreadParallelRunner::Runner than can be passed as a
-// JxlParallelRunner when using the JPEG XL library. This uses std::thread
-// internally and related synchronization functions. The number of threads
-// created is fixed at construction time and the threads are re-used for every
-// ThreadParallelRunner::Runner call. Only one concurrent Runner() call per
-// instance is allowed at a time.
-//
-// This is a scalable, lower-overhead thread pool runner, especially suitable
-// for data-parallel computations in the fork-join model, where clients need to
-// know when all tasks have completed.
-//
-// This thread pool can efficiently load-balance millions of tasks using an
-// atomic counter, thus avoiding per-task virtual or system calls. With 48
-// hyperthreads and 1M tasks that add to an atomic counter, overall runtime is
-// 10-20x higher when using std::async, and ~200x for a queue-based thread
-// pool.
-//
-// Usage:
-//   ThreadParallelRunner runner;
-//   JxlDecode(
-//       ... , &ThreadParallelRunner::Runner, static_cast<void*>(&runner));
-
-#ifndef LIB_THREADS_THREAD_PARALLEL_RUNNER_INTERNAL_H_
-#define LIB_THREADS_THREAD_PARALLEL_RUNNER_INTERNAL_H_
-
-#include <jxl/memory_manager.h>
-#include <jxl/parallel_runner.h>
-
-#include <atomic>
-#include <condition_variable>  //NOLINT
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>
-#include <mutex>               //NOLINT
-#include <thread>              //NOLINT
-#include <vector>
-
-namespace jpegxl {
-
-// Main helper class implementing the ::JxlParallelRunner interface.
-class ThreadParallelRunner {
- public:
-  // ::JxlParallelRunner interface.
-  static JxlParallelRetCode Runner(void* runner_opaque, void* jpegxl_opaque,
-                                   JxlParallelRunInit init,
-                                   JxlParallelRunFunction func,
-                                   uint32_t start_range, uint32_t end_range);
-
-  // Starts the given number of worker threads and blocks until they are ready.
-  // "num_worker_threads" defaults to one per hyperthread. If zero, all tasks
-  // run on the main thread.
-  explicit ThreadParallelRunner(
-      int num_worker_threads = std::thread::hardware_concurrency());
-
-  // Waits for all threads to exit.
-  ~ThreadParallelRunner();
-
-  // Returns maximum number of main/worker threads that may call Func. Useful
-  // for allocating per-thread storage.
-  size_t NumThreads() const { return num_threads_; }
-
-  // Runs func(thread, thread) on all thread(s) that may participate in Run.
-  // If NumThreads() == 0, runs on the main thread with thread == 0, otherwise
-  // concurrently called by each worker thread in [0, NumThreads()).
-  template <class Func>
-  void RunOnEachThread(const Func& func) {
-    if (num_worker_threads_ == 0) {
-      const int thread = 0;
-      func(thread, thread);
-      return;
-    }
-
-    data_func_ = reinterpret_cast<JxlParallelRunFunction>(&CallClosure<Func>);
-    jpegxl_opaque_ = const_cast<void*>(static_cast<const void*>(&func));
-    StartWorkers(kWorkerOnce);
-    WorkersReadyBarrier();
-  }
-
-  JxlMemoryManager memory_manager;
-
- private:
-  // After construction and between calls to Run, workers are "ready", i.e.
-  // waiting on worker_start_cv_. They are "started" by sending a "command"
-  // and notifying all worker_start_cv_ waiters. (That is why all workers
-  // must be ready/waiting - otherwise, the notification will not reach all of
-  // them and the main thread waits in vain for them to report readiness.)
-  using WorkerCommand = uint64_t;
-
-  // Special values; all others encode the begin/end parameters. Note that all
-  // these are no-op ranges (begin >= end) and therefore never used to encode
-  // ranges.
-  static constexpr WorkerCommand kWorkerWait = ~1ULL;
-  static constexpr WorkerCommand kWorkerOnce = ~2ULL;
-  static constexpr WorkerCommand kWorkerExit = ~3ULL;
-
-  // Calls f(task, thread). Used for type erasure of Func arguments. The
-  // signature must match JxlParallelRunFunction, hence a void* argument.
-  template <class Closure>
-  static void CallClosure(void* f, const uint32_t task, const size_t thread) {
-    (*reinterpret_cast<const Closure*>(f))(task, thread);
-  }
-
-  void WorkersReadyBarrier() {
-    std::unique_lock<std::mutex> lock(mutex_);
-    // Typically only a single iteration.
-    while (workers_ready_ != threads_.size()) {
-      workers_ready_cv_.wait(lock);
-    }
-    workers_ready_ = 0;
-
-    // Safely handle spurious worker wakeups.
-    worker_start_command_ = kWorkerWait;
-  }
-
-  // Precondition: all workers are ready.
-  void StartWorkers(const WorkerCommand worker_command) {
-    mutex_.lock();
-    worker_start_command_ = worker_command;
-    // Workers will need this lock, so release it before they wake up.
-    mutex_.unlock();
-    worker_start_cv_.notify_all();
-  }
-
-  // Attempts to reserve and perform some work from the global range of tasks,
-  // which is encoded within "command". Returns after all tasks are reserved.
-  static void RunRange(ThreadParallelRunner* self, WorkerCommand command,
-                       int thread);
-
-  static void ThreadFunc(ThreadParallelRunner* self, int thread);
-
-  // Unmodified after ctor, but cannot be const because we call thread::join().
-  std::vector<std::thread> threads_;
-
-  const uint32_t num_worker_threads_;  // == threads_.size()
-  const uint32_t num_threads_;
-
-  std::atomic<int> depth_{0};  // detects if Run is re-entered (not supported).
-
-  std::mutex mutex_;  // guards both cv and their variables.
-  std::condition_variable workers_ready_cv_;
-  uint32_t workers_ready_ = 0;
-  std::condition_variable worker_start_cv_;
-  WorkerCommand worker_start_command_;
-
-  // Written by main thread, read by workers (after mutex lock/unlock).
-  JxlParallelRunFunction data_func_;
-  void* jpegxl_opaque_;
-
-  // Updated by workers; padding avoids false sharing.
-  uint8_t padding1[64];
-  std::atomic<uint32_t> num_reserved_{0};
-  uint8_t padding2[64];
-};
-
-}  // namespace jpegxl
-
-#endif  // LIB_THREADS_THREAD_PARALLEL_RUNNER_INTERNAL_H_
diff --git a/third_party/jpeg-xl/lib/threads/thread_parallel_runner_test.cc b/third_party/jpeg-xl/lib/threads/thread_parallel_runner_test.cc
deleted file mode 100644
index 7da636c82f891..0000000000000
--- a/third_party/jpeg-xl/lib/threads/thread_parallel_runner_test.cc
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <algorithm>
-#include <atomic>
-#include <cstdint>
-#include <vector>
-
-#include "lib/jxl/base/data_parallel.h"
-#include "lib/jxl/base/status.h"
-#include "lib/jxl/test_utils.h"
-#include "lib/jxl/testing.h"
-
-using ::jxl::test::ThreadPoolForTests;
-
-namespace jpegxl {
-namespace {
-
-int PopulationCount(uint64_t bits) {
-  int num_set = 0;
-  while (bits != 0) {
-    num_set += bits & 1;
-    bits >>= 1;
-  }
-  return num_set;
-}
-
-// Ensures task parameter is in bounds, every parameter is reached,
-// pool can be reused (multiple consecutive Run calls), pool can be destroyed
-// (joining with its threads), num_threads=0 works (runs on current thread).
-TEST(ThreadParallelRunnerTest, TestPool) {
-  for (int num_threads = 0; num_threads <= 18; ++num_threads) {
-    ThreadPoolForTests pool(num_threads);
-    for (int num_tasks = 0; num_tasks < 32; ++num_tasks) {
-      std::vector<int> mementos(num_tasks);
-      for (int begin = 0; begin < 32; ++begin) {
-        std::fill(mementos.begin(), mementos.end(), 0);
-        const auto do_task = [begin, num_tasks, &mementos](
-                                 const int task,
-                                 const int thread) -> jxl::Status {
-          // Parameter is in the given range
-          EXPECT_GE(task, begin);
-          EXPECT_LT(task, begin + num_tasks);
-
-          // Store mementos to be sure we visited each task.
-          mementos.at(task - begin) = 1000 + task;
-          return true;
-        };
-        EXPECT_TRUE(RunOnPool(pool.get(), begin, begin + num_tasks,
-                              jxl::ThreadPool::NoInit, do_task, "TestPool"));
-        for (int task = begin; task < begin + num_tasks; ++task) {
-          EXPECT_EQ(1000 + task, mementos.at(task - begin));
-        }
-      }
-    }
-  }
-}
-
-// Verify "thread" parameter when processing few tasks.
-TEST(ThreadParallelRunnerTest, TestSmallAssignments) {
-  const int kMaxThreads = 8;
-  for (int num_threads = 1; num_threads <= kMaxThreads; ++num_threads) {
-    ThreadPoolForTests pool(num_threads);
-
-    // (Avoid mutex because it may perturb the worker thread scheduling)
-    std::atomic<uint64_t> id_bits{0};
-    std::atomic<int> num_calls{0};
-    const auto do_task = [&num_calls, num_threads, &id_bits](
-                             const int task, const int thread) -> jxl::Status {
-      num_calls.fetch_add(1, std::memory_order_relaxed);
-
-      EXPECT_LT(thread, num_threads);
-      uint64_t bits = id_bits.load(std::memory_order_relaxed);
-      while (!id_bits.compare_exchange_weak(bits, bits | (1ULL << thread))) {
-        // lock-free retry-loop
-      }
-      return true;
-    };
-    EXPECT_TRUE(RunOnPool(pool.get(), 0, num_threads, jxl::ThreadPool::NoInit,
-                          do_task, "TestSmallAssignments"));
-
-    // Correct number of tasks.
-    EXPECT_EQ(num_threads, num_calls.load());
-
-    const int num_participants = PopulationCount(id_bits.load());
-    // Can't expect equality because other workers may have woken up too late.
-    EXPECT_LE(num_participants, num_threads);
-  }
-}
-
-struct Counter {
-  Counter() {
-    // Suppress "unused-field" warning.
-    (void)padding;
-  }
-  void Assimilate(const Counter& victim) { counter += victim.counter; }
-  int counter = 0;
-  int padding[31];
-};
-
-TEST(ThreadParallelRunnerTest, TestCounter) {
-  const int kNumThreads = 12;
-  ThreadPoolForTests pool(kNumThreads);
-  alignas(128) Counter counters[kNumThreads];
-
-  const int kNumTasks = kNumThreads * 19;
-  const auto count = [&counters](const int task,
-                                 const int thread) -> jxl::Status {
-    counters[thread].counter += task;
-    return true;
-  };
-  EXPECT_TRUE(RunOnPool(pool.get(), 0, kNumTasks, jxl::ThreadPool::NoInit,
-                        count, "TestCounter"));
-
-  int expected = 0;
-  for (int i = 0; i < kNumTasks; ++i) {
-    expected += i;
-  }
-
-  for (int i = 1; i < kNumThreads; ++i) {
-    counters[0].Assimilate(counters[i]);
-  }
-  EXPECT_EQ(expected, counters[0].counter);
-}
-
-}  // namespace
-}  // namespace jpegxl
diff --git a/third_party/jpeg-xl/plugins/CMakeLists.txt b/third_party/jpeg-xl/plugins/CMakeLists.txt
deleted file mode 100644
index bff1bff29dff9..0000000000000
--- a/third_party/jpeg-xl/plugins/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-if(NOT MSVC)
-  option(JPEGXL_ENABLE_PLUGIN_GDKPIXBUF "Enable plugin for GdkPixbuf image loading library" ON)
-  if(JPEGXL_ENABLE_PLUGIN_GDKPIXBUF)
-    add_subdirectory(gdk-pixbuf)
-  endif()
-endif()
-
-option(JPEGXL_ENABLE_PLUGIN_GIMP210 "Enable plugin for GIMP 2.10.x series" ON)
-if(JPEGXL_ENABLE_PLUGIN_GIMP210)
-  add_subdirectory(gimp)
-endif()
-
-option(JPEGXL_ENABLE_PLUGIN_MIME "Enable image/jxl declaration for shared-mime-info" ON)
-if(JPEGXL_ENABLE_PLUGIN_MIME)
-  add_subdirectory(mime)
-endif()
diff --git a/third_party/jpeg-xl/plugins/gdk-pixbuf/CMakeLists.txt b/third_party/jpeg-xl/plugins/gdk-pixbuf/CMakeLists.txt
deleted file mode 100644
index 12c1a83753e1a..0000000000000
--- a/third_party/jpeg-xl/plugins/gdk-pixbuf/CMakeLists.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-find_package(PkgConfig)
-pkg_check_modules(Gdk-Pixbuf IMPORTED_TARGET gdk-pixbuf-2.0>=2.36)
-
-include(GNUInstallDirs)
-
-if (NOT Gdk-Pixbuf_FOUND)
-  message(WARNING "GDK Pixbuf development libraries not found, \
-                   the Gdk-Pixbuf plugin will not be built")
-  return ()
-endif ()
-
-add_library(pixbufloader-jxl MODULE pixbufloader-jxl.c)
-
-# Mark all symbols as hidden by default. The PkgConfig::Gdk-Pixbuf dependency
-# will cause fill_info and fill_vtable entry points to be made public.
-set_target_properties(pixbufloader-jxl PROPERTIES
-  CXX_VISIBILITY_PRESET hidden
-  VISIBILITY_INLINES_HIDDEN 1
-)
-
-# Note: This only needs the decoder library, but we don't install the decoder
-# shared library.
-target_link_libraries(pixbufloader-jxl jxl jxl_threads lcms2 PkgConfig::Gdk-Pixbuf)
-
-execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} gdk-pixbuf-2.0 --variable gdk_pixbuf_moduledir --define-variable=prefix=${CMAKE_INSTALL_PREFIX} OUTPUT_VARIABLE GDK_PIXBUF_MODULEDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
-install(TARGETS pixbufloader-jxl DESTINATION "${GDK_PIXBUF_MODULEDIR}")
-
-# Instead of the following, we might instead add the
-# mime type image/jxl to
-# /usr/share/thumbnailers/gdk-pixbuf-thumbnailer.thumbnailer
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/jxl.thumbnailer DESTINATION "${CMAKE_INSTALL_DATADIR}/thumbnailers/")
-
-if(BUILD_TESTING AND NOT CMAKE_CROSSCOMPILING)
-  pkg_check_modules(Gdk IMPORTED_TARGET gdk-2.0)
-  if (Gdk_FOUND)
-    # Test for loading a .jxl file using the pixbufloader library via GDK. This
-    # requires to have the image/jxl mime type and loader library configured,
-    # which we do in a fake environment in the CMAKE_CURRENT_BINARY_DIR.
-    add_executable(pixbufloader_test pixbufloader_test.cc)
-    target_link_libraries(pixbufloader_test PkgConfig::Gdk)
-
-    # Create a mime cache for test.
-    add_custom_command(
-      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/mime/mime.cache"
-      COMMAND env XDG_DATA_HOME=${CMAKE_CURRENT_BINARY_DIR}
-        xdg-mime install --novendor
-        "${CMAKE_SOURCE_DIR}/plugins/mime/image-jxl.xml"
-      DEPENDS "${CMAKE_SOURCE_DIR}/plugins/mime/image-jxl.xml"
-    )
-    add_custom_target(pixbufloader_test_mime
-      DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/mime/mime.cache"
-    )
-    add_dependencies(pixbufloader_test pixbufloader_test_mime)
-
-    # Use a fake X server to run the test if xvfb is installed.
-    find_program (XVFB_PROGRAM xvfb-run)
-    if(XVFB_PROGRAM)
-      set(XVFB_PROGRAM_PREFIX "${XVFB_PROGRAM};-a")
-    else()
-      set(XVFB_PROGRAM_PREFIX "")
-    endif()
-
-    # libX11.so and libgdk-x11-2.0.so are not compiled with MSAN -> report
-    # use-of-uninitialized-value for string some internal string value.
-    # TODO(eustas): investigate direct memory leak (32 bytes).
-    if (NOT (SANITIZER STREQUAL "msan") AND NOT (SANITIZER STREQUAL "asan"))
-      add_test(
-        NAME pixbufloader_test_jxl
-        COMMAND
-          ${XVFB_PROGRAM_PREFIX} $<TARGET_FILE:pixbufloader_test>
-          "${CMAKE_CURRENT_SOURCE_DIR}/loaders_test.cache"
-          "${JPEGXL_TEST_DATA_PATH}/jxl/blending/cropped_traffic_light.jxl"
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-      )
-      set_tests_properties(pixbufloader_test_jxl PROPERTIES SKIP_RETURN_CODE 254)
-    endif()
-  endif()  # Gdk_FOUND
-endif()  # BUILD_TESTING
diff --git a/third_party/jpeg-xl/plugins/gdk-pixbuf/README.md b/third_party/jpeg-xl/plugins/gdk-pixbuf/README.md
deleted file mode 100644
index 185919436fcd4..0000000000000
--- a/third_party/jpeg-xl/plugins/gdk-pixbuf/README.md
+++ /dev/null
@@ -1,50 +0,0 @@
-## JPEG XL GDK Pixbuf
-
-
-The plugin may already have been installed when following the instructions from the
-[Installing section of BUILDING.md](../../BUILDING.md#installing), in which case it should
-already be in the correct place, e.g.
-
-```/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jxl.so```
-
-Otherwise we can copy it manually:
-
-```bash
-sudo cp $your_build_directory/plugins/gdk-pixbuf/libpixbufloader-jxl.so /usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jxl.so
-```
-
-
-Then we need to update the cache, for example with:
-
-```bash
-sudo /usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache
-```
-
-In order to get thumbnails with this, first one has to add the jxl MIME type, see
-[../mime/README.md](../mime/README.md).
-
-Ensure that the thumbnailer file is installed in the correct place,
-`/usr/share/thumbnailers/jxl.thumbnailer` or `/usr/local/share/thumbnailers/jxl.thumbnailer`.
-
-The file should have been copied automatically when following the instructions
-in the [Installing section of README.md](../../README.md#installing), but
-otherwise it can be copied manually:
-
-```bash
-sudo cp plugins/gdk-pixbuf/jxl.thumbnailer /usr/local/share/thumbnailers/jxl.thumbnailer
-```
-
-Update the Mime database with
-```bash
-update-mime --local
-```
-or
-```bash
-sudo update-desktop-database
-```
-
-Then possibly delete the thumbnail cache with
-```bash
-rm -r ~/.cache/thumbnails
-```
-and restart the application displaying thumbnails, e.g. `nautilus -q` to display thumbnails.
diff --git a/third_party/jpeg-xl/plugins/gdk-pixbuf/jxl.thumbnailer b/third_party/jpeg-xl/plugins/gdk-pixbuf/jxl.thumbnailer
deleted file mode 100644
index 1bcaab61fcbd2..0000000000000
--- a/third_party/jpeg-xl/plugins/gdk-pixbuf/jxl.thumbnailer
+++ /dev/null
@@ -1,4 +0,0 @@
-[Thumbnailer Entry]
-TryExec=/usr/bin/gdk-pixbuf-thumbnailer
-Exec=/usr/bin/gdk-pixbuf-thumbnailer -s %s %u %o
-MimeType=image/jxl;
diff --git a/third_party/jpeg-xl/plugins/gdk-pixbuf/loaders_test.cache b/third_party/jpeg-xl/plugins/gdk-pixbuf/loaders_test.cache
deleted file mode 100644
index 95c62c8fc3224..0000000000000
--- a/third_party/jpeg-xl/plugins/gdk-pixbuf/loaders_test.cache
+++ /dev/null
@@ -1,16 +0,0 @@
-# GdkPixbuf Image Loader Modules file for testing
-# Automatically generated file, do not edit
-# Created by gdk-pixbuf-query-loaders from gdk-pixbuf-2.42.2
-#
-# Generated with:
-#  GDK_PIXBUF_MODULEDIR=`pwd`/build/plugins/gdk-pixbuf/ gdk-pixbuf-query-loaders
-#
-# Modified to use the library from the current working directory at runtime.
-"./libpixbufloader-jxl.so"
-"jxl" 4 "gdk-pixbuf" "JPEG XL image" "BSD-3"
-"image/jxl" ""
-"jxl" ""
-"\377\n" "  " 100
-"...\fJXL \r\n\207\n" "zzz         " 100
-
-
diff --git a/third_party/jpeg-xl/plugins/gdk-pixbuf/pixbufloader-jxl.c b/third_party/jpeg-xl/plugins/gdk-pixbuf/pixbufloader-jxl.c
deleted file mode 100644
index 6a0de0486b1a0..0000000000000
--- a/third_party/jpeg-xl/plugins/gdk-pixbuf/pixbufloader-jxl.c
+++ /dev/null
@@ -1,781 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <jxl/codestream_header.h>
-#include <jxl/decode.h>
-#include <jxl/encode.h>
-#include <jxl/resizable_parallel_runner.h>
-#include <jxl/types.h>
-
-#define GDK_PIXBUF_ENABLE_BACKEND
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#undef GDK_PIXBUF_ENABLE_BACKEND
-
-G_BEGIN_DECLS
-
-// Information about a single frame.
-typedef struct {
-  uint64_t duration_ms;
-  GdkPixbuf *data;
-  gboolean decoded;
-} GdkPixbufJxlAnimationFrame;
-
-// Represent a whole JPEG XL animation; all its fields are owned; as a GObject,
-// the Animation struct itself is reference counted (as are the GdkPixbufs for
-// individual frames).
-struct _GdkPixbufJxlAnimation {
-  GdkPixbufAnimation parent_instance;
-
-  // GDK interface implementation callbacks.
-  GdkPixbufModuleSizeFunc image_size_callback;
-  GdkPixbufModulePreparedFunc pixbuf_prepared_callback;
-  GdkPixbufModuleUpdatedFunc area_updated_callback;
-  gpointer user_data;
-
-  // All frames known so far; a frame is added when the JXL_DEC_FRAME event is
-  // received from the decoder; initially frame.decoded is FALSE, until
-  // the JXL_DEC_IMAGE event is received.
-  GArray *frames;
-
-  // JPEG XL decoder and related structures.
-  JxlParallelRunner *parallel_runner;
-  JxlDecoder *decoder;
-  JxlPixelFormat pixel_format;
-
-  // Decoding is `done` when JXL_DEC_SUCCESS is received; calling
-  // load_increment afterwards gives an error.
-  gboolean done;
-
-  // Image information.
-  size_t xsize;
-  size_t ysize;
-  gboolean alpha_premultiplied;
-  gboolean has_animation;
-  gboolean has_alpha;
-  uint64_t total_duration_ms;
-  uint64_t tick_duration_us;
-  uint64_t repetition_count;  // 0 = loop forever
-
-  gchar *icc_base64;
-};
-
-#define GDK_TYPE_PIXBUF_JXL_ANIMATION (gdk_pixbuf_jxl_animation_get_type())
-G_DECLARE_FINAL_TYPE(GdkPixbufJxlAnimation, gdk_pixbuf_jxl_animation, GDK,
-                     JXL_ANIMATION, GdkPixbufAnimation);
-
-G_DEFINE_TYPE(GdkPixbufJxlAnimation, gdk_pixbuf_jxl_animation,
-              GDK_TYPE_PIXBUF_ANIMATION);
-
-// Iterator to a given point in time in the animation; contains a pointer to the
-// full animation.
-struct _GdkPixbufJxlAnimationIter {
-  GdkPixbufAnimationIter parent_instance;
-  GdkPixbufJxlAnimation *animation;
-  size_t current_frame;
-  uint64_t time_offset;
-};
-
-#define GDK_TYPE_PIXBUF_JXL_ANIMATION_ITER \
-  (gdk_pixbuf_jxl_animation_iter_get_type())
-G_DECLARE_FINAL_TYPE(GdkPixbufJxlAnimationIter, gdk_pixbuf_jxl_animation_iter,
-                     GDK, JXL_ANIMATION_ITER, GdkPixbufAnimationIter);
-G_DEFINE_TYPE(GdkPixbufJxlAnimationIter, gdk_pixbuf_jxl_animation_iter,
-              GDK_TYPE_PIXBUF_ANIMATION_ITER);
-
-static void gdk_pixbuf_jxl_animation_init(GdkPixbufJxlAnimation *obj) {
-  // Suppress "unused function" warnings.
-  (void)glib_autoptr_cleanup_GdkPixbufJxlAnimation;
-  (void)GDK_JXL_ANIMATION;
-  (void)GDK_IS_JXL_ANIMATION;
-}
-
-static gboolean gdk_pixbuf_jxl_animation_is_static_image(
-    GdkPixbufAnimation *anim) {
-  GdkPixbufJxlAnimation *jxl_anim = (GdkPixbufJxlAnimation *)anim;
-  return !jxl_anim->has_animation;
-}
-
-static GdkPixbuf *gdk_pixbuf_jxl_animation_get_static_image(
-    GdkPixbufAnimation *anim) {
-  GdkPixbufJxlAnimation *jxl_anim = (GdkPixbufJxlAnimation *)anim;
-  if (jxl_anim->frames == NULL || jxl_anim->frames->len == 0) return NULL;
-  GdkPixbufJxlAnimationFrame *frame =
-      &g_array_index(jxl_anim->frames, GdkPixbufJxlAnimationFrame, 0);
-  return frame->decoded ? frame->data : NULL;
-}
-
-static void gdk_pixbuf_jxl_animation_get_size(GdkPixbufAnimation *anim,
-                                              int *width, int *height) {
-  GdkPixbufJxlAnimation *jxl_anim = (GdkPixbufJxlAnimation *)anim;
-  if (width) *width = jxl_anim->xsize;
-  if (height) *height = jxl_anim->ysize;
-}
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-static gboolean gdk_pixbuf_jxl_animation_iter_advance(
-    GdkPixbufAnimationIter *iter, const GTimeVal *current_time);
-
-static GdkPixbufAnimationIter *gdk_pixbuf_jxl_animation_get_iter(
-    GdkPixbufAnimation *anim, const GTimeVal *start_time) {
-  GdkPixbufJxlAnimationIter *iter =
-      g_object_new(GDK_TYPE_PIXBUF_JXL_ANIMATION_ITER, NULL);
-  iter->animation = (GdkPixbufJxlAnimation *)anim;
-  iter->time_offset = start_time->tv_sec * 1000ULL + start_time->tv_usec / 1000;
-  g_object_ref(iter->animation);
-  gdk_pixbuf_jxl_animation_iter_advance((GdkPixbufAnimationIter *)iter,
-                                        start_time);
-  return (GdkPixbufAnimationIter *)iter;
-}
-G_GNUC_END_IGNORE_DEPRECATIONS
-
-static void gdk_pixbuf_jxl_animation_finalize(GObject *obj) {
-  GdkPixbufJxlAnimation *decoder_state = (GdkPixbufJxlAnimation *)obj;
-  if (decoder_state->frames != NULL) {
-    for (size_t i = 0; i < decoder_state->frames->len; i++) {
-      g_object_unref(
-          g_array_index(decoder_state->frames, GdkPixbufJxlAnimationFrame, i)
-              .data);
-    }
-    g_array_free(decoder_state->frames, /*free_segment=*/TRUE);
-  }
-  JxlResizableParallelRunnerDestroy(decoder_state->parallel_runner);
-  JxlDecoderDestroy(decoder_state->decoder);
-  g_free(decoder_state->icc_base64);
-}
-
-static void gdk_pixbuf_jxl_animation_class_init(
-    GdkPixbufJxlAnimationClass *klass) {
-  G_OBJECT_CLASS(klass)->finalize = gdk_pixbuf_jxl_animation_finalize;
-  klass->parent_class.is_static_image =
-      gdk_pixbuf_jxl_animation_is_static_image;
-  klass->parent_class.get_static_image =
-      gdk_pixbuf_jxl_animation_get_static_image;
-  klass->parent_class.get_size = gdk_pixbuf_jxl_animation_get_size;
-  klass->parent_class.get_iter = gdk_pixbuf_jxl_animation_get_iter;
-}
-
-static void gdk_pixbuf_jxl_animation_iter_init(GdkPixbufJxlAnimationIter *obj) {
-  (void)glib_autoptr_cleanup_GdkPixbufJxlAnimationIter;
-  (void)GDK_JXL_ANIMATION_ITER;
-  (void)GDK_IS_JXL_ANIMATION_ITER;
-}
-
-static int gdk_pixbuf_jxl_animation_iter_get_delay_time(
-    GdkPixbufAnimationIter *iter) {
-  GdkPixbufJxlAnimationIter *jxl_iter = (GdkPixbufJxlAnimationIter *)iter;
-  if (jxl_iter->animation->frames->len <= jxl_iter->current_frame) {
-    return 0;
-  }
-  return g_array_index(jxl_iter->animation->frames, GdkPixbufJxlAnimationFrame,
-                       jxl_iter->current_frame)
-      .duration_ms;
-}
-
-static GdkPixbuf *gdk_pixbuf_jxl_animation_iter_get_pixbuf(
-    GdkPixbufAnimationIter *iter) {
-  GdkPixbufJxlAnimationIter *jxl_iter = (GdkPixbufJxlAnimationIter *)iter;
-  if (jxl_iter->animation->frames->len <= jxl_iter->current_frame) {
-    return NULL;
-  }
-  return g_array_index(jxl_iter->animation->frames, GdkPixbufJxlAnimationFrame,
-                       jxl_iter->current_frame)
-      .data;
-}
-
-static gboolean gdk_pixbuf_jxl_animation_iter_on_currently_loading_frame(
-    GdkPixbufAnimationIter *iter) {
-  GdkPixbufJxlAnimationIter *jxl_iter = (GdkPixbufJxlAnimationIter *)iter;
-  if (jxl_iter->animation->frames->len <= jxl_iter->current_frame) {
-    return TRUE;
-  }
-  return !g_array_index(jxl_iter->animation->frames, GdkPixbufJxlAnimationFrame,
-                        jxl_iter->current_frame)
-              .decoded;
-}
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-static gboolean gdk_pixbuf_jxl_animation_iter_advance(
-    GdkPixbufAnimationIter *iter, const GTimeVal *current_time) {
-  GdkPixbufJxlAnimationIter *jxl_iter = (GdkPixbufJxlAnimationIter *)iter;
-  size_t old_frame = jxl_iter->current_frame;
-
-  uint64_t current_time_ms = current_time->tv_sec * 1000ULL +
-                             current_time->tv_usec / 1000 -
-                             jxl_iter->time_offset;
-
-  if (jxl_iter->animation->frames->len == 0) {
-    jxl_iter->current_frame = 0;
-  } else if (!jxl_iter->animation->done &&
-             current_time_ms >= jxl_iter->animation->total_duration_ms) {
-    jxl_iter->current_frame = jxl_iter->animation->frames->len - 1;
-  } else if (jxl_iter->animation->repetition_count != 0 &&
-             current_time_ms > jxl_iter->animation->repetition_count *
-                                   jxl_iter->animation->total_duration_ms) {
-    jxl_iter->current_frame = jxl_iter->animation->frames->len - 1;
-  } else {
-    uint64_t total_duration_ms = jxl_iter->animation->total_duration_ms;
-    // Guard against divide-by-0 in malicious files.
-    if (total_duration_ms == 0) total_duration_ms = 1;
-    uint64_t loop_offset = current_time_ms % total_duration_ms;
-    jxl_iter->current_frame = 0;
-    while (TRUE) {
-      uint64_t duration =
-          g_array_index(jxl_iter->animation->frames, GdkPixbufJxlAnimationFrame,
-                        jxl_iter->current_frame)
-              .duration_ms;
-      if (duration >= loop_offset) {
-        break;
-      }
-      loop_offset -= duration;
-      jxl_iter->current_frame++;
-    }
-  }
-
-  return old_frame != jxl_iter->current_frame;
-}
-G_GNUC_END_IGNORE_DEPRECATIONS
-
-static void gdk_pixbuf_jxl_animation_iter_finalize(GObject *obj) {
-  GdkPixbufJxlAnimationIter *iter = (GdkPixbufJxlAnimationIter *)obj;
-  g_object_unref(iter->animation);
-}
-
-static void gdk_pixbuf_jxl_animation_iter_class_init(
-    GdkPixbufJxlAnimationIterClass *klass) {
-  G_OBJECT_CLASS(klass)->finalize = gdk_pixbuf_jxl_animation_iter_finalize;
-  klass->parent_class.get_delay_time =
-      gdk_pixbuf_jxl_animation_iter_get_delay_time;
-  klass->parent_class.get_pixbuf = gdk_pixbuf_jxl_animation_iter_get_pixbuf;
-  klass->parent_class.on_currently_loading_frame =
-      gdk_pixbuf_jxl_animation_iter_on_currently_loading_frame;
-  klass->parent_class.advance = gdk_pixbuf_jxl_animation_iter_advance;
-}
-
-G_END_DECLS
-
-static gpointer begin_load(GdkPixbufModuleSizeFunc size_func,
-                           GdkPixbufModulePreparedFunc prepare_func,
-                           GdkPixbufModuleUpdatedFunc update_func,
-                           gpointer user_data, GError **error) {
-  GdkPixbufJxlAnimation *decoder_state =
-      g_object_new(GDK_TYPE_PIXBUF_JXL_ANIMATION, NULL);
-  if (decoder_state == NULL) {
-    g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                "Creation of the animation state failed");
-    return NULL;
-  }
-  decoder_state->image_size_callback = size_func;
-  decoder_state->pixbuf_prepared_callback = prepare_func;
-  decoder_state->area_updated_callback = update_func;
-  decoder_state->user_data = user_data;
-  decoder_state->frames =
-      g_array_new(/*zero_terminated=*/FALSE, /*clear_=*/TRUE,
-                  sizeof(GdkPixbufJxlAnimationFrame));
-
-  if (decoder_state->frames == NULL) {
-    g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                "Creation of the frame array failed");
-    goto cleanup;
-  }
-
-  if (!(decoder_state->parallel_runner =
-            JxlResizableParallelRunnerCreate(NULL))) {
-    g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                "Creation of the JXL parallel runner failed");
-    goto cleanup;
-  }
-
-  if (!(decoder_state->decoder = JxlDecoderCreate(NULL))) {
-    g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                "Creation of the JXL decoder failed");
-    goto cleanup;
-  }
-
-  JxlDecoderStatus status;
-
-  if ((status = JxlDecoderSetParallelRunner(
-           decoder_state->decoder, JxlResizableParallelRunner,
-           decoder_state->parallel_runner)) != JXL_DEC_SUCCESS) {
-    g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                "JxlDecoderSetParallelRunner failed: %x", status);
-    goto cleanup;
-  }
-  if ((status = JxlDecoderSubscribeEvents(
-           decoder_state->decoder, JXL_DEC_BASIC_INFO | JXL_DEC_COLOR_ENCODING |
-                                       JXL_DEC_FULL_IMAGE | JXL_DEC_FRAME)) !=
-      JXL_DEC_SUCCESS) {
-    g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                "JxlDecoderSubscribeEvents failed: %x", status);
-    goto cleanup;
-  }
-
-  decoder_state->pixel_format.data_type = JXL_TYPE_FLOAT;
-  decoder_state->pixel_format.endianness = JXL_NATIVE_ENDIAN;
-
-  return decoder_state;
-cleanup:
-  JxlResizableParallelRunnerDestroy(decoder_state->parallel_runner);
-  JxlDecoderDestroy(decoder_state->decoder);
-  g_object_unref(decoder_state);
-  return NULL;
-}
-
-static gboolean stop_load(gpointer context, GError **error) {
-  g_object_unref(context);
-  return TRUE;
-}
-
-static gboolean load_increment(gpointer context, const guchar *buf, guint size,
-                               GError **error) {
-  GdkPixbufJxlAnimation *decoder_state = context;
-  if (decoder_state->done == TRUE) {
-    g_warning_once("Trailing data found at end of JXL file");
-    return TRUE;
-  }
-
-  JxlDecoderStatus status;
-
-  if ((status = JxlDecoderSetInput(decoder_state->decoder, buf, size)) !=
-      JXL_DEC_SUCCESS) {
-    // Should never happen if things are done properly.
-    g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                "JXL decoder logic error: %x", status);
-    return FALSE;
-  }
-
-  for (;;) {
-    status = JxlDecoderProcessInput(decoder_state->decoder);
-    switch (status) {
-      case JXL_DEC_NEED_MORE_INPUT: {
-        JxlDecoderReleaseInput(decoder_state->decoder);
-        return TRUE;
-      }
-
-      case JXL_DEC_BASIC_INFO: {
-        JxlBasicInfo info;
-        if (JxlDecoderGetBasicInfo(decoder_state->decoder, &info) !=
-            JXL_DEC_SUCCESS) {
-          g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                      "JXLDecoderGetBasicInfo failed");
-          return FALSE;
-        }
-        decoder_state->pixel_format.num_channels = info.alpha_bits > 0 ? 4 : 3;
-        decoder_state->alpha_premultiplied = info.alpha_premultiplied;
-        decoder_state->xsize = info.xsize;
-        decoder_state->ysize = info.ysize;
-        decoder_state->has_animation = info.have_animation;
-        decoder_state->has_alpha = info.alpha_bits > 0;
-        if (info.have_animation) {
-          decoder_state->repetition_count = info.animation.num_loops;
-          decoder_state->tick_duration_us = 1000000ULL *
-                                            info.animation.tps_denominator /
-                                            info.animation.tps_numerator;
-        }
-        gint width = info.xsize;
-        gint height = info.ysize;
-        if (decoder_state->image_size_callback) {
-          decoder_state->image_size_callback(&width, &height,
-                                             decoder_state->user_data);
-        }
-
-        // GDK convention for signaling being interested only in the basic info.
-        if (width == 0 || height == 0) {
-          decoder_state->done = TRUE;
-          return TRUE;
-        }
-
-        // Set an appropriate number of threads for the image size.
-        JxlResizableParallelRunnerSetThreads(
-            decoder_state->parallel_runner,
-            JxlResizableParallelRunnerSuggestThreads(info.xsize, info.ysize));
-        break;
-      }
-
-      case JXL_DEC_COLOR_ENCODING: {
-        // Get the ICC color profile of the pixel data
-        gpointer icc_buff;
-        size_t icc_size;
-        JxlColorEncoding color_encoding;
-        if (JXL_DEC_SUCCESS == JxlDecoderGetColorAsEncodedProfile(
-                                   decoder_state->decoder,
-                                   JXL_COLOR_PROFILE_TARGET_ORIGINAL,
-                                   &color_encoding)) {
-          // we don't check the return status here because it's not a problem if
-          // this fails
-          JxlDecoderSetPreferredColorProfile(decoder_state->decoder,
-                                             &color_encoding);
-        }
-        if (JXL_DEC_SUCCESS != JxlDecoderGetICCProfileSize(
-                                   decoder_state->decoder,
-                                   JXL_COLOR_PROFILE_TARGET_DATA, &icc_size)) {
-          g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                      "JxlDecoderGetICCProfileSize failed");
-          return FALSE;
-        }
-        if (!(icc_buff = g_malloc(icc_size))) {
-          g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                      "Allocating ICC profile failed");
-          return FALSE;
-        }
-        if (JXL_DEC_SUCCESS !=
-            JxlDecoderGetColorAsICCProfile(decoder_state->decoder,
-                                           JXL_COLOR_PROFILE_TARGET_DATA,
-                                           icc_buff, icc_size)) {
-          g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                      "JxlDecoderGetColorAsICCProfile failed");
-          g_free(icc_buff);
-          return FALSE;
-        }
-        decoder_state->icc_base64 = g_base64_encode(icc_buff, icc_size);
-        g_free(icc_buff);
-        if (!decoder_state->icc_base64) {
-          g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                      "Allocating ICC profile base64 string failed");
-          return FALSE;
-        }
-
-        break;
-      }
-
-      case JXL_DEC_FRAME: {
-        // TODO(veluca): support rescaling.
-        JxlFrameHeader frame_header;
-        if (JxlDecoderGetFrameHeader(decoder_state->decoder, &frame_header) !=
-            JXL_DEC_SUCCESS) {
-          g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                      "Failed to retrieve frame info");
-          return FALSE;
-        }
-
-        {
-          GdkPixbufJxlAnimationFrame frame;
-          frame.decoded = FALSE;
-          frame.duration_ms =
-              frame_header.duration * decoder_state->tick_duration_us / 1000;
-          decoder_state->total_duration_ms += frame.duration_ms;
-          frame.data =
-              gdk_pixbuf_new(GDK_COLORSPACE_RGB, decoder_state->has_alpha,
-                             /*bits_per_sample=*/8, decoder_state->xsize,
-                             decoder_state->ysize);
-          if (frame.data == NULL) {
-            g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                        "Failed to allocate output pixel buffer");
-            return FALSE;
-          }
-          gdk_pixbuf_set_option(frame.data, "icc-profile",
-                                decoder_state->icc_base64);
-          decoder_state->pixel_format.align =
-              gdk_pixbuf_get_rowstride(frame.data);
-          decoder_state->pixel_format.data_type = JXL_TYPE_UINT8;
-          g_array_append_val(decoder_state->frames, frame);
-        }
-        if (decoder_state->pixbuf_prepared_callback &&
-            decoder_state->frames->len == 1) {
-          decoder_state->pixbuf_prepared_callback(
-              g_array_index(decoder_state->frames, GdkPixbufJxlAnimationFrame,
-                            0)
-                  .data,
-              decoder_state->has_animation ? (GdkPixbufAnimation *)decoder_state
-                                           : NULL,
-              decoder_state->user_data);
-        }
-        break;
-      }
-
-      case JXL_DEC_NEED_IMAGE_OUT_BUFFER: {
-        GdkPixbuf *output =
-            g_array_index(decoder_state->frames, GdkPixbufJxlAnimationFrame,
-                          decoder_state->frames->len - 1)
-                .data;
-        decoder_state->pixel_format.align = gdk_pixbuf_get_rowstride(output);
-        guint size;
-        guchar *dst = gdk_pixbuf_get_pixels_with_length(output, &size);
-        if (JXL_DEC_SUCCESS != JxlDecoderSetImageOutBuffer(
-                                   decoder_state->decoder,
-                                   &decoder_state->pixel_format, dst, size)) {
-          g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                      "JxlDecoderSetImageOutBuffer failed");
-          return FALSE;
-        }
-        break;
-      }
-
-      case JXL_DEC_FULL_IMAGE: {
-        // TODO(veluca): consider doing partial updates.
-        if (decoder_state->area_updated_callback) {
-          GdkPixbuf *output = g_array_index(decoder_state->frames,
-                                            GdkPixbufJxlAnimationFrame, 0)
-                                  .data;
-          decoder_state->area_updated_callback(
-              output, 0, 0, gdk_pixbuf_get_width(output),
-              gdk_pixbuf_get_height(output), decoder_state->user_data);
-        }
-        g_array_index(decoder_state->frames, GdkPixbufJxlAnimationFrame,
-                      decoder_state->frames->len - 1)
-            .decoded = TRUE;
-        break;
-      }
-
-      case JXL_DEC_SUCCESS: {
-        decoder_state->done = TRUE;
-        return TRUE;
-      }
-
-      default: {
-        g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                    "Unexpected JxlDecoderProcessInput return code: %x",
-                    status);
-        return FALSE;
-      }
-    }
-  }
-  return TRUE;
-}
-
-static gboolean jxl_is_save_option_supported(const gchar *option_key) {
-  if (g_strcmp0(option_key, "quality") == 0) {
-    return TRUE;
-  }
-
-  return FALSE;
-}
-
-static gboolean jxl_image_saver(FILE *f, GdkPixbuf *pixbuf, gchar **keys,
-                                gchar **values, GError **error) {
-  long quality = 90; /* default; must be between 0 and 100 */
-  double distance;
-  gboolean save_alpha;
-  JxlEncoder *encoder;
-  void *parallel_runner;
-  JxlEncoderFrameSettings *frame_settings;
-  JxlBasicInfo output_info;
-  JxlPixelFormat pixel_format;
-  JxlColorEncoding color_profile;
-  JxlEncoderStatus status;
-
-  GByteArray *compressed;
-  size_t offset = 0;
-  uint8_t *next_out;
-  size_t avail_out;
-
-  if (f == NULL || pixbuf == NULL) {
-    return FALSE;
-  }
-
-  if (keys && *keys) {
-    gchar **kiter = keys;
-    gchar **viter = values;
-
-    while (*kiter) {
-      if (strcmp(*kiter, "quality") == 0) {
-        char *endptr = NULL;
-        quality = strtol(*viter, &endptr, 10);
-
-        if (endptr == *viter) {
-          g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_BAD_OPTION,
-                      "JXL quality must be a value between 0 and 100; value "
-                      "\"%s\" could not be parsed.",
-                      *viter);
-
-          return FALSE;
-        }
-
-        if (quality < 0 || quality > 100) {
-          g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_BAD_OPTION,
-                      "JXL quality must be a value between 0 and 100; value "
-                      "\"%ld\" is not allowed.",
-                      quality);
-
-          return FALSE;
-        }
-      } else {
-        g_warning("Unrecognized parameter (%s) passed to JXL saver.", *kiter);
-      }
-
-      ++kiter;
-      ++viter;
-    }
-  }
-
-  if (gdk_pixbuf_get_bits_per_sample(pixbuf) != 8) {
-    g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_UNKNOWN_TYPE,
-                "Sorry, only 8bit images are supported by this JXL saver");
-    return FALSE;
-  }
-
-  JxlEncoderInitBasicInfo(&output_info);
-  output_info.have_container = JXL_FALSE;
-  output_info.xsize = gdk_pixbuf_get_width(pixbuf);
-  output_info.ysize = gdk_pixbuf_get_height(pixbuf);
-  output_info.bits_per_sample = 8;
-  output_info.orientation = JXL_ORIENT_IDENTITY;
-  output_info.num_color_channels = 3;
-
-  if (output_info.xsize == 0 || output_info.ysize == 0) {
-    g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-                "Empty image, nothing to save");
-    return FALSE;
-  }
-
-  save_alpha = gdk_pixbuf_get_has_alpha(pixbuf);
-
-  pixel_format.data_type = JXL_TYPE_UINT8;
-  pixel_format.endianness = JXL_NATIVE_ENDIAN;
-  pixel_format.align = gdk_pixbuf_get_rowstride(pixbuf);
-
-  if (save_alpha) {
-    if (gdk_pixbuf_get_n_channels(pixbuf) != 4) {
-      g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_UNKNOWN_TYPE,
-                  "Unsupported number of channels");
-      return FALSE;
-    }
-
-    output_info.num_extra_channels = 1;
-    output_info.alpha_bits = 8;
-    pixel_format.num_channels = 4;
-  } else {
-    if (gdk_pixbuf_get_n_channels(pixbuf) != 3) {
-      g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_UNKNOWN_TYPE,
-                  "Unsupported number of channels");
-      return FALSE;
-    }
-
-    output_info.num_extra_channels = 0;
-    output_info.alpha_bits = 0;
-    pixel_format.num_channels = 3;
-  }
-
-  encoder = JxlEncoderCreate(NULL);
-  if (!encoder) {
-    g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                "Creation of the JXL encoder failed");
-    return FALSE;
-  }
-
-  parallel_runner = JxlResizableParallelRunnerCreate(NULL);
-  if (!parallel_runner) {
-    JxlEncoderDestroy(encoder);
-    g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                "Creation of the JXL decoder failed");
-    return FALSE;
-  }
-
-  JxlResizableParallelRunnerSetThreads(
-      parallel_runner, JxlResizableParallelRunnerSuggestThreads(
-                           output_info.xsize, output_info.ysize));
-
-  status = JxlEncoderSetParallelRunner(encoder, JxlResizableParallelRunner,
-                                       parallel_runner);
-  if (status != JXL_ENC_SUCCESS) {
-    JxlResizableParallelRunnerDestroy(parallel_runner);
-    JxlEncoderDestroy(encoder);
-    g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                "JxlDecoderSetParallelRunner failed: %x", status);
-    return FALSE;
-  }
-
-  if (quality > 99) {
-    output_info.uses_original_profile = JXL_TRUE;
-    distance = 0;
-  } else {
-    output_info.uses_original_profile = JXL_FALSE;
-    distance = JxlEncoderDistanceFromQuality((float)quality);
-  }
-
-  status = JxlEncoderSetBasicInfo(encoder, &output_info);
-  if (status != JXL_ENC_SUCCESS) {
-    JxlResizableParallelRunnerDestroy(parallel_runner);
-    JxlEncoderDestroy(encoder);
-    g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                "JxlEncoderSetBasicInfo failed: %x", status);
-    return FALSE;
-  }
-
-  JxlColorEncodingSetToSRGB(&color_profile, JXL_FALSE);
-  status = JxlEncoderSetColorEncoding(encoder, &color_profile);
-  if (status != JXL_ENC_SUCCESS) {
-    JxlResizableParallelRunnerDestroy(parallel_runner);
-    JxlEncoderDestroy(encoder);
-    g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                "JxlEncoderSetColorEncoding failed: %x", status);
-    return FALSE;
-  }
-
-  frame_settings = JxlEncoderFrameSettingsCreate(encoder, NULL);
-  JxlEncoderSetFrameDistance(frame_settings, distance);
-  JxlEncoderSetFrameLossless(frame_settings, output_info.uses_original_profile);
-
-  status = JxlEncoderAddImageFrame(frame_settings, &pixel_format,
-                                   gdk_pixbuf_read_pixels(pixbuf),
-                                   gdk_pixbuf_get_byte_length(pixbuf));
-  if (status != JXL_ENC_SUCCESS) {
-    JxlResizableParallelRunnerDestroy(parallel_runner);
-    JxlEncoderDestroy(encoder);
-    g_set_error(error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED,
-                "JxlEncoderAddImageFrame failed: %x", status);
-    return FALSE;
-  }
-
-  JxlEncoderCloseInput(encoder);
-
-  compressed = g_byte_array_sized_new(4096);
-  g_byte_array_set_size(compressed, 4096);
-  do {
-    next_out = compressed->data + offset;
-    avail_out = compressed->len - offset;
-    status = JxlEncoderProcessOutput(encoder, &next_out, &avail_out);
-
-    if (status == JXL_ENC_NEED_MORE_OUTPUT) {
-      offset = next_out - compressed->data;
-      g_byte_array_set_size(compressed, compressed->len * 2);
-    } else if (status == JXL_ENC_ERROR) {
-      JxlResizableParallelRunnerDestroy(parallel_runner);
-      JxlEncoderDestroy(encoder);
-      g_set_error(error, G_FILE_ERROR, 0, "JxlEncoderProcessOutput failed: %x",
-                  status);
-      return FALSE;
-    }
-  } while (status != JXL_ENC_SUCCESS);
-
-  JxlResizableParallelRunnerDestroy(parallel_runner);
-  JxlEncoderDestroy(encoder);
-
-  g_byte_array_set_size(compressed, next_out - compressed->data);
-  if (compressed->len > 0) {
-    fwrite(compressed->data, 1, compressed->len, f);
-    g_byte_array_free(compressed, TRUE);
-    return TRUE;
-  }
-
-  return FALSE;
-}
-
-void fill_vtable(GdkPixbufModule *module) {
-  module->begin_load = begin_load;
-  module->stop_load = stop_load;
-  module->load_increment = load_increment;
-  module->is_save_option_supported = jxl_is_save_option_supported;
-  module->save = jxl_image_saver;
-}
-
-void fill_info(GdkPixbufFormat *info) {
-  static GdkPixbufModulePattern signature[] = {
-      {"\xFF\x0A", "  ", 100},
-      {"...\x0CJXL \x0D\x0A\x87\x0A", "zzz         ", 100},
-      {NULL, NULL, 0},
-  };
-
-  static gchar *mime_types[] = {"image/jxl", NULL};
-
-  static gchar *extensions[] = {"jxl", NULL};
-
-  info->name = "jxl";
-  info->signature = signature;
-  info->description = "JPEG XL image";
-  info->mime_types = mime_types;
-  info->extensions = extensions;
-  info->flags = GDK_PIXBUF_FORMAT_WRITABLE | GDK_PIXBUF_FORMAT_THREADSAFE;
-  info->license = "BSD-3";
-}
diff --git a/third_party/jpeg-xl/plugins/gdk-pixbuf/pixbufloader_test.cc b/third_party/jpeg-xl/plugins/gdk-pixbuf/pixbufloader_test.cc
deleted file mode 100644
index a2e5dc970321f..0000000000000
--- a/third_party/jpeg-xl/plugins/gdk-pixbuf/pixbufloader_test.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdk.h>
-#include <glib.h>
-#include <stdlib.h>
-
-int main(int argc, char* argv[]) {
-  if (argc != 3) {
-    fprintf(stderr, "Usage: %s <loaders.cache> <image.jxl>\n", argv[0]);
-    return 1;
-  }
-
-  const char* loaders_cache = argv[1];
-  const char* filename = argv[2];
-  const int kDoOverwrite = 1;
-  setenv("GDK_PIXBUF_MODULE_FILE", loaders_cache, kDoOverwrite);
-
-  // XDG_DATA_HOME is the path where we look for the mime cache.
-  // XDG_DATA_DIRS directories are used in addition to XDG_DATA_HOME.
-  setenv("XDG_DATA_HOME", ".", kDoOverwrite);
-  setenv("XDG_DATA_DIRS", "", kDoOverwrite);
-
-  if (!gdk_init_check(nullptr, nullptr)) {
-    fprintf(stderr, "This test requires a DISPLAY\n");
-    // Signals ctest that we should mark this test as skipped.
-    return 254;
-  }
-  GError* error = nullptr;
-  GdkPixbuf* pb = gdk_pixbuf_new_from_file(filename, &error);
-  if (pb != nullptr) {
-    g_object_unref(pb);
-    return 0;
-  } else {
-    fprintf(stderr, "Error loading file: %s\n", filename);
-    g_assert_no_error(error);
-    return 1;
-  }
-}
diff --git a/third_party/jpeg-xl/plugins/gimp/CMakeLists.txt b/third_party/jpeg-xl/plugins/gimp/CMakeLists.txt
deleted file mode 100644
index f0a49005ed2be..0000000000000
--- a/third_party/jpeg-xl/plugins/gimp/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-find_package(PkgConfig)
-pkg_check_modules(Gimp IMPORTED_TARGET gimp-2.0>=2.10 gimpui-2.0>=2.10)
-
-if (NOT Gimp_FOUND)
-  message(WARNING "Gimp development libraries not found, the Gimp plugin will not be built")
-  return ()
-endif ()
-
-add_executable(file-jxl WIN32
-  common.h
-  common.cc
-  file-jxl-load.cc
-  file-jxl-load.h
-  file-jxl-save.cc
-  file-jxl-save.h
-  file-jxl.cc)
-target_link_libraries(file-jxl jxl jxl_threads PkgConfig::Gimp)
-
-target_include_directories(file-jxl PUBLIC
-    ${PROJECT_SOURCE_DIR})  # for plugins/gimp absolute paths.
-
-pkg_get_variable(GIMP_LIB_DIR gimp-2.0 gimplibdir)
-install(TARGETS file-jxl RUNTIME DESTINATION "${GIMP_LIB_DIR}/plug-ins/file-jxl/")
diff --git a/third_party/jpeg-xl/plugins/gimp/common.cc b/third_party/jpeg-xl/plugins/gimp/common.cc
deleted file mode 100644
index a40340aacab53..0000000000000
--- a/third_party/jpeg-xl/plugins/gimp/common.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "plugins/gimp/common.h"
-
-namespace jxl {
-
-JpegXlGimpProgress::JpegXlGimpProgress(const char *message) {
-  cur_progress = 0;
-  max_progress = 100;
-
-  gimp_progress_init_printf("%s\n", message);
-}
-
-void JpegXlGimpProgress::update() {
-  gimp_progress_update(static_cast<float>(++cur_progress) /
-                       static_cast<float>(max_progress));
-}
-
-void JpegXlGimpProgress::finished() { gimp_progress_update(1.0); }
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/plugins/gimp/common.h b/third_party/jpeg-xl/plugins/gimp/common.h
deleted file mode 100644
index 3fe63c1a47d50..0000000000000
--- a/third_party/jpeg-xl/plugins/gimp/common.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef PLUGINS_GIMP_COMMON_H_
-#define PLUGINS_GIMP_COMMON_H_
-
-#include <libgimp/gimp.h>
-#include <libgimp/gimpui.h>
-#include <math.h>
-
-#include <fstream>
-#include <iterator>
-#include <string>
-#include <vector>
-
-#define PLUG_IN_BINARY "file-jxl"
-#define SAVE_PROC "file-jxl-save"
-
-// Defined by both FUIF and glib.
-#undef MAX
-#undef MIN
-#undef CLAMP
-
-#include <jxl/resizable_parallel_runner.h>
-#include <jxl/resizable_parallel_runner_cxx.h>
-
-namespace jxl {
-
-class JpegXlGimpProgress {
- public:
-  explicit JpegXlGimpProgress(const char *message);
-  void update();
-  void finished();
-
- private:
-  int cur_progress;
-  int max_progress;
-
-};  // class JpegXlGimpProgress
-
-}  // namespace jxl
-
-#endif  // PLUGINS_GIMP_COMMON_H_
diff --git a/third_party/jpeg-xl/plugins/gimp/file-jxl-load.cc b/third_party/jpeg-xl/plugins/gimp/file-jxl-load.cc
deleted file mode 100644
index 9abd6e8a9b916..0000000000000
--- a/third_party/jpeg-xl/plugins/gimp/file-jxl-load.cc
+++ /dev/null
@@ -1,483 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "plugins/gimp/file-jxl-load.h"
-
-#include <jxl/decode.h>
-#include <jxl/decode_cxx.h>
-
-#define _PROFILE_ORIGIN_ JXL_COLOR_PROFILE_TARGET_ORIGINAL
-#define _PROFILE_TARGET_ JXL_COLOR_PROFILE_TARGET_DATA
-#define LOAD_PROC "file-jxl-load"
-
-namespace jxl {
-
-bool SetJpegXlOutBuffer(
-    std::unique_ptr<JxlDecoderStruct, JxlDecoderDestroyStruct> *dec,
-    JxlPixelFormat *format, size_t *buffer_size, gpointer *pixels_buffer_1) {
-  if (JXL_DEC_SUCCESS !=
-      JxlDecoderImageOutBufferSize(dec->get(), format, buffer_size)) {
-    g_printerr(LOAD_PROC " Error: JxlDecoderImageOutBufferSize failed\n");
-    return false;
-  }
-  *pixels_buffer_1 = g_malloc(*buffer_size);
-  if (JXL_DEC_SUCCESS != JxlDecoderSetImageOutBuffer(dec->get(), format,
-                                                     *pixels_buffer_1,
-                                                     *buffer_size)) {
-    g_printerr(LOAD_PROC " Error: JxlDecoderSetImageOutBuffer failed\n");
-    return false;
-  }
-  return true;
-}
-
-bool LoadJpegXlImage(const gchar *const filename, gint32 *const image_id) {
-  bool stop_processing = false;
-  JxlDecoderStatus status = JXL_DEC_NEED_MORE_INPUT;
-  std::vector<uint8_t> icc_profile;
-  GimpColorProfile *profile_icc = nullptr;
-  GimpColorProfile *profile_int = nullptr;
-  bool is_linear = false;
-  uint32_t xsize = 0;
-  uint32_t ysize = 0;
-  int32_t crop_x0 = 0;
-  int32_t crop_y0 = 0;
-  size_t layer_idx = 0;
-  uint32_t frame_duration = 0;
-  double tps_denom = 1.f;
-  double tps_numerator = 1.f;
-
-  gint32 layer;
-
-  gpointer pixels_buffer_1 = nullptr;
-  gpointer pixels_buffer_2 = nullptr;
-  size_t buffer_size = 0;
-
-  GimpImageBaseType image_type = GIMP_RGB;
-  GimpImageType layer_type = GIMP_RGB_IMAGE;
-  GimpPrecision precision = GIMP_PRECISION_U16_GAMMA;
-  JxlBasicInfo info = {};
-  JxlPixelFormat format = {};
-  JxlAnimationHeader animation = {};
-  JxlBlendMode blend_mode = JXL_BLEND_BLEND;
-  std::vector<char> frame_name;
-
-  format.num_channels = 4;
-  format.data_type = JXL_TYPE_FLOAT;
-  format.endianness = JXL_NATIVE_ENDIAN;
-  format.align = 0;
-
-  bool is_gray = false;
-
-  JpegXlGimpProgress gimp_load_progress(
-      ("Opening JPEG XL file:" + std::string(filename)).c_str());
-  gimp_load_progress.update();
-
-  // read file
-  std::ifstream instream(filename, std::ios::in | std::ios::binary);
-  std::vector<uint8_t> compressed((std::istreambuf_iterator<char>(instream)),
-                                  std::istreambuf_iterator<char>());
-  instream.close();
-
-  gimp_load_progress.update();
-
-  // multi-threaded parallel runner.
-  auto runner = JxlResizableParallelRunnerMake(nullptr);
-
-  auto dec = JxlDecoderMake(nullptr);
-  if (JXL_DEC_SUCCESS !=
-      JxlDecoderSubscribeEvents(
-          dec.get(), JXL_DEC_BASIC_INFO | JXL_DEC_COLOR_ENCODING |
-                         JXL_DEC_FULL_IMAGE | JXL_DEC_FRAME_PROGRESSION |
-                         JXL_DEC_FRAME)) {
-    g_printerr(LOAD_PROC " Error: JxlDecoderSubscribeEvents failed\n");
-    return false;
-  }
-
-  if (JXL_DEC_SUCCESS != JxlDecoderSetParallelRunner(dec.get(),
-                                                     JxlResizableParallelRunner,
-                                                     runner.get())) {
-    g_printerr(LOAD_PROC " Error: JxlDecoderSetParallelRunner failed\n");
-    return false;
-  }
-  // TODO(user): make this work with coalescing set to false, while handling
-  // frames with duration 0 and references to earlier frames correctly.
-  if (JXL_DEC_SUCCESS != JxlDecoderSetCoalescing(dec.get(), JXL_TRUE)) {
-    g_printerr(LOAD_PROC " Error: JxlDecoderSetCoalescing failed\n");
-    return false;
-  }
-
-  // grand decode loop...
-  JxlDecoderSetInput(dec.get(), compressed.data(), compressed.size());
-
-  if (JXL_DEC_SUCCESS != JxlDecoderSetProgressiveDetail(
-                             dec.get(), JxlProgressiveDetail::kPasses)) {
-    g_printerr(LOAD_PROC " Error: JxlDecoderSetProgressiveDetail failed\n");
-    return false;
-  }
-
-  while (true) {
-    gimp_load_progress.update();
-
-    if (!stop_processing) status = JxlDecoderProcessInput(dec.get());
-
-    if (status == JXL_DEC_BASIC_INFO) {
-      if (JXL_DEC_SUCCESS != JxlDecoderGetBasicInfo(dec.get(), &info)) {
-        g_printerr(LOAD_PROC " Error: JxlDecoderGetBasicInfo failed\n");
-        return false;
-      }
-
-      xsize = info.xsize;
-      ysize = info.ysize;
-      if (info.have_animation) {
-        animation = info.animation;
-        tps_denom = animation.tps_denominator;
-        tps_numerator = animation.tps_numerator;
-      }
-
-      JxlResizableParallelRunnerSetThreads(
-          runner.get(), JxlResizableParallelRunnerSuggestThreads(xsize, ysize));
-    } else if (status == JXL_DEC_COLOR_ENCODING) {
-      // check for ICC profile
-      size_t icc_size = 0;
-      JxlColorEncoding color_encoding;
-      if (JXL_DEC_SUCCESS !=
-          JxlDecoderGetColorAsEncodedProfile(dec.get(), _PROFILE_ORIGIN_,
-                                             &color_encoding)) {
-        // Attempt to load ICC profile when no internal color encoding
-        if (JXL_DEC_SUCCESS != JxlDecoderGetICCProfileSize(
-                                   dec.get(), _PROFILE_ORIGIN_, &icc_size)) {
-          g_printerr(LOAD_PROC
-                     " Warning: JxlDecoderGetICCProfileSize failed\n");
-        }
-
-        if (icc_size > 0) {
-          icc_profile.resize(icc_size);
-          if (JXL_DEC_SUCCESS != JxlDecoderGetColorAsICCProfile(
-                                     dec.get(), _PROFILE_ORIGIN_,
-                                     icc_profile.data(), icc_profile.size())) {
-            g_printerr(LOAD_PROC
-                       " Warning: JxlDecoderGetColorAsICCProfile failed\n");
-          }
-
-          profile_icc = gimp_color_profile_new_from_icc_profile(
-              icc_profile.data(), icc_profile.size(), nullptr);
-
-          if (profile_icc) {
-            is_linear = gimp_color_profile_is_linear(profile_icc);
-            g_printerr(LOAD_PROC " Info: Color profile is_linear = %d\n",
-                       is_linear);
-          } else {
-            g_printerr(LOAD_PROC " Warning: Failed to read ICC profile.\n");
-          }
-        } else {
-          g_printerr(LOAD_PROC " Warning: Empty ICC data.\n");
-        }
-      }
-
-      // Internal color profile detection...
-      if (JXL_DEC_SUCCESS ==
-          JxlDecoderGetColorAsEncodedProfile(dec.get(), _PROFILE_TARGET_,
-                                             &color_encoding)) {
-        g_printerr(LOAD_PROC " Info: Internal color encoding detected.\n");
-
-        // figure out linearity of internal profile
-        switch (color_encoding.transfer_function) {
-          case JXL_TRANSFER_FUNCTION_LINEAR:
-            is_linear = true;
-            break;
-
-          case JXL_TRANSFER_FUNCTION_709:
-          case JXL_TRANSFER_FUNCTION_PQ:
-          case JXL_TRANSFER_FUNCTION_HLG:
-          case JXL_TRANSFER_FUNCTION_GAMMA:
-          case JXL_TRANSFER_FUNCTION_DCI:
-          case JXL_TRANSFER_FUNCTION_SRGB:
-            is_linear = false;
-            break;
-
-          case JXL_TRANSFER_FUNCTION_UNKNOWN:
-          default:
-            if (profile_icc) {
-              g_printerr(LOAD_PROC
-                         " Info: Unknown transfer function.  "
-                         "ICC profile is present.");
-            } else {
-              g_printerr(LOAD_PROC
-                         " Info: Unknown transfer function.  "
-                         "No ICC profile present.");
-            }
-            break;
-        }
-
-        switch (color_encoding.color_space) {
-          case JXL_COLOR_SPACE_RGB:
-            if (color_encoding.white_point == JXL_WHITE_POINT_D65 &&
-                color_encoding.primaries == JXL_PRIMARIES_SRGB) {
-              if (is_linear) {
-                profile_int = gimp_color_profile_new_rgb_srgb_linear();
-              } else {
-                profile_int = gimp_color_profile_new_rgb_srgb();
-              }
-            } else if (!is_linear &&
-                       color_encoding.white_point == JXL_WHITE_POINT_D65 &&
-                       (color_encoding.primaries_green_xy[0] == 0.2100 ||
-                        color_encoding.primaries_green_xy[1] == 0.7100)) {
-              // Probably Adobe RGB
-              profile_int = gimp_color_profile_new_rgb_adobe();
-            } else if (profile_icc) {
-              g_printerr(LOAD_PROC
-                         " Info: Unknown RGB colorspace.  "
-                         "Using ICC profile.\n");
-            } else {
-              g_printerr(LOAD_PROC
-                         " Info: Unknown RGB colorspace.  "
-                         "Treating as sRGB.\n");
-              if (is_linear) {
-                profile_int = gimp_color_profile_new_rgb_srgb_linear();
-              } else {
-                profile_int = gimp_color_profile_new_rgb_srgb();
-              }
-            }
-            break;
-
-          case JXL_COLOR_SPACE_GRAY:
-            is_gray = true;
-            if (!profile_icc ||
-                color_encoding.white_point == JXL_WHITE_POINT_D65) {
-              if (is_linear) {
-                profile_int = gimp_color_profile_new_d65_gray_linear();
-              } else {
-                profile_int = gimp_color_profile_new_d65_gray_srgb_trc();
-              }
-            }
-            break;
-          case JXL_COLOR_SPACE_XYB:
-          case JXL_COLOR_SPACE_UNKNOWN:
-          default:
-            if (profile_icc) {
-              g_printerr(LOAD_PROC
-                         " Info: Unknown colorspace.  Using ICC profile.\n");
-            } else {
-              g_error(
-                  LOAD_PROC
-                  " Warning: Unknown colorspace. Treating as sRGB profile.\n");
-
-              if (is_linear) {
-                profile_int = gimp_color_profile_new_rgb_srgb_linear();
-              } else {
-                profile_int = gimp_color_profile_new_rgb_srgb();
-              }
-            }
-            break;
-        }
-      }
-
-      // set pixel format
-      if (info.num_color_channels > 1) {
-        if (info.alpha_bits == 0) {
-          image_type = GIMP_RGB;
-          layer_type = GIMP_RGB_IMAGE;
-          format.num_channels = info.num_color_channels;
-        } else {
-          image_type = GIMP_RGB;
-          layer_type = GIMP_RGBA_IMAGE;
-          format.num_channels = info.num_color_channels + 1;
-        }
-      } else if (info.num_color_channels == 1) {
-        if (info.alpha_bits == 0) {
-          image_type = GIMP_GRAY;
-          layer_type = GIMP_GRAY_IMAGE;
-          format.num_channels = info.num_color_channels;
-        } else {
-          image_type = GIMP_GRAY;
-          layer_type = GIMP_GRAYA_IMAGE;
-          format.num_channels = info.num_color_channels + 1;
-        }
-      }
-
-      // Set image bit depth and linearity
-      if (info.bits_per_sample <= 8) {
-        if (is_linear) {
-          precision = GIMP_PRECISION_U8_LINEAR;
-        } else {
-          precision = GIMP_PRECISION_U8_GAMMA;
-        }
-      } else if (info.bits_per_sample <= 16) {
-        if (info.exponent_bits_per_sample > 0) {
-          if (is_linear) {
-            precision = GIMP_PRECISION_HALF_LINEAR;
-          } else {
-            precision = GIMP_PRECISION_HALF_GAMMA;
-          }
-        } else if (is_linear) {
-          precision = GIMP_PRECISION_U16_LINEAR;
-        } else {
-          precision = GIMP_PRECISION_U16_GAMMA;
-        }
-      } else {
-        if (info.exponent_bits_per_sample > 0) {
-          if (is_linear) {
-            precision = GIMP_PRECISION_FLOAT_LINEAR;
-          } else {
-            precision = GIMP_PRECISION_FLOAT_GAMMA;
-          }
-        } else if (is_linear) {
-          precision = GIMP_PRECISION_U32_LINEAR;
-        } else {
-          precision = GIMP_PRECISION_U32_GAMMA;
-        }
-      }
-
-      // create new image
-      if (is_linear) {
-        *image_id = gimp_image_new_with_precision(xsize, ysize, image_type,
-                                                  GIMP_PRECISION_FLOAT_LINEAR);
-      } else {
-        *image_id = gimp_image_new_with_precision(xsize, ysize, image_type,
-                                                  GIMP_PRECISION_FLOAT_GAMMA);
-      }
-
-      if (profile_int) {
-        gimp_image_set_color_profile(*image_id, profile_int);
-      } else if (!profile_icc) {
-        g_printerr(LOAD_PROC " Warning: No color profile.\n");
-      }
-    } else if (status == JXL_DEC_NEED_IMAGE_OUT_BUFFER) {
-      // get image from decoder in FLOAT
-      format.data_type = JXL_TYPE_FLOAT;
-      if (!SetJpegXlOutBuffer(&dec, &format, &buffer_size, &pixels_buffer_1))
-        return false;
-    } else if (status == JXL_DEC_FULL_IMAGE) {
-      // create and insert layer
-      gchar *layer_name;
-      if (layer_idx == 0 && !info.have_animation) {
-        layer_name = g_strdup_printf("Background");
-      } else {
-        const char *blend = (blend_mode == JXL_BLEND_REPLACE) ? " (replace)"
-                            : (blend_mode == JXL_BLEND_BLEND) ? " (combine)"
-                                                              : "";
-        char *temp_frame_name = nullptr;
-        bool must_free_frame_name = false;
-        if (frame_name.size() == 0) {
-          temp_frame_name = g_strdup_printf("Frame %lu", layer_idx + 1);
-          must_free_frame_name = true;
-        } else {
-          temp_frame_name = frame_name.data();
-        }
-        double fduration = frame_duration * 1000.f * tps_denom / tps_numerator;
-        layer_name = g_strdup_printf("%s (%.15gms)%s", temp_frame_name,
-                                     fduration, blend);
-        if (must_free_frame_name) free(temp_frame_name);
-      }
-      layer = gimp_layer_new(*image_id, layer_name, xsize, ysize, layer_type,
-                             /*opacity=*/100,
-                             gimp_image_get_default_new_layer_mode(*image_id));
-
-      gimp_image_insert_layer(*image_id, layer, /*parent_id=*/-1,
-                              /*position=*/0);
-
-      pixels_buffer_2 = g_malloc(buffer_size);
-      GeglBuffer *buffer = gimp_drawable_get_buffer(layer);
-      const Babl *destination_format = gegl_buffer_set_format(buffer, nullptr);
-
-      std::string babl_format_str = "";
-      if (is_gray) {
-        babl_format_str += "Y'";
-      } else {
-        babl_format_str += "R'G'B'";
-      }
-      if (info.alpha_bits > 0) {
-        babl_format_str += "A";
-      }
-      babl_format_str += " float";
-
-      const Babl *source_format = babl_format(babl_format_str.c_str());
-
-      babl_process(babl_fish(source_format, destination_format),
-                   pixels_buffer_1, pixels_buffer_2, xsize * ysize);
-
-      gegl_buffer_set(buffer, GEGL_RECTANGLE(0, 0, xsize, ysize), 0, nullptr,
-                      pixels_buffer_2, GEGL_AUTO_ROWSTRIDE);
-      gimp_item_transform_translate(layer, crop_x0, crop_y0);
-
-      g_clear_object(&buffer);
-      g_free(pixels_buffer_1);
-      g_free(pixels_buffer_2);
-      if (stop_processing) status = JXL_DEC_SUCCESS;
-      g_free(layer_name);
-      layer_idx++;
-    } else if (status == JXL_DEC_FRAME) {
-      JxlFrameHeader frame_header;
-      if (JxlDecoderGetFrameHeader(dec.get(), &frame_header) !=
-          JXL_DEC_SUCCESS) {
-        g_printerr(LOAD_PROC " Error: JxlDecoderSetImageOutBuffer failed\n");
-        return false;
-      }
-      xsize = frame_header.layer_info.xsize;
-      ysize = frame_header.layer_info.ysize;
-      crop_x0 = frame_header.layer_info.crop_x0;
-      crop_y0 = frame_header.layer_info.crop_y0;
-      frame_duration = frame_header.duration;
-      blend_mode = frame_header.layer_info.blend_info.blendmode;
-      if (blend_mode != JXL_BLEND_BLEND && blend_mode != JXL_BLEND_REPLACE) {
-        g_printerr(
-            LOAD_PROC
-            " Warning: JxlDecoderGetFrameHeader: Unhandled blend mode: %d\n",
-            blend_mode);
-      }
-      if (frame_header.name_length > 0) {
-        frame_name.resize(frame_header.name_length + 1);
-        if (JXL_DEC_SUCCESS != JxlDecoderGetFrameName(dec.get(),
-                                                      frame_name.data(),
-                                                      frame_name.size())) {
-          g_printerr(LOAD_PROC "Error: JxlDecoderGetFrameName failed");
-          return false;
-        }
-      } else {
-        frame_name.resize(0);
-      }
-    } else if (status == JXL_DEC_SUCCESS) {
-      // All decoding successfully finished.
-      // It's not required to call JxlDecoderReleaseInput(dec.get())
-      // since the decoder will be destroyed.
-      break;
-    } else if (status == JXL_DEC_NEED_MORE_INPUT ||
-               status == JXL_DEC_FRAME_PROGRESSION) {
-      stop_processing = status != JXL_DEC_FRAME_PROGRESSION;
-      if (JxlDecoderFlushImage(dec.get()) == JXL_DEC_SUCCESS) {
-        status = JXL_DEC_FULL_IMAGE;
-        continue;
-      }
-      g_printerr(LOAD_PROC " Error: Already provided all input\n");
-      return false;
-    } else if (status == JXL_DEC_ERROR) {
-      g_printerr(LOAD_PROC " Error: Decoder error\n");
-      return false;
-    } else {
-      g_printerr(LOAD_PROC " Error: Unknown decoder status\n");
-      return false;
-    }
-  }  // end grand decode loop
-
-  gimp_load_progress.update();
-
-  if (profile_icc) {
-    gimp_image_set_color_profile(*image_id, profile_icc);
-  }
-
-  gimp_load_progress.update();
-
-  // TODO(xiota): Add option to keep image as float
-  if (info.bits_per_sample < 32) {
-    gimp_image_convert_precision(*image_id, precision);
-  }
-
-  gimp_image_set_filename(*image_id, filename);
-
-  gimp_load_progress.finished();
-  return true;
-}
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/plugins/gimp/file-jxl-load.h b/third_party/jpeg-xl/plugins/gimp/file-jxl-load.h
deleted file mode 100644
index ef5b92fef62e1..0000000000000
--- a/third_party/jpeg-xl/plugins/gimp/file-jxl-load.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef PLUGINS_GIMP_FILE_JXL_LOAD_H_
-#define PLUGINS_GIMP_FILE_JXL_LOAD_H_
-
-#include "plugins/gimp/common.h"
-
-namespace jxl {
-
-bool LoadJpegXlImage(const gchar* filename, gint32* image_id);
-
-}  // namespace jxl
-
-#endif  // PLUGINS_GIMP_FILE_JXL_LOAD_H_
diff --git a/third_party/jpeg-xl/plugins/gimp/file-jxl-save.cc b/third_party/jpeg-xl/plugins/gimp/file-jxl-save.cc
deleted file mode 100644
index 65b637d419749..0000000000000
--- a/third_party/jpeg-xl/plugins/gimp/file-jxl-save.cc
+++ /dev/null
@@ -1,893 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "plugins/gimp/file-jxl-save.h"
-
-#include <jxl/encode.h>
-#include <jxl/encode_cxx.h>
-#include <jxl/types.h>
-
-#include <cmath>
-#include <utility>
-
-#include "gobject/gsignal.h"
-
-#define PLUG_IN_BINARY "file-jxl"
-#define SAVE_PROC "file-jxl-save"
-
-namespace jxl {
-
-namespace {
-
-constexpr size_t kScaleWidth = 200;
-
-#ifndef g_clear_signal_handler
-// g_clear_signal_handler was added in glib 2.62
-void g_clear_signal_handler(gulong* handler, gpointer instance) {
-  if (handler != nullptr && *handler != 0) {
-    g_signal_handler_disconnect(instance, *handler);
-    *handler = 0;
-  }
-}
-#endif  // g_clear_signal_handler
-
-class JpegXlSaveOpts {
- public:
-  float distance;
-  float quality;
-
-  bool lossless = false;
-  bool is_linear = false;
-  bool has_alpha = false;
-  bool is_gray = false;
-  bool icc_attached = false;
-
-  bool advanced_mode = false;
-  bool use_container = true;
-  bool save_exif = false;
-  int encoding_effort = 7;
-  int faster_decoding = 0;
-
-  std::string babl_format_str = "RGB u16";
-  std::string babl_type_str = "u16";
-  std::string babl_model_str = "RGB";
-
-  JxlPixelFormat pixel_format;
-  JxlBasicInfo basic_info;
-
-  // functions
-  JpegXlSaveOpts();
-
-  bool SetDistance(float dist);
-  bool SetQuality(float qual);
-  bool SetDimensions(int x, int y);
-  bool SetNumChannels(int channels);
-
-  bool UpdateDistance();
-  bool UpdateQuality();
-
-  bool SetModel(bool is_linear_);
-
-  bool UpdateBablFormat();
-  bool SetBablModel(std::string model);
-  bool SetBablType(std::string type);
-
-  bool SetPrecision(int gimp_precision);
-
- private:
-};  // class JpegXlSaveOpts
-
-JpegXlSaveOpts jxl_save_opts;
-
-class JpegXlSaveGui {
- public:
-  bool SaveDialog();
-
- private:
-  GtkWidget* toggle_lossless = nullptr;
-  GtkAdjustment* entry_distance = nullptr;
-  GtkAdjustment* entry_quality = nullptr;
-  GtkAdjustment* entry_effort = nullptr;
-  GtkAdjustment* entry_faster = nullptr;
-  GtkWidget* frame_advanced = nullptr;
-  GtkWidget* toggle_no_xyb = nullptr;
-  GtkWidget* toggle_raw = nullptr;
-  gulong handle_toggle_lossless = 0;
-  gulong handle_entry_quality = 0;
-  gulong handle_entry_distance = 0;
-
-  static bool GuiOnChangeQuality(GtkAdjustment* adj_qual, void* this_pointer);
-
-  static bool GuiOnChangeDistance(GtkAdjustment* adj_dist, void* this_pointer);
-
-  static bool GuiOnChangeEffort(GtkAdjustment* adj_effort);
-  static bool GuiOnChangeLossless(GtkWidget* toggle, void* this_pointer);
-  static bool GuiOnChangeCodestream(GtkWidget* toggle);
-  static bool GuiOnChangeNoXYB(GtkWidget* toggle);
-
-  static bool GuiOnChangeAdvancedMode(GtkWidget* toggle, void* this_pointer);
-};  // class JpegXlSaveGui
-
-JpegXlSaveGui jxl_save_gui;
-
-bool JpegXlSaveGui::GuiOnChangeQuality(GtkAdjustment* adj_qual,
-                                       void* this_pointer) {
-  JpegXlSaveGui* self = static_cast<JpegXlSaveGui*>(this_pointer);
-
-  g_clear_signal_handler(&self->handle_entry_distance, self->entry_distance);
-  g_clear_signal_handler(&self->handle_entry_quality, self->entry_quality);
-  g_clear_signal_handler(&self->handle_toggle_lossless, self->toggle_lossless);
-
-  GtkAdjustment* adj_dist = self->entry_distance;
-  jxl_save_opts.SetQuality(gtk_adjustment_get_value(adj_qual));
-  gtk_adjustment_set_value(adj_dist, jxl_save_opts.distance);
-
-  self->handle_toggle_lossless = g_signal_connect(
-      self->toggle_lossless, "toggled", G_CALLBACK(GuiOnChangeLossless), self);
-  self->handle_entry_distance =
-      g_signal_connect(self->entry_distance, "value-changed",
-                       G_CALLBACK(GuiOnChangeDistance), self);
-  self->handle_entry_quality =
-      g_signal_connect(self->entry_quality, "value-changed",
-                       G_CALLBACK(GuiOnChangeQuality), self);
-  return true;
-}
-
-bool JpegXlSaveGui::GuiOnChangeDistance(GtkAdjustment* adj_dist,
-                                        void* this_pointer) {
-  JpegXlSaveGui* self = static_cast<JpegXlSaveGui*>(this_pointer);
-  GtkAdjustment* adj_qual = self->entry_quality;
-
-  g_clear_signal_handler(&self->handle_entry_distance, self->entry_distance);
-  g_clear_signal_handler(&self->handle_entry_quality, self->entry_quality);
-  g_clear_signal_handler(&self->handle_toggle_lossless, self->toggle_lossless);
-
-  jxl_save_opts.SetDistance(gtk_adjustment_get_value(adj_dist));
-  gtk_adjustment_set_value(adj_qual, jxl_save_opts.quality);
-
-  if (!(jxl_save_opts.distance < 0.001)) {
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(self->toggle_lossless),
-                                 false);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(self->toggle_no_xyb), false);
-  }
-
-  self->handle_toggle_lossless = g_signal_connect(
-      self->toggle_lossless, "toggled", G_CALLBACK(GuiOnChangeLossless), self);
-  self->handle_entry_distance =
-      g_signal_connect(self->entry_distance, "value-changed",
-                       G_CALLBACK(GuiOnChangeDistance), self);
-  self->handle_entry_quality =
-      g_signal_connect(self->entry_quality, "value-changed",
-                       G_CALLBACK(GuiOnChangeQuality), self);
-  return true;
-}
-
-bool JpegXlSaveGui::GuiOnChangeEffort(GtkAdjustment* adj_effort) {
-  float new_effort = 10 - gtk_adjustment_get_value(adj_effort);
-  jxl_save_opts.encoding_effort = new_effort;
-  return true;
-}
-
-bool JpegXlSaveGui::GuiOnChangeLossless(GtkWidget* toggle, void* this_pointer) {
-  JpegXlSaveGui* self = static_cast<JpegXlSaveGui*>(this_pointer);
-  GtkAdjustment* adj_distance = self->entry_distance;
-  GtkAdjustment* adj_quality = self->entry_quality;
-  GtkAdjustment* adj_effort = self->entry_effort;
-
-  jxl_save_opts.lossless =
-      gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle));
-
-  g_clear_signal_handler(&self->handle_entry_distance, self->entry_distance);
-  g_clear_signal_handler(&self->handle_entry_quality, self->entry_quality);
-  g_clear_signal_handler(&self->handle_toggle_lossless, self->toggle_lossless);
-
-  if (jxl_save_opts.lossless) {
-    gtk_adjustment_set_value(adj_quality, 100.0);
-    gtk_adjustment_set_value(adj_distance, 0.0);
-    jxl_save_opts.distance = 0;
-    jxl_save_opts.UpdateQuality();
-    gtk_adjustment_set_value(adj_effort, 7);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(self->toggle_no_xyb), true);
-  } else {
-    gtk_adjustment_set_value(adj_quality, 90.0);
-    gtk_adjustment_set_value(adj_distance, 1.0);
-    jxl_save_opts.distance = 1.0;
-    jxl_save_opts.UpdateQuality();
-    gtk_adjustment_set_value(adj_effort, 3);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(self->toggle_no_xyb), false);
-  }
-  self->handle_toggle_lossless = g_signal_connect(
-      self->toggle_lossless, "toggled", G_CALLBACK(GuiOnChangeLossless), self);
-  self->handle_entry_distance =
-      g_signal_connect(self->entry_distance, "value-changed",
-                       G_CALLBACK(GuiOnChangeDistance), self);
-  self->handle_entry_quality =
-      g_signal_connect(self->entry_quality, "value-changed",
-                       G_CALLBACK(GuiOnChangeQuality), self);
-  return true;
-}
-
-bool JpegXlSaveGui::GuiOnChangeCodestream(GtkWidget* toggle) {
-  jxl_save_opts.use_container =
-      !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle));
-  return true;
-}
-
-bool JpegXlSaveGui::GuiOnChangeNoXYB(GtkWidget* toggle) {
-  jxl_save_opts.basic_info.uses_original_profile =
-      gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle));
-  return true;
-}
-
-bool JpegXlSaveGui::GuiOnChangeAdvancedMode(GtkWidget* toggle,
-                                            void* this_pointer) {
-  JpegXlSaveGui* self = static_cast<JpegXlSaveGui*>(this_pointer);
-  jxl_save_opts.advanced_mode =
-      gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle));
-
-  gtk_widget_set_sensitive(self->frame_advanced, jxl_save_opts.advanced_mode);
-
-  if (!jxl_save_opts.advanced_mode) {
-    jxl_save_opts.basic_info.uses_original_profile = JXL_FALSE;
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(self->toggle_no_xyb), false);
-
-    jxl_save_opts.use_container = true;
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(self->toggle_raw), false);
-
-    jxl_save_opts.faster_decoding = 0;
-    gtk_adjustment_set_value(GTK_ADJUSTMENT(self->entry_faster), 0);
-  }
-  return true;
-}
-
-bool JpegXlSaveGui::SaveDialog() {
-  gboolean run;
-  GtkWidget* dialog;
-  GtkWidget* content_area;
-  GtkWidget* main_vbox;
-  GtkWidget* frame;
-  GtkWidget* toggle;
-  GtkWidget* table;
-  GtkWidget* vbox;
-  GtkWidget* separator;
-
-  // initialize export dialog
-  gimp_ui_init(PLUG_IN_BINARY, true);
-  dialog = gimp_export_dialog_new("JPEG XL", PLUG_IN_BINARY, SAVE_PROC);
-
-  gtk_window_set_resizable(GTK_WINDOW(dialog), false);
-  content_area = gimp_export_dialog_get_content_area(dialog);
-
-  main_vbox = gtk_vbox_new(false, 6);
-  gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 6);
-  gtk_box_pack_start(GTK_BOX(content_area), main_vbox, true, true, 0);
-  gtk_widget_show(main_vbox);
-
-  // Standard Settings Frame
-  frame = gtk_frame_new(nullptr);
-  gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
-  gtk_box_pack_start(GTK_BOX(main_vbox), frame, false, false, 0);
-  gtk_widget_show(frame);
-
-  vbox = gtk_vbox_new(false, 6);
-  gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
-  gtk_container_add(GTK_CONTAINER(frame), vbox);
-  gtk_widget_show(vbox);
-
-  // Layout Table
-  table = gtk_table_new(20, 3, false);
-  gtk_table_set_col_spacings(GTK_TABLE(table), 6);
-  gtk_box_pack_start(GTK_BOX(vbox), table, false, false, 0);
-  gtk_widget_show(table);
-
-  // Distance Slider
-  static gchar distance_help[] =
-      "Butteraugli distance target.  Suggested values:"
-      "\n\td\u00A0=\u00A00.3\tExcellent"
-      "\n\td\u00A0=\u00A01\tVery Good"
-      "\n\td\u00A0=\u00A02\tGood"
-      "\n\td\u00A0=\u00A03\tFair"
-      "\n\td\u00A0=\u00A06\tPoor";
-
-  entry_distance = reinterpret_cast<GtkAdjustment*>(
-      gimp_scale_entry_new(GTK_TABLE(table), 0, 0, "Distance", kScaleWidth, 0,
-                           jxl_save_opts.distance, 0.0, 15.0, 0.001, 1.0, 3,
-                           true, 0.0, 0.0, distance_help, SAVE_PROC));
-  gimp_scale_entry_set_logarithmic(reinterpret_cast<GtkObject*>(entry_distance),
-                                   true);
-
-  // Quality Slider
-  static gchar quality_help[] =
-      "JPEG-style Quality is remapped to distance.  "
-      "Values roughly match libjpeg quality settings.";
-  entry_quality = reinterpret_cast<GtkAdjustment*>(gimp_scale_entry_new(
-      GTK_TABLE(table), 0, 1, "Quality", kScaleWidth, 0, jxl_save_opts.quality,
-      8.26, 100.0, 1.0, 10.0, 2, true, 0.0, 0.0, quality_help, SAVE_PROC));
-
-  // Distance and Quality Signals
-  handle_entry_distance = g_signal_connect(
-      entry_distance, "value-changed", G_CALLBACK(GuiOnChangeDistance), this);
-  handle_entry_quality = g_signal_connect(entry_quality, "value-changed",
-                                          G_CALLBACK(GuiOnChangeQuality), this);
-
-  // ----------
-  separator = gtk_vseparator_new();
-  gtk_table_attach(GTK_TABLE(table), separator, 0, 2, 2, 3, GTK_EXPAND,
-                   GTK_EXPAND, 9, 9);
-  gtk_widget_show(separator);
-
-  // Encoding Effort / Speed
-  static gchar effort_help[] =
-      "Adjust encoding speed.  Higher values are faster because "
-      "the encoder uses less effort to hit distance targets.  "
-      "As\u00A0a\u00A0result, image quality may be decreased.  "
-      "Default\u00A0=\u00A03.";
-  entry_effort = reinterpret_cast<GtkAdjustment*>(
-      gimp_scale_entry_new(GTK_TABLE(table), 0, 3, "Speed", kScaleWidth, 0,
-                           10 - jxl_save_opts.encoding_effort, 1, 9, 1, 2, 0,
-                           true, 0.0, 0.0, effort_help, SAVE_PROC));
-
-  // effort signal
-  g_signal_connect(entry_effort, "value-changed", G_CALLBACK(GuiOnChangeEffort),
-                   nullptr);
-
-  // ----------
-  separator = gtk_vseparator_new();
-  gtk_table_attach(GTK_TABLE(table), separator, 0, 2, 4, 5, GTK_EXPAND,
-                   GTK_EXPAND, 9, 9);
-  gtk_widget_show(separator);
-
-  // Lossless Mode Convenience Checkbox
-  static gchar lossless_help[] =
-      "Compress using modular lossless mode.  "
-      "Speed\u00A0is adjusted to improve performance.";
-  toggle_lossless = gtk_check_button_new_with_label("Lossless Mode");
-  gimp_help_set_help_data(toggle_lossless, lossless_help, nullptr);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle_lossless),
-                               jxl_save_opts.lossless);
-  gtk_table_attach_defaults(GTK_TABLE(table), toggle_lossless, 0, 2, 5, 6);
-  gtk_widget_show(toggle_lossless);
-
-  // lossless signal
-  handle_toggle_lossless = g_signal_connect(
-      toggle_lossless, "toggled", G_CALLBACK(GuiOnChangeLossless), this);
-
-  // ----------
-  separator = gtk_vseparator_new();
-  gtk_box_pack_start(GTK_BOX(main_vbox), separator, false, false, 1);
-  gtk_widget_show(separator);
-
-  // Advanced Settings Frame
-  frame_advanced = gtk_frame_new("Advanced Settings");
-  gimp_help_set_help_data(frame_advanced,
-                          "Some advanced settings may produce malformed files.",
-                          nullptr);
-  gtk_frame_set_shadow_type(GTK_FRAME(frame_advanced), GTK_SHADOW_ETCHED_IN);
-  gtk_box_pack_start(GTK_BOX(main_vbox), frame_advanced, true, true, 0);
-  gtk_widget_show(frame_advanced);
-
-  gtk_widget_set_sensitive(frame_advanced, false);
-
-  vbox = gtk_vbox_new(false, 6);
-  gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
-  gtk_container_add(GTK_CONTAINER(frame_advanced), vbox);
-  gtk_widget_show(vbox);
-
-  // uses_original_profile
-  static gchar uses_original_profile_help[] =
-      "Prevents conversion to the XYB colorspace.  "
-      "File sizes are approximately doubled.";
-  toggle_no_xyb = gtk_check_button_new_with_label("Do not use XYB colorspace");
-  gimp_help_set_help_data(toggle_no_xyb, uses_original_profile_help, nullptr);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle_no_xyb),
-                               jxl_save_opts.basic_info.uses_original_profile);
-  gtk_box_pack_start(GTK_BOX(vbox), toggle_no_xyb, false, false, 0);
-  gtk_widget_show(toggle_no_xyb);
-
-  g_signal_connect(toggle_no_xyb, "toggled", G_CALLBACK(GuiOnChangeNoXYB),
-                   nullptr);
-
-  // save raw codestream
-  static gchar codestream_help[] =
-      "Save the raw codestream, without a container.  "
-      "The container is required for metadata and some other features.";
-  toggle_raw = gtk_check_button_new_with_label("Save Raw Codestream");
-  gimp_help_set_help_data(toggle_raw, codestream_help, nullptr);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle_raw),
-                               !jxl_save_opts.use_container);
-  gtk_box_pack_start(GTK_BOX(vbox), toggle_raw, false, false, 0);
-  gtk_widget_show(toggle_raw);
-
-  g_signal_connect(toggle_raw, "toggled", G_CALLBACK(GuiOnChangeCodestream),
-                   nullptr);
-
-  // ----------
-  separator = gtk_vseparator_new();
-  gtk_box_pack_start(GTK_BOX(vbox), separator, false, false, 1);
-  gtk_widget_show(separator);
-
-  // Faster Decoding / Decoding Speed
-  static gchar faster_help[] =
-      "Improve decoding speed at the expense of quality.  "
-      "Default\u00A0=\u00A00.";
-  table = gtk_table_new(1, 3, false);
-  gtk_table_set_col_spacings(GTK_TABLE(table), 6);
-  gtk_container_add(GTK_CONTAINER(vbox), table);
-  gtk_widget_show(table);
-
-  entry_faster = reinterpret_cast<GtkAdjustment*>(
-      gimp_scale_entry_new(GTK_TABLE(table), 0, 0, "Faster Decoding",
-                           kScaleWidth, 0, jxl_save_opts.faster_decoding, 0, 4,
-                           1, 1, 0, true, 0.0, 0.0, faster_help, SAVE_PROC));
-
-  // Faster Decoding Signals
-  g_signal_connect(entry_faster, "value-changed",
-                   G_CALLBACK(gimp_int_adjustment_update),
-                   &jxl_save_opts.faster_decoding);
-
-  // Enable Advanced Settings
-  frame = gtk_frame_new(nullptr);
-  gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE);
-  gtk_box_pack_start(GTK_BOX(main_vbox), frame, true, true, 0);
-  gtk_widget_show(frame);
-
-  vbox = gtk_vbox_new(false, 6);
-  gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
-  gtk_container_add(GTK_CONTAINER(frame), vbox);
-  gtk_widget_show(vbox);
-
-  static gchar advanced_help[] =
-      "Some advanced settings may produce malformed files.";
-  toggle = gtk_check_button_new_with_label("Enable Advanced Settings");
-  gimp_help_set_help_data(toggle, advanced_help, nullptr);
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle),
-                               jxl_save_opts.advanced_mode);
-  gtk_box_pack_start(GTK_BOX(vbox), toggle, false, false, 0);
-  gtk_widget_show(toggle);
-
-  g_signal_connect(toggle, "toggled", G_CALLBACK(GuiOnChangeAdvancedMode),
-                   this);
-
-  // show dialog
-  gtk_widget_show(dialog);
-
-  GtkAllocation allocation;
-  gtk_widget_get_allocation(dialog, &allocation);
-
-  int height = allocation.height;
-  gtk_widget_set_size_request(dialog, height * 1.5, height);
-
-  run = (gimp_dialog_run(GIMP_DIALOG(dialog)) == GTK_RESPONSE_OK);
-  gtk_widget_destroy(dialog);
-
-  return run;
-}  // JpegXlSaveGui::SaveDialog
-
-JpegXlSaveOpts::JpegXlSaveOpts() {
-  SetDistance(1.0);
-
-  pixel_format.num_channels = 4;
-  pixel_format.data_type = JXL_TYPE_FLOAT;
-  pixel_format.endianness = JXL_NATIVE_ENDIAN;
-  pixel_format.align = 0;
-
-  JxlEncoderInitBasicInfo(&basic_info);
-}  // JpegXlSaveOpts constructor
-
-bool JpegXlSaveOpts::SetModel(bool is_linear_) {
-  int channels;
-  std::string model;
-
-  if (is_gray) {
-    channels = 1;
-    if (is_linear_) {
-      model = "Y";
-    } else {
-      model = "Y'";
-    }
-  } else {
-    channels = 3;
-    if (is_linear_) {
-      model = "RGB";
-    } else {
-      model = "R'G'B'";
-    }
-  }
-  if (has_alpha) {
-    SetBablModel(model + "A");
-    SetNumChannels(channels + 1);
-  } else {
-    SetBablModel(model);
-    SetNumChannels(channels);
-  }
-  return true;
-}  // JpegXlSaveOpts::SetModel
-
-bool JpegXlSaveOpts::SetDistance(float dist) {
-  distance = dist;
-  return UpdateQuality();
-}
-
-bool JpegXlSaveOpts::SetQuality(float qual) {
-  quality = qual;
-  return UpdateDistance();
-}
-
-bool JpegXlSaveOpts::UpdateQuality() {
-  float qual;
-
-  if (distance < 0.1) {
-    qual = 100;
-  } else if (distance > 6.4) {
-    qual = -5.0 / 53.0 * sqrt(6360.0 * distance - 39975.0) + 1725.0 / 53.0;
-    lossless = false;
-  } else {
-    qual = 100 - (distance - 0.1) / 0.09;
-    lossless = false;
-  }
-
-  if (qual < 0) {
-    quality = 0.0;
-  } else if (qual >= 100) {
-    quality = 100.0;
-  } else {
-    quality = qual;
-  }
-
-  return true;
-}
-
-bool JpegXlSaveOpts::UpdateDistance() {
-  float dist = JxlEncoderDistanceFromQuality(quality);
-
-  if (dist > 25) {
-    distance = 25;
-  } else {
-    distance = dist;
-  }
-  return true;
-}
-
-bool JpegXlSaveOpts::SetDimensions(int x, int y) {
-  basic_info.xsize = x;
-  basic_info.ysize = y;
-  return true;
-}
-
-bool JpegXlSaveOpts::SetNumChannels(int channels) {
-  switch (channels) {
-    case 1:
-      pixel_format.num_channels = 1;
-      basic_info.num_color_channels = 1;
-      basic_info.num_extra_channels = 0;
-      basic_info.alpha_bits = 0;
-      basic_info.alpha_exponent_bits = 0;
-      break;
-    case 2:
-      pixel_format.num_channels = 2;
-      basic_info.num_color_channels = 1;
-      basic_info.num_extra_channels = 1;
-      basic_info.alpha_bits =
-          static_cast<int>(std::fmin(16, basic_info.bits_per_sample));
-      basic_info.alpha_exponent_bits = 0;
-      break;
-    case 3:
-      pixel_format.num_channels = 3;
-      basic_info.num_color_channels = 3;
-      basic_info.num_extra_channels = 0;
-      basic_info.alpha_bits = 0;
-      basic_info.alpha_exponent_bits = 0;
-      break;
-    case 4:
-      pixel_format.num_channels = 4;
-      basic_info.num_color_channels = 3;
-      basic_info.num_extra_channels = 1;
-      basic_info.alpha_bits =
-          static_cast<int>(std::fmin(16, basic_info.bits_per_sample));
-      basic_info.alpha_exponent_bits = 0;
-      break;
-    default:
-      SetNumChannels(3);
-  }  // switch
-  return true;
-}  // JpegXlSaveOpts::SetNumChannels
-
-bool JpegXlSaveOpts::UpdateBablFormat() {
-  babl_format_str = babl_model_str + " " + babl_type_str;
-  return true;
-}
-
-bool JpegXlSaveOpts::SetBablModel(std::string model) {
-  babl_model_str = std::move(model);
-  return UpdateBablFormat();
-}
-
-bool JpegXlSaveOpts::SetBablType(std::string type) {
-  babl_type_str = std::move(type);
-  return UpdateBablFormat();
-}
-
-bool JpegXlSaveOpts::SetPrecision(int gimp_precision) {
-  switch (gimp_precision) {
-    case GIMP_PRECISION_HALF_GAMMA:
-    case GIMP_PRECISION_HALF_LINEAR:
-      basic_info.bits_per_sample = 16;
-      basic_info.exponent_bits_per_sample = 5;
-      break;
-
-    // UINT32 not supported by encoder; using FLOAT instead
-    case GIMP_PRECISION_U32_GAMMA:
-    case GIMP_PRECISION_U32_LINEAR:
-    case GIMP_PRECISION_FLOAT_GAMMA:
-    case GIMP_PRECISION_FLOAT_LINEAR:
-      basic_info.bits_per_sample = 32;
-      basic_info.exponent_bits_per_sample = 8;
-      break;
-
-    case GIMP_PRECISION_U16_GAMMA:
-    case GIMP_PRECISION_U16_LINEAR:
-      basic_info.bits_per_sample = 16;
-      basic_info.exponent_bits_per_sample = 0;
-      break;
-
-    default:
-    case GIMP_PRECISION_U8_LINEAR:
-    case GIMP_PRECISION_U8_GAMMA:
-      basic_info.bits_per_sample = 8;
-      basic_info.exponent_bits_per_sample = 0;
-      break;
-  }
-  return true;
-}  // JpegXlSaveOpts::SetPrecision
-
-}  // namespace
-
-bool SaveJpegXlImage(const gint32 image_id, const gint32 drawable_id,
-                     const gint32 orig_image_id, const gchar* const filename) {
-  if (!jxl_save_gui.SaveDialog()) {
-    return true;
-  }
-
-  gint32 nlayers;
-  gint32* layers;
-  gint32 duplicate = gimp_image_duplicate(image_id);
-
-  JpegXlGimpProgress gimp_save_progress(
-      ("Saving JPEG XL file:" + std::string(filename)).c_str());
-  gimp_save_progress.update();
-
-  // try to get ICC color profile...
-  std::vector<uint8_t> icc;
-
-  GimpColorProfile* profile = gimp_image_get_effective_color_profile(image_id);
-  jxl_save_opts.is_gray = gimp_color_profile_is_gray(profile);
-  jxl_save_opts.is_linear = gimp_color_profile_is_linear(profile);
-
-  profile = gimp_image_get_color_profile(image_id);
-  if (profile) {
-    g_printerr(SAVE_PROC " Info: Extracting ICC Profile...\n");
-    gsize icc_size;
-    const guint8* const icc_bytes =
-        gimp_color_profile_get_icc_profile(profile, &icc_size);
-
-    icc.assign(icc_bytes, icc_bytes + icc_size);
-  } else {
-    g_printerr(SAVE_PROC " Info: No ICC profile.  Exporting image anyway.\n");
-  }
-
-  gimp_save_progress.update();
-
-  jxl_save_opts.SetDimensions(gimp_image_width(image_id),
-                              gimp_image_height(image_id));
-
-  jxl_save_opts.SetPrecision(gimp_image_get_precision(image_id));
-  layers = gimp_image_get_layers(duplicate, &nlayers);
-
-  for (int i = 0; i < nlayers; i++) {
-    if (gimp_drawable_has_alpha(layers[i])) {
-      jxl_save_opts.has_alpha = true;
-      break;
-    }
-  }
-
-  gimp_save_progress.update();
-
-  // layers need to match image size, for now
-  for (int i = 0; i < nlayers; i++) {
-    gimp_layer_resize_to_image_size(layers[i]);
-  }
-
-  // treat layers as animation frames, for now
-  if (nlayers > 1) {
-    jxl_save_opts.basic_info.have_animation = JXL_TRUE;
-    jxl_save_opts.basic_info.animation.tps_numerator = 100;
-  }
-
-  gimp_save_progress.update();
-
-  // multi-threaded parallel runner.
-  auto runner = JxlResizableParallelRunnerMake(nullptr);
-
-  JxlResizableParallelRunnerSetThreads(
-      runner.get(),
-      JxlResizableParallelRunnerSuggestThreads(jxl_save_opts.basic_info.xsize,
-                                               jxl_save_opts.basic_info.ysize));
-
-  auto enc = JxlEncoderMake(/*memory_manager=*/nullptr);
-  JxlEncoderUseContainer(enc.get(), jxl_save_opts.use_container);
-
-  if (JXL_ENC_SUCCESS != JxlEncoderSetParallelRunner(enc.get(),
-                                                     JxlResizableParallelRunner,
-                                                     runner.get())) {
-    g_printerr(SAVE_PROC " Error: JxlEncoderSetParallelRunner failed\n");
-    return false;
-  }
-
-  // this sets some basic_info properties
-  jxl_save_opts.SetModel(jxl_save_opts.is_linear);
-
-  if (JXL_ENC_SUCCESS !=
-      JxlEncoderSetBasicInfo(enc.get(), &jxl_save_opts.basic_info)) {
-    g_printerr(SAVE_PROC " Error: JxlEncoderSetBasicInfo failed\n");
-    return false;
-  }
-
-  // try to use ICC profile
-  if (!icc.empty() && !jxl_save_opts.is_gray) {
-    if (JXL_ENC_SUCCESS ==
-        JxlEncoderSetICCProfile(enc.get(), icc.data(), icc.size())) {
-      jxl_save_opts.icc_attached = true;
-    } else {
-      g_printerr(SAVE_PROC " Warning: JxlEncoderSetICCProfile failed.\n");
-      jxl_save_opts.basic_info.uses_original_profile = JXL_FALSE;
-      jxl_save_opts.lossless = false;
-    }
-  } else {
-    g_printerr(SAVE_PROC " Warning: Using internal profile.\n");
-    jxl_save_opts.basic_info.uses_original_profile = JXL_FALSE;
-    jxl_save_opts.lossless = false;
-  }
-
-  // set up internal color profile
-  JxlColorEncoding color_encoding = {};
-
-  if (jxl_save_opts.is_linear) {
-    JxlColorEncodingSetToLinearSRGB(&color_encoding,
-                                    TO_JXL_BOOL(jxl_save_opts.is_gray));
-  } else {
-    JxlColorEncodingSetToSRGB(&color_encoding,
-                              TO_JXL_BOOL(jxl_save_opts.is_gray));
-  }
-
-  if (JXL_ENC_SUCCESS !=
-      JxlEncoderSetColorEncoding(enc.get(), &color_encoding)) {
-    g_printerr(SAVE_PROC " Warning: JxlEncoderSetColorEncoding failed\n");
-  }
-
-  // set encoder options
-  JxlEncoderFrameSettings* frame_settings;
-  frame_settings = JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
-
-  JxlEncoderFrameSettingsSetOption(frame_settings, JXL_ENC_FRAME_SETTING_EFFORT,
-                                   jxl_save_opts.encoding_effort);
-  JxlEncoderFrameSettingsSetOption(frame_settings,
-                                   JXL_ENC_FRAME_SETTING_DECODING_SPEED,
-                                   jxl_save_opts.faster_decoding);
-
-  // lossless mode
-  if (jxl_save_opts.lossless || jxl_save_opts.distance < 0.01) {
-    if (jxl_save_opts.basic_info.exponent_bits_per_sample > 0) {
-      // lossless mode doesn't work well with floating point
-      jxl_save_opts.distance = 0.01;
-      jxl_save_opts.lossless = false;
-      JxlEncoderSetFrameLossless(frame_settings, JXL_FALSE);
-      JxlEncoderSetFrameDistance(frame_settings, 0.01);
-    } else {
-      JxlEncoderSetFrameDistance(frame_settings, 0);
-      JxlEncoderSetFrameLossless(frame_settings, JXL_TRUE);
-    }
-  } else {
-    jxl_save_opts.lossless = false;
-    JxlEncoderSetFrameLossless(frame_settings, JXL_FALSE);
-    JxlEncoderSetFrameDistance(frame_settings, jxl_save_opts.distance);
-  }
-
-  // convert precision and colorspace
-  if (jxl_save_opts.is_linear &&
-      jxl_save_opts.basic_info.bits_per_sample < 32) {
-    gimp_image_convert_precision(duplicate, GIMP_PRECISION_FLOAT_LINEAR);
-  } else {
-    gimp_image_convert_precision(duplicate, GIMP_PRECISION_FLOAT_GAMMA);
-  }
-
-  // process layers and compress into JXL
-  size_t buffer_size =
-      jxl_save_opts.basic_info.xsize * jxl_save_opts.basic_info.ysize *
-      jxl_save_opts.pixel_format.num_channels * 4;  // bytes per sample
-
-  for (int i = nlayers - 1; i >= 0; i--) {
-    gimp_save_progress.update();
-
-    // copy image into buffer...
-    gpointer pixels_buffer_1;
-    gpointer pixels_buffer_2;
-    pixels_buffer_1 = g_malloc(buffer_size);
-    pixels_buffer_2 = g_malloc(buffer_size);
-
-    gimp_layer_resize_to_image_size(layers[i]);
-
-    GeglBuffer* buffer = gimp_drawable_get_buffer(layers[i]);
-
-    // using gegl_buffer_set_format to get the format because
-    // gegl_buffer_get_format doesn't always get the original format
-    const Babl* native_format = gegl_buffer_set_format(buffer, nullptr);
-
-    gegl_buffer_get(buffer,
-                    GEGL_RECTANGLE(0, 0, jxl_save_opts.basic_info.xsize,
-                                   jxl_save_opts.basic_info.ysize),
-                    1.0, native_format, pixels_buffer_1, GEGL_AUTO_ROWSTRIDE,
-                    GEGL_ABYSS_NONE);
-    g_clear_object(&buffer);
-
-    // use babl to fix gamma mismatch issues
-    jxl_save_opts.SetModel(jxl_save_opts.is_linear);
-    jxl_save_opts.pixel_format.data_type = JXL_TYPE_FLOAT;
-    jxl_save_opts.SetBablType("float");
-    const Babl* destination_format =
-        babl_format(jxl_save_opts.babl_format_str.c_str());
-
-    babl_process(
-        babl_fish(native_format, destination_format), pixels_buffer_1,
-        pixels_buffer_2,
-        jxl_save_opts.basic_info.xsize * jxl_save_opts.basic_info.ysize);
-
-    gimp_save_progress.update();
-
-    // send layer to encoder
-    if (JXL_ENC_SUCCESS !=
-        JxlEncoderAddImageFrame(frame_settings, &jxl_save_opts.pixel_format,
-                                pixels_buffer_2, buffer_size)) {
-      g_printerr(SAVE_PROC " Error: JxlEncoderAddImageFrame failed\n");
-      return false;
-    }
-  }
-
-  JxlEncoderCloseInput(enc.get());
-
-  // get data from encoder
-  std::vector<uint8_t> compressed;
-  compressed.resize(262144);
-  uint8_t* next_out = compressed.data();
-  size_t avail_out = compressed.size();
-
-  JxlEncoderStatus process_result = JXL_ENC_NEED_MORE_OUTPUT;
-  while (process_result == JXL_ENC_NEED_MORE_OUTPUT) {
-    gimp_save_progress.update();
-
-    process_result = JxlEncoderProcessOutput(enc.get(), &next_out, &avail_out);
-    if (process_result == JXL_ENC_NEED_MORE_OUTPUT) {
-      size_t offset = next_out - compressed.data();
-      compressed.resize(compressed.size() + 262144);
-      next_out = compressed.data() + offset;
-      avail_out = compressed.size() - offset;
-    }
-  }
-  compressed.resize(next_out - compressed.data());
-
-  if (JXL_ENC_SUCCESS != process_result) {
-    g_printerr(SAVE_PROC " Error: JxlEncoderProcessOutput failed\n");
-    return false;
-  }
-
-  // write file
-  std::ofstream outstream(filename, std::ios::out | std::ios::binary);
-  copy(compressed.begin(), compressed.end(),
-       std::ostream_iterator<uint8_t>(outstream));
-
-  gimp_save_progress.finished();
-  return true;
-}  // SaveJpegXlImage()
-
-}  // namespace jxl
diff --git a/third_party/jpeg-xl/plugins/gimp/file-jxl-save.h b/third_party/jpeg-xl/plugins/gimp/file-jxl-save.h
deleted file mode 100644
index c9d0e8091f95e..0000000000000
--- a/third_party/jpeg-xl/plugins/gimp/file-jxl-save.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#ifndef PLUGINS_GIMP_FILE_JXL_SAVE_H_
-#define PLUGINS_GIMP_FILE_JXL_SAVE_H_
-
-#include "plugins/gimp/common.h"
-
-namespace jxl {
-
-bool SaveJpegXlImage(gint32 image_id, gint32 drawable_id, gint32 orig_image_id,
-                     const gchar* filename);
-
-}  // namespace jxl
-
-#endif  // PLUGINS_GIMP_FILE_JXL_SAVE_H_
diff --git a/third_party/jpeg-xl/plugins/gimp/file-jxl.cc b/third_party/jpeg-xl/plugins/gimp/file-jxl.cc
deleted file mode 100644
index 743495a2e0c51..0000000000000
--- a/third_party/jpeg-xl/plugins/gimp/file-jxl.cc
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright (c) the JPEG XL Project Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include <string.h>
-
-#include <string>
-
-#include "plugins/gimp/common.h"
-#include "plugins/gimp/file-jxl-load.h"
-#include "plugins/gimp/file-jxl-save.h"
-
-namespace jxl {
-namespace {
-
-constexpr char kLoadProc[] = "file-jxl-load";
-constexpr char kSaveProc[] = "file-jxl-save";
-
-void Query() {
-  {
-    static char run_mode_name[] = "run-mode";
-    static char run_mode_description[] = "Run mode";
-    static char filename_name[] = "filename";
-    static char filename_description[] = "The name of the file to load";
-    static char raw_filename_name[] = "raw-filename";
-    static char raw_filename_description[] =
-        "The name of the file, as entered by the user";
-    static const GimpParamDef load_args[] = {
-        {GIMP_PDB_INT32, run_mode_name, run_mode_description},
-        {GIMP_PDB_STRING, filename_name, filename_description},
-        {GIMP_PDB_STRING, raw_filename_name, raw_filename_description},
-    };
-    static char image_name[] = "image";
-    static char image_description[] = "Loaded image";
-    static const GimpParamDef load_return_vals[] = {
-        {GIMP_PDB_IMAGE, image_name, image_description},
-    };
-
-    gimp_install_procedure(
-        /*name=*/kLoadProc, /*blurb=*/"Loads JPEG XL image files",
-        /*help=*/"Loads JPEG XL image files", /*author=*/"JPEG XL Project",
-        /*copyright=*/"JPEG XL Project", /*date=*/"2019",
-        /*menu_label=*/"JPEG XL image", /*image_types=*/nullptr,
-        /*type=*/GIMP_PLUGIN, /*n_params=*/G_N_ELEMENTS(load_args),
-        /*n_return_vals=*/G_N_ELEMENTS(load_return_vals), /*params=*/load_args,
-        /*return_vals=*/load_return_vals);
-    gimp_register_file_handler_mime(kLoadProc, "image/jxl");
-    gimp_register_magic_load_handler(
-        kLoadProc, "jxl", "",
-        "0,string,\xFF\x0A,"
-        "0,string,\\000\\000\\000\x0CJXL\\040\\015\\012\x87\\012");
-  }
-
-  {
-    static char run_mode_name[] = "run-mode";
-    static char run_mode_description[] = "Run mode";
-    static char image_name[] = "image";
-    static char image_description[] = "Input image";
-    static char drawable_name[] = "drawable";
-    static char drawable_description[] = "Drawable to save";
-    static char filename_name[] = "filename";
-    static char filename_description[] = "The name of the file to save";
-    static char raw_filename_name[] = "raw-filename";
-    static char raw_filename_description[] = "The name of the file to save";
-    static const GimpParamDef save_args[] = {
-        {GIMP_PDB_INT32, run_mode_name, run_mode_description},
-        {GIMP_PDB_IMAGE, image_name, image_description},
-        {GIMP_PDB_DRAWABLE, drawable_name, drawable_description},
-        {GIMP_PDB_STRING, filename_name, filename_description},
-        {GIMP_PDB_STRING, raw_filename_name, raw_filename_description},
-    };
-
-    gimp_install_procedure(
-        /*name=*/kSaveProc, /*blurb=*/"Saves JPEG XL image files",
-        /*help=*/"Saves JPEG XL image files", /*author=*/"JPEG XL Project",
-        /*copyright=*/"JPEG XL Project", /*date=*/"2019",
-        /*menu_label=*/"JPEG XL image", /*image_types=*/"RGB*, GRAY*",
-        /*type=*/GIMP_PLUGIN, /*n_params=*/G_N_ELEMENTS(save_args),
-        /*n_return_vals=*/0, /*params=*/save_args,
-        /*return_vals=*/nullptr);
-    gimp_register_file_handler_mime(kSaveProc, "image/jxl");
-    gimp_register_save_handler(kSaveProc, "jxl", "");
-  }
-}
-
-void Run(const gchar* const name, const gint nparams,
-         const GimpParam* const params, gint* const nreturn_vals,
-         GimpParam** const return_vals) {
-  gegl_init(nullptr, nullptr);
-
-  static GimpParam values[2];
-
-  *nreturn_vals = 1;
-  *return_vals = values;
-
-  values[0].type = GIMP_PDB_STATUS;
-  values[0].data.d_status = GIMP_PDB_EXECUTION_ERROR;
-
-  if (strcmp(name, kLoadProc) == 0) {
-    if (nparams != 3) {
-      values[0].data.d_status = GIMP_PDB_CALLING_ERROR;
-      return;
-    }
-
-    const gchar* const filename = params[1].data.d_string;
-    gint32 image_id;
-    if (!LoadJpegXlImage(filename, &image_id)) {
-      values[0].data.d_status = GIMP_PDB_EXECUTION_ERROR;
-      return;
-    }
-
-    *nreturn_vals = 2;
-    values[0].data.d_status = GIMP_PDB_SUCCESS;
-    values[1].type = GIMP_PDB_IMAGE;
-    values[1].data.d_image = image_id;
-  } else if (strcmp(name, kSaveProc) == 0) {
-    if (nparams != 5) {
-      values[0].data.d_status = GIMP_PDB_CALLING_ERROR;
-      return;
-    }
-
-    gint32 image_id = params[1].data.d_image;
-    gint32 drawable_id = params[2].data.d_drawable;
-    const gchar* const filename = params[3].data.d_string;
-    const gint32 orig_image_id = image_id;
-    const GimpExportReturn export_result = gimp_export_image(
-        &image_id, &drawable_id, "JPEG XL",
-        static_cast<GimpExportCapabilities>(GIMP_EXPORT_CAN_HANDLE_RGB |
-                                            GIMP_EXPORT_CAN_HANDLE_GRAY |
-                                            GIMP_EXPORT_CAN_HANDLE_ALPHA));
-    switch (export_result) {
-      case GIMP_EXPORT_CANCEL:
-        values[0].data.d_status = GIMP_PDB_CANCEL;
-        return;
-      case GIMP_EXPORT_IGNORE:
-        break;
-      case GIMP_EXPORT_EXPORT:
-        break;
-    }
-    if (!SaveJpegXlImage(image_id, drawable_id, orig_image_id, filename)) {
-      return;
-    }
-    if (image_id != orig_image_id) {
-      gimp_image_delete(image_id);
-    }
-    values[0].data.d_status = GIMP_PDB_SUCCESS;
-  }
-}
-
-}  // namespace
-}  // namespace jxl
-
-static const GimpPlugInInfo PLUG_IN_INFO = {nullptr, nullptr, &jxl::Query,
-                                            &jxl::Run};
-
-MAIN()
diff --git a/third_party/jpeg-xl/plugins/mime/CMakeLists.txt b/third_party/jpeg-xl/plugins/mime/CMakeLists.txt
deleted file mode 100644
index 6f2a0f919c17b..0000000000000
--- a/third_party/jpeg-xl/plugins/mime/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) the JPEG XL Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-install(FILES image-jxl.xml DESTINATION share/mime/packages/)
diff --git a/third_party/jpeg-xl/plugins/mime/README.md b/third_party/jpeg-xl/plugins/mime/README.md
deleted file mode 100644
index 6954a91e4825a..0000000000000
--- a/third_party/jpeg-xl/plugins/mime/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-## :warning: Not needed anymore
-
-As `image/jxl` is now supported by [shared-mime-info 2.2](https://gitlab.freedesktop.org/xdg/shared-mime-info/-/releases/2.2), it should not be necessary anymore to install this plugin.
-
-You can test if your system correctly understand the MIME type of JPEG XL image by obtaining a JPEG XL image, e.g. with
-```bash
-wget https://raw.githubusercontent.com/libjxl/conformance/master/testcases/bicycles/input.jxl
-```
-and with that sample JPEG XL file `input.jxl` (or any other valid JPEG XL file), run any of the following commands:
-```bash
-xdg-mime query filetype input.jxl
-file --mime-type input.jxl
-mimetype input.jxl
-```
-If the output contains `image/jxl` you are all set!
-
-
-## JPEG XL MIME type
-
-If not already installed by the [Installing section of BUILDING.md](../../BUILDING.md#installing), then it can be done manually:
-
-### Install
-```bash
-sudo xdg-mime install --novendor image-jxl.xml
-```
-
-Then run:
-```
-update-mime --local
-```
-
-
-### Uninstall
-```bash
-sudo xdg-mime uninstall image-jxl.xml
-```
-
diff --git a/third_party/jpeg-xl/plugins/mime/image-jxl.xml b/third_party/jpeg-xl/plugins/mime/image-jxl.xml
deleted file mode 100644
index cab9018c7da48..0000000000000
--- a/third_party/jpeg-xl/plugins/mime/image-jxl.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="image/jxl">
-    <comment>JPEG XL image</comment>
-    <comment xml:lang="fr">image JPEG XL</comment>
-    <comment xml:lang="nl">JPEG XL afbeelding</comment>
-    <magic priority="50">
-      <match type="string" offset="0" value="\xFF\x0A"/>
-      <match type="string" offset="0" value="\0\0\0\x0CJXL \x0D\x0A\x87\x0A"/>
-    </magic>
-    <glob pattern="*.jxl"/>
-  </mime-type>
-</mime-info>
diff --git a/third_party/jpeg-xl/third_party/CMakeLists.txt b/third_party/jpeg-xl/third_party/CMakeLists.txt
deleted file mode 100644
index ea22103eb8860..0000000000000
--- a/third_party/jpeg-xl/third_party/CMakeLists.txt
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright (c) the JPEG XL Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-if((SANITIZER STREQUAL "asan") OR (SANITIZER STREQUAL "msan"))
-  set(BUILD_TESTING OFF)
-endif()
-
-# Highway
-set(HWY_SYSTEM_GTEST ON CACHE INTERNAL "")
-set(HWY_FORCE_STATIC_LIBS ON CACHE INTERNAL "")
-set(HWY_ENABLE_CONTRIB OFF CACHE INTERNAL "")
-set(HWY_ENABLE_EXAMPLES OFF CACHE INTERNAL "")
-set(HWY_ENABLE_TESTS OFF CACHE INTERNAL "")
-if((SANITIZER STREQUAL "asan") OR (SANITIZER STREQUAL "msan"))
-  set(HWY_ENABLE_INSTALL OFF CACHE INTERNAL "")
-endif()
-if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/highway/CMakeLists.txt" AND
-    NOT JPEGXL_FORCE_SYSTEM_HWY)
-  add_subdirectory(highway)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/highway/LICENSE"
-                 ${PROJECT_BINARY_DIR}/LICENSE.highway COPYONLY)
-else()
-  find_package(HWY 1.0.7)
-  if (NOT HWY_FOUND)
-    message(FATAL_ERROR
-        "Highway library (hwy) not found. Install libhwy-dev or download it "
-        "to third_party/highway from https://github.com/google/highway . "
-        "Highway is required to build JPEG XL. You can run "
-        "${PROJECT_SOURCE_DIR}/deps.sh to download this dependency.")
-  endif()
-  if(JPEGXL_DEP_LICENSE_DIR)
-    configure_file("${JPEGXL_DEP_LICENSE_DIR}/libhwy-dev/copyright"
-                   ${PROJECT_BINARY_DIR}/LICENSE.highway COPYONLY)
-  endif()  # JPEGXL_DEP_LICENSE_DIR
-endif()
-
-# brotli
-if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/brotli/c/include/brotli/decode.h" OR
-    JPEGXL_FORCE_SYSTEM_BROTLI)
-  find_package(Brotli)
-  if (NOT Brotli_FOUND)
-    message(FATAL_ERROR
-        "Brotli not found, install brotli-dev or download brotli source code to"
-        " third_party/brotli from https://github.com/google/brotli. You can use"
-        " ${PROJECT_SOURCE_DIR}/deps.sh to download this dependency.")
-  endif ()
-  if(JPEGXL_DEP_LICENSE_DIR)
-    configure_file("${JPEGXL_DEP_LICENSE_DIR}/libbrotli-dev/copyright"
-                   ${PROJECT_BINARY_DIR}/LICENSE.brotli COPYONLY)
-  endif()  # JPEGXL_DEP_LICENSE_DIR
-else()
-  # Compile brotli from sources.
-  set(BROTLI_DISABLE_TESTS ON CACHE STRING "Disable Brotli tests")
-  # Override default "no-install" policy.
-  if((NOT SANITIZER STREQUAL "asan") AND (NOT SANITIZER STREQUAL "msan"))
-    set(BROTLI_BUNDLED_MODE OFF CACHE INTERNAL "")
-  endif()
-  add_subdirectory(brotli)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/brotli/LICENSE"
-                 ${PROJECT_BINARY_DIR}/LICENSE.brotli COPYONLY)
-  if(APPLE)
-    if(NOT DEFINED CMAKE_MACOSX_RPATH)
-      # Use @rpath in install_name when CMAKE_MACOSX_RPATH is not set.
-      set_property(TARGET brotlienc PROPERTY MACOSX_RPATH TRUE)
-      set_property(TARGET brotlidec PROPERTY MACOSX_RPATH TRUE)
-      set_property(TARGET brotlicommon PROPERTY MACOSX_RPATH TRUE)
-    endif()
-    if((NOT DEFINED CMAKE_MACOSX_RPATH) OR CMAKE_MACOSX_RPATH)
-      # Set library search path when @rpath is used.
-      if(NOT DEFINED CMAKE_INSTALL_RPATH)
-        set_property(TARGET brotlienc PROPERTY INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-        set_property(TARGET brotlidec PROPERTY INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-        set_property(TARGET brotlicommon PROPERTY INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-      endif()
-    else()
-      # Set conventional install_name when @rpath is not used.
-      if(NOT DEFINED CMAKE_INSTALL_NAME_DIR)
-        set_property(TARGET brotlienc PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-        set_property(TARGET brotlidec PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-        set_property(TARGET brotlicommon PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-      endif()
-    endif()
-  endif()  # APPLE
-endif()
-
-# *cms
-if (JPEGXL_ENABLE_SKCMS)
-  if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/skcms/skcms.h" )
-    message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch the "
-            "build dependencies.")
-  endif()
-  include(skcms.cmake)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/skcms/LICENSE"
-                 ${PROJECT_BINARY_DIR}/LICENSE.skcms COPYONLY)
-endif ()
-if (JPEGXL_ENABLE_VIEWERS OR NOT JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS)
-  if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lcms/.git" OR JPEGXL_FORCE_SYSTEM_LCMS2 )
-    find_package(LCMS2 2.12)
-    if ( NOT LCMS2_FOUND )
-      message(FATAL_ERROR "Please install lcms2 or run git submodule update --init")
-    endif ()
-  else()
-    include(lcms2.cmake)
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lcms/COPYING"
-                   ${PROJECT_BINARY_DIR}/LICENSE.lcms COPYONLY)
-  endif()
-endif()
-
-# libpng
-if (JPEGXL_BUNDLE_LIBPNG AND EMSCRIPTEN)
-  if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libpng/CMakeLists.txt")
-  message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch the "
-          "build dependencies.")
-  endif()
-  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/libpng/scripts/pnglibconf.h.prebuilt" DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/libpng")
-  file(RENAME "${CMAKE_CURRENT_SOURCE_DIR}/libpng/pnglibconf.h.prebuilt" "${CMAKE_CURRENT_SOURCE_DIR}/libpng/pnglibconf.h")
-  set(ZLIB_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/zlib/")
-  set(ZLIB_LIBRARIES "")
-  set(PNG_FOUND YES PARENT_SCOPE)
-  set(PNG_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/libpng/" PARENT_SCOPE)
-  set(PNG_LIBRARIES "" PARENT_SCOPE)
-elseif (JPEGXL_BUNDLE_LIBPNG)
-  if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libpng/CMakeLists.txt")
-    message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch the "
-            "build dependencies.")
-  endif()
-  add_subdirectory(zlib)
-  set(PNG_STATIC ON CACHE BOOL "")
-  set(PNG_EXECUTABLES OFF CACHE BOOL "")
-  set(PNG_BUILD_ZLIB ON CACHE BOOL "")
-  set(PNG_TESTS OFF CACHE BOOL "")
-  set(SKIP_INSTALL_ALL ON CACHE BOOL "")
-  set(ZLIB_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/zlib/")
-  set(ZLIB_LIBRARIES zlibstatic)
-  add_subdirectory(libpng EXCLUDE_FROM_ALL)
-  set(PNG_FOUND YES PARENT_SCOPE)
-  set(PNG_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/libpng/" PARENT_SCOPE)
-  set(PNG_LIBRARIES png_static PARENT_SCOPE)
-  set_property(TARGET png_static PROPERTY POSITION_INDEPENDENT_CODE ON)
-  set_property(TARGET zlibstatic PROPERTY POSITION_INDEPENDENT_CODE ON)
-  if(JPEGXL_DEP_LICENSE_DIR)
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libpng/LICENSE"
-                   ${PROJECT_BINARY_DIR}/LICENSE.libpng COPYONLY)
-  endif()
-else()
-  find_package(PNG)
-  if(PNG_FOUND AND JPEGXL_DEP_LICENSE_DIR)
-    configure_file("${JPEGXL_DEP_LICENSE_DIR}/zlib1g-dev/copyright"
-                   ${PROJECT_BINARY_DIR}/LICENSE.zlib COPYONLY)
-    configure_file("${JPEGXL_DEP_LICENSE_DIR}/libpng-dev/copyright"
-                   ${PROJECT_BINARY_DIR}/LICENSE.libpng COPYONLY)
-  endif()  # JPEGXL_DEP_LICENSE_DIR
-endif()
-
-# sjpeg
-if (JPEGXL_ENABLE_SJPEG)
-  if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/sjpeg/CMakeLists.txt")
-    message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch the "
-            "build dependencies.")
-  endif()
-  include(sjpeg.cmake)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sjpeg/COPYING"
-                 ${PROJECT_BINARY_DIR}/LICENSE.sjpeg COPYONLY)
-endif ()
diff --git a/third_party/jpeg-xl/third_party/HEVCSoftware/README.md b/third_party/jpeg-xl/third_party/HEVCSoftware/README.md
deleted file mode 100644
index 70ebaeba33f6e..0000000000000
--- a/third_party/jpeg-xl/third_party/HEVCSoftware/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-This directory contains modified configuration files from the reference HEVC
-encoder, the source code of which can be found at: https://hevc.hhi.fraunhofer.de/svn/svn_HEVCSoftware/
diff --git a/third_party/jpeg-xl/third_party/HEVCSoftware/cfg/LICENSE b/third_party/jpeg-xl/third_party/HEVCSoftware/cfg/LICENSE
deleted file mode 100644
index a9d8844e42393..0000000000000
--- a/third_party/jpeg-xl/third_party/HEVCSoftware/cfg/LICENSE
+++ /dev/null
@@ -1,31 +0,0 @@
-The copyright in this software is being made available under the BSD
-License, included below. This software may be subject to other third party
-and contributor rights, including patent rights, and no such rights are
-granted under this license.   
-
-Copyright (c) 2010-2017, ITU/ISO/IEC
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- * Neither the name of the ITU/ISO/IEC nor the names of its contributors may
-   be used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/third_party/jpeg-xl/third_party/HEVCSoftware/cfg/encoder_intra_main_scc_10.cfg b/third_party/jpeg-xl/third_party/HEVCSoftware/cfg/encoder_intra_main_scc_10.cfg
deleted file mode 100644
index 5f6b95836d598..0000000000000
--- a/third_party/jpeg-xl/third_party/HEVCSoftware/cfg/encoder_intra_main_scc_10.cfg
+++ /dev/null
@@ -1,136 +0,0 @@
-#======== File I/O =====================
-BitstreamFile                 : str.bin
-ReconFile                     : rec.yuv
-
-#======== Profile definition ==============
-Profile                       : main-SCC   # Profile name to use for encoding. Use main (for FDIS main), main10 (for FDIS main10), main-still-picture, main-RExt, high-throughput-RExt, main-SCC
-Tier                          : main        # Tier to use for interpretation of --Level (main or high only)"
-
-#======== Unit definition ================
-MaxCUWidth                    : 64          # Maximum coding unit width in pixel
-MaxCUHeight                   : 64          # Maximum coding unit height in pixel
-MaxPartitionDepth             : 4           # Maximum coding unit depth
-QuadtreeTULog2MaxSize         : 5           # Log2 of maximum transform size for
-                                            # quadtree-based TU coding (2...6)
-QuadtreeTULog2MinSize         : 2           # Log2 of minimum transform size for
-                                            # quadtree-based TU coding (2...6)
-QuadtreeTUMaxDepthInter       : 3
-QuadtreeTUMaxDepthIntra       : 3
-
-#======== Coding Structure =============
-IntraPeriod                   : 1           # Period of I-Frame ( -1 = only first)
-DecodingRefreshType           : 1           # Random Access 0:none, 1:CRA, 2:IDR, 3:Recovery Point SEI
-GOPSize                       : 1           # GOP Size (number of B slice = GOPSize-1)
-ReWriteParamSetsFlag          : 1           # Write parameter sets with every IRAP
-#        Type POC QPoffset QPfactor tcOffsetDiv2 betaOffsetDiv2  temporal_id #ref_pics_active #ref_pics reference pictures  
-
-#=========== Motion Search =============
-FastSearch                    : 1           # 0:Full search  1:TZ search
-SearchRange                   : 64          # (0: Search range is a Full frame)
-HadamardME                    : 1           # Use of hadamard measure for fractional ME
-FEN                           : 1           # Fast encoder decision
-FDM                           : 1           # Fast Decision for Merge RD cost
-
-#======== Quantization =============
-QP                            : 32          # Quantization parameter(0-51)
-MaxDeltaQP                    : 0           # CU-based multi-QP optimization
-MaxCuDQPDepth                 : 0           # Max depth of a minimum CuDQP for sub-LCU-level delta QP
-DeltaQpRD                     : 0           # Slice-based multi-QP optimization
-RDOQ                          : 1           # RDOQ
-RDOQTS                        : 1           # RDOQ for transform skip
-CbQpOffset                    : 6
-CrQpOffset                    : 6
-
-#=========== Deblock Filter ============
-LoopFilterOffsetInPPS         : 1           # Dbl params: 0=varying params in SliceHeader, param = base_param + GOP_offset_param; 1 (default) =constant params in PPS, param = base_param)
-LoopFilterDisable             : 0           # Disable deblocking filter (0=Filter, 1=No Filter)
-LoopFilterBetaOffset_div2     : 0           # base_param: -6 ~ 6
-LoopFilterTcOffset_div2       : 0           # base_param: -6 ~ 6
-DeblockingFilterMetric        : 0           # blockiness metric (automatically configures deblocking parameters in bitstream). Applies slice-level loop filter offsets (LoopFilterOffsetInPPS and LoopFilterDisable must be 0)
-
-#=========== Misc. ============
-InternalBitDepth              : 10           # codec operating bit-depth
-
-#=========== Coding Tools =================
-SAO                           : 1           # Sample adaptive offset  (0: OFF, 1: ON)
-AMP                           : 1           # Asymmetric motion partitions (0: OFF, 1: ON)
-TransformSkip                 : 1           # Transform skipping (0: OFF, 1: ON)
-TransformSkipFast             : 1           # Fast Transform skipping (0: OFF, 1: ON)
-SAOLcuBoundary                : 0           # SAOLcuBoundary using non-deblocked pixels (0: OFF, 1: ON)
-
-#============ Slices ================
-SliceMode                : 0                # 0: Disable all slice options.
-                                            # 1: Enforce maximum number of LCU in an slice,
-                                            # 2: Enforce maximum number of bytes in an 'slice'
-                                            # 3: Enforce maximum number of tiles in a slice
-SliceArgument            : 1500             # Argument for 'SliceMode'.
-                                            # If SliceMode==1 it represents max. SliceGranularity-sized blocks per slice.
-                                            # If SliceMode==2 it represents max. bytes per slice.
-                                            # If SliceMode==3 it represents max. tiles per slice.
-
-LFCrossSliceBoundaryFlag : 1                # In-loop filtering, including ALF and DB, is across or not across slice boundary.
-                                            # 0:not across, 1: across
-
-#============ PCM ================
-PCMEnabledFlag                      : 0                # 0: No PCM mode
-PCMLog2MaxSize                      : 5                # Log2 of maximum PCM block size.
-PCMLog2MinSize                      : 3                # Log2 of minimum PCM block size.
-PCMInputBitDepthFlag                : 1                # 0: PCM bit-depth is internal bit-depth. 1: PCM bit-depth is input bit-depth.
-PCMFilterDisableFlag                : 0                # 0: Enable loop filtering on I_PCM samples. 1: Disable loop filtering on I_PCM samples.
-
-#============ Tiles ================
-TileUniformSpacing                  : 0                # 0: the column boundaries are indicated by TileColumnWidth array, the row boundaries are indicated by TileRowHeight array
-                                                       # 1: the column and row boundaries are distributed uniformly
-NumTileColumnsMinus1                : 0                # Number of tile columns in a picture minus 1
-TileColumnWidthArray                : 2 3              # Array containing tile column width values in units of CTU (from left to right in picture)   
-NumTileRowsMinus1                   : 0                # Number of tile rows in a picture minus 1
-TileRowHeightArray                  : 2                # Array containing tile row height values in units of CTU (from top to bottom in picture)
-
-LFCrossTileBoundaryFlag             : 1                # In-loop filtering is across or not across tile boundary.
-                                                       # 0:not across, 1: across 
-
-#============ WaveFront ================
-WaveFrontSynchro                    : 0                # 0:  No WaveFront synchronisation (WaveFrontSubstreams must be 1 in this case).
-                                                       # >0: WaveFront synchronises with the LCU above and to the right by this many LCUs.
-
-#=========== Quantization Matrix =================
-ScalingList                   : 0                      # ScalingList 0 : off, 1 : default, 2 : file read
-ScalingListFile               : scaling_list.txt       # Scaling List file name. If file is not exist, use Default Matrix.
-
-#============ Lossless ================
-TransquantBypassEnable     : 0                         # Value of PPS flag.
-CUTransquantBypassFlagForce: 0                         # Force transquant bypass mode, when transquant_bypass_enable_flag is enabled
-
-#=========== RExt ============
-ExtendedPrecision                   : 0                # Increased internal accuracies to support high bit depths (not valid in V1 profiles)
-TransformSkipLog2MaxSize            : 2                # Specify transform-skip maximum size. Minimum 2. (not valid in V1 profiles)
-ImplicitResidualDPCM                : 1                # Enable implicitly signalled residual DPCM for intra (also known as sample-adaptive intra predict) (not valid in V1 profiles)
-ExplicitResidualDPCM                : 1                # Enable explicitly signalled residual DPCM for inter and intra-block-copy (not valid in V1 profiles)
-ResidualRotation                    : 1                # Enable rotation of transform-skipped and transquant-bypassed TUs through 180 degrees prior to entropy coding (not valid in V1 profiles)
-SingleSignificanceMapContext        : 1                # Enable, for transform-skipped and transquant-bypassed TUs, the selection of a single significance map context variable for all coefficients (not valid in V1 profiles)
-IntraReferenceSmoothing             : 1                # 0: Disable use of intra reference smoothing (not valid in V1 profiles). 1: Enable use of intra reference smoothing (same as V1)
-GolombRiceParameterAdaptation       : 1                # Enable the partial retention of the Golomb-Rice parameter value from one coefficient group to the next
-HighPrecisionPredictionWeighting    : 1                # Use high precision option for weighted prediction (not valid in V1 profiles)
-CrossComponentPrediction            : 1                # Enable the use of cross-component prediction (not valid in V1 profiles)
-
-#=========== SCC ============
-IntraBlockCopyEnabled                  : 1             # Enable the use of intra block copying
-HashBasedIntraBlockCopySearchEnabled   : 1             # Use hash based search for intra block copying on 8x8 blocks
-IntraBlockCopySearchWidthInCTUs        : -1            # Search range for IBC (-1: full frame search)
-IntraBlockCopyNonHashSearchWidthInCTUs : 3             # Search range for IBC non-hash search method (i.e., fast/full search)
-MSEBasedSequencePSNR                   : 1             # 0:Emit sequence PSNR only as a linear average of the frame PSNRs, 1: also emit a sequence PSNR based on an average of the frame MSEs
-PrintClippedPSNR                       : 1             # 0:Print lossless PSNR values as 999.99 dB, 1: clip lossless PSNR according to resolution
-PrintFrameMSE                          : 1             # 0:emit only bit count and PSNRs for each frame, 1: also emit MSE values
-PrintSequenceMSE                       : 1             # 0:emit only bit rate and PSNRs for the whole sequence, 1 = also emit MSE values
-ColourTransform                        : 1             # Enable the use of color transform(not valid in V1 profiles)
-PaletteMode                            : 1             # Enable the use of palette mode(not valid in V1 profiles)
-PaletteMaxSize                         : 63            # Supported maximum palette size (not valid in V1 profiles)
-PaletteMaxPredSize                     : 128           # Supported maximum palette predictor size (not valid in V1 profiles)
-IntraBoundaryFilterDisabled            : 1             # Disable the use of intra boundary filtering (not valid in V1 profiles)
-TransquantBypassInferTUSplit           : 1             # Infer TU splitting for transquant bypass CUs
-PalettePredInSPSEnabled                : 0             # Transmit palette predictor initializer in SPS (not valid in V1 profiles)
-PalettePredInPPSEnabled                : 0             # Transmit palette predictor initializer in PPS (not valid in V1 profiles)
-SelectiveRDOQ                          : 1             # Selective RDOQ
-
-### DO NOT ADD ANYTHING BELOW THIS LINE ###
-### DO NOT DELETE THE EMPTY LINE BELOW ###
diff --git a/third_party/jpeg-xl/third_party/dirent.cc b/third_party/jpeg-xl/third_party/dirent.cc
deleted file mode 100644
index 3906084e03274..0000000000000
--- a/third_party/jpeg-xl/third_party/dirent.cc
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright (c) the JPEG XL Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#if defined(_WIN32) || defined(_WIN64)
-#include "third_party/dirent.h"
-
-#include "lib/jxl/base/status.h"
-
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif  // NOMINMAX
-
-#include <errno.h>
-#include <windows.h>
-
-#include <memory>
-#include <string>
-
-int mkdir(const char* path, mode_t /*mode*/) {
-  const LPSECURITY_ATTRIBUTES sec = nullptr;
-  if (!CreateDirectory(path, sec)) {
-    JXL_NOTIFY_ERROR("Failed to create directory %s", path);
-    return -1;
-  }
-  return 0;
-}
-
-// Modified from code bearing the following notice:
-// https://trac.wildfiregames.com/browser/ps/trunk/source/lib/sysdep/os/
-/* Copyright (C) 2010 Wildfire Games.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-struct DIR {
-  HANDLE hFind;
-
-  WIN32_FIND_DATA findData;  // indeterminate if hFind == INVALID_HANDLE_VALUE
-
-  // readdir will return the address of this member.
-  // (must be stored in DIR to allow multiple independent
-  // opendir/readdir sequences).
-  dirent ent;
-
-  // used by readdir to skip the first FindNextFile.
-  size_t numCalls = 0;
-};
-
-static bool IsValidDirectory(const char* path) {
-  const DWORD fileAttributes = GetFileAttributes(path);
-
-  // path not found
-  if (fileAttributes == INVALID_FILE_ATTRIBUTES) return false;
-
-  // not a directory
-  if ((fileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) return false;
-
-  return true;
-}
-
-DIR* opendir(const char* path) {
-  if (!IsValidDirectory(path)) {
-    errno = ENOENT;
-    return nullptr;
-  }
-
-  std::unique_ptr<DIR> d(new DIR);
-
-  // NB: "c:\\path" only returns information about that directory;
-  // trailing slashes aren't allowed. append "\\*" to retrieve its entries.
-  std::string searchPath(path);
-  if (searchPath.back() != '/' && searchPath.back() != '\\') {
-    searchPath += '\\';
-  }
-  searchPath += '*';
-
-  // (we don't defer FindFirstFile until readdir because callers
-  // expect us to return 0 if directory reading will/did fail.)
-  d->hFind = FindFirstFile(searchPath.c_str(), &d->findData);
-  if (d->hFind != INVALID_HANDLE_VALUE) return d.release();
-  if (GetLastError() == ERROR_NO_MORE_FILES) return d.release();  // empty
-
-  JXL_NOTIFY_ERROR("Failed to open directory %s", searchPath.c_str());
-  return nullptr;
-}
-
-int closedir(DIR* dir) {
-  delete dir;
-  return 0;
-}
-
-dirent* readdir(DIR* d) {
-  // "empty" case from opendir
-  if (d->hFind == INVALID_HANDLE_VALUE) return nullptr;
-
-  // until end of directory or a valid entry was found:
-  for (;;) {
-    if (d->numCalls++ != 0)  // (skip first call to FindNextFile - see opendir)
-    {
-      if (!FindNextFile(d->hFind, &d->findData)) {
-        JXL_DASSERT(GetLastError() == ERROR_NO_MORE_FILES);
-        SetLastError(0);
-        return nullptr;  // end of directory or error
-      }
-    }
-
-    // only return non-hidden and non-system entries
-    if ((d->findData.dwFileAttributes &
-         (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) == 0) {
-      d->ent.d_name = d->findData.cFileName;
-      return &d->ent;
-    }
-  }
-}
-
-#endif  // #if defined(_WIN32) || defined(_WIN64)
diff --git a/third_party/jpeg-xl/third_party/dirent.h b/third_party/jpeg-xl/third_party/dirent.h
deleted file mode 100644
index 37a08f425be92..0000000000000
--- a/third_party/jpeg-xl/third_party/dirent.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) the JPEG XL Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef LIB_JXL_THIRD_PARTY_DIRENT_H_
-#define LIB_JXL_THIRD_PARTY_DIRENT_H_
-
-// Emulates POSIX readdir for Windows
-
-#if defined(_WIN32) || defined(_WIN64)
-
-#include <sys/stat.h>  // S_IFREG
-
-#ifndef _MODE_T_
-typedef unsigned int mode_t;
-#endif  // _MODE_T_
-int mkdir(const char* path, mode_t mode);
-
-struct dirent {
-  char* d_name;  // no path
-};
-
-#define stat _stat64
-
-#ifndef S_ISDIR
-#define S_ISDIR(m) (m & S_IFDIR)
-#endif  // S_ISDIR
-
-#ifndef S_ISREG
-#define S_ISREG(m) (m & S_IFREG)
-#endif  // S_ISREG
-
-struct DIR;
-DIR* opendir(const char* path);
-int closedir(DIR* dir);
-dirent* readdir(DIR* d);
-
-#endif  // #if defined(_WIN32) || defined(_WIN64)
-#endif  // LIB_JXL_THIRD_PARTY_DIRENT_H_
diff --git a/third_party/jpeg-xl/third_party/lcms2.cmake b/third_party/jpeg-xl/third_party/lcms2.cmake
deleted file mode 100644
index dec6be9367a86..0000000000000
--- a/third_party/jpeg-xl/third_party/lcms2.cmake
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright (c) the JPEG XL Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-add_library(lcms2 STATIC EXCLUDE_FROM_ALL
-  lcms/src/cmsalpha.c
-  lcms/src/cmscam02.c
-  lcms/src/cmscgats.c
-  lcms/src/cmscnvrt.c
-  lcms/src/cmserr.c
-  lcms/src/cmsgamma.c
-  lcms/src/cmsgmt.c
-  lcms/src/cmshalf.c
-  lcms/src/cmsintrp.c
-  lcms/src/cmsio0.c
-  lcms/src/cmsio1.c
-  lcms/src/cmslut.c
-  lcms/src/cmsmd5.c
-  lcms/src/cmsmtrx.c
-  lcms/src/cmsnamed.c
-  lcms/src/cmsopt.c
-  lcms/src/cmspack.c
-  lcms/src/cmspcs.c
-  lcms/src/cmsplugin.c
-  lcms/src/cmsps2.c
-  lcms/src/cmssamp.c
-  lcms/src/cmssm.c
-  lcms/src/cmstypes.c
-  lcms/src/cmsvirt.c
-  lcms/src/cmswtpnt.c
-  lcms/src/cmsxform.c
-  lcms/src/lcms2_internal.h
-)
-target_include_directories(lcms2
-    PUBLIC "${CMAKE_CURRENT_LIST_DIR}/lcms/include")
-# This warning triggers with gcc-8.
-if (CMAKE_C_COMPILER_ID MATCHES "GNU")
-  target_compile_options(lcms2
-    PRIVATE
-      # gcc-only flags.
-      -Wno-stringop-truncation
-      -Wno-strict-aliasing
-  )
-endif()
-# By default LCMS uses sizeof(void*) for memory alignment, but in arm 32-bits we
-# can't access doubles not aligned to 8 bytes. This forces the alignment to 8
-# bytes.
-target_compile_definitions(lcms2
-  PRIVATE "-DCMS_PTR_ALIGNMENT=8")
-target_compile_definitions(lcms2
-  PUBLIC "-DCMS_NO_REGISTER_KEYWORD=1")
-
-# Ensure that a thread safe alternative of gmtime is used in LCMS
-include(CheckSymbolExists)
-check_symbol_exists(gmtime_r "time.h" HAVE_GMTIME_R)
-if (HAVE_GMTIME_R)
-  target_compile_definitions(lcms2
-    PUBLIC "-DHAVE_GMTIME_R=1")
-else()
-  check_symbol_exists(gmtime_s "time.h" HAVE_GMTIME_S)
-  if (HAVE_GMTIME_S)
-    target_compile_definitions(lcms2
-      PUBLIC "-DHAVE_GMTIME_S=1")
-  endif()
-endif()
-
-set_property(TARGET lcms2 PROPERTY POSITION_INDEPENDENT_CODE ON)
diff --git a/third_party/jpeg-xl/third_party/sjpeg.cmake b/third_party/jpeg-xl/third_party/sjpeg.cmake
deleted file mode 100644
index f1a69252ba472..0000000000000
--- a/third_party/jpeg-xl/third_party/sjpeg.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) the JPEG XL Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# We need to CACHE the SJPEG_BUILD_EXAMPLES to not be removed by the option()
-# inside SJPEG.
-set(SJPEG_BUILD_EXAMPLES NO CACHE BOOL "Examples")
-# SJPEG uses OpenGL which throws a warning if multiple options are installed.
-# This setting makes it prefer the new version.
-set(OpenGL_GL_PREFERENCE GLVND)
-
-# Build SJPEG as a static library.
-set(BUILD_SHARED_LIBS_BACKUP ${BUILD_SHARED_LIBS})
-set(BUILD_SHARED_LIBS OFF)
-add_subdirectory(sjpeg EXCLUDE_FROM_ALL)
-target_include_directories(sjpeg PUBLIC "${CMAKE_CURRENT_LIST_DIR}/sjpeg/src/")
-set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_BACKUP})
diff --git a/third_party/jpeg-xl/third_party/skcms.cmake b/third_party/jpeg-xl/third_party/skcms.cmake
deleted file mode 100644
index c383041346385..0000000000000
--- a/third_party/jpeg-xl/third_party/skcms.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) the JPEG XL Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-function(target_link_skcms TARGET_NAME)
-  target_sources(${TARGET_NAME} PRIVATE "${PROJECT_SOURCE_DIR}/third_party/skcms/skcms.cc")
-  target_include_directories(${TARGET_NAME} PRIVATE "${PROJECT_SOURCE_DIR}/third_party/skcms/")
-
-  include(CheckCXXCompilerFlag)
-  check_cxx_compiler_flag("-Wno-psabi" CXX_WPSABI_SUPPORTED)
-  if(CXX_WPSABI_SUPPORTED)
-    set_source_files_properties("${PROJECT_SOURCE_DIR}/third_party/skcms/skcms.cc"
-      PROPERTIES COMPILE_OPTIONS "-Wno-psabi"
-      TARGET_DIRECTORY ${TARGET_NAME})
-  endif()
-endfunction()
diff --git a/third_party/jpeg-xl/third_party/testing.cmake b/third_party/jpeg-xl/third_party/testing.cmake
deleted file mode 100644
index 5d8ad927598b9..0000000000000
--- a/third_party/jpeg-xl/third_party/testing.cmake
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright (c) the JPEG XL Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Enable tests in third_party/ as well.
-enable_testing()
-include(CTest)
-
-set(SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party")
-
-if(BUILD_TESTING)
-# Add GTest from source and alias it to what the find_package(GTest) workflow
-# defines. Omitting googletest/ directory would require it to be available in
-# the base system instead, but it would work just fine. This makes packages
-# using GTest and calling find_package(GTest) actually work.
-if (EXISTS "${SOURCE_DIR}/googletest/CMakeLists.txt" AND
-    NOT JPEGXL_FORCE_SYSTEM_GTEST)
-  add_subdirectory(third_party/googletest EXCLUDE_FROM_ALL)
-  include(GoogleTest)
-
-  set(GTEST_ROOT "${SOURCE_DIR}/googletest/googletest")
-  set(GTEST_INCLUDE_DIR "$<TARGET_PROPERTY:INCLUDE_DIRECTORIES,gtest>"
-      CACHE STRING "")
-  set(GMOCK_INCLUDE_DIR "$<TARGET_PROPERTY:INCLUDE_DIRECTORIES,gmock>")
-  set(GTEST_LIBRARY "$<TARGET_FILE:gtest>")
-  set(GTEST_MAIN_LIBRARY "$<TARGET_FILE:gtest_main>")
-
-  set_target_properties(gtest PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
-  set_target_properties(gmock PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
-  set_target_properties(gtest_main PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
-  set_target_properties(gmock_main PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
-
-  # googletest doesn't compile clean with clang-cl (-Wundef)
-  if (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-Wno-error")
-    set_target_properties(gmock PROPERTIES COMPILE_FLAGS "-Wno-error")
-    set_target_properties(gtest_main PROPERTIES COMPILE_FLAGS "-Wno-error")
-    set_target_properties(gmock_main PROPERTIES COMPILE_FLAGS "-Wno-error")
-  endif ()
-  configure_file("${SOURCE_DIR}/googletest/LICENSE"
-                 ${PROJECT_BINARY_DIR}/LICENSE.googletest COPYONLY)
-else()
-  if(JPEGXL_DEP_LICENSE_DIR)
-    configure_file("${JPEGXL_DEP_LICENSE_DIR}/googletest/copyright"
-                   ${PROJECT_BINARY_DIR}/LICENSE.googletest COPYONLY)
-  endif()  # JPEGXL_DEP_LICENSE_DIR
-  find_package(GTest REQUIRED)
-endif()
-
-endif()  # BUILD_TESTING

From db71b4860a66cba1512709b3fd8108a581dc5c97 Mon Sep 17 00:00:00 2001
From: Jan-Niklas Jaeschke <jjaschke@mozilla.com>
Date: Thu, 29 Jan 2026 10:33:23 +0000
Subject: [PATCH 015/116] Bug 2011818 - CSS Highlight API: Cache computedStyle
 of functional pseudo elements. r=emilio,firefox-style-system-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D280081
---
 layout/style/CachedInheritingStyles.cpp | 46 +++++++++++++++++--------
 layout/style/CachedInheritingStyles.h   | 22 ++++++++----
 layout/style/ComputedStyle.cpp          |  9 ++---
 layout/style/ComputedStyle.h            | 25 +++++++++++---
 layout/style/ServoStyleSet.cpp          | 11 +++---
 5 files changed, 77 insertions(+), 36 deletions(-)

diff --git a/layout/style/CachedInheritingStyles.cpp b/layout/style/CachedInheritingStyles.cpp
index da6e4d24e66ff..faffcddc940fc 100644
--- a/layout/style/CachedInheritingStyles.cpp
+++ b/layout/style/CachedInheritingStyles.cpp
@@ -7,54 +7,70 @@
 #include "mozilla/CachedInheritingStyles.h"
 
 #include "mozilla/ComputedStyle.h"
+#include "mozilla/PseudoStyleType.h"
 #include "nsCOMPtr.h"
 #include "nsWindowSizes.h"
 
 namespace mozilla {
 
-void CachedInheritingStyles::Insert(ComputedStyle* aStyle) {
+void CachedInheritingStyles::Insert(ComputedStyle* aStyle,
+                                    nsAtom* aFunctionalPseudoParameter) {
   MOZ_ASSERT(aStyle);
   MOZ_ASSERT(aStyle->IsInheritingAnonBox() ||
              aStyle->IsLazilyCascadedPseudoElement());
 
-  if (IsEmpty()) {
+  // For entries with a functional parameter, we always use indirect storage
+  // since direct mode only stores a ComputedStyle* without the parameter.
+  const bool needsIndirect = aFunctionalPseudoParameter != nullptr;
+
+  if (IsEmpty() && !needsIndirect) {
     RefPtr<ComputedStyle> s = aStyle;
     mBits = reinterpret_cast<uintptr_t>(s.forget().take());
     MOZ_ASSERT(!IsEmpty() && !IsIndirect());
   } else if (IsIndirect()) {
-    AsIndirect()->AppendElement(aStyle);
+    AsIndirect()->AppendElement(
+        CachedStyleEntry{aStyle, aFunctionalPseudoParameter});
   } else {
     IndirectCache* cache = new IndirectCache();
-    cache->AppendElement(dont_AddRef(AsDirect()));
-    cache->AppendElement(aStyle);
+    if (!IsEmpty()) {
+      cache->AppendElement(CachedStyleEntry{dont_AddRef(AsDirect()), nullptr});
+    }
+    cache->AppendElement(CachedStyleEntry{aStyle, aFunctionalPseudoParameter});
     mBits = reinterpret_cast<uintptr_t>(cache) | 1;
     MOZ_ASSERT(IsIndirect());
   }
 }
 
-ComputedStyle* CachedInheritingStyles::Lookup(PseudoStyleType aType) const {
-  MOZ_ASSERT(PseudoStyle::IsPseudoElement(aType) ||
-             PseudoStyle::IsInheritingAnonBox(aType));
+ComputedStyle* CachedInheritingStyles::Lookup(
+    const PseudoStyleRequest& aRequest) const {
+  MOZ_ASSERT(PseudoStyle::IsPseudoElement(aRequest.mType) ||
+             PseudoStyle::IsInheritingAnonBox(aRequest.mType));
   if (IsIndirect()) {
-    for (auto& style : *AsIndirect()) {
-      if (style->GetPseudoType() == aType) {
-        return style;
+    for (const auto& entry : *AsIndirect()) {
+      if (entry.mStyle->GetPseudoType() == aRequest.mType &&
+          entry.mFunctionalPseudoParameter == aRequest.mIdentifier) {
+        return entry.mStyle;
       }
     }
 
     return nullptr;
   }
 
+  // Direct mode only stores non-functional entries.
+  if (aRequest.mIdentifier) {
+    return nullptr;
+  }
+
   ComputedStyle* direct = AsDirect();
-  return direct && direct->GetPseudoType() == aType ? direct : nullptr;
+  return direct && direct->GetPseudoType() == aRequest.mType ? direct : nullptr;
 }
 
 void CachedInheritingStyles::AddSizeOfIncludingThis(nsWindowSizes& aSizes,
                                                     size_t* aCVsSize) const {
   if (IsIndirect()) {
-    for (auto& style : *AsIndirect()) {
-      if (!aSizes.mState.HaveSeenPtr(style)) {
-        style->AddSizeOfIncludingThis(aSizes, aCVsSize);
+    for (const auto& entry : *AsIndirect()) {
+      if (!aSizes.mState.HaveSeenPtr(entry.mStyle)) {
+        entry.mStyle->AddSizeOfIncludingThis(aSizes, aCVsSize);
       }
     }
 
diff --git a/layout/style/CachedInheritingStyles.h b/layout/style/CachedInheritingStyles.h
index cfe86594ca500..27896ebb992db 100644
--- a/layout/style/CachedInheritingStyles.h
+++ b/layout/style/CachedInheritingStyles.h
@@ -15,20 +15,30 @@ class nsWindowSizes;
 
 namespace mozilla {
 
+struct PseudoStyleRequest;
 enum class PseudoStyleType : uint8_t;
 class ComputedStyle;
 
+// Entry in the cached inheriting styles cache. Stores the style and, for
+// functional pseudo-elements like ::highlight(name), the functional parameter.
+struct CachedStyleEntry {
+  RefPtr<ComputedStyle> mStyle;
+  RefPtr<nsAtom> mFunctionalPseudoParameter;
+};
+
 // Cache of anonymous box and lazy pseudo styles that inherit from a given
 // style.
 //
 // To minimize memory footprint, the cache is word-sized with a tagged pointer
-// If there is only one entry, it's stored inline. If there are more, they're
-// stored in an out-of-line buffer. See bug 1429126 comment 0 and comment 1 for
-// the measurements and rationale that influenced the design.
+// If there is only one entry without a functional parameter, it's stored
+// inline. If there are more entries, or the entry has a functional parameter,
+// they're stored in an out-of-line buffer. See bug 1429126 comment 0 and
+// comment 1 for the measurements and rationale that influenced the design.
 class CachedInheritingStyles {
  public:
-  void Insert(ComputedStyle* aStyle);
-  ComputedStyle* Lookup(PseudoStyleType) const;
+  void Insert(ComputedStyle* aStyle,
+              nsAtom* aFunctionalPseudoParameter = nullptr);
+  ComputedStyle* Lookup(const PseudoStyleRequest& aRequest) const;
 
   CachedInheritingStyles() : mBits(0) {}
   ~CachedInheritingStyles() {
@@ -43,7 +53,7 @@ class CachedInheritingStyles {
 
  private:
   // See bug 1429126 comment 1 for the choice of four here.
-  typedef AutoTArray<RefPtr<ComputedStyle>, 4> IndirectCache;
+  using IndirectCache = AutoTArray<CachedStyleEntry, 4>;
 
   bool IsEmpty() const { return !mBits; }
   bool IsIndirect() const { return (mBits & 1); }
diff --git a/layout/style/ComputedStyle.cpp b/layout/style/ComputedStyle.cpp
index fc30f5350f8d0..1c593ac061e55 100644
--- a/layout/style/ComputedStyle.cpp
+++ b/layout/style/ComputedStyle.cpp
@@ -391,14 +391,15 @@ Maybe<StyleStructID> ComputedStyle::LookupStruct(const nsACString& aName) {
 #endif  // DEBUG
 
 ComputedStyle* ComputedStyle::GetCachedLazyPseudoStyle(
-    PseudoStyleType aPseudo) const {
-  MOZ_ASSERT(PseudoStyle::IsPseudoElement(aPseudo));
+    const PseudoStyleRequest& aRequest) const {
+  MOZ_ASSERT(PseudoStyle::IsPseudoElement(aRequest.mType));
 
-  if (nsCSSPseudoElements::PseudoElementSupportsUserActionState(aPseudo)) {
+  if (nsCSSPseudoElements::PseudoElementSupportsUserActionState(
+          aRequest.mType)) {
     return nullptr;
   }
 
-  return mCachedInheritingStyles.Lookup(aPseudo);
+  return mCachedInheritingStyles.Lookup(aRequest);
 }
 
 MOZ_DEFINE_MALLOC_ENCLOSING_SIZE_OF(ServoComputedValuesMallocEnclosingSizeOf)
diff --git a/layout/style/ComputedStyle.h b/layout/style/ComputedStyle.h
index 6a800b7a6b14c..7e04dc80d4518 100644
--- a/layout/style/ComputedStyle.h
+++ b/layout/style/ComputedStyle.h
@@ -184,6 +184,11 @@ class ComputedStyle {
     return bool(Flags() & Flag::SELF_OR_ANCESTOR_HAS_CONTAIN_STYLE);
   }
 
+  // Whether the style uses container query units (cqw, cqh, etc.).
+  bool UsesContainerUnits() const {
+    return bool(Flags() & Flag::USES_CONTAINER_UNITS);
+  }
+
   // Is the only link whose visitedness is allowed to influence the
   // style of the node this ComputedStyle is for (which is that element
   // or its nearest ancestor that is a link) visited?
@@ -207,18 +212,20 @@ class ComputedStyle {
   ComputedStyle* GetCachedInheritingAnonBoxStyle(
       PseudoStyleType aPseudoType) const {
     MOZ_ASSERT(PseudoStyle::IsInheritingAnonBox(aPseudoType));
-    return mCachedInheritingStyles.Lookup(aPseudoType);
+    return mCachedInheritingStyles.Lookup(PseudoStyleRequest(aPseudoType));
   }
 
   void SetCachedInheritedAnonBoxStyle(ComputedStyle* aStyle) {
     mCachedInheritingStyles.Insert(aStyle);
   }
 
-  ComputedStyle* GetCachedLazyPseudoStyle(PseudoStyleType aPseudo) const;
+  ComputedStyle* GetCachedLazyPseudoStyle(const PseudoStyleRequest&) const;
 
-  void SetCachedLazyPseudoStyle(ComputedStyle* aStyle) {
+  void SetCachedLazyPseudoStyle(ComputedStyle* aStyle,
+                                nsAtom* aFunctionalPseudoParameter) {
     MOZ_ASSERT(aStyle->IsPseudoElement());
-    MOZ_ASSERT(!GetCachedLazyPseudoStyle(aStyle->GetPseudoType()));
+    MOZ_ASSERT(!GetCachedLazyPseudoStyle(
+        {aStyle->GetPseudoType(), aFunctionalPseudoParameter}));
     MOZ_ASSERT(aStyle->IsLazilyCascadedPseudoElement());
 
     // Since we're caching lazy pseudo styles on the ComputedValues of the
@@ -235,7 +242,13 @@ class ComputedStyle {
       return;
     }
 
-    mCachedInheritingStyles.Insert(aStyle);
+    // Styles using container query units can become stale when container sizes
+    // change without the parent style changing, so don't cache them.
+    if (aStyle->UsesContainerUnits()) {
+      return;
+    }
+
+    mCachedInheritingStyles.Insert(aStyle, aFunctionalPseudoParameter);
   }
 
 #define GENERATE_ACCESSOR(name_)                                         \
@@ -356,6 +369,8 @@ class ComputedStyle {
   ServoComputedData mSource;
 
   // A cache of anonymous box and lazy pseudo styles inheriting from this style.
+  // For functional pseudo-elements like ::highlight(name), the functional
+  // parameter is stored alongside the style in the cache.
   CachedInheritingStyles mCachedInheritingStyles;
 
   const PseudoStyleType mPseudoType;
diff --git a/layout/style/ServoStyleSet.cpp b/layout/style/ServoStyleSet.cpp
index 023b79c2009a5..410ddfcc91b61 100644
--- a/layout/style/ServoStyleSet.cpp
+++ b/layout/style/ServoStyleSet.cpp
@@ -455,13 +455,12 @@ already_AddRefed<ComputedStyle> ServoStyleSet::ResolvePseudoElementStyle(
   UpdateStylistIfNeeded();
   MOZ_ASSERT(PseudoStyle::IsPseudoElement(aType));
 
-  // caching is done using `aType` only, therefore results would be wrong for
-  // pseudos with functional parameters (e.g. `::highlight(foo)`).
   const bool cacheable =
-      !aFunctionalPseudoParameter &&
       LazyPseudoIsCacheable(aType, aOriginatingElement, aParentStyle);
-  RefPtr<ComputedStyle> style =
-      cacheable ? aParentStyle->GetCachedLazyPseudoStyle(aType) : nullptr;
+  RefPtr<ComputedStyle> style = cacheable
+                                    ? aParentStyle->GetCachedLazyPseudoStyle(
+                                          {aType, aFunctionalPseudoParameter})
+                                    : nullptr;
 
   const bool isProbe = aIsProbe == IsProbe::Yes;
 
@@ -479,7 +478,7 @@ already_AddRefed<ComputedStyle> ServoStyleSet::ResolvePseudoElementStyle(
       return nullptr;
     }
     if (cacheable) {
-      aParentStyle->SetCachedLazyPseudoStyle(style);
+      aParentStyle->SetCachedLazyPseudoStyle(style, aFunctionalPseudoParameter);
     }
   }
 

From 8ce1ea2630e9a4f0fed4e3f3cc7778031d62646a Mon Sep 17 00:00:00 2001
From: iorgamgabriel <iorgamgabriel@yahoo.com>
Date: Thu, 29 Jan 2026 10:51:56 +0000
Subject: [PATCH 016/116] Bug 2004990 - [Downloads path] Fix the name guessing
 for new Download location. r=android-reviewers,tthibaud

Differential Revision: https://phabricator.services.mozilla.com/D278753
---
 gradle/libs.versions.toml                     |   2 +
 .../browser/engine-gecko/build.gradle         |   1 +
 .../browser/engine/gecko/GeckoEngine.kt       | 148 ++++++-
 .../engine/gecko/GeckoEngineSession.kt        |  19 +-
 .../GeckoServiceWorkerDelegate.kt             |  11 +-
 .../gecko/util/SpeculativeSessionFactory.kt   |  22 +-
 .../gecko/webextension/GeckoWebExtension.kt   |   8 +-
 .../engine/gecko/GeckoEngineSessionTest.kt    |   6 +
 .../GeckoServiceWorkerDelegateTest.kt         |   4 +-
 .../util/SpeculativeSessionFactoryTest.kt     |  73 ++-
 .../browser/engine/system/SystemEngineView.kt |  28 +-
 .../components/feature/downloads/build.gradle |   1 +
 .../downloads/AbstractFetchDownloadService.kt |   9 +-
 .../downloads/DownloadDialogFragment.kt       |   5 +-
 .../feature/downloads/DownloadsFeature.kt     |  29 +-
 .../feature/downloads/ext/DownloadState.kt    |  26 +-
 .../manager/AndroidDownloadManager.kt         |  34 +-
 .../AbstractFetchDownloadServiceTest.kt       |   5 +
 .../downloads/DownloadDialogFragmentTest.kt   |   3 +-
 .../feature/downloads/DownloadsFeatureTest.kt |  22 +-
 .../downloads/ext/DownloadStateKtTest.kt      |  17 +-
 .../manager/AndroidDownloadManagerTest.kt     |  23 +-
 .../manager/FetchDownloadManagerTest.kt       |   3 +
 .../components/support/utils/build.gradle     |   8 +
 .../support/utils/DefaultDownloadFileUtils.kt | 169 +++++++
 .../support/utils/DownloadFileUtils.kt        |  56 +++
 .../components/support/utils/DownloadUtils.kt | 123 +++---
 .../utils/DefaultDownloadFileUtilsTest.kt     | 418 ++++++++++++++++++
 .../support/utils/DownloadUtilsTest.kt        | 403 -----------------
 .../support/utils/FakeDownloadFileUtils.kt    |  74 ++++
 .../android-components/docs/changelog.md      |   3 +
 .../browser/downloads/DownloadService.kt      |  13 +
 .../fenix/browser/BaseBrowserFragment.kt      |  10 +
 .../java/org/mozilla/fenix/components/Core.kt |  16 +-
 .../fenix/downloads/DownloadService.kt        |  13 +
 .../focus/downloads/DownloadService.kt        |  13 +
 36 files changed, 1251 insertions(+), 567 deletions(-)
 create mode 100644 mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DefaultDownloadFileUtils.kt
 create mode 100644 mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DownloadFileUtils.kt
 create mode 100644 mobile/android/android-components/components/support/utils/src/test/java/mozilla/components/support/utils/DefaultDownloadFileUtilsTest.kt
 create mode 100644 mobile/android/android-components/components/support/utils/src/testFixtures/kotlin/mozilla/components/support/utils/FakeDownloadFileUtils.kt

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index eceb6f03f9cc6..9356cbe76063e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -40,6 +40,7 @@ palette = "1.0.0"
 preferences = "1.2.1"
 profileinstaller = "1.4.0"
 recyclerview = "1.4.0"
+documentfile = "1.0.1"
 room = "2.8.4"
 savedstate = "1.4.0"
 swiperefreshlayout = "1.2.0"
@@ -171,6 +172,7 @@ androidx-palette = { group = "androidx.palette", name = "palette-ktx", version.r
 androidx-preferences = { group = "androidx.preference", name = "preference", version.ref = "preferences" }
 androidx-profileinstaller = { group = "androidx.profileinstaller", name = "profileinstaller", version.ref = "profileinstaller" }
 androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerview" }
+androidx-documentfile = { group = "androidx.documentfile", name = "documentfile", version.ref = "documentfile" }
 androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
 androidx-room-runtime = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
 androidx-room-testing = { group = "androidx.room", name = "room-testing", version.ref = "room" }
diff --git a/mobile/android/android-components/components/browser/engine-gecko/build.gradle b/mobile/android/android-components/components/browser/engine-gecko/build.gradle
index 3875a621feaf6..8541d199476ef 100644
--- a/mobile/android/android-components/components/browser/engine-gecko/build.gradle
+++ b/mobile/android/android-components/components/browser/engine-gecko/build.gradle
@@ -67,6 +67,7 @@ dependencies {
 
     testImplementation project(':components:support-test')
     testImplementation project(':components:tooling-fetch-tests')
+    testImplementation testFixtures(project(':components:support-utils'))
 
     testImplementation libs.androidx.test.core
     testImplementation libs.androidx.test.junit
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt
index 60fb24214c178..c059b6fbb2b98 100644
--- a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt
+++ b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt
@@ -5,6 +5,7 @@
 package mozilla.components.browser.engine.gecko
 
 import android.content.Context
+import android.os.Environment
 import android.os.Parcelable
 import android.util.AttributeSet
 import android.util.JsonReader
@@ -82,6 +83,8 @@ import mozilla.components.concept.engine.webnotifications.WebNotificationDelegat
 import mozilla.components.concept.engine.webpush.WebPushDelegate
 import mozilla.components.concept.engine.webpush.WebPushHandler
 import mozilla.components.support.ktx.kotlin.isResourceUrl
+import mozilla.components.support.utils.DefaultDownloadFileUtils
+import mozilla.components.support.utils.DownloadFileUtils
 import mozilla.components.support.utils.ThreadUtils
 import org.json.JSONObject
 import org.mozilla.geckoview.AllowOrDeny
@@ -114,6 +117,14 @@ class GeckoEngine(
     private val geckoPreferenceAccessor: GeckoPreferenceAccessor = DefaultGeckoPreferenceAccessor(),
     private val runtimeTranslationAccessor: RuntimeTranslationAccessor = DefaultRuntimeTranslationAccessor(),
     private val addressStructureAccessor: RuntimeAddressStructureAccessor = DefaultRuntimeAddressStructureAccessor(),
+    private val downloadFileUtils: DownloadFileUtils = DefaultDownloadFileUtils(
+        context = context,
+        downloadLocationGetter = {
+            Environment.getExternalStoragePublicDirectory(
+                Environment.DIRECTORY_DOWNLOADS,
+            ).path
+        },
+    ),
 ) : Engine, WebExtensionRuntime, TranslationsRuntime, BrowserPreferencesRuntime {
     private val executor by lazy { executorProvider.invoke() }
     private val localeUpdater = LocaleSettingUpdater(context, runtime)
@@ -133,8 +144,9 @@ class GeckoEngine(
             return webExtensionDelegate?.onToggleActionPopup(
                 extension,
                 GeckoEngineSession(
-                    runtime,
+                    runtime = runtime,
                     defaultSettings = defaultSettings,
+                    downloadFileUtils = downloadFileUtils,
                 ),
                 action,
             )
@@ -219,7 +231,13 @@ class GeckoEngine(
     override fun createSession(private: Boolean, contextId: String?): EngineSession {
         ThreadUtils.assertOnUiThread()
         val speculativeSession = speculativeConnectionFactory.get(private, contextId)
-        return speculativeSession ?: GeckoEngineSession(runtime, private, defaultSettings, contextId)
+        return speculativeSession ?: GeckoEngineSession(
+            runtime = runtime,
+            privateMode = private,
+            downloadFileUtils = downloadFileUtils,
+            defaultSettings = defaultSettings,
+            contextId = contextId,
+        )
     }
 
     /**
@@ -241,7 +259,13 @@ class GeckoEngine(
      */
     override fun speculativeCreateSession(private: Boolean, contextId: String?) {
         ThreadUtils.assertOnUiThread()
-        speculativeConnectionFactory.create(runtime, private, contextId, defaultSettings)
+        speculativeConnectionFactory.create(
+            runtime = runtime,
+            private = private,
+            contextId = contextId,
+            defaultSettings = defaultSettings,
+            downloadFileUtils = downloadFileUtils,
+        )
     }
 
     /**
@@ -347,7 +371,11 @@ class GeckoEngine(
         runtime.webExtensionController.update((extension as GeckoWebExtension).nativeExtension).then(
             { geckoExtension ->
                 val updatedExtension = if (geckoExtension != null) {
-                    GeckoWebExtension(geckoExtension, runtime).also {
+                    GeckoWebExtension(
+                        nativeExtension = geckoExtension,
+                        runtime = runtime,
+                        downloadFileUtils = downloadFileUtils,
+                    ).also {
                         it.registerActionHandler(webExtensionActionHandler)
                         it.registerTabHandler(webExtensionTabHandler, defaultSettings)
                     }
@@ -383,7 +411,11 @@ class GeckoEngine(
                 val result = GeckoResult<NativePermissionPromptResponse>()
 
                 webExtensionDelegate.onInstallPermissionRequest(
-                    GeckoWebExtension(ext, runtime),
+                    GeckoWebExtension(
+                        nativeExtension = ext,
+                        runtime = runtime,
+                        downloadFileUtils = downloadFileUtils,
+                    ),
                     permissions.toList(),
                     origins.toList(),
                     dataCollectionPermissions.toList(),
@@ -408,7 +440,11 @@ class GeckoEngine(
             ): GeckoResult<AllowOrDeny>? {
                 val result = GeckoResult<AllowOrDeny>()
                 webExtensionDelegate.onUpdatePermissionRequest(
-                    GeckoWebExtension(extension, runtime),
+                    GeckoWebExtension(
+                        nativeExtension = extension,
+                        runtime = runtime,
+                        downloadFileUtils = downloadFileUtils,
+                    ),
                     newPermissions.toList(),
                     newOrigins.toList(),
                     newDataCollectionPermissions.toList(),
@@ -426,7 +462,11 @@ class GeckoEngine(
             ): GeckoResult<AllowOrDeny>? {
                 val result = GeckoResult<AllowOrDeny>()
                 webExtensionDelegate.onOptionalPermissionsRequest(
-                    GeckoWebExtension(extension, runtime),
+                    GeckoWebExtension(
+                        nativeExtension = extension,
+                        runtime = runtime,
+                        downloadFileUtils = downloadFileUtils,
+                    ),
                     permissions.toList(),
                     origins.toList(),
                     dataCollectionPermissions.toList(),
@@ -445,23 +485,51 @@ class GeckoEngine(
 
         val addonManagerDelegate = object : WebExtensionController.AddonManagerDelegate {
             override fun onDisabled(extension: org.mozilla.geckoview.WebExtension) {
-                webExtensionDelegate.onDisabled(GeckoWebExtension(extension, runtime))
+                webExtensionDelegate.onDisabled(
+                    GeckoWebExtension(
+                        nativeExtension = extension,
+                        runtime = runtime,
+                        downloadFileUtils = downloadFileUtils,
+                    ),
+                )
             }
 
             override fun onEnabled(extension: org.mozilla.geckoview.WebExtension) {
-                webExtensionDelegate.onEnabled(GeckoWebExtension(extension, runtime))
+                webExtensionDelegate.onEnabled(
+                    GeckoWebExtension(
+                        nativeExtension = extension,
+                        runtime = runtime,
+                        downloadFileUtils = downloadFileUtils,
+                    ),
+                )
             }
 
             override fun onReady(extension: org.mozilla.geckoview.WebExtension) {
-                webExtensionDelegate.onReady(GeckoWebExtension(extension, runtime))
+                webExtensionDelegate.onReady(
+                    GeckoWebExtension(
+                        nativeExtension = extension,
+                        runtime = runtime,
+                        downloadFileUtils = downloadFileUtils,
+                    ),
+                )
             }
 
             override fun onUninstalled(extension: org.mozilla.geckoview.WebExtension) {
-                webExtensionDelegate.onUninstalled(GeckoWebExtension(extension, runtime))
+                webExtensionDelegate.onUninstalled(
+                    GeckoWebExtension(
+                        nativeExtension = extension,
+                        runtime = runtime,
+                        downloadFileUtils = downloadFileUtils,
+                    ),
+                )
             }
 
             override fun onInstalled(extension: org.mozilla.geckoview.WebExtension) {
-                val installedExtension = GeckoWebExtension(extension, runtime)
+                val installedExtension = GeckoWebExtension(
+                    nativeExtension = extension,
+                    runtime = runtime,
+                    downloadFileUtils = downloadFileUtils,
+                )
                 webExtensionDelegate.onInstalled(installedExtension)
                 installedExtension.registerActionHandler(webExtensionActionHandler)
                 installedExtension.registerTabHandler(webExtensionTabHandler, defaultSettings)
@@ -480,7 +548,13 @@ class GeckoEngine(
             }
 
             override fun onOptionalPermissionsChanged(extension: org.mozilla.geckoview.WebExtension) {
-                webExtensionDelegate.onOptionalPermissionsChanged(GeckoWebExtension(extension, runtime))
+                webExtensionDelegate.onOptionalPermissionsChanged(
+                    GeckoWebExtension(
+                        nativeExtension = extension,
+                        runtime = runtime,
+                        downloadFileUtils = downloadFileUtils,
+                    ),
+                )
             }
         }
 
@@ -503,7 +577,11 @@ class GeckoEngine(
         runtime.webExtensionController.list().then(
             {
                 val extensions = it?.map { extension ->
-                    GeckoWebExtension(extension, runtime)
+                    GeckoWebExtension(
+                        nativeExtension = extension,
+                        runtime = runtime,
+                        downloadFileUtils = downloadFileUtils,
+                    )
                 } ?: emptyList()
 
                 extensions.forEach { extension ->
@@ -532,7 +610,11 @@ class GeckoEngine(
     ) {
         runtime.webExtensionController.enable((extension as GeckoWebExtension).nativeExtension, source.id).then(
             {
-                val enabledExtension = GeckoWebExtension(it!!, runtime)
+                val enabledExtension = GeckoWebExtension(
+                    nativeExtension = it!!,
+                    runtime = runtime,
+                    downloadFileUtils = downloadFileUtils,
+                )
                 onSuccess(enabledExtension)
                 GeckoResult<Void>()
             },
@@ -570,7 +652,11 @@ class GeckoEngine(
             dataCollectionPermissions.toTypedArray(),
         ).then(
             {
-                val enabledExtension = GeckoWebExtension(it!!, runtime)
+                val enabledExtension = GeckoWebExtension(
+                    nativeExtension = it!!,
+                    runtime = runtime,
+                    downloadFileUtils = downloadFileUtils,
+                )
                 onSuccess(enabledExtension)
                 GeckoResult<Void>()
             },
@@ -608,7 +694,11 @@ class GeckoEngine(
             dataCollectionPermissions.toTypedArray(),
         ).then(
             {
-                val enabledExtension = GeckoWebExtension(it!!, runtime)
+                val enabledExtension = GeckoWebExtension(
+                    nativeExtension = it!!,
+                    runtime = runtime,
+                    downloadFileUtils = downloadFileUtils,
+                )
                 onSuccess(enabledExtension)
                 GeckoResult<Void>()
             },
@@ -630,7 +720,11 @@ class GeckoEngine(
     ) {
         runtime.webExtensionController.disable((extension as GeckoWebExtension).nativeExtension, source.id).then(
             {
-                val disabledExtension = GeckoWebExtension(it!!, runtime)
+                val disabledExtension = GeckoWebExtension(
+                    nativeExtension = it!!,
+                    runtime = runtime,
+                    downloadFileUtils = downloadFileUtils,
+                )
                 onSuccess(disabledExtension)
                 GeckoResult<Void>()
             },
@@ -663,7 +757,11 @@ class GeckoEngine(
                         ),
                     )
                 } else {
-                    val ext = GeckoWebExtension(geckoExtension, runtime)
+                    val ext = GeckoWebExtension(
+                        nativeExtension = geckoExtension,
+                        runtime = runtime,
+                        downloadFileUtils = downloadFileUtils,
+                    )
                     webExtensionDelegate?.onAllowedInPrivateBrowsingChanged(ext)
                     onSuccess(ext)
                 }
@@ -780,6 +878,7 @@ class GeckoEngine(
         runtime.serviceWorkerDelegate = GeckoServiceWorkerDelegate(
             delegate = serviceWorkerDelegate,
             runtime = runtime,
+            downloadFileUtils = downloadFileUtils,
             engineSettings = defaultSettings,
         )
     }
@@ -1842,8 +1941,9 @@ class GeckoEngine(
     internal fun org.mozilla.geckoview.WebExtension?.toSafeWebExtension(): GeckoWebExtension? {
         return if (this != null) {
             GeckoWebExtension(
-                this,
-                runtime,
+                nativeExtension = this,
+                runtime = runtime,
+                downloadFileUtils = downloadFileUtils,
             )
         } else {
             null
@@ -1854,7 +1954,11 @@ class GeckoEngine(
         ext: org.mozilla.geckoview.WebExtension,
         onSuccess: ((WebExtension) -> Unit),
     ) {
-        val installedExtension = GeckoWebExtension(ext, runtime)
+        val installedExtension = GeckoWebExtension(
+            nativeExtension = ext,
+            runtime = runtime,
+            downloadFileUtils = downloadFileUtils,
+        )
         webExtensionDelegate?.onInstalled(installedExtension)
         installedExtension.registerActionHandler(webExtensionActionHandler)
         installedExtension.registerTabHandler(webExtensionTabHandler, defaultSettings)
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt
index 0d4b6de655323..57804842ef08f 100644
--- a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt
+++ b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt
@@ -60,6 +60,7 @@ import mozilla.components.support.ktx.kotlin.isPhone
 import mozilla.components.support.ktx.kotlin.sanitizeFileName
 import mozilla.components.support.ktx.kotlin.tryGetHostFromUrl
 import mozilla.components.support.utils.CertificateUtils
+import mozilla.components.support.utils.DownloadFileUtils
 import mozilla.components.support.utils.DownloadUtils
 import mozilla.components.support.utils.DownloadUtils.RESPONSE_CODE_SUCCESS
 import mozilla.components.support.utils.DownloadUtils.makePdfContentDisposition
@@ -90,6 +91,7 @@ class GeckoEngineSession(
     private val runtime: GeckoRuntime,
     private val privateMode: Boolean = false,
     private val defaultSettings: Settings? = null,
+    private val downloadFileUtils: DownloadFileUtils? = null,
     contextId: String? = null,
     private val geckoSessionProvider: () -> GeckoSession = {
         val settings = GeckoSessionSettings.Builder()
@@ -258,8 +260,8 @@ class GeckoEngineSession(
                 val contentLength = 0L
                 // NB: If the title is an empty string, there is a chance the PDF will not have a name.
                 // See https://github.com/mozilla-mobile/android-components/issues/12276
-                val fileName = DownloadUtils.guessFileName(
-                    disposition,
+                val fileName = downloadFileUtils?.guessFileName(
+                    contentDisposition = disposition,
                     url = url,
                     mimeType = contentType,
                 )
@@ -981,7 +983,12 @@ class GeckoEngineSession(
             uri: String,
         ): GeckoResult<GeckoSession> {
             val newEngineSession =
-                GeckoEngineSession(runtime, privateMode, defaultSettings, openGeckoSession = false)
+                GeckoEngineSession(
+                    runtime = runtime,
+                    privateMode = privateMode,
+                    downloadFileUtils = downloadFileUtils,
+                    openGeckoSession = false,
+                )
             notifyObservers {
                 onWindowRequest(GeckoWindowRequest(uri, newEngineSession))
             }
@@ -1294,8 +1301,8 @@ class GeckoEngineSession(
                 val contentLength = headers[CONTENT_LENGTH]?.trim()?.toLongOrNull()
                 val contentDisposition = headers[CONTENT_DISPOSITION]?.trim()
                 val url = uri
-                val fileName = DownloadUtils.guessFileName(
-                    contentDisposition,
+                val fileName = downloadFileUtils?.guessFileName(
+                    contentDisposition = contentDisposition,
                     url = url,
                     mimeType = contentType,
                 )
@@ -1305,7 +1312,7 @@ class GeckoEngineSession(
                         url = url,
                         contentLength = contentLength,
                         contentType = DownloadUtils.sanitizeMimeType(contentType),
-                        fileName = fileName.sanitizeFileName(),
+                        fileName = fileName?.sanitizeFileName(),
                         response = response,
                         isPrivate = privateMode,
                         openInApp = webResponse.requestExternalApp,
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/serviceworker/GeckoServiceWorkerDelegate.kt b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/serviceworker/GeckoServiceWorkerDelegate.kt
index 3bf0f24fff2d2..92b9baf254f2b 100644
--- a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/serviceworker/GeckoServiceWorkerDelegate.kt
+++ b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/serviceworker/GeckoServiceWorkerDelegate.kt
@@ -8,6 +8,7 @@ import mozilla.components.browser.engine.gecko.GeckoEngineSession
 import mozilla.components.concept.engine.EngineSession
 import mozilla.components.concept.engine.Settings
 import mozilla.components.concept.engine.serviceworker.ServiceWorkerDelegate
+import mozilla.components.support.utils.DownloadFileUtils
 import org.mozilla.geckoview.GeckoResult
 import org.mozilla.geckoview.GeckoRuntime
 import org.mozilla.geckoview.GeckoSession
@@ -18,14 +19,22 @@ import org.mozilla.geckoview.GeckoSession
  * @param delegate [ServiceWorkerDelegate] handling service workers requests.
  * @param runtime [GeckoRuntime] current engine's runtime.
  * @param engineSettings [Settings] default settings used when new [EngineSession]s are to be created.
+ * @param downloadFileUtils [DownloadFileUtils] helper for handling download file operations.
  */
 class GeckoServiceWorkerDelegate(
     internal val delegate: ServiceWorkerDelegate,
     internal val runtime: GeckoRuntime,
     internal val engineSettings: Settings?,
+    private val downloadFileUtils: DownloadFileUtils,
 ) : GeckoRuntime.ServiceWorkerDelegate {
     override fun onOpenWindow(url: String): GeckoResult<GeckoSession> {
-        val newEngineSession = GeckoEngineSession(runtime, false, engineSettings, openGeckoSession = false)
+        val newEngineSession = GeckoEngineSession(
+            runtime = runtime,
+            downloadFileUtils = downloadFileUtils,
+            privateMode = false,
+            defaultSettings = engineSettings,
+            openGeckoSession = false,
+        )
 
         return when (delegate.addNewTab(newEngineSession)) {
             true -> GeckoResult.fromValue(newEngineSession.geckoSession)
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/util/SpeculativeSessionFactory.kt b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/util/SpeculativeSessionFactory.kt
index 7e4e095ba48b6..39858e6a230ee 100644
--- a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/util/SpeculativeSessionFactory.kt
+++ b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/util/SpeculativeSessionFactory.kt
@@ -8,6 +8,7 @@ import androidx.annotation.VisibleForTesting
 import mozilla.components.browser.engine.gecko.GeckoEngineSession
 import mozilla.components.concept.engine.EngineSession
 import mozilla.components.concept.engine.Settings
+import mozilla.components.support.utils.DownloadFileUtils
 import org.mozilla.geckoview.GeckoRuntime
 
 /**
@@ -29,6 +30,7 @@ internal class SpeculativeSessionFactory {
         private: Boolean,
         contextId: String?,
         defaultSettings: Settings?,
+        downloadFileUtils: DownloadFileUtils,
     ) {
         if (speculativeEngineSession?.matches(private, contextId) == true) {
             // We already have a speculative engine session for this configuration. Nothing to do here.
@@ -39,11 +41,12 @@ internal class SpeculativeSessionFactory {
         clear()
 
         speculativeEngineSession = SpeculativeEngineSession.create(
-            this,
-            runtime,
-            private,
-            contextId,
-            defaultSettings,
+            factory = this,
+            runtime = runtime,
+            private = private,
+            contextId = contextId,
+            downloadFileUtils = downloadFileUtils,
+            defaultSettings = defaultSettings,
         )
     }
 
@@ -124,10 +127,17 @@ internal class SpeculativeEngineSession constructor(
             factory: SpeculativeSessionFactory,
             runtime: GeckoRuntime,
             private: Boolean,
+            downloadFileUtils: DownloadFileUtils,
             contextId: String?,
             defaultSettings: Settings?,
         ): SpeculativeEngineSession {
-            val engineSession = GeckoEngineSession(runtime, private, defaultSettings, contextId)
+            val engineSession = GeckoEngineSession(
+                runtime = runtime,
+                privateMode = private,
+                downloadFileUtils = downloadFileUtils,
+                defaultSettings = defaultSettings,
+                contextId = contextId,
+            )
             val observer = SpeculativeSessionObserver(factory)
             engineSession.register(observer)
 
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/webextension/GeckoWebExtension.kt b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/webextension/GeckoWebExtension.kt
index d7deea0907fe7..66f211e133421 100644
--- a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/webextension/GeckoWebExtension.kt
+++ b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/webextension/GeckoWebExtension.kt
@@ -20,6 +20,7 @@ import mozilla.components.concept.engine.webextension.Port
 import mozilla.components.concept.engine.webextension.TabHandler
 import mozilla.components.concept.engine.webextension.WebExtension
 import mozilla.components.support.base.log.logger.Logger
+import mozilla.components.support.utils.DownloadFileUtils
 import org.json.JSONObject
 import org.mozilla.geckoview.AllowOrDeny
 import org.mozilla.geckoview.GeckoResult
@@ -35,6 +36,7 @@ import org.mozilla.geckoview.WebExtension.Action as GeckoNativeWebExtensionActio
 class GeckoWebExtension(
     val nativeExtension: GeckoNativeWebExtension,
     val runtime: GeckoRuntime,
+    val downloadFileUtils: DownloadFileUtils? = null,
 ) : WebExtension(nativeExtension.id, nativeExtension.location, true) {
 
     private val connectedPorts: MutableMap<PortId, GeckoPort> = mutableMapOf()
@@ -261,7 +263,8 @@ class GeckoWebExtension(
                 tabDetails: GeckoNativeWebExtension.CreateTabDetails,
             ): GeckoResult<GeckoSession>? {
                 val geckoEngineSession = GeckoEngineSession(
-                    runtime,
+                    runtime = runtime,
+                    downloadFileUtils = downloadFileUtils,
                     defaultSettings = defaultSettings,
                     openGeckoSession = false,
                 )
@@ -280,7 +283,8 @@ class GeckoWebExtension(
                     tabHandler.onNewTab(
                         this@GeckoWebExtension,
                         GeckoEngineSession(
-                            runtime,
+                            runtime = runtime,
+                            downloadFileUtils = downloadFileUtils,
                             defaultSettings = defaultSettings,
                         ),
                         false,
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt
index b850b338a2042..6a30bfb37509d 100644
--- a/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt
+++ b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt
@@ -51,6 +51,7 @@ import mozilla.components.support.test.expectException
 import mozilla.components.support.test.mock
 import mozilla.components.support.test.whenever
 import mozilla.components.support.utils.DownloadUtils.RESPONSE_CODE_SUCCESS
+import mozilla.components.support.utils.FakeDownloadFileUtils
 import mozilla.components.support.utils.ThreadUtils
 import mozilla.components.test.ReflectionUtils
 import org.json.JSONObject
@@ -337,6 +338,7 @@ class GeckoEngineSessionTest {
             mock(),
             geckoSessionProvider = geckoSessionProvider,
             privateMode = true,
+            downloadFileUtils = FakeDownloadFileUtils(guessFileName = { _, _, _ -> "image name.png" }),
         )
 
         val observer: EngineSession.Observer = mock()
@@ -376,6 +378,7 @@ class GeckoEngineSessionTest {
             mock(),
             geckoSessionProvider = geckoSessionProvider,
             privateMode = true,
+            downloadFileUtils = FakeDownloadFileUtils(guessFileName = { _, _, _ -> "image image.png" }),
         )
 
         val observer: EngineSession.Observer = mock()
@@ -416,6 +419,7 @@ class GeckoEngineSessionTest {
             mock(),
             geckoSessionProvider = geckoSessionProvider,
             privateMode = true,
+            downloadFileUtils = FakeDownloadFileUtils(guessFileName = { _, _, _ -> "image.png" }),
         )
 
         val observer: EngineSession.Observer = mock()
@@ -453,6 +457,7 @@ class GeckoEngineSessionTest {
             mock(),
             geckoSessionProvider = geckoSessionProvider,
             privateMode = true,
+            downloadFileUtils = FakeDownloadFileUtils(guessFileName = { _, _, _ -> "image.png" }),
         )
 
         val observer: EngineSession.Observer = mock()
@@ -4619,6 +4624,7 @@ class GeckoEngineSessionTest {
         val engineSession = GeckoEngineSession(
             runtime = mock(),
             geckoSessionProvider = geckoSessionProvider,
+            downloadFileUtils = FakeDownloadFileUtils(guessFileName = { _, _, _ -> "Mozilla.pdf" }),
         ).apply {
             currentUrl = "https://mozilla.org"
             currentTitle = "Mozilla"
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/serviceworker/GeckoServiceWorkerDelegateTest.kt b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/serviceworker/GeckoServiceWorkerDelegateTest.kt
index 8e4cbf2983ecc..473088dd4f33b 100644
--- a/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/serviceworker/GeckoServiceWorkerDelegateTest.kt
+++ b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/serviceworker/GeckoServiceWorkerDelegateTest.kt
@@ -20,7 +20,7 @@ class GeckoServiceWorkerDelegateTest() {
     fun `GIVEN a delegate to add tabs WHEN it added a new tab for the request to open a new window THEN return a the new closed session`() {
         val delegate = mock<ServiceWorkerDelegate>()
         doReturn(true).`when`(delegate).addNewTab(any())
-        val geckoDelegate = GeckoServiceWorkerDelegate(delegate, mock(), mock())
+        val geckoDelegate = GeckoServiceWorkerDelegate(delegate, mock(), mock(), mock())
 
         val result = geckoDelegate.onOpenWindow("").poll(1)
 
@@ -31,7 +31,7 @@ class GeckoServiceWorkerDelegateTest() {
     fun `GIVEN a delegate to add tabs WHEN it disn't add a new tab for the request to open a new window THEN return null`() {
         val delegate = mock<ServiceWorkerDelegate>()
         doReturn(false).`when`(delegate).addNewTab(any())
-        val geckoDelegate = GeckoServiceWorkerDelegate(delegate, mock(), mock())
+        val geckoDelegate = GeckoServiceWorkerDelegate(delegate, mock(), mock(), mock())
 
         val result = geckoDelegate.onOpenWindow("").poll(1)
 
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/util/SpeculativeSessionFactoryTest.kt b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/util/SpeculativeSessionFactoryTest.kt
index e660a3761ff9c..07c307ea84477 100644
--- a/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/util/SpeculativeSessionFactoryTest.kt
+++ b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/util/SpeculativeSessionFactoryTest.kt
@@ -7,6 +7,7 @@ package mozilla.components.browser.engine.gecko.util
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import mozilla.components.support.test.mock
 import mozilla.components.support.test.whenever
+import mozilla.components.support.utils.FakeDownloadFileUtils
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNotSame
@@ -34,11 +35,23 @@ class SpeculativeSessionFactoryTest {
         val factory = SpeculativeSessionFactory()
         assertNull(factory.speculativeEngineSession)
 
-        factory.create(runtime = runtime, private = true, contextId = null, defaultSettings = mock())
+        factory.create(
+            runtime = runtime,
+            private = true,
+            contextId = null,
+            defaultSettings = mock(),
+            downloadFileUtils = FakeDownloadFileUtils(),
+        )
         val speculativeSession = factory.speculativeEngineSession
         assertNotNull(speculativeSession)
 
-        factory.create(runtime = runtime, private = true, contextId = null, defaultSettings = mock())
+        factory.create(
+            runtime = runtime,
+            private = true,
+            contextId = null,
+            defaultSettings = mock(),
+            downloadFileUtils = FakeDownloadFileUtils(),
+            )
         assertSame(speculativeSession, factory.speculativeEngineSession)
     }
 
@@ -47,11 +60,23 @@ class SpeculativeSessionFactoryTest {
         val factory = SpeculativeSessionFactory()
         assertNull(factory.speculativeEngineSession)
 
-        factory.create(runtime = runtime, private = true, contextId = null, defaultSettings = mock())
+        factory.create(
+            runtime = runtime,
+            private = true,
+            contextId = null,
+            defaultSettings = mock(),
+            downloadFileUtils = FakeDownloadFileUtils(),
+            )
         val speculativeSession = factory.speculativeEngineSession
         assertNotNull(speculativeSession)
 
-        factory.create(runtime = runtime, private = false, contextId = null, defaultSettings = mock())
+        factory.create(
+            runtime = runtime,
+            private = false,
+            contextId = null,
+            defaultSettings = mock(),
+            downloadFileUtils = FakeDownloadFileUtils(),
+        )
         assertNotSame(speculativeSession, factory.speculativeEngineSession)
         assertFalse(speculativeSession!!.engineSession.geckoSession.isOpen)
         assertFalse(speculativeSession.engineSession.isObserved())
@@ -62,7 +87,13 @@ class SpeculativeSessionFactoryTest {
         val factory = SpeculativeSessionFactory()
         assertFalse(factory.hasSpeculativeSession())
 
-        factory.create(runtime = runtime, private = true, contextId = null, defaultSettings = mock())
+        factory.create(
+            runtime = runtime,
+            private = true,
+            contextId = null,
+            defaultSettings = mock(),
+            downloadFileUtils = FakeDownloadFileUtils(),
+            )
         assertTrue(factory.hasSpeculativeSession())
 
         val speculativeSession = factory.get(private = true, contextId = null)
@@ -78,7 +109,13 @@ class SpeculativeSessionFactoryTest {
         val factory = SpeculativeSessionFactory()
         assertNull(factory.speculativeEngineSession)
 
-        factory.create(runtime = runtime, private = true, contextId = null, defaultSettings = mock())
+        factory.create(
+            runtime = runtime,
+            private = true,
+            contextId = null,
+            defaultSettings = mock(),
+            downloadFileUtils = FakeDownloadFileUtils(),
+            )
         val speculativeSession = factory.speculativeEngineSession
         assertNotNull(speculativeSession)
 
@@ -90,7 +127,13 @@ class SpeculativeSessionFactoryTest {
     @Test
     fun `clears speculative session on crash`() {
         val factory = SpeculativeSessionFactory()
-        factory.create(runtime = runtime, private = true, contextId = null, defaultSettings = mock())
+        factory.create(
+            runtime = runtime,
+            private = true,
+            contextId = null,
+            defaultSettings = mock(),
+            downloadFileUtils = FakeDownloadFileUtils(),
+            )
         assertTrue(factory.hasSpeculativeSession())
         val speculativeSession = factory.speculativeEngineSession
 
@@ -103,7 +146,13 @@ class SpeculativeSessionFactoryTest {
     @Test
     fun `clears speculative session when process is killed`() {
         val factory = SpeculativeSessionFactory()
-        factory.create(runtime = runtime, private = true, contextId = null, defaultSettings = mock())
+        factory.create(
+            runtime = runtime,
+            private = true,
+            contextId = null,
+            defaultSettings = mock(),
+            downloadFileUtils = FakeDownloadFileUtils(),
+            )
         assertTrue(factory.hasSpeculativeSession())
         val speculativeSession = factory.speculativeEngineSession
 
@@ -116,7 +165,13 @@ class SpeculativeSessionFactoryTest {
     @Test
     fun `clear unregisters observer and closes session`() {
         val factory = SpeculativeSessionFactory()
-        factory.create(runtime = runtime, private = true, contextId = null, defaultSettings = mock())
+        factory.create(
+            runtime = runtime,
+            private = true,
+            contextId = null,
+            defaultSettings = mock(),
+            downloadFileUtils = FakeDownloadFileUtils(),
+            )
         assertTrue(factory.hasSpeculativeSession())
         val speculativeSession = factory.speculativeEngineSession
         assertTrue(speculativeSession!!.engineSession.isObserved())
diff --git a/mobile/android/android-components/components/browser/engine-system/src/main/java/mozilla/components/browser/engine/system/SystemEngineView.kt b/mobile/android/android-components/components/browser/engine-system/src/main/java/mozilla/components/browser/engine/system/SystemEngineView.kt
index 2f5d8708312b7..b5f9deb79e8a9 100644
--- a/mobile/android/android-components/components/browser/engine-system/src/main/java/mozilla/components/browser/engine/system/SystemEngineView.kt
+++ b/mobile/android/android-components/components/browser/engine-system/src/main/java/mozilla/components/browser/engine/system/SystemEngineView.kt
@@ -10,6 +10,7 @@ import android.content.res.Resources
 import android.graphics.Bitmap
 import android.net.Uri
 import android.net.http.SslError
+import android.os.Environment
 import android.os.Handler
 import android.os.Message
 import android.util.AttributeSet
@@ -62,7 +63,7 @@ import mozilla.components.concept.storage.PageVisit
 import mozilla.components.concept.storage.VisitType
 import mozilla.components.support.ktx.android.view.getRectWithViewLocation
 import mozilla.components.support.ktx.kotlin.tryGetHostFromUrl
-import mozilla.components.support.utils.DownloadUtils
+import mozilla.components.support.utils.DefaultDownloadFileUtils
 
 /**
  * WebView-based implementation of EngineView.
@@ -594,14 +595,23 @@ class SystemEngineView @JvmOverloads constructor(
 
     internal fun createDownloadListener(): DownloadListener {
         return DownloadListener { url, userAgent, contentDisposition, mimetype, contentLength ->
-            session?.internalNotifyObservers {
-                val fileName = DownloadUtils.guessFileName(
-                    contentDisposition = contentDisposition,
-                    url = url,
-                    mimeType = mimetype,
-                )
-                val cookie = CookieManager.getInstance().getCookie(url)
-                onExternalResource(url, fileName, contentLength, mimetype, cookie, userAgent)
+            session?.let { session ->
+                session.internalNotifyObservers {
+                    val fileName = DefaultDownloadFileUtils(
+                        context = context,
+                        downloadLocationGetter = {
+                            Environment.getExternalStoragePublicDirectory(
+                                Environment.DIRECTORY_DOWNLOADS,
+                            ).path
+                        },
+                    ).guessFileName(
+                        contentDisposition = contentDisposition,
+                        url = url,
+                        mimeType = mimetype,
+                    )
+                    val cookie = CookieManager.getInstance().getCookie(url)
+                    onExternalResource(url, fileName, contentLength, mimetype, cookie, userAgent)
+                }
             }
         }
     }
diff --git a/mobile/android/android-components/components/feature/downloads/build.gradle b/mobile/android/android-components/components/feature/downloads/build.gradle
index bdc59260f6874..5040536abfe3d 100644
--- a/mobile/android/android-components/components/feature/downloads/build.gradle
+++ b/mobile/android/android-components/components/feature/downloads/build.gradle
@@ -68,6 +68,7 @@ dependencies {
     testImplementation libs.robolectric
 
     androidTestImplementation project(':components:support-android-test')
+    testImplementation testFixtures(project(':components:support-utils'))
 
     androidTestImplementation libs.androidx.arch.core.testing
     androidTestImplementation libs.androidx.room.testing
diff --git a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt
index f59b7d057cdb7..4cefb6168a581 100644
--- a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt
@@ -74,6 +74,7 @@ import mozilla.components.support.base.log.logger.Logger
 import mozilla.components.support.ktx.kotlin.ifNullOrEmpty
 import mozilla.components.support.ktx.kotlin.sanitizeURL
 import mozilla.components.support.ktx.kotlinx.coroutines.throttleLatest
+import mozilla.components.support.utils.DownloadFileUtils
 import mozilla.components.support.utils.DownloadUtils
 import mozilla.components.support.utils.ext.registerReceiverCompat
 import mozilla.components.support.utils.ext.stopForegroundCompat
@@ -116,6 +117,8 @@ abstract class AbstractFetchDownloadService : Service() {
     protected abstract val fileSizeFormatter: FileSizeFormatter
     protected abstract val downloadEstimator: DownloadEstimator
 
+    protected abstract val downloadFileUtils: DownloadFileUtils
+
     // TODO Move this to browser store and make immutable:
     // https://github.com/mozilla-mobile/android-components/issues/7050
     internal data class DownloadJobState(
@@ -715,7 +718,11 @@ abstract class AbstractFetchDownloadService : Service() {
 
         response.body.useStream { inStream ->
             var copyInChuckStatus: CopyInChuckStatus? = null
-            val newDownloadState = download.withResponse(response.headers, inStream)
+            val newDownloadState = download.withResponse(
+                headers = response.headers,
+                downloadFileUtils = downloadFileUtils,
+                stream = inStream,
+            )
             currentDownloadJobState.state = newDownloadState
 
             useFileStream(newDownloadState, isResumingDownload) { outStream ->
diff --git a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadDialogFragment.kt b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadDialogFragment.kt
index 98288fa67a06a..75ddb66998b70 100644
--- a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadDialogFragment.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadDialogFragment.kt
@@ -7,7 +7,6 @@ package mozilla.components.feature.downloads
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatDialogFragment
 import mozilla.components.browser.state.state.content.DownloadState
-import mozilla.components.feature.downloads.ext.realFilenameOrGuessed
 
 /**
  * This is a general representation of a dialog meant to be used in collaboration with [DownloadsFeature]
@@ -29,9 +28,9 @@ abstract class DownloadDialogFragment : AppCompatDialogFragment() {
     /**
      * Add the metadata of this download object to the arguments of this fragment.
      */
-    fun setDownload(download: DownloadState) {
+    fun setDownload(download: DownloadState, fileName: String) {
         val args = arguments ?: Bundle()
-        args.putString(KEY_FILE_NAME, download.realFilenameOrGuessed)
+        args.putString(KEY_FILE_NAME, fileName)
         args.putString(KEY_URL, download.url)
         args.putLong(KEY_CONTENT_LENGTH, download.contentLength ?: 0)
         arguments = args
diff --git a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt
index 41a29d466e2c3..33b9b1351e628 100644
--- a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt
@@ -9,6 +9,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.content.pm.ResolveInfo
+import android.os.Environment
 import android.widget.Toast
 import androidx.annotation.ColorRes
 import androidx.annotation.VisibleForTesting
@@ -25,7 +26,7 @@ import mozilla.components.browser.state.state.content.DownloadState
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.feature.downloads.DownloadDialogFragment.Companion.FRAGMENT_TAG
 import mozilla.components.feature.downloads.dialog.DeniedPermissionDialogFragment
-import mozilla.components.feature.downloads.ext.realFilenameOrGuessed
+import mozilla.components.feature.downloads.ext.getRealFilenameOrGuessed
 import mozilla.components.feature.downloads.facts.emitPromptDismissedFact
 import mozilla.components.feature.downloads.facts.emitPromptDisplayedFact
 import mozilla.components.feature.downloads.manager.AndroidDownloadManager
@@ -43,6 +44,8 @@ import mozilla.components.support.ktx.android.content.appName
 import mozilla.components.support.ktx.android.content.isPermissionGranted
 import mozilla.components.support.ktx.kotlin.isSameOriginAs
 import mozilla.components.support.utils.Browsers
+import mozilla.components.support.utils.DefaultDownloadFileUtils
+import mozilla.components.support.utils.DownloadFileUtils
 import mozilla.components.support.utils.ext.packageManagerCompatHelper
 
 /**
@@ -131,7 +134,15 @@ class DownloadsFeature(
     private val fileSystemHelper: FileSystemHelper = DefaultFileSystemHelper(),
     override var onNeedToRequestPermissions: OnNeedToRequestPermissions = { },
     onDownloadStopped: onDownloadStopped = noop,
-    private val downloadManager: DownloadManager = AndroidDownloadManager(applicationContext, store),
+    private val downloadFileUtils: DownloadFileUtils = DefaultDownloadFileUtils(
+        context = applicationContext,
+        downloadLocationGetter = {
+            Environment.getExternalStoragePublicDirectory(
+                Environment.DIRECTORY_DOWNLOADS,
+            ).path
+        },
+    ),
+    private val downloadManager: DownloadManager = AndroidDownloadManager(applicationContext, store, downloadFileUtils),
     private val tabId: String? = null,
     private val fragmentManager: FragmentManager? = null,
     private val promptsStyling: PromptsStyling? = null,
@@ -258,7 +269,7 @@ class DownloadsFeature(
                     customFirstPartyDownloadDialog != null && !download.skipConfirmation -> {
                         val downloadWithSameEtag = findDownloadWithSameEtag(download)
                         customFirstPartyDownloadDialog.invoke(
-                            Filename(download.realFilenameOrGuessed),
+                            Filename(download.getRealFilenameOrGuessed(downloadFileUtils)),
                             ContentSize(download.contentLength ?: 0),
                             FileNameOfDuplicateIfAlreadyDownloaded(downloadWithSameEtag?.fileName),
                             PositiveActionCallback {
@@ -280,7 +291,10 @@ class DownloadsFeature(
                     }
 
                     fragmentManager != null && !download.skipConfirmation -> {
-                        showDownloadDialog(tab, download)
+                        showDownloadDialog(
+                            tab = tab,
+                            download = download,
+                        )
                         false
                     }
 
@@ -315,7 +329,7 @@ class DownloadsFeature(
 
         if (isDownloadBiggerThanAvailableSpace(download)) {
             fileHasNotEnoughStorageDialog.invoke(
-                Filename(download.realFilenameOrGuessed),
+                Filename(download.getRealFilenameOrGuessed(downloadFileUtils)),
             )
             download.sessionId?.let { useCases.cancelDownloadRequest.invoke(it, download.id) }
             return false
@@ -375,7 +389,10 @@ class DownloadsFeature(
         download: DownloadState,
         dialog: DownloadDialogFragment = getDownloadDialog(),
     ) {
-        dialog.setDownload(download)
+        dialog.setDownload(
+            download = download,
+            fileName = download.getRealFilenameOrGuessed(downloadFileUtils),
+        )
 
         dialog.onStartDownload = {
             startDownload(download)
diff --git a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/ext/DownloadState.kt b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/ext/DownloadState.kt
index 9a146364e5762..3ffd97a014856 100644
--- a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/ext/DownloadState.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/ext/DownloadState.kt
@@ -13,7 +13,7 @@ import mozilla.components.concept.fetch.Headers.Names.CONTENT_TYPE
 import mozilla.components.concept.fetch.Headers.Names.E_TAG
 import mozilla.components.support.ktx.kotlin.decode
 import mozilla.components.support.ktx.kotlin.sanitizeFileName
-import mozilla.components.support.utils.DownloadUtils
+import mozilla.components.support.utils.DownloadFileUtils
 import java.io.InputStream
 import java.net.URLConnection
 
@@ -26,9 +26,14 @@ internal fun DownloadState.isScheme(protocols: Iterable<String>): Boolean {
  * Returns a copy of the download with some fields filled in based on values from a response.
  *
  * @param headers Headers from the response.
+ * @param downloadFileUtils [DownloadFileUtils] helper for handling download file operations.
  * @param stream Stream of the response body.
  */
-internal fun DownloadState.withResponse(headers: Headers, stream: InputStream?): DownloadState {
+internal fun DownloadState.withResponse(
+    headers: Headers,
+    downloadFileUtils: DownloadFileUtils,
+    stream: InputStream?,
+): DownloadState {
     val contentDisposition = headers[CONTENT_DISPOSITION]
     var contentType = this.contentType
     if (contentType == null && stream != null) {
@@ -39,7 +44,11 @@ internal fun DownloadState.withResponse(headers: Headers, stream: InputStream?):
     }
 
     val newFileName = if (fileName.isNullOrBlank()) {
-        DownloadUtils.guessFileName(contentDisposition, destinationDirectory, url, contentType)
+        downloadFileUtils.guessFileName(
+            contentDisposition = contentDisposition,
+            url = url,
+            mimeType = contentType,
+        )
     } else {
         fileName
     }
@@ -51,5 +60,12 @@ internal fun DownloadState.withResponse(headers: Headers, stream: InputStream?):
     )
 }
 
-internal val DownloadState.realFilenameOrGuessed
-    get() = fileName ?: DownloadUtils.guessFileName(null, destinationDirectory, url, contentType)
+internal fun DownloadState.getRealFilenameOrGuessed(
+    downloadFileUtils: DownloadFileUtils,
+): String {
+    return fileName ?: downloadFileUtils.guessFileName(
+        contentDisposition = null,
+        url = url,
+        mimeType = contentType,
+    )
+}
diff --git a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/manager/AndroidDownloadManager.kt b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/manager/AndroidDownloadManager.kt
index 173409553dd75..8d0bbdc443553 100644
--- a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/manager/AndroidDownloadManager.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/manager/AndroidDownloadManager.kt
@@ -15,6 +15,7 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.os.Build
 import android.os.Build.VERSION.SDK_INT
+import android.os.Environment
 import android.util.LongSparseArray
 import androidx.annotation.VisibleForTesting
 import androidx.core.content.ContextCompat
@@ -30,9 +31,10 @@ import mozilla.components.concept.fetch.Headers.Names.REFERRER
 import mozilla.components.concept.fetch.Headers.Names.USER_AGENT
 import mozilla.components.feature.downloads.AbstractFetchDownloadService
 import mozilla.components.feature.downloads.ext.isScheme
-import mozilla.components.support.utils.DownloadUtils
+import mozilla.components.support.utils.DownloadFileUtils
 import mozilla.components.support.utils.ext.getSerializableExtraCompat
 import mozilla.components.support.utils.ext.registerReceiverCompat
+import java.io.File
 
 typealias SystemDownloadManager = android.app.DownloadManager
 typealias SystemRequest = android.app.DownloadManager.Request
@@ -45,6 +47,7 @@ typealias SystemRequest = android.app.DownloadManager.Request
 class AndroidDownloadManager(
     private val applicationContext: Context,
     private val store: BrowserStore,
+    private val downloadFileUtils: DownloadFileUtils,
     override var onDownloadStopped: onDownloadStopped = noop,
 ) : BroadcastReceiver(), DownloadManager {
 
@@ -80,7 +83,10 @@ class AndroidDownloadManager(
 
         validatePermissionGranted(applicationContext)
 
-        val request = download.toAndroidRequest(cookie)
+        val request = download.toAndroidRequest(
+            downloadFileUtils = downloadFileUtils,
+            cookie = cookie,
+        )
         val downloadID = androidDownloadManager.enqueue(request)
         store.dispatch(DownloadAction.AddDownloadAction(download.copy(id = downloadID.toString())))
         downloadRequests[downloadID] = request
@@ -135,7 +141,10 @@ class AndroidDownloadManager(
     }
 }
 
-private fun DownloadState.toAndroidRequest(cookie: String): SystemRequest {
+private fun DownloadState.toAndroidRequest(
+    downloadFileUtils: DownloadFileUtils,
+    cookie: String,
+): SystemRequest {
     val request = SystemRequest(url.toUri())
         .setNotificationVisibility(VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
 
@@ -149,12 +158,23 @@ private fun DownloadState.toAndroidRequest(cookie: String): SystemRequest {
         addRequestHeaderSafely(REFERRER, referrerUrl)
     }
 
-    val fileName = if (fileName.isNullOrBlank()) {
-        DownloadUtils.guessFileName(null, destinationDirectory, url, contentType)
+    val destinationDir = if (directoryPath.isBlank()) {
+        Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
     } else {
-        fileName
+        File(directoryPath)
     }
-    request.setDestinationInExternalPublicDir(destinationDirectory, fileName)
+
+    val finalFileName = fileName?.takeUnless { it.isBlank() }
+        ?: downloadFileUtils.guessFileName(
+            contentDisposition = null,
+            url = url,
+            mimeType = contentType,
+        )
+
+    destinationDir.mkdirs()
+
+    val destinationFile = File(destinationDir, finalFileName)
+    request.setDestinationUri(destinationFile.toUri())
 
     return request
 }
diff --git a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/AbstractFetchDownloadServiceTest.kt b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/AbstractFetchDownloadServiceTest.kt
index 2d69c16d265b5..2de59270bc85c 100644
--- a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/AbstractFetchDownloadServiceTest.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/AbstractFetchDownloadServiceTest.kt
@@ -62,6 +62,8 @@ import mozilla.components.support.test.eq
 import mozilla.components.support.test.mock
 import mozilla.components.support.test.robolectric.testContext
 import mozilla.components.support.test.rule.MainCoroutineRule
+import mozilla.components.support.utils.DownloadFileUtils
+import mozilla.components.support.utils.FakeDownloadFileUtils
 import mozilla.components.support.utils.ext.stopForegroundCompat
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
@@ -121,6 +123,8 @@ class AbstractFetchDownloadServiceTest {
     private val fakeFileSizeFormatter: FileSizeFormatter = FakeFileSizeFormatter()
     private val fakeDateTimeProvider: DateTimeProvider = FakeDateTimeProvider()
     private val fakeDownloadEstimator: DownloadEstimator = DownloadEstimator(fakeDateTimeProvider)
+
+    private val fakeDownloadFileUtils: DownloadFileUtils = FakeDownloadFileUtils()
     private val fakePackageNameProvider: PackageNameProvider =
         FakePackageNameProvider("mozilla.components.feature.downloads.test")
 
@@ -145,6 +149,7 @@ class AbstractFetchDownloadServiceTest {
             override val notificationsDelegate = this@AbstractFetchDownloadServiceTest.notificationsDelegate
             override val fileSizeFormatter = fakeFileSizeFormatter
             override val downloadEstimator = fakeDownloadEstimator
+            override val downloadFileUtils = fakeDownloadFileUtils
             override val packageNameProvider = fakePackageNameProvider
             override val context: Context = testContext
         },
diff --git a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadDialogFragmentTest.kt b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadDialogFragmentTest.kt
index e72da87a9c0df..d12b58dc92ef1 100644
--- a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadDialogFragmentTest.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadDialogFragmentTest.kt
@@ -7,6 +7,7 @@ package mozilla.components.feature.downloads
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import mozilla.components.browser.state.state.content.DownloadState
 import mozilla.components.feature.downloads.DownloadDialogFragment.Companion.KEY_FILE_NAME
+import mozilla.components.support.utils.FakeDownloadFileUtils
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Before
@@ -34,7 +35,7 @@ class DownloadDialogFragmentTest {
 
     @Test
     fun `when setDownload must set download metadata`() {
-        dialog.setDownload(download)
+        dialog.setDownload(download, "5MB.zip")
 
         assertNotNull(dialog.arguments)
         val fileName = dialog.arguments!!.getString(KEY_FILE_NAME)
diff --git a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadsFeatureTest.kt b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadsFeatureTest.kt
index e55b691518de0..a57b44901c02a 100644
--- a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadsFeatureTest.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadsFeatureTest.kt
@@ -24,6 +24,7 @@ import mozilla.components.browser.state.state.createTab
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.feature.downloads.DownloadsUseCases.CancelDownloadRequestUseCase
 import mozilla.components.feature.downloads.DownloadsUseCases.ConsumeDownloadUseCase
+import mozilla.components.feature.downloads.ext.getRealFilenameOrGuessed
 import mozilla.components.feature.downloads.fake.FakeFileSystemHelper
 import mozilla.components.feature.downloads.manager.DownloadManager
 import mozilla.components.feature.downloads.ui.DownloadAppChooserDialog
@@ -36,6 +37,7 @@ import mozilla.components.support.test.robolectric.grantPermission
 import mozilla.components.support.test.robolectric.testContext
 import mozilla.components.support.test.rule.MainCoroutineRule
 import mozilla.components.support.test.whenever
+import mozilla.components.support.utils.FakeDownloadFileUtils
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
@@ -233,7 +235,7 @@ class DownloadsFeatureTest {
     fun `When starting a download an existing dialog is reused`() {
         grantPermissions()
 
-        val download = DownloadState(url = "https://www.mozilla.org", sessionId = "test-tab")
+        val download = DownloadState(url = "https://www.mozilla.org", sessionId = "test-tab", fileName = "fileName")
         store.dispatch(ContentAction.UpdateDownloadAction("test-tab", download))
 
         val dialogFragment: DownloadDialogFragment = mock()
@@ -254,11 +256,14 @@ class DownloadsFeatureTest {
         )
 
         val tab = store.state.findTab("test-tab")
-        feature.showDownloadDialog(tab!!, download)
+        feature.showDownloadDialog(
+            tab = tab!!,
+            download = download,
+        )
 
         verify(dialogFragment).onStartDownload = any()
         verify(dialogFragment).onCancelDownload = any()
-        verify(dialogFragment).setDownload(download)
+        verify(dialogFragment).setDownload(any(), eq(download.getRealFilenameOrGuessed(FakeDownloadFileUtils())))
         verify(dialogFragment, never()).showNow(any(), any())
     }
 
@@ -286,7 +291,10 @@ class DownloadsFeatureTest {
 
         val tab = store.state.findTab("test-tab")
 
-        feature.showDownloadDialog(tab!!, download)
+        feature.showDownloadDialog(
+            tab = tab!!,
+            download = download,
+        )
 
         dialogFragment.onCancelDownload()
         verify(closeDownloadResponseUseCase).invoke(anyString(), anyString())
@@ -534,7 +542,11 @@ class DownloadsFeatureTest {
         doReturn(false).`when`(feature).isAlreadyADownloadDialog()
         doReturn(true).`when`(fragmentManager).isDestroyed
 
-        feature.showDownloadDialog(mock(), mock(), dialog)
+        feature.showDownloadDialog(
+            tab = mock(),
+            download = mock(),
+            dialog = dialog,
+        )
 
         verify(dialog, never()).showNow(fragmentManager, DownloadDialogFragment.FRAGMENT_TAG)
     }
diff --git a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/ext/DownloadStateKtTest.kt b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/ext/DownloadStateKtTest.kt
index 4f6dac6e69a8f..7d204c7dfde3d 100644
--- a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/ext/DownloadStateKtTest.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/ext/DownloadStateKtTest.kt
@@ -6,7 +6,9 @@ package mozilla.components.feature.downloads.ext
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import mozilla.components.browser.state.state.content.DownloadState
-import mozilla.components.support.utils.DownloadUtils
+import mozilla.components.support.test.robolectric.testContext
+import mozilla.components.support.utils.DefaultDownloadFileUtils
+import mozilla.components.support.utils.FakeDownloadFileUtils
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotEquals
@@ -22,11 +24,13 @@ class DownloadStateKtTest {
             url = "url",
             fileName = null,
         )
+        val fakeUtils = FakeDownloadFileUtils()
+
         val expectedName = with(download) {
-            DownloadUtils.guessFileName(null, destinationDirectory, url, contentType)
+            fakeUtils.guessFileName(null, url, contentType)
         }
 
-        val result = download.realFilenameOrGuessed
+        val result = download.getRealFilenameOrGuessed(fakeUtils)
 
         assertEquals(expectedName, result)
     }
@@ -39,10 +43,13 @@ class DownloadStateKtTest {
             contentType = "image/jpeg",
         )
         val guessedName = with(download) {
-            DownloadUtils.guessFileName(null, destinationDirectory, url, contentType)
+            DefaultDownloadFileUtils(
+                testContext,
+                downloadLocationGetter = { "downloads" },
+            ).guessFileName(null, url, contentType)
         }
 
-        val result = download.realFilenameOrGuessed
+        val result = download.fileName
 
         assertEquals("test", result)
         assertNotEquals(guessedName, result)
diff --git a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/manager/AndroidDownloadManagerTest.kt b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/manager/AndroidDownloadManagerTest.kt
index 1c64849fd11d0..5ea14a615eade 100644
--- a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/manager/AndroidDownloadManagerTest.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/manager/AndroidDownloadManagerTest.kt
@@ -18,6 +18,7 @@ import mozilla.components.feature.downloads.AbstractFetchDownloadService.Compani
 import mozilla.components.support.test.mock
 import mozilla.components.support.test.robolectric.grantPermission
 import mozilla.components.support.test.robolectric.testContext
+import mozilla.components.support.utils.FakeDownloadFileUtils
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
@@ -48,7 +49,11 @@ class AndroidDownloadManagerTest {
             userAgent = "Mozilla/5.0 (Linux; Android 7.1.1) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Focus/8.0 Chrome/69.0.3497.100 Mobile Safari/537.36",
         )
         store = BrowserStore()
-        downloadManager = AndroidDownloadManager(testContext, store)
+        downloadManager = AndroidDownloadManager(
+            applicationContext = testContext,
+            store = store,
+            downloadFileUtils = FakeDownloadFileUtils(),
+            )
     }
 
     @Test(expected = SecurityException::class)
@@ -103,7 +108,13 @@ class AndroidDownloadManagerTest {
 
     @Test
     fun `GIVEN a device that supports scoped storage THEN permissions must not included file access`() {
-        val downloadManager = spy(AndroidDownloadManager(testContext, store))
+        val downloadManager = spy(
+            AndroidDownloadManager(
+            applicationContext = testContext,
+            store = store,
+            downloadFileUtils = FakeDownloadFileUtils(),
+        ),
+        )
 
         doReturn(Build.VERSION_CODES.Q).`when`(downloadManager).getSDKVersion()
         println(downloadManager.permissions.joinToString { it })
@@ -112,7 +123,13 @@ class AndroidDownloadManagerTest {
 
     @Test
     fun `GIVEN a device does not supports scoped storage THEN permissions must be included file access`() {
-        val downloadManager = spy(AndroidDownloadManager(testContext, store))
+        val downloadManager = spy(
+            AndroidDownloadManager(
+            applicationContext = testContext,
+            store = store,
+            downloadFileUtils = FakeDownloadFileUtils(),
+        ),
+        )
 
         doReturn(Build.VERSION_CODES.P).`when`(downloadManager).getSDKVersion()
 
diff --git a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/manager/FetchDownloadManagerTest.kt b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/manager/FetchDownloadManagerTest.kt
index cb3978556dd46..5b689d647ba15 100644
--- a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/manager/FetchDownloadManagerTest.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/manager/FetchDownloadManagerTest.kt
@@ -30,6 +30,8 @@ import mozilla.components.support.test.any
 import mozilla.components.support.test.mock
 import mozilla.components.support.test.robolectric.grantPermission
 import mozilla.components.support.test.robolectric.testContext
+import mozilla.components.support.utils.DownloadFileUtils
+import mozilla.components.support.utils.FakeDownloadFileUtils
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
@@ -319,6 +321,7 @@ class FetchDownloadManagerTest {
         override val downloadEstimator: DownloadEstimator = DownloadEstimator(
             FakeDateTimeProvider(),
         )
+        override val downloadFileUtils: DownloadFileUtils = FakeDownloadFileUtils()
         override val packageNameProvider = FakePackageNameProvider("org.mozilla.fenix.test")
     }
 }
diff --git a/mobile/android/android-components/components/support/utils/build.gradle b/mobile/android/android-components/components/support/utils/build.gradle
index 975afb17ed7dd..b94ceb9bf6bcc 100644
--- a/mobile/android/android-components/components/support/utils/build.gradle
+++ b/mobile/android/android-components/components/support/utils/build.gradle
@@ -15,6 +15,9 @@ android {
         compose = true
     }
     namespace = 'mozilla.components.support.utils'
+    testFixtures {
+        enable = true
+    }
 }
 
 dependencies {
@@ -27,11 +30,13 @@ dependencies {
     implementation libs.androidx.activity.compose
     implementation libs.androidx.annotation
     implementation platform(libs.androidx.compose.bom)
+    implementation libs.androidx.compose.runtime.saveable
     implementation libs.androidx.compose.foundation
     implementation libs.androidx.compose.ui
     implementation libs.androidx.core
     implementation libs.androidx.core.ktx
     implementation libs.kotlinx.coroutines
+    implementation libs.androidx.documentfile
 
     testImplementation project(":components:support-test")
 
@@ -39,6 +44,9 @@ dependencies {
     testImplementation libs.androidx.test.junit
     testImplementation libs.kotlinx.coroutines.test
     testImplementation libs.robolectric
+
+    testFixturesImplementation platform(libs.androidx.compose.bom)
+    testFixturesImplementation libs.androidx.compose.runtime.saveable
 }
 
 apply from: '../../../common-config.gradle'
diff --git a/mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DefaultDownloadFileUtils.kt b/mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DefaultDownloadFileUtils.kt
new file mode 100644
index 0000000000000..8d248f4c68e0a
--- /dev/null
+++ b/mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DefaultDownloadFileUtils.kt
@@ -0,0 +1,169 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package mozilla.components.support.utils
+
+import android.content.Context
+import android.net.Uri
+import android.os.Build
+import android.provider.MediaStore
+import androidx.core.net.toUri
+import androidx.documentfile.provider.DocumentFile
+import mozilla.components.support.base.log.logger.Logger
+import mozilla.components.support.utils.DownloadUtils.changeExtension
+import mozilla.components.support.utils.DownloadUtils.createExtension
+import mozilla.components.support.utils.DownloadUtils.extractFileNameFromUrl
+import mozilla.components.support.utils.DownloadUtils.findFileInMediaStore
+import mozilla.components.support.utils.DownloadUtils.isDefaultDownloadDirectory
+import mozilla.components.support.utils.DownloadUtils.sanitizeMimeType
+import mozilla.components.support.utils.DownloadUtils.truncateFileName
+import java.io.File
+
+/**
+ * The default implementation of [DownloadFileUtils].
+ *
+ * @param context The application context.
+ * @param downloadLocationGetter A lambda providing the current directory path for downloads.
+ */
+class DefaultDownloadFileUtils(
+    private val context: Context,
+    private val downloadLocationGetter: () -> String,
+) : DownloadFileUtils {
+    private val logger = Logger("DefaultDownloadFileUtils")
+
+    /**
+     * Keep aligned with desktop generic content types:
+     * https://searchfox.org/mozilla-central/source/browser/components/downloads/DownloadsCommon.jsm#208
+     */
+    private val genericContentTypes = arrayOf(
+        "application/octet-stream",
+        "binary/octet-stream",
+        "application/unknown",
+    )
+
+    companion object {
+        private const val SCHEME_CONTENT = "content://"
+    }
+
+    override fun guessFileName(
+        contentDisposition: String?,
+        url: String?,
+        mimeType: String?,
+    ): String {
+        // Split fileName between base and extension
+        // Add an extension if filename does not have one
+        val extractedFileName = extractFileNameFromUrl(contentDisposition, url)
+        val sanitizedMimeType = sanitizeMimeType(mimeType)
+
+        val fileName = if (extractedFileName.contains('.')) {
+            if (genericContentTypes.contains(sanitizedMimeType)) {
+                extractedFileName
+            } else {
+                changeExtension(extractedFileName, sanitizedMimeType)
+            }
+        } else {
+            extractedFileName + createExtension(sanitizedMimeType)
+        }
+        return uniqueFileName(
+            directoryPath = downloadLocationGetter(),
+            fileName = fileName,
+        )
+    }
+
+    override fun findDownloadFileUri(fileName: String?, directoryPath: String): Uri? {
+        if (fileName == null) return null
+
+        return try {
+            if (directoryPath.isDefaultDownloadDirectory()) {
+                context.contentResolver.findFileInMediaStore(
+                    collection = downloadsCollectionUri,
+                    fileName = fileName,
+                )
+            } else {
+                findFileInSafDirectory(directoryPath, fileName)
+            }
+        } catch (e: SecurityException) {
+            logger.error("Security error finding download file URI for '$fileName': ${e.message}")
+            null
+        } catch (e: IllegalArgumentException) {
+            logger.error("Invalid argument finding download file URI for '$fileName': ${e.message}")
+            null
+        } catch (e: IllegalStateException) {
+            logger.error("State error finding download file URI for '$fileName': ${e.message}")
+            null
+        }
+    }
+
+    override fun fileExists(directoryPath: String, fileName: String?): Boolean {
+        return findDownloadFileUri(fileName, directoryPath) != null
+    }
+
+    override fun uniqueFileName(
+        directoryPath: String,
+        fileName: String,
+    ): String {
+        val file = File(fileName)
+        val (baseFileName, fileExtension) = truncateFileName(
+            baseFileName = file.nameWithoutExtension,
+            fileExtension = file.extension,
+            path = directoryPath,
+        )
+
+        var currentFileName = createFileName(baseFileName, fileExtension)
+        var copyVersionNumber = 1
+
+        while (fileExists(directoryPath, currentFileName)) {
+            currentFileName = createFileName(baseFileName, copyVersionNumber++, fileExtension)
+        }
+
+        return currentFileName
+    }
+
+    /**
+     * The appropriate content URI for the downloads collection, based on the Android SDK version.
+     */
+    private val downloadsCollectionUri: Uri
+        get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            MediaStore.Downloads.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
+        } else {
+            MediaStore.Files.getContentUri("external")
+        }
+
+    /**
+     * Finds a file within a directory tree selected via the Storage Access Framework (SAF).
+     *
+     * @param context The application context.
+     * @param directoryPath The 'content://' URI string of the directory tree.
+     * @param fileName The name of the file to find.
+     * @return The content Uri of the found file, or `null` if not found or an error occurs.
+     */
+    private fun findFileInSafDirectory(
+        directoryPath: String,
+        fileName: String,
+    ): Uri? {
+        check(directoryPath.startsWith(SCHEME_CONTENT)) { "directoryPath must be a content URI" }
+
+        return try {
+            val directoryTreeUri = directoryPath.toUri()
+            val directory = DocumentFile.fromTreeUri(context, directoryTreeUri)
+
+            directory?.findFile(fileName)?.uri
+        } catch (e: SecurityException) {
+            logger.error("Security error finding file in SAF directory: ${e.message}")
+            null
+        } catch (e: IllegalArgumentException) {
+            logger.error("Invalid URI for SAF directory: ${e.message}")
+            null
+        }
+    }
+
+    private fun createFileName(fileName: String, fileExtension: String): String {
+        return if (fileExtension.isNotEmpty()) "$fileName.$fileExtension" else fileName
+    }
+
+    private fun createFileName(baseFileName: String, copyVersionNumber: Int, fileExtension: String): String {
+        val newName = "$baseFileName($copyVersionNumber)"
+        return if (fileExtension.isNotEmpty()) "$newName.$fileExtension" else newName
+    }
+}
diff --git a/mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DownloadFileUtils.kt b/mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DownloadFileUtils.kt
new file mode 100644
index 0000000000000..7019f6d7522d5
--- /dev/null
+++ b/mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DownloadFileUtils.kt
@@ -0,0 +1,56 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package mozilla.components.support.utils
+
+import android.net.Uri
+
+/**
+ * An interface for handling downloaded files, such as opening files,
+ * creating intents, and resolving content types and URIs.
+ */
+interface DownloadFileUtils {
+
+    /**
+     * Guess the name of the file that should be downloaded.
+     *
+     * This method is largely identical to [android.webkit.URLUtil.guessFileName]
+     * which unfortunately does not implement RFC 5987.
+     */
+    fun guessFileName(
+        contentDisposition: String?,
+        url: String?,
+        mimeType: String?,
+    ): String
+
+    /**
+     * Finds the content URI for a downloaded file.
+     *
+     * @param fileName The name of the file to find.
+     * @param directoryPath The directory where the file is located.
+     * @return The content [Uri] of the file, or `null` if it cannot be found.
+     */
+    fun findDownloadFileUri(fileName: String?, directoryPath: String): Uri?
+
+    /**
+     * Checks if a file exists in the specified directory.
+     *
+     * @param directoryPath The path or content URI of the directory.
+     * @param fileName The name of the file to check.
+     */
+    fun fileExists(directoryPath: String, fileName: String?): Boolean
+
+    /**
+     * Generates a unique file name for a given directory to avoid overwriting existing files.
+     * This function handles both standard file paths and Storage Access Framework (SAF) URIs.
+     *
+     * @param directoryPath The path or content URI of the target directory.
+     * @param fileName The desired initial file name (e.g., "document.pdf").
+     * @return A unique file name (e.g., "document (1).pdf").
+     */
+    fun uniqueFileName(
+        directoryPath: String,
+        fileName: String,
+    ): String
+}
diff --git a/mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DownloadUtils.kt b/mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DownloadUtils.kt
index e725db7064287..8e6ce3aeb1a87 100644
--- a/mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DownloadUtils.kt
+++ b/mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DownloadUtils.kt
@@ -4,8 +4,11 @@
 
 package mozilla.components.support.utils
 
+import android.content.ContentResolver
+import android.content.ContentUris
 import android.net.Uri
 import android.os.Environment
+import android.provider.MediaStore
 import android.webkit.MimeTypeMap
 import mozilla.components.support.utils.DownloadUtils.CONTENT_DISPOSITION_TYPE
 import mozilla.components.support.utils.DownloadUtils.fileNameAsteriskContentDispositionPattern
@@ -133,16 +136,6 @@ object DownloadUtils {
      */
     private val encodedSymbolPattern = Pattern.compile("%[0-9a-f]{2}|[0-9a-z!#$&+-.^_`|~]", Pattern.CASE_INSENSITIVE)
 
-    /**
-     * Keep aligned with desktop generic content types:
-     * https://searchfox.org/mozilla-central/source/browser/components/downloads/DownloadsCommon.jsm#208
-     */
-    private val GENERIC_CONTENT_TYPES = arrayOf(
-        "application/octet-stream",
-        "binary/octet-stream",
-        "application/unknown",
-    )
-
     /**
      * Maximum number of characters for the title length.
      *
@@ -174,43 +167,13 @@ object DownloadUtils {
      */
     private const val MIN_FILE_NAME_LENGTH = 5
 
+    private const val SCHEME_CONTENT = "content://"
+
     /**
      * The HTTP response code for a successful request.
      */
     const val RESPONSE_CODE_SUCCESS = 200
 
-    /**
-     * Guess the name of the file that should be downloaded.
-     *
-     * This method is largely identical to [android.webkit.URLUtil.guessFileName]
-     * which unfortunately does not implement RFC 5987.
-     */
-
-    @JvmStatic
-    fun guessFileName(
-        contentDisposition: String?,
-        destinationDirectory: String = Environment.DIRECTORY_DOWNLOADS,
-        url: String?,
-        mimeType: String?,
-    ): String {
-        // Split fileName between base and extension
-        // Add an extension if filename does not have one
-        val extractedFileName = extractFileNameFromUrl(contentDisposition, url)
-        val sanitizedMimeType = sanitizeMimeType(mimeType)
-
-        val fileName = if (extractedFileName.contains('.')) {
-            if (GENERIC_CONTENT_TYPES.contains(sanitizedMimeType)) {
-                extractedFileName
-            } else {
-                changeExtension(extractedFileName, sanitizedMimeType)
-            }
-        } else {
-            extractedFileName + createExtension(sanitizedMimeType)
-        }
-
-        return uniqueFileName(Environment.getExternalStoragePublicDirectory(destinationDirectory), fileName)
-    }
-
     // Some site add extra information after the mimetype, for example 'application/pdf; qs=0.001'
     // we just want to extract the mimeType and ignore the rest.
     fun sanitizeMimeType(mimeType: String?): String? {
@@ -227,26 +190,6 @@ object DownloadUtils {
             )?.trim()
     }
 
-    /**
-     * Checks if the file exists so as not to overwrite one already in the destination directory
-     */
-    fun uniqueFileName(directory: File, fileName: String): String {
-        val file = File(fileName)
-        val (baseFileName, fileExtension) = truncateFileName(
-            baseFileName = file.nameWithoutExtension,
-            fileExtension = file.extension,
-            path = directory.absolutePath,
-        )
-
-        var potentialFileName = File(directory, createFileName(fileName = baseFileName, fileExtension = fileExtension))
-        var copyVersionNumber = 1
-        while (potentialFileName.exists()) {
-            potentialFileName = File(directory, createFileName(baseFileName, copyVersionNumber++, fileExtension))
-        }
-
-        return potentialFileName.name
-    }
-
     /**
      * Truncates the file name if its length, combined with the directory path and file extension,
      * exceeds the maximum allowable path length. If the file extension is too long, it is removed entirely.
@@ -314,7 +257,14 @@ object DownloadUtils {
             }
     }
 
-    private fun extractFileNameFromUrl(contentDisposition: String?, url: String?): String {
+    /**
+     * Extracts a file name from either the Content-Disposition header or the URL.
+     *
+     * @param contentDisposition The 'Content-Disposition' HTTP header value, if available.
+     * @param url The URL from which the file is being downloaded.
+     * @return The extracted file name or a default fallback name.
+     */
+    fun extractFileNameFromUrl(contentDisposition: String?, url: String?): String {
         var filename: String? = null
 
         // Extract file name from content disposition header field
@@ -344,10 +294,10 @@ object DownloadUtils {
             val fileName = parseContentDispositionWithFileName(contentDisposition)
                 ?: parseContentDispositionWithFileNameAsterisk(contentDisposition)
             Uri.decode(fileName)
-        } catch (ex: IllegalStateException) {
+        } catch (_: IllegalStateException) {
             // This function is defined as returning null when it can't parse the header
             null
-        } catch (ex: UnsupportedEncodingException) {
+        } catch (_: UnsupportedEncodingException) {
             // Do nothing
             null
         }
@@ -362,7 +312,7 @@ object DownloadUtils {
             val unencodedFileName = contentDisposition.substring(startIndex)
             val indexOfNextSemicolon = unencodedFileName.indexOf(';')
             if (indexOfNextSemicolon != -1) {
-                return unencodedFileName.substring(0, indexOfNextSemicolon)
+                return unencodedFileName.take(indexOfNextSemicolon)
             }
             return unencodedFileName
         }
@@ -440,7 +390,7 @@ object DownloadUtils {
     /**
      * Compare the filename extension with the mime type and change it if necessary.
      */
-    private fun changeExtension(filename: String, providedMimeType: String?): String {
+    fun changeExtension(filename: String, providedMimeType: String?): String {
         val file = File(filename)
         val mimeTypeMap = MimeTypeMap.getSingleton()
         val extensionFromMimeType = getExtensionFromMimeType(providedMimeType)
@@ -485,7 +435,7 @@ object DownloadUtils {
     /**
      * Guess the extension for a file using the mime type.
      */
-    private fun createExtension(mimeType: String?): String {
+    fun createExtension(mimeType: String?): String {
         var extension: String? = null
 
         if (mimeType != null) {
@@ -507,4 +457,41 @@ object DownloadUtils {
 
         return extension
     }
+
+    /**
+     * Checks if a file path corresponds to the default public "Downloads" directory.
+     *
+     * @return `true` if the path is the default downloads directory, `false` otherwise.
+     * It also returns `false` if the path is null, empty, or a "content://" URI.
+     */
+    fun String?.isDefaultDownloadDirectory(): Boolean {
+        if (this.isNullOrEmpty() || this.startsWith(SCHEME_CONTENT)) {
+            return false
+        }
+        val defaultDownloadsDir =
+            Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+        return File(this).absolutePath == defaultDownloadsDir.absolutePath
+    }
+
+    /**
+     * Queries MediaStore to find a file by its display name within a given collection.
+     *
+     * @param collection The MediaStore collection to search in (e.g., MediaStore.Downloads.getContentUri(...)).
+     * @param fileName The display name of the file to find.
+     * @return The content [Uri] of the file if found, otherwise null.
+     */
+    fun ContentResolver.findFileInMediaStore(collection: Uri, fileName: String): Uri? {
+        val projection = arrayOf(MediaStore.Downloads._ID)
+        val selection = "${MediaStore.Downloads.DISPLAY_NAME} = ?"
+        val selectionArgs = arrayOf(fileName)
+
+        query(collection, projection, selection, selectionArgs, null)?.use { cursor ->
+            if (cursor.moveToFirst()) {
+                val idColumn = cursor.getColumnIndexOrThrow(MediaStore.Downloads._ID)
+                val id = cursor.getLong(idColumn)
+                return ContentUris.withAppendedId(collection, id)
+            }
+        }
+        return null
+    }
 }
diff --git a/mobile/android/android-components/components/support/utils/src/test/java/mozilla/components/support/utils/DefaultDownloadFileUtilsTest.kt b/mobile/android/android-components/components/support/utils/src/test/java/mozilla/components/support/utils/DefaultDownloadFileUtilsTest.kt
new file mode 100644
index 0000000000000..aadb472c527ed
--- /dev/null
+++ b/mobile/android/android-components/components/support/utils/src/test/java/mozilla/components/support/utils/DefaultDownloadFileUtilsTest.kt
@@ -0,0 +1,418 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package mozilla.components.support.utils
+
+import android.os.Environment
+import android.webkit.MimeTypeMap
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import mozilla.components.support.test.robolectric.testContext
+import org.junit.Assert.assertEquals
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TemporaryFolder
+import org.junit.runner.RunWith
+import org.mockito.Mockito.doReturn
+import org.mockito.Mockito.spy
+
+@RunWith(AndroidJUnit4::class)
+class DefaultDownloadFileUtilsTest {
+    @Rule
+    @JvmField
+    val folder = TemporaryFolder()
+
+    private val rootPath: String
+        get() = folder.root.path
+
+    val defaultDownloadFileUtils: DefaultDownloadFileUtils = DefaultDownloadFileUtils(
+        context = testContext,
+        downloadLocationGetter = {
+            rootPath
+        },
+    )
+
+    private fun assertContentDisposition(expected: String, contentDisposition: String) {
+        assertEquals(
+            expected,
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = contentDisposition,
+                url = null,
+                mimeType = null,
+            ),
+        )
+    }
+
+    @Test
+    fun guessFileName_contentDisposition() {
+        // Default file name
+        assertContentDisposition("downloadfile.bin", "")
+
+        CONTENT_DISPOSITION_TYPES.forEach { contentDisposition ->
+            // continuing with default filenames
+            assertContentDisposition("downloadfile.bin", contentDisposition)
+            assertContentDisposition("downloadfile.bin", "$contentDisposition;")
+            assertContentDisposition("downloadfile.bin", "$contentDisposition; filename")
+            assertContentDisposition("downloadfile.bin", "$contentDisposition; filename=")
+            assertContentDisposition("downloadfile.bin", "$contentDisposition; filename=\"\"")
+            assertContentDisposition("downloadfile.bin", "$contentDisposition; filename=.bin")
+
+            // Provided filename field
+            assertContentDisposition("filename.jpg", "$contentDisposition; filename=\"filename.jpg\"")
+            assertContentDisposition("file\"name.jpg", "$contentDisposition; filename=\"file\\\"name.jpg\"")
+            assertContentDisposition("file\\name.jpg", "$contentDisposition; filename=\"file\\\\name.jpg\"")
+            assertContentDisposition("file\\\"name.jpg", "$contentDisposition; filename=\"file\\\\\\\"name.jpg\"")
+            assertContentDisposition("filename.jpg", "$contentDisposition; filename=filename.jpg")
+            assertContentDisposition("filename.jpg", "$contentDisposition; filename=filename.jpg; foo")
+            assertContentDisposition("filename.jpg", "$contentDisposition; filename=\"filename.jpg\"; foo")
+            assertContentDisposition("file\nname.jpg", "$contentDisposition; filename=\"file%0Aname.jpg\"; foo")
+
+            // UTF-8 encoded filename* field
+            assertContentDisposition(
+                "\uD83E\uDD8A + x.jpg",
+                "$contentDisposition; filename=\"_.jpg\"; filename*=utf-8'en'%F0%9F%A6%8A%20+%20x.jpg",
+            )
+            assertContentDisposition(
+                "filename 的副本.jpg",
+                contentDisposition + ";filename=\"_.jpg\";" +
+                    "filename*=UTF-8''filename%20%E7%9A%84%E5%89%AF%E6%9C%AC.jpg",
+            )
+            assertContentDisposition(
+                "filename.jpg",
+                "$contentDisposition; filename=_.jpg; filename*=utf-8'en'filename.jpg",
+            )
+            // Wrong order of the "filename*" segment
+            assertContentDisposition(
+                "filename.jpg",
+                "$contentDisposition; filename*=utf-8'en'filename.jpg; filename=_.jpg",
+            )
+            // Semicolon at the end
+            assertContentDisposition(
+                "filename.jpg",
+                "$contentDisposition; filename*=utf-8'en'filename.jpg; foo",
+            )
+
+            // ISO-8859-1 encoded filename* field
+            assertContentDisposition(
+                "file' 'name.jpg",
+                "$contentDisposition; filename=\"_.jpg\"; filename*=iso-8859-1'en'file%27%20%27name.jpg",
+            )
+
+            assertContentDisposition("success.html", "$contentDisposition; filename*=utf-8''success.html; foo")
+            assertContentDisposition("success.html", "$contentDisposition; filename*=utf-8''success.html")
+            assertContentDisposition("Firefox v9.apk", "$contentDisposition; filename=\"Firefox v9.apk\"; filename*=utf-8''Firefox v9.apk")
+            assertContentDisposition("Firefox (v9).apk", "$contentDisposition; filename=\"Firefox (v9).apk\"; filename*=utf-8''Firefox%20%28v9%29.apk")
+        }
+    }
+
+    @Test
+    fun uniqueFilenameNoExtension() {
+        val spyUtils = spy(defaultDownloadFileUtils)
+
+        assertEquals("test", spyUtils.uniqueFileName(rootPath, "test"))
+
+        doReturn(true).`when`(spyUtils).fileExists(rootPath, "test")
+        assertEquals("test(1)", spyUtils.uniqueFileName(rootPath, "test"))
+
+        doReturn(true).`when`(spyUtils).fileExists(rootPath, "test")
+        doReturn(true).`when`(spyUtils).fileExists(rootPath, "test(1)")
+        assertEquals("test(2)", spyUtils.uniqueFileName(rootPath, "test"))
+    }
+
+    @Test
+    fun uniqueFilename() {
+        val spyUtils = spy(defaultDownloadFileUtils)
+
+        doReturn(true).`when`(spyUtils).fileExists(rootPath, "test.zip")
+
+        assertEquals("test(1).zip", spyUtils.uniqueFileName(rootPath, "test.zip"))
+
+        doReturn(true).`when`(spyUtils).fileExists(rootPath, "test.zip")
+        doReturn(true).`when`(spyUtils).fileExists(rootPath, "test(1).zip")
+
+        assertEquals("test(2).zip", spyUtils.uniqueFileName(rootPath, "test.zip"))
+    }
+
+    @Test
+    fun guessFilename() {
+        val spyUtils = spy(defaultDownloadFileUtils)
+
+        assertEquals(
+            "test.zip",
+            spyUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/test.zip",
+                mimeType = "application/zip",
+            ),
+        )
+
+        doReturn(true).`when`(spyUtils).fileExists(rootPath, "test.zip")
+        assertEquals(
+            "test(1).zip",
+            spyUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/test.zip",
+                mimeType = "application/zip",
+            ),
+        )
+
+        doReturn(true).`when`(spyUtils).fileExists(rootPath, "test.zip")
+        doReturn(true).`when`(spyUtils).fileExists(rootPath, "test(1).zip")
+        assertEquals(
+            "test(2).zip",
+            spyUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/test.zip",
+                mimeType = "application/zip",
+            ),
+        )
+    }
+
+    @Test
+    fun guessFileName_url() {
+        assertUrl(
+            expected = "downloadfile.bin",
+            url = "http://example.com/",
+        )
+        assertUrl(
+            expected = "downloadfile.bin",
+            url = "http://example.com/filename/",
+        )
+        assertUrl(
+            expected = "filename.jpg",
+            url = "http://example.com/filename.jpg",
+        )
+        assertUrl(
+            expected = "filename.jpg",
+            url = "http://example.com/foo/bar/filename.jpg",
+        )
+    }
+
+    @Test
+    fun guessFileName_mimeType() {
+        // Matches the first extension from official mapping: application/x-msdos-program -> com exe bat dll
+        assertEquals(
+            "com",
+            MimeTypeMap.getSingleton().getExtensionFromMimeType("application/x-msdos-program"),
+        )
+        assertEquals(
+            "application/x-msdos-program",
+            MimeTypeMap.getSingleton().getMimeTypeFromExtension("exe"),
+        )
+        assertEquals(
+            "application/x-msdos-program",
+            MimeTypeMap.getSingleton().getMimeTypeFromExtension("dll"),
+        )
+        assertEquals(
+            "application/x-msdos-program",
+            MimeTypeMap.getSingleton().getMimeTypeFromExtension("bat"),
+        )
+
+        assertEquals(
+            "file.jpg",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/file.jpg",
+                mimeType = "image/jpeg",
+            ),
+        )
+
+        // This is difference with URLUtil.guessFileName
+        assertEquals(
+            "file.bin.jpg",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/file.bin",
+                mimeType = "image/jpeg",
+            ),
+        )
+
+        assertEquals(
+            "Caesium-wahoo-v3.6-b792615ced1b.zip",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "https://download.msfjarvis.website/caesium/wahoo/beta/Caesium-wahoo-v3.6-b792615ced1b.zip",
+                mimeType = "application/zip",
+            ),
+        )
+        assertEquals(
+            "compressed.TAR.GZ",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/compressed.TAR.GZ",
+                mimeType = "application/gzip",
+            ),
+        )
+        assertEquals(
+            "file.html",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/file?abc",
+                mimeType = "text/html",
+            ),
+        )
+        assertEquals(
+            "file.html",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/file",
+                mimeType = "text/html",
+            ),
+        )
+        assertEquals(
+            "file.html",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/file",
+                mimeType = "text/html; charset=utf-8",
+            ),
+        )
+        assertEquals(
+            "file.txt.html",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/file.txt",
+                mimeType = "text/html",
+            ),
+        )
+        assertEquals(
+            "file.txt",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/file.txt",
+                mimeType = "text/plain",
+            ),
+        )
+        assertEquals(
+            "file.data",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/file.data",
+                mimeType = "application/octet-stream",
+            ),
+        )
+        assertEquals(
+            "file.data",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/file.data",
+                mimeType = "binary/octet-stream",
+            ),
+        )
+        assertEquals(
+            "file.data",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/file.data",
+                mimeType = "application/unknown",
+            ),
+        )
+
+        assertEquals(
+            "file.zip.jpg",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/file.zip",
+                mimeType = "image/jpeg",
+            ),
+        )
+
+        // extra information in content-type
+        assertEquals(
+            "file.jpg",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/file.jpg",
+                mimeType = "application/octet-stream; Charset=utf-8",
+            ),
+        )
+
+        // Should not change to file.dll
+        assertEquals(
+            "file.exe",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/file.exe",
+                mimeType = "application/x-msdos-program",
+            ),
+        )
+        assertEquals(
+            "file.exe",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/file.exe",
+                mimeType = "application/vnd.microsoft.portable-executable",
+            ),
+        )
+
+        // application/x-pdf with .pdf
+        assertEquals(
+            "file.pdf",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/file.pdf",
+                mimeType = "application/x-pdf",
+            ),
+        )
+
+        // application/x-pdf without extension
+        assertEquals(
+            "downloadfile.pdf",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/downloadfile",
+                mimeType = "application/x-pdf",
+            ),
+        )
+
+        // application/x-pdf with non-pdf extension
+        assertEquals(
+            "file.bin.pdf",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/file.bin",
+                mimeType = "application/x-pdf",
+            ),
+        )
+
+        assertEquals(
+            "file.bin.com",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/file.bin",
+                mimeType = "application/x-msdos-program",
+            ),
+        )
+
+        assertEquals(
+            "file.apks.zip",
+            defaultDownloadFileUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/file.apks",
+                mimeType = "application/zip",
+            ),
+        )
+    }
+
+    companion object {
+        private val CONTENT_DISPOSITION_TYPES = listOf("attachment", "inline")
+
+        private fun assertUrl(expected: String, url: String) {
+            assertEquals(
+                expected,
+                DefaultDownloadFileUtils(
+                    context = testContext,
+                    downloadLocationGetter = {
+                        Environment.getExternalStoragePublicDirectory(
+                            Environment.DIRECTORY_DOWNLOADS,
+                        ).path
+                    },
+                ).guessFileName(
+                    contentDisposition = null,
+                    url = url,
+                    mimeType = null,
+                ),
+            )
+        }
+    }
+}
diff --git a/mobile/android/android-components/components/support/utils/src/test/java/mozilla/components/support/utils/DownloadUtilsTest.kt b/mobile/android/android-components/components/support/utils/src/test/java/mozilla/components/support/utils/DownloadUtilsTest.kt
index acf10c324746d..5fd655c21d541 100644
--- a/mobile/android/android-components/components/support/utils/src/test/java/mozilla/components/support/utils/DownloadUtilsTest.kt
+++ b/mobile/android/android-components/components/support/utils/src/test/java/mozilla/components/support/utils/DownloadUtilsTest.kt
@@ -4,401 +4,14 @@
 
 package mozilla.components.support.utils
 
-import android.webkit.MimeTypeMap
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Assert.assertEquals
-import org.junit.Rule
 import org.junit.Test
-import org.junit.rules.TemporaryFolder
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class DownloadUtilsTest {
 
-    @Rule @JvmField
-    val folder = TemporaryFolder()
-
-    private fun assertContentDisposition(expected: String, contentDisposition: String) {
-        assertEquals(
-            expected,
-            DownloadUtils.guessFileName(
-                contentDisposition = contentDisposition,
-                destinationDirectory = folder.root.path,
-                url = null,
-                mimeType = null,
-            ),
-        )
-    }
-
-    @Test
-    fun guessFileName_contentDisposition() {
-        // Default file name
-        assertContentDisposition("downloadfile.bin", "")
-
-        CONTENT_DISPOSITION_TYPES.forEach { contentDisposition ->
-            // continuing with default filenames
-            assertContentDisposition("downloadfile.bin", contentDisposition)
-            assertContentDisposition("downloadfile.bin", "$contentDisposition;")
-            assertContentDisposition("downloadfile.bin", "$contentDisposition; filename")
-            assertContentDisposition("downloadfile.bin", "$contentDisposition; filename=")
-            assertContentDisposition("downloadfile.bin", "$contentDisposition; filename=\"\"")
-            assertContentDisposition("downloadfile.bin", "$contentDisposition; filename=.bin")
-
-            // Provided filename field
-            assertContentDisposition("filename.jpg", "$contentDisposition; filename=\"filename.jpg\"")
-            assertContentDisposition("file\"name.jpg", "$contentDisposition; filename=\"file\\\"name.jpg\"")
-            assertContentDisposition("file\\name.jpg", "$contentDisposition; filename=\"file\\\\name.jpg\"")
-            assertContentDisposition("file\\\"name.jpg", "$contentDisposition; filename=\"file\\\\\\\"name.jpg\"")
-            assertContentDisposition("filename.jpg", "$contentDisposition; filename=filename.jpg")
-            assertContentDisposition("filename.jpg", "$contentDisposition; filename=filename.jpg; foo")
-            assertContentDisposition("filename.jpg", "$contentDisposition; filename=\"filename.jpg\"; foo")
-            assertContentDisposition("file\nname.jpg", "$contentDisposition; filename=\"file%0Aname.jpg\"; foo")
-
-            // UTF-8 encoded filename* field
-            assertContentDisposition(
-                "\uD83E\uDD8A + x.jpg",
-                "$contentDisposition; filename=\"_.jpg\"; filename*=utf-8'en'%F0%9F%A6%8A%20+%20x.jpg",
-            )
-            assertContentDisposition(
-                "filename 的副本.jpg",
-                contentDisposition + ";filename=\"_.jpg\";" +
-                    "filename*=UTF-8''filename%20%E7%9A%84%E5%89%AF%E6%9C%AC.jpg",
-            )
-            assertContentDisposition(
-                "filename.jpg",
-                "$contentDisposition; filename=_.jpg; filename*=utf-8'en'filename.jpg",
-            )
-            // Wrong order of the "filename*" segment
-            assertContentDisposition(
-                "filename.jpg",
-                "$contentDisposition; filename*=utf-8'en'filename.jpg; filename=_.jpg",
-            )
-            // Semicolon at the end
-            assertContentDisposition(
-                "filename.jpg",
-                "$contentDisposition; filename*=utf-8'en'filename.jpg; foo",
-            )
-
-            // ISO-8859-1 encoded filename* field
-            assertContentDisposition(
-                "file' 'name.jpg",
-                "$contentDisposition; filename=\"_.jpg\"; filename*=iso-8859-1'en'file%27%20%27name.jpg",
-            )
-
-            assertContentDisposition("success.html", "$contentDisposition; filename*=utf-8''success.html; foo")
-            assertContentDisposition("success.html", "$contentDisposition; filename*=utf-8''success.html")
-            assertContentDisposition("Firefox v9.apk", "$contentDisposition; filename=\"Firefox v9.apk\"; filename*=utf-8''Firefox v9.apk")
-            assertContentDisposition("Firefox (v9).apk", "$contentDisposition; filename=\"Firefox (v9).apk\"; filename*=utf-8''Firefox%20%28v9%29.apk")
-        }
-    }
-
-    @Test
-    fun uniqueFilenameNoExtension() {
-        assertEquals("test", DownloadUtils.uniqueFileName(folder.root, "test"))
-
-        folder.newFile("test")
-        assertEquals("test(1)", DownloadUtils.uniqueFileName(folder.root, "test"))
-
-        folder.newFile("test(1)")
-        assertEquals("test(2)", DownloadUtils.uniqueFileName(folder.root, "test"))
-    }
-
-    @Test
-    fun uniqueFilename() {
-        assertEquals("test.zip", DownloadUtils.uniqueFileName(folder.root, "test.zip"))
-
-        folder.newFile("test.zip")
-        assertEquals("test(1).zip", DownloadUtils.uniqueFileName(folder.root, "test.zip"))
-
-        folder.newFile("test(1).zip")
-        assertEquals("test(2).zip", DownloadUtils.uniqueFileName(folder.root, "test.zip"))
-    }
-
-    @Test
-    fun guessFilename() {
-        assertEquals(
-            "test.zip",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/test.zip",
-                mimeType = "application/zip",
-            ),
-        )
-
-        folder.newFile("test.zip")
-        assertEquals(
-            "test(1).zip",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/test.zip",
-                mimeType = "application/zip",
-            ),
-        )
-
-        folder.newFile("test(1).zip")
-        assertEquals(
-            "test(2).zip",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/test.zip",
-                mimeType = "application/zip",
-            ),
-        )
-    }
-
-    @Test
-    fun guessFileName_url() {
-        assertUrl(
-            destinationDirectory = folder.root.path,
-            expected = "downloadfile.bin",
-            url = "http://example.com/",
-        )
-        assertUrl(
-            destinationDirectory = folder.root.path,
-            expected = "downloadfile.bin",
-            url = "http://example.com/filename/",
-        )
-        assertUrl(
-            destinationDirectory = folder.root.path,
-            expected = "filename.jpg",
-            url = "http://example.com/filename.jpg",
-        )
-        assertUrl(
-            destinationDirectory = folder.root.path,
-            expected = "filename.jpg",
-            url = "http://example.com/foo/bar/filename.jpg",
-        )
-    }
-
-    @Test
-    fun guessFileName_mimeType() {
-        // Matches the first extension from official mapping: application/x-msdos-program -> com exe bat dll
-        assertEquals(
-            "com",
-            MimeTypeMap.getSingleton().getExtensionFromMimeType("application/x-msdos-program"),
-        )
-        assertEquals(
-            "application/x-msdos-program",
-            MimeTypeMap.getSingleton().getMimeTypeFromExtension("exe"),
-        )
-        assertEquals(
-            "application/x-msdos-program",
-            MimeTypeMap.getSingleton().getMimeTypeFromExtension("dll"),
-        )
-        assertEquals(
-            "application/x-msdos-program",
-            MimeTypeMap.getSingleton().getMimeTypeFromExtension("bat"),
-        )
-
-        assertEquals(
-            "file.jpg",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/file.jpg",
-                mimeType = "image/jpeg",
-            ),
-        )
-
-        // This is difference with URLUtil.guessFileName
-        assertEquals(
-            "file.bin.jpg",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/file.bin",
-                mimeType = "image/jpeg",
-            ),
-        )
-
-        assertEquals(
-            "Caesium-wahoo-v3.6-b792615ced1b.zip",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "https://download.msfjarvis.website/caesium/wahoo/beta/Caesium-wahoo-v3.6-b792615ced1b.zip",
-                mimeType = "application/zip",
-            ),
-        )
-        assertEquals(
-            "compressed.TAR.GZ",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/compressed.TAR.GZ",
-                mimeType = "application/gzip",
-            ),
-        )
-        assertEquals(
-            "file.html",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/file?abc",
-                mimeType = "text/html",
-            ),
-        )
-        assertEquals(
-            "file.html",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/file",
-                mimeType = "text/html",
-            ),
-        )
-        assertEquals(
-            "file.html",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/file",
-                mimeType = "text/html; charset=utf-8",
-            ),
-        )
-        assertEquals(
-            "file.txt.html",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/file.txt",
-                mimeType = "text/html",
-            ),
-        )
-        assertEquals(
-            "file.txt",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/file.txt",
-                mimeType = "text/plain",
-            ),
-        )
-        assertEquals(
-            "file.data",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/file.data",
-                mimeType = "application/octet-stream",
-            ),
-        )
-        assertEquals(
-            "file.data",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/file.data",
-                mimeType = "binary/octet-stream",
-            ),
-        )
-        assertEquals(
-            "file.data",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/file.data",
-                mimeType = "application/unknown",
-            ),
-        )
-
-        assertEquals(
-            "file.zip.jpg",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/file.zip",
-                mimeType = "image/jpeg",
-            ),
-        )
-
-        // extra information in content-type
-        assertEquals(
-            "file.jpg",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/file.jpg",
-                mimeType = "application/octet-stream; Charset=utf-8",
-            ),
-        )
-
-        // Should not change to file.dll
-        assertEquals(
-            "file.exe",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/file.exe",
-                mimeType = "application/x-msdos-program",
-            ),
-        )
-        assertEquals(
-            "file.exe",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/file.exe",
-                mimeType = "application/vnd.microsoft.portable-executable",
-            ),
-        )
-
-        // application/x-pdf with .pdf
-        assertEquals(
-            "file.pdf",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/file.pdf",
-                mimeType = "application/x-pdf",
-            ),
-        )
-
-        // application/x-pdf without extension
-        assertEquals(
-            "downloadfile.pdf",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/downloadfile",
-                mimeType = "application/x-pdf",
-            ),
-        )
-
-        // application/x-pdf with non-pdf extension
-        assertEquals(
-            "file.bin.pdf",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/file.bin",
-                mimeType = "application/x-pdf",
-            ),
-        )
-
-        assertEquals(
-            "file.bin.com",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                destinationDirectory = folder.root.path,
-                url = "http://example.com/file.bin",
-                mimeType = "application/x-msdos-program",
-            ),
-        )
-
-        assertEquals(
-            "file.apks.zip",
-            DownloadUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/file.apks",
-                mimeType = "application/zip",
-            ),
-        )
-    }
-
     @Test
     fun sanitizeMimeType() {
         assertEquals("application/pdf", DownloadUtils.sanitizeMimeType("application/pdf; qs=0.001"))
@@ -477,20 +90,4 @@ class DownloadUtilsTest {
         assertEquals("a(1)", DownloadUtils.createFileName("a", 1))
         assertEquals("a(1)", DownloadUtils.createFileName("a", 1, ""))
     }
-
-    companion object {
-        private val CONTENT_DISPOSITION_TYPES = listOf("attachment", "inline")
-
-        private fun assertUrl(destinationDirectory: String, expected: String, url: String) {
-            assertEquals(
-                expected,
-                DownloadUtils.guessFileName(
-                    contentDisposition = null,
-                    destinationDirectory = destinationDirectory,
-                    url = url,
-                    mimeType = null,
-                ),
-            )
-        }
-    }
 }
diff --git a/mobile/android/android-components/components/support/utils/src/testFixtures/kotlin/mozilla/components/support/utils/FakeDownloadFileUtils.kt b/mobile/android/android-components/components/support/utils/src/testFixtures/kotlin/mozilla/components/support/utils/FakeDownloadFileUtils.kt
new file mode 100644
index 0000000000000..2153d96c8959e
--- /dev/null
+++ b/mobile/android/android-components/components/support/utils/src/testFixtures/kotlin/mozilla/components/support/utils/FakeDownloadFileUtils.kt
@@ -0,0 +1,74 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package mozilla.components.support.utils
+
+import android.net.Uri
+import android.os.Environment
+import androidx.core.net.toUri
+import java.io.File
+
+/**
+ * A fake implementation of [DownloadFileUtils] for testing purposes.
+ *
+ * This class allows faking the behavior of file-related operations during downloads
+ * by providing lambdas for its primary functions.
+ */
+class FakeDownloadFileUtils(
+    private val guessFileName: (
+        contentDisposition: String?,
+        url: String?,
+        mimeType: String?,
+    ) -> String = { _, _, _ -> "fileName" },
+    private val findDownloadFileUri: (
+        fileName: String?,
+        directoryPath: String,
+    ) -> Uri = { _, _ ->
+        Environment.getExternalStoragePublicDirectory(
+            Environment.DIRECTORY_DOWNLOADS,
+        ).path.toUri()
+    },
+    private val fileExists: (
+        directoryPath: String,
+        fileName: String?,
+    ) -> Boolean = { directoryPath, fileName ->
+        File(directoryPath, fileName ?: "").exists()
+    },
+    private val uniqueFileName: (
+        directoryPath: String,
+        fileName: String,
+    ) -> String = { directoryPath, fileName ->
+        "$directoryPath/$fileName"
+    },
+) : DownloadFileUtils {
+
+    override fun guessFileName(
+        contentDisposition: String?,
+        url: String?,
+        mimeType: String?,
+    ): String {
+        return guessFileName.invoke(contentDisposition, url, mimeType)
+    }
+
+    override fun findDownloadFileUri(
+        fileName: String?,
+        directoryPath: String,
+    ): Uri {
+        return findDownloadFileUri.invoke(fileName, directoryPath)
+    }
+
+    override fun fileExists(
+        directoryPath: String,
+        fileName: String?,
+    ): Boolean {
+        return fileExists.invoke(directoryPath, fileName)
+    }
+
+    override fun uniqueFileName(
+        directoryPath: String,
+        fileName: String,
+    ): String {
+        return uniqueFileName.invoke(directoryPath, fileName)
+    }
+}
diff --git a/mobile/android/android-components/docs/changelog.md b/mobile/android/android-components/docs/changelog.md
index d83e14f79011e..587f7f0dc8b57 100644
--- a/mobile/android/android-components/docs/changelog.md
+++ b/mobile/android/android-components/docs/changelog.md
@@ -5,6 +5,9 @@ permalink: /changelog/
 ---
 
 # 149.0 (In Development)
+* **engine-gecko**
+  * ⚠️ **Breaking change**: Added `DownloadFileUtils` parameter to `GeckoServiceWorkerDelegate`,
+    `SpeculativeSessionFactory`, `GeckoEngine`, `AndroidDownloadManager` and `GeckoEngineSession` [Bug 2004990] (https://bugzilla.mozilla.org/show_bug.cgi?id=2004990)
 
 # 148.0
 * **support-utils**
diff --git a/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/downloads/DownloadService.kt b/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/downloads/DownloadService.kt
index 7fab6c6e76753..9ac55cd913421 100644
--- a/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/downloads/DownloadService.kt
+++ b/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/downloads/DownloadService.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.samples.browser.downloads
 
+import android.os.Environment
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.feature.downloads.AbstractFetchDownloadService
 import mozilla.components.feature.downloads.DefaultPackageNameProvider
@@ -11,6 +12,8 @@ import mozilla.components.feature.downloads.DownloadEstimator
 import mozilla.components.feature.downloads.FileSizeFormatter
 import mozilla.components.feature.downloads.PackageNameProvider
 import mozilla.components.support.base.android.NotificationsDelegate
+import mozilla.components.support.utils.DefaultDownloadFileUtils
+import mozilla.components.support.utils.DownloadFileUtils
 import org.mozilla.samples.browser.ext.components
 
 class DownloadService : AbstractFetchDownloadService() {
@@ -20,4 +23,14 @@ class DownloadService : AbstractFetchDownloadService() {
     override val fileSizeFormatter: FileSizeFormatter by lazy { components.fileSizeFormatter }
     override val downloadEstimator: DownloadEstimator by lazy { components.downloadEstimator }
     override val packageNameProvider: PackageNameProvider by lazy { DefaultPackageNameProvider(applicationContext) }
+    override val downloadFileUtils: DownloadFileUtils by lazy {
+        DefaultDownloadFileUtils(
+            context = applicationContext,
+            downloadLocationGetter = {
+                Environment.getExternalStoragePublicDirectory(
+                    Environment.DIRECTORY_DOWNLOADS,
+                ).path
+            },
+        )
+    }
 }
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index 56818b93adddc..e1331d0affd7f 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -11,6 +11,7 @@ import android.content.Intent
 import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
+import android.os.Environment
 import android.os.storage.StorageManager
 import android.provider.Settings
 import android.util.Log
@@ -141,6 +142,7 @@ import mozilla.components.support.ktx.android.view.hideKeyboard
 import mozilla.components.support.ktx.kotlin.getOrigin
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged
 import mozilla.components.support.locale.ActivityContextWrapper
+import mozilla.components.support.utils.DefaultDownloadFileUtils
 import mozilla.components.ui.widgets.behavior.EngineViewClippingBehavior
 import mozilla.components.ui.widgets.withCenterAlignedButtons
 import mozilla.telemetry.glean.private.NoExtras
@@ -796,6 +798,14 @@ abstract class BaseBrowserFragment :
             useCases = context.components.useCases.downloadUseCases,
             fragmentManager = childFragmentManager,
             tabId = customTabSessionId,
+            downloadFileUtils = DefaultDownloadFileUtils(
+                context = context.applicationContext,
+                downloadLocationGetter = {
+                    Environment.getExternalStoragePublicDirectory(
+                        Environment.DIRECTORY_DOWNLOADS,
+                    ).path
+                },
+            ),
             downloadManager = FetchDownloadManager(
                 context.applicationContext,
                 store,
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt
index 5cc1da059f7da..3c86797cc021f 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt
@@ -6,6 +6,7 @@ package org.mozilla.fenix.components
 
 import android.content.Context
 import android.content.res.Configuration
+import android.os.Environment
 import androidx.core.content.ContextCompat
 import androidx.datastore.preferences.preferencesDataStore
 import kotlinx.coroutines.CoroutineScope
@@ -103,6 +104,7 @@ import mozilla.components.support.base.worker.Frequency
 import mozilla.components.support.ktx.android.content.appVersionName
 import mozilla.components.support.ktx.android.content.res.readJSONObject
 import mozilla.components.support.locale.LocaleManager
+import mozilla.components.support.utils.DefaultDownloadFileUtils
 import mozilla.components.support.utils.RunWhenReadyQueue
 import org.mozilla.fenix.AppRequestInterceptor
 import org.mozilla.fenix.BuildConfig
@@ -233,9 +235,17 @@ class Core(
         }
 
         GeckoEngine(
-            context,
-            defaultSettings,
-            geckoRuntime,
+            context = context,
+            defaultSettings = defaultSettings,
+            runtime = geckoRuntime,
+            downloadFileUtils = DefaultDownloadFileUtils(
+                context = context,
+                downloadLocationGetter = {
+                    Environment.getExternalStoragePublicDirectory(
+                        Environment.DIRECTORY_DOWNLOADS,
+                    ).path
+                },
+                ),
         ).also {
             WebCompatFeature.install(it)
         }
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/downloads/DownloadService.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/downloads/DownloadService.kt
index 56351031e6a6d..2eb4b28a68527 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/downloads/DownloadService.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/downloads/DownloadService.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.downloads
 
+import android.os.Environment
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.feature.downloads.AbstractFetchDownloadService
 import mozilla.components.feature.downloads.DefaultPackageNameProvider
@@ -11,6 +12,8 @@ import mozilla.components.feature.downloads.DownloadEstimator
 import mozilla.components.feature.downloads.FileSizeFormatter
 import mozilla.components.feature.downloads.PackageNameProvider
 import mozilla.components.support.base.android.NotificationsDelegate
+import mozilla.components.support.utils.DefaultDownloadFileUtils
+import mozilla.components.support.utils.DownloadFileUtils
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components
 
@@ -24,4 +27,14 @@ class DownloadService : AbstractFetchDownloadService() {
     override val packageNameProvider: PackageNameProvider by lazy {
         DefaultPackageNameProvider(applicationContext)
     }
+    override val downloadFileUtils: DownloadFileUtils by lazy {
+        DefaultDownloadFileUtils(
+            context = applicationContext,
+            downloadLocationGetter = {
+                Environment.getExternalStoragePublicDirectory(
+                    Environment.DIRECTORY_DOWNLOADS,
+                ).path
+            },
+        )
+    }
 }
diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/downloads/DownloadService.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/downloads/DownloadService.kt
index 5b1c3659ce272..4df90473f35cd 100644
--- a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/downloads/DownloadService.kt
+++ b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/downloads/DownloadService.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.focus.downloads
 
+import android.os.Environment
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.concept.fetch.Client
 import mozilla.components.feature.downloads.AbstractFetchDownloadService
@@ -12,6 +13,8 @@ import mozilla.components.feature.downloads.DownloadEstimator
 import mozilla.components.feature.downloads.FileSizeFormatter
 import mozilla.components.feature.downloads.PackageNameProvider
 import mozilla.components.support.base.android.NotificationsDelegate
+import mozilla.components.support.utils.DefaultDownloadFileUtils
+import mozilla.components.support.utils.DownloadFileUtils
 import org.mozilla.focus.ext.components
 
 class DownloadService : AbstractFetchDownloadService() {
@@ -21,4 +24,14 @@ class DownloadService : AbstractFetchDownloadService() {
     override val fileSizeFormatter: FileSizeFormatter by lazy { components.fileSizeFormatter }
     override val downloadEstimator: DownloadEstimator by lazy { components.downloadEstimator }
     override val packageNameProvider: PackageNameProvider by lazy { DefaultPackageNameProvider(applicationContext) }
+    override val downloadFileUtils: DownloadFileUtils by lazy {
+        DefaultDownloadFileUtils(
+            context = applicationContext,
+            downloadLocationGetter = {
+                Environment.getExternalStoragePublicDirectory(
+                    Environment.DIRECTORY_DOWNLOADS,
+                ).path
+            },
+        )
+    }
 }

From 10421053351bd520738a64af39d330b3529a5461 Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <jrediger@mozilla.com>
Date: Thu, 29 Jan 2026 11:34:13 +0000
Subject: [PATCH 017/116] Bug 2010821 - Update docs about bugs and data review
 on metrics r=chutten,Roger DONTBUILD

This also updates the Fenix docs, which were very outdated and contained
lots of now-invalid links. I have removed all of these.
However there's other Android telemetry documentation that is outdated.

Differential Revision: https://phabricator.services.mozilla.com/D280732
---
 ...metry-implementation,-reviews,-renewals.md | 93 +++----------------
 .../glean/build_scripts/mach_commands.py      | 17 ++--
 2 files changed, 20 insertions(+), 90 deletions(-)

diff --git a/mobile/android/fenix/docs/Telemetry-implementation,-reviews,-renewals.md b/mobile/android/fenix/docs/Telemetry-implementation,-reviews,-renewals.md
index 81f3ea5825f92..bad3e32668822 100644
--- a/mobile/android/fenix/docs/Telemetry-implementation,-reviews,-renewals.md
+++ b/mobile/android/fenix/docs/Telemetry-implementation,-reviews,-renewals.md
@@ -1,23 +1,21 @@
 # Telemetry - Implementation, Reviews, Renewals
 
-See https://github.com/mozilla-mobile/fenix/wiki/Telemetry-Checklist for the steps to implement new probes.
-
 # Creating Glean Annotations
 
-Glean Annotations repository: https://github.com/mozilla/glean-annotations
-
-See [Add a Glean Annotation for an event](https://github.com/mozilla-mobile/fenix/wiki/Add-a-Glean-Annotation-for-an-event) for instructions.
+Glean Annotations repository: <https://github.com/mozilla/glean-annotations>
 
-More info [here](https://mozilla.github.io/glean-annotations/contributing/creating/)
+See the documentation on how to [create new annotations](https://mozilla.github.io/glean-annotations/contributing/creating/).
 
 
 # Data review
 
-Data reviews are needed on all PRs that add new telemetry or modify existing telemetry.
+Data reviews are needed on all patches that add new telemetry or modify existing telemetry.
+Any change that touches metrics will be automatically flagged with a `needs-data-classification` tag by Phabricator.
+If a change adds/updates data collection in a way that doesn’t automatically trigger this rule, this tag should be added manually (and if appropriate, please file a bug to update the herald rule so it happens automatically next time).
+
+More details about this process can be found in the [in-tree docs](https://firefox-source-docs.mozilla.org/contributing/data-review.html) and [wiki](https://wiki.mozilla.org/Data_Collection).
+Add a link for the bug adding or changing a metric or ping to the `bugs` and `data_reviews` lists
 
-1. The implementer must complete the forms for [data renewal](https://github.com/mozilla/data-review/blob/main/renewal_request.md) or [a new data request](https://github.com/mozilla/data-review/blob/main/request.md) and put them as a comment in their PR.
-2. Once the form is complete, contact a [Data Steward](https://wiki.mozilla.org/Data_Collection) to arrange a review. Note: a data review does not replace code review! The PR should not land without both a data review and a code review.
-3. Once the data review is complete, add the link to the approval in the `data_reviews` sub-section of your metric in the `metrics.yaml` file.
 Example:
 
 ```
@@ -27,11 +25,9 @@ download_notification:
     description: |
       A user resumed a download in the download notification
     bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/5583
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=EXAMPLE
     data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/6554
-      - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877
-      - https://github.com/mozilla-mobile/fenix/pull/18143
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=EXAMPLE
     data_sensitivity:
       - interaction
     notification_emails:
@@ -39,71 +35,6 @@ download_notification:
     expires: "2021-07-01"
 ```
 
-When a telemetry probe is being renewed, do not remove the old data review links from `metrics.yaml`. The new approval should be added to the existing list.
-
-Make sure you are selecting the correct Category of data that is being collected: https://wiki.mozilla.org/Data_Collection#Data_Collection_Categories
-
-# Renewing existing telemetry
-
-1. Collect a list of metrics from metrics.yaml file in Fenix that will be expiring in that month
-  a. Currently compiling these in [this doc](https://docs.google.com/document/d/1NGlnTa9TPyTnd3ciUPbwujbITjkX8p8vJybXcZrrM2w/edit#)
-  b. This should be done at least a few weeks prior to the events/metrics' expiration date
-  c. Including metric name, original data review PR link, description (if it’s unclear from the name)
-2. Figure out the owner for each of the metrics (who needs to give the OK to renew/remove)
-  a. Most renewals will need product approval
-  b. Other approvals could come from the engineering team (e.g. `preferences.remote_debugging_enabled`), GV, App Services, Performance (e.g. `startup.timeline.framework_primary`), etc.
-3. Answer any open questions for the metric owners, and get approval from them to:
-  a. Renew the metric (for how long? 6 months? 1 year?)
-  b. Choose not to renew (but not delete)
-  c. Choose to remove the metric
-  d. Renew the metric and set to never expire (this should only be for business critical metrics)
-4. Fill out the [renewal request](https://github.com/mozilla/data-review/blob/main/renewal_request.md) for each metric, with question 3 (“Why was the initial period of collection insufficient?”) being answered by the owner
-5. Open a PR for the renewals
-  a. Sometimes it’s easier to split up the renewals into multiple PRs if there are multiple owners: e.g. [product renewals](https://github.com/mozilla-mobile/fenix/pull/21788), [perf renewals](https://github.com/mozilla-mobile/fenix/pull/21315), [Fission renewals](https://github.com/mozilla-mobile/fenix/pull/21779) for December 2021
-6. Get a data review for your [renewal request](https://github.com/mozilla/data-review/blob/main/renewal_request.md) and update each of the metrics’ data-reviews in metrics.yaml to reflect this
-
-## Approval process
-
-For each telemetry probe that we want to renew, the data-review will ask us [these questions](https://github.com/mozilla/data-review/blob/main/renewal_request.md). Each probe/group of related probes should have answers to those questions ([example](https://github.com/mozilla-mobile/fenix/pull/20517#issuecomment-887038794)).
-
-### Example renewal data request
-```
-# Request for Data Collection Renewal
-
-`search_shortcuts:`
- selected
-1) Provide a link to the initial Data Collection Review Request for this collection.
-- https://github.com/mozilla-mobile/fenix/pull/1202#issuecomment-476870449
-- https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
-- https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
-
-2) When will this collection now expire? 08/01/2022
-3) Why was the initial period of collection insufficient?
-Important for revenue tracking and optimization.
-
-`Toolbar_settings:`
- changed_position:
-1) Provide a link to the initial Data Collection Review Request for this collection.
-- https://github.com/mozilla-mobile/fenix/pull/6608
-- https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068
-- https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
-
-2) When will this collection now expire? 08/01/2022
-3) Why was the initial period of collection insufficient?
-The data didn’t initially tell us what we wanted (there were bugs), so we want to continue tracking this so we can answer our questions.
-
-`login_dialog:`
- displayed:
-cancelled
-saved
-never_save
-1) Provide a link to the initial Data Collection Review Request for this collection.
-- https://github.com/mozilla-mobile/fenix/pull/13050
-- https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789
-
-2) When will this collection now expire? 08/01/2022
-3) Why was the initial period of collection insufficient?
-Still need to optimize this feature and we want trends from 6+mo of data.
-```
+When a telemetry metric is being renewed, do not remove the old data review links from `metrics.yaml`. The new approval should be added to the existing list.
 
-For product-defined telemetry, this will involve meeting with a product manager and discussing each probe. There are three options: renew the probe for another length of time (usually 6 months), let the probe expire to evaluate later if the probe is still needed, or remove the probe entirely.
+Make sure you are selecting the correct category of data that is being collected: [Data Collection Categories](https://wiki.mozilla.org/Data_Collection#Data_Collection_Categories)
diff --git a/toolkit/components/glean/build_scripts/mach_commands.py b/toolkit/components/glean/build_scripts/mach_commands.py
index e9d34c7d7fac2..9e7a94661da7b 100644
--- a/toolkit/components/glean/build_scripts/mach_commands.py
+++ b/toolkit/components/glean/build_scripts/mach_commands.py
@@ -29,12 +29,12 @@
 }
 
 DATA_REVIEW_HELP = """
-Beginning 2024-05-07[1], data reviews for projects in mozilla-central are now
-conducted on Phabricator. Simply duplicate your bug URL from the `bugs` list to
-the `data_reviews` list in your metrics and pings definitions, and push for code
-review in the normal way[2].
+Data reviews for projects in mozilla-central are conducted on Phabricator.
+Bugs that add or change a metric or ping should be added to the `bugs` list.
+Duplicate your bug URL from the `bugs` list to the `data_reviews` list in your metrics and pings definitions,
+and push for code review in the normal way[1].
 
-More details about this process can be found in the in-tree docs[3] and wiki[4].
+More details about this process can be found in the in-tree docs[2] and wiki[3].
 
 If you'd like to generate a Data Review Request template anyway (if, for
 instance, you can't use Phabricator for your data review or you need a Data
@@ -43,10 +43,9 @@
 
 ./mach python -m glean_parser data-review
 
-[1]: https://groups.google.com/a/mozilla.org/g/firefox-dev/c/7z-i6UhPoKY
-[2]: https://firefox-source-docs.mozilla.org/contributing/index.html
-[3]: https://firefox-source-docs.mozilla.org/contributing/data-review.html
-[4]: https://wiki.mozilla.org/Data_Collection
+[1]: https://firefox-source-docs.mozilla.org/contributing/index.html
+[2]: https://firefox-source-docs.mozilla.org/contributing/data-review.html
+[3]: https://wiki.mozilla.org/Data_Collection
 """
 
 

From 8a919430d2c5ffeb98769bda80488beb2e73ce51 Mon Sep 17 00:00:00 2001
From: jugglinmike <mike@mikepennisi.com>
Date: Tue, 27 Jan 2026 16:45:28 +0000
Subject: [PATCH 018/116] Bug 2012361 [wpt PR 57328] - Map "Color" to
 web-features, a=testonly

Automatic update from web-platform-tests
Map "Color" to web-features (#57328)

--

wpt-commits: 32006ad1c817b401a0ad454e8d786744f9a98ff1
wpt-pr: 57328
---
 testing/web-platform/tests/css/CSS2/colors/WEB_FEATURES.yml | 4 ++++
 testing/web-platform/tests/css/css-color/WEB_FEATURES.yml   | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/testing/web-platform/tests/css/CSS2/colors/WEB_FEATURES.yml b/testing/web-platform/tests/css/CSS2/colors/WEB_FEATURES.yml
index 6bfa95a6c58b7..707091b7b1161 100644
--- a/testing/web-platform/tests/css/CSS2/colors/WEB_FEATURES.yml
+++ b/testing/web-platform/tests/css/CSS2/colors/WEB_FEATURES.yml
@@ -2,3 +2,7 @@ features:
 - name: background-position
   files:
   - table-backgrounds-bs-row-002.xht
+- name: color
+  files:
+  - "*"
+  - "!table-backgrounds-bs-row-002.xht"
diff --git a/testing/web-platform/tests/css/css-color/WEB_FEATURES.yml b/testing/web-platform/tests/css/css-color/WEB_FEATURES.yml
index 1b2ab1b44c6d1..1a7a8ae995e6e 100644
--- a/testing/web-platform/tests/css/css-color/WEB_FEATURES.yml
+++ b/testing/web-platform/tests/css/css-color/WEB_FEATURES.yml
@@ -63,3 +63,9 @@ features:
 - name: named-color
   files:
   - named-001.html
+- name: color
+  files:
+  - color-001.html
+  - color-002.html
+  - t31-color-text-a.xht
+  - t423-transparent-*

From 2e3e5cf9822ee6b2cbeb6ad028b8a3002ea9b6e6 Mon Sep 17 00:00:00 2001
From: Javier Fernandez Garcia-Boente <jfernandez@igalia.com>
Date: Tue, 27 Jan 2026 16:45:32 +0000
Subject: [PATCH 019/116] Bug 2002259 [wpt PR 56260] - Tests to ensure
 'animation-name' doesn't accept an empty string., a=testonly

Automatic update from web-platform-tests
Tests to ensure 'animation-name' doesn't accept an empty string. (#56260)

--

wpt-commits: 8d789131acec848a52eb9a3285c75adc84fcc72a
wpt-pr: 56260
---
 .../animation-name-edge-cases-ref.html        | 24 ++++++
 .../parsing/animation-name-edge-cases.html    | 75 +++++++++++++++++++
 .../parsing/keyframes-name-invalid.html       |  4 +-
 3 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 testing/web-platform/tests/css/css-animations/parsing/animation-name-edge-cases-ref.html
 create mode 100644 testing/web-platform/tests/css/css-animations/parsing/animation-name-edge-cases.html

diff --git a/testing/web-platform/tests/css/css-animations/parsing/animation-name-edge-cases-ref.html b/testing/web-platform/tests/css/css-animations/parsing/animation-name-edge-cases-ref.html
new file mode 100644
index 0000000000000..85337ad1f7697
--- /dev/null
+++ b/testing/web-platform/tests/css/css-animations/parsing/animation-name-edge-cases-ref.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<style>
+ .test {
+    width: 300px;
+    height: 25px;
+    margin-top: 10px;
+    background-color: green;
+  }
+
+</style>
+
+<h3>The following should have a green background:</h3>
+
+<div class="test"></div>
+<div class="test"></div>
+<div class="test"></div>
+<div class="test"></div>
+<div class="test"></div>
+<div class="test"></div>
+<div class="test"></div>
+<div class="test"></div>
+<div class="test"></div>
+<div class="test"></div>
+<div class="test"></div>
diff --git a/testing/web-platform/tests/css/css-animations/parsing/animation-name-edge-cases.html b/testing/web-platform/tests/css/css-animations/parsing/animation-name-edge-cases.html
new file mode 100644
index 0000000000000..f8fecfccca2b1
--- /dev/null
+++ b/testing/web-platform/tests/css/css-animations/parsing/animation-name-edge-cases.html
@@ -0,0 +1,75 @@
+<!doctype html>
+<html>
+<head>
+<title>Setting 'animation-duration' to an infinite value should not hang</title>
+<link rel="author" title="yisibl(一丝)" href="https://github.com/yisibl"/>
+<link rel="author" title="Javier Fernandez" href="jfernandez@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-animations/#typedef-keyframes-name">
+<link rel="match" href="animation-name-edge-cases-ref.html">
+<meta name="assert" content="@keyframes name accepts CSS Wide Keywords as strings, but rejects an empty string.">
+<style>
+  @keyframes "" {
+    to { background: red }
+  }
+  @keyframes default {
+    to { background: red }
+  }
+  @keyframes "default" {
+    to { background: green }
+  }
+  @keyframes "string" {
+    to { background: green }
+  }
+  @keyframes "none" {
+    to { background: green }
+  }
+  @keyframes "inherit" {
+    to { background: green }
+  }
+  @keyframes "initial" {
+    to { background: green }
+  }
+  @keyframes "revert" {
+    to { background: green }
+  }
+  @keyframes "revert-layer" {
+    to { background: green }
+  }
+  @keyframes "revert-rule" {
+    to { background: green }
+  }
+  @keyframes "unset" {
+    to { background: green }
+  }
+
+  .test {
+    width: 300px;
+    height: 25px;
+    margin-top: 10px;
+    background-color: red;
+    animation: 0s both;
+  }
+
+  .test-invalid {
+    background-color: green;
+  }
+</style>
+</head>
+<body>
+<h3>The following should have a green background:</h3>
+
+<div class="test" style="animation-name: 'default';"></div>
+<div class="test" style="animation-name: 'none';"></div>
+<div class="test" style="animation-name: 'inherit';"></div>
+<div class="test" style="animation-name: 'initial';"></div>
+<div class="test" style="animation-name: 'revert';"></div>
+<div class="test" style="animation-name: 'revert-layer';"></div>
+<div class="test" style="animation-name: 'revert-rule';"></div>
+
+<!-- Invalid values -->
+<div class="test test-invalid" style="animation-name: default;"></div>
+<div class="test test-invalid" style="animation-name: '';"></div>
+<div class="test" style="animation-name: 'string'; animation-name: '';"></div>
+<div class="test" style="animation-name: 'none'; animation-name: ;"></div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-animations/parsing/keyframes-name-invalid.html b/testing/web-platform/tests/css/css-animations/parsing/keyframes-name-invalid.html
index f14dff3e2c0db..010d70874e1cb 100644
--- a/testing/web-platform/tests/css/css-animations/parsing/keyframes-name-invalid.html
+++ b/testing/web-platform/tests/css/css-animations/parsing/keyframes-name-invalid.html
@@ -41,6 +41,8 @@
         test_keyframes_name_invalid('revert-layer, four');
         // TODO: https://bugs.chromium.org/p/chromium/issues/detail?id=1342609
         // test_keyframes_name_invalid('--foo');
+
+        test_keyframes_name_invalid('""');
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>

From 270234cfd8ae65a5cdf671ba9fb8a88ff9f42a66 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Mon, 26 Jan 2026 09:53:49 +0000
Subject: [PATCH 020/116] Bug 2002259 [wpt PR 56260] - Update wpt metadata,
 a=testonly

wpt-pr: 56260
wpt-type: metadata
---
 .../css-animations/parsing/animation-name-edge-cases.html.ini   | 2 ++
 .../css/css-animations/parsing/keyframes-name-invalid.html.ini  | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 testing/web-platform/meta/css/css-animations/parsing/animation-name-edge-cases.html.ini

diff --git a/testing/web-platform/meta/css/css-animations/parsing/animation-name-edge-cases.html.ini b/testing/web-platform/meta/css/css-animations/parsing/animation-name-edge-cases.html.ini
new file mode 100644
index 0000000000000..3e4d9535456cc
--- /dev/null
+++ b/testing/web-platform/meta/css/css-animations/parsing/animation-name-edge-cases.html.ini
@@ -0,0 +1,2 @@
+[animation-name-edge-cases.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-animations/parsing/keyframes-name-invalid.html.ini b/testing/web-platform/meta/css/css-animations/parsing/keyframes-name-invalid.html.ini
index 0d45c2949cd91..c9bc281723944 100644
--- a/testing/web-platform/meta/css/css-animations/parsing/keyframes-name-invalid.html.ini
+++ b/testing/web-platform/meta/css/css-animations/parsing/keyframes-name-invalid.html.ini
@@ -1,3 +1,5 @@
 [keyframes-name-invalid.html]
   expected:
     if (os == "android") and fission: [OK, TIMEOUT]
+  [invalid: @keyframes "" { }]
+    expected: FAIL

From 204f222c54bfba48d71f19693c6f530e6bf5ccc3 Mon Sep 17 00:00:00 2001
From: Noam Rosenthal <nrosenthal@chromium.org>
Date: Tue, 27 Jan 2026 16:45:38 +0000
Subject: [PATCH 021/116] Bug 2012414 [wpt PR 57331] - Implement (unsafe)
 streaming sanitizer, a=testonly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Automatic update from web-platform-tests
Implement (unsafe) streaming sanitizer

This is based on the draft algorithm in
https://github.com/WICG/sanitizer-api/issues/190#issuecomment-3633021106

- extract single-node decisions/operations in Sanitizer to own methods
- expose a method that sanitizes a single node,
  and another one that queries specifically for replacing element with
  children.
- The streaming sanitizer is passed to the parser when using the
  streaming methods.
- when a node is about to be inserted, we consult the streaming
  sanitizer about whether the node itself should be modified/dropped,
  and whether it should skip some of the stack due to
  replaceElementWithChildren.

For now only the unsafe version is implemented, as streamHTML is not yet
exposed.

This needs a much wider test coverage, for now this is a prototype to
feed the spec discussion.

Bug: 475738087
Change-Id: Iba91dfd1bcc1195eeeaf9930ec941135e8a14b38
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7462514
Reviewed-by: Philip Jägenstedt <foolip@chromium.org>
Commit-Queue: Noam Rosenthal <nrosenthal@google.com>
Reviewed-by: Daniel Vogelheim <vogelheim@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1574418}

--

wpt-commits: ec74332812c570a84a34c2562d9cce0856a27da3
wpt-pr: 57331
---
 .../tentative/stream-html-sanitizer.html      | 205 ++++++++++++++++++
 1 file changed, 205 insertions(+)
 create mode 100644 testing/web-platform/tests/html/dom/partial-updates/tentative/stream-html-sanitizer.html

diff --git a/testing/web-platform/tests/html/dom/partial-updates/tentative/stream-html-sanitizer.html b/testing/web-platform/tests/html/dom/partial-updates/tentative/stream-html-sanitizer.html
new file mode 100644
index 0000000000000..500f94ddd4ebb
--- /dev/null
+++ b/testing/web-platform/tests/html/dom/partial-updates/tentative/stream-html-sanitizer.html
@@ -0,0 +1,205 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>HTML partial updates - streamHTMLUnsafe with sanitizer</title>
+<link rel="help" href="https://github.com/WICG/declarative-partial-updates" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style id="style"></style>
+<p id="target"></p>
+<script>
+  for (const method of ["streamHTMLUnsafe", "streamAppendHTMLUnsafe"]) {
+    promise_test(async (t) => {
+      const placeholder = document.createElement("div");
+      const writer = placeholder
+        [method]({ sanitizer: { removeElements: ["span"] } })
+        .getWriter();
+      await writer.write("<div>A</div><span>B</span>");
+      await writer.close();
+      assert_equals(placeholder.textContent, "A");
+    }, `element.${method} with sanitizer {removeElements}`);
+
+    promise_test(async (t) => {
+      const placeholder = document.createElement("div");
+      const writer = placeholder
+        [method]({ sanitizer: { elements: ["div"] } })
+        .getWriter();
+      await writer.write("<div>A</div><span>B</span>");
+      await writer.close();
+      assert_equals(placeholder.textContent, "A");
+    }, `element.${method} with sanitizer {elements}`);
+
+    promise_test(async (t) => {
+      const placeholder = document.createElement("div");
+      const writer = placeholder
+        [method]({
+          sanitizer: {
+            replaceWithChildrenElements: ["div"],
+          },
+        })
+        .getWriter();
+      await writer.write("<div id=outer><span id=inner>A</span></div>");
+      await writer.close();
+      assert_equals(placeholder.firstElementChild.id, "inner");
+    }, `element.${method} with sanitizer {replaceWithChildrenElements}`);
+
+    promise_test(async (t) => {
+      const placeholder = document.createElement("div");
+      const writer = placeholder
+        [method]({
+          sanitizer: {
+            replaceWithChildrenElements: ["div"],
+          },
+        })
+        .getWriter();
+      await writer.write("<div id=outer>A</div>");
+      await writer.close();
+      assert_equals(placeholder.firstChild.nodeType, Node.TEXT_NODE);
+      assert_equals(placeholder.firstChild.textContent, "A");
+    }, `element.${method} with sanitizer {replaceWithChildrenElements} and text`);
+
+    promise_test(async (t) => {
+      const placeholder = document.createElement("div");
+      const writer = placeholder
+        [method]({
+          sanitizer: {
+            attributes: ["allowed"],
+          },
+        })
+        .getWriter();
+      await writer.write("<div allowed=a forbidden=b>A</div>");
+      await writer.close();
+      assert_true(placeholder.firstElementChild.hasAttribute("allowed"));
+      assert_false(placeholder.firstElementChild.hasAttribute("forbidden"));
+    }, `element.${method} with sanitizer {attributes}`);
+
+    promise_test(async (t) => {
+      const placeholder = document.createElement("div");
+      const writer = placeholder
+        [method]({
+          sanitizer: {
+            removeAttributes: ["forbidden"],
+          },
+        })
+        .getWriter();
+      await writer.write("<div allowed=a forbidden=b>A</div>");
+      await writer.close();
+      assert_true(placeholder.firstElementChild.hasAttribute("allowed"));
+      assert_false(placeholder.firstElementChild.hasAttribute("forbidden"));
+    }, `element.${method} with sanitizer {removeAttributes}`);
+
+    promise_test(async (t) => {
+      const placeholder = document.createElement("div");
+      const writer = placeholder
+        [method]({
+          sanitizer: {
+            elements: [{ name: "div", removeAttributes: ["forbidden"] }]
+          },
+        })
+        .getWriter();
+      await writer.write("<div allowed=a forbidden=b>A</div>");
+      await writer.close();
+      assert_true(placeholder.firstElementChild.hasAttribute("allowed"));
+      assert_false(placeholder.firstElementChild.hasAttribute("forbidden"));
+    }, `element.${method} with sanitizer {element: [{removeAttributes}]}`);
+
+    promise_test(async (t) => {
+      const placeholder = document.createElement("div");
+      const writer = placeholder
+        [method]({
+          sanitizer: {
+            elements: [{ name: "div", attributes: ["allowed"] }]
+          },
+        })
+        .getWriter();
+      await writer.write("<div allowed=a forbidden=b>A</div>");
+      await writer.close();
+      assert_true(placeholder.firstElementChild.hasAttribute("allowed"));
+      assert_false(placeholder.firstElementChild.hasAttribute("forbidden"));
+    }, `element.${method} with sanitizer {element: [{attributes}]}`);
+
+    promise_test(async (t) => {
+      const placeholder = document.createElement("div");
+      const writer = placeholder
+        [method]({
+          sanitizer: {
+            elements: ["template", { name: "div", attributes: ["allowed"] }]
+          },
+        })
+        .getWriter();
+      await writer.write("<template><div allowed=a forbidden=b>A</div></template>");
+      await writer.close();
+      const {firstElementChild} = placeholder.firstElementChild.content;
+      assert_true(firstElementChild.hasAttribute("allowed"));
+      assert_false(firstElementChild.hasAttribute("forbidden"));
+    }, `element.${method} with sanitizer should sanitize template contents`);
+
+    promise_test(async (t) => {
+      const placeholder = document.createElement("div");
+      const writer = placeholder
+        [method]({
+          sanitizer: {
+            replaceWithChildrenElements: ["template"]
+          },
+        })
+        .getWriter();
+      await writer.write("<template><div allowed=a>A</div></template>");
+      await writer.close();
+      assert_equals(placeholder.firstElementChild, null);
+    }, `element.${method}: sanitizer shouldn't allow escaping template`);
+
+    promise_test(async (t) => {
+      const placeholder = document.createElement("div");
+      const writer = placeholder
+        [method]({
+          sanitizer: {
+            replaceWithChildrenElements: ["tr"]
+          },
+        })
+        .getWriter();
+      await writer.write("<table><td>Content");
+      await writer.close();
+      assert_equals(placeholder.innerHTML, "<table><tbody><td>Content</td></tbody></table>");
+    }, `element.${method}: sanitizer takes effect after foster parenting`);
+
+    promise_test(async (t) => {
+      const placeholder = document.createElement("div");
+      const writer = placeholder
+        [method]({
+          sanitizer: {
+            replaceWithChildrenElements: ["tr"]
+          },
+        })
+        .getWriter();
+      await writer.write("<table><p><p>Content<td>");
+      await writer.close();
+      assert_equals(placeholder.innerHTML, "<p></p><p>Content</p><table><tbody><td></td></tbody></table>");
+    }, `element.${method}: sanitizer with foster parenting: <table><p><p>`);
+
+    promise_test(async (t) => {
+      const placeholder = document.createElement("div");
+      const writer = placeholder
+        [method]({
+          sanitizer: {
+            removeElements: ["i"]
+          },
+        })
+        .getWriter();
+      await writer.write("<p>1<b>2<i>3</b>4</i>5</p>");
+      await writer.close();
+      assert_equals(placeholder.innerHTML, "<p>1<b>2</b>5</p>");
+    }, `element.${method}: sanitizer takes effect after adoption agency`);
+
+    promise_test(async (t) => {
+      const placeholder = document.createElement("div");
+      const sanitizer = new Sanitizer();
+      const writer = placeholder
+        [method]({sanitizer})
+        .getWriter();
+      await writer.write("<p>1</p>");
+      sanitizer.removeElement("p");
+      await writer.write("<p>2</p>");
+      await writer.close();
+      assert_equals(placeholder.textContent, "12");
+    }, `element.${method}: mutating the sanitizer while streaming does not effect the originally given sanitizer`);
+}
+</script>

From 54bbf55652f47b260f02812194cdc02a9b59836a Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Mon, 26 Jan 2026 12:08:13 +0000
Subject: [PATCH 022/116] Bug 2012414 [wpt PR 57331] - Update wpt metadata,
 a=testonly

wpt-pr: 57331
wpt-type: metadata
---
 .../tentative/stream-html-sanitizer.html.ini  | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 testing/web-platform/meta/html/dom/partial-updates/tentative/stream-html-sanitizer.html.ini

diff --git a/testing/web-platform/meta/html/dom/partial-updates/tentative/stream-html-sanitizer.html.ini b/testing/web-platform/meta/html/dom/partial-updates/tentative/stream-html-sanitizer.html.ini
new file mode 100644
index 0000000000000..d466585ce36b4
--- /dev/null
+++ b/testing/web-platform/meta/html/dom/partial-updates/tentative/stream-html-sanitizer.html.ini
@@ -0,0 +1,84 @@
+[stream-html-sanitizer.html]
+  [element.streamHTMLUnsafe with sanitizer {removeElements}]
+    expected: FAIL
+
+  [element.streamHTMLUnsafe with sanitizer {elements}]
+    expected: FAIL
+
+  [element.streamHTMLUnsafe with sanitizer {replaceWithChildrenElements}]
+    expected: FAIL
+
+  [element.streamHTMLUnsafe with sanitizer {replaceWithChildrenElements} and text]
+    expected: FAIL
+
+  [element.streamHTMLUnsafe with sanitizer {attributes}]
+    expected: FAIL
+
+  [element.streamHTMLUnsafe with sanitizer {removeAttributes}]
+    expected: FAIL
+
+  [element.streamHTMLUnsafe with sanitizer {element: [{removeAttributes}\]}]
+    expected: FAIL
+
+  [element.streamHTMLUnsafe with sanitizer {element: [{attributes}\]}]
+    expected: FAIL
+
+  [element.streamHTMLUnsafe with sanitizer should sanitize template contents]
+    expected: FAIL
+
+  [element.streamHTMLUnsafe: sanitizer shouldn't allow escaping template]
+    expected: FAIL
+
+  [element.streamHTMLUnsafe: sanitizer takes effect after foster parenting]
+    expected: FAIL
+
+  [element.streamHTMLUnsafe: sanitizer with foster parenting: <table><p><p>]
+    expected: FAIL
+
+  [element.streamHTMLUnsafe: sanitizer takes effect after adoption agency]
+    expected: FAIL
+
+  [element.streamHTMLUnsafe: mutating the sanitizer while streaming does not effect the originally given sanitizer]
+    expected: FAIL
+
+  [element.streamAppendHTMLUnsafe with sanitizer {removeElements}]
+    expected: FAIL
+
+  [element.streamAppendHTMLUnsafe with sanitizer {elements}]
+    expected: FAIL
+
+  [element.streamAppendHTMLUnsafe with sanitizer {replaceWithChildrenElements}]
+    expected: FAIL
+
+  [element.streamAppendHTMLUnsafe with sanitizer {replaceWithChildrenElements} and text]
+    expected: FAIL
+
+  [element.streamAppendHTMLUnsafe with sanitizer {attributes}]
+    expected: FAIL
+
+  [element.streamAppendHTMLUnsafe with sanitizer {removeAttributes}]
+    expected: FAIL
+
+  [element.streamAppendHTMLUnsafe with sanitizer {element: [{removeAttributes}\]}]
+    expected: FAIL
+
+  [element.streamAppendHTMLUnsafe with sanitizer {element: [{attributes}\]}]
+    expected: FAIL
+
+  [element.streamAppendHTMLUnsafe with sanitizer should sanitize template contents]
+    expected: FAIL
+
+  [element.streamAppendHTMLUnsafe: sanitizer shouldn't allow escaping template]
+    expected: FAIL
+
+  [element.streamAppendHTMLUnsafe: sanitizer takes effect after foster parenting]
+    expected: FAIL
+
+  [element.streamAppendHTMLUnsafe: sanitizer with foster parenting: <table><p><p>]
+    expected: FAIL
+
+  [element.streamAppendHTMLUnsafe: sanitizer takes effect after adoption agency]
+    expected: FAIL
+
+  [element.streamAppendHTMLUnsafe: mutating the sanitizer while streaming does not effect the originally given sanitizer]
+    expected: FAIL

From 72ca676db5b2e864d828125ad4174fc9ae5692e9 Mon Sep 17 00:00:00 2001
From: David Awogbemila <awogbemila@chromium.org>
Date: Tue, 27 Jan 2026 16:45:44 +0000
Subject: [PATCH 023/116] Bug 2012524 [wpt PR 57337] - [animation-trigger]
 Remove play-alternate and play-pause actions, a=testonly

Automatic update from web-platform-tests
[animation-trigger] Remove play-alternate and play-pause actions

In [1] the working group decided to drop play-pause and play-alternate
actions for now.

[1] https://github.com/w3c/csswg-drafts/issues/12611#issuecomment-3382276301

Bug: 390314945, 441908430
Change-Id: I492ebd36564e83287a14bb0e254f2b65b8bba13c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7511968
Commit-Queue: David Awogbemila <awogbemila@chromium.org>
Reviewed-by: Kevin Ellis <kevers@chromium.org>
Reviewed-by: David Awogbemila <awogbemila@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1574559}

--

wpt-commits: a0f0f2f274fa92cb144a93579e847e4d63e413f4
wpt-pr: 57337
---
 .../event-trigger-alternate.tentative.html    | 60 -------------------
 .../event-trigger-state.tentative.html        | 48 ---------------
 2 files changed, 108 deletions(-)
 delete mode 100644 testing/web-platform/tests/web-animations/animation-trigger/event-trigger-alternate.tentative.html
 delete mode 100644 testing/web-platform/tests/web-animations/animation-trigger/event-trigger-state.tentative.html

diff --git a/testing/web-platform/tests/web-animations/animation-trigger/event-trigger-alternate.tentative.html b/testing/web-platform/tests/web-animations/animation-trigger/event-trigger-alternate.tentative.html
deleted file mode 100644
index de0f3fd0bc901..0000000000000
--- a/testing/web-platform/tests/web-animations/animation-trigger/event-trigger-alternate.tentative.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="help" href="https://drafts.csswg.org/web-animations-2#animation-trigger">
-    <script src="/resources/testdriver.js"></script>
-    <script src="/resources/testdriver-vendor.js"></script>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/web-animations/testcommon.js"></script>
-  </head>
-  <body>
-    <div id="event-target">Click me!</div>
-
-    <div id="animation-target">Watch me!</div>
-    <script>
-      promise_test(async (test) => {
-        const eventTarget = document.getElementById("event-target");
-        const animationTarget = document.getElementById("animation-target");
-        const ANIMATION_DURATION_MS = 100000;
-        const animation = new Animation(
-          new KeyframeEffect(
-            animationTarget,
-            [
-              { transform: "translateY(0)" },
-              { transform: "translateY(3rem)" },
-            ],
-            { duration: ANIMATION_DURATION_MS, fill: "both" }
-          ));
-        const trigger = new EventTrigger({
-          eventType: "click",
-          eventTarget: eventTarget
-        });
-        trigger.addAnimation(animation, "play-alternate");
-        await waitForAnimationFrames(1);
-        assert_equals(animation.playState, "idle", "animation is idle");
-        assert_equals(animation.playbackRate, 1, "playbackRate is initially 1");
-        await test_driver.click(eventTarget);
-        await waitForAnimationFrames(1);
-        assert_equals(animation.playState, "running", "animation is running after first click");
-        assert_equals(animation.playbackRate, 1, "playbackRate is 1 after first click");
-
-        // Advance to middle of duration so that animation doesn't finish too
-        // quickly after reversing.
-        animation.currentTime = animation.startTime + (ANIMATION_DURATION_MS/2);
-        await waitForAnimationFrames(1);
-
-        await test_driver.click(eventTarget);
-        await waitForAnimationFrames(1);
-        assert_equals(animation.playState, "running", "animation is running after second click");
-        assert_equals(animation.playbackRate, -1, "playbackRate is -1 after second click");
-        animation.pause();
-        await waitForAnimationFrames(1);
-        await test_driver.click(eventTarget);
-        await waitForAnimationFrames(1);
-        assert_equals(animation.playState, "running", "animation is running after third click");
-        assert_equals(animation.playbackRate, 1, "playbackRate is 1 after third click");
-      }, "Basic event-based animation-trigger with 'alternate' behavior");
-    </script>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/web-animations/animation-trigger/event-trigger-state.tentative.html b/testing/web-platform/tests/web-animations/animation-trigger/event-trigger-state.tentative.html
deleted file mode 100644
index 4ea44408c2980..0000000000000
--- a/testing/web-platform/tests/web-animations/animation-trigger/event-trigger-state.tentative.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="help" href="https://drafts.csswg.org/web-animations-2#animation-trigger">
-    <script src="/resources/testdriver.js"></script>
-    <script src="/resources/testdriver-vendor.js"></script>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/web-animations/testcommon.js"></script>
-  </head>
-  <body>
-    <div id="event-target">Click me!</div>
-
-    <div id="animation-target">Watch me!</div>
-    <script>
-      promise_test(async (test) => {
-        const eventTarget = document.getElementById("event-target");
-        const animationTarget = document.getElementById("animation-target");
-        const ANIMATION_DURATION_MS = 100000;
-        const animation = new Animation(
-          new KeyframeEffect(
-            animationTarget,
-            [
-              { transform: "translateY(0)" },
-              { transform: "translateY(3rem)" },
-            ],
-            { duration: ANIMATION_DURATION_MS, fill: "both" }
-          ));
-        const trigger = new EventTrigger({
-          eventType: "click",
-          eventTarget: eventTarget
-        });
-        trigger.addAnimation(animation, "play-pause");
-        await waitForAnimationFrames(1);
-        assert_equals(animation.playState, "idle", "animation is idle");
-        await test_driver.click(eventTarget);
-        await waitForAnimationFrames(1);
-        assert_equals(animation.playState, "running", "animation is running");
-        await test_driver.click(eventTarget);
-        await waitForAnimationFrames(1);
-        assert_equals(animation.playState, "paused", "animation is paused");
-        await test_driver.click(eventTarget);
-        await waitForAnimationFrames(1);
-        assert_equals(animation.playState, "running", "animation is running");
-      }, "Basic event-based animation-trigger with 'state' behavior");
-    </script>
-  </body>
-</html>

From e3ab74e481f724143cbe3b6105452e118c2a1fe1 Mon Sep 17 00:00:00 2001
From: Morten Stenshorne <mstensho@chromium.org>
Date: Tue, 27 Jan 2026 16:45:47 +0000
Subject: [PATCH 024/116] Bug 2012502 [wpt PR 57336] - Bail earlier in layout
 cache matching when breaking before a node., a=testonly

Automatic update from web-platform-tests
Bail earlier in layout cache matching when breaking before a node.

If there is a break before a node, re-using its layout result in the
next fragmentainer is always a bad idea if break appeal was less than
ideal when fitting it in the previous column (there may be more room for
it in the next column).

Move some code further up, to avoid failures in
MaySkipLayoutWithinBlockFormattingContext().

The out-of-flow positioned element was required to trigger the DCHECK
failure, since this for some reason causes the inline layout algorithm
to resolve the block BFC offset, which in turn will prevent the
SubtreeModifiedMarginStrut from being set when it otherwise would.

It is likely that this fixes correctness issues too, but I couldn't come
up with a test for that.

Bug: 413385740
Change-Id: I3a8746cff7f28325e6d7d7b1674bff8e37d0ed8f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7516846
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Reviewed-by: Ian Kilpatrick <ikilpatrick@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1574605}

--

wpt-commits: 49dbfbe8f643b8aa911a5de1479eda3db5ea5d8a
wpt-pr: 57336
---
 ...-column-height-block-with-margin-in-inline.html | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 testing/web-platform/tests/css/css-multicol/crashtests/shrink-column-height-block-with-margin-in-inline.html

diff --git a/testing/web-platform/tests/css/css-multicol/crashtests/shrink-column-height-block-with-margin-in-inline.html b/testing/web-platform/tests/css/css-multicol/crashtests/shrink-column-height-block-with-margin-in-inline.html
new file mode 100644
index 0000000000000..2789a8adfdb5d
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/crashtests/shrink-column-height-block-with-margin-in-inline.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<title>Shrink multicol height so that a child block (inside an inline) with a top margin gets pushed to the next column and gets its margin truncated.</title>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://issues.chromium.org/issues/413385740">
+<div id="container" style="columns:1; column-fill:auto; height:200px;">
+  <span style="position:absolute;"></span>
+  <span>
+    <div style="margin-top:10px;">x</div>
+  </span>
+</div>
+<script>
+  document.body.offsetTop;
+  container.style.height = "2px";
+</script>

From 90b8980fb299b989faaa30ddccd50a7b0bf74ef7 Mon Sep 17 00:00:00 2001
From: Yanling Wang <yanlingwang@microsoft.com>
Date: Tue, 27 Jan 2026 16:45:51 +0000
Subject: [PATCH 025/116] Bug 2011520 [wpt PR 57260] - [Masonry] Implement
 item-level baseline alignment for non-intrinsic tracks, a=testonly

Automatic update from web-platform-tests
[Masonry] Implement item-level baseline alignment for non-intrinsic
tracks

This CL implements support for baseline alignment at the item level
in the non-intrinsic (fixed) tracks for grid-lanes.

Implementation:
- Added baseline alignment logic to handle align-items/justify-items
align-self/justify-self with baseline and last-baseline values.
- Items now properly align their baselines within their track when the
container specifies baseline alignment.
- Support for both row and column direction in grid-lanes(align-items
and justify-items respectively)

Test Coverage:
Added tests covering:
- Basic first/last baseline alignment (001)
- Self-alignment overrides (002)
- Margins with baseline alignment (003)
- Multi-track spanning items and dense packing(004)
- Multiple writing modes: vertical-rl/lr, sideways-rl/lr (005)

Bug: 343257585
Change-Id: I596e51b1a7f6e9cb77ca286b8eb044f6f17971ea
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7408310
Reviewed-by: Alison Maher <almaher@microsoft.com>
Reviewed-by: Kurt Catti-Schmidt <kschmi@microsoft.com>
Commit-Queue: Yanling Wang <yanlingwang@microsoft.com>
Cr-Commit-Position: refs/heads/main@{#1574610}

--

wpt-commits: c2807c2f99f57d1426d253a9140821138c36c13b
wpt-pr: 57260
---
 ...lumn-grid-lanes-item-baseline-001-ref.html | 110 +++++++++++++
 .../column-grid-lanes-item-baseline-001.html  | 122 +++++++++++++++
 ...lumn-grid-lanes-item-baseline-002-ref.html | 111 ++++++++++++++
 .../column-grid-lanes-item-baseline-002.html  | 105 +++++++++++++
 ...lumn-grid-lanes-item-baseline-003-ref.html | 143 +++++++++++++++++
 .../column-grid-lanes-item-baseline-003.html  | 139 +++++++++++++++++
 ...umn-grid-lanes-item-baseline-004a-ref.html | 134 ++++++++++++++++
 .../column-grid-lanes-item-baseline-004a.html | 136 +++++++++++++++++
 ...umn-grid-lanes-item-baseline-004b-ref.html | 133 ++++++++++++++++
 .../column-grid-lanes-item-baseline-004b.html | 136 +++++++++++++++++
 ...lumn-grid-lanes-item-baseline-005-ref.html | 134 ++++++++++++++++
 .../column-grid-lanes-item-baseline-005.html  | 143 +++++++++++++++++
 ...em-baseline-cyclic-dependency-001-ref.html |  82 ++++++++++
 ...s-item-baseline-cyclic-dependency-001.html |  74 +++++++++
 ...em-baseline-cyclic-dependency-002-ref.html |  73 +++++++++
 ...s-item-baseline-cyclic-dependency-002.html |  75 +++++++++
 ...em-baseline-cyclic-dependency-003-ref.html |  76 +++++++++
 ...s-item-baseline-cyclic-dependency-003.html |  75 +++++++++
 ...nes-item-baseline-synthesized-001-ref.html |  69 +++++++++
 ...d-lanes-item-baseline-synthesized-001.html |  74 +++++++++
 ...nes-item-baseline-synthesized-002-ref.html |  68 +++++++++
 ...d-lanes-item-baseline-synthesized-002.html |  73 +++++++++
 .../row-grid-lanes-item-baseline-001-ref.html |  77 ++++++++++
 .../row-grid-lanes-item-baseline-001.html     |  93 +++++++++++
 .../row-grid-lanes-item-baseline-002-ref.html | 108 +++++++++++++
 .../row-grid-lanes-item-baseline-002.html     | 119 +++++++++++++++
 .../row-grid-lanes-item-baseline-003-ref.html | 128 ++++++++++++++++
 .../row-grid-lanes-item-baseline-003.html     | 139 +++++++++++++++++
 .../row-grid-lanes-item-baseline-004-ref.html | 132 ++++++++++++++++
 .../row-grid-lanes-item-baseline-004.html     | 136 +++++++++++++++++
 .../row-grid-lanes-item-baseline-005-ref.html | 133 ++++++++++++++++
 .../row-grid-lanes-item-baseline-005.html     | 144 ++++++++++++++++++
 ...em-baseline-cyclic-dependency-001-ref.html |  63 ++++++++
 ...s-item-baseline-cyclic-dependency-001.html |  66 ++++++++
 ...em-baseline-cyclic-dependency-002-ref.html |  63 ++++++++
 ...s-item-baseline-cyclic-dependency-002.html |  66 ++++++++
 ...em-baseline-cyclic-dependency-003-ref.html |  61 ++++++++
 ...s-item-baseline-cyclic-dependency-003.html |  65 ++++++++
 38 files changed, 3878 insertions(+)
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-001-ref.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-001.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-002-ref.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-002.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-003-ref.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-003.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004a-ref.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004a.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004b-ref.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004b.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-005-ref.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-005.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-001-ref.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-001.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-002-ref.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-002.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-003-ref.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-003.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-001-ref.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-001.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-002-ref.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-002.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-001-ref.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-001.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-002-ref.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-002.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-003-ref.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-003.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-004-ref.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-004.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-005-ref.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-005.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-001-ref.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-001.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-002-ref.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-002.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-003-ref.html
 create mode 100644 testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-003.html

diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-001-ref.html
new file mode 100644
index 0000000000000..2af60ca144a8d
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-001-ref.html
@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <style>
+    .grid {
+      width: 400px;
+      border: solid 5px transparent;
+      gap: 3px;
+      display: grid;
+      grid-template-columns: repeat(3, 120px);
+      grid-template-rows: repeat(2, min-content);
+      background-color: #9f8c8c;
+      border-color: slateblue;
+      text-decoration: underline;
+      font: 16px/1 monospace;
+    }
+
+    .fb {
+      justify-items: baseline;
+    }
+
+    .lb {
+      justify-items: last baseline;
+    }
+
+    .item {
+        height: 35px;
+    }
+
+    #item1 {
+      background-color: #8cffa0;
+      width: 60px;
+      font-size: 24px;
+    }
+
+    #item4 {
+      background-color: #ffff8c;
+      width: 80px;
+      font-size: 24px;
+    }
+
+    #item7 {
+      background-color: #ff8c8c;
+      width: 50px;
+      font-size: 16px;
+    }
+
+    #item2 {
+      background-color: #a0c8ff;
+      width: 70px;
+      font-size: 24px;
+    }
+
+    #item5 {
+      background-color: #ff8cff;
+      width: 90px;
+      font-size: 14px;
+    }
+
+    #item8 {
+      background-color: #c8ffa0;
+      width: 60px;
+      font-size: 22px;
+    }
+
+    #item3 {
+      background-color: #ffa08c;
+      width: 75px;
+      font-size: 24px;
+    }
+
+    #item6 {
+      background-color: #8cffff;
+      width: 55px;
+      font-size: 16px;
+    }
+
+    #item9 {
+      background-color: #a0a0ff;
+      width: 85px;
+      font-size: 26px;
+    }
+  </style>
+</head>
+<body>
+<div class="grid fb">
+  <div id="item1" class="item">AAA</div>
+  <div id="item2" class="item">BBB</div>
+  <div id="item3" class="item">CCC</div>
+  <div id="item4" class="item">DDD</div>
+  <div id="item5" class="item">EEE</div>
+  <div id="item6" class="item">FFF</div>
+  <div id="item7" class="item">GGG</div>
+  <div id="item8" class="item">HHH</div>
+  <div id="item9" class="item">III</div>
+</div>
+<div class="grid lb">
+  <div id="item1" class="item">AAA</div>
+  <div id="item2" class="item">BBB</div>
+  <div id="item3" class="item">CCC</div>
+  <div id="item4" class="item">DDD</div>
+  <div id="item5" class="item">EEE</div>
+  <div id="item6" class="item">FFF</div>
+  <div id="item7" class="item">GGG</div>
+  <div id="item8" class="item">HHH</div>
+  <div id="item9" class="item">III</div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-001.html
new file mode 100644
index 0000000000000..c26bbe863d4f1
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-001.html
@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Grid Lanes Test: justify-items:baseline/last baseline</title>
+  <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-baseline-alignment">
+  <link rel="match" href="column-grid-lanes-item-baseline-001-ref.html">
+  <style>
+    .grid-lanes {
+      width: 400px;
+      border: solid 5px transparent;
+      gap: 3px;
+      display: grid-lanes;
+      grid-template-columns: repeat(3, 120px);
+      background-color: #9f8c8c;
+      border-color: slateblue;
+      text-decoration: underline;
+      font: 16px/1 monospace;
+    }
+
+    .item {
+      height: 35px;
+    }
+
+    .fb {
+      justify-items: baseline;
+    }
+
+    .lb {
+      justify-items: last baseline;
+    }
+
+    #item1 {
+      background-color: #8cffa0;
+      width: 60px;
+      font-size: 24px;
+      grid-column: 1;
+    }
+
+    #item4 {
+      background-color: #ffff8c;
+      width: 80px;
+      font-size: 24px;
+      grid-column: 1;
+    }
+
+    #item7 {
+      background-color: #ff8c8c;
+      width: 50px;
+      font-size: 16px;
+      grid-column: 1;
+    }
+
+    #item2 {
+      background-color: #a0c8ff;
+      width: 70px;
+      font-size: 24px;
+      grid-column: 2;
+    }
+
+    #item5 {
+      background-color: #ff8cff;
+      width: 90px;
+      font-size: 14px;
+      grid-column: 2;
+    }
+
+    #item8 {
+      background-color: #c8ffa0;
+      width: 60px;
+      font-size: 22px;
+      grid-column: 2;
+    }
+
+    #item3 {
+      background-color: #ffa08c;
+      width: 75px;
+      font-size: 24px;
+      grid-column: 3;
+    }
+
+    #item6 {
+      background-color: #8cffff;
+      width: 55px;
+      font-size: 16px;
+      grid-column: 3;
+    }
+
+    #item9 {
+      background-color: #a0a0ff;
+      width: 85px;
+      font-size: 26px;
+      grid-column: 3;
+    }
+  </style>
+</head>
+<body>
+<div class="grid-lanes fb">
+  <div id="item1" class="item">AAA</div>
+  <div id="item2" class="item">BBB</div>
+  <div id="item3" class="item">CCC</div>
+  <div id="item4" class="item">DDD</div>
+  <div id="item5" class="item">EEE</div>
+  <div id="item6" class="item">FFF</div>
+  <div id="item7" class="item">GGG</div>
+  <div id="item8" class="item">HHH</div>
+  <div id="item9" class="item">III</div>
+</div>
+<div class="grid-lanes lb">
+  <div id="item1" class="item">AAA</div>
+  <div id="item2" class="item">BBB</div>
+  <div id="item3" class="item">CCC</div>
+  <div id="item4" class="item">DDD</div>
+  <div id="item5" class="item">EEE</div>
+  <div id="item6" class="item">FFF</div>
+  <div id="item7" class="item">GGG</div>
+  <div id="item8" class="item">HHH</div>
+  <div id="item9" class="item">III</div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-002-ref.html
new file mode 100644
index 0000000000000..9ea55e536ff76
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-002-ref.html
@@ -0,0 +1,111 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <style>
+    .grid {
+      width: 400px;
+      border: solid 5px;
+      gap: 3px;
+      display: grid;
+      grid-template-columns: repeat(3, 120px);
+      grid-template-rows: repeat(3, min-content);
+      background-color: #f0f0f0;
+      border-color: slateblue;
+      justify-items: center;
+      margin-bottom: 20px;
+      font: 16px/1 monospace;
+    }
+
+    .item {
+      height: 50px;
+      padding: 8px;
+    }
+
+    #item1 {
+      background-color: #8cffa0;
+      width: 70px;
+      justify-self: baseline;
+      grid-column: 1;
+      grid-row: 1;
+    }
+
+    #item2 {
+      background-color: #a0c8ff;
+      width: 80px;
+      justify-self: baseline;
+      grid-column: 1;
+      grid-row: 2;
+    }
+
+    #item3 {
+      background-color: #ffa08c;
+      width: 65px;
+      justify-self: center;
+      grid-column: 1;
+      grid-row: 3;
+    }
+
+    #item4 {
+      background-color: #ff8cff;
+      width: 90px;
+      justify-self: last baseline;
+      grid-column: 2;
+      grid-row: 1;
+    }
+
+    #item5 {
+      background-color: #8cffff;
+      width: 85px;
+      justify-self: last baseline;
+      grid-column: 2;
+      grid-row: 2;
+    }
+
+    #item6 {
+      background-color: #ff8c8c;
+      width: 60px;
+      justify-self: start;
+      grid-column: 2;
+      grid-row: 3;
+    }
+
+    #item7 {
+      background-color: #c8ffa0;
+      width: 65px;
+      justify-self: baseline;
+      grid-column: 3;
+      grid-row: 1;
+    }
+
+    #item8 {
+      background-color: #a0a0ff;
+      width: 75px;
+      justify-self: baseline;
+      grid-column: 3;
+      grid-row: 2;
+    }
+
+    #item9 {
+      background-color: #ffc88c;
+      width: 70px;
+      justify-self: end;
+      grid-column: 3;
+      grid-row: 3;
+    }
+  </style>
+</head>
+<body>
+<div class="grid">
+  <div id="item1" class="item">baseline</div>
+  <div id="item2" class="item">baseline</div>
+  <div id="item3" class="item">center</div>
+  <div id="item4" class="item">last baseline</div>
+  <div id="item5" class="item">last baseline</div>
+  <div id="item6" class="item">start</div>
+  <div id="item7" class="item">baseline</div>
+  <div id="item8" class="item">baseline</div>
+  <div id="item9" class="item">end</div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-002.html
new file mode 100644
index 0000000000000..9ec7b6f0e70f8
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-002.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Grid Lanes Test: justify-self baseline override</title>
+  <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-baseline-alignment">
+  <link rel="match" href="column-grid-lanes-item-baseline-002-ref.html">
+  <style>
+    .grid-lanes {
+      width: 400px;
+      border: solid 5px;
+      gap: 3px;
+      display: grid-lanes;
+      grid-template-columns: repeat(3, 120px);
+      background-color: #f0f0f0;
+      border-color: slateblue;
+      justify-items: center;
+      margin-bottom: 20px;
+      font: 16px/1 monospace;
+    }
+
+    .item {
+      height: 50px;
+      padding: 8px;
+    }
+
+    #item1 {
+      background-color: #8cffa0;
+      width: 70px;
+      grid-column: 1;
+      justify-self: baseline;
+    }
+
+    #item2 {
+      background-color: #a0c8ff;
+      width: 80px;
+      grid-column: 1;
+      justify-self: baseline;
+    }
+
+    #item3 {
+      background-color: #ffa08c;
+      width: 65px;
+      grid-column: 1;
+      justify-self: center;
+    }
+
+    #item5 {
+      background-color: #ff8cff;
+      width: 90px;
+      grid-column: 2;
+      justify-self: last baseline;
+    }
+
+    #item6 {
+      background-color: #8cffff;
+      width: 85px;
+      grid-column: 2;
+      justify-self: last baseline;
+    }
+
+    #item7 {
+      background-color: #ff8c8c;
+      width: 60px;
+      grid-column: 2;
+      justify-self: start;
+    }
+
+    #item8 {
+      background-color: #c8ffa0;
+      width: 65px;
+      grid-column: 3;
+      justify-self: baseline;
+    }
+
+    #item9 {
+      background-color: #a0a0ff;
+      width: 75px;
+      grid-column: 3;
+      justify-self: baseline;
+    }
+
+    #item10 {
+      background-color: #ffc88c;
+      width: 70px;
+      grid-column: 3;
+      justify-self: end;
+    }
+  </style>
+</head>
+<body>
+<div class="grid-lanes">
+  <div id="item1" class="item">baseline</div>
+  <div id="item2" class="item">baseline</div>
+  <div id="item3" class="item">center</div>
+  <div id="item5" class="item">last baseline</div>
+  <div id="item6" class="item">last baseline</div>
+  <div id="item7" class="item">start</div>
+  <div id="item8" class="item">baseline</div>
+  <div id="item9" class="item">baseline</div>
+  <div id="item10" class="item">end</div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-003-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-003-ref.html
new file mode 100644
index 0000000000000..3f601ce931399
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-003-ref.html
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <style>
+    .grid {
+      width: 400px;
+      border: solid 5px transparent;
+      gap: 3px;
+      display: grid;
+      grid-template-columns: repeat(3, 120px);
+      grid-template-rows: repeat(3, min-content);
+      grid-auto-flow: column;
+      background-color: #9f8c8c;
+      border-color: slateblue;
+      text-decoration: underline;
+      font: 16px/1 monospace;
+    }
+
+    .item {
+      height: 35px;
+    }
+
+    .fb {
+      justify-items: baseline;
+    }
+
+    .lb {
+      justify-items: last baseline;
+    }
+
+    #item1 {
+      background-color: #8cffa0;
+      width: 60px;
+      font-size: 24px;
+      margin-inline: 0;
+      grid-column: 1;
+      grid-row: 1;
+    }
+
+    #item4 {
+      background-color: #ffff8c;
+      width: 80px;
+      font-size: 24px;
+      margin-inline-start: 10px;
+      margin-inline-end: 5px;
+      grid-column: 1;
+      grid-row: 2;
+    }
+
+    #item7 {
+      background-color: #ff8c8c;
+      width: 50px;
+      font-size: 16px;
+      margin-inline-start: 20px;
+      margin-inline-end: 0;
+      grid-column: 1;
+      grid-row: 3;
+    }
+
+    #item2 {
+      background-color: #a0c8ff;
+      width: 70px;
+      font-size: 24px;
+      margin-inline: 15px;
+      grid-column: 2;
+      grid-row: 1;
+    }
+
+    #item5 {
+      background-color: #ff8cff;
+      width: 90px;
+      font-size: 14px;
+      margin-inline-start: 0;
+      margin-inline-end: 20px;
+      grid-column: 2;
+      grid-row: 2;
+    }
+
+    #item8 {
+      background-color: #c8ffa0;
+      width: 60px;
+      font-size: 22px;
+      margin-inline-start: 15px;
+      margin-inline-end: 0;
+      grid-column: 2;
+      grid-row: 3;
+    }
+
+    #item3 {
+      background-color: #ffa08c;
+      width: 75px;
+      font-size: 24px;
+      margin-inline-start: 5px;
+      margin-inline-end: 10px;
+      grid-column: 3;
+      grid-row: 1;
+    }
+
+    #item6 {
+      background-color: #8cffff;
+      width: 55px;
+      font-size: 16px;
+      margin-inline: 25px 5px;
+      grid-column: 3;
+      grid-row: 2;
+    }
+
+    #item9 {
+      background-color: #a0a0ff;
+      width: 85px;
+      font-size: 26px;
+      margin-inline: 5px 25px;
+      grid-column: 3;
+      grid-row: 3;
+    }
+  </style>
+</head>
+<body>
+<div class="grid fb">
+  <div id="item1" class="item">AAA</div>
+  <div id="item2" class="item">BBB</div>
+  <div id="item3" class="item">CCC</div>
+  <div id="item4" class="item">DDD</div>
+  <div id="item5" class="item">EEE</div>
+  <div id="item6" class="item">FFF</div>
+  <div id="item7" class="item">GGG</div>
+  <div id="item8" class="item">HHH</div>
+  <div id="item9" class="item">III</div>
+</div>
+<div class="grid lb">
+  <div id="item1" class="item">AAA</div>
+  <div id="item2" class="item">BBB</div>
+  <div id="item3" class="item">CCC</div>
+  <div id="item4" class="item">DDD</div>
+  <div id="item5" class="item">EEE</div>
+  <div id="item6" class="item">FFF</div>
+  <div id="item7" class="item">GGG</div>
+  <div id="item8" class="item">HHH</div>
+  <div id="item9" class="item">III</div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-003.html
new file mode 100644
index 0000000000000..1bf79e65ec421
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-003.html
@@ -0,0 +1,139 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Grid Lanes Test: baseline alignment with different margins</title>
+  <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-baseline-alignment">
+  <link rel="match" href="column-grid-lanes-item-baseline-003-ref.html">
+  <style>
+    .grid-lanes {
+      width: 400px;
+      border: solid 5px transparent;
+      gap: 3px;
+      display: grid-lanes;
+      grid-template-columns: repeat(3, 120px);
+      background-color: #9f8c8c;
+      border-color: slateblue;
+      text-decoration: underline;
+      font: 16px/1 monospace;
+    }
+
+    .item {
+      height: 35px;
+    }
+
+    .fb {
+      justify-items: baseline;
+    }
+
+    .lb {
+      justify-items: last baseline;
+    }
+
+    /* Column 1 - items with different inline margins */
+    #item1 {
+      background-color: #8cffa0;
+      width: 60px;
+      font-size: 24px;
+      grid-column: 1;
+      margin-inline: 0;
+    }
+
+    #item4 {
+      background-color: #ffff8c;
+      width: 80px;
+      font-size: 24px;
+      grid-column: 1;
+      margin-inline-start: 10px;
+      margin-inline-end: 5px;
+    }
+
+    #item7 {
+      background-color: #ff8c8c;
+      width: 50px;
+      font-size: 16px;
+      grid-column: 1;
+      margin-inline-start: 20px;
+      margin-inline-end: 0;
+    }
+
+    /* Column 2 - items with asymmetric margins */
+    #item2 {
+      background-color: #a0c8ff;
+      width: 70px;
+      font-size: 24px;
+      grid-column: 2;
+      margin-inline: 15px;
+    }
+
+    #item5 {
+      background-color: #ff8cff;
+      width: 90px;
+      font-size: 14px;
+      grid-column: 2;
+      margin-inline-start: 0;
+      margin-inline-end: 20px;
+    }
+
+    #item8 {
+      background-color: #c8ffa0;
+      width: 60px;
+      font-size: 22px;
+      grid-column: 2;
+      margin-inline-start: 15px;
+      margin-inline-end: 0;
+    }
+
+    /* Column 3 - items with large margins */
+    #item3 {
+      background-color: #ffa08c;
+      width: 75px;
+      font-size: 24px;
+      grid-column: 3;
+      margin-inline-start: 5px;
+      margin-inline-end: 10px;
+    }
+
+    #item6 {
+      background-color: #8cffff;
+      width: 55px;
+      font-size: 16px;
+      grid-column: 3;
+      margin-inline: 25px 5px;
+    }
+
+    #item9 {
+      background-color: #a0a0ff;
+      width: 85px;
+      font-size: 26px;
+      grid-column: 3;
+      margin-inline: 5px 25px;
+    }
+  </style>
+</head>
+<body>
+<div class="grid-lanes fb">
+  <div id="item1" class="item">AAA</div>
+  <div id="item2" class="item">BBB</div>
+  <div id="item3" class="item">CCC</div>
+  <div id="item4" class="item">DDD</div>
+  <div id="item5" class="item">EEE</div>
+  <div id="item6" class="item">FFF</div>
+  <div id="item7" class="item">GGG</div>
+  <div id="item8" class="item">HHH</div>
+  <div id="item9" class="item">III</div>
+</div>
+<div class="grid-lanes lb">
+  <div id="item1" class="item">AAA</div>
+  <div id="item2" class="item">BBB</div>
+  <div id="item3" class="item">CCC</div>
+  <div id="item4" class="item">DDD</div>
+  <div id="item5" class="item">EEE</div>
+  <div id="item6" class="item">FFF</div>
+  <div id="item7" class="item">GGG</div>
+  <div id="item8" class="item">HHH</div>
+  <div id="item9" class="item">III</div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004a-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004a-ref.html
new file mode 100644
index 0000000000000..bc2d91281fc91
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004a-ref.html
@@ -0,0 +1,134 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <style>
+    .grid {
+      width: 600px;
+      border: solid 5px;
+      gap: 3px;
+      display: grid;
+      grid-auto-flow: column;
+      grid-template-rows: repeat(4, min-content);
+      grid-template-columns: repeat(4, 120px);
+      background-color: #f0f0f0;
+      border-color: slateblue;
+      margin-bottom: 20px;
+      font: 16px/1 monospace;
+    }
+
+    .fb {
+      justify-items: first baseline;
+    }
+
+    .lb {
+      justify-items: last baseline;
+    }
+
+    .item {
+      height: 35px;
+      padding: 5px;
+      text-decoration: underline;
+      writing-mode: vertical-lr;
+    }
+
+    #item1 {
+      background-color: #8cffa0;
+      width: 50px;
+      font-size: 16px;
+      grid-column: 1 / 2;
+      grid-row: 1 / 2;
+    }
+
+    #item2 {
+      background-color: #a0c8ff;
+      width: 60px;
+      font-size: 20px;
+      grid-column: 1 / 2;
+      grid-row: 2 / 3;
+    }
+
+    #item3 {
+      background-color: #ffa08c;
+      width: 140px;
+      grid-column: 1 / 3;
+      font-size: 18px;
+    }
+
+    #item4 {
+      background-color: #ffff8c;
+      width: 55px;
+      font-size: 14px;
+    }
+
+    #item5 {
+      background-color: #ff8cff;
+      width: 65px;
+      font-size: 22px;
+    }
+
+    #item6 {
+      background-color: #8cffff;
+      width: 50px;
+      font-size: 16px;
+    }
+
+    #item7 {
+      background-color: #ff8c8c;
+      width: 160px;
+      grid-column: 3 / 5;
+      font-size: 24px;
+    }
+
+    #item8 {
+      background-color: #c8ffa0;
+      width: 55px;
+      font-size: 18px;
+      grid-column: 3 / 4;
+      grid-row: 2 / 3;
+    }
+
+    #item9 {
+      background-color: #a0a0ff;
+      width: 60px;
+      font-size: 16px;
+      grid-column: 3 / 4;
+      grid-row: 3 / 4;
+    }
+
+    #item10 {
+      background-color: #ffc88c;
+      width: 50px;
+      font-size: 20px;
+      grid-column: 4 / 5;
+      grid-row: 2 / 3;
+    }
+  </style>
+</head>
+<body>
+<div class="grid fb">
+  <div id="item1" class="item">AAA</div>
+  <div id="item2" class="item">BBB</div>
+  <div id="item3" class="item">CCC</div>
+  <div id="item4" class="item">DDD</div>
+  <div id="item5" class="item">EEE</div>
+  <div id="item6" class="item">FFF</div>
+  <div id="item7" class="item">GGG</div>
+  <div id="item8" class="item">HHH</div>
+  <div id="item9" class="item">III</div>
+  <div id="item10" class="item">JJJ</div>
+</div>
+<div class="grid lb">
+  <div id="item1" class="item">AAA</div>
+  <div id="item2" class="item">BBB</div>
+  <div id="item3" class="item">CCC</div>
+  <div id="item4" class="item">DDD</div>
+  <div id="item5" class="item">EEE</div>
+  <div id="item6" class="item">FFF</div>
+  <div id="item7" class="item">GGG</div>
+  <div id="item8" class="item">HHH</div>
+  <div id="item9" class="item">III</div>
+  <div id="item10" class="item">JJJ</div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004a.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004a.html
new file mode 100644
index 0000000000000..4baaa83dfdb17
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004a.html
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Grid Lanes Test: baseline alignment with multi-track spanning items and dense packing</title>
+  <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-baseline-alignment">
+  <link rel="match" href="column-grid-lanes-item-baseline-004a-ref.html">
+  <style>
+    .grid-lanes {
+      width: 600px;
+      border: solid 5px;
+      gap: 3px;
+      display: grid-lanes;
+      grid-template-columns: repeat(4, 120px);
+      grid-lanes-pack: dense;
+      grid-auto-flow: dense;
+      background-color: #f0f0f0;
+      border-color: slateblue;
+      margin-bottom: 20px;
+      font: 16px/1 monospace;
+    }
+
+    .fb {
+      justify-items: first baseline;
+    }
+
+    .lb {
+      justify-items: last baseline;
+    }
+
+    .item {
+      height: 35px;
+      padding: 5px;
+      text-decoration: underline;
+      writing-mode: vertical-lr;
+    }
+
+    #item1 {
+      background-color: #8cffa0;
+      width: 50px;
+      grid-column: 1 / 2;
+      font-size: 16px;
+    }
+
+    #item2 {
+      background-color: #a0c8ff;
+      width: 60px;
+      grid-column: 1 / 2;
+      font-size: 20px;
+    }
+
+    #item3 {
+      background-color: #ffa08c;
+      width: 140px;
+      grid-column: 1 / 3;
+      font-size: 18px;
+    }
+
+    #item4 {
+      background-color: #ffff8c;
+      width: 55px;
+      grid-column: 1 / 2;
+      font-size: 14px;
+    }
+
+    #item5 {
+      background-color: #ff8cff;
+      width: 65px;
+      grid-column: 2 / 3;
+      font-size: 22px;
+    }
+
+    #item6 {
+      background-color: #8cffff;
+      width: 50px;
+      grid-column: 2 / 3;
+      font-size: 16px;
+    }
+
+    #item7 {
+      background-color: #ff8c8c;
+      width: 160px;
+      grid-column: 3 / 5;
+      font-size: 24px;
+    }
+
+    #item8 {
+      background-color: #c8ffa0;
+      width: 55px;
+      grid-column: 3 / 4;
+      font-size: 18px;
+    }
+
+    #item9 {
+      background-color: #a0a0ff;
+      width: 60px;
+      grid-column: 3 / 4;
+      font-size: 16px;
+    }
+
+    #item10 {
+      background-color: #ffc88c;
+      width: 50px;
+      grid-column: 4 / 5;
+      font-size: 20px;
+    }
+  </style>
+</head>
+<body>
+<div class="grid-lanes fb">
+  <div id="item1" class="item">AAA</div>
+  <div id="item2" class="item">BBB</div>
+  <div id="item3" class="item">CCC</div>
+  <div id="item4" class="item">DDD</div>
+  <div id="item5" class="item">EEE</div>
+  <div id="item6" class="item">FFF</div>
+  <div id="item7" class="item">GGG</div>
+  <div id="item8" class="item">HHH</div>
+  <div id="item9" class="item">III</div>
+  <div id="item10" class="item">JJJ</div>
+</div>
+<div class="grid-lanes lb">
+  <div id="item1" class="item">AAA</div>
+  <div id="item2" class="item">BBB</div>
+  <div id="item3" class="item">CCC</div>
+  <div id="item4" class="item">DDD</div>
+  <div id="item5" class="item">EEE</div>
+  <div id="item6" class="item">FFF</div>
+  <div id="item7" class="item">GGG</div>
+  <div id="item8" class="item">HHH</div>
+  <div id="item9" class="item">III</div>
+  <div id="item10" class="item">JJJ</div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004b-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004b-ref.html
new file mode 100644
index 0000000000000..09d7d2c4ffc56
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004b-ref.html
@@ -0,0 +1,133 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <style>
+    .grid {
+      width: 400px;
+      border: solid 5px;
+      gap: 3px;
+      display: grid;
+      grid-auto-flow: column;
+      grid-template-rows: repeat(4, min-content);
+      grid-template-columns: repeat(4, 80px);
+      background-color: #f0f0f0;
+      border-color: slateblue;
+      margin-bottom: 20px;
+      font: 16px/1 monospace;
+    }
+
+    .fb {
+      justify-items: first baseline;
+    }
+
+    .lb {
+      justify-items: last baseline;
+    }
+
+    .item {
+      height: 35px;
+      padding: 5px;
+      text-decoration: underline;
+    }
+
+    #item1 {
+      background-color: #8cffa0;
+      width: 50px;
+      font-size: 16px;
+      grid-column: 1 / 2;
+      grid-row: 1 / 2;
+    }
+
+    #item2 {
+      background-color: #a0c8ff;
+      width: 60px;
+      font-size: 20px;
+      grid-column: 1 / 2;
+      grid-row: 2 / 3;
+    }
+
+    #item3 {
+      background-color: #ffa08c;
+      width: 140px;
+      grid-column: 1 / 3;
+      font-size: 18px;
+    }
+
+    #item4 {
+      background-color: #ffff8c;
+      width: 55px;
+      font-size: 14px;
+    }
+
+    #item5 {
+      background-color: #ff8cff;
+      width: 65px;
+      font-size: 22px;
+    }
+
+    #item6 {
+      background-color: #8cffff;
+      width: 50px;
+      font-size: 16px;
+    }
+
+    #item7 {
+      background-color: #ff8c8c;
+      width: 160px;
+      grid-column: 3 / 5;
+      font-size: 24px;
+    }
+
+    #item8 {
+      background-color: #c8ffa0;
+      width: 55px;
+      font-size: 18px;
+      grid-column: 3 / 4;
+      grid-row: 2 / 3;
+    }
+
+    #item9 {
+      background-color: #a0a0ff;
+      width: 60px;
+      font-size: 16px;
+      grid-column: 3 / 4;
+      grid-row: 3 / 4;
+    }
+
+    #item10 {
+      background-color: #ffc88c;
+      width: 50px;
+      font-size: 20px;
+      grid-column: 4 / 5;
+      grid-row: 2 / 3;
+    }
+  </style>
+</head>
+<body>
+<div class="grid fb">
+  <div id="item1" class="item">AAA</div>
+  <div id="item2" class="item">BBB</div>
+  <div id="item3" class="item">CCC</div>
+  <div id="item4" class="item">DDD</div>
+  <div id="item5" class="item">EEE</div>
+  <div id="item6" class="item">FFF</div>
+  <div id="item7" class="item">GGG</div>
+  <div id="item8" class="item">HHH</div>
+  <div id="item9" class="item">III</div>
+  <div id="item10" class="item">JJJ</div>
+</div>
+<div class="grid lb">
+  <div id="item1" class="item">AAA</div>
+  <div id="item2" class="item">BBB</div>
+  <div id="item3" class="item">CCC</div>
+  <div id="item4" class="item">DDD</div>
+  <div id="item5" class="item">EEE</div>
+  <div id="item6" class="item">FFF</div>
+  <div id="item7" class="item">GGG</div>
+  <div id="item8" class="item">HHH</div>
+  <div id="item9" class="item">III</div>
+  <div id="item10" class="item">JJJ</div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004b.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004b.html
new file mode 100644
index 0000000000000..22a7279c2e2a9
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004b.html
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Grid Lanes Test: baseline alignment with multi-track spanning items and dense packing</title>
+  <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-baseline-alignment">
+  <link rel="match" href="column-grid-lanes-item-baseline-004b-ref.html">
+  <style>
+    .grid-lanes {
+      width: 400px;
+      border: solid 5px;
+      gap: 3px;
+      display: grid-lanes;
+      grid-template-columns: repeat(4, 80px);
+      grid-lanes-pack: dense;
+      grid-auto-flow: dense;
+      background-color: #f0f0f0;
+      border-color: slateblue;
+      margin-bottom: 20px;
+      font: 16px/1 monospace;
+      justify-items: last baseline;
+    }
+
+    .fb {
+      justify-items: first baseline;
+    }
+
+    .lb {
+      justify-items: last baseline;
+    }
+
+    .item {
+      height: 35px;
+      padding: 5px;
+      text-decoration: underline;
+    }
+
+    #item1 {
+      background-color: #8cffa0;
+      width: 50px;
+      grid-column: 1 / 2;
+      font-size: 16px;
+    }
+
+    #item2 {
+      background-color: #a0c8ff;
+      width: 60px;
+      grid-column: 1 / 2;
+      font-size: 20px;
+    }
+
+    #item3 {
+      background-color: #ffa08c;
+      width: 140px;
+      grid-column: 1 / 3;
+      font-size: 18px;
+    }
+
+    #item4 {
+      background-color: #ffff8c;
+      width: 55px;
+      grid-column: 1 / 2;
+      font-size: 14px;
+    }
+
+    #item5 {
+      background-color: #ff8cff;
+      width: 65px;
+      grid-column: 2 / 3;
+      font-size: 22px;
+    }
+
+    #item6 {
+      background-color: #8cffff;
+      width: 50px;
+      grid-column: 2 / 3;
+      font-size: 16px;
+    }
+
+    #item7 {
+      background-color: #ff8c8c;
+      width: 160px;
+      grid-column: 3 / 5;
+      font-size: 24px;
+    }
+
+    #item8 {
+      background-color: #c8ffa0;
+      width: 55px;
+      grid-column: 3 / 4;
+      font-size: 18px;
+    }
+
+    #item9 {
+      background-color: #a0a0ff;
+      width: 60px;
+      grid-column: 3 / 4;
+      font-size: 16px;
+    }
+
+    #item10 {
+      background-color: #ffc88c;
+      width: 50px;
+      grid-column: 4 / 5;
+      font-size: 20px;
+    }
+  </style>
+</head>
+<body>
+<div class="grid-lanes fb">
+  <div id="item1" class="item">AAA</div>
+  <div id="item2" class="item">BBB</div>
+  <div id="item3" class="item">CCC</div>
+  <div id="item4" class="item">DDD</div>
+  <div id="item5" class="item">EEE</div>
+  <div id="item6" class="item">FFF</div>
+  <div id="item7" class="item">GGG</div>
+  <div id="item8" class="item">HHH</div>
+  <div id="item9" class="item">III</div>
+  <div id="item10" class="item">JJJ</div>
+</div>
+<div class="grid-lanes lb">
+  <div id="item1" class="item">AAA</div>
+  <div id="item2" class="item">BBB</div>
+  <div id="item3" class="item">CCC</div>
+  <div id="item4" class="item">DDD</div>
+  <div id="item5" class="item">EEE</div>
+  <div id="item6" class="item">FFF</div>
+  <div id="item7" class="item">GGG</div>
+  <div id="item8" class="item">HHH</div>
+  <div id="item9" class="item">III</div>
+  <div id="item10" class="item">JJJ</div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-005-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-005-ref.html
new file mode 100644
index 0000000000000..63bcc704f3e55
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-005-ref.html
@@ -0,0 +1,134 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <style>
+    .container {
+      display: flex;
+      gap: 20px;
+      margin-bottom: 20px;
+    }
+
+    .grid {
+      height: 200px;
+      border: solid 3px;
+      gap: 2px;
+      display: grid;
+      grid-auto-flow: column;
+      grid-template-rows: repeat(4, min-content);
+      grid-template-columns: repeat(2, 60px);
+      background-color: #f0f0f0;
+      border-color: slateblue;
+      justify-items: baseline;
+      font: 16px/1 monospace;
+    }
+
+    .vertical-rl {
+      writing-mode: vertical-rl;
+    }
+
+    .vertical-lr {
+      writing-mode: vertical-lr;
+    }
+
+    .sideways-rl {
+      writing-mode: sideways-rl;
+    }
+
+    .sideways-lr {
+      writing-mode: sideways-lr;
+    }
+
+    .item {
+      width: 60px;
+      padding: 3px;
+      text-decoration: underline;
+    }
+
+    #item1 {
+      background-color: #8cffa0;
+      min-height: 20px;
+      font-size: 12px;
+    }
+
+    #item2 {
+      background-color: #a0c8ff;
+      min-height: 30px;
+      font-size: 16px;
+    }
+
+    #item3 {
+      background-color: #ffa08c;
+      min-height: 25px;
+      font-size: 14px;
+    }
+
+    #item4 {
+      background-color: #ffff8c;
+      min-height: 35px;
+      font-size: 10px;
+    }
+
+    #item5 {
+      background-color: #ff8cff;
+      min-height: 28px;
+      font-size: 14px;
+    }
+
+    #item6 {
+      background-color: #8cffff;
+      min-height: 22px;
+      font-size: 18px;
+    }
+
+    #item7 {
+      background-color: #ff8c8c;
+      min-height: 32px;
+      font-size: 12px;
+    }
+  </style>
+</head>
+<body>
+<div class="container">
+  <div class="grid vertical-rl">
+    <div id="item1" class="item">AB<br/>CD</div>
+    <div id="item2" class="item">EF<br/>GH</div>
+    <div id="item3" class="item">IJ</div>
+    <div id="item4" class="item">KL</div>
+    <div id="item5" class="item">MN</div>
+    <div id="item6" class="item">OP</div>
+    <div id="item7" class="item">QR<br/>ST</div>
+  </div>
+  <div class="grid vertical-lr">
+    <div id="item1" class="item">AB<br/>CD</div>
+    <div id="item2" class="item">EF<br/>GH</div>
+    <div id="item3" class="item">IJ</div>
+    <div id="item4" class="item">KL</div>
+    <div id="item5" class="item">MN</div>
+    <div id="item6" class="item">OP</div>
+    <div id="item7" class="item">QR<br/>ST</div>
+  </div>
+</div>
+
+<div class="container">
+  <div class="grid sideways-rl">
+    <div id="item1" class="item">AB<br/>CD</div>
+    <div id="item2" class="item">EF<br/>GH</div>
+    <div id="item3" class="item">IJ</div>
+    <div id="item4" class="item">KL</div>
+    <div id="item5" class="item">MN</div>
+    <div id="item6" class="item">OP</div>
+    <div id="item7" class="item">QR<br/>ST</div>
+  </div>
+  <div class="grid sideways-lr">
+    <div id="item1" class="item">AB<br/>CD</div>
+    <div id="item2" class="item">EF<br/>GH</div>
+    <div id="item3" class="item">IJ</div>
+    <div id="item4" class="item">KL</div>
+    <div id="item5" class="item">MN</div>
+    <div id="item6" class="item">OP</div>
+    <div id="item7" class="item">QR<br/>ST</div>
+  </div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-005.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-005.html
new file mode 100644
index 0000000000000..1311894e29615
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-005.html
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Grid Lanes Test: baseline alignment with different writing modes</title>
+  <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-baseline-alignment">
+  <link rel="match" href="column-grid-lanes-item-baseline-005-ref.html">
+  <style>
+    .container {
+      display: flex;
+      gap: 20px;
+      margin-bottom: 20px;
+    }
+
+    .grid-lanes {
+      height: 200px;
+      border: solid 3px;
+      gap: 2px;
+      display: grid-lanes;
+      grid-template-columns: repeat(2, 60px);
+      background-color: #f0f0f0;
+      border-color: slateblue;
+      justify-items: baseline;
+      font: 16px/1 monospace;
+    }
+
+    .vertical-rl {
+      writing-mode: vertical-rl;
+    }
+
+    .vertical-lr {
+      writing-mode: vertical-lr;
+    }
+
+    .sideways-rl {
+      writing-mode: sideways-rl;
+    }
+
+    .sideways-lr {
+      writing-mode: sideways-lr;
+    }
+
+    .item {
+      width: 60px;
+      padding: 3px;
+      text-decoration: underline;
+    }
+
+    #item1 {
+      background-color: #8cffa0;
+      min-height: 20px;
+      grid-column: 1 / 2;
+      font-size: 12px;
+    }
+
+    #item2 {
+      background-color: #a0c8ff;
+      min-height: 30px;
+      grid-column: 1 / 2;
+      font-size: 16px;
+    }
+
+    #item3 {
+      background-color: #ffa08c;
+      min-height: 25px;
+      grid-column: 1 / 2;
+      font-size: 14px;
+    }
+
+    #item4 {
+      background-color: #ffff8c;
+      min-height: 35px;
+      grid-column: 1 / 2;
+      font-size: 10px;
+    }
+
+    #item5 {
+      background-color: #ff8cff;
+      min-height: 28px;
+      grid-column: 2 / 3;
+      font-size: 14px;
+    }
+
+    #item6 {
+      background-color: #8cffff;
+      min-height: 22px;
+      grid-column: 2 / 3;
+      font-size: 18px;
+    }
+
+    #item7 {
+      background-color: #ff8c8c;
+      min-height: 32px;
+      grid-column: 2 / 3;
+      font-size: 12px;
+    }
+  </style>
+</head>
+<body>
+<div class="container">
+  <div class="grid-lanes vertical-rl">
+    <div id="item1" class="item">AB<br/>CD</div>
+    <div id="item2" class="item">EF<br/>GH</div>
+    <div id="item3" class="item">IJ</div>
+    <div id="item4" class="item">KL</div>
+    <div id="item5" class="item">MN</div>
+    <div id="item6" class="item">OP</div>
+    <div id="item7" class="item">QR<br/>ST</div>
+  </div>
+  <div class="grid-lanes vertical-lr">
+    <div id="item1" class="item">AB<br/>CD</div>
+    <div id="item2" class="item">EF<br/>GH</div>
+    <div id="item3" class="item">IJ</div>
+    <div id="item4" class="item">KL</div>
+    <div id="item5" class="item">MN</div>
+    <div id="item6" class="item">OP</div>
+    <div id="item7" class="item">QR<br/>ST</div>
+  </div>
+</div>
+
+<div class="container">
+  <div class="grid-lanes sideways-rl">
+    <div id="item1" class="item">AB<br/>CD</div>
+    <div id="item2" class="item">EF<br/>GH</div>
+    <div id="item3" class="item">IJ</div>
+    <div id="item4" class="item">KL</div>
+    <div id="item5" class="item">MN</div>
+    <div id="item6" class="item">OP</div>
+    <div id="item7" class="item">QR<br/>ST</div>
+  </div>
+  <div class="grid-lanes sideways-lr">
+    <div id="item1" class="item">AB<br/>CD</div>
+    <div id="item2" class="item">EF<br/>GH</div>
+    <div id="item3" class="item">IJ</div>
+    <div id="item4" class="item">KL</div>
+    <div id="item5" class="item">MN</div>
+    <div id="item6" class="item">OP</div>
+    <div id="item7" class="item">QR<br/>ST</div>
+  </div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-001-ref.html
new file mode 100644
index 0000000000000..f7f968527dbd8
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-001-ref.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <style>
+    .inline-grid {
+      display: inline-grid;
+      background-color: grey;
+      position: relative;
+      border: solid;
+      text-orientation: sideways;
+      font: 15px/1 Ahem;
+      justify-items: baseline;
+    }
+
+    .rows { grid-template-rows: 100px 100px; }
+
+    .min-content-columns { grid-template-columns: min-content; }
+    .max-content-columns { grid-template-columns: max-content; }
+    .fit-content-columns { grid-template-columns: fit-content; }
+
+    .flex-columns     { grid-template-columns: 1fr; }
+    .max-flex-columns { grid-template-columns: minmax(0px, 1fr); }
+
+    .height25  { height: 25px; }
+    .height50  { height: 50px; }
+    .height200 { height: 200px; }
+    .width25   { width: 25px; }
+    .width50   { width: 50px; }
+    .width200  { width: 200px; }
+
+    .height200Percent { height: 200%; }
+    .width200Percent  { width: 200%; }
+
+    .firstRowFirstColumn {
+      background-color: blue;
+      grid-column: 1;
+      grid-row: 1;
+    }
+
+    .secondRowFirstColumn {
+      background-color: purple;
+      grid-column: 1;
+      grid-row: 2;
+    }
+
+    .firstRowSpanning2AutoColumn {
+      background-color: maroon;
+      grid-column: auto;
+      grid-row: 1 / span 2;
+      height: 100%;
+    }
+
+    .verticalLR {
+      writing-mode: vertical-lr;
+    }
+
+    .verticalRL {
+      writing-mode: vertical-rl;
+    }
+  </style>
+</head>
+<body>
+<div style="height: 250px">
+    <pre>min-content-sized columns - items with relative width</pre>
+    <div class="inline-grid rows min-content-columns">
+        <div class="firstRowFirstColumn verticalRL">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="secondRowFirstColumn verticalRL width200Percent"></div>
+        <div class="firstRowSpanning2AutoColumn verticalRL width25"></div>
+    </div>
+</div>
+<div style="height: 250px">
+    <pre>max-content-sized columns - items with relative width</pre>
+    <div class="inline-grid rows max-content-columns">
+        <div class="firstRowFirstColumn verticalLR">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="secondRowFirstColumn verticalLR width200Percent">ÉÉ</div>
+        <div class="firstRowSpanning2AutoColumn verticalLR width25"></div>
+    </div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-001.html
new file mode 100644
index 0000000000000..23eadc45ba550
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-001.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Grid Lanes Test: Self-Baseline alignment and sizing cyclic dependency</title>
+  <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-baseline-alignment">
+  <link rel="match" href="column-grid-lanes-item-baseline-cyclic-dependency-001-ref.html">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <style>
+    .grid-lanes {
+      display: inline-grid-lanes;
+      background-color: grey;
+      position: relative;
+      border: solid;
+      text-orientation: sideways;
+      font: 15px/1 Ahem;
+      justify-items: baseline;
+    }
+
+    .min-content-columns { grid-template-columns: min-content; }
+    .max-content-columns { grid-template-columns: max-content; }
+
+    .width25   { width: 25px; }
+    .width50   { width: 50px; }
+    .width200  { width: 200px; }
+    .width200Percent  { width: 200%; }
+
+    .firstRowFirstItem {
+      background-color: blue;
+      grid-column: 1;
+      height: 100px;
+    }
+
+    .secondRowFirstItem {
+      background-color: purple;
+      grid-column: 1;
+      height: 100px;
+    }
+
+    .spanning2 {
+      background-color: maroon;
+      grid-column: 2;
+      height: 200px;
+    }
+
+    .verticalLR {
+      writing-mode: vertical-lr;
+    }
+
+    .verticalRL {
+      writing-mode: vertical-rl;
+    }
+  </style>
+</head>
+<body>
+<div style="height: 250px">
+    <pre>min-content-sized columns - items with relative width</pre>
+    <div class="grid-lanes min-content-columns">
+        <div class="firstRowFirstItem verticalRL">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="secondRowFirstItem verticaRL width200Percent"></div>
+        <div class="spanning2 verticalRL width25"></div>
+    </div>
+</div>
+<div style="height: 250px">
+    <pre>max-content-sized columns - items with relative width</pre>
+    <div class="grid-lanes max-content-columns">
+        <div class="firstRowFirstItem verticalLR">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="secondRowFirstItem verticalLR width200Percent">ÉÉ</div>
+        <div class="spanning2 verticalRL width25"></div>
+    </div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-002-ref.html
new file mode 100644
index 0000000000000..a455f6b30f11f
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-002-ref.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <style>
+    .inline-grid {
+      display: inline-grid;
+      background-color: grey;
+      position: relative;
+      border: solid;
+      text-orientation: sideways;
+      font: 15px/1 Ahem;
+      justify-items: baseline;
+    }
+    .rows { grid-template-rows: 100px 100px; }
+    .flex-columns     { grid-template-columns: 1fr; }
+    .max-flex-columns { grid-template-columns: minmax(0px, 1fr); }
+    .auto-rows        { grid-template-rows: auto 100px; }
+
+    .height50  { height: 50px; }
+    .width25   { width: 25px; }
+    .width50   { width: 50px; }
+    .width200  { width: 200px; }
+    .width200Percent  { width: 200%; }
+
+    .firstRowFirstColumn {
+      background-color: blue;
+      grid-column: 1;
+      grid-row: 1;
+    }
+
+    .secondRowFirstColumn {
+      background-color: purple;
+      grid-column: 1;
+      grid-row: 2;
+    }
+
+    .firstRowSpanning2AutoColumn {
+      background-color: maroon;
+      grid-column: auto;
+      grid-row: 1 / span 2;
+      height: 100%;
+    }
+
+    .verticalLR {
+      writing-mode: vertical-lr;
+    }
+
+    .verticalRL {
+      writing-mode: vertical-rl;
+    }
+  </style>
+</head>
+<body>
+<div style="height: 250px">
+    <pre>flexible-sized columns - items with relative width</pre>
+    <div class="inline-grid rows flex-columns">
+        <div class="firstRowFirstColumn verticalLR width50">ÉÉ</div>
+        <div class="secondRowFirstColumn verticalLR width200Percent">ÉÉ</div>
+        <div class="firstRowSpanning2AutoColumn verticalLR width25"></div>
+    </div>
+</div>
+<div style="height: 250px">
+    <pre>flex max-function columns - items with relative width</pre>
+    <div class="inline-grid auto-rows max-flex-columns">
+        <div class="firstRowFirstColumn verticalLR width50 height50"></div>
+        <div class="secondRowFirstColumn verticalLR width200Percent height50"></div>
+        <div class="firstRowSpanning2AutoColumn verticalLR width25"></div>
+    </div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-002.html
new file mode 100644
index 0000000000000..587e23c15e79d
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-002.html
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Grid Lanes Test: Self-Baseline alignment and sizing cyclic dependency</title>
+  <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-baseline-alignment">
+  <link rel="match" href="column-grid-lanes-item-baseline-cyclic-dependency-002-ref.html">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <style>
+    .grid-lanes {
+      display: inline-grid-lanes;
+      background-color: grey;
+      position: relative;
+      border: solid;
+      text-orientation: sideways;
+      font: 15px/1 Ahem;
+      justify-items: baseline;
+    }
+
+    .flex-columns     { grid-template-columns: 1fr; }
+    .max-flex-columns { grid-template-columns: minmax(0px, 1fr); }
+
+    .width25   { width: 25px; }
+    .width50   { width: 50px; }
+    .width200  { width: 200px; }
+    .width200Percent  { width: 200%; }
+    .height50 { height: 50px; }
+    .height100 { height: 100px; }
+    .height150 {height: 150px; }
+    .height200 {height: 200px; }
+
+    .firstRowFirstItem {
+      background-color: blue;
+      grid-column: 1;
+    }
+
+    .secondRowFirstItem {
+      background-color: purple;
+      grid-column: 1;
+    }
+
+    .spanning2 {
+      background-color: maroon;
+      grid-column: 2;
+    }
+
+    .verticalLR {
+      writing-mode: vertical-lr;
+    }
+
+    .verticalRL {
+      writing-mode: vertical-rl;
+    }
+  </style>
+</head>
+<body>
+<div style="height: 250px">
+    <pre>flexible-sized columns - items with relative width</pre>
+    <div class="grid-lanes flex-columns">
+        <div class="firstRowFirstItem verticalLR height100 width50">ÉÉ</div>
+        <div class="secondRowFirstItem verticalLR height100 width200Percent">ÉÉ</div>
+        <div class="spanning2 verticalLR width25 height200"></div>
+    </div>
+</div>
+<div style="height: 250px">
+    <pre>flex max-function columns - items with relative width</pre>
+    <div class="grid-lanes max-flex-columns">
+        <div class="firstRowFirstItem verticalLR width50 height50"></div>
+        <div class="secondRowFirstItem verticalLR width200Percent height50"></div>
+        <div class="spanning2 verticalLR width25 height150"></div>
+    </div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-003-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-003-ref.html
new file mode 100644
index 0000000000000..188441a96f14a
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-003-ref.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <style>
+    .inline-grid {
+      display: inline-grid;
+      background-color: grey;
+      position: relative;
+      border: solid;
+      text-orientation: sideways;
+      font: 15px/1 Ahem;
+      justify-items: baseline;
+    }
+
+    .rows { grid-template-rows: 100px 100px; }
+    .fit-content-columns { grid-template-columns: fit-content; }
+
+    .height25  { height: 25px; }
+    .height50  { height: 50px; }
+    .height200 { height: 200px; }
+    .width25   { width: 25px; }
+    .width50   { width: 50px; }
+    .width200  { width: 200px; }
+
+    .height200Percent { height: 200%; }
+    .width200Percent  { width: 200%; }
+
+    .firstRowFirstColumn {
+      background-color: blue;
+      grid-column: 1;
+      grid-row: 1;
+    }
+
+    .secondRowFirstColumn {
+      background-color: purple;
+      grid-column: 1;
+      grid-row: 2;
+    }
+
+    .firstRowSpanning2AutoColumn {
+      background-color: maroon;
+      grid-column: auto;
+      grid-row: 1 / span 2;
+      height: 100%;
+    }
+
+    .verticalLR {
+      writing-mode: vertical-lr;
+    }
+
+    .verticalRL {
+      writing-mode: vertical-rl;
+    }
+  </style>
+</head>
+<body>
+<div style="height: 250px">
+    <pre>auto-sized columns - items with relative width</pre>
+    <div class="inline-grid rows">
+        <div class="firstRowFirstColumn verticalLR width50">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="secondRowFirstColumn verticalLR width200Percent">ÉÉÉÉ É ÉÉ</div>
+        <div class="firstRowSpanning2AutoColumn verticalLR width25"></div>
+    </div>
+</div>
+<div style="height: 250px">
+    <pre>fit-content-sized columns - items with relative width</pre>
+    <div class="inline-grid rows fit-content-columns">
+        <div class="firstRowFirstColumn verticalLR">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="secondRowFirstColumn verticalLR width200Percent">ÉÉ</div>
+        <div class="firstRowSpanning2AutoColumn verticalLR width25"></div>
+    </div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-003.html
new file mode 100644
index 0000000000000..b65c3e8a94777
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-003.html
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Grid Lanes Test: Self-Baseline alignment and sizing cyclic dependency</title>
+  <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-baseline-alignment">
+  <link rel="match" href="column-grid-lanes-item-baseline-cyclic-dependency-003-ref.html">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <style>
+    .grid-lanes {
+      display: inline-grid-lanes;
+      background-color: grey;
+      position: relative;
+      border: solid;
+      text-orientation: sideways;
+      font: 15px/1 Ahem;
+      justify-items: baseline;
+    }
+
+    .fit-content-columns { grid-template-columns: fit-content; }
+
+    .height100 { height: 100px; }
+    .height200 { height: 200px; }
+    .width25   { width: 25px; }
+    .width50   { width: 50px; }
+    .width200  { width: 200px; }
+    .width200Percent  { width: 200%; }
+
+    .firstRowFirstItem {
+      background-color: blue;
+      grid-column: 1;
+      height: 100px;
+    }
+
+    .secondRowFirstItem {
+      background-color: purple;
+      grid-column: 1;
+      height: 100px;
+    }
+
+    .spanning2 {
+      background-color: maroon;
+      grid-column: 2;
+      height: 200px;
+    }
+
+    .verticalLR {
+      writing-mode: vertical-lr;
+    }
+
+    .verticalRL {
+      writing-mode: vertical-rl;
+    }
+  </style>
+</head>
+<body>
+<div style="height: 250px">
+    <pre>auto-sized columns - items with relative width</pre>
+    <div class="grid-lanes">
+        <div class="firstRowFirstItem verticalLR width50">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="secondRowFirstItem verticalLR width200Percent">ÉÉÉÉ É ÉÉ</div>
+        <div class="spanning2 verticalLR width25"></div>
+    </div>
+</div>
+<div style="height: 250px">
+    <pre>fit-content-sized columns - items with relative width</pre>
+    <div class="grid-lanes fit-content-columns">
+        <div class="firstRowFirstItem verticalLR height100">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="secondRowFirstItem verticalLR height100 width200Percent">ÉÉ</div>
+        <div class="spanning2 verticalLR width25 height200"></div>
+    </div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-001-ref.html
new file mode 100644
index 0000000000000..51b8a2ab7c609
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-001-ref.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <style>
+    .container { position: relative; }
+    .grid {
+      display: grid;
+      position: relative;
+      text-orientation: sideways;
+      grid: 100px 200px / 200px 100px;
+      font-family: Ahem;
+      line-height: 1;
+      background-color: grey;
+      justify-items: baseline;
+      width: 300px;
+    }
+    .bigFont  { font-size: 50px; }
+    .width25 { width: 25px; }
+
+    .paddingLeft { padding-left: 25px; }
+    .paddingRight { padding-right: 25px; }
+
+    .firstRowFirstColumn {
+      background-color: blue;
+      grid-column: 1;
+      grid-row: 1;
+    }
+
+    .secondRowFirstColumn {
+      background-color: purple;
+      grid-column: 1;
+      grid-row: 2;
+    }
+
+    .autoRowSpanning2AutoColumn {
+      background-color: aqua;
+      grid-column: auto;
+      grid-row: span 2;
+    }
+
+    .verticalRL {
+      writing-mode: vertical-rl;
+    }
+    .verticalLR {
+      writing-mode: vertical-lr;
+    }
+    .horizontalTB {
+      writing-mode: horizontal-tb;
+    }
+  </style>
+</head>
+<body>
+<pre>Horizontal grid-lanes and verticalRL items do not share a baseline context</pre>
+<div class="grid">
+  <div class="firstRowFirstColumn">ÉÉ É ÉÉÉ É ÉÉ É</div>
+  <div class="secondRowFirstColumn bigFont paddingRight verticalRL">É É ÉÉ</div>
+  <div class="autoRowSpanning2AutoColumn width25"></div>
+</div>
+
+<pre>Horizontal grid-lanes and verticalLR item</pre>
+<div class="grid">
+  <div class="firstRowFirstColumn">ÉÉ É ÉÉÉ É ÉÉ É</div>
+  <div class="secondRowFirstColumn bigFont paddingLeft verticalLR">É É ÉÉ</div>
+  <div class="autoRowSpanning2AutoColumn width25"></div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-001.html
new file mode 100644
index 0000000000000..648c46f5a4d89
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-001.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Grid Lanes Test: Self-Baseline alignment with synthesized baselines for orthogonal items</title>
+  <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-baseline-alignment">
+  <link rel="help" href="https://drafts.csswg.org/css-align/#synthesize-baseline">
+  <link rel="match" href="column-grid-lanes-item-baseline-synthesized-001-ref.html">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <style>
+    .container { position: relative; }
+    .grid-lanes {
+      display: grid-lanes;
+      position: relative;
+      text-orientation: sideways;
+      grid-template-columns: 200px 100px;
+      font-family: Ahem;
+      line-height: 1;
+      background-color: grey;
+      justify-items: baseline;
+      width: 300px;
+    }
+    .bigFont  { font-size: 50px; }
+
+    .paddingLeft { padding-left: 25px; }
+    .paddingRight { padding-right: 25px; }
+
+    .firstItem {
+      background-color: blue;
+      grid-column: 1;
+      height: 100px;
+    }
+
+    .secondItem {
+      background-color: purple;
+      grid-column: 1;
+      height: 200px;
+    }
+
+    .thirdItem {
+      background-color: aqua;
+      grid-column: 2;
+      width: 25px;
+      height: 300px;
+    }
+
+    .verticalRL {
+      writing-mode: vertical-rl;
+    }
+    .verticalLR {
+      writing-mode: vertical-lr;
+    }
+    .horizontalTB {
+      writing-mode: horizontal-tb;
+    }
+  </style>
+</head>
+<body>
+<pre>Horizontal grid-lanes and verticalRL items do not share a baseline context</pre>
+<div class="grid-lanes">
+  <div class="firstItem">ÉÉ É ÉÉÉ É ÉÉ É</div>
+  <div class="secondItem bigFont paddingRight verticalRL">É É ÉÉ</div>
+  <div class="thirdItem"></div>
+</div>
+
+<pre>Horizontal grid-lanes and verticalLR item</pre>
+<div class="grid-lanes">
+  <div class="firstItem">ÉÉ É ÉÉÉ É ÉÉ É</div>
+  <div class="secondItem bigFont paddingLeft verticalLR">É É ÉÉ</div>
+  <div class="thirdItem"></div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-002-ref.html
new file mode 100644
index 0000000000000..f72e0e7afac4c
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-002-ref.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <style>
+    .container { position: relative; }
+    .grid {
+      display: grid;
+      position: relative;
+      text-orientation: sideways;
+      grid: 100px 200px / 200px 100px;
+      font-family: Ahem;
+      line-height: 1;
+      background-color: grey;
+      justify-items: baseline;
+      width: 300px;
+    }
+    .bigFont  { font-size: 50px; }
+    .height25 { height: 25px; }
+    .paddingLeft { padding-left: 25px; }
+    .paddingRight { padding-right: 25px; }
+
+    .firstRowFirstColumn {
+      background-color: blue;
+      grid-column: 1;
+      grid-row: 1;
+    }
+
+    .secondRowFirstColumn {
+      background-color: purple;
+      grid-column: 1;
+      grid-row: 2;
+    }
+
+    .autoRowSpanning2AutoColumn {
+      background-color: aqua;
+      grid-column: auto;
+      grid-row: span 2;
+    }
+
+    .verticalRL {
+      writing-mode: vertical-rl;
+    }
+    .verticalLR {
+      writing-mode: vertical-lr;
+    }
+    .horizontalTB {
+      writing-mode: horizontal-tb;
+    }
+  </style>
+</head>
+<body>
+<pre>VerticalLR grid-lanes and Horizontal item</pre>
+<div class="grid justifyItemsBaseline verticalLR">
+  <div class="firstRowFirstColumn">ÉÉ É ÉÉÉ É ÉÉ É</div>
+  <div class="secondRowFirstColumn bigFont horizontalTB">É É ÉÉ</div>
+  <div class="autoRowSpanning2AutoColumn height25"></div>
+</div>
+
+<pre>VerticalRL grid-lanes and Horizontal item</pre>
+<div class="grid justifyItemsBaseline verticalRL">
+  <div class="firstRowFirstColumn">ÉÉ É ÉÉÉ É ÉÉ É</div>
+  <div class="secondRowFirstColumn bigFont horizontalTB">É É ÉÉ</div>
+  <div class="autoRowSpanning2AutoColumn height25"></div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-002.html
new file mode 100644
index 0000000000000..4985216959cb8
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-002.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Grid Lanes Test: Self-Baseline alignment with synthesized baselines for orthogonal items</title>
+  <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-baseline-alignment">
+  <link rel="help" href="https://drafts.csswg.org/css-align/#synthesize-baseline">
+  <link rel="match" href="column-grid-lanes-item-baseline-synthesized-002-ref.html">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <style>
+    .container { position: relative; }
+    .grid-lanes {
+      display: grid-lanes;
+      position: relative;
+      text-orientation: sideways;
+      grid-template-columns: 200px 100px;
+      font-family: Ahem;
+      line-height: 1;
+      background-color: grey;
+      justify-items: baseline;
+      width: 300px;
+    }
+    .bigFont  { font-size: 50px; }
+    .paddingLeft { padding-left: 25px; }
+    .paddingRight { padding-right: 25px; }
+
+    .firstItem {
+      background-color: blue;
+      grid-column: 1;
+      width: 100px;
+    }
+
+    .secondItem {
+      background-color: purple;
+      grid-column: 1;
+      width: 200px;
+    }
+
+    .thirdItem {
+      background-color: aqua;
+      grid-column: 2;
+      width: 300px;
+      height: 25px;
+    }
+
+    .verticalRL {
+      writing-mode: vertical-rl;
+    }
+    .verticalLR {
+      writing-mode: vertical-lr;
+    }
+    .horizontalTB {
+      writing-mode: horizontal-tb;
+    }
+  </style>
+</head>
+<body>
+<pre>VerticalLR grid-lanes and Horizontal item</pre>
+<div class="grid-lanes verticalLR">
+  <div class="firstItem">ÉÉ É ÉÉÉ É ÉÉ É</div>
+  <div class="secondItem bigFont horizontalTB">É É ÉÉ</div>
+  <div class="thirdItem"></div>
+</div>
+
+<pre>VerticalRL grid-lanes and Horizontal item</pre>
+<div class="grid-lanes verticalRL">
+  <div class="firstItem">ÉÉ É ÉÉÉ É ÉÉ É</div>
+  <div class="secondItem bigFont horizontalTB">É É ÉÉ</div>
+  <div class="thirdItem"></div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-001-ref.html
new file mode 100644
index 0000000000000..d14af9b85d423
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-001-ref.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <style>
+    .grid {
+      width: 500px;
+      border: solid 5px transparent;
+      gap: 3px;
+      display: grid;
+      grid-template-columns: repeat(auto-fill, 100px);
+      grid-template-rows: repeat(2, 100px);
+      background-color: #9f8c8c;
+      border-color: slateblue;
+      text-decoration: underline;
+      font: 16px/1 monospace;
+    }
+
+    .fb {
+      align-items: first baseline;
+    }
+
+    .lb {
+      align-items: last baseline;
+    }
+
+    #item1 {
+      background-color: #8cffa0;
+      min-height: 30px;
+    }
+
+    #item2 {
+      background-color: #a0c8ff;
+      min-height: 50px;
+    }
+
+    #item3 {
+      background-color: #ffa08c;
+      min-height: 40px;
+    }
+
+    #item4 {
+      background-color: #ffff8c;
+      min-height: 60px;
+    }
+
+    #item5 {
+      background-color: #ff8cff;
+      min-height: 70px;
+    }
+
+    #item6 {
+      background-color: #8cffff;
+      min-height: 50px;
+      font-size: 30px;
+    }
+  </style>
+</head>
+<body>
+<div class="grid fb">
+  <div id="item1">1</div>
+  <div id="item2">2</div>
+  <div id="item3">3</div>
+  <div id="item4">4<br />line 2</div>
+  <div id="item5">5</div>
+  <div id="item6">6</div>
+</div>
+<div class="grid lb">
+  <div id="item1">1</div>
+  <div id="item2">2</div>
+  <div id="item3">3</div>
+  <div id="item4">4<br />line 2</div>
+  <div id="item5">5</div>
+  <div id="item6">6</div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-001.html
new file mode 100644
index 0000000000000..e4aa2aeb4abf9
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-001.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Grid Lanes Test: align-items:baseline/last baseline</title>
+  <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-baseline-alignment">
+  <link rel="match" href="row-grid-lanes-item-baseline-001-ref.html">
+  <style>
+    .grid-lanes {
+      width: 500px;
+      border: solid 5px transparent;
+      gap: 3px;
+      display: grid-lanes;
+      grid-lanes-direction: row;
+      grid-template-rows: repeat(2, 100px);
+      background-color: #9f8c8c;
+      border-color: slateblue;
+      text-decoration: underline;
+      font: 16px/1 monospace;
+    }
+
+    .fb {
+      align-items: first baseline;
+    }
+
+    .lb {
+      align-items: last baseline;
+    }
+
+    #item1 {
+    background-color: #8cffa0;
+    min-height: 30px;
+    grid-row: 1 / 2;
+    width: 100px;
+    }
+
+    #item2 {
+    background-color: #a0c8ff;
+    min-height: 50px;
+    grid-row: 1 / 2;
+    width: 100px;
+    }
+
+    #item3 {
+    background-color: #ffa08c;
+    min-height: 40px;
+    grid-row: 1 / 2;
+    width: 100px;
+    }
+
+    #item4 {
+    background-color: #ffff8c;
+    min-height: 60px;
+    grid-row: 1 / 2;
+    width: 100px;
+    }
+
+    #item5 {
+    background-color: #ff8cff;
+    min-height: 70px;
+    grid-row: 2 / 3;
+    width: 100px;
+    }
+
+    #item6 {
+    background-color: #8cffff;
+    min-height: 50px;
+    font-size: 30px;
+    grid-row: 2 / 3;
+    width: 100px;
+    }
+    </style>
+</head>
+<body>
+<div class="grid-lanes fb">
+  <div id="item1">1</div>
+  <div id="item2">2</div>
+  <div id="item3">3</div>
+  <div id="item4">4<br />line 2</div>
+  <div id="item5">5</div>
+  <div id="item6">6</div>
+</div>
+<div class="grid-lanes lb">
+  <div id="item1">1</div>
+  <div id="item2">2</div>
+  <div id="item3">3</div>
+  <div id="item4">4<br />line 2</div>
+  <div id="item5">5</div>
+  <div id="item6">6</div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-002-ref.html
new file mode 100644
index 0000000000000..2b6fa69779472
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-002-ref.html
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <style>
+    .grid {
+      width: 500px;
+      border: solid 5px;
+      gap: 3px;
+      display: grid;
+      grid-template-columns: repeat(4, min-content);
+      grid-template-rows: repeat(3, 100px);
+      background-color: #f0f0f0;
+      border-color: slateblue;
+      align-items: center;
+      margin-bottom: 20px;
+      font: 16px/1 monospace;
+    }
+
+    .item {
+      width: 100px;
+      padding: 5px;
+    }
+
+    #item1 {
+      background-color: #8cffa0;
+      min-height: 30px;
+      align-self: baseline;
+      font-size: 16px;
+    }
+
+    #item2 {
+      background-color: #a0c8ff;
+      min-height: 50px;
+      align-self: baseline;
+      font-size: 24px;
+    }
+
+    #item3 {
+      background-color: #ffa08c;
+      min-height: 40px;
+      align-self: center;
+    }
+
+    #item4 {
+      background-color: #ffff8c;
+      min-height: 60px;
+      align-self: baseline;
+      font-size: 12px;
+    }
+
+    #item5 {
+      background-color: #ff8cff;
+      min-height: 70px;
+      align-self: last baseline;
+    }
+
+    #item6 {
+      background-color: #8cffff;
+      min-height: 50px;
+      align-self: last baseline;
+      font-size: 20px;
+    }
+
+    #item7 {
+      background-color: #ff8c8c;
+      min-height: 45px;
+      align-self: start;
+    }
+
+    #item8 {
+      grid-row: 3 / 4;
+      background-color: #c8ffa0;
+      min-height: 35px;
+      align-self: baseline;
+    }
+
+    #item9 {
+      grid-row: 3 / 4;
+      background-color: #a0a0ff;
+      min-height: 55px;
+      align-self: baseline;
+      font-size: 28px;
+    }
+
+    #item10 {
+      grid-row: 3 / 4;
+      background-color: #ffc88c;
+      min-height: 50px;
+      align-self: end;
+    }
+  </style>
+</head>
+<body>
+<div class="grid">
+  <div id="item1" class="item">baseline</div>
+  <div id="item2" class="item">baseline</div>
+  <div id="item3" class="item">center</div>
+  <div id="item4" class="item">baseline</div>
+  <div id="item5" class="item">last<br/>baseline</div>
+  <div id="item6" class="item">last<br/>baseline</div>
+  <div id="item7" class="item">start</div>
+  <div id="item8" class="item">baseline</div>
+  <div id="item9" class="item">baseline</div>
+  <div id="item10" class="item">end</div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-002.html
new file mode 100644
index 0000000000000..1c7c40ac4f1b8
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-002.html
@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Grid Lanes Test: align-self baseline override</title>
+  <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-baseline-alignment">
+  <link rel="match" href="row-grid-lanes-item-baseline-002-ref.html">
+  <style>
+    .grid-lanes {
+      width: 500px;
+      border: solid 5px;
+      gap: 3px;
+      display: grid-lanes;
+      grid-lanes-direction: row;
+      grid-template-rows: repeat(3, 100px);
+      background-color: #f0f0f0;
+      border-color: slateblue;
+      align-items: center;
+      margin-bottom: 20px;
+      font: 16px/1 monospace;
+    }
+
+    .item {
+      width: 100px;
+      padding: 5px;
+    }
+
+    #item1 {
+      background-color: #8cffa0;
+      min-height: 30px;
+      grid-row: 1 / 2;
+      align-self: baseline;
+      font-size: 16px;
+    }
+
+    #item2 {
+      background-color: #a0c8ff;
+      min-height: 50px;
+      grid-row: 1 / 2;
+      align-self: baseline;
+      font-size: 24px;
+    }
+
+    #item3 {
+      background-color: #ffa08c;
+      min-height: 40px;
+      grid-row: 1 / 2;
+      align-self: center;
+    }
+
+    #item4 {
+      background-color: #ffff8c;
+      min-height: 60px;
+      grid-row: 1 / 2;
+      align-self: baseline;
+      font-size: 12px;
+    }
+
+    #item5 {
+      background-color: #ff8cff;
+      min-height: 70px;
+      grid-row: 2 / 3;
+      align-self: last baseline;
+    }
+
+    #item6 {
+      background-color: #8cffff;
+      min-height: 50px;
+      grid-row: 2 / 3;
+      align-self: last baseline;
+      font-size: 20px;
+    }
+
+    #item7 {
+      background-color: #ff8c8c;
+      min-height: 45px;
+      grid-row: 2 / 3;
+      align-self: start;
+    }
+
+    #item8 {
+      background-color: #c8ffa0;
+      min-height: 35px;
+      grid-row: 3 / 4;
+      align-self: baseline;
+    }
+
+    #item9 {
+      background-color: #a0a0ff;
+      min-height: 55px;
+      grid-row: 3 / 4;
+      align-self: baseline;
+      font-size: 28px;
+    }
+
+    #item10 {
+      background-color: #ffc88c;
+      min-height: 50px;
+      grid-row: 3 / 4;
+      align-self: end;
+    }
+  </style>
+</head>
+<body>
+<div class="grid-lanes">
+  <div id="item1" class="item">baseline</div>
+  <div id="item2" class="item">baseline</div>
+  <div id="item3" class="item">center</div>
+  <div id="item4" class="item">baseline</div>
+  <div id="item5" class="item">last<br/>baseline</div>
+  <div id="item6" class="item">last<br/>baseline</div>
+  <div id="item7" class="item">start</div>
+  <div id="item8" class="item">baseline</div>
+  <div id="item9" class="item">baseline</div>
+  <div id="item10" class="item">end</div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-003-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-003-ref.html
new file mode 100644
index 0000000000000..2203969b2ba3a
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-003-ref.html
@@ -0,0 +1,128 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <style>
+    .grid {
+      width: 500px;
+      border: solid 5px;
+      gap: 3px;
+      display: grid;
+      grid-template-columns: repeat(4, min-content);
+      grid-template-rows: repeat(3, 100px);
+      background-color: #f0f0f0;
+      border-color: slateblue;
+      margin-bottom: 20px;
+      font: 16px/1 monospace;
+    }
+
+    .fb {
+      align-items: first baseline;
+    }
+
+    .lb {
+      align-items: last baseline;
+    }
+
+    .item {
+      width: 100px;
+      padding: 5px;
+      text-decoration: underline;
+    }
+
+    #item1 {
+      background-color: #8cffa0;
+      min-height: 30px;
+      font-size: 16px;
+      margin-block: 0;
+    }
+
+    #item2 {
+      background-color: #a0c8ff;
+      min-height: 30px;
+      font-size: 20px;
+      margin-block-start: 10px;
+      margin-block-end: 5px;
+    }
+
+    #item3 {
+      background-color: #ffa08c;
+      min-height: 30px;
+      font-size: 14px;
+      margin-block-start: 20px;
+      margin-block-end: 0;
+    }
+
+    #item4 {
+      background-color: #ffff8c;
+      min-height: 30px;
+      font-size: 18px;
+      margin-block: 15px;
+    }
+
+    #item5 {
+      background-color: #ff8cff;
+      min-height: 35px;
+      font-size: 16px;
+      margin-block-start: 0;
+      margin-block-end: 20px;
+    }
+
+    #item6 {
+      background-color: #8cffff;
+      min-height: 35px;
+      font-size: 22px;
+      margin-block-start: 15px;
+      margin-block-end: 0;
+    }
+
+    #item7 {
+      background-color: #ff8c8c;
+      min-height: 35px;
+      font-size: 12px;
+      margin-block-start: 5px;
+      margin-block-end: 10px;
+    }
+
+    #item8 {
+      background-color: #c8ffa0;
+      min-height: 30px;
+      font-size: 24px;
+      margin-block: 25px 5px;
+      grid-row: 3 / 4;
+    }
+
+    #item9 {
+      background-color: #a0a0ff;
+      min-height: 30px;
+      font-size: 16px;
+      margin-block: 5px 25px;
+      grid-row: 3 / 4;
+    }
+  </style>
+</head>
+<body>
+<div class="grid fb">
+  <div id="item1" class="item">1</div>
+  <div id="item2" class="item">2</div>
+  <div id="item3" class="item">3</div>
+  <div id="item4" class="item">4</div>
+  <div id="item5" class="item">5</div>
+  <div id="item6" class="item">6</div>
+  <div id="item7" class="item">7</div>
+  <div id="item8" class="item">8</div>
+  <div id="item9" class="item">9</div>
+</div>
+<div class="grid lb">
+  <div id="item1" class="item">1</div>
+  <div id="item2" class="item">2</div>
+  <div id="item3" class="item">3</div>
+  <div id="item4" class="item">4</div>
+  <div id="item5" class="item">5</div>
+  <div id="item6" class="item">6</div>
+  <div id="item7" class="item">7</div>
+  <div id="item8" class="item">8</div>
+  <div id="item9" class="item">9</div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-003.html
new file mode 100644
index 0000000000000..a0d7e187bbccc
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-003.html
@@ -0,0 +1,139 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Grid Lanes Test: baseline alignment with different margins</title>
+  <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-baseline-alignment">
+  <link rel="match" href="row-grid-lanes-item-baseline-003-ref.html">
+  <style>
+    .grid-lanes {
+      width: 500px;
+      border: solid 5px;
+      gap: 3px;
+      display: grid-lanes;
+      grid-lanes-direction: row;
+      grid-template-rows: repeat(3, 100px);
+      background-color: #f0f0f0;
+      border-color: slateblue;
+      margin-bottom: 20px;
+      font: 16px/1 monospace;
+    }
+
+    .fb {
+      align-items: first baseline;
+    }
+
+    .lb {
+      align-items: last baseline;
+    }
+
+    .item {
+      width: 100px;
+      padding: 5px;
+      text-decoration: underline;
+    }
+
+    #item1 {
+      background-color: #8cffa0;
+      min-height: 30px;
+      grid-row: 1 / 2;
+      font-size: 16px;
+      margin-block: 0;
+    }
+
+    #item2 {
+      background-color: #a0c8ff;
+      min-height: 30px;
+      grid-row: 1 / 2;
+      font-size: 20px;
+      margin-block-start: 10px;
+      margin-block-end: 5px;
+    }
+
+    #item3 {
+      background-color: #ffa08c;
+      min-height: 30px;
+      grid-row: 1 / 2;
+      font-size: 14px;
+      margin-block-start: 20px;
+      margin-block-end: 0;
+    }
+
+    #item4 {
+      background-color: #ffff8c;
+      min-height: 30px;
+      grid-row: 1 / 2;
+      font-size: 18px;
+      margin-block: 15px;
+    }
+
+    #item5 {
+      background-color: #ff8cff;
+      min-height: 35px;
+      grid-row: 2 / 3;
+      font-size: 16px;
+      margin-block-start: 0;
+      margin-block-end: 20px;
+    }
+
+    #item6 {
+      background-color: #8cffff;
+      min-height: 35px;
+      grid-row: 2 / 3;
+      font-size: 22px;
+      margin-block-start: 15px;
+      margin-block-end: 0;
+    }
+
+    #item7 {
+      background-color: #ff8c8c;
+      min-height: 35px;
+      grid-row: 2 / 3;
+      font-size: 12px;
+      margin-block-start: 5px;
+      margin-block-end: 10px;
+    }
+
+    #item8 {
+      background-color: #c8ffa0;
+      min-height: 30px;
+      grid-row: 3 / 4;
+      font-size: 24px;
+      margin-block: 25px 5px;
+    }
+
+    #item9 {
+      background-color: #a0a0ff;
+      min-height: 30px;
+      grid-row: 3 / 4;
+      font-size: 16px;
+      margin-block: 5px 25px;
+    }
+  </style>
+</head>
+<body>
+<div class="grid-lanes fb">
+  <div id="item1" class="item">1</div>
+  <div id="item2" class="item">2</div>
+  <div id="item3" class="item">3</div>
+  <div id="item4" class="item">4</div>
+  <div id="item5" class="item">5</div>
+  <div id="item6" class="item">6</div>
+  <div id="item7" class="item">7</div>
+  <div id="item8" class="item">8</div>
+  <div id="item9" class="item">9</div>
+</div>
+<div class="grid-lanes lb">
+  <div id="item1" class="item">1</div>
+  <div id="item2" class="item">2</div>
+  <div id="item3" class="item">3</div>
+  <div id="item4" class="item">4</div>
+  <div id="item5" class="item">5</div>
+  <div id="item6" class="item">6</div>
+  <div id="item7" class="item">7</div>
+  <div id="item8" class="item">8</div>
+  <div id="item9" class="item">9</div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-004-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-004-ref.html
new file mode 100644
index 0000000000000..9bbb8046bac54
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-004-ref.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <style>
+    .grid {
+      width: 500px;
+      border: solid 5px;
+      gap: 3px;
+      display: grid;
+      grid-template-columns: repeat(4, min-content);
+      grid-template-rows: repeat(4, 80px);
+      background-color: #f0f0f0;
+      border-color: slateblue;
+      margin-bottom: 20px;
+      font: 16px/1 monospace;
+    }
+
+    .fb {
+      align-items: first baseline;
+    }
+
+    .lb {
+      align-items: last baseline;
+    }
+
+    .item {
+      width: 100px;
+      padding: 5px;
+      text-decoration: underline;
+    }
+
+    #item1 {
+      background-color: #8cffa0;
+      min-height: 30px;
+      font-size: 16px;
+      grid-column: 1 / 2;
+      grid-row: 1 / 2;
+    }
+
+    #item2 {
+      background-color: #a0c8ff;
+      min-height: 40px;
+      font-size: 20px;
+      grid-column: 2 / 3;
+      grid-row: 1 / 2;
+    }
+
+    #item3 {
+      background-color: #ffa08c;
+      min-height: 100px;
+      grid-row: 1 / 3;
+      font-size: 18px;
+    }
+
+    #item4 {
+      background-color: #ffff8c;
+      min-height: 35px;
+      font-size: 14px;
+    }
+
+    #item5 {
+      background-color: #ff8cff;
+      min-height: 45px;
+      font-size: 22px;
+    }
+
+    #item6 {
+      background-color: #8cffff;
+      min-height: 30px;
+      font-size: 16px;
+    }
+
+    #item7 {
+      background-color: #ff8c8c;
+      min-height: 120px;
+      grid-row: 3 / 5;
+      font-size: 24px;
+    }
+
+    #item8 {
+      background-color: #c8ffa0;
+      min-height: 35px;
+      font-size: 18px;
+      grid-column: 2 / 3;
+      grid-row: 3 / 4;
+    }
+
+    #item9 {
+      background-color: #a0a0ff;
+      min-height: 40px;
+      font-size: 16px;
+      grid-column: 3 / 4;
+      grid-row: 3 / 4;
+    }
+
+    #item10 {
+      background-color: #ffc88c;
+      min-height: 30px;
+      font-size: 20px;
+      grid-column: 2 / 3;
+      grid-row: 4 / 5;
+    }
+  </style>
+</head>
+<body>
+<div class="grid fb">
+  <div id="item1" class="item">1</div>
+  <div id="item2" class="item">2</div>
+  <div id="item3" class="item">3<br/>line 2</div>
+  <div id="item4" class="item">4</div>
+  <div id="item5" class="item">5</div>
+  <div id="item6" class="item">6</div>
+  <div id="item7" class="item">7<br/>line 2</div>
+  <div id="item8" class="item">8</div>
+  <div id="item9" class="item">9</div>
+  <div id="item10" class="item">10</div>
+</div>
+<div class="grid lb">
+  <div id="item1" class="item">1</div>
+  <div id="item2" class="item">2</div>
+  <div id="item3" class="item">3<br/>line 2</div>
+  <div id="item4" class="item">4</div>
+  <div id="item5" class="item">5</div>
+  <div id="item6" class="item">6</div>
+  <div id="item7" class="item">7<br/>line 2</div>
+  <div id="item8" class="item">8</div>
+  <div id="item9" class="item">9</div>
+  <div id="item10" class="item">10</div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-004.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-004.html
new file mode 100644
index 0000000000000..506d7572cda60
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-004.html
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Grid Lanes Test: baseline alignment with multi-track spanning items and dense packing</title>
+  <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-baseline-alignment">
+  <link rel="match" href="row-grid-lanes-item-baseline-004-ref.html">
+  <style>
+    .grid-lanes {
+      width: 500px;
+      border: solid 5px;
+      gap: 3px;
+      display: grid-lanes;
+      grid-lanes-direction: row;
+      grid-template-rows: repeat(4, 80px);
+      grid-lanes-pack: dense;
+      grid-auto-flow: dense;
+      background-color: #f0f0f0;
+      border-color: slateblue;
+      margin-bottom: 20px;
+      font: 16px/1 monospace;
+    }
+
+    .fb {
+      align-items: first baseline;
+    }
+
+    .lb {
+      align-items: last baseline;
+    }
+
+    .item {
+      width: 100px;
+      padding: 5px;
+      text-decoration: underline;
+    }
+
+    #item1 {
+      background-color: #8cffa0;
+      min-height: 30px;
+      grid-row: 1 / 2;
+      font-size: 16px;
+    }
+
+    #item2 {
+      background-color: #a0c8ff;
+      min-height: 40px;
+      grid-row: 1 / 2;
+      font-size: 20px;
+    }
+
+    #item3 {
+      background-color: #ffa08c;
+      min-height: 100px;
+      grid-row: 1 / 3;
+      font-size: 18px;
+    }
+
+    #item4 {
+      background-color: #ffff8c;
+      min-height: 35px;
+      grid-row: 1 / 2;
+      font-size: 14px;
+    }
+
+    #item5 {
+      background-color: #ff8cff;
+      min-height: 45px;
+      grid-row: 2 / 3;
+      font-size: 22px;
+    }
+
+    #item6 {
+      background-color: #8cffff;
+      min-height: 30px;
+      grid-row: 2 / 3;
+      font-size: 16px;
+    }
+
+    #item7 {
+      background-color: #ff8c8c;
+      min-height: 120px;
+      grid-row: 3 / 5;
+      font-size: 24px;
+    }
+
+    #item8 {
+      background-color: #c8ffa0;
+      min-height: 35px;
+      grid-row: 3 / 4;
+      font-size: 18px;
+    }
+
+    #item9 {
+      background-color: #a0a0ff;
+      min-height: 40px;
+      grid-row: 3 / 4;
+      font-size: 16px;
+    }
+
+    #item10 {
+      background-color: #ffc88c;
+      min-height: 30px;
+      grid-row: 4 / 5;
+      font-size: 20px;
+    }
+  </style>
+</head>
+<body>
+<div class="grid-lanes fb">
+  <div id="item1" class="item">1</div>
+  <div id="item2" class="item">2</div>
+  <div id="item3" class="item">3<br/>line 2</div>
+  <div id="item4" class="item">4</div>
+  <div id="item5" class="item">5</div>
+  <div id="item6" class="item">6</div>
+  <div id="item7" class="item">7<br/>line 2</div>
+  <div id="item8" class="item">8</div>
+  <div id="item9" class="item">9</div>
+  <div id="item10" class="item">10</div>
+</div>
+<div class="grid-lanes lb">
+  <div id="item1" class="item">1</div>
+  <div id="item2" class="item">2</div>
+  <div id="item3" class="item">3<br/>line 2</div>
+  <div id="item4" class="item">4</div>
+  <div id="item5" class="item">5</div>
+  <div id="item6" class="item">6</div>
+  <div id="item7" class="item">7<br/>line 2</div>
+  <div id="item8" class="item">8</div>
+  <div id="item9" class="item">9</div>
+  <div id="item10" class="item">10</div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-005-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-005-ref.html
new file mode 100644
index 0000000000000..06f8a4df3ddee
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-005-ref.html
@@ -0,0 +1,133 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <style>
+    .container {
+      display: flex;
+      gap: 20px;
+      margin-bottom: 20px;
+    }
+
+    .grid {
+      width: 200px;
+      border: solid 3px;
+      gap: 2px;
+      display: grid;
+      grid-template-columns: repeat(4, min-content);
+      grid-template-rows: repeat(2, 60px);
+      background-color: #f0f0f0;
+      border-color: slateblue;
+      align-items: baseline;
+      font: 16px/1 monospace;
+    }
+
+    .vertical-rl {
+      writing-mode: vertical-rl;
+    }
+
+    .vertical-lr {
+      writing-mode: vertical-lr;
+    }
+
+    .sideways-rl {
+      writing-mode: sideways-rl;
+    }
+
+    .sideways-lr {
+      writing-mode: sideways-lr;
+    }
+
+    .item {
+      height: 60px;
+      padding: 3px;
+      text-decoration: underline;
+    }
+
+    #item1 {
+      background-color: #8cffa0;
+      min-width: 20px;
+      font-size: 12px;
+    }
+
+    #item2 {
+      background-color: #a0c8ff;
+      min-width: 30px;
+      font-size: 16px;
+    }
+
+    #item3 {
+      background-color: #ffa08c;
+      min-width: 25px;
+      font-size: 14px;
+    }
+
+    #item4 {
+      background-color: #ffff8c;
+      min-width: 35px;
+      font-size: 10px;
+    }
+
+    #item5 {
+      background-color: #ff8cff;
+      min-width: 28px;
+      font-size: 14px;
+    }
+
+    #item6 {
+      background-color: #8cffff;
+      min-width: 22px;
+      font-size: 18px;
+    }
+
+    #item7 {
+      background-color: #ff8c8c;
+      min-width: 32px;
+      font-size: 12px;
+    }
+  </style>
+</head>
+<body>
+<div class="container">
+  <div class="grid vertical-rl">
+    <div id="item1" class="item">AB<br/>CD</div>
+    <div id="item2" class="item">EF<br/>GH</div>
+    <div id="item3" class="item">IJ</div>
+    <div id="item4" class="item">KL</div>
+    <div id="item5" class="item">MN</div>
+    <div id="item6" class="item">OP</div>
+    <div id="item7" class="item">QR<br/>ST</div>
+  </div>
+  <div class="grid vertical-lr">
+    <div id="item1" class="item">AB<br/>CD</div>
+    <div id="item2" class="item">EF<br/>GH</div>
+    <div id="item3" class="item">IJ</div>
+    <div id="item4" class="item">KL</div>
+    <div id="item5" class="item">MN</div>
+    <div id="item6" class="item">OP</div>
+    <div id="item7" class="item">QR<br/>ST</div>
+  </div>
+</div>
+
+<div class="container">
+  <div class="grid sideways-rl">
+    <div id="item1" class="item">AB<br/>CD</div>
+    <div id="item2" class="item">EF<br/>GH</div>
+    <div id="item3" class="item">IJ</div>
+    <div id="item4" class="item">KL</div>
+    <div id="item5" class="item">MN</div>
+    <div id="item6" class="item">OP</div>
+    <div id="item7" class="item">QR<br/>ST</div>
+  </div>
+  <div class="grid sideways-lr">
+    <div id="item1" class="item">AB<br/>CD</div>
+    <div id="item2" class="item">EF<br/>GH</div>
+    <div id="item3" class="item">IJ</div>
+    <div id="item4" class="item">KL</div>
+    <div id="item5" class="item">MN</div>
+    <div id="item6" class="item">OP</div>
+    <div id="item7" class="item">QR<br/>ST</div>
+  </div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-005.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-005.html
new file mode 100644
index 0000000000000..c3b3e5d932a12
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-005.html
@@ -0,0 +1,144 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Grid Lanes Test: baseline alignment with different writing modes</title>
+  <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-baseline-alignment">
+  <link rel="match" href="row-grid-lanes-item-baseline-005-ref.html">
+  <style>
+    .container {
+      display: flex;
+      gap: 20px;
+      margin-bottom: 20px;
+    }
+
+    .grid-lanes {
+      width: 200px;
+      border: solid 3px;
+      gap: 2px;
+      display: grid-lanes;
+      grid-lanes-direction: row;
+      grid-template-rows: repeat(2, 60px);
+      background-color: #f0f0f0;
+      border-color: slateblue;
+      align-items: baseline;
+      font: 16px/1 monospace;
+    }
+
+    .vertical-rl {
+      writing-mode: vertical-rl;
+    }
+
+    .vertical-lr {
+      writing-mode: vertical-lr;
+    }
+
+    .sideways-rl {
+      writing-mode: sideways-rl;
+    }
+
+    .sideways-lr {
+      writing-mode: sideways-lr;
+    }
+
+    .item {
+      height: 60px;
+      padding: 3px;
+      text-decoration: underline;
+    }
+
+    #item1 {
+      background-color: #8cffa0;
+      min-width: 20px;
+      grid-row: 1 / 2;
+      font-size: 12px;
+    }
+
+    #item2 {
+      background-color: #a0c8ff;
+      min-width: 30px;
+      grid-row: 1 / 2;
+      font-size: 16px;
+    }
+
+    #item3 {
+      background-color: #ffa08c;
+      min-width: 25px;
+      grid-row: 1 / 2;
+      font-size: 14px;
+    }
+
+    #item4 {
+      background-color: #ffff8c;
+      min-width: 35px;
+      grid-row: 1 / 2;
+      font-size: 10px;
+    }
+
+    #item5 {
+      background-color: #ff8cff;
+      min-width: 28px;
+      grid-row: 2 / 3;
+      font-size: 14px;
+    }
+
+    #item6 {
+      background-color: #8cffff;
+      min-width: 22px;
+      grid-row: 2 / 3;
+      font-size: 18px;
+    }
+
+    #item7 {
+      background-color: #ff8c8c;
+      min-width: 32px;
+      grid-row: 2 / 3;
+      font-size: 12px;
+    }
+  </style>
+</head>
+<body>
+<div class="container">
+  <div class="grid-lanes vertical-rl">
+    <div id="item1" class="item">AB<br/>CD</div>
+    <div id="item2" class="item">EF<br/>GH</div>
+    <div id="item3" class="item">IJ</div>
+    <div id="item4" class="item">KL</div>
+    <div id="item5" class="item">MN</div>
+    <div id="item6" class="item">OP</div>
+    <div id="item7" class="item">QR<br/>ST</div>
+  </div>
+  <div class="grid-lanes vertical-lr">
+    <div id="item1" class="item">AB<br/>CD</div>
+    <div id="item2" class="item">EF<br/>GH</div>
+    <div id="item3" class="item">IJ</div>
+    <div id="item4" class="item">KL</div>
+    <div id="item5" class="item">MN</div>
+    <div id="item6" class="item">OP</div>
+    <div id="item7" class="item">QR<br/>ST</div>
+  </div>
+</div>
+
+<div class="container">
+  <div class="grid-lanes sideways-rl">
+    <div id="item1" class="item">AB<br/>CD</div>
+    <div id="item2" class="item">EF<br/>GH</div>
+    <div id="item3" class="item">IJ</div>
+    <div id="item4" class="item">KL</div>
+    <div id="item5" class="item">MN</div>
+    <div id="item6" class="item">OP</div>
+    <div id="item7" class="item">QR<br/>ST</div>
+  </div>
+  <div class="grid-lanes sideways-lr">
+    <div id="item1" class="item">AB<br/>CD</div>
+    <div id="item2" class="item">EF<br/>GH</div>
+    <div id="item3" class="item">IJ</div>
+    <div id="item4" class="item">KL</div>
+    <div id="item5" class="item">MN</div>
+    <div id="item6" class="item">OP</div>
+    <div id="item7" class="item">QR<br/>ST</div>
+  </div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-001-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-001-ref.html
new file mode 100644
index 0000000000000..aa012417d7823
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-001-ref.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <style>
+    .inline-grid {
+      display: inline-grid;
+      background-color: grey;
+      position: relative;
+      border: solid;
+      text-orientation: sideways;
+      font: 15px/1 Ahem;
+      align-items: baseline;
+    }
+
+    .columns { grid-template-columns: 100px 100px; }
+    .min-content-rows { grid-template-rows: min-content; }
+    .max-content-rows { grid-template-rows: max-content; }
+
+    .height25  { height: 25px; }
+    .height50  { height: 50px; }
+    .height200Percent { height: 200%; }
+
+    .firstRowFirstColumn {
+      background-color: blue;
+      grid-column: 1;
+      grid-row: 1;
+    }
+
+    .firstRowSecondColumn {
+      background-color: lime;
+      grid-column: 2;
+      grid-row: 1;
+    }
+
+    .autoRowAutoColumnSpanning2 {
+      background-color: maroon;
+      grid-column: span 2;
+      grid-row: 2;
+    }
+  </style>
+</head>
+<body>
+<div style="height: 200px">
+    <pre>min-content-sized rows - items with relative height</pre>
+    <div class="inline-grid columns min-content-rows">
+        <div class="firstRowFirstColumn">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="firstRowSecondColumn height200Percent">ÉÉÉÉ É ÉÉ</div>
+        <div class="autoRowAutoColumnSpanning2 height25"></div>
+    </div>
+</div>
+
+<div style="height: 200px">
+    <pre>max-content-sized rows - items with relative height</pre>
+    <div class="inline-grid columns max-content-rows">
+        <div class="firstRowFirstColumn">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="firstRowSecondColumn height200Percent">ÉÉÉÉ É ÉÉ</div>
+        <div class="autoRowAutoColumnSpanning2 height25"></div>
+    </div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-001.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-001.html
new file mode 100644
index 0000000000000..43f4360a393b6
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-001.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Grid Lanes Test: Self-Baseline alignment and sizing cyclic dependency</title>
+  <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-baseline-alignment">
+  <link rel="match" href="row-grid-lanes-item-baseline-cyclic-dependency-001-ref.html">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <style>
+    .grid-lanes {
+      display: inline-grid-lanes;
+      grid-lanes-direction: row;
+      background-color: grey;
+      position: relative;
+      border: solid;
+      text-orientation: sideways;
+      font: 15px/1 Ahem;
+      align-items: baseline;
+    }
+
+    .min-content-rows { grid-template-rows: min-content; }
+    .max-content-rows { grid-template-rows: max-content; }
+
+    .height25  { height: 25px; }
+    .height50  { height: 50px; }
+    .height200Percent { height: 200%; }
+
+    .firstRowFirstItem {
+      background-color: blue;
+      grid-row: 1;
+      width: 100px;
+    }
+
+    .firstRowSecondItem {
+      background-color: lime;
+      grid-row: 1;
+      width: 100px;
+    }
+
+    .secondRowSpanning2 {
+      background-color: maroon;
+      width: 200px;
+      grid-row: 2;
+    }
+  </style>
+</head>
+<body>
+<div style="height: 200px">
+    <pre>min-content-sized rows - items with relative height</pre>
+    <div class="grid-lanes min-content-rows">
+        <div class="firstRowFirstItem">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="firstRowSecondItem height200Percent">ÉÉÉÉ É ÉÉ</div>
+        <div class="secondRowSpanning2 height25"></div>
+    </div>
+</div>
+<div style="height: 200px">
+    <pre>max-content-sized rows - items with relative height</pre>
+    <div class="grid-lanes max-content-rows">
+        <div class="firstRowFirstItem">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="firstRowSecondItem height200Percent">ÉÉÉÉ É ÉÉ</div>
+        <div class="secondRowSpanning2 height25"></div>
+    </div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-002-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-002-ref.html
new file mode 100644
index 0000000000000..a6910670494b3
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-002-ref.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <style>
+    .inline-grid {
+      display: inline-grid;
+      background-color: grey;
+      position: relative;
+      border: solid;
+      text-orientation: sideways;
+      font: 15px/1 Ahem;
+      align-items: baseline;
+    }
+
+    .columns { grid-template-columns: 100px 100px; }
+    .flex-rows        { grid-template-rows: 1fr; }
+    .max-flex-rows    { grid-template-rows: minmax(0px, 1fr); }
+
+    .height25  { height: 25px; }
+    .height50  { height: 50px; }
+    .height200Percent { height: 200%; }
+
+    .firstRowFirstColumn {
+      background-color: blue;
+      grid-column: 1;
+      grid-row: 1;
+    }
+
+    .firstRowSecondColumn {
+      background-color: lime;
+      grid-column: 2;
+      grid-row: 1;
+    }
+
+    .autoRowAutoColumnSpanning2 {
+      background-color: maroon;
+      grid-column: span 2;
+      grid-row: 2;
+    }
+
+</style>
+</head>
+<body>
+<div style="height: 125px">
+    <pre>flexible-sized rows - items with relative height</pre>
+    <div class="inline-grid columns flex-rows">
+        <div class="firstRowFirstColumn height50">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="firstRowSecondColumn height200Percent">ÉÉÉÉ É ÉÉ</div>
+        <div class="autoRowAutoColumnSpanning2 height25"></div>
+    </div>
+</div>
+<div style="height: 125px">
+    <pre>flex max-function rows - items with relative height</pre>
+    <div class="inline-grid columns max-flex-rows">
+        <div class="firstRowFirstColumn height50">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="firstRowSecondColumn height200Percent">ÉÉÉÉ É ÉÉ</div>
+        <div class="autoRowAutoColumnSpanning2 height25"></div>
+    </div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-002.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-002.html
new file mode 100644
index 0000000000000..66cedbf563053
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-002.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Grid Lanes Test: Self-Baseline alignment and sizing cyclic dependency</title>
+  <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-baseline-alignment">
+  <link rel="match" href="row-grid-lanes-item-baseline-cyclic-dependency-002-ref.html">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <style>
+    .grid-lanes {
+      display: inline-grid-lanes;
+      grid-lanes-direction: row;
+      background-color: grey;
+      position: relative;
+      border: solid;
+      text-orientation: sideways;
+      font: 15px/1 Ahem;
+      align-items: baseline;
+    }
+
+    .flex-rows        { grid-template-rows: 1fr; }
+    .max-flex-rows    { grid-template-rows: minmax(0px, 1fr); }
+
+    .height25  { height: 25px; }
+    .height50  { height: 50px; }
+    .height200Percent { height: 200%; }
+
+    .firstRowFirstItem {
+      background-color: blue;
+      grid-row: 1;
+      width: 100px;
+    }
+
+    .firstRowSecondItem {
+      background-color: lime;
+      grid-row: 1;
+      width: 100px;
+    }
+
+    .secondRowSpanning2 {
+      background-color: maroon;
+      width: 200px;
+      grid-row: 2;
+    }
+  </style>
+</head>
+<body>
+<div style="height: 125px">
+    <pre>flexible-sized rows - items with relative height</pre>
+    <div class="grid-lanes flex-rows">
+        <div class="firstRowFirstItem height50">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="firstRowSecondItem height200Percent">ÉÉÉÉ É ÉÉ</div>
+        <div class="secondRowSpanning2 height25"></div>
+    </div>
+</div>
+<div style="height: 125px">
+    <pre>flex max-function rows - items with relative height</pre>
+    <div class="grid-lanes max-flex-rows">
+        <div class="firstRowFirstItem height50">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="firstRowSecondItem height200Percent">ÉÉÉÉ É ÉÉ</div>
+        <div class="secondRowSpanning2 height25"></div>
+    </div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-003-ref.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-003-ref.html
new file mode 100644
index 0000000000000..2b8531c8481d9
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-003-ref.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <style>
+    .inline-grid {
+      display: inline-grid;
+      background-color: grey;
+      position: relative;
+      border: solid;
+      text-orientation: sideways;
+      font: 15px/1 Ahem;
+      align-items: baseline;
+    }
+
+    .columns { grid-template-columns: 100px 100px; }
+    .fit-content-rows { grid-template-rows: fit-content; }
+
+    .height25  { height: 25px; }
+    .height50  { height: 50px; }
+    .height200Percent { height: 200%; }
+
+    .firstRowFirstColumn {
+      background-color: blue;
+      grid-column: 1;
+      grid-row: 1;
+    }
+
+    .firstRowSecondColumn {
+      background-color: lime;
+      grid-column: 2;
+      grid-row: 1;
+    }
+
+    .autoRowAutoColumnSpanning2 {
+      background-color: maroon;
+      grid-column: span 2;
+      grid-row: 2;
+    }
+  </style>
+</head>
+<body>
+<div style="height: 125px">
+    <pre>auto-sized rows - items with relative height</pre>
+    <div class="inline-grid columns">
+        <div class="firstRowFirstColumn height50">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="firstRowSecondColumn height200Percent">ÉÉÉÉ É ÉÉ</div>
+        <div class="autoRowAutoColumnSpanning2 height25"></div>
+    </div>
+</div>
+<div style="height: 200px">
+    <pre>fit-content-sized rows - items with relative height</pre>
+    <div class="inline-grid columns fit-content-rows">
+        <div class="firstRowFirstColumn">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="firstRowSecondColumn height200Percent">ÉÉÉÉ É ÉÉ</div>
+        <div class="autoRowAutoColumnSpanning2 height25"></div>
+    </div>
+</div>
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-003.html b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-003.html
new file mode 100644
index 0000000000000..577a6ec07dafd
--- /dev/null
+++ b/testing/web-platform/tests/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-003.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Grid Lanes Test: Self-Baseline alignment and sizing cyclic dependency</title>
+  <link rel="author" title="Yanling Wang" href="mailto:yanlingwang@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3/#masonry-baseline-alignment">
+  <link rel="match" href="row-grid-lanes-item-baseline-cyclic-dependency-003-ref.html">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  <style>
+    .grid-lanes {
+      display: inline-grid-lanes;
+      grid-lanes-direction: row;
+      background-color: grey;
+      position: relative;
+      border: solid;
+      text-orientation: sideways;
+      font: 15px/1 Ahem;
+      align-items: baseline;
+    }
+
+    .fit-content-rows { grid-template-rows: fit-content; }
+
+    .height25  { height: 25px; }
+    .height50  { height: 50px; }
+    .height200Percent { height: 200%; }
+
+    .firstRowFirstItem {
+      background-color: blue;
+      grid-row: 1;
+      width: 100px;
+    }
+
+    .firstRowSecondItem {
+      background-color: lime;
+      grid-row: 1;
+      width: 100px;
+    }
+
+    .secondRowSpanning2 {
+      background-color: maroon;
+      width: 200px;
+      grid-row: 2;
+    }
+  </style>
+</head>
+<body>
+<div style="height: 125px">
+    <pre>auto-sized rows - items with relative height</pre>
+    <div class="grid-lanes">
+        <div class="firstRowFirstItem height50">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="firstRowSecondItem height200Percent">ÉÉÉÉ É ÉÉ</div>
+        <div class="secondRowSpanning2 height25"></div>
+    </div>
+</div>
+<div style="height: 200px">
+    <pre>fit-content-sized rows - items with relative height</pre>
+    <div class="grid-lanes fit-content-rows">
+        <div class="firstRowFirstItem">ÉÉ É ÉÉ ÉÉÉÉ É ÉÉ ÉÉÉ ÉÉ É</div>
+        <div class="firstRowSecondItem height200Percent">ÉÉÉÉ É ÉÉ</div>
+        <div class="secondRowSpanning2 height25"></div>
+    </div>
+</div>
+</body>
+</html>

From 534114e8924baee6e947d2454e6eb71414c60862 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Mon, 26 Jan 2026 19:24:23 +0000
Subject: [PATCH 026/116] Bug 2011520 [wpt PR 57260] - Update wpt metadata,
 a=testonly

wpt-pr: 57260
wpt-type: metadata
---
 .../baseline/column-grid-lanes-item-baseline-001.html.ini       | 2 ++
 .../baseline/column-grid-lanes-item-baseline-002.html.ini       | 2 ++
 .../baseline/column-grid-lanes-item-baseline-003.html.ini       | 2 ++
 .../baseline/column-grid-lanes-item-baseline-004a.html.ini      | 2 ++
 .../baseline/column-grid-lanes-item-baseline-004b.html.ini      | 2 ++
 .../baseline/column-grid-lanes-item-baseline-005.html.ini       | 2 ++
 ...lumn-grid-lanes-item-baseline-cyclic-dependency-001.html.ini | 2 ++
 ...lumn-grid-lanes-item-baseline-cyclic-dependency-002.html.ini | 2 ++
 ...lumn-grid-lanes-item-baseline-cyclic-dependency-003.html.ini | 2 ++
 .../column-grid-lanes-item-baseline-synthesized-001.html.ini    | 2 ++
 .../column-grid-lanes-item-baseline-synthesized-002.html.ini    | 2 ++
 .../baseline/row-grid-lanes-item-baseline-001.html.ini          | 2 ++
 .../baseline/row-grid-lanes-item-baseline-002.html.ini          | 2 ++
 .../baseline/row-grid-lanes-item-baseline-003.html.ini          | 2 ++
 .../baseline/row-grid-lanes-item-baseline-004.html.ini          | 2 ++
 .../baseline/row-grid-lanes-item-baseline-005.html.ini          | 2 ++
 .../row-grid-lanes-item-baseline-cyclic-dependency-001.html.ini | 2 ++
 .../row-grid-lanes-item-baseline-cyclic-dependency-002.html.ini | 2 ++
 .../row-grid-lanes-item-baseline-cyclic-dependency-003.html.ini | 2 ++
 19 files changed, 38 insertions(+)
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004a.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004b.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-005.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-005.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-003.html.ini

diff --git a/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-001.html.ini
new file mode 100644
index 0000000000000..e5ceea5010a07
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-001.html.ini
@@ -0,0 +1,2 @@
+[column-grid-lanes-item-baseline-001.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-002.html.ini
new file mode 100644
index 0000000000000..b0998ed693595
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-002.html.ini
@@ -0,0 +1,2 @@
+[column-grid-lanes-item-baseline-002.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-003.html.ini
new file mode 100644
index 0000000000000..9c9d5a3c4845e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-003.html.ini
@@ -0,0 +1,2 @@
+[column-grid-lanes-item-baseline-003.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004a.html.ini b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004a.html.ini
new file mode 100644
index 0000000000000..1c6689d2b9d33
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004a.html.ini
@@ -0,0 +1,2 @@
+[column-grid-lanes-item-baseline-004a.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004b.html.ini b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004b.html.ini
new file mode 100644
index 0000000000000..71560f4417cc6
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-004b.html.ini
@@ -0,0 +1,2 @@
+[column-grid-lanes-item-baseline-004b.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-005.html.ini b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-005.html.ini
new file mode 100644
index 0000000000000..9e252fb8b6750
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-005.html.ini
@@ -0,0 +1,2 @@
+[column-grid-lanes-item-baseline-005.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-001.html.ini
new file mode 100644
index 0000000000000..d630b93662d65
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-001.html.ini
@@ -0,0 +1,2 @@
+[column-grid-lanes-item-baseline-cyclic-dependency-001.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-002.html.ini
new file mode 100644
index 0000000000000..166815f1e1744
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-002.html.ini
@@ -0,0 +1,2 @@
+[column-grid-lanes-item-baseline-cyclic-dependency-002.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-003.html.ini
new file mode 100644
index 0000000000000..120e29bf5ba59
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-cyclic-dependency-003.html.ini
@@ -0,0 +1,2 @@
+[column-grid-lanes-item-baseline-cyclic-dependency-003.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-001.html.ini
new file mode 100644
index 0000000000000..558e5112d511d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-001.html.ini
@@ -0,0 +1,2 @@
+[column-grid-lanes-item-baseline-synthesized-001.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-002.html.ini
new file mode 100644
index 0000000000000..0e85d2a4473ca
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/column-grid-lanes-item-baseline-synthesized-002.html.ini
@@ -0,0 +1,2 @@
+[column-grid-lanes-item-baseline-synthesized-002.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-001.html.ini
new file mode 100644
index 0000000000000..3ebff4e34f48d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-001.html.ini
@@ -0,0 +1,2 @@
+[row-grid-lanes-item-baseline-001.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-002.html.ini
new file mode 100644
index 0000000000000..3f11fae5ce2f6
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-002.html.ini
@@ -0,0 +1,2 @@
+[row-grid-lanes-item-baseline-002.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-003.html.ini
new file mode 100644
index 0000000000000..c57ff693a903c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-003.html.ini
@@ -0,0 +1,2 @@
+[row-grid-lanes-item-baseline-003.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-004.html.ini b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-004.html.ini
new file mode 100644
index 0000000000000..9300ec632786a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-004.html.ini
@@ -0,0 +1,2 @@
+[row-grid-lanes-item-baseline-004.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-005.html.ini b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-005.html.ini
new file mode 100644
index 0000000000000..b7236af14b325
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-005.html.ini
@@ -0,0 +1,2 @@
+[row-grid-lanes-item-baseline-005.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-001.html.ini
new file mode 100644
index 0000000000000..7bbee0de69284
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-001.html.ini
@@ -0,0 +1,2 @@
+[row-grid-lanes-item-baseline-cyclic-dependency-001.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-002.html.ini
new file mode 100644
index 0000000000000..928a8b283bde7
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-002.html.ini
@@ -0,0 +1,2 @@
+[row-grid-lanes-item-baseline-cyclic-dependency-002.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-003.html.ini
new file mode 100644
index 0000000000000..808fbca868c10
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-lanes/tentative/baseline/row-grid-lanes-item-baseline-cyclic-dependency-003.html.ini
@@ -0,0 +1,2 @@
+[row-grid-lanes-item-baseline-cyclic-dependency-003.html]
+  expected: FAIL

From b7bcf4acf6436615aae44ec513e5ede7a960c66c Mon Sep 17 00:00:00 2001
From: Anne van Kesteren <annevk@annevk.nl>
Date: Tue, 27 Jan 2026 16:45:57 +0000
Subject: [PATCH 027/116] Bug 2012335 [wpt PR 57326] - CSP: test that U+000B is
 not treated as whitespace, a=testonly

Automatic update from web-platform-tests
CSP: test that U+000B is not treated as whitespace

--

wpt-commits: f169d441f42da2fd60b668c7aefd02e79c378b26
wpt-pr: 57326
---
 .../generic/only-valid-whitespaces-are-allowed.html          | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/testing/web-platform/tests/content-security-policy/generic/only-valid-whitespaces-are-allowed.html b/testing/web-platform/tests/content-security-policy/generic/only-valid-whitespaces-are-allowed.html
index 9b3636c9feb87..217023a91e450 100644
--- a/testing/web-platform/tests/content-security-policy/generic/only-valid-whitespaces-are-allowed.html
+++ b/testing/web-platform/tests/content-security-policy/generic/only-valid-whitespaces-are-allowed.html
@@ -31,6 +31,11 @@
       // https://github.com/webcompat/web-bugs/issues/18902 has more details about why this particularly relevant
       { "csp": "img-src\u00A0'none';", "expected": true, "name": "U+00A0 NBSP  should not be parsed between directive name and value" },
       { "csp": "img-src http://example.com\u00A0http://example2.com;", "expected": true, "name": "U+00A0 NBSP  should not be parsed inside directive value" },
+
+      // Ensure vertical tab (U+000B) is not considered a valid whitespace
+      // ASCII whitespace does not include vertical tab per https://infra.spec.whatwg.org/#ascii-whitespace
+      { "csp": "img-src\u000B'none';", "expected": true, "name": "U+000B VT    should not be parsed between directive name and value" },
+      { "csp": "img-src http://example.com\u000Bhttp://example2.com;", "expected": true, "name": "U+000B VT    should not be parsed inside directive value" },
     ];
 
     tests.forEach(test => {

From 77cfc5b656534f58df2d8248f7942ab41a9c3104 Mon Sep 17 00:00:00 2001
From: Andrey Kosyakov <caseq@chromium.org>
Date: Tue, 27 Jan 2026 16:46:00 +0000
Subject: [PATCH 028/116] Bug 2012538 [wpt PR 57339] - SuppressDetachCheck() on
 promise resolvers used by Obserable methods, a=testonly

Automatic update from web-platform-tests
SuppressDetachCheck() on promise resolvers used by Obserable methods

Bug: 472771920
Change-Id: If6e6e39c6509658bff767321e2348e573bffb14f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7512714
Reviewed-by: Nate Chapin <japhet@chromium.org>
Commit-Queue: Andrey Kosyakov <caseq@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1574638}

--

wpt-commits: 9eebd5afef864f414548791c6e8a9f840ecc01fc
wpt-pr: 57339
---
 .../tentative/crashtests/observable-gc.any.js | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 testing/web-platform/tests/dom/observable/tentative/crashtests/observable-gc.any.js

diff --git a/testing/web-platform/tests/dom/observable/tentative/crashtests/observable-gc.any.js b/testing/web-platform/tests/dom/observable/tentative/crashtests/observable-gc.any.js
new file mode 100644
index 0000000000000..4402641b8669a
--- /dev/null
+++ b/testing/web-platform/tests/dom/observable/tentative/crashtests/observable-gc.any.js
@@ -0,0 +1,72 @@
+// META: script=/common/gc.js
+// META: title=Regression test for https://crbug.com/472771920
+'use strict';
+
+promise_test(async () => {
+  let observable = new Observable(subscriber => {
+    subscriber.next(1);
+  });
+
+  const promise = observable.toArray();
+  observable = null;
+  await garbageCollect();
+}, "toArray(): does not crash on observable being GCed");
+
+promise_test(async () => {
+  let observable = new Observable(subscriber => {
+    subscriber.next(1);
+  });
+
+  const promise = observable.forEach(() => {});
+  observable = null;
+  await garbageCollect();
+}, "forEach(): does not crash on observable being GCed");
+
+promise_test(async () => {
+  let observable = new Observable(subscriber => {});
+
+  const promise = observable.first();
+  observable = null;
+  await garbageCollect();
+}, "first(): does not crash on observable being GCed");
+
+promise_test(async () => {
+  let observable = new Observable(subscriber => {});
+
+  const promise = observable.last();
+  observable = null;
+  await garbageCollect();
+}, "last(): does not crash on observable being GCed");
+
+promise_test(async () => {
+  let observable = new Observable(subscriber => {});
+
+  const promise = observable.some(value => true);
+  observable = null;
+  await garbageCollect();
+}, "some(): does not crash on observable being GCed");
+
+promise_test(async () => {
+  let observable = new Observable(subscriber => {});
+
+  const promise = observable.every(value => true);
+  observable = null;
+  await garbageCollect();
+}, "every(): does not crash on observable being GCed");
+
+promise_test(async () => {
+  let observable = new Observable(subscriber => {});
+
+  const promise = observable.find(value => true);
+  observable = null;
+  await garbageCollect();
+}, "find(): does not crash on observable being GCed");
+
+promise_test(async () => {
+  let observable = new Observable(subscriber => {});
+
+  const promise = observable.reduce(value => value);
+  observable = null;
+  await garbageCollect();
+}, "reduce(): does not crash on observable being GCed");
+

From 3c981bc0d3c9514cb9608b30f99b5ca055dd698f Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Mon, 26 Jan 2026 19:49:35 +0000
Subject: [PATCH 029/116] Bug 2012538 [wpt PR 57339] - Update wpt metadata,
 a=testonly

wpt-pr: 57339
wpt-type: metadata
---
 .../crashtests/observable-gc.any.js.ini       | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 testing/web-platform/meta/dom/observable/tentative/crashtests/observable-gc.any.js.ini

diff --git a/testing/web-platform/meta/dom/observable/tentative/crashtests/observable-gc.any.js.ini b/testing/web-platform/meta/dom/observable/tentative/crashtests/observable-gc.any.js.ini
new file mode 100644
index 0000000000000..1111f1d3fc564
--- /dev/null
+++ b/testing/web-platform/meta/dom/observable/tentative/crashtests/observable-gc.any.js.ini
@@ -0,0 +1,50 @@
+[observable-gc.any.html]
+  [toArray(): does not crash on observable being GCed]
+    expected: FAIL
+
+  [forEach(): does not crash on observable being GCed]
+    expected: FAIL
+
+  [first(): does not crash on observable being GCed]
+    expected: FAIL
+
+  [last(): does not crash on observable being GCed]
+    expected: FAIL
+
+  [some(): does not crash on observable being GCed]
+    expected: FAIL
+
+  [every(): does not crash on observable being GCed]
+    expected: FAIL
+
+  [find(): does not crash on observable being GCed]
+    expected: FAIL
+
+  [reduce(): does not crash on observable being GCed]
+    expected: FAIL
+
+
+[observable-gc.any.worker.html]
+  [toArray(): does not crash on observable being GCed]
+    expected: FAIL
+
+  [forEach(): does not crash on observable being GCed]
+    expected: FAIL
+
+  [first(): does not crash on observable being GCed]
+    expected: FAIL
+
+  [last(): does not crash on observable being GCed]
+    expected: FAIL
+
+  [some(): does not crash on observable being GCed]
+    expected: FAIL
+
+  [every(): does not crash on observable being GCed]
+    expected: FAIL
+
+  [find(): does not crash on observable being GCed]
+    expected: FAIL
+
+  [reduce(): does not crash on observable being GCed]
+    expected: FAIL

From 5be4aeeb30d9d517eef734c8757a6d6a939f6c4e Mon Sep 17 00:00:00 2001
From: jugglinmike <mike@mikepennisi.com>
Date: Tue, 27 Jan 2026 16:46:06 +0000
Subject: [PATCH 030/116] Bug 2012233 [wpt PR 57323] - Map iframe-related tests
 to web-features, a=testonly

Automatic update from web-platform-tests
Map iframe-related tests to web-features (#57323)

--

wpt-commits: ce7533833901dbb8556ca1aadeb2b257c2eea5f9
wpt-pr: 57323
---
 .../WEB_FEATURES.yml                          |  8 ++++++++
 .../WEB_FEATURES.yml                          |  8 ++++++++
 .../html/browsers/sandboxing/WEB_FEATURES.yml |  9 +++++++++
 .../urls/terminology-0/WEB_FEATURES.yml       |  5 +++++
 .../the-iframe-element/WEB_FEATURES.yml       | 19 +++++++++++++++++++
 .../web-platform/tests/xhr/WEB_FEATURES.yml   |  3 +++
 6 files changed, 52 insertions(+)

diff --git a/testing/web-platform/tests/html/browsers/browsing-the-web/navigating-across-documents/WEB_FEATURES.yml b/testing/web-platform/tests/html/browsers/browsing-the-web/navigating-across-documents/WEB_FEATURES.yml
index ea2cdca87e2a5..5bef18f115ed2 100644
--- a/testing/web-platform/tests/html/browsers/browsing-the-web/navigating-across-documents/WEB_FEATURES.yml
+++ b/testing/web-platform/tests/html/browsers/browsing-the-web/navigating-across-documents/WEB_FEATURES.yml
@@ -3,3 +3,11 @@ features:
   files:
   - navigation-unload-data-url.window.js
   - redirect-to-data.html
+- name: iframe-srcdoc
+  files:
+  - about-srcdoc-navigation-blocked.window.js
+  - grandparent_location_aboutsrcdoc.sub.window.js
+  - grandparent_session_aboutsrcdoc.sub.window.js
+- name: iframe
+  files:
+  - empty-iframe-load-event.html
diff --git a/testing/web-platform/tests/html/browsers/browsing-the-web/remote-context-helper-tests/WEB_FEATURES.yml b/testing/web-platform/tests/html/browsers/browsing-the-web/remote-context-helper-tests/WEB_FEATURES.yml
index 43bc6fc8a6241..dba510df10cfc 100644
--- a/testing/web-platform/tests/html/browsers/browsing-the-web/remote-context-helper-tests/WEB_FEATURES.yml
+++ b/testing/web-platform/tests/html/browsers/browsing-the-web/remote-context-helper-tests/WEB_FEATURES.yml
@@ -2,3 +2,11 @@ features:
 - name: data-urls
   files:
   - addWindow-urlType-data.window.js
+- name: iframe-srcdoc
+  files:
+  - addIframe-srcdoc-startOn.window.js
+  - addIframe-srcdoc.window.js
+- name: iframe
+  files:
+  - addIframe-urlType.window.js
+  - addIframe.window.js
diff --git a/testing/web-platform/tests/html/browsers/sandboxing/WEB_FEATURES.yml b/testing/web-platform/tests/html/browsers/sandboxing/WEB_FEATURES.yml
index be786b31f7fb2..bb8f1da2bb304 100644
--- a/testing/web-platform/tests/html/browsers/sandboxing/WEB_FEATURES.yml
+++ b/testing/web-platform/tests/html/browsers/sandboxing/WEB_FEATURES.yml
@@ -3,3 +3,12 @@ features:
   files:
   - sandbox-inherited-from-required-csp.html
   - window-open-blank-from-different-initiator.html
+- name: iframe-sandbox
+  files:
+  - popup-from-initial-empty-sandboxed-document.window.js
+  - sandbox-*
+  - "!sandbox-inherited-from-initiator-response.html"
+  - "!sandbox-inherited-from-required-csp.html"
+  - "!sandbox-navigation-timing-iframe.tentative.html"
+  - "!sandbox-navigation-timing.tentative.html"
+  - "!sandbox-new-execution-context-iframe.html"
diff --git a/testing/web-platform/tests/html/infrastructure/urls/terminology-0/WEB_FEATURES.yml b/testing/web-platform/tests/html/infrastructure/urls/terminology-0/WEB_FEATURES.yml
index 906718b80359f..98683158c596c 100644
--- a/testing/web-platform/tests/html/infrastructure/urls/terminology-0/WEB_FEATURES.yml
+++ b/testing/web-platform/tests/html/infrastructure/urls/terminology-0/WEB_FEATURES.yml
@@ -3,3 +3,8 @@ features:
   files:
   - document-base-url.html
   - multiple-base.sub.html
+- name: iframe-srcdoc
+  files:
+  - document-base-url-about-srcdoc.https.window.js
+  - document-base-url-changes-about-srcdoc.https.window.js
+  - nontraditional-about-srcdoc.html
diff --git a/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/WEB_FEATURES.yml b/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/WEB_FEATURES.yml
index 470b91ca71102..7cae7ee081d34 100644
--- a/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/WEB_FEATURES.yml
+++ b/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/WEB_FEATURES.yml
@@ -9,3 +9,22 @@ features:
 - name: hashchange
   files:
   - srcdoc_change_hash.html
+- name: iframe-srcdoc
+  files:
+  - srcdoc*
+  - "!srcdoc_change_hash.html"
+- name: iframe-sandbox
+  files:
+  - iframe_sandbox_*
+  - sandbox-*
+  - sandbox_*
+- name: iframe
+  files:
+  - "*"
+  - "!iframe-loading-lazy*"
+  - "!iframe-loading-lazy-base-url*"
+  - "!iframe-with-base.html"
+  - "!srcdoc*"
+  - "!iframe_sandbox_*"
+  - "!sandbox-*"
+  - "!sandbox_*"
diff --git a/testing/web-platform/tests/xhr/WEB_FEATURES.yml b/testing/web-platform/tests/xhr/WEB_FEATURES.yml
index eb73be520a0f9..8333253b6ac50 100644
--- a/testing/web-platform/tests/xhr/WEB_FEATURES.yml
+++ b/testing/web-platform/tests/xhr/WEB_FEATURES.yml
@@ -25,3 +25,6 @@ features:
 - name: http2
   files:
   - status.h2.window.js
+- name: iframe-sandbox
+  files:
+  - access-control-sandboxed-iframe-*

From 98c4d9b76a9e3d5fa2ef7fc4f8be1e30eb954683 Mon Sep 17 00:00:00 2001
From: Xiaochen Zhou <xiaochenzh@chromium.org>
Date: Tue, 27 Jan 2026 16:46:22 +0000
Subject: [PATCH 031/116] Bug 2012622 [wpt PR 57345] - [Connection-Allowlist]
 Add wpt for link rel prefetch, a=testonly

Automatic update from web-platform-tests
[Connection-Allowlist] Add wpt for link rel prefetch

Test procedure:
1. A pretech request stores a value on the server. It subjects to the
connection allowlist.
2. A fetch request checks whether the value was set by the prefetch
request. This request is exempted from the connection allowlist by
url pattern `*://*:*/*\\?*&ignore-allowlist=true*`.

Bug: 447954811
Change-Id: Ia4058f08b87381f870066179dc2289a055e9f05f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7505234
Commit-Queue: Xiaochen Zhou <xiaochenzh@chromium.org>
Reviewed-by: Andrew Verge <averge@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1574820}

--

wpt-commits: 16a84e425015b51895129aebc5a510cb9efcad89
wpt-pr: 57345
---
 .../tentative/link_rel_prefetch.sub.window.js | 62 +++++++++++++++++++
 ...ink_rel_prefetch.sub.window.js.sub.headers |  1 +
 .../tentative/resources/key-value-store.py    | 31 ++++++++++
 .../tentative/resources/utils.js              | 38 ++++++++++++
 4 files changed, 132 insertions(+)
 create mode 100644 testing/web-platform/tests/connection-allowlist/tentative/link_rel_prefetch.sub.window.js
 create mode 100644 testing/web-platform/tests/connection-allowlist/tentative/link_rel_prefetch.sub.window.js.sub.headers
 create mode 100644 testing/web-platform/tests/connection-allowlist/tentative/resources/key-value-store.py
 create mode 100644 testing/web-platform/tests/connection-allowlist/tentative/resources/utils.js

diff --git a/testing/web-platform/tests/connection-allowlist/tentative/link_rel_prefetch.sub.window.js b/testing/web-platform/tests/connection-allowlist/tentative/link_rel_prefetch.sub.window.js
new file mode 100644
index 0000000000000..6bd4ad5a79fc6
--- /dev/null
+++ b/testing/web-platform/tests/connection-allowlist/tentative/link_rel_prefetch.sub.window.js
@@ -0,0 +1,62 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=resources/utils.js
+// META: timeout=long
+
+const port = get_host_info().HTTP_PORT_ELIDED;
+const SUCCESS = true;
+const FAILURE = false;
+
+function prefetch_test(origin, expectation) {
+  promise_test(
+      async t => {
+        const key = token();
+        const value = 'hello';
+        const params = new URLSearchParams();
+        params.set('key', key);
+        params.set('value', value);
+
+        const link = document.createElement('link');
+        link.rel = 'prefetch';
+        link.href = `${origin}${STORE_URL}?${params.toString()}`;
+        document.head.appendChild(link);
+        t.add_cleanup(() => link.remove());
+
+        if (expectation === SUCCESS) {
+          const result = await nextValueFromServer(key);
+          assert_equals(result, value);
+        } else {
+          const result = await Promise.race([
+            new Promise(r => t.step_timeout(r, 1000)), nextValueFromServer(key)
+          ]);
+          assert_true(typeof result === 'undefined');
+        }
+      },
+      `Prefetch to ${origin} ${
+          expectation === SUCCESS ? 'succeeds' : 'fails'}.`);
+}
+
+const test_cases = [
+  // Page loads originate from `http://hosts[][]`; prefetching this origin
+  // succeeds, while subdomains fail.
+  {origin: 'http://{{hosts[][]}}' + port, expectation: SUCCESS},
+  {origin: 'http://{{hosts[][www]}}' + port, expectation: FAILURE},
+  {origin: 'http://{{hosts[][www1]}}' + port, expectation: FAILURE},
+  {origin: 'http://{{hosts[][www2]}}' + port, expectation: FAILURE},
+  {origin: 'http://{{hosts[][天気の良い日]}}' + port, expectation: FAILURE},
+  {origin: 'http://{{hosts[][élève]}}' + port, expectation: FAILURE},
+
+  // The pattern we've specified in the header ("*://*.hosts[alt]:*/") will
+  // match any subdomain of `hosts[alt]` (though not, as it turns out,
+  // `hosts[alt]` itself.
+  {origin: 'http://{{hosts[alt][]}}' + port, expectation: FAILURE},
+  {origin: 'http://{{hosts[alt][www]}}' + port, expectation: SUCCESS},
+  {origin: 'http://{{hosts[alt][www1]}}' + port, expectation: SUCCESS},
+  {origin: 'http://{{hosts[alt][www2]}}' + port, expectation: SUCCESS},
+  {origin: 'http://{{hosts[alt][天気の良い日]}}' + port, expectation: SUCCESS},
+  {origin: 'http://{{hosts[alt][élève]}}' + port, expectation: SUCCESS},
+];
+
+for (let i = 0; i < test_cases.length; i++) {
+  prefetch_test(test_cases[i].origin, test_cases[i].expectation);
+}
diff --git a/testing/web-platform/tests/connection-allowlist/tentative/link_rel_prefetch.sub.window.js.sub.headers b/testing/web-platform/tests/connection-allowlist/tentative/link_rel_prefetch.sub.window.js.sub.headers
new file mode 100644
index 0000000000000..05a5826807caa
--- /dev/null
+++ b/testing/web-platform/tests/connection-allowlist/tentative/link_rel_prefetch.sub.window.js.sub.headers
@@ -0,0 +1 @@
+Connection-Allowlist: (response-origin "*://:subdomain.{{hosts[alt][]}}:*" "*://*:*/*\\?*&ignore-allowlist=true*")
\ No newline at end of file
diff --git a/testing/web-platform/tests/connection-allowlist/tentative/resources/key-value-store.py b/testing/web-platform/tests/connection-allowlist/tentative/resources/key-value-store.py
new file mode 100644
index 0000000000000..9946855547db0
--- /dev/null
+++ b/testing/web-platform/tests/connection-allowlist/tentative/resources/key-value-store.py
@@ -0,0 +1,31 @@
+# Copyright 2026 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""Key-Value store server.
+
+The request takes "key=" and "value=" URL parameters. The key should be a UUID
+generated by token().
+
+- When only the "key=" is specified, serves a 200 response whose body contains
+  the stored value specified by the key. If the stored value doesn't exist,
+  serves a 200 response with an empty body.
+- When both the "key=" and "value=" are specified, stores the pair and serves
+  a 200 response without body.
+"""
+
+
+def main(request, response):
+    key = request.GET.get(b"key")
+    value = request.GET.get(b"value", None)
+
+    # Store the value.
+    if value:
+        request.server.stash.put(key, value)
+        return (200, [], b"")
+
+    # Get the value.
+    data = request.server.stash.take(key)
+    if not data:
+        return (200, [], b"")
+    return (200, [], data)
\ No newline at end of file
diff --git a/testing/web-platform/tests/connection-allowlist/tentative/resources/utils.js b/testing/web-platform/tests/connection-allowlist/tentative/resources/utils.js
new file mode 100644
index 0000000000000..7d7f02f007df3
--- /dev/null
+++ b/testing/web-platform/tests/connection-allowlist/tentative/resources/utils.js
@@ -0,0 +1,38 @@
+const STORE_URL =
+    '/connection-allowlist/tentative/resources/key-value-store.py';
+// URL with this query is exempted from connection allowlist.
+const IGNORE_ALLOWLIST = 'ignore-allowlist=true';
+
+// Reads the value specified by `key` from the key-value store on the server.
+async function readValueFromServer(key) {
+  const serverUrl = `${STORE_URL}?${IGNORE_ALLOWLIST}&key=${key}`;
+  const response = await fetch(serverUrl);
+  if (!response.ok)
+    throw new Error('An error happened in the server');
+  const value = await response.text();
+
+  // The value is not stored in the server.
+  if (value === '')
+    return {status: false};
+
+  return {status: true, value: value};
+}
+
+// Convenience wrapper around the above getter that will wait until a value is
+// available on the server.
+async function nextValueFromServer(key) {
+  // Resolve the key if it is a Promise.
+  key = await key;
+
+  while (true) {
+    // Fetches the test result from the server.
+    const {status, value} = await readValueFromServer(key);
+    if (!status) {
+      // The test result has not been stored yet. Retry after a while.
+      await new Promise(resolve => step_timeout(resolve, 100));
+      continue;
+    }
+
+    return value;
+  }
+}

From c6640a3427dd888d1382d22c123121bbd4c9fdbb Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Tue, 27 Jan 2026 09:12:42 +0000
Subject: [PATCH 032/116] Bug 2012622 [wpt PR 57345] - Update wpt metadata,
 a=testonly

wpt-pr: 57345
wpt-type: metadata
---
 .../link_rel_prefetch.sub.window.js.ini        | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 testing/web-platform/meta/connection-allowlist/tentative/link_rel_prefetch.sub.window.js.ini

diff --git a/testing/web-platform/meta/connection-allowlist/tentative/link_rel_prefetch.sub.window.js.ini b/testing/web-platform/meta/connection-allowlist/tentative/link_rel_prefetch.sub.window.js.ini
new file mode 100644
index 0000000000000..6171dbbb2b35b
--- /dev/null
+++ b/testing/web-platform/meta/connection-allowlist/tentative/link_rel_prefetch.sub.window.js.ini
@@ -0,0 +1,18 @@
+[link_rel_prefetch.sub.window.html]
+  [Prefetch to http://www.web-platform.test:8000 fails.]
+    expected: FAIL
+
+  [Prefetch to http://www1.web-platform.test:8000 fails.]
+    expected: FAIL
+
+  [Prefetch to http://www2.web-platform.test:8000 fails.]
+    expected: FAIL
+
+  [Prefetch to http://xn--n8j6ds53lwwkrqhv28a.web-platform.test:8000 fails.]
+    expected: FAIL
+
+  [Prefetch to http://xn--lve-6lad.web-platform.test:8000 fails.]
+    expected: FAIL
+
+  [Prefetch to http://not-web-platform.test:8000 fails.]
+    expected: FAIL

From 681f25341fd57d3a9ff96da2f93430f81f550caa Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Tue, 27 Jan 2026 16:46:28 +0000
Subject: [PATCH 033/116] Bug 2012579 [wpt PR 57340] - Use Ahem font in WPT
 old-content-is-inline.html, a=testonly

Automatic update from web-platform-tests
Use Ahem font in WPT old-content-is-inline.html (#57340)

This testcase is only valid (i.e. it only actually matches its reference case)
if the text doesn't linewrap.  So it needs to specify a specific font in order
to have some guarantees that linewrapping won't happen.

Hence, this patch switches to the Ahem font, and reduces the length of the
strings so that they're short enough to fit on a single line in that font.

This patch also removes the styling that was making the text transparent, and
makes the text blue instead; with the Ahem font, we're not at as much risk of
fuzzy failures from subtle antialiasing differences.

Fixes https://github.com/web-platform-tests/interop/issues/1250
--

wpt-commits: fadfaa1a530fbbc35dddef0d2651f89a8a24a23d
wpt-pr: 57340
---
 .../old-content-is-inline-ref.html            | 21 ++++++++++++-------
 .../old-content-is-inline.html                | 19 ++++++++++-------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/testing/web-platform/tests/css/css-view-transitions/old-content-is-inline-ref.html b/testing/web-platform/tests/css/css-view-transitions/old-content-is-inline-ref.html
index 5459d1d482c30..6d7cc53f79b5c 100644
--- a/testing/web-platform/tests/css/css-view-transitions/old-content-is-inline-ref.html
+++ b/testing/web-platform/tests/css/css-view-transitions/old-content-is-inline-ref.html
@@ -2,9 +2,14 @@
 <title>View transitions: Old content is an inline element (ref)</title>
 <link rel="help" href="https://www.w3.org/TR/css-view-transitions-1/">
 <link rel="author" href="mailto:bokan@chromium.org">
+<link rel="stylesheet" href="/fonts/ahem.css">
 
 <style>
-:root { background-color: rebeccapurple; }
+:root {
+  background-color: rebeccapurple;
+  font: 20px/1 Ahem;
+}
+
 body { margin: 0; }
 
 .container {
@@ -31,7 +36,7 @@
 
 .inline {
   background-color: limegreen;
-  color: rgba(0, 0, 0, 0);
+  color: blue;
 }
 
 .transitioned .inline {
@@ -49,20 +54,20 @@
 </style>
 
 <div class="container start">
-  <span>FILLER FILLER</span>
-  <span id="start" class="inline">INLINE INLINE INLINE INLINE</span>
+  <span>FILL FILL</span>
+  <span id="start" class="inline">INL INL</span>
   <p>START STATE</p>
 </div>
 
 <div class="container end transitioned">
-  <span>FILLER FILLER</span>
-  <span id="end" class="inline">INLINE INLINE INLINE INLINE</span>
+  <span>FILL FILL</span>
+  <span id="end" class="inline">INL INL</span>
   <p>END STATE</p>
 </div>
 
 <div id="dummyEndInline">
-  <span style="opacity:0">FILLER FILLER</span>
-  <span class="inline">INLINE INLINE INLINE INLINE</span>
+  <span style="opacity:0">FILL FILL</span>
+  <span class="inline">INL INL</span>
 </div>
 <script>
   let endWidth = document.getElementById('end').getBoundingClientRect().width;
diff --git a/testing/web-platform/tests/css/css-view-transitions/old-content-is-inline.html b/testing/web-platform/tests/css/css-view-transitions/old-content-is-inline.html
index 3333a07a02963..71189ad0a0464 100644
--- a/testing/web-platform/tests/css/css-view-transitions/old-content-is-inline.html
+++ b/testing/web-platform/tests/css/css-view-transitions/old-content-is-inline.html
@@ -4,11 +4,15 @@
 <link rel="help" href="https://www.w3.org/TR/css-view-transitions-1/">
 <link rel="author" href="mailto:bokan@chromium.org">
 <link rel="match" href="old-content-is-inline-ref.html">
-<meta name="fuzzy" content="maxDifference=0-255; totalPixels=0-500">
+<link rel="stylesheet" href="/fonts/ahem.css">
 <script src="/common/reftest-wait.js"></script>
 
 <style>
-body { margin : 0; }
+body {
+  margin : 0;
+  font: 20px/1 Ahem;
+}
+
 .container {
   position: absolute;
   left: 100px;
@@ -35,8 +39,7 @@
 
 .inline {
   background-color: limegreen;
-  /* allow small pixel diff in text */
-  color: rgba(0, 0, 0, 0);
+  color: blue;
 }
 
 .start .inline {
@@ -105,8 +108,8 @@
 starting position.
 -->
 <div class="container start">
-  <span>FILLER FILLER</span>
-  <span id="start" class="inline">INLINE INLINE INLINE INLINE</span>
+  <span>FILL FILL</span>
+  <span id="start" class="inline">INL INL</span>
   <p>START STATE</p>
 </div>
 
@@ -115,8 +118,8 @@
 ending position.
 -->
 <div class="container end">
-  <span>FILLER FILLER</span>
-  <span id="end" class="inline">INLINE INLINE INLINE INLINE</span>
+  <span>FILL FILL</span>
+  <span id="end" class="inline">INL INL</span>
   <p>END STATE</p>
 </div>
 

From 62714ad722cc9f9ee7ac45d5a0b0230f5ae03b69 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Tue, 27 Jan 2026 00:47:38 +0000
Subject: [PATCH 034/116] Bug 2012579 [wpt PR 57340] - Update wpt metadata,
 a=testonly

wpt-pr: 57340
wpt-type: metadata
---
 .../css/css-view-transitions/old-content-is-inline.html.ini     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/testing/web-platform/meta/css/css-view-transitions/old-content-is-inline.html.ini b/testing/web-platform/meta/css/css-view-transitions/old-content-is-inline.html.ini
index 9a2a428031149..c323ebaa807e3 100644
--- a/testing/web-platform/meta/css/css-view-transitions/old-content-is-inline.html.ini
+++ b/testing/web-platform/meta/css/css-view-transitions/old-content-is-inline.html.ini
@@ -1,4 +1,2 @@
 [old-content-is-inline.html]
   bug: Fuzz
-  expected:
-    if os == "win": FAIL

From 0570ebcc6baed33499aedef8b9350fd9f79c2179 Mon Sep 17 00:00:00 2001
From: Jayson Chen <jaysonchen@microsoft.com>
Date: Tue, 27 Jan 2026 16:46:34 +0000
Subject: [PATCH 035/116] Bug 2010918 [wpt PR 57213] - [scoped-registry] Null
 registry element should get registry on adopt instead of insert, a=testonly

Automatic update from web-platform-tests
[scoped-registry] Null registry element should get registry on adopt
instead of insert

It was discussed over TPAC and outlined in
https://github.com/whatwg/dom/pull/1423 that we want to set registry on
null registry element during adoption instead of insertion of a node.

Bug: 448853877
Change-Id: I63b8a7bcef98ead66bd1375c9b1df69d9b9bd597
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7078864
Reviewed-by: Joey Arhar <jarhar@chromium.org>
Reviewed-by: Mason Freed <masonf@chromium.org>
Commit-Queue: Jayson Chen <jaysonchen@microsoft.com>
Cr-Commit-Position: refs/heads/main@{#1574942}

--

wpt-commits: 5b0c22e0813ff10a654adf6148cd57a66d50823e
wpt-pr: 57213
---
 .../registries/element-mutation.html          | 78 ++++++++++---------
 1 file changed, 42 insertions(+), 36 deletions(-)

diff --git a/testing/web-platform/tests/custom-elements/registries/element-mutation.html b/testing/web-platform/tests/custom-elements/registries/element-mutation.html
index 817965d260a8a..dd292b4a75ee2 100644
--- a/testing/web-platform/tests/custom-elements/registries/element-mutation.html
+++ b/testing/web-platform/tests/custom-elements/registries/element-mutation.html
@@ -31,49 +31,55 @@
 
 <script>
 
-test(() => {
-    const registry = new CustomElementRegistry;
+function runTests(mutation, mutationName) {
+    test(() => {
+        const registry = new CustomElementRegistry;
 
-    const element = document.createElement('new-element');
-    assert_equals(element.customElementRegistry, window.customElements);
+        const element = document.createElement('new-element');
+        assert_equals(element.customElementRegistry, window.customElements);
 
-    document.body.appendChild(element);
-    const shadow = document.createElement('div').attachShadow({mode: 'open', customElementRegistry: registry})
-    shadow.appendChild(element)
-    assert_not_equals(element.customElementRegistry, registry);
+        mutation(document.body, element);
+        const shadow = document.createElement('div').attachShadow({mode: 'open', customElementRegistry: registry})
+        mutation(shadow, element);
+        assert_not_equals(element.customElementRegistry, registry);
 
-    document.body.appendChild(element)
-    assert_equals(element.customElementRegistry, window.customElements);
-}, "An element with global registry should not change its registry when moved into a shadow tree with scoped registry.")
+        mutation(document.body, element);
+        assert_equals(element.customElementRegistry, window.customElements);
+    }, "An element with global registry should not change its registry when run " + mutationName + " into a shadow tree with scoped registry.")
 
-test(() => {
-    const clone = host.cloneNode(true);
-    const shadowRoot1 = clone.querySelector('#shadow-host-1').shadowRoot;
-    const element = shadowRoot1.querySelector('#shadow-host-1-child');
+    test(() => {
+        const clone = host.cloneNode(true);
+        const shadowRoot1 = clone.querySelector('#shadow-host-1').shadowRoot;
+        const element = shadowRoot1.querySelector('#shadow-host-1-child');
 
-    const registry1 = new CustomElementRegistry;
-    registry1.initialize(shadowRoot1);
-    assert_equals(element.customElementRegistry, registry1);
+        const registry1 = new CustomElementRegistry;
+        registry1.initialize(shadowRoot1);
+        assert_equals(element.customElementRegistry, registry1);
 
-    document.querySelector('#host').appendChild(element);
-    assert_equals(element.customElementRegistry, registry1);
-}, "An element with scoped registry should not change its registry when moved out of the shadow tree.")
+        mutation(document.querySelector('#host'), element);
+        assert_equals(element.customElementRegistry, registry1);
+    }, "An element with scoped registry should not change its registry when run " + mutationName + " out of the shadow tree.")
 
-test(() => {
-    const clone = host.cloneNode(true);
-    const shadowRoot1 = clone.querySelector('#shadow-host-1').shadowRoot;
-    const shadowRoot2 = clone.querySelector('#shadow-host-2').shadowRoot;
-    const element = shadowRoot1.querySelector('#shadow-host-1-child');
-
-    const registry1 = new CustomElementRegistry;
-    const registry2 = new CustomElementRegistry;
-    registry1.initialize(shadowRoot1);
-    registry2.initialize(shadowRoot2);
-    assert_equals(element.customElementRegistry, registry1);
-
-    shadowRoot2.appendChild(element);
-    assert_equals(element.customElementRegistry, registry1);
-}, "An element with scoped registry should not change its registry when moved into another shadow tree with different scoped registry.")
+    test(() => {
+        const clone = host.cloneNode(true);
+        const shadowRoot1 = clone.querySelector('#shadow-host-1').shadowRoot;
+        const shadowRoot2 = clone.querySelector('#shadow-host-2').shadowRoot;
+        const element = shadowRoot1.querySelector('#shadow-host-1-child');
+
+        const registry1 = new CustomElementRegistry;
+        const registry2 = new CustomElementRegistry;
+        registry1.initialize(shadowRoot1);
+        registry2.initialize(shadowRoot2);
+        assert_equals(element.customElementRegistry, registry1);
+
+        mutation(shadowRoot2, element);
+        assert_equals(element.customElementRegistry, registry1);
+    }, "An element with scoped registry should not change its registry when run " + mutationName + " into another shadow tree with different scoped registry.")
+};
+
+runTests(function (parent, child) { parent.append(child); }, "append");
+runTests(function (parent, child) { parent.appendChild(child); }, "appendChild");
+runTests(function (parent, child) { parent.prepend(child); }, "prepend");
 
 test(() => {
     customElements.define('x-foo', class extends HTMLElement {});

From 77cb7a7a3bae8d952cded3d340e74ae0920e9a54 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Tue, 27 Jan 2026 05:11:52 +0000
Subject: [PATCH 036/116] Bug 2010918 [wpt PR 57213] - Update wpt metadata,
 a=testonly

wpt-pr: 57213
wpt-type: metadata
---
 .../registries/element-mutation.html.ini      | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/testing/web-platform/meta/custom-elements/registries/element-mutation.html.ini b/testing/web-platform/meta/custom-elements/registries/element-mutation.html.ini
index e41633e83635d..1d9cd3b315811 100644
--- a/testing/web-platform/meta/custom-elements/registries/element-mutation.html.ini
+++ b/testing/web-platform/meta/custom-elements/registries/element-mutation.html.ini
@@ -10,3 +10,30 @@
 
   [Declarative shadow DOM with shadowrootcustomelementregistry attribute without registry initialized should remain null registry after adoption.]
     expected: FAIL
+
+  [An element with global registry should not change its registry when run append into a shadow tree with scoped registry.]
+    expected: FAIL
+
+  [An element with scoped registry should not change its registry when run append out of the shadow tree.]
+    expected: FAIL
+
+  [An element with scoped registry should not change its registry when run append into another shadow tree with different scoped registry.]
+    expected: FAIL
+
+  [An element with global registry should not change its registry when run appendChild into a shadow tree with scoped registry.]
+    expected: FAIL
+
+  [An element with scoped registry should not change its registry when run appendChild out of the shadow tree.]
+    expected: FAIL
+
+  [An element with scoped registry should not change its registry when run appendChild into another shadow tree with different scoped registry.]
+    expected: FAIL
+
+  [An element with global registry should not change its registry when run prepend into a shadow tree with scoped registry.]
+    expected: FAIL
+
+  [An element with scoped registry should not change its registry when run prepend out of the shadow tree.]
+    expected: FAIL
+
+  [An element with scoped registry should not change its registry when run prepend into another shadow tree with different scoped registry.]
+    expected: FAIL

From 5fe2bd5866a564629ec5f9df1ab1ead26d4f711c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= <canaltinova@gmail.com>
Date: Tue, 27 Jan 2026 16:46:40 +0000
Subject: [PATCH 037/116] Bug 2012174 [wpt PR 57314] - Add 2ms overshoot to
 mainThreadBusy to account for timer precision rounding, a=testonly

Automatic update from web-platform-tests
Add 2ms overshoot to mainThreadBusy to account for timer precision rounding (#57314)

Fixes https://github.com/web-platform-tests/interop/issues/1247

Firefox rounds performance.now() to 1ms for privacy protection against
timing attacks (e.g., Spectre), which can cause the busy-wait loop to exit
up to 1ms early when timestamps round unfavorably. Additionally, Firefox
introduces "jitter" randomness to web-exposed timestamps as an
anti-fingerprinting protection, which may make performance.now() lie by
up to 1ms (while still increasing monotonically).

Adding 2ms ensures the loop blocks for at least the requested amount of
time, accounting for both forms of timer imprecision (up to 1ms each).

This fixes intermittent timeouts in event-timing/duration-with-target-low.html
and other tests that rely on mainThreadBusy.
--

wpt-commits: df7bad7e1d602fbc1f05e32e3151f1b2dd9c1c26
wpt-pr: 57314
---
 .../event-timing/resources/event-timing-test-utils.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/testing/web-platform/tests/event-timing/resources/event-timing-test-utils.js b/testing/web-platform/tests/event-timing/resources/event-timing-test-utils.js
index b222bba2fb3ba..e63ea7e7c6aba 100644
--- a/testing/web-platform/tests/event-timing/resources/event-timing-test-utils.js
+++ b/testing/web-platform/tests/event-timing/resources/event-timing-test-utils.js
@@ -1,5 +1,14 @@
 function mainThreadBusy(ms) {
-  const target = performance.now() + ms;
+  // Add 2ms to ensure we block for *at least* the requested amount of time,
+  // even in the face of two forms of timer imprecision:
+  //
+  // (1) Firefox rounds performance.now() to 1ms for privacy protection against
+  // timing attacks (e.g., Spectre), which can cause the loop to exit up to 1ms
+  // early when timestamps round unfavorably.
+  // (2) Firefox also introduces "jitter" randomness to web-exposed timestamps,
+  // an anti-fingerprinting protection that may make performance.now() lie by
+  // up to 1ms (while still increasing monotonically).
+  const target = performance.now() + ms + 2;
   while (performance.now() < target);
 }
 

From 3fff79f5518fbbbab2e6f72981c1c5a69a3f42a0 Mon Sep 17 00:00:00 2001
From: Virali Purbey <viralipurbey@microsoft.com>
Date: Tue, 27 Jan 2026 16:46:43 +0000
Subject: [PATCH 038/116] Bug 2012649 [wpt PR 57353] - [SVG] Support `path`
 attribute on <textPath> element., a=testonly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Automatic update from web-platform-tests
[SVG] Support `path` attribute on <textPath> element.

This change adds support for specifying a `path` attribute directly
on the element.

With this addition, <textPath> may resolve its geometry from either
`href`, `path`, or both:

1. If both are present, the `path` attribute takes precedence over
`href`.
2. If only `path` is present and it is valid, the inline path definition
is used.
3. If only `href` is present, or if `path` is invalid, the referenced
path to `href` is used.

This CL implements the resolution logic and ensures the correct
precedence when both attributes are specified.

Bug: 374010056
Change-Id: I04b2416765e13fdf107876a3939df6040707b8a2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7367700
Commit-Queue: Virali Purbey <viralipurbey@microsoft.com>
Reviewed-by: Divyansh Mangal <dmangal@microsoft.com>
Reviewed-by: Fredrik Söderquist <fs@opera.com>
Cr-Commit-Position: refs/heads/main@{#1574995}

--

wpt-commits: 1a4b666571909861db79005f3e8856bcb2fb5ec7
wpt-pr: 57353
---
 ...textpath-path-attr-invalid-path-fallback.svg | 17 +++++++++++++++++
 .../textpath-path-attr-precedence-over-href.svg | 16 ++++++++++++++++
 .../text/reftests/textpath-path-attr-ref.svg    | 10 ++++++++++
 .../svg/text/reftests/textpath-path-attr.svg    | 13 +++++++++++++
 4 files changed, 56 insertions(+)
 create mode 100644 testing/web-platform/tests/svg/text/reftests/textpath-path-attr-invalid-path-fallback.svg
 create mode 100644 testing/web-platform/tests/svg/text/reftests/textpath-path-attr-precedence-over-href.svg
 create mode 100644 testing/web-platform/tests/svg/text/reftests/textpath-path-attr-ref.svg
 create mode 100644 testing/web-platform/tests/svg/text/reftests/textpath-path-attr.svg

diff --git a/testing/web-platform/tests/svg/text/reftests/textpath-path-attr-invalid-path-fallback.svg b/testing/web-platform/tests/svg/text/reftests/textpath-path-attr-invalid-path-fallback.svg
new file mode 100644
index 0000000000000..957692547ef22
--- /dev/null
+++ b/testing/web-platform/tests/svg/text/reftests/textpath-path-attr-invalid-path-fallback.svg
@@ -0,0 +1,17 @@
+<svg width="400" height="200" xmlns="http://www.w3.org/2000/svg" xmlns:html="http://www.w3.org/1999/xhtml">
+ <title>Invalid 'path' attribute should fallback to href</title>
+  <metadata>
+    <html:link rel="author" title="Virali Purbey" href="mailto:viralipurbey@microsoft.com"/>
+    <html:link rel="help" href="https://www.w3.org/TR/SVG2/text.html#TextPathElementPathAttribute"/>
+    <html:link rel="match" href="textpath-path-attr-ref.svg"/>
+  </metadata>
+  <defs>
+    <path id="curve" d="M 10 50 Q 100 10 200 50 T 390 50"/>
+  </defs>
+  <text x="10" y="50" font-size="20" fill="black">
+    <!-- Invalid path data should fallback to href -->
+    <textPath href="#curve" path="Invalid path">
+      Text along a quadratic curve
+    </textPath>
+  </text>
+</svg>
diff --git a/testing/web-platform/tests/svg/text/reftests/textpath-path-attr-precedence-over-href.svg b/testing/web-platform/tests/svg/text/reftests/textpath-path-attr-precedence-over-href.svg
new file mode 100644
index 0000000000000..c34e7d48dd428
--- /dev/null
+++ b/testing/web-platform/tests/svg/text/reftests/textpath-path-attr-precedence-over-href.svg
@@ -0,0 +1,16 @@
+<svg width="400" height="200" xmlns="http://www.w3.org/2000/svg" xmlns:html="http://www.w3.org/1999/xhtml">
+ <title>Checking `path` precedence over `href` on textPath element</title>
+  <metadata>
+    <html:link rel="author" title="Virali Purbey" href="mailto:viralipurbey@microsoft.com"/>
+    <html:link rel="help" href="https://www.w3.org/TR/SVG2/text.html#TextPathElementPathAttribute"/>
+    <html:link rel="match" href="textpath-path-attr-ref.svg"/>
+  </metadata>
+  <defs>
+    <path id="line" d="M 10 50 L 100 200"/>
+  </defs>
+  <text x="10" y="50" font-size="20" fill="black">
+    <textPath href="#line" path="M 10 50 Q 100 10 200 50 T 390 50">
+      Text along a quadratic curve
+    </textPath>
+  </text>
+</svg>
diff --git a/testing/web-platform/tests/svg/text/reftests/textpath-path-attr-ref.svg b/testing/web-platform/tests/svg/text/reftests/textpath-path-attr-ref.svg
new file mode 100644
index 0000000000000..51a780cbd1d02
--- /dev/null
+++ b/testing/web-platform/tests/svg/text/reftests/textpath-path-attr-ref.svg
@@ -0,0 +1,10 @@
+<svg width="400" height="200" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <path id="curve" d="M 10 50 Q 100 10 200 50 T 390 50"/>
+  </defs>
+  <text x="10" y="50" font-size="20" fill="black">
+    <textPath href="#curve">
+      Text along a quadratic curve
+    </textPath>
+  </text>
+</svg>
diff --git a/testing/web-platform/tests/svg/text/reftests/textpath-path-attr.svg b/testing/web-platform/tests/svg/text/reftests/textpath-path-attr.svg
new file mode 100644
index 0000000000000..eea6a7160f934
--- /dev/null
+++ b/testing/web-platform/tests/svg/text/reftests/textpath-path-attr.svg
@@ -0,0 +1,13 @@
+<svg width="400" height="200" xmlns="http://www.w3.org/2000/svg" xmlns:html="http://www.w3.org/1999/xhtml">
+ <title>Supported 'path' on textPath element</title>
+  <metadata>
+    <html:link rel="author" title="Virali Purbey" href="mailto:viralipurbey@microsoft.com"/>
+    <html:link rel="help" href="https://www.w3.org/TR/SVG2/text.html#TextPathElementPathAttribute"/>
+    <html:link rel="match" href="textpath-path-attr-ref.svg"/>
+  </metadata>
+  <text x="10" y="50" font-size="20" fill="black">
+    <textPath path="M 10 50 Q 100 10 200 50 T 390 50">
+      Text along a quadratic curve
+    </textPath>
+  </text>
+</svg>

From 1fadac5ff1c027df4aa5e07c2c3c828091e22a68 Mon Sep 17 00:00:00 2001
From: Anne van Kesteren <annevk@annevk.nl>
Date: Tue, 27 Jan 2026 16:46:53 +0000
Subject: [PATCH 039/116] Bug 2012581 [wpt PR 57341] - X-Frame-Options: don't
 strip 0x0B or 0x0C, a=testonly

Automatic update from web-platform-tests
X-Frame-Options: don't strip 0x0B or 0x0C

Per the specification only tabs and spaces are supposed to be trimmed.

--

wpt-commits: 6770fe822c96c2b314cc14848e600c81a2a86a11
wpt-pr: 57341
---
 .../tests/x-frame-options/get-decode-split.html      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/testing/web-platform/tests/x-frame-options/get-decode-split.html b/testing/web-platform/tests/x-frame-options/get-decode-split.html
index 9f5101d610eb2..237df46d49ad3 100644
--- a/testing/web-platform/tests/x-frame-options/get-decode-split.html
+++ b/testing/web-platform/tests/x-frame-options/get-decode-split.html
@@ -20,4 +20,16 @@
   sameOriginAllowed: false,
   crossOriginAllowed: false
 });
+
+xfo_simple_tests({
+  headerValue: `\x0BDENY`,
+  sameOriginAllowed: true,
+  crossOriginAllowed: true
+});
+
+xfo_simple_tests({
+  headerValue: `\x0CDENY`,
+  sameOriginAllowed: true,
+  crossOriginAllowed: true
+});
 </script>

From cacfb32841f844840c9e06164aeb1d25a130a710 Mon Sep 17 00:00:00 2001
From: Anne van Kesteren <annevk@annevk.nl>
Date: Tue, 27 Jan 2026 16:47:02 +0000
Subject: [PATCH 040/116] Bug 2012664 [wpt PR 57354] - Add coverage for other
 elements with UA shadow roots, a=testonly

Automatic update from web-platform-tests
Add coverage for other elements with UA shadow roots

--

wpt-commits: 40d3eb8f315cf862fcf0c68019fdb4b864a1460c
wpt-pr: 57354
---
 .../slot-dir-attach-child-details-crash.html      | 15 +++++++++++++++
 .../slot-dir-attach-child-meter-crash.html        | 15 +++++++++++++++
 .../slot-dir-attach-child-progress-crash.html     | 15 +++++++++++++++
 .../slot-dir-attach-child-textarea-crash.html     | 15 +++++++++++++++
 4 files changed, 60 insertions(+)
 create mode 100644 testing/web-platform/tests/shadow-dom/slot-dir-attach-child-details-crash.html
 create mode 100644 testing/web-platform/tests/shadow-dom/slot-dir-attach-child-meter-crash.html
 create mode 100644 testing/web-platform/tests/shadow-dom/slot-dir-attach-child-progress-crash.html
 create mode 100644 testing/web-platform/tests/shadow-dom/slot-dir-attach-child-textarea-crash.html

diff --git a/testing/web-platform/tests/shadow-dom/slot-dir-attach-child-details-crash.html b/testing/web-platform/tests/shadow-dom/slot-dir-attach-child-details-crash.html
new file mode 100644
index 0000000000000..8e5bb0463678f
--- /dev/null
+++ b/testing/web-platform/tests/shadow-dom/slot-dir-attach-child-details-crash.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<datalist id="move">
+  <option dir="rtl">
+    <details id="details"><summary>Summary</summary></details>
+  </option>
+</datalist>
+<svg>
+  <tspan id="tspan"/><use href="#tspan"/>
+</svg>
+<script>
+  onload = () => {
+    document.getElementById("details").appendChild(document.createElement("div"));
+    document.getElementById("tspan").appendChild(move);
+  }
+</script>
diff --git a/testing/web-platform/tests/shadow-dom/slot-dir-attach-child-meter-crash.html b/testing/web-platform/tests/shadow-dom/slot-dir-attach-child-meter-crash.html
new file mode 100644
index 0000000000000..4b3af0cf9d2c4
--- /dev/null
+++ b/testing/web-platform/tests/shadow-dom/slot-dir-attach-child-meter-crash.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<datalist id="move">
+  <option dir="rtl">
+    <meter id="meter" value="50" min="0" max="100"></meter>
+  </option>
+</datalist>
+<svg>
+  <tspan id="tspan"/><use href="#tspan"/>
+</svg>
+<script>
+  onload = () => {
+    document.getElementById("meter").appendChild(document.createElement("div"));
+    document.getElementById("tspan").appendChild(move);
+  }
+</script>
diff --git a/testing/web-platform/tests/shadow-dom/slot-dir-attach-child-progress-crash.html b/testing/web-platform/tests/shadow-dom/slot-dir-attach-child-progress-crash.html
new file mode 100644
index 0000000000000..a376b5046a226
--- /dev/null
+++ b/testing/web-platform/tests/shadow-dom/slot-dir-attach-child-progress-crash.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<datalist id="move">
+  <option dir="rtl">
+    <progress id="progress" value="50" max="100"></progress>
+  </option>
+</datalist>
+<svg>
+  <tspan id="tspan"/><use href="#tspan"/>
+</svg>
+<script>
+  onload = () => {
+    document.getElementById("progress").appendChild(document.createElement("div"));
+    document.getElementById("tspan").appendChild(move);
+  }
+</script>
diff --git a/testing/web-platform/tests/shadow-dom/slot-dir-attach-child-textarea-crash.html b/testing/web-platform/tests/shadow-dom/slot-dir-attach-child-textarea-crash.html
new file mode 100644
index 0000000000000..ed02f1530ea14
--- /dev/null
+++ b/testing/web-platform/tests/shadow-dom/slot-dir-attach-child-textarea-crash.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<datalist id="move">
+  <option dir="rtl">
+    <textarea id="textarea"></textarea>
+  </option>
+</datalist>
+<svg>
+  <tspan id="tspan"/><use href="#tspan"/>
+</svg>
+<script>
+  onload = () => {
+    document.getElementById("textarea").appendChild(document.createElement("div"));
+    document.getElementById("tspan").appendChild(move);
+  }
+</script>

From b99d90139bc4060df4da8196c758f6f383ed6424 Mon Sep 17 00:00:00 2001
From: Xiaochen Zhou <xiaochenzh@chromium.org>
Date: Tue, 27 Jan 2026 16:47:06 +0000
Subject: [PATCH 041/116] Bug 2012585 [wpt PR 57343] - [Connection-Allowlist]
 Add wpt for link rel preload, a=testonly

Automatic update from web-platform-tests
[Connection-Allowlist] Add wpt for link rel preload

Test procedure:
1. A preload request stores a value on the server. It subjects to the
connection allowlist.
2. A fetch request checks whether the value was set by the preload
request. This request is exempted from the connection allowlist.

Bug: 447954811
Change-Id: I10816a8befabed3eafd3723558e44df4643e55ad
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7504500
Reviewed-by: Andrew Verge <averge@chromium.org>
Commit-Queue: Xiaochen Zhou <xiaochenzh@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1575156}

--

wpt-commits: e904f36ee83879c63d8f7c0fed1cf23c33f60438
wpt-pr: 57343
---
 .../tentative/link_rel_preload.sub.window.js  | 63 +++++++++++++++++++
 ...link_rel_preload.sub.window.js.sub.headers |  1 +
 2 files changed, 64 insertions(+)
 create mode 100644 testing/web-platform/tests/connection-allowlist/tentative/link_rel_preload.sub.window.js
 create mode 100644 testing/web-platform/tests/connection-allowlist/tentative/link_rel_preload.sub.window.js.sub.headers

diff --git a/testing/web-platform/tests/connection-allowlist/tentative/link_rel_preload.sub.window.js b/testing/web-platform/tests/connection-allowlist/tentative/link_rel_preload.sub.window.js
new file mode 100644
index 0000000000000..a526284c4b965
--- /dev/null
+++ b/testing/web-platform/tests/connection-allowlist/tentative/link_rel_preload.sub.window.js
@@ -0,0 +1,63 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=resources/utils.js
+// META: timeout=long
+
+const port = get_host_info().HTTP_PORT_ELIDED;
+const SUCCESS = true;
+const FAILURE = false;
+
+function preload_test(origin, expectation) {
+  promise_test(
+      async t => {
+        const key = token();
+        const value = 'hello';
+        const params = new URLSearchParams();
+        params.set('key', key);
+        params.set('value', value);
+
+        const link = document.createElement('link');
+        link.rel = 'preload';
+        link.href = `${origin}${STORE_URL}?${params.toString()}`;
+        link.as = 'script'
+        document.head.appendChild(link);
+        t.add_cleanup(() => link.remove());
+
+        if (expectation === SUCCESS) {
+          const result = await nextValueFromServer(key);
+          assert_equals(result, value);
+        } else {
+          const result = await Promise.race([
+            new Promise(r => t.step_timeout(r, 1000)), nextValueFromServer(key)
+          ]);
+          assert_true(typeof result === 'undefined');
+        }
+      },
+      `Preload to ${origin} ${
+          expectation === SUCCESS ? 'succeeds' : 'fails'}.`);
+}
+
+const test_cases = [
+  // Page loads originate from `http://hosts[][]`; preloading this origin
+  // succeeds, while subdomains fail.
+  {origin: 'http://{{hosts[][]}}' + port, expectation: SUCCESS},
+  {origin: 'http://{{hosts[][www]}}' + port, expectation: FAILURE},
+  {origin: 'http://{{hosts[][www1]}}' + port, expectation: FAILURE},
+  {origin: 'http://{{hosts[][www2]}}' + port, expectation: FAILURE},
+  {origin: 'http://{{hosts[][天気の良い日]}}' + port, expectation: FAILURE},
+  {origin: 'http://{{hosts[][élève]}}' + port, expectation: FAILURE},
+
+  // The pattern we've specified in the header ("*://*.hosts[alt]:*/") will
+  // match any subdomain of `hosts[alt]` (though not, as it turns out,
+  // `hosts[alt]` itself.
+  {origin: 'http://{{hosts[alt][]}}' + port, expectation: FAILURE},
+  {origin: 'http://{{hosts[alt][www]}}' + port, expectation: SUCCESS},
+  {origin: 'http://{{hosts[alt][www1]}}' + port, expectation: SUCCESS},
+  {origin: 'http://{{hosts[alt][www2]}}' + port, expectation: SUCCESS},
+  {origin: 'http://{{hosts[alt][天気の良い日]}}' + port, expectation: SUCCESS},
+  {origin: 'http://{{hosts[alt][élève]}}' + port, expectation: SUCCESS},
+];
+
+for (let i = 0; i < test_cases.length; i++) {
+  preload_test(test_cases[i].origin, test_cases[i].expectation);
+}
diff --git a/testing/web-platform/tests/connection-allowlist/tentative/link_rel_preload.sub.window.js.sub.headers b/testing/web-platform/tests/connection-allowlist/tentative/link_rel_preload.sub.window.js.sub.headers
new file mode 100644
index 0000000000000..05a5826807caa
--- /dev/null
+++ b/testing/web-platform/tests/connection-allowlist/tentative/link_rel_preload.sub.window.js.sub.headers
@@ -0,0 +1 @@
+Connection-Allowlist: (response-origin "*://:subdomain.{{hosts[alt][]}}:*" "*://*:*/*\\?*&ignore-allowlist=true*")
\ No newline at end of file

From dfbd3b9f1b2571b64e3d7661bd2bc646d1919008 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Tue, 27 Jan 2026 14:39:06 +0000
Subject: [PATCH 042/116] Bug 2012585 [wpt PR 57343] - Update wpt metadata,
 a=testonly

wpt-pr: 57343
wpt-type: metadata
---
 .../link_rel_preload.sub.window.js.ini        | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 testing/web-platform/meta/connection-allowlist/tentative/link_rel_preload.sub.window.js.ini

diff --git a/testing/web-platform/meta/connection-allowlist/tentative/link_rel_preload.sub.window.js.ini b/testing/web-platform/meta/connection-allowlist/tentative/link_rel_preload.sub.window.js.ini
new file mode 100644
index 0000000000000..772387d6c58f0
--- /dev/null
+++ b/testing/web-platform/meta/connection-allowlist/tentative/link_rel_preload.sub.window.js.ini
@@ -0,0 +1,36 @@
+[link_rel_preload.sub.window.html]
+  [Preload to http://web-platform.test:8000 succeeds.]
+    expected: FAIL
+
+  [Preload to http://www.web-platform.test:8000 fails.]
+    expected: FAIL
+
+  [Preload to http://www1.web-platform.test:8000 fails.]
+    expected: FAIL
+
+  [Preload to http://www2.web-platform.test:8000 fails.]
+    expected: FAIL
+
+  [Preload to http://xn--n8j6ds53lwwkrqhv28a.web-platform.test:8000 fails.]
+    expected: FAIL
+
+  [Preload to http://xn--lve-6lad.web-platform.test:8000 fails.]
+    expected: FAIL
+
+  [Preload to http://not-web-platform.test:8000 fails.]
+    expected: FAIL
+
+  [Preload to http://www.not-web-platform.test:8000 succeeds.]
+    expected: FAIL
+
+  [Preload to http://www1.not-web-platform.test:8000 succeeds.]
+    expected: FAIL
+
+  [Preload to http://www2.not-web-platform.test:8000 succeeds.]
+    expected: FAIL
+
+  [Preload to http://xn--n8j6ds53lwwkrqhv28a.not-web-platform.test:8000 succeeds.]
+    expected: FAIL
+
+  [Preload to http://xn--lve-6lad.not-web-platform.test:8000 succeeds.]
+    expected: FAIL

From 7d645e5fa891981792ceae5fcac6417195e5882e Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Tue, 27 Jan 2026 16:47:12 +0000
Subject: [PATCH 043/116] Bug 2012623 [wpt PR 57352] - Shorten the text in
 new-content-is-inline.html, a=testonly

Automatic update from web-platform-tests
Shorten the text in new-content-is-inline.html (#57352)

This patch shortens the text ("FILLER" -> "FILL" and "INLINE..." -> "INL INL")

Shorter text is nice because it avoids the need to linewrap, which:
* brings the test into alignment with its neighbor "old-content-is-inline.html"
* restores the test to the no-linewrapping state that it was in before the Ahem
  font-family was added to it.
* removes the need for a fuzzy annotation (removed in this patch)

This patch also includes a few other small cleanups for consistency with
changes that I recently made to its neighbor "old-content-is-inline.html":
* I'm making some text blue instead of transparent. (The test was only
  transparent to avoid subpixel positioning differences, which stopped being a
  problem once the test started using Ahem.)
* I'm simplifying the ahem.css link-tag.
--

wpt-commits: 6829c2ad47b60cb97b2533593af9fc89edf5c2c6
wpt-pr: 57352
---
 .../new-content-is-inline-ref.html               | 16 ++++++++--------
 .../new-content-is-inline.html                   | 14 ++++++--------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/testing/web-platform/tests/css/css-view-transitions/new-content-is-inline-ref.html b/testing/web-platform/tests/css/css-view-transitions/new-content-is-inline-ref.html
index 10098bec8efc7..d8821ea58ee1a 100644
--- a/testing/web-platform/tests/css/css-view-transitions/new-content-is-inline-ref.html
+++ b/testing/web-platform/tests/css/css-view-transitions/new-content-is-inline-ref.html
@@ -2,7 +2,7 @@
 <title>View transitions: New content is an inline element (ref)</title>
 <link rel="help" href="https://www.w3.org/TR/css-view-transitions-1/">
 <link rel="author" href="mailto:bokan@chromium.org">
-<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<link rel="stylesheet" href="/fonts/ahem.css">
 
 <style>
 :root {
@@ -37,7 +37,7 @@
 .inline {
   opacity: 0;
   background-color: coral;
-  color: rgba(0, 0, 0, 0);
+  color: blue;
 }
 
 .transitioned .inline {
@@ -56,20 +56,20 @@
 </style>
 
 <div class="container start">
-  <span>FILLER FILLER</span>
-  <span id="start" class="inline">INLINE INLINE INLINE INLINE</span>
+  <span>FILL FILL</span>
+  <span id="start" class="inline">INL INL</span>
   <p style="margin-top: 50px">START STATE</p>
 </div>
 
 <div class="container end transitioned">
-  <span>FILLER FILLER</span>
-  <span id="end" class="inline">INLINE INLINE INLINE INLINE</span>
+  <span>FILL FILL</span>
+  <span id="end" class="inline">INL INL</span>
   <p>END STATE</p>
 </div>
 
 <div id="dummyStartInline" class="transitioned">
-  <span style="opacity:0">FILLER FILLER</span>
-  <span class="inline">INLINE INLINE INLINE INLINE</span>
+  <span style="opacity:0">FILL FILL</span>
+  <span class="inline">INL INL</span>
 </div>
 <script>
   let endWidth = document.getElementById('end').getBoundingClientRect().width;
diff --git a/testing/web-platform/tests/css/css-view-transitions/new-content-is-inline.html b/testing/web-platform/tests/css/css-view-transitions/new-content-is-inline.html
index 9be8332c857be..9b9637cc115c2 100644
--- a/testing/web-platform/tests/css/css-view-transitions/new-content-is-inline.html
+++ b/testing/web-platform/tests/css/css-view-transitions/new-content-is-inline.html
@@ -4,8 +4,7 @@
 <link rel="help" href="https://www.w3.org/TR/css-view-transitions-1/">
 <link rel="author" href="mailto:bokan@chromium.org">
 <link rel="match" href="new-content-is-inline-ref.html">
-<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
-<meta name="fuzzy" content="maxDifference=0-255; totalPixels=0-1000">
+<link rel="stylesheet" href="/fonts/ahem.css">
 <script src="/common/reftest-wait.js"></script>
 
 <style>
@@ -40,8 +39,7 @@
 
 .inline {
   background-color: limegreen;
-  /* allow small pixel diff in text */
-  color: rgba(0, 0, 0, 0);
+  color: blue;
 }
 
 .start .inline {
@@ -110,8 +108,8 @@
 starting position.
 -->
 <div class="container start">
-  <span>FILLER FILLER</span>
-  <span id="start" class="inline">INLINE INLINE INLINE INLINE</span>
+  <span>FILL FILL</span>
+  <span id="start" class="inline">INL INL</span>
   <p style="margin-top: 50px">START STATE</p>
 </div>
 
@@ -120,8 +118,8 @@
 ending position.
 -->
 <div class="container end">
-  <span>FILLER FILLER</span>
-  <span id="end" class="inline">INLINE INLINE INLINE INLINE</span>
+  <span>FILL FILL</span>
+  <span id="end" class="inline">INL INL</span>
   <p>END STATE</p>
 </div>
 

From d8869edeebf0b6b577fb832fb85192d0c20477f5 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Tue, 27 Jan 2026 15:34:33 +0000
Subject: [PATCH 044/116] Bug 2012623 [wpt PR 57352] - Update wpt metadata,
 a=testonly

wpt-pr: 57352
wpt-type: metadata
---
 .../css/css-view-transitions/new-content-is-inline.html.ini     | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 testing/web-platform/meta/css/css-view-transitions/new-content-is-inline.html.ini

diff --git a/testing/web-platform/meta/css/css-view-transitions/new-content-is-inline.html.ini b/testing/web-platform/meta/css/css-view-transitions/new-content-is-inline.html.ini
deleted file mode 100644
index f15f73d1dae2e..0000000000000
--- a/testing/web-platform/meta/css/css-view-transitions/new-content-is-inline.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[new-content-is-inline.html]
-  expected: FAIL

From 8da85bf6dc5ed5118745c7abcee98f79807948a7 Mon Sep 17 00:00:00 2001
From: Xiaochen Zhou <xiaochenzh@chromium.org>
Date: Tue, 27 Jan 2026 16:47:18 +0000
Subject: [PATCH 045/116] Bug 2012587 [wpt PR 57344] - [Connection-Allowlist]
 Add wpt for link rel modulepreload, a=testonly

Automatic update from web-platform-tests
[Connection-Allowlist] Add wpt for link rel modulepreload

Test procedure:
1. A modulepreload request stores a value on the server. It subjects to
the connection allowlist.
2. A fetch request checks whether the value was set by the modulepreload
request. This request is exempted from the connection allowlist.

Bug: 447954811
Change-Id: I8b680d69a3c023eff3a6d2e5b41c3ceb1c3d0b89
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7505295
Reviewed-by: Andrew Verge <averge@chromium.org>
Commit-Queue: Xiaochen Zhou <xiaochenzh@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1575208}

--

wpt-commits: 10bbfe6bcf96c8df39cd2d759fd33cbe05e99cbc
wpt-pr: 57344
---
 .../link_rel_modulepreload.sub.window.js      | 62 +++++++++++++++++++
 ...el_modulepreload.sub.window.js.sub.headers |  1 +
 2 files changed, 63 insertions(+)
 create mode 100644 testing/web-platform/tests/connection-allowlist/tentative/link_rel_modulepreload.sub.window.js
 create mode 100644 testing/web-platform/tests/connection-allowlist/tentative/link_rel_modulepreload.sub.window.js.sub.headers

diff --git a/testing/web-platform/tests/connection-allowlist/tentative/link_rel_modulepreload.sub.window.js b/testing/web-platform/tests/connection-allowlist/tentative/link_rel_modulepreload.sub.window.js
new file mode 100644
index 0000000000000..ffd9287ab7e6b
--- /dev/null
+++ b/testing/web-platform/tests/connection-allowlist/tentative/link_rel_modulepreload.sub.window.js
@@ -0,0 +1,62 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=resources/utils.js
+// META: timeout=long
+
+const port = get_host_info().HTTP_PORT_ELIDED;
+const SUCCESS = true;
+const FAILURE = false;
+
+function modulepreload_test(origin, expectation) {
+  promise_test(
+      async t => {
+        const key = token();
+        const value = 'hello';
+        const params = new URLSearchParams();
+        params.set('key', key);
+        params.set('value', value);
+
+        const link = document.createElement('link');
+        link.rel = 'modulepreload';
+        link.href = `${origin}${STORE_URL}?${params.toString()}`;
+        document.head.appendChild(link);
+        t.add_cleanup(() => link.remove());
+
+        if (expectation === SUCCESS) {
+          const result = await nextValueFromServer(key);
+          assert_equals(result, value);
+        } else {
+          const result = await Promise.race([
+            new Promise(r => t.step_timeout(r, 1000)), nextValueFromServer(key)
+          ]);
+          assert_true(typeof result === 'undefined');
+        }
+      },
+      `Modulepreload to ${origin} ${
+          expectation === SUCCESS ? 'succeeds' : 'fails'}.`);
+}
+
+const test_cases = [
+  // Page loads originate from `http://hosts[][]`; modulepreloading this origin
+  // succeeds, while subdomains fail.
+  {origin: 'http://{{hosts[][]}}' + port, expectation: SUCCESS},
+  {origin: 'http://{{hosts[][www]}}' + port, expectation: FAILURE},
+  {origin: 'http://{{hosts[][www1]}}' + port, expectation: FAILURE},
+  {origin: 'http://{{hosts[][www2]}}' + port, expectation: FAILURE},
+  {origin: 'http://{{hosts[][天気の良い日]}}' + port, expectation: FAILURE},
+  {origin: 'http://{{hosts[][élève]}}' + port, expectation: FAILURE},
+
+  // The pattern we've specified in the header ("*://*.hosts[alt]:*/") will
+  // match any subdomain of `hosts[alt]` (though not, as it turns out,
+  // `hosts[alt]` itself.
+  {origin: 'http://{{hosts[alt][]}}' + port, expectation: FAILURE},
+  {origin: 'http://{{hosts[alt][www]}}' + port, expectation: SUCCESS},
+  {origin: 'http://{{hosts[alt][www1]}}' + port, expectation: SUCCESS},
+  {origin: 'http://{{hosts[alt][www2]}}' + port, expectation: SUCCESS},
+  {origin: 'http://{{hosts[alt][天気の良い日]}}' + port, expectation: SUCCESS},
+  {origin: 'http://{{hosts[alt][élève]}}' + port, expectation: SUCCESS},
+];
+
+for (let i = 0; i < test_cases.length; i++) {
+  modulepreload_test(test_cases[i].origin, test_cases[i].expectation);
+}
diff --git a/testing/web-platform/tests/connection-allowlist/tentative/link_rel_modulepreload.sub.window.js.sub.headers b/testing/web-platform/tests/connection-allowlist/tentative/link_rel_modulepreload.sub.window.js.sub.headers
new file mode 100644
index 0000000000000..05a5826807caa
--- /dev/null
+++ b/testing/web-platform/tests/connection-allowlist/tentative/link_rel_modulepreload.sub.window.js.sub.headers
@@ -0,0 +1 @@
+Connection-Allowlist: (response-origin "*://:subdomain.{{hosts[alt][]}}:*" "*://*:*/*\\?*&ignore-allowlist=true*")
\ No newline at end of file

From 369ccb5ee8ea8689c663225d78401e6dce823c50 Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Tue, 27 Jan 2026 16:39:06 +0000
Subject: [PATCH 046/116] Bug 2012587 [wpt PR 57344] - Update wpt metadata,
 a=testonly

wpt-pr: 57344
wpt-type: metadata
---
 .../link_rel_modulepreload.sub.window.js.ini  | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 testing/web-platform/meta/connection-allowlist/tentative/link_rel_modulepreload.sub.window.js.ini

diff --git a/testing/web-platform/meta/connection-allowlist/tentative/link_rel_modulepreload.sub.window.js.ini b/testing/web-platform/meta/connection-allowlist/tentative/link_rel_modulepreload.sub.window.js.ini
new file mode 100644
index 0000000000000..79e4cd2db338e
--- /dev/null
+++ b/testing/web-platform/meta/connection-allowlist/tentative/link_rel_modulepreload.sub.window.js.ini
@@ -0,0 +1,36 @@
+[link_rel_modulepreload.sub.window.html]
+  [Modulepreload to http://web-platform.test:8000 succeeds.]
+    expected: FAIL
+
+  [Modulepreload to http://www.web-platform.test:8000 fails.]
+    expected: FAIL
+
+  [Modulepreload to http://www1.web-platform.test:8000 fails.]
+    expected: FAIL
+
+  [Modulepreload to http://www2.web-platform.test:8000 fails.]
+    expected: FAIL
+
+  [Modulepreload to http://xn--n8j6ds53lwwkrqhv28a.web-platform.test:8000 fails.]
+    expected: FAIL
+
+  [Modulepreload to http://xn--lve-6lad.web-platform.test:8000 fails.]
+    expected: FAIL
+
+  [Modulepreload to http://not-web-platform.test:8000 fails.]
+    expected: FAIL
+
+  [Modulepreload to http://www.not-web-platform.test:8000 succeeds.]
+    expected: FAIL
+
+  [Modulepreload to http://www1.not-web-platform.test:8000 succeeds.]
+    expected: FAIL
+
+  [Modulepreload to http://www2.not-web-platform.test:8000 succeeds.]
+    expected: FAIL
+
+  [Modulepreload to http://xn--n8j6ds53lwwkrqhv28a.not-web-platform.test:8000 succeeds.]
+    expected: FAIL
+
+  [Modulepreload to http://xn--lve-6lad.not-web-platform.test:8000 succeeds.]
+    expected: FAIL

From eae367e29844d26ce1fa4c5d8a752eb2daf3b19e Mon Sep 17 00:00:00 2001
From: moz-wptsync-bot <wptsync@mozilla.com>
Date: Tue, 27 Jan 2026 16:47:46 +0000
Subject: [PATCH 047/116] Bug 2012753 - [wpt-sync] Update web-platform-tests to
 10bbfe6bcf96c8df39cd2d759fd33cbe05e99cbc, a=testonly

MANUAL PUSH: wpt sync bot

wpt-head: 10bbfe6bcf96c8df39cd2d759fd33cbe05e99cbc
wpt-type: landing
---
 ...ache-partitioning.tentative.https.html.ini | 19 ++++++++++---------
 ...d-copy-selection-line-break.https.html.ini |  5 +++++
 .../compression-bad-chunks.any.js.ini         |  2 +-
 ...mpression-including-empty-chunk.any.js.ini |  4 +++-
 .../decompression-correct-input.any.js.ini    |  7 ++++---
 .../link_rel_modulepreload.sub.window.js.ini  | 18 ------------------
 .../link_rel_preload.sub.window.js.ini        | 18 ------------------
 .../animation-name-edge-cases.html.ini        |  2 --
 .../parsing/keyframes-name-invalid.html.ini   |  5 -----
 ...scroll-behavior-main-frame-window.html.ini |  9 +++++----
 .../registries/element-mutation.html.ini      |  9 ---------
 .../dom/abort/timeout-shadowrealm.any.js.ini  |  4 ++--
 .../event-timing/gap-keydown-keyup.html.ini   |  6 +++---
 .../cross-origin-status.https.html.ini        |  8 ++++----
 .../logged-out.https.html.ini                 |  2 ++
 .../window-open-noopener.html.ini             |  8 +++++---
 .../change-src-while-not-displayed.html.ini   |  1 +
 ...eature-policy-attribute.https.sub.html.ini |  9 +++++----
 ...lowed-by-feature-policy.https.sub.html.ini |  4 +---
 ...-default-feature-policy.https.sub.html.ini |  1 +
 ...abled-by-feature-policy.https.sub.html.ini |  6 ++++--
 .../load-events-networkState.html.ini         |  2 ++
 ...selection-candidate-insert-before.html.ini | 11 ++++++-----
 .../modulepreload-referrerpolicy.html.ini     |  1 +
 ...ecorder-canvas-media-source.https.html.ini |  1 +
 .../MediaRecorder-creation.https.html.ini     |  2 +-
 ...rder-peerconnection-no-sink.https.html.ini |  9 ++++-----
 testing/web-platform/meta/mozilla-sync        |  2 +-
 ...get_removed_interleaved.tentative.html.ini |  2 ++
 ...nterevent_click_is_a_pointerevent.html.ini |  8 ++++----
 .../streams/piping/flow-control.any.js.ini    |  4 +++-
 .../piping/general-addition.any.js.ini        |  4 +++-
 .../enqueue-with-detached-buffer.any.js.ini   |  5 ++++-
 .../readable-byte-streams/general.any.js.ini  |  5 +++--
 .../non-transferable-buffers.any.js.ini       |  8 ++++----
 .../patched-global.any.js.ini                 |  7 ++++---
 ...floating-point-total-queue-size.any.js.ini |  3 +--
 .../streams/readable-streams/global.html.ini  |  1 +
 .../transform-streams/errors.any.js.ini       |  1 +
 .../transform-streams/terminate.any.js.ini    |  4 +++-
 .../streams/writable-streams/error.any.js.ini |  8 ++++----
 .../js-wasm-cycle.tentative.any.js.ini        |  8 +++++---
 .../jsapi/instance/constructor.any.js.ini     |  2 ++
 .../wasm/jsapi/instance/toString.any.js.ini   |  4 +++-
 .../module/moduleSource.tentative.any.js.ini  |  6 ++++--
 .../jsapi/tag/toString.tentative.any.js.ini   |  4 ++--
 ...event-trigger-alternate.tentative.html.ini |  3 ---
 .../event-trigger-state.tentative.html.ini    |  3 ---
 .../audiocontext-rendersizehint.html.ini      |  2 ++
 ...video-encoder-h26x-annexb.https.any.js.ini | 10 ++++------
 .../set_download_behavior/user_context.py.ini |  1 +
 .../browsing_context/activate/activate.py.ini |  3 ++-
 .../browsing_context/activate/invalid.py.ini  |  3 +++
 .../capture_screenshot/origin.py.ini          |  3 +++
 .../close/prompt_unload.py.ini                |  2 ++
 .../context_created/original_opener.py.ini    |  5 +++--
 .../network/continue_response/invalid.py.ini  |  4 ++++
 .../response_started/response_started.py.ini  |  3 +++
 ...ption-constructor-and-prototype.any.js.ini |  4 ++--
 ...MException-constructor-behavior.any.js.ini |  4 +++-
 ...ssage_MessagePorts_xsite.sub.window.js.ini |  2 +-
 ...tiation-stress-glare-linear.https.html.ini |  1 +
 .../webrtc/protocol/rtp-demuxing.html.ini     |  3 +--
 .../meta/webrtc/simulcast/h264.https.html.ini |  3 +--
 64 files changed, 161 insertions(+), 157 deletions(-)
 delete mode 100644 testing/web-platform/meta/css/css-animations/parsing/animation-name-edge-cases.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-animations/parsing/keyframes-name-invalid.html.ini
 delete mode 100644 testing/web-platform/meta/web-animations/animation-trigger/event-trigger-alternate.tentative.html.ini
 delete mode 100644 testing/web-platform/meta/web-animations/animation-trigger/event-trigger-state.tentative.html.ini
 create mode 100644 testing/web-platform/meta/webdriver/tests/bidi/browsing_context/activate/invalid.py.ini
 create mode 100644 testing/web-platform/meta/webdriver/tests/bidi/browsing_context/capture_screenshot/origin.py.ini
 create mode 100644 testing/web-platform/meta/webdriver/tests/bidi/network/response_started/response_started.py.ini

diff --git a/testing/web-platform/meta/clear-site-data/clear-cache-partitioning.tentative.https.html.ini b/testing/web-platform/meta/clear-site-data/clear-cache-partitioning.tentative.https.html.ini
index e333bda017919..145c727556da6 100644
--- a/testing/web-platform/meta/clear-site-data/clear-cache-partitioning.tentative.https.html.ini
+++ b/testing/web-platform/meta/clear-site-data/clear-cache-partitioning.tentative.https.html.ini
@@ -23,16 +23,18 @@
     if (os == "mac") and not debug: [OK, TIMEOUT]
   [clear in cross origin iframe doesn't affect embedder]
     expected:
-      if (os == "linux") and not debug and not asan: [PASS, FAIL]
-      if (os == "android") and sessionHistoryInParent and not debug: [PASS, FAIL]
-      if (os == "android") and not sessionHistoryInParent and not debug: [PASS, FAIL]
+      if (os == "linux") and not tsan and not debug and not asan: [PASS, FAIL]
+      if (os == "android") and not debug and sessionHistoryInParent: [PASS, FAIL]
+      if (os == "android") and not debug and not sessionHistoryInParent: [PASS, FAIL]
+      if (os == "linux") and tsan: [PASS, FAIL]
 
   [cross origin iframe data doesn't get cleared]
     expected:
-      if (os == "linux") and not debug and fission: [PASS, FAIL]
-      if (os == "android") and sessionHistoryInParent and debug: [FAIL, PASS]
-      if (os == "android") and sessionHistoryInParent and not debug: [PASS, FAIL]
-      if (os == "android") and not sessionHistoryInParent and debug: [FAIL, PASS]
+      if (os == "linux") and not debug and not fission: PASS
+      if (os == "linux") and debug: PASS
+      if os == "win": PASS
+      if os == "mac": PASS
+      [PASS, FAIL]
 
   [clear double partitioned context with intermediate cross origin clears that partitioned data]
     expected:
@@ -48,5 +50,4 @@
 
   [clearing cache doesn't affect subdomain]
     expected:
-      if (os == "android") and not debug and sessionHistoryInParent: [PASS, FAIL]
-      if (os == "android") and not debug and not sessionHistoryInParent: [PASS, FAIL]
+      if (os == "android") and not debug: [PASS, FAIL]
diff --git a/testing/web-platform/meta/clipboard-apis/clipboard-copy-selection-line-break.https.html.ini b/testing/web-platform/meta/clipboard-apis/clipboard-copy-selection-line-break.https.html.ini
index 052ffdcc378c6..e9f719e7aee98 100644
--- a/testing/web-platform/meta/clipboard-apis/clipboard-copy-selection-line-break.https.html.ini
+++ b/testing/web-platform/meta/clipboard-apis/clipboard-copy-selection-line-break.https.html.ini
@@ -43,6 +43,7 @@
   [test paragraph text with line breaks: "\\r\\n"]
     expected:
       if (os == "android") and debug and sessionHistoryInParent: [PASS, FAIL]
+      if (os == "android") and not debug and sessionHistoryInParent: [PASS, FAIL]
 
   [test paragraph text with line breaks: "\\n\\r"]
     expected:
@@ -52,6 +53,10 @@
     expected:
       if not sessionHistoryInParent and not debug: [PASS, FAIL]
 
+  [test paragraph text with line breaks: "\\r"]
+    expected:
+      if (os == "android") and sessionHistoryInParent and not debug: [PASS, FAIL]
+
 
 [clipboard-copy-selection-line-break.https.html?11-20]
   [test preformatted text with line breaks: "\\n\\n"]
diff --git a/testing/web-platform/meta/compression/compression-bad-chunks.any.js.ini b/testing/web-platform/meta/compression/compression-bad-chunks.any.js.ini
index 0cf1b9289b2fe..22face52b6cce 100644
--- a/testing/web-platform/meta/compression/compression-bad-chunks.any.js.ini
+++ b/testing/web-platform/meta/compression/compression-bad-chunks.any.js.ini
@@ -1,5 +1,6 @@
 [compression-bad-chunks.any.sharedworker.html]
   expected:
+    if sessionHistoryInParent and (os == "android") and not debug: [OK, TIMEOUT]
     if not sessionHistoryInParent and not debug: [OK, TIMEOUT]
 
 [compression-bad-chunks.any.serviceworker.html]
@@ -20,7 +21,6 @@
 [compression-bad-chunks.any.shadowrealm-in-window.html]
   expected:
     if (os == "android") and sessionHistoryInParent and not debug: [ERROR, TIMEOUT]
-    if (os == "android") and not sessionHistoryInParent and debug: TIMEOUT
     ERROR
 
 [compression-bad-chunks.any.shadowrealm-in-sharedworker.html]
diff --git a/testing/web-platform/meta/compression/compression-including-empty-chunk.any.js.ini b/testing/web-platform/meta/compression/compression-including-empty-chunk.any.js.ini
index d498474fff88d..b846fa250d7bc 100644
--- a/testing/web-platform/meta/compression/compression-including-empty-chunk.any.js.ini
+++ b/testing/web-platform/meta/compression/compression-including-empty-chunk.any.js.ini
@@ -23,7 +23,9 @@
   expected: ERROR
 
 [compression-including-empty-chunk.any.shadowrealm-in-sharedworker.html]
-  expected: ERROR
+  expected:
+    if (os == "android") and sessionHistoryInParent and not debug: [ERROR, TIMEOUT]
+    ERROR
 
 [compression-including-empty-chunk.https.any.shadowrealm-in-audioworklet.html]
   expected: ERROR
diff --git a/testing/web-platform/meta/compression/decompression-correct-input.any.js.ini b/testing/web-platform/meta/compression/decompression-correct-input.any.js.ini
index 7e76d2b850b67..727cabffc40f3 100644
--- a/testing/web-platform/meta/compression/decompression-correct-input.any.js.ini
+++ b/testing/web-platform/meta/compression/decompression-correct-input.any.js.ini
@@ -25,12 +25,13 @@
 
 [decompression-correct-input.any.shadowrealm-in-shadowrealm.html]
   expected:
-    if sessionHistoryInParent and (os == "android") and not debug: [ERROR, TIMEOUT]
-    if not sessionHistoryInParent and not debug: [ERROR, TIMEOUT]
+    if (os == "android") and not debug: [ERROR, TIMEOUT]
     ERROR
 
 [decompression-correct-input.any.shadowrealm-in-window.html]
-  expected: ERROR
+  expected:
+    if (os == "android") and sessionHistoryInParent and not debug: [ERROR, TIMEOUT]
+    ERROR
 
 [decompression-correct-input.https.any.shadowrealm-in-audioworklet.html]
   expected: ERROR
diff --git a/testing/web-platform/meta/connection-allowlist/tentative/link_rel_modulepreload.sub.window.js.ini b/testing/web-platform/meta/connection-allowlist/tentative/link_rel_modulepreload.sub.window.js.ini
index 79e4cd2db338e..143f3cdb9275f 100644
--- a/testing/web-platform/meta/connection-allowlist/tentative/link_rel_modulepreload.sub.window.js.ini
+++ b/testing/web-platform/meta/connection-allowlist/tentative/link_rel_modulepreload.sub.window.js.ini
@@ -1,7 +1,4 @@
 [link_rel_modulepreload.sub.window.html]
-  [Modulepreload to http://web-platform.test:8000 succeeds.]
-    expected: FAIL
-
   [Modulepreload to http://www.web-platform.test:8000 fails.]
     expected: FAIL
 
@@ -19,18 +16,3 @@
 
   [Modulepreload to http://not-web-platform.test:8000 fails.]
     expected: FAIL
-
-  [Modulepreload to http://www.not-web-platform.test:8000 succeeds.]
-    expected: FAIL
-
-  [Modulepreload to http://www1.not-web-platform.test:8000 succeeds.]
-    expected: FAIL
-
-  [Modulepreload to http://www2.not-web-platform.test:8000 succeeds.]
-    expected: FAIL
-
-  [Modulepreload to http://xn--n8j6ds53lwwkrqhv28a.not-web-platform.test:8000 succeeds.]
-    expected: FAIL
-
-  [Modulepreload to http://xn--lve-6lad.not-web-platform.test:8000 succeeds.]
-    expected: FAIL
diff --git a/testing/web-platform/meta/connection-allowlist/tentative/link_rel_preload.sub.window.js.ini b/testing/web-platform/meta/connection-allowlist/tentative/link_rel_preload.sub.window.js.ini
index 772387d6c58f0..77b3dd97fa186 100644
--- a/testing/web-platform/meta/connection-allowlist/tentative/link_rel_preload.sub.window.js.ini
+++ b/testing/web-platform/meta/connection-allowlist/tentative/link_rel_preload.sub.window.js.ini
@@ -1,7 +1,4 @@
 [link_rel_preload.sub.window.html]
-  [Preload to http://web-platform.test:8000 succeeds.]
-    expected: FAIL
-
   [Preload to http://www.web-platform.test:8000 fails.]
     expected: FAIL
 
@@ -19,18 +16,3 @@
 
   [Preload to http://not-web-platform.test:8000 fails.]
     expected: FAIL
-
-  [Preload to http://www.not-web-platform.test:8000 succeeds.]
-    expected: FAIL
-
-  [Preload to http://www1.not-web-platform.test:8000 succeeds.]
-    expected: FAIL
-
-  [Preload to http://www2.not-web-platform.test:8000 succeeds.]
-    expected: FAIL
-
-  [Preload to http://xn--n8j6ds53lwwkrqhv28a.not-web-platform.test:8000 succeeds.]
-    expected: FAIL
-
-  [Preload to http://xn--lve-6lad.not-web-platform.test:8000 succeeds.]
-    expected: FAIL
diff --git a/testing/web-platform/meta/css/css-animations/parsing/animation-name-edge-cases.html.ini b/testing/web-platform/meta/css/css-animations/parsing/animation-name-edge-cases.html.ini
deleted file mode 100644
index 3e4d9535456cc..0000000000000
--- a/testing/web-platform/meta/css/css-animations/parsing/animation-name-edge-cases.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[animation-name-edge-cases.html]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-animations/parsing/keyframes-name-invalid.html.ini b/testing/web-platform/meta/css/css-animations/parsing/keyframes-name-invalid.html.ini
deleted file mode 100644
index c9bc281723944..0000000000000
--- a/testing/web-platform/meta/css/css-animations/parsing/keyframes-name-invalid.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[keyframes-name-invalid.html]
-  expected:
-    if (os == "android") and fission: [OK, TIMEOUT]
-  [invalid: @keyframes "" { }]
-    expected: FAIL
diff --git a/testing/web-platform/meta/css/cssom-view/scroll-behavior-main-frame-window.html.ini b/testing/web-platform/meta/css/cssom-view/scroll-behavior-main-frame-window.html.ini
index de51492f31479..4317d94749e69 100644
--- a/testing/web-platform/meta/css/cssom-view/scroll-behavior-main-frame-window.html.ini
+++ b/testing/web-platform/meta/css/cssom-view/scroll-behavior-main-frame-window.html.ini
@@ -1,16 +1,17 @@
 [scroll-behavior-main-frame-window.html]
   [Main frame with smooth scroll-behavior ; scroll() with default behavior]
     expected:
-      if not fission and (os == "linux") and debug: [PASS, FAIL]
+      if (os == "linux") and debug and not fission: [PASS, FAIL]
 
   [Main frame with auto scroll-behavior ; scroll() with smooth behavior]
     expected:
-      if not fission and (os == "linux") and debug: [PASS, FAIL]
+      if (os == "linux") and debug and not fission: [PASS, FAIL]
 
   [Main frame with smooth scroll-behavior ; scrollTo() with auto behavior]
     expected:
-      if not fission and (os == "linux") and debug: [PASS, FAIL]
+      if (os == "win") and debug and (processor == "x86"): [PASS, FAIL]
+      if (os == "linux") and debug and not fission: [PASS, FAIL]
 
   [Main frame with smooth scroll-behavior ; scroll() with auto behavior]
     expected:
-      if not fission and (os == "linux") and debug: [PASS, FAIL]
+      if (os == "linux") and debug and not fission: [PASS, FAIL]
diff --git a/testing/web-platform/meta/custom-elements/registries/element-mutation.html.ini b/testing/web-platform/meta/custom-elements/registries/element-mutation.html.ini
index 1d9cd3b315811..cdb7e62d462b8 100644
--- a/testing/web-platform/meta/custom-elements/registries/element-mutation.html.ini
+++ b/testing/web-platform/meta/custom-elements/registries/element-mutation.html.ini
@@ -1,13 +1,4 @@
 [element-mutation.html]
-  [An element with global registry should not change its registry when moved into a shadow tree with scoped registry.]
-    expected: FAIL
-
-  [An element with scoped registry should not change its registry when moved out of the shadow tree.]
-    expected: FAIL
-
-  [An element with scoped registry should not change its registry when moved into another shadow tree with different scoped registry.]
-    expected: FAIL
-
   [Declarative shadow DOM with shadowrootcustomelementregistry attribute without registry initialized should remain null registry after adoption.]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/dom/abort/timeout-shadowrealm.any.js.ini b/testing/web-platform/meta/dom/abort/timeout-shadowrealm.any.js.ini
index 8d43f2f37de0b..4c92a3ca5fbe3 100644
--- a/testing/web-platform/meta/dom/abort/timeout-shadowrealm.any.js.ini
+++ b/testing/web-platform/meta/dom/abort/timeout-shadowrealm.any.js.ini
@@ -13,8 +13,8 @@
 
 [timeout-shadowrealm.any.shadowrealm-in-dedicatedworker.html]
   expected:
-    if not sessionHistoryInParent and not debug: [ERROR, TIMEOUT]
-    ERROR
+    if sessionHistoryInParent: ERROR
+    [ERROR, TIMEOUT]
 
 [timeout-shadowrealm.https.any.shadowrealm-in-audioworklet.html]
   expected:
diff --git a/testing/web-platform/meta/event-timing/gap-keydown-keyup.html.ini b/testing/web-platform/meta/event-timing/gap-keydown-keyup.html.ini
index 44f3ace7ed20e..07d4593e79afe 100644
--- a/testing/web-platform/meta/event-timing/gap-keydown-keyup.html.ini
+++ b/testing/web-platform/meta/event-timing/gap-keydown-keyup.html.ini
@@ -1,6 +1,6 @@
 [gap-keydown-keyup.html]
   [keydown duration shouldn't wait for keyup.]
     expected:
-      if (os == "win") and not debug and (processor == "x86_64"): [PASS, FAIL]
-      if (os == "mac") and not debug: [PASS, FAIL]
-      if (os == "android") and not debug: [PASS, FAIL]
+      if not debug and (os == "linux"): PASS
+      if debug: PASS
+      [PASS, FAIL]
diff --git a/testing/web-platform/meta/fedcm/fedcm-login-status/cross-origin-status.https.html.ini b/testing/web-platform/meta/fedcm/fedcm-login-status/cross-origin-status.https.html.ini
index 51e6250c0865a..7dc169ff2037e 100644
--- a/testing/web-platform/meta/fedcm/fedcm-login-status/cross-origin-status.https.html.ini
+++ b/testing/web-platform/meta/fedcm/fedcm-login-status/cross-origin-status.https.html.ini
@@ -1,6 +1,6 @@
 [cross-origin-status.https.html]
   expected:
-    if (os == "win") and not debug and (processor == "x86_64"): [ERROR, TIMEOUT]
+    if (os == "win") and not debug and (processor == "x86_64"): [TIMEOUT, ERROR]
     if (os == "win") and not debug and (processor == "x86"): [ERROR, TIMEOUT]
   [Cross-origin same-site status header should work from fetch()]
     expected: [PASS, FAIL]
@@ -19,10 +19,10 @@
 
   [Status header should be ignored from a fenced frame, even if it is same-origin]
     expected:
-      if (os == "win") and not debug: [PASS, NOTRUN, TIMEOUT]
       if (os == "win") and ccov: [PASS, NOTRUN]
+      if (os == "win") and not debug: [NOTRUN, PASS, TIMEOUT]
 
   [Status header should be ignored from cross-site iframe]
     expected:
-      if (os == "win") and not debug and (processor == "x86_64"): [PASS, TIMEOUT]
-      if (os == "win") and not debug and (processor == "x86"): [PASS, TIMEOUT]
+      if (os == "win") and not debug and (processor == "x86_64"): [TIMEOUT, PASS]
+      if (os == "win") and not debug and (processor == "x86"): [PASS, TIMEOUT, NOTRUN]
diff --git a/testing/web-platform/meta/fedcm/fedcm-login-status/logged-out.https.html.ini b/testing/web-platform/meta/fedcm/fedcm-login-status/logged-out.https.html.ini
index 0d9bcbd583709..26b712d2d22cf 100644
--- a/testing/web-platform/meta/fedcm/fedcm-login-status/logged-out.https.html.ini
+++ b/testing/web-platform/meta/fedcm/fedcm-login-status/logged-out.https.html.ini
@@ -1,3 +1,5 @@
 [logged-out.https.html]
+  expected:
+    if (processor == "x86") and not debug: [OK, ERROR]
   [User info request should fail because we are marked as not logged in]
     expected: FAIL
diff --git a/testing/web-platform/meta/html/browsers/the-window-object/window-open-noopener.html.ini b/testing/web-platform/meta/html/browsers/the-window-object/window-open-noopener.html.ini
index f8a0811c90256..e5c84fd494f74 100644
--- a/testing/web-platform/meta/html/browsers/the-window-object/window-open-noopener.html.ini
+++ b/testing/web-platform/meta/html/browsers/the-window-object/window-open-noopener.html.ini
@@ -1,12 +1,14 @@
 [window-open-noopener.html?_self]
   expected:
-    if (os == "win") and (processor == "x86"): [OK, CRASH]
+    if (os == "win") and (processor == "x86") and debug: [OK, CRASH]
+    if (os == "win") and (processor == "x86") and not debug: [OK, CRASH]
     if (os == "android") and not debug: [OK, ERROR]
 
 [window-open-noopener.html?indexed]
   expected:
     if (processor == "x86_64") and (os == "linux") and debug and not fission: [OK, CRASH]
-    if processor == "x86": [OK, CRASH]
+    if (processor == "x86") and debug: [OK, CRASH]
+    if (processor == "x86") and not debug: [OK, CRASH]
   [noopener=1 means the same as noopener]
     expected: FAIL
 
@@ -34,9 +36,9 @@
 
 [window-open-noopener.html?_parent]
   expected:
-    if (os == "win") and (processor == "x86"): [CRASH, OK, ERROR]
     if (os == "android") and not debug: [OK, ERROR]
 
 [window-open-noopener.html?_top]
   expected:
+    if (os == "win") and debug and (processor == "x86"): [OK, CRASH]
     if (os == "android") and not debug: [OK, ERROR]
diff --git a/testing/web-platform/meta/html/rendering/replaced-elements/embedded-content/change-src-while-not-displayed.html.ini b/testing/web-platform/meta/html/rendering/replaced-elements/embedded-content/change-src-while-not-displayed.html.ini
index bb4e40f7ee792..dd87930133a7c 100644
--- a/testing/web-platform/meta/html/rendering/replaced-elements/embedded-content/change-src-while-not-displayed.html.ini
+++ b/testing/web-platform/meta/html/rendering/replaced-elements/embedded-content/change-src-while-not-displayed.html.ini
@@ -3,4 +3,5 @@
     if (os == "linux") and swgl and debug and fission: [PASS, FAIL]
     if (os == "win") and debug and not swgl: [PASS, FAIL]
     if (os == "linux") and swgl and not debug: [PASS, FAIL]
+    if (os == "android") and debug and not swgl: [PASS, FAIL]
     if (os == "linux") and not swgl: [PASS, FAIL]
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy-attribute.https.sub.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy-attribute.https.sub.html.ini
index f987935ec778e..e4338d353dee4 100644
--- a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy-attribute.https.sub.html.ini
+++ b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy-attribute.https.sub.html.ini
@@ -1,13 +1,14 @@
 implementation-status: backlog
 [autoplay-allowed-by-feature-policy-attribute.https.sub.html]
   expected:
-    if os_version == "14.70": [OK, TIMEOUT]
-    if os_version == "14": [OK, TIMEOUT]
+    if os == "mac": [OK, TIMEOUT]
+    if os == "android": [OK, TIMEOUT]
   [Feature policy "autoplay" can be enabled in cross-origin iframe using allow="autoplay" attribute]
     expected:
-      if os_version == "14.70": [PASS, TIMEOUT]
-      if os_version == "14": [PASS, TIMEOUT]
+      if os == "mac": [PASS, TIMEOUT]
+      if os == "android": [PASS, TIMEOUT]
 
   [Feature policy "autoplay" can be enabled in same-origin iframe using allow="autoplay" attribute]
     expected:
       if os == "mac": [PASS, TIMEOUT]
+      if os == "android": [PASS, TIMEOUT]
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy.https.sub.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy.https.sub.html.ini
index 795a72d70a071..53142aecb9b97 100644
--- a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy.https.sub.html.ini
+++ b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-allowed-by-feature-policy.https.sub.html.ini
@@ -1,21 +1,19 @@
 implementation-status: backlog
 [autoplay-allowed-by-feature-policy.https.sub.html]
   expected:
-    if (os == "android") and (version == "7.0"): OK
     if os == "linux": OK
     [OK, TIMEOUT]
   [Feature-Policy header: autoplay * allows cross-origin iframes.]
     expected:
-      if (os == "android") and (version == "7.0"): PASS
       if os == "linux": PASS
       [PASS, TIMEOUT]
 
   [Feature-Policy header: autoplay * allows same-origin iframes.]
     expected:
-      if (os == "android") and (version == "7.0"): PASS
       if os == "linux": PASS
       [PASS, TIMEOUT]
 
   [Feature-Policy header: autoplay * allows the top-level document.]
     expected:
       if os == "mac": [PASS, TIMEOUT]
+      if os == "android": [PASS, TIMEOUT]
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-default-feature-policy.https.sub.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-default-feature-policy.https.sub.html.ini
index 196c271a1103c..56729fb1169db 100644
--- a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-default-feature-policy.https.sub.html.ini
+++ b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-default-feature-policy.https.sub.html.ini
@@ -12,6 +12,7 @@ implementation-status: backlog
   [Default "autoplay" feature policy ["self"\] allows same-origin iframes.]
     expected:
       if os == "mac": [PASS, TIMEOUT]
+      if os == "android": [PASS, TIMEOUT]
 
   [Default "autoplay" feature policy ["self"\] allows the top-level document.]
     expected:
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-disabled-by-feature-policy.https.sub.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-disabled-by-feature-policy.https.sub.html.ini
index 743df5759e2cc..7ecb93700e9c0 100644
--- a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-disabled-by-feature-policy.https.sub.html.ini
+++ b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-disabled-by-feature-policy.https.sub.html.ini
@@ -1,19 +1,21 @@
 implementation-status: backlog
 [autoplay-disabled-by-feature-policy.https.sub.html]
   expected:
-    if (os == "android") and (version == "14"): [OK, TIMEOUT]
     if os == "mac": [OK, TIMEOUT]
+    if os == "android": [OK, TIMEOUT]
   [Feature-Policy header: autoplay "none" disallows same-origin iframes.]
     expected:
       if os == "mac": [FAIL, TIMEOUT]
+      if os == "android": [FAIL, TIMEOUT]
       FAIL
 
   [Feature-Policy header: autoplay "none" disallows cross-origin iframes.]
     expected:
-      if (os == "android") and (version == "14"): [FAIL, TIMEOUT]
       if os == "mac": [FAIL, TIMEOUT]
+      if os == "android": [FAIL, TIMEOUT]
       FAIL
 
   [Feature-Policy header: autoplay "none" has no effect on the top level document.]
     expected:
       if os == "mac": [PASS, TIMEOUT]
+      if os == "android": [PASS, TIMEOUT]
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html.ini
index 5e78f1cb44c3c..b086a73315356 100644
--- a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html.ini
+++ b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html.ini
@@ -1,2 +1,4 @@
 [load-events-networkState.html]
   bug: 1709960
+  expected:
+    if (os == "android") and debug: TIMEOUT
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html.ini
index 02d2396f985e9..fb447ae9e6aff 100644
--- a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html.ini
+++ b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-candidate-insert-before.html.ini
@@ -1,12 +1,13 @@
 [resource-selection-candidate-insert-before.html]
+  expected:
+    if (os == "android") and debug and not sessionHistoryInParent: [TIMEOUT, OK]
+    if (os == "android") and not debug and sessionHistoryInParent: [TIMEOUT, OK]
+    if (os == "android") and not debug and not sessionHistoryInParent: [TIMEOUT, OK]
   [inserting another source before the candidate]
     expected:
       if (os == "win") and (os_version == "11.26100") and ccov: [PASS, FAIL]
-      if (os == "linux") and not debug and not asan and tsan: [PASS, FAIL]
-      if (os == "linux") and debug and not fission: [PASS, FAIL]
-      if (os == "linux") and not debug and asan: [PASS, FAIL]
-      if (os == "android") and debug and sessionHistoryInParent: [FAIL, PASS]
+      if (os == "android") and not debug and not sessionHistoryInParent: FAIL
       if (os == "win") and not debug: FAIL
+      if (os == "linux") and tsan: [PASS, FAIL]
       if os == "mac": FAIL
-      if (os == "android") and not sessionHistoryInParent and not debug: FAIL
       [FAIL, PASS]
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/modulepreload-referrerpolicy.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/modulepreload-referrerpolicy.html.ini
index e97b2738f9166..985a8c6203638 100644
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/modulepreload-referrerpolicy.html.ini
+++ b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/modulepreload-referrerpolicy.html.ini
@@ -7,6 +7,7 @@
 
   [Modulepreload with strict-origin policy should send origin-only referrer]
     expected:
+      if (os == "linux") and not asan and not debug and not tsan: [PASS, FAIL]
       if (os == "win") and debug and (processor == "x86_64"): [PASS, FAIL]
       if (os == "linux") and asan and fission: [PASS, FAIL]
       if (os == "android") and sessionHistoryInParent and debug: [PASS, FAIL]
diff --git a/testing/web-platform/meta/mediacapture-record/MediaRecorder-canvas-media-source.https.html.ini b/testing/web-platform/meta/mediacapture-record/MediaRecorder-canvas-media-source.https.html.ini
index 837ce8816c2cf..eeed3099f1a1f 100644
--- a/testing/web-platform/meta/mediacapture-record/MediaRecorder-canvas-media-source.https.html.ini
+++ b/testing/web-platform/meta/mediacapture-record/MediaRecorder-canvas-media-source.https.html.ini
@@ -58,5 +58,6 @@
 
 [MediaRecorder-canvas-media-source.https.html?mimeType=video/mp4;codecs=av01,mp4a.40.2]
   expected:
+    if (os == "mac") and debug: [OK, TIMEOUT]
     if (os == "mac") and not debug: [OK, TIMEOUT]
     if (os == "linux") and not fission: [OK, CRASH]
diff --git a/testing/web-platform/meta/mediacapture-record/MediaRecorder-creation.https.html.ini b/testing/web-platform/meta/mediacapture-record/MediaRecorder-creation.https.html.ini
index ceef73fe4cc40..04d9875acf2a2 100644
--- a/testing/web-platform/meta/mediacapture-record/MediaRecorder-creation.https.html.ini
+++ b/testing/web-platform/meta/mediacapture-record/MediaRecorder-creation.https.html.ini
@@ -1,4 +1,4 @@
 [MediaRecorder-creation.https.html]
   expected:
     if (os == "linux") and not debug and fission: [OK, CRASH]
-    if (os == "android") and fission: [OK, TIMEOUT]
+    if (os == "mac") and debug: [OK, TIMEOUT]
diff --git a/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html.ini b/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html.ini
index 00d68e9d655dc..ba02046155829 100644
--- a/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html.ini
+++ b/testing/web-platform/meta/mediacapture-record/MediaRecorder-peerconnection-no-sink.https.html.ini
@@ -1,11 +1,10 @@
 [MediaRecorder-peerconnection-no-sink.https.html]
   expected:
     if (os == "android") and release_or_beta: OK
-    if (os_version == "24.04") and not debug and fission: [OK, CRASH]
-    if (os_version == "14.70") and not debug: [OK, TIMEOUT]
-    if os_version == "7.0": [OK, TIMEOUT]
-    if os_version == "18.04": [OK, CRASH]
-    if os_version == "14": [OK, TIMEOUT]
+    if (os == "linux") and not debug and fission: [OK, CRASH]
+    if (os == "mac") and debug: [OK, TIMEOUT]
+    if (os == "mac") and not debug: [OK, TIMEOUT]
+    if os == "android": [OK, TIMEOUT]
   [MediaRecorder records from PeerConnection without sinks, {"video":{}}]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1669551
     expected:
diff --git a/testing/web-platform/meta/mozilla-sync b/testing/web-platform/meta/mozilla-sync
index 39259576aa7b3..984c0ede061a2 100644
--- a/testing/web-platform/meta/mozilla-sync
+++ b/testing/web-platform/meta/mozilla-sync
@@ -1 +1 @@
-upstream: 690f95ba24fdbe74cb0085793c448a4a989e5ed7
+upstream: 10bbfe6bcf96c8df39cd2d759fd33cbe05e99cbc
diff --git a/testing/web-platform/meta/pointerevents/pointerevent_after_target_removed_interleaved.tentative.html.ini b/testing/web-platform/meta/pointerevents/pointerevent_after_target_removed_interleaved.tentative.html.ini
index 2685882fb3e2a..131e008c4fccf 100644
--- a/testing/web-platform/meta/pointerevents/pointerevent_after_target_removed_interleaved.tentative.html.ini
+++ b/testing/web-platform/meta/pointerevents/pointerevent_after_target_removed_interleaved.tentative.html.ini
@@ -8,6 +8,7 @@
 
 [pointerevent_after_target_removed_interleaved.tentative.html?touch]
   expected:
+    if (os == "win") and debug and (processor == "x86"): [OK, TIMEOUT]
     if (os == "linux") and debug: [OK, TIMEOUT]
   [mouse events from touch received before/after child removal at pointerdown]
     expected:
@@ -16,6 +17,7 @@
 
   [mouse events from touch received before/after child removal at pointerup]
     expected:
+      if (os == "win") and debug and (processor == "x86"): [FAIL, TIMEOUT]
       if (os == "linux") and debug: [FAIL, NOTRUN]
       FAIL
 
diff --git a/testing/web-platform/meta/pointerevents/pointerevent_click_is_a_pointerevent.html.ini b/testing/web-platform/meta/pointerevents/pointerevent_click_is_a_pointerevent.html.ini
index 6129c88fc9836..29d46a9660b83 100644
--- a/testing/web-platform/meta/pointerevents/pointerevent_click_is_a_pointerevent.html.ini
+++ b/testing/web-platform/meta/pointerevents/pointerevent_click_is_a_pointerevent.html.ini
@@ -13,16 +13,16 @@
 
 [pointerevent_click_is_a_pointerevent.html?touch]
   expected:
-    if (os == "win") and debug and (processor == "x86"): [OK, TIMEOUT]
-    if (os == "linux") and debug and not fission: [OK, TIMEOUT]
+    if (processor == "x86_64") and (os == "linux") and debug and not fission: [OK, TIMEOUT]
+    if (processor == "x86") and debug: [OK, TIMEOUT]
   [click using touch is a PointerEvent with correct properties]
     expected:
       if (os == "linux") and debug and not fission: [PASS, TIMEOUT]
 
   [click using touch is a PointerEvent with correct properties in a subframe]
     expected:
-      if (os == "win") and debug and (processor == "x86"): [PASS, NOTRUN]
-      if (os == "linux") and debug and not fission: [PASS, NOTRUN]
+      if (processor == "x86_64") and (os == "linux") and debug and not fission: [PASS, NOTRUN]
+      if (processor == "x86") and debug: [PASS, TIMEOUT, NOTRUN]
 
   [click using touch is a PointerEvent with correct properties when no other PointerEvent listeners are present]
     expected:
diff --git a/testing/web-platform/meta/streams/piping/flow-control.any.js.ini b/testing/web-platform/meta/streams/piping/flow-control.any.js.ini
index bb382831b6546..ca59d97eb8c8f 100644
--- a/testing/web-platform/meta/streams/piping/flow-control.any.js.ini
+++ b/testing/web-platform/meta/streams/piping/flow-control.any.js.ini
@@ -11,6 +11,8 @@
     if (os == "android") and debug and sessionHistoryInParent: [OK, TIMEOUT]
 
 [flow-control.any.html]
+  expected:
+    if not sessionHistoryInParent and not debug: [OK, TIMEOUT]
 
 [flow-control.any.shadowrealm.html]
   expected: ERROR
@@ -32,7 +34,7 @@
 
 [flow-control.any.shadowrealm-in-dedicatedworker.html]
   expected:
-    if (os == "win") and not debug and (processor == "x86_64"): [ERROR, CRASH]
+    if (os == "win") and not debug: [ERROR, CRASH]
     ERROR
 
 [flow-control.any.shadowrealm-in-shadowrealm.html]
diff --git a/testing/web-platform/meta/streams/piping/general-addition.any.js.ini b/testing/web-platform/meta/streams/piping/general-addition.any.js.ini
index 02a9a40f6e403..e1e5ed398390e 100644
--- a/testing/web-platform/meta/streams/piping/general-addition.any.js.ini
+++ b/testing/web-platform/meta/streams/piping/general-addition.any.js.ini
@@ -18,7 +18,9 @@
   expected: [ERROR, TIMEOUT]
 
 [general-addition.any.shadowrealm-in-sharedworker.html]
-  expected: ERROR
+  expected:
+    if not sessionHistoryInParent and not debug: [ERROR, TIMEOUT]
+    ERROR
 
 [general-addition.any.shadowrealm-in-shadowrealm.html]
   expected:
diff --git a/testing/web-platform/meta/streams/readable-byte-streams/enqueue-with-detached-buffer.any.js.ini b/testing/web-platform/meta/streams/readable-byte-streams/enqueue-with-detached-buffer.any.js.ini
index 255f525b2da74..feeeed9aa8189 100644
--- a/testing/web-platform/meta/streams/readable-byte-streams/enqueue-with-detached-buffer.any.js.ini
+++ b/testing/web-platform/meta/streams/readable-byte-streams/enqueue-with-detached-buffer.any.js.ini
@@ -1,4 +1,6 @@
 [enqueue-with-detached-buffer.any.sharedworker.html]
+  expected:
+    if (os == "android") and sessionHistoryInParent and not debug: [OK, TIMEOUT]
 
 [enqueue-with-detached-buffer.any.worker.html]
   expected:
@@ -32,7 +34,8 @@
 
 [enqueue-with-detached-buffer.any.shadowrealm-in-shadowrealm.html]
   expected:
-    if not sessionHistoryInParent and debug: [ERROR, TIMEOUT]
+    if (os == "android") and sessionHistoryInParent and not debug: [ERROR, TIMEOUT]
+    if (os == "android") and not sessionHistoryInParent and debug: [ERROR, TIMEOUT]
     ERROR
 
 [enqueue-with-detached-buffer.any.shadowrealm-in-window.html]
diff --git a/testing/web-platform/meta/streams/readable-byte-streams/general.any.js.ini b/testing/web-platform/meta/streams/readable-byte-streams/general.any.js.ini
index fdd3a163091e0..cdda6edfeed0c 100644
--- a/testing/web-platform/meta/streams/readable-byte-streams/general.any.js.ini
+++ b/testing/web-platform/meta/streams/readable-byte-streams/general.any.js.ini
@@ -11,6 +11,7 @@
 
 [general.any.serviceworker.html]
   expected:
+    if sessionHistoryInParent and (os == "android") and not debug: [OK, TIMEOUT]
     if not sessionHistoryInParent and not debug: [OK, TIMEOUT]
 
 [general.any.sharedworker.html]
@@ -40,8 +41,8 @@
 
 [general.any.shadowrealm-in-window.html]
   expected:
-    if (os == "android") and debug and sessionHistoryInParent: [ERROR, TIMEOUT]
-    if (os == "android") and not debug and not sessionHistoryInParent: [ERROR, TIMEOUT]
+    if (os == "android") and sessionHistoryInParent and debug: [ERROR, TIMEOUT]
+    if (os == "android") and not sessionHistoryInParent and not debug: [ERROR, TIMEOUT]
     ERROR
 
 [general.https.any.shadowrealm-in-audioworklet.html]
diff --git a/testing/web-platform/meta/streams/readable-byte-streams/non-transferable-buffers.any.js.ini b/testing/web-platform/meta/streams/readable-byte-streams/non-transferable-buffers.any.js.ini
index 5fb1bff658a07..d2b7c14b3a47d 100644
--- a/testing/web-platform/meta/streams/readable-byte-streams/non-transferable-buffers.any.js.ini
+++ b/testing/web-platform/meta/streams/readable-byte-streams/non-transferable-buffers.any.js.ini
@@ -31,9 +31,7 @@
   expected: ERROR
 
 [non-transferable-buffers.https.any.shadowrealm-in-audioworklet.html]
-  expected:
-    if (os == "android") and debug and sessionHistoryInParent: TIMEOUT
-    ERROR
+  expected: ERROR
 
 [non-transferable-buffers.any.shadowrealm-in-shadowrealm.html]
   expected: ERROR
@@ -44,4 +42,6 @@
     ERROR
 
 [non-transferable-buffers.any.shadowrealm-in-sharedworker.html]
-  expected: ERROR
+  expected:
+    if (os == "android") and sessionHistoryInParent and not debug: [ERROR, TIMEOUT]
+    ERROR
diff --git a/testing/web-platform/meta/streams/readable-byte-streams/patched-global.any.js.ini b/testing/web-platform/meta/streams/readable-byte-streams/patched-global.any.js.ini
index d5ee54c2e7f60..6220a0db55798 100644
--- a/testing/web-platform/meta/streams/readable-byte-streams/patched-global.any.js.ini
+++ b/testing/web-platform/meta/streams/readable-byte-streams/patched-global.any.js.ini
@@ -8,8 +8,7 @@
 
 [patched-global.any.shadowrealm-in-dedicatedworker.html]
   expected:
-    if (os == "android") and debug and sessionHistoryInParent: [ERROR, TIMEOUT]
-    if (os == "android") and debug and not sessionHistoryInParent: [ERROR, TIMEOUT]
+    if (os == "android") and debug: [ERROR, TIMEOUT]
     ERROR
 
 [patched-global.https.any.shadowrealm-in-audioworklet.html]
@@ -24,7 +23,9 @@
   expected: ERROR
 
 [patched-global.https.any.shadowrealm-in-serviceworker.html]
-  expected: ERROR
+  expected:
+    if not sessionHistoryInParent and not debug: [ERROR, TIMEOUT]
+    ERROR
 
 [patched-global.any.sharedworker.html]
   expected:
diff --git a/testing/web-platform/meta/streams/readable-streams/floating-point-total-queue-size.any.js.ini b/testing/web-platform/meta/streams/readable-streams/floating-point-total-queue-size.any.js.ini
index 43b642f89abba..5f6b5321ddd46 100644
--- a/testing/web-platform/meta/streams/readable-streams/floating-point-total-queue-size.any.js.ini
+++ b/testing/web-platform/meta/streams/readable-streams/floating-point-total-queue-size.any.js.ini
@@ -8,11 +8,10 @@
 
 [floating-point-total-queue-size.any.sharedworker.html]
   expected:
+    if (os == "android") and sessionHistoryInParent and debug: TIMEOUT
     if (os == "android") and sessionHistoryInParent and not debug: [OK, TIMEOUT]
 
 [floating-point-total-queue-size.any.html]
-  expected:
-    if not sessionHistoryInParent and debug: TIMEOUT
 
 [floating-point-total-queue-size.any.shadowrealm.html]
   expected:
diff --git a/testing/web-platform/meta/streams/readable-streams/global.html.ini b/testing/web-platform/meta/streams/readable-streams/global.html.ini
index 7611922f98f9e..20496b3e12905 100644
--- a/testing/web-platform/meta/streams/readable-streams/global.html.ini
+++ b/testing/web-platform/meta/streams/readable-streams/global.html.ini
@@ -1,3 +1,4 @@
 [global.html]
   expected:
+    if sessionHistoryInParent and (os == "android") and debug: [OK, TIMEOUT]
     if not sessionHistoryInParent and not debug: [OK, TIMEOUT]
diff --git a/testing/web-platform/meta/streams/transform-streams/errors.any.js.ini b/testing/web-platform/meta/streams/transform-streams/errors.any.js.ini
index ad923d9de6abf..606cbb19a2bcb 100644
--- a/testing/web-platform/meta/streams/transform-streams/errors.any.js.ini
+++ b/testing/web-platform/meta/streams/transform-streams/errors.any.js.ini
@@ -36,6 +36,7 @@
 
 [errors.any.shadowrealm-in-shadowrealm.html]
   expected:
+    if (os == "android") and debug and not sessionHistoryInParent: TIMEOUT
     if (os == "win") and not debug: [ERROR, CRASH]
     ERROR
 
diff --git a/testing/web-platform/meta/streams/transform-streams/terminate.any.js.ini b/testing/web-platform/meta/streams/transform-streams/terminate.any.js.ini
index 1fbe190445511..312bea4f59275 100644
--- a/testing/web-platform/meta/streams/transform-streams/terminate.any.js.ini
+++ b/testing/web-platform/meta/streams/transform-streams/terminate.any.js.ini
@@ -19,7 +19,9 @@
     ERROR
 
 [terminate.any.shadowrealm-in-shadowrealm.html]
-  expected: ERROR
+  expected:
+    if not sessionHistoryInParent and debug: TIMEOUT
+    ERROR
 
 [terminate.https.any.shadowrealm-in-serviceworker.html]
   expected: [ERROR, TIMEOUT]
diff --git a/testing/web-platform/meta/streams/writable-streams/error.any.js.ini b/testing/web-platform/meta/streams/writable-streams/error.any.js.ini
index 89c1d65582de2..826b7604df55c 100644
--- a/testing/web-platform/meta/streams/writable-streams/error.any.js.ini
+++ b/testing/web-platform/meta/streams/writable-streams/error.any.js.ini
@@ -1,7 +1,7 @@
 [error.any.serviceworker.html]
   expected:
     if (os == "android") and not debug and sessionHistoryInParent: [OK, ERROR, TIMEOUT]
-    if (os == "android") and not debug and not sessionHistoryInParent: [OK, ERROR]
+    if (os == "android") and not debug and not sessionHistoryInParent: [OK, TIMEOUT, ERROR]
     if (os == "mac") and not debug: [OK, ERROR]
 
 [error.any.worker.html]
@@ -12,9 +12,9 @@
 
 [error.any.sharedworker.html]
   expected:
-    if (os == "android") and debug and not sessionHistoryInParent: [OK, TIMEOUT]
-    if (os == "android") and not debug and sessionHistoryInParent: [OK, CRASH]
-    if (os == "android") and not debug and not sessionHistoryInParent: [OK, TIMEOUT, CRASH]
+    if sessionHistoryInParent and (os == "android") and not debug: [OK, CRASH]
+    if not sessionHistoryInParent and debug: [OK, TIMEOUT]
+    if not sessionHistoryInParent and not debug: [OK, TIMEOUT, CRASH]
 
 [error.any.shadowrealm.html]
   expected:
diff --git a/testing/web-platform/meta/wasm/jsapi/esm-integration/js-wasm-cycle.tentative.any.js.ini b/testing/web-platform/meta/wasm/jsapi/esm-integration/js-wasm-cycle.tentative.any.js.ini
index 08bc281459f46..382706c53769b 100644
--- a/testing/web-platform/meta/wasm/jsapi/esm-integration/js-wasm-cycle.tentative.any.js.ini
+++ b/testing/web-platform/meta/wasm/jsapi/esm-integration/js-wasm-cycle.tentative.any.js.ini
@@ -19,14 +19,16 @@
   expected: ERROR
 
 [js-wasm-cycle.tentative.any.html]
+  expected:
+    if not sessionHistoryInParent and not debug: [OK, TIMEOUT]
   [Check bindings in JavaScript and WebAssembly cycle (JS higher)]
     expected: FAIL
 
+
 [js-wasm-cycle.tentative.any.js]
   [Check bindings in JavaScript and WebAssembly cycle (JS higher)]
     expected: FAIL
 
+
 [js-wasm-cycle.tentative.https.any.shadowrealm-in-serviceworker.html]
-  expected:
-    if (os == "android") and debug and sessionHistoryInParent: TIMEOUT
-    ERROR
+  expected: ERROR
diff --git a/testing/web-platform/meta/wasm/jsapi/instance/constructor.any.js.ini b/testing/web-platform/meta/wasm/jsapi/instance/constructor.any.js.ini
index fb1eec3360d09..67e8a94574f6a 100644
--- a/testing/web-platform/meta/wasm/jsapi/instance/constructor.any.js.ini
+++ b/testing/web-platform/meta/wasm/jsapi/instance/constructor.any.js.ini
@@ -3,6 +3,8 @@
     if not sessionHistoryInParent and not debug: [OK, TIMEOUT]
 
 [constructor.any.worker.html]
+  expected:
+    if (os == "android") and sessionHistoryInParent and not debug: [OK, TIMEOUT]
 
 [constructor.any.shadowrealm.html]
   expected: ERROR
diff --git a/testing/web-platform/meta/wasm/jsapi/instance/toString.any.js.ini b/testing/web-platform/meta/wasm/jsapi/instance/toString.any.js.ini
index dfa1daa5c9905..63d89a5cc69d8 100644
--- a/testing/web-platform/meta/wasm/jsapi/instance/toString.any.js.ini
+++ b/testing/web-platform/meta/wasm/jsapi/instance/toString.any.js.ini
@@ -27,4 +27,6 @@
   expected: ERROR
 
 [toString.any.shadowrealm-in-shadowrealm.html]
-  expected: ERROR
+  expected:
+    if (os == "android") and sessionHistoryInParent and not debug: [ERROR, TIMEOUT]
+    ERROR
diff --git a/testing/web-platform/meta/wasm/jsapi/module/moduleSource.tentative.any.js.ini b/testing/web-platform/meta/wasm/jsapi/module/moduleSource.tentative.any.js.ini
index 222976f206c9c..570e6b1160416 100644
--- a/testing/web-platform/meta/wasm/jsapi/module/moduleSource.tentative.any.js.ini
+++ b/testing/web-platform/meta/wasm/jsapi/module/moduleSource.tentative.any.js.ini
@@ -22,7 +22,7 @@
 
 [moduleSource.tentative.any.worker.html]
   expected:
-    if (os == "win") and not debug and (processor == "x86_64"): [OK, CRASH]
+    if (os == "win") and not debug: [OK, CRASH]
     if (os == "android") and debug: [OK, TIMEOUT]
   [AbstractModuleSource intrinsic]
     expected: FAIL
@@ -51,7 +51,9 @@
   expected: [ERROR, TIMEOUT]
 
 [moduleSource.tentative.any.shadowrealm-in-window.html]
-  expected: ERROR
+  expected:
+    if (os == "android") and sessionHistoryInParent and not debug: [ERROR, TIMEOUT]
+    ERROR
 
 [moduleSource.tentative.https.any.shadowrealm-in-audioworklet.html]
   expected:
diff --git a/testing/web-platform/meta/wasm/jsapi/tag/toString.tentative.any.js.ini b/testing/web-platform/meta/wasm/jsapi/tag/toString.tentative.any.js.ini
index 92e5ff50d3a12..0929660648111 100644
--- a/testing/web-platform/meta/wasm/jsapi/tag/toString.tentative.any.js.ini
+++ b/testing/web-platform/meta/wasm/jsapi/tag/toString.tentative.any.js.ini
@@ -4,6 +4,7 @@
 
 [toString.tentative.any.html]
   expected:
+    if (os == "android") and debug and sessionHistoryInParent: TIMEOUT
     if (os == "android") and not debug: [OK, TIMEOUT]
 
 [toString.tentative.any.shadowrealm.html]
@@ -27,8 +28,7 @@
 
 [toString.tentative.any.shadowrealm-in-window.html]
   expected:
-    if not sessionHistoryInParent and debug: TIMEOUT
-    if not sessionHistoryInParent and not debug: [ERROR, TIMEOUT]
+    if not sessionHistoryInParent: [ERROR, TIMEOUT]
     ERROR
 
 [toString.tentative.any.shadowrealm-in-sharedworker.html]
diff --git a/testing/web-platform/meta/web-animations/animation-trigger/event-trigger-alternate.tentative.html.ini b/testing/web-platform/meta/web-animations/animation-trigger/event-trigger-alternate.tentative.html.ini
deleted file mode 100644
index 37c315d7333a4..0000000000000
--- a/testing/web-platform/meta/web-animations/animation-trigger/event-trigger-alternate.tentative.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[event-trigger-alternate.tentative.html]
-  [Basic event-based animation-trigger with 'alternate' behavior]
-    expected: FAIL
diff --git a/testing/web-platform/meta/web-animations/animation-trigger/event-trigger-state.tentative.html.ini b/testing/web-platform/meta/web-animations/animation-trigger/event-trigger-state.tentative.html.ini
deleted file mode 100644
index 93cc7304bf182..0000000000000
--- a/testing/web-platform/meta/web-animations/animation-trigger/event-trigger-state.tentative.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[event-trigger-state.tentative.html]
-  [Basic event-based animation-trigger with 'state' behavior]
-    expected: FAIL
diff --git a/testing/web-platform/meta/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-rendersizehint.html.ini b/testing/web-platform/meta/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-rendersizehint.html.ini
index 6afb4793d0841..0b2a99172d171 100644
--- a/testing/web-platform/meta/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-rendersizehint.html.ini
+++ b/testing/web-platform/meta/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-rendersizehint.html.ini
@@ -1,4 +1,6 @@
 [audiocontext-rendersizehint.html]
+  expected:
+    if not sessionHistoryInParent and not debug: [OK, TIMEOUT]
   [AudioContext with no renderSizeHint]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/webcodecs/video-encoder-h26x-annexb.https.any.js.ini b/testing/web-platform/meta/webcodecs/video-encoder-h26x-annexb.https.any.js.ini
index 55599a37e6bad..34dba6e737a04 100644
--- a/testing/web-platform/meta/webcodecs/video-encoder-h26x-annexb.https.any.js.ini
+++ b/testing/web-platform/meta/webcodecs/video-encoder-h26x-annexb.https.any.js.ini
@@ -8,13 +8,15 @@
     if (os == "android") or (version == "Ubuntu 18.04"): not implemented
   [Verify stream compliance h26x annexb]
     expected:
-      if os == "win": PRECONDITION_FAILED
-      if os == "linux": PRECONDITION_FAILED
+      if os == "mac": PASS
+      PRECONDITION_FAILED
 
 
 [video-encoder-h26x-annexb.https.any.html?h265_annexb_software]
   disabled:
     if (os == "android") or (version == "Ubuntu 18.04"): not implemented
+  expected:
+    if tsan: [OK, CRASH]
   [Verify stream compliance h26x annexb]
     expected:
       if os == "linux": PASS
@@ -43,15 +45,11 @@
 [video-encoder-h26x-annexb.https.any.worker.html?h264_annexb_software]
   [Verify stream compliance h26x annexb]
     expected:
-      if (os == "linux") and (version == "Ubuntu 18.04"): PRECONDITION_FAILED
       if os == "android": PRECONDITION_FAILED
 
 
 [video-encoder-h26x-annexb.https.any.worker.html?h264_annexb_hardware]
   [Verify stream compliance h26x annexb]
     expected:
-      if tsan: PRECONDITION_FAILED
-      if os == "linux": PRECONDITION_FAILED
       if os == "mac": PASS
-      if os == "win": PRECONDITION_FAILED
       PRECONDITION_FAILED
diff --git a/testing/web-platform/meta/webdriver/tests/bidi/browser/set_download_behavior/user_context.py.ini b/testing/web-platform/meta/webdriver/tests/bidi/browser/set_download_behavior/user_context.py.ini
index 378bb35a165fa..d207f56e02ed2 100644
--- a/testing/web-platform/meta/webdriver/tests/bidi/browser/set_download_behavior/user_context.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/bidi/browser/set_download_behavior/user_context.py.ini
@@ -1,5 +1,6 @@
 [user_context.py]
   expected:
+    if (os == "linux") and (display == "wayland") and not debug: [OK, TIMEOUT]
     if (os == "mac") and not debug: [OK, TIMEOUT]
   [test_user_contexts[True-new\]]
     expected: FAIL
diff --git a/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/activate/activate.py.ini b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/activate/activate.py.ini
index 99e6e972575ff..4c209278bf41f 100644
--- a/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/activate/activate.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/activate/activate.py.ini
@@ -1,6 +1,7 @@
 [activate.py]
   expected:
-    if not fission and not debug and sessionHistoryInParent and (os == "android"): [OK, TIMEOUT]
+    if (os == "android") and not debug and not fission and sessionHistoryInParent: [OK, TIMEOUT]
+    if (os == "linux") and (display == "wayland") and not debug: [OK, CRASH]
   [test_activate_window]
     disabled:
       if os == "android": Not supported
diff --git a/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/activate/invalid.py.ini b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/activate/invalid.py.ini
new file mode 100644
index 0000000000000..582d0600149a1
--- /dev/null
+++ b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/activate/invalid.py.ini
@@ -0,0 +1,3 @@
+[invalid.py]
+  expected:
+    if (display == "wayland") and not debug: [OK, TIMEOUT]
diff --git a/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/capture_screenshot/origin.py.ini b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/capture_screenshot/origin.py.ini
new file mode 100644
index 0000000000000..fb68cc4d3b635
--- /dev/null
+++ b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/capture_screenshot/origin.py.ini
@@ -0,0 +1,3 @@
+[origin.py]
+  expected:
+    if (display == "wayland") and not debug: [OK, CRASH]
diff --git a/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/close/prompt_unload.py.ini b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/close/prompt_unload.py.ini
index 8a232c9d1bf78..e07e03951cba6 100644
--- a/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/close/prompt_unload.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/close/prompt_unload.py.ini
@@ -1,4 +1,6 @@
 [prompt_unload.py]
+  expected:
+    if (display == "wayland") and not debug: [OK, CRASH]
   [test_prompt_unload_triggering_dialog[window\]]
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1879324
     expected:
diff --git a/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/context_created/original_opener.py.ini b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/context_created/original_opener.py.ini
index 0b4c853c7b34e..ca13f1326ca9d 100644
--- a/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/context_created/original_opener.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/bidi/browsing_context/context_created/original_opener.py.ini
@@ -1,5 +1,6 @@
 [original_opener.py]
   expected:
-    if (os == "linux") and (display == "x11") and tsan: [OK, TIMEOUT]
-    if (os == "linux") and (display == "wayland") and not debug: [OK, TIMEOUT]
+    if (os == "linux") and not tsan and (display == "wayland") and debug: [OK, CRASH]
+    if (os == "linux") and not tsan and (display == "wayland") and not debug: [OK, TIMEOUT]
     if (os == "mac") and not debug: [OK, TIMEOUT]
+    if (os == "linux") and tsan: [OK, TIMEOUT]
diff --git a/testing/web-platform/meta/webdriver/tests/bidi/network/continue_response/invalid.py.ini b/testing/web-platform/meta/webdriver/tests/bidi/network/continue_response/invalid.py.ini
index 3c7f171dc404d..280eb57bcba64 100644
--- a/testing/web-platform/meta/webdriver/tests/bidi/network/continue_response/invalid.py.ini
+++ b/testing/web-platform/meta/webdriver/tests/bidi/network/continue_response/invalid.py.ini
@@ -570,3 +570,7 @@
   [test_params_status_code_invalid_value[4.3\]]
     expected:
       if tsan: [PASS, ERROR]
+
+  [test_params_cookies_invalid_type[False\]]
+    expected:
+      if (os == "win") and debug: [PASS, FAIL]
diff --git a/testing/web-platform/meta/webdriver/tests/bidi/network/response_started/response_started.py.ini b/testing/web-platform/meta/webdriver/tests/bidi/network/response_started/response_started.py.ini
new file mode 100644
index 0000000000000..c30980465f528
--- /dev/null
+++ b/testing/web-platform/meta/webdriver/tests/bidi/network/response_started/response_started.py.ini
@@ -0,0 +1,3 @@
+[response_started.py]
+  expected:
+    if (display == "wayland") and debug: [OK, CRASH]
diff --git a/testing/web-platform/meta/webidl/ecmascript-binding/es-exceptions/DOMException-constructor-and-prototype.any.js.ini b/testing/web-platform/meta/webidl/ecmascript-binding/es-exceptions/DOMException-constructor-and-prototype.any.js.ini
index 695c4f989e49f..b6fa7f491f091 100644
--- a/testing/web-platform/meta/webidl/ecmascript-binding/es-exceptions/DOMException-constructor-and-prototype.any.js.ini
+++ b/testing/web-platform/meta/webidl/ecmascript-binding/es-exceptions/DOMException-constructor-and-prototype.any.js.ini
@@ -1,7 +1,6 @@
 [DOMException-constructor-and-prototype.any.worker.html]
   expected:
-    if sessionHistoryInParent: OK
-    [OK, TIMEOUT]
+    if not sessionHistoryInParent: [OK, TIMEOUT]
 
 [DOMException-constructor-and-prototype.any.html]
 
@@ -32,5 +31,6 @@
 
 [DOMException-constructor-and-prototype.any.shadowrealm-in-dedicatedworker.html]
   expected:
+    if sessionHistoryInParent and (os == "android") and not debug: [ERROR, TIMEOUT]
     if not sessionHistoryInParent and not debug: [ERROR, TIMEOUT]
     ERROR
diff --git a/testing/web-platform/meta/webidl/ecmascript-binding/es-exceptions/DOMException-constructor-behavior.any.js.ini b/testing/web-platform/meta/webidl/ecmascript-binding/es-exceptions/DOMException-constructor-behavior.any.js.ini
index 2889505065bb0..96db610bb5de7 100644
--- a/testing/web-platform/meta/webidl/ecmascript-binding/es-exceptions/DOMException-constructor-behavior.any.js.ini
+++ b/testing/web-platform/meta/webidl/ecmascript-binding/es-exceptions/DOMException-constructor-behavior.any.js.ini
@@ -19,7 +19,9 @@
   expected: ERROR
 
 [DOMException-constructor-behavior.any.shadowrealm-in-shadowrealm.html]
-  expected: ERROR
+  expected:
+    if not sessionHistoryInParent and not debug: [ERROR, TIMEOUT]
+    ERROR
 
 [DOMException-constructor-behavior.https.any.shadowrealm-in-serviceworker.html]
   expected: [ERROR, TIMEOUT]
diff --git a/testing/web-platform/meta/webmessaging/postMessage_MessagePorts_xsite.sub.window.js.ini b/testing/web-platform/meta/webmessaging/postMessage_MessagePorts_xsite.sub.window.js.ini
index 695a16764e602..af889e6d055bb 100644
--- a/testing/web-platform/meta/webmessaging/postMessage_MessagePorts_xsite.sub.window.js.ini
+++ b/testing/web-platform/meta/webmessaging/postMessage_MessagePorts_xsite.sub.window.js.ini
@@ -1,3 +1,3 @@
 [postMessage_MessagePorts_xsite.sub.window.html]
   expected:
-    if (os == "android") and fission: [OK, TIMEOUT]
+    if (os == "android") and sessionHistoryInParent and not debug: [OK, TIMEOUT]
diff --git a/testing/web-platform/meta/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare-linear.https.html.ini b/testing/web-platform/meta/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare-linear.https.html.ini
index 2517a8ff50b0e..d795799484680 100644
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare-linear.https.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare-linear.https.html.ini
@@ -1,4 +1,5 @@
 [RTCPeerConnection-perfect-negotiation-stress-glare-linear.https.html]
   expected:
+    if (os == "android") and debug and sessionHistoryInParent: [OK, TIMEOUT]
     if (os == "android") and debug and not sessionHistoryInParent: [OK, TIMEOUT]
     if (os == "android") and not debug: [OK, TIMEOUT]
diff --git a/testing/web-platform/meta/webrtc/protocol/rtp-demuxing.html.ini b/testing/web-platform/meta/webrtc/protocol/rtp-demuxing.html.ini
index d72b7048ddd09..316a97579513a 100644
--- a/testing/web-platform/meta/webrtc/protocol/rtp-demuxing.html.ini
+++ b/testing/web-platform/meta/webrtc/protocol/rtp-demuxing.html.ini
@@ -5,10 +5,9 @@
   [Can demux two video tracks with different payload types on a bundled connection]
     expected:
       if (os == "win") and debug and (processor == "x86_64"): [PASS, FAIL]
-      if (os == "mac") and debug: [PASS, FAIL]
-      if (os == "mac") and not debug: [PASS, FAIL]
       if (os == "linux") and debug: [PASS, TIMEOUT]
       if (os == "linux") and not debug: [PASS, TIMEOUT]
+      if os == "mac": [PASS, FAIL]
 
   [Can demux two video tracks with the same payload type on an unbundled connection]
     expected:
diff --git a/testing/web-platform/meta/webrtc/simulcast/h264.https.html.ini b/testing/web-platform/meta/webrtc/simulcast/h264.https.html.ini
index 5fa165ad7ceb3..021ca0594dc83 100644
--- a/testing/web-platform/meta/webrtc/simulcast/h264.https.html.ini
+++ b/testing/web-platform/meta/webrtc/simulcast/h264.https.html.ini
@@ -5,6 +5,5 @@
   [H264 simulcast setup with two streams]
     expected:
       if (os == "win") and debug and (processor == "x86_64"): [PASS, FAIL]
-      if (os == "mac") and debug: [PASS, FAIL]
-      if (os == "mac") and not debug: [PASS, FAIL]
       if (os == "linux") and not debug: [PASS, TIMEOUT]
+      if os == "mac": [PASS, FAIL]

From 2292742e2bba10cc7f56ff2f0f89f29e6f949b04 Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jdemooij@mozilla.com>
Date: Thu, 29 Jan 2026 12:18:37 +0000
Subject: [PATCH 048/116] Bug 2012018 - Simplify property lookup in
 SuppressDeletedProperty. r=iain

Differential Revision: https://phabricator.services.mozilla.com/D280679
---
 js/src/vm/Iteration.cpp | 44 ++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/js/src/vm/Iteration.cpp b/js/src/vm/Iteration.cpp
index 27624fb264eb6..da9c2511a0fa1 100644
--- a/js/src/vm/Iteration.cpp
+++ b/js/src/vm/Iteration.cpp
@@ -44,6 +44,7 @@
 #include "gc/StoreBuffer-inl.h"
 #include "vm/NativeObject-inl.h"
 #include "vm/PlainObject-inl.h"  // js::PlainObject::createWithTemplate
+#include "vm/Shape-inl.h"        // js::GetPropertyAttributes
 
 using namespace js;
 
@@ -1808,10 +1809,9 @@ static bool SuppressDeletedProperty(JSContext* cx, NativeIterator* ni,
   }
 
   // Check whether id is still to come.
-  Rooted<JSLinearString*> idStr(cx);
   IteratorProperty* cursor = ni->nextProperty();
   for (; cursor < ni->propertiesEnd(); ++cursor) {
-    idStr = cursor->asString();
+    JSLinearString* idStr = cursor->asString();
     // Common case: both strings are atoms.
     if (idStr->isAtom() && str->isAtom()) {
       if (idStr != str) {
@@ -1825,27 +1825,25 @@ static bool SuppressDeletedProperty(JSContext* cx, NativeIterator* ni,
 
     // Check whether another property along the prototype chain became
     // visible as a result of this deletion.
-    RootedObject proto(cx);
-    if (!GetPrototype(cx, obj, &proto)) {
-      return false;
-    }
-    if (proto) {
-      RootedId id(cx);
-      RootedValue idv(cx, StringValue(idStr));
-      if (!PrimitiveValueToId<CanGC>(cx, idv, &id)) {
-        return false;
-      }
-
-      Rooted<mozilla::Maybe<PropertyDescriptor>> desc(cx);
-      RootedObject holder(cx);
-      if (!GetPropertyDescriptor(cx, proto, id, &desc, &holder)) {
-        return false;
-      }
-
-      // If deletion just made something up the chain visible, no need to
-      // do anything.
-      if (desc.isSome() && desc->enumerable()) {
-        return true;
+    if (obj->hasStaticPrototype()) {
+      JSObject* proto = obj->staticPrototype();
+      if (proto) {
+        JSAtom* atom = AtomizeString(cx, str);
+        if (!atom) {
+          return false;
+        }
+        PropertyKey key = AtomToId(atom);
+        NativeObject* holder = nullptr;
+        PropertyResult prop;
+        if (LookupPropertyPure(cx, proto, key, &holder, &prop) &&
+            prop.isFound()) {
+          // If deletion just made something up the chain visible, no need to
+          // do anything.
+          JS::PropertyAttributes attrs = GetPropertyAttributes(holder, prop);
+          if (attrs.enumerable()) {
+            return true;
+          }
+        }
       }
     }
 

From 6a059306a52d5b2ff924c69ebd3e9eeaeee53a69 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Thu, 29 Jan 2026 12:29:40 +0000
Subject: [PATCH 049/116] Bug 2012638 - Make
 `nsFrameSelection::RepaintSelection()` run
 `UpdateSelectionCacheOnRepaintSelection()` in any desktop debug builds
 r=edgar

The method serializes the selection ranges to update the selection cache
for the OS only on macOS.  So, there are a lot of cases to run
`nsHTMLCopyEncoder` only on macOS because repainting selection occurs
immediately after moving focus.

Therefore, we may see assertion failures around `RangeBoundaryBase` and
`nsHTMLCopyEncoder` itself only of debug builds on macOS.  However,
the macOS machines in trysever are always busy and we need to wait at
least one day and the developers may not run the tests on macOS before
landing their patches due to the slowness.

For solving these issues, this patch makes it run on any debug builds
on any desktop platforms. So, basically, we don't need to run tests on
macOS on tryserver after landing this in the most cases.

Differential Revision: https://phabricator.services.mozilla.com/D280905
---
 dom/base/nsCopySupport.cpp          |  8 +++--
 dom/base/nsCopySupport.h            |  4 ++-
 layout/generic/nsFrameSelection.cpp | 48 +++++++++++++++++++++++------
 3 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/dom/base/nsCopySupport.cpp b/dom/base/nsCopySupport.cpp
index c6f48b2d27182..9ca2cfd4527d2 100644
--- a/dom/base/nsCopySupport.cpp
+++ b/dom/base/nsCopySupport.cpp
@@ -346,7 +346,7 @@ static nsresult PutToClipboard(
 
 nsresult nsCopySupport::EncodeDocumentWithContextAndPutToClipboard(
     Selection* aSel, Document* aDoc, nsIClipboard::ClipboardType aClipboardID,
-    bool aWithRubyAnnotation) {
+    bool aWithRubyAnnotation, UpdateClipboard aUpdateClipboard /* = Yes */) {
   NS_ENSURE_TRUE(aDoc, NS_ERROR_NULL_POINTER);
 
   uint32_t additionalFlags = nsIDocumentEncoder::SkipInvisibleContent;
@@ -364,8 +364,10 @@ nsresult nsCopySupport::EncodeDocumentWithContextAndPutToClipboard(
                                           encodedDocumentWithContext);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = PutToClipboard(encodedDocumentWithContext, aClipboardID, *aDoc);
-  NS_ENSURE_SUCCESS(rv, rv);
+  if (aUpdateClipboard == UpdateClipboard::Yes) {
+    rv = PutToClipboard(encodedDocumentWithContext, aClipboardID, *aDoc);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
 
   return rv;
 }
diff --git a/dom/base/nsCopySupport.h b/dom/base/nsCopySupport.h
index a904aa909e6fa..3cb40255a8e8a 100644
--- a/dom/base/nsCopySupport.h
+++ b/dom/base/nsCopySupport.h
@@ -36,12 +36,14 @@ class nsCopySupport {
  public:
   static nsresult ClearSelectionCache();
 
+  enum class UpdateClipboard : bool { No, Yes };
   /**
    * @param aDoc Needs to be not nullptr.
    */
   static nsresult EncodeDocumentWithContextAndPutToClipboard(
       mozilla::dom::Selection* aSel, mozilla::dom::Document* aDoc,
-      nsIClipboard::ClipboardType aClipboardID, bool aWithRubyAnnotation);
+      nsIClipboard::ClipboardType aClipboardID, bool aWithRubyAnnotation,
+      UpdateClipboard = UpdateClipboard::Yes);
 
   // Get the selection, or entire document, in the format specified by the mime
   // type (text/html or text/plain). If aSel is non-null, use it, otherwise get
diff --git a/layout/generic/nsFrameSelection.cpp b/layout/generic/nsFrameSelection.cpp
index e13a48b98781d..1cb67b81387aa 100644
--- a/layout/generic/nsFrameSelection.cpp
+++ b/layout/generic/nsFrameSelection.cpp
@@ -137,9 +137,21 @@ MOZ_CAN_RUN_SCRIPT_BOUNDARY static nsresult CreateAndAddRange(
 static nsresult SelectCellElement(nsIContent* aCellElement,
                                   Selection& aNormalSelection);
 
-#ifdef XP_MACOSX
-static nsresult UpdateSelectionCacheOnRepaintSelection(Selection* aSel);
-#endif  // XP_MACOSX
+// On macOS, we need to update the selection cache when we repaint a selection.
+// This runs nsHTMLCopyEncoder to serialize the selection ranges, which is
+// really complicated especially when shadow DOM selection. Therefore, that may
+// cause some assertion failures. Unfortunately, our macOS machines in the CI
+// are always busy and we need one or two days to check the result on trysever.
+// Therefore, we should run nsHTMLCopyEncoder part in all desktop platforms if
+// it's a debug build. Thus, we can check the result on Linux machines in
+// tryserver.
+#if defined(XP_MACOS) || (defined(DEBUG) && !defined(ANDROID))
+#  define RUN_MAYBE_UPDATE_SELECTION_CACHE_REPAINT_SELECTION
+#endif
+
+#ifdef RUN_MAYBE_UPDATE_SELECTION_CACHE_REPAINT_SELECTION
+static nsresult MaybeUpdateSelectionCacheOnRepaintSelection(Selection* aSel);
+#endif  // RUN_MAYBE_UPDATE_SELECTION_CACHE_REPAINT_SELECTION
 
 #ifdef PRINT_RANGE
 static void printRange(nsRange* aDomRange);
@@ -1729,14 +1741,21 @@ nsresult nsFrameSelection::RepaintSelection(SelectionType aSelectionType) {
 
 // On macOS, update the selection cache to the new active selection
 // aka the current selection.
-#ifdef XP_MACOSX
+// NOTE: On Linux and Windows, we don't need to run this because this just runs
+// nsHTMLCopyEncorder without updating the selection cache.  However, we run
+// this in the debug builds on Linux and Windows. See the comment of this macro
+// definition for the detail.
+#ifdef RUN_MAYBE_UPDATE_SELECTION_CACHE_REPAINT_SELECTION
   // Check that we're in the an active window and, if this is Web content,
   // in the frontmost tab.
+  // XXX This is called when the selection blurs, see
+  // PresShell::FrameSelectionWillLoseFocus(). Cannot we skip doing this in that
+  // case?
   Document* doc = mPresShell->GetDocument();
   if (doc && IsInActiveTab(doc) && aSelectionType == SelectionType::eNormal) {
-    UpdateSelectionCacheOnRepaintSelection(sel);
+    MaybeUpdateSelectionCacheOnRepaintSelection(sel);
   }
-#endif
+#endif  // #ifdef RUN_MAYBE_UPDATE_SELECTION_CACHE_REPAINT_SELECTION
   return sel->Repaint(mPresShell->GetPresContext());
 }
 
@@ -3121,7 +3140,7 @@ void nsFrameSelection::DisconnectFromPresShell() {
   }
 }
 
-#ifdef XP_MACOSX
+#ifdef RUN_MAYBE_UPDATE_SELECTION_CACHE_REPAINT_SELECTION
 /**
  * See Bug 1288453.
  *
@@ -3141,7 +3160,7 @@ void nsFrameSelection::DisconnectFromPresShell() {
  * If the current selection is empty. The current selection cache
  * would be cleared by AutoCopyListener::OnSelectionChange().
  */
-static nsresult UpdateSelectionCacheOnRepaintSelection(Selection* aSel) {
+static nsresult MaybeUpdateSelectionCacheOnRepaintSelection(Selection* aSel) {
   PresShell* presShell = aSel->GetPresShell();
   if (!presShell) {
     return NS_OK;
@@ -3150,12 +3169,21 @@ static nsresult UpdateSelectionCacheOnRepaintSelection(Selection* aSel) {
 
   if (aDoc && aSel && !aSel->IsCollapsed()) {
     return nsCopySupport::EncodeDocumentWithContextAndPutToClipboard(
-        aSel, aDoc, nsIClipboard::kSelectionCache, false);
+        aSel, aDoc, nsIClipboard::kSelectionCache, false,
+#  ifdef XP_MACOSX
+        // Update the selection cache on macOS
+        nsCopySupport::UpdateClipboard::Yes
+#  else
+        // Do not update the clipboard on the other platforms, just run the
+        // serializer to detect assertion failures.
+        nsCopySupport::UpdateClipboard::No
+#  endif
+    );
   }
 
   return NS_OK;
 }
-#endif  // XP_MACOSX
+#endif  // RUN_MAYBE_UPDATE_SELECTION_CACHE_REPAINT_SELECTION
 
 // mozilla::AutoCopyListener
 

From 0bbd358b15501236bd1e9a56d64dd25bfa262f8d Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@mozilla.com>
Date: Thu, 29 Jan 2026 12:45:06 +0000
Subject: [PATCH 050/116] Bug 2012735 - port generate-checksums script to boto3
 r=releng-reviewers,bhearsum

Differential Revision: https://phabricator.services.mozilla.com/D280627
---
 .../scripts/release/generate-checksums.py     | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/testing/mozharness/scripts/release/generate-checksums.py b/testing/mozharness/scripts/release/generate-checksums.py
index 8c576cfda4768..99bb4f59caf14 100644
--- a/testing/mozharness/scripts/release/generate-checksums.py
+++ b/testing/mozharness/scripts/release/generate-checksums.py
@@ -73,7 +73,7 @@ def __init__(self):
             require_config_file=False,
             config={
                 "virtualenv_modules": [
-                    "boto",
+                    "boto3",
                 ],
                 "virtualenv_path": "venv",
             },
@@ -140,12 +140,18 @@ def _get_hash_function(self, format_):
 
     def _get_bucket(self):
         self.activate_virtualenv()
-        from boto import connect_s3
+        import boto3
+        from botocore import UNSIGNED
+        from botocore.client import Config
 
         self.info("Connecting to S3")
-        conn = connect_s3(anon=True, host="storage.googleapis.com")
+        conn = boto3.resource(
+            "s3",
+            config=Config(signature_version=UNSIGNED),
+            endpoint_url="https://storage.googleapis.com",
+        )
         self.info("Connecting to bucket {}".format(self.config["bucket_name"]))
-        self.bucket = conn.get_bucket(self.config["bucket_name"])
+        self.bucket = conn.Bucket(self.config["bucket_name"])
         return self.bucket
 
     def collect_individual_checksums(self):
@@ -160,19 +166,19 @@ def collect_individual_checksums(self):
 
         def worker(item):
             self.debug(f"Downloading {item}")
-            sums = bucket.get_key(item).get_contents_as_string()
-            raw_checksums.append(sums)
+            response = item.get()
+            raw_checksums.append(response["Body"].read())
 
         def find_checksums_files():
             self.info("Getting key names from bucket")
             checksum_files = {"beets": [], "checksums": []}
-            for key in bucket.list(prefix=self.file_prefix):
+            for key in bucket.objects.filter(Prefix=self.file_prefix):
                 if key.key.endswith(".checksums"):
                     self.debug(f"Found checksums file: {key.key}")
-                    checksum_files["checksums"].append(key.key)
+                    checksum_files["checksums"].append(key)
                 elif key.key.endswith(".beet"):
                     self.debug(f"Found beet file: {key.key}")
-                    checksum_files["beets"].append(key.key)
+                    checksum_files["beets"].append(key)
                 else:
                     self.debug(f"Ignoring non-checksums file: {key.key}")
             if checksum_files["beets"]:

From bb79c58c15f01732c591f02505df3e7430d0279e Mon Sep 17 00:00:00 2001
From: Cristina Horotan <chorotan@mozilla.com>
Date: Thu, 29 Jan 2026 15:45:42 +0200
Subject: [PATCH 051/116] Revert "Bug 2010221, Bug 2010220, Bug 2010219 - Part
 2: Remove no longer used self-hosting code for Intl.DurationFormat.
 r=spidermonkey-reviewers,mgaudet" for causing xpc failures on
 updateSyncManager.js

This reverts commit 161968231671738aa1360c62d3d1dc43a13300d8.

Revert "Bug 2010221 - Part 1: Move Intl.DurationFormat initialisation to C++. r=spidermonkey-reviewers,mgaudet"

This reverts commit eff29d99caecaebb575df6b153a3d9636bebf002.

Revert "Bug 2010220 - Part 2: Remove no longer used self-hosting code for Intl.Collator. r=spidermonkey-reviewers,dminor"

This reverts commit c87a5afc1234bc8a51d5e1d474b5ce3be845a39d.

Revert "Bug 2010220 - Part 1: Move Intl.Collator to C++. r=spidermonkey-reviewers,dminor"

This reverts commit 759d06c2bdf79a6893cf8193318a390391b20f50.

Revert "Bug 2010219 - Part 2: Remove no longer used self-hosting code for Intl.Segmenter. r=dminor"

This reverts commit 3b41d03e4c21ac94504184bcb6c09609faf9577d.

Revert "Bug 2010219 - Part 1: Move Intl.Segmenter initialisation to C++. r=dminor"

This reverts commit 88ceab8d948f3c67f22438c1cca2ffdfd21fbc2b.
---
 js/src/builtin/intl/Collator.cpp       |  678 ++++---------
 js/src/builtin/intl/Collator.h         |  135 +--
 js/src/builtin/intl/Collator.js        |  353 +++++++
 js/src/builtin/intl/CommonFunctions.js |   35 +-
 js/src/builtin/intl/DurationFormat.cpp | 1252 +++++++++---------------
 js/src/builtin/intl/DurationFormat.h   |  106 +-
 js/src/builtin/intl/DurationFormat.js  |  556 +++++++++++
 js/src/builtin/intl/Segmenter.cpp      |  272 ++---
 js/src/builtin/intl/Segmenter.h        |   42 +-
 js/src/builtin/intl/Segmenter.js       |  202 ++++
 js/src/builtin/moz.build               |    2 +
 js/src/jit/CacheIR.cpp                 |    3 +
 js/src/jit/InlinableNatives.cpp        |   13 +
 js/src/jit/InlinableNatives.h          |    3 +
 js/src/vm/SelfHosting.cpp              |   21 +
 15 files changed, 1960 insertions(+), 1713 deletions(-)
 create mode 100644 js/src/builtin/intl/Collator.js
 create mode 100644 js/src/builtin/intl/DurationFormat.js

diff --git a/js/src/builtin/intl/Collator.cpp b/js/src/builtin/intl/Collator.cpp
index 0fd1294a4e700..bceff97853ff6 100644
--- a/js/src/builtin/intl/Collator.cpp
+++ b/js/src/builtin/intl/Collator.cpp
@@ -17,9 +17,7 @@
 #include "builtin/intl/FormatBuffer.h"
 #include "builtin/intl/LanguageTag.h"
 #include "builtin/intl/LocaleNegotiation.h"
-#include "builtin/intl/ParameterNegotiation.h"
 #include "builtin/intl/SharedIntlData.h"
-#include "builtin/intl/UsingEnum.h"
 #include "gc/GCContext.h"
 #include "js/PropertySpec.h"
 #include "js/StableStringChars.h"
@@ -36,6 +34,11 @@
 using namespace js;
 using namespace js::intl;
 
+using JS::AutoStableStringChars;
+
+using js::intl::ReportInternalError;
+using js::intl::SharedIntlData;
+
 const JSClassOps CollatorObject::classOps_ = {
     nullptr,                   // addProperty
     nullptr,                   // delProperty
@@ -63,10 +66,6 @@ const JSClass& CollatorObject::protoClass_ = PlainObject::class_;
 static bool collator_supportedLocalesOf(JSContext* cx, unsigned argc,
                                         Value* vp);
 
-static bool collator_compare(JSContext* cx, unsigned argc, Value* vp);
-
-static bool collator_resolvedOptions(JSContext* cx, unsigned argc, Value* vp);
-
 static bool collator_toSource(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
   args.rval().setString(cx->names().Collator);
@@ -79,13 +78,13 @@ static const JSFunctionSpec collator_static_methods[] = {
 };
 
 static const JSFunctionSpec collator_methods[] = {
-    JS_FN("resolvedOptions", collator_resolvedOptions, 0, 0),
+    JS_SELF_HOSTED_FN("resolvedOptions", "Intl_Collator_resolvedOptions", 0, 0),
     JS_FN("toSource", collator_toSource, 0, 0),
     JS_FS_END,
 };
 
 static const JSPropertySpec collator_properties[] = {
-    JS_PSG("compare", collator_compare, 0),
+    JS_SELF_HOSTED_GET("compare", "$Intl_Collator_compare_get", 0),
     JS_STRING_SYM_PS(toStringTag, "Intl.Collator", JSPROP_READONLY),
     JS_PS_END,
 };
@@ -103,173 +102,6 @@ const ClassSpec CollatorObject::classSpec_ = {
     ClassSpec::DontDefineConstructor,
 };
 
-static constexpr std::string_view UsageToString(CollatorOptions::Usage usage) {
-#ifndef USING_ENUM
-  using enum CollatorOptions::Usage;
-#else
-  USING_ENUM(CollatorOptions::Usage, Sort, Search);
-#endif
-  switch (usage) {
-    case Sort:
-      return "sort";
-    case Search:
-      return "search";
-  }
-  MOZ_CRASH("invalid collator usage");
-}
-
-static constexpr std::string_view SensitivityToString(
-    CollatorOptions::Sensitivity sensitivity) {
-#ifndef USING_ENUM
-  using enum CollatorOptions::Sensitivity;
-#else
-  USING_ENUM(CollatorOptions::Sensitivity, Base, Accent, Case, Variant);
-#endif
-  switch (sensitivity) {
-    case Base:
-      return "base";
-    case Accent:
-      return "accent";
-    case Case:
-      return "case";
-    case Variant:
-      return "variant";
-  }
-  MOZ_CRASH("invalid collator sensitivity");
-}
-
-static constexpr std::string_view CaseFirstToString(
-    CollatorOptions::CaseFirst caseFirst) {
-#ifndef USING_ENUM
-  using enum CollatorOptions::CaseFirst;
-#else
-  USING_ENUM(CollatorOptions::CaseFirst, False, Lower, Upper);
-#endif
-  switch (caseFirst) {
-    case False:
-      return "false";
-    case Lower:
-      return "lower";
-    case Upper:
-      return "upper";
-  }
-  MOZ_CRASH("invalid collator case first");
-}
-
-/**
- * 10.1.2 Intl.Collator([ locales [, options]])
- *
- * ES2017 Intl draft rev 94045d234762ad107a3d09bb6f7381a65f1a2f9b
- */
-static bool InitializeCollator(JSContext* cx, Handle<CollatorObject*> collator,
-                               Handle<JS::Value> locales,
-                               Handle<JS::Value> optionsValue) {
-  // Steps 4-5.
-  Rooted<LocalesList> requestedLocales(cx, cx);
-  if (!CanonicalizeLocaleList(cx, locales, &requestedLocales)) {
-    return false;
-  }
-
-  Rooted<ArrayObject*> requestedLocalesArray(
-      cx, LocalesListToArray(cx, requestedLocales));
-  if (!requestedLocalesArray) {
-    return false;
-  }
-  collator->setRequestedLocales(requestedLocalesArray);
-
-  auto colOptions = cx->make_unique<CollatorOptions>();
-  if (!colOptions) {
-    return false;
-  }
-
-  if (!optionsValue.isUndefined()) {
-    // Step 6.
-    Rooted<JSObject*> options(cx, JS::ToObject(cx, optionsValue));
-    if (!options) {
-      return false;
-    }
-
-    // Steps 7-8.
-    static constexpr auto usages = MapOptions<UsageToString>(
-        CollatorOptions::Usage::Sort, CollatorOptions::Usage::Search);
-    if (!GetStringOption(cx, options, cx->names().usage, usages,
-                         CollatorOptions::Usage::Sort, &colOptions->usage)) {
-      return false;
-    }
-
-    // Step 9-10. (Performed in ResolveLocale)
-
-    // Step 11. (Inlined ResolveOptions)
-
-    // ResolveOptions, steps 1-3. (Already performed above)
-
-    // ResolveOptions, step 4.
-    LocaleMatcher matcher;
-    if (!GetLocaleMatcherOption(cx, options, &matcher)) {
-      return false;
-    }
-
-    // ResolveOptions, step 5.
-    //
-    // This implementation only supports the "lookup" locale matcher, therefore
-    // the "localeMatcher" option doesn't need to be stored.
-
-    // ResolveOptions, step 6.
-    Rooted<JSLinearString*> collation(cx);
-    if (!GetUnicodeExtensionOption(cx, options, UnicodeExtensionKey::Collation,
-                                   &collation)) {
-      return false;
-    }
-    if (collation) {
-      collator->setCollation(collation);
-    }
-
-    // ResolveOptions, step 6.
-    if (!GetBooleanOption(cx, options, cx->names().numeric,
-                          &colOptions->numeric)) {
-      return false;
-    }
-
-    // ResolveOptions, step 6.
-    static constexpr auto caseFirsts = MapOptions<CaseFirstToString>(
-        CollatorOptions::CaseFirst::Upper, CollatorOptions::CaseFirst::Lower,
-        CollatorOptions::CaseFirst::False);
-    if (!GetStringOption(cx, options, cx->names().caseFirst, caseFirsts,
-                         &colOptions->caseFirst)) {
-      return false;
-    }
-
-    // ResolveOptions, step 7. (Not applicable)
-
-    // ResolveOptions, step 8. (Performed in ResolveLocale)
-
-    // ResolveOptions, step 9. (Return)
-
-    // Steps 12-19 and 21. (Performed in ResolveLocale)
-
-    // Step 20.
-    static constexpr auto sensitivities =
-        MapOptions<SensitivityToString>(CollatorOptions::Sensitivity::Base,
-                                        CollatorOptions::Sensitivity::Accent,
-                                        CollatorOptions::Sensitivity::Case,
-                                        CollatorOptions::Sensitivity::Variant);
-    if (!GetStringOption(cx, options, cx->names().sensitivity, sensitivities,
-                         &colOptions->sensitivity)) {
-      return false;
-    }
-
-    // Step 22.
-    if (!GetBooleanOption(cx, options, cx->names().ignorePunctuation,
-                          &colOptions->ignorePunctuation)) {
-      return false;
-    }
-  }
-  collator->setOptions(colOptions.release());
-  AddCellMemory(collator, sizeof(CollatorOptions), js::MemoryUse::IntlOptions);
-
-  return true;
-}
-
 /**
  * 10.1.2 Intl.Collator([ locales [, options]])
  *
@@ -281,8 +113,8 @@ static bool Collator(JSContext* cx, unsigned argc, Value* vp) {
 
   // Step 1 (Handled by OrdinaryCreateFromConstructor fallback code).
 
-  // Steps 2-3 (Inlined 9.1.14, OrdinaryCreateFromConstructor).
-  Rooted<JSObject*> proto(cx);
+  // Steps 2-5 (Inlined 9.1.14, OrdinaryCreateFromConstructor).
+  RootedObject proto(cx);
   if (!GetPrototypeFromBuiltinConstructor(cx, args, JSProto_Collator, &proto)) {
     return false;
   }
@@ -293,12 +125,15 @@ static bool Collator(JSContext* cx, unsigned argc, Value* vp) {
     return false;
   }
 
-  // Steps 4-22.
-  if (!InitializeCollator(cx, collator, args.get(0), args.get(1))) {
+  HandleValue locales = args.get(0);
+  HandleValue options = args.get(1);
+
+  // Step 6.
+  if (!intl::InitializeObject(cx, collator, cx->names().InitializeCollator,
+                              locales, options)) {
     return false;
   }
 
-  // Step 23.
   args.rval().setObject(*collator);
   return true;
 }
@@ -311,9 +146,11 @@ CollatorObject* js::intl::CreateCollator(JSContext* cx, Handle<Value> locales,
     return nullptr;
   }
 
-  if (!InitializeCollator(cx, collator, locales, options)) {
+  if (!InitializeObject(cx, collator, cx->names().InitializeCollator, locales,
+                        options)) {
     return nullptr;
   }
+
   return collator;
 }
 
@@ -338,215 +175,80 @@ CollatorObject* js::intl::GetOrCreateCollator(JSContext* cx,
 }
 
 void js::CollatorObject::finalize(JS::GCContext* gcx, JSObject* obj) {
-  auto* collator = &obj->as<CollatorObject>();
-
-  if (auto* options = collator->getOptions()) {
-    gcx->delete_(obj, options, MemoryUse::IntlOptions);
-  }
-
-  if (auto* coll = collator->getCollator()) {
-    RemoveICUCellMemory(gcx, obj, CollatorObject::EstimatedMemoryUse);
+  if (mozilla::intl::Collator* coll = obj->as<CollatorObject>().getCollator()) {
+    intl::RemoveICUCellMemory(gcx, obj, CollatorObject::EstimatedMemoryUse);
     delete coll;
   }
 }
 
 /**
- * Resolve the actual locale to finish initialization of the Collator.
+ * Returns a new mozilla::intl::Collator with the locale and collation options
+ * of the given Collator.
  */
-static bool ResolveLocale(JSContext* cx, Handle<CollatorObject*> collator) {
-  // Return if the locale was already resolved.
-  if (collator->isLocaleResolved()) {
-    return true;
+static mozilla::intl::Collator* NewIntlCollator(
+    JSContext* cx, Handle<CollatorObject*> collator) {
+  RootedValue value(cx);
+  RootedObject internals(cx, intl::GetInternalsObject(cx, collator));
+  if (!internals) {
+    return nullptr;
   }
-  auto* colOptions = collator->getOptions();
-
-  Rooted<ArrayObject*> requestedLocales(
-      cx, &collator->getRequestedLocales()->as<ArrayObject>());
 
-  // %Intl.Collator%.[[RelevantExtensionKeys]] is « "co", "kf", "kn" ».
-  mozilla::EnumSet<UnicodeExtensionKey> relevantExtensionKeys{
-      UnicodeExtensionKey::Collation,
-      UnicodeExtensionKey::CollationCaseFirst,
-      UnicodeExtensionKey::CollationNumeric,
-  };
+  using mozilla::intl::Collator;
 
-  // Initialize locale options from constructor arguments.
-  Rooted<LocaleOptions> localeOptions(cx);
-  if (auto* co = collator->getCollation()) {
-    localeOptions.setUnicodeExtension(UnicodeExtensionKey::Collation, co);
-  }
-  if (auto caseFirst = colOptions->caseFirst) {
-#ifndef USING_ENUM
-    using enum CollatorOptions::CaseFirst;
-#else
-    USING_ENUM(CollatorOptions::CaseFirst, False, Lower, Upper);
-#endif
+  Collator::Options options{};
 
-    JSLinearString* kf;
-    switch (*caseFirst) {
-      case Upper:
-        kf = cx->names().upper;
-        break;
-      case Lower:
-        kf = cx->names().lower;
-        break;
-      case False:
-        kf = cx->names().false_;
-        break;
-    }
-    localeOptions.setUnicodeExtension(UnicodeExtensionKey::CollationCaseFirst,
-                                      kf);
-  }
-  if (auto numeric = colOptions->numeric) {
-    JSLinearString* kn = *numeric ? cx->names().true_ : cx->names().false_;
-    localeOptions.setUnicodeExtension(UnicodeExtensionKey::CollationNumeric,
-                                      kn);
-  }
-
-  // Use the default locale data for "sort" usage.
-  // Use the collator search locale data for "search" usage.
-  LocaleData localeData;
-  if (colOptions->usage == CollatorOptions::Usage::Sort) {
-    localeData = LocaleData::Default;
-  } else {
-    localeData = LocaleData::CollatorSearch;
+  if (!GetProperty(cx, internals, internals, cx->names().usage, &value)) {
+    return nullptr;
   }
 
-  // Resolve the actual locale.
-  Rooted<ResolvedLocale> resolved(cx);
-  if (!ResolveLocale(cx, AvailableLocaleKind::Collator, requestedLocales,
-                     localeOptions, relevantExtensionKeys, localeData,
-                     &resolved)) {
-    return false;
-  }
+  enum class Usage { Search, Sort };
 
-  if (colOptions->sensitivity.isNothing()) {
-    // In theory the default sensitivity for the "search" collator is locale
-    // dependent; in reality the CLDR/ICU default strength is always tertiary.
-    // Therefore use "variant" as the default value for both collation modes.
-    colOptions->sensitivity =
-        mozilla::Some(CollatorOptions::Sensitivity::Variant);
-  }
-
-  if (colOptions->ignorePunctuation.isNothing()) {
-    // If |locale| is the default locale (e.g. da-DK), but only supported
-    // through a fallback (da), we need to get the actual data locale first.
-    Rooted<JSLinearString*> dataLocale(cx);
-    if (!BestAvailableLocale(cx, AvailableLocaleKind::Collator,
-                             resolved.dataLocale(), nullptr, &dataLocale)) {
-      return false;
+  Usage usage;
+  {
+    JSLinearString* str = value.toString()->ensureLinear(cx);
+    if (!str) {
+      return nullptr;
     }
-    MOZ_ASSERT(dataLocale);
 
-    auto& sharedIntlData = cx->runtime()->sharedIntlData.ref();
-
-    bool ignorePunctuation;
-    if (!sharedIntlData.isIgnorePunctuation(cx, dataLocale,
-                                            &ignorePunctuation)) {
-      return false;
+    if (StringEqualsLiteral(str, "search")) {
+      usage = Usage::Search;
+    } else {
+      MOZ_ASSERT(StringEqualsLiteral(str, "sort"));
+      usage = Usage::Sort;
     }
-    colOptions->ignorePunctuation = mozilla::Some(ignorePunctuation);
-  }
-
-  // Finish initialization by setting the actual locale and collation.
-  auto* locale = resolved.toLocale(cx);
-  if (!locale) {
-    return false;
-  }
-  collator->setLocale(locale);
-
-  if (auto co = resolved.extension(UnicodeExtensionKey::Collation)) {
-    collator->setCollation(co);
-  } else {
-    collator->setCollation(cx->names().default_);
-  }
-
-  auto kf = resolved.extension(UnicodeExtensionKey::CollationCaseFirst);
-  MOZ_ASSERT(kf, "resolved case first is non-null");
-
-  if (StringEqualsLiteral(kf, "upper")) {
-    colOptions->caseFirst = mozilla::Some(CollatorOptions::CaseFirst::Upper);
-  } else if (StringEqualsLiteral(kf, "lower")) {
-    colOptions->caseFirst = mozilla::Some(CollatorOptions::CaseFirst::Lower);
-  } else {
-    MOZ_ASSERT(StringEqualsLiteral(kf, "false"));
-    colOptions->caseFirst = mozilla::Some(CollatorOptions::CaseFirst::False);
-  }
-
-  auto kn = resolved.extension(UnicodeExtensionKey::CollationNumeric);
-  MOZ_ASSERT(kn, "resolved numeric is non-null");
-
-  if (StringEqualsLiteral(kn, "true")) {
-    colOptions->numeric = mozilla::Some(true);
-  } else {
-    MOZ_ASSERT(StringEqualsLiteral(kn, "false"));
-    colOptions->numeric = mozilla::Some(false);
-  }
-
-  MOZ_ASSERT(collator->isLocaleResolved(), "locale successfully resolved");
-  return true;
-}
-
-static auto ToCollatorSensitivity(CollatorOptions::Sensitivity sensitivity) {
-#ifndef USING_ENUM
-  using enum mozilla::intl::Collator::Sensitivity;
-#else
-  USING_ENUM(mozilla::intl::Collator::Sensitivity, Base, Accent, Case, Variant);
-#endif
-  switch (sensitivity) {
-    case CollatorOptions::Sensitivity::Base:
-      return Base;
-    case CollatorOptions::Sensitivity::Accent:
-      return Accent;
-    case CollatorOptions::Sensitivity::Case:
-      return Case;
-    case CollatorOptions::Sensitivity::Variant:
-      return Variant;
-  }
-  MOZ_CRASH("invalid collator sensitivity");
-}
-
-static auto ToCollatorCaseFirst(CollatorOptions::CaseFirst caseFirst) {
-#ifndef USING_ENUM
-  using enum mozilla::intl::Collator::CaseFirst;
-#else
-  USING_ENUM(mozilla::intl::Collator::CaseFirst, False, Lower, Upper);
-#endif
-  switch (caseFirst) {
-    case CollatorOptions::CaseFirst::Upper:
-      return Upper;
-    case CollatorOptions::CaseFirst::Lower:
-      return Lower;
-    case CollatorOptions::CaseFirst::False:
-      return False;
-  }
-  MOZ_CRASH("invalid collator case first");
-}
-
-/**
- * Returns a new mozilla::intl::Collator with the locale and collation options
- * of the given Collator.
- */
-static mozilla::intl::Collator* NewIntlCollator(
-    JSContext* cx, Handle<CollatorObject*> collator) {
-  if (!ResolveLocale(cx, collator)) {
-    return nullptr;
   }
-  auto colOptions = *collator->getOptions();
 
-  JS::RootedVector<UnicodeExtensionKeyword> keywords(cx);
+  JS::RootedVector<intl::UnicodeExtensionKeyword> keywords(cx);
 
   // ICU expects collation as Unicode locale extensions on locale.
-  if (colOptions.usage == CollatorOptions::Usage::Search) {
+  if (usage == Usage::Search) {
     if (!keywords.emplaceBack("co", cx->names().search)) {
       return nullptr;
     }
 
     // Search collations can't select a different collation, so the collation
     // property is guaranteed to be "default".
-    MOZ_ASSERT(StringEqualsLiteral(collator->getCollation(), "default"));
+#ifdef DEBUG
+    if (!GetProperty(cx, internals, internals, cx->names().collation, &value)) {
+      return nullptr;
+    }
+
+    JSLinearString* collation = value.toString()->ensureLinear(cx);
+    if (!collation) {
+      return nullptr;
+    }
+
+    MOZ_ASSERT(StringEqualsLiteral(collation, "default"));
+#endif
   } else {
-    auto* collation = collator->getCollation();
+    if (!GetProperty(cx, internals, internals, cx->names().collation, &value)) {
+      return nullptr;
+    }
+
+    JSLinearString* collation = value.toString()->ensureLinear(cx);
+    if (!collation) {
+      return nullptr;
+    }
 
     // Set collation as a Unicode locale extension when it was specified.
     if (!StringEqualsLiteral(collation, "default")) {
@@ -556,20 +258,64 @@ static mozilla::intl::Collator* NewIntlCollator(
     }
   }
 
-  Rooted<JSLinearString*> localeStr(cx, collator->getLocale());
-  auto locale = FormatLocale(cx, localeStr, keywords);
+  UniqueChars locale = intl::FormatLocale(cx, internals, keywords);
   if (!locale) {
     return nullptr;
   }
 
-  mozilla::intl::Collator::Options options = {
-      .sensitivity = ToCollatorSensitivity(*colOptions.sensitivity),
-      .caseFirst = ToCollatorCaseFirst(*colOptions.caseFirst),
-      .ignorePunctuation = *colOptions.ignorePunctuation,
-      .numeric = *colOptions.numeric,
-  };
+  if (!GetProperty(cx, internals, internals, cx->names().sensitivity, &value)) {
+    return nullptr;
+  }
 
-  auto collResult = mozilla::intl::Collator::TryCreate(locale.get());
+  {
+    JSLinearString* sensitivity = value.toString()->ensureLinear(cx);
+    if (!sensitivity) {
+      return nullptr;
+    }
+    if (StringEqualsLiteral(sensitivity, "base")) {
+      options.sensitivity = Collator::Sensitivity::Base;
+    } else if (StringEqualsLiteral(sensitivity, "accent")) {
+      options.sensitivity = Collator::Sensitivity::Accent;
+    } else if (StringEqualsLiteral(sensitivity, "case")) {
+      options.sensitivity = Collator::Sensitivity::Case;
+    } else {
+      MOZ_ASSERT(StringEqualsLiteral(sensitivity, "variant"));
+      options.sensitivity = Collator::Sensitivity::Variant;
+    }
+  }
+
+  if (!GetProperty(cx, internals, internals, cx->names().ignorePunctuation,
+                   &value)) {
+    return nullptr;
+  }
+  options.ignorePunctuation = value.toBoolean();
+
+  if (!GetProperty(cx, internals, internals, cx->names().numeric, &value)) {
+    return nullptr;
+  }
+  if (!value.isUndefined()) {
+    options.numeric = value.toBoolean();
+  }
+
+  if (!GetProperty(cx, internals, internals, cx->names().caseFirst, &value)) {
+    return nullptr;
+  }
+  if (!value.isUndefined()) {
+    JSLinearString* caseFirst = value.toString()->ensureLinear(cx);
+    if (!caseFirst) {
+      return nullptr;
+    }
+    if (StringEqualsLiteral(caseFirst, "upper")) {
+      options.caseFirst = Collator::CaseFirst::Upper;
+    } else if (StringEqualsLiteral(caseFirst, "lower")) {
+      options.caseFirst = Collator::CaseFirst::Lower;
+    } else {
+      MOZ_ASSERT(StringEqualsLiteral(caseFirst, "false"));
+      options.caseFirst = Collator::CaseFirst::False;
+    }
+  }
+
+  auto collResult = Collator::TryCreate(locale.get());
   if (collResult.isErr()) {
     ReportInternalError(cx, collResult.unwrapErr());
     return nullptr;
@@ -581,29 +327,31 @@ static mozilla::intl::Collator* NewIntlCollator(
     ReportInternalError(cx, optResult.unwrapErr());
     return nullptr;
   }
+
   return coll.release();
 }
 
 static mozilla::intl::Collator* GetOrCreateCollator(
     JSContext* cx, Handle<CollatorObject*> collator) {
   // Obtain a cached mozilla::intl::Collator object.
-  if (auto* coll = collator->getCollator()) {
+  mozilla::intl::Collator* coll = collator->getCollator();
+  if (coll) {
     return coll;
   }
 
-  auto* coll = NewIntlCollator(cx, collator);
+  coll = NewIntlCollator(cx, collator);
   if (!coll) {
     return nullptr;
   }
   collator->setCollator(coll);
 
-  AddICUCellMemory(collator, CollatorObject::EstimatedMemoryUse);
+  intl::AddICUCellMemory(collator, CollatorObject::EstimatedMemoryUse);
   return coll;
 }
 
-bool js::intl::CompareStrings(JSContext* cx, Handle<CollatorObject*> collator,
-                              Handle<JSString*> str1, Handle<JSString*> str2,
-                              MutableHandle<Value> result) {
+static bool intl_CompareStrings(JSContext* cx, mozilla::intl::Collator* coll,
+                                JSString* str1, JSString* str2,
+                                MutableHandleValue result) {
   MOZ_ASSERT(str1);
   MOZ_ASSERT(str2);
 
@@ -612,182 +360,96 @@ bool js::intl::CompareStrings(JSContext* cx, Handle<CollatorObject*> collator,
     return true;
   }
 
-  auto* coll = GetOrCreateCollator(cx, collator);
-  if (!coll) {
-    return false;
-  }
-
-  JS::AutoStableStringChars stableChars1(cx);
+  AutoStableStringChars stableChars1(cx);
   if (!stableChars1.initTwoByte(cx, str1)) {
     return false;
   }
 
-  JS::AutoStableStringChars stableChars2(cx);
+  AutoStableStringChars stableChars2(cx);
   if (!stableChars2.initTwoByte(cx, str2)) {
     return false;
   }
 
-  auto chars1 = stableChars1.twoByteRange();
-  auto chars2 = stableChars2.twoByteRange();
+  mozilla::Range<const char16_t> chars1 = stableChars1.twoByteRange();
+  mozilla::Range<const char16_t> chars2 = stableChars2.twoByteRange();
 
   result.setInt32(coll->CompareStrings(chars1, chars2));
   return true;
 }
 
-static bool IsCollator(Handle<JS::Value> v) {
-  return v.isObject() && v.toObject().is<CollatorObject>();
-}
-
-static constexpr uint32_t CollatorCompareFunction_Collator = 0;
-
-/**
- * Collator Compare Functions
- */
-static bool CollatorCompareFunction(JSContext* cx, unsigned argc, Value* vp) {
+bool js::intl_CompareStrings(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
+  MOZ_ASSERT(args.length() == 3);
+  MOZ_ASSERT(args[0].isObject());
+  MOZ_ASSERT(args[1].isString());
+  MOZ_ASSERT(args[2].isString());
 
-  // Steps 1-2.
-  auto* compare = &args.callee().as<JSFunction>();
-  auto collValue = compare->getExtendedSlot(CollatorCompareFunction_Collator);
   Rooted<CollatorObject*> collator(cx,
-                                   &collValue.toObject().as<CollatorObject>());
+                                   &args[0].toObject().as<CollatorObject>());
 
-  // Step 3.
-  Rooted<JSString*> x(cx, JS::ToString(cx, args.get(0)));
-  if (!x) {
-    return false;
-  }
-
-  // Step 4.
-  Rooted<JSString*> y(cx, JS::ToString(cx, args.get(1)));
-  if (!y) {
+  mozilla::intl::Collator* coll = GetOrCreateCollator(cx, collator);
+  if (!coll) {
     return false;
   }
 
-  // Step 5.
-  return CompareStrings(cx, collator, x, y, args.rval());
+  // Use the UCollator to actually compare the strings.
+  JSString* str1 = args[1].toString();
+  JSString* str2 = args[2].toString();
+  return intl_CompareStrings(cx, coll, str1, str2, args.rval());
 }
 
-/**
- * get Intl.Collator.prototype.compare
- */
-static bool collator_compare(JSContext* cx, const CallArgs& args) {
-  Rooted<CollatorObject*> collator(
-      cx, &args.thisv().toObject().as<CollatorObject>());
-
-  // Step 3.
-  auto* boundCompare = collator->getBoundCompare();
-  if (!boundCompare) {
-    Handle<PropertyName*> funName = cx->names().empty_;
-    auto* fn =
-        NewNativeFunction(cx, CollatorCompareFunction, 2, funName,
-                          gc::AllocKind::FUNCTION_EXTENDED, GenericObject);
-    if (!fn) {
-      return false;
-    }
-    fn->initExtendedSlot(CollatorCompareFunction_Collator,
-                         ObjectValue(*collator));
-
-    collator->setBoundCompare(fn);
-    boundCompare = fn;
+bool js::intl::CompareStrings(JSContext* cx, Handle<CollatorObject*> collator,
+                              Handle<JSString*> str1, Handle<JSString*> str2,
+                              MutableHandle<Value> result) {
+  mozilla::intl::Collator* coll = GetOrCreateCollator(cx, collator);
+  if (!coll) {
+    return false;
   }
-
-  // Step 4.
-  args.rval().setObject(*boundCompare);
-  return true;
+  return intl_CompareStrings(cx, coll, str1, str2, result);
 }
 
-/**
- * get Intl.Collator.prototype.compare
- */
-static bool collator_compare(JSContext* cx, unsigned argc, Value* vp) {
-  // Steps 1-2.
+bool js::intl_isUpperCaseFirst(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
-  return CallNonGenericMethod<IsCollator, collator_compare>(cx, args);
-}
+  MOZ_ASSERT(args.length() == 1);
+  MOZ_ASSERT(args[0].isString());
 
-/**
- * Intl.Collator.prototype.resolvedOptions ( )
- */
-static bool collator_resolvedOptions(JSContext* cx, const CallArgs& args) {
-  Rooted<CollatorObject*> collator(
-      cx, &args.thisv().toObject().as<CollatorObject>());
+  SharedIntlData& sharedIntlData = cx->runtime()->sharedIntlData.ref();
 
-  if (!ResolveLocale(cx, collator)) {
-    return false;
-  }
-  auto colOptions = *collator->getOptions();
-
-  // Step 3.
-  Rooted<IdValueVector> options(cx, cx);
-
-  // Step 4.
-  if (!options.emplaceBack(NameToId(cx->names().locale),
-                           StringValue(collator->getLocale()))) {
+  Rooted<JSLinearString*> locale(cx, args[0].toString()->ensureLinear(cx));
+  if (!locale) {
     return false;
   }
 
-  auto* usage = NewStringCopy<CanGC>(cx, UsageToString(colOptions.usage));
-  if (!usage) {
-    return false;
-  }
-  if (!options.emplaceBack(NameToId(cx->names().usage), StringValue(usage))) {
+  bool isUpperFirst;
+  if (!sharedIntlData.isUpperCaseFirst(cx, locale, &isUpperFirst)) {
     return false;
   }
 
-  auto* sensitivity =
-      NewStringCopy<CanGC>(cx, SensitivityToString(*colOptions.sensitivity));
-  if (!sensitivity) {
-    return false;
-  }
-  if (!options.emplaceBack(NameToId(cx->names().sensitivity),
-                           StringValue(sensitivity))) {
-    return false;
-  }
+  args.rval().setBoolean(isUpperFirst);
+  return true;
+}
 
-  if (!options.emplaceBack(NameToId(cx->names().ignorePunctuation),
-                           BooleanValue(*colOptions.ignorePunctuation))) {
-    return false;
-  }
+bool js::intl_isIgnorePunctuation(JSContext* cx, unsigned argc, Value* vp) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+  MOZ_ASSERT(args.length() == 1);
+  MOZ_ASSERT(args[0].isString());
 
-  if (!options.emplaceBack(NameToId(cx->names().collation),
-                           StringValue(collator->getCollation()))) {
-    return false;
-  }
+  SharedIntlData& sharedIntlData = cx->runtime()->sharedIntlData.ref();
 
-  if (!options.emplaceBack(NameToId(cx->names().numeric),
-                           BooleanValue(*colOptions.numeric))) {
+  Rooted<JSLinearString*> locale(cx, args[0].toString()->ensureLinear(cx));
+  if (!locale) {
     return false;
   }
 
-  auto* caseFirst =
-      NewStringCopy<CanGC>(cx, CaseFirstToString(*colOptions.caseFirst));
-  if (!caseFirst) {
-    return false;
-  }
-  if (!options.emplaceBack(NameToId(cx->names().caseFirst),
-                           StringValue(caseFirst))) {
+  bool isIgnorePunctuation;
+  if (!sharedIntlData.isIgnorePunctuation(cx, locale, &isIgnorePunctuation)) {
     return false;
   }
 
-  // Step 5.
-  auto* result = NewPlainObjectWithUniqueNames(cx, options);
-  if (!result) {
-    return false;
-  }
-  args.rval().setObject(*result);
+  args.rval().setBoolean(isIgnorePunctuation);
   return true;
 }
 
-/**
- * Intl.Collator.prototype.resolvedOptions ( )
- */
-static bool collator_resolvedOptions(JSContext* cx, unsigned argc, Value* vp) {
-  // Steps 1-2.
-  CallArgs args = CallArgsFromVp(argc, vp);
-  return CallNonGenericMethod<IsCollator, collator_resolvedOptions>(cx, args);
-}
-
 /**
  * Intl.Collator.supportedLocalesOf ( locales [ , options ] )
  */
diff --git a/js/src/builtin/intl/Collator.h b/js/src/builtin/intl/Collator.h
index 84fb256e1dde1..146bf2fe74ea3 100644
--- a/js/src/builtin/intl/Collator.h
+++ b/js/src/builtin/intl/Collator.h
@@ -7,15 +7,11 @@
 #ifndef builtin_intl_Collator_h
 #define builtin_intl_Collator_h
 
-#include "mozilla/Maybe.h"
-
-#include <stddef.h>
 #include <stdint.h>
 
+#include "builtin/SelfHostingDefines.h"
 #include "js/Class.h"
-#include "js/Value.h"
 #include "vm/NativeObject.h"
-#include "vm/StringType.h"
 
 namespace mozilla::intl {
 class Collator;
@@ -23,88 +19,24 @@ class Collator;
 
 namespace js {
 
-namespace intl {
-struct CollatorOptions {
-  enum class Usage : int8_t { Sort, Search };
-  Usage usage = Usage::Sort;
-
-  enum class Sensitivity : int8_t { Base, Accent, Case, Variant };
-  mozilla::Maybe<Sensitivity> sensitivity{};
-
-  mozilla::Maybe<bool> ignorePunctuation{};
-
-  mozilla::Maybe<bool> numeric{};
-
-  enum class CaseFirst : int8_t { Upper, Lower, False };
-  mozilla::Maybe<CaseFirst> caseFirst{};
-};
-}  // namespace intl
+/******************** Collator ********************/
 
 class CollatorObject : public NativeObject {
  public:
   static const JSClass class_;
   static const JSClass& protoClass_;
 
-  static constexpr uint32_t LOCALE_SLOT = 0;
-  static constexpr uint32_t COLLATION_SLOT = 1;
-  static constexpr uint32_t OPTIONS_SLOT = 2;
-  static constexpr uint32_t INTL_COLLATOR_SLOT = 3;
-  static constexpr uint32_t BOUND_COMPARE_SLOT = 4;
-  static constexpr uint32_t SLOT_COUNT = 5;
+  static constexpr uint32_t INTERNALS_SLOT = 0;
+  static constexpr uint32_t INTL_COLLATOR_SLOT = 1;
+  static constexpr uint32_t SLOT_COUNT = 2;
+
+  static_assert(INTERNALS_SLOT == INTL_INTERNALS_OBJECT_SLOT,
+                "INTERNALS_SLOT must match self-hosting define for internals "
+                "object slot");
 
   // Estimated memory use for UCollator (see IcuMemoryUsage).
   static constexpr size_t EstimatedMemoryUse = 1128;
 
-  bool isLocaleResolved() const { return getFixedSlot(LOCALE_SLOT).isString(); }
-
-  JSObject* getRequestedLocales() const {
-    const auto& slot = getFixedSlot(LOCALE_SLOT);
-    if (slot.isUndefined()) {
-      return nullptr;
-    }
-    return &slot.toObject();
-  }
-
-  void setRequestedLocales(JSObject* requestedLocales) {
-    setFixedSlot(LOCALE_SLOT, JS::ObjectValue(*requestedLocales));
-  }
-
-  JSLinearString* getLocale() const {
-    const auto& slot = getFixedSlot(LOCALE_SLOT);
-    if (slot.isUndefined()) {
-      return nullptr;
-    }
-    return &slot.toString()->asLinear();
-  }
-
-  void setLocale(JSLinearString* locale) {
-    setFixedSlot(LOCALE_SLOT, JS::StringValue(locale));
-  }
-
-  JSLinearString* getCollation() const {
-    const auto& slot = getFixedSlot(COLLATION_SLOT);
-    if (slot.isUndefined()) {
-      return nullptr;
-    }
-    return &slot.toString()->asLinear();
-  }
-
-  void setCollation(JSLinearString* collation) {
-    setFixedSlot(COLLATION_SLOT, JS::StringValue(collation));
-  }
-
-  intl::CollatorOptions* getOptions() const {
-    const auto& slot = getFixedSlot(OPTIONS_SLOT);
-    if (slot.isUndefined()) {
-      return nullptr;
-    }
-    return static_cast<intl::CollatorOptions*>(slot.toPrivate());
-  }
-
-  void setOptions(intl::CollatorOptions* options) {
-    setFixedSlot(OPTIONS_SLOT, JS::PrivateValue(options));
-  }
-
   mozilla::intl::Collator* getCollator() const {
     const auto& slot = getFixedSlot(INTL_COLLATOR_SLOT);
     if (slot.isUndefined()) {
@@ -114,19 +46,7 @@ class CollatorObject : public NativeObject {
   }
 
   void setCollator(mozilla::intl::Collator* collator) {
-    setFixedSlot(INTL_COLLATOR_SLOT, JS::PrivateValue(collator));
-  }
-
-  JSObject* getBoundCompare() const {
-    const auto& slot = getFixedSlot(BOUND_COMPARE_SLOT);
-    if (slot.isUndefined()) {
-      return nullptr;
-    }
-    return &slot.toObject();
-  }
-
-  void setBoundCompare(JSObject* boundCompare) {
-    setFixedSlot(BOUND_COMPARE_SLOT, JS::ObjectValue(*boundCompare));
+    setFixedSlot(INTL_COLLATOR_SLOT, PrivateValue(collator));
   }
 
  private:
@@ -136,6 +56,36 @@ class CollatorObject : public NativeObject {
   static void finalize(JS::GCContext* gcx, JSObject* obj);
 };
 
+/**
+ * Compares x and y (which must be String values), and returns a number less
+ * than 0 if x < y, 0 if x = y, or a number greater than 0 if x > y according
+ * to the sort order for the locale and collation options of the given
+ * Collator.
+ *
+ * Spec: ECMAScript Internationalization API Specification, 10.3.2.
+ *
+ * Usage: result = intl_CompareStrings(collator, x, y)
+ */
+[[nodiscard]] extern bool intl_CompareStrings(JSContext* cx, unsigned argc,
+                                              JS::Value* vp);
+
+/**
+ * Returns true if the given locale sorts upper-case before lower-case
+ * characters.
+ *
+ * Usage: result = intl_isUpperCaseFirst(locale)
+ */
+[[nodiscard]] extern bool intl_isUpperCaseFirst(JSContext* cx, unsigned argc,
+                                                JS::Value* vp);
+
+/**
+ * Returns true if the given locale ignores punctuation by default.
+ *
+ * Usage: result = intl_isIgnorePunctuation(locale)
+ */
+[[nodiscard]] extern bool intl_isIgnorePunctuation(JSContext* cx, unsigned argc,
+                                                   JS::Value* vp);
+
 namespace intl {
 
 /**
@@ -153,11 +103,6 @@ namespace intl {
     JSContext* cx, JS::Handle<JS::Value> locales,
     JS::Handle<JS::Value> options);
 
-/**
- * Compares x and y, and returns a number less than 0 if x < y, 0 if x = y, or a
- * number greater than 0 if x > y according to the sort order for the locale and
- * collation options of the given Collator.
- */
 [[nodiscard]] extern bool CompareStrings(JSContext* cx,
                                          JS::Handle<CollatorObject*> collator,
                                          JS::Handle<JSString*> str1,
diff --git a/js/src/builtin/intl/Collator.js b/js/src/builtin/intl/Collator.js
new file mode 100644
index 0000000000000..c4c4f3048de21
--- /dev/null
+++ b/js/src/builtin/intl/Collator.js
@@ -0,0 +1,353 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* Portions Copyright Norbert Lindenberg 2011-2012. */
+
+/**
+ * Compute an internal properties object from |lazyCollatorData|.
+ */
+function resolveCollatorInternals(lazyCollatorData) {
+  assert(IsObject(lazyCollatorData), "lazy data not an object?");
+
+  var internalProps = std_Object_create(null);
+
+  // Step 5.
+  internalProps.usage = lazyCollatorData.usage;
+
+  // Compute effective locale.
+
+  // Steps 6-7 and 16-17.
+  var r = intl_ResolveLocale(
+    "Collator",
+    lazyCollatorData.requestedLocales,
+    lazyCollatorData.opt,
+    lazyCollatorData.usage === "search"
+  );
+
+  // Step 18.
+  internalProps.locale = r.locale;
+
+  // Step 19.
+  var collation = r.co;
+
+  // Step 20.
+  if (collation === null) {
+    collation = "default";
+  }
+
+  // Step 21.
+  internalProps.collation = collation;
+
+  // Step 22.
+  internalProps.numeric = r.kn === "true";
+
+  // Step 23.
+  internalProps.caseFirst = r.kf;
+
+  // Compute remaining collation options.
+  // Step 25.
+  var s = lazyCollatorData.rawSensitivity;
+  if (s === undefined) {
+    // In theory the default sensitivity for the "search" collator is
+    // locale dependent; in reality the CLDR/ICU default strength is
+    // always tertiary. Therefore use "variant" as the default value for
+    // both collation modes.
+    s = "variant";
+  }
+
+  // Step 26.
+  internalProps.sensitivity = s;
+
+  // Step 28.
+  var ignorePunctuation = lazyCollatorData.ignorePunctuation;
+  if (ignorePunctuation === undefined) {
+    var actualLocale = collatorActualLocale(r.dataLocale);
+    ignorePunctuation = intl_isIgnorePunctuation(actualLocale);
+  }
+  internalProps.ignorePunctuation = ignorePunctuation;
+
+  // The caller is responsible for associating |internalProps| with the right
+  // object using |setInternalProperties|.
+  return internalProps;
+}
+
+/**
+ * Returns an object containing the Collator internal properties of |obj|.
+ */
+function getCollatorInternals(obj) {
+  assert(IsObject(obj), "getCollatorInternals called with non-object");
+  assert(
+    intl_GuardToCollator(obj) !== null,
+    "getCollatorInternals called with non-Collator"
+  );
+
+  var internals = getIntlObjectInternals(obj);
+  assert(
+    internals.type === "Collator",
+    "bad type escaped getIntlObjectInternals"
+  );
+
+  // If internal properties have already been computed, use them.
+  var internalProps = maybeInternalProperties(internals);
+  if (internalProps) {
+    return internalProps;
+  }
+
+  // Otherwise it's time to fully create them.
+  internalProps = resolveCollatorInternals(internals.lazyData);
+  setInternalProperties(internals, internalProps);
+  return internalProps;
+}
+
+/**
+ * Initializes an object as a Collator.
+ *
+ * This method is complicated a moderate bit by its implementing initialization
+ * as a *lazy* concept.  Everything that must happen now, does -- but we defer
+ * all the work we can until the object is actually used as a Collator.  This
+ * later work occurs in |resolveCollatorInternals|; steps not noted here occur
+ * there.
+ *
+ * Spec: ECMAScript Internationalization API Specification, 10.1.1.
+ */
+function InitializeCollator(collator, locales, options) {
+  assert(IsObject(collator), "InitializeCollator called with non-object");
+  assert(
+    intl_GuardToCollator(collator) !== null,
+    "InitializeCollator called with non-Collator"
+  );
+
+  // Lazy Collator data has the following structure:
+  //
+  //   {
+  //     requestedLocales: List of locales,
+  //     usage: "sort" / "search",
+  //     opt: // opt object computed in InitializeCollator
+  //       {
+  //         localeMatcher: "lookup" / "best fit",
+  //         co: string matching a Unicode extension type / undefined
+  //         kn: true / false / undefined,
+  //         kf: "upper" / "lower" / "false" / undefined
+  //       }
+  //     rawSensitivity: "base" / "accent" / "case" / "variant" / undefined,
+  //     ignorePunctuation: true / false / undefined
+  //   }
+  //
+  // Note that lazy data is only installed as a final step of initialization,
+  // so every Collator lazy data object has *all* these properties, never a
+  // subset of them.
+  var lazyCollatorData = std_Object_create(null);
+
+  // Step 1.
+  var requestedLocales = CanonicalizeLocaleList(locales);
+  lazyCollatorData.requestedLocales = requestedLocales;
+
+  // Steps 2-3.
+  //
+  // If we ever need more speed here at startup, we should try to detect the
+  // case where |options === undefined| and then directly use the default
+  // value for each option.  For now, just keep it simple.
+  if (options === undefined) {
+    options = std_Object_create(null);
+  } else {
+    options = ToObject(options);
+  }
+
+  // Compute options that impact interpretation of locale.
+  // Step 4.
+  var u = GetOption(options, "usage", "string", ["sort", "search"], "sort");
+  lazyCollatorData.usage = u;
+
+  // Step 8.
+  var opt = NEW_RECORD();
+  lazyCollatorData.opt = opt;
+
+  // Steps 9-10.
+  var matcher = GetOption(
+    options,
+    "localeMatcher",
+    "string",
+    ["lookup", "best fit"],
+    "best fit"
+  );
+  opt.localeMatcher = matcher;
+
+  // https://github.com/tc39/ecma402/pull/459
+  var collation = GetOption(
+    options,
+    "collation",
+    "string",
+    undefined,
+    undefined
+  );
+  if (collation !== undefined) {
+    collation = intl_ValidateAndCanonicalizeUnicodeExtensionType(
+      collation,
+      "collation",
+      "co"
+    );
+  }
+  opt.co = collation;
+
+  // Steps 11-13.
+  var numericValue = GetOption(
+    options,
+    "numeric",
+    "boolean",
+    undefined,
+    undefined
+  );
+  if (numericValue !== undefined) {
+    numericValue = numericValue ? "true" : "false";
+  }
+  opt.kn = numericValue;
+
+  // Steps 14-15.
+  var caseFirstValue = GetOption(
+    options,
+    "caseFirst",
+    "string",
+    ["upper", "lower", "false"],
+    undefined
+  );
+  opt.kf = caseFirstValue;
+
+  // Compute remaining collation options.
+  // Step 24.
+  var s = GetOption(
+    options,
+    "sensitivity",
+    "string",
+    ["base", "accent", "case", "variant"],
+    undefined
+  );
+  lazyCollatorData.rawSensitivity = s;
+
+  // Step 27.
+  var ip = GetOption(options, "ignorePunctuation", "boolean", undefined, undefined);
+  lazyCollatorData.ignorePunctuation = ip;
+
+  // Step 29.
+  //
+  // We've done everything that must be done now: mark the lazy data as fully
+  // computed and install it.
+  initializeIntlObject(collator, "Collator", lazyCollatorData);
+}
+
+/**
+ * Returns the actual locale used when a collator for |locale| is constructed.
+ */
+function collatorActualLocale(locale) {
+  assert(typeof locale === "string", "locale should be string");
+
+  // If |locale| is the default locale (e.g. da-DK), but only supported
+  // through a fallback (da), we need to get the actual locale before we
+  // can call intl_isUpperCaseFirst. Also see intl_BestAvailableLocale.
+  return BestAvailableLocaleIgnoringDefault("Collator", locale);
+}
+
+/**
+ * Create function to be cached and returned by Intl.Collator.prototype.compare.
+ *
+ * Spec: ECMAScript Internationalization API Specification, 10.3.3.1.
+ */
+function createCollatorCompare(collator) {
+  // This function is not inlined in $Intl_Collator_compare_get to avoid
+  // creating a call-object on each call to $Intl_Collator_compare_get.
+  return function(x, y) {
+    // Step 1 (implicit).
+
+    // Step 2.
+    assert(IsObject(collator), "collatorCompareToBind called with non-object");
+    assert(
+      intl_GuardToCollator(collator) !== null,
+      "collatorCompareToBind called with non-Collator"
+    );
+
+    // Steps 3-6
+    var X = ToString(x);
+    var Y = ToString(y);
+
+    // Step 7.
+    return intl_CompareStrings(collator, X, Y);
+  };
+}
+
+/**
+ * Returns a function bound to this Collator that compares x (converted to a
+ * String value) and y (converted to a String value),
+ * and returns a number less than 0 if x < y, 0 if x = y, or a number greater
+ * than 0 if x > y according to the sort order for the locale and collation
+ * options of this Collator object.
+ *
+ * Spec: ECMAScript Internationalization API Specification, 10.3.3.
+ */
+// Uncloned functions with `$` prefix are allocated as extended function
+// to store the original name in `SetCanonicalName`.
+function $Intl_Collator_compare_get() {
+  // Step 1.
+  var collator = this;
+
+  // Steps 2-3.
+  if (
+    !IsObject(collator) ||
+    (collator = intl_GuardToCollator(collator)) === null
+  ) {
+    return callFunction(
+      intl_CallCollatorMethodIfWrapped,
+      this,
+      "$Intl_Collator_compare_get"
+    );
+  }
+
+  var internals = getCollatorInternals(collator);
+
+  // Step 4.
+  if (internals.boundCompare === undefined) {
+    // Steps 4.a-c.
+    internals.boundCompare = createCollatorCompare(collator);
+  }
+
+  // Step 5.
+  return internals.boundCompare;
+}
+SetCanonicalName($Intl_Collator_compare_get, "get compare");
+
+/**
+ * Returns the resolved options for a Collator object.
+ *
+ * Spec: ECMAScript Internationalization API Specification, 10.3.4.
+ */
+function Intl_Collator_resolvedOptions() {
+  // Step 1.
+  var collator = this;
+
+  // Steps 2-3.
+  if (
+    !IsObject(collator) ||
+    (collator = intl_GuardToCollator(collator)) === null
+  ) {
+    return callFunction(
+      intl_CallCollatorMethodIfWrapped,
+      this,
+      "Intl_Collator_resolvedOptions"
+    );
+  }
+
+  var internals = getCollatorInternals(collator);
+
+  // Steps 4-5.
+  var result = {
+    locale: internals.locale,
+    usage: internals.usage,
+    sensitivity: internals.sensitivity,
+    ignorePunctuation: internals.ignorePunctuation,
+    collation: internals.collation,
+    numeric: internals.numeric,
+    caseFirst: internals.caseFirst,
+  };
+
+  // Step 6.
+  return result;
+}
diff --git a/js/src/builtin/intl/CommonFunctions.js b/js/src/builtin/intl/CommonFunctions.js
index 874560a4efc8b..9d3050cf0c4e9 100644
--- a/js/src/builtin/intl/CommonFunctions.js
+++ b/js/src/builtin/intl/CommonFunctions.js
@@ -258,9 +258,12 @@ function intlFallbackSymbol() {
 function initializeIntlObject(obj, type, lazyData) {
   assert(IsObject(obj), "Non-object passed to initializeIntlObject");
   assert(
-    (type === "DateTimeFormat" && intl_GuardToDateTimeFormat(obj) !== null) ||
+    (type === "Collator" && intl_GuardToCollator(obj) !== null) ||
+      (type === "DateTimeFormat" && intl_GuardToDateTimeFormat(obj) !== null) ||
+      (type === "DurationFormat" && intl_GuardToDurationFormat(obj) !== null) ||
       (type === "NumberFormat" && intl_GuardToNumberFormat(obj) !== null) ||
-      (type === "PluralRules" && intl_GuardToPluralRules(obj) !== null),
+      (type === "PluralRules" && intl_GuardToPluralRules(obj) !== null) ||
+      (type === "Segmenter" && intl_GuardToSegmenter(obj) !== null),
     "type must match the object's class"
   );
   assert(IsObject(lazyData), "non-object lazy data");
@@ -269,9 +272,12 @@ function initializeIntlObject(obj, type, lazyData) {
   //
   // The .type property indicates the type of Intl object that |obj| is. It
   // must be one of:
+  // - Collator
   // - DateTimeFormat
+  // - DurationFormat
   // - NumberFormat
   // - PluralRules
+  // - Segmenter
   //
   // The .lazyData property stores information needed to compute -- without
   // observable side effects -- the actual internal Intl properties of
@@ -334,9 +340,12 @@ function maybeInternalProperties(internals) {
 function getIntlObjectInternals(obj) {
   assert(IsObject(obj), "getIntlObjectInternals called with non-Object");
   assert(
-    intl_GuardToDateTimeFormat(obj) !== null ||
+    intl_GuardToCollator(obj) !== null ||
+      intl_GuardToDateTimeFormat(obj) !== null ||
+      intl_GuardToDurationFormat(obj) !== null ||
       intl_GuardToNumberFormat(obj) !== null ||
-      intl_GuardToPluralRules(obj) !== null,
+      intl_GuardToPluralRules(obj) !== null ||
+      intl_GuardToSegmenter(obj) !== null,
     "getIntlObjectInternals called with non-Intl object"
   );
 
@@ -345,12 +354,17 @@ function getIntlObjectInternals(obj) {
   assert(IsObject(internals), "internals not an object");
   assert(hasOwn("type", internals), "missing type");
   assert(
-    (internals.type === "DateTimeFormat" &&
+    (internals.type === "Collator" && intl_GuardToCollator(obj) !== null) ||
+      (internals.type === "DateTimeFormat" &&
         intl_GuardToDateTimeFormat(obj) !== null) ||
+      (internals.type === "DurationFormat" &&
+        intl_GuardToDurationFormat(obj) !== null) ||
       (internals.type === "NumberFormat" &&
         intl_GuardToNumberFormat(obj) !== null) ||
       (internals.type === "PluralRules" &&
-        intl_GuardToPluralRules(obj) !== null),
+        intl_GuardToPluralRules(obj) !== null) ||
+      (internals.type === "Segmenter" &&
+        intl_GuardToSegmenter(obj) !== null),
     "type must match the object's class"
   );
   assert(hasOwn("lazyData", internals), "missing lazyData");
@@ -374,14 +388,19 @@ function getInternals(obj) {
 
   // Otherwise it's time to fully create them.
   var type = internals.type;
-  if (type === "DateTimeFormat") {
+  if (type === "Collator") {
+    internalProps = resolveCollatorInternals(internals.lazyData);
+  } else if (type === "DateTimeFormat") {
     internalProps = resolveDateTimeFormatInternals(internals.lazyData);
+  } else if (type === "DurationFormat") {
+    internalProps = resolveDurationFormatInternals(internals.lazyData);
   } else if (type === "NumberFormat") {
     internalProps = resolveNumberFormatInternals(internals.lazyData);
   } else if (type === "PluralRules") {
     internalProps = resolvePluralRulesInternals(internals.lazyData);
   } else {
-    assert(false, "unexpected Intl constructor");
+    assert(type === "Segmenter", "unexpected Intl type");
+    internalProps = resolveSegmenterInternals(internals.lazyData);
   }
   setInternalProperties(internals, internalProps);
   return internalProps;
diff --git a/js/src/builtin/intl/DurationFormat.cpp b/js/src/builtin/intl/DurationFormat.cpp
index 0816e6ce446cf..d8250c23d2017 100644
--- a/js/src/builtin/intl/DurationFormat.cpp
+++ b/js/src/builtin/intl/DurationFormat.cpp
@@ -12,12 +12,10 @@
 #include "mozilla/intl/DateTimeFormat.h"
 #include "mozilla/intl/ListFormat.h"
 #include "mozilla/intl/NumberFormat.h"
-#include "mozilla/Maybe.h"
 #include "mozilla/Span.h"
 
 #include <array>
 #include <charconv>
-#include <utility>
 
 #include "jspubtd.h"
 #include "NamespaceImports.h"
@@ -28,8 +26,6 @@
 #include "builtin/intl/ListFormat.h"
 #include "builtin/intl/LocaleNegotiation.h"
 #include "builtin/intl/NumberFormat.h"
-#include "builtin/intl/ParameterNegotiation.h"
-#include "builtin/intl/UsingEnum.h"
 #include "builtin/temporal/Duration.h"
 #include "gc/AllocKind.h"
 #include "gc/GCContext.h"
@@ -51,14 +47,12 @@
 using namespace js;
 using namespace js::intl;
 
-using js::temporal::TemporalUnit;
-
 static constexpr auto durationUnits = std::array{
-    TemporalUnit::Year,        TemporalUnit::Month,
-    TemporalUnit::Week,        TemporalUnit::Day,
-    TemporalUnit::Hour,        TemporalUnit::Minute,
-    TemporalUnit::Second,      TemporalUnit::Millisecond,
-    TemporalUnit::Microsecond, TemporalUnit::Nanosecond,
+    temporal::TemporalUnit::Year,        temporal::TemporalUnit::Month,
+    temporal::TemporalUnit::Week,        temporal::TemporalUnit::Day,
+    temporal::TemporalUnit::Hour,        temporal::TemporalUnit::Minute,
+    temporal::TemporalUnit::Second,      temporal::TemporalUnit::Millisecond,
+    temporal::TemporalUnit::Microsecond, temporal::TemporalUnit::Nanosecond,
 };
 
 const JSClass DurationFormatObject::class_ = {
@@ -73,13 +67,8 @@ const JSClass DurationFormatObject::class_ = {
 const JSClass& DurationFormatObject::protoClass_ = PlainObject::class_;
 
 static bool durationFormat_format(JSContext* cx, unsigned argc, Value* vp);
-
 static bool durationFormat_formatToParts(JSContext* cx, unsigned argc,
                                          Value* vp);
-
-static bool durationFormat_resolvedOptions(JSContext* cx, unsigned argc,
-                                           Value* vp);
-
 static bool durationFormat_supportedLocalesOf(JSContext* cx, unsigned argc,
                                               Value* vp);
 
@@ -95,7 +84,8 @@ static const JSFunctionSpec durationFormat_static_methods[] = {
 };
 
 static const JSFunctionSpec durationFormat_methods[] = {
-    JS_FN("resolvedOptions", durationFormat_resolvedOptions, 0, 0),
+    JS_SELF_HOSTED_FN("resolvedOptions", "Intl_DurationFormat_resolvedOptions",
+                      0, 0),
     JS_FN("format", durationFormat_format, 1, 0),
     JS_FN("formatToParts", durationFormat_formatToParts, 1, 0),
     JS_FN("toSource", durationFormat_toSource, 0, 0),
@@ -153,545 +143,6 @@ void js::DurationFormatObject::finalize(JS::GCContext* gcx, JSObject* obj) {
   }
 }
 
-static constexpr std::string_view DisplayToString(DurationDisplay display) {
-#ifndef USING_ENUM
-  using enum DurationDisplay;
-#else
-  USING_ENUM(DurationDisplay, Auto, Always);
-#endif
-  switch (display) {
-    case Auto:
-      return "auto";
-    case Always:
-      return "always";
-  }
-  MOZ_CRASH("invalid duration format display");
-}
-
-static constexpr std::string_view DurationStyleToString(DurationStyle style) {
-#ifndef USING_ENUM
-  using enum DurationStyle;
-#else
-  USING_ENUM(DurationStyle, Long, Short, Narrow, Numeric, TwoDigit);
-#endif
-  switch (style) {
-    case Long:
-      return "long";
-    case Short:
-      return "short";
-    case Narrow:
-      return "narrow";
-    case Numeric:
-      return "numeric";
-    case TwoDigit:
-      return "2-digit";
-  }
-  MOZ_CRASH("invalid duration format style");
-}
-
-static constexpr std::string_view BaseStyleToString(DurationBaseStyle style) {
-#ifndef USING_ENUM
-  using enum DurationBaseStyle;
-#else
-  USING_ENUM(DurationBaseStyle, Long, Short, Narrow, Digital);
-#endif
-  switch (style) {
-    case Long:
-      return "long";
-    case Short:
-      return "short";
-    case Narrow:
-      return "narrow";
-    case Digital:
-      return "digital";
-  }
-  MOZ_CRASH("invalid duration format base style");
-}
-
-/**
- * Return the singular name for |unit|.
- */
-static std::string_view SingularUnitName(TemporalUnit unit) {
-  switch (unit) {
-    case TemporalUnit::Year:
-      return "year";
-    case TemporalUnit::Month:
-      return "month";
-    case TemporalUnit::Week:
-      return "week";
-    case TemporalUnit::Day:
-      return "day";
-    case TemporalUnit::Hour:
-      return "hour";
-    case TemporalUnit::Minute:
-      return "minute";
-    case TemporalUnit::Second:
-      return "second";
-    case TemporalUnit::Millisecond:
-      return "millisecond";
-    case TemporalUnit::Microsecond:
-      return "microsecond";
-    case TemporalUnit::Nanosecond:
-      return "nanosecond";
-    case TemporalUnit::Unset:
-    case TemporalUnit::Auto:
-      break;
-  }
-  MOZ_CRASH("invalid temporal unit");
-}
-
-/**
- * Return the plural name for |unit|.
- */
-static std::string_view PluralUnitName(TemporalUnit unit) {
-  switch (unit) {
-    case TemporalUnit::Year:
-      return "years";
-    case TemporalUnit::Month:
-      return "months";
-    case TemporalUnit::Week:
-      return "weeks";
-    case TemporalUnit::Day:
-      return "days";
-    case TemporalUnit::Hour:
-      return "hours";
-    case TemporalUnit::Minute:
-      return "minutes";
-    case TemporalUnit::Second:
-      return "seconds";
-    case TemporalUnit::Millisecond:
-      return "milliseconds";
-    case TemporalUnit::Microsecond:
-      return "microseconds";
-    case TemporalUnit::Nanosecond:
-      return "nanoseconds";
-    case TemporalUnit::Unset:
-    case TemporalUnit::Auto:
-      break;
-  }
-  MOZ_CRASH("invalid temporal unit");
-}
-
-/**
- * Return the "style" property name for |unit|.
- */
-static Handle<PropertyName*> DurationStyleName(TemporalUnit unit,
-                                               JSContext* cx) {
-  switch (unit) {
-    case TemporalUnit::Year:
-      return cx->names().years;
-    case TemporalUnit::Month:
-      return cx->names().months;
-    case TemporalUnit::Week:
-      return cx->names().weeks;
-    case TemporalUnit::Day:
-      return cx->names().days;
-    case TemporalUnit::Hour:
-      return cx->names().hours;
-    case TemporalUnit::Minute:
-      return cx->names().minutes;
-    case TemporalUnit::Second:
-      return cx->names().seconds;
-    case TemporalUnit::Millisecond:
-      return cx->names().milliseconds;
-    case TemporalUnit::Microsecond:
-      return cx->names().microseconds;
-    case TemporalUnit::Nanosecond:
-      return cx->names().nanoseconds;
-    case TemporalUnit::Unset:
-    case TemporalUnit::Auto:
-      break;
-  }
-  MOZ_CRASH("invalid temporal unit");
-}
-
-/**
- * Return the "display" property name for |unit|.
- */
-static Handle<PropertyName*> DurationDisplayName(TemporalUnit unit,
-                                                 JSContext* cx) {
-  switch (unit) {
-    case TemporalUnit::Year:
-      return cx->names().yearsDisplay;
-    case TemporalUnit::Month:
-      return cx->names().monthsDisplay;
-    case TemporalUnit::Week:
-      return cx->names().weeksDisplay;
-    case TemporalUnit::Day:
-      return cx->names().daysDisplay;
-    case TemporalUnit::Hour:
-      return cx->names().hoursDisplay;
-    case TemporalUnit::Minute:
-      return cx->names().minutesDisplay;
-    case TemporalUnit::Second:
-      return cx->names().secondsDisplay;
-    case TemporalUnit::Millisecond:
-      return cx->names().millisecondsDisplay;
-    case TemporalUnit::Microsecond:
-      return cx->names().microsecondsDisplay;
-    case TemporalUnit::Nanosecond:
-      return cx->names().nanosecondsDisplay;
-    case TemporalUnit::Unset:
-    case TemporalUnit::Auto:
-      break;
-  }
-  MOZ_CRASH("invalid temporal unit");
-}
-
-/**
- * IsFractionalSecondUnitName ( unit )
- */
-static inline bool IsFractionalSecondUnitName(TemporalUnit unit) {
-  return TemporalUnit::Millisecond <= unit && unit <= TemporalUnit::Nanosecond;
-}
-
-/**
- * GetDurationUnitOptions ( unit, options, baseStyle, stylesList, digitalBase,
- * prevStyle, twoDigitHours )
- */
-static bool GetDurationUnitOptions(
-    JSContext* cx, TemporalUnit unit, Handle<JSObject*> options,
-    DurationBaseStyle baseStyle, DurationStyle digitalBase,
-    DurationStyle prevStyle,
-    std::pair<DurationStyle, DurationDisplay>* result) {
-  // Step 1.
-  mozilla::Maybe<DurationStyle> styleOption{};
-  switch (unit) {
-    case TemporalUnit::Year:
-    case TemporalUnit::Month:
-    case TemporalUnit::Week:
-    case TemporalUnit::Day: {
-      static constexpr auto styles = MapOptions<DurationStyleToString>(
-          DurationStyle::Long, DurationStyle::Short, DurationStyle::Narrow);
-      if (!GetStringOption(cx, options, DurationStyleName(unit, cx), styles,
-                           &styleOption)) {
-        return false;
-      }
-      break;
-    }
-
-    case TemporalUnit::Hour:
-    case TemporalUnit::Minute:
-    case TemporalUnit::Second: {
-      static constexpr auto styles = MapOptions<DurationStyleToString>(
-          DurationStyle::Long, DurationStyle::Short, DurationStyle::Narrow,
-          DurationStyle::Numeric, DurationStyle::TwoDigit);
-      if (!GetStringOption(cx, options, DurationStyleName(unit, cx), styles,
-                           &styleOption)) {
-        return false;
-      }
-      break;
-    }
-
-    case TemporalUnit::Millisecond:
-    case TemporalUnit::Microsecond:
-    case TemporalUnit::Nanosecond: {
-      static constexpr auto styles = MapOptions<DurationStyleToString>(
-          DurationStyle::Long, DurationStyle::Short, DurationStyle::Narrow,
-          DurationStyle::Numeric);
-      if (!GetStringOption(cx, options, DurationStyleName(unit, cx), styles,
-                           &styleOption)) {
-        return false;
-      }
-      break;
-    }
-
-    case TemporalUnit::Unset:
-    case TemporalUnit::Auto:
-      MOZ_CRASH("invalid temporal unit");
-  }
-
-  // Step 2.
-  auto displayDefault = DurationDisplay::Always;
-
-  // Step 3.
-  if (styleOption.isNothing()) {
-    // Step 3.a.
-    if (baseStyle == DurationBaseStyle::Digital) {
-      // Step 3.a.i.
-      styleOption = mozilla::Some(digitalBase);
-
-      // Step 3.a.ii.
-      if (!(TemporalUnit::Hour <= unit && unit <= TemporalUnit::Second)) {
-        displayDefault = DurationDisplay::Auto;
-      }
-    }
-
-    // Step 3.b. ("fractional" handled implicitly)
-    else if (prevStyle == DurationStyle::Numeric ||
-             prevStyle == DurationStyle::TwoDigit) {
-      // Step 3.b.i.
-      styleOption = mozilla::Some(DurationStyle::Numeric);
-
-      // Step 3.b.ii.
-      if (unit != TemporalUnit::Minute && unit != TemporalUnit::Second) {
-        displayDefault = DurationDisplay::Auto;
-      }
-    }
-
-    // Step 3.c.
-    else {
-      // Step 3.c.i.
-      styleOption = mozilla::Some(static_cast<DurationStyle>(baseStyle));
-
-      // Step 3.c.ii.
-      displayDefault = DurationDisplay::Auto;
-    }
-  }
-  auto style = *styleOption;
-
-  // Step 4.
-  bool isFractional =
-      style == DurationStyle::Numeric && IsFractionalSecondUnitName(unit);
-  if (isFractional) {
-    // Step 4.a. (Not applicable in our implementation)
-
-    // Step 4.b.
-    displayDefault = DurationDisplay::Auto;
-  }
-
-  // Steps 5-6.
-  static constexpr auto displays = MapOptions<DisplayToString>(
-      DurationDisplay::Auto, DurationDisplay::Always);
-
-  mozilla::Maybe<DurationDisplay> displayOption{};
-  if (!GetStringOption(cx, options, DurationDisplayName(unit, cx), displays,
-                       &displayOption)) {
-    return false;
-  }
-  auto display = displayOption.valueOr(displayDefault);
-
-  // Step 7. (Inlined ValidateDurationUnitStyle)
-
-  // ValidateDurationUnitStyle, step 1.
-  if (display == DurationDisplay::Always && isFractional) {
-    MOZ_ASSERT(styleOption.isSome() || displayOption.isSome(),
-               "no error is thrown when both 'style' and 'display' are absent");
-
-    JSErrNum errorNumber =
-        styleOption.isSome() && displayOption.isSome()
-            ? JSMSG_INTL_DURATION_INVALID_DISPLAY_OPTION
-        : displayOption.isSome()
-            ? JSMSG_INTL_DURATION_INVALID_DISPLAY_OPTION_DEFAULT_STYLE
-            : JSMSG_INTL_DURATION_INVALID_DISPLAY_OPTION_DEFAULT_DISPLAY;
-    JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, errorNumber,
-                              PluralUnitName(unit).data());
-    return false;
-  }
-
-  // ValidateDurationUnitStyle, steps 2-3.
-  if ((prevStyle == DurationStyle::Numeric ||
-       prevStyle == DurationStyle::TwoDigit) &&
-      !(style == DurationStyle::Numeric || style == DurationStyle::TwoDigit)) {
-    JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr,
-                              JSMSG_INTL_DURATION_INVALID_NON_NUMERIC_OPTION,
-                              PluralUnitName(unit).data(),
-                              DurationStyleToString(style).data());
-    return false;
-  }
-
-  // Step 8. (Our implementation doesn't use |twoDigitHours|.)
-
-  // Step 9.
-  if ((TemporalUnit::Minute == unit || unit == TemporalUnit::Second) &&
-      (prevStyle == DurationStyle::Numeric ||
-       prevStyle == DurationStyle::TwoDigit)) {
-    style = DurationStyle::TwoDigit;
-  }
-
-  // Step 10.
-  *result = {style, display};
-  return true;
-}
-
-/**
- * Intl.DurationFormat ( [ locales [ , options ] ] )
- */
-static bool InitializeDurationFormat(
-    JSContext* cx, Handle<DurationFormatObject*> durationFormat,
-    const CallArgs& args) {
-  // Step 3. (Inlined ResolveOptions)
-
-  // ResolveOptions, step 1.
-  Rooted<LocalesList> requestedLocales(cx, cx);
-  if (!CanonicalizeLocaleList(cx, args.get(0), &requestedLocales)) {
-    return false;
-  }
-
-  Rooted<ArrayObject*> requestedLocalesArray(
-      cx, LocalesListToArray(cx, requestedLocales));
-  if (!requestedLocalesArray) {
-    return false;
-  }
-  durationFormat->setRequestedLocales(requestedLocalesArray);
-
-  auto dfOptions = cx->make_unique<DurationFormatOptions>();
-  if (!dfOptions) {
-    return false;
-  }
-
-  if (args.hasDefined(1)) {
-    // ResolveOptions, steps 2-3.
-    Rooted<JSObject*> options(cx, JS::ToObject(cx, args[1]));
-    if (!options) {
-      return false;
-    }
-
-    // ResolveOptions, step 4.
-    LocaleMatcher matcher;
-    if (!GetLocaleMatcherOption(cx, options, &matcher)) {
-      return false;
-    }
-
-    // ResolveOptions, step 5.
-    //
-    // This implementation only supports the "lookup" locale matcher, therefore
-    // the "localeMatcher" option doesn't need to be stored.
-
-    // ResolveOptions, step 6.
-    Rooted<JSLinearString*> numberingSystem(cx);
-    if (!GetUnicodeExtensionOption(cx, options,
-                                   UnicodeExtensionKey::NumberingSystem,
-                                   &numberingSystem)) {
-      return false;
-    }
-    if (numberingSystem) {
-      durationFormat->setNumberingSystem(numberingSystem);
-    }
-
-    // ResolveOptions, step 7. (Not applicable)
-
-    // ResolveOptions, step 8. (Performed in ResolveLocale)
-
-    // ResolveOptions, step 9. (Return)
-
-    // Step 4. (Not applicable when ResolveOptions is inlined.)
-
-    // Steps 5-11. (Performed in ResolveLocale)
-
-    // Steps 12-13.
-    static constexpr auto styles = MapOptions<BaseStyleToString>(
-        DurationBaseStyle::Long, DurationBaseStyle::Short,
-        DurationBaseStyle::Narrow, DurationBaseStyle::Digital);
-    DurationBaseStyle style;
-    if (!GetStringOption(cx, options, cx->names().style, styles,
-                         DurationBaseStyle::Short, &style)) {
-      return false;
-    }
-    dfOptions->style = style;
-
-    // Step 14.
-    //
-    // This implementation doesn't support passing an empty string for
-    // |prevStyle|. Using one of the textual styles has the same effect, so we
-    // use "long" here.
-    constexpr auto emptyPrevStyle = DurationStyle::Long;
-
-    // Step 15. (Loop unrolled)
-    using DurationUnitOption = std::pair<DurationStyle, DurationDisplay>;
-
-    DurationUnitOption years;
-    if (!GetDurationUnitOptions(cx, TemporalUnit::Year, options, style,
-                                DurationStyle::Short, emptyPrevStyle, &years)) {
-      return false;
-    }
-    dfOptions->yearsStyle = years.first;
-    dfOptions->yearsDisplay = years.second;
-
-    DurationUnitOption months;
-    if (!GetDurationUnitOptions(cx, TemporalUnit::Month, options, style,
-                                DurationStyle::Short, emptyPrevStyle,
-                                &months)) {
-      return false;
-    }
-    dfOptions->monthsStyle = months.first;
-    dfOptions->monthsDisplay = months.second;
-
-    DurationUnitOption weeks;
-    if (!GetDurationUnitOptions(cx, TemporalUnit::Week, options, style,
-                                DurationStyle::Short, emptyPrevStyle, &weeks)) {
-      return false;
-    }
-    dfOptions->weeksStyle = weeks.first;
-    dfOptions->weeksDisplay = weeks.second;
-
-    DurationUnitOption days;
-    if (!GetDurationUnitOptions(cx, TemporalUnit::Day, options, style,
-                                DurationStyle::Short, emptyPrevStyle, &days)) {
-      return false;
-    }
-    dfOptions->daysStyle = days.first;
-    dfOptions->daysDisplay = days.second;
-
-    DurationUnitOption hours;
-    if (!GetDurationUnitOptions(cx, TemporalUnit::Hour, options, style,
-                                DurationStyle::Numeric, emptyPrevStyle,
-                                &hours)) {
-      return false;
-    }
-    dfOptions->hoursStyle = hours.first;
-    dfOptions->hoursDisplay = hours.second;
-
-    DurationUnitOption minutes;
-    if (!GetDurationUnitOptions(cx, TemporalUnit::Minute, options, style,
-                                DurationStyle::Numeric, hours.first,
-                                &minutes)) {
-      return false;
-    }
-    dfOptions->minutesStyle = minutes.first;
-    dfOptions->minutesDisplay = minutes.second;
-
-    DurationUnitOption seconds;
-    if (!GetDurationUnitOptions(cx, TemporalUnit::Second, options, style,
-                                DurationStyle::Numeric, minutes.first,
-                                &seconds)) {
-      return false;
-    }
-    dfOptions->secondsStyle = seconds.first;
-    dfOptions->secondsDisplay = seconds.second;
-
-    DurationUnitOption milliseconds;
-    if (!GetDurationUnitOptions(cx, TemporalUnit::Millisecond, options, style,
-                                DurationStyle::Numeric, seconds.first,
-                                &milliseconds)) {
-      return false;
-    }
-    dfOptions->millisecondsStyle = milliseconds.first;
-    dfOptions->millisecondsDisplay = milliseconds.second;
-
-    DurationUnitOption microseconds;
-    if (!GetDurationUnitOptions(cx, TemporalUnit::Microsecond, options, style,
-                                DurationStyle::Numeric, milliseconds.first,
-                                &microseconds)) {
-      return false;
-    }
-    dfOptions->microsecondsStyle = microseconds.first;
-    dfOptions->microsecondsDisplay = microseconds.second;
-
-    DurationUnitOption nanoseconds;
-    if (!GetDurationUnitOptions(cx, TemporalUnit::Nanosecond, options, style,
-                                DurationStyle::Numeric, microseconds.first,
-                                &nanoseconds)) {
-      return false;
-    }
-    dfOptions->nanosecondsStyle = nanoseconds.first;
-    dfOptions->nanosecondsDisplay = nanoseconds.second;
-
-    // Step 16.
-    mozilla::Maybe<int32_t> fractionalDigits{};
-    if (!GetNumberOption(cx, options, cx->names().fractionalDigits, 0, 9,
-                         &fractionalDigits)) {
-      return false;
-    }
-    dfOptions->fractionalDigits = fractionalDigits.valueOr(-1);
-  }
-  durationFormat->setOptions(dfOptions.release());
-  AddCellMemory(durationFormat, sizeof(DurationFormatOptions),
-                MemoryUse::IntlOptions);
-
-  return true;
-}
-
 /**
  * Intl.DurationFormat ( [ locales [ , options ] ] )
  */
@@ -704,7 +155,7 @@ static bool DurationFormat(JSContext* cx, unsigned argc, Value* vp) {
   }
 
   // Step 2 (Inlined 9.1.14, OrdinaryCreateFromConstructor).
-  Rooted<JSObject*> proto(cx);
+  RootedObject proto(cx);
   if (!GetPrototypeFromBuiltinConstructor(cx, args, JSProto_DurationFormat,
                                           &proto)) {
     return false;
@@ -716,64 +167,17 @@ static bool DurationFormat(JSContext* cx, unsigned argc, Value* vp) {
     return false;
   }
 
-  // Steps 3-16.
-  if (!InitializeDurationFormat(cx, durationFormat, args)) {
-    return false;
-  }
-
-  // Step 17.
-  args.rval().setObject(*durationFormat);
-  return true;
-}
-
-/**
- * Resolve the actual locale to finish initialization of the DurationFormat.
- */
-static bool ResolveLocale(JSContext* cx,
-                          Handle<DurationFormatObject*> durationFormat) {
-  // Return if the locale was already resolved.
-  if (durationFormat->isLocaleResolved()) {
-    return true;
-  }
-
-  Rooted<ArrayObject*> requestedLocales(
-      cx, &durationFormat->getRequestedLocales()->as<ArrayObject>());
-
-  // %Intl.DurationFormat%.[[RelevantExtensionKeys]] is « "nu" ».
-  mozilla::EnumSet<UnicodeExtensionKey> relevantExtensionKeys{
-      UnicodeExtensionKey::NumberingSystem,
-  };
-
-  // Initialize locale options from constructor arguments.
-  Rooted<LocaleOptions> localeOptions(cx);
-  if (auto* nu = durationFormat->getNumberingSystem()) {
-    localeOptions.setUnicodeExtension(UnicodeExtensionKey::NumberingSystem, nu);
-  }
+  HandleValue locales = args.get(0);
+  HandleValue options = args.get(1);
 
-  // Use the default locale data.
-  auto localeData = LocaleData::Default;
-
-  // Resolve the actual locale.
-  Rooted<ResolvedLocale> resolved(cx);
-  if (!ResolveLocale(cx, AvailableLocaleKind::DurationFormat, requestedLocales,
-                     localeOptions, relevantExtensionKeys, localeData,
-                     &resolved)) {
-    return false;
-  }
-
-  // Finish initialization by setting the actual locale and numbering system.
-  auto* locale = resolved.toLocale(cx);
-  if (!locale) {
+  // Steps 3-28.
+  if (!InitializeObject(cx, durationFormat,
+                        cx->names().InitializeDurationFormat, locales,
+                        options)) {
     return false;
   }
-  durationFormat->setLocale(locale);
 
-  auto nu = resolved.extension(UnicodeExtensionKey::NumberingSystem);
-  MOZ_ASSERT(nu, "resolved numbering system is non-null");
-  durationFormat->setNumberingSystem(nu);
-
-  MOZ_ASSERT(durationFormat->isLocaleResolved(),
-             "locale successfully resolved");
+  args.rval().setObject(*durationFormat);
   return true;
 }
 
@@ -786,16 +190,28 @@ static JSString* GetTimeSeparator(
     return separator;
   }
 
-  if (!ResolveLocale(cx, durationFormat)) {
+  Rooted<JSObject*> internals(cx, GetInternalsObject(cx, durationFormat));
+  if (!internals) {
     return nullptr;
   }
 
-  auto locale = EncodeLocale(cx, durationFormat->getLocale());
+  Rooted<Value> value(cx);
+
+  if (!GetProperty(cx, internals, internals, cx->names().locale, &value)) {
+    return nullptr;
+  }
+
+  UniqueChars locale = EncodeLocale(cx, value.toString());
   if (!locale) {
     return nullptr;
   }
 
-  auto numberingSystem = EncodeAscii(cx, durationFormat->getNumberingSystem());
+  if (!GetProperty(cx, internals, internals, cx->names().numberingSystem,
+                   &value)) {
+    return nullptr;
+  }
+
+  UniqueChars numberingSystem = EncodeAscii(cx, value.toString());
   if (!numberingSystem) {
     return nullptr;
   }
@@ -852,50 +268,143 @@ struct DurationValue {
       return DurationValue{std::abs(number)};
     }
 
-    // Copy decimal strings without the leading '-' sign character.
-    auto result = DurationValue{};
-    std::copy(std::next(decimal), std::end(decimal), result.decimal);
-    return result;
+    // Copy decimal strings without the leading '-' sign character.
+    auto result = DurationValue{};
+    std::copy(std::next(decimal), std::end(decimal), result.decimal);
+    return result;
+  }
+
+  // |number| is active by default unless |decimal| is used.
+  bool isDecimal() const { return decimal[0] != '\0'; }
+
+  // Return true if this value represents either +0 or -0.
+  bool isZero() const { return number == 0 && !isDecimal(); }
+
+  operator std::string_view() const {
+    MOZ_ASSERT(isDecimal());
+    return {decimal};
+  }
+};
+
+/**
+ * Return the |unit| value from |duration|.
+ */
+static auto ToDurationValue(const temporal::Duration& duration,
+                            temporal::TemporalUnit unit) {
+  using namespace temporal;
+
+  switch (unit) {
+    case TemporalUnit::Year:
+      return DurationValue{duration.years};
+    case TemporalUnit::Month:
+      return DurationValue{duration.months};
+    case TemporalUnit::Week:
+      return DurationValue{duration.weeks};
+    case TemporalUnit::Day:
+      return DurationValue{duration.days};
+    case TemporalUnit::Hour:
+      return DurationValue{duration.hours};
+    case TemporalUnit::Minute:
+      return DurationValue{duration.minutes};
+    case TemporalUnit::Second:
+      return DurationValue{duration.seconds};
+    case TemporalUnit::Millisecond:
+      return DurationValue{duration.milliseconds};
+    case TemporalUnit::Microsecond:
+      return DurationValue{duration.microseconds};
+    case TemporalUnit::Nanosecond:
+      return DurationValue{duration.nanoseconds};
+    case TemporalUnit::Unset:
+    case TemporalUnit::Auto:
+      break;
+  }
+  MOZ_CRASH("invalid temporal unit");
+}
+
+/**
+ * Return the "display" property name for |unit|.
+ */
+static PropertyName* DurationDisplayName(temporal::TemporalUnit unit,
+                                         JSContext* cx) {
+  using namespace temporal;
+
+  switch (unit) {
+    case TemporalUnit::Year:
+      return cx->names().yearsDisplay;
+    case TemporalUnit::Month:
+      return cx->names().monthsDisplay;
+    case TemporalUnit::Week:
+      return cx->names().weeksDisplay;
+    case TemporalUnit::Day:
+      return cx->names().daysDisplay;
+    case TemporalUnit::Hour:
+      return cx->names().hoursDisplay;
+    case TemporalUnit::Minute:
+      return cx->names().minutesDisplay;
+    case TemporalUnit::Second:
+      return cx->names().secondsDisplay;
+    case TemporalUnit::Millisecond:
+      return cx->names().millisecondsDisplay;
+    case TemporalUnit::Microsecond:
+      return cx->names().microsecondsDisplay;
+    case TemporalUnit::Nanosecond:
+      return cx->names().nanosecondsDisplay;
+    case TemporalUnit::Unset:
+    case TemporalUnit::Auto:
+      break;
   }
+  MOZ_CRASH("invalid temporal unit");
+}
 
-  // |number| is active by default unless |decimal| is used.
-  bool isDecimal() const { return decimal[0] != '\0'; }
+/**
+ * Convert |value|, which must be a string, to a |DurationDisplay|.
+ */
+static bool ToDurationDisplay(JSContext* cx, const Value& value,
+                              DurationDisplay* result) {
+  MOZ_ASSERT(value.isString());
 
-  // Return true if this value represents either +0 or -0.
-  bool isZero() const { return number == 0 && !isDecimal(); }
+  auto* linear = value.toString()->ensureLinear(cx);
+  if (!linear) {
+    return false;
+  }
 
-  operator std::string_view() const {
-    MOZ_ASSERT(isDecimal());
-    return {decimal};
+  if (StringEqualsAscii(linear, "auto")) {
+    *result = DurationDisplay::Auto;
+  } else {
+    MOZ_ASSERT(StringEqualsAscii(linear, "always"));
+    *result = DurationDisplay::Always;
   }
-};
+  return true;
+}
 
 /**
- * Return the |unit| value from |duration|.
+ * Return the "style" property name for |unit|.
  */
-static auto ToDurationValue(const temporal::Duration& duration,
-                            TemporalUnit unit) {
+static PropertyName* DurationStyleName(temporal::TemporalUnit unit,
+                                       JSContext* cx) {
+  using namespace temporal;
+
   switch (unit) {
     case TemporalUnit::Year:
-      return DurationValue{duration.years};
+      return cx->names().yearsStyle;
     case TemporalUnit::Month:
-      return DurationValue{duration.months};
+      return cx->names().monthsStyle;
     case TemporalUnit::Week:
-      return DurationValue{duration.weeks};
+      return cx->names().weeksStyle;
     case TemporalUnit::Day:
-      return DurationValue{duration.days};
+      return cx->names().daysStyle;
     case TemporalUnit::Hour:
-      return DurationValue{duration.hours};
+      return cx->names().hoursStyle;
     case TemporalUnit::Minute:
-      return DurationValue{duration.minutes};
+      return cx->names().minutesStyle;
     case TemporalUnit::Second:
-      return DurationValue{duration.seconds};
+      return cx->names().secondsStyle;
     case TemporalUnit::Millisecond:
-      return DurationValue{duration.milliseconds};
+      return cx->names().millisecondsStyle;
     case TemporalUnit::Microsecond:
-      return DurationValue{duration.microseconds};
+      return cx->names().microsecondsStyle;
     case TemporalUnit::Nanosecond:
-      return DurationValue{duration.nanoseconds};
+      return cx->names().nanosecondsStyle;
     case TemporalUnit::Unset:
     case TemporalUnit::Auto:
       break;
@@ -903,6 +412,33 @@ static auto ToDurationValue(const temporal::Duration& duration,
   MOZ_CRASH("invalid temporal unit");
 }
 
+/**
+ * Convert |value|, which must be a string, to a |DurationStyle|.
+ */
+static bool ToDurationStyle(JSContext* cx, const Value& value,
+                            DurationStyle* result) {
+  MOZ_ASSERT(value.isString());
+
+  auto* linear = value.toString()->ensureLinear(cx);
+  if (!linear) {
+    return false;
+  }
+
+  if (StringEqualsAscii(linear, "long")) {
+    *result = DurationStyle::Long;
+  } else if (StringEqualsAscii(linear, "short")) {
+    *result = DurationStyle::Short;
+  } else if (StringEqualsAscii(linear, "narrow")) {
+    *result = DurationStyle::Narrow;
+  } else if (StringEqualsAscii(linear, "numeric")) {
+    *result = DurationStyle::Numeric;
+  } else {
+    MOZ_ASSERT(StringEqualsAscii(linear, "2-digit"));
+    *result = DurationStyle::TwoDigit;
+  }
+  return true;
+}
+
 /**
  * Return the fractional digits setting from |durationFormat|.
  */
@@ -921,7 +457,9 @@ static std::pair<uint32_t, uint32_t> GetFractionalDigits(
 }
 
 static DurationUnitOptions GetUnitOptions(const DurationFormatOptions& options,
-                                          TemporalUnit unit) {
+                                          temporal::TemporalUnit unit) {
+  using namespace temporal;
+
   switch (unit) {
 #define GET_UNIT_OPTIONS(name) \
   DurationUnitOptions { options.name##Display, options.name##Style }
@@ -955,27 +493,167 @@ static DurationUnitOptions GetUnitOptions(const DurationFormatOptions& options,
   MOZ_CRASH("invalid duration unit");
 }
 
-/**
- * Create a `mozilla::intl::NumberFormat` instance based on
- * |durationFormat.locale| and |options|.
- */
-static mozilla::intl::NumberFormat* NewDurationNumberFormat(
-    JSContext* cx, Handle<DurationFormatObject*> durationFormat,
-    const mozilla::intl::NumberFormatOptions& options) {
-  if (!ResolveLocale(cx, durationFormat)) {
+static void SetUnitOptions(DurationFormatOptions& options,
+                           temporal::TemporalUnit unit,
+                           const DurationUnitOptions& unitOptions) {
+  using namespace temporal;
+
+  switch (unit) {
+#define SET_UNIT_OPTIONS(name)                    \
+  do {                                            \
+    options.name##Display = unitOptions.display_; \
+    options.name##Style = unitOptions.style_;     \
+  } while (0)
+
+    case TemporalUnit::Year:
+      SET_UNIT_OPTIONS(years);
+      return;
+    case TemporalUnit::Month:
+      SET_UNIT_OPTIONS(months);
+      return;
+    case TemporalUnit::Week:
+      SET_UNIT_OPTIONS(weeks);
+      return;
+    case TemporalUnit::Day:
+      SET_UNIT_OPTIONS(days);
+      return;
+    case TemporalUnit::Hour:
+      SET_UNIT_OPTIONS(hours);
+      return;
+    case TemporalUnit::Minute:
+      SET_UNIT_OPTIONS(minutes);
+      return;
+    case TemporalUnit::Second:
+      SET_UNIT_OPTIONS(seconds);
+      return;
+    case TemporalUnit::Millisecond:
+      SET_UNIT_OPTIONS(milliseconds);
+      return;
+    case TemporalUnit::Microsecond:
+      SET_UNIT_OPTIONS(microseconds);
+      return;
+    case TemporalUnit::Nanosecond:
+      SET_UNIT_OPTIONS(nanoseconds);
+      return;
+    case TemporalUnit::Unset:
+    case TemporalUnit::Auto:
+      break;
+
+#undef SET_UNIT_OPTIONS
+  }
+  MOZ_CRASH("invalid duration unit");
+}
+
+static DurationFormatOptions* NewDurationFormatOptions(
+    JSContext* cx, Handle<DurationFormatObject*> durationFormat) {
+  Rooted<JSObject*> internals(cx, GetInternalsObject(cx, durationFormat));
+  if (!internals) {
+    return nullptr;
+  }
+
+  auto options = cx->make_unique<DurationFormatOptions>();
+  if (!options) {
+    return nullptr;
+  }
+
+  Rooted<Value> value(cx);
+  for (temporal::TemporalUnit unit : durationUnits) {
+    DurationDisplay display;
+    if (!GetProperty(cx, internals, internals, DurationDisplayName(unit, cx),
+                     &value)) {
+      return nullptr;
+    }
+    if (!ToDurationDisplay(cx, value, &display)) {
+      return nullptr;
+    }
+
+    DurationStyle style;
+    if (!GetProperty(cx, internals, internals, DurationStyleName(unit, cx),
+                     &value)) {
+      return nullptr;
+    }
+    if (!ToDurationStyle(cx, value, &style)) {
+      return nullptr;
+    }
+
+    SetUnitOptions(*options, unit,
+                   DurationUnitOptions{static_cast<uint8_t>(display),
+                                       static_cast<uint8_t>(style)});
+  }
+
+  if (!GetProperty(cx, internals, internals, cx->names().fractionalDigits,
+                   &value)) {
+    return nullptr;
+  }
+  if (value.isUndefined()) {
+    options->fractionalDigits = -1;
+  } else {
+    options->fractionalDigits = value.toInt32();
+  }
+
+  return options.release();
+}
+
+static DurationFormatOptions* GetOrCreateDurationFormatOptions(
+    JSContext* cx, Handle<DurationFormatObject*> durationFormat) {
+  auto* options = durationFormat->getOptions();
+  if (options) {
+    return options;
+  }
+
+  options = NewDurationFormatOptions(cx, durationFormat);
+  if (!options) {
     return nullptr;
   }
+  durationFormat->setOptions(options);
+
+  AddCellMemory(durationFormat, sizeof(DurationFormatOptions),
+                MemoryUse::IntlOptions);
+  return options;
+}
 
+/**
+ * Return the locale for `mozilla::intl::NumberFormat` objects.
+ */
+static UniqueChars NewDurationNumberFormatLocale(
+    JSContext* cx, Handle<DurationFormatObject*> durationFormat) {
   // ICU expects numberingSystem as a Unicode locale extensions on locale.
 
-  Rooted<JSLinearString*> localeStr(cx, durationFormat->getLocale());
+  Rooted<JSObject*> internals(cx, GetInternalsObject(cx, durationFormat));
+  if (!internals) {
+    return nullptr;
+  }
 
   JS::RootedVector<UnicodeExtensionKeyword> keywords(cx);
-  if (!keywords.emplaceBack("nu", durationFormat->getNumberingSystem())) {
+
+  Rooted<Value> value(cx);
+  if (!GetProperty(cx, internals, internals, cx->names().numberingSystem,
+                   &value)) {
     return nullptr;
   }
 
-  auto locale = FormatLocale(cx, localeStr, keywords);
+  {
+    auto* numberingSystem = value.toString()->ensureLinear(cx);
+    if (!numberingSystem) {
+      return nullptr;
+    }
+
+    if (!keywords.emplaceBack("nu", numberingSystem)) {
+      return nullptr;
+    }
+  }
+
+  return FormatLocale(cx, internals, keywords);
+}
+
+/**
+ * Create a `mozilla::intl::NumberFormat` instance based on |internals.locale|
+ * and |options|.
+ */
+static mozilla::intl::NumberFormat* NewDurationNumberFormat(
+    JSContext* cx, Handle<DurationFormatObject*> durationFormat,
+    const mozilla::intl::NumberFormatOptions& options) {
+  auto locale = NewDurationNumberFormatLocale(cx, durationFormat);
   if (!locale) {
     return nullptr;
   }
@@ -991,7 +669,43 @@ static mozilla::intl::NumberFormat* NewDurationNumberFormat(
 /**
  * Return the singular name for |unit|.
  */
-static auto PartUnitName(TemporalUnit unit) {
+static std::string_view UnitName(temporal::TemporalUnit unit) {
+  using namespace temporal;
+
+  switch (unit) {
+    case TemporalUnit::Year:
+      return "year";
+    case TemporalUnit::Month:
+      return "month";
+    case TemporalUnit::Week:
+      return "week";
+    case TemporalUnit::Day:
+      return "day";
+    case TemporalUnit::Hour:
+      return "hour";
+    case TemporalUnit::Minute:
+      return "minute";
+    case TemporalUnit::Second:
+      return "second";
+    case TemporalUnit::Millisecond:
+      return "millisecond";
+    case TemporalUnit::Microsecond:
+      return "microsecond";
+    case TemporalUnit::Nanosecond:
+      return "nanosecond";
+    case TemporalUnit::Unset:
+    case TemporalUnit::Auto:
+      break;
+  }
+  MOZ_CRASH("invalid temporal unit");
+}
+
+/**
+ * Return the singular name for |unit|.
+ */
+static auto PartUnitName(temporal::TemporalUnit unit) {
+  using namespace temporal;
+
   switch (unit) {
     case TemporalUnit::Year:
       return &JSAtomState::year;
@@ -1049,13 +763,15 @@ static auto UnitDisplay(DurationStyle style) {
  * decimal string when the fractional part is non-zero.
  */
 static auto ComputeFractionalDigits(const temporal::Duration& duration,
-                                    TemporalUnit unit) {
+                                    temporal::TemporalUnit unit) {
+  using namespace temporal;
+
   MOZ_ASSERT(IsValidDuration(duration));
   MOZ_ASSERT(TemporalUnit::Second <= unit && unit <= TemporalUnit::Microsecond);
 
   // Directly return the duration amount when no sub-seconds are present, i.e.
   // the fractional part is zero.
-  temporal::TimeDuration timeDuration;
+  TimeDuration timeDuration;
   int32_t exponent;
   switch (unit) {
     case TemporalUnit::Second: {
@@ -1063,7 +779,7 @@ static auto ComputeFractionalDigits(const temporal::Duration& duration,
           duration.nanoseconds == 0) {
         return DurationValue{duration.seconds};
       }
-      timeDuration = temporal::TimeDurationFromComponents({
+      timeDuration = TimeDurationFromComponents({
           0,
           0,
           0,
@@ -1083,7 +799,7 @@ static auto ComputeFractionalDigits(const temporal::Duration& duration,
       if (duration.microseconds == 0 && duration.nanoseconds == 0) {
         return DurationValue{duration.milliseconds};
       }
-      timeDuration = temporal::TimeDurationFromComponents({
+      timeDuration = TimeDurationFromComponents({
           0,
           0,
           0,
@@ -1103,7 +819,7 @@ static auto ComputeFractionalDigits(const temporal::Duration& duration,
       if (duration.nanoseconds == 0) {
         return DurationValue{duration.microseconds};
       }
-      timeDuration = temporal::TimeDurationFromComponents({
+      timeDuration = TimeDurationFromComponents({
           0,
           0,
           0,
@@ -1130,7 +846,7 @@ static auto ComputeFractionalDigits(const temporal::Duration& duration,
   char* chars = result.decimal;
 
   // Leading '-' sign when the duration is negative.
-  if (timeDuration < temporal::TimeDuration{}) {
+  if (timeDuration < TimeDuration{}) {
     *chars++ = '-';
     timeDuration = timeDuration.abs();
   }
@@ -1174,7 +890,7 @@ static auto ComputeFractionalDigits(const temporal::Duration& duration,
  */
 static mozilla::intl::NumberFormat* NewNumericFormatter(
     JSContext* cx, Handle<DurationFormatObject*> durationFormat,
-    TemporalUnit unit) {
+    temporal::TemporalUnit unit) {
   // FormatNumericHours, step 1. (Not applicable in our implementation.)
   // FormatNumericMinutes, steps 1-2. (Not applicable in our implementation.)
   // FormatNumericSeconds, steps 1-2. (Not applicable in our implementation.)
@@ -1185,7 +901,7 @@ static mozilla::intl::NumberFormat* NewNumericFormatter(
   auto* dfOptions = durationFormat->getOptions();
   MOZ_ASSERT(dfOptions, "unexpected unresolved duration format options");
 
-  auto style = GetUnitOptions(*dfOptions, unit).style;
+  auto style = GetUnitOptions(*dfOptions, unit).style();
 
   // FormatNumericHours, step 3.
   // FormatNumericMinutes, step 4.
@@ -1219,7 +935,7 @@ static mozilla::intl::NumberFormat* NewNumericFormatter(
   options.mGrouping = mozilla::intl::NumberFormatOptions::Grouping::Never;
 
   // FormatNumericSeconds, steps 11-14.
-  if (unit == TemporalUnit::Second) {
+  if (unit == temporal::TemporalUnit::Second) {
     // FormatNumericSeconds, step 11.
     auto fractionalDigits = GetFractionalDigits(durationFormat);
 
@@ -1239,7 +955,7 @@ static mozilla::intl::NumberFormat* NewNumericFormatter(
 
 static mozilla::intl::NumberFormat* GetOrCreateNumericFormatter(
     JSContext* cx, Handle<DurationFormatObject*> durationFormat,
-    TemporalUnit unit) {
+    temporal::TemporalUnit unit) {
   // Obtain a cached mozilla::intl::NumberFormat object.
   auto* nf = durationFormat->getNumberFormat(unit);
   if (nf) {
@@ -1260,7 +976,9 @@ static mozilla::intl::NumberFormat* GetOrCreateNumericFormatter(
  * NextUnitFractional ( durationFormat, unit )
  */
 static bool NextUnitFractional(const DurationFormatObject* durationFormat,
-                               TemporalUnit unit) {
+                               temporal::TemporalUnit unit) {
+  using namespace temporal;
+
   // Steps 1-3.
   if (TemporalUnit::Second <= unit && unit <= TemporalUnit::Microsecond) {
     auto* options = durationFormat->getOptions();
@@ -1270,7 +988,7 @@ static bool NextUnitFractional(const DurationFormatObject* durationFormat,
 
     auto nextUnit =
         static_cast<TemporalUnit>(static_cast<TemporalUnitType>(unit) + 1);
-    auto nextStyle = GetUnitOptions(*options, nextUnit).style;
+    auto nextStyle = GetUnitOptions(*options, nextUnit).style();
     return nextStyle == DurationStyle::Numeric;
   }
 
@@ -1283,7 +1001,7 @@ static bool NextUnitFractional(const DurationFormatObject* durationFormat,
  */
 static mozilla::intl::NumberFormat* NewNumberFormat(
     JSContext* cx, Handle<DurationFormatObject*> durationFormat,
-    TemporalUnit unit, DurationStyle style) {
+    temporal::TemporalUnit unit, DurationStyle style) {
   // Step 4.h.i.
   mozilla::intl::NumberFormatOptions options{};
 
@@ -1299,8 +1017,7 @@ static mozilla::intl::NumberFormat* NewNumberFormat(
   }
 
   // Steps 4.h.iii.4-6.
-  options.mUnit =
-      mozilla::Some(std::pair{SingularUnitName(unit), UnitDisplay(style)});
+  options.mUnit = mozilla::Some(std::pair{UnitName(unit), UnitDisplay(style)});
 
   // Step 4.h.iii.7.
   return NewDurationNumberFormat(cx, durationFormat, options);
@@ -1308,13 +1025,14 @@ static mozilla::intl::NumberFormat* NewNumberFormat(
 
 static mozilla::intl::NumberFormat* GetOrCreateNumberFormat(
     JSContext* cx, Handle<DurationFormatObject*> durationFormat,
-    TemporalUnit unit, DurationStyle style) {
+    temporal::TemporalUnit unit, DurationStyle style) {
   // Obtain a cached mozilla::intl::NumberFormat object.
-  if (auto* nf = durationFormat->getNumberFormat(unit)) {
+  auto* nf = durationFormat->getNumberFormat(unit);
+  if (nf) {
     return nf;
   }
 
-  auto* nf = NewNumberFormat(cx, durationFormat, unit, style);
+  nf = NewNumberFormat(cx, durationFormat, unit, style);
   if (!nf) {
     return nullptr;
   }
@@ -1336,7 +1054,7 @@ static JSLinearString* FormatDurationValueToString(
 static ArrayObject* FormatDurationValueToParts(JSContext* cx,
                                                mozilla::intl::NumberFormat* nf,
                                                const DurationValue& value,
-                                               TemporalUnit unit) {
+                                               temporal::TemporalUnit unit) {
   if (value.isDecimal()) {
     return FormatNumberToParts(cx, nf, std::string_view{value},
                                PartUnitName(unit));
@@ -1345,8 +1063,8 @@ static ArrayObject* FormatDurationValueToParts(JSContext* cx,
 }
 
 static bool FormatDurationValue(JSContext* cx, mozilla::intl::NumberFormat* nf,
-                                TemporalUnit unit, const DurationValue& value,
-                                bool formatToParts,
+                                temporal::TemporalUnit unit,
+                                const DurationValue& value, bool formatToParts,
                                 MutableHandle<Value> result) {
   if (!formatToParts) {
     auto* str = FormatDurationValueToString(cx, nf, value);
@@ -1375,9 +1093,10 @@ static bool FormatDurationValue(JSContext* cx, mozilla::intl::NumberFormat* nf,
  */
 static bool FormatNumericHoursOrMinutesOrSeconds(
     JSContext* cx, Handle<DurationFormatObject*> durationFormat,
-    TemporalUnit unit, const DurationValue& value, bool formatToParts,
+    temporal::TemporalUnit unit, const DurationValue& value, bool formatToParts,
     MutableHandle<Value> result) {
-  MOZ_ASSERT(TemporalUnit::Hour <= unit && unit <= TemporalUnit::Second);
+  MOZ_ASSERT(temporal::TemporalUnit::Hour <= unit &&
+             unit <= temporal::TemporalUnit::Second);
 
   // FormatNumericHours, steps 1-10.
   // FormatNumericMinutes, steps 1-11.
@@ -1414,9 +1133,11 @@ static PlainObject* NewLiteralPart(JSContext* cx, JSString* value) {
 static bool FormatNumericUnits(JSContext* cx,
                                Handle<DurationFormatObject*> durationFormat,
                                const temporal::Duration& duration,
-                               TemporalUnit firstNumericUnit,
+                               temporal::TemporalUnit firstNumericUnit,
                                bool signDisplayed, bool formatToParts,
                                MutableHandle<Value> result) {
+  using namespace temporal;
+
   auto* options = durationFormat->getOptions();
   MOZ_ASSERT(options, "unexpected unresolved duration format options");
 
@@ -1437,19 +1158,21 @@ static bool FormatNumericUnits(JSContext* cx,
   auto hoursValue = DurationValue{duration.hours};
 
   // Step 4.
-  auto hoursDisplay = GetUnitOptions(*options, TemporalUnit::Hour).display;
+  auto hoursDisplay = GetUnitOptions(*options, TemporalUnit::Hour).display();
 
   // Step 5.
   auto minutesValue = DurationValue{duration.minutes};
 
   // Step 6.
-  auto minutesDisplay = GetUnitOptions(*options, TemporalUnit::Minute).display;
+  auto minutesDisplay =
+      GetUnitOptions(*options, TemporalUnit::Minute).display();
 
   // Step 7-8.
   auto secondsValue = ComputeFractionalDigits(duration, TemporalUnit::Second);
 
   // Step 9.
-  auto secondsDisplay = GetUnitOptions(*options, TemporalUnit::Second).display;
+  auto secondsDisplay =
+      GetUnitOptions(*options, TemporalUnit::Second).display();
 
   // Step 10.
   bool hoursFormatted = false;
@@ -1630,41 +1353,47 @@ static bool FormatNumericUnits(JSContext* cx,
   return true;
 }
 
-static auto ToListFormatStyle(DurationBaseStyle style) {
-#ifndef USING_ENUM
-  using enum mozilla::intl::ListFormat::Style;
-#else
-  USING_ENUM(mozilla::intl::ListFormat::Style, Long, Short, Narrow);
-#endif
-  switch (style) {
-    case DurationBaseStyle::Long:
-      return Long;
-    case DurationBaseStyle::Short:
-      return Short;
-    case DurationBaseStyle::Narrow:
-      return Narrow;
-    case DurationBaseStyle::Digital:
-      return Short;
-  }
-  MOZ_CRASH("invalid duration format base style");
-}
-
 static mozilla::intl::ListFormat* NewDurationListFormat(
     JSContext* cx, Handle<DurationFormatObject*> durationFormat) {
-  if (!ResolveLocale(cx, durationFormat)) {
+  Rooted<JSObject*> internals(cx, GetInternalsObject(cx, durationFormat));
+  if (!internals) {
+    return nullptr;
+  }
+
+  Rooted<Value> value(cx);
+  if (!GetProperty(cx, internals, internals, cx->names().locale, &value)) {
     return nullptr;
   }
-  auto dfOptions = *durationFormat->getOptions();
 
-  auto locale = EncodeLocale(cx, durationFormat->getLocale());
+  UniqueChars locale = EncodeLocale(cx, value.toString());
   if (!locale) {
     return nullptr;
   }
 
-  mozilla::intl::ListFormat::Options options = {
-      .mType = mozilla::intl::ListFormat::Type::Unit,
-      .mStyle = ToListFormatStyle(dfOptions.style),
-  };
+  mozilla::intl::ListFormat::Options options;
+  options.mType = mozilla::intl::ListFormat::Type::Unit;
+
+  if (!GetProperty(cx, internals, internals, cx->names().style, &value)) {
+    return nullptr;
+  }
+  {
+    auto* linear = value.toString()->ensureLinear(cx);
+    if (!linear) {
+      return nullptr;
+    }
+
+    using ListFormatStyle = mozilla::intl::ListFormat::Style;
+    if (StringEqualsLiteral(linear, "long")) {
+      options.mStyle = ListFormatStyle::Long;
+    } else if (StringEqualsLiteral(linear, "short")) {
+      options.mStyle = ListFormatStyle::Short;
+    } else if (StringEqualsLiteral(linear, "narrow")) {
+      options.mStyle = ListFormatStyle::Narrow;
+    } else {
+      MOZ_ASSERT(StringEqualsLiteral(linear, "digital"));
+      options.mStyle = ListFormatStyle::Short;
+    }
+  }
 
   auto result = mozilla::intl::ListFormat::TryCreate(
       mozilla::MakeStringSpan(locale.get()), options);
@@ -1678,11 +1407,12 @@ static mozilla::intl::ListFormat* NewDurationListFormat(
 static mozilla::intl::ListFormat* GetOrCreateListFormat(
     JSContext* cx, Handle<DurationFormatObject*> durationFormat) {
   // Obtain a cached mozilla::intl::ListFormat object.
-  if (auto* lf = durationFormat->getListFormat()) {
+  auto* lf = durationFormat->getListFormat();
+  if (lf) {
     return lf;
   }
 
-  auto* lf = NewDurationListFormat(cx, durationFormat);
+  lf = NewDurationListFormat(cx, durationFormat);
   if (!lf) {
     return nullptr;
   }
@@ -1893,7 +1623,9 @@ static bool PartitionDurationFormatPattern(
     JSContext* cx, Handle<DurationFormatObject*> durationFormat,
     Handle<Value> durationLike, bool formatToParts,
     MutableHandle<Value> result) {
-  temporal::Duration duration;
+  using namespace temporal;
+
+  Duration duration;
   if (!ToTemporalDuration(cx, durationLike, &duration)) {
     return false;
   }
@@ -1913,7 +1645,10 @@ static bool PartitionDurationFormatPattern(
   static_assert(durationUnits.size() == FormattedDurationValueVectorCapacity,
                 "inline stack capacity large enough for all duration units");
 
-  auto options = *durationFormat->getOptions();
+  auto* options = GetOrCreateDurationFormatOptions(cx, durationFormat);
+  if (!options) {
+    return false;
+  }
 
   Rooted<Value> formattedValue(cx);
 
@@ -1938,13 +1673,13 @@ static bool PartitionDurationFormatPattern(
     // Step 4.a. (Moved below)
 
     // Step 4.b.
-    auto unitOptions = GetUnitOptions(options, unit);
+    auto unitOptions = GetUnitOptions(*options, unit);
 
     // Step 4.c.
-    auto style = unitOptions.style;
+    auto style = unitOptions.style();
 
     // Step 4.d.
-    auto display = unitOptions.display;
+    auto display = unitOptions.display();
 
     // Steps 4.e-f. (Not applicable in our implementation.)
 
@@ -2021,7 +1756,7 @@ static bool PartitionDurationFormatPattern(
                          result);
 }
 
-static bool IsDurationFormat(Handle<JS::Value> v) {
+static bool IsDurationFormat(HandleValue v) {
   return v.isObject() && v.toObject().is<DurationFormatObject>();
 }
 
@@ -2065,93 +1800,6 @@ static bool durationFormat_formatToParts(JSContext* cx, unsigned argc,
       cx, args);
 }
 
-/**
- * Intl.DurationFormat.prototype.resolvedOptions ( )
- */
-static bool durationFormat_resolvedOptions(JSContext* cx,
-                                           const JS::CallArgs& args) {
-  Rooted<DurationFormatObject*> durationFormat(
-      cx, &args.thisv().toObject().as<DurationFormatObject>());
-
-  if (!ResolveLocale(cx, durationFormat)) {
-    return false;
-  }
-  auto dfOptions = *durationFormat->getOptions();
-
-  // Step 3.
-  Rooted<IdValueVector> options(cx, cx);
-
-  // Step 4.
-  if (!options.emplaceBack(NameToId(cx->names().locale),
-                           StringValue(durationFormat->getLocale()))) {
-    return false;
-  }
-
-  if (!options.emplaceBack(NameToId(cx->names().numberingSystem),
-                           StringValue(durationFormat->getNumberingSystem()))) {
-    return false;
-  }
-
-  auto* style = NewStringCopy<CanGC>(cx, BaseStyleToString(dfOptions.style));
-  if (!style) {
-    return false;
-  }
-  if (!options.emplaceBack(NameToId(cx->names().style), StringValue(style))) {
-    return false;
-  }
-
-  for (auto unit : durationUnits) {
-    auto unitOptions = GetUnitOptions(dfOptions, unit);
-
-    auto* style =
-        NewStringCopy<CanGC>(cx, DurationStyleToString(unitOptions.style));
-    if (!style) {
-      return false;
-    }
-    if (!options.emplaceBack(NameToId(DurationStyleName(unit, cx)),
-                             StringValue(style))) {
-      return false;
-    }
-
-    auto* display =
-        NewStringCopy<CanGC>(cx, DisplayToString(unitOptions.display));
-    if (!display) {
-      return false;
-    }
-    if (!options.emplaceBack(NameToId(DurationDisplayName(unit, cx)),
-                             StringValue(display))) {
-      return false;
-    }
-  }
-
-  if (dfOptions.fractionalDigits >= 0) {
-    MOZ_ASSERT(dfOptions.fractionalDigits <= 9);
-    if (!options.emplaceBack(NameToId(cx->names().fractionalDigits),
-                             Int32Value(dfOptions.fractionalDigits))) {
-      return false;
-    }
-  }
-
-  // Step 5.
-  auto* result = NewPlainObjectWithUniqueNames(cx, options);
-  if (!result) {
-    return false;
-  }
-  args.rval().setObject(*result);
-  return true;
-}
-
-/**
- * Intl.DurationFormat.prototype.resolvedOptions ( )
- */
-static bool durationFormat_resolvedOptions(JSContext* cx, unsigned argc,
-                                           Value* vp) {
-  // Steps 1-2.
-  CallArgs args = CallArgsFromVp(argc, vp);
-  return CallNonGenericMethod<IsDurationFormat, durationFormat_resolvedOptions>(
-      cx, args);
-}
-
 /**
  * Intl.DurationFormat.supportedLocalesOf ( locales [ , options ] )
  */
@@ -2180,7 +1828,9 @@ bool js::TemporalDurationToLocaleString(JSContext* cx,
     return false;
   }
 
-  if (!InitializeDurationFormat(cx, durationFormat, args)) {
+  if (!intl::InitializeObject(cx, durationFormat,
+                              cx->names().InitializeDurationFormat, args.get(0),
+                              args.get(1))) {
     return false;
   }
 
diff --git a/js/src/builtin/intl/DurationFormat.h b/js/src/builtin/intl/DurationFormat.h
index fbe0ae54a77ce..d287299302f96 100644
--- a/js/src/builtin/intl/DurationFormat.h
+++ b/js/src/builtin/intl/DurationFormat.h
@@ -9,10 +9,10 @@
 
 #include <stdint.h>
 
+#include "builtin/SelfHostingDefines.h"
 #include "builtin/temporal/TemporalUnit.h"
 #include "js/Class.h"
 #include "vm/NativeObject.h"
-#include "vm/StringType.h"
 
 namespace mozilla::intl {
 class ListFormat;
@@ -24,13 +24,15 @@ namespace js {
 namespace intl {
 enum class DurationDisplay : uint8_t { Auto, Always };
 enum class DurationStyle : uint8_t { Long, Short, Narrow, Numeric, TwoDigit };
-enum class DurationBaseStyle : uint8_t { Long, Short, Narrow, Digital };
 
 struct DurationFormatOptions {
-// Packed representation to keep the unit options as small as possible.
-#define DECLARE_DURATION_UNIT(name)                          \
-  DurationDisplay name##Display : 1 = DurationDisplay::Auto; \
-  DurationStyle name##Style : 3 = DurationStyle::Short;
+  // Packed representation to keep the unit options as small as possible.
+  //
+  // Use |uint8_t| instead of the actual enum type to avoid GCC warnings:
+  // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61414
+#define DECLARE_DURATION_UNIT(name)                \
+  /* DurationDisplay */ uint8_t name##Display : 1; \
+  /* DurationStyle */ uint8_t name##Style : 3;
 
   DECLARE_DURATION_UNIT(years);
   DECLARE_DURATION_UNIT(months);
@@ -45,14 +47,17 @@ struct DurationFormatOptions {
 
 #undef DECLARE_DURATION_UNIT
 
-  DurationBaseStyle style = DurationBaseStyle::Short;
-  int8_t fractionalDigits = -1;
+  int8_t fractionalDigits;
 };
 
 struct DurationUnitOptions {
   // Use the same bit-widths for fast extraction from DurationFormatOptions.
-  DurationDisplay display : 1;
-  DurationStyle style : 3;
+  /* DurationDisplay */ uint8_t display_ : 1;
+  /* DurationStyle */ uint8_t style_ : 3;
+
+  auto display() const { return static_cast<DurationDisplay>(display_); }
+
+  auto style() const { return static_cast<DurationStyle>(style_); }
 };
 
 }  // namespace intl
@@ -62,8 +67,8 @@ class DurationFormatObject : public NativeObject {
   static const JSClass class_;
   static const JSClass& protoClass_;
 
-  static constexpr uint32_t LOCALE_SLOT = 0;
-  static constexpr uint32_t NUMBERING_SYSTEM = 1;
+  static constexpr uint32_t INTERNALS_SLOT = 0;
+  static constexpr uint32_t LIST_FORMAT_SLOT = 1;
   static constexpr uint32_t NUMBER_FORMAT_YEARS_SLOT = 2;
   static constexpr uint32_t NUMBER_FORMAT_MONTHS_SLOT = 3;
   static constexpr uint32_t NUMBER_FORMAT_WEEKS_SLOT = 4;
@@ -74,10 +79,13 @@ class DurationFormatObject : public NativeObject {
   static constexpr uint32_t NUMBER_FORMAT_MILLISECONDS_SLOT = 9;
   static constexpr uint32_t NUMBER_FORMAT_MICROSECONDS_SLOT = 10;
   static constexpr uint32_t NUMBER_FORMAT_NANOSECONDS_SLOT = 11;
-  static constexpr uint32_t LIST_FORMAT_SLOT = 12;
-  static constexpr uint32_t OPTIONS_SLOT = 13;
-  static constexpr uint32_t TIME_SEPARATOR_SLOT = 14;
-  static constexpr uint32_t SLOT_COUNT = 15;
+  static constexpr uint32_t OPTIONS_SLOT = 12;
+  static constexpr uint32_t TIME_SEPARATOR_SLOT = 13;
+  static constexpr uint32_t SLOT_COUNT = 14;
+
+  static_assert(INTERNALS_SLOT == INTL_INTERNALS_OBJECT_SLOT,
+                "INTERNALS_SLOT must match self-hosting define for internals "
+                "object slot");
 
  private:
   static constexpr uint32_t numberFormatSlot(temporal::TemporalUnit unit) {
@@ -93,42 +101,30 @@ class DurationFormatObject : public NativeObject {
   }
 
  public:
-  bool isLocaleResolved() const { return getFixedSlot(LOCALE_SLOT).isString(); }
-
-  JSObject* getRequestedLocales() const {
-    const auto& slot = getFixedSlot(LOCALE_SLOT);
-    if (slot.isUndefined()) {
-      return nullptr;
-    }
-    return &slot.toObject();
-  }
-
-  void setRequestedLocales(JSObject* requestedLocales) {
-    setFixedSlot(LOCALE_SLOT, JS::ObjectValue(*requestedLocales));
-  }
-
-  JSLinearString* getLocale() const {
-    const auto& slot = getFixedSlot(LOCALE_SLOT);
+  mozilla::intl::NumberFormat* getNumberFormat(
+      temporal::TemporalUnit unit) const {
+    const auto& slot = getFixedSlot(numberFormatSlot(unit));
     if (slot.isUndefined()) {
       return nullptr;
     }
-    return &slot.toString()->asLinear();
+    return static_cast<mozilla::intl::NumberFormat*>(slot.toPrivate());
   }
 
-  void setLocale(JSLinearString* locale) {
-    setFixedSlot(LOCALE_SLOT, JS::StringValue(locale));
+  void setNumberFormat(temporal::TemporalUnit unit,
+                       mozilla::intl::NumberFormat* numberFormat) {
+    setFixedSlot(numberFormatSlot(unit), PrivateValue(numberFormat));
   }
 
-  JSLinearString* getNumberingSystem() const {
-    const auto& slot = getFixedSlot(NUMBERING_SYSTEM);
+  mozilla::intl::ListFormat* getListFormat() const {
+    const auto& slot = getFixedSlot(LIST_FORMAT_SLOT);
     if (slot.isUndefined()) {
       return nullptr;
     }
-    return &slot.toString()->asLinear();
+    return static_cast<mozilla::intl::ListFormat*>(slot.toPrivate());
   }
 
-  void setNumberingSystem(JSLinearString* numberingSystem) {
-    setFixedSlot(NUMBERING_SYSTEM, JS::StringValue(numberingSystem));
+  void setListFormat(mozilla::intl::ListFormat* listFormat) {
+    setFixedSlot(LIST_FORMAT_SLOT, PrivateValue(listFormat));
   }
 
   intl::DurationFormatOptions* getOptions() const {
@@ -140,33 +136,7 @@ class DurationFormatObject : public NativeObject {
   }
 
   void setOptions(intl::DurationFormatOptions* options) {
-    setFixedSlot(OPTIONS_SLOT, JS::PrivateValue(options));
-  }
-
-  mozilla::intl::NumberFormat* getNumberFormat(
-      temporal::TemporalUnit unit) const {
-    const auto& slot = getFixedSlot(numberFormatSlot(unit));
-    if (slot.isUndefined()) {
-      return nullptr;
-    }
-    return static_cast<mozilla::intl::NumberFormat*>(slot.toPrivate());
-  }
-
-  void setNumberFormat(temporal::TemporalUnit unit,
-                       mozilla::intl::NumberFormat* numberFormat) {
-    setFixedSlot(numberFormatSlot(unit), JS::PrivateValue(numberFormat));
-  }
-
-  mozilla::intl::ListFormat* getListFormat() const {
-    const auto& slot = getFixedSlot(LIST_FORMAT_SLOT);
-    if (slot.isUndefined()) {
-      return nullptr;
-    }
-    return static_cast<mozilla::intl::ListFormat*>(slot.toPrivate());
-  }
-
-  void setListFormat(mozilla::intl::ListFormat* listFormat) {
-    setFixedSlot(LIST_FORMAT_SLOT, JS::PrivateValue(listFormat));
+    setFixedSlot(OPTIONS_SLOT, PrivateValue(options));
   }
 
   JSString* getTimeSeparator() const {
@@ -178,7 +148,7 @@ class DurationFormatObject : public NativeObject {
   }
 
   void setTimeSeparator(JSString* timeSeparator) {
-    setFixedSlot(TIME_SEPARATOR_SLOT, JS::StringValue(timeSeparator));
+    setFixedSlot(TIME_SEPARATOR_SLOT, StringValue(timeSeparator));
   }
 
  private:
diff --git a/js/src/builtin/intl/DurationFormat.js b/js/src/builtin/intl/DurationFormat.js
new file mode 100644
index 0000000000000..3e812b8ca452d
--- /dev/null
+++ b/js/src/builtin/intl/DurationFormat.js
@@ -0,0 +1,556 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Intl.DurationFormat ( [ locales [ , options ] ] )
+ *
+ * Compute an internal properties object from |lazyDurationFormatData|.
+ */
+function resolveDurationFormatInternals(lazyDurationFormatData) {
+  assert(IsObject(lazyDurationFormatData), "lazy data not an object?");
+
+  var internalProps = std_Object_create(null);
+
+  // Compute effective locale.
+
+  // Step 9.
+  var r = intl_ResolveLocale(
+    "DurationFormat",
+    lazyDurationFormatData.requestedLocales,
+    lazyDurationFormatData.opt,
+  );
+
+  // Steps 10-11.
+  internalProps.locale = r.locale;
+
+  // Steps 12-21. (Not applicable in our implementation.)
+
+  // Step 22.
+  internalProps.numberingSystem = r.nu;
+
+  // Step 24.
+  internalProps.style = lazyDurationFormatData.style;
+
+  // Step 26.
+  internalProps.yearsStyle = lazyDurationFormatData.yearsStyle;
+  internalProps.yearsDisplay = lazyDurationFormatData.yearsDisplay;
+
+  internalProps.weeksStyle = lazyDurationFormatData.weeksStyle;
+  internalProps.weeksDisplay = lazyDurationFormatData.weeksDisplay;
+
+  internalProps.monthsStyle = lazyDurationFormatData.monthsStyle;
+  internalProps.monthsDisplay = lazyDurationFormatData.monthsDisplay;
+
+  internalProps.daysStyle = lazyDurationFormatData.daysStyle;
+  internalProps.daysDisplay = lazyDurationFormatData.daysDisplay;
+
+  internalProps.hoursStyle = lazyDurationFormatData.hoursStyle;
+  internalProps.hoursDisplay = lazyDurationFormatData.hoursDisplay;
+
+  internalProps.minutesStyle = lazyDurationFormatData.minutesStyle;
+  internalProps.minutesDisplay = lazyDurationFormatData.minutesDisplay;
+
+  internalProps.secondsStyle = lazyDurationFormatData.secondsStyle;
+  internalProps.secondsDisplay = lazyDurationFormatData.secondsDisplay;
+
+  internalProps.millisecondsStyle = lazyDurationFormatData.millisecondsStyle;
+  internalProps.millisecondsDisplay =
+    lazyDurationFormatData.millisecondsDisplay;
+
+  internalProps.microsecondsStyle = lazyDurationFormatData.microsecondsStyle;
+  internalProps.microsecondsDisplay =
+    lazyDurationFormatData.microsecondsDisplay;
+
+  internalProps.nanosecondsStyle = lazyDurationFormatData.nanosecondsStyle;
+  internalProps.nanosecondsDisplay = lazyDurationFormatData.nanosecondsDisplay;
+
+  // Step 27.
+  internalProps.fractionalDigits = lazyDurationFormatData.fractionalDigits;
+
+  // The caller is responsible for associating |internalProps| with the right
+  // object using |setInternalProperties|.
+  return internalProps;
+}
+
+/**
+ * Returns an object containing the DurationFormat internal properties of |obj|.
+ */
+function getDurationFormatInternals(obj) {
+  assert(IsObject(obj), "getDurationFormatInternals called with non-object");
+  assert(
+    intl_GuardToDurationFormat(obj) !== null,
+    "getDurationFormatInternals called with non-DurationFormat"
+  );
+
+  var internals = getIntlObjectInternals(obj);
+  assert(
+    internals.type === "DurationFormat",
+    "bad type escaped getIntlObjectInternals"
+  );
+
+  // If internal properties have already been computed, use them.
+  var internalProps = maybeInternalProperties(internals);
+  if (internalProps) {
+    return internalProps;
+  }
+
+  // Otherwise it's time to fully create them.
+  internalProps = resolveDurationFormatInternals(internals.lazyData);
+  setInternalProperties(internals, internalProps);
+  return internalProps;
+}
+
+/**
+ * Intl.DurationFormat ( [ locales [ , options ] ] )
+ *
+ * Initializes an object as a DurationFormat.
+ *
+ * This method is complicated a moderate bit by its implementing initialization
+ * as a *lazy* concept.  Everything that must happen now, does -- but we defer
+ * all the work we can until the object is actually used as a DurationFormat.
+ * This later work occurs in |resolveDurationFormatInternals|; steps not noted
+ * here occur there.
+ */
+function InitializeDurationFormat(durationFormat, locales, options) {
+  assert(
+    IsObject(durationFormat),
+    "InitializeDurationFormat called with non-object"
+  );
+  assert(
+    intl_GuardToDurationFormat(durationFormat) !== null,
+    "InitializeDurationFormat called with non-DurationFormat"
+  );
+
+  // Lazy DurationFormat data has the following structure:
+  //
+  //   {
+  //     requestedLocales: List of locales,
+  //     style: "long" / "short" / "narrow" / "digital",
+  //
+  //     yearsStyle: "long" / "short" / "narrow",
+  //     yearsDisplay: "auto" / "always",
+  //
+  //     monthsStyle: "long" / "short" / "narrow",
+  //     monthsDisplay: "auto" / "always",
+  //
+  //     weeksStyle: "long" / "short" / "narrow",
+  //     weeksDisplay: "auto" / "always",
+  //
+  //     daysStyle: "long" / "short" / "narrow",
+  //     daysDisplay: "auto" / "always",
+  //
+  //     hoursStyle: "long" / "short" / "narrow" / "numeric" / "2-digit",
+  //     hoursDisplay: "auto" / "always",
+  //
+  //     minutesStyle: "long" / "short" / "narrow" / "numeric" / "2-digit",
+  //     minutesDisplay: "auto" / "always",
+  //
+  //     secondsStyle: "long" / "short" / "narrow" / "numeric" / "2-digit",
+  //     secondsDisplay: "auto" / "always",
+  //
+  //     millisecondsStyle: "long" / "short" / "narrow" / "numeric",
+  //     millisecondsDisplay: "auto" / "always",
+  //
+  //     microsecondsStyle: "long" / "short" / "narrow" / "numeric",
+  //     microsecondsDisplay: "auto" / "always",
+  //
+  //     nanosecondsStyle: "long" / "short" / "narrow" / "numeric",
+  //     nanosecondsDisplay: "auto" / "always",
+  //
+  //     fractionalDigits: integer ∈ [0, 9] / undefined,
+  //
+  //     opt: // opt object computed in InitializeDurationFormat
+  //       {
+  //         localeMatcher: "lookup" / "best fit",
+  //
+  //         nu: string matching a Unicode extension type, // optional
+  //       }
+  //   }
+  //
+  // Note that lazy data is only installed as a final step of initialization,
+  // so every DurationFormat lazy data object has *all* these properties,
+  // never a subset of them.
+  var lazyDurationFormatData = std_Object_create(null);
+
+  // Step 3.
+  var requestedLocales = CanonicalizeLocaleList(locales);
+  lazyDurationFormatData.requestedLocales = requestedLocales;
+
+  // Step 4.
+  if (options === undefined) {
+    options = std_Object_create(null);
+  } else if (!IsObject(options)) {
+    ThrowTypeError(
+      JSMSG_OBJECT_REQUIRED,
+      options === null ? "null" : typeof options
+    );
+  }
+
+  // Step 5.
+  var matcher = GetOption(
+    options,
+    "localeMatcher",
+    "string",
+    ["lookup", "best fit"],
+    "best fit"
+  );
+
+  // Step 6.
+  var numberingSystem = GetOption(
+    options,
+    "numberingSystem",
+    "string",
+    undefined,
+    undefined
+  );
+
+  // Step 7.
+  if (numberingSystem !== undefined) {
+    numberingSystem = intl_ValidateAndCanonicalizeUnicodeExtensionType(
+      numberingSystem,
+      "numberingSystem",
+      "nu"
+    );
+  }
+
+  // Step 8.
+  var opt = NEW_RECORD();
+  opt.localeMatcher = matcher;
+  opt.nu = numberingSystem;
+
+  lazyDurationFormatData.opt = opt;
+
+  // Compute formatting options.
+
+  // Steps 23-24.
+  var style = GetOption(
+    options,
+    "style",
+    "string",
+    ["long", "short", "narrow", "digital"],
+    "short"
+  );
+  lazyDurationFormatData.style = style;
+
+  // Step 25. (Not applicable in our implementation)
+
+  // Step 26, unit = "years".
+  var yearsOptions = GetDurationUnitOptions(
+    "years",
+    options,
+    style,
+    ["long", "short", "narrow"],
+    "short",
+    /* prevStyle= */ ""
+  );
+  lazyDurationFormatData.yearsStyle = yearsOptions.style;
+  lazyDurationFormatData.yearsDisplay = yearsOptions.display;
+
+  // Step 26, unit = "months".
+  var monthsOptions = GetDurationUnitOptions(
+    "months",
+    options,
+    style,
+    ["long", "short", "narrow"],
+    "short",
+    /* prevStyle= */ ""
+  );
+  lazyDurationFormatData.monthsStyle = monthsOptions.style;
+  lazyDurationFormatData.monthsDisplay = monthsOptions.display;
+
+  // Step 26, unit = "weeks".
+  var weeksOptions = GetDurationUnitOptions(
+    "weeks",
+    options,
+    style,
+    ["long", "short", "narrow"],
+    "short",
+    /* prevStyle= */ ""
+  );
+  lazyDurationFormatData.weeksStyle = weeksOptions.style;
+  lazyDurationFormatData.weeksDisplay = weeksOptions.display;
+
+  // Step 26, unit = "days".
+  var daysOptions = GetDurationUnitOptions(
+    "days",
+    options,
+    style,
+    ["long", "short", "narrow"],
+    "short",
+    /* prevStyle= */ ""
+  );
+  lazyDurationFormatData.daysStyle = daysOptions.style;
+  lazyDurationFormatData.daysDisplay = daysOptions.display;
+
+  // Step 26, unit = "hours".
+  var hoursOptions = GetDurationUnitOptions(
+    "hours",
+    options,
+    style,
+    ["long", "short", "narrow", "numeric", "2-digit"],
+    "numeric",
+    /* prevStyle= */ ""
+  );
+  lazyDurationFormatData.hoursStyle = hoursOptions.style;
+  lazyDurationFormatData.hoursDisplay = hoursOptions.display;
+
+  // Step 26, unit = "minutes".
+  var minutesOptions = GetDurationUnitOptions(
+    "minutes",
+    options,
+    style,
+    ["long", "short", "narrow", "numeric", "2-digit"],
+    "numeric",
+    hoursOptions.style
+  );
+  lazyDurationFormatData.minutesStyle = minutesOptions.style;
+  lazyDurationFormatData.minutesDisplay = minutesOptions.display;
+
+  // Step 26, unit = "seconds".
+  var secondsOptions = GetDurationUnitOptions(
+    "seconds",
+    options,
+    style,
+    ["long", "short", "narrow", "numeric", "2-digit"],
+    "numeric",
+    minutesOptions.style
+  );
+  lazyDurationFormatData.secondsStyle = secondsOptions.style;
+  lazyDurationFormatData.secondsDisplay = secondsOptions.display;
+
+  // Step 26, unit = "milliseconds".
+  var millisecondsOptions = GetDurationUnitOptions(
+    "milliseconds",
+    options,
+    style,
+    ["long", "short", "narrow", "numeric"],
+    "numeric",
+    secondsOptions.style
+  );
+  lazyDurationFormatData.millisecondsStyle = millisecondsOptions.style;
+  lazyDurationFormatData.millisecondsDisplay = millisecondsOptions.display;
+
+  // Step 26, unit = "microseconds".
+  var microsecondsOptions = GetDurationUnitOptions(
+    "microseconds",
+    options,
+    style,
+    ["long", "short", "narrow", "numeric"],
+    "numeric",
+    millisecondsOptions.style
+  );
+  lazyDurationFormatData.microsecondsStyle = microsecondsOptions.style;
+  lazyDurationFormatData.microsecondsDisplay = microsecondsOptions.display;
+
+  // Step 26, unit = "milliseconds".
+  var nanosecondsOptions = GetDurationUnitOptions(
+    "nanoseconds",
+    options,
+    style,
+    ["long", "short", "narrow", "numeric"],
+    "numeric",
+    microsecondsOptions.style
+  );
+  lazyDurationFormatData.nanosecondsStyle = nanosecondsOptions.style;
+  lazyDurationFormatData.nanosecondsDisplay = nanosecondsOptions.display;
+
+  // Step 27.
+  lazyDurationFormatData.fractionalDigits = GetNumberOption(
+    options,
+    "fractionalDigits",
+    0,
+    9,
+    undefined
+  );
+
+  // We've done everything that must be done now: mark the lazy data as fully
+  // computed and install it.
+  initializeIntlObject(
+    durationFormat,
+    "DurationFormat",
+    lazyDurationFormatData
+  );
+}
+
+/**
+ * GetDurationUnitOptions ( unit, options, baseStyle, stylesList, digitalBase, prevStyle, twoDigitHours )
+ */
+function GetDurationUnitOptions(
+  unit,
+  options,
+  baseStyle,
+  stylesList,
+  digitalBase,
+  prevStyle
+) {
+  assert(typeof unit === "string", "unit is a string");
+  assert(IsObject(options), "options is an object");
+  assert(typeof baseStyle === "string", "baseStyle is a string");
+  assert(IsArray(stylesList), "stylesList is an array");
+  assert(typeof digitalBase === "string", "digitalBase is a string");
+  assert(typeof prevStyle === "string", "prevStyle is a string");
+
+  // Step 1.
+  var styleOption = GetOption(options, unit, "string", stylesList, undefined);
+
+  var style = styleOption;
+
+  // Step 2.
+  var displayDefault = "always";
+
+  // Step 3.
+  if (style === undefined) {
+    // Steps 3.a-b.
+    if (baseStyle === "digital") {
+      // Step 3.a.i.
+      if (unit !== "hours" && unit !== "minutes" && unit !== "seconds") {
+        displayDefault = "auto";
+      }
+
+      // Step 3.a.ii.
+      style = digitalBase;
+    } else {
+      // Steps 3.b.i-ii. ("fractional" handled implicitly)
+      if (prevStyle === "numeric" || prevStyle === "2-digit") {
+        // Step 3.b.i.1.
+        if (unit !== "minutes" && unit !== "seconds") {
+          // Step 3.b.i.1.a.
+          displayDefault = "auto";
+        }
+
+        // Step 3.b.i.2.
+        style = "numeric";
+      } else {
+        // Step 3.b.ii.1.
+        displayDefault = "auto";
+
+        // Step 3.b.ii.2.
+        style = baseStyle;
+      }
+    }
+  }
+
+  // Step 4.
+  var isFractional =
+    style === "numeric" &&
+    (unit === "milliseconds" ||
+      unit === "microseconds" ||
+      unit === "nanoseconds");
+  if (isFractional) {
+    // Step 4.a.i. (Not applicable in our implementation)
+
+    // Step 4.a.ii.
+    displayDefault = "auto";
+  }
+
+  // Step 5.
+  var displayField = unit + "Display";
+
+  // Step 6.
+  var displayOption = GetOption(
+    options,
+    displayField,
+    "string",
+    ["auto", "always"],
+    undefined
+  );
+
+  var display = displayOption ?? displayDefault;
+
+  // Step 7.
+  if (display === "always" && isFractional) {
+    assert(
+      styleOption !== undefined || displayOption !== undefined,
+      "no error is thrown when both 'style' and 'display' are absent"
+    );
+
+    ThrowRangeError(
+      // eslint-disable-next-line no-nested-ternary
+      styleOption !== undefined && displayOption !== undefined
+        ? JSMSG_INTL_DURATION_INVALID_DISPLAY_OPTION
+        : displayOption !== undefined
+        ? JSMSG_INTL_DURATION_INVALID_DISPLAY_OPTION_DEFAULT_STYLE
+        : JSMSG_INTL_DURATION_INVALID_DISPLAY_OPTION_DEFAULT_DISPLAY,
+      unit
+    );
+  }
+
+  // Steps 8-9.
+  if (prevStyle === "numeric" || prevStyle === "2-digit") {
+    // Step 8.a. and 9.a.
+    if (style !== "numeric" && style !== "2-digit") {
+      ThrowRangeError(
+        JSMSG_INTL_DURATION_INVALID_NON_NUMERIC_OPTION,
+        unit,
+        `"${style}"`
+      );
+    }
+
+    // Step 9.b.
+    else if (unit === "minutes" || unit === "seconds") {
+      style = "2-digit";
+    }
+  }
+
+  // Step 10. (Our implementation doesn't use |twoDigitHours|.)
+
+  // Step 11.
+  return { style, display };
+}
+
+/**
+ * Returns the resolved options for a DurationFormat object.
+ */
+function Intl_DurationFormat_resolvedOptions() {
+  // Step 1.
+  var durationFormat = this;
+
+  // Step 2.
+  if (
+    !IsObject(durationFormat) ||
+    (durationFormat = intl_GuardToDurationFormat(durationFormat)) === null
+  ) {
+    return callFunction(
+      intl_CallDurationFormatMethodIfWrapped,
+      this,
+      "Intl_DurationFormat_resolvedOptions"
+    );
+  }
+
+  var internals = getDurationFormatInternals(durationFormat);
+
+  // Steps 3-4.
+  var result = {
+    locale: internals.locale,
+    numberingSystem: internals.numberingSystem,
+    style: internals.style,
+    years: internals.yearsStyle,
+    yearsDisplay: internals.yearsDisplay,
+    months: internals.monthsStyle,
+    monthsDisplay: internals.monthsDisplay,
+    weeks: internals.weeksStyle,
+    weeksDisplay: internals.weeksDisplay,
+    days: internals.daysStyle,
+    daysDisplay: internals.daysDisplay,
+    hours: internals.hoursStyle,
+    hoursDisplay: internals.hoursDisplay,
+    minutes: internals.minutesStyle,
+    minutesDisplay: internals.minutesDisplay,
+    seconds: internals.secondsStyle,
+    secondsDisplay: internals.secondsDisplay,
+    milliseconds: internals.millisecondsStyle,
+    millisecondsDisplay: internals.millisecondsDisplay,
+    microseconds: internals.microsecondsStyle,
+    microsecondsDisplay: internals.microsecondsDisplay,
+    nanoseconds: internals.nanosecondsStyle,
+    nanosecondsDisplay: internals.nanosecondsDisplay,
+  };
+
+  if (internals.fractionalDigits !== undefined) {
+    DefineDataProperty(result, "fractionalDigits", internals.fractionalDigits);
+  }
+
+  // Step 5.
+  return result;
+}
diff --git a/js/src/builtin/intl/Segmenter.cpp b/js/src/builtin/intl/Segmenter.cpp
index 4bc6158559509..7c6e9f1a92734 100644
--- a/js/src/builtin/intl/Segmenter.cpp
+++ b/js/src/builtin/intl/Segmenter.cpp
@@ -17,9 +17,7 @@
 #include "builtin/Array.h"
 #include "builtin/intl/CommonFunctions.h"
 #include "builtin/intl/LocaleNegotiation.h"
-#include "builtin/intl/ParameterNegotiation.h"
 #include "builtin/intl/StringAsciiChars.h"
-#include "builtin/intl/UsingEnum.h"
 #include "gc/AllocKind.h"
 #include "gc/GCContext.h"
 #include "icu4x/GraphemeClusterSegmenter.hpp"
@@ -73,10 +71,6 @@ const JSClass& SegmenterObject::protoClass_ = PlainObject::class_;
 static bool segmenter_supportedLocalesOf(JSContext* cx, unsigned argc,
                                          Value* vp);
 
-static bool segmenter_segment(JSContext* cx, unsigned argc, Value* vp);
-
-static bool segmenter_resolvedOptions(JSContext* cx, unsigned argc, Value* vp);
-
 static bool segmenter_toSource(JSContext* cx, unsigned argc, Value* vp) {
   CallArgs args = CallArgsFromVp(argc, vp);
   args.rval().setString(cx->names().Segmenter);
@@ -89,8 +83,9 @@ static const JSFunctionSpec segmenter_static_methods[] = {
 };
 
 static const JSFunctionSpec segmenter_methods[] = {
-    JS_FN("resolvedOptions", segmenter_resolvedOptions, 0, 0),
-    JS_FN("segment", segmenter_segment, 1, 0),
+    JS_SELF_HOSTED_FN("resolvedOptions", "Intl_Segmenter_resolvedOptions", 0,
+                      0),
+    JS_SELF_HOSTED_FN("segment", "Intl_Segmenter_segment", 1, 0),
     JS_FN("toSource", segmenter_toSource, 0, 0),
     JS_FS_END,
 };
@@ -113,24 +108,6 @@ const ClassSpec SegmenterObject::classSpec_ = {
     ClassSpec::DontDefineConstructor,
 };
 
-static constexpr std::string_view GranularityToString(
-    SegmenterGranularity granularity) {
-#ifndef USING_ENUM
-  using enum SegmenterGranularity;
-#else
-  USING_ENUM(SegmenterGranularity, Grapheme, Word, Sentence);
-#endif
-  switch (granularity) {
-    case Grapheme:
-      return "grapheme";
-    case Word:
-      return "word";
-    case Sentence:
-      return "sentence";
-  }
-  MOZ_CRASH("invalid segmenter granularity");
-}
-
 /**
  * Intl.Segmenter ([ locales [ , options ]])
  */
@@ -155,69 +132,16 @@ static bool Segmenter(JSContext* cx, unsigned argc, Value* vp) {
     return false;
   }
 
-  // Step 4. (Inlined ResolveOptions)
-
-  // ResolveOptions, step 1.
-  Rooted<LocalesList> requestedLocales(cx, cx);
-  if (!CanonicalizeLocaleList(cx, args.get(0), &requestedLocales)) {
-    return false;
-  }
+  HandleValue locales = args.get(0);
+  HandleValue options = args.get(1);
 
-  Rooted<ArrayObject*> requestedLocalesArray(
-      cx, LocalesListToArray(cx, requestedLocales));
-  if (!requestedLocalesArray) {
+  // Steps 4-13.
+  if (!intl::InitializeObject(cx, segmenter, cx->names().InitializeSegmenter,
+                              locales, options)) {
     return false;
   }
-  segmenter->setRequestedLocales(requestedLocalesArray);
-
-  auto granularity = SegmenterGranularity::Grapheme;
-  if (args.hasDefined(1)) {
-    // ResolveOptions, steps 2-3.
-    Rooted<JSObject*> options(
-        cx, RequireObjectArg(cx, "options", "Intl.Segmenter", args[1]));
-    if (!options) {
-      return false;
-    }
-
-    // ResolveOptions, step 4.
-    LocaleMatcher matcher;
-    if (!GetLocaleMatcherOption(cx, options, &matcher)) {
-      return false;
-    }
-
-    // ResolveOptions, step 5.
-    //
-    // This implementation only supports the "lookup" locale matcher, therefore
-    // the "localeMatcher" option doesn't need to be stored.
-
-    // ResolveOptions, step 6.
-    //
-    // Intl.Segmenter doesn't support any Unicode extension keys.
-
-    // ResolveOptions, step 7. (Not applicable)
-
-    // ResolveOptions, step 8. (Performed in ResolveLocale)
-
-    // ResolveOptions, step 9. (Return)
-
-    // Step 5. (Not applicable when ResolveOptions is inlined.)
-
-    // Steps 6-7. (Performed in ResolveLocale)
-
-    // Step 8.
-    static constexpr auto granularities = MapOptions<GranularityToString>(
-        SegmenterGranularity::Grapheme, SegmenterGranularity::Word,
-        SegmenterGranularity::Sentence);
-    if (!GetStringOption(cx, options, cx->names().granularity, granularities,
-                         SegmenterGranularity::Grapheme, &granularity)) {
-      return false;
-    }
-  }
 
-  // Step 9.
-  segmenter->setGranularity(granularity);
-
-  // Step 10.
+  // Step 14.
   args.rval().setObject(*segmenter);
   return true;
 }
@@ -592,36 +516,46 @@ static typename Interface::Segmenter* CreateSegmenter(
   return result.ok;
 }
 
-/**
- * Resolve the actual locale to finish initialization of the Segmenter.
- */
-static bool ResolveLocale(JSContext* cx, Handle<SegmenterObject*> segmenter) {
-  // Return if the locale was already resolved.
-  if (segmenter->isLocaleResolved()) {
+static bool EnsureInternalsResolved(JSContext* cx,
+                                    Handle<SegmenterObject*> segmenter) {
+  if (segmenter->getLocale()) {
     return true;
   }
 
-  Rooted<ArrayObject*> requestedLocales(
-      cx, &segmenter->getRequestedLocales()->as<ArrayObject>());
-
-  // %Intl.Segmenter%.[[RelevantExtensionKeys]] is « ».
-  mozilla::EnumSet<UnicodeExtensionKey> relevantExtensionKeys{};
+  Rooted<JS::Value> value(cx);
 
-  // Initialize locale options from constructor arguments.
-  Rooted<LocaleOptions> localeOptions(cx);
+  Rooted<JSObject*> internals(cx, intl::GetInternalsObject(cx, segmenter));
+  if (!internals) {
+    return false;
+  }
 
-  // Use the default locale data.
-  auto localeData = LocaleData::Default;
+  if (!GetProperty(cx, internals, internals, cx->names().locale, &value)) {
+    return false;
+  }
+  Rooted<JSString*> locale(cx, value.toString());
 
-  // Resolve the actual locale.
-  Rooted<ResolvedLocale> resolved(cx);
-  if (!ResolveLocale(cx, AvailableLocaleKind::ListFormat, requestedLocales,
-                     localeOptions, relevantExtensionKeys, localeData,
-                     &resolved)) {
+  if (!GetProperty(cx, internals, internals, cx->names().granularity, &value)) {
     return false;
   }
 
-  switch (segmenter->getGranularity()) {
+  SegmenterGranularity granularity;
+  {
+    JSLinearString* linear = value.toString()->ensureLinear(cx);
+    if (!linear) {
+      return false;
+    }
+
+    if (StringEqualsLiteral(linear, "grapheme")) {
+      granularity = SegmenterGranularity::Grapheme;
+    } else if (StringEqualsLiteral(linear, "word")) {
+      granularity = SegmenterGranularity::Word;
+    } else {
+      MOZ_ASSERT(StringEqualsLiteral(linear, "sentence"));
+      granularity = SegmenterGranularity::Sentence;
+    }
+  }
+
+  switch (granularity) {
     case SegmenterGranularity::Grapheme: {
       auto* seg = CreateSegmenter<GraphemeClusterSegmenter>();
       if (!seg) {
@@ -631,7 +565,7 @@ static bool ResolveLocale(JSContext* cx, Handle<SegmenterObject*> segmenter) {
       break;
     }
     case SegmenterGranularity::Word: {
-      auto* seg = CreateSegmenter<WordSegmenter>(cx, resolved.dataLocale());
+      auto* seg = CreateSegmenter<WordSegmenter>(cx, locale);
       if (!seg) {
         return false;
       }
@@ -639,7 +573,7 @@ static bool ResolveLocale(JSContext* cx, Handle<SegmenterObject*> segmenter) {
       break;
     }
     case SegmenterGranularity::Sentence: {
-      auto* seg = CreateSegmenter<SentenceSegmenter>(cx, resolved.dataLocale());
+      auto* seg = CreateSegmenter<SentenceSegmenter>(cx, locale);
       if (!seg) {
         return false;
       }
@@ -648,10 +582,9 @@ static bool ResolveLocale(JSContext* cx, Handle<SegmenterObject*> segmenter) {
     }
   }
 
-  // Finish initialization by setting the actual locale.
-  segmenter->setLocale(resolved.dataLocale());
+  segmenter->setLocale(locale);
+  segmenter->setGranularity(granularity);
 
-  MOZ_ASSERT(segmenter->isLocaleResolved(), "locale successfully resolved");
   return true;
 }
 
@@ -891,14 +824,6 @@ static bool EnsureBreakIterator(JSContext* cx, Handle<T*> segments,
     segments->setIndex(0);
   }
 
-  // Ensure the locale is resolved.
-  if (!segments->getSegmenter()->isLocaleResolved()) {
-    Rooted<SegmenterObject*> segmenter(cx, segments->getSegmenter());
-    if (!ResolveLocale(cx, segmenter)) {
-      return false;
-    }
-  }
-
   // Ensure the string characters can be passed to ICU4X.
   if (!EnsureStringChars(cx, segments)) {
     return false;
@@ -1000,21 +925,28 @@ static ArrayObject* FindSegmentBoundaries(JSContext* cx, Handle<T*> segments,
   return CreateBoundaries(cx, boundaries, segments->getGranularity());
 }
 
-/**
- * Create a new Segments object.
- */
-static SegmentsObject* CreateSegmentsObject(JSContext* cx,
-                                            Handle<SegmenterObject*> segmenter,
-                                            Handle<JSString*> string) {
+bool js::intl_CreateSegmentsObject(JSContext* cx, unsigned argc, Value* vp) {
+  CallArgs args = CallArgsFromVp(argc, vp);
+  MOZ_ASSERT(args.length() == 2);
+
+  Rooted<SegmenterObject*> segmenter(cx,
+                                     &args[0].toObject().as<SegmenterObject>());
+  Rooted<JSString*> string(cx, args[1].toString());
+
+  // Ensure the internal properties are resolved.
+  if (!EnsureInternalsResolved(cx, segmenter)) {
+    return false;
+  }
+
   Rooted<JSObject*> proto(
       cx, GlobalObject::getOrCreateSegmentsPrototype(cx, cx->global()));
   if (!proto) {
-    return nullptr;
+    return false;
   }
 
   auto* segments = NewObjectWithGivenProto<SegmentsObject>(cx, proto);
   if (!segments) {
-    return nullptr;
+    return false;
   }
 
   segments->setSegmenter(segmenter);
@@ -1022,7 +954,8 @@ static SegmentsObject* CreateSegmentsObject(JSContext* cx,
   segments->setString(string);
   segments->setIndex(0);
 
-  return segments;
+  args.rval().setObject(*segments);
+  return true;
 }
 
 bool js::intl_CreateSegmentIterator(JSContext* cx, unsigned argc, Value* vp) {
@@ -1095,89 +1028,6 @@ bool js::intl_FindNextSegmentBoundaries(JSContext* cx, unsigned argc,
   return true;
 }
 
-static bool IsSegmenter(Handle<JS::Value> v) {
-  return v.isObject() && v.toObject().is<SegmenterObject>();
-}
-
-/**
- * Intl.Segmenter.prototype.segment ( string )
- */
-static bool segmenter_segment(JSContext* cx, const CallArgs& args) {
-  Rooted<SegmenterObject*> segmenter(
-      cx, &args.thisv().toObject().as<SegmenterObject>());
-
-  // Step 3.
-  Rooted<JSString*> string(cx, JS::ToString(cx, args.get(0)));
-  if (!string) {
-    return false;
-  }
-
-  // Step 4.
-  auto* result = CreateSegmentsObject(cx, segmenter, string);
-  if (!result) {
-    return false;
-  }
-  args.rval().setObject(*result);
-  return true;
-}
-
-/**
- * Intl.Segmenter.prototype.segment ( string )
- */
-static bool segmenter_segment(JSContext* cx, unsigned argc, Value* vp) {
-  // Steps 1-2.
-  CallArgs args = CallArgsFromVp(argc, vp);
-  return CallNonGenericMethod<IsSegmenter, segmenter_segment>(cx, args);
-}
-
-/**
- * Intl.Segmenter.prototype.resolvedOptions ( )
- */
-static bool segmenter_resolvedOptions(JSContext* cx, const CallArgs& args) {
-  Rooted<SegmenterObject*> segmenter(
-      cx, &args.thisv().toObject().as<SegmenterObject>());
-
-  if (!ResolveLocale(cx, segmenter)) {
-    return false;
-  }
-
-  // Step 3.
-  Rooted<IdValueVector> options(cx, cx);
-
-  // Step 4.
-  if (!options.emplaceBack(NameToId(cx->names().locale),
-                           StringValue(segmenter->getLocale()))) {
-    return false;
-  }
-
-  auto* granularity = NewStringCopy<CanGC>(
-      cx, GranularityToString(segmenter->getGranularity()));
-  if (!granularity) {
-    return false;
-  }
-  if (!options.emplaceBack(NameToId(cx->names().granularity),
-                           StringValue(granularity))) {
-    return false;
-  }
-
-  // Step 5.
-  auto* result = NewPlainObjectWithUniqueNames(cx, options);
-  if (!result) {
-    return false;
-  }
-  args.rval().setObject(*result);
-  return true;
-}
-
-/**
- * Intl.Segmenter.prototype.resolvedOptions ( )
- */
-static bool segmenter_resolvedOptions(JSContext* cx, unsigned argc, Value* vp) {
-  // Steps 1-2.
-  CallArgs args = CallArgsFromVp(argc, vp);
-  return CallNonGenericMethod<IsSegmenter, segmenter_resolvedOptions>(cx, args);
-}
-
 /**
  * Intl.Segmenter.supportedLocalesOf ( locales [ , options ] )
  */
diff --git a/js/src/builtin/intl/Segmenter.h b/js/src/builtin/intl/Segmenter.h
index b7ff42d6e26de..2b75b86488257 100644
--- a/js/src/builtin/intl/Segmenter.h
+++ b/js/src/builtin/intl/Segmenter.h
@@ -14,7 +14,6 @@
 #include "js/Class.h"
 #include "js/Value.h"
 #include "vm/NativeObject.h"
-#include "vm/StringType.h"
 
 struct JS_PUBLIC_API JSContext;
 class JSString;
@@ -32,35 +31,26 @@ class SegmenterObject : public NativeObject {
   static const JSClass class_;
   static const JSClass& protoClass_;
 
-  static constexpr uint32_t LOCALE_SLOT = 0;
-  static constexpr uint32_t GRANULARITY_SLOT = 1;
-  static constexpr uint32_t SEGMENTER_SLOT = 2;
-  static constexpr uint32_t SLOT_COUNT = 3;
+  static constexpr uint32_t INTERNALS_SLOT = 0;
+  static constexpr uint32_t LOCALE_SLOT = 1;
+  static constexpr uint32_t GRANULARITY_SLOT = 2;
+  static constexpr uint32_t SEGMENTER_SLOT = 3;
+  static constexpr uint32_t SLOT_COUNT = 4;
 
-  bool isLocaleResolved() const { return getFixedSlot(LOCALE_SLOT).isString(); }
+  static_assert(INTERNALS_SLOT == INTL_INTERNALS_OBJECT_SLOT,
+                "INTERNALS_SLOT must match self-hosting define for internals "
+                "object slot");
 
-  JSObject* getRequestedLocales() const {
+  JSString* getLocale() const {
     const auto& slot = getFixedSlot(LOCALE_SLOT);
     if (slot.isUndefined()) {
       return nullptr;
     }
-    return &slot.toObject();
-  }
-
-  void setRequestedLocales(JSObject* requestedLocales) {
-    setFixedSlot(LOCALE_SLOT, JS::ObjectValue(*requestedLocales));
-  }
-
-  JSLinearString* getLocale() const {
-    const auto& slot = getFixedSlot(LOCALE_SLOT);
-    if (slot.isUndefined()) {
-      return nullptr;
-    }
-    return &slot.toString()->asLinear();
+    return slot.toString();
   }
 
-  void setLocale(JSLinearString* locale) {
-    setFixedSlot(LOCALE_SLOT, JS::StringValue(locale));
+  void setLocale(JSString* locale) {
+    setFixedSlot(LOCALE_SLOT, StringValue(locale));
   }
 
   SegmenterGranularity getGranularity() const {
@@ -356,6 +346,14 @@ class SegmentIteratorObject : public NativeObject {
   static void finalize(JS::GCContext* gcx, JSObject* obj);
 };
 
+/**
+ * Create a new Segments object.
+ *
+ * Usage: segment = intl_CreateSegmentsObject(segmenter, string)
+ */
+[[nodiscard]] extern bool intl_CreateSegmentsObject(JSContext* cx,
+                                                    unsigned argc, Value* vp);
+
 /**
  * Create a new Segment Iterator object.
  *
diff --git a/js/src/builtin/intl/Segmenter.js b/js/src/builtin/intl/Segmenter.js
index 472b2f67356f5..2636a6a4e3948 100644
--- a/js/src/builtin/intl/Segmenter.js
+++ b/js/src/builtin/intl/Segmenter.js
@@ -2,6 +2,208 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+/**
+ * Intl.Segmenter ( [ locales [ , options ] ] )
+ *
+ * Compute an internal properties object from |lazySegmenterData|.
+ */
+function resolveSegmenterInternals(lazySegmenterData) {
+  assert(IsObject(lazySegmenterData), "lazy data not an object?");
+
+  var internalProps = std_Object_create(null);
+
+  // Compute effective locale.
+
+  // Steps 9-10.
+  var r = intl_ResolveLocale(
+    "Segmenter",
+    lazySegmenterData.requestedLocales,
+    lazySegmenterData.opt,
+  );
+
+  // Step 11.
+  internalProps.locale = r.locale;
+
+  // Step 13.
+  internalProps.granularity = lazySegmenterData.granularity;
+
+  // The caller is responsible for associating |internalProps| with the right
+  // object using |setInternalProperties|.
+  return internalProps;
+}
+
+/**
+ * Returns an object containing the Segmenter internal properties of |obj|.
+ */
+function getSegmenterInternals(obj) {
+  assert(IsObject(obj), "getSegmenterInternals called with non-object");
+  assert(
+    intl_GuardToSegmenter(obj) !== null,
+    "getSegmenterInternals called with non-Segmenter"
+  );
+
+  var internals = getIntlObjectInternals(obj);
+  assert(
+    internals.type === "Segmenter",
+    "bad type escaped getIntlObjectInternals"
+  );
+
+  // If internal properties have already been computed, use them.
+  var internalProps = maybeInternalProperties(internals);
+  if (internalProps) {
+    return internalProps;
+  }
+
+  // Otherwise it's time to fully create them.
+  internalProps = resolveSegmenterInternals(internals.lazyData);
+  setInternalProperties(internals, internalProps);
+  return internalProps;
+}
+
+/**
+ * Intl.Segmenter ( [ locales [ , options ] ] )
+ *
+ * Initializes an object as a Segmenter.
+ *
+ * This method is complicated a moderate bit by its implementing initialization
+ * as a *lazy* concept.  Everything that must happen now, does -- but we defer
+ * all the work we can until the object is actually used as a Segmenter.
+ * This later work occurs in |resolveSegmenterInternals|; steps not noted here
+ * occur there.
+ */
+function InitializeSegmenter(segmenter, locales, options) {
+  assert(IsObject(segmenter), "InitializeSegmenter called with non-object");
+  assert(
+    intl_GuardToSegmenter(segmenter) !== null,
+    "InitializeSegmenter called with non-Segmenter"
+  );
+
+  // Lazy Segmenter data has the following structure:
+  //
+  //   {
+  //     requestedLocales: List of locales,
+  //
+  //     opt: // opt object computed in InitializeSegmenter
+  //       {
+  //         localeMatcher: "lookup" / "best fit",
+  //       }
+  //
+  //     granularity: "grapheme" / "word" / "sentence",
+  //   }
+  //
+  // Note that lazy data is only installed as a final step of initialization,
+  // so every Segmenter lazy data object has *all* these properties, never a
+  // subset of them.
+  var lazySegmenterData = std_Object_create(null);
+
+  // Step 4.
+  var requestedLocales = CanonicalizeLocaleList(locales);
+  lazySegmenterData.requestedLocales = requestedLocales;
+
+  // Step 5.
+  if (options === undefined) {
+    options = std_Object_create(null);
+  } else if (!IsObject(options)) {
+    ThrowTypeError(
+      JSMSG_OBJECT_REQUIRED,
+      options === null ? "null" : typeof options
+    );
+  }
+
+  // Step 6.
+  var opt = NEW_RECORD();
+  lazySegmenterData.opt = opt;
+
+  // Steps 7-8.
+  var matcher = GetOption(
+    options,
+    "localeMatcher",
+    "string",
+    ["lookup", "best fit"],
+    "best fit"
+  );
+  opt.localeMatcher = matcher;
+
+  // Steps 12-13.
+  var granularity = GetOption(
+    options,
+    "granularity",
+    "string",
+    ["grapheme", "word", "sentence"],
+    "grapheme"
+  );
+  lazySegmenterData.granularity = granularity;
+
+  // We've done everything that must be done now: mark the lazy data as fully
+  // computed and install it.
+  initializeIntlObject(segmenter, "Segmenter", lazySegmenterData);
+}
+
+/**
+ * Intl.Segmenter.prototype.segment ( string )
+ *
+ * Create a new Segments object.
+ */
+function Intl_Segmenter_segment(value) {
+  // Step 1.
+  var segmenter = this;
+
+  // Step 2.
+  if (
+    !IsObject(segmenter) ||
+    (segmenter = intl_GuardToSegmenter(segmenter)) === null
+  ) {
+    return callFunction(
+      intl_CallSegmenterMethodIfWrapped,
+      this,
+      value,
+      "Intl_Segmenter_segment"
+    );
+  }
+
+  // Ensure the Segmenter internals are resolved.
+  getSegmenterInternals(segmenter);
+
+  // Step 3.
+  var string = ToString(value);
+
+  // Step 4.
+  return intl_CreateSegmentsObject(segmenter, string);
+}
+
+/**
+ * Intl.Segmenter.prototype.resolvedOptions ()
+ *
+ * Returns the resolved options for a Segmenter object.
+ */
+function Intl_Segmenter_resolvedOptions() {
+  // Step 1.
+  var segmenter = this;
+
+  // Step 2.
+  if (
+    !IsObject(segmenter) ||
+    (segmenter = intl_GuardToSegmenter(segmenter)) === null
+  ) {
+    return callFunction(
+      intl_CallSegmenterMethodIfWrapped,
+      this,
+      "Intl_Segmenter_resolvedOptions"
+    );
+  }
+
+  var internals = getSegmenterInternals(segmenter);
+
+  // Steps 3-4.
+  var options = {
+    locale: internals.locale,
+    granularity: internals.granularity,
+  };
+
+  // Step 5.
+  return options;
+}
+
 /**
  * CreateSegmentDataObject ( segmenter, string, startIndex, endIndex )
  */
diff --git a/js/src/builtin/moz.build b/js/src/builtin/moz.build
index 04d55984f44f5..125d8c81b0ef9 100644
--- a/js/src/builtin/moz.build
+++ b/js/src/builtin/moz.build
@@ -89,9 +89,11 @@ selfhosted_inputs = [
 ] + (
     [
         "intl/NumberingSystemsGenerated.h",
+        "intl/Collator.js",
         "intl/CommonFunctions.js",
         "intl/CurrencyDataGenerated.js",
         "intl/DateTimeFormat.js",
+        "intl/DurationFormat.js",
         "intl/NumberFormat.js",
         "intl/PluralRules.js",
         "intl/SanctionedSimpleUnitIdentifiersGenerated.js",
diff --git a/js/src/jit/CacheIR.cpp b/js/src/jit/CacheIR.cpp
index cb63f93265e6c..12540d07672fb 100644
--- a/js/src/jit/CacheIR.cpp
+++ b/js/src/jit/CacheIR.cpp
@@ -13180,9 +13180,12 @@ AttachDecision InlinableNativeIRGenerator::tryAttachStub() {
       return tryAttachFunctionBind();
 
     // Intl natives.
+    case InlinableNative::IntlGuardToCollator:
     case InlinableNative::IntlGuardToDateTimeFormat:
+    case InlinableNative::IntlGuardToDurationFormat:
     case InlinableNative::IntlGuardToNumberFormat:
     case InlinableNative::IntlGuardToPluralRules:
+    case InlinableNative::IntlGuardToSegmenter:
     case InlinableNative::IntlGuardToSegments:
     case InlinableNative::IntlGuardToSegmentIterator:
       return tryAttachGuardToClass(native);
diff --git a/js/src/jit/InlinableNatives.cpp b/js/src/jit/InlinableNatives.cpp
index ad723f3507ec4..483bf70259a6b 100644
--- a/js/src/jit/InlinableNatives.cpp
+++ b/js/src/jit/InlinableNatives.cpp
@@ -7,7 +7,9 @@
 #include "jit/InlinableNatives.h"
 
 #ifdef JS_HAS_INTL_API
+#  include "builtin/intl/Collator.h"
 #  include "builtin/intl/DateTimeFormat.h"
+#  include "builtin/intl/DurationFormat.h"
 #  include "builtin/intl/NumberFormat.h"
 #  include "builtin/intl/PluralRules.h"
 #  include "builtin/intl/Segmenter.h"
@@ -39,20 +41,28 @@ const JSClass* js::jit::InlinableNativeGuardToClass(InlinableNative native) {
   switch (native) {
 #ifdef JS_HAS_INTL_API
     // Intl natives.
+    case InlinableNative::IntlGuardToCollator:
+      return &CollatorObject::class_;
     case InlinableNative::IntlGuardToDateTimeFormat:
       return &DateTimeFormatObject::class_;
+    case InlinableNative::IntlGuardToDurationFormat:
+      return &DurationFormatObject::class_;
     case InlinableNative::IntlGuardToNumberFormat:
       return &NumberFormatObject::class_;
     case InlinableNative::IntlGuardToPluralRules:
       return &PluralRulesObject::class_;
+    case InlinableNative::IntlGuardToSegmenter:
+      return &SegmenterObject::class_;
     case InlinableNative::IntlGuardToSegments:
       return &SegmentsObject::class_;
     case InlinableNative::IntlGuardToSegmentIterator:
       return &SegmentIteratorObject::class_;
 #else
+    case InlinableNative::IntlGuardToCollator:
     case InlinableNative::IntlGuardToDateTimeFormat:
     case InlinableNative::IntlGuardToNumberFormat:
     case InlinableNative::IntlGuardToPluralRules:
+    case InlinableNative::IntlGuardToSegmenter:
     case InlinableNative::IntlGuardToSegments:
     case InlinableNative::IntlGuardToSegmentIterator:
       MOZ_CRASH("Intl API disabled");
@@ -157,9 +167,12 @@ bool js::jit::CanInlineNativeCrossRealm(InlinableNative native) {
       // RNG state is per-realm.
       return false;
 
+    case InlinableNative::IntlGuardToCollator:
     case InlinableNative::IntlGuardToDateTimeFormat:
+    case InlinableNative::IntlGuardToDurationFormat:
     case InlinableNative::IntlGuardToNumberFormat:
     case InlinableNative::IntlGuardToPluralRules:
+    case InlinableNative::IntlGuardToSegmenter:
     case InlinableNative::IntlGuardToSegments:
     case InlinableNative::IntlGuardToSegmentIterator:
     case InlinableNative::IsRegExpObject:
diff --git a/js/src/jit/InlinableNatives.h b/js/src/jit/InlinableNatives.h
index 5f7d6145e755e..ec1ea2ae45763 100644
--- a/js/src/jit/InlinableNatives.h
+++ b/js/src/jit/InlinableNatives.h
@@ -95,9 +95,12 @@
                                                    \
   _(FunctionBind)                                  \
                                                    \
+  _(IntlGuardToCollator)                           \
   _(IntlGuardToDateTimeFormat)                     \
+  _(IntlGuardToDurationFormat)                     \
   _(IntlGuardToNumberFormat)                       \
   _(IntlGuardToPluralRules)                        \
+  _(IntlGuardToSegmenter)                          \
   _(IntlGuardToSegments)                           \
   _(IntlGuardToSegmentIterator)                    \
                                                    \
diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp
index 9359bcea8ef96..fb4210b7fc51f 100644
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -24,7 +24,9 @@
 #include "builtin/Array.h"
 #include "builtin/BigInt.h"
 #ifdef JS_HAS_INTL_API
+#  include "builtin/intl/Collator.h"
 #  include "builtin/intl/DateTimeFormat.h"
+#  include "builtin/intl/DurationFormat.h"
 #  include "builtin/intl/IntlObject.h"
 #  include "builtin/intl/Locale.h"
 #  include "builtin/intl/NumberFormat.h"
@@ -1842,17 +1844,25 @@ static const JSFunctionSpec intrinsic_functions[] = {
 // Intrinsics and standard functions used by Intl API implementation.
 #ifdef JS_HAS_INTL_API
     JS_FN("intl_BestAvailableLocale", intl_BestAvailableLocale, 3, 0),
+    JS_FN("intl_CallCollatorMethodIfWrapped",
+          CallNonGenericSelfhostedMethod<Is<CollatorObject>>, 2, 0),
     JS_FN("intl_CallDateTimeFormatMethodIfWrapped",
           CallNonGenericSelfhostedMethod<Is<DateTimeFormatObject>>, 2, 0),
+    JS_FN("intl_CallDurationFormatMethodIfWrapped",
+          CallNonGenericSelfhostedMethod<Is<DurationFormatObject>>, 2, 0),
     JS_FN("intl_CallNumberFormatMethodIfWrapped",
           CallNonGenericSelfhostedMethod<Is<NumberFormatObject>>, 2, 0),
     JS_FN("intl_CallPluralRulesMethodIfWrapped",
           CallNonGenericSelfhostedMethod<Is<PluralRulesObject>>, 2, 0),
     JS_FN("intl_CallSegmentIteratorMethodIfWrapped",
           CallNonGenericSelfhostedMethod<Is<SegmentIteratorObject>>, 2, 0),
+    JS_FN("intl_CallSegmenterMethodIfWrapped",
+          CallNonGenericSelfhostedMethod<Is<SegmenterObject>>, 2, 0),
     JS_FN("intl_CallSegmentsMethodIfWrapped",
           CallNonGenericSelfhostedMethod<Is<SegmentsObject>>, 2, 0),
+    JS_FN("intl_CompareStrings", intl_CompareStrings, 3, 0),
     JS_FN("intl_CreateSegmentIterator", intl_CreateSegmentIterator, 1, 0),
+    JS_FN("intl_CreateSegmentsObject", intl_CreateSegmentsObject, 2, 0),
     JS_FN("intl_DefaultTimeZone", intrinsic_DefaultTimeZone, 0, 0),
     JS_FN("intl_FindNextSegmentBoundaries", intl_FindNextSegmentBoundaries, 1,
           0),
@@ -1862,9 +1872,15 @@ static const JSFunctionSpec intrinsic_functions[] = {
     JS_FN("intl_FormatNumber", intl_FormatNumber, 3, 0),
     JS_FN("intl_FormatNumberRange", intl_FormatNumberRange, 4, 0),
     JS_FN("intl_GetPluralCategories", intl_GetPluralCategories, 1, 0),
+    JS_INLINABLE_FN("intl_GuardToCollator",
+                    intrinsic_GuardToBuiltin<CollatorObject>, 1, 0,
+                    IntlGuardToCollator),
     JS_INLINABLE_FN("intl_GuardToDateTimeFormat",
                     intrinsic_GuardToBuiltin<DateTimeFormatObject>, 1, 0,
                     IntlGuardToDateTimeFormat),
+    JS_INLINABLE_FN("intl_GuardToDurationFormat",
+                    intrinsic_GuardToBuiltin<DurationFormatObject>, 1, 0,
+                    IntlGuardToDurationFormat),
     JS_INLINABLE_FN("intl_GuardToNumberFormat",
                     intrinsic_GuardToBuiltin<NumberFormatObject>, 1, 0,
                     IntlGuardToNumberFormat),
@@ -1874,6 +1890,9 @@ static const JSFunctionSpec intrinsic_functions[] = {
     JS_INLINABLE_FN("intl_GuardToSegmentIterator",
                     intrinsic_GuardToBuiltin<SegmentIteratorObject>, 1, 0,
                     IntlGuardToSegmentIterator),
+    JS_INLINABLE_FN("intl_GuardToSegmenter",
+                    intrinsic_GuardToBuiltin<SegmenterObject>, 1, 0,
+                    IntlGuardToSegmenter),
     JS_INLINABLE_FN("intl_GuardToSegments",
                     intrinsic_GuardToBuiltin<SegmentsObject>, 1, 0,
                     IntlGuardToSegments),
@@ -1895,6 +1914,8 @@ static const JSFunctionSpec intrinsic_functions[] = {
     JS_FN("intl_availableMeasurementUnits", intl_availableMeasurementUnits, 0,
           0),
 #  endif
+    JS_FN("intl_isIgnorePunctuation", intl_isIgnorePunctuation, 1, 0),
+    JS_FN("intl_isUpperCaseFirst", intl_isUpperCaseFirst, 1, 0),
     JS_FN("intl_resolveDateTimeFormatComponents",
           intl_resolveDateTimeFormatComponents, 3, 0),
 #endif  // JS_HAS_INTL_API

From 067d5b0303b5b7295309024c211f8ba2c3438d22 Mon Sep 17 00:00:00 2001
From: Cristina Horotan <chorotan@mozilla.com>
Date: Thu, 29 Jan 2026 16:00:32 +0200
Subject: [PATCH 052/116] Revert "Bug 2004990 - [Downloads path] Fix the name
 guessing for new Download location. r=android-reviewers,tthibaud" for causing
 detect-leaks-arm failures

This reverts commit 8ce1ea2630e9a4f0fed4e3f3cc7778031d62646a.
---
 gradle/libs.versions.toml                     |   2 -
 .../browser/engine-gecko/build.gradle         |   1 -
 .../browser/engine/gecko/GeckoEngine.kt       | 148 +------
 .../engine/gecko/GeckoEngineSession.kt        |  19 +-
 .../GeckoServiceWorkerDelegate.kt             |  11 +-
 .../gecko/util/SpeculativeSessionFactory.kt   |  22 +-
 .../gecko/webextension/GeckoWebExtension.kt   |   8 +-
 .../engine/gecko/GeckoEngineSessionTest.kt    |   6 -
 .../GeckoServiceWorkerDelegateTest.kt         |   4 +-
 .../util/SpeculativeSessionFactoryTest.kt     |  73 +--
 .../browser/engine/system/SystemEngineView.kt |  28 +-
 .../components/feature/downloads/build.gradle |   1 -
 .../downloads/AbstractFetchDownloadService.kt |   9 +-
 .../downloads/DownloadDialogFragment.kt       |   5 +-
 .../feature/downloads/DownloadsFeature.kt     |  29 +-
 .../feature/downloads/ext/DownloadState.kt    |  26 +-
 .../manager/AndroidDownloadManager.kt         |  34 +-
 .../AbstractFetchDownloadServiceTest.kt       |   5 -
 .../downloads/DownloadDialogFragmentTest.kt   |   3 +-
 .../feature/downloads/DownloadsFeatureTest.kt |  22 +-
 .../downloads/ext/DownloadStateKtTest.kt      |  17 +-
 .../manager/AndroidDownloadManagerTest.kt     |  23 +-
 .../manager/FetchDownloadManagerTest.kt       |   3 -
 .../components/support/utils/build.gradle     |   8 -
 .../support/utils/DefaultDownloadFileUtils.kt | 169 -------
 .../support/utils/DownloadFileUtils.kt        |  56 ---
 .../components/support/utils/DownloadUtils.kt | 123 +++---
 .../utils/DefaultDownloadFileUtilsTest.kt     | 418 ------------------
 .../support/utils/DownloadUtilsTest.kt        | 403 +++++++++++++++++
 .../support/utils/FakeDownloadFileUtils.kt    |  74 ----
 .../android-components/docs/changelog.md      |   3 -
 .../browser/downloads/DownloadService.kt      |  13 -
 .../fenix/browser/BaseBrowserFragment.kt      |  10 -
 .../java/org/mozilla/fenix/components/Core.kt |  16 +-
 .../fenix/downloads/DownloadService.kt        |  13 -
 .../focus/downloads/DownloadService.kt        |  13 -
 36 files changed, 567 insertions(+), 1251 deletions(-)
 delete mode 100644 mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DefaultDownloadFileUtils.kt
 delete mode 100644 mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DownloadFileUtils.kt
 delete mode 100644 mobile/android/android-components/components/support/utils/src/test/java/mozilla/components/support/utils/DefaultDownloadFileUtilsTest.kt
 delete mode 100644 mobile/android/android-components/components/support/utils/src/testFixtures/kotlin/mozilla/components/support/utils/FakeDownloadFileUtils.kt

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9356cbe76063e..eceb6f03f9cc6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -40,7 +40,6 @@ palette = "1.0.0"
 preferences = "1.2.1"
 profileinstaller = "1.4.0"
 recyclerview = "1.4.0"
-documentfile = "1.0.1"
 room = "2.8.4"
 savedstate = "1.4.0"
 swiperefreshlayout = "1.2.0"
@@ -172,7 +171,6 @@ androidx-palette = { group = "androidx.palette", name = "palette-ktx", version.r
 androidx-preferences = { group = "androidx.preference", name = "preference", version.ref = "preferences" }
 androidx-profileinstaller = { group = "androidx.profileinstaller", name = "profileinstaller", version.ref = "profileinstaller" }
 androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerview" }
-androidx-documentfile = { group = "androidx.documentfile", name = "documentfile", version.ref = "documentfile" }
 androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
 androidx-room-runtime = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
 androidx-room-testing = { group = "androidx.room", name = "room-testing", version.ref = "room" }
diff --git a/mobile/android/android-components/components/browser/engine-gecko/build.gradle b/mobile/android/android-components/components/browser/engine-gecko/build.gradle
index 8541d199476ef..3875a621feaf6 100644
--- a/mobile/android/android-components/components/browser/engine-gecko/build.gradle
+++ b/mobile/android/android-components/components/browser/engine-gecko/build.gradle
@@ -67,7 +67,6 @@ dependencies {
 
     testImplementation project(':components:support-test')
     testImplementation project(':components:tooling-fetch-tests')
-    testImplementation testFixtures(project(':components:support-utils'))
 
     testImplementation libs.androidx.test.core
     testImplementation libs.androidx.test.junit
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt
index c059b6fbb2b98..60fb24214c178 100644
--- a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt
+++ b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt
@@ -5,7 +5,6 @@
 package mozilla.components.browser.engine.gecko
 
 import android.content.Context
-import android.os.Environment
 import android.os.Parcelable
 import android.util.AttributeSet
 import android.util.JsonReader
@@ -83,8 +82,6 @@ import mozilla.components.concept.engine.webnotifications.WebNotificationDelegat
 import mozilla.components.concept.engine.webpush.WebPushDelegate
 import mozilla.components.concept.engine.webpush.WebPushHandler
 import mozilla.components.support.ktx.kotlin.isResourceUrl
-import mozilla.components.support.utils.DefaultDownloadFileUtils
-import mozilla.components.support.utils.DownloadFileUtils
 import mozilla.components.support.utils.ThreadUtils
 import org.json.JSONObject
 import org.mozilla.geckoview.AllowOrDeny
@@ -117,14 +114,6 @@ class GeckoEngine(
     private val geckoPreferenceAccessor: GeckoPreferenceAccessor = DefaultGeckoPreferenceAccessor(),
     private val runtimeTranslationAccessor: RuntimeTranslationAccessor = DefaultRuntimeTranslationAccessor(),
     private val addressStructureAccessor: RuntimeAddressStructureAccessor = DefaultRuntimeAddressStructureAccessor(),
-    private val downloadFileUtils: DownloadFileUtils = DefaultDownloadFileUtils(
-        context = context,
-        downloadLocationGetter = {
-            Environment.getExternalStoragePublicDirectory(
-                Environment.DIRECTORY_DOWNLOADS,
-            ).path
-        },
-    ),
 ) : Engine, WebExtensionRuntime, TranslationsRuntime, BrowserPreferencesRuntime {
     private val executor by lazy { executorProvider.invoke() }
     private val localeUpdater = LocaleSettingUpdater(context, runtime)
@@ -144,9 +133,8 @@ class GeckoEngine(
             return webExtensionDelegate?.onToggleActionPopup(
                 extension,
                 GeckoEngineSession(
-                    runtime = runtime,
+                    runtime,
                     defaultSettings = defaultSettings,
-                    downloadFileUtils = downloadFileUtils,
                 ),
                 action,
             )
@@ -231,13 +219,7 @@ class GeckoEngine(
     override fun createSession(private: Boolean, contextId: String?): EngineSession {
         ThreadUtils.assertOnUiThread()
         val speculativeSession = speculativeConnectionFactory.get(private, contextId)
-        return speculativeSession ?: GeckoEngineSession(
-            runtime = runtime,
-            privateMode = private,
-            downloadFileUtils = downloadFileUtils,
-            defaultSettings = defaultSettings,
-            contextId = contextId,
-        )
+        return speculativeSession ?: GeckoEngineSession(runtime, private, defaultSettings, contextId)
     }
 
     /**
@@ -259,13 +241,7 @@ class GeckoEngine(
      */
     override fun speculativeCreateSession(private: Boolean, contextId: String?) {
         ThreadUtils.assertOnUiThread()
-        speculativeConnectionFactory.create(
-            runtime = runtime,
-            private = private,
-            contextId = contextId,
-            defaultSettings = defaultSettings,
-            downloadFileUtils = downloadFileUtils,
-        )
+        speculativeConnectionFactory.create(runtime, private, contextId, defaultSettings)
     }
 
     /**
@@ -371,11 +347,7 @@ class GeckoEngine(
         runtime.webExtensionController.update((extension as GeckoWebExtension).nativeExtension).then(
             { geckoExtension ->
                 val updatedExtension = if (geckoExtension != null) {
-                    GeckoWebExtension(
-                        nativeExtension = geckoExtension,
-                        runtime = runtime,
-                        downloadFileUtils = downloadFileUtils,
-                    ).also {
+                    GeckoWebExtension(geckoExtension, runtime).also {
                         it.registerActionHandler(webExtensionActionHandler)
                         it.registerTabHandler(webExtensionTabHandler, defaultSettings)
                     }
@@ -411,11 +383,7 @@ class GeckoEngine(
                 val result = GeckoResult<NativePermissionPromptResponse>()
 
                 webExtensionDelegate.onInstallPermissionRequest(
-                    GeckoWebExtension(
-                        nativeExtension = ext,
-                        runtime = runtime,
-                        downloadFileUtils = downloadFileUtils,
-                    ),
+                    GeckoWebExtension(ext, runtime),
                     permissions.toList(),
                     origins.toList(),
                     dataCollectionPermissions.toList(),
@@ -440,11 +408,7 @@ class GeckoEngine(
             ): GeckoResult<AllowOrDeny>? {
                 val result = GeckoResult<AllowOrDeny>()
                 webExtensionDelegate.onUpdatePermissionRequest(
-                    GeckoWebExtension(
-                        nativeExtension = extension,
-                        runtime = runtime,
-                        downloadFileUtils = downloadFileUtils,
-                    ),
+                    GeckoWebExtension(extension, runtime),
                     newPermissions.toList(),
                     newOrigins.toList(),
                     newDataCollectionPermissions.toList(),
@@ -462,11 +426,7 @@ class GeckoEngine(
             ): GeckoResult<AllowOrDeny>? {
                 val result = GeckoResult<AllowOrDeny>()
                 webExtensionDelegate.onOptionalPermissionsRequest(
-                    GeckoWebExtension(
-                        nativeExtension = extension,
-                        runtime = runtime,
-                        downloadFileUtils = downloadFileUtils,
-                    ),
+                    GeckoWebExtension(extension, runtime),
                     permissions.toList(),
                     origins.toList(),
                     dataCollectionPermissions.toList(),
@@ -485,51 +445,23 @@ class GeckoEngine(
 
         val addonManagerDelegate = object : WebExtensionController.AddonManagerDelegate {
             override fun onDisabled(extension: org.mozilla.geckoview.WebExtension) {
-                webExtensionDelegate.onDisabled(
-                    GeckoWebExtension(
-                        nativeExtension = extension,
-                        runtime = runtime,
-                        downloadFileUtils = downloadFileUtils,
-                    ),
-                )
+                webExtensionDelegate.onDisabled(GeckoWebExtension(extension, runtime))
             }
 
             override fun onEnabled(extension: org.mozilla.geckoview.WebExtension) {
-                webExtensionDelegate.onEnabled(
-                    GeckoWebExtension(
-                        nativeExtension = extension,
-                        runtime = runtime,
-                        downloadFileUtils = downloadFileUtils,
-                    ),
-                )
+                webExtensionDelegate.onEnabled(GeckoWebExtension(extension, runtime))
             }
 
             override fun onReady(extension: org.mozilla.geckoview.WebExtension) {
-                webExtensionDelegate.onReady(
-                    GeckoWebExtension(
-                        nativeExtension = extension,
-                        runtime = runtime,
-                        downloadFileUtils = downloadFileUtils,
-                    ),
-                )
+                webExtensionDelegate.onReady(GeckoWebExtension(extension, runtime))
             }
 
             override fun onUninstalled(extension: org.mozilla.geckoview.WebExtension) {
-                webExtensionDelegate.onUninstalled(
-                    GeckoWebExtension(
-                        nativeExtension = extension,
-                        runtime = runtime,
-                        downloadFileUtils = downloadFileUtils,
-                    ),
-                )
+                webExtensionDelegate.onUninstalled(GeckoWebExtension(extension, runtime))
             }
 
             override fun onInstalled(extension: org.mozilla.geckoview.WebExtension) {
-                val installedExtension = GeckoWebExtension(
-                    nativeExtension = extension,
-                    runtime = runtime,
-                    downloadFileUtils = downloadFileUtils,
-                )
+                val installedExtension = GeckoWebExtension(extension, runtime)
                 webExtensionDelegate.onInstalled(installedExtension)
                 installedExtension.registerActionHandler(webExtensionActionHandler)
                 installedExtension.registerTabHandler(webExtensionTabHandler, defaultSettings)
@@ -548,13 +480,7 @@ class GeckoEngine(
             }
 
             override fun onOptionalPermissionsChanged(extension: org.mozilla.geckoview.WebExtension) {
-                webExtensionDelegate.onOptionalPermissionsChanged(
-                    GeckoWebExtension(
-                        nativeExtension = extension,
-                        runtime = runtime,
-                        downloadFileUtils = downloadFileUtils,
-                    ),
-                )
+                webExtensionDelegate.onOptionalPermissionsChanged(GeckoWebExtension(extension, runtime))
             }
         }
 
@@ -577,11 +503,7 @@ class GeckoEngine(
         runtime.webExtensionController.list().then(
             {
                 val extensions = it?.map { extension ->
-                    GeckoWebExtension(
-                        nativeExtension = extension,
-                        runtime = runtime,
-                        downloadFileUtils = downloadFileUtils,
-                    )
+                    GeckoWebExtension(extension, runtime)
                 } ?: emptyList()
 
                 extensions.forEach { extension ->
@@ -610,11 +532,7 @@ class GeckoEngine(
     ) {
         runtime.webExtensionController.enable((extension as GeckoWebExtension).nativeExtension, source.id).then(
             {
-                val enabledExtension = GeckoWebExtension(
-                    nativeExtension = it!!,
-                    runtime = runtime,
-                    downloadFileUtils = downloadFileUtils,
-                )
+                val enabledExtension = GeckoWebExtension(it!!, runtime)
                 onSuccess(enabledExtension)
                 GeckoResult<Void>()
             },
@@ -652,11 +570,7 @@ class GeckoEngine(
             dataCollectionPermissions.toTypedArray(),
         ).then(
             {
-                val enabledExtension = GeckoWebExtension(
-                    nativeExtension = it!!,
-                    runtime = runtime,
-                    downloadFileUtils = downloadFileUtils,
-                )
+                val enabledExtension = GeckoWebExtension(it!!, runtime)
                 onSuccess(enabledExtension)
                 GeckoResult<Void>()
             },
@@ -694,11 +608,7 @@ class GeckoEngine(
             dataCollectionPermissions.toTypedArray(),
         ).then(
             {
-                val enabledExtension = GeckoWebExtension(
-                    nativeExtension = it!!,
-                    runtime = runtime,
-                    downloadFileUtils = downloadFileUtils,
-                )
+                val enabledExtension = GeckoWebExtension(it!!, runtime)
                 onSuccess(enabledExtension)
                 GeckoResult<Void>()
             },
@@ -720,11 +630,7 @@ class GeckoEngine(
     ) {
         runtime.webExtensionController.disable((extension as GeckoWebExtension).nativeExtension, source.id).then(
             {
-                val disabledExtension = GeckoWebExtension(
-                    nativeExtension = it!!,
-                    runtime = runtime,
-                    downloadFileUtils = downloadFileUtils,
-                )
+                val disabledExtension = GeckoWebExtension(it!!, runtime)
                 onSuccess(disabledExtension)
                 GeckoResult<Void>()
             },
@@ -757,11 +663,7 @@ class GeckoEngine(
                         ),
                     )
                 } else {
-                    val ext = GeckoWebExtension(
-                        nativeExtension = geckoExtension,
-                        runtime = runtime,
-                        downloadFileUtils = downloadFileUtils,
-                    )
+                    val ext = GeckoWebExtension(geckoExtension, runtime)
                     webExtensionDelegate?.onAllowedInPrivateBrowsingChanged(ext)
                     onSuccess(ext)
                 }
@@ -878,7 +780,6 @@ class GeckoEngine(
         runtime.serviceWorkerDelegate = GeckoServiceWorkerDelegate(
             delegate = serviceWorkerDelegate,
             runtime = runtime,
-            downloadFileUtils = downloadFileUtils,
             engineSettings = defaultSettings,
         )
     }
@@ -1941,9 +1842,8 @@ class GeckoEngine(
     internal fun org.mozilla.geckoview.WebExtension?.toSafeWebExtension(): GeckoWebExtension? {
         return if (this != null) {
             GeckoWebExtension(
-                nativeExtension = this,
-                runtime = runtime,
-                downloadFileUtils = downloadFileUtils,
+                this,
+                runtime,
             )
         } else {
             null
@@ -1954,11 +1854,7 @@ class GeckoEngine(
         ext: org.mozilla.geckoview.WebExtension,
         onSuccess: ((WebExtension) -> Unit),
     ) {
-        val installedExtension = GeckoWebExtension(
-            nativeExtension = ext,
-            runtime = runtime,
-            downloadFileUtils = downloadFileUtils,
-        )
+        val installedExtension = GeckoWebExtension(ext, runtime)
         webExtensionDelegate?.onInstalled(installedExtension)
         installedExtension.registerActionHandler(webExtensionActionHandler)
         installedExtension.registerTabHandler(webExtensionTabHandler, defaultSettings)
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt
index 57804842ef08f..0d4b6de655323 100644
--- a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt
+++ b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt
@@ -60,7 +60,6 @@ import mozilla.components.support.ktx.kotlin.isPhone
 import mozilla.components.support.ktx.kotlin.sanitizeFileName
 import mozilla.components.support.ktx.kotlin.tryGetHostFromUrl
 import mozilla.components.support.utils.CertificateUtils
-import mozilla.components.support.utils.DownloadFileUtils
 import mozilla.components.support.utils.DownloadUtils
 import mozilla.components.support.utils.DownloadUtils.RESPONSE_CODE_SUCCESS
 import mozilla.components.support.utils.DownloadUtils.makePdfContentDisposition
@@ -91,7 +90,6 @@ class GeckoEngineSession(
     private val runtime: GeckoRuntime,
     private val privateMode: Boolean = false,
     private val defaultSettings: Settings? = null,
-    private val downloadFileUtils: DownloadFileUtils? = null,
     contextId: String? = null,
     private val geckoSessionProvider: () -> GeckoSession = {
         val settings = GeckoSessionSettings.Builder()
@@ -260,8 +258,8 @@ class GeckoEngineSession(
                 val contentLength = 0L
                 // NB: If the title is an empty string, there is a chance the PDF will not have a name.
                 // See https://github.com/mozilla-mobile/android-components/issues/12276
-                val fileName = downloadFileUtils?.guessFileName(
-                    contentDisposition = disposition,
+                val fileName = DownloadUtils.guessFileName(
+                    disposition,
                     url = url,
                     mimeType = contentType,
                 )
@@ -983,12 +981,7 @@ class GeckoEngineSession(
             uri: String,
         ): GeckoResult<GeckoSession> {
             val newEngineSession =
-                GeckoEngineSession(
-                    runtime = runtime,
-                    privateMode = privateMode,
-                    downloadFileUtils = downloadFileUtils,
-                    openGeckoSession = false,
-                )
+                GeckoEngineSession(runtime, privateMode, defaultSettings, openGeckoSession = false)
             notifyObservers {
                 onWindowRequest(GeckoWindowRequest(uri, newEngineSession))
             }
@@ -1301,8 +1294,8 @@ class GeckoEngineSession(
                 val contentLength = headers[CONTENT_LENGTH]?.trim()?.toLongOrNull()
                 val contentDisposition = headers[CONTENT_DISPOSITION]?.trim()
                 val url = uri
-                val fileName = downloadFileUtils?.guessFileName(
-                    contentDisposition = contentDisposition,
+                val fileName = DownloadUtils.guessFileName(
+                    contentDisposition,
                     url = url,
                     mimeType = contentType,
                 )
@@ -1312,7 +1305,7 @@ class GeckoEngineSession(
                         url = url,
                         contentLength = contentLength,
                         contentType = DownloadUtils.sanitizeMimeType(contentType),
-                        fileName = fileName?.sanitizeFileName(),
+                        fileName = fileName.sanitizeFileName(),
                         response = response,
                         isPrivate = privateMode,
                         openInApp = webResponse.requestExternalApp,
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/serviceworker/GeckoServiceWorkerDelegate.kt b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/serviceworker/GeckoServiceWorkerDelegate.kt
index 92b9baf254f2b..3bf0f24fff2d2 100644
--- a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/serviceworker/GeckoServiceWorkerDelegate.kt
+++ b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/serviceworker/GeckoServiceWorkerDelegate.kt
@@ -8,7 +8,6 @@ import mozilla.components.browser.engine.gecko.GeckoEngineSession
 import mozilla.components.concept.engine.EngineSession
 import mozilla.components.concept.engine.Settings
 import mozilla.components.concept.engine.serviceworker.ServiceWorkerDelegate
-import mozilla.components.support.utils.DownloadFileUtils
 import org.mozilla.geckoview.GeckoResult
 import org.mozilla.geckoview.GeckoRuntime
 import org.mozilla.geckoview.GeckoSession
@@ -19,22 +18,14 @@ import org.mozilla.geckoview.GeckoSession
  * @param delegate [ServiceWorkerDelegate] handling service workers requests.
  * @param runtime [GeckoRuntime] current engine's runtime.
  * @param engineSettings [Settings] default settings used when new [EngineSession]s are to be created.
- * @param downloadFileUtils [DownloadFileUtils] helper for handling download file operations.
  */
 class GeckoServiceWorkerDelegate(
     internal val delegate: ServiceWorkerDelegate,
     internal val runtime: GeckoRuntime,
     internal val engineSettings: Settings?,
-    private val downloadFileUtils: DownloadFileUtils,
 ) : GeckoRuntime.ServiceWorkerDelegate {
     override fun onOpenWindow(url: String): GeckoResult<GeckoSession> {
-        val newEngineSession = GeckoEngineSession(
-            runtime = runtime,
-            downloadFileUtils = downloadFileUtils,
-            privateMode = false,
-            defaultSettings = engineSettings,
-            openGeckoSession = false,
-        )
+        val newEngineSession = GeckoEngineSession(runtime, false, engineSettings, openGeckoSession = false)
 
         return when (delegate.addNewTab(newEngineSession)) {
             true -> GeckoResult.fromValue(newEngineSession.geckoSession)
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/util/SpeculativeSessionFactory.kt b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/util/SpeculativeSessionFactory.kt
index 39858e6a230ee..7e4e095ba48b6 100644
--- a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/util/SpeculativeSessionFactory.kt
+++ b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/util/SpeculativeSessionFactory.kt
@@ -8,7 +8,6 @@ import androidx.annotation.VisibleForTesting
 import mozilla.components.browser.engine.gecko.GeckoEngineSession
 import mozilla.components.concept.engine.EngineSession
 import mozilla.components.concept.engine.Settings
-import mozilla.components.support.utils.DownloadFileUtils
 import org.mozilla.geckoview.GeckoRuntime
 
 /**
@@ -30,7 +29,6 @@ internal class SpeculativeSessionFactory {
         private: Boolean,
         contextId: String?,
         defaultSettings: Settings?,
-        downloadFileUtils: DownloadFileUtils,
     ) {
         if (speculativeEngineSession?.matches(private, contextId) == true) {
             // We already have a speculative engine session for this configuration. Nothing to do here.
@@ -41,12 +39,11 @@ internal class SpeculativeSessionFactory {
         clear()
 
         speculativeEngineSession = SpeculativeEngineSession.create(
-            factory = this,
-            runtime = runtime,
-            private = private,
-            contextId = contextId,
-            downloadFileUtils = downloadFileUtils,
-            defaultSettings = defaultSettings,
+            this,
+            runtime,
+            private,
+            contextId,
+            defaultSettings,
         )
     }
 
@@ -127,17 +124,10 @@ internal class SpeculativeEngineSession constructor(
             factory: SpeculativeSessionFactory,
             runtime: GeckoRuntime,
             private: Boolean,
-            downloadFileUtils: DownloadFileUtils,
             contextId: String?,
             defaultSettings: Settings?,
         ): SpeculativeEngineSession {
-            val engineSession = GeckoEngineSession(
-                runtime = runtime,
-                privateMode = private,
-                downloadFileUtils = downloadFileUtils,
-                defaultSettings = defaultSettings,
-                contextId = contextId,
-            )
+            val engineSession = GeckoEngineSession(runtime, private, defaultSettings, contextId)
             val observer = SpeculativeSessionObserver(factory)
             engineSession.register(observer)
 
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/webextension/GeckoWebExtension.kt b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/webextension/GeckoWebExtension.kt
index 66f211e133421..d7deea0907fe7 100644
--- a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/webextension/GeckoWebExtension.kt
+++ b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/webextension/GeckoWebExtension.kt
@@ -20,7 +20,6 @@ import mozilla.components.concept.engine.webextension.Port
 import mozilla.components.concept.engine.webextension.TabHandler
 import mozilla.components.concept.engine.webextension.WebExtension
 import mozilla.components.support.base.log.logger.Logger
-import mozilla.components.support.utils.DownloadFileUtils
 import org.json.JSONObject
 import org.mozilla.geckoview.AllowOrDeny
 import org.mozilla.geckoview.GeckoResult
@@ -36,7 +35,6 @@ import org.mozilla.geckoview.WebExtension.Action as GeckoNativeWebExtensionActio
 class GeckoWebExtension(
     val nativeExtension: GeckoNativeWebExtension,
     val runtime: GeckoRuntime,
-    val downloadFileUtils: DownloadFileUtils? = null,
 ) : WebExtension(nativeExtension.id, nativeExtension.location, true) {
 
     private val connectedPorts: MutableMap<PortId, GeckoPort> = mutableMapOf()
@@ -263,8 +261,7 @@ class GeckoWebExtension(
                 tabDetails: GeckoNativeWebExtension.CreateTabDetails,
             ): GeckoResult<GeckoSession>? {
                 val geckoEngineSession = GeckoEngineSession(
-                    runtime = runtime,
-                    downloadFileUtils = downloadFileUtils,
+                    runtime,
                     defaultSettings = defaultSettings,
                     openGeckoSession = false,
                 )
@@ -283,8 +280,7 @@ class GeckoWebExtension(
                     tabHandler.onNewTab(
                         this@GeckoWebExtension,
                         GeckoEngineSession(
-                            runtime = runtime,
-                            downloadFileUtils = downloadFileUtils,
+                            runtime,
                             defaultSettings = defaultSettings,
                         ),
                         false,
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt
index 6a30bfb37509d..b850b338a2042 100644
--- a/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt
+++ b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt
@@ -51,7 +51,6 @@ import mozilla.components.support.test.expectException
 import mozilla.components.support.test.mock
 import mozilla.components.support.test.whenever
 import mozilla.components.support.utils.DownloadUtils.RESPONSE_CODE_SUCCESS
-import mozilla.components.support.utils.FakeDownloadFileUtils
 import mozilla.components.support.utils.ThreadUtils
 import mozilla.components.test.ReflectionUtils
 import org.json.JSONObject
@@ -338,7 +337,6 @@ class GeckoEngineSessionTest {
             mock(),
             geckoSessionProvider = geckoSessionProvider,
             privateMode = true,
-            downloadFileUtils = FakeDownloadFileUtils(guessFileName = { _, _, _ -> "image name.png" }),
         )
 
         val observer: EngineSession.Observer = mock()
@@ -378,7 +376,6 @@ class GeckoEngineSessionTest {
             mock(),
             geckoSessionProvider = geckoSessionProvider,
             privateMode = true,
-            downloadFileUtils = FakeDownloadFileUtils(guessFileName = { _, _, _ -> "image image.png" }),
         )
 
         val observer: EngineSession.Observer = mock()
@@ -419,7 +416,6 @@ class GeckoEngineSessionTest {
             mock(),
             geckoSessionProvider = geckoSessionProvider,
             privateMode = true,
-            downloadFileUtils = FakeDownloadFileUtils(guessFileName = { _, _, _ -> "image.png" }),
         )
 
         val observer: EngineSession.Observer = mock()
@@ -457,7 +453,6 @@ class GeckoEngineSessionTest {
             mock(),
             geckoSessionProvider = geckoSessionProvider,
             privateMode = true,
-            downloadFileUtils = FakeDownloadFileUtils(guessFileName = { _, _, _ -> "image.png" }),
         )
 
         val observer: EngineSession.Observer = mock()
@@ -4624,7 +4619,6 @@ class GeckoEngineSessionTest {
         val engineSession = GeckoEngineSession(
             runtime = mock(),
             geckoSessionProvider = geckoSessionProvider,
-            downloadFileUtils = FakeDownloadFileUtils(guessFileName = { _, _, _ -> "Mozilla.pdf" }),
         ).apply {
             currentUrl = "https://mozilla.org"
             currentTitle = "Mozilla"
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/serviceworker/GeckoServiceWorkerDelegateTest.kt b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/serviceworker/GeckoServiceWorkerDelegateTest.kt
index 473088dd4f33b..8e4cbf2983ecc 100644
--- a/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/serviceworker/GeckoServiceWorkerDelegateTest.kt
+++ b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/serviceworker/GeckoServiceWorkerDelegateTest.kt
@@ -20,7 +20,7 @@ class GeckoServiceWorkerDelegateTest() {
     fun `GIVEN a delegate to add tabs WHEN it added a new tab for the request to open a new window THEN return a the new closed session`() {
         val delegate = mock<ServiceWorkerDelegate>()
         doReturn(true).`when`(delegate).addNewTab(any())
-        val geckoDelegate = GeckoServiceWorkerDelegate(delegate, mock(), mock(), mock())
+        val geckoDelegate = GeckoServiceWorkerDelegate(delegate, mock(), mock())
 
         val result = geckoDelegate.onOpenWindow("").poll(1)
 
@@ -31,7 +31,7 @@ class GeckoServiceWorkerDelegateTest() {
     fun `GIVEN a delegate to add tabs WHEN it disn't add a new tab for the request to open a new window THEN return null`() {
         val delegate = mock<ServiceWorkerDelegate>()
         doReturn(false).`when`(delegate).addNewTab(any())
-        val geckoDelegate = GeckoServiceWorkerDelegate(delegate, mock(), mock(), mock())
+        val geckoDelegate = GeckoServiceWorkerDelegate(delegate, mock(), mock())
 
         val result = geckoDelegate.onOpenWindow("").poll(1)
 
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/util/SpeculativeSessionFactoryTest.kt b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/util/SpeculativeSessionFactoryTest.kt
index 07c307ea84477..e660a3761ff9c 100644
--- a/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/util/SpeculativeSessionFactoryTest.kt
+++ b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/util/SpeculativeSessionFactoryTest.kt
@@ -7,7 +7,6 @@ package mozilla.components.browser.engine.gecko.util
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import mozilla.components.support.test.mock
 import mozilla.components.support.test.whenever
-import mozilla.components.support.utils.FakeDownloadFileUtils
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNotSame
@@ -35,23 +34,11 @@ class SpeculativeSessionFactoryTest {
         val factory = SpeculativeSessionFactory()
         assertNull(factory.speculativeEngineSession)
 
-        factory.create(
-            runtime = runtime,
-            private = true,
-            contextId = null,
-            defaultSettings = mock(),
-            downloadFileUtils = FakeDownloadFileUtils(),
-        )
+        factory.create(runtime = runtime, private = true, contextId = null, defaultSettings = mock())
         val speculativeSession = factory.speculativeEngineSession
         assertNotNull(speculativeSession)
 
-        factory.create(
-            runtime = runtime,
-            private = true,
-            contextId = null,
-            defaultSettings = mock(),
-            downloadFileUtils = FakeDownloadFileUtils(),
-            )
+        factory.create(runtime = runtime, private = true, contextId = null, defaultSettings = mock())
         assertSame(speculativeSession, factory.speculativeEngineSession)
     }
 
@@ -60,23 +47,11 @@ class SpeculativeSessionFactoryTest {
         val factory = SpeculativeSessionFactory()
         assertNull(factory.speculativeEngineSession)
 
-        factory.create(
-            runtime = runtime,
-            private = true,
-            contextId = null,
-            defaultSettings = mock(),
-            downloadFileUtils = FakeDownloadFileUtils(),
-            )
+        factory.create(runtime = runtime, private = true, contextId = null, defaultSettings = mock())
         val speculativeSession = factory.speculativeEngineSession
         assertNotNull(speculativeSession)
 
-        factory.create(
-            runtime = runtime,
-            private = false,
-            contextId = null,
-            defaultSettings = mock(),
-            downloadFileUtils = FakeDownloadFileUtils(),
-        )
+        factory.create(runtime = runtime, private = false, contextId = null, defaultSettings = mock())
         assertNotSame(speculativeSession, factory.speculativeEngineSession)
         assertFalse(speculativeSession!!.engineSession.geckoSession.isOpen)
         assertFalse(speculativeSession.engineSession.isObserved())
@@ -87,13 +62,7 @@ class SpeculativeSessionFactoryTest {
         val factory = SpeculativeSessionFactory()
         assertFalse(factory.hasSpeculativeSession())
 
-        factory.create(
-            runtime = runtime,
-            private = true,
-            contextId = null,
-            defaultSettings = mock(),
-            downloadFileUtils = FakeDownloadFileUtils(),
-            )
+        factory.create(runtime = runtime, private = true, contextId = null, defaultSettings = mock())
         assertTrue(factory.hasSpeculativeSession())
 
         val speculativeSession = factory.get(private = true, contextId = null)
@@ -109,13 +78,7 @@ class SpeculativeSessionFactoryTest {
         val factory = SpeculativeSessionFactory()
         assertNull(factory.speculativeEngineSession)
 
-        factory.create(
-            runtime = runtime,
-            private = true,
-            contextId = null,
-            defaultSettings = mock(),
-            downloadFileUtils = FakeDownloadFileUtils(),
-            )
+        factory.create(runtime = runtime, private = true, contextId = null, defaultSettings = mock())
         val speculativeSession = factory.speculativeEngineSession
         assertNotNull(speculativeSession)
 
@@ -127,13 +90,7 @@ class SpeculativeSessionFactoryTest {
     @Test
     fun `clears speculative session on crash`() {
         val factory = SpeculativeSessionFactory()
-        factory.create(
-            runtime = runtime,
-            private = true,
-            contextId = null,
-            defaultSettings = mock(),
-            downloadFileUtils = FakeDownloadFileUtils(),
-            )
+        factory.create(runtime = runtime, private = true, contextId = null, defaultSettings = mock())
         assertTrue(factory.hasSpeculativeSession())
         val speculativeSession = factory.speculativeEngineSession
 
@@ -146,13 +103,7 @@ class SpeculativeSessionFactoryTest {
     @Test
     fun `clears speculative session when process is killed`() {
         val factory = SpeculativeSessionFactory()
-        factory.create(
-            runtime = runtime,
-            private = true,
-            contextId = null,
-            defaultSettings = mock(),
-            downloadFileUtils = FakeDownloadFileUtils(),
-            )
+        factory.create(runtime = runtime, private = true, contextId = null, defaultSettings = mock())
         assertTrue(factory.hasSpeculativeSession())
         val speculativeSession = factory.speculativeEngineSession
 
@@ -165,13 +116,7 @@ class SpeculativeSessionFactoryTest {
     @Test
     fun `clear unregisters observer and closes session`() {
         val factory = SpeculativeSessionFactory()
-        factory.create(
-            runtime = runtime,
-            private = true,
-            contextId = null,
-            defaultSettings = mock(),
-            downloadFileUtils = FakeDownloadFileUtils(),
-            )
+        factory.create(runtime = runtime, private = true, contextId = null, defaultSettings = mock())
         assertTrue(factory.hasSpeculativeSession())
         val speculativeSession = factory.speculativeEngineSession
         assertTrue(speculativeSession!!.engineSession.isObserved())
diff --git a/mobile/android/android-components/components/browser/engine-system/src/main/java/mozilla/components/browser/engine/system/SystemEngineView.kt b/mobile/android/android-components/components/browser/engine-system/src/main/java/mozilla/components/browser/engine/system/SystemEngineView.kt
index b5f9deb79e8a9..2f5d8708312b7 100644
--- a/mobile/android/android-components/components/browser/engine-system/src/main/java/mozilla/components/browser/engine/system/SystemEngineView.kt
+++ b/mobile/android/android-components/components/browser/engine-system/src/main/java/mozilla/components/browser/engine/system/SystemEngineView.kt
@@ -10,7 +10,6 @@ import android.content.res.Resources
 import android.graphics.Bitmap
 import android.net.Uri
 import android.net.http.SslError
-import android.os.Environment
 import android.os.Handler
 import android.os.Message
 import android.util.AttributeSet
@@ -63,7 +62,7 @@ import mozilla.components.concept.storage.PageVisit
 import mozilla.components.concept.storage.VisitType
 import mozilla.components.support.ktx.android.view.getRectWithViewLocation
 import mozilla.components.support.ktx.kotlin.tryGetHostFromUrl
-import mozilla.components.support.utils.DefaultDownloadFileUtils
+import mozilla.components.support.utils.DownloadUtils
 
 /**
  * WebView-based implementation of EngineView.
@@ -595,23 +594,14 @@ class SystemEngineView @JvmOverloads constructor(
 
     internal fun createDownloadListener(): DownloadListener {
         return DownloadListener { url, userAgent, contentDisposition, mimetype, contentLength ->
-            session?.let { session ->
-                session.internalNotifyObservers {
-                    val fileName = DefaultDownloadFileUtils(
-                        context = context,
-                        downloadLocationGetter = {
-                            Environment.getExternalStoragePublicDirectory(
-                                Environment.DIRECTORY_DOWNLOADS,
-                            ).path
-                        },
-                    ).guessFileName(
-                        contentDisposition = contentDisposition,
-                        url = url,
-                        mimeType = mimetype,
-                    )
-                    val cookie = CookieManager.getInstance().getCookie(url)
-                    onExternalResource(url, fileName, contentLength, mimetype, cookie, userAgent)
-                }
+            session?.internalNotifyObservers {
+                val fileName = DownloadUtils.guessFileName(
+                    contentDisposition = contentDisposition,
+                    url = url,
+                    mimeType = mimetype,
+                )
+                val cookie = CookieManager.getInstance().getCookie(url)
+                onExternalResource(url, fileName, contentLength, mimetype, cookie, userAgent)
             }
         }
     }
diff --git a/mobile/android/android-components/components/feature/downloads/build.gradle b/mobile/android/android-components/components/feature/downloads/build.gradle
index 5040536abfe3d..bdc59260f6874 100644
--- a/mobile/android/android-components/components/feature/downloads/build.gradle
+++ b/mobile/android/android-components/components/feature/downloads/build.gradle
@@ -68,7 +68,6 @@ dependencies {
     testImplementation libs.robolectric
 
     androidTestImplementation project(':components:support-android-test')
-    testImplementation testFixtures(project(':components:support-utils'))
 
     androidTestImplementation libs.androidx.arch.core.testing
     androidTestImplementation libs.androidx.room.testing
diff --git a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt
index 4cefb6168a581..f59b7d057cdb7 100644
--- a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt
@@ -74,7 +74,6 @@ import mozilla.components.support.base.log.logger.Logger
 import mozilla.components.support.ktx.kotlin.ifNullOrEmpty
 import mozilla.components.support.ktx.kotlin.sanitizeURL
 import mozilla.components.support.ktx.kotlinx.coroutines.throttleLatest
-import mozilla.components.support.utils.DownloadFileUtils
 import mozilla.components.support.utils.DownloadUtils
 import mozilla.components.support.utils.ext.registerReceiverCompat
 import mozilla.components.support.utils.ext.stopForegroundCompat
@@ -117,8 +116,6 @@ abstract class AbstractFetchDownloadService : Service() {
     protected abstract val fileSizeFormatter: FileSizeFormatter
     protected abstract val downloadEstimator: DownloadEstimator
 
-    protected abstract val downloadFileUtils: DownloadFileUtils
-
     // TODO Move this to browser store and make immutable:
     // https://github.com/mozilla-mobile/android-components/issues/7050
     internal data class DownloadJobState(
@@ -718,11 +715,7 @@ abstract class AbstractFetchDownloadService : Service() {
 
         response.body.useStream { inStream ->
             var copyInChuckStatus: CopyInChuckStatus? = null
-            val newDownloadState = download.withResponse(
-                headers = response.headers,
-                downloadFileUtils = downloadFileUtils,
-                stream = inStream,
-            )
+            val newDownloadState = download.withResponse(response.headers, inStream)
             currentDownloadJobState.state = newDownloadState
 
             useFileStream(newDownloadState, isResumingDownload) { outStream ->
diff --git a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadDialogFragment.kt b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadDialogFragment.kt
index 75ddb66998b70..98288fa67a06a 100644
--- a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadDialogFragment.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadDialogFragment.kt
@@ -7,6 +7,7 @@ package mozilla.components.feature.downloads
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatDialogFragment
 import mozilla.components.browser.state.state.content.DownloadState
+import mozilla.components.feature.downloads.ext.realFilenameOrGuessed
 
 /**
  * This is a general representation of a dialog meant to be used in collaboration with [DownloadsFeature]
@@ -28,9 +29,9 @@ abstract class DownloadDialogFragment : AppCompatDialogFragment() {
     /**
      * Add the metadata of this download object to the arguments of this fragment.
      */
-    fun setDownload(download: DownloadState, fileName: String) {
+    fun setDownload(download: DownloadState) {
         val args = arguments ?: Bundle()
-        args.putString(KEY_FILE_NAME, fileName)
+        args.putString(KEY_FILE_NAME, download.realFilenameOrGuessed)
         args.putString(KEY_URL, download.url)
         args.putLong(KEY_CONTENT_LENGTH, download.contentLength ?: 0)
         arguments = args
diff --git a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt
index 33b9b1351e628..41a29d466e2c3 100644
--- a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt
@@ -9,7 +9,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.content.pm.ResolveInfo
-import android.os.Environment
 import android.widget.Toast
 import androidx.annotation.ColorRes
 import androidx.annotation.VisibleForTesting
@@ -26,7 +25,7 @@ import mozilla.components.browser.state.state.content.DownloadState
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.feature.downloads.DownloadDialogFragment.Companion.FRAGMENT_TAG
 import mozilla.components.feature.downloads.dialog.DeniedPermissionDialogFragment
-import mozilla.components.feature.downloads.ext.getRealFilenameOrGuessed
+import mozilla.components.feature.downloads.ext.realFilenameOrGuessed
 import mozilla.components.feature.downloads.facts.emitPromptDismissedFact
 import mozilla.components.feature.downloads.facts.emitPromptDisplayedFact
 import mozilla.components.feature.downloads.manager.AndroidDownloadManager
@@ -44,8 +43,6 @@ import mozilla.components.support.ktx.android.content.appName
 import mozilla.components.support.ktx.android.content.isPermissionGranted
 import mozilla.components.support.ktx.kotlin.isSameOriginAs
 import mozilla.components.support.utils.Browsers
-import mozilla.components.support.utils.DefaultDownloadFileUtils
-import mozilla.components.support.utils.DownloadFileUtils
 import mozilla.components.support.utils.ext.packageManagerCompatHelper
 
 /**
@@ -134,15 +131,7 @@ class DownloadsFeature(
     private val fileSystemHelper: FileSystemHelper = DefaultFileSystemHelper(),
     override var onNeedToRequestPermissions: OnNeedToRequestPermissions = { },
     onDownloadStopped: onDownloadStopped = noop,
-    private val downloadFileUtils: DownloadFileUtils = DefaultDownloadFileUtils(
-        context = applicationContext,
-        downloadLocationGetter = {
-            Environment.getExternalStoragePublicDirectory(
-                Environment.DIRECTORY_DOWNLOADS,
-            ).path
-        },
-    ),
-    private val downloadManager: DownloadManager = AndroidDownloadManager(applicationContext, store, downloadFileUtils),
+    private val downloadManager: DownloadManager = AndroidDownloadManager(applicationContext, store),
     private val tabId: String? = null,
     private val fragmentManager: FragmentManager? = null,
     private val promptsStyling: PromptsStyling? = null,
@@ -269,7 +258,7 @@ class DownloadsFeature(
                     customFirstPartyDownloadDialog != null && !download.skipConfirmation -> {
                         val downloadWithSameEtag = findDownloadWithSameEtag(download)
                         customFirstPartyDownloadDialog.invoke(
-                            Filename(download.getRealFilenameOrGuessed(downloadFileUtils)),
+                            Filename(download.realFilenameOrGuessed),
                             ContentSize(download.contentLength ?: 0),
                             FileNameOfDuplicateIfAlreadyDownloaded(downloadWithSameEtag?.fileName),
                             PositiveActionCallback {
@@ -291,10 +280,7 @@ class DownloadsFeature(
                     }
 
                     fragmentManager != null && !download.skipConfirmation -> {
-                        showDownloadDialog(
-                            tab = tab,
-                            download = download,
-                        )
+                        showDownloadDialog(tab, download)
                         false
                     }
 
@@ -329,7 +315,7 @@ class DownloadsFeature(
 
         if (isDownloadBiggerThanAvailableSpace(download)) {
             fileHasNotEnoughStorageDialog.invoke(
-                Filename(download.getRealFilenameOrGuessed(downloadFileUtils)),
+                Filename(download.realFilenameOrGuessed),
             )
             download.sessionId?.let { useCases.cancelDownloadRequest.invoke(it, download.id) }
             return false
@@ -389,10 +375,7 @@ class DownloadsFeature(
         download: DownloadState,
         dialog: DownloadDialogFragment = getDownloadDialog(),
     ) {
-        dialog.setDownload(
-            download = download,
-            fileName = download.getRealFilenameOrGuessed(downloadFileUtils),
-        )
+        dialog.setDownload(download)
 
         dialog.onStartDownload = {
             startDownload(download)
diff --git a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/ext/DownloadState.kt b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/ext/DownloadState.kt
index 3ffd97a014856..9a146364e5762 100644
--- a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/ext/DownloadState.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/ext/DownloadState.kt
@@ -13,7 +13,7 @@ import mozilla.components.concept.fetch.Headers.Names.CONTENT_TYPE
 import mozilla.components.concept.fetch.Headers.Names.E_TAG
 import mozilla.components.support.ktx.kotlin.decode
 import mozilla.components.support.ktx.kotlin.sanitizeFileName
-import mozilla.components.support.utils.DownloadFileUtils
+import mozilla.components.support.utils.DownloadUtils
 import java.io.InputStream
 import java.net.URLConnection
 
@@ -26,14 +26,9 @@ internal fun DownloadState.isScheme(protocols: Iterable<String>): Boolean {
  * Returns a copy of the download with some fields filled in based on values from a response.
  *
  * @param headers Headers from the response.
- * @param downloadFileUtils [DownloadFileUtils] helper for handling download file operations.
  * @param stream Stream of the response body.
  */
-internal fun DownloadState.withResponse(
-    headers: Headers,
-    downloadFileUtils: DownloadFileUtils,
-    stream: InputStream?,
-): DownloadState {
+internal fun DownloadState.withResponse(headers: Headers, stream: InputStream?): DownloadState {
     val contentDisposition = headers[CONTENT_DISPOSITION]
     var contentType = this.contentType
     if (contentType == null && stream != null) {
@@ -44,11 +39,7 @@ internal fun DownloadState.withResponse(
     }
 
     val newFileName = if (fileName.isNullOrBlank()) {
-        downloadFileUtils.guessFileName(
-            contentDisposition = contentDisposition,
-            url = url,
-            mimeType = contentType,
-        )
+        DownloadUtils.guessFileName(contentDisposition, destinationDirectory, url, contentType)
     } else {
         fileName
     }
@@ -60,12 +51,5 @@ internal fun DownloadState.withResponse(
     )
 }
 
-internal fun DownloadState.getRealFilenameOrGuessed(
-    downloadFileUtils: DownloadFileUtils,
-): String {
-    return fileName ?: downloadFileUtils.guessFileName(
-        contentDisposition = null,
-        url = url,
-        mimeType = contentType,
-    )
-}
+internal val DownloadState.realFilenameOrGuessed
+    get() = fileName ?: DownloadUtils.guessFileName(null, destinationDirectory, url, contentType)
diff --git a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/manager/AndroidDownloadManager.kt b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/manager/AndroidDownloadManager.kt
index 8d0bbdc443553..173409553dd75 100644
--- a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/manager/AndroidDownloadManager.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/manager/AndroidDownloadManager.kt
@@ -15,7 +15,6 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.os.Build
 import android.os.Build.VERSION.SDK_INT
-import android.os.Environment
 import android.util.LongSparseArray
 import androidx.annotation.VisibleForTesting
 import androidx.core.content.ContextCompat
@@ -31,10 +30,9 @@ import mozilla.components.concept.fetch.Headers.Names.REFERRER
 import mozilla.components.concept.fetch.Headers.Names.USER_AGENT
 import mozilla.components.feature.downloads.AbstractFetchDownloadService
 import mozilla.components.feature.downloads.ext.isScheme
-import mozilla.components.support.utils.DownloadFileUtils
+import mozilla.components.support.utils.DownloadUtils
 import mozilla.components.support.utils.ext.getSerializableExtraCompat
 import mozilla.components.support.utils.ext.registerReceiverCompat
-import java.io.File
 
 typealias SystemDownloadManager = android.app.DownloadManager
 typealias SystemRequest = android.app.DownloadManager.Request
@@ -47,7 +45,6 @@ typealias SystemRequest = android.app.DownloadManager.Request
 class AndroidDownloadManager(
     private val applicationContext: Context,
     private val store: BrowserStore,
-    private val downloadFileUtils: DownloadFileUtils,
     override var onDownloadStopped: onDownloadStopped = noop,
 ) : BroadcastReceiver(), DownloadManager {
 
@@ -83,10 +80,7 @@ class AndroidDownloadManager(
 
         validatePermissionGranted(applicationContext)
 
-        val request = download.toAndroidRequest(
-            downloadFileUtils = downloadFileUtils,
-            cookie = cookie,
-        )
+        val request = download.toAndroidRequest(cookie)
         val downloadID = androidDownloadManager.enqueue(request)
         store.dispatch(DownloadAction.AddDownloadAction(download.copy(id = downloadID.toString())))
         downloadRequests[downloadID] = request
@@ -141,10 +135,7 @@ class AndroidDownloadManager(
     }
 }
 
-private fun DownloadState.toAndroidRequest(
-    downloadFileUtils: DownloadFileUtils,
-    cookie: String,
-): SystemRequest {
+private fun DownloadState.toAndroidRequest(cookie: String): SystemRequest {
     val request = SystemRequest(url.toUri())
         .setNotificationVisibility(VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
 
@@ -158,23 +149,12 @@ private fun DownloadState.toAndroidRequest(
         addRequestHeaderSafely(REFERRER, referrerUrl)
     }
 
-    val destinationDir = if (directoryPath.isBlank()) {
-        Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+    val fileName = if (fileName.isNullOrBlank()) {
+        DownloadUtils.guessFileName(null, destinationDirectory, url, contentType)
     } else {
-        File(directoryPath)
+        fileName
     }
-
-    val finalFileName = fileName?.takeUnless { it.isBlank() }
-        ?: downloadFileUtils.guessFileName(
-            contentDisposition = null,
-            url = url,
-            mimeType = contentType,
-        )
-
-    destinationDir.mkdirs()
-
-    val destinationFile = File(destinationDir, finalFileName)
-    request.setDestinationUri(destinationFile.toUri())
+    request.setDestinationInExternalPublicDir(destinationDirectory, fileName)
 
     return request
 }
diff --git a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/AbstractFetchDownloadServiceTest.kt b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/AbstractFetchDownloadServiceTest.kt
index 2de59270bc85c..2d69c16d265b5 100644
--- a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/AbstractFetchDownloadServiceTest.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/AbstractFetchDownloadServiceTest.kt
@@ -62,8 +62,6 @@ import mozilla.components.support.test.eq
 import mozilla.components.support.test.mock
 import mozilla.components.support.test.robolectric.testContext
 import mozilla.components.support.test.rule.MainCoroutineRule
-import mozilla.components.support.utils.DownloadFileUtils
-import mozilla.components.support.utils.FakeDownloadFileUtils
 import mozilla.components.support.utils.ext.stopForegroundCompat
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
@@ -123,8 +121,6 @@ class AbstractFetchDownloadServiceTest {
     private val fakeFileSizeFormatter: FileSizeFormatter = FakeFileSizeFormatter()
     private val fakeDateTimeProvider: DateTimeProvider = FakeDateTimeProvider()
     private val fakeDownloadEstimator: DownloadEstimator = DownloadEstimator(fakeDateTimeProvider)
-
-    private val fakeDownloadFileUtils: DownloadFileUtils = FakeDownloadFileUtils()
     private val fakePackageNameProvider: PackageNameProvider =
         FakePackageNameProvider("mozilla.components.feature.downloads.test")
 
@@ -149,7 +145,6 @@ class AbstractFetchDownloadServiceTest {
             override val notificationsDelegate = this@AbstractFetchDownloadServiceTest.notificationsDelegate
             override val fileSizeFormatter = fakeFileSizeFormatter
             override val downloadEstimator = fakeDownloadEstimator
-            override val downloadFileUtils = fakeDownloadFileUtils
             override val packageNameProvider = fakePackageNameProvider
             override val context: Context = testContext
         },
diff --git a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadDialogFragmentTest.kt b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadDialogFragmentTest.kt
index d12b58dc92ef1..e72da87a9c0df 100644
--- a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadDialogFragmentTest.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadDialogFragmentTest.kt
@@ -7,7 +7,6 @@ package mozilla.components.feature.downloads
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import mozilla.components.browser.state.state.content.DownloadState
 import mozilla.components.feature.downloads.DownloadDialogFragment.Companion.KEY_FILE_NAME
-import mozilla.components.support.utils.FakeDownloadFileUtils
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Before
@@ -35,7 +34,7 @@ class DownloadDialogFragmentTest {
 
     @Test
     fun `when setDownload must set download metadata`() {
-        dialog.setDownload(download, "5MB.zip")
+        dialog.setDownload(download)
 
         assertNotNull(dialog.arguments)
         val fileName = dialog.arguments!!.getString(KEY_FILE_NAME)
diff --git a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadsFeatureTest.kt b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadsFeatureTest.kt
index a57b44901c02a..e55b691518de0 100644
--- a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadsFeatureTest.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadsFeatureTest.kt
@@ -24,7 +24,6 @@ import mozilla.components.browser.state.state.createTab
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.feature.downloads.DownloadsUseCases.CancelDownloadRequestUseCase
 import mozilla.components.feature.downloads.DownloadsUseCases.ConsumeDownloadUseCase
-import mozilla.components.feature.downloads.ext.getRealFilenameOrGuessed
 import mozilla.components.feature.downloads.fake.FakeFileSystemHelper
 import mozilla.components.feature.downloads.manager.DownloadManager
 import mozilla.components.feature.downloads.ui.DownloadAppChooserDialog
@@ -37,7 +36,6 @@ import mozilla.components.support.test.robolectric.grantPermission
 import mozilla.components.support.test.robolectric.testContext
 import mozilla.components.support.test.rule.MainCoroutineRule
 import mozilla.components.support.test.whenever
-import mozilla.components.support.utils.FakeDownloadFileUtils
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
@@ -235,7 +233,7 @@ class DownloadsFeatureTest {
     fun `When starting a download an existing dialog is reused`() {
         grantPermissions()
 
-        val download = DownloadState(url = "https://www.mozilla.org", sessionId = "test-tab", fileName = "fileName")
+        val download = DownloadState(url = "https://www.mozilla.org", sessionId = "test-tab")
         store.dispatch(ContentAction.UpdateDownloadAction("test-tab", download))
 
         val dialogFragment: DownloadDialogFragment = mock()
@@ -256,14 +254,11 @@ class DownloadsFeatureTest {
         )
 
         val tab = store.state.findTab("test-tab")
-        feature.showDownloadDialog(
-            tab = tab!!,
-            download = download,
-        )
+        feature.showDownloadDialog(tab!!, download)
 
         verify(dialogFragment).onStartDownload = any()
         verify(dialogFragment).onCancelDownload = any()
-        verify(dialogFragment).setDownload(any(), eq(download.getRealFilenameOrGuessed(FakeDownloadFileUtils())))
+        verify(dialogFragment).setDownload(download)
         verify(dialogFragment, never()).showNow(any(), any())
     }
 
@@ -291,10 +286,7 @@ class DownloadsFeatureTest {
 
         val tab = store.state.findTab("test-tab")
 
-        feature.showDownloadDialog(
-            tab = tab!!,
-            download = download,
-        )
+        feature.showDownloadDialog(tab!!, download)
 
         dialogFragment.onCancelDownload()
         verify(closeDownloadResponseUseCase).invoke(anyString(), anyString())
@@ -542,11 +534,7 @@ class DownloadsFeatureTest {
         doReturn(false).`when`(feature).isAlreadyADownloadDialog()
         doReturn(true).`when`(fragmentManager).isDestroyed
 
-        feature.showDownloadDialog(
-            tab = mock(),
-            download = mock(),
-            dialog = dialog,
-        )
+        feature.showDownloadDialog(mock(), mock(), dialog)
 
         verify(dialog, never()).showNow(fragmentManager, DownloadDialogFragment.FRAGMENT_TAG)
     }
diff --git a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/ext/DownloadStateKtTest.kt b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/ext/DownloadStateKtTest.kt
index 7d204c7dfde3d..4f6dac6e69a8f 100644
--- a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/ext/DownloadStateKtTest.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/ext/DownloadStateKtTest.kt
@@ -6,9 +6,7 @@ package mozilla.components.feature.downloads.ext
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import mozilla.components.browser.state.state.content.DownloadState
-import mozilla.components.support.test.robolectric.testContext
-import mozilla.components.support.utils.DefaultDownloadFileUtils
-import mozilla.components.support.utils.FakeDownloadFileUtils
+import mozilla.components.support.utils.DownloadUtils
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotEquals
@@ -24,13 +22,11 @@ class DownloadStateKtTest {
             url = "url",
             fileName = null,
         )
-        val fakeUtils = FakeDownloadFileUtils()
-
         val expectedName = with(download) {
-            fakeUtils.guessFileName(null, url, contentType)
+            DownloadUtils.guessFileName(null, destinationDirectory, url, contentType)
         }
 
-        val result = download.getRealFilenameOrGuessed(fakeUtils)
+        val result = download.realFilenameOrGuessed
 
         assertEquals(expectedName, result)
     }
@@ -43,13 +39,10 @@ class DownloadStateKtTest {
             contentType = "image/jpeg",
         )
         val guessedName = with(download) {
-            DefaultDownloadFileUtils(
-                testContext,
-                downloadLocationGetter = { "downloads" },
-            ).guessFileName(null, url, contentType)
+            DownloadUtils.guessFileName(null, destinationDirectory, url, contentType)
         }
 
-        val result = download.fileName
+        val result = download.realFilenameOrGuessed
 
         assertEquals("test", result)
         assertNotEquals(guessedName, result)
diff --git a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/manager/AndroidDownloadManagerTest.kt b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/manager/AndroidDownloadManagerTest.kt
index 5ea14a615eade..1c64849fd11d0 100644
--- a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/manager/AndroidDownloadManagerTest.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/manager/AndroidDownloadManagerTest.kt
@@ -18,7 +18,6 @@ import mozilla.components.feature.downloads.AbstractFetchDownloadService.Compani
 import mozilla.components.support.test.mock
 import mozilla.components.support.test.robolectric.grantPermission
 import mozilla.components.support.test.robolectric.testContext
-import mozilla.components.support.utils.FakeDownloadFileUtils
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
@@ -49,11 +48,7 @@ class AndroidDownloadManagerTest {
             userAgent = "Mozilla/5.0 (Linux; Android 7.1.1) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Focus/8.0 Chrome/69.0.3497.100 Mobile Safari/537.36",
         )
         store = BrowserStore()
-        downloadManager = AndroidDownloadManager(
-            applicationContext = testContext,
-            store = store,
-            downloadFileUtils = FakeDownloadFileUtils(),
-            )
+        downloadManager = AndroidDownloadManager(testContext, store)
     }
 
     @Test(expected = SecurityException::class)
@@ -108,13 +103,7 @@ class AndroidDownloadManagerTest {
 
     @Test
     fun `GIVEN a device that supports scoped storage THEN permissions must not included file access`() {
-        val downloadManager = spy(
-            AndroidDownloadManager(
-            applicationContext = testContext,
-            store = store,
-            downloadFileUtils = FakeDownloadFileUtils(),
-        ),
-        )
+        val downloadManager = spy(AndroidDownloadManager(testContext, store))
 
         doReturn(Build.VERSION_CODES.Q).`when`(downloadManager).getSDKVersion()
         println(downloadManager.permissions.joinToString { it })
@@ -123,13 +112,7 @@ class AndroidDownloadManagerTest {
 
     @Test
     fun `GIVEN a device does not supports scoped storage THEN permissions must be included file access`() {
-        val downloadManager = spy(
-            AndroidDownloadManager(
-            applicationContext = testContext,
-            store = store,
-            downloadFileUtils = FakeDownloadFileUtils(),
-        ),
-        )
+        val downloadManager = spy(AndroidDownloadManager(testContext, store))
 
         doReturn(Build.VERSION_CODES.P).`when`(downloadManager).getSDKVersion()
 
diff --git a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/manager/FetchDownloadManagerTest.kt b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/manager/FetchDownloadManagerTest.kt
index 5b689d647ba15..cb3978556dd46 100644
--- a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/manager/FetchDownloadManagerTest.kt
+++ b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/manager/FetchDownloadManagerTest.kt
@@ -30,8 +30,6 @@ import mozilla.components.support.test.any
 import mozilla.components.support.test.mock
 import mozilla.components.support.test.robolectric.grantPermission
 import mozilla.components.support.test.robolectric.testContext
-import mozilla.components.support.utils.DownloadFileUtils
-import mozilla.components.support.utils.FakeDownloadFileUtils
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
@@ -321,7 +319,6 @@ class FetchDownloadManagerTest {
         override val downloadEstimator: DownloadEstimator = DownloadEstimator(
             FakeDateTimeProvider(),
         )
-        override val downloadFileUtils: DownloadFileUtils = FakeDownloadFileUtils()
         override val packageNameProvider = FakePackageNameProvider("org.mozilla.fenix.test")
     }
 }
diff --git a/mobile/android/android-components/components/support/utils/build.gradle b/mobile/android/android-components/components/support/utils/build.gradle
index b94ceb9bf6bcc..975afb17ed7dd 100644
--- a/mobile/android/android-components/components/support/utils/build.gradle
+++ b/mobile/android/android-components/components/support/utils/build.gradle
@@ -15,9 +15,6 @@ android {
         compose = true
     }
     namespace = 'mozilla.components.support.utils'
-    testFixtures {
-        enable = true
-    }
 }
 
 dependencies {
@@ -30,13 +27,11 @@ dependencies {
     implementation libs.androidx.activity.compose
     implementation libs.androidx.annotation
     implementation platform(libs.androidx.compose.bom)
-    implementation libs.androidx.compose.runtime.saveable
     implementation libs.androidx.compose.foundation
     implementation libs.androidx.compose.ui
     implementation libs.androidx.core
     implementation libs.androidx.core.ktx
     implementation libs.kotlinx.coroutines
-    implementation libs.androidx.documentfile
 
     testImplementation project(":components:support-test")
 
@@ -44,9 +39,6 @@ dependencies {
     testImplementation libs.androidx.test.junit
     testImplementation libs.kotlinx.coroutines.test
     testImplementation libs.robolectric
-
-    testFixturesImplementation platform(libs.androidx.compose.bom)
-    testFixturesImplementation libs.androidx.compose.runtime.saveable
 }
 
 apply from: '../../../common-config.gradle'
diff --git a/mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DefaultDownloadFileUtils.kt b/mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DefaultDownloadFileUtils.kt
deleted file mode 100644
index 8d248f4c68e0a..0000000000000
--- a/mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DefaultDownloadFileUtils.kt
+++ /dev/null
@@ -1,169 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package mozilla.components.support.utils
-
-import android.content.Context
-import android.net.Uri
-import android.os.Build
-import android.provider.MediaStore
-import androidx.core.net.toUri
-import androidx.documentfile.provider.DocumentFile
-import mozilla.components.support.base.log.logger.Logger
-import mozilla.components.support.utils.DownloadUtils.changeExtension
-import mozilla.components.support.utils.DownloadUtils.createExtension
-import mozilla.components.support.utils.DownloadUtils.extractFileNameFromUrl
-import mozilla.components.support.utils.DownloadUtils.findFileInMediaStore
-import mozilla.components.support.utils.DownloadUtils.isDefaultDownloadDirectory
-import mozilla.components.support.utils.DownloadUtils.sanitizeMimeType
-import mozilla.components.support.utils.DownloadUtils.truncateFileName
-import java.io.File
-
-/**
- * The default implementation of [DownloadFileUtils].
- *
- * @param context The application context.
- * @param downloadLocationGetter A lambda providing the current directory path for downloads.
- */
-class DefaultDownloadFileUtils(
-    private val context: Context,
-    private val downloadLocationGetter: () -> String,
-) : DownloadFileUtils {
-    private val logger = Logger("DefaultDownloadFileUtils")
-
-    /**
-     * Keep aligned with desktop generic content types:
-     * https://searchfox.org/mozilla-central/source/browser/components/downloads/DownloadsCommon.jsm#208
-     */
-    private val genericContentTypes = arrayOf(
-        "application/octet-stream",
-        "binary/octet-stream",
-        "application/unknown",
-    )
-
-    companion object {
-        private const val SCHEME_CONTENT = "content://"
-    }
-
-    override fun guessFileName(
-        contentDisposition: String?,
-        url: String?,
-        mimeType: String?,
-    ): String {
-        // Split fileName between base and extension
-        // Add an extension if filename does not have one
-        val extractedFileName = extractFileNameFromUrl(contentDisposition, url)
-        val sanitizedMimeType = sanitizeMimeType(mimeType)
-
-        val fileName = if (extractedFileName.contains('.')) {
-            if (genericContentTypes.contains(sanitizedMimeType)) {
-                extractedFileName
-            } else {
-                changeExtension(extractedFileName, sanitizedMimeType)
-            }
-        } else {
-            extractedFileName + createExtension(sanitizedMimeType)
-        }
-        return uniqueFileName(
-            directoryPath = downloadLocationGetter(),
-            fileName = fileName,
-        )
-    }
-
-    override fun findDownloadFileUri(fileName: String?, directoryPath: String): Uri? {
-        if (fileName == null) return null
-
-        return try {
-            if (directoryPath.isDefaultDownloadDirectory()) {
-                context.contentResolver.findFileInMediaStore(
-                    collection = downloadsCollectionUri,
-                    fileName = fileName,
-                )
-            } else {
-                findFileInSafDirectory(directoryPath, fileName)
-            }
-        } catch (e: SecurityException) {
-            logger.error("Security error finding download file URI for '$fileName': ${e.message}")
-            null
-        } catch (e: IllegalArgumentException) {
-            logger.error("Invalid argument finding download file URI for '$fileName': ${e.message}")
-            null
-        } catch (e: IllegalStateException) {
-            logger.error("State error finding download file URI for '$fileName': ${e.message}")
-            null
-        }
-    }
-
-    override fun fileExists(directoryPath: String, fileName: String?): Boolean {
-        return findDownloadFileUri(fileName, directoryPath) != null
-    }
-
-    override fun uniqueFileName(
-        directoryPath: String,
-        fileName: String,
-    ): String {
-        val file = File(fileName)
-        val (baseFileName, fileExtension) = truncateFileName(
-            baseFileName = file.nameWithoutExtension,
-            fileExtension = file.extension,
-            path = directoryPath,
-        )
-
-        var currentFileName = createFileName(baseFileName, fileExtension)
-        var copyVersionNumber = 1
-
-        while (fileExists(directoryPath, currentFileName)) {
-            currentFileName = createFileName(baseFileName, copyVersionNumber++, fileExtension)
-        }
-
-        return currentFileName
-    }
-
-    /**
-     * The appropriate content URI for the downloads collection, based on the Android SDK version.
-     */
-    private val downloadsCollectionUri: Uri
-        get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            MediaStore.Downloads.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
-        } else {
-            MediaStore.Files.getContentUri("external")
-        }
-
-    /**
-     * Finds a file within a directory tree selected via the Storage Access Framework (SAF).
-     *
-     * @param context The application context.
-     * @param directoryPath The 'content://' URI string of the directory tree.
-     * @param fileName The name of the file to find.
-     * @return The content Uri of the found file, or `null` if not found or an error occurs.
-     */
-    private fun findFileInSafDirectory(
-        directoryPath: String,
-        fileName: String,
-    ): Uri? {
-        check(directoryPath.startsWith(SCHEME_CONTENT)) { "directoryPath must be a content URI" }
-
-        return try {
-            val directoryTreeUri = directoryPath.toUri()
-            val directory = DocumentFile.fromTreeUri(context, directoryTreeUri)
-
-            directory?.findFile(fileName)?.uri
-        } catch (e: SecurityException) {
-            logger.error("Security error finding file in SAF directory: ${e.message}")
-            null
-        } catch (e: IllegalArgumentException) {
-            logger.error("Invalid URI for SAF directory: ${e.message}")
-            null
-        }
-    }
-
-    private fun createFileName(fileName: String, fileExtension: String): String {
-        return if (fileExtension.isNotEmpty()) "$fileName.$fileExtension" else fileName
-    }
-
-    private fun createFileName(baseFileName: String, copyVersionNumber: Int, fileExtension: String): String {
-        val newName = "$baseFileName($copyVersionNumber)"
-        return if (fileExtension.isNotEmpty()) "$newName.$fileExtension" else newName
-    }
-}
diff --git a/mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DownloadFileUtils.kt b/mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DownloadFileUtils.kt
deleted file mode 100644
index 7019f6d7522d5..0000000000000
--- a/mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DownloadFileUtils.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package mozilla.components.support.utils
-
-import android.net.Uri
-
-/**
- * An interface for handling downloaded files, such as opening files,
- * creating intents, and resolving content types and URIs.
- */
-interface DownloadFileUtils {
-
-    /**
-     * Guess the name of the file that should be downloaded.
-     *
-     * This method is largely identical to [android.webkit.URLUtil.guessFileName]
-     * which unfortunately does not implement RFC 5987.
-     */
-    fun guessFileName(
-        contentDisposition: String?,
-        url: String?,
-        mimeType: String?,
-    ): String
-
-    /**
-     * Finds the content URI for a downloaded file.
-     *
-     * @param fileName The name of the file to find.
-     * @param directoryPath The directory where the file is located.
-     * @return The content [Uri] of the file, or `null` if it cannot be found.
-     */
-    fun findDownloadFileUri(fileName: String?, directoryPath: String): Uri?
-
-    /**
-     * Checks if a file exists in the specified directory.
-     *
-     * @param directoryPath The path or content URI of the directory.
-     * @param fileName The name of the file to check.
-     */
-    fun fileExists(directoryPath: String, fileName: String?): Boolean
-
-    /**
-     * Generates a unique file name for a given directory to avoid overwriting existing files.
-     * This function handles both standard file paths and Storage Access Framework (SAF) URIs.
-     *
-     * @param directoryPath The path or content URI of the target directory.
-     * @param fileName The desired initial file name (e.g., "document.pdf").
-     * @return A unique file name (e.g., "document (1).pdf").
-     */
-    fun uniqueFileName(
-        directoryPath: String,
-        fileName: String,
-    ): String
-}
diff --git a/mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DownloadUtils.kt b/mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DownloadUtils.kt
index 8e6ce3aeb1a87..e725db7064287 100644
--- a/mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DownloadUtils.kt
+++ b/mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/DownloadUtils.kt
@@ -4,11 +4,8 @@
 
 package mozilla.components.support.utils
 
-import android.content.ContentResolver
-import android.content.ContentUris
 import android.net.Uri
 import android.os.Environment
-import android.provider.MediaStore
 import android.webkit.MimeTypeMap
 import mozilla.components.support.utils.DownloadUtils.CONTENT_DISPOSITION_TYPE
 import mozilla.components.support.utils.DownloadUtils.fileNameAsteriskContentDispositionPattern
@@ -136,6 +133,16 @@ object DownloadUtils {
      */
     private val encodedSymbolPattern = Pattern.compile("%[0-9a-f]{2}|[0-9a-z!#$&+-.^_`|~]", Pattern.CASE_INSENSITIVE)
 
+    /**
+     * Keep aligned with desktop generic content types:
+     * https://searchfox.org/mozilla-central/source/browser/components/downloads/DownloadsCommon.jsm#208
+     */
+    private val GENERIC_CONTENT_TYPES = arrayOf(
+        "application/octet-stream",
+        "binary/octet-stream",
+        "application/unknown",
+    )
+
     /**
      * Maximum number of characters for the title length.
      *
@@ -167,13 +174,43 @@ object DownloadUtils {
      */
     private const val MIN_FILE_NAME_LENGTH = 5
 
-    private const val SCHEME_CONTENT = "content://"
-
     /**
      * The HTTP response code for a successful request.
      */
     const val RESPONSE_CODE_SUCCESS = 200
 
+    /**
+     * Guess the name of the file that should be downloaded.
+     *
+     * This method is largely identical to [android.webkit.URLUtil.guessFileName]
+     * which unfortunately does not implement RFC 5987.
+     */
+
+    @JvmStatic
+    fun guessFileName(
+        contentDisposition: String?,
+        destinationDirectory: String = Environment.DIRECTORY_DOWNLOADS,
+        url: String?,
+        mimeType: String?,
+    ): String {
+        // Split fileName between base and extension
+        // Add an extension if filename does not have one
+        val extractedFileName = extractFileNameFromUrl(contentDisposition, url)
+        val sanitizedMimeType = sanitizeMimeType(mimeType)
+
+        val fileName = if (extractedFileName.contains('.')) {
+            if (GENERIC_CONTENT_TYPES.contains(sanitizedMimeType)) {
+                extractedFileName
+            } else {
+                changeExtension(extractedFileName, sanitizedMimeType)
+            }
+        } else {
+            extractedFileName + createExtension(sanitizedMimeType)
+        }
+
+        return uniqueFileName(Environment.getExternalStoragePublicDirectory(destinationDirectory), fileName)
+    }
+
     // Some site add extra information after the mimetype, for example 'application/pdf; qs=0.001'
     // we just want to extract the mimeType and ignore the rest.
     fun sanitizeMimeType(mimeType: String?): String? {
@@ -190,6 +227,26 @@ object DownloadUtils {
             )?.trim()
     }
 
+    /**
+     * Checks if the file exists so as not to overwrite one already in the destination directory
+     */
+    fun uniqueFileName(directory: File, fileName: String): String {
+        val file = File(fileName)
+        val (baseFileName, fileExtension) = truncateFileName(
+            baseFileName = file.nameWithoutExtension,
+            fileExtension = file.extension,
+            path = directory.absolutePath,
+        )
+
+        var potentialFileName = File(directory, createFileName(fileName = baseFileName, fileExtension = fileExtension))
+        var copyVersionNumber = 1
+        while (potentialFileName.exists()) {
+            potentialFileName = File(directory, createFileName(baseFileName, copyVersionNumber++, fileExtension))
+        }
+
+        return potentialFileName.name
+    }
+
     /**
      * Truncates the file name if its length, combined with the directory path and file extension,
      * exceeds the maximum allowable path length. If the file extension is too long, it is removed entirely.
@@ -257,14 +314,7 @@ object DownloadUtils {
             }
     }
 
-    /**
-     * Extracts a file name from either the Content-Disposition header or the URL.
-     *
-     * @param contentDisposition The 'Content-Disposition' HTTP header value, if available.
-     * @param url The URL from which the file is being downloaded.
-     * @return The extracted file name or a default fallback name.
-     */
-    fun extractFileNameFromUrl(contentDisposition: String?, url: String?): String {
+    private fun extractFileNameFromUrl(contentDisposition: String?, url: String?): String {
         var filename: String? = null
 
         // Extract file name from content disposition header field
@@ -294,10 +344,10 @@ object DownloadUtils {
             val fileName = parseContentDispositionWithFileName(contentDisposition)
                 ?: parseContentDispositionWithFileNameAsterisk(contentDisposition)
             Uri.decode(fileName)
-        } catch (_: IllegalStateException) {
+        } catch (ex: IllegalStateException) {
             // This function is defined as returning null when it can't parse the header
             null
-        } catch (_: UnsupportedEncodingException) {
+        } catch (ex: UnsupportedEncodingException) {
             // Do nothing
             null
         }
@@ -312,7 +362,7 @@ object DownloadUtils {
             val unencodedFileName = contentDisposition.substring(startIndex)
             val indexOfNextSemicolon = unencodedFileName.indexOf(';')
             if (indexOfNextSemicolon != -1) {
-                return unencodedFileName.take(indexOfNextSemicolon)
+                return unencodedFileName.substring(0, indexOfNextSemicolon)
             }
             return unencodedFileName
         }
@@ -390,7 +440,7 @@ object DownloadUtils {
     /**
      * Compare the filename extension with the mime type and change it if necessary.
      */
-    fun changeExtension(filename: String, providedMimeType: String?): String {
+    private fun changeExtension(filename: String, providedMimeType: String?): String {
         val file = File(filename)
         val mimeTypeMap = MimeTypeMap.getSingleton()
         val extensionFromMimeType = getExtensionFromMimeType(providedMimeType)
@@ -435,7 +485,7 @@ object DownloadUtils {
     /**
      * Guess the extension for a file using the mime type.
      */
-    fun createExtension(mimeType: String?): String {
+    private fun createExtension(mimeType: String?): String {
         var extension: String? = null
 
         if (mimeType != null) {
@@ -457,41 +507,4 @@ object DownloadUtils {
 
         return extension
     }
-
-    /**
-     * Checks if a file path corresponds to the default public "Downloads" directory.
-     *
-     * @return `true` if the path is the default downloads directory, `false` otherwise.
-     * It also returns `false` if the path is null, empty, or a "content://" URI.
-     */
-    fun String?.isDefaultDownloadDirectory(): Boolean {
-        if (this.isNullOrEmpty() || this.startsWith(SCHEME_CONTENT)) {
-            return false
-        }
-        val defaultDownloadsDir =
-            Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
-        return File(this).absolutePath == defaultDownloadsDir.absolutePath
-    }
-
-    /**
-     * Queries MediaStore to find a file by its display name within a given collection.
-     *
-     * @param collection The MediaStore collection to search in (e.g., MediaStore.Downloads.getContentUri(...)).
-     * @param fileName The display name of the file to find.
-     * @return The content [Uri] of the file if found, otherwise null.
-     */
-    fun ContentResolver.findFileInMediaStore(collection: Uri, fileName: String): Uri? {
-        val projection = arrayOf(MediaStore.Downloads._ID)
-        val selection = "${MediaStore.Downloads.DISPLAY_NAME} = ?"
-        val selectionArgs = arrayOf(fileName)
-
-        query(collection, projection, selection, selectionArgs, null)?.use { cursor ->
-            if (cursor.moveToFirst()) {
-                val idColumn = cursor.getColumnIndexOrThrow(MediaStore.Downloads._ID)
-                val id = cursor.getLong(idColumn)
-                return ContentUris.withAppendedId(collection, id)
-            }
-        }
-        return null
-    }
 }
diff --git a/mobile/android/android-components/components/support/utils/src/test/java/mozilla/components/support/utils/DefaultDownloadFileUtilsTest.kt b/mobile/android/android-components/components/support/utils/src/test/java/mozilla/components/support/utils/DefaultDownloadFileUtilsTest.kt
deleted file mode 100644
index aadb472c527ed..0000000000000
--- a/mobile/android/android-components/components/support/utils/src/test/java/mozilla/components/support/utils/DefaultDownloadFileUtilsTest.kt
+++ /dev/null
@@ -1,418 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package mozilla.components.support.utils
-
-import android.os.Environment
-import android.webkit.MimeTypeMap
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import mozilla.components.support.test.robolectric.testContext
-import org.junit.Assert.assertEquals
-import org.junit.Rule
-import org.junit.Test
-import org.junit.rules.TemporaryFolder
-import org.junit.runner.RunWith
-import org.mockito.Mockito.doReturn
-import org.mockito.Mockito.spy
-
-@RunWith(AndroidJUnit4::class)
-class DefaultDownloadFileUtilsTest {
-    @Rule
-    @JvmField
-    val folder = TemporaryFolder()
-
-    private val rootPath: String
-        get() = folder.root.path
-
-    val defaultDownloadFileUtils: DefaultDownloadFileUtils = DefaultDownloadFileUtils(
-        context = testContext,
-        downloadLocationGetter = {
-            rootPath
-        },
-    )
-
-    private fun assertContentDisposition(expected: String, contentDisposition: String) {
-        assertEquals(
-            expected,
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = contentDisposition,
-                url = null,
-                mimeType = null,
-            ),
-        )
-    }
-
-    @Test
-    fun guessFileName_contentDisposition() {
-        // Default file name
-        assertContentDisposition("downloadfile.bin", "")
-
-        CONTENT_DISPOSITION_TYPES.forEach { contentDisposition ->
-            // continuing with default filenames
-            assertContentDisposition("downloadfile.bin", contentDisposition)
-            assertContentDisposition("downloadfile.bin", "$contentDisposition;")
-            assertContentDisposition("downloadfile.bin", "$contentDisposition; filename")
-            assertContentDisposition("downloadfile.bin", "$contentDisposition; filename=")
-            assertContentDisposition("downloadfile.bin", "$contentDisposition; filename=\"\"")
-            assertContentDisposition("downloadfile.bin", "$contentDisposition; filename=.bin")
-
-            // Provided filename field
-            assertContentDisposition("filename.jpg", "$contentDisposition; filename=\"filename.jpg\"")
-            assertContentDisposition("file\"name.jpg", "$contentDisposition; filename=\"file\\\"name.jpg\"")
-            assertContentDisposition("file\\name.jpg", "$contentDisposition; filename=\"file\\\\name.jpg\"")
-            assertContentDisposition("file\\\"name.jpg", "$contentDisposition; filename=\"file\\\\\\\"name.jpg\"")
-            assertContentDisposition("filename.jpg", "$contentDisposition; filename=filename.jpg")
-            assertContentDisposition("filename.jpg", "$contentDisposition; filename=filename.jpg; foo")
-            assertContentDisposition("filename.jpg", "$contentDisposition; filename=\"filename.jpg\"; foo")
-            assertContentDisposition("file\nname.jpg", "$contentDisposition; filename=\"file%0Aname.jpg\"; foo")
-
-            // UTF-8 encoded filename* field
-            assertContentDisposition(
-                "\uD83E\uDD8A + x.jpg",
-                "$contentDisposition; filename=\"_.jpg\"; filename*=utf-8'en'%F0%9F%A6%8A%20+%20x.jpg",
-            )
-            assertContentDisposition(
-                "filename 的副本.jpg",
-                contentDisposition + ";filename=\"_.jpg\";" +
-                    "filename*=UTF-8''filename%20%E7%9A%84%E5%89%AF%E6%9C%AC.jpg",
-            )
-            assertContentDisposition(
-                "filename.jpg",
-                "$contentDisposition; filename=_.jpg; filename*=utf-8'en'filename.jpg",
-            )
-            // Wrong order of the "filename*" segment
-            assertContentDisposition(
-                "filename.jpg",
-                "$contentDisposition; filename*=utf-8'en'filename.jpg; filename=_.jpg",
-            )
-            // Semicolon at the end
-            assertContentDisposition(
-                "filename.jpg",
-                "$contentDisposition; filename*=utf-8'en'filename.jpg; foo",
-            )
-
-            // ISO-8859-1 encoded filename* field
-            assertContentDisposition(
-                "file' 'name.jpg",
-                "$contentDisposition; filename=\"_.jpg\"; filename*=iso-8859-1'en'file%27%20%27name.jpg",
-            )
-
-            assertContentDisposition("success.html", "$contentDisposition; filename*=utf-8''success.html; foo")
-            assertContentDisposition("success.html", "$contentDisposition; filename*=utf-8''success.html")
-            assertContentDisposition("Firefox v9.apk", "$contentDisposition; filename=\"Firefox v9.apk\"; filename*=utf-8''Firefox v9.apk")
-            assertContentDisposition("Firefox (v9).apk", "$contentDisposition; filename=\"Firefox (v9).apk\"; filename*=utf-8''Firefox%20%28v9%29.apk")
-        }
-    }
-
-    @Test
-    fun uniqueFilenameNoExtension() {
-        val spyUtils = spy(defaultDownloadFileUtils)
-
-        assertEquals("test", spyUtils.uniqueFileName(rootPath, "test"))
-
-        doReturn(true).`when`(spyUtils).fileExists(rootPath, "test")
-        assertEquals("test(1)", spyUtils.uniqueFileName(rootPath, "test"))
-
-        doReturn(true).`when`(spyUtils).fileExists(rootPath, "test")
-        doReturn(true).`when`(spyUtils).fileExists(rootPath, "test(1)")
-        assertEquals("test(2)", spyUtils.uniqueFileName(rootPath, "test"))
-    }
-
-    @Test
-    fun uniqueFilename() {
-        val spyUtils = spy(defaultDownloadFileUtils)
-
-        doReturn(true).`when`(spyUtils).fileExists(rootPath, "test.zip")
-
-        assertEquals("test(1).zip", spyUtils.uniqueFileName(rootPath, "test.zip"))
-
-        doReturn(true).`when`(spyUtils).fileExists(rootPath, "test.zip")
-        doReturn(true).`when`(spyUtils).fileExists(rootPath, "test(1).zip")
-
-        assertEquals("test(2).zip", spyUtils.uniqueFileName(rootPath, "test.zip"))
-    }
-
-    @Test
-    fun guessFilename() {
-        val spyUtils = spy(defaultDownloadFileUtils)
-
-        assertEquals(
-            "test.zip",
-            spyUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/test.zip",
-                mimeType = "application/zip",
-            ),
-        )
-
-        doReturn(true).`when`(spyUtils).fileExists(rootPath, "test.zip")
-        assertEquals(
-            "test(1).zip",
-            spyUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/test.zip",
-                mimeType = "application/zip",
-            ),
-        )
-
-        doReturn(true).`when`(spyUtils).fileExists(rootPath, "test.zip")
-        doReturn(true).`when`(spyUtils).fileExists(rootPath, "test(1).zip")
-        assertEquals(
-            "test(2).zip",
-            spyUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/test.zip",
-                mimeType = "application/zip",
-            ),
-        )
-    }
-
-    @Test
-    fun guessFileName_url() {
-        assertUrl(
-            expected = "downloadfile.bin",
-            url = "http://example.com/",
-        )
-        assertUrl(
-            expected = "downloadfile.bin",
-            url = "http://example.com/filename/",
-        )
-        assertUrl(
-            expected = "filename.jpg",
-            url = "http://example.com/filename.jpg",
-        )
-        assertUrl(
-            expected = "filename.jpg",
-            url = "http://example.com/foo/bar/filename.jpg",
-        )
-    }
-
-    @Test
-    fun guessFileName_mimeType() {
-        // Matches the first extension from official mapping: application/x-msdos-program -> com exe bat dll
-        assertEquals(
-            "com",
-            MimeTypeMap.getSingleton().getExtensionFromMimeType("application/x-msdos-program"),
-        )
-        assertEquals(
-            "application/x-msdos-program",
-            MimeTypeMap.getSingleton().getMimeTypeFromExtension("exe"),
-        )
-        assertEquals(
-            "application/x-msdos-program",
-            MimeTypeMap.getSingleton().getMimeTypeFromExtension("dll"),
-        )
-        assertEquals(
-            "application/x-msdos-program",
-            MimeTypeMap.getSingleton().getMimeTypeFromExtension("bat"),
-        )
-
-        assertEquals(
-            "file.jpg",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/file.jpg",
-                mimeType = "image/jpeg",
-            ),
-        )
-
-        // This is difference with URLUtil.guessFileName
-        assertEquals(
-            "file.bin.jpg",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/file.bin",
-                mimeType = "image/jpeg",
-            ),
-        )
-
-        assertEquals(
-            "Caesium-wahoo-v3.6-b792615ced1b.zip",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "https://download.msfjarvis.website/caesium/wahoo/beta/Caesium-wahoo-v3.6-b792615ced1b.zip",
-                mimeType = "application/zip",
-            ),
-        )
-        assertEquals(
-            "compressed.TAR.GZ",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/compressed.TAR.GZ",
-                mimeType = "application/gzip",
-            ),
-        )
-        assertEquals(
-            "file.html",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/file?abc",
-                mimeType = "text/html",
-            ),
-        )
-        assertEquals(
-            "file.html",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/file",
-                mimeType = "text/html",
-            ),
-        )
-        assertEquals(
-            "file.html",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/file",
-                mimeType = "text/html; charset=utf-8",
-            ),
-        )
-        assertEquals(
-            "file.txt.html",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/file.txt",
-                mimeType = "text/html",
-            ),
-        )
-        assertEquals(
-            "file.txt",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/file.txt",
-                mimeType = "text/plain",
-            ),
-        )
-        assertEquals(
-            "file.data",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/file.data",
-                mimeType = "application/octet-stream",
-            ),
-        )
-        assertEquals(
-            "file.data",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/file.data",
-                mimeType = "binary/octet-stream",
-            ),
-        )
-        assertEquals(
-            "file.data",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/file.data",
-                mimeType = "application/unknown",
-            ),
-        )
-
-        assertEquals(
-            "file.zip.jpg",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/file.zip",
-                mimeType = "image/jpeg",
-            ),
-        )
-
-        // extra information in content-type
-        assertEquals(
-            "file.jpg",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/file.jpg",
-                mimeType = "application/octet-stream; Charset=utf-8",
-            ),
-        )
-
-        // Should not change to file.dll
-        assertEquals(
-            "file.exe",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/file.exe",
-                mimeType = "application/x-msdos-program",
-            ),
-        )
-        assertEquals(
-            "file.exe",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/file.exe",
-                mimeType = "application/vnd.microsoft.portable-executable",
-            ),
-        )
-
-        // application/x-pdf with .pdf
-        assertEquals(
-            "file.pdf",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/file.pdf",
-                mimeType = "application/x-pdf",
-            ),
-        )
-
-        // application/x-pdf without extension
-        assertEquals(
-            "downloadfile.pdf",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/downloadfile",
-                mimeType = "application/x-pdf",
-            ),
-        )
-
-        // application/x-pdf with non-pdf extension
-        assertEquals(
-            "file.bin.pdf",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/file.bin",
-                mimeType = "application/x-pdf",
-            ),
-        )
-
-        assertEquals(
-            "file.bin.com",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/file.bin",
-                mimeType = "application/x-msdos-program",
-            ),
-        )
-
-        assertEquals(
-            "file.apks.zip",
-            defaultDownloadFileUtils.guessFileName(
-                contentDisposition = null,
-                url = "http://example.com/file.apks",
-                mimeType = "application/zip",
-            ),
-        )
-    }
-
-    companion object {
-        private val CONTENT_DISPOSITION_TYPES = listOf("attachment", "inline")
-
-        private fun assertUrl(expected: String, url: String) {
-            assertEquals(
-                expected,
-                DefaultDownloadFileUtils(
-                    context = testContext,
-                    downloadLocationGetter = {
-                        Environment.getExternalStoragePublicDirectory(
-                            Environment.DIRECTORY_DOWNLOADS,
-                        ).path
-                    },
-                ).guessFileName(
-                    contentDisposition = null,
-                    url = url,
-                    mimeType = null,
-                ),
-            )
-        }
-    }
-}
diff --git a/mobile/android/android-components/components/support/utils/src/test/java/mozilla/components/support/utils/DownloadUtilsTest.kt b/mobile/android/android-components/components/support/utils/src/test/java/mozilla/components/support/utils/DownloadUtilsTest.kt
index 5fd655c21d541..acf10c324746d 100644
--- a/mobile/android/android-components/components/support/utils/src/test/java/mozilla/components/support/utils/DownloadUtilsTest.kt
+++ b/mobile/android/android-components/components/support/utils/src/test/java/mozilla/components/support/utils/DownloadUtilsTest.kt
@@ -4,14 +4,401 @@
 
 package mozilla.components.support.utils
 
+import android.webkit.MimeTypeMap
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Assert.assertEquals
+import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.TemporaryFolder
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class DownloadUtilsTest {
 
+    @Rule @JvmField
+    val folder = TemporaryFolder()
+
+    private fun assertContentDisposition(expected: String, contentDisposition: String) {
+        assertEquals(
+            expected,
+            DownloadUtils.guessFileName(
+                contentDisposition = contentDisposition,
+                destinationDirectory = folder.root.path,
+                url = null,
+                mimeType = null,
+            ),
+        )
+    }
+
+    @Test
+    fun guessFileName_contentDisposition() {
+        // Default file name
+        assertContentDisposition("downloadfile.bin", "")
+
+        CONTENT_DISPOSITION_TYPES.forEach { contentDisposition ->
+            // continuing with default filenames
+            assertContentDisposition("downloadfile.bin", contentDisposition)
+            assertContentDisposition("downloadfile.bin", "$contentDisposition;")
+            assertContentDisposition("downloadfile.bin", "$contentDisposition; filename")
+            assertContentDisposition("downloadfile.bin", "$contentDisposition; filename=")
+            assertContentDisposition("downloadfile.bin", "$contentDisposition; filename=\"\"")
+            assertContentDisposition("downloadfile.bin", "$contentDisposition; filename=.bin")
+
+            // Provided filename field
+            assertContentDisposition("filename.jpg", "$contentDisposition; filename=\"filename.jpg\"")
+            assertContentDisposition("file\"name.jpg", "$contentDisposition; filename=\"file\\\"name.jpg\"")
+            assertContentDisposition("file\\name.jpg", "$contentDisposition; filename=\"file\\\\name.jpg\"")
+            assertContentDisposition("file\\\"name.jpg", "$contentDisposition; filename=\"file\\\\\\\"name.jpg\"")
+            assertContentDisposition("filename.jpg", "$contentDisposition; filename=filename.jpg")
+            assertContentDisposition("filename.jpg", "$contentDisposition; filename=filename.jpg; foo")
+            assertContentDisposition("filename.jpg", "$contentDisposition; filename=\"filename.jpg\"; foo")
+            assertContentDisposition("file\nname.jpg", "$contentDisposition; filename=\"file%0Aname.jpg\"; foo")
+
+            // UTF-8 encoded filename* field
+            assertContentDisposition(
+                "\uD83E\uDD8A + x.jpg",
+                "$contentDisposition; filename=\"_.jpg\"; filename*=utf-8'en'%F0%9F%A6%8A%20+%20x.jpg",
+            )
+            assertContentDisposition(
+                "filename 的副本.jpg",
+                contentDisposition + ";filename=\"_.jpg\";" +
+                    "filename*=UTF-8''filename%20%E7%9A%84%E5%89%AF%E6%9C%AC.jpg",
+            )
+            assertContentDisposition(
+                "filename.jpg",
+                "$contentDisposition; filename=_.jpg; filename*=utf-8'en'filename.jpg",
+            )
+            // Wrong order of the "filename*" segment
+            assertContentDisposition(
+                "filename.jpg",
+                "$contentDisposition; filename*=utf-8'en'filename.jpg; filename=_.jpg",
+            )
+            // Semicolon at the end
+            assertContentDisposition(
+                "filename.jpg",
+                "$contentDisposition; filename*=utf-8'en'filename.jpg; foo",
+            )
+
+            // ISO-8859-1 encoded filename* field
+            assertContentDisposition(
+                "file' 'name.jpg",
+                "$contentDisposition; filename=\"_.jpg\"; filename*=iso-8859-1'en'file%27%20%27name.jpg",
+            )
+
+            assertContentDisposition("success.html", "$contentDisposition; filename*=utf-8''success.html; foo")
+            assertContentDisposition("success.html", "$contentDisposition; filename*=utf-8''success.html")
+            assertContentDisposition("Firefox v9.apk", "$contentDisposition; filename=\"Firefox v9.apk\"; filename*=utf-8''Firefox v9.apk")
+            assertContentDisposition("Firefox (v9).apk", "$contentDisposition; filename=\"Firefox (v9).apk\"; filename*=utf-8''Firefox%20%28v9%29.apk")
+        }
+    }
+
+    @Test
+    fun uniqueFilenameNoExtension() {
+        assertEquals("test", DownloadUtils.uniqueFileName(folder.root, "test"))
+
+        folder.newFile("test")
+        assertEquals("test(1)", DownloadUtils.uniqueFileName(folder.root, "test"))
+
+        folder.newFile("test(1)")
+        assertEquals("test(2)", DownloadUtils.uniqueFileName(folder.root, "test"))
+    }
+
+    @Test
+    fun uniqueFilename() {
+        assertEquals("test.zip", DownloadUtils.uniqueFileName(folder.root, "test.zip"))
+
+        folder.newFile("test.zip")
+        assertEquals("test(1).zip", DownloadUtils.uniqueFileName(folder.root, "test.zip"))
+
+        folder.newFile("test(1).zip")
+        assertEquals("test(2).zip", DownloadUtils.uniqueFileName(folder.root, "test.zip"))
+    }
+
+    @Test
+    fun guessFilename() {
+        assertEquals(
+            "test.zip",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/test.zip",
+                mimeType = "application/zip",
+            ),
+        )
+
+        folder.newFile("test.zip")
+        assertEquals(
+            "test(1).zip",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/test.zip",
+                mimeType = "application/zip",
+            ),
+        )
+
+        folder.newFile("test(1).zip")
+        assertEquals(
+            "test(2).zip",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/test.zip",
+                mimeType = "application/zip",
+            ),
+        )
+    }
+
+    @Test
+    fun guessFileName_url() {
+        assertUrl(
+            destinationDirectory = folder.root.path,
+            expected = "downloadfile.bin",
+            url = "http://example.com/",
+        )
+        assertUrl(
+            destinationDirectory = folder.root.path,
+            expected = "downloadfile.bin",
+            url = "http://example.com/filename/",
+        )
+        assertUrl(
+            destinationDirectory = folder.root.path,
+            expected = "filename.jpg",
+            url = "http://example.com/filename.jpg",
+        )
+        assertUrl(
+            destinationDirectory = folder.root.path,
+            expected = "filename.jpg",
+            url = "http://example.com/foo/bar/filename.jpg",
+        )
+    }
+
+    @Test
+    fun guessFileName_mimeType() {
+        // Matches the first extension from official mapping: application/x-msdos-program -> com exe bat dll
+        assertEquals(
+            "com",
+            MimeTypeMap.getSingleton().getExtensionFromMimeType("application/x-msdos-program"),
+        )
+        assertEquals(
+            "application/x-msdos-program",
+            MimeTypeMap.getSingleton().getMimeTypeFromExtension("exe"),
+        )
+        assertEquals(
+            "application/x-msdos-program",
+            MimeTypeMap.getSingleton().getMimeTypeFromExtension("dll"),
+        )
+        assertEquals(
+            "application/x-msdos-program",
+            MimeTypeMap.getSingleton().getMimeTypeFromExtension("bat"),
+        )
+
+        assertEquals(
+            "file.jpg",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/file.jpg",
+                mimeType = "image/jpeg",
+            ),
+        )
+
+        // This is difference with URLUtil.guessFileName
+        assertEquals(
+            "file.bin.jpg",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/file.bin",
+                mimeType = "image/jpeg",
+            ),
+        )
+
+        assertEquals(
+            "Caesium-wahoo-v3.6-b792615ced1b.zip",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "https://download.msfjarvis.website/caesium/wahoo/beta/Caesium-wahoo-v3.6-b792615ced1b.zip",
+                mimeType = "application/zip",
+            ),
+        )
+        assertEquals(
+            "compressed.TAR.GZ",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/compressed.TAR.GZ",
+                mimeType = "application/gzip",
+            ),
+        )
+        assertEquals(
+            "file.html",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/file?abc",
+                mimeType = "text/html",
+            ),
+        )
+        assertEquals(
+            "file.html",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/file",
+                mimeType = "text/html",
+            ),
+        )
+        assertEquals(
+            "file.html",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/file",
+                mimeType = "text/html; charset=utf-8",
+            ),
+        )
+        assertEquals(
+            "file.txt.html",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/file.txt",
+                mimeType = "text/html",
+            ),
+        )
+        assertEquals(
+            "file.txt",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/file.txt",
+                mimeType = "text/plain",
+            ),
+        )
+        assertEquals(
+            "file.data",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/file.data",
+                mimeType = "application/octet-stream",
+            ),
+        )
+        assertEquals(
+            "file.data",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/file.data",
+                mimeType = "binary/octet-stream",
+            ),
+        )
+        assertEquals(
+            "file.data",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/file.data",
+                mimeType = "application/unknown",
+            ),
+        )
+
+        assertEquals(
+            "file.zip.jpg",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/file.zip",
+                mimeType = "image/jpeg",
+            ),
+        )
+
+        // extra information in content-type
+        assertEquals(
+            "file.jpg",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/file.jpg",
+                mimeType = "application/octet-stream; Charset=utf-8",
+            ),
+        )
+
+        // Should not change to file.dll
+        assertEquals(
+            "file.exe",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/file.exe",
+                mimeType = "application/x-msdos-program",
+            ),
+        )
+        assertEquals(
+            "file.exe",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/file.exe",
+                mimeType = "application/vnd.microsoft.portable-executable",
+            ),
+        )
+
+        // application/x-pdf with .pdf
+        assertEquals(
+            "file.pdf",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/file.pdf",
+                mimeType = "application/x-pdf",
+            ),
+        )
+
+        // application/x-pdf without extension
+        assertEquals(
+            "downloadfile.pdf",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/downloadfile",
+                mimeType = "application/x-pdf",
+            ),
+        )
+
+        // application/x-pdf with non-pdf extension
+        assertEquals(
+            "file.bin.pdf",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/file.bin",
+                mimeType = "application/x-pdf",
+            ),
+        )
+
+        assertEquals(
+            "file.bin.com",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                destinationDirectory = folder.root.path,
+                url = "http://example.com/file.bin",
+                mimeType = "application/x-msdos-program",
+            ),
+        )
+
+        assertEquals(
+            "file.apks.zip",
+            DownloadUtils.guessFileName(
+                contentDisposition = null,
+                url = "http://example.com/file.apks",
+                mimeType = "application/zip",
+            ),
+        )
+    }
+
     @Test
     fun sanitizeMimeType() {
         assertEquals("application/pdf", DownloadUtils.sanitizeMimeType("application/pdf; qs=0.001"))
@@ -90,4 +477,20 @@ class DownloadUtilsTest {
         assertEquals("a(1)", DownloadUtils.createFileName("a", 1))
         assertEquals("a(1)", DownloadUtils.createFileName("a", 1, ""))
     }
+
+    companion object {
+        private val CONTENT_DISPOSITION_TYPES = listOf("attachment", "inline")
+
+        private fun assertUrl(destinationDirectory: String, expected: String, url: String) {
+            assertEquals(
+                expected,
+                DownloadUtils.guessFileName(
+                    contentDisposition = null,
+                    destinationDirectory = destinationDirectory,
+                    url = url,
+                    mimeType = null,
+                ),
+            )
+        }
+    }
 }
diff --git a/mobile/android/android-components/components/support/utils/src/testFixtures/kotlin/mozilla/components/support/utils/FakeDownloadFileUtils.kt b/mobile/android/android-components/components/support/utils/src/testFixtures/kotlin/mozilla/components/support/utils/FakeDownloadFileUtils.kt
deleted file mode 100644
index 2153d96c8959e..0000000000000
--- a/mobile/android/android-components/components/support/utils/src/testFixtures/kotlin/mozilla/components/support/utils/FakeDownloadFileUtils.kt
+++ /dev/null
@@ -1,74 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package mozilla.components.support.utils
-
-import android.net.Uri
-import android.os.Environment
-import androidx.core.net.toUri
-import java.io.File
-
-/**
- * A fake implementation of [DownloadFileUtils] for testing purposes.
- *
- * This class allows faking the behavior of file-related operations during downloads
- * by providing lambdas for its primary functions.
- */
-class FakeDownloadFileUtils(
-    private val guessFileName: (
-        contentDisposition: String?,
-        url: String?,
-        mimeType: String?,
-    ) -> String = { _, _, _ -> "fileName" },
-    private val findDownloadFileUri: (
-        fileName: String?,
-        directoryPath: String,
-    ) -> Uri = { _, _ ->
-        Environment.getExternalStoragePublicDirectory(
-            Environment.DIRECTORY_DOWNLOADS,
-        ).path.toUri()
-    },
-    private val fileExists: (
-        directoryPath: String,
-        fileName: String?,
-    ) -> Boolean = { directoryPath, fileName ->
-        File(directoryPath, fileName ?: "").exists()
-    },
-    private val uniqueFileName: (
-        directoryPath: String,
-        fileName: String,
-    ) -> String = { directoryPath, fileName ->
-        "$directoryPath/$fileName"
-    },
-) : DownloadFileUtils {
-
-    override fun guessFileName(
-        contentDisposition: String?,
-        url: String?,
-        mimeType: String?,
-    ): String {
-        return guessFileName.invoke(contentDisposition, url, mimeType)
-    }
-
-    override fun findDownloadFileUri(
-        fileName: String?,
-        directoryPath: String,
-    ): Uri {
-        return findDownloadFileUri.invoke(fileName, directoryPath)
-    }
-
-    override fun fileExists(
-        directoryPath: String,
-        fileName: String?,
-    ): Boolean {
-        return fileExists.invoke(directoryPath, fileName)
-    }
-
-    override fun uniqueFileName(
-        directoryPath: String,
-        fileName: String,
-    ): String {
-        return uniqueFileName.invoke(directoryPath, fileName)
-    }
-}
diff --git a/mobile/android/android-components/docs/changelog.md b/mobile/android/android-components/docs/changelog.md
index 587f7f0dc8b57..d83e14f79011e 100644
--- a/mobile/android/android-components/docs/changelog.md
+++ b/mobile/android/android-components/docs/changelog.md
@@ -5,9 +5,6 @@ permalink: /changelog/
 ---
 
 # 149.0 (In Development)
-* **engine-gecko**
-  * ⚠️ **Breaking change**: Added `DownloadFileUtils` parameter to `GeckoServiceWorkerDelegate`,
-    `SpeculativeSessionFactory`, `GeckoEngine`, `AndroidDownloadManager` and `GeckoEngineSession` [Bug 2004990] (https://bugzilla.mozilla.org/show_bug.cgi?id=2004990)
 
 # 148.0
 * **support-utils**
diff --git a/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/downloads/DownloadService.kt b/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/downloads/DownloadService.kt
index 9ac55cd913421..7fab6c6e76753 100644
--- a/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/downloads/DownloadService.kt
+++ b/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/downloads/DownloadService.kt
@@ -4,7 +4,6 @@
 
 package org.mozilla.samples.browser.downloads
 
-import android.os.Environment
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.feature.downloads.AbstractFetchDownloadService
 import mozilla.components.feature.downloads.DefaultPackageNameProvider
@@ -12,8 +11,6 @@ import mozilla.components.feature.downloads.DownloadEstimator
 import mozilla.components.feature.downloads.FileSizeFormatter
 import mozilla.components.feature.downloads.PackageNameProvider
 import mozilla.components.support.base.android.NotificationsDelegate
-import mozilla.components.support.utils.DefaultDownloadFileUtils
-import mozilla.components.support.utils.DownloadFileUtils
 import org.mozilla.samples.browser.ext.components
 
 class DownloadService : AbstractFetchDownloadService() {
@@ -23,14 +20,4 @@ class DownloadService : AbstractFetchDownloadService() {
     override val fileSizeFormatter: FileSizeFormatter by lazy { components.fileSizeFormatter }
     override val downloadEstimator: DownloadEstimator by lazy { components.downloadEstimator }
     override val packageNameProvider: PackageNameProvider by lazy { DefaultPackageNameProvider(applicationContext) }
-    override val downloadFileUtils: DownloadFileUtils by lazy {
-        DefaultDownloadFileUtils(
-            context = applicationContext,
-            downloadLocationGetter = {
-                Environment.getExternalStoragePublicDirectory(
-                    Environment.DIRECTORY_DOWNLOADS,
-                ).path
-            },
-        )
-    }
 }
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index e1331d0affd7f..56818b93adddc 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -11,7 +11,6 @@ import android.content.Intent
 import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
-import android.os.Environment
 import android.os.storage.StorageManager
 import android.provider.Settings
 import android.util.Log
@@ -142,7 +141,6 @@ import mozilla.components.support.ktx.android.view.hideKeyboard
 import mozilla.components.support.ktx.kotlin.getOrigin
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged
 import mozilla.components.support.locale.ActivityContextWrapper
-import mozilla.components.support.utils.DefaultDownloadFileUtils
 import mozilla.components.ui.widgets.behavior.EngineViewClippingBehavior
 import mozilla.components.ui.widgets.withCenterAlignedButtons
 import mozilla.telemetry.glean.private.NoExtras
@@ -798,14 +796,6 @@ abstract class BaseBrowserFragment :
             useCases = context.components.useCases.downloadUseCases,
             fragmentManager = childFragmentManager,
             tabId = customTabSessionId,
-            downloadFileUtils = DefaultDownloadFileUtils(
-                context = context.applicationContext,
-                downloadLocationGetter = {
-                    Environment.getExternalStoragePublicDirectory(
-                        Environment.DIRECTORY_DOWNLOADS,
-                    ).path
-                },
-            ),
             downloadManager = FetchDownloadManager(
                 context.applicationContext,
                 store,
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt
index 3c86797cc021f..5cc1da059f7da 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt
@@ -6,7 +6,6 @@ package org.mozilla.fenix.components
 
 import android.content.Context
 import android.content.res.Configuration
-import android.os.Environment
 import androidx.core.content.ContextCompat
 import androidx.datastore.preferences.preferencesDataStore
 import kotlinx.coroutines.CoroutineScope
@@ -104,7 +103,6 @@ import mozilla.components.support.base.worker.Frequency
 import mozilla.components.support.ktx.android.content.appVersionName
 import mozilla.components.support.ktx.android.content.res.readJSONObject
 import mozilla.components.support.locale.LocaleManager
-import mozilla.components.support.utils.DefaultDownloadFileUtils
 import mozilla.components.support.utils.RunWhenReadyQueue
 import org.mozilla.fenix.AppRequestInterceptor
 import org.mozilla.fenix.BuildConfig
@@ -235,17 +233,9 @@ class Core(
         }
 
         GeckoEngine(
-            context = context,
-            defaultSettings = defaultSettings,
-            runtime = geckoRuntime,
-            downloadFileUtils = DefaultDownloadFileUtils(
-                context = context,
-                downloadLocationGetter = {
-                    Environment.getExternalStoragePublicDirectory(
-                        Environment.DIRECTORY_DOWNLOADS,
-                    ).path
-                },
-                ),
+            context,
+            defaultSettings,
+            geckoRuntime,
         ).also {
             WebCompatFeature.install(it)
         }
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/downloads/DownloadService.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/downloads/DownloadService.kt
index 2eb4b28a68527..56351031e6a6d 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/downloads/DownloadService.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/downloads/DownloadService.kt
@@ -4,7 +4,6 @@
 
 package org.mozilla.fenix.downloads
 
-import android.os.Environment
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.feature.downloads.AbstractFetchDownloadService
 import mozilla.components.feature.downloads.DefaultPackageNameProvider
@@ -12,8 +11,6 @@ import mozilla.components.feature.downloads.DownloadEstimator
 import mozilla.components.feature.downloads.FileSizeFormatter
 import mozilla.components.feature.downloads.PackageNameProvider
 import mozilla.components.support.base.android.NotificationsDelegate
-import mozilla.components.support.utils.DefaultDownloadFileUtils
-import mozilla.components.support.utils.DownloadFileUtils
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components
 
@@ -27,14 +24,4 @@ class DownloadService : AbstractFetchDownloadService() {
     override val packageNameProvider: PackageNameProvider by lazy {
         DefaultPackageNameProvider(applicationContext)
     }
-    override val downloadFileUtils: DownloadFileUtils by lazy {
-        DefaultDownloadFileUtils(
-            context = applicationContext,
-            downloadLocationGetter = {
-                Environment.getExternalStoragePublicDirectory(
-                    Environment.DIRECTORY_DOWNLOADS,
-                ).path
-            },
-        )
-    }
 }
diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/downloads/DownloadService.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/downloads/DownloadService.kt
index 4df90473f35cd..5b1c3659ce272 100644
--- a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/downloads/DownloadService.kt
+++ b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/downloads/DownloadService.kt
@@ -4,7 +4,6 @@
 
 package org.mozilla.focus.downloads
 
-import android.os.Environment
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.concept.fetch.Client
 import mozilla.components.feature.downloads.AbstractFetchDownloadService
@@ -13,8 +12,6 @@ import mozilla.components.feature.downloads.DownloadEstimator
 import mozilla.components.feature.downloads.FileSizeFormatter
 import mozilla.components.feature.downloads.PackageNameProvider
 import mozilla.components.support.base.android.NotificationsDelegate
-import mozilla.components.support.utils.DefaultDownloadFileUtils
-import mozilla.components.support.utils.DownloadFileUtils
 import org.mozilla.focus.ext.components
 
 class DownloadService : AbstractFetchDownloadService() {
@@ -24,14 +21,4 @@ class DownloadService : AbstractFetchDownloadService() {
     override val fileSizeFormatter: FileSizeFormatter by lazy { components.fileSizeFormatter }
     override val downloadEstimator: DownloadEstimator by lazy { components.downloadEstimator }
     override val packageNameProvider: PackageNameProvider by lazy { DefaultPackageNameProvider(applicationContext) }
-    override val downloadFileUtils: DownloadFileUtils by lazy {
-        DefaultDownloadFileUtils(
-            context = applicationContext,
-            downloadLocationGetter = {
-                Environment.getExternalStoragePublicDirectory(
-                    Environment.DIRECTORY_DOWNLOADS,
-                ).path
-            },
-        )
-    }
 }

From ceded7b8d7fca9e40585d6050cdf988318cb8dbf Mon Sep 17 00:00:00 2001
From: Cristina Horotan <chorotan@mozilla.com>
Date: Thu, 29 Jan 2026 16:32:54 +0200
Subject: [PATCH 053/116] Revert "Bug 2012638 - Make
 `nsFrameSelection::RepaintSelection()` run
 `UpdateSelectionCacheOnRepaintSelection()` in any desktop debug builds
 r=edgar" for causing bc failures on browser_bug1261299.js

This reverts commit 6a059306a52d5b2ff924c69ebd3e9eeaeee53a69.
---
 dom/base/nsCopySupport.cpp          |  8 ++---
 dom/base/nsCopySupport.h            |  4 +--
 layout/generic/nsFrameSelection.cpp | 48 ++++++-----------------------
 3 files changed, 14 insertions(+), 46 deletions(-)

diff --git a/dom/base/nsCopySupport.cpp b/dom/base/nsCopySupport.cpp
index 9ca2cfd4527d2..c6f48b2d27182 100644
--- a/dom/base/nsCopySupport.cpp
+++ b/dom/base/nsCopySupport.cpp
@@ -346,7 +346,7 @@ static nsresult PutToClipboard(
 
 nsresult nsCopySupport::EncodeDocumentWithContextAndPutToClipboard(
     Selection* aSel, Document* aDoc, nsIClipboard::ClipboardType aClipboardID,
-    bool aWithRubyAnnotation, UpdateClipboard aUpdateClipboard /* = Yes */) {
+    bool aWithRubyAnnotation) {
   NS_ENSURE_TRUE(aDoc, NS_ERROR_NULL_POINTER);
 
   uint32_t additionalFlags = nsIDocumentEncoder::SkipInvisibleContent;
@@ -364,10 +364,8 @@ nsresult nsCopySupport::EncodeDocumentWithContextAndPutToClipboard(
                                           encodedDocumentWithContext);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  if (aUpdateClipboard == UpdateClipboard::Yes) {
-    rv = PutToClipboard(encodedDocumentWithContext, aClipboardID, *aDoc);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
+  rv = PutToClipboard(encodedDocumentWithContext, aClipboardID, *aDoc);
+  NS_ENSURE_SUCCESS(rv, rv);
 
   return rv;
 }
diff --git a/dom/base/nsCopySupport.h b/dom/base/nsCopySupport.h
index 3cb40255a8e8a..a904aa909e6fa 100644
--- a/dom/base/nsCopySupport.h
+++ b/dom/base/nsCopySupport.h
@@ -36,14 +36,12 @@ class nsCopySupport {
  public:
   static nsresult ClearSelectionCache();
 
-  enum class UpdateClipboard : bool { No, Yes };
   /**
    * @param aDoc Needs to be not nullptr.
    */
   static nsresult EncodeDocumentWithContextAndPutToClipboard(
       mozilla::dom::Selection* aSel, mozilla::dom::Document* aDoc,
-      nsIClipboard::ClipboardType aClipboardID, bool aWithRubyAnnotation,
-      UpdateClipboard = UpdateClipboard::Yes);
+      nsIClipboard::ClipboardType aClipboardID, bool aWithRubyAnnotation);
 
   // Get the selection, or entire document, in the format specified by the mime
   // type (text/html or text/plain). If aSel is non-null, use it, otherwise get
diff --git a/layout/generic/nsFrameSelection.cpp b/layout/generic/nsFrameSelection.cpp
index 1cb67b81387aa..e13a48b98781d 100644
--- a/layout/generic/nsFrameSelection.cpp
+++ b/layout/generic/nsFrameSelection.cpp
@@ -137,21 +137,9 @@ MOZ_CAN_RUN_SCRIPT_BOUNDARY static nsresult CreateAndAddRange(
 static nsresult SelectCellElement(nsIContent* aCellElement,
                                   Selection& aNormalSelection);
 
-// On macOS, we need to update the selection cache when we repaint a selection.
-// This runs nsHTMLCopyEncoder to serialize the selection ranges, which is
-// really complicated especially when shadow DOM selection. Therefore, that may
-// cause some assertion failures. Unfortunately, our macOS machines in the CI
-// are always busy and we need one or two days to check the result on trysever.
-// Therefore, we should run nsHTMLCopyEncoder part in all desktop platforms if
-// it's a debug build. Thus, we can check the result on Linux machines in
-// tryserver.
-#if defined(XP_MACOS) || (defined(DEBUG) && !defined(ANDROID))
-#  define RUN_MAYBE_UPDATE_SELECTION_CACHE_REPAINT_SELECTION
-#endif
-
-#ifdef RUN_MAYBE_UPDATE_SELECTION_CACHE_REPAINT_SELECTION
-static nsresult MaybeUpdateSelectionCacheOnRepaintSelection(Selection* aSel);
-#endif  // RUN_MAYBE_UPDATE_SELECTION_CACHE_REPAINT_SELECTION
+#ifdef XP_MACOSX
+static nsresult UpdateSelectionCacheOnRepaintSelection(Selection* aSel);
+#endif  // XP_MACOSX
 
 #ifdef PRINT_RANGE
 static void printRange(nsRange* aDomRange);
@@ -1741,21 +1729,14 @@ nsresult nsFrameSelection::RepaintSelection(SelectionType aSelectionType) {
 
 // On macOS, update the selection cache to the new active selection
 // aka the current selection.
-// NOTE: On Linux and Windows, we don't need to run this because this just runs
-// nsHTMLCopyEncorder without updating the selection cache.  However, we run
-// this in the debug builds on Linux and Windows. See the comment of this macro
-// definition for the detail.
-#ifdef RUN_MAYBE_UPDATE_SELECTION_CACHE_REPAINT_SELECTION
+#ifdef XP_MACOSX
   // Check that we're in the an active window and, if this is Web content,
   // in the frontmost tab.
-  // XXX This is called when the selection blurs, see
-  // PresShell::FrameSelectionWillLoseFocus(). Cannot we skip doing this in that
-  // case?
   Document* doc = mPresShell->GetDocument();
   if (doc && IsInActiveTab(doc) && aSelectionType == SelectionType::eNormal) {
-    MaybeUpdateSelectionCacheOnRepaintSelection(sel);
+    UpdateSelectionCacheOnRepaintSelection(sel);
   }
-#endif  // #ifdef RUN_MAYBE_UPDATE_SELECTION_CACHE_REPAINT_SELECTION
+#endif
   return sel->Repaint(mPresShell->GetPresContext());
 }
 
@@ -3140,7 +3121,7 @@ void nsFrameSelection::DisconnectFromPresShell() {
   }
 }
 
-#ifdef RUN_MAYBE_UPDATE_SELECTION_CACHE_REPAINT_SELECTION
+#ifdef XP_MACOSX
 /**
  * See Bug 1288453.
  *
@@ -3160,7 +3141,7 @@ void nsFrameSelection::DisconnectFromPresShell() {
  * If the current selection is empty. The current selection cache
  * would be cleared by AutoCopyListener::OnSelectionChange().
  */
-static nsresult MaybeUpdateSelectionCacheOnRepaintSelection(Selection* aSel) {
+static nsresult UpdateSelectionCacheOnRepaintSelection(Selection* aSel) {
   PresShell* presShell = aSel->GetPresShell();
   if (!presShell) {
     return NS_OK;
@@ -3169,21 +3150,12 @@ static nsresult MaybeUpdateSelectionCacheOnRepaintSelection(Selection* aSel) {
 
   if (aDoc && aSel && !aSel->IsCollapsed()) {
     return nsCopySupport::EncodeDocumentWithContextAndPutToClipboard(
-        aSel, aDoc, nsIClipboard::kSelectionCache, false,
-#  ifdef XP_MACOSX
-        // Update the selection cache on macOS
-        nsCopySupport::UpdateClipboard::Yes
-#  else
-        // Do not update the clipboard on the other platforms, just run the
-        // serializer to detect assertion failures.
-        nsCopySupport::UpdateClipboard::No
-#  endif
-    );
+        aSel, aDoc, nsIClipboard::kSelectionCache, false);
   }
 
   return NS_OK;
 }
-#endif  // RUN_MAYBE_UPDATE_SELECTION_CACHE_REPAINT_SELECTION
+#endif  // XP_MACOSX
 
 // mozilla::AutoCopyListener
 

From dd89427fae737bf504cf3bffb421a7b6381a2c12 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date: Thu, 29 Jan 2026 13:38:56 +0000
Subject: [PATCH 054/116] Bug 2013100 - Update KSP to version 2.3.5.
 r=android-reviewers,mcarare

Differential Revision: https://phabricator.services.mozilla.com/D280814
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index eceb6f03f9cc6..ca87bc1937163 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -52,7 +52,7 @@ work = "2.11.0"
 accompanist = "0.37.3"
 firebase-messaging = "25.0.1"
 installreferrer = "2.2"
-ksp = "2.3.4"
+ksp = "2.3.5"
 material = "1.13.0"
 osslicenses-plugin = "0.10.10"
 play-review = "2.0.2"

From 54fe7c7be568f472f79857e54996b7b4ae4f4a98 Mon Sep 17 00:00:00 2001
From: Vincent Hilla <vhilla@mozilla.com>
Date: Thu, 29 Jan 2026 13:53:27 +0000
Subject: [PATCH 055/116] Bug 2009931 - Cleanup after BrowserChild::Init crash.
 r=nika,hsivonen

This commit removes the unsuccessful deferring of notifications around
BrowserChild::Init and  and narrows when we ignore a failure in
nsDocShell::Initialize.

Differential Revision: https://phabricator.services.mozilla.com/D279293
---
 docshell/base/nsDocShell.cpp                | 21 +++++----------
 docshell/base/nsDocShell.h                  |  4 +--
 dom/base/nsFrameLoader.cpp                  |  2 +-
 dom/ipc/BrowserChild.cpp                    |  5 ++--
 dom/ipc/ContentChild.cpp                    | 21 ++++++++-------
 toolkit/components/browser/nsWebBrowser.cpp | 29 ++++++++++-----------
 toolkit/components/browser/nsWebBrowser.h   | 11 ++++----
 xpfe/appshell/nsAppShellService.cpp         |  7 ++---
 8 files changed, 49 insertions(+), 51 deletions(-)

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 3e3bf3bd2b49b..0d00a3dccb96d 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -443,23 +443,17 @@ nsresult nsDocShell::InitWindow(nsIWidget* aParentWidget, int32_t aX,
                                 mozilla::dom::WindowGlobalChild* aWindowActor) {
   SetParentWidget(aParentWidget);
   SetPositionAndSize(aX, aY, aWidth, aHeight, 0);
-  if (!Initialize(aOpenWindowInfo, aWindowActor)) {
-    // Since bug 543435, Initialize can fail and propagating this would
-    // cause callers to crash when they didn't previously (bug 2003244).
-    NS_WARNING("Failed to initialize docshell");
-  }
-
-  return NS_OK;
+  return Initialize(aOpenWindowInfo, aWindowActor);
 }
 
-bool nsDocShell::Initialize(nsIOpenWindowInfo* aOpenWindowInfo,
-                            mozilla::dom::WindowGlobalChild* aWindowActor) {
+nsresult nsDocShell::Initialize(nsIOpenWindowInfo* aOpenWindowInfo,
+                                mozilla::dom::WindowGlobalChild* aWindowActor) {
   if (mInitialized) {
     // We've already been initialized.
     MOZ_ASSERT(!aOpenWindowInfo,
                "Tried to reinitialize with override principal");
     MOZ_ASSERT(!aWindowActor, "Tried to reinitialize with a window actor");
-    return true;
+    return NS_OK;
   }
 
   MOZ_ASSERT(aOpenWindowInfo,
@@ -468,15 +462,14 @@ bool nsDocShell::Initialize(nsIOpenWindowInfo* aOpenWindowInfo,
   NS_ASSERTION(mItemType == typeContent || mItemType == typeChrome,
                "Unexpected item type in docshell");
 
-  NS_ENSURE_TRUE(Preferences::GetRootBranch(), false);
+  NS_ENSURE_TRUE(Preferences::GetRootBranch(), NS_ERROR_NOT_INITIALIZED);
   mInitialized = true;
 
   mDisableMetaRefreshWhenInactive =
       Preferences::GetBool("browser.meta_refresh_when_inactive.disabled",
                            mDisableMetaRefreshWhenInactive);
 
-  bool succeeded =
-      NS_SUCCEEDED(CreateInitialDocumentViewer(aOpenWindowInfo, aWindowActor));
+  nsresult rv = CreateInitialDocumentViewer(aOpenWindowInfo, aWindowActor);
 
   if (nsCOMPtr<nsIObserverService> serv = services::GetObserverService()) {
     const char* msg = mItemType == typeContent ? NS_WEBNAVIGATION_CREATE
@@ -484,7 +477,7 @@ bool nsDocShell::Initialize(nsIOpenWindowInfo* aOpenWindowInfo,
     serv->NotifyWhenScriptSafe(GetAsSupports(this), msg, nullptr);
   }
 
-  return succeeded;
+  return rv;
 }
 
 /* static */
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index 7e828206261ca..7ca79a65b91dc 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -190,8 +190,8 @@ class nsDocShell final : public nsDocLoader,
       mozilla::dom::BrowsingContext* aBrowsingContext,
       uint64_t aContentWindowID = 0);
 
-  bool Initialize(nsIOpenWindowInfo* aOpenWindowInfo,
-                  mozilla::dom::WindowGlobalChild* aWindowActor);
+  nsresult Initialize(nsIOpenWindowInfo* aOpenWindowInfo,
+                      mozilla::dom::WindowGlobalChild* aWindowActor);
 
   nsresult InitWindow(nsIWidget* aParentWidget, int32_t aX, int32_t aY,
                       int32_t aWidth, int32_t aHeight,
diff --git a/dom/base/nsFrameLoader.cpp b/dom/base/nsFrameLoader.cpp
index 175985e9f3ebb..0cba28c9f2ee2 100644
--- a/dom/base/nsFrameLoader.cpp
+++ b/dom/base/nsFrameLoader.cpp
@@ -2301,7 +2301,7 @@ nsresult nsFrameLoader::MaybeCreateDocShell() {
       doc->GetPolicyContainer();
   openWindowInfo->mCoepToInheritForAboutBlank = doc->GetEmbedderPolicy();
   openWindowInfo->mBaseUriToInheritForAboutBlank = mOwnerContent->GetBaseURI();
-  if (!docShell->Initialize(openWindowInfo, nullptr)) {
+  if (NS_FAILED(docShell->Initialize(openWindowInfo, nullptr))) {
     // Do not call Destroy() here. See bug 472312.
     NS_WARNING("Something wrong when creating the docshell for a frameloader!");
     return NS_ERROR_FAILURE;
diff --git a/dom/ipc/BrowserChild.cpp b/dom/ipc/BrowserChild.cpp
index 6c3aa4619eb81..709627e4bb60d 100644
--- a/dom/ipc/BrowserChild.cpp
+++ b/dom/ipc/BrowserChild.cpp
@@ -468,8 +468,9 @@ nsresult BrowserChild::Init(mozIDOMWindowProxy* aParent,
   mPuppetWidget->InfallibleCreate(nullptr, LayoutDeviceIntRect(),
                                   widget::InitData());
 
-  mWebBrowser = nsWebBrowser::Create(this, mPuppetWidget, mBrowsingContext,
-                                     aInitialWindowChild, aOpenWindowInfo);
+  MOZ_TRY(nsWebBrowser::Create(this, mPuppetWidget, mBrowsingContext,
+                               aInitialWindowChild, aOpenWindowInfo,
+                               getter_AddRefs(mWebBrowser)));
   if (!mWebBrowser) {
     // At least the JS recursion depth check can cause an early return
     // here. dom/base/crashtests/1419902.html
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
index 11639e7ec9785..6a02bfa1d07bd 100644
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -1890,6 +1890,13 @@ mozilla::ipc::IPCResult ContentChild::RecvConstructBrowser(
                ? IPC_FAIL(this, "discarded initial top BrowsingContext")
                : IPC_FAIL(this, "missing initial top BrowsingContext");
   }
+  if (!browsingContext->AncestorsAreCurrent()) {
+    MOZ_ASSERT(!aIsTopLevel, "Top level discard was already checked");
+    MOZ_LOG(
+        BrowsingContext::GetLog(), LogLevel::Warning,
+        ("Discarded or inactive ancestor of initial frame BrowsingContext"));
+    return IPC_OK();
+  }
 
   if (xpc::IsInAutomation() &&
       StaticPrefs::
@@ -1964,15 +1971,11 @@ mozilla::ipc::IPCResult ContentChild::RecvConstructBrowser(
   openWindowInfo->mPolicyContainerToInheritForAboutBlank =
       new PolicyContainer();
 
-  {
-    // Block the script runner that notifies about the creation of the script
-    // global for the initial about:blank.
-    nsAutoScriptBlocker blockScripts;
-
-    if (NS_WARN_IF(NS_FAILED(browserChild->Init(
-            /* aOpener */ nullptr, windowChild, openWindowInfo)))) {
-      return IPC_FAIL(browserChild, "BrowserChild::Init failed");
-    }
+  nsresult rv = browserChild->Init(
+      /* aOpener */ nullptr, windowChild, openWindowInfo);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    IPC_FAIL_UNSAFE_PRINTF(browserChild, "BrowserChild::Init failed (rv=%s)",
+                           mozilla::GetStaticErrorName(rv));
   }
 
   nsCOMPtr<nsIObserverService> os = services::GetObserverService();
diff --git a/toolkit/components/browser/nsWebBrowser.cpp b/toolkit/components/browser/nsWebBrowser.cpp
index 965e7d6513ece..9389455282fc2 100644
--- a/toolkit/components/browser/nsWebBrowser.cpp
+++ b/toolkit/components/browser/nsWebBrowser.cpp
@@ -82,11 +82,12 @@ nsIWidget* nsWebBrowser::EnsureWidget() {
 }
 
 /* static */
-already_AddRefed<nsWebBrowser> nsWebBrowser::Create(
-    nsIWebBrowserChrome* aContainerWindow, nsIWidget* aParentWidget,
-    dom::BrowsingContext* aBrowsingContext,
-    dom::WindowGlobalChild* aInitialWindowChild,
-    nsIOpenWindowInfo* aOpenWindowInfo) {
+nsresult nsWebBrowser::Create(nsIWebBrowserChrome* aContainerWindow,
+                              nsIWidget* aParentWidget,
+                              dom::BrowsingContext* aBrowsingContext,
+                              dom::WindowGlobalChild* aInitialWindowChild,
+                              nsIOpenWindowInfo* aOpenWindowInfo,
+                              nsWebBrowser** aWebBrowser) {
   MOZ_ASSERT(aOpenWindowInfo, "Must have openwindowinfo");
   MOZ_ASSERT_IF(aInitialWindowChild,
                 aInitialWindowChild->BrowsingContext() == aBrowsingContext);
@@ -98,12 +99,12 @@ already_AddRefed<nsWebBrowser> nsWebBrowser::Create(
       aBrowsingContext->IsContent() ? typeContentWrapper : typeChromeWrapper);
 
   // nsWebBrowser::SetContainer also calls nsWebBrowser::EnsureDocShellTreeOwner
-  NS_ENSURE_SUCCESS(browser->SetContainerWindow(aContainerWindow), nullptr);
-  NS_ENSURE_SUCCESS(browser->SetParentWidget(aParentWidget), nullptr);
+  MOZ_TRY(browser->SetContainerWindow(aContainerWindow));
+  MOZ_TRY(browser->SetParentWidget(aParentWidget));
 
   nsCOMPtr<nsIWidget> docShellParentWidget = browser->EnsureWidget();
   if (NS_WARN_IF(!docShellParentWidget)) {
-    return nullptr;
+    return NS_ERROR_NOT_AVAILABLE;
   }
 
   uint64_t outerWindowId =
@@ -112,7 +113,7 @@ already_AddRefed<nsWebBrowser> nsWebBrowser::Create(
   RefPtr<nsDocShell> docShell =
       nsDocShell::Create(aBrowsingContext, outerWindowId);
   if (NS_WARN_IF(!docShell)) {
-    return nullptr;
+    return NS_ERROR_FAILURE;
   }
   browser->SetDocShell(docShell);
   MOZ_ASSERT(browser->mDocShell == docShell);
@@ -139,16 +140,14 @@ already_AddRefed<nsWebBrowser> nsWebBrowser::Create(
   // events from subframes. To solve that we install our own chrome event
   // handler that always gets called (even for subframes) for any bubbling
   // event.
-  nsresult rv = docShell->InitWindow(docShellParentWidget, 0, 0, 0, 0,
-                                     aOpenWindowInfo, aInitialWindowChild);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return nullptr;
-  }
+  MOZ_TRY(docShell->InitWindow(docShellParentWidget, 0, 0, 0, 0,
+                               aOpenWindowInfo, aInitialWindowChild));
 
   docShellTreeOwner->AddToWatcher();  // evil twin of Remove in SetDocShell(0)
   docShellTreeOwner->AddChromeListeners();
 
-  return browser.forget();
+  browser.forget(aWebBrowser);
+  return NS_OK;
 }
 
 void nsWebBrowser::InternalDestroy() {
diff --git a/toolkit/components/browser/nsWebBrowser.h b/toolkit/components/browser/nsWebBrowser.h
index 251128df37edc..bae99d926c7e4 100644
--- a/toolkit/components/browser/nsWebBrowser.h
+++ b/toolkit/components/browser/nsWebBrowser.h
@@ -89,11 +89,12 @@ class nsWebBrowser final : public nsIWebBrowser,
   MOZ_CAN_RUN_SCRIPT_BOUNDARY void FocusDeactivate(uint64_t aActionId);
   void SetWillChangeProcess();
 
-  static already_AddRefed<nsWebBrowser> Create(
-      nsIWebBrowserChrome* aContainerWindow, nsIWidget* aParentWidget,
-      mozilla::dom::BrowsingContext* aBrowsingContext,
-      mozilla::dom::WindowGlobalChild* aInitialWindowChild,
-      nsIOpenWindowInfo* aOpenWindowInfo);
+  static nsresult Create(nsIWebBrowserChrome* aContainerWindow,
+                         nsIWidget* aParentWidget,
+                         mozilla::dom::BrowsingContext* aBrowsingContext,
+                         mozilla::dom::WindowGlobalChild* aInitialWindowChild,
+                         nsIOpenWindowInfo* aOpenWindowInfo,
+                         nsWebBrowser** aWebBrowser);
 
  protected:
   virtual ~nsWebBrowser();
diff --git a/xpfe/appshell/nsAppShellService.cpp b/xpfe/appshell/nsAppShellService.cpp
index f165a5e80c0eb..253a46e7a2d07 100644
--- a/xpfe/appshell/nsAppShellService.cpp
+++ b/xpfe/appshell/nsAppShellService.cpp
@@ -438,9 +438,10 @@ nsAppShellService::CreateWindowlessBrowser(bool aIsChrome, uint32_t aChromeMask,
   /* Next, we create an instance of nsWebBrowser. Instances of this class have
    * an associated doc shell, which is what we're interested in.
    */
-  nsCOMPtr<nsIWebBrowser> browser =
-      nsWebBrowser::Create(stub, widget, browsingContext,
-                           nullptr /* initialWindowChild */, openWindowInfo);
+  RefPtr<nsWebBrowser> browser;
+  MOZ_TRY(nsWebBrowser::Create(stub, widget, browsingContext,
+                               nullptr /* initialWindowChild */, openWindowInfo,
+                               getter_AddRefs(browser)));
 
   if (NS_WARN_IF(!browser)) {
     NS_ERROR("Couldn't create instance of nsWebBrowser!");

From 97239f8ed9c38963deae816f3a7c19fd1b926595 Mon Sep 17 00:00:00 2001
From: Erik Nordin <enordin@mozilla.com>
Date: Thu, 29 Jan 2026 14:06:53 +0000
Subject: [PATCH 056/116] Bug 2010993 - Ensure TranslationsEngine is destroyed
 when disabling Translations r=translations-reviewers,gregtatum

This commit ensures that disabling the Translations feature will ensure
that the Translations Engine is destroyed. It also ensures that the engine
actor is fetched every time, rather than relying on the cached value, which
may no longer be valid when re-enabling the feature.

Differential Revision: https://phabricator.services.mozilla.com/D280367
---
 .../translations/tests/browser/head.js        | 24 ++++++--
 .../translations/TranslationsFeature.sys.mjs  | 27 +++++++--
 .../translations/TranslationsUtils.mjs        | 18 +++++-
 .../content/translations-engine.sys.mjs       | 58 ++++++++++++++-----
 4 files changed, 100 insertions(+), 27 deletions(-)

diff --git a/browser/components/translations/tests/browser/head.js b/browser/components/translations/tests/browser/head.js
index 093360b81d533..e22ae622dcb0a 100644
--- a/browser/components/translations/tests/browser/head.js
+++ b/browser/components/translations/tests/browser/head.js
@@ -1502,8 +1502,12 @@ class FullPageTranslationsTestUtils {
    */
   static async waitForAllPendingTranslationsToComplete(runInPage) {
     await runInPage(async ({ waitForCondition }) => {
-      const translationsChild =
-        content.windowGlobalChild.getActor("Translations");
+      let translationsChild;
+      try {
+        translationsChild = content.windowGlobalChild.getActor("Translations");
+      } catch {
+        return;
+      }
 
       while (
         translationsChild.translatedDoc?.hasPendingTranslationRequests() ||
@@ -1533,8 +1537,12 @@ class FullPageTranslationsTestUtils {
    */
   static async assertNoElementsAreObservedForContentIntersection(runInPage) {
     await runInPage(async ({ waitForCondition }) => {
-      const translationsChild =
-        content.windowGlobalChild.getActor("Translations");
+      let translationsChild;
+      try {
+        translationsChild = content.windowGlobalChild.getActor("Translations");
+      } catch {
+        return;
+      }
 
       await waitForCondition(
         () =>
@@ -1553,8 +1561,12 @@ class FullPageTranslationsTestUtils {
    */
   static async assertNoElementsAreObservedForAttributeIntersection(runInPage) {
     await runInPage(async ({ waitForCondition }) => {
-      const translationsChild =
-        content.windowGlobalChild.getActor("Translations");
+      let translationsChild;
+      try {
+        translationsChild = content.windowGlobalChild.getActor("Translations");
+      } catch {
+        return;
+      }
 
       await waitForCondition(
         () =>
diff --git a/toolkit/components/translations/TranslationsFeature.sys.mjs b/toolkit/components/translations/TranslationsFeature.sys.mjs
index d63a27bfd0e03..8158273c06eca 100644
--- a/toolkit/components/translations/TranslationsFeature.sys.mjs
+++ b/toolkit/components/translations/TranslationsFeature.sys.mjs
@@ -3,10 +3,23 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import { AIFeature } from "chrome://global/content/ml/AIFeature.sys.mjs";
-import { TranslationsUtils } from "chrome://global/content/translations/TranslationsUtils.mjs";
 
+/**
+ * @typedef {object} Lazy
+ * @property {typeof console} console
+ * @property {typeof import("chrome://global/content/translations/TranslationsUtils.mjs").TranslationsUtils} TranslationsUtils
+ * @property {typeof import("chrome://global/content/ml/EngineProcess.sys.mjs").EngineProcess} EngineProcess
+ */
+
+/** @type {Lazy} */
 const lazy = {};
 
+ChromeUtils.defineESModuleGetters(lazy, {
+  TranslationsUtils:
+    "chrome://global/content/translations/TranslationsUtils.mjs",
+  EngineProcess: "chrome://global/content/ml/EngineProcess.sys.mjs",
+});
+
 ChromeUtils.defineLazyGetter(lazy, "console", () => {
   return console.createInstance({
     maxLogLevelPref: "browser.translations.logLevel",
@@ -61,7 +74,10 @@ export class TranslationsFeature extends AIFeature {
     Services.prefs.setStringPref(AI_CONTROL_TRANSLATIONS_PREF, "blocked");
     Services.prefs.setBoolPref(TRANSLATIONS_ENABLE_PREF, false);
 
-    await TranslationsFeature.#deleteAllArtifacts();
+    await Promise.allSettled([
+      lazy.EngineProcess.destroyTranslationsEngine(),
+      TranslationsFeature.#deleteAllArtifacts(),
+    ]);
   }
 
   /**
@@ -79,7 +95,10 @@ export class TranslationsFeature extends AIFeature {
     Services.prefs.clearUserPref(AI_CONTROL_TRANSLATIONS_PREF);
     Services.prefs.clearUserPref(TRANSLATIONS_ENABLE_PREF);
 
-    await TranslationsFeature.#deleteAllArtifacts();
+    await Promise.allSettled([
+      lazy.EngineProcess.destroyTranslationsEngine(),
+      TranslationsFeature.#deleteAllArtifacts(),
+    ]);
   }
 
   /**
@@ -135,7 +154,7 @@ export class TranslationsFeature extends AIFeature {
    */
   static async #deleteAllArtifacts() {
     try {
-      await TranslationsUtils.deleteAllLanguageFiles();
+      await lazy.TranslationsUtils.deleteAllLanguageFiles();
     } catch (error) {
       lazy.console.error(
         "Failed to delete Translations language files.",
diff --git a/toolkit/components/translations/TranslationsUtils.mjs b/toolkit/components/translations/TranslationsUtils.mjs
index 18671a7feab93..06840b679fbcc 100644
--- a/toolkit/components/translations/TranslationsUtils.mjs
+++ b/toolkit/components/translations/TranslationsUtils.mjs
@@ -9,6 +9,7 @@
 /**
  * @typedef {object} Lazy
  * @property {typeof console} console
+ * @property {typeof import("resource://services-settings/RemoteSettingsClient.sys.mjs").RemoteSettingsClient} RemoteSettingsClient
  */
 
 /** @type {Lazy} */
@@ -21,6 +22,11 @@ ChromeUtils.defineLazyGetter(lazy, "console", () => {
   });
 });
 
+ChromeUtils.defineESModuleGetters(lazy, {
+  RemoteSettingsClient:
+    "resource://services-settings/RemoteSettingsClient.sys.mjs",
+});
+
 /**
  * A set of global static utility functions that are useful throughout the
  * Translations ecosystem within the Firefox code base.
@@ -169,7 +175,17 @@ export class TranslationsUtils {
     const client = RemoteSettings(
       TranslationsUtils.translationsModelsCollectionName
     );
-    await client.attachments.deleteAll();
+
+    try {
+      await client.attachments.deleteAll();
+    } catch (error) {
+      if (!(error instanceof lazy.RemoteSettingsClient.EmptyDatabaseError)) {
+        lazy.console.error(
+          "Failed to delete Translations language files.",
+          error
+        );
+      }
+    }
 
     try {
       const records = await client.get({
diff --git a/toolkit/components/translations/content/translations-engine.sys.mjs b/toolkit/components/translations/content/translations-engine.sys.mjs
index 9590fbe076aa5..52ff8827d3fe3 100644
--- a/toolkit/components/translations/content/translations-engine.sys.mjs
+++ b/toolkit/components/translations/content/translations-engine.sys.mjs
@@ -74,22 +74,48 @@
 // unprivileged Cu.Sandbox, with these specific methods re-exported into the
 // sandbox scope.
 
-const engineActor = ChromeUtils.domProcessChild.getActor("TranslationsEngine");
-
-const TE_addProfilerMarker = engineActor.TE_addProfilerMarker.bind(engineActor);
-const TE_getLogLevel = engineActor.TE_getLogLevel.bind(engineActor);
-const TE_log = engineActor.TE_log.bind(engineActor);
-const TE_logError = engineActor.TE_logError.bind(engineActor);
-const TE_requestEnginePayload =
-  engineActor.TE_requestEnginePayload.bind(engineActor);
-const TE_reportEnginePerformance =
-  engineActor.TE_reportEnginePerformance.bind(engineActor);
-const TE_reportEngineStatus =
-  engineActor.TE_reportEngineStatus.bind(engineActor);
-const TE_resolveForceShutdown =
-  engineActor.TE_resolveForceShutdown.bind(engineActor);
-const TE_destroyEngineProcess =
-  engineActor.TE_destroyEngineProcess.bind(engineActor);
+function getEngineActor() {
+  try {
+    return ChromeUtils.domProcessChild.getActor("TranslationsEngine");
+  } catch (error) {
+    if (error.name === "NotFoundError") {
+      return null;
+    }
+    throw error;
+  }
+}
+
+function TE_addProfilerMarker(...args) {
+  return getEngineActor()?.TE_addProfilerMarker(...args);
+}
+function TE_getLogLevel(...args) {
+  return getEngineActor()?.TE_getLogLevel(...args);
+}
+function TE_log(...args) {
+  return getEngineActor()?.TE_log(...args);
+}
+function TE_logError(...args) {
+  return getEngineActor()?.TE_logError(...args);
+}
+function TE_requestEnginePayload(...args) {
+  const actor = getEngineActor();
+  if (!actor) {
+    throw new Error("TranslationsEngine actor not available.");
+  }
+  return actor.TE_requestEnginePayload(...args);
+}
+function TE_reportEnginePerformance(...args) {
+  return getEngineActor()?.TE_reportEnginePerformance(...args);
+}
+function TE_reportEngineStatus(...args) {
+  return getEngineActor()?.TE_reportEngineStatus(...args);
+}
+function TE_resolveForceShutdown(...args) {
+  return getEngineActor()?.TE_resolveForceShutdown(...args);
+}
+function TE_destroyEngineProcess(...args) {
+  return getEngineActor()?.TE_destroyEngineProcess(...args);
+}
 
 // How long the cache remains alive between uses, in milliseconds. In automation the
 // engine is manually created and destroyed to avoid timing issues.

From f78f5e861274bd8617c2ea4199ccb2e53a4cbe00 Mon Sep 17 00:00:00 2001
From: Erik Nordin <enordin@mozilla.com>
Date: Thu, 29 Jan 2026 14:06:53 +0000
Subject: [PATCH 057/116] Bug 2010993 - Make about:translations react to
 feature enabledness r=translations-reviewers,gregtatum

This commit ensures that the about:translations page reacts to the Translations
feature becoming disabled and enabled. When disabled, the page content should
hide itself. When re-enabled, the page content should re-show and continue to
work as normal.

Differential Revision: https://phabricator.services.mozilla.com/D280368
---
 .../actors/AboutTranslationsChild.sys.mjs     |  21 ++-
 .../actors/AboutTranslationsParent.sys.mjs    |  34 +++-
 .../actors/TranslationsParent.sys.mjs         |  34 +++-
 .../content/about-translations.mjs            | 171 +++++++++++++++---
 .../browser_about_translations_enabling.js    | 168 +++++++++++++----
 .../translations/tests/browser/shared-head.js |   5 +
 toolkit/modules/ActorManagerParent.sys.mjs    |   1 -
 7 files changed, 358 insertions(+), 76 deletions(-)

diff --git a/toolkit/components/translations/actors/AboutTranslationsChild.sys.mjs b/toolkit/components/translations/actors/AboutTranslationsChild.sys.mjs
index 74bed28da60f9..3659382b17cb8 100644
--- a/toolkit/components/translations/actors/AboutTranslationsChild.sys.mjs
+++ b/toolkit/components/translations/actors/AboutTranslationsChild.sys.mjs
@@ -39,21 +39,30 @@ export class AboutTranslationsChild extends JSWindowActorChild {
     "browser.translations.useHTML"
   );
 
-  handleEvent(event) {
+  async handleEvent(event) {
     if (event.type === "DOMDocElementInserted") {
       this.#exportFunctions();
     }
 
-    if (
-      event.type === "DOMContentLoaded" &&
-      Services.prefs.getBoolPref("browser.translations.enable")
-    ) {
-      this.#sendEventToContent({ type: "enable" });
+    if (event.type === "DOMContentLoaded") {
+      const enabled = await this.sendQuery("AboutTranslations:GetEnabledState");
+      this.#sendEventToContent({
+        type: "enabled-state-changed",
+        enabled,
+      });
     }
   }
 
   receiveMessage({ name, data }) {
     switch (name) {
+      case "AboutTranslations:EnabledStateChanged": {
+        const { enabled } = data;
+        this.#sendEventToContent({
+          type: "enabled-state-changed",
+          enabled,
+        });
+        break;
+      }
       case "AboutTranslations:SendTranslationsPort": {
         const { languagePair, port } = data;
         const transferables = [port];
diff --git a/toolkit/components/translations/actors/AboutTranslationsParent.sys.mjs b/toolkit/components/translations/actors/AboutTranslationsParent.sys.mjs
index 25c70fb80c4eb..c3d0889a28783 100644
--- a/toolkit/components/translations/actors/AboutTranslationsParent.sys.mjs
+++ b/toolkit/components/translations/actors/AboutTranslationsParent.sys.mjs
@@ -33,11 +33,16 @@ export class AboutTranslationsParent extends JSWindowActorParent {
   #languageDisplayNames = null;
 
   actorCreated() {
+    lazy.TranslationsParent.ensurePrefObservers();
     this.#boundObserve = this.#observe.bind(this);
     Services.obs.addObserver(
       this.#boundObserve,
       "translations:model-records-changed"
     );
+    Services.obs.addObserver(
+      this.#boundObserve,
+      "translations:enabled-state-changed"
+    );
   }
 
   didDestroy() {
@@ -46,15 +51,39 @@ export class AboutTranslationsParent extends JSWindowActorParent {
         this.#boundObserve,
         "translations:model-records-changed"
       );
+      Services.obs.removeObserver(
+        this.#boundObserve,
+        "translations:enabled-state-changed"
+      );
       this.#boundObserve = null;
     }
     this.#isDestroyed = true;
   }
 
-  #observe(subject, topic) {
+  /**
+   * Observes notifications for about:translations updates.
+   *
+   * @param {nsISupports} _subject
+   * @param {string} topic
+   * @param {string} data
+   *
+   * @see {nsIObserver}
+   */
+  #observe(_subject, topic, data) {
+    if (this.#isDestroyed) {
+      return;
+    }
+
     switch (topic) {
       case "translations:model-records-changed": {
         this.sendAsyncMessage("AboutTranslations:RebuildTranslator");
+        break;
+      }
+      case "translations:enabled-state-changed": {
+        this.sendAsyncMessage("AboutTranslations:EnabledStateChanged", {
+          enabled: data === "enabled",
+        });
+        break;
       }
     }
   }
@@ -110,6 +139,9 @@ export class AboutTranslationsParent extends JSWindowActorParent {
       case "AboutTranslations:IsTranslationsEngineSupported": {
         return lazy.TranslationsParent.getIsTranslationsEngineSupported();
       }
+      case "AboutTranslations:GetEnabledState": {
+        return lazy.TranslationsParent.AIFeature.isEnabled;
+      }
       case "AboutTranslations:OpenSupportPage": {
         const browser = this.browsingContext.top.embedderElement;
         browser.ownerGlobal.openTrustedLinkIn(
diff --git a/toolkit/components/translations/actors/TranslationsParent.sys.mjs b/toolkit/components/translations/actors/TranslationsParent.sys.mjs
index 4905cef71c8f7..507b1a2ec254b 100644
--- a/toolkit/components/translations/actors/TranslationsParent.sys.mjs
+++ b/toolkit/components/translations/actors/TranslationsParent.sys.mjs
@@ -28,8 +28,11 @@ const NEVER_TRANSLATE_LANGS_PREF =
   "browser.translations.neverTranslateLanguages";
 const MOST_RECENT_TARGET_LANGS_PREF =
   "browser.translations.mostRecentTargetLanguages";
+const TRANSLATIONS_ENABLED_PREF = "browser.translations.enable";
 const TOPIC_NS_PREF_CHANGED = "nsPref:changed";
 const TOPIC_TRANSLATIONS_PREF_CHANGED = "translations:pref-changed";
+const TOPIC_TRANSLATIONS_ENABLED_STATE_CHANGED =
+  "translations:enabled-state-changed";
 const TOPIC_MAYBE_UPDATE_USER_LANG_TAG =
   "translations:maybe-update-user-lang-tag";
 const TOPIC_APP_LOCALES_CHANGED = "intl:app-locales-changed";
@@ -105,7 +108,15 @@ ChromeUtils.defineLazyGetter(lazy, "console", () => {
 XPCOMUtils.defineLazyPreferenceGetter(
   lazy,
   "translationsEnabledPref",
-  "browser.translations.enable"
+  TRANSLATIONS_ENABLED_PREF,
+  /* aDefaultValue */ false,
+  /* aOnUpdate */ () => {
+    Services.obs.notifyObservers(
+      null,
+      TOPIC_TRANSLATIONS_PREF_CHANGED,
+      TRANSLATIONS_ENABLED_PREF
+    );
+  }
 );
 
 /**
@@ -1119,6 +1130,17 @@ export class TranslationsParent extends JSWindowActorParent {
     TranslationsParent.#preferredLanguages = null;
   }
 
+  /**
+   * Notifies observers when the Translations feature enabled state changes.
+   */
+  static #notifyEnabledStateChanged() {
+    Services.obs.notifyObservers(
+      null,
+      TOPIC_TRANSLATIONS_ENABLED_STATE_CHANGED,
+      TranslationsParent.AIFeature.isEnabled ? "enabled" : "disabled"
+    );
+  }
+
   /**
    * Provide a way for tests to override the system locales.
    *
@@ -1262,7 +1284,7 @@ export class TranslationsParent extends JSWindowActorParent {
    * Initializes static pref observers exactly once the first time this is called.
    * Does nothing on subsequent calls.
    */
-  static #maybeStartObservingPrefs() {
+  static ensurePrefObservers() {
     if (TranslationsParent.#observingPrefs) {
       // We have already initialized the observers.
       return;
@@ -1470,6 +1492,10 @@ export class TranslationsParent extends JSWindowActorParent {
       }
       case TOPIC_TRANSLATIONS_PREF_CHANGED: {
         switch (data) {
+          case TRANSLATIONS_ENABLED_PREF: {
+            TranslationsParent.#notifyEnabledStateChanged();
+            break;
+          }
           case USE_LEXICAL_SHORTLIST_PREF: {
             // This is an extreme edge case where someone would flip the useLexicalShortlist
             // pref during an active translation. Most people will not be flipping this pref
@@ -1528,7 +1554,7 @@ export class TranslationsParent extends JSWindowActorParent {
       );
     }
 
-    TranslationsParent.#maybeStartObservingPrefs();
+    TranslationsParent.ensurePrefObservers();
 
     const preferredLanguages = new Set([
       ...TranslationsParent.#getMostRecentTargetLanguages(),
@@ -2407,7 +2433,7 @@ export class TranslationsParent extends JSWindowActorParent {
       return TranslationsParent.#translationModelRecords;
     }
 
-    TranslationsParent.#maybeStartObservingPrefs();
+    TranslationsParent.ensurePrefObservers();
 
     // Load the models. If no data is present, then there will be an initial sync.
     // Rely on Remote Settings for the syncing strategy for receiving updates.
diff --git a/toolkit/components/translations/content/about-translations.mjs b/toolkit/components/translations/content/about-translations.mjs
index 9547e8e0956ec..fd806cf607f4b 100644
--- a/toolkit/components/translations/content/about-translations.mjs
+++ b/toolkit/components/translations/content/about-translations.mjs
@@ -60,6 +60,20 @@ class AboutTranslations {
    */
   #translationId = 0;
 
+  /**
+   * Whether the Translations feature is enabled for this page.
+   *
+   * @type {boolean}
+   */
+  #isFeatureEnabled = true;
+
+  /**
+   * Whether the current system supports the translations engine.
+   *
+   * @type {boolean}
+   */
+  #isTranslationsEngineSupported;
+
   /**
    * The previous source text that was translated.
    *
@@ -166,6 +180,8 @@ class AboutTranslations {
    *        Whether the translations engine is supported by the current system.
    */
   constructor(isTranslationsEngineSupported) {
+    this.#isTranslationsEngineSupported = isTranslationsEngineSupported;
+
     AT_telemetry("onOpen", {
       maintainFlow: false,
     });
@@ -196,6 +212,47 @@ class AboutTranslations {
     await this.#readyPromiseWithResolvers.promise;
   }
 
+  /**
+   * Enables the feature and updates the UI to match the enabled state.
+   *
+   * @returns {Promise<void>}
+   */
+  async onFeatureEnabled() {
+    this.#isFeatureEnabled = true;
+
+    if (!this.#isTranslationsEngineSupported) {
+      this.#showUnsupportedInfoMessage();
+      document.body.style.visibility = "visible";
+      return;
+    }
+
+    if (!this.#supportedLanguages) {
+      this.#showLanguageLoadErrorMessage();
+      document.body.style.visibility = "visible";
+      return;
+    }
+
+    this.#updateSourceScriptDirection();
+    this.#updateTargetScriptDirection();
+    this.#updateSourceSectionClearButtonVisibility();
+    this.#requestSectionHeightsUpdate({ scheduleCallback: false });
+    this.#maybeRequestTranslation();
+
+    document.body.style.visibility = "visible";
+  }
+
+  /**
+   * Disables the feature and clears any active translations.
+   */
+  onFeatureDisabled() {
+    // Ensure any active translation request becomes stale.
+    this.#translationId += 1;
+    this.#isFeatureEnabled = false;
+    this.#destroyTranslator();
+
+    document.body.style.visibility = "hidden";
+  }
+
   /**
    * Instantiates and returns the elements that comprise the UI.
    *
@@ -1393,8 +1450,13 @@ class AboutTranslations {
      * in a new translation request.
      */
     onDebounce: async () => {
+      if (!this.#isFeatureEnabled) {
+        return;
+      }
+
       try {
         this.#updateURLFromUI();
+
         this.#requestSectionHeightsUpdate({ scheduleCallback: false });
 
         await this.#maybeUpdateDetectedSourceLanguage();
@@ -1473,6 +1535,10 @@ class AboutTranslations {
     // Mark the events so that they show up in the Firefox Profiler. This makes it handy
     // to visualize the debouncing behavior.
     doEveryTime: () => {
+      if (!this.#isFeatureEnabled) {
+        return;
+      }
+
       const sourceText = this.#getSourceText();
       performance.mark(
         `Translations: input changed to ${sourceText.length} code units.`
@@ -1788,38 +1854,95 @@ class AboutTranslations {
   }
 }
 
+/**
+ * A promise used to ensure the about:translations page initializes once.
+ *
+ * @type {Promise<void> | null}
+ */
+let aboutTranslationsInitPromise = null;
+
+/**
+ * Initializes the about:translations page if it has not been initialized yet.
+ *
+ * @returns {Promise<void>}
+ */
+async function ensureAboutTranslationsInitialized() {
+  if (aboutTranslationsInitPromise) {
+    return aboutTranslationsInitPromise;
+  }
+
+  aboutTranslationsInitPromise = AT_isTranslationEngineSupported()
+    .then(async isTranslationsEngineSupported => {
+      window.aboutTranslations = new AboutTranslations(
+        isTranslationsEngineSupported
+      );
+      await window.aboutTranslations.ready();
+    })
+    .catch(error => {
+      AT_logError(error);
+    });
+
+  return aboutTranslationsInitPromise;
+}
+
+/**
+ * Marks that the document is ready for automated testing to being making assertions.
+ *
+ * @returns {void}
+ */
+function markReadyForTesting() {
+  document.body.setAttribute("ready-for-testing", "");
+}
+
+/**
+ * Whether the initial enabled state has been applied.
+ *
+ * @type {boolean}
+ */
+let initialEnabledStateApplied = false;
+
+/**
+ * Applies the enabled state to the about:translations UI.
+ *
+ * @param {boolean} enabled
+ * @returns {Promise<void>}
+ */
+async function setFeatureEnabledState(enabled) {
+  await ensureAboutTranslationsInitialized();
+
+  if (!window.aboutTranslations) {
+    return;
+  }
+
+  if (enabled) {
+    await window.aboutTranslations.onFeatureEnabled();
+  } else {
+    window.aboutTranslations.onFeatureDisabled();
+  }
+
+  if (initialEnabledStateApplied) {
+    document.dispatchEvent(
+      new CustomEvent("AboutTranslationsTest:EnabledStateChanged", {
+        detail: { enabled },
+      })
+    );
+  }
+
+  initialEnabledStateApplied = true;
+  markReadyForTesting();
+}
+
 /**
  * Listen for events coming from the AboutTranslations actor.
  */
 window.addEventListener("AboutTranslationsChromeToContent", ({ detail }) => {
   switch (detail.type) {
-    case "enable": {
-      if (window.aboutTranslations) {
-        throw new Error(
-          "Attempt to initialize about:translations page more than once."
-        );
-      }
-
-      AT_isTranslationEngineSupported()
-        .then(async isTranslationsEngineSupported => {
-          window.aboutTranslations = new AboutTranslations(
-            isTranslationsEngineSupported
-          );
-          await window.aboutTranslations.ready();
-        })
-        .catch(error => {
-          AT_logError(error);
-        })
-        .finally(() => {
-          // This lets test cases know that they can start making assertions.
-          document.body.setAttribute("ready-for-testing", "");
-          document.body.style.visibility = "visible";
-        });
-
+    case "enabled-state-changed": {
+      void setFeatureEnabledState(detail.enabled);
       break;
     }
     case "rebuild-translator": {
-      window.aboutTranslations.rebuildTranslator();
+      window.aboutTranslations?.rebuildTranslator();
       break;
     }
     default: {
diff --git a/toolkit/components/translations/tests/browser/browser_about_translations_enabling.js b/toolkit/components/translations/tests/browser/browser_about_translations_enabling.js
index 9875371cab21a..fd7555ceccb1b 100644
--- a/toolkit/components/translations/tests/browser/browser_about_translations_enabling.js
+++ b/toolkit/components/translations/tests/browser/browser_about_translations_enabling.js
@@ -3,55 +3,143 @@
 
 "use strict";
 
+const AI_PREFS = [
+  ["browser.translations.enable", false],
+  ["browser.ai.control.default", "blocked"],
+  ["browser.ai.control.translations", "blocked"],
+];
+
+const HIDDEN_UI = {
+  pageHeader: false,
+  mainUserInterface: false,
+  sourceLanguageSelector: false,
+  targetLanguageSelector: false,
+  copyButton: false,
+  swapLanguagesButton: false,
+  sourceSectionTextArea: false,
+  targetSectionTextArea: false,
+  unsupportedInfoMessage: false,
+  languageLoadErrorMessage: false,
+};
+
+const VISIBLE_UI = {
+  pageHeader: true,
+  mainUserInterface: true,
+  sourceLanguageSelector: true,
+  targetLanguageSelector: true,
+  copyButton: true,
+  swapLanguagesButton: true,
+  sourceSectionTextArea: true,
+  targetSectionTextArea: true,
+  unsupportedInfoMessage: false,
+  languageLoadErrorMessage: false,
+};
+
 /**
- * Checks that nothing appears when the global Translations pref is disabled.
+ * Checks the about:translations UI updates with AIFeature enable/disable starting from disabled.
  */
-add_task(async function test_about_translations_disabled() {
-  const { aboutTranslationsTestUtils, cleanup } = await openAboutTranslations({
-    disabled: true,
-    autoDownloadFromRemoteSettings: true,
-  });
+add_task(
+  async function test_about_translations_ai_feature_toggle_from_disabled() {
+    const { aboutTranslationsTestUtils, cleanup } = await openAboutTranslations(
+      {
+        disabled: true,
+        autoDownloadFromRemoteSettings: true,
+        prefs: [
+          ["browser.translations.enable", false],
+          ["browser.ai.control.default", "blocked"],
+          ["browser.ai.control.translations", "blocked"],
+        ],
+      }
+    );
 
-  await aboutTranslationsTestUtils.assertIsVisible({
-    pageHeader: false,
-    mainUserInterface: false,
-    sourceLanguageSelector: false,
-    targetLanguageSelector: false,
-    copyButton: false,
-    swapLanguagesButton: false,
-    sourceSectionTextArea: false,
-    targetSectionTextArea: false,
-    unsupportedInfoMessage: false,
-    languageLoadErrorMessage: false,
-  });
+    await aboutTranslationsTestUtils.assertIsVisible(HIDDEN_UI);
 
-  await cleanup();
-});
+    await aboutTranslationsTestUtils.assertEvents(
+      {
+        expected: [
+          [
+            AboutTranslationsTestUtils.Events.EnabledStateChanged,
+            { enabled: true },
+          ],
+        ],
+      },
+      async () => {
+        await TranslationsParent.AIFeature.enable();
+      }
+    );
+    await aboutTranslationsTestUtils.assertIsVisible(VISIBLE_UI);
+
+    await aboutTranslationsTestUtils.assertEvents(
+      {
+        expected: [
+          [
+            AboutTranslationsTestUtils.Events.EnabledStateChanged,
+            { enabled: false },
+          ],
+        ],
+      },
+      async () => {
+        await TranslationsParent.AIFeature.disable();
+      }
+    );
+    await aboutTranslationsTestUtils.assertIsVisible(HIDDEN_UI);
+
+    await cleanup();
+  }
+);
 
 /**
- * Checks that the page loads correctly when the global Translations pref is enabled.
+ * Checks the about:translations UI updates with AIFeature disable/enable starting from enabled.
  */
-add_task(async function test_about_translations_enabled() {
-  const { aboutTranslationsTestUtils, cleanup } = await openAboutTranslations({
-    disabled: false,
-    autoDownloadFromRemoteSettings: true,
-  });
+add_task(
+  async function test_about_translations_ai_feature_toggle_from_enabled() {
+    const { aboutTranslationsTestUtils, cleanup } = await openAboutTranslations(
+      {
+        disabled: false,
+        autoDownloadFromRemoteSettings: true,
+        prefs: [
+          ["browser.translations.enable", true],
+          ["browser.ai.control.default", "available"],
+          ["browser.ai.control.translations", "default"],
+        ],
+      }
+    );
 
-  await aboutTranslationsTestUtils.assertIsVisible({
-    pageHeader: true,
-    mainUserInterface: true,
-    sourceLanguageSelector: true,
-    targetLanguageSelector: true,
-    copyButton: true,
-    swapLanguagesButton: true,
-    sourceSectionTextArea: true,
-    targetSectionTextArea: true,
-    unsupportedInfoMessage: false,
-    languageLoadErrorMessage: false,
-  });
+    await aboutTranslationsTestUtils.assertIsVisible(VISIBLE_UI);
 
-  await cleanup();
-});
+    await aboutTranslationsTestUtils.assertEvents(
+      {
+        expected: [
+          [
+            AboutTranslationsTestUtils.Events.EnabledStateChanged,
+            { enabled: false },
+          ],
+        ],
+      },
+      async () => {
+        await TranslationsParent.AIFeature.disable();
+      }
+    );
+    await aboutTranslationsTestUtils.assertIsVisible(HIDDEN_UI);
+
+    await aboutTranslationsTestUtils.assertEvents(
+      {
+        expected: [
+          [
+            AboutTranslationsTestUtils.Events.EnabledStateChanged,
+            { enabled: true },
+          ],
+        ],
+      },
+      async () => {
+        await TranslationsParent.AIFeature.enable();
+      }
+    );
+    await aboutTranslationsTestUtils.assertIsVisible(VISIBLE_UI);
+
+    await cleanup();
+  }
+);
 
 /**
  * Checks that the page loads correctly when the global Translations pref is enabled.
diff --git a/toolkit/components/translations/tests/browser/shared-head.js b/toolkit/components/translations/tests/browser/shared-head.js
index 715049b507050..72f53412bd848 100644
--- a/toolkit/components/translations/tests/browser/shared-head.js
+++ b/toolkit/components/translations/tests/browser/shared-head.js
@@ -4107,6 +4107,11 @@ class AboutTranslationsTestUtils {
    * A collection of custom events that the about:translations document may dispatch.
    */
   static Events = class Events {
+    /**
+     * Event fired when the enabled state of the Translations feature changes.
+     */
+    static EnabledStateChanged = "AboutTranslationsTest:EnabledStateChanged";
+
     /**
      * Event fired when the detected language updates.
      *
diff --git a/toolkit/modules/ActorManagerParent.sys.mjs b/toolkit/modules/ActorManagerParent.sys.mjs
index 944f70cccb2bb..2e7021c478532 100644
--- a/toolkit/modules/ActorManagerParent.sys.mjs
+++ b/toolkit/modules/ActorManagerParent.sys.mjs
@@ -767,7 +767,6 @@ if (AppConstants.platform != "android") {
     },
     matches: ["about:translations"],
     remoteTypes: ["privilegedabout"],
-    enablePreference: "browser.translations.enable",
   };
 
   JSWINDOWACTORS.ColorPicker = {

From e97e9bb23240d0b0c2359119f7c19cacc1bc5d3c Mon Sep 17 00:00:00 2001
From: Erik Nordin <enordin@mozilla.com>
Date: Thu, 29 Jan 2026 14:06:54 +0000
Subject: [PATCH 058/116] Bug 2010993 - Make Translate QuickAction react to
 feature enabledness
 r=daleharvey,translations-reviewers,urlbar-reviewers,gregtatum,mak

This commit ensures that the Translate QuickAction is reactive to the
enabled state of the Translations feature, which may now become disabled
or re-enabled via the Settings UI.

Differential Revision: https://phabricator.services.mozilla.com/D280369
---
 .../urlbar/QuickActionsLoaderDefault.sys.mjs  |   9 +-
 .../browser/browser_quickactions_translate.js | 135 ++++++++++++++++++
 2 files changed, 141 insertions(+), 3 deletions(-)

diff --git a/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs b/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs
index a7a50ae918895..f3b49ad155f5c 100644
--- a/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs
+++ b/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs
@@ -275,9 +275,12 @@ const DEFAULT_ACTIONS = {
     icon: "chrome://browser/skin/translations.svg",
     label: "quickactions-translate",
     isVisible: () => {
-      return Services.prefs.getBoolPref(
-        "browser.translations.quickAction.enabled",
-        false
+      return (
+        lazy.TranslationsParent.AIFeature.isEnabled &&
+        Services.prefs.getBoolPref(
+          "browser.translations.quickAction.enabled",
+          false
+        )
       );
     },
     onPick: async () => {
diff --git a/browser/components/urlbar/tests/browser/browser_quickactions_translate.js b/browser/components/urlbar/tests/browser/browser_quickactions_translate.js
index 0c2ecb37019c9..c26ca80c85b6c 100644
--- a/browser/components/urlbar/tests/browser/browser_quickactions_translate.js
+++ b/browser/components/urlbar/tests/browser/browser_quickactions_translate.js
@@ -24,6 +24,7 @@ add_setup(async function setup() {
     set: [
       ["browser.urlbar.quickactions.enabled", true],
       ["browser.translations.quickAction.enabled", true],
+      ["browser.translations.enable", true],
       ["browser.urlbar.quickactions.timesShownOnboardingLabel", 0],
     ],
   });
@@ -67,6 +68,140 @@ add_task(async function test_translate_disabled() {
   await SpecialPowers.popPrefEnv();
 });
 
+add_task(async function test_translate_ai_feature_toggle_from_disabled() {
+  info("Start from disabled and ensure the translate quick action is hidden");
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.ai.control.default", "blocked"],
+      ["browser.ai.control.translations", "blocked"],
+      ["browser.translations.enable", false],
+    ],
+  });
+
+  await TranslationsParent.AIFeature.disable();
+
+  info("Search for the translate quick action keyword");
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: "translate",
+  });
+
+  let hasTranslateAction = Boolean(
+    window.document.querySelector(
+      `.urlbarView-action-btn[data-action=translate]`
+    )
+  );
+  Assert.ok(
+    !hasTranslateAction,
+    "Translate action is not shown when the AI feature is disabled"
+  );
+
+  await UrlbarTestUtils.promisePopupClose(window, () => {
+    EventUtils.synthesizeKey("KEY_Escape");
+  });
+
+  await TranslationsParent.AIFeature.enable();
+
+  info("Search for the translate quick action keyword after enable");
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: "translate",
+  });
+
+  await assertAction("translate");
+
+  await UrlbarTestUtils.promisePopupClose(window, () => {
+    EventUtils.synthesizeKey("KEY_Escape");
+  });
+
+  await TranslationsParent.AIFeature.disable();
+
+  info("Search for the translate quick action keyword after disable again");
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: "translate",
+  });
+
+  hasTranslateAction = Boolean(
+    window.document.querySelector(
+      `.urlbarView-action-btn[data-action=translate]`
+    )
+  );
+  Assert.ok(
+    !hasTranslateAction,
+    "Translate action is not shown when the AI feature is disabled"
+  );
+
+  await UrlbarTestUtils.promisePopupClose(window, () => {
+    EventUtils.synthesizeKey("KEY_Escape");
+  });
+
+  await SpecialPowers.popPrefEnv();
+});
+
+add_task(async function test_translate_ai_feature_toggle_from_enabled() {
+  info("Start from enabled and ensure the translate quick action is visible");
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.ai.control.default", "available"],
+      ["browser.ai.control.translations", "default"],
+      ["browser.translations.enable", true],
+    ],
+  });
+
+  await TranslationsParent.AIFeature.enable();
+
+  info("Search for the translate quick action keyword");
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: "translate",
+  });
+
+  await assertAction("translate");
+
+  await UrlbarTestUtils.promisePopupClose(window, () => {
+    EventUtils.synthesizeKey("KEY_Escape");
+  });
+
+  await TranslationsParent.AIFeature.disable();
+
+  info("Search for the translate quick action keyword after disable");
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: "translate",
+  });
+
+  let hasTranslateAction = Boolean(
+    window.document.querySelector(
+      `.urlbarView-action-btn[data-action=translate]`
+    )
+  );
+  Assert.ok(
+    !hasTranslateAction,
+    "Translate action is not shown when the AI feature is disabled"
+  );
+
+  await UrlbarTestUtils.promisePopupClose(window, () => {
+    EventUtils.synthesizeKey("KEY_Escape");
+  });
+
+  await TranslationsParent.AIFeature.enable();
+
+  info("Search for the translate quick action keyword after enable");
+  await UrlbarTestUtils.promiseAutocompleteResultPopup({
+    window,
+    value: "translate",
+  });
+
+  await assertAction("translate");
+
+  await UrlbarTestUtils.promisePopupClose(window, () => {
+    EventUtils.synthesizeKey("KEY_Escape");
+  });
+
+  await SpecialPowers.popPrefEnv();
+});
+
 add_task(async function test_translate_keyword() {
   info("Search with the primary translate keyword");
   await UrlbarTestUtils.promiseAutocompleteResultPopup({

From accc09b6ed8362ea0a23090532f4b5e7ea60e9b0 Mon Sep 17 00:00:00 2001
From: Erik Nordin <enordin@mozilla.com>
Date: Thu, 29 Jan 2026 14:06:54 +0000
Subject: [PATCH 059/116] Bug 2010993 - Make SelectTranslations react to
 feature enabledness r=translations-reviewers,gregtatum

This commit ensures that the SelectTranslations context menu item is reactive
to the Translations feature becoming disabled or re-enabled, which may now
occur in the Firefox Settings.

Differential Revision: https://phabricator.services.mozilla.com/D280370
---
 browser/base/content/nsContextMenu.sys.mjs    |   4 +-
 .../tests/browser/browser_select.toml         |   2 +
 .../browser_translations_select_ai_feature.js | 119 ++++++++++++++++++
 3 files changed, 122 insertions(+), 3 deletions(-)
 create mode 100644 browser/components/translations/tests/browser/browser_translations_select_ai_feature.js

diff --git a/browser/base/content/nsContextMenu.sys.mjs b/browser/base/content/nsContextMenu.sys.mjs
index 1bc46140ca1cf..45712b1fc01c6 100644
--- a/browser/base/content/nsContextMenu.sys.mjs
+++ b/browser/base/content/nsContextMenu.sys.mjs
@@ -2708,9 +2708,7 @@ export class nsContextMenu {
     const translateSelectionItem = this.document.getElementById(
       "context-translate-selection"
     );
-    const translationsEnabled = Services.prefs.getBoolPref(
-      "browser.translations.enable"
-    );
+    const translationsEnabled = lazy.TranslationsParent.AIFeature.isEnabled;
     const selectTranslationsEnabled = Services.prefs.getBoolPref(
       "browser.translations.select.enable"
     );
diff --git a/browser/components/translations/tests/browser/browser_select.toml b/browser/components/translations/tests/browser/browser_select.toml
index a76ea3e2a760d..1bd6fe7058ac2 100644
--- a/browser/components/translations/tests/browser/browser_select.toml
+++ b/browser/components/translations/tests/browser/browser_select.toml
@@ -6,6 +6,8 @@ support-files = [
   "!/toolkit/components/translations/tests/browser/translations-test.mjs",
 ]
 
+["browser_translations_select_ai_feature.js"]
+
 ["browser_translations_select_context_menu_engine_unsupported.js"]
 
 ["browser_translations_select_context_menu_feature_disabled.js"]
diff --git a/browser/components/translations/tests/browser/browser_translations_select_ai_feature.js b/browser/components/translations/tests/browser/browser_translations_select_ai_feature.js
new file mode 100644
index 0000000000000..85791e95c61eb
--- /dev/null
+++ b/browser/components/translations/tests/browser/browser_translations_select_ai_feature.js
@@ -0,0 +1,119 @@
+/* Any copyright is dedicated to the Public Domain.
+   https://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/**
+ * This test case ensures that the Select Translations flow responds to the Translations
+ * AIFeature becoming enabled, and then disabled again.
+ */
+add_task(
+  async function test_select_translations_ai_feature_toggle_from_disabled() {
+    const { cleanup, runInPage } = await loadTestPage({
+      page: SELECT_TEST_PAGE_URL,
+      languagePairs: LANGUAGE_PAIRS,
+      autoDownloadFromRemoteSettings: true,
+      prefs: [
+        ["browser.translations.enable", false],
+        ["browser.ai.control.default", "blocked"],
+        ["browser.ai.control.translations", "blocked"],
+        ["browser.translations.select.enable", true],
+      ],
+    });
+
+    await TranslationsParent.AIFeature.disable();
+
+    await SelectTranslationsTestUtils.assertContextMenuTranslateSelectionItem(
+      runInPage,
+      {
+        selectSpanishSentence: true,
+        openAtSpanishSentence: true,
+        expectMenuItemVisible: false,
+      },
+      "The translate-selection context menu item is hidden when the Translations feature is disabled."
+    );
+
+    await TranslationsParent.AIFeature.enable();
+
+    await SelectTranslationsTestUtils.openPanel(runInPage, {
+      selectSpanishSentence: true,
+      openAtSpanishSentence: true,
+      expectedFromLanguage: "es",
+      expectedToLanguage: "en",
+      onOpenPanel: SelectTranslationsTestUtils.assertPanelViewTranslated,
+    });
+
+    await SelectTranslationsTestUtils.clickDoneButton();
+
+    await TranslationsParent.AIFeature.disable();
+
+    await SelectTranslationsTestUtils.assertContextMenuTranslateSelectionItem(
+      runInPage,
+      {
+        selectSpanishSentence: true,
+        openAtSpanishSentence: true,
+        expectMenuItemVisible: false,
+      },
+      "The translate-selection context menu item is hidden after disabling the Translations feature."
+    );
+
+    await cleanup();
+  }
+);
+
+/**
+ * This test case ensures that the Select Translations flow responds to the Translations
+ * AIFeature becoming disabled, and then re-enabled again.
+ */
+add_task(
+  async function test_select_translations_ai_feature_toggle_from_enabled() {
+    const { cleanup, runInPage } = await loadTestPage({
+      page: SELECT_TEST_PAGE_URL,
+      languagePairs: LANGUAGE_PAIRS,
+      autoDownloadFromRemoteSettings: true,
+      prefs: [
+        ["browser.ai.control.default", "available"],
+        ["browser.ai.control.translations", "default"],
+        ["browser.translations.select.enable", true],
+      ],
+    });
+
+    await TranslationsParent.AIFeature.enable();
+
+    await SelectTranslationsTestUtils.openPanel(runInPage, {
+      selectSpanishSentence: true,
+      openAtSpanishSentence: true,
+      expectedFromLanguage: "es",
+      expectedToLanguage: "en",
+      onOpenPanel: SelectTranslationsTestUtils.assertPanelViewTranslated,
+    });
+
+    await SelectTranslationsTestUtils.clickDoneButton();
+
+    await TranslationsParent.AIFeature.disable();
+
+    await SelectTranslationsTestUtils.assertContextMenuTranslateSelectionItem(
+      runInPage,
+      {
+        selectSpanishSentence: true,
+        openAtSpanishSentence: true,
+        expectMenuItemVisible: false,
+      },
+      "The translate-selection context menu item is hidden after disabling the Translations feature."
+    );
+
+    await TranslationsParent.AIFeature.enable();
+
+    await SelectTranslationsTestUtils.openPanel(runInPage, {
+      selectSpanishSentence: true,
+      openAtSpanishSentence: true,
+      expectedFromLanguage: "es",
+      expectedToLanguage: "en",
+      onOpenPanel: SelectTranslationsTestUtils.assertPanelViewTranslated,
+    });
+
+    await SelectTranslationsTestUtils.clickDoneButton();
+
+    await cleanup();
+  }
+);

From 63d9a87bfefcdc3fbc907f1982a1364ff28e7bf0 Mon Sep 17 00:00:00 2001
From: Erik Nordin <enordin@mozilla.com>
Date: Thu, 29 Jan 2026 14:06:54 +0000
Subject: [PATCH 060/116] Bug 2010993 - Make AppMenu react to Translations
 feature enabledness r=translations-reviewers,gregtatum

This commit ensures that the "Translate page..." Application Menu Item correctly
reacts to the Translations feature becoming enabled or disabled, which may now
occur from the main Settings UI.

Differential Revision: https://phabricator.services.mozilla.com/D280371
---
 browser/base/content/browser-init.js          | 25 ++++++
 browser/base/content/browser.js               | 18 ++---
 browser/base/content/browser.js.globals       |  1 -
 .../tests/browser/browser_full.toml           |  2 +
 ...nslations_full_page_ai_feature_app_menu.js | 77 +++++++++++++++++++
 .../translations/tests/browser/head.js        | 43 +++++++++++
 6 files changed, 152 insertions(+), 14 deletions(-)
 create mode 100644 browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_app_menu.js

diff --git a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js
index f02d7241e71d6..714984cdf97a9 100644
--- a/browser/base/content/browser-init.js
+++ b/browser/base/content/browser-init.js
@@ -20,6 +20,22 @@ var gBrowserInit = {
   _firstContentWindowPaintDeferred: Promise.withResolvers(),
   idleTasksFinished: Promise.withResolvers(),
 
+  /**
+   * Handles considerations when the enabled state of the Translations feature
+   * changes during runtime, such as being blocked or re-enabled in the AI Settings.
+   */
+  _translationsEnabledStateObserver: {
+    observe(_subject, topic, _data) {
+      if (topic !== "translations:enabled-state-changed") {
+        console.warn(`received unexpected topic: ${topic}`);
+        return;
+      }
+
+      // Ensures that the Application Menu correctly includes or omits the translate-page menu item.
+      XULBrowserWindow._updateElementsForContentType();
+    },
+  },
+
   _setupFirstContentWindowPaintPromise() {
     let lastTransactionId = window.windowUtils.lastTransactionId;
     let layerTreeListener = () => {
@@ -419,6 +435,11 @@ var gBrowserInit = {
     Services.obs.addObserver(gXPInstallObserver, "addon-install-confirmation");
     Services.obs.addObserver(gKeywordURIFixup, "keyword-uri-fixup");
     Services.obs.addObserver(gLocaleChangeObserver, "intl:app-locales-changed");
+    TranslationsParent.ensurePrefObservers();
+    Services.obs.addObserver(
+      this._translationsEnabledStateObserver,
+      "translations:enabled-state-changed"
+    );
 
     BrowserOffline.init();
 
@@ -1163,6 +1184,10 @@ var gBrowserInit = {
         gLocaleChangeObserver,
         "intl:app-locales-changed"
       );
+      Services.obs.removeObserver(
+        this._translationsEnabledStateObserver,
+        "translations:enabled-state-changed"
+      );
 
       BrowserOffline.uninit();
       PanelUI.uninit();
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 4cf700009937c..baaf142459118 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -604,13 +604,6 @@ XPCOMUtils.defineLazyPreferenceGetter(
   }
 );
 
-XPCOMUtils.defineLazyPreferenceGetter(
-  this,
-  "gTranslationsEnabled",
-  "browser.translations.enable",
-  false
-);
-
 XPCOMUtils.defineLazyPreferenceGetter(
   this,
   "gUseFeltPrivacyUI",
@@ -2378,12 +2371,11 @@ var XULBrowserWindow = {
     } else {
       this._menuItemForTranslations.removeAttribute("disabled");
     }
-    if (gTranslationsEnabled) {
-      if (TranslationsParent.getIsTranslationsEngineSupported()) {
-        this._menuItemForTranslations.removeAttribute("hidden");
-      } else {
-        this._menuItemForTranslations.setAttribute("hidden", "true");
-      }
+    if (
+      TranslationsParent.AIFeature.isEnabled &&
+      TranslationsParent.getIsTranslationsEngineSupported()
+    ) {
+      this._menuItemForTranslations.removeAttribute("hidden");
     } else {
       this._menuItemForTranslations.setAttribute("hidden", "true");
     }
diff --git a/browser/base/content/browser.js.globals b/browser/base/content/browser.js.globals
index 8e8ebc111c633..adf7005531cb4 100644
--- a/browser/base/content/browser.js.globals
+++ b/browser/base/content/browser.js.globals
@@ -228,7 +228,6 @@
   "gAddonAbuseReportEnabled",
   "gMiddleClickNewTabUsesPasteboard",
   "gPrintEnabled",
-  "gTranslationsEnabled",
   "gUseFeltPrivacyUI",
   "gReduceMotion",
   "gFindBar",
diff --git a/browser/components/translations/tests/browser/browser_full.toml b/browser/components/translations/tests/browser/browser_full.toml
index ec84239d13066..53fb7af9b69eb 100644
--- a/browser/components/translations/tests/browser/browser_full.toml
+++ b/browser/components/translations/tests/browser/browser_full.toml
@@ -6,6 +6,8 @@ support-files = [
   "!/toolkit/components/translations/tests/browser/translations-test.mjs",
 ]
 
+["browser_translations_full_page_ai_feature_app_menu.js"]
+
 ["browser_translations_full_page_intersection_content_eager.js"]
 
 ["browser_translations_full_page_intersection_find_bar.js"]
diff --git a/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_app_menu.js b/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_app_menu.js
new file mode 100644
index 0000000000000..c1710de0db660
--- /dev/null
+++ b/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_app_menu.js
@@ -0,0 +1,77 @@
+/* Any copyright is dedicated to the Public Domain.
+   https://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/**
+ * This test case ensures that the Application Menu Translate item responds to the
+ * Translations feature becoming enabled, and then disabled again.
+ */
+add_task(async function test_app_menu_ai_feature_toggle_from_disabled() {
+  const { cleanup, runInPage } = await loadTestPage({
+    page: SPANISH_PAGE_URL,
+    languagePairs: LANGUAGE_PAIRS,
+    prefs: [
+      ["browser.translations.enable", false],
+      ["browser.ai.control.default", "blocked"],
+      ["browser.ai.control.translations", "blocked"],
+    ],
+  });
+
+  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
+  await FullPageTranslationsTestUtils.assertAppMenuTranslateItemVisibility(
+    { visible: false },
+    "The app-menu translate button is hidden when the page loads with Translations feature disabled."
+  );
+
+  await TranslationsParent.AIFeature.enable();
+  await FullPageTranslationsTestUtils.assertAppMenuTranslateItemVisibility(
+    { visible: true },
+    "The app-menu translate button is visible when the Translations feature is enabled."
+  );
+
+  await TranslationsParent.AIFeature.disable();
+  await FullPageTranslationsTestUtils.assertAppMenuTranslateItemVisibility(
+    { visible: false },
+    "The app-menu translate button is hidden after disabling the Translations feature."
+  );
+
+  await cleanup();
+});
+
+/**
+ * This test case ensures that the Application Menu Translate item responds to the
+ * Translations feature becoming disabled, and then enabled again.
+ */
+add_task(async function test_app_menu_ai_feature_toggle_from_enabled() {
+  const { cleanup, runInPage } = await loadTestPage({
+    page: SPANISH_PAGE_URL,
+    languagePairs: LANGUAGE_PAIRS,
+    prefs: [
+      ["browser.ai.control.default", "available"],
+      ["browser.ai.control.translations", "default"],
+    ],
+  });
+
+  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
+
+  await TranslationsParent.AIFeature.enable();
+  await FullPageTranslationsTestUtils.assertAppMenuTranslateItemVisibility(
+    { visible: true },
+    "The app-menu translate button is visible when the Translations feature is enabled."
+  );
+
+  await TranslationsParent.AIFeature.disable();
+  await FullPageTranslationsTestUtils.assertAppMenuTranslateItemVisibility(
+    { visible: false },
+    "The app-menu translate button is hidden when the Translations feature is disabled."
+  );
+
+  await TranslationsParent.AIFeature.enable();
+  await FullPageTranslationsTestUtils.assertAppMenuTranslateItemVisibility(
+    { visible: true },
+    "The app-menu translate button is visible after enabling the Translations feature."
+  );
+
+  await cleanup();
+});
diff --git a/browser/components/translations/tests/browser/head.js b/browser/components/translations/tests/browser/head.js
index e22ae622dcb0a..515af0ee454e7 100644
--- a/browser/components/translations/tests/browser/head.js
+++ b/browser/components/translations/tests/browser/head.js
@@ -2679,6 +2679,49 @@ class FullPageTranslationsTestUtils {
     );
   }
 
+  /**
+   * Opens the app menu and asserts the translate button visibility.
+   *
+   * @param {object} options
+   * @param {boolean} options.visible
+   * @param {string} message
+   */
+  static async assertAppMenuTranslateItemVisibility({ visible }, message) {
+    if (message) {
+      info(message);
+    }
+
+    if (window.PanelUI.panel.state !== "closed") {
+      const panelHidden = BrowserTestUtils.waitForEvent(
+        window.PanelUI.panel,
+        "popuphidden"
+      );
+      window.PanelUI.hide();
+      await panelHidden;
+    }
+
+    const panelShown = BrowserTestUtils.waitForEvent(
+      window.PanelUI.panel,
+      "popupshown"
+    );
+    window.PanelUI.show();
+    await panelShown;
+
+    const translateSiteButton = maybeGetById("appMenu-translate-button", false);
+    is(
+      translateSiteButton.hidden,
+      !visible,
+      "The app-menu translate button visibility should match the expected state."
+    );
+
+    const panelHidden = BrowserTestUtils.waitForEvent(
+      window.PanelUI.panel,
+      "popuphidden"
+    );
+    window.PanelUI.hide();
+    await panelHidden;
+  }
+
   /**
    * Opens the translations panel via the translations button.
    *

From cceadb3a8154ecfccc27999891d42767c4a5d170 Mon Sep 17 00:00:00 2001
From: Erik Nordin <enordin@mozilla.com>
Date: Thu, 29 Jan 2026 14:06:55 +0000
Subject: [PATCH 061/116] Bug 2010993 - Rework StatePerTopChromeWindow to
 StatePerTab r=translations-reviewers,gregtatum

This commit reworks our cached state from being per top chrome window
to being truly per tab. Now that the feature can be disabled and enabled
at runtime with multiple tabs open, there is more than just the current
context that we may need to store in order to behave correctly if the
feature becomes re-enabled with multiple tabs still open.

Differential Revision: https://phabricator.services.mozilla.com/D280387
---
 .../actors/TranslationsParent.sys.mjs         | 122 ++++++++----------
 1 file changed, 52 insertions(+), 70 deletions(-)

diff --git a/toolkit/components/translations/actors/TranslationsParent.sys.mjs b/toolkit/components/translations/actors/TranslationsParent.sys.mjs
index 507b1a2ec254b..a39914e72756b 100644
--- a/toolkit/components/translations/actors/TranslationsParent.sys.mjs
+++ b/toolkit/components/translations/actors/TranslationsParent.sys.mjs
@@ -253,65 +253,52 @@ const VERIFY_SIGNATURES_FROM_FS = false;
  */
 
 /**
- * The state that is stored per a "top" ChromeWindow. This "top" ChromeWindow is the JS
- * global associated with a browser window. Some state is unique to a browser window, and
- * using the top ChromeWindow is a unique key that ensures the state will be unique to
- * that browser window.
+ * The state that is stored per tab.
  *
- * See BrowsingContext.webidl for information on the "top"
  * See the TranslationsParent JSDoc for more information on the state management.
  */
-class StatePerTopChromeWindow {
+class StatePerTab {
   /**
-   * The storage backing for the states.
+   * A mapping from the browser element to the state for this tab.
    *
-   * @type {WeakMap<ChromeWindow, StatePerTopChromeWindow>}
+   * @type {WeakMap<object, StatePerTab>}
    */
   static #states = new WeakMap();
 
   /**
    * When reloading the page, store the language pair that needs translating.
    *
-   * @type {null | LanguagePair}
+   * @type {LanguagePair | null}
    */
   translateOnPageReload = null;
 
-  /**
-   * The page may auto-translate due to user settings. On a page restore, always
-   * skip the page restore logic.
-   *
-   * @type {boolean}
-   */
-  isPageRestored = false;
-
   /**
    * Remember the detected languages on a page reload. This will keep the translations
    * button from disappearing and reappearing, which causes the button to lose focus.
    *
-   * @type {LangTags | null} previousDetectedLanguages
+   * @type {LangTags | null}
    */
-  previousDetectedLanguages = null;
+  detectedLanguages = null;
 
-  static #id = 0;
   /**
-   * @param {ChromeWindow} topChromeWindow
+   * The page may auto-translate due to user settings. On a page restore, always
+   * skip the logic that would cause an immediate auto re-translation.
+   *
+   * @type {boolean}
    */
-  constructor(topChromeWindow) {
-    this.id = StatePerTopChromeWindow.#id++;
-    StatePerTopChromeWindow.#states.set(topChromeWindow, this);
-  }
+  skipAutoTranslate = false;
 
   /**
-   * @param {ChromeWindow} topChromeWindow
-   * @returns {StatePerTopChromeWindow}
+   * @param {object} browser
+   * @returns {StatePerTab}
    */
-  static getOrCreate(topChromeWindow) {
-    let state = StatePerTopChromeWindow.#states.get(topChromeWindow);
+  static getOrCreate(browser) {
+    let state = StatePerTab.#states.get(browser);
     if (state) {
       return state;
     }
-    state = new StatePerTopChromeWindow(topChromeWindow);
-    StatePerTopChromeWindow.#states.set(topChromeWindow, state);
+    state = new StatePerTab();
+    StatePerTab.#states.set(browser, state);
     return state;
   }
 }
@@ -324,7 +311,7 @@ class StatePerTopChromeWindow {
  * Care must be taken for the life cycle of the state management and data caching. The
  * following examples use a fictitious `myState` property to show how state can be stored.
  *
- * There is only 1 TranslationsParent static class in the parent process. At this
+ * There is only one TranslationsParent static class in the parent process. At this
  * layer it is safe to store things like translation models and general browser
  * configuration as these don't change across browser windows. This is accessed like
  * `TranslationsParent.myState`
@@ -336,26 +323,30 @@ class StatePerTopChromeWindow {
  * abstraction, like `this.getWindowState().myState`. This layer also consists of a
  * `FullPageTranslationsPanel` instance per top ChromeWindow (at least on Desktop).
  *
- * The final layer consists of the multiple tabs and navigation history inside of a
- * ChromeWindow. Data for this layer is safe to store on the TranslationsParent instance,
- * like `this.myState`.
+ * The final layer consists of the TranslationsParent actor instances, which exist per tab
+ * and are recreated on page reload. Data for this layer is safe to store on the
+ * TranslationsParent instance, like `this.myState`. However, any data related to the actor
+ * instance that needs to persist between page loads or navigation should be stored in the
+ * StatePerTab map.
  *
  * Below is an ascii diagram of this relationship.
  *
  *   ┌─────────────────────────────────────────────────────────────────────────────┐
  *   │                           static TranslationsParent                         │
  *   └─────────────────────────────────────────────────────────────────────────────┘
- *                  |                                       |
- *                  v                                       v
+ *                    |                                         |
+ *                    v                                         v
  * ┌──────────────────────────────────────┐   ┌──────────────────────────────────────┐
  * │         top ChromeWindow             │   │        top ChromeWindow              │
  * │ (FullPageTranslationsPanel instance) │   │ (FullPageTranslationsPanel instance) │
+ * │ + (Translations URL Button instance) │   │ + (Translations URL Button instance) │
  * └──────────────────────────────────────┘   └──────────────────────────────────────┘
  *             |               |       |                |              |       |
  *             v               v       v                v              v       v
  *   ┌────────────────────┐ ┌─────┐ ┌─────┐  ┌────────────────────┐ ┌─────┐ ┌─────┐
  *   │ TranslationsParent │ │ ... │ │ ... │  │ TranslationsParent │ │ ... │ │ ... │
  *   │  (actor instance)  │ │     │ │     │  │  (actor instance)  │ │     │ │     │
+ *   │   + StatePerTab    │ │     │ │     │  │   + StatePerTab    │ │     │ │     │
  *   └────────────────────┘ └─────┘ └─────┘  └────────────────────┘ └─────┘ └─────┘
  */
 export class TranslationsParent extends JSWindowActorParent {
@@ -568,28 +559,18 @@ export class TranslationsParent extends JSWindowActorParent {
     return this.#findBar;
   }
 
-  /**
-   * There is only one static TranslationsParent for all of the top ChromeWindows.
-   * The top ChromeWindow maps to the user's conception of a window such as when you hit
-   * cmd+n or ctrl+n.
-   *
-   * @returns {StatePerTopChromeWindow}
-   */
-  getWindowState() {
-    const state = StatePerTopChromeWindow.getOrCreate(
-      this.browsingContext.top.embedderWindowGlobal
-    );
-    return state;
-  }
-
   actorCreated() {
-    this.innerWindowId = this.browsingContext.top.embedderElement.innerWindowID;
-    const windowState = this.getWindowState();
+    const browser = this.browsingContext.top.embedderElement;
+    this.innerWindowId = browser.innerWindowID;
+    const tabState = StatePerTab.getOrCreate(browser);
+
+    // Restore detected languages from the tab state (survives page reloads).
+    const previousDetectedLanguages = tabState.detectedLanguages;
+
     this.languageState = new TranslationsLanguageState(
       this,
-      windowState.previousDetectedLanguages
+      previousDetectedLanguages
     );
-    windowState.previousDetectedLanguages = null;
 
     this.#boundObserve = this.#observe.bind(this);
     Services.obs.addObserver(
@@ -597,10 +578,10 @@ export class TranslationsParent extends JSWindowActorParent {
       TOPIC_MAYBE_UPDATE_USER_LANG_TAG
     );
 
-    if (windowState.translateOnPageReload) {
+    if (tabState.translateOnPageReload) {
       // The actor was recreated after a page reload, start the translation.
-      const languagePair = windowState.translateOnPageReload;
-      windowState.translateOnPageReload = null;
+      const languagePair = tabState.translateOnPageReload;
+      tabState.translateOnPageReload = null;
 
       lazy.console.log(
         `Translating on a page reload from "${lazy.TranslationsUtils.serializeLanguagePair(languagePair)}".`
@@ -612,7 +593,6 @@ export class TranslationsParent extends JSWindowActorParent {
       );
     }
 
-    const browser = this.browsingContext.top.embedderElement;
     if (browser) {
       this.#registerFindBarEventListeners(browser);
     }
@@ -1836,10 +1816,11 @@ export class TranslationsParent extends JSWindowActorParent {
    * @returns {boolean}
    */
   #maybeAutoTranslate(langTags) {
-    const windowState = this.getWindowState();
-    if (windowState.isPageRestored) {
+    const browser = this.browsingContext.top.embedderElement;
+    const tabState = StatePerTab.getOrCreate(browser);
+    if (tabState.skipAutoTranslate) {
       // The user clicked the restore button. Respect it for one page load.
-      windowState.isPageRestored = false;
+      tabState.skipAutoTranslate = false;
 
       // Skip this auto-translation.
       return false;
@@ -3469,8 +3450,10 @@ export class TranslationsParent extends JSWindowActorParent {
     if (this.languageState.requestedLanguagePair) {
       // This page has already been translated, restore it and translate it
       // again once the actor has been recreated.
-      const windowState = this.getWindowState();
-      windowState.translateOnPageReload = languagePair;
+      const browser = this.browsingContext.top.embedderElement;
+      const tabState = StatePerTab.getOrCreate(browser);
+      tabState.translateOnPageReload = languagePair;
+      tabState.detectedLanguages = this.languageState.detectedLanguages;
       this.restorePage(sourceLanguage);
     } else {
       const { docLangTag } = this.languageState.detectedLanguages;
@@ -3553,15 +3536,14 @@ export class TranslationsParent extends JSWindowActorParent {
    */
   restorePage() {
     TranslationsParent.telemetry().onRestorePage();
-    // Skip auto-translate for one page load.
-    const windowState = this.getWindowState();
-    windowState.isPageRestored = true;
+    // Skip auto-translate for one page load and preserve detected languages.
+    const browser = this.browsingContext.embedderElement;
+    const tabState = StatePerTab.getOrCreate(browser);
+    tabState.skipAutoTranslate = true;
+    tabState.detectedLanguages = this.languageState.detectedLanguages;
     this.languageState.hasVisibleChange = false;
     this.languageState.requestedLanguagePair = null;
-    windowState.previousDetectedLanguages =
-      this.languageState.detectedLanguages;
 
-    const browser = this.browsingContext.embedderElement;
     browser.reload();
   }
 

From 1288d8c4183d101073ba695fe17f7f4cb055b202 Mon Sep 17 00:00:00 2001
From: Erik Nordin <enordin@mozilla.com>
Date: Thu, 29 Jan 2026 14:06:55 +0000
Subject: [PATCH 062/116] Bug 2010993 - Make FullPage Translations react to
 feature enabledness r=translations-reviewers,gregtatum

This commit ensures that the FullPage Translations functionality is able
to react to the Translations feature becoming enabled and disabled, including
managing the state of the Translations URL bar button across tabs, and handling
context from tabs that may have been disabled mid translation.

Differential Revision: https://phabricator.services.mozilla.com/D280388
---
 browser/base/content/browser-init.js          |  27 +-
 .../content/fullPageTranslationsPanel.js      |  28 +-
 .../tests/browser/browser_full.toml           |   8 +
 ...nslations_full_page_ai_feature_app_menu.js |  65 +++
 ...ons_full_page_ai_feature_auto_translate.js | 176 +++++++
 ...ns_full_page_ai_feature_mid_translation.js | 381 ++++++++++++++
 ...lations_full_page_ai_feature_navigation.js | 159 ++++++
 ...ions_full_page_ai_feature_urlbar_button.js | 302 +++++++++++
 .../actors/TranslationsChild.sys.mjs          |   4 +
 .../actors/TranslationsParent.sys.mjs         | 486 +++++++++++++-----
 toolkit/modules/ActorManagerParent.sys.mjs    |   6 +
 11 files changed, 1502 insertions(+), 140 deletions(-)
 create mode 100644 browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_auto_translate.js
 create mode 100644 browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_mid_translation.js
 create mode 100644 browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_navigation.js
 create mode 100644 browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_urlbar_button.js

diff --git a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js
index 714984cdf97a9..51f6ad46d0478 100644
--- a/browser/base/content/browser-init.js
+++ b/browser/base/content/browser-init.js
@@ -25,7 +25,7 @@ var gBrowserInit = {
    * changes during runtime, such as being blocked or re-enabled in the AI Settings.
    */
   _translationsEnabledStateObserver: {
-    observe(_subject, topic, _data) {
+    observe(_subject, topic, data) {
       if (topic !== "translations:enabled-state-changed") {
         console.warn(`received unexpected topic: ${topic}`);
         return;
@@ -33,6 +33,23 @@ var gBrowserInit = {
 
       // Ensures that the Application Menu correctly includes or omits the translate-page menu item.
       XULBrowserWindow._updateElementsForContentType();
+
+      if (data === "enabled") {
+        // When the feature is re-enabled, ensure that actor instances exist for all tabs.
+        // This loop is synchronous, but should be lightweight to instantiate only the actor objects.
+        // Any expensive work is scheduled asynchronously to the event loop by the actor itself after construction.
+        for (const tab of gBrowser.tabs) {
+          try {
+            // Ensure that a Translations actor instance is (re)created for each open tab that is allowed to have one.
+            tab.linkedBrowser?.browsingContext?.currentWindowGlobal?.getActor(
+              "Translations"
+            );
+          } catch {
+            // Not every tab is allowed to have a Translations actor, which is okay.
+            // See ActorManagerParent for the official allow list of URLs.
+          }
+        }
+      }
     },
   },
 
@@ -232,6 +249,14 @@ var gBrowserInit = {
       "TranslationsParent:OfferTranslation",
       FullPageTranslationsPanel
     );
+    gBrowser.tabContainer.addEventListener("TabSelect", () => {
+      // This ensures that the Translations URL-bar button becomes hidden when
+      // the feature becomes disabled, even when switching from tabs such as
+      // about:newtab that do not have an actor instance available to them.
+      if (!TranslationsParent.AIFeature.isEnabled) {
+        FullPageTranslationsPanel.buttonElements.button.hidden = true;
+      }
+    });
     gBrowser.addTabsProgressListener(FullPageTranslationsPanel);
 
     window.addEventListener("AppCommand", HandleAppCommandEvent, true);
diff --git a/browser/components/translations/content/fullPageTranslationsPanel.js b/browser/components/translations/content/fullPageTranslationsPanel.js
index ab8c30923722c..1107e99571b1b 100644
--- a/browser/components/translations/content/fullPageTranslationsPanel.js
+++ b/browser/components/translations/content/fullPageTranslationsPanel.js
@@ -1418,9 +1418,19 @@ var FullPageTranslationsPanel = new (class {
    * @param {tabbrowser} browser
    */
   onLocationChange(browser) {
+    if (browser !== gBrowser.selectedBrowser) {
+      // If the given browser is not for the active tab, we should not process it right now.
+      // Its state will be processed accordingly whenever that tab becomes active.
+      return;
+    }
+
     if (browser.currentURI.spec.startsWith("about:reader")) {
       // Hide the translations button when entering reader mode.
       this.buttonElements.button.hidden = true;
+    } else if (!TranslationsParent.AIFeature.isEnabled) {
+      // When the Translations feature is disabled, no actor instance is created, therefore no
+      // event will be dispatched to update button visibility. We need to handle it here instead.
+      this.buttonElements.button.hidden = true;
     }
   }
 
@@ -1571,15 +1581,17 @@ var FullPageTranslationsPanel = new (class {
         }
 
         if (
+          // Only show the button if the Translations feature is enabled.
+          TranslationsParent.AIFeature.isEnabled &&
           // We've already requested to translate this page, so always show the icon.
-          requestedLanguagePair ||
-          // There was an error translating, so always show the icon. This can happen
-          // when a user manually invokes the translation and we wouldn't normally show
-          // the icon.
-          error ||
-          // Finally check that we can translate this language.
-          (hasSupportedLanguage &&
-            TranslationsParent.getIsTranslationsEngineSupported())
+          (requestedLanguagePair ||
+            // There was an error translating, so always show the icon. This can happen
+            // when a user manually invokes the translation and we wouldn't normally show
+            // the icon.
+            error ||
+            // Finally check that we can translate this language.
+            (hasSupportedLanguage &&
+              TranslationsParent.getIsTranslationsEngineSupported()))
         ) {
           // Keep track if the button was originally hidden, because it will be shown now.
           const wasButtonHidden = button.hidden;
diff --git a/browser/components/translations/tests/browser/browser_full.toml b/browser/components/translations/tests/browser/browser_full.toml
index 53fb7af9b69eb..fe4b36c0dc7b1 100644
--- a/browser/components/translations/tests/browser/browser_full.toml
+++ b/browser/components/translations/tests/browser/browser_full.toml
@@ -8,6 +8,14 @@ support-files = [
 
 ["browser_translations_full_page_ai_feature_app_menu.js"]
 
+["browser_translations_full_page_ai_feature_auto_translate.js"]
+
+["browser_translations_full_page_ai_feature_mid_translation.js"]
+
+["browser_translations_full_page_ai_feature_navigation.js"]
+
+["browser_translations_full_page_ai_feature_urlbar_button.js"]
+
 ["browser_translations_full_page_intersection_content_eager.js"]
 
 ["browser_translations_full_page_intersection_find_bar.js"]
diff --git a/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_app_menu.js b/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_app_menu.js
index c1710de0db660..ec929d4cefaa9 100644
--- a/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_app_menu.js
+++ b/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_app_menu.js
@@ -11,6 +11,7 @@ add_task(async function test_app_menu_ai_feature_toggle_from_disabled() {
   const { cleanup, runInPage } = await loadTestPage({
     page: SPANISH_PAGE_URL,
     languagePairs: LANGUAGE_PAIRS,
+    autoDownloadFromRemoteSettings: true,
     prefs: [
       ["browser.translations.enable", false],
       ["browser.ai.control.default", "blocked"],
@@ -30,6 +31,30 @@ add_task(async function test_app_menu_ai_feature_toggle_from_disabled() {
     "The app-menu translate button is visible when the Translations feature is enabled."
   );
 
+  await FullPageTranslationsTestUtils.openPanel({
+    expectedFromLanguage: "es",
+    expectedToLanguage: "en",
+    openFromAppMenu: true,
+    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
+  });
+
+  await FullPageTranslationsTestUtils.clickTranslateButton();
+
+  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
+    fromLanguage: "es",
+    toLanguage: "en",
+    runInPage,
+  });
+
+  await FullPageTranslationsTestUtils.openPanel({
+    expectedToLanguage: "en",
+    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit,
+  });
+
+  await FullPageTranslationsTestUtils.clickRestoreButton();
+
+  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
+
   await TranslationsParent.AIFeature.disable();
   await FullPageTranslationsTestUtils.assertAppMenuTranslateItemVisibility(
     { visible: false },
@@ -47,6 +72,7 @@ add_task(async function test_app_menu_ai_feature_toggle_from_enabled() {
   const { cleanup, runInPage } = await loadTestPage({
     page: SPANISH_PAGE_URL,
     languagePairs: LANGUAGE_PAIRS,
+    autoDownloadFromRemoteSettings: true,
     prefs: [
       ["browser.ai.control.default", "available"],
       ["browser.ai.control.translations", "default"],
@@ -61,6 +87,30 @@ add_task(async function test_app_menu_ai_feature_toggle_from_enabled() {
     "The app-menu translate button is visible when the Translations feature is enabled."
   );
 
+  await FullPageTranslationsTestUtils.openPanel({
+    expectedFromLanguage: "es",
+    expectedToLanguage: "en",
+    openFromAppMenu: true,
+    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
+  });
+
+  await FullPageTranslationsTestUtils.clickTranslateButton();
+
+  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
+    fromLanguage: "es",
+    toLanguage: "en",
+    runInPage,
+  });
+
+  await FullPageTranslationsTestUtils.openPanel({
+    expectedToLanguage: "en",
+    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit,
+  });
+
+  await FullPageTranslationsTestUtils.clickRestoreButton();
+
+  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
+
   await TranslationsParent.AIFeature.disable();
   await FullPageTranslationsTestUtils.assertAppMenuTranslateItemVisibility(
     { visible: false },
@@ -73,5 +123,20 @@ add_task(async function test_app_menu_ai_feature_toggle_from_enabled() {
     "The app-menu translate button is visible after enabling the Translations feature."
   );
 
+  await FullPageTranslationsTestUtils.openPanel({
+    expectedFromLanguage: "es",
+    expectedToLanguage: "en",
+    openFromAppMenu: true,
+    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault,
+  });
+
+  await FullPageTranslationsTestUtils.clickTranslateButton();
+
+  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
+    fromLanguage: "es",
+    toLanguage: "en",
+    runInPage,
+  });
+
   await cleanup();
 });
diff --git a/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_auto_translate.js b/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_auto_translate.js
new file mode 100644
index 0000000000000..06d26309d39cb
--- /dev/null
+++ b/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_auto_translate.js
@@ -0,0 +1,176 @@
+/* Any copyright is dedicated to the Public Domain.
+   https://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/**
+ * This test case verifies that when the Translations feature is re-enabled for pages
+ * that would auto-translate, the active tab translates immediately, but background tabs
+ * will not translate until invoked, in this case by page reload.
+ */
+add_task(
+  async function test_auto_translate_on_reenable_requires_reload_in_background_tab() {
+    const { cleanup, runInPage: runInPage1 } = await loadTestPage({
+      page: SPANISH_PAGE_URL,
+      languagePairs: LANGUAGE_PAIRS,
+      autoDownloadFromRemoteSettings: true,
+      prefs: [
+        ["browser.translations.enable", false],
+        ["browser.ai.control.default", "blocked"],
+        ["browser.ai.control.translations", "blocked"],
+        ["browser.translations.alwaysTranslateLanguages", "es"],
+      ],
+    });
+
+    const tab1 = gBrowser.selectedTab;
+
+    await FullPageTranslationsTestUtils.assertTranslationsButton(
+      { button: false },
+      "The URL bar translate button is hidden in tab 1 with Translations feature disabled."
+    );
+
+    await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage1);
+
+    info("Opening a second tab while Translations feature is still disabled.");
+    const { removeTab: removeTab2, runInPage: runInPage2 } = await addTab(
+      SPANISH_PAGE_URL,
+      "Opening second Spanish tab"
+    );
+
+    await FullPageTranslationsTestUtils.assertTranslationsButton(
+      { button: false },
+      "The URL bar translate button is hidden in tab 2 with Translations feature disabled."
+    );
+
+    await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage2);
+
+    info("Re-enabling the Translations feature from tab 2 (active tab).");
+    await TranslationsParent.AIFeature.enable();
+
+    await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated(
+      {
+        fromLanguage: "es",
+        toLanguage: "en",
+        runInPage: runInPage2,
+      }
+    );
+
+    await FullPageTranslationsTestUtils.assertTranslationsButton(
+      { button: true, circleArrows: false, locale: true, icon: true },
+      "The URL bar translate button shows locale indicator after auto-translation in tab 2."
+    );
+
+    info("Switching to tab 1 to verify it does not auto-translate.");
+    await switchTab(tab1, "Switching to tab 1");
+
+    await FullPageTranslationsTestUtils.assertTranslationsButton(
+      { button: true, circleArrows: false, locale: false, icon: true },
+      "The URL bar translate button is visible in tab 1 but without circleArrows, indicating no auto-translate occurred."
+    );
+
+    await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage1);
+
+    await navigate("Manually reloading tab 1. Auto-translate should trigger", {
+      url: SPANISH_PAGE_URL,
+    });
+
+    await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated(
+      {
+        fromLanguage: "es",
+        toLanguage: "en",
+        runInPage: runInPage1,
+      }
+    );
+
+    await FullPageTranslationsTestUtils.assertTranslationsButton(
+      { button: true, circleArrows: false, locale: true, icon: true },
+      "The URL bar translate button shows locale indicator after auto-translation."
+    );
+
+    await removeTab2();
+    await cleanup();
+  }
+);
+
+/**
+ * This test case verifies that when the Translations feature is re-enabled for pages
+ * that would auto-translate, the active tab translates immediately, but background tabs
+ * will not translate until invoked, in this case via the Translations panel.
+ */
+add_task(async function test_manual_translate_on_reenable_in_background_tab() {
+  const { cleanup, runInPage: runInPage1 } = await loadTestPage({
+    page: SPANISH_PAGE_URL,
+    languagePairs: LANGUAGE_PAIRS,
+    autoDownloadFromRemoteSettings: true,
+    prefs: [
+      ["browser.translations.enable", false],
+      ["browser.ai.control.default", "blocked"],
+      ["browser.ai.control.translations", "blocked"],
+      ["browser.translations.alwaysTranslateLanguages", "es"],
+    ],
+  });
+
+  const tab1 = gBrowser.selectedTab;
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: false },
+    "The URL bar translate button is hidden in tab 1 with Translations feature disabled."
+  );
+
+  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage1);
+
+  info("Opening a second tab while Translations feature is still disabled.");
+  const { removeTab: removeTab2, runInPage: runInPage2 } = await addTab(
+    SPANISH_PAGE_URL,
+    "Opening second Spanish tab"
+  );
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: false },
+    "The URL bar translate button is hidden in tab 2 with Translations feature disabled."
+  );
+
+  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage2);
+
+  info("Re-enabling the Translations feature from tab 2 (active tab).");
+  await TranslationsParent.AIFeature.enable();
+
+  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
+    fromLanguage: "es",
+    toLanguage: "en",
+    runInPage: runInPage2,
+  });
+
+  info("Switching to tab 1 to verify it does not auto-translate.");
+  await switchTab(tab1, "Switching to tab 1");
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: false, locale: false, icon: true },
+    "The URL bar translate button is visible in tab 1 but no auto-translate occurred."
+  );
+
+  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage1);
+
+  info("Manually translating tab 1 by opening the panel.");
+  await FullPageTranslationsTestUtils.openPanel({
+    expectedFromLanguage: "es",
+    expectedToLanguage: "en",
+    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault,
+  });
+
+  await FullPageTranslationsTestUtils.clickTranslateButton();
+
+  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
+    fromLanguage: "es",
+    toLanguage: "en",
+    runInPage: runInPage1,
+  });
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: false, locale: true, icon: true },
+    "The URL bar translate button shows locale indicator after translation."
+  );
+
+  await removeTab2();
+  await cleanup();
+});
diff --git a/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_mid_translation.js b/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_mid_translation.js
new file mode 100644
index 0000000000000..2d8f03298667a
--- /dev/null
+++ b/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_mid_translation.js
@@ -0,0 +1,381 @@
+/* Any copyright is dedicated to the Public Domain.
+   https://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/**
+ * This test case verifies that when the Translations feature is disabled while a translation
+ * is active, the button disappears and the page is left in a partially translated state.
+ * Upon re-enabling the Translations feature, the page in the active tab should automatically
+ * reload to restore the original content.
+ */
+add_task(async function test_mid_translation_disable_and_reenable_active_tab() {
+  const { cleanup, runInPage } = await loadTestPage({
+    page: SPANISH_PAGE_URL,
+    languagePairs: LANGUAGE_PAIRS,
+    autoDownloadFromRemoteSettings: true,
+    prefs: [
+      ["browser.ai.control.default", "available"],
+      ["browser.ai.control.translations", "default"],
+    ],
+  });
+
+  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
+
+  await TranslationsParent.AIFeature.enable();
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: false, locale: false, icon: true },
+    "The URL bar translate button is visible when the Translations feature is enabled."
+  );
+
+  await FullPageTranslationsTestUtils.openPanel({
+    expectedFromLanguage: "es",
+    expectedToLanguage: "en",
+    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
+  });
+
+  await FullPageTranslationsTestUtils.clickTranslateButton();
+
+  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
+    fromLanguage: "es",
+    toLanguage: "en",
+    runInPage,
+  });
+
+  info("Verifying that H1 is translated but final paragraph is not.");
+  await FullPageTranslationsTestUtils.assertPageH1ContentIsTranslated({
+    fromLanguage: "es",
+    toLanguage: "en",
+    runInPage,
+  });
+
+  await FullPageTranslationsTestUtils.assertPageFinalParagraphContentIsNotTranslated(
+    { runInPage }
+  );
+
+  info("Disabling the Translations feature while translation is active.");
+  const browser = gBrowser.selectedBrowser;
+  const reloadPromise = BrowserTestUtils.browserLoaded(browser);
+
+  await TranslationsParent.AIFeature.disable();
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: false },
+    "The URL bar translate button is hidden after disabling the Translations feature."
+  );
+
+  info("Scrolling to bottom to verify no new translations occur.");
+  await scrollToBottomOfPage(runInPage);
+
+  await FullPageTranslationsTestUtils.assertPageFinalParagraphContentIsNotTranslated(
+    {
+      runInPage,
+      message:
+        "The final paragraph should not be translated after feature was disabled.",
+    }
+  );
+
+  info(
+    "Re-enabling the Translations feature. Page should automatically reload."
+  );
+  await TranslationsParent.AIFeature.enable();
+
+  info("Waiting for page reload to complete.");
+  await reloadPromise;
+
+  info("Scrolling to top of page after reload.");
+  await scrollToTopOfPage(runInPage);
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: false, locale: false, icon: true },
+    "The URL bar translate button is visible after page reload."
+  );
+
+  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
+
+  info("Verifying that a new translation can be started successfully.");
+  await FullPageTranslationsTestUtils.openPanel({
+    expectedFromLanguage: "es",
+    expectedToLanguage: "en",
+    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault,
+  });
+
+  await FullPageTranslationsTestUtils.clickTranslateButton();
+
+  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
+    fromLanguage: "es",
+    toLanguage: "en",
+    runInPage,
+  });
+
+  await cleanup();
+});
+
+/**
+ * This test case verifies that when the Translations feature is disabled while a translation
+ * is active, the button disappears and the page is left in a partially translated state.
+ * Upon re-enabling the Translations feature, the page in the background tab should show the
+ * Translations button, but not automatically refresh. Upon switching to the background tab,
+ * the page should refresh itself to restore the original content, after which a new
+ * translation can be invoked.
+ */
+add_task(
+  async function test_mid_translation_disable_and_reenable_background_tab() {
+    const { cleanup, runInPage: runInPage1 } = await loadTestPage({
+      page: SPANISH_PAGE_URL,
+      languagePairs: LANGUAGE_PAIRS,
+      autoDownloadFromRemoteSettings: true,
+      prefs: [
+        ["browser.ai.control.default", "available"],
+        ["browser.ai.control.translations", "default"],
+      ],
+    });
+
+    const tab1 = gBrowser.selectedTab;
+
+    await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage1);
+
+    await TranslationsParent.AIFeature.enable();
+    await FullPageTranslationsTestUtils.assertTranslationsButton(
+      { button: true, circleArrows: false, locale: false, icon: true },
+      "The URL bar translate button is visible in tab 1."
+    );
+
+    await FullPageTranslationsTestUtils.openPanel({
+      expectedFromLanguage: "es",
+      expectedToLanguage: "en",
+      onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
+    });
+
+    await FullPageTranslationsTestUtils.clickTranslateButton();
+
+    await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated(
+      {
+        fromLanguage: "es",
+        toLanguage: "en",
+        runInPage: runInPage1,
+      }
+    );
+
+    info("Verifying that H1 is translated but final paragraph is not.");
+    await FullPageTranslationsTestUtils.assertPageH1ContentIsTranslated({
+      fromLanguage: "es",
+      toLanguage: "en",
+      runInPage: runInPage1,
+    });
+
+    await FullPageTranslationsTestUtils.assertPageFinalParagraphContentIsNotTranslated(
+      { runInPage: runInPage1 }
+    );
+
+    info("Disabling the Translations feature while translation is active.");
+    await TranslationsParent.AIFeature.disable();
+
+    await FullPageTranslationsTestUtils.assertTranslationsButton(
+      { button: false },
+      "The URL bar translate button is hidden after disabling the Translations feature."
+    );
+
+    info("Opening a second tab.");
+    const { removeTab: removeTab2 } = await addTab(
+      SPANISH_PAGE_URL,
+      "Opening second Spanish tab"
+    );
+
+    await FullPageTranslationsTestUtils.assertTranslationsButton(
+      { button: false },
+      "The URL bar translate button is hidden in tab 2 while feature is disabled."
+    );
+
+    info("Re-enabling the Translations feature from tab 2.");
+    await TranslationsParent.AIFeature.enable();
+
+    await FullPageTranslationsTestUtils.assertTranslationsButton(
+      { button: true, circleArrows: false, locale: false, icon: true },
+      "The URL bar translate button is visible in tab 2 after re-enabling."
+    );
+
+    info("Setting up reload promise for tab 1 before switching to it.");
+    const browser1 = tab1.linkedBrowser;
+    const reloadPromise = BrowserTestUtils.browserLoaded(browser1);
+
+    info("Switching back to tab 1. Page should reload.");
+    await switchTab(tab1, "Switching to tab 1");
+
+    info("Waiting for tab 1 to reload.");
+    await reloadPromise;
+
+    await FullPageTranslationsTestUtils.assertTranslationsButton(
+      { button: true, circleArrows: false, locale: false, icon: true },
+      "The URL bar translate button is visible in tab 1 after reload, indicating page is not translated."
+    );
+
+    await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage1);
+
+    info("Verifying that a new translation can be started successfully.");
+    await FullPageTranslationsTestUtils.openPanel({
+      expectedFromLanguage: "es",
+      expectedToLanguage: "en",
+      onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault,
+    });
+
+    await FullPageTranslationsTestUtils.clickTranslateButton();
+
+    await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated(
+      {
+        fromLanguage: "es",
+        toLanguage: "en",
+        runInPage: runInPage1,
+      }
+    );
+
+    await FullPageTranslationsTestUtils.assertTranslationsButton(
+      { button: true, circleArrows: false, locale: true, icon: true },
+      "The URL bar translate button shows locale indicator after translation."
+    );
+
+    await removeTab2();
+    await cleanup();
+  }
+);
+
+/**
+ * This test case verifies that when translation is active in a background tab,
+ * and the Translations feature is disabled from an active tab that has no actor
+ * instance (such as about:blank), then the translate button is properly
+ * hidden when switching back to a background tab that had an active translation.
+ */
+add_task(async function test_mid_translation_disable_from_tab_without_actor() {
+  const { cleanup, runInPage } = await loadTestPage({
+    page: SPANISH_PAGE_URL,
+    languagePairs: LANGUAGE_PAIRS,
+    autoDownloadFromRemoteSettings: true,
+    prefs: [
+      ["browser.ai.control.default", "available"],
+      ["browser.ai.control.translations", "default"],
+    ],
+  });
+
+  const tab1 = gBrowser.selectedTab;
+
+  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
+
+  await TranslationsParent.AIFeature.enable();
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: false, locale: false, icon: true },
+    "The URL bar translate button is visible in tab 1."
+  );
+
+  await FullPageTranslationsTestUtils.openPanel({
+    expectedFromLanguage: "es",
+    expectedToLanguage: "en",
+    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
+  });
+
+  await FullPageTranslationsTestUtils.clickTranslateButton();
+
+  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
+    fromLanguage: "es",
+    toLanguage: "en",
+    runInPage,
+  });
+
+  info("Opening about:blank tab.");
+  const { removeTab } = await addTab("about:blank", "Opening about:blank tab");
+
+  info("Disabling the Translations feature from about:blank tab.");
+  await TranslationsParent.AIFeature.disable();
+
+  info("Switching back to tab 1 with active translation.");
+  await switchTab(tab1, "Switching to tab 1");
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: false },
+    "The URL bar translate button is hidden in tab 1 after disabling from about:blank."
+  );
+
+  await removeTab();
+  await cleanup();
+});
+
+/**
+ * This test case verifies behavior when the Translations feature is disabled while language models
+ * are still loading, then the feature is re-enabled and a subsequent translation attempt is invoked
+ * for the same language pair.
+ */
+add_task(async function test_disable_feature_during_model_loading() {
+  const { cleanup, runInPage, resolveDownloads } = await loadTestPage({
+    page: SPANISH_PAGE_URL,
+    languagePairs: LANGUAGE_PAIRS,
+    autoDownloadFromRemoteSettings: false,
+    prefs: [
+      ["browser.ai.control.default", "available"],
+      ["browser.ai.control.translations", "default"],
+    ],
+  });
+
+  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
+
+  await TranslationsParent.AIFeature.enable();
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: false, locale: false, icon: true },
+    "The URL bar translate button is visible when the Translations feature is enabled."
+  );
+
+  await FullPageTranslationsTestUtils.openPanel({
+    expectedFromLanguage: "es",
+    expectedToLanguage: "en",
+    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
+  });
+
+  info(
+    "Clicking translate button without resolving downloads to simulate models loading."
+  );
+  await FullPageTranslationsTestUtils.clickTranslateButton({
+    downloadHandler: null,
+  });
+
+  info("Waiting for the button to show the loading indicator.");
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: true, locale: false, icon: true },
+    "The button shows the loading indicator while models are downloading."
+  );
+
+  info(
+    "Disabling the Translations feature while models are still loading (downloads not resolved)."
+  );
+  await TranslationsParent.AIFeature.disable();
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: false },
+    "The URL bar translate button is hidden after disabling the Translations feature."
+  );
+
+  info("Re-enabling the Translations feature.");
+  await TranslationsParent.AIFeature.enable();
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: false, locale: false, icon: true },
+    "The URL bar translate button is visible after re-enabling."
+  );
+
+  info("Attempting to translate again with the same language pair.");
+  await FullPageTranslationsTestUtils.openPanel({
+    expectedFromLanguage: "es",
+    expectedToLanguage: "en",
+    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault,
+  });
+
+  info("This time, resolve downloads so translation can complete.");
+  await FullPageTranslationsTestUtils.clickTranslateButton({
+    downloadHandler: resolveDownloads,
+  });
+
+  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
+    fromLanguage: "es",
+    toLanguage: "en",
+    runInPage,
+  });
+
+  await cleanup();
+});
diff --git a/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_navigation.js b/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_navigation.js
new file mode 100644
index 0000000000000..32f350fdddf8c
--- /dev/null
+++ b/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_navigation.js
@@ -0,0 +1,159 @@
+/* Any copyright is dedicated to the Public Domain.
+   https://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/**
+ * This test case verifies that language detection works correctly when the
+ * feature is disabled and immediately re-enabled on the same page without
+ * navigation.
+ */
+add_task(async function test_toggle_without_navigation_detects_language() {
+  const { cleanup } = await loadTestPage({
+    page: SPANISH_PAGE_URL,
+    languagePairs: LANGUAGE_PAIRS,
+    autoDownloadFromRemoteSettings: true,
+    prefs: [
+      ["browser.ai.control.default", "available"],
+      ["browser.ai.control.translations", "default"],
+    ],
+  });
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: false, locale: false, icon: true },
+    "The URL bar translate button is visible on Spanish page."
+  );
+
+  info("Disabling and immediately re-enabling without navigation.");
+  await TranslationsParent.AIFeature.disable();
+  await TranslationsParent.AIFeature.enable();
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: false, locale: false, icon: true },
+    "The URL bar translate button is visible after toggling."
+  );
+
+  info("Verifying Spanish is still detected correctly by translating.");
+  await FullPageTranslationsTestUtils.openPanel({
+    expectedFromLanguage: "es",
+    expectedToLanguage: "en",
+    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
+  });
+
+  await FullPageTranslationsTestUtils.clickTranslateButton();
+
+  await cleanup();
+});
+
+/**
+ * This test case verifies that when the Translations feature is disabled, then the user
+ * navigates to a different-language page, and the feature is re-enabled, the
+ * detected languages correctly reflect the new page's language.
+ */
+add_task(async function test_navigation_while_disabled_detects_current_page() {
+  const { cleanup } = await loadTestPage({
+    page: SPANISH_PAGE_URL,
+    languagePairs: LANGUAGE_PAIRS,
+    autoDownloadFromRemoteSettings: true,
+    prefs: [
+      ["browser.ai.control.default", "available"],
+      ["browser.ai.control.translations", "default"],
+    ],
+  });
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: false, locale: false, icon: true },
+    "The URL bar translate button is visible on Spanish page."
+  );
+
+  info("Disabling the Translations feature while on Spanish page.");
+  await TranslationsParent.AIFeature.disable();
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: false },
+    "The URL bar translate button is hidden after disabling the Translations feature."
+  );
+
+  await navigate("Navigating to French page while feature is disabled", {
+    url: FRENCH_PAGE_URL,
+  });
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: false },
+    "The URL bar translate button is still hidden on French page."
+  );
+
+  info("Re-enabling the Translations feature on French page.");
+  await TranslationsParent.AIFeature.enable();
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: false, locale: false, icon: true },
+    "The URL bar translate button is visible after re-enabling."
+  );
+
+  info("Verifying French is detected by translating the page.");
+  await FullPageTranslationsTestUtils.openPanel({
+    expectedFromLanguage: "fr",
+    expectedToLanguage: "en",
+    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
+  });
+
+  await FullPageTranslationsTestUtils.clickTranslateButton();
+
+  await cleanup();
+});
+
+/**
+ * This test case verifies that after multiple navigations while the Translations
+ * feature is disabled, the detected languages correctly reflect the current page's
+ * language when the feature is re-enabled, not any previously visited pages.
+ */
+add_task(async function test_multiple_navigations_while_disabled() {
+  const { cleanup } = await loadTestPage({
+    page: SPANISH_PAGE_URL,
+    languagePairs: LANGUAGE_PAIRS,
+    autoDownloadFromRemoteSettings: true,
+    prefs: [
+      ["browser.ai.control.default", "available"],
+      ["browser.ai.control.translations", "default"],
+    ],
+  });
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: false, locale: false, icon: true },
+    "The URL bar translate button is visible on Spanish page."
+  );
+
+  info("Disabling the Translations feature on Spanish page.");
+  await TranslationsParent.AIFeature.disable();
+
+  await navigate("Navigating to French page while feature is disabled", {
+    url: FRENCH_PAGE_URL,
+  });
+
+  await navigate(
+    "Navigating back to Spanish page, still with feature disabled",
+    {
+      url: SPANISH_PAGE_URL,
+    }
+  );
+
+  info("Re-enabling the Translations feature on Spanish page.");
+  await TranslationsParent.AIFeature.enable();
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: false, locale: false, icon: true },
+    "The URL bar translate button is visible after re-enabling."
+  );
+
+  info("Verifying Spanish is detected by translating the page.");
+  await FullPageTranslationsTestUtils.openPanel({
+    expectedFromLanguage: "es",
+    expectedToLanguage: "en",
+    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
+  });
+
+  await FullPageTranslationsTestUtils.clickTranslateButton();
+
+  await cleanup();
+});
diff --git a/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_urlbar_button.js b/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_urlbar_button.js
new file mode 100644
index 0000000000000..82ee8b03d2569
--- /dev/null
+++ b/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_urlbar_button.js
@@ -0,0 +1,302 @@
+/* Any copyright is dedicated to the Public Domain.
+   https://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/**
+ * This test case ensures that the URL-bar translate button responds to the
+ * Translations feature becoming enabled when the page was loaded while
+ * the feature was disabled, and that Translations works correctly once invoked.
+ */
+add_task(async function test_urlbar_button_ai_feature_toggle_from_disabled() {
+  const { cleanup, runInPage } = await loadTestPage({
+    page: SPANISH_PAGE_URL,
+    languagePairs: LANGUAGE_PAIRS,
+    autoDownloadFromRemoteSettings: true,
+    prefs: [
+      ["browser.translations.enable", false],
+      ["browser.ai.control.default", "blocked"],
+      ["browser.ai.control.translations", "blocked"],
+    ],
+  });
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: false },
+    "The URL bar translate button is hidden when the page loads with Translations feature disabled."
+  );
+
+  await TranslationsParent.AIFeature.enable();
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: false, locale: false, icon: true },
+    "The URL bar translate button is visible when the Translations feature is enabled."
+  );
+
+  await FullPageTranslationsTestUtils.openPanel({
+    expectedFromLanguage: "es",
+    expectedToLanguage: "en",
+    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
+  });
+
+  await FullPageTranslationsTestUtils.clickTranslateButton();
+
+  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
+    fromLanguage: "es",
+    toLanguage: "en",
+    runInPage,
+  });
+
+  await FullPageTranslationsTestUtils.openPanel({
+    expectedToLanguage: "en",
+    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit,
+  });
+
+  await FullPageTranslationsTestUtils.clickRestoreButton();
+
+  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
+
+  await TranslationsParent.AIFeature.disable();
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: false },
+    "The URL bar translate button is hidden after disabling the Translations feature."
+  );
+
+  await cleanup();
+});
+
+/**
+ * This test case ensures that the URL bar translate button responds to the
+ * Translations feature becoming disabled, and then enabled again, and that
+ * Translations continues to function correctly when invoked after re-enabling.
+ */
+add_task(async function test_urlbar_button_ai_feature_toggle_from_enabled() {
+  const { cleanup, runInPage } = await loadTestPage({
+    page: SPANISH_PAGE_URL,
+    languagePairs: LANGUAGE_PAIRS,
+    autoDownloadFromRemoteSettings: true,
+    prefs: [
+      ["browser.ai.control.default", "available"],
+      ["browser.ai.control.translations", "default"],
+    ],
+  });
+
+  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
+
+  await TranslationsParent.AIFeature.enable();
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: false, locale: false, icon: true },
+    "The URL bar translate button is visible when the Translations feature is enabled."
+  );
+
+  await FullPageTranslationsTestUtils.openPanel({
+    expectedFromLanguage: "es",
+    expectedToLanguage: "en",
+    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
+  });
+
+  await FullPageTranslationsTestUtils.clickTranslateButton();
+
+  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
+    fromLanguage: "es",
+    toLanguage: "en",
+    runInPage,
+  });
+
+  await FullPageTranslationsTestUtils.openPanel({
+    expectedToLanguage: "en",
+    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit,
+  });
+
+  await FullPageTranslationsTestUtils.clickRestoreButton();
+
+  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
+
+  await TranslationsParent.AIFeature.disable();
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: false },
+    "The URL bar translate button is hidden when the Translations feature is disabled."
+  );
+
+  await TranslationsParent.AIFeature.enable();
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: false, locale: false, icon: true },
+    "The URL bar translate button is visible after enabling the Translations feature."
+  );
+
+  await FullPageTranslationsTestUtils.openPanel({
+    expectedFromLanguage: "es",
+    expectedToLanguage: "en",
+    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault,
+  });
+
+  await FullPageTranslationsTestUtils.changeSelectedToLanguage({
+    langTag: "fr",
+  });
+
+  await FullPageTranslationsTestUtils.clickTranslateButton();
+
+  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
+    fromLanguage: "es",
+    toLanguage: "fr",
+    runInPage,
+  });
+
+  await cleanup();
+});
+
+/**
+ * This test case verifies that the URL-bar translate button state is correctly
+ * updated across multiple tabs when the Translations feature is toggled. When
+ * disabled, the button should be hidden in all tabs, and when re-enabled, the
+ * button should be visible in each tab with a translatable page.
+ */
+add_task(async function test_urlbar_button_ai_feature_toggle_multiple_tabs() {
+  const { runInPage: runInPage1, cleanup: cleanupWindow1 } = await loadTestPage(
+    {
+      page: SPANISH_PAGE_URL,
+      languagePairs: LANGUAGE_PAIRS,
+      prefs: [
+        ["browser.ai.control.default", "available"],
+        ["browser.ai.control.translations", "default"],
+      ],
+    }
+  );
+
+  const tab1 = gBrowser.selectedTab;
+
+  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage1);
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: false, locale: false, icon: true },
+    "The URL bar translate button is visible in tab 1."
+  );
+
+  const { removeTab, runInPage: runInPage2 } = await addTab(
+    SPANISH_PAGE_URL,
+    "Creating a second Spanish page tab"
+  );
+
+  const tab2 = gBrowser.selectedTab;
+
+  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage2);
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: false, locale: false, icon: true },
+    "The URL bar translate button is visible in tab 2."
+  );
+
+  await TranslationsParent.AIFeature.disable();
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: false },
+    "The URL bar translate button is hidden in tab 2 after disabling."
+  );
+
+  await switchTab(tab1, "Switching to tab 1");
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: false },
+    "The URL bar translate button is hidden in tab 1 after disabling."
+  );
+
+  await TranslationsParent.AIFeature.enable();
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: false, locale: false, icon: true },
+    "The URL bar translate button is visible in tab 1 after re-enabling."
+  );
+
+  await switchTab(tab2, "Switching to tab 2");
+
+  await FullPageTranslationsTestUtils.assertTranslationsButton(
+    { button: true, circleArrows: false, locale: false, icon: true },
+    "The URL bar translate button is visible in tab 2 after re-enabling."
+  );
+
+  await removeTab();
+  await cleanupWindow1();
+});
+
+/**
+ * This test case verifies that when the Translations feature is disabled from an active
+ * tab that has no actor (such as about:blank), then translate button is properly hidden
+ * when switching back to a background tab that previously would have had the button visible.
+ */
+add_task(
+  async function test_urlbar_button_ai_feature_disable_from_tab_without_actor() {
+    const { cleanup } = await loadTestPage({
+      page: SPANISH_PAGE_URL,
+      languagePairs: LANGUAGE_PAIRS,
+      autoDownloadFromRemoteSettings: true,
+      prefs: [
+        ["browser.ai.control.default", "available"],
+        ["browser.ai.control.translations", "default"],
+      ],
+    });
+
+    const tab1 = gBrowser.selectedTab;
+
+    await TranslationsParent.AIFeature.enable();
+    await FullPageTranslationsTestUtils.assertTranslationsButton(
+      { button: true, circleArrows: false, locale: false, icon: true },
+      "The URL bar translate button is visible in tab 1."
+    );
+
+    const { removeTab } = await addTab(
+      "about:blank",
+      "Opening about:blank tab"
+    );
+
+    await TranslationsParent.AIFeature.disable();
+
+    await switchTab(tab1, "Switching to tab 1");
+
+    await FullPageTranslationsTestUtils.assertTranslationsButton(
+      { button: false },
+      "The URL bar translate button is hidden in tab 1 after disabling from about:blank."
+    );
+
+    await removeTab();
+    await cleanup();
+  }
+);
+
+/**
+ * This test case verifies that when the Translations feature is enabled from an active tab
+ * that has no actor (such as about:blank), then the translate button is properly shown when
+ * switching back to a background tab whose page would display the translate url-bar button.
+ */
+add_task(
+  async function test_urlbar_button_ai_feature_enable_from_tab_without_actor() {
+    const { cleanup } = await loadTestPage({
+      page: SPANISH_PAGE_URL,
+      languagePairs: LANGUAGE_PAIRS,
+      autoDownloadFromRemoteSettings: true,
+      prefs: [
+        ["browser.ai.control.default", "available"],
+        ["browser.ai.control.translations", "blocked"],
+      ],
+    });
+
+    const tab1 = gBrowser.selectedTab;
+
+    await FullPageTranslationsTestUtils.assertTranslationsButton(
+      { button: false },
+      "The URL bar translate button is hidden when feature is disabled."
+    );
+
+    const { removeTab } = await addTab(
+      "about:blank",
+      "Opening about:blank tab"
+    );
+
+    await TranslationsParent.AIFeature.enable();
+
+    await switchTab(tab1, "Switching to tab 1");
+
+    await FullPageTranslationsTestUtils.assertTranslationsButton(
+      { button: true, circleArrows: false, locale: false, icon: true },
+      "The URL bar translate button is visible in tab 1 after enabling from about:blank."
+    );
+
+    await removeTab();
+    await cleanup();
+  }
+);
diff --git a/toolkit/components/translations/actors/TranslationsChild.sys.mjs b/toolkit/components/translations/actors/TranslationsChild.sys.mjs
index 0f1daa5e09c6b..b328dab5b3a40 100644
--- a/toolkit/components/translations/actors/TranslationsChild.sys.mjs
+++ b/toolkit/components/translations/actors/TranslationsChild.sys.mjs
@@ -140,6 +140,10 @@ export class TranslationsChild extends JSWindowActorChild {
       case "Translations:GetDocumentElementLang": {
         return this.document.documentElement.lang;
       }
+      case "Translations:IsDocumentReady": {
+        const state = this.document.readyState;
+        return state === "interactive" || state === "complete";
+      }
       case "Translations:AcquirePort": {
         this.addProfilerMarker("Acquired a port, resuming translations");
         this.#translatedDoc.acquirePort(data.port);
diff --git a/toolkit/components/translations/actors/TranslationsParent.sys.mjs b/toolkit/components/translations/actors/TranslationsParent.sys.mjs
index a39914e72756b..fc7719c35ba8e 100644
--- a/toolkit/components/translations/actors/TranslationsParent.sys.mjs
+++ b/toolkit/components/translations/actors/TranslationsParent.sys.mjs
@@ -28,7 +28,6 @@ const NEVER_TRANSLATE_LANGS_PREF =
   "browser.translations.neverTranslateLanguages";
 const MOST_RECENT_TARGET_LANGS_PREF =
   "browser.translations.mostRecentTargetLanguages";
-const TRANSLATIONS_ENABLED_PREF = "browser.translations.enable";
 const TOPIC_NS_PREF_CHANGED = "nsPref:changed";
 const TOPIC_TRANSLATIONS_PREF_CHANGED = "translations:pref-changed";
 const TOPIC_TRANSLATIONS_ENABLED_STATE_CHANGED =
@@ -105,20 +104,6 @@ ChromeUtils.defineLazyGetter(lazy, "console", () => {
   });
 });
 
-XPCOMUtils.defineLazyPreferenceGetter(
-  lazy,
-  "translationsEnabledPref",
-  TRANSLATIONS_ENABLED_PREF,
-  /* aDefaultValue */ false,
-  /* aOnUpdate */ () => {
-    Services.obs.notifyObservers(
-      null,
-      TOPIC_TRANSLATIONS_PREF_CHANGED,
-      TRANSLATIONS_ENABLED_PREF
-    );
-  }
-);
-
 /**
  * Returns whether Translations should utilize lexical shortlisting.
  */
@@ -280,6 +265,17 @@ class StatePerTab {
    */
   detectedLanguages = null;
 
+  /**
+   * The URL of the page where detectedLanguages was captured.
+   *
+   * This is used to ensure that the cached detectedLanguage are only considered
+   * if we are on the same URL that they were captured from, otherwise they are
+   * ignored and discarded.
+   *
+   * @type {string | null}
+   */
+  url = null;
+
   /**
    * The page may auto-translate due to user settings. On a page restore, always
    * skip the logic that would cause an immediate auto re-translation.
@@ -288,6 +284,15 @@ class StatePerTab {
    */
   skipAutoTranslate = false;
 
+  /**
+   * If a translation was active when the feature was disabled, the page content
+   * is in a partially translated state and needs to be reloaded before allowing
+   * a new translation.
+   *
+   * @type {boolean}
+   */
+  needsReloadBeforeTranslation = false;
+
   /**
    * @param {object} browser
    * @returns {StatePerTab}
@@ -497,16 +502,27 @@ export class TranslationsParent extends JSWindowActorParent {
   static #REACT_TO_PAGE_LANGUAGE_TIMEOUT = 500;
 
   /**
-   * A race that determines when to react to to the page's language tag.
+   * Tracks the language-detection lifecycle for the page associated with this actor.
+   * - null: Detection has not started.
+   * - PromiseWithResolvers: Detection has started.
+   *
+   * The promise resolves with the reason that detection started, so that it can be
+   * logged to the console.
    *
-   * Ideally, we want to wait for the page to fully load, but we may have
-   * to take action before that.
+   * Detection may start due to 3 scenarios.
    *
-   * @see {TranslationsParent#REACT_TO_PAGE_LANGUAGE_TIMEOUT}
+   * 1) The page loaded while the Translations feature was disabled, and then the user
+   *    enabled the feature in a different tab via the Firefox AI Settings.
+   *
+   * 2) The page loaded with the Translations feature enabled, and we received the "load"
+   *    event before our timeout, signaling that we are ready to scrape the page content.
+   *
+   * 3) The page is loading with the Translations feature enabled, and we received DOMContentLoaded,
+   *    but have not received the "load" event before our specified timeout.
    *
    * @type {PromiseWithResolvers<string> | null}
    */
-  #reactToPageLanguageRace = null;
+  #languageDetectionReason = null;
 
   /**
    * Contains the state that would affect UI. Anytime this state is changed, a dispatch
@@ -560,23 +576,35 @@ export class TranslationsParent extends JSWindowActorParent {
   }
 
   actorCreated() {
-    const browser = this.browsingContext.top.embedderElement;
+    const browser = this.browsingContext?.top?.embedderElement;
+    if (!browser) {
+      lazy.console.warn("Actor created for invalid browser element");
+      return;
+    }
+
     this.innerWindowId = browser.innerWindowID;
     const tabState = StatePerTab.getOrCreate(browser);
 
-    // Restore detected languages from the tab state (survives page reloads).
-    const previousDetectedLanguages = tabState.detectedLanguages;
+    const currentUrl = browser.currentURI?.spec;
+    const detectedLanguages =
+      currentUrl === tabState.url ? tabState.detectedLanguages : null;
 
-    this.languageState = new TranslationsLanguageState(
-      this,
-      previousDetectedLanguages
-    );
+    tabState.detectedLanguages = null;
+    tabState.url = null;
+
+    this.languageState = new TranslationsLanguageState(this, detectedLanguages);
 
     this.#boundObserve = this.#observe.bind(this);
     Services.obs.addObserver(
       this.#boundObserve,
       TOPIC_MAYBE_UPDATE_USER_LANG_TAG
     );
+    Services.obs.addObserver(
+      this.#boundObserve,
+      TOPIC_TRANSLATIONS_ENABLED_STATE_CHANGED
+    );
+
+    this.#registerFindBarEventListeners(browser);
 
     if (tabState.translateOnPageReload) {
       // The actor was recreated after a page reload, start the translation.
@@ -591,11 +619,89 @@ export class TranslationsParent extends JSWindowActorParent {
         languagePair,
         false // reportAsAutoTranslate
       );
+
+      return;
     }
 
-    if (browser) {
-      this.#registerFindBarEventListeners(browser);
+    const isSelectedTab =
+      browser === browser.ownerGlobal?.gBrowser?.selectedBrowser;
+
+    if (tabState.needsReloadBeforeTranslation && isSelectedTab) {
+      tabState.needsReloadBeforeTranslation = false;
+      browser.reload();
+      return;
     }
+
+    this.languageState.dispatch({ reason: "actor-created" });
+    this.#maybeDetectLanguagesIfDocumentReady(isSelectedTab);
+  }
+
+  /**
+   * If the document is already in an interactive or complete state, run language detection.
+   * Otherwise, do nothing, since the language detection will trigger when the page loads.
+   *
+   * This is needed when the feature is re-enabled on pages that are already loaded.
+   *
+   * @param {boolean} isSelectedTab
+   */
+  async #maybeDetectLanguagesIfDocumentReady(isSelectedTab) {
+    if (this.languageState.detectedLanguages || this.#languageDetectionReason) {
+      // Detection already completed or is in progress.
+      return;
+    }
+
+    let isDocumentReady;
+    try {
+      isDocumentReady = await this.sendQuery("Translations:IsDocumentReady");
+    } catch (error) {
+      lazy.console.error("Failed to check document readiness.", error);
+      return;
+    }
+
+    if (this.#isDestroyed) {
+      return;
+    }
+
+    if (!isDocumentReady) {
+      // The document is not ready yet. Language detection will be triggered when the page loads.
+      return;
+    }
+
+    if (this.#languageDetectionReason) {
+      // The document is ready, but the DOMContentLoaded path already triggered language detection.
+      return;
+    }
+
+    this.#languageDetectionReason = Promise.withResolvers();
+    this.#languageDetectionReason.resolve("actor-created");
+
+    await this.#languageDetectionReason.promise.then(async reason => {
+      try {
+        if (this.#isDestroyed) {
+          return;
+        }
+
+        const htmlLangAttribute = await this.queryDocumentElementLang();
+        if (this.#isDestroyed) {
+          return;
+        }
+
+        if (isSelectedTab) {
+          await this.#reactToPageLanguage(htmlLangAttribute, reason);
+        } else {
+          const detectedLanguages =
+            await this.getDetectedLanguages(htmlLangAttribute);
+
+          if (this.#isDestroyed || !detectedLanguages) {
+            return;
+          }
+
+          this.languageState.detectedLanguages = detectedLanguages;
+        }
+      } catch (error) {
+        lazy.console.error("Failed to run language detection.", error);
+      }
+    });
   }
 
   /**
@@ -1112,12 +1218,16 @@ export class TranslationsParent extends JSWindowActorParent {
 
   /**
    * Notifies observers when the Translations feature enabled state changes.
+   * Called by ActorManagerParent after the actor has been registered or unregistered,
+   * ensuring that actors are available when observers receive the notification.
+   *
+   * @param {boolean} isEnabled
    */
-  static #notifyEnabledStateChanged() {
+  static onIsEnabledChanged(isEnabled) {
     Services.obs.notifyObservers(
       null,
       TOPIC_TRANSLATIONS_ENABLED_STATE_CHANGED,
-      TranslationsParent.AIFeature.isEnabled ? "enabled" : "disabled"
+      isEnabled ? "enabled" : "disabled"
     );
   }
 
@@ -1431,6 +1541,12 @@ export class TranslationsParent extends JSWindowActorParent {
         this.#maybeUpdateUserLangTag();
         break;
       }
+      case TOPIC_TRANSLATIONS_ENABLED_STATE_CHANGED: {
+        this.languageState?.dispatch({
+          reason: "feature-enabled-state-changed",
+        });
+        break;
+      }
       default: {
         lazy.console.error(
           `Unexpected topic observed by TranslationsParent actor: '${topic}'`
@@ -1472,10 +1588,6 @@ export class TranslationsParent extends JSWindowActorParent {
       }
       case TOPIC_TRANSLATIONS_PREF_CHANGED: {
         switch (data) {
-          case TRANSLATIONS_ENABLED_PREF: {
-            TranslationsParent.#notifyEnabledStateChanged();
-            break;
-          }
           case USE_LEXICAL_SHORTLIST_PREF: {
             // This is an extreme edge case where someone would flip the useLexicalShortlist
             // pref during an active translation. Most people will not be flipping this pref
@@ -1505,8 +1617,12 @@ export class TranslationsParent extends JSWindowActorParent {
    * Updates the user's language tag if it has changed from the current.
    */
   #maybeUpdateUserLangTag() {
+    if (!this.languageState) {
+      return;
+    }
+    const docLangTag = this.languageState.detectedLanguages?.docLangTag;
     const langTag = TranslationsParent.getPreferredLanguages({
-      excludeLangTags: [this.languageState.detectedLanguages?.docLangTag],
+      excludeLangTags: docLangTag ? [docLangTag] : [],
     })[0];
     this.languageState.maybeUpdateUserLangTag(langTag);
   }
@@ -1656,17 +1772,22 @@ export class TranslationsParent extends JSWindowActorParent {
 
     switch (name) {
       case "Translations:DOMContentLoaded": {
-        const { htmlLangAttribute } = data;
+        if (
+          this.languageState?.detectedLanguages ||
+          this.#languageDetectionReason
+        ) {
+          return undefined;
+        }
 
-        this.#reactToPageLanguageRace = Promise.withResolvers();
-        const { promise, resolve } = this.#reactToPageLanguageRace;
+        const { htmlLangAttribute } = data;
+        this.#languageDetectionReason = Promise.withResolvers();
+        const { promise, resolve } = this.#languageDetectionReason;
 
-        promise.then(reason => {
+        promise.then(async reason => {
           if (this.#isDestroyed) {
             return;
           }
-          this.#reactToPageLanguage(htmlLangAttribute, reason);
-          this.#reactToPageLanguageRace = null;
+          await this.#reactToPageLanguage(htmlLangAttribute, reason);
         });
 
         lazy.setTimeout(() => {
@@ -1676,10 +1797,16 @@ export class TranslationsParent extends JSWindowActorParent {
         return undefined;
       }
       case "Translations:Load": {
-        this.#reactToPageLanguageRace?.resolve("load");
+        this.#languageDetectionReason?.resolve("load");
         return undefined;
       }
       case "Translations:RequestPort": {
+        if (!this.languageState) {
+          lazy.console.error(
+            "A port was requested but the actor was not fully initialized"
+          );
+          return undefined;
+        }
         const { requestedLanguagePair } = this.languageState;
         if (!requestedLanguagePair) {
           lazy.console.error(
@@ -1724,7 +1851,9 @@ export class TranslationsParent extends JSWindowActorParent {
         return undefined;
       }
       case "Translations:ReportFirstVisibleChange": {
-        this.languageState.hasVisibleChange = true;
+        if (this.languageState) {
+          this.languageState.hasVisibleChange = true;
+        }
       }
     }
     return undefined;
@@ -3447,111 +3576,152 @@ export class TranslationsParent extends JSWindowActorParent {
       );
       return;
     }
+    const browser = this.browsingContext.top.embedderElement;
+    const tabState = StatePerTab.getOrCreate(browser);
+
+    if (tabState.needsReloadBeforeTranslation) {
+      tabState.needsReloadBeforeTranslation = false;
+      tabState.translateOnPageReload = languagePair;
+      browser.reload();
+      return;
+    }
+
+    if (!this.languageState) {
+      lazy.console.error(
+        "Translation requested but actor not fully initialized"
+      );
+      return;
+    }
+
     if (this.languageState.requestedLanguagePair) {
-      // This page has already been translated, restore it and translate it
-      // again once the actor has been recreated.
-      const browser = this.browsingContext.top.embedderElement;
-      const tabState = StatePerTab.getOrCreate(browser);
       tabState.translateOnPageReload = languagePair;
-      tabState.detectedLanguages = this.languageState.detectedLanguages;
-      this.restorePage(sourceLanguage);
-    } else {
-      const { docLangTag } = this.languageState.detectedLanguages;
+      this.restorePage();
+      return;
+    }
 
-      if (!this.innerWindowId) {
-        throw new Error(
-          "The innerWindowId for the TranslationsParent was not available."
-        );
-      }
+    const detectedLanguages =
+      await this.#ensureDetectedLanguagesForTranslation();
+    if (!detectedLanguages) {
+      return;
+    }
 
-      // The MessageChannel will be used for communicating directly between the content
-      // process and the engine's process.
-      const port = await TranslationsParent.requestTranslationsPort(
-        languagePair,
-        this
+    const { docLangTag } = detectedLanguages;
+
+    if (!this.innerWindowId) {
+      throw new Error(
+        "The innerWindowId for the TranslationsParent was not available."
       );
+    }
 
-      if (!port) {
-        lazy.console.error(
-          `Failed to create a translations port for language pair: (${lazy.TranslationsUtils.serializeLanguagePair(languagePair)})`
-        );
-        return;
-      }
+    // The MessageChannel will be used for communicating directly between the content
+    // process and the engine's process.
+    const port = await TranslationsParent.requestTranslationsPort(
+      languagePair,
+      this
+    );
+
+    if (!port) {
+      lazy.console.error(
+        `Failed to create a translations port for language pair: (${lazy.TranslationsUtils.serializeLanguagePair(languagePair)})`
+      );
+      return;
+    }
 
-      this.languageState.requestedLanguagePair = languagePair;
+    this.languageState.requestedLanguagePair = languagePair;
 
-      const preferredLanguages = TranslationsParent.getPreferredLanguages();
-      const topPreferredLanguage =
-        preferredLanguages && preferredLanguages.length
-          ? preferredLanguages[0]
-          : null;
+    const preferredLanguages = TranslationsParent.getPreferredLanguages();
+    const topPreferredLanguage =
+      preferredLanguages && preferredLanguages.length
+        ? preferredLanguages[0]
+        : null;
 
-      TranslationsParent.telemetry().onTranslate({
-        docLangTag,
-        sourceLanguage,
-        targetLanguage,
-        topPreferredLanguage,
-        autoTranslate: reportAsAutoTranslate,
-        requestTarget: "full_page",
-      });
+    TranslationsParent.telemetry().onTranslate({
+      docLangTag,
+      sourceLanguage,
+      targetLanguage,
+      topPreferredLanguage,
+      autoTranslate: reportAsAutoTranslate,
+      requestTarget: "full_page",
+    });
 
-      TranslationsParent.storeMostRecentTargetLanguage(targetLanguage);
+    TranslationsParent.storeMostRecentTargetLanguage(targetLanguage);
 
-      let isFindBarOpen;
+    let isFindBarOpen;
 
-      if (this.#findBar) {
-        isFindBarOpen = !this.#findBar.hidden;
-      }
+    if (this.#findBar) {
+      isFindBarOpen = !this.#findBar.hidden;
+    }
 
-      if (isFindBarOpen === undefined && AppConstants.platform !== "android") {
-        const browser = this.browsingContext?.top.embedderElement;
-        if (browser) {
-          const tabBrowser = browser.getTabBrowser();
-          const findBar = tabBrowser.getCachedFindBar();
+    if (isFindBarOpen === undefined && AppConstants.platform !== "android") {
+      /* eslint-disable-next-line no-shadow */
+      const browser = this.browsingContext?.top.embedderElement;
+      if (browser) {
+        const tabBrowser = browser.getTabBrowser();
+        const findBar = tabBrowser.getCachedFindBar();
 
-          if (findBar) {
-            isFindBarOpen = findBar.hidden;
-          } else {
-            isFindBarOpen = false;
-          }
+        if (findBar) {
+          isFindBarOpen = findBar.hidden;
+        } else {
+          isFindBarOpen = false;
         }
       }
-
-      this.sendAsyncMessage(
-        "Translations:TranslatePage",
-        {
-          isFindBarOpen,
-          languagePair,
-          port,
-        },
-        // https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Transferable_objects
-        // Mark the MessageChannel port as transferable.
-        [port]
-      );
     }
+
+    this.sendAsyncMessage(
+      "Translations:TranslatePage",
+      {
+        isFindBarOpen,
+        languagePair,
+        port,
+      },
+      // https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Transferable_objects
+      // Mark the MessageChannel port as transferable.
+      [port]
+    );
   }
 
   /**
    * Restore the page to the original language by doing a hard reload.
    */
   restorePage() {
+    if (!this.languageState) {
+      lazy.console.error(
+        "Restore page requested but actor not fully initialized"
+      );
+      return;
+    }
     TranslationsParent.telemetry().onRestorePage();
-    // Skip auto-translate for one page load and preserve detected languages.
     const browser = this.browsingContext.embedderElement;
     const tabState = StatePerTab.getOrCreate(browser);
     tabState.skipAutoTranslate = true;
+    tabState.needsReloadBeforeTranslation = false;
     tabState.detectedLanguages = this.languageState.detectedLanguages;
+    tabState.url = browser.currentURI?.spec;
     this.languageState.hasVisibleChange = false;
     this.languageState.requestedLanguagePair = null;
 
     browser.reload();
   }
 
+  /**
+   * Called when the browser's location changes. This is only invoked for location
+   * changes in the currently selected browser, not for background tabs.
+   *
+   * @param {object} browser
+   */
   static onLocationChange(browser) {
-    if (!lazy.translationsEnabledPref) {
+    if (!TranslationsParent.AIFeature.isEnabled) {
       // The pref isn't enabled, so don't attempt to get the actor.
       return;
     }
+
+    const tabState = StatePerTab.getOrCreate(browser);
+    if (tabState.needsReloadBeforeTranslation) {
+      tabState.needsReloadBeforeTranslation = false;
+      browser.reload();
+      return;
+    }
+
     let actor;
     try {
       actor =
@@ -3559,6 +3729,7 @@ export class TranslationsParent extends JSWindowActorParent {
     } catch {
       // The actor may not be supported on this page, which throws an error.
     }
+
     actor?.languageState.locationChanged();
   }
 
@@ -4008,6 +4179,34 @@ export class TranslationsParent extends JSWindowActorParent {
     return langTags;
   }
 
+  /**
+   * Ensures that detected languages are available for translation, performing detection if necessary.
+   *
+   * @returns {Promise<LangTags | null>} The detected languages, or null if detection failed
+   */
+  async #ensureDetectedLanguagesForTranslation() {
+    if (this.languageState.detectedLanguages) {
+      return this.languageState.detectedLanguages;
+    }
+
+    const htmlLangAttribute = await this.queryDocumentElementLang();
+    const detectedLanguages =
+      await this.getDetectedLanguages(htmlLangAttribute);
+
+    if (!detectedLanguages) {
+      lazy.console.error("Failed to detect languages for translation request.");
+      return null;
+    }
+
+    this.languageState.detectedLanguages = detectedLanguages;
+
+    await this.maybeOfferTranslations(detectedLanguages).catch(error =>
+      lazy.console.error(error)
+    );
+
+    return detectedLanguages;
+  }
+
   /**
    * The pref for if we can always offer a translation when it's available.
    */
@@ -4345,16 +4544,33 @@ export class TranslationsParent extends JSWindowActorParent {
    * are misbehaving.
    */
   #ensureTranslationsDiscarded() {
-    if (this.engineActor && this.languageState.requestedLanguagePair) {
+    if (this.engineActor && this.languageState?.requestedLanguagePair) {
       this.engineActor.discardTranslations(this.innerWindowId);
     }
   }
 
   didDestroy() {
-    if (!this.innerWindowId) {
-      throw new Error(
-        "The innerWindowId for the TranslationsParent was not available."
-      );
+    if (!TranslationsParent.AIFeature.isEnabled) {
+      // If the actor is getting destroyed due to the feature becoming disabled,
+      // we have a few things we need to cache in case the user re-enables Translations.
+      //
+      // This can occur if someone flips the global Block AI toggle in the settings,
+      // and then individually re-enables the Translations feature.
+      this.languageState?.dispatch({ reason: "feature-disabled" });
+
+      const browser = this.browsingContext?.top?.embedderElement;
+      if (browser) {
+        const tabState = StatePerTab.getOrCreate(browser);
+
+        if (this.languageState?.detectedLanguages) {
+          tabState.detectedLanguages = this.languageState.detectedLanguages;
+          tabState.url = browser.currentURI?.spec;
+        }
+
+        if (this.languageState?.requestedLanguagePair) {
+          tabState.needsReloadBeforeTranslation = true;
+        }
+      }
     }
 
     if (this.#boundObserve) {
@@ -4362,6 +4578,10 @@ export class TranslationsParent extends JSWindowActorParent {
         this.#boundObserve,
         TOPIC_MAYBE_UPDATE_USER_LANG_TAG
       );
+      Services.obs.removeObserver(
+        this.#boundObserve,
+        TOPIC_TRANSLATIONS_ENABLED_STATE_CHANGED
+      );
       this.#boundObserve = null;
     }
 
@@ -4445,22 +4665,26 @@ class TranslationsLanguageState {
    * Dispatch anytime the language details change, so that any UI can react to it.
    */
   dispatch({ reason } = {}) {
-    const browser = this.#actor.browsingContext.top.embedderElement;
-    if (!browser) {
-      return;
-    }
+    try {
+      const browser = this.#actor?.browsingContext?.top?.embedderElement;
+      if (!browser) {
+        return;
+      }
 
-    /* eslint-disable-next-line no-shadow */
-    const { CustomEvent } = browser.ownerGlobal;
-    browser.dispatchEvent(
-      new CustomEvent("TranslationsParent:LanguageState", {
-        bubbles: true,
-        detail: {
-          actor: this.#actor,
-          reason,
-        },
-      })
-    );
+      /* eslint-disable-next-line no-shadow */
+      const { CustomEvent } = browser.ownerGlobal;
+      browser.dispatchEvent(
+        new CustomEvent("TranslationsParent:LanguageState", {
+          bubbles: true,
+          detail: {
+            actor: this.#actor,
+            reason,
+          },
+        })
+      );
+    } catch {
+      // The actor may be destroyed. There is nothing to recover here.
+    }
   }
 
   /**
diff --git a/toolkit/modules/ActorManagerParent.sys.mjs b/toolkit/modules/ActorManagerParent.sys.mjs
index 2e7021c478532..8358aa43ae7ea 100644
--- a/toolkit/modules/ActorManagerParent.sys.mjs
+++ b/toolkit/modules/ActorManagerParent.sys.mjs
@@ -619,6 +619,12 @@ let JSWINDOWACTORS = {
     matches: ["http://*/*", "https://*/*", "file:///*", "moz-extension://*"],
     messageManagerGroups: ["browsers"],
     enablePreference: "browser.translations.enable",
+    onPreferenceChanged(isEnabled) {
+      const { TranslationsParent } = ChromeUtils.importESModule(
+        "resource://gre/actors/TranslationsParent.sys.mjs"
+      );
+      TranslationsParent.onIsEnabledChanged(isEnabled);
+    },
   },
 
   UAWidgets: {

From 45bd6451cfeccaba8b10308445fa26aa8d113696 Mon Sep 17 00:00:00 2001
From: Erik Nordin <enordin@mozilla.com>
Date: Thu, 29 Jan 2026 14:06:55 +0000
Subject: [PATCH 063/116] Bug 2010993 - Add TranslationsFeature Telemetry
 r=translations-reviewers,gregtatum

This commit adds 3 new telemetry metrics so that we can tell how frequently
the Translatiosn feature is being enabled, disabled, or reset from the settings,
especially compared to how often the global AI switch is being flipped.

Differential Revision: https://phabricator.services.mozilla.com/D280542
---
 .../translations/TranslationsFeature.sys.mjs  |  6 +++
 .../TranslationsTelemetry.sys.mjs             | 21 +++++++++
 toolkit/components/translations/metrics.yaml  | 43 +++++++++++++++++++
 .../browser_translations_ai_feature.js        | 40 +++++++++++++----
 .../translations/tests/browser/shared-head.js | 13 +++---
 5 files changed, 108 insertions(+), 15 deletions(-)

diff --git a/toolkit/components/translations/TranslationsFeature.sys.mjs b/toolkit/components/translations/TranslationsFeature.sys.mjs
index 8158273c06eca..d4d8c5264716f 100644
--- a/toolkit/components/translations/TranslationsFeature.sys.mjs
+++ b/toolkit/components/translations/TranslationsFeature.sys.mjs
@@ -9,6 +9,7 @@ import { AIFeature } from "chrome://global/content/ml/AIFeature.sys.mjs";
  * @property {typeof console} console
  * @property {typeof import("chrome://global/content/translations/TranslationsUtils.mjs").TranslationsUtils} TranslationsUtils
  * @property {typeof import("chrome://global/content/ml/EngineProcess.sys.mjs").EngineProcess} EngineProcess
+ * @property {typeof import("chrome://global/content/translations/TranslationsTelemetry.sys.mjs").TranslationsTelemetry} TranslationsTelemetry
  */
 
 /** @type {Lazy} */
@@ -18,6 +19,8 @@ ChromeUtils.defineESModuleGetters(lazy, {
   TranslationsUtils:
     "chrome://global/content/translations/TranslationsUtils.mjs",
   EngineProcess: "chrome://global/content/ml/EngineProcess.sys.mjs",
+  TranslationsTelemetry:
+    "chrome://global/content/translations/TranslationsTelemetry.sys.mjs",
 });
 
 ChromeUtils.defineLazyGetter(lazy, "console", () => {
@@ -57,6 +60,7 @@ export class TranslationsFeature extends AIFeature {
 
     Services.prefs.setStringPref(AI_CONTROL_TRANSLATIONS_PREF, "enabled");
     Services.prefs.setBoolPref(TRANSLATIONS_ENABLE_PREF, true);
+    lazy.TranslationsTelemetry.onFeatureEnable();
   }
 
   /**
@@ -78,6 +82,7 @@ export class TranslationsFeature extends AIFeature {
       lazy.EngineProcess.destroyTranslationsEngine(),
       TranslationsFeature.#deleteAllArtifacts(),
     ]);
+    lazy.TranslationsTelemetry.onFeatureDisable();
   }
 
   /**
@@ -99,6 +104,7 @@ export class TranslationsFeature extends AIFeature {
       lazy.EngineProcess.destroyTranslationsEngine(),
       TranslationsFeature.#deleteAllArtifacts(),
     ]);
+    lazy.TranslationsTelemetry.onFeatureReset();
   }
 
   /**
diff --git a/toolkit/components/translations/TranslationsTelemetry.sys.mjs b/toolkit/components/translations/TranslationsTelemetry.sys.mjs
index 20cfd03ff4a04..a8b0268c6efd6 100644
--- a/toolkit/components/translations/TranslationsTelemetry.sys.mjs
+++ b/toolkit/components/translations/TranslationsTelemetry.sys.mjs
@@ -432,6 +432,27 @@ export class TranslationsTelemetry {
       }
     );
   }
+
+  static onFeatureEnable() {
+    Glean.translationsFeature.enable.record();
+    TranslationsTelemetry.logEventToConsole(
+      TranslationsTelemetry.onFeatureEnable
+    );
+  }
+
+  static onFeatureDisable() {
+    Glean.translationsFeature.disable.record();
+    TranslationsTelemetry.logEventToConsole(
+      TranslationsTelemetry.onFeatureDisable
+    );
+  }
+
+  static onFeatureReset() {
+    Glean.translationsFeature.reset.record();
+    TranslationsTelemetry.logEventToConsole(
+      TranslationsTelemetry.onFeatureReset
+    );
+  }
 }
 
 /**
diff --git a/toolkit/components/translations/metrics.yaml b/toolkit/components/translations/metrics.yaml
index 9b1d1b88229e4..8e1a3aa056c00 100644
--- a/toolkit/components/translations/metrics.yaml
+++ b/toolkit/components/translations/metrics.yaml
@@ -942,3 +942,46 @@ translations.about_translations_page:
     notification_emails:
       - translations-telemetry-alerts@mozilla.com
     expires: never
+
+translations.feature:
+  enable:
+    type: event
+    description: >
+      Triggers when the Translations feature is enabled via the AI Feature API.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=2010993
+    data_reviews:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=2010993
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - translations-telemetry-alerts@mozilla.com
+    expires: never
+
+  disable:
+    type: event
+    description: >
+      Triggers when the Translations feature is disabled via the AI Feature API.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=2010993
+    data_reviews:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=2010993
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - translations-telemetry-alerts@mozilla.com
+    expires: never
+
+  reset:
+    type: event
+    description: >
+      Triggers when the Translations feature is reset via the AI Feature API.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=2010993
+    data_reviews:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=2010993
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - translations-telemetry-alerts@mozilla.com
+    expires: never
diff --git a/toolkit/components/translations/tests/browser/browser_translations_ai_feature.js b/toolkit/components/translations/tests/browser/browser_translations_ai_feature.js
index c6ba7214f3ec5..2e9dafe2cb671 100644
--- a/toolkit/components/translations/tests/browser/browser_translations_ai_feature.js
+++ b/toolkit/components/translations/tests/browser/browser_translations_ai_feature.js
@@ -8,7 +8,7 @@ const AI_CONTROL_TRANSLATIONS_PREF = "browser.ai.control.translations";
 const TRANSLATIONS_ENABLE_PREF = "browser.translations.enable";
 
 /**
- * This test case ensures that the Translations AI feature contains the proper id.
+ * This test case ensures that the Translations feature contains the proper id.
  */
 add_task(async function test_ai_feature_id() {
   is(
@@ -19,7 +19,7 @@ add_task(async function test_ai_feature_id() {
 });
 
 /**
- * This test case ensures that the Translations AI feature availability is correct
+ * This test case ensures that the Translations feature availability is correct
  * for all combinations of the prefs that control its enabled state.
  */
 add_task(async function test_ai_feature_state_combinations() {
@@ -189,7 +189,7 @@ add_task(async function test_ai_feature_state_combinations() {
     expectEnabled,
   } of cases) {
     const description = `default=${defaultPref} translations=${translationsPref} enabled=${enabledPref}`;
-    info(`AI feature state: ${description}`);
+    info(`Translations feature state: ${description}`);
     Services.prefs.setStringPref(AI_CONTROL_DEFAULT_PREF, defaultPref);
     Services.prefs.setStringPref(
       AI_CONTROL_TRANSLATIONS_PREF,
@@ -206,7 +206,7 @@ add_task(async function test_ai_feature_state_combinations() {
 });
 
 /**
- * This test case ensures that enabling the AI feature updates prefs without deleting artifacts.
+ * This test case ensures that enabling the Translations feature updates prefs without deleting artifacts.
  */
 add_task(async function test_ai_feature_enable() {
   await SpecialPowers.pushPrefEnv({
@@ -240,14 +240,22 @@ add_task(async function test_ai_feature_enable() {
       "Enable turns on translations"
     );
     is(deleteCalls, 0, "Enable does not delete artifacts");
+
+    await TestTranslationsTelemetry.assertEvent(
+      Glean.translationsFeature.enable,
+      {
+        expectedEventCount: 1,
+      }
+    );
   } finally {
     TranslationsUtils.deleteAllLanguageFiles = originalDeleteAllLanguageFiles;
     await SpecialPowers.popPrefEnv();
+    TestTranslationsTelemetry.cleanup();
   }
 });
 
 /**
- * This test case ensures that disabling the AI feature updates prefs and deletes artifacts.
+ * This test case ensures that disabling the Translations feature updates prefs and deletes artifacts.
  */
 add_task(async function test_ai_feature_disable() {
   await SpecialPowers.pushPrefEnv({
@@ -286,14 +294,22 @@ add_task(async function test_ai_feature_disable() {
       "Disable turns off translations"
     );
     is(deleteCalls, 1, "Disable deletes artifacts");
+
+    await TestTranslationsTelemetry.assertEvent(
+      Glean.translationsFeature.disable,
+      {
+        expectedEventCount: 1,
+      }
+    );
   } finally {
     TranslationsUtils.deleteAllLanguageFiles = originalDeleteAllLanguageFiles;
     await SpecialPowers.popPrefEnv();
+    TestTranslationsTelemetry.cleanup();
   }
 });
 
 /**
- * This test case ensures that resetting the AI feature clears prefs and deletes artifacts.
+ * This test case ensures that resetting the Translations feature clears prefs and deletes artifacts.
  */
 add_task(async function test_ai_feature_reset() {
   await SpecialPowers.pushPrefEnv({
@@ -325,14 +341,22 @@ add_task(async function test_ai_feature_reset() {
       "Reset clears the translations enabled pref"
     );
     is(deleteCalls, 1, "Reset deletes artifacts");
+
+    await TestTranslationsTelemetry.assertEvent(
+      Glean.translationsFeature.reset,
+      {
+        expectedEventCount: 1,
+      }
+    );
   } finally {
     TranslationsUtils.deleteAllLanguageFiles = originalDeleteAllLanguageFiles;
     await SpecialPowers.popPrefEnv();
+    TestTranslationsTelemetry.cleanup();
   }
 });
 
 /**
- * This test case ensures that policy-managed translations enable pref rejects AI feature changes.
+ * This test case ensures that policy-managed translations enable pref rejects Translations feature changes.
  */
 add_task(async function test_ai_feature_policy_lock_enable_pref() {
   await SpecialPowers.pushPrefEnv({
@@ -386,7 +410,7 @@ add_task(async function test_ai_feature_policy_lock_enable_pref() {
 });
 
 /**
- * This test case ensures that policy-managed AI control pref rejects AI feature changes.
+ * This test case ensures that policy-managed AI control pref rejects Translations feature changes.
  */
 add_task(async function test_ai_feature_policy_lock_ai_control_pref() {
   await SpecialPowers.pushPrefEnv({
diff --git a/toolkit/components/translations/tests/browser/shared-head.js b/toolkit/components/translations/tests/browser/shared-head.js
index 72f53412bd848..ac95ff5c33d67 100644
--- a/toolkit/components/translations/tests/browser/shared-head.js
+++ b/toolkit/components/translations/tests/browser/shared-head.js
@@ -312,8 +312,7 @@ async function openAboutTranslations({
       await EngineProcess.destroyTranslationsEngine();
 
       await SpecialPowers.popPrefEnv();
-      TestTranslationsTelemetry.reset();
-      Services.fog.testResetFOG();
+      TestTranslationsTelemetry.cleanup();
     },
   };
 }
@@ -2395,7 +2394,7 @@ async function setupActorTest({
       await EngineProcess.destroyTranslationsEngine();
       BrowserTestUtils.removeTab(tab);
       await removeMocks();
-      TestTranslationsTelemetry.reset();
+      TestTranslationsTelemetry.cleanup();
       return SpecialPowers.popPrefEnv();
     },
   };
@@ -2876,11 +2875,10 @@ async function loadTestPage({
         await cleanupLocales();
       }
       restoreA11yUtils();
-      Services.fog.testResetFOG();
       TranslationsParent.testAutomaticPopup = false;
       TranslationsParent.resetHostsOffered();
       BrowserTestUtils.removeTab(tab);
-      TestTranslationsTelemetry.reset();
+      TestTranslationsTelemetry.cleanup();
       return Promise.all([
         SpecialPowers.popPrefEnv(),
         SpecialPowers.popPermissions(),
@@ -3608,7 +3606,7 @@ async function setupAboutPreferences(
     BrowserTestUtils.removeTab(tab);
     await removeMocks();
     await SpecialPowers.popPrefEnv();
-    TestTranslationsTelemetry.reset();
+    TestTranslationsTelemetry.cleanup();
   }
 
   return {
@@ -3723,8 +3721,9 @@ async function mockLocales({ systemLocales, appLocales, webLanguages }) {
 class TestTranslationsTelemetry {
   static #previousFlowId = null;
 
-  static reset() {
+  static cleanup() {
     TestTranslationsTelemetry.#previousFlowId = null;
+    Services.fog.testResetFOG();
   }
 
   /**

From fe1114298a60fe0011a845964c5f66af6f5ab33b Mon Sep 17 00:00:00 2001
From: Erik Nordin <enordin@mozilla.com>
Date: Thu, 29 Jan 2026 14:06:55 +0000
Subject: [PATCH 064/116] Bug 2010993 - Update Android Test Expectations
 r=ohall,geckoview-reviewers,translations-reviewers

This commit ensures that the test expectations on Android
reflect the new flow of the FullPage Translations language
state and detection logic.

Differential Revision: https://phabricator.services.mozilla.com/D280872
---
 .../geckoview/test/TranslationsTest.kt        | 30 +++++++++----------
 .../actors/TranslationsParent.sys.mjs         |  3 ++
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TranslationsTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TranslationsTest.kt
index b4fe34bf4292e..c3a587f79fd3a 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TranslationsTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TranslationsTest.kt
@@ -128,7 +128,7 @@ class TranslationsTest : BaseSessionTest() {
     fun onTranslationStateChangeDelegateTest() {
         if (sessionRule.env.isAutomation) {
             sessionRule.delegateDuringNextWait(object : Delegate {
-                @AssertCalled(count = 1)
+                @AssertCalled(count = 2)
                 override fun onTranslationStateChange(
                     session: GeckoSession,
                     translationState: TranslationState?,
@@ -138,7 +138,7 @@ class TranslationsTest : BaseSessionTest() {
         } else {
             // For use when running from Android Studio
             sessionRule.delegateDuringNextWait(object : Delegate {
-                @AssertCalled(count = 2)
+                @AssertCalled(count = 3)
                 override fun onTranslationStateChange(
                     session: GeckoSession,
                     translationState: TranslationState?,
@@ -292,26 +292,32 @@ class TranslationsTest : BaseSessionTest() {
     fun translateTest() {
         var delegateCalled = 0
         sessionRule.delegateUntilTestEnd(object : Delegate {
-            @AssertCalled(count = 3)
+            @AssertCalled(count = 4)
             override fun onTranslationStateChange(
                 session: GeckoSession,
                 translationState: TranslationState?,
             ) {
                 delegateCalled++
-                // Before page load
+                // Actor created
                 if (delegateCalled == 1) {
                     assertTrue(
                         "Translations correctly does not have a requested pair.",
                         translationState?.requestedTranslationPair == null,
                     )
                 }
+
                 // Page load
                 if (delegateCalled == 2) {
+                    // Nothing to check here.
+                }
+
+                // Detection complete
+                if (delegateCalled == 3) {
                     assertTrue("Translations correctly has detected a page language. ", translationState?.detectedLanguages?.docLangTag == "es")
                 }
 
                 // Translate
-                if (delegateCalled == 3) {
+                if (delegateCalled == 4) {
                     assertTrue("Translations correctly has set a translation pair from language. ", translationState?.requestedTranslationPair?.fromLanguage == "es")
                     assertTrue("Translations correctly has set a translation pair to language. ", translationState?.requestedTranslationPair?.toLanguage == "en")
                 }
@@ -711,17 +717,9 @@ class TranslationsTest : BaseSessionTest() {
                 .operation(DELETE)
                 .operationLevel(ALL)
                 .build()
-            try {
-                sessionRule.waitForResult(RuntimeTranslation.manageLanguageModel(allDeleteAttempt))
-                fail("Should not complete deletes in automation.")
-            } catch (e: RuntimeException) {
-                // Wait call causes a runtime exception too.
-                val te = e.cause as TranslationsException
-                assertTrue(
-                    "Correctly could not delete on automated test harness.",
-                    te.code == ERROR_MODEL_COULD_NOT_DELETE,
-                )
-            }
+            // Deleting from an empty database is a no-op.
+            sessionRule.waitForResult(RuntimeTranslation.manageLanguageModel(allDeleteAttempt))
+            assertTrue("Delete from empty database succeeds gracefully.", true)
 
             val malformedRequest = ModelManagementOptions.Builder()
                 .operation("not-a-function")
diff --git a/toolkit/components/translations/actors/TranslationsParent.sys.mjs b/toolkit/components/translations/actors/TranslationsParent.sys.mjs
index fc7719c35ba8e..acfcda2cc0e35 100644
--- a/toolkit/components/translations/actors/TranslationsParent.sys.mjs
+++ b/toolkit/components/translations/actors/TranslationsParent.sys.mjs
@@ -623,7 +623,10 @@ export class TranslationsParent extends JSWindowActorParent {
       return;
     }
 
+    // On Android there is no gBrowser, but there is effectively only one tab visible
+    // at a time, so treat Android as always having the selected tab.
     const isSelectedTab =
+      AppConstants.platform === "android" ||
       browser === browser.ownerGlobal?.gBrowser?.selectedBrowser;
 
     if (tabState.needsReloadBeforeTranslation && isSelectedTab) {

From 791e8881d1c2e9139bad07a0fa1988941cfe4ec3 Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <krosylight@proton.me>
Date: Thu, 29 Jan 2026 14:07:51 +0000
Subject: [PATCH 065/116] Bug 2012153 - Always add transparent-gray border on
 picker color preview
 r=devtools-reviewers,desktop-theme-reviewers,emilio,nchevobbe

Differential Revision: https://phabricator.services.mozilla.com/D280271
---
 .../client/shared/test/browser_spectrum.js    | 20 ++++++-------------
 .../content/widgets/colorpicker-common.mjs    |  6 ------
 toolkit/themes/shared/colorpicker-common.css  |  6 +-----
 3 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/devtools/client/shared/test/browser_spectrum.js b/devtools/client/shared/test/browser_spectrum.js
index 6832b99c84b37..926eb586006b5 100644
--- a/devtools/client/shared/test/browser_spectrum.js
+++ b/devtools/client/shared/test/browser_spectrum.js
@@ -65,17 +65,9 @@ function extractRgbaOverlayString(linearGradientStr) {
   return linearGradientStr.substring(start + 1, end + 1);
 }
 
-function testColorPreviewDisplay(
-  spectrum,
-  expectedRgbCssString,
-  expectedBorderColor
-) {
+function testColorPreviewDisplay(spectrum, expectedRgbCssString) {
   const { colorPreview } = spectrum;
   const colorPreviewStyle = window.getComputedStyle(colorPreview);
-  expectedBorderColor =
-    expectedBorderColor === "transparent"
-      ? "rgba(0, 0, 0, 0)"
-      : expectedBorderColor;
 
   spectrum.updateUI();
 
@@ -97,7 +89,7 @@ function testColorPreviewDisplay(
   const borderColorTop = colorPreviewStyle.getPropertyValue("border-top-color");
   is(
     borderColorTop,
-    expectedBorderColor,
+    "color(srgb 0.5 0.5 0.5 / 0.5)",
     "Color preview border color is correct."
   );
 }
@@ -322,19 +314,19 @@ async function testChangingColorShouldUpdateColorPreview(container) {
   const s = await createSpectrum(container, [0, 0, 1, 1]);
 
   info("Test that color preview is black.");
-  testColorPreviewDisplay(s, "rgb(0, 0, 1)", "transparent");
+  testColorPreviewDisplay(s, "rgb(0, 0, 1)");
 
   info("Test that color preview is blue.");
   s.rgb = [0, 0, 255, 1];
-  testColorPreviewDisplay(s, "rgb(0, 0, 255)", "transparent");
+  testColorPreviewDisplay(s, "rgb(0, 0, 255)");
 
   info("Test that color preview is red.");
   s.rgb = [255, 0, 0, 1];
-  testColorPreviewDisplay(s, "rgb(255, 0, 0)", "transparent");
+  testColorPreviewDisplay(s, "rgb(255, 0, 0)");
 
   info("Test that color preview is white and also has a light grey border.");
   s.rgb = cssColors.white;
-  testColorPreviewDisplay(s, "rgb(255, 255, 255)", "rgb(204, 204, 204)");
+  testColorPreviewDisplay(s, "rgb(255, 255, 255)");
 
   s.destroy();
 }
diff --git a/toolkit/content/widgets/colorpicker-common.mjs b/toolkit/content/widgets/colorpicker-common.mjs
index 2e9474f58f937..f7169e456316e 100644
--- a/toolkit/content/widgets/colorpicker-common.mjs
+++ b/toolkit/content/widgets/colorpicker-common.mjs
@@ -198,12 +198,6 @@ export class ColorPickerCommon {
     // Overlay the rgba color over a checkered image background.
     this.colorPreview.style.setProperty("--overlay-color", this.rgbCssString);
 
-    // We should be able to distinguish the color preview on high luminance rgba values.
-    // Give the color preview a light grey border if the luminance of the current rgba
-    // tuple is great.
-    const colorLuminance = InspectorUtils.relativeLuminance(...this.rgbFloat);
-    this.colorPreview.classList.toggle("high-luminance", colorLuminance > 0.85);
-
     // Set title on color preview for better UX
     this.colorPreview.title = this.colorName;
   }
diff --git a/toolkit/themes/shared/colorpicker-common.css b/toolkit/themes/shared/colorpicker-common.css
index 9a16076b699d1..5d0e4736c28e7 100644
--- a/toolkit/themes/shared/colorpicker-common.css
+++ b/toolkit/themes/shared/colorpicker-common.css
@@ -37,7 +37,7 @@
  */
 .spectrum-color-preview {
   --overlay-color: transparent;
-  border: 1px solid transparent;
+  border: 1px solid color(srgb 0.5 0.5 0.5 / 0.5);
   border-radius: 50%;
   box-sizing: border-box;
   width: 25px;
@@ -52,10 +52,6 @@
   }
 }
 
-.spectrum-color-preview.high-luminance {
-  border-color: #ccc;
-}
-
 .spectrum-slider-container {
   display: flex;
   flex-direction: column;

From 3a1066b63e416eddaecc1549931634e2919312a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= <florian@queze.net>
Date: Thu, 29 Jan 2026 14:16:37 +0000
Subject: [PATCH 066/116] Bug 1987201 - Fix
 browser_privacy_allowListPreference_reload.js standalone failure.
 r=emz,mkennedy

The test was failing when run standalone because it opens preferences with
content blocking category set to "strict", which triggers a one-time migration
in UrlClassifierExceptionListService that sets the baseline allow-list pref to
false. The test expected baseline to remain true.

When the test runs in the folder, a previous test triggers the migration first
with category="standard", which doesn't change the baseline pref. The migration
then skips on subsequent test runs, allowing baseline to stay true.

Fix by setting the migration pref to true before opening preferences, preventing
the migration from running and keeping baseline at its expected initial value.

Differential Revision: https://phabricator.services.mozilla.com/D280743
---
 .../tests/browser_privacy_allowListPreference_reload.js  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/browser/components/preferences/tests/browser_privacy_allowListPreference_reload.js b/browser/components/preferences/tests/browser_privacy_allowListPreference_reload.js
index 7b3bf14f75289..9395befc8bb8a 100644
--- a/browser/components/preferences/tests/browser_privacy_allowListPreference_reload.js
+++ b/browser/components/preferences/tests/browser_privacy_allowListPreference_reload.js
@@ -41,7 +41,14 @@ async function setup() {
 add_task(
   async function test_reload_does_not_show_after_baseline_checkbox_dialog_cancel() {
     await SpecialPowers.pushPrefEnv({
-      set: [[CB_CATEGORY_PREF, "strict"]],
+      set: [
+        [CB_CATEGORY_PREF, "strict"],
+        // Prevent migration from running and changing baseline to false
+        [
+          "privacy.trackingprotection.allow_list.hasMigratedCategoryPrefs",
+          true,
+        ],
+      ],
     });
     Assert.ok(
       Services.prefs.getBoolPref(BASELINE_PREF),

From 75688bf85ec18ef0460858da53e9f36232c75596 Mon Sep 17 00:00:00 2001
From: t-p-white <towhite@mozilla.com>
Date: Thu, 29 Jan 2026 14:50:18 +0000
Subject: [PATCH 067/116] Bug 2012103 - Part 1: Updated the UI to implement the
 Nova onboarding redesign copy.
 r=android-reviewers,android-l10n-reviewers,flod,rebecatudor273,gmalekpour

[[ https://www.figma.com/design/udCfSmhE1ZaLdU2V5jPt5j/Android-Mobile-Onboarding-2025?node-id=17583-15686&m=dev | Figma reference ]].

Video demo of updated use of **copy only**. **Note** images are not being updated as patch of this patch - any seen here are part of a WIP change. This is a forced example, behaviour of pop up can also be ignored.

{F56347030}

Differential Revision: https://phabricator.services.mozilla.com/D280413
---
 mobile/android/fenix/app/onboarding.fml.yaml  | 147 ++++++++++--------
 .../MarketingDataOnboardingPageRedesign.kt    |  27 ++--
 .../redesign/view/OnboardingPageRedesign.kt   |  32 ++--
 .../redesign/view/OnboardingScreenRedesign.kt |  56 +++----
 .../TermsOfServiceOnboardingPageRedesign.kt   |  28 ++--
 .../view/ToolbarOnboardingPageRedesign.kt     |  10 +-
 .../fenix/app/src/main/res/values/strings.xml |  98 ++++++------
 7 files changed, 200 insertions(+), 198 deletions(-)

diff --git a/mobile/android/fenix/app/onboarding.fml.yaml b/mobile/android/fenix/app/onboarding.fml.yaml
index 6c70a63988de9..e5cfadd447a4b 100644
--- a/mobile/android/fenix/app/onboarding.fml.yaml
+++ b/mobile/android/fenix/app/onboarding.fml.yaml
@@ -147,21 +147,19 @@ features:
             terms-of-service-redesign:
               card-type: terms-of-service
               enabled: false
-              title: onboarding_redesign_tou_title
+              title: nova_onboarding_tou_title
               ordering: 0
               image-res: ic_firefox
-              primary-button-label: onboarding_redesign_tou_agree_and_continue_button_label
+              primary-button-label: nova_onboarding_continue_button
               extra-data:
                 term-of-service-data:
-                  subheader-one-text: onboarding_redesign_tou_subheader_one
-                  subheader-two-text: onboarding_redesign_tou_subheader_two
-                  subheader-three-text: onboarding_redesign_tou_subheader_three
-                  line-one-text: onboarding_redesign_tou_body_one
-                  line-one-link-text: onboarding_redesign_tou_body_one_link_text
-                  line-two-text: onboarding_redesign_tou_body_two
-                  line-two-link-text: onboarding_redesign_tou_body_two_link_text
-                  line-three-text: onboarding_redesign_tou_body_three
-                  line-three-link-text: onboarding_redesign_tou_body_three_link_text
+                  subheader-one-text: nova_onboarding_tou_subtitle
+                  line-one-text: nova_onboarding_tou_body_line_1
+                  line-one-link-text: nova_onboarding_tou_body_line_1_link_text
+                  line-two-text: nova_onboarding_tou_body_line_2
+                  line-two-link-text: nova_onboarding_tou_body_line_2_link_text
+                  line-three-text: nova_onboarding_tou_body_line_3
+                  line-three-link-text: nova_onboarding_tou_body_line_3_link_text
 
             default-browser:
               card-type: default-browser
@@ -176,11 +174,11 @@ features:
             default-browser-redesign:
               card-type: default-browser
               enabled: false
-              title: onboarding_redesign_set_default_browser_title
+              title: nova_onboarding_set_to_default_title_2
               ordering: 5
-              body: onboarding_redesign_set_default_browser_body
-              primary-button-label: juno_onboarding_default_browser_positive_button
-              secondary-button-label: juno_onboarding_default_browser_negative_button
+              body: nova_onboarding_set_to_default_subtitle
+              primary-button-label: nova_onboarding_set_to_default_button
+              secondary-button-label: nova_onboarding_negative_button
 
             add-search-widget:
               enabled: true
@@ -192,6 +190,16 @@ features:
               primary-button-label: juno_onboarding_add_search_widget_positive_button
               secondary-button-label: juno_onboarding_add_search_widget_negative_button
 
+            add-search-widget-redesign:
+              enabled: false
+              card-type: add-search-widget
+              title: nova_onboarding_add_search_widget_title
+              body: nova_onboarding_add_search_widget_subtitle
+              image-res: ic_onboarding_search_widget
+              ordering: 10
+              primary-button-label: nova_onboarding_add_search_widget_button
+              secondary-button-label: nova_onboarding_negative_button
+
             sync-sign-in:
               enabled: true
               card-type: sync-sign-in
@@ -205,11 +213,11 @@ features:
             sync-sign-in-redesign:
               enabled: false
               card-type: sync-sign-in
-              title: onboarding_redesign_sync_title
-              body: onboarding_redesign_sync_body
+              title: nova_onboarding_sync_title
+              body: nova_onboarding_sync_subtitle
               ordering: 15
-              primary-button-label: onboarding_redesign_sync_positive_button
-              secondary-button-label: onboarding_redesign_sync_negative_button
+              primary-button-label: nova_onboarding_sync_button
+              secondary-button-label: nova_onboarding_negative_button
 
             notification-permission:
               enabled: true
@@ -221,6 +229,16 @@ features:
               primary-button-label: juno_onboarding_enable_notifications_positive_button
               secondary-button-label: juno_onboarding_enable_notifications_negative_button
 
+            notification-permission-redesign:
+              enabled: false
+              card-type: notification-permission
+              title: nova_onboarding_notifications_title
+              body: nova_onboarding_notifications_subtitle
+              image-res: ic_notification_permission
+              ordering: 20
+              primary-button-label: nova_onboarding_notifications_button
+              secondary-button-label: nova_onboarding_negative_button
+
             theme-selection:
               card-type: theme-selection
               enabled: false
@@ -261,19 +279,19 @@ features:
             toolbar-placement-redesign:
               card-type: toolbar-placement
               enabled: false
-              title: onboarding_redesign_customize_toolbar_title
+              title: nova_onboarding_toolbar_selection_title
               body: onboarding_customize_toolbar_description
               image-res: ic_onboarding_customize_toolbar
               ordering: 35
-              primary-button-label: onboarding_redesign_continue_button
+              primary-button-label: nova_onboarding_continue_button
               extra-data:
                 customization-toolbar-data:
                   - toolbar-type: toolbar-top
-                    label: onboarding_customize_toolbar_top_option
-                    image-res: ic_onboarding_top_toolbar
+                    label: nova_onboarding_toolbar_selection_top_label
+                    image-res: ic_onboarding_top_toolbar # Unused in redesign
                   - toolbar-type: toolbar-bottom
-                    label: onboarding_customize_toolbar_bottom_option
-                    image-res: ic_onboarding_bottom_toolbar
+                    label: nova_onboarding_toolbar_selection_bottom_label
+                    image-res: ic_onboarding_bottom_toolbar # Unused in redesign
 
             marketing-data:
               card-type: marketing-data
@@ -292,72 +310,77 @@ features:
             marketing-data-redesign:
               card-type: marketing-data
               enabled: false
-              title: onboarding_marketing_redesign_title
-              body: onboarding_marketing_body
+              title: nova_onboarding_marketing_title
               image-res: ic_onboarding_marketing_redesign
               ordering: 40
-              primary-button-label: onboarding_marketing_redesign_positive_button
+              primary-button-label: nova_onboarding_continue_button
               extra-data:
                 marketing-data:
-                  body-line-one-text: onboarding_marketing_redesign_learn_more
-                  body-line-one-link-text: onboarding_marketing_redesign_learn_more
-                  body-line-two-text: onboarding_marketing_redesign_opt_out_checkbox
+                  body-line-one-text: nova_onboarding_marketing_body
+                  body-line-one-link-text: nova_onboarding_marketing_body_link_text
 
       - channel: nightly
         value:
           use-onboarding-redesign: true
           cards:
             terms-of-service:
-              title: onboarding_redesign_tou_title
-              primary-button-label: onboarding_redesign_tou_agree_and_continue_button_label
+              title: nova_onboarding_tou_title
+              primary-button-label: nova_onboarding_continue_button
               extra-data:
                 term-of-service-data:
-                  subheader-one-text: onboarding_redesign_tou_subheader_one
-                  subheader-two-text: onboarding_redesign_tou_subheader_two
-                  subheader-three-text: onboarding_redesign_tou_subheader_three
-                  line-one-text: onboarding_redesign_tou_body_one
-                  line-one-link-text: onboarding_redesign_tou_body_one_link_text
-                  line-two-text: onboarding_redesign_tou_body_two
-                  line-two-link-text: onboarding_redesign_tou_body_two_link_text
-                  line-three-text: onboarding_redesign_tou_body_three
-                  line-three-link-text: onboarding_redesign_tou_body_three_link_text
+                  subheader-one-text: nova_onboarding_tou_subtitle
+                  line-one-text: nova_onboarding_tou_body_line_1
+                  line-one-link-text: nova_onboarding_tou_body_line_1_link_text
+                  line-two-text: nova_onboarding_tou_body_line_2
+                  line-two-link-text: nova_onboarding_tou_body_line_2_link_text
+                  line-three-text: nova_onboarding_tou_body_line_3
+                  line-three-link-text: nova_onboarding_tou_body_line_3_link_text
 
             default-browser:
-              title: onboarding_redesign_set_default_browser_title
-              body: onboarding_redesign_set_default_browser_body
-              primary-button-label: juno_onboarding_default_browser_positive_button
-              secondary-button-label: juno_onboarding_default_browser_negative_button
+              title: nova_onboarding_set_to_default_title_2
+              body: nova_onboarding_set_to_default_subtitle
+              primary-button-label: nova_onboarding_set_to_default_button
+              secondary-button-label: nova_onboarding_negative_button
+
+            add-search-widget:
+              title: nova_onboarding_add_search_widget_title
+              body: nova_onboarding_add_search_widget_subtitle
+              primary-button-label: nova_onboarding_add_search_widget_button
+              secondary-button-label: nova_onboarding_negative_button
 
             sync-sign-in:
-              title: onboarding_redesign_sync_title
-              body: onboarding_redesign_sync_body
-              primary-button-label: onboarding_redesign_sync_positive_button
-              secondary-button-label: onboarding_redesign_sync_negative_button
+              title: nova_onboarding_sync_title
+              body: nova_onboarding_sync_subtitle
+              primary-button-label: nova_onboarding_sync_button
+              secondary-button-label: nova_onboarding_negative_button
+
+            notification-permission:
+              title: nova_onboarding_notifications_title
+              body: nova_onboarding_notifications_subtitle
+              primary-button-label: nova_onboarding_notifications_button
+              secondary-button-label: nova_onboarding_negative_button
 
             toolbar-placement:
-              title: onboarding_redesign_customize_toolbar_title
-              body: onboarding_customize_toolbar_description
+              title: nova_onboarding_toolbar_selection_title
               image-res: ic_onboarding_customize_toolbar
               primary-button-label: onboarding_redesign_continue_button
               extra-data:
                 customization-toolbar-data:
                   - toolbar-type: toolbar-top
-                    label: onboarding_customize_toolbar_top_option
-                    image-res: ic_onboarding_top_toolbar
+                    label: nova_onboarding_toolbar_selection_top_label
+                    image-res: ic_onboarding_top_toolbar # Unused in redesign
                   - toolbar-type: toolbar-bottom
-                    label: onboarding_customize_toolbar_bottom_option
-                    image-res: ic_onboarding_bottom_toolbar
+                    label: nova_onboarding_toolbar_selection_bottom_label
+                    image-res: ic_onboarding_bottom_toolbar # Unused in redesign
 
             marketing:
-              title: onboarding_marketing_redesign_title
-              body: onboarding_marketing_body
+              title: nova_onboarding_marketing_title
               image-res: ic_onboarding_marketing_redesign
-              primary-button-label: onboarding_marketing_redesign_positive_button
+              primary-button-label: nova_onboarding_continue_button
               extra-data:
                 marketing-data:
-                  body-line-one-text: onboarding_marketing_redesign_learn_more
-                  body-line-one-link-text: onboarding_marketing_redesign_learn_more
-                  body-line-two-text: onboarding_marketing_redesign_opt_out_checkbox
+                  body-line-one-text: nova_onboarding_marketing_body
+                  body-line-one-link-text: nova_onboarding_marketing_body_link_text
 
             # Disable the defaults that are not included in the redesign.
             theme-selection:
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/MarketingDataOnboardingPageRedesign.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/MarketingDataOnboardingPageRedesign.kt
index 4994598ea4fce..513e8ab0d2070 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/MarketingDataOnboardingPageRedesign.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/MarketingDataOnboardingPageRedesign.kt
@@ -6,7 +6,6 @@ package org.mozilla.fenix.onboarding.redesign.view
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -160,18 +159,8 @@ private fun MarketingDataView(
                 },
             )
 
-            Text(
-                text = marketingData.bodyTwoText,
-                style = FirefoxTheme.typography.body2,
-                textAlign = TextAlign.Start,
-            )
-        }
-
-        Spacer(modifier = Modifier.height(4.dp))
-
-        Box(modifier = Modifier.padding(start = 48.dp)) {
             LinkText(
-                text = marketingData.bodyOneText,
+                text = marketingData.bodyOneText.updateFirstPlaceholder(marketingData.bodyOneLinkText),
                 linkTextStates = listOf(
                     LinkTextState(
                         text = marketingData.bodyOneLinkText,
@@ -180,6 +169,8 @@ private fun MarketingDataView(
                     ),
                 ),
                 linkTextDecoration = TextDecoration.Underline,
+                style = FirefoxTheme.typography.body2,
+                textAlign = TextAlign.Start,
             )
         }
     }
@@ -192,16 +183,16 @@ private fun MarketingDataOnboardingPagePreview() {
         MarketingDataOnboardingPageRedesign(
             state = OnboardingPageState(
                 imageRes = R.drawable.ic_onboarding_marketing_redesign,
-                title = stringResource(id = R.string.onboarding_marketing_redesign_title),
+                title = stringResource(id = R.string.nova_onboarding_marketing_title),
                 description = "", // NB: not used in the redesign
                 primaryButton = Action(
-                    text = stringResource(id = R.string.onboarding_marketing_redesign_positive_button),
+                    text = stringResource(id = R.string.nova_onboarding_continue_button),
                     onClick = {},
                 ),
                 marketingData = OnboardingMarketingData(
-                    bodyOneText = stringResource(id = R.string.onboarding_marketing_redesign_learn_more),
-                    bodyOneLinkText = stringResource(id = R.string.onboarding_marketing_redesign_learn_more),
-                    bodyTwoText = stringResource(id = R.string.onboarding_marketing_redesign_opt_out_checkbox),
+                    bodyOneText = stringResource(id = R.string.nova_onboarding_marketing_body),
+                    bodyOneLinkText = stringResource(id = R.string.nova_onboarding_marketing_body_link_text),
+                    bodyTwoText = "", // NB: not used in the redesign
                 ),
             ),
             onMarketingDataLearnMoreClick = {},
@@ -210,3 +201,5 @@ private fun MarketingDataOnboardingPagePreview() {
         )
     }
 }
+
+private fun String.updateFirstPlaceholder(text: String) = replace($$"%1$s", text)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingPageRedesign.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingPageRedesign.kt
index 2b791c3759a8a..bcccda75c808a 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingPageRedesign.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingPageRedesign.kt
@@ -156,14 +156,14 @@ private fun OnboardingPageSetToDefaultPreview() {
         OnboardingPageRedesign(
             pageState = OnboardingPageState(
                 imageRes = R.drawable.ic_notification_permission,
-                title = stringResource(R.string.onboarding_redesign_set_default_browser_title),
-                description = stringResource(R.string.onboarding_redesign_set_default_browser_body),
+                title = stringResource(R.string.nova_onboarding_set_to_default_title_2),
+                description = stringResource(R.string.nova_onboarding_set_to_default_subtitle),
                 primaryButton = Action(
-                    text = stringResource(R.string.juno_onboarding_default_browser_positive_button),
+                    text = stringResource(R.string.nova_onboarding_set_to_default_button),
                     onClick = {},
                 ),
                 secondaryButton = Action(
-                    text = stringResource(R.string.juno_onboarding_default_browser_negative_button),
+                    text = stringResource(R.string.nova_onboarding_negative_button),
                     onClick = {},
                 ),
                 onRecordImpressionEvent = {},
@@ -180,14 +180,14 @@ private fun OnboardingPageSyncPreview() {
         OnboardingPageRedesign(
             pageState = OnboardingPageState(
                 imageRes = R.drawable.ic_notification_permission, // Unused in the redesign.
-                title = stringResource(R.string.onboarding_redesign_sync_title),
-                description = stringResource(R.string.onboarding_redesign_sync_body),
+                title = stringResource(R.string.nova_onboarding_sync_title),
+                description = stringResource(R.string.nova_onboarding_sync_subtitle),
                 primaryButton = Action(
-                    text = stringResource(R.string.onboarding_redesign_sync_positive_button),
+                    text = stringResource(R.string.nova_onboarding_sync_button),
                     onClick = {},
                 ),
                 secondaryButton = Action(
-                    text = stringResource(R.string.onboarding_redesign_sync_negative_button),
+                    text = stringResource(R.string.nova_onboarding_negative_button),
                     onClick = {},
                 ),
                 onRecordImpressionEvent = {},
@@ -204,14 +204,14 @@ private fun OnboardingPageNotificationPreview() {
         OnboardingPageRedesign(
             pageState = OnboardingPageState(
                 imageRes = R.drawable.ic_notification_permission, // Unused in the redesign.
-                title = stringResource(R.string.juno_onboarding_enable_notifications_title_nimbus_2),
-                description = stringResource(R.string.juno_onboarding_enable_notifications_description_nimbus_2),
+                title = stringResource(R.string.nova_onboarding_add_search_widget_title),
+                description = stringResource(R.string.nova_onboarding_add_search_widget_subtitle),
                 primaryButton = Action(
-                    text = stringResource(R.string.juno_onboarding_enable_notifications_positive_button),
+                    text = stringResource(R.string.nova_onboarding_notifications_button),
                     onClick = {},
                 ),
                 secondaryButton = Action(
-                    text = stringResource(R.string.juno_onboarding_enable_notifications_negative_button),
+                    text = stringResource(R.string.nova_onboarding_negative_button),
                     onClick = {},
                 ),
                 onRecordImpressionEvent = {},
@@ -228,14 +228,14 @@ private fun OnboardingPageSearchWidgetPreview() {
         OnboardingPageRedesign(
             pageState = OnboardingPageState(
                 imageRes = R.drawable.ic_notification_permission, // Unused in the redesign.
-                title = stringResource(R.string.juno_onboarding_add_search_widget_title),
-                description = stringResource(R.string.juno_onboarding_add_search_widget_description),
+                title = stringResource(R.string.nova_onboarding_add_search_widget_title),
+                description = stringResource(R.string.nova_onboarding_add_search_widget_subtitle),
                 primaryButton = Action(
-                    text = stringResource(R.string.juno_onboarding_add_search_widget_positive_button),
+                    text = stringResource(R.string.nova_onboarding_add_search_widget_button),
                     onClick = {},
                 ),
                 secondaryButton = Action(
-                    text = stringResource(R.string.juno_onboarding_add_search_widget_negative_button),
+                    text = stringResource(R.string.nova_onboarding_negative_button),
                     onClick = {},
                 ),
                 onRecordImpressionEvent = {},
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt
index e9cfdf89a23a7..2edcd31b8d879 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt
@@ -53,7 +53,6 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.components.appstate.AppAction
 import org.mozilla.fenix.components.appstate.setup.checklist.ChecklistItem
 import org.mozilla.fenix.components.components
-import org.mozilla.fenix.compose.LinkTextState
 import org.mozilla.fenix.compose.PagerIndicator
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.onboarding.WidgetPinnedReceiver.WidgetPinnedState
@@ -62,7 +61,6 @@ import org.mozilla.fenix.onboarding.redesign.view.defaultbrowser.SetToDefaultMai
 import org.mozilla.fenix.onboarding.redesign.view.sync.SyncMainImage
 import org.mozilla.fenix.onboarding.store.OnboardingAction.OnboardingToolbarAction
 import org.mozilla.fenix.onboarding.store.OnboardingStore
-import org.mozilla.fenix.onboarding.view.Caption
 import org.mozilla.fenix.onboarding.view.OnboardingPageState
 import org.mozilla.fenix.onboarding.view.OnboardingPageUiData
 import org.mozilla.fenix.onboarding.view.OnboardingTermsOfService
@@ -650,24 +648,22 @@ private fun defaultPreviewPages() = listOf(
 @Composable
 private fun touPageUIData() = OnboardingPageUiData(
     type = OnboardingPageUiData.Type.TERMS_OF_SERVICE,
-    title = stringResource(id = R.string.onboarding_redesign_tou_title),
+    title = stringResource(id = R.string.nova_onboarding_tou_title),
     description = "",
     termsOfService = OnboardingTermsOfService(
-        subheaderOneText = stringResource(id = R.string.onboarding_redesign_tou_subheader_one),
-        subheaderTwoText = stringResource(id = R.string.onboarding_redesign_tou_subheader_two),
-        subheaderThreeText = stringResource(id = R.string.onboarding_redesign_tou_subheader_three),
-        lineOneText = stringResource(id = R.string.onboarding_redesign_tou_body_one),
-        lineOneLinkText = stringResource(id = R.string.onboarding_redesign_tou_body_one_link_text),
+        subheaderOneText = stringResource(id = R.string.nova_onboarding_tou_subtitle),
+        lineOneText = stringResource(id = R.string.nova_onboarding_tou_body_line_1),
+        lineOneLinkText = stringResource(id = R.string.nova_onboarding_tou_body_line_1_link_text),
         lineOneLinkUrl = "URL",
-        lineTwoText = stringResource(id = R.string.onboarding_redesign_tou_body_two),
-        lineTwoLinkText = stringResource(id = R.string.onboarding_redesign_tou_body_two_link_text),
+        lineTwoText = stringResource(id = R.string.nova_onboarding_tou_body_line_2),
+        lineTwoLinkText = stringResource(id = R.string.nova_onboarding_tou_body_line_2_link_text),
         lineTwoLinkUrl = "URL",
-        lineThreeText = stringResource(id = R.string.onboarding_redesign_tou_body_three),
-        lineThreeLinkText = stringResource(id = R.string.onboarding_redesign_tou_body_three_link_text),
+        lineThreeText = stringResource(id = R.string.nova_onboarding_tou_body_line_3),
+        lineThreeLinkText = stringResource(id = R.string.nova_onboarding_tou_body_line_3_link_text),
     ),
     imageRes = R.drawable.ic_firefox,
     primaryButtonLabel = stringResource(
-        id = R.string.onboarding_redesign_tou_agree_and_continue_button_label,
+        id = R.string.nova_onboarding_continue_button,
     ),
 )
 
@@ -675,47 +671,39 @@ private fun touPageUIData() = OnboardingPageUiData(
 private fun defaultBrowserPageUiData() = OnboardingPageUiData(
     type = OnboardingPageUiData.Type.DEFAULT_BROWSER,
     imageRes = R.drawable.ic_onboarding_welcome,
-    title = stringResource(R.string.onboarding_redesign_set_default_browser_title),
-    description = stringResource(R.string.onboarding_redesign_set_default_browser_body),
-    primaryButtonLabel = stringResource(R.string.juno_onboarding_default_browser_positive_button),
-    secondaryButtonLabel = stringResource(R.string.juno_onboarding_default_browser_negative_button),
+    title = stringResource(R.string.nova_onboarding_set_to_default_title_2),
+    description = stringResource(R.string.nova_onboarding_set_to_default_subtitle),
+    primaryButtonLabel = stringResource(R.string.nova_onboarding_set_to_default_button),
+    secondaryButtonLabel = stringResource(R.string.nova_onboarding_negative_button),
 )
 
 @Composable
 private fun syncPageUiData() = OnboardingPageUiData(
     type = OnboardingPageUiData.Type.SYNC_SIGN_IN,
     imageRes = R.drawable.ic_onboarding_sync,
-    title = stringResource(R.string.juno_onboarding_sign_in_title_2),
-    description = stringResource(R.string.juno_onboarding_sign_in_description_3),
-    primaryButtonLabel = stringResource(R.string.juno_onboarding_sign_in_positive_button),
-    secondaryButtonLabel = stringResource(R.string.juno_onboarding_sign_in_negative_button),
-    privacyCaption = Caption(
-        text = stringResource(R.string.juno_onboarding_privacy_notice_text),
-        linkTextState = LinkTextState(
-            text = stringResource(R.string.juno_onboarding_privacy_notice_text),
-            url = "",
-            onClick = {},
-        ),
-    ),
+    title = stringResource(R.string.nova_onboarding_sync_title),
+    description = stringResource(R.string.nova_onboarding_sync_subtitle),
+    primaryButtonLabel = stringResource(R.string.nova_onboarding_sync_button),
+    secondaryButtonLabel = stringResource(R.string.nova_onboarding_negative_button),
 )
 
 @Composable
 private fun toolbarPlacementPageUiData() = OnboardingPageUiData(
     type = OnboardingPageUiData.Type.TOOLBAR_PLACEMENT,
     imageRes = R.drawable.ic_onboarding_customize_toolbar,
-    title = stringResource(R.string.onboarding_customize_toolbar_title),
-    description = stringResource(R.string.onboarding_customize_toolbar_description),
-    primaryButtonLabel = stringResource(R.string.onboarding_save_and_start_button),
+    title = stringResource(R.string.nova_onboarding_toolbar_selection_title),
+    description = "", // Unused in redesign
+    primaryButtonLabel = stringResource(R.string.nova_onboarding_continue_button),
     toolbarOptions = listOf(
         ToolbarOption(
             toolbarType = ToolbarOptionType.TOOLBAR_TOP,
             imageRes = R.drawable.ic_onboarding_top_toolbar,
-            label = stringResource(R.string.onboarding_customize_toolbar_top_option),
+            label = stringResource(R.string.nova_onboarding_toolbar_selection_top_label),
         ),
         ToolbarOption(
             toolbarType = ToolbarOptionType.TOOLBAR_BOTTOM,
             imageRes = R.drawable.ic_onboarding_bottom_toolbar,
-            label = stringResource(R.string.onboarding_customize_toolbar_bottom_option),
+            label = stringResource(R.string.nova_onboarding_toolbar_selection_bottom_label),
         ),
     ),
 )
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt
index 8b6a7f84d0e20..f30dcf1c25c02 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt
@@ -113,11 +113,11 @@ private fun Header(pageState: OnboardingPageState) {
 
     Spacer(Modifier.height(10.dp))
 
-    pageState.termsOfService?.let { Subheaders(it) }
+    pageState.termsOfService?.let { Subheader(it) }
 }
 
 @Composable
-private fun Subheaders(termsOfService: OnboardingTermsOfService) {
+private fun Subheader(termsOfService: OnboardingTermsOfService) {
     with(termsOfService) {
         Spacer(Modifier.height(10.dp))
 
@@ -126,8 +126,6 @@ private fun Subheaders(termsOfService: OnboardingTermsOfService) {
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
             subheaderOneText?.let { SubHeaderText(it) }
-            subheaderTwoText?.let { SubHeaderText(it) }
-            subheaderThreeText?.let { SubHeaderText(it) }
         }
     }
 }
@@ -217,25 +215,23 @@ private fun OnboardingPagePreview() {
     FirefoxTheme {
         TermsOfServiceOnboardingPageRedesign(
             pageState = OnboardingPageState(
-                title = stringResource(id = R.string.onboarding_redesign_tou_title),
+                title = stringResource(id = R.string.nova_onboarding_tou_title),
                 description = "",
                 termsOfService = OnboardingTermsOfService(
-                    subheaderOneText = stringResource(id = R.string.onboarding_redesign_tou_subheader_one),
-                    subheaderTwoText = stringResource(id = R.string.onboarding_redesign_tou_subheader_two),
-                    subheaderThreeText = stringResource(id = R.string.onboarding_redesign_tou_subheader_three),
-                    lineOneText = stringResource(id = R.string.onboarding_redesign_tou_body_one),
-                    lineOneLinkText = stringResource(id = R.string.onboarding_redesign_tou_body_one_link_text),
+                    subheaderOneText = stringResource(id = R.string.nova_onboarding_tou_subtitle),
+                    lineOneText = stringResource(id = R.string.nova_onboarding_tou_body_line_1),
+                    lineOneLinkText = stringResource(id = R.string.nova_onboarding_tou_body_line_1_link_text),
                     lineOneLinkUrl = "URL",
-                    lineTwoText = stringResource(id = R.string.onboarding_redesign_tou_body_two),
-                    lineTwoLinkText = stringResource(id = R.string.onboarding_redesign_tou_body_two_link_text),
+                    lineTwoText = stringResource(id = R.string.nova_onboarding_tou_body_line_2),
+                    lineTwoLinkText = stringResource(id = R.string.nova_onboarding_tou_body_line_2_link_text),
                     lineTwoLinkUrl = "URL",
-                    lineThreeText = stringResource(id = R.string.onboarding_redesign_tou_body_three),
-                    lineThreeLinkText = stringResource(id = R.string.onboarding_redesign_tou_body_three_link_text),
+                    lineThreeText = stringResource(id = R.string.nova_onboarding_tou_body_line_3),
+                    lineThreeLinkText = stringResource(id = R.string.nova_onboarding_tou_body_line_3_link_text),
                 ),
-                imageRes = R.drawable.ic_firefox,
+                imageRes = R.drawable.nova_onboarding_tou,
                 primaryButton = Action(
                     text = stringResource(
-                        id = R.string.onboarding_redesign_tou_agree_and_continue_button_label,
+                        id = R.string.nova_onboarding_continue_button,
                     ),
                     onClick = {},
                 ),
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/ToolbarOnboardingPageRedesign.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/ToolbarOnboardingPageRedesign.kt
index 4583de4c401aa..d8b2a21e2c9cc 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/ToolbarOnboardingPageRedesign.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/ToolbarOnboardingPageRedesign.kt
@@ -336,11 +336,11 @@ private fun OnboardingPagePreview() {
             onboardingStore = OnboardingStore(),
             pageState = OnboardingPageState(
                 imageRes = R.drawable.ic_onboarding_customize_toolbar,
-                title = stringResource(id = R.string.onboarding_redesign_customize_toolbar_title),
-                description = stringResource(id = R.string.onboarding_customize_toolbar_description),
+                title = stringResource(id = R.string.nova_onboarding_toolbar_selection_title),
+                description = "", // Unused in redesign
                 primaryButton = Action(
                     text = stringResource(
-                        id = R.string.onboarding_redesign_continue_button,
+                        id = R.string.nova_onboarding_continue_button,
                     ),
                     onClick = {},
                 ),
@@ -348,12 +348,12 @@ private fun OnboardingPagePreview() {
                     ToolbarOption(
                         toolbarType = ToolbarOptionType.TOOLBAR_TOP,
                         imageRes = R.drawable.ic_onboarding_top_toolbar,
-                        label = stringResource(R.string.onboarding_customize_toolbar_top_option),
+                        label = stringResource(R.string.nova_onboarding_toolbar_selection_top_label),
                     ),
                     ToolbarOption(
                         toolbarType = ToolbarOptionType.TOOLBAR_BOTTOM,
                         imageRes = R.drawable.ic_onboarding_bottom_toolbar,
-                        label = stringResource(R.string.onboarding_customize_toolbar_bottom_option),
+                        label = stringResource(R.string.nova_onboarding_toolbar_selection_bottom_label),
                     ),
                 ),
                 onRecordImpressionEvent = {},
diff --git a/mobile/android/fenix/app/src/main/res/values/strings.xml b/mobile/android/fenix/app/src/main/res/values/strings.xml
index 2392e162f5747..105f2a888ad44 100644
--- a/mobile/android/fenix/app/src/main/res/values/strings.xml
+++ b/mobile/android/fenix/app/src/main/res/values/strings.xml
@@ -472,54 +472,54 @@
     <string name="onboarding_term_of_service_line_three_link_text">Manage</string>
 
     <!-- Terms of use (ToU) onboarding redesign title. -->
-    <string name="onboarding_redesign_tou_title">Launch the ultimate Android browser</string>
+    <string name="onboarding_redesign_tou_title" tools:ignore="UnusedResources">Launch the ultimate Android browser</string>
     <!-- Terms of use (ToU) first subheader. -->
-    <string name="onboarding_redesign_tou_subheader_one">Load sites lightning fast</string>
+    <string name="onboarding_redesign_tou_subheader_one" tools:ignore="UnusedResources">Load sites lightning fast</string>
     <!-- Terms of use (ToU) second subheader. -->
-    <string name="onboarding_redesign_tou_subheader_two">Automatic tracking protection</string>
+    <string name="onboarding_redesign_tou_subheader_two" tools:ignore="UnusedResources">Automatic tracking protection</string>
     <!-- Terms of use (ToU) third subheader. -->
-    <string name="onboarding_redesign_tou_subheader_three">Thousands of customizations</string>
+    <string name="onboarding_redesign_tou_subheader_three" tools:ignore="UnusedResources">Thousands of customizations</string>
     <!-- Terms of use (ToU) first body text. %1$s is replaced by an active link,
         using onboarding_redesign_tou_body_one_link_text as text (“Firefox Terms of Use”). -->
-    <string name="onboarding_redesign_tou_body_one">By continuing, you agree to the %1$s.</string>
+    <string name="onboarding_redesign_tou_body_one" tools:ignore="UnusedResources">By continuing, you agree to the %1$s.</string>
     <!-- Used as text for the link in onboarding_redesign_tou_body_one. -->
-    <string name="onboarding_redesign_tou_body_one_link_text" tools:ignore="BrandUsage">Firefox Terms of Use</string>
+    <string name="onboarding_redesign_tou_body_one_link_text" tools:ignore="BrandUsage,UnusedResources">Firefox Terms of Use</string>
     <!-- Terms of use (ToU) second body text. 'Firefox' is intentionally hardcoded.
         %1$s is replaced by an active link, using onboarding_redesign_tou_body_two_link_text as text (“Privacy Notice”). -->
-    <string name="onboarding_redesign_tou_body_two" tools:ignore="BrandUsage">Firefox cares about your privacy. Learn more in our %1$s.</string>
+    <string name="onboarding_redesign_tou_body_two" tools:ignore="BrandUsage,UnusedResources">Firefox cares about your privacy. Learn more in our %1$s.</string>
     <!-- Used as text for the link in onboarding_redesign_tou_body_two. -->
-    <string name="onboarding_redesign_tou_body_two_link_text">Privacy Notice</string>
+    <string name="onboarding_redesign_tou_body_two_link_text" tools:ignore="UnusedResources">Privacy Notice</string>
     <!-- Terms of use (ToU) third body text. 'Firefox' and 'Mozilla' are intentionally hardcoded.
         %1$s is replaced by an active link using onboarding_redesign_tou_body_three_link_text as text (“Manage Settings”). -->
-    <string name="onboarding_redesign_tou_body_three" tools:ignore="BrandUsage">To help improve the browser, Firefox sends diagnostic and interaction data to Mozilla. %1$s</string>
+    <string name="onboarding_redesign_tou_body_three" tools:ignore="BrandUsage,UnusedResources">To help improve the browser, Firefox sends diagnostic and interaction data to Mozilla. %1$s</string>
     <!-- Used as text for the link in onboarding_redesign_tou_body_three. -->
-    <string name="onboarding_redesign_tou_body_three_link_text">Manage Settings</string>
+    <string name="onboarding_redesign_tou_body_three_link_text" tools:ignore="UnusedResources">Manage Settings</string>
     <!-- Terms of use (ToU) onboarding page continue button label. -->
-    <string name="onboarding_redesign_tou_agree_and_continue_button_label">Continue</string>
+    <string name="onboarding_redesign_tou_agree_and_continue_button_label" tools:ignore="UnusedResources">Continue</string>
     <!-- Onboarding header for the toolbar selection card. -->
-    <string name="onboarding_redesign_customize_toolbar_title">Where do you want your address bar?</string>
+    <string name="onboarding_redesign_customize_toolbar_title" tools:ignore="UnusedResources">Where do you want your address bar?</string>
     <!-- Onboarding label for 'Continue' button. -->
-    <string name="onboarding_redesign_continue_button">Continue</string>
+    <string name="onboarding_redesign_continue_button" tools:ignore="UnusedResources">Continue</string>
     <!-- Marketing onboarding page title. 'Firefox' is intentionally hardcoded. -->
-    <string name="onboarding_marketing_redesign_title" tools:ignore="BrandUsage">Help us grow Firefox</string>
+    <string name="onboarding_marketing_redesign_title" tools:ignore="BrandUsage,UnusedResources">Help us grow Firefox</string>
     <!-- Marketing onboarding page opt-out checkbox. Unchecking the box does not increase data collection. Our data practices remain the same. 'Mozilla' is intentionally hardcoded. -->
-    <string name="onboarding_marketing_redesign_opt_out_checkbox" tools:ignore="BrandUsage">Share how you discovered Firefox, and that you use it, with Mozilla’s marketing partners. This data is never sold.</string>
+    <string name="onboarding_marketing_redesign_opt_out_checkbox" tools:ignore="BrandUsage,UnusedResources">Share how you discovered Firefox, and that you use it, with Mozilla’s marketing partners. This data is never sold.</string>
     <!-- Marketing onboarding page clickable link text to "learn more" on how data is used. -->
-    <string name="onboarding_marketing_redesign_learn_more">How we use the data</string>
+    <string name="onboarding_marketing_redesign_learn_more" tools:ignore="UnusedResources">How we use the data</string>
     <!-- Marketing onboarding page button label. Button to confirm choice and start browsing. -->
-    <string name="onboarding_marketing_redesign_positive_button">Confirm</string>
+    <string name="onboarding_marketing_redesign_positive_button" tools:ignore="UnusedResources">Confirm</string>
     <!-- Set to default browser onboarding redesign title. -->
-    <string name="onboarding_redesign_set_default_browser_title">Get automatic tracking protection by default</string>
+    <string name="onboarding_redesign_set_default_browser_title" tools:ignore="UnusedResources">Get automatic tracking protection by default</string>
     <!-- Set to default browser onboarding redesign body. -->
-    <string name="onboarding_redesign_set_default_browser_body">One tap helps stop companies spying on your clicks.</string>
+    <string name="onboarding_redesign_set_default_browser_body" tools:ignore="UnusedResources">One tap helps stop companies spying on your clicks.</string>
     <!-- Sync onboarding redesign title. 'Firefox' is intentionally hardcoded. -->
-    <string name="onboarding_redesign_sync_title" tools:ignore="BrandUsage">Sync everywhere you use Firefox</string>
+    <string name="onboarding_redesign_sync_title" tools:ignore="BrandUsage,UnusedResources">Sync everywhere you use Firefox</string>
     <!-- Sync onboarding redesign body. -->
-    <string name="onboarding_redesign_sync_body">Get bookmarks, tabs, and passwords on any device. All protected with encryption.</string>
+    <string name="onboarding_redesign_sync_body" tools:ignore="UnusedResources">Get bookmarks, tabs, and passwords on any device. All protected with encryption.</string>
     <!-- Sync onboarding redesign positive button text. -->
-    <string name="onboarding_redesign_sync_positive_button">Start syncing</string>
+    <string name="onboarding_redesign_sync_positive_button" tools:ignore="UnusedResources">Start syncing</string>
     <!-- Sync onboarding redesign negative button text. -->
-    <string name="onboarding_redesign_sync_negative_button">Not now</string>
+    <string name="onboarding_redesign_sync_negative_button" tools:ignore="UnusedResources">Not now</string>
     <!-- Marketing onboarding page title. 'Firefox' is intentionally hardcoded. -->
     <string name="onboarding_marketing_title" tools:ignore="BrandUsage,UnusedResources">Help us grow Firefox</string>
     <!-- Marketing onboarding page body. 'Firefox' is intentionally hardcoded. -->
@@ -540,55 +540,57 @@
     <!-- ==== Project "Nova" onboarding strings ==== -->
 
     <!-- "Continue" onboarding button. -->
-    <string name="nova_onboarding_continue_button" tools:ignore="UnusedResources">Continue</string>
+    <string name="nova_onboarding_continue_button" >Continue</string>
 
     <!-- "Not now" onboarding button. -->
-    <string name="nova_onboarding_negative_button" tools:ignore="UnusedResources">Not now</string>
+    <string name="nova_onboarding_negative_button">Not now</string>
 
     <!-- Terms of use (ToU) onboarding title. -->
-    <string name="nova_onboarding_tou_title" tools:ignore="UnusedResources">Get ready to run free</string>
+    <string name="nova_onboarding_tou_title">Get ready to run free</string>
 
     <!-- Terms of use (ToU) onboarding subtitle. -->
-    <string name="nova_onboarding_tou_subtitle" tools:ignore="UnusedResources">Speedy, safe, and won’t sell you out.\nBrowsing just got better.</string>
+    <string name="nova_onboarding_tou_subtitle">Speedy, safe, and won’t sell you out.\nBrowsing just got better.</string>
 
     <!-- Terms of use (ToU) onboarding body line one.
         %1$s is replaced by an active link, using nova_onboarding_tou_body_line_1_link_text as text (“Firefox Terms of Use”). -->
-    <string name="nova_onboarding_tou_body_line_1" tools:ignore="UnusedResources">By continuing, you agree to the %1$s.</string>
+    <string name="nova_onboarding_tou_body_line_1">By continuing, you agree to the %1$s.</string>
 
     <!-- Terms of use (ToU) onboarding body line one link text for nova_onboarding_tou_body_line_1. 'Firefox' is intentionally hardcoded. -->
-    <string name="nova_onboarding_tou_body_line_1_link_text" tools:ignore="BrandUsage,UnusedResources">Firefox Terms of Use</string>
+    <string name="nova_onboarding_tou_body_line_1_link_text" tools:ignore="BrandUsage">Firefox Terms of Use</string>
 
     <!-- Terms of use (ToU) onboarding body line two. 'Firefox' is intentionally hardcoded.
         %1$s is replaced by an active link, using nova_onboarding_tou_body_line_2_link_text as text (“Privacy Notice”). -->
-    <string name="nova_onboarding_tou_body_line_2" tools:ignore="BrandUsage,UnusedResources">Firefox cares about your privacy. Learn more in our %1$s.</string>
+    <string name="nova_onboarding_tou_body_line_2" tools:ignore="BrandUsage">Firefox cares about your privacy. Learn more in our %1$s.</string>
 
     <!-- Terms of use (ToU) onboarding body line two link text for nova_onboarding_tou_body_line_2. -->
-    <string name="nova_onboarding_tou_body_line_2_link_text" tools:ignore="UnusedResources">Privacy Notice</string>
+    <string name="nova_onboarding_tou_body_line_2_link_text">Privacy Notice</string>
 
     <!-- Terms of use (ToU) onboarding body line three. 'Firefox' and 'Mozilla' are intentionally hardcoded.
         %1$s is replaced by an active link, using nova_onboarding_tou_body_line_3_link_text as text (“Manage Settings”). -->
-    <string name="nova_onboarding_tou_body_line_3" tools:ignore="BrandUsage,UnusedResources">To help improve the browser, Firefox sends diagnostic and interaction data to Mozilla. %1$s</string>
+    <string name="nova_onboarding_tou_body_line_3" tools:ignore="BrandUsage">To help improve the browser, Firefox sends diagnostic and interaction data to Mozilla. %1$s</string>
 
     <!-- Terms of use (ToU) onboarding body line three link text for nova_onboarding_tou_body_line_3. -->
-    <string name="nova_onboarding_tou_body_line_3_link_text" tools:ignore="UnusedResources">Manage settings</string>
+    <string name="nova_onboarding_tou_body_line_3_link_text">Manage settings</string>
 
     <!-- "Set to default" onboarding title. -->
     <string name="nova_onboarding_set_to_default_title" tools:ignore="UnusedResources">Say goodbye to creepy trackers</string>
+    <!-- "Set to default" onboarding title. -->
+    <string name="nova_onboarding_set_to_default_title_2">Open all your links with built-in privacy</string>
 
     <!-- "Set to default" onboarding subtitle. -->
-    <string name="nova_onboarding_set_to_default_subtitle" tools:ignore="UnusedResources">We protect your data and automatically block companies from spying on your clicks.</string>
+    <string name="nova_onboarding_set_to_default_subtitle">We protect your data and automatically block companies from spying on your clicks.</string>
 
     <!-- "Set to default" onboarding button. -->
-    <string name="nova_onboarding_set_to_default_button" tools:ignore="UnusedResources">Set as default browser</string>
+    <string name="nova_onboarding_set_to_default_button">Set as default browser</string>
 
     <!-- Toolbar selection onboarding title. -->
-    <string name="nova_onboarding_toolbar_selection_title" tools:ignore="UnusedResources">Choose your address bar</string>
+    <string name="nova_onboarding_toolbar_selection_title">Choose your address bar</string>
 
     <!-- Toolbar selection onboarding "top" option label. -->
-    <string name="nova_onboarding_toolbar_selection_top_label" tools:ignore="UnusedResources">Top</string>
+    <string name="nova_onboarding_toolbar_selection_top_label">Top</string>
 
     <!-- Toolbar selection onboarding "bottom" option label. -->
-    <string name="nova_onboarding_toolbar_selection_bottom_label" tools:ignore="UnusedResources">Bottom</string>
+    <string name="nova_onboarding_toolbar_selection_bottom_label">Bottom</string>
 
     <!-- Theme selection onboarding title. -->
     <string name="nova_onboarding_theme_selection_title" tools:ignore="UnusedResources">Pick your theme</string>
@@ -603,23 +605,23 @@
     <string name="nova_onboarding_theme_selection_dark_label" tools:ignore="UnusedResources">Dark</string>
 
     <!-- Sync onboarding title. -->
-    <string name="nova_onboarding_sync_title" tools:ignore="UnusedResources">Instantly pick up where you left off</string>
+    <string name="nova_onboarding_sync_title">Instantly pick up where you left off</string>
 
     <!-- Sync onboarding subtitle. -->
-    <string name="nova_onboarding_sync_subtitle" tools:ignore="UnusedResources">Grab bookmarks, passwords, and more on any device in a snap. Your personal data stays safe and secure with encryption.</string>
+    <string name="nova_onboarding_sync_subtitle">Grab bookmarks, passwords, and more on any device in a snap. Your personal data stays safe and secure with encryption.</string>
 
     <!-- Sync onboarding button. -->
-    <string name="nova_onboarding_sync_button" tools:ignore="UnusedResources">Start syncing</string>
+    <string name="nova_onboarding_sync_button">Start syncing</string>
 
     <!-- Marketing onboarding title. -->
-    <string name="nova_onboarding_marketing_title" tools:ignore="UnusedResources">Help us build a better internet</string>
+    <string name="nova_onboarding_marketing_title">Help us build a better internet</string>
 
     <!-- Marketing onboarding body. 'Firefox' and 'Mozilla' are intentionally hardcoded.
         %1$s is replaced by an active link, using nova_onboarding_marketing_body_link_text as text (“How we use the data”). -->
-    <string name="nova_onboarding_marketing_body" tools:ignore="BrandUsage,UnusedResources">Share how you discovered Firefox, and that you use it, with Mozilla’s marketing partners. This data is never sold. %1$s</string>
+    <string name="nova_onboarding_marketing_body" tools:ignore="BrandUsage">Share how you discovered Firefox, and that you use it, with Mozilla’s marketing partners. This data is never sold. %1$s</string>
 
     <!-- Marketing onboarding body link text. -->
-    <string name="nova_onboarding_marketing_body_link_text" tools:ignore="UnusedResources">How we use the data</string>
+    <string name="nova_onboarding_marketing_body_link_text">How we use the data</string>
 
     <!-- Notifications onboarding title. 'Firefox' is intentionally hardcoded. -->
     <string name="nova_onboarding_notifications_title" tools:ignore="BrandUsage,UnusedResources">Notifications help you stay safer with Firefox</string>
@@ -628,16 +630,16 @@
     <string name="nova_onboarding_notifications_subtitle" tools:ignore="BrandUsage,UnusedResources">Discover the latest privacy features in Firefox so you’re always up to date on how to stay protected.</string>
 
     <!-- Notifications onboarding button. -->
-    <string name="nova_onboarding_notifications_button" tools:ignore="UnusedResources">Turn on notifications</string>
+    <string name="nova_onboarding_notifications_button">Turn on notifications</string>
 
     <!-- "Add search widget" onboarding title. -->
-    <string name="nova_onboarding_add_search_widget_title" tools:ignore="UnusedResources">Make every search more private</string>
+    <string name="nova_onboarding_add_search_widget_title">Make every search more private</string>
 
     <!-- "Add search widget" onboarding subtitle. 'Firefox' is intentionally hardcoded. -->
-    <string name="nova_onboarding_add_search_widget_subtitle" tools:ignore="BrandUsage,UnusedResources">Start every search from your phone’s home screen and know Firefox’s automatic protections have your back.</string>
+    <string name="nova_onboarding_add_search_widget_subtitle" tools:ignore="BrandUsage">Start every search from your phone’s home screen and know Firefox’s automatic protections have your back.</string>
 
     <!-- "Add search widget" onboarding button. 'Firefox' is intentionally hardcoded. -->
-    <string name="nova_onboarding_add_search_widget_button" tools:ignore="BrandUsage,UnusedResources">Add Firefox widget</string>
+    <string name="nova_onboarding_add_search_widget_button" tools:ignore="BrandUsage">Add Firefox widget</string>
 
     <!-- ==== End of Project "Nova" onboarding strings ==== -->
 

From 5743fa6b4a8a2864d9a4c35f844569a160284edc Mon Sep 17 00:00:00 2001
From: t-p-white <towhite@mozilla.com>
Date: Thu, 29 Jan 2026 14:50:18 +0000
Subject: [PATCH 068/116] Bug 2012103 - Part 2: Added the required drawable
 assets, and updated the redesigned onboarding cards to implement them.
 r=android-reviewers,gmalekpour

This patch is to add the new assets and implement them in the onboarding redesign. Note that there will likely be follow-up patches for UX tweaks to sizing and positing etc

{F56358545}

Differential Revision: https://phabricator.services.mozilla.com/D280434
---
 mobile/android/fenix/app/lint-baseline.xml    |  33 +
 mobile/android/fenix/app/onboarding.fml.yaml  |  11 +-
 .../notification/NotificationMainImage.kt     |   2 +-
 .../MarketingDataOnboardingPageRedesign.kt    |   2 +-
 .../redesign/view/OnboardingScreenRedesign.kt |  33 +-
 .../TermsOfServiceOnboardingPageRedesign.kt   |  11 +-
 .../view/ToolbarOnboardingPageRedesign.kt     | 238 ++-----
 .../defaultbrowser/SetToDefaultMainImage.kt   | 112 +--
 .../redesign/view/sync/SyncMainImage.kt       |   2 +-
 .../widget/SetSearchWidgetMainImage.kt        |   2 +-
 .../nova_onboarding_background.xml            |  94 +++
 .../drawable/android_sync_illustration.xml    | 106 ---
 .../drawable/nova_onboarding_background.xml   |  88 +++
 .../drawable/nova_onboarding_marketing.xml    | 528 ++++++++++++++
 .../nova_onboarding_notifications.xml         | 241 +++++++
 .../nova_onboarding_set_to_default.xml        | 182 +++++
 .../res/drawable/nova_onboarding_sync.xml     | 674 ++++++++++++++++++
 .../nova_onboarding_toolbar_bottom_active.xml | 304 ++++++++
 ...ova_onboarding_toolbar_bottom_inactive.xml | 105 +++
 .../nova_onboarding_toolbar_top_active.xml    | 304 ++++++++
 .../nova_onboarding_toolbar_top_inactive.xml  | 105 +++
 .../main/res/drawable/nova_onboarding_tou.xml | 311 ++++++++
 .../res/drawable/nova_onboarding_widget.xml   | 242 +++++++
 23 files changed, 3304 insertions(+), 426 deletions(-)
 create mode 100644 mobile/android/fenix/app/src/main/res/drawable-night/nova_onboarding_background.xml
 delete mode 100644 mobile/android/fenix/app/src/main/res/drawable/android_sync_illustration.xml
 create mode 100644 mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_background.xml
 create mode 100644 mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_marketing.xml
 create mode 100644 mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_notifications.xml
 create mode 100644 mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_set_to_default.xml
 create mode 100644 mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_sync.xml
 create mode 100644 mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_toolbar_bottom_active.xml
 create mode 100644 mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_toolbar_bottom_inactive.xml
 create mode 100644 mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_toolbar_top_active.xml
 create mode 100644 mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_toolbar_top_inactive.xml
 create mode 100644 mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_tou.xml
 create mode 100644 mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_widget.xml

diff --git a/mobile/android/fenix/app/lint-baseline.xml b/mobile/android/fenix/app/lint-baseline.xml
index 0322134e8c230..12e14630a916a 100644
--- a/mobile/android/fenix/app/lint-baseline.xml
+++ b/mobile/android/fenix/app/lint-baseline.xml
@@ -353,6 +353,39 @@
             column="20"/>
     </issue>
 
+    <issue
+        id="VectorRaster"
+        message="Limit vector icons sizes to 200×200 to keep icon drawing fast; see https://developer.android.com/studio/write/vector-asset-studio#when for more"
+        errorLine1="    android:width=&quot;202dp&quot;"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/main/res/drawable/nova_onboarding_notifications.xml"
+            line="7"
+            column="20"/>
+    </issue>
+
+    <issue
+        id="VectorRaster"
+        message="Limit vector icons sizes to 200×200 to keep icon drawing fast; see https://developer.android.com/studio/write/vector-asset-studio#when for more"
+        errorLine1="    android:width=&quot;257dp&quot;"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/main/res/drawable/nova_onboarding_tou.xml"
+            line="7"
+            column="20"/>
+    </issue>
+
+    <issue
+        id="VectorRaster"
+        message="Limit vector icons sizes to 200×200 to keep icon drawing fast; see https://developer.android.com/studio/write/vector-asset-studio#when for more"
+        errorLine1="    android:width=&quot;206dp&quot;"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/main/res/drawable/nova_onboarding_widget.xml"
+            line="7"
+            column="20"/>
+    </issue>
+
     <issue
         id="VisibleForTests"
         message="This method should only be accessed from tests or within private scope"
diff --git a/mobile/android/fenix/app/onboarding.fml.yaml b/mobile/android/fenix/app/onboarding.fml.yaml
index e5cfadd447a4b..fce86f3dd70ef 100644
--- a/mobile/android/fenix/app/onboarding.fml.yaml
+++ b/mobile/android/fenix/app/onboarding.fml.yaml
@@ -149,7 +149,7 @@ features:
               enabled: false
               title: nova_onboarding_tou_title
               ordering: 0
-              image-res: ic_firefox
+              image-res: nova_onboarding_tou
               primary-button-label: nova_onboarding_continue_button
               extra-data:
                 term-of-service-data:
@@ -195,7 +195,6 @@ features:
               card-type: add-search-widget
               title: nova_onboarding_add_search_widget_title
               body: nova_onboarding_add_search_widget_subtitle
-              image-res: ic_onboarding_search_widget
               ordering: 10
               primary-button-label: nova_onboarding_add_search_widget_button
               secondary-button-label: nova_onboarding_negative_button
@@ -234,7 +233,6 @@ features:
               card-type: notification-permission
               title: nova_onboarding_notifications_title
               body: nova_onboarding_notifications_subtitle
-              image-res: ic_notification_permission
               ordering: 20
               primary-button-label: nova_onboarding_notifications_button
               secondary-button-label: nova_onboarding_negative_button
@@ -281,7 +279,6 @@ features:
               enabled: false
               title: nova_onboarding_toolbar_selection_title
               body: onboarding_customize_toolbar_description
-              image-res: ic_onboarding_customize_toolbar
               ordering: 35
               primary-button-label: nova_onboarding_continue_button
               extra-data:
@@ -311,7 +308,7 @@ features:
               card-type: marketing-data
               enabled: false
               title: nova_onboarding_marketing_title
-              image-res: ic_onboarding_marketing_redesign
+              image-res: nova_onboarding_marketing
               ordering: 40
               primary-button-label: nova_onboarding_continue_button
               extra-data:
@@ -325,6 +322,7 @@ features:
           cards:
             terms-of-service:
               title: nova_onboarding_tou_title
+              image-res: nova_onboarding_tou
               primary-button-label: nova_onboarding_continue_button
               extra-data:
                 term-of-service-data:
@@ -362,7 +360,6 @@ features:
 
             toolbar-placement:
               title: nova_onboarding_toolbar_selection_title
-              image-res: ic_onboarding_customize_toolbar
               primary-button-label: onboarding_redesign_continue_button
               extra-data:
                 customization-toolbar-data:
@@ -375,7 +372,7 @@ features:
 
             marketing:
               title: nova_onboarding_marketing_title
-              image-res: ic_onboarding_marketing_redesign
+              image-res: nova_onboarding_marketing
               primary-button-label: nova_onboarding_continue_button
               extra-data:
                 marketing-data:
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/notification/NotificationMainImage.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/notification/NotificationMainImage.kt
index 650014a689336..35b82f3d0d0a5 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/notification/NotificationMainImage.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/notification/NotificationMainImage.kt
@@ -20,7 +20,7 @@ import org.mozilla.fenix.theme.FirefoxTheme
 @Composable
 fun NotificationMainImage() {
     Image(
-        painter = painterResource(R.drawable.ic_notification_permission),
+        painter = painterResource(R.drawable.nova_onboarding_notifications),
         contentDescription = null, // Decorative only
     )
 }
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/MarketingDataOnboardingPageRedesign.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/MarketingDataOnboardingPageRedesign.kt
index 513e8ab0d2070..acfefe417b85e 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/MarketingDataOnboardingPageRedesign.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/MarketingDataOnboardingPageRedesign.kt
@@ -182,7 +182,7 @@ private fun MarketingDataOnboardingPagePreview() {
     FirefoxTheme {
         MarketingDataOnboardingPageRedesign(
             state = OnboardingPageState(
-                imageRes = R.drawable.ic_onboarding_marketing_redesign,
+                imageRes = R.drawable.nova_onboarding_marketing,
                 title = stringResource(id = R.string.nova_onboarding_marketing_title),
                 description = "", // NB: not used in the redesign
                 primaryButton = Action(
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt
index 2edcd31b8d879..226666388f5c6 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt
@@ -7,7 +7,6 @@ package org.mozilla.fenix.onboarding.redesign.view
 import android.content.res.Configuration
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.background
-import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
@@ -36,10 +35,11 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.draw.paint
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
@@ -78,25 +78,6 @@ import org.mozilla.fenix.utils.isLargeScreenSize
 private val SMALL_SCREEN_MAX_HEIGHT = 480.dp
 private val logger: Logger = Logger("OnboardingScreenRedesign")
 
-/**
- * The colors used for the gradient background.
- */
-private object GradientColors {
-    val nonDarkMode = listOf(
-        Color(0xFFF5C1BD), // light pink (top)
-        Color(0xFFED8043), // orange
-        Color(0xFFEB691D), // deeper orange-red
-        Color(0xFFE00B1D), // strong red (bottom)
-    )
-
-    val darkMode = listOf(
-        Color(0xFF9B7AE0), // soft violet (top)
-        Color(0xFF7B4FC9), // medium purple
-        Color(0xFF4A289A), // deep purple
-        Color(0xFF2E1468), // darkest purple (bottom)
-    )
-}
-
 /**
  * A screen for displaying onboarding.
  *
@@ -385,11 +366,13 @@ private fun OnboardingContent(
 private fun OnboardingBackground(isVisible: Boolean, isSolidBackground: Boolean) {
     if (!isVisible) return
 
-    val colors = if (isSystemInDarkTheme()) GradientColors.darkMode else GradientColors.nonDarkMode
     val backgroundModifier = if (isSolidBackground) {
         Modifier.background(color = MaterialTheme.colorScheme.surface)
     } else {
-        Modifier.background(brush = Brush.verticalGradient(colors = colors))
+        Modifier.paint(
+            painter = painterResource(R.drawable.nova_onboarding_background),
+            contentScale = ContentScale.Crop,
+        )
     }
 
     Box(
@@ -661,7 +644,7 @@ private fun touPageUIData() = OnboardingPageUiData(
         lineThreeText = stringResource(id = R.string.nova_onboarding_tou_body_line_3),
         lineThreeLinkText = stringResource(id = R.string.nova_onboarding_tou_body_line_3_link_text),
     ),
-    imageRes = R.drawable.ic_firefox,
+    imageRes = R.drawable.nova_onboarding_tou,
     primaryButtonLabel = stringResource(
         id = R.string.nova_onboarding_continue_button,
     ),
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt
index f30dcf1c25c02..49c9dd0fd645b 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt
@@ -39,6 +39,8 @@ import org.mozilla.fenix.onboarding.view.OnboardingTermsOfService
 import org.mozilla.fenix.onboarding.view.OnboardingTermsOfServiceEventHandler
 import org.mozilla.fenix.theme.FirefoxTheme
 
+private val TOU_IMAGE_HEIGHT = 200.dp
+
 /**
  * A Composable for displaying the terms of service onboarding page content.
  *
@@ -98,9 +100,7 @@ private fun Header(pageState: OnboardingPageState) {
     Image(
         painter = painterResource(id = pageState.imageRes),
         contentDescription = null, // Decorative image only.
-        modifier = Modifier
-            .height(IconSize.heightDp)
-            .width(IconSize.widthDp),
+        modifier = Modifier.height(TOU_IMAGE_HEIGHT),
     )
 
     Spacer(Modifier.height(20.dp))
@@ -202,11 +202,6 @@ private fun BodyLinkText(
 
 private fun String.updateFirstPlaceholder(text: String) = replace("%1\$s", text)
 
-private object IconSize {
-    val heightDp = 60.dp
-    val widthDp = 58.dp
-}
-
 // *** Code below used for previews only *** //
 
 @PreviewLightDark
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/ToolbarOnboardingPageRedesign.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/ToolbarOnboardingPageRedesign.kt
index d8b2a21e2c9cc..bf61a3a146677 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/ToolbarOnboardingPageRedesign.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/ToolbarOnboardingPageRedesign.kt
@@ -4,23 +4,24 @@
 
 package org.mozilla.fenix.onboarding.redesign.view
 
-import androidx.compose.animation.animateColorAsState
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
@@ -31,17 +32,16 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import mozilla.components.compose.base.annotation.FlexibleWindowLightDarkPreview
 import mozilla.components.compose.base.button.FilledButton
@@ -54,6 +54,8 @@ import org.mozilla.fenix.onboarding.view.ToolbarOptionType
 import org.mozilla.fenix.theme.FirefoxTheme
 import mozilla.components.ui.icons.R as iconsR
 
+private val TOOLBAR_IMAGE_HEIGHT = 150.dp
+
 /**
  * A Composable for displaying toolbar placement onboarding page content.
  *
@@ -145,189 +147,89 @@ private fun ToolbarPositionOption(
     isSelected: Boolean,
     onClick: () -> Unit,
 ) {
-    Column(horizontalAlignment = Alignment.CenterHorizontally) {
-        ToolbarPositionImage(
-            option = option,
-            isSelected = isSelected,
-            onClick = { onClick() },
+    Column(
+        modifier = Modifier.clickable(
+            role = Role.Button,
+            interactionSource = remember { MutableInteractionSource() },
+            indication = null, // Prevents onClick press/ripple animation
+            onClick = onClick,
+        ),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        Spacer(Modifier.height(8.dp))
+
+        Image(
+            painter = painterResource(option.toolbarType.imageRes(isSelected)),
+            contentDescription = null, // Decorative only
+            modifier = Modifier.height(TOOLBAR_IMAGE_HEIGHT),
         )
 
-        Spacer(Modifier.height(8.dp))
+        Spacer(Modifier.height(26.dp))
 
         Text(
             text = option.label,
             modifier = Modifier.align(Alignment.CenterHorizontally),
             style = FirefoxTheme.typography.headline7,
         )
-    }
-}
 
-@Composable
-private fun ToolbarPositionImage(
-    option: ToolbarOption,
-    isSelected: Boolean,
-    onClick: () -> Unit,
-    aspectRatio: Float = 0.7f,
-) {
-    val cardShape = RoundedCornerShape(16.dp)
-    val imageColors = imageColors(isSelected)
+        Spacer(Modifier.height(12.dp))
 
-    Box(
-        modifier = Modifier
-            .height(CONTENT_IMAGE_HEIGHT)
-            .aspectRatio(aspectRatio)
-            .clickable(role = Role.Button, onClick = onClick)
-            .clip(shape = cardShape)
-            .background(color = imageColors.cardBackground)
-            .border(2.dp, imageColors.borderColor, cardShape),
-    ) {
-        BrowserIllustration(
-            imageColors = imageColors,
-            isTop = option.toolbarType == ToolbarOptionType.TOOLBAR_TOP,
-        )
+        SelectedCheckmark(isSelected)
     }
 }
 
-@Composable
-private fun BrowserIllustration(
-    imageColors: ImageColors,
-    isTop: Boolean,
-) {
-    val browserShape = RoundedCornerShape(6.dp)
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .padding(32.dp)
-            .clip(shape = browserShape)
-            .border(2.dp, imageColors.borderColor, browserShape),
-    ) {
-        val (paddingTop, paddingBottom) = if (isTop) 6.dp to 4.dp else 4.dp to 6.dp
-
-        if (isTop) {
-            ToolbarIllustration(
-                toolbarBackground = imageColors.toolbarBackground,
-                addressBarBackground = imageColors.addressBarBackground,
-                iconTint = imageColors.iconColor,
-                paddingTop = paddingTop,
-                paddingBottom = paddingBottom,
-            )
-        }
-
-        TabIllustration(Modifier.weight(1f))
-
-        if (!isTop) {
-            ToolbarIllustration(
-                toolbarBackground = imageColors.toolbarBackground,
-                addressBarBackground = imageColors.addressBarBackground,
-                iconTint = imageColors.iconColor,
-                paddingTop = paddingTop,
-                paddingBottom = paddingBottom,
-            )
-        }
-    }
-}
+@DrawableRes
+private fun ToolbarOptionType.imageRes(isSelected: Boolean): Int =
+    when (this) {
+        ToolbarOptionType.TOOLBAR_TOP ->
+            if (isSelected) {
+                R.drawable.nova_onboarding_toolbar_top_active
+            } else {
+                R.drawable.nova_onboarding_toolbar_top_inactive
+            }
 
-@Composable
-private fun ToolbarIllustration(
-    toolbarBackground: Color,
-    addressBarBackground: Color,
-    iconTint: Color,
-    paddingTop: Dp,
-    paddingBottom: Dp,
-) {
-    Box(modifier = Modifier.background(toolbarBackground)) {
-        AddressBarIllustration(
-            addressBarBackground = addressBarBackground,
-            iconTint = iconTint,
-            paddingTop = paddingTop,
-            paddingBottom = paddingBottom,
-        )
+        ToolbarOptionType.TOOLBAR_BOTTOM ->
+            if (isSelected) {
+                R.drawable.nova_onboarding_toolbar_bottom_active
+            } else {
+                R.drawable.nova_onboarding_toolbar_bottom_inactive
+            }
     }
-}
 
 @Composable
-private fun AddressBarIllustration(
-    addressBarBackground: Color,
-    iconTint: Color,
-    paddingTop: Dp,
-    paddingBottom: Dp,
-) {
-    Box(
-        modifier = Modifier
-            .fillMaxWidth()
-            .height(24.dp)
-            .padding(top = paddingTop, bottom = paddingBottom, start = 6.dp, end = 6.dp)
-            .clip(RoundedCornerShape(28.dp))
-            .background(addressBarBackground),
-    ) {
-        Icon(
-            painter = painterResource(iconsR.drawable.mozac_ic_search_24),
-            tint = iconTint,
-            contentDescription = null,
+private fun SelectedCheckmark(selected: Boolean = false) {
+    if (selected) {
+        Box(
             modifier = Modifier
-                .padding(start = 4.dp, top = 2.dp, bottom = 2.dp)
-                .align(Alignment.CenterStart),
-        )
+                .size(24.dp)
+                .padding(1.dp)
+                .clip(CircleShape)
+                .background(MaterialTheme.colorScheme.tertiary),
+            contentAlignment = Alignment.Center,
+        ) {
+            Icon(
+                painter = painterResource(id = iconsR.drawable.mozac_ic_checkmark_24),
+                contentDescription = null, // Decorative only.
+                tint = MaterialTheme.colorScheme.onPrimary,
+                modifier = Modifier
+                    .size(24.dp)
+                    .padding(2.dp),
+            )
+        }
+    } else {
+        Box(
+            modifier = Modifier
+                .size(24.dp)
+                .border(
+                    width = 3.dp,
+                    color = MaterialTheme.colorScheme.outlineVariant,
+                    shape = CircleShape,
+                ),
+            contentAlignment = Alignment.Center,
+        ) { }
     }
 }
 
-@Composable
-private fun TabIllustration(modifier: Modifier) {
-    Box(
-        modifier = modifier
-            .fillMaxWidth()
-            .background(Color.White),
-    )
-}
-
-@Composable
-private fun imageColors(isSelected: Boolean): ImageColors {
-    val borderColor by animateColorAsState(
-        targetValue = if (isSelected) {
-            MaterialTheme.colorScheme.primary
-        } else {
-            MaterialTheme.colorScheme.outlineVariant
-        },
-        label = "borderColor",
-    )
-    val cardBackground by animateColorAsState(
-        targetValue = if (isSelected) MaterialTheme.colorScheme.primaryContainer else Color.White,
-        label = "cardBackground",
-    )
-    val addressBarBackground by animateColorAsState(
-        targetValue = if (isSelected) MaterialTheme.colorScheme.primary else Color.White,
-        label = "addressBarBackground",
-    )
-    val toolbarBackground by animateColorAsState(
-        targetValue = if (isSelected) {
-            MaterialTheme.colorScheme.surfaceDim
-        } else {
-            MaterialTheme.colorScheme.outlineVariant
-        },
-        label = "toolbarBackground",
-    )
-    val iconColor by animateColorAsState(
-        targetValue = if (isSelected) Color.White else MaterialTheme.colorScheme.onSurfaceVariant,
-        label = "iconColor",
-    )
-
-    return ImageColors(
-        borderColor = borderColor,
-        cardBackground = cardBackground,
-        addressBarBackground = addressBarBackground,
-        toolbarBackground = toolbarBackground,
-        iconColor = iconColor,
-    )
-}
-
-private data class ImageColors(
-    val borderColor: Color,
-    val cardBackground: Color,
-    val addressBarBackground: Color,
-    val toolbarBackground: Color,
-    val iconColor: Color,
-)
-
 @FlexibleWindowLightDarkPreview
 @Composable
 private fun OnboardingPagePreview() {
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/defaultbrowser/SetToDefaultMainImage.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/defaultbrowser/SetToDefaultMainImage.kt
index 7ed32c21a08ea..753bd03f1c430 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/defaultbrowser/SetToDefaultMainImage.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/defaultbrowser/SetToDefaultMainImage.kt
@@ -5,33 +5,12 @@
 package org.mozilla.fenix.onboarding.redesign.view.defaultbrowser
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.PreviewLightDark
-import androidx.compose.ui.unit.dp
 import org.mozilla.fenix.R
 import org.mozilla.fenix.theme.FirefoxTheme
-import mozilla.components.ui.icons.R as iconsR
 
 /**
  * Renders the main image for the "Set to Default" onboarding screen.
@@ -40,93 +19,10 @@ import mozilla.components.ui.icons.R as iconsR
  */
 @Composable
 fun SetToDefaultMainImage() {
-    Column(
-        modifier = Modifier.padding(horizontal = 16.dp),
-        verticalArrangement = Arrangement.spacedBy(8.dp),
-    ) {
-        BrowserChoiceRow()
-
-        BrowserChoiceRow(selected = true)
-
-        BrowserChoiceRow()
-    }
-}
-
-@Composable
-private fun BrowserChoiceRow(selected: Boolean = false) {
-    Row(
-        modifier = Modifier
-            .fillMaxWidth()
-            .height(40.dp),
-        horizontalArrangement = Arrangement.spacedBy(10.dp),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        BrowserDetailsRow(selected)
-
-        SelectedCheckmark(selected)
-    }
-}
-
-@Composable
-private fun RowScope.BrowserDetailsRow(selected: Boolean = false) {
-    Row(
-        modifier = Modifier
-            .fillMaxHeight()
-            .weight(1f)
-            .border(3.dp, MaterialTheme.colorScheme.outlineVariant, RoundedCornerShape(10.dp))
-            .padding(start = 12.dp),
-        horizontalArrangement = Arrangement.spacedBy(12.dp),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        if (selected) {
-            Image(
-                painter = painterResource(R.drawable.ic_firefox),
-                contentDescription = null, // Decorative only.
-                modifier = Modifier.size(24.dp),
-            )
-        } else {
-            Box(
-                modifier = Modifier
-                    .size(20.dp)
-                    .clip(CircleShape)
-                    .background(MaterialTheme.colorScheme.outlineVariant),
-            )
-        }
-    }
-}
-
-@Composable
-private fun SelectedCheckmark(selected: Boolean = false) {
-    if (selected) {
-        Box(
-            modifier = Modifier
-                .size(24.dp)
-                .padding(1.dp)
-                .clip(CircleShape)
-                .background(MaterialTheme.colorScheme.tertiary),
-            contentAlignment = Alignment.Center,
-        ) {
-            Icon(
-                painter = painterResource(id = iconsR.drawable.mozac_ic_checkmark_24),
-                contentDescription = null, // Decorative only.
-                tint = MaterialTheme.colorScheme.onPrimary,
-                modifier = Modifier
-                    .size(24.dp)
-                    .padding(2.dp),
-            )
-        }
-    } else {
-        Box(
-            modifier = Modifier
-                .size(24.dp)
-                .border(
-                    width = 3.dp,
-                    color = MaterialTheme.colorScheme.outlineVariant,
-                    shape = CircleShape,
-                ),
-            contentAlignment = Alignment.Center,
-        ) { }
-    }
+    Image(
+        painter = painterResource(R.drawable.nova_onboarding_set_to_default),
+        contentDescription = null, // Decorative only
+    )
 }
 
 @PreviewLightDark
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/sync/SyncMainImage.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/sync/SyncMainImage.kt
index f3edc7e89678e..d999beb59bd6f 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/sync/SyncMainImage.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/sync/SyncMainImage.kt
@@ -20,7 +20,7 @@ import org.mozilla.fenix.theme.FirefoxTheme
 @Composable
 fun SyncMainImage() {
     Image(
-        painter = painterResource(R.drawable.android_sync_illustration),
+        painter = painterResource(R.drawable.nova_onboarding_sync),
         contentDescription = null, // Decorative only
     )
 }
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/widget/SetSearchWidgetMainImage.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/widget/SetSearchWidgetMainImage.kt
index c35ec743b8f19..0a8eeca3bbbcb 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/widget/SetSearchWidgetMainImage.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/widget/SetSearchWidgetMainImage.kt
@@ -25,7 +25,7 @@ private val IMAGE_HEIGHT = 200.dp
 @Composable
 fun SetSearchWidgetMainImage() {
     Image(
-        painter = painterResource(R.drawable.ic_onboarding_search_widget),
+        painter = painterResource(R.drawable.nova_onboarding_widget),
         contentDescription = null, // Decorative only
         modifier = Modifier.height(IMAGE_HEIGHT),
     )
diff --git a/mobile/android/fenix/app/src/main/res/drawable-night/nova_onboarding_background.xml b/mobile/android/fenix/app/src/main/res/drawable-night/nova_onboarding_background.xml
new file mode 100644
index 0000000000000..b2786a9e63e2a
--- /dev/null
+++ b/mobile/android/fenix/app/src/main/res/drawable-night/nova_onboarding_background.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="654.19dp"
+    android:height="387.68dp"
+    android:viewportWidth="654.19"
+    android:viewportHeight="387.68">
+  <path
+      android:pathData="M0,0h654.19v387.68h-654.19z"
+      android:fillColor="#210340"/>
+  <path
+      android:pathData="M628.25,242.93c-46.99,-8.62 -65.32,-29.08 -112.97,-29.08s-67.42,18.01 -107.11,29.08c-25.6,7.14 -53.12,9.74 -76.51,9.48 -64.7,-4.17 -75.88,-24.47 -124.81,-24.72 -41.76,-0.21 -63.19,16.39 -96.17,23.22 -38.77,8.03 -82.8,7.92 -101.54,7.41 -3.29,-0.09 -6.75,-0.19 -9.15,-0.26v64.48c1.57,-1.13 3.36,-2.39 4.61,-3.21 48.65,-32.09 109.82,-32.95 150.88,-9.62 39.87,22.65 72.31,37.98 113.39,28.07 27.41,-6.61 50.07,-23.5 72.27,-34.6 33.66,-16.83 63.76,-20.14 111.88,-5.94 34.97,10.32 61.57,21.27 98.27,21.51 43.55,0.29 72.19,-7.59 98.88,-29.42 1.07,-0.87 2.65,-2.24 4.02,-3.44v-38.26c-0.75,-0.13 -1.5,-0.26 -2.09,-0.36 -6.78,-1.19 -14.55,-2.62 -23.86,-4.33Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="326.77"
+          android:startY="299.16"
+          android:endX="328.17"
+          android:endY="183.67"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF210340"/>
+        <item android:offset="0.23" android:color="#FF29074C"/>
+        <item android:offset="0.65" android:color="#FF3E126D"/>
+        <item android:offset="1" android:color="#FF541D8F"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M551.3,318.74c-36.7,-0.24 -63.3,-11.19 -98.27,-21.51 -48.12,-14.2 -78.21,-10.89 -111.88,5.94 -22.21,11.1 -44.87,27.99 -72.27,34.6 -41.08,9.9 -73.52,-5.42 -113.39,-28.07 -41.06,-23.33 -102.23,-22.48 -150.88,9.62 -1.25,0.82 -3.04,2.09 -4.61,3.21v65.16h654.19v-101.8c-1.38,1.2 -2.95,2.56 -4.02,3.44 -26.69,21.83 -55.33,29.71 -98.88,29.42Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="328.47"
+          android:startY="360.6"
+          android:endX="323.06"
+          android:endY="266.55"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF210340"/>
+        <item android:offset="0.23" android:color="#FF29074C"/>
+        <item android:offset="0.65" android:color="#FF3E126D"/>
+        <item android:offset="1" android:color="#FF541D8F"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M215.7,122.72c-6.59,4.74 -8.9,8.36 -12.95,8.36 -7.28,0 -9.32,6.55 -6.36,8.43 5.38,3.41 16.35,1.66 35.22,1.66 21.03,0 26.4,-0.3 32.06,-1.42 7.33,-1.45 4.81,-10.85 -2.47,-11.97 -7.28,-1.12 -10.2,1.06 -21.75,-6.38 -8.21,-5.29 -17.06,-3.49 -23.75,1.32Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="232"
+          android:startY="153.46"
+          android:endX="231.01"
+          android:endY="111.88"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF210340"/>
+        <item android:offset="0.23" android:color="#FF29074C"/>
+        <item android:offset="0.65" android:color="#FF3E126D"/>
+        <item android:offset="1" android:color="#FF541D8F"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M515.24,90.62c5.38,3.41 16.35,1.66 35.22,1.66 21.03,0 26.4,-0.3 32.06,-1.42 7.33,-1.45 4.81,-10.85 -2.47,-11.97 -7.28,-1.12 -10.2,1.06 -21.75,-6.38 -8.21,-5.29 -17.06,-3.49 -23.75,1.32 -6.59,4.74 -8.9,8.36 -12.95,8.36 -7.28,0 -9.32,6.55 -6.36,8.43Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="549.85"
+          android:startY="117.76"
+          android:endX="550.84"
+          android:endY="65.29"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF210340"/>
+        <item android:offset="0.23" android:color="#FF29074C"/>
+        <item android:offset="0.65" android:color="#FF3E126D"/>
+        <item android:offset="1" android:color="#FF541D8F"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M102.55,86.43c4.9,4.21 35.26,3.46 69.54,3.46 38.2,0 53.38,0.05 63.67,-2.05 13.31,-2.72 10.77,-14.03 -2.45,-16.13 -13.22,-2.1 -21.55,-15.43 -43.1,-14.03 -21.55,1.4 -27.43,7.72 -41.14,13.33 -13.71,5.61 -25.94,4.91 -33.3,4.91 -13.22,0 -18.12,6.31 -13.22,10.52Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="172.08"
+          android:startY="110.64"
+          android:endX="173.07"
+          android:endY="58.16"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF210340"/>
+        <item android:offset="0.23" android:color="#FF29074C"/>
+        <item android:offset="0.65" android:color="#FF3E126D"/>
+        <item android:offset="1" android:color="#FF541D8F"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/mobile/android/fenix/app/src/main/res/drawable/android_sync_illustration.xml b/mobile/android/fenix/app/src/main/res/drawable/android_sync_illustration.xml
deleted file mode 100644
index 05b43cf784055..0000000000000
--- a/mobile/android/fenix/app/src/main/res/drawable/android_sync_illustration.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="110dp"
-    android:height="151dp"
-    android:viewportWidth="110"
-    android:viewportHeight="151">
-  <path
-      android:pathData="M56.41,57.59m-45.68,0a45.68,45.68 0,1 1,91.36 0a45.68,45.68 0,1 1,-91.36 0"
-      android:strokeAlpha="0.96"
-      android:strokeLineJoin="bevel"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#9059FF"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M97.5,31m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M94.69,29.88C94.69,31.43 95.95,32.69 97.5,32.69C99.05,32.69 100.31,31.43 100.31,29.88C100.31,28.32 99.05,27.06 97.5,27.06C95.95,27.06 94.69,28.32 94.69,29.88ZM96,29.88C96,29.05 96.68,28.38 97.5,28.38C98.32,28.38 99,29.05 99,29.88C99,30.7 98.32,31.38 97.5,31.38C96.68,31.38 96,30.7 96,29.88Z"
-      android:fillColor="#5B5B66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M96.23,38.01C96.59,38.33 97.05,38.5 97.5,38.5C97.96,38.5 98.41,38.33 98.77,38.01C100.75,36.19 104.06,32.74 104.06,30.06C104.06,26.44 101.11,23.5 97.5,23.5C93.89,23.5 90.94,26.45 90.94,30.06C90.94,32.74 94.25,36.19 96.23,38.01ZM92.25,30.06C92.25,27.17 94.6,24.81 97.5,24.81C100.39,24.81 102.74,27.17 102.74,30.06C102.74,31.63 100.93,34.23 97.88,37.04C97.66,37.23 97.33,37.23 97.12,37.04C94.07,34.24 92.25,31.63 92.25,30.06Z"
-      android:fillColor="#5B5B66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M16.5,31m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M16.5,24.81C13.08,24.81 10.31,27.58 10.31,31C10.31,34.42 13.08,37.19 16.5,37.19C19.92,37.19 22.69,34.42 22.69,31C22.69,27.58 19.92,24.81 16.5,24.81ZM9,31C9,26.86 12.36,23.5 16.5,23.5C20.64,23.5 24,26.86 24,31C24,35.14 20.64,38.5 16.5,38.5C12.36,38.5 9,35.14 9,31Z"
-      android:fillColor="#5B5B66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M15.84,31V27.25H17.16V30.62L19.96,32.24L19.31,33.38L16.17,31.57C15.97,31.45 15.84,31.23 15.84,31Z"
-      android:fillColor="#5B5B66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M97.5,73m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M95.25,73.84H93V75.16H95.25V73.84Z"
-      android:fillColor="#5B5B66"/>
-  <path
-      android:pathData="M90,68.88C90,67.84 90.84,67 91.88,67H103.13C104.16,67 105,67.84 105,68.88V76.38C105,77.41 104.16,78.25 103.13,78.25H91.88C90.84,78.25 90,77.41 90,76.38V68.88ZM91.88,68.31C91.56,68.31 91.31,68.56 91.31,68.88V70.19H103.69V68.88C103.69,68.56 103.43,68.31 103.13,68.31H91.88ZM91.31,76.38V71.5H103.69V76.38C103.69,76.69 103.43,76.94 103.13,76.94H91.88C91.56,76.94 91.31,76.69 91.31,76.38Z"
-      android:fillColor="#5B5B66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M56.5,12m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M49,12C49,9.93 50.68,8.25 52.75,8.25C54.56,8.25 56.08,9.54 56.42,11.25H64V12.56H62.31V15H61V12.56H56.46C56.19,14.37 54.63,15.75 52.75,15.75C50.68,15.75 49,14.07 49,12ZM52.75,9.56C51.4,9.56 50.31,10.65 50.31,12C50.31,13.35 51.4,14.44 52.75,14.44C54.1,14.44 55.19,13.35 55.19,12C55.19,10.65 54.1,9.56 52.75,9.56Z"
-      android:fillColor="#5B5B66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M12.5,73m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M12.69,67.68C12.58,67.55 12.37,67.59 12.31,67.74L12.31,67.74L11.05,70.91C10.95,71.15 10.72,71.32 10.46,71.33L7.06,71.55C7.06,71.55 7.06,71.55 7.06,71.55C6.86,71.56 6.78,71.82 6.94,71.95L6.94,71.95L9.56,74.13C9.76,74.29 9.84,74.56 9.78,74.81L8.93,78.12C8.92,78.18 8.92,78.22 8.94,78.25C8.95,78.28 8.98,78.32 9.02,78.35C9.1,78.41 9.19,78.41 9.27,78.36L12.15,76.54C12.37,76.4 12.65,76.4 12.87,76.54L15.75,78.36C15.91,78.46 16.14,78.33 16.08,78.11C16.08,78.11 16.08,78.11 16.08,78.11L15.24,74.81C15.17,74.56 15.26,74.29 15.46,74.13L18.08,71.95C18.24,71.82 18.16,71.56 17.95,71.55C17.95,71.55 17.96,71.55 17.95,71.55L14.55,71.33C14.29,71.32 14.07,71.15 13.97,70.91L12.71,67.74C12.7,67.72 12.69,67.7 12.69,67.68ZM14.02,67.39C14.01,67.34 14,67.29 13.98,67.24C13.45,65.93 11.58,65.91 11.05,67.24C11.05,67.24 11.05,67.24 11.05,67.25L9.95,70.01L6.98,70.2L6.97,70.2C5.56,70.3 4.97,72.08 6.07,72.99C6.07,72.99 6.08,72.99 6.07,72.99L8.37,74.89L7.63,77.78C7.26,79.17 8.8,80.25 9.99,79.5L12.51,77.91L15.03,79.5C16.24,80.28 17.74,79.15 17.39,77.79L16.65,74.89L18.94,72.99C18.94,72.99 18.94,72.99 18.94,72.99C20.04,72.08 19.46,70.3 18.04,70.2L15.07,70.01L14.02,67.39Z"
-      android:fillColor="#5B5B66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M34.8,63.45L77.24,63.45A2,2 0,0 1,79.24 65.45L79.24,146.5A2,2 0,0 1,77.24 148.5L34.8,148.5A2,2 0,0 1,32.8 146.5L32.8,65.45A2,2 0,0 1,34.8 63.45z"
-      android:strokeLineJoin="round"
-      android:strokeWidth="3"
-      android:fillColor="#ffffff"
-      android:strokeColor="#5B5B66"/>
-  <path
-      android:pathData="M38.64,69L73.64,69A1,1 0,0 1,74.64 70L74.64,142A1,1 0,0 1,73.64 143L38.64,143A1,1 0,0 1,37.64 142L37.64,70A1,1 0,0 1,38.64 69z"
-      android:fillColor="#E0E0E6"/>
-  <path
-      android:pathData="M55.5,100.29m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0"
-      android:fillColor="#F9F9FB"/>
-  <path
-      android:pathData="M54.38,102.09L51.45,102.09L51.45,105.01"
-      android:strokeLineJoin="round"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#15141A"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M57.89,98.58L60.81,98.58L60.81,95.66"
-      android:strokeLineJoin="round"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#15141A"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M60.81,100.92C60.52,103.26 58.47,105.01 56.13,105.01C53.79,105.01 52.04,103.26 52.04,102.09"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#15141A"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M60.22,98.58C60.22,97.41 58.47,95.66 56.13,95.66C53.79,95.66 51.75,97.41 51.45,99.75"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#15141A"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M56.64,67m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
-      android:fillColor="#5B5B66"/>
-</vector>
diff --git a/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_background.xml b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_background.xml
new file mode 100644
index 0000000000000..d898305133f3b
--- /dev/null
+++ b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_background.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="654.19dp"
+    android:height="387.68dp"
+    android:viewportWidth="654.19"
+    android:viewportHeight="387.68">
+  <path
+      android:pathData="M0,0h654.19v387.68h-654.19z"
+      android:fillColor="#fcf5f0"/>
+  <path
+      android:pathData="M628.25,242.93c-46.99,-8.62 -65.32,-29.08 -112.97,-29.08s-67.42,18.01 -107.11,29.08c-25.6,7.14 -53.12,9.74 -76.51,9.48 -64.7,-4.17 -75.88,-24.47 -124.81,-24.72 -41.76,-0.21 -63.19,16.39 -96.17,23.22 -38.77,8.03 -82.8,7.92 -101.54,7.41 -3.29,-0.09 -6.75,-0.19 -9.15,-0.26v64.48c1.57,-1.13 3.36,-2.39 4.61,-3.21 48.65,-32.09 109.82,-32.95 150.88,-9.62 39.87,22.65 72.31,37.98 113.39,28.07 27.41,-6.61 50.07,-23.5 72.27,-34.6 33.66,-16.83 63.76,-20.14 111.88,-5.94 34.97,10.32 61.57,21.27 98.27,21.51 43.55,0.29 72.19,-7.59 98.88,-29.42 1.07,-0.87 2.65,-2.24 4.02,-3.44v-38.26c-0.75,-0.13 -1.5,-0.26 -2.09,-0.36 -6.78,-1.19 -14.55,-2.62 -23.86,-4.33Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="326.65"
+          android:startY="308.65"
+          android:endX="328.06"
+          android:endY="193.15"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFCF5F0"/>
+        <item android:offset="0.22" android:color="#FFFAECF1"/>
+        <item android:offset="0.56" android:color="#FFF5D4F5"/>
+        <item android:offset="1" android:color="#FFEEAEFC"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M650.17,289.32c-26.69,21.83 -55.33,29.71 -98.88,29.42 -36.7,-0.24 -63.3,-11.19 -98.27,-21.51 -48.12,-14.2 -78.21,-10.89 -111.88,5.94 -22.21,11.1 -44.87,27.99 -72.27,34.6 -41.08,9.9 -73.52,-5.42 -113.39,-28.07 -41.06,-23.33 -102.23,-22.48 -150.88,9.62 -1.25,0.82 -3.04,2.09 -4.61,3.21v65.16h654.19v-101.8c-1.38,1.2 -2.95,2.56 -4.02,3.44Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="329.6"
+          android:startY="380.36"
+          android:endX="322.82"
+          android:endY="262.3"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFCF5F0"/>
+        <item android:offset="0.22" android:color="#FFFAECF1"/>
+        <item android:offset="0.56" android:color="#FFF5D4F5"/>
+        <item android:offset="1" android:color="#FFEEAEFC"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M215.7,122.72c-6.59,4.74 -8.9,8.36 -12.95,8.36 -7.28,0 -9.32,6.55 -6.36,8.43 5.38,3.41 16.35,1.66 35.22,1.66 21.03,0 26.4,-0.3 32.06,-1.42 7.33,-1.45 4.81,-10.85 -2.47,-11.97 -7.28,-1.12 -10.2,1.06 -21.75,-6.38 -8.21,-5.29 -17.06,-3.49 -23.75,1.32Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="246.87"
+          android:startY="176.92"
+          android:endX="224.05"
+          android:endY="115.48"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFCEEDE"/>
+        <item android:offset="1" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M515.24,90.62c5.38,3.41 16.35,1.66 35.22,1.66 21.03,0 26.4,-0.3 32.06,-1.42 7.33,-1.45 4.81,-10.85 -2.47,-11.97 -7.28,-1.12 -10.2,1.06 -21.75,-6.38 -8.21,-5.29 -17.06,-3.49 -23.75,1.32 -6.59,4.74 -8.9,8.36 -12.95,8.36 -7.28,0 -9.32,6.55 -6.36,8.43Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="565.72"
+          android:startY="128.04"
+          android:endX="542.9"
+          android:endY="66.6"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFCEEDE"/>
+        <item android:offset="1" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M102.55,86.43c4.9,4.21 35.26,3.46 69.54,3.46 38.2,0 53.38,0.05 63.67,-2.05 13.31,-2.72 10.77,-14.03 -2.45,-16.13 -13.22,-2.1 -21.55,-15.43 -43.1,-14.03 -21.55,1.4 -27.43,7.72 -41.14,13.33 -13.71,5.61 -25.94,4.91 -33.3,4.91 -13.22,0 -18.12,6.31 -13.22,10.52Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="191.43"
+          android:startY="128.95"
+          android:endX="162.83"
+          android:endY="56.84"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFCEEDE"/>
+        <item android:offset="1" android:color="#FFFFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_marketing.xml b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_marketing.xml
new file mode 100644
index 0000000000000..3ef91aa771e6c
--- /dev/null
+++ b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_marketing.xml
@@ -0,0 +1,528 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="262.19dp"
+    android:height="259.47dp"
+    android:viewportWidth="262.19"
+    android:viewportHeight="259.47">
+  <group>
+    <clip-path
+        android:pathData="M192.15,124.93c8.52,-6.52 12.95,-5.04 13.35,-8.53 0.19,-1.65 -2.48,-1.96 -2.41,-3.62 0.1,-2.6 7.3,-2.64 7.04,-5.23 -0.31,-3.08 -4.01,-3.22 -5.22,-3.82 -2.28,-1.14 2.24,-1.68 1.31,-4.05 -1.32,-3.39 -9.31,-1.92 -14.2,-6.01 -2.87,-2.4 -4.08,-8.68 -4.99,-11.9 -1.91,-6.77 -2.45,-10.07 -5.55,-19.96 -2.78,-8.85 -6.07,-16.22 -9.88,-16.6 -3.78,-0.38 -7.75,4.2 -12.98,13.05 -3.1,5.24 -5.08,9.9 -7.35,13.1 -0.13,0.18 -5.29,-0.26 -7.64,0 -1.56,0.17 -1.87,-5 -6.77,-14.85 -4.86,-9.8 -8.62,-12.08 -12.85,-11.19 -3.57,0.76 -7.81,11.11 -10.75,20.58 -2.23,7.18 -2.11,7.95 -2.95,10.6 -1.88,5.9 -4.46,15.08 -8.52,18.3 -5.15,4.1 -10.24,2.74 -12,5.92 -1.54,2.78 2.29,2.57 1.81,3.41 -0.8,1.41 -6.19,0.79 -6.44,4.23 -0.2,2.82 5.05,1.73 5.03,3.02 -0.03,1.76 -3.82,2.47 -3.82,4.23 0,4.43 3.82,0.6 19.32,12.48 8.25,6.32 7.73,17.62 1.71,29.65 -2.99,5.98 -6.55,15.79 -6.94,23.61 -0.78,15.73 12.97,35.85 7.95,44.95 -2.73,4.95 -5.83,8.42 -7.2,16.8 -3.02,18.45 16.12,9.9 15.9,9.96 -0.78,0.21 71.38,0.09 72.9,-0.43 8.53,-2.94 18.2,-0.22 13.73,-12.42 -2.56,-6.98 -7.3,-10.3 -9.96,-14.96 -5.5,-9.66 1.3,-13.96 -1.12,-39.73 -1.06,-11.23 0.31,-23.24 -3.33,-29.16 -7.41,-12.03 -4.55,-25.78 2.81,-31.41Z"/>
+    <path
+        android:pathData="M221.85,272.37l-155.7,16.56l4.54,-247.27l136.56,-4.22l14.6,234.93z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="142.24"
+            android:startY="67.9"
+            android:endX="143.94"
+            android:endY="273.3"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFE5B15"/>
+          <item android:offset="0.19" android:color="#FFFF9C00"/>
+          <item android:offset="0.25" android:color="#FFFF9200"/>
+          <item android:offset="0.35" android:color="#FFFF7900"/>
+          <item android:offset="0.41" android:color="#FFFF6600"/>
+          <item android:offset="0.73" android:color="#FFFB2872"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M149.31,70.92s11.21,-0.88 21.37,5.05c9.27,5.41 18.86,10.87 19.56,11.1 0.7,0.22 0.77,-39.39 0.77,-39.39l-17.2,-6.64s-18.02,-1.07 -18.23,0.4c-0.22,1.47 -6.27,29.48 -6.27,29.48Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="170.07"
+            android:startY="76.66"
+            android:endX="178.66"
+            android:endY="38.63"
+            android:type="linear">
+          <item android:offset="0" android:color="#00FF6600"/>
+          <item android:offset="0.02" android:color="#2BFF6600"/>
+          <item android:offset="0.05" android:color="#5BFF6600"/>
+          <item android:offset="0.08" android:color="#87FF6600"/>
+          <item android:offset="0.12" android:color="#ADFF6600"/>
+          <item android:offset="0.15" android:color="#CCFF6600"/>
+          <item android:offset="0.19" android:color="#E2FF6600"/>
+          <item android:offset="0.22" android:color="#F2FF6600"/>
+          <item android:offset="0.27" android:color="#FCFF6600"/>
+          <item android:offset="0.32" android:color="#FFFF6600"/>
+          <item android:offset="0.66" android:color="#FFFD4737"/>
+          <item android:offset="1" android:color="#FFFB2872"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M146.3,70.92s-11.21,-0.88 -21.37,5.05c-9.27,5.41 -18.86,10.87 -19.56,11.1s-0.77,-39.39 -0.77,-39.39l17.2,-6.64s18.02,-1.07 18.23,0.4c0.22,1.47 6.27,29.48 6.27,29.48Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="125.54"
+            android:startY="76.72"
+            android:endX="116.95"
+            android:endY="38.7"
+            android:type="linear">
+          <item android:offset="0" android:color="#00FF6600"/>
+          <item android:offset="0.03" android:color="#2BFF6600"/>
+          <item android:offset="0.06" android:color="#5BFF6600"/>
+          <item android:offset="0.1" android:color="#87FF6600"/>
+          <item android:offset="0.14" android:color="#ADFF6600"/>
+          <item android:offset="0.18" android:color="#CCFF6600"/>
+          <item android:offset="0.22" android:color="#E2FF6600"/>
+          <item android:offset="0.26" android:color="#F2FF6600"/>
+          <item android:offset="0.31" android:color="#FCFF6600"/>
+          <item android:offset="0.38" android:color="#FFFF6600"/>
+          <item android:offset="0.69" android:color="#FFFD4737"/>
+          <item android:offset="1" android:color="#FFFB2872"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M201.94,284.16c45.06,0.62 21.99,-179.25 7.71,-180.9 -11.33,-1.31 -24.5,7.78 -34.35,11.8 -7.42,3.03 -11.96,1.85 -13.62,0.28 -3.47,-3.25 -9,-5.79 -15.18,-5.92 -7.13,-0.15 -15.33,5.23 -17.84,6.67 -7.75,4.43 -28.27,-23.05 -49.6,-7.25 -6.07,4.5 -32.64,129.32 0.22,174.33 29.17,39.95 117.53,0.92 122.67,0.99Z"
+        android:strokeAlpha="0.6"
+        android:fillAlpha="0.6">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="148.7"
+            android:startY="112.18"
+            android:endX="144.13"
+            android:endY="266.91"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFFE753"/>
+          <item android:offset="0.08" android:color="#DBFFD547"/>
+          <item android:offset="0.22" android:color="#A3FFB834"/>
+          <item android:offset="0.36" android:color="#70FF9F24"/>
+          <item android:offset="0.5" android:color="#47FF8A17"/>
+          <item android:offset="0.64" android:color="#28FF7A0D"/>
+          <item android:offset="0.77" android:color="#11FF6F05"/>
+          <item android:offset="0.89" android:color="#05FF6801"/>
+          <item android:offset="1" android:color="#00FF6600"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M145.82,108.1c8.16,-0.17 11.34,3.1 18.27,8.28 5.99,4.47 0.85,16.04 -13.12,17.51 -18.8,1.99 -27.56,-13.1 -21.6,-17.51s8.29,-8.1 16.45,-8.28Z"
+        android:fillColor="#ffc635"/>
+    <path
+        android:pathData="M69.31,253.64a33.79,33.58 0,1 0,67.58 0a33.79,33.58 0,1 0,-67.58 0z"
+        android:strokeAlpha="0.38"
+        android:fillAlpha="0.38">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:centerX="102.27"
+            android:centerY="257.66"
+            android:gradientRadius="34.49"
+            android:type="radial">
+          <item android:offset="0" android:color="#FFFFD400"/>
+          <item android:offset="0.41" android:color="#96FFBD00"/>
+          <item android:offset="0.99" android:color="#00FF9C00"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+  </group>
+  <path
+      android:pathData="M147.73,151.45s-13.56,10.02 -9.91,33.43c2.93,18.74 5.32,23.08 7.17,34.98 1.85,11.9 3.82,25.63 3.82,25.63 0,0 1.66,-13.28 3.9,-25.93 1.6,-9.04 4.81,-21.22 6.53,-35.85 2.77,-23.56 -11.51,-32.26 -11.51,-32.26Z"
+      android:strokeAlpha="0.6"
+      android:fillAlpha="0.6">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="147.05"
+          android:startY="147.67"
+          android:endX="151.09"
+          android:endY="236.51"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFD400"/>
+        <item android:offset="0.09" android:color="#F4FFD100"/>
+        <item android:offset="0.24" android:color="#D6FFCB00"/>
+        <item android:offset="0.44" android:color="#A8FFC000"/>
+        <item android:offset="0.67" android:color="#66FFB200"/>
+        <item android:offset="0.94" android:color="#11FFA000"/>
+        <item android:offset="1" android:color="#00FF9C00"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <group>
+    <clip-path
+        android:pathData="M82.87,123.68c-11.1,-30.76 20.89,-37.31 19.31,-67.49 -0.83,-15.8 -8.72,-20.52 -8.72,-20.52 0,0 0.08,4.29 -1.96,8.81 -2.13,4.71 -3.67,6.71 -3.67,6.71 0,0 5.01,-24.53 -22.92,-42.13C34.56,-10.07 11.46,7.04 11.46,7.04c0,0 19.8,0.71 22.13,23.46 2.37,23.21 -21.16,31.02 -29.17,54.54 -11.44,33.59 0.11,59.88 25.97,89.04 20.68,23.32 57.65,32.93 63.36,32.44 6.45,-0.55 36.06,-18.07 29.41,-36.77 -7.43,-20.89 -32.44,-24.35 -40.28,-46.07Z"/>
+    <path
+        android:pathData="M196.81,240.9l-243.62,-37.89l32.73,-226.12l243.62,37.89l-32.73,226.12z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="31.63"
+            android:startY="-11.82"
+            android:endX="126.67"
+            android:endY="180.25"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFFEB49"/>
+          <item android:offset="0.32" android:color="#FFFF9B1D"/>
+          <item android:offset="0.56" android:color="#FFFF6600"/>
+          <item android:offset="0.74" android:color="#FFFD4835"/>
+          <item android:offset="0.91" android:color="#FFFB3161"/>
+          <item android:offset="1" android:color="#FFFB2872"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+  </group>
+  <path
+      android:pathData="M13.89,103.23s-0.28,-5.81 2.17,-19.2c1.56,-8.52 5.73,-15.82 5.73,-15.82l0.98,9.68s2.08,-8.71 7.44,-16.14c10.73,-14.88 20.23,-14.88 20.23,-14.88 0,0 2.78,10.28 -7.29,36.16 -3.68,9.44 -25.13,34.92 -26.93,33.28 -1.8,-1.64 -0.9,-2.46 -2.32,-13.08Z"
+      android:strokeAlpha="0.4"
+      android:fillAlpha="0.4">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:centerX="-2.04"
+          android:centerY="65.49"
+          android:gradientRadius="37.84"
+          android:type="radial">
+        <item android:offset="0.51" android:color="#FFFFEB49"/>
+        <item android:offset="0.55" android:color="#F4FFEB49"/>
+        <item android:offset="0.63" android:color="#D6FFEB49"/>
+        <item android:offset="0.72" android:color="#A8FFEB49"/>
+        <item android:offset="0.84" android:color="#66FFEB49"/>
+        <item android:offset="0.97" android:color="#11FFEB49"/>
+        <item android:offset="1" android:color="#00FFEB49"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M80.79,40.49s-0.84,-4.19 -3.07,-8.94c-2.23,-4.75 -6.81,-9.33 -6.81,-9.33l0.93,7.18s-2.7,-4.15 -7.4,-9.35c-1.82,-2.01 -5.22,-4.59 -5.22,-4.59 0,0 4.51,7.35 6.37,13.32 1.85,5.98 3.38,11 3.19,15.21 -0.19,4.21 -2.76,8.98 2.38,10.98s10.86,-5.07 9.63,-14.47Z"
+      android:strokeAlpha="0.7"
+      android:fillAlpha="0.7">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="63.04"
+          android:startY="13.53"
+          android:endX="74.34"
+          android:endY="45.41"
+          android:type="linear">
+        <item android:offset="0.51" android:color="#FFFFEB49"/>
+        <item android:offset="0.56" android:color="#F4FFEB49"/>
+        <item android:offset="0.63" android:color="#D6FFEB49"/>
+        <item android:offset="0.73" android:color="#A8FFEB49"/>
+        <item android:offset="0.84" android:color="#66FFEB49"/>
+        <item android:offset="0.97" android:color="#11FFEB49"/>
+        <item android:offset="1" android:color="#00FFEB49"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M124.73,100.36c-0.3,5.78 2.78,7.46 4.68,7.42 3.58,-0.07 5.86,-2.32 6.04,-5.43 0.39,-6.75 -0.93,-10.82 -5.93,-10.44 -3.15,0.24 -4.55,3.75 -4.79,8.45Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="128.26"
+          android:startY="88.02"
+          android:endX="130.92"
+          android:endY="105.67"
+          android:type="linear">
+        <item android:offset="0.16" android:color="#FFA030B9"/>
+        <item android:offset="0.88" android:color="#FF00073A"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M132.69,97.02m-1.73,0a1.73,1.73 0,1 1,3.46 0a1.73,1.73 0,1 1,-3.46 0"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M167.75,100.36c0.3,5.78 -2.78,7.46 -4.68,7.42 -3.58,-0.07 -5.86,-2.32 -6.04,-5.43 -0.39,-6.75 0.93,-10.82 5.93,-10.44 3.15,0.24 4.55,3.75 4.79,8.45Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="164.22"
+          android:startY="88.02"
+          android:endX="161.56"
+          android:endY="105.67"
+          android:type="linear">
+        <item android:offset="0.16" android:color="#FFA030B9"/>
+        <item android:offset="0.88" android:color="#FF00073A"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M164.1,97.02m-1.73,0a1.73,1.73 0,1 1,3.46 0a1.73,1.73 0,1 1,-3.46 0"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M146.73,111.68c-2.96,-0.03 -4.59,1.22 -5.06,2.39 -0.59,1.45 0.66,4.49 4.3,4.53 3.46,0.04 5.47,-2.78 5.03,-4.39 -0.31,-1.14 -1.65,-2.51 -4.27,-2.53Z"
+      android:fillColor="#200041"/>
+  <path
+      android:pathData="M185.6,259.45s12.82,-33.77 24.11,-42.96c9.72,-7.91 21.21,-12.68 32.78,-13.95 4.06,-0.44 12.14,-0.02 12.14,-0.02 0,0 -4.96,3.7 -7.13,5.56 -11,9.48 -16.81,19.15 -21.19,27.65 -9.19,17.84 -23.52,23.71 -23.52,23.71h-17.21Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="258.86"
+          android:startY="217.81"
+          android:endX="190.5"
+          android:endY="241.25"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFE752FF"/>
+        <item android:offset="0.11" android:color="#FFDD4FFF"/>
+        <item android:offset="0.28" android:color="#FFC347FF"/>
+        <item android:offset="0.51" android:color="#FF983BFF"/>
+        <item android:offset="0.77" android:color="#FF5E2AFF"/>
+        <item android:offset="1" android:color="#FF271AFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M254.63,202.52s-6.6,5.6 -11.88,18.36c-5.28,12.76 -7.75,16.5 -14.52,25.08 -9.9,12.54 -22.52,13.49 -22.52,13.49h-2.91s1.78,-14.7 15.86,-30.54c14.08,-15.84 35.97,-26.39 35.97,-26.39Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="275.5"
+          android:startY="126.39"
+          android:endX="196.65"
+          android:endY="299.53"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFE752FF"/>
+        <item android:offset="0.11" android:color="#FFDD4FFF"/>
+        <item android:offset="0.28" android:color="#FFC347FF"/>
+        <item android:offset="0.51" android:color="#FF983BFF"/>
+        <item android:offset="0.77" android:color="#FF5E2AFF"/>
+        <item android:offset="1" android:color="#FF271AFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M150.14,249.62c-1.8,-12.35 -9.68,-23.61 -15.24,-33.57 -7.23,-12.96 -15.91,-22.45 -29.47,-31.71 -12.76,-8.71 -26.02,-16.49 -40.19,-20.29 -5.08,-1.36 -9.49,-2.03 -13.62,-2.59 -5.24,-0.71 -15.26,-2.81 -15.26,-2.81 0,0 6.4,7.56 9.53,11.42 7.98,9.81 15.95,19.55 26.03,26.2 14.78,12.87 12.66,14.04 28.32,30.66 6.27,6.65 12.7,32.51 12.7,32.51h37.21s0.73,-11.24 0,-9.83Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="87.16"
+          android:startY="148.28"
+          android:endX="98.07"
+          android:endY="246.45"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFE752FF"/>
+        <item android:offset="0.11" android:color="#FFDD4FFF"/>
+        <item android:offset="0.28" android:color="#FFC347FF"/>
+        <item android:offset="0.51" android:color="#FF983BFF"/>
+        <item android:offset="0.77" android:color="#FF5E2AFF"/>
+        <item android:offset="1" android:color="#FF271AFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M78.73,185.26c15.87,13.27 28.85,25.2 35.64,35.6 9.76,14.96 6.64,38.58 6.64,38.58h-8.08s-37.85,-50.78 -47.09,-63.1c-9.24,-12.32 -29.49,-37.69 -29.49,-37.69 0,0 15.53,4.17 42.38,26.61Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="76.09"
+          android:startY="144.49"
+          android:endX="82.68"
+          android:endY="282.02"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFE752FF"/>
+        <item android:offset="0.11" android:color="#FFDD4FFF"/>
+        <item android:offset="0.28" android:color="#FFC347FF"/>
+        <item android:offset="0.51" android:color="#FF983BFF"/>
+        <item android:offset="0.77" android:color="#FF5E2AFF"/>
+        <item android:offset="1" android:color="#FF271AFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M116.27,259.45s2.73,-31.52 -24.33,-51.66c-16.53,-12.3 -23.93,-15.78 -43.56,-14.96 -4.78,0.2 -14.93,1.74 -14.93,1.74 0,0 10.57,6.6 15.41,10.26 25.6,19.35 45.33,54.62 45.33,54.62h44.39,-1.39">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="117.04"
+          android:startY="158.85"
+          android:endX="64.37"
+          android:endY="274.52"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFE752FF"/>
+        <item android:offset="0.11" android:color="#FFDD4FFF"/>
+        <item android:offset="0.28" android:color="#FFC347FF"/>
+        <item android:offset="0.51" android:color="#FF983BFF"/>
+        <item android:offset="0.77" android:color="#FF5E2AFF"/>
+        <item android:offset="1" android:color="#FF271AFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M154.22,259.45s-3.83,-46.42 -12.29,-65.31c-4.31,-11.37 -10.2,-21.59 -17.17,-30.6 -10.77,-13.93 -24.11,-24.95 -38.14,-32.76 -4.76,-2.65 -14.44,-6.83 -14.44,-6.83 0,0 -0.11,8 0.59,11.71 3.36,17.83 17.27,31.42 26.88,44.21 12.38,13.49 27.38,24.96 34.94,44.06 4.7,10.24 11.49,35.52 11.49,35.52h8.31,-0.17Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="107.84"
+          android:startY="139.95"
+          android:endX="117.42"
+          android:endY="236.77"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFE752FF"/>
+        <item android:offset="0.11" android:color="#FFDD4FFF"/>
+        <item android:offset="0.28" android:color="#FFC347FF"/>
+        <item android:offset="0.51" android:color="#FF983BFF"/>
+        <item android:offset="0.77" android:color="#FF5E2AFF"/>
+        <item android:offset="1" android:color="#FF271AFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M161.36,227.94c3.52,-20.48 5.86,-32.9 5.34,-52.68 -0.07,-2.83 -1.12,-11.77 -1.12,-11.77 0,0 -5.08,3.75 -6.84,5.9 -7,8.53 -12.43,19.77 -14.36,31.83 -2.52,15.71 1.21,32.82 6.59,47.17 0.31,0.76 2.93,11.06 2.93,11.06h-0.09s6.63,-22.95 6.96,-29.81c0.2,0 0.4,-2.12 0.59,-1.69Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="133.45"
+          android:startY="179.09"
+          android:endX="178.25"
+          android:endY="234.37"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFE752FF"/>
+        <item android:offset="0.11" android:color="#FFDD4FFF"/>
+        <item android:offset="0.28" android:color="#FFC347FF"/>
+        <item android:offset="0.51" android:color="#FF983BFF"/>
+        <item android:offset="0.77" android:color="#FF5E2AFF"/>
+        <item android:offset="1" android:color="#FF271AFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M154.42,203.39c-3.39,22.9 -1.2,56.06 -1.2,56.06h5.32s6.66,-36.77 9.08,-49.46c3.52,-18.48 -2.04,-46.5 -2.04,-46.5 0,0 -7.65,16.14 -11.17,39.9Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="143.38"
+          android:startY="125.79"
+          android:endX="163.88"
+          android:endY="235.4"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFE752FF"/>
+        <item android:offset="0.11" android:color="#FFDD4FFF"/>
+        <item android:offset="0.28" android:color="#FFC347FF"/>
+        <item android:offset="0.51" android:color="#FF983BFF"/>
+        <item android:offset="0.77" android:color="#FF5E2AFF"/>
+        <item android:offset="1" android:color="#FF271AFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M156.57,259.45s-4.35,-51.22 15.95,-92.11c11.17,-22.49 25.19,-40.45 44.07,-49.34 2.7,-1.27 8.22,-3.32 8.22,-3.32 0,0 -0.67,5.51 -1.24,8.17 -4.36,20.48 -17.36,36.97 -28.61,51.96 -9.17,16.24 -17.91,33.38 -24.57,51.53 -10.61,34.99 -4.09,33.11 -4.09,33.11h-9.73Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="146.01"
+          android:startY="159.14"
+          android:endX="229.72"
+          android:endY="211.46"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFE752FF"/>
+        <item android:offset="0.11" android:color="#FFDD4FFF"/>
+        <item android:offset="0.28" android:color="#FFC347FF"/>
+        <item android:offset="0.51" android:color="#FF983BFF"/>
+        <item android:offset="0.77" android:color="#FF5E2AFF"/>
+        <item android:offset="1" android:color="#FF271AFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M160.89,259.45s0.5,-36.31 21.34,-66.54c13.65,-19.8 32.46,-29.13 51.28,-35.4 7.92,-2.64 18.75,-3.53 18.75,-3.53 0,0 -5.47,6.24 -7.2,8.48 -9.03,11.7 -24.37,20.74 -37.33,30.52 -17.49,13.21 -21.17,19.47 -27.26,33.48 -2.89,6.88 -6.51,32.98 -6.51,32.98h-14.01,0.94Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="213.25"
+          android:startY="131.52"
+          android:endX="204.88"
+          android:endY="219.66"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFE752FF"/>
+        <item android:offset="0.11" android:color="#FFDD4FFF"/>
+        <item android:offset="0.28" android:color="#FFC347FF"/>
+        <item android:offset="0.51" android:color="#FF983BFF"/>
+        <item android:offset="0.77" android:color="#FF5E2AFF"/>
+        <item android:offset="1" android:color="#FF271AFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M205.02,184.46c-10.19,9.17 -22.44,20.68 -29.48,44 -7.04,23.32 -6.24,30.98 -6.24,30.98h8s7.92,-39.78 22.44,-53.86c14.52,-14.08 17.6,-11 29.92,-22.44 12.32,-11.44 22.6,-29.16 22.6,-29.16 0,0 -29.64,14.64 -47.24,30.48Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="200.43"
+          android:startY="133.61"
+          android:endX="214.1"
+          android:endY="230.16"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFE752FF"/>
+        <item android:offset="0.11" android:color="#FFDD4FFF"/>
+        <item android:offset="0.28" android:color="#FFC347FF"/>
+        <item android:offset="0.51" android:color="#FF983BFF"/>
+        <item android:offset="0.77" android:color="#FF5E2AFF"/>
+        <item android:offset="1" android:color="#FF271AFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M172.99,259.45s6.18,-31.26 12.1,-41.88c6.56,-11.77 16.84,-23.02 28.03,-28.26 15.36,-7.94 26.3,-10.01 39.66,-9.11 2.49,0.17 9.41,0.79 9.41,0.79 0,0 -3.63,2.79 -6.18,4.49 -13.85,9.24 -24.84,16.58 -39.11,30.68 -12.36,12.22 -23.59,43.3 -23.59,43.3h-18.78,1.08">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="232.38"
+          android:startY="154.99"
+          android:endX="204.65"
+          android:endY="276.84"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFE752FF"/>
+        <item android:offset="0.11" android:color="#FFDD4FFF"/>
+        <item android:offset="0.28" android:color="#FFC347FF"/>
+        <item android:offset="0.51" android:color="#FF983BFF"/>
+        <item android:offset="0.77" android:color="#FF5E2AFF"/>
+        <item android:offset="1" android:color="#FF271AFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M33.44,194.56s19.77,23.34 31.21,35.22 29.53,29.66 29.53,29.66h10.44s-3.44,-30.54 -26.32,-45.06c-22.88,-14.52 -44.85,-19.82 -44.85,-19.82Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="57.55"
+          android:startY="159.94"
+          android:endX="75.63"
+          android:endY="265.35"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFE752FF"/>
+        <item android:offset="0.11" android:color="#FFDD4FFF"/>
+        <item android:offset="0.28" android:color="#FFC347FF"/>
+        <item android:offset="0.51" android:color="#FF983BFF"/>
+        <item android:offset="0.77" android:color="#FF5E2AFF"/>
+        <item android:offset="1" android:color="#FF271AFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M96.62,259.45s-7.6,-16.3 -22.12,-28.62c-5,-4.24 -11.93,-10.94 -23.33,-12.81 -3.82,-0.63 -11.49,-1.56 -11.49,-1.56 0,0 4.06,7.84 6.02,11.08 19.18,31.63 44.7,31.92 44.7,31.92h6.23Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="86.47"
+          android:startY="189.63"
+          android:endX="59.13"
+          android:endY="261.71"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFE752FF"/>
+        <item android:offset="0.11" android:color="#FFDD4FFF"/>
+        <item android:offset="0.28" android:color="#FFC347FF"/>
+        <item android:offset="0.51" android:color="#FF983BFF"/>
+        <item android:offset="0.77" android:color="#FF5E2AFF"/>
+        <item android:offset="1" android:color="#FF271AFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M112.62,173.9c11.46,15.63 15.68,27.72 21.4,42.24 5.72,14.52 5.13,43.3 5.13,43.3h-6.61s7.36,-28.78 -32.24,-73.66c-8.56,-9.7 -25.08,-29.48 -27.28,-41.36 -2.2,-11.88 -0.84,-20.47 -0.84,-20.47 0,0 25.92,30.15 40.44,49.95Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="121.97"
+          android:startY="145.71"
+          android:endX="79.67"
+          android:endY="264.99"
+          android:type="linear">
+        <item android:offset="0.12" android:color="#FFE752FF"/>
+        <item android:offset="0.19" android:color="#FFDD4FFF"/>
+        <item android:offset="0.31" android:color="#FFC347FF"/>
+        <item android:offset="0.46" android:color="#FF983BFF"/>
+        <item android:offset="0.64" android:color="#FF5E2AFF"/>
+        <item android:offset="0.79" android:color="#FF271AFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M185.66,166.86c-8.83,17.01 -17.16,40.04 -20.68,56.32 -3.52,16.28 -5.02,36.26 -5.02,36.26h5.35s9.36,-40.66 18.6,-61.34c9.24,-20.68 18.04,-27.28 28.16,-44.44 10.12,-17.16 12.75,-38.98 12.75,-38.98 0,0 -27.27,29.3 -39.15,52.18Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="162.24"
+          android:startY="168.23"
+          android:endX="222.84"
+          android:endY="206.1"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFE752FF"/>
+        <item android:offset="0.11" android:color="#FFDD4FFF"/>
+        <item android:offset="0.28" android:color="#FFC347FF"/>
+        <item android:offset="0.51" android:color="#FF983BFF"/>
+        <item android:offset="0.77" android:color="#FF5E2AFF"/>
+        <item android:offset="1" android:color="#FF271AFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_notifications.xml b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_notifications.xml
new file mode 100644
index 0000000000000..2bcf8159588a2
--- /dev/null
+++ b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_notifications.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="202dp"
+    android:height="150dp"
+    android:viewportWidth="202"
+    android:viewportHeight="150">
+  <group>
+    <clip-path
+        android:pathData="M0,0h202v150h-202z"/>
+    <path
+        android:pathData="M200.04,82.26C199.23,78.01 191.45,75.85 187.53,71.09C185.23,68.31 185.51,59.67 185.39,56.44C185.39,56.4 185.39,56.35 185.39,56.3C185.2,51.39 184.8,47.49 183.79,38.46C182.83,29.91 180.42,22.98 176.78,21.42C173.41,19.96 168.68,24.02 162.13,31.49C158.25,35.92 157.28,37.22 154.98,40.24C154.73,40.57 154.58,40.88 154.35,41.13C154,41.54 153.46,41.8 152.05,41.73C151.75,41.72 151.49,41.67 151.27,41.59C149.56,40.92 150.41,37.84 149.17,28.49C147.97,19.42 145.69,14.06 141.5,14.08C137.87,14.1 131,21.54 125.56,28.43C121.06,34.13 120.71,34.72 118.96,36.76C116.93,39.15 113.5,43.68 110.04,47.8C106.9,51.55 103.75,54.95 101.64,56.07C96.01,59.04 92.79,57.33 90.89,60.28C89.2,62.93 93.36,63.01 92.75,63.73C92.67,63.83 92.56,63.9 92.43,63.96C101.91,65.87 106.12,75.92 110.05,73.81C111.13,71.6 112.43,70.12 114.01,69.22C116.26,67.95 119.09,67.86 122.69,68.51C128.03,69.49 134.41,74.37 139.34,80.19C139.88,80.83 140.41,81.48 140.91,82.14C141.14,82.44 141.31,82.74 141.44,83.05C142.94,84.82 143.67,85.23 144.97,84.86C162.04,79.99 175.73,79.05 197.5,84.75C197.59,84.09 200.42,84.2 200.05,82.26H200.04Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="144.93"
+            android:startY="29.32"
+            android:endX="146.05"
+            android:endY="166"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFF6600"/>
+          <item android:offset="0.04" android:color="#FFFF6F00"/>
+          <item android:offset="0.2" android:color="#FFFF8F00"/>
+          <item android:offset="0.29" android:color="#FFFF9C00"/>
+          <item android:offset="0.52" android:color="#FFFF6600"/>
+          <item android:offset="0.86" android:color="#FFFB2872"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M158.9,68.42C158.9,68.42 148.22,62.74 144.6,61.16C140.91,59.54 138.27,57.68 136.52,56.65C132.26,54.15 136.16,45.38 127.49,42.73C119.18,40.19 98.27,52.58 111.5,66.8C124.72,81.02 151.49,83.23 156.33,78.68C161.16,74.13 159.04,68.98 158.9,68.42V68.42Z"
+        android:strokeAlpha="0.7"
+        android:fillAlpha="0.7">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:centerX="151.62"
+            android:centerY="48.43"
+            android:gradientRadius="20.24"
+            android:type="radial">
+          <item android:offset="0" android:color="#7FD81F60"/>
+          <item android:offset="0.22" android:color="#7CD81F60"/>
+          <item android:offset="0.39" android:color="#70D81F60"/>
+          <item android:offset="0.54" android:color="#5ED81F60"/>
+          <item android:offset="0.68" android:color="#42D81F60"/>
+          <item android:offset="0.81" android:color="#1ED81F60"/>
+          <item android:offset="0.91" android:color="#00D81F60"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M115.79,47.09C119.61,43.27 125.1,40.39 130.05,43.39C135.02,46.39 135.02,53.1 134.1,56.22C133.18,59.34 131.21,64.73 129.95,66.01C128.68,67.28 120.45,63.08 115.96,59.86C111.46,56.63 108.99,53.89 115.79,47.09V47.09Z"
+        android:strokeAlpha="0.7"
+        android:fillAlpha="0.7">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:centerX="122.67"
+            android:centerY="61.9"
+            android:gradientRadius="20.14"
+            android:type="radial">
+          <item android:offset="0.63" android:color="#00D81F60"/>
+          <item android:offset="0.7" android:color="#05D81F60"/>
+          <item android:offset="0.77" android:color="#11D81F60"/>
+          <item android:offset="0.84" android:color="#28D81F60"/>
+          <item android:offset="0.91" android:color="#47D81F60"/>
+          <item android:offset="0.98" android:color="#6DD81F60"/>
+          <item android:offset="1" android:color="#7FD81F60"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M122.74,42.61C125.14,41.87 127.66,41.94 130.05,43.39C130.32,43.55 130.56,43.72 130.8,43.91C138.46,42.52 148.05,41.8 151.26,41.59C149.55,40.93 150.4,37.85 149.16,28.5C147.97,19.43 145.68,14.06 141.49,14.09C137.86,14.11 130.99,21.55 125.55,28.43C121.05,34.14 120.7,34.73 118.96,36.77C116.92,39.15 113.49,43.69 110.04,47.81L112.25,47.72C115.31,45.04 119.28,43.21 122.74,42.62V42.61Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="132.07"
+            android:startY="39.57"
+            android:endX="141.61"
+            android:endY="5.13"
+            android:type="linear">
+          <item android:offset="0" android:color="#00FF6600"/>
+          <item android:offset="0.05" android:color="#2BFF6600"/>
+          <item android:offset="0.3" android:color="#FFFF6600"/>
+          <item android:offset="0.65" android:color="#FFFD4737"/>
+          <item android:offset="1" android:color="#FFFB2872"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M185.39,56.3C185.2,51.39 184.79,47.49 183.78,38.46C182.82,29.91 180.41,22.98 176.78,21.42C173.41,19.96 168.67,24.02 162.12,31.49C158.25,35.92 157.28,37.22 154.98,40.24C154.73,40.57 154.57,40.88 154.35,41.13C156.68,42.03 161.86,44.02 167.03,46.11C175.22,49.41 182.09,53.95 185.38,56.3H185.39Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="170.95"
+            android:startY="45.98"
+            android:endX="182.63"
+            android:endY="16.46"
+            android:type="linear">
+          <item android:offset="0" android:color="#00FF6600"/>
+          <item android:offset="0.04" android:color="#0CFF6600"/>
+          <item android:offset="0.11" android:color="#33FF6600"/>
+          <item android:offset="0.21" android:color="#6DFF6600"/>
+          <item android:offset="0.33" android:color="#BFFF6600"/>
+          <item android:offset="0.42" android:color="#FFFF6600"/>
+          <item android:offset="0.71" android:color="#FFFD4737"/>
+          <item android:offset="1" android:color="#FFFB2872"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M182.07,100.81C186.4,98.08 194.26,101.67 196.27,98.16C197.33,96.33 194.15,95.21 194.63,93.68C195.18,91.89 201.84,94.78 201.95,91.06C202.04,88.08 199.01,86.19 197.97,85.4C197.6,85.11 197.46,84.91 197.48,84.75C175.72,79.05 162.03,79.99 144.95,84.85C143.66,85.23 142.93,84.82 141.43,83.05C143.86,88.7 130.93,95.86 122.88,94.1C108.37,90.93 106.89,80.67 109.86,74.19C109.92,74.06 109.98,73.94 110.04,73.81C106.11,75.92 101.91,65.88 92.42,63.96C90.95,64.7 86.66,63.63 85.88,66.59C85.18,69.23 90.37,69.14 90.12,70.36C89.78,72.02 86.04,72.02 85.74,73.69C84.95,77.9 86.8,74.34 99.4,88.38C106.11,95.86 113.47,110.56 115.19,121.24C115.86,125.39 116.89,144.77 117.43,150.4L129.14,149.99C129.79,137.88 137.44,118.65 137.44,118.65C137.44,118.65 146.28,136.81 149.69,149.99L194.2,150.01C192.66,143.65 185.04,125.58 182.82,120.83C179.02,112.72 174.5,105.61 182.07,100.82V100.81Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="143.34"
+            android:startY="30.92"
+            android:endX="144.94"
+            android:endY="224.84"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFF6600"/>
+          <item android:offset="0.21" android:color="#FFFF9C00"/>
+          <item android:offset="0.52" android:color="#FFFF6600"/>
+          <item android:offset="0.86" android:color="#FFFB2872"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M182.07,100.81C186.4,98.08 194.26,101.67 196.27,98.16C197.33,96.33 194.15,95.21 194.63,93.68C195.18,91.89 201.84,94.78 201.95,91.06C202.04,88.08 199.01,86.19 197.97,85.4C197.6,85.11 197.46,84.91 197.48,84.75C175.72,79.05 162.03,79.99 144.95,84.85C143.66,85.23 142.93,84.82 141.43,83.05C143.86,88.7 130.93,95.86 122.88,94.1C108.37,90.93 106.89,80.67 109.86,74.19C109.92,74.06 109.98,73.94 110.04,73.81C106.11,75.92 101.91,65.88 92.42,63.96C90.95,64.7 86.66,63.63 85.88,66.59C85.18,69.23 90.37,69.14 90.12,70.36C89.78,72.02 86.04,72.02 85.74,73.69C84.95,77.9 86.8,74.34 99.4,88.38C106.11,95.86 113.47,110.56 115.19,121.24C115.86,125.39 116.9,144.38 117.44,150.01H129.14C129.79,137.9 137.44,118.65 137.44,118.65C137.44,118.65 146.26,136.78 149.68,149.96L194.2,150.13C192.66,143.77 185.04,125.58 182.82,120.83C179.02,112.72 174.5,105.61 182.07,100.82V100.81Z"
+        android:strokeAlpha="0.6"
+        android:fillAlpha="0.6">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="145.46"
+            android:startY="68.23"
+            android:endX="128.45"
+            android:endY="184.89"
+            android:type="linear">
+          <item android:offset="0.15" android:color="#FFFFEB49"/>
+          <item android:offset="0.34" android:color="#BAFFC735"/>
+          <item android:offset="0.58" android:color="#6BFF9D1E"/>
+          <item android:offset="0.78" android:color="#30FF7F0E"/>
+          <item android:offset="0.92" android:color="#0CFF6D03"/>
+          <item android:offset="1" android:color="#00FF6600"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M139.33,80.19C134.41,74.37 128.03,69.49 122.68,68.51C119.08,67.86 116.25,67.95 114,69.22C112.42,70.11 111.13,71.59 110.04,73.81C109.98,73.94 109.92,74.06 109.86,74.19C106.89,80.67 108.37,90.93 122.88,94.1C130.93,95.86 143.86,88.69 141.43,83.05C141.29,82.74 141.12,82.44 140.9,82.14C140.4,81.48 139.87,80.83 139.32,80.19H139.33Z"
+        android:fillColor="#FFC635"/>
+    <path
+        android:pathData="M137.44,118.64C137.44,118.64 129.79,137.89 129.14,149.99H149.69C146.28,136.81 137.44,118.64 137.44,118.64Z"
+        android:fillColor="#FFB029"/>
+    <path
+        android:pathData="M118.98,75.91C122.31,76.19 124.44,73.61 124.13,72.03C123.9,70.91 122.71,69.5 120.18,69.29C117.33,69.06 115.68,70.14 115.14,71.25C114.47,72.6 115.47,75.62 118.97,75.92L118.98,75.91Z"
+        android:fillColor="#00073A"/>
+    <path
+        android:pathData="M146.99,73.58C149.09,74.27 151.8,73.27 153.08,68.37C153.26,67.64 153.74,66.29 153.36,65.89C152.61,65.08 150.82,64.33 148.11,63.06C147.23,62.65 146.26,61.99 145.86,62.14C145.2,62.39 144.81,63.69 144.15,66.36C142.95,71.2 145.44,73.06 146.99,73.58V73.58Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="148.64"
+            android:startY="58.38"
+            android:endX="148.68"
+            android:endY="73.63"
+            android:type="linear">
+          <item android:offset="0.16" android:color="#FFA030B9"/>
+          <item android:offset="0.88" android:color="#FF00073A"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M147.55,68.69C147.71,67.83 147.15,67 146.29,66.84C145.43,66.68 144.6,67.24 144.44,68.1C144.28,68.96 144.84,69.79 145.7,69.95C146.56,70.11 147.39,69.55 147.55,68.69Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M121.36,50.13C118.85,50.05 116.85,52.85 115.48,56.91C115.19,57.75 115.04,58.49 114.99,59.13C114.73,61.99 116.45,63.03 117.69,63.43C118.43,63.68 119.84,63.97 121.28,63.14C122.37,62.51 123.48,61.23 124.31,58.79C126.13,53.44 125.56,50.28 121.37,50.13H121.36Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="118.62"
+            android:startY="46.87"
+            android:endX="120.99"
+            android:endY="62.57"
+            android:type="linear">
+          <item android:offset="0.16" android:color="#FFA030B9"/>
+          <item android:offset="0.88" android:color="#FF00073A"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M118.01,57.58C117.2,57.36 116.36,57.83 116.14,58.65C115.91,59.46 116.39,60.3 117.2,60.52C118.01,60.74 118.85,60.27 119.07,59.46C119.3,58.65 118.82,57.81 118.01,57.58Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M9.02,29.93L72.53,29.93A5.48,5.48 0,0 1,78 35.41L78,66.15A5.48,5.48 0,0 1,72.53 71.62L9.02,71.62A5.48,5.48 0,0 1,3.55 66.15L3.55,35.41A5.48,5.48 0,0 1,9.02 29.93z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M3.55,0H78V16.1C78,18.86 75.76,21.1 73,21.1H8.55C5.79,21.1 3.55,18.86 3.55,16.1V0Z"
+        android:fillColor="#F0F0F4"/>
+    <path
+        android:pathData="M3.55,117.46C3.55,120.22 5.79,122.46 8.55,122.46H73C75.76,122.46 78,120.22 78,117.46V85.83C78,83.06 75.76,80.83 73,80.83H8.55C5.79,80.83 3.55,83.06 3.55,85.83V117.46Z"
+        android:fillColor="#F0F0F4"/>
+    <path
+        android:pathData="M14.33,40.31L58.28,40.31A2.88,2.88 0,0 1,61.16 43.19L61.16,43.19A2.88,2.88 0,0 1,58.28 46.07L14.33,46.07A2.88,2.88 0,0 1,11.45 43.19L11.45,43.19A2.88,2.88 0,0 1,14.33 40.31z"
+        android:fillColor="#E4D7FC"/>
+    <path
+        android:pathData="M14.33,52.47L38.69,52.47A2.88,2.88 0,0 1,41.57 55.35L41.57,55.35A2.88,2.88 0,0 1,38.69 58.23L14.33,58.23A2.88,2.88 0,0 1,11.45 55.35L11.45,55.35A2.88,2.88 0,0 1,14.33 52.47z"
+        android:fillColor="#E4D7FC"/>
+    <path
+        android:pathData="M76.44,31.63m-7.68,0a7.68,7.68 0,1 1,15.37 0a7.68,7.68 0,1 1,-15.37 0"
+        android:fillColor="#7543E3"/>
+    <path
+        android:pathData="M95.31,194.18C96.52,192.13 97.65,189.92 98.73,187.54C106.63,170.07 107.25,152 102.17,135.3C98.75,124.09 94.24,118.25 94.24,118.25C94.24,118.25 94.31,119.4 93.94,121.53C93.66,123.19 93.17,124.03 93.17,124.03C93.17,124.03 91.63,121.33 90.98,120.32C77.03,98.62 56.9,91.49 39.22,88.91C23.93,86.68 23.1,73.73 23.1,73.73C23.1,73.73 9.25,94.15 21.62,111.59C32.67,127.16 43.69,142.94 44.11,159.31L95.32,194.18L95.31,194.18Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="71.05"
+            android:startY="81.65"
+            android:endX="44.25"
+            android:endY="205.28"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFFEB49"/>
+          <item android:offset="0.32" android:color="#FFFF9B1D"/>
+          <item android:offset="0.56" android:color="#FFFF6600"/>
+          <item android:offset="0.74" android:color="#FFFD4835"/>
+          <item android:offset="0.91" android:color="#FFFB3161"/>
+          <item android:offset="1" android:color="#FFFB2872"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M95,142.4C87.21,121.17 78.1,112.88 78.15,112.87C78.15,112.87 79.09,115.75 80.08,119.34C80.87,122.15 80.91,124.21 80.9,124.9C80.13,123.61 75.88,118.38 71.41,113.83C65.4,107.71 59.47,103.74 59.47,103.74C59.47,103.74 64.56,110.82 68.02,117.51C73.8,128.67 79.3,142.09 79.08,151.25C78.91,158.63 76.68,167.49 84.71,169.82C92.73,172.14 98.92,160.52 95,142.41L95,142.4Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="61.38"
+            android:startY="101.84"
+            android:endX="99.36"
+            android:endY="176.9"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFFEB49"/>
+          <item android:offset="0.3" android:color="#A0FFBA2E"/>
+          <item android:offset="0.7" android:color="#2DFF7E0D"/>
+          <item android:offset="0.87" android:color="#00FF6600"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+  </group>
+</vector>
diff --git a/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_set_to_default.xml b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_set_to_default.xml
new file mode 100644
index 0000000000000..bf469b3d8b2b5
--- /dev/null
+++ b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_set_to_default.xml
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="463.24dp"
+    android:height="635.11dp"
+    android:viewportWidth="463.24"
+    android:viewportHeight="635.11">
+  <group>
+    <clip-path
+        android:pathData="M0,0h463.24v635.11h-463.24z"/>
+    <group>
+      <clip-path
+          android:pathData="M0.12,0h463.21v993.59h-463.21z"/>
+      <path
+          android:pathData="M0.12,34.74C0.12,15.55 15.67,0 34.86,0h390.26c19.19,0 34.74,15.55 34.74,34.74v924.11c0,19.19 -15.55,34.74 -34.74,34.74H34.86c-19.19,0 -34.74,-15.55 -34.74,-34.74V34.74Z"
+          android:fillColor="#3a4245"/>
+      <path
+          android:pathData="M7.07,34.74c0,-15.35 12.44,-27.79 27.79,-27.79h390.26c15.35,0 27.79,12.44 27.79,27.79v924.11c0,15.35 -12.44,27.79 -27.79,27.79H34.86c-15.35,0 -27.79,-12.44 -27.79,-27.79V34.74Z"
+          android:strokeWidth="15"
+          android:fillColor="#f1f2f3"
+          android:strokeColor="#000"/>
+      <path
+          android:pathData="M459.86,361.31h1.16c1.28,0 2.32,0.9 2.32,2.01v56.19c0,1.11 -1.04,2.01 -2.32,2.01h-1.16v-60.22Z"
+          android:fillColor="#121515"/>
+      <path
+          android:pathData="M459.86,192.23h1.16c1.28,0 2.32,1.72 2.32,3.83v106.98c0,2.12 -1.04,3.83 -2.32,3.83h-1.16v-114.65Z"
+          android:fillColor="#121515"/>
+      <group>
+        <clip-path
+            android:pathData="M15.17,46.32c0,-17.27 14,-31.27 31.27,-31.27h367.1c17.27,0 31.27,14 31.27,31.27v891.69c0,17.27 -14,31.27 -31.27,31.27H46.44c-17.27,0 -31.27,-14 -31.27,-31.27V46.32Z"/>
+      </group>
+      <path
+          android:pathData="M229.99,50.95c6.72,0 12.16,-5.44 12.16,-12.16s-5.44,-12.16 -12.16,-12.16 -12.16,5.44 -12.16,12.16 5.44,12.16 12.16,12.16Z"
+          android:fillColor="#262c2d"
+          android:fillType="evenOdd"/>
+      <path
+          android:pathData="M229.99,46.39c4.2,0 7.6,-3.4 7.6,-7.6s-3.4,-7.6 -7.6,-7.6 -7.6,3.4 -7.6,7.6 3.4,7.6 7.6,7.6Z"
+          android:fillColor="#121515"
+          android:fillType="evenOdd"/>
+      <path
+          android:pathData="M229.99,37.27c0.84,0 1.52,-0.68 1.52,-1.52s-0.68,-1.52 -1.52,-1.52 -1.52,0.68 -1.52,1.52 0.68,1.52 1.52,1.52Z"
+          android:strokeAlpha="0.4"
+          android:fillColor="#636f73"
+          android:fillType="evenOdd"
+          android:fillAlpha="0.4"/>
+    </group>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M101.58,82.67c-2.16,-0.62 -3.74,-1.39 -4.72,-2.29 -0.98,-0.9 -1.48,-2.02 -1.48,-3.36 0,-1.5 0.6,-2.75 1.81,-3.74 1.2,-0.98 2.77,-1.48 4.69,-1.48 1.31,0 2.48,0.25 3.51,0.76 1.03,0.51 1.83,1.21 2.39,2.1 0.57,0.89 0.85,1.87 0.85,2.93h-2.54c0,-1.16 -0.37,-2.07 -1.1,-2.73 -0.74,-0.66 -1.77,-0.99 -3.11,-0.99 -1.24,0 -2.21,0.27 -2.91,0.82 -0.7,0.55 -1.04,1.31 -1.04,2.28 0,0.78 0.33,1.44 0.99,1.98s1.79,1.03 3.38,1.48 2.83,0.94 3.73,1.48c0.9,0.54 1.56,1.17 2,1.88 0.43,0.72 0.65,1.56 0.65,2.54 0,1.55 -0.6,2.79 -1.81,3.72 -1.21,0.93 -2.82,1.4 -4.85,1.4 -1.31,0 -2.54,-0.25 -3.68,-0.75 -1.14,-0.5 -2.02,-1.19 -2.63,-2.07 -0.62,-0.88 -0.93,-1.87 -0.93,-2.98h2.53c0,1.16 0.43,2.07 1.28,2.74 0.85,0.67 1.99,1.01 3.42,1.01 1.33,0 2.35,-0.27 3.06,-0.81s1.06,-1.28 1.06,-2.22 -0.33,-1.66 -0.98,-2.17c-0.66,-0.51 -1.85,-1.02 -3.57,-1.52Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M117.42,91.46c-1.93,0 -3.49,-0.63 -4.7,-1.9 -1.21,-1.27 -1.81,-2.96 -1.81,-5.08v-0.45c0,-1.41 0.27,-2.67 0.81,-3.78 0.54,-1.11 1.29,-1.97 2.26,-2.6 0.97,-0.63 2.02,-0.94 3.15,-0.94 1.85,0 3.28,0.61 4.31,1.82 1.02,1.22 1.54,2.96 1.54,5.23v1.01h-9.63c0.03,1.4 0.44,2.53 1.23,3.4 0.78,0.86 1.78,1.29 2.99,1.29 0.86,0 1.58,-0.18 2.18,-0.53 0.59,-0.35 1.12,-0.81 1.56,-1.39l1.48,1.16c-1.19,1.83 -2.98,2.74 -5.36,2.74ZM117.11,78.72c-0.98,0 -1.8,0.36 -2.47,1.07 -0.67,0.71 -1.08,1.71 -1.23,3h7.12v-0.18c-0.07,-1.23 -0.4,-2.19 -1,-2.87s-1.4,-1.02 -2.42,-1.02Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M129.06,73.55v3.44h2.65v1.88h-2.65v8.82c0,0.57 0.12,1 0.35,1.28s0.64,0.43 1.21,0.43c0.28,0 0.67,-0.05 1.16,-0.16v1.96c-0.64,0.17 -1.26,0.26 -1.87,0.26 -1.08,0 -1.9,-0.33 -2.46,-0.98 -0.55,-0.66 -0.83,-1.59 -0.83,-2.8v-8.81h-2.59v-1.88h2.59v-3.44h2.43Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M137.85,73.55v3.44h2.65v1.88h-2.65v8.82c0,0.57 0.12,1 0.35,1.28s0.64,0.43 1.21,0.43c0.28,0 0.67,-0.05 1.16,-0.16v1.96c-0.64,0.17 -1.26,0.26 -1.87,0.26 -1.08,0 -1.9,-0.33 -2.46,-0.98 -0.55,-0.66 -0.83,-1.59 -0.83,-2.8v-8.81h-2.59v-1.88h2.59v-3.44h2.43Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M143.35,73.22c0,-0.39 0.12,-0.73 0.36,-1 0.24,-0.27 0.6,-0.41 1.07,-0.41s0.83,0.14 1.08,0.41c0.25,0.27 0.37,0.61 0.37,1s-0.12,0.72 -0.37,0.99c-0.25,0.26 -0.6,0.39 -1.08,0.39s-0.83,-0.13 -1.07,-0.39c-0.24,-0.26 -0.36,-0.59 -0.36,-0.99ZM145.98,91.2h-2.43v-14.21h2.43v14.21Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M152.17,76.99l0.08,1.79c1.08,-1.37 2.5,-2.05 4.25,-2.05 3,0 4.52,1.69 4.54,5.08v9.39h-2.43v-9.4c0,-1.02 -0.24,-1.78 -0.7,-2.27 -0.46,-0.49 -1.18,-0.73 -2.15,-0.73 -0.79,0 -1.48,0.21 -2.08,0.63s-1.06,0.97 -1.39,1.65v10.13h-2.43v-14.21h2.3Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M164.13,83.97c0,-2.22 0.51,-3.98 1.54,-5.29s2.38,-1.96 4.07,-1.96 3.09,0.61 4.06,1.84l0.12,-1.58h2.22v13.87c0,1.84 -0.54,3.29 -1.64,4.35 -1.09,1.06 -2.55,1.59 -4.39,1.59 -1.02,0 -2.03,-0.22 -3.01,-0.66s-1.73,-1.04 -2.25,-1.8l1.26,-1.46c1.04,1.29 2.32,1.93 3.82,1.93 1.18,0 2.1,-0.33 2.76,-1 0.66,-0.67 0.99,-1.6 0.99,-2.81v-1.22c-0.97,1.12 -2.3,1.68 -3.98,1.68s-3.01,-0.67 -4.04,-2.01c-1.03,-1.34 -1.54,-3.16 -1.54,-5.47ZM166.57,84.25c0,1.6 0.33,2.86 0.99,3.78s1.58,1.37 2.76,1.37c1.53,0 2.66,-0.7 3.38,-2.09v-6.49c-0.74,-1.36 -1.86,-2.04 -3.35,-2.04 -1.18,0 -2.11,0.46 -2.77,1.38 -0.67,0.92 -1,2.28 -1,4.08Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M188.07,87.43c0,-0.66 -0.25,-1.17 -0.74,-1.53 -0.49,-0.36 -1.36,-0.68 -2.59,-0.94 -1.23,-0.26 -2.21,-0.58 -2.93,-0.95 -0.72,-0.37 -1.26,-0.81 -1.6,-1.31s-0.52,-1.11 -0.52,-1.81c0,-1.16 0.49,-2.15 1.48,-2.96 0.99,-0.8 2.24,-1.21 3.78,-1.21 1.61,0 2.92,0.42 3.92,1.25 1,0.83 1.5,1.89 1.5,3.19h-2.44c0,-0.67 -0.28,-1.24 -0.85,-1.72 -0.57,-0.48 -1.28,-0.72 -2.13,-0.72s-1.58,0.19 -2.07,0.58 -0.75,0.89 -0.75,1.51c0,0.59 0.23,1.03 0.7,1.33 0.46,0.3 1.3,0.58 2.51,0.85s2.2,0.6 2.95,0.97 1.31,0.83 1.67,1.36 0.54,1.18 0.54,1.94c0,1.27 -0.51,2.29 -1.52,3.05s-2.33,1.15 -3.95,1.15c-1.14,0 -2.15,-0.2 -3.02,-0.6 -0.88,-0.4 -1.56,-0.96 -2.06,-1.69 -0.49,-0.72 -0.74,-1.5 -0.74,-2.34h2.43c0.04,0.81 0.37,1.46 0.98,1.94 0.61,0.48 1.41,0.72 2.41,0.72 0.92,0 1.66,-0.19 2.21,-0.56 0.56,-0.37 0.83,-0.87 0.83,-1.49Z"/>
+    <path
+        android:pathData="M43.86,91.76l-8.51,-8.51l8.34,-8.34"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="#000"/>
+    <path
+        android:pathData="M53.62,83.34L35.35,83.34"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="#000"/>
+    <path
+        android:pathData="M31.9,136.49h56.73v13.76h-56.73z"
+        android:fillColor="#a2a2a3"/>
+    <path
+        android:pathData="M31.9,160.22h56.73v13.76h-56.73z"
+        android:fillColor="#e8e7e8"/>
+    <path
+        android:pathData="M31.9,216.54h56.73v13.76h-56.73z"
+        android:fillColor="#a2a2a3"/>
+    <path
+        android:pathData="M31.9,240.27h108.99v13.76h-108.99z"
+        android:fillColor="#e8e7e8"/>
+    <path
+        android:pathData="M31.9,296.98h85.91v12.6h-85.91z"
+        android:fillColor="#a2a2a3"/>
+    <path
+        android:pathData="M31.9,378.59h85.91v12.6h-85.91z"
+        android:fillColor="#a2a2a3"/>
+    <path
+        android:pathData="M31.9,437.67h85.91v12.6h-85.91z"
+        android:fillColor="#a2a2a3"/>
+    <path
+        android:pathData="M31.9,496.14h55.75v12.6h-55.75z"
+        android:fillColor="#a2a2a3"/>
+    <path
+        android:pathData="M31.9,320.71h257.04v13.76h-257.04z"
+        android:fillColor="#e8e7e8"/>
+    <path
+        android:pathData="M20.23,530.72h420.62v61.01h-420.62z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="3"
+        android:fillColor="#fff"
+        android:strokeColor="#6f45d8"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M36.89,561.13c-1.41,-0.4 -2.43,-0.9 -3.08,-1.49 -0.64,-0.59 -0.96,-1.32 -0.96,-2.19 0,-0.98 0.39,-1.79 1.18,-2.43 0.78,-0.64 1.8,-0.96 3.06,-0.96 0.85,0 1.62,0.17 2.29,0.5 0.67,0.33 1.19,0.79 1.56,1.37 0.37,0.58 0.55,1.22 0.55,1.91h-1.65c0,-0.75 -0.24,-1.35 -0.72,-1.78 -0.48,-0.43 -1.16,-0.65 -2.03,-0.65 -0.81,0 -1.44,0.18 -1.9,0.54 -0.45,0.36 -0.68,0.85 -0.68,1.49 0,0.51 0.21,0.94 0.65,1.29s1.16,0.67 2.2,0.96c1.04,0.29 1.84,0.61 2.43,0.96s1.02,0.76 1.3,1.23c0.28,0.47 0.42,1.02 0.42,1.65 0,1.01 -0.39,1.82 -1.18,2.42s-1.84,0.91 -3.16,0.91c-0.86,0 -1.65,-0.16 -2.39,-0.49 -0.74,-0.33 -1.31,-0.78 -1.72,-1.35 -0.4,-0.57 -0.6,-1.22 -0.6,-1.94h1.65c0,0.75 0.28,1.35 0.83,1.78 0.56,0.44 1.3,0.65 2.23,0.65 0.87,0 1.53,-0.18 1.99,-0.53s0.69,-0.84 0.69,-1.45 -0.21,-1.08 -0.64,-1.42c-0.43,-0.33 -1.2,-0.66 -2.33,-0.99Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M47.21,566.85c-1.25,0 -2.28,-0.41 -3.06,-1.24 -0.79,-0.82 -1.18,-1.93 -1.18,-3.31v-0.29c0,-0.92 0.17,-1.74 0.53,-2.46 0.35,-0.72 0.84,-1.29 1.47,-1.69s1.31,-0.61 2.05,-0.61c1.2,0 2.14,0.4 2.81,1.19 0.67,0.79 1,1.93 1,3.4v0.66h-6.27c0.02,0.91 0.29,1.65 0.8,2.21 0.51,0.56 1.16,0.84 1.95,0.84 0.56,0 1.03,-0.12 1.42,-0.34 0.39,-0.23 0.73,-0.53 1.02,-0.91l0.97,0.75c-0.78,1.19 -1.94,1.79 -3.49,1.79ZM47.01,558.55c-0.64,0 -1.17,0.23 -1.61,0.7 -0.43,0.47 -0.7,1.12 -0.8,1.96h4.64v-0.12c-0.05,-0.8 -0.26,-1.43 -0.65,-1.87 -0.39,-0.44 -0.91,-0.66 -1.57,-0.66Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M54.79,555.18v2.24h1.73v1.22h-1.73v5.75c0,0.37 0.08,0.65 0.23,0.84 0.15,0.19 0.42,0.28 0.79,0.28 0.18,0 0.43,-0.03 0.75,-0.1v1.28c-0.42,0.11 -0.82,0.17 -1.21,0.17 -0.71,0 -1.24,-0.21 -1.6,-0.64s-0.54,-1.04 -0.54,-1.82v-5.74h-1.68v-1.22h1.68v-2.24h1.58Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M68.42,566.68c-0.09,-0.18 -0.17,-0.51 -0.22,-0.97 -0.74,0.76 -1.61,1.15 -2.63,1.15 -0.91,0 -1.66,-0.26 -2.25,-0.78 -0.58,-0.52 -0.88,-1.17 -0.88,-1.96 0,-0.96 0.37,-1.71 1.1,-2.24 0.73,-0.53 1.76,-0.8 3.09,-0.8h1.54v-0.73c0,-0.55 -0.17,-0.99 -0.5,-1.32 -0.33,-0.33 -0.82,-0.49 -1.46,-0.49 -0.56,0 -1.04,0.14 -1.42,0.43 -0.38,0.29 -0.57,0.63 -0.57,1.04h-1.59c0,-0.46 0.16,-0.91 0.49,-1.34 0.33,-0.43 0.77,-0.77 1.33,-1.02 0.56,-0.25 1.18,-0.38 1.85,-0.38 1.07,0 1.9,0.27 2.51,0.8s0.92,1.27 0.94,2.2v4.26c0,0.85 0.11,1.53 0.33,2.03v0.14h-1.66ZM65.79,565.47c0.5,0 0.97,-0.13 1.41,-0.38 0.44,-0.26 0.77,-0.59 0.97,-1v-1.9h-1.24c-1.94,0 -2.91,0.57 -2.91,1.7 0,0.5 0.17,0.88 0.5,1.16 0.33,0.28 0.76,0.42 1.27,0.42Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M77.62,564.22c0,-0.43 -0.16,-0.76 -0.48,-1s-0.88,-0.44 -1.69,-0.61c-0.8,-0.17 -1.44,-0.38 -1.91,-0.62 -0.47,-0.24 -0.82,-0.53 -1.04,-0.86 -0.23,-0.33 -0.34,-0.72 -0.34,-1.18 0,-0.76 0.32,-1.4 0.96,-1.92 0.64,-0.53 1.46,-0.79 2.46,-0.79 1.05,0 1.9,0.27 2.55,0.81 0.65,0.54 0.98,1.23 0.98,2.08h-1.59c0,-0.43 -0.18,-0.81 -0.55,-1.12 -0.37,-0.31 -0.83,-0.47 -1.39,-0.47s-1.03,0.12 -1.35,0.38c-0.33,0.25 -0.49,0.58 -0.49,0.98 0,0.38 0.15,0.67 0.45,0.86 0.3,0.2 0.85,0.38 1.64,0.56 0.79,0.18 1.43,0.39 1.92,0.63 0.49,0.25 0.85,0.54 1.09,0.88 0.24,0.35 0.35,0.77 0.35,1.26 0,0.83 -0.33,1.49 -0.99,1.99 -0.66,0.5 -1.52,0.75 -2.57,0.75 -0.74,0 -1.4,-0.13 -1.97,-0.39 -0.57,-0.26 -1.02,-0.63 -1.34,-1.1 -0.32,-0.47 -0.48,-0.98 -0.48,-1.53h1.58c0.03,0.53 0.24,0.95 0.64,1.26s0.92,0.47 1.57,0.47c0.6,0 1.08,-0.12 1.44,-0.37 0.36,-0.24 0.54,-0.56 0.54,-0.97Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M85.22,561.97c0,-1.42 0.34,-2.56 1.01,-3.43 0.67,-0.86 1.55,-1.29 2.64,-1.29s1.94,0.37 2.58,1.11v-4.82h1.58v13.14h-1.45l-0.08,-0.99c-0.63,0.78 -1.51,1.16 -2.64,1.16s-1.95,-0.44 -2.62,-1.32c-0.68,-0.88 -1.01,-2.02 -1.01,-3.44v-0.12ZM86.8,562.15c0,1.05 0.22,1.87 0.65,2.46 0.43,0.59 1.03,0.89 1.8,0.89 1,0 1.74,-0.45 2.2,-1.35v-4.25c-0.47,-0.87 -1.2,-1.31 -2.18,-1.31 -0.78,0 -1.38,0.3 -1.81,0.9 -0.43,0.6 -0.65,1.49 -0.65,2.66Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M99.33,566.85c-1.25,0 -2.28,-0.41 -3.06,-1.24 -0.79,-0.82 -1.18,-1.93 -1.18,-3.31v-0.29c0,-0.92 0.17,-1.74 0.53,-2.46 0.35,-0.72 0.84,-1.29 1.47,-1.69s1.31,-0.61 2.05,-0.61c1.2,0 2.14,0.4 2.81,1.19 0.67,0.79 1,1.93 1,3.4v0.66h-6.27c0.02,0.91 0.29,1.65 0.8,2.21 0.51,0.56 1.16,0.84 1.95,0.84 0.56,0 1.03,-0.12 1.42,-0.34 0.39,-0.23 0.73,-0.53 1.02,-0.91l0.97,0.75c-0.78,1.19 -1.94,1.79 -3.49,1.79ZM99.13,558.55c-0.64,0 -1.17,0.23 -1.61,0.7 -0.43,0.47 -0.7,1.12 -0.8,1.96h4.64v-0.12c-0.05,-0.8 -0.26,-1.43 -0.65,-1.87 -0.39,-0.44 -0.91,-0.66 -1.57,-0.66Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M105.54,566.68v-8.03h-1.46v-1.22h1.46v-0.95c0,-0.99 0.27,-1.76 0.8,-2.3 0.53,-0.54 1.28,-0.81 2.25,-0.81 0.36,0 0.73,0.05 1.09,0.14l-0.08,1.28c-0.27,-0.05 -0.55,-0.08 -0.86,-0.08 -0.51,0 -0.91,0.15 -1.19,0.45 -0.28,0.3 -0.42,0.73 -0.42,1.29v0.98h1.98v1.22h-1.98v8.03h-1.58Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M116.56,566.68c-0.09,-0.18 -0.17,-0.51 -0.22,-0.97 -0.74,0.76 -1.61,1.15 -2.63,1.15 -0.91,0 -1.66,-0.26 -2.25,-0.78 -0.58,-0.52 -0.88,-1.17 -0.88,-1.96 0,-0.96 0.37,-1.71 1.1,-2.24 0.73,-0.53 1.76,-0.8 3.09,-0.8h1.54v-0.73c0,-0.55 -0.17,-0.99 -0.5,-1.32 -0.33,-0.33 -0.82,-0.49 -1.46,-0.49 -0.56,0 -1.04,0.14 -1.42,0.43 -0.38,0.29 -0.57,0.63 -0.57,1.04h-1.59c0,-0.46 0.16,-0.91 0.49,-1.34 0.33,-0.43 0.77,-0.77 1.33,-1.02 0.56,-0.25 1.18,-0.38 1.85,-0.38 1.07,0 1.9,0.27 2.51,0.8s0.92,1.27 0.94,2.2v4.26c0,0.85 0.11,1.53 0.33,2.03v0.14h-1.66ZM113.94,565.47c0.5,0 0.97,-0.13 1.41,-0.38 0.44,-0.26 0.77,-0.59 0.97,-1v-1.9h-1.24c-1.94,0 -2.91,0.57 -2.91,1.7 0,0.5 0.17,0.88 0.5,1.16 0.33,0.28 0.76,0.42 1.27,0.42Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M126.09,565.76c-0.62,0.72 -1.52,1.09 -2.71,1.09 -0.99,0 -1.74,-0.29 -2.25,-0.86 -0.52,-0.57 -0.78,-1.42 -0.78,-2.54v-6.02h1.58v5.98c0,1.4 0.57,2.1 1.71,2.1 1.21,0 2.01,-0.45 2.41,-1.35v-6.73h1.58v9.26h-1.5l-0.03,-0.91Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M131.75,566.68h-1.58v-13.14h1.58v13.14Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M136.43,555.18v2.24h1.73v1.22h-1.73v5.75c0,0.37 0.08,0.65 0.23,0.84 0.15,0.19 0.42,0.28 0.79,0.28 0.18,0 0.43,-0.03 0.75,-0.1v1.28c-0.42,0.11 -0.82,0.17 -1.21,0.17 -0.71,0 -1.24,-0.21 -1.6,-0.64s-0.54,-1.04 -0.54,-1.82v-5.74h-1.68v-1.22h1.68v-2.24h1.58Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M152.18,562.15c0,1.42 -0.33,2.55 -0.98,3.41 -0.65,0.86 -1.52,1.29 -2.62,1.29 -1.17,0 -2.07,-0.41 -2.71,-1.24l-0.08,1.07h-1.45v-13.14h1.58v4.9c0.64,-0.79 1.52,-1.19 2.64,-1.19s2.01,0.42 2.65,1.27c0.64,0.85 0.96,2.01 0.96,3.49v0.14ZM150.6,561.97c0,-1.08 -0.21,-1.91 -0.62,-2.5 -0.42,-0.59 -1.02,-0.88 -1.8,-0.88 -1.04,0 -1.79,0.49 -2.25,1.46v4c0.48,0.97 1.24,1.45 2.27,1.45 0.76,0 1.35,-0.29 1.77,-0.88s0.63,-1.47 0.63,-2.65Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M158.65,558.84c-0.24,-0.04 -0.5,-0.06 -0.78,-0.06 -1.04,0 -1.74,0.44 -2.11,1.33v6.57h-1.58v-9.26h1.54l0.03,1.07c0.52,-0.83 1.25,-1.24 2.21,-1.24 0.31,0 0.54,0.04 0.7,0.12v1.47Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M159.51,561.97c0,-0.91 0.18,-1.72 0.54,-2.45 0.36,-0.72 0.85,-1.28 1.49,-1.68 0.64,-0.39 1.36,-0.59 2.18,-0.59 1.26,0 2.28,0.44 3.06,1.31 0.78,0.87 1.17,2.03 1.17,3.48v0.11c0,0.9 -0.17,1.71 -0.52,2.43s-0.84,1.27 -1.48,1.67c-0.64,0.4 -1.38,0.6 -2.21,0.6 -1.25,0 -2.27,-0.44 -3.05,-1.31 -0.78,-0.87 -1.17,-2.03 -1.17,-3.46v-0.11ZM161.1,562.15c0,1.03 0.24,1.85 0.71,2.47 0.48,0.62 1.11,0.93 1.91,0.93s1.44,-0.32 1.92,-0.95c0.47,-0.63 0.71,-1.51 0.71,-2.65 0,-1.02 -0.24,-1.84 -0.72,-2.47 -0.48,-0.63 -1.12,-0.95 -1.92,-0.95s-1.41,0.31 -1.89,0.93c-0.48,0.62 -0.72,1.51 -0.72,2.67Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M178.12,564.5l1.78,-7.07h1.58l-2.69,9.26h-1.28l-2.25,-7.01 -2.19,7.01h-1.28l-2.69,-9.26h1.57l1.82,6.93 2.16,-6.93h1.28l2.2,7.07Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M188.48,564.22c0,-0.43 -0.16,-0.76 -0.48,-1s-0.88,-0.44 -1.69,-0.61c-0.8,-0.17 -1.44,-0.38 -1.91,-0.62 -0.47,-0.24 -0.82,-0.53 -1.04,-0.86 -0.23,-0.33 -0.34,-0.72 -0.34,-1.18 0,-0.76 0.32,-1.4 0.96,-1.92 0.64,-0.53 1.46,-0.79 2.46,-0.79 1.05,0 1.9,0.27 2.55,0.81 0.65,0.54 0.98,1.23 0.98,2.08h-1.59c0,-0.43 -0.18,-0.81 -0.55,-1.12 -0.37,-0.31 -0.83,-0.47 -1.39,-0.47s-1.03,0.12 -1.35,0.38c-0.33,0.25 -0.49,0.58 -0.49,0.98 0,0.38 0.15,0.67 0.45,0.86 0.3,0.2 0.85,0.38 1.64,0.56 0.79,0.18 1.43,0.39 1.92,0.63 0.49,0.25 0.85,0.54 1.09,0.88 0.24,0.35 0.35,0.77 0.35,1.26 0,0.83 -0.33,1.49 -0.99,1.99 -0.66,0.5 -1.52,0.75 -2.57,0.75 -0.74,0 -1.4,-0.13 -1.97,-0.39 -0.57,-0.26 -1.02,-0.63 -1.34,-1.1 -0.32,-0.47 -0.48,-0.98 -0.48,-1.53h1.58c0.03,0.53 0.24,0.95 0.64,1.26s0.92,0.47 1.57,0.47c0.6,0 1.08,-0.12 1.44,-0.37 0.36,-0.24 0.54,-0.56 0.54,-0.97Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M195.96,566.85c-1.25,0 -2.28,-0.41 -3.06,-1.24 -0.79,-0.82 -1.18,-1.93 -1.18,-3.31v-0.29c0,-0.92 0.17,-1.74 0.53,-2.46 0.35,-0.72 0.84,-1.29 1.47,-1.69s1.31,-0.61 2.05,-0.61c1.2,0 2.14,0.4 2.81,1.19 0.67,0.79 1,1.93 1,3.4v0.66h-6.27c0.02,0.91 0.29,1.65 0.8,2.21 0.51,0.56 1.16,0.84 1.95,0.84 0.56,0 1.03,-0.12 1.42,-0.34 0.39,-0.23 0.73,-0.53 1.02,-0.91l0.97,0.75c-0.78,1.19 -1.94,1.79 -3.49,1.79ZM195.76,558.55c-0.64,0 -1.17,0.23 -1.61,0.7 -0.43,0.47 -0.7,1.12 -0.8,1.96h4.64v-0.12c-0.05,-0.8 -0.26,-1.43 -0.65,-1.87 -0.39,-0.44 -0.91,-0.66 -1.57,-0.66Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M205.88,558.84c-0.24,-0.04 -0.5,-0.06 -0.78,-0.06 -1.04,0 -1.74,0.44 -2.11,1.33v6.57h-1.58v-9.26h1.54l0.03,1.07c0.52,-0.83 1.25,-1.24 2.21,-1.24 0.31,0 0.54,0.04 0.7,0.12v1.47Z"/>
+    <path
+        android:pathData="M401.88,553.72L412.24,553.72A7.5,7.5 0,0 1,419.74 561.22L419.74,561.23A7.5,7.5 0,0 1,412.24 568.73L401.88,568.73A7.5,7.5 0,0 1,394.38 561.23L394.38,561.22A7.5,7.5 0,0 1,401.88 553.72z"
+        android:fillColor="#81808e"/>
+    <path
+        android:pathData="M394.77,561.22m-11.26,0a11.26,11.26 0,1 1,22.52 0a11.26,11.26 0,1 1,-22.52 0"
+        android:fillColor="#15141a"/>
+  </group>
+</vector>
diff --git a/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_sync.xml b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_sync.xml
new file mode 100644
index 0000000000000..15ee314cd214e
--- /dev/null
+++ b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_sync.xml
@@ -0,0 +1,674 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="301.53dp"
+    android:height="150dp"
+    android:viewportWidth="301.53"
+    android:viewportHeight="150">
+  <path
+      android:pathData="M30.25,0.68h196.87c2.97,0 5.38,2.41 5.38,5.38v132.59H24.86V6.07c0,-2.97 2.41,-5.38 5.38,-5.38Z"
+      android:fillColor="#0f1212"/>
+  <path
+      android:pathData="M0.75,138.57h256.7c0.27,0 0.49,0.22 0.49,0.49v3.46c0,0.13 -0.11,0.23 -0.23,0.23H0.75c-0.13,0 -0.23,-0.11 -0.23,-0.23v-3.71c0,-0.13 0.11,-0.23 0.23,-0.23Z"
+      android:fillColor="#525357"/>
+  <path
+      android:pathData="M235.94,146.93H25.43c-3.27,0 -6.53,-0.34 -9.73,-1.01l-15.19,-3.18h257.21l-17.83,3.77c-1.3,0.27 -2.63,0.41 -3.95,0.41Z"
+      android:fillColor="#222327"/>
+  <path
+      android:pathData="M110.93,138.57h37.11c0,1.63 -1.33,2.96 -2.96,2.96h-31.19c-1.63,0 -2.96,-1.33 -2.96,-2.96h0Z"
+      android:fillColor="#363638"/>
+  <group>
+    <clip-path
+        android:pathData="M252.8,6.14L290.62,6.14A10.91,10.91 0,0 1,301.53 17.05L301.53,123.45A10.91,10.91 0,0 1,290.62 134.36L252.8,134.36A10.91,10.91 0,0 1,241.89 123.45L241.89,17.05A10.91,10.91 0,0 1,252.8 6.14z"/>
+    <path
+        android:pathData="M252.8,6.14L290.62,6.14A10.91,10.91 0,0 1,301.53 17.05L301.53,123.45A10.91,10.91 0,0 1,290.62 134.36L252.8,134.36A10.91,10.91 0,0 1,241.89 123.45L241.89,17.05A10.91,10.91 0,0 1,252.8 6.14z"
+        android:fillColor="#e7ddee"/>
+    <path
+        android:pathData="M290.45,134.33h-37.48c-6.12,0 -11.08,-4.86 -11.08,-10.85V16.64c0,-5.8 4.8,-10.5 10.72,-10.5h38.2c5.92,0 10.72,4.7 10.72,10.5v106.84c0,5.99 -4.96,10.85 -11.08,10.85h0Z"
+        android:fillColor="#f9f9fb"/>
+    <path
+        android:pathData="M283.95,23.07h13.88v-2.34h-13.88v2.34Z"
+        android:fillColor="#e2e2e2"/>
+    <path
+        android:pathData="M253.45,118.79h38.11c2.97,0 5.38,-2.41 5.38,-5.38h0c0,-2.98 -2.41,-5.39 -5.38,-5.39h-38.11c-2.97,0 -5.38,2.41 -5.38,5.38h0c0,2.98 2.41,5.38 5.38,5.38h0Z"
+        android:strokeWidth=".54"
+        android:fillColor="#fff"
+        android:strokeColor="#e8e7e8"/>
+    <path
+        android:pathData="M290.85,117.93h0.42c2.36,0 4.27,-1.91 4.27,-4.27h0v-0.42c0,-2.36 -1.91,-4.27 -4.27,-4.27h-0.42c-2.36,0 -4.27,1.91 -4.27,4.27h0v0.42c0,2.36 1.91,4.27 4.27,4.27h0Z"
+        android:fillColor="#ecebed"/>
+    <path
+        android:pathData="M244.88,108.03c1.32,0 2.4,1.05 2.4,2.34v6.1c0,1.29 -1.07,2.33 -2.4,2.33h-2.75v-10.76h2.75Z"
+        android:strokeWidth=".54"
+        android:fillColor="#fff"
+        android:strokeColor="#e8e7e8"/>
+    <path
+        android:pathData="M244.04,108.94v9.01h2.51c0.78,0 1.41,-0.6 1.41,-1.33v-6.35c0,-0.74 -0.63,-1.33 -1.41,-1.33h-2.51Z"
+        android:fillColor="#ecebed"/>
+    <path
+        android:pathData="M290.29,35.8h3.68c1.55,0 2.81,-1.26 2.81,-2.81v-3.69c0,-1.55 -1.26,-2.81 -2.81,-2.81h-3.68c-1.55,0 -2.81,1.26 -2.81,2.81v3.69c0,1.55 1.26,2.81 2.81,2.81ZM276.27,35.8h3.68c1.55,0 2.81,-1.26 2.81,-2.81v-3.69c0,-1.55 -1.26,-2.81 -2.81,-2.81h-3.68c-1.55,0 -2.81,1.26 -2.81,2.81h0v3.69c0,1.55 1.26,2.81 2.81,2.81h0Z"
+        android:strokeWidth=".54"
+        android:fillColor="#fff"
+        android:strokeColor="#e8e7e8"/>
+    <path
+        android:pathData="M262.25,35.8h3.68c1.55,0 2.81,-1.26 2.81,-2.81v-3.69c0,-1.55 -1.26,-2.81 -2.81,-2.81h-3.68c-1.55,0 -2.81,1.26 -2.81,2.81h0v3.69c0,1.55 1.26,2.81 2.81,2.81h0Z"
+        android:fillColor="#e4d7fc"/>
+    <path
+        android:pathData="M248.23,35.8h3.68c1.55,0 2.81,-1.26 2.81,-2.81v-3.69c0,-1.55 -1.26,-2.81 -2.81,-2.81h-3.68c-1.55,0 -2.81,1.26 -2.81,2.81h0v3.69c0,1.55 1.26,2.81 2.81,2.81h0Z"
+        android:fillColor="#c8b2f6"/>
+    <path
+        android:pathData="M290.29,52.99h3.68c1.55,0 2.81,-1.26 2.81,-2.81v-3.69c0,-1.55 -1.26,-2.81 -2.81,-2.81h-3.68c-1.55,0 -2.81,1.26 -2.81,2.81v3.69c0,1.55 1.26,2.81 2.81,2.81h0Z"
+        android:strokeWidth=".54"
+        android:fillColor="#fff"
+        android:strokeColor="#e8e7e8"/>
+    <path
+        android:pathData="M276.27,52.99h3.68c1.55,0 2.81,-1.26 2.81,-2.81h0v-3.69c0,-1.55 -1.26,-2.81 -2.81,-2.81h-3.68c-1.55,0 -2.81,1.26 -2.81,2.81h0v3.69c0,1.55 1.26,2.81 2.81,2.81h0Z"
+        android:fillColor="#7543e3"/>
+    <path
+        android:pathData="M262.25,52.99h3.68c1.55,0 2.81,-1.26 2.81,-2.81h0v-3.69c0,-1.55 -1.26,-2.81 -2.81,-2.81h-3.68c-1.55,0 -2.81,1.26 -2.81,2.81h0v3.69c0,1.55 1.26,2.81 2.81,2.81h0ZM248.23,52.99h3.68c1.55,0 2.81,-1.26 2.81,-2.81h0v-3.69c0,-1.55 -1.26,-2.81 -2.81,-2.81h-3.68c-1.55,0 -2.81,1.26 -2.81,2.81h0v3.69c0,1.55 1.26,2.81 2.81,2.81h0ZM296.15,28.37c0.72,0 1.3,-0.58 1.3,-1.3s-0.58,-1.3 -1.3,-1.3h0c-0.72,0 -1.3,0.58 -1.3,1.3s0.58,1.3 1.3,1.3Z"
+        android:strokeWidth=".54"
+        android:fillColor="#fff"
+        android:strokeColor="#e8e7e8"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M296.25,26.26l0.11,0.11 -0.3,0.29h-0.3c-0.06,0 -0.11,0.04 -0.13,0.1 -0.02,0.05 0,0.11 0.03,0.16l0.26,0.26 -0.43,0.43 0.1,0.09 0.43,-0.43 0.26,0.26s0.06,0.04 0.1,0.04c0.02,0 0.04,0 0.06,0 0.05,-0.02 0.09,-0.07 0.09,-0.13v-0.3s0.3,-0.29 0.3,-0.29l0.11,0.11 0.1,-0.1 -0.69,-0.69 -0.1,0.09s0,0 0,0Z"/>
+    <path
+        android:pathData="M249.26,91.04h43.09c2.51,0 4.54,-2.03 4.54,-4.54h0c0,-2.51 -2.03,-4.55 -4.54,-4.55h-43.09c-2.51,0 -4.54,2.03 -4.54,4.54h0c0,2.51 2.03,4.55 4.54,4.55h0Z"
+        android:strokeWidth=".54"
+        android:fillColor="#fff"
+        android:strokeColor="#e8e7e8"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M286.06,85.28c0.54,0 0.97,0.44 0.97,0.98 0,0.54 -0.44,0.97 -0.98,0.97 -0.21,0 -0.42,-0.07 -0.59,-0.2l-0.76,0.76 -0.17,-0.17 0.76,-0.76c-0.33,-0.43 -0.25,-1.04 0.17,-1.37 0.17,-0.13 0.38,-0.21 0.6,-0.2 0,0 0,0 0,0ZM286.79,86.25c0,-0.4 -0.33,-0.73 -0.73,-0.73 -0.4,0 -0.73,0.33 -0.73,0.73 0,0.4 0.33,0.73 0.73,0.73 0.4,0 0.73,-0.33 0.73,-0.73Z"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M254.58,87.64h28.12v-2.22h-28.12v2.22Z"
+        android:fillColor="#e2e2e2"/>
+    <path
+        android:pathData="M287.95,104.72h9.8v-2.22h-9.8v2.22Z"
+        android:fillColor="#f1f2f3"/>
+    <path
+        android:pathData="M300.31,121.39h-58.42"
+        android:strokeWidth=".54"
+        android:fillColor="#00000000"
+        android:strokeColor="#e8e7e8"/>
+    <path
+        android:pathData="M293.68,126.21l0.89,-0.89 -0.87,-0.87M283.09,124.46l-0.89,0.89 0.87,0.87"
+        android:strokeWidth=".6"
+        android:fillColor="#00000000"
+        android:strokeColor="#000"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M272.61,125.37l-0.11,-0.1v0.99c0,0.19 -0.15,0.34 -0.34,0.34h-1.68c-0.19,0 -0.34,-0.15 -0.34,-0.34v-0.99l-0.11,0.1 -0.16,-0.18 1.21,-1.05c0.13,-0.11 0.32,-0.11 0.45,0l1.21,1.05 -0.16,0.18h0.01ZM271.26,124.32s0.1,-0.03 0.14,0l0.87,0.75v1.2c0,0.06 -0.04,0.1 -0.1,0.1h-0.34v-0.61c0,-0.19 -0.15,-0.34 -0.34,-0.34h-0.34c-0.19,0 -0.34,0.15 -0.34,0.34v0.61h-0.34c-0.05,0 -0.1,-0.04 -0.1,-0.1 0,0 0,0 0,0v-1.2l0.87,-0.75h0ZM271.06,126.38v-0.61c0,-0.06 0.04,-0.1 0.1,-0.1h0.34c0.06,0 0.1,0.04 0.1,0.1v0.61h-0.54Z"
+        android:fillType="evenOdd"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M260.75,125.06c0.11,0 0.2,0.09 0.2,0.2 0,0.11 -0.09,0.2 -0.2,0.2h0c-0.11,0 -0.2,-0.09 -0.2,-0.2 0,-0.11 0.09,-0.2 0.2,-0.2h0ZM259.66,125.06c0.11,0 0.2,0.09 0.2,0.2 0,0.11 -0.09,0.2 -0.2,0.2h0c-0.11,0 -0.2,-0.09 -0.2,-0.2 0,-0.11 0.09,-0.2 0.2,-0.2ZM258.57,125.06c0.11,0 0.2,0.09 0.2,0.2s-0.09,0.2 -0.2,0.2 -0.2,-0.09 -0.2,-0.2 0.09,-0.2 0.2,-0.2Z"/>
+    <path
+        android:pathData="M247.82,126.39h0.68c0.62,0.02 1.14,-0.47 1.16,-1.09s-0.47,-1.14 -1.09,-1.16c-0.02,0 -0.04,0 -0.07,0h-0.68c-0.62,0 -1.13,0.5 -1.13,1.13s0.51,1.13 1.13,1.13Z"
+        android:strokeWidth=".6"
+        android:fillColor="#00000000"
+        android:strokeColor="#000"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M248.6,124.94l0.25,0.17v-0.16l-0.25,-0.18h-0.17v0.96h0.17v-0.79h0ZM248.05,125.7c0.06,-0.04 0.11,-0.1 0.13,-0.17 0.03,-0.08 0.05,-0.17 0.04,-0.26 0,-0.09 -0.01,-0.18 -0.04,-0.26 -0.03,-0.07 -0.07,-0.13 -0.13,-0.17 -0.06,-0.04 -0.13,-0.06 -0.2,-0.06 -0.07,0 -0.14,0.02 -0.2,0.06 -0.06,0.04 -0.1,0.1 -0.13,0.17 -0.03,0.08 -0.05,0.17 -0.04,0.26 0,0.1 0.01,0.19 0.04,0.26 0.03,0.07 0.07,0.13 0.13,0.17 0.06,0.04 0.12,0.06 0.2,0.06 0.07,0 0.14,-0.02 0.2,-0.06ZM247.74,125.57s-0.06,-0.08 -0.07,-0.12c-0.02,-0.06 -0.03,-0.13 -0.03,-0.19 0,-0.07 0,-0.14 0.03,-0.19 0.01,-0.05 0.04,-0.09 0.07,-0.12 0.03,-0.03 0.07,-0.04 0.11,-0.04 0.04,0 0.08,0.01 0.11,0.04 0.03,0.03 0.06,0.08 0.07,0.12 0.02,0.06 0.03,0.13 0.03,0.19 0,0.06 0,0.13 -0.03,0.19 -0.01,0.05 -0.04,0.09 -0.07,0.12 -0.03,0.03 -0.07,0.04 -0.11,0.04 -0.04,0 -0.08,-0.01 -0.11,-0.04Z"/>
+    <path
+        android:pathData="M239.88,121.89c4.42,-6.02 2.38,-12.34 3.48,-19.68 1.05,-7.05 4.1,-6.49 4.1,-6.49 0,0 -0.39,1.08 -0.29,2.67 0.11,1.69 0.25,1.25 0.25,1.25 0,0 3.68,-2.25 5.64,-6.66 2.12,-4.75 2.76,-8.52 -0.48,-14.13 -3.92,-6.79 -5.95,-9.03 -6.53,-14.69 -1,-9.87 10.31,-12.21 10.31,-12.21 0,0 -3.52,7.66 6.26,13.58 2.76,1.67 12.11,6.49 16.98,13.22 1.36,1.87 2.01,4.1 2.01,4.1 0,0 0.4,-0.44 0.69,-1.34 0.21,-0.64 0.59,-1.69 0.59,-1.69 0,0 4.21,7.01 5.1,14.67 1.82,15.62 -3.78,23.5 -9.93,30.38 -3.92,4.39 -9.43,7.51 -15.86,9.46l-11.66,0.02c-5.99,0.01 -10.8,-5.14 -10.65,-11v-1.47s-0.02,0 -0.02,0h0Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="274.65"
+            android:startY="50.59"
+            android:endX="252.11"
+            android:endY="148.63"
+            android:type="linear">
+          <item android:offset="0.11" android:color="#FFFFEB49"/>
+          <item android:offset="0.37" android:color="#FFFF9B1D"/>
+          <item android:offset="0.56" android:color="#FFFF6600"/>
+          <item android:offset="0.74" android:color="#FFFD4835"/>
+          <item android:offset="0.91" android:color="#FFFB3161"/>
+          <item android:offset="1" android:color="#FFFB2872"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M282.39,109.21c2.81,-11.47 1.28,-17.71 1.3,-17.69 0,0 -0.44,1.52 -1.05,3.36 -0.6,1.79 -1.34,2.75 -1.34,2.75 0.24,0.61 -0.07,-3.7 -0.81,-7.66 -0.82,-4.4 -2.23,-7.85 -2.23,-7.85 0,0 0.14,4.54 -0.31,8.46 -0.75,6.51 -2.27,13.93 -5.03,17.83 -2.22,3.14 -5.77,6.34 -2.97,9.68 2.8,3.34 8.86,0.11 12.44,-8.87h0Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="279.65"
+            android:startY="81.85"
+            android:endX="275.95"
+            android:endY="111.66"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFFD600"/>
+          <item android:offset="0.08" android:color="#F4FFD300"/>
+          <item android:offset="0.22" android:color="#D6FFCD00"/>
+          <item android:offset="0.4" android:color="#A8FFC200"/>
+          <item android:offset="0.61" android:color="#66FFB400"/>
+          <item android:offset="0.86" android:color="#11FFA200"/>
+          <item android:offset="0.91" android:color="#00FF9E00"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+  </group>
+  <path
+      android:pathData="M252.79,7.39L290.62,7.39A9.65,9.65 0,0 1,300.27 17.04L300.27,123.45A9.65,9.65 0,0 1,290.62 133.1L252.79,133.1A9.65,9.65 0,0 1,243.14 123.45L243.14,17.04A9.65,9.65 0,0 1,252.79 7.39z"
+      android:strokeWidth="2.51"
+      android:fillColor="#00000000"
+      android:strokeColor="#210340"/>
+  <path
+      android:pathData="M26.46,6.34c0,-2.21 1.79,-4 4,-4h196.68c2.21,0 4,1.79 4,4v127.57H26.46V6.34h0Z"
+      android:fillColor="#f1f2f3"/>
+  <group>
+    <clip-path
+        android:pathData="M113.44,46.86h39.03v12.25h-39.03z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M127.22,49.96h3.72v0.9h-2.62v1.76h2.01v0.9h-2.01v2.36h-1.09v-5.92h0ZM131.72,51.62h1.06v4.26h-1.06s0,-4.26 0,-4.26ZM133.75,51.62h0.97v0.77h0.11c0.09,-0.28 0.23,-0.48 0.41,-0.61 0.18,-0.14 0.42,-0.21 0.7,-0.21h0.62v0.87h-1.06c-0.24,0 -0.41,0.07 -0.53,0.22 -0.11,0.14 -0.17,0.38 -0.17,0.72v2.51h-1.06s0,-4.26 0,-4.26ZM131.68,49.96h1.15v0.9h-1.15v-0.9ZM138.76,55.96c-0.62,0 -1.1,-0.19 -1.45,-0.57 -0.34,-0.39 -0.51,-0.93 -0.51,-1.64s0.17,-1.24 0.51,-1.63c0.35,-0.39 0.83,-0.58 1.45,-0.58s1.07,0.18 1.4,0.53c0.33,0.36 0.5,0.86 0.5,1.52v0.38h-2.75v0.09c0,0.39 0.07,0.68 0.2,0.86 0.14,0.18 0.35,0.27 0.65,0.27 0.24,0 0.42,-0.05 0.54,-0.15 0.12,-0.11 0.19,-0.22 0.19,-0.33v-0.03h1.09c-0.11,0.42 -0.33,0.73 -0.64,0.96 -0.31,0.22 -0.7,0.33 -1.17,0.33ZM139.6,53.25c-0.02,-0.33 -0.1,-0.58 -0.24,-0.73 -0.13,-0.16 -0.34,-0.24 -0.61,-0.24s-0.48,0.08 -0.62,0.24c-0.13,0.15 -0.21,0.4 -0.23,0.73h1.7ZM141.68,52.37h-0.68v-0.75h0.68v-0.97c0,-0.22 0.05,-0.38 0.16,-0.5 0.11,-0.12 0.28,-0.18 0.49,-0.18h1.61v0.75h-1.2v0.91h1.2v0.75h-1.2v3.51h-1.06v-3.51ZM146.18,55.96c-0.62,0 -1.11,-0.19 -1.46,-0.57 -0.35,-0.39 -0.53,-0.93 -0.53,-1.64s0.18,-1.24 0.53,-1.63c0.35,-0.39 0.84,-0.58 1.46,-0.58s1.11,0.19 1.46,0.58c0.35,0.38 0.53,0.93 0.53,1.63s-0.18,1.25 -0.53,1.64c-0.35,0.38 -0.83,0.57 -1.46,0.57ZM146.18,55.19c0.3,0 0.51,-0.09 0.65,-0.27 0.14,-0.19 0.22,-0.47 0.22,-0.86v-0.62c0,-0.39 -0.07,-0.67 -0.22,-0.85 -0.14,-0.19 -0.36,-0.28 -0.65,-0.28s-0.52,0.09 -0.66,0.28c-0.14,0.18 -0.21,0.47 -0.21,0.85v0.62c0,0.39 0.07,0.68 0.21,0.86 0.14,0.18 0.36,0.27 0.66,0.27ZM149.61,53.68l-1.28,-2.07h1.1l0.9,1.52h0.08l0.9,-1.52h1.07l-1.28,2.07 1.35,2.19h-1.09l-0.97,-1.64h-0.08l-0.97,1.64h-1.07l1.35,-2.19h0Z"/>
+    <path
+        android:pathData="M117.66,55.44s0.05,0.03 0.07,0.04h0s-0.08,-0.04 -0.08,-0.04h0Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="117.71"
+            android:startY="55.45"
+            android:endX="117.69"
+            android:endY="55.47"
+            android:type="linear">
+          <item android:offset="0.05" android:color="#FFFFF44F"/>
+          <item android:offset="0.37" android:color="#FFFF980E"/>
+          <item android:offset="0.53" android:color="#FFFF3647"/>
+          <item android:offset="0.7" android:color="#FFE31587"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M124.55,51.06c-0.25,-0.6 -0.76,-1.25 -1.16,-1.46 0.28,0.55 0.48,1.14 0.58,1.75h0c-0.65,-1.62 -1.76,-2.27 -2.66,-3.7 -0.05,-0.07 -0.09,-0.15 -0.14,-0.22 -0.02,-0.04 -0.04,-0.08 -0.06,-0.12 -0.04,-0.07 -0.07,-0.15 -0.09,-0.23 0,0 0,-0.01 -0.01,-0.02 0,0 0,0 -0.01,0 0,0 0,0 0,0s0,0 0,0h0c-1.45,0.85 -1.94,2.42 -1.99,3.2 -0.58,0.04 -1.13,0.25 -1.59,0.61 -0.05,-0.04 -0.1,-0.08 -0.15,-0.11 -0.13,-0.46 -0.14,-0.95 -0.02,-1.41 -0.53,0.26 -1,0.62 -1.39,1.07h0c-0.23,-0.29 -0.21,-1.25 -0.2,-1.44 -0.07,0.03 -0.13,0.06 -0.19,0.1 -0.2,0.14 -0.39,0.31 -0.56,0.48 -0.2,0.2 -0.38,0.42 -0.54,0.65 -0.37,0.53 -0.63,1.12 -0.77,1.75 0,0.01 0,0.03 0,0.04 -0.01,0.05 -0.05,0.3 -0.06,0.36 0,0 0,0 0,0.01 -0.05,0.26 -0.08,0.53 -0.09,0.8v0.03c0,3.19 2.58,5.77 5.77,5.77 2.81,0 5.21,-2.02 5.69,-4.79 0,-0.07 0.02,-0.15 0.03,-0.22 0.12,-0.98 0,-1.98 -0.37,-2.9h0ZM117.9,55.58s0.05,0.03 0.08,0.04h0s-0.06,-0.03 -0.08,-0.04h0Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="123.91"
+            android:startY="48.82"
+            android:endX="114.65"
+            android:endY="57.69"
+            android:type="linear">
+          <item android:offset="0.05" android:color="#FFFFF44F"/>
+          <item android:offset="0.37" android:color="#FFFF980E"/>
+          <item android:offset="0.53" android:color="#FFFF3647"/>
+          <item android:offset="0.7" android:color="#FFE31587"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M124.55,51.06c-0.25,-0.6 -0.76,-1.25 -1.16,-1.46 0.28,0.55 0.48,1.14 0.58,1.75 0,0 0,0 0,0h0c0.55,1.48 0.25,2.98 -0.18,3.9 -0.66,1.42 -2.26,2.87 -4.77,2.8 -2.71,-0.08 -5.09,-2.09 -5.54,-4.72 -0.08,-0.42 0,-0.62 0.04,-0.96 -0.06,0.26 -0.09,0.53 -0.09,0.8v0.03c0,3.19 2.58,5.77 5.77,5.77 2.81,0 5.21,-2.02 5.69,-4.79 0,-0.07 0.02,-0.15 0.03,-0.22 0.12,-0.98 0,-1.98 -0.37,-2.9h0Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:centerX="121.84"
+            android:centerY="47.15"
+            android:gradientRadius="10.89"
+            android:type="radial">
+          <item android:offset="0.13" android:color="#FFFFBD4F"/>
+          <item android:offset="0.28" android:color="#FFFF980E"/>
+          <item android:offset="0.47" android:color="#FFFF3750"/>
+          <item android:offset="0.78" android:color="#FFEB0878"/>
+          <item android:offset="0.86" android:color="#FFE50080"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M124.55,51.06c-0.25,-0.6 -0.76,-1.25 -1.16,-1.46 0.28,0.55 0.48,1.14 0.58,1.75 0,0 0,0 0,0h0c0.55,1.48 0.25,2.98 -0.18,3.9 -0.66,1.42 -2.26,2.87 -4.77,2.8 -2.71,-0.08 -5.09,-2.09 -5.54,-4.72 -0.08,-0.42 0,-0.62 0.04,-0.96 -0.06,0.26 -0.09,0.53 -0.09,0.8v0.03c0,3.19 2.58,5.77 5.77,5.77 2.81,0 5.21,-2.02 5.69,-4.79 0,-0.07 0.02,-0.15 0.03,-0.22 0.12,-0.98 0,-1.98 -0.37,-2.9h0Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:centerX="122.85"
+            android:centerY="53.97"
+            android:gradientRadius="11.16"
+            android:type="radial">
+          <item android:offset="0.3" android:color="#FF960E18"/>
+          <item android:offset="0.35" android:color="#BCB11927"/>
+          <item android:offset="0.43" android:color="#56DB293D"/>
+          <item android:offset="0.5" android:color="#16F5334B"/>
+          <item android:offset="0.53" android:color="#00FF3750"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M121.74,51.74s0.02,0.02 0.04,0.03c-0.14,-0.26 -0.33,-0.49 -0.54,-0.7 -1.79,-1.79 -0.47,-3.89 -0.25,-3.99h0c-1.45,0.85 -1.94,2.42 -1.99,3.2 0.07,0 0.13,0 0.2,0 1.05,0 2.01,0.57 2.53,1.48h0Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:centerX="120.46"
+            android:centerY="45.03"
+            android:gradientRadius="3.56"
+            android:type="radial">
+          <item android:offset="0.13" android:color="#FFFFF44F"/>
+          <item android:offset="0.53" android:color="#FFFF980E"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M119.22,52.1c0,0.14 -0.52,0.64 -0.69,0.64 -1.64,0 -1.91,0.99 -1.91,0.99 0.07,0.84 0.65,1.52 1.36,1.89 0.03,0.02 0.06,0.03 0.1,0.05 0.06,0.02 0.11,0.05 0.17,0.07 0.24,0.09 0.49,0.13 0.75,0.14 2.88,0.13 3.43,-3.44 1.36,-4.48 0.53,-0.09 1.08,0.12 1.39,0.34 -0.52,-0.91 -1.48,-1.47 -2.53,-1.48 -0.07,0 -0.14,0 -0.2,0 -0.58,0.04 -1.13,0.25 -1.59,0.61 0.09,0.07 0.19,0.17 0.4,0.38 0.39,0.39 1.4,0.79 1.4,0.83h0Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="118.41"
+            android:startY="61.76"
+            android:endX="123.11"
+            android:endY="59.19"
+            android:type="linear">
+          <item android:offset="0.36" android:color="#FF5859FF"/>
+          <item android:offset="0.44" android:color="#FF6A53FA"/>
+          <item android:offset="0.6" android:color="#FF8F47F1"/>
+          <item android:offset="0.76" android:color="#FFAA3FEB"/>
+          <item android:offset="0.89" android:color="#FFBB3AE7"/>
+          <item android:offset="1" android:color="#FFC139E6"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M117.16,50.69s0.08,0.05 0.12,0.08c-0.13,-0.46 -0.14,-0.95 -0.02,-1.41 -0.53,0.26 -1,0.62 -1.39,1.07 0.03,0 0.86,-0.02 1.29,0.26Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:centerX="115.11"
+            android:centerY="45.95"
+            android:gradientRadius="3.75"
+            android:type="radial">
+          <item android:offset="0.1" android:color="#FFFFE226"/>
+          <item android:offset="0.79" android:color="#FFFF7139"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M113.49,53.34c0.45,2.63 2.83,4.64 5.54,4.72 2.5,0.07 4.11,-1.38 4.77,-2.8 0.43,-0.92 0.72,-2.42 0.18,-3.89h0s0,-0.01 0,-0.01h0c0.2,1.35 -0.48,2.64 -1.54,3.52h0c-2.07,1.69 -4.05,1.03 -4.45,0.75 -0.03,-0.01 -0.06,-0.03 -0.08,-0.04 -1.21,-0.58 -1.71,-1.68 -1.6,-2.62 -0.59,0 -1.12,-0.33 -1.37,-0.86 0,0 0.91,-0.65 2.12,-0.09 0.68,0.31 1.46,0.34 2.17,0.09 0,-0.05 -1.01,-0.45 -1.4,-0.83 -0.21,-0.21 -0.31,-0.31 -0.4,-0.38 -0.05,-0.04 -0.1,-0.08 -0.15,-0.11 -0.03,-0.02 -0.07,-0.05 -0.12,-0.08 -0.42,-0.27 -1.26,-0.26 -1.29,-0.26h0c-0.23,-0.29 -0.21,-1.25 -0.2,-1.44 -0.07,0.03 -0.13,0.06 -0.19,0.1 -0.2,0.14 -0.39,0.31 -0.56,0.48 -0.2,0.2 -0.38,0.42 -0.54,0.65 -0.37,0.53 -0.63,1.12 -0.77,1.75 0,0.01 -0.21,0.91 -0.11,1.37h0Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:centerX="120.52"
+            android:centerY="45.74"
+            android:gradientRadius="17.87"
+            android:type="radial">
+          <item android:offset="0.11" android:color="#FFFFF44F"/>
+          <item android:offset="0.46" android:color="#FFFF980E"/>
+          <item android:offset="0.72" android:color="#FFFF3647"/>
+          <item android:offset="0.9" android:color="#FFE31587"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M121.24,51.07c0.21,0.21 0.39,0.44 0.54,0.7 0.03,0.02 0.06,0.05 0.09,0.07 1.31,1.2 0.62,2.91 0.57,3.03 1.06,-0.88 1.74,-2.17 1.54,-3.51 -0.65,-1.63 -1.76,-2.28 -2.66,-3.71 -0.05,-0.07 -0.09,-0.15 -0.14,-0.22 -0.02,-0.04 -0.04,-0.08 -0.06,-0.12 -0.04,-0.07 -0.07,-0.15 -0.09,-0.23 0,0 0,-0.01 -0.01,-0.02 0,0 0,0 -0.01,0 0,0 0,0 0,0s0,0 0,0c-0.22,0.11 -1.55,2.2 0.25,3.99Z"
+        android:fillAlpha="0.8">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="121.09"
+            android:startY="45.63"
+            android:endX="123.48"
+            android:endY="56.23"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFFF44F"/>
+          <item android:offset="0.3" android:color="#FFFF980E"/>
+          <item android:offset="0.57" android:color="#FFFF3647"/>
+          <item android:offset="0.74" android:color="#FFE31587"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M121.87,51.84s-0.06,-0.05 -0.09,-0.07c-0.01,0 -0.02,-0.02 -0.04,-0.03 -0.31,-0.22 -0.86,-0.43 -1.39,-0.34 2.07,1.04 1.52,4.61 -1.36,4.48 -0.26,-0.01 -0.51,-0.06 -0.75,-0.14 -0.06,-0.02 -0.11,-0.04 -0.17,-0.07 -0.03,-0.01 -0.07,-0.03 -0.1,-0.05h0c0.4,0.28 2.38,0.94 4.45,-0.74h0c0.05,-0.13 0.74,-1.83 -0.57,-3.04h0Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:centerX="115.96"
+            android:centerY="60.98"
+            android:gradientRadius="10.29"
+            android:type="radial">
+          <item android:offset="0.14" android:color="#FFFFF44F"/>
+          <item android:offset="0.48" android:color="#FFFF980E"/>
+          <item android:offset="0.66" android:color="#FFFF3647"/>
+          <item android:offset="0.9" android:color="#FFE31587"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M116.62,53.73s0.27,-0.99 1.91,-0.99c0.18,0 0.68,-0.5 0.69,-0.64 -0.71,0.26 -1.48,0.22 -2.17,-0.09 -1.21,-0.57 -2.12,0.09 -2.12,0.09 0.25,0.53 0.78,0.87 1.37,0.86 -0.11,0.94 0.39,2.04 1.6,2.62 0.03,0.01 0.05,0.03 0.08,0.04 -0.7,-0.36 -1.29,-1.05 -1.36,-1.89Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:centerX="121.7"
+            android:centerY="47.09"
+            android:gradientRadius="12.36"
+            android:type="radial">
+          <item android:offset="0.09" android:color="#FFFFF44F"/>
+          <item android:offset="0.63" android:color="#FFFF980E"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M124.55,51.06c-0.25,-0.6 -0.76,-1.25 -1.16,-1.46 0.28,0.55 0.48,1.14 0.58,1.75h0c-0.65,-1.62 -1.76,-2.27 -2.66,-3.7 -0.05,-0.07 -0.09,-0.15 -0.14,-0.22 -0.02,-0.04 -0.04,-0.08 -0.06,-0.12 -0.04,-0.07 -0.07,-0.15 -0.09,-0.23 0,0 0,-0.01 -0.01,-0.02 0,0 0,0 -0.01,0 0,0 0,0 0,0s0,0 0,0h0c-1.45,0.85 -1.94,2.42 -1.99,3.2 0.07,0 0.13,0 0.2,0 1.05,0 2.01,0.57 2.53,1.48 -0.31,-0.22 -0.86,-0.43 -1.39,-0.34 2.07,1.04 1.52,4.61 -1.36,4.48 -0.26,-0.01 -0.51,-0.06 -0.75,-0.14 -0.06,-0.02 -0.11,-0.04 -0.17,-0.07 -0.03,-0.01 -0.07,-0.03 -0.1,-0.05h0s-0.06,-0.03 -0.08,-0.04c0.03,0.01 0.05,0.03 0.08,0.04 -0.7,-0.36 -1.29,-1.05 -1.36,-1.89 0,0 0.27,-0.99 1.91,-0.99 0.18,0 0.68,-0.5 0.69,-0.64 0,-0.05 -1.01,-0.45 -1.4,-0.83 -0.21,-0.21 -0.31,-0.31 -0.4,-0.38 -0.05,-0.04 -0.1,-0.08 -0.15,-0.11 -0.13,-0.46 -0.14,-0.95 -0.02,-1.41 -0.53,0.26 -1,0.62 -1.39,1.07h0c-0.23,-0.29 -0.21,-1.25 -0.2,-1.44 -0.07,0.03 -0.13,0.06 -0.19,0.1 -0.2,0.14 -0.39,0.31 -0.56,0.48 -0.2,0.2 -0.38,0.42 -0.54,0.65 -0.37,0.53 -0.63,1.12 -0.77,1.75 0,0.01 0,0.03 0,0.04 -0.01,0.05 -0.06,0.31 -0.07,0.36 -0.04,0.27 -0.07,0.54 -0.09,0.8v0.03c0,3.19 2.58,5.77 5.77,5.77 2.81,0 5.21,-2.02 5.69,-4.79 0,-0.07 0.02,-0.15 0.03,-0.22 0.12,-0.98 0,-1.98 -0.37,-2.9h0ZM123.97,51.36h0s0,0 0,0h0s0,0 0,0Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="123.29"
+            android:startY="48.83"
+            android:endX="115.89"
+            android:endY="56.95"
+            android:type="linear">
+          <item android:offset="0.17" android:color="#CCFFF44F"/>
+          <item android:offset="0.68" android:color="#00FFF44F"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+  </group>
+  <path
+      android:pathData="M185.63,62.42h-112.85c-1.78,0 -3.22,1.44 -3.22,3.22v2.57c0,1.78 1.44,3.22 3.22,3.22h112.85c1.78,0 3.22,-1.44 3.22,-3.22h0v-2.57c0,-1.78 -1.44,-3.22 -3.22,-3.22h0Z"
+      android:strokeWidth=".51"
+      android:fillColor="#fff"
+      android:strokeColor="#ccc"/>
+  <path
+      android:pathData="M62.14,79.26h-5.16c-1.48,0 -2.69,1.2 -2.69,2.69v5.16c0,1.48 1.2,2.69 2.69,2.69h5.16c1.48,0 2.69,-1.2 2.69,-2.69v-5.16c0,-1.48 -1.2,-2.69 -2.69,-2.69ZM82.04,79.26h-5.16c-1.48,0 -2.69,1.2 -2.69,2.69v5.16c0,1.48 1.2,2.68 2.69,2.68h5.16c1.48,0 2.69,-1.2 2.69,-2.68v-5.16c0,-1.48 -1.2,-2.69 -2.69,-2.69Z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M101.93,79.26h-5.16c-1.48,0 -2.69,1.2 -2.69,2.69v5.16c0,1.48 1.2,2.69 2.69,2.69h5.16c1.48,0 2.69,-1.2 2.69,-2.69v-5.16c0,-1.48 -1.2,-2.69 -2.69,-2.69Z"
+      android:fillColor="#c8b2f6"/>
+  <path
+      android:pathData="M121.82,79.26h-5.16c-1.48,0 -2.69,1.2 -2.69,2.69v5.16c0,1.48 1.2,2.69 2.69,2.69h5.16c1.48,0 2.69,-1.2 2.69,-2.69v-5.16c0,-1.48 -1.2,-2.69 -2.69,-2.69Z"
+      android:fillColor="#7543e3"/>
+  <path
+      android:pathData="M141.71,79.26h-5.16c-1.48,0 -2.69,1.2 -2.69,2.69h0v5.16c0,1.48 1.2,2.69 2.69,2.69h5.16c1.48,0 2.69,-1.2 2.69,-2.69h0v-5.16c0,-1.48 -1.2,-2.69 -2.69,-2.69h0Z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M161.6,79.26h-5.16c-1.48,0 -2.69,1.2 -2.69,2.69h0v5.16c0,1.48 1.2,2.69 2.69,2.69h5.16c1.48,0 2.69,-1.2 2.69,-2.69h0v-5.16c0,-1.48 -1.2,-2.69 -2.69,-2.69h0Z"
+      android:fillColor="#e4d7fc"/>
+  <path
+      android:pathData="M181.49,79.26h-5.16c-1.48,0 -2.69,1.2 -2.69,2.69h0v5.16c0,1.48 1.2,2.69 2.69,2.69h5.16c1.48,0 2.69,-1.2 2.69,-2.69h0v-5.16c0,-1.48 -1.2,-2.69 -2.69,-2.69h0ZM201.39,79.26h-5.16c-1.48,0 -2.69,1.2 -2.69,2.69h0v5.16c0,1.48 1.2,2.68 2.69,2.68h5.16c1.48,0 2.69,-1.2 2.69,-2.68v-5.16c0,-1.48 -1.2,-2.69 -2.69,-2.69h0Z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M65.34,91.74h-11.54v1.56h11.54v-1.56h0ZM85.23,91.74h-11.54v1.56h11.54v-1.56h0ZM105.12,91.74h-11.54v1.56h11.54v-1.56h0ZM125.01,91.74h-11.54v1.56h11.54v-1.56h0ZM144.9,91.74h-11.54v1.56h11.54v-1.56h0ZM164.8,91.74h-11.54v1.56h11.54v-1.56h0ZM184.69,91.74h-11.54v1.56h11.54v-1.56h0Z"
+      android:fillColor="#e2e2e2"/>
+  <path
+      android:pathData="M204.58,91.74h-11.54v1.56h11.54v-1.56h0Z"
+      android:fillColor="#cfcfd8"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M73.89,64.82c-0.9,0 -1.64,0.73 -1.64,1.64 0,0.9 0.73,1.64 1.63,1.64 0.37,0 0.72,-0.12 1.01,-0.35l1.28,1.28 0.29,-0.29 -1.28,-1.28c0.56,-0.71 0.43,-1.74 -0.28,-2.29 -0.29,-0.22 -0.64,-0.35 -1.01,-0.35h0ZM72.67,66.46c0,-0.68 0.55,-1.23 1.23,-1.23s1.23,0.55 1.23,1.23 -0.55,1.23 -1.23,1.23 -1.23,-0.55 -1.23,-1.23Z"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M204.4,129.79c0.31,-0.29 0.66,-0.54 1.04,-0.73 -0.13,-6.4 -0.11,-16.63 -1.87,-26.53 -0.2,0.31 -1.24,7.75 -1.24,7.75 0,0 -1.06,-3.77 -1.57,-5.46 -0.53,-1.75 -1.52,-4.02 -1.52,-4.02 0,0 0.23,2.55 0.25,4.36 0,0.88 0.25,3.74 0.21,4.33 -0.04,0.52 -0.21,-0.63 -1.44,-3.92 -1.65,-4.38 -2.53,-4.66 -2.76,-5.5 1.18,4.18 3.49,19.4 4.63,28.32 0,0.03 0,0.07 -0.04,0.1 0.32,2.27 0.5,4.14 0.68,5.45 1.22,0 2.26,-0.01 3.22,-0.02 -0.61,-0.73 -1.47,-2.29 0.43,-4.13h0Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="206.63"
+          android:startY="49.53"
+          android:endX="198.86"
+          android:endY="131.6"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFF6600"/>
+        <item android:offset="0.33" android:color="#FFFFB029"/>
+        <item android:offset="0.46" android:color="#FFFF9218"/>
+        <item android:offset="0.63" android:color="#FFFF6600"/>
+        <item android:offset="1" android:color="#FFFB2872"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M197.1,132.45c0.16,0.71 0.6,1.18 1.14,1.5h1.79c0.26,0 0.5,0 0.74,0 -0.18,-1.31 -0.35,-3.18 -0.68,-5.45 -0.39,0.45 -3.69,0.88 -2.98,3.96h0Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="206.76"
+          android:startY="49.55"
+          android:endX="198.99"
+          android:endY="131.62"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFF6600"/>
+        <item android:offset="0.33" android:color="#FFFFB029"/>
+        <item android:offset="0.46" android:color="#FFFF9218"/>
+        <item android:offset="0.63" android:color="#FFFF6600"/>
+        <item android:offset="1" android:color="#FFFB2872"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M197.1,132.45c0.16,0.71 0.6,1.18 1.14,1.5h1.79c0.26,0 0.5,0 0.74,0 -0.18,-1.31 -0.35,-3.18 -0.68,-5.45 -0.39,0.45 -3.69,0.88 -2.98,3.96h0Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="193.69"
+          android:startY="101.53"
+          android:endX="201.47"
+          android:endY="147.51"
+          android:type="linear">
+        <item android:offset="0.02" android:color="#00D81F60"/>
+        <item android:offset="0.49" android:color="#FFD81F60"/>
+        <item android:offset="0.58" android:color="#FFA31F4D"/>
+        <item android:offset="0.68" android:color="#FF731F3C"/>
+        <item android:offset="0.78" android:color="#FF4D1F2F"/>
+        <item android:offset="0.86" android:color="#FF321F25"/>
+        <item android:offset="0.94" android:color="#FF211F20"/>
+        <item android:offset="1" android:color="#FF1C1F1E"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M213.37,64.73c-0.99,0.89 -1.74,1.15 -2.05,1.22 -0.1,0.03 -0.16,0.03 -0.16,0.03 0,0 2.68,4.13 6.77,4.76 0.97,-0.63 1.56,-1.08 2.8,-1.94 2.43,-1.71 3.47,-4.37 3.46,-6.08 -0.27,0.18 -0.58,0.29 -0.9,0.31 -1.29,0.12 -2.12,-0.86 -2,-1.47 0.05,-0.3 0.3,-0.65 0.76,-0.87 -0.47,0.02 -1.05,0.05 -1.78,0.01 -0.64,-0.03 -1.28,-0.12 -1.91,-0.25 -3.21,0.89 -3.1,2.6 -4.98,4.29h0Z"
+      android:fillColor="#ffc635"/>
+  <path
+      android:pathData="M221.28,61.56c-0.11,0.61 0.72,1.59 2,1.47 0.37,-0.04 0.67,-0.15 0.9,-0.31 0,-0.41 -0.07,-0.78 -0.19,-1.05 -0.43,-0.99 -0.95,-1.02 -1.96,-0.98 -0.46,0.22 -0.7,0.57 -0.76,0.87h0Z"
+      android:fillColor="#200041"/>
+  <path
+      android:pathData="M192.87,107.62c-0.2,0.31 -0.3,2.66 -0.3,2.66l-2.7,-6.83s0.51,5.46 0.46,6.04c-0.04,0.52 -0.68,-1.74 -2.18,-4.92 -0.84,-1.77 -1.51,-2.69 -1.99,-3.28 -0.38,-1.57 -0.67,-3.15 -0.88,-4.75 -1.21,-9.09 -0.49,-13.29 -0.49,-17.47s-3.08,-2.75 -4.17,-4.27c-0.8,-1.12 1.17,-1.64 1.05,-2.25 -0.18,-0.95 -1.95,0.43 -2.48,-0.39 -0.64,-1 0.55,-2.24 1.12,-2.71 5.45,-3.11 8.3,-6.01 15.42,-5.4 4.58,0.4 5.86,0.71 10.96,1.59 1.67,0.29 3.26,0.39 4.65,0.3 -0.1,0.03 -0.16,0.03 -0.16,0.03 0,0 2.68,4.13 6.77,4.76 -0.85,0.55 -1.71,1.08 -2.57,1.6 -3.9,2.35 -7.85,13.11 3.13,19.59 13.18,7.78 12.71,11.92 12.71,11.92l-0.04,30.08s-30.6,-0.02 -33.24,-0.05c0,0 2.58,-3.72 2.36,-4.56">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="185.67"
+          android:startY="24.54"
+          android:endX="221.86"
+          android:endY="147.08"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFF6600"/>
+        <item android:offset="0.28" android:color="#FFFFC635"/>
+        <item android:offset="0.41" android:color="#FFFFB029"/>
+        <item android:offset="0.5" android:color="#FFFF9218"/>
+        <item android:offset="0.63" android:color="#FFFF6600"/>
+        <item android:offset="1" android:color="#FFFB2872"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M204.56,59.23c0.17,0.33 0.08,0.73 -0.2,0.89 -0.28,0.16 -0.65,0.03 -0.82,-0.3 -0.17,-0.33 -0.08,-0.73 0.2,-0.89 0.28,-0.16 0.65,-0.03 0.82,0.3h0Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="204.29"
+          android:startY="57.03"
+          android:endX="202.19"
+          android:endY="79.22"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFF6600"/>
+        <item android:offset="0.33" android:color="#FFFFB029"/>
+        <item android:offset="0.46" android:color="#FFFF9218"/>
+        <item android:offset="0.63" android:color="#FFFF6600"/>
+        <item android:offset="1" android:color="#FFFB2872"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M212.93,59.23c0.54,-0.18 1.39,-0.6 0.25,-2.33 -0.93,-1.4 -1.79,-1.92 -2.55,-1.76 -1.32,0.27 -1.45,1.35 0,3.53 0.25,0.37 1.07,0.98 2.3,0.57ZM213.39,57.95c0.09,0.37 -0.08,0.75 -0.38,0.85 -0.3,0.1 -0.6,-0.13 -0.7,-0.49 -0.09,-0.37 0.08,-0.75 0.38,-0.85 0.3,-0.1 0.61,0.12 0.7,0.49Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="212.35"
+          android:startY="50.08"
+          android:endX="204.57"
+          android:endY="132.15"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFF6600"/>
+        <item android:offset="0.33" android:color="#FFFFB029"/>
+        <item android:offset="0.46" android:color="#FFFF9218"/>
+        <item android:offset="0.63" android:color="#FFFF6600"/>
+        <item android:offset="1" android:color="#FFFB2872"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M212.93,59.23c0.54,-0.18 1.39,-0.6 0.25,-2.33 -0.93,-1.4 -1.79,-1.92 -2.55,-1.76 -1.32,0.27 -1.45,1.35 0,3.53 0.25,0.37 1.07,0.98 2.3,0.57ZM213.39,57.95c0.09,0.37 -0.08,0.75 -0.38,0.85 -0.3,0.1 -0.6,-0.13 -0.7,-0.49 -0.09,-0.37 0.08,-0.75 0.38,-0.85 0.3,-0.1 0.61,0.12 0.7,0.49Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="213.42"
+          android:startY="61.74"
+          android:endX="210.29"
+          android:endY="53.91"
+          android:type="linear">
+        <item android:offset="0.16" android:color="#FFA02FB9"/>
+        <item android:offset="0.88" android:color="#FF00073B"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M212.7,57.46c-0.3,0.1 -0.46,0.48 -0.38,0.85 0.09,0.37 0.4,0.59 0.7,0.49 0.3,-0.1 0.46,-0.48 0.38,-0.85 -0.09,-0.37 -0.4,-0.59 -0.7,-0.49Z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M208.06,51.88c-0.89,-4.82 -2.68,-12.82 -4.69,-12.61 -2.13,0.23 -4.26,4.37 -5.88,8.31 -0.18,-0.73 -0.38,-1.57 -0.74,-2.61 -1.23,-3.63 -1.95,-5.53 -3.34,-5.3 -1.5,0.25 -3.54,3.37 -4.61,6.04 -1.72,4.29 -1.75,5.34 -2.06,7.24 -0.06,0.38 -0.16,0.81 -0.27,1.27 -0.59,2.4 -1.76,5.53 -2.32,6.56 -1.32,2.38 -5.5,5.56 -5.32,7.72 0.08,0.94 2.4,0.26 1.62,0.81 -0.05,0.03 -0.11,0.08 -0.18,0.14 5.45,-3.11 8.3,-6.01 15.42,-5.4 4.58,0.4 5.86,0.71 10.96,1.59 1.67,0.29 3.26,0.39 4.65,0.3 0.32,-0.07 1.06,-0.33 2.05,-1.22 1.87,-1.69 1.77,-3.4 4.98,-4.29 -4.91,-1.09 -3.98,-5.2 -10.28,-8.56h0ZM212.93,59.23c-1.23,0.41 -2.05,-0.19 -2.3,-0.57 -1.45,-2.17 -1.32,-3.26 0,-3.53 0.76,-0.15 1.63,0.36 2.55,1.76 1.14,1.72 0.29,2.15 -0.25,2.33h0Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="200.72"
+          android:startY="40"
+          android:endX="188.14"
+          android:endY="183.68"
+          android:type="linear">
+        <item android:offset="0.02" android:color="#FFFF6600"/>
+        <item android:offset="0.23" android:color="#FFFFB029"/>
+        <item android:offset="0.33" android:color="#FFFF9118"/>
+        <item android:offset="0.44" android:color="#FFFF790A"/>
+        <item android:offset="0.54" android:color="#FFFF6B02"/>
+        <item android:offset="0.63" android:color="#FFFF6600"/>
+        <item android:offset="1" android:color="#FFFB2872"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M201.32,50.17c1.87,0.13 4.32,0.48 6.3,1.48 0.15,0.08 0.3,0.15 0.45,0.23 -0.89,-4.82 -2.68,-12.82 -4.69,-12.61 -2.13,0.23 -4.26,4.37 -5.88,8.31 0.25,1.01 0.44,1.79 0.89,2.51 0.02,0.03 1.25,-0.04 2.93,0.08h0Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="208.73"
+          android:startY="34.29"
+          android:endX="193.06"
+          android:endY="75.01"
+          android:type="linear">
+        <item android:offset="0.09" android:color="#00BE0449"/>
+        <item android:offset="0.2" android:color="#2BBE0449"/>
+        <item android:offset="0.33" android:color="#54BE0449"/>
+        <item android:offset="0.47" android:color="#72BE0449"/>
+        <item android:offset="0.62" android:color="#87BE0449"/>
+        <item android:offset="0.78" android:color="#93BE0449"/>
+        <item android:offset="1" android:color="#99BE0449"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M204.88,59.22c0.53,1.51 -0.64,1.73 -1.3,1.84 -1.26,0.23 -2.04,0.37 -2.74,-1.61 -0.89,-2.52 0.27,-3.44 1.64,-3.24 0.87,0.12 1.68,0.95 2.4,3Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="202.08"
+          android:startY="65.01"
+          android:endX="203.2"
+          android:endY="55.02"
+          android:type="linear">
+        <item android:offset="0.16" android:color="#FFA02FB9"/>
+        <item android:offset="0.88" android:color="#FF00073B"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M204.27,60.18c0.3,-0.1 0.45,-0.48 0.33,-0.83 -0.12,-0.35 -0.47,-0.55 -0.77,-0.45 -0.3,0.11 -0.45,0.48 -0.33,0.83s0.47,0.55 0.77,0.45Z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M197.1,132.41c-0.71,-3.08 2.59,-3.51 2.98,-3.96 -0.79,-5.54 -2.49,-13.4 -7.35,-20.89 -0.2,0.31 -0.18,2.68 -0.18,2.68l-2.7,-6.83s0.51,5.45 0.46,6.04c-0.04,0.52 -0.68,-1.75 -2.18,-4.93 -0.84,-1.77 -1.51,-2.69 -1.99,-3.28 2.44,10.18 7.48,15.89 9.34,27.71 0.03,0.2 -2.04,0.71 -1.72,3.63 0.14,1.26 0.43,1.29 4.49,1.31 -0.54,-0.32 -0.98,-0.79 -1.14,-1.5h0s0,0 0,0Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="199.37"
+          android:startY="48.73"
+          android:endX="191.58"
+          android:endY="130.92"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFF6600"/>
+        <item android:offset="0.33" android:color="#FFFFB029"/>
+        <item android:offset="0.46" android:color="#FFFF9218"/>
+        <item android:offset="0.63" android:color="#FFFF6600"/>
+        <item android:offset="1" android:color="#FFFB2872"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M197.1,132.41c-0.71,-3.07 2.59,-3.51 2.98,-3.96 -0.72,-11.15 -7.38,-21.18 -7.38,-21.18l-0.1,2.81 -2.74,-6.67s0.23,1.82 0.25,3.64c0,0.88 0.25,1.82 0.21,2.41 -0.04,0.52 -0.68,-1.75 -2.18,-4.93 -0.84,-1.77 -1.51,-2.69 -1.99,-3.28 2.44,10.18 7.48,15.89 9.34,27.72 0.03,0.2 -2.93,1.13 -2.6,4.06 0.14,1.26 1.31,0.86 5.38,0.88 -0.54,-0.32 -0.98,-0.79 -1.14,-1.5h0Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="191.01"
+          android:startY="101.94"
+          android:endX="198.79"
+          android:endY="147.93"
+          android:type="linear">
+        <item android:offset="0.02" android:color="#00D81F60"/>
+        <item android:offset="0.43" android:color="#FFD81F60"/>
+        <item android:offset="0.54" android:color="#FFA31F4D"/>
+        <item android:offset="0.65" android:color="#FF731F3C"/>
+        <item android:offset="0.75" android:color="#FF4D1F2F"/>
+        <item android:offset="0.85" android:color="#FF321F25"/>
+        <item android:offset="0.94" android:color="#FF211F20"/>
+        <item android:offset="1" android:color="#FF1C1F1E"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M205.32,129.07c-0.13,-6.4 -0.11,-16.64 -1.87,-26.53 -0.2,0.31 -1.24,7.75 -1.24,7.75 0,0 -1.06,-3.77 -1.57,-5.46 -0.53,-1.75 -1.52,-4.02 -1.52,-4.02 0,0 0.23,2.55 0.25,4.36 0,0.88 0.25,3.74 0.21,4.33 -0.04,0.52 -0.21,-0.63 -1.44,-3.92 -1.65,-4.38 -2.53,-4.66 -2.76,-5.5 1.19,4.18 3.49,19.41 4.63,28.32 0,0.04 -0.01,0.07 -0.04,0.1 -0.39,0.45 -3.69,0.88 -2.98,3.96 0.16,0.71 0.6,1.18 1.14,1.5h1.79c0.25,0 0.5,0 0.73,0 1.22,0 2.26,-0.01 3.22,-0.02 -0.61,-0.73 -1.47,-2.29 0.43,-4.13 0.31,-0.29 0.66,-0.54 1.04,-0.73h-0.01,0Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="200.36"
+          android:startY="99.58"
+          android:endX="200.36"
+          android:endY="151.77"
+          android:type="linear">
+        <item android:offset="0.02" android:color="#00D81F60"/>
+        <item android:offset="0.49" android:color="#FFD81F60"/>
+        <item android:offset="0.5" android:color="#FFD11F5D"/>
+        <item android:offset="0.68" android:color="#FF841F42"/>
+        <item android:offset="0.83" android:color="#FF4C1F2E"/>
+        <item android:offset="0.94" android:color="#FF291F22"/>
+        <item android:offset="1" android:color="#FF1C1F1E"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M221.62,129.51c-3.08,0.34 -14.7,-1.56 -16.82,-0.45 -0.38,0.19 -0.73,0.44 -1.04,0.73 -1.9,1.83 -1.04,3.4 -0.43,4.13 0.59,0 1.14,0 1.7,0 2.29,-0.01 4.54,-0.02 8.6,-0.05 3.01,-0.02 6.07,0 9.05,0.02 0,0 -0.04,-4.48 -1.06,-4.37h0Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="159.04"
+          android:startY="127.5"
+          android:endX="230.48"
+          android:endY="133.13"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFF6600"/>
+        <item android:offset="0.33" android:color="#FFFFB029"/>
+        <item android:offset="0.46" android:color="#FFFF9218"/>
+        <item android:offset="0.63" android:color="#FFFF6600"/>
+        <item android:offset="1" android:color="#FFFB2872"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M220.55,127.96s-1.47,0.6 -2.33,0.71c-2.59,0.34 -12,-0.65 -13.78,0.47h0c-0.33,0.19 -0.62,0.43 -0.87,0.72 -1.59,1.83 -0.88,3.4 -0.36,4.13h1.43c1.93,-0.01 17.13,-0.05 19.63,-0.02l-3.72,-5.99h0Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="226.7"
+          android:startY="130.84"
+          android:endX="209.49"
+          android:endY="131.33"
+          android:type="linear">
+        <item android:offset="0.26" android:color="#00FE2B64"/>
+        <item android:offset="0.95" android:color="#FFAA0D51"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M228.55,116.94c-0.77,-7.14 -5.76,-12.44 -12.24,-11.74s-11.44,6.72 -11.16,14.04c0.2,5.07 4.2,12.74 7.35,14.42">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="194.6"
+          android:startY="108.27"
+          android:endX="216.03"
+          android:endY="119.33"
+          android:type="linear">
+        <item android:offset="0.11" android:color="#FFFBE74D"/>
+        <item android:offset="0.23" android:color="#E2F9DA49"/>
+        <item android:offset="0.49" android:color="#99F5BA40"/>
+        <item android:offset="0.86" android:color="#26EF8632"/>
+        <item android:offset="0.98" android:color="#00ED762E"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_toolbar_bottom_active.xml b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_toolbar_bottom_active.xml
new file mode 100644
index 0000000000000..6cb227017052c
--- /dev/null
+++ b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_toolbar_bottom_active.xml
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="463.21dp"
+    android:height="993.59dp"
+    android:viewportWidth="463.21"
+    android:viewportHeight="993.59">
+  <group>
+    <clip-path
+        android:pathData="M0,0h463.21v993.59h-463.21z"/>
+    <path
+        android:pathData="M0,34.74C0,15.55 15.55,0 34.74,0h390.26c19.19,0 34.74,15.55 34.74,34.74v924.11c0,19.19 -15.55,34.74 -34.74,34.74H34.74c-19.19,0 -34.74,-15.55 -34.74,-34.74V34.74Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="229.87"
+            android:startY="0"
+            android:endX="229.87"
+            android:endY="1027.29"
+            android:type="linear">
+          <item android:offset="0" android:color="#FF000000"/>
+          <item android:offset="0.37" android:color="#FF010101"/>
+          <item android:offset="0.51" android:color="#FF080808"/>
+          <item android:offset="0.6" android:color="#FF141414"/>
+          <item android:offset="0.68" android:color="#FF252525"/>
+          <item android:offset="0.75" android:color="#FF3B3B3B"/>
+          <item android:offset="0.8" android:color="#FF565656"/>
+          <item android:offset="0.86" android:color="#FF777777"/>
+          <item android:offset="0.91" android:color="#FF9C9C9C"/>
+          <item android:offset="0.95" android:color="#FFC7C7C7"/>
+          <item android:offset="0.99" android:color="#FFF5F5F5"/>
+          <item android:offset="1" android:color="#FFFFFFFF"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M15.18,10.3h434.36v52.46h-434.36z"
+        android:fillColor="#e2e2e2"/>
+    <path
+        android:pathData="M14.9,877.11h431.18v104.39h-431.18z"
+        android:fillColor="#e2e2e2"/>
+    <path
+        android:pathData="M51.21,903.16L261.99,903.16A26.02,26.02 0,0 1,288.01 929.18L288.01,929.19A26.02,26.02 0,0 1,261.99 955.21L51.21,955.21A26.02,26.02 0,0 1,25.19 929.19L25.19,929.18A26.02,26.02 0,0 1,51.21 903.16z"
+        android:fillColor="#fff"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M50.69,939c-0.5,0 -0.99,-0.13 -1.43,-0.37 -2.04,-1.14 -3.92,-2.91 -5.29,-4.99 -0.7,-1.06 -1.19,-2.34 -1.46,-3.82l-0.7,-3.78c-0.24,-1.26 0.37,-2.51 1.49,-3.12l5.91,-3.2c0.87,-0.47 1.91,-0.47 2.8,0l6.06,3.26c1.13,0.61 1.74,1.87 1.5,3.13l-0.7,3.72c-0.27,1.47 -0.77,2.75 -1.45,3.8 -1.37,2.08 -3.25,3.85 -5.29,5 -0.44,0.25 -0.94,0.37 -1.43,0.37ZM50.61,921.09c-0.2,0 -0.4,0.05 -0.58,0.15l-5.91,3.2c-0.47,0.26 -0.72,0.78 -0.62,1.31l0.7,3.78c0.23,1.25 0.64,2.32 1.21,3.18 1.22,1.86 2.89,3.43 4.69,4.44 0.37,0.21 0.83,0.21 1.2,0 1.81,-1.01 3.47,-2.58 4.69,-4.44 0.57,-0.86 0.97,-1.92 1.2,-3.17l0.7,-3.72c0.1,-0.53 -0.16,-1.05 -0.63,-1.31l-6.07,-3.26c-0.19,-0.1 -0.38,-0.15 -0.58,-0.15h0Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M50.21,931.96c-0.23,0 -0.45,-0.09 -0.61,-0.26l-2.73,-2.73 1.22,-1.22 2.12,2.12 3.82,-3.82 1.22,1.22 -4.43,4.43c-0.16,0.17 -0.38,0.26 -0.61,0.26Z"/>
+    <path
+        android:pathData="M72.44,919.58h194.46v19.22h-194.46z"
+        android:fillColor="#e2e2e2"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M313.58,930.17v7.73h1.72v-7.73h7.73v-1.72h-7.73v-7.73h-1.72v7.73h-7.73v1.72h7.73Z"/>
+    <path
+        android:pathData="M360.87,921.57L373.7,921.57A4.31,4.31 0,0 1,378.01 925.88L378.01,933.76A4.31,4.31 0,0 1,373.7 938.07L360.87,938.07A4.31,4.31 0,0 1,356.56 933.76L356.56,925.88A4.31,4.31 0,0 1,360.87 921.57z"
+        android:strokeWidth="1.12"
+        android:fillColor="#00000000"
+        android:strokeColor="#000"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M364.08,927.51h-0.03l-1.81,1.24v-1.14l1.83,-1.28h1.24v6.99h-1.23v-5.81Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M368.12,933c-0.41,-0.29 -0.73,-0.71 -0.95,-1.25s-0.33,-1.18 -0.33,-1.92h0c0,-0.75 0.11,-1.39 0.33,-1.93s0.54,-0.96 0.95,-1.25 0.9,-0.44 1.47,-0.44 1.06,0.15 1.47,0.44 0.73,0.71 0.95,1.25 0.33,1.18 0.33,1.92h0c0,0.75 -0.11,1.39 -0.33,1.93s-0.54,0.96 -0.95,1.25c-0.41,0.29 -0.9,0.44 -1.47,0.44s-1.06,-0.15 -1.47,-0.44ZM370.39,932.11c0.22,-0.21 0.39,-0.5 0.51,-0.89 0.12,-0.39 0.18,-0.85 0.18,-1.39h0c0,-0.55 -0.06,-1.01 -0.18,-1.4 -0.12,-0.39 -0.29,-0.68 -0.51,-0.89 -0.22,-0.21 -0.49,-0.31 -0.8,-0.31s-0.59,0.1 -0.81,0.31c-0.22,0.2 -0.39,0.5 -0.51,0.89 -0.12,0.39 -0.18,0.85 -0.18,1.39h0c0,0.55 0.06,1.01 0.18,1.4 0.12,0.39 0.28,0.69 0.51,0.89 0.22,0.21 0.49,0.31 0.81,0.31s0.58,-0.1 0.8,-0.31Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M421.63,921.23c0,-0.82 -0.67,-1.49 -1.49,-1.49s-1.49,0.67 -1.49,1.49 0.67,1.49 1.49,1.49 1.49,-0.67 1.49,-1.49Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M421.63,929.19c0,-0.82 -0.67,-1.49 -1.49,-1.49s-1.49,0.67 -1.49,1.49 0.67,1.49 1.49,1.49 1.49,-0.67 1.49,-1.49Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M421.63,937.15c0,-0.82 -0.67,-1.49 -1.49,-1.49s-1.49,0.67 -1.49,1.49 0.67,1.49 1.49,1.49 1.49,-0.67 1.49,-1.49Z"/>
+    <path
+        android:pathData="M6.95,34.74c0,-15.35 12.44,-27.79 27.79,-27.79h390.26c15.35,0 27.79,12.44 27.79,27.79v924.11c0,15.35 -12.44,27.79 -27.79,27.79H34.74c-15.35,0 -27.79,-12.44 -27.79,-27.79V34.74Z"
+        android:strokeWidth="15"
+        android:fillColor="#00000000"
+        android:strokeColor="#000"/>
+    <path
+        android:pathData="M459.74,361.31h1.16c1.28,0 2.32,0.9 2.32,2.01v56.19c0,1.11 -1.04,2.01 -2.32,2.01h-1.16v-60.22Z"
+        android:fillColor="#121515"/>
+    <path
+        android:pathData="M459.74,192.23h1.16c1.28,0 2.32,1.72 2.32,3.83v106.98c0,2.12 -1.04,3.83 -2.32,3.83h-1.16v-114.65Z"
+        android:fillColor="#121515"/>
+    <group>
+      <clip-path
+          android:pathData="M15.05,46.32c0,-17.27 14,-31.27 31.27,-31.27h367.1c17.27,0 31.27,14 31.27,31.27v891.69c0,17.27 -14,31.27 -31.27,31.27H46.32c-17.27,0 -31.27,-14 -31.27,-31.27V46.32Z"/>
+    </group>
+    <path
+        android:pathData="M229.96,50.97c6.72,0 12.16,-5.44 12.16,-12.16s-5.44,-12.16 -12.16,-12.16 -12.16,5.44 -12.16,12.16 5.44,12.16 12.16,12.16Z"
+        android:fillColor="#262c2d"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M229.96,46.41c4.2,0 7.6,-3.4 7.6,-7.6s-3.4,-7.6 -7.6,-7.6 -7.6,3.4 -7.6,7.6 3.4,7.6 7.6,7.6Z"
+        android:fillColor="#121515"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M229.96,37.29c0.84,0 1.52,-0.68 1.52,-1.52s-0.68,-1.52 -1.52,-1.52 -1.52,0.68 -1.52,1.52 0.68,1.52 1.52,1.52Z"
+        android:strokeAlpha="0.4"
+        android:fillColor="#636f73"
+        android:fillType="evenOdd"
+        android:fillAlpha="0.4"/>
+    <path
+        android:pathData="M313.18,759.85c13.61,-12.94 21.69,-11.29 21.67,-17.38 -0.01,-2.88 -4.76,-2.87 -4.99,-5.74 -0.36,-4.49 12.27,-6.02 11.28,-10.43 -1.17,-5.23 -7.71,-4.72 -9.95,-5.52 -4.23,-1.5 3.58,-3.35 1.46,-7.24 -3.02,-5.56 -16.73,-1.41 -26.16,-7.45 -5.54,-3.55 -10.13,-17.22 -12.72,-22.43 -5,-10.05 -7.04,-17.84 -14.41,-32.6 -7.48,-14.98 -13.35,-23.62 -20.56,-23.97 -6.22,-0.3 -13.02,9.14 -18.96,25.97 -4.64,13.12 -5.73,16.12 -9.03,22.08 -0.19,0.34 -9.3,1.98 -13.42,2.64 -2.95,0.48 -5.5,-9.01 -17.2,-24.22 -10.06,-13.08 -17.24,-18.89 -24.49,-16.49 -6.11,2.03 -10.69,21.69 -13.15,37.22 -2.03,12.87 -2.06,14.1 -2.99,18.82 -2.07,10.53 -4.7,26.84 -11.16,33.21 -8.2,8.09 -18.18,6.18 -19.87,12.25 -1.96,7.03 4.6,4.31 3.93,5.86 -1.12,2.59 -10.71,2.61 -10.43,8.57 0.23,4.89 9.23,1.95 9.45,4.17 0.31,3.03 -6.2,5.02 -5.83,8.04 0.92,7.61 20.13,4.69 34.14,17.21 10.36,9.26 11.41,25.82 9.02,48.75 -1.73,16.57 -6.14,45.9 -6.14,45.9h142.75s-5.75,-41.05 -7.86,-52.9c-4.19,-23.53 3.88,-53.17 15.64,-64.35Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="-6.92"
+            android:startY="752.1"
+            android:endX="372.1"
+            android:endY="752.1"
+            android:type="linear">
+          <item android:offset="0" android:color="#00FF6600"/>
+          <item android:offset="0.03" android:color="#2BFF6600"/>
+          <item android:offset="0.07" android:color="#5BFF6600"/>
+          <item android:offset="0.11" android:color="#87FF6600"/>
+          <item android:offset="0.16" android:color="#ADFF6600"/>
+          <item android:offset="0.2" android:color="#CCFF6600"/>
+          <item android:offset="0.25" android:color="#E2FF6600"/>
+          <item android:offset="0.3" android:color="#F2FF6600"/>
+          <item android:offset="0.36" android:color="#FCFF6600"/>
+          <item android:offset="0.43" android:color="#FFFF6600"/>
+          <item android:offset="0.72" android:color="#FFFD4737"/>
+          <item android:offset="1" android:color="#FFFB2872"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <group>
+      <clip-path
+          android:pathData="M313.18,759.85c13.61,-12.94 21.69,-11.29 21.67,-17.38 -0.01,-2.88 -4.76,-2.87 -4.99,-5.74 -0.36,-4.49 12.27,-6.02 11.28,-10.43 -1.17,-5.23 -7.71,-4.72 -9.95,-5.52 -4.23,-1.5 3.58,-3.35 1.46,-7.24 -3.02,-5.56 -16.73,-1.41 -26.16,-7.45 -5.54,-3.55 -10.13,-17.22 -12.72,-22.43 -5,-10.05 -7.04,-17.84 -14.41,-32.6 -7.48,-14.98 -13.35,-23.62 -20.56,-23.97 -6.22,-0.3 -13.02,9.14 -18.96,25.97 -4.64,13.12 -5.73,16.12 -9.03,22.08 -0.19,0.34 -9.3,1.98 -13.42,2.64 -2.95,0.48 -5.5,-9.01 -17.2,-24.22 -10.06,-13.08 -17.24,-18.89 -24.49,-16.49 -6.11,2.03 -10.69,21.69 -13.15,37.22 -2.03,12.87 -2.06,14.1 -2.99,18.82 -2.07,10.53 -4.7,26.84 -11.16,33.21 -8.2,8.09 -18.18,6.18 -19.87,12.25 -1.96,7.03 4.6,4.31 3.93,5.86 -1.12,2.59 -10.71,2.61 -10.43,8.57 0.23,4.89 9.23,1.95 9.45,4.17 0.31,3.03 -6.2,5.02 -5.83,8.04 0.92,7.61 20.13,4.69 34.14,17.21 10.36,9.26 11.41,25.82 9.02,48.75 -1.73,16.57 -6.14,45.9 -6.14,45.9h142.75s-5.75,-41.05 -7.86,-52.9c-4.19,-23.53 3.88,-53.17 15.64,-64.35Z"/>
+      <path
+          android:pathData="M425.84,981.4l-377.66,48.81l70.38,-422.68l203.02,-1.22l104.26,375.09z">
+        <aapt:attr name="android:fillColor">
+          <gradient
+              android:startX="225.49"
+              android:startY="660.15"
+              android:endX="235.7"
+              android:endY="966.35"
+              android:type="linear">
+            <item android:offset="0" android:color="#FFFF6600"/>
+            <item android:offset="0.33" android:color="#FFFFB029"/>
+            <item android:offset="0.46" android:color="#FFFF9218"/>
+            <item android:offset="0.63" android:color="#FFFF6600"/>
+            <item android:offset="1" android:color="#FFFB2872"/>
+          </gradient>
+        </aapt:attr>
+      </path>
+      <path
+          android:pathData="M226.82,675.64s19.49,-3.79 38.55,4.35c17.39,7.42 35.35,14.88 36.62,15.12 1.27,0.25 -6.8,-67.9 -6.8,-67.9l-31.55,-7.93s-31.84,1.81 -31.92,4.39c-0.08,2.57 -4.9,51.98 -4.9,51.98Z">
+        <aapt:attr name="android:fillColor">
+          <gradient
+              android:startX="264.66"
+              android:startY="681.24"
+              android:endX="271.73"
+              android:endY="614.18"
+              android:type="linear">
+            <item android:offset="0" android:color="#00FF6600"/>
+            <item android:offset="0.03" android:color="#2BFF6600"/>
+            <item android:offset="0.07" android:color="#5BFF6600"/>
+            <item android:offset="0.11" android:color="#87FF6600"/>
+            <item android:offset="0.16" android:color="#ADFF6600"/>
+            <item android:offset="0.2" android:color="#CCFF6600"/>
+            <item android:offset="0.25" android:color="#E2FF6600"/>
+            <item android:offset="0.3" android:color="#F2FF6600"/>
+            <item android:offset="0.36" android:color="#FCFF6600"/>
+            <item android:offset="0.43" android:color="#FFFF6600"/>
+            <item android:offset="0.72" android:color="#FFFD4737"/>
+            <item android:offset="1" android:color="#FFFB2872"/>
+          </gradient>
+        </aapt:attr>
+      </path>
+      <path
+          android:pathData="M219.47,675.54s-19.86,0.76 -36.46,13.02c-15.15,11.18 -30.85,22.52 -32.03,23.05 -1.18,0.53 -9.5,-67.59 -9.5,-67.59l28.8,-14.91s31.4,-5.49 32.08,-3.01c0.68,2.48 17.1,49.44 17.1,49.44Z">
+        <aapt:attr name="android:fillColor">
+          <gradient
+              android:startX="184.17"
+              android:startY="690.22"
+              android:endX="161.72"
+              android:endY="626.68"
+              android:type="linear">
+            <item android:offset="0" android:color="#00FF6600"/>
+            <item android:offset="0.03" android:color="#2BFF6600"/>
+            <item android:offset="0.07" android:color="#5BFF6600"/>
+            <item android:offset="0.11" android:color="#87FF6600"/>
+            <item android:offset="0.16" android:color="#ADFF6600"/>
+            <item android:offset="0.2" android:color="#CCFF6600"/>
+            <item android:offset="0.25" android:color="#E2FF6600"/>
+            <item android:offset="0.3" android:color="#F2FF6600"/>
+            <item android:offset="0.36" android:color="#FCFF6600"/>
+            <item android:offset="0.43" android:color="#FFFF6600"/>
+            <item android:offset="0.72" android:color="#FFFD4737"/>
+            <item android:offset="1" android:color="#FFFB2872"/>
+          </gradient>
+        </aapt:attr>
+      </path>
+      <path
+          android:pathData="M325.06,1044.4c79.62,1.08 39.88,-324.36 14.48,-324.3 -19,0.05 -35.18,3.25 -50.49,12.23 -13.16,7.72 -26.47,21.3 -29.65,19.77 -7.57,-3.65 -19.71,-17.09 -37.65,-11.39 -14.03,4.46 -18.37,13.09 -23.38,17.32 -3.75,3.17 -12.58,-6.12 -26.55,-11.63 -17.78,-7.02 -41.68,-6.4 -60.81,11.24 -18.36,16.93 -8.67,283.89 41.72,283.79 19.31,-0.04 153.02,2.7 172.33,2.96Z"
+          android:strokeAlpha="0.6"
+          android:fillAlpha="0.6">
+        <aapt:attr name="android:fillColor">
+          <gradient
+              android:startX="241.29"
+              android:startY="734.35"
+              android:endX="233.84"
+              android:endY="986.53"
+              android:type="linear">
+            <item android:offset="0" android:color="#FFFFEB49"/>
+            <item android:offset="0.36" android:color="#99FFB52B"/>
+            <item android:offset="0.67" android:color="#47FF8A14"/>
+            <item android:offset="0.89" android:color="#14FF7005"/>
+            <item android:offset="1" android:color="#00FF6600"/>
+          </gradient>
+        </aapt:attr>
+      </path>
+      <path
+          android:pathData="M234.8,826.26s-21.33,16.07 -14.88,56.61c5.17,32.46 9.41,39.97 12.67,60.57 3.26,20.6 6.75,44.39 6.75,44.39 0,0 2.94,-23 6.9,-44.91 2.83,-15.66 8.5,-36.75 11.53,-62.08 4.89,-40.81 -22.97,-54.57 -22.97,-54.57Z"
+          android:strokeAlpha="0.6"
+          android:fillAlpha="0.6">
+        <aapt:attr name="android:fillColor">
+          <gradient
+              android:startX="238.1"
+              android:startY="860.52"
+              android:endX="245.04"
+              android:endY="1013.27"
+              android:type="linear">
+            <item android:offset="0" android:color="#FFFFD400"/>
+            <item android:offset="0.09" android:color="#F4FFD100"/>
+            <item android:offset="0.24" android:color="#D6FFCB00"/>
+            <item android:offset="0.44" android:color="#A8FFC000"/>
+            <item android:offset="0.67" android:color="#66FFB200"/>
+            <item android:offset="0.94" android:color="#11FFA000"/>
+            <item android:offset="1" android:color="#00FF9C00"/>
+          </gradient>
+        </aapt:attr>
+      </path>
+      <path
+          android:pathData="M90.69,991.55a59.71,58.15 0,1 0,119.42 0a59.71,58.15 0,1 0,-119.42 0z"
+          android:strokeAlpha="0.38"
+          android:fillAlpha="0.38">
+        <aapt:attr name="android:fillColor">
+          <gradient
+              android:centerX="148.93"
+              android:centerY="998.57"
+              android:gradientRadius="60.94"
+              android:type="radial">
+            <item android:offset="0" android:color="#FFFFD400"/>
+            <item android:offset="0.41" android:color="#96FFBD00"/>
+            <item android:offset="0.99" android:color="#00FF9C00"/>
+          </gradient>
+        </aapt:attr>
+      </path>
+    </group>
+    <path
+        android:pathData="M221.13,736.83c13.33,-3.73 23.95,6.9 37.19,14.4 11.44,6.48 4.81,27.41 -19.39,32.78 -32.58,7.23 -50.71,-16.98 -41.16,-25.78 9.89,-9.12 12.17,-18.26 23.37,-21.39Z"
+        android:fillColor="#ffcf34"/>
+    <path
+        android:pathData="M223.03,742.7c-5.21,0.55 -7.8,3.02 -8.39,5.14 -0.73,2.61 2.09,7.59 8.49,6.92 6.08,-0.63 9.02,-5.89 7.92,-8.57 -0.79,-1.9 -3.42,-3.98 -8.02,-3.49Z"
+        android:fillColor="#200041"/>
+    <path
+        android:pathData="M220.46,742.45c13.33,-3.8 25.25,7.23 38.49,14.88 11.44,6.61 4.81,27.96 -19.39,33.45 -32.58,7.38 -50.71,-17.33 -41.16,-26.31 9.89,-9.31 10.87,-18.82 22.07,-22.02Z"
+        android:fillColor="#ffc635"/>
+    <path
+        android:pathData="M223.76,749.67c-5.21,0.56 -7.8,3.08 -8.39,5.24 -0.73,2.66 2.09,7.74 8.49,7.06 6.08,-0.65 9.02,-6.01 7.92,-8.74 -0.79,-1.94 -3.42,-4.06 -8.02,-3.56Z"
+        android:fillColor="#200041"/>
+    <path
+        android:pathData="M245.14,729.8c0.68,6.98 6.22,9.46 9.29,9.04 5.88,-0.81 9.43,-1.97 8.57,-11.11 -1.09,-11.64 -5.58,-15.18 -11.78,-14.25 -6.5,0.97 -7.01,6.81 -6.08,16.33Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="247.31"
+            android:startY="706.11"
+            android:endX="257.42"
+            android:endY="738.18"
+            android:type="linear">
+          <item android:offset="0.16" android:color="#FFA030B9"/>
+          <item android:offset="0.88" android:color="#FF00073A"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M256.44,722.16m-2.9,0a2.9,2.9 0,1 1,5.8 0a2.9,2.9 0,1 1,-5.8 0"
+        android:fillColor="#fff"/>
+    <path
+        android:pathData="M186.99,735.26c0.64,9.71 5.99,10.97 9.16,10.53 6.07,-0.84 9.54,-2.21 9.12,-9.31 -0.67,-11.34 -3.68,-17.87 -11.95,-16.25 -5.21,1.02 -6.85,7.15 -6.33,15.04Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="190.64"
+            android:startY="714.27"
+            android:endX="198.32"
+            android:endY="742.39"
+            android:type="linear">
+          <item android:offset="0.16" android:color="#FFA030B9"/>
+          <item android:offset="0.88" android:color="#FF00073A"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M198.46,728.89m-2.83,0a2.83,2.83 0,1 1,5.66 0a2.83,2.83 0,1 1,-5.66 0"
+        android:fillColor="#fff"/>
+  </group>
+</vector>
diff --git a/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_toolbar_bottom_inactive.xml b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_toolbar_bottom_inactive.xml
new file mode 100644
index 0000000000000..868f8872baa1d
--- /dev/null
+++ b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_toolbar_bottom_inactive.xml
@@ -0,0 +1,105 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="463.21dp"
+    android:height="993.59dp"
+    android:viewportWidth="463.21"
+    android:viewportHeight="993.59">
+  <group>
+    <clip-path
+        android:pathData="M0,0h463.21v993.59h-463.21z"/>
+    <path
+        android:pathData="M0,34.74C0,15.55 15.55,0 34.74,0h390.26c19.19,0 34.74,15.55 34.74,34.74v924.11c0,19.19 -15.55,34.74 -34.74,34.74H34.74c-19.19,0 -34.74,-15.55 -34.74,-34.74V34.74Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="229.87"
+            android:startY="0"
+            android:endX="229.87"
+            android:endY="1128.17"
+            android:type="linear">
+          <item android:offset="0" android:color="#FF000000"/>
+          <item android:offset="0.37" android:color="#FF010101"/>
+          <item android:offset="0.51" android:color="#FF080808"/>
+          <item android:offset="0.6" android:color="#FF141414"/>
+          <item android:offset="0.68" android:color="#FF252525"/>
+          <item android:offset="0.75" android:color="#FF3B3B3B"/>
+          <item android:offset="0.8" android:color="#FF565656"/>
+          <item android:offset="0.86" android:color="#FF777777"/>
+          <item android:offset="0.91" android:color="#FF9C9C9C"/>
+          <item android:offset="0.95" android:color="#FFC7C7C7"/>
+          <item android:offset="0.99" android:color="#FFF5F5F5"/>
+          <item android:offset="1" android:color="#FFFFFFFF"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M15.18,10.3h434.36v52.46h-434.36z"
+        android:fillColor="#e2e2e2"/>
+    <path
+        android:pathData="M14.9,877.11h431.18v104.39h-431.18z"
+        android:fillColor="#e2e2e2"/>
+    <path
+        android:pathData="M51.21,903.16L261.99,903.16A26.02,26.02 0,0 1,288.01 929.18L288.01,929.19A26.02,26.02 0,0 1,261.99 955.21L51.21,955.21A26.02,26.02 0,0 1,25.19 929.19L25.19,929.18A26.02,26.02 0,0 1,51.21 903.16z"
+        android:fillColor="#fff"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M50.69,939c-0.5,0 -0.99,-0.13 -1.43,-0.37 -2.04,-1.14 -3.92,-2.91 -5.29,-4.99 -0.7,-1.06 -1.19,-2.34 -1.46,-3.82l-0.7,-3.78c-0.24,-1.26 0.37,-2.51 1.49,-3.12l5.91,-3.2c0.87,-0.47 1.91,-0.47 2.8,0l6.06,3.26c1.13,0.61 1.74,1.87 1.5,3.13l-0.7,3.72c-0.27,1.47 -0.77,2.75 -1.45,3.8 -1.37,2.08 -3.25,3.85 -5.29,5 -0.44,0.25 -0.94,0.37 -1.43,0.37ZM50.61,921.09c-0.2,0 -0.4,0.05 -0.58,0.15l-5.91,3.2c-0.47,0.26 -0.72,0.78 -0.62,1.31l0.7,3.78c0.23,1.25 0.64,2.32 1.21,3.18 1.22,1.86 2.89,3.43 4.69,4.44 0.37,0.21 0.83,0.21 1.2,0 1.81,-1.01 3.47,-2.58 4.69,-4.44 0.57,-0.86 0.97,-1.92 1.2,-3.17l0.7,-3.72c0.1,-0.53 -0.16,-1.05 -0.63,-1.31l-6.07,-3.26c-0.19,-0.1 -0.38,-0.15 -0.58,-0.15h0Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M50.21,931.96c-0.23,0 -0.45,-0.09 -0.61,-0.26l-2.73,-2.73 1.22,-1.22 2.12,2.12 3.82,-3.82 1.22,1.22 -4.43,4.43c-0.16,0.17 -0.38,0.26 -0.61,0.26Z"/>
+    <path
+        android:pathData="M72.44,919.58h194.46v19.22h-194.46z"
+        android:fillColor="#e2e2e2"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M313.58,930.17v7.73h1.72v-7.73h7.73v-1.72h-7.73v-7.73h-1.72v7.73h-7.73v1.72h7.73Z"/>
+    <path
+        android:pathData="M360.87,921.57L373.7,921.57A4.31,4.31 0,0 1,378.01 925.88L378.01,933.76A4.31,4.31 0,0 1,373.7 938.07L360.87,938.07A4.31,4.31 0,0 1,356.56 933.76L356.56,925.88A4.31,4.31 0,0 1,360.87 921.57z"
+        android:strokeWidth="1.12"
+        android:fillColor="#00000000"
+        android:strokeColor="#000"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M364.08,927.51h-0.03l-1.81,1.24v-1.14l1.83,-1.28h1.24v6.99h-1.23v-5.81Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M368.12,933c-0.41,-0.29 -0.73,-0.71 -0.95,-1.25s-0.33,-1.18 -0.33,-1.92h0c0,-0.75 0.11,-1.39 0.33,-1.93s0.54,-0.96 0.95,-1.25 0.9,-0.44 1.47,-0.44 1.06,0.15 1.47,0.44 0.73,0.71 0.95,1.25 0.33,1.18 0.33,1.92h0c0,0.75 -0.11,1.39 -0.33,1.93s-0.54,0.96 -0.95,1.25c-0.41,0.29 -0.9,0.44 -1.47,0.44s-1.06,-0.15 -1.47,-0.44ZM370.39,932.11c0.22,-0.21 0.39,-0.5 0.51,-0.89 0.12,-0.39 0.18,-0.85 0.18,-1.39h0c0,-0.55 -0.06,-1.01 -0.18,-1.4 -0.12,-0.39 -0.29,-0.68 -0.51,-0.89 -0.22,-0.21 -0.49,-0.31 -0.8,-0.31s-0.59,0.1 -0.81,0.31c-0.22,0.2 -0.39,0.5 -0.51,0.89 -0.12,0.39 -0.18,0.85 -0.18,1.39h0c0,0.55 0.06,1.01 0.18,1.4 0.12,0.39 0.28,0.69 0.51,0.89 0.22,0.21 0.49,0.31 0.81,0.31s0.58,-0.1 0.8,-0.31Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M421.63,921.23c0,-0.82 -0.67,-1.49 -1.49,-1.49s-1.49,0.67 -1.49,1.49 0.67,1.49 1.49,1.49 1.49,-0.67 1.49,-1.49Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M421.63,929.19c0,-0.82 -0.67,-1.49 -1.49,-1.49s-1.49,0.67 -1.49,1.49 0.67,1.49 1.49,1.49 1.49,-0.67 1.49,-1.49Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M421.63,937.15c0,-0.82 -0.67,-1.49 -1.49,-1.49s-1.49,0.67 -1.49,1.49 0.67,1.49 1.49,1.49 1.49,-0.67 1.49,-1.49Z"/>
+    <path
+        android:pathData="M6.95,34.74c0,-15.35 12.44,-27.79 27.79,-27.79h390.26c15.35,0 27.79,12.44 27.79,27.79v924.11c0,15.35 -12.44,27.79 -27.79,27.79H34.74c-15.35,0 -27.79,-12.44 -27.79,-27.79V34.74Z"
+        android:strokeWidth="15"
+        android:fillColor="#00000000"
+        android:strokeColor="#000"/>
+    <path
+        android:pathData="M459.74,361.31h1.16c1.28,0 2.32,0.9 2.32,2.01v56.19c0,1.11 -1.04,2.01 -2.32,2.01h-1.16v-60.22Z"
+        android:fillColor="#121515"/>
+    <path
+        android:pathData="M459.74,192.23h1.16c1.28,0 2.32,1.72 2.32,3.83v106.98c0,2.12 -1.04,3.83 -2.32,3.83h-1.16v-114.65Z"
+        android:fillColor="#121515"/>
+    <group>
+      <clip-path
+          android:pathData="M15.05,46.32c0,-17.27 14,-31.27 31.27,-31.27h367.1c17.27,0 31.27,14 31.27,31.27v891.69c0,17.27 -14,31.27 -31.27,31.27H46.32c-17.27,0 -31.27,-14 -31.27,-31.27V46.32Z"/>
+    </group>
+    <path
+        android:pathData="M229.96,50.97c6.72,0 12.16,-5.44 12.16,-12.16s-5.44,-12.16 -12.16,-12.16 -12.16,5.44 -12.16,12.16 5.44,12.16 12.16,12.16Z"
+        android:fillColor="#262c2d"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M229.96,46.41c4.2,0 7.6,-3.4 7.6,-7.6s-3.4,-7.6 -7.6,-7.6 -7.6,3.4 -7.6,7.6 3.4,7.6 7.6,7.6Z"
+        android:fillColor="#121515"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M229.96,37.29c0.84,0 1.52,-0.68 1.52,-1.52s-0.68,-1.52 -1.52,-1.52 -1.52,0.68 -1.52,1.52 0.68,1.52 1.52,1.52Z"
+        android:strokeAlpha="0.4"
+        android:fillColor="#636f73"
+        android:fillType="evenOdd"
+        android:fillAlpha="0.4"/>
+  </group>
+</vector>
diff --git a/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_toolbar_top_active.xml b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_toolbar_top_active.xml
new file mode 100644
index 0000000000000..33ab78e22e680
--- /dev/null
+++ b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_toolbar_top_active.xml
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="463.21dp"
+    android:height="993.59dp"
+    android:viewportWidth="463.21"
+    android:viewportHeight="993.59">
+  <group>
+    <clip-path
+        android:pathData="M0,0h463.21v993.59h-463.21z"/>
+    <path
+        android:pathData="M0,34.74C0,15.55 15.55,0 34.74,0h390.26c19.19,0 34.74,15.55 34.74,34.74v924.11c0,19.19 -15.55,34.74 -34.74,34.74H34.74c-19.19,0 -34.74,-15.55 -34.74,-34.74V34.74Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="229.87"
+            android:startY="993.59"
+            android:endX="229.87"
+            android:endY="-40.08"
+            android:type="linear">
+          <item android:offset="0" android:color="#FF000000"/>
+          <item android:offset="0.37" android:color="#FF010101"/>
+          <item android:offset="0.51" android:color="#FF080808"/>
+          <item android:offset="0.6" android:color="#FF141414"/>
+          <item android:offset="0.68" android:color="#FF252525"/>
+          <item android:offset="0.75" android:color="#FF3B3B3B"/>
+          <item android:offset="0.8" android:color="#FF565656"/>
+          <item android:offset="0.86" android:color="#FF777777"/>
+          <item android:offset="0.91" android:color="#FF9C9C9C"/>
+          <item android:offset="0.95" android:color="#FFC7C7C7"/>
+          <item android:offset="0.99" android:color="#FFF5F5F5"/>
+          <item android:offset="1" android:color="#FFFFFFFF"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M15.18,10.3h434.36v52.46h-434.36z"
+        android:fillColor="#e2e2e2"/>
+    <path
+        android:pathData="M14.9,61.94h431.18v81.51h-431.18z"
+        android:fillColor="#e2e2e2"/>
+    <path
+        android:pathData="M51.21,76.55L261.99,76.55A26.02,26.02 0,0 1,288.01 102.57L288.01,102.58A26.02,26.02 0,0 1,261.99 128.6L51.21,128.6A26.02,26.02 0,0 1,25.19 102.58L25.19,102.57A26.02,26.02 0,0 1,51.21 76.55z"
+        android:fillColor="#fff"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M50.69,112.39c-0.5,0 -0.99,-0.13 -1.43,-0.37 -2.04,-1.14 -3.92,-2.91 -5.29,-4.99 -0.7,-1.06 -1.19,-2.34 -1.46,-3.82l-0.7,-3.78c-0.24,-1.26 0.37,-2.51 1.49,-3.12l5.91,-3.2c0.87,-0.47 1.91,-0.47 2.8,0l6.06,3.26c1.13,0.61 1.74,1.87 1.5,3.13l-0.7,3.72c-0.27,1.47 -0.77,2.75 -1.45,3.8 -1.37,2.08 -3.25,3.85 -5.29,5 -0.44,0.25 -0.94,0.37 -1.43,0.37ZM50.61,94.48c-0.2,0 -0.4,0.05 -0.58,0.15l-5.91,3.2c-0.47,0.26 -0.72,0.78 -0.62,1.31l0.7,3.78c0.23,1.25 0.64,2.32 1.21,3.18 1.22,1.86 2.89,3.43 4.69,4.44 0.37,0.21 0.83,0.21 1.2,0 1.81,-1.01 3.47,-2.58 4.69,-4.44 0.57,-0.86 0.97,-1.92 1.2,-3.17l0.7,-3.72c0.1,-0.53 -0.16,-1.05 -0.63,-1.31l-6.07,-3.26c-0.19,-0.1 -0.38,-0.15 -0.58,-0.15h0Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M50.21,105.34c-0.23,0 -0.45,-0.09 -0.61,-0.26l-2.73,-2.73 1.22,-1.22 2.12,2.12 3.82,-3.82 1.22,1.22 -4.43,4.43c-0.16,0.17 -0.38,0.26 -0.61,0.26Z"/>
+    <path
+        android:pathData="M72.44,92.97h194.46v19.22h-194.46z"
+        android:fillColor="#e2e2e2"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M313.58,103.55v7.73h1.72v-7.73h7.73v-1.72h-7.73v-7.73h-1.72v7.73h-7.73v1.72h7.73Z"/>
+    <path
+        android:pathData="M360.87,94.96L373.7,94.96A4.31,4.31 0,0 1,378.01 99.27L378.01,107.15A4.31,4.31 0,0 1,373.7 111.46L360.87,111.46A4.31,4.31 0,0 1,356.56 107.15L356.56,99.27A4.31,4.31 0,0 1,360.87 94.96z"
+        android:strokeWidth="1.12"
+        android:fillColor="#00000000"
+        android:strokeColor="#000"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M364.08,100.9h-0.03l-1.81,1.24v-1.14l1.83,-1.28h1.24v6.99h-1.23v-5.81Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M368.12,106.39c-0.41,-0.29 -0.73,-0.71 -0.95,-1.25s-0.33,-1.18 -0.33,-1.92h0c0,-0.75 0.11,-1.39 0.33,-1.93s0.54,-0.96 0.95,-1.25 0.9,-0.44 1.47,-0.44 1.06,0.15 1.47,0.44 0.73,0.71 0.95,1.25 0.33,1.18 0.33,1.92h0c0,0.75 -0.11,1.39 -0.33,1.93s-0.54,0.96 -0.95,1.25c-0.41,0.29 -0.9,0.44 -1.47,0.44s-1.06,-0.15 -1.47,-0.44ZM370.39,105.5c0.22,-0.21 0.39,-0.5 0.51,-0.89 0.12,-0.39 0.18,-0.85 0.18,-1.39h0c0,-0.55 -0.06,-1.01 -0.18,-1.4 -0.12,-0.39 -0.29,-0.68 -0.51,-0.89 -0.22,-0.21 -0.49,-0.31 -0.8,-0.31s-0.59,0.1 -0.81,0.31c-0.22,0.2 -0.39,0.5 -0.51,0.89 -0.12,0.39 -0.18,0.85 -0.18,1.39h0c0,0.55 0.06,1.01 0.18,1.4 0.12,0.39 0.28,0.69 0.51,0.89 0.22,0.21 0.49,0.31 0.81,0.31s0.58,-0.1 0.8,-0.31Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M421.63,94.61c0,-0.82 -0.67,-1.49 -1.49,-1.49s-1.49,0.67 -1.49,1.49 0.67,1.49 1.49,1.49 1.49,-0.67 1.49,-1.49Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M421.63,102.58c0,-0.82 -0.67,-1.49 -1.49,-1.49s-1.49,0.67 -1.49,1.49 0.67,1.49 1.49,1.49 1.49,-0.67 1.49,-1.49Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M421.63,110.54c0,-0.82 -0.67,-1.49 -1.49,-1.49s-1.49,0.67 -1.49,1.49 0.67,1.49 1.49,1.49 1.49,-0.67 1.49,-1.49Z"/>
+    <path
+        android:pathData="M6.95,34.74c0,-15.35 12.44,-27.79 27.79,-27.79h390.26c15.35,0 27.79,12.44 27.79,27.79v924.11c0,15.35 -12.44,27.79 -27.79,27.79H34.74c-15.35,0 -27.79,-12.44 -27.79,-27.79V34.74Z"
+        android:strokeWidth="15"
+        android:fillColor="#00000000"
+        android:strokeColor="#000"/>
+    <path
+        android:pathData="M459.74,361.31h1.16c1.28,0 2.32,0.9 2.32,2.01v56.19c0,1.11 -1.04,2.01 -2.32,2.01h-1.16v-60.22Z"
+        android:fillColor="#121515"/>
+    <path
+        android:pathData="M459.74,192.23h1.16c1.28,0 2.32,1.72 2.32,3.83v106.98c0,2.12 -1.04,3.83 -2.32,3.83h-1.16v-114.65Z"
+        android:fillColor="#121515"/>
+    <group>
+      <clip-path
+          android:pathData="M15.05,46.32c0,-17.27 14,-31.27 31.27,-31.27h367.1c17.27,0 31.27,14 31.27,31.27v891.69c0,17.27 -14,31.27 -31.27,31.27H46.32c-17.27,0 -31.27,-14 -31.27,-31.27V46.32Z"/>
+    </group>
+    <path
+        android:pathData="M229.96,50.97c6.72,0 12.16,-5.44 12.16,-12.16s-5.44,-12.16 -12.16,-12.16 -12.16,5.44 -12.16,12.16 5.44,12.16 12.16,12.16Z"
+        android:fillColor="#262c2d"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M229.96,46.41c4.2,0 7.6,-3.4 7.6,-7.6s-3.4,-7.6 -7.6,-7.6 -7.6,3.4 -7.6,7.6 3.4,7.6 7.6,7.6Z"
+        android:fillColor="#121515"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M229.96,37.29c0.84,0 1.52,-0.68 1.52,-1.52s-0.68,-1.52 -1.52,-1.52 -1.52,0.68 -1.52,1.52 0.68,1.52 1.52,1.52Z"
+        android:strokeAlpha="0.4"
+        android:fillColor="#636f73"
+        android:fillType="evenOdd"
+        android:fillAlpha="0.4"/>
+    <path
+        android:pathData="M150.03,260.7c-13.61,12.94 -21.69,11.29 -21.67,17.38 0.01,2.88 4.76,2.87 4.99,5.74 0.36,4.49 -12.27,6.02 -11.28,10.43 1.17,5.23 7.71,4.72 9.95,5.52 4.23,1.5 -3.58,3.35 -1.46,7.24 3.02,5.56 16.73,1.41 26.16,7.45 5.54,3.55 10.13,17.22 12.72,22.43 5,10.05 7.04,17.84 14.41,32.6 7.48,14.98 13.35,23.62 20.56,23.97 6.22,0.3 13.02,-9.14 18.96,-25.97 4.64,-13.12 5.73,-16.12 9.03,-22.08 0.19,-0.34 9.3,-1.98 13.42,-2.64 2.95,-0.48 5.5,9.01 17.2,24.22 10.06,13.08 17.24,18.89 24.49,16.49 6.11,-2.03 10.69,-21.69 13.15,-37.22 2.03,-12.87 2.06,-14.1 2.99,-18.82 2.07,-10.53 4.7,-26.84 11.16,-33.21 8.2,-8.09 18.18,-6.18 19.87,-12.25 1.96,-7.03 -4.6,-4.31 -3.93,-5.86 1.12,-2.59 10.71,-2.61 10.43,-8.57 -0.23,-4.89 -9.23,-1.95 -9.45,-4.17 -0.31,-3.03 6.2,-5.02 5.83,-8.04 -0.92,-7.61 -20.13,-4.69 -34.14,-17.21 -10.36,-9.26 -11.41,-25.82 -9.02,-48.75 1.73,-16.57 6.14,-45.9 6.14,-45.9h-142.75s5.75,41.05 7.86,52.9c4.19,23.53 -3.88,53.17 -15.64,64.35Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="470.13"
+            android:startY="268.45"
+            android:endX="91.12"
+            android:endY="268.45"
+            android:type="linear">
+          <item android:offset="0" android:color="#00FF6600"/>
+          <item android:offset="0.03" android:color="#2BFF6600"/>
+          <item android:offset="0.07" android:color="#5BFF6600"/>
+          <item android:offset="0.11" android:color="#87FF6600"/>
+          <item android:offset="0.16" android:color="#ADFF6600"/>
+          <item android:offset="0.2" android:color="#CCFF6600"/>
+          <item android:offset="0.25" android:color="#E2FF6600"/>
+          <item android:offset="0.3" android:color="#F2FF6600"/>
+          <item android:offset="0.36" android:color="#FCFF6600"/>
+          <item android:offset="0.43" android:color="#FFFF6600"/>
+          <item android:offset="0.72" android:color="#FFFD4737"/>
+          <item android:offset="1" android:color="#FFFB2872"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <group>
+      <clip-path
+          android:pathData="M150.03,260.7c-13.61,12.94 -21.69,11.29 -21.67,17.38 0.01,2.88 4.76,2.87 4.99,5.74 0.36,4.49 -12.27,6.02 -11.28,10.43 1.17,5.23 7.71,4.72 9.95,5.52 4.23,1.5 -3.58,3.35 -1.46,7.24 3.02,5.56 16.73,1.41 26.16,7.45 5.54,3.55 10.13,17.22 12.72,22.43 5,10.05 7.04,17.84 14.41,32.6 7.48,14.98 13.35,23.62 20.56,23.97 6.22,0.3 13.02,-9.14 18.96,-25.97 4.64,-13.12 5.73,-16.12 9.03,-22.08 0.19,-0.34 9.3,-1.98 13.42,-2.64 2.95,-0.48 5.5,9.01 17.2,24.22 10.06,13.08 17.24,18.89 24.49,16.49 6.11,-2.03 10.69,-21.69 13.15,-37.22 2.03,-12.87 2.06,-14.1 2.99,-18.82 2.07,-10.53 4.7,-26.84 11.16,-33.21 8.2,-8.09 18.18,-6.18 19.87,-12.25 1.96,-7.03 -4.6,-4.31 -3.93,-5.86 1.12,-2.59 10.71,-2.61 10.43,-8.57 -0.23,-4.89 -9.23,-1.95 -9.45,-4.17 -0.31,-3.03 6.2,-5.02 5.83,-8.04 -0.92,-7.61 -20.13,-4.69 -34.14,-17.21 -10.36,-9.26 -11.41,-25.82 -9.02,-48.75 1.73,-16.57 6.14,-45.9 6.14,-45.9h-142.75s5.75,41.05 7.86,52.9c4.19,23.53 -3.88,53.17 -15.64,64.35Z"/>
+      <path
+          android:pathData="M37.37,39.15l377.67,-48.81l-70.39,422.68l-203.01,1.23l-104.27,-375.1z">
+        <aapt:attr name="android:fillColor">
+          <gradient
+              android:startX="237.72"
+              android:startY="360.4"
+              android:endX="227.52"
+              android:endY="54.2"
+              android:type="linear">
+            <item android:offset="0" android:color="#FFFF6600"/>
+            <item android:offset="0.33" android:color="#FFFFB029"/>
+            <item android:offset="0.46" android:color="#FFFF9218"/>
+            <item android:offset="0.63" android:color="#FFFF6600"/>
+            <item android:offset="1" android:color="#FFFB2872"/>
+          </gradient>
+        </aapt:attr>
+      </path>
+      <path
+          android:pathData="M236.39,344.91s-19.49,3.79 -38.55,-4.35c-17.39,-7.42 -35.35,-14.88 -36.62,-15.12 -1.27,-0.25 6.8,67.9 6.8,67.9l31.55,7.93s31.84,-1.81 31.92,-4.39c0.08,-2.57 4.9,-51.98 4.9,-51.98Z">
+        <aapt:attr name="android:fillColor">
+          <gradient
+              android:startX="198.59"
+              android:startY="339.28"
+              android:endX="191.53"
+              android:endY="406.33"
+              android:type="linear">
+            <item android:offset="0" android:color="#00FF6600"/>
+            <item android:offset="0.03" android:color="#2BFF6600"/>
+            <item android:offset="0.07" android:color="#5BFF6600"/>
+            <item android:offset="0.11" android:color="#87FF6600"/>
+            <item android:offset="0.16" android:color="#ADFF6600"/>
+            <item android:offset="0.2" android:color="#CCFF6600"/>
+            <item android:offset="0.25" android:color="#E2FF6600"/>
+            <item android:offset="0.3" android:color="#F2FF6600"/>
+            <item android:offset="0.36" android:color="#FCFF6600"/>
+            <item android:offset="0.43" android:color="#FFFF6600"/>
+            <item android:offset="0.72" android:color="#FFFD4737"/>
+            <item android:offset="1" android:color="#FFFB2872"/>
+          </gradient>
+        </aapt:attr>
+      </path>
+      <path
+          android:pathData="M243.74,345.01s19.86,-0.76 36.46,-13.02c15.15,-11.18 30.85,-22.52 32.03,-23.05 1.18,-0.53 9.5,67.59 9.5,67.59l-28.8,14.91s-31.4,5.49 -32.08,3.01c-0.68,-2.48 -17.1,-49.44 -17.1,-49.44Z">
+        <aapt:attr name="android:fillColor">
+          <gradient
+              android:startX="279.06"
+              android:startY="330.35"
+              android:endX="301.52"
+              android:endY="393.89"
+              android:type="linear">
+            <item android:offset="0" android:color="#00FF6600"/>
+            <item android:offset="0.03" android:color="#2BFF6600"/>
+            <item android:offset="0.07" android:color="#5BFF6600"/>
+            <item android:offset="0.11" android:color="#87FF6600"/>
+            <item android:offset="0.16" android:color="#ADFF6600"/>
+            <item android:offset="0.2" android:color="#CCFF6600"/>
+            <item android:offset="0.25" android:color="#E2FF6600"/>
+            <item android:offset="0.3" android:color="#F2FF6600"/>
+            <item android:offset="0.36" android:color="#FCFF6600"/>
+            <item android:offset="0.43" android:color="#FFFF6600"/>
+            <item android:offset="0.72" android:color="#FFFD4737"/>
+            <item android:offset="1" android:color="#FFFB2872"/>
+          </gradient>
+        </aapt:attr>
+      </path>
+      <path
+          android:pathData="M138.16,-23.85c-79.62,-1.08 -39.88,324.36 -14.48,324.3 19,-0.05 35.18,-3.25 50.49,-12.23 13.16,-7.72 26.47,-21.3 29.65,-19.77 7.57,3.65 19.71,17.09 37.65,11.39 14.03,-4.46 18.37,-13.09 23.38,-17.32 3.75,-3.17 12.58,6.12 26.55,11.63 17.78,7.02 41.68,6.4 60.81,-11.24 18.36,-16.93 8.67,-283.89 -41.72,-283.79 -19.31,0.04 -153.02,-2.7 -172.33,-2.96Z"
+          android:strokeAlpha="0.6"
+          android:fillAlpha="0.6">
+        <aapt:attr name="android:fillColor">
+          <gradient
+              android:startX="221.93"
+              android:startY="286.2"
+              android:endX="229.37"
+              android:endY="34.02"
+              android:type="linear">
+            <item android:offset="0" android:color="#FFFFEB49"/>
+            <item android:offset="0.36" android:color="#99FFB52B"/>
+            <item android:offset="0.67" android:color="#47FF8A14"/>
+            <item android:offset="0.89" android:color="#14FF7005"/>
+            <item android:offset="1" android:color="#00FF6600"/>
+          </gradient>
+        </aapt:attr>
+      </path>
+      <path
+          android:pathData="M228.42,194.3s21.33,-16.07 14.88,-56.61c-5.17,-32.46 -9.41,-39.97 -12.67,-60.57 -3.26,-20.6 -6.75,-44.39 -6.75,-44.39 0,0 -2.94,23 -6.9,44.91 -2.83,15.66 -8.5,36.75 -11.53,62.08 -4.89,40.81 22.97,54.57 22.97,54.57Z"
+          android:strokeAlpha="0.6"
+          android:fillAlpha="0.6">
+        <aapt:attr name="android:fillColor">
+          <gradient
+              android:startX="225.11"
+              android:startY="160.03"
+              android:endX="218.17"
+              android:endY="7.28"
+              android:type="linear">
+            <item android:offset="0" android:color="#FFFFD400"/>
+            <item android:offset="0.09" android:color="#F4FFD100"/>
+            <item android:offset="0.24" android:color="#D6FFCB00"/>
+            <item android:offset="0.44" android:color="#A8FFC000"/>
+            <item android:offset="0.67" android:color="#66FFB200"/>
+            <item android:offset="0.94" android:color="#11FFA000"/>
+            <item android:offset="1" android:color="#00FF9C00"/>
+          </gradient>
+        </aapt:attr>
+      </path>
+      <path
+          android:pathData="M253.11,29a59.71,58.15 0,1 0,119.42 0a59.71,58.15 0,1 0,-119.42 0z"
+          android:strokeAlpha="0.38"
+          android:fillAlpha="0.38">
+        <aapt:attr name="android:fillColor">
+          <gradient
+              android:centerX="314.28"
+              android:centerY="22"
+              android:gradientRadius="60.94"
+              android:type="radial">
+            <item android:offset="0" android:color="#FFFFD400"/>
+            <item android:offset="0.41" android:color="#96FFBD00"/>
+            <item android:offset="0.99" android:color="#00FF9C00"/>
+          </gradient>
+        </aapt:attr>
+      </path>
+    </group>
+    <path
+        android:pathData="M242.09,283.72c-13.33,3.73 -23.95,-6.9 -37.19,-14.4 -11.44,-6.48 -4.81,-27.41 19.39,-32.78 32.58,-7.23 50.71,16.98 41.16,25.78 -9.89,9.12 -12.17,18.26 -23.37,21.39Z"
+        android:fillColor="#ffcf34"/>
+    <path
+        android:pathData="M240.18,277.85c5.21,-0.55 7.8,-3.02 8.39,-5.14 0.73,-2.61 -2.09,-7.59 -8.49,-6.92 -6.08,0.63 -9.02,5.89 -7.92,8.57 0.79,1.9 3.42,3.98 8.02,3.49Z"
+        android:fillColor="#200041"/>
+    <path
+        android:pathData="M242.66,278.06c-13.33,3.8 -25.25,-7.23 -38.49,-14.88 -11.44,-6.61 -4.81,-27.96 19.39,-33.45 32.58,-7.38 50.71,17.33 41.16,26.31 -9.89,9.31 -10.87,18.82 -22.07,22.02Z"
+        android:fillColor="#ffc635"/>
+    <path
+        android:pathData="M239.45,270.88c5.21,-0.56 7.8,-3.08 8.39,-5.24 0.73,-2.66 -2.09,-7.74 -8.49,-7.06 -6.08,0.65 -9.02,6.01 -7.92,8.74 0.79,1.94 3.42,4.06 8.02,3.56Z"
+        android:fillColor="#200041"/>
+    <path
+        android:pathData="M218.07,290.75c-0.68,-6.98 -6.22,-9.46 -9.29,-9.04 -5.88,0.81 -9.43,1.97 -8.57,11.11 1.09,11.64 5.58,15.18 11.78,14.25 6.5,-0.97 7.01,-6.81 6.08,-16.33Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="215.94"
+            android:startY="314.47"
+            android:endX="205.83"
+            android:endY="282.41"
+            android:type="linear">
+          <item android:offset="0.16" android:color="#FFA030B9"/>
+          <item android:offset="0.88" android:color="#FF00073A"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M206.77,298.39m-2.9,0a2.9,2.9 0,1 1,5.8 0a2.9,2.9 0,1 1,-5.8 0"
+        android:fillColor="#fff"/>
+    <path
+        android:pathData="M276.23,285.29c-0.64,-9.71 -5.99,-10.97 -9.16,-10.53 -6.07,0.84 -9.54,2.21 -9.12,9.31 0.67,11.34 3.68,17.87 11.95,16.25 5.21,-1.02 6.85,-7.15 6.33,-15.04Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="272.61"
+            android:startY="306.32"
+            android:endX="264.93"
+            android:endY="278.2"
+            android:type="linear">
+          <item android:offset="0.16" android:color="#FFA030B9"/>
+          <item android:offset="0.88" android:color="#FF00073A"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M264.76,291.66m-2.83,0a2.83,2.83 0,1 1,5.66 0a2.83,2.83 0,1 1,-5.66 0"
+        android:fillColor="#fff"/>
+  </group>
+</vector>
diff --git a/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_toolbar_top_inactive.xml b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_toolbar_top_inactive.xml
new file mode 100644
index 0000000000000..31aa44c3fd80a
--- /dev/null
+++ b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_toolbar_top_inactive.xml
@@ -0,0 +1,105 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="463.21dp"
+    android:height="993.59dp"
+    android:viewportWidth="463.21"
+    android:viewportHeight="993.59">
+  <group>
+    <clip-path
+        android:pathData="M0,0h463.21v993.59h-463.21z"/>
+    <path
+        android:pathData="M0,34.74C0,15.55 15.55,0 34.74,0h390.26c19.19,0 34.74,15.55 34.74,34.74v924.11c0,19.19 -15.55,34.74 -34.74,34.74H34.74c-19.19,0 -34.74,-15.55 -34.74,-34.74V34.74Z">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:startX="229.87"
+            android:startY="993.59"
+            android:endX="229.87"
+            android:endY="-94.77"
+            android:type="linear">
+          <item android:offset="0" android:color="#FF000000"/>
+          <item android:offset="0.34" android:color="#FF010101"/>
+          <item android:offset="0.48" android:color="#FF080808"/>
+          <item android:offset="0.58" android:color="#FF151515"/>
+          <item android:offset="0.66" android:color="#FF262626"/>
+          <item android:offset="0.73" android:color="#FF3D3D3D"/>
+          <item android:offset="0.79" android:color="#FF595959"/>
+          <item android:offset="0.85" android:color="#FF7A7A7A"/>
+          <item android:offset="0.9" android:color="#FFA1A1A1"/>
+          <item android:offset="0.95" android:color="#FFCCCCCC"/>
+          <item android:offset="1" android:color="#FFFBFBFB"/>
+          <item android:offset="1" android:color="#FFFFFFFF"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M15.18,10.3h434.36v52.46h-434.36z"
+        android:fillColor="#e2e2e2"/>
+    <path
+        android:pathData="M14.9,61.94h431.18v81.51h-431.18z"
+        android:fillColor="#e2e2e2"/>
+    <path
+        android:pathData="M51.21,76.55L261.99,76.55A26.02,26.02 0,0 1,288.01 102.57L288.01,102.58A26.02,26.02 0,0 1,261.99 128.6L51.21,128.6A26.02,26.02 0,0 1,25.19 102.58L25.19,102.57A26.02,26.02 0,0 1,51.21 76.55z"
+        android:fillColor="#fff"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M50.69,112.39c-0.5,0 -0.99,-0.13 -1.43,-0.37 -2.04,-1.14 -3.92,-2.91 -5.29,-4.99 -0.7,-1.06 -1.19,-2.34 -1.46,-3.82l-0.7,-3.78c-0.24,-1.26 0.37,-2.51 1.49,-3.12l5.91,-3.2c0.87,-0.47 1.91,-0.47 2.8,0l6.06,3.26c1.13,0.61 1.74,1.87 1.5,3.13l-0.7,3.72c-0.27,1.47 -0.77,2.75 -1.45,3.8 -1.37,2.08 -3.25,3.85 -5.29,5 -0.44,0.25 -0.94,0.37 -1.43,0.37ZM50.61,94.48c-0.2,0 -0.4,0.05 -0.58,0.15l-5.91,3.2c-0.47,0.26 -0.72,0.78 -0.62,1.31l0.7,3.78c0.23,1.25 0.64,2.32 1.21,3.18 1.22,1.86 2.89,3.43 4.69,4.44 0.37,0.21 0.83,0.21 1.2,0 1.81,-1.01 3.47,-2.58 4.69,-4.44 0.57,-0.86 0.97,-1.92 1.2,-3.17l0.7,-3.72c0.1,-0.53 -0.16,-1.05 -0.63,-1.31l-6.07,-3.26c-0.19,-0.1 -0.38,-0.15 -0.58,-0.15h0Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M50.21,105.34c-0.23,0 -0.45,-0.09 -0.61,-0.26l-2.73,-2.73 1.22,-1.22 2.12,2.12 3.82,-3.82 1.22,1.22 -4.43,4.43c-0.16,0.17 -0.38,0.26 -0.61,0.26Z"/>
+    <path
+        android:pathData="M72.44,92.97h194.46v19.22h-194.46z"
+        android:fillColor="#e2e2e2"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M313.58,103.55v7.73h1.72v-7.73h7.73v-1.72h-7.73v-7.73h-1.72v7.73h-7.73v1.72h7.73Z"/>
+    <path
+        android:pathData="M360.87,94.96L373.7,94.96A4.31,4.31 0,0 1,378.01 99.27L378.01,107.15A4.31,4.31 0,0 1,373.7 111.46L360.87,111.46A4.31,4.31 0,0 1,356.56 107.15L356.56,99.27A4.31,4.31 0,0 1,360.87 94.96z"
+        android:strokeWidth="1.12"
+        android:fillColor="#00000000"
+        android:strokeColor="#000"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M364.08,100.9h-0.03l-1.81,1.24v-1.14l1.83,-1.28h1.24v6.99h-1.23v-5.81Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M368.12,106.39c-0.41,-0.29 -0.73,-0.71 -0.95,-1.25s-0.33,-1.18 -0.33,-1.92h0c0,-0.75 0.11,-1.39 0.33,-1.93s0.54,-0.96 0.95,-1.25 0.9,-0.44 1.47,-0.44 1.06,0.15 1.47,0.44 0.73,0.71 0.95,1.25 0.33,1.18 0.33,1.92h0c0,0.75 -0.11,1.39 -0.33,1.93s-0.54,0.96 -0.95,1.25c-0.41,0.29 -0.9,0.44 -1.47,0.44s-1.06,-0.15 -1.47,-0.44ZM370.39,105.5c0.22,-0.21 0.39,-0.5 0.51,-0.89 0.12,-0.39 0.18,-0.85 0.18,-1.39h0c0,-0.55 -0.06,-1.01 -0.18,-1.4 -0.12,-0.39 -0.29,-0.68 -0.51,-0.89 -0.22,-0.21 -0.49,-0.31 -0.8,-0.31s-0.59,0.1 -0.81,0.31c-0.22,0.2 -0.39,0.5 -0.51,0.89 -0.12,0.39 -0.18,0.85 -0.18,1.39h0c0,0.55 0.06,1.01 0.18,1.4 0.12,0.39 0.28,0.69 0.51,0.89 0.22,0.21 0.49,0.31 0.81,0.31s0.58,-0.1 0.8,-0.31Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M421.63,94.61c0,-0.82 -0.67,-1.49 -1.49,-1.49s-1.49,0.67 -1.49,1.49 0.67,1.49 1.49,1.49 1.49,-0.67 1.49,-1.49Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M421.63,102.58c0,-0.82 -0.67,-1.49 -1.49,-1.49s-1.49,0.67 -1.49,1.49 0.67,1.49 1.49,1.49 1.49,-0.67 1.49,-1.49Z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M421.63,110.54c0,-0.82 -0.67,-1.49 -1.49,-1.49s-1.49,0.67 -1.49,1.49 0.67,1.49 1.49,1.49 1.49,-0.67 1.49,-1.49Z"/>
+    <path
+        android:pathData="M6.95,34.74c0,-15.35 12.44,-27.79 27.79,-27.79h390.26c15.35,0 27.79,12.44 27.79,27.79v924.11c0,15.35 -12.44,27.79 -27.79,27.79H34.74c-15.35,0 -27.79,-12.44 -27.79,-27.79V34.74Z"
+        android:strokeWidth="15"
+        android:fillColor="#00000000"
+        android:strokeColor="#000"/>
+    <path
+        android:pathData="M459.74,361.31h1.16c1.28,0 2.32,0.9 2.32,2.01v56.19c0,1.11 -1.04,2.01 -2.32,2.01h-1.16v-60.22Z"
+        android:fillColor="#121515"/>
+    <path
+        android:pathData="M459.74,192.23h1.16c1.28,0 2.32,1.72 2.32,3.83v106.98c0,2.12 -1.04,3.83 -2.32,3.83h-1.16v-114.65Z"
+        android:fillColor="#121515"/>
+    <group>
+      <clip-path
+          android:pathData="M15.05,46.32c0,-17.27 14,-31.27 31.27,-31.27h367.1c17.27,0 31.27,14 31.27,31.27v891.69c0,17.27 -14,31.27 -31.27,31.27H46.32c-17.27,0 -31.27,-14 -31.27,-31.27V46.32Z"/>
+    </group>
+    <path
+        android:pathData="M229.96,50.97c6.72,0 12.16,-5.44 12.16,-12.16s-5.44,-12.16 -12.16,-12.16 -12.16,5.44 -12.16,12.16 5.44,12.16 12.16,12.16Z"
+        android:fillColor="#262c2d"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M229.96,46.41c4.2,0 7.6,-3.4 7.6,-7.6s-3.4,-7.6 -7.6,-7.6 -7.6,3.4 -7.6,7.6 3.4,7.6 7.6,7.6Z"
+        android:fillColor="#121515"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M229.96,37.29c0.84,0 1.52,-0.68 1.52,-1.52s-0.68,-1.52 -1.52,-1.52 -1.52,0.68 -1.52,1.52 0.68,1.52 1.52,1.52Z"
+        android:strokeAlpha="0.4"
+        android:fillColor="#636f73"
+        android:fillType="evenOdd"
+        android:fillAlpha="0.4"/>
+  </group>
+</vector>
diff --git a/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_tou.xml b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_tou.xml
new file mode 100644
index 0000000000000..5c56d94f27f6e
--- /dev/null
+++ b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_tou.xml
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="257dp"
+    android:height="297dp"
+    android:viewportWidth="257"
+    android:viewportHeight="297">
+  <path
+      android:pathData="M255.13,92.84C254.78,88.4 244.9,87.29 240.61,80.76C239.27,78.71 238.91,75.34 238.91,71.66C238.9,68.45 239.17,65.01 239.29,62.01C239.57,54.95 239.27,51.07 239.34,39.13C239.4,29.66 238.23,19.16 233.87,16.69C229.82,14.4 223.3,18.86 214.02,27.38C208.85,32.14 205.46,36.25 201.91,39.18C201.7,39.36 201.49,39.55 201.27,39.71C201.06,39.88 195.75,38.51 192.65,37.89C191.98,37.75 191.57,36.98 191.23,35.59C190.48,32.48 190.08,26.29 187.92,17.24C185.22,5.97 181.56,0.46 176.28,0.01C171.82,-0.37 164.09,10.85 158.14,20.25C153.21,28.02 152.85,28.82 150.92,31.62C149.52,33.66 147.9,36.08 146.16,38.5C142.56,43.5 138.41,48.48 134.44,50.06C126.94,53.03 121.14,49.03 118.35,52.49C115.67,55.81 118.58,56.42 119.18,57C135.25,61.06 139.1,82.47 146.53,80.61C152.86,79.02 157.03,85.76 170.08,87.38C183.06,89 184.54,95.99 194.27,94.18C214.76,90.37 231.88,89.45 251.76,96.68C250.75,95.12 255.35,95.7 255.13,92.84Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="210.86"
+          android:startY="-1.81"
+          android:endX="164.03"
+          android:endY="142.01"
+          android:type="linear">
+        <item android:offset="0.17" android:color="#FFFF6600"/>
+        <item android:offset="0.54" android:color="#FFFF9C00"/>
+        <item android:offset="0.9" android:color="#FFFF6800"/>
+        <item android:offset="0.91" android:color="#FFFF6600"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M222.28,52.74C229.01,60.54 235.95,68.44 238.91,71.66C238.9,68.45 239.17,65.01 239.29,62.01C239.57,54.95 239.27,51.07 239.34,39.13C239.4,29.66 238.23,19.16 233.87,16.69C229.82,14.4 223.3,18.86 214.02,27.38C208.85,32.14 205.46,36.25 201.91,39.18C206.14,40.69 215.32,44.69 222.28,52.74Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="223.4"
+          android:startY="49.79"
+          android:endX="248.44"
+          android:endY="10.15"
+          android:type="linear">
+        <item android:offset="0" android:color="#00FF6600"/>
+        <item android:offset="0.43" android:color="#FFFF6600"/>
+        <item android:offset="0.72" android:color="#FFFD4838"/>
+        <item android:offset="1" android:color="#FFFB2872"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M191.23,35.59C190.48,32.48 190.08,26.29 187.92,17.24C185.22,5.97 181.56,0.46 176.28,0.01C171.82,-0.37 164.1,10.85 158.14,20.25C153.21,28.02 152.85,28.82 150.92,31.62C149.52,33.66 147.9,36.08 146.16,38.5C151.26,37.66 160.37,36.03 169.3,34.37C178.09,32.73 186.27,34.22 191.23,35.59Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="169.31"
+          android:startY="33.27"
+          android:endX="174.87"
+          android:endY="-13.39"
+          android:type="linear">
+        <item android:offset="0" android:color="#00FF6600"/>
+        <item android:offset="0.04" android:color="#1AFF6600"/>
+        <item android:offset="0.42" android:color="#FFFF6600"/>
+        <item android:offset="0.7" android:color="#FFFD4838"/>
+        <item android:offset="0.97" android:color="#FFFB2872"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M251.77,96.68C232.42,89.64 215.5,90.34 195.5,93.97C193.48,94.33 191.84,94.66 189.63,94.37C194.11,99.15 181.08,111.48 165.58,108.52C160.29,107.51 156.01,105.89 152.61,103.9C141.16,97.23 139.86,86.67 144.02,81.29C144.2,81.05 144.4,80.81 144.6,80.56C138.31,78.74 133.8,60.7 119.18,57C119.3,57.12 119.33,57.24 119.19,57.38C117.74,58.75 111.64,56.11 110.14,60.05C108.9,63.28 115.45,63.87 114.96,65.37C114.3,67.42 109.61,66.91 108.98,68.97C107.94,72.42 110.17,72.2 115.89,77.38C118.77,79.98 122.53,83.95 127.2,90.45C134.63,100.8 135.14,124.5 134.22,140.78C133.76,148.92 129.62,167.04 129.14,176.6C128.65,186.44 129.67,195.29 129.92,203.08C129.98,206.91 129.91,212.24 129.03,216.02C126.8,227.24 120.18,229.03 117.76,243.79C114.13,265.98 138.29,274.31 138.02,274.38C137.96,274.4 137.89,274.42 137.79,274.44C139.02,274.58 140.23,274.73 141.39,274.87C146.67,275.52 151.25,276.13 155.19,276.68C156.71,276.9 158.33,277.1 159.68,277.3C159.27,279.73 158.63,282.54 158.01,284.36C157.14,286.9 156.24,291.53 157.5,293.66C160.04,297.93 175.73,297.29 176.46,292.24C176.82,289.77 177.06,286.76 177.2,283.35C177.2,283.36 177.2,283.37 177.2,283.39C178.98,283.31 179.1,283.33 180.26,283.4C180.27,283.91 180.46,288.59 180.99,292.24C181.73,297.29 197.42,297.93 199.95,293.66C201.2,291.55 200.32,286.91 199.45,284.36C199.04,283.16 198.61,281.47 198.24,279.73C200.21,279.33 223,274.67 224.91,274.37C224.94,274.27 225.06,274.18 225.3,274.1C235.74,270.5 247.6,254.5 242.12,239.56C238.99,231.01 233.18,226.95 229.93,221.24C223.18,209.41 228.33,206.64 225.37,175.07C224.07,161.32 220.47,145.12 219,136.74C216.1,120.09 219.86,120.19 229.67,117.46C242.32,113.93 246.64,116.15 248.35,112.2C249.15,110.33 246.14,109.02 246.8,107.1C247.84,104.08 256.3,106.59 256.92,103.46C257.71,99.45 252.75,98.18 251.77,96.68Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="182.87"
+          android:startY="52.62"
+          android:endX="182.87"
+          android:endY="311.16"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFF6600"/>
+        <item android:offset="0.01" android:color="#FFFF7508"/>
+        <item android:offset="0.04" android:color="#FFFF8B14"/>
+        <item android:offset="0.07" android:color="#FFFF9C1E"/>
+        <item android:offset="0.11" android:color="#FFFFA724"/>
+        <item android:offset="0.17" android:color="#FFFFAE28"/>
+        <item android:offset="0.33" android:color="#FFFFB029"/>
+        <item android:offset="0.46" android:color="#FFFF9319"/>
+        <item android:offset="0.63" android:color="#FFFF6600"/>
+        <item android:offset="0.64" android:color="#FFFE5E10"/>
+        <item android:offset="0.69" android:color="#FFFD4A33"/>
+        <item android:offset="0.74" android:color="#FFFC3B4F"/>
+        <item android:offset="0.79" android:color="#FFFC3162"/>
+        <item android:offset="0.84" android:color="#FFFB2A6E"/>
+        <item android:offset="0.89" android:color="#FFFB2872"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M251.77,96.68C232.42,89.64 215.5,90.34 195.5,93.97C193.48,94.33 191.84,94.66 189.63,94.37C194.11,99.15 181.08,111.48 165.58,108.52C160.29,107.51 156.01,105.89 152.61,103.9C141.16,97.23 139.86,86.67 144.02,81.29C144.2,81.05 144.4,80.81 144.6,80.56C138.31,78.74 133.8,60.7 119.18,57C119.3,57.12 119.33,57.24 119.19,57.38C117.74,58.75 111.64,56.11 110.14,60.05C108.9,63.28 115.45,63.87 114.96,65.37C114.3,67.42 109.61,66.91 108.98,68.97C107.94,72.42 110.17,72.2 115.89,77.38C118.77,79.98 122.53,83.95 127.2,90.45C134.63,100.8 135.14,124.5 134.22,140.78C133.76,148.92 129.62,167.04 129.14,176.6C128.65,186.44 129.67,195.29 129.92,203.08C129.98,206.91 129.91,212.24 129.03,216.02C126.8,227.24 120.18,229.03 117.76,243.79C114.13,265.98 138.29,274.31 138.02,274.38C137.96,274.4 137.89,274.42 137.79,274.44C139.02,274.58 140.23,274.73 141.39,274.87C146.67,275.52 151.25,276.13 155.19,276.68C156.71,276.9 158.33,277.1 159.68,277.3C159.27,279.73 158.63,282.54 158.01,284.36C157.14,286.89 156.24,291.53 157.5,293.66C160.04,297.93 175.73,297.29 176.46,292.24C176.82,289.77 177.06,286.76 177.2,283.35C177.2,283.36 177.2,283.37 177.2,283.39C178.98,283.31 179.1,283.33 180.26,283.4C180.27,283.91 180.46,288.59 180.99,292.24C181.73,297.29 197.42,297.93 199.95,293.66C201.2,291.55 200.32,286.91 199.45,284.36C199.04,283.16 198.61,281.47 198.24,279.73C200.21,279.33 223,274.67 224.91,274.37C224.94,274.27 225.06,274.18 225.3,274.1C235.74,270.5 247.6,254.5 242.12,239.56C238.99,231.01 233.18,226.95 229.93,221.24C223.18,209.41 228.33,206.64 225.37,175.07C224.07,161.32 220.47,145.12 219,136.74C216.1,120.09 219.86,120.19 229.67,117.46C242.32,113.93 246.64,116.15 248.35,112.2C249.15,110.33 246.14,109.02 246.8,107.1C247.84,104.08 256.3,106.59 256.92,103.46C257.71,99.45 252.75,98.18 251.77,96.68Z"
+      android:strokeAlpha="0.6"
+      android:fillAlpha="0.6">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="182.87"
+          android:startY="52.62"
+          android:endX="182.87"
+          android:endY="311.16"
+          android:type="linear">
+        <item android:offset="0" android:color="#CCFFEB49"/>
+        <item android:offset="0.43" android:color="#75FFAC27"/>
+        <item android:offset="0.81" android:color="#26FF7A0B"/>
+        <item android:offset="1" android:color="#00FF6600"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M137.99,274.44C138.09,274.42 138.17,274.4 138.23,274.38C138.49,274.31 114.34,265.97 117.97,243.78C119.58,233.97 123.15,229.77 126.37,224.05C126.55,223.72 126.72,223.38 126.86,223.02C127.18,222.19 127.67,220.83 128.02,219.82C125.53,219.32 122.46,218.54 118.12,216.8C78.7,201.05 77.16,161.01 79.76,122.21C81.77,92.25 48.55,79.45 48.55,79.45C48.55,79.45 57.83,95.2 41.6,109.78C22.82,126.64 4.75,150.73 5.52,186.96C5.55,188.65 5.88,193 5.88,193C5.88,193 4.63,192.4 2.98,190.69C0.87,188.49 0.03,187.1 0.03,187.1C0.03,187.1 -0.65,197.43 4.21,213.18C11.44,236.64 26.47,257.22 49.6,271.38C72.15,285.18 90.44,286.01 123.59,286.05C123.6,284.79 124.14,283.26 125.75,281.3C130.27,275.76 136.49,274.75 137.99,274.44ZM61.03,244.09C53.42,253.18 36.93,244.39 27.21,219.97C19.56,188.79 23.74,171.82 23.67,171.85C23.67,171.85 24.85,175.99 26.52,181C27.84,184.97 29.42,187.42 29.96,188.2C29.84,186.07 30.71,176.54 32.36,167.65C34.59,155.68 38.43,146.31 38.43,146.31C38.43,146.31 38.04,158.67 39.26,169.3C41.29,187.01 45.44,207.16 52.95,217.78C59,226.33 68.64,235 61.03,244.09Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="7.16"
+          android:startY="94.58"
+          android:endX="107.09"
+          android:endY="292.91"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFEB49"/>
+        <item android:offset="0.45" android:color="#FFFF6600"/>
+        <item android:offset="0.54" android:color="#FFFF6109"/>
+        <item android:offset="0.69" android:color="#FFFF5423"/>
+        <item android:offset="0.82" android:color="#FFFF453F"/>
+        <item android:offset="1" android:color="#FFFB2872"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M39.26,169.3C38.05,158.67 38.43,146.31 38.43,146.31C38.43,146.31 34.59,155.68 32.36,167.65C30.71,176.54 29.84,186.07 29.96,188.2C29.42,187.42 27.84,184.97 26.52,181C24.85,175.99 23.67,171.85 23.67,171.85C23.74,171.82 19.56,188.8 27.21,219.97C36.93,244.39 53.42,253.18 61.03,244.09C68.64,235 59,226.33 52.95,217.78C45.44,207.16 41.3,187.01 39.26,169.3Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="-8.1"
+          android:startY="102.27"
+          android:endX="91.83"
+          android:endY="300.6"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFE500"/>
+        <item android:offset="0.45" android:color="#FFFF6D00"/>
+        <item android:offset="0.54" android:color="#FFFF6709"/>
+        <item android:offset="0.69" android:color="#FFFF5723"/>
+        <item android:offset="0.82" android:color="#FFFF453F"/>
+        <item android:offset="1" android:color="#FFFB0372"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M39.26,169.3C38.05,158.67 38.43,146.31 38.43,146.31C38.43,146.31 34.59,155.68 32.36,167.65C30.71,176.54 29.84,186.07 29.96,188.2C29.42,187.42 27.84,184.97 26.52,181C24.85,175.99 23.67,171.85 23.67,171.85C23.74,171.82 19.56,188.8 27.21,219.97C36.93,244.39 53.42,253.18 61.03,244.09C68.64,235 59,226.33 52.95,217.78C45.44,207.16 41.3,187.01 39.26,169.3Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="34.66"
+          android:startY="145.57"
+          android:endX="44.73"
+          android:endY="226.64"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFEB49"/>
+        <item android:offset="0.14" android:color="#DAFFE043"/>
+        <item android:offset="0.39" android:color="#9AFFC333"/>
+        <item android:offset="0.72" android:color="#47FF9419"/>
+        <item android:offset="1" android:color="#00FF6600"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M155.4,276.68C151.46,276.12 146.88,275.52 141.6,274.87C140.43,274.73 139.23,274.58 138,274.44C136.49,274.75 130.27,275.76 125.75,281.3C124.14,283.26 123.6,284.79 123.59,286.05C123.58,286.9 123.81,287.63 124.14,288.26C125.63,291.15 132.88,290.88 137.06,289.77C139.43,289.14 142.51,288.43 145.91,287.75C149.63,287.01 153.75,286.29 157.8,285.73C157.92,285.27 158.06,284.82 158.22,284.35C158.82,282.6 159.47,279.81 159.89,277.33C158.5,277.12 157,276.91 155.4,276.68Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="241.86"
+          android:startY="242.38"
+          android:endX="84.21"
+          android:endY="305.2"
+          android:type="linear">
+        <item android:offset="0.02" android:color="#00BE0449"/>
+        <item android:offset="0.51" android:color="#FFFB2872"/>
+        <item android:offset="0.67" android:color="#FFA31C5E"/>
+        <item android:offset="0.83" android:color="#FF4C114B"/>
+        <item android:offset="0.94" android:color="#FF150A3F"/>
+        <item android:offset="1" android:color="#FF00073A"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M235.51,281.92C234.56,280.76 232.93,279.45 230.26,277.91C226.88,275.95 223.88,275.09 224.29,274.48C223.75,274.57 223.21,274.66 222.65,274.77C211.21,277.09 203.51,278.43 198.32,279.18C198.71,281.11 199.2,283.03 199.65,284.35C199.81,284.8 199.94,285.25 200.06,285.69C200.11,285.88 200.15,286.07 200.2,286.25C210.19,287.78 214.59,289.67 222.61,290.08C231.6,290.53 234.4,289.63 235.91,286.93C236.74,285.47 237.14,283.92 235.51,281.92Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="153.53"
+          android:startY="257.41"
+          android:endX="261.11"
+          android:endY="299.48"
+          android:type="linear">
+        <item android:offset="0" android:color="#00BE0449"/>
+        <item android:offset="0.41" android:color="#FFFB2872"/>
+        <item android:offset="1" android:color="#FF00073A"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M159.54,246.23C155.71,231.68 143.91,220.34 129.06,217.06C128.85,217.99 128.58,218.88 128.28,219.76C128.27,219.79 128.26,219.82 128.25,219.85C127.81,221.14 127.29,222.39 126.63,223.59C123.34,229.54 119.62,233.71 117.97,243.78C114.34,265.97 138.49,274.31 138.23,274.38C138.17,274.4 138.09,274.42 137.99,274.44C139.23,274.58 140.43,274.73 141.6,274.87C146.88,275.52 151.46,276.12 155.4,276.68C157.94,272.32 159.69,267.44 160.44,262.23C160.3,257.35 159.98,251.9 159.54,246.23Z"
+      android:strokeAlpha="0.38"
+      android:fillAlpha="0.38">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:centerX="120.47"
+          android:centerY="261.99"
+          android:gradientRadius="66.77"
+          android:type="radial">
+        <item android:offset="0" android:color="#FFFFEB49"/>
+        <item android:offset="0.08" android:color="#DBFFE143"/>
+        <item android:offset="0.22" android:color="#9EFFC634"/>
+        <item android:offset="0.41" android:color="#4FFF991C"/>
+        <item android:offset="0.59" android:color="#00FF6600"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M175.61,231.47C174.82,232.41 174.36,238.56 173.34,239.08C172.53,239.49 172.13,234.25 171.29,229.52C171.07,228.24 170.2,224.1 169.99,222.88C168.93,216.96 168.92,217.42 168.04,212.59C167.87,216.45 167.51,217.48 166.81,223.39C166.46,226.26 165.98,229.71 165.57,231.62C165.22,233.29 164.67,227.09 164.34,225.45C162.7,217.53 161.55,215.42 159.33,207.54C158.08,203.08 154.15,198.97 153.76,196.13C155.56,208.29 158.15,228.4 159.54,246.23C159.98,251.91 160.3,257.35 160.44,262.24C160.57,266.93 160.53,271.11 160.26,274.46C160.2,275.29 160.06,276.29 159.89,277.33C159.47,279.81 158.82,282.61 158.22,284.36C158.06,284.82 157.92,285.27 157.8,285.73C156.88,289.1 156.88,292.25 157.71,293.66C160.24,297.93 175.94,297.29 176.67,292.24C177.03,289.77 177.27,286.75 177.41,283.33C177.94,270.43 177.04,251.48 175.61,231.47Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="164.25"
+          android:startY="197.72"
+          android:endX="168.83"
+          android:endY="319.58"
+          android:type="linear">
+        <item android:offset="0.01" android:color="#00BE0449"/>
+        <item android:offset="0.23" android:color="#74C70E51"/>
+        <item android:offset="0.49" android:color="#FFD81F60"/>
+        <item android:offset="0.56" android:color="#FFD41F5F"/>
+        <item android:offset="0.63" android:color="#FFC81D5D"/>
+        <item android:offset="0.7" android:color="#FFB41B5A"/>
+        <item android:offset="0.77" android:color="#FF981855"/>
+        <item android:offset="0.84" android:color="#FF73144E"/>
+        <item android:offset="0.91" android:color="#FF470F46"/>
+        <item android:offset="0.98" android:color="#FF13093D"/>
+        <item android:offset="1" android:color="#FF00073A"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M200.06,285.7C199.94,285.25 199.81,284.8 199.65,284.36C199.2,283.03 198.72,281.11 198.32,279.18C197.98,277.48 197.71,275.77 197.6,274.46C196.18,256.65 201.18,215.88 204.11,196.13C203.72,198.97 199.79,203.08 198.54,207.54C196.32,215.42 195.17,217.53 193.53,225.45C193.2,227.09 192.65,233.29 192.3,231.62C191.89,229.71 191.4,226.26 191.06,223.39C190.36,217.48 190,216.45 189.83,212.59C188.95,217.42 188.94,216.96 187.88,222.88C187.66,224.1 186.8,228.24 186.57,229.52C185.74,234.25 185.34,239.49 184.53,239.08C183.51,238.56 183.05,232.41 182.26,231.47C180.83,251.48 179.93,270.42 180.46,283.32C180.6,286.74 180.84,289.77 181.2,292.24C181.93,297.29 197.63,297.93 200.16,293.66C200.95,292.32 200.98,289.42 200.2,286.25C200.15,286.07 200.11,285.88 200.06,285.7Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="194.21"
+          android:startY="175.38"
+          android:endX="189.14"
+          android:endY="320.49"
+          android:type="linear">
+        <item android:offset="0" android:color="#00D81F60"/>
+        <item android:offset="0.62" android:color="#FFD81F60"/>
+        <item android:offset="0.66" android:color="#FFD21E5F"/>
+        <item android:offset="0.71" android:color="#FFC31D5C"/>
+        <item android:offset="0.77" android:color="#FFA91A58"/>
+        <item android:offset="0.83" android:color="#FF841651"/>
+        <item android:offset="0.9" android:color="#FF561149"/>
+        <item android:offset="0.97" android:color="#FF1E0A3F"/>
+        <item android:offset="1" android:color="#FF00073A"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M177.36,137.3C177.36,137.3 160.75,149.58 165.23,178.25C168.81,201.21 171.75,206.53 174.01,221.1C176.27,235.67 178.69,252.5 178.69,252.5C178.69,252.5 180.73,236.23 183.47,220.73C185.43,209.65 189.36,194.74 191.47,176.82C194.86,147.95 177.36,137.3 177.36,137.3Z"
+      android:strokeAlpha="0.6"
+      android:fillAlpha="0.6">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="177.85"
+          android:startY="161.8"
+          android:endX="182.79"
+          android:endY="270.63"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFEB49"/>
+        <item android:offset="0.21" android:color="#C8FFE03F"/>
+        <item android:offset="0.59" android:color="#68FFC324"/>
+        <item android:offset="1" android:color="#00FF9C00"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M161.09,72.89C170.62,74.17 177.4,88.88 187.99,93.28C196.46,96.79 182.48,111.75 165.58,108.52C142.83,104.18 138.47,88.47 144.02,81.29C147,77.43 153.09,71.82 161.09,72.89Z"
+      android:fillColor="#FFC635"/>
+  <path
+      android:pathData="M160.57,75.28C157.11,74.19 154.76,75.08 153.79,76.29C152.59,77.78 152.97,81.78 157.22,83.12C161.27,84.4 164.62,81.81 164.68,79.76C164.72,78.31 163.63,76.24 160.57,75.28Z"
+      android:fillColor="#200041"/>
+  <path
+      android:pathData="M187.88,74.89C185.89,79.47 188.46,82.55 190.51,83.13C194.44,84.23 197.04,84.48 199.67,78.49C203.02,70.86 201.46,67.4 197.29,66.28C192.93,65.1 190.59,68.64 187.88,74.89Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="197.37"
+          android:startY="60.49"
+          android:endX="194.95"
+          android:endY="83.7"
+          android:type="linear">
+        <item android:offset="0.16" android:color="#FFA030B9"/>
+        <item android:offset="0.88" android:color="#FF00073A"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M194.46,71.88C194.04,72.89 192.89,73.46 191.87,73.16C190.86,72.85 190.38,71.78 190.8,70.76C191.21,69.75 192.37,69.18 193.39,69.49C194.4,69.79 194.88,70.86 194.46,71.88Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M153.77,59.86C150.92,65.92 153.7,68.1 155.74,68.67C159.64,69.77 162.17,69.86 164.29,65.44C167.66,58.38 168.04,53.63 162.56,52.42C159.11,51.65 156.09,54.94 153.77,59.86Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="162.91"
+          android:startY="48.02"
+          android:endX="160.13"
+          android:endY="67.39"
+          android:type="linear">
+        <item android:offset="0.16" android:color="#FFA030B9"/>
+        <item android:offset="0.88" android:color="#FF00073A"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M160.68,58.27C160.26,59.31 159.07,59.9 158.03,59.59C156.99,59.27 156.5,58.17 156.92,57.13C157.35,56.09 158.54,55.51 159.58,55.82C160.62,56.14 161.11,57.23 160.68,58.27Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_widget.xml b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_widget.xml
new file mode 100644
index 0000000000000..d0a2664477f88
--- /dev/null
+++ b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_widget.xml
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="206dp"
+    android:height="150dp"
+    android:viewportWidth="206"
+    android:viewportHeight="150">
+  <group>
+    <clip-path
+        android:pathData="M0,0h206v150h-206z"/>
+    <group>
+      <clip-path
+          android:pathData="M12.15,1h181.71v389.38h-181.71z"/>
+      <path
+          android:pathData="M12.15,14.61c0,-7.52 6.1,-13.61 13.63,-13.61h153.09c7.53,0 13.63,6.1 13.63,13.61v362.15c0,7.52 -6.1,13.61 -13.63,13.61H25.77c-7.53,0 -13.63,-6.1 -13.63,-13.61V14.61Z"
+          android:fillColor="#3a4245"/>
+      <path
+          android:pathData="M14.87,14.61c0,-6.02 4.88,-10.89 10.9,-10.89h153.09c6.02,0 10.9,4.88 10.9,10.89v362.15c0,6.02 -4.88,10.89 -10.9,10.89H25.77c-6.02,0 -10.9,-4.88 -10.9,-10.89V14.61Z"
+          android:fillColor="#121515"/>
+      <path
+          android:pathData="M192.49,142.59h0.45c0.5,0 0.91,0.35 0.91,0.79v22.02c0,0.44 -0.41,0.79 -0.91,0.79h-0.45v-23.6Z"
+          android:fillColor="#121515"/>
+      <path
+          android:pathData="M192.49,76.33h0.45c0.5,0 0.91,0.67 0.91,1.5v41.93c0,0.83 -0.41,1.5 -0.91,1.5h-0.45v-44.93Z"
+          android:fillColor="#121515"/>
+      <group>
+        <clip-path
+            android:pathData="M18.05,19.15c0,-6.77 5.49,-12.25 12.27,-12.25h144c6.77,0 12.27,5.49 12.27,12.25v349.44c0,6.77 -5.49,12.25 -12.27,12.25H30.32c-6.77,0 -12.27,-5.49 -12.27,-12.25V19.15Z"/>
+        <path
+            android:pathData="M18.05,19.15c0,-6.77 5.49,-12.25 12.27,-12.25h144c6.77,0 12.27,5.49 12.27,12.25v349.44c0,6.77 -5.49,12.25 -12.27,12.25H30.32c-6.77,0 -12.27,-5.49 -12.27,-12.25V19.15Z"
+            android:fillColor="#f1f2f3"/>
+      </group>
+      <path
+          android:pathData="M102.32,20.97c2.63,0 4.77,-2.13 4.77,-4.77s-2.14,-4.77 -4.77,-4.77 -4.77,2.13 -4.77,4.77 2.14,4.77 4.77,4.77Z"
+          android:fillColor="#262c2d"
+          android:fillType="evenOdd"/>
+      <path
+          android:pathData="M102.32,19.18c1.65,0 2.98,-1.33 2.98,-2.98s-1.33,-2.98 -2.98,-2.98 -2.98,1.33 -2.98,2.98 1.34,2.98 2.98,2.98Z"
+          android:fillColor="#121515"
+          android:fillType="evenOdd"/>
+      <path
+          android:pathData="M102.32,15.61c0.33,0 0.6,-0.27 0.6,-0.6s-0.27,-0.6 -0.6,-0.6 -0.6,0.27 -0.6,0.6 0.27,0.6 0.6,0.6Z"
+          android:strokeAlpha="0.4"
+          android:fillColor="#636f73"
+          android:fillType="evenOdd"
+          android:fillAlpha="0.4"/>
+    </group>
+    <path
+        android:pathData="M31.45,40.7L173.47,40.7A7,7 0,0 1,180.47 47.7L180.47,72.94A7,7 0,0 1,173.47 79.94L31.45,79.94A7,7 0,0 1,24.45 72.94L24.45,47.7A7,7 0,0 1,31.45 40.7z"
+        android:fillColor="#fff"/>
+    <path
+        android:pathData="M49.69,48.94L170.08,48.94A3.58,3.58 0,0 1,173.66 52.52L173.66,66.99A3.58,3.58 0,0 1,170.08 70.57L49.69,70.57A3.58,3.58 0,0 1,46.11 66.99L46.11,52.52A3.58,3.58 0,0 1,49.69 48.94z"
+        android:strokeWidth=".85"
+        android:fillColor="#fff"
+        android:strokeColor="#ccc"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M162.16,54.64c-2.44,0 -4.41,1.97 -4.41,4.41s1.97,4.41 4.41,4.41c1.03,0 1.96,-0.35 2.71,-0.92l3.45,3.45 0.78,-0.78 -3.45,-3.45c0.58,-0.75 0.92,-1.68 0.92,-2.71 0,-2.44 -1.97,-4.41 -4.41,-4.41ZM158.85,59.05c0,-1.83 1.48,-3.31 3.31,-3.31s3.31,1.48 3.31,3.31 -1.48,3.31 -3.31,3.31 -3.31,-1.48 -3.31,-3.31Z"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M29.65,102.72L49.11,102.72A5.2,5.2 0,0 1,54.31 107.92L54.31,127.38A5.2,5.2 0,0 1,49.11 132.58L29.65,132.58A5.2,5.2 0,0 1,24.45 127.38L24.45,107.92A5.2,5.2 0,0 1,29.65 102.72z"
+        android:fillColor="#e0e0e6"/>
+    <path
+        android:pathData="M113.76,102.72L133.22,102.72A5.2,5.2 0,0 1,138.42 107.92L138.42,127.38A5.2,5.2 0,0 1,133.22 132.58L113.76,132.58A5.2,5.2 0,0 1,108.56 127.38L108.56,107.92A5.2,5.2 0,0 1,113.76 102.72z"
+        android:fillColor="#e0e0e6"/>
+    <path
+        android:pathData="M71.7,102.72L91.16,102.72A5.2,5.2 0,0 1,96.36 107.92L96.36,127.38A5.2,5.2 0,0 1,91.16 132.58L71.7,132.58A5.2,5.2 0,0 1,66.5 127.38L66.5,107.92A5.2,5.2 0,0 1,71.7 102.72z"
+        android:fillColor="#e0e0e6"/>
+    <path
+        android:pathData="M155.81,102.72L175.27,102.72A5.2,5.2 0,0 1,180.47 107.92L180.47,127.38A5.2,5.2 0,0 1,175.27 132.58L155.81,132.58A5.2,5.2 0,0 1,150.61 127.38L150.61,107.92A5.2,5.2 0,0 1,155.81 102.72z"
+        android:fillColor="#e0e0e6"/>
+  </group>
+  <path
+      android:pathData="M57.74,54.1c-0.62,-1.48 -1.87,-3.09 -2.85,-3.59 0.7,1.35 1.18,2.81 1.44,4.31v0.02c-1.6,-4 -4.32,-5.62 -6.55,-9.13 -0.11,-0.18 -0.23,-0.36 -0.33,-0.54 -0.06,-0.1 -0.11,-0.19 -0.16,-0.29 -0.09,-0.18 -0.16,-0.37 -0.21,-0.56 0,-0.02 -0.01,-0.04 -0.03,-0.04 0,0 -0.02,0 -0.03,0 0,0 0,0 0,0s0,0 0,0h0c-3.57,2.08 -4.78,5.95 -4.89,7.88 -1.42,0.1 -2.79,0.62 -3.91,1.51 -0.12,-0.1 -0.24,-0.19 -0.37,-0.28 -0.32,-1.13 -0.34,-2.33 -0.04,-3.47 -1.31,0.63 -2.47,1.53 -3.42,2.64h0c-0.56,-0.71 -0.52,-3.06 -0.49,-3.55 -0.17,0.07 -0.32,0.15 -0.47,0.25 -0.5,0.35 -0.96,0.75 -1.39,1.19 -0.48,0.49 -0.93,1.02 -1.33,1.59 -0.91,1.29 -1.56,2.76 -1.9,4.3 0,0.03 -0.01,0.06 -0.02,0.09 -0.03,0.13 -0.12,0.75 -0.14,0.89 0,0.01 0,0.02 0,0.03 -0.12,0.65 -0.2,1.3 -0.23,1.96v0.07c0,7.84 6.36,14.19 14.2,14.19 6.91,0 12.82,-4.98 13.99,-11.79 0.02,-0.18 0.04,-0.37 0.06,-0.55 0.29,-2.42 -0.02,-4.87 -0.92,-7.13h0ZM41.38,65.21c0.07,0.03 0.13,0.07 0.2,0.1h0c-0.07,-0.03 -0.14,-0.06 -0.21,-0.1h0Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="56.16"
+          android:startY="48.59"
+          android:endX="33.4"
+          android:endY="70.41"
+          android:type="linear">
+        <item android:offset="0.05" android:color="#FFFFF44F"/>
+        <item android:offset="0.37" android:color="#FFFF980E"/>
+        <item android:offset="0.53" android:color="#FFFF3647"/>
+        <item android:offset="0.7" android:color="#FFE31587"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M57.74,54.1c-0.62,-1.48 -1.87,-3.09 -2.85,-3.59 0.7,1.35 1.18,2.81 1.44,4.31 0,0 0,0 0,0.01h0c1.34,3.65 0.61,7.34 -0.44,9.59 -1.63,3.49 -5.56,7.07 -11.73,6.9 -6.66,-0.19 -12.53,-5.13 -13.62,-11.6 -0.2,-1.02 0,-1.54 0.1,-2.37 -0.14,0.64 -0.21,1.3 -0.23,1.96v0.07c0,7.84 6.36,14.2 14.2,14.2 6.91,0 12.82,-4.98 13.99,-11.79 0.02,-0.18 0.04,-0.37 0.06,-0.55 0.29,-2.42 -0.02,-4.87 -0.92,-7.13h0Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:centerX="51.8"
+          android:centerY="49.69"
+          android:gradientRadius="27.23"
+          android:type="radial">
+        <item android:offset="0.13" android:color="#FFFFBD4F"/>
+        <item android:offset="0.28" android:color="#FFFF980E"/>
+        <item android:offset="0.47" android:color="#FFFF3750"/>
+        <item android:offset="0.78" android:color="#FFEB0878"/>
+        <item android:offset="0.86" android:color="#FFE50080"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M57.74,54.1c-0.62,-1.48 -1.87,-3.09 -2.85,-3.59 0.7,1.35 1.18,2.81 1.44,4.31 0,0 0,0 0,0.01h0c1.34,3.65 0.61,7.34 -0.44,9.59 -1.63,3.49 -5.56,7.07 -11.73,6.9 -6.66,-0.19 -12.53,-5.13 -13.62,-11.6 -0.2,-1.02 0,-1.54 0.1,-2.37 -0.14,0.64 -0.21,1.3 -0.23,1.96v0.07c0,7.84 6.36,14.2 14.2,14.2 6.91,0 12.82,-4.98 13.99,-11.79 0.02,-0.18 0.04,-0.37 0.06,-0.55 0.29,-2.42 -0.02,-4.87 -0.92,-7.13h0Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:centerX="47.08"
+          android:centerY="56.51"
+          android:gradientRadius="27.91"
+          android:type="radial">
+        <item android:offset="0.3" android:color="#FF960E18"/>
+        <item android:offset="0.35" android:color="#BCB11927"/>
+        <item android:offset="0.43" android:color="#56DB293D"/>
+        <item android:offset="0.5" android:color="#16F5334B"/>
+        <item android:offset="0.53" android:color="#00FF3750"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M50.84,55.77s0.06,0.04 0.09,0.06c-0.36,-0.63 -0.8,-1.21 -1.32,-1.72 -4.41,-4.41 -1.16,-9.57 -0.61,-9.83h0c-3.57,2.08 -4.78,5.95 -4.89,7.88 0.17,-0.01 0.33,-0.02 0.5,-0.02 2.58,0 4.95,1.39 6.22,3.63h0Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:centerX="49.39"
+          android:centerY="42.04"
+          android:gradientRadius="8.89"
+          android:type="radial">
+        <item android:offset="0.13" android:color="#FFFFF44F"/>
+        <item android:offset="0.53" android:color="#FFFF980E"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M44.63,56.65c-0.02,0.35 -1.27,1.57 -1.71,1.57 -4.04,0 -4.69,2.44 -4.69,2.44 0.18,2.06 1.61,3.75 3.34,4.65 0.08,0.04 0.16,0.08 0.24,0.11 0.14,0.06 0.28,0.12 0.42,0.17 0.59,0.21 1.22,0.33 1.85,0.36 7.07,0.33 8.45,-8.46 3.34,-11.01 1.31,-0.23 2.66,0.3 3.42,0.83 -1.27,-2.24 -3.64,-3.63 -6.22,-3.63 -0.17,0 -0.33,0.01 -0.5,0.02 -1.42,0.1 -2.79,0.62 -3.91,1.51 0.22,0.18 0.46,0.43 0.98,0.93 0.96,0.95 3.43,1.93 3.44,2.05h0Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="40.1"
+          android:startY="71.63"
+          android:endX="49.5"
+          android:endY="66.47"
+          android:type="linear">
+        <item android:offset="0.36" android:color="#FF5859FF"/>
+        <item android:offset="0.44" android:color="#FF6A53FA"/>
+        <item android:offset="0.6" android:color="#FF8F47F1"/>
+        <item android:offset="0.76" android:color="#FFAA3FEB"/>
+        <item android:offset="0.89" android:color="#FFBB3AE7"/>
+        <item android:offset="1" android:color="#FFC139E6"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M39.56,53.19c0.1,0.06 0.2,0.13 0.29,0.2 -0.32,-1.13 -0.34,-2.33 -0.04,-3.47 -1.31,0.63 -2.47,1.53 -3.42,2.64 0.07,0 2.13,-0.04 3.16,0.63Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:centerX="40.65"
+          android:centerY="44.81"
+          android:gradientRadius="9.37"
+          android:type="radial">
+        <item android:offset="0.1" android:color="#FFFFE226"/>
+        <item android:offset="0.79" android:color="#FFFF7139"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M30.54,59.71c1.1,6.47 6.96,11.42 13.62,11.6 6.16,0.18 10.1,-3.4 11.73,-6.9 1.05,-2.26 1.78,-5.95 0.44,-9.58h0s0,-0.03 0,-0.03v0.02c0.51,3.29 -1.17,6.47 -3.78,8.63v0.02c-5.1,4.15 -9.98,2.5 -10.96,1.83 -0.07,-0.03 -0.14,-0.07 -0.21,-0.1 -2.97,-1.42 -4.2,-4.13 -3.93,-6.45 -1.44,0.02 -2.76,-0.81 -3.36,-2.11 0,0 2.25,-1.61 5.22,-0.21 1.68,0.76 3.59,0.84 5.33,0.21 0,-0.12 -2.48,-1.1 -3.44,-2.05 -0.51,-0.51 -0.76,-0.75 -0.98,-0.93 -0.12,-0.1 -0.24,-0.19 -0.37,-0.28 -0.08,-0.06 -0.18,-0.12 -0.29,-0.2 -1.04,-0.67 -3.09,-0.63 -3.16,-0.63h0c-0.56,-0.71 -0.52,-3.06 -0.49,-3.55 -0.17,0.07 -0.32,0.15 -0.47,0.25 -0.5,0.35 -0.96,0.75 -1.39,1.19 -0.48,0.49 -0.93,1.02 -1.33,1.59 -0.91,1.29 -1.56,2.76 -1.9,4.3 0,0.03 -0.51,2.24 -0.26,3.38h0Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:centerX="54.78"
+          android:centerY="42.69"
+          android:gradientRadius="44.68"
+          android:type="radial">
+        <item android:offset="0.11" android:color="#FFFFF44F"/>
+        <item android:offset="0.46" android:color="#FFFF980E"/>
+        <item android:offset="0.72" android:color="#FFFF3647"/>
+        <item android:offset="0.9" android:color="#FFE31587"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M49.61,54.11c0.52,0.51 0.96,1.09 1.32,1.72 0.07,0.06 0.15,0.11 0.21,0.18 3.22,2.96 1.53,7.16 1.41,7.46 2.61,-2.15 4.29,-5.34 3.79,-8.63 -1.61,-4 -4.33,-5.61 -6.55,-9.13 -0.11,-0.18 -0.23,-0.36 -0.33,-0.54 -0.06,-0.1 -0.11,-0.19 -0.16,-0.29 -0.09,-0.18 -0.16,-0.37 -0.21,-0.56 0,-0.02 -0.01,-0.04 -0.03,-0.04 0,0 -0.02,0 -0.03,0 0,0 0,0 0,0s0,0 0,0c-0.55,0.26 -3.81,5.42 0.61,9.83Z"
+      android:fillAlpha="0.8">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="49.23"
+          android:startY="40.74"
+          android:endX="55.13"
+          android:endY="66.83"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFF44F"/>
+        <item android:offset="0.3" android:color="#FFFF980E"/>
+        <item android:offset="0.57" android:color="#FFFF3647"/>
+        <item android:offset="0.74" android:color="#FFE31587"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M51.15,56.01c-0.07,-0.06 -0.14,-0.12 -0.21,-0.18 -0.03,-0.02 -0.06,-0.04 -0.09,-0.06 -0.76,-0.53 -2.11,-1.06 -3.42,-0.83 5.11,2.55 3.74,11.34 -3.34,11.01 -0.63,-0.03 -1.25,-0.15 -1.85,-0.36 -0.14,-0.05 -0.28,-0.11 -0.42,-0.17 -0.08,-0.04 -0.16,-0.07 -0.24,-0.11h0c0.99,0.68 5.86,2.32 10.96,-1.82v-0.02c0.13,-0.3 1.82,-4.49 -1.4,-7.46h0Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:centerX="42.2"
+          android:centerY="57.96"
+          android:gradientRadius="25.72"
+          android:type="radial">
+        <item android:offset="0.14" android:color="#FFFFF44F"/>
+        <item android:offset="0.48" android:color="#FFFF980E"/>
+        <item android:offset="0.66" android:color="#FFFF3647"/>
+        <item android:offset="0.9" android:color="#FFE31587"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M38.23,60.66s0.65,-2.44 4.69,-2.44c0.44,0 1.69,-1.22 1.71,-1.57 -1.73,0.63 -3.65,0.55 -5.33,-0.21 -2.97,-1.4 -5.22,0.21 -5.22,0.21 0.6,1.31 1.92,2.14 3.36,2.11 -0.26,2.32 0.96,5.03 3.93,6.45 0.07,0.03 0.13,0.07 0.2,0.1 -1.73,-0.9 -3.17,-2.59 -3.34,-4.65Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:centerX="48.91"
+          android:centerY="44.06"
+          android:gradientRadius="30.91"
+          android:type="radial">
+        <item android:offset="0.09" android:color="#FFFFF44F"/>
+        <item android:offset="0.63" android:color="#FFFF980E"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M57.74,54.1c-0.62,-1.48 -1.87,-3.09 -2.85,-3.59 0.7,1.35 1.18,2.81 1.44,4.31v0.02c-1.6,-4 -4.32,-5.62 -6.55,-9.13 -0.11,-0.18 -0.23,-0.36 -0.33,-0.54 -0.06,-0.1 -0.11,-0.19 -0.16,-0.29 -0.09,-0.18 -0.16,-0.37 -0.21,-0.56 0,-0.02 -0.01,-0.04 -0.03,-0.04 0,0 -0.02,0 -0.03,0 0,0 0,0 0,0s0,0 0,0h0c-3.57,2.08 -4.78,5.95 -4.89,7.88 0.17,-0.01 0.33,-0.02 0.5,-0.02 2.58,0 4.95,1.39 6.22,3.63 -0.76,-0.53 -2.11,-1.06 -3.42,-0.83 5.11,2.55 3.74,11.34 -3.34,11.01 -0.63,-0.03 -1.25,-0.15 -1.85,-0.36 -0.14,-0.05 -0.28,-0.11 -0.42,-0.17 -0.08,-0.04 -0.16,-0.07 -0.24,-0.11h0c-0.07,-0.03 -0.14,-0.06 -0.21,-0.1 0.07,0.03 0.13,0.07 0.2,0.1 -1.73,-0.9 -3.17,-2.59 -3.34,-4.65 0,0 0.65,-2.44 4.69,-2.44 0.44,0 1.69,-1.22 1.71,-1.57 0,-0.12 -2.48,-1.1 -3.44,-2.05 -0.51,-0.51 -0.76,-0.75 -0.98,-0.93 -0.12,-0.1 -0.24,-0.19 -0.37,-0.28 -0.32,-1.13 -0.34,-2.33 -0.04,-3.47 -1.31,0.63 -2.47,1.53 -3.42,2.64h0c-0.56,-0.71 -0.52,-3.06 -0.49,-3.55 -0.17,0.07 -0.32,0.15 -0.47,0.25 -0.5,0.35 -0.96,0.75 -1.39,1.19 -0.48,0.49 -0.93,1.02 -1.33,1.59 -0.91,1.29 -1.56,2.76 -1.9,4.3 0,0.03 -0.01,0.06 -0.02,0.09 -0.03,0.13 -0.15,0.76 -0.16,0.9 -0.11,0.66 -0.18,1.32 -0.21,1.98v0.07c0,7.84 6.36,14.19 14.2,14.19 6.91,0 12.82,-4.98 13.99,-11.79 0.02,-0.18 0.04,-0.37 0.06,-0.55 0.29,-2.42 -0.02,-4.87 -0.92,-7.13h0ZM56.33,54.83h0s0,0.01 0,0.01h0s0,-0.01 0,-0.01Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="54.66"
+          android:startY="48.61"
+          android:endX="36.45"
+          android:endY="68.59"
+          android:type="linear">
+        <item android:offset="0.17" android:color="#CCFFF44F"/>
+        <item android:offset="0.68" android:color="#00FFF44F"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>

From b06ef17de976b06895b5d89345c9fc1f8d44efcd Mon Sep 17 00:00:00 2001
From: t-p-white <towhite@mozilla.com>
Date: Thu, 29 Jan 2026 14:50:18 +0000
Subject: [PATCH 069/116] Bug 2012103 - Part 3: Refactor the sub-header
 implementation for `TermsOfServiceOnboardingPageRedesign`, and fix link
 warning for `updateFirstPlaceholder`
 r=android-reviewers,gmalekpour,rebecatudor273

Differential Revision: https://phabricator.services.mozilla.com/D280590
---
 .../TermsOfServiceOnboardingPageRedesign.kt   | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt
index 49c9dd0fd645b..af51ae08c6e8a 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt
@@ -111,27 +111,13 @@ private fun Header(pageState: OnboardingPageState) {
         style = MaterialTheme.typography.headlineMedium,
     )
 
-    Spacer(Modifier.height(10.dp))
-
-    pageState.termsOfService?.let { Subheader(it) }
-}
-
-@Composable
-private fun Subheader(termsOfService: OnboardingTermsOfService) {
-    with(termsOfService) {
-        Spacer(Modifier.height(10.dp))
+    Spacer(Modifier.height(20.dp))
 
-        Column(
-            verticalArrangement = Arrangement.spacedBy(4.dp),
-            horizontalAlignment = Alignment.CenterHorizontally,
-        ) {
-            subheaderOneText?.let { SubHeaderText(it) }
-        }
-    }
+    pageState.termsOfService?.subheaderOneText?.let { SubHeader(it) }
 }
 
 @Composable
-private fun SubHeaderText(text: String) {
+private fun SubHeader(text: String) {
     Text(
         text = text,
         style = FirefoxTheme.typography.body2.copy(
@@ -200,7 +186,7 @@ private fun BodyLinkText(
     )
 }
 
-private fun String.updateFirstPlaceholder(text: String) = replace("%1\$s", text)
+private fun String.updateFirstPlaceholder(text: String) = replace($$"%1$s", text)
 
 // *** Code below used for previews only *** //
 

From 39878ac2c1776a9fb01e3ce2da354b048ad221ea Mon Sep 17 00:00:00 2001
From: t-p-white <towhite@mozilla.com>
Date: Thu, 29 Jan 2026 14:50:19 +0000
Subject: [PATCH 070/116] Bug 2012103 - Part 4: Update the onboarding screen
 redesign to pagination dots to use the updated M3 color tokens defined in the
 Figma r=android-reviewers,gmalekpour

Differential Revision: https://phabricator.services.mozilla.com/D280731
---
 .../onboarding/redesign/view/OnboardingScreenRedesign.kt      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt
index 226666388f5c6..b1c5463665a21 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/OnboardingScreenRedesign.kt
@@ -353,10 +353,12 @@ private fun OnboardingContent(
 
                 PagerIndicator(
                     pagerState = pagerState,
-                    leaveTrail = true,
                     modifier = Modifier
                         .align(Alignment.CenterHorizontally)
                         .padding(bottom = 16.dp),
+                    activeColor = MaterialTheme.colorScheme.onPrimary,
+                    inactiveColor = MaterialTheme.colorScheme.surfaceVariant,
+                    leaveTrail = true,
                 )
             }
         }

From 4c2406db13c52effa52c4eda434f7f4581947efa Mon Sep 17 00:00:00 2001
From: t-p-white <towhite@mozilla.com>
Date: Thu, 29 Jan 2026 14:50:19 +0000
Subject: [PATCH 071/116] Bug 2012103 - Part 5: Add Kit sync QR asset to the
 Sync sign in fragment. r=android-reviewers,gmalekpour

{F56642173}

Differential Revision: https://phabricator.services.mozilla.com/D280730
---
 .../app/src/main/res/drawable/ic_scan.xml     |   27 -
 .../res/drawable/nova_onboarding_sync_qr.xml  | 1010 +++++++++++++++++
 .../main/res/layout/fragment_turn_on_sync.xml |    4 +-
 3 files changed, 1012 insertions(+), 29 deletions(-)
 delete mode 100644 mobile/android/fenix/app/src/main/res/drawable/ic_scan.xml
 create mode 100644 mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_sync_qr.xml

diff --git a/mobile/android/fenix/app/src/main/res/drawable/ic_scan.xml b/mobile/android/fenix/app/src/main/res/drawable/ic_scan.xml
deleted file mode 100644
index 47fffd545f348..0000000000000
--- a/mobile/android/fenix/app/src/main/res/drawable/ic_scan.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:width="187dp" android:height="171dp" android:viewportWidth="187" android:viewportHeight="171">
-    <path android:pathData="M17 11.5L20 7l5.5-2.5h36l55-1L149 5l0.5 21v34.5L127 62l-2.5 5.5V98h-102L18 91.5V53l-1-41.5z" android:fillColor="#592ACB" android:fillAlpha="0.3"/>
-    <path android:pathData="M58.93 31.45l2.37-5.67h49.09V72l-1.97 6.45H61.3l-2.37-4.74V31.45zm72.72 37.79l7.48-1.58 0.92 5.26h23.5L166.7 72l0.92-4.34h4.2l4.46 1.58 1.45 9.21-1.45 14.36 2.37 38.31-0.92 24.76-1.45 5.53-4.46 2.5h-42V78.45l1.83-9.21z">
-        <aapt:attr name="android:fillColor">
-            <gradient android:startX="58.93" android:startY="25.78" android:endX="178.65" android:endY="25.78" android:type="linear">
-                <item android:offset="0" android:color="#FF9059FF"/>
-                <item android:offset="0.52" android:color="#FFFF4AA2"/>
-                <item android:offset="1" android:color="#FFFFBD4F"/>
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path android:pathData="M4.68 99.37c0-1.03 0.67-1.11 1.29-1.09 1.75 0.1 3.34-0.55 4.99-0.88 1.18-0.24 2.21-1.11 3.37-1 1 0.1 1.75-0.47 2.64-0.51 1.1-0.06 0.66-0.79 0.38-1-0.83-0.57-0.83-1.43-0.9-2.22-0.28-3.21-0.35-6.41-0.28-9.62 0.06-2.28 0.02-4.58 0.04-6.87 0-1.73-0.39-3.59 0.09-5.17 0.7-2.3 0.41-4.55 0.41-6.82 0-3.57-0.28-7.14-0.37-10.72-0.04-1.84 0.17-3.66 0.28-5.5 0.16-2.99 0.05-5.95 0.05-8.92 0-3.13 0.06-6.26 0.08-9.41 0-0.6 0.47-1.53-0.89-1.29-0.31 0.06-0.22-0.44-0.2-0.62 0.13-1.09-0.24-2.25 0.24-3.24 0.9-1.85-0.22-3.67 0.18-5.51 0.48-2.14-0.2-4.33-0.02-6.48 0.15-1.79-0.01-3.61 1.04-5.36 0.49-0.83 0.59-1.97 1.49-2.67 0.7-0.54 1.62-0.59 2.35-0.7 3.5-0.57 6.98-1.31 10.59-1.13 2.56 0.13 5.16-0.16 7.74-0.22 2.38-0.03 4.77 0.08 7.15 0 2.57-0.09 5.12 0.43 7.71 0.26 2.3-0.15 4.62 0.33 6.93 0.35 1.65 0.02 3.31-0.28 4.97-0.5 1.79-0.24 3.61-0.29 5.4-0.14 3.92 0.29 7.82-0.15 11.73-0.17 2.82 0 5.63-0.09 8.4 0.2 2.21 0.24 4.4 0.02 6.59 0.21 1.27 0.11 2.41-0.37 3.66-0.3 3.52 0.22 7.04-0.39 10.56-0.31 2.24 0.03 4.51 0.05 6.77 0.16 1.29 0.06 2.64 0.06 3.96-0.09 1.4-0.15 2.82-0.46 4.26 0.02 0.55 0.18 1.12-0.29 1.79-0.26 2.22 0.13 4.45 0.26 6.68 0.13 2.58-0.15 5.16-0.16 7.74-0.11 1.41 0.04 2.81 0.24 4.19 0.88 0.7 0.34 1.68 0.21 2.42 0.74 0.66 0.48 1.19 1.03 1.12 1.95-0.24 2.88 0.74 5.66 0.59 8.53-0.06 1.22-0.11 2.43-0.13 3.65-0.07 2.91 0.09 5.84-0.26 8.74-0.18 1.52 0.11 3.08-0.16 4.52-0.39 2.04 0.26 4.05-0.11 6.04-0.24 1.32 0.22 2.56 0.07 3.85-0.15 1.34-0.24 2.69-0.26 4.03-0.02 1.4 0.06 2.8 0.09 4.18 0.06 2.76 0.24 5.53 0.11 8.29-0.07 1.45 0.61 1.64 1.66 1.64 6.93-0.04 13.85-0.13 20.78-0.06 1.8 0.02 3.57 0.7 5.06 1.84 0.2 0.17 0.39 0.39 0.63 0.48 2.37 0.8 3.5 2.58 3.76 4.92 0.22 2.01 1.06 3.92 1.16 5.89 0.12 2.82 0.27 5.64 0.27 8.46 0 2.28 0.06 4.6 0.11 6.89 0.11 5.59-0.07 11.19-0.55 16.77-0.13 1.38 0 2.8 0.05 4.2 0.08 2.47 0.24 4.96 0.26 7.42 0.02 3.98 0.06 7.96-0.09 11.92-0.11 2.62 0.06 5.23 0.02 7.85-0.02 2.28-0.15 4.56-0.17 6.83-0.03 2.74 0.19 5.49 0.21 8.21 0.01 2.54-0.35 5.05-0.61 7.57-0.11 1.05-0.15 2.1-0.24 3.15-0.37 4.27-3.87 5.75-7.26 6.15-3.28 0.41-6.59 0.56-9.89 0.67-1.1 0.03-2.19 1.03-3.3-0.04-1.47 1.47-3.27 0.35-4.89 0.64-1.57 0.3-3.13-0.11-4.66-0.03-2.56 0.11-5.09 0-7.63-0.11-0.26 0-0.59 0.11-0.68-0.23-0.42-1.52-1.1-0.64-1.66-0.14-0.49 0.46-0.88 0.7-1.34 0-0.11-0.17-0.26-0.06-0.41-0.06-0.95 0-1.91 0.92-2.87 0-0.26-0.26-0.68-0.18-1.01-0.05-2.75 1.05-5.47 0.75-8.18-0.06-3.22-0.96-4.01-3.87-4.92-6.54-1.43-4.27-0.97-8.74-1.08-13.15-0.04-1.75-0.45-3.53-0.22-5.25 0.18-1.36-0.21-2.67 0.09-4.06 0.22-1.02-0.17-2.31-0.09-3.43 0.09-1.6 0.14-3.22 0.27-4.81 0.11-1.53 0.04-3.2-0.09-4.8-0.18-2.23-0.09-4.44 0.09-6.67 0.09-1.14 0-2.28-0.02-3.41-0.03-1.71 0-3.42 0.17-5.14 0.07-0.73-0.11-1.08-0.89-1.03-3.95 0.26-7.91-0.2-11.87 0.2-1.31 0.13-2.69-0.33-4.02-0.25-1.67 0.09-3.37 0.07-5.01 0.09-1.62 0-3.29-0.07-4.95-0.09-4.57-0.06-9.12-0.04-13.69-0.19-1.84-0.05-3.68 0.15-5.5 0-3.28-0.26-6.56 0.06-9.84-0.03-2.58-0.08-5.15 0.05-7.73-0.04-3.54-0.13-7.07 0.07-10.59-0.04-3.24-0.11-6.48-0.03-9.73-0.07-3.16-0.04-6.31-0.04-9.48-0.06-4.18-0.02-8.36-0.22-12.54-0.03-3.3 0.14-6.61 0.16-9.91 0.35-0.7 0.03-1.47 0.07-2.21-0.37-0.79-0.48-1.73 0.16-2.6-0.02-1.03-0.22-1.08-0.87-0.88-1.9 0.22-1.08-0.06-2.28-0.2-3.4-0.15-1.13-0.59-2.2-0.47-3.38 0.15-1.14 1.07-1.32 1.88-1.69 0.52-0.24 0.8 0 0.96 0.63l-0.02-0.04zm94.48-2.14c0.33-2.02 1.53-0.53 2.36-0.7 0.2-0.03 0.31 0.5 0.46 0.26 0.7-1.09 1.42-0.22 2.12-0.07 0.16 0.03 0.31 0.09 0.48 0.13 0-0.08 0-0.15-0.04-0.21-0.48-0.71 0.15-0.44 0.4-0.44 1.44-0.03 2.88 0.26 4.33-0.03 1.72-0.37 3.45-0.39 5.2-0.32 2.41 0.11 4.84 0.11 7.25 0.08 1.7-0.04 2.05-0.52 1.73-2.16-0.11-0.53-0.11-1.01 0-1.55 0.23-1.14 0.41-2.37 0.37-3.44-0.07-2.21 0.17-4.38 0.21-6.57 0.03-1.94 0.23-3.85 0.22-5.77 0-2.36-0.39-4.71-0.54-7.07-0.11-1.84-0.13-3.85 0.79-5.36 1.64-2.74 4.42-4.05 7.61-4.22 0.83-0.03 1.68-0.09 2.45-0.24 2.37-0.4 4.77-0.16 7.15-0.53 1.65-0.26 3.38-0.2 5.08-0.17 0.62 0 0.9-0.03 0.88-0.72-0.16-5.98 0.3-11.99-0.24-17.97-0.11-1.22-0.09-2.47 0.04-3.7 0.26-2.34 0.39-4.66 0.28-7.02-0.08-1.62-0.08-3.26-0.08-4.9 0-0.61 0.68-1.08 0.65-1.58-0.24-3.8-0.69-7.57-0.7-11.37 0-0.97-0.28-1.98-0.63-2.91-0.4-1.1-1.25-1.8-2.54-1.65-1.69 0.2-3.33-0.32-5.01-0.46-1.09-0.1-2.32 0.6-3.3-0.41-0.81 0.98-1.99 0.65-2.87 0.5-1.82-0.3-3.67-0.04-5.51-0.52-0.68-0.18-1.54-0.48-2.24-0.37-2.2 0.35-4.37 0.17-6.56 0.24-2.36 0.08-4.68 0.3-7.05 0-2.78-0.33-5.62-0.12-8.42-0.22-4.46-0.14-8.93-0.42-13.39 0.17-0.29 0.04-0.72 0.09-0.9-0.07-1.22-1.07-2.38-0.15-3.54 0.05-0.61 0.11-1.2 0.31-1.8 0.31-6.91 0-13.82 0-20.72-0.03-1.18 0-2.34-0.37-3.54-0.26-1.01 0.09-2.01-0.74-3.07 0-0.48 0.33-0.45-0.61-1.07-0.55-2.06 0.24-4.11-0.34-6.19-0.26-1.99 0.07-4-0.31-6 0-0.26 0.04-0.56 0.05-0.8 0-1.93-0.57-3.83-0.22-5.69 0.22-1.8 0.42-3.62 0.88-5.43 0.53-1.86-0.35-3.61-0.33-5.4 0.28-0.93 0.33-1.95 0.66-2.91 0.57-1.4-0.13-2.59 0.24-3.13 1.49-1.06 2.45-1.38 5.18-1.27 7.68 0.13 2.86-0.18 5.69 0.09 8.55 0.13 1.29-0.09 2.65-0.11 3.94-0.01 1.58 0.1 3.22 0.15 4.82 0.09 2.62 0.3 5.25 0.2 7.87-0.07 1.99 0.06 3.94 0.06 5.93 0 1.77 0.5 3.55 0 5.28-0.52 1.77-0.44 3.54-0.5 5.33-0.09 3.16 0.48 6.31 0.26 9.5 0 0.2 0.11 0.42 0.13 0.64 0.15 1.75 0.51 3.5 0.35 5.24-0.44 5-1.01 10.01-0.2 15.04 0.36 2.34 1.21 4.53 2.57 6.5 0.65 0.92 1.46 1.75 2.69 0.89 0.54-0.37 1.09-0.3 1.59-0.28 2.04 0.07 4.09 0.26 6.13 0.39 0.79 0.05 1.34 0.35 1.46 1.36 0-1.1 0.64-0.55 1.08-0.64 0.92-0.23 1.81-0.58 2.8-0.28 0.81 0.24 1.79-0.41 2.54 0.37 0.41-0.55 1-0.52 1.57-0.5 2.37 0.07 4.75 0.17 7.11 0.24 0.66 0.02 1.4 0.18 1.93 0.09 2.63-0.42 5.31-0.42 7.92-0.44 2.16-0.02 4.27-0.39 6.41-0.28 1.14 0.06 2.36 0.17 3.39 0.1 1.62-0.1 3.26-0.11 4.86 0 0.81 0.05 2.06 0.47 2.49 0.33 2.19-0.81 4.29 0 6.41 0 1.38 0 2.85-0.26 4.14 0.53 0.22 0.13 0.2-0.07 0.2-0.16 0.11-0.72 0.67-0.43 1.03-0.43 1.75 0.02 3.5 0.04 5.25 0.17 0.7 0.05 1.62-0.32 1.99 0.75 0.07 0.19 0.41 0.13 0.41 0 0-0.94 0.92-0.7 1.17-0.66 0.96 0.13 2.2-0.31 2.88 1.11l0.07 0.01zm24.7 9.23c0-1.95-0.44-3.83-0.3-5.73 0.06-0.88-0.25-1.25-1.21-1.18-1.6 0.13-3.21 0.58-4.81 0-0.22-0.07-0.51 0-0.77 0.08-1.92 0.57-3.89 0-5.8 0.31-0.79 0.13-1.57-0.09-2.34-0.04-2.36 0.15-4.7 0.13-7.04 0-0.92-0.05-1.93 0.41-2.72-0.09-0.87-0.57-1.49 0.13-2.21 0.11-0.89-0.02-1.79-0.44-2.67-0.4-2.91 0.13-5.79 0.51-8.75-0.09-1.38-0.28-3.06-0.1-4.53 0.05-1.86 0.18-3.7 0.06-5.55 0.15-0.97 0.05-2.13-0.67-2.68-0.48-1.5 0.53-2.86 0-4.26 0.05-1.44 0.08-2.85-0.24-4.33-0.05-1.27 0.16-2.48-0.41-3.9 0-1.29 0.37-2.84 0.39-4.27 0.37-1.48-0.02-2.97 0-4.44 0.09-1.31 0.09-2.53-0.44-3.93-0.28-0.84 0.1-2.02 0.19-2.96-0.11-1.36-0.44-2.91-0.31-4 0.04-1.76 0.55-3.46 0.4-5.17 0.5-2.34 0.11-4.68-1.07-7.02 0.03-0.07 0.04-0.18 0.04-0.26 0-1.4-0.75-2.83 0.28-4.29-0.07-0.92-0.22-2.01 0.28-2.93 0.18-0.86-0.09-1.54 0.28-2.33 0.3-0.59 0-1.18 0.29-1.75-0.06-0.61-0.36-1.24-0.24-1.9-0.22-1.18 0-2.25 0.24-3.37 0.59-1.16 0.37-2.41 0.42-3.57 0.9-0.69 0.3-1.5 0.56-2.03-0.36-0.15-0.26-0.61-0.37-0.59-0.15 0.06 0.99-0.77 0.68-1.22 0.92-0.29 0.17-0.55 0.22-0.33 0.66 0.57 1.22 0.65 2.54 0.76 3.85 0.05 0.7 0.55 0.92 0.92 0.81 0.77-0.2 1.51-0.05 2.26-0.11 3.01-0.2 5.99-0.35 8.99-0.5 0.94-0.05 1.86-0.03 2.8-0.03 2.62 0 5.21-0.04 7.83-0.04 2.19 0 4.42 0.2 6.59 0.04 3.11-0.24 6.21 0 9.3-0.17 2.05-0.11 4.07 0.33 6.17 0.22 3.19-0.18 6.41 0.13 9.63 0.17 0.85 0 1.62 0.29 2.56 0.2 2.6-0.28 5.22 0.2 7.85-0.11 0.7-0.09 1.62 0.42 2.14 0.28 1.93-0.56 3.81-0.1 5.69-0.04 2.04 0.06 4.09 0 6.13 0.18 1.29 0.11 2.76 0.11 4.12-0.07 0.37-0.05 0.65-0.28 0.59 0.39-0.03 0.35 0.23 0.07 0.41 0.03 1.91-0.4 3.85-0.88 5.78 0 0.44 0.21 1.31 0.26 1.33 0.06 0.11-1.51 1.27-0.66 1.69-0.63 0.68 0.06 1.61 0.26 2.1 0.13 2.14-0.57 4.24-0.13 6.34-0.13 2.41 0 4.84 0.17 7.24 0.37 0.69 0.06 1.52-0.77 2.13 0.26 0.11 0.18 0.17-0.02 0.19-0.13 0.2-0.74 0.88-0.42 1.3-0.52 2.42-0.49 4.87-0.36 7.32-0.47l0.07-0.06zm1.42 22.28c1.45 0.34 0.88 1.24 0.86 1.99-0.07 1.98-0.14 3.93-0.22 5.9-0.09 2.41-0.22 4.82 0.08 7.25 0.35 2.86 0.53 5.73 0.27 8.62-0.09 1.16-0.22 2.41 0.04 3.5 0.62 2.52 1.14 5.1 2.26 7.48 0.32 0.66 0.81 1.22 1.81 1.45 1.49 0.37 2.98 0.92 4.47 0.72 1.18-0.16 2.14 0.54 3.32 0.3 1.32-0.26 2.76-0.3 4.11-0.24 2.19 0.09 4.4 0.26 6.57 0.31 3.96 0.11 7.96 0.35 11.95-0.11 2.69-0.31 5.44-0.02 8.16-0.17 2.91-0.16 5.84-0.11 8.69-0.86 1.92-0.52 2.99-1.81 3.37-3.78 0.3-1.51 0-2.98 0.15-4.45 0.15-1.77 0.35-3.54 0.35-5.34 0-2.6-0.07-5.18-0.16-7.78-0.1-2.7-0.11-5.43-0.15-8.15-0.02-1.31-0.3-2.67-0.15-3.89 0.22-1.82 0.06-3.59 0.15-5.4 0.07-1.53 0.13-3.05-0.02-4.56-0.13-1.31 0-2.6-0.05-3.85-0.12-1.92 0.03-3.82-0.1-5.73-0.13-2.03 0.06-4.03-0.36-6.1-0.39-1.84-0.11-3.81-0.17-5.72-0.07-1.98-0.09-3.91 0.15-5.9 0.11-0.94 0.2-1.95 0.13-2.91-0.15-2.12-0.08-4.23 0-6.35 0.05-1.57 0.11-3.17 0-4.7-0.08-1.31-0.28-2.71-0.37-4.03-0.08-1.07-0.06-2.16-0.15-3.24-0.15-1.51-0.46-2.99-0.4-4.53 0.03-1.4-0.24-2.84-1.64-3.72-1.13-0.72-2.23-1.59-3.61-1.53-1.09 0.05-2.2 0.03-3.28 0.14-1.27 0.13-2.51 0-3.74-0.11-1.92-0.12-3.81 0.13-5.73-0.18-0.99-0.17-2.24-0.42-3.02-0.07-1.29 0.59-2.45 0.29-3.68 0.36-1.35 0.1-2.64-0.6-3.85-0.47-2.03 0.2-3.98 0.11-5.95-0.24-1.64-0.3-3.28 0.13-4.94 0.05-0.92-0.04-1.82-0.4-2.76-0.24-0.7 0.13-1.45 0.06-2.13 0.24-1.31 0.35-2.55-0.24-3.82-0.13-0.86 0.08-1.75 0.35-2.57 0.54-1.77 0.38-3.03 1.18-3.21 2.94-0.18 1.79-0.4 3.61-0.22 5.4 0.28 2.69 0.53 5.38 0.52 8.08 0 2.21 0.16 4.46 0.03 6.65-0.07 1.38-0.05 2.8 0.06 4.11 0.16 1.71-0.15 3.37-0.09 5.05 0.03 1.23 0.58 2.61 0.09 3.72-0.65 1.41-0.33 2.83-0.37 4.2-0.06 3.24 0.18 6.48 0.11 9.76-0.06 2-0.06 4.12 0.24 6.07 0.42 2.82-0.13 5.59 0.13 8.35 0.05 0.64 0.09 1.43-1.15 1.36l-0.01-0.06zm24.58-109.87c0.28 0.86-0.97 1.49-0.48 2.25 0.47 0.7 0.19 1.25-0.01 1.84-0.32 0.9-0.21 2.02 0.29 2.85 0.55-2.24 0.26-4.58 0.22-6.92l-0.02-0.02zM56.47 97.58c-0.02-0.64-0.72-0.66-0.97-1.08-0.21 0.2-0.67 0.09-0.61 0.55 0.07 0.64 0.48 0.9 1.07 0.96 0.29 0.02 0.53-0.04 0.51-0.41v-0.02zm93.45-83.11c0.61-1.84 0.48-2.95-0.28-3.63 0.1 1.1 0.17 2.21 0.28 3.63z" android:fillColor="#000000"/>
-    <path android:pathData="M186.3 116.67v-0.98c0-1.54-0.07-3.09-0.15-4.64-0.03-0.94-0.09-1.87-0.11-2.83l-0.05-1c-0.06-1.05-0.1-2.04 0-2.96 0.49-5.56 0.68-11.29 0.57-16.98-0.06-2.3-0.1-4.61-0.11-6.87 0-2.16-0.1-4.33-0.19-6.43l-0.09-2.12c-0.05-1.25-0.37-2.41-0.66-3.55-0.22-0.85-0.43-1.66-0.52-2.45-0.33-3.15-1.97-5.36-4.75-6.37-0.09-0.1-0.18-0.19-0.33-0.3-1.9-1.4-4.02-2.17-6.15-2.21h-5.05c-3.3 0-6.61 0-9.91 0.06l-5.65 0.03c0.07-1.91 0-3.85-0.06-5.72-0.03-0.8-0.05-1.61-0.07-2.38 0-0.57-0.02-1.16-0.06-1.73 0-0.81-0.05-1.6-0.03-2.38 0.03-1.49 0.13-2.74 0.24-3.88 0.09-0.79 0.01-1.53-0.06-2.18-0.05-0.6-0.11-1.12-0.04-1.56 0.24-1.2 0.15-2.32 0.1-3.41-0.08-0.92-0.13-1.8 0.01-2.59 0.19-0.98 0.17-1.92 0.15-2.82-0.02-0.67-0.02-1.29 0.04-1.84 0.26-2.09 0.26-4.17 0.26-6.19 0-0.9 0-1.81 0.02-2.75 0-1.16 0.07-2.32 0.12-3.57 0.08-1.55-0.12-3.02-0.33-4.44-0.18-1.42-0.37-2.74-0.26-4.03 0.17-2.12-1.38-3.22-1.87-3.59-0.8-0.57-1.62-0.72-2.23-0.81-0.19-0.04-0.44-0.08-0.46-0.09-1.83-0.89-3.59-1.04-4.94-1.07-0.99-0.02-1.97-0.04-2.96-0.04-1.7 0-3.35 0.04-4.96 0.13-0.66 0.04-1.32 0.05-1.99 0.05-1.49 0-3.02-0.07-4.66-0.16-0.55 0-0.99 0.15-1.32 0.24-0.02 0.02-0.04 0.02-0.06 0.02-0.64-0.17-1.32-0.26-2.06-0.26s-1.42 0.07-2.06 0.16l-0.65 0.08c-0.73 0.07-1.51 0.11-2.32 0.11-0.44 0-0.9 0-1.34-0.04-1.73-0.07-3.46-0.11-5.2-0.13h-2.15c-1.45-0.02-2.91 0.08-4.33 0.17-1.4 0.09-2.72 0.18-4.07 0.18-0.51 0-1.03-0.02-1.56-0.05h-0.39c-0.64 0-1.25 0.09-1.79 0.16-0.4 0.08-0.81 0.15-1.25 0.15h-0.2c-0.89-0.09-1.79-0.09-2.71-0.09h-1.03c-0.85 0-1.84-0.02-2.78-0.11-1.95-0.22-3.85-0.24-5.45-0.24-0.68 0-3.17 0.02-3.17 0.02-1.46 0-2.91 0.07-4.37 0.13-1.47 0.07-2.94 0.12-4.43 0.12-0.92 0-1.85-0.01-2.77-0.09-0.7-0.05-1.41-0.07-2.13-0.07-1.22 0-2.45 0.07-3.67 0.24l-0.96 0.13c-1.25 0.18-2.45 0.35-3.73 0.35-0.93-0.02-1.85-0.11-2.77-0.19-1.08-0.11-2.21-0.2-3.35-0.2h-0.96c-0.33 0.02-0.66 0.04-0.97 0.04-0.96 0-1.92-0.08-2.86-0.15-1.05-0.07-2.08-0.17-3.13-0.17-0.24 0-0.48 0.02-0.72 0.02-0.62 0.02-1.25 0.04-1.87 0.04-0.7 0-1.4-0.02-2.1-0.02-0.72-0.02-1.44-0.02-2.16-0.02h-0.98c-1.03 0.02-2.04 0.08-3.05 0.13-1.13 0.06-2.25 0.13-3.35 0.13-0.41 0-0.81 0-1.2-0.04-0.46-0.01-0.9-0.03-1.35-0.03-2.74 0-5.39 0.46-7.97 0.9l-1.66 0.28-0.31 0.03c-0.81 0.11-1.92 0.26-2.87 1.02-1.04 0.77-1.42 1.8-1.72 2.54-0.07 0.24-0.14 0.46-0.27 0.66-1.07 1.8-1.14 3.55-1.22 5.12-0.02 0.33-0.04 0.68-0.07 1.03-0.08 1.07 0 2.06 0.09 3.04 0.09 1.14 0.18 2.23-0.04 3.19-0.24 1.12-0.09 2.15 0.02 3.03 0.15 0.96 0.2 1.57-0.02 2.05-0.53 1.07-0.49 2.12-0.44 2.95 0 0.29 0.04 0.6-0.02 0.97-0.03 0.33-0.13 1.25 0.52 1.97 0.15 0.17 0.35 0.3 0.57 0.41l-0.04 3.4c-0.02 1.9-0.03 3.8-0.03 5.7v2.56c0.01 2.06 0.03 4.19-0.08 6.26-0.04 0.61-0.07 1.19-0.11 1.8-0.09 1.24-0.18 2.53-0.16 3.85 0.03 1.47 0.11 2.95 0.16 4.42 0.09 2.06 0.19 4.18 0.2 6.26 0 0.48 0 0.98 0.04 1.46 0.06 1.69 0.11 3.28-0.37 4.8-0.42 1.44-0.31 2.9-0.22 4.19 0.04 0.51 0.08 1.03 0.08 1.52v1.4c0 1.83 0 3.63-0.04 5.46-0.08 3.46 0.02 6.66 0.27 9.81v0.2c0.06 0.37 0.11 0.91 0.3 1.48-0.15 0.03-0.28 0.07-0.39 0.07-0.13-0.02-0.26-0.02-0.38-0.02-1.02 0-1.86 0.37-2.55 0.67-0.36 0.16-0.71 0.31-1.01 0.36-0.5 0.11-0.99 0.24-1.49 0.37-0.98 0.26-1.92 0.5-2.82 0.5H5.78c-0.61 0-1.13 0.11-1.57 0.37H4.08c-0.37 0-0.75 0.09-1.09 0.24L2.7 97.19c-0.77 0.31-2.43 0.95-2.65 3.03-0.15 1.11 0.07 2.05 0.26 2.88 0.07 0.33 0.14 0.64 0.18 0.96l0.11 0.73c0.11 0.79 0.22 1.53 0.13 2.08-0.59 2.95 1.18 3.8 2.26 4.04 0.24 0.05 0.52 0.07 0.78 0.07 0.37 0 0.75-0.05 1.12-0.13 0.11 0 0.2-0.03 0.31-0.05 0.91 0.51 1.81 0.57 2.42 0.57 0.24 0 0.48-0.02 0.72-0.02 1.82-0.11 3.66-0.15 5.48-0.2 1.46-0.04 2.91-0.1 4.39-0.15 1.34-0.07 2.69-0.09 4.03-0.09 1.49 0 2.97 0.03 4.46 0.05 1.32 0.02 2.63 0.06 3.94 0.06h3.07c2.14 0.02 4.28 0.03 6.41 0.05 0.81 0 1.62 0.02 2.43 0.02h2.51c1.58-0.02 3.17 0 4.73 0.06 0.96 0.03 1.9 0.03 2.84 0.03s1.82 0 2.72-0.01c0.91 0 1.79-0.02 2.69-0.02 0.8 0 1.59 0.02 2.36 0.03 0.77 0.02 1.55 0.04 2.32 0.04h3.61c0.61-0.02 1.22-0.02 1.82 0 0.46 0.02 0.92 0.02 1.39 0.02 0.93 0 1.86-0.02 2.79-0.04 0.89-0.03 1.79-0.05 2.69-0.05 0.96 0 1.92 0.03 2.88 0.11 0.55 0.03 1.1 0.05 1.65 0.05 0.56 0 1.15 0 1.7-0.03 0.53-0.02 1.07-0.04 1.6-0.04 0.22 0 0.42 0.02 0.65 0.02 3.14 0.11 6.29 0.13 9.44 0.14 1.42 0 2.84 0 4.26 0.04 0.66 0 1.32 0.02 1.97 0.04 0.86 0.03 1.73 0.05 2.58 0.05h1.67c1.29-0.02 2.58-0.02 3.85-0.09h0.2c0.45 0 0.91 0.06 1.37 0.13 0.57 0.07 1.18 0.17 1.84 0.17 0.24 0 0.5-0.02 0.74-0.06 1.12-0.11 2.37-0.17 3.92-0.17 0.83 0 1.64 0.02 2.47 0.02 0.83 0.02 1.67 0.04 2.5 0.04 0.57 0 1.16 0 1.73-0.02-0.09 1.31-0.13 2.75-0.09 4.33l0.04 0.83c0.03 0.83 0.07 1.62 0 2.37-0.17 2.07-0.32 4.5-0.1 6.97 0.15 1.86 0.19 3.29 0.1 4.51-0.08 1.07-0.13 2.15-0.19 3.24l-0.09 1.6c-0.04 0.63 0.04 1.27 0.09 1.83 0.04 0.49 0.11 1.04 0.04 1.36-0.2 0.97-0.15 1.88-0.09 2.67 0.03 0.57 0.05 1.05 0 1.51-0.17 1.32-0.06 2.58 0.07 3.81 0.06 0.57 0.11 1.16 0.13 1.71 0.02 0.98 0.02 1.97 0 2.95 0 3.52-0.06 7.15 1.16 10.76l0.17 0.46c0.9 2.7 2.02 6.07 5.98 7.27 1.83 0.53 3.45 0.81 4.99 0.81 1.42 0 2.8-0.24 3.98-0.7 0.52 0.33 1.11 0.5 1.71 0.5 0.61 0 1.16-0.17 1.55-0.3 0 0 0.04 0 0.06-0.02 0.49 0.36 0.99 0.43 1.3 0.43 0.57 0 1.07-0.22 1.44-0.48 0.35 0.28 0.81 0.42 1.31 0.42 0.03 0 0.2-0.01 0.24-0.01 1.75 0.09 3.62 0.16 5.52 0.16 0.77 0 1.53 0 2.3-0.04h0.32c0.44 0 0.88 0.04 1.32 0.06 0.56 0.06 1.11 0.09 1.64 0.09 0.59 0 1.13-0.05 1.64-0.15 0.09-0.01 0.2-0.01 0.3-0.01 0.31 0 0.6 0.03 0.92 0.07 0.44 0.06 0.9 0.11 1.36 0.11 0.77 0 1.46-0.15 2.06-0.44 0.33 0.11 0.68 0.16 1.03 0.16 0.67 0 1.22-0.18 1.68-0.33 0.18-0.05 0.46-0.15 0.55-0.15 3.04-0.11 6.58-0.23 10.06-0.68 5.34-0.64 8.49-3.4 8.87-7.8 0.04-0.56 0.08-1.09 0.11-1.64 0.04-0.52 0.06-1.02 0.1-1.5 0.07-0.6 0.14-1.19 0.2-1.8 0.22-1.94 0.46-3.92 0.44-5.97-0.02-1.2-0.05-2.37-0.11-3.57-0.05-1.53-0.13-3.08-0.11-4.6 0-1 0.06-1.99 0.08-2.99 0.03-1.29 0.07-2.58 0.09-3.87v-3.44c-0.02-1.45-0.06-2.89 0-4.35 0.14-3.68 0.13-7.4 0.11-11.03h-0.02zm-2.1-8.38c0.07 2.47 0.24 4.96 0.26 7.42 0.02 3.98 0.05 7.96-0.11 11.92-0.09 2.63 0.05 5.23 0 7.85 0 2.28-0.13 4.56-0.17 6.83-0.02 2.74 0.19 5.49 0.22 8.23 0 2.54-0.37 5.05-0.62 7.57-0.1 1.05-0.13 2.1-0.23 3.15-0.36 4.29-3.88 5.75-7.25 6.15-3.3 0.41-6.59 0.55-9.89 0.66-1.11 0.04-2.21 1.05-3.3-0.02-1.47 1.48-3.28 0.34-4.9 0.65-1.56 0.29-3.13-0.11-4.66-0.04-2.56 0.11-5.1 0-7.64-0.13-0.26-0.02-0.59 0.11-0.68-0.22-0.43-1.53-1.11-0.64-1.64-0.15-0.52 0.47-0.9 0.71-1.34-0.01-0.12-0.17-0.26-0.06-0.43-0.06-0.94 0.02-1.89 0.92-2.87 0-0.26-0.26-0.68-0.2-1.01-0.07-2.73 1.05-5.45 0.75-8.16-0.06-3.24-0.97-4.04-3.88-4.94-6.55-1.44-4.28-0.98-8.73-1.07-13.15-0.05-1.75-0.44-3.54-0.22-5.25 0.19-1.36-0.2-2.67 0.08-4.07 0.22-1-0.17-2.31-0.1-3.43 0.1-1.6 0.15-3.22 0.28-4.8 0.11-1.55 0.04-3.21-0.09-4.81-0.21-2.23-0.09-4.46 0.09-6.67 0.09-1.14 0-2.26-0.04-3.41-0.03-1.71 0-3.42 0.19-5.13 0.07-0.74-0.11-1.09-0.9-1.04-3.95 0.24-7.91-0.22-11.87 0.21-1.32 0.14-2.68-0.33-4.03-0.26-1.66 0.09-3.35 0.07-5.01 0.09-1.62 0.02-3.29-0.07-4.95-0.09-4.55-0.06-9.12-0.04-13.67-0.18-1.84-0.06-3.68 0.14-5.5 0-3.28-0.26-6.56 0.05-9.84-0.04-2.58-0.07-5.16 0.05-7.73-0.04-3.54-0.11-7.08 0.09-10.61-0.03-3.24-0.12-6.49-0.04-9.73-0.08-3.15-0.04-6.31-0.04-9.48-0.05-4.18-0.02-8.36-0.22-12.54-0.02-3.3 0.15-6.6 0.16-9.89 0.35-0.7 0.03-1.49 0.07-2.21-0.37-0.8-0.5-1.73 0.17-2.62-0.04-1.01-0.22-1.07-0.85-0.86-1.88 0.2-1.08-0.08-2.28-0.22-3.4-0.15-1.13-0.59-2.19-0.45-3.37 0.13-1.16 1.05-1.35 1.86-1.7 0.52-0.24 0.8 0 0.98 0.63-0.02-1.05 0.66-1.13 1.29-1.09 1.75 0.07 3.33-0.55 4.99-0.9 1.18-0.24 2.21-1.11 3.37-1 0.99 0.1 1.75-0.47 2.63-0.51 1.11-0.06 0.67-0.81 0.39-1-0.83-0.59-0.83-1.45-0.9-2.22-0.28-3.21-0.35-6.41-0.28-9.62 0.06-2.3 0.04-4.58 0.04-6.89 0-1.73-0.41-3.57 0.07-5.17 0.7-2.3 0.43-4.55 0.41-6.82-0.02-3.57-0.28-7.14-0.37-10.71-0.04-1.85 0.18-3.67 0.27-5.51 0.17-2.97 0.06-5.95 0.06-8.91 0-3.14 0.06-6.27 0.07-9.42 0-0.58 0.46-1.52-0.88-1.28-0.29 0.05-0.22-0.45-0.2-0.63 0.13-1.09-0.24-2.25 0.26-3.24 0.88-1.83-0.24-3.67 0.16-5.51 0.48-2.14-0.18-4.33 0-6.48 0.15-1.79-0.02-3.59 1.03-5.36 0.5-0.83 0.59-1.97 1.51-2.67 0.7-0.55 1.62-0.59 2.36-0.7 3.5-0.57 6.98-1.33 10.59-1.12 2.58 0.12 5.16-0.19 7.73-0.23 2.4-0.03 4.77 0.1 7.17 0 2.58-0.09 5.12 0.43 7.72 0.26 2.28-0.13 4.62 0.33 6.92 0.37 1.68 0.02 3.32-0.28 4.97-0.5 1.79-0.24 3.63-0.29 5.42-0.14 3.9 0.29 7.81-0.15 11.71-0.17 2.82-0.02 5.64-0.09 8.42 0.2 2.21 0.24 4.4 0.02 6.57 0.21 1.29 0.09 2.43-0.37 3.67-0.3 3.52 0.22 7.03-0.37 10.55-0.31 2.27 0.03 4.51 0.03 6.78 0.14 1.27 0.08 2.63 0.06 3.96-0.09 1.4-0.14 2.81-0.44 4.25 0.04 0.54 0.18 1.12-0.3 1.77-0.26 2.23 0.13 4.48 0.24 6.68 0.11 2.58-0.15 5.16-0.16 7.76-0.09 1.42 0.04 2.82 0.22 4.18 0.88 0.7 0.32 1.67 0.21 2.41 0.74 0.67 0.48 1.2 1.03 1.12 1.95-0.23 2.88 0.74 5.66 0.59 8.53-0.05 1.22-0.11 2.43-0.12 3.65-0.08 2.91 0.09 5.83-0.26 8.73-0.19 1.51 0.11 3.09-0.17 4.53-0.38 2.04 0.26 4.05-0.11 6.02-0.24 1.33 0.22 2.58 0.07 3.87-0.14 1.32-0.22 2.69-0.25 4.03 0 1.38 0.07 2.78 0.09 4.18 0.05 2.76 0.24 5.54 0.11 8.29-0.07 1.45 0.61 1.64 1.68 1.64 6.92-0.04 13.84-0.15 20.77-0.08 1.8 0.04 3.55 0.72 5.07 1.85 0.2 0.16 0.38 0.4 0.6 0.47 2.38 0.8 3.5 2.58 3.76 4.92 0.22 2.01 1.07 3.92 1.16 5.9 0.11 2.81 0.28 5.63 0.28 8.45 0 2.28 0.05 4.6 0.11 6.9 0.11 5.6-0.08 11.2-0.57 16.78-0.12 1.38 0 2.8 0.07 4.2z" android:fillColor="#F9F9FB" android:fillAlpha="0.5"/>
-    <path android:pathData="M92.25 41.49s-0.24 0-0.24 0.02c-0.4 2.01-1.99 1.95-3.52 2.08-0.71 0.06-1.49-0.18-1.25 1.36 0.28 1.86 0.3 3.83 0.24 5.75 0 0.48-0.26 0.92 0.77 0.75 2.4-0.38 2.44-0.25 2.12-2.68-0.07-0.59 0.08-1.09 0.22-1.64 0.08-0.3 0.24-0.43 0.41-0.32 1.34 0.81 2.67-0.33 4.05-0.03 1.25 0.27 2.08 0.92 1.97 2.19v0.13c-0.37 3-0.2 3.15 2.76 2.8 0.58-0.08 0.81-0.17 0.7-0.78-0.07-0.46-0.05-0.94-0.05-1.41-0.06-1.81 0.26-2.27 2.06-2.51 1.33-0.18 2.69-0.2 4.04-0.2 0.33 0 0.95 0 0.88 0.83-0.08 0.99 0.13 2 0.13 3.02 0 2.02-0.68 2.72-2.65 2.82-1.94 0.09-1.94 0.31-1.72 2.24 0.19 1.59 0.68 3.17 0.37 4.79-0.13 0.64 0.2 0.87 0.7 0.99 0.13 0.04 0.26 0 0.39 0 2.5 0.1 3.04 0.56 3.15 2.95 0.09 2.1 0.14 4.2-0.15 6.28-0.26 1.79-1.62 2.62-3.31 1.99-0.43-0.16-0.65 0.11-0.96 0.26-1.83 0.83-2.78 0.2-2.82-1.77-0.03-1.56-0.82-2.58-2.38-3.06-0.27-0.09-0.49-0.4-0.94-0.22-0.29 1.03 0.32 2.06 0.21 3.19-0.24 2.3-1.03 3.22-3.36 3.02-0.36-0.04-0.73-0.02-1.1-0.04-2.08-0.11-2.32-0.4-2.56-2.72-0.06-0.56-0.31-1.11-0.26-1.64 0.08-0.72-0.4-0.78-0.81-0.94-0.11-0.04-0.24-0.04-0.37-0.04-1.27 0-1.93 0.77-1.97 2.32-0.05 1.92-0.4 2.05-2.24 2.23-1.37 0.13-2.6-0.5-3.95-0.28-0.57 0.1-0.49-0.68-0.51-0.99-0.06-2.62-0.04-5.23 0-7.85 0.04-1.25 0.83-1.97 1.99-2 2.45-0.1 4.9-0.32 7.33-0.21 1.23 0.06 1.25-0.86 1.1-1.29-0.29-0.81-0.18-1.52-0.09-2.32 0.07-0.62-0.39-1.05-0.86-0.73-1.55 1.03-3.25 0.55-4.79 0.33-1.24-0.17-2.43 0.24-3.67-0.11-1.07-0.31-1.31-0.98-1.32-1.88 0-0.39 0.2-0.79 0.16-1.16-0.2-1.49-0.2-1.57-2.13-2.23-0.54-0.18-1-0.48-1.52-0.68l0.04 0.04c0-1.33 0.04-2.67 0-4-0.04-1.07 0.28-1.68 1.48-1.36 0.12 0.03 0.25 0.13 0.36 0.09 0.67-0.17 1.4-0.24 1.99-0.55 0.67-0.37 0.06-1.07 0.13-1.62 0.22-1.66 0.59-2.1 2.29-2.14 0.12 0 0.25-0.09 0.36-0.07 1.51 0.27 2.08-0.34 1.75-1.85-0.05-0.2-0.07-0.46 0-0.64 0.48-1.33-0.16-1.34-1.18-1.09-2.3 0.56-3.64-0.55-3.66-2.96 0-0.96 0-1.94 0.13-2.89 0.05-0.39 0.16-0.81 0.9-0.92 1.12-0.19 2.19-0.39 3.35-0.35 1.38 0.05 2.03 0.86 2.4 2.04 0.07 0.2 0.11 0.42 0.14 0.63 0.19 0.81 0.15 1.75 0.43 2.43 0.31 0.73 1.42-0.02 2.17 0.14 1.58 0.34 1.95 1.04 2.25 2.53 0.13 0.62-0.11 1.34 0.46 1.84v0.15l-0.04-0.06zm2.97 12.97c-0.08-0.11 0.35-0.91-0.5-1-0.65-0.07-1.38-0.13-1.97 0.09-1.22 0.46-0.11 1.75-0.74 2.51-0.15 0.16-0.07 0.51 0.17 0.72 0.24 0.18 0.42-0.17 0.59-0.08 0.49 0.28 1.05-0.36 1.49 0.04 0.99 0.92 0.9 0 0.96-0.57 0.05-0.46 0-0.92 0-1.73v0.02zM92.47 65.6c0.04 1.04 0.52 1.56 1.44 1.55 0.13 0 0.28-0.15 0.35-0.11 1.18 0.46 1.2-0.28 1.14-1.09-0.02-0.3-0.04-0.61-0.07-0.9-0.13-1.22-0.76-1.73-2.16-1.66-1.05 0.05-0.57 0.94-0.72 1.51-0.05 0.26-0.22 0.48 0 0.7h0.02zm-27.79 2.93c0-1.94-0.09-3.89 0.02-5.82 0.15-2.32 0.96-3.1 3.11-2.89 2.54 0.22 5.07 0.2 7.61 0.11 2.02-0.08 2.74 0.7 2.98 3.33 0.22 2.47 0.5 4.95 0.26 7.46-0.2 2.26-1.16 3.37-3.41 3.41-2.12 0.03-4.21-0.39-6.33-0.3-0.17 0-0.41 0-0.48-0.11-0.68-1.03-1.24-1.12-2.03 0-0.42 0.61-1.34 0.02-1.45-0.98-0.15-1.39-0.33-2.79-0.3-4.21h0.02zm2.06-2.97c-0.22 1.81 0.13 3.61 0.24 5.4 0.02 0.39-0.07 1.84 1.22 0.86 0.15-0.11 0.31 0.06 0.46 0.06 2.3 0.15 4.6 0.26 6.91 0.4 0.55 0.04 0.9-0.05 1.05-0.68 0.27-1.18 0.46-2.43 0.4-3.55-0.07-1.71-0.37-3.45-0.46-5.2-0.02-0.46-0.15-1.01-0.9-1.01-2.6 0-5.18 0.02-7.77-0.03-0.74 0-1.04-0.04-1.05 0.92 0 0.94-0.22 1.89-0.11 2.85l0.01-0.02z" android:fillColor="#000000"/>
-    <path android:pathData="M76.47 52.08c0.74 1.14 0.44 2.43 0.31 3.59-0.2 1.95-0.2 2.41-2.5 2.34-0.63 0-1.27 0.26-1.92 0.28-1.71 0.05-2.25-0.41-2.23-2.1 0-0.85-0.14-1.68-0.14-2.51 0-0.57-0.1-0.72-0.78-0.55-0.97 0.24-1.99 0.55-3.04 0.35-0.77-0.17-1.27-0.5-1.23-1.38 0.05-1.22-0.11-2.45 0.11-3.63 0.2-1.16 2.34-2.17 3.68-1.97 0.52 0.07 1 0.3 1.51 0.35 1.09 0.15 1.53 0.81 1.51 1.84 0 0.2-0.14 0.43-0.13 0.61 0.08 0.61-0.09 1.31 0.1 1.79 0.25 0.66 1.1 0.03 1.6 0.24 1.03 0.4 2.34-0.32 3.17 0.79l-0.04-0.04h0.02zm2.71-13.35c0.16 1.73-0.17 3.33-0.5 4.93-0.3 1.46-1.12 1.88-2.67 1.96-2.18 0.09-4.35 0.35-6.52 0.48-1.03 0.05-2.1 0.03-3.08-0.37-1.42-0.59-1.78-1.51-1.67-3.02 0.07-1.05-0.22-2.1-0.21-3.19 0.06-1.97 0.1-3.94 0.35-5.89 0.04-0.21 0.1-0.33-0.16-0.54-0.46-0.35-0.22-1.08 0.05-1.12 0.91-0.11 1.77-0.77 2.56-0.64 2.45 0.42 4.87 0.4 7.32 0.16 0.7-0.07 1.43-0.02 2.13 0.11 1.29 0.26 2.12 1.24 2.17 2.89 0.04 1.44 0.52 2.86 0.23 4.24zm-12.84-6.01s-0.07 0.21-0.07 0.32c-0.04 3-0.13 6-0.12 8.99 0 1.86 1.77 2.96 3.65 2.48 0.77-0.2 1.57-0.48 2.41-0.33 1.31 0.2 2.58 0.02 3.87-0.33 0.9-0.26 1.13-0.76 1.2-1.55 0.22-2.5 0.16-4.99-0.11-7.49-0.11-1.07-0.66-1.46-1.55-1.51-1.12-0.06-2.26-0.1-3.39 0-2 0.18-3.99 0.2-5.89-0.61v0.03zm25.91 8.77v-0.15c0.06-1.89 0.11-3.81 0.15-5.71 0.02-1.89 1.18-2.7 3-3.14 1.93-0.48 3.83-0.45 5.75-0.59 1.19-0.08 2.34 0.09 3.5 0.12 0.95 0.04 1.41 0.83 1.64 1.7 0.6 2.41 0.62 4.9 0.81 7.37 0.05 0.81 0.25 1.56-0.28 2.43-0.96 1.51-2.34 2.34-3.92 2.48-2.42 0.22-4.87 0.17-7.3 0.02-2.11-0.13-2.78-0.94-3.02-3.28-0.05-0.44-0.16-0.84-0.29-1.25h-0.04zM94.22 40c-0.18 1.18-0.15 2.36 0.3 3.48 0.13 0.29 0.07 0.57 0.68 0.64 1.42 0.17 2.87-0.18 4.18 0.17 1.38 0.37 2.58 0.15 3.85-0.09 1.12-0.2 1.95-1.38 2.04-2.53 0.19-2.17-0.31-4.29-0.37-6.44-0.01-0.92-0.53-1.7-1.62-1.6-1.29 0.09-2.56 0.14-3.83 0-1.49-0.17-2.93 0.48-4.34 0.38-0.85-0.03-0.89 0.24-0.89 0.74-0.03 1.75 0 3.5 0 5.25zM71.51 70.61c-1.65-0.04-2.37-0.65-2.59-2.21-0.13-0.96-0.3-1.92-0.44-2.87-0.19-1.17 0.42-2.01 1.62-2.2 1.38-0.22 2.78-0.13 4.12 0.22 1 0.26 1.18 1.31 1.22 2.03 0.03 1.09 0.38 2.14 0.16 3.24-0.18 1-0.53 1.64-1.71 1.59-0.79-0.04-1.58 0.12-2.38 0.2z" android:fillColor="#000000"/>
-    <path android:pathData="M71.02 43.13c-2.38 0.26-3.1-0.5-3.39-3.2-0.09-0.83-0.66-1.77 0.29-2.53 0.04-0.02-0.75-0.53-0.42-1.03 0.46-0.72 0.59-1.86 2.03-1.25 0.6 0.26 1.45 0.09 2.17 0 2.54-0.33 2.72-0.13 3.68 2.17 0.44 1.05 0.48 2.05 0.35 3.04-0.29 2.19-1.53 2.43-4.36 2.87-0.11 0-0.26-0.07-0.35-0.09v0.02zm29.35-8.49c1 0.59 1.68 1.29 2.44 1.84 1.78 1.31 0.8 4.99-1.44 5.8-3.11 1.15-5.67-0.94-5.21-4.23 0.18-1.37 0.81-1.9 2.1-1.75 0.35 0.03 0.55 0.22 0.59 0.59 0.01 0.22 0 0.51 0.12 0.62 0.76 0.61 1.72 1.11 0 1.79-0.33 0.13-0.14 0.77 0.34 0.9 0.46 0.11 0.94 0.15 1.34-0.27 0.41-0.43 0.5-0.91 0.15-1.29-0.48-0.52-0.24-1.66-1.4-1.62-0.37 0-0.3-0.37-0.06-0.57 0.55-0.45 1-0.96 1.05-1.77l-0.02-0.04z" android:fillColor="#000000"/>
-    <group>
-        <clip-path android:pathData="M57 21h57v60H57z"/>
-        <path android:pathData="M58.39 43c-0.73-0.15-0.98-0.27-0.97-1.11 0.04-1.41 0-2.85 0-4.26 0.1-4.12-0.65-8.18-0.34-12.3 0.13-1.81 0.94-2.35 2.37-3.04 2.88-1.4 5.81-0.23 8.66-0.62 2.53-0.34 5.06 0.31 7.61 0.24 2.14-0.06 4.24-0.41 6.36-0.33 3.56 0.11 7.11-0.02 10.66-0.08 3.58-0.04 7.21 0.08 10.8-0.44 1.06-0.16 2.18-0.06 3.3 0.23 0.56 0.13 1.43 0.1 2.12-0.04 1.64-0.35 3.21 0.62 3.92 2.1 0.62 1.31 0.29 2.58 0.35 3.89 0.08 1.59 0.29 3.19 0.17 4.77-0.35 5.24 0.1 10.45 0.02 15.69-0.06 3.87 0.19 7.72 0.21 11.59 0 3.15-0.03 6.33 0.1 9.49 0.06 1.17 0.64 2.31-0.17 3.58-0.27 0.42 0.19 1.65 0.13 2.56-0.19 2.94-1.14 4.33-3.97 5.23-1.24 0.41-2.45 0.5-3.9 0.23-2.32-0.44-4.85 0.24-7.26 0.12-5.55-0.29-11.09 0.73-16.67 0.1-2.06-0.23-4.24 0.42-6.29 0.15-1.81-0.25-3.55 0.15-5.32 0.12-1.93-0.04-3.9 0.19-5.81 0.13-3.77-0.1-5.75-2.21-6.22-6.06-0.38-3.16-0.59-6.34-0.59-9.51 0-1.68-0.14-3.39 0.13-5.05 0.35-2.13-0.27-4.19-0.19-6.31 0.08-2.16 0.13-4.35-0.1-6.52-0.09-0.95 0-1.95-0.06-2.91-0.03-0.66 0.45-1.04 0.97-1.66L58.39 43zm1.14 23.87c-0.33 2.06 0.73 4.41 0.69 6.91-0.04 2.54 2.72 4.37 5.1 4.31 7.81-0.13 15.65-0.05 23.48-0.05 3.14 0 6.29-0.02 9.44 0 0.86 0 1.83-0.66 2.6 0.28 1.08-0.82 2.37-0.59 3.57-0.55 1.45 0.04 2.82-0.25 4.19-0.6 1.12-0.29 2.83-2.02 2.74-2.83-0.33-2.69 0.05-5.45-0.33-8.12-0.18-1.22 0.46-2.27 0.21-3.45-0.44-2.1-0.19-4.23-0.33-6.37-0.03-0.52 0.99-0.56 0.43-1.04-0.56-0.46-0.39-1-0.39-1.52 0.1-6.16-0.29-12.32 0-18.48 0.08-1.79-0.31-3.6 0.25-5.35 0.41-1.27-0.61-3.27-1.93-3.49-1.56-0.25-3.12-0.57-4.74-0.63-2.18-0.06-4.36 0.29-6.56 0.06-1.72-0.18-3.44-0.27-5.21-0.2-1.84 0.08-3.73-0.34-5.6-0.42-2.28-0.09-4.52 0.54-6.75 0.27-3.53-0.44-7.01-0.11-10.52 0.04-0.77 0.04-1.56-0.17-2.32-0.19-2.02-0.06-4.36-1.56-6 0.96-0.03 0.06-0.17 0.04-0.27 0.06-1.83 0.44-2.72 1.67-2.27 3.52 0.29 1.19 0.21 2.37 0.19 3.56-0.04 2.48-0.19 4.97-0.08 7.43 0.23 4.54 0.08 9.11 0.31 13.65 0.19 3.93 0.04 7.85 0.04 12.22l0.06 0.02z" android:fillColor="#000000"/>
-    </group>
-    <path android:pathData="M146.76 51.35c-0.09-3.04-0.66-5.99-0.25-8.99 0.64 3 0.2 6.02 0.25 8.99zm-61.27 53.19c-0.66 0.71-1.05-1.33-2.01-0.13-0.29 0.37-1.71 0.46-2.65 0.51-2.08 0.13-4.16-0.37-6.24 0-1.44 0.26-2.89 0.44-4.2-0.55-0.07-0.05-0.5 0.18-0.39-0.24 0.09-0.28 0.37-0.68 0.61-0.7 1.18-0.11 2.27-1.32 3.54-0.29 0.29-0.87 0.84-0.35 1.38-0.37 2.39-0.06 4.79-0.39 7.16-0.37 1.24 0 2.49 0 3.74 0.04 0.59 0.01 1.05 0.27 1.05 0.68 0 0.38 0 1.05-0.74 1.2-0.42 0.09-0.81 0.29-1.25 0.22zm91.48 56.42c-0.65-0.07-0.32 0.54-0.52 0.8-0.44 0.55-0.7 0.94-1.62 0.86-0.86-0.09-1.78 0.41-2.72 0.57-2.07 0.37-4.13 0.11-6.19 0.15-1.64 0.04-3.32 0.11-4.92 0.46-1.79 0.39-3.48-0.04-5.21-0.13-1.58-0.09-3.17-0.4-4.79-0.07-0.94 0.18-1.95 0.02-2.89 0-1.86-0.06-3.67 0.28-5.51 0.31-1.21 0.04-2.28-0.59-3.48-0.48-1.29 0.13-2.6 0.48-3.85 0.39-1.71-0.13-3.48-0.24-5.06-1.07-0.11-0.05-0.22-0.2-0.22-0.31-0.04-1.79-1.62-3.19-1.37-5.03 0.19-1.44-0.14-2.87 0.15-4.33 0.2-0.97-0.5-2.01-0.31-3.09 0.33-1.9 0.15-3.83-0.04-5.69-0.2-2.19 0.02-4.33 0.04-6.48 0-2.36-0.41-4.76-0.52-7.11-0.11-2.58-0.03-5.23 0.04-7.83 0.06-2.16 0.13-4.46-0.33-6.67-0.11-0.55 0-1.27 0.02-1.91 0.07-1.22 0.68-2.43 0.24-3.7-0.13-0.35-0.23-0.91 0.33-1.17 0.13-0.05 0.4-0.12 0.2-0.35-0.83-0.88-0.15-1.82-0.13-2.72 0-1.95 0.28-3.89 0.33-5.84 0.06-1.55-0.11-3.06-0.13-4.6 0-2.75-0.92-5.47-0.16-8.25 0.13-0.46-0.3-1.07 0.64-1.02-0.03-0.44-0.72-0.13-0.61-0.84 0.39-2.42 0.32-4.9 0.24-7.32-0.01-1.08-0.14-2.39-0.44-3.57-0.11-0.4-0.46-1.29 0.57-1.4-0.46-0.92 0.28-1.82 0.06-2.72-0.02-0.08-0.15-0.21-0.13-0.23 1.09-1.06 0.81-2.87 2.04-3.84 1.2-0.94 2.67-1.31 4.13-1.48 1.36-0.15 2.74-0.24 4.12-0.24 1.05 0 1.24 0.32 1.15 1.09-0.06 0.44 0 0.9-0.06 1.34-0.15 1.77 1.03 2.8 3.37 2.82 2.05 0 4.07-0.39 6.17-0.18 1.81 0.18 3.67-0.08 5.51-0.35 2.19-0.32 4.42-0.08 6.59 0.33 1.31 0.26 2.52-0.22 3.79-0.3 0.81-0.03 1.2-1.21 1.11-1.93-0.11-0.92 0.9-1.51 0.46-2.41 0-0.04 0.11-0.2 0.15-0.19 1.16 0.24 2.26-0.84 3.44-0.18 0.42 0.24 0.81 0 1.2-0.09 2.01-0.44 4.64 1.45 5.27 3.37 0.71 2.19 0.95 4.42 1.4 6.65 0.14 0.77 0.24 1.52 0.09 2.26-0.3 1.47 0.62 2.95 0 4.4-0.89 2.1 0.57 4.57-1.13 6.56-0.46 0.53 0 1.25 0.17 1.77 0.42 1.36 0 2.76 0.26 3.96 0.24 1.1 0.29 2.15 0.33 3.26 0.05 1.21 0.15 2.43 0.26 3.64 0.11 1.38 0.07 2.84 0.15 4.22 0.11 2.1 0.62 4.2 0.49 6.34 0 0.07 0.13 0.22 0.11 0.22-1.18 0.81-1.14 1.56 0.13 2.23-0.68 0.68 0.17 1.78-0.73 2.45-0.76 0.55 0.53 0.16 0.38 0.71-0.22 0.8 0.13 1.77-0.15 2.53-0.35 0.94 0.08 1.76 0.08 2.61v6.26c0 1.13-0.15 2.27 0 3.39 0.25 2.1-0.39 4.15-0.24 6.25 0.15 2.06 0.13 4.14 0 6.2-0.09 1.2 0.64 2.51-0.37 3.63-0.02 0.02 0.57 0.53 0.5 1.11-0.06 0.4 0.2 0.86-0.32 1.16-0.07 0.03-0.27 0-0.16 0.22 0.4 0.81 0.72 3.13 0.59 4.18-0.13 0.99 0.14 1.99-0.17 2.98-0.22 0.7-0.61 1.07-1.36 1-0.17 0.6 0.57 0.22 0.64 0.62-0.66 0.39-0.6 1.27-1.08 1.82 0.02-0.31-0.02-0.6-0.24-0.86-0.81-1.05-1.18-2.19-0.98-3.57 0.52-3.56 0.7-7.11 0.48-10.7-0.13-1.99-0.24-3.96-0.05-5.99 0.18-1.93-0.1-3.88 0.53-5.78-0.9-0.39 0.87-0.52 0.09-0.89 0.59-0.92-0.57-1.58-0.31-2.59 0.24-0.94 0.35-2.19 0.13-3.02-0.43-1.57 0.68-3.1-0.21-4.55 1.05-1.2 0.15-2.58 0.15-3.82 0-1.28 0.3-2.66-0.05-3.94-0.33-1.16 0.31-2.28 0.03-3.35-0.64-2.45 0.11-4.91-0.25-7.35-0.06-0.33 0.84-0.57 0.22-0.92-0.74-0.4-0.5-1.01-0.46-1.52 0.07-1.17 0.13-2.42-0.02-3.49-0.22-1.71-0.33-3.4-0.44-5.12-0.12-1.73-0.8-3.5 0.38-5.13 0.04-0.06-0.05-0.24-0.09-0.35-0.28-0.81-0.18-1.63-0.11-2.47 0.09-1.09 0.53-2.25 0.33-3.21-0.42-2.11 0.09-4.2-0.07-6.3-0.13-1.82-0.28-3.64-0.35-5.47-0.06-1.76-1.07-2.91-2.29-3.94-0.25-0.22-0.55-0.46-0.92-0.24-0.92 0.56-1.91 0.19-2.87 0.24-0.77 0.04-1.09 0.24-1.34 1.07-0.35 1.13-0.04 2.49-1.66 3.28-1.31 0.63-2.49 0.77-3.83 0.88-1.51 0.13-2.93-0.33-4.4-0.38-2.9-0.09-5.71 0.51-8.59 0.42-1.64-0.05-3.28-0.15-4.95 0.11-1.46 0.22-3.04-0.39-4.57-0.55-0.9-0.11-1.23-0.74-1.47-1.42-0.33-1.01-0.46-2.08-0.43-3.17 0-0.37-0.11-1.1-0.71-0.6-0.46 0.38-0.79 0.4-1.35 0.47-0.77 0.11-1.71 0.32-2.36 0.78-2.06 1.45-2.87 3.68-2.94 6.08-0.06 1.52 0.55 3.05 0.2 4.65-0.07 0.34-0.39 0.52-0.33 0.89 0.31 2.01 0.68 4.01-0.61 5.86-0.13 0.18-0.13 0.42 0 0.62 0.19 0.33 0.57 1.82 0.55 2.06-0.09 0.81-0.27 1.62-0.25 2.44 0 0.53 0.35 1.03 0.37 1.6 0.03 1.91 0 3.83 0.25 5.72 0.35 2.6 0.41 2.84-0.81 5.05-0.04 0.06-0.04 0.17 0 0.2 0.9 0.91 0.15 1.88 0.19 2.82 0.13 2.99-0.06 5.91-0.3 8.86-0.04 0.53-0.53 1.14-0.24 1.49 0.79 0.98-0.61 2.36 0.65 3.19 0.02 0-0.04 0.16-0.06 0.24-0.46 1.14-0.29 2.3-0.16 3.46 0.07 0.75-0.45 1.53-0.26 2.12 0.61 1.97 0.14 3.99 0.51 5.97 0.28 1.49 0.19 3.03 0.48 4.56 0.15 0.68 0.81 2.42-0.96 2.84-0.29 0.07-0.11 0.2-0.05 0.37 0.09 0.26 0.22 0.33 0.44 0.14 0.33-0.27 0.63-0.27 0.54 0.23-0.41 2.35 0.07 4.73 0 7.1-0.04 1 0.14 1.83-1.11 2.43 0.66-0.07 0.74 0.26 1.05 1.02 0.79 1.84-0.51 3.68 0.11 5.56 0.2 0.63 0.06 1.51 0 2.26-0.05 1.02 0.35 2.01 0.06 3.06-0.13 0.44 0.07 1.25 0.57 1.36 0.79 0.19 1.66 0.15 2.47 0.02 0.84-0.13 1.45-0.16 1.21 1.16 0.46-0.62 0.68-1.47 1.36-1.27 2.03 0.63 4.02-0.05 6.03 0.04 3.37 0.15 6.74-0.17 10.11 0 1.75 0.09 3.48-0.04 5.21 0 1.45 0 2.93 0.37 4.33 0.05 1.65-0.36 3.46-0.47 4.99-0.31 2.24 0.24 4.27-0.95 6.44-0.46 0.11 0.02 0.3-0.16 0.43-0.29 0.97-1.05 1.78-0.98 2.56 0.25h-0.02z" android:fillColor="#000000"/>
-    <path android:pathData="M155.51 67.04c-2.56-0.04-4.82 0.42-7.13 0.07-0.47-0.07-1.06 0.35-1.58-0.18-0.26-0.26-0.53-0.43-0.33-0.87 0.17-0.35 0.18-0.77 0.76-0.72 1.6 0.11 3.18-0.16 4.78-0.09 1.09 0.06 2.18-0.26 3.32-0.24 0.9 0 1.4 0.48 1.36 1.14-0.04 0.65-0.77 0.85-1.16 0.89h-0.02zm5.09-2.45c1.06-0.17 1.49 0.75 1.49 1.38 0 1.16-1.44 0.99-2.08 1.64-0.08 0.07-0.96-0.79-0.87-1.16 0.2-0.74 0.15-1.9 1.44-1.86h0.02zm-21.99 30.48c0 1.99-0.02 3.96 0 5.95 0 0.48-0.19 0.7-0.59 0.66-0.37-0.02-0.76 0.06-1.03-0.48-0.36-0.68-0.32-1.36-0.37-2.04-0.17-1.86-0.22-3.74 0.13-5.56 0.51-2.64 1.49-3.41 4.42-3.54 2.5-0.11 5.02-0.2 7.53-0.13 0.68 0 1.31 0.2 1.99-0.11 0.59-0.26 0.31 0.46 0.53 0.63 0.52 0.35 0.15 0.6-0.09 0.79-1.11 0.86-2.5 1.27-3.79 1.1-2.34-0.29-4.57-0.11-6.82 0.45-0.98 0.23-1.69 1.21-1.93 2.28h0.02zm28.95 23.9c-0.04-2.26-0.24-4.1 0.07-5.89 0.08-0.39 0.06-1.2 0.87-1.38 1.08-0.24 1.41 0.81 1.56 1.25 0.78 2.12 0.48 4.22 0 6.45-0.4 1.89-1.67 2.78-2.89 3.64-0.7 0.52-2.08 0.15-3.13 0.06-1-0.09-1.95-0.39-2.98-0.22-0.87 0.15-1.53-0.98-1.2-1.81 0.07-0.16 0.15-0.44 0.27-0.36 1.07 0.6 2.05-0.39 2.93-0.21 1.04 0.22 1.97 0 2.95 0.04 1.57 0.04 1.33-1.09 1.53-1.55l0.02-0.02zm-30.32-1.62c-0.18-0.68 0.43-1.51 0.19-1.88-0.43-0.64-0.32-1.19-0.28-1.78 0.04-0.98 0.79-1.27 1.59-1.33 0.35-0.02 1.1-0.03 0.73 0.87-0.4 1.03 0.19 2.12-0.11 3.24-0.22 0.86-0.13 1.86 0.07 2.82 0.24 1.05 1.04 2.08 2.05 1.93 1.03-0.15 2.01 0.11 3.02 0 0.83-0.07 1.58-0.09 2.23-0.68 0.46-0.4 0.96-0.29 1.29 0.18 0.29 0.41 0.33 0.81 0.05 1.33-0.68 1.27-1.62 1.49-3 1.29-0.83-0.11-1.82-0.06-2.69 0.18-2.3 0.61-5.23-1.45-5.1-4.27 0.04-0.63-0.33-1.23-0.05-1.88l0.01-0.02zm24.88-27.68c1.35-0.24 2.78-0.26 4.22-0.24 1.01 0 2.71 1.11 2.86 2.18 0.12 1.01 0.6 1.95 0.59 2.96-0.04 1.66 0.29 3.33-0.13 4.99-0.11 0.46 0.13 1.14-0.87 1.11-0.92-0.04-0.81-0.45-0.86-1.13-0.11-1.49-0.13-2.98-0.17-4.49-0.05-2.06-2.19-3.68-4.25-3.15-1.31 0.33-2.33-0.13-3.41-0.59-0.81-0.35-0.67-0.72-0.04-1.12 0.61-0.41 1.25-0.68 2.08-0.52h-0.02z" android:fillColor="#000000"/>
-</vector>
diff --git a/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_sync_qr.xml b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_sync_qr.xml
new file mode 100644
index 0000000000000..fb755481e4904
--- /dev/null
+++ b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_sync_qr.xml
@@ -0,0 +1,1010 @@
+<?xml version="1.0" encoding="utf-8"?><!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="200dp"
+    android:height="108.87801dp"
+    android:viewportWidth="306.6"
+    android:viewportHeight="166.91">
+
+    <path
+        android:fillColor="#101212"
+        android:pathData="M30.25,0.68h196.87c2.97,0 5.38,2.41 5.38,5.38v132.59H24.86V6.07c0,-2.97 2.41,-5.38 5.38,-5.38Z" />
+
+    <path
+        android:fillColor="#525357"
+        android:pathData="M0.75,138.57h256.7c0.27,0 0.49,0.22 0.49,0.49v3.46c0,0.13 -0.11,0.23 -0.23,0.23H0.75c-0.13,0 -0.23,-0.11 -0.23,-0.23v-3.71c0,-0.13 0.11,-0.23 0.23,-0.23Z" />
+
+    <path
+        android:fillColor="#222327"
+        android:pathData="M235.94,146.93H25.43c-3.27,0 -6.53,-0.34 -9.73,-1.01l-15.19,-3.18h257.21l-17.83,3.77c-1.3,0.27 -2.63,0.41 -3.95,0.41Z" />
+
+    <path
+        android:fillColor="#363638"
+        android:pathData="M110.93,138.57h37.11c0,1.63 -1.33,2.96 -2.96,2.96h-31.19c-1.63,0 -2.96,-1.33 -2.96,-2.96h0Z" />
+
+    <path
+        android:fillColor="#f0f1f2"
+        android:pathData="M26.46,6.34c0,-2.21 1.79,-4 4,-4h196.68c2.21,0 4,1.79 4,4v127.57H26.46V6.34h0Z" />
+
+    <path android:pathData="M305.97,95.87c-0.12,-1.51 -3.48,-1.89 -4.94,-4.11 -0.45,-0.7 -0.58,-1.84 -0.58,-3.09 0,-1.09 0.09,-2.27 0.13,-3.28 0.1,-2.4 0,-3.71 0.02,-7.78 0.02,-3.22 -0.37,-6.79 -1.86,-7.63 -1.38,-0.78 -3.6,0.74 -6.75,3.63 -1.76,1.62 -2.92,3.01 -4.12,4.01 -0.07,0.06 -0.15,0.13 -0.22,0.18 -0.07,0.06 -1.88,-0.41 -2.94,-0.62 -0.23,-0.05 -0.36,-0.31 -0.48,-0.78 -0.26,-1.05 -0.39,-3.16 -1.13,-6.24 -0.92,-3.83 -2.16,-5.7 -3.96,-5.86 -1.52,-0.13 -4.15,3.68 -6.17,6.89 -1.67,2.65 -1.8,2.92 -2.45,3.87 -0.47,0.69 -1.02,1.52 -1.62,2.33 -1.22,1.69 -2.63,3.4 -3.99,3.93 -2.55,1.01 -4.52,-0.35 -5.47,0.83 -0.91,1.13 0.08,1.34 0.29,1.54 5.47,1.38 6.78,8.66 9.3,8.03 2.16,-0.54 3.58,1.75 8.01,2.3 4.41,0.55 4.92,2.93 8.22,2.31 6.96,-1.3 12.79,-1.62 19.55,0.85 -0.34,-0.53 1.22,-0.33 1.14,-1.3h0Z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="274.99"
+                android:endY="112.59"
+                android:startX="290.92"
+                android:startY="63.68"
+                android:type="linear">
+
+                <item
+                    android:color="#FFEC702D"
+                    android:offset="0.17" />
+
+                <item
+                    android:color="#FFF0A039"
+                    android:offset="0.54" />
+
+                <item
+                    android:color="#FFEC712E"
+                    android:offset="0.9" />
+
+                <item
+                    android:color="#FFEC702D"
+                    android:offset="0.91" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path android:pathData="M294.8,82.24c2.29,2.65 4.65,5.34 5.65,6.43 0,-1.09 0.09,-2.27 0.13,-3.28 0.1,-2.4 0,-3.71 0.02,-7.78 0.02,-3.22 -0.37,-6.79 -1.86,-7.63 -1.38,-0.78 -3.6,0.74 -6.75,3.63 -1.76,1.62 -2.92,3.01 -4.12,4.01 1.44,0.51 4.56,1.87 6.92,4.61h0Z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="303.73"
+                android:endY="67.99"
+                android:startX="295.22"
+                android:startY="81.48"
+                android:type="linear">
+
+                <item
+                    android:color="#00EC702D"
+                    android:offset="0" />
+
+                <item
+                    android:color="#4CEC702D"
+                    android:offset="0.11" />
+
+                <item
+                    android:color="#99EC702D"
+                    android:offset="0.23" />
+
+                <item
+                    android:color="#D1EC702D"
+                    android:offset="0.32" />
+
+                <item
+                    android:color="#F2EC702D"
+                    android:offset="0.4" />
+
+                <item
+                    android:color="#FFEC702D"
+                    android:offset="0.43" />
+
+                <item
+                    android:color="#FFE95643"
+                    android:offset="0.72" />
+
+                <item
+                    android:color="#FFE64173"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path android:pathData="M284.24,76.41c-0.26,-1.05 -0.39,-3.16 -1.13,-6.24 -0.92,-3.83 -2.16,-5.7 -3.96,-5.86 -1.52,-0.13 -4.15,3.68 -6.17,6.89 -1.67,2.65 -1.8,2.92 -2.45,3.87 -0.47,0.69 -1.02,1.52 -1.62,2.33 1.73,-0.29 4.84,-0.84 7.87,-1.41 2.99,-0.55 5.77,-0.05 7.46,0.41Z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="278.58"
+                android:endY="60.07"
+                android:startX="276.69"
+                android:startY="75.93"
+                android:type="linear">
+
+                <item
+                    android:color="#00EC702D"
+                    android:offset="0" />
+
+                <item
+                    android:color="#2BEC702D"
+                    android:offset="0.03" />
+
+                <item
+                    android:color="#5BEC702D"
+                    android:offset="0.07" />
+
+                <item
+                    android:color="#87EC702D"
+                    android:offset="0.11" />
+
+                <item
+                    android:color="#ADEC702D"
+                    android:offset="0.15" />
+
+                <item
+                    android:color="#CCEC702D"
+                    android:offset="0.2" />
+
+                <item
+                    android:color="#E2EC702D"
+                    android:offset="0.24" />
+
+                <item
+                    android:color="#F2EC702D"
+                    android:offset="0.29" />
+
+                <item
+                    android:color="#FCEC702D"
+                    android:offset="0.35" />
+
+                <item
+                    android:color="#FFEC702D"
+                    android:offset="0.42" />
+
+                <item
+                    android:color="#FFE95643"
+                    android:offset="0.7" />
+
+                <item
+                    android:color="#FFE64173"
+                    android:offset="0.97" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path android:pathData="M304.83,97.17c-6.58,-2.39 -12.33,-2.16 -19.13,-0.93 -0.69,0.13 -1.24,0.24 -1.99,0.14 1.52,1.63 -2.91,5.81 -8.18,4.81 -1.79,-0.34 -3.25,-0.9 -4.41,-1.58 -3.89,-2.27 -4.33,-5.86 -2.92,-7.69 0.06,-0.08 0.13,-0.17 0.2,-0.25 -2.14,-0.62 -3.67,-6.76 -8.65,-8.01 0.04,0.04 0.05,0.08 0,0.13 -0.49,0.46 -2.56,-0.43 -3.07,0.91 -0.42,1.1 1.8,1.3 1.64,1.81 -0.23,0.7 -1.82,0.52 -2.04,1.22 -0.35,1.17 0.4,1.1 2.34,2.86 0.98,0.89 2.26,2.24 3.84,4.44 2.53,3.52 2.7,11.57 2.38,17.11 -0.16,2.77 -1.57,8.93 -1.72,12.18 -0.17,3.35 0.18,6.35 0.27,9 0.02,1.3 0,3.11 -0.31,4.4 -0.76,3.81 -3,4.42 -3.83,9.44 -1.23,7.55 6.97,10.38 6.89,10.4 -0.02,0 -0.05,0.01 -0.08,0.02 0.42,0.05 0.83,0.1 1.22,0.15 1.79,0.22 3.35,0.42 4.69,0.61 0.52,0.07 1.06,0.15 1.53,0.21 -0.14,0.83 -0.35,1.78 -0.57,2.39 -0.3,0.87 -0.6,2.44 -0.17,3.16 0.86,1.46 6.2,1.23 6.45,-0.48 0.12,-0.84 0.21,-1.86 0.25,-3.02h0c0.6,-0.02 0.65,-0.01 1.03,0 0,0.18 0.07,1.76 0.25,3 0.25,1.71 5.58,1.94 6.45,0.48 0.42,-0.72 0.13,-2.29 -0.17,-3.16 -0.14,-0.4 -0.29,-0.99 -0.41,-1.58 0.67,-0.14 8.42,-1.72 9.07,-1.82 0,-0.03 0.05,-0.06 0.13,-0.09 3.56,-1.22 7.58,-6.67 5.72,-11.74 -1.06,-2.91 -3.04,-4.28 -4.15,-6.23 -2.3,-4.02 -0.54,-4.96 -1.55,-15.7 -0.44,-4.68 -1.67,-10.18 -2.17,-13.03 -0.99,-5.66 0.3,-5.62 3.62,-6.55 4.31,-1.2 5.77,-0.44 6.35,-1.79 0.28,-0.63 -0.75,-1.08 -0.52,-1.73 0.35,-1.02 3.23,-0.17 3.44,-1.23 0.27,-1.37 -1.42,-1.79 -1.75,-2.3v0.03Z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="281.4"
+                android:endY="170.11"
+                android:startX="281.4"
+                android:startY="82.2"
+                android:type="linear">
+
+                <item
+                    android:color="#FFEC702D"
+                    android:offset="0" />
+
+                <item
+                    android:color="#FFED7C32"
+                    android:offset="0" />
+
+                <item
+                    android:color="#FFEF8F3A"
+                    android:offset="0.04" />
+
+                <item
+                    android:color="#FFF09F40"
+                    android:offset="0.07" />
+
+                <item
+                    android:color="#FFF1AA46"
+                    android:offset="0.11" />
+
+                <item
+                    android:color="#FFF2B049"
+                    android:offset="0.17" />
+
+                <item
+                    android:color="#FFF2B24A"
+                    android:offset="0.33" />
+
+                <item
+                    android:color="#FFEF963D"
+                    android:offset="0.46" />
+
+                <item
+                    android:color="#FFEC702D"
+                    android:offset="0.63" />
+
+                <item
+                    android:color="#FFEA6830"
+                    android:offset="0.64" />
+
+                <item
+                    android:color="#FFE95940"
+                    android:offset="0.69" />
+
+                <item
+                    android:color="#FFE74D54"
+                    android:offset="0.74" />
+
+                <item
+                    android:color="#FFE64665"
+                    android:offset="0.79" />
+
+                <item
+                    android:color="#FFE6426F"
+                    android:offset="0.84" />
+
+                <item
+                    android:color="#FFE64173"
+                    android:offset="0.89" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path
+        android:fillAlpha="0.6"
+        android:pathData="M304.83,97.17c-6.58,-2.39 -12.33,-2.16 -19.13,-0.93 -0.69,0.13 -1.24,0.24 -1.99,0.14 1.52,1.63 -2.91,5.81 -8.18,4.81 -1.79,-0.34 -3.25,-0.9 -4.41,-1.58 -3.89,-2.27 -4.33,-5.86 -2.92,-7.69 0.06,-0.08 0.13,-0.17 0.2,-0.25 -2.14,-0.62 -3.67,-6.76 -8.65,-8.01 0.04,0.04 0.05,0.08 0,0.13 -0.49,0.46 -2.56,-0.43 -3.07,0.91 -0.42,1.1 1.8,1.3 1.64,1.81 -0.23,0.7 -1.82,0.52 -2.04,1.22 -0.35,1.17 0.4,1.1 2.34,2.86 0.98,0.89 2.26,2.24 3.84,4.44 2.53,3.52 2.7,11.57 2.38,17.11 -0.16,2.77 -1.57,8.93 -1.72,12.18 -0.17,3.35 0.18,6.35 0.27,9 0.02,1.3 0,3.11 -0.31,4.4 -0.76,3.81 -3,4.42 -3.83,9.44 -1.23,7.55 6.97,10.38 6.89,10.4 -0.02,0 -0.05,0.01 -0.08,0.02 0.42,0.05 0.83,0.1 1.22,0.15 1.79,0.22 3.35,0.42 4.69,0.61 0.52,0.07 1.06,0.15 1.53,0.21 -0.14,0.83 -0.35,1.78 -0.57,2.39 -0.3,0.87 -0.6,2.44 -0.17,3.16 0.86,1.46 6.2,1.23 6.45,-0.48 0.12,-0.84 0.21,-1.86 0.25,-3.02h0c0.6,-0.02 0.65,-0.01 1.03,0 0,0.18 0.07,1.76 0.25,3 0.25,1.71 5.58,1.94 6.45,0.48 0.42,-0.72 0.13,-2.29 -0.17,-3.16 -0.14,-0.4 -0.29,-0.99 -0.41,-1.58 0.67,-0.14 8.42,-1.72 9.07,-1.82 0,-0.03 0.05,-0.06 0.13,-0.09 3.56,-1.22 7.58,-6.67 5.72,-11.74 -1.06,-2.91 -3.04,-4.28 -4.15,-6.23 -2.3,-4.02 -0.54,-4.96 -1.55,-15.7 -0.44,-4.68 -1.67,-10.18 -2.17,-13.03 -0.99,-5.66 0.3,-5.62 3.62,-6.55 4.31,-1.2 5.77,-0.44 6.35,-1.79 0.28,-0.63 -0.75,-1.08 -0.52,-1.73 0.35,-1.02 3.23,-0.17 3.44,-1.23 0.27,-1.37 -1.42,-1.79 -1.75,-2.3v0.03Z"
+        android:strokeAlpha="0.6">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="281.4"
+                android:endY="170.11"
+                android:startX="281.4"
+                android:startY="82.2"
+                android:type="linear">
+
+                <item
+                    android:color="#CCFBEB68"
+                    android:offset="0" />
+
+                <item
+                    android:color="#A3F7D25A"
+                    android:offset="0.22" />
+
+                <item
+                    android:color="#3FEF943C"
+                    android:offset="0.7" />
+
+                <item
+                    android:color="#00EC702D"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path android:pathData="M272.06,158.38c-1.34,-0.19 -2.9,-0.39 -4.69,-0.61 -0.39,-0.05 -0.81,-0.1 -1.22,-0.15 -0.51,0.11 -2.63,0.45 -4.17,2.34 -0.54,0.67 -0.73,1.19 -0.73,1.62 0,0.29 0.08,0.53 0.19,0.75 0.51,0.99 2.97,0.89 4.39,0.51 0.81,-0.22 1.85,-0.45 3.01,-0.69 1.26,-0.26 2.66,-0.49 4.04,-0.69 0.04,-0.16 0.09,-0.32 0.15,-0.46 0.21,-0.59 0.42,-1.55 0.57,-2.38 -0.47,-0.07 -0.99,-0.15 -1.53,-0.22h-0.02Z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="247.86"
+                android:endY="168.08"
+                android:startX="301.46"
+                android:startY="146.72"
+                android:type="linear">
+
+                <item
+                    android:color="#00AD254B"
+                    android:offset="0.02" />
+
+                <item
+                    android:color="#FFE64173"
+                    android:offset="0.51" />
+
+                <item
+                    android:color="#FF952A5D"
+                    android:offset="0.67" />
+
+                <item
+                    android:color="#FF451548"
+                    android:offset="0.83" />
+
+                <item
+                    android:color="#FF130A3B"
+                    android:offset="0.94" />
+
+                <item
+                    android:color="#FF010737"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path android:pathData="M299.3,160.16c-0.32,-0.39 -0.88,-0.84 -1.78,-1.37 -1.15,-0.67 -2.17,-0.96 -2.03,-1.16 -0.19,0.03 -0.36,0.06 -0.55,0.1 -3.89,0.79 -6.51,1.24 -8.27,1.5 0.13,0.66 0.3,1.31 0.45,1.76 0.05,0.15 0.1,0.3 0.14,0.45 0.02,0.06 0.03,0.13 0.05,0.19 3.4,0.52 4.9,1.16 7.62,1.3 3.05,0.16 4.01,-0.15 4.52,-1.07 0.28,-0.5 0.41,-1.02 -0.14,-1.7h-0.01Z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="308.01"
+                android:endY="166.13"
+                android:startX="271.43"
+                android:startY="151.82"
+                android:type="linear">
+
+                <item
+                    android:color="#00AD254B"
+                    android:offset="0" />
+
+                <item
+                    android:color="#FFE64173"
+                    android:offset="0.41" />
+
+                <item
+                    android:color="#FF010737"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path
+        android:fillAlpha="0.38"
+        android:pathData="M273.47,148.03c-1.3,-4.94 -5.31,-8.81 -10.36,-9.92 -0.07,0.32 -0.17,0.62 -0.27,0.92 0,0 0,0.02 0,0.03 -0.15,0.44 -0.33,0.87 -0.55,1.27 -1.11,2.03 -2.38,3.44 -2.95,6.87 -1.23,7.54 6.97,10.38 6.89,10.4 -0.02,0 -0.05,0 -0.08,0.02 0.42,0.05 0.83,0.1 1.22,0.15 1.79,0.22 3.35,0.42 4.69,0.61 0.87,-1.49 1.46,-3.14 1.71,-4.92 -0.05,-1.67 -0.16,-3.52 -0.31,-5.45v0.02Z"
+        android:strokeAlpha="0.38">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:centerX="253.18"
+                android:centerY="156.12"
+                android:gradientRadius="22.61"
+                android:type="radial">
+
+                <item
+                    android:color="#FFFBEB68"
+                    android:offset="0" />
+
+                <item
+                    android:color="#F4FAE565"
+                    android:offset="0.05" />
+
+                <item
+                    android:color="#D8F8D75D"
+                    android:offset="0.14" />
+
+                <item
+                    android:color="#ADF4C251"
+                    android:offset="0.25" />
+
+                <item
+                    android:color="#70F1A342"
+                    android:offset="0.38" />
+
+                <item
+                    android:color="#21ED7F33"
+                    android:offset="0.53" />
+
+                <item
+                    android:color="#00EC702D"
+                    android:offset="0.59" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path android:pathData="M278.93,143.01c-0.27,0.33 -0.42,2.41 -0.77,2.59 -0.28,0.14 -0.41,-1.64 -0.7,-3.25 -0.08,-0.43 -0.37,-1.84 -0.44,-2.26 -0.36,-2.01 -0.36,-1.85 -0.66,-3.5 -0.06,1.31 -0.18,1.66 -0.42,3.67 -0.12,0.98 -0.29,2.15 -0.42,2.8 -0.12,0.57 -0.31,-1.55 -0.42,-2.1 -0.56,-2.69 -0.95,-3.41 -1.7,-6.09 -0.42,-1.52 -1.76,-2.92 -1.89,-3.88 0.61,4.14 1.49,10.97 1.96,17.04 0.15,1.93 0.26,3.78 0.31,5.45 0.05,1.6 0.03,3.01 -0.06,4.16 -0.02,0.29 -0.07,0.62 -0.13,0.98 -0.14,0.85 -0.36,1.79 -0.57,2.38 -0.05,0.16 -0.1,0.32 -0.15,0.46 -0.32,1.14 -0.32,2.22 -0.03,2.7 0.86,1.46 6.2,1.23 6.45,-0.48 0.12,-0.84 0.21,-1.87 0.25,-3.03 0.18,-4.38 -0.13,-10.82 -0.61,-17.63h0.02Z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="276.6"
+                android:endY="172.97"
+                android:startX="275.05"
+                android:startY="131.54"
+                android:type="linear">
+
+                <item
+                    android:color="#00AD254B"
+                    android:offset="0" />
+
+                <item
+                    android:color="#0AAE254C"
+                    android:offset="0.06" />
+
+                <item
+                    android:color="#28B1274E"
+                    android:offset="0.14" />
+
+                <item
+                    android:color="#5BB52A52"
+                    android:offset="0.23" />
+
+                <item
+                    android:color="#A0BC2E58"
+                    android:offset="0.35" />
+
+                <item
+                    android:color="#F7C43560"
+                    android:offset="0.48" />
+
+                <item
+                    android:color="#FFC53561"
+                    android:offset="0.49" />
+
+                <item
+                    android:color="#FFC13460"
+                    android:offset="0.56" />
+
+                <item
+                    android:color="#FFB6315D"
+                    android:offset="0.63" />
+
+                <item
+                    android:color="#FFA32C59"
+                    android:offset="0.7" />
+
+                <item
+                    android:color="#FF892553"
+                    android:offset="0.77" />
+
+                <item
+                    android:color="#FF691D4C"
+                    android:offset="0.84" />
+
+                <item
+                    android:color="#FF401344"
+                    android:offset="0.91" />
+
+                <item
+                    android:color="#FF12093A"
+                    android:offset="0.98" />
+
+                <item
+                    android:color="#FF010737"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path android:pathData="M287.25,161.45c-0.04,-0.15 -0.09,-0.31 -0.14,-0.45 -0.16,-0.45 -0.32,-1.1 -0.45,-1.76 -0.12,-0.58 -0.21,-1.16 -0.25,-1.61 -0.48,-6.06 1.22,-19.92 2.21,-26.63 -0.13,0.97 -1.47,2.36 -1.89,3.88 -0.76,2.68 -1.14,3.4 -1.7,6.09 -0.12,0.56 -0.3,2.67 -0.42,2.1 -0.14,-0.65 -0.31,-1.82 -0.42,-2.8 -0.24,-2.01 -0.36,-2.36 -0.42,-3.67 -0.3,1.64 -0.3,1.49 -0.66,3.5 -0.08,0.41 -0.36,1.82 -0.44,2.26 -0.29,1.61 -0.42,3.39 -0.7,3.25 -0.34,-0.18 -0.5,-2.27 -0.77,-2.59 -0.48,6.81 -0.79,13.25 -0.61,17.63 0.05,1.16 0.13,2.2 0.25,3.03 0.25,1.71 5.58,1.94 6.45,0.48 0.27,-0.45 0.28,-1.44 0,-2.52 -0.02,-0.06 -0.03,-0.13 -0.05,-0.19h0.02Z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="283.52"
+                android:endY="173.28"
+                android:startX="285.25"
+                android:startY="123.93"
+                android:type="linear">
+
+                <item
+                    android:color="#00C53561"
+                    android:offset="0" />
+
+                <item
+                    android:color="#00C53561"
+                    android:offset="0.11" />
+
+                <item
+                    android:color="#0FC53561"
+                    android:offset="0.19" />
+
+                <item
+                    android:color="#23C53561"
+                    android:offset="0.27" />
+
+                <item
+                    android:color="#3FC53561"
+                    android:offset="0.35" />
+
+                <item
+                    android:color="#63C53561"
+                    android:offset="0.42" />
+
+                <item
+                    android:color="#91C53561"
+                    android:offset="0.49" />
+
+                <item
+                    android:color="#C4C53561"
+                    android:offset="0.55" />
+
+                <item
+                    android:color="#FFC53561"
+                    android:offset="0.62" />
+
+                <item
+                    android:color="#FFC03460"
+                    android:offset="0.66" />
+
+                <item
+                    android:color="#FFB1305C"
+                    android:offset="0.71" />
+
+                <item
+                    android:color="#FF992956"
+                    android:offset="0.77" />
+
+                <item
+                    android:color="#FF792150"
+                    android:offset="0.83" />
+
+                <item
+                    android:color="#FF4E1647"
+                    android:offset="0.9" />
+
+                <item
+                    android:color="#FF1A0B3C"
+                    android:offset="0.97" />
+
+                <item
+                    android:color="#FF010737"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path
+        android:fillAlpha="0.6"
+        android:pathData="M279.52,110.99s-5.64,4.18 -4.13,13.93c1.22,7.81 2.22,9.61 2.98,14.57 0.77,4.95 1.59,10.68 1.59,10.68 0,0 0.69,-5.54 1.63,-10.81 0.67,-3.76 2,-8.84 2.72,-14.93 1.15,-9.81 -4.8,-13.44 -4.8,-13.44h0Z"
+        android:strokeAlpha="0.6">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="281.37"
+                android:endY="156.32"
+                android:startX="279.68"
+                android:startY="119.32"
+                android:type="linear">
+
+                <item
+                    android:color="#FFFBEB68"
+                    android:offset="0" />
+
+                <item
+                    android:color="#F4FAE765"
+                    android:offset="0.09" />
+
+                <item
+                    android:color="#D6F9DE5E"
+                    android:offset="0.24" />
+
+                <item
+                    android:color="#A8F6D054"
+                    android:offset="0.44" />
+
+                <item
+                    android:color="#66F4BD47"
+                    android:offset="0.67" />
+
+                <item
+                    android:color="#11F1A43B"
+                    android:offset="0.94" />
+
+                <item
+                    android:color="#00F0A039"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path
+        android:fillColor="#f5c755"
+        android:pathData="M273.99,89.08c3.24,0.43 5.55,5.44 9.15,6.93 2.88,1.19 -1.87,6.28 -7.62,5.18 -7.73,-1.48 -9.22,-6.82 -7.33,-9.26 1.01,-1.31 3.08,-3.22 5.8,-2.86Z" />
+
+    <path
+        android:fillColor="#1c023e"
+        android:pathData="M273.89,89.89c-1.15,-0.37 -1.96,-0.09 -2.31,0.32 -0.43,0.5 -0.36,1.85 1.05,2.32 1.35,0.44 2.52,-0.42 2.57,-1.11 0.04,-0.49 -0.3,-1.19 -1.32,-1.53h0Z" />
+
+    <path android:pathData="M283.76,89.72c-0.75,1.54 0.08,2.59 0.76,2.79 1.31,0.38 2.19,0.47 3.17,-1.54 1.25,-2.57 0.78,-3.74 -0.61,-4.14 -1.39,-0.39 -2.3,0.78 -3.32,2.88h0Z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="286.56"
+                android:endY="88.18"
+                android:startX="284.06"
+                android:startY="94.8"
+                android:type="linear">
+
+                <item
+                    android:color="#FF9338B2"
+                    android:offset="0.16" />
+
+                <item
+                    android:color="#FF010738"
+                    android:offset="0.88" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path
+        android:fillColor="#fff"
+        android:pathData="M284.26,91.12c-0.32,-0.15 -0.44,-0.56 -0.28,-0.91 0.17,-0.35 0.56,-0.51 0.88,-0.36 0.32,0.15 0.44,0.56 0.28,0.91 -0.17,0.35 -0.56,0.51 -0.88,0.36Z" />
+
+    <path android:pathData="M272.46,84.54c-1.06,2.04 -0.16,2.79 0.52,2.98 1.3,0.38 2.16,0.42 2.95,-1.06 1.25,-2.37 1.46,-3.98 -0.37,-4.4 -1.15,-0.27 -2.23,0.84 -3.09,2.49h0Z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="275.36"
+                android:endY="82.02"
+                android:startX="272.11"
+                android:startY="92.24"
+                android:type="linear">
+
+                <item
+                    android:color="#FF9338B2"
+                    android:offset="0.16" />
+
+                <item
+                    android:color="#FF010738"
+                    android:offset="0.88" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path
+        android:fillColor="#fff"
+        android:pathData="M272.92,86.37c-0.33,-0.16 -0.46,-0.57 -0.29,-0.93 0.17,-0.36 0.58,-0.52 0.91,-0.36 0.33,0.16 0.46,0.57 0.29,0.93 -0.17,0.36 -0.58,0.52 -0.91,0.36Z" />
+
+    <path
+        android:fillColor="#f0f1f2"
+        android:pathData="M219.31,44L256.14,44A8.6,8.6 0,0 1,264.74 52.6L264.74,156.42A8.6,8.6 0,0 1,256.14 165.02L219.31,165.02A8.6,8.6 0,0 1,210.71 156.42L210.71,52.6A8.6,8.6 0,0 1,219.31 44z" />
+
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M219.31,44L256.14,44A8.6,8.6 0,0 1,264.74 52.6L264.74,156.42A8.6,8.6 0,0 1,256.14 165.02L219.31,165.02A8.6,8.6 0,0 1,210.71 156.42L210.71,52.6A8.6,8.6 0,0 1,219.31 44z"
+        android:strokeWidth="3.78"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M254.31,98.45v-6.48c0,-2.12 -1.72,-3.84 -3.84,-3.84h-6.66"
+        android:strokeWidth="3"
+        android:strokeColor="#6e45da" />
+
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M223.43,98.45v-6.48c0,-2.12 1.72,-3.84 3.84,-3.84h6.66"
+        android:strokeWidth="3"
+        android:strokeColor="#6e45da" />
+
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M254.31,108.74v6.48c0,2.12 -1.72,3.84 -3.84,3.84h-6.66"
+        android:strokeWidth="3"
+        android:strokeColor="#6e45da" />
+
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M223.43,108.74v6.48c0,2.12 1.72,3.84 3.84,3.84h6.66"
+        android:strokeWidth="3"
+        android:strokeColor="#6e45da" />
+
+    <path android:pathData="M208.82,149.56s-4.64,-0.02 -7.92,-1.09c-10.8,-3.54 -16.68,-10.27 -20.33,-18.18 -1.3,-2.81 -1.82,-7.57 -1.82,-7.57 0,0 0.79,0.73 1.86,1.57 0.85,0.66 1.47,0.89 1.47,0.89 0,0 -0.69,-1.5 -1.11,-3.68 -1.51,-7.74 0.26,-13.34 3.61,-19.12 4.64,-7.99 9.18,-11.23 11.44,-17.61 0.81,-2.29 1.03,-4.13 0.46,-5.88 -0.68,-2.1 -4.76,-3.67 -4.76,-3.67 0,0 5.93,-1.93 13.07,1.82 4.11,2.16 7.74,4.93 9.89,8.08 5.34,7.81 6.02,12.81 4.53,22.21 -1.41,8.89 -7.1,16.36 -9.22,20.15 -0.37,0.66 -1.16,2.87 -1.16,3.29v18.81h0Z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="199.33"
+                android:endY="149.56"
+                android:startX="199.33"
+                android:startY="74.7"
+                android:type="linear">
+
+                <item
+                    android:color="#FFFBEB68"
+                    android:offset="0" />
+
+                <item
+                    android:color="#FFF09F40"
+                    android:offset="0.32" />
+
+                <item
+                    android:color="#FFEC702D"
+                    android:offset="0.56" />
+
+                <item
+                    android:color="#FFE95742"
+                    android:offset="0.74" />
+
+                <item
+                    android:color="#FFE64664"
+                    android:offset="0.91" />
+
+                <item
+                    android:color="#FFE64173"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path
+        android:fillAlpha="0.7"
+        android:pathData="M213.9,95.19c-0.99,-3.61 -1.6,-4.62 -3.64,-7.76 -1.38,-2.12 -2.72,-3.01 -2.72,-3.01l0.95,2.85 0.68,2.7c0.38,0.26 -1.19,-1.86 -3.61,-4.25 -1.69,-1.67 -4.3,-2.81 -4.3,-2.81 0,0 2.2,3.18 3.61,6.3 1.41,3.13 2.03,9.68 1.71,11.63 -0.57,3.51 4.25,2.18 6.37,2.56s1.95,-2.48 0.96,-8.21Z"
+        android:strokeAlpha="0.7">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="210.92"
+                android:endY="98.99"
+                android:startX="201.45"
+                android:startY="82.4"
+                android:type="linear">
+
+                <item
+                    android:color="#FFFBEB68"
+                    android:offset="0.03" />
+
+                <item
+                    android:color="#F4FBEB67"
+                    android:offset="0.12" />
+
+                <item
+                    android:color="#D6FBEE66"
+                    android:offset="0.26" />
+
+                <item
+                    android:color="#A8FCF063"
+                    android:offset="0.46" />
+
+                <item
+                    android:color="#66FDF660"
+                    android:offset="0.69" />
+
+                <item
+                    android:color="#11FFFC5E"
+                    android:offset="0.95" />
+
+                <item
+                    android:color="#00FFFF5E"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path android:pathData="M186.35,111.99s0.49,2.22 0.98,3.2c0.52,1.06 1.66,2.95 1.66,2.95 0,0 -0.25,-5.71 1.68,-10.51 1.49,-3.69 5.49,-7.51 5.49,-7.51 0,0 -1.32,4.26 -1.67,6.4 -0.95,5.59 -0.51,11.18 1.45,16.22 1.29,3.31 3.23,6.38 5.88,9.07 1.1,1.11 3.66,3.14 3.66,3.14 0,0 -3.29,-1.28 -4.75,-2.3 -1.74,-1.21 -4.68,-4.27 -4.68,-4.27 0,0 1.49,3.08 2.51,4.4 2.15,2.76 4.29,4.57 6.97,6.26 2.68,1.69 -0.31,3.01 2.65,4.03 -0.2,1.34 -0.11,2.65 0.27,3.96 -3.18,-0.32 -1.31,-0.55 -4.48,-1.92 -6.57,-2.84 -12.43,-7.41 -14.77,-11.55 -2.85,-5.05 -3.67,-9.62 -3.61,-15.49 0.04,-3.24 0.76,-6.07 0.76,-6.07v-0.02Z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:centerX="125.04"
+                android:centerY="115.36"
+                android:gradientRadius="69.96"
+                android:type="radial">
+
+                <item
+                    android:color="#FFAD254B"
+                    android:offset="0" />
+
+                <item
+                    android:color="#11E64173"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89.57,56.79v-16.92c0,-5.54 4.49,-10.03 10.03,-10.03h17.38"
+        android:strokeWidth="2.41"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M170.15,56.79v-16.92c0,-5.54 -4.49,-10.03 -10.03,-10.03h-17.38"
+        android:strokeWidth="2.41"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89.57,83.66v16.92c0,5.54 4.49,10.03 10.03,10.03h17.38"
+        android:strokeWidth="2.41"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M170.15,83.66v16.92c0,5.54 -4.49,10.03 -10.03,10.03h-17.38"
+        android:strokeWidth="2.41"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M116.84,39.25h-16.99c-0.78,0 -1.41,0.63 -1.41,1.41v16.99c0,0.78 0.63,1.41 1.41,1.41h16.99c0.78,0 1.41,-0.63 1.41,-1.41v-16.99c0,-0.78 -0.63,-1.41 -1.41,-1.41Z"
+        android:strokeWidth="2.41"
+        android:strokeColor="#1e053d"
+        android:strokeLineJoin="round" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M103.8,44.47h9.08c0.08,0 0.15,0.07 0.15,0.15v9.08c0,0.08 -0.07,0.15 -0.15,0.15h-9.08c-0.08,0 -0.15,-0.07 -0.15,-0.15v-9.08c0,-0.08 0.07,-0.15 0.15,-0.15Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M118.25,82.17h-19.82v19.82h19.82v-19.82Z"
+        android:strokeWidth="2.41"
+        android:strokeColor="#1e053d"
+        android:strokeLineJoin="round" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M103.8,87.4h9.08c0.08,0 0.15,0.07 0.15,0.15v9.08c0,0.08 -0.07,0.15 -0.15,0.15h-9.08c-0.08,0 -0.15,-0.07 -0.15,-0.15v-9.08c0,-0.08 0.07,-0.15 0.15,-0.15Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M162.39,39.25h-19.82v19.82h19.82v-19.82Z"
+        android:strokeWidth="2.41"
+        android:strokeColor="#1e053d"
+        android:strokeLineJoin="round" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M147.94,44.47h9.08c0.08,0 0.15,0.07 0.15,0.15v9.08c0,0.08 -0.07,0.15 -0.15,0.15h-9.08c-0.08,0 -0.15,-0.07 -0.15,-0.15v-9.08c0,-0.08 0.07,-0.15 0.15,-0.15Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M136.99,41.61v3.53h-8.23v-3.53h8.23Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M158.91,84.97v3.53h-11.48v-3.53h11.48Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M150.96,100.8h-3.53v-12.27h3.53v12.27Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M136.97,58.98h-3.53v-8.39h3.53v8.39Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M132.28,66.41h-3.53v-10.94h3.53v10.94Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M127.55,50.51v3.77h-3.77v-3.77h3.77Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M137.26,67.62v3.77h-3.77v-3.77h3.77Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M158.53,93.52v3.77h-3.77v-3.77h3.77Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M151.06,72.31h-3.53v-8.39h3.53v8.39Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M155.8,77.17h-3.53v-8.39h3.53v8.39Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M160.74,63.81v3.77h-3.77v-3.77h3.77Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M141.77,76.34v3.53h-8.39v-3.53h8.39Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M136.98,80.99v3.53h-8.39v-3.53h8.39Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M132.53,100.14h-3.53v-14.42h3.53v14.42Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M127.8,85.71v3.77h-3.77v-3.77h3.77Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M136.99,94.37v3.77h-3.41v-3.77h3.41Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M121.93,68.52v3.53h-8.39v-3.53h8.39Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M112.32,73.22v3.53h-8.39v-3.53h8.39Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M123.15,75.92h-3.53v-12.27h3.53v12.27Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+    <path
+        android:fillColor="#311466"
+        android:pathData="M102.72,68.27v3.77h-3.77v-3.77h3.77Z"
+        android:strokeWidth="1.21"
+        android:strokeColor="#1e053d" />
+
+</vector>
diff --git a/mobile/android/fenix/app/src/main/res/layout/fragment_turn_on_sync.xml b/mobile/android/fenix/app/src/main/res/layout/fragment_turn_on_sync.xml
index cbac8400062fd..1b51d6e0f7871 100644
--- a/mobile/android/fenix/app/src/main/res/layout/fragment_turn_on_sync.xml
+++ b/mobile/android/fenix/app/src/main/res/layout/fragment_turn_on_sync.xml
@@ -36,11 +36,11 @@
             android:layout_marginTop="16dp"
             android:adjustViewBounds="true"
             android:importantForAccessibility="no"
-            android:scaleType="fitXY"
+            android:scaleType="fitCenter"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/title_sign_in"
-            app:srcCompat="@drawable/ic_scan" />
+            app:srcCompat="@drawable/nova_onboarding_sync_qr" />
 
         <TextView
             android:id="@+id/signInInstructions"

From b348a92ef502539484ec05c98a43673393241f8d Mon Sep 17 00:00:00 2001
From: t-p-white <towhite@mozilla.com>
Date: Thu, 29 Jan 2026 14:50:19 +0000
Subject: [PATCH 072/116] Bug 2012103 - Part 6: Nova onboarding ToU card Kit
 easter egg - change image on press r=android-reviewers,gmalekpour

{F56660470}

Differential Revision: https://phabricator.services.mozilla.com/D280748
---
 mobile/android/fenix/app/lint-baseline.xml    |  11 +
 .../TermsOfServiceOnboardingPageRedesign.kt   |  35 +-
 .../res/drawable/nova_onboarding_tou_2.xml    | 848 ++++++++++++++++++
 3 files changed, 892 insertions(+), 2 deletions(-)
 create mode 100644 mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_tou_2.xml

diff --git a/mobile/android/fenix/app/lint-baseline.xml b/mobile/android/fenix/app/lint-baseline.xml
index 12e14630a916a..08c3a166ff45e 100644
--- a/mobile/android/fenix/app/lint-baseline.xml
+++ b/mobile/android/fenix/app/lint-baseline.xml
@@ -375,6 +375,17 @@
             column="20"/>
     </issue>
 
+    <issue
+        id="VectorRaster"
+        message="Limit vector icons sizes to 200×200 to keep icon drawing fast; see https://developer.android.com/studio/write/vector-asset-studio#when for more"
+        errorLine1="    android:width=&quot;257dp&quot;"
+        errorLine2="                   ~~~~~">
+        <location
+            file="src/main/res/drawable/nova_onboarding_tou_2.xml"
+            line="7"
+            column="20"/>
+    </issue>
+
     <issue
         id="VectorRaster"
         message="Limit vector icons sizes to 200×200 to keep icon drawing fast; see https://developer.android.com/studio/write/vector-asset-studio#when for more"
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt
index af51ae08c6e8a..6dce14fb37138 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/redesign/view/TermsOfServiceOnboardingPageRedesign.kt
@@ -5,6 +5,8 @@
 package org.mozilla.fenix.onboarding.redesign.view
 
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -19,10 +21,13 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.text.style.TextAlign
@@ -41,6 +46,11 @@ import org.mozilla.fenix.theme.FirefoxTheme
 
 private val TOU_IMAGE_HEIGHT = 200.dp
 
+private val kitImageResources = listOf(
+    R.drawable.nova_onboarding_tou,
+    R.drawable.nova_onboarding_tou_2,
+)
+
 /**
  * A Composable for displaying the terms of service onboarding page content.
  *
@@ -97,10 +107,22 @@ fun TermsOfServiceOnboardingPageRedesign(
 
 @Composable
 private fun Header(pageState: OnboardingPageState) {
+    val currentImageIndex = remember { mutableIntStateOf(0) }
+    val currentImageRes = kitImageResources[currentImageIndex.intValue]
+
     Image(
-        painter = painterResource(id = pageState.imageRes),
+        painter = painterResource(id = currentImageRes),
         contentDescription = null, // Decorative image only.
-        modifier = Modifier.height(TOU_IMAGE_HEIGHT),
+        modifier = Modifier
+            .height(TOU_IMAGE_HEIGHT)
+            .clickable(
+                role = Role.Button,
+                interactionSource = remember { MutableInteractionSource() },
+                indication = null, // Prevents onClick press/ripple animation
+            ) {
+                currentImageIndex.intValue =
+                    nextCyclicImageIndex(currentImageIndex.intValue, kitImageResources.size)
+            },
     )
 
     Spacer(Modifier.height(20.dp))
@@ -116,6 +138,15 @@ private fun Header(pageState: OnboardingPageState) {
     pageState.termsOfService?.subheaderOneText?.let { SubHeader(it) }
 }
 
+/**
+ * Advances the image index to the next item, wrapping back to the start when the end of the list
+ * is reached. This ensures the index always stays within valid bounds.
+ */
+private fun nextCyclicImageIndex(
+    currentImageIndex: Int,
+    imageResourcesSize: Int,
+) = (currentImageIndex + 1) % imageResourcesSize
+
 @Composable
 private fun SubHeader(text: String) {
     Text(
diff --git a/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_tou_2.xml b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_tou_2.xml
new file mode 100644
index 0000000000000..1ae806335ffe7
--- /dev/null
+++ b/mobile/android/fenix/app/src/main/res/drawable/nova_onboarding_tou_2.xml
@@ -0,0 +1,848 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="220.04773dp"
+    android:height="257dp"
+    android:viewportWidth="196.81"
+    android:viewportHeight="229.86">
+
+    <path android:pathData="m193.1,51.84c-1.26,-3.22 -8.85,-1.82 -13.5,-5.71 -1.77,-1.48 -2.88,-4.52 -3.67,-7.31 -0.43,-1.5 -0.77,-2.93 -1.07,-4 -1.82,-6.44 -2.33,-9.58 -5.28,-18.98 -2.64,-8.42 -5.77,-15.42 -9.39,-15.78 -3.59,-0.36 -7.36,3.99 -12.34,12.4 -2.81,4.75 -4.66,8.98 -6.69,12.01 -0.1,0.15 -0.2,0.31 -0.3,0.45 -0.12,0.17 -5.03,-0.25 -7.26,0 -0.27,0.03 -0.5,-0.11 -0.72,-0.41 -1.01,-1.36 -1.9,-6.03 -5.71,-13.71 -4.62,-9.31 -8.19,-11.49 -12.22,-10.63 -3.4,0.72 -7.42,10.56 -10.22,19.57 -2.12,6.82 -2,7.56 -2.81,10.07 -0.85,2.68 -1.86,6.07 -3.1,9.22 -1.35,3.44 -2.98,6.58 -4.99,8.18 -4.9,3.89 -9.73,2.6 -11.4,5.62 -1.35,2.44 1.64,2.46 1.75,3.07 15.61,-1.15 29.28,14.9 35.18,11.54 1.91,-1.09 3.73,-2.89 7.19,-5.76 2.58,-2.58 5.09,-4.77 8.6,-5.34 7.36,-1.19 11.3,6.46 17.89,11.37 0.11,0.08 0.21,0.17 0.31,0.26 2.27,0.53 5.72,0.37 10.35,-1.52 7.93,-3.24 18.14,-9.93 27.62,-11.14 -0.66,-0.86 2.54,-1.5 1.77,-3.48z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="138.75"
+                android:endY="213.18"
+                android:startX="137.32"
+                android:startY="5.31"
+                android:type="linear">
+
+                <item
+                    android:color="#FFFF6600"
+                    android:offset="0" />
+
+                <item
+                    android:color="#FFFF9C00"
+                    android:offset="0.24" />
+
+                <item
+                    android:color="#FFFF9200"
+                    android:offset="0.31" />
+
+                <item
+                    android:color="#FFFF7900"
+                    android:offset="0.44" />
+
+                <item
+                    android:color="#FFFF6600"
+                    android:offset="0.52" />
+
+                <item
+                    android:color="#FFFB2872"
+                    android:offset="0.96" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path android:pathData="m109.11,212.4c0.08,-0.02 0.14,-0.03 0.18,-0.04 0.21,-0.06 -18.89,-6.65 -16.01,-24.19 1.3,-7.97 4.25,-11.26 6.84,-15.97 0.52,-0.94 0.93,-1.93 1.28,-2.96 -1.97,-0.4 -4.58,-1.04 -8.01,-2.41 -31.16,-12.45 -32.38,-44.11 -30.33,-74.78 1.59,-23.69 -24.67,-33.81 -24.67,-33.81 0,0 7.33,12.45 -5.5,23.97 -14.84,13.33 -29.13,32.38 -28.52,61.02 0.03,1.34 0.28,4.77 0.28,4.77 0,0 -0.99,-0.48 -2.29,-1.83 -1.67,-1.73 -2.33,-2.83 -2.33,-2.83 0,0 -0.54,8.17 3.3,20.62 5.72,18.54 17.6,34.81 35.89,46.01 17.82,10.91 32.28,11.56 58.49,11.6 0,-1 0.44,-2.21 1.7,-3.76 3.58,-4.38 8.49,-5.17 9.69,-5.42z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="84.67"
+                android:endY="227.01"
+                android:startX="5.67"
+                android:startY="70.21"
+                android:type="linear">
+
+                <item
+                    android:color="#FFFFEB49"
+                    android:offset="0" />
+
+                <item
+                    android:color="#FFFF6600"
+                    android:offset="0.45" />
+
+                <item
+                    android:color="#FFFF6109"
+                    android:offset="0.54" />
+
+                <item
+                    android:color="#FFFF5322"
+                    android:offset="0.69" />
+
+                <item
+                    android:color="#FFFF453F"
+                    android:offset="0.82" />
+
+                <item
+                    android:color="#FFFB2872"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path android:pathData="m31.05,129.28c-0.96,-8.4 -0.66,-18.17 -0.66,-18.17 0,0 -3.04,7.41 -4.8,16.87 -1.31,7.03 -1.99,14.56 -1.9,16.25 -0.43,-0.61 -1.67,-2.55 -2.72,-5.69 -1.32,-3.96 -2.25,-7.23 -2.25,-7.23 0.05,-0.03 -3.25,13.39 2.8,38.04 7.68,19.31 20.72,26.26 26.74,19.07 6.02,-7.19 -1.61,-14.04 -6.39,-20.8 -5.93,-8.39 -9.21,-24.32 -10.82,-38.33z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="35.37"
+                android:endY="174.61"
+                android:startX="27.41"
+                android:startY="110.52"
+                android:type="linear">
+
+                <item
+                    android:color="#FFFFEB49"
+                    android:offset="0" />
+
+                <item
+                    android:color="#F4FFE545"
+                    android:offset="0.09" />
+
+                <item
+                    android:color="#D6FFD63D"
+                    android:offset="0.24" />
+
+                <item
+                    android:color="#A8FFBD2F"
+                    android:offset="0.44" />
+
+                <item
+                    android:color="#66FF9A1C"
+                    android:offset="0.67" />
+
+                <item
+                    android:color="#11FF6F05"
+                    android:offset="0.94" />
+
+                <item
+                    android:color="#00FF6600"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path android:pathData="m126.42,214.69c0.14,-0.83 0.25,-1.61 0.3,-2.27 0.21,-2.65 0.24,-5.95 0.14,-9.67 -0.59,4.11 -1.97,7.97 -3.99,11.42 1.26,0.18 2.45,0.35 3.55,0.52z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="124.96"
+                android:endY="222.62"
+                android:startX="123.64"
+                android:startY="3.05"
+                android:type="linear">
+
+                <item
+                    android:color="#FFFF6600"
+                    android:offset="0" />
+
+                <item
+                    android:color="#FFFF9C00"
+                    android:offset="0.2" />
+
+                <item
+                    android:color="#FFFF9200"
+                    android:offset="0.29" />
+
+                <item
+                    android:color="#FFFF7900"
+                    android:offset="0.43" />
+
+                <item
+                    android:color="#FFFF6600"
+                    android:offset="0.52" />
+
+                <item
+                    android:color="#FFFB2872"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path
+        android:fillAlpha="0.6"
+        android:pathData="m126.42,214.69c0.14,-0.83 0.25,-1.61 0.3,-2.27 0.21,-2.65 0.24,-5.95 0.14,-9.67 -0.59,4.11 -1.97,7.97 -3.99,11.42 1.26,0.18 2.45,0.35 3.55,0.52z"
+        android:strokeAlpha="0.6">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="125.33"
+                android:endY="196.37"
+                android:startX="129.28"
+                android:startY="62.62"
+                android:type="linear">
+
+                <item
+                    android:color="#FFFFEB49"
+                    android:offset="0" />
+
+                <item
+                    android:color="#99FFB52B"
+                    android:offset="0.36" />
+
+                <item
+                    android:color="#47FF8A14"
+                    android:offset="0.67" />
+
+                <item
+                    android:color="#14FF7005"
+                    android:offset="0.89" />
+
+                <item
+                    android:color="#00FF6600"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path
+        android:fillColor="#ffc635"
+        android:pathData="m135.15,56.34c-3.51,0.57 -6.02,2.76 -8.6,5.34 -1.96,1.96 -3.97,4.16 -6.51,6.04 -5.66,4.2 2.66,18.54 20.54,16.65 13.02,-1.38 17.96,-11.97 12.78,-16.39 -0.1,-0.09 -0.2,-0.18 -0.31,-0.26 -6.59,-4.92 -10.53,-12.57 -17.89,-11.37z" />
+
+    <path
+        android:fillAlpha="0.6"
+        android:pathData="m158.29,221.74c7.9,1.2 11.38,2.7 17.72,3.02 7.11,0.36 9.32,-0.35 10.52,-2.48 0.65,-1.16 0.97,-2.38 -0.32,-3.96l-28.03,2.98c0.04,0.15 0.07,0.29 0.11,0.44z"
+        android:strokeAlpha="0.6">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="173.32"
+                android:endY="197.79"
+                android:startX="177.27"
+                android:startY="64.04"
+                android:type="linear">
+
+                <item
+                    android:color="#FFFFEB49"
+                    android:offset="0" />
+
+                <item
+                    android:color="#99FFB52B"
+                    android:offset="0.36" />
+
+                <item
+                    android:color="#47FF8A14"
+                    android:offset="0.67" />
+
+                <item
+                    android:color="#14FF7005"
+                    android:offset="0.89" />
+
+                <item
+                    android:color="#00FF6600"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path android:pathData="m151.28,55.53c3.38,-0.07 5.96,1.22 5.69,-3.64 -0.39,-6.85 -2.35,-8.66 -5.81,-8.44 -3.73,0.24 -4.42,3.38 -4.52,8.82 -0.08,3.99 2.88,3.29 4.65,3.25z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="152.58"
+                android:endY="55.92"
+                android:startX="149.47"
+                android:startY="39.59"
+                android:type="linear">
+
+                <item
+                    android:color="#FFA030B9"
+                    android:offset="0.16" />
+
+                <item
+                    android:color="#FF00073A"
+                    android:offset="0.88" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M153.09,48.42m-1.63,0a1.63,1.63 0,1 1,3.26 0a1.63,1.63 0,1 1,-3.26 0" />
+
+    <path android:pathData="m120.08,55.54c3.41,-0.07 5.57,0.79 5.74,-2.16 0.37,-6.42 -0.88,-10.29 -5.64,-9.93 -3,0.23 -4.32,3.57 -4.55,8.03 -0.28,5.5 2.64,4.09 4.45,4.05z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="121.21"
+                android:endY="54.44"
+                android:startX="119.09"
+                android:startY="40.36"
+                android:type="linear">
+
+                <item
+                    android:color="#FFA030B9"
+                    android:offset="0.16" />
+
+                <item
+                    android:color="#FF00073A"
+                    android:offset="0.88" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="m122.39,49.96c0.91,0 1.64,-0.74 1.64,-1.64 0,-0.9 -0.74,-1.64 -1.64,-1.64 -0.9,0 -1.64,0.74 -1.64,1.64 0,0.9 0.74,1.64 1.64,1.64z" />
+
+    <path
+        android:fillColor="#00073a"
+        android:pathData="m136.54,60.25c-2.82,-0.03 -4.36,1.16 -4.81,2.27 -0.56,1.38 0.63,4.27 4.09,4.31 3.29,0.04 5.2,-2.64 4.78,-4.17 -0.3,-1.09 -1.57,-2.38 -4.06,-2.41z" />
+
+    <path android:pathData="m175.92,38.82c-0.43,-1.5 -0.77,-2.93 -1.07,-4 -1.82,-6.44 -2.33,-9.58 -5.28,-18.98 -2.64,-8.42 -5.77,-15.42 -9.39,-15.78 -3.59,-0.36 -7.36,3.99 -12.34,12.4 -2.81,4.75 -4.66,8.98 -6.69,12.01 3.61,0.07 11.14,0.74 18.15,4.84 6.59,3.84 13.34,7.72 16.61,9.52z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="167.97"
+                android:endY="-10.31"
+                android:startX="159.8"
+                android:startY="25.83"
+                android:type="linear">
+
+                <item
+                    android:color="#00FF6600"
+                    android:offset="0" />
+
+                <item
+                    android:color="#2BFF6600"
+                    android:offset="0.03" />
+
+                <item
+                    android:color="#5BFF6600"
+                    android:offset="0.07" />
+
+                <item
+                    android:color="#87FF6600"
+                    android:offset="0.11" />
+
+                <item
+                    android:color="#ADFF6600"
+                    android:offset="0.16" />
+
+                <item
+                    android:color="#CCFF6600"
+                    android:offset="0.2" />
+
+                <item
+                    android:color="#E2FF6600"
+                    android:offset="0.25" />
+
+                <item
+                    android:color="#F2FF6600"
+                    android:offset="0.3" />
+
+                <item
+                    android:color="#FCFF6600"
+                    android:offset="0.36" />
+
+                <item
+                    android:color="#FFFF6600"
+                    android:offset="0.43" />
+
+                <item
+                    android:color="#FFFD4737"
+                    android:offset="0.72" />
+
+                <item
+                    android:color="#FFFB2872"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path android:pathData="m132.88,24.51c-1.01,-1.36 -1.9,-6.03 -5.71,-13.71 -4.62,-9.31 -8.19,-11.49 -12.22,-10.63 -3.4,0.72 -7.42,10.56 -10.22,19.57 -2.12,6.82 -2,7.56 -2.81,10.07 -0.85,2.68 -1.86,6.07 -3.1,9.22 3.09,-1.69 10.12,-5.71 16.99,-9.72 6.37,-3.72 13.17,-4.62 17.07,-4.8z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="106.13"
+                android:endY="-11.45"
+                android:startX="114.3"
+                android:startY="24.69"
+                android:type="linear">
+
+                <item
+                    android:color="#00FF6600"
+                    android:offset="0" />
+
+                <item
+                    android:color="#2BFF6600"
+                    android:offset="0.03" />
+
+                <item
+                    android:color="#5BFF6600"
+                    android:offset="0.07" />
+
+                <item
+                    android:color="#87FF6600"
+                    android:offset="0.11" />
+
+                <item
+                    android:color="#ADFF6600"
+                    android:offset="0.16" />
+
+                <item
+                    android:color="#CCFF6600"
+                    android:offset="0.2" />
+
+                <item
+                    android:color="#E2FF6600"
+                    android:offset="0.25" />
+
+                <item
+                    android:color="#F2FF6600"
+                    android:offset="0.3" />
+
+                <item
+                    android:color="#FCFF6600"
+                    android:offset="0.36" />
+
+                <item
+                    android:color="#FFFF6600"
+                    android:offset="0.43" />
+
+                <item
+                    android:color="#FFFD4737"
+                    android:offset="0.71" />
+
+                <item
+                    android:color="#FFFB2872"
+                    android:offset="0.98" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path android:pathData="m122.87,214.17c-3.11,-0.44 -6.73,-0.92 -10.91,-1.43 -0.92,-0.11 -1.87,-0.23 -2.85,-0.34 -1.19,0.25 -6.11,1.04 -9.69,5.42 -1.27,1.55 -1.69,2.76 -1.7,3.76 0,0.67 0.17,1.24 0.43,1.75 1.18,2.29 6.91,2.07 10.22,1.19 1.88,-0.5 4.3,-1.06 7,-1.6 2.94,-0.59 6.19,-1.15 9.39,-1.6 0.1,-0.36 0.21,-0.72 0.33,-1.09 0.47,-1.38 0.99,-3.59 1.32,-5.55 -1.1,-0.16 -2.29,-0.34 -3.55,-0.52z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="66.59"
+                android:endY="236.72"
+                android:startX="191.22"
+                android:startY="187.05"
+                android:type="linear">
+
+                <item
+                    android:color="#00BE0449"
+                    android:offset="0.02" />
+
+                <item
+                    android:color="#FFFB2872"
+                    android:offset="0.51" />
+
+                <item
+                    android:color="#FFA31C5E"
+                    android:offset="0.67" />
+
+                <item
+                    android:color="#FF4C104A"
+                    android:offset="0.83" />
+
+                <item
+                    android:color="#FF15093E"
+                    android:offset="0.94" />
+
+                <item
+                    android:color="#FF00073A"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path android:pathData="m186.21,218.32c-0.75,-0.92 -2.05,-1.96 -4.15,-3.18 -2.67,-1.55 -5.05,-2.23 -4.73,-2.71 -0.43,0.07 -0.85,0.14 -1.29,0.23 -9.05,1.83 -15.13,2.89 -19.23,3.48 0.31,1.53 0.69,3.05 1.05,4.09 0.12,0.35 0.23,0.71 0.32,1.06 0.04,0.15 0.07,0.29 0.11,0.44 7.9,1.2 11.38,2.7 17.72,3.02 7.11,0.36 9.32,-0.35 10.52,-2.48 0.65,-1.16 0.97,-2.38 -0.32,-3.96z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="206.45"
+                android:endY="232.2"
+                android:startX="121.39"
+                android:startY="198.94"
+                android:type="linear">
+
+                <item
+                    android:color="#00BE0449"
+                    android:offset="0" />
+
+                <item
+                    android:color="#FFFB2872"
+                    android:offset="0.41" />
+
+                <item
+                    android:color="#FF00073A"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path android:pathData="m196.81,59.33c-0.29,-2.92 -3.81,-3.06 -4.96,-3.63 -0.27,-0.13 -0.43,-0.26 -0.53,-0.38 -9.48,1.21 -19.69,7.9 -27.62,11.14 -4.63,1.89 -8.08,2.05 -10.35,1.52 5.18,4.42 0.24,15.01 -12.78,16.39 -17.87,1.89 -26.2,-12.45 -20.54,-16.65 2.54,-1.88 4.55,-4.07 6.51,-6.04 -3.47,2.87 -5.28,4.67 -7.19,5.76 -5.9,3.37 -19.56,-12.68 -35.18,-11.54 0,0.05 0,0.11 -0.03,0.17 -0.77,1.34 -5.89,0.75 -6.12,4.02 -0.19,2.68 4.8,1.65 4.78,2.87 -0.03,1.67 -3.63,2.34 -3.63,4.02 0,4.21 3.63,0.57 18.36,11.86 7.85,6.01 9.18,17.29 8.47,29.92 -0.36,6.34 -2.97,20.37 -3.34,27.8 -0.61,12.18 1.25,22.43 -0.62,30.48 -0.18,0.75 -0.4,1.48 -0.64,2.2 -0.35,1.02 -0.76,2.01 -1.28,2.96 -2.6,4.71 -5.54,8 -6.84,15.97 -2.87,17.54 16.22,24.13 16.01,24.19 -0.04,0.01 -0.11,0.03 -0.18,0.04 0.98,0.12 1.93,0.23 2.85,0.34 4.17,0.51 7.79,0.99 10.91,1.43 2.01,-3.45 3.4,-7.31 3.99,-11.42 0.1,3.71 0.07,7.01 -0.14,9.67 -0.05,0.65 -0.16,1.44 -0.3,2.27 -0.33,1.96 -0.85,4.17 -1.32,5.55 -0.12,0.36 -0.23,0.73 -0.33,1.09 -0.73,2.67 -0.73,5.15 -0.07,6.27 2,3.38 14.41,2.87 14.99,-1.12 0.28,-1.95 0.47,-4.34 0.58,-7.05 0.48,-0.02 0.96,-0.04 1.4,-0.04 0.34,0 0.67,0.02 1.01,0.03 0.11,2.71 0.3,5.1 0.58,7.05 0.58,3.99 12.99,4.5 14.99,1.12 0.62,-1.05 0.65,-3.35 0.03,-5.85 -0.04,-0.15 -0.07,-0.29 -0.11,-0.44 -0.1,-0.35 -0.2,-0.7 -0.32,-1.06 -0.36,-1.05 -0.74,-2.57 -1.05,-4.09 4.1,-0.59 10.19,-1.65 19.23,-3.48 0.44,-0.09 0.87,-0.16 1.29,-0.23 0.05,-0.08 0.16,-0.15 0.36,-0.21 8.1,-2.8 17.3,-15.21 13.05,-26.81 -2.43,-6.64 -6.94,-9.79 -9.47,-14.22 -5.23,-9.18 -1.24,-11.33 -3.54,-35.83 -1,-10.67 -3.8,-23.24 -4.94,-29.75 -2.25,-12.92 -0.09,-24.42 6.91,-29.77 8.1,-6.19 12.31,-4.79 12.69,-8.11 0.18,-1.57 -2.36,-1.87 -2.3,-3.44 0.1,-2.47 6.94,-2.51 6.69,-4.97z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="130.48"
+                android:endY="258.59"
+                android:startX="139.04"
+                android:startY="13.59"
+                android:type="linear">
+
+                <item
+                    android:color="#FFFF6600"
+                    android:offset="0.02" />
+
+                <item
+                    android:color="#FFFF7408"
+                    android:offset="0.02" />
+
+                <item
+                    android:color="#FFFF9419"
+                    android:offset="0.03" />
+
+                <item
+                    android:color="#FFFFAF28"
+                    android:offset="0.03" />
+
+                <item
+                    android:color="#FFFFC534"
+                    android:offset="0.04" />
+
+                <item
+                    android:color="#FFFFD63D"
+                    android:offset="0.05" />
+
+                <item
+                    android:color="#FFFFE244"
+                    android:offset="0.06" />
+
+                <item
+                    android:color="#FFFFE947"
+                    android:offset="0.07" />
+
+                <item
+                    android:color="#FFFFEB49"
+                    android:offset="0.11" />
+
+                <item
+                    android:color="#FFFFC936"
+                    android:offset="0.21" />
+
+                <item
+                    android:color="#FFFF7508"
+                    android:offset="0.43" />
+
+                <item
+                    android:color="#FFFF6600"
+                    android:offset="0.47" />
+
+                <item
+                    android:color="#FFFB2872"
+                    android:offset="0.85" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path android:pathData="m138.85,178.43c-0.62,0.75 -0.99,5.61 -1.79,6.02 -0.64,0.32 -0.96,-3.82 -1.62,-7.56 -0.18,-1.01 -0.86,-4.29 -1.04,-5.25 -0.84,-4.68 -0.84,-4.31 -1.54,-8.13 -0.14,3.05 -0.42,3.86 -0.98,8.54 -0.27,2.27 -0.66,5 -0.98,6.51 -0.28,1.32 -0.71,-3.59 -0.98,-4.88 -1.3,-6.26 -2.2,-7.93 -3.96,-14.16 -0.99,-3.52 -4.1,-6.77 -4.4,-9.02 1.42,9.61 3.46,25.52 4.56,39.61 0.35,4.49 0.61,8.8 0.71,12.66 0.1,3.71 0.07,7.01 -0.14,9.67 -0.05,0.65 -0.16,1.44 -0.3,2.27 -0.33,1.96 -0.85,4.17 -1.32,5.55 -0.12,0.36 -0.23,0.73 -0.33,1.09 -0.73,2.67 -0.73,5.15 -0.07,6.27 2,3.38 14.41,2.87 14.99,-1.12 0.28,-1.95 0.47,-4.34 0.58,-7.05 0.42,-10.2 -0.29,-25.18 -1.42,-41z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="133.49"
+                android:endY="248.09"
+                android:startX="129.86"
+                android:startY="151.75"
+                android:type="linear">
+
+                <item
+                    android:color="#00BE0449"
+                    android:offset="0.01" />
+
+                <item
+                    android:color="#0ABF054A"
+                    android:offset="0.06" />
+
+                <item
+                    android:color="#28C2084C"
+                    android:offset="0.14" />
+
+                <item
+                    android:color="#5BC70D51"
+                    android:offset="0.23" />
+
+                <item
+                    android:color="#A0CE1457"
+                    android:offset="0.35" />
+
+                <item
+                    android:color="#F7D71E5F"
+                    android:offset="0.48" />
+
+                <item
+                    android:color="#FFD81F60"
+                    android:offset="0.49" />
+
+                <item
+                    android:color="#FFD31E5F"
+                    android:offset="0.56" />
+
+                <item
+                    android:color="#FFC71D5D"
+                    android:offset="0.63" />
+
+                <item
+                    android:color="#FFB31A59"
+                    android:offset="0.7" />
+
+                <item
+                    android:color="#FF971754"
+                    android:offset="0.77" />
+
+                <item
+                    android:color="#FF73134E"
+                    android:offset="0.84" />
+
+                <item
+                    android:color="#FF460E46"
+                    android:offset="0.91" />
+
+                <item
+                    android:color="#FF13093D"
+                    android:offset="0.98" />
+
+                <item
+                    android:color="#FF00073A"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path
+        android:fillAlpha="0.6"
+        android:pathData="m151.44,136.72c2.63,-22.4 -10.94,-30.67 -10.94,-30.67 0,0 -12.89,9.53 -9.42,31.78 2.78,17.82 5.06,21.94 6.82,33.25 1.76,11.31 3.63,24.37 3.63,24.37 0,0 1.58,-12.62 3.71,-24.65 1.52,-8.59 4.57,-20.17 6.2,-34.08z"
+        android:strokeAlpha="0.6">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="144.71"
+                android:endY="209.52"
+                android:startX="140.87"
+                android:startY="125.07"
+                android:type="linear">
+
+                <item
+                    android:color="#FFFFEB49"
+                    android:offset="0" />
+
+                <item
+                    android:color="#F4FFE545"
+                    android:offset="0.09" />
+
+                <item
+                    android:color="#D6FFD63D"
+                    android:offset="0.24" />
+
+                <item
+                    android:color="#A8FFBD2F"
+                    android:offset="0.44" />
+
+                <item
+                    android:color="#66FF9A1C"
+                    android:offset="0.68" />
+
+                <item
+                    android:color="#11FF6F05"
+                    android:offset="0.94" />
+
+                <item
+                    android:color="#00FF6600"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path android:pathData="m158.18,221.3c-0.1,-0.35 -0.2,-0.7 -0.32,-1.06 -0.36,-1.05 -0.74,-2.57 -1.05,-4.09 -0.27,-1.35 -0.49,-2.7 -0.57,-3.73 -1.12,-14.08 2.83,-46.31 5.14,-61.93 -0.3,2.25 -3.41,5.5 -4.4,9.02 -1.75,6.23 -2.66,7.9 -3.96,14.16 -0.27,1.29 -0.7,6.2 -0.98,4.88 -0.32,-1.51 -0.71,-4.23 -0.98,-6.51 -0.56,-4.68 -0.84,-5.49 -0.98,-8.54 -0.7,3.82 -0.7,3.46 -1.54,8.13 -0.17,0.97 -0.86,4.24 -1.04,5.25 -0.66,3.74 -0.97,7.88 -1.62,7.56 -0.81,-0.41 -1.17,-5.27 -1.79,-6.02 -1.13,15.82 -1.84,30.8 -1.42,40.99 0.11,2.71 0.3,5.1 0.58,7.05 0.58,3.99 12.99,4.5 14.99,1.12 0.62,-1.05 0.65,-3.35 0.03,-5.85 -0.04,-0.15 -0.07,-0.29 -0.11,-0.44z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:endX="149.54"
+                android:endY="248.81"
+                android:startX="153.55"
+                android:startY="134.09"
+                android:type="linear">
+
+                <item
+                    android:color="#00D81F60"
+                    android:offset="0" />
+
+                <item
+                    android:color="#02D81F60"
+                    android:offset="0.11" />
+
+                <item
+                    android:color="#0FD81F60"
+                    android:offset="0.19" />
+
+                <item
+                    android:color="#23D81F60"
+                    android:offset="0.27" />
+
+                <item
+                    android:color="#3FD81F60"
+                    android:offset="0.35" />
+
+                <item
+                    android:color="#63D81F60"
+                    android:offset="0.42" />
+
+                <item
+                    android:color="#91D81F60"
+                    android:offset="0.49" />
+
+                <item
+                    android:color="#C4D81F60"
+                    android:offset="0.55" />
+
+                <item
+                    android:color="#FFD81F60"
+                    android:offset="0.62" />
+
+                <item
+                    android:color="#FFD21E5F"
+                    android:offset="0.66" />
+
+                <item
+                    android:color="#FFC21C5C"
+                    android:offset="0.71" />
+
+                <item
+                    android:color="#FFA81957"
+                    android:offset="0.77" />
+
+                <item
+                    android:color="#FF841551"
+                    android:offset="0.83" />
+
+                <item
+                    android:color="#FF551049"
+                    android:offset="0.9" />
+
+                <item
+                    android:color="#FF1D0A3F"
+                    android:offset="0.97" />
+
+                <item
+                    android:color="#FF00073A"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path
+        android:fillAlpha="0.38"
+        android:pathData="m126.14,190.1c-3.03,-11.5 -12.35,-20.47 -24.09,-23.06 -0.18,0.75 -0.4,1.48 -0.64,2.2 -0.35,1.02 -0.76,2.01 -1.28,2.96 -2.6,4.71 -5.54,8 -6.84,15.97 -2.87,17.54 16.22,24.13 16.01,24.19 -0.04,0.01 -0.11,0.03 -0.18,0.04 0.98,0.12 1.93,0.23 2.85,0.34 4.17,0.51 7.79,0.99 10.91,1.43 2.01,-3.45 3.4,-7.31 3.99,-11.42 -0.11,-3.86 -0.36,-8.17 -0.71,-12.66z"
+        android:strokeAlpha="0.38">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:centerX="95.25"
+                android:centerY="202.56"
+                android:gradientRadius="52.79"
+                android:type="radial">
+
+                <item
+                    android:color="#FFFFEB49"
+                    android:offset="0" />
+
+                <item
+                    android:color="#F4FFE546"
+                    android:offset="0.07" />
+
+                <item
+                    android:color="#D8FFD73E"
+                    android:offset="0.18" />
+
+                <item
+                    android:color="#ADFFC031"
+                    android:offset="0.32" />
+
+                <item
+                    android:color="#70FFA01F"
+                    android:offset="0.49" />
+
+                <item
+                    android:color="#21FF7709"
+                    android:offset="0.69" />
+
+                <item
+                    android:color="#00FF6600"
+                    android:offset="0.77" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+</vector>

From ce12ba096df99d308207491e824705e89ee57685 Mon Sep 17 00:00:00 2001
From: Bob Owen <bobowencode@gmail.com>
Date: Thu, 29 Jan 2026 14:54:41 +0000
Subject: [PATCH 073/116] Bug 2012950 - Increase the number of sandbox policy
 memory pages. r=yjuglaret

We are seeing some users running out of rules space for fonts. This patch adds
another 32 KB of rules space to try and make sure we mitigate the issue
for most if not all users.
We will be moving to a single font rule in Bug 2002995, which will mean we can
reduce the kPolMemPageCount back to a much smaller number.

Differential Revision: https://phabricator.services.mozilla.com/D280918
---
 ...ace_kPolMemPageCount_and_revert_to_14.patch | 18 +++++++++---------
 .../chromium/sandbox/win/src/sandbox_policy.h  |  2 +-
 .../win/src/sandboxbroker/sandboxBroker.cpp    | 12 ++++++++----
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/security/sandbox/chromium-shim/patches/52_surface_kPolMemPageCount_and_revert_to_14.patch b/security/sandbox/chromium-shim/patches/52_surface_kPolMemPageCount_and_revert_to_14.patch
index 688cc1855aa2c..912b7f1b86695 100644
--- a/security/sandbox/chromium-shim/patches/52_surface_kPolMemPageCount_and_revert_to_14.patch
+++ b/security/sandbox/chromium-shim/patches/52_surface_kPolMemPageCount_and_revert_to_14.patch
@@ -1,11 +1,11 @@
 This surfaces the memory page count for the maximum policy size as a constant,
-so that we can rely on it in our code. It also reverts it to 14, the value
-it was set to before the latest chromium sandbox update.
+so that we can rely on it in our code. It also changes it to 22 to allow for
+uesrs that need large numbers of GPU process font rules.
 
-diff --git a/security/sandbox/chromium/sandbox/win/src/sandbox_policy.h b/security/sandbox/chromium/sandbox/win/src/sandbox_policy.h
+diff --git a/sandbox/win/src/sandbox_policy.h b/sandbox/win/src/sandbox_policy.h
 index 4d9d8f270890..bffab2fae890 100644
---- a/security/sandbox/chromium/sandbox/win/src/sandbox_policy.h
-+++ b/security/sandbox/chromium/sandbox/win/src/sandbox_policy.h
+--- a/sandbox/win/src/sandbox_policy.h
++++ b/sandbox/win/src/sandbox_policy.h
 @@ -10,16 +10,19 @@
  
  #include "base/containers/span.h"
@@ -16,7 +16,7 @@ index 4d9d8f270890..bffab2fae890 100644
  namespace sandbox {
  
 +// Number of memory pages to allow for the policy storage.
-+constexpr size_t kPolMemPageCount = 14;
++constexpr size_t kPolMemPageCount = 22;
 +
  class AppContainer;
  
@@ -26,10 +26,10 @@ index 4d9d8f270890..bffab2fae890 100644
    kDefault,
    // Child is launched using the alternate desktop.
    kAlternateDesktop,
-diff --git a/security/sandbox/chromium/sandbox/win/src/sandbox_policy_base.cc b/security/sandbox/chromium/sandbox/win/src/sandbox_policy_base.cc
+diff --git a/sandbox/win/src/sandbox_policy_base.cc b/sandbox/win/src/sandbox_policy_base.cc
 index 2559133d772b..3395e9cadc07 100644
---- a/security/sandbox/chromium/sandbox/win/src/sandbox_policy_base.cc
-+++ b/security/sandbox/chromium/sandbox/win/src/sandbox_policy_base.cc
+--- a/sandbox/win/src/sandbox_policy_base.cc
++++ b/sandbox/win/src/sandbox_policy_base.cc
 @@ -44,17 +44,17 @@
  
  namespace sandbox {
diff --git a/security/sandbox/chromium/sandbox/win/src/sandbox_policy.h b/security/sandbox/chromium/sandbox/win/src/sandbox_policy.h
index bffab2fae890e..efc0869d3b873 100644
--- a/security/sandbox/chromium/sandbox/win/src/sandbox_policy.h
+++ b/security/sandbox/chromium/sandbox/win/src/sandbox_policy.h
@@ -16,7 +16,7 @@
 namespace sandbox {
 
 // Number of memory pages to allow for the policy storage.
-constexpr size_t kPolMemPageCount = 14;
+constexpr size_t kPolMemPageCount = 22;
 
 class AppContainer;
 
diff --git a/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp b/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
index 6f69ce6f66cf4..fc668765e79b4 100644
--- a/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
+++ b/security/sandbox/win/src/sandboxbroker/sandboxBroker.cpp
@@ -1389,10 +1389,14 @@ void SandboxBroker::SetSecurityLevelForGPUProcess(int32_t aSandboxLevel) {
   config->SetLockdownDefaultDacl();
   config->AddRestrictingRandomSid();
 
-  // Policy wrapper to keep track of available rule space. The full policy has
-  // 14 pages, so 12 allows two pages for generic process rules and to allow for
-  // padding that occurs in LowLevelPolicy::Done. See bug 2009140.
-  sandboxing::SizeTrackingConfig trackingConfig(config, 12);
+  // Policy wrapper to keep track of available rule space. We allow two spare
+  // pages for generic process rules and to allow for padding that occurs in
+  // LowLevelPolicy::Done. See bug 2009140.
+  // Note that we plan to move to a single font access rule in bug 2002995. This
+  // will remove the need for individual rules and mean that we can reduce
+  // sandbox::kPolMemPageCount.
+  sandboxing::SizeTrackingConfig trackingConfig(config,
+                                                sandbox::kPolMemPageCount - 2);
 
   if (StaticPrefs::security_sandbox_chrome_pipe_rule_enabled()) {
     // Add the policy for the client side of a pipe. It is just a file

From ab26851cffbd3815efc3237059aabe2a3bb93712 Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <jrediger@mozilla.com>
Date: Thu, 29 Jan 2026 15:03:18 +0000
Subject: [PATCH 074/116] Bug 2010018 - Update to Glean v67.0.0
 r=TravisLong,mach-reviewers,ahochheiden

Note: the `mach vendor rust` step is done in a separate follow-up patch,
after an also-required application-services update.

Unfortunately this duplicates the `toml` dependency in gfx/wr, due to
other outdated dependencies requiring an old version. We currently
cannot resolve this.

Differential Revision: https://phabricator.services.mozilla.com/D280214
---
 Cargo.toml                |   2 +-
 gfx/wr/Cargo.lock         | 153 ++++++++++++++++++++++----------------
 gfx/wr/Cargo.toml         |   2 +-
 gfx/wr/servo-tidy.toml    |   3 +
 gradle/libs.versions.toml |   2 +-
 python/sites/mach.txt     |   2 +-
 6 files changed, 97 insertions(+), 67 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6f669ec9414bc..de1a9e5d6cb1f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -77,7 +77,7 @@ uniffi_pipeline = "0.29.3"
 # Shared across multiple application-services consumers.
 rusqlite = "0.37"
 # Shared across multiple glean consumers.
-glean = "=66.3.0"
+glean = "=67.0.0"
 
 # Explicitly specify what our profiles use.  The opt-level setting here is
 # a total fiction; see the setup of MOZ_RUST_DEFAULT_FLAGS for what the
diff --git a/gfx/wr/Cargo.lock b/gfx/wr/Cargo.lock
index 91ccc4ac129bf..bdef5c87f3b78 100644
--- a/gfx/wr/Cargo.lock
+++ b/gfx/wr/Cargo.lock
@@ -125,9 +125,9 @@ dependencies = [
 
 [[package]]
 name = "askama"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4744ed2eef2645831b441d8f5459689ade2ab27c854488fbab1fbe94fce1a7"
+checksum = "f75363874b771be265f4ffe307ca705ef6f3baa19011c149da8674a87f1b75c4"
 dependencies = [
  "askama_derive",
  "itoa",
@@ -138,9 +138,9 @@ dependencies = [
 
 [[package]]
 name = "askama_derive"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d661e0f57be36a5c14c48f78d09011e67e0cb618f269cca9f2fd8d15b68c46ac"
+checksum = "129397200fe83088e8a68407a8e2b1f826cf0086b21ccdb866a722c8bcd3a94f"
 dependencies = [
  "askama_parser",
  "basic-toml",
@@ -155,9 +155,9 @@ dependencies = [
 
 [[package]]
 name = "askama_parser"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf315ce6524c857bb129ff794935cf6d42c82a6cff60526fe2a63593de4d0d4f"
+checksum = "d6ab5630b3d5eaf232620167977f95eb51f3432fc76852328774afbd242d4358"
 dependencies = [
  "memchr",
  "serde",
@@ -1232,9 +1232,9 @@ dependencies = [
 
 [[package]]
 name = "glean"
-version = "66.3.0"
+version = "67.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2cff88cbb3ec5ecd45a8ba642772a5fb88cc61350b6960d72a7452de138d9e2"
+checksum = "8b43d851e3966fafee2933c2891e6b7f7f346866bab7835cb0410700336f424b"
 dependencies = [
  "crossbeam-channel",
  "glean-core",
@@ -1247,9 +1247,9 @@ dependencies = [
 
 [[package]]
 name = "glean-core"
-version = "66.3.0"
+version = "67.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b34409d1d4bc10da8ddcb584a0a1825d8ad6a5a268bf711320da95c615c30245"
+checksum = "b8146e9829a5fe15343fd3c42d8d41e478b02f68b8359346273cc56d7f7feff8"
 dependencies = [
  "android_logger",
  "bincode",
@@ -1722,6 +1722,7 @@ checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.4",
+ "serde",
 ]
 
 [[package]]
@@ -2479,9 +2480,9 @@ dependencies = [
 
 [[package]]
 name = "phf_generator"
-version = "0.10.0"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
+checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
 dependencies = [
  "phf_shared",
  "rand 0.8.5",
@@ -2489,9 +2490,9 @@ dependencies = [
 
 [[package]]
 name = "phf_shared"
-version = "0.10.0"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
 dependencies = [
  "siphasher",
 ]
@@ -2558,12 +2559,6 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
 [[package]]
 name = "precomputed-hash"
 version = "0.1.1"
@@ -2577,7 +2572,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
 dependencies = [
  "thiserror 1.0.38",
- "toml",
+ "toml 0.5.9",
 ]
 
 [[package]]
@@ -2629,18 +2624,6 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
- "libc",
- "rand_chacha",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
  "rand_core 0.6.4",
 ]
 
@@ -2664,9 +2647,6 @@ name = "rand_core"
 version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom 0.2.6",
-]
 
 [[package]]
 name = "raw-window-handle"
@@ -2964,6 +2944,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776"
+dependencies = [
+ "serde_core",
+]
+
 [[package]]
 name = "servo-fontconfig"
 version = "0.5.1"
@@ -3014,9 +3003,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "siphasher"
-version = "0.3.10"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "slab"
@@ -3101,12 +3090,11 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "string_cache"
-version = "0.8.7"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
+checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f"
 dependencies = [
  "new_debug_unreachable",
- "once_cell",
  "parking_lot 0.12.1",
  "phf_shared",
  "precomputed-hash",
@@ -3115,9 +3103,9 @@ dependencies = [
 
 [[package]]
 name = "string_cache_codegen"
-version = "0.5.2"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
+checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0"
 dependencies = [
  "phf_generator",
  "phf_shared",
@@ -3324,6 +3312,45 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae2a4cf385da23d1d53bc15cdfa5c2109e93d8d362393c801e87da2f72f0e201"
+dependencies = [
+ "indexmap 2.10.0",
+ "serde_core",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_parser",
+ "toml_writer",
+ "winnow",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.7.5+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10"
+dependencies = [
+ "winnow",
+]
+
+[[package]]
+name = "toml_writer"
+version = "1.0.6+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607"
+
 [[package]]
 name = "topological-sort"
 version = "0.1.0"
@@ -3396,9 +3423,9 @@ checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 
 [[package]]
 name = "uniffi"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6d968cb62160c11f2573e6be724ef8b1b18a277aededd17033f8a912d73e2b4"
+checksum = "b8c6dec3fc6645f71a16a3fa9ff57991028153bd194ca97f4b55e610c73ce66a"
 dependencies = [
  "anyhow",
  "uniffi_build",
@@ -3409,9 +3436,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_bindgen"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6b39ef1acbe1467d5d210f274fae344cb6f8766339330cb4c9688752899bf6b"
+checksum = "4ed0150801958d4825da56a41c71f000a457ac3a4613fa9647df78ac4b6b6881"
 dependencies = [
  "anyhow",
  "askama",
@@ -3425,7 +3452,7 @@ dependencies = [
  "serde",
  "tempfile",
  "textwrap 0.16.1",
- "toml",
+ "toml 0.9.6",
  "uniffi_internal_macros",
  "uniffi_meta",
  "uniffi_pipeline",
@@ -3434,9 +3461,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_build"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6683e6b665423cddeacd89a3f97312cf400b2fb245a26f197adaf65c45d505b2"
+checksum = "b78fd9271a4c2e85bd2c266c5a9ede1fac676eb39fd77f636c27eaf67426fd5f"
 dependencies = [
  "anyhow",
  "camino",
@@ -3445,9 +3472,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_core"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2d990b553d6b9a7ee9c3ae71134674739913d52350b56152b0e613595bb5a6f"
+checksum = "b0ef62e69762fbb9386dcb6c87cd3dd05d525fa8a3a579a290892e60ddbda47e"
 dependencies = [
  "anyhow",
  "bytes",
@@ -3457,9 +3484,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_internal_macros"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04f4f224becf14885c10e6e400b95cc4d1985738140cb194ccc2044563f8a56b"
+checksum = "98f51ebca0d9a4b2aa6c644d5ede45c56f73906b96403c08a1985e75ccb64a01"
 dependencies = [
  "anyhow",
  "indexmap 2.10.0",
@@ -3470,9 +3497,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_macros"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b481d385af334871d70904e6a5f129be7cd38c18fcf8dd8fd1f646b426a56d58"
+checksum = "db9d12529f1223d014fd501e5f29ca0884d15d6ed5ddddd9f506e55350327dc3"
 dependencies = [
  "camino",
  "fs-err",
@@ -3481,15 +3508,15 @@ dependencies = [
  "quote",
  "serde",
  "syn 2.0.100",
- "toml",
+ "toml 0.9.6",
  "uniffi_meta",
 ]
 
 [[package]]
 name = "uniffi_meta"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f817868a3b171bb7bf259e882138d104deafde65684689b4694c846d322491"
+checksum = "9df6d413db2827c68588f8149d30d49b71d540d46539e435b23a7f7dbd4d4f86"
 dependencies = [
  "anyhow",
  "siphasher",
@@ -3499,9 +3526,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_pipeline"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b147e133ad7824e32426b90bc41fda584363563f2ba747f590eca1fd6fd14e6"
+checksum = "a806dddc8208f22efd7e95a5cdf88ed43d0f3271e8f63b47e757a8bbdb43b63a"
 dependencies = [
  "anyhow",
  "heck",
@@ -3512,9 +3539,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_udl"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caed654fb73da5abbc7a7e9c741532284532ba4762d6fe5071372df22a41730a"
+checksum = "0d1a7339539bf6f6fa3e9b534dece13f778bda2d54b1a6d4e40b4d6090ac26e7"
 dependencies = [
  "anyhow",
  "textwrap 0.16.1",
diff --git a/gfx/wr/Cargo.toml b/gfx/wr/Cargo.toml
index 79efc5fa19e38..9bec3a9cab5c9 100644
--- a/gfx/wr/Cargo.toml
+++ b/gfx/wr/Cargo.toml
@@ -10,7 +10,7 @@ resolver = "2"
 
 [workspace.dependencies]
 gleam = "0.15.1"
-glean = "=66.3.0"
+glean = "=67.0.0"
 
 [profile.release]
 debug = true
diff --git a/gfx/wr/servo-tidy.toml b/gfx/wr/servo-tidy.toml
index 721bcb3418cb3..b50a67e21d254 100644
--- a/gfx/wr/servo-tidy.toml
+++ b/gfx/wr/servo-tidy.toml
@@ -62,6 +62,9 @@ packages = [
     "miniz_oxide",
     "mio",
     "socket2",
+    # 0.9 required by glean/uniffi
+    # 0.5 by proc-macro-crate
+    "toml",
     "windows-link",
 ]
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ca87bc1937163..5ec0346b540d8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -78,7 +78,7 @@ ktlint = "1.8.0"
 spotless = "8.2.0"
 
 # Mozilla
-glean = "66.3.0"
+glean = "67.0.0"
 
 # Testing libraries
 androidx-test = "1.7.0"
diff --git a/python/sites/mach.txt b/python/sites/mach.txt
index 9c3984e650547..46593aee515cd 100644
--- a/python/sites/mach.txt
+++ b/python/sites/mach.txt
@@ -58,7 +58,7 @@ pth:xpcom/geckoprocesstypes_generator
 pth:xpcom/idl-parser
 # glean-sdk may not be installable if a wheel isn't available
 # and it has to be built from source.
-pypi-optional:glean-sdk==66.3.0:telemetry will not be collected
+pypi-optional:glean-sdk==67.0.0:telemetry will not be collected
 pypi-optional:orjson>=3.10:json operations will be slower in various tools
 # Mach gracefully handles the case where `psutil` is unavailable.
 # We aren't (yet) able to pin packages in automation, so we have to

From 6f47e784b92a575c9ecf47f450e25c30eb82c8c0 Mon Sep 17 00:00:00 2001
From: Updatebot <updatebot@mozilla.com>
Date: Thu, 29 Jan 2026 15:03:18 +0000
Subject: [PATCH 075/116] Bug 2013174 - Update android nightly
 application-services version bump to 57f37cd43031e44518f0e240f2e0409ba72eae91
 r=release-managers,diannaS

Differential Revision: https://phabricator.services.mozilla.com/D280898
---
 .../plugins/dependencies/src/main/java/ApplicationServices.kt | 2 +-
 .../plugins/dependencies/src/main/java/moz.yaml               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt b/mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt
index a817fb40552e4..7b56c1fc2b91b 100644
--- a/mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt
+++ b/mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // These lines are generated by android-components/automation/application-services-nightly-bump.py
-val VERSION = "149.20260122050249"
+val VERSION = "149.20260129050319"
 val CHANNEL = ApplicationServicesChannel.NIGHTLY
 
 object ApplicationServicesConfig {
diff --git a/mobile/android/android-components/plugins/dependencies/src/main/java/moz.yaml b/mobile/android/android-components/plugins/dependencies/src/main/java/moz.yaml
index 89f48ddc33971..54640a7d43632 100644
--- a/mobile/android/android-components/plugins/dependencies/src/main/java/moz.yaml
+++ b/mobile/android/android-components/plugins/dependencies/src/main/java/moz.yaml
@@ -31,11 +31,11 @@ origin:
 
   # Human-readable identifier for this version/release
   # Generally "version NNN", "tag SSS", "bookmark SSS"
-  release: e4b27cacf93b0114db3db28a789738509fcf7257 (2026-01-22T05:02:49).
+  release: 57f37cd43031e44518f0e240f2e0409ba72eae91 (2026-01-29T05:03:19).
 
   # Revision to pull in
   # Must be a long or short commit SHA (long preferred)
-  revision: e4b27cacf93b0114db3db28a789738509fcf7257
+  revision: 57f37cd43031e44518f0e240f2e0409ba72eae91
 
   # The package's license, where possible using the mnemonic from
   # https://spdx.org/licenses/

From 14dfda0a0900b3635b254472a1513c921d30cf1c Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Thu, 29 Jan 2026 15:03:19 +0000
Subject: [PATCH 076/116] Bug 2007857 (part 1) - update app-services to rev
 with new glean and uniffi. r=janerik

Differential Revision: https://phabricator.services.mozilla.com/D280548
---
 Cargo.toml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index de1a9e5d6cb1f..3a284c5b48aca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -270,21 +270,21 @@ objc = { git = "https://github.com/glandium/rust-objc", rev = "4de89f5aa9851ceca
 allocator-api2 = { git = "https://github.com/glandium/allocator-api2", rev = "ad5f3d56a5a4519eff52af4ff85293431466ef5c" }
 
 # application-services overrides to make updating them all simpler.
-context_id = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-error-support = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-filter_adult = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-relevancy = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-search = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-sql-support = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-suggest = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-sync15 = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-tabs = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-tracing-support = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-viaduct = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-webext-storage = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-logins = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
-init_rust_components = { git = "https://github.com/mozilla/application-services", rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2" }
+context_id = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+error-support = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+filter_adult = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+relevancy = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+search = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+sql-support = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+suggest = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+sync15 = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+tabs = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+tracing-support = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+viaduct = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+webext-storage = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+logins = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
+init_rust_components = { git = "https://github.com/mozilla/application-services", rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56" }
 # Patched version of zip 2.4.2 to allow for reading omnijars.
 zip = { path = "third_party/rust/zip" }
 

From a4c608e92c37fcf1ce64ac01a0ae3c394ddc63e4 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Thu, 29 Jan 2026 15:03:19 +0000
Subject: [PATCH 077/116] Bug 2007857 (part 2) - Update uniffi to 0.31.
 r=bdk,supply-chain-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D277578
---
 Cargo.lock                                    |  127 +-
 Cargo.toml                                    |   10 +-
 build/rust/siphasher/Cargo.toml               |   11 -
 build/rust/siphasher/lib.rs                   |    5 -
 docs/rust-components/api/js/viaduct.md        |    2 +
 dom/chrome-webidl/UniFFI.webidl               |   13 +
 supply-chain/audits.toml                      |    2 +-
 supply-chain/imports.lock                     |  189 +-
 .../uniffi-bindgen-gecko-js/Cargo.toml        |    2 +-
 .../generated/RustContextId.sys.mjs           |    2 +-
 .../components/generated/RustLogins.sys.mjs   |  426 ++-
 .../generated/RustRelevancy.sys.mjs           |   22 +-
 .../generated/RustRemoteSettings.sys.mjs      |   30 +-
 .../components/generated/RustSearch.sys.mjs   |   12 +-
 .../components/generated/RustSuggest.sys.mjs  |   52 +-
 .../components/generated/RustTabs.sys.mjs     |   52 +-
 .../components/generated/RustTracing.sys.mjs  |   10 +-
 .../components/generated/RustViaduct.sys.mjs  |  143 +-
 .../generated/RustWebextstorage.sys.mjs       |   46 +-
 .../uniffi-bindgen-gecko-js/config.toml       |    5 +
 .../src/bindgen_paths.rs                      |   22 +
 .../src/config_supplier.rs                    |   46 -
 .../uniffi-bindgen-gecko-js/src/lib.rs        |   21 +-
 .../src/pipeline/callables.rs                 |   85 +-
 .../src/pipeline/callback_interfaces.rs       |   10 +-
 .../src/pipeline/cpp_callback_interfaces.rs   |   44 +-
 .../src/pipeline/cpp_ffi_types.rs             |   27 +-
 .../src/pipeline/cpp_scaffolding_calls.rs     |  108 +-
 .../src/pipeline/default.rs                   |   93 +
 .../src/pipeline/docs.rs                      |   14 +-
 .../src/pipeline/interfaces.rs                |    5 +
 .../src/pipeline/js_docstrings.rs             |    5 +-
 .../src/pipeline/js_filename.rs               |    4 +-
 .../src/pipeline/js_names.rs                  |    6 +-
 .../src/pipeline/literals.rs                  |   49 -
 .../src/pipeline/mod.rs                       |    6 +-
 .../src/pipeline/modules.rs                   |   22 +-
 .../src/pipeline/nodes.rs                     |  133 +-
 .../cpp/CallbackInterfaceFfiValueTypes.cpp    |   11 +-
 .../src/templates/cpp/CallbackInterfaces.cpp  |   16 +-
 .../src/templates/cpp/PointerTypes.cpp        |  125 +-
 .../src/templates/cpp/ScaffoldingCalls.cpp    |    8 -
 .../templates/js/CallbackInterface.sys.mjs    |    2 +-
 .../src/templates/js/ExternalType.sys.mjs     |    2 +-
 .../src/templates/js/Interface.sys.mjs        |   38 +-
 .../generated/RustUniffiBindingsTests.sys.mjs |  430 ++-
 .../RustUniffiBindingsTestsCollision.sys.mjs  |    4 +-
 ...stUniffiBindingsTestsExternalTypes.sys.mjs |    8 +-
 .../tests/xpcshell/test_trait_interfaces.js   |  178 +-
 .../src/trait_interfaces.rs                   |   21 +-
 toolkit/components/uniffi-js/Callbacks.cpp    |   45 +
 toolkit/components/uniffi-js/Callbacks.h      |   17 +
 .../uniffi-js/GeneratedScaffolding.cpp        | 3321 ++++++++++-------
 toolkit/components/uniffi-js/PointerType.h    |    4 +-
 .../components/uniffi-js/UniFFIPointer.cpp    |   15 +-
 toolkit/components/uniffi-js/UniFFIPointer.h  |    8 +-
 .../uniffi-js/UniFFIScaffolding.cpp           |    9 +
 .../components/uniffi-js/UniFFIScaffolding.h  |    4 +
 .../components/uniffi-js/js/UniFFI.sys.mjs    |   60 +-
 59 files changed, 3772 insertions(+), 2415 deletions(-)
 delete mode 100644 build/rust/siphasher/Cargo.toml
 delete mode 100644 build/rust/siphasher/lib.rs
 create mode 100644 toolkit/components/uniffi-bindgen-gecko-js/src/bindgen_paths.rs
 delete mode 100644 toolkit/components/uniffi-bindgen-gecko-js/src/config_supplier.rs
 create mode 100644 toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/default.rs
 delete mode 100644 toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/literals.rs

diff --git a/Cargo.lock b/Cargo.lock
index 6d349ee38186a..6e089be9df604 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -195,9 +195,9 @@ dependencies = [
 
 [[package]]
 name = "askama"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4744ed2eef2645831b441d8f5459689ade2ab27c854488fbab1fbe94fce1a7"
+checksum = "f75363874b771be265f4ffe307ca705ef6f3baa19011c149da8674a87f1b75c4"
 dependencies = [
  "askama_derive",
  "itoa",
@@ -208,9 +208,9 @@ dependencies = [
 
 [[package]]
 name = "askama_derive"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d661e0f57be36a5c14c48f78d09011e67e0cb618f269cca9f2fd8d15b68c46ac"
+checksum = "129397200fe83088e8a68407a8e2b1f826cf0086b21ccdb866a722c8bcd3a94f"
 dependencies = [
  "askama_parser",
  "basic-toml",
@@ -225,9 +225,9 @@ dependencies = [
 
 [[package]]
 name = "askama_parser"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf315ce6524c857bb129ff794935cf6d42c82a6cff60526fe2a63593de4d0d4f"
+checksum = "d6ab5630b3d5eaf232620167977f95eb51f3432fc76852328774afbd242d4358"
 dependencies = [
  "memchr",
  "serde",
@@ -987,7 +987,7 @@ dependencies = [
 [[package]]
 name = "context_id"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "chrono",
  "error-support",
@@ -1946,7 +1946,7 @@ dependencies = [
 [[package]]
 name = "error-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "env_logger",
  "error-support-macros",
@@ -1961,7 +1961,7 @@ dependencies = [
 [[package]]
 name = "error-support-macros"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2056,7 +2056,7 @@ dependencies = [
 [[package]]
 name = "filter_adult"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "base64 0.22.1",
  "error-support",
@@ -2092,7 +2092,7 @@ dependencies = [
 [[package]]
 name = "firefox-versioning"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "serde_json",
  "thiserror 2.0.12",
@@ -2766,9 +2766,9 @@ dependencies = [
 
 [[package]]
 name = "glean"
-version = "66.3.0"
+version = "67.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2cff88cbb3ec5ecd45a8ba642772a5fb88cc61350b6960d72a7452de138d9e2"
+checksum = "8b43d851e3966fafee2933c2891e6b7f7f346866bab7835cb0410700336f424b"
 dependencies = [
  "crossbeam-channel",
  "glean-core",
@@ -2781,9 +2781,9 @@ dependencies = [
 
 [[package]]
 name = "glean-core"
-version = "66.3.0"
+version = "67.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b34409d1d4bc10da8ddcb584a0a1825d8ad6a5a268bf711320da95c615c30245"
+checksum = "b8146e9829a5fe15343fd3c42d8d41e478b02f68b8359346273cc56d7f7feff8"
 dependencies = [
  "android_logger",
  "bincode",
@@ -3467,7 +3467,7 @@ dependencies = [
 [[package]]
 name = "init_rust_components"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "nss",
  "uniffi",
@@ -3476,7 +3476,7 @@ dependencies = [
 [[package]]
 name = "interrupt-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "lazy_static",
  "parking_lot",
@@ -3647,7 +3647,7 @@ dependencies = [
 [[package]]
 name = "jwcrypto"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "base64 0.21.999",
  "error-support",
@@ -4030,7 +4030,7 @@ checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
 [[package]]
 name = "logins"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -5083,7 +5083,7 @@ dependencies = [
 [[package]]
 name = "nss"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "base64 0.21.999",
  "error-support",
@@ -5112,12 +5112,12 @@ dependencies = [
 [[package]]
 name = "nss_build_common"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 
 [[package]]
 name = "nss_sys"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "libsqlite3-sys",
  "nss_build_common",
@@ -5449,7 +5449,7 @@ checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
 [[package]]
 name = "payload-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "serde",
  "serde_derive",
@@ -5552,7 +5552,7 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
 dependencies = [
- "siphasher 1.0.1",
+ "siphasher",
 ]
 
 [[package]]
@@ -6002,7 +6002,7 @@ dependencies = [
 [[package]]
 name = "rc_crypto"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "base64 0.21.999",
  "error-support",
@@ -6072,7 +6072,7 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 [[package]]
 name = "relevancy"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "anyhow",
  "base64 0.21.999",
@@ -6096,7 +6096,7 @@ dependencies = [
 [[package]]
 name = "remote_settings"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "anyhow",
  "camino",
@@ -6367,7 +6367,7 @@ dependencies = [
 [[package]]
 name = "search"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "error-support",
  "firefox-versioning",
@@ -6617,13 +6617,6 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
-[[package]]
-name = "siphasher"
-version = "0.3.999"
-dependencies = [
- "siphasher 1.0.1",
-]
-
 [[package]]
 name = "siphasher"
 version = "1.0.1"
@@ -6692,7 +6685,7 @@ dependencies = [
 [[package]]
 name = "sql-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "error-support",
  "interrupt-support",
@@ -6883,7 +6876,7 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 [[package]]
 name = "suggest"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "anyhow",
  "chrono",
@@ -6936,7 +6929,7 @@ dependencies = [
 [[package]]
 name = "sync-guid"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "base64 0.21.999",
  "rand",
@@ -6947,7 +6940,7 @@ dependencies = [
 [[package]]
 name = "sync15"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "anyhow",
  "base16",
@@ -6991,7 +6984,7 @@ dependencies = [
 [[package]]
 name = "tabs"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "anyhow",
  "error-support",
@@ -7340,7 +7333,7 @@ dependencies = [
 [[package]]
 name = "tracing-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "parking_lot",
  "serde_json",
@@ -7420,7 +7413,7 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 [[package]]
 name = "types"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "rusqlite 0.37.0",
  "serde",
@@ -7502,9 +7495,9 @@ checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
 
 [[package]]
 name = "uniffi"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b334fd69b3cf198b63616c096aabf9820ab21ed9b2aa1367ddd4b411068bf520"
+checksum = "b8c6dec3fc6645f71a16a3fa9ff57991028153bd194ca97f4b55e610c73ce66a"
 dependencies = [
  "anyhow",
  "cargo_metadata",
@@ -7546,9 +7539,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_bindgen"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ff0132b533483cf19abb30bba5c72c24d9f3e4d9a2ff71cb3e22e73899fd46e"
+checksum = "4ed0150801958d4825da56a41c71f000a457ac3a4613fa9647df78ac4b6b6881"
 dependencies = [
  "anyhow",
  "askama",
@@ -7563,7 +7556,7 @@ dependencies = [
  "serde",
  "tempfile",
  "textwrap",
- "toml 0.5.999",
+ "toml 0.9.8",
  "uniffi_internal_macros",
  "uniffi_meta",
  "uniffi_pipeline",
@@ -7600,9 +7593,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_build"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d84d607076008df3c32dd2100ee4e727269f11d3faa35691af70d144598f666"
+checksum = "b78fd9271a4c2e85bd2c266c5a9ede1fac676eb39fd77f636c27eaf67426fd5f"
 dependencies = [
  "anyhow",
  "camino",
@@ -7611,9 +7604,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_core"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e3b997192dc15ef1778c842001811ec7f241a093a693ac864e1fc938e64fa9"
+checksum = "b0ef62e69762fbb9386dcb6c87cd3dd05d525fa8a3a579a290892e60ddbda47e"
 dependencies = [
  "anyhow",
  "bytes",
@@ -7623,9 +7616,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_internal_macros"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f64bec2f3a33f2f08df8150e67fa45ba59a2ca740bf20c1beb010d4d791f9a1b"
+checksum = "98f51ebca0d9a4b2aa6c644d5ede45c56f73906b96403c08a1985e75ccb64a01"
 dependencies = [
  "anyhow",
  "indexmap",
@@ -7636,9 +7629,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_macros"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d8708716d2582e4f3d7e9f320290b5966eb951ca421d7630571183615453efc"
+checksum = "db9d12529f1223d014fd501e5f29ca0884d15d6ed5ddddd9f506e55350327dc3"
 dependencies = [
  "camino",
  "fs-err",
@@ -7647,27 +7640,27 @@ dependencies = [
  "quote",
  "serde",
  "syn",
- "toml 0.5.999",
+ "toml 0.9.8",
  "uniffi_meta",
 ]
 
 [[package]]
 name = "uniffi_meta"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d226fc167754ce548c5ece9828c8a06f03bf1eea525d2659ba6bd648bd8e2f3"
+checksum = "9df6d413db2827c68588f8149d30d49b71d540d46539e435b23a7f7dbd4d4f86"
 dependencies = [
  "anyhow",
- "siphasher 0.3.999",
+ "siphasher",
  "uniffi_internal_macros",
  "uniffi_pipeline",
 ]
 
 [[package]]
 name = "uniffi_pipeline"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b925b6421df15cf4bedee27714022cd9626fb4d7eee0923522a608b274ba4371"
+checksum = "a806dddc8208f22efd7e95a5cdf88ed43d0f3271e8f63b47e757a8bbdb43b63a"
 dependencies = [
  "anyhow",
  "heck",
@@ -7678,9 +7671,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_testing"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a8386f86b6f986bc01d6cdaec395980b9125ae493634ddbdc9feef5f50d80af"
+checksum = "4802bed208a296657eef3451a961a6502e1d7aa8930b4b0cd952ed4f81a3957e"
 dependencies = [
  "anyhow",
  "camino",
@@ -7691,9 +7684,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_udl"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c42649b721df759d9d4692a376b82b62ce3028ec9fc466f4780fb8cdf728996"
+checksum = "0d1a7339539bf6f6fa3e9b534dece13f778bda2d54b1a6d4e40b4d6090ac26e7"
 dependencies = [
  "anyhow",
  "textwrap",
@@ -7801,7 +7794,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 [[package]]
 name = "viaduct"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "async-trait",
  "error-support",
@@ -7976,7 +7969,7 @@ dependencies = [
 [[package]]
 name = "webext-storage"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2#0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
 dependencies = [
  "anyhow",
  "error-support",
diff --git a/Cargo.toml b/Cargo.toml
index 3a284c5b48aca..029ced130c1f6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -71,9 +71,9 @@ rust-version = "1.90.0"
 
 [workspace.dependencies]
 # Shared across multiple UniFFI consumers.
-uniffi = "0.29.3"
-uniffi_bindgen = "0.29.3"
-uniffi_pipeline = "0.29.3"
+uniffi = "0.31"
+uniffi_bindgen = "0.31"
+uniffi_pipeline = "0.31"
 # Shared across multiple application-services consumers.
 rusqlite = "0.37"
 # Shared across multiple glean consumers.
@@ -172,10 +172,6 @@ bindgen = { path = "build/rust/bindgen" }
 # Patch nix 0.29 to 0.30+
 nix = { path = "build/rust/nix" }
 
-# Patch siphasher 0.3 to 1.0
-# TODO: Remove once https://github.com/mozilla/uniffi-rs/pull/2709 lands in m-c.
-siphasher = { path = "build/rust/siphasher" }
-
 # Patch autocfg to hide rustc output. Workaround for https://github.com/cuviper/autocfg/issues/30
 autocfg = { path = "third_party/rust/autocfg" }
 
diff --git a/build/rust/siphasher/Cargo.toml b/build/rust/siphasher/Cargo.toml
deleted file mode 100644
index 7834ef04ac96f..0000000000000
--- a/build/rust/siphasher/Cargo.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[package]
-name = "siphasher"
-version = "0.3.999"
-edition = "2018"
-license = "MPL-2.0"
-
-[lib]
-path = "lib.rs"
-
-[dependencies.siphasher]
-version = "1"
diff --git a/build/rust/siphasher/lib.rs b/build/rust/siphasher/lib.rs
deleted file mode 100644
index b4bdec7b54143..0000000000000
--- a/build/rust/siphasher/lib.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-pub use siphasher::*;
diff --git a/docs/rust-components/api/js/viaduct.md b/docs/rust-components/api/js/viaduct.md
index 4ebca60151ea0..3d64195c370a6 100644
--- a/docs/rust-components/api/js/viaduct.md
+++ b/docs/rust-components/api/js/viaduct.md
@@ -63,3 +63,5 @@
 ```
 ```{js:autofunction} RustViaduct.sys.initBackend
 ```
+```{js:autofunction} RustViaduct.sys.setGlobalDefaultUserAgent
+```
diff --git a/dom/chrome-webidl/UniFFI.webidl b/dom/chrome-webidl/UniFFI.webidl
index 0cd3d0194ba1e..6f3c3080db206 100644
--- a/dom/chrome-webidl/UniFFI.webidl
+++ b/dom/chrome-webidl/UniFFI.webidl
@@ -124,4 +124,17 @@ namespace UniFFIScaffolding {
   // This is called at shutdown to clear out the reference to the JS function.
   [Throws]
   undefined deregisterCallbackHandler(UniFFICallbackInterfaceId interfaceId);
+
+  // Create a new handle for a callback interface object
+  //
+  // This is called by the JS code before lowering a callback interface object.  The returned handle
+  // is used as a key for the JS callback interface map and also returned to Rust.
+  unsigned long long callbackHandleCreate();
+
+  // Decrease the reference count for a callback interface handle
+  //
+  // The JS code calls this before lifting a callback interface object.  It returns the new
+  // reference count.  If `0`, then the map entry for the JS object is removed.
+  unsigned long callbackHandleRelease(unsigned long long handle);
+
 };
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index 3f62da3876808..f87fe39a9484a 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -563,7 +563,7 @@ notes = "Maintained by the Glean and Application Services teams"
 [[wildcard-audits.uniffi_internal_macros]]
 who = "Jan-Erik Rediger <jrediger@mozilla.com>"
 criteria = "safe-to-deploy"
-user-id = 111105
+user-id = 111105 # Mark Hammond (mhammond)
 start = "2025-03-18"
 end = "2026-03-25"
 
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 86218975dac23..8e153820223e8 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -261,15 +261,15 @@ user-login = "jrmuizel"
 user-name = "Jeff Muizelaar"
 
 [[publisher.glean]]
-version = "66.3.0"
-when = "2025-12-19"
+version = "67.0.0"
+when = "2026-01-21"
 user-id = 48
 user-login = "badboy"
 user-name = "Jan-Erik Rediger"
 
 [[publisher.glean-core]]
-version = "66.3.0"
-when = "2025-12-19"
+version = "67.0.0"
+when = "2026-01-21"
 user-id = 48
 user-login = "badboy"
 user-name = "Jan-Erik Rediger"
@@ -791,64 +791,74 @@ user-login = "Manishearth"
 user-name = "Manish Goregaokar"
 
 [[publisher.uniffi]]
-version = "0.29.3"
-when = "2025-06-06"
-user-id = 127697
-user-login = "bendk"
+version = "0.31.0"
+when = "2026-01-14"
+user-id = 111105
+user-login = "mhammond"
+user-name = "Mark Hammond"
 
 [[publisher.uniffi_bindgen]]
-version = "0.29.3"
-when = "2025-06-06"
-user-id = 127697
-user-login = "bendk"
+version = "0.31.0"
+when = "2026-01-14"
+user-id = 111105
+user-login = "mhammond"
+user-name = "Mark Hammond"
 
 [[publisher.uniffi_build]]
-version = "0.29.3"
-when = "2025-06-06"
-user-id = 127697
-user-login = "bendk"
+version = "0.31.0"
+when = "2026-01-14"
+user-id = 111105
+user-login = "mhammond"
+user-name = "Mark Hammond"
 
 [[publisher.uniffi_core]]
-version = "0.29.3"
-when = "2025-06-06"
-user-id = 127697
-user-login = "bendk"
+version = "0.31.0"
+when = "2026-01-14"
+user-id = 111105
+user-login = "mhammond"
+user-name = "Mark Hammond"
 
 [[publisher.uniffi_internal_macros]]
-version = "0.29.3"
-when = "2025-06-06"
-user-id = 127697
-user-login = "bendk"
+version = "0.31.0"
+when = "2026-01-14"
+user-id = 111105
+user-login = "mhammond"
+user-name = "Mark Hammond"
 
 [[publisher.uniffi_macros]]
-version = "0.29.3"
-when = "2025-06-06"
-user-id = 127697
-user-login = "bendk"
+version = "0.31.0"
+when = "2026-01-14"
+user-id = 111105
+user-login = "mhammond"
+user-name = "Mark Hammond"
 
 [[publisher.uniffi_meta]]
-version = "0.29.3"
-when = "2025-06-06"
-user-id = 127697
-user-login = "bendk"
+version = "0.31.0"
+when = "2026-01-14"
+user-id = 111105
+user-login = "mhammond"
+user-name = "Mark Hammond"
 
 [[publisher.uniffi_pipeline]]
-version = "0.29.3"
-when = "2025-06-06"
-user-id = 127697
-user-login = "bendk"
+version = "0.31.0"
+when = "2026-01-14"
+user-id = 111105
+user-login = "mhammond"
+user-name = "Mark Hammond"
 
 [[publisher.uniffi_testing]]
-version = "0.29.3"
-when = "2025-06-06"
-user-id = 127697
-user-login = "bendk"
+version = "0.31.0"
+when = "2026-01-14"
+user-id = 111105
+user-login = "mhammond"
+user-name = "Mark Hammond"
 
 [[publisher.uniffi_udl]]
-version = "0.29.3"
-when = "2025-06-06"
-user-id = 127697
-user-login = "bendk"
+version = "0.31.0"
+when = "2026-01-14"
+user-id = 111105
+user-login = "mhammond"
+user-name = "Mark Hammond"
 
 [[publisher.utf8_iter]]
 version = "1.0.4"
@@ -3103,12 +3113,77 @@ who = "Ameer Ghani <inahga@divviup.org>"
 criteria = "safe-to-deploy"
 delta = "0.4.1 -> 0.4.2"
 
-[[audits.mozilla.wildcard-audits.uniffi_internal_macros]]
+[[audits.mozilla.wildcard-audits.uniffi]]
 who = "Jan-Erik Rediger <jrediger@mozilla.com>"
 criteria = "safe-to-deploy"
-user-id = 127697 # bendk
-start = "2025-02-06"
-end = "2026-03-14"
+user-id = 111105 # Mark Hammond (mhammond)
+start = "2021-11-22"
+end = "2027-01-08"
+aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml"
+
+[[audits.mozilla.wildcard-audits.uniffi_bindgen]]
+who = "Jan-Erik Rediger <jrediger@mozilla.com>"
+criteria = "safe-to-deploy"
+user-id = 111105 # Mark Hammond (mhammond)
+start = "2021-11-22"
+end = "2027-01-08"
+aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml"
+
+[[audits.mozilla.wildcard-audits.uniffi_build]]
+who = "Jan-Erik Rediger <jrediger@mozilla.com>"
+criteria = "safe-to-deploy"
+user-id = 111105 # Mark Hammond (mhammond)
+start = "2021-11-22"
+end = "2027-01-08"
+aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml"
+
+[[audits.mozilla.wildcard-audits.uniffi_core]]
+who = "Jan-Erik Rediger <jrediger@mozilla.com>"
+criteria = "safe-to-deploy"
+user-id = 111105 # Mark Hammond (mhammond)
+start = "2023-11-20"
+end = "2027-01-08"
+aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml"
+
+[[audits.mozilla.wildcard-audits.uniffi_macros]]
+who = "Jan-Erik Rediger <jrediger@mozilla.com>"
+criteria = "safe-to-deploy"
+user-id = 111105 # Mark Hammond (mhammond)
+start = "2021-11-22"
+end = "2027-01-08"
+aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml"
+
+[[audits.mozilla.wildcard-audits.uniffi_meta]]
+who = "Jan-Erik Rediger <jrediger@mozilla.com>"
+criteria = "safe-to-deploy"
+user-id = 111105 # Mark Hammond (mhammond)
+start = "2023-11-20"
+end = "2027-01-08"
+aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml"
+
+[[audits.mozilla.wildcard-audits.uniffi_pipeline]]
+who = "Jan-Erik Rediger <jrediger@mozilla.com>"
+criteria = "safe-to-deploy"
+user-id = 111105 # Mark Hammond (mhammond)
+start = "2025-10-08"
+end = "2027-01-14"
+notes = "Maintained by the Glean and Application Services teams"
+aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml"
+
+[[audits.mozilla.wildcard-audits.uniffi_testing]]
+who = "Jan-Erik Rediger <jrediger@mozilla.com>"
+criteria = "safe-to-deploy"
+user-id = 111105 # Mark Hammond (mhammond)
+start = "2023-11-20"
+end = "2027-01-08"
+aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml"
+
+[[audits.mozilla.wildcard-audits.uniffi_udl]]
+who = "Jan-Erik Rediger <jrediger@mozilla.com>"
+criteria = "safe-to-deploy"
+user-id = 111105 # Mark Hammond (mhammond)
+start = "2023-11-20"
+end = "2027-01-08"
 aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml"
 
 [[audits.mozilla.wildcard-audits.weedle2]]
@@ -3129,6 +3204,24 @@ end = "2026-07-02"
 notes = "Maintained by me"
 aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml"
 
+[[audits.mozilla.audits.askama]]
+who = "Jan-Erik Rediger <jrediger@mozilla.com>"
+criteria = "safe-to-deploy"
+delta = "0.13.1 -> 0.14.0"
+aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml"
+
+[[audits.mozilla.audits.askama_derive]]
+who = "Jan-Erik Rediger <jrediger@mozilla.com>"
+criteria = "safe-to-deploy"
+delta = "0.13.1 -> 0.14.0"
+aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml"
+
+[[audits.mozilla.audits.askama_parser]]
+who = "Jan-Erik Rediger <jrediger@mozilla.com>"
+criteria = "safe-to-deploy"
+delta = "0.13.0 -> 0.14.0"
+aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml"
+
 [[audits.mozilla.audits.basic-toml]]
 who = "Jan-Erik Rediger <jrediger@mozilla.com>"
 criteria = "safe-to-deploy"
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/Cargo.toml b/toolkit/components/uniffi-bindgen-gecko-js/Cargo.toml
index bc5c911ae6deb..c64a0e9bb3424 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/Cargo.toml
+++ b/toolkit/components/uniffi-bindgen-gecko-js/Cargo.toml
@@ -10,7 +10,7 @@ path = "src/main.rs"
 
 [dependencies]
 anyhow = "1"
-askama = { version = "0.13", default-features = false, features = ["config"] }
+askama = { version = "0.14", default-features = false, features = ["config"] }
 clap = { version = "4", default-features = false, features = ["std", "derive", "cargo"] }
 cargo_metadata = "0.19"
 extend = "1.1"
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustContextId.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustContextId.sys.mjs
index 2f1b1a1692d6c..9f0f5adfaa7cc 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustContextId.sys.mjs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustContextId.sys.mjs
@@ -303,7 +303,7 @@ export class FfiConverterTypeContextIdCallback extends FfiConverter {
     }
 
     static lift(handleId) {
-        return uniffiCallbackHandlerContextIdContextIdCallback.getCallbackObj(handleId)
+        return uniffiCallbackHandlerContextIdContextIdCallback.takeCallbackObj(handleId)
     }
 
     static read(dataStream) {
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustLogins.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustLogins.sys.mjs
index 3da4b15599a4d..720c27d19286c 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustLogins.sys.mjs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustLogins.sys.mjs
@@ -175,7 +175,7 @@ return handleRustResult(
  * Utility function to create a StaticKeyManager to be used for the time
  * being until support lands for [trait implementation of an UniFFI
  * interface](https://mozilla.github.io/uniffi-rs/next/proc_macro/index.html#structs-implementing-traits)
- * in UniFFI. 
+ * in UniFFI.
  * @param {string} key
  * @returns {KeyManager}
  */
@@ -235,6 +235,42 @@ export class FfiConverterOptionalString extends FfiConverterArrayBuffer {
         return 1 + FfiConverterString.computeSize(value)
     }
 }
+// Export the FFIConverter object to make external types work.
+export class FfiConverterOptionalInt64 extends FfiConverterArrayBuffer {
+    static checkType(value) {
+        if (value !== undefined && value !== null) {
+            FfiConverterInt64.checkType(value)
+        }
+    }
+
+    static read(dataStream) {
+        const code = dataStream.readUint8(0);
+        switch (code) {
+            case 0:
+                return null
+            case 1:
+                return FfiConverterInt64.read(dataStream)
+            default:
+                throw new UniFFIError(`Unexpected code: ${code}`);
+        }
+    }
+
+    static write(dataStream, value) {
+        if (value === null || value === undefined) {
+            dataStream.writeUint8(0);
+            return;
+        }
+        dataStream.writeUint8(1);
+        FfiConverterInt64.write(dataStream, value)
+    }
+
+    static computeSize(value) {
+        if (value === null || value === undefined) {
+            return 1;
+        }
+        return 1 + FfiConverterInt64.computeSize(value)
+    }
+}
 /**
  * A login stored in the database
  */
@@ -252,7 +288,9 @@ export class Login {
             usernameField, 
             passwordField, 
             password, 
-            username
+            username, 
+            timeOfLastBreach, 
+            timeLastBreachAlertDismissed
         } = {
             id: undefined, 
             timesUsed: undefined, 
@@ -265,7 +303,9 @@ export class Login {
             usernameField: undefined, 
             passwordField: undefined, 
             password: undefined, 
-            username: undefined
+            username: undefined, 
+            timeOfLastBreach: undefined, 
+            timeLastBreachAlertDismissed: undefined
         }
     ) {
         try {
@@ -364,6 +404,22 @@ export class Login {
             }
             throw e;
         }
+        try {
+            FfiConverterOptionalInt64.checkType(timeOfLastBreach)
+        } catch (e) {
+            if (e instanceof UniFFITypeError) {
+                e.addItemDescriptionPart("timeOfLastBreach");
+            }
+            throw e;
+        }
+        try {
+            FfiConverterOptionalInt64.checkType(timeLastBreachAlertDismissed)
+        } catch (e) {
+            if (e instanceof UniFFITypeError) {
+                e.addItemDescriptionPart("timeLastBreachAlertDismissed");
+            }
+            throw e;
+        }
         /**
          * id
          */
@@ -412,6 +468,18 @@ export class Login {
          * username
          */
         this.username = username;
+        /**
+         * These fields can be synced from Desktop and are NOT included in LoginEntry,
+         * so update() will not modify them. Use the dedicated API methods to manipulate:
+         * record_breach(), reset_all_breaches(), is_potentially_breached(),
+         * record_breach_alert_dismissal(), record_breach_alert_dismissal_time(),
+         * and is_breach_alert_dismissed().
+         */
+        this.timeOfLastBreach = timeOfLastBreach;
+        /**
+         * timeLastBreachAlertDismissed
+         */
+        this.timeLastBreachAlertDismissed = timeLastBreachAlertDismissed;
     }
 
     equals(other) {
@@ -428,6 +496,8 @@ export class Login {
             && this.passwordField == other.passwordField
             && this.password == other.password
             && this.username == other.username
+            && this.timeOfLastBreach == other.timeOfLastBreach
+            && this.timeLastBreachAlertDismissed == other.timeLastBreachAlertDismissed
         )
     }
 }
@@ -448,6 +518,8 @@ export class FfiConverterTypeLogin extends FfiConverterArrayBuffer {
             passwordField: FfiConverterString.read(dataStream),
             password: FfiConverterString.read(dataStream),
             username: FfiConverterString.read(dataStream),
+            timeOfLastBreach: FfiConverterOptionalInt64.read(dataStream),
+            timeLastBreachAlertDismissed: FfiConverterOptionalInt64.read(dataStream),
         });
     }
     static write(dataStream, value) {
@@ -463,6 +535,8 @@ export class FfiConverterTypeLogin extends FfiConverterArrayBuffer {
         FfiConverterString.write(dataStream, value.passwordField);
         FfiConverterString.write(dataStream, value.password);
         FfiConverterString.write(dataStream, value.username);
+        FfiConverterOptionalInt64.write(dataStream, value.timeOfLastBreach);
+        FfiConverterOptionalInt64.write(dataStream, value.timeLastBreachAlertDismissed);
     }
 
     static computeSize(value) {
@@ -479,6 +553,8 @@ export class FfiConverterTypeLogin extends FfiConverterArrayBuffer {
         totalSize += FfiConverterString.computeSize(value.passwordField);
         totalSize += FfiConverterString.computeSize(value.password);
         totalSize += FfiConverterString.computeSize(value.username);
+        totalSize += FfiConverterOptionalInt64.computeSize(value.timeOfLastBreach);
+        totalSize += FfiConverterOptionalInt64.computeSize(value.timeLastBreachAlertDismissed);
         return totalSize
     }
 
@@ -583,6 +659,22 @@ export class FfiConverterTypeLogin extends FfiConverterArrayBuffer {
             }
             throw e;
         }
+        try {
+            FfiConverterOptionalInt64.checkType(value.timeOfLastBreach);
+        } catch (e) {
+            if (e instanceof UniFFITypeError) {
+                e.addItemDescriptionPart(".timeOfLastBreach");
+            }
+            throw e;
+        }
+        try {
+            FfiConverterOptionalInt64.checkType(value.timeLastBreachAlertDismissed);
+        } catch (e) {
+            if (e instanceof UniFFITypeError) {
+                e.addItemDescriptionPart(".timeLastBreachAlertDismissed");
+            }
+            throw e;
+        }
     }
 }
 /**
@@ -1811,19 +1903,30 @@ export class EncryptorDecryptorImpl extends EncryptorDecryptor {
 //
 // Export the FFIConverter object to make external types work.
 export class FfiConverterTypeEncryptorDecryptor extends FfiConverter {
-    // lift works like a regular interface
-    static lift(value) {
-        const opts = {};
-        opts[constructUniffiObject] = value;
-        return new EncryptorDecryptorImpl(opts);
+    static lift(handle) {
+        if (handle instanceof UniFFIPointer) {
+          // Rust handle.  Construct an object from it
+          const opts = {};
+          opts[constructUniffiObject] = handle;
+          return new EncryptorDecryptorImpl(opts);
+        } else {
+          // JS handle.  Get the JS object from the callback handler
+          return uniffiCallbackHandlerLoginsEncryptorDecryptor.takeCallbackObj(handle)
+        }
     }
 
-    // lower treats value like a callback interface
     static lower(value) {
-        if (!(value instanceof EncryptorDecryptor)) {
-            throw new UniFFITypeError("expected 'EncryptorDecryptor' subclass");
+        const ptr = value[uniffiObjectPtr];
+        if (ptr instanceof UniFFIPointer) {
+          // Rust-implemented interface, return the ptr.  The C++ code will clone it.
+          return ptr;
+        } else {
+          // JS-implemented interface, store the object in the handle map and return the handle
+          if (!(value instanceof EncryptorDecryptor)) {
+              throw new UniFFITypeError("expected 'EncryptorDecryptor' subclass");
+          }
+          return uniffiCallbackHandlerLoginsEncryptorDecryptor.storeCallbackObj(value)
         }
-        return uniffiCallbackHandlerLoginsEncryptorDecryptor.storeCallbackObj(value)
     }
 
     // lowerReceiver is used when calling methods on an interface we got from Rust, 
@@ -1837,11 +1940,16 @@ export class FfiConverterTypeEncryptorDecryptor extends FfiConverter {
     }
 
     static read(dataStream) {
-        return this.lift(dataStream.readPointer(3));
+        return this.lift(dataStream.readHandleOrPointer(3))
     }
 
     static write(dataStream, value) {
-        dataStream.writePointer(3, this.lower(value));
+        if (value[uniffiObjectPtr] instanceof UniFFIPointer) {
+          // Rust-implemented interface, return the ptr.
+          dataStream.writePointer(3, this.lower(value));
+        } else {
+          dataStream.writeInt64(this.lower(value))
+        }
     }
 
     static computeSize(value) {
@@ -1941,19 +2049,30 @@ export class KeyManagerImpl extends KeyManager {
 //
 // Export the FFIConverter object to make external types work.
 export class FfiConverterTypeKeyManager extends FfiConverter {
-    // lift works like a regular interface
-    static lift(value) {
-        const opts = {};
-        opts[constructUniffiObject] = value;
-        return new KeyManagerImpl(opts);
+    static lift(handle) {
+        if (handle instanceof UniFFIPointer) {
+          // Rust handle.  Construct an object from it
+          const opts = {};
+          opts[constructUniffiObject] = handle;
+          return new KeyManagerImpl(opts);
+        } else {
+          // JS handle.  Get the JS object from the callback handler
+          return uniffiCallbackHandlerLoginsKeyManager.takeCallbackObj(handle)
+        }
     }
 
-    // lower treats value like a callback interface
     static lower(value) {
-        if (!(value instanceof KeyManager)) {
-            throw new UniFFITypeError("expected 'KeyManager' subclass");
+        const ptr = value[uniffiObjectPtr];
+        if (ptr instanceof UniFFIPointer) {
+          // Rust-implemented interface, return the ptr.  The C++ code will clone it.
+          return ptr;
+        } else {
+          // JS-implemented interface, store the object in the handle map and return the handle
+          if (!(value instanceof KeyManager)) {
+              throw new UniFFITypeError("expected 'KeyManager' subclass");
+          }
+          return uniffiCallbackHandlerLoginsKeyManager.storeCallbackObj(value)
         }
-        return uniffiCallbackHandlerLoginsKeyManager.storeCallbackObj(value)
     }
 
     // lowerReceiver is used when calling methods on an interface we got from Rust, 
@@ -1967,11 +2086,16 @@ export class FfiConverterTypeKeyManager extends FfiConverter {
     }
 
     static read(dataStream) {
-        return this.lift(dataStream.readPointer(4));
+        return this.lift(dataStream.readHandleOrPointer(4))
     }
 
     static write(dataStream, value) {
-        dataStream.writePointer(4, this.lower(value));
+        if (value[uniffiObjectPtr] instanceof UniFFIPointer) {
+          // Rust-implemented interface, return the ptr.
+          dataStream.writePointer(4, this.lower(value));
+        } else {
+          dataStream.writeInt64(this.lower(value))
+        }
     }
 
     static computeSize(value) {
@@ -2444,6 +2568,15 @@ export class LoginStoreInterface {
         baseDomain) {
       throw Error("hasLoginsByBaseDomain not implemented");
     }
+    /**
+     * Determines whether a breach alert has been dismissed, based on the breach date and the alert dismissal timestamp.
+     * @param {string} id
+     * @returns {boolean}
+     */
+    isBreachAlertDismissed(
+        id) {
+      throw Error("isBreachAlertDismissed not implemented");
+    }
     /**
      * isEmpty
      * @returns {boolean}
@@ -2451,6 +2584,15 @@ export class LoginStoreInterface {
     isEmpty() {
       throw Error("isEmpty not implemented");
     }
+    /**
+     * Determines whether a login’s password is potentially breached, based on the breach date and the time of the last password change.
+     * @param {string} id
+     * @returns {boolean}
+     */
+    isPotentiallyBreached(
+        id) {
+      throw Error("isPotentiallyBreached not implemented");
+    }
     /**
      * list
      * @returns {Array.<Login>}
@@ -2458,6 +2600,35 @@ export class LoginStoreInterface {
     list() {
       throw Error("list not implemented");
     }
+    /**
+     * Stores a known breach date for a login.
+     * In Firefox Desktop this is updated once per session from Remote Settings.
+     * @param {string} id
+     * @param {number} timestamp
+     */
+    recordBreach(
+        id, 
+        timestamp) {
+      throw Error("recordBreach not implemented");
+    }
+    /**
+     * Stores that the user dismissed the breach alert for a login.
+     * @param {string} id
+     */
+    recordBreachAlertDismissal(
+        id) {
+      throw Error("recordBreachAlertDismissal not implemented");
+    }
+    /**
+     * Stores the time at which the user dismissed the breach alert for a login.
+     * @param {string} id
+     * @param {number} timestamp
+     */
+    recordBreachAlertDismissalTime(
+        id, 
+        timestamp) {
+      throw Error("recordBreachAlertDismissalTime not implemented");
+    }
     /**
      * registerWithSyncManager
      */
@@ -2470,6 +2641,12 @@ export class LoginStoreInterface {
     reset() {
       throw Error("reset not implemented");
     }
+    /**
+     * Removes all recorded breaches for all logins (i.e. sets time_of_last_breach to null).
+     */
+    resetAllBreaches() {
+      throw Error("resetAllBreaches not implemented");
+    }
     /**
      * Run maintenance on the DB
      * 
@@ -2901,6 +3078,27 @@ export class LoginStore extends LoginStoreInterface {
         )
     }
 
+    /**
+     * Determines whether a breach alert has been dismissed, based on the breach date and the alert dismissal timestamp.
+     * @param {string} id
+     * @returns {boolean}
+     */
+    isBreachAlertDismissed(
+        id) {
+       
+        FfiConverterString.checkType(id);
+        const result = UniFFIScaffolding.callSync(
+            35, // uniffi_logins_fn_method_loginstore_is_breach_alert_dismissed
+            FfiConverterTypeLoginStore.lowerReceiver(this),
+            FfiConverterString.lower(id),
+        )
+        return handleRustResult(
+            result,
+            FfiConverterBoolean.lift.bind(FfiConverterBoolean),
+            FfiConverterTypeLoginsApiError.lift.bind(FfiConverterTypeLoginsApiError),
+        )
+    }
+
     /**
      * isEmpty
      * @returns {boolean}
@@ -2908,8 +3106,29 @@ export class LoginStore extends LoginStoreInterface {
     isEmpty() {
        
         const result = UniFFIScaffolding.callSync(
-            35, // uniffi_logins_fn_method_loginstore_is_empty
+            36, // uniffi_logins_fn_method_loginstore_is_empty
+            FfiConverterTypeLoginStore.lowerReceiver(this),
+        )
+        return handleRustResult(
+            result,
+            FfiConverterBoolean.lift.bind(FfiConverterBoolean),
+            FfiConverterTypeLoginsApiError.lift.bind(FfiConverterTypeLoginsApiError),
+        )
+    }
+
+    /**
+     * Determines whether a login’s password is potentially breached, based on the breach date and the time of the last password change.
+     * @param {string} id
+     * @returns {boolean}
+     */
+    isPotentiallyBreached(
+        id) {
+       
+        FfiConverterString.checkType(id);
+        const result = UniFFIScaffolding.callSync(
+            37, // uniffi_logins_fn_method_loginstore_is_potentially_breached
             FfiConverterTypeLoginStore.lowerReceiver(this),
+            FfiConverterString.lower(id),
         )
         return handleRustResult(
             result,
@@ -2925,7 +3144,7 @@ export class LoginStore extends LoginStoreInterface {
     list() {
        
         const result = UniFFIScaffolding.callSync(
-            36, // uniffi_logins_fn_method_loginstore_list
+            38, // uniffi_logins_fn_method_loginstore_list
             FfiConverterTypeLoginStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2935,13 +3154,82 @@ export class LoginStore extends LoginStoreInterface {
         )
     }
 
+    /**
+     * Stores a known breach date for a login.
+     * In Firefox Desktop this is updated once per session from Remote Settings.
+     * @param {string} id
+     * @param {number} timestamp
+     */
+    recordBreach(
+        id, 
+        timestamp) {
+       
+        FfiConverterString.checkType(id);
+        FfiConverterInt64.checkType(timestamp);
+        const result = UniFFIScaffolding.callSync(
+            39, // uniffi_logins_fn_method_loginstore_record_breach
+            FfiConverterTypeLoginStore.lowerReceiver(this),
+            FfiConverterString.lower(id),
+            FfiConverterInt64.lower(timestamp),
+        )
+        return handleRustResult(
+            result,
+            (result) => undefined,
+            FfiConverterTypeLoginsApiError.lift.bind(FfiConverterTypeLoginsApiError),
+        )
+    }
+
+    /**
+     * Stores that the user dismissed the breach alert for a login.
+     * @param {string} id
+     */
+    recordBreachAlertDismissal(
+        id) {
+       
+        FfiConverterString.checkType(id);
+        const result = UniFFIScaffolding.callSync(
+            40, // uniffi_logins_fn_method_loginstore_record_breach_alert_dismissal
+            FfiConverterTypeLoginStore.lowerReceiver(this),
+            FfiConverterString.lower(id),
+        )
+        return handleRustResult(
+            result,
+            (result) => undefined,
+            FfiConverterTypeLoginsApiError.lift.bind(FfiConverterTypeLoginsApiError),
+        )
+    }
+
+    /**
+     * Stores the time at which the user dismissed the breach alert for a login.
+     * @param {string} id
+     * @param {number} timestamp
+     */
+    recordBreachAlertDismissalTime(
+        id, 
+        timestamp) {
+       
+        FfiConverterString.checkType(id);
+        FfiConverterInt64.checkType(timestamp);
+        const result = UniFFIScaffolding.callSync(
+            41, // uniffi_logins_fn_method_loginstore_record_breach_alert_dismissal_time
+            FfiConverterTypeLoginStore.lowerReceiver(this),
+            FfiConverterString.lower(id),
+            FfiConverterInt64.lower(timestamp),
+        )
+        return handleRustResult(
+            result,
+            (result) => undefined,
+            FfiConverterTypeLoginsApiError.lift.bind(FfiConverterTypeLoginsApiError),
+        )
+    }
+
     /**
      * registerWithSyncManager
      */
     registerWithSyncManager() {
        
         const result = UniFFIScaffolding.callSync(
-            37, // uniffi_logins_fn_method_loginstore_register_with_sync_manager
+            42, // uniffi_logins_fn_method_loginstore_register_with_sync_manager
             FfiConverterTypeLoginStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2957,7 +3245,23 @@ export class LoginStore extends LoginStoreInterface {
     reset() {
        
         const result = UniFFIScaffolding.callSync(
-            38, // uniffi_logins_fn_method_loginstore_reset
+            43, // uniffi_logins_fn_method_loginstore_reset
+            FfiConverterTypeLoginStore.lowerReceiver(this),
+        )
+        return handleRustResult(
+            result,
+            (result) => undefined,
+            FfiConverterTypeLoginsApiError.lift.bind(FfiConverterTypeLoginsApiError),
+        )
+    }
+
+    /**
+     * Removes all recorded breaches for all logins (i.e. sets time_of_last_breach to null).
+     */
+    resetAllBreaches() {
+       
+        const result = UniFFIScaffolding.callSync(
+            44, // uniffi_logins_fn_method_loginstore_reset_all_breaches
             FfiConverterTypeLoginStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2976,7 +3280,7 @@ export class LoginStore extends LoginStoreInterface {
     async runMaintenance() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            39, // uniffi_logins_fn_method_loginstore_run_maintenance
+            45, // uniffi_logins_fn_method_loginstore_run_maintenance
             FfiConverterTypeLoginStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2995,7 +3299,7 @@ export class LoginStore extends LoginStoreInterface {
        
         FfiConverterString.checkType(checkpoint);
         const result = UniFFIScaffolding.callSync(
-            40, // uniffi_logins_fn_method_loginstore_set_checkpoint
+            46, // uniffi_logins_fn_method_loginstore_set_checkpoint
             FfiConverterTypeLoginStore.lowerReceiver(this),
             FfiConverterString.lower(checkpoint),
         )
@@ -3012,7 +3316,7 @@ export class LoginStore extends LoginStoreInterface {
     shutdown() {
        
         const result = UniFFIScaffolding.callSync(
-            41, // uniffi_logins_fn_method_loginstore_shutdown
+            47, // uniffi_logins_fn_method_loginstore_shutdown
             FfiConverterTypeLoginStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -3031,7 +3335,7 @@ export class LoginStore extends LoginStoreInterface {
        
         FfiConverterString.checkType(id);
         const result = UniFFIScaffolding.callSync(
-            42, // uniffi_logins_fn_method_loginstore_touch
+            48, // uniffi_logins_fn_method_loginstore_touch
             FfiConverterTypeLoginStore.lowerReceiver(this),
             FfiConverterString.lower(id),
         )
@@ -3055,7 +3359,7 @@ export class LoginStore extends LoginStoreInterface {
         FfiConverterString.checkType(id);
         FfiConverterTypeLoginEntry.checkType(login);
         const result = UniFFIScaffolding.callSync(
-            43, // uniffi_logins_fn_method_loginstore_update
+            49, // uniffi_logins_fn_method_loginstore_update
             FfiConverterTypeLoginStore.lowerReceiver(this),
             FfiConverterString.lower(id),
             FfiConverterTypeLoginEntry.lower(login),
@@ -3083,7 +3387,7 @@ export class LoginStore extends LoginStoreInterface {
     wipeLocal() {
        
         const result = UniFFIScaffolding.callSync(
-            44, // uniffi_logins_fn_method_loginstore_wipe_local
+            50, // uniffi_logins_fn_method_loginstore_wipe_local
             FfiConverterTypeLoginStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -3164,7 +3468,7 @@ export class ManagedEncryptorDecryptor extends ManagedEncryptorDecryptorInterfac
        
         FfiConverterTypeKeyManager.checkType(keyManager);
         const result = UniFFIScaffolding.callSync(
-            45, // uniffi_logins_fn_constructor_managedencryptordecryptor_new
+            51, // uniffi_logins_fn_constructor_managedencryptordecryptor_new
             FfiConverterTypeKeyManager.lower(keyManager),
         )
         return handleRustResult(
@@ -3332,7 +3636,7 @@ export class NssKeyManager extends NssKeyManagerInterface {
        
         FfiConverterTypePrimaryPasswordAuthenticator.checkType(primaryPasswordAuthenticator);
         const result = UniFFIScaffolding.callSync(
-            46, // uniffi_logins_fn_constructor_nsskeymanager_new
+            52, // uniffi_logins_fn_constructor_nsskeymanager_new
             FfiConverterTypePrimaryPasswordAuthenticator.lower(primaryPasswordAuthenticator),
         )
         return handleRustResult(
@@ -3349,7 +3653,7 @@ export class NssKeyManager extends NssKeyManagerInterface {
     intoDynKeyManager() {
        
         const result = UniFFIScaffolding.callSync(
-            47, // uniffi_logins_fn_method_nsskeymanager_into_dyn_key_manager
+            53, // uniffi_logins_fn_method_nsskeymanager_into_dyn_key_manager
             FfiConverterTypeNSSKeyManager.lowerReceiver(this),
         )
         return handleRustResult(
@@ -3451,7 +3755,7 @@ export class PrimaryPasswordAuthenticatorImpl extends PrimaryPasswordAuthenticat
     async getPrimaryPassword() {
        
         const result = await UniFFIScaffolding.callAsync(
-            48, // uniffi_logins_fn_method_primarypasswordauthenticator_get_primary_password
+            54, // uniffi_logins_fn_method_primarypasswordauthenticator_get_primary_password
             FfiConverterTypePrimaryPasswordAuthenticator.lowerReceiver(this),
         )
         return handleRustResult(
@@ -3467,7 +3771,7 @@ export class PrimaryPasswordAuthenticatorImpl extends PrimaryPasswordAuthenticat
     async onAuthenticationSuccess() {
        
         const result = await UniFFIScaffolding.callAsync(
-            49, // uniffi_logins_fn_method_primarypasswordauthenticator_on_authentication_success
+            55, // uniffi_logins_fn_method_primarypasswordauthenticator_on_authentication_success
             FfiConverterTypePrimaryPasswordAuthenticator.lowerReceiver(this),
         )
         return handleRustResult(
@@ -3483,7 +3787,7 @@ export class PrimaryPasswordAuthenticatorImpl extends PrimaryPasswordAuthenticat
     async onAuthenticationFailure() {
        
         const result = await UniFFIScaffolding.callAsync(
-            50, // uniffi_logins_fn_method_primarypasswordauthenticator_on_authentication_failure
+            56, // uniffi_logins_fn_method_primarypasswordauthenticator_on_authentication_failure
             FfiConverterTypePrimaryPasswordAuthenticator.lowerReceiver(this),
         )
         return handleRustResult(
@@ -3500,19 +3804,30 @@ export class PrimaryPasswordAuthenticatorImpl extends PrimaryPasswordAuthenticat
 //
 // Export the FFIConverter object to make external types work.
 export class FfiConverterTypePrimaryPasswordAuthenticator extends FfiConverter {
-    // lift works like a regular interface
-    static lift(value) {
-        const opts = {};
-        opts[constructUniffiObject] = value;
-        return new PrimaryPasswordAuthenticatorImpl(opts);
+    static lift(handle) {
+        if (handle instanceof UniFFIPointer) {
+          // Rust handle.  Construct an object from it
+          const opts = {};
+          opts[constructUniffiObject] = handle;
+          return new PrimaryPasswordAuthenticatorImpl(opts);
+        } else {
+          // JS handle.  Get the JS object from the callback handler
+          return uniffiCallbackHandlerLoginsPrimaryPasswordAuthenticator.takeCallbackObj(handle)
+        }
     }
 
-    // lower treats value like a callback interface
     static lower(value) {
-        if (!(value instanceof PrimaryPasswordAuthenticator)) {
-            throw new UniFFITypeError("expected 'PrimaryPasswordAuthenticator' subclass");
+        const ptr = value[uniffiObjectPtr];
+        if (ptr instanceof UniFFIPointer) {
+          // Rust-implemented interface, return the ptr.  The C++ code will clone it.
+          return ptr;
+        } else {
+          // JS-implemented interface, store the object in the handle map and return the handle
+          if (!(value instanceof PrimaryPasswordAuthenticator)) {
+              throw new UniFFITypeError("expected 'PrimaryPasswordAuthenticator' subclass");
+          }
+          return uniffiCallbackHandlerLoginsPrimaryPasswordAuthenticator.storeCallbackObj(value)
         }
-        return uniffiCallbackHandlerLoginsPrimaryPasswordAuthenticator.storeCallbackObj(value)
     }
 
     // lowerReceiver is used when calling methods on an interface we got from Rust, 
@@ -3526,11 +3841,16 @@ export class FfiConverterTypePrimaryPasswordAuthenticator extends FfiConverter {
     }
 
     static read(dataStream) {
-        return this.lift(dataStream.readPointer(8));
+        return this.lift(dataStream.readHandleOrPointer(8))
     }
 
     static write(dataStream, value) {
-        dataStream.writePointer(8, this.lower(value));
+        if (value[uniffiObjectPtr] instanceof UniFFIPointer) {
+          // Rust-implemented interface, return the ptr.
+          dataStream.writePointer(8, this.lower(value));
+        } else {
+          dataStream.writeInt64(this.lower(value))
+        }
     }
 
     static computeSize(value) {
@@ -3618,7 +3938,7 @@ export class StaticKeyManager extends StaticKeyManagerInterface {
        
         FfiConverterString.checkType(key);
         const result = UniFFIScaffolding.callSync(
-            51, // uniffi_logins_fn_constructor_statickeymanager_new
+            57, // uniffi_logins_fn_constructor_statickeymanager_new
             FfiConverterString.lower(key),
         )
         return handleRustResult(
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRelevancy.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRelevancy.sys.mjs
index 08994a35f0315..bf5671d2bdd1b 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRelevancy.sys.mjs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRelevancy.sys.mjs
@@ -56,7 +56,7 @@ export function score(
 FfiConverterTypeInterestVector.checkType(interestVector);
 FfiConverterSequenceTypeInterest.checkType(contentCategories);
 const result = UniFFIScaffolding.callSync(
-    52, // uniffi_relevancy_fn_func_score
+    58, // uniffi_relevancy_fn_func_score
     FfiConverterTypeInterestVector.lower(interestVector),
     FfiConverterSequenceTypeInterest.lower(contentCategories),
 )
@@ -1414,7 +1414,7 @@ export class RelevancyStore extends RelevancyStoreInterface {
         FfiConverterString.checkType(dbPath);
         FfiConverterTypeRemoteSettingsService.checkType(remoteSettings);
         const result = UniFFIScaffolding.callSync(
-            53, // uniffi_relevancy_fn_constructor_relevancystore_new
+            59, // uniffi_relevancy_fn_constructor_relevancystore_new
             FfiConverterString.lower(dbPath),
             FfiConverterTypeRemoteSettingsService.lower(remoteSettings),
         )
@@ -1442,7 +1442,7 @@ export class RelevancyStore extends RelevancyStoreInterface {
         FfiConverterString.checkType(bandit);
         FfiConverterSequenceString.checkType(arms);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            54, // uniffi_relevancy_fn_method_relevancystore_bandit_init
+            60, // uniffi_relevancy_fn_method_relevancystore_bandit_init
             FfiConverterTypeRelevancyStore.lowerReceiver(this),
             FfiConverterString.lower(bandit),
             FfiConverterSequenceString.lower(arms),
@@ -1473,7 +1473,7 @@ export class RelevancyStore extends RelevancyStoreInterface {
         FfiConverterString.checkType(bandit);
         FfiConverterSequenceString.checkType(arms);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            55, // uniffi_relevancy_fn_method_relevancystore_bandit_select
+            61, // uniffi_relevancy_fn_method_relevancystore_bandit_select
             FfiConverterTypeRelevancyStore.lowerReceiver(this),
             FfiConverterString.lower(bandit),
             FfiConverterSequenceString.lower(arms),
@@ -1506,7 +1506,7 @@ export class RelevancyStore extends RelevancyStoreInterface {
         FfiConverterString.checkType(arm);
         FfiConverterBoolean.checkType(selected);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            56, // uniffi_relevancy_fn_method_relevancystore_bandit_update
+            62, // uniffi_relevancy_fn_method_relevancystore_bandit_update
             FfiConverterTypeRelevancyStore.lowerReceiver(this),
             FfiConverterString.lower(bandit),
             FfiConverterString.lower(arm),
@@ -1527,7 +1527,7 @@ export class RelevancyStore extends RelevancyStoreInterface {
     close() {
        
         const result = UniFFIScaffolding.callSync(
-            57, // uniffi_relevancy_fn_method_relevancystore_close
+            63, // uniffi_relevancy_fn_method_relevancystore_close
             FfiConverterTypeRelevancyStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -1543,7 +1543,7 @@ export class RelevancyStore extends RelevancyStoreInterface {
     async ensureInterestDataPopulated() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            58, // uniffi_relevancy_fn_method_relevancystore_ensure_interest_data_populated
+            64, // uniffi_relevancy_fn_method_relevancystore_ensure_interest_data_populated
             FfiConverterTypeRelevancyStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -1566,7 +1566,7 @@ export class RelevancyStore extends RelevancyStoreInterface {
         FfiConverterString.checkType(bandit);
         FfiConverterString.checkType(arm);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            59, // uniffi_relevancy_fn_method_relevancystore_get_bandit_data
+            65, // uniffi_relevancy_fn_method_relevancystore_get_bandit_data
             FfiConverterTypeRelevancyStore.lowerReceiver(this),
             FfiConverterString.lower(bandit),
             FfiConverterString.lower(arm),
@@ -1598,7 +1598,7 @@ export class RelevancyStore extends RelevancyStoreInterface {
        
         FfiConverterSequenceString.checkType(topUrlsByFrecency);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            60, // uniffi_relevancy_fn_method_relevancystore_ingest
+            66, // uniffi_relevancy_fn_method_relevancystore_ingest
             FfiConverterTypeRelevancyStore.lowerReceiver(this),
             FfiConverterSequenceString.lower(topUrlsByFrecency),
         )
@@ -1615,7 +1615,7 @@ export class RelevancyStore extends RelevancyStoreInterface {
     interrupt() {
        
         const result = UniFFIScaffolding.callSync(
-            61, // uniffi_relevancy_fn_method_relevancystore_interrupt
+            67, // uniffi_relevancy_fn_method_relevancystore_interrupt
             FfiConverterTypeRelevancyStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -1635,7 +1635,7 @@ export class RelevancyStore extends RelevancyStoreInterface {
     async userInterestVector() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            62, // uniffi_relevancy_fn_method_relevancystore_user_interest_vector
+            68, // uniffi_relevancy_fn_method_relevancystore_user_interest_vector
             FfiConverterTypeRelevancyStore.lowerReceiver(this),
         )
         return handleRustResult(
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRemoteSettings.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRemoteSettings.sys.mjs
index 59cdd929b9dc7..e2e73cf6a8fb2 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRemoteSettings.sys.mjs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustRemoteSettings.sys.mjs
@@ -1623,7 +1623,7 @@ export class RemoteSettings extends RemoteSettingsInterface {
        
         FfiConverterTypeRemoteSettingsConfig.checkType(remoteSettingsConfig);
         const result = UniFFIScaffolding.callSync(
-            63, // uniffi_remote_settings_fn_constructor_remotesettings_new
+            69, // uniffi_remote_settings_fn_constructor_remotesettings_new
             FfiConverterTypeRemoteSettingsConfig.lower(remoteSettingsConfig),
         )
         return handleRustResult(
@@ -1645,7 +1645,7 @@ export class RemoteSettings extends RemoteSettingsInterface {
         FfiConverterString.checkType(attachmentId);
         FfiConverterString.checkType(path);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            64, // uniffi_remote_settings_fn_method_remotesettings_download_attachment_to_path
+            70, // uniffi_remote_settings_fn_method_remotesettings_download_attachment_to_path
             FfiConverterTypeRemoteSettings.lowerReceiver(this),
             FfiConverterString.lower(attachmentId),
             FfiConverterString.lower(path),
@@ -1664,7 +1664,7 @@ export class RemoteSettings extends RemoteSettingsInterface {
     async getRecords() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            65, // uniffi_remote_settings_fn_method_remotesettings_get_records
+            71, // uniffi_remote_settings_fn_method_remotesettings_get_records
             FfiConverterTypeRemoteSettings.lowerReceiver(this),
         )
         return handleRustResult(
@@ -1685,7 +1685,7 @@ export class RemoteSettings extends RemoteSettingsInterface {
        
         FfiConverterUInt64.checkType(timestamp);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            66, // uniffi_remote_settings_fn_method_remotesettings_get_records_since
+            72, // uniffi_remote_settings_fn_method_remotesettings_get_records_since
             FfiConverterTypeRemoteSettings.lowerReceiver(this),
             FfiConverterUInt64.lower(timestamp),
         )
@@ -1969,7 +1969,7 @@ export class RemoteSettingsClient extends RemoteSettingsClientInterface {
     async collectionName() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            67, // uniffi_remote_settings_fn_method_remotesettingsclient_collection_name
+            73, // uniffi_remote_settings_fn_method_remotesettingsclient_collection_name
             FfiConverterTypeRemoteSettingsClient.lowerReceiver(this),
         )
         return handleRustResult(
@@ -1997,7 +1997,7 @@ export class RemoteSettingsClient extends RemoteSettingsClientInterface {
        
         FfiConverterTypeRemoteSettingsRecord.checkType(record);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            68, // uniffi_remote_settings_fn_method_remotesettingsclient_get_attachment
+            74, // uniffi_remote_settings_fn_method_remotesettingsclient_get_attachment
             FfiConverterTypeRemoteSettingsClient.lowerReceiver(this),
             FfiConverterTypeRemoteSettingsRecord.lower(record),
         )
@@ -2033,7 +2033,7 @@ export class RemoteSettingsClient extends RemoteSettingsClientInterface {
        
         FfiConverterBoolean.checkType(syncIfEmpty);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            69, // uniffi_remote_settings_fn_method_remotesettingsclient_get_records
+            75, // uniffi_remote_settings_fn_method_remotesettingsclient_get_records
             FfiConverterTypeRemoteSettingsClient.lowerReceiver(this),
             FfiConverterBoolean.lower(syncIfEmpty),
         )
@@ -2057,7 +2057,7 @@ export class RemoteSettingsClient extends RemoteSettingsClientInterface {
        
         FfiConverterBoolean.checkType(syncIfEmpty);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            70, // uniffi_remote_settings_fn_method_remotesettingsclient_get_records_map
+            76, // uniffi_remote_settings_fn_method_remotesettingsclient_get_records_map
             FfiConverterTypeRemoteSettingsClient.lowerReceiver(this),
             FfiConverterBoolean.lower(syncIfEmpty),
         )
@@ -2074,7 +2074,7 @@ export class RemoteSettingsClient extends RemoteSettingsClientInterface {
     async shutdown() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            71, // uniffi_remote_settings_fn_method_remotesettingsclient_shutdown
+            77, // uniffi_remote_settings_fn_method_remotesettingsclient_shutdown
             FfiConverterTypeRemoteSettingsClient.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2090,7 +2090,7 @@ export class RemoteSettingsClient extends RemoteSettingsClientInterface {
     async sync() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            72, // uniffi_remote_settings_fn_method_remotesettingsclient_sync
+            78, // uniffi_remote_settings_fn_method_remotesettingsclient_sync
             FfiConverterTypeRemoteSettingsClient.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2271,7 +2271,7 @@ export class RemoteSettingsService extends RemoteSettingsServiceInterface {
         FfiConverterString.checkType(storageDir);
         FfiConverterTypeRemoteSettingsConfig2.checkType(config);
         const result = UniFFIScaffolding.callSync(
-            73, // uniffi_remote_settings_fn_constructor_remotesettingsservice_new
+            79, // uniffi_remote_settings_fn_constructor_remotesettingsservice_new
             FfiConverterString.lower(storageDir),
             FfiConverterTypeRemoteSettingsConfig2.lower(config),
         )
@@ -2289,7 +2289,7 @@ export class RemoteSettingsService extends RemoteSettingsServiceInterface {
     clientUrl() {
        
         const result = UniFFIScaffolding.callSync(
-            74, // uniffi_remote_settings_fn_method_remotesettingsservice_client_url
+            80, // uniffi_remote_settings_fn_method_remotesettingsservice_client_url
             FfiConverterTypeRemoteSettingsService.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2311,7 +2311,7 @@ export class RemoteSettingsService extends RemoteSettingsServiceInterface {
        
         FfiConverterString.checkType(collectionName);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            75, // uniffi_remote_settings_fn_method_remotesettingsservice_make_client
+            81, // uniffi_remote_settings_fn_method_remotesettingsservice_make_client
             FfiConverterTypeRemoteSettingsService.lowerReceiver(this),
             FfiConverterString.lower(collectionName),
         )
@@ -2329,7 +2329,7 @@ export class RemoteSettingsService extends RemoteSettingsServiceInterface {
     async sync() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            76, // uniffi_remote_settings_fn_method_remotesettingsservice_sync
+            82, // uniffi_remote_settings_fn_method_remotesettingsservice_sync
             FfiConverterTypeRemoteSettingsService.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2354,7 +2354,7 @@ export class RemoteSettingsService extends RemoteSettingsServiceInterface {
        
         FfiConverterTypeRemoteSettingsConfig2.checkType(config);
         const result = UniFFIScaffolding.callSync(
-            77, // uniffi_remote_settings_fn_method_remotesettingsservice_update_config
+            83, // uniffi_remote_settings_fn_method_remotesettingsservice_update_config
             FfiConverterTypeRemoteSettingsService.lowerReceiver(this),
             FfiConverterTypeRemoteSettingsConfig2.lower(config),
         )
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs
index 2ab692958efa8..1105287e714a5 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSearch.sys.mjs
@@ -2782,7 +2782,7 @@ export class SearchEngineSelector extends SearchEngineSelectorInterface {
     static init() {
        
         const result = UniFFIScaffolding.callSync(
-            78, // uniffi_search_fn_constructor_searchengineselector_new
+            84, // uniffi_search_fn_constructor_searchengineselector_new
         )
         return handleRustResult(
             result,
@@ -2799,7 +2799,7 @@ export class SearchEngineSelector extends SearchEngineSelectorInterface {
     clearSearchConfig() {
        
         const result = UniFFIScaffolding.callSync(
-            79, // uniffi_search_fn_method_searchengineselector_clear_search_config
+            85, // uniffi_search_fn_method_searchengineselector_clear_search_config
             FfiConverterTypeSearchEngineSelector.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2821,7 +2821,7 @@ export class SearchEngineSelector extends SearchEngineSelectorInterface {
        
         FfiConverterTypeSearchUserEnvironment.checkType(userEnvironment);
         const result = UniFFIScaffolding.callSync(
-            80, // uniffi_search_fn_method_searchengineselector_filter_engine_configuration
+            86, // uniffi_search_fn_method_searchengineselector_filter_engine_configuration
             FfiConverterTypeSearchEngineSelector.lowerReceiver(this),
             FfiConverterTypeSearchUserEnvironment.lower(userEnvironment),
         )
@@ -2841,7 +2841,7 @@ export class SearchEngineSelector extends SearchEngineSelectorInterface {
        
         FfiConverterString.checkType(overrides);
         const result = UniFFIScaffolding.callSync(
-            81, // uniffi_search_fn_method_searchengineselector_set_config_overrides
+            87, // uniffi_search_fn_method_searchengineselector_set_config_overrides
             FfiConverterTypeSearchEngineSelector.lowerReceiver(this),
             FfiConverterString.lower(overrides),
         )
@@ -2865,7 +2865,7 @@ export class SearchEngineSelector extends SearchEngineSelectorInterface {
        
         FfiConverterString.checkType(configuration);
         const result = UniFFIScaffolding.callSync(
-            82, // uniffi_search_fn_method_searchengineselector_set_search_config
+            88, // uniffi_search_fn_method_searchengineselector_set_search_config
             FfiConverterTypeSearchEngineSelector.lowerReceiver(this),
             FfiConverterString.lower(configuration),
         )
@@ -2896,7 +2896,7 @@ export class SearchEngineSelector extends SearchEngineSelectorInterface {
         FfiConverterTypeRemoteSettingsService.checkType(service);
         FfiConverterBoolean.checkType(applyEngineOverrides);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            83, // uniffi_search_fn_method_searchengineselector_use_remote_settings_server
+            89, // uniffi_search_fn_method_searchengineselector_use_remote_settings_server
             FfiConverterTypeSearchEngineSelector.lowerReceiver(this),
             FfiConverterTypeRemoteSettingsService.lower(service),
             FfiConverterBoolean.lower(applyEngineOverrides),
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs
index e9af70cbf7124..b79e8b177030c 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustSuggest.sys.mjs
@@ -47,7 +47,7 @@ export function rawSuggestionUrlMatches(
 FfiConverterString.checkType(rawUrl);
 FfiConverterString.checkType(cookedUrl);
 const result = UniFFIScaffolding.callSync(
-    84, // uniffi_suggest_fn_func_raw_suggestion_url_matches
+    90, // uniffi_suggest_fn_func_raw_suggestion_url_matches
     FfiConverterString.lower(rawUrl),
     FfiConverterString.lower(cookedUrl),
 )
@@ -4255,7 +4255,7 @@ export class SuggestStore extends SuggestStoreInterface {
         FfiConverterString.checkType(path);
         FfiConverterTypeRemoteSettingsService.checkType(remoteSettingsService);
         const result = UniFFIScaffolding.callSync(
-            85, // uniffi_suggest_fn_constructor_suggeststore_new
+            91, // uniffi_suggest_fn_constructor_suggeststore_new
             FfiConverterString.lower(path),
             FfiConverterTypeRemoteSettingsService.lower(remoteSettingsService),
         )
@@ -4273,7 +4273,7 @@ export class SuggestStore extends SuggestStoreInterface {
     async anyDismissedSuggestions() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            86, // uniffi_suggest_fn_method_suggeststore_any_dismissed_suggestions
+            92, // uniffi_suggest_fn_method_suggeststore_any_dismissed_suggestions
             FfiConverterTypeSuggestStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -4289,7 +4289,7 @@ export class SuggestStore extends SuggestStoreInterface {
     async clear() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            87, // uniffi_suggest_fn_method_suggeststore_clear
+            93, // uniffi_suggest_fn_method_suggeststore_clear
             FfiConverterTypeSuggestStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -4305,7 +4305,7 @@ export class SuggestStore extends SuggestStoreInterface {
     async clearDismissedSuggestions() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            88, // uniffi_suggest_fn_method_suggeststore_clear_dismissed_suggestions
+            94, // uniffi_suggest_fn_method_suggeststore_clear_dismissed_suggestions
             FfiConverterTypeSuggestStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -4330,7 +4330,7 @@ export class SuggestStore extends SuggestStoreInterface {
        
         FfiConverterString.checkType(key);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            89, // uniffi_suggest_fn_method_suggeststore_dismiss_by_key
+            95, // uniffi_suggest_fn_method_suggeststore_dismiss_by_key
             FfiConverterTypeSuggestStore.lowerReceiver(this),
             FfiConverterString.lower(key),
         )
@@ -4352,7 +4352,7 @@ export class SuggestStore extends SuggestStoreInterface {
        
         FfiConverterTypeSuggestion.checkType(suggestion);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            90, // uniffi_suggest_fn_method_suggeststore_dismiss_by_suggestion
+            96, // uniffi_suggest_fn_method_suggeststore_dismiss_by_suggestion
             FfiConverterTypeSuggestStore.lowerReceiver(this),
             FfiConverterTypeSuggestion.lower(suggestion),
         )
@@ -4377,7 +4377,7 @@ export class SuggestStore extends SuggestStoreInterface {
        
         FfiConverterString.checkType(suggestionUrl);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            91, // uniffi_suggest_fn_method_suggeststore_dismiss_suggestion
+            97, // uniffi_suggest_fn_method_suggeststore_dismiss_suggestion
             FfiConverterTypeSuggestStore.lowerReceiver(this),
             FfiConverterString.lower(suggestionUrl),
         )
@@ -4400,7 +4400,7 @@ export class SuggestStore extends SuggestStoreInterface {
        
         FfiConverterTypeGeoname.checkType(geoname);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            92, // uniffi_suggest_fn_method_suggeststore_fetch_geoname_alternates
+            98, // uniffi_suggest_fn_method_suggeststore_fetch_geoname_alternates
             FfiConverterTypeSuggestStore.lowerReceiver(this),
             FfiConverterTypeGeoname.lower(geoname),
         )
@@ -4430,7 +4430,7 @@ export class SuggestStore extends SuggestStoreInterface {
         FfiConverterBoolean.checkType(matchNamePrefix);
         FfiConverterOptionalSequenceTypeGeoname.checkType(filter);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            93, // uniffi_suggest_fn_method_suggeststore_fetch_geonames
+            99, // uniffi_suggest_fn_method_suggeststore_fetch_geonames
             FfiConverterTypeSuggestStore.lowerReceiver(this),
             FfiConverterString.lower(query),
             FfiConverterBoolean.lower(matchNamePrefix),
@@ -4450,7 +4450,7 @@ export class SuggestStore extends SuggestStoreInterface {
     async fetchGlobalConfig() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            94, // uniffi_suggest_fn_method_suggeststore_fetch_global_config
+            100, // uniffi_suggest_fn_method_suggeststore_fetch_global_config
             FfiConverterTypeSuggestStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -4470,7 +4470,7 @@ export class SuggestStore extends SuggestStoreInterface {
        
         FfiConverterTypeSuggestionProvider.checkType(provider);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            95, // uniffi_suggest_fn_method_suggeststore_fetch_provider_config
+            101, // uniffi_suggest_fn_method_suggeststore_fetch_provider_config
             FfiConverterTypeSuggestStore.lowerReceiver(this),
             FfiConverterTypeSuggestionProvider.lower(provider),
         )
@@ -4491,7 +4491,7 @@ export class SuggestStore extends SuggestStoreInterface {
        
         FfiConverterTypeSuggestIngestionConstraints.checkType(constraints);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            96, // uniffi_suggest_fn_method_suggeststore_ingest
+            102, // uniffi_suggest_fn_method_suggeststore_ingest
             FfiConverterTypeSuggestStore.lowerReceiver(this),
             FfiConverterTypeSuggestIngestionConstraints.lower(constraints),
         )
@@ -4515,7 +4515,7 @@ export class SuggestStore extends SuggestStoreInterface {
        
         FfiConverterOptionalTypeInterruptKind.checkType(kind);
         const result = UniFFIScaffolding.callSync(
-            97, // uniffi_suggest_fn_method_suggeststore_interrupt
+            103, // uniffi_suggest_fn_method_suggeststore_interrupt
             FfiConverterTypeSuggestStore.lowerReceiver(this),
             FfiConverterOptionalTypeInterruptKind.lower(kind),
         )
@@ -4541,7 +4541,7 @@ export class SuggestStore extends SuggestStoreInterface {
        
         FfiConverterString.checkType(key);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            98, // uniffi_suggest_fn_method_suggeststore_is_dismissed_by_key
+            104, // uniffi_suggest_fn_method_suggeststore_is_dismissed_by_key
             FfiConverterTypeSuggestStore.lowerReceiver(this),
             FfiConverterString.lower(key),
         )
@@ -4566,7 +4566,7 @@ export class SuggestStore extends SuggestStoreInterface {
        
         FfiConverterTypeSuggestion.checkType(suggestion);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            99, // uniffi_suggest_fn_method_suggeststore_is_dismissed_by_suggestion
+            105, // uniffi_suggest_fn_method_suggeststore_is_dismissed_by_suggestion
             FfiConverterTypeSuggestStore.lowerReceiver(this),
             FfiConverterTypeSuggestion.lower(suggestion),
         )
@@ -4587,7 +4587,7 @@ export class SuggestStore extends SuggestStoreInterface {
        
         FfiConverterTypeSuggestionQuery.checkType(query);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            100, // uniffi_suggest_fn_method_suggeststore_query
+            106, // uniffi_suggest_fn_method_suggeststore_query
             FfiConverterTypeSuggestStore.lowerReceiver(this),
             FfiConverterTypeSuggestionQuery.lower(query),
         )
@@ -4608,7 +4608,7 @@ export class SuggestStore extends SuggestStoreInterface {
        
         FfiConverterTypeSuggestionQuery.checkType(query);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            101, // uniffi_suggest_fn_method_suggeststore_query_with_metrics
+            107, // uniffi_suggest_fn_method_suggeststore_query_with_metrics
             FfiConverterTypeSuggestStore.lowerReceiver(this),
             FfiConverterTypeSuggestionQuery.lower(query),
         )
@@ -4772,7 +4772,7 @@ export class SuggestStoreBuilder extends SuggestStoreBuilderInterface {
     static init() {
        
         const result = UniFFIScaffolding.callSync(
-            102, // uniffi_suggest_fn_constructor_suggeststorebuilder_new
+            108, // uniffi_suggest_fn_constructor_suggeststorebuilder_new
         )
         return handleRustResult(
             result,
@@ -4788,7 +4788,7 @@ export class SuggestStoreBuilder extends SuggestStoreBuilderInterface {
     build() {
        
         const result = UniFFIScaffolding.callSync(
-            103, // uniffi_suggest_fn_method_suggeststorebuilder_build
+            109, // uniffi_suggest_fn_method_suggeststorebuilder_build
             FfiConverterTypeSuggestStoreBuilder.lowerReceiver(this),
         )
         return handleRustResult(
@@ -4808,7 +4808,7 @@ export class SuggestStoreBuilder extends SuggestStoreBuilderInterface {
        
         FfiConverterString.checkType(path);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            104, // uniffi_suggest_fn_method_suggeststorebuilder_cache_path
+            110, // uniffi_suggest_fn_method_suggeststorebuilder_cache_path
             FfiConverterTypeSuggestStoreBuilder.lowerReceiver(this),
             FfiConverterString.lower(path),
         )
@@ -4829,7 +4829,7 @@ export class SuggestStoreBuilder extends SuggestStoreBuilderInterface {
        
         FfiConverterString.checkType(path);
         const result = UniFFIScaffolding.callSync(
-            105, // uniffi_suggest_fn_method_suggeststorebuilder_data_path
+            111, // uniffi_suggest_fn_method_suggeststorebuilder_data_path
             FfiConverterTypeSuggestStoreBuilder.lowerReceiver(this),
             FfiConverterString.lower(path),
         )
@@ -4857,7 +4857,7 @@ export class SuggestStoreBuilder extends SuggestStoreBuilderInterface {
         FfiConverterString.checkType(library);
         FfiConverterOptionalString.checkType(entryPoint);
         const result = UniFFIScaffolding.callSync(
-            106, // uniffi_suggest_fn_method_suggeststorebuilder_load_extension
+            112, // uniffi_suggest_fn_method_suggeststorebuilder_load_extension
             FfiConverterTypeSuggestStoreBuilder.lowerReceiver(this),
             FfiConverterString.lower(library),
             FfiConverterOptionalString.lower(entryPoint),
@@ -4879,7 +4879,7 @@ export class SuggestStoreBuilder extends SuggestStoreBuilderInterface {
        
         FfiConverterString.checkType(bucketName);
         const result = UniFFIScaffolding.callSync(
-            107, // uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_bucket_name
+            113, // uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_bucket_name
             FfiConverterTypeSuggestStoreBuilder.lowerReceiver(this),
             FfiConverterString.lower(bucketName),
         )
@@ -4900,7 +4900,7 @@ export class SuggestStoreBuilder extends SuggestStoreBuilderInterface {
        
         FfiConverterTypeRemoteSettingsServer.checkType(server);
         const result = UniFFIScaffolding.callSync(
-            108, // uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_server
+            114, // uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_server
             FfiConverterTypeSuggestStoreBuilder.lowerReceiver(this),
             FfiConverterTypeRemoteSettingsServer.lower(server),
         )
@@ -4921,7 +4921,7 @@ export class SuggestStoreBuilder extends SuggestStoreBuilderInterface {
        
         FfiConverterTypeRemoteSettingsService.checkType(rsService);
         const result = UniFFIScaffolding.callSync(
-            109, // uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_service
+            115, // uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_service
             FfiConverterTypeSuggestStoreBuilder.lowerReceiver(this),
             FfiConverterTypeRemoteSettingsService.lower(rsService),
         )
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs
index 2b64be9b532b3..885a7c5e9d2d2 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTabs.sys.mjs
@@ -1765,7 +1765,7 @@ export class RemoteCommandStore extends RemoteCommandStoreInterface {
         FfiConverterString.checkType(deviceId);
         FfiConverterTypeRemoteCommand.checkType(command);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            110, // uniffi_tabs_fn_method_remotecommandstore_add_remote_command
+            116, // uniffi_tabs_fn_method_remotecommandstore_add_remote_command
             FfiConverterTypeRemoteCommandStore.lowerReceiver(this),
             FfiConverterString.lower(deviceId),
             FfiConverterTypeRemoteCommand.lower(command),
@@ -1793,7 +1793,7 @@ export class RemoteCommandStore extends RemoteCommandStoreInterface {
         FfiConverterTypeRemoteCommand.checkType(command);
         FfiConverterTypeTimestamp.checkType(when);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            111, // uniffi_tabs_fn_method_remotecommandstore_add_remote_command_at
+            117, // uniffi_tabs_fn_method_remotecommandstore_add_remote_command_at
             FfiConverterTypeRemoteCommandStore.lowerReceiver(this),
             FfiConverterString.lower(deviceId),
             FfiConverterTypeRemoteCommand.lower(command),
@@ -1813,7 +1813,7 @@ export class RemoteCommandStore extends RemoteCommandStoreInterface {
     async getUnsentCommands() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            112, // uniffi_tabs_fn_method_remotecommandstore_get_unsent_commands
+            118, // uniffi_tabs_fn_method_remotecommandstore_get_unsent_commands
             FfiConverterTypeRemoteCommandStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -1837,7 +1837,7 @@ export class RemoteCommandStore extends RemoteCommandStoreInterface {
         FfiConverterString.checkType(deviceId);
         FfiConverterTypeRemoteCommand.checkType(command);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            113, // uniffi_tabs_fn_method_remotecommandstore_remove_remote_command
+            119, // uniffi_tabs_fn_method_remotecommandstore_remove_remote_command
             FfiConverterTypeRemoteCommandStore.lowerReceiver(this),
             FfiConverterString.lower(deviceId),
             FfiConverterTypeRemoteCommand.lower(command),
@@ -1859,7 +1859,7 @@ export class RemoteCommandStore extends RemoteCommandStoreInterface {
        
         FfiConverterTypePendingCommand.checkType(command);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            114, // uniffi_tabs_fn_method_remotecommandstore_set_pending_command_sent
+            120, // uniffi_tabs_fn_method_remotecommandstore_set_pending_command_sent
             FfiConverterTypeRemoteCommandStore.lowerReceiver(this),
             FfiConverterTypePendingCommand.lower(command),
         )
@@ -2081,7 +2081,7 @@ export class TabsBridgedEngine extends TabsBridgedEngineInterface {
     async apply() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            115, // uniffi_tabs_fn_method_tabsbridgedengine_apply
+            121, // uniffi_tabs_fn_method_tabsbridgedengine_apply
             FfiConverterTypeTabsBridgedEngine.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2101,7 +2101,7 @@ export class TabsBridgedEngine extends TabsBridgedEngineInterface {
        
         FfiConverterString.checkType(newSyncId);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            116, // uniffi_tabs_fn_method_tabsbridgedengine_ensure_current_sync_id
+            122, // uniffi_tabs_fn_method_tabsbridgedengine_ensure_current_sync_id
             FfiConverterTypeTabsBridgedEngine.lowerReceiver(this),
             FfiConverterString.lower(newSyncId),
         )
@@ -2119,7 +2119,7 @@ export class TabsBridgedEngine extends TabsBridgedEngineInterface {
     async lastSync() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            117, // uniffi_tabs_fn_method_tabsbridgedengine_last_sync
+            123, // uniffi_tabs_fn_method_tabsbridgedengine_last_sync
             FfiConverterTypeTabsBridgedEngine.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2138,7 +2138,7 @@ export class TabsBridgedEngine extends TabsBridgedEngineInterface {
        
         FfiConverterString.checkType(clientData);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            118, // uniffi_tabs_fn_method_tabsbridgedengine_prepare_for_sync
+            124, // uniffi_tabs_fn_method_tabsbridgedengine_prepare_for_sync
             FfiConverterTypeTabsBridgedEngine.lowerReceiver(this),
             FfiConverterString.lower(clientData),
         )
@@ -2155,7 +2155,7 @@ export class TabsBridgedEngine extends TabsBridgedEngineInterface {
     async reset() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            119, // uniffi_tabs_fn_method_tabsbridgedengine_reset
+            125, // uniffi_tabs_fn_method_tabsbridgedengine_reset
             FfiConverterTypeTabsBridgedEngine.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2172,7 +2172,7 @@ export class TabsBridgedEngine extends TabsBridgedEngineInterface {
     async resetSyncId() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            120, // uniffi_tabs_fn_method_tabsbridgedengine_reset_sync_id
+            126, // uniffi_tabs_fn_method_tabsbridgedengine_reset_sync_id
             FfiConverterTypeTabsBridgedEngine.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2191,7 +2191,7 @@ export class TabsBridgedEngine extends TabsBridgedEngineInterface {
        
         FfiConverterInt64.checkType(lastSync);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            121, // uniffi_tabs_fn_method_tabsbridgedengine_set_last_sync
+            127, // uniffi_tabs_fn_method_tabsbridgedengine_set_last_sync
             FfiConverterTypeTabsBridgedEngine.lowerReceiver(this),
             FfiConverterInt64.lower(lastSync),
         )
@@ -2214,7 +2214,7 @@ export class TabsBridgedEngine extends TabsBridgedEngineInterface {
         FfiConverterInt64.checkType(newTimestamp);
         FfiConverterSequenceTypeTabsGuid.checkType(uploadedIds);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            122, // uniffi_tabs_fn_method_tabsbridgedengine_set_uploaded
+            128, // uniffi_tabs_fn_method_tabsbridgedengine_set_uploaded
             FfiConverterTypeTabsBridgedEngine.lowerReceiver(this),
             FfiConverterInt64.lower(newTimestamp),
             FfiConverterSequenceTypeTabsGuid.lower(uploadedIds),
@@ -2235,7 +2235,7 @@ export class TabsBridgedEngine extends TabsBridgedEngineInterface {
        
         FfiConverterSequenceString.checkType(incomingEnvelopesAsJson);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            123, // uniffi_tabs_fn_method_tabsbridgedengine_store_incoming
+            129, // uniffi_tabs_fn_method_tabsbridgedengine_store_incoming
             FfiConverterTypeTabsBridgedEngine.lowerReceiver(this),
             FfiConverterSequenceString.lower(incomingEnvelopesAsJson),
         )
@@ -2252,7 +2252,7 @@ export class TabsBridgedEngine extends TabsBridgedEngineInterface {
     async syncFinished() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            124, // uniffi_tabs_fn_method_tabsbridgedengine_sync_finished
+            130, // uniffi_tabs_fn_method_tabsbridgedengine_sync_finished
             FfiConverterTypeTabsBridgedEngine.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2269,7 +2269,7 @@ export class TabsBridgedEngine extends TabsBridgedEngineInterface {
     async syncId() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            125, // uniffi_tabs_fn_method_tabsbridgedengine_sync_id
+            131, // uniffi_tabs_fn_method_tabsbridgedengine_sync_id
             FfiConverterTypeTabsBridgedEngine.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2285,7 +2285,7 @@ export class TabsBridgedEngine extends TabsBridgedEngineInterface {
     async syncStarted() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            126, // uniffi_tabs_fn_method_tabsbridgedengine_sync_started
+            132, // uniffi_tabs_fn_method_tabsbridgedengine_sync_started
             FfiConverterTypeTabsBridgedEngine.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2301,7 +2301,7 @@ export class TabsBridgedEngine extends TabsBridgedEngineInterface {
     async wipe() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            127, // uniffi_tabs_fn_method_tabsbridgedengine_wipe
+            133, // uniffi_tabs_fn_method_tabsbridgedengine_wipe
             FfiConverterTypeTabsBridgedEngine.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2474,7 +2474,7 @@ export class TabsStore extends TabsStoreInterface {
        
         FfiConverterString.checkType(path);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            128, // uniffi_tabs_fn_constructor_tabsstore_new
+            134, // uniffi_tabs_fn_constructor_tabsstore_new
             FfiConverterString.lower(path),
         )
         return handleRustResult(
@@ -2491,7 +2491,7 @@ export class TabsStore extends TabsStoreInterface {
     async bridgedEngine() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            129, // uniffi_tabs_fn_method_tabsstore_bridged_engine
+            135, // uniffi_tabs_fn_method_tabsstore_bridged_engine
             FfiConverterTypeTabsStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2507,7 +2507,7 @@ export class TabsStore extends TabsStoreInterface {
     async closeConnection() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            130, // uniffi_tabs_fn_method_tabsstore_close_connection
+            136, // uniffi_tabs_fn_method_tabsstore_close_connection
             FfiConverterTypeTabsStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2524,7 +2524,7 @@ export class TabsStore extends TabsStoreInterface {
     async getAll() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            131, // uniffi_tabs_fn_method_tabsstore_get_all
+            137, // uniffi_tabs_fn_method_tabsstore_get_all
             FfiConverterTypeTabsStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2541,7 +2541,7 @@ export class TabsStore extends TabsStoreInterface {
     async newRemoteCommandStore() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            132, // uniffi_tabs_fn_method_tabsstore_new_remote_command_store
+            138, // uniffi_tabs_fn_method_tabsstore_new_remote_command_store
             FfiConverterTypeTabsStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2557,7 +2557,7 @@ export class TabsStore extends TabsStoreInterface {
     async registerWithSyncManager() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            133, // uniffi_tabs_fn_method_tabsstore_register_with_sync_manager
+            139, // uniffi_tabs_fn_method_tabsstore_register_with_sync_manager
             FfiConverterTypeTabsStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2576,7 +2576,7 @@ export class TabsStore extends TabsStoreInterface {
        
         FfiConverterSequenceTypeRemoteTabRecord.checkType(remoteTabs);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            134, // uniffi_tabs_fn_method_tabsstore_set_local_tabs
+            140, // uniffi_tabs_fn_method_tabsstore_set_local_tabs
             FfiConverterTypeTabsStore.lowerReceiver(this),
             FfiConverterSequenceTypeRemoteTabRecord.lower(remoteTabs),
         )
@@ -2596,7 +2596,7 @@ export class TabsStore extends TabsStoreInterface {
        
         FfiConverterTypeLocalTabsInfo.checkType(info);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            135, // uniffi_tabs_fn_method_tabsstore_set_local_tabs_info
+            141, // uniffi_tabs_fn_method_tabsstore_set_local_tabs_info
             FfiConverterTypeTabsStore.lowerReceiver(this),
             FfiConverterTypeLocalTabsInfo.lower(info),
         )
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTracing.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTracing.sys.mjs
index 52c46eeaa22bd..6bd2027e80191 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTracing.sys.mjs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustTracing.sys.mjs
@@ -47,7 +47,7 @@ FfiConverterString.checkType(target);
 FfiConverterTypeTracingLevel.checkType(level);
 FfiConverterTypeEventSink.checkType(sink);
 const result = UniFFIScaffolding.callSync(
-    136, // uniffi_tracing_support_fn_func_register_event_sink
+    142, // uniffi_tracing_support_fn_func_register_event_sink
     FfiConverterString.lower(target),
     FfiConverterTypeTracingLevel.lower(level),
     FfiConverterTypeEventSink.lower(sink),
@@ -71,7 +71,7 @@ export function registerMinLevelEventSink(
 FfiConverterTypeTracingLevel.checkType(level);
 FfiConverterTypeEventSink.checkType(sink);
 const result = UniFFIScaffolding.callSync(
-    137, // uniffi_tracing_support_fn_func_register_min_level_event_sink
+    143, // uniffi_tracing_support_fn_func_register_min_level_event_sink
     FfiConverterTypeTracingLevel.lower(level),
     FfiConverterTypeEventSink.lower(sink),
 )
@@ -91,7 +91,7 @@ export function unregisterEventSink(
    
 FfiConverterString.checkType(target);
 const result = UniFFIScaffolding.callSync(
-    138, // uniffi_tracing_support_fn_func_unregister_event_sink
+    144, // uniffi_tracing_support_fn_func_unregister_event_sink
     FfiConverterString.lower(target),
 )
 return handleRustResult(
@@ -107,7 +107,7 @@ return handleRustResult(
 export function unregisterMinLevelEventSink() {
    
 const result = UniFFIScaffolding.callSync(
-    139, // uniffi_tracing_support_fn_func_unregister_min_level_event_sink
+    145, // uniffi_tracing_support_fn_func_unregister_min_level_event_sink
 )
 return handleRustResult(
     result,
@@ -427,7 +427,7 @@ export class FfiConverterTypeEventSink extends FfiConverter {
     }
 
     static lift(handleId) {
-        return uniffiCallbackHandlerTracingEventSink.getCallbackObj(handleId)
+        return uniffiCallbackHandlerTracingEventSink.takeCallbackObj(handleId)
     }
 
     static read(dataStream) {
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustViaduct.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustViaduct.sys.mjs
index c96a40ff7c578..5c9c53a0c3e21 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustViaduct.sys.mjs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustViaduct.sys.mjs
@@ -38,7 +38,7 @@ export var UnitTestObjs = {
 export function allowAndroidEmulatorLoopback() {
    
 const result = UniFFIScaffolding.callSync(
-    140, // uniffi_viaduct_fn_func_allow_android_emulator_loopback
+    146, // uniffi_viaduct_fn_func_allow_android_emulator_loopback
 )
 return handleRustResult(
     result,
@@ -56,7 +56,7 @@ export function initBackend(
    
 FfiConverterTypeBackend.checkType(backend);
 const result = UniFFIScaffolding.callSync(
-    141, // uniffi_viaduct_fn_func_init_backend
+    147, // uniffi_viaduct_fn_func_init_backend
     FfiConverterTypeBackend.lower(backend),
 )
 return handleRustResult(
@@ -66,9 +66,69 @@ return handleRustResult(
 )
 }
 
+/**
+ * Set the global default user-agent
+ * 
+ * This is what's used when no user-agent is set in the `ClientSettings` and no `user-agent`
+ * header is set in the Request.
+ * @param {string} userAgent
+ */
+export function setGlobalDefaultUserAgent(
+    userAgent) {
+   
+FfiConverterString.checkType(userAgent);
+const result = UniFFIScaffolding.callSync(
+    148, // uniffi_viaduct_fn_func_set_global_default_user_agent
+    FfiConverterString.lower(userAgent),
+)
+return handleRustResult(
+    result,
+    (result) => undefined,
+    null,
+)
+}
+
+
+
+
+
 
+// Export the FFIConverter object to make external types work.
+export class FfiConverterOptionalString extends FfiConverterArrayBuffer {
+    static checkType(value) {
+        if (value !== undefined && value !== null) {
+            FfiConverterString.checkType(value)
+        }
+    }
+
+    static read(dataStream) {
+        const code = dataStream.readUint8(0);
+        switch (code) {
+            case 0:
+                return null
+            case 1:
+                return FfiConverterString.read(dataStream)
+            default:
+                throw new UniFFIError(`Unexpected code: ${code}`);
+        }
+    }
 
+    static write(dataStream, value) {
+        if (value === null || value === undefined) {
+            dataStream.writeUint8(0);
+            return;
+        }
+        dataStream.writeUint8(1);
+        FfiConverterString.write(dataStream, value)
+    }
 
+    static computeSize(value) {
+        if (value === null || value === undefined) {
+            return 1;
+        }
+        return 1 + FfiConverterString.computeSize(value)
+    }
+}
 /**
  * ClientSettings
  */
@@ -76,10 +136,12 @@ export class ClientSettings {
     constructor(
         {
             timeout= 0, 
-            redirectLimit= 10
+            redirectLimit= 10, 
+            userAgent= null
         } = {
             timeout: undefined, 
-            redirectLimit: undefined
+            redirectLimit: undefined, 
+            userAgent: undefined
         }
     ) {
         try {
@@ -98,20 +160,36 @@ export class ClientSettings {
             }
             throw e;
         }
+        try {
+            FfiConverterOptionalString.checkType(userAgent)
+        } catch (e) {
+            if (e instanceof UniFFITypeError) {
+                e.addItemDescriptionPart("userAgent");
+            }
+            throw e;
+        }
         /**
-         * timeout
+         * Timeout for the entire request in ms (0 indicates no timeout).
          */
         this.timeout = timeout;
         /**
-         * redirectLimit
+         * Maximum amount of redirects to follow (0 means redirects are not allowed)
          */
         this.redirectLimit = redirectLimit;
+        /**
+         * Client default user-agent.
+         * 
+         * This overrides the global default user-agent and is used when no `User-agent` header is set
+         * directly in the Request.
+         */
+        this.userAgent = userAgent;
     }
 
     equals(other) {
         return (
             this.timeout == other.timeout
             && this.redirectLimit == other.redirectLimit
+            && this.userAgent == other.userAgent
         )
     }
 }
@@ -122,17 +200,20 @@ export class FfiConverterTypeClientSettings extends FfiConverterArrayBuffer {
         return new ClientSettings({
             timeout: FfiConverterUInt32.read(dataStream),
             redirectLimit: FfiConverterUInt32.read(dataStream),
+            userAgent: FfiConverterOptionalString.read(dataStream),
         });
     }
     static write(dataStream, value) {
         FfiConverterUInt32.write(dataStream, value.timeout);
         FfiConverterUInt32.write(dataStream, value.redirectLimit);
+        FfiConverterOptionalString.write(dataStream, value.userAgent);
     }
 
     static computeSize(value) {
         let totalSize = 0;
         totalSize += FfiConverterUInt32.computeSize(value.timeout);
         totalSize += FfiConverterUInt32.computeSize(value.redirectLimit);
+        totalSize += FfiConverterOptionalString.computeSize(value.userAgent);
         return totalSize
     }
 
@@ -157,6 +238,14 @@ export class FfiConverterTypeClientSettings extends FfiConverterArrayBuffer {
             }
             throw e;
         }
+        try {
+            FfiConverterOptionalString.checkType(value.userAgent);
+        } catch (e) {
+            if (e instanceof UniFFITypeError) {
+                e.addItemDescriptionPart(".userAgent");
+            }
+            throw e;
+        }
     }
 }
 
@@ -287,8 +376,6 @@ export class FfiConverterTypeMethod extends FfiConverterArrayBuffer {
       }
     }
 }
-
-
 export class FfiConverterTypeViaductUrl extends FfiConverter {
     static lift(value) {
         return FfiConverterString.lift(value);
@@ -1199,7 +1286,7 @@ export class BackendImpl extends Backend {
         FfiConverterTypeRequest.checkType(request);
         FfiConverterTypeClientSettings.checkType(settings);
         const result = await UniFFIScaffolding.callAsync(
-            142, // uniffi_viaduct_fn_method_backend_send_request
+            149, // uniffi_viaduct_fn_method_backend_send_request
             FfiConverterTypeBackend.lowerReceiver(this),
             FfiConverterTypeRequest.lower(request),
             FfiConverterTypeClientSettings.lower(settings),
@@ -1218,19 +1305,30 @@ export class BackendImpl extends Backend {
 //
 // Export the FFIConverter object to make external types work.
 export class FfiConverterTypeBackend extends FfiConverter {
-    // lift works like a regular interface
-    static lift(value) {
-        const opts = {};
-        opts[constructUniffiObject] = value;
-        return new BackendImpl(opts);
+    static lift(handle) {
+        if (handle instanceof UniFFIPointer) {
+          // Rust handle.  Construct an object from it
+          const opts = {};
+          opts[constructUniffiObject] = handle;
+          return new BackendImpl(opts);
+        } else {
+          // JS handle.  Get the JS object from the callback handler
+          return uniffiCallbackHandlerViaductBackend.takeCallbackObj(handle)
+        }
     }
 
-    // lower treats value like a callback interface
     static lower(value) {
-        if (!(value instanceof Backend)) {
-            throw new UniFFITypeError("expected 'Backend' subclass");
+        const ptr = value[uniffiObjectPtr];
+        if (ptr instanceof UniFFIPointer) {
+          // Rust-implemented interface, return the ptr.  The C++ code will clone it.
+          return ptr;
+        } else {
+          // JS-implemented interface, store the object in the handle map and return the handle
+          if (!(value instanceof Backend)) {
+              throw new UniFFITypeError("expected 'Backend' subclass");
+          }
+          return uniffiCallbackHandlerViaductBackend.storeCallbackObj(value)
         }
-        return uniffiCallbackHandlerViaductBackend.storeCallbackObj(value)
     }
 
     // lowerReceiver is used when calling methods on an interface we got from Rust, 
@@ -1244,11 +1342,16 @@ export class FfiConverterTypeBackend extends FfiConverter {
     }
 
     static read(dataStream) {
-        return this.lift(dataStream.readPointer(20));
+        return this.lift(dataStream.readHandleOrPointer(20))
     }
 
     static write(dataStream, value) {
-        dataStream.writePointer(20, this.lower(value));
+        if (value[uniffiObjectPtr] instanceof UniFFIPointer) {
+          // Rust-implemented interface, return the ptr.
+          dataStream.writePointer(20, this.lower(value));
+        } else {
+          dataStream.writeInt64(this.lower(value))
+        }
     }
 
     static computeSize(value) {
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs
index 9bc2cebb35ac3..a15e19b973e7e 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/components/generated/RustWebextstorage.sys.mjs
@@ -877,7 +877,7 @@ export class WebExtStorageBridgedEngine extends WebExtStorageBridgedEngineInterf
     async apply() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            143, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_apply
+            150, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_apply
             FfiConverterTypeWebExtStorageBridgedEngine.lowerReceiver(this),
         )
         return handleRustResult(
@@ -897,7 +897,7 @@ export class WebExtStorageBridgedEngine extends WebExtStorageBridgedEngineInterf
        
         FfiConverterString.checkType(newSyncId);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            144, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_ensure_current_sync_id
+            151, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_ensure_current_sync_id
             FfiConverterTypeWebExtStorageBridgedEngine.lowerReceiver(this),
             FfiConverterString.lower(newSyncId),
         )
@@ -915,7 +915,7 @@ export class WebExtStorageBridgedEngine extends WebExtStorageBridgedEngineInterf
     async lastSync() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            145, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_last_sync
+            152, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_last_sync
             FfiConverterTypeWebExtStorageBridgedEngine.lowerReceiver(this),
         )
         return handleRustResult(
@@ -934,7 +934,7 @@ export class WebExtStorageBridgedEngine extends WebExtStorageBridgedEngineInterf
        
         FfiConverterString.checkType(clientData);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            146, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_prepare_for_sync
+            153, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_prepare_for_sync
             FfiConverterTypeWebExtStorageBridgedEngine.lowerReceiver(this),
             FfiConverterString.lower(clientData),
         )
@@ -951,7 +951,7 @@ export class WebExtStorageBridgedEngine extends WebExtStorageBridgedEngineInterf
     async reset() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            147, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_reset
+            154, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_reset
             FfiConverterTypeWebExtStorageBridgedEngine.lowerReceiver(this),
         )
         return handleRustResult(
@@ -968,7 +968,7 @@ export class WebExtStorageBridgedEngine extends WebExtStorageBridgedEngineInterf
     async resetSyncId() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            148, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_reset_sync_id
+            155, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_reset_sync_id
             FfiConverterTypeWebExtStorageBridgedEngine.lowerReceiver(this),
         )
         return handleRustResult(
@@ -987,7 +987,7 @@ export class WebExtStorageBridgedEngine extends WebExtStorageBridgedEngineInterf
        
         FfiConverterInt64.checkType(lastSync);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            149, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_set_last_sync
+            156, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_set_last_sync
             FfiConverterTypeWebExtStorageBridgedEngine.lowerReceiver(this),
             FfiConverterInt64.lower(lastSync),
         )
@@ -1010,7 +1010,7 @@ export class WebExtStorageBridgedEngine extends WebExtStorageBridgedEngineInterf
         FfiConverterInt64.checkType(serverModifiedMillis);
         FfiConverterSequenceTypeGuid.checkType(guids);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            150, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_set_uploaded
+            157, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_set_uploaded
             FfiConverterTypeWebExtStorageBridgedEngine.lowerReceiver(this),
             FfiConverterInt64.lower(serverModifiedMillis),
             FfiConverterSequenceTypeGuid.lower(guids),
@@ -1031,7 +1031,7 @@ export class WebExtStorageBridgedEngine extends WebExtStorageBridgedEngineInterf
        
         FfiConverterSequenceString.checkType(incoming);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            151, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_store_incoming
+            158, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_store_incoming
             FfiConverterTypeWebExtStorageBridgedEngine.lowerReceiver(this),
             FfiConverterSequenceString.lower(incoming),
         )
@@ -1048,7 +1048,7 @@ export class WebExtStorageBridgedEngine extends WebExtStorageBridgedEngineInterf
     async syncFinished() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            152, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_finished
+            159, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_finished
             FfiConverterTypeWebExtStorageBridgedEngine.lowerReceiver(this),
         )
         return handleRustResult(
@@ -1065,7 +1065,7 @@ export class WebExtStorageBridgedEngine extends WebExtStorageBridgedEngineInterf
     async syncId() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            153, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_id
+            160, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_id
             FfiConverterTypeWebExtStorageBridgedEngine.lowerReceiver(this),
         )
         return handleRustResult(
@@ -1081,7 +1081,7 @@ export class WebExtStorageBridgedEngine extends WebExtStorageBridgedEngineInterf
     async syncStarted() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            154, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_started
+            161, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_started
             FfiConverterTypeWebExtStorageBridgedEngine.lowerReceiver(this),
         )
         return handleRustResult(
@@ -1097,7 +1097,7 @@ export class WebExtStorageBridgedEngine extends WebExtStorageBridgedEngineInterf
     async wipe() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            155, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_wipe
+            162, // uniffi_webext_storage_fn_method_webextstoragebridgedengine_wipe
             FfiConverterTypeWebExtStorageBridgedEngine.lowerReceiver(this),
         )
         return handleRustResult(
@@ -1305,7 +1305,7 @@ export class WebExtStorageStore extends WebExtStorageStoreInterface {
        
         FfiConverterString.checkType(path);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            156, // uniffi_webext_storage_fn_constructor_webextstoragestore_new
+            163, // uniffi_webext_storage_fn_constructor_webextstoragestore_new
             FfiConverterString.lower(path),
         )
         return handleRustResult(
@@ -1322,7 +1322,7 @@ export class WebExtStorageStore extends WebExtStorageStoreInterface {
     async bridgedEngine() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            157, // uniffi_webext_storage_fn_method_webextstoragestore_bridged_engine
+            164, // uniffi_webext_storage_fn_method_webextstoragestore_bridged_engine
             FfiConverterTypeWebExtStorageStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -1342,7 +1342,7 @@ export class WebExtStorageStore extends WebExtStorageStoreInterface {
        
         FfiConverterString.checkType(extId);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            158, // uniffi_webext_storage_fn_method_webextstoragestore_clear
+            165, // uniffi_webext_storage_fn_method_webextstoragestore_clear
             FfiConverterTypeWebExtStorageStore.lowerReceiver(this),
             FfiConverterString.lower(extId),
         )
@@ -1359,7 +1359,7 @@ export class WebExtStorageStore extends WebExtStorageStoreInterface {
     async close() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            159, // uniffi_webext_storage_fn_method_webextstoragestore_close
+            166, // uniffi_webext_storage_fn_method_webextstoragestore_close
             FfiConverterTypeWebExtStorageStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -1382,7 +1382,7 @@ export class WebExtStorageStore extends WebExtStorageStoreInterface {
         FfiConverterString.checkType(extId);
         FfiConverterTypeJsonValue.checkType(keys);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            160, // uniffi_webext_storage_fn_method_webextstoragestore_get
+            167, // uniffi_webext_storage_fn_method_webextstoragestore_get
             FfiConverterTypeWebExtStorageStore.lowerReceiver(this),
             FfiConverterString.lower(extId),
             FfiConverterTypeJsonValue.lower(keys),
@@ -1407,7 +1407,7 @@ export class WebExtStorageStore extends WebExtStorageStoreInterface {
         FfiConverterString.checkType(extId);
         FfiConverterTypeJsonValue.checkType(keys);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            161, // uniffi_webext_storage_fn_method_webextstoragestore_get_bytes_in_use
+            168, // uniffi_webext_storage_fn_method_webextstoragestore_get_bytes_in_use
             FfiConverterTypeWebExtStorageStore.lowerReceiver(this),
             FfiConverterString.lower(extId),
             FfiConverterTypeJsonValue.lower(keys),
@@ -1429,7 +1429,7 @@ export class WebExtStorageStore extends WebExtStorageStoreInterface {
        
         FfiConverterString.checkType(extId);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            162, // uniffi_webext_storage_fn_method_webextstoragestore_get_keys
+            169, // uniffi_webext_storage_fn_method_webextstoragestore_get_keys
             FfiConverterTypeWebExtStorageStore.lowerReceiver(this),
             FfiConverterString.lower(extId),
         )
@@ -1447,7 +1447,7 @@ export class WebExtStorageStore extends WebExtStorageStoreInterface {
     async getSyncedChanges() {
        
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            163, // uniffi_webext_storage_fn_method_webextstoragestore_get_synced_changes
+            170, // uniffi_webext_storage_fn_method_webextstoragestore_get_synced_changes
             FfiConverterTypeWebExtStorageStore.lowerReceiver(this),
         )
         return handleRustResult(
@@ -1470,7 +1470,7 @@ export class WebExtStorageStore extends WebExtStorageStoreInterface {
         FfiConverterString.checkType(extId);
         FfiConverterTypeJsonValue.checkType(keys);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            164, // uniffi_webext_storage_fn_method_webextstoragestore_remove
+            171, // uniffi_webext_storage_fn_method_webextstoragestore_remove
             FfiConverterTypeWebExtStorageStore.lowerReceiver(this),
             FfiConverterString.lower(extId),
             FfiConverterTypeJsonValue.lower(keys),
@@ -1495,7 +1495,7 @@ export class WebExtStorageStore extends WebExtStorageStoreInterface {
         FfiConverterString.checkType(extId);
         FfiConverterTypeJsonValue.checkType(val);
         const result = await UniFFIScaffolding.callAsyncWrapper(
-            165, // uniffi_webext_storage_fn_method_webextstoragestore_set
+            172, // uniffi_webext_storage_fn_method_webextstoragestore_set
             FfiConverterTypeWebExtStorageStore.lowerReceiver(this),
             FfiConverterString.lower(extId),
             FfiConverterTypeJsonValue.lower(val),
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/config.toml b/toolkit/components/uniffi-bindgen-gecko-js/config.toml
index c6680d21d8ceb..d7f9bb7cdc624 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/config.toml
+++ b/toolkit/components/uniffi-bindgen-gecko-js/config.toml
@@ -72,6 +72,7 @@ TabsStore = "AsyncWrapped"
 [viaduct.async_wrappers]
 "allow_android_emulator_loopback" = "Sync"
 "init_backend" = "Sync"
+set_global_default_user_agent = "Sync"
 
 [webext_storage.async_wrappers]
 WebExtStorageBridgedEngine = "AsyncWrapped"
@@ -101,6 +102,8 @@ WebExtStorageStore = "AsyncWrapped"
 "invoke_test_trait_interface_noop" = "Sync"
 "invoke_test_trait_interface_set_value" = "Sync"
 "invoke_test_trait_interface_throw_if_equal" = "Sync"
+"roundtrip_async_test_trait_interface" = "Sync"
+"roundtrip_async_test_trait_interface_list" = "Sync"
 "roundtrip_bool" = "Sync"
 "roundtrip_complex_compound" = "Sync"
 "roundtrip_complex_enum" = "Sync"
@@ -121,6 +124,8 @@ WebExtStorageStore = "AsyncWrapped"
 "roundtrip_time_interval_ms" = "AsyncWrapped"
 "roundtrip_time_interval_sec_dbl" = "AsyncWrapped"
 "roundtrip_time_interval_sec_flt" = "AsyncWrapped"
+"roundtrip_test_trait_interface" = "Sync"
+"roundtrip_test_trait_interface_list" = "Sync"
 "roundtrip_u16" = "Sync"
 "roundtrip_u32" = "Sync"
 "roundtrip_u64" = "Sync"
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/bindgen_paths.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/bindgen_paths.rs
new file mode 100644
index 0000000000000..41b286491b0ff
--- /dev/null
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/bindgen_paths.rs
@@ -0,0 +1,22 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use anyhow::Result;
+use uniffi_bindgen::{BindgenPaths, BindgenPathsLayer};
+
+pub fn gecko_js_bindgen_paths() -> Result<BindgenPaths> {
+    let mut paths = BindgenPaths::default();
+    paths.add_layer(ConfigTomlLayer {});
+    paths.add_cargo_metadata_layer(false)?;
+    Ok(paths)
+}
+
+/// Responsible for identifying our config.toml
+struct ConfigTomlLayer {}
+
+impl BindgenPathsLayer for ConfigTomlLayer {
+    fn get_config(&self, _crate_name: &str) -> Result<Option<toml::Table>> {
+        Ok(Some(toml::from_str(include_str!("../config.toml"))?))
+    }
+}
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/config_supplier.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/config_supplier.rs
deleted file mode 100644
index 4a2f1fbc3235f..0000000000000
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/config_supplier.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use anyhow::{anyhow, Context, Result};
-use cargo_metadata::MetadataCommand;
-use toml::{map::Map, value::Table, Value};
-use uniffi_bindgen::{cargo_metadata::CrateConfigSupplier, BindgenCrateConfigSupplier};
-
-/// Responsible for finding UDL files and config values for crates
-pub struct GeckoJsCrateConfigSupplier {
-    // Used to lookup the UDL files
-    cargo_crate_config_supplier: CrateConfigSupplier,
-    // Used to get config values
-    config_table: Map<String, Value>,
-}
-
-impl GeckoJsCrateConfigSupplier {
-    pub fn new() -> Result<Self> {
-        Ok(Self {
-            cargo_crate_config_supplier: MetadataCommand::new()
-                .exec()
-                .context("error running cargo metadata")?
-                .into(),
-            config_table: toml::from_str(include_str!("../config.toml"))?,
-        })
-    }
-}
-
-impl BindgenCrateConfigSupplier for &GeckoJsCrateConfigSupplier {
-    fn get_udl(&self, crate_name: &str, udl_name: &str) -> Result<String> {
-        self.cargo_crate_config_supplier
-            .get_udl(crate_name, udl_name)
-    }
-
-    fn get_toml(&self, crate_name: &str) -> Result<Option<Table>> {
-        self.config_table
-            .get(crate_name)
-            .map(|v| {
-                v.as_table()
-                    .ok_or_else(|| anyhow!("Config value not table"))
-                    .cloned()
-            })
-            .transpose()
-    }
-}
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/lib.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/lib.rs
index c236de9bc61b2..55ae050b25f36 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/lib.rs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/lib.rs
@@ -14,10 +14,10 @@ use serde::{Deserialize, Serialize};
 use uniffi_bindgen::pipeline::initial;
 use uniffi_pipeline::PrintOptions;
 
-mod config_supplier;
+mod bindgen_paths;
 pub mod pipeline;
 
-use config_supplier::GeckoJsCrateConfigSupplier;
+use bindgen_paths::gecko_js_bindgen_paths;
 use pipeline::{gecko_js_pipeline, GeckoPipeline};
 use uniffi_pipeline::Node;
 
@@ -156,13 +156,13 @@ fn run_generate(
 ) -> Result<()> {
     let root = pipeline.execute(root)?;
     render(&args.cpp_path, root.cpp_scaffolding)?;
-    for module in root.modules.values() {
-        let dir = if module.fixture {
+    for namespace in root.namespaces.values() {
+        let dir = if namespace.fixture {
             &args.fixture_js_dir
         } else {
             &args.js_dir
         };
-        render(&dir.join(&module.js_filename), module)?;
+        render(&dir.join(&namespace.js_filename), namespace)?;
     }
     for entry in fs::read_dir(&args.docs_path)? {
         let path = entry?.path();
@@ -194,15 +194,14 @@ fn root_and_pipeline(
     library_path: Utf8PathBuf,
     fixtures_library_path: Utf8PathBuf,
 ) -> Result<(initial::Root, GeckoPipeline)> {
-    let config_supplier = GeckoJsCrateConfigSupplier::new()?;
-    let root = initial::Root::from_library(&config_supplier, &library_path, None)?;
+    let root = initial::Root::from_library(gecko_js_bindgen_paths()?, &library_path, None)?;
     let fixtures_root =
-        initial::Root::from_library(&config_supplier, &fixtures_library_path, None)?;
+        initial::Root::from_library(gecko_js_bindgen_paths()?, &fixtures_library_path, None)?;
     let root = initial::Root {
-        modules: root
-            .modules
+        namespaces: root
+            .namespaces
             .into_iter()
-            .chain(fixtures_root.modules)
+            .chain(fixtures_root.namespaces)
             .collect(),
         cdylib: None,
     };
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/callables.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/callables.rs
index 347407603ae38..ef891ab191986 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/callables.rs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/callables.rs
@@ -7,10 +7,10 @@ use crate::ConcurrencyMode;
 
 use anyhow::{anyhow, bail, Result};
 
-pub fn pass(module: &mut Module) -> Result<()> {
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
     // We have to generate for_callback_interface for now.  In the future, this probably should be
     // done in the general pipeline.
-    module.visit_mut(|cbi: &mut CallbackInterface| {
+    namespace.visit_mut(|cbi: &mut CallbackInterface| {
         cbi.visit_mut(|callable: &mut Callable| {
             if let CallableKind::VTableMethod {
                 for_callback_interface,
@@ -22,29 +22,31 @@ pub fn pass(module: &mut Module) -> Result<()> {
         });
     });
 
-    let async_wrappers = &module.config.async_wrappers;
-    let module_name = &module.name;
+    let async_wrappers = &namespace.config.async_wrappers;
+    let namespace_name = &namespace.name;
 
     // Track unconfigured callables for later reporting
     let mut unconfigured_callables = Vec::new();
 
     // Configure all callables
-    module.functions.try_visit_mut(|callable: &mut Callable| {
-        handle_callable(
-            callable,
-            async_wrappers,
-            &mut unconfigured_callables,
-            module_name,
-        )
-    })?;
-    module
+    namespace
+        .functions
+        .try_visit_mut(|callable: &mut Callable| {
+            handle_callable(
+                callable,
+                async_wrappers,
+                &mut unconfigured_callables,
+                namespace_name,
+            )
+        })?;
+    namespace
         .type_definitions
         .try_visit_mut(|callable: &mut Callable| {
             handle_callable(
                 callable,
                 async_wrappers,
                 &mut unconfigured_callables,
-                module_name,
+                namespace_name,
             )
         })?;
 
@@ -53,7 +55,7 @@ pub fn pass(module: &mut Module) -> Result<()> {
         let mut message = format!(
             "Found {} callables in module '{}' without explicit async/sync configuration in config.toml:\n",
             unconfigured_callables.len(),
-            module_name
+            namespace_name
         );
 
         for (spec, info, _) in &unconfigured_callables {
@@ -63,7 +65,7 @@ pub fn pass(module: &mut Module) -> Result<()> {
         message.push_str(
             "\nPlease add these callables to the `toolkit/components/uniffi-bindgen-gecko-js/config.toml` file with explicit configuration:\n",
         );
-        message.push_str(&format!("[{}.async_wrappers]\n", module.crate_name));
+        message.push_str(&format!("[{}.async_wrappers]\n", namespace.crate_name));
 
         for (spec, _, example) in &unconfigured_callables {
             message.push_str(&format!("\"{spec}\" = {example}\n"));
@@ -85,31 +87,30 @@ fn handle_callable(
     let name = &callable.name;
     let spec = match &callable.kind {
         CallableKind::Function => name.clone(),
-        CallableKind::Method { interface_name, .. }
-        | CallableKind::Constructor { interface_name, .. } => {
+        CallableKind::Method { self_type, .. } | CallableKind::Constructor { self_type, .. } => {
+            let interface_name = self_type.ty.name()?;
             format!("{interface_name}.{name}")
         }
-        CallableKind::VTableMethod { trait_name, .. } => {
+        CallableKind::VTableMethod { self_type, .. } => {
+            let trait_name = self_type.ty.name()?;
             format!("{trait_name}.{name}")
         }
     };
 
     let config = async_wrappers.get(&spec);
     // If the config is not set, check for a parent config
-    let config = config.or_else(|| match &callable.kind {
-        CallableKind::Method {
-            interface_name: parent,
-            ..
-        }
-        | CallableKind::Constructor {
-            interface_name: parent,
-            ..
-        }
-        | CallableKind::VTableMethod {
-            trait_name: parent, ..
-        } => async_wrappers.get(parent),
-        _ => None,
-    });
+    let config = match config {
+        Some(c) => Some(c),
+        None => match &callable.kind {
+            CallableKind::Method { self_type, .. }
+            | CallableKind::Constructor { self_type, .. }
+            | CallableKind::VTableMethod { self_type, .. } => {
+                let parent = self_type.ty.name()?;
+                async_wrappers.get(parent)
+            }
+            _ => None,
+        },
+    };
     // Finally, default to `Async` for async methods
     let config = config.or_else(|| {
         if callable.async_data.is_some() {
@@ -165,17 +166,23 @@ fn handle_callable(
                 CallableKind::Function => {
                     format!("Function '{}' in module '{}'", name, module_name)
                 }
-                CallableKind::Method { interface_name, .. } => format!(
+                CallableKind::Method { self_type, .. } => format!(
                     "Method '{}.{}' in module '{}'",
-                    interface_name, name, module_name
+                    self_type.ty.name()?,
+                    name,
+                    module_name
                 ),
-                CallableKind::Constructor { interface_name, .. } => format!(
+                CallableKind::Constructor { self_type, .. } => format!(
                     "Constructor '{}.{}' in module '{}'",
-                    interface_name, name, module_name
+                    self_type.ty.name()?,
+                    name,
+                    module_name
                 ),
-                CallableKind::VTableMethod { trait_name, .. } => format!(
+                CallableKind::VTableMethod { self_type, .. } => format!(
                     "VTable method '{}.{}' in module '{}'",
-                    trait_name, name, module_name
+                    self_type.ty.name()?,
+                    name,
+                    module_name
                 ),
             };
 
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/callback_interfaces.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/callback_interfaces.rs
index 98aad14b72cdc..da9c44d2f8596 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/callback_interfaces.rs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/callback_interfaces.rs
@@ -6,9 +6,9 @@ use heck::ToUpperCamelCase;
 
 use super::*;
 
-pub fn pass(module: &mut Module) -> Result<()> {
-    let module_name = module.name.clone();
-    module.visit_mut(|cbi: &mut CallbackInterface| {
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
+    let namespace_name = namespace.name.clone();
+    namespace.visit_mut(|cbi: &mut CallbackInterface| {
         cbi.vtable.interface_name = cbi.name.clone();
         cbi.vtable.callback_interface = true;
         cbi.interface_base_class = InterfaceBaseClass {
@@ -33,10 +33,10 @@ pub fn pass(module: &mut Module) -> Result<()> {
         };
     });
     // Set the js_handler_var for both callback interfaces and trait interfaces
-    module.visit_mut(|vtable: &mut VTable| {
+    namespace.visit_mut(|vtable: &mut VTable| {
         vtable.js_handler_var = format!(
             "uniffiCallbackHandler{}{}",
-            module_name.to_upper_camel_case(),
+            namespace_name.to_upper_camel_case(),
             vtable.interface_name.to_upper_camel_case()
         );
     });
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/cpp_callback_interfaces.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/cpp_callback_interfaces.rs
index 344bf0751229e..7b7394baab47b 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/cpp_callback_interfaces.rs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/cpp_callback_interfaces.rs
@@ -11,9 +11,9 @@ use super::*;
 
 pub fn pass(root: &mut Root) -> Result<()> {
     root.cpp_scaffolding.callback_interfaces =
-        CombinedItems::try_new(root, |module, ids, items| {
-            let module_name = module.name.clone();
-            let ffi_func_map: HashMap<String, FfiFunctionType> = module
+        CombinedItems::try_new(root, |namespace, ids, items| {
+            let module_name = namespace.name.clone();
+            let ffi_func_map: HashMap<String, FfiFunctionType> = namespace
                 .ffi_definitions
                 .iter()
                 .filter_map(|def| match def {
@@ -23,7 +23,7 @@ pub fn pass(root: &mut Root) -> Result<()> {
                 .map(|func_type| (func_type.name.0.clone(), func_type.clone()))
                 .collect();
 
-            module.try_visit_mut(|cbi: &mut CallbackInterface| {
+            namespace.try_visit_mut(|cbi: &mut CallbackInterface| {
                 cbi.vtable.callback_interface_id = ids.new_id();
                 items.push(generate_cpp_callback_interface(
                     &module_name,
@@ -33,7 +33,7 @@ pub fn pass(root: &mut Root) -> Result<()> {
                 Ok(())
             })?;
 
-            module.try_visit_mut(|int: &mut Interface| {
+            namespace.try_visit_mut(|int: &mut Interface| {
                 if let Some(vtable) = &mut int.vtable {
                     vtable.callback_interface_id = ids.new_id();
                     items.push(generate_cpp_callback_interface(
@@ -150,9 +150,13 @@ fn generate_cpp_callback_interface(
         name: interface_name.to_string(),
         // Only generate FFI value class for callback interfaces.  For trait
         // interfaces, we're going to generate one `PointerTypes.cpp` instead.
-        ffi_value_class: vtable
-            .callback_interface
-            .then(|| format!("FfiValueCallbackInterface{module_name}_{interface_name}")),
+        ffi_value_class: vtable.callback_interface.then(|| {
+            format!(
+                "FfiValueObjectHandle{}{}",
+                module_name.to_upper_camel_case(),
+                interface_name.to_upper_camel_case()
+            )
+        }),
         handler_var: format!(
             "gUniffiCallbackHandler{}{}",
             module_name.to_upper_camel_case(),
@@ -170,6 +174,11 @@ fn generate_cpp_callback_interface(
             module_name.to_snake_case(),
             interface_name.to_snake_case()
         ),
+        clone_fn: format!(
+            "callback_clone_{}_{}",
+            module_name.to_snake_case(),
+            interface_name.to_snake_case()
+        ),
         methods: vtable
             .methods
             .iter()
@@ -205,21 +214,14 @@ pub fn return_handler_class_name(return_ty: Option<&FfiValueReturnType>) -> Resu
             FfiType::Float32 => "CallbackLowerReturnFloat32".to_string(),
             FfiType::Float64 => "CallbackLowerReturnFloat64".to_string(),
             FfiType::RustBuffer(_) => "CallbackLowerReturnRustBuffer".to_string(),
-            FfiType::RustArcPtr {
-                module_name,
-                object_name,
-            } => {
-                format!(
-                    "CallbackLowerReturnObject{}{}",
-                    module_name.to_upper_camel_case(),
-                    object_name.to_upper_camel_case(),
-                )
-            }
-            FfiType::Handle(HandleKind::CallbackInterface {
-                module_name,
+            FfiType::Handle(HandleKind::TraitInterface {
+                namespace,
                 interface_name,
             }) => {
-                format!("CallbackLowerReturnCallbackInterface{module_name}_{interface_name}")
+                format!("CallbackLowerReturnCallbackInterface{namespace}_{interface_name}")
+            }
+            FfiType::Handle(HandleKind::StructInterface { .. }) => {
+                "CallbackLowerReturnUInt8".to_string()
             }
             ty => bail!("Invalid callback return FFI type: {ty:?}"),
         },
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/cpp_ffi_types.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/cpp_ffi_types.rs
index fd204b115755a..97128dd394623 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/cpp_ffi_types.rs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/cpp_ffi_types.rs
@@ -47,7 +47,6 @@ fn ffi_type_name(ty: &FfiType) -> String {
         FfiType::Float32 => "float".to_owned(),
         FfiType::Float64 => "double".to_owned(),
         FfiType::RustBuffer(_) => "RustBuffer".to_owned(),
-        FfiType::RustArcPtr { .. } => "void*".to_owned(),
         FfiType::ForeignBytes => "ForeignBytes".to_owned(),
         FfiType::Handle(_) => "uint64_t".to_owned(),
         FfiType::RustCallStatus => "RustCallStatus".to_owned(),
@@ -60,18 +59,8 @@ fn ffi_type_name(ty: &FfiType) -> String {
     }
 }
 
-pub fn ffi_value_class(node: &FfiTypeNode) -> Result<String> {
+fn ffi_value_class(node: &FfiTypeNode) -> Result<String> {
     Ok(match &node.ty {
-        FfiType::RustArcPtr {
-            module_name,
-            object_name,
-        } => {
-            format!(
-                "FfiValueObjectHandle{}{}",
-                module_name.to_upper_camel_case(),
-                object_name.to_upper_camel_case(),
-            )
-        }
         FfiType::UInt8
         | FfiType::Int8
         | FfiType::UInt16
@@ -84,11 +73,19 @@ pub fn ffi_value_class(node: &FfiTypeNode) -> Result<String> {
             format!("FfiValueFloat<{}>", node.type_name)
         }
         FfiType::RustBuffer(_) => "FfiValueRustBuffer".to_owned(),
-        FfiType::Handle(HandleKind::CallbackInterface {
-            module_name,
+        FfiType::Handle(HandleKind::StructInterface {
+            namespace,
+            interface_name,
+        })
+        | FfiType::Handle(HandleKind::TraitInterface {
+            namespace,
             interface_name,
         }) => {
-            format!("FfiValueCallbackInterface{module_name}_{interface_name}")
+            format!(
+                "FfiValueObjectHandle{}{}",
+                namespace.to_upper_camel_case(),
+                interface_name.to_upper_camel_case(),
+            )
         }
         ty => bail!("No FfiValue class for: {ty:?}"),
     })
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/cpp_scaffolding_calls.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/cpp_scaffolding_calls.rs
index fda2174878b46..1f4b7dcdf0418 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/cpp_scaffolding_calls.rs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/cpp_scaffolding_calls.rs
@@ -10,65 +10,59 @@ use heck::ToUpperCamelCase;
 
 pub fn pass(root: &mut Root) -> Result<()> {
     // Generate `ScaffoldingCall` items
-    root.cpp_scaffolding.scaffolding_calls = CombinedItems::try_new(root, |module, ids, items| {
-        let module_name = module.name.clone();
-        let mut ffi_func_map = HashMap::new();
-        module.visit(|ffi_func: &FfiFunction| {
-            if ffi_func.kind == FfiFunctionKind::Scaffolding {
-                ffi_func_map.insert(ffi_func.name.0.clone(), ffi_func.clone());
-            }
-        });
-        module.try_visit_mut(|callable: &mut Callable| {
-            // Callback interface methods don't have scaffolding functions associated with them
-            if matches!(callable.kind, CallableKind::VTableMethod { .. }) {
-                return Ok(());
-            }
-            let ffi_func = ffi_func_map
-                .remove(&callable.ffi_func.0)
-                .ok_or_else(|| anyhow!("FfiFunction lookup failed: {:?}", callable.ffi_func.0))?;
-            callable.id = ids.new_id();
-            let mut arguments = match &callable.kind {
-                CallableKind::Method { interface_name, .. } => vec![FfiValueArgument {
-                    name: "uniffi_ptr".to_string(),
-                    ty: FfiTypeNode {
-                        ty: FfiType::RustArcPtr {
-                            module_name: module_name.clone(),
-                            object_name: interface_name.clone(),
-                        },
-                        ..FfiTypeNode::default()
-                    },
-                    receiver: true,
+    root.cpp_scaffolding.scaffolding_calls =
+        CombinedItems::try_new(root, |namespace, ids, items| {
+            let mut ffi_func_map = HashMap::new();
+            namespace.visit(|ffi_func: &FfiFunction| {
+                if ffi_func.kind == FfiFunctionKind::Scaffolding {
+                    ffi_func_map.insert(ffi_func.name.0.clone(), ffi_func.clone());
+                }
+            });
+            namespace.try_visit_mut(|callable: &mut Callable| {
+                // Callback interface methods don't have scaffolding functions associated with them
+                if matches!(callable.kind, CallableKind::VTableMethod { .. }) {
+                    return Ok(());
+                }
+                let ffi_func = ffi_func_map.remove(&callable.ffi_func.0).ok_or_else(|| {
+                    anyhow!("FfiFunction lookup failed: {:?}", callable.ffi_func.0)
+                })?;
+                callable.id = ids.new_id();
+                let mut arguments = match &callable.kind {
+                    CallableKind::Method { self_type, .. } => vec![FfiValueArgument {
+                        name: "uniffi_ptr".to_string(),
+                        ty: self_type.ffi_type.clone(),
+                        receiver: true,
+                        ..FfiValueArgument::default()
+                    }],
+                    _ => vec![],
+                };
+                arguments.extend(callable.arguments.iter().map(|a| FfiValueArgument {
+                    name: a.name.clone(),
+                    ty: a.ty.ffi_type.clone(),
+                    receiver: false,
                     ..FfiValueArgument::default()
-                }],
-                _ => vec![],
-            };
-            arguments.extend(callable.arguments.iter().map(|a| FfiValueArgument {
-                name: a.name.clone(),
-                ty: a.ty.ffi_type.clone(),
-                receiver: false,
-                ..FfiValueArgument::default()
-            }));
+                }));
 
-            items.push(ScaffoldingCall {
-                id: callable.id,
-                arguments,
-                handler_class_name: format!(
-                    "ScaffoldingCallHandler{}",
-                    ffi_func.name.0.to_upper_camel_case(),
-                ),
-                return_ty: callable
-                    .return_type
-                    .ty
-                    .as_ref()
-                    .map(|ty| FfiValueReturnType {
-                        ty: ty.ffi_type.clone(),
-                        ..FfiValueReturnType::default()
-                    }),
-                ffi_func,
-            });
-            Ok(())
-        })
-    })?;
+                items.push(ScaffoldingCall {
+                    id: callable.id,
+                    arguments,
+                    handler_class_name: format!(
+                        "ScaffoldingCallHandler{}",
+                        ffi_func.name.0.to_upper_camel_case(),
+                    ),
+                    return_ty: callable
+                        .return_type
+                        .ty
+                        .as_ref()
+                        .map(|ty| FfiValueReturnType {
+                            ty: ty.ffi_type.clone(),
+                            ..FfiValueReturnType::default()
+                        }),
+                    ffi_func,
+                });
+                Ok(())
+            })
+        })?;
     root.cpp_scaffolding
         .scaffolding_calls
         .sort_by_key(|call| call.id);
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/default.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/default.rs
new file mode 100644
index 0000000000000..f8f1d9778135c
--- /dev/null
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/default.rs
@@ -0,0 +1,93 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use super::*;
+use anyhow::bail;
+use heck::{ToShoutySnakeCase, ToUpperCamelCase};
+
+/// A pass to handle literals and other default values.
+pub fn pass(root: &mut Root) -> Result<()> {
+    // literals first, because the Default pass might use the value.
+    root.visit_mut(|node: &mut LiteralNode| node.js_lit = js_lit(&node.lit));
+
+    // Now the default node itself.
+    root.try_visit_mut(|default: &mut DefaultValueNode| {
+        default.js_lit = render_default(&default.default)?;
+        Ok(())
+    })
+}
+
+pub(super) fn render_default(default: &DefaultValue) -> Result<String> {
+    Ok(match default {
+        DefaultValue::Default(tn) => match &tn.ty {
+            Type::UInt8
+            | Type::UInt16
+            | Type::UInt32
+            | Type::UInt64
+            | Type::Int8
+            | Type::Int16
+            | Type::Int32
+            | Type::Int64 => "0".to_string(),
+            Type::Float32 | Type::Float64 => "0.0".to_string(),
+            Type::Boolean => "false".to_string(),
+            Type::Bytes => "new Uint8Array(0)".to_string(),
+            Type::String => "\"\"".to_string(),
+            Type::Record { .. }
+            | Type::Enum { .. }
+            | Type::Interface { .. }
+            | Type::CallbackInterface { .. } => format!("new {}()", tn.ty.name()?),
+            Type::Optional { .. } => "null".to_string(),
+            Type::Map { .. } => "{}".to_string(),
+            Type::Sequence { .. } => "[]".to_string(),
+            Type::Custom { builtin, .. } => {
+                return render_default(&DefaultValue::Default(TypeNode {
+                    ty: *builtin.clone(),
+                    ..tn.clone()
+                }))
+                .map_err(|_err| anyhow::anyhow!("Default values not supported for {:?}", tn.ty))
+            }
+            _ => bail!("Default values not supported for {:?}", tn.ty),
+        },
+        // We assume the Literal pass has already run, so `js_lit` already has a value.
+        DefaultValue::Literal(lit) => lit.js_lit.clone(),
+    })
+}
+
+fn js_lit(lit: &Literal) -> String {
+    match lit {
+        Literal::Boolean(inner) => inner.to_string(),
+        Literal::String(inner) => format!("\"{}\"", inner),
+        Literal::UInt(num, radix, _) => number_lit(radix, num).to_string(),
+        Literal::Int(num, radix, _) => number_lit(radix, num).to_string(),
+        Literal::Float(num, _) => num.clone(),
+        Literal::Enum(name, typ) => enum_lit(&typ.ty, name),
+        Literal::EmptyMap => "{}".to_string(),
+        Literal::EmptySequence => "[]".to_string(),
+        Literal::Some { inner } => js_lit(inner),
+        Literal::None => "null".to_string(),
+    }
+}
+
+fn number_lit(
+    radix: &Radix,
+    num: impl std::fmt::Display + std::fmt::LowerHex + std::fmt::Octal,
+) -> String {
+    match radix {
+        Radix::Decimal => format!("{}", num),
+        Radix::Hexadecimal => format!("{:#x}", num),
+        Radix::Octal => format!("{:#o}", num),
+    }
+}
+
+fn enum_lit(typ: &Type, variant_name: &str) -> String {
+    if let Type::Enum { name, .. } = typ {
+        format!(
+            "{}.{}",
+            name.to_upper_camel_case(),
+            variant_name.to_shouty_snake_case()
+        )
+    } else {
+        panic!("Rendering an enum literal on a type that is not an enum")
+    }
+}
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/docs.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/docs.rs
index 7588bce778ea5..f160226802d4e 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/docs.rs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/docs.rs
@@ -6,18 +6,18 @@ use super::*;
 
 pub fn pass(root: &mut Root) -> Result<()> {
     let mut module_docs = vec![];
-    root.visit_mut(|module: &mut Module| {
-        if module.fixture {
+    root.visit_mut(|namespace: &mut Namespace| {
+        if namespace.fixture {
             return;
         }
         let mut docs = ApiModuleDocs {
-            filename: format!("{}.md", module.name),
-            jsdoc_module_name: format!("{}.sys", module.js_name),
-            module_name: format!("{}.sys.mjs", module.js_name),
+            filename: format!("{}.md", namespace.name),
+            jsdoc_module_name: format!("{}.sys", namespace.js_name),
+            module_name: format!("{}.sys.mjs", namespace.js_name),
             classes: vec![],
             functions: vec![],
         };
-        module.visit(|type_def: &TypeDefinition| {
+        namespace.visit(|type_def: &TypeDefinition| {
             match type_def {
                 TypeDefinition::Interface(Interface {
                     name, docstring, ..
@@ -54,7 +54,7 @@ pub fn pass(root: &mut Root) -> Result<()> {
                 _ => (),
             }
         });
-        module.visit(|func: &Function| {
+        namespace.visit(|func: &Function| {
             docs.functions.push(func.name.clone());
         });
         docs.classes.sort();
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/interfaces.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/interfaces.rs
index e2fadcfffb037..8e8aee03566db 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/interfaces.rs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/interfaces.rs
@@ -77,6 +77,11 @@ pub fn pass(root: &mut Root) -> Result<()> {
                 ffi_func_clone: int.ffi_func_clone.clone(),
                 ffi_func_free: int.ffi_func_free.clone(),
                 trait_interface_info: int.vtable.is_some().then(|| PointerTypeTraitInterfaceInfo {
+                    clone_fn: format!(
+                        "callback_clone_{}_{}",
+                        module_name.to_snake_case(),
+                        int.name.to_snake_case(),
+                    ),
                     free_fn: format!(
                         "callback_free_{}_{}",
                         module_name.to_snake_case(),
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/js_docstrings.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/js_docstrings.rs
index e20e77d79786a..063209d27ac6d 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/js_docstrings.rs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/js_docstrings.rs
@@ -6,8 +6,9 @@ use super::*;
 use std::borrow::Cow;
 
 pub fn pass(root: &mut Root) -> Result<()> {
-    root.visit_mut(|module: &mut Module| {
-        module.js_docstring = format_docstring(module.docstring.as_ref().unwrap_or(&module.name));
+    root.visit_mut(|namespace: &mut Namespace| {
+        namespace.js_docstring =
+            format_docstring(namespace.docstring.as_ref().unwrap_or(&namespace.name));
     });
     root.visit_mut(|func: &mut Function| {
         func.js_docstring = format_callable_docstring(
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/js_filename.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/js_filename.rs
index 4f3ef74ff5322..016e410ee8e7e 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/js_filename.rs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/js_filename.rs
@@ -5,7 +5,7 @@
 use super::*;
 use heck::ToUpperCamelCase;
 
-pub fn pass(module: &mut Module) -> Result<()> {
-    module.js_filename = format!("Rust{}.sys.mjs", module.name.to_upper_camel_case());
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
+    namespace.js_filename = format!("Rust{}.sys.mjs", namespace.name.to_upper_camel_case());
     Ok(())
 }
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/js_names.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/js_names.rs
index f681f8b3819d4..06692f681f212 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/js_names.rs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/js_names.rs
@@ -38,7 +38,9 @@ pub fn pass(root: &mut Root) -> Result<()> {
             }
         }
     });
-    root.visit_mut(|module: &mut Module| module.js_name = format_module_name(&module.name));
+    root.visit_mut(|namespace: &mut Namespace| {
+        namespace.js_name = format_module_name(&namespace.name)
+    });
     root.visit_mut(|ty: &mut Type| match ty {
         Type::Record {
             module_name, name, ..
@@ -61,7 +63,7 @@ pub fn pass(root: &mut Root) -> Result<()> {
         _ => (),
     });
     root.visit_mut(|ext: &mut ExternalType| {
-        ext.module_name = format_module_name(&ext.module_name);
+        ext.namespace = format_module_name(&ext.namespace);
         ext.name = ext.name.to_upper_camel_case();
     });
     Ok(())
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/literals.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/literals.rs
deleted file mode 100644
index bf1d01d14f51e..0000000000000
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/literals.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use super::*;
-use heck::{ToShoutySnakeCase, ToUpperCamelCase};
-
-pub fn pass(root: &mut Root) -> Result<()> {
-    root.visit_mut(|node: &mut LiteralNode| node.js_lit = js_lit(&node.lit));
-    Ok(())
-}
-
-fn js_lit(lit: &Literal) -> String {
-    match lit {
-        Literal::Boolean(inner) => inner.to_string(),
-        Literal::String(inner) => format!("\"{}\"", inner),
-        Literal::UInt(num, radix, _) => number_lit(radix, num).to_string(),
-        Literal::Int(num, radix, _) => number_lit(radix, num).to_string(),
-        Literal::Float(num, _) => num.clone(),
-        Literal::Enum(name, typ) => enum_lit(&typ.ty, name),
-        Literal::EmptyMap => "{}".to_string(),
-        Literal::EmptySequence => "[]".to_string(),
-        Literal::Some { inner } => js_lit(inner),
-        Literal::None => "null".to_string(),
-    }
-}
-
-fn number_lit(
-    radix: &Radix,
-    num: impl std::fmt::Display + std::fmt::LowerHex + std::fmt::Octal,
-) -> String {
-    match radix {
-        Radix::Decimal => format!("{}", num),
-        Radix::Hexadecimal => format!("{:#x}", num),
-        Radix::Octal => format!("{:#o}", num),
-    }
-}
-
-fn enum_lit(typ: &Type, variant_name: &str) -> String {
-    if let Type::Enum { name, .. } = typ {
-        format!(
-            "{}.{}",
-            name.to_upper_camel_case(),
-            variant_name.to_shouty_snake_case()
-        )
-    } else {
-        panic!("Rendering an enum literal on a type that is not an enum")
-    }
-}
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/mod.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/mod.rs
index a9cec6c7a5816..7a092b4ece4b4 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/mod.rs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/mod.rs
@@ -11,12 +11,12 @@ mod cpp_ffi_definitions;
 mod cpp_ffi_types;
 mod cpp_names;
 mod cpp_scaffolding_calls;
+mod default;
 mod docs;
 mod interfaces;
 mod js_docstrings;
 mod js_filename;
 mod js_names;
-mod literals;
 mod modules;
 mod types;
 
@@ -31,7 +31,7 @@ use uniffi_pipeline::{Node, Pipeline};
 pub type GeckoPipeline = Pipeline<initial::Root, Root>;
 
 pub fn gecko_js_pipeline(pipeline_map: HashMap<String, Config>) -> GeckoPipeline {
-    general::pipeline()
+    general::pipeline("gecko-js")
         .convert_ir_pass::<Root>()
         .pass(modules::pass(pipeline_map))
         .pass(callables::pass)
@@ -45,7 +45,7 @@ pub fn gecko_js_pipeline(pipeline_map: HashMap<String, Config>) -> GeckoPipeline
         .pass(types::pass)
         .pass(cpp_ffi_types::pass)
         .pass(cpp_names::pass)
-        .pass(literals::pass)
+        .pass(default::pass)
         .pass(js_docstrings::pass)
         .pass(docs::pass)
 }
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/modules.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/modules.rs
index 2792611fec6b0..0e782d6a11d7f 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/modules.rs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/modules.rs
@@ -6,31 +6,31 @@ use super::*;
 use crate::Config;
 use std::collections::{HashMap, HashSet};
 
-pub fn pass(mut config_map: HashMap<String, Config>) -> impl FnMut(&mut Module) -> Result<()> {
-    move |module: &mut Module| {
-        module.config = config_map.remove(&module.crate_name).unwrap_or_default();
+pub fn pass(mut config_map: HashMap<String, Config>) -> impl FnMut(&mut Namespace) -> Result<()> {
+    move |namespace: &mut Namespace| {
+        namespace.config = config_map.remove(&namespace.crate_name).unwrap_or_default();
         // Set the `fixture` flag for modules that belong to the text fixtures
         // To do this in a general way, we would need to remember which `Metadata::Namespace` items
         // came from the fixtures library and create a closure that captured that set.
         //
         // However, since we only have two fixture modules, we can do this very easily.
-        if module.name.starts_with("uniffi_bindings_tests") {
-            module.fixture = true;
+        if namespace.name.starts_with("uniffi_bindings_tests") {
+            namespace.fixture = true;
         }
 
         // Workaround for the fact that the UniFFI 0.29.2 doesn't set this correctly.
-        module.string_type_node = TypeNode {
+        namespace.string_type_node = TypeNode {
             ty: Type::String,
             canonical_name: "String".to_string(),
             ..TypeNode::default()
         };
 
         // Collect all imports first, then process custom types
-        let config = module.config.clone();
+        let config = namespace.config.clone();
         let mut all_imports = HashSet::new();
 
         // Process custom types and collect imports
-        module.try_visit_mut(|custom: &mut CustomType| {
+        namespace.try_visit_mut(|custom: &mut CustomType| {
             if let Some(custom_config) = config.custom_types.get(&custom.name) {
                 custom.type_name = custom_config.type_name.clone();
                 custom.lift_expr = Some(custom_config.lift.clone());
@@ -48,11 +48,11 @@ pub fn pass(mut config_map: HashMap<String, Config>) -> impl FnMut(&mut Module)
 
         let mut imports_vec: Vec<String> = all_imports.into_iter().collect();
         imports_vec.sort(); // For deterministic output
-        module.imports = imports_vec;
+        namespace.imports = imports_vec;
 
         let mut saw_callback_interface = false;
-        module.visit(|_: &VTable| saw_callback_interface = true);
-        module.has_callback_interface = saw_callback_interface;
+        namespace.visit(|_: &VTable| saw_callback_interface = true);
+        namespace.has_callback_interface = saw_callback_interface;
         Ok(())
     }
 }
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/nodes.rs b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/nodes.rs
index 5312cf615377e..2b1821efebaa2 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/nodes.rs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/pipeline/nodes.rs
@@ -2,11 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use indexmap::IndexMap;
+use indexmap::{IndexMap, IndexSet};
 
-use anyhow::Result;
+use anyhow::{bail, Result};
 use askama::Template;
-use uniffi_bindgen::backend::filters::to_askama_error;
+use uniffi_bindgen::to_askama_error;
 use uniffi_pipeline::Node;
 
 use crate::{ConcurrencyMode, Config};
@@ -16,7 +16,7 @@ use crate::{ConcurrencyMode, Config};
 pub struct Root {
     /// In library mode, we get the name of the library file for free.
     pub cdylib: Option<String>,
-    pub modules: IndexMap<String, Module>,
+    pub namespaces: IndexMap<String, Namespace>,
     pub cpp_scaffolding: CppScaffolding,
     pub module_docs: Vec<ApiModuleDocs>,
 }
@@ -77,6 +77,7 @@ pub struct PointerType {
 #[derive(Debug, Clone, Node)]
 pub struct PointerTypeTraitInterfaceInfo {
     pub free_fn: String,
+    pub clone_fn: String,
 }
 
 // Used to generate the C++ callback interface code
@@ -101,6 +102,9 @@ pub struct CppCallbackInterface {
     /// Name of the function generated by uniffi-bindgen-gecko-js to free a callback interface
     /// handle.
     pub free_fn: String,
+    /// Name of the function generated by uniffi-bindgen-gecko-js to clone a callback interface
+    /// handle.
+    pub clone_fn: String,
     pub vtable_struct_type: FfiTypeNode,
     pub methods: Vec<CppCallbackInterfaceMethod>,
 }
@@ -163,7 +167,7 @@ pub struct AsyncCallbackMethodHandlerBase {
 
 #[derive(Debug, Clone, Node, Template)]
 #[template(path = "js/Module.sys.mjs", escape = "none")]
-pub struct Module {
+pub struct Namespace {
     pub name: String,
     pub config: Config,
     pub js_name: String,
@@ -174,7 +178,7 @@ pub struct Module {
     pub js_docstring: String,
     pub functions: Vec<Function>,
     pub type_definitions: Vec<TypeDefinition>,
-    pub ffi_definitions: Vec<FfiDefinition>,
+    pub ffi_definitions: IndexSet<FfiDefinition>,
     pub checksums: Vec<Checksum>,
     pub ffi_rustbuffer_alloc: RustFfiFunctionName,
     pub ffi_rustbuffer_from_bytes: RustFfiFunctionName,
@@ -254,15 +258,15 @@ pub struct Callable {
 pub enum CallableKind {
     Function,
     Method {
-        interface_name: String,
+        self_type: TypeNode,
         ffi_converter: String,
     },
     Constructor {
-        interface_name: String,
+        self_type: TypeNode,
         primary: bool,
     },
     VTableMethod {
-        trait_name: String,
+        self_type: TypeNode,
         for_callback_interface: bool,
     },
 }
@@ -277,7 +281,7 @@ pub struct ThrowsType {
     pub ty: Option<TypeNode>,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub struct AsyncData {
     pub ffi_rust_future_poll: RustFfiFunctionName,
     pub ffi_rust_future_cancel: RustFfiFunctionName,
@@ -293,16 +297,30 @@ pub struct Argument {
     pub ty: TypeNode,
     pub by_ref: bool,
     pub optional: bool,
-    pub default: Option<LiteralNode>,
+    pub default: Option<DefaultValueNode>,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, Eq, PartialEq, Hash)]
+pub enum DefaultValue {
+    Default(TypeNode),
+    Literal(LiteralNode),
+}
+
+#[derive(Debug, Clone, Node, Eq, PartialEq, Hash)]
+pub struct DefaultValueNode {
+    #[node(wraps)]
+    pub default: DefaultValue,
+    /// The default value rendered as a string
+    pub js_lit: String,
+}
+
+#[derive(Debug, Clone, Node, Eq, PartialEq, Hash)]
 pub struct LiteralNode {
     pub js_lit: String,
     pub lit: Literal,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, Eq, PartialEq, Hash)]
 pub enum Literal {
     Boolean(bool),
     String(String),
@@ -325,7 +343,7 @@ pub enum Literal {
 
 // Represent the radix of integer literal values.
 // We preserve the radix into the generated bindings for readability reasons.
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, Eq, PartialEq, Hash)]
 pub enum Radix {
     Decimal = 10,
     Octal = 8,
@@ -346,7 +364,7 @@ pub struct Record {
 pub struct Field {
     pub name: String,
     pub ty: TypeNode,
-    pub default: Option<LiteralNode>,
+    pub default: Option<DefaultValueNode>,
     pub docstring: Option<String>,
     pub js_docstring: String,
 }
@@ -491,12 +509,12 @@ pub struct MapType {
 
 #[derive(Debug, Clone, Node)]
 pub struct ExternalType {
-    pub module_name: String,
+    pub namespace: String,
     pub name: String,
     pub self_type: TypeNode,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, Eq, PartialEq, Hash)]
 pub struct TypeNode {
     pub ty: Type,
     /// Name of the JS class for this type (only set for user-defined types like
@@ -567,6 +585,19 @@ pub enum Type {
     },
 }
 
+impl Type {
+    pub fn name(&self) -> Result<&str> {
+        match &self {
+            Type::Record { name, .. }
+            | Type::Enum { name, .. }
+            | Type::Interface { name, .. }
+            | Type::CallbackInterface { name, .. }
+            | Type::Custom { name, .. } => Ok(name.as_str()),
+            _ => bail!("This type has no name"),
+        }
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Node)]
 pub enum ObjectImpl {
     // A single Rust type
@@ -577,7 +608,7 @@ pub enum ObjectImpl {
     CallbackTrait,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub enum FfiDefinition {
     /// FFI Function exported in the Rust library
     RustFunction(FfiFunction),
@@ -587,16 +618,16 @@ pub enum FfiDefinition {
     Struct(FfiStruct),
 }
 
-#[derive(Debug, Clone, Node, PartialEq, Eq)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub struct RustFfiFunctionName(pub String);
 
-#[derive(Debug, Clone, Node, PartialEq, Eq)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub struct FfiStructName(pub String);
 
-#[derive(Debug, Clone, Node, PartialEq, Eq)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub struct FfiFunctionTypeName(pub String);
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub struct FfiFunction {
     pub name: RustFfiFunctionName,
     pub async_data: Option<AsyncData>,
@@ -606,7 +637,7 @@ pub struct FfiFunction {
     pub kind: FfiFunctionKind,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Node)]
+#[derive(Debug, Clone, PartialEq, Eq, Node, Hash)]
 pub enum FfiFunctionKind {
     Scaffolding,
     ObjectClone,
@@ -624,7 +655,7 @@ pub enum FfiFunctionKind {
     Checksum,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub struct FfiFunctionType {
     pub name: FfiFunctionTypeName,
     pub arguments: Vec<FfiArgument>,
@@ -632,37 +663,37 @@ pub struct FfiFunctionType {
     pub has_rust_call_status_arg: bool,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub struct FfiReturnType {
     pub ty: Option<FfiTypeNode>,
     pub type_name: String,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub struct FfiStruct {
     pub name: FfiStructName,
     pub fields: Vec<FfiField>,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub struct FfiField {
     pub name: String,
     pub ty: FfiTypeNode,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub struct FfiArgument {
     pub name: String,
     pub ty: FfiTypeNode,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub struct FfiTypeNode {
     pub ty: FfiType,
     pub type_name: String,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub enum FfiType {
     UInt8,
     Int8,
@@ -674,10 +705,6 @@ pub enum FfiType {
     Int64,
     Float32,
     Float64,
-    RustArcPtr {
-        module_name: String,
-        object_name: String,
-    },
     RustBuffer(Option<String>),
     ForeignBytes,
     Function(FfiFunctionTypeName),
@@ -694,8 +721,12 @@ pub enum HandleKind {
     RustFuture,
     ForeignFuture,
     ForeignFutureCallbackData,
-    CallbackInterface {
-        module_name: String,
+    StructInterface {
+        namespace: String,
+        interface_name: String,
+    },
+    TraitInterface {
+        namespace: String,
         interface_name: String,
     },
 }
@@ -729,10 +760,10 @@ impl<T> CombinedItems<T> {
     /// F is a function that finds items in module and pushes them to a vec.
     pub fn new<F>(root: &mut Root, mut f: F) -> Self
     where
-        F: FnMut(&mut Module, &mut CombinedItemsIdGenerator, &mut Vec<T>),
+        F: FnMut(&mut Namespace, &mut CombinedItemsIdGenerator, &mut Vec<T>),
     {
-        Self::try_new(root, |module, id_generator, items| {
-            f(module, id_generator, items);
+        Self::try_new(root, |namespace, id_generator, items| {
+            f(namespace, id_generator, items);
             Ok(())
         })
         .unwrap()
@@ -740,7 +771,7 @@ impl<T> CombinedItems<T> {
 
     pub fn try_new<F>(root: &mut Root, mut f: F) -> Result<Self>
     where
-        F: FnMut(&mut Module, &mut CombinedItemsIdGenerator, &mut Vec<T>) -> Result<()>,
+        F: FnMut(&mut Namespace, &mut CombinedItemsIdGenerator, &mut Vec<T>) -> Result<()>,
     {
         // Use 2 separate counters for "real" Rust components vs fixtures.
         let mut combined_items = Self {
@@ -756,16 +787,20 @@ impl<T> CombinedItems<T> {
         // * It means the IDs get grouped together, which can make for a more efficient `switch`
         //   statement.
 
-        root.try_visit_mut(|module: &mut Module| {
-            if !module.fixture {
-                f(module, &mut id_generator, &mut combined_items.items)
+        root.try_visit_mut(|namespace: &mut Namespace| {
+            if !namespace.fixture {
+                f(namespace, &mut id_generator, &mut combined_items.items)
             } else {
                 Ok(())
             }
         })?;
-        root.try_visit_mut(|module: &mut Module| {
-            if module.fixture {
-                f(module, &mut id_generator, &mut combined_items.fixture_items)
+        root.try_visit_mut(|namespace: &mut Namespace| {
+            if namespace.fixture {
+                f(
+                    namespace,
+                    &mut id_generator,
+                    &mut combined_items.fixture_items,
+                )
             } else {
                 Ok(())
             }
@@ -862,7 +897,7 @@ pub mod filters {
     use super::*;
     use askama::Result;
 
-    pub fn class_name(ty: &TypeNode) -> Result<String> {
+    pub fn class_name(ty: &TypeNode, _: &dyn askama::Values) -> Result<String> {
         match &ty.class_name {
             Some(class_name) => Ok(class_name.clone()),
             None => Err(to_askama_error(&format!(
@@ -873,7 +908,7 @@ pub mod filters {
     }
 
     // Render an expression to check if two instances of this type are equal
-    pub fn field_equals(field: &Field, first_obj: &str, second_obj: &str) -> Result<String> {
+    pub fn field_equals(field: &Field, _: &dyn askama::Values, first_obj: &str, second_obj: &str) -> Result<String> {
         let name = &field.name;
         Ok(match &field.ty.ty {
             Type::Record { .. } => format!("{first_obj}.{name}.equals({second_obj}.{name})"),
@@ -884,7 +919,7 @@ pub mod filters {
     // Remove the trailing comma from a block of text.
     //
     // This can make generating argument lists more convenient.
-    pub fn remove_trailing_comma<T: std::fmt::Display>(text: T) -> Result<String> {
+    pub fn remove_trailing_comma<T: std::fmt::Display>(text: T, _: &dyn askama::Values) -> Result<String> {
         let text = text.to_string();
         let Some(last_comma) = text.rfind(',') else {
             return Ok(text.to_string());
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/templates/cpp/CallbackInterfaceFfiValueTypes.cpp b/toolkit/components/uniffi-bindgen-gecko-js/src/templates/cpp/CallbackInterfaceFfiValueTypes.cpp
index 9e8feff42f25a..0a31974860d82 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/templates/cpp/CallbackInterfaceFfiValueTypes.cpp
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/templates/cpp/CallbackInterfaceFfiValueTypes.cpp
@@ -19,9 +19,6 @@ extern "C" void {{ cbi.free_fn }}(uint64_t uniffiHandle);
 // `FfiValueInt<uint64_t>`, except it has extra code to cleanup the callback handles.
 class {{ ffi_value_class }} {
  private:
-  // Was this value lowered?  If so, that means we own the handle and are responsible for cleaning
-  // it up if we don't pass it to Rust because other values failed to lower
-  bool mLowered = false;
   uint64_t mValue = 0;
 
  public:
@@ -43,20 +40,17 @@ class {{ ffi_value_class }} {
     }
     ReleaseHandleIfSet();
     mValue = intValue;
-    mLowered = true;
   }
 
   void Lift(JSContext* aContext, dom::OwningUniFFIScaffoldingValue* aDest,
             ErrorResult& aError) {
     aDest->SetAsDouble() = mValue;
     mValue = 0;
-    mLowered = false;
   }
 
   uint64_t IntoRust() {
     auto handle = mValue;
     mValue = 0;
-    mLowered = false;
     return handle;
   }
 
@@ -64,11 +58,10 @@ class {{ ffi_value_class }} {
 
   void ReleaseHandleIfSet() {
     // A non-zero value indicates that we own a callback handle that was never passed to Rust or
-    // lifted to JS and needs to be freed.
-    if (mValue != 0 && mLowered) {
+    // lifted to JS.  Call the free function to decrease the refcount.
+    if (mValue != 0) {
         {{ cbi.free_fn }}(mValue);
         mValue = 0;
-        mLowered = false;
     }
   }
 
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/templates/cpp/CallbackInterfaces.cpp b/toolkit/components/uniffi-bindgen-gecko-js/src/templates/cpp/CallbackInterfaces.cpp
index e3771620d151c..6ca3702a59586 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/templates/cpp/CallbackInterfaces.cpp
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/templates/cpp/CallbackInterfaces.cpp
@@ -185,7 +185,7 @@ extern "C" void {{ meth.fn_name }}(
   // This can be used to detected when the future is dropped from the Rust side and cancel the
   // async task on the foreign side.  However, there's no way to do that in JS, so we just ignore
   // it.
-  ForeignFuture *aUniffiOutForeignFuture
+  ForeignFutureDroppedCallbackStruct *aUniffiOutForeignFuture
 ) {
   UniquePtr<AsyncCallbackMethodHandlerBase> handler = MakeUnique<{{ meth.async_handler_class_name }}>(
         aUniffiHandle,
@@ -331,19 +331,27 @@ extern "C" void {{ meth.fn_name }}(
 {%- endmatch %}
 {%- endfor %}
 
-extern "C" void {{ cbi.free_fn }}(uint64_t uniffiHandle) {
+extern "C" void {{ cbi.free_fn }}(uint64_t aUniffiHandle) {
+  if (CallbackHandleRelease(aUniffiHandle) == 0) {
    // Callback object handles are keys in a map stored in the JS handler. To
    // handle the free call, schedule a fire-and-forget JS call to remove the key.
    AsyncCallbackMethodHandlerBase::ScheduleAsyncCall(
-      MakeUnique<CallbackFreeHandler>("{{ cbi.name }}.uniffi_free", uniffiHandle),
+      MakeUnique<CallbackFreeHandler>("{{ cbi.name }}.uniffi_free", aUniffiHandle),
       &{{ cbi.handler_var }});
+  }
+}
+
+extern "C" uint64_t {{ cbi.clone_fn }}(uint64_t aUniffiHandle) {
+  CallbackHandleAddRef(aUniffiHandle);
+  return aUniffiHandle;
 }
 
 static {{ cbi.vtable_struct_type.type_name }} {{ cbi.vtable_var }} {
+  {{ cbi.free_fn }},
+  {{ cbi.clone_fn }},
   {%- for meth in cbi.methods %}
   {{ meth.fn_name }},
   {%- endfor %}
-  {{ cbi.free_fn }}
 };
 
 {%- endfor %}
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/templates/cpp/PointerTypes.cpp b/toolkit/components/uniffi-bindgen-gecko-js/src/templates/cpp/PointerTypes.cpp
index 9218c13ef796d..45b7ecae3482a 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/templates/cpp/PointerTypes.cpp
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/templates/cpp/PointerTypes.cpp
@@ -18,11 +18,11 @@ const static mozilla::uniffi::UniFFIPointerType {{ pointer_type.name }} {
 {%- when None %}
 class {{ pointer_type.ffi_value_class }} {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   {{ pointer_type.ffi_value_class }}() = default;
-  explicit {{ pointer_type.ffi_value_class }}(void* aValue) : mValue(aValue) {}
+  explicit {{ pointer_type.ffi_value_class }}(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   {{ pointer_type.ffi_value_class }}(const {{ pointer_type.ffi_value_class }}&) = delete;
@@ -31,7 +31,7 @@ class {{ pointer_type.ffi_value_class }} {
   {{ pointer_type.ffi_value_class }}& operator=({{ pointer_type.ffi_value_class }}&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -61,16 +61,16 @@ class {{ pointer_type.ffi_value_class }} {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &{{ pointer_type.name }});
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static {{ pointer_type.ffi_value_class }} FromRust(void* aValue) {
+  static {{ pointer_type.ffi_value_class }} FromRust(uint64_t aValue) {
     return {{ pointer_type.ffi_value_class }}(aValue);
   }
 
@@ -91,26 +91,23 @@ class {{ pointer_type.ffi_value_class }} {
   }
 };
 {%- when Some(trait_interface_info) %}
-// Forward declare the free function, which is defined later on in `CallbackInterfaces.cpp`
+// Forward declare the free and clone functions, which are defined later on in `CallbackInterfaces.cpp`
 extern "C" void {{ trait_interface_info.free_fn }}(uint64_t uniffiHandle);
+extern "C" uint64_t {{ trait_interface_info.clone_fn }}(uint64_t uniffiHandle);
 
 // Trait interface FFI value class.  This is a hybrid between the one for interfaces and callback
 // interface version
 class {{ pointer_type.ffi_value_class }} {
  private:
-  // Did we lower a callback interface, rather than lift an object interface?
-  // This is weird, but it's a needed work until something like
-  // https://github.com/mozilla/uniffi-rs/pull/1823 lands.
-  bool mLoweredCallbackInterface = false;
-  // The raw FFI value is a pointer.
+  // The raw FFI value is a uint64_t in all cases.
   // For callback interfaces, the uint64_t handle gets casted to a pointer.  Callback interface
-  // handles are incremented by one at a time, so even on a 32-bit system this
+  // handles are used as the uint64_t and are incremented by one at a time, so even on a 32-bit system this
   // shouldn't overflow.
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   {{ pointer_type.ffi_value_class }}() = default;
-  explicit {{ pointer_type.ffi_value_class }}(void* aValue) : mValue(aValue) {}
+  explicit {{ pointer_type.ffi_value_class }}(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   {{ pointer_type.ffi_value_class }}(const {{ pointer_type.ffi_value_class }}&) = delete;
@@ -119,83 +116,79 @@ class {{ pointer_type.ffi_value_class }} {
   {{ pointer_type.ffi_value_class }}& operator=({{ pointer_type.ffi_value_class }}&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    mLoweredCallbackInterface = aOther.mLoweredCallbackInterface;
-    aOther.mValue = nullptr;
-    aOther.mLoweredCallbackInterface = false;
+    aOther.mValue = 0;
     return *this;
   }
 
-  // Lower treats `aValue` as a callback interface
+  // Lower a trait interface, `aValue` can either be a Rust or JS handle
   void Lower(const dom::OwningUniFFIScaffoldingValue& aValue,
              ErrorResult& aError) {
-    if (!aValue.IsDouble()) {
-      aError.ThrowTypeError("Bad argument type"_ns);
-      return;
-    }
-    double floatValue = aValue.GetAsDouble();
-    uint64_t intValue = static_cast<uint64_t>(floatValue);
-    if (intValue != floatValue) {
-      aError.ThrowTypeError("Not an integer"_ns);
-      return;
-    }
     FreeHandle();
-    mValue = reinterpret_cast<void *>(intValue);
-    mLoweredCallbackInterface = true;
-  }
-
-  // LowerReceiver is used for method receivers.  It treats `aValue` as an object pointer.
-  void LowerReciever(const dom::OwningUniFFIScaffoldingValue& aValue,
-             ErrorResult& aError) {
-    if (!aValue.IsUniFFIPointer()) {
-      aError.ThrowTypeError("Expected UniFFI pointer argument"_ns);
-      return;
-    }
-    dom::UniFFIPointer& value = aValue.GetAsUniFFIPointer();
-    if (!value.IsSamePtrType(&{{ pointer_type.name }})) {
-      aError.ThrowTypeError("Incorrect UniFFI pointer type"_ns);
+    if (aValue.IsUniFFIPointer()) {
+      // Rust handle.  Clone the handle and return it.
+      dom::UniFFIPointer& value = aValue.GetAsUniFFIPointer();
+      if (!value.IsSamePtrType(&{{ pointer_type.name }})) {
+        aError.ThrowTypeError("Incorrect UniFFI pointer type"_ns);
+        return;
+      }
+      mValue = value.ClonePtr();
+    } else if (aValue.IsDouble()) {
+      // JS handle.  Just return it, the JS code has already incremented the
+      // refcount
+      double floatValue = aValue.GetAsDouble();
+      uint64_t intValue = static_cast<uint64_t>(floatValue);
+      if (intValue != floatValue) {
+        aError.ThrowTypeError("Not an integer"_ns);
+        return;
+      }
+      mValue = intValue;
+    } else {
+      aError.ThrowTypeError("Bad argument type"_ns);
       return;
     }
-    FreeHandle();
-    mValue = value.ClonePtr();
-    mLoweredCallbackInterface = false;
   }
 
-  // Lift treats `aDest` as a regular interface
+  // Lift a trait interface.  `mValue` can either by a Rust or JS handle
   void Lift(JSContext* aContext, dom::OwningUniFFIScaffoldingValue* aDest,
             ErrorResult& aError) {
-    aDest->SetAsUniFFIPointer() =
-        dom::UniFFIPointer::Create(mValue, &{{ pointer_type.name }});
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    if ((mValue & 1) == 0) {
+      // Rust handle
+      aDest->SetAsUniFFIPointer() =
+          dom::UniFFIPointer::Create(mValue, &{{ pointer_type.name }});
+    } else {
+      // JS handle
+      aDest->SetAsDouble() = mValue;
+    }
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    mValue = 0;
     return temp;
   }
 
-  static {{ pointer_type.ffi_value_class }} FromRust(void* aValue) {
+  static {{ pointer_type.ffi_value_class }} FromRust(uint64_t aValue) {
     return {{ pointer_type.ffi_value_class }}(aValue);
   }
 
   void FreeHandle() {
-    // This behavior depends on if we lowered a callback interface handle or lifted an interface
-    // pointer.
-    if (mLoweredCallbackInterface && reinterpret_cast<uintptr_t>(mValue) != 0) {
-                                     printf("FREEING CB %p\n", mValue);
-        {{ trait_interface_info.free_fn }}(reinterpret_cast<uintptr_t>(mValue));
-        mValue = reinterpret_cast<void *>(0);
-    } else if (!mLoweredCallbackInterface && mValue != nullptr) {
-                                     printf("FREEING interface %p\n", mValue);
+    // If we're storing a handle, call the free function for it. The function to
+    // call depends on if we're holding a JS or Rust implementation of the
+    // interface. We can tell that by looking at the lowest bit of the handle
+    if (mValue == 0) {
+      // 0 indicates we're not storing a handle.
+    } else if ((mValue & 1) == 0) {
+      // Rust implementation
       RustCallStatus callStatus{};
       ({{ pointer_type.ffi_func_free.0 }})(mValue, &callStatus);
       // No need to check `RustCallStatus`, it's only part of the API to match
       // other FFI calls.  The free function can never fail.
+    } else {
+      // JS implementation
+      {{ trait_interface_info.free_fn }}(mValue);
     }
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    mValue = 0;
   }
 
   ~{{ pointer_type.ffi_value_class }}() {
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/templates/cpp/ScaffoldingCalls.cpp b/toolkit/components/uniffi-bindgen-gecko-js/src/templates/cpp/ScaffoldingCalls.cpp
index 75dbb645bc6a4..808511b930254 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/templates/cpp/ScaffoldingCalls.cpp
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/templates/cpp/ScaffoldingCalls.cpp
@@ -31,11 +31,7 @@ class {{ scaffolding_call.handler_class_name }} : public UniffiSyncCallHandler {
     }
     {%- endif %}
     {%- for arg in scaffolding_call.arguments %}
-    {%- if arg.receiver %}
-    {{ arg.field_name }}.LowerReciever(aArgs[{{ loop.index0 }}], aError);
-    {%- else %}
     {{ arg.field_name }}.Lower(aArgs[{{ loop.index0 }}], aError);
-    {%- endif %}
     if (aError.Failed()) {
       return;
     }
@@ -94,11 +90,7 @@ class {{ scaffolding_call.handler_class_name }} : public UniffiAsyncCallHandler
   void LowerArgsAndMakeRustCall(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
     {%- for arg in scaffolding_call.arguments %}
     {{ arg.ffi_value_class }} {{ arg.field_name }}{};
-    {%- if arg.receiver %}
-    {{ arg.field_name }}.LowerReciever(aArgs[{{ loop.index0 }}], aError);
-    {%- else %}
     {{ arg.field_name }}.Lower(aArgs[{{ loop.index0 }}], aError);
-    {%- endif %}
     if (aError.Failed()) {
       return;
     }
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/templates/js/CallbackInterface.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/src/templates/js/CallbackInterface.sys.mjs
index 040955e2de99c..73e87beaf1fbd 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/templates/js/CallbackInterface.sys.mjs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/templates/js/CallbackInterface.sys.mjs
@@ -11,7 +11,7 @@ export class {{ cbi.self_type.ffi_converter }} extends FfiConverter {
     }
 
     static lift(handleId) {
-        return {{ cbi.vtable.js_handler_var }}.getCallbackObj(handleId)
+        return {{ cbi.vtable.js_handler_var }}.takeCallbackObj(handleId)
     }
 
     static read(dataStream) {
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/templates/js/ExternalType.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/src/templates/js/ExternalType.sys.mjs
index 2af33a3a3fb00..f2636e19eefb3 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/templates/js/ExternalType.sys.mjs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/templates/js/ExternalType.sys.mjs
@@ -1,6 +1,6 @@
 import {
   {{ external.self_type.ffi_converter }},
-} from "./{{ external.module_name }}.sys.mjs";
+} from "./{{ external.namespace }}.sys.mjs";
 
 // Export the FFIConverter object to make external types work.
 export { {{ external.self_type.ffi_converter }} };
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/src/templates/js/Interface.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/src/templates/js/Interface.sys.mjs
index 0de92e7539af9..0b06786703375 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/src/templates/js/Interface.sys.mjs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/src/templates/js/Interface.sys.mjs
@@ -77,19 +77,30 @@ export class {{ int.self_type.ffi_converter }} extends FfiConverter {
 //
 // Export the FFIConverter object to make external types work.
 export class {{ int.self_type.ffi_converter }} extends FfiConverter {
-    // lift works like a regular interface
-    static lift(value) {
-        const opts = {};
-        opts[constructUniffiObject] = value;
-        return new {{ int.js_class_name }}(opts);
+    static lift(handle) {
+        if (handle instanceof UniFFIPointer) {
+          // Rust handle.  Construct an object from it
+          const opts = {};
+          opts[constructUniffiObject] = handle;
+          return new {{ int.js_class_name }}(opts);
+        } else {
+          // JS handle.  Get the JS object from the callback handler
+          return {{ vtable.js_handler_var }}.takeCallbackObj(handle)
+        }
     }
 
-    // lower treats value like a callback interface
     static lower(value) {
-        if (!(value instanceof {{ int.interface_base_class.name }})) {
-            throw new UniFFITypeError("expected '{{ int.interface_base_class.name }}' subclass");
+        const ptr = value[uniffiObjectPtr];
+        if (ptr instanceof UniFFIPointer) {
+          // Rust-implemented interface, return the ptr.  The C++ code will clone it.
+          return ptr;
+        } else {
+          // JS-implemented interface, store the object in the handle map and return the handle
+          if (!(value instanceof {{ int.interface_base_class.name }})) {
+              throw new UniFFITypeError("expected '{{ int.interface_base_class.name }}' subclass");
+          }
+          return {{ vtable.js_handler_var }}.storeCallbackObj(value)
         }
-        return {{ vtable.js_handler_var }}.storeCallbackObj(value)
     }
 
     // lowerReceiver is used when calling methods on an interface we got from Rust, 
@@ -103,11 +114,16 @@ export class {{ int.self_type.ffi_converter }} extends FfiConverter {
     }
 
     static read(dataStream) {
-        return this.lift(dataStream.readPointer({{ int.object_id }}));
+        return this.lift(dataStream.readHandleOrPointer({{ int.object_id }}))
     }
 
     static write(dataStream, value) {
-        dataStream.writePointer({{ int.object_id }}, this.lower(value));
+        if (value[uniffiObjectPtr] instanceof UniFFIPointer) {
+          // Rust-implemented interface, return the ptr.
+          dataStream.writePointer({{ int.object_id }}, this.lower(value));
+        } else {
+          dataStream.writeInt64(this.lower(value))
+        }
     }
 
     static computeSize(value) {
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/tests/generated/RustUniffiBindingsTests.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/tests/generated/RustUniffiBindingsTests.sys.mjs
index a3678558b3227..afc7f2e74b16f 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/tests/generated/RustUniffiBindingsTests.sys.mjs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/tests/generated/RustUniffiBindingsTests.sys.mjs
@@ -46,7 +46,7 @@ if (v instanceof UniffiSkipJsTypeCheck) {
     FfiConverterFloat32.checkType(v);
 }
 const result = await UniFFIScaffolding.callAsync(
-    166, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_f32
+    173, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_f32
     FfiConverterFloat32.lower(v),
 )
 return handleRustResult(
@@ -70,7 +70,7 @@ if (v instanceof UniffiSkipJsTypeCheck) {
     FfiConverterFloat64.checkType(v);
 }
 const result = await UniFFIScaffolding.callAsync(
-    167, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_f64
+    174, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_f64
     FfiConverterFloat64.lower(v),
 )
 return handleRustResult(
@@ -94,7 +94,7 @@ if (v instanceof UniffiSkipJsTypeCheck) {
     FfiConverterInt16.checkType(v);
 }
 const result = await UniFFIScaffolding.callAsync(
-    168, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_i16
+    175, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_i16
     FfiConverterInt16.lower(v),
 )
 return handleRustResult(
@@ -118,7 +118,7 @@ if (v instanceof UniffiSkipJsTypeCheck) {
     FfiConverterInt32.checkType(v);
 }
 const result = await UniFFIScaffolding.callAsync(
-    169, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_i32
+    176, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_i32
     FfiConverterInt32.lower(v),
 )
 return handleRustResult(
@@ -142,7 +142,7 @@ if (v instanceof UniffiSkipJsTypeCheck) {
     FfiConverterInt64.checkType(v);
 }
 const result = await UniFFIScaffolding.callAsync(
-    170, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_i64
+    177, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_i64
     FfiConverterInt64.lower(v),
 )
 return handleRustResult(
@@ -166,7 +166,7 @@ if (v instanceof UniffiSkipJsTypeCheck) {
     FfiConverterInt8.checkType(v);
 }
 const result = await UniFFIScaffolding.callAsync(
-    171, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_i8
+    178, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_i8
     FfiConverterInt8.lower(v),
 )
 return handleRustResult(
@@ -190,7 +190,7 @@ if (v instanceof UniffiSkipJsTypeCheck) {
     FfiConverterMapStringString.checkType(v);
 }
 const result = await UniFFIScaffolding.callAsync(
-    172, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_map
+    179, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_map
     FfiConverterMapStringString.lower(v),
 )
 return handleRustResult(
@@ -214,7 +214,7 @@ if (v instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeAsyncInterface.checkType(v);
 }
 const result = await UniFFIScaffolding.callAsync(
-    173, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_obj
+    180, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_obj
     FfiConverterTypeAsyncInterface.lower(v),
 )
 return handleRustResult(
@@ -238,7 +238,7 @@ if (v instanceof UniffiSkipJsTypeCheck) {
     FfiConverterString.checkType(v);
 }
 const result = await UniFFIScaffolding.callAsync(
-    174, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_string
+    181, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_string
     FfiConverterString.lower(v),
 )
 return handleRustResult(
@@ -262,7 +262,7 @@ if (v instanceof UniffiSkipJsTypeCheck) {
     FfiConverterUInt16.checkType(v);
 }
 const result = await UniFFIScaffolding.callAsync(
-    175, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_u16
+    182, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_u16
     FfiConverterUInt16.lower(v),
 )
 return handleRustResult(
@@ -286,7 +286,7 @@ if (v instanceof UniffiSkipJsTypeCheck) {
     FfiConverterUInt32.checkType(v);
 }
 const result = await UniFFIScaffolding.callAsync(
-    176, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_u32
+    183, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_u32
     FfiConverterUInt32.lower(v),
 )
 return handleRustResult(
@@ -310,7 +310,7 @@ if (v instanceof UniffiSkipJsTypeCheck) {
     FfiConverterUInt64.checkType(v);
 }
 const result = await UniFFIScaffolding.callAsync(
-    177, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_u64
+    184, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_u64
     FfiConverterUInt64.lower(v),
 )
 return handleRustResult(
@@ -334,7 +334,7 @@ if (v instanceof UniffiSkipJsTypeCheck) {
     FfiConverterUInt8.checkType(v);
 }
 const result = await UniFFIScaffolding.callAsync(
-    178, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_u8
+    185, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_u8
     FfiConverterUInt8.lower(v),
 )
 return handleRustResult(
@@ -358,7 +358,7 @@ if (v instanceof UniffiSkipJsTypeCheck) {
     FfiConverterSequenceUInt32.checkType(v);
 }
 const result = await UniFFIScaffolding.callAsync(
-    179, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_vec
+    186, // uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_vec
     FfiConverterSequenceUInt32.lower(v),
 )
 return handleRustResult(
@@ -374,7 +374,7 @@ return handleRustResult(
 export async function asyncThrowError() {
    
 const result = await UniFFIScaffolding.callAsync(
-    180, // uniffi_uniffi_bindings_tests_fn_func_async_throw_error
+    187, // uniffi_uniffi_bindings_tests_fn_func_async_throw_error
 )
 return handleRustResult(
     result,
@@ -397,7 +397,7 @@ if (int instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeTestInterface.checkType(int);
 }
 const result = UniFFIScaffolding.callSync(
-    181, // uniffi_uniffi_bindings_tests_fn_func_clone_interface
+    188, // uniffi_uniffi_bindings_tests_fn_func_clone_interface
     FfiConverterTypeTestInterface.lower(int),
 )
 return handleRustResult(
@@ -421,7 +421,7 @@ if (value instanceof UniffiSkipJsTypeCheck) {
     FfiConverterUInt32.checkType(value);
 }
 const result = await UniFFIScaffolding.callAsyncWrapper(
-    182, // uniffi_uniffi_bindings_tests_fn_func_create_async_test_trait_interface
+    189, // uniffi_uniffi_bindings_tests_fn_func_create_async_test_trait_interface
     FfiConverterUInt32.lower(value),
 )
 return handleRustResult(
@@ -445,7 +445,7 @@ if (value instanceof UniffiSkipJsTypeCheck) {
     FfiConverterUInt32.checkType(value);
 }
 const result = UniFFIScaffolding.callSync(
-    183, // uniffi_uniffi_bindings_tests_fn_func_create_test_trait_interface
+    190, // uniffi_uniffi_bindings_tests_fn_func_create_test_trait_interface
     FfiConverterUInt32.lower(value),
 )
 return handleRustResult(
@@ -469,7 +469,7 @@ if (arg instanceof UniffiSkipJsTypeCheck) {
     FfiConverterString.checkType(arg);
 }
 const result = UniFFIScaffolding.callSync(
-    184, // uniffi_uniffi_bindings_tests_fn_func_func_with_default
+    191, // uniffi_uniffi_bindings_tests_fn_func_func_with_default
     FfiConverterString.lower(arg),
 )
 return handleRustResult(
@@ -492,7 +492,7 @@ if (input instanceof UniffiSkipJsTypeCheck) {
     FfiConverterUInt32.checkType(input);
 }
 const result = UniFFIScaffolding.callSync(
-    185, // uniffi_uniffi_bindings_tests_fn_func_func_with_error
+    192, // uniffi_uniffi_bindings_tests_fn_func_func_with_error
     FfiConverterUInt32.lower(input),
 )
 return handleRustResult(
@@ -515,7 +515,7 @@ if (input instanceof UniffiSkipJsTypeCheck) {
     FfiConverterUInt32.checkType(input);
 }
 const result = UniFFIScaffolding.callSync(
-    186, // uniffi_uniffi_bindings_tests_fn_func_func_with_flat_error
+    193, // uniffi_uniffi_bindings_tests_fn_func_func_with_flat_error
     FfiConverterUInt32.lower(input),
 )
 return handleRustResult(
@@ -540,7 +540,7 @@ if (theArgument instanceof UniffiSkipJsTypeCheck) {
     FfiConverterString.checkType(theArgument);
 }
 const result = UniFFIScaffolding.callSync(
-    187, // uniffi_uniffi_bindings_tests_fn_func_func_with_multi_word_arg
+    194, // uniffi_uniffi_bindings_tests_fn_func_func_with_multi_word_arg
     FfiConverterString.lower(theArgument),
 )
 return handleRustResult(
@@ -557,7 +557,7 @@ return handleRustResult(
 export async function getCustomTypesDemo() {
    
 const result = await UniFFIScaffolding.callAsyncWrapper(
-    188, // uniffi_uniffi_bindings_tests_fn_func_get_custom_types_demo
+    195, // uniffi_uniffi_bindings_tests_fn_func_get_custom_types_demo
 )
 return handleRustResult(
     result,
@@ -580,7 +580,7 @@ if (int instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeAsyncTestTraitInterface.checkType(int);
 }
 const result = await UniFFIScaffolding.callAsync(
-    189, // uniffi_uniffi_bindings_tests_fn_func_invoke_async_test_trait_interface_get_value
+    196, // uniffi_uniffi_bindings_tests_fn_func_invoke_async_test_trait_interface_get_value
     FfiConverterTypeAsyncTestTraitInterface.lower(int),
 )
 return handleRustResult(
@@ -603,7 +603,7 @@ if (int instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeAsyncTestTraitInterface.checkType(int);
 }
 const result = await UniFFIScaffolding.callAsync(
-    190, // uniffi_uniffi_bindings_tests_fn_func_invoke_async_test_trait_interface_noop
+    197, // uniffi_uniffi_bindings_tests_fn_func_invoke_async_test_trait_interface_noop
     FfiConverterTypeAsyncTestTraitInterface.lower(int),
 )
 return handleRustResult(
@@ -633,7 +633,7 @@ if (value instanceof UniffiSkipJsTypeCheck) {
     FfiConverterUInt32.checkType(value);
 }
 const result = await UniFFIScaffolding.callAsync(
-    191, // uniffi_uniffi_bindings_tests_fn_func_invoke_async_test_trait_interface_set_value
+    198, // uniffi_uniffi_bindings_tests_fn_func_invoke_async_test_trait_interface_set_value
     FfiConverterTypeAsyncTestTraitInterface.lower(int),
     FfiConverterUInt32.lower(value),
 )
@@ -665,7 +665,7 @@ if (numbers instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeCallbackInterfaceNumbers.checkType(numbers);
 }
 const result = await UniFFIScaffolding.callAsync(
-    192, // uniffi_uniffi_bindings_tests_fn_func_invoke_async_test_trait_interface_throw_if_equal
+    199, // uniffi_uniffi_bindings_tests_fn_func_invoke_async_test_trait_interface_throw_if_equal
     FfiConverterTypeAsyncTestTraitInterface.lower(int),
     FfiConverterTypeCallbackInterfaceNumbers.lower(numbers),
 )
@@ -690,7 +690,7 @@ if (cbi instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeTestAsyncCallbackInterface.checkType(cbi);
 }
 const result = await UniFFIScaffolding.callAsync(
-    193, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_async_callback_interface_get_value
+    200, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_async_callback_interface_get_value
     FfiConverterTypeTestAsyncCallbackInterface.lower(cbi),
 )
 return handleRustResult(
@@ -713,7 +713,7 @@ if (cbi instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeTestAsyncCallbackInterface.checkType(cbi);
 }
 const result = await UniFFIScaffolding.callAsync(
-    194, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_async_callback_interface_noop
+    201, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_async_callback_interface_noop
     FfiConverterTypeTestAsyncCallbackInterface.lower(cbi),
 )
 return handleRustResult(
@@ -743,7 +743,7 @@ if (value instanceof UniffiSkipJsTypeCheck) {
     FfiConverterUInt32.checkType(value);
 }
 const result = await UniFFIScaffolding.callAsync(
-    195, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_async_callback_interface_set_value
+    202, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_async_callback_interface_set_value
     FfiConverterTypeTestAsyncCallbackInterface.lower(cbi),
     FfiConverterUInt32.lower(value),
 )
@@ -775,7 +775,7 @@ if (numbers instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeCallbackInterfaceNumbers.checkType(numbers);
 }
 const result = await UniFFIScaffolding.callAsync(
-    196, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_async_callback_interface_throw_if_equal
+    203, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_async_callback_interface_throw_if_equal
     FfiConverterTypeTestAsyncCallbackInterface.lower(cbi),
     FfiConverterTypeCallbackInterfaceNumbers.lower(numbers),
 )
@@ -800,7 +800,7 @@ if (cbi instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeTestCallbackInterface.checkType(cbi);
 }
 const result = UniFFIScaffolding.callSync(
-    197, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_callback_interface_get_value
+    204, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_callback_interface_get_value
     FfiConverterTypeTestCallbackInterface.lower(cbi),
 )
 return handleRustResult(
@@ -823,7 +823,7 @@ if (cbi instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeTestCallbackInterface.checkType(cbi);
 }
 const result = UniFFIScaffolding.callSync(
-    198, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_callback_interface_noop
+    205, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_callback_interface_noop
     FfiConverterTypeTestCallbackInterface.lower(cbi),
 )
 return handleRustResult(
@@ -853,7 +853,7 @@ if (value instanceof UniffiSkipJsTypeCheck) {
     FfiConverterUInt32.checkType(value);
 }
 const result = UniFFIScaffolding.callSync(
-    199, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_callback_interface_set_value
+    206, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_callback_interface_set_value
     FfiConverterTypeTestCallbackInterface.lower(cbi),
     FfiConverterUInt32.lower(value),
 )
@@ -885,7 +885,7 @@ if (numbers instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeCallbackInterfaceNumbers.checkType(numbers);
 }
 const result = UniFFIScaffolding.callSync(
-    200, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_callback_interface_throw_if_equal
+    207, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_callback_interface_throw_if_equal
     FfiConverterTypeTestCallbackInterface.lower(cbi),
     FfiConverterTypeCallbackInterfaceNumbers.lower(numbers),
 )
@@ -910,7 +910,7 @@ if (int instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeTestTraitInterface.checkType(int);
 }
 const result = UniFFIScaffolding.callSync(
-    201, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_trait_interface_get_value
+    208, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_trait_interface_get_value
     FfiConverterTypeTestTraitInterface.lower(int),
 )
 return handleRustResult(
@@ -933,7 +933,7 @@ if (int instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeTestTraitInterface.checkType(int);
 }
 const result = UniFFIScaffolding.callSync(
-    202, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_trait_interface_noop
+    209, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_trait_interface_noop
     FfiConverterTypeTestTraitInterface.lower(int),
 )
 return handleRustResult(
@@ -963,7 +963,7 @@ if (value instanceof UniffiSkipJsTypeCheck) {
     FfiConverterUInt32.checkType(value);
 }
 const result = UniFFIScaffolding.callSync(
-    203, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_trait_interface_set_value
+    210, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_trait_interface_set_value
     FfiConverterTypeTestTraitInterface.lower(int),
     FfiConverterUInt32.lower(value),
 )
@@ -995,7 +995,7 @@ if (numbers instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeCallbackInterfaceNumbers.checkType(numbers);
 }
 const result = UniFFIScaffolding.callSync(
-    204, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_trait_interface_throw_if_equal
+    211, // uniffi_uniffi_bindings_tests_fn_func_invoke_test_trait_interface_throw_if_equal
     FfiConverterTypeTestTraitInterface.lower(int),
     FfiConverterTypeCallbackInterfaceNumbers.lower(numbers),
 )
@@ -1006,6 +1006,54 @@ return handleRustResult(
 )
 }
 
+/**
+ * roundtripAsyncTestTraitInterface
+ * @param {AsyncTestTraitInterface} int
+ * @returns {AsyncTestTraitInterface}
+ */
+export function roundtripAsyncTestTraitInterface(
+    int) {
+   
+if (int instanceof UniffiSkipJsTypeCheck) {
+    int = int.value;
+} else {
+    FfiConverterTypeAsyncTestTraitInterface.checkType(int);
+}
+const result = UniFFIScaffolding.callSync(
+    212, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_async_test_trait_interface
+    FfiConverterTypeAsyncTestTraitInterface.lower(int),
+)
+return handleRustResult(
+    result,
+    FfiConverterTypeAsyncTestTraitInterface.lift.bind(FfiConverterTypeAsyncTestTraitInterface),
+    null,
+)
+}
+
+/**
+ * roundtripAsyncTestTraitInterfaceList
+ * @param {Array.<AsyncTestTraitInterface>} intList
+ * @returns {Array.<AsyncTestTraitInterface>}
+ */
+export function roundtripAsyncTestTraitInterfaceList(
+    intList) {
+   
+if (intList instanceof UniffiSkipJsTypeCheck) {
+    intList = intList.value;
+} else {
+    FfiConverterSequenceTypeAsyncTestTraitInterface.checkType(intList);
+}
+const result = UniFFIScaffolding.callSync(
+    213, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_async_test_trait_interface_list
+    FfiConverterSequenceTypeAsyncTestTraitInterface.lower(intList),
+)
+return handleRustResult(
+    result,
+    FfiConverterSequenceTypeAsyncTestTraitInterface.lift.bind(FfiConverterSequenceTypeAsyncTestTraitInterface),
+    null,
+)
+}
+
 /**
  * roundtripBool
  * @param {boolean} a
@@ -1020,7 +1068,7 @@ if (a instanceof UniffiSkipJsTypeCheck) {
     FfiConverterBoolean.checkType(a);
 }
 const result = UniFFIScaffolding.callSync(
-    205, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_bool
+    214, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_bool
     FfiConverterBoolean.lower(a),
 )
 return handleRustResult(
@@ -1044,7 +1092,7 @@ if (a instanceof UniffiSkipJsTypeCheck) {
     FfiConverterOptionalSequenceMapStringUInt32.checkType(a);
 }
 const result = UniFFIScaffolding.callSync(
-    206, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_complex_compound
+    215, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_complex_compound
     FfiConverterOptionalSequenceMapStringUInt32.lower(a),
 )
 return handleRustResult(
@@ -1068,7 +1116,7 @@ if (en instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeComplexEnum.checkType(en);
 }
 const result = UniFFIScaffolding.callSync(
-    207, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_complex_enum
+    216, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_complex_enum
     FfiConverterTypeComplexEnum.lower(en),
 )
 return handleRustResult(
@@ -1092,7 +1140,7 @@ if (rec instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeComplexRec.checkType(rec);
 }
 const result = UniFFIScaffolding.callSync(
-    208, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_complex_rec
+    217, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_complex_rec
     FfiConverterTypeComplexRec.lower(rec),
 )
 return handleRustResult(
@@ -1116,7 +1164,7 @@ if (handle instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeHandle.checkType(handle);
 }
 const result = UniFFIScaffolding.callSync(
-    209, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_custom_type
+    218, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_custom_type
     FfiConverterTypeHandle.lower(handle),
 )
 return handleRustResult(
@@ -1140,7 +1188,7 @@ if (en instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeEnumNoData.checkType(en);
 }
 const result = UniFFIScaffolding.callSync(
-    210, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_enum_no_data
+    219, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_enum_no_data
     FfiConverterTypeEnumNoData.lower(en),
 )
 return handleRustResult(
@@ -1164,7 +1212,7 @@ if (en instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeEnumWithData.checkType(en);
 }
 const result = UniFFIScaffolding.callSync(
-    211, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_enum_with_data
+    220, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_enum_with_data
     FfiConverterTypeEnumWithData.lower(en),
 )
 return handleRustResult(
@@ -1188,7 +1236,7 @@ if (a instanceof UniffiSkipJsTypeCheck) {
     FfiConverterFloat32.checkType(a);
 }
 const result = UniFFIScaffolding.callSync(
-    212, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_f32
+    221, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_f32
     FfiConverterFloat32.lower(a),
 )
 return handleRustResult(
@@ -1212,7 +1260,7 @@ if (a instanceof UniffiSkipJsTypeCheck) {
     FfiConverterFloat64.checkType(a);
 }
 const result = UniFFIScaffolding.callSync(
-    213, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_f64
+    222, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_f64
     FfiConverterFloat64.lower(a),
 )
 return handleRustResult(
@@ -1236,7 +1284,7 @@ if (a instanceof UniffiSkipJsTypeCheck) {
     FfiConverterMapStringUInt32.checkType(a);
 }
 const result = UniFFIScaffolding.callSync(
-    214, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_hash_map
+    223, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_hash_map
     FfiConverterMapStringUInt32.lower(a),
 )
 return handleRustResult(
@@ -1260,7 +1308,7 @@ if (a instanceof UniffiSkipJsTypeCheck) {
     FfiConverterInt16.checkType(a);
 }
 const result = UniFFIScaffolding.callSync(
-    215, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_i16
+    224, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_i16
     FfiConverterInt16.lower(a),
 )
 return handleRustResult(
@@ -1284,7 +1332,7 @@ if (a instanceof UniffiSkipJsTypeCheck) {
     FfiConverterInt32.checkType(a);
 }
 const result = UniFFIScaffolding.callSync(
-    216, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_i32
+    225, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_i32
     FfiConverterInt32.lower(a),
 )
 return handleRustResult(
@@ -1308,7 +1356,7 @@ if (a instanceof UniffiSkipJsTypeCheck) {
     FfiConverterInt64.checkType(a);
 }
 const result = UniFFIScaffolding.callSync(
-    217, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_i64
+    226, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_i64
     FfiConverterInt64.lower(a),
 )
 return handleRustResult(
@@ -1332,7 +1380,7 @@ if (a instanceof UniffiSkipJsTypeCheck) {
     FfiConverterInt8.checkType(a);
 }
 const result = UniFFIScaffolding.callSync(
-    218, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_i8
+    227, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_i8
     FfiConverterInt8.lower(a),
 )
 return handleRustResult(
@@ -1356,7 +1404,7 @@ if (a instanceof UniffiSkipJsTypeCheck) {
     FfiConverterOptionalUInt32.checkType(a);
 }
 const result = UniFFIScaffolding.callSync(
-    219, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_option
+    228, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_option
     FfiConverterOptionalUInt32.lower(a),
 )
 return handleRustResult(
@@ -1380,7 +1428,7 @@ if (rec instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeSimpleRec.checkType(rec);
 }
 const result = await UniFFIScaffolding.callAsyncWrapper(
-    220, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_simple_rec
+    229, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_simple_rec
     FfiConverterTypeSimpleRec.lower(rec),
 )
 return handleRustResult(
@@ -1404,7 +1452,7 @@ if (a instanceof UniffiSkipJsTypeCheck) {
     FfiConverterString.checkType(a);
 }
 const result = UniFFIScaffolding.callSync(
-    221, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_string
+    230, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_string
     FfiConverterString.lower(a),
 )
 return handleRustResult(
@@ -1414,6 +1462,54 @@ return handleRustResult(
 )
 }
 
+/**
+ * roundtripTestTraitInterface
+ * @param {TestTraitInterface} int
+ * @returns {TestTraitInterface}
+ */
+export function roundtripTestTraitInterface(
+    int) {
+   
+if (int instanceof UniffiSkipJsTypeCheck) {
+    int = int.value;
+} else {
+    FfiConverterTypeTestTraitInterface.checkType(int);
+}
+const result = UniFFIScaffolding.callSync(
+    231, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_test_trait_interface
+    FfiConverterTypeTestTraitInterface.lower(int),
+)
+return handleRustResult(
+    result,
+    FfiConverterTypeTestTraitInterface.lift.bind(FfiConverterTypeTestTraitInterface),
+    null,
+)
+}
+
+/**
+ * roundtripTestTraitInterfaceList
+ * @param {Array.<TestTraitInterface>} intList
+ * @returns {Array.<TestTraitInterface>}
+ */
+export function roundtripTestTraitInterfaceList(
+    intList) {
+   
+if (intList instanceof UniffiSkipJsTypeCheck) {
+    intList = intList.value;
+} else {
+    FfiConverterSequenceTypeTestTraitInterface.checkType(intList);
+}
+const result = UniFFIScaffolding.callSync(
+    232, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_test_trait_interface_list
+    FfiConverterSequenceTypeTestTraitInterface.lower(intList),
+)
+return handleRustResult(
+    result,
+    FfiConverterSequenceTypeTestTraitInterface.lift.bind(FfiConverterSequenceTypeTestTraitInterface),
+    null,
+)
+}
+
 /**
  * roundtripTimeIntervalMs
  * @param {TimeIntervalMs} time
@@ -1428,7 +1524,7 @@ if (time instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeTimeIntervalMs.checkType(time);
 }
 const result = await UniFFIScaffolding.callAsyncWrapper(
-    222, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_time_interval_ms
+    233, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_time_interval_ms
     FfiConverterTypeTimeIntervalMs.lower(time),
 )
 return handleRustResult(
@@ -1452,7 +1548,7 @@ if (time instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeTimeIntervalSecDbl.checkType(time);
 }
 const result = await UniFFIScaffolding.callAsyncWrapper(
-    223, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_time_interval_sec_dbl
+    234, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_time_interval_sec_dbl
     FfiConverterTypeTimeIntervalSecDbl.lower(time),
 )
 return handleRustResult(
@@ -1476,7 +1572,7 @@ if (time instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeTimeIntervalSecFlt.checkType(time);
 }
 const result = await UniFFIScaffolding.callAsyncWrapper(
-    224, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_time_interval_sec_flt
+    235, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_time_interval_sec_flt
     FfiConverterTypeTimeIntervalSecFlt.lower(time),
 )
 return handleRustResult(
@@ -1500,7 +1596,7 @@ if (a instanceof UniffiSkipJsTypeCheck) {
     FfiConverterUInt16.checkType(a);
 }
 const result = UniFFIScaffolding.callSync(
-    225, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_u16
+    236, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_u16
     FfiConverterUInt16.lower(a),
 )
 return handleRustResult(
@@ -1524,7 +1620,7 @@ if (a instanceof UniffiSkipJsTypeCheck) {
     FfiConverterUInt32.checkType(a);
 }
 const result = UniFFIScaffolding.callSync(
-    226, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_u32
+    237, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_u32
     FfiConverterUInt32.lower(a),
 )
 return handleRustResult(
@@ -1548,7 +1644,7 @@ if (a instanceof UniffiSkipJsTypeCheck) {
     FfiConverterUInt64.checkType(a);
 }
 const result = UniFFIScaffolding.callSync(
-    227, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_u64
+    238, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_u64
     FfiConverterUInt64.lower(a),
 )
 return handleRustResult(
@@ -1572,7 +1668,7 @@ if (a instanceof UniffiSkipJsTypeCheck) {
     FfiConverterUInt8.checkType(a);
 }
 const result = UniFFIScaffolding.callSync(
-    228, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_u8
+    239, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_u8
     FfiConverterUInt8.lower(a),
 )
 return handleRustResult(
@@ -1596,7 +1692,7 @@ if (url instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeUrl.checkType(url);
 }
 const result = await UniFFIScaffolding.callAsyncWrapper(
-    229, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_url
+    240, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_url
     FfiConverterTypeUrl.lower(url),
 )
 return handleRustResult(
@@ -1620,7 +1716,7 @@ if (a instanceof UniffiSkipJsTypeCheck) {
     FfiConverterSequenceUInt32.checkType(a);
 }
 const result = UniFFIScaffolding.callSync(
-    230, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_vec
+    241, // uniffi_uniffi_bindings_tests_fn_func_roundtrip_vec
     FfiConverterSequenceUInt32.lower(a),
 )
 return handleRustResult(
@@ -1714,7 +1810,7 @@ if (negate instanceof UniffiSkipJsTypeCheck) {
     FfiConverterBoolean.checkType(negate);
 }
 const result = UniFFIScaffolding.callSync(
-    231, // uniffi_uniffi_bindings_tests_fn_func_sum_with_many_types
+    242, // uniffi_uniffi_bindings_tests_fn_func_sum_with_many_types
     FfiConverterUInt8.lower(a),
     FfiConverterInt8.lower(b),
     FfiConverterUInt16.lower(c),
@@ -1748,7 +1844,7 @@ if (interfaces instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeTwoTestInterfaces.checkType(interfaces);
 }
 const result = UniFFIScaffolding.callSync(
-    232, // uniffi_uniffi_bindings_tests_fn_func_swap_test_interfaces
+    243, // uniffi_uniffi_bindings_tests_fn_func_swap_test_interfaces
     FfiConverterTypeTwoTestInterfaces.lower(interfaces),
 )
 return handleRustResult(
@@ -1764,7 +1860,7 @@ return handleRustResult(
 export function testFunc() {
    
 const result = UniFFIScaffolding.callSync(
-    233, // uniffi_uniffi_bindings_tests_fn_func_test_func
+    244, // uniffi_uniffi_bindings_tests_fn_func_test_func
 )
 return handleRustResult(
     result,
@@ -2748,7 +2844,7 @@ export class TestInterface extends TestInterfaceInterface {
             FfiConverterUInt32.checkType(value);
         }
         const result = UniFFIScaffolding.callSync(
-            234, // uniffi_uniffi_bindings_tests_fn_constructor_testinterface_new
+            245, // uniffi_uniffi_bindings_tests_fn_constructor_testinterface_new
             FfiConverterUInt32.lower(value),
         )
         return handleRustResult(
@@ -2765,7 +2861,7 @@ export class TestInterface extends TestInterfaceInterface {
     getValue() {
        
         const result = UniFFIScaffolding.callSync(
-            235, // uniffi_uniffi_bindings_tests_fn_method_testinterface_get_value
+            246, // uniffi_uniffi_bindings_tests_fn_method_testinterface_get_value
             FfiConverterTypeTestInterface.lowerReceiver(this),
         )
         return handleRustResult(
@@ -2784,7 +2880,7 @@ export class TestInterface extends TestInterfaceInterface {
     refCount() {
        
         const result = UniFFIScaffolding.callSync(
-            236, // uniffi_uniffi_bindings_tests_fn_method_testinterface_ref_count
+            247, // uniffi_uniffi_bindings_tests_fn_method_testinterface_ref_count
             FfiConverterTypeTestInterface.lowerReceiver(this),
         )
         return handleRustResult(
@@ -3563,7 +3659,7 @@ export class AsyncInterface extends AsyncInterfaceInterface {
             FfiConverterString.checkType(name);
         }
         const result = UniFFIScaffolding.callSync(
-            237, // uniffi_uniffi_bindings_tests_fn_constructor_asyncinterface_new
+            248, // uniffi_uniffi_bindings_tests_fn_constructor_asyncinterface_new
             FfiConverterString.lower(name),
         )
         return handleRustResult(
@@ -3580,7 +3676,7 @@ export class AsyncInterface extends AsyncInterfaceInterface {
     async name() {
        
         const result = await UniFFIScaffolding.callAsync(
-            238, // uniffi_uniffi_bindings_tests_fn_method_asyncinterface_name
+            249, // uniffi_uniffi_bindings_tests_fn_method_asyncinterface_name
             FfiConverterTypeAsyncInterface.lowerReceiver(this),
         )
         return handleRustResult(
@@ -3691,7 +3787,7 @@ export class AsyncTestTraitInterfaceImpl extends AsyncTestTraitInterface {
     async noop() {
        
         const result = await UniFFIScaffolding.callAsync(
-            239, // uniffi_uniffi_bindings_tests_fn_method_asynctesttraitinterface_noop
+            250, // uniffi_uniffi_bindings_tests_fn_method_asynctesttraitinterface_noop
             FfiConverterTypeAsyncTestTraitInterface.lowerReceiver(this),
         )
         return handleRustResult(
@@ -3708,7 +3804,7 @@ export class AsyncTestTraitInterfaceImpl extends AsyncTestTraitInterface {
     async getValue() {
        
         const result = await UniFFIScaffolding.callAsync(
-            240, // uniffi_uniffi_bindings_tests_fn_method_asynctesttraitinterface_get_value
+            251, // uniffi_uniffi_bindings_tests_fn_method_asynctesttraitinterface_get_value
             FfiConverterTypeAsyncTestTraitInterface.lowerReceiver(this),
         )
         return handleRustResult(
@@ -3731,7 +3827,7 @@ export class AsyncTestTraitInterfaceImpl extends AsyncTestTraitInterface {
             FfiConverterUInt32.checkType(value);
         }
         const result = await UniFFIScaffolding.callAsync(
-            241, // uniffi_uniffi_bindings_tests_fn_method_asynctesttraitinterface_set_value
+            252, // uniffi_uniffi_bindings_tests_fn_method_asynctesttraitinterface_set_value
             FfiConverterTypeAsyncTestTraitInterface.lowerReceiver(this),
             FfiConverterUInt32.lower(value),
         )
@@ -3759,7 +3855,7 @@ export class AsyncTestTraitInterfaceImpl extends AsyncTestTraitInterface {
             FfiConverterTypeCallbackInterfaceNumbers.checkType(numbers);
         }
         const result = await UniFFIScaffolding.callAsync(
-            242, // uniffi_uniffi_bindings_tests_fn_method_asynctesttraitinterface_throw_if_equal
+            253, // uniffi_uniffi_bindings_tests_fn_method_asynctesttraitinterface_throw_if_equal
             FfiConverterTypeAsyncTestTraitInterface.lowerReceiver(this),
             FfiConverterTypeCallbackInterfaceNumbers.lower(numbers),
         )
@@ -3777,19 +3873,30 @@ export class AsyncTestTraitInterfaceImpl extends AsyncTestTraitInterface {
 //
 // Export the FFIConverter object to make external types work.
 export class FfiConverterTypeAsyncTestTraitInterface extends FfiConverter {
-    // lift works like a regular interface
-    static lift(value) {
-        const opts = {};
-        opts[constructUniffiObject] = value;
-        return new AsyncTestTraitInterfaceImpl(opts);
+    static lift(handle) {
+        if (handle instanceof UniFFIPointer) {
+          // Rust handle.  Construct an object from it
+          const opts = {};
+          opts[constructUniffiObject] = handle;
+          return new AsyncTestTraitInterfaceImpl(opts);
+        } else {
+          // JS handle.  Get the JS object from the callback handler
+          return uniffiCallbackHandlerUniffiBindingsTestsAsyncTestTraitInterface.takeCallbackObj(handle)
+        }
     }
 
-    // lower treats value like a callback interface
     static lower(value) {
-        if (!(value instanceof AsyncTestTraitInterface)) {
-            throw new UniFFITypeError("expected 'AsyncTestTraitInterface' subclass");
+        const ptr = value[uniffiObjectPtr];
+        if (ptr instanceof UniFFIPointer) {
+          // Rust-implemented interface, return the ptr.  The C++ code will clone it.
+          return ptr;
+        } else {
+          // JS-implemented interface, store the object in the handle map and return the handle
+          if (!(value instanceof AsyncTestTraitInterface)) {
+              throw new UniFFITypeError("expected 'AsyncTestTraitInterface' subclass");
+          }
+          return uniffiCallbackHandlerUniffiBindingsTestsAsyncTestTraitInterface.storeCallbackObj(value)
         }
-        return uniffiCallbackHandlerUniffiBindingsTestsAsyncTestTraitInterface.storeCallbackObj(value)
     }
 
     // lowerReceiver is used when calling methods on an interface we got from Rust, 
@@ -3803,11 +3910,16 @@ export class FfiConverterTypeAsyncTestTraitInterface extends FfiConverter {
     }
 
     static read(dataStream) {
-        return this.lift(dataStream.readPointer(25));
+        return this.lift(dataStream.readHandleOrPointer(25))
     }
 
     static write(dataStream, value) {
-        dataStream.writePointer(25, this.lower(value));
+        if (value[uniffiObjectPtr] instanceof UniFFIPointer) {
+          // Rust-implemented interface, return the ptr.
+          dataStream.writePointer(25, this.lower(value));
+        } else {
+          dataStream.writeInt64(this.lower(value))
+        }
     }
 
     static computeSize(value) {
@@ -3915,7 +4027,7 @@ export class ComplexMethods extends ComplexMethodsInterface {
     static init() {
        
         const result = UniFFIScaffolding.callSync(
-            243, // uniffi_uniffi_bindings_tests_fn_constructor_complexmethods_new
+            254, // uniffi_uniffi_bindings_tests_fn_constructor_complexmethods_new
         )
         return handleRustResult(
             result,
@@ -3938,7 +4050,7 @@ export class ComplexMethods extends ComplexMethodsInterface {
             FfiConverterString.checkType(arg);
         }
         const result = UniFFIScaffolding.callSync(
-            244, // uniffi_uniffi_bindings_tests_fn_method_complexmethods_method_with_default
+            255, // uniffi_uniffi_bindings_tests_fn_method_complexmethods_method_with_default
             FfiConverterTypeComplexMethods.lowerReceiver(this),
             FfiConverterString.lower(arg),
         )
@@ -3963,7 +4075,7 @@ export class ComplexMethods extends ComplexMethodsInterface {
             FfiConverterString.checkType(theArgument);
         }
         const result = UniFFIScaffolding.callSync(
-            245, // uniffi_uniffi_bindings_tests_fn_method_complexmethods_method_with_multi_word_arg
+            256, // uniffi_uniffi_bindings_tests_fn_method_complexmethods_method_with_multi_word_arg
             FfiConverterTypeComplexMethods.lowerReceiver(this),
             FfiConverterString.lower(theArgument),
         )
@@ -4075,7 +4187,7 @@ export class TestTraitInterfaceImpl extends TestTraitInterface {
     noop() {
        
         const result = UniFFIScaffolding.callSync(
-            246, // uniffi_uniffi_bindings_tests_fn_method_testtraitinterface_noop
+            257, // uniffi_uniffi_bindings_tests_fn_method_testtraitinterface_noop
             FfiConverterTypeTestTraitInterface.lowerReceiver(this),
         )
         return handleRustResult(
@@ -4092,7 +4204,7 @@ export class TestTraitInterfaceImpl extends TestTraitInterface {
     getValue() {
        
         const result = UniFFIScaffolding.callSync(
-            247, // uniffi_uniffi_bindings_tests_fn_method_testtraitinterface_get_value
+            258, // uniffi_uniffi_bindings_tests_fn_method_testtraitinterface_get_value
             FfiConverterTypeTestTraitInterface.lowerReceiver(this),
         )
         return handleRustResult(
@@ -4115,7 +4227,7 @@ export class TestTraitInterfaceImpl extends TestTraitInterface {
             FfiConverterUInt32.checkType(value);
         }
         const result = UniFFIScaffolding.callSync(
-            248, // uniffi_uniffi_bindings_tests_fn_method_testtraitinterface_set_value
+            259, // uniffi_uniffi_bindings_tests_fn_method_testtraitinterface_set_value
             FfiConverterTypeTestTraitInterface.lowerReceiver(this),
             FfiConverterUInt32.lower(value),
         )
@@ -4143,7 +4255,7 @@ export class TestTraitInterfaceImpl extends TestTraitInterface {
             FfiConverterTypeCallbackInterfaceNumbers.checkType(numbers);
         }
         const result = UniFFIScaffolding.callSync(
-            249, // uniffi_uniffi_bindings_tests_fn_method_testtraitinterface_throw_if_equal
+            260, // uniffi_uniffi_bindings_tests_fn_method_testtraitinterface_throw_if_equal
             FfiConverterTypeTestTraitInterface.lowerReceiver(this),
             FfiConverterTypeCallbackInterfaceNumbers.lower(numbers),
         )
@@ -4161,19 +4273,30 @@ export class TestTraitInterfaceImpl extends TestTraitInterface {
 //
 // Export the FFIConverter object to make external types work.
 export class FfiConverterTypeTestTraitInterface extends FfiConverter {
-    // lift works like a regular interface
-    static lift(value) {
-        const opts = {};
-        opts[constructUniffiObject] = value;
-        return new TestTraitInterfaceImpl(opts);
+    static lift(handle) {
+        if (handle instanceof UniFFIPointer) {
+          // Rust handle.  Construct an object from it
+          const opts = {};
+          opts[constructUniffiObject] = handle;
+          return new TestTraitInterfaceImpl(opts);
+        } else {
+          // JS handle.  Get the JS object from the callback handler
+          return uniffiCallbackHandlerUniffiBindingsTestsTestTraitInterface.takeCallbackObj(handle)
+        }
     }
 
-    // lower treats value like a callback interface
     static lower(value) {
-        if (!(value instanceof TestTraitInterface)) {
-            throw new UniFFITypeError("expected 'TestTraitInterface' subclass");
+        const ptr = value[uniffiObjectPtr];
+        if (ptr instanceof UniFFIPointer) {
+          // Rust-implemented interface, return the ptr.  The C++ code will clone it.
+          return ptr;
+        } else {
+          // JS-implemented interface, store the object in the handle map and return the handle
+          if (!(value instanceof TestTraitInterface)) {
+              throw new UniFFITypeError("expected 'TestTraitInterface' subclass");
+          }
+          return uniffiCallbackHandlerUniffiBindingsTestsTestTraitInterface.storeCallbackObj(value)
         }
-        return uniffiCallbackHandlerUniffiBindingsTestsTestTraitInterface.storeCallbackObj(value)
     }
 
     // lowerReceiver is used when calling methods on an interface we got from Rust, 
@@ -4187,11 +4310,16 @@ export class FfiConverterTypeTestTraitInterface extends FfiConverter {
     }
 
     static read(dataStream) {
-        return this.lift(dataStream.readPointer(27));
+        return this.lift(dataStream.readHandleOrPointer(27))
     }
 
     static write(dataStream, value) {
-        dataStream.writePointer(27, this.lower(value));
+        if (value[uniffiObjectPtr] instanceof UniFFIPointer) {
+          // Rust-implemented interface, return the ptr.
+          dataStream.writePointer(27, this.lower(value));
+        } else {
+          dataStream.writeInt64(this.lower(value))
+        }
     }
 
     static computeSize(value) {
@@ -4297,7 +4425,7 @@ export class FfiConverterTypeTestAsyncCallbackInterface extends FfiConverter {
     }
 
     static lift(handleId) {
-        return uniffiCallbackHandlerUniffiBindingsTestsTestAsyncCallbackInterface.getCallbackObj(handleId)
+        return uniffiCallbackHandlerUniffiBindingsTestsTestAsyncCallbackInterface.takeCallbackObj(handleId)
     }
 
     static read(dataStream) {
@@ -4410,7 +4538,7 @@ export class FfiConverterTypeTestCallbackInterface extends FfiConverter {
     }
 
     static lift(handleId) {
-        return uniffiCallbackHandlerUniffiBindingsTestsTestCallbackInterface.getCallbackObj(handleId)
+        return uniffiCallbackHandlerUniffiBindingsTestsTestCallbackInterface.takeCallbackObj(handleId)
     }
 
     static read(dataStream) {
@@ -4572,6 +4700,49 @@ export class FfiConverterSequenceUInt32 extends FfiConverterArrayBuffer {
         })
     }
 }
+// Export the FFIConverter object to make external types work.
+export class FfiConverterSequenceTypeAsyncTestTraitInterface extends FfiConverterArrayBuffer {
+    static read(dataStream) {
+        const len = dataStream.readInt32();
+        const arr = [];
+        for (let i = 0; i < len; i++) {
+            arr.push(FfiConverterTypeAsyncTestTraitInterface.read(dataStream));
+        }
+        return arr;
+    }
+
+    static write(dataStream, value) {
+        dataStream.writeInt32(value.length);
+        value.forEach((innerValue) => {
+            FfiConverterTypeAsyncTestTraitInterface.write(dataStream, innerValue);
+        })
+    }
+
+    static computeSize(value) {
+        // The size of the length
+        let size = 4;
+        for (const innerValue of value) {
+            size += FfiConverterTypeAsyncTestTraitInterface.computeSize(innerValue);
+        }
+        return size;
+    }
+
+    static checkType(value) {
+        if (!Array.isArray(value)) {
+            throw new UniFFITypeError(`${value} is not an array`);
+        }
+        value.forEach((innerValue, idx) => {
+            try {
+                FfiConverterTypeAsyncTestTraitInterface.checkType(innerValue);
+            } catch (e) {
+                if (e instanceof UniFFITypeError) {
+                    e.addItemDescriptionPart(`[${idx}]`);
+                }
+                throw e;
+            }
+        })
+    }
+}
 
 
 // Export the FFIConverter object to make external types work.
@@ -4743,6 +4914,49 @@ export class FfiConverterOptionalUInt32 extends FfiConverterArrayBuffer {
         return 1 + FfiConverterUInt32.computeSize(value)
     }
 }
+// Export the FFIConverter object to make external types work.
+export class FfiConverterSequenceTypeTestTraitInterface extends FfiConverterArrayBuffer {
+    static read(dataStream) {
+        const len = dataStream.readInt32();
+        const arr = [];
+        for (let i = 0; i < len; i++) {
+            arr.push(FfiConverterTypeTestTraitInterface.read(dataStream));
+        }
+        return arr;
+    }
+
+    static write(dataStream, value) {
+        dataStream.writeInt32(value.length);
+        value.forEach((innerValue) => {
+            FfiConverterTypeTestTraitInterface.write(dataStream, innerValue);
+        })
+    }
+
+    static computeSize(value) {
+        // The size of the length
+        let size = 4;
+        for (const innerValue of value) {
+            size += FfiConverterTypeTestTraitInterface.computeSize(innerValue);
+        }
+        return size;
+    }
+
+    static checkType(value) {
+        if (!Array.isArray(value)) {
+            throw new UniFFITypeError(`${value} is not an array`);
+        }
+        value.forEach((innerValue, idx) => {
+            try {
+                FfiConverterTypeTestTraitInterface.checkType(innerValue);
+            } catch (e) {
+                if (e instanceof UniFFITypeError) {
+                    e.addItemDescriptionPart(`[${idx}]`);
+                }
+                throw e;
+            }
+        })
+    }
+}
 // Wrapper to skip type checking for function arguments
 //
 // This is only defined and used on test fixtures.  The goal is to skip the JS type checking so that
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/tests/generated/RustUniffiBindingsTestsCollision.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/tests/generated/RustUniffiBindingsTestsCollision.sys.mjs
index 83da36618e443..e41421cefc324 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/tests/generated/RustUniffiBindingsTestsCollision.sys.mjs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/tests/generated/RustUniffiBindingsTestsCollision.sys.mjs
@@ -46,7 +46,7 @@ if (cb instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeTestCallbackInterface.checkType(cb);
 }
 const result = UniFFIScaffolding.callSync(
-    250, // uniffi_uniffi_bindings_tests_collision_fn_func_invoke_collision_callback
+    261, // uniffi_uniffi_bindings_tests_collision_fn_func_invoke_collision_callback
     FfiConverterTypeTestCallbackInterface.lower(cb),
 )
 return handleRustResult(
@@ -84,7 +84,7 @@ export class FfiConverterTypeTestCallbackInterface extends FfiConverter {
     }
 
     static lift(handleId) {
-        return uniffiCallbackHandlerUniffiBindingsTestsCollisionTestCallbackInterface.getCallbackObj(handleId)
+        return uniffiCallbackHandlerUniffiBindingsTestsCollisionTestCallbackInterface.takeCallbackObj(handleId)
     }
 
     static read(dataStream) {
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/tests/generated/RustUniffiBindingsTestsExternalTypes.sys.mjs b/toolkit/components/uniffi-bindgen-gecko-js/tests/generated/RustUniffiBindingsTestsExternalTypes.sys.mjs
index baf445e5a865e..3ae65f4032da5 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/tests/generated/RustUniffiBindingsTestsExternalTypes.sys.mjs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/tests/generated/RustUniffiBindingsTestsExternalTypes.sys.mjs
@@ -46,7 +46,7 @@ if (custom instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeHandle.checkType(custom);
 }
 const result = UniFFIScaffolding.callSync(
-    251, // uniffi_uniffi_bindings_tests_external_types_fn_func_roundtrip_ext_custom_type
+    262, // uniffi_uniffi_bindings_tests_external_types_fn_func_roundtrip_ext_custom_type
     FfiConverterTypeHandle.lower(custom),
 )
 return handleRustResult(
@@ -70,7 +70,7 @@ if (en instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeEnumWithData.checkType(en);
 }
 const result = UniFFIScaffolding.callSync(
-    252, // uniffi_uniffi_bindings_tests_external_types_fn_func_roundtrip_ext_enum
+    263, // uniffi_uniffi_bindings_tests_external_types_fn_func_roundtrip_ext_enum
     FfiConverterTypeEnumWithData.lower(en),
 )
 return handleRustResult(
@@ -94,7 +94,7 @@ if (int instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeTestInterface.checkType(int);
 }
 const result = UniFFIScaffolding.callSync(
-    253, // uniffi_uniffi_bindings_tests_external_types_fn_func_roundtrip_ext_interface
+    264, // uniffi_uniffi_bindings_tests_external_types_fn_func_roundtrip_ext_interface
     FfiConverterTypeTestInterface.lower(int),
 )
 return handleRustResult(
@@ -118,7 +118,7 @@ if (rec instanceof UniffiSkipJsTypeCheck) {
     FfiConverterTypeSimpleRec.checkType(rec);
 }
 const result = UniFFIScaffolding.callSync(
-    254, // uniffi_uniffi_bindings_tests_external_types_fn_func_roundtrip_ext_record
+    265, // uniffi_uniffi_bindings_tests_external_types_fn_func_roundtrip_ext_record
     FfiConverterTypeSimpleRec.lower(rec),
 )
 return handleRustResult(
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/tests/xpcshell/test_trait_interfaces.js b/toolkit/components/uniffi-bindgen-gecko-js/tests/xpcshell/test_trait_interfaces.js
index 64513ec828ede..c4b4ec38794f3 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/tests/xpcshell/test_trait_interfaces.js
+++ b/toolkit/components/uniffi-bindgen-gecko-js/tests/xpcshell/test_trait_interfaces.js
@@ -10,6 +10,10 @@ const {
   invokeAsyncTestTraitInterfaceThrowIfEqual,
   invokeTestTraitInterfaceNoop,
   invokeTestTraitInterfaceSetValue,
+  roundtripAsyncTestTraitInterface,
+  roundtripAsyncTestTraitInterfaceList,
+  roundtripTestTraitInterface,
+  roundtripTestTraitInterfaceList,
   Failure1,
   AsyncTestTraitInterface,
   CallbackInterfaceNumbers,
@@ -48,9 +52,8 @@ class TraitImpl extends TestTraitInterface {
   }
 }
 
-// Test calling the Rust impl from JS
-add_task(() => {
-  const int = createTestTraitInterface(42);
+// Test calling sync trait interfaces from JS
+function testSyncTraitInterfaceFromJs(int) {
   int.noop();
   Assert.equal(int.getValue(), 42);
   int.setValue(43);
@@ -77,37 +80,51 @@ add_task(() => {
       b: 11,
     })
   );
-});
+}
 
-// Test calling the async Rust impl from JS
-add_task(async () => {
-  const int = await createAsyncTestTraitInterface(42);
-  await int.noop();
-  Assert.equal(await int.getValue(), 42);
-  await int.setValue(43);
-  Assert.equal(await int.getValue(), 43);
-  await Assert.rejects(
-    int.throwIfEqual(
-      new CallbackInterfaceNumbers({
-        a: 10,
-        b: 10,
-      })
-    ),
-    Failure1
-  );
-  Assert.deepEqual(
-    await int.throwIfEqual(
-      new CallbackInterfaceNumbers({
-        a: 10,
-        b: 11,
-      })
-    ),
-    new CallbackInterfaceNumbers({
-      a: 10,
-      b: 11,
-    })
-  );
-});
+// Test calling sync JS interfaces from Rust
+//
+// We can't test that much, since sync callback interfaces are automatically wrapped to be
+// fire-and-forget and can't return values
+function testSyncTraitInterfaceFromRust(int) {
+  // Arrange for `noop()` to be called, then wait a while and make sure nothing crashes.
+  invokeTestTraitInterfaceNoop(int);
+  do_test_pending();
+  do_timeout(100, do_test_finished);
+
+  // Arrange for `setValue` to be called and test that it happened
+  invokeTestTraitInterfaceSetValue(int, 43);
+  do_test_pending();
+  do_timeout(100, () => {
+    Assert.equal(int.getValue(), 43);
+    do_test_finished();
+  });
+}
+
+// Test various combinations of Rust and JS implemented trait interfaces
+add_task(() => testSyncTraitInterfaceFromJs(createTestTraitInterface(42)));
+add_task(() => testSyncTraitInterfaceFromRust(new TraitImpl(42)));
+// Test passing async trait interfaces back and forth across the FFI
+add_task(() =>
+  testSyncTraitInterfaceFromJs(
+    roundtripTestTraitInterface(createTestTraitInterface(42))
+  )
+);
+add_task(() =>
+  testSyncTraitInterfaceFromRust(roundtripTestTraitInterface(new TraitImpl(42)))
+);
+// This time, pass them across the FFI using a RustBuffer, which goes through a slightly different
+// codepath
+add_task(() =>
+  testSyncTraitInterfaceFromJs(
+    roundtripTestTraitInterfaceList([createTestTraitInterface(42)])[0]
+  )
+);
+add_task(() =>
+  testSyncTraitInterfaceFromRust(
+    roundtripTestTraitInterfaceList([new TraitImpl(42)])[0]
+  )
+);
 
 /**
  *
@@ -140,36 +157,14 @@ class AsyncTraitImpl extends AsyncTestTraitInterface {
   }
 }
 
-// Test calling sync JS interfaces from Rust
-//
-// We can't test that much, since sync callback interfaces are automatically wrapped to be
-// fire-and-forget and can't return values
-add_task(async () => {
-  const int = new TraitImpl(42);
-  // Arrange for `noop()` to be called, then wait a while and make sure nothing crashes.
-  invokeTestTraitInterfaceNoop(int);
-  do_test_pending();
-  do_timeout(100, do_test_finished);
-
-  // Arrange for `setValue` to be called and test that it happened
-  invokeTestTraitInterfaceSetValue(int, 43);
-  do_test_pending();
-  do_timeout(100, () => {
-    Assert.equal(int.getValue(), 43);
-    do_test_finished();
-  });
-});
-
-// Test calling async JS interfaces from Rust
-add_task(async () => {
-  const int = new AsyncTraitImpl(42);
-  await invokeAsyncTestTraitInterfaceNoop(int);
-  Assert.equal(await invokeAsyncTestTraitInterfaceGetValue(int), 42);
-  await invokeAsyncTestTraitInterfaceSetValue(int, 43);
-  Assert.equal(await invokeAsyncTestTraitInterfaceGetValue(int), 43);
+// Test calling the async Rust impl from JS
+async function testAsyncTraitInterfaceFromJs(int) {
+  await int.noop();
+  Assert.equal(await int.getValue(), 42);
+  await int.setValue(43);
+  Assert.equal(await int.getValue(), 43);
   await Assert.rejects(
-    invokeAsyncTestTraitInterfaceThrowIfEqual(
-      int,
+    int.throwIfEqual(
       new CallbackInterfaceNumbers({
         a: 10,
         b: 10,
@@ -178,8 +173,7 @@ add_task(async () => {
     Failure1
   );
   Assert.deepEqual(
-    await invokeAsyncTestTraitInterfaceThrowIfEqual(
-      int,
+    await int.throwIfEqual(
       new CallbackInterfaceNumbers({
         a: 10,
         b: 11,
@@ -190,28 +184,10 @@ add_task(async () => {
       b: 11,
     })
   );
-});
-
-// Test calling a Rust trait interface from Rust -- after roundtripping it through JS
-add_task(async () => {
-  const int = createTestTraitInterface(42);
-  // Arrange for `noop()` to be called, then wait a while and make sure nothing crashes.
-  invokeTestTraitInterfaceNoop(int);
-  do_test_pending();
-  do_timeout(100, do_test_finished);
-
-  // Arrange for `setValue` to be called and test that it happened
-  invokeTestTraitInterfaceSetValue(int, 43);
-  do_test_pending();
-  do_timeout(100, () => {
-    Assert.equal(int.getValue(), 43);
-    do_test_finished();
-  });
-});
+}
 
-// Test calling an async Rust trait interface from Rust -- after roundtripping it through JS
-add_task(async () => {
-  const int = await createAsyncTestTraitInterface(42);
+// Test calling async JS interfaces from Rust
+async function testAsyncTraitInterfaceFromRust(int) {
   await invokeAsyncTestTraitInterfaceNoop(int);
   Assert.equal(await invokeAsyncTestTraitInterfaceGetValue(int), 42);
   await invokeAsyncTestTraitInterfaceSetValue(int, 43);
@@ -239,4 +215,34 @@ add_task(async () => {
       b: 11,
     })
   );
-});
+}
+
+add_task(async () =>
+  testAsyncTraitInterfaceFromJs(await createAsyncTestTraitInterface(42))
+);
+add_task(async () => testAsyncTraitInterfaceFromRust(new AsyncTraitImpl(42)));
+// Test passing async trait interfaces back and forth across the FFI
+add_task(async () =>
+  testAsyncTraitInterfaceFromJs(
+    roundtripAsyncTestTraitInterface(await createAsyncTestTraitInterface(42))
+  )
+);
+add_task(async () =>
+  testAsyncTraitInterfaceFromRust(
+    roundtripAsyncTestTraitInterface(new AsyncTraitImpl(42))
+  )
+);
+// This time, pass them across the FFI using a RustBuffer, which goes through a slightly different
+// codepath
+add_task(async () =>
+  testAsyncTraitInterfaceFromJs(
+    roundtripAsyncTestTraitInterfaceList([
+      await createAsyncTestTraitInterface(42),
+    ])[0]
+  )
+);
+add_task(async () =>
+  testAsyncTraitInterfaceFromRust(
+    roundtripAsyncTestTraitInterfaceList([new AsyncTraitImpl(42)])[0]
+  )
+);
diff --git a/toolkit/components/uniffi-bindgen-gecko-js/uniffi_bindings_tests/src/trait_interfaces.rs b/toolkit/components/uniffi-bindgen-gecko-js/uniffi_bindings_tests/src/trait_interfaces.rs
index b6c5bb4efdfab..ced648d91ba9e 100644
--- a/toolkit/components/uniffi-bindgen-gecko-js/uniffi_bindings_tests/src/trait_interfaces.rs
+++ b/toolkit/components/uniffi-bindgen-gecko-js/uniffi_bindings_tests/src/trait_interfaces.rs
@@ -63,6 +63,16 @@ fn create_test_trait_interface(value: u32) -> Arc<dyn TestTraitInterface> {
     })
 }
 
+#[uniffi::export]
+pub fn roundtrip_test_trait_interface(int: Arc<dyn TestTraitInterface>) -> Arc<dyn TestTraitInterface> {
+    int
+}
+
+#[uniffi::export]
+pub fn roundtrip_test_trait_interface_list(int_list: Vec<Arc<dyn TestTraitInterface>>) -> Vec<Arc<dyn TestTraitInterface>> {
+    int_list
+}
+
 struct TestTraitInterfaceImpl {
     value: AtomicU32,
 }
@@ -117,6 +127,16 @@ fn create_async_test_trait_interface(value: u32) -> Arc<dyn AsyncTestTraitInterf
     })
 }
 
+#[uniffi::export]
+fn roundtrip_async_test_trait_interface(int: Arc<dyn AsyncTestTraitInterface>) -> Arc<dyn AsyncTestTraitInterface> {
+    int
+}
+
+#[uniffi::export]
+fn roundtrip_async_test_trait_interface_list(int_list: Vec<Arc<dyn AsyncTestTraitInterface>>) -> Vec<Arc<dyn AsyncTestTraitInterface>> {
+    int_list
+}
+
 #[uniffi::export]
 async fn invoke_async_test_trait_interface_noop(int: Arc<dyn AsyncTestTraitInterface>) {
     int.noop().await
@@ -132,7 +152,6 @@ async fn invoke_async_test_trait_interface_set_value(
     int: Arc<dyn AsyncTestTraitInterface>,
     value: u32,
 ) {
-    println!("**** invoke_async_test_trait_interface_set_value {value}");
     int.set_value(value).await
 }
 
diff --git a/toolkit/components/uniffi-js/Callbacks.cpp b/toolkit/components/uniffi-js/Callbacks.cpp
index 49ef0195fb051..5668f567c3097 100644
--- a/toolkit/components/uniffi-js/Callbacks.cpp
+++ b/toolkit/components/uniffi-js/Callbacks.cpp
@@ -12,6 +12,7 @@
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/UniFFIBinding.h"
 #include "mozilla/uniffi/Callbacks.h"
+#include "mozilla/Atomics.h"
 #include "mozilla/Logging.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/UniquePtr.h"
@@ -19,6 +20,50 @@
 namespace mozilla::uniffi {
 extern mozilla::LazyLogModule gUniffiLogger;
 
+// Type we'll be using to store callback handle ref counts
+//
+// 32-bits should never overflow and ReleaseAcquire is the recommended memory
+// ordering for reference counts:
+// https://searchfox.org/firefox-main/rev/f26084f2dfc00c1e10377d4433cfea594f7ea8c2/mfbt/Atomics.h#114-119
+using HandleRefCount = Atomic<uint32_t, MemoryOrdering::ReleaseAcquire>;
+
+uint64_t CallbackHandleCreate() {
+  // This allocates an atomic u32 that stores the ref count.
+  // We cast the address to a `u64`, which will be the handle.
+  //
+  // Another approach would be to create a HashMap that maps handles to their
+  // refcounts. However, that would require a lock and global initialization.
+  // This works in a similar way, but instead of generating a handle and
+  // inserting it into the map, we call `new` to allocate a memory location and
+  // use the address as the handle.
+  //
+  // This will safely fit in a JS integer as long as pointers only set the lower
+  // 53 bits or so. This is okay since the JS code itself assumes only the lower
+  // 48 bits of the pointer are set:
+  // https://searchfox.org/firefox-main/rev/20a1fb35a4d5c2f2ea6c865ecebc8e4bee6f86c9/js/public/Value.h#61-66
+  //
+  // Finally, we always set the lowest bit on the handle.  This allows UniFFI to
+  // tell if trait interface handles came from JS or Rust.
+  HandleRefCount* handlePointer = new HandleRefCount(1);
+  return reinterpret_cast<uint64_t>(handlePointer) | 1;
+}
+
+uint32_t CallbackHandleAddRef(uint64_t aHandle) {
+  HandleRefCount* handlePointer =
+      reinterpret_cast<HandleRefCount*>(aHandle & ~1);
+  return ++(*handlePointer);
+}
+
+uint32_t CallbackHandleRelease(uint64_t aHandle) {
+  HandleRefCount* handlePointer =
+      reinterpret_cast<HandleRefCount*>(aHandle & ~1);
+  auto refCount = --(*handlePointer);
+  if (refCount == 0) {
+    delete handlePointer;
+  }
+  return refCount;
+}
+
 void AsyncCallbackMethodHandlerBase::ScheduleAsyncCall(
     UniquePtr<AsyncCallbackMethodHandlerBase> aHandler,
     StaticRefPtr<dom::UniFFICallbackHandler>* aJsHandler) {
diff --git a/toolkit/components/uniffi-js/Callbacks.h b/toolkit/components/uniffi-js/Callbacks.h
index 8d2bc5a205ce8..3d4abc5c2da6f 100644
--- a/toolkit/components/uniffi-js/Callbacks.h
+++ b/toolkit/components/uniffi-js/Callbacks.h
@@ -36,6 +36,23 @@ void RegisterCallbackHandler(uint64_t aInterfaceId,
  */
 void DeregisterCallbackHandler(uint64_t aInterfaceId, ErrorResult& aError);
 
+/**
+ * Create a new Callback interface handle
+ */
+uint64_t CallbackHandleCreate();
+
+/**
+ * Increase the refcount for a callback interface handle.  Returns the new
+ * refcount.
+ */
+uint32_t CallbackHandleAddRef(uint64_t aHandle);
+
+/**
+ * Decrease the refconut for a callback interface handle.  Returns the new
+ * refcount.
+ */
+uint32_t CallbackHandleRelease(uint64_t aHandle);
+
 /**
  * Base class for async callback interface method handlers
  *
diff --git a/toolkit/components/uniffi-js/GeneratedScaffolding.cpp b/toolkit/components/uniffi-js/GeneratedScaffolding.cpp
index a317ea701be79..e3be5891c855e 100644
--- a/toolkit/components/uniffi-js/GeneratedScaffolding.cpp
+++ b/toolkit/components/uniffi-js/GeneratedScaffolding.cpp
@@ -45,10 +45,10 @@ extern "C" {
   void ffi_context_id_rustbuffer_free(RustBuffer, RustCallStatus*);
   RustBuffer ffi_context_id_rustbuffer_reserve(RustBuffer, uint64_t, RustCallStatus*);
   typedef void (*RustFutureContinuationCallback)(uint64_t, int8_t);
-  typedef void (*ForeignFutureFree)(uint64_t);
-  struct ForeignFuture {
+  typedef void (*ForeignFutureDroppedCallback)(uint64_t);
+  struct ForeignFutureDroppedCallbackStruct {
     uint64_t handle;
-    ForeignFutureFree free;
+    ForeignFutureDroppedCallback free;
   };
   void ffi_context_id_rust_future_poll_u8(uint64_t, RustFutureContinuationCallback, uint64_t);
   void ffi_context_id_rust_future_cancel_u8(uint64_t);
@@ -90,10 +90,6 @@ extern "C" {
   void ffi_context_id_rust_future_cancel_f64(uint64_t);
   double ffi_context_id_rust_future_complete_f64(uint64_t, RustCallStatus*);
   void ffi_context_id_rust_future_free_f64(uint64_t);
-  void ffi_context_id_rust_future_poll_pointer(uint64_t, RustFutureContinuationCallback, uint64_t);
-  void ffi_context_id_rust_future_cancel_pointer(uint64_t);
-  void* ffi_context_id_rust_future_complete_pointer(uint64_t, RustCallStatus*);
-  void ffi_context_id_rust_future_free_pointer(uint64_t);
   void ffi_context_id_rust_future_poll_rust_buffer(uint64_t, RustFutureContinuationCallback, uint64_t);
   void ffi_context_id_rust_future_cancel_rust_buffer(uint64_t);
   RustBuffer ffi_context_id_rust_future_complete_rust_buffer(uint64_t, RustCallStatus*);
@@ -102,21 +98,23 @@ extern "C" {
   void ffi_context_id_rust_future_cancel_void(uint64_t);
   void ffi_context_id_rust_future_complete_void(uint64_t, RustCallStatus*);
   void ffi_context_id_rust_future_free_void(uint64_t);
-  void* uniffi_context_id_fn_clone_contextidcomponent(void*, RustCallStatus*);
-  void uniffi_context_id_fn_free_contextidcomponent(void*, RustCallStatus*);
+  uint64_t uniffi_context_id_fn_clone_contextidcomponent(uint64_t, RustCallStatus*);
+  void uniffi_context_id_fn_free_contextidcomponent(uint64_t, RustCallStatus*);
   typedef void (*CallbackInterfaceContextIdContextIdCallbackMethod0)(uint64_t, RustBuffer, int64_t, void*, RustCallStatus*);
   typedef void (*CallbackInterfaceContextIdContextIdCallbackMethod1)(uint64_t, RustBuffer, void*, RustCallStatus*);
+  typedef uint64_t (*CallbackInterfaceCloneContextId_ContextIdCallback)(uint64_t);
   typedef void (*CallbackInterfaceFreeContextId_ContextIdCallback)(uint64_t);
   struct VTableCallbackInterfaceContextIdContextIdCallback {
+    CallbackInterfaceFreeContextId_ContextIdCallback uniffi_free;
+    CallbackInterfaceCloneContextId_ContextIdCallback uniffi_clone;
     CallbackInterfaceContextIdContextIdCallbackMethod0 persist;
     CallbackInterfaceContextIdContextIdCallbackMethod1 rotated;
-    CallbackInterfaceFreeContextId_ContextIdCallback uniffi_free;
   };
   void uniffi_context_id_fn_init_callback_vtable_contextidcallback(VTableCallbackInterfaceContextIdContextIdCallback*);
-  void* uniffi_context_id_fn_constructor_contextidcomponent_new(RustBuffer, int64_t, int8_t, uint64_t, RustCallStatus*);
-  void uniffi_context_id_fn_method_contextidcomponent_force_rotation(void*, RustCallStatus*);
-  RustBuffer uniffi_context_id_fn_method_contextidcomponent_request(void*, uint8_t, RustCallStatus*);
-  void uniffi_context_id_fn_method_contextidcomponent_unset_callback(void*, RustCallStatus*);
+  uint64_t uniffi_context_id_fn_constructor_contextidcomponent_new(RustBuffer, int64_t, int8_t, uint64_t, RustCallStatus*);
+  void uniffi_context_id_fn_method_contextidcomponent_force_rotation(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_context_id_fn_method_contextidcomponent_request(uint64_t, uint8_t, RustCallStatus*);
+  void uniffi_context_id_fn_method_contextidcomponent_unset_callback(uint64_t, RustCallStatus*);
   uint32_t ffi_context_id_uniffi_contract_version();
   uint16_t uniffi_context_id_checksum_constructor_contextidcomponent_new();
   uint16_t uniffi_context_id_checksum_method_contextidcomponent_force_rotation();
@@ -166,10 +164,6 @@ extern "C" {
   void ffi_error_support_rust_future_cancel_f64(uint64_t);
   double ffi_error_support_rust_future_complete_f64(uint64_t, RustCallStatus*);
   void ffi_error_support_rust_future_free_f64(uint64_t);
-  void ffi_error_support_rust_future_poll_pointer(uint64_t, RustFutureContinuationCallback, uint64_t);
-  void ffi_error_support_rust_future_cancel_pointer(uint64_t);
-  void* ffi_error_support_rust_future_complete_pointer(uint64_t, RustCallStatus*);
-  void ffi_error_support_rust_future_free_pointer(uint64_t);
   void ffi_error_support_rust_future_poll_rust_buffer(uint64_t, RustFutureContinuationCallback, uint64_t);
   void ffi_error_support_rust_future_cancel_rust_buffer(uint64_t);
   RustBuffer ffi_error_support_rust_future_complete_rust_buffer(uint64_t, RustCallStatus*);
@@ -223,10 +217,6 @@ extern "C" {
   void ffi_filter_adult_rust_future_cancel_f64(uint64_t);
   double ffi_filter_adult_rust_future_complete_f64(uint64_t, RustCallStatus*);
   void ffi_filter_adult_rust_future_free_f64(uint64_t);
-  void ffi_filter_adult_rust_future_poll_pointer(uint64_t, RustFutureContinuationCallback, uint64_t);
-  void ffi_filter_adult_rust_future_cancel_pointer(uint64_t);
-  void* ffi_filter_adult_rust_future_complete_pointer(uint64_t, RustCallStatus*);
-  void ffi_filter_adult_rust_future_free_pointer(uint64_t);
   void ffi_filter_adult_rust_future_poll_rust_buffer(uint64_t, RustFutureContinuationCallback, uint64_t);
   void ffi_filter_adult_rust_future_cancel_rust_buffer(uint64_t);
   RustBuffer ffi_filter_adult_rust_future_complete_rust_buffer(uint64_t, RustCallStatus*);
@@ -235,10 +225,10 @@ extern "C" {
   void ffi_filter_adult_rust_future_cancel_void(uint64_t);
   void ffi_filter_adult_rust_future_complete_void(uint64_t, RustCallStatus*);
   void ffi_filter_adult_rust_future_free_void(uint64_t);
-  void* uniffi_filter_adult_fn_clone_filteradultcomponent(void*, RustCallStatus*);
-  void uniffi_filter_adult_fn_free_filteradultcomponent(void*, RustCallStatus*);
-  void* uniffi_filter_adult_fn_constructor_filteradultcomponent_new(RustCallStatus*);
-  int8_t uniffi_filter_adult_fn_method_filteradultcomponent_contains(void*, RustBuffer, RustCallStatus*);
+  uint64_t uniffi_filter_adult_fn_clone_filteradultcomponent(uint64_t, RustCallStatus*);
+  void uniffi_filter_adult_fn_free_filteradultcomponent(uint64_t, RustCallStatus*);
+  uint64_t uniffi_filter_adult_fn_constructor_filteradultcomponent_new(RustCallStatus*);
+  int8_t uniffi_filter_adult_fn_method_filteradultcomponent_contains(uint64_t, RustBuffer, RustCallStatus*);
   uint32_t ffi_filter_adult_uniffi_contract_version();
   uint16_t uniffi_filter_adult_checksum_constructor_filteradultcomponent_new();
   uint16_t uniffi_filter_adult_checksum_method_filteradultcomponent_contains();
@@ -286,10 +276,6 @@ extern "C" {
   void ffi_init_rust_components_rust_future_cancel_f64(uint64_t);
   double ffi_init_rust_components_rust_future_complete_f64(uint64_t, RustCallStatus*);
   void ffi_init_rust_components_rust_future_free_f64(uint64_t);
-  void ffi_init_rust_components_rust_future_poll_pointer(uint64_t, RustFutureContinuationCallback, uint64_t);
-  void ffi_init_rust_components_rust_future_cancel_pointer(uint64_t);
-  void* ffi_init_rust_components_rust_future_complete_pointer(uint64_t, RustCallStatus*);
-  void ffi_init_rust_components_rust_future_free_pointer(uint64_t);
   void ffi_init_rust_components_rust_future_poll_rust_buffer(uint64_t, RustFutureContinuationCallback, uint64_t);
   void ffi_init_rust_components_rust_future_cancel_rust_buffer(uint64_t);
   RustBuffer ffi_init_rust_components_rust_future_complete_rust_buffer(uint64_t, RustCallStatus*);
@@ -345,10 +331,6 @@ extern "C" {
   void ffi_logins_rust_future_cancel_f64(uint64_t);
   double ffi_logins_rust_future_complete_f64(uint64_t, RustCallStatus*);
   void ffi_logins_rust_future_free_f64(uint64_t);
-  void ffi_logins_rust_future_poll_pointer(uint64_t, RustFutureContinuationCallback, uint64_t);
-  void ffi_logins_rust_future_cancel_pointer(uint64_t);
-  void* ffi_logins_rust_future_complete_pointer(uint64_t, RustCallStatus*);
-  void ffi_logins_rust_future_free_pointer(uint64_t);
   void ffi_logins_rust_future_poll_rust_buffer(uint64_t, RustFutureContinuationCallback, uint64_t);
   void ffi_logins_rust_future_cancel_rust_buffer(uint64_t);
   RustBuffer ffi_logins_rust_future_complete_rust_buffer(uint64_t, RustCallStatus*);
@@ -357,34 +339,38 @@ extern "C" {
   void ffi_logins_rust_future_cancel_void(uint64_t);
   void ffi_logins_rust_future_complete_void(uint64_t, RustCallStatus*);
   void ffi_logins_rust_future_free_void(uint64_t);
-  void* uniffi_logins_fn_clone_encryptordecryptor(void*, RustCallStatus*);
-  void uniffi_logins_fn_free_encryptordecryptor(void*, RustCallStatus*);
-  void* uniffi_logins_fn_clone_keymanager(void*, RustCallStatus*);
-  void uniffi_logins_fn_free_keymanager(void*, RustCallStatus*);
-  void* uniffi_logins_fn_clone_loginstore(void*, RustCallStatus*);
-  void uniffi_logins_fn_free_loginstore(void*, RustCallStatus*);
-  void* uniffi_logins_fn_clone_managedencryptordecryptor(void*, RustCallStatus*);
-  void uniffi_logins_fn_free_managedencryptordecryptor(void*, RustCallStatus*);
-  void* uniffi_logins_fn_clone_nsskeymanager(void*, RustCallStatus*);
-  void uniffi_logins_fn_free_nsskeymanager(void*, RustCallStatus*);
-  void* uniffi_logins_fn_clone_primarypasswordauthenticator(void*, RustCallStatus*);
-  void uniffi_logins_fn_free_primarypasswordauthenticator(void*, RustCallStatus*);
-  void* uniffi_logins_fn_clone_statickeymanager(void*, RustCallStatus*);
-  void uniffi_logins_fn_free_statickeymanager(void*, RustCallStatus*);
+  uint64_t uniffi_logins_fn_clone_encryptordecryptor(uint64_t, RustCallStatus*);
+  void uniffi_logins_fn_free_encryptordecryptor(uint64_t, RustCallStatus*);
+  uint64_t uniffi_logins_fn_clone_keymanager(uint64_t, RustCallStatus*);
+  void uniffi_logins_fn_free_keymanager(uint64_t, RustCallStatus*);
+  uint64_t uniffi_logins_fn_clone_loginstore(uint64_t, RustCallStatus*);
+  void uniffi_logins_fn_free_loginstore(uint64_t, RustCallStatus*);
+  uint64_t uniffi_logins_fn_clone_managedencryptordecryptor(uint64_t, RustCallStatus*);
+  void uniffi_logins_fn_free_managedencryptordecryptor(uint64_t, RustCallStatus*);
+  uint64_t uniffi_logins_fn_clone_nsskeymanager(uint64_t, RustCallStatus*);
+  void uniffi_logins_fn_free_nsskeymanager(uint64_t, RustCallStatus*);
+  uint64_t uniffi_logins_fn_clone_primarypasswordauthenticator(uint64_t, RustCallStatus*);
+  void uniffi_logins_fn_free_primarypasswordauthenticator(uint64_t, RustCallStatus*);
+  uint64_t uniffi_logins_fn_clone_statickeymanager(uint64_t, RustCallStatus*);
+  void uniffi_logins_fn_free_statickeymanager(uint64_t, RustCallStatus*);
   typedef void (*CallbackInterfaceLoginsEncryptorDecryptorMethod0)(uint64_t, RustBuffer, RustBuffer*, RustCallStatus*);
   typedef void (*CallbackInterfaceLoginsEncryptorDecryptorMethod1)(uint64_t, RustBuffer, RustBuffer*, RustCallStatus*);
+  typedef uint64_t (*CallbackInterfaceCloneLogins_EncryptorDecryptor)(uint64_t);
   typedef void (*CallbackInterfaceFreeLogins_EncryptorDecryptor)(uint64_t);
   struct VTableCallbackInterfaceLoginsEncryptorDecryptor {
+    CallbackInterfaceFreeLogins_EncryptorDecryptor uniffi_free;
+    CallbackInterfaceCloneLogins_EncryptorDecryptor uniffi_clone;
     CallbackInterfaceLoginsEncryptorDecryptorMethod0 decrypt;
     CallbackInterfaceLoginsEncryptorDecryptorMethod1 encrypt;
-    CallbackInterfaceFreeLogins_EncryptorDecryptor uniffi_free;
   };
   void uniffi_logins_fn_init_callback_vtable_encryptordecryptor(VTableCallbackInterfaceLoginsEncryptorDecryptor*);
   typedef void (*CallbackInterfaceLoginsKeyManagerMethod0)(uint64_t, RustBuffer*, RustCallStatus*);
+  typedef uint64_t (*CallbackInterfaceCloneLogins_KeyManager)(uint64_t);
   typedef void (*CallbackInterfaceFreeLogins_KeyManager)(uint64_t);
   struct VTableCallbackInterfaceLoginsKeyManager {
-    CallbackInterfaceLoginsKeyManagerMethod0 get_key;
     CallbackInterfaceFreeLogins_KeyManager uniffi_free;
+    CallbackInterfaceCloneLogins_KeyManager uniffi_clone;
+    CallbackInterfaceLoginsKeyManagerMethod0 get_key;
   };
   void uniffi_logins_fn_init_callback_vtable_keymanager(VTableCallbackInterfaceLoginsKeyManager*);
   struct ForeignFutureResultRustBuffer {
@@ -392,65 +378,73 @@ extern "C" {
     RustCallStatus call_status;
   };
   typedef void (*ForeignFutureCompleterust_buffer)(uint64_t, ForeignFutureResultRustBuffer);
-  typedef void (*CallbackInterfaceLoginsPrimaryPasswordAuthenticatorMethod0)(uint64_t, ForeignFutureCompleterust_buffer, uint64_t, ForeignFuture*);
+  typedef void (*CallbackInterfaceLoginsPrimaryPasswordAuthenticatorMethod0)(uint64_t, ForeignFutureCompleterust_buffer, uint64_t, ForeignFutureDroppedCallbackStruct*);
   struct ForeignFutureResultVoid {
     RustCallStatus call_status;
   };
   typedef void (*ForeignFutureCompletevoid)(uint64_t, ForeignFutureResultVoid);
-  typedef void (*CallbackInterfaceLoginsPrimaryPasswordAuthenticatorMethod1)(uint64_t, ForeignFutureCompletevoid, uint64_t, ForeignFuture*);
-  typedef void (*CallbackInterfaceLoginsPrimaryPasswordAuthenticatorMethod2)(uint64_t, ForeignFutureCompletevoid, uint64_t, ForeignFuture*);
+  typedef void (*CallbackInterfaceLoginsPrimaryPasswordAuthenticatorMethod1)(uint64_t, ForeignFutureCompletevoid, uint64_t, ForeignFutureDroppedCallbackStruct*);
+  typedef void (*CallbackInterfaceLoginsPrimaryPasswordAuthenticatorMethod2)(uint64_t, ForeignFutureCompletevoid, uint64_t, ForeignFutureDroppedCallbackStruct*);
+  typedef uint64_t (*CallbackInterfaceCloneLogins_PrimaryPasswordAuthenticator)(uint64_t);
   typedef void (*CallbackInterfaceFreeLogins_PrimaryPasswordAuthenticator)(uint64_t);
   struct VTableCallbackInterfaceLoginsPrimaryPasswordAuthenticator {
+    CallbackInterfaceFreeLogins_PrimaryPasswordAuthenticator uniffi_free;
+    CallbackInterfaceCloneLogins_PrimaryPasswordAuthenticator uniffi_clone;
     CallbackInterfaceLoginsPrimaryPasswordAuthenticatorMethod0 get_primary_password;
     CallbackInterfaceLoginsPrimaryPasswordAuthenticatorMethod1 on_authentication_success;
     CallbackInterfaceLoginsPrimaryPasswordAuthenticatorMethod2 on_authentication_failure;
-    CallbackInterfaceFreeLogins_PrimaryPasswordAuthenticator uniffi_free;
   };
   void uniffi_logins_fn_init_callback_vtable_primarypasswordauthenticator(VTableCallbackInterfaceLoginsPrimaryPasswordAuthenticator*);
   int8_t uniffi_logins_fn_func_check_canary(RustBuffer, RustBuffer, RustBuffer, RustCallStatus*);
   RustBuffer uniffi_logins_fn_func_create_canary(RustBuffer, RustBuffer, RustCallStatus*);
   RustBuffer uniffi_logins_fn_func_create_key(RustCallStatus*);
-  void* uniffi_logins_fn_func_create_login_store_with_nss_keymanager(RustBuffer, void*, RustCallStatus*);
-  void* uniffi_logins_fn_func_create_login_store_with_static_key_manager(RustBuffer, RustBuffer, RustCallStatus*);
-  void* uniffi_logins_fn_func_create_managed_encdec(void*, RustCallStatus*);
-  void* uniffi_logins_fn_func_create_static_key_manager(RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_logins_fn_method_encryptordecryptor_decrypt(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_logins_fn_method_encryptordecryptor_encrypt(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_logins_fn_method_keymanager_get_key(void*, RustCallStatus*);
-  void* uniffi_logins_fn_constructor_loginstore_new(RustBuffer, void*, RustCallStatus*);
-  RustBuffer uniffi_logins_fn_method_loginstore_add(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_logins_fn_method_loginstore_add_many(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_logins_fn_method_loginstore_add_many_with_meta(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_logins_fn_method_loginstore_add_or_update(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_logins_fn_method_loginstore_add_with_meta(void*, RustBuffer, RustCallStatus*);
-  int64_t uniffi_logins_fn_method_loginstore_count(void*, RustCallStatus*);
-  int64_t uniffi_logins_fn_method_loginstore_count_by_form_action_origin(void*, RustBuffer, RustCallStatus*);
-  int64_t uniffi_logins_fn_method_loginstore_count_by_origin(void*, RustBuffer, RustCallStatus*);
-  int8_t uniffi_logins_fn_method_loginstore_delete(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_logins_fn_method_loginstore_delete_many(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_logins_fn_method_loginstore_delete_undecryptable_records_for_remote_replacement(void*, RustCallStatus*);
-  RustBuffer uniffi_logins_fn_method_loginstore_find_login_to_update(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_logins_fn_method_loginstore_get(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_logins_fn_method_loginstore_get_by_base_domain(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_logins_fn_method_loginstore_get_checkpoint(void*, RustCallStatus*);
-  int8_t uniffi_logins_fn_method_loginstore_has_logins_by_base_domain(void*, RustBuffer, RustCallStatus*);
-  int8_t uniffi_logins_fn_method_loginstore_is_empty(void*, RustCallStatus*);
-  RustBuffer uniffi_logins_fn_method_loginstore_list(void*, RustCallStatus*);
-  void uniffi_logins_fn_method_loginstore_register_with_sync_manager(void*, RustCallStatus*);
-  void uniffi_logins_fn_method_loginstore_reset(void*, RustCallStatus*);
-  void uniffi_logins_fn_method_loginstore_run_maintenance(void*, RustCallStatus*);
-  void uniffi_logins_fn_method_loginstore_set_checkpoint(void*, RustBuffer, RustCallStatus*);
-  void uniffi_logins_fn_method_loginstore_shutdown(void*, RustCallStatus*);
-  void uniffi_logins_fn_method_loginstore_touch(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_logins_fn_method_loginstore_update(void*, RustBuffer, RustBuffer, RustCallStatus*);
-  void uniffi_logins_fn_method_loginstore_wipe_local(void*, RustCallStatus*);
-  void* uniffi_logins_fn_constructor_managedencryptordecryptor_new(void*, RustCallStatus*);
-  void* uniffi_logins_fn_constructor_nsskeymanager_new(void*, RustCallStatus*);
-  void* uniffi_logins_fn_method_nsskeymanager_into_dyn_key_manager(void*, RustCallStatus*);
-  uint64_t uniffi_logins_fn_method_primarypasswordauthenticator_get_primary_password(void*);
-  uint64_t uniffi_logins_fn_method_primarypasswordauthenticator_on_authentication_success(void*);
-  uint64_t uniffi_logins_fn_method_primarypasswordauthenticator_on_authentication_failure(void*);
-  void* uniffi_logins_fn_constructor_statickeymanager_new(RustBuffer, RustCallStatus*);
+  uint64_t uniffi_logins_fn_func_create_login_store_with_nss_keymanager(RustBuffer, uint64_t, RustCallStatus*);
+  uint64_t uniffi_logins_fn_func_create_login_store_with_static_key_manager(RustBuffer, RustBuffer, RustCallStatus*);
+  uint64_t uniffi_logins_fn_func_create_managed_encdec(uint64_t, RustCallStatus*);
+  uint64_t uniffi_logins_fn_func_create_static_key_manager(RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_logins_fn_method_encryptordecryptor_decrypt(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_logins_fn_method_encryptordecryptor_encrypt(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_logins_fn_method_keymanager_get_key(uint64_t, RustCallStatus*);
+  uint64_t uniffi_logins_fn_constructor_loginstore_new(RustBuffer, uint64_t, RustCallStatus*);
+  RustBuffer uniffi_logins_fn_method_loginstore_add(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_logins_fn_method_loginstore_add_many(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_logins_fn_method_loginstore_add_many_with_meta(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_logins_fn_method_loginstore_add_or_update(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_logins_fn_method_loginstore_add_with_meta(uint64_t, RustBuffer, RustCallStatus*);
+  int64_t uniffi_logins_fn_method_loginstore_count(uint64_t, RustCallStatus*);
+  int64_t uniffi_logins_fn_method_loginstore_count_by_form_action_origin(uint64_t, RustBuffer, RustCallStatus*);
+  int64_t uniffi_logins_fn_method_loginstore_count_by_origin(uint64_t, RustBuffer, RustCallStatus*);
+  int8_t uniffi_logins_fn_method_loginstore_delete(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_logins_fn_method_loginstore_delete_many(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_logins_fn_method_loginstore_delete_undecryptable_records_for_remote_replacement(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_logins_fn_method_loginstore_find_login_to_update(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_logins_fn_method_loginstore_get(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_logins_fn_method_loginstore_get_by_base_domain(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_logins_fn_method_loginstore_get_checkpoint(uint64_t, RustCallStatus*);
+  int8_t uniffi_logins_fn_method_loginstore_has_logins_by_base_domain(uint64_t, RustBuffer, RustCallStatus*);
+  int8_t uniffi_logins_fn_method_loginstore_is_breach_alert_dismissed(uint64_t, RustBuffer, RustCallStatus*);
+  int8_t uniffi_logins_fn_method_loginstore_is_empty(uint64_t, RustCallStatus*);
+  int8_t uniffi_logins_fn_method_loginstore_is_potentially_breached(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_logins_fn_method_loginstore_list(uint64_t, RustCallStatus*);
+  void uniffi_logins_fn_method_loginstore_record_breach(uint64_t, RustBuffer, int64_t, RustCallStatus*);
+  void uniffi_logins_fn_method_loginstore_record_breach_alert_dismissal(uint64_t, RustBuffer, RustCallStatus*);
+  void uniffi_logins_fn_method_loginstore_record_breach_alert_dismissal_time(uint64_t, RustBuffer, int64_t, RustCallStatus*);
+  void uniffi_logins_fn_method_loginstore_register_with_sync_manager(uint64_t, RustCallStatus*);
+  void uniffi_logins_fn_method_loginstore_reset(uint64_t, RustCallStatus*);
+  void uniffi_logins_fn_method_loginstore_reset_all_breaches(uint64_t, RustCallStatus*);
+  void uniffi_logins_fn_method_loginstore_run_maintenance(uint64_t, RustCallStatus*);
+  void uniffi_logins_fn_method_loginstore_set_checkpoint(uint64_t, RustBuffer, RustCallStatus*);
+  void uniffi_logins_fn_method_loginstore_shutdown(uint64_t, RustCallStatus*);
+  void uniffi_logins_fn_method_loginstore_touch(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_logins_fn_method_loginstore_update(uint64_t, RustBuffer, RustBuffer, RustCallStatus*);
+  void uniffi_logins_fn_method_loginstore_wipe_local(uint64_t, RustCallStatus*);
+  uint64_t uniffi_logins_fn_constructor_managedencryptordecryptor_new(uint64_t, RustCallStatus*);
+  uint64_t uniffi_logins_fn_constructor_nsskeymanager_new(uint64_t, RustCallStatus*);
+  uint64_t uniffi_logins_fn_method_nsskeymanager_into_dyn_key_manager(uint64_t, RustCallStatus*);
+  uint64_t uniffi_logins_fn_method_primarypasswordauthenticator_get_primary_password(uint64_t);
+  uint64_t uniffi_logins_fn_method_primarypasswordauthenticator_on_authentication_success(uint64_t);
+  uint64_t uniffi_logins_fn_method_primarypasswordauthenticator_on_authentication_failure(uint64_t);
+  uint64_t uniffi_logins_fn_constructor_statickeymanager_new(RustBuffer, RustCallStatus*);
   uint32_t ffi_logins_uniffi_contract_version();
   uint16_t uniffi_logins_checksum_func_check_canary();
   uint16_t uniffi_logins_checksum_func_create_canary();
@@ -479,10 +473,16 @@ extern "C" {
   uint16_t uniffi_logins_checksum_method_loginstore_get_by_base_domain();
   uint16_t uniffi_logins_checksum_method_loginstore_get_checkpoint();
   uint16_t uniffi_logins_checksum_method_loginstore_has_logins_by_base_domain();
+  uint16_t uniffi_logins_checksum_method_loginstore_is_breach_alert_dismissed();
   uint16_t uniffi_logins_checksum_method_loginstore_is_empty();
+  uint16_t uniffi_logins_checksum_method_loginstore_is_potentially_breached();
   uint16_t uniffi_logins_checksum_method_loginstore_list();
+  uint16_t uniffi_logins_checksum_method_loginstore_record_breach();
+  uint16_t uniffi_logins_checksum_method_loginstore_record_breach_alert_dismissal();
+  uint16_t uniffi_logins_checksum_method_loginstore_record_breach_alert_dismissal_time();
   uint16_t uniffi_logins_checksum_method_loginstore_register_with_sync_manager();
   uint16_t uniffi_logins_checksum_method_loginstore_reset();
+  uint16_t uniffi_logins_checksum_method_loginstore_reset_all_breaches();
   uint16_t uniffi_logins_checksum_method_loginstore_run_maintenance();
   uint16_t uniffi_logins_checksum_method_loginstore_set_checkpoint();
   uint16_t uniffi_logins_checksum_method_loginstore_shutdown();
@@ -540,10 +540,6 @@ extern "C" {
   void ffi_relevancy_rust_future_cancel_f64(uint64_t);
   double ffi_relevancy_rust_future_complete_f64(uint64_t, RustCallStatus*);
   void ffi_relevancy_rust_future_free_f64(uint64_t);
-  void ffi_relevancy_rust_future_poll_pointer(uint64_t, RustFutureContinuationCallback, uint64_t);
-  void ffi_relevancy_rust_future_cancel_pointer(uint64_t);
-  void* ffi_relevancy_rust_future_complete_pointer(uint64_t, RustCallStatus*);
-  void ffi_relevancy_rust_future_free_pointer(uint64_t);
   void ffi_relevancy_rust_future_poll_rust_buffer(uint64_t, RustFutureContinuationCallback, uint64_t);
   void ffi_relevancy_rust_future_cancel_rust_buffer(uint64_t);
   RustBuffer ffi_relevancy_rust_future_complete_rust_buffer(uint64_t, RustCallStatus*);
@@ -552,19 +548,19 @@ extern "C" {
   void ffi_relevancy_rust_future_cancel_void(uint64_t);
   void ffi_relevancy_rust_future_complete_void(uint64_t, RustCallStatus*);
   void ffi_relevancy_rust_future_free_void(uint64_t);
-  void* uniffi_relevancy_fn_clone_relevancystore(void*, RustCallStatus*);
-  void uniffi_relevancy_fn_free_relevancystore(void*, RustCallStatus*);
+  uint64_t uniffi_relevancy_fn_clone_relevancystore(uint64_t, RustCallStatus*);
+  void uniffi_relevancy_fn_free_relevancystore(uint64_t, RustCallStatus*);
   double uniffi_relevancy_fn_func_score(RustBuffer, RustBuffer, RustCallStatus*);
-  void* uniffi_relevancy_fn_constructor_relevancystore_new(RustBuffer, void*, RustCallStatus*);
-  void uniffi_relevancy_fn_method_relevancystore_bandit_init(void*, RustBuffer, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_relevancy_fn_method_relevancystore_bandit_select(void*, RustBuffer, RustBuffer, RustCallStatus*);
-  void uniffi_relevancy_fn_method_relevancystore_bandit_update(void*, RustBuffer, RustBuffer, int8_t, RustCallStatus*);
-  void uniffi_relevancy_fn_method_relevancystore_close(void*, RustCallStatus*);
-  void uniffi_relevancy_fn_method_relevancystore_ensure_interest_data_populated(void*, RustCallStatus*);
-  RustBuffer uniffi_relevancy_fn_method_relevancystore_get_bandit_data(void*, RustBuffer, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_relevancy_fn_method_relevancystore_ingest(void*, RustBuffer, RustCallStatus*);
-  void uniffi_relevancy_fn_method_relevancystore_interrupt(void*, RustCallStatus*);
-  RustBuffer uniffi_relevancy_fn_method_relevancystore_user_interest_vector(void*, RustCallStatus*);
+  uint64_t uniffi_relevancy_fn_constructor_relevancystore_new(RustBuffer, uint64_t, RustCallStatus*);
+  void uniffi_relevancy_fn_method_relevancystore_bandit_init(uint64_t, RustBuffer, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_relevancy_fn_method_relevancystore_bandit_select(uint64_t, RustBuffer, RustBuffer, RustCallStatus*);
+  void uniffi_relevancy_fn_method_relevancystore_bandit_update(uint64_t, RustBuffer, RustBuffer, int8_t, RustCallStatus*);
+  void uniffi_relevancy_fn_method_relevancystore_close(uint64_t, RustCallStatus*);
+  void uniffi_relevancy_fn_method_relevancystore_ensure_interest_data_populated(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_relevancy_fn_method_relevancystore_get_bandit_data(uint64_t, RustBuffer, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_relevancy_fn_method_relevancystore_ingest(uint64_t, RustBuffer, RustCallStatus*);
+  void uniffi_relevancy_fn_method_relevancystore_interrupt(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_relevancy_fn_method_relevancystore_user_interest_vector(uint64_t, RustCallStatus*);
   uint32_t ffi_relevancy_uniffi_contract_version();
   uint16_t uniffi_relevancy_checksum_func_score();
   uint16_t uniffi_relevancy_checksum_constructor_relevancystore_new();
@@ -621,10 +617,6 @@ extern "C" {
   void ffi_remote_settings_rust_future_cancel_f64(uint64_t);
   double ffi_remote_settings_rust_future_complete_f64(uint64_t, RustCallStatus*);
   void ffi_remote_settings_rust_future_free_f64(uint64_t);
-  void ffi_remote_settings_rust_future_poll_pointer(uint64_t, RustFutureContinuationCallback, uint64_t);
-  void ffi_remote_settings_rust_future_cancel_pointer(uint64_t);
-  void* ffi_remote_settings_rust_future_complete_pointer(uint64_t, RustCallStatus*);
-  void ffi_remote_settings_rust_future_free_pointer(uint64_t);
   void ffi_remote_settings_rust_future_poll_rust_buffer(uint64_t, RustFutureContinuationCallback, uint64_t);
   void ffi_remote_settings_rust_future_cancel_rust_buffer(uint64_t);
   RustBuffer ffi_remote_settings_rust_future_complete_rust_buffer(uint64_t, RustCallStatus*);
@@ -633,27 +625,27 @@ extern "C" {
   void ffi_remote_settings_rust_future_cancel_void(uint64_t);
   void ffi_remote_settings_rust_future_complete_void(uint64_t, RustCallStatus*);
   void ffi_remote_settings_rust_future_free_void(uint64_t);
-  void* uniffi_remote_settings_fn_clone_remotesettings(void*, RustCallStatus*);
-  void uniffi_remote_settings_fn_free_remotesettings(void*, RustCallStatus*);
-  void* uniffi_remote_settings_fn_clone_remotesettingsclient(void*, RustCallStatus*);
-  void uniffi_remote_settings_fn_free_remotesettingsclient(void*, RustCallStatus*);
-  void* uniffi_remote_settings_fn_clone_remotesettingsservice(void*, RustCallStatus*);
-  void uniffi_remote_settings_fn_free_remotesettingsservice(void*, RustCallStatus*);
-  void* uniffi_remote_settings_fn_constructor_remotesettings_new(RustBuffer, RustCallStatus*);
-  void uniffi_remote_settings_fn_method_remotesettings_download_attachment_to_path(void*, RustBuffer, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_remote_settings_fn_method_remotesettings_get_records(void*, RustCallStatus*);
-  RustBuffer uniffi_remote_settings_fn_method_remotesettings_get_records_since(void*, uint64_t, RustCallStatus*);
-  RustBuffer uniffi_remote_settings_fn_method_remotesettingsclient_collection_name(void*, RustCallStatus*);
-  RustBuffer uniffi_remote_settings_fn_method_remotesettingsclient_get_attachment(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_remote_settings_fn_method_remotesettingsclient_get_records(void*, int8_t, RustCallStatus*);
-  RustBuffer uniffi_remote_settings_fn_method_remotesettingsclient_get_records_map(void*, int8_t, RustCallStatus*);
-  void uniffi_remote_settings_fn_method_remotesettingsclient_shutdown(void*, RustCallStatus*);
-  void uniffi_remote_settings_fn_method_remotesettingsclient_sync(void*, RustCallStatus*);
-  void* uniffi_remote_settings_fn_constructor_remotesettingsservice_new(RustBuffer, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_remote_settings_fn_method_remotesettingsservice_client_url(void*, RustCallStatus*);
-  void* uniffi_remote_settings_fn_method_remotesettingsservice_make_client(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_remote_settings_fn_method_remotesettingsservice_sync(void*, RustCallStatus*);
-  void uniffi_remote_settings_fn_method_remotesettingsservice_update_config(void*, RustBuffer, RustCallStatus*);
+  uint64_t uniffi_remote_settings_fn_clone_remotesettings(uint64_t, RustCallStatus*);
+  void uniffi_remote_settings_fn_free_remotesettings(uint64_t, RustCallStatus*);
+  uint64_t uniffi_remote_settings_fn_clone_remotesettingsclient(uint64_t, RustCallStatus*);
+  void uniffi_remote_settings_fn_free_remotesettingsclient(uint64_t, RustCallStatus*);
+  uint64_t uniffi_remote_settings_fn_clone_remotesettingsservice(uint64_t, RustCallStatus*);
+  void uniffi_remote_settings_fn_free_remotesettingsservice(uint64_t, RustCallStatus*);
+  uint64_t uniffi_remote_settings_fn_constructor_remotesettings_new(RustBuffer, RustCallStatus*);
+  void uniffi_remote_settings_fn_method_remotesettings_download_attachment_to_path(uint64_t, RustBuffer, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_remote_settings_fn_method_remotesettings_get_records(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_remote_settings_fn_method_remotesettings_get_records_since(uint64_t, uint64_t, RustCallStatus*);
+  RustBuffer uniffi_remote_settings_fn_method_remotesettingsclient_collection_name(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_remote_settings_fn_method_remotesettingsclient_get_attachment(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_remote_settings_fn_method_remotesettingsclient_get_records(uint64_t, int8_t, RustCallStatus*);
+  RustBuffer uniffi_remote_settings_fn_method_remotesettingsclient_get_records_map(uint64_t, int8_t, RustCallStatus*);
+  void uniffi_remote_settings_fn_method_remotesettingsclient_shutdown(uint64_t, RustCallStatus*);
+  void uniffi_remote_settings_fn_method_remotesettingsclient_sync(uint64_t, RustCallStatus*);
+  uint64_t uniffi_remote_settings_fn_constructor_remotesettingsservice_new(RustBuffer, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_remote_settings_fn_method_remotesettingsservice_client_url(uint64_t, RustCallStatus*);
+  uint64_t uniffi_remote_settings_fn_method_remotesettingsservice_make_client(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_remote_settings_fn_method_remotesettingsservice_sync(uint64_t, RustCallStatus*);
+  void uniffi_remote_settings_fn_method_remotesettingsservice_update_config(uint64_t, RustBuffer, RustCallStatus*);
   uint32_t ffi_remote_settings_uniffi_contract_version();
   uint16_t uniffi_remote_settings_checksum_constructor_remotesettings_new();
   uint16_t uniffi_remote_settings_checksum_method_remotesettings_download_attachment_to_path();
@@ -714,10 +706,6 @@ extern "C" {
   void ffi_search_rust_future_cancel_f64(uint64_t);
   double ffi_search_rust_future_complete_f64(uint64_t, RustCallStatus*);
   void ffi_search_rust_future_free_f64(uint64_t);
-  void ffi_search_rust_future_poll_pointer(uint64_t, RustFutureContinuationCallback, uint64_t);
-  void ffi_search_rust_future_cancel_pointer(uint64_t);
-  void* ffi_search_rust_future_complete_pointer(uint64_t, RustCallStatus*);
-  void ffi_search_rust_future_free_pointer(uint64_t);
   void ffi_search_rust_future_poll_rust_buffer(uint64_t, RustFutureContinuationCallback, uint64_t);
   void ffi_search_rust_future_cancel_rust_buffer(uint64_t);
   RustBuffer ffi_search_rust_future_complete_rust_buffer(uint64_t, RustCallStatus*);
@@ -726,14 +714,14 @@ extern "C" {
   void ffi_search_rust_future_cancel_void(uint64_t);
   void ffi_search_rust_future_complete_void(uint64_t, RustCallStatus*);
   void ffi_search_rust_future_free_void(uint64_t);
-  void* uniffi_search_fn_clone_searchengineselector(void*, RustCallStatus*);
-  void uniffi_search_fn_free_searchengineselector(void*, RustCallStatus*);
-  void* uniffi_search_fn_constructor_searchengineselector_new(RustCallStatus*);
-  void uniffi_search_fn_method_searchengineselector_clear_search_config(void*, RustCallStatus*);
-  RustBuffer uniffi_search_fn_method_searchengineselector_filter_engine_configuration(void*, RustBuffer, RustCallStatus*);
-  void uniffi_search_fn_method_searchengineselector_set_config_overrides(void*, RustBuffer, RustCallStatus*);
-  void uniffi_search_fn_method_searchengineselector_set_search_config(void*, RustBuffer, RustCallStatus*);
-  void uniffi_search_fn_method_searchengineselector_use_remote_settings_server(void*, void*, int8_t, RustCallStatus*);
+  uint64_t uniffi_search_fn_clone_searchengineselector(uint64_t, RustCallStatus*);
+  void uniffi_search_fn_free_searchengineselector(uint64_t, RustCallStatus*);
+  uint64_t uniffi_search_fn_constructor_searchengineselector_new(RustCallStatus*);
+  void uniffi_search_fn_method_searchengineselector_clear_search_config(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_search_fn_method_searchengineselector_filter_engine_configuration(uint64_t, RustBuffer, RustCallStatus*);
+  void uniffi_search_fn_method_searchengineselector_set_config_overrides(uint64_t, RustBuffer, RustCallStatus*);
+  void uniffi_search_fn_method_searchengineselector_set_search_config(uint64_t, RustBuffer, RustCallStatus*);
+  void uniffi_search_fn_method_searchengineselector_use_remote_settings_server(uint64_t, uint64_t, int8_t, RustCallStatus*);
   uint32_t ffi_search_uniffi_contract_version();
   uint16_t uniffi_search_checksum_constructor_searchengineselector_new();
   uint16_t uniffi_search_checksum_method_searchengineselector_clear_search_config();
@@ -785,10 +773,6 @@ extern "C" {
   void ffi_suggest_rust_future_cancel_f64(uint64_t);
   double ffi_suggest_rust_future_complete_f64(uint64_t, RustCallStatus*);
   void ffi_suggest_rust_future_free_f64(uint64_t);
-  void ffi_suggest_rust_future_poll_pointer(uint64_t, RustFutureContinuationCallback, uint64_t);
-  void ffi_suggest_rust_future_cancel_pointer(uint64_t);
-  void* ffi_suggest_rust_future_complete_pointer(uint64_t, RustCallStatus*);
-  void ffi_suggest_rust_future_free_pointer(uint64_t);
   void ffi_suggest_rust_future_poll_rust_buffer(uint64_t, RustFutureContinuationCallback, uint64_t);
   void ffi_suggest_rust_future_cancel_rust_buffer(uint64_t);
   RustBuffer ffi_suggest_rust_future_complete_rust_buffer(uint64_t, RustCallStatus*);
@@ -797,36 +781,36 @@ extern "C" {
   void ffi_suggest_rust_future_cancel_void(uint64_t);
   void ffi_suggest_rust_future_complete_void(uint64_t, RustCallStatus*);
   void ffi_suggest_rust_future_free_void(uint64_t);
-  void* uniffi_suggest_fn_clone_suggeststore(void*, RustCallStatus*);
-  void uniffi_suggest_fn_free_suggeststore(void*, RustCallStatus*);
-  void* uniffi_suggest_fn_clone_suggeststorebuilder(void*, RustCallStatus*);
-  void uniffi_suggest_fn_free_suggeststorebuilder(void*, RustCallStatus*);
+  uint64_t uniffi_suggest_fn_clone_suggeststore(uint64_t, RustCallStatus*);
+  void uniffi_suggest_fn_free_suggeststore(uint64_t, RustCallStatus*);
+  uint64_t uniffi_suggest_fn_clone_suggeststorebuilder(uint64_t, RustCallStatus*);
+  void uniffi_suggest_fn_free_suggeststorebuilder(uint64_t, RustCallStatus*);
   int8_t uniffi_suggest_fn_func_raw_suggestion_url_matches(RustBuffer, RustBuffer, RustCallStatus*);
-  void* uniffi_suggest_fn_constructor_suggeststore_new(RustBuffer, void*, RustCallStatus*);
-  int8_t uniffi_suggest_fn_method_suggeststore_any_dismissed_suggestions(void*, RustCallStatus*);
-  void uniffi_suggest_fn_method_suggeststore_clear(void*, RustCallStatus*);
-  void uniffi_suggest_fn_method_suggeststore_clear_dismissed_suggestions(void*, RustCallStatus*);
-  void uniffi_suggest_fn_method_suggeststore_dismiss_by_key(void*, RustBuffer, RustCallStatus*);
-  void uniffi_suggest_fn_method_suggeststore_dismiss_by_suggestion(void*, RustBuffer, RustCallStatus*);
-  void uniffi_suggest_fn_method_suggeststore_dismiss_suggestion(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_suggest_fn_method_suggeststore_fetch_geoname_alternates(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_suggest_fn_method_suggeststore_fetch_geonames(void*, RustBuffer, int8_t, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_suggest_fn_method_suggeststore_fetch_global_config(void*, RustCallStatus*);
-  RustBuffer uniffi_suggest_fn_method_suggeststore_fetch_provider_config(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_suggest_fn_method_suggeststore_ingest(void*, RustBuffer, RustCallStatus*);
-  void uniffi_suggest_fn_method_suggeststore_interrupt(void*, RustBuffer, RustCallStatus*);
-  int8_t uniffi_suggest_fn_method_suggeststore_is_dismissed_by_key(void*, RustBuffer, RustCallStatus*);
-  int8_t uniffi_suggest_fn_method_suggeststore_is_dismissed_by_suggestion(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_suggest_fn_method_suggeststore_query(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_suggest_fn_method_suggeststore_query_with_metrics(void*, RustBuffer, RustCallStatus*);
-  void* uniffi_suggest_fn_constructor_suggeststorebuilder_new(RustCallStatus*);
-  void* uniffi_suggest_fn_method_suggeststorebuilder_build(void*, RustCallStatus*);
-  void* uniffi_suggest_fn_method_suggeststorebuilder_cache_path(void*, RustBuffer, RustCallStatus*);
-  void* uniffi_suggest_fn_method_suggeststorebuilder_data_path(void*, RustBuffer, RustCallStatus*);
-  void* uniffi_suggest_fn_method_suggeststorebuilder_load_extension(void*, RustBuffer, RustBuffer, RustCallStatus*);
-  void* uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_bucket_name(void*, RustBuffer, RustCallStatus*);
-  void* uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_server(void*, RustBuffer, RustCallStatus*);
-  void* uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_service(void*, void*, RustCallStatus*);
+  uint64_t uniffi_suggest_fn_constructor_suggeststore_new(RustBuffer, uint64_t, RustCallStatus*);
+  int8_t uniffi_suggest_fn_method_suggeststore_any_dismissed_suggestions(uint64_t, RustCallStatus*);
+  void uniffi_suggest_fn_method_suggeststore_clear(uint64_t, RustCallStatus*);
+  void uniffi_suggest_fn_method_suggeststore_clear_dismissed_suggestions(uint64_t, RustCallStatus*);
+  void uniffi_suggest_fn_method_suggeststore_dismiss_by_key(uint64_t, RustBuffer, RustCallStatus*);
+  void uniffi_suggest_fn_method_suggeststore_dismiss_by_suggestion(uint64_t, RustBuffer, RustCallStatus*);
+  void uniffi_suggest_fn_method_suggeststore_dismiss_suggestion(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_suggest_fn_method_suggeststore_fetch_geoname_alternates(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_suggest_fn_method_suggeststore_fetch_geonames(uint64_t, RustBuffer, int8_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_suggest_fn_method_suggeststore_fetch_global_config(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_suggest_fn_method_suggeststore_fetch_provider_config(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_suggest_fn_method_suggeststore_ingest(uint64_t, RustBuffer, RustCallStatus*);
+  void uniffi_suggest_fn_method_suggeststore_interrupt(uint64_t, RustBuffer, RustCallStatus*);
+  int8_t uniffi_suggest_fn_method_suggeststore_is_dismissed_by_key(uint64_t, RustBuffer, RustCallStatus*);
+  int8_t uniffi_suggest_fn_method_suggeststore_is_dismissed_by_suggestion(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_suggest_fn_method_suggeststore_query(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_suggest_fn_method_suggeststore_query_with_metrics(uint64_t, RustBuffer, RustCallStatus*);
+  uint64_t uniffi_suggest_fn_constructor_suggeststorebuilder_new(RustCallStatus*);
+  uint64_t uniffi_suggest_fn_method_suggeststorebuilder_build(uint64_t, RustCallStatus*);
+  uint64_t uniffi_suggest_fn_method_suggeststorebuilder_cache_path(uint64_t, RustBuffer, RustCallStatus*);
+  uint64_t uniffi_suggest_fn_method_suggeststorebuilder_data_path(uint64_t, RustBuffer, RustCallStatus*);
+  uint64_t uniffi_suggest_fn_method_suggeststorebuilder_load_extension(uint64_t, RustBuffer, RustBuffer, RustCallStatus*);
+  uint64_t uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_bucket_name(uint64_t, RustBuffer, RustCallStatus*);
+  uint64_t uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_server(uint64_t, RustBuffer, RustCallStatus*);
+  uint64_t uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_service(uint64_t, uint64_t, RustCallStatus*);
   uint32_t ffi_suggest_uniffi_contract_version();
   uint16_t uniffi_suggest_checksum_func_raw_suggestion_url_matches();
   uint16_t uniffi_suggest_checksum_constructor_suggeststore_new();
@@ -898,10 +882,6 @@ extern "C" {
   void ffi_sync15_rust_future_cancel_f64(uint64_t);
   double ffi_sync15_rust_future_complete_f64(uint64_t, RustCallStatus*);
   void ffi_sync15_rust_future_free_f64(uint64_t);
-  void ffi_sync15_rust_future_poll_pointer(uint64_t, RustFutureContinuationCallback, uint64_t);
-  void ffi_sync15_rust_future_cancel_pointer(uint64_t);
-  void* ffi_sync15_rust_future_complete_pointer(uint64_t, RustCallStatus*);
-  void ffi_sync15_rust_future_free_pointer(uint64_t);
   void ffi_sync15_rust_future_poll_rust_buffer(uint64_t, RustFutureContinuationCallback, uint64_t);
   void ffi_sync15_rust_future_cancel_rust_buffer(uint64_t);
   RustBuffer ffi_sync15_rust_future_complete_rust_buffer(uint64_t, RustCallStatus*);
@@ -955,10 +935,6 @@ extern "C" {
   void ffi_tabs_rust_future_cancel_f64(uint64_t);
   double ffi_tabs_rust_future_complete_f64(uint64_t, RustCallStatus*);
   void ffi_tabs_rust_future_free_f64(uint64_t);
-  void ffi_tabs_rust_future_poll_pointer(uint64_t, RustFutureContinuationCallback, uint64_t);
-  void ffi_tabs_rust_future_cancel_pointer(uint64_t);
-  void* ffi_tabs_rust_future_complete_pointer(uint64_t, RustCallStatus*);
-  void ffi_tabs_rust_future_free_pointer(uint64_t);
   void ffi_tabs_rust_future_poll_rust_buffer(uint64_t, RustFutureContinuationCallback, uint64_t);
   void ffi_tabs_rust_future_cancel_rust_buffer(uint64_t);
   RustBuffer ffi_tabs_rust_future_complete_rust_buffer(uint64_t, RustCallStatus*);
@@ -967,38 +943,38 @@ extern "C" {
   void ffi_tabs_rust_future_cancel_void(uint64_t);
   void ffi_tabs_rust_future_complete_void(uint64_t, RustCallStatus*);
   void ffi_tabs_rust_future_free_void(uint64_t);
-  void* uniffi_tabs_fn_clone_remotecommandstore(void*, RustCallStatus*);
-  void uniffi_tabs_fn_free_remotecommandstore(void*, RustCallStatus*);
-  void* uniffi_tabs_fn_clone_tabsbridgedengine(void*, RustCallStatus*);
-  void uniffi_tabs_fn_free_tabsbridgedengine(void*, RustCallStatus*);
-  void* uniffi_tabs_fn_clone_tabsstore(void*, RustCallStatus*);
-  void uniffi_tabs_fn_free_tabsstore(void*, RustCallStatus*);
-  int8_t uniffi_tabs_fn_method_remotecommandstore_add_remote_command(void*, RustBuffer, RustBuffer, RustCallStatus*);
-  int8_t uniffi_tabs_fn_method_remotecommandstore_add_remote_command_at(void*, RustBuffer, RustBuffer, int64_t, RustCallStatus*);
-  RustBuffer uniffi_tabs_fn_method_remotecommandstore_get_unsent_commands(void*, RustCallStatus*);
-  int8_t uniffi_tabs_fn_method_remotecommandstore_remove_remote_command(void*, RustBuffer, RustBuffer, RustCallStatus*);
-  int8_t uniffi_tabs_fn_method_remotecommandstore_set_pending_command_sent(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_tabs_fn_method_tabsbridgedengine_apply(void*, RustCallStatus*);
-  RustBuffer uniffi_tabs_fn_method_tabsbridgedengine_ensure_current_sync_id(void*, RustBuffer, RustCallStatus*);
-  int64_t uniffi_tabs_fn_method_tabsbridgedengine_last_sync(void*, RustCallStatus*);
-  void uniffi_tabs_fn_method_tabsbridgedengine_prepare_for_sync(void*, RustBuffer, RustCallStatus*);
-  void uniffi_tabs_fn_method_tabsbridgedengine_reset(void*, RustCallStatus*);
-  RustBuffer uniffi_tabs_fn_method_tabsbridgedengine_reset_sync_id(void*, RustCallStatus*);
-  void uniffi_tabs_fn_method_tabsbridgedengine_set_last_sync(void*, int64_t, RustCallStatus*);
-  void uniffi_tabs_fn_method_tabsbridgedengine_set_uploaded(void*, int64_t, RustBuffer, RustCallStatus*);
-  void uniffi_tabs_fn_method_tabsbridgedengine_store_incoming(void*, RustBuffer, RustCallStatus*);
-  void uniffi_tabs_fn_method_tabsbridgedengine_sync_finished(void*, RustCallStatus*);
-  RustBuffer uniffi_tabs_fn_method_tabsbridgedengine_sync_id(void*, RustCallStatus*);
-  void uniffi_tabs_fn_method_tabsbridgedengine_sync_started(void*, RustCallStatus*);
-  void uniffi_tabs_fn_method_tabsbridgedengine_wipe(void*, RustCallStatus*);
-  void* uniffi_tabs_fn_constructor_tabsstore_new(RustBuffer, RustCallStatus*);
-  void* uniffi_tabs_fn_method_tabsstore_bridged_engine(void*, RustCallStatus*);
-  void uniffi_tabs_fn_method_tabsstore_close_connection(void*, RustCallStatus*);
-  RustBuffer uniffi_tabs_fn_method_tabsstore_get_all(void*, RustCallStatus*);
-  void* uniffi_tabs_fn_method_tabsstore_new_remote_command_store(void*, RustCallStatus*);
-  void uniffi_tabs_fn_method_tabsstore_register_with_sync_manager(void*, RustCallStatus*);
-  void uniffi_tabs_fn_method_tabsstore_set_local_tabs(void*, RustBuffer, RustCallStatus*);
-  void uniffi_tabs_fn_method_tabsstore_set_local_tabs_info(void*, RustBuffer, RustCallStatus*);
+  uint64_t uniffi_tabs_fn_clone_remotecommandstore(uint64_t, RustCallStatus*);
+  void uniffi_tabs_fn_free_remotecommandstore(uint64_t, RustCallStatus*);
+  uint64_t uniffi_tabs_fn_clone_tabsbridgedengine(uint64_t, RustCallStatus*);
+  void uniffi_tabs_fn_free_tabsbridgedengine(uint64_t, RustCallStatus*);
+  uint64_t uniffi_tabs_fn_clone_tabsstore(uint64_t, RustCallStatus*);
+  void uniffi_tabs_fn_free_tabsstore(uint64_t, RustCallStatus*);
+  int8_t uniffi_tabs_fn_method_remotecommandstore_add_remote_command(uint64_t, RustBuffer, RustBuffer, RustCallStatus*);
+  int8_t uniffi_tabs_fn_method_remotecommandstore_add_remote_command_at(uint64_t, RustBuffer, RustBuffer, int64_t, RustCallStatus*);
+  RustBuffer uniffi_tabs_fn_method_remotecommandstore_get_unsent_commands(uint64_t, RustCallStatus*);
+  int8_t uniffi_tabs_fn_method_remotecommandstore_remove_remote_command(uint64_t, RustBuffer, RustBuffer, RustCallStatus*);
+  int8_t uniffi_tabs_fn_method_remotecommandstore_set_pending_command_sent(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_tabs_fn_method_tabsbridgedengine_apply(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_tabs_fn_method_tabsbridgedengine_ensure_current_sync_id(uint64_t, RustBuffer, RustCallStatus*);
+  int64_t uniffi_tabs_fn_method_tabsbridgedengine_last_sync(uint64_t, RustCallStatus*);
+  void uniffi_tabs_fn_method_tabsbridgedengine_prepare_for_sync(uint64_t, RustBuffer, RustCallStatus*);
+  void uniffi_tabs_fn_method_tabsbridgedengine_reset(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_tabs_fn_method_tabsbridgedengine_reset_sync_id(uint64_t, RustCallStatus*);
+  void uniffi_tabs_fn_method_tabsbridgedengine_set_last_sync(uint64_t, int64_t, RustCallStatus*);
+  void uniffi_tabs_fn_method_tabsbridgedengine_set_uploaded(uint64_t, int64_t, RustBuffer, RustCallStatus*);
+  void uniffi_tabs_fn_method_tabsbridgedengine_store_incoming(uint64_t, RustBuffer, RustCallStatus*);
+  void uniffi_tabs_fn_method_tabsbridgedengine_sync_finished(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_tabs_fn_method_tabsbridgedengine_sync_id(uint64_t, RustCallStatus*);
+  void uniffi_tabs_fn_method_tabsbridgedengine_sync_started(uint64_t, RustCallStatus*);
+  void uniffi_tabs_fn_method_tabsbridgedengine_wipe(uint64_t, RustCallStatus*);
+  uint64_t uniffi_tabs_fn_constructor_tabsstore_new(RustBuffer, RustCallStatus*);
+  uint64_t uniffi_tabs_fn_method_tabsstore_bridged_engine(uint64_t, RustCallStatus*);
+  void uniffi_tabs_fn_method_tabsstore_close_connection(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_tabs_fn_method_tabsstore_get_all(uint64_t, RustCallStatus*);
+  uint64_t uniffi_tabs_fn_method_tabsstore_new_remote_command_store(uint64_t, RustCallStatus*);
+  void uniffi_tabs_fn_method_tabsstore_register_with_sync_manager(uint64_t, RustCallStatus*);
+  void uniffi_tabs_fn_method_tabsstore_set_local_tabs(uint64_t, RustBuffer, RustCallStatus*);
+  void uniffi_tabs_fn_method_tabsstore_set_local_tabs_info(uint64_t, RustBuffer, RustCallStatus*);
   uint32_t ffi_tabs_uniffi_contract_version();
   uint16_t uniffi_tabs_checksum_method_remotecommandstore_add_remote_command();
   uint16_t uniffi_tabs_checksum_method_remotecommandstore_add_remote_command_at();
@@ -1070,10 +1046,6 @@ extern "C" {
   void ffi_tracing_support_rust_future_cancel_f64(uint64_t);
   double ffi_tracing_support_rust_future_complete_f64(uint64_t, RustCallStatus*);
   void ffi_tracing_support_rust_future_free_f64(uint64_t);
-  void ffi_tracing_support_rust_future_poll_pointer(uint64_t, RustFutureContinuationCallback, uint64_t);
-  void ffi_tracing_support_rust_future_cancel_pointer(uint64_t);
-  void* ffi_tracing_support_rust_future_complete_pointer(uint64_t, RustCallStatus*);
-  void ffi_tracing_support_rust_future_free_pointer(uint64_t);
   void ffi_tracing_support_rust_future_poll_rust_buffer(uint64_t, RustFutureContinuationCallback, uint64_t);
   void ffi_tracing_support_rust_future_cancel_rust_buffer(uint64_t);
   RustBuffer ffi_tracing_support_rust_future_complete_rust_buffer(uint64_t, RustCallStatus*);
@@ -1083,10 +1055,12 @@ extern "C" {
   void ffi_tracing_support_rust_future_complete_void(uint64_t, RustCallStatus*);
   void ffi_tracing_support_rust_future_free_void(uint64_t);
   typedef void (*CallbackInterfaceTracingEventSinkMethod0)(uint64_t, RustBuffer, void*, RustCallStatus*);
+  typedef uint64_t (*CallbackInterfaceCloneTracing_EventSink)(uint64_t);
   typedef void (*CallbackInterfaceFreeTracing_EventSink)(uint64_t);
   struct VTableCallbackInterfaceTracingEventSink {
-    CallbackInterfaceTracingEventSinkMethod0 on_event;
     CallbackInterfaceFreeTracing_EventSink uniffi_free;
+    CallbackInterfaceCloneTracing_EventSink uniffi_clone;
+    CallbackInterfaceTracingEventSinkMethod0 on_event;
   };
   void uniffi_tracing_support_fn_init_callback_vtable_eventsink(VTableCallbackInterfaceTracingEventSink*);
   void uniffi_tracing_support_fn_func_register_event_sink(RustBuffer, RustBuffer, uint64_t, RustCallStatus*);
@@ -1142,10 +1116,6 @@ extern "C" {
   void ffi_viaduct_rust_future_cancel_f64(uint64_t);
   double ffi_viaduct_rust_future_complete_f64(uint64_t, RustCallStatus*);
   void ffi_viaduct_rust_future_free_f64(uint64_t);
-  void ffi_viaduct_rust_future_poll_pointer(uint64_t, RustFutureContinuationCallback, uint64_t);
-  void ffi_viaduct_rust_future_cancel_pointer(uint64_t);
-  void* ffi_viaduct_rust_future_complete_pointer(uint64_t, RustCallStatus*);
-  void ffi_viaduct_rust_future_free_pointer(uint64_t);
   void ffi_viaduct_rust_future_poll_rust_buffer(uint64_t, RustFutureContinuationCallback, uint64_t);
   void ffi_viaduct_rust_future_cancel_rust_buffer(uint64_t);
   RustBuffer ffi_viaduct_rust_future_complete_rust_buffer(uint64_t, RustCallStatus*);
@@ -1154,21 +1124,25 @@ extern "C" {
   void ffi_viaduct_rust_future_cancel_void(uint64_t);
   void ffi_viaduct_rust_future_complete_void(uint64_t, RustCallStatus*);
   void ffi_viaduct_rust_future_free_void(uint64_t);
-  void* uniffi_viaduct_fn_clone_backend(void*, RustCallStatus*);
-  void uniffi_viaduct_fn_free_backend(void*, RustCallStatus*);
-  typedef void (*CallbackInterfaceViaductBackendMethod0)(uint64_t, RustBuffer, RustBuffer, ForeignFutureCompleterust_buffer, uint64_t, ForeignFuture*);
+  uint64_t uniffi_viaduct_fn_clone_backend(uint64_t, RustCallStatus*);
+  void uniffi_viaduct_fn_free_backend(uint64_t, RustCallStatus*);
+  typedef void (*CallbackInterfaceViaductBackendMethod0)(uint64_t, RustBuffer, RustBuffer, ForeignFutureCompleterust_buffer, uint64_t, ForeignFutureDroppedCallbackStruct*);
+  typedef uint64_t (*CallbackInterfaceCloneViaduct_Backend)(uint64_t);
   typedef void (*CallbackInterfaceFreeViaduct_Backend)(uint64_t);
   struct VTableCallbackInterfaceViaductBackend {
-    CallbackInterfaceViaductBackendMethod0 send_request;
     CallbackInterfaceFreeViaduct_Backend uniffi_free;
+    CallbackInterfaceCloneViaduct_Backend uniffi_clone;
+    CallbackInterfaceViaductBackendMethod0 send_request;
   };
   void uniffi_viaduct_fn_init_callback_vtable_backend(VTableCallbackInterfaceViaductBackend*);
   void uniffi_viaduct_fn_func_allow_android_emulator_loopback(RustCallStatus*);
-  void uniffi_viaduct_fn_func_init_backend(void*, RustCallStatus*);
-  uint64_t uniffi_viaduct_fn_method_backend_send_request(void*, RustBuffer, RustBuffer);
+  void uniffi_viaduct_fn_func_init_backend(uint64_t, RustCallStatus*);
+  void uniffi_viaduct_fn_func_set_global_default_user_agent(RustBuffer, RustCallStatus*);
+  uint64_t uniffi_viaduct_fn_method_backend_send_request(uint64_t, RustBuffer, RustBuffer);
   uint32_t ffi_viaduct_uniffi_contract_version();
   uint16_t uniffi_viaduct_checksum_func_allow_android_emulator_loopback();
   uint16_t uniffi_viaduct_checksum_func_init_backend();
+  uint16_t uniffi_viaduct_checksum_func_set_global_default_user_agent();
   uint16_t uniffi_viaduct_checksum_method_backend_send_request();
   RustBuffer ffi_webext_storage_rustbuffer_alloc(uint64_t, RustCallStatus*);
   RustBuffer ffi_webext_storage_rustbuffer_from_bytes(ForeignBytes, RustCallStatus*);
@@ -1214,10 +1188,6 @@ extern "C" {
   void ffi_webext_storage_rust_future_cancel_f64(uint64_t);
   double ffi_webext_storage_rust_future_complete_f64(uint64_t, RustCallStatus*);
   void ffi_webext_storage_rust_future_free_f64(uint64_t);
-  void ffi_webext_storage_rust_future_poll_pointer(uint64_t, RustFutureContinuationCallback, uint64_t);
-  void ffi_webext_storage_rust_future_cancel_pointer(uint64_t);
-  void* ffi_webext_storage_rust_future_complete_pointer(uint64_t, RustCallStatus*);
-  void ffi_webext_storage_rust_future_free_pointer(uint64_t);
   void ffi_webext_storage_rust_future_poll_rust_buffer(uint64_t, RustFutureContinuationCallback, uint64_t);
   void ffi_webext_storage_rust_future_cancel_rust_buffer(uint64_t);
   RustBuffer ffi_webext_storage_rust_future_complete_rust_buffer(uint64_t, RustCallStatus*);
@@ -1226,33 +1196,33 @@ extern "C" {
   void ffi_webext_storage_rust_future_cancel_void(uint64_t);
   void ffi_webext_storage_rust_future_complete_void(uint64_t, RustCallStatus*);
   void ffi_webext_storage_rust_future_free_void(uint64_t);
-  void* uniffi_webext_storage_fn_clone_webextstoragebridgedengine(void*, RustCallStatus*);
-  void uniffi_webext_storage_fn_free_webextstoragebridgedengine(void*, RustCallStatus*);
-  void* uniffi_webext_storage_fn_clone_webextstoragestore(void*, RustCallStatus*);
-  void uniffi_webext_storage_fn_free_webextstoragestore(void*, RustCallStatus*);
-  RustBuffer uniffi_webext_storage_fn_method_webextstoragebridgedengine_apply(void*, RustCallStatus*);
-  RustBuffer uniffi_webext_storage_fn_method_webextstoragebridgedengine_ensure_current_sync_id(void*, RustBuffer, RustCallStatus*);
-  int64_t uniffi_webext_storage_fn_method_webextstoragebridgedengine_last_sync(void*, RustCallStatus*);
-  void uniffi_webext_storage_fn_method_webextstoragebridgedengine_prepare_for_sync(void*, RustBuffer, RustCallStatus*);
-  void uniffi_webext_storage_fn_method_webextstoragebridgedengine_reset(void*, RustCallStatus*);
-  RustBuffer uniffi_webext_storage_fn_method_webextstoragebridgedengine_reset_sync_id(void*, RustCallStatus*);
-  void uniffi_webext_storage_fn_method_webextstoragebridgedengine_set_last_sync(void*, int64_t, RustCallStatus*);
-  void uniffi_webext_storage_fn_method_webextstoragebridgedengine_set_uploaded(void*, int64_t, RustBuffer, RustCallStatus*);
-  void uniffi_webext_storage_fn_method_webextstoragebridgedengine_store_incoming(void*, RustBuffer, RustCallStatus*);
-  void uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_finished(void*, RustCallStatus*);
-  RustBuffer uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_id(void*, RustCallStatus*);
-  void uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_started(void*, RustCallStatus*);
-  void uniffi_webext_storage_fn_method_webextstoragebridgedengine_wipe(void*, RustCallStatus*);
-  void* uniffi_webext_storage_fn_constructor_webextstoragestore_new(RustBuffer, RustCallStatus*);
-  void* uniffi_webext_storage_fn_method_webextstoragestore_bridged_engine(void*, RustCallStatus*);
-  RustBuffer uniffi_webext_storage_fn_method_webextstoragestore_clear(void*, RustBuffer, RustCallStatus*);
-  void uniffi_webext_storage_fn_method_webextstoragestore_close(void*, RustCallStatus*);
-  RustBuffer uniffi_webext_storage_fn_method_webextstoragestore_get(void*, RustBuffer, RustBuffer, RustCallStatus*);
-  uint64_t uniffi_webext_storage_fn_method_webextstoragestore_get_bytes_in_use(void*, RustBuffer, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_webext_storage_fn_method_webextstoragestore_get_keys(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_webext_storage_fn_method_webextstoragestore_get_synced_changes(void*, RustCallStatus*);
-  RustBuffer uniffi_webext_storage_fn_method_webextstoragestore_remove(void*, RustBuffer, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_webext_storage_fn_method_webextstoragestore_set(void*, RustBuffer, RustBuffer, RustCallStatus*);
+  uint64_t uniffi_webext_storage_fn_clone_webextstoragebridgedengine(uint64_t, RustCallStatus*);
+  void uniffi_webext_storage_fn_free_webextstoragebridgedengine(uint64_t, RustCallStatus*);
+  uint64_t uniffi_webext_storage_fn_clone_webextstoragestore(uint64_t, RustCallStatus*);
+  void uniffi_webext_storage_fn_free_webextstoragestore(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_webext_storage_fn_method_webextstoragebridgedengine_apply(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_webext_storage_fn_method_webextstoragebridgedengine_ensure_current_sync_id(uint64_t, RustBuffer, RustCallStatus*);
+  int64_t uniffi_webext_storage_fn_method_webextstoragebridgedengine_last_sync(uint64_t, RustCallStatus*);
+  void uniffi_webext_storage_fn_method_webextstoragebridgedengine_prepare_for_sync(uint64_t, RustBuffer, RustCallStatus*);
+  void uniffi_webext_storage_fn_method_webextstoragebridgedengine_reset(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_webext_storage_fn_method_webextstoragebridgedengine_reset_sync_id(uint64_t, RustCallStatus*);
+  void uniffi_webext_storage_fn_method_webextstoragebridgedengine_set_last_sync(uint64_t, int64_t, RustCallStatus*);
+  void uniffi_webext_storage_fn_method_webextstoragebridgedengine_set_uploaded(uint64_t, int64_t, RustBuffer, RustCallStatus*);
+  void uniffi_webext_storage_fn_method_webextstoragebridgedengine_store_incoming(uint64_t, RustBuffer, RustCallStatus*);
+  void uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_finished(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_id(uint64_t, RustCallStatus*);
+  void uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_started(uint64_t, RustCallStatus*);
+  void uniffi_webext_storage_fn_method_webextstoragebridgedengine_wipe(uint64_t, RustCallStatus*);
+  uint64_t uniffi_webext_storage_fn_constructor_webextstoragestore_new(RustBuffer, RustCallStatus*);
+  uint64_t uniffi_webext_storage_fn_method_webextstoragestore_bridged_engine(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_webext_storage_fn_method_webextstoragestore_clear(uint64_t, RustBuffer, RustCallStatus*);
+  void uniffi_webext_storage_fn_method_webextstoragestore_close(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_webext_storage_fn_method_webextstoragestore_get(uint64_t, RustBuffer, RustBuffer, RustCallStatus*);
+  uint64_t uniffi_webext_storage_fn_method_webextstoragestore_get_bytes_in_use(uint64_t, RustBuffer, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_webext_storage_fn_method_webextstoragestore_get_keys(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_webext_storage_fn_method_webextstoragestore_get_synced_changes(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_webext_storage_fn_method_webextstoragestore_remove(uint64_t, RustBuffer, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_webext_storage_fn_method_webextstoragestore_set(uint64_t, RustBuffer, RustBuffer, RustCallStatus*);
   uint32_t ffi_webext_storage_uniffi_contract_version();
   uint16_t uniffi_webext_storage_checksum_method_webextstoragebridgedengine_apply();
   uint16_t uniffi_webext_storage_checksum_method_webextstoragebridgedengine_ensure_current_sync_id();
@@ -1323,10 +1293,6 @@ extern "C" {
   void ffi_uniffi_bindings_tests_rust_future_cancel_f64(uint64_t);
   double ffi_uniffi_bindings_tests_rust_future_complete_f64(uint64_t, RustCallStatus*);
   void ffi_uniffi_bindings_tests_rust_future_free_f64(uint64_t);
-  void ffi_uniffi_bindings_tests_rust_future_poll_pointer(uint64_t, RustFutureContinuationCallback, uint64_t);
-  void ffi_uniffi_bindings_tests_rust_future_cancel_pointer(uint64_t);
-  void* ffi_uniffi_bindings_tests_rust_future_complete_pointer(uint64_t, RustCallStatus*);
-  void ffi_uniffi_bindings_tests_rust_future_free_pointer(uint64_t);
   void ffi_uniffi_bindings_tests_rust_future_poll_rust_buffer(uint64_t, RustFutureContinuationCallback, uint64_t);
   void ffi_uniffi_bindings_tests_rust_future_cancel_rust_buffer(uint64_t);
   RustBuffer ffi_uniffi_bindings_tests_rust_future_complete_rust_buffer(uint64_t, RustCallStatus*);
@@ -1335,71 +1301,79 @@ extern "C" {
   void ffi_uniffi_bindings_tests_rust_future_cancel_void(uint64_t);
   void ffi_uniffi_bindings_tests_rust_future_complete_void(uint64_t, RustCallStatus*);
   void ffi_uniffi_bindings_tests_rust_future_free_void(uint64_t);
-  void* uniffi_uniffi_bindings_tests_fn_clone_asyncinterface(void*, RustCallStatus*);
-  void uniffi_uniffi_bindings_tests_fn_free_asyncinterface(void*, RustCallStatus*);
-  void* uniffi_uniffi_bindings_tests_fn_clone_asynctesttraitinterface(void*, RustCallStatus*);
-  void uniffi_uniffi_bindings_tests_fn_free_asynctesttraitinterface(void*, RustCallStatus*);
-  void* uniffi_uniffi_bindings_tests_fn_clone_complexmethods(void*, RustCallStatus*);
-  void uniffi_uniffi_bindings_tests_fn_free_complexmethods(void*, RustCallStatus*);
-  void* uniffi_uniffi_bindings_tests_fn_clone_testinterface(void*, RustCallStatus*);
-  void uniffi_uniffi_bindings_tests_fn_free_testinterface(void*, RustCallStatus*);
-  void* uniffi_uniffi_bindings_tests_fn_clone_testtraitinterface(void*, RustCallStatus*);
-  void uniffi_uniffi_bindings_tests_fn_free_testtraitinterface(void*, RustCallStatus*);
-  typedef void (*CallbackInterfaceUniffiBindingsTestsAsyncTestTraitInterfaceMethod0)(uint64_t, ForeignFutureCompletevoid, uint64_t, ForeignFuture*);
+  uint64_t uniffi_uniffi_bindings_tests_fn_clone_asyncinterface(uint64_t, RustCallStatus*);
+  void uniffi_uniffi_bindings_tests_fn_free_asyncinterface(uint64_t, RustCallStatus*);
+  uint64_t uniffi_uniffi_bindings_tests_fn_clone_asynctesttraitinterface(uint64_t, RustCallStatus*);
+  void uniffi_uniffi_bindings_tests_fn_free_asynctesttraitinterface(uint64_t, RustCallStatus*);
+  uint64_t uniffi_uniffi_bindings_tests_fn_clone_complexmethods(uint64_t, RustCallStatus*);
+  void uniffi_uniffi_bindings_tests_fn_free_complexmethods(uint64_t, RustCallStatus*);
+  uint64_t uniffi_uniffi_bindings_tests_fn_clone_testinterface(uint64_t, RustCallStatus*);
+  void uniffi_uniffi_bindings_tests_fn_free_testinterface(uint64_t, RustCallStatus*);
+  uint64_t uniffi_uniffi_bindings_tests_fn_clone_testtraitinterface(uint64_t, RustCallStatus*);
+  void uniffi_uniffi_bindings_tests_fn_free_testtraitinterface(uint64_t, RustCallStatus*);
+  typedef void (*CallbackInterfaceUniffiBindingsTestsAsyncTestTraitInterfaceMethod0)(uint64_t, ForeignFutureCompletevoid, uint64_t, ForeignFutureDroppedCallbackStruct*);
   struct ForeignFutureResultU32 {
     uint32_t return_value;
     RustCallStatus call_status;
   };
   typedef void (*ForeignFutureCompleteu32)(uint64_t, ForeignFutureResultU32);
-  typedef void (*CallbackInterfaceUniffiBindingsTestsAsyncTestTraitInterfaceMethod1)(uint64_t, ForeignFutureCompleteu32, uint64_t, ForeignFuture*);
-  typedef void (*CallbackInterfaceUniffiBindingsTestsAsyncTestTraitInterfaceMethod2)(uint64_t, uint32_t, ForeignFutureCompletevoid, uint64_t, ForeignFuture*);
-  typedef void (*CallbackInterfaceUniffiBindingsTestsAsyncTestTraitInterfaceMethod3)(uint64_t, RustBuffer, ForeignFutureCompleterust_buffer, uint64_t, ForeignFuture*);
+  typedef void (*CallbackInterfaceUniffiBindingsTestsAsyncTestTraitInterfaceMethod1)(uint64_t, ForeignFutureCompleteu32, uint64_t, ForeignFutureDroppedCallbackStruct*);
+  typedef void (*CallbackInterfaceUniffiBindingsTestsAsyncTestTraitInterfaceMethod2)(uint64_t, uint32_t, ForeignFutureCompletevoid, uint64_t, ForeignFutureDroppedCallbackStruct*);
+  typedef void (*CallbackInterfaceUniffiBindingsTestsAsyncTestTraitInterfaceMethod3)(uint64_t, RustBuffer, ForeignFutureCompleterust_buffer, uint64_t, ForeignFutureDroppedCallbackStruct*);
+  typedef uint64_t (*CallbackInterfaceCloneUniffiBindingsTests_AsyncTestTraitInterface)(uint64_t);
   typedef void (*CallbackInterfaceFreeUniffiBindingsTests_AsyncTestTraitInterface)(uint64_t);
   struct VTableCallbackInterfaceUniffiBindingsTestsAsyncTestTraitInterface {
+    CallbackInterfaceFreeUniffiBindingsTests_AsyncTestTraitInterface uniffi_free;
+    CallbackInterfaceCloneUniffiBindingsTests_AsyncTestTraitInterface uniffi_clone;
     CallbackInterfaceUniffiBindingsTestsAsyncTestTraitInterfaceMethod0 noop;
     CallbackInterfaceUniffiBindingsTestsAsyncTestTraitInterfaceMethod1 get_value;
     CallbackInterfaceUniffiBindingsTestsAsyncTestTraitInterfaceMethod2 set_value;
     CallbackInterfaceUniffiBindingsTestsAsyncTestTraitInterfaceMethod3 throw_if_equal;
-    CallbackInterfaceFreeUniffiBindingsTests_AsyncTestTraitInterface uniffi_free;
   };
   void uniffi_uniffi_bindings_tests_fn_init_callback_vtable_asynctesttraitinterface(VTableCallbackInterfaceUniffiBindingsTestsAsyncTestTraitInterface*);
   typedef void (*CallbackInterfaceUniffiBindingsTestsTestTraitInterfaceMethod0)(uint64_t, void*, RustCallStatus*);
   typedef void (*CallbackInterfaceUniffiBindingsTestsTestTraitInterfaceMethod1)(uint64_t, uint32_t*, RustCallStatus*);
   typedef void (*CallbackInterfaceUniffiBindingsTestsTestTraitInterfaceMethod2)(uint64_t, uint32_t, void*, RustCallStatus*);
   typedef void (*CallbackInterfaceUniffiBindingsTestsTestTraitInterfaceMethod3)(uint64_t, RustBuffer, RustBuffer*, RustCallStatus*);
+  typedef uint64_t (*CallbackInterfaceCloneUniffiBindingsTests_TestTraitInterface)(uint64_t);
   typedef void (*CallbackInterfaceFreeUniffiBindingsTests_TestTraitInterface)(uint64_t);
   struct VTableCallbackInterfaceUniffiBindingsTestsTestTraitInterface {
+    CallbackInterfaceFreeUniffiBindingsTests_TestTraitInterface uniffi_free;
+    CallbackInterfaceCloneUniffiBindingsTests_TestTraitInterface uniffi_clone;
     CallbackInterfaceUniffiBindingsTestsTestTraitInterfaceMethod0 noop;
     CallbackInterfaceUniffiBindingsTestsTestTraitInterfaceMethod1 get_value;
     CallbackInterfaceUniffiBindingsTestsTestTraitInterfaceMethod2 set_value;
     CallbackInterfaceUniffiBindingsTestsTestTraitInterfaceMethod3 throw_if_equal;
-    CallbackInterfaceFreeUniffiBindingsTests_TestTraitInterface uniffi_free;
   };
   void uniffi_uniffi_bindings_tests_fn_init_callback_vtable_testtraitinterface(VTableCallbackInterfaceUniffiBindingsTestsTestTraitInterface*);
-  typedef void (*CallbackInterfaceUniffiBindingsTestsTestAsyncCallbackInterfaceMethod0)(uint64_t, ForeignFutureCompletevoid, uint64_t, ForeignFuture*);
-  typedef void (*CallbackInterfaceUniffiBindingsTestsTestAsyncCallbackInterfaceMethod1)(uint64_t, ForeignFutureCompleteu32, uint64_t, ForeignFuture*);
-  typedef void (*CallbackInterfaceUniffiBindingsTestsTestAsyncCallbackInterfaceMethod2)(uint64_t, uint32_t, ForeignFutureCompletevoid, uint64_t, ForeignFuture*);
-  typedef void (*CallbackInterfaceUniffiBindingsTestsTestAsyncCallbackInterfaceMethod3)(uint64_t, RustBuffer, ForeignFutureCompleterust_buffer, uint64_t, ForeignFuture*);
+  typedef void (*CallbackInterfaceUniffiBindingsTestsTestAsyncCallbackInterfaceMethod0)(uint64_t, ForeignFutureCompletevoid, uint64_t, ForeignFutureDroppedCallbackStruct*);
+  typedef void (*CallbackInterfaceUniffiBindingsTestsTestAsyncCallbackInterfaceMethod1)(uint64_t, ForeignFutureCompleteu32, uint64_t, ForeignFutureDroppedCallbackStruct*);
+  typedef void (*CallbackInterfaceUniffiBindingsTestsTestAsyncCallbackInterfaceMethod2)(uint64_t, uint32_t, ForeignFutureCompletevoid, uint64_t, ForeignFutureDroppedCallbackStruct*);
+  typedef void (*CallbackInterfaceUniffiBindingsTestsTestAsyncCallbackInterfaceMethod3)(uint64_t, RustBuffer, ForeignFutureCompleterust_buffer, uint64_t, ForeignFutureDroppedCallbackStruct*);
+  typedef uint64_t (*CallbackInterfaceCloneUniffiBindingsTests_TestAsyncCallbackInterface)(uint64_t);
   typedef void (*CallbackInterfaceFreeUniffiBindingsTests_TestAsyncCallbackInterface)(uint64_t);
   struct VTableCallbackInterfaceUniffiBindingsTestsTestAsyncCallbackInterface {
+    CallbackInterfaceFreeUniffiBindingsTests_TestAsyncCallbackInterface uniffi_free;
+    CallbackInterfaceCloneUniffiBindingsTests_TestAsyncCallbackInterface uniffi_clone;
     CallbackInterfaceUniffiBindingsTestsTestAsyncCallbackInterfaceMethod0 noop;
     CallbackInterfaceUniffiBindingsTestsTestAsyncCallbackInterfaceMethod1 get_value;
     CallbackInterfaceUniffiBindingsTestsTestAsyncCallbackInterfaceMethod2 set_value;
     CallbackInterfaceUniffiBindingsTestsTestAsyncCallbackInterfaceMethod3 throw_if_equal;
-    CallbackInterfaceFreeUniffiBindingsTests_TestAsyncCallbackInterface uniffi_free;
   };
   void uniffi_uniffi_bindings_tests_fn_init_callback_vtable_testasynccallbackinterface(VTableCallbackInterfaceUniffiBindingsTestsTestAsyncCallbackInterface*);
   typedef void (*CallbackInterfaceUniffiBindingsTestsTestCallbackInterfaceMethod0)(uint64_t, void*, RustCallStatus*);
   typedef void (*CallbackInterfaceUniffiBindingsTestsTestCallbackInterfaceMethod1)(uint64_t, uint32_t*, RustCallStatus*);
   typedef void (*CallbackInterfaceUniffiBindingsTestsTestCallbackInterfaceMethod2)(uint64_t, uint32_t, void*, RustCallStatus*);
   typedef void (*CallbackInterfaceUniffiBindingsTestsTestCallbackInterfaceMethod3)(uint64_t, RustBuffer, RustBuffer*, RustCallStatus*);
+  typedef uint64_t (*CallbackInterfaceCloneUniffiBindingsTests_TestCallbackInterface)(uint64_t);
   typedef void (*CallbackInterfaceFreeUniffiBindingsTests_TestCallbackInterface)(uint64_t);
   struct VTableCallbackInterfaceUniffiBindingsTestsTestCallbackInterface {
+    CallbackInterfaceFreeUniffiBindingsTests_TestCallbackInterface uniffi_free;
+    CallbackInterfaceCloneUniffiBindingsTests_TestCallbackInterface uniffi_clone;
     CallbackInterfaceUniffiBindingsTestsTestCallbackInterfaceMethod0 noop;
     CallbackInterfaceUniffiBindingsTestsTestCallbackInterfaceMethod1 get_value;
     CallbackInterfaceUniffiBindingsTestsTestCallbackInterfaceMethod2 set_value;
     CallbackInterfaceUniffiBindingsTestsTestCallbackInterfaceMethod3 throw_if_equal;
-    CallbackInterfaceFreeUniffiBindingsTests_TestCallbackInterface uniffi_free;
   };
   void uniffi_uniffi_bindings_tests_fn_init_callback_vtable_testcallbackinterface(VTableCallbackInterfaceUniffiBindingsTestsTestCallbackInterface*);
   uint64_t uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_f32(float);
@@ -1409,7 +1383,7 @@ extern "C" {
   uint64_t uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_i64(int64_t);
   uint64_t uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_i8(int8_t);
   uint64_t uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_map(RustBuffer);
-  uint64_t uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_obj(void*);
+  uint64_t uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_obj(uint64_t);
   uint64_t uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_string(RustBuffer);
   uint64_t uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_u16(uint16_t);
   uint64_t uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_u32(uint32_t);
@@ -1417,18 +1391,18 @@ extern "C" {
   uint64_t uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_u8(uint8_t);
   uint64_t uniffi_uniffi_bindings_tests_fn_func_async_roundtrip_vec(RustBuffer);
   uint64_t uniffi_uniffi_bindings_tests_fn_func_async_throw_error();
-  void* uniffi_uniffi_bindings_tests_fn_func_clone_interface(void*, RustCallStatus*);
-  void* uniffi_uniffi_bindings_tests_fn_func_create_async_test_trait_interface(uint32_t, RustCallStatus*);
-  void* uniffi_uniffi_bindings_tests_fn_func_create_test_trait_interface(uint32_t, RustCallStatus*);
+  uint64_t uniffi_uniffi_bindings_tests_fn_func_clone_interface(uint64_t, RustCallStatus*);
+  uint64_t uniffi_uniffi_bindings_tests_fn_func_create_async_test_trait_interface(uint32_t, RustCallStatus*);
+  uint64_t uniffi_uniffi_bindings_tests_fn_func_create_test_trait_interface(uint32_t, RustCallStatus*);
   RustBuffer uniffi_uniffi_bindings_tests_fn_func_func_with_default(RustBuffer, RustCallStatus*);
   void uniffi_uniffi_bindings_tests_fn_func_func_with_error(uint32_t, RustCallStatus*);
   void uniffi_uniffi_bindings_tests_fn_func_func_with_flat_error(uint32_t, RustCallStatus*);
   RustBuffer uniffi_uniffi_bindings_tests_fn_func_func_with_multi_word_arg(RustBuffer, RustCallStatus*);
   RustBuffer uniffi_uniffi_bindings_tests_fn_func_get_custom_types_demo(RustCallStatus*);
-  uint64_t uniffi_uniffi_bindings_tests_fn_func_invoke_async_test_trait_interface_get_value(void*);
-  uint64_t uniffi_uniffi_bindings_tests_fn_func_invoke_async_test_trait_interface_noop(void*);
-  uint64_t uniffi_uniffi_bindings_tests_fn_func_invoke_async_test_trait_interface_set_value(void*, uint32_t);
-  uint64_t uniffi_uniffi_bindings_tests_fn_func_invoke_async_test_trait_interface_throw_if_equal(void*, RustBuffer);
+  uint64_t uniffi_uniffi_bindings_tests_fn_func_invoke_async_test_trait_interface_get_value(uint64_t);
+  uint64_t uniffi_uniffi_bindings_tests_fn_func_invoke_async_test_trait_interface_noop(uint64_t);
+  uint64_t uniffi_uniffi_bindings_tests_fn_func_invoke_async_test_trait_interface_set_value(uint64_t, uint32_t);
+  uint64_t uniffi_uniffi_bindings_tests_fn_func_invoke_async_test_trait_interface_throw_if_equal(uint64_t, RustBuffer);
   uint64_t uniffi_uniffi_bindings_tests_fn_func_invoke_test_async_callback_interface_get_value(uint64_t);
   uint64_t uniffi_uniffi_bindings_tests_fn_func_invoke_test_async_callback_interface_noop(uint64_t);
   uint64_t uniffi_uniffi_bindings_tests_fn_func_invoke_test_async_callback_interface_set_value(uint64_t, uint32_t);
@@ -1437,10 +1411,12 @@ extern "C" {
   void uniffi_uniffi_bindings_tests_fn_func_invoke_test_callback_interface_noop(uint64_t, RustCallStatus*);
   void uniffi_uniffi_bindings_tests_fn_func_invoke_test_callback_interface_set_value(uint64_t, uint32_t, RustCallStatus*);
   RustBuffer uniffi_uniffi_bindings_tests_fn_func_invoke_test_callback_interface_throw_if_equal(uint64_t, RustBuffer, RustCallStatus*);
-  uint32_t uniffi_uniffi_bindings_tests_fn_func_invoke_test_trait_interface_get_value(void*, RustCallStatus*);
-  void uniffi_uniffi_bindings_tests_fn_func_invoke_test_trait_interface_noop(void*, RustCallStatus*);
-  void uniffi_uniffi_bindings_tests_fn_func_invoke_test_trait_interface_set_value(void*, uint32_t, RustCallStatus*);
-  RustBuffer uniffi_uniffi_bindings_tests_fn_func_invoke_test_trait_interface_throw_if_equal(void*, RustBuffer, RustCallStatus*);
+  uint32_t uniffi_uniffi_bindings_tests_fn_func_invoke_test_trait_interface_get_value(uint64_t, RustCallStatus*);
+  void uniffi_uniffi_bindings_tests_fn_func_invoke_test_trait_interface_noop(uint64_t, RustCallStatus*);
+  void uniffi_uniffi_bindings_tests_fn_func_invoke_test_trait_interface_set_value(uint64_t, uint32_t, RustCallStatus*);
+  RustBuffer uniffi_uniffi_bindings_tests_fn_func_invoke_test_trait_interface_throw_if_equal(uint64_t, RustBuffer, RustCallStatus*);
+  uint64_t uniffi_uniffi_bindings_tests_fn_func_roundtrip_async_test_trait_interface(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_uniffi_bindings_tests_fn_func_roundtrip_async_test_trait_interface_list(RustBuffer, RustCallStatus*);
   int8_t uniffi_uniffi_bindings_tests_fn_func_roundtrip_bool(int8_t, RustCallStatus*);
   RustBuffer uniffi_uniffi_bindings_tests_fn_func_roundtrip_complex_compound(RustBuffer, RustCallStatus*);
   RustBuffer uniffi_uniffi_bindings_tests_fn_func_roundtrip_complex_enum(RustBuffer, RustCallStatus*);
@@ -1458,6 +1434,8 @@ extern "C" {
   RustBuffer uniffi_uniffi_bindings_tests_fn_func_roundtrip_option(RustBuffer, RustCallStatus*);
   RustBuffer uniffi_uniffi_bindings_tests_fn_func_roundtrip_simple_rec(RustBuffer, RustCallStatus*);
   RustBuffer uniffi_uniffi_bindings_tests_fn_func_roundtrip_string(RustBuffer, RustCallStatus*);
+  uint64_t uniffi_uniffi_bindings_tests_fn_func_roundtrip_test_trait_interface(uint64_t, RustCallStatus*);
+  RustBuffer uniffi_uniffi_bindings_tests_fn_func_roundtrip_test_trait_interface_list(RustBuffer, RustCallStatus*);
   int64_t uniffi_uniffi_bindings_tests_fn_func_roundtrip_time_interval_ms(int64_t, RustCallStatus*);
   double uniffi_uniffi_bindings_tests_fn_func_roundtrip_time_interval_sec_dbl(double, RustCallStatus*);
   float uniffi_uniffi_bindings_tests_fn_func_roundtrip_time_interval_sec_flt(float, RustCallStatus*);
@@ -1470,22 +1448,22 @@ extern "C" {
   double uniffi_uniffi_bindings_tests_fn_func_sum_with_many_types(uint8_t, int8_t, uint16_t, int16_t, uint32_t, int32_t, uint64_t, int64_t, float, double, int8_t, RustCallStatus*);
   RustBuffer uniffi_uniffi_bindings_tests_fn_func_swap_test_interfaces(RustBuffer, RustCallStatus*);
   void uniffi_uniffi_bindings_tests_fn_func_test_func(RustCallStatus*);
-  void* uniffi_uniffi_bindings_tests_fn_constructor_asyncinterface_new(RustBuffer, RustCallStatus*);
-  uint64_t uniffi_uniffi_bindings_tests_fn_method_asyncinterface_name(void*);
-  uint64_t uniffi_uniffi_bindings_tests_fn_method_asynctesttraitinterface_noop(void*);
-  uint64_t uniffi_uniffi_bindings_tests_fn_method_asynctesttraitinterface_get_value(void*);
-  uint64_t uniffi_uniffi_bindings_tests_fn_method_asynctesttraitinterface_set_value(void*, uint32_t);
-  uint64_t uniffi_uniffi_bindings_tests_fn_method_asynctesttraitinterface_throw_if_equal(void*, RustBuffer);
-  void* uniffi_uniffi_bindings_tests_fn_constructor_complexmethods_new(RustCallStatus*);
-  RustBuffer uniffi_uniffi_bindings_tests_fn_method_complexmethods_method_with_default(void*, RustBuffer, RustCallStatus*);
-  RustBuffer uniffi_uniffi_bindings_tests_fn_method_complexmethods_method_with_multi_word_arg(void*, RustBuffer, RustCallStatus*);
-  void* uniffi_uniffi_bindings_tests_fn_constructor_testinterface_new(uint32_t, RustCallStatus*);
-  uint32_t uniffi_uniffi_bindings_tests_fn_method_testinterface_get_value(void*, RustCallStatus*);
-  uint32_t uniffi_uniffi_bindings_tests_fn_method_testinterface_ref_count(void*, RustCallStatus*);
-  void uniffi_uniffi_bindings_tests_fn_method_testtraitinterface_noop(void*, RustCallStatus*);
-  uint32_t uniffi_uniffi_bindings_tests_fn_method_testtraitinterface_get_value(void*, RustCallStatus*);
-  void uniffi_uniffi_bindings_tests_fn_method_testtraitinterface_set_value(void*, uint32_t, RustCallStatus*);
-  RustBuffer uniffi_uniffi_bindings_tests_fn_method_testtraitinterface_throw_if_equal(void*, RustBuffer, RustCallStatus*);
+  uint64_t uniffi_uniffi_bindings_tests_fn_constructor_asyncinterface_new(RustBuffer, RustCallStatus*);
+  uint64_t uniffi_uniffi_bindings_tests_fn_method_asyncinterface_name(uint64_t);
+  uint64_t uniffi_uniffi_bindings_tests_fn_method_asynctesttraitinterface_noop(uint64_t);
+  uint64_t uniffi_uniffi_bindings_tests_fn_method_asynctesttraitinterface_get_value(uint64_t);
+  uint64_t uniffi_uniffi_bindings_tests_fn_method_asynctesttraitinterface_set_value(uint64_t, uint32_t);
+  uint64_t uniffi_uniffi_bindings_tests_fn_method_asynctesttraitinterface_throw_if_equal(uint64_t, RustBuffer);
+  uint64_t uniffi_uniffi_bindings_tests_fn_constructor_complexmethods_new(RustCallStatus*);
+  RustBuffer uniffi_uniffi_bindings_tests_fn_method_complexmethods_method_with_default(uint64_t, RustBuffer, RustCallStatus*);
+  RustBuffer uniffi_uniffi_bindings_tests_fn_method_complexmethods_method_with_multi_word_arg(uint64_t, RustBuffer, RustCallStatus*);
+  uint64_t uniffi_uniffi_bindings_tests_fn_constructor_testinterface_new(uint32_t, RustCallStatus*);
+  uint32_t uniffi_uniffi_bindings_tests_fn_method_testinterface_get_value(uint64_t, RustCallStatus*);
+  uint32_t uniffi_uniffi_bindings_tests_fn_method_testinterface_ref_count(uint64_t, RustCallStatus*);
+  void uniffi_uniffi_bindings_tests_fn_method_testtraitinterface_noop(uint64_t, RustCallStatus*);
+  uint32_t uniffi_uniffi_bindings_tests_fn_method_testtraitinterface_get_value(uint64_t, RustCallStatus*);
+  void uniffi_uniffi_bindings_tests_fn_method_testtraitinterface_set_value(uint64_t, uint32_t, RustCallStatus*);
+  RustBuffer uniffi_uniffi_bindings_tests_fn_method_testtraitinterface_throw_if_equal(uint64_t, RustBuffer, RustCallStatus*);
   uint32_t ffi_uniffi_bindings_tests_uniffi_contract_version();
   uint16_t uniffi_uniffi_bindings_tests_checksum_func_async_roundtrip_f32();
   uint16_t uniffi_uniffi_bindings_tests_checksum_func_async_roundtrip_f64();
@@ -1526,6 +1504,8 @@ extern "C" {
   uint16_t uniffi_uniffi_bindings_tests_checksum_func_invoke_test_trait_interface_noop();
   uint16_t uniffi_uniffi_bindings_tests_checksum_func_invoke_test_trait_interface_set_value();
   uint16_t uniffi_uniffi_bindings_tests_checksum_func_invoke_test_trait_interface_throw_if_equal();
+  uint16_t uniffi_uniffi_bindings_tests_checksum_func_roundtrip_async_test_trait_interface();
+  uint16_t uniffi_uniffi_bindings_tests_checksum_func_roundtrip_async_test_trait_interface_list();
   uint16_t uniffi_uniffi_bindings_tests_checksum_func_roundtrip_bool();
   uint16_t uniffi_uniffi_bindings_tests_checksum_func_roundtrip_complex_compound();
   uint16_t uniffi_uniffi_bindings_tests_checksum_func_roundtrip_complex_enum();
@@ -1543,6 +1523,8 @@ extern "C" {
   uint16_t uniffi_uniffi_bindings_tests_checksum_func_roundtrip_option();
   uint16_t uniffi_uniffi_bindings_tests_checksum_func_roundtrip_simple_rec();
   uint16_t uniffi_uniffi_bindings_tests_checksum_func_roundtrip_string();
+  uint16_t uniffi_uniffi_bindings_tests_checksum_func_roundtrip_test_trait_interface();
+  uint16_t uniffi_uniffi_bindings_tests_checksum_func_roundtrip_test_trait_interface_list();
   uint16_t uniffi_uniffi_bindings_tests_checksum_func_roundtrip_time_interval_ms();
   uint16_t uniffi_uniffi_bindings_tests_checksum_func_roundtrip_time_interval_sec_dbl();
   uint16_t uniffi_uniffi_bindings_tests_checksum_func_roundtrip_time_interval_sec_flt();
@@ -1615,10 +1597,6 @@ extern "C" {
   void ffi_uniffi_bindings_tests_collision_rust_future_cancel_f64(uint64_t);
   double ffi_uniffi_bindings_tests_collision_rust_future_complete_f64(uint64_t, RustCallStatus*);
   void ffi_uniffi_bindings_tests_collision_rust_future_free_f64(uint64_t);
-  void ffi_uniffi_bindings_tests_collision_rust_future_poll_pointer(uint64_t, RustFutureContinuationCallback, uint64_t);
-  void ffi_uniffi_bindings_tests_collision_rust_future_cancel_pointer(uint64_t);
-  void* ffi_uniffi_bindings_tests_collision_rust_future_complete_pointer(uint64_t, RustCallStatus*);
-  void ffi_uniffi_bindings_tests_collision_rust_future_free_pointer(uint64_t);
   void ffi_uniffi_bindings_tests_collision_rust_future_poll_rust_buffer(uint64_t, RustFutureContinuationCallback, uint64_t);
   void ffi_uniffi_bindings_tests_collision_rust_future_cancel_rust_buffer(uint64_t);
   RustBuffer ffi_uniffi_bindings_tests_collision_rust_future_complete_rust_buffer(uint64_t, RustCallStatus*);
@@ -1628,10 +1606,12 @@ extern "C" {
   void ffi_uniffi_bindings_tests_collision_rust_future_complete_void(uint64_t, RustCallStatus*);
   void ffi_uniffi_bindings_tests_collision_rust_future_free_void(uint64_t);
   typedef void (*CallbackInterfaceUniffiBindingsTestsCollisionTestCallbackInterfaceMethod0)(uint64_t, RustBuffer*, RustCallStatus*);
+  typedef uint64_t (*CallbackInterfaceCloneUniffiBindingsTestsCollision_TestCallbackInterface)(uint64_t);
   typedef void (*CallbackInterfaceFreeUniffiBindingsTestsCollision_TestCallbackInterface)(uint64_t);
   struct VTableCallbackInterfaceUniffiBindingsTestsCollisionTestCallbackInterface {
-    CallbackInterfaceUniffiBindingsTestsCollisionTestCallbackInterfaceMethod0 get_value;
     CallbackInterfaceFreeUniffiBindingsTestsCollision_TestCallbackInterface uniffi_free;
+    CallbackInterfaceCloneUniffiBindingsTestsCollision_TestCallbackInterface uniffi_clone;
+    CallbackInterfaceUniffiBindingsTestsCollisionTestCallbackInterfaceMethod0 get_value;
   };
   void uniffi_uniffi_bindings_tests_collision_fn_init_callback_vtable_testcallbackinterface(VTableCallbackInterfaceUniffiBindingsTestsCollisionTestCallbackInterface*);
   RustBuffer uniffi_uniffi_bindings_tests_collision_fn_func_invoke_collision_callback(uint64_t, RustCallStatus*);
@@ -1681,10 +1661,6 @@ extern "C" {
   void ffi_uniffi_bindings_tests_external_types_rust_future_cancel_f64(uint64_t);
   double ffi_uniffi_bindings_tests_external_types_rust_future_complete_f64(uint64_t, RustCallStatus*);
   void ffi_uniffi_bindings_tests_external_types_rust_future_free_f64(uint64_t);
-  void ffi_uniffi_bindings_tests_external_types_rust_future_poll_pointer(uint64_t, RustFutureContinuationCallback, uint64_t);
-  void ffi_uniffi_bindings_tests_external_types_rust_future_cancel_pointer(uint64_t);
-  void* ffi_uniffi_bindings_tests_external_types_rust_future_complete_pointer(uint64_t, RustCallStatus*);
-  void ffi_uniffi_bindings_tests_external_types_rust_future_free_pointer(uint64_t);
   void ffi_uniffi_bindings_tests_external_types_rust_future_poll_rust_buffer(uint64_t, RustFutureContinuationCallback, uint64_t);
   void ffi_uniffi_bindings_tests_external_types_rust_future_cancel_rust_buffer(uint64_t);
   RustBuffer ffi_uniffi_bindings_tests_external_types_rust_future_complete_rust_buffer(uint64_t, RustCallStatus*);
@@ -1695,7 +1671,7 @@ extern "C" {
   void ffi_uniffi_bindings_tests_external_types_rust_future_free_void(uint64_t);
   uint64_t uniffi_uniffi_bindings_tests_external_types_fn_func_roundtrip_ext_custom_type(uint64_t, RustCallStatus*);
   RustBuffer uniffi_uniffi_bindings_tests_external_types_fn_func_roundtrip_ext_enum(RustBuffer, RustCallStatus*);
-  void* uniffi_uniffi_bindings_tests_external_types_fn_func_roundtrip_ext_interface(void*, RustCallStatus*);
+  uint64_t uniffi_uniffi_bindings_tests_external_types_fn_func_roundtrip_ext_interface(uint64_t, RustCallStatus*);
   RustBuffer uniffi_uniffi_bindings_tests_external_types_fn_func_roundtrip_ext_record(RustBuffer, RustCallStatus*);
   uint32_t ffi_uniffi_bindings_tests_external_types_uniffi_contract_version();
   uint16_t uniffi_uniffi_bindings_tests_external_types_checksum_func_roundtrip_ext_custom_type();
@@ -1719,11 +1695,11 @@ const static mozilla::uniffi::UniFFIPointerType kContextIdContextIdComponentPoin
 };
 class FfiValueObjectHandleContextIdContextIdComponent {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleContextIdContextIdComponent() = default;
-  explicit FfiValueObjectHandleContextIdContextIdComponent(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleContextIdContextIdComponent(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleContextIdContextIdComponent(const FfiValueObjectHandleContextIdContextIdComponent&) = delete;
@@ -1732,7 +1708,7 @@ class FfiValueObjectHandleContextIdContextIdComponent {
   FfiValueObjectHandleContextIdContextIdComponent& operator=(FfiValueObjectHandleContextIdContextIdComponent&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -1762,16 +1738,16 @@ class FfiValueObjectHandleContextIdContextIdComponent {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kContextIdContextIdComponentPointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleContextIdContextIdComponent FromRust(void* aValue) {
+  static FfiValueObjectHandleContextIdContextIdComponent FromRust(uint64_t aValue) {
     return FfiValueObjectHandleContextIdContextIdComponent(aValue);
   }
 
@@ -1798,11 +1774,11 @@ const static mozilla::uniffi::UniFFIPointerType kFilterAdultFilterAdultComponent
 };
 class FfiValueObjectHandleFilterAdultFilterAdultComponent {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleFilterAdultFilterAdultComponent() = default;
-  explicit FfiValueObjectHandleFilterAdultFilterAdultComponent(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleFilterAdultFilterAdultComponent(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleFilterAdultFilterAdultComponent(const FfiValueObjectHandleFilterAdultFilterAdultComponent&) = delete;
@@ -1811,7 +1787,7 @@ class FfiValueObjectHandleFilterAdultFilterAdultComponent {
   FfiValueObjectHandleFilterAdultFilterAdultComponent& operator=(FfiValueObjectHandleFilterAdultFilterAdultComponent&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -1841,16 +1817,16 @@ class FfiValueObjectHandleFilterAdultFilterAdultComponent {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kFilterAdultFilterAdultComponentPointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleFilterAdultFilterAdultComponent FromRust(void* aValue) {
+  static FfiValueObjectHandleFilterAdultFilterAdultComponent FromRust(uint64_t aValue) {
     return FfiValueObjectHandleFilterAdultFilterAdultComponent(aValue);
   }
 
@@ -1875,26 +1851,23 @@ const static mozilla::uniffi::UniFFIPointerType kLoginsEncryptorDecryptorPointer
   uniffi_logins_fn_clone_encryptordecryptor,
   uniffi_logins_fn_free_encryptordecryptor,
 };
-// Forward declare the free function, which is defined later on in `CallbackInterfaces.cpp`
+// Forward declare the free and clone functions, which are defined later on in `CallbackInterfaces.cpp`
 extern "C" void callback_free_logins_encryptor_decryptor(uint64_t uniffiHandle);
+extern "C" uint64_t callback_clone_logins_encryptor_decryptor(uint64_t uniffiHandle);
 
 // Trait interface FFI value class.  This is a hybrid between the one for interfaces and callback
 // interface version
 class FfiValueObjectHandleLoginsEncryptorDecryptor {
  private:
-  // Did we lower a callback interface, rather than lift an object interface?
-  // This is weird, but it's a needed work until something like
-  // https://github.com/mozilla/uniffi-rs/pull/1823 lands.
-  bool mLoweredCallbackInterface = false;
-  // The raw FFI value is a pointer.
+  // The raw FFI value is a uint64_t in all cases.
   // For callback interfaces, the uint64_t handle gets casted to a pointer.  Callback interface
-  // handles are incremented by one at a time, so even on a 32-bit system this
+  // handles are used as the uint64_t and are incremented by one at a time, so even on a 32-bit system this
   // shouldn't overflow.
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleLoginsEncryptorDecryptor() = default;
-  explicit FfiValueObjectHandleLoginsEncryptorDecryptor(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleLoginsEncryptorDecryptor(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleLoginsEncryptorDecryptor(const FfiValueObjectHandleLoginsEncryptorDecryptor&) = delete;
@@ -1903,83 +1876,79 @@ class FfiValueObjectHandleLoginsEncryptorDecryptor {
   FfiValueObjectHandleLoginsEncryptorDecryptor& operator=(FfiValueObjectHandleLoginsEncryptorDecryptor&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    mLoweredCallbackInterface = aOther.mLoweredCallbackInterface;
-    aOther.mValue = nullptr;
-    aOther.mLoweredCallbackInterface = false;
+    aOther.mValue = 0;
     return *this;
   }
 
-  // Lower treats `aValue` as a callback interface
+  // Lower a trait interface, `aValue` can either be a Rust or JS handle
   void Lower(const dom::OwningUniFFIScaffoldingValue& aValue,
              ErrorResult& aError) {
-    if (!aValue.IsDouble()) {
-      aError.ThrowTypeError("Bad argument type"_ns);
-      return;
-    }
-    double floatValue = aValue.GetAsDouble();
-    uint64_t intValue = static_cast<uint64_t>(floatValue);
-    if (intValue != floatValue) {
-      aError.ThrowTypeError("Not an integer"_ns);
-      return;
-    }
     FreeHandle();
-    mValue = reinterpret_cast<void *>(intValue);
-    mLoweredCallbackInterface = true;
-  }
-
-  // LowerReceiver is used for method receivers.  It treats `aValue` as an object pointer.
-  void LowerReciever(const dom::OwningUniFFIScaffoldingValue& aValue,
-             ErrorResult& aError) {
-    if (!aValue.IsUniFFIPointer()) {
-      aError.ThrowTypeError("Expected UniFFI pointer argument"_ns);
-      return;
-    }
-    dom::UniFFIPointer& value = aValue.GetAsUniFFIPointer();
-    if (!value.IsSamePtrType(&kLoginsEncryptorDecryptorPointerType)) {
-      aError.ThrowTypeError("Incorrect UniFFI pointer type"_ns);
+    if (aValue.IsUniFFIPointer()) {
+      // Rust handle.  Clone the handle and return it.
+      dom::UniFFIPointer& value = aValue.GetAsUniFFIPointer();
+      if (!value.IsSamePtrType(&kLoginsEncryptorDecryptorPointerType)) {
+        aError.ThrowTypeError("Incorrect UniFFI pointer type"_ns);
+        return;
+      }
+      mValue = value.ClonePtr();
+    } else if (aValue.IsDouble()) {
+      // JS handle.  Just return it, the JS code has already incremented the
+      // refcount
+      double floatValue = aValue.GetAsDouble();
+      uint64_t intValue = static_cast<uint64_t>(floatValue);
+      if (intValue != floatValue) {
+        aError.ThrowTypeError("Not an integer"_ns);
+        return;
+      }
+      mValue = intValue;
+    } else {
+      aError.ThrowTypeError("Bad argument type"_ns);
       return;
     }
-    FreeHandle();
-    mValue = value.ClonePtr();
-    mLoweredCallbackInterface = false;
   }
 
-  // Lift treats `aDest` as a regular interface
+  // Lift a trait interface.  `mValue` can either by a Rust or JS handle
   void Lift(JSContext* aContext, dom::OwningUniFFIScaffoldingValue* aDest,
             ErrorResult& aError) {
-    aDest->SetAsUniFFIPointer() =
-        dom::UniFFIPointer::Create(mValue, &kLoginsEncryptorDecryptorPointerType);
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    if ((mValue & 1) == 0) {
+      // Rust handle
+      aDest->SetAsUniFFIPointer() =
+          dom::UniFFIPointer::Create(mValue, &kLoginsEncryptorDecryptorPointerType);
+    } else {
+      // JS handle
+      aDest->SetAsDouble() = mValue;
+    }
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleLoginsEncryptorDecryptor FromRust(void* aValue) {
+  static FfiValueObjectHandleLoginsEncryptorDecryptor FromRust(uint64_t aValue) {
     return FfiValueObjectHandleLoginsEncryptorDecryptor(aValue);
   }
 
   void FreeHandle() {
-    // This behavior depends on if we lowered a callback interface handle or lifted an interface
-    // pointer.
-    if (mLoweredCallbackInterface && reinterpret_cast<uintptr_t>(mValue) != 0) {
-                                     printf("FREEING CB %p\n", mValue);
-        callback_free_logins_encryptor_decryptor(reinterpret_cast<uintptr_t>(mValue));
-        mValue = reinterpret_cast<void *>(0);
-    } else if (!mLoweredCallbackInterface && mValue != nullptr) {
-                                     printf("FREEING interface %p\n", mValue);
+    // If we're storing a handle, call the free function for it. The function to
+    // call depends on if we're holding a JS or Rust implementation of the
+    // interface. We can tell that by looking at the lowest bit of the handle
+    if (mValue == 0) {
+      // 0 indicates we're not storing a handle.
+    } else if ((mValue & 1) == 0) {
+      // Rust implementation
       RustCallStatus callStatus{};
       (uniffi_logins_fn_free_encryptordecryptor)(mValue, &callStatus);
       // No need to check `RustCallStatus`, it's only part of the API to match
       // other FFI calls.  The free function can never fail.
+    } else {
+      // JS implementation
+      callback_free_logins_encryptor_decryptor(mValue);
     }
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    mValue = 0;
   }
 
   ~FfiValueObjectHandleLoginsEncryptorDecryptor() {
@@ -1994,26 +1963,23 @@ const static mozilla::uniffi::UniFFIPointerType kLoginsKeyManagerPointerType {
   uniffi_logins_fn_clone_keymanager,
   uniffi_logins_fn_free_keymanager,
 };
-// Forward declare the free function, which is defined later on in `CallbackInterfaces.cpp`
+// Forward declare the free and clone functions, which are defined later on in `CallbackInterfaces.cpp`
 extern "C" void callback_free_logins_key_manager(uint64_t uniffiHandle);
+extern "C" uint64_t callback_clone_logins_key_manager(uint64_t uniffiHandle);
 
 // Trait interface FFI value class.  This is a hybrid between the one for interfaces and callback
 // interface version
 class FfiValueObjectHandleLoginsKeyManager {
  private:
-  // Did we lower a callback interface, rather than lift an object interface?
-  // This is weird, but it's a needed work until something like
-  // https://github.com/mozilla/uniffi-rs/pull/1823 lands.
-  bool mLoweredCallbackInterface = false;
-  // The raw FFI value is a pointer.
+  // The raw FFI value is a uint64_t in all cases.
   // For callback interfaces, the uint64_t handle gets casted to a pointer.  Callback interface
-  // handles are incremented by one at a time, so even on a 32-bit system this
+  // handles are used as the uint64_t and are incremented by one at a time, so even on a 32-bit system this
   // shouldn't overflow.
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleLoginsKeyManager() = default;
-  explicit FfiValueObjectHandleLoginsKeyManager(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleLoginsKeyManager(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleLoginsKeyManager(const FfiValueObjectHandleLoginsKeyManager&) = delete;
@@ -2022,83 +1988,79 @@ class FfiValueObjectHandleLoginsKeyManager {
   FfiValueObjectHandleLoginsKeyManager& operator=(FfiValueObjectHandleLoginsKeyManager&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    mLoweredCallbackInterface = aOther.mLoweredCallbackInterface;
-    aOther.mValue = nullptr;
-    aOther.mLoweredCallbackInterface = false;
+    aOther.mValue = 0;
     return *this;
   }
 
-  // Lower treats `aValue` as a callback interface
+  // Lower a trait interface, `aValue` can either be a Rust or JS handle
   void Lower(const dom::OwningUniFFIScaffoldingValue& aValue,
              ErrorResult& aError) {
-    if (!aValue.IsDouble()) {
-      aError.ThrowTypeError("Bad argument type"_ns);
-      return;
-    }
-    double floatValue = aValue.GetAsDouble();
-    uint64_t intValue = static_cast<uint64_t>(floatValue);
-    if (intValue != floatValue) {
-      aError.ThrowTypeError("Not an integer"_ns);
-      return;
-    }
     FreeHandle();
-    mValue = reinterpret_cast<void *>(intValue);
-    mLoweredCallbackInterface = true;
-  }
-
-  // LowerReceiver is used for method receivers.  It treats `aValue` as an object pointer.
-  void LowerReciever(const dom::OwningUniFFIScaffoldingValue& aValue,
-             ErrorResult& aError) {
-    if (!aValue.IsUniFFIPointer()) {
-      aError.ThrowTypeError("Expected UniFFI pointer argument"_ns);
-      return;
-    }
-    dom::UniFFIPointer& value = aValue.GetAsUniFFIPointer();
-    if (!value.IsSamePtrType(&kLoginsKeyManagerPointerType)) {
-      aError.ThrowTypeError("Incorrect UniFFI pointer type"_ns);
+    if (aValue.IsUniFFIPointer()) {
+      // Rust handle.  Clone the handle and return it.
+      dom::UniFFIPointer& value = aValue.GetAsUniFFIPointer();
+      if (!value.IsSamePtrType(&kLoginsKeyManagerPointerType)) {
+        aError.ThrowTypeError("Incorrect UniFFI pointer type"_ns);
+        return;
+      }
+      mValue = value.ClonePtr();
+    } else if (aValue.IsDouble()) {
+      // JS handle.  Just return it, the JS code has already incremented the
+      // refcount
+      double floatValue = aValue.GetAsDouble();
+      uint64_t intValue = static_cast<uint64_t>(floatValue);
+      if (intValue != floatValue) {
+        aError.ThrowTypeError("Not an integer"_ns);
+        return;
+      }
+      mValue = intValue;
+    } else {
+      aError.ThrowTypeError("Bad argument type"_ns);
       return;
     }
-    FreeHandle();
-    mValue = value.ClonePtr();
-    mLoweredCallbackInterface = false;
   }
 
-  // Lift treats `aDest` as a regular interface
+  // Lift a trait interface.  `mValue` can either by a Rust or JS handle
   void Lift(JSContext* aContext, dom::OwningUniFFIScaffoldingValue* aDest,
             ErrorResult& aError) {
-    aDest->SetAsUniFFIPointer() =
-        dom::UniFFIPointer::Create(mValue, &kLoginsKeyManagerPointerType);
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    if ((mValue & 1) == 0) {
+      // Rust handle
+      aDest->SetAsUniFFIPointer() =
+          dom::UniFFIPointer::Create(mValue, &kLoginsKeyManagerPointerType);
+    } else {
+      // JS handle
+      aDest->SetAsDouble() = mValue;
+    }
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleLoginsKeyManager FromRust(void* aValue) {
+  static FfiValueObjectHandleLoginsKeyManager FromRust(uint64_t aValue) {
     return FfiValueObjectHandleLoginsKeyManager(aValue);
   }
 
   void FreeHandle() {
-    // This behavior depends on if we lowered a callback interface handle or lifted an interface
-    // pointer.
-    if (mLoweredCallbackInterface && reinterpret_cast<uintptr_t>(mValue) != 0) {
-                                     printf("FREEING CB %p\n", mValue);
-        callback_free_logins_key_manager(reinterpret_cast<uintptr_t>(mValue));
-        mValue = reinterpret_cast<void *>(0);
-    } else if (!mLoweredCallbackInterface && mValue != nullptr) {
-                                     printf("FREEING interface %p\n", mValue);
+    // If we're storing a handle, call the free function for it. The function to
+    // call depends on if we're holding a JS or Rust implementation of the
+    // interface. We can tell that by looking at the lowest bit of the handle
+    if (mValue == 0) {
+      // 0 indicates we're not storing a handle.
+    } else if ((mValue & 1) == 0) {
+      // Rust implementation
       RustCallStatus callStatus{};
       (uniffi_logins_fn_free_keymanager)(mValue, &callStatus);
       // No need to check `RustCallStatus`, it's only part of the API to match
       // other FFI calls.  The free function can never fail.
+    } else {
+      // JS implementation
+      callback_free_logins_key_manager(mValue);
     }
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    mValue = 0;
   }
 
   ~FfiValueObjectHandleLoginsKeyManager() {
@@ -2115,11 +2077,11 @@ const static mozilla::uniffi::UniFFIPointerType kLoginsLoginStorePointerType {
 };
 class FfiValueObjectHandleLoginsLoginStore {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleLoginsLoginStore() = default;
-  explicit FfiValueObjectHandleLoginsLoginStore(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleLoginsLoginStore(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleLoginsLoginStore(const FfiValueObjectHandleLoginsLoginStore&) = delete;
@@ -2128,7 +2090,7 @@ class FfiValueObjectHandleLoginsLoginStore {
   FfiValueObjectHandleLoginsLoginStore& operator=(FfiValueObjectHandleLoginsLoginStore&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -2158,16 +2120,16 @@ class FfiValueObjectHandleLoginsLoginStore {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kLoginsLoginStorePointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleLoginsLoginStore FromRust(void* aValue) {
+  static FfiValueObjectHandleLoginsLoginStore FromRust(uint64_t aValue) {
     return FfiValueObjectHandleLoginsLoginStore(aValue);
   }
 
@@ -2194,11 +2156,11 @@ const static mozilla::uniffi::UniFFIPointerType kLoginsManagedEncryptorDecryptor
 };
 class FfiValueObjectHandleLoginsManagedEncryptorDecryptor {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleLoginsManagedEncryptorDecryptor() = default;
-  explicit FfiValueObjectHandleLoginsManagedEncryptorDecryptor(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleLoginsManagedEncryptorDecryptor(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleLoginsManagedEncryptorDecryptor(const FfiValueObjectHandleLoginsManagedEncryptorDecryptor&) = delete;
@@ -2207,7 +2169,7 @@ class FfiValueObjectHandleLoginsManagedEncryptorDecryptor {
   FfiValueObjectHandleLoginsManagedEncryptorDecryptor& operator=(FfiValueObjectHandleLoginsManagedEncryptorDecryptor&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -2237,16 +2199,16 @@ class FfiValueObjectHandleLoginsManagedEncryptorDecryptor {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kLoginsManagedEncryptorDecryptorPointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleLoginsManagedEncryptorDecryptor FromRust(void* aValue) {
+  static FfiValueObjectHandleLoginsManagedEncryptorDecryptor FromRust(uint64_t aValue) {
     return FfiValueObjectHandleLoginsManagedEncryptorDecryptor(aValue);
   }
 
@@ -2273,11 +2235,11 @@ const static mozilla::uniffi::UniFFIPointerType kLoginsNssKeyManagerPointerType
 };
 class FfiValueObjectHandleLoginsNssKeyManager {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleLoginsNssKeyManager() = default;
-  explicit FfiValueObjectHandleLoginsNssKeyManager(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleLoginsNssKeyManager(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleLoginsNssKeyManager(const FfiValueObjectHandleLoginsNssKeyManager&) = delete;
@@ -2286,7 +2248,7 @@ class FfiValueObjectHandleLoginsNssKeyManager {
   FfiValueObjectHandleLoginsNssKeyManager& operator=(FfiValueObjectHandleLoginsNssKeyManager&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -2316,16 +2278,16 @@ class FfiValueObjectHandleLoginsNssKeyManager {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kLoginsNssKeyManagerPointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleLoginsNssKeyManager FromRust(void* aValue) {
+  static FfiValueObjectHandleLoginsNssKeyManager FromRust(uint64_t aValue) {
     return FfiValueObjectHandleLoginsNssKeyManager(aValue);
   }
 
@@ -2350,26 +2312,23 @@ const static mozilla::uniffi::UniFFIPointerType kLoginsPrimaryPasswordAuthentica
   uniffi_logins_fn_clone_primarypasswordauthenticator,
   uniffi_logins_fn_free_primarypasswordauthenticator,
 };
-// Forward declare the free function, which is defined later on in `CallbackInterfaces.cpp`
+// Forward declare the free and clone functions, which are defined later on in `CallbackInterfaces.cpp`
 extern "C" void callback_free_logins_primary_password_authenticator(uint64_t uniffiHandle);
+extern "C" uint64_t callback_clone_logins_primary_password_authenticator(uint64_t uniffiHandle);
 
 // Trait interface FFI value class.  This is a hybrid between the one for interfaces and callback
 // interface version
 class FfiValueObjectHandleLoginsPrimaryPasswordAuthenticator {
  private:
-  // Did we lower a callback interface, rather than lift an object interface?
-  // This is weird, but it's a needed work until something like
-  // https://github.com/mozilla/uniffi-rs/pull/1823 lands.
-  bool mLoweredCallbackInterface = false;
-  // The raw FFI value is a pointer.
+  // The raw FFI value is a uint64_t in all cases.
   // For callback interfaces, the uint64_t handle gets casted to a pointer.  Callback interface
-  // handles are incremented by one at a time, so even on a 32-bit system this
+  // handles are used as the uint64_t and are incremented by one at a time, so even on a 32-bit system this
   // shouldn't overflow.
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleLoginsPrimaryPasswordAuthenticator() = default;
-  explicit FfiValueObjectHandleLoginsPrimaryPasswordAuthenticator(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleLoginsPrimaryPasswordAuthenticator(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleLoginsPrimaryPasswordAuthenticator(const FfiValueObjectHandleLoginsPrimaryPasswordAuthenticator&) = delete;
@@ -2378,83 +2337,79 @@ class FfiValueObjectHandleLoginsPrimaryPasswordAuthenticator {
   FfiValueObjectHandleLoginsPrimaryPasswordAuthenticator& operator=(FfiValueObjectHandleLoginsPrimaryPasswordAuthenticator&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    mLoweredCallbackInterface = aOther.mLoweredCallbackInterface;
-    aOther.mValue = nullptr;
-    aOther.mLoweredCallbackInterface = false;
+    aOther.mValue = 0;
     return *this;
   }
 
-  // Lower treats `aValue` as a callback interface
+  // Lower a trait interface, `aValue` can either be a Rust or JS handle
   void Lower(const dom::OwningUniFFIScaffoldingValue& aValue,
              ErrorResult& aError) {
-    if (!aValue.IsDouble()) {
-      aError.ThrowTypeError("Bad argument type"_ns);
-      return;
-    }
-    double floatValue = aValue.GetAsDouble();
-    uint64_t intValue = static_cast<uint64_t>(floatValue);
-    if (intValue != floatValue) {
-      aError.ThrowTypeError("Not an integer"_ns);
-      return;
-    }
     FreeHandle();
-    mValue = reinterpret_cast<void *>(intValue);
-    mLoweredCallbackInterface = true;
-  }
-
-  // LowerReceiver is used for method receivers.  It treats `aValue` as an object pointer.
-  void LowerReciever(const dom::OwningUniFFIScaffoldingValue& aValue,
-             ErrorResult& aError) {
-    if (!aValue.IsUniFFIPointer()) {
-      aError.ThrowTypeError("Expected UniFFI pointer argument"_ns);
-      return;
-    }
-    dom::UniFFIPointer& value = aValue.GetAsUniFFIPointer();
-    if (!value.IsSamePtrType(&kLoginsPrimaryPasswordAuthenticatorPointerType)) {
-      aError.ThrowTypeError("Incorrect UniFFI pointer type"_ns);
+    if (aValue.IsUniFFIPointer()) {
+      // Rust handle.  Clone the handle and return it.
+      dom::UniFFIPointer& value = aValue.GetAsUniFFIPointer();
+      if (!value.IsSamePtrType(&kLoginsPrimaryPasswordAuthenticatorPointerType)) {
+        aError.ThrowTypeError("Incorrect UniFFI pointer type"_ns);
+        return;
+      }
+      mValue = value.ClonePtr();
+    } else if (aValue.IsDouble()) {
+      // JS handle.  Just return it, the JS code has already incremented the
+      // refcount
+      double floatValue = aValue.GetAsDouble();
+      uint64_t intValue = static_cast<uint64_t>(floatValue);
+      if (intValue != floatValue) {
+        aError.ThrowTypeError("Not an integer"_ns);
+        return;
+      }
+      mValue = intValue;
+    } else {
+      aError.ThrowTypeError("Bad argument type"_ns);
       return;
     }
-    FreeHandle();
-    mValue = value.ClonePtr();
-    mLoweredCallbackInterface = false;
   }
 
-  // Lift treats `aDest` as a regular interface
+  // Lift a trait interface.  `mValue` can either by a Rust or JS handle
   void Lift(JSContext* aContext, dom::OwningUniFFIScaffoldingValue* aDest,
             ErrorResult& aError) {
-    aDest->SetAsUniFFIPointer() =
-        dom::UniFFIPointer::Create(mValue, &kLoginsPrimaryPasswordAuthenticatorPointerType);
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    if ((mValue & 1) == 0) {
+      // Rust handle
+      aDest->SetAsUniFFIPointer() =
+          dom::UniFFIPointer::Create(mValue, &kLoginsPrimaryPasswordAuthenticatorPointerType);
+    } else {
+      // JS handle
+      aDest->SetAsDouble() = mValue;
+    }
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleLoginsPrimaryPasswordAuthenticator FromRust(void* aValue) {
+  static FfiValueObjectHandleLoginsPrimaryPasswordAuthenticator FromRust(uint64_t aValue) {
     return FfiValueObjectHandleLoginsPrimaryPasswordAuthenticator(aValue);
   }
 
   void FreeHandle() {
-    // This behavior depends on if we lowered a callback interface handle or lifted an interface
-    // pointer.
-    if (mLoweredCallbackInterface && reinterpret_cast<uintptr_t>(mValue) != 0) {
-                                     printf("FREEING CB %p\n", mValue);
-        callback_free_logins_primary_password_authenticator(reinterpret_cast<uintptr_t>(mValue));
-        mValue = reinterpret_cast<void *>(0);
-    } else if (!mLoweredCallbackInterface && mValue != nullptr) {
-                                     printf("FREEING interface %p\n", mValue);
+    // If we're storing a handle, call the free function for it. The function to
+    // call depends on if we're holding a JS or Rust implementation of the
+    // interface. We can tell that by looking at the lowest bit of the handle
+    if (mValue == 0) {
+      // 0 indicates we're not storing a handle.
+    } else if ((mValue & 1) == 0) {
+      // Rust implementation
       RustCallStatus callStatus{};
       (uniffi_logins_fn_free_primarypasswordauthenticator)(mValue, &callStatus);
       // No need to check `RustCallStatus`, it's only part of the API to match
       // other FFI calls.  The free function can never fail.
+    } else {
+      // JS implementation
+      callback_free_logins_primary_password_authenticator(mValue);
     }
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    mValue = 0;
   }
 
   ~FfiValueObjectHandleLoginsPrimaryPasswordAuthenticator() {
@@ -2471,11 +2426,11 @@ const static mozilla::uniffi::UniFFIPointerType kLoginsStaticKeyManagerPointerTy
 };
 class FfiValueObjectHandleLoginsStaticKeyManager {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleLoginsStaticKeyManager() = default;
-  explicit FfiValueObjectHandleLoginsStaticKeyManager(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleLoginsStaticKeyManager(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleLoginsStaticKeyManager(const FfiValueObjectHandleLoginsStaticKeyManager&) = delete;
@@ -2484,7 +2439,7 @@ class FfiValueObjectHandleLoginsStaticKeyManager {
   FfiValueObjectHandleLoginsStaticKeyManager& operator=(FfiValueObjectHandleLoginsStaticKeyManager&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -2514,16 +2469,16 @@ class FfiValueObjectHandleLoginsStaticKeyManager {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kLoginsStaticKeyManagerPointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleLoginsStaticKeyManager FromRust(void* aValue) {
+  static FfiValueObjectHandleLoginsStaticKeyManager FromRust(uint64_t aValue) {
     return FfiValueObjectHandleLoginsStaticKeyManager(aValue);
   }
 
@@ -2550,11 +2505,11 @@ const static mozilla::uniffi::UniFFIPointerType kRelevancyRelevancyStorePointerT
 };
 class FfiValueObjectHandleRelevancyRelevancyStore {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleRelevancyRelevancyStore() = default;
-  explicit FfiValueObjectHandleRelevancyRelevancyStore(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleRelevancyRelevancyStore(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleRelevancyRelevancyStore(const FfiValueObjectHandleRelevancyRelevancyStore&) = delete;
@@ -2563,7 +2518,7 @@ class FfiValueObjectHandleRelevancyRelevancyStore {
   FfiValueObjectHandleRelevancyRelevancyStore& operator=(FfiValueObjectHandleRelevancyRelevancyStore&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -2593,16 +2548,16 @@ class FfiValueObjectHandleRelevancyRelevancyStore {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kRelevancyRelevancyStorePointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleRelevancyRelevancyStore FromRust(void* aValue) {
+  static FfiValueObjectHandleRelevancyRelevancyStore FromRust(uint64_t aValue) {
     return FfiValueObjectHandleRelevancyRelevancyStore(aValue);
   }
 
@@ -2629,11 +2584,11 @@ const static mozilla::uniffi::UniFFIPointerType kRemoteSettingsRemoteSettingsPoi
 };
 class FfiValueObjectHandleRemoteSettingsRemoteSettings {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleRemoteSettingsRemoteSettings() = default;
-  explicit FfiValueObjectHandleRemoteSettingsRemoteSettings(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleRemoteSettingsRemoteSettings(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleRemoteSettingsRemoteSettings(const FfiValueObjectHandleRemoteSettingsRemoteSettings&) = delete;
@@ -2642,7 +2597,7 @@ class FfiValueObjectHandleRemoteSettingsRemoteSettings {
   FfiValueObjectHandleRemoteSettingsRemoteSettings& operator=(FfiValueObjectHandleRemoteSettingsRemoteSettings&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -2672,16 +2627,16 @@ class FfiValueObjectHandleRemoteSettingsRemoteSettings {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kRemoteSettingsRemoteSettingsPointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleRemoteSettingsRemoteSettings FromRust(void* aValue) {
+  static FfiValueObjectHandleRemoteSettingsRemoteSettings FromRust(uint64_t aValue) {
     return FfiValueObjectHandleRemoteSettingsRemoteSettings(aValue);
   }
 
@@ -2708,11 +2663,11 @@ const static mozilla::uniffi::UniFFIPointerType kRemoteSettingsRemoteSettingsCli
 };
 class FfiValueObjectHandleRemoteSettingsRemoteSettingsClient {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleRemoteSettingsRemoteSettingsClient() = default;
-  explicit FfiValueObjectHandleRemoteSettingsRemoteSettingsClient(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleRemoteSettingsRemoteSettingsClient(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleRemoteSettingsRemoteSettingsClient(const FfiValueObjectHandleRemoteSettingsRemoteSettingsClient&) = delete;
@@ -2721,7 +2676,7 @@ class FfiValueObjectHandleRemoteSettingsRemoteSettingsClient {
   FfiValueObjectHandleRemoteSettingsRemoteSettingsClient& operator=(FfiValueObjectHandleRemoteSettingsRemoteSettingsClient&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -2751,16 +2706,16 @@ class FfiValueObjectHandleRemoteSettingsRemoteSettingsClient {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kRemoteSettingsRemoteSettingsClientPointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleRemoteSettingsRemoteSettingsClient FromRust(void* aValue) {
+  static FfiValueObjectHandleRemoteSettingsRemoteSettingsClient FromRust(uint64_t aValue) {
     return FfiValueObjectHandleRemoteSettingsRemoteSettingsClient(aValue);
   }
 
@@ -2787,11 +2742,11 @@ const static mozilla::uniffi::UniFFIPointerType kRemoteSettingsRemoteSettingsSer
 };
 class FfiValueObjectHandleRemoteSettingsRemoteSettingsService {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleRemoteSettingsRemoteSettingsService() = default;
-  explicit FfiValueObjectHandleRemoteSettingsRemoteSettingsService(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleRemoteSettingsRemoteSettingsService(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleRemoteSettingsRemoteSettingsService(const FfiValueObjectHandleRemoteSettingsRemoteSettingsService&) = delete;
@@ -2800,7 +2755,7 @@ class FfiValueObjectHandleRemoteSettingsRemoteSettingsService {
   FfiValueObjectHandleRemoteSettingsRemoteSettingsService& operator=(FfiValueObjectHandleRemoteSettingsRemoteSettingsService&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -2830,16 +2785,16 @@ class FfiValueObjectHandleRemoteSettingsRemoteSettingsService {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kRemoteSettingsRemoteSettingsServicePointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleRemoteSettingsRemoteSettingsService FromRust(void* aValue) {
+  static FfiValueObjectHandleRemoteSettingsRemoteSettingsService FromRust(uint64_t aValue) {
     return FfiValueObjectHandleRemoteSettingsRemoteSettingsService(aValue);
   }
 
@@ -2866,11 +2821,11 @@ const static mozilla::uniffi::UniFFIPointerType kSearchSearchEngineSelectorPoint
 };
 class FfiValueObjectHandleSearchSearchEngineSelector {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleSearchSearchEngineSelector() = default;
-  explicit FfiValueObjectHandleSearchSearchEngineSelector(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleSearchSearchEngineSelector(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleSearchSearchEngineSelector(const FfiValueObjectHandleSearchSearchEngineSelector&) = delete;
@@ -2879,7 +2834,7 @@ class FfiValueObjectHandleSearchSearchEngineSelector {
   FfiValueObjectHandleSearchSearchEngineSelector& operator=(FfiValueObjectHandleSearchSearchEngineSelector&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -2909,16 +2864,16 @@ class FfiValueObjectHandleSearchSearchEngineSelector {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kSearchSearchEngineSelectorPointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleSearchSearchEngineSelector FromRust(void* aValue) {
+  static FfiValueObjectHandleSearchSearchEngineSelector FromRust(uint64_t aValue) {
     return FfiValueObjectHandleSearchSearchEngineSelector(aValue);
   }
 
@@ -2945,11 +2900,11 @@ const static mozilla::uniffi::UniFFIPointerType kSuggestSuggestStorePointerType
 };
 class FfiValueObjectHandleSuggestSuggestStore {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleSuggestSuggestStore() = default;
-  explicit FfiValueObjectHandleSuggestSuggestStore(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleSuggestSuggestStore(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleSuggestSuggestStore(const FfiValueObjectHandleSuggestSuggestStore&) = delete;
@@ -2958,7 +2913,7 @@ class FfiValueObjectHandleSuggestSuggestStore {
   FfiValueObjectHandleSuggestSuggestStore& operator=(FfiValueObjectHandleSuggestSuggestStore&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -2988,16 +2943,16 @@ class FfiValueObjectHandleSuggestSuggestStore {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kSuggestSuggestStorePointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleSuggestSuggestStore FromRust(void* aValue) {
+  static FfiValueObjectHandleSuggestSuggestStore FromRust(uint64_t aValue) {
     return FfiValueObjectHandleSuggestSuggestStore(aValue);
   }
 
@@ -3024,11 +2979,11 @@ const static mozilla::uniffi::UniFFIPointerType kSuggestSuggestStoreBuilderPoint
 };
 class FfiValueObjectHandleSuggestSuggestStoreBuilder {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleSuggestSuggestStoreBuilder() = default;
-  explicit FfiValueObjectHandleSuggestSuggestStoreBuilder(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleSuggestSuggestStoreBuilder(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleSuggestSuggestStoreBuilder(const FfiValueObjectHandleSuggestSuggestStoreBuilder&) = delete;
@@ -3037,7 +2992,7 @@ class FfiValueObjectHandleSuggestSuggestStoreBuilder {
   FfiValueObjectHandleSuggestSuggestStoreBuilder& operator=(FfiValueObjectHandleSuggestSuggestStoreBuilder&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -3067,16 +3022,16 @@ class FfiValueObjectHandleSuggestSuggestStoreBuilder {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kSuggestSuggestStoreBuilderPointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleSuggestSuggestStoreBuilder FromRust(void* aValue) {
+  static FfiValueObjectHandleSuggestSuggestStoreBuilder FromRust(uint64_t aValue) {
     return FfiValueObjectHandleSuggestSuggestStoreBuilder(aValue);
   }
 
@@ -3103,11 +3058,11 @@ const static mozilla::uniffi::UniFFIPointerType kTabsRemoteCommandStorePointerTy
 };
 class FfiValueObjectHandleTabsRemoteCommandStore {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleTabsRemoteCommandStore() = default;
-  explicit FfiValueObjectHandleTabsRemoteCommandStore(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleTabsRemoteCommandStore(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleTabsRemoteCommandStore(const FfiValueObjectHandleTabsRemoteCommandStore&) = delete;
@@ -3116,7 +3071,7 @@ class FfiValueObjectHandleTabsRemoteCommandStore {
   FfiValueObjectHandleTabsRemoteCommandStore& operator=(FfiValueObjectHandleTabsRemoteCommandStore&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -3146,16 +3101,16 @@ class FfiValueObjectHandleTabsRemoteCommandStore {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kTabsRemoteCommandStorePointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleTabsRemoteCommandStore FromRust(void* aValue) {
+  static FfiValueObjectHandleTabsRemoteCommandStore FromRust(uint64_t aValue) {
     return FfiValueObjectHandleTabsRemoteCommandStore(aValue);
   }
 
@@ -3182,11 +3137,11 @@ const static mozilla::uniffi::UniFFIPointerType kTabsTabsBridgedEnginePointerTyp
 };
 class FfiValueObjectHandleTabsTabsBridgedEngine {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleTabsTabsBridgedEngine() = default;
-  explicit FfiValueObjectHandleTabsTabsBridgedEngine(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleTabsTabsBridgedEngine(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleTabsTabsBridgedEngine(const FfiValueObjectHandleTabsTabsBridgedEngine&) = delete;
@@ -3195,7 +3150,7 @@ class FfiValueObjectHandleTabsTabsBridgedEngine {
   FfiValueObjectHandleTabsTabsBridgedEngine& operator=(FfiValueObjectHandleTabsTabsBridgedEngine&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -3225,16 +3180,16 @@ class FfiValueObjectHandleTabsTabsBridgedEngine {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kTabsTabsBridgedEnginePointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleTabsTabsBridgedEngine FromRust(void* aValue) {
+  static FfiValueObjectHandleTabsTabsBridgedEngine FromRust(uint64_t aValue) {
     return FfiValueObjectHandleTabsTabsBridgedEngine(aValue);
   }
 
@@ -3261,11 +3216,11 @@ const static mozilla::uniffi::UniFFIPointerType kTabsTabsStorePointerType {
 };
 class FfiValueObjectHandleTabsTabsStore {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleTabsTabsStore() = default;
-  explicit FfiValueObjectHandleTabsTabsStore(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleTabsTabsStore(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleTabsTabsStore(const FfiValueObjectHandleTabsTabsStore&) = delete;
@@ -3274,7 +3229,7 @@ class FfiValueObjectHandleTabsTabsStore {
   FfiValueObjectHandleTabsTabsStore& operator=(FfiValueObjectHandleTabsTabsStore&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -3304,16 +3259,16 @@ class FfiValueObjectHandleTabsTabsStore {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kTabsTabsStorePointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleTabsTabsStore FromRust(void* aValue) {
+  static FfiValueObjectHandleTabsTabsStore FromRust(uint64_t aValue) {
     return FfiValueObjectHandleTabsTabsStore(aValue);
   }
 
@@ -3338,26 +3293,23 @@ const static mozilla::uniffi::UniFFIPointerType kViaductBackendPointerType {
   uniffi_viaduct_fn_clone_backend,
   uniffi_viaduct_fn_free_backend,
 };
-// Forward declare the free function, which is defined later on in `CallbackInterfaces.cpp`
+// Forward declare the free and clone functions, which are defined later on in `CallbackInterfaces.cpp`
 extern "C" void callback_free_viaduct_backend(uint64_t uniffiHandle);
+extern "C" uint64_t callback_clone_viaduct_backend(uint64_t uniffiHandle);
 
 // Trait interface FFI value class.  This is a hybrid between the one for interfaces and callback
 // interface version
 class FfiValueObjectHandleViaductBackend {
  private:
-  // Did we lower a callback interface, rather than lift an object interface?
-  // This is weird, but it's a needed work until something like
-  // https://github.com/mozilla/uniffi-rs/pull/1823 lands.
-  bool mLoweredCallbackInterface = false;
-  // The raw FFI value is a pointer.
+  // The raw FFI value is a uint64_t in all cases.
   // For callback interfaces, the uint64_t handle gets casted to a pointer.  Callback interface
-  // handles are incremented by one at a time, so even on a 32-bit system this
+  // handles are used as the uint64_t and are incremented by one at a time, so even on a 32-bit system this
   // shouldn't overflow.
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleViaductBackend() = default;
-  explicit FfiValueObjectHandleViaductBackend(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleViaductBackend(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleViaductBackend(const FfiValueObjectHandleViaductBackend&) = delete;
@@ -3366,83 +3318,79 @@ class FfiValueObjectHandleViaductBackend {
   FfiValueObjectHandleViaductBackend& operator=(FfiValueObjectHandleViaductBackend&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    mLoweredCallbackInterface = aOther.mLoweredCallbackInterface;
-    aOther.mValue = nullptr;
-    aOther.mLoweredCallbackInterface = false;
+    aOther.mValue = 0;
     return *this;
   }
 
-  // Lower treats `aValue` as a callback interface
+  // Lower a trait interface, `aValue` can either be a Rust or JS handle
   void Lower(const dom::OwningUniFFIScaffoldingValue& aValue,
              ErrorResult& aError) {
-    if (!aValue.IsDouble()) {
-      aError.ThrowTypeError("Bad argument type"_ns);
-      return;
-    }
-    double floatValue = aValue.GetAsDouble();
-    uint64_t intValue = static_cast<uint64_t>(floatValue);
-    if (intValue != floatValue) {
-      aError.ThrowTypeError("Not an integer"_ns);
-      return;
-    }
     FreeHandle();
-    mValue = reinterpret_cast<void *>(intValue);
-    mLoweredCallbackInterface = true;
-  }
-
-  // LowerReceiver is used for method receivers.  It treats `aValue` as an object pointer.
-  void LowerReciever(const dom::OwningUniFFIScaffoldingValue& aValue,
-             ErrorResult& aError) {
-    if (!aValue.IsUniFFIPointer()) {
-      aError.ThrowTypeError("Expected UniFFI pointer argument"_ns);
-      return;
-    }
-    dom::UniFFIPointer& value = aValue.GetAsUniFFIPointer();
-    if (!value.IsSamePtrType(&kViaductBackendPointerType)) {
-      aError.ThrowTypeError("Incorrect UniFFI pointer type"_ns);
+    if (aValue.IsUniFFIPointer()) {
+      // Rust handle.  Clone the handle and return it.
+      dom::UniFFIPointer& value = aValue.GetAsUniFFIPointer();
+      if (!value.IsSamePtrType(&kViaductBackendPointerType)) {
+        aError.ThrowTypeError("Incorrect UniFFI pointer type"_ns);
+        return;
+      }
+      mValue = value.ClonePtr();
+    } else if (aValue.IsDouble()) {
+      // JS handle.  Just return it, the JS code has already incremented the
+      // refcount
+      double floatValue = aValue.GetAsDouble();
+      uint64_t intValue = static_cast<uint64_t>(floatValue);
+      if (intValue != floatValue) {
+        aError.ThrowTypeError("Not an integer"_ns);
+        return;
+      }
+      mValue = intValue;
+    } else {
+      aError.ThrowTypeError("Bad argument type"_ns);
       return;
     }
-    FreeHandle();
-    mValue = value.ClonePtr();
-    mLoweredCallbackInterface = false;
   }
 
-  // Lift treats `aDest` as a regular interface
+  // Lift a trait interface.  `mValue` can either by a Rust or JS handle
   void Lift(JSContext* aContext, dom::OwningUniFFIScaffoldingValue* aDest,
             ErrorResult& aError) {
-    aDest->SetAsUniFFIPointer() =
-        dom::UniFFIPointer::Create(mValue, &kViaductBackendPointerType);
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    if ((mValue & 1) == 0) {
+      // Rust handle
+      aDest->SetAsUniFFIPointer() =
+          dom::UniFFIPointer::Create(mValue, &kViaductBackendPointerType);
+    } else {
+      // JS handle
+      aDest->SetAsDouble() = mValue;
+    }
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleViaductBackend FromRust(void* aValue) {
+  static FfiValueObjectHandleViaductBackend FromRust(uint64_t aValue) {
     return FfiValueObjectHandleViaductBackend(aValue);
   }
 
   void FreeHandle() {
-    // This behavior depends on if we lowered a callback interface handle or lifted an interface
-    // pointer.
-    if (mLoweredCallbackInterface && reinterpret_cast<uintptr_t>(mValue) != 0) {
-                                     printf("FREEING CB %p\n", mValue);
-        callback_free_viaduct_backend(reinterpret_cast<uintptr_t>(mValue));
-        mValue = reinterpret_cast<void *>(0);
-    } else if (!mLoweredCallbackInterface && mValue != nullptr) {
-                                     printf("FREEING interface %p\n", mValue);
+    // If we're storing a handle, call the free function for it. The function to
+    // call depends on if we're holding a JS or Rust implementation of the
+    // interface. We can tell that by looking at the lowest bit of the handle
+    if (mValue == 0) {
+      // 0 indicates we're not storing a handle.
+    } else if ((mValue & 1) == 0) {
+      // Rust implementation
       RustCallStatus callStatus{};
       (uniffi_viaduct_fn_free_backend)(mValue, &callStatus);
       // No need to check `RustCallStatus`, it's only part of the API to match
       // other FFI calls.  The free function can never fail.
+    } else {
+      // JS implementation
+      callback_free_viaduct_backend(mValue);
     }
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    mValue = 0;
   }
 
   ~FfiValueObjectHandleViaductBackend() {
@@ -3459,11 +3407,11 @@ const static mozilla::uniffi::UniFFIPointerType kWebextstorageWebExtStorageBridg
 };
 class FfiValueObjectHandleWebextstorageWebExtStorageBridgedEngine {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleWebextstorageWebExtStorageBridgedEngine() = default;
-  explicit FfiValueObjectHandleWebextstorageWebExtStorageBridgedEngine(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleWebextstorageWebExtStorageBridgedEngine(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleWebextstorageWebExtStorageBridgedEngine(const FfiValueObjectHandleWebextstorageWebExtStorageBridgedEngine&) = delete;
@@ -3472,7 +3420,7 @@ class FfiValueObjectHandleWebextstorageWebExtStorageBridgedEngine {
   FfiValueObjectHandleWebextstorageWebExtStorageBridgedEngine& operator=(FfiValueObjectHandleWebextstorageWebExtStorageBridgedEngine&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -3502,16 +3450,16 @@ class FfiValueObjectHandleWebextstorageWebExtStorageBridgedEngine {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kWebextstorageWebExtStorageBridgedEnginePointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleWebextstorageWebExtStorageBridgedEngine FromRust(void* aValue) {
+  static FfiValueObjectHandleWebextstorageWebExtStorageBridgedEngine FromRust(uint64_t aValue) {
     return FfiValueObjectHandleWebextstorageWebExtStorageBridgedEngine(aValue);
   }
 
@@ -3538,11 +3486,11 @@ const static mozilla::uniffi::UniFFIPointerType kWebextstorageWebExtStorageStore
 };
 class FfiValueObjectHandleWebextstorageWebExtStorageStore {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleWebextstorageWebExtStorageStore() = default;
-  explicit FfiValueObjectHandleWebextstorageWebExtStorageStore(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleWebextstorageWebExtStorageStore(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleWebextstorageWebExtStorageStore(const FfiValueObjectHandleWebextstorageWebExtStorageStore&) = delete;
@@ -3551,7 +3499,7 @@ class FfiValueObjectHandleWebextstorageWebExtStorageStore {
   FfiValueObjectHandleWebextstorageWebExtStorageStore& operator=(FfiValueObjectHandleWebextstorageWebExtStorageStore&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -3581,16 +3529,16 @@ class FfiValueObjectHandleWebextstorageWebExtStorageStore {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kWebextstorageWebExtStorageStorePointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleWebextstorageWebExtStorageStore FromRust(void* aValue) {
+  static FfiValueObjectHandleWebextstorageWebExtStorageStore FromRust(uint64_t aValue) {
     return FfiValueObjectHandleWebextstorageWebExtStorageStore(aValue);
   }
 
@@ -3619,11 +3567,11 @@ const static mozilla::uniffi::UniFFIPointerType kUniffiBindingsTestsTestInterfac
 };
 class FfiValueObjectHandleUniffiBindingsTestsTestInterface {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleUniffiBindingsTestsTestInterface() = default;
-  explicit FfiValueObjectHandleUniffiBindingsTestsTestInterface(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleUniffiBindingsTestsTestInterface(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleUniffiBindingsTestsTestInterface(const FfiValueObjectHandleUniffiBindingsTestsTestInterface&) = delete;
@@ -3632,7 +3580,7 @@ class FfiValueObjectHandleUniffiBindingsTestsTestInterface {
   FfiValueObjectHandleUniffiBindingsTestsTestInterface& operator=(FfiValueObjectHandleUniffiBindingsTestsTestInterface&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -3662,16 +3610,16 @@ class FfiValueObjectHandleUniffiBindingsTestsTestInterface {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kUniffiBindingsTestsTestInterfacePointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleUniffiBindingsTestsTestInterface FromRust(void* aValue) {
+  static FfiValueObjectHandleUniffiBindingsTestsTestInterface FromRust(uint64_t aValue) {
     return FfiValueObjectHandleUniffiBindingsTestsTestInterface(aValue);
   }
 
@@ -3698,11 +3646,11 @@ const static mozilla::uniffi::UniFFIPointerType kUniffiBindingsTestsAsyncInterfa
 };
 class FfiValueObjectHandleUniffiBindingsTestsAsyncInterface {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleUniffiBindingsTestsAsyncInterface() = default;
-  explicit FfiValueObjectHandleUniffiBindingsTestsAsyncInterface(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleUniffiBindingsTestsAsyncInterface(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleUniffiBindingsTestsAsyncInterface(const FfiValueObjectHandleUniffiBindingsTestsAsyncInterface&) = delete;
@@ -3711,7 +3659,7 @@ class FfiValueObjectHandleUniffiBindingsTestsAsyncInterface {
   FfiValueObjectHandleUniffiBindingsTestsAsyncInterface& operator=(FfiValueObjectHandleUniffiBindingsTestsAsyncInterface&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -3741,16 +3689,16 @@ class FfiValueObjectHandleUniffiBindingsTestsAsyncInterface {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kUniffiBindingsTestsAsyncInterfacePointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleUniffiBindingsTestsAsyncInterface FromRust(void* aValue) {
+  static FfiValueObjectHandleUniffiBindingsTestsAsyncInterface FromRust(uint64_t aValue) {
     return FfiValueObjectHandleUniffiBindingsTestsAsyncInterface(aValue);
   }
 
@@ -3775,26 +3723,23 @@ const static mozilla::uniffi::UniFFIPointerType kUniffiBindingsTestsAsyncTestTra
   uniffi_uniffi_bindings_tests_fn_clone_asynctesttraitinterface,
   uniffi_uniffi_bindings_tests_fn_free_asynctesttraitinterface,
 };
-// Forward declare the free function, which is defined later on in `CallbackInterfaces.cpp`
+// Forward declare the free and clone functions, which are defined later on in `CallbackInterfaces.cpp`
 extern "C" void callback_free_uniffi_bindings_tests_async_test_trait_interface(uint64_t uniffiHandle);
+extern "C" uint64_t callback_clone_uniffi_bindings_tests_async_test_trait_interface(uint64_t uniffiHandle);
 
 // Trait interface FFI value class.  This is a hybrid between the one for interfaces and callback
 // interface version
 class FfiValueObjectHandleUniffiBindingsTestsAsyncTestTraitInterface {
  private:
-  // Did we lower a callback interface, rather than lift an object interface?
-  // This is weird, but it's a needed work until something like
-  // https://github.com/mozilla/uniffi-rs/pull/1823 lands.
-  bool mLoweredCallbackInterface = false;
-  // The raw FFI value is a pointer.
+  // The raw FFI value is a uint64_t in all cases.
   // For callback interfaces, the uint64_t handle gets casted to a pointer.  Callback interface
-  // handles are incremented by one at a time, so even on a 32-bit system this
+  // handles are used as the uint64_t and are incremented by one at a time, so even on a 32-bit system this
   // shouldn't overflow.
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleUniffiBindingsTestsAsyncTestTraitInterface() = default;
-  explicit FfiValueObjectHandleUniffiBindingsTestsAsyncTestTraitInterface(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleUniffiBindingsTestsAsyncTestTraitInterface(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleUniffiBindingsTestsAsyncTestTraitInterface(const FfiValueObjectHandleUniffiBindingsTestsAsyncTestTraitInterface&) = delete;
@@ -3803,83 +3748,79 @@ class FfiValueObjectHandleUniffiBindingsTestsAsyncTestTraitInterface {
   FfiValueObjectHandleUniffiBindingsTestsAsyncTestTraitInterface& operator=(FfiValueObjectHandleUniffiBindingsTestsAsyncTestTraitInterface&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    mLoweredCallbackInterface = aOther.mLoweredCallbackInterface;
-    aOther.mValue = nullptr;
-    aOther.mLoweredCallbackInterface = false;
+    aOther.mValue = 0;
     return *this;
   }
 
-  // Lower treats `aValue` as a callback interface
+  // Lower a trait interface, `aValue` can either be a Rust or JS handle
   void Lower(const dom::OwningUniFFIScaffoldingValue& aValue,
              ErrorResult& aError) {
-    if (!aValue.IsDouble()) {
+    FreeHandle();
+    if (aValue.IsUniFFIPointer()) {
+      // Rust handle.  Clone the handle and return it.
+      dom::UniFFIPointer& value = aValue.GetAsUniFFIPointer();
+      if (!value.IsSamePtrType(&kUniffiBindingsTestsAsyncTestTraitInterfacePointerType)) {
+        aError.ThrowTypeError("Incorrect UniFFI pointer type"_ns);
+        return;
+      }
+      mValue = value.ClonePtr();
+    } else if (aValue.IsDouble()) {
+      // JS handle.  Just return it, the JS code has already incremented the
+      // refcount
+      double floatValue = aValue.GetAsDouble();
+      uint64_t intValue = static_cast<uint64_t>(floatValue);
+      if (intValue != floatValue) {
+        aError.ThrowTypeError("Not an integer"_ns);
+        return;
+      }
+      mValue = intValue;
+    } else {
       aError.ThrowTypeError("Bad argument type"_ns);
       return;
     }
-    double floatValue = aValue.GetAsDouble();
-    uint64_t intValue = static_cast<uint64_t>(floatValue);
-    if (intValue != floatValue) {
-      aError.ThrowTypeError("Not an integer"_ns);
-      return;
-    }
-    FreeHandle();
-    mValue = reinterpret_cast<void *>(intValue);
-    mLoweredCallbackInterface = true;
-  }
-
-  // LowerReceiver is used for method receivers.  It treats `aValue` as an object pointer.
-  void LowerReciever(const dom::OwningUniFFIScaffoldingValue& aValue,
-             ErrorResult& aError) {
-    if (!aValue.IsUniFFIPointer()) {
-      aError.ThrowTypeError("Expected UniFFI pointer argument"_ns);
-      return;
-    }
-    dom::UniFFIPointer& value = aValue.GetAsUniFFIPointer();
-    if (!value.IsSamePtrType(&kUniffiBindingsTestsAsyncTestTraitInterfacePointerType)) {
-      aError.ThrowTypeError("Incorrect UniFFI pointer type"_ns);
-      return;
-    }
-    FreeHandle();
-    mValue = value.ClonePtr();
-    mLoweredCallbackInterface = false;
   }
 
-  // Lift treats `aDest` as a regular interface
+  // Lift a trait interface.  `mValue` can either by a Rust or JS handle
   void Lift(JSContext* aContext, dom::OwningUniFFIScaffoldingValue* aDest,
             ErrorResult& aError) {
-    aDest->SetAsUniFFIPointer() =
-        dom::UniFFIPointer::Create(mValue, &kUniffiBindingsTestsAsyncTestTraitInterfacePointerType);
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    if ((mValue & 1) == 0) {
+      // Rust handle
+      aDest->SetAsUniFFIPointer() =
+          dom::UniFFIPointer::Create(mValue, &kUniffiBindingsTestsAsyncTestTraitInterfacePointerType);
+    } else {
+      // JS handle
+      aDest->SetAsDouble() = mValue;
+    }
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleUniffiBindingsTestsAsyncTestTraitInterface FromRust(void* aValue) {
+  static FfiValueObjectHandleUniffiBindingsTestsAsyncTestTraitInterface FromRust(uint64_t aValue) {
     return FfiValueObjectHandleUniffiBindingsTestsAsyncTestTraitInterface(aValue);
   }
 
   void FreeHandle() {
-    // This behavior depends on if we lowered a callback interface handle or lifted an interface
-    // pointer.
-    if (mLoweredCallbackInterface && reinterpret_cast<uintptr_t>(mValue) != 0) {
-                                     printf("FREEING CB %p\n", mValue);
-        callback_free_uniffi_bindings_tests_async_test_trait_interface(reinterpret_cast<uintptr_t>(mValue));
-        mValue = reinterpret_cast<void *>(0);
-    } else if (!mLoweredCallbackInterface && mValue != nullptr) {
-                                     printf("FREEING interface %p\n", mValue);
+    // If we're storing a handle, call the free function for it. The function to
+    // call depends on if we're holding a JS or Rust implementation of the
+    // interface. We can tell that by looking at the lowest bit of the handle
+    if (mValue == 0) {
+      // 0 indicates we're not storing a handle.
+    } else if ((mValue & 1) == 0) {
+      // Rust implementation
       RustCallStatus callStatus{};
       (uniffi_uniffi_bindings_tests_fn_free_asynctesttraitinterface)(mValue, &callStatus);
       // No need to check `RustCallStatus`, it's only part of the API to match
       // other FFI calls.  The free function can never fail.
+    } else {
+      // JS implementation
+      callback_free_uniffi_bindings_tests_async_test_trait_interface(mValue);
     }
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    mValue = 0;
   }
 
   ~FfiValueObjectHandleUniffiBindingsTestsAsyncTestTraitInterface() {
@@ -3896,11 +3837,11 @@ const static mozilla::uniffi::UniFFIPointerType kUniffiBindingsTestsComplexMetho
 };
 class FfiValueObjectHandleUniffiBindingsTestsComplexMethods {
  private:
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleUniffiBindingsTestsComplexMethods() = default;
-  explicit FfiValueObjectHandleUniffiBindingsTestsComplexMethods(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleUniffiBindingsTestsComplexMethods(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleUniffiBindingsTestsComplexMethods(const FfiValueObjectHandleUniffiBindingsTestsComplexMethods&) = delete;
@@ -3909,7 +3850,7 @@ class FfiValueObjectHandleUniffiBindingsTestsComplexMethods {
   FfiValueObjectHandleUniffiBindingsTestsComplexMethods& operator=(FfiValueObjectHandleUniffiBindingsTestsComplexMethods&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    aOther.mValue = nullptr;
+    aOther.mValue = 0;
     return *this;
   }
 
@@ -3939,16 +3880,16 @@ class FfiValueObjectHandleUniffiBindingsTestsComplexMethods {
             ErrorResult& aError) {
     aDest->SetAsUniFFIPointer() =
         dom::UniFFIPointer::Create(mValue, &kUniffiBindingsTestsComplexMethodsPointerType);
-    mValue = nullptr;
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleUniffiBindingsTestsComplexMethods FromRust(void* aValue) {
+  static FfiValueObjectHandleUniffiBindingsTestsComplexMethods FromRust(uint64_t aValue) {
     return FfiValueObjectHandleUniffiBindingsTestsComplexMethods(aValue);
   }
 
@@ -3973,26 +3914,23 @@ const static mozilla::uniffi::UniFFIPointerType kUniffiBindingsTestsTestTraitInt
   uniffi_uniffi_bindings_tests_fn_clone_testtraitinterface,
   uniffi_uniffi_bindings_tests_fn_free_testtraitinterface,
 };
-// Forward declare the free function, which is defined later on in `CallbackInterfaces.cpp`
+// Forward declare the free and clone functions, which are defined later on in `CallbackInterfaces.cpp`
 extern "C" void callback_free_uniffi_bindings_tests_test_trait_interface(uint64_t uniffiHandle);
+extern "C" uint64_t callback_clone_uniffi_bindings_tests_test_trait_interface(uint64_t uniffiHandle);
 
 // Trait interface FFI value class.  This is a hybrid between the one for interfaces and callback
 // interface version
 class FfiValueObjectHandleUniffiBindingsTestsTestTraitInterface {
  private:
-  // Did we lower a callback interface, rather than lift an object interface?
-  // This is weird, but it's a needed work until something like
-  // https://github.com/mozilla/uniffi-rs/pull/1823 lands.
-  bool mLoweredCallbackInterface = false;
-  // The raw FFI value is a pointer.
+  // The raw FFI value is a uint64_t in all cases.
   // For callback interfaces, the uint64_t handle gets casted to a pointer.  Callback interface
-  // handles are incremented by one at a time, so even on a 32-bit system this
+  // handles are used as the uint64_t and are incremented by one at a time, so even on a 32-bit system this
   // shouldn't overflow.
-  void* mValue = nullptr;
+  uint64_t mValue = 0;
 
  public:
   FfiValueObjectHandleUniffiBindingsTestsTestTraitInterface() = default;
-  explicit FfiValueObjectHandleUniffiBindingsTestsTestTraitInterface(void* aValue) : mValue(aValue) {}
+  explicit FfiValueObjectHandleUniffiBindingsTestsTestTraitInterface(uint64_t aValue) : mValue(aValue) {}
 
   // Delete copy constructor and assignment as this type is non-copyable.
   FfiValueObjectHandleUniffiBindingsTestsTestTraitInterface(const FfiValueObjectHandleUniffiBindingsTestsTestTraitInterface&) = delete;
@@ -4001,83 +3939,79 @@ class FfiValueObjectHandleUniffiBindingsTestsTestTraitInterface {
   FfiValueObjectHandleUniffiBindingsTestsTestTraitInterface& operator=(FfiValueObjectHandleUniffiBindingsTestsTestTraitInterface&& aOther) {
     FreeHandle();
     mValue = aOther.mValue;
-    mLoweredCallbackInterface = aOther.mLoweredCallbackInterface;
-    aOther.mValue = nullptr;
-    aOther.mLoweredCallbackInterface = false;
+    aOther.mValue = 0;
     return *this;
   }
 
-  // Lower treats `aValue` as a callback interface
+  // Lower a trait interface, `aValue` can either be a Rust or JS handle
   void Lower(const dom::OwningUniFFIScaffoldingValue& aValue,
              ErrorResult& aError) {
-    if (!aValue.IsDouble()) {
-      aError.ThrowTypeError("Bad argument type"_ns);
-      return;
-    }
-    double floatValue = aValue.GetAsDouble();
-    uint64_t intValue = static_cast<uint64_t>(floatValue);
-    if (intValue != floatValue) {
-      aError.ThrowTypeError("Not an integer"_ns);
-      return;
-    }
     FreeHandle();
-    mValue = reinterpret_cast<void *>(intValue);
-    mLoweredCallbackInterface = true;
-  }
-
-  // LowerReceiver is used for method receivers.  It treats `aValue` as an object pointer.
-  void LowerReciever(const dom::OwningUniFFIScaffoldingValue& aValue,
-             ErrorResult& aError) {
-    if (!aValue.IsUniFFIPointer()) {
-      aError.ThrowTypeError("Expected UniFFI pointer argument"_ns);
-      return;
-    }
-    dom::UniFFIPointer& value = aValue.GetAsUniFFIPointer();
-    if (!value.IsSamePtrType(&kUniffiBindingsTestsTestTraitInterfacePointerType)) {
-      aError.ThrowTypeError("Incorrect UniFFI pointer type"_ns);
+    if (aValue.IsUniFFIPointer()) {
+      // Rust handle.  Clone the handle and return it.
+      dom::UniFFIPointer& value = aValue.GetAsUniFFIPointer();
+      if (!value.IsSamePtrType(&kUniffiBindingsTestsTestTraitInterfacePointerType)) {
+        aError.ThrowTypeError("Incorrect UniFFI pointer type"_ns);
+        return;
+      }
+      mValue = value.ClonePtr();
+    } else if (aValue.IsDouble()) {
+      // JS handle.  Just return it, the JS code has already incremented the
+      // refcount
+      double floatValue = aValue.GetAsDouble();
+      uint64_t intValue = static_cast<uint64_t>(floatValue);
+      if (intValue != floatValue) {
+        aError.ThrowTypeError("Not an integer"_ns);
+        return;
+      }
+      mValue = intValue;
+    } else {
+      aError.ThrowTypeError("Bad argument type"_ns);
       return;
     }
-    FreeHandle();
-    mValue = value.ClonePtr();
-    mLoweredCallbackInterface = false;
   }
 
-  // Lift treats `aDest` as a regular interface
+  // Lift a trait interface.  `mValue` can either by a Rust or JS handle
   void Lift(JSContext* aContext, dom::OwningUniFFIScaffoldingValue* aDest,
             ErrorResult& aError) {
-    aDest->SetAsUniFFIPointer() =
-        dom::UniFFIPointer::Create(mValue, &kUniffiBindingsTestsTestTraitInterfacePointerType);
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    if ((mValue & 1) == 0) {
+      // Rust handle
+      aDest->SetAsUniFFIPointer() =
+          dom::UniFFIPointer::Create(mValue, &kUniffiBindingsTestsTestTraitInterfacePointerType);
+    } else {
+      // JS handle
+      aDest->SetAsDouble() = mValue;
+    }
+    mValue = 0;
   }
 
-  void* IntoRust() {
+  uint64_t IntoRust() {
     auto temp = mValue;
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    mValue = 0;
     return temp;
   }
 
-  static FfiValueObjectHandleUniffiBindingsTestsTestTraitInterface FromRust(void* aValue) {
+  static FfiValueObjectHandleUniffiBindingsTestsTestTraitInterface FromRust(uint64_t aValue) {
     return FfiValueObjectHandleUniffiBindingsTestsTestTraitInterface(aValue);
   }
 
   void FreeHandle() {
-    // This behavior depends on if we lowered a callback interface handle or lifted an interface
-    // pointer.
-    if (mLoweredCallbackInterface && reinterpret_cast<uintptr_t>(mValue) != 0) {
-                                     printf("FREEING CB %p\n", mValue);
-        callback_free_uniffi_bindings_tests_test_trait_interface(reinterpret_cast<uintptr_t>(mValue));
-        mValue = reinterpret_cast<void *>(0);
-    } else if (!mLoweredCallbackInterface && mValue != nullptr) {
-                                     printf("FREEING interface %p\n", mValue);
+    // If we're storing a handle, call the free function for it. The function to
+    // call depends on if we're holding a JS or Rust implementation of the
+    // interface. We can tell that by looking at the lowest bit of the handle
+    if (mValue == 0) {
+      // 0 indicates we're not storing a handle.
+    } else if ((mValue & 1) == 0) {
+      // Rust implementation
       RustCallStatus callStatus{};
       (uniffi_uniffi_bindings_tests_fn_free_testtraitinterface)(mValue, &callStatus);
       // No need to check `RustCallStatus`, it's only part of the API to match
       // other FFI calls.  The free function can never fail.
+    } else {
+      // JS implementation
+      callback_free_uniffi_bindings_tests_test_trait_interface(mValue);
     }
-    mValue = nullptr;
-    mLoweredCallbackInterface = false;
+    mValue = 0;
   }
 
   ~FfiValueObjectHandleUniffiBindingsTestsTestTraitInterface() {
@@ -4346,16 +4280,13 @@ extern "C" void callback_free_context_id_context_id_callback(uint64_t uniffiHand
 
 // FfiValue class for these callback interface handles.  This works like the
 // `FfiValueInt<uint64_t>`, except it has extra code to cleanup the callback handles.
-class FfiValueCallbackInterfacecontext_id_ContextIdCallback {
+class FfiValueObjectHandleContextIdContextIdCallback {
  private:
-  // Was this value lowered?  If so, that means we own the handle and are responsible for cleaning
-  // it up if we don't pass it to Rust because other values failed to lower
-  bool mLowered = false;
   uint64_t mValue = 0;
 
  public:
-  FfiValueCallbackInterfacecontext_id_ContextIdCallback() = default;
-  explicit FfiValueCallbackInterfacecontext_id_ContextIdCallback(uint64_t aValue) : mValue(aValue) {}
+  FfiValueObjectHandleContextIdContextIdCallback() = default;
+  explicit FfiValueObjectHandleContextIdContextIdCallback(uint64_t aValue) : mValue(aValue) {}
 
   void Lower(const dom::OwningUniFFIScaffoldingValue& aValue,
              ErrorResult& aError) {
@@ -4372,36 +4303,32 @@ class FfiValueCallbackInterfacecontext_id_ContextIdCallback {
     }
     ReleaseHandleIfSet();
     mValue = intValue;
-    mLowered = true;
   }
 
   void Lift(JSContext* aContext, dom::OwningUniFFIScaffoldingValue* aDest,
             ErrorResult& aError) {
     aDest->SetAsDouble() = mValue;
     mValue = 0;
-    mLowered = false;
   }
 
   uint64_t IntoRust() {
     auto handle = mValue;
     mValue = 0;
-    mLowered = false;
     return handle;
   }
 
-  static FfiValueCallbackInterfacecontext_id_ContextIdCallback FromRust(uint64_t aValue) { return FfiValueCallbackInterfacecontext_id_ContextIdCallback(aValue); };
+  static FfiValueObjectHandleContextIdContextIdCallback FromRust(uint64_t aValue) { return FfiValueObjectHandleContextIdContextIdCallback(aValue); };
 
   void ReleaseHandleIfSet() {
     // A non-zero value indicates that we own a callback handle that was never passed to Rust or
-    // lifted to JS and needs to be freed.
-    if (mValue != 0 && mLowered) {
+    // lifted to JS.  Call the free function to decrease the refcount.
+    if (mValue != 0) {
         callback_free_context_id_context_id_callback(mValue);
         mValue = 0;
-        mLowered = false;
     }
   }
 
-  ~FfiValueCallbackInterfacecontext_id_ContextIdCallback() {
+  ~FfiValueObjectHandleContextIdContextIdCallback() {
     ReleaseHandleIfSet();
   }
 };
@@ -4411,16 +4338,13 @@ extern "C" void callback_free_tracing_event_sink(uint64_t uniffiHandle);
 
 // FfiValue class for these callback interface handles.  This works like the
 // `FfiValueInt<uint64_t>`, except it has extra code to cleanup the callback handles.
-class FfiValueCallbackInterfacetracing_EventSink {
+class FfiValueObjectHandleTracingEventSink {
  private:
-  // Was this value lowered?  If so, that means we own the handle and are responsible for cleaning
-  // it up if we don't pass it to Rust because other values failed to lower
-  bool mLowered = false;
   uint64_t mValue = 0;
 
  public:
-  FfiValueCallbackInterfacetracing_EventSink() = default;
-  explicit FfiValueCallbackInterfacetracing_EventSink(uint64_t aValue) : mValue(aValue) {}
+  FfiValueObjectHandleTracingEventSink() = default;
+  explicit FfiValueObjectHandleTracingEventSink(uint64_t aValue) : mValue(aValue) {}
 
   void Lower(const dom::OwningUniFFIScaffoldingValue& aValue,
              ErrorResult& aError) {
@@ -4437,36 +4361,32 @@ class FfiValueCallbackInterfacetracing_EventSink {
     }
     ReleaseHandleIfSet();
     mValue = intValue;
-    mLowered = true;
   }
 
   void Lift(JSContext* aContext, dom::OwningUniFFIScaffoldingValue* aDest,
             ErrorResult& aError) {
     aDest->SetAsDouble() = mValue;
     mValue = 0;
-    mLowered = false;
   }
 
   uint64_t IntoRust() {
     auto handle = mValue;
     mValue = 0;
-    mLowered = false;
     return handle;
   }
 
-  static FfiValueCallbackInterfacetracing_EventSink FromRust(uint64_t aValue) { return FfiValueCallbackInterfacetracing_EventSink(aValue); };
+  static FfiValueObjectHandleTracingEventSink FromRust(uint64_t aValue) { return FfiValueObjectHandleTracingEventSink(aValue); };
 
   void ReleaseHandleIfSet() {
     // A non-zero value indicates that we own a callback handle that was never passed to Rust or
-    // lifted to JS and needs to be freed.
-    if (mValue != 0 && mLowered) {
+    // lifted to JS.  Call the free function to decrease the refcount.
+    if (mValue != 0) {
         callback_free_tracing_event_sink(mValue);
         mValue = 0;
-        mLowered = false;
     }
   }
 
-  ~FfiValueCallbackInterfacetracing_EventSink() {
+  ~FfiValueObjectHandleTracingEventSink() {
     ReleaseHandleIfSet();
   }
 };
@@ -4478,16 +4398,13 @@ extern "C" void callback_free_uniffi_bindings_tests_test_async_callback_interfac
 
 // FfiValue class for these callback interface handles.  This works like the
 // `FfiValueInt<uint64_t>`, except it has extra code to cleanup the callback handles.
-class FfiValueCallbackInterfaceuniffi_bindings_tests_TestAsyncCallbackInterface {
+class FfiValueObjectHandleUniffiBindingsTestsTestAsyncCallbackInterface {
  private:
-  // Was this value lowered?  If so, that means we own the handle and are responsible for cleaning
-  // it up if we don't pass it to Rust because other values failed to lower
-  bool mLowered = false;
   uint64_t mValue = 0;
 
  public:
-  FfiValueCallbackInterfaceuniffi_bindings_tests_TestAsyncCallbackInterface() = default;
-  explicit FfiValueCallbackInterfaceuniffi_bindings_tests_TestAsyncCallbackInterface(uint64_t aValue) : mValue(aValue) {}
+  FfiValueObjectHandleUniffiBindingsTestsTestAsyncCallbackInterface() = default;
+  explicit FfiValueObjectHandleUniffiBindingsTestsTestAsyncCallbackInterface(uint64_t aValue) : mValue(aValue) {}
 
   void Lower(const dom::OwningUniFFIScaffoldingValue& aValue,
              ErrorResult& aError) {
@@ -4504,36 +4421,32 @@ class FfiValueCallbackInterfaceuniffi_bindings_tests_TestAsyncCallbackInterface
     }
     ReleaseHandleIfSet();
     mValue = intValue;
-    mLowered = true;
   }
 
   void Lift(JSContext* aContext, dom::OwningUniFFIScaffoldingValue* aDest,
             ErrorResult& aError) {
     aDest->SetAsDouble() = mValue;
     mValue = 0;
-    mLowered = false;
   }
 
   uint64_t IntoRust() {
     auto handle = mValue;
     mValue = 0;
-    mLowered = false;
     return handle;
   }
 
-  static FfiValueCallbackInterfaceuniffi_bindings_tests_TestAsyncCallbackInterface FromRust(uint64_t aValue) { return FfiValueCallbackInterfaceuniffi_bindings_tests_TestAsyncCallbackInterface(aValue); };
+  static FfiValueObjectHandleUniffiBindingsTestsTestAsyncCallbackInterface FromRust(uint64_t aValue) { return FfiValueObjectHandleUniffiBindingsTestsTestAsyncCallbackInterface(aValue); };
 
   void ReleaseHandleIfSet() {
     // A non-zero value indicates that we own a callback handle that was never passed to Rust or
-    // lifted to JS and needs to be freed.
-    if (mValue != 0 && mLowered) {
+    // lifted to JS.  Call the free function to decrease the refcount.
+    if (mValue != 0) {
         callback_free_uniffi_bindings_tests_test_async_callback_interface(mValue);
         mValue = 0;
-        mLowered = false;
     }
   }
 
-  ~FfiValueCallbackInterfaceuniffi_bindings_tests_TestAsyncCallbackInterface() {
+  ~FfiValueObjectHandleUniffiBindingsTestsTestAsyncCallbackInterface() {
     ReleaseHandleIfSet();
   }
 };
@@ -4543,16 +4456,13 @@ extern "C" void callback_free_uniffi_bindings_tests_test_callback_interface(uint
 
 // FfiValue class for these callback interface handles.  This works like the
 // `FfiValueInt<uint64_t>`, except it has extra code to cleanup the callback handles.
-class FfiValueCallbackInterfaceuniffi_bindings_tests_TestCallbackInterface {
+class FfiValueObjectHandleUniffiBindingsTestsTestCallbackInterface {
  private:
-  // Was this value lowered?  If so, that means we own the handle and are responsible for cleaning
-  // it up if we don't pass it to Rust because other values failed to lower
-  bool mLowered = false;
   uint64_t mValue = 0;
 
  public:
-  FfiValueCallbackInterfaceuniffi_bindings_tests_TestCallbackInterface() = default;
-  explicit FfiValueCallbackInterfaceuniffi_bindings_tests_TestCallbackInterface(uint64_t aValue) : mValue(aValue) {}
+  FfiValueObjectHandleUniffiBindingsTestsTestCallbackInterface() = default;
+  explicit FfiValueObjectHandleUniffiBindingsTestsTestCallbackInterface(uint64_t aValue) : mValue(aValue) {}
 
   void Lower(const dom::OwningUniFFIScaffoldingValue& aValue,
              ErrorResult& aError) {
@@ -4569,36 +4479,32 @@ class FfiValueCallbackInterfaceuniffi_bindings_tests_TestCallbackInterface {
     }
     ReleaseHandleIfSet();
     mValue = intValue;
-    mLowered = true;
   }
 
   void Lift(JSContext* aContext, dom::OwningUniFFIScaffoldingValue* aDest,
             ErrorResult& aError) {
     aDest->SetAsDouble() = mValue;
     mValue = 0;
-    mLowered = false;
   }
 
   uint64_t IntoRust() {
     auto handle = mValue;
     mValue = 0;
-    mLowered = false;
     return handle;
   }
 
-  static FfiValueCallbackInterfaceuniffi_bindings_tests_TestCallbackInterface FromRust(uint64_t aValue) { return FfiValueCallbackInterfaceuniffi_bindings_tests_TestCallbackInterface(aValue); };
+  static FfiValueObjectHandleUniffiBindingsTestsTestCallbackInterface FromRust(uint64_t aValue) { return FfiValueObjectHandleUniffiBindingsTestsTestCallbackInterface(aValue); };
 
   void ReleaseHandleIfSet() {
     // A non-zero value indicates that we own a callback handle that was never passed to Rust or
-    // lifted to JS and needs to be freed.
-    if (mValue != 0 && mLowered) {
+    // lifted to JS.  Call the free function to decrease the refcount.
+    if (mValue != 0) {
         callback_free_uniffi_bindings_tests_test_callback_interface(mValue);
         mValue = 0;
-        mLowered = false;
     }
   }
 
-  ~FfiValueCallbackInterfaceuniffi_bindings_tests_TestCallbackInterface() {
+  ~FfiValueObjectHandleUniffiBindingsTestsTestCallbackInterface() {
     ReleaseHandleIfSet();
   }
 };
@@ -4608,16 +4514,13 @@ extern "C" void callback_free_uniffi_bindings_tests_collision_test_callback_inte
 
 // FfiValue class for these callback interface handles.  This works like the
 // `FfiValueInt<uint64_t>`, except it has extra code to cleanup the callback handles.
-class FfiValueCallbackInterfaceuniffi_bindings_tests_collision_TestCallbackInterface {
+class FfiValueObjectHandleUniffiBindingsTestsCollisionTestCallbackInterface {
  private:
-  // Was this value lowered?  If so, that means we own the handle and are responsible for cleaning
-  // it up if we don't pass it to Rust because other values failed to lower
-  bool mLowered = false;
   uint64_t mValue = 0;
 
  public:
-  FfiValueCallbackInterfaceuniffi_bindings_tests_collision_TestCallbackInterface() = default;
-  explicit FfiValueCallbackInterfaceuniffi_bindings_tests_collision_TestCallbackInterface(uint64_t aValue) : mValue(aValue) {}
+  FfiValueObjectHandleUniffiBindingsTestsCollisionTestCallbackInterface() = default;
+  explicit FfiValueObjectHandleUniffiBindingsTestsCollisionTestCallbackInterface(uint64_t aValue) : mValue(aValue) {}
 
   void Lower(const dom::OwningUniFFIScaffoldingValue& aValue,
              ErrorResult& aError) {
@@ -4634,36 +4537,32 @@ class FfiValueCallbackInterfaceuniffi_bindings_tests_collision_TestCallbackInter
     }
     ReleaseHandleIfSet();
     mValue = intValue;
-    mLowered = true;
   }
 
   void Lift(JSContext* aContext, dom::OwningUniFFIScaffoldingValue* aDest,
             ErrorResult& aError) {
     aDest->SetAsDouble() = mValue;
     mValue = 0;
-    mLowered = false;
   }
 
   uint64_t IntoRust() {
     auto handle = mValue;
     mValue = 0;
-    mLowered = false;
     return handle;
   }
 
-  static FfiValueCallbackInterfaceuniffi_bindings_tests_collision_TestCallbackInterface FromRust(uint64_t aValue) { return FfiValueCallbackInterfaceuniffi_bindings_tests_collision_TestCallbackInterface(aValue); };
+  static FfiValueObjectHandleUniffiBindingsTestsCollisionTestCallbackInterface FromRust(uint64_t aValue) { return FfiValueObjectHandleUniffiBindingsTestsCollisionTestCallbackInterface(aValue); };
 
   void ReleaseHandleIfSet() {
     // A non-zero value indicates that we own a callback handle that was never passed to Rust or
-    // lifted to JS and needs to be freed.
-    if (mValue != 0 && mLowered) {
+    // lifted to JS.  Call the free function to decrease the refcount.
+    if (mValue != 0) {
         callback_free_uniffi_bindings_tests_collision_test_callback_interface(mValue);
         mValue = 0;
-        mLowered = false;
     }
   }
 
-  ~FfiValueCallbackInterfaceuniffi_bindings_tests_collision_TestCallbackInterface() {
+  ~FfiValueObjectHandleUniffiBindingsTestsCollisionTestCallbackInterface() {
     ReleaseHandleIfSet();
   }
 };
@@ -4682,7 +4581,7 @@ class ScaffoldingCallHandlerUniffiContextIdFnConstructorContextidcomponentNew :
   FfiValueRustBuffer mInitContextId{};
   FfiValueInt<int64_t> mCreationTimestampS{};
   FfiValueInt<int8_t> mRunningInTestAutomation{};
-  FfiValueCallbackInterfacecontext_id_ContextIdCallback mCallback{};
+  FfiValueObjectHandleContextIdContextIdCallback mCallback{};
 
   // MakeRustCall stores the result of the call in these fields
   FfiValueObjectHandleContextIdContextIdComponent mUniffiReturnValue{};
@@ -4744,7 +4643,7 @@ class ScaffoldingCallHandlerUniffiContextIdFnMethodContextidcomponentForceRotati
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_context_id_fn_method_contextidcomponent_force_rotation (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -4775,7 +4674,7 @@ class ScaffoldingCallHandlerUniffiContextIdFnMethodContextidcomponentRequest : p
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_context_id_fn_method_contextidcomponent_request (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -4816,7 +4715,7 @@ class ScaffoldingCallHandlerUniffiContextIdFnMethodContextidcomponentUnsetCallba
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_context_id_fn_method_contextidcomponent_unset_callback (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -4874,7 +4773,7 @@ class ScaffoldingCallHandlerUniffiFilterAdultFnMethodFilteradultcomponentContain
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_filter_adult_fn_method_filteradultcomponent_contains (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -5225,7 +5124,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodEncryptordecryptorDecrypt : publ
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_encryptordecryptor_decrypt (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -5268,7 +5167,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodEncryptordecryptorEncrypt : publ
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_encryptordecryptor_encrypt (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -5310,7 +5209,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodKeymanagerGetKey : public Uniffi
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_keymanager_get_key (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -5391,7 +5290,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreAdd : public UniffiSyn
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_add (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -5434,7 +5333,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreAddMany : public Uniff
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_add_many (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -5477,7 +5376,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreAddManyWithMeta : publ
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_add_many_with_meta (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -5520,7 +5419,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreAddOrUpdate : public U
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_add_or_update (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -5563,7 +5462,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreAddWithMeta : public U
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_add_with_meta (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -5605,7 +5504,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreCount : public UniffiS
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_count (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -5643,7 +5542,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreCountByFormActionOrigi
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_count_by_form_action_origin (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -5686,7 +5585,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreCountByOrigin : public
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_count_by_origin (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -5729,7 +5628,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreDelete : public Uniffi
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_delete (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -5772,7 +5671,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreDeleteMany : public Un
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_delete_many (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -5814,7 +5713,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreDeleteUndecryptableRec
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_delete_undecryptable_records_for_remote_replacement (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -5852,7 +5751,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreFindLoginToUpdate : pu
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_find_login_to_update (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -5895,7 +5794,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreGet : public UniffiSyn
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_get (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -5938,7 +5837,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreGetByBaseDomain : publ
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_get_by_base_domain (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -5980,7 +5879,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreGetCheckpoint : public
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_get_checkpoint (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -6018,7 +5917,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreHasLoginsByBaseDomain
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_has_logins_by_base_domain (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -6046,21 +5945,26 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreHasLoginsByBaseDomain
     );
   }
 };
-class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreIsEmpty : public UniffiSyncCallHandler {
+class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreIsBreachAlertDismissed : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
   FfiValueObjectHandleLoginsLoginStore mUniffiPtr{};
+  FfiValueRustBuffer mId{};
 
   // MakeRustCall stores the result of the call in these fields
   FfiValueInt<int8_t> mUniffiReturnValue{};
 
 public:
   void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
-    if (aArgs.Length() < 1) {
-      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_is_empty (expected: 1, actual: %zu)", aArgs.Length()));
+    if (aArgs.Length() < 2) {
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_is_breach_alert_dismissed (expected: 2, actual: %zu)", aArgs.Length()));
+      return;
+    }
+    mUniffiPtr.Lower(aArgs[0], aError);
+    if (aError.Failed()) {
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mId.Lower(aArgs[1], aError);
     if (aError.Failed()) {
       return;
     }
@@ -6068,8 +5972,9 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreIsEmpty : public Uniff
 
   void MakeRustCall(RustCallStatus* aOutStatus) override {
     mUniffiReturnValue = FfiValueInt<int8_t>::FromRust(
-      uniffi_logins_fn_method_loginstore_is_empty(
+      uniffi_logins_fn_method_loginstore_is_breach_alert_dismissed(
         mUniffiPtr.IntoRust(),
+        mId.IntoRust(),
         aOutStatus
       )
     );
@@ -6083,29 +5988,29 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreIsEmpty : public Uniff
     );
   }
 };
-class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreList : public UniffiSyncCallHandler {
+class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreIsEmpty : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
   FfiValueObjectHandleLoginsLoginStore mUniffiPtr{};
 
   // MakeRustCall stores the result of the call in these fields
-  FfiValueRustBuffer mUniffiReturnValue{};
+  FfiValueInt<int8_t> mUniffiReturnValue{};
 
 public:
   void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
     if (aArgs.Length() < 1) {
-      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_list (expected: 1, actual: %zu)", aArgs.Length()));
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_is_empty (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
   }
 
   void MakeRustCall(RustCallStatus* aOutStatus) override {
-    mUniffiReturnValue = FfiValueRustBuffer::FromRust(
-      uniffi_logins_fn_method_loginstore_list(
+    mUniffiReturnValue = FfiValueInt<int8_t>::FromRust(
+      uniffi_logins_fn_method_loginstore_is_empty(
         mUniffiPtr.IntoRust(),
         aOutStatus
       )
@@ -6120,86 +6025,120 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreList : public UniffiSy
     );
   }
 };
-class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreRegisterWithSyncManager : public UniffiSyncCallHandler {
+class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreIsPotentiallyBreached : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
   FfiValueObjectHandleLoginsLoginStore mUniffiPtr{};
+  FfiValueRustBuffer mId{};
 
   // MakeRustCall stores the result of the call in these fields
+  FfiValueInt<int8_t> mUniffiReturnValue{};
 
 public:
   void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
-    if (aArgs.Length() < 1) {
-      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_register_with_sync_manager (expected: 1, actual: %zu)", aArgs.Length()));
+    if (aArgs.Length() < 2) {
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_is_potentially_breached (expected: 2, actual: %zu)", aArgs.Length()));
+      return;
+    }
+    mUniffiPtr.Lower(aArgs[0], aError);
+    if (aError.Failed()) {
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mId.Lower(aArgs[1], aError);
     if (aError.Failed()) {
       return;
     }
   }
 
   void MakeRustCall(RustCallStatus* aOutStatus) override {
-    uniffi_logins_fn_method_loginstore_register_with_sync_manager(
-      mUniffiPtr.IntoRust(),
-      aOutStatus
+    mUniffiReturnValue = FfiValueInt<int8_t>::FromRust(
+      uniffi_logins_fn_method_loginstore_is_potentially_breached(
+        mUniffiPtr.IntoRust(),
+        mId.IntoRust(),
+        aOutStatus
+      )
     );
   }
 
   virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
+    mUniffiReturnValue.Lift(
+      aCx,
+      &aDest.Construct(),
+      aError
+    );
   }
 };
-class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreReset : public UniffiSyncCallHandler {
+class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreList : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
   FfiValueObjectHandleLoginsLoginStore mUniffiPtr{};
 
   // MakeRustCall stores the result of the call in these fields
+  FfiValueRustBuffer mUniffiReturnValue{};
 
 public:
   void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
     if (aArgs.Length() < 1) {
-      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_reset (expected: 1, actual: %zu)", aArgs.Length()));
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_list (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
   }
 
   void MakeRustCall(RustCallStatus* aOutStatus) override {
-    uniffi_logins_fn_method_loginstore_reset(
-      mUniffiPtr.IntoRust(),
-      aOutStatus
+    mUniffiReturnValue = FfiValueRustBuffer::FromRust(
+      uniffi_logins_fn_method_loginstore_list(
+        mUniffiPtr.IntoRust(),
+        aOutStatus
+      )
     );
   }
 
   virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
+    mUniffiReturnValue.Lift(
+      aCx,
+      &aDest.Construct(),
+      aError
+    );
   }
 };
-class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreRunMaintenance : public UniffiSyncCallHandler {
+class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreRecordBreach : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
   FfiValueObjectHandleLoginsLoginStore mUniffiPtr{};
+  FfiValueRustBuffer mId{};
+  FfiValueInt<int64_t> mTimestamp{};
 
   // MakeRustCall stores the result of the call in these fields
 
 public:
   void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
-    if (aArgs.Length() < 1) {
-      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_run_maintenance (expected: 1, actual: %zu)", aArgs.Length()));
+    if (aArgs.Length() < 3) {
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_record_breach (expected: 3, actual: %zu)", aArgs.Length()));
+      return;
+    }
+    mUniffiPtr.Lower(aArgs[0], aError);
+    if (aError.Failed()) {
+      return;
+    }
+    mId.Lower(aArgs[1], aError);
+    if (aError.Failed()) {
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mTimestamp.Lower(aArgs[2], aError);
     if (aError.Failed()) {
       return;
     }
   }
 
   void MakeRustCall(RustCallStatus* aOutStatus) override {
-    uniffi_logins_fn_method_loginstore_run_maintenance(
+    uniffi_logins_fn_method_loginstore_record_breach(
       mUniffiPtr.IntoRust(),
+      mId.IntoRust(),
+      mTimestamp.IntoRust(),
       aOutStatus
     );
   }
@@ -6207,34 +6146,34 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreRunMaintenance : publi
   virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
   }
 };
-class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreSetCheckpoint : public UniffiSyncCallHandler {
+class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreRecordBreachAlertDismissal : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
   FfiValueObjectHandleLoginsLoginStore mUniffiPtr{};
-  FfiValueRustBuffer mCheckpoint{};
+  FfiValueRustBuffer mId{};
 
   // MakeRustCall stores the result of the call in these fields
 
 public:
   void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
     if (aArgs.Length() < 2) {
-      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_set_checkpoint (expected: 2, actual: %zu)", aArgs.Length()));
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_record_breach_alert_dismissal (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
-    mCheckpoint.Lower(aArgs[1], aError);
+    mId.Lower(aArgs[1], aError);
     if (aError.Failed()) {
       return;
     }
   }
 
   void MakeRustCall(RustCallStatus* aOutStatus) override {
-    uniffi_logins_fn_method_loginstore_set_checkpoint(
+    uniffi_logins_fn_method_loginstore_record_breach_alert_dismissal(
       mUniffiPtr.IntoRust(),
-      mCheckpoint.IntoRust(),
+      mId.IntoRust(),
       aOutStatus
     );
   }
@@ -6242,28 +6181,40 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreSetCheckpoint : public
   virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
   }
 };
-class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreShutdown : public UniffiSyncCallHandler {
+class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreRecordBreachAlertDismissalTime : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
   FfiValueObjectHandleLoginsLoginStore mUniffiPtr{};
+  FfiValueRustBuffer mId{};
+  FfiValueInt<int64_t> mTimestamp{};
 
   // MakeRustCall stores the result of the call in these fields
 
 public:
   void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
-    if (aArgs.Length() < 1) {
-      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_shutdown (expected: 1, actual: %zu)", aArgs.Length()));
+    if (aArgs.Length() < 3) {
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_record_breach_alert_dismissal_time (expected: 3, actual: %zu)", aArgs.Length()));
+      return;
+    }
+    mUniffiPtr.Lower(aArgs[0], aError);
+    if (aError.Failed()) {
+      return;
+    }
+    mId.Lower(aArgs[1], aError);
+    if (aError.Failed()) {
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mTimestamp.Lower(aArgs[2], aError);
     if (aError.Failed()) {
       return;
     }
   }
 
   void MakeRustCall(RustCallStatus* aOutStatus) override {
-    uniffi_logins_fn_method_loginstore_shutdown(
+    uniffi_logins_fn_method_loginstore_record_breach_alert_dismissal_time(
       mUniffiPtr.IntoRust(),
+      mId.IntoRust(),
+      mTimestamp.IntoRust(),
       aOutStatus
     );
   }
@@ -6271,34 +6222,28 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreShutdown : public Unif
   virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
   }
 };
-class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreTouch : public UniffiSyncCallHandler {
+class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreRegisterWithSyncManager : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
   FfiValueObjectHandleLoginsLoginStore mUniffiPtr{};
-  FfiValueRustBuffer mId{};
 
   // MakeRustCall stores the result of the call in these fields
 
 public:
   void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
-    if (aArgs.Length() < 2) {
-      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_touch (expected: 2, actual: %zu)", aArgs.Length()));
-      return;
-    }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
-    if (aError.Failed()) {
+    if (aArgs.Length() < 1) {
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_register_with_sync_manager (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mId.Lower(aArgs[1], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
   }
 
   void MakeRustCall(RustCallStatus* aOutStatus) override {
-    uniffi_logins_fn_method_loginstore_touch(
+    uniffi_logins_fn_method_loginstore_register_with_sync_manager(
       mUniffiPtr.IntoRust(),
-      mId.IntoRust(),
       aOutStatus
     );
   }
@@ -6306,56 +6251,36 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreTouch : public UniffiS
   virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
   }
 };
-class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreUpdate : public UniffiSyncCallHandler {
+class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreReset : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
   FfiValueObjectHandleLoginsLoginStore mUniffiPtr{};
-  FfiValueRustBuffer mId{};
-  FfiValueRustBuffer mLogin{};
 
   // MakeRustCall stores the result of the call in these fields
-  FfiValueRustBuffer mUniffiReturnValue{};
 
 public:
   void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
-    if (aArgs.Length() < 3) {
-      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_update (expected: 3, actual: %zu)", aArgs.Length()));
-      return;
-    }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
-    if (aError.Failed()) {
-      return;
-    }
-    mId.Lower(aArgs[1], aError);
-    if (aError.Failed()) {
+    if (aArgs.Length() < 1) {
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_reset (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mLogin.Lower(aArgs[2], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
   }
 
   void MakeRustCall(RustCallStatus* aOutStatus) override {
-    mUniffiReturnValue = FfiValueRustBuffer::FromRust(
-      uniffi_logins_fn_method_loginstore_update(
-        mUniffiPtr.IntoRust(),
-        mId.IntoRust(),
-        mLogin.IntoRust(),
-        aOutStatus
-      )
+    uniffi_logins_fn_method_loginstore_reset(
+      mUniffiPtr.IntoRust(),
+      aOutStatus
     );
   }
 
   virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
-    mUniffiReturnValue.Lift(
-      aCx,
-      &aDest.Construct(),
-      aError
-    );
   }
 };
-class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreWipeLocal : public UniffiSyncCallHandler {
+class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreResetAllBreaches : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
   FfiValueObjectHandleLoginsLoginStore mUniffiPtr{};
@@ -6365,17 +6290,17 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreWipeLocal : public Uni
 public:
   void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
     if (aArgs.Length() < 1) {
-      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_wipe_local (expected: 1, actual: %zu)", aArgs.Length()));
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_reset_all_breaches (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
   }
 
   void MakeRustCall(RustCallStatus* aOutStatus) override {
-    uniffi_logins_fn_method_loginstore_wipe_local(
+    uniffi_logins_fn_method_loginstore_reset_all_breaches(
       mUniffiPtr.IntoRust(),
       aOutStatus
     );
@@ -6384,76 +6309,282 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreWipeLocal : public Uni
   virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
   }
 };
-class ScaffoldingCallHandlerUniffiLoginsFnConstructorManagedencryptordecryptorNew : public UniffiSyncCallHandler {
+class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreRunMaintenance : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
-  FfiValueObjectHandleLoginsKeyManager mKeyManager{};
+  FfiValueObjectHandleLoginsLoginStore mUniffiPtr{};
 
   // MakeRustCall stores the result of the call in these fields
-  FfiValueObjectHandleLoginsManagedEncryptorDecryptor mUniffiReturnValue{};
 
 public:
   void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
     if (aArgs.Length() < 1) {
-      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_constructor_managedencryptordecryptor_new (expected: 1, actual: %zu)", aArgs.Length()));
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_run_maintenance (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mKeyManager.Lower(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
   }
 
   void MakeRustCall(RustCallStatus* aOutStatus) override {
-    mUniffiReturnValue = FfiValueObjectHandleLoginsManagedEncryptorDecryptor::FromRust(
-      uniffi_logins_fn_constructor_managedencryptordecryptor_new(
-        mKeyManager.IntoRust(),
-        aOutStatus
-      )
+    uniffi_logins_fn_method_loginstore_run_maintenance(
+      mUniffiPtr.IntoRust(),
+      aOutStatus
     );
   }
 
   virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
-    mUniffiReturnValue.Lift(
-      aCx,
-      &aDest.Construct(),
-      aError
-    );
   }
 };
-class ScaffoldingCallHandlerUniffiLoginsFnConstructorNsskeymanagerNew : public UniffiSyncCallHandler {
+class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreSetCheckpoint : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
-  FfiValueObjectHandleLoginsPrimaryPasswordAuthenticator mPrimaryPasswordAuthenticator{};
+  FfiValueObjectHandleLoginsLoginStore mUniffiPtr{};
+  FfiValueRustBuffer mCheckpoint{};
 
   // MakeRustCall stores the result of the call in these fields
-  FfiValueObjectHandleLoginsNssKeyManager mUniffiReturnValue{};
 
 public:
   void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
-    if (aArgs.Length() < 1) {
-      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_constructor_nsskeymanager_new (expected: 1, actual: %zu)", aArgs.Length()));
+    if (aArgs.Length() < 2) {
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_set_checkpoint (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mPrimaryPasswordAuthenticator.Lower(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
+    if (aError.Failed()) {
+      return;
+    }
+    mCheckpoint.Lower(aArgs[1], aError);
     if (aError.Failed()) {
       return;
     }
   }
 
   void MakeRustCall(RustCallStatus* aOutStatus) override {
-    mUniffiReturnValue = FfiValueObjectHandleLoginsNssKeyManager::FromRust(
-      uniffi_logins_fn_constructor_nsskeymanager_new(
-        mPrimaryPasswordAuthenticator.IntoRust(),
-        aOutStatus
-      )
+    uniffi_logins_fn_method_loginstore_set_checkpoint(
+      mUniffiPtr.IntoRust(),
+      mCheckpoint.IntoRust(),
+      aOutStatus
     );
   }
 
   virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
-    mUniffiReturnValue.Lift(
-      aCx,
-      &aDest.Construct(),
+  }
+};
+class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreShutdown : public UniffiSyncCallHandler {
+private:
+  // LowerRustArgs stores the resulting arguments in these fields
+  FfiValueObjectHandleLoginsLoginStore mUniffiPtr{};
+
+  // MakeRustCall stores the result of the call in these fields
+
+public:
+  void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
+    if (aArgs.Length() < 1) {
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_shutdown (expected: 1, actual: %zu)", aArgs.Length()));
+      return;
+    }
+    mUniffiPtr.Lower(aArgs[0], aError);
+    if (aError.Failed()) {
+      return;
+    }
+  }
+
+  void MakeRustCall(RustCallStatus* aOutStatus) override {
+    uniffi_logins_fn_method_loginstore_shutdown(
+      mUniffiPtr.IntoRust(),
+      aOutStatus
+    );
+  }
+
+  virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
+  }
+};
+class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreTouch : public UniffiSyncCallHandler {
+private:
+  // LowerRustArgs stores the resulting arguments in these fields
+  FfiValueObjectHandleLoginsLoginStore mUniffiPtr{};
+  FfiValueRustBuffer mId{};
+
+  // MakeRustCall stores the result of the call in these fields
+
+public:
+  void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
+    if (aArgs.Length() < 2) {
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_touch (expected: 2, actual: %zu)", aArgs.Length()));
+      return;
+    }
+    mUniffiPtr.Lower(aArgs[0], aError);
+    if (aError.Failed()) {
+      return;
+    }
+    mId.Lower(aArgs[1], aError);
+    if (aError.Failed()) {
+      return;
+    }
+  }
+
+  void MakeRustCall(RustCallStatus* aOutStatus) override {
+    uniffi_logins_fn_method_loginstore_touch(
+      mUniffiPtr.IntoRust(),
+      mId.IntoRust(),
+      aOutStatus
+    );
+  }
+
+  virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
+  }
+};
+class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreUpdate : public UniffiSyncCallHandler {
+private:
+  // LowerRustArgs stores the resulting arguments in these fields
+  FfiValueObjectHandleLoginsLoginStore mUniffiPtr{};
+  FfiValueRustBuffer mId{};
+  FfiValueRustBuffer mLogin{};
+
+  // MakeRustCall stores the result of the call in these fields
+  FfiValueRustBuffer mUniffiReturnValue{};
+
+public:
+  void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
+    if (aArgs.Length() < 3) {
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_update (expected: 3, actual: %zu)", aArgs.Length()));
+      return;
+    }
+    mUniffiPtr.Lower(aArgs[0], aError);
+    if (aError.Failed()) {
+      return;
+    }
+    mId.Lower(aArgs[1], aError);
+    if (aError.Failed()) {
+      return;
+    }
+    mLogin.Lower(aArgs[2], aError);
+    if (aError.Failed()) {
+      return;
+    }
+  }
+
+  void MakeRustCall(RustCallStatus* aOutStatus) override {
+    mUniffiReturnValue = FfiValueRustBuffer::FromRust(
+      uniffi_logins_fn_method_loginstore_update(
+        mUniffiPtr.IntoRust(),
+        mId.IntoRust(),
+        mLogin.IntoRust(),
+        aOutStatus
+      )
+    );
+  }
+
+  virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
+    mUniffiReturnValue.Lift(
+      aCx,
+      &aDest.Construct(),
+      aError
+    );
+  }
+};
+class ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreWipeLocal : public UniffiSyncCallHandler {
+private:
+  // LowerRustArgs stores the resulting arguments in these fields
+  FfiValueObjectHandleLoginsLoginStore mUniffiPtr{};
+
+  // MakeRustCall stores the result of the call in these fields
+
+public:
+  void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
+    if (aArgs.Length() < 1) {
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_loginstore_wipe_local (expected: 1, actual: %zu)", aArgs.Length()));
+      return;
+    }
+    mUniffiPtr.Lower(aArgs[0], aError);
+    if (aError.Failed()) {
+      return;
+    }
+  }
+
+  void MakeRustCall(RustCallStatus* aOutStatus) override {
+    uniffi_logins_fn_method_loginstore_wipe_local(
+      mUniffiPtr.IntoRust(),
+      aOutStatus
+    );
+  }
+
+  virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
+  }
+};
+class ScaffoldingCallHandlerUniffiLoginsFnConstructorManagedencryptordecryptorNew : public UniffiSyncCallHandler {
+private:
+  // LowerRustArgs stores the resulting arguments in these fields
+  FfiValueObjectHandleLoginsKeyManager mKeyManager{};
+
+  // MakeRustCall stores the result of the call in these fields
+  FfiValueObjectHandleLoginsManagedEncryptorDecryptor mUniffiReturnValue{};
+
+public:
+  void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
+    if (aArgs.Length() < 1) {
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_constructor_managedencryptordecryptor_new (expected: 1, actual: %zu)", aArgs.Length()));
+      return;
+    }
+    mKeyManager.Lower(aArgs[0], aError);
+    if (aError.Failed()) {
+      return;
+    }
+  }
+
+  void MakeRustCall(RustCallStatus* aOutStatus) override {
+    mUniffiReturnValue = FfiValueObjectHandleLoginsManagedEncryptorDecryptor::FromRust(
+      uniffi_logins_fn_constructor_managedencryptordecryptor_new(
+        mKeyManager.IntoRust(),
+        aOutStatus
+      )
+    );
+  }
+
+  virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
+    mUniffiReturnValue.Lift(
+      aCx,
+      &aDest.Construct(),
+      aError
+    );
+  }
+};
+class ScaffoldingCallHandlerUniffiLoginsFnConstructorNsskeymanagerNew : public UniffiSyncCallHandler {
+private:
+  // LowerRustArgs stores the resulting arguments in these fields
+  FfiValueObjectHandleLoginsPrimaryPasswordAuthenticator mPrimaryPasswordAuthenticator{};
+
+  // MakeRustCall stores the result of the call in these fields
+  FfiValueObjectHandleLoginsNssKeyManager mUniffiReturnValue{};
+
+public:
+  void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
+    if (aArgs.Length() < 1) {
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_constructor_nsskeymanager_new (expected: 1, actual: %zu)", aArgs.Length()));
+      return;
+    }
+    mPrimaryPasswordAuthenticator.Lower(aArgs[0], aError);
+    if (aError.Failed()) {
+      return;
+    }
+  }
+
+  void MakeRustCall(RustCallStatus* aOutStatus) override {
+    mUniffiReturnValue = FfiValueObjectHandleLoginsNssKeyManager::FromRust(
+      uniffi_logins_fn_constructor_nsskeymanager_new(
+        mPrimaryPasswordAuthenticator.IntoRust(),
+        aOutStatus
+      )
+    );
+  }
+
+  virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
+    mUniffiReturnValue.Lift(
+      aCx,
+      &aDest.Construct(),
       aError
     );
   }
@@ -6472,7 +6603,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodNsskeymanagerIntoDynKeyManager :
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_logins_fn_method_nsskeymanager_into_dyn_key_manager (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -6512,7 +6643,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodPrimarypasswordauthenticatorGetP
   // return a future.
   void LowerArgsAndMakeRustCall(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
     FfiValueObjectHandleLoginsPrimaryPasswordAuthenticator mUniffiPtr{};
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -6552,7 +6683,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodPrimarypasswordauthenticatorOnAu
   // return a future.
   void LowerArgsAndMakeRustCall(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
     FfiValueObjectHandleLoginsPrimaryPasswordAuthenticator mUniffiPtr{};
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -6586,7 +6717,7 @@ class ScaffoldingCallHandlerUniffiLoginsFnMethodPrimarypasswordauthenticatorOnAu
   // return a future.
   void LowerArgsAndMakeRustCall(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
     FfiValueObjectHandleLoginsPrimaryPasswordAuthenticator mUniffiPtr{};
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -6742,7 +6873,7 @@ class ScaffoldingCallHandlerUniffiRelevancyFnMethodRelevancystoreBanditInit : pu
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_relevancy_fn_method_relevancystore_bandit_init (expected: 3, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -6784,7 +6915,7 @@ class ScaffoldingCallHandlerUniffiRelevancyFnMethodRelevancystoreBanditSelect :
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_relevancy_fn_method_relevancystore_bandit_select (expected: 3, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -6833,7 +6964,7 @@ class ScaffoldingCallHandlerUniffiRelevancyFnMethodRelevancystoreBanditUpdate :
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_relevancy_fn_method_relevancystore_bandit_update (expected: 4, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -6877,7 +7008,7 @@ class ScaffoldingCallHandlerUniffiRelevancyFnMethodRelevancystoreClose : public
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_relevancy_fn_method_relevancystore_close (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -6906,7 +7037,7 @@ class ScaffoldingCallHandlerUniffiRelevancyFnMethodRelevancystoreEnsureInterestD
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_relevancy_fn_method_relevancystore_ensure_interest_data_populated (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -6938,7 +7069,7 @@ class ScaffoldingCallHandlerUniffiRelevancyFnMethodRelevancystoreGetBanditData :
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_relevancy_fn_method_relevancystore_get_bandit_data (expected: 3, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -6986,7 +7117,7 @@ class ScaffoldingCallHandlerUniffiRelevancyFnMethodRelevancystoreIngest : public
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_relevancy_fn_method_relevancystore_ingest (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7027,7 +7158,7 @@ class ScaffoldingCallHandlerUniffiRelevancyFnMethodRelevancystoreInterrupt : pub
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_relevancy_fn_method_relevancystore_interrupt (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7057,7 +7188,7 @@ class ScaffoldingCallHandlerUniffiRelevancyFnMethodRelevancystoreUserInterestVec
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_relevancy_fn_method_relevancystore_user_interest_vector (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7132,7 +7263,7 @@ class ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsDownloadAt
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_remote_settings_fn_method_remotesettings_download_attachment_to_path (expected: 3, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7172,7 +7303,7 @@ class ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsGetRecords
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_remote_settings_fn_method_remotesettings_get_records (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7210,7 +7341,7 @@ class ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsGetRecords
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_remote_settings_fn_method_remotesettings_get_records_since (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7252,7 +7383,7 @@ class ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientColl
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_remote_settings_fn_method_remotesettingsclient_collection_name (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7290,7 +7421,7 @@ class ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientGetA
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_remote_settings_fn_method_remotesettingsclient_get_attachment (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7333,7 +7464,7 @@ class ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientGetR
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_remote_settings_fn_method_remotesettingsclient_get_records (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7376,7 +7507,7 @@ class ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientGetR
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_remote_settings_fn_method_remotesettingsclient_get_records_map (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7417,7 +7548,7 @@ class ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientShut
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_remote_settings_fn_method_remotesettingsclient_shutdown (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7446,7 +7577,7 @@ class ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientSync
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_remote_settings_fn_method_remotesettingsclient_sync (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7519,7 +7650,7 @@ class ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsserviceCli
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_remote_settings_fn_method_remotesettingsservice_client_url (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7557,7 +7688,7 @@ class ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsserviceMak
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_remote_settings_fn_method_remotesettingsservice_make_client (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7599,7 +7730,7 @@ class ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsserviceSyn
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_remote_settings_fn_method_remotesettingsservice_sync (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7636,7 +7767,7 @@ class ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsserviceUpd
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_remote_settings_fn_method_remotesettingsservice_update_config (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7697,7 +7828,7 @@ class ScaffoldingCallHandlerUniffiSearchFnMethodSearchengineselectorClearSearchC
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_search_fn_method_searchengineselector_clear_search_config (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7728,7 +7859,7 @@ class ScaffoldingCallHandlerUniffiSearchFnMethodSearchengineselectorFilterEngine
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_search_fn_method_searchengineselector_filter_engine_configuration (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7770,7 +7901,7 @@ class ScaffoldingCallHandlerUniffiSearchFnMethodSearchengineselectorSetConfigOve
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_search_fn_method_searchengineselector_set_config_overrides (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7805,7 +7936,7 @@ class ScaffoldingCallHandlerUniffiSearchFnMethodSearchengineselectorSetSearchCon
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_search_fn_method_searchengineselector_set_search_config (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7841,7 +7972,7 @@ class ScaffoldingCallHandlerUniffiSearchFnMethodSearchengineselectorUseRemoteSet
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_search_fn_method_searchengineselector_use_remote_settings_server (expected: 3, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -7967,7 +8098,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreAnyDismissedSuggest
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststore_any_dismissed_suggestions (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8003,7 +8134,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreClear : public Unif
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststore_clear (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8032,7 +8163,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreClearDismissedSugge
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststore_clear_dismissed_suggestions (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8062,7 +8193,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreDismissByKey : publ
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststore_dismiss_by_key (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8097,7 +8228,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreDismissBySuggestion
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststore_dismiss_by_suggestion (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8132,7 +8263,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreDismissSuggestion :
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststore_dismiss_suggestion (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8168,7 +8299,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreFetchGeonameAlterna
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststore_fetch_geoname_alternates (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8213,7 +8344,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreFetchGeonames : pub
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststore_fetch_geonames (expected: 4, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8265,7 +8396,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreFetchGlobalConfig :
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststore_fetch_global_config (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8303,7 +8434,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreFetchProviderConfig
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststore_fetch_provider_config (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8346,7 +8477,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreIngest : public Uni
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststore_ingest (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8388,7 +8519,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreInterrupt : public
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststore_interrupt (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8424,7 +8555,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreIsDismissedByKey :
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststore_is_dismissed_by_key (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8467,7 +8598,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreIsDismissedBySugges
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststore_is_dismissed_by_suggestion (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8510,7 +8641,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreQuery : public Unif
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststore_query (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8553,7 +8684,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreQueryWithMetrics :
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststore_query_with_metrics (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8622,7 +8753,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderBuild : publ
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststorebuilder_build (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8660,7 +8791,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderCachePath :
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststorebuilder_cache_path (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8703,7 +8834,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderDataPath : p
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststorebuilder_data_path (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8747,7 +8878,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderLoadExtensio
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststorebuilder_load_extension (expected: 3, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8795,7 +8926,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderRemoteSettin
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_bucket_name (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8838,7 +8969,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderRemoteSettin
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_server (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8881,7 +9012,7 @@ class ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderRemoteSettin
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_suggest_fn_method_suggeststorebuilder_remote_settings_service (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8925,7 +9056,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodRemotecommandstoreAddRemoteCommand
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_remotecommandstore_add_remote_command (expected: 3, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -8975,7 +9106,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodRemotecommandstoreAddRemoteCommand
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_remotecommandstore_add_remote_command_at (expected: 4, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9027,7 +9158,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodRemotecommandstoreGetUnsentCommand
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_remotecommandstore_get_unsent_commands (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9066,7 +9197,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodRemotecommandstoreRemoveRemoteComm
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_remotecommandstore_remove_remote_command (expected: 3, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9114,7 +9245,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodRemotecommandstoreSetPendingComman
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_remotecommandstore_set_pending_command_sent (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9156,7 +9287,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineApply : public Un
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_tabsbridgedengine_apply (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9194,7 +9325,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineEnsureCurrentSync
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_tabsbridgedengine_ensure_current_sync_id (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9236,7 +9367,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineLastSync : public
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_tabsbridgedengine_last_sync (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9273,7 +9404,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedenginePrepareForSync :
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_tabsbridgedengine_prepare_for_sync (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9307,7 +9438,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineReset : public Un
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_tabsbridgedengine_reset (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9337,7 +9468,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineResetSyncId : pub
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_tabsbridgedengine_reset_sync_id (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9374,7 +9505,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineSetLastSync : pub
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_tabsbridgedengine_set_last_sync (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9410,7 +9541,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineSetUploaded : pub
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_tabsbridgedengine_set_uploaded (expected: 3, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9450,7 +9581,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineStoreIncoming : p
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_tabsbridgedengine_store_incoming (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9484,7 +9615,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineSyncFinished : pu
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_tabsbridgedengine_sync_finished (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9514,7 +9645,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineSyncId : public U
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_tabsbridgedengine_sync_id (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9550,7 +9681,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineSyncStarted : pub
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_tabsbridgedengine_sync_started (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9579,7 +9710,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineWipe : public Uni
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_tabsbridgedengine_wipe (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9646,7 +9777,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreBridgedEngine : public Un
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_tabsstore_bridged_engine (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9682,7 +9813,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreCloseConnection : public
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_tabsstore_close_connection (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9712,7 +9843,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreGetAll : public UniffiSyn
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_tabsstore_get_all (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9749,7 +9880,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreNewRemoteCommandStore : p
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_tabsstore_new_remote_command_store (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9785,7 +9916,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreRegisterWithSyncManager :
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_tabsstore_register_with_sync_manager (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9815,7 +9946,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreSetLocalTabs : public Uni
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_tabsstore_set_local_tabs (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9850,7 +9981,7 @@ class ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreSetLocalTabsInfo : public
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_tabs_fn_method_tabsstore_set_local_tabs_info (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -9876,7 +10007,7 @@ class ScaffoldingCallHandlerUniffiTracingSupportFnFuncRegisterEventSink : public
   // LowerRustArgs stores the resulting arguments in these fields
   FfiValueRustBuffer mTarget{};
   FfiValueRustBuffer mLevel{};
-  FfiValueCallbackInterfacetracing_EventSink mSink{};
+  FfiValueObjectHandleTracingEventSink mSink{};
 
   // MakeRustCall stores the result of the call in these fields
 
@@ -9916,7 +10047,7 @@ class ScaffoldingCallHandlerUniffiTracingSupportFnFuncRegisterMinLevelEventSink
 private:
   // LowerRustArgs stores the resulting arguments in these fields
   FfiValueRustBuffer mLevel{};
-  FfiValueCallbackInterfacetracing_EventSink mSink{};
+  FfiValueObjectHandleTracingEventSink mSink{};
 
   // MakeRustCall stores the result of the call in these fields
 
@@ -10043,6 +10174,35 @@ class ScaffoldingCallHandlerUniffiViaductFnFuncInitBackend : public UniffiSyncCa
   virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
   }
 };
+class ScaffoldingCallHandlerUniffiViaductFnFuncSetGlobalDefaultUserAgent : public UniffiSyncCallHandler {
+private:
+  // LowerRustArgs stores the resulting arguments in these fields
+  FfiValueRustBuffer mUserAgent{};
+
+  // MakeRustCall stores the result of the call in these fields
+
+public:
+  void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
+    if (aArgs.Length() < 1) {
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_viaduct_fn_func_set_global_default_user_agent (expected: 1, actual: %zu)", aArgs.Length()));
+      return;
+    }
+    mUserAgent.Lower(aArgs[0], aError);
+    if (aError.Failed()) {
+      return;
+    }
+  }
+
+  void MakeRustCall(RustCallStatus* aOutStatus) override {
+    uniffi_viaduct_fn_func_set_global_default_user_agent(
+      mUserAgent.IntoRust(),
+      aOutStatus
+    );
+  }
+
+  virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
+  }
+};
 class ScaffoldingCallHandlerUniffiViaductFnMethodBackendSendRequest : public UniffiAsyncCallHandler {
 public:
   ScaffoldingCallHandlerUniffiViaductFnMethodBackendSendRequest() : UniffiAsyncCallHandler(
@@ -10060,7 +10220,7 @@ class ScaffoldingCallHandlerUniffiViaductFnMethodBackendSendRequest : public Uni
   // return a future.
   void LowerArgsAndMakeRustCall(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
     FfiValueObjectHandleViaductBackend mUniffiPtr{};
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10110,7 +10270,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengin
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragebridgedengine_apply (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10148,7 +10308,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengin
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragebridgedengine_ensure_current_sync_id (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10190,7 +10350,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengin
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragebridgedengine_last_sync (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10227,7 +10387,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengin
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragebridgedengine_prepare_for_sync (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10261,7 +10421,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengin
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragebridgedengine_reset (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10291,7 +10451,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengin
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragebridgedengine_reset_sync_id (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10328,7 +10488,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengin
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragebridgedengine_set_last_sync (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10364,7 +10524,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengin
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragebridgedengine_set_uploaded (expected: 3, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10404,7 +10564,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengin
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragebridgedengine_store_incoming (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10438,7 +10598,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengin
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_finished (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10468,7 +10628,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengin
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_id (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10504,7 +10664,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengin
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragebridgedengine_sync_started (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10533,7 +10693,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengin
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragebridgedengine_wipe (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10600,7 +10760,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreBridged
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragestore_bridged_engine (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10638,7 +10798,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreClear :
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragestore_clear (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10679,7 +10839,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreClose :
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragestore_close (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10711,7 +10871,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreGet : p
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragestore_get (expected: 3, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10760,7 +10920,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreGetByte
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragestore_get_bytes_in_use (expected: 3, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10808,7 +10968,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreGetKeys
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragestore_get_keys (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10850,7 +11010,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreGetSync
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragestore_get_synced_changes (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10889,7 +11049,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreRemove
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragestore_remove (expected: 3, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -10938,7 +11098,7 @@ class ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreSet : p
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_webext_storage_fn_method_webextstoragestore_set (expected: 3, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -11263,8 +11423,8 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncAsyncRoundtripMap : p
 class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncAsyncRoundtripObj : public UniffiAsyncCallHandler {
 public:
   ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncAsyncRoundtripObj() : UniffiAsyncCallHandler(
-        ffi_uniffi_bindings_tests_rust_future_poll_pointer,
-        ffi_uniffi_bindings_tests_rust_future_free_pointer
+        ffi_uniffi_bindings_tests_rust_future_poll_u64,
+        ffi_uniffi_bindings_tests_rust_future_free_u64
     ) { }
 
 private:
@@ -11289,7 +11449,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncAsyncRoundtripObj : p
 
   void CallCompleteFn(RustCallStatus* aOutStatus) override {
     mUniffiReturnValue = FfiValueObjectHandleUniffiBindingsTestsAsyncInterface::FromRust(
-      ffi_uniffi_bindings_tests_rust_future_complete_pointer(mFutureHandle, aOutStatus));
+      ffi_uniffi_bindings_tests_rust_future_complete_u64(mFutureHandle, aOutStatus));
   }
 
 public:
@@ -12023,7 +12183,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestAsyncCallba
   // Always called on the main thread since async Rust calls don't block, they
   // return a future.
   void LowerArgsAndMakeRustCall(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
-    FfiValueCallbackInterfaceuniffi_bindings_tests_TestAsyncCallbackInterface mCbi{};
+    FfiValueObjectHandleUniffiBindingsTestsTestAsyncCallbackInterface mCbi{};
     mCbi.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
@@ -12063,7 +12223,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestAsyncCallba
   // Always called on the main thread since async Rust calls don't block, they
   // return a future.
   void LowerArgsAndMakeRustCall(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
-    FfiValueCallbackInterfaceuniffi_bindings_tests_TestAsyncCallbackInterface mCbi{};
+    FfiValueObjectHandleUniffiBindingsTestsTestAsyncCallbackInterface mCbi{};
     mCbi.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
@@ -12097,7 +12257,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestAsyncCallba
   // Always called on the main thread since async Rust calls don't block, they
   // return a future.
   void LowerArgsAndMakeRustCall(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
-    FfiValueCallbackInterfaceuniffi_bindings_tests_TestAsyncCallbackInterface mCbi{};
+    FfiValueObjectHandleUniffiBindingsTestsTestAsyncCallbackInterface mCbi{};
     mCbi.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
@@ -12138,7 +12298,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestAsyncCallba
   // Always called on the main thread since async Rust calls don't block, they
   // return a future.
   void LowerArgsAndMakeRustCall(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
-    FfiValueCallbackInterfaceuniffi_bindings_tests_TestAsyncCallbackInterface mCbi{};
+    FfiValueObjectHandleUniffiBindingsTestsTestAsyncCallbackInterface mCbi{};
     mCbi.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
@@ -12172,7 +12332,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestAsyncCallba
 class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestCallbackInterfaceGetValue : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
-  FfiValueCallbackInterfaceuniffi_bindings_tests_TestCallbackInterface mCbi{};
+  FfiValueObjectHandleUniffiBindingsTestsTestCallbackInterface mCbi{};
 
   // MakeRustCall stores the result of the call in these fields
   FfiValueInt<uint32_t> mUniffiReturnValue{};
@@ -12209,7 +12369,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestCallbackInt
 class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestCallbackInterfaceNoop : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
-  FfiValueCallbackInterfaceuniffi_bindings_tests_TestCallbackInterface mCbi{};
+  FfiValueObjectHandleUniffiBindingsTestsTestCallbackInterface mCbi{};
 
   // MakeRustCall stores the result of the call in these fields
 
@@ -12238,7 +12398,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestCallbackInt
 class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestCallbackInterfaceSetValue : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
-  FfiValueCallbackInterfaceuniffi_bindings_tests_TestCallbackInterface mCbi{};
+  FfiValueObjectHandleUniffiBindingsTestsTestCallbackInterface mCbi{};
   FfiValueInt<uint32_t> mValue{};
 
   // MakeRustCall stores the result of the call in these fields
@@ -12273,7 +12433,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestCallbackInt
 class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestCallbackInterfaceThrowIfEqual : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
-  FfiValueCallbackInterfaceuniffi_bindings_tests_TestCallbackInterface mCbi{};
+  FfiValueObjectHandleUniffiBindingsTestsTestCallbackInterface mCbi{};
   FfiValueRustBuffer mNumbers{};
 
   // MakeRustCall stores the result of the call in these fields
@@ -12457,30 +12617,30 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestTraitInterf
     );
   }
 };
-class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripBool : public UniffiSyncCallHandler {
+class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripAsyncTestTraitInterface : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
-  FfiValueInt<int8_t> mA{};
+  FfiValueObjectHandleUniffiBindingsTestsAsyncTestTraitInterface mInt{};
 
   // MakeRustCall stores the result of the call in these fields
-  FfiValueInt<int8_t> mUniffiReturnValue{};
+  FfiValueObjectHandleUniffiBindingsTestsAsyncTestTraitInterface mUniffiReturnValue{};
 
 public:
   void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
     if (aArgs.Length() < 1) {
-      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_uniffi_bindings_tests_fn_func_roundtrip_bool (expected: 1, actual: %zu)", aArgs.Length()));
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_uniffi_bindings_tests_fn_func_roundtrip_async_test_trait_interface (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mA.Lower(aArgs[0], aError);
+    mInt.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
   }
 
   void MakeRustCall(RustCallStatus* aOutStatus) override {
-    mUniffiReturnValue = FfiValueInt<int8_t>::FromRust(
-      uniffi_uniffi_bindings_tests_fn_func_roundtrip_bool(
-        mA.IntoRust(),
+    mUniffiReturnValue = FfiValueObjectHandleUniffiBindingsTestsAsyncTestTraitInterface::FromRust(
+      uniffi_uniffi_bindings_tests_fn_func_roundtrip_async_test_trait_interface(
+        mInt.IntoRust(),
         aOutStatus
       )
     );
@@ -12494,10 +12654,10 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripBool : publi
     );
   }
 };
-class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripComplexCompound : public UniffiSyncCallHandler {
+class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripAsyncTestTraitInterfaceList : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
-  FfiValueRustBuffer mA{};
+  FfiValueRustBuffer mIntList{};
 
   // MakeRustCall stores the result of the call in these fields
   FfiValueRustBuffer mUniffiReturnValue{};
@@ -12505,10 +12665,10 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripComplexCompo
 public:
   void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
     if (aArgs.Length() < 1) {
-      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_uniffi_bindings_tests_fn_func_roundtrip_complex_compound (expected: 1, actual: %zu)", aArgs.Length()));
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_uniffi_bindings_tests_fn_func_roundtrip_async_test_trait_interface_list (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mA.Lower(aArgs[0], aError);
+    mIntList.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -12516,8 +12676,8 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripComplexCompo
 
   void MakeRustCall(RustCallStatus* aOutStatus) override {
     mUniffiReturnValue = FfiValueRustBuffer::FromRust(
-      uniffi_uniffi_bindings_tests_fn_func_roundtrip_complex_compound(
-        mA.IntoRust(),
+      uniffi_uniffi_bindings_tests_fn_func_roundtrip_async_test_trait_interface_list(
+        mIntList.IntoRust(),
         aOutStatus
       )
     );
@@ -12531,7 +12691,81 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripComplexCompo
     );
   }
 };
-class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripComplexEnum : public UniffiSyncCallHandler {
+class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripBool : public UniffiSyncCallHandler {
+private:
+  // LowerRustArgs stores the resulting arguments in these fields
+  FfiValueInt<int8_t> mA{};
+
+  // MakeRustCall stores the result of the call in these fields
+  FfiValueInt<int8_t> mUniffiReturnValue{};
+
+public:
+  void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
+    if (aArgs.Length() < 1) {
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_uniffi_bindings_tests_fn_func_roundtrip_bool (expected: 1, actual: %zu)", aArgs.Length()));
+      return;
+    }
+    mA.Lower(aArgs[0], aError);
+    if (aError.Failed()) {
+      return;
+    }
+  }
+
+  void MakeRustCall(RustCallStatus* aOutStatus) override {
+    mUniffiReturnValue = FfiValueInt<int8_t>::FromRust(
+      uniffi_uniffi_bindings_tests_fn_func_roundtrip_bool(
+        mA.IntoRust(),
+        aOutStatus
+      )
+    );
+  }
+
+  virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
+    mUniffiReturnValue.Lift(
+      aCx,
+      &aDest.Construct(),
+      aError
+    );
+  }
+};
+class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripComplexCompound : public UniffiSyncCallHandler {
+private:
+  // LowerRustArgs stores the resulting arguments in these fields
+  FfiValueRustBuffer mA{};
+
+  // MakeRustCall stores the result of the call in these fields
+  FfiValueRustBuffer mUniffiReturnValue{};
+
+public:
+  void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
+    if (aArgs.Length() < 1) {
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_uniffi_bindings_tests_fn_func_roundtrip_complex_compound (expected: 1, actual: %zu)", aArgs.Length()));
+      return;
+    }
+    mA.Lower(aArgs[0], aError);
+    if (aError.Failed()) {
+      return;
+    }
+  }
+
+  void MakeRustCall(RustCallStatus* aOutStatus) override {
+    mUniffiReturnValue = FfiValueRustBuffer::FromRust(
+      uniffi_uniffi_bindings_tests_fn_func_roundtrip_complex_compound(
+        mA.IntoRust(),
+        aOutStatus
+      )
+    );
+  }
+
+  virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
+    mUniffiReturnValue.Lift(
+      aCx,
+      &aDest.Construct(),
+      aError
+    );
+  }
+};
+class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripComplexEnum : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
   FfiValueRustBuffer mEn{};
@@ -13086,6 +13320,80 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripString : pub
     );
   }
 };
+class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripTestTraitInterface : public UniffiSyncCallHandler {
+private:
+  // LowerRustArgs stores the resulting arguments in these fields
+  FfiValueObjectHandleUniffiBindingsTestsTestTraitInterface mInt{};
+
+  // MakeRustCall stores the result of the call in these fields
+  FfiValueObjectHandleUniffiBindingsTestsTestTraitInterface mUniffiReturnValue{};
+
+public:
+  void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
+    if (aArgs.Length() < 1) {
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_uniffi_bindings_tests_fn_func_roundtrip_test_trait_interface (expected: 1, actual: %zu)", aArgs.Length()));
+      return;
+    }
+    mInt.Lower(aArgs[0], aError);
+    if (aError.Failed()) {
+      return;
+    }
+  }
+
+  void MakeRustCall(RustCallStatus* aOutStatus) override {
+    mUniffiReturnValue = FfiValueObjectHandleUniffiBindingsTestsTestTraitInterface::FromRust(
+      uniffi_uniffi_bindings_tests_fn_func_roundtrip_test_trait_interface(
+        mInt.IntoRust(),
+        aOutStatus
+      )
+    );
+  }
+
+  virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
+    mUniffiReturnValue.Lift(
+      aCx,
+      &aDest.Construct(),
+      aError
+    );
+  }
+};
+class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripTestTraitInterfaceList : public UniffiSyncCallHandler {
+private:
+  // LowerRustArgs stores the resulting arguments in these fields
+  FfiValueRustBuffer mIntList{};
+
+  // MakeRustCall stores the result of the call in these fields
+  FfiValueRustBuffer mUniffiReturnValue{};
+
+public:
+  void LowerRustArgs(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
+    if (aArgs.Length() < 1) {
+      aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_uniffi_bindings_tests_fn_func_roundtrip_test_trait_interface_list (expected: 1, actual: %zu)", aArgs.Length()));
+      return;
+    }
+    mIntList.Lower(aArgs[0], aError);
+    if (aError.Failed()) {
+      return;
+    }
+  }
+
+  void MakeRustCall(RustCallStatus* aOutStatus) override {
+    mUniffiReturnValue = FfiValueRustBuffer::FromRust(
+      uniffi_uniffi_bindings_tests_fn_func_roundtrip_test_trait_interface_list(
+        mIntList.IntoRust(),
+        aOutStatus
+      )
+    );
+  }
+
+  virtual void LiftSuccessfulCallResult(JSContext* aCx, dom::Optional<dom::OwningUniFFIScaffoldingValue>& aDest, ErrorResult& aError) override {
+    mUniffiReturnValue.Lift(
+      aCx,
+      &aDest.Construct(),
+      aError
+    );
+  }
+};
 class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripTimeIntervalMs : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
@@ -13623,7 +13931,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodTestinterfaceGetVal
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_uniffi_bindings_tests_fn_method_testinterface_get_value (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -13660,7 +13968,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodTestinterfaceRefCou
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_uniffi_bindings_tests_fn_method_testinterface_ref_count (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -13737,7 +14045,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodAsyncinterfaceName
   // return a future.
   void LowerArgsAndMakeRustCall(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
     FfiValueObjectHandleUniffiBindingsTestsAsyncInterface mUniffiPtr{};
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -13777,7 +14085,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodAsynctesttraitinter
   // return a future.
   void LowerArgsAndMakeRustCall(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
     FfiValueObjectHandleUniffiBindingsTestsAsyncTestTraitInterface mUniffiPtr{};
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -13812,7 +14120,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodAsynctesttraitinter
   // return a future.
   void LowerArgsAndMakeRustCall(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
     FfiValueObjectHandleUniffiBindingsTestsAsyncTestTraitInterface mUniffiPtr{};
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -13852,7 +14160,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodAsynctesttraitinter
   // return a future.
   void LowerArgsAndMakeRustCall(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
     FfiValueObjectHandleUniffiBindingsTestsAsyncTestTraitInterface mUniffiPtr{};
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -13893,7 +14201,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodAsynctesttraitinter
   // return a future.
   void LowerArgsAndMakeRustCall(const dom::Sequence<dom::OwningUniFFIScaffoldingValue>& aArgs, ErrorResult& aError) override {
     FfiValueObjectHandleUniffiBindingsTestsAsyncTestTraitInterface mUniffiPtr{};
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -13965,7 +14273,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodComplexmethodsMetho
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_uniffi_bindings_tests_fn_method_complexmethods_method_with_default (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -14008,7 +14316,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodComplexmethodsMetho
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_uniffi_bindings_tests_fn_method_complexmethods_method_with_multi_word_arg (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -14049,7 +14357,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodTesttraitinterfaceN
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_uniffi_bindings_tests_fn_method_testtraitinterface_noop (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -14079,7 +14387,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodTesttraitinterfaceG
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_uniffi_bindings_tests_fn_method_testtraitinterface_get_value (expected: 1, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -14116,7 +14424,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodTesttraitinterfaceS
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_uniffi_bindings_tests_fn_method_testtraitinterface_set_value (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -14152,7 +14460,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodTesttraitinterfaceT
       aError.ThrowUnknownError(nsPrintfCString("LowerRustArgs: Incorrect argument length for uniffi_uniffi_bindings_tests_fn_method_testtraitinterface_throw_if_equal (expected: 2, actual: %zu)", aArgs.Length()));
       return;
     }
-    mUniffiPtr.LowerReciever(aArgs[0], aError);
+    mUniffiPtr.Lower(aArgs[0], aError);
     if (aError.Failed()) {
       return;
     }
@@ -14183,7 +14491,7 @@ class ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodTesttraitinterfaceT
 class ScaffoldingCallHandlerUniffiUniffiBindingsTestsCollisionFnFuncInvokeCollisionCallback : public UniffiSyncCallHandler {
 private:
   // LowerRustArgs stores the resulting arguments in these fields
-  FfiValueCallbackInterfaceuniffi_bindings_tests_collision_TestCallbackInterface mCb{};
+  FfiValueObjectHandleUniffiBindingsTestsCollisionTestCallbackInterface mCb{};
 
   // MakeRustCall stores the result of the call in these fields
   FfiValueRustBuffer mUniffiReturnValue{};
@@ -14473,569 +14781,602 @@ UniquePtr<UniffiSyncCallHandler> GetSyncCallHandler(uint64_t aId) {
       return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreHasLoginsByBaseDomain>();
     }
     case 35: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreIsEmpty>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreIsBreachAlertDismissed>();
     }
     case 36: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreList>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreIsEmpty>();
     }
     case 37: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreRegisterWithSyncManager>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreIsPotentiallyBreached>();
     }
     case 38: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreReset>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreList>();
     }
     case 39: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreRunMaintenance>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreRecordBreach>();
     }
     case 40: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreSetCheckpoint>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreRecordBreachAlertDismissal>();
     }
     case 41: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreShutdown>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreRecordBreachAlertDismissalTime>();
     }
     case 42: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreTouch>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreRegisterWithSyncManager>();
     }
     case 43: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreUpdate>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreReset>();
     }
     case 44: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreWipeLocal>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreResetAllBreaches>();
     }
     case 45: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnConstructorManagedencryptordecryptorNew>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreRunMaintenance>();
     }
     case 46: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnConstructorNsskeymanagerNew>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreSetCheckpoint>();
     }
     case 47: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodNsskeymanagerIntoDynKeyManager>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreShutdown>();
+    }
+    case 48: {
+      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreTouch>();
+    }
+    case 49: {
+      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreUpdate>();
+    }
+    case 50: {
+      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodLoginstoreWipeLocal>();
     }
     case 51: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnConstructorStatickeymanagerNew>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnConstructorManagedencryptordecryptorNew>();
     }
     case 52: {
-      return MakeUnique<ScaffoldingCallHandlerUniffiRelevancyFnFuncScore>();
+      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnConstructorNsskeymanagerNew>();
     }
     case 53: {
+      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodNsskeymanagerIntoDynKeyManager>();
+    }
+    case 57: {
+      return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnConstructorStatickeymanagerNew>();
+    }
+    case 58: {
+      return MakeUnique<ScaffoldingCallHandlerUniffiRelevancyFnFuncScore>();
+    }
+    case 59: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRelevancyFnConstructorRelevancystoreNew>();
     }
-    case 54: {
+    case 60: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRelevancyFnMethodRelevancystoreBanditInit>();
     }
-    case 55: {
+    case 61: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRelevancyFnMethodRelevancystoreBanditSelect>();
     }
-    case 56: {
+    case 62: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRelevancyFnMethodRelevancystoreBanditUpdate>();
     }
-    case 57: {
+    case 63: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRelevancyFnMethodRelevancystoreClose>();
     }
-    case 58: {
+    case 64: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRelevancyFnMethodRelevancystoreEnsureInterestDataPopulated>();
     }
-    case 59: {
+    case 65: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRelevancyFnMethodRelevancystoreGetBanditData>();
     }
-    case 60: {
+    case 66: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRelevancyFnMethodRelevancystoreIngest>();
     }
-    case 61: {
+    case 67: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRelevancyFnMethodRelevancystoreInterrupt>();
     }
-    case 62: {
+    case 68: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRelevancyFnMethodRelevancystoreUserInterestVector>();
     }
-    case 63: {
+    case 69: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnConstructorRemotesettingsNew>();
     }
-    case 64: {
+    case 70: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsDownloadAttachmentToPath>();
     }
-    case 65: {
+    case 71: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsGetRecords>();
     }
-    case 66: {
+    case 72: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsGetRecordsSince>();
     }
-    case 67: {
+    case 73: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientCollectionName>();
     }
-    case 68: {
+    case 74: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientGetAttachment>();
     }
-    case 69: {
+    case 75: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientGetRecords>();
     }
-    case 70: {
+    case 76: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientGetRecordsMap>();
     }
-    case 71: {
+    case 77: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientShutdown>();
     }
-    case 72: {
+    case 78: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsclientSync>();
     }
-    case 73: {
+    case 79: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnConstructorRemotesettingsserviceNew>();
     }
-    case 74: {
+    case 80: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsserviceClientUrl>();
     }
-    case 75: {
+    case 81: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsserviceMakeClient>();
     }
-    case 76: {
+    case 82: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsserviceSync>();
     }
-    case 77: {
+    case 83: {
       return MakeUnique<ScaffoldingCallHandlerUniffiRemoteSettingsFnMethodRemotesettingsserviceUpdateConfig>();
     }
-    case 78: {
+    case 84: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSearchFnConstructorSearchengineselectorNew>();
     }
-    case 79: {
+    case 85: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSearchFnMethodSearchengineselectorClearSearchConfig>();
     }
-    case 80: {
+    case 86: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSearchFnMethodSearchengineselectorFilterEngineConfiguration>();
     }
-    case 81: {
+    case 87: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSearchFnMethodSearchengineselectorSetConfigOverrides>();
     }
-    case 82: {
+    case 88: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSearchFnMethodSearchengineselectorSetSearchConfig>();
     }
-    case 83: {
+    case 89: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSearchFnMethodSearchengineselectorUseRemoteSettingsServer>();
     }
-    case 84: {
+    case 90: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnFuncRawSuggestionUrlMatches>();
     }
-    case 85: {
+    case 91: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnConstructorSuggeststoreNew>();
     }
-    case 86: {
+    case 92: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreAnyDismissedSuggestions>();
     }
-    case 87: {
+    case 93: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreClear>();
     }
-    case 88: {
+    case 94: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreClearDismissedSuggestions>();
     }
-    case 89: {
+    case 95: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreDismissByKey>();
     }
-    case 90: {
+    case 96: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreDismissBySuggestion>();
     }
-    case 91: {
+    case 97: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreDismissSuggestion>();
     }
-    case 92: {
+    case 98: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreFetchGeonameAlternates>();
     }
-    case 93: {
+    case 99: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreFetchGeonames>();
     }
-    case 94: {
+    case 100: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreFetchGlobalConfig>();
     }
-    case 95: {
+    case 101: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreFetchProviderConfig>();
     }
-    case 96: {
+    case 102: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreIngest>();
     }
-    case 97: {
+    case 103: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreInterrupt>();
     }
-    case 98: {
+    case 104: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreIsDismissedByKey>();
     }
-    case 99: {
+    case 105: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreIsDismissedBySuggestion>();
     }
-    case 100: {
+    case 106: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreQuery>();
     }
-    case 101: {
+    case 107: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststoreQueryWithMetrics>();
     }
-    case 102: {
+    case 108: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnConstructorSuggeststorebuilderNew>();
     }
-    case 103: {
+    case 109: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderBuild>();
     }
-    case 104: {
+    case 110: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderCachePath>();
     }
-    case 105: {
+    case 111: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderDataPath>();
     }
-    case 106: {
+    case 112: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderLoadExtension>();
     }
-    case 107: {
+    case 113: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderRemoteSettingsBucketName>();
     }
-    case 108: {
+    case 114: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderRemoteSettingsServer>();
     }
-    case 109: {
+    case 115: {
       return MakeUnique<ScaffoldingCallHandlerUniffiSuggestFnMethodSuggeststorebuilderRemoteSettingsService>();
     }
-    case 110: {
+    case 116: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodRemotecommandstoreAddRemoteCommand>();
     }
-    case 111: {
+    case 117: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodRemotecommandstoreAddRemoteCommandAt>();
     }
-    case 112: {
+    case 118: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodRemotecommandstoreGetUnsentCommands>();
     }
-    case 113: {
+    case 119: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodRemotecommandstoreRemoveRemoteCommand>();
     }
-    case 114: {
+    case 120: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodRemotecommandstoreSetPendingCommandSent>();
     }
-    case 115: {
+    case 121: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineApply>();
     }
-    case 116: {
+    case 122: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineEnsureCurrentSyncId>();
     }
-    case 117: {
+    case 123: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineLastSync>();
     }
-    case 118: {
+    case 124: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedenginePrepareForSync>();
     }
-    case 119: {
+    case 125: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineReset>();
     }
-    case 120: {
+    case 126: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineResetSyncId>();
     }
-    case 121: {
+    case 127: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineSetLastSync>();
     }
-    case 122: {
+    case 128: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineSetUploaded>();
     }
-    case 123: {
+    case 129: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineStoreIncoming>();
     }
-    case 124: {
+    case 130: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineSyncFinished>();
     }
-    case 125: {
+    case 131: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineSyncId>();
     }
-    case 126: {
+    case 132: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineSyncStarted>();
     }
-    case 127: {
+    case 133: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsbridgedengineWipe>();
     }
-    case 128: {
+    case 134: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnConstructorTabsstoreNew>();
     }
-    case 129: {
+    case 135: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreBridgedEngine>();
     }
-    case 130: {
+    case 136: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreCloseConnection>();
     }
-    case 131: {
+    case 137: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreGetAll>();
     }
-    case 132: {
+    case 138: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreNewRemoteCommandStore>();
     }
-    case 133: {
+    case 139: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreRegisterWithSyncManager>();
     }
-    case 134: {
+    case 140: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreSetLocalTabs>();
     }
-    case 135: {
+    case 141: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTabsFnMethodTabsstoreSetLocalTabsInfo>();
     }
-    case 136: {
+    case 142: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTracingSupportFnFuncRegisterEventSink>();
     }
-    case 137: {
+    case 143: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTracingSupportFnFuncRegisterMinLevelEventSink>();
     }
-    case 138: {
+    case 144: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTracingSupportFnFuncUnregisterEventSink>();
     }
-    case 139: {
+    case 145: {
       return MakeUnique<ScaffoldingCallHandlerUniffiTracingSupportFnFuncUnregisterMinLevelEventSink>();
     }
-    case 140: {
+    case 146: {
       return MakeUnique<ScaffoldingCallHandlerUniffiViaductFnFuncAllowAndroidEmulatorLoopback>();
     }
-    case 141: {
+    case 147: {
       return MakeUnique<ScaffoldingCallHandlerUniffiViaductFnFuncInitBackend>();
     }
-    case 143: {
+    case 148: {
+      return MakeUnique<ScaffoldingCallHandlerUniffiViaductFnFuncSetGlobalDefaultUserAgent>();
+    }
+    case 150: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineApply>();
     }
-    case 144: {
+    case 151: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineEnsureCurrentSyncId>();
     }
-    case 145: {
+    case 152: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineLastSync>();
     }
-    case 146: {
+    case 153: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedenginePrepareForSync>();
     }
-    case 147: {
+    case 154: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineReset>();
     }
-    case 148: {
+    case 155: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineResetSyncId>();
     }
-    case 149: {
+    case 156: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineSetLastSync>();
     }
-    case 150: {
+    case 157: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineSetUploaded>();
     }
-    case 151: {
+    case 158: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineStoreIncoming>();
     }
-    case 152: {
+    case 159: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineSyncFinished>();
     }
-    case 153: {
+    case 160: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineSyncId>();
     }
-    case 154: {
+    case 161: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineSyncStarted>();
     }
-    case 155: {
+    case 162: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragebridgedengineWipe>();
     }
-    case 156: {
+    case 163: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnConstructorWebextstoragestoreNew>();
     }
-    case 157: {
+    case 164: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreBridgedEngine>();
     }
-    case 158: {
+    case 165: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreClear>();
     }
-    case 159: {
+    case 166: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreClose>();
     }
-    case 160: {
+    case 167: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreGet>();
     }
-    case 161: {
+    case 168: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreGetBytesInUse>();
     }
-    case 162: {
+    case 169: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreGetKeys>();
     }
-    case 163: {
+    case 170: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreGetSyncedChanges>();
     }
-    case 164: {
+    case 171: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreRemove>();
     }
-    case 165: {
+    case 172: {
       return MakeUnique<ScaffoldingCallHandlerUniffiWebextStorageFnMethodWebextstoragestoreSet>();
     }
 
 #ifdef MOZ_UNIFFI_FIXTURES
-    case 181: {
+    case 188: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncCloneInterface>();
     }
-    case 182: {
+    case 189: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncCreateAsyncTestTraitInterface>();
     }
-    case 183: {
+    case 190: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncCreateTestTraitInterface>();
     }
-    case 184: {
+    case 191: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncFuncWithDefault>();
     }
-    case 185: {
+    case 192: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncFuncWithError>();
     }
-    case 186: {
+    case 193: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncFuncWithFlatError>();
     }
-    case 187: {
+    case 194: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncFuncWithMultiWordArg>();
     }
-    case 188: {
+    case 195: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncGetCustomTypesDemo>();
     }
-    case 197: {
+    case 204: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestCallbackInterfaceGetValue>();
     }
-    case 198: {
+    case 205: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestCallbackInterfaceNoop>();
     }
-    case 199: {
+    case 206: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestCallbackInterfaceSetValue>();
     }
-    case 200: {
+    case 207: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestCallbackInterfaceThrowIfEqual>();
     }
-    case 201: {
+    case 208: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestTraitInterfaceGetValue>();
     }
-    case 202: {
+    case 209: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestTraitInterfaceNoop>();
     }
-    case 203: {
+    case 210: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestTraitInterfaceSetValue>();
     }
-    case 204: {
+    case 211: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestTraitInterfaceThrowIfEqual>();
     }
-    case 205: {
+    case 212: {
+      return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripAsyncTestTraitInterface>();
+    }
+    case 213: {
+      return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripAsyncTestTraitInterfaceList>();
+    }
+    case 214: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripBool>();
     }
-    case 206: {
+    case 215: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripComplexCompound>();
     }
-    case 207: {
+    case 216: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripComplexEnum>();
     }
-    case 208: {
+    case 217: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripComplexRec>();
     }
-    case 209: {
+    case 218: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripCustomType>();
     }
-    case 210: {
+    case 219: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripEnumNoData>();
     }
-    case 211: {
+    case 220: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripEnumWithData>();
     }
-    case 212: {
+    case 221: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripF32>();
     }
-    case 213: {
+    case 222: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripF64>();
     }
-    case 214: {
+    case 223: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripHashMap>();
     }
-    case 215: {
+    case 224: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripI16>();
     }
-    case 216: {
+    case 225: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripI32>();
     }
-    case 217: {
+    case 226: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripI64>();
     }
-    case 218: {
+    case 227: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripI8>();
     }
-    case 219: {
+    case 228: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripOption>();
     }
-    case 220: {
+    case 229: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripSimpleRec>();
     }
-    case 221: {
+    case 230: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripString>();
     }
-    case 222: {
+    case 231: {
+      return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripTestTraitInterface>();
+    }
+    case 232: {
+      return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripTestTraitInterfaceList>();
+    }
+    case 233: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripTimeIntervalMs>();
     }
-    case 223: {
+    case 234: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripTimeIntervalSecDbl>();
     }
-    case 224: {
+    case 235: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripTimeIntervalSecFlt>();
     }
-    case 225: {
+    case 236: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripU16>();
     }
-    case 226: {
+    case 237: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripU32>();
     }
-    case 227: {
+    case 238: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripU64>();
     }
-    case 228: {
+    case 239: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripU8>();
     }
-    case 229: {
+    case 240: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripUrl>();
     }
-    case 230: {
+    case 241: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncRoundtripVec>();
     }
-    case 231: {
+    case 242: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncSumWithManyTypes>();
     }
-    case 232: {
+    case 243: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncSwapTestInterfaces>();
     }
-    case 233: {
+    case 244: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncTestFunc>();
     }
-    case 234: {
+    case 245: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnConstructorTestinterfaceNew>();
     }
-    case 235: {
+    case 246: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodTestinterfaceGetValue>();
     }
-    case 236: {
+    case 247: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodTestinterfaceRefCount>();
     }
-    case 237: {
+    case 248: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnConstructorAsyncinterfaceNew>();
     }
-    case 243: {
+    case 254: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnConstructorComplexmethodsNew>();
     }
-    case 244: {
+    case 255: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodComplexmethodsMethodWithDefault>();
     }
-    case 245: {
+    case 256: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodComplexmethodsMethodWithMultiWordArg>();
     }
-    case 246: {
+    case 257: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodTesttraitinterfaceNoop>();
     }
-    case 247: {
+    case 258: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodTesttraitinterfaceGetValue>();
     }
-    case 248: {
+    case 259: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodTesttraitinterfaceSetValue>();
     }
-    case 249: {
+    case 260: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodTesttraitinterfaceThrowIfEqual>();
     }
-    case 250: {
+    case 261: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsCollisionFnFuncInvokeCollisionCallback>();
     }
-    case 251: {
+    case 262: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsExternalTypesFnFuncRoundtripExtCustomType>();
     }
-    case 252: {
+    case 263: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsExternalTypesFnFuncRoundtripExtEnum>();
     }
-    case 253: {
+    case 264: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsExternalTypesFnFuncRoundtripExtInterface>();
     }
-    case 254: {
+    case 265: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsExternalTypesFnFuncRoundtripExtRecord>();
     }
 #endif /* MOZ_UNIFFI_FIXTURES */
@@ -15048,102 +15389,102 @@ UniquePtr<UniffiSyncCallHandler> GetSyncCallHandler(uint64_t aId) {
 UniquePtr<UniffiAsyncCallHandler> GetAsyncCallHandler(uint64_t aId) {
   switch (aId) {
 
-    case 48: {
+    case 54: {
       return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodPrimarypasswordauthenticatorGetPrimaryPassword>();
     }
-    case 49: {
+    case 55: {
       return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodPrimarypasswordauthenticatorOnAuthenticationSuccess>();
     }
-    case 50: {
+    case 56: {
       return MakeUnique<ScaffoldingCallHandlerUniffiLoginsFnMethodPrimarypasswordauthenticatorOnAuthenticationFailure>();
     }
-    case 142: {
+    case 149: {
       return MakeUnique<ScaffoldingCallHandlerUniffiViaductFnMethodBackendSendRequest>();
     }
 
 #ifdef MOZ_UNIFFI_FIXTURES
-    case 166: {
+    case 173: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncAsyncRoundtripF32>();
     }
-    case 167: {
+    case 174: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncAsyncRoundtripF64>();
     }
-    case 168: {
+    case 175: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncAsyncRoundtripI16>();
     }
-    case 169: {
+    case 176: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncAsyncRoundtripI32>();
     }
-    case 170: {
+    case 177: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncAsyncRoundtripI64>();
     }
-    case 171: {
+    case 178: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncAsyncRoundtripI8>();
     }
-    case 172: {
+    case 179: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncAsyncRoundtripMap>();
     }
-    case 173: {
+    case 180: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncAsyncRoundtripObj>();
     }
-    case 174: {
+    case 181: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncAsyncRoundtripString>();
     }
-    case 175: {
+    case 182: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncAsyncRoundtripU16>();
     }
-    case 176: {
+    case 183: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncAsyncRoundtripU32>();
     }
-    case 177: {
+    case 184: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncAsyncRoundtripU64>();
     }
-    case 178: {
+    case 185: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncAsyncRoundtripU8>();
     }
-    case 179: {
+    case 186: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncAsyncRoundtripVec>();
     }
-    case 180: {
+    case 187: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncAsyncThrowError>();
     }
-    case 189: {
+    case 196: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeAsyncTestTraitInterfaceGetValue>();
     }
-    case 190: {
+    case 197: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeAsyncTestTraitInterfaceNoop>();
     }
-    case 191: {
+    case 198: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeAsyncTestTraitInterfaceSetValue>();
     }
-    case 192: {
+    case 199: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeAsyncTestTraitInterfaceThrowIfEqual>();
     }
-    case 193: {
+    case 200: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestAsyncCallbackInterfaceGetValue>();
     }
-    case 194: {
+    case 201: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestAsyncCallbackInterfaceNoop>();
     }
-    case 195: {
+    case 202: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestAsyncCallbackInterfaceSetValue>();
     }
-    case 196: {
+    case 203: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnFuncInvokeTestAsyncCallbackInterfaceThrowIfEqual>();
     }
-    case 238: {
+    case 249: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodAsyncinterfaceName>();
     }
-    case 239: {
+    case 250: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodAsynctesttraitinterfaceNoop>();
     }
-    case 240: {
+    case 251: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodAsynctesttraitinterfaceGetValue>();
     }
-    case 241: {
+    case 252: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodAsynctesttraitinterfaceSetValue>();
     }
-    case 242: {
+    case 253: {
       return MakeUnique<ScaffoldingCallHandlerUniffiUniffiBindingsTestsFnMethodAsynctesttraitinterfaceThrowIfEqual>();
     }
 #endif /* MOZ_UNIFFI_FIXTURES */
@@ -15456,18 +15797,26 @@ extern "C" void callback_interface_context_id_context_id_callback_rotated(
   AsyncCallbackMethodHandlerBase::ScheduleAsyncCall(std::move(handler), &gUniffiCallbackHandlerContextIdContextIdCallback);
 }
 
-extern "C" void callback_free_context_id_context_id_callback(uint64_t uniffiHandle) {
+extern "C" void callback_free_context_id_context_id_callback(uint64_t aUniffiHandle) {
+  if (CallbackHandleRelease(aUniffiHandle) == 0) {
    // Callback object handles are keys in a map stored in the JS handler. To
    // handle the free call, schedule a fire-and-forget JS call to remove the key.
    AsyncCallbackMethodHandlerBase::ScheduleAsyncCall(
-      MakeUnique<CallbackFreeHandler>("ContextIdCallback.uniffi_free", uniffiHandle),
+      MakeUnique<CallbackFreeHandler>("ContextIdCallback.uniffi_free", aUniffiHandle),
       &gUniffiCallbackHandlerContextIdContextIdCallback);
+  }
+}
+
+extern "C" uint64_t callback_clone_context_id_context_id_callback(uint64_t aUniffiHandle) {
+  CallbackHandleAddRef(aUniffiHandle);
+  return aUniffiHandle;
 }
 
 static VTableCallbackInterfaceContextIdContextIdCallback kUniffiVtableContextIdContextIdCallback {
+  callback_free_context_id_context_id_callback,
+  callback_clone_context_id_context_id_callback,
   callback_interface_context_id_context_id_callback_persist,
   callback_interface_context_id_context_id_callback_rotated,
-  callback_free_context_id_context_id_callback
 };
 static StaticRefPtr<dom::UniFFICallbackHandler> gUniffiCallbackHandlerLoginsEncryptorDecryptor;
 /**
@@ -15569,18 +15918,26 @@ extern "C" void callback_interface_logins_encryptor_decryptor_encrypt(
   *aUniffiOutReturn = CallbackLowerReturnRustBuffer::Lower(callResult, aUniffiOutStatus, error);
   }
 
-extern "C" void callback_free_logins_encryptor_decryptor(uint64_t uniffiHandle) {
+extern "C" void callback_free_logins_encryptor_decryptor(uint64_t aUniffiHandle) {
+  if (CallbackHandleRelease(aUniffiHandle) == 0) {
    // Callback object handles are keys in a map stored in the JS handler. To
    // handle the free call, schedule a fire-and-forget JS call to remove the key.
    AsyncCallbackMethodHandlerBase::ScheduleAsyncCall(
-      MakeUnique<CallbackFreeHandler>("EncryptorDecryptor.uniffi_free", uniffiHandle),
+      MakeUnique<CallbackFreeHandler>("EncryptorDecryptor.uniffi_free", aUniffiHandle),
       &gUniffiCallbackHandlerLoginsEncryptorDecryptor);
+  }
+}
+
+extern "C" uint64_t callback_clone_logins_encryptor_decryptor(uint64_t aUniffiHandle) {
+  CallbackHandleAddRef(aUniffiHandle);
+  return aUniffiHandle;
 }
 
 static VTableCallbackInterfaceLoginsEncryptorDecryptor kUniffiVtableLoginsEncryptorDecryptor {
+  callback_free_logins_encryptor_decryptor,
+  callback_clone_logins_encryptor_decryptor,
   callback_interface_logins_encryptor_decryptor_decrypt,
   callback_interface_logins_encryptor_decryptor_encrypt,
-  callback_free_logins_encryptor_decryptor
 };
 static StaticRefPtr<dom::UniFFICallbackHandler> gUniffiCallbackHandlerLoginsKeyManager;
 /**
@@ -15624,17 +15981,25 @@ extern "C" void callback_interface_logins_key_manager_get_key(
   *aUniffiOutReturn = CallbackLowerReturnRustBuffer::Lower(callResult, aUniffiOutStatus, error);
   }
 
-extern "C" void callback_free_logins_key_manager(uint64_t uniffiHandle) {
+extern "C" void callback_free_logins_key_manager(uint64_t aUniffiHandle) {
+  if (CallbackHandleRelease(aUniffiHandle) == 0) {
    // Callback object handles are keys in a map stored in the JS handler. To
    // handle the free call, schedule a fire-and-forget JS call to remove the key.
    AsyncCallbackMethodHandlerBase::ScheduleAsyncCall(
-      MakeUnique<CallbackFreeHandler>("KeyManager.uniffi_free", uniffiHandle),
+      MakeUnique<CallbackFreeHandler>("KeyManager.uniffi_free", aUniffiHandle),
       &gUniffiCallbackHandlerLoginsKeyManager);
+  }
+}
+
+extern "C" uint64_t callback_clone_logins_key_manager(uint64_t aUniffiHandle) {
+  CallbackHandleAddRef(aUniffiHandle);
+  return aUniffiHandle;
 }
 
 static VTableCallbackInterfaceLoginsKeyManager kUniffiVtableLoginsKeyManager {
+  callback_free_logins_key_manager,
+  callback_clone_logins_key_manager,
   callback_interface_logins_key_manager_get_key,
-  callback_free_logins_key_manager
 };
 static StaticRefPtr<dom::UniFFICallbackHandler> gUniffiCallbackHandlerLoginsPrimaryPasswordAuthenticator;
 /**
@@ -15707,7 +16072,7 @@ extern "C" void callback_interface_logins_primary_password_authenticator_get_pri
   // This can be used to detected when the future is dropped from the Rust side and cancel the
   // async task on the foreign side.  However, there's no way to do that in JS, so we just ignore
   // it.
-  ForeignFuture *aUniffiOutForeignFuture
+  ForeignFutureDroppedCallbackStruct *aUniffiOutForeignFuture
 ) {
   UniquePtr<AsyncCallbackMethodHandlerBase> handler = MakeUnique<CallbackInterfaceMethodLoginsPrimaryPasswordAuthenticatorGetPrimaryPassword>(
         aUniffiHandle,
@@ -15786,7 +16151,7 @@ extern "C" void callback_interface_logins_primary_password_authenticator_on_auth
   // This can be used to detected when the future is dropped from the Rust side and cancel the
   // async task on the foreign side.  However, there's no way to do that in JS, so we just ignore
   // it.
-  ForeignFuture *aUniffiOutForeignFuture
+  ForeignFutureDroppedCallbackStruct *aUniffiOutForeignFuture
 ) {
   UniquePtr<AsyncCallbackMethodHandlerBase> handler = MakeUnique<CallbackInterfaceMethodLoginsPrimaryPasswordAuthenticatorOnAuthenticationSuccess>(
         aUniffiHandle,
@@ -15865,7 +16230,7 @@ extern "C" void callback_interface_logins_primary_password_authenticator_on_auth
   // This can be used to detected when the future is dropped from the Rust side and cancel the
   // async task on the foreign side.  However, there's no way to do that in JS, so we just ignore
   // it.
-  ForeignFuture *aUniffiOutForeignFuture
+  ForeignFutureDroppedCallbackStruct *aUniffiOutForeignFuture
 ) {
   UniquePtr<AsyncCallbackMethodHandlerBase> handler = MakeUnique<CallbackInterfaceMethodLoginsPrimaryPasswordAuthenticatorOnAuthenticationFailure>(
         aUniffiHandle,
@@ -15875,19 +16240,27 @@ extern "C" void callback_interface_logins_primary_password_authenticator_on_auth
   AsyncCallbackMethodHandlerBase::ScheduleAsyncCall(std::move(handler), &gUniffiCallbackHandlerLoginsPrimaryPasswordAuthenticator);
 }
 
-extern "C" void callback_free_logins_primary_password_authenticator(uint64_t uniffiHandle) {
+extern "C" void callback_free_logins_primary_password_authenticator(uint64_t aUniffiHandle) {
+  if (CallbackHandleRelease(aUniffiHandle) == 0) {
    // Callback object handles are keys in a map stored in the JS handler. To
    // handle the free call, schedule a fire-and-forget JS call to remove the key.
    AsyncCallbackMethodHandlerBase::ScheduleAsyncCall(
-      MakeUnique<CallbackFreeHandler>("PrimaryPasswordAuthenticator.uniffi_free", uniffiHandle),
+      MakeUnique<CallbackFreeHandler>("PrimaryPasswordAuthenticator.uniffi_free", aUniffiHandle),
       &gUniffiCallbackHandlerLoginsPrimaryPasswordAuthenticator);
+  }
+}
+
+extern "C" uint64_t callback_clone_logins_primary_password_authenticator(uint64_t aUniffiHandle) {
+  CallbackHandleAddRef(aUniffiHandle);
+  return aUniffiHandle;
 }
 
 static VTableCallbackInterfaceLoginsPrimaryPasswordAuthenticator kUniffiVtableLoginsPrimaryPasswordAuthenticator {
+  callback_free_logins_primary_password_authenticator,
+  callback_clone_logins_primary_password_authenticator,
   callback_interface_logins_primary_password_authenticator_get_primary_password,
   callback_interface_logins_primary_password_authenticator_on_authentication_success,
   callback_interface_logins_primary_password_authenticator_on_authentication_failure,
-  callback_free_logins_primary_password_authenticator
 };
 static StaticRefPtr<dom::UniFFICallbackHandler> gUniffiCallbackHandlerTracingEventSink;
 /**
@@ -15946,17 +16319,25 @@ extern "C" void callback_interface_tracing_event_sink_on_event(
   AsyncCallbackMethodHandlerBase::ScheduleAsyncCall(std::move(handler), &gUniffiCallbackHandlerTracingEventSink);
 }
 
-extern "C" void callback_free_tracing_event_sink(uint64_t uniffiHandle) {
+extern "C" void callback_free_tracing_event_sink(uint64_t aUniffiHandle) {
+  if (CallbackHandleRelease(aUniffiHandle) == 0) {
    // Callback object handles are keys in a map stored in the JS handler. To
    // handle the free call, schedule a fire-and-forget JS call to remove the key.
    AsyncCallbackMethodHandlerBase::ScheduleAsyncCall(
-      MakeUnique<CallbackFreeHandler>("EventSink.uniffi_free", uniffiHandle),
+      MakeUnique<CallbackFreeHandler>("EventSink.uniffi_free", aUniffiHandle),
       &gUniffiCallbackHandlerTracingEventSink);
+  }
+}
+
+extern "C" uint64_t callback_clone_tracing_event_sink(uint64_t aUniffiHandle) {
+  CallbackHandleAddRef(aUniffiHandle);
+  return aUniffiHandle;
 }
 
 static VTableCallbackInterfaceTracingEventSink kUniffiVtableTracingEventSink {
+  callback_free_tracing_event_sink,
+  callback_clone_tracing_event_sink,
   callback_interface_tracing_event_sink_on_event,
-  callback_free_tracing_event_sink
 };
 static StaticRefPtr<dom::UniFFICallbackHandler> gUniffiCallbackHandlerViaductBackend;
 /**
@@ -16045,7 +16426,7 @@ extern "C" void callback_interface_viaduct_backend_send_request(
   // This can be used to detected when the future is dropped from the Rust side and cancel the
   // async task on the foreign side.  However, there's no way to do that in JS, so we just ignore
   // it.
-  ForeignFuture *aUniffiOutForeignFuture
+  ForeignFutureDroppedCallbackStruct *aUniffiOutForeignFuture
 ) {
   UniquePtr<AsyncCallbackMethodHandlerBase> handler = MakeUnique<CallbackInterfaceMethodViaductBackendSendRequest>(
         aUniffiHandle,
@@ -16057,17 +16438,25 @@ extern "C" void callback_interface_viaduct_backend_send_request(
   AsyncCallbackMethodHandlerBase::ScheduleAsyncCall(std::move(handler), &gUniffiCallbackHandlerViaductBackend);
 }
 
-extern "C" void callback_free_viaduct_backend(uint64_t uniffiHandle) {
+extern "C" void callback_free_viaduct_backend(uint64_t aUniffiHandle) {
+  if (CallbackHandleRelease(aUniffiHandle) == 0) {
    // Callback object handles are keys in a map stored in the JS handler. To
    // handle the free call, schedule a fire-and-forget JS call to remove the key.
    AsyncCallbackMethodHandlerBase::ScheduleAsyncCall(
-      MakeUnique<CallbackFreeHandler>("Backend.uniffi_free", uniffiHandle),
+      MakeUnique<CallbackFreeHandler>("Backend.uniffi_free", aUniffiHandle),
       &gUniffiCallbackHandlerViaductBackend);
+  }
+}
+
+extern "C" uint64_t callback_clone_viaduct_backend(uint64_t aUniffiHandle) {
+  CallbackHandleAddRef(aUniffiHandle);
+  return aUniffiHandle;
 }
 
 static VTableCallbackInterfaceViaductBackend kUniffiVtableViaductBackend {
+  callback_free_viaduct_backend,
+  callback_clone_viaduct_backend,
   callback_interface_viaduct_backend_send_request,
-  callback_free_viaduct_backend
 };
 
 #ifdef MOZ_UNIFFI_FIXTURES
@@ -16142,7 +16531,7 @@ extern "C" void callback_interface_uniffi_bindings_tests_test_async_callback_int
   // This can be used to detected when the future is dropped from the Rust side and cancel the
   // async task on the foreign side.  However, there's no way to do that in JS, so we just ignore
   // it.
-  ForeignFuture *aUniffiOutForeignFuture
+  ForeignFutureDroppedCallbackStruct *aUniffiOutForeignFuture
 ) {
   UniquePtr<AsyncCallbackMethodHandlerBase> handler = MakeUnique<CallbackInterfaceMethodUniffiBindingsTestsTestAsyncCallbackInterfaceNoop>(
         aUniffiHandle,
@@ -16221,7 +16610,7 @@ extern "C" void callback_interface_uniffi_bindings_tests_test_async_callback_int
   // This can be used to detected when the future is dropped from the Rust side and cancel the
   // async task on the foreign side.  However, there's no way to do that in JS, so we just ignore
   // it.
-  ForeignFuture *aUniffiOutForeignFuture
+  ForeignFutureDroppedCallbackStruct *aUniffiOutForeignFuture
 ) {
   UniquePtr<AsyncCallbackMethodHandlerBase> handler = MakeUnique<CallbackInterfaceMethodUniffiBindingsTestsTestAsyncCallbackInterfaceGetValue>(
         aUniffiHandle,
@@ -16308,7 +16697,7 @@ extern "C" void callback_interface_uniffi_bindings_tests_test_async_callback_int
   // This can be used to detected when the future is dropped from the Rust side and cancel the
   // async task on the foreign side.  However, there's no way to do that in JS, so we just ignore
   // it.
-  ForeignFuture *aUniffiOutForeignFuture
+  ForeignFutureDroppedCallbackStruct *aUniffiOutForeignFuture
 ) {
   UniquePtr<AsyncCallbackMethodHandlerBase> handler = MakeUnique<CallbackInterfaceMethodUniffiBindingsTestsTestAsyncCallbackInterfaceSetValue>(
         aUniffiHandle,
@@ -16396,7 +16785,7 @@ extern "C" void callback_interface_uniffi_bindings_tests_test_async_callback_int
   // This can be used to detected when the future is dropped from the Rust side and cancel the
   // async task on the foreign side.  However, there's no way to do that in JS, so we just ignore
   // it.
-  ForeignFuture *aUniffiOutForeignFuture
+  ForeignFutureDroppedCallbackStruct *aUniffiOutForeignFuture
 ) {
   UniquePtr<AsyncCallbackMethodHandlerBase> handler = MakeUnique<CallbackInterfaceMethodUniffiBindingsTestsTestAsyncCallbackInterfaceThrowIfEqual>(
         aUniffiHandle,
@@ -16407,20 +16796,28 @@ extern "C" void callback_interface_uniffi_bindings_tests_test_async_callback_int
   AsyncCallbackMethodHandlerBase::ScheduleAsyncCall(std::move(handler), &gUniffiCallbackHandlerUniffiBindingsTestsTestAsyncCallbackInterface);
 }
 
-extern "C" void callback_free_uniffi_bindings_tests_test_async_callback_interface(uint64_t uniffiHandle) {
+extern "C" void callback_free_uniffi_bindings_tests_test_async_callback_interface(uint64_t aUniffiHandle) {
+  if (CallbackHandleRelease(aUniffiHandle) == 0) {
    // Callback object handles are keys in a map stored in the JS handler. To
    // handle the free call, schedule a fire-and-forget JS call to remove the key.
    AsyncCallbackMethodHandlerBase::ScheduleAsyncCall(
-      MakeUnique<CallbackFreeHandler>("TestAsyncCallbackInterface.uniffi_free", uniffiHandle),
+      MakeUnique<CallbackFreeHandler>("TestAsyncCallbackInterface.uniffi_free", aUniffiHandle),
       &gUniffiCallbackHandlerUniffiBindingsTestsTestAsyncCallbackInterface);
+  }
+}
+
+extern "C" uint64_t callback_clone_uniffi_bindings_tests_test_async_callback_interface(uint64_t aUniffiHandle) {
+  CallbackHandleAddRef(aUniffiHandle);
+  return aUniffiHandle;
 }
 
 static VTableCallbackInterfaceUniffiBindingsTestsTestAsyncCallbackInterface kUniffiVtableUniffiBindingsTestsTestAsyncCallbackInterface {
+  callback_free_uniffi_bindings_tests_test_async_callback_interface,
+  callback_clone_uniffi_bindings_tests_test_async_callback_interface,
   callback_interface_uniffi_bindings_tests_test_async_callback_interface_noop,
   callback_interface_uniffi_bindings_tests_test_async_callback_interface_get_value,
   callback_interface_uniffi_bindings_tests_test_async_callback_interface_set_value,
   callback_interface_uniffi_bindings_tests_test_async_callback_interface_throw_if_equal,
-  callback_free_uniffi_bindings_tests_test_async_callback_interface
 };
 static StaticRefPtr<dom::UniFFICallbackHandler> gUniffiCallbackHandlerUniffiBindingsTestsTestCallbackInterface;
 /**
@@ -16602,20 +16999,28 @@ extern "C" void callback_interface_uniffi_bindings_tests_test_callback_interface
   *aUniffiOutReturn = CallbackLowerReturnRustBuffer::Lower(callResult, aUniffiOutStatus, error);
   }
 
-extern "C" void callback_free_uniffi_bindings_tests_test_callback_interface(uint64_t uniffiHandle) {
+extern "C" void callback_free_uniffi_bindings_tests_test_callback_interface(uint64_t aUniffiHandle) {
+  if (CallbackHandleRelease(aUniffiHandle) == 0) {
    // Callback object handles are keys in a map stored in the JS handler. To
    // handle the free call, schedule a fire-and-forget JS call to remove the key.
    AsyncCallbackMethodHandlerBase::ScheduleAsyncCall(
-      MakeUnique<CallbackFreeHandler>("TestCallbackInterface.uniffi_free", uniffiHandle),
+      MakeUnique<CallbackFreeHandler>("TestCallbackInterface.uniffi_free", aUniffiHandle),
       &gUniffiCallbackHandlerUniffiBindingsTestsTestCallbackInterface);
+  }
+}
+
+extern "C" uint64_t callback_clone_uniffi_bindings_tests_test_callback_interface(uint64_t aUniffiHandle) {
+  CallbackHandleAddRef(aUniffiHandle);
+  return aUniffiHandle;
 }
 
 static VTableCallbackInterfaceUniffiBindingsTestsTestCallbackInterface kUniffiVtableUniffiBindingsTestsTestCallbackInterface {
+  callback_free_uniffi_bindings_tests_test_callback_interface,
+  callback_clone_uniffi_bindings_tests_test_callback_interface,
   callback_interface_uniffi_bindings_tests_test_callback_interface_noop,
   callback_interface_uniffi_bindings_tests_test_callback_interface_get_value,
   callback_interface_uniffi_bindings_tests_test_callback_interface_set_value,
   callback_interface_uniffi_bindings_tests_test_callback_interface_throw_if_equal,
-  callback_free_uniffi_bindings_tests_test_callback_interface
 };
 static StaticRefPtr<dom::UniFFICallbackHandler> gUniffiCallbackHandlerUniffiBindingsTestsAsyncTestTraitInterface;
 /**
@@ -16688,7 +17093,7 @@ extern "C" void callback_interface_uniffi_bindings_tests_async_test_trait_interf
   // This can be used to detected when the future is dropped from the Rust side and cancel the
   // async task on the foreign side.  However, there's no way to do that in JS, so we just ignore
   // it.
-  ForeignFuture *aUniffiOutForeignFuture
+  ForeignFutureDroppedCallbackStruct *aUniffiOutForeignFuture
 ) {
   UniquePtr<AsyncCallbackMethodHandlerBase> handler = MakeUnique<CallbackInterfaceMethodUniffiBindingsTestsAsyncTestTraitInterfaceNoop>(
         aUniffiHandle,
@@ -16767,7 +17172,7 @@ extern "C" void callback_interface_uniffi_bindings_tests_async_test_trait_interf
   // This can be used to detected when the future is dropped from the Rust side and cancel the
   // async task on the foreign side.  However, there's no way to do that in JS, so we just ignore
   // it.
-  ForeignFuture *aUniffiOutForeignFuture
+  ForeignFutureDroppedCallbackStruct *aUniffiOutForeignFuture
 ) {
   UniquePtr<AsyncCallbackMethodHandlerBase> handler = MakeUnique<CallbackInterfaceMethodUniffiBindingsTestsAsyncTestTraitInterfaceGetValue>(
         aUniffiHandle,
@@ -16854,7 +17259,7 @@ extern "C" void callback_interface_uniffi_bindings_tests_async_test_trait_interf
   // This can be used to detected when the future is dropped from the Rust side and cancel the
   // async task on the foreign side.  However, there's no way to do that in JS, so we just ignore
   // it.
-  ForeignFuture *aUniffiOutForeignFuture
+  ForeignFutureDroppedCallbackStruct *aUniffiOutForeignFuture
 ) {
   UniquePtr<AsyncCallbackMethodHandlerBase> handler = MakeUnique<CallbackInterfaceMethodUniffiBindingsTestsAsyncTestTraitInterfaceSetValue>(
         aUniffiHandle,
@@ -16942,7 +17347,7 @@ extern "C" void callback_interface_uniffi_bindings_tests_async_test_trait_interf
   // This can be used to detected when the future is dropped from the Rust side and cancel the
   // async task on the foreign side.  However, there's no way to do that in JS, so we just ignore
   // it.
-  ForeignFuture *aUniffiOutForeignFuture
+  ForeignFutureDroppedCallbackStruct *aUniffiOutForeignFuture
 ) {
   UniquePtr<AsyncCallbackMethodHandlerBase> handler = MakeUnique<CallbackInterfaceMethodUniffiBindingsTestsAsyncTestTraitInterfaceThrowIfEqual>(
         aUniffiHandle,
@@ -16953,20 +17358,28 @@ extern "C" void callback_interface_uniffi_bindings_tests_async_test_trait_interf
   AsyncCallbackMethodHandlerBase::ScheduleAsyncCall(std::move(handler), &gUniffiCallbackHandlerUniffiBindingsTestsAsyncTestTraitInterface);
 }
 
-extern "C" void callback_free_uniffi_bindings_tests_async_test_trait_interface(uint64_t uniffiHandle) {
+extern "C" void callback_free_uniffi_bindings_tests_async_test_trait_interface(uint64_t aUniffiHandle) {
+  if (CallbackHandleRelease(aUniffiHandle) == 0) {
    // Callback object handles are keys in a map stored in the JS handler. To
    // handle the free call, schedule a fire-and-forget JS call to remove the key.
    AsyncCallbackMethodHandlerBase::ScheduleAsyncCall(
-      MakeUnique<CallbackFreeHandler>("AsyncTestTraitInterface.uniffi_free", uniffiHandle),
+      MakeUnique<CallbackFreeHandler>("AsyncTestTraitInterface.uniffi_free", aUniffiHandle),
       &gUniffiCallbackHandlerUniffiBindingsTestsAsyncTestTraitInterface);
+  }
+}
+
+extern "C" uint64_t callback_clone_uniffi_bindings_tests_async_test_trait_interface(uint64_t aUniffiHandle) {
+  CallbackHandleAddRef(aUniffiHandle);
+  return aUniffiHandle;
 }
 
 static VTableCallbackInterfaceUniffiBindingsTestsAsyncTestTraitInterface kUniffiVtableUniffiBindingsTestsAsyncTestTraitInterface {
+  callback_free_uniffi_bindings_tests_async_test_trait_interface,
+  callback_clone_uniffi_bindings_tests_async_test_trait_interface,
   callback_interface_uniffi_bindings_tests_async_test_trait_interface_noop,
   callback_interface_uniffi_bindings_tests_async_test_trait_interface_get_value,
   callback_interface_uniffi_bindings_tests_async_test_trait_interface_set_value,
   callback_interface_uniffi_bindings_tests_async_test_trait_interface_throw_if_equal,
-  callback_free_uniffi_bindings_tests_async_test_trait_interface
 };
 static StaticRefPtr<dom::UniFFICallbackHandler> gUniffiCallbackHandlerUniffiBindingsTestsTestTraitInterface;
 /**
@@ -17148,20 +17561,28 @@ extern "C" void callback_interface_uniffi_bindings_tests_test_trait_interface_th
   *aUniffiOutReturn = CallbackLowerReturnRustBuffer::Lower(callResult, aUniffiOutStatus, error);
   }
 
-extern "C" void callback_free_uniffi_bindings_tests_test_trait_interface(uint64_t uniffiHandle) {
+extern "C" void callback_free_uniffi_bindings_tests_test_trait_interface(uint64_t aUniffiHandle) {
+  if (CallbackHandleRelease(aUniffiHandle) == 0) {
    // Callback object handles are keys in a map stored in the JS handler. To
    // handle the free call, schedule a fire-and-forget JS call to remove the key.
    AsyncCallbackMethodHandlerBase::ScheduleAsyncCall(
-      MakeUnique<CallbackFreeHandler>("TestTraitInterface.uniffi_free", uniffiHandle),
+      MakeUnique<CallbackFreeHandler>("TestTraitInterface.uniffi_free", aUniffiHandle),
       &gUniffiCallbackHandlerUniffiBindingsTestsTestTraitInterface);
+  }
+}
+
+extern "C" uint64_t callback_clone_uniffi_bindings_tests_test_trait_interface(uint64_t aUniffiHandle) {
+  CallbackHandleAddRef(aUniffiHandle);
+  return aUniffiHandle;
 }
 
 static VTableCallbackInterfaceUniffiBindingsTestsTestTraitInterface kUniffiVtableUniffiBindingsTestsTestTraitInterface {
+  callback_free_uniffi_bindings_tests_test_trait_interface,
+  callback_clone_uniffi_bindings_tests_test_trait_interface,
   callback_interface_uniffi_bindings_tests_test_trait_interface_noop,
   callback_interface_uniffi_bindings_tests_test_trait_interface_get_value,
   callback_interface_uniffi_bindings_tests_test_trait_interface_set_value,
   callback_interface_uniffi_bindings_tests_test_trait_interface_throw_if_equal,
-  callback_free_uniffi_bindings_tests_test_trait_interface
 };
 static StaticRefPtr<dom::UniFFICallbackHandler> gUniffiCallbackHandlerUniffiBindingsTestsCollisionTestCallbackInterface;
 /**
@@ -17212,17 +17633,25 @@ extern "C" void callback_interface_uniffi_bindings_tests_collision_test_callback
   AsyncCallbackMethodHandlerBase::ScheduleAsyncCall(std::move(handler), &gUniffiCallbackHandlerUniffiBindingsTestsCollisionTestCallbackInterface);
 }
 
-extern "C" void callback_free_uniffi_bindings_tests_collision_test_callback_interface(uint64_t uniffiHandle) {
+extern "C" void callback_free_uniffi_bindings_tests_collision_test_callback_interface(uint64_t aUniffiHandle) {
+  if (CallbackHandleRelease(aUniffiHandle) == 0) {
    // Callback object handles are keys in a map stored in the JS handler. To
    // handle the free call, schedule a fire-and-forget JS call to remove the key.
    AsyncCallbackMethodHandlerBase::ScheduleAsyncCall(
-      MakeUnique<CallbackFreeHandler>("TestCallbackInterface.uniffi_free", uniffiHandle),
+      MakeUnique<CallbackFreeHandler>("TestCallbackInterface.uniffi_free", aUniffiHandle),
       &gUniffiCallbackHandlerUniffiBindingsTestsCollisionTestCallbackInterface);
+  }
+}
+
+extern "C" uint64_t callback_clone_uniffi_bindings_tests_collision_test_callback_interface(uint64_t aUniffiHandle) {
+  CallbackHandleAddRef(aUniffiHandle);
+  return aUniffiHandle;
 }
 
 static VTableCallbackInterfaceUniffiBindingsTestsCollisionTestCallbackInterface kUniffiVtableUniffiBindingsTestsCollisionTestCallbackInterface {
+  callback_free_uniffi_bindings_tests_collision_test_callback_interface,
+  callback_clone_uniffi_bindings_tests_collision_test_callback_interface,
   callback_interface_uniffi_bindings_tests_collision_test_callback_interface_get_value,
-  callback_free_uniffi_bindings_tests_collision_test_callback_interface
 };
 #endif /* MOZ_UNIFFI_FIXTURES */
 
diff --git a/toolkit/components/uniffi-js/PointerType.h b/toolkit/components/uniffi-js/PointerType.h
index f997cdb6e29ce..b402e578a7b69 100644
--- a/toolkit/components/uniffi-js/PointerType.h
+++ b/toolkit/components/uniffi-js/PointerType.h
@@ -22,9 +22,9 @@ namespace mozilla::uniffi {
 struct UniFFIPointerType {
   nsLiteralCString typeName;
   // Rust FFI function to clone for the pointer
-  void* (*clone)(void*, RustCallStatus*);
+  uint64_t (*clone)(uint64_t, RustCallStatus*);
   // Rust FFI function to destroy for the pointer
-  void (*destructor)(void*, RustCallStatus*);
+  void (*destructor)(uint64_t, RustCallStatus*);
 };
 }  // namespace mozilla::uniffi
 
diff --git a/toolkit/components/uniffi-js/UniFFIPointer.cpp b/toolkit/components/uniffi-js/UniFFIPointer.cpp
index f772b85f92570..8c888227a95f4 100644
--- a/toolkit/components/uniffi-js/UniFFIPointer.cpp
+++ b/toolkit/components/uniffi-js/UniFFIPointer.cpp
@@ -33,7 +33,7 @@ NS_INTERFACE_MAP_END
 
 // Static function
 already_AddRefed<UniFFIPointer> UniFFIPointer::Create(
-    void* aPtr, const UniFFIPointerType* aType) {
+    uint64_t aPtr, const UniFFIPointerType* aType) {
   RefPtr<UniFFIPointer> uniFFIPointer = new UniFFIPointer(aPtr, aType);
   return uniFFIPointer.forget();
 }
@@ -58,9 +58,8 @@ already_AddRefed<UniFFIPointer> UniFFIPointer::Read(
     return nullptr;
   }
 
-  // in Rust and Write(), a pointer is converted to a void* then written as u64
-  // BigEndian we do the reverse here
-  void* ptr = (void*)mozilla::BigEndian::readUint64(data_ptr);
+  // in Rust and Write(), pointers are always u64 BigEndian.
+  uint64_t ptr = mozilla::BigEndian::readUint64(data_ptr);
   return UniFFIPointer::Create(ptr, aType);
 }
 
@@ -85,7 +84,7 @@ void UniFFIPointer::Write(const ArrayBuffer& aArrayBuff, uint32_t aPosition,
   // unit tests.  Also, there's no way to protect against this in general since
   // if anything fails after writing a pointer to the array then the reference
   // will leak.
-  void* clone = ClonePtr();
+  uint64_t clone = ClonePtr();
   CheckedUint32 end = CheckedUint32(aPosition) + 8;
   if (!end.isValid() || !aArrayBuff.ProcessData([&](const Span<uint8_t>& aData,
                                                     JS::AutoCheckCannotGC&&) {
@@ -95,7 +94,7 @@ void UniFFIPointer::Write(const ArrayBuffer& aArrayBuff, uint32_t aPosition,
         // in Rust and Read(), a u64 is read as BigEndian and then converted to
         // a pointer we do the reverse here
         const auto& data_ptr = aData.Subspan(aPosition, 8);
-        mozilla::BigEndian::writeUint64(data_ptr.Elements(), (uint64_t)clone);
+        mozilla::BigEndian::writeUint64(data_ptr.Elements(), clone);
         return true;
       })) {
     aError.ThrowRangeError("position is out of range");
@@ -103,7 +102,7 @@ void UniFFIPointer::Write(const ArrayBuffer& aArrayBuff, uint32_t aPosition,
   }
 }
 
-UniFFIPointer::UniFFIPointer(void* aPtr, const UniFFIPointerType* aType) {
+UniFFIPointer::UniFFIPointer(uint64_t aPtr, const UniFFIPointerType* aType) {
   mPtr = aPtr;
   mType = aType;
 }
@@ -113,7 +112,7 @@ JSObject* UniFFIPointer::WrapObject(JSContext* aCx,
   return dom::UniFFIPointer_Binding::Wrap(aCx, this, aGivenProto);
 }
 
-void* UniFFIPointer::ClonePtr() const {
+uint64_t UniFFIPointer::ClonePtr() const {
   MOZ_LOG(gUniffiLogger, LogLevel::Info, ("[UniFFI] Cloning raw pointer"));
   RustCallStatus status{};
   auto cloned = this->mType->clone(this->mPtr, &status);
diff --git a/toolkit/components/uniffi-js/UniFFIPointer.h b/toolkit/components/uniffi-js/UniFFIPointer.h
index 40aa72a0a0320..2d12e96dc4351 100644
--- a/toolkit/components/uniffi-js/UniFFIPointer.h
+++ b/toolkit/components/uniffi-js/UniFFIPointer.h
@@ -22,14 +22,14 @@ class UniFFIPointer final : public nsISupports, public nsWrapperCache {
   NS_DECL_CYCLE_COLLECTION_WRAPPERCACHE_CLASS(UniFFIPointer)
 
   static already_AddRefed<UniFFIPointer> Create(
-      void* aPtr, const uniffi::UniFFIPointerType* aType);
+      uint64_t aPtr, const uniffi::UniFFIPointerType* aType);
   static already_AddRefed<UniFFIPointer> Read(
       const ArrayBuffer& aArrayBuff, uint32_t aPosition,
       const uniffi::UniFFIPointerType* aType, ErrorResult& aError);
   void Write(const ArrayBuffer& aArrayBuff, uint32_t aPosition,
              const uniffi::UniFFIPointerType* aType, ErrorResult& aError) const;
 
-  UniFFIPointer(void* aPtr, const uniffi::UniFFIPointerType* aType);
+  UniFFIPointer(uint64_t aPtr, const uniffi::UniFFIPointerType* aType);
 
   JSObject* WrapObject(JSContext* aCx,
                        JS::Handle<JSObject*> aGivenProto) override;
@@ -44,7 +44,7 @@ class UniFFIPointer final : public nsISupports, public nsWrapperCache {
    *   - When calling a method
    *   - When passing the object as an argument to a function
    */
-  void* ClonePtr() const;
+  uint64_t ClonePtr() const;
 
   /**
    * Returns true if the pointer type `this` holds is the same as the argument
@@ -55,7 +55,7 @@ class UniFFIPointer final : public nsISupports, public nsWrapperCache {
 
  private:
   const uniffi::UniFFIPointerType* mType;
-  void* mPtr;
+  uint64_t mPtr;
 
  protected:
   /**
diff --git a/toolkit/components/uniffi-js/UniFFIScaffolding.cpp b/toolkit/components/uniffi-js/UniFFIScaffolding.cpp
index b90e7727641f6..edb479b71afa7 100644
--- a/toolkit/components/uniffi-js/UniFFIScaffolding.cpp
+++ b/toolkit/components/uniffi-js/UniFFIScaffolding.cpp
@@ -128,4 +128,13 @@ void UniFFIScaffolding::DeregisterCallbackHandler(GlobalObject& aGlobal,
   uniffi::DeregisterCallbackHandler(aInterfaceId, aError);
 }
 
+uint64_t UniFFIScaffolding::CallbackHandleCreate(GlobalObject& aGlobal) {
+  return uniffi::CallbackHandleCreate();
+}
+
+uint32_t UniFFIScaffolding::CallbackHandleRelease(GlobalObject& aGlobal,
+                                                  uint64_t aHandle) {
+  return uniffi::CallbackHandleRelease(aHandle);
+}
+
 }  // namespace mozilla::dom
diff --git a/toolkit/components/uniffi-js/UniFFIScaffolding.h b/toolkit/components/uniffi-js/UniFFIScaffolding.h
index 1fd44e7462536..509efce9fa309 100644
--- a/toolkit/components/uniffi-js/UniFFIScaffolding.h
+++ b/toolkit/components/uniffi-js/UniFFIScaffolding.h
@@ -50,6 +50,10 @@ class UniFFIScaffolding {
   static void DeregisterCallbackHandler(GlobalObject& aGlobal,
                                         uint64_t interfaceId,
                                         ErrorResult& aError);
+
+  static uint64_t CallbackHandleCreate(GlobalObject& aGlobal);
+  static uint32_t CallbackHandleRelease(GlobalObject& aGlobal,
+                                        uint64_t aHandle);
 };
 
 }  // namespace mozilla::dom
diff --git a/toolkit/components/uniffi-js/js/UniFFI.sys.mjs b/toolkit/components/uniffi-js/js/UniFFI.sys.mjs
index e425a6d703f32..f7444504e74ca 100644
--- a/toolkit/components/uniffi-js/js/UniFFI.sys.mjs
+++ b/toolkit/components/uniffi-js/js/UniFFI.sys.mjs
@@ -229,6 +229,29 @@ export class ArrayBufferDataStream {
     );
     this.pos += 8;
   }
+
+  // Reads either a handle or pointer from the data stream
+  //
+  // This is used for trait interfaces, which can use either one.
+  // In both cases, the data is **always** 8 bytes long. That is enforced
+  // by the C++ and Rust Scaffolding code.
+  readHandleOrPointer(pointerId) {
+    // Try to read a handle from the data stream
+    let handleOrPointer = Number(this.dataView.getBigInt64(this.pos));
+
+    if ((handleOrPointer & 1) == 0) {
+      // Actually the buffer is storing a pointer at this point, read that instead
+      const ptr = UniFFIScaffolding.readPointer(
+        pointerId,
+        this.dataView.buffer,
+        this.pos
+      );
+      this.pos += 8;
+      return ptr;
+    }
+    this.pos += 8;
+    return handleOrPointer;
+  }
 }
 
 // Base class for FFI converters
@@ -669,7 +692,6 @@ export const constructUniffiObject = Symbol("constructUniffiObject");
 export class UniFFICallbackHandler {
   #name;
   #interfaceId;
-  #handleCounter;
   #handleMap;
   #methodHandlers;
   #allowNewCallbacks;
@@ -684,7 +706,6 @@ export class UniFFICallbackHandler {
   constructor(name, interfaceId, methodHandlers) {
     this.#name = name;
     this.#interfaceId = interfaceId;
-    this.#handleCounter = 0;
     this.#handleMap = new Map();
     this.#methodHandlers = methodHandlers;
     this.#allowNewCallbacks = true;
@@ -703,10 +724,7 @@ export class UniFFICallbackHandler {
     if (!this.#allowNewCallbacks) {
       throw new UniFFIError(`No new callbacks allowed for ${this.#name}`);
     }
-    // Increment first.  This way handles start at `1` and we can use `0` to represent a NULL
-    // handle.
-    this.#handleCounter += 1;
-    const handle = this.#handleCounter;
+    const handle = UniFFIScaffolding.callbackHandleCreate();
     this.#handleMap.set(
       handle,
       new UniFFICallbackHandleMapEntry(
@@ -720,10 +738,34 @@ export class UniFFICallbackHandler {
   /**
    * Get a previously stored callback object
    *
+   * This consumes the handle, decreasing it's refcount.
+   *
+   * @param {int} handle - Callback object handle, returned from `storeCallbackObj()`
+   * @returns {obj} - Callback object
+   */
+  takeCallbackObj(handle) {
+    const callbackObj = this.#handleMap.get(handle).callbackObj;
+    if (UniFFIScaffolding.callbackHandleRelease(handle) == 0) {
+      this.#handleMap.delete(handle);
+    }
+    if (callbackObj === undefined) {
+      throw new UniFFIError(
+        `${this.#name}: invalid callback handle id: ${handle}`
+      );
+    }
+    return callbackObj;
+  }
+
+  /**
+   * Borrow a previously stored callback object
+   *
+   * This does not consume the handle and keeps the refcount the same.
+   * The only time we use this is when lifting the receiver for a callback interface method.
+   *
    * @param {int} handle - Callback object handle, returned from `storeCallbackObj()`
    * @returns {obj} - Callback object
    */
-  getCallbackObj(handle) {
+  borrowCallbackObj(handle) {
     const callbackObj = this.#handleMap.get(handle).callbackObj;
     if (callbackObj === undefined) {
       throw new UniFFIError(
@@ -789,7 +831,7 @@ export class UniFFICallbackHandler {
    * @param {UniFFIScaffoldingValue[]} args - Arguments to pass to the method
    */
   callSync(handle, methodId, ...args) {
-    const callbackObj = this.getCallbackObj(handle);
+    const callbackObj = this.borrowCallbackObj(handle);
     const methodHandler = this.getMethodHandler(methodId);
     try {
       const returnValue = methodHandler.call(callbackObj, args);
@@ -807,7 +849,7 @@ export class UniFFICallbackHandler {
    * @param {UniFFIScaffoldingValue[]} args - Arguments to pass to the method
    */
   async callAsync(handle, methodId, ...args) {
-    const callbackObj = this.getCallbackObj(handle);
+    const callbackObj = this.borrowCallbackObj(handle);
     const methodHandler = this.getMethodHandler(methodId);
     try {
       const returnValue = await methodHandler.call(callbackObj, args);

From 71f561e8e364e6415a828043ed37dbe7e9b5a80f Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Thu, 29 Jan 2026 15:03:19 +0000
Subject: [PATCH 078/116] Bug 2007857 (part 3) - vendor rust. r=bdk

Differential Revision: https://phabricator.services.mozilla.com/D280549
---
 .cargo/config.toml.in                         |    4 +-
 Cargo.lock                                    |   52 +-
 third_party/rust/askama/.cargo-checksum.json  |    2 +-
 third_party/rust/askama/.cargo_vcs_info.json  |    2 +-
 third_party/rust/askama/Cargo.lock            |   36 +-
 third_party/rust/askama/Cargo.toml            |    8 +-
 third_party/rust/askama/Cargo.toml.orig       |    8 +-
 third_party/rust/askama/clippy.toml           |    2 +-
 third_party/rust/askama/src/filters/alloc.rs  |  786 +++++--
 .../rust/askama/src/filters/builtin.rs        |   21 +-
 third_party/rust/askama/src/filters/escape.rs |  195 +-
 .../rust/askama/src/filters/humansize.rs      |   16 +-
 third_party/rust/askama/src/filters/json.rs   |  102 +-
 third_party/rust/askama/src/filters/mod.rs    |   14 +-
 third_party/rust/askama/src/filters/std.rs    |   63 +
 .../rust/askama/src/filters/urlencode.rs      |   11 +-
 third_party/rust/askama/src/helpers.rs        |   26 +-
 third_party/rust/askama/src/lib.rs            |  201 +-
 .../rust/askama_derive/.cargo-checksum.json   |    2 +-
 .../rust/askama_derive/.cargo_vcs_info.json   |    2 +-
 third_party/rust/askama_derive/Cargo.lock     |   24 +-
 third_party/rust/askama_derive/Cargo.toml     |    6 +-
 .../rust/askama_derive/Cargo.toml.orig        |    6 +-
 third_party/rust/askama_derive/clippy.toml    |    2 +-
 .../rust/askama_derive/src/generator.rs       |   11 +-
 .../rust/askama_derive/src/generator/expr.rs  |  625 +----
 .../askama_derive/src/generator/filter.rs     |  928 ++++++++
 .../rust/askama_derive/src/generator/node.rs  |   27 +-
 .../rust/askama_derive/src/integration.rs     |   10 +-
 third_party/rust/askama_derive/src/lib.rs     |   19 -
 third_party/rust/askama_derive/src/tests.rs   |   10 +-
 .../rust/askama_parser/.cargo-checksum.json   |    2 +-
 .../rust/askama_parser/.cargo_vcs_info.json   |    2 +-
 third_party/rust/askama_parser/Cargo.lock     |   36 +-
 third_party/rust/askama_parser/Cargo.toml     |    4 +-
 .../rust/askama_parser/Cargo.toml.orig        |    4 +-
 third_party/rust/askama_parser/clippy.toml    |    2 +-
 third_party/rust/askama_parser/src/expr.rs    |   10 +-
 third_party/rust/askama_parser/src/lib.rs     |    4 +-
 .../rust/context_id/.cargo-checksum.json      |    2 +-
 third_party/rust/context_id/Cargo.toml        |    4 +-
 .../rust/error-support/.cargo-checksum.json   |    2 +-
 third_party/rust/error-support/Cargo.toml     |    4 +-
 .../rust/error-support/src/error_tracing.rs   |  117 +-
 .../rust/filter_adult/.cargo-checksum.json    |    2 +-
 third_party/rust/filter_adult/Cargo.toml      |    2 +-
 .../rust/glean-core/.cargo-checksum.json      |    2 +-
 .../rust/glean-core/.cargo_vcs_info.json      |    2 +-
 third_party/rust/glean-core/Cargo.lock        |  174 +-
 third_party/rust/glean-core/Cargo.toml        |   55 +-
 third_party/rust/glean-core/Cargo.toml.orig   |   20 +-
 .../rust/glean-core/benches/dispatcher.rs     |  111 -
 .../rust/glean-core/src/event_database/mod.rs |   62 +
 .../rust/glean-core/src/internal_metrics.rs   |   17 +-
 .../rust/glean-core/tests/common/mod.rs       |   23 -
 third_party/rust/glean-core/tests/docs.rs     |  111 +
 .../rust/glean-core/tests/ping_maker.rs       |    4 +-
 third_party/rust/glean/.cargo-checksum.json   |    2 +-
 third_party/rust/glean/.cargo_vcs_info.json   |    2 +-
 third_party/rust/glean/Cargo.lock             |  124 +-
 third_party/rust/glean/Cargo.toml             |   27 +-
 third_party/rust/glean/Cargo.toml.orig        |    6 +-
 .../init_rust_components/.cargo-checksum.json |    2 +-
 .../rust/init_rust_components/Cargo.toml      |    2 +-
 .../interrupt-support/.cargo-checksum.json    |    2 +-
 third_party/rust/interrupt-support/Cargo.toml |    4 +-
 third_party/rust/logins/.cargo-checksum.json  |    2 +-
 third_party/rust/logins/Cargo.toml            |    4 +-
 third_party/rust/logins/src/db.rs             |  267 ++-
 third_party/rust/logins/src/encryption.rs     |    2 +
 third_party/rust/logins/src/error.rs          |    3 +
 third_party/rust/logins/src/login.rs          |   18 +
 third_party/rust/logins/src/logins.udl        |   36 +-
 third_party/rust/logins/src/schema.rs         |  154 +-
 third_party/rust/logins/src/store.rs          |   31 +
 third_party/rust/logins/src/sync/engine.rs    |    2 +-
 third_party/rust/logins/src/sync/merge.rs     |    4 +-
 third_party/rust/logins/src/sync/payload.rs   |   26 +
 .../rust/logins/src/sync/update_plan.rs       |    4 +-
 third_party/rust/nss/.cargo-checksum.json     |    2 +-
 .../rust/nss/fixtures/profile/logins.db       |  Bin 40960 -> 40960 bytes
 .../rust/relevancy/.cargo-checksum.json       |    2 +-
 third_party/rust/relevancy/Cargo.toml         |    4 +-
 .../rust/remote_settings/.cargo-checksum.json |    2 +-
 third_party/rust/remote_settings/Cargo.toml   |    4 +-
 .../7bbe6c5c-fdb8-2845-a4f4-e1382e708a0e      |  Bin 5430 -> 0 bytes
 ...6c5c-fdb8-2845-a4f4-e1382e708a0e.meta.json |    5 -
 .../95ed201d-4ab8-4cb8-831d-454f53cab0f8      |  Bin 1357 -> 0 bytes
 ...201d-4ab8-4cb8-831d-454f53cab0f8.meta.json |    5 -
 .../dumps/main/regions.timestamp              |    1 +
 .../dumps/main/search-config-icons.json       |   36 +-
 .../dumps/main/search-config-icons.timestamp  |    1 +
 .../dumps/main/search-config-v2.timestamp     |    1 +
 .../dumps/main/search-telemetry-v2.timestamp  |    1 +
 .../main/summarizer-models-config.timestamp   |    1 +
 .../dumps/main/translations-models.timestamp  |    1 +
 .../dumps/main/translations-wasm.timestamp    |    1 +
 .../rust/remote_settings/src/client.rs        |   51 +-
 .../rust/remote_settings/src/macros.rs        |   20 +
 third_party/rust/search/.cargo-checksum.json  |    2 +-
 third_party/rust/search/Cargo.toml            |    4 +-
 third_party/rust/search/src/lib.rs            |    3 +
 third_party/rust/search/src/selector.rs       | 2043 +++--------------
 third_party/rust/search/src/test_helpers.rs   |  502 ++++
 .../rust/sql-support/.cargo-checksum.json     |    2 +-
 .../rust/sql-support/src/open_database.rs     |   26 +-
 third_party/rust/suggest/.cargo-checksum.json |    2 +-
 third_party/rust/suggest/Cargo.toml           |    4 +-
 third_party/rust/suggest/src/store.rs         |   51 +-
 third_party/rust/sync15/.cargo-checksum.json  |    2 +-
 third_party/rust/sync15/Cargo.toml            |    4 +-
 third_party/rust/tabs/.cargo-checksum.json    |    2 +-
 third_party/rust/tabs/Cargo.toml              |    4 +-
 .../rust/tracing-support/.cargo-checksum.json |    2 +-
 third_party/rust/tracing-support/Cargo.toml   |    4 +-
 third_party/rust/uniffi/.cargo-checksum.json  |    2 +-
 third_party/rust/uniffi/.cargo_vcs_info.json  |    2 +-
 third_party/rust/uniffi/Cargo.lock            |  116 +-
 third_party/rust/uniffi/Cargo.toml            |   29 +-
 third_party/rust/uniffi/Cargo.toml.orig       |   24 +-
 third_party/rust/uniffi/README.md             |    3 +-
 third_party/rust/uniffi/src/cli/swift.rs      |    7 +-
 .../rust/uniffi/src/cli/uniffi_bindgen.rs     |  255 +-
 third_party/rust/uniffi/src/lib.rs            |    8 +-
 third_party/rust/uniffi/tests/custom_types.rs |   54 +
 .../uniffi/tests/ui/proc_macro_arc.stderr     |    2 +-
 .../uniffi/tests/ui/version_mismatch.stderr   |    4 +-
 .../rust/uniffi/uniffi-bindgen-swift.rs       |    9 +
 .../mod.rs => uniffi/uniffi-bindgen.rs}       |    6 +-
 .../rust/uniffi_bindgen/.cargo-checksum.json  |    2 +-
 .../rust/uniffi_bindgen/.cargo_vcs_info.json  |    2 +-
 third_party/rust/uniffi_bindgen/Cargo.lock    |  100 +-
 third_party/rust/uniffi_bindgen/Cargo.toml    |   17 +-
 .../rust/uniffi_bindgen/Cargo.toml.orig       |   18 +-
 third_party/rust/uniffi_bindgen/README.md     |    3 +-
 .../uniffi_bindgen/src/backend/filters.rs     |   32 -
 .../rust/uniffi_bindgen/src/bindgen_paths.rs  |  109 +
 .../bindings/kotlin/gen_kotlin/compounds.rs   |   37 +-
 .../src/bindings/kotlin/gen_kotlin/custom.rs  |   13 +-
 .../src/bindings/kotlin/gen_kotlin/enum_.rs   |   12 +-
 .../src/bindings/kotlin/gen_kotlin/mod.rs     |  297 ++-
 .../bindings/kotlin/gen_kotlin/primitives.rs  |   38 +-
 .../uniffi_bindgen/src/bindings/kotlin/mod.rs |  150 +-
 .../src/bindings/kotlin/templates/Async.kt    |   42 +-
 .../kotlin/templates/CallbackInterfaceImpl.kt |   41 +-
 .../bindings/kotlin/templates/EnumTemplate.kt |   44 +-
 .../kotlin/templates/ErrorTemplate.kt         |   18 +-
 .../kotlin/templates/ExternalTypeTemplate.kt  |   16 +
 .../bindings/kotlin/templates/HandleMap.kt    |   16 +-
 .../src/bindings/kotlin/templates/Helpers.kt  |    6 +-
 .../templates/NamespaceLibraryTemplate.kt     |  114 +-
 .../kotlin/templates/ObjectTemplate.kt        |  178 +-
 .../kotlin/templates/RecordTemplate.kt        |   19 +-
 .../kotlin/templates/RustBufferTemplate.kt    |   40 +-
 .../src/bindings/kotlin/templates/Types.kt    |   13 +-
 .../src/bindings/kotlin/templates/macros.kt   |   79 +-
 .../src/bindings/kotlin/test.rs               |   20 +-
 .../rust/uniffi_bindgen/src/bindings/mod.rs   |   83 +-
 .../src/bindings/python/filters.rs            |   49 +
 .../python/gen_python/callback_interface.rs   |   31 -
 .../bindings/python/gen_python/compounds.rs   |  118 -
 .../src/bindings/python/gen_python/custom.rs  |   26 -
 .../src/bindings/python/gen_python/enum_.rs   |   39 -
 .../bindings/python/gen_python/miscellany.rs  |   26 -
 .../src/bindings/python/gen_python/mod.rs     |  683 ------
 .../src/bindings/python/gen_python/object.rs  |   26 -
 .../bindings/python/gen_python/primitives.rs  |   67 -
 .../src/bindings/python/gen_python/record.rs  |   26 -
 .../uniffi_bindgen/src/bindings/python/mod.rs |   81 +-
 .../python/pipeline/callback_interfaces.rs    |   18 +
 .../src/bindings/python/pipeline/config.rs    |   34 +
 .../src/bindings/python/pipeline/default.rs   |  131 ++
 .../src/bindings/python/pipeline/error.rs     |   15 +
 .../python/pipeline/external_types.rs         |   76 +
 .../src/bindings/python/pipeline/ffi_types.rs |   67 +
 .../bindings/python/pipeline/interfaces.rs    |   75 +
 .../src/bindings/python/pipeline/mod.rs       |   33 +-
 .../src/bindings/python/pipeline/modules.rs   |   46 +
 .../src/bindings/python/pipeline/names.rs     |  141 ++
 .../src/bindings/python/pipeline/nodes.rs     |  676 ++++++
 .../src/bindings/python/pipeline/types.rs     |  104 +
 .../src/bindings/python/templates/Async.py    |   42 +-
 .../bindings/python/templates/CallableArgs.py |    8 +
 .../bindings/python/templates/CallableBody.py |   71 +
 .../python/templates/CallbackInterfaceImpl.py |   86 +-
 .../templates/CallbackInterfaceTemplate.py    |   12 +-
 .../bindings/python/templates/CustomType.py   |   37 +-
 .../bindings/python/templates/EnumTemplate.py |  183 +-
 .../python/templates/ErrorTemplate.py         |   89 +-
 .../python/templates/ExternalTemplate.py      |   20 -
 .../bindings/python/templates/HandleMap.py    |   30 +-
 .../src/bindings/python/templates/Helpers.py  |    6 +-
 .../python/templates/InterfaceTemplate.py     |  168 ++
 .../bindings/python/templates/MapTemplate.py  |   17 +-
 .../templates/{wrapper.py => Module.py}       |   45 +-
 .../templates/NamespaceLibraryTemplate.py     |   45 +-
 .../python/templates/ObjectTemplate.py        |  187 --
 .../python/templates/OptionalTemplate.py      |   10 +-
 .../src/bindings/python/templates/Protocol.py |   11 +-
 .../python/templates/RecordTemplate.py        |   86 +-
 .../python/templates/RustBufferTemplate.py    |   10 +-
 .../python/templates/SequenceTemplate.py      |   10 +-
 .../templates/TopLevelFunctionTemplate.py     |   48 +-
 .../src/bindings/python/templates/Types.py    |  115 +-
 .../python/templates/UniffiTraitImpls.py      |   72 +
 .../{BooleanHelper.py => builtins/Boolean.py} |    2 +-
 .../{BytesHelper.py => builtins/Bytes.py}     |    2 +-
 .../Duration.py}                              |    2 +-
 .../{Float32Helper.py => builtins/Float32.py} |    2 +-
 .../{Float64Helper.py => builtins/Float64.py} |    2 +-
 .../{Int16Helper.py => builtins/Int16.py}     |    2 +-
 .../{Int32Helper.py => builtins/Int32.py}     |    2 +-
 .../{Int64Helper.py => builtins/Int64.py}     |    2 +-
 .../{Int8Helper.py => builtins/Int8.py}       |    2 +-
 .../{StringHelper.py => builtins/String.py}   |    2 +-
 .../Timestamp.py}                             |    2 +-
 .../{UInt16Helper.py => builtins/UInt16.py}   |    2 +-
 .../{UInt32Helper.py => builtins/UInt32.py}   |    2 +-
 .../{UInt64Helper.py => builtins/UInt64.py}   |    2 +-
 .../{UInt8Helper.py => builtins/UInt8.py}     |    2 +-
 .../src/bindings/python/templates/macros.py   |  178 --
 .../src/bindings/python/test.rs               |   19 +-
 .../src/bindings/ruby/gen_ruby/mod.rs         |   70 +-
 .../uniffi_bindgen/src/bindings/ruby/mod.rs   |   84 +-
 .../bindings/ruby/templates/ObjectTemplate.rb |   35 +-
 .../bindings/ruby/templates/RecordTemplate.rb |    2 +-
 .../ruby/templates/RustBufferBuilder.rb       |    4 +-
 .../ruby/templates/RustBufferStream.rb        |    4 +-
 .../src/bindings/ruby/templates/macros.rb     |    2 +-
 .../uniffi_bindgen/src/bindings/ruby/test.rs  |   18 +-
 .../src/bindings/swift/gen_swift/compounds.rs |   35 +-
 .../src/bindings/swift/gen_swift/custom.rs    |   11 +-
 .../src/bindings/swift/gen_swift/enum_.rs     |   12 +-
 .../src/bindings/swift/gen_swift/mod.rs       |  361 ++-
 .../bindings/swift/gen_swift/primitives.rs    |   38 +-
 .../uniffi_bindgen/src/bindings/swift/mod.rs  |  234 +-
 .../src/bindings/swift/templates/Async.swift  |   52 +-
 .../templates/CallbackInterfaceImpl.swift     |   33 +-
 .../swift/templates/EnumTemplate.swift        |   27 +-
 .../swift/templates/ErrorTemplate.swift       |   38 +-
 .../bindings/swift/templates/HandleMap.swift  |   29 +-
 .../swift/templates/ObjectTemplate.swift      |  193 +-
 .../swift/templates/RecordTemplate.swift      |   33 +-
 .../src/bindings/swift/templates/macros.swift |   73 +-
 .../uniffi_bindgen/src/bindings/swift/test.rs |   43 +-
 .../rust/uniffi_bindgen/src/cargo_metadata.rs |   59 +-
 .../uniffi_bindgen/src/interface/callbacks.rs |   37 +-
 .../uniffi_bindgen/src/interface/enum_.rs     |   89 +-
 .../rust/uniffi_bindgen/src/interface/ffi.rs  |   15 +-
 .../uniffi_bindgen/src/interface/function.rs  |   20 +-
 .../rust/uniffi_bindgen/src/interface/mod.rs  |  345 ++-
 .../uniffi_bindgen/src/interface/object.rs    |  188 +-
 .../uniffi_bindgen/src/interface/record.rs    |   87 +-
 .../uniffi_bindgen/src/interface/rename.rs    |  330 +++
 .../uniffi_bindgen/src/interface/universe.rs  |   79 +-
 .../uniffi_bindgen/src/interface/visit_mut.rs |   49 +-
 third_party/rust/uniffi_bindgen/src/lib.rs    |  103 +-
 .../rust/uniffi_bindgen/src/library_mode.rs   |   52 +-
 third_party/rust/uniffi_bindgen/src/loader.rs |  264 +++
 .../uniffi_bindgen/src/macro_metadata/ci.rs   |    3 -
 .../src/macro_metadata/extract.rs             |   17 +-
 .../uniffi_bindgen/src/macro_metadata/mod.rs  |    2 +-
 .../src/pipeline/general/callable.rs          |  102 +-
 .../pipeline/general/callback_interfaces.rs   |  167 +-
 .../src/pipeline/general/checksums.rs         |   47 +-
 .../src/pipeline/general/default.rs           |   20 +
 .../src/pipeline/general/ffi_async_data.rs    |   33 +-
 .../src/pipeline/general/ffi_functions.rs     |   31 +-
 .../src/pipeline/general/ffi_types.rs         |   50 +-
 .../src/pipeline/general/mod.rs               |   22 +-
 .../src/pipeline/general/modules.rs           |    4 +-
 .../src/pipeline/general/nodes.rs             |  117 +-
 .../src/pipeline/general/objects.rs           |   55 +-
 .../src/pipeline/general/rename.rs            |  184 ++
 .../src/pipeline/general/rust_buffer.rs       |   33 +-
 .../src/pipeline/general/rust_future.rs       |   55 +-
 .../src/pipeline/general/self_types.rs        |   26 +-
 .../src/pipeline/general/sort.rs              |   12 +-
 .../general/type_definitions_from_api.rs      |   62 +-
 .../src/pipeline/general/type_nodes.rs        |    8 +-
 .../src/pipeline/general/uniffi_traits.rs     |   35 +
 .../src/pipeline/initial/from_uniffi_meta.rs  |  277 ++-
 .../src/pipeline/initial/mod.rs               |   50 +-
 .../src/pipeline/initial/nodes.rs             |   94 +-
 .../rust/uniffi_bindgen/src/pipeline/mod.rs   |    2 +-
 .../uniffi_bindgen/src/scaffolding/mod.rs     |   12 +-
 .../src/scaffolding/templates/EnumTemplate.rs |   16 +
 .../scaffolding/templates/ObjectTemplate.rs   |   28 +-
 .../scaffolding/templates/RecordTemplate.rs   |   16 +
 .../templates/scaffolding_template.rs         |    2 +-
 .../rust/uniffi_build/.cargo-checksum.json    |    2 +-
 .../rust/uniffi_build/.cargo_vcs_info.json    |    2 +-
 third_party/rust/uniffi_build/Cargo.lock      |  100 +-
 third_party/rust/uniffi_build/Cargo.toml      |    4 +-
 third_party/rust/uniffi_build/Cargo.toml.orig |    4 +-
 third_party/rust/uniffi_build/README.md       |    3 +-
 .../rust/uniffi_core/.cargo-checksum.json     |    2 +-
 .../rust/uniffi_core/.cargo_vcs_info.json     |    2 +-
 third_party/rust/uniffi_core/Cargo.lock       |    6 +-
 third_party/rust/uniffi_core/Cargo.toml       |    2 +-
 third_party/rust/uniffi_core/Cargo.toml.orig  |    2 +-
 third_party/rust/uniffi_core/README.md        |    3 +-
 .../rust/uniffi_core/src/ffi/ffidefault.rs    |    7 -
 .../rust/uniffi_core/src/ffi/ffiserialize.rs  |    2 +-
 .../rust/uniffi_core/src/ffi/foreignfuture.rs |   86 +-
 .../rust/uniffi_core/src/ffi/handle.rs        |   61 +-
 .../rust/uniffi_core/src/ffi/rustcalls.rs     |   32 +-
 .../uniffi_core/src/ffi/rustfuture/future.rs  |  267 ++-
 .../uniffi_core/src/ffi/rustfuture/mod.rs     |   74 +-
 .../src/ffi/rustfuture/scheduler.rs           |    6 +-
 .../uniffi_core/src/ffi/rustfuture/tests.rs   |   34 +-
 .../uniffi_core/src/ffi_converter_impls.rs    |   15 +-
 .../uniffi_core/src/ffi_converter_traits.rs   |   12 +-
 third_party/rust/uniffi_core/src/lib.rs       |    2 +-
 third_party/rust/uniffi_core/src/metadata.rs  |   13 +-
 .../.cargo-checksum.json                      |    2 +-
 .../.cargo_vcs_info.json                      |    2 +-
 .../rust/uniffi_internal_macros/Cargo.lock    |    2 +-
 .../rust/uniffi_internal_macros/Cargo.toml    |    2 +-
 .../uniffi_internal_macros/Cargo.toml.orig    |    2 +-
 .../rust/uniffi_internal_macros/README.md     |    3 +-
 .../rust/uniffi_internal_macros/src/as_ref.rs |   56 -
 .../uniffi_internal_macros/src/checksum.rs    |    2 +-
 .../rust/uniffi_internal_macros/src/ir/ast.rs |    1 +
 .../rust/uniffi_internal_macros/src/lib.rs    |    8 -
 .../rust/uniffi_macros/.cargo-checksum.json   |    2 +-
 .../rust/uniffi_macros/.cargo_vcs_info.json   |    2 +-
 third_party/rust/uniffi_macros/Cargo.lock     |  104 +-
 third_party/rust/uniffi_macros/Cargo.toml     |    8 +-
 .../rust/uniffi_macros/Cargo.toml.orig        |    8 +-
 third_party/rust/uniffi_macros/README.md      |    3 +-
 third_party/rust/uniffi_macros/src/custom.rs  |   37 +-
 third_party/rust/uniffi_macros/src/default.rs |   16 +
 third_party/rust/uniffi_macros/src/enum_.rs   |   84 +-
 third_party/rust/uniffi_macros/src/error.rs   |   36 +-
 third_party/rust/uniffi_macros/src/export.rs  |   59 +-
 .../uniffi_macros/src/export/attributes.rs    |   41 +-
 .../src/export/callback_interface.rs          |   66 +-
 .../rust/uniffi_macros/src/export/item.rs     |   40 +-
 .../uniffi_macros/src/export/scaffolding.rs   |   53 +-
 .../src/export/trait_interface.rs             |  146 +-
 .../rust/uniffi_macros/src/export/utrait.rs   |  148 +-
 third_party/rust/uniffi_macros/src/fnsig.rs   |  109 +-
 third_party/rust/uniffi_macros/src/lib.rs     |   62 +-
 third_party/rust/uniffi_macros/src/object.rs  |  125 +-
 third_party/rust/uniffi_macros/src/record.rs  |   68 +-
 .../uniffi_macros/src/setup_scaffolding.rs    |    9 +-
 third_party/rust/uniffi_macros/src/util.rs    |   18 +-
 .../rust/uniffi_meta/.cargo-checksum.json     |    2 +-
 .../rust/uniffi_meta/.cargo_vcs_info.json     |    2 +-
 third_party/rust/uniffi_meta/Cargo.lock       |   22 +-
 third_party/rust/uniffi_meta/Cargo.toml       |    8 +-
 third_party/rust/uniffi_meta/Cargo.toml.orig  |    8 +-
 third_party/rust/uniffi_meta/README.md        |    3 +-
 third_party/rust/uniffi_meta/src/ffi_names.rs |   42 +-
 third_party/rust/uniffi_meta/src/group.rs     |    8 +-
 third_party/rust/uniffi_meta/src/lib.rs       |   65 +-
 third_party/rust/uniffi_meta/src/metadata.rs  |    4 +
 third_party/rust/uniffi_meta/src/reader.rs    |   48 +-
 third_party/rust/uniffi_meta/src/types.rs     |    6 +
 .../rust/uniffi_pipeline/.cargo-checksum.json |    2 +-
 .../rust/uniffi_pipeline/.cargo_vcs_info.json |    2 +-
 third_party/rust/uniffi_pipeline/Cargo.lock   |   14 +-
 third_party/rust/uniffi_pipeline/Cargo.toml   |    4 +-
 .../rust/uniffi_pipeline/Cargo.toml.orig      |    4 +-
 third_party/rust/uniffi_pipeline/README.md    |    3 +-
 third_party/rust/uniffi_pipeline/src/lib.rs   |    2 +-
 .../rust/uniffi_testing/.cargo-checksum.json  |    2 +-
 .../rust/uniffi_testing/.cargo_vcs_info.json  |    2 +-
 third_party/rust/uniffi_testing/Cargo.lock    |    6 +-
 third_party/rust/uniffi_testing/Cargo.toml    |    2 +-
 .../rust/uniffi_testing/Cargo.toml.orig       |    2 +-
 third_party/rust/uniffi_testing/src/lib.rs    |    2 +-
 .../rust/uniffi_udl/.cargo-checksum.json      |    2 +-
 .../rust/uniffi_udl/.cargo_vcs_info.json      |    2 +-
 third_party/rust/uniffi_udl/Cargo.lock        |   26 +-
 third_party/rust/uniffi_udl/Cargo.toml        |    4 +-
 third_party/rust/uniffi_udl/Cargo.toml.orig   |    4 +-
 third_party/rust/uniffi_udl/README.md         |    3 +-
 third_party/rust/uniffi_udl/src/attributes.rs |   40 +-
 .../uniffi_udl/src/converters/callables.rs    |   12 +-
 .../rust/uniffi_udl/src/converters/enum_.rs   |   16 +-
 .../uniffi_udl/src/converters/interface.rs    |   22 +-
 .../rust/uniffi_udl/src/converters/mod.rs     |  108 +-
 third_party/rust/uniffi_udl/src/literal.rs    |    7 +-
 third_party/rust/viaduct/.cargo-checksum.json |    2 +-
 third_party/rust/viaduct/Cargo.toml           |    8 +-
 third_party/rust/viaduct/src/client.rs        |   87 +-
 third_party/rust/viaduct/src/new_backend.rs   |    3 +-
 third_party/rust/viaduct/src/ohttp.rs         |    3 +-
 third_party/rust/viaduct/src/ohttp_client.rs  |    4 +
 third_party/rust/viaduct/src/settings.rs      |   12 +
 .../rust/webext-storage/.cargo-checksum.json  |    2 +-
 third_party/rust/webext-storage/Cargo.toml    |    4 +-
 394 files changed, 12871 insertions(+), 8383 deletions(-)
 create mode 100644 third_party/rust/askama/src/filters/std.rs
 create mode 100644 third_party/rust/askama_derive/src/generator/filter.rs
 delete mode 100644 third_party/rust/glean-core/benches/dispatcher.rs
 create mode 100644 third_party/rust/glean-core/tests/docs.rs
 delete mode 100644 third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/7bbe6c5c-fdb8-2845-a4f4-e1382e708a0e
 delete mode 100644 third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/7bbe6c5c-fdb8-2845-a4f4-e1382e708a0e.meta.json
 delete mode 100644 third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/95ed201d-4ab8-4cb8-831d-454f53cab0f8
 delete mode 100644 third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/95ed201d-4ab8-4cb8-831d-454f53cab0f8.meta.json
 create mode 100644 third_party/rust/remote_settings/dumps/main/regions.timestamp
 create mode 100644 third_party/rust/remote_settings/dumps/main/search-config-icons.timestamp
 create mode 100644 third_party/rust/remote_settings/dumps/main/search-config-v2.timestamp
 create mode 100644 third_party/rust/remote_settings/dumps/main/search-telemetry-v2.timestamp
 create mode 100644 third_party/rust/remote_settings/dumps/main/summarizer-models-config.timestamp
 create mode 100644 third_party/rust/remote_settings/dumps/main/translations-models.timestamp
 create mode 100644 third_party/rust/remote_settings/dumps/main/translations-wasm.timestamp
 create mode 100644 third_party/rust/search/src/test_helpers.rs
 create mode 100644 third_party/rust/uniffi/tests/custom_types.rs
 create mode 100644 third_party/rust/uniffi/uniffi-bindgen-swift.rs
 rename third_party/rust/{uniffi_bindgen/src/backend/mod.rs => uniffi/uniffi-bindgen.rs} (73%)
 delete mode 100644 third_party/rust/uniffi_bindgen/src/backend/filters.rs
 create mode 100644 third_party/rust/uniffi_bindgen/src/bindgen_paths.rs
 create mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/filters.rs
 delete mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/callback_interface.rs
 delete mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/compounds.rs
 delete mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/custom.rs
 delete mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/enum_.rs
 delete mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/miscellany.rs
 delete mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/mod.rs
 delete mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/object.rs
 delete mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/primitives.rs
 delete mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/record.rs
 create mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/callback_interfaces.rs
 create mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/config.rs
 create mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/default.rs
 create mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/error.rs
 create mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/external_types.rs
 create mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/ffi_types.rs
 create mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/interfaces.rs
 create mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/modules.rs
 create mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/names.rs
 create mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/nodes.rs
 create mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/types.rs
 create mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/templates/CallableArgs.py
 create mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/templates/CallableBody.py
 delete mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/templates/ExternalTemplate.py
 create mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/templates/InterfaceTemplate.py
 rename third_party/rust/uniffi_bindgen/src/bindings/python/templates/{wrapper.py => Module.py} (67%)
 delete mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/templates/ObjectTemplate.py
 create mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/templates/UniffiTraitImpls.py
 rename third_party/rust/uniffi_bindgen/src/bindings/python/templates/{BooleanHelper.py => builtins/Boolean.py} (90%)
 rename third_party/rust/uniffi_bindgen/src/bindings/python/templates/{BytesHelper.py => builtins/Bytes.py} (88%)
 rename third_party/rust/uniffi_bindgen/src/bindings/python/templates/{DurationHelper.py => builtins/Duration.py} (92%)
 rename third_party/rust/uniffi_bindgen/src/bindings/python/templates/{Float32Helper.py => builtins/Float32.py} (66%)
 rename third_party/rust/uniffi_bindgen/src/bindings/python/templates/{Float64Helper.py => builtins/Float64.py} (66%)
 rename third_party/rust/uniffi_bindgen/src/bindings/python/templates/{Int16Helper.py => builtins/Int16.py} (74%)
 rename third_party/rust/uniffi_bindgen/src/bindings/python/templates/{Int32Helper.py => builtins/Int32.py} (74%)
 rename third_party/rust/uniffi_bindgen/src/bindings/python/templates/{Int64Helper.py => builtins/Int64.py} (74%)
 rename third_party/rust/uniffi_bindgen/src/bindings/python/templates/{Int8Helper.py => builtins/Int8.py} (74%)
 rename third_party/rust/uniffi_bindgen/src/bindings/python/templates/{StringHelper.py => builtins/String.py} (95%)
 rename third_party/rust/uniffi_bindgen/src/bindings/python/templates/{TimestampHelper.py => builtins/Timestamp.py} (95%)
 rename third_party/rust/uniffi_bindgen/src/bindings/python/templates/{UInt16Helper.py => builtins/UInt16.py} (74%)
 rename third_party/rust/uniffi_bindgen/src/bindings/python/templates/{UInt32Helper.py => builtins/UInt32.py} (74%)
 rename third_party/rust/uniffi_bindgen/src/bindings/python/templates/{UInt64Helper.py => builtins/UInt64.py} (74%)
 rename third_party/rust/uniffi_bindgen/src/bindings/python/templates/{UInt8Helper.py => builtins/UInt8.py} (73%)
 delete mode 100644 third_party/rust/uniffi_bindgen/src/bindings/python/templates/macros.py
 create mode 100644 third_party/rust/uniffi_bindgen/src/interface/rename.rs
 create mode 100644 third_party/rust/uniffi_bindgen/src/loader.rs
 create mode 100644 third_party/rust/uniffi_bindgen/src/pipeline/general/default.rs
 create mode 100644 third_party/rust/uniffi_bindgen/src/pipeline/general/rename.rs
 create mode 100644 third_party/rust/uniffi_bindgen/src/pipeline/general/uniffi_traits.rs
 delete mode 100644 third_party/rust/uniffi_internal_macros/src/as_ref.rs

diff --git a/.cargo/config.toml.in b/.cargo/config.toml.in
index a003413c5d5d1..b5d751cf1bc70 100644
--- a/.cargo/config.toml.in
+++ b/.cargo/config.toml.in
@@ -75,9 +75,9 @@ git = "https://github.com/jfkthame/mapped_hyph.git"
 rev = "eff105f6ad7ec9b79816cfc1985a28e5340ad14b"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/mozilla/application-services?rev=0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"]
+[source."git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56"]
 git = "https://github.com/mozilla/application-services"
-rev = "0376c542e4a31cde8d33dd0e8da17dcfbc6c58b2"
+rev = "900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/mozilla/audioipc?rev=82fe7fa7e3aaa35468137239a0e4c2f867457214"]
diff --git a/Cargo.lock b/Cargo.lock
index 6e089be9df604..0a0312bad0fe3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -987,7 +987,7 @@ dependencies = [
 [[package]]
 name = "context_id"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "chrono",
  "error-support",
@@ -1946,7 +1946,7 @@ dependencies = [
 [[package]]
 name = "error-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "env_logger",
  "error-support-macros",
@@ -1961,7 +1961,7 @@ dependencies = [
 [[package]]
 name = "error-support-macros"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2056,7 +2056,7 @@ dependencies = [
 [[package]]
 name = "filter_adult"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "base64 0.22.1",
  "error-support",
@@ -2092,7 +2092,7 @@ dependencies = [
 [[package]]
 name = "firefox-versioning"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "serde_json",
  "thiserror 2.0.12",
@@ -3467,7 +3467,7 @@ dependencies = [
 [[package]]
 name = "init_rust_components"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "nss",
  "uniffi",
@@ -3476,7 +3476,7 @@ dependencies = [
 [[package]]
 name = "interrupt-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "lazy_static",
  "parking_lot",
@@ -3647,7 +3647,7 @@ dependencies = [
 [[package]]
 name = "jwcrypto"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "base64 0.21.999",
  "error-support",
@@ -4030,7 +4030,7 @@ checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
 [[package]]
 name = "logins"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -5083,7 +5083,7 @@ dependencies = [
 [[package]]
 name = "nss"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "base64 0.21.999",
  "error-support",
@@ -5112,12 +5112,12 @@ dependencies = [
 [[package]]
 name = "nss_build_common"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 
 [[package]]
 name = "nss_sys"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "libsqlite3-sys",
  "nss_build_common",
@@ -5449,7 +5449,7 @@ checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
 [[package]]
 name = "payload-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "serde",
  "serde_derive",
@@ -6002,7 +6002,7 @@ dependencies = [
 [[package]]
 name = "rc_crypto"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "base64 0.21.999",
  "error-support",
@@ -6072,7 +6072,7 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 [[package]]
 name = "relevancy"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "anyhow",
  "base64 0.21.999",
@@ -6096,7 +6096,7 @@ dependencies = [
 [[package]]
 name = "remote_settings"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "anyhow",
  "camino",
@@ -6367,7 +6367,7 @@ dependencies = [
 [[package]]
 name = "search"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "error-support",
  "firefox-versioning",
@@ -6685,7 +6685,7 @@ dependencies = [
 [[package]]
 name = "sql-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "error-support",
  "interrupt-support",
@@ -6876,7 +6876,7 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 [[package]]
 name = "suggest"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "anyhow",
  "chrono",
@@ -6929,7 +6929,7 @@ dependencies = [
 [[package]]
 name = "sync-guid"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "base64 0.21.999",
  "rand",
@@ -6940,7 +6940,7 @@ dependencies = [
 [[package]]
 name = "sync15"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "anyhow",
  "base16",
@@ -6984,7 +6984,7 @@ dependencies = [
 [[package]]
 name = "tabs"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "anyhow",
  "error-support",
@@ -7333,7 +7333,7 @@ dependencies = [
 [[package]]
 name = "tracing-support"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "parking_lot",
  "serde_json",
@@ -7413,7 +7413,7 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 [[package]]
 name = "types"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "rusqlite 0.37.0",
  "serde",
@@ -7794,7 +7794,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 [[package]]
 name = "viaduct"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "async-trait",
  "error-support",
@@ -7969,7 +7969,7 @@ dependencies = [
 [[package]]
 name = "webext-storage"
 version = "0.1.0"
-source = "git+https://github.com/mozilla/application-services?rev=702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5#702ff65e54b3d2d1c8418faf2081ea8c00a1f6c5"
+source = "git+https://github.com/mozilla/application-services?rev=900d0b03aeb82245c28a11a9adc1cbbead31ce56#900d0b03aeb82245c28a11a9adc1cbbead31ce56"
 dependencies = [
  "anyhow",
  "error-support",
diff --git a/third_party/rust/askama/.cargo-checksum.json b/third_party/rust/askama/.cargo-checksum.json
index 3c62ae8c008d1..8a1cb9d22a7fd 100644
--- a/third_party/rust/askama/.cargo-checksum.json
+++ b/third_party/rust/askama/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"db69f8c612fa2dc671dc6a6349959d8d273dc20134dc871468fa1738259a81cb",".rustfmt.toml":"a3754a3582a6ab4247c2ace9f9686f8757f94691b01e86f340234c4c18073a1b","Cargo.lock":"cad3d8819bf20edbd9c47036cefa5310b2d22b195eb476336730da9719d58a26","Cargo.toml":"5ebc58027a0fd606bd36036295f375c358d0b21f8cad26d777e95840bfdfb24e","Cargo.toml.orig":"a9b57f1840ab7ad0431eec020fa34559240f01749fa74e2491e378cb099d4c17","LICENSE-APACHE":"87cb0d734c723c083e51c825930ff42bce28596b52dee15567f6b28f19c195e3","LICENSE-MIT":"df20e0180764bf5bd76f74d47bc9e8c0069a666401629c390003a1d5eba99c92","README.md":"eae12ef134f50f2b4439996b72074190e11d04f4cf9d19b6adb282801eaa0ae4","_typos.toml":"72588ef2385568368e7ec251c8451f75a16343d5a06b4c2b312beba2cdf5b308","benches/escape.rs":"bbf2e79702f8216cce9b2496cd028d8163ab261dfc4d4d6507a6dbfdca02ca5b","benches/strings.inc":"76b8ac1b79abeaced7831a03aaedf8dd85057eac78e0cecbe68f589d38f0592b","benches/to-json.rs":"ed7beddc73149e91e35408302b6314c615286bf5be360e63fe5e9364411a1f56","clippy.toml":"d141089a5edd91c83ae211257638df2ef1ca53f66b30faa98b22ea1447faeeff","deny.toml":"b7637b42164b1bbba883c422187292cf08ad624691145b5124eaf10edf38c164","src/ascii_str.rs":"272ed728e3e024cefbf16b9a004ad806781cff95f613d34c35a4e8479224d16f","src/error.rs":"0b5615a5b9d8bacedb473ca2c5f8f0d6b41faf58f5c5fc12bb72c1bea7b7efe2","src/filters/alloc.rs":"b3595393fe932043f1df0c579e4f7792f56d2ffd6ee351861d0087fbf3e49aec","src/filters/builtin.rs":"34d6dd5b6603c94b9a3f393f84adf4001e99addf50e60412c559e4748dc3eac6","src/filters/escape.rs":"e4dc1ab7a3b92c3ec402ad4e87989c08be4aa0d892eee65124735f41a0acdeec","src/filters/humansize.rs":"7d139ab50da3c90856b271fac68ed172d014d8a6ed43892e78a11e8cbdb7b0ac","src/filters/json.rs":"0e880bbc49787b83c880760038c8d900c2b1870d81d07211fa0873f77f171825","src/filters/mod.rs":"9a58841eb3173e73225bb40116d783d0b3a59d8f6b452bbe4efd5f0fd7dfd43a","src/filters/urlencode.rs":"5adbe8d4c0811146af02b061a4c648afdf45e29b0ee271d20d116b30479373cd","src/helpers.rs":"3e3e4a9a7698892f96c48a9be1305a88852b91ea278c22f2eacdfd833fde31a7","src/html.rs":"91ee580663d8ad08460373d9e5c8ed196ab0ce61eb113dc8d43ad19ca6671422","src/lib.rs":"dd806557cf5f54928f272a425d0630de850516b58dcb9f944d34b6bfef6b528a","src/values.rs":"7162ffa2dc5469d8f819ab61f9ed4fbe3b5f478cfb9eed74d141fb184c0c1161","tomlfmt.toml":"a33c21547346656aead5f46f2f07e1965f4cf0c6f2a16deb8ec06019619267aa"},"package":"5d4744ed2eef2645831b441d8f5459689ade2ab27c854488fbab1fbe94fce1a7"}
\ No newline at end of file
+{"files":{".cargo_vcs_info.json":"718220ddd7fe5e8c428c39a01820585e100b4c5ba954aaed61d9b4532961adfd",".rustfmt.toml":"a3754a3582a6ab4247c2ace9f9686f8757f94691b01e86f340234c4c18073a1b","Cargo.lock":"da7b251d6b7ea997ae5928cb5df7ab4a0f0a8fedd36bf2d702c30165f446c7f2","Cargo.toml":"6270a445c97358734a1911d3f345fd7a53a1793517dcb7de0ad6b83a6b99d70a","Cargo.toml.orig":"0f79abd0e1b798dbbc32275f9ef127cd3a50423a698e72eba0b076f546d605eb","LICENSE-APACHE":"87cb0d734c723c083e51c825930ff42bce28596b52dee15567f6b28f19c195e3","LICENSE-MIT":"df20e0180764bf5bd76f74d47bc9e8c0069a666401629c390003a1d5eba99c92","README.md":"eae12ef134f50f2b4439996b72074190e11d04f4cf9d19b6adb282801eaa0ae4","_typos.toml":"72588ef2385568368e7ec251c8451f75a16343d5a06b4c2b312beba2cdf5b308","benches/escape.rs":"bbf2e79702f8216cce9b2496cd028d8163ab261dfc4d4d6507a6dbfdca02ca5b","benches/strings.inc":"76b8ac1b79abeaced7831a03aaedf8dd85057eac78e0cecbe68f589d38f0592b","benches/to-json.rs":"ed7beddc73149e91e35408302b6314c615286bf5be360e63fe5e9364411a1f56","clippy.toml":"1d57e7a7054a89a2f5a11b7e1d863d20bd60d8d0fcca5ef500c185eb76806ea5","deny.toml":"b7637b42164b1bbba883c422187292cf08ad624691145b5124eaf10edf38c164","src/ascii_str.rs":"272ed728e3e024cefbf16b9a004ad806781cff95f613d34c35a4e8479224d16f","src/error.rs":"0b5615a5b9d8bacedb473ca2c5f8f0d6b41faf58f5c5fc12bb72c1bea7b7efe2","src/filters/alloc.rs":"58e04ab7f07f2c99ce2fca3c6e2800c5c19b54a98718b5c3f3b27dbe01bf52c9","src/filters/builtin.rs":"cc53aee5a80c5ec289accc284bf947488ed77dfdcce6bdf48fc5270e0db446f1","src/filters/escape.rs":"86e946b6e4cb14372a1382fa7a9ecb448b1c7c60bce665839813ba6d883d3bf5","src/filters/humansize.rs":"56bf8bd6e8a800dba00fb15e6115f3ffa2c6afb3231c0d60625b1853df7e86af","src/filters/json.rs":"7e5c015aa835d004baf16bf5307000cc69cee6445296f68e2b410a3c9b45739c","src/filters/mod.rs":"0351f873fb84899e6b2f0caa1edee37ad86fe58ac563d7ffd0bee6bcf6078c01","src/filters/std.rs":"7e64e3869569ea3d7663920c27368ff660260e74cebb7e2db6a502cb6b2a5df0","src/filters/urlencode.rs":"d4bf716ae7771bfb97a0b561be916eb6b4746ef55608a808049b28c39793a79a","src/helpers.rs":"66b426cb0336a7af2c9a9f5d006a328c045e35aa1bc9b31e15e13d8ce9dd8050","src/html.rs":"91ee580663d8ad08460373d9e5c8ed196ab0ce61eb113dc8d43ad19ca6671422","src/lib.rs":"4d889df0c862ae774ffa346e5a51f6e0e764a3de3025eb16e279b0923493c310","src/values.rs":"7162ffa2dc5469d8f819ab61f9ed4fbe3b5f478cfb9eed74d141fb184c0c1161","tomlfmt.toml":"a33c21547346656aead5f46f2f07e1965f4cf0c6f2a16deb8ec06019619267aa"},"package":"f75363874b771be265f4ffe307ca705ef6f3baa19011c149da8674a87f1b75c4"}
\ No newline at end of file
diff --git a/third_party/rust/askama/.cargo_vcs_info.json b/third_party/rust/askama/.cargo_vcs_info.json
index 0dd7c27803753..141ca1aee7581 100644
--- a/third_party/rust/askama/.cargo_vcs_info.json
+++ b/third_party/rust/askama/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "0b1c0e4d35c38311f179b069f6a7008c9490b786"
+    "sha1": "95867ac8cedc80b69f4047dea9c1272a5bf947b3"
   },
   "path_in_vcs": "askama"
 }
\ No newline at end of file
diff --git a/third_party/rust/askama/Cargo.lock b/third_party/rust/askama/Cargo.lock
index a69772927bbd1..49f42ef0fa2c6 100644
--- a/third_party/rust/askama/Cargo.lock
+++ b/third_party/rust/askama/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "aho-corasick"
@@ -25,7 +25,7 @@ checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "askama"
-version = "0.13.1"
+version = "0.14.0"
 dependencies = [
  "askama_derive",
  "assert_matches",
@@ -38,9 +38,9 @@ dependencies = [
 
 [[package]]
 name = "askama_derive"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d661e0f57be36a5c14c48f78d09011e67e0cb618f269cca9f2fd8d15b68c46ac"
+checksum = "129397200fe83088e8a68407a8e2b1f826cf0086b21ccdb866a722c8bcd3a94f"
 dependencies = [
  "askama_parser",
  "basic-toml",
@@ -56,9 +56,9 @@ dependencies = [
 
 [[package]]
 name = "askama_parser"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf315ce6524c857bb129ff794935cf6d42c82a6cff60526fe2a63593de4d0d4f"
+checksum = "d6ab5630b3d5eaf232620167977f95eb51f3432fc76852328774afbd242d4358"
 dependencies = [
  "memchr",
  "serde",
@@ -140,18 +140,18 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.34"
+version = "4.5.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e958897981290da2a852763fe9cdb89cd36977a5d729023127095fa94d95e2ff"
+checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.34"
+version = "4.5.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83b0f35019843db2160b5bb19ae09b4e6411ac33fc6a712003c33e03090e2489"
+checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -238,9 +238,9 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "half"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7db2ff139bba50379da6aa0766b52fdcb62cb5b263009b09ed58ba604e14bbd1"
+checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
 dependencies = [
  "cfg-if",
  "crunchy",
@@ -290,9 +290,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
 name = "log"
@@ -363,9 +363,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
@@ -693,9 +693,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36"
+checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10"
 dependencies = [
  "memchr",
 ]
diff --git a/third_party/rust/askama/Cargo.toml b/third_party/rust/askama/Cargo.toml
index a9fa0b8c38a89..c76cb6d313d07 100644
--- a/third_party/rust/askama/Cargo.toml
+++ b/third_party/rust/askama/Cargo.toml
@@ -11,9 +11,9 @@
 
 [package]
 edition = "2021"
-rust-version = "1.81"
+rust-version = "1.83"
 name = "askama"
-version = "0.13.1"
+version = "0.14.0"
 build = false
 autolib = false
 autobins = false
@@ -60,7 +60,7 @@ default = [
     "urlencode",
     "askama_derive?/default",
 ]
-derive = ["askama_derive"]
+derive = ["dep:askama_derive"]
 full = [
     "default",
     "blocks",
@@ -102,7 +102,7 @@ harness = false
 required-features = ["serde_json"]
 
 [dependencies.askama_derive]
-version = "=0.13.1"
+version = "=0.14.0"
 optional = true
 default-features = false
 
diff --git a/third_party/rust/askama/Cargo.toml.orig b/third_party/rust/askama/Cargo.toml.orig
index 852f3300316d5..db711d57e5a18 100644
--- a/third_party/rust/askama/Cargo.toml.orig
+++ b/third_party/rust/askama/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "askama"
-version = "0.13.1"
+version = "0.14.0"
 description = "Type-safe, compiled Jinja-like templates for Rust"
 keywords = ["markup", "template", "jinja2", "html"]
 categories = ["template-engine"]
@@ -8,7 +8,7 @@ homepage = "https://askama.readthedocs.io/"
 repository = "https://github.com/askama-rs/askama"
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.81"
+rust-version = "1.83"
 
 [package.metadata.docs.rs]
 features = ["full"]
@@ -27,7 +27,7 @@ harness = false
 itoa = "1.0.11"
 
 # needed by feature "derive"
-askama_derive = { version = "=0.13.1", path = "../askama_derive", default-features = false, optional = true }
+askama_derive = { version = "=0.14.0", path = "../askama_derive", default-features = false, optional = true }
 
 # needed by feature "serde_json"
 serde = { version = "1.0", optional = true, default-features = false }
@@ -56,7 +56,7 @@ alloc = [
 blocks = ["askama_derive?/blocks"]
 code-in-doc = ["askama_derive?/code-in-doc"]
 config = ["askama_derive?/config"]
-derive = ["askama_derive"]
+derive = ["dep:askama_derive"]
 serde_json = ["std", "askama_derive?/serde_json", "dep:serde", "dep:serde_json"]
 std = [
     "alloc",
diff --git a/third_party/rust/askama/clippy.toml b/third_party/rust/askama/clippy.toml
index 5e90250c4555a..4e779c6ce119b 100644
--- a/third_party/rust/askama/clippy.toml
+++ b/third_party/rust/askama/clippy.toml
@@ -1 +1 @@
-msrv = "1.81.0"
+msrv = "1.83.0"
diff --git a/third_party/rust/askama/src/filters/alloc.rs b/third_party/rust/askama/src/filters/alloc.rs
index b611406c39e35..29e7024e673a6 100644
--- a/third_party/rust/askama/src/filters/alloc.rs
+++ b/third_party/rust/askama/src/filters/alloc.rs
@@ -1,9 +1,15 @@
+use alloc::borrow::Cow;
+use alloc::str;
 use alloc::string::String;
+use core::cell::Cell;
+use core::convert::Infallible;
 use core::fmt::{self, Write};
+use core::ops::Deref;
+use core::pin::Pin;
 
 use super::MAX_LEN;
 use super::escape::HtmlSafeOutput;
-use crate::Result;
+use crate::{FastWritable, Result};
 
 /// Return an ephemeral `&str` for `$src: impl fmt::Display`
 ///
@@ -118,14 +124,36 @@ pub fn format() {}
 /// # }
 /// ```
 #[inline]
-pub fn linebreaks(s: impl fmt::Display) -> Result<HtmlSafeOutput<String>, fmt::Error> {
-    fn linebreaks(s: &str) -> String {
-        let linebroken = s.replace("\n\n", "</p><p>").replace('\n', "<br/>");
-        alloc::format!("<p>{linebroken}</p>")
+pub fn linebreaks<S: fmt::Display>(source: S) -> Result<HtmlSafeOutput<Linebreaks<S>>, Infallible> {
+    Ok(HtmlSafeOutput(Linebreaks(source)))
+}
+
+pub struct Linebreaks<S>(S);
+
+impl<S: fmt::Display> fmt::Display for Linebreaks<S> {
+    #[inline]
+    fn fmt(&self, dest: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let mut buffer;
+        flush_linebreaks(dest, try_to_str!(self.0 => buffer))
     }
+}
 
-    let mut buffer;
-    Ok(HtmlSafeOutput(linebreaks(try_to_str!(s => buffer))))
+impl<S: FastWritable> FastWritable for Linebreaks<S> {
+    #[inline]
+    fn write_into<W: fmt::Write + ?Sized>(
+        &self,
+        dest: &mut W,
+        values: &dyn crate::Values,
+    ) -> crate::Result<()> {
+        let mut buffer = String::new();
+        self.0.write_into(&mut buffer, values)?;
+        Ok(flush_linebreaks(dest, &buffer)?)
+    }
+}
+
+fn flush_linebreaks(dest: &mut (impl fmt::Write + ?Sized), s: &str) -> fmt::Result {
+    let linebroken = s.replace("\n\n", "</p><p>").replace('\n', "<br/>");
+    write!(dest, "<p>{linebroken}</p>")
 }
 
 /// Converts all newlines in a piece of plain text to HTML line breaks
@@ -149,13 +177,37 @@ pub fn linebreaks(s: impl fmt::Display) -> Result<HtmlSafeOutput<String>, fmt::E
 /// # }
 /// ```
 #[inline]
-pub fn linebreaksbr(s: impl fmt::Display) -> Result<HtmlSafeOutput<String>, fmt::Error> {
-    fn linebreaksbr(s: &str) -> String {
-        s.replace('\n', "<br/>")
+pub fn linebreaksbr<S: fmt::Display>(
+    source: S,
+) -> Result<HtmlSafeOutput<Linebreaksbr<S>>, Infallible> {
+    Ok(HtmlSafeOutput(Linebreaksbr(source)))
+}
+
+pub struct Linebreaksbr<S>(S);
+
+impl<S: fmt::Display> fmt::Display for Linebreaksbr<S> {
+    #[inline]
+    fn fmt(&self, dest: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let mut buffer;
+        flush_linebreaksbr(dest, try_to_str!(self.0 => buffer))
+    }
+}
+
+impl<S: FastWritable> FastWritable for Linebreaksbr<S> {
+    #[inline]
+    fn write_into<W: fmt::Write + ?Sized>(
+        &self,
+        dest: &mut W,
+        values: &dyn crate::Values,
+    ) -> crate::Result<()> {
+        let mut buffer = String::new();
+        self.0.write_into(&mut buffer, values)?;
+        Ok(flush_linebreaksbr(dest, &buffer)?)
     }
+}
 
-    let mut buffer;
-    Ok(HtmlSafeOutput(linebreaksbr(try_to_str!(s => buffer))))
+fn flush_linebreaksbr(dest: &mut (impl fmt::Write + ?Sized), s: &str) -> fmt::Result {
+    dest.write_str(&s.replace('\n', "<br/>"))
 }
 
 /// Replaces only paragraph breaks in plain text with appropriate HTML
@@ -183,14 +235,38 @@ pub fn linebreaksbr(s: impl fmt::Display) -> Result<HtmlSafeOutput<String>, fmt:
 /// # }
 /// ```
 #[inline]
-pub fn paragraphbreaks(s: impl fmt::Display) -> Result<HtmlSafeOutput<String>, fmt::Error> {
-    fn paragraphbreaks(s: &str) -> String {
-        let linebroken = s.replace("\n\n", "</p><p>").replace("<p></p>", "");
-        alloc::format!("<p>{linebroken}</p>")
+pub fn paragraphbreaks<S: fmt::Display>(
+    source: S,
+) -> Result<HtmlSafeOutput<Paragraphbreaks<S>>, Infallible> {
+    Ok(HtmlSafeOutput(Paragraphbreaks(source)))
+}
+
+pub struct Paragraphbreaks<S>(S);
+
+impl<S: fmt::Display> fmt::Display for Paragraphbreaks<S> {
+    #[inline]
+    fn fmt(&self, dest: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let mut buffer;
+        flush_paragraphbreaks(dest, try_to_str!(self.0 => buffer))
+    }
+}
+
+impl<S: FastWritable> FastWritable for Paragraphbreaks<S> {
+    #[inline]
+    fn write_into<W: fmt::Write + ?Sized>(
+        &self,
+        dest: &mut W,
+        values: &dyn crate::Values,
+    ) -> crate::Result<()> {
+        let mut buffer = String::new();
+        self.0.write_into(&mut buffer, values)?;
+        Ok(flush_paragraphbreaks(dest, &buffer)?)
     }
+}
 
-    let mut buffer;
-    Ok(HtmlSafeOutput(paragraphbreaks(try_to_str!(s => buffer))))
+fn flush_paragraphbreaks(dest: &mut (impl fmt::Write + ?Sized), s: &str) -> fmt::Result {
+    let linebroken = s.replace("\n\n", "</p><p>").replace("<p></p>", "");
+    write!(dest, "<p>{linebroken}</p>")
 }
 
 /// Converts to lowercase
@@ -219,9 +295,35 @@ pub fn paragraphbreaks(s: impl fmt::Display) -> Result<HtmlSafeOutput<String>, f
 /// # }
 /// ```
 #[inline]
-pub fn lower(s: impl fmt::Display) -> Result<String, fmt::Error> {
-    let mut buffer;
-    Ok(try_to_str!(s => buffer).to_lowercase())
+pub fn lower<S: fmt::Display>(source: S) -> Result<Lower<S>, Infallible> {
+    Ok(Lower(source))
+}
+
+pub struct Lower<S>(S);
+
+impl<S: fmt::Display> fmt::Display for Lower<S> {
+    #[inline]
+    fn fmt(&self, dest: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let mut buffer;
+        flush_lower(dest, try_to_str!(self.0 => buffer))
+    }
+}
+
+impl<S: FastWritable> FastWritable for Lower<S> {
+    #[inline]
+    fn write_into<W: fmt::Write + ?Sized>(
+        &self,
+        dest: &mut W,
+        values: &dyn crate::Values,
+    ) -> crate::Result<()> {
+        let mut buffer = String::new();
+        self.0.write_into(&mut buffer, values)?;
+        Ok(flush_lower(dest, &buffer)?)
+    }
+}
+
+fn flush_lower(dest: &mut (impl fmt::Write + ?Sized), s: &str) -> fmt::Result {
+    dest.write_str(&s.to_lowercase())
 }
 
 /// Converts to lowercase, alias for the `|lower` filter
@@ -250,8 +352,8 @@ pub fn lower(s: impl fmt::Display) -> Result<String, fmt::Error> {
 /// # }
 /// ```
 #[inline]
-pub fn lowercase(s: impl fmt::Display) -> Result<String, fmt::Error> {
-    lower(s)
+pub fn lowercase<S: fmt::Display>(source: S) -> Result<Lower<S>, Infallible> {
+    lower(source)
 }
 
 /// Converts to uppercase
@@ -280,9 +382,35 @@ pub fn lowercase(s: impl fmt::Display) -> Result<String, fmt::Error> {
 /// # }
 /// ```
 #[inline]
-pub fn upper(s: impl fmt::Display) -> Result<String, fmt::Error> {
-    let mut buffer;
-    Ok(try_to_str!(s => buffer).to_uppercase())
+pub fn upper<S: fmt::Display>(source: S) -> Result<Upper<S>, Infallible> {
+    Ok(Upper(source))
+}
+
+pub struct Upper<S>(S);
+
+impl<S: fmt::Display> fmt::Display for Upper<S> {
+    #[inline]
+    fn fmt(&self, dest: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let mut buffer;
+        flush_upper(dest, try_to_str!(self.0 => buffer))
+    }
+}
+
+impl<S: FastWritable> FastWritable for Upper<S> {
+    #[inline]
+    fn write_into<W: fmt::Write + ?Sized>(
+        &self,
+        dest: &mut W,
+        values: &dyn crate::Values,
+    ) -> crate::Result<()> {
+        let mut buffer = String::new();
+        self.0.write_into(&mut buffer, values)?;
+        Ok(flush_upper(dest, &buffer)?)
+    }
+}
+
+fn flush_upper(dest: &mut (impl fmt::Write + ?Sized), s: &str) -> fmt::Result {
+    dest.write_str(&s.to_uppercase())
 }
 
 /// Converts to uppercase, alias for the `|upper` filter
@@ -311,8 +439,8 @@ pub fn upper(s: impl fmt::Display) -> Result<String, fmt::Error> {
 /// # }
 /// ```
 #[inline]
-pub fn uppercase(s: impl fmt::Display) -> Result<String, fmt::Error> {
-    upper(s)
+pub fn uppercase<S: fmt::Display>(source: S) -> Result<Upper<S>, Infallible> {
+    upper(source)
 }
 
 /// Strip leading and trailing whitespace
@@ -335,27 +463,57 @@ pub fn uppercase(s: impl fmt::Display) -> Result<String, fmt::Error> {
 /// );
 /// # }
 /// ```
-#[cfg(feature = "alloc")]
-pub fn trim<T: fmt::Display>(s: T) -> Result<String> {
-    struct Collector(String);
-
-    impl fmt::Write for Collector {
-        fn write_str(&mut self, s: &str) -> fmt::Result {
-            match self.0.is_empty() {
-                true => self.0.write_str(s.trim_start()),
-                false => self.0.write_str(s),
-            }
+#[inline]
+pub fn trim<S: fmt::Display>(source: S) -> Result<Trim<S>, Infallible> {
+    Ok(Trim(source))
+}
+
+pub struct Trim<S>(S);
+
+impl<S: fmt::Display> fmt::Display for Trim<S> {
+    #[inline]
+    fn fmt(&self, dest: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let mut collector = TrimCollector(String::new());
+        write!(collector, "{}", self.0)?;
+        flush_trim(dest, collector)
+    }
+}
+
+impl<S: FastWritable> FastWritable for Trim<S> {
+    #[inline]
+    fn write_into<W: fmt::Write + ?Sized>(
+        &self,
+        dest: &mut W,
+        values: &dyn crate::Values,
+    ) -> crate::Result<()> {
+        let mut collector = TrimCollector(String::new());
+        self.0.write_into(&mut collector, values)?;
+        Ok(flush_trim(dest, collector)?)
+    }
+}
+
+struct TrimCollector(String);
+
+impl fmt::Write for TrimCollector {
+    fn write_str(&mut self, s: &str) -> fmt::Result {
+        match self.0.is_empty() {
+            true => self.0.write_str(s.trim_start()),
+            false => self.0.write_str(s),
         }
     }
+}
 
-    let mut collector = Collector(String::new());
-    write!(collector, "{s}")?;
-    let Collector(mut s) = collector;
-    s.truncate(s.trim_end().len());
-    Ok(s)
+fn flush_trim(dest: &mut (impl fmt::Write + ?Sized), collector: TrimCollector) -> fmt::Result {
+    dest.write_str(collector.0.trim_end())
 }
 
-/// Indent lines with `width` spaces
+/// Indent lines with spaces or a prefix.
+///
+/// The first line and blank lines are not indented by default.
+/// The filter has two optional [`bool`] arguments, `first` and `blank`, that can be set to `true`
+/// to indent the first and blank lines, resp.
+///
+/// ### Example of `indent` with spaces
 ///
 /// ```
 /// # #[cfg(feature = "code-in-doc")] {
@@ -375,40 +533,97 @@ pub fn trim<T: fmt::Display>(s: T) -> Result<String> {
 /// );
 /// # }
 /// ```
+///
+/// ### Example of `indent` with prefix a custom prefix
+///
+/// ```
+/// # #[cfg(feature = "code-in-doc")] {
+/// # use askama::Template;
+/// /// ```jinja
+/// /// <div>{{ example|indent("$$$ ") }}</div>
+/// /// ```
+/// #[derive(Template)]
+/// #[template(ext = "html", in_doc = true)]
+/// struct Example<'a> {
+///     example: &'a str,
+/// }
+///
+/// assert_eq!(
+///     Example { example: "hello\nfoo\nbar" }.to_string(),
+///     "<div>hello\n$$$ foo\n$$$ bar</div>"
+/// );
+/// # }
+/// ```
 #[inline]
-pub fn indent(s: impl fmt::Display, width: usize) -> Result<String, fmt::Error> {
-    fn indent(args: fmt::Arguments<'_>, width: usize) -> Result<String, fmt::Error> {
-        let mut buffer = String::new();
-        let s = if width >= MAX_LEN {
-            buffer.write_fmt(args)?;
-            return Ok(buffer);
-        } else if let Some(s) = args.as_str() {
-            if s.len() >= MAX_LEN {
-                return Ok(s.into());
-            } else {
-                s
-            }
+pub fn indent<S, I: AsIndent>(
+    source: S,
+    indent: I,
+    first: bool,
+    blank: bool,
+) -> Result<Indent<S, I>, Infallible> {
+    Ok(Indent {
+        source,
+        indent,
+        first,
+        blank,
+    })
+}
+
+pub struct Indent<S, I> {
+    source: S,
+    indent: I,
+    first: bool,
+    blank: bool,
+}
+
+impl<S: fmt::Display, I: AsIndent> fmt::Display for Indent<S, I> {
+    fn fmt(&self, dest: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let indent = self.indent.as_indent();
+        if indent.len() >= MAX_LEN || indent.is_empty() {
+            write!(dest, "{}", self.source)
         } else {
-            buffer.write_fmt(args)?;
-            if buffer.len() >= MAX_LEN {
-                return Ok(buffer);
-            }
-            buffer.as_str()
-        };
+            let mut buffer;
+            let buffer = try_to_str!(self.source => buffer);
+            flush_indent(dest, indent, buffer, self.first, self.blank)
+        }
+    }
+}
+
+impl<S: FastWritable, I: AsIndent> FastWritable for Indent<S, I> {
+    fn write_into<W: fmt::Write + ?Sized>(
+        &self,
+        dest: &mut W,
+        values: &dyn crate::Values,
+    ) -> crate::Result<()> {
+        let indent = self.indent.as_indent();
+        if indent.len() >= MAX_LEN || indent.is_empty() {
+            self.source.write_into(dest, values)
+        } else {
+            let mut buffer = String::new();
+            self.source.write_into(&mut buffer, values)?;
+            Ok(flush_indent(dest, indent, &buffer, self.first, self.blank)?)
+        }
+    }
+}
 
-        let mut indented = String::new();
-        for (i, c) in s.char_indices() {
-            indented.push(c);
+fn flush_indent(
+    dest: &mut (impl fmt::Write + ?Sized),
+    indent: &str,
+    s: &str,
+    first: bool,
+    blank: bool,
+) -> fmt::Result {
+    if s.len() >= MAX_LEN {
+        return dest.write_str(s);
+    }
 
-            if c == '\n' && i < s.len() - 1 {
-                for _ in 0..width {
-                    indented.push(' ');
-                }
-            }
+    for (idx, line) in s.split_inclusive('\n').enumerate() {
+        if (first || idx > 0) && (blank || !matches!(line, "\n" | "\r\n")) {
+            dest.write_str(indent)?;
         }
-        Ok(indented)
+        dest.write_str(line)?;
     }
-    indent(format_args!("{s}"), width)
+    Ok(())
 }
 
 /// Capitalize a value. The first character will be uppercase, all others lowercase.
@@ -437,21 +652,45 @@ pub fn indent(s: impl fmt::Display, width: usize) -> Result<String, fmt::Error>
 /// # }
 /// ```
 #[inline]
-pub fn capitalize(s: impl fmt::Display) -> Result<String, fmt::Error> {
-    fn capitalize(s: &str) -> Result<String, fmt::Error> {
-        let mut chars = s.chars();
-        if let Some(c) = chars.next() {
-            let mut replacement = String::with_capacity(s.len());
-            replacement.extend(c.to_uppercase());
-            replacement.push_str(&chars.as_str().to_lowercase());
-            Ok(replacement)
-        } else {
-            Ok(String::new())
-        }
+pub fn capitalize<S: fmt::Display>(source: S) -> Result<Capitalize<S>, Infallible> {
+    Ok(Capitalize(source))
+}
+
+pub struct Capitalize<S>(S);
+
+impl<S: fmt::Display> fmt::Display for Capitalize<S> {
+    #[inline]
+    fn fmt(&self, dest: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let mut buffer;
+        flush_capitalize(dest, try_to_str!(self.0 => buffer))
+    }
+}
+
+impl<S: FastWritable> FastWritable for Capitalize<S> {
+    #[inline]
+    fn write_into<W: fmt::Write + ?Sized>(
+        &self,
+        dest: &mut W,
+        values: &dyn crate::Values,
+    ) -> crate::Result<()> {
+        let mut buffer = String::new();
+        self.0.write_into(&mut buffer, values)?;
+        Ok(flush_capitalize(dest, &buffer)?)
     }
+}
 
-    let mut buffer;
-    capitalize(try_to_str!(s => buffer))
+fn flush_capitalize(dest: &mut (impl fmt::Write + ?Sized), s: &str) -> fmt::Result {
+    let mut chars = s.chars();
+    if let Some(c) = chars.next() {
+        write!(
+            dest,
+            "{}{}",
+            c.to_uppercase(),
+            chars.as_str().to_lowercase()
+        )
+    } else {
+        Ok(())
+    }
 }
 
 /// Count the words in that string.
@@ -474,9 +713,55 @@ pub fn capitalize(s: impl fmt::Display) -> Result<String, fmt::Error> {
 /// );
 /// # }
 /// ```
-pub fn wordcount(s: impl fmt::Display) -> Result<usize, fmt::Error> {
-    let mut buffer;
-    Ok(try_to_str!(s => buffer).split_whitespace().count())
+#[inline]
+pub fn wordcount<S>(source: S) -> Wordcount<S> {
+    Wordcount(Cell::new(Some(WordcountInner {
+        source,
+        buffer: String::new(),
+    })))
+}
+
+pub struct Wordcount<S>(Cell<Option<WordcountInner<S>>>);
+
+struct WordcountInner<S> {
+    source: S,
+    buffer: String,
+}
+
+impl<S: fmt::Display> fmt::Display for Wordcount<S> {
+    #[inline]
+    fn fmt(&self, _: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if let Some(mut inner) = self.0.take() {
+            write!(inner.buffer, "{}", inner.source)?;
+            self.0.set(Some(inner));
+        }
+        Ok(())
+    }
+}
+
+impl<S: FastWritable> FastWritable for Wordcount<S> {
+    #[inline]
+    fn write_into<W: fmt::Write + ?Sized>(
+        &self,
+        _: &mut W,
+        values: &dyn crate::Values,
+    ) -> crate::Result<()> {
+        if let Some(mut inner) = self.0.take() {
+            inner.source.write_into(&mut inner.buffer, values)?;
+            self.0.set(Some(inner));
+        }
+        Ok(())
+    }
+}
+
+impl<S> Wordcount<S> {
+    pub fn into_count(self) -> usize {
+        if let Some(inner) = self.0.into_inner() {
+            inner.buffer.split_whitespace().count()
+        } else {
+            0
+        }
+    }
 }
 
 /// Return a title cased version of the value. Words will start with uppercase letters, all
@@ -500,39 +785,160 @@ pub fn wordcount(s: impl fmt::Display) -> Result<usize, fmt::Error> {
 /// );
 /// # }
 /// ```
-pub fn title(s: impl fmt::Display) -> Result<String, fmt::Error> {
-    let mut buffer;
-    let s = try_to_str!(s => buffer);
-    let mut need_capitalization = true;
-
-    // Sadly enough, we can't mutate a string when iterating over its chars, likely because it could
-    // change the size of a char, "breaking" the char indices.
-    let mut output = String::with_capacity(s.len());
-    for c in s.chars() {
-        if c.is_whitespace() {
-            output.push(c);
-            need_capitalization = true;
-        } else if need_capitalization {
-            match c.is_uppercase() {
-                true => output.push(c),
-                false => output.extend(c.to_uppercase()),
-            }
-            need_capitalization = false;
-        } else {
-            match c.is_lowercase() {
-                true => output.push(c),
-                false => output.extend(c.to_lowercase()),
-            }
+#[inline]
+pub fn title<S: fmt::Display>(source: S) -> Result<Title<S>, Infallible> {
+    Ok(Title(source))
+}
+
+pub struct Title<S>(S);
+
+impl<S: fmt::Display> fmt::Display for Title<S> {
+    #[inline]
+    fn fmt(&self, dest: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let mut buffer;
+        flush_title(dest, try_to_str!(self.0 => buffer))
+    }
+}
+
+impl<S: FastWritable> FastWritable for Title<S> {
+    #[inline]
+    fn write_into<W: fmt::Write + ?Sized>(
+        &self,
+        dest: &mut W,
+        values: &dyn crate::Values,
+    ) -> crate::Result<()> {
+        let mut buffer = String::new();
+        self.0.write_into(&mut buffer, values)?;
+        Ok(flush_title(dest, &buffer)?)
+    }
+}
+
+fn flush_title(dest: &mut (impl fmt::Write + ?Sized), s: &str) -> fmt::Result {
+    for word in s.split_inclusive(char::is_whitespace) {
+        flush_capitalize(dest, word)?;
+    }
+    Ok(())
+}
+
+/// Return a title cased version of the value. Alias for the [`|title`](title) filter.
+///
+/// ```
+/// # #[cfg(feature = "code-in-doc")] {
+/// # use askama::Template;
+/// /// ```jinja
+/// /// <div>{{ example|titlecase }}</div>
+/// /// ```
+/// #[derive(Template)]
+/// #[template(ext = "html", in_doc = true)]
+/// struct Example<'a> {
+///     example: &'a str,
+/// }
+///
+/// assert_eq!(
+///     Example { example: "hello WORLD" }.to_string(),
+///     "<div>Hello World</div>"
+/// );
+/// # }
+/// ```
+#[inline]
+pub fn titlecase<S: fmt::Display>(source: S) -> Result<Title<S>, Infallible> {
+    title(source)
+}
+
+/// A prefix usable for indenting [prettified JSON data](super::json::json_pretty) and
+/// [`|indent`](indent)
+///
+/// ```
+/// # use askama::filters::AsIndent;
+/// assert_eq!(4.as_indent(), "    ");
+/// assert_eq!(" -> ".as_indent(), " -> ");
+/// ```
+pub trait AsIndent {
+    /// Borrow `self` as prefix to use.
+    fn as_indent(&self) -> &str;
+}
+
+impl AsIndent for str {
+    #[inline]
+    fn as_indent(&self) -> &str {
+        self
+    }
+}
+
+#[cfg(feature = "alloc")]
+impl AsIndent for alloc::string::String {
+    #[inline]
+    fn as_indent(&self) -> &str {
+        self
+    }
+}
+
+impl AsIndent for usize {
+    #[inline]
+    fn as_indent(&self) -> &str {
+        spaces(*self)
+    }
+}
+
+impl AsIndent for core::num::Wrapping<usize> {
+    #[inline]
+    fn as_indent(&self) -> &str {
+        spaces(self.0)
+    }
+}
+
+impl AsIndent for core::num::NonZeroUsize {
+    #[inline]
+    fn as_indent(&self) -> &str {
+        spaces(self.get())
+    }
+}
+
+fn spaces(width: usize) -> &'static str {
+    const MAX_SPACES: usize = 16;
+    const SPACES: &str = match str::from_utf8(&[b' '; MAX_SPACES]) {
+        Ok(spaces) => spaces,
+        Err(_) => panic!(),
+    };
+
+    &SPACES[..width.min(SPACES.len())]
+}
+
+#[cfg(feature = "alloc")]
+impl<T: AsIndent + alloc::borrow::ToOwned + ?Sized> AsIndent for Cow<'_, T> {
+    #[inline]
+    fn as_indent(&self) -> &str {
+        T::as_indent(self)
+    }
+}
+
+crate::impl_for_ref! {
+    impl AsIndent for T {
+        #[inline]
+        fn as_indent(&self) -> &str {
+            <T>::as_indent(self)
         }
     }
-    Ok(output)
+}
+
+impl<T> AsIndent for Pin<T>
+where
+    T: Deref,
+    <T as Deref>::Target: AsIndent,
+{
+    #[inline]
+    fn as_indent(&self) -> &str {
+        self.as_ref().get_ref().as_indent()
+    }
 }
 
 #[cfg(test)]
 mod tests {
     use alloc::string::ToString;
+    use std::borrow::ToOwned;
 
     use super::*;
+    use crate::NO_VALUES;
 
     #[test]
     fn test_linebreaks() {
@@ -596,17 +1002,118 @@ mod tests {
 
     #[test]
     fn test_indent() {
-        assert_eq!(indent("hello", 2).unwrap().to_string(), "hello");
-        assert_eq!(indent("hello\n", 2).unwrap().to_string(), "hello\n");
-        assert_eq!(indent("hello\nfoo", 2).unwrap().to_string(), "hello\n  foo");
         assert_eq!(
-            indent("hello\nfoo\n bar", 4).unwrap().to_string(),
+            indent("hello", 2, false, false).unwrap().to_string(),
+            "hello"
+        );
+        assert_eq!(
+            indent("hello\n", 2, false, false).unwrap().to_string(),
+            "hello\n"
+        );
+        assert_eq!(
+            indent("hello\nfoo", 2, false, false).unwrap().to_string(),
+            "hello\n  foo"
+        );
+        assert_eq!(
+            indent("hello\nfoo\n bar", 4, false, false)
+                .unwrap()
+                .to_string(),
             "hello\n    foo\n     bar"
         );
         assert_eq!(
-            indent("hello", 267_332_238_858).unwrap().to_string(),
+            indent("hello", 267_332_238_858, false, false)
+                .unwrap()
+                .to_string(),
             "hello"
         );
+
+        assert_eq!(
+            indent("hello\n\n bar", 4, false, false)
+                .unwrap()
+                .to_string(),
+            "hello\n\n     bar"
+        );
+        assert_eq!(
+            indent("hello\n\n bar", 4, false, true).unwrap().to_string(),
+            "hello\n    \n     bar"
+        );
+        assert_eq!(
+            indent("hello\n\n bar", 4, true, false).unwrap().to_string(),
+            "    hello\n\n     bar"
+        );
+        assert_eq!(
+            indent("hello\n\n bar", 4, true, true).unwrap().to_string(),
+            "    hello\n    \n     bar"
+        );
+    }
+
+    #[test]
+    fn test_indent_str() {
+        assert_eq!(
+            indent("hello\n\n bar", "❗❓", false, false)
+                .unwrap()
+                .to_string(),
+            "hello\n\n❗❓ bar"
+        );
+        assert_eq!(
+            indent("hello\n\n bar", "❗❓", false, true)
+                .unwrap()
+                .to_string(),
+            "hello\n❗❓\n❗❓ bar"
+        );
+        assert_eq!(
+            indent("hello\n\n bar", "❗❓", true, false)
+                .unwrap()
+                .to_string(),
+            "❗❓hello\n\n❗❓ bar"
+        );
+        assert_eq!(
+            indent("hello\n\n bar", "❗❓", true, true)
+                .unwrap()
+                .to_string(),
+            "❗❓hello\n❗❓\n❗❓ bar"
+        );
+    }
+
+    #[test]
+    #[allow(clippy::arc_with_non_send_sync)] // it's only a test, it does not have to make sense
+    #[allow(clippy::type_complexity)] // it's only a test, it does not have to be pretty
+    fn test_indent_complicated() {
+        use std::boxed::Box;
+        use std::cell::{RefCell, RefMut};
+        use std::rc::Rc;
+        use std::sync::{Arc, Mutex, MutexGuard, RwLock, RwLockWriteGuard};
+
+        let prefix = Mutex::new(Box::pin("❗❓".to_owned()));
+        let prefix = RefCell::new(Arc::new(prefix.try_lock().unwrap()));
+        let prefix = RwLock::new(Rc::new(prefix.borrow_mut()));
+        let prefix: RwLockWriteGuard<'_, Rc<RefMut<'_, Arc<MutexGuard<'_, Pin<Box<String>>>>>>> =
+            prefix.try_write().unwrap();
+
+        assert_eq!(
+            indent("hello\n\n bar", &prefix, false, false)
+                .unwrap()
+                .to_string(),
+            "hello\n\n❗❓ bar"
+        );
+        assert_eq!(
+            indent("hello\n\n bar", &prefix, false, true)
+                .unwrap()
+                .to_string(),
+            "hello\n❗❓\n❗❓ bar"
+        );
+        assert_eq!(
+            indent("hello\n\n bar", &prefix, true, false)
+                .unwrap()
+                .to_string(),
+            "❗❓hello\n\n❗❓ bar"
+        );
+        assert_eq!(
+            indent("hello\n\n bar", &prefix, true, true)
+                .unwrap()
+                .to_string(),
+            "❗❓hello\n❗❓\n❗❓ bar"
+        );
     }
 
     #[test]
@@ -630,28 +1137,45 @@ mod tests {
 
     #[test]
     fn test_wordcount() {
-        assert_eq!(wordcount("").unwrap(), 0);
-        assert_eq!(wordcount(" \n\t").unwrap(), 0);
-        assert_eq!(wordcount("foo").unwrap(), 1);
-        assert_eq!(wordcount("foo bar").unwrap(), 2);
-        assert_eq!(wordcount("foo  bar").unwrap(), 2);
+        for &(word, count) in &[
+            ("", 0),
+            (" \n\t", 0),
+            ("foo", 1),
+            ("foo bar", 2),
+            ("foo  bar", 2),
+        ] {
+            let w = wordcount(word);
+            let _ = w.to_string();
+            assert_eq!(w.into_count(), count, "fmt: {word:?}");
+
+            let w = wordcount(word);
+            w.write_into(&mut String::new(), NO_VALUES).unwrap();
+            assert_eq!(w.into_count(), count, "FastWritable: {word:?}");
+        }
     }
 
     #[test]
     fn test_title() {
-        assert_eq!(&title("").unwrap(), "");
-        assert_eq!(&title(" \n\t").unwrap(), " \n\t");
-        assert_eq!(&title("foo").unwrap(), "Foo");
-        assert_eq!(&title(" foo").unwrap(), " Foo");
-        assert_eq!(&title("foo bar").unwrap(), "Foo Bar");
-        assert_eq!(&title("foo  bar ").unwrap(), "Foo  Bar ");
-        assert_eq!(&title("fOO").unwrap(), "Foo");
-        assert_eq!(&title("fOo BaR").unwrap(), "Foo Bar");
+        assert_eq!(&title("").unwrap().to_string(), "");
+        assert_eq!(&title(" \n\t").unwrap().to_string(), " \n\t");
+        assert_eq!(&title("foo").unwrap().to_string(), "Foo");
+        assert_eq!(&title(" foo").unwrap().to_string(), " Foo");
+        assert_eq!(&title("foo bar").unwrap().to_string(), "Foo Bar");
+        assert_eq!(&title("foo  bar ").unwrap().to_string(), "Foo  Bar ");
+        assert_eq!(&title("fOO").unwrap().to_string(), "Foo");
+        assert_eq!(&title("fOo BaR").unwrap().to_string(), "Foo Bar");
+        assert_eq!(&title("foo\r\nbar").unwrap().to_string(), "Foo\r\nBar");
+        assert_eq!(
+            &title("Fo\x0boo\x0coO\u{2002}OO\u{3000}baR")
+                .unwrap()
+                .to_string(),
+            "Fo\x0bOo\x0cOo\u{2002}Oo\u{3000}Bar"
+        );
     }
 
     #[test]
     fn fuzzed_indent_filter() {
         let s = "hello\nfoo\nbar".to_string().repeat(1024);
-        assert_eq!(indent(s.clone(), 4).unwrap().to_string(), s);
+        assert_eq!(indent(s.clone(), 4, false, false).unwrap().to_string(), s);
     }
 }
diff --git a/third_party/rust/askama/src/filters/builtin.rs b/third_party/rust/askama/src/filters/builtin.rs
index fbe91a58f56be..7e3e1f73d5cb1 100644
--- a/third_party/rust/askama/src/filters/builtin.rs
+++ b/third_party/rust/askama/src/filters/builtin.rs
@@ -5,8 +5,7 @@ use core::ops::Deref;
 use core::pin::Pin;
 
 use super::MAX_LEN;
-use super::escape::FastWritable;
-use crate::{Error, Result};
+use crate::{Error, FastWritable, Result, Values};
 
 /// Limit string length, appends '...' if truncated
 ///
@@ -50,9 +49,13 @@ impl<S: fmt::Display> fmt::Display for TruncateFilter<S> {
 
 impl<S: FastWritable> FastWritable for TruncateFilter<S> {
     #[inline]
-    fn write_into<W: fmt::Write + ?Sized>(&self, dest: &mut W) -> crate::Result<()> {
+    fn write_into<W: fmt::Write + ?Sized>(
+        &self,
+        dest: &mut W,
+        values: &dyn Values,
+    ) -> crate::Result<()> {
         self.source
-            .write_into(&mut TruncateWriter::new(dest, self.remaining))
+            .write_into(&mut TruncateWriter::new(dest, self.remaining), values)
     }
 }
 
@@ -440,10 +443,14 @@ impl<S: fmt::Display, P: fmt::Display> fmt::Display for Pluralize<S, P> {
 
 impl<S: FastWritable, P: FastWritable> FastWritable for Pluralize<S, P> {
     #[inline]
-    fn write_into<W: fmt::Write + ?Sized>(&self, dest: &mut W) -> crate::Result<()> {
+    fn write_into<W: fmt::Write + ?Sized>(
+        &self,
+        dest: &mut W,
+        values: &dyn Values,
+    ) -> crate::Result<()> {
         match self {
-            Pluralize::Singular(value) => value.write_into(dest),
-            Pluralize::Plural(value) => value.write_into(dest),
+            Pluralize::Singular(value) => value.write_into(dest, values),
+            Pluralize::Plural(value) => value.write_into(dest, values),
         }
     }
 }
diff --git a/third_party/rust/askama/src/filters/escape.rs b/third_party/rust/askama/src/filters/escape.rs
index 9bc082541d52e..846a5b608b3a2 100644
--- a/third_party/rust/askama/src/filters/escape.rs
+++ b/third_party/rust/askama/src/filters/escape.rs
@@ -1,10 +1,9 @@
 use core::convert::Infallible;
 use core::fmt::{self, Formatter, Write};
-use core::ops::Deref;
 use core::pin::Pin;
 use core::str;
 
-use crate::Values;
+use crate::{FastWritable, Values};
 
 /// Marks a string (or other `Display` type) as safe
 ///
@@ -82,8 +81,12 @@ impl<T: fmt::Display, E: Escaper> fmt::Display for EscapeDisplay<T, E> {
 
 impl<T: FastWritable, E: Escaper> FastWritable for EscapeDisplay<T, E> {
     #[inline]
-    fn write_into<W: fmt::Write + ?Sized>(&self, dest: &mut W) -> crate::Result<()> {
-        self.0.write_into(&mut EscapeWriter(dest, self.1))
+    fn write_into<W: fmt::Write + ?Sized>(
+        &self,
+        dest: &mut W,
+        values: &dyn Values,
+    ) -> crate::Result<()> {
+        self.0.write_into(&mut EscapeWriter(dest, self.1), values)
     }
 }
 
@@ -250,10 +253,14 @@ impl<'a, T: HtmlSafe + ?Sized> AutoEscape for &AutoEscaper<'a, T, Html> {
 ///
 /// ```rust
 /// mod filters {
-///     use askama::{filters::MaybeSafe, Result};
+///     use askama::{filters::MaybeSafe, Result, Values};
 ///
 ///     // Do not actually use this filter! It's an intentionally bad example.
-///     pub fn backdoor<T: std::fmt::Display>(s: T, enable: &bool) -> Result<MaybeSafe<T>> {
+///     pub fn backdoor<T: std::fmt::Display>(
+///         s: T,
+///         _: &dyn Values,
+///         enable: &bool,
+///     ) -> Result<MaybeSafe<T>> {
 ///         Ok(match *enable {
 ///             true => MaybeSafe::Safe(s),
 ///             false => MaybeSafe::NeedsEscaping(s),
@@ -303,12 +310,16 @@ const _: () = {
     // This is the fallback. The filter is not the last element of the filter chain.
     impl<T: FastWritable> FastWritable for MaybeSafe<T> {
         #[inline]
-        fn write_into<W: fmt::Write + ?Sized>(&self, dest: &mut W) -> crate::Result<()> {
+        fn write_into<W: fmt::Write + ?Sized>(
+            &self,
+            dest: &mut W,
+            values: &dyn Values,
+        ) -> crate::Result<()> {
             let inner = match self {
                 MaybeSafe::Safe(inner) => inner,
                 MaybeSafe::NeedsEscaping(inner) => inner,
             };
-            inner.write_into(dest)
+            inner.write_into(dest, values)
         }
     }
 
@@ -338,10 +349,14 @@ const _: () = {
     }
 
     impl<T: FastWritable + ?Sized, E: Escaper> FastWritable for Wrapped<'_, T, E> {
-        fn write_into<W: fmt::Write + ?Sized>(&self, dest: &mut W) -> crate::Result<()> {
+        fn write_into<W: fmt::Write + ?Sized>(
+            &self,
+            dest: &mut W,
+            values: &dyn Values,
+        ) -> crate::Result<()> {
             match *self {
-                Wrapped::Safe(t) => t.write_into(dest),
-                Wrapped::NeedsEscaping(t, e) => EscapeDisplay(t, e).write_into(dest),
+                Wrapped::Safe(t) => t.write_into(dest, values),
+                Wrapped::NeedsEscaping(t, e) => EscapeDisplay(t, e).write_into(dest, values),
             }
         }
     }
@@ -368,10 +383,10 @@ const _: () = {
 ///
 /// ```rust
 /// mod filters {
-///     use askama::{filters::Safe, Result};
+///     use askama::{filters::Safe, Result, Values};
 ///
 ///     // Do not actually use this filter! It's an intentionally bad example.
-///     pub fn strip_except_apos(s: impl ToString) -> Result<Safe<String>> {
+///     pub fn strip_except_apos(s: impl ToString, _: &dyn Values) -> Result<Safe<String>> {
 ///         Ok(Safe(s
 ///             .to_string()
 ///             .chars()
@@ -409,8 +424,12 @@ const _: () = {
     // This is the fallback. The filter is not the last element of the filter chain.
     impl<T: FastWritable> FastWritable for Safe<T> {
         #[inline]
-        fn write_into<W: fmt::Write + ?Sized>(&self, dest: &mut W) -> crate::Result<()> {
-            self.0.write_into(dest)
+        fn write_into<W: fmt::Write + ?Sized>(
+            &self,
+            dest: &mut W,
+            values: &dyn Values,
+        ) -> crate::Result<()> {
+            self.0.write_into(dest, values)
         }
     }
 
@@ -498,152 +517,6 @@ pub trait WriteWritable {
     ) -> crate::Result<()>;
 }
 
-/// Used internally by askama to speed up writing some types.
-///
-/// Types implementing this trait can be written without needing to employ an [`fmt::Formatter`].
-pub trait FastWritable {
-    /// Used internally by askama to speed up writing some types.
-    fn write_into<W: fmt::Write + ?Sized>(&self, dest: &mut W) -> crate::Result<()>;
-}
-
-const _: () = {
-    crate::impl_for_ref! {
-        impl FastWritable for T {
-            #[inline]
-            fn write_into<W: fmt::Write + ?Sized>(&self, dest: &mut W) -> crate::Result<()> {
-                <T>::write_into(self, dest)
-            }
-        }
-    }
-
-    impl<T> FastWritable for Pin<T>
-    where
-        T: Deref,
-        <T as Deref>::Target: FastWritable,
-    {
-        #[inline]
-        fn write_into<W: fmt::Write + ?Sized>(&self, dest: &mut W) -> crate::Result<()> {
-            self.as_ref().get_ref().write_into(dest)
-        }
-    }
-
-    #[cfg(feature = "alloc")]
-    impl<T: FastWritable + alloc::borrow::ToOwned> FastWritable for alloc::borrow::Cow<'_, T> {
-        #[inline]
-        fn write_into<W: fmt::Write + ?Sized>(&self, dest: &mut W) -> crate::Result<()> {
-            T::write_into(self.as_ref(), dest)
-        }
-    }
-
-    // implement FastWritable for a list of types
-    macro_rules! impl_for_int {
-        ($($ty:ty)*) => { $(
-            impl FastWritable for $ty {
-                #[inline]
-                fn write_into<W: fmt::Write + ?Sized>(&self, dest: &mut W) -> crate::Result<()> {
-                    itoa::Buffer::new().format(*self).write_into(dest)
-                }
-            }
-        )* };
-    }
-
-    impl_for_int!(
-        u8 u16 u32 u64 u128 usize
-        i8 i16 i32 i64 i128 isize
-    );
-
-    // implement FastWritable for a list of non-zero integral types
-    macro_rules! impl_for_nz_int {
-        ($($id:ident)*) => { $(
-            impl FastWritable for core::num::$id {
-                #[inline]
-                fn write_into<W: fmt::Write + ?Sized>(&self, dest: &mut W) -> crate::Result<()> {
-                    self.get().write_into(dest)
-                }
-            }
-        )* };
-    }
-
-    impl_for_nz_int!(
-        NonZeroU8 NonZeroU16 NonZeroU32 NonZeroU64 NonZeroU128 NonZeroUsize
-        NonZeroI8 NonZeroI16 NonZeroI32 NonZeroI64 NonZeroI128 NonZeroIsize
-    );
-
-    impl FastWritable for str {
-        #[inline]
-        fn write_into<W: fmt::Write + ?Sized>(&self, dest: &mut W) -> crate::Result<()> {
-            Ok(dest.write_str(self)?)
-        }
-    }
-
-    #[cfg(feature = "alloc")]
-    impl FastWritable for alloc::string::String {
-        #[inline]
-        fn write_into<W: fmt::Write + ?Sized>(&self, dest: &mut W) -> crate::Result<()> {
-            self.as_str().write_into(dest)
-        }
-    }
-
-    impl FastWritable for bool {
-        #[inline]
-        fn write_into<W: fmt::Write + ?Sized>(&self, dest: &mut W) -> crate::Result<()> {
-            Ok(dest.write_str(match self {
-                true => "true",
-                false => "false",
-            })?)
-        }
-    }
-
-    impl FastWritable for char {
-        #[inline]
-        fn write_into<W: fmt::Write + ?Sized>(&self, dest: &mut W) -> crate::Result<()> {
-            Ok(dest.write_char(*self)?)
-        }
-    }
-
-    impl FastWritable for fmt::Arguments<'_> {
-        fn write_into<W: fmt::Write + ?Sized>(&self, dest: &mut W) -> crate::Result<()> {
-            Ok(match self.as_str() {
-                Some(s) => dest.write_str(s),
-                None => dest.write_fmt(*self),
-            }?)
-        }
-    }
-
-    impl<S: crate::Template + ?Sized> WriteWritable for &Writable<'_, S> {
-        #[inline]
-        fn askama_write<W: fmt::Write + ?Sized>(
-            &self,
-            dest: &mut W,
-            values: &dyn Values,
-        ) -> crate::Result<()> {
-            self.0.render_into_with_values(dest, values)
-        }
-    }
-
-    impl<S: FastWritable + ?Sized> WriteWritable for &&Writable<'_, S> {
-        #[inline]
-        fn askama_write<W: fmt::Write + ?Sized>(
-            &self,
-            dest: &mut W,
-            _: &dyn Values,
-        ) -> crate::Result<()> {
-            self.0.write_into(dest)
-        }
-    }
-
-    impl<S: fmt::Display + ?Sized> WriteWritable for &&&Writable<'_, S> {
-        #[inline]
-        fn askama_write<W: fmt::Write + ?Sized>(
-            &self,
-            dest: &mut W,
-            _: &dyn Values,
-        ) -> crate::Result<()> {
-            Ok(write!(dest, "{}", self.0)?)
-        }
-    }
-};
-
 #[test]
 #[cfg(feature = "alloc")]
 fn test_escape() {
diff --git a/third_party/rust/askama/src/filters/humansize.rs b/third_party/rust/askama/src/filters/humansize.rs
index 716991b4867d6..d8f489a707147 100644
--- a/third_party/rust/askama/src/filters/humansize.rs
+++ b/third_party/rust/askama/src/filters/humansize.rs
@@ -2,8 +2,8 @@ use core::convert::Infallible;
 use core::fmt;
 use core::mem::MaybeUninit;
 
-use super::FastWritable;
 use crate::ascii_str::{AsciiChar, AsciiStr};
+use crate::{FastWritable, NO_VALUES, Values};
 
 /// Returns adequate string representation (in KB, ..) of number of bytes
 ///
@@ -33,14 +33,18 @@ pub struct FilesizeFormatFilter(f32);
 impl fmt::Display for FilesizeFormatFilter {
     #[inline]
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        Ok(self.write_into(f)?)
+        Ok(self.write_into(f, NO_VALUES)?)
     }
 }
 
 impl FastWritable for FilesizeFormatFilter {
-    fn write_into<W: fmt::Write + ?Sized>(&self, dest: &mut W) -> crate::Result<()> {
+    fn write_into<W: fmt::Write + ?Sized>(
+        &self,
+        dest: &mut W,
+        values: &dyn Values,
+    ) -> crate::Result<()> {
         if self.0 < 1e3 {
-            (self.0 as u32).write_into(dest)?;
+            (self.0 as u32).write_into(dest, values)?;
             Ok(dest.write_str(" B")?)
         } else if let Some((prefix, factor)) = SI_PREFIXES
             .iter()
@@ -49,8 +53,8 @@ impl FastWritable for FilesizeFormatFilter {
         {
             // u32 is big enough to hold the number 999_999
             let scaled = (self.0 * factor) as u32;
-            (scaled / 100).write_into(dest)?;
-            format_frac(&mut MaybeUninit::uninit(), prefix, scaled).write_into(dest)
+            (scaled / 100).write_into(dest, values)?;
+            format_frac(&mut MaybeUninit::uninit(), prefix, scaled).write_into(dest, values)
         } else {
             too_big(self.0, dest)
         }
diff --git a/third_party/rust/askama/src/filters/json.rs b/third_party/rust/askama/src/filters/json.rs
index 7dbae4c194fd8..b040767fca2d4 100644
--- a/third_party/rust/askama/src/filters/json.rs
+++ b/third_party/rust/askama/src/filters/json.rs
@@ -1,13 +1,12 @@
 use std::convert::Infallible;
-use std::ops::Deref;
-use std::pin::Pin;
 use std::{fmt, io, str};
 
 use serde::Serialize;
 use serde_json::ser::{CompactFormatter, PrettyFormatter, Serializer};
 
-use super::FastWritable;
+use super::AsIndent;
 use crate::ascii_str::{AsciiChar, AsciiStr};
+use crate::{FastWritable, NO_VALUES, Values};
 
 /// Serialize to JSON (requires `json` feature)
 ///
@@ -101,94 +100,9 @@ struct ToJsonPretty<S, I> {
     indent: I,
 }
 
-/// A prefix usable for indenting [prettified JSON data](json_pretty)
-///
-/// ```
-/// # use askama::filters::AsIndent;
-/// assert_eq!(4.as_indent(), "    ");
-/// assert_eq!(" -> ".as_indent(), " -> ");
-/// ```
-pub trait AsIndent {
-    /// Borrow `self` as prefix to use.
-    fn as_indent(&self) -> &str;
-}
-
-impl AsIndent for str {
-    #[inline]
-    fn as_indent(&self) -> &str {
-        self
-    }
-}
-
-#[cfg(feature = "alloc")]
-impl AsIndent for alloc::string::String {
-    #[inline]
-    fn as_indent(&self) -> &str {
-        self
-    }
-}
-
-impl AsIndent for usize {
-    #[inline]
-    fn as_indent(&self) -> &str {
-        spaces(*self)
-    }
-}
-
-impl AsIndent for std::num::Wrapping<usize> {
-    #[inline]
-    fn as_indent(&self) -> &str {
-        spaces(self.0)
-    }
-}
-
-impl AsIndent for std::num::NonZeroUsize {
-    #[inline]
-    fn as_indent(&self) -> &str {
-        spaces(self.get())
-    }
-}
-
-fn spaces(width: usize) -> &'static str {
-    const MAX_SPACES: usize = 16;
-    const SPACES: &str = match str::from_utf8(&[b' '; MAX_SPACES]) {
-        Ok(spaces) => spaces,
-        Err(_) => panic!(),
-    };
-
-    &SPACES[..width.min(SPACES.len())]
-}
-
-#[cfg(feature = "alloc")]
-impl<T: AsIndent + alloc::borrow::ToOwned + ?Sized> AsIndent for alloc::borrow::Cow<'_, T> {
-    #[inline]
-    fn as_indent(&self) -> &str {
-        T::as_indent(self)
-    }
-}
-
-crate::impl_for_ref! {
-    impl AsIndent for T {
-        #[inline]
-        fn as_indent(&self) -> &str {
-            <T>::as_indent(self)
-        }
-    }
-}
-
-impl<T> AsIndent for Pin<T>
-where
-    T: Deref,
-    <T as Deref>::Target: AsIndent,
-{
-    #[inline]
-    fn as_indent(&self) -> &str {
-        self.as_ref().get_ref().as_indent()
-    }
-}
-
 impl<S: Serialize> FastWritable for ToJson<S> {
-    fn write_into<W: fmt::Write + ?Sized>(&self, f: &mut W) -> crate::Result<()> {
+    #[inline]
+    fn write_into<W: fmt::Write + ?Sized>(&self, f: &mut W, _: &dyn Values) -> crate::Result<()> {
         serialize(f, &self.value, CompactFormatter)
     }
 }
@@ -196,12 +110,13 @@ impl<S: Serialize> FastWritable for ToJson<S> {
 impl<S: Serialize> fmt::Display for ToJson<S> {
     #[inline]
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        Ok(self.write_into(f)?)
+        Ok(self.write_into(f, NO_VALUES)?)
     }
 }
 
 impl<S: Serialize, I: AsIndent> FastWritable for ToJsonPretty<S, I> {
-    fn write_into<W: fmt::Write + ?Sized>(&self, f: &mut W) -> crate::Result<()> {
+    #[inline]
+    fn write_into<W: fmt::Write + ?Sized>(&self, f: &mut W, _: &dyn Values) -> crate::Result<()> {
         serialize(
             f,
             &self.value,
@@ -213,11 +128,10 @@ impl<S: Serialize, I: AsIndent> FastWritable for ToJsonPretty<S, I> {
 impl<S: Serialize, I: AsIndent> fmt::Display for ToJsonPretty<S, I> {
     #[inline]
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        Ok(self.write_into(f)?)
+        Ok(self.write_into(f, NO_VALUES)?)
     }
 }
 
-#[inline]
 fn serialize<S, W, F>(dest: &mut W, value: &S, formatter: F) -> Result<(), crate::Error>
 where
     S: Serialize + ?Sized,
diff --git a/third_party/rust/askama/src/filters/mod.rs b/third_party/rust/askama/src/filters/mod.rs
index 24905f1340d7b..9b63cb11cb9cb 100644
--- a/third_party/rust/askama/src/filters/mod.rs
+++ b/third_party/rust/askama/src/filters/mod.rs
@@ -17,22 +17,26 @@ mod escape;
 mod humansize;
 #[cfg(feature = "serde_json")]
 mod json;
+#[cfg(feature = "std")]
+mod std;
 #[cfg(feature = "urlencode")]
 mod urlencode;
 
 #[cfg(feature = "alloc")]
 pub use self::alloc::{
-    capitalize, fmt, format, indent, linebreaks, linebreaksbr, lower, lowercase, paragraphbreaks,
-    title, trim, upper, uppercase, wordcount,
+    AsIndent, capitalize, fmt, format, indent, linebreaks, linebreaksbr, lower, lowercase,
+    paragraphbreaks, title, titlecase, trim, upper, uppercase, wordcount,
 };
 pub use self::builtin::{PluralizeCount, center, join, pluralize, truncate};
 pub use self::escape::{
-    AutoEscape, AutoEscaper, Escaper, FastWritable, Html, HtmlSafe, HtmlSafeOutput, MaybeSafe,
-    Safe, Text, Unsafe, Writable, WriteWritable, e, escape, safe,
+    AutoEscape, AutoEscaper, Escaper, Html, HtmlSafe, HtmlSafeOutput, MaybeSafe, Safe, Text,
+    Unsafe, Writable, WriteWritable, e, escape, safe,
 };
 pub use self::humansize::filesizeformat;
 #[cfg(feature = "serde_json")]
-pub use self::json::{AsIndent, json, json_pretty};
+pub use self::json::{json, json_pretty};
+#[cfg(feature = "std")]
+pub use self::std::unique;
 #[cfg(feature = "urlencode")]
 pub use self::urlencode::{urlencode, urlencode_strict};
 
diff --git a/third_party/rust/askama/src/filters/std.rs b/third_party/rust/askama/src/filters/std.rs
new file mode 100644
index 0000000000000..08f7912dc3ad3
--- /dev/null
+++ b/third_party/rust/askama/src/filters/std.rs
@@ -0,0 +1,63 @@
+use core::convert::Infallible;
+use std::collections::HashMap;
+use std::collections::hash_map::Entry;
+use std::hash::Hash;
+use std::rc::Rc;
+
+/// Returns an iterator with all duplicates removed.
+///
+/// The sorting order is kept, no extra allocation is performed. However, to make it possible,
+/// the data is wrapped inside `Rc`.
+///
+/// ```
+/// # use askama::Template;
+/// #[derive(Template)]
+/// #[template(ext = "html", source = "{% for elem in example|unique %}{{ elem }},{% endfor %}")]
+/// struct Example<'a> {
+///     example: Vec<&'a str>,
+/// }
+///
+/// assert_eq!(
+///     Example { example: vec!["a", "b", "a", "c"] }.to_string(),
+///     "a,b,c,"
+/// );
+/// ```
+pub fn unique<T: Hash + Eq>(
+    it: impl IntoIterator<Item = T>,
+) -> Result<impl Iterator<Item = Rc<T>>, Infallible> {
+    let mut set = HashMap::new();
+
+    Ok(it.into_iter().filter_map(move |elem| {
+        // To prevent cloning the data, we need to use `Rc`, like that we can clone `elem` as
+        // key of the `HashSet` and return it.
+        if let Entry::Vacant(entry) = set.entry(Rc::new(elem)) {
+            Some(Rc::clone(entry.insert_entry(()).key()))
+        } else {
+            None
+        }
+    }))
+}
+
+#[cfg(test)]
+mod test {
+    use alloc::vec; // It's the macro, not the module.
+    use alloc::vec::Vec;
+
+    use super::*;
+
+    #[test]
+    fn test_unique() {
+        assert_eq!(
+            unique(["a", "b", "a", "c"]).unwrap().collect::<Vec<_>>(),
+            vec![Rc::new("a"), Rc::new("b"), Rc::new("c")]
+        );
+        assert_eq!(
+            unique([1, 1, 1, 2, 1]).unwrap().collect::<Vec<_>>(),
+            vec![Rc::new(1), Rc::new(2)]
+        );
+        assert_eq!(
+            unique("hello".chars()).unwrap().collect::<Vec<_>>(),
+            vec![Rc::new('h'), Rc::new('e'), Rc::new('l'), Rc::new('o')]
+        );
+    }
+}
diff --git a/third_party/rust/askama/src/filters/urlencode.rs b/third_party/rust/askama/src/filters/urlencode.rs
index 8a83779284988..a5205e6d441da 100644
--- a/third_party/rust/askama/src/filters/urlencode.rs
+++ b/third_party/rust/askama/src/filters/urlencode.rs
@@ -4,7 +4,8 @@ use std::fmt::Write;
 
 use percent_encoding::{AsciiSet, NON_ALPHANUMERIC, utf8_percent_encode};
 
-use crate::filters::{FastWritable, HtmlSafeOutput};
+use crate::filters::HtmlSafeOutput;
+use crate::{FastWritable, Values};
 
 // Urlencode char encoding set. Only the characters in the unreserved set don't
 // have any special purpose in any part of a URI and can be safely left
@@ -110,8 +111,12 @@ impl<T: fmt::Display> fmt::Display for UrlencodeFilter<T> {
 
 impl<T: FastWritable> FastWritable for UrlencodeFilter<T> {
     #[inline]
-    fn write_into<W: fmt::Write + ?Sized>(&self, f: &mut W) -> crate::Result<()> {
-        self.0.write_into(&mut UrlencodeWriter(f, self.1))
+    fn write_into<W: fmt::Write + ?Sized>(
+        &self,
+        f: &mut W,
+        values: &dyn Values,
+    ) -> crate::Result<()> {
+        self.0.write_into(&mut UrlencodeWriter(f, self.1), values)
     }
 }
 
diff --git a/third_party/rust/askama/src/helpers.rs b/third_party/rust/askama/src/helpers.rs
index 7efdbd30b9d60..4188d334d68dd 100644
--- a/third_party/rust/askama/src/helpers.rs
+++ b/third_party/rust/askama/src/helpers.rs
@@ -13,8 +13,8 @@ use core::ops::Deref;
 use core::pin::Pin;
 
 pub use crate::error::{ErrorMarker, ResultConverter};
-use crate::filters::FastWritable;
 pub use crate::values::get_value;
+use crate::{FastWritable, Values};
 
 pub struct TemplateLoop<I>
 where
@@ -245,7 +245,19 @@ impl fmt::Display for Empty {
 
 impl FastWritable for Empty {
     #[inline]
-    fn write_into<W: fmt::Write + ?Sized>(&self, _: &mut W) -> crate::Result<()> {
+    fn write_into<W: fmt::Write + ?Sized>(&self, _: &mut W, _: &dyn Values) -> crate::Result<()> {
+        Ok(())
+    }
+}
+
+impl fmt::Write for Empty {
+    #[inline]
+    fn write_str(&mut self, _: &str) -> fmt::Result {
+        Ok(())
+    }
+
+    #[inline]
+    fn write_char(&mut self, _: char) -> fmt::Result {
         Ok(())
     }
 }
@@ -267,9 +279,13 @@ impl<L: fmt::Display, R: fmt::Display> fmt::Display for Concat<L, R> {
 
 impl<L: FastWritable, R: FastWritable> FastWritable for Concat<L, R> {
     #[inline]
-    fn write_into<W: fmt::Write + ?Sized>(&self, dest: &mut W) -> crate::Result<()> {
-        self.0.write_into(dest)?;
-        self.1.write_into(dest)
+    fn write_into<W: fmt::Write + ?Sized>(
+        &self,
+        dest: &mut W,
+        values: &dyn Values,
+    ) -> crate::Result<()> {
+        self.0.write_into(dest, values)?;
+        self.1.write_into(dest, values)
     }
 }
 
diff --git a/third_party/rust/askama/src/lib.rs b/third_party/rust/askama/src/lib.rs
index d53950c843f80..599313075ebb2 100644
--- a/third_party/rust/askama/src/lib.rs
+++ b/third_party/rust/askama/src/lib.rs
@@ -76,6 +76,7 @@ mod values;
 #[cfg(feature = "alloc")]
 use alloc::string::String;
 use core::fmt;
+use core::ops::Deref;
 #[cfg(feature = "std")]
 use std::io;
 
@@ -109,7 +110,7 @@ pub use crate::values::{NO_VALUES, Value, Values, get_value};
 /// `.render()`.
 ///
 /// [dynamic methods calls]: <https://doc.rust-lang.org/stable/std/keyword.dyn.html>
-pub trait Template: fmt::Display + filters::FastWritable {
+pub trait Template: fmt::Display + FastWritable {
     /// Helper method which allocates a new `String` and renders into it.
     #[inline]
     #[cfg(feature = "alloc")]
@@ -370,6 +371,194 @@ macro_rules! impl_for_ref {
     }
 }
 
+/// Types implementing this trait can be written without needing to employ an [`fmt::Formatter`].
+pub trait FastWritable {
+    /// Used internally by askama to speed up writing some types.
+    fn write_into<W: fmt::Write + ?Sized>(
+        &self,
+        dest: &mut W,
+        values: &dyn Values,
+    ) -> crate::Result<()>;
+}
+
+const _: () = {
+    crate::impl_for_ref! {
+        impl FastWritable for T {
+            #[inline]
+            fn write_into<W: fmt::Write + ?Sized>(
+                &self,
+                dest: &mut W,
+                values: &dyn Values,
+            ) -> crate::Result<()> {
+                <T>::write_into(self, dest, values)
+            }
+        }
+    }
+
+    impl<T> FastWritable for core::pin::Pin<T>
+    where
+        T: Deref,
+        <T as Deref>::Target: FastWritable,
+    {
+        #[inline]
+        fn write_into<W: fmt::Write + ?Sized>(
+            &self,
+            dest: &mut W,
+            values: &dyn Values,
+        ) -> crate::Result<()> {
+            self.as_ref().get_ref().write_into(dest, values)
+        }
+    }
+
+    #[cfg(feature = "alloc")]
+    impl<T: FastWritable + alloc::borrow::ToOwned> FastWritable for alloc::borrow::Cow<'_, T> {
+        #[inline]
+        fn write_into<W: fmt::Write + ?Sized>(
+            &self,
+            dest: &mut W,
+            values: &dyn Values,
+        ) -> crate::Result<()> {
+            T::write_into(self.as_ref(), dest, values)
+        }
+    }
+
+    // implement FastWritable for a list of types
+    macro_rules! impl_for_int {
+        ($($ty:ty)*) => { $(
+            impl FastWritable for $ty {
+                #[inline]
+                fn write_into<W: fmt::Write + ?Sized>(
+                    &self,
+                    dest: &mut W,
+                    values: &dyn Values,
+                ) -> crate::Result<()> {
+                    itoa::Buffer::new().format(*self).write_into(dest, values)
+                }
+            }
+        )* };
+    }
+
+    impl_for_int!(
+        u8 u16 u32 u64 u128 usize
+        i8 i16 i32 i64 i128 isize
+    );
+
+    // implement FastWritable for a list of non-zero integral types
+    macro_rules! impl_for_nz_int {
+        ($($id:ident)*) => { $(
+            impl FastWritable for core::num::$id {
+                #[inline]
+                fn write_into<W: fmt::Write + ?Sized>(
+                    &self,
+                    dest: &mut W,
+                    values: &dyn Values,
+                ) -> crate::Result<()> {
+                    self.get().write_into(dest, values)
+                }
+            }
+        )* };
+    }
+
+    impl_for_nz_int!(
+        NonZeroU8 NonZeroU16 NonZeroU32 NonZeroU64 NonZeroU128 NonZeroUsize
+        NonZeroI8 NonZeroI16 NonZeroI32 NonZeroI64 NonZeroI128 NonZeroIsize
+    );
+
+    impl FastWritable for str {
+        #[inline]
+        fn write_into<W: fmt::Write + ?Sized>(
+            &self,
+            dest: &mut W,
+            _: &dyn Values,
+        ) -> crate::Result<()> {
+            Ok(dest.write_str(self)?)
+        }
+    }
+
+    #[cfg(feature = "alloc")]
+    impl FastWritable for alloc::string::String {
+        #[inline]
+        fn write_into<W: fmt::Write + ?Sized>(
+            &self,
+            dest: &mut W,
+            values: &dyn Values,
+        ) -> crate::Result<()> {
+            self.as_str().write_into(dest, values)
+        }
+    }
+
+    impl FastWritable for bool {
+        #[inline]
+        fn write_into<W: fmt::Write + ?Sized>(
+            &self,
+            dest: &mut W,
+            _: &dyn Values,
+        ) -> crate::Result<()> {
+            Ok(dest.write_str(match self {
+                true => "true",
+                false => "false",
+            })?)
+        }
+    }
+
+    impl FastWritable for char {
+        #[inline]
+        fn write_into<W: fmt::Write + ?Sized>(
+            &self,
+            dest: &mut W,
+            _: &dyn Values,
+        ) -> crate::Result<()> {
+            Ok(dest.write_char(*self)?)
+        }
+    }
+
+    impl FastWritable for fmt::Arguments<'_> {
+        fn write_into<W: fmt::Write + ?Sized>(
+            &self,
+            dest: &mut W,
+            _: &dyn Values,
+        ) -> crate::Result<()> {
+            Ok(match self.as_str() {
+                Some(s) => dest.write_str(s),
+                None => dest.write_fmt(*self),
+            }?)
+        }
+    }
+
+    impl<S: crate::Template + ?Sized> filters::WriteWritable for &filters::Writable<'_, S> {
+        #[inline]
+        fn askama_write<W: fmt::Write + ?Sized>(
+            &self,
+            dest: &mut W,
+            values: &dyn Values,
+        ) -> crate::Result<()> {
+            self.0.render_into_with_values(dest, values)
+        }
+    }
+
+    impl<S: FastWritable + ?Sized> filters::WriteWritable for &&filters::Writable<'_, S> {
+        #[inline]
+        fn askama_write<W: fmt::Write + ?Sized>(
+            &self,
+            dest: &mut W,
+            values: &dyn Values,
+        ) -> crate::Result<()> {
+            self.0.write_into(dest, values)
+        }
+    }
+
+    impl<S: fmt::Display + ?Sized> filters::WriteWritable for &&&filters::Writable<'_, S> {
+        #[inline]
+        fn askama_write<W: fmt::Write + ?Sized>(
+            &self,
+            dest: &mut W,
+            _: &dyn Values,
+        ) -> crate::Result<()> {
+            Ok(write!(dest, "{}", self.0)?)
+        }
+    }
+};
+
 pub(crate) use impl_for_ref;
 
 #[cfg(all(test, feature = "alloc"))]
@@ -404,10 +593,14 @@ mod tests {
             }
         }
 
-        impl filters::FastWritable for Test {
+        impl FastWritable for Test {
             #[inline]
-            fn write_into<W: fmt::Write + ?Sized>(&self, f: &mut W) -> crate::Result<()> {
-                self.render_into(f)
+            fn write_into<W: fmt::Write + ?Sized>(
+                &self,
+                f: &mut W,
+                values: &dyn Values,
+            ) -> crate::Result<()> {
+                self.render_into_with_values(f, values)
             }
         }
 
diff --git a/third_party/rust/askama_derive/.cargo-checksum.json b/third_party/rust/askama_derive/.cargo-checksum.json
index 9dd0930edfce1..871cd80677ed2 100644
--- a/third_party/rust/askama_derive/.cargo-checksum.json
+++ b/third_party/rust/askama_derive/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"afe7ca0d7f5c57e052aaf72bf0a0797594a2e964264400116d0e682517bb2239",".rustfmt.toml":"a3754a3582a6ab4247c2ace9f9686f8757f94691b01e86f340234c4c18073a1b","Cargo.lock":"8008614e39c3bc17f343022acece92f83df083c063fadd7285b487edb6144cd0","Cargo.toml":"82346a11579069448d1e1d80d0ace534961ec3614a5b1cf08ef26e9120a3373d","Cargo.toml.orig":"cfc4de298486db29aa882ef66685cdb90f565d7646565d880a4da79dc89b4d88","LICENSE-APACHE":"87cb0d734c723c083e51c825930ff42bce28596b52dee15567f6b28f19c195e3","LICENSE-MIT":"df20e0180764bf5bd76f74d47bc9e8c0069a666401629c390003a1d5eba99c92","README.md":"7ed9662073cd064bc6e5e57cd41658d318e9ae32285c5d6682a7c8ba83baef6c","_typos.toml":"72588ef2385568368e7ec251c8451f75a16343d5a06b4c2b312beba2cdf5b308","clippy.toml":"d141089a5edd91c83ae211257638df2ef1ca53f66b30faa98b22ea1447faeeff","deny.toml":"b7637b42164b1bbba883c422187292cf08ad624691145b5124eaf10edf38c164","empty_test_config.toml":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","src/config.rs":"56d724c4c21bd09c93ce8971226a5273eb86696eb1592e127149edcb43a2e4a1","src/generator.rs":"b3f3326072e436cc0ba7e4130e4298d8f3e5d8840121396b153aab4a13b1d403","src/generator/expr.rs":"1fcbbb2b7db536940d80d64863168f27f25b3b6c585c8f6522e5f38be3f800f9","src/generator/node.rs":"5c1dbee8e6ad4dacfa0a6a0c796489d2dd76f4625363beba866194fea65e3677","src/heritage.rs":"d726ea8a567be3503f7f6efa80f21fe009cc590dff63f0d4ad76cc8dd3c5bd43","src/html.rs":"91ee580663d8ad08460373d9e5c8ed196ab0ce61eb113dc8d43ad19ca6671422","src/input.rs":"0e2c0d4b574198511068069e7a11f6f2ab99a76281f45c7490f39cca631b9590","src/integration.rs":"bcdc1b7b1729487a8e4c756890e6d356622b725f1b9a41bff76eca87e71eaa0b","src/lib.rs":"0b9496bd40dc2bdca7ad825061e297ee9524ee18a30f7e065c4c6b583caca72a","src/tests.rs":"262039b9f6cbbf7a838ec55afbb6d6c0ffdf135090a58e157c66b63c8ead0c3b","templates/a.html":"b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c","templates/b.html":"7d865e959b2466918c9863afca942d0fb89d7c9ac0c99bafc3749504ded97730","templates/include1.html":"5a4304e5548d5cf618779383dcc27eba93d826feff1c41a348101c734c034ea2","templates/include2.html":"cd319fee61d9d0e8a00a40d55e91c338fd9e156e69773f03ba5c31db02892eb2","templates/include3.html":"1121cfccd5913f0a63fec40a6ffd44ea64f9dc135c66634ba001d10bcf4302a2","templates/sub/b.html":"7d865e959b2466918c9863afca942d0fb89d7c9ac0c99bafc3749504ded97730","templates/sub/c.html":"bf07a7fbb825fc0aae7bf4a1177b2b31fcf8a3feeaf7092761e18c859ee52a9c","templates/sub/sub1/d.html":"86b0c5a1e2b73b08fd54c727f4458649ed9fe3ad1b6e8ac9460c070113509a1e","tomlfmt.toml":"a33c21547346656aead5f46f2f07e1965f4cf0c6f2a16deb8ec06019619267aa"},"package":"d661e0f57be36a5c14c48f78d09011e67e0cb618f269cca9f2fd8d15b68c46ac"}
\ No newline at end of file
+{"files":{".cargo_vcs_info.json":"e595c82685e05c60b3a610267da7da99d67fbb7ce01e85dfed515029bb16dc7c",".rustfmt.toml":"a3754a3582a6ab4247c2ace9f9686f8757f94691b01e86f340234c4c18073a1b","Cargo.lock":"3865d3573baf1de5f9e9753561b6f09f408ea35b462036322b256ea10bf8090b","Cargo.toml":"6b245e85a90b2209744f29c49e4eb6f0322ab9bf56ef3ba0468ea5870865e07a","Cargo.toml.orig":"3b57992c26bf4b71731bff20cd7a0b25c3965e9fb4389e0cc67826de274de81c","LICENSE-APACHE":"87cb0d734c723c083e51c825930ff42bce28596b52dee15567f6b28f19c195e3","LICENSE-MIT":"df20e0180764bf5bd76f74d47bc9e8c0069a666401629c390003a1d5eba99c92","README.md":"7ed9662073cd064bc6e5e57cd41658d318e9ae32285c5d6682a7c8ba83baef6c","_typos.toml":"72588ef2385568368e7ec251c8451f75a16343d5a06b4c2b312beba2cdf5b308","clippy.toml":"1d57e7a7054a89a2f5a11b7e1d863d20bd60d8d0fcca5ef500c185eb76806ea5","deny.toml":"b7637b42164b1bbba883c422187292cf08ad624691145b5124eaf10edf38c164","empty_test_config.toml":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","src/config.rs":"56d724c4c21bd09c93ce8971226a5273eb86696eb1592e127149edcb43a2e4a1","src/generator.rs":"6e6347cb26453254558de4fb0631ad2f3bbb681d5795c7c695b0d6f36497fc4f","src/generator/expr.rs":"5e64b4f5aba9d1a228eff958fb696cfeb5ad0ab0b3c00fac9b28f7b6d8b48fcc","src/generator/filter.rs":"cca924850a2992b145a2e3c01cb115aef09678f282e1b7e55c5f04840069632c","src/generator/node.rs":"655203816ffd1f83d6e6bc5d169b8c93ced8fe1ec5cdaae411c6575c29e48b4d","src/heritage.rs":"d726ea8a567be3503f7f6efa80f21fe009cc590dff63f0d4ad76cc8dd3c5bd43","src/html.rs":"91ee580663d8ad08460373d9e5c8ed196ab0ce61eb113dc8d43ad19ca6671422","src/input.rs":"0e2c0d4b574198511068069e7a11f6f2ab99a76281f45c7490f39cca631b9590","src/integration.rs":"57adba07d8eef4d0d12e1dc7ae764dac4941f6a21ec1b4092c2c99d259a08996","src/lib.rs":"717b4b369d5e5873a4225d6c854607d38b7015380f3a445af3c6241ce8e226dd","src/tests.rs":"124670f5e4d62df820fe4b1c81c9e77944db7528c4cc147502a2d6e85bab11bf","templates/a.html":"b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c","templates/b.html":"7d865e959b2466918c9863afca942d0fb89d7c9ac0c99bafc3749504ded97730","templates/include1.html":"5a4304e5548d5cf618779383dcc27eba93d826feff1c41a348101c734c034ea2","templates/include2.html":"cd319fee61d9d0e8a00a40d55e91c338fd9e156e69773f03ba5c31db02892eb2","templates/include3.html":"1121cfccd5913f0a63fec40a6ffd44ea64f9dc135c66634ba001d10bcf4302a2","templates/sub/b.html":"7d865e959b2466918c9863afca942d0fb89d7c9ac0c99bafc3749504ded97730","templates/sub/c.html":"bf07a7fbb825fc0aae7bf4a1177b2b31fcf8a3feeaf7092761e18c859ee52a9c","templates/sub/sub1/d.html":"86b0c5a1e2b73b08fd54c727f4458649ed9fe3ad1b6e8ac9460c070113509a1e","tomlfmt.toml":"a33c21547346656aead5f46f2f07e1965f4cf0c6f2a16deb8ec06019619267aa"},"package":"129397200fe83088e8a68407a8e2b1f826cf0086b21ccdb866a722c8bcd3a94f"}
\ No newline at end of file
diff --git a/third_party/rust/askama_derive/.cargo_vcs_info.json b/third_party/rust/askama_derive/.cargo_vcs_info.json
index 95f945c2680b2..74055f3c61865 100644
--- a/third_party/rust/askama_derive/.cargo_vcs_info.json
+++ b/third_party/rust/askama_derive/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "0b1c0e4d35c38311f179b069f6a7008c9490b786"
+    "sha1": "95867ac8cedc80b69f4047dea9c1272a5bf947b3"
   },
   "path_in_vcs": "askama_derive"
 }
\ No newline at end of file
diff --git a/third_party/rust/askama_derive/Cargo.lock b/third_party/rust/askama_derive/Cargo.lock
index ead15187ac26d..5a427a08a06ef 100644
--- a/third_party/rust/askama_derive/Cargo.lock
+++ b/third_party/rust/askama_derive/Cargo.lock
@@ -1,10 +1,10 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "askama_derive"
-version = "0.13.1"
+version = "0.14.0"
 dependencies = [
  "askama_parser",
  "basic-toml",
@@ -23,9 +23,9 @@ dependencies = [
 
 [[package]]
 name = "askama_parser"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf315ce6524c857bb129ff794935cf6d42c82a6cff60526fe2a63593de4d0d4f"
+checksum = "d6ab5630b3d5eaf232620167977f95eb51f3432fc76852328774afbd242d4358"
 dependencies = [
  "memchr",
  "serde",
@@ -69,9 +69,9 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
 name = "memchr"
@@ -87,9 +87,9 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "prettyplease"
-version = "0.2.31"
+version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5316f57387668042f561aae71480de936257848f9c43ce528e311d89a07cadeb"
+checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6"
 dependencies = [
  "proc-macro2",
  "syn",
@@ -97,9 +97,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
@@ -260,9 +260,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36"
+checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10"
 dependencies = [
  "memchr",
 ]
diff --git a/third_party/rust/askama_derive/Cargo.toml b/third_party/rust/askama_derive/Cargo.toml
index 1bd894713e204..47d54c75535ee 100644
--- a/third_party/rust/askama_derive/Cargo.toml
+++ b/third_party/rust/askama_derive/Cargo.toml
@@ -11,9 +11,9 @@
 
 [package]
 edition = "2021"
-rust-version = "1.81"
+rust-version = "1.83"
 name = "askama_derive"
-version = "0.13.1"
+version = "0.14.0"
 build = false
 autolib = false
 autobins = false
@@ -73,7 +73,7 @@ optional = true
 version = "2"
 
 [dependencies.parser]
-version = "=0.13.0"
+version = "=0.14.0"
 package = "askama_parser"
 
 [dependencies.proc-macro2]
diff --git a/third_party/rust/askama_derive/Cargo.toml.orig b/third_party/rust/askama_derive/Cargo.toml.orig
index 8c022b2d1abfd..a9d1e42a1a34f 100644
--- a/third_party/rust/askama_derive/Cargo.toml.orig
+++ b/third_party/rust/askama_derive/Cargo.toml.orig
@@ -1,13 +1,13 @@
 [package]
 name = "askama_derive"
-version = "0.13.1"
+version = "0.14.0"
 description = "Procedural macro package for Askama"
 homepage = "https://github.com/askama-rs/askama"
 repository = "https://github.com/askama-rs/askama"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 edition = "2021"
-rust-version = "1.81"
+rust-version = "1.83"
 
 [package.metadata.docs.rs]
 all-features = true
@@ -17,7 +17,7 @@ rustdoc-args = ["--generate-link-to-definition", "--cfg=docsrs"]
 proc-macro = true
 
 [dependencies]
-parser = { package = "askama_parser", version = "=0.13.0", path = "../askama_parser" }
+parser = { package = "askama_parser", version = "=0.14.0", path = "../askama_parser" }
 
 basic-toml = { version = "0.1.1", optional = true }
 pulldown-cmark = { version = "0.13.0", optional = true, default-features = false }
diff --git a/third_party/rust/askama_derive/clippy.toml b/third_party/rust/askama_derive/clippy.toml
index 5e90250c4555a..4e779c6ce119b 100644
--- a/third_party/rust/askama_derive/clippy.toml
+++ b/third_party/rust/askama_derive/clippy.toml
@@ -1 +1 @@
-msrv = "1.81.0"
+msrv = "1.83.0"
diff --git a/third_party/rust/askama_derive/src/generator.rs b/third_party/rust/askama_derive/src/generator.rs
index edca2eaaa6c99..1d713613efcdb 100644
--- a/third_party/rust/askama_derive/src/generator.rs
+++ b/third_party/rust/askama_derive/src/generator.rs
@@ -1,4 +1,5 @@
 mod expr;
+mod filter;
 mod node;
 
 use std::borrow::Cow;
@@ -307,14 +308,18 @@ impl<'a, 'h> Generator<'a, 'h> {
             }
 
             // cannot use `crate::integrations::impl_fast_writable()` w/o cloning the struct
-            impl #wrapper_impl_generics askama::filters::FastWritable
+            impl #wrapper_impl_generics askama::FastWritable
             for #wrapper_id #wrapper_ty_generics #wrapper_where_clause {
                 #[inline]
-                fn write_into<AskamaW>(&self, dest: &mut AskamaW) -> askama::Result<()>
+                fn write_into<AskamaW>(
+                    &self,
+                    dest: &mut AskamaW,
+                    values: &dyn askama::Values,
+                ) -> askama::Result<()>
                 where
                     AskamaW: askama::helpers::core::fmt::Write + ?askama::helpers::core::marker::Sized
                 {
-                    <_ as askama::Template>::render_into(self, dest)
+                    <_ as askama::Template>::render_into_with_values(self, dest, values)
                 }
             }
 
diff --git a/third_party/rust/askama_derive/src/generator/expr.rs b/third_party/rust/askama_derive/src/generator/expr.rs
index b7cdb0fd7d77e..f6db6b3184db8 100644
--- a/third_party/rust/askama_derive/src/generator/expr.rs
+++ b/third_party/rust/askama_derive/src/generator/expr.rs
@@ -1,25 +1,22 @@
 use std::borrow::Cow;
 
 use parser::node::CondTest;
-use parser::{
-    Attr, CharLit, CharPrefix, Expr, Filter, IntKind, Num, Span, StrLit, StrPrefix, Target,
-    TyGenerics, WithSpan,
-};
+use parser::{Attr, CharLit, CharPrefix, Expr, Filter, Span, StrLit, Target, TyGenerics, WithSpan};
 use quote::quote;
 
 use super::{
-    DisplayWrap, FILTER_SOURCE, Generator, LocalMeta, TargetIsize, TargetUsize, Writable,
-    compile_time_escape, is_copyable, normalize_identifier,
+    DisplayWrap, FILTER_SOURCE, Generator, LocalMeta, Writable, compile_time_escape, is_copyable,
+    normalize_identifier,
 };
+use crate::CompileError;
 use crate::heritage::Context;
 use crate::integration::Buffer;
-use crate::{BUILTIN_FILTERS, BUILTIN_FILTERS_NEED_ALLOC, CompileError, MsgValidEscapers};
 
 impl<'a> Generator<'a, '_> {
     pub(crate) fn visit_expr_root(
         &mut self,
         ctx: &Context<'_>,
-        expr: &WithSpan<'_, Expr<'a>>,
+        expr: &WithSpan<'a, Expr<'a>>,
     ) -> Result<String, CompileError> {
         let mut buf = Buffer::new();
         self.visit_expr(ctx, &mut buf, expr)?;
@@ -30,7 +27,7 @@ impl<'a> Generator<'a, '_> {
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        expr: &WithSpan<'_, Expr<'a>>,
+        expr: &WithSpan<'a, Expr<'a>>,
     ) -> Result<DisplayWrap, CompileError> {
         Ok(match **expr {
             Expr::BoolLit(s) => self.visit_bool_lit(buf, s),
@@ -68,6 +65,7 @@ impl<'a> Generator<'a, '_> {
             Expr::As(ref expr, target) => self.visit_as(ctx, buf, expr, target)?,
             Expr::Concat(ref exprs) => self.visit_concat(ctx, buf, exprs)?,
             Expr::LetCond(ref cond) => self.visit_let_cond(ctx, buf, cond)?,
+            Expr::ArgumentPlaceholder => DisplayWrap::Unwrapped,
         })
     }
 
@@ -82,7 +80,7 @@ impl<'a> Generator<'a, '_> {
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        expr: &WithSpan<'_, Expr<'a>>,
+        expr: &WithSpan<'a, Expr<'a>>,
     ) -> Result<DisplayWrap, CompileError> {
         match **expr {
             Expr::BinOp(op @ ("||" | "&&"), ref left, _) => {
@@ -103,7 +101,7 @@ impl<'a> Generator<'a, '_> {
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        expr: &WithSpan<'_, Expr<'a>>,
+        expr: &WithSpan<'a, Expr<'a>>,
         prev_display_wrap: DisplayWrap,
     ) -> Result<DisplayWrap, CompileError> {
         match **expr {
@@ -122,7 +120,7 @@ impl<'a> Generator<'a, '_> {
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        expr: &WithSpan<'_, Expr<'a>>,
+        expr: &WithSpan<'a, Expr<'a>>,
     ) -> Result<(), CompileError> {
         match &**expr {
             Expr::BoolLit(_) | Expr::IsDefined(_) | Expr::IsNotDefined(_) => {
@@ -171,7 +169,7 @@ impl<'a> Generator<'a, '_> {
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        expr: &WithSpan<'_, Expr<'a>>,
+        expr: &WithSpan<'a, Expr<'a>>,
         target: &str,
     ) -> Result<DisplayWrap, CompileError> {
         buf.write("askama::helpers::get_primitive_value(&(");
@@ -186,7 +184,7 @@ impl<'a> Generator<'a, '_> {
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        exprs: &[WithSpan<'_, Expr<'a>>],
+        exprs: &[WithSpan<'a, Expr<'a>>],
     ) -> Result<DisplayWrap, CompileError> {
         match exprs {
             [] => unreachable!(),
@@ -207,7 +205,7 @@ impl<'a> Generator<'a, '_> {
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        cond: &WithSpan<'_, CondTest<'a>>,
+        cond: &WithSpan<'a, CondTest<'a>>,
     ) -> Result<DisplayWrap, CompileError> {
         let mut expr_buf = Buffer::new();
         let display_wrap = self.visit_expr_first(ctx, &mut expr_buf, &cond.expr)?;
@@ -223,7 +221,7 @@ impl<'a> Generator<'a, '_> {
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        expr: &WithSpan<'_, Expr<'a>>,
+        expr: &WithSpan<'a, Expr<'a>>,
     ) -> Result<DisplayWrap, CompileError> {
         buf.write("match (");
         self.visit_expr(ctx, buf, expr)?;
@@ -242,450 +240,12 @@ impl<'a> Generator<'a, '_> {
         DisplayWrap::Unwrapped
     }
 
-    pub(crate) fn visit_filter(
-        &mut self,
-        ctx: &Context<'_>,
-        buf: &mut Buffer,
-        name: &str,
-        args: &[WithSpan<'_, Expr<'a>>],
-        generics: &[WithSpan<'_, TyGenerics<'_>>],
-        node: Span<'_>,
-    ) -> Result<DisplayWrap, CompileError> {
-        let filter = match name {
-            "deref" => Self::_visit_deref_filter,
-            "escape" | "e" => Self::_visit_escape_filter,
-            "filesizeformat" => Self::_visit_humansize,
-            "fmt" => Self::_visit_fmt_filter,
-            "format" => Self::_visit_format_filter,
-            "join" => Self::_visit_join_filter,
-            "json" | "tojson" => Self::_visit_json_filter,
-            "linebreaks" => Self::_visit_linebreaks_filter,
-            "linebreaksbr" => Self::_visit_linebreaksbr_filter,
-            "paragraphbreaks" => Self::_visit_paragraphbreaks_filter,
-            "pluralize" => Self::_visit_pluralize_filter,
-            "ref" => Self::_visit_ref_filter,
-            "safe" => Self::_visit_safe_filter,
-            "urlencode" => Self::_visit_urlencode_filter,
-            "urlencode_strict" => Self::_visit_urlencode_strict_filter,
-            "value" => return self._visit_value(ctx, buf, args, generics, node, "`value` filter"),
-            name if BUILTIN_FILTERS.contains(&name) => {
-                return self._visit_builtin_filter(ctx, buf, name, args, generics, node);
-            }
-            _ => return self._visit_custom_filter(ctx, buf, name, args, generics, node),
-        };
-        if !generics.is_empty() {
-            Err(ctx.generate_error(format_args!("unexpected generics on filter `{name}`"), node))
-        } else {
-            filter(self, ctx, buf, args, node)
-        }
-    }
-
-    fn _visit_custom_filter(
-        &mut self,
-        ctx: &Context<'_>,
-        buf: &mut Buffer,
-        name: &str,
-        args: &[WithSpan<'_, Expr<'a>>],
-        generics: &[WithSpan<'_, TyGenerics<'_>>],
-        node: Span<'_>,
-    ) -> Result<DisplayWrap, CompileError> {
-        if BUILTIN_FILTERS_NEED_ALLOC.contains(&name) {
-            ensure_filter_has_feature_alloc(ctx, name, node)?;
-        }
-        buf.write(format_args!("filters::{name}"));
-        self.visit_call_generics(buf, generics);
-        buf.write('(');
-        self._visit_args(ctx, buf, args)?;
-        buf.write(")?");
-        Ok(DisplayWrap::Unwrapped)
-    }
-
-    fn _visit_builtin_filter(
-        &mut self,
-        ctx: &Context<'_>,
-        buf: &mut Buffer,
-        name: &str,
-        args: &[WithSpan<'_, Expr<'a>>],
-        generics: &[WithSpan<'_, TyGenerics<'_>>],
-        node: Span<'_>,
-    ) -> Result<DisplayWrap, CompileError> {
-        if !generics.is_empty() {
-            return Err(
-                ctx.generate_error(format_args!("unexpected generics on filter `{name}`"), node)
-            );
-        }
-        buf.write(format_args!("askama::filters::{name}"));
-        self.visit_call_generics(buf, generics);
-        buf.write('(');
-        self._visit_args(ctx, buf, args)?;
-        buf.write(")?");
-        Ok(DisplayWrap::Unwrapped)
-    }
-
-    fn _visit_urlencode_filter(
-        &mut self,
-        ctx: &Context<'_>,
-        buf: &mut Buffer,
-        args: &[WithSpan<'_, Expr<'a>>],
-        node: Span<'_>,
-    ) -> Result<DisplayWrap, CompileError> {
-        self._visit_urlencode_filter_inner(ctx, buf, "urlencode", args, node)
-    }
-
-    fn _visit_urlencode_strict_filter(
-        &mut self,
-        ctx: &Context<'_>,
-        buf: &mut Buffer,
-        args: &[WithSpan<'_, Expr<'a>>],
-        node: Span<'_>,
-    ) -> Result<DisplayWrap, CompileError> {
-        self._visit_urlencode_filter_inner(ctx, buf, "urlencode_strict", args, node)
-    }
-
-    fn _visit_urlencode_filter_inner(
-        &mut self,
-        ctx: &Context<'_>,
-        buf: &mut Buffer,
-        name: &str,
-        args: &[WithSpan<'_, Expr<'a>>],
-        node: Span<'_>,
-    ) -> Result<DisplayWrap, CompileError> {
-        if cfg!(not(feature = "urlencode")) {
-            return Err(ctx.generate_error(
-                format_args!("the `{name}` filter requires the `urlencode` feature to be enabled"),
-                node,
-            ));
-        }
-
-        // Both filters return HTML-safe strings.
-        buf.write(format_args!(
-            "askama::filters::HtmlSafeOutput(askama::filters::{name}(",
-        ));
-        self._visit_args(ctx, buf, args)?;
-        buf.write(")?)");
-        Ok(DisplayWrap::Unwrapped)
-    }
-
-    fn _visit_humansize(
-        &mut self,
-        ctx: &Context<'_>,
-        buf: &mut Buffer,
-        args: &[WithSpan<'_, Expr<'a>>],
-        _node: Span<'_>,
-    ) -> Result<DisplayWrap, CompileError> {
-        // All filters return numbers, and any default formatted number is HTML safe.
-        buf.write(format_args!(
-            "askama::filters::HtmlSafeOutput(askama::filters::filesizeformat(\
-                 askama::helpers::get_primitive_value(&("
-        ));
-        self._visit_args(ctx, buf, args)?;
-        buf.write(")) as askama::helpers::core::primitive::f32)?)");
-        Ok(DisplayWrap::Unwrapped)
-    }
-
-    fn _visit_pluralize_filter(
-        &mut self,
-        ctx: &Context<'_>,
-        buf: &mut Buffer,
-        args: &[WithSpan<'_, Expr<'a>>],
-        node: Span<'_>,
-    ) -> Result<DisplayWrap, CompileError> {
-        const SINGULAR: &WithSpan<'static, Expr<'static>> =
-            &WithSpan::new_without_span(Expr::StrLit(StrLit {
-                prefix: None,
-                content: "",
-            }));
-        const PLURAL: &WithSpan<'static, Expr<'static>> =
-            &WithSpan::new_without_span(Expr::StrLit(StrLit {
-                prefix: None,
-                content: "s",
-            }));
-
-        let (count, sg, pl) = match args {
-            [count] => (count, SINGULAR, PLURAL),
-            [count, sg] => (count, sg, PLURAL),
-            [count, sg, pl] => (count, sg, pl),
-            _ => {
-                return Err(
-                    ctx.generate_error("unexpected argument(s) in `pluralize` filter", node)
-                );
-            }
-        };
-        if let Some(is_singular) = expr_is_int_lit_plus_minus_one(count) {
-            let value = if is_singular { sg } else { pl };
-            self._visit_auto_escaped_arg(ctx, buf, value)?;
-        } else {
-            buf.write("askama::filters::pluralize(");
-            self._visit_arg(ctx, buf, count)?;
-            for value in [sg, pl] {
-                buf.write(',');
-                self._visit_auto_escaped_arg(ctx, buf, value)?;
-            }
-            buf.write(")?");
-        }
-        Ok(DisplayWrap::Wrapped)
-    }
-
-    fn _visit_paragraphbreaks_filter(
-        &mut self,
-        ctx: &Context<'_>,
-        buf: &mut Buffer,
-        args: &[WithSpan<'_, Expr<'a>>],
-        node: Span<'_>,
-    ) -> Result<DisplayWrap, CompileError> {
-        self._visit_linebreaks_filters(ctx, buf, "paragraphbreaks", args, node)
-    }
-
-    fn _visit_linebreaksbr_filter(
-        &mut self,
-        ctx: &Context<'_>,
-        buf: &mut Buffer,
-        args: &[WithSpan<'_, Expr<'a>>],
-        node: Span<'_>,
-    ) -> Result<DisplayWrap, CompileError> {
-        self._visit_linebreaks_filters(ctx, buf, "linebreaksbr", args, node)
-    }
-
-    fn _visit_linebreaks_filter(
-        &mut self,
-        ctx: &Context<'_>,
-        buf: &mut Buffer,
-        args: &[WithSpan<'_, Expr<'a>>],
-        node: Span<'_>,
-    ) -> Result<DisplayWrap, CompileError> {
-        self._visit_linebreaks_filters(ctx, buf, "linebreaks", args, node)
-    }
-
-    fn _visit_linebreaks_filters(
-        &mut self,
-        ctx: &Context<'_>,
-        buf: &mut Buffer,
-        name: &str,
-        args: &[WithSpan<'_, Expr<'a>>],
-        node: Span<'_>,
-    ) -> Result<DisplayWrap, CompileError> {
-        ensure_filter_has_feature_alloc(ctx, name, node)?;
-        if args.len() != 1 {
-            return Err(ctx.generate_error(
-                format_args!("unexpected argument(s) in `{name}` filter"),
-                node,
-            ));
-        }
-        buf.write(format_args!(
-            "askama::filters::{name}(&(&&askama::filters::AutoEscaper::new(&(",
-        ));
-        self._visit_args(ctx, buf, args)?;
-        // The input is always HTML escaped, regardless of the selected escaper:
-        buf.write("), askama::filters::Html)).askama_auto_escape()?)?");
-        // The output is marked as HTML safe, not safe in all contexts:
-        Ok(DisplayWrap::Unwrapped)
-    }
-
-    fn _visit_ref_filter(
-        &mut self,
-        ctx: &Context<'_>,
-        buf: &mut Buffer,
-        args: &[WithSpan<'_, Expr<'a>>],
-        node: Span<'_>,
-    ) -> Result<DisplayWrap, CompileError> {
-        let arg = match args {
-            [arg] => arg,
-            _ => return Err(ctx.generate_error("unexpected argument(s) in `as_ref` filter", node)),
-        };
-        buf.write('&');
-        self.visit_expr(ctx, buf, arg)?;
-        Ok(DisplayWrap::Unwrapped)
-    }
-
-    fn _visit_deref_filter(
-        &mut self,
-        ctx: &Context<'_>,
-        buf: &mut Buffer,
-        args: &[WithSpan<'_, Expr<'a>>],
-        node: Span<'_>,
-    ) -> Result<DisplayWrap, CompileError> {
-        let arg = match args {
-            [arg] => arg,
-            _ => return Err(ctx.generate_error("unexpected argument(s) in `deref` filter", node)),
-        };
-        buf.write('*');
-        self.visit_expr(ctx, buf, arg)?;
-        Ok(DisplayWrap::Unwrapped)
-    }
-
-    fn _visit_json_filter(
-        &mut self,
-        ctx: &Context<'_>,
-        buf: &mut Buffer,
-        args: &[WithSpan<'_, Expr<'a>>],
-        node: Span<'_>,
-    ) -> Result<DisplayWrap, CompileError> {
-        if cfg!(not(feature = "serde_json")) {
-            return Err(ctx.generate_error(
-                "the `json` filter requires the `serde_json` feature to be enabled",
-                node,
-            ));
-        }
-
-        let filter = match args.len() {
-            1 => "json",
-            2 => "json_pretty",
-            _ => return Err(ctx.generate_error("unexpected argument(s) in `json` filter", node)),
-        };
-        buf.write(format_args!("askama::filters::{filter}("));
-        self._visit_args(ctx, buf, args)?;
-        buf.write(")?");
-        Ok(DisplayWrap::Unwrapped)
-    }
-
-    fn _visit_safe_filter(
+    pub(super) fn visit_value(
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        args: &[WithSpan<'_, Expr<'a>>],
-        node: Span<'_>,
-    ) -> Result<DisplayWrap, CompileError> {
-        if args.len() != 1 {
-            return Err(ctx.generate_error("unexpected argument(s) in `safe` filter", node));
-        }
-        buf.write("askama::filters::safe(");
-        self._visit_args(ctx, buf, args)?;
-        buf.write(format_args!(", {})?", self.input.escaper));
-        Ok(DisplayWrap::Wrapped)
-    }
-
-    fn _visit_escape_filter(
-        &mut self,
-        ctx: &Context<'_>,
-        buf: &mut Buffer,
-        args: &[WithSpan<'_, Expr<'a>>],
-        node: Span<'_>,
-    ) -> Result<DisplayWrap, CompileError> {
-        if args.len() > 2 {
-            return Err(ctx.generate_error("only two arguments allowed to escape filter", node));
-        }
-        let opt_escaper = match args.get(1).map(|expr| &**expr) {
-            Some(Expr::StrLit(StrLit { prefix, content })) => {
-                if let Some(prefix) = prefix {
-                    let kind = if *prefix == StrPrefix::Binary {
-                        "slice"
-                    } else {
-                        "CStr"
-                    };
-                    return Err(ctx.generate_error(
-                        format_args!(
-                            "invalid escaper `b{content:?}`. Expected a string, found a {kind}"
-                        ),
-                        args[1].span(),
-                    ));
-                }
-                Some(content)
-            }
-            Some(_) => {
-                return Err(ctx.generate_error("invalid escaper type for escape filter", node));
-            }
-            None => None,
-        };
-        let escaper = match opt_escaper {
-            Some(name) => self
-                .input
-                .config
-                .escapers
-                .iter()
-                .find_map(|(extensions, path)| {
-                    extensions
-                        .contains(&Cow::Borrowed(name))
-                        .then_some(path.as_ref())
-                })
-                .ok_or_else(|| {
-                    ctx.generate_error(
-                        format_args!(
-                            "invalid escaper '{name}' for `escape` filter. {}",
-                            MsgValidEscapers(&self.input.config.escapers),
-                        ),
-                        node,
-                    )
-                })?,
-            None => self.input.escaper,
-        };
-        buf.write("askama::filters::escape(");
-        self._visit_args(ctx, buf, &args[..1])?;
-        buf.write(format_args!(", {escaper})?"));
-        Ok(DisplayWrap::Wrapped)
-    }
-
-    fn _visit_format_filter(
-        &mut self,
-        ctx: &Context<'_>,
-        buf: &mut Buffer,
-        args: &[WithSpan<'_, Expr<'a>>],
-        node: Span<'_>,
-    ) -> Result<DisplayWrap, CompileError> {
-        ensure_filter_has_feature_alloc(ctx, "format", node)?;
-        if !args.is_empty() {
-            if let Expr::StrLit(ref fmt) = *args[0] {
-                buf.write("askama::helpers::alloc::format!(");
-                self.visit_str_lit(buf, fmt);
-                if args.len() > 1 {
-                    buf.write(',');
-                    self._visit_args(ctx, buf, &args[1..])?;
-                }
-                buf.write(')');
-                return Ok(DisplayWrap::Unwrapped);
-            }
-        }
-        Err(ctx.generate_error(r#"use filter format like `"a={} b={}"|format(a, b)`"#, node))
-    }
-
-    fn _visit_fmt_filter(
-        &mut self,
-        ctx: &Context<'_>,
-        buf: &mut Buffer,
-        args: &[WithSpan<'_, Expr<'a>>],
-        node: Span<'_>,
-    ) -> Result<DisplayWrap, CompileError> {
-        ensure_filter_has_feature_alloc(ctx, "fmt", node)?;
-        if let [_, arg2] = args {
-            if let Expr::StrLit(ref fmt) = **arg2 {
-                buf.write("askama::helpers::alloc::format!(");
-                self.visit_str_lit(buf, fmt);
-                buf.write(',');
-                self._visit_args(ctx, buf, &args[..1])?;
-                buf.write(')');
-                return Ok(DisplayWrap::Unwrapped);
-            }
-        }
-        Err(ctx.generate_error(r#"use filter fmt like `value|fmt("{:?}")`"#, node))
-    }
-
-    // Force type coercion on first argument to `join` filter (see #39).
-    fn _visit_join_filter(
-        &mut self,
-        ctx: &Context<'_>,
-        buf: &mut Buffer,
-        args: &[WithSpan<'_, Expr<'a>>],
-        _node: Span<'_>,
-    ) -> Result<DisplayWrap, CompileError> {
-        buf.write("askama::filters::join((&");
-        for (i, arg) in args.iter().enumerate() {
-            if i > 0 {
-                buf.write(", &");
-            }
-            self.visit_expr(ctx, buf, arg)?;
-            if i == 0 {
-                buf.write(").into_iter()");
-            }
-        }
-        buf.write(")?");
-        Ok(DisplayWrap::Unwrapped)
-    }
-
-    fn _visit_value(
-        &mut self,
-        ctx: &Context<'_>,
-        buf: &mut Buffer,
-        args: &[WithSpan<'_, Expr<'a>>],
-        generics: &[WithSpan<'_, TyGenerics<'_>>],
+        args: &[WithSpan<'a, Expr<'a>>],
+        generics: &[WithSpan<'a, TyGenerics<'a>>],
         node: Span<'_>,
         kind: &str,
     ) -> Result<DisplayWrap, CompileError> {
@@ -706,47 +266,47 @@ impl<'a> Generator<'a, '_> {
         self.visit_ty_generic(buf, gen);
         buf.write('>');
         buf.write("(&__askama_values, &(");
-        self._visit_arg(ctx, buf, key)?;
+        self.visit_arg(ctx, buf, key)?;
         buf.write("))");
         Ok(DisplayWrap::Unwrapped)
     }
 
-    fn _visit_args(
+    pub(super) fn visit_args(
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        args: &[WithSpan<'_, Expr<'a>>],
+        args: &[WithSpan<'a, Expr<'a>>],
     ) -> Result<(), CompileError> {
         for (i, arg) in args.iter().enumerate() {
             if i > 0 {
                 buf.write(',');
             }
-            self._visit_arg(ctx, buf, arg)?;
+            self.visit_arg(ctx, buf, arg)?;
         }
         Ok(())
     }
 
-    fn _visit_arg(
+    pub(super) fn visit_arg(
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        arg: &WithSpan<'_, Expr<'a>>,
+        arg: &WithSpan<'a, Expr<'a>>,
     ) -> Result<(), CompileError> {
-        self._visit_arg_inner(ctx, buf, arg, false)
+        self.visit_arg_inner(ctx, buf, arg, false)
     }
 
-    fn _visit_arg_inner(
+    fn visit_arg_inner(
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        arg: &WithSpan<'_, Expr<'a>>,
+        arg: &WithSpan<'a, Expr<'a>>,
         // This parameter is needed because even though Expr::Unary is not copyable, we might still
         // be able to skip a few levels.
         need_borrow: bool,
     ) -> Result<(), CompileError> {
         if let Expr::Unary(expr @ ("*" | "&"), ref arg) = **arg {
             buf.write(expr);
-            return self._visit_arg_inner(ctx, buf, arg, true);
+            return self.visit_arg_inner(ctx, buf, arg, true);
         }
         let borrow = need_borrow || !is_copyable(arg);
         if borrow {
@@ -768,11 +328,11 @@ impl<'a> Generator<'a, '_> {
         Ok(())
     }
 
-    fn _visit_auto_escaped_arg(
+    pub(super) fn visit_auto_escaped_arg(
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        arg: &WithSpan<'_, Expr<'a>>,
+        arg: &WithSpan<'a, Expr<'a>>,
     ) -> Result<(), CompileError> {
         if let Some(Writable::Lit(arg)) = compile_time_escape(arg, self.input.escaper) {
             if !arg.is_empty() {
@@ -784,7 +344,7 @@ impl<'a> Generator<'a, '_> {
             }
         } else {
             buf.write("(&&askama::filters::AutoEscaper::new(");
-            self._visit_arg(ctx, buf, arg)?;
+            self.visit_arg(ctx, buf, arg)?;
             buf.write(format_args!(
                 ", {})).askama_auto_escape()?",
                 self.input.escaper
@@ -797,8 +357,8 @@ impl<'a> Generator<'a, '_> {
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        obj: &WithSpan<'_, Expr<'a>>,
-        attr: &Attr<'_>,
+        obj: &WithSpan<'a, Expr<'a>>,
+        attr: &Attr<'a>,
     ) -> Result<DisplayWrap, CompileError> {
         if let Expr::Var(name) = **obj {
             if name == "loop" {
@@ -825,7 +385,11 @@ impl<'a> Generator<'a, '_> {
         Ok(DisplayWrap::Unwrapped)
     }
 
-    fn visit_call_generics(&mut self, buf: &mut Buffer, generics: &[WithSpan<'_, TyGenerics<'_>>]) {
+    pub(super) fn visit_call_generics(
+        &mut self,
+        buf: &mut Buffer,
+        generics: &[WithSpan<'a, TyGenerics<'a>>],
+    ) {
         if generics.is_empty() {
             return;
         }
@@ -833,7 +397,7 @@ impl<'a> Generator<'a, '_> {
         self.visit_ty_generics(buf, generics);
     }
 
-    fn visit_ty_generics(&mut self, buf: &mut Buffer, generics: &[WithSpan<'_, TyGenerics<'_>>]) {
+    fn visit_ty_generics(&mut self, buf: &mut Buffer, generics: &[WithSpan<'a, TyGenerics<'a>>]) {
         if generics.is_empty() {
             return;
         }
@@ -845,7 +409,11 @@ impl<'a> Generator<'a, '_> {
         buf.write('>');
     }
 
-    fn visit_ty_generic(&mut self, buf: &mut Buffer, generic: &WithSpan<'_, TyGenerics<'_>>) {
+    pub(super) fn visit_ty_generic(
+        &mut self,
+        buf: &mut Buffer,
+        generic: &WithSpan<'a, TyGenerics<'a>>,
+    ) {
         let TyGenerics { refs, path, args } = &**generic;
         for _ in 0..*refs {
             buf.write('&');
@@ -858,8 +426,8 @@ impl<'a> Generator<'a, '_> {
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        obj: &WithSpan<'_, Expr<'a>>,
-        key: &WithSpan<'_, Expr<'a>>,
+        obj: &WithSpan<'a, Expr<'a>>,
+        key: &WithSpan<'a, Expr<'a>>,
     ) -> Result<DisplayWrap, CompileError> {
         buf.write('&');
         self.visit_expr(ctx, buf, obj)?;
@@ -873,9 +441,9 @@ impl<'a> Generator<'a, '_> {
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        left: &WithSpan<'_, Expr<'a>>,
-        args: &[WithSpan<'_, Expr<'a>>],
-        generics: &[WithSpan<'_, TyGenerics<'_>>],
+        left: &WithSpan<'a, Expr<'a>>,
+        args: &[WithSpan<'a, Expr<'a>>],
+        generics: &[WithSpan<'a, TyGenerics<'a>>],
     ) -> Result<DisplayWrap, CompileError> {
         match &**left {
             Expr::Attr(sub_left, Attr { name, .. }) if ***sub_left == Expr::Var("loop") => {
@@ -930,7 +498,7 @@ impl<'a> Generator<'a, '_> {
             }
             // We special-case "askama::get_value".
             Expr::Path(path) if path == &["askama", "get_value"] => {
-                self._visit_value(
+                self.visit_value(
                     ctx,
                     buf,
                     args,
@@ -951,7 +519,7 @@ impl<'a> Generator<'a, '_> {
                 }
                 self.visit_call_generics(buf, generics);
                 buf.write('(');
-                self._visit_args(ctx, buf, args)?;
+                self.visit_args(ctx, buf, args)?;
                 buf.write(')');
             }
         }
@@ -963,7 +531,7 @@ impl<'a> Generator<'a, '_> {
         ctx: &Context<'_>,
         buf: &mut Buffer,
         op: &str,
-        inner: &WithSpan<'_, Expr<'a>>,
+        inner: &WithSpan<'a, Expr<'a>>,
     ) -> Result<DisplayWrap, CompileError> {
         buf.write(op);
         self.visit_expr(ctx, buf, inner)?;
@@ -975,8 +543,8 @@ impl<'a> Generator<'a, '_> {
         ctx: &Context<'_>,
         buf: &mut Buffer,
         op: &str,
-        left: Option<&WithSpan<'_, Expr<'a>>>,
-        right: Option<&WithSpan<'_, Expr<'a>>>,
+        left: Option<&WithSpan<'a, Expr<'a>>>,
+        right: Option<&WithSpan<'a, Expr<'a>>>,
     ) -> Result<DisplayWrap, CompileError> {
         if let Some(left) = left {
             self.visit_expr(ctx, buf, left)?;
@@ -993,8 +561,8 @@ impl<'a> Generator<'a, '_> {
         ctx: &Context<'_>,
         buf: &mut Buffer,
         op: &str,
-        left: &WithSpan<'_, Expr<'a>>,
-        right: &WithSpan<'_, Expr<'a>>,
+        left: &WithSpan<'a, Expr<'a>>,
+        right: &WithSpan<'a, Expr<'a>>,
     ) -> Result<DisplayWrap, CompileError> {
         self.visit_expr(ctx, buf, left)?;
         buf.write(format_args!(" {op} "));
@@ -1006,7 +574,7 @@ impl<'a> Generator<'a, '_> {
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        inner: &WithSpan<'_, Expr<'a>>,
+        inner: &WithSpan<'a, Expr<'a>>,
     ) -> Result<DisplayWrap, CompileError> {
         buf.write('(');
         self.visit_expr(ctx, buf, inner)?;
@@ -1018,7 +586,7 @@ impl<'a> Generator<'a, '_> {
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        exprs: &[WithSpan<'_, Expr<'a>>],
+        exprs: &[WithSpan<'a, Expr<'a>>],
     ) -> Result<DisplayWrap, CompileError> {
         buf.write('(');
         for (index, expr) in exprs.iter().enumerate() {
@@ -1036,7 +604,7 @@ impl<'a> Generator<'a, '_> {
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        expr: &WithSpan<'_, Expr<'a>>,
+        expr: &WithSpan<'a, Expr<'a>>,
     ) -> Result<DisplayWrap, CompileError> {
         self.visit_expr(ctx, buf, expr)?;
         Ok(DisplayWrap::Unwrapped)
@@ -1046,7 +614,7 @@ impl<'a> Generator<'a, '_> {
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        elements: &[WithSpan<'_, Expr<'a>>],
+        elements: &[WithSpan<'a, Expr<'a>>],
     ) -> Result<DisplayWrap, CompileError> {
         buf.write('[');
         for (i, el) in elements.iter().enumerate() {
@@ -1103,7 +671,7 @@ impl<'a> Generator<'a, '_> {
         DisplayWrap::Unwrapped
     }
 
-    fn visit_str_lit(&mut self, buf: &mut Buffer, s: &StrLit<'_>) -> DisplayWrap {
+    pub(super) fn visit_str_lit(&mut self, buf: &mut Buffer, s: &StrLit<'_>) -> DisplayWrap {
         if let Some(prefix) = s.prefix {
             buf.write(prefix.to_char());
         }
@@ -1227,76 +795,3 @@ impl<'a> Generator<'a, '_> {
         }
     }
 }
-
-fn ensure_filter_has_feature_alloc(
-    ctx: &Context<'_>,
-    name: &str,
-    node: Span<'_>,
-) -> Result<(), CompileError> {
-    if !cfg!(feature = "alloc") {
-        return Err(ctx.generate_error(
-            format_args!("the `{name}` filter requires the `alloc` feature to be enabled"),
-            node,
-        ));
-    }
-    Ok(())
-}
-
-fn expr_is_int_lit_plus_minus_one(expr: &WithSpan<'_, Expr<'_>>) -> Option<bool> {
-    fn is_signed_singular<T: Eq + Default, E>(
-        from_str_radix: impl Fn(&str, u32) -> Result<T, E>,
-        value: &str,
-        plus_one: T,
-        minus_one: T,
-    ) -> Option<bool> {
-        Some([plus_one, minus_one].contains(&from_str_radix(value, 10).ok()?))
-    }
-
-    fn is_unsigned_singular<T: Eq + Default, E>(
-        from_str_radix: impl Fn(&str, u32) -> Result<T, E>,
-        value: &str,
-        plus_one: T,
-    ) -> Option<bool> {
-        Some(from_str_radix(value, 10).ok()? == plus_one)
-    }
-
-    macro_rules! impl_match {
-        (
-            $kind:ident $value:ident;
-            $($svar:ident => $sty:ident),*;
-            $($uvar:ident => $uty:ident),*;
-        ) => {
-            match $kind {
-                $(
-                    Some(IntKind::$svar) => is_signed_singular($sty::from_str_radix, $value, 1, -1),
-                )*
-                $(
-                    Some(IntKind::$uvar) => is_unsigned_singular($uty::from_str_radix, $value, 1),
-                )*
-                None => match $value.starts_with('-') {
-                    true => is_signed_singular(i128::from_str_radix, $value, 1, -1),
-                    false => is_unsigned_singular(u128::from_str_radix, $value, 1),
-                },
-            }
-        };
-    }
-
-    let Expr::NumLit(_, Num::Int(value, kind)) = **expr else {
-        return None;
-    };
-    impl_match! {
-        kind value;
-        I8 => i8,
-        I16 => i16,
-        I32 => i32,
-        I64 => i64,
-        I128 => i128,
-        Isize => TargetIsize;
-        U8 => u8,
-        U16 => u16,
-        U32 => u32,
-        U64 => u64,
-        U128 => u128,
-        Usize => TargetUsize;
-    }
-}
diff --git a/third_party/rust/askama_derive/src/generator/filter.rs b/third_party/rust/askama_derive/src/generator/filter.rs
new file mode 100644
index 0000000000000..50b255d161343
--- /dev/null
+++ b/third_party/rust/askama_derive/src/generator/filter.rs
@@ -0,0 +1,928 @@
+use std::borrow::Cow;
+use std::fmt::{self, Write};
+use std::mem::replace;
+
+use parser::{Expr, IntKind, Num, Span, StrLit, StrPrefix, TyGenerics, WithSpan};
+
+use super::{DisplayWrap, Generator, TargetIsize, TargetUsize};
+use crate::heritage::Context;
+use crate::integration::Buffer;
+use crate::{CompileError, MsgValidEscapers, fmt_left, fmt_right};
+
+impl<'a> Generator<'a, '_> {
+    pub(super) fn visit_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        name: &str,
+        args: &[WithSpan<'a, Expr<'a>>],
+        generics: &[WithSpan<'a, TyGenerics<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        let filter = match name {
+            "center" => Self::visit_center_filter,
+            "deref" => Self::visit_deref_filter,
+            "escape" | "e" => Self::visit_escape_filter,
+            "filesizeformat" => Self::visit_humansize,
+            "fmt" => Self::visit_fmt_filter,
+            "format" => Self::visit_format_filter,
+            "indent" => Self::visit_indent_filter,
+            "join" => Self::visit_join_filter,
+            "json" | "tojson" => Self::visit_json_filter,
+            "linebreaks" => Self::visit_linebreaks_filter,
+            "linebreaksbr" => Self::visit_linebreaksbr_filter,
+            "paragraphbreaks" => Self::visit_paragraphbreaks_filter,
+            "pluralize" => Self::visit_pluralize_filter,
+            "ref" => Self::visit_ref_filter,
+            "safe" => Self::visit_safe_filter,
+            "truncate" => Self::visit_truncate_filter,
+            "urlencode" => Self::visit_urlencode_filter,
+            "urlencode_strict" => Self::visit_urlencode_strict_filter,
+            "value" => return self.visit_value(ctx, buf, args, generics, node, "`value` filter"),
+            "wordcount" => Self::visit_wordcount_filter,
+            name => {
+                let filter = match () {
+                    _ if BUILTIN_FILTERS.contains(&name) => Self::visit_builtin_filter,
+                    _ if BUILTIN_FILTERS_ALLOC.contains(&name) => Self::visit_builtin_filter_alloc,
+                    _ if BUILTIN_FILTERS_STD.contains(&name) => Self::visit_builtin_filter_std,
+                    _ => Self::visit_custom_filter,
+                };
+                return filter(self, ctx, buf, name, args, generics, node);
+            }
+        };
+
+        ensure_no_generics(ctx, name, node, generics)?;
+        filter(self, ctx, buf, args, node)
+    }
+
+    fn visit_custom_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        name: &str,
+        args: &[WithSpan<'a, Expr<'a>>],
+        generics: &[WithSpan<'a, TyGenerics<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        ensure_no_named_arguments(ctx, name, args, node)?;
+        buf.write(format_args!("filters::{name}"));
+        self.visit_call_generics(buf, generics);
+        buf.write('(');
+        self.visit_arg(ctx, buf, &args[0])?;
+        buf.write(",__askama_values");
+        if args.len() > 1 {
+            buf.write(',');
+            self.visit_args(ctx, buf, &args[1..])?;
+        }
+        buf.write(")?");
+        Ok(DisplayWrap::Unwrapped)
+    }
+
+    fn visit_builtin_filter_alloc(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        name: &str,
+        args: &[WithSpan<'a, Expr<'a>>],
+        generics: &[WithSpan<'a, TyGenerics<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        ensure_filter_has_feature_alloc(ctx, name, node)?;
+        self.visit_builtin_filter(ctx, buf, name, args, generics, node)
+    }
+
+    fn visit_builtin_filter_std(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        name: &str,
+        args: &[WithSpan<'a, Expr<'a>>],
+        generics: &[WithSpan<'a, TyGenerics<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        ensure_filter_has_feature_std(ctx, name, node)?;
+        self.visit_builtin_filter(ctx, buf, name, args, generics, node)
+    }
+
+    fn visit_builtin_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        name: &str,
+        args: &[WithSpan<'a, Expr<'a>>],
+        generics: &[WithSpan<'a, TyGenerics<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        ensure_no_generics(ctx, name, node, generics)?;
+        let arg = no_arguments(ctx, name, args)?;
+        buf.write(format_args!("askama::filters::{name}"));
+        self.visit_call_generics(buf, generics);
+        buf.write('(');
+        self.visit_arg(ctx, buf, arg)?;
+        buf.write(")?");
+        Ok(DisplayWrap::Unwrapped)
+    }
+
+    fn visit_urlencode_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        args: &[WithSpan<'a, Expr<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        self.visit_urlencode_filter_inner(ctx, buf, "urlencode", args, node)
+    }
+
+    fn visit_urlencode_strict_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        args: &[WithSpan<'a, Expr<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        self.visit_urlencode_filter_inner(ctx, buf, "urlencode_strict", args, node)
+    }
+
+    fn visit_urlencode_filter_inner(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        name: &str,
+        args: &[WithSpan<'a, Expr<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        if cfg!(not(feature = "urlencode")) {
+            return Err(ctx.generate_error(
+                format_args!("the `{name}` filter requires the `urlencode` feature to be enabled"),
+                node,
+            ));
+        }
+
+        let arg = no_arguments(ctx, name, args)?;
+        // Both filters return HTML-safe strings.
+        buf.write(format_args!(
+            "askama::filters::HtmlSafeOutput(askama::filters::{name}(",
+        ));
+        self.visit_arg(ctx, buf, arg)?;
+        buf.write(")?)");
+        Ok(DisplayWrap::Unwrapped)
+    }
+
+    fn visit_wordcount_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        args: &[WithSpan<'a, Expr<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        ensure_filter_has_feature_alloc(ctx, "wordcount", node)?;
+
+        let arg = no_arguments(ctx, "wordcount", args)?;
+        buf.write("match askama::filters::wordcount(&(");
+        self.visit_arg(ctx, buf, arg)?;
+        buf.write(
+            ")) {\
+                expr0 => {\
+                    (&&&askama::filters::Writable(&expr0)).\
+                        askama_write(&mut askama::helpers::Empty, __askama_values)?;\
+                    expr0.into_count()\
+                }\
+            }\
+        ",
+        );
+
+        Ok(DisplayWrap::Unwrapped)
+    }
+
+    fn visit_humansize(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        args: &[WithSpan<'a, Expr<'a>>],
+        _node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        let arg = no_arguments(ctx, "humansize", args)?;
+        // All filters return numbers, and any default formatted number is HTML safe.
+        buf.write(format_args!(
+            "askama::filters::HtmlSafeOutput(askama::filters::filesizeformat(\
+                 askama::helpers::get_primitive_value(&("
+        ));
+        self.visit_arg(ctx, buf, arg)?;
+        buf.write(")) as askama::helpers::core::primitive::f32)?)");
+        Ok(DisplayWrap::Unwrapped)
+    }
+
+    fn visit_pluralize_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        args: &[WithSpan<'a, Expr<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        const SINGULAR: &WithSpan<'static, Expr<'static>> =
+            &WithSpan::new_without_span(Expr::StrLit(StrLit {
+                prefix: None,
+                content: "",
+            }));
+        const PLURAL: &WithSpan<'static, Expr<'static>> =
+            &WithSpan::new_without_span(Expr::StrLit(StrLit {
+                prefix: None,
+                content: "s",
+            }));
+        const ARGUMENTS: &[&FilterArgument; 3] = &[
+            FILTER_SOURCE,
+            &FilterArgument {
+                name: "singular",
+                default_value: Some(SINGULAR),
+            },
+            &FilterArgument {
+                name: "plural",
+                default_value: Some(PLURAL),
+            },
+        ];
+
+        let [count, sg, pl] = collect_filter_args(ctx, "pluralize", node, args, ARGUMENTS)?;
+
+        if let Some(is_singular) = expr_is_int_lit_plus_minus_one(count) {
+            let value = if is_singular { sg } else { pl };
+            self.visit_auto_escaped_arg(ctx, buf, value)?;
+        } else {
+            buf.write("askama::filters::pluralize(");
+            self.visit_arg(ctx, buf, count)?;
+            for value in [sg, pl] {
+                buf.write(',');
+                self.visit_auto_escaped_arg(ctx, buf, value)?;
+            }
+            buf.write(")?");
+        }
+        Ok(DisplayWrap::Wrapped)
+    }
+
+    fn visit_paragraphbreaks_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        args: &[WithSpan<'a, Expr<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        self.visit_linebreaks_filters(ctx, buf, "paragraphbreaks", args, node)
+    }
+
+    fn visit_linebreaksbr_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        args: &[WithSpan<'a, Expr<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        self.visit_linebreaks_filters(ctx, buf, "linebreaksbr", args, node)
+    }
+
+    fn visit_linebreaks_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        args: &[WithSpan<'a, Expr<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        self.visit_linebreaks_filters(ctx, buf, "linebreaks", args, node)
+    }
+
+    fn visit_linebreaks_filters(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        name: &str,
+        args: &[WithSpan<'a, Expr<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        ensure_filter_has_feature_alloc(ctx, name, node)?;
+        let arg = no_arguments(ctx, name, args)?;
+        buf.write(format_args!(
+            "askama::filters::{name}(&(&&askama::filters::AutoEscaper::new(&(",
+        ));
+        self.visit_arg(ctx, buf, arg)?;
+        // The input is always HTML escaped, regardless of the selected escaper:
+        buf.write("), askama::filters::Html)).askama_auto_escape()?)?");
+        // The output is marked as HTML safe, not safe in all contexts:
+        Ok(DisplayWrap::Unwrapped)
+    }
+
+    fn visit_ref_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        args: &[WithSpan<'a, Expr<'a>>],
+        _node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        let arg = no_arguments(ctx, "ref", args)?;
+        buf.write('&');
+        self.visit_expr(ctx, buf, arg)?;
+        Ok(DisplayWrap::Unwrapped)
+    }
+
+    fn visit_deref_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        args: &[WithSpan<'a, Expr<'a>>],
+        _node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        let arg = no_arguments(ctx, "deref", args)?;
+        buf.write('*');
+        self.visit_expr(ctx, buf, arg)?;
+        Ok(DisplayWrap::Unwrapped)
+    }
+
+    fn visit_json_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        args: &[WithSpan<'a, Expr<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        const ARGUMENTS: &[&FilterArgument; 2] = &[
+            FILTER_SOURCE,
+            &FilterArgument {
+                name: "indent",
+                default_value: Some(ARGUMENT_PLACEHOLDER),
+            },
+        ];
+
+        if cfg!(not(feature = "serde_json")) {
+            return Err(ctx.generate_error(
+                "the `json` filter requires the `serde_json` feature to be enabled",
+                node,
+            ));
+        }
+
+        let [value, indent] = collect_filter_args(ctx, "json", node, args, ARGUMENTS)?;
+        if is_argument_placeholder(indent) {
+            buf.write(format_args!("askama::filters::json("));
+            self.visit_arg(ctx, buf, value)?;
+            buf.write(")?");
+        } else {
+            buf.write(format_args!("askama::filters::json_pretty("));
+            self.visit_arg(ctx, buf, value)?;
+            buf.write(',');
+            self.visit_arg(ctx, buf, indent)?;
+            buf.write(")?");
+        }
+        Ok(DisplayWrap::Unwrapped)
+    }
+
+    fn visit_indent_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        args: &[WithSpan<'a, Expr<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        const FALSE: &WithSpan<'static, Expr<'static>> =
+            &WithSpan::new_without_span(Expr::BoolLit(false));
+        const ARGUMENTS: &[&FilterArgument; 4] = &[
+            FILTER_SOURCE,
+            &FilterArgument {
+                name: "width",
+                default_value: None,
+            },
+            &FilterArgument {
+                name: "first",
+                default_value: Some(FALSE),
+            },
+            &FilterArgument {
+                name: "blank",
+                default_value: Some(FALSE),
+            },
+        ];
+
+        ensure_filter_has_feature_alloc(ctx, "indent", node)?;
+        let [source, indent, first, blank] =
+            collect_filter_args(ctx, "indent", node, args, ARGUMENTS)?;
+        buf.write("askama::filters::indent(");
+        self.visit_arg(ctx, buf, source)?;
+        buf.write(",");
+        self.visit_arg(ctx, buf, indent)?;
+        buf.write(", askama::helpers::as_bool(&(");
+        self.visit_arg(ctx, buf, first)?;
+        buf.write(")), askama::helpers::as_bool(&(");
+        self.visit_arg(ctx, buf, blank)?;
+        buf.write(")))?");
+        Ok(DisplayWrap::Unwrapped)
+    }
+
+    fn visit_safe_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        args: &[WithSpan<'a, Expr<'a>>],
+        _node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        let arg = no_arguments(ctx, "safe", args)?;
+        buf.write("askama::filters::safe(");
+        self.visit_arg(ctx, buf, arg)?;
+        buf.write(format_args!(", {})?", self.input.escaper));
+        Ok(DisplayWrap::Wrapped)
+    }
+
+    fn visit_escape_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        args: &[WithSpan<'a, Expr<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        const ARGUMENTS: &[&FilterArgument; 2] = &[
+            FILTER_SOURCE,
+            &FilterArgument {
+                name: "escaper",
+                default_value: Some(ARGUMENT_PLACEHOLDER),
+            },
+        ];
+
+        let [source, opt_escaper] = collect_filter_args(ctx, "escape", node, args, ARGUMENTS)?;
+        let opt_escaper = if !is_argument_placeholder(opt_escaper) {
+            let Expr::StrLit(StrLit { prefix, content }) = **opt_escaper else {
+                return Err(ctx.generate_error("invalid escaper type for escape filter", node));
+            };
+            if let Some(prefix) = prefix {
+                let kind = if prefix == StrPrefix::Binary {
+                    "slice"
+                } else {
+                    "CStr"
+                };
+                return Err(ctx.generate_error(
+                    format_args!(
+                        "invalid escaper `b{content:?}`. Expected a string, found a {kind}"
+                    ),
+                    opt_escaper.span(),
+                ));
+            }
+            Some(content)
+        } else {
+            None
+        };
+
+        let escaper = match opt_escaper {
+            Some(name) => self
+                .input
+                .config
+                .escapers
+                .iter()
+                .find_map(|(extensions, path)| {
+                    extensions
+                        .contains(&Cow::Borrowed(name))
+                        .then_some(path.as_ref())
+                })
+                .ok_or_else(|| {
+                    ctx.generate_error(
+                        format_args!(
+                            "invalid escaper `{}` for `escape` filter. {}",
+                            name.escape_debug(),
+                            MsgValidEscapers(&self.input.config.escapers),
+                        ),
+                        node,
+                    )
+                })?,
+            None => self.input.escaper,
+        };
+        buf.write("askama::filters::escape(");
+        self.visit_arg(ctx, buf, source)?;
+        buf.write(format_args!(", {escaper})?"));
+        Ok(DisplayWrap::Wrapped)
+    }
+
+    fn visit_format_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        args: &[WithSpan<'a, Expr<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        ensure_filter_has_feature_alloc(ctx, "format", node)?;
+        ensure_no_named_arguments(ctx, "format", args, node)?;
+        if !args.is_empty() {
+            if let Expr::StrLit(ref fmt) = *args[0] {
+                buf.write("askama::helpers::alloc::format!(");
+                self.visit_str_lit(buf, fmt);
+                if args.len() > 1 {
+                    buf.write(',');
+                    self.visit_args(ctx, buf, &args[1..])?;
+                }
+                buf.write(')');
+                return Ok(DisplayWrap::Unwrapped);
+            }
+        }
+        Err(ctx.generate_error(
+            r#"use `format` filter like `"a={} b={}"|format(a, b)`"#,
+            node,
+        ))
+    }
+
+    fn visit_fmt_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        args: &[WithSpan<'a, Expr<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        const ARGUMENTS: &[&FilterArgument; 2] = &[
+            FILTER_SOURCE,
+            &FilterArgument {
+                name: "format",
+                default_value: None,
+            },
+        ];
+
+        ensure_filter_has_feature_alloc(ctx, "fmt", node)?;
+        let [source, fmt] = collect_filter_args(ctx, "fmt", node, args, ARGUMENTS)?;
+        let Expr::StrLit(ref fmt) = **fmt else {
+            return Err(ctx.generate_error(r#"use `fmt` filter like `value|fmt("{:?}")`"#, node));
+        };
+        buf.write("askama::helpers::alloc::format!(");
+        self.visit_str_lit(buf, fmt);
+        buf.write(',');
+        self.visit_arg(ctx, buf, source)?;
+        buf.write(')');
+        Ok(DisplayWrap::Unwrapped)
+    }
+
+    // Force type coercion on first argument to `join` filter (see #39).
+    fn visit_join_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        args: &[WithSpan<'a, Expr<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        const ARGUMENTS: &[&FilterArgument; 2] = &[
+            FILTER_SOURCE,
+            &FilterArgument {
+                name: "separator",
+                default_value: None,
+            },
+        ];
+
+        let [iterable, separator] = collect_filter_args(ctx, "join", node, args, ARGUMENTS)?;
+        buf.write("askama::filters::join((&(");
+        self.visit_arg(ctx, buf, iterable)?;
+        buf.write(")).into_iter(),");
+        self.visit_arg(ctx, buf, separator)?;
+        buf.write(")?");
+        Ok(DisplayWrap::Unwrapped)
+    }
+
+    fn visit_center_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        args: &[WithSpan<'a, Expr<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        self.visit_center_truncate_filter(ctx, buf, args, node, "center")
+    }
+
+    fn visit_truncate_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        args: &[WithSpan<'a, Expr<'a>>],
+        node: Span<'_>,
+    ) -> Result<DisplayWrap, CompileError> {
+        self.visit_center_truncate_filter(ctx, buf, args, node, "truncate")
+    }
+
+    fn visit_center_truncate_filter(
+        &mut self,
+        ctx: &Context<'_>,
+        buf: &mut Buffer,
+        args: &[WithSpan<'a, Expr<'a>>],
+        node: Span<'_>,
+        name: &str,
+    ) -> Result<DisplayWrap, CompileError> {
+        const ARGUMENTS: &[&FilterArgument; 2] = &[
+            FILTER_SOURCE,
+            &FilterArgument {
+                name: "length",
+                default_value: None,
+            },
+        ];
+
+        ensure_filter_has_feature_alloc(ctx, name, node)?;
+        let [arg, length] = collect_filter_args(ctx, name, node, args, ARGUMENTS)?;
+        buf.write(format_args!("askama::filters::{name}("));
+        self.visit_arg(ctx, buf, arg)?;
+        buf.write(
+            "\
+                ,\
+                askama::helpers::core::primitive::usize::try_from(\
+                    askama::helpers::get_primitive_value(&(",
+        );
+        self.visit_arg(ctx, buf, length)?;
+        buf.write(
+            "\
+                    ))\
+                ).map_err(|_| askama::Error::Fmt)?\
+            )?",
+        );
+        Ok(DisplayWrap::Unwrapped)
+    }
+}
+
+fn ensure_filter_has_feature_alloc(
+    ctx: &Context<'_>,
+    name: &str,
+    node: Span<'_>,
+) -> Result<(), CompileError> {
+    if !cfg!(feature = "alloc") {
+        return Err(ctx.generate_error(
+            format_args!("the `{name}` filter requires the `alloc` feature to be enabled"),
+            node,
+        ));
+    }
+    Ok(())
+}
+
+fn ensure_filter_has_feature_std(
+    ctx: &Context<'_>,
+    name: &str,
+    node: Span<'_>,
+) -> Result<(), CompileError> {
+    if !cfg!(feature = "alloc") {
+        return Err(ctx.generate_error(
+            format_args!("the `{name}` filter requires the `std` feature to be enabled"),
+            node,
+        ));
+    }
+    Ok(())
+}
+
+fn ensure_no_generics(
+    ctx: &Context<'_>,
+    name: &str,
+    node: Span<'_>,
+    generics: &[WithSpan<'_, TyGenerics<'_>>],
+) -> Result<(), CompileError> {
+    if !generics.is_empty() {
+        return Err(
+            ctx.generate_error(format_args!("unexpected generics on filter `{name}`"), node)
+        );
+    }
+    Ok(())
+}
+
+fn expr_is_int_lit_plus_minus_one(expr: &WithSpan<'_, Expr<'_>>) -> Option<bool> {
+    fn is_signed_singular<T: Eq + Default, E>(
+        from_str_radix: impl Fn(&str, u32) -> Result<T, E>,
+        value: &str,
+        plus_one: T,
+        minus_one: T,
+    ) -> Option<bool> {
+        Some([plus_one, minus_one].contains(&from_str_radix(value, 10).ok()?))
+    }
+
+    fn is_unsigned_singular<T: Eq + Default, E>(
+        from_str_radix: impl Fn(&str, u32) -> Result<T, E>,
+        value: &str,
+        plus_one: T,
+    ) -> Option<bool> {
+        Some(from_str_radix(value, 10).ok()? == plus_one)
+    }
+
+    macro_rules! impl_match {
+        (
+            $kind:ident $value:ident;
+            $($svar:ident => $sty:ident),*;
+            $($uvar:ident => $uty:ident),*;
+        ) => {
+            match $kind {
+                $(
+                    Some(IntKind::$svar) => is_signed_singular($sty::from_str_radix, $value, 1, -1),
+                )*
+                $(
+                    Some(IntKind::$uvar) => is_unsigned_singular($uty::from_str_radix, $value, 1),
+                )*
+                None => match $value.starts_with('-') {
+                    true => is_signed_singular(i128::from_str_radix, $value, 1, -1),
+                    false => is_unsigned_singular(u128::from_str_radix, $value, 1),
+                },
+            }
+        };
+    }
+
+    let Expr::NumLit(_, Num::Int(value, kind)) = **expr else {
+        return None;
+    };
+    impl_match! {
+        kind value;
+        I8 => i8,
+        I16 => i16,
+        I32 => i32,
+        I64 => i64,
+        I128 => i128,
+        Isize => TargetIsize;
+        U8 => u8,
+        U16 => u16,
+        U32 => u32,
+        U64 => u64,
+        U128 => u128,
+        Usize => TargetUsize;
+    }
+}
+
+struct FilterArgument {
+    name: &'static str,
+    /// If set to `None`, then a value is needed.
+    /// If set to `Some(ARGUMENT_PLACEHOLDER)`, then no value has to be assigned.
+    /// If set to `Some(&WithSpan...)`, then this value will be used if no argument was supplied.
+    default_value: Option<&'static WithSpan<'static, Expr<'static>>>,
+}
+
+/// Must be the first entry to `collect_filter_args()`'s argument `filter_args`.
+const FILTER_SOURCE: &FilterArgument = &FilterArgument {
+    name: "",
+    default_value: None,
+};
+
+const ARGUMENT_PLACEHOLDER: &WithSpan<'_, Expr<'_>> =
+    &WithSpan::new_without_span(Expr::ArgumentPlaceholder);
+
+#[inline]
+fn is_argument_placeholder(arg: &WithSpan<'_, Expr<'_>>) -> bool {
+    matches!(**arg, Expr::ArgumentPlaceholder)
+}
+
+fn no_arguments<'a, 'b>(
+    ctx: &Context<'_>,
+    name: &str,
+    args: &'b [WithSpan<'a, Expr<'a>>],
+) -> Result<&'b WithSpan<'a, Expr<'a>>, CompileError> {
+    match args {
+        [arg] => Ok(arg),
+        [_, arg, ..] => Err(ctx.generate_error(
+            format_args!("`{name}` filter does not have any arguments"),
+            arg.span(),
+        )),
+        _ => unreachable!(),
+    }
+}
+
+#[inline]
+fn collect_filter_args<'a, 'b, const N: usize>(
+    ctx: &Context<'_>,
+    name: &str,
+    node: Span<'_>,
+    input_args: &'b [WithSpan<'a, Expr<'a>>],
+    filter_args: &'static [&'static FilterArgument; N],
+) -> Result<[&'b WithSpan<'a, Expr<'a>>; N], CompileError> {
+    let mut collected_args = [ARGUMENT_PLACEHOLDER; N];
+    // rationale: less code duplication by implementing the bulk of the function non-generic
+    collect_filter_args_inner(
+        ctx,
+        name,
+        node,
+        input_args,
+        filter_args,
+        &mut collected_args,
+    )?;
+    Ok(collected_args)
+}
+
+fn collect_filter_args_inner<'a, 'b>(
+    ctx: &Context<'_>,
+    name: &str,
+    node: Span<'_>,
+    input_args: &'b [WithSpan<'a, Expr<'a>>],
+    filter_args: &'static [&'static FilterArgument],
+    collected_args: &mut [&'b WithSpan<'a, Expr<'a>>],
+) -> Result<(), CompileError> {
+    // invariant: the parser ensures that named arguments come after positional arguments
+    let mut arg_idx = 0;
+    for arg in input_args {
+        let (idx, value) = if let Expr::NamedArgument(arg_name, ref value) = **arg {
+            let Some(idx) = filter_args
+                .iter()
+                .enumerate()
+                .find_map(|(idx, arg)| (arg.name == arg_name).then_some(idx))
+            else {
+                return Err(ctx.generate_error(
+                    match filter_args.len() {
+                        1 => fmt_left!("`{name}` filter does not have any arguments"),
+                        _ => fmt_right!(
+                            "`{name}` filter does not have an argument `{}`{}",
+                            arg_name.escape_debug(),
+                            ItsArgumentsAre(filter_args),
+                        ),
+                    },
+                    arg.span(),
+                ));
+            };
+            (idx, &**value)
+        } else {
+            let idx = arg_idx;
+            arg_idx += 1;
+            (idx, arg)
+        };
+
+        let Some(collected_arg) = collected_args.get_mut(idx) else {
+            return Err(ctx.generate_error(
+                format_args!(
+                    "`{name}` filter accepts at most {} argument{}{}",
+                    filter_args.len() - 1,
+                    if filter_args.len() != 2 { "s" } else { "" },
+                    ItsArgumentsAre(filter_args),
+                ),
+                arg.span(),
+            ));
+        };
+        if !is_argument_placeholder(replace(collected_arg, value)) {
+            return Err(ctx.generate_error(
+                format_args!(
+                    "`{}` argument to `{}` filter was already set{}",
+                    filter_args[idx].name.escape_debug(),
+                    name.escape_debug(),
+                    ItsArgumentsAre(filter_args),
+                ),
+                arg.span(),
+            ));
+        }
+    }
+
+    for (&arg, collected) in filter_args.iter().zip(collected_args) {
+        if !is_argument_placeholder(collected) {
+            continue;
+        } else if let Some(default) = arg.default_value {
+            *collected = default;
+        } else {
+            return Err(ctx.generate_error(
+                format_args!(
+                    "`{}` argument is missing when calling `{name}` filter{}",
+                    arg.name.escape_debug(),
+                    ItsArgumentsAre(filter_args),
+                ),
+                node,
+            ));
+        }
+    }
+
+    Ok(())
+}
+
+struct ItsArgumentsAre(&'static [&'static FilterArgument]);
+
+impl fmt::Display for ItsArgumentsAre {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str("; its arguments are: (")?;
+        for (idx, arg) in self.0.iter().enumerate() {
+            match idx {
+                0 => continue,
+                1 => {}
+                _ => f.write_str(", ")?,
+            }
+            if arg.default_value.is_some() {
+                write!(f, "[{}]", arg.name)?;
+            } else {
+                f.write_str(arg.name)?;
+            }
+        }
+        f.write_char(')')
+    }
+}
+
+fn ensure_no_named_arguments(
+    ctx: &Context<'_>,
+    name: &str,
+    args: &[WithSpan<'_, Expr<'_>>],
+    node: Span<'_>,
+) -> Result<(), CompileError> {
+    for arg in args {
+        if is_argument_placeholder(arg) {
+            return Err(ctx.generate_error(
+                format_args!(
+                    "`{}` filter cannot accept named arguments",
+                    name.escape_debug()
+                ),
+                node,
+            ));
+        }
+    }
+    Ok(())
+}
+
+// These built-in filters take no arguments, no generics, and are not feature gated.
+const BUILTIN_FILTERS: &[&str] = &[];
+
+// These built-in filters take no arguments, no generics, and need `features = ["alloc"]`.
+const BUILTIN_FILTERS_ALLOC: &[&str] = &[
+    "capitalize",
+    "lower",
+    "lowercase",
+    "title",
+    "titlecase",
+    "trim",
+    "upper",
+    "uppercase",
+];
+
+// These built-in filters take no arguments, no generics, and need `features = ["std"]`.
+const BUILTIN_FILTERS_STD: &[&str] = &["unique"];
diff --git a/third_party/rust/askama_derive/src/generator/node.rs b/third_party/rust/askama_derive/src/generator/node.rs
index 06a929189d88e..e2fc9afa4d330 100644
--- a/third_party/rust/askama_derive/src/generator/node.rs
+++ b/third_party/rust/askama_derive/src/generator/node.rs
@@ -207,7 +207,8 @@ impl<'a> Generator<'a, '_> {
             | Expr::FilterSource
             | Expr::As(_, _)
             | Expr::Concat(_)
-            | Expr::LetCond(_) => {
+            | Expr::LetCond(_)
+            | Expr::ArgumentPlaceholder => {
                 *only_contains_is_defined = false;
                 (EvaluatedResult::Unknown, WithSpan::new(expr, span))
             }
@@ -506,7 +507,7 @@ impl<'a> Generator<'a, '_> {
         &mut self,
         ctx: &Context<'a>,
         buf: &mut Buffer,
-        loop_block: &'a WithSpan<'_, Loop<'_>>,
+        loop_block: &'a WithSpan<'a, Loop<'_>>,
     ) -> Result<usize, CompileError> {
         self.handle_ws(loop_block.ws1);
         self.push_locals(|this| {
@@ -592,7 +593,7 @@ impl<'a> Generator<'a, '_> {
         &mut self,
         ctx: &Context<'a>,
         buf: &mut Buffer,
-        call: &'a WithSpan<'_, Call<'_>>,
+        call: &'a WithSpan<'a, Call<'_>>,
     ) -> Result<usize, CompileError> {
         let Call {
             ws,
@@ -769,7 +770,7 @@ impl<'a> Generator<'a, '_> {
         &mut self,
         ctx: &Context<'a>,
         buf: &mut Buffer,
-        filter: &'a WithSpan<'_, FilterBlock<'_>>,
+        filter: &'a WithSpan<'a, FilterBlock<'_>>,
     ) -> Result<usize, CompileError> {
         self.write_buf_writable(ctx, buf)?;
         self.flush_ws(filter.ws1);
@@ -828,7 +829,7 @@ impl<'a> Generator<'a, '_> {
         &mut self,
         ctx: &Context<'a>,
         buf: &mut Buffer,
-        i: &'a WithSpan<'_, Include<'_>>,
+        i: &'a WithSpan<'a, Include<'_>>,
     ) -> Result<usize, CompileError> {
         self.flush_ws(i.ws);
         self.write_buf_writable(ctx, buf)?;
@@ -936,7 +937,7 @@ impl<'a> Generator<'a, '_> {
         &mut self,
         ctx: &Context<'_>,
         buf: &mut Buffer,
-        l: &'a WithSpan<'_, Let<'_>>,
+        l: &'a WithSpan<'a, Let<'_>>,
     ) -> Result<(), CompileError> {
         self.handle_ws(l.ws);
 
@@ -965,7 +966,12 @@ impl<'a> Generator<'a, '_> {
         }
 
         self.visit_target(buf, true, true, &l.var);
-        let (before, after) = if !is_copyable(val) {
+        // If it's not taking the ownership of a local variable or copyable, then we need to add
+        // a reference.
+        let (before, after) = if !matches!(**val, Expr::Try(..))
+            && !matches!(**val, Expr::Var(name) if self.locals.get(name).is_some())
+            && !is_copyable(val)
+        {
             ("&(", ")")
         } else {
             ("", "")
@@ -1190,7 +1196,7 @@ impl<'a> Generator<'a, '_> {
         Ok(size_hint)
     }
 
-    fn write_comment(&mut self, comment: &'a WithSpan<'_, Comment<'_>>) {
+    fn write_comment(&mut self, comment: &'a WithSpan<'a, Comment<'_>>) {
         self.handle_ws(comment.ws);
     }
 
@@ -1538,8 +1544,8 @@ fn is_cacheable(expr: &WithSpan<'_, Expr<'_>>) -> bool {
         Expr::BinOp(_, lhs, rhs) => is_cacheable(lhs) && is_cacheable(rhs),
         Expr::IsDefined(_) | Expr::IsNotDefined(_) => true,
         Expr::Range(_, lhs, rhs) => {
-            lhs.as_ref().map_or(true, |v| is_cacheable(v))
-                && rhs.as_ref().map_or(true, |v| is_cacheable(v))
+            lhs.as_ref().is_none_or(|v| is_cacheable(v))
+                && rhs.as_ref().is_none_or(|v| is_cacheable(v))
         }
         Expr::Group(arg) => is_cacheable(arg),
         Expr::Tuple(args) => args.iter().all(is_cacheable),
@@ -1554,5 +1560,6 @@ fn is_cacheable(expr: &WithSpan<'_, Expr<'_>>) -> bool {
         Expr::RustMacro(_, _) => false,
         // Should never be encountered:
         Expr::FilterSource => unreachable!("FilterSource in expression?"),
+        Expr::ArgumentPlaceholder => unreachable!("ExpressionPlaceholder in expression?"),
     }
 }
diff --git a/third_party/rust/askama_derive/src/integration.rs b/third_party/rust/askama_derive/src/integration.rs
index f86533392b783..930ac9152f98e 100644
--- a/third_party/rust/askama_derive/src/integration.rs
+++ b/third_party/rust/askama_derive/src/integration.rs
@@ -60,15 +60,19 @@ fn impl_display(ast: &DeriveInput, buf: &mut Buffer) {
 
 /// Implement `FastWritable` for the given item.
 fn impl_fast_writable(ast: &DeriveInput, buf: &mut Buffer) {
-    write_header(ast, buf, "askama::filters::FastWritable");
+    write_header(ast, buf, "askama::FastWritable");
     buf.write(
         "\
             #[inline]\
-            fn write_into<AskamaW>(&self, dest: &mut AskamaW) -> askama::Result<()> \
+            fn write_into<AskamaW>(\
+                &self,\
+                dest: &mut AskamaW,\
+                values: &dyn askama::Values\
+            ) -> askama::Result<()> \
             where \
                 AskamaW: askama::helpers::core::fmt::Write + ?askama::helpers::core::marker::Sized,\
             {\
-                askama::Template::render_into(self, dest)\
+                askama::Template::render_into_with_values(self, dest, values)\
             }\
         }",
     );
diff --git a/third_party/rust/askama_derive/src/lib.rs b/third_party/rust/askama_derive/src/lib.rs
index 46c02c18a8e32..ae2d670ea83b6 100644
--- a/third_party/rust/askama_derive/src/lib.rs
+++ b/third_party/rust/askama_derive/src/lib.rs
@@ -597,22 +597,3 @@ macro_rules! fmt_right {
 }
 
 pub(crate) use {fmt_left, fmt_right};
-
-// This is used by the code generator to decide whether a named filter is part of
-// Askama or should refer to a local `filters` module.
-const BUILTIN_FILTERS: &[&str] = &[
-    "capitalize",
-    "center",
-    "indent",
-    "lower",
-    "lowercase",
-    "title",
-    "trim",
-    "truncate",
-    "upper",
-    "uppercase",
-    "wordcount",
-];
-
-// Built-in filters that need the `alloc` feature.
-const BUILTIN_FILTERS_NEED_ALLOC: &[&str] = &["center", "truncate"];
diff --git a/third_party/rust/askama_derive/src/tests.rs b/third_party/rust/askama_derive/src/tests.rs
index fa901ec14c137..605fdbcccbe14 100644
--- a/third_party/rust/askama_derive/src/tests.rs
+++ b/third_party/rust/askama_derive/src/tests.rs
@@ -67,13 +67,17 @@ fn compare_ex(
             }
         }
 
-        impl askama::filters::FastWritable for Foo {
+        impl askama::FastWritable for Foo {
             #[inline]
-            fn write_into<AskamaW>(&self, dest: &mut AskamaW) -> askama::Result<()>
+            fn write_into<AskamaW>(
+                &self,
+                dest: &mut AskamaW,
+                values: &dyn askama::Values,
+            ) -> askama::Result<()>
             where
                 AskamaW: askama::helpers::core::fmt::Write + ?askama::helpers::core::marker::Sized,
             {
-                askama::Template::render_into(self, dest)
+                askama::Template::render_into_with_values(self, dest, values)
             }
         }
     };
diff --git a/third_party/rust/askama_parser/.cargo-checksum.json b/third_party/rust/askama_parser/.cargo-checksum.json
index e180ccffb1b19..a19abd3f7f81c 100644
--- a/third_party/rust/askama_parser/.cargo-checksum.json
+++ b/third_party/rust/askama_parser/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"c59ce3b4639624b332b35ccc7dbb2ea96a4154a468b1914b0f252d888b736c83",".rustfmt.toml":"a3754a3582a6ab4247c2ace9f9686f8757f94691b01e86f340234c4c18073a1b","Cargo.lock":"fe55f129ae3e6619311c163585945ffe3aa1375e33661f0660a88b00aef32a0d","Cargo.toml":"c24d9b8953af7ad1763bfe09ae00274d02f1bd3ef9e0ed199583c2708712777d","Cargo.toml.orig":"893dfcf9976fa62d0eff38bb6f0388300089da1fcf0f288c60173d47c9915d81","LICENSE-APACHE":"87cb0d734c723c083e51c825930ff42bce28596b52dee15567f6b28f19c195e3","LICENSE-MIT":"df20e0180764bf5bd76f74d47bc9e8c0069a666401629c390003a1d5eba99c92","README.md":"6db8144626e0048bfeed20163343b9f01130f297c9ec4b34e1087383cf0c7050","_typos.toml":"72588ef2385568368e7ec251c8451f75a16343d5a06b4c2b312beba2cdf5b308","benches/from_str.rs":"115edebf8d2812adf0f6d981063a977de9f447eccfc09578b321bec308f716e9","benches/librustdoc/LICENSE.md":"8e22b9dae01ceac57b59cf5794dd1a179fc411d14c5351ebf6a97be2678d00c2","benches/librustdoc/item_info.html":"50b88a3f7a56c9d4faf56b1c74dda1e8f02b28ede6581c71c5effa805961a8ea","benches/librustdoc/item_union.html":"aee76fa8260873caa1fb694b8972400e76474fbe7a0791da9298b68828f62364","benches/librustdoc/page.html":"1c656f63a52e1e526b9b0042e7819641db7530b94a71943257cd878f11dbd029","benches/librustdoc/print_item.html":"d3f020edd22e168a84b28b28c0d06084679c58f7c666dc6bf85ba3ba9ede1802","benches/librustdoc/short_item_info.html":"e477cc4083d6e090c00c81947450dba8d3116bdbae8ccd0d59e332c07d6d918b","benches/librustdoc/sidebar.html":"be30b18a25b6011784c11898bca43f06f99a69184812bef3ea92af27ae048849","benches/librustdoc/source.html":"4715ad7116104b800565ef332126c290addf23e989c7161ad184593bcfef50cc","benches/librustdoc/type_layout.html":"9d881f22ce88e40661dffd09d428f9cb2e33d878febc228126674a78b5e6c759","benches/librustdoc/type_layout_size.html":"23778308b293055acc84e29b87384e648675d41b9a18d3b76ad5a1cbeff9d502","clippy.toml":"d141089a5edd91c83ae211257638df2ef1ca53f66b30faa98b22ea1447faeeff","deny.toml":"b7637b42164b1bbba883c422187292cf08ad624691145b5124eaf10edf38c164","src/ascii_str.rs":"272ed728e3e024cefbf16b9a004ad806781cff95f613d34c35a4e8479224d16f","src/expr.rs":"c62b88d09aa311edab8025137b7fa79a33377180ccb0294a9a821e5c7074a94b","src/lib.rs":"b00d21a80702e441a48b11c712dbda09ed88e51e2f9f5fc3f1ae95c0d9bdca04","src/memchr_splitter.rs":"98b595e9aa2e8bbd5e387f708845a457bdc4a1e4430afd59fca5e8842c7f80c2","src/node.rs":"333a4fa93d421fbf08d9e6bf0d8ad8f939ca030f8f3a4105a3e2f4d5bc1c4b19","src/target.rs":"3147366b5be225d10bd3f0dc15294b5e8680268e435cd10690a6eb462ce37783","src/tests.rs":"8181c774f69f540eea59d551ed49d4359bde896d741f55ff39e83df569e00f25","tests/comment-depth.txt":"5d771b3a3b9e7ecea773f76426acb24fdb466df30b8554fb8fc48e9ecc70b32e","tests/excessive_filter_block.txt":"e062f409de016958e577e288f1ecb91d54eb50a319ea0a002eb008ad5e68125b","tests/filter-recursion.txt":"0aaf73f6664a5e1c8f38ac333692e1a2b391d0e23debdc2acf9c6d1b4303ce08","tests/fuzzed-deeply-tested-if-let.txt":"8ca5b1b580e1189feb59a1a12bbea220056b2cc655edd84068327b9bf04879b2","tests/fuzzed_excessive_filter_block.inc":"f50f1cc972c36daace6054ea43cf85b16c2065a7c60be881ceb730d9348793cf","tests/fuzzed_span_is_not_substring_of_source.bin":"27b97ec342a66dbb5a29e0e2ecf1f04ccf2a4e53c003f767143ad8a1729c4641","tests/target-recursion.txt":"501fa6855bbdf566f89b52ded1265c6f05896e749cfaf216d9dea07c76c772d2","tests/unary-recursion.txt":"1d1763a8f62e1a397cc274727562d6b2c5ac80d2558e8aa930a51906c604ea00","tomlfmt.toml":"a33c21547346656aead5f46f2f07e1965f4cf0c6f2a16deb8ec06019619267aa"},"package":"cf315ce6524c857bb129ff794935cf6d42c82a6cff60526fe2a63593de4d0d4f"}
\ No newline at end of file
+{"files":{".cargo_vcs_info.json":"81b463d004f87f823386f671b2083c5de33fcfc6ece4cdb6eeb7496cfc2d67a7",".rustfmt.toml":"a3754a3582a6ab4247c2ace9f9686f8757f94691b01e86f340234c4c18073a1b","Cargo.lock":"9d2ccd8a5285558da68ec425fd2e092c6250af5a0a0ca5dce76767859ce3b23e","Cargo.toml":"fd23d9288de3737c1869736a18c41e6bd5c54ecc746a20e7699d6d18488f5c16","Cargo.toml.orig":"a8e2cf32a2f31417efd6a0cd0c683380cfb6350fa16f87056c63d1bc63c7a690","LICENSE-APACHE":"87cb0d734c723c083e51c825930ff42bce28596b52dee15567f6b28f19c195e3","LICENSE-MIT":"df20e0180764bf5bd76f74d47bc9e8c0069a666401629c390003a1d5eba99c92","README.md":"6db8144626e0048bfeed20163343b9f01130f297c9ec4b34e1087383cf0c7050","_typos.toml":"72588ef2385568368e7ec251c8451f75a16343d5a06b4c2b312beba2cdf5b308","benches/from_str.rs":"115edebf8d2812adf0f6d981063a977de9f447eccfc09578b321bec308f716e9","benches/librustdoc/LICENSE.md":"8e22b9dae01ceac57b59cf5794dd1a179fc411d14c5351ebf6a97be2678d00c2","benches/librustdoc/item_info.html":"50b88a3f7a56c9d4faf56b1c74dda1e8f02b28ede6581c71c5effa805961a8ea","benches/librustdoc/item_union.html":"aee76fa8260873caa1fb694b8972400e76474fbe7a0791da9298b68828f62364","benches/librustdoc/page.html":"1c656f63a52e1e526b9b0042e7819641db7530b94a71943257cd878f11dbd029","benches/librustdoc/print_item.html":"d3f020edd22e168a84b28b28c0d06084679c58f7c666dc6bf85ba3ba9ede1802","benches/librustdoc/short_item_info.html":"e477cc4083d6e090c00c81947450dba8d3116bdbae8ccd0d59e332c07d6d918b","benches/librustdoc/sidebar.html":"be30b18a25b6011784c11898bca43f06f99a69184812bef3ea92af27ae048849","benches/librustdoc/source.html":"4715ad7116104b800565ef332126c290addf23e989c7161ad184593bcfef50cc","benches/librustdoc/type_layout.html":"9d881f22ce88e40661dffd09d428f9cb2e33d878febc228126674a78b5e6c759","benches/librustdoc/type_layout_size.html":"23778308b293055acc84e29b87384e648675d41b9a18d3b76ad5a1cbeff9d502","clippy.toml":"1d57e7a7054a89a2f5a11b7e1d863d20bd60d8d0fcca5ef500c185eb76806ea5","deny.toml":"b7637b42164b1bbba883c422187292cf08ad624691145b5124eaf10edf38c164","src/ascii_str.rs":"272ed728e3e024cefbf16b9a004ad806781cff95f613d34c35a4e8479224d16f","src/expr.rs":"eb6b094cf90037d4394b8278a141c08fb7a885d705503e4ef38e576cca1862ab","src/lib.rs":"cd0dc2ab07bdb9fe22733bc03f3dd28c623e51e1ac71ab92464695549e197663","src/memchr_splitter.rs":"98b595e9aa2e8bbd5e387f708845a457bdc4a1e4430afd59fca5e8842c7f80c2","src/node.rs":"333a4fa93d421fbf08d9e6bf0d8ad8f939ca030f8f3a4105a3e2f4d5bc1c4b19","src/target.rs":"3147366b5be225d10bd3f0dc15294b5e8680268e435cd10690a6eb462ce37783","src/tests.rs":"8181c774f69f540eea59d551ed49d4359bde896d741f55ff39e83df569e00f25","tests/comment-depth.txt":"5d771b3a3b9e7ecea773f76426acb24fdb466df30b8554fb8fc48e9ecc70b32e","tests/excessive_filter_block.txt":"e062f409de016958e577e288f1ecb91d54eb50a319ea0a002eb008ad5e68125b","tests/filter-recursion.txt":"0aaf73f6664a5e1c8f38ac333692e1a2b391d0e23debdc2acf9c6d1b4303ce08","tests/fuzzed-deeply-tested-if-let.txt":"8ca5b1b580e1189feb59a1a12bbea220056b2cc655edd84068327b9bf04879b2","tests/fuzzed_excessive_filter_block.inc":"f50f1cc972c36daace6054ea43cf85b16c2065a7c60be881ceb730d9348793cf","tests/fuzzed_span_is_not_substring_of_source.bin":"27b97ec342a66dbb5a29e0e2ecf1f04ccf2a4e53c003f767143ad8a1729c4641","tests/target-recursion.txt":"501fa6855bbdf566f89b52ded1265c6f05896e749cfaf216d9dea07c76c772d2","tests/unary-recursion.txt":"1d1763a8f62e1a397cc274727562d6b2c5ac80d2558e8aa930a51906c604ea00","tomlfmt.toml":"a33c21547346656aead5f46f2f07e1965f4cf0c6f2a16deb8ec06019619267aa"},"package":"d6ab5630b3d5eaf232620167977f95eb51f3432fc76852328774afbd242d4358"}
\ No newline at end of file
diff --git a/third_party/rust/askama_parser/.cargo_vcs_info.json b/third_party/rust/askama_parser/.cargo_vcs_info.json
index 50a1635323ab5..260726353bab2 100644
--- a/third_party/rust/askama_parser/.cargo_vcs_info.json
+++ b/third_party/rust/askama_parser/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "697862a76c440544fd82f51a36a3c9482065bde5"
+    "sha1": "95867ac8cedc80b69f4047dea9c1272a5bf947b3"
   },
   "path_in_vcs": "askama_parser"
 }
\ No newline at end of file
diff --git a/third_party/rust/askama_parser/Cargo.lock b/third_party/rust/askama_parser/Cargo.lock
index 141e7763b5a70..41016d2b63f13 100644
--- a/third_party/rust/askama_parser/Cargo.lock
+++ b/third_party/rust/askama_parser/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "aho-corasick"
@@ -25,7 +25,7 @@ checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "askama_parser"
-version = "0.13.0"
+version = "0.14.0"
 dependencies = [
  "criterion",
  "memchr",
@@ -87,18 +87,18 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.32"
+version = "4.5.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83"
+checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.32"
+version = "4.5.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8"
+checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -185,9 +185,9 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "half"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7db2ff139bba50379da6aa0766b52fdcb62cb5b263009b09ed58ba604e14bbd1"
+checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
 dependencies = [
  "cfg-if",
  "crunchy",
@@ -237,15 +237,15 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
 name = "log"
-version = "0.4.26"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "memchr"
@@ -264,9 +264,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.21.1"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "oorandom"
@@ -304,9 +304,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
@@ -611,9 +611,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36"
+checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10"
 dependencies = [
  "memchr",
 ]
diff --git a/third_party/rust/askama_parser/Cargo.toml b/third_party/rust/askama_parser/Cargo.toml
index 52b7cd6e2646f..28a4c6894049e 100644
--- a/third_party/rust/askama_parser/Cargo.toml
+++ b/third_party/rust/askama_parser/Cargo.toml
@@ -11,9 +11,9 @@
 
 [package]
 edition = "2021"
-rust-version = "1.81"
+rust-version = "1.83"
 name = "askama_parser"
-version = "0.13.0"
+version = "0.14.0"
 build = false
 autolib = false
 autobins = false
diff --git a/third_party/rust/askama_parser/Cargo.toml.orig b/third_party/rust/askama_parser/Cargo.toml.orig
index b4ab954af69b6..e72f2d79a3cb4 100644
--- a/third_party/rust/askama_parser/Cargo.toml.orig
+++ b/third_party/rust/askama_parser/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "askama_parser"
-version = "0.13.0"
+version = "0.14.0"
 description = "Parser for Askama templates"
 documentation = "https://docs.rs/askama"
 keywords = ["markup", "template", "jinja2", "html"]
@@ -10,7 +10,7 @@ repository = "https://github.com/askama-rs/askama"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 edition = "2021"
-rust-version = "1.81"
+rust-version = "1.83"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/third_party/rust/askama_parser/clippy.toml b/third_party/rust/askama_parser/clippy.toml
index 5e90250c4555a..4e779c6ce119b 100644
--- a/third_party/rust/askama_parser/clippy.toml
+++ b/third_party/rust/askama_parser/clippy.toml
@@ -1 +1 @@
-msrv = "1.81.0"
+msrv = "1.83.0"
diff --git a/third_party/rust/askama_parser/src/expr.rs b/third_party/rust/askama_parser/src/expr.rs
index 6056aad4249b1..b235911e88497 100644
--- a/third_party/rust/askama_parser/src/expr.rs
+++ b/third_party/rust/askama_parser/src/expr.rs
@@ -93,6 +93,10 @@ fn check_expr<'a>(
             }
             Ok(())
         }
+        Expr::ArgumentPlaceholder => Err(winnow::error::ErrMode::Cut(ErrorContext::new(
+            "unreachable",
+            expr.span,
+        ))),
     }
 }
 
@@ -137,6 +141,9 @@ pub enum Expr<'a> {
     Concat(Vec<WithSpan<'a, Expr<'a>>>),
     /// If you have `&& let Some(y)`, this variant handles it.
     LetCond(Box<WithSpan<'a, CondTest<'a>>>),
+    /// This variant should never be used directly.
+    /// It is used for the handling of named arguments in the generator, esp. with filters.
+    ArgumentPlaceholder,
 }
 
 impl<'a> Expr<'a> {
@@ -526,7 +533,8 @@ impl<'a> Expr<'a> {
             | Self::BinOp(_, _, _)
             | Self::Path(_)
             | Self::Concat(_)
-            | Self::LetCond(_) => false,
+            | Self::LetCond(_)
+            | Self::ArgumentPlaceholder => false,
         }
     }
 }
diff --git a/third_party/rust/askama_parser/src/lib.rs b/third_party/rust/askama_parser/src/lib.rs
index 2e616c9b671f9..e1ee9d29c15e8 100644
--- a/third_party/rust/askama_parser/src/lib.rs
+++ b/third_party/rust/askama_parser/src/lib.rs
@@ -723,7 +723,7 @@ fn path_or_identifier<'a>(i: &mut &'a str) -> ParseResult<'a, PathOrIdentifier<'
             if name
                 .chars()
                 .next()
-                .map_or(true, |c| c == '_' || c.is_lowercase()) =>
+                .is_none_or(|c| c == '_' || c.is_lowercase()) =>
         {
             Ok(PathOrIdentifier::Identifier(name))
         }
@@ -1037,7 +1037,7 @@ fn filter<'a>(
     cut_err((
         ws(identifier),
         opt(|i: &mut _| expr::call_generics(i, level)).map(|generics| generics.unwrap_or_default()),
-        opt(|i: &mut _| Expr::arguments(i, level, false)),
+        opt(|i: &mut _| Expr::arguments(i, level, true)),
     ))
     .parse_next(i)
 }
diff --git a/third_party/rust/context_id/.cargo-checksum.json b/third_party/rust/context_id/.cargo-checksum.json
index 6bc0635c8b1de..5a52391916f14 100644
--- a/third_party/rust/context_id/.cargo-checksum.json
+++ b/third_party/rust/context_id/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"ef652383889181c9e31c6f59b7726acc1d36767dd8f55e28aa38b1b630c54841","README.md":"478bd3dcd41863df0975c96fd38e34334d8146799bf1a16204bab2cc12dcffd2","src/callback.rs":"1e18555c60cc29eeaa31faabd25e0dd18cd3103bea65c2a4f558ed392dc8f7d0","src/error.rs":"434abbc9f803242bab3d6f83d43115e11ae361a71bd0279c407132ac99128265","src/lib.rs":"53c7790a585f8eef9511dc9e4a6bdd65805f827019fb5b952cc26f9f8e96f06f","src/mars.rs":"96d0a8767de2260821b14e2ec913857bfbf1a9c131a567fbdaf367397c36e231","uniffi.toml":"02d52578b859174a22728da6d6b546d94faa435866e94ac035f975d4a2ac6f5a"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"cbaa86bd99dc7dc4afd17ea9a149f742f6c2ac3b04f54407a9b1807466c074d6","README.md":"478bd3dcd41863df0975c96fd38e34334d8146799bf1a16204bab2cc12dcffd2","src/callback.rs":"1e18555c60cc29eeaa31faabd25e0dd18cd3103bea65c2a4f558ed392dc8f7d0","src/error.rs":"434abbc9f803242bab3d6f83d43115e11ae361a71bd0279c407132ac99128265","src/lib.rs":"53c7790a585f8eef9511dc9e4a6bdd65805f827019fb5b952cc26f9f8e96f06f","src/mars.rs":"96d0a8767de2260821b14e2ec913857bfbf1a9c131a567fbdaf367397c36e231","uniffi.toml":"02d52578b859174a22728da6d6b546d94faa435866e94ac035f975d4a2ac6f5a"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/context_id/Cargo.toml b/third_party/rust/context_id/Cargo.toml
index 398ccddb68620..6a44bb074a991 100644
--- a/third_party/rust/context_id/Cargo.toml
+++ b/third_party/rust/context_id/Cargo.toml
@@ -41,7 +41,7 @@ path = "../support/error"
 version = "1.4"
 
 [dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 
 [dependencies.uuid]
 version = "1.3"
@@ -58,5 +58,5 @@ default-features = false
 path = "../support/viaduct-dev"
 
 [build-dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 features = ["build"]
diff --git a/third_party/rust/error-support/.cargo-checksum.json b/third_party/rust/error-support/.cargo-checksum.json
index f0f63650a9cf6..4200b097edfe0 100644
--- a/third_party/rust/error-support/.cargo-checksum.json
+++ b/third_party/rust/error-support/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"379d09265c4ad36b0e8aa71fab2a82c71946a33dc00314ff0a9efd07431b8642","README.md":"d820e387ac36a98c8e554fcaba13b76eb935413b535019444f6d448240e4d07e","metrics.yaml":"d7404186be19150cfba00c7ffb4261479fd91f3b674151ed88d28d15172283b2","pings.yaml":"80e8cae15ec4b9369d92ffc2fd038931a108cfb1edcacd6f27e529a809979043","src/error_tracing.rs":"86f4d88fb9a08640924199ddae1a6a6f1267574174011caeaa1f65b6dd38157d","src/handling.rs":"4b1183afe0716653918515299bc877a4d461fe8d2bb114a8c25f303203a35fdb","src/lib.rs":"f3860585d0cf613fe2974c5119f0738601c65c74aaba2c79311e440903dde254","src/macros.rs":"27366e0424e4d700605c34bd96295cd35fa41aed8b49f30e0b6e0c59b870fe73","src/redact.rs":"c9a4df1a87be68b15d583587bda941d4c60a1d0449e2d43ff99f3611a290a863","src/reporting.rs":"eda5580fabe633bd4fe7ac69ea8056874e8adfc093a74942294edcfbaa48824f","uniffi.toml":"af91bcd8e7b1fa3f475a5e556979ff23c57b338395e0b65abc1cb1a0ee823e23"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"7f193fead888139c98e8b06e03dc737b7c9a7c24702326a6abd06cd14cc557e9","README.md":"d820e387ac36a98c8e554fcaba13b76eb935413b535019444f6d448240e4d07e","metrics.yaml":"d7404186be19150cfba00c7ffb4261479fd91f3b674151ed88d28d15172283b2","pings.yaml":"80e8cae15ec4b9369d92ffc2fd038931a108cfb1edcacd6f27e529a809979043","src/error_tracing.rs":"1982a6772f3d25ad8563cf9a9328dc8b276d1d3ef280546bbd6c7630367b3181","src/handling.rs":"4b1183afe0716653918515299bc877a4d461fe8d2bb114a8c25f303203a35fdb","src/lib.rs":"f3860585d0cf613fe2974c5119f0738601c65c74aaba2c79311e440903dde254","src/macros.rs":"27366e0424e4d700605c34bd96295cd35fa41aed8b49f30e0b6e0c59b870fe73","src/redact.rs":"c9a4df1a87be68b15d583587bda941d4c60a1d0449e2d43ff99f3611a290a863","src/reporting.rs":"eda5580fabe633bd4fe7ac69ea8056874e8adfc093a74942294edcfbaa48824f","uniffi.toml":"af91bcd8e7b1fa3f475a5e556979ff23c57b338395e0b65abc1cb1a0ee823e23"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/error-support/Cargo.toml b/third_party/rust/error-support/Cargo.toml
index 4165954ff1329..5e8abb52c97f8 100644
--- a/third_party/rust/error-support/Cargo.toml
+++ b/third_party/rust/error-support/Cargo.toml
@@ -69,8 +69,8 @@ path = "../tracing"
 optional = true
 
 [dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 
 [build-dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 features = ["build"]
diff --git a/third_party/rust/error-support/src/error_tracing.rs b/third_party/rust/error-support/src/error_tracing.rs
index 716cad8b0b5db..01642a0097de0 100644
--- a/third_party/rust/error-support/src/error_tracing.rs
+++ b/third_party/rust/error-support/src/error_tracing.rs
@@ -2,18 +2,34 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+use std::{
+    collections::HashMap,
+    time::{Duration, Instant},
+};
+
 use parking_lot::Mutex;
 
-static RECENT_BREADCRUMBS: Mutex<BreadcrumbRingBuffer> = Mutex::new(BreadcrumbRingBuffer::new());
+static GLOBALS: Mutex<Globals> = Mutex::new(Globals::new());
 
 pub fn report_error_to_app(type_name: String, message: String) {
+    // First step: perform all actions that we need the lock for.
+    let breadcrumbs = {
+        let mut globals = GLOBALS.lock();
+        if !globals
+            .rate_limiter
+            .should_send_report(&type_name, Instant::now())
+        {
+            return;
+        }
+        globals.breadcrumbs.get_breadcrumbs()
+    };
     // Report errors by sending a tracing event to the `app-services-error-reporter::error` target.
     //
     // Applications should register for these events and send a glean error ping when they occur.
     //
     // breadcrumbs will be sent in the `breadcrumbs` field as a single string, with each individual
     // breadcrumb joined by newlines.
-    let breadcrumbs = RECENT_BREADCRUMBS.lock().get_breadcrumbs().join("\n");
+    let breadcrumbs = breadcrumbs.join("\n");
     tracing_support::error!(target: "app-services-error-reporter::error", message, type_name, breadcrumbs);
 }
 
@@ -22,10 +38,25 @@ pub fn report_breadcrumb(message: String, module: String, line: u32, column: u32
     //   - Push it to the `RECENT_BREADCRUMBS` list
     //   - Send out the `app-services-error-reporter::breadcrumb`.  Applications can register for
     //     these events and log them.
-    RECENT_BREADCRUMBS.lock().push(message.clone());
+    GLOBALS.lock().breadcrumbs.push(message.clone());
     tracing_support::info!(target: "app-services-error-reporter::breadcrumb", message, module, line, column);
 }
 
+// Global structs used for error reporting
+struct Globals {
+    breadcrumbs: BreadcrumbRingBuffer,
+    rate_limiter: RateLimiter,
+}
+
+impl Globals {
+    const fn new() -> Self {
+        Self {
+            breadcrumbs: BreadcrumbRingBuffer::new(),
+            rate_limiter: RateLimiter::new(),
+        }
+    }
+}
+
 /// Ring buffer implementation that we use to store the most recent 20 breadcrumbs
 #[derive(Default)]
 struct BreadcrumbRingBuffer {
@@ -73,6 +104,49 @@ fn truncate_breadcrumb(breadcrumb: String) -> String {
     breadcrumb[0..split_point].to_string()
 }
 
+/// Rate-limits error reports per component by type to a max of 20/hr
+///
+/// This uses the simplest algorithm possible.  We could use something like a token bucket to allow
+/// for a small burst of errors, but that doesn't seem so useful.  In that scenario, the first
+/// error report is the one we want to fix.
+struct RateLimiter {
+    // Optional so we can make `new()` const.
+    last_report: Option<HashMap<String, Instant>>,
+}
+
+impl RateLimiter {
+    // Rate limit reports if they're within 3 minutes of each other.
+    const INTERVAL: Duration = Duration::from_secs(180);
+
+    const fn new() -> Self {
+        Self { last_report: None }
+    }
+
+    fn should_send_report(&mut self, error_type: &str, now: Instant) -> bool {
+        let component = error_type.split("-").next().unwrap();
+        let last_report = self.last_report.get_or_insert_with(HashMap::default);
+
+        if let Some(last_report) = last_report.get(component) {
+            match now.checked_duration_since(*last_report) {
+                // Not enough time has passed, rate-limit the report
+                Some(elapsed) if elapsed < Self::INTERVAL => {
+                    return false;
+                }
+                // For all other cases, fall through and allow the report to be sent.
+                //
+                // Note: this also covers the `None` case which happens when the clock is
+                // non-monotonic.  This shouldn't happen often, but it's possible after the OS syncs
+                // with NTP, if users manually adjust their clocks, etc.  Letting an extra event
+                // through seems okay in this case. We should get back into a good state soon
+                // after.
+                _ => (),
+            }
+        }
+        last_report.insert(component.to_string(), now);
+        true
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
@@ -212,4 +286,41 @@ mod test {
         // fire emoji, which is multiple bytes long.
         assert_eq!(truncate_breadcrumb("0".repeat(99) + "🔥").len(), 99);
     }
+
+    #[test]
+    fn test_rate_limiter() {
+        let mut rate_limiter = RateLimiter::new();
+        let start = Instant::now();
+        let min = Duration::from_secs(60);
+        // The first error report is okay
+        assert!(rate_limiter.should_send_report("test-type", start));
+        // The report should be rate limited until 3 minutes pass, then we can send another one.
+        // Add time from the instant to simulate time going forward.
+        assert!(!rate_limiter.should_send_report("test-type", start));
+        assert!(!rate_limiter.should_send_report("test-type", start + min * 1));
+        assert!(!rate_limiter.should_send_report("test-type", start + min * 2));
+        assert!(rate_limiter.should_send_report("test-type", start + min * 3));
+        assert!(!rate_limiter.should_send_report("test-type", start + min * 4));
+        assert!(!rate_limiter.should_send_report("test-type", start + min * 5));
+        assert!(rate_limiter.should_send_report("test-type", start + min * 6));
+
+        assert!(rate_limiter.should_send_report("test-type", start + min * 60));
+        assert!(!rate_limiter.should_send_report("test-type", start + min * 61));
+        assert!(!rate_limiter.should_send_report("test-type", start + min * 62));
+        assert!(rate_limiter.should_send_report("test-type", start + min * 63));
+    }
+
+    #[test]
+    fn test_rate_limiter_type_matching() {
+        let mut rate_limiter = RateLimiter::new();
+        let start = Instant::now();
+        // Cause error error reports to be rate limited
+        assert!(rate_limiter.should_send_report("componenta-network-error", start));
+        assert!(!rate_limiter.should_send_report("componenta-network-error", start));
+        // Other reports from the same component should also be rate limited
+        assert!(!rate_limiter.should_send_report("componenta-database-error", start));
+        // But not ones from other components
+        assert!(rate_limiter.should_send_report("componentb-database-error", start));
+        assert!(rate_limiter.should_send_report("componentaa-network-error", start));
+    }
 }
diff --git a/third_party/rust/filter_adult/.cargo-checksum.json b/third_party/rust/filter_adult/.cargo-checksum.json
index c5cddc8ef23fd..ca5c9f6a6d107 100644
--- a/third_party/rust/filter_adult/.cargo-checksum.json
+++ b/third_party/rust/filter_adult/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"886d7b40e21a758cacd5434bba5298ee1cb08214073283ea6d957582802fb4e5","README.md":"22f8afa84d0520433a776749e6484d212c5b8ab1c39cd26392e5b4fb8d903927","src/adult_set.bin":"6c7ace6f2d28f779d28174621c25e3ec091b28bc959afed0b1a080cb77bb741d","src/bin/import-site-list.rs":"46b2e39f27f6c78345724c4c0ae88c99253e93a350f1ae2b22ea4a4cf95d2ca3","src/error.rs":"44c8f849fc5f527c169f9e572c6216e74ca866e1009ac9ed26333c954dc17f7e","src/lib.rs":"3dee3f293219dae0ac5f46ae93713e3030a3e1864416f0a2c1a08964d57c6a32"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"da5e5f3b8e297137937913e935351c711043acb92ad5e50864ef0dcd4cfe723e","README.md":"22f8afa84d0520433a776749e6484d212c5b8ab1c39cd26392e5b4fb8d903927","src/adult_set.bin":"6c7ace6f2d28f779d28174621c25e3ec091b28bc959afed0b1a080cb77bb741d","src/bin/import-site-list.rs":"46b2e39f27f6c78345724c4c0ae88c99253e93a350f1ae2b22ea4a4cf95d2ca3","src/error.rs":"44c8f849fc5f527c169f9e572c6216e74ca866e1009ac9ed26333c954dc17f7e","src/lib.rs":"3dee3f293219dae0ac5f46ae93713e3030a3e1864416f0a2c1a08964d57c6a32"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/filter_adult/Cargo.toml b/third_party/rust/filter_adult/Cargo.toml
index c7d4235a178cf..7febc1af66efb 100644
--- a/third_party/rust/filter_adult/Cargo.toml
+++ b/third_party/rust/filter_adult/Cargo.toml
@@ -53,4 +53,4 @@ default-features = false
 path = "../support/error"
 
 [dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
diff --git a/third_party/rust/glean-core/.cargo-checksum.json b/third_party/rust/glean-core/.cargo-checksum.json
index bed0dcbb53c91..dc46c4ccafb3e 100644
--- a/third_party/rust/glean-core/.cargo-checksum.json
+++ b/third_party/rust/glean-core/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"f5bf6d99b530bb019bed6564659c930921912a7697958407f82bb7c550cc0dab","Cargo.lock":"64f4c2b5f446feb82f0b1f1286511f112aa5f264f4b2f51eb3c4f49a1fec8cdd","Cargo.toml":"07d6ed31608165a3da22b3f29acd4615ce09ef5c838e73bf8fff87f58ba97c52","Cargo.toml.orig":"e484e8470dc3e3f5e3fa03a9b9c9d4b6e353ac8ca1ed255c1641b7f57bfcac01","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"026495898699b54608eb4ec16074ffafc57920d80ccb59961c501a1ea28c9985","benches/dispatcher.rs":"086c3cb9f44ab071753685991ab5b76d4582a55aec6f332eb4da6b05f9df6ce1","build.rs":"4857bea99c6b8c08db8818efa9d3738716f52d3acb68159323957ae52892a3eb","examples/rkv-open.rs":"0d0aaaa29b47338880ab444cece0dfa212ff114cbaf738c9a4cd6e7f10545854","src/common_metric_data.rs":"571075e47241a5f21799994033f852d0d70d0e486661287646ac61dadd11ac59","src/core/mod.rs":"836527e8f655d7205c9809340450eec947facd66ca31638a024af361ddaa808b","src/core_metrics.rs":"ddc750e9f4e11f88aee947360897031657aeef74fcf0f3293bd9033b78747354","src/coverage.rs":"49613fd310bd24d779472720975fbe6c97ec370a95eb55f10afa43f67539c942","src/database/mod.rs":"175b2be87bd198485c12409b708415b5a13e53a78c0f4e92729d2379ed618880","src/debug.rs":"663f77a3335256a562afad031496ea9215e315edd608398452df514dcff0b4af","src/dispatcher/global.rs":"baadcfe97eaac490a6b08479e8b4a45598445f5a9e6663ebf3095ee5f4f2a188","src/dispatcher/mod.rs":"b52e27140539f9349a7721e4e3329e3f002168664353b31fa1c7d843fb3a762d","src/error.rs":"21b087a55727b57ec26a017bb80887c6656aa461e38e82d9ecc5ca734b8fce71","src/error_recording.rs":"32c1f58ff080cb22184bca37e356faadbfe846386880fb0898b773adb3a97d8c","src/event_database/mod.rs":"cfd584864a8300a2b441bd91558dcc64ab8130bcc9e19583edeb37a3d9622d2c","src/fd_logger.rs":"4de0eb3d50ce96669de0bb581a4a794bec2cc768f2cb5221a02e739709c098e5","src/glean.udl":"43d66c7ee56533bdac9f272f3281515ee1e2cc1d9db2c85811f37283acda2967","src/glean_metrics.rs":"eb8dcf95b7a1a5c53d880f0ff791300e6c4c5e21f0761fed7c004381bc43a230","src/histogram/exponential.rs":"101c16ef06f043c2bc8eb28684ab69c748b4bc8c6f66ed4e64ee24c0ee9a364e","src/histogram/functional.rs":"fffa12a5b2b376cf9337ee0fdd6ad7961841e441b556a4e9ef29c524f933ea2d","src/histogram/linear.rs":"9214b0c99884ce35969c397c336410d0a7e898f8cee697f6b80166b451dfa781","src/histogram/mod.rs":"b4033298bdd011542cf4243a4f64634b4b9b815aa0a7c2c662a55310298dab5e","src/internal_metrics.rs":"fea338bbfe77498ceb5810a7387e78f9f07c82728f6ec3d026ddcaa1b09e5230","src/internal_pings.rs":"2b90557ace5177cbf12e53889c79a572c3772ebfb2a61ef7d42cef89467263b8","src/lib.rs":"1fc685c3b8542356d3cf31b58366f579073c6fad80f2388e0f66bd212785bd47","src/lib_unit_tests.rs":"cc0ca9d21ce75fc9e8b445240d770018459b8f71f44b08a988d4ac2d25ac3c4f","src/metrics/boolean.rs":"06c6f4a7c236083f95f3a9f2bc543aa2745f8d02d25bd2dee0dfe37ca2558662","src/metrics/counter.rs":"5cdebb985fc960283926f96d2e08b9e72a70c5d6e5e27463671a64d8eb532d84","src/metrics/custom_distribution.rs":"48ec22cfa6b6481daa0152672e34f6793aab9c256192bdc3fce0f47f37c73f27","src/metrics/datetime.rs":"f38db0aae52dd2eba726b76a9a246c70e15ed9dc303c3d1df33229b9fdc3826b","src/metrics/denominator.rs":"69403002f65cf6c2a792c17f1714e4841a44283e3df19704b84cd46554a4bd21","src/metrics/dual_labeled_counter.rs":"8e1a4690f2a84d84aefbb211e3478565e440271fd53c31fae020b74e7d0ec0a7","src/metrics/event.rs":"f79103475b656b631861431e7b943956d94b1a92621f2e05d6fbca0312673c20","src/metrics/experiment.rs":"5f9278cca4e133eb8df33bbfe36d1fe0ef3eade8c09f1b46db3c4d0790515412","src/metrics/labeled.rs":"6bab38ccd297f92b54b91f6a36c39a9eaecf7573f6f761850c467e605cd0dd2b","src/metrics/memory_distribution.rs":"681ee0a15ebdd7d7f81edac0ef7e8f1e7bb0eb45414b4a95a8c33b9f215ac444","src/metrics/memory_unit.rs":"ee32e020cb303dd631457374048a3ed53a2e7cbacc29c54d17d836fb15507538","src/metrics/mod.rs":"63bbefcc54b22a066a14da6850b3a7f6c8aea2102e64678d84c66bb65f682e5d","src/metrics/numerator.rs":"de8853a691980606745895c083c22036347117b3d556de66a9d9978ec0f51168","src/metrics/object.rs":"cae8f118350e5fd7d28a810ac8d00ba7e401237f3e4fbb6233eef3874ddf8683","src/metrics/ping.rs":"065e3203b7c82a88937c5241be5964ee2d12f9c8404c57f7fd2e15a5cf7f0469","src/metrics/quantity.rs":"a39359e4c21ffbe687580eeac02967f12dec85ba0461ac2167a5bbd23ab7b2af","src/metrics/rate.rs":"ffde9ace03310287c7d6624b391c2168571deaf421b7e1e71fe4b771867f6a36","src/metrics/recorded_experiment.rs":"6f089534bb4e1143abf0aa43e813c9fcc864fff128a825e83f09e61e96a1f6ee","src/metrics/remote_settings_config.rs":"3beea00afd2779f1e4d2d88ed43cbce1e5a62286ea74b52f0a62236f3b34c217","src/metrics/string.rs":"6469efc8b42841ad7dd265bb77c9ed187cb175e62e006a47cc46ec677b907715","src/metrics/string_list.rs":"acb68507cddc8f3a6a90abb075d1099fe047603f4af3c776de6fa25fc5893f57","src/metrics/text.rs":"ffb9664d8eadbc858da543d27e11c9a8aff8dadfa98f4b7b92e458a7627c2a48","src/metrics/time_unit.rs":"72325065e4ac0f3562f1983bda9fe3c0ab18272011dafe03d67900a3184a8eb6","src/metrics/timespan.rs":"028245d298c800a877f614bd8832fb596ff11ea600d4e00b4967c127cbb48994","src/metrics/timing_distribution.rs":"30af0e8417176b5ec3136bbefe699e3ec7c342c0a14dac3b27f35d2b55d853b7","src/metrics/url.rs":"3efa62c1c1070319f56fb641d61f489918d716763916dcd6d6d3073b3a6f8c6f","src/metrics/uuid.rs":"3b18c899d2c1e5967b73594dd2a0ab6f2b0c220eaf2bf3d4ef7de2cb1c1e4edd","src/ping/mod.rs":"a21212c4ee31d8b60760f21b31bf320ab921aa16503cc94e2fbc2b70ea604e3f","src/scheduler.rs":"2463d406492b43e3b4544bc3b6cdeea99421b2bb04178a0cf38cd9cfcd00c5e4","src/storage/mod.rs":"dd27a2ced7f2d16fd52f680a45f8751e0d6939435b1c8f4c28a9e7bef3ccb4f0","src/system.rs":"e3d1b54e1d39cafe6f4dc7ff5021b08c879733f909951b0e1332b3efa9ed97bd","src/thread.rs":"f8504fb6cfc7b43566f232930d5075d8a759fd7339d81ff01ba73568298492c7","src/traits/boolean.rs":"fa955e81ee0ff1a3da86002347cf4713f4ccd4e7a32ecddc7e8eab6483820277","src/traits/counter.rs":"8ed21fad9163b10a4fec89c052437ada69bbda6c9fe9e912bd9a2531a3264427","src/traits/custom_distribution.rs":"3dd516a7cf62c48371ee36e7390707e049bca3bf45fefca2d6cb0d33c501df17","src/traits/datetime.rs":"6c3bae9b7e971181c4d0c39d873a424b4bd30bdab3dc9fd00027327902f628fd","src/traits/dual_labeled_counter.rs":"63cbed60be3e8d695788f0a3624507787a005a0aaf05bdd3828fdfb0890952e0","src/traits/event.rs":"f372bfce1247d59693af351f2d79023c07d4f2f1fbaa38fc0bdce1af6d218bb5","src/traits/labeled.rs":"1b2f8eea8d59e1635f64993936d880084a5e3f65cfd7a26ddf6968366890187d","src/traits/memory_distribution.rs":"9e559d2579092062da945ec1d901439b3907fdc9db2bb376b10f9a877b58f2ac","src/traits/mod.rs":"1ffab9c66d37a4759c369d805386792eb39f769d6a801e1737eb19cfdb40477f","src/traits/numerator.rs":"d5991ef6463d17127ce7c969f8a3e110ec83b59714162f04d371ac43844241a1","src/traits/object.rs":"c03bad670ec7affbc578247f9e1904e898c1870b9bf25750c5094113f995623f","src/traits/ping.rs":"8831c106c03afeb458b0b028fa1ce61f056ebf8e82bc0a171a1bff255d920748","src/traits/quantity.rs":"cff0f7fdd0ee41d0457d9ca08222f652b4649eb64e0c0fbdfa76849013012c56","src/traits/rate.rs":"4f0a3a68d78631e5d5b83cbc65bfb9a41359b4fd8874296d58adebbc914a739a","src/traits/string.rs":"594a330ca03b21128040a263b3d4c85f66aed5147ac785f036f8c537c691dfd3","src/traits/string_list.rs":"b0b46bdf8c48a7480a0144eb40bf93fbfd8086af8e5f73863676fb695fb443ba","src/traits/text.rs":"b700031c6204126e73d9ea9c36f59fe6eb0b3b5dc50696072445c4420806f80f","src/traits/timespan.rs":"95d747ade6a58428f613b8860289a369386f45a8dc2b76ba741e39cbf19cc438","src/traits/timing_distribution.rs":"20e3ff9eed201a782f35584c657af0c7430673a97afeae708e2ea893a5723b95","src/traits/url.rs":"36fa73762288c4d33dd72de1a47c1f5451d2d6e751cf293d5e0ec88ebd4f9a71","src/traits/uuid.rs":"ea31080e349166d59272a119a546870650fab3dc512d356efbc98a3254165023","src/upload/directory.rs":"b676a05ae19a937e81391d749048fd7f544c629999dd71c8198319b5534da956","src/upload/mod.rs":"0cabe040aa8711c419922bd2e00acf8e3d3af48a65f01c8be590316b957e876a","src/upload/policy.rs":"df95dacdc32977f10d28b3677d19c074a38daef90193f8fe3994ada3e5bcf08f","src/upload/request.rs":"6922ca8ca6944b414686234156b1d46bf9e6f4bf745b77ed7a767ad231970876","src/upload/result.rs":"c956266c54595d27d5e8b11abffe28fad5fea82995922618805b66cfdcc21d54","src/util.rs":"8fe16c1a1c89d9ca0fee425d81a5809c999092c0b7543d386a2b9a6d649ba130","tests/boolean.rs":"76d6014ff108cb6514d9bceb1b2b14749a55b09921f4595a5e30f1bd3546e9f0","tests/clientid_textfile.rs":"92b28280321c0e0994820cd0e0b5fbb4d49990c65d36de451389720d0d270666","tests/collection_enabled.rs":"05517ad50a05e97f73b658eb854561284db1588c7f1ec736055436a0b2b64d99","tests/common/mod.rs":"d086cbaf7ab330d10e91ebceb709d77b48d481735499ccbf59f68ec662ca7230","tests/counter.rs":"4c59def10e64de0d7a0241dde0267fd02c828b38be8cc67fba90a76004ca6721","tests/custom_distribution.rs":"41c593a0b4561e21f29d1a5b948de964a866253c58ca76ffefebe370fca150e0","tests/datetime.rs":"51bf8ebea3f5b99d2e5cab1d0e2cd15d750a05c5002b9dbec614ce7dc9093cf4","tests/dual_labeled_counter.rs":"e95a5713ec3faa2cbd4bfdafa9b2f4051bb7c3d7e3fd09ca4d730d5ee7d30ffe","tests/event.rs":"2321b9b80460aeaeb3583da5d475de7c6e331e95033f38313a9018056850201b","tests/labeled.rs":"01ea8db75d774f6ca864f7cc772c98c21e570511cb034e0226127a2bae7b605f","tests/memory_distribution.rs":"3d9a5b8f99e03f783e3396e4320ee4dc974c895cfef2cec0b14d2a9a9f9b736f","tests/object.rs":"8c35676e04f6ccf54a28764700915e753fc0355bfa5d7804d72caba66fd564cd","tests/ping.rs":"eff68d3b47b04c58d8123214dd66e8d06d11f82ed3fd4f703224f84effb319bb","tests/ping_maker.rs":"e4b834336dc8114531746a3c47a8c28c7ae9831856c06d9c0ce26a1167e4fcfd","tests/quantity.rs":"55e7dca346fd1d27f0974b78ca3fb12427cb5da2ee637afc08a54f360f947361","tests/rate.rs":"3766230e31cc4ab960f916b4c2f9208cc8542ecea0749298197f547b745440e9","tests/storage.rs":"990dd1d13b9ffa8af0686977a6ac3502c6befb9eaa83649587e2660f51c596c9","tests/string.rs":"397fcfd27c25f0e81e2a40db3265b0d7dc0dd56b190319c1f86cb1c2c0ed4f9d","tests/string_list.rs":"34efa2afe3e89e6635f21ec9c80650d5816e35e9cb85163d894d600a5b3a4e3a","tests/test-rkv-cases.sh":"1df53d64ba03ff60b242afb79099fb1a5847a7d29b4b8f6e3fa8d75bdeff1d71","tests/text.rs":"c3449e0dd8d774a60f47e39752c16951b8723eeea11c6a01d7fa7d3536285773","tests/timespan.rs":"3d05739a93f3e0ea7264e8fdea876bd948714e5b44e82b8fd7c0218fdb597bb3","tests/timing_distribution.rs":"072ad950b2162e503150e411119b9a000573538bd2cff93c1c1a3616d1589ef4","tests/uuid.rs":"e0e58614319f5e973126f5b4e68d9289ccd6d65e428aca215bf7dcc8a0504889","uniffi.toml":"6ddc98b686b0925a81abd9d1c769e5c98ac29771b210a1c535931a46dec9a8e3"},"package":"b34409d1d4bc10da8ddcb584a0a1825d8ad6a5a268bf711320da95c615c30245"}
\ No newline at end of file
+{"files":{".cargo_vcs_info.json":"e82dae59360598d815537223d72a8bf234acc2236c40ca1f9ecfd15f01075550","Cargo.lock":"a2eb0e7140e22e16399788cdcc35b5237ce39461c83e4ec42fa31fb38e533f33","Cargo.toml":"133826f45171cfa2db3b2306ea8bc46bb757ba2a310a27863c3274523dc81a1d","Cargo.toml.orig":"5491a835f93fac8a1fa5a1b8dc376573309732e0f2a79323b21518a35e09b473","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"026495898699b54608eb4ec16074ffafc57920d80ccb59961c501a1ea28c9985","build.rs":"4857bea99c6b8c08db8818efa9d3738716f52d3acb68159323957ae52892a3eb","examples/rkv-open.rs":"0d0aaaa29b47338880ab444cece0dfa212ff114cbaf738c9a4cd6e7f10545854","src/common_metric_data.rs":"571075e47241a5f21799994033f852d0d70d0e486661287646ac61dadd11ac59","src/core/mod.rs":"836527e8f655d7205c9809340450eec947facd66ca31638a024af361ddaa808b","src/core_metrics.rs":"ddc750e9f4e11f88aee947360897031657aeef74fcf0f3293bd9033b78747354","src/coverage.rs":"49613fd310bd24d779472720975fbe6c97ec370a95eb55f10afa43f67539c942","src/database/mod.rs":"175b2be87bd198485c12409b708415b5a13e53a78c0f4e92729d2379ed618880","src/debug.rs":"663f77a3335256a562afad031496ea9215e315edd608398452df514dcff0b4af","src/dispatcher/global.rs":"baadcfe97eaac490a6b08479e8b4a45598445f5a9e6663ebf3095ee5f4f2a188","src/dispatcher/mod.rs":"b52e27140539f9349a7721e4e3329e3f002168664353b31fa1c7d843fb3a762d","src/error.rs":"21b087a55727b57ec26a017bb80887c6656aa461e38e82d9ecc5ca734b8fce71","src/error_recording.rs":"32c1f58ff080cb22184bca37e356faadbfe846386880fb0898b773adb3a97d8c","src/event_database/mod.rs":"9fce4a5e829379d72296cf043d1adc1995deac1e9636c686e635134f765e3ca7","src/fd_logger.rs":"4de0eb3d50ce96669de0bb581a4a794bec2cc768f2cb5221a02e739709c098e5","src/glean.udl":"43d66c7ee56533bdac9f272f3281515ee1e2cc1d9db2c85811f37283acda2967","src/glean_metrics.rs":"eb8dcf95b7a1a5c53d880f0ff791300e6c4c5e21f0761fed7c004381bc43a230","src/histogram/exponential.rs":"101c16ef06f043c2bc8eb28684ab69c748b4bc8c6f66ed4e64ee24c0ee9a364e","src/histogram/functional.rs":"fffa12a5b2b376cf9337ee0fdd6ad7961841e441b556a4e9ef29c524f933ea2d","src/histogram/linear.rs":"9214b0c99884ce35969c397c336410d0a7e898f8cee697f6b80166b451dfa781","src/histogram/mod.rs":"b4033298bdd011542cf4243a4f64634b4b9b815aa0a7c2c662a55310298dab5e","src/internal_metrics.rs":"4d262851ebabdf2c1ee6ed845afcc9bafe51b06f2fd10c94617c69bb686be89d","src/internal_pings.rs":"2b90557ace5177cbf12e53889c79a572c3772ebfb2a61ef7d42cef89467263b8","src/lib.rs":"1fc685c3b8542356d3cf31b58366f579073c6fad80f2388e0f66bd212785bd47","src/lib_unit_tests.rs":"cc0ca9d21ce75fc9e8b445240d770018459b8f71f44b08a988d4ac2d25ac3c4f","src/metrics/boolean.rs":"06c6f4a7c236083f95f3a9f2bc543aa2745f8d02d25bd2dee0dfe37ca2558662","src/metrics/counter.rs":"5cdebb985fc960283926f96d2e08b9e72a70c5d6e5e27463671a64d8eb532d84","src/metrics/custom_distribution.rs":"48ec22cfa6b6481daa0152672e34f6793aab9c256192bdc3fce0f47f37c73f27","src/metrics/datetime.rs":"f38db0aae52dd2eba726b76a9a246c70e15ed9dc303c3d1df33229b9fdc3826b","src/metrics/denominator.rs":"69403002f65cf6c2a792c17f1714e4841a44283e3df19704b84cd46554a4bd21","src/metrics/dual_labeled_counter.rs":"8e1a4690f2a84d84aefbb211e3478565e440271fd53c31fae020b74e7d0ec0a7","src/metrics/event.rs":"f79103475b656b631861431e7b943956d94b1a92621f2e05d6fbca0312673c20","src/metrics/experiment.rs":"5f9278cca4e133eb8df33bbfe36d1fe0ef3eade8c09f1b46db3c4d0790515412","src/metrics/labeled.rs":"6bab38ccd297f92b54b91f6a36c39a9eaecf7573f6f761850c467e605cd0dd2b","src/metrics/memory_distribution.rs":"681ee0a15ebdd7d7f81edac0ef7e8f1e7bb0eb45414b4a95a8c33b9f215ac444","src/metrics/memory_unit.rs":"ee32e020cb303dd631457374048a3ed53a2e7cbacc29c54d17d836fb15507538","src/metrics/mod.rs":"63bbefcc54b22a066a14da6850b3a7f6c8aea2102e64678d84c66bb65f682e5d","src/metrics/numerator.rs":"de8853a691980606745895c083c22036347117b3d556de66a9d9978ec0f51168","src/metrics/object.rs":"cae8f118350e5fd7d28a810ac8d00ba7e401237f3e4fbb6233eef3874ddf8683","src/metrics/ping.rs":"065e3203b7c82a88937c5241be5964ee2d12f9c8404c57f7fd2e15a5cf7f0469","src/metrics/quantity.rs":"a39359e4c21ffbe687580eeac02967f12dec85ba0461ac2167a5bbd23ab7b2af","src/metrics/rate.rs":"ffde9ace03310287c7d6624b391c2168571deaf421b7e1e71fe4b771867f6a36","src/metrics/recorded_experiment.rs":"6f089534bb4e1143abf0aa43e813c9fcc864fff128a825e83f09e61e96a1f6ee","src/metrics/remote_settings_config.rs":"3beea00afd2779f1e4d2d88ed43cbce1e5a62286ea74b52f0a62236f3b34c217","src/metrics/string.rs":"6469efc8b42841ad7dd265bb77c9ed187cb175e62e006a47cc46ec677b907715","src/metrics/string_list.rs":"acb68507cddc8f3a6a90abb075d1099fe047603f4af3c776de6fa25fc5893f57","src/metrics/text.rs":"ffb9664d8eadbc858da543d27e11c9a8aff8dadfa98f4b7b92e458a7627c2a48","src/metrics/time_unit.rs":"72325065e4ac0f3562f1983bda9fe3c0ab18272011dafe03d67900a3184a8eb6","src/metrics/timespan.rs":"028245d298c800a877f614bd8832fb596ff11ea600d4e00b4967c127cbb48994","src/metrics/timing_distribution.rs":"30af0e8417176b5ec3136bbefe699e3ec7c342c0a14dac3b27f35d2b55d853b7","src/metrics/url.rs":"3efa62c1c1070319f56fb641d61f489918d716763916dcd6d6d3073b3a6f8c6f","src/metrics/uuid.rs":"3b18c899d2c1e5967b73594dd2a0ab6f2b0c220eaf2bf3d4ef7de2cb1c1e4edd","src/ping/mod.rs":"a21212c4ee31d8b60760f21b31bf320ab921aa16503cc94e2fbc2b70ea604e3f","src/scheduler.rs":"2463d406492b43e3b4544bc3b6cdeea99421b2bb04178a0cf38cd9cfcd00c5e4","src/storage/mod.rs":"dd27a2ced7f2d16fd52f680a45f8751e0d6939435b1c8f4c28a9e7bef3ccb4f0","src/system.rs":"e3d1b54e1d39cafe6f4dc7ff5021b08c879733f909951b0e1332b3efa9ed97bd","src/thread.rs":"f8504fb6cfc7b43566f232930d5075d8a759fd7339d81ff01ba73568298492c7","src/traits/boolean.rs":"fa955e81ee0ff1a3da86002347cf4713f4ccd4e7a32ecddc7e8eab6483820277","src/traits/counter.rs":"8ed21fad9163b10a4fec89c052437ada69bbda6c9fe9e912bd9a2531a3264427","src/traits/custom_distribution.rs":"3dd516a7cf62c48371ee36e7390707e049bca3bf45fefca2d6cb0d33c501df17","src/traits/datetime.rs":"6c3bae9b7e971181c4d0c39d873a424b4bd30bdab3dc9fd00027327902f628fd","src/traits/dual_labeled_counter.rs":"63cbed60be3e8d695788f0a3624507787a005a0aaf05bdd3828fdfb0890952e0","src/traits/event.rs":"f372bfce1247d59693af351f2d79023c07d4f2f1fbaa38fc0bdce1af6d218bb5","src/traits/labeled.rs":"1b2f8eea8d59e1635f64993936d880084a5e3f65cfd7a26ddf6968366890187d","src/traits/memory_distribution.rs":"9e559d2579092062da945ec1d901439b3907fdc9db2bb376b10f9a877b58f2ac","src/traits/mod.rs":"1ffab9c66d37a4759c369d805386792eb39f769d6a801e1737eb19cfdb40477f","src/traits/numerator.rs":"d5991ef6463d17127ce7c969f8a3e110ec83b59714162f04d371ac43844241a1","src/traits/object.rs":"c03bad670ec7affbc578247f9e1904e898c1870b9bf25750c5094113f995623f","src/traits/ping.rs":"8831c106c03afeb458b0b028fa1ce61f056ebf8e82bc0a171a1bff255d920748","src/traits/quantity.rs":"cff0f7fdd0ee41d0457d9ca08222f652b4649eb64e0c0fbdfa76849013012c56","src/traits/rate.rs":"4f0a3a68d78631e5d5b83cbc65bfb9a41359b4fd8874296d58adebbc914a739a","src/traits/string.rs":"594a330ca03b21128040a263b3d4c85f66aed5147ac785f036f8c537c691dfd3","src/traits/string_list.rs":"b0b46bdf8c48a7480a0144eb40bf93fbfd8086af8e5f73863676fb695fb443ba","src/traits/text.rs":"b700031c6204126e73d9ea9c36f59fe6eb0b3b5dc50696072445c4420806f80f","src/traits/timespan.rs":"95d747ade6a58428f613b8860289a369386f45a8dc2b76ba741e39cbf19cc438","src/traits/timing_distribution.rs":"20e3ff9eed201a782f35584c657af0c7430673a97afeae708e2ea893a5723b95","src/traits/url.rs":"36fa73762288c4d33dd72de1a47c1f5451d2d6e751cf293d5e0ec88ebd4f9a71","src/traits/uuid.rs":"ea31080e349166d59272a119a546870650fab3dc512d356efbc98a3254165023","src/upload/directory.rs":"b676a05ae19a937e81391d749048fd7f544c629999dd71c8198319b5534da956","src/upload/mod.rs":"0cabe040aa8711c419922bd2e00acf8e3d3af48a65f01c8be590316b957e876a","src/upload/policy.rs":"df95dacdc32977f10d28b3677d19c074a38daef90193f8fe3994ada3e5bcf08f","src/upload/request.rs":"6922ca8ca6944b414686234156b1d46bf9e6f4bf745b77ed7a767ad231970876","src/upload/result.rs":"c956266c54595d27d5e8b11abffe28fad5fea82995922618805b66cfdcc21d54","src/util.rs":"8fe16c1a1c89d9ca0fee425d81a5809c999092c0b7543d386a2b9a6d649ba130","tests/boolean.rs":"76d6014ff108cb6514d9bceb1b2b14749a55b09921f4595a5e30f1bd3546e9f0","tests/clientid_textfile.rs":"92b28280321c0e0994820cd0e0b5fbb4d49990c65d36de451389720d0d270666","tests/collection_enabled.rs":"05517ad50a05e97f73b658eb854561284db1588c7f1ec736055436a0b2b64d99","tests/common/mod.rs":"56a4fb53f1651be1f8f20e916a1ef3cb81729c02013129f92be90fa610a53ec5","tests/counter.rs":"4c59def10e64de0d7a0241dde0267fd02c828b38be8cc67fba90a76004ca6721","tests/custom_distribution.rs":"41c593a0b4561e21f29d1a5b948de964a866253c58ca76ffefebe370fca150e0","tests/datetime.rs":"51bf8ebea3f5b99d2e5cab1d0e2cd15d750a05c5002b9dbec614ce7dc9093cf4","tests/docs.rs":"990c5a05a0e01c817eb03f34310948b2c255f70110c1b8bf1c4bdf0bf02a0823","tests/dual_labeled_counter.rs":"e95a5713ec3faa2cbd4bfdafa9b2f4051bb7c3d7e3fd09ca4d730d5ee7d30ffe","tests/event.rs":"2321b9b80460aeaeb3583da5d475de7c6e331e95033f38313a9018056850201b","tests/labeled.rs":"01ea8db75d774f6ca864f7cc772c98c21e570511cb034e0226127a2bae7b605f","tests/memory_distribution.rs":"3d9a5b8f99e03f783e3396e4320ee4dc974c895cfef2cec0b14d2a9a9f9b736f","tests/object.rs":"8c35676e04f6ccf54a28764700915e753fc0355bfa5d7804d72caba66fd564cd","tests/ping.rs":"eff68d3b47b04c58d8123214dd66e8d06d11f82ed3fd4f703224f84effb319bb","tests/ping_maker.rs":"79453ba1f5e61023137734ddbac858a4141e0f1d6fb4ac135b7375355b233fba","tests/quantity.rs":"55e7dca346fd1d27f0974b78ca3fb12427cb5da2ee637afc08a54f360f947361","tests/rate.rs":"3766230e31cc4ab960f916b4c2f9208cc8542ecea0749298197f547b745440e9","tests/storage.rs":"990dd1d13b9ffa8af0686977a6ac3502c6befb9eaa83649587e2660f51c596c9","tests/string.rs":"397fcfd27c25f0e81e2a40db3265b0d7dc0dd56b190319c1f86cb1c2c0ed4f9d","tests/string_list.rs":"34efa2afe3e89e6635f21ec9c80650d5816e35e9cb85163d894d600a5b3a4e3a","tests/test-rkv-cases.sh":"1df53d64ba03ff60b242afb79099fb1a5847a7d29b4b8f6e3fa8d75bdeff1d71","tests/text.rs":"c3449e0dd8d774a60f47e39752c16951b8723eeea11c6a01d7fa7d3536285773","tests/timespan.rs":"3d05739a93f3e0ea7264e8fdea876bd948714e5b44e82b8fd7c0218fdb597bb3","tests/timing_distribution.rs":"072ad950b2162e503150e411119b9a000573538bd2cff93c1c1a3616d1589ef4","tests/uuid.rs":"e0e58614319f5e973126f5b4e68d9289ccd6d65e428aca215bf7dcc8a0504889","uniffi.toml":"6ddc98b686b0925a81abd9d1c769e5c98ac29771b210a1c535931a46dec9a8e3"},"package":"b8146e9829a5fe15343fd3c42d8d41e478b02f68b8359346273cc56d7f7feff8"}
\ No newline at end of file
diff --git a/third_party/rust/glean-core/.cargo_vcs_info.json b/third_party/rust/glean-core/.cargo_vcs_info.json
index 06dc25f2c9a3b..e8543aa8956b4 100644
--- a/third_party/rust/glean-core/.cargo_vcs_info.json
+++ b/third_party/rust/glean-core/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "8345d1b4b7eb0530a21656d7001df4bb8ce73809"
+    "sha1": "a793015bad500379ec5480e280ac2631178a2013"
   },
   "path_in_vcs": "glean-core"
 }
\ No newline at end of file
diff --git a/third_party/rust/glean-core/Cargo.lock b/third_party/rust/glean-core/Cargo.lock
index 7bdb053f73f9e..65db90a18df80 100644
--- a/third_party/rust/glean-core/Cargo.lock
+++ b/third_party/rust/glean-core/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "adler2"
@@ -67,9 +67,9 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
 
 [[package]]
 name = "askama"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4744ed2eef2645831b441d8f5459689ade2ab27c854488fbab1fbe94fce1a7"
+checksum = "f75363874b771be265f4ffe307ca705ef6f3baa19011c149da8674a87f1b75c4"
 dependencies = [
  "askama_derive",
  "itoa",
@@ -80,9 +80,9 @@ dependencies = [
 
 [[package]]
 name = "askama_derive"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d661e0f57be36a5c14c48f78d09011e67e0cb618f269cca9f2fd8d15b68c46ac"
+checksum = "129397200fe83088e8a68407a8e2b1f826cf0086b21ccdb866a722c8bcd3a94f"
 dependencies = [
  "askama_parser",
  "basic-toml",
@@ -97,9 +97,9 @@ dependencies = [
 
 [[package]]
 name = "askama_parser"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf315ce6524c857bb129ff794935cf6d42c82a6cff60526fe2a63593de4d0d4f"
+checksum = "d6ab5630b3d5eaf232620167977f95eb51f3432fc76852328774afbd242d4358"
 dependencies = [
  "memchr",
  "serde",
@@ -451,7 +451,7 @@ dependencies = [
 
 [[package]]
 name = "glean-core"
-version = "66.3.0"
+version = "67.0.0"
 dependencies = [
  "android_logger",
  "bincode",
@@ -461,11 +461,12 @@ dependencies = [
  "ctor",
  "env_logger",
  "flate2",
- "iso8601",
  "log",
  "malloc_size_of_derive",
  "once_cell",
  "oslog",
+ "pulldown-cmark",
+ "pulldown-cmark-to-cmark",
  "rkv",
  "serde",
  "serde_json",
@@ -474,6 +475,7 @@ dependencies = [
  "uniffi",
  "uuid",
  "wr_malloc_size_of",
+ "xshell",
  "zeitstempel",
 ]
 
@@ -579,15 +581,7 @@ checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
  "hashbrown",
-]
-
-[[package]]
-name = "iso8601"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5b94fbeb759754d87e1daea745bc8efd3037cd16980331fe1d1524c9a79ce96"
-dependencies = [
- "nom",
+ "serde",
 ]
 
 [[package]]
@@ -781,6 +775,26 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "pulldown-cmark"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0"
+dependencies = [
+ "bitflags 2.4.1",
+ "memchr",
+ "unicase",
+]
+
+[[package]]
+name = "pulldown-cmark-to-cmark"
+version = "22.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50793def1b900256624a709439404384204a5dc3a6ec580281bfaac35e882e90"
+dependencies = [
+ "pulldown-cmark",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.38"
@@ -918,18 +932,28 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.217"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.217"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -948,11 +972,20 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776"
+dependencies = [
+ "serde_core",
+]
+
 [[package]]
 name = "siphasher"
-version = "0.3.11"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "smawk"
@@ -1057,13 +1090,49 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "toml"
-version = "0.5.11"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+checksum = "ae2a4cf385da23d1d53bc15cdfa5c2109e93d8d362393c801e87da2f72f0e201"
 dependencies = [
- "serde",
+ "indexmap",
+ "serde_core",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_parser",
+ "toml_writer",
+ "winnow",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.7.5+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10"
+dependencies = [
+ "winnow",
 ]
 
+[[package]]
+name = "toml_writer"
+version = "1.0.6+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607"
+
+[[package]]
+name = "unicase"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142"
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.8"
@@ -1087,9 +1156,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6d968cb62160c11f2573e6be724ef8b1b18a277aededd17033f8a912d73e2b4"
+checksum = "b8c6dec3fc6645f71a16a3fa9ff57991028153bd194ca97f4b55e610c73ce66a"
 dependencies = [
  "anyhow",
  "uniffi_build",
@@ -1100,9 +1169,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_bindgen"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6b39ef1acbe1467d5d210f274fae344cb6f8766339330cb4c9688752899bf6b"
+checksum = "4ed0150801958d4825da56a41c71f000a457ac3a4613fa9647df78ac4b6b6881"
 dependencies = [
  "anyhow",
  "askama",
@@ -1125,9 +1194,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_build"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6683e6b665423cddeacd89a3f97312cf400b2fb245a26f197adaf65c45d505b2"
+checksum = "b78fd9271a4c2e85bd2c266c5a9ede1fac676eb39fd77f636c27eaf67426fd5f"
 dependencies = [
  "anyhow",
  "camino",
@@ -1136,9 +1205,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_core"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2d990b553d6b9a7ee9c3ae71134674739913d52350b56152b0e613595bb5a6f"
+checksum = "b0ef62e69762fbb9386dcb6c87cd3dd05d525fa8a3a579a290892e60ddbda47e"
 dependencies = [
  "anyhow",
  "bytes",
@@ -1148,9 +1217,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_internal_macros"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04f4f224becf14885c10e6e400b95cc4d1985738140cb194ccc2044563f8a56b"
+checksum = "98f51ebca0d9a4b2aa6c644d5ede45c56f73906b96403c08a1985e75ccb64a01"
 dependencies = [
  "anyhow",
  "indexmap",
@@ -1161,9 +1230,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_macros"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b481d385af334871d70904e6a5f129be7cd38c18fcf8dd8fd1f646b426a56d58"
+checksum = "db9d12529f1223d014fd501e5f29ca0884d15d6ed5ddddd9f506e55350327dc3"
 dependencies = [
  "camino",
  "fs-err",
@@ -1178,9 +1247,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_meta"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f817868a3b171bb7bf259e882138d104deafde65684689b4694c846d322491"
+checksum = "9df6d413db2827c68588f8149d30d49b71d540d46539e435b23a7f7dbd4d4f86"
 dependencies = [
  "anyhow",
  "siphasher",
@@ -1190,9 +1259,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_pipeline"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b147e133ad7824e32426b90bc41fda584363563f2ba747f590eca1fd6fd14e6"
+checksum = "a806dddc8208f22efd7e95a5cdf88ed43d0f3271e8f63b47e757a8bbdb43b63a"
 dependencies = [
  "anyhow",
  "heck",
@@ -1203,9 +1272,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_udl"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caed654fb73da5abbc7a7e9c741532284532ba4762d6fe5071372df22a41730a"
+checksum = "0d1a7339539bf6f6fa3e9b534dece13f778bda2d54b1a6d4e40b4d6090ac26e7"
 dependencies = [
  "anyhow",
  "textwrap",
@@ -1500,6 +1569,21 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "xshell"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e7290c623014758632efe00737145b6867b66292c42167f2ec381eb566a373d"
+dependencies = [
+ "xshell-macros",
+]
+
+[[package]]
+name = "xshell-macros"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32ac00cd3f8ec9c1d33fb3e7958a82df6989c42d747bd326c822b1d625283547"
+
 [[package]]
 name = "zeitstempel"
 version = "0.2.0"
diff --git a/third_party/rust/glean-core/Cargo.toml b/third_party/rust/glean-core/Cargo.toml
index 9e04e9ad4f1e9..2fc7c90e157aa 100644
--- a/third_party/rust/glean-core/Cargo.toml
+++ b/third_party/rust/glean-core/Cargo.toml
@@ -11,9 +11,9 @@
 
 [package]
 edition = "2021"
-rust-version = "1.82"
+rust-version = "1.87"
 name = "glean-core"
-version = "66.3.0"
+version = "67.0.0"
 authors = [
     "Jan-Erik Rediger <jrediger@mozilla.com>",
     "The Glean Team <glean-team@mozilla.com>",
@@ -24,12 +24,12 @@ include = [
     "/LICENSE",
     "/src",
     "/examples",
-    "/benches",
     "/tests",
     "/Cargo.toml",
     "/uniffi.toml",
     "/build.rs",
 ]
+autolib = false
 autobins = false
 autoexamples = false
 autotests = false
@@ -43,10 +43,21 @@ repository = "https://github.com/mozilla/glean"
 [package.metadata.glean]
 glean-parser = "18.2.0"
 
+[badges.circle-ci]
+branch = "main"
+repository = "mozilla/glean"
+
+[badges.maintenance]
+status = "actively-developed"
+
+[features]
+benchmark = []
+enable_env_logger = ["env_logger"]
+gecko = []
+
 [lib]
 name = "glean_core"
 path = "src/lib.rs"
-bench = false
 
 [[example]]
 name = "rkv-open"
@@ -76,6 +87,10 @@ path = "tests/custom_distribution.rs"
 name = "datetime"
 path = "tests/datetime.rs"
 
+[[test]]
+name = "docs"
+path = "tests/docs.rs"
+
 [[test]]
 name = "dual_labeled_counter"
 path = "tests/dual_labeled_counter.rs"
@@ -140,11 +155,6 @@ path = "tests/timing_distribution.rs"
 name = "uuid"
 path = "tests/uuid.rs"
 
-[[bench]]
-name = "dispatcher"
-path = "benches/dispatcher.rs"
-harness = false
-
 [dependencies.bincode]
 version = "1.2.1"
 
@@ -194,7 +204,7 @@ version = "1.0.44"
 version = "2"
 
 [dependencies.uniffi]
-version = "0.29.3"
+version = "0.31.0"
 default-features = false
 
 [dependencies.uuid]
@@ -215,22 +225,24 @@ version = "0.10.0"
 features = ["humantime"]
 default-features = false
 
-[dev-dependencies.iso8601]
-version = "0.4"
+[dev-dependencies.pulldown-cmark]
+version = "0.13.0"
+default-features = false
+
+[dev-dependencies.pulldown-cmark-to-cmark]
+version = "22.0.0"
 
 [dev-dependencies.tempfile]
 version = "3.8.0"
 
+[dev-dependencies.xshell]
+version = "0.2.7"
+
 [build-dependencies.uniffi]
-version = "0.29.3"
+version = "0.31.0"
 features = ["build"]
 default-features = false
 
-[features]
-benchmark = []
-enable_env_logger = ["env_logger"]
-gecko = []
-
 [target.'cfg(target_os = "android")'.dependencies.android_logger]
 version = "0.12.0"
 default-features = false
@@ -239,10 +251,3 @@ default-features = false
 version = "0.1.0"
 features = ["logger"]
 default-features = false
-
-[badges.circle-ci]
-branch = "main"
-repository = "mozilla/glean"
-
-[badges.maintenance]
-status = "actively-developed"
diff --git a/third_party/rust/glean-core/Cargo.toml.orig b/third_party/rust/glean-core/Cargo.toml.orig
index bfd162a7263ce..afdafb2bc1de7 100644
--- a/third_party/rust/glean-core/Cargo.toml.orig
+++ b/third_party/rust/glean-core/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "glean-core"
-version = "66.3.0"
+version = "67.0.0"
 authors = ["Jan-Erik Rediger <jrediger@mozilla.com>", "The Glean Team <glean-team@mozilla.com>"]
 description = "A modern Telemetry library"
 repository = "https://github.com/mozilla/glean"
@@ -13,13 +13,12 @@ include = [
   "/LICENSE",
   "/src",
   "/examples",
-  "/benches",
   "/tests",
   "/Cargo.toml",
   "/uniffi.toml",
   "/build.rs",
 ]
-rust-version = "1.82"
+rust-version = "1.87"
 
 [package.metadata.glean]
 glean-parser = "18.2.0"
@@ -41,7 +40,7 @@ flate2 = "1.0.19"
 zeitstempel = "0.2.0"
 crossbeam-channel = "0.5"
 thiserror = "2"
-uniffi = { version = "0.29.3", default-features = false }
+uniffi = { version = "0.31.0", default-features = false }
 env_logger = { version = "0.10.0", default-features = false, optional = true }
 malloc_size_of_derive = "0.1.3"
 malloc_size_of = { version = "0.2.2", package = "wr_malloc_size_of", default-features = false, features = ["once_cell"] }
@@ -55,12 +54,14 @@ oslog = { version = "0.1.0", default-features = false, features = ["logger"] }
 [dev-dependencies]
 env_logger = { version = "0.10.0", default-features = false, features = ["humantime"] }
 tempfile = "3.8.0"
-iso8601 = "0.4"
 ctor = "0.2.2"
 criterion = "0.7.0"
+pulldown-cmark = { version = "0.13.0", default-features = false }
+pulldown-cmark-to-cmark = "22.0.0"
+xshell = "0.2.7"
 
 [build-dependencies]
-uniffi = { version = "0.29.3", default-features = false, features = ["build"] }
+uniffi = { version = "0.31.0", default-features = false, features = ["build"] }
 
 [features]
 # Enable `env_logger`. Only works on non-Android non-iOS targets.
@@ -69,10 +70,3 @@ enable_env_logger = ["env_logger"]
 gecko = []
 # Expose some internals for easier benchmarking
 benchmark = []
-
-[lib]
-bench = false
-
-[[bench]]
-name = "dispatcher"
-harness = false
diff --git a/third_party/rust/glean-core/benches/dispatcher.rs b/third_party/rust/glean-core/benches/dispatcher.rs
deleted file mode 100644
index f881c2807bcd6..0000000000000
--- a/third_party/rust/glean-core/benches/dispatcher.rs
+++ /dev/null
@@ -1,111 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-//! Micro-benchmark to measure the time it takes to launch tasks on the dispatcher.
-//! Explicitly does not measure the time it takes to _run_ these.
-
-use std::hint::black_box;
-
-use criterion::{criterion_group, criterion_main, Criterion};
-use glean_core::{
-    dispatcher, glean_initialize, glean_shutdown, join_init, ClientInfoMetrics, CommonMetricData,
-    CounterMetric, Lifetime, OnGleanEvents,
-};
-
-pub fn dispatcher_benchmark(c: &mut Criterion) {
-    // Ensure dispatcher has been created and is usable.
-    dispatcher::flush_init().unwrap();
-
-    // An empty function has size 0. Putting that on the queue should be quick.
-    c.bench_function("empty fn", |b| {
-        b.iter(|| {
-            dispatcher::launch(|| {
-                // intentionally left empty
-            });
-        })
-    });
-
-    // Drain the dispatcher.
-    dispatcher::block_on_queue();
-
-    // Moving data into the function means we need to copy that data on to the queue too.
-    c.bench_function("fn 1024", |b| {
-        b.iter(|| {
-            let c = [0; 1024];
-            dispatcher::launch(move || {
-                black_box(c);
-            });
-        })
-    });
-
-    // Ensure we can run more tests afterwards.
-    dispatcher::reset_dispatcher();
-}
-
-struct Callbacks;
-
-impl OnGleanEvents for Callbacks {
-    fn initialize_finished(&self) {}
-
-    fn trigger_upload(&self) -> glean_core::Result<(), glean_core::CallbackError> {
-        Ok(())
-    }
-
-    fn start_metrics_ping_scheduler(&self) -> bool {
-        false
-    }
-
-    fn cancel_uploads(&self) -> glean_core::Result<(), glean_core::CallbackError> {
-        Ok(())
-    }
-}
-
-pub fn metric_dispatcher_benchmark(c: &mut Criterion) {
-    let dir = tempfile::tempdir().unwrap();
-    let data_path = dir.path().display().to_string();
-
-    let cfg = glean_core::InternalConfiguration {
-        upload_enabled: true,
-        data_path,
-        application_id: String::from("glean-bench"),
-        language_binding_name: String::from("rust"),
-        max_events: None,
-        delay_ping_lifetime_io: false,
-        app_build: String::from("1"),
-        use_core_mps: true,
-        trim_data_to_registered_pings: true,
-        log_level: None,
-        rate_limit: None,
-        enable_event_timestamps: true,
-        experimentation_id: None,
-        enable_internal_pings: false,
-        ping_schedule: Default::default(),
-        ping_lifetime_threshold: 0,
-        ping_lifetime_max_time: 0,
-    };
-    let client_info = ClientInfoMetrics::unknown();
-
-    glean_initialize(cfg, client_info, Box::new(Callbacks));
-    join_init();
-
-    c.bench_function("counter.add", |b| {
-        let metric = CounterMetric::new(CommonMetricData {
-            name: "counter".into(),
-            category: "telemetry".into(),
-            send_in_pings: vec!["baseline".into()],
-            disabled: false,
-            lifetime: Lifetime::Ping,
-            ..Default::default()
-        });
-
-        b.iter(|| {
-            metric.add(1);
-        })
-    });
-
-    glean_shutdown();
-}
-
-criterion_group!(benches, dispatcher_benchmark, metric_dispatcher_benchmark);
-criterion_main!(benches);
diff --git a/third_party/rust/glean-core/src/event_database/mod.rs b/third_party/rust/glean-core/src/event_database/mod.rs
index 108bc3d465073..413855e3cf029 100644
--- a/third_party/rust/glean-core/src/event_database/mod.rs
+++ b/third_party/rust/glean-core/src/event_database/mod.rs
@@ -560,6 +560,22 @@ impl EventDatabase {
                 // Let's fix cur_ec up and hope this isn't a sign something big is broken.
                 cur_ec = execution_counter;
             }
+
+            // event timestamp is a `u64`, but BigQuery uses `i64` (signed!) everywhere. Let's clamp the value to make
+            // sure we stay within bounds.
+            if event.event.timestamp > i64::MAX as u64 {
+                glean
+                    .additional_metrics
+                    .event_timestamp_clamped
+                    .add_sync(glean, 1);
+                log::warn!(
+                    "Calculated event timestamp was too high. Got: {}, max: {}",
+                    event.event.timestamp,
+                    i64::MAX,
+                );
+                event.event.timestamp = event.event.timestamp.clamp(0, i64::MAX as u64);
+            }
+
             if highest_ts > event.event.timestamp {
                 // Even though we sorted everything, something in the
                 // execution_counter or glean.startup.date math went awry.
@@ -1357,4 +1373,50 @@ mod test {
         )
         .is_err());
     }
+
+    #[test]
+    fn normalize_store_clamps_timestamp() {
+        let (glean, _dir) = new_glean(None);
+
+        let store_name = "store-name";
+        let event = RecordedEvent {
+            category: "category".into(),
+            name: "name".into(),
+            ..Default::default()
+        };
+
+        let timestamps = [
+            0,
+            (i64::MAX / 2) as u64,
+            i64::MAX as _,
+            (i64::MAX as u64) + 1,
+        ];
+        let mut store = timestamps
+            .into_iter()
+            .map(|timestamp| StoredEvent {
+                event: RecordedEvent {
+                    timestamp,
+                    ..event.clone()
+                },
+                execution_counter: None,
+            })
+            .collect();
+
+        let glean_start_time = glean.start_time();
+        glean
+            .event_storage()
+            .normalize_store(&glean, store_name, &mut store, glean_start_time);
+        assert_eq!(4, store.len());
+
+        assert_eq!(0, store[0].event.timestamp);
+        assert_eq!((i64::MAX / 2) as u64, store[1].event.timestamp);
+        assert_eq!((i64::MAX as u64), store[2].event.timestamp);
+        assert_eq!((i64::MAX as u64), store[3].event.timestamp);
+
+        let error_count = glean
+            .additional_metrics
+            .event_timestamp_clamped
+            .get_value(&glean, "health");
+        assert_eq!(Some(1), error_count);
+    }
 }
diff --git a/third_party/rust/glean-core/src/internal_metrics.rs b/third_party/rust/glean-core/src/internal_metrics.rs
index b0e405f64bfb0..a0a3ddb791da0 100644
--- a/third_party/rust/glean-core/src/internal_metrics.rs
+++ b/third_party/rust/glean-core/src/internal_metrics.rs
@@ -40,6 +40,10 @@ pub struct AdditionalMetrics {
     /// An experimentation identifier derived and provided by the application
     /// for the purpose of experimentation enrollment.
     pub experimentation_id: StringMetric,
+
+    /// The number of times we had to clamp an event timestamp
+    /// for exceeding the range of a signed 64-bit integer (9223372036854775807).
+    pub event_timestamp_clamped: CounterMetric,
 }
 
 impl CoreMetrics {
@@ -198,6 +202,15 @@ impl AdditionalMetrics {
                 disabled: false,
                 dynamic_label: None,
             }),
+
+            event_timestamp_clamped: CounterMetric::new(CommonMetricData {
+                name: "event_timestamp_clamped".into(),
+                category: "glean.error".into(),
+                send_in_pings: vec!["health".into()],
+                lifetime: Lifetime::Ping,
+                disabled: false,
+                dynamic_label: None,
+            }),
         }
     }
 }
@@ -241,7 +254,7 @@ impl UploadMetrics {
 
             discarded_exceeding_pings_size: MemoryDistributionMetric::new(
                 CommonMetricData {
-                    name: "discarded_exceeding_ping_size".into(),
+                    name: "discarded_exceeding_pings_size".into(),
                     category: "glean.upload".into(),
                     send_in_pings: vec!["metrics".into(), "health".into()],
                     lifetime: Lifetime::Ping,
@@ -354,7 +367,7 @@ impl DatabaseMetrics {
 
             rkv_load_error: StringMetric::new(CommonMetricData {
                 name: "rkv_load_error".into(),
-                category: "glean.error".into(),
+                category: "glean.database".into(),
                 send_in_pings: vec!["metrics".into(), "health".into()],
                 lifetime: Lifetime::Ping,
                 disabled: false,
diff --git a/third_party/rust/glean-core/tests/common/mod.rs b/third_party/rust/glean-core/tests/common/mod.rs
index 0c1337b268ad7..17b8f64537993 100644
--- a/third_party/rust/glean-core/tests/common/mod.rs
+++ b/third_party/rust/glean-core/tests/common/mod.rs
@@ -5,15 +5,12 @@
 // #[allow(dead_code)] is required on this module as a workaround for
 // https://github.com/rust-lang/rust/issues/46379
 #![allow(dead_code)]
-use chrono::Timelike;
 use glean_core::{Glean, PingType, Result};
 
 use std::fs::{read_dir, File};
 use std::io::{BufRead, BufReader};
 use std::path::Path;
 
-use chrono::offset::TimeZone;
-use iso8601::Date::YMD;
 use serde_json::Value as JsonValue;
 
 use ctor::ctor;
@@ -170,26 +167,6 @@ impl PingBuilder {
     }
 }
 
-/// Converts an iso8601::DateTime to a chrono::DateTime<FixedOffset>
-pub fn iso8601_to_chrono(datetime: &iso8601::DateTime) -> chrono::DateTime<chrono::FixedOffset> {
-    if let YMD { year, month, day } = datetime.date {
-        return chrono::FixedOffset::east_opt(datetime.time.tz_offset_hours * 3600)
-            .unwrap()
-            .with_ymd_and_hms(
-                year,
-                month,
-                day,
-                datetime.time.hour,
-                datetime.time.minute,
-                datetime.time.second,
-            )
-            .unwrap()
-            .with_nanosecond(datetime.time.millisecond * 1_000_000)
-            .unwrap();
-    };
-    panic!("Unsupported datetime format");
-}
-
 /// Gets a vector of the currently queued pings.
 ///
 /// # Arguments
diff --git a/third_party/rust/glean-core/tests/docs.rs b/third_party/rust/glean-core/tests/docs.rs
new file mode 100644
index 0000000000000..7ea83eb628722
--- /dev/null
+++ b/third_party/rust/glean-core/tests/docs.rs
@@ -0,0 +1,111 @@
+use std::collections::HashMap;
+use std::fs;
+use std::fs::File;
+use std::io::Write;
+
+use pulldown_cmark::Event::{End, Start, Text};
+use pulldown_cmark::Tag::List;
+use pulldown_cmark::TagEnd;
+use pulldown_cmark_to_cmark::cmark;
+use xshell::{cmd, Shell};
+
+#[test]
+fn reference_metrics_toc_is_sorted() {
+    // Relative to `glean-core`
+    let index_file = "../docs/user/reference/metrics/index.md";
+    let src = fs::read_to_string(index_file).expect("unable to read file");
+    let parser = pulldown_cmark::Parser::new(&src);
+    let mut events = parser.into_offset_iter();
+
+    let mut modified_events = Vec::new();
+
+    let mut output = File::create(index_file).unwrap();
+
+    // Everything before the list
+    let mut list_start = 0;
+    for (event, span) in events.by_ref() {
+        if let Start(List(..)) = event {
+            modified_events.push(event);
+            list_start = span.start;
+            break;
+        }
+    }
+
+    // Output everything up to the list start unmodified.
+    if list_start > 0 {
+        writeln!(&mut output, "{}", &src[0..(list_start - 1)]).unwrap();
+    }
+
+    let mut items = HashMap::new();
+
+    // The list itself.
+    // We store a `title -> events` mapping to sort it later by `title`.
+    let mut list_end = 0;
+    while let Some((event, span)) = events.next() {
+        if let End(TagEnd::List(..)) = event {
+            list_end = span.end;
+            break;
+        }
+
+        let mut elems = Vec::new();
+        elems.push(event);
+
+        let mut title: Option<String> = None;
+        for (event, _) in events.by_ref() {
+            match event {
+                End(TagEnd::Item) => {
+                    elems.push(End(TagEnd::Item));
+                    break;
+                }
+                Text(s) if title.is_none() => {
+                    title = Some(s.to_string());
+                    elems.push(Text(s));
+                }
+                e => elems.push(e),
+            }
+        }
+        items.insert(title.unwrap(), elems);
+    }
+
+    let mut item_keys: Vec<_> = items.keys().cloned().collect();
+    item_keys.sort_by_key(|item| {
+        // We need to handle a few special cases:
+        //
+        // * Dual-labeled and labeled metrics should be sorted right after their top-level metric type
+        // * Normalizing plurals to be sorted correctly after the singular (quantity -> quantities)
+
+        let mut k = item.to_ascii_lowercase();
+        k = k.strip_prefix("dual-labeled ").unwrap_or(&k).to_string();
+        k = k.strip_prefix("labeled ").unwrap_or(&k).to_string();
+
+        match &*k {
+            _ if item == "Dual-labeled counters" => String::from("counter3"),
+            "counters" => String::from("counter2"),
+            "quantities" => String::from("quantity2"),
+            "strings" => String::from("string2"),
+            "string list" => String::from("string3"),
+            _ => k,
+        }
+    });
+
+    for key in item_keys {
+        let elems = items.remove(&key).unwrap();
+        modified_events.extend(elems);
+    }
+    modified_events.push(End(TagEnd::List(false)));
+
+    let mut output_markdown = String::new();
+    cmark(modified_events.into_iter(), &mut output_markdown).unwrap();
+    writeln!(&mut output, "{output_markdown}\n").unwrap();
+
+    // The remaining document can be printed unmodified.
+    if list_end > 0 {
+        write!(&mut output, "{}", &src[list_end..]).unwrap();
+    }
+
+    // Last but not least check if we modified the document.
+    let sh = Shell::new().unwrap();
+    cmd!(sh, "git --no-pager diff --exit-code {index_file}")
+        .run()
+        .unwrap();
+}
diff --git a/third_party/rust/glean-core/tests/ping_maker.rs b/third_party/rust/glean-core/tests/ping_maker.rs
index 67ba6902ceb91..d0bd3b4805c7d 100644
--- a/third_party/rust/glean-core/tests/ping_maker.rs
+++ b/third_party/rust/glean-core/tests/ping_maker.rs
@@ -41,10 +41,10 @@ fn ping_info_must_contain_a_nonempty_start_and_end_time() {
     let ping_info = ping.content["ping_info"].as_object().unwrap();
 
     let start_time_str = ping_info["start_time"].as_str().unwrap();
-    let start_time_date = iso8601_to_chrono(&iso8601::datetime(start_time_str).unwrap());
+    let start_time_date = chrono::DateTime::parse_from_rfc3339(start_time_str).unwrap();
 
     let end_time_str = ping_info["end_time"].as_str().unwrap();
-    let end_time_date = iso8601_to_chrono(&iso8601::datetime(end_time_str).unwrap());
+    let end_time_date = chrono::DateTime::parse_from_rfc3339(end_time_str).unwrap();
 
     assert!(start_time_date <= end_time_date);
 }
diff --git a/third_party/rust/glean/.cargo-checksum.json b/third_party/rust/glean/.cargo-checksum.json
index 6dc372436d0be..ea428aa43245a 100644
--- a/third_party/rust/glean/.cargo-checksum.json
+++ b/third_party/rust/glean/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"d2d8830453bc12f765ad49ba50201b1707b5da87b646d6d9affaf7c873ccaf42","Cargo.lock":"81a1d2f485f6e073e7d06b0e05f558796ef8ec1c8e4e4f07dee1d4d0964b6be2","Cargo.toml":"4a050a0e5e18fb2fd0ebcbc29a3a438b915b222b7f9757f0f56e4e3eaa179da1","Cargo.toml.orig":"951089e0f0bc7a80d77d18073e8cbf574ebfeae7a112ab6cd7f0070c0d9af725","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"5627cc81e6187ab6c2b4dff061af16d559edcab64ba786bac39daa69c703c595","src/common_test.rs":"c86cccfb7da1506cfed29cb2ee13d839b7ac7cffdfd70793c9665bb44e0b684f","src/configuration.rs":"de65ab99a26b4547be20803bc195cb50a6ab40b1a3f49a2e6230fed5a9d7a8d8","src/core_metrics.rs":"fef8fb4e5fa57c179836c6eb2cf59278fe3b8b036dbe57b0ff02971b4acd822f","src/lib.rs":"73179ef356374879fd8ffbe9268f74a81a06de8fa3ba73dfe158b43be2fab249","src/net/http_uploader.rs":"0a94ac3cd87cb021529dee46d537765ab8d923e0f4ac7615225e878d3739e6dc","src/net/mod.rs":"9999cfcee8b3bf282ff753acb661893ae4c306c2cafd76029d630211b034e71e","src/private/event.rs":"e6c76b384771b6ca5e0bc77f0e563ff768798be0985b1b7858e5921af497d197","src/private/mod.rs":"de67f272a20b9b5ead58a40073a82ba54f9dd1b7d0d14c7b916fc714c961ead4","src/private/object.rs":"4dde92c7700d68fb7113ae57ef84c0ec14f5c786a2f0758ae700f458891613be","src/private/ping.rs":"8ec514e88c1fcba13560522c83e39643edf7d74a3dc733e273984c46c781b2d2","src/system.rs":"d602804a72258bfd65e51c571946631732ee27d81342d8aa406e47fdd241bbfa","src/test.rs":"ffc54a3cab5950148cee0750b11de883f1346bce1d9b7755143e3d5ba78f7533","tests/collection_enabled.rs":"3327a949dbdeec493d661261abda68ffa71acc50ab24cba4fde5302749e6f16b","tests/collection_enabled_bin.rs":"d3a6458b84012a447e5cb792f2292a06951ed252fad803b9166b437bacba542c","tests/common/mod.rs":"2fd391c5eb45f56fdfa3261dd631406c67ed36b10b0d5432febe2483da5c9d89","tests/custom_distribution_buffered.rs":"aa70bc2e2aca14c5c8a30dafd246d2657769fa7cdf4d09a6f10a03a356c696f6","tests/dual_labeled_counter_metric.rs":"91e9e206a4f331e067f55e5cde7eb0b893e41ea08eb125371e7b03fe44cb1445","tests/health_ping.rs":"88690ffc4946e41c1b518cfeff2768a6c0dc702672f79d44ad6ade64042c76ae","tests/health_ping_file_overwrite.rs":"ae95d1dab9339af0483599e8d4c3e3ce4d0caec28ff7097909803c770079e0aa","tests/init_fails.rs":"ca7fa1b3dd6a21a9e005b7a4f0a18664c4bceb952dd463db8316500f72280d5b","tests/interruptible_shutdown.rs":"60f057bd495843a6d97cc9f875be1aa944b43c5f9a034c58d648b2d629195989","tests/labeled_metrics.rs":"d9b14025054a0ee9b89b60e720435828257eda7ec61f349389ab387923d3954c","tests/memory_distribution_buffered.rs":"e809a8de47ea4ac10c1181651d48b11aa11f57704d95f10ae194762e5d3d2982","tests/metric_metadata.rs":"e0188fcf8dc8f754f905a0662932d341646429589795bf10407645c0b3034ad2","tests/near-empty-c0ffee-db.safe.bin":"89afb3bb8fc94430fb0ed0fe55f85f3f8bcc8fd0fed69a9df13cc560294ec9f5","tests/never_init.rs":"51fff5618f6603bc0945d70131698d10a1c6275f43bbc22a2de5807f8a79229f","tests/no_time_to_init.rs":"2ede23df6618ff1cb5ae3b7bbf95900ad0fd92072afa2e0319bf147b4f75cefc","tests/overflowing_preinit.rs":"dc4d5eccb84c3c9ca25221bdc4a9bbf50ebc36d6d83d27f36d93f4562fb75d5d","tests/persist_ping_lifetime_nopanic.rs":"18379d3ffbf4a2c8c684c04ff7a0660b86dfbbb447db2d24dfed6073cb7ddf8f","tests/schema.rs":"23b49005402b914e55a0c5c155f30c2662c609f79be78d1385ec25b3600b3547","tests/signaling_done.rs":"a0c956aaf18e96912896df624e14a652c4276fc09da75d2e29a5f8c8ae99226e","tests/simple.rs":"79d78a4cdc439c92b4efbbb2aa181ec1fd232c7a6264ad7832ab2a574ea74939","tests/test-delayed-ping-data.sh":"b6a86e07e47c301529e3bcca5265eba091c6626e38a495ad05f94f1654e6450e","tests/test-enabled-pings.sh":"f094f5735c1bb66da854de0eae84098527fff9b59854888da6f2865308847383","tests/test-mps-delay.sh":"207661a72bf8c05a8b44ad40f208826338069e2f7f4dc3f589aabc35606732e8","tests/test-pending-gets-removed.sh":"7099aaf770cfae070ee4427557cb33981734e18fe145890917d5e8ca324ea011","tests/test-ping-lifetime-flush.sh":"ed7dfc57ce71677e6b310286aed563ab4baa69aad9554cbd045fe5e49903b63a","tests/test-shutdown-blocking.sh":"d35beb9bda6881bc70b5681239d5b422cd21a295b15288b89685b61c753f46bb","tests/test-thread-crashing.sh":"9573952e17206eeb6312b7318aa72dc8412ea2dda4f5aefdcc4ffd5cfbe47772","tests/timing_distribution_buffered.rs":"b96cd123ff830175597d32667477eac9102e05aea6726382c83b35b6bc66176c","tests/timing_distribution_single_sample.rs":"bca54132d5fec225788f0292e8b6c11fa658405dc0586a2bbd84b86c1558f4bd","tests/upload_timing.rs":"e7271e7a71fc5df98c9695a01f89039f4011849c709c8dc99af23bb7e047f3e1","tests/uploader_capabilities.rs":"0c2d70ed51fba444a94aef522e7cb9253c939551694babe0045b2358e3e85b34"},"package":"c2cff88cbb3ec5ecd45a8ba642772a5fb88cc61350b6960d72a7452de138d9e2"}
\ No newline at end of file
+{"files":{".cargo_vcs_info.json":"8dc8db651341888f8bfec1c702c85c863cf032e64557b7e3f17787d8b5327329","Cargo.lock":"90ca4c9bef80b21a6493150ac426169b8626d5a8a0a644b1524077e50d0f5774","Cargo.toml":"d15413be9eb683d2bad9ff95d7efd6e34579e5d9a5cb8b6848031562ddc2748e","Cargo.toml.orig":"f46518d045d8326782fcc701b8cc4dc70ac5b9106f9193525365b56938a4cab0","LICENSE":"1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5","README.md":"5627cc81e6187ab6c2b4dff061af16d559edcab64ba786bac39daa69c703c595","src/common_test.rs":"c86cccfb7da1506cfed29cb2ee13d839b7ac7cffdfd70793c9665bb44e0b684f","src/configuration.rs":"de65ab99a26b4547be20803bc195cb50a6ab40b1a3f49a2e6230fed5a9d7a8d8","src/core_metrics.rs":"fef8fb4e5fa57c179836c6eb2cf59278fe3b8b036dbe57b0ff02971b4acd822f","src/lib.rs":"73179ef356374879fd8ffbe9268f74a81a06de8fa3ba73dfe158b43be2fab249","src/net/http_uploader.rs":"0a94ac3cd87cb021529dee46d537765ab8d923e0f4ac7615225e878d3739e6dc","src/net/mod.rs":"9999cfcee8b3bf282ff753acb661893ae4c306c2cafd76029d630211b034e71e","src/private/event.rs":"e6c76b384771b6ca5e0bc77f0e563ff768798be0985b1b7858e5921af497d197","src/private/mod.rs":"de67f272a20b9b5ead58a40073a82ba54f9dd1b7d0d14c7b916fc714c961ead4","src/private/object.rs":"4dde92c7700d68fb7113ae57ef84c0ec14f5c786a2f0758ae700f458891613be","src/private/ping.rs":"8ec514e88c1fcba13560522c83e39643edf7d74a3dc733e273984c46c781b2d2","src/system.rs":"d602804a72258bfd65e51c571946631732ee27d81342d8aa406e47fdd241bbfa","src/test.rs":"ffc54a3cab5950148cee0750b11de883f1346bce1d9b7755143e3d5ba78f7533","tests/collection_enabled.rs":"3327a949dbdeec493d661261abda68ffa71acc50ab24cba4fde5302749e6f16b","tests/collection_enabled_bin.rs":"d3a6458b84012a447e5cb792f2292a06951ed252fad803b9166b437bacba542c","tests/common/mod.rs":"2fd391c5eb45f56fdfa3261dd631406c67ed36b10b0d5432febe2483da5c9d89","tests/custom_distribution_buffered.rs":"aa70bc2e2aca14c5c8a30dafd246d2657769fa7cdf4d09a6f10a03a356c696f6","tests/dual_labeled_counter_metric.rs":"91e9e206a4f331e067f55e5cde7eb0b893e41ea08eb125371e7b03fe44cb1445","tests/health_ping.rs":"88690ffc4946e41c1b518cfeff2768a6c0dc702672f79d44ad6ade64042c76ae","tests/health_ping_file_overwrite.rs":"ae95d1dab9339af0483599e8d4c3e3ce4d0caec28ff7097909803c770079e0aa","tests/init_fails.rs":"ca7fa1b3dd6a21a9e005b7a4f0a18664c4bceb952dd463db8316500f72280d5b","tests/interruptible_shutdown.rs":"60f057bd495843a6d97cc9f875be1aa944b43c5f9a034c58d648b2d629195989","tests/labeled_metrics.rs":"d9b14025054a0ee9b89b60e720435828257eda7ec61f349389ab387923d3954c","tests/memory_distribution_buffered.rs":"e809a8de47ea4ac10c1181651d48b11aa11f57704d95f10ae194762e5d3d2982","tests/metric_metadata.rs":"e0188fcf8dc8f754f905a0662932d341646429589795bf10407645c0b3034ad2","tests/near-empty-c0ffee-db.safe.bin":"89afb3bb8fc94430fb0ed0fe55f85f3f8bcc8fd0fed69a9df13cc560294ec9f5","tests/never_init.rs":"51fff5618f6603bc0945d70131698d10a1c6275f43bbc22a2de5807f8a79229f","tests/no_time_to_init.rs":"2ede23df6618ff1cb5ae3b7bbf95900ad0fd92072afa2e0319bf147b4f75cefc","tests/overflowing_preinit.rs":"dc4d5eccb84c3c9ca25221bdc4a9bbf50ebc36d6d83d27f36d93f4562fb75d5d","tests/persist_ping_lifetime_nopanic.rs":"18379d3ffbf4a2c8c684c04ff7a0660b86dfbbb447db2d24dfed6073cb7ddf8f","tests/schema.rs":"23b49005402b914e55a0c5c155f30c2662c609f79be78d1385ec25b3600b3547","tests/signaling_done.rs":"a0c956aaf18e96912896df624e14a652c4276fc09da75d2e29a5f8c8ae99226e","tests/simple.rs":"79d78a4cdc439c92b4efbbb2aa181ec1fd232c7a6264ad7832ab2a574ea74939","tests/test-delayed-ping-data.sh":"b6a86e07e47c301529e3bcca5265eba091c6626e38a495ad05f94f1654e6450e","tests/test-enabled-pings.sh":"f094f5735c1bb66da854de0eae84098527fff9b59854888da6f2865308847383","tests/test-mps-delay.sh":"207661a72bf8c05a8b44ad40f208826338069e2f7f4dc3f589aabc35606732e8","tests/test-pending-gets-removed.sh":"7099aaf770cfae070ee4427557cb33981734e18fe145890917d5e8ca324ea011","tests/test-ping-lifetime-flush.sh":"ed7dfc57ce71677e6b310286aed563ab4baa69aad9554cbd045fe5e49903b63a","tests/test-shutdown-blocking.sh":"d35beb9bda6881bc70b5681239d5b422cd21a295b15288b89685b61c753f46bb","tests/test-thread-crashing.sh":"9573952e17206eeb6312b7318aa72dc8412ea2dda4f5aefdcc4ffd5cfbe47772","tests/timing_distribution_buffered.rs":"b96cd123ff830175597d32667477eac9102e05aea6726382c83b35b6bc66176c","tests/timing_distribution_single_sample.rs":"bca54132d5fec225788f0292e8b6c11fa658405dc0586a2bbd84b86c1558f4bd","tests/upload_timing.rs":"e7271e7a71fc5df98c9695a01f89039f4011849c709c8dc99af23bb7e047f3e1","tests/uploader_capabilities.rs":"0c2d70ed51fba444a94aef522e7cb9253c939551694babe0045b2358e3e85b34"},"package":"8b43d851e3966fafee2933c2891e6b7f7f346866bab7835cb0410700336f424b"}
\ No newline at end of file
diff --git a/third_party/rust/glean/.cargo_vcs_info.json b/third_party/rust/glean/.cargo_vcs_info.json
index 7aeaf4d883a8e..e7cca059d4b75 100644
--- a/third_party/rust/glean/.cargo_vcs_info.json
+++ b/third_party/rust/glean/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "8345d1b4b7eb0530a21656d7001df4bb8ce73809"
+    "sha1": "a793015bad500379ec5480e280ac2631178a2013"
   },
   "path_in_vcs": "glean-core/rlb"
 }
\ No newline at end of file
diff --git a/third_party/rust/glean/Cargo.lock b/third_party/rust/glean/Cargo.lock
index b3e63790c9151..60027cea04853 100644
--- a/third_party/rust/glean/Cargo.lock
+++ b/third_party/rust/glean/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "adler2"
@@ -55,9 +55,9 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
 
 [[package]]
 name = "askama"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4744ed2eef2645831b441d8f5459689ade2ab27c854488fbab1fbe94fce1a7"
+checksum = "f75363874b771be265f4ffe307ca705ef6f3baa19011c149da8674a87f1b75c4"
 dependencies = [
  "askama_derive",
  "itoa",
@@ -68,9 +68,9 @@ dependencies = [
 
 [[package]]
 name = "askama_derive"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d661e0f57be36a5c14c48f78d09011e67e0cb618f269cca9f2fd8d15b68c46ac"
+checksum = "129397200fe83088e8a68407a8e2b1f826cf0086b21ccdb866a722c8bcd3a94f"
 dependencies = [
  "askama_parser",
  "basic-toml",
@@ -85,9 +85,9 @@ dependencies = [
 
 [[package]]
 name = "askama_parser"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf315ce6524c857bb129ff794935cf6d42c82a6cff60526fe2a63593de4d0d4f"
+checksum = "d6ab5630b3d5eaf232620167977f95eb51f3432fc76852328774afbd242d4358"
 dependencies = [
  "memchr",
  "serde",
@@ -312,7 +312,7 @@ dependencies = [
 
 [[package]]
 name = "glean"
-version = "66.3.0"
+version = "67.0.0"
 dependencies = [
  "crossbeam-channel",
  "env_logger",
@@ -331,9 +331,9 @@ dependencies = [
 
 [[package]]
 name = "glean-core"
-version = "66.3.0"
+version = "67.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b34409d1d4bc10da8ddcb584a0a1825d8ad6a5a268bf711320da95c615c30245"
+checksum = "b8146e9829a5fe15343fd3c42d8d41e478b02f68b8359346273cc56d7f7feff8"
 dependencies = [
  "android_logger",
  "bincode",
@@ -446,6 +446,7 @@ checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
  "hashbrown",
+ "serde",
 ]
 
 [[package]]
@@ -757,18 +758,28 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.217"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.217"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -787,11 +798,20 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776"
+dependencies = [
+ "serde_core",
+]
+
 [[package]]
 name = "siphasher"
-version = "0.3.11"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "smawk"
@@ -886,13 +906,43 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "toml"
-version = "0.5.11"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+checksum = "ae2a4cf385da23d1d53bc15cdfa5c2109e93d8d362393c801e87da2f72f0e201"
 dependencies = [
- "serde",
+ "indexmap",
+ "serde_core",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_parser",
+ "toml_writer",
+ "winnow",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.7.5+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10"
+dependencies = [
+ "winnow",
 ]
 
+[[package]]
+name = "toml_writer"
+version = "1.0.6+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607"
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.8"
@@ -916,9 +966,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6d968cb62160c11f2573e6be724ef8b1b18a277aededd17033f8a912d73e2b4"
+checksum = "b8c6dec3fc6645f71a16a3fa9ff57991028153bd194ca97f4b55e610c73ce66a"
 dependencies = [
  "anyhow",
  "uniffi_build",
@@ -929,9 +979,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_bindgen"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6b39ef1acbe1467d5d210f274fae344cb6f8766339330cb4c9688752899bf6b"
+checksum = "4ed0150801958d4825da56a41c71f000a457ac3a4613fa9647df78ac4b6b6881"
 dependencies = [
  "anyhow",
  "askama",
@@ -954,9 +1004,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_build"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6683e6b665423cddeacd89a3f97312cf400b2fb245a26f197adaf65c45d505b2"
+checksum = "b78fd9271a4c2e85bd2c266c5a9ede1fac676eb39fd77f636c27eaf67426fd5f"
 dependencies = [
  "anyhow",
  "camino",
@@ -965,9 +1015,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_core"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2d990b553d6b9a7ee9c3ae71134674739913d52350b56152b0e613595bb5a6f"
+checksum = "b0ef62e69762fbb9386dcb6c87cd3dd05d525fa8a3a579a290892e60ddbda47e"
 dependencies = [
  "anyhow",
  "bytes",
@@ -977,9 +1027,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_internal_macros"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04f4f224becf14885c10e6e400b95cc4d1985738140cb194ccc2044563f8a56b"
+checksum = "98f51ebca0d9a4b2aa6c644d5ede45c56f73906b96403c08a1985e75ccb64a01"
 dependencies = [
  "anyhow",
  "indexmap",
@@ -990,9 +1040,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_macros"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b481d385af334871d70904e6a5f129be7cd38c18fcf8dd8fd1f646b426a56d58"
+checksum = "db9d12529f1223d014fd501e5f29ca0884d15d6ed5ddddd9f506e55350327dc3"
 dependencies = [
  "camino",
  "fs-err",
@@ -1007,9 +1057,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_meta"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f817868a3b171bb7bf259e882138d104deafde65684689b4694c846d322491"
+checksum = "9df6d413db2827c68588f8149d30d49b71d540d46539e435b23a7f7dbd4d4f86"
 dependencies = [
  "anyhow",
  "siphasher",
@@ -1019,9 +1069,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_pipeline"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b147e133ad7824e32426b90bc41fda584363563f2ba747f590eca1fd6fd14e6"
+checksum = "a806dddc8208f22efd7e95a5cdf88ed43d0f3271e8f63b47e757a8bbdb43b63a"
 dependencies = [
  "anyhow",
  "heck",
@@ -1032,9 +1082,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_udl"
-version = "0.29.4"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caed654fb73da5abbc7a7e9c741532284532ba4762d6fe5071372df22a41730a"
+checksum = "0d1a7339539bf6f6fa3e9b534dece13f778bda2d54b1a6d4e40b4d6090ac26e7"
 dependencies = [
  "anyhow",
  "textwrap",
diff --git a/third_party/rust/glean/Cargo.toml b/third_party/rust/glean/Cargo.toml
index fa2b95cd93c43..af7a06970b209 100644
--- a/third_party/rust/glean/Cargo.toml
+++ b/third_party/rust/glean/Cargo.toml
@@ -11,9 +11,9 @@
 
 [package]
 edition = "2021"
-rust-version = "1.82"
+rust-version = "1.87"
 name = "glean"
-version = "66.3.0"
+version = "67.0.0"
 authors = [
     "Jan-Erik Rediger <jrediger@mozilla.com>",
     "The Glean Team <glean-team@mozilla.com>",
@@ -26,6 +26,7 @@ include = [
     "/tests",
     "/Cargo.toml",
 ]
+autolib = false
 autobins = false
 autoexamples = false
 autotests = false
@@ -39,6 +40,16 @@ keywords = [
 license = "MPL-2.0"
 repository = "https://github.com/mozilla/glean"
 
+[badges.circle-ci]
+branch = "main"
+repository = "mozilla/glean"
+
+[badges.maintenance]
+status = "actively-developed"
+
+[features]
+gecko = ["glean-core/gecko"]
+
 [lib]
 name = "glean"
 path = "src/lib.rs"
@@ -135,7 +146,7 @@ path = "tests/uploader_capabilities.rs"
 version = "0.5"
 
 [dependencies.glean-core]
-version = "66.3.0"
+version = "67.0.0"
 
 [dependencies.inherent]
 version = "1"
@@ -174,13 +185,3 @@ version = "1.0.44"
 
 [dev-dependencies.tempfile]
 version = "3.1.0"
-
-[features]
-gecko = ["glean-core/gecko"]
-
-[badges.circle-ci]
-branch = "main"
-repository = "mozilla/glean"
-
-[badges.maintenance]
-status = "actively-developed"
diff --git a/third_party/rust/glean/Cargo.toml.orig b/third_party/rust/glean/Cargo.toml.orig
index 86712fd68c696..8d252315a3c52 100644
--- a/third_party/rust/glean/Cargo.toml.orig
+++ b/third_party/rust/glean/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "glean"
-version = "66.3.0"
+version = "67.0.0"
 authors = ["Jan-Erik Rediger <jrediger@mozilla.com>", "The Glean Team <glean-team@mozilla.com>"]
 description = "Glean SDK Rust language bindings"
 repository = "https://github.com/mozilla/glean"
@@ -15,7 +15,7 @@ include = [
   "/tests",
   "/Cargo.toml",
 ]
-rust-version = "1.82"
+rust-version = "1.87"
 
 [badges]
 circle-ci = { repository = "mozilla/glean", branch = "main" }
@@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
 
 [dependencies.glean-core]
 path = ".."
-version = "66.3.0"
+version = "67.0.0"
 
 [dependencies]
 crossbeam-channel = "0.5"
diff --git a/third_party/rust/init_rust_components/.cargo-checksum.json b/third_party/rust/init_rust_components/.cargo-checksum.json
index d42b54fd3c548..e5f89cf028286 100644
--- a/third_party/rust/init_rust_components/.cargo-checksum.json
+++ b/third_party/rust/init_rust_components/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"6d78f7622d841fb3a75edbf01d731f853e9ba4c20bf46bb2744e25ce632501b4","README.md":"4c4ba1a04d445dca0507eef3ff8cd79e0954474d2a75feadd98946187fd8374f","src/lib.rs":"421e93bbc63bdcc41131b2ef740be98d00c4151775ef164857671430666f7ebd","uniffi.toml":"2e98a909732dc83db0c0b41438b0935c1fd5f869cea327e3ef5501fae5fa5d01"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"cf60bdba9b0536032be9ac69aa9fa5c68f6ad50c99e78d3e00c8d034156276a6","README.md":"4c4ba1a04d445dca0507eef3ff8cd79e0954474d2a75feadd98946187fd8374f","src/lib.rs":"421e93bbc63bdcc41131b2ef740be98d00c4151775ef164857671430666f7ebd","uniffi.toml":"2e98a909732dc83db0c0b41438b0935c1fd5f869cea327e3ef5501fae5fa5d01"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/init_rust_components/Cargo.toml b/third_party/rust/init_rust_components/Cargo.toml
index 590a1911511fa..7a42e590ba2c4 100644
--- a/third_party/rust/init_rust_components/Cargo.toml
+++ b/third_party/rust/init_rust_components/Cargo.toml
@@ -40,7 +40,7 @@ path = "src/lib.rs"
 path = "../support/rc_crypto/nss"
 
 [dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 
 [dependencies.viaduct]
 path = "../viaduct"
diff --git a/third_party/rust/interrupt-support/.cargo-checksum.json b/third_party/rust/interrupt-support/.cargo-checksum.json
index 7e365118cf84f..ad2f0e10de28b 100644
--- a/third_party/rust/interrupt-support/.cargo-checksum.json
+++ b/third_party/rust/interrupt-support/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"49590b948115d3e5f78937b676087c1455e26ad8db30195f5839572c2836aa28","README.md":"7f1418b4a7c138ba20bcaea077fe6cf0d6ffbaf6df6b90c80efc52aa0d0e2e9f","build.rs":"49840f26c73c5db19cb4e7f02930e49d7a19648168b83f2313ac1a0303c103df","src/error.rs":"b83cbe8abd22a9d687508d236a2a77e28b3fc6c39673633e5820cc0e3fc86cba","src/interrupt_support.udl":"bac2d5a94b5ae5d1b819b2058b82c541e02b1f75ef157c1eb236bfb4f0c78a05","src/interruptee.rs":"c56f9ac610d0b24a128a907266432287558c4b73f6c24b82674ca7894181d18f","src/lib.rs":"cf44a84310913be5264e1c4a3e004a9f7a6cd82d01a109bb6ac4d6002b5dd560","src/shutdown.rs":"e4b7a89f1ef319646aee3282a0d60465c3dbf571c52a0295f3b1a8909f345818","src/sql.rs":"db9b93fb2fe813ae0af6313082f07fad0e381691290466a7ac67bec14024722d"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"e9650fddb0037b950dfd18a36ab6067d9c6ae1d69f5867920c36e9f73a288eb0","README.md":"7f1418b4a7c138ba20bcaea077fe6cf0d6ffbaf6df6b90c80efc52aa0d0e2e9f","build.rs":"49840f26c73c5db19cb4e7f02930e49d7a19648168b83f2313ac1a0303c103df","src/error.rs":"b83cbe8abd22a9d687508d236a2a77e28b3fc6c39673633e5820cc0e3fc86cba","src/interrupt_support.udl":"bac2d5a94b5ae5d1b819b2058b82c541e02b1f75ef157c1eb236bfb4f0c78a05","src/interruptee.rs":"c56f9ac610d0b24a128a907266432287558c4b73f6c24b82674ca7894181d18f","src/lib.rs":"cf44a84310913be5264e1c4a3e004a9f7a6cd82d01a109bb6ac4d6002b5dd560","src/shutdown.rs":"e4b7a89f1ef319646aee3282a0d60465c3dbf571c52a0295f3b1a8909f345818","src/sql.rs":"db9b93fb2fe813ae0af6313082f07fad0e381691290466a7ac67bec14024722d"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/interrupt-support/Cargo.toml b/third_party/rust/interrupt-support/Cargo.toml
index 0648898efac5c..768896b667e52 100644
--- a/third_party/rust/interrupt-support/Cargo.toml
+++ b/third_party/rust/interrupt-support/Cargo.toml
@@ -41,8 +41,8 @@ features = [
 ]
 
 [dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 
 [build-dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 features = ["build"]
diff --git a/third_party/rust/logins/.cargo-checksum.json b/third_party/rust/logins/.cargo-checksum.json
index 05fa03109f6e0..2a72bbf044194 100644
--- a/third_party/rust/logins/.cargo-checksum.json
+++ b/third_party/rust/logins/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"932aaba3c932b809da6c86cc2c808cbba983011b923545674e62dc3a164867eb","README.md":"2c25808f8371b5d9ceb58e51f71304a270d5b33dad5a280a6e95e06e606f4492","build.rs":"63ff52215682b7d516679e7aaeaaaf5d3ac98ebdf0c08361193c34c99506bfdf","metrics.yaml":"a875db3d9d759935f43131bd5c830307f8fe5d42df0e47768deb91e4568d0f6b","src/db.rs":"2bdc7ddc8ee6b342bdf9fb7d8f3dc105ff10fcd9383da368939b1adf99d12dc1","src/encryption.rs":"4208bdd76c5c216c9abd23b3c970f5ce811e047a75a5c720248944aa15f9e2f7","src/error.rs":"cf6fdbc0561989bdbc48944d3c6b1459cb36c11318236471c7a22ba17653a71b","src/lib.rs":"f9a56ad783794e23fa635ad38db62ccb8dfce5d9d44b0c58de3176c978291fe8","src/login.rs":"6685942f6047bd82bafc24af0c83411e5c12572921b6a5ac988426222a2d39ba","src/logins.udl":"92efe79861974a15e42a889e7ea2bc0d44f1089b78d23122f490fd2cf9020828","src/schema.rs":"804b1c23e4eb640e7b77f65d35204cec7dacf3c3d6a9c0928b06b7df9bf7ddc5","src/store.rs":"446b143b9cdd9fda5cec65fd7492a645713680bacff7ebcad2a9ed9eebe8075d","src/sync/engine.rs":"a3a78625f7ba79c8150f3321cbe3473312410e731b9ebfccf989a5f14d25eba1","src/sync/merge.rs":"6469f8bd582358c96bc35579ac228c95ad4bd64e84a29dda0cde0d87d2dcc5ed","src/sync/mod.rs":"00eb3bdd5fcac411fb314400a3d66aea874aa117db1003caf75ea43d385e372e","src/sync/payload.rs":"202f56cf0af9ffc3cc3d57c72ad61e4fa006bf5104386d9ef58a2611d539accb","src/sync/update_plan.rs":"c1d45f5972237785e274b1ecbd350cef7c1d7f530e66b9068d707eb1dfa1304e","src/util.rs":"1ced78e185164640e9859b0316f4798ccacd30bad9d6c549f9f650350a5f97b6","uniffi.toml":"1b1ea1a488fc051b9fe5a289e474462f7c676bcd02ca176713d885d280414bf6"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"b56d32e96d574fc21a484e35be91fd5bdf5ce15ab033d50f95216eebfd09fb36","README.md":"2c25808f8371b5d9ceb58e51f71304a270d5b33dad5a280a6e95e06e606f4492","build.rs":"63ff52215682b7d516679e7aaeaaaf5d3ac98ebdf0c08361193c34c99506bfdf","metrics.yaml":"a875db3d9d759935f43131bd5c830307f8fe5d42df0e47768deb91e4568d0f6b","src/db.rs":"3f023ab6dc16fa593af9cb6d973e8e8dd28918b65b9f4993f4db1edeca7e67e5","src/encryption.rs":"df48d5a5209743007817922eeef25278255ef6a2550d43782f7504ecff6a383f","src/error.rs":"ed3799d9ad49a7554613923313ff921b7fb71dbf7076b2b9198323d7eb2f4e68","src/lib.rs":"f9a56ad783794e23fa635ad38db62ccb8dfce5d9d44b0c58de3176c978291fe8","src/login.rs":"e427f19a5bb899a2f06eb613b3e249fd2febae84e46dba14bb1e59317ed420e6","src/logins.udl":"a6017f61fa3b28078b91bbef2fc71f28e33847468724cd4a4e59c67a2ef9e043","src/schema.rs":"384e10c123c6cc9fa5356a9718cc757eca157345047c5dc5c9df15dce8c19fe2","src/store.rs":"dcc09f3bdd162761b0c67b542ba448500be2b40a50f8ffb3dbbaa50c9b8795d5","src/sync/engine.rs":"ea96e598c3ab13b9c4d4373550580677713bc1066ab176e9e3f4666618929a1f","src/sync/merge.rs":"6fbfdd4239826098cf9c7cf6ee3d2d32251a03d92f013d7ba0be8cb459df1de4","src/sync/mod.rs":"00eb3bdd5fcac411fb314400a3d66aea874aa117db1003caf75ea43d385e372e","src/sync/payload.rs":"c116f627ffb5f9294e90988d879cc55e33a83984a090e36410e6cc40e25fbb95","src/sync/update_plan.rs":"2c0a3b926adee2fd68a6355332e7188277cd0f047342adbc83d6ce498cebe2b1","src/util.rs":"1ced78e185164640e9859b0316f4798ccacd30bad9d6c549f9f650350a5f97b6","uniffi.toml":"1b1ea1a488fc051b9fe5a289e474462f7c676bcd02ca176713d885d280414bf6"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/logins/Cargo.toml b/third_party/rust/logins/Cargo.toml
index a68754270b89e..b5e511f9a98d3 100644
--- a/third_party/rust/logins/Cargo.toml
+++ b/third_party/rust/logins/Cargo.toml
@@ -93,7 +93,7 @@ path = "../sync15"
 features = ["standalone-sync"]
 
 [dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 
 [dev-dependencies]
 tempfile = "3.2.0"
@@ -106,5 +106,5 @@ features = ["testing"]
 path = "../support/rc_crypto/nss"
 
 [build-dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 features = ["build"]
diff --git a/third_party/rust/logins/src/db.rs b/third_party/rust/logins/src/db.rs
index 8336bcdc45c6d..ba95dd774421e 100644
--- a/third_party/rust/logins/src/db.rs
+++ b/third_party/rust/logins/src/db.rs
@@ -306,6 +306,84 @@ impl LoginDb {
         Ok(())
     }
 
+    pub fn record_breach(&self, id: &str, timestamp: i64) -> Result<()> {
+        let tx = self.unchecked_transaction()?;
+        self.ensure_local_overlay_exists(id)?;
+        self.mark_mirror_overridden(id)?;
+        self.execute_cached(
+            "UPDATE loginsL
+             SET timeOfLastBreach = :now_millis
+             WHERE guid = :guid",
+            named_params! {
+                ":now_millis": timestamp,
+                ":guid": id,
+            },
+        )?;
+        tx.commit()?;
+        Ok(())
+    }
+
+    pub fn is_potentially_breached(&self, id: &str) -> Result<bool> {
+        let is_potentially_breached: bool = self.db.query_row(
+            "SELECT EXISTS(SELECT 1 FROM loginsL WHERE guid = :guid AND timeOfLastBreach IS NOT NULL AND timeOfLastBreach > timePasswordChanged)",
+            named_params! { ":guid": id },
+            |row| row.get(0),
+        )?;
+        Ok(is_potentially_breached)
+    }
+
+    pub fn reset_all_breaches(&self) -> Result<()> {
+        let tx = self.unchecked_transaction()?;
+        self.execute_cached(
+            "UPDATE loginsL
+             SET timeOfLastBreach = NULL
+             WHERE timeOfLastBreach IS NOT NULL",
+            [],
+        )?;
+        tx.commit()?;
+        Ok(())
+    }
+
+    pub fn is_breach_alert_dismissed(&self, id: &str) -> Result<bool> {
+        let is_breach_alert_dismissed: bool = self.db.query_row(
+            "SELECT EXISTS(SELECT 1 FROM loginsL WHERE guid = :guid AND timeOfLastBreach < timeLastBreachAlertDismissed)",
+            named_params! { ":guid": id },
+            |row| row.get(0),
+        )?;
+        Ok(is_breach_alert_dismissed)
+    }
+
+    /// Records that the user dismissed the breach alert for a login using the current time.
+    ///
+    /// For testing or when you need to specify a particular timestamp, use
+    /// [`record_breach_alert_dismissal_time`](Self::record_breach_alert_dismissal_time) instead.
+    pub fn record_breach_alert_dismissal(&self, id: &str) -> Result<()> {
+        let timestamp = util::system_time_ms_i64(SystemTime::now());
+        self.record_breach_alert_dismissal_time(id, timestamp)
+    }
+
+    /// Records that the user dismissed the breach alert for a login at a specific time.
+    ///
+    /// This is primarily useful for testing or when syncing dismissal times from other devices.
+    /// For normal usage, prefer [`record_breach_alert_dismissal`](Self::record_breach_alert_dismissal)
+    /// which automatically uses the current time.
+    pub fn record_breach_alert_dismissal_time(&self, id: &str, timestamp: i64) -> Result<()> {
+        let tx = self.unchecked_transaction()?;
+        self.ensure_local_overlay_exists(id)?;
+        self.mark_mirror_overridden(id)?;
+        self.execute_cached(
+            "UPDATE loginsL
+             SET timeLastBreachAlertDismissed = :now_millis
+             WHERE guid = :guid",
+            named_params! {
+                ":now_millis": timestamp,
+                ":guid": id,
+            },
+        )?;
+        tx.commit()?;
+        Ok(())
+    }
+
     // The single place we insert new rows or update existing local rows.
     // just the SQL - no validation or anything.
     fn insert_new_login(&self, login: &EncryptedLogin) -> Result<()> {
@@ -322,6 +400,8 @@ impl LoginDb {
                 timeCreated,
                 timeLastUsed,
                 timePasswordChanged,
+                timeOfLastBreach,
+                timeLastBreachAlertDismissed,
                 local_modified,
                 is_deleted,
                 sync_status
@@ -337,6 +417,8 @@ impl LoginDb {
                 :time_created,
                 :time_last_used,
                 :time_password_changed,
+                :time_of_last_breach,
+                :time_last_breach_alert_dismissed,
                 :local_modified,
                 0, -- is_deleted
                 {new} -- sync_status
@@ -356,6 +438,8 @@ impl LoginDb {
                 ":times_used": login.meta.times_used,
                 ":time_last_used": login.meta.time_last_used,
                 ":time_password_changed": login.meta.time_password_changed,
+                ":time_of_last_breach": login.fields.time_of_last_breach,
+                ":time_last_breach_alert_dismissed": login.fields.time_last_breach_alert_dismissed,
                 ":local_modified": login.meta.time_created,
                 ":sec_fields": login.sec_fields,
                 ":guid": login.guid(),
@@ -368,18 +452,18 @@ impl LoginDb {
         // assumes the "local overlay" exists, so the guid must too.
         let sql = format!(
             "UPDATE loginsL
-             SET local_modified      = :now_millis,
-                 timeLastUsed        = :time_last_used,
-                 timePasswordChanged = :time_password_changed,
-                 httpRealm           = :http_realm,
-                 formActionOrigin    = :form_action_origin,
-                 usernameField       = :username_field,
-                 passwordField       = :password_field,
-                 timesUsed           = :times_used,
-                 secFields           = :sec_fields,
-                 origin              = :origin,
+             SET local_modified                           = :now_millis,
+                 timeLastUsed                             = :time_last_used,
+                 timePasswordChanged                      = :time_password_changed,
+                 httpRealm                                = :http_realm,
+                 formActionOrigin                         = :form_action_origin,
+                 usernameField                            = :username_field,
+                 passwordField                            = :password_field,
+                 timesUsed                                = :times_used,
+                 secFields                                = :sec_fields,
+                 origin                                   = :origin,
                  -- leave New records as they are, otherwise update them to `changed`
-                 sync_status         = max(sync_status, {changed})
+                 sync_status                              = max(sync_status, {changed})
              WHERE guid = :guid",
             changed = SyncStatus::Changed as u8
         );
@@ -459,6 +543,8 @@ impl LoginDb {
                             http_realm: new_entry.http_realm,
                             username_field: new_entry.username_field,
                             password_field: new_entry.password_field,
+                            time_of_last_breach: None,
+                            time_last_breach_alert_dismissed: None,
                         },
                         sec_fields,
                     };
@@ -573,6 +659,8 @@ impl LoginDb {
                 http_realm: entry.http_realm,
                 username_field: entry.username_field,
                 password_field: entry.password_field,
+                time_of_last_breach: None,
+                time_last_breach_alert_dismissed: None,
             },
             sec_fields,
         };
@@ -1018,6 +1106,9 @@ pub mod test_utils {
                 timePasswordChanged,
                 timeCreated,
 
+                timeOfLastBreach,
+                timeLastBreachAlertDismissed,
+
                 guid
             ) VALUES (
                 :is_overridden,
@@ -1035,6 +1126,9 @@ pub mod test_utils {
                 :time_password_changed,
                 :time_created,
 
+                :time_of_last_breach,
+                :time_last_breach_alert_dismissed,
+
                 :guid
             )";
         let mut stmt = db.prepare_cached(sql)?;
@@ -1052,6 +1146,8 @@ pub mod test_utils {
             ":time_last_used": login.meta.time_last_used,
             ":time_password_changed": login.meta.time_password_changed,
             ":time_created": login.meta.time_created,
+            ":time_of_last_breach": login.fields.time_of_last_breach,
+            ":time_last_breach_alert_dismissed": login.fields.time_last_breach_alert_dismissed,
             ":guid": login.guid_str(),
         })?;
         Ok(())
@@ -1678,6 +1774,155 @@ mod tests {
         assert_eq!(login2.meta.times_used, login.meta.times_used + 1);
     }
 
+    #[test]
+    fn test_breach_alerts() {
+        ensure_initialized();
+        let db = LoginDb::open_in_memory();
+        let login = db
+            .add(
+                LoginEntry {
+                    origin: "https://www.example.com".into(),
+                    http_realm: Some("https://www.example.com".into()),
+                    username: "user1".into(),
+                    password: "password1".into(),
+                    ..Default::default()
+                },
+                &*TEST_ENCDEC,
+            )
+            .unwrap();
+        // initial state
+        assert!(login.fields.time_of_last_breach.is_none());
+        assert!(!db.is_potentially_breached(&login.meta.id).unwrap());
+        assert!(login.fields.time_last_breach_alert_dismissed.is_none());
+
+        // Wait and use a time that's definitely after password was changed
+        thread::sleep(time::Duration::from_millis(50));
+        let breach_time = util::system_time_ms_i64(SystemTime::now());
+        db.record_breach(&login.meta.id, breach_time).unwrap();
+        assert!(db.is_potentially_breached(&login.meta.id).unwrap());
+        let login1 = db.get_by_id(&login.meta.id).unwrap().unwrap();
+        assert!(login1.fields.time_of_last_breach.is_some());
+
+        // dismiss
+        db.record_breach_alert_dismissal(&login.meta.id).unwrap();
+        let login2 = db.get_by_id(&login.meta.id).unwrap().unwrap();
+        assert!(login2.fields.time_last_breach_alert_dismissed.is_some());
+
+        // reset
+        db.reset_all_breaches().unwrap();
+        assert!(!db.is_potentially_breached(&login.meta.id).unwrap());
+        let login3 = db.get_by_id(&login.meta.id).unwrap().unwrap();
+        assert!(login3.fields.time_of_last_breach.is_none());
+
+        // Wait and use a time that's definitely after password was changed
+        thread::sleep(time::Duration::from_millis(50));
+        let breach_time = util::system_time_ms_i64(SystemTime::now());
+        db.record_breach(&login.meta.id, breach_time).unwrap();
+        assert!(db.is_potentially_breached(&login.meta.id).unwrap());
+
+        // now change password
+        db.update(
+            &login.meta.id.clone(),
+            LoginEntry {
+                password: "changed-password".into(),
+                ..login.clone().decrypt(&*TEST_ENCDEC).unwrap().entry()
+            },
+            &*TEST_ENCDEC,
+        )
+        .unwrap();
+        // not breached anymore
+        assert!(!db.is_potentially_breached(&login.meta.id).unwrap());
+    }
+
+    #[test]
+    fn test_breach_alert_fields_not_overwritten_by_update() {
+        ensure_initialized();
+        let db = LoginDb::open_in_memory();
+        let login = db
+            .add(
+                LoginEntry {
+                    origin: "https://www.example.com".into(),
+                    http_realm: Some("https://www.example.com".into()),
+                    username: "user1".into(),
+                    password: "password1".into(),
+                    ..Default::default()
+                },
+                &*TEST_ENCDEC,
+            )
+            .unwrap();
+        assert!(!db.is_potentially_breached(&login.meta.id).unwrap());
+
+        // Wait and use a time that's definitely after password was changed
+        thread::sleep(time::Duration::from_millis(50));
+        let breach_time = util::system_time_ms_i64(SystemTime::now());
+        db.record_breach(&login.meta.id, breach_time).unwrap();
+        assert!(db.is_potentially_breached(&login.meta.id).unwrap());
+
+        // change some fields
+        db.update(
+            &login.meta.id.clone(),
+            LoginEntry {
+                username_field: "changed-username-field".into(),
+                ..login.clone().decrypt(&*TEST_ENCDEC).unwrap().entry()
+            },
+            &*TEST_ENCDEC,
+        )
+        .unwrap();
+
+        // breach still present
+        assert!(db.is_potentially_breached(&login.meta.id).unwrap());
+    }
+
+    #[test]
+    fn test_breach_alert_dismissal_with_specific_timestamp() {
+        ensure_initialized();
+        let db = LoginDb::open_in_memory();
+        let login = db
+            .add(
+                LoginEntry {
+                    origin: "https://www.example.com".into(),
+                    http_realm: Some("https://www.example.com".into()),
+                    username: "user1".into(),
+                    password: "password1".into(),
+                    ..Default::default()
+                },
+                &*TEST_ENCDEC,
+            )
+            .unwrap();
+
+        // Record a breach that happened after password was created
+        // Use a timestamp that's definitely after the login's timePasswordChanged
+        let breach_time = login.meta.time_password_changed + 1000;
+        db.record_breach(&login.meta.id, breach_time).unwrap();
+        assert!(db.is_potentially_breached(&login.meta.id).unwrap());
+
+        // Dismiss with a specific timestamp after the breach
+        let dismiss_time = breach_time + 500;
+        db.record_breach_alert_dismissal_time(&login.meta.id, dismiss_time)
+            .unwrap();
+
+        // Verify the exact timestamp was stored
+        let retrieved = db
+            .get_by_id(&login.meta.id)
+            .unwrap()
+            .unwrap()
+            .decrypt(&*TEST_ENCDEC)
+            .unwrap();
+        assert_eq!(
+            retrieved.time_last_breach_alert_dismissed,
+            Some(dismiss_time)
+        );
+
+        // Verify the breach alert is considered dismissed
+        assert!(db.is_breach_alert_dismissed(&login.meta.id).unwrap());
+
+        // Test that dismissing before the breach time means it's not dismissed
+        let earlier_dismiss_time = breach_time - 100;
+        db.record_breach_alert_dismissal_time(&login.meta.id, earlier_dismiss_time)
+            .unwrap();
+        assert!(!db.is_breach_alert_dismissed(&login.meta.id).unwrap());
+    }
+
     #[test]
     fn test_delete() {
         ensure_initialized();
diff --git a/third_party/rust/logins/src/encryption.rs b/third_party/rust/logins/src/encryption.rs
index f460cda3bc44c..d5426ba6073b0 100644
--- a/third_party/rust/logins/src/encryption.rs
+++ b/third_party/rust/logins/src/encryption.rs
@@ -72,6 +72,7 @@ use nss::pk11::sym_key::{
 /// Note that EncryptorDecryptor must not call any LoginStore methods. The login store can call out
 /// to the EncryptorDecryptor when it's internal mutex is held so calling back in to the LoginStore
 /// may deadlock.
+#[uniffi::trait_interface]
 pub trait EncryptorDecryptor: Send + Sync {
     fn encrypt(&self, cleartext: Vec<u8>) -> ApiResult<Vec<u8>>;
     fn decrypt(&self, ciphertext: Vec<u8>) -> ApiResult<Vec<u8>>;
@@ -152,6 +153,7 @@ impl EncryptorDecryptor for ManagedEncryptorDecryptor {
 
 /// Consumers can implement the KeyManager in combination with the ManagedEncryptorDecryptor to hand
 /// over the encryption key whenever encryption or decryption happens.
+#[uniffi::trait_interface]
 pub trait KeyManager: Send + Sync {
     fn get_key(&self) -> ApiResult<Vec<u8>>;
 }
diff --git a/third_party/rust/logins/src/error.rs b/third_party/rust/logins/src/error.rs
index 0837a4c76dbb6..a08c20225ad35 100644
--- a/third_party/rust/logins/src/error.rs
+++ b/third_party/rust/logins/src/error.rs
@@ -113,6 +113,9 @@ pub enum Error {
 
     #[error("Migration Error: {0}")]
     MigrationError(String),
+
+    #[error("IncompatibleVersion: {0}")]
+    IncompatibleVersion(i64),
 }
 
 /// Error::InvalidLogin subtypes
diff --git a/third_party/rust/logins/src/login.rs b/third_party/rust/logins/src/login.rs
index e3e150a722632..e486c0f0bfa7b 100644
--- a/third_party/rust/logins/src/login.rs
+++ b/third_party/rust/logins/src/login.rs
@@ -292,6 +292,8 @@ pub struct LoginFields {
     pub http_realm: Option<String>,
     pub username_field: String,
     pub password_field: String,
+    pub time_of_last_breach: Option<i64>,
+    pub time_last_breach_alert_dismissed: Option<i64>,
 }
 
 /// LoginEntry fields that are stored encrypted
@@ -355,6 +357,9 @@ pub struct LoginEntryWithMeta {
 }
 
 /// A bulk insert result entry, returned by `add_many` and `add_many_with_records`
+/// Please note that although the success case is much larger than the error case, this is
+/// negligible in real life, as we expect a very small success/error ratio.
+#[allow(clippy::large_enum_variant)]
 pub enum BulkResultEntry {
     Success { login: Login },
     Error { message: String },
@@ -465,6 +470,10 @@ pub struct Login {
     // secure fields
     pub username: String,
     pub password: String,
+
+    // breach alerts
+    pub time_of_last_breach: Option<i64>,
+    pub time_last_breach_alert_dismissed: Option<i64>,
 }
 
 impl Login {
@@ -484,6 +493,9 @@ impl Login {
 
             username: sec_fields.username,
             password: sec_fields.password,
+
+            time_of_last_breach: fields.time_last_breach_alert_dismissed,
+            time_last_breach_alert_dismissed: fields.time_last_breach_alert_dismissed,
         }
     }
 
@@ -525,6 +537,8 @@ impl Login {
                 http_realm: self.http_realm,
                 username_field: self.username_field,
                 password_field: self.password_field,
+                time_of_last_breach: self.time_last_breach_alert_dismissed,
+                time_last_breach_alert_dismissed: self.time_last_breach_alert_dismissed,
             },
             sec_fields,
         })
@@ -581,6 +595,10 @@ impl EncryptedLogin {
 
                 username_field: string_or_default(row, "usernameField")?,
                 password_field: string_or_default(row, "passwordField")?,
+
+                time_of_last_breach: row.get::<_, Option<i64>>("timeOfLastBreach")?,
+                time_last_breach_alert_dismissed: row
+                    .get::<_, Option<i64>>("timeLastBreachAlertDismissed")?,
             },
             sec_fields: row.get("secFields")?,
         };
diff --git a/third_party/rust/logins/src/logins.udl b/third_party/rust/logins/src/logins.udl
index 080489fb76ff5..5bae6d40d5779 100644
--- a/third_party/rust/logins/src/logins.udl
+++ b/third_party/rust/logins/src/logins.udl
@@ -22,7 +22,7 @@ namespace logins {
     /// Utility function to create a StaticKeyManager to be used for the time
     /// being until support lands for [trait implementation of an UniFFI
     /// interface](https://mozilla.github.io/uniffi-rs/next/proc_macro/index.html#structs-implementing-traits)
-    /// in UniFFI. 
+    /// in UniFFI.
     KeyManager create_static_key_manager(string key);
 
     /// Similar to create_static_key_manager above, create a
@@ -92,6 +92,15 @@ dictionary Login {
     // secure login fields
     string password;
     string username;
+
+    // breach alert fields
+    /// These fields can be synced from Desktop and are NOT included in LoginEntry,
+    /// so update() will not modify them. Use the dedicated API methods to manipulate:
+    /// record_breach(), reset_all_breaches(), is_potentially_breached(),
+    /// record_breach_alert_dismissal(), record_breach_alert_dismissal_time(),
+    /// and is_breach_alert_dismissed().
+    i64? time_of_last_breach;
+    i64? time_last_breach_alert_dismissed;
 };
 
 /// Metrics tracking deletion of logins that cannot be decrypted, see `delete_undecryptable_records_for_remote_replacement`
@@ -228,6 +237,31 @@ interface LoginStore {
     [Throws=LoginsApiError]
     void touch([ByRef] string id);
 
+    /// Determines whether a login’s password is potentially breached, based on the breach date and the time of the last password change.
+    [Throws=LoginsApiError]
+    boolean is_potentially_breached([ByRef] string id);
+
+    /// Stores a known breach date for a login.
+    /// In Firefox Desktop this is updated once per session from Remote Settings.
+    [Throws=LoginsApiError]
+    void record_breach([ByRef] string id, i64 timestamp);
+
+    /// Removes all recorded breaches for all logins (i.e. sets time_of_last_breach to null).
+    [Throws=LoginsApiError]
+    void reset_all_breaches();
+
+    /// Determines whether a breach alert has been dismissed, based on the breach date and the alert dismissal timestamp.
+    [Throws=LoginsApiError]
+    boolean is_breach_alert_dismissed([ByRef] string id);
+
+    /// Stores that the user dismissed the breach alert for a login.
+    [Throws=LoginsApiError]
+    void record_breach_alert_dismissal([ByRef] string id);
+
+    /// Stores the time at which the user dismissed the breach alert for a login.
+    [Throws=LoginsApiError]
+    void record_breach_alert_dismissal_time([ByRef] string id, i64 timestamp);
+
     [Throws=LoginsApiError]
     boolean is_empty();
 
diff --git a/third_party/rust/logins/src/schema.rs b/third_party/rust/logins/src/schema.rs
index 79376b01e0757..77b028a02c55e 100644
--- a/third_party/rust/logins/src/schema.rs
+++ b/third_party/rust/logins/src/schema.rs
@@ -95,7 +95,8 @@ use sql_support::ConnExt;
 
 /// Version 1: SQLCipher -> plaintext migration.
 /// Version 2: addition of `loginsM.enc_unknown_fields`.
-pub(super) const VERSION: i64 = 2;
+/// Version 3: addition of `timeOfLastBreach` and `timeLastBreachAlertDismissed`.
+pub(super) const VERSION: i64 = 3;
 
 /// Every column shared by both tables except for `id`
 ///
@@ -125,29 +126,34 @@ pub const COMMON_COLS: &str = "
     timeCreated,
     timeLastUsed,
     timePasswordChanged,
-    timesUsed
+    timesUsed,
+    timeOfLastBreach,
+    timeLastBreachAlertDismissed
 ";
 
 const COMMON_SQL: &str = "
-    id                  INTEGER PRIMARY KEY AUTOINCREMENT,
-    origin              TEXT NOT NULL,
+    id                                          INTEGER PRIMARY KEY AUTOINCREMENT,
+    origin                                      TEXT NOT NULL,
     -- Exactly one of httpRealm or formActionOrigin should be set
-    httpRealm           TEXT,
-    formActionOrigin    TEXT,
-    usernameField       TEXT,
-    passwordField       TEXT,
-    timesUsed           INTEGER NOT NULL DEFAULT 0,
-    timeCreated         INTEGER NOT NULL,
-    timeLastUsed        INTEGER,
-    timePasswordChanged INTEGER NOT NULL,
-    secFields           TEXT,
-    guid                TEXT NOT NULL UNIQUE
+    httpRealm                                   TEXT,
+    formActionOrigin                            TEXT,
+    usernameField                               TEXT,
+    passwordField                               TEXT,
+    timesUsed                                   INTEGER NOT NULL DEFAULT 0,
+    timeCreated                                 INTEGER NOT NULL,
+    timeLastUsed                                INTEGER,
+    timePasswordChanged                         INTEGER NOT NULL,
+    timeOfLastBreach    INTEGER,
+    timeLastBreachAlertDismissed                INTEGER,
+    secFields                                   TEXT,
+    guid                                        TEXT NOT NULL UNIQUE
 ";
 
 lazy_static! {
     static ref CREATE_LOCAL_TABLE_SQL: String = format!(
         "CREATE TABLE IF NOT EXISTS loginsL (
             {common_sql},
+
             -- Milliseconds, or NULL if never modified locally.
             local_modified INTEGER,
 
@@ -220,26 +226,41 @@ pub(crate) fn init(db: &Connection) -> Result<()> {
 #[allow(clippy::unnecessary_wraps)]
 fn upgrade(db: &Connection, from: i64) -> Result<()> {
     debug!("Upgrading schema from {} to {}", from, VERSION);
+
     if from == VERSION {
         return Ok(());
     }
-    assert_ne!(
-        from, 0,
-        "Upgrading from user_version = 0 should already be handled (in `init`)"
-    );
 
-    // Schema upgrades.
-    if from == 1 {
-        // Just one new nullable column makes this fairly easy
-        db.execute_batch("ALTER TABLE loginsM ADD enc_unknown_fields TEXT;")?;
+    for version in from..VERSION {
+        upgrade_from(db, version)?;
     }
-    // XXX - next migration, be sure to:
-    // from = 2;
-    // if from == 2 ...
+
     db.execute_batch(&SET_VERSION_SQL)?;
     Ok(())
 }
 
+fn upgrade_from(db: &Connection, from: i64) -> Result<()> {
+    debug!("- running schema upgrade {}", from);
+    // Schema upgrades.
+    match from {
+        0 => Err(Error::IncompatibleVersion(from)),
+
+        // Just one new nullable column makes this fairly easy
+        1 => Ok(db.execute_batch("ALTER TABLE loginsM ADD enc_unknown_fields TEXT;")?),
+
+        // again, easy migratable nullable columns
+        2 => Ok(db.execute_batch(
+            "ALTER TABLE loginsL ADD timeOfLastBreach INTEGER;
+        ALTER TABLE loginsM ADD timeOfLastBreach INTEGER;
+        ALTER TABLE loginsL ADD timeLastBreachAlertDismissed INTEGER;
+        ALTER TABLE loginsM ADD timeLastBreachAlertDismissed INTEGER;",
+        )?),
+
+        // next migration, add here
+        _ => Err(Error::IncompatibleVersion(from)),
+    }
+}
+
 pub(crate) fn create(db: &Connection) -> Result<()> {
     debug!("Creating schema");
     db.execute_all(&[
@@ -262,6 +283,46 @@ mod tests {
     use nss::ensure_initialized;
     use rusqlite::Connection;
 
+    // Snapshot of the schema in version 1.  We use this to test that we can migrate from there to the
+    // current schema.
+    const SCHEMA_V1: &str = r#"
+CREATE TABLE IF NOT EXISTS loginsL (
+    id                  INTEGER PRIMARY KEY AUTOINCREMENT,
+    origin              TEXT NOT NULL,
+    httpRealm           TEXT,
+    formActionOrigin    TEXT,
+    usernameField       TEXT,
+    passwordField       TEXT,
+    timesUsed           INTEGER NOT NULL DEFAULT 0,
+    timeCreated         INTEGER NOT NULL,
+    timeLastUsed        INTEGER,
+    timePasswordChanged INTEGER NOT NULL,
+    secFields           TEXT,
+
+    local_modified INTEGER,
+
+    is_deleted     TINYINT NOT NULL DEFAULT 0,
+    sync_status    TINYINT NOT NULL DEFAULT 0
+);
+CREATE TABLE IF NOT EXISTS loginsM (
+    id                  INTEGER PRIMARY KEY AUTOINCREMENT,
+    origin              TEXT NOT NULL,
+    httpRealm           TEXT,
+    formActionOrigin    TEXT,
+    usernameField       TEXT,
+    passwordField       TEXT,
+    timesUsed           INTEGER NOT NULL DEFAULT 0,
+    timeCreated         INTEGER NOT NULL,
+    timeLastUsed        INTEGER,
+    timePasswordChanged INTEGER NOT NULL,
+    secFields           TEXT,
+    guid                TEXT NOT NULL UNIQUE,
+    server_modified     INTEGER NOT NULL,
+    is_overridden       TINYINT NOT NULL DEFAULT 0
+);
+PRAGMA user_version=1;
+    "#;
+
     #[test]
     fn test_create_schema() {
         ensure_initialized();
@@ -271,51 +332,24 @@ mod tests {
         assert_eq!(version, VERSION);
     }
 
+    /// Test running all schema upgrades.
+    ///
+    /// If an upgrade fails, then this test will fail with a panic.
     #[test]
-    fn test_upgrade_v1() {
+    fn test_all_upgrades() {
         ensure_initialized();
         // manually setup a V1 schema.
         let connection = Connection::open_in_memory().unwrap();
-        connection
-            .execute_batch(
-                "
-                CREATE TABLE IF NOT EXISTS loginsM (
-                    -- this was common_sql as at v1
-                    id                  INTEGER PRIMARY KEY AUTOINCREMENT,
-                    origin              TEXT NOT NULL,
-                    httpRealm           TEXT,
-                    formActionOrigin    TEXT,
-                    usernameField       TEXT,
-                    passwordField       TEXT,
-                    timesUsed           INTEGER NOT NULL DEFAULT 0,
-                    timeCreated         INTEGER NOT NULL,
-                    timeLastUsed        INTEGER,
-                    timePasswordChanged INTEGER NOT NULL,
-                    secFields           TEXT,
-                    guid                TEXT NOT NULL UNIQUE,
-                    server_modified     INTEGER NOT NULL,
-                    is_overridden       TINYINT NOT NULL DEFAULT 0
-                    -- note enc_unknown_fields missing
-                );
-            ",
-            )
-            .unwrap();
-        // Call `create` to create the rest of the schema - the "if not exists" means loginsM
-        // will remain as v1.
-        create(&connection).unwrap();
-        // but that set the version to VERSION - set it back to 1 so our upgrade code runs.
-        connection
-            .execute_batch("PRAGMA user_version = 1;")
+        connection.execute_batch(SCHEMA_V1).unwrap();
+        let version = connection
+            .conn_ext_query_one::<i64>("PRAGMA user_version")
             .unwrap();
+        assert_eq!(version, 1);
 
         // Now open the DB - it will create loginsL for us and migrate loginsM.
         let db = LoginDb::with_connection(connection, TEST_ENCDEC.clone()).unwrap();
         // all migrations should have succeeded.
         let version = db.conn_ext_query_one::<i64>("PRAGMA user_version").unwrap();
         assert_eq!(version, VERSION);
-
-        // and ensure sql selecting the new column works.
-        db.execute_batch("SELECT enc_unknown_fields FROM loginsM")
-            .unwrap();
     }
 }
diff --git a/third_party/rust/logins/src/store.rs b/third_party/rust/logins/src/store.rs
index 405c9b0efa686..4328463f96b5c 100644
--- a/third_party/rust/logins/src/store.rs
+++ b/third_party/rust/logins/src/store.rs
@@ -178,6 +178,37 @@ impl LoginStore {
         self.lock_db()?.touch(id)
     }
 
+    #[handle_error(Error)]
+    pub fn is_potentially_breached(&self, id: &str) -> ApiResult<bool> {
+        self.lock_db()?.is_potentially_breached(id)
+    }
+
+    #[handle_error(Error)]
+    pub fn record_breach(&self, id: &str, timestamp: i64) -> ApiResult<()> {
+        self.lock_db()?.record_breach(id, timestamp)
+    }
+
+    #[handle_error(Error)]
+    pub fn reset_all_breaches(&self) -> ApiResult<()> {
+        self.lock_db()?.reset_all_breaches()
+    }
+
+    #[handle_error(Error)]
+    pub fn is_breach_alert_dismissed(&self, id: &str) -> ApiResult<bool> {
+        self.lock_db()?.is_breach_alert_dismissed(id)
+    }
+
+    #[handle_error(Error)]
+    pub fn record_breach_alert_dismissal(&self, id: &str) -> ApiResult<()> {
+        self.lock_db()?.record_breach_alert_dismissal(id)
+    }
+
+    #[handle_error(Error)]
+    pub fn record_breach_alert_dismissal_time(&self, id: &str, timestamp: i64) -> ApiResult<()> {
+        self.lock_db()?
+            .record_breach_alert_dismissal_time(id, timestamp)
+    }
+
     #[handle_error(Error)]
     pub fn delete(&self, id: &str) -> ApiResult<bool> {
         self.lock_db()?.delete(id)
diff --git a/third_party/rust/logins/src/sync/engine.rs b/third_party/rust/logins/src/sync/engine.rs
index 1cb484e5c44be..0cde79e7b2a43 100644
--- a/third_party/rust/logins/src/sync/engine.rs
+++ b/third_party/rust/logins/src/sync/engine.rs
@@ -99,7 +99,7 @@ impl LoginsSyncEngine {
                         let local_modified = UNIX_EPOCH
                             + Duration::from_millis(dupe.meta.time_password_changed as u64);
                         let local = LocalLogin::Alive {
-                            login: dupe,
+                            login: Box::new(dupe),
                             local_modified,
                         };
                         plan.plan_two_way_merge(local, (upstream, upstream_time));
diff --git a/third_party/rust/logins/src/sync/merge.rs b/third_party/rust/logins/src/sync/merge.rs
index 2786d64e7f8d9..a64edf67a9071 100644
--- a/third_party/rust/logins/src/sync/merge.rs
+++ b/third_party/rust/logins/src/sync/merge.rs
@@ -40,7 +40,7 @@ pub(crate) enum LocalLogin {
         local_modified: SystemTime,
     },
     Alive {
-        login: EncryptedLogin,
+        login: Box<EncryptedLogin>,
         local_modified: SystemTime,
     },
 }
@@ -72,7 +72,7 @@ impl LocalLogin {
                 error_support::report_error!("logins-crypto", "empty ciphertext in the db",);
             }
             LocalLogin::Alive {
-                login,
+                login: Box::new(login),
                 local_modified,
             }
         })
diff --git a/third_party/rust/logins/src/sync/payload.rs b/third_party/rust/logins/src/sync/payload.rs
index a10a634b9450c..4901c16cb55b1 100644
--- a/third_party/rust/logins/src/sync/payload.rs
+++ b/third_party/rust/logins/src/sync/payload.rs
@@ -70,6 +70,8 @@ impl IncomingLogin {
             http_realm: p.http_realm,
             username_field: p.username_field,
             password_field: p.password_field,
+            time_of_last_breach: p.time_of_last_breach,
+            time_last_breach_alert_dismissed: p.time_last_breach_alert_dismissed,
         };
         let original_sec_fields = SecureLoginFields {
             username: p.username,
@@ -86,6 +88,8 @@ impl IncomingLogin {
             http_realm: login_entry.http_realm,
             username_field: login_entry.username_field,
             password_field: login_entry.password_field,
+            time_of_last_breach: None,
+            time_last_breach_alert_dismissed: None,
         };
         let id = String::from(p.guid);
         let sec_fields = SecureLoginFields {
@@ -169,6 +173,14 @@ pub struct LoginPayload {
     // Additional "unknown" round-tripped fields.
     #[serde(flatten)]
     unknown_fields: UnknownFields,
+
+    #[serde(default)]
+    #[serde(deserialize_with = "deserialize_optional_timestamp")]
+    pub time_of_last_breach: Option<i64>,
+
+    #[serde(default)]
+    #[serde(deserialize_with = "deserialize_optional_timestamp")]
+    pub time_last_breach_alert_dismissed: Option<i64>,
 }
 
 // These probably should be on the payload itself, but one refactor at a time!
@@ -197,6 +209,8 @@ impl EncryptedLogin {
                 time_password_changed: self.meta.time_password_changed,
                 time_last_used: self.meta.time_last_used,
                 times_used: self.meta.times_used,
+                time_of_last_breach: self.fields.time_of_last_breach,
+                time_last_breach_alert_dismissed: self.fields.time_last_breach_alert_dismissed,
                 unknown_fields,
             },
         )?)
@@ -217,6 +231,18 @@ where
     Ok(i64::deserialize(deserializer).unwrap_or_default().max(0))
 }
 
+// Quiet clippy, since this function is passed to deserialiaze_with...
+#[allow(clippy::unnecessary_wraps)]
+fn deserialize_optional_timestamp<'de, D>(
+    deserializer: D,
+) -> std::result::Result<Option<i64>, D::Error>
+where
+    D: serde::de::Deserializer<'de>,
+{
+    use serde::de::Deserialize;
+    Ok(i64::deserialize(deserializer).ok())
+}
+
 #[cfg(not(feature = "keydb"))]
 #[cfg(test)]
 mod tests {
diff --git a/third_party/rust/logins/src/sync/update_plan.rs b/third_party/rust/logins/src/sync/update_plan.rs
index 122a2f7d40662..50a77583ccf60 100644
--- a/third_party/rust/logins/src/sync/update_plan.rs
+++ b/third_party/rust/logins/src/sync/update_plan.rs
@@ -449,7 +449,7 @@ mod tests {
         // And since the local age is 100, then the server should win.
         let server_record_timestamp = now.checked_sub(Duration::from_secs(1)).unwrap();
         let local_login = LocalLogin::Alive {
-            login: login.clone(),
+            login: Box::new(login.clone()),
             local_modified,
         };
 
@@ -516,7 +516,7 @@ mod tests {
         // And since the local age is 1, the local record should win!
         let server_record_timestamp = now.checked_sub(Duration::from_secs(500)).unwrap();
         let local_login = LocalLogin::Alive {
-            login: login.clone(),
+            login: Box::new(login.clone()),
             local_modified,
         };
         let mirror_login = MirrorLogin {
diff --git a/third_party/rust/nss/.cargo-checksum.json b/third_party/rust/nss/.cargo-checksum.json
index aaa413e702ec5..1e2ed5458d894 100644
--- a/third_party/rust/nss/.cargo-checksum.json
+++ b/third_party/rust/nss/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"a02789df36131f32a60b54968c08b6cb77b75735011d2d4a8932b4f538ddd139","README.md":"14dd59e435d179c21c3b4b880bbe3cc6e5999b9f9ac9431f3f9aa3f43902e3fa","fixtures/profile/.gitignore":"48343efff5004bb5907ff57074cf7bd3e7757661f1f0e8816388102848a41976","fixtures/profile/README.md":"a801e141cf954b809aed59d7a0f3a573dce23231035dbab95c6350117c346a75","fixtures/profile/key4.db":"4472e451ccf2e756181c36e94876849a35e044912a6c959fe2c057dd8f9e3708","fixtures/profile/logins.db":"561cbb773cf79d0d9934303d9ffc2f46dc690dfd87bcffa2df2f7e9009af2056","src/aes.rs":"bf3b115fecfc445fed978f43fed4076249c99d72db203acacd8297f418c347e5","src/cert.rs":"8195da7dc86bb9f60306106be08e622d0a116dabdbd31967e227435933ee50d0","src/ec.rs":"c495042a6f92254b7c9941ef0e253340922b0c1d1c43c7d3e725aa1068ae5d0b","src/ecdh.rs":"4acddfaebbc43f4e59c9dd0df56e582f5d0db65c4fd15dcc634c2e27d84efc2c","src/error.rs":"58a923bb8651160bb17c582cf876046792e79f3a190c8572f836b218f16cee74","src/lib.rs":"862ae2d8dbbe29f83579209286198b19bdccdcd81b99e55646d25de874a76d13","src/pbkdf2.rs":"40d5facfdc434571455283265823dd2b0334d2a8db0a09b50ee05d5b1f2a02d7","src/pk11/context.rs":"b4927fe401ed113d79f03aed1c0d9a007d3ce3b3706921ebc3e239e1f472dad6","src/pk11/mod.rs":"d78368654f9a8bc12f1403c4a096b63cf9834820ea6ed48418b9afaa0fc2299e","src/pk11/slot.rs":"99cb603b6d561b86d7655ca33da4aa0e4fb355d065f56d1bfc22b0778a745989","src/pk11/sym_key.rs":"b69b61844191f27e7efb2412a5a0aa7bfcd8ab70caae29a20d20694150ecf620","src/pk11/types.rs":"010e926224d29c9fe12d8804add17e2130f4c383bc8186ac1dad08d16678ae4e","src/pkixc.rs":"939fd8bd84be5eef57c6e9a970e1509e8cb94566ad42f1427a3beaaa214cc62b","src/secport.rs":"99a2c5112939bda2558dd7f0760f1092ab42052871448181083f92ce56f73f05","src/util.rs":"b92ebf5adde772dbc07142837a0196e5b2370e1d5582f11b9e88a385caaa352a"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"a02789df36131f32a60b54968c08b6cb77b75735011d2d4a8932b4f538ddd139","README.md":"14dd59e435d179c21c3b4b880bbe3cc6e5999b9f9ac9431f3f9aa3f43902e3fa","fixtures/profile/.gitignore":"48343efff5004bb5907ff57074cf7bd3e7757661f1f0e8816388102848a41976","fixtures/profile/README.md":"a801e141cf954b809aed59d7a0f3a573dce23231035dbab95c6350117c346a75","fixtures/profile/key4.db":"4472e451ccf2e756181c36e94876849a35e044912a6c959fe2c057dd8f9e3708","fixtures/profile/logins.db":"29c6f202e1b9cd0741899ef0ec3f0e9dd76726076c0ee843aae4c36e0d050fa8","src/aes.rs":"bf3b115fecfc445fed978f43fed4076249c99d72db203acacd8297f418c347e5","src/cert.rs":"8195da7dc86bb9f60306106be08e622d0a116dabdbd31967e227435933ee50d0","src/ec.rs":"c495042a6f92254b7c9941ef0e253340922b0c1d1c43c7d3e725aa1068ae5d0b","src/ecdh.rs":"4acddfaebbc43f4e59c9dd0df56e582f5d0db65c4fd15dcc634c2e27d84efc2c","src/error.rs":"58a923bb8651160bb17c582cf876046792e79f3a190c8572f836b218f16cee74","src/lib.rs":"862ae2d8dbbe29f83579209286198b19bdccdcd81b99e55646d25de874a76d13","src/pbkdf2.rs":"40d5facfdc434571455283265823dd2b0334d2a8db0a09b50ee05d5b1f2a02d7","src/pk11/context.rs":"b4927fe401ed113d79f03aed1c0d9a007d3ce3b3706921ebc3e239e1f472dad6","src/pk11/mod.rs":"d78368654f9a8bc12f1403c4a096b63cf9834820ea6ed48418b9afaa0fc2299e","src/pk11/slot.rs":"99cb603b6d561b86d7655ca33da4aa0e4fb355d065f56d1bfc22b0778a745989","src/pk11/sym_key.rs":"b69b61844191f27e7efb2412a5a0aa7bfcd8ab70caae29a20d20694150ecf620","src/pk11/types.rs":"010e926224d29c9fe12d8804add17e2130f4c383bc8186ac1dad08d16678ae4e","src/pkixc.rs":"939fd8bd84be5eef57c6e9a970e1509e8cb94566ad42f1427a3beaaa214cc62b","src/secport.rs":"99a2c5112939bda2558dd7f0760f1092ab42052871448181083f92ce56f73f05","src/util.rs":"b92ebf5adde772dbc07142837a0196e5b2370e1d5582f11b9e88a385caaa352a"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/nss/fixtures/profile/logins.db b/third_party/rust/nss/fixtures/profile/logins.db
index 93d7ce7517234f977f25fd6c974c376607d03d40..ebe1a36f4b2f23b9b7f98e178376fb9ca60a006f 100644
GIT binary patch
delta 269
zcmZoTz|?SnX@ayWGXnzy7ZAe$Cy>Dc;{a(!AZDJ}C@;^<pw}hD3*>RKeqi7d<iE&Y
z&-#HsfbR&OBkx|`hK-FytehQkEbQXa(u@-}J91oS_R>)($;?glPxDDEE^#VKO-#;E
z@bn9Db$1Pd$RNZWb5e^+Tr!JuGmDE;Q(&qz+j1De=Jjq~%%jTeK&g3?U$fay&SY!e
UtjW&LI9ZaXaq>xi{Y3&30KVKx6#xJL

delta 151
zcmZoTz|?SnX@ayW69WSS7ZAe$E0Dng;{a(!AZD7_C@;^%pw}hD%m0IclP!aRXBPiS
z9uE!+9!d5!?3!#DY;QIT3cO;SyqC9Sas#j3W+y&AM$Yy)7ItxIX~zD|KUuFcGipu_
g;BVw?(_sV)_H35oQe~cef!}}wXafi{EE1Ri0FON#FaQ7m

diff --git a/third_party/rust/relevancy/.cargo-checksum.json b/third_party/rust/relevancy/.cargo-checksum.json
index e137ece115c8a..7894872362a86 100644
--- a/third_party/rust/relevancy/.cargo-checksum.json
+++ b/third_party/rust/relevancy/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"cc4a829c33618bbdb89e4b0679d6e452c8231d0072a185b5b37aa621ecaf2d06","src/bin/generate-test-data.rs":"7cc80b56929091d02675b9dd9bf4c657a95cda502656cf2ec8d91f56d7a393c7","src/db.rs":"2b8f96024e86887414dc559a1efb9f29bec8c3f8b34d1faa7a0ec93089855b1b","src/error.rs":"3a1308e65440769d9435fc95528d4ef42994c84d88e1da04ba058491dea387c4","src/ingest.rs":"194eefe22aa012d863675005548041495e71a0adc95f5e59d1124b8990de156c","src/interest.rs":"e4369a1280867438bca12746f71288a03b4d5e180e156f4bc0335046012565f7","src/lib.rs":"6caa17ba27774941fce73602357acaf279645a19cd70459636e507b247da255f","src/ranker.rs":"e71414fe79ade26f3c79dceb5211af4f37984a9cded8c938dc1da8d8d28c2ad3","src/rs.rs":"e897443bd4d8d308effeae55a955d237d22e823b5d5abfb271a25b5796ebd419","src/schema.rs":"38ea82679da2729a571aad936f96469e732ec1c104d7c21fd869842f7a5f30a3","src/url_hash.rs":"2e908316fb70923644d1990dbf470d69ce2f5e99b0c5c3d95ec691590be8ffa5","test-data":"1ef2cd092d59e7e126cd4a514af983d449ed9f9c98708702fd237464a76c2b5e"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"169bcfdc4ccef43b3d86dcc089653d0dc155b9664c76a2f9aba8e31322f0e510","src/bin/generate-test-data.rs":"7cc80b56929091d02675b9dd9bf4c657a95cda502656cf2ec8d91f56d7a393c7","src/db.rs":"2b8f96024e86887414dc559a1efb9f29bec8c3f8b34d1faa7a0ec93089855b1b","src/error.rs":"3a1308e65440769d9435fc95528d4ef42994c84d88e1da04ba058491dea387c4","src/ingest.rs":"194eefe22aa012d863675005548041495e71a0adc95f5e59d1124b8990de156c","src/interest.rs":"e4369a1280867438bca12746f71288a03b4d5e180e156f4bc0335046012565f7","src/lib.rs":"6caa17ba27774941fce73602357acaf279645a19cd70459636e507b247da255f","src/ranker.rs":"e71414fe79ade26f3c79dceb5211af4f37984a9cded8c938dc1da8d8d28c2ad3","src/rs.rs":"e897443bd4d8d308effeae55a955d237d22e823b5d5abfb271a25b5796ebd419","src/schema.rs":"38ea82679da2729a571aad936f96469e732ec1c104d7c21fd869842f7a5f30a3","src/url_hash.rs":"2e908316fb70923644d1990dbf470d69ce2f5e99b0c5c3d95ec691590be8ffa5","test-data":"1ef2cd092d59e7e126cd4a514af983d449ed9f9c98708702fd237464a76c2b5e"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/relevancy/Cargo.toml b/third_party/rust/relevancy/Cargo.toml
index 32e5a5f8acb78..f6bd583ad96e1 100644
--- a/third_party/rust/relevancy/Cargo.toml
+++ b/third_party/rust/relevancy/Cargo.toml
@@ -67,8 +67,8 @@ features = ["derive"]
 path = "../support/sql"
 
 [dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 
 [build-dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 features = ["build"]
diff --git a/third_party/rust/remote_settings/.cargo-checksum.json b/third_party/rust/remote_settings/.cargo-checksum.json
index ebdf3b9494246..ebd9adae0956b 100644
--- a/third_party/rust/remote_settings/.cargo-checksum.json
+++ b/third_party/rust/remote_settings/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"19c95234033bcb34a4f179937308bd6075c8df6671d7b2f34b897fc3c33718e6","dumps/main/attachments/regions/world":"00b308033d44f61612b962f572765d14a3999586d92fc8b9fff2217a1ae070e8","dumps/main/attachments/regions/world-buffered":"1d3ed6954fac2a5b31302f5d3e8186c5fa08a20239afc0643ca5dfbb4d8a86fc","dumps/main/attachments/regions/world-buffered.meta.json":"914a71376a152036aceccb6877e079fbb9e3373c6219f24f00dd30e901a72cce","dumps/main/attachments/regions/world.meta.json":"2a47d77834997b98e563265d299723e7f7fd64c8c7a5731afc722862333d6fbd","dumps/main/attachments/search-config-icons/001500a9-1a6c-3f5a-ba15-a5f5a075d256":"fdadf15c6eae7933c3d254ae6311112e0bc8a422c38c758189dbe6a4d7f6b718","dumps/main/attachments/search-config-icons/001500a9-1a6c-3f5a-ba15-a5f5a075d256.meta.json":"6ed1e1c390a45360590e5a1e6d7823218e7b10860581646ddb5e368143aa72fc","dumps/main/attachments/search-config-icons/06cf7432-efd7-f244-927b-5e423005e1ea":"b75ef04a805325e303c4195833cdd077d3d406f360b25b72502fc55880b9150b","dumps/main/attachments/search-config-icons/06cf7432-efd7-f244-927b-5e423005e1ea.meta.json":"0d4cce0ed0dc6b2c46651bea32fc3cc2facfe8b341e1022b65f2cd2231f6b713","dumps/main/attachments/search-config-icons/0a57b0cf-34f0-4d09-96e4-dbd6e3355410":"a7493c6a9d70d60acccf73f62dcbc127a580469570aee60b7482cd42cdb59f69","dumps/main/attachments/search-config-icons/0a57b0cf-34f0-4d09-96e4-dbd6e3355410.meta.json":"d33a128c92b96af2e643158ed3b861d3726bd67a59907fed0795ab2210c82b96","dumps/main/attachments/search-config-icons/0d7668a8-c3f4-cfee-cbc8-536511528937":"7042293af6b04e421cb7b68dc599ac644b76939cdcf5970159e44f658dd6a0cc","dumps/main/attachments/search-config-icons/0d7668a8-c3f4-cfee-cbc8-536511528937.meta.json":"d6523508334a67b201326591606d7e225a04fc53fdce2c1b4d8afac1b41af6b0","dumps/main/attachments/search-config-icons/0eec5640-6fde-d6fe-322a-c72c6d5bd5a2":"64800e32b24b2c8c0582750e1657426d56abd74b65682e20e892f82710d120b6","dumps/main/attachments/search-config-icons/0eec5640-6fde-d6fe-322a-c72c6d5bd5a2.meta.json":"56fb61a078cc45abf7bc3b8fe89b60ef75f3b86ea61d63084749607c4662bbef","dumps/main/attachments/search-config-icons/101ce01d-2691-b729-7f16-9d389803384b":"62d2faa3a8322b1f643aab6e045837500ebe3049c5cb140cb44c4dfc7290337a","dumps/main/attachments/search-config-icons/101ce01d-2691-b729-7f16-9d389803384b.meta.json":"de134ed423a2bd92b4ad8cdf631aad6a83cc2c30f8df9ee251a435ee9f46f28f","dumps/main/attachments/search-config-icons/177aba42-9bed-4078-e36b-580e8794cd7f":"3b88f3ef3cbfaed127d679ec7e44a44fe8dcad688feb89a70a1a9447c1460d15","dumps/main/attachments/search-config-icons/177aba42-9bed-4078-e36b-580e8794cd7f.meta.json":"c35210da5afc11b3af156baf46c23fa523dafac7e8cb2738b4caef80ed48c72e","dumps/main/attachments/search-config-icons/25de0352-aabb-d31f-15f7-bf9299fb004c":"828c3ca82e9be483ae583e5a705dde57b24fd8431e192e3a2d0809871992afa5","dumps/main/attachments/search-config-icons/25de0352-aabb-d31f-15f7-bf9299fb004c.meta.json":"aa5483b5c65427c028a676b2fc13892f6fcaf602613183962744c43ca146d86a","dumps/main/attachments/search-config-icons/2bbe48f4-d3b8-c9e0-86e3-a54c37ec3335":"723ac3228124926537d5a61284d60e198a52895195f9f69b967c578ef7a012ad","dumps/main/attachments/search-config-icons/2bbe48f4-d3b8-c9e0-86e3-a54c37ec3335.meta.json":"d754b38d7e2f79e651d5fe110a7bb9855e0f7269e177be6d047453a36a52a4c5","dumps/main/attachments/search-config-icons/2e835b0e-9709-d1bb-9725-87f59f3445ca":"16ea89d4baa39529d7a84d5152867a4c6ed6867198c4dfa1648b1f43ce6a3f6f","dumps/main/attachments/search-config-icons/2e835b0e-9709-d1bb-9725-87f59f3445ca.meta.json":"7edb361a6610fdabb431a58bc170b7df3f179ca1fadebae6f2e98777b64b35c5","dumps/main/attachments/search-config-icons/2ecca3f8-c1ef-43cc-b053-886d1ae46c36":"774f0a7a613c6c5bea642e3628fa7436851de79e7da9713ad0c96d5db7f44300","dumps/main/attachments/search-config-icons/2ecca3f8-c1ef-43cc-b053-886d1ae46c36.meta.json":"194cb07dd29fd66121f05bbef38291e894291adcbc4c63c373b5f72f6f2e245e","dumps/main/attachments/search-config-icons/32d26d19-aeb0-5c01-32e8-f8970be9246f":"a64f553b79fbb8c45734310dac401ad253ccd05aeabfa58bb5541daa6d8caf70","dumps/main/attachments/search-config-icons/32d26d19-aeb0-5c01-32e8-f8970be9246f.meta.json":"6e56cf6a9470f575b283e40ed6a049e9dbffadcb59fa74a0f941b431c444d795","dumps/main/attachments/search-config-icons/39d0b17d-c020-4890-932f-83c0f6ed130b":"4f409c3ffc67cfa870b05e4089b6ffc3fc81448fa60afba447f0177cd1192b1e","dumps/main/attachments/search-config-icons/39d0b17d-c020-4890-932f-83c0f6ed130b.meta.json":"686c72d6cd220285d8b97af55474198027eab1b1af7ed89508c8935c9e00e7d4","dumps/main/attachments/search-config-icons/41135a88-093d-4077-873b-9de1ae133427":"c2718c5e416670426475dd8cc496f5464bf95224e8f8f0a72b695360ddc917c0","dumps/main/attachments/search-config-icons/41135a88-093d-4077-873b-9de1ae133427.meta.json":"a941fc27ca88b56eccbdec380ce2d3b911f4c62e4aba1f5399bc4498c6601d94","dumps/main/attachments/search-config-icons/41f0d805-3775-4988-8d8c-5ad8ccd86d1c":"755b8939c63b1fcc9acd05cd33ffed675397516d37b5bd8f3a03875e25d3fb43","dumps/main/attachments/search-config-icons/41f0d805-3775-4988-8d8c-5ad8ccd86d1c.meta.json":"25cafe7d629c6b006e15dee98987c26ef509f348ed0350a3ccf1f06838db86f3","dumps/main/attachments/search-config-icons/47da97b5-600f-c450-fd15-a52bb2169c11":"d7fdfd971d874f2ec6f209df6f6b8173d126cd3f7a25daacb94de4259efbcf16","dumps/main/attachments/search-config-icons/47da97b5-600f-c450-fd15-a52bb2169c11.meta.json":"e6b95ca29bf3e750819cf890ae8e879ac506d54b918c3c0ab065adc16a131188","dumps/main/attachments/search-config-icons/48c72361-cd67-412e-bd7f-f81a43c10791":"92da7ef030e1d3ed97235748156383e5d75fa6d2744bd124334ab47dc0b689a1","dumps/main/attachments/search-config-icons/48c72361-cd67-412e-bd7f-f81a43c10791.meta.json":"21d1320d60c981b9c9248b9b186fc49f9d95046a817d7a3145f48465236087e8","dumps/main/attachments/search-config-icons/4e271681-3e0f-91ac-9750-03f665efc171":"189ed3031a2cefd3150c9e5b37bee1ffbc1f7850f7ac0621e4b8d262f2c1048c","dumps/main/attachments/search-config-icons/4e271681-3e0f-91ac-9750-03f665efc171.meta.json":"0a401871b82f1c1cbca91232fd643be1cc1a76c07a48830eaa2a47cdfafb1f14","dumps/main/attachments/search-config-icons/50f6171f-8e7a-b41b-862e-f97397038fb2":"9140bd1b30953f41bc758d2c0ecc873f5163e4f51126c278991eccd38589c541","dumps/main/attachments/search-config-icons/50f6171f-8e7a-b41b-862e-f97397038fb2.meta.json":"805d8ce33bac4611ce12d1f84ef431313555d76bf996264736e401ceb6dabe98","dumps/main/attachments/search-config-icons/5203dd03-2c55-4b53-9c60-58258d587be1":"adb29f6fd95956401630d94967381ac473f57215d96a5bcf500a00e747731380","dumps/main/attachments/search-config-icons/5203dd03-2c55-4b53-9c60-58258d587be1.meta.json":"27a6f994c2c7653a33d380ac13c4cfbc00f543a92f229426aa71d85b1f968357","dumps/main/attachments/search-config-icons/5914932e-66ba-4126-8be5-d37beadd9532":"02f54211387baa59e4246356dc7344e48f39a412f2e5993d7f403aa538df7276","dumps/main/attachments/search-config-icons/5914932e-66ba-4126-8be5-d37beadd9532.meta.json":"2df77daeeef5892fdb7fdeecffb804638bd0d2f7da5b9e617f01303d786dcd09","dumps/main/attachments/search-config-icons/5ded611d-44b2-dc46-fd67-fb116888d75d":"877fb3aca13d2a7c656df1f94df3fa052afbb40b65c99ba5382392ff5499016e","dumps/main/attachments/search-config-icons/5ded611d-44b2-dc46-fd67-fb116888d75d.meta.json":"d1c75915fdc86461e755cd08e670b01da41cd3d76688afe692f841733a9b7ee0","dumps/main/attachments/search-config-icons/5e03d6f4-6ee9-8bc8-cf22-7a5f2cf55c41":"9cd3da38e3938549434d1c3cba6fed249ffa7d91d9a6d7ffb5f4184f527cac76","dumps/main/attachments/search-config-icons/5e03d6f4-6ee9-8bc8-cf22-7a5f2cf55c41.meta.json":"8506d9438825f2dc34875e04e0212e22a2652c5c43aa93e4d184d59ec765316f","dumps/main/attachments/search-config-icons/6644f26f-28ea-4222-929d-5d43a02dae05":"4f1bfbfec1441bd9a304ca7f3b8fd54130e94df185f7b28bb17c86ba517e13b7","dumps/main/attachments/search-config-icons/6644f26f-28ea-4222-929d-5d43a02dae05.meta.json":"f7d37f9c8b87480539cd981f463790c99ed15b2ffc5e3ff4786dd11c25228df4","dumps/main/attachments/search-config-icons/6d10d702-7bd6-1452-90a5-3df665a38f66":"f895a965b68d02e7391cc4504d9be75e1ba7f9b50a1dd59af77bb44a7769c08c","dumps/main/attachments/search-config-icons/6d10d702-7bd6-1452-90a5-3df665a38f66.meta.json":"d782d80f8187cf8051be89c6b8a1ef4700e0b84dcda006843d1fd2f266c4419b","dumps/main/attachments/search-config-icons/6e36a151-e4f4-4117-9067-1ca82c47d01a":"e9849089ffced59563896974afee0fceedac7fc8455bbeaa5bae230f54c933d9","dumps/main/attachments/search-config-icons/6e36a151-e4f4-4117-9067-1ca82c47d01a.meta.json":"0e5a64c06ea0ae875e8e0fdc850feddf5a8714b8290293dcd100d455de32ace0","dumps/main/attachments/search-config-icons/6f4da442-d31e-28f8-03af-797d16bbdd27":"dd5cab3711f778677859e86000a127ed07a6175e8e58aecb0fba71b825ce76d7","dumps/main/attachments/search-config-icons/6f4da442-d31e-28f8-03af-797d16bbdd27.meta.json":"0a947797180fdaf031a9c2d2f841b88243c90ff85f0af873f99ddd770fc59e8b","dumps/main/attachments/search-config-icons/7072564d-a573-4750-bf33-f0a07631c9eb":"0a653ea57472694ac05623d9b237e479232a0d65683d05f89661f996054e3276","dumps/main/attachments/search-config-icons/7072564d-a573-4750-bf33-f0a07631c9eb.meta.json":"bb8a256f72b37166fea2ecd4c3a59f49615854a7210e6963f2571f8dcb3d3a3f","dumps/main/attachments/search-config-icons/70fdd651-6c50-b7bb-09ec-7e85da259173":"31a793dad95b5ffd02d39ebf14fc40877596f418f5926247487265034181dc8f","dumps/main/attachments/search-config-icons/70fdd651-6c50-b7bb-09ec-7e85da259173.meta.json":"8c744e9d2f218256e63f1b1a2193f2fc4a7b980e72464e8d57fbe150446f2efc","dumps/main/attachments/search-config-icons/71f41a0c-5b70-4116-b30f-e62089083522":"5aad083bfcef256d433c1ffa571b814d16f61832bcd7565bf03909011f6a0bfc","dumps/main/attachments/search-config-icons/71f41a0c-5b70-4116-b30f-e62089083522.meta.json":"4a8f0c4e4ee643faa2f8d8cc4ddb8f87d14c740e8c9252223f826181c0117741","dumps/main/attachments/search-config-icons/74793ce1-a918-a5eb-d3c0-2aadaff3c88c":"ca8f102ac4f35189ebcb786d080843b603b234f89b8d8b1c0ef27a0ab7148182","dumps/main/attachments/search-config-icons/74793ce1-a918-a5eb-d3c0-2aadaff3c88c.meta.json":"60a7975cd79156623b0ca58be4110d152e50b6e9caaaa211dad1cd37eabb0345","dumps/main/attachments/search-config-icons/74f94dc2-caf6-4b90-b3d2-f3e2f7714d88":"3376e14529ed2e96c7dc491b3bf11914d7c8ff47a068311b2432c086c2ae0f28","dumps/main/attachments/search-config-icons/74f94dc2-caf6-4b90-b3d2-f3e2f7714d88.meta.json":"3a94a78a846f312c85c0609971b153aaba9819e2b657f25e3b0648a3956933d1","dumps/main/attachments/search-config-icons/764e3b14-fe16-4feb-8384-124c516a5afa":"71413ef23ac14ce2b7bb76f7f5d16b2df267239841a88ddab36b129481e00616","dumps/main/attachments/search-config-icons/764e3b14-fe16-4feb-8384-124c516a5afa.meta.json":"2f16dd51ade97a327d4e5f14d689f822a5c9061b9b27810bbccbf2f406a5e56f","dumps/main/attachments/search-config-icons/7bbe6c5c-fdb8-2845-a4f4-e1382e708a0e":"24daa27a3234d01b5add42e027b0a34000d0ab47c17fe3924c2ca267b7b61c19","dumps/main/attachments/search-config-icons/7bbe6c5c-fdb8-2845-a4f4-e1382e708a0e.meta.json":"308d345dbcfd7583e5f7460d34caf3b63d01b747a6e060a2b0971bf00ed2b22c","dumps/main/attachments/search-config-icons/7bf4ca37-e2b8-4d31-a1c3-979bc0e85131":"912d20feefcba57d43bffff5e245b8c1e3865155ed686d8ad253bbab71116e83","dumps/main/attachments/search-config-icons/7bf4ca37-e2b8-4d31-a1c3-979bc0e85131.meta.json":"3ec071b0a2940cd8892a72bd28d44237aecfd20d88303661348257ddb98aee43","dumps/main/attachments/search-config-icons/7c81cf98-7c11-4afd-8279-db89118a6dfb":"e988445d87afe0d285bea251705fc23eb70ac42426ab0d7a69d9276585c5573c","dumps/main/attachments/search-config-icons/7c81cf98-7c11-4afd-8279-db89118a6dfb.meta.json":"273dd09cad2a62459cc062e3b39b835d55a06b10cb7d5149aad77dd55451821f","dumps/main/attachments/search-config-icons/7cb4d88a-d4df-45b2-87e4-f896eaf1bbdb":"8dc2e75e6792b8374b20621fa2151ac24b4626e5c1f6a1abec4f912746441859","dumps/main/attachments/search-config-icons/7cb4d88a-d4df-45b2-87e4-f896eaf1bbdb.meta.json":"21d2522ab4e47477e72da3a2d2223e50e55fef442e2ba736d56df1e09593d76f","dumps/main/attachments/search-config-icons/7edaf4fe-a8a0-432b-86d2-bf75ebe80851":"27541cb376bdda829a6cf9cefd13da112728881e3daa4ac3c1178d4ce15f1e8b","dumps/main/attachments/search-config-icons/7edaf4fe-a8a0-432b-86d2-bf75ebe80851.meta.json":"3aea5d0652172940ac33e32628dcc6a03b79fe686c6de752482c8e3ae5cd70eb","dumps/main/attachments/search-config-icons/7efbed51-813c-581d-d8d3-f8758434e451":"b0c6d1850265e3c946917232ca6c6ace3dad23347bfab4f81351eac569326d34","dumps/main/attachments/search-config-icons/7efbed51-813c-581d-d8d3-f8758434e451.meta.json":"5a723c8f04bffa33a69a7054d30a4816caf1a3924081c85e1d9770126f761a96","dumps/main/attachments/search-config-icons/84bb4962-e571-227a-9ef6-2ac5f2aac361":"a1fd5d127a5f2590ddcd439b7a2abb3456b48217ea11daf0345b26e108f520e6","dumps/main/attachments/search-config-icons/84bb4962-e571-227a-9ef6-2ac5f2aac361.meta.json":"5cb0ebdde367b9754ddf6cbd01150414d27977b2d4c5f65cd6bbb89989388f3b","dumps/main/attachments/search-config-icons/87ac4cde-f581-398b-1e32-eb4079183b36":"33ca72f1eac56793d1fd811189cedef98004a067c85b1143083b564814a4b0db","dumps/main/attachments/search-config-icons/87ac4cde-f581-398b-1e32-eb4079183b36.meta.json":"d97eca8063cc17b99c81c55d4ff121d765c793e006ed252fec5f9539bd0fc339","dumps/main/attachments/search-config-icons/8831ce10-b1e4-6eb4-4975-83c67457288e":"ca3cc8786977f6ffeb0546ff8f3bb2b7fd240d1956fbf86777dbf0e8bec9c03b","dumps/main/attachments/search-config-icons/8831ce10-b1e4-6eb4-4975-83c67457288e.meta.json":"45274d848d1f6d398563bb46a2bfa3eee40ff16a5dbf0bbc8904db442f80702c","dumps/main/attachments/search-config-icons/890de5c4-0941-a116-473a-5d240e79497a":"6ba1f0fd1d12014cab32f74daab24dfa16fb26613ace20a1e595267621038a07","dumps/main/attachments/search-config-icons/890de5c4-0941-a116-473a-5d240e79497a.meta.json":"107547059360c3658dcf187a546ffb52bb23fa385e1338151043bebe82bbf640","dumps/main/attachments/search-config-icons/8abb10a7-212f-46b5-a7b4-244f414e3810":"f8780adb4d7b28f2f881db4ca7b697d8fc916cd9fa834ccc445fe7d4b72a6cc7","dumps/main/attachments/search-config-icons/8abb10a7-212f-46b5-a7b4-244f414e3810.meta.json":"5401603c7abbc6ca5bdddb8f9cca7eee2e26e5721cc73f23d95f600d5421d431","dumps/main/attachments/search-config-icons/91a9672d-e945-8e1e-0996-aefdb0190716":"5d53ef1866a08cc29011f5f2a9ce99bbf37cf42e80de7f0e8cc30d13337e8187","dumps/main/attachments/search-config-icons/91a9672d-e945-8e1e-0996-aefdb0190716.meta.json":"4e8ea36e3d659eb22ac7c86498003ca8885bab9c40685bb8ca7796a8230201da","dumps/main/attachments/search-config-icons/94a84724-c30f-4767-ba42-01cc37fc31a4":"98dca7e24cad0a1be96ef2c323e9759beb63c72440756f887e2482d9ce8e8969","dumps/main/attachments/search-config-icons/94a84724-c30f-4767-ba42-01cc37fc31a4.meta.json":"1070966901fe9db82b71bfa74ddeedd4f23ab2ed1eddaf201634e06a604e6006","dumps/main/attachments/search-config-icons/95ed201d-4ab8-4cb8-831d-454f53cab0f8":"3426b5100a6bdb45f8039f0c71a6b68193750ba7bae5b36e5ed31b2b7f372cda","dumps/main/attachments/search-config-icons/95ed201d-4ab8-4cb8-831d-454f53cab0f8.meta.json":"3447cd050619c1d2e5859147ab894a43da75235a580219306d8629e28a7a3eb5","dumps/main/attachments/search-config-icons/96327a73-c433-5eb4-a16d-b090cadfb80b":"ca6e972004f62355c1ea97656bc2328e1643971bdecab9c6b563d45593b8122e","dumps/main/attachments/search-config-icons/96327a73-c433-5eb4-a16d-b090cadfb80b.meta.json":"c4e3c9e6426e6f35410c287eef95b3e2134e54409e462f02dd440876c06b1bb4","dumps/main/attachments/search-config-icons/9802e63d-05ec-48ba-93f9-746e0981ad98":"6b1b073183eb0012daea0dce351a94d395c8a0b531b610e56eac52b3d1d1da0e","dumps/main/attachments/search-config-icons/9802e63d-05ec-48ba-93f9-746e0981ad98.meta.json":"cceb55c68db8dddd23d064364a281e982069bfe2bb55eba7d282fffcec2aa89f","dumps/main/attachments/search-config-icons/9d96547d-7575-49ca-8908-1e046b8ea90e":"6a743574353de0ec7c85b49f46b2b554caa0fc1d064b90544c5dea0fea2b8901","dumps/main/attachments/search-config-icons/9d96547d-7575-49ca-8908-1e046b8ea90e.meta.json":"10897754c5aafe0b84413afee5e9948fd799262a26aa07bca85fe6fb369beac4","dumps/main/attachments/search-config-icons/a06db97d-1210-ea2e-5474-0e2f7d295bfd":"617dec5d635efb0a12d0de935c6999ef0249f4a63c62bdcb96551518bc3d1812","dumps/main/attachments/search-config-icons/a06db97d-1210-ea2e-5474-0e2f7d295bfd.meta.json":"06cf576ca882bd7c2d54c18329e21e5b1a9cb7732d4954b52cbfa52979a67765","dumps/main/attachments/search-config-icons/a06dc3fd-4bdb-41f3-2ebc-4cbed06a9bd3":"d994f806b1e4225b50be5ab681b2cecf845cc216a19a432d878cea3cb815bafd","dumps/main/attachments/search-config-icons/a06dc3fd-4bdb-41f3-2ebc-4cbed06a9bd3.meta.json":"67524e18799023a017c7d9db1b9ba5c9cc3090d20f8154449a8f44ba22719104","dumps/main/attachments/search-config-icons/a2c7d4e9-f770-51e1-0963-3c2c8401631d":"1bf68aca7bfc75ca8485c3dac9a1daa13c1a3eb480688c32262096af6076adfa","dumps/main/attachments/search-config-icons/a2c7d4e9-f770-51e1-0963-3c2c8401631d.meta.json":"4ab103bba0f8fde581c3950c6c08cfcf6786104d8cbcba240499308f26958d04","dumps/main/attachments/search-config-icons/a83f24e4-602c-47bd-930c-ad0947ee1adf":"66612f999921d892645c8a2b37aa5dad17b134e7fdaed375a683baec7fc10697","dumps/main/attachments/search-config-icons/a83f24e4-602c-47bd-930c-ad0947ee1adf.meta.json":"f985ffbde6cf6ef972b6798c9336922dcfa29ca9a31e3aa4fae1962e069bdb0c","dumps/main/attachments/search-config-icons/b64f09fd-52d1-c48e-af23-4ce918e7bf3b":"c3e8300801c5c585662f14fd8e819d635efd9830783dc3c631212927866e9898","dumps/main/attachments/search-config-icons/b64f09fd-52d1-c48e-af23-4ce918e7bf3b.meta.json":"f7fd846d6717131e75865f8f5ed562e88f40be3dcf1603f2660b425dedabc7d1","dumps/main/attachments/search-config-icons/b882b24d-1776-4ef9-9016-0bdbd935eda3":"076352591c7077af4af5771918f80b5da9c6bf479327cc68390abdb158f3ec03","dumps/main/attachments/search-config-icons/b882b24d-1776-4ef9-9016-0bdbd935eda3.meta.json":"229139bca53bc63bd59b8f261f36c11fbe76b2b45dfeac2580261cf290c41365","dumps/main/attachments/search-config-icons/b8ca5a94-8fff-27ad-6e00-96e244a32e21":"1474c93e49c209aca2a2df2acb61b64574805106bead6edebd67287de21920e0","dumps/main/attachments/search-config-icons/b8ca5a94-8fff-27ad-6e00-96e244a32e21.meta.json":"6fd72c11afb4249d0166d8d98c552ee02d73c0e07f0578bfd3d7e67d70bcaee3","dumps/main/attachments/search-config-icons/b9424309-f601-4a69-98ca-ca68e65633e6":"601d72e7abde5ec864b3d8ca0031896f769107670b84c66053062481a56d8665","dumps/main/attachments/search-config-icons/b9424309-f601-4a69-98ca-ca68e65633e6.meta.json":"f299a7d56c5552fc592c66073d3e1e1d16ce4a99e935dcc0cad7dafcad6b9e3b","dumps/main/attachments/search-config-icons/c411adc1-9661-4fb5-a4c1-8cfe74911943":"150765e8e9b985ba5b820ac9b8e7623023d5a0e24f94663d5e9203d8d7598059","dumps/main/attachments/search-config-icons/c411adc1-9661-4fb5-a4c1-8cfe74911943.meta.json":"c5cc89d5f24ef1fa40b1c47c2e97eaeb01439b8d3b186b9c2fe716c94ead30f2","dumps/main/attachments/search-config-icons/cbf9e891-d079-2b28-5617-283450d463dd":"5b2c34b3c4e8dd898b664dba6c3786e2ff9869eff55d673aa48361f11325ed07","dumps/main/attachments/search-config-icons/cbf9e891-d079-2b28-5617-283450d463dd.meta.json":"b757806fd1b922d81bbecab94c73d3db98cfc2aa2791a4d5137112f795a732ee","dumps/main/attachments/search-config-icons/d87f251c-3e12-a8bf-e2d0-afd43d36c5f9":"865d76c8175a8f11dedc93f0bc212242a97a8a76adac870e8249368cecc81402","dumps/main/attachments/search-config-icons/d87f251c-3e12-a8bf-e2d0-afd43d36c5f9.meta.json":"22594c8870cbabe5fc5d2637509235202502661b466e9e37c5878716f323a34f","dumps/main/attachments/search-config-icons/db0e1627-ae89-4c25-8944-a9481d8512d9":"97a68f0b948b68bbf389a9ef43e2fe6c31ff8dc7889c939fdfdea79378576c67","dumps/main/attachments/search-config-icons/db0e1627-ae89-4c25-8944-a9481d8512d9.meta.json":"1eccc999dcd377af84cf63ed60b7ef23d5d4b936a1e465d12349a5366b1b012d","dumps/main/attachments/search-config-icons/e02f23df-8d48-2b1b-3b5c-6dd27302c61c":"247aa26993083705ce99a8e5612cdf262aca98cde86ba19afc964329ba95986a","dumps/main/attachments/search-config-icons/e02f23df-8d48-2b1b-3b5c-6dd27302c61c.meta.json":"06fc893d29cf406519611da9d1993a13bd9134192940c12bf64536ea571db4f0","dumps/main/attachments/search-config-icons/e718e983-09aa-e8f6-b25f-cd4b395d4785":"809697f48848e7c3638d5f3e0b224ea60b3800504e7bd8417854d55989b85196","dumps/main/attachments/search-config-icons/e718e983-09aa-e8f6-b25f-cd4b395d4785.meta.json":"0d9baef39747776500e5b83e72cd9d901fc09ac08247368dd2117bb4ec011f54","dumps/main/attachments/search-config-icons/e7547f62-187b-b641-d462-e54a3f813d9a":"c971ee33b8c0a57349669d957bf73070b0632b128c94748e845b57d5e15221a4","dumps/main/attachments/search-config-icons/e7547f62-187b-b641-d462-e54a3f813d9a.meta.json":"8ec4f6a7826966f2ff82632ef527366db3452ebc40c90a557602111f0ea956c9","dumps/main/attachments/search-config-icons/eb62e768-151b-45d1-9fe5-9e1d2a5991c5":"aa46b3d1ed8557e5bc7e71988cc6c46b00363b890d2a781973f9dc9073f8dd31","dumps/main/attachments/search-config-icons/eb62e768-151b-45d1-9fe5-9e1d2a5991c5.meta.json":"a06682b589df8dd63b1f25c01630ead55a89217f72c0bc04b391829af3fef59f","dumps/main/attachments/search-config-icons/f312610a-ebfb-a106-ea92-fd643c5d3636":"91d17ba44192a6430ffdb447ff3a11533ef964628f67c13480cc9470212d3d65","dumps/main/attachments/search-config-icons/f312610a-ebfb-a106-ea92-fd643c5d3636.meta.json":"ce26ab2382a7a67a55688330dd74127b4a980610f4030bde8eaaa20b81306559","dumps/main/attachments/search-config-icons/f943d7bc-872e-4a81-810f-94d26465da69":"69e0131f3e85657f827eb4ad3f01c25cf17540fe2db15c7e756f4dcfc1853dd2","dumps/main/attachments/search-config-icons/f943d7bc-872e-4a81-810f-94d26465da69.meta.json":"2e29a77bc8758ac3674f3a94b42fb871171fc53ae45bcb1fec6527c787758a23","dumps/main/attachments/search-config-icons/fa0fc42c-d91d-fca7-34eb-806ff46062dc":"6da5620880159634213e197fafca1dde0272153be3e4590818533fab8d040770","dumps/main/attachments/search-config-icons/fa0fc42c-d91d-fca7-34eb-806ff46062dc.meta.json":"0c3c0eb832be884f25186395b8bf08cdbe0a6e2845b9e55e7cbea5d0f183ed7d","dumps/main/attachments/search-config-icons/fca3e3ee-56cd-f474-dc31-307fd24a891d":"c4d88cfa5262f6d2cf76b167281d25821c9e1770684b739ed6ad3cf7277a121b","dumps/main/attachments/search-config-icons/fca3e3ee-56cd-f474-dc31-307fd24a891d.meta.json":"a40c37a5150e3745849f67305fe2fe1e06ef1c3901f6dc604a8e3f6c94e7b624","dumps/main/attachments/search-config-icons/fe75ce3f-1545-400c-b28c-ad771054e69f":"3a9d06951c7c9d2c19cd00533a760b0f8755b1e2e718af81c710297d030fbe44","dumps/main/attachments/search-config-icons/fe75ce3f-1545-400c-b28c-ad771054e69f.meta.json":"3f353e083d7a885f6d59d36c9276a2d325686a533cf8c502cd41a10172e763ea","dumps/main/attachments/search-config-icons/fed4f021-ff3e-942a-010e-afa43fda2136":"d7fdfd971d874f2ec6f209df6f6b8173d126cd3f7a25daacb94de4259efbcf16","dumps/main/attachments/search-config-icons/fed4f021-ff3e-942a-010e-afa43fda2136.meta.json":"740f77dcc93ece89fd55557baf399a4464373c81154b0a9758b8622f6c458253","dumps/main/attachments/translations-wasm/4fd32605-9889-4dd9-9fc7-577ad1136746":"a3a89d9ad0a4ed8f27bf3e403701b23f5709816f6376438503f2fa5b0182c2dc","dumps/main/attachments/translations-wasm/4fd32605-9889-4dd9-9fc7-577ad1136746.meta.json":"443145b56a534c87db789181355536a2a60062b74ef6de9aa7bdb38bc33c328e","dumps/main/regions.json":"e8990158373f82d3f89fed5089cf29e4177cc85904479128728e05025e9a0c0c","dumps/main/search-config-icons.json":"53cfd9548f2e8299fe976b628f32af90ddbec0ff9579483d051c7426b634f2bf","dumps/main/search-config-v2.json":"4a409b410fbb5cf72443cae17c76181ef5852b75d219e90db2af8a7141aa9ed3","dumps/main/search-telemetry-v2.json":"405b6a0e198f5cc2d2a4e484a5ccd2ca269bd5e08d03857cdc8e102c35f58708","dumps/main/summarizer-models-config.json":"2785f498567aebcc2c3157b360a06970b8174815506a6e018c4cf9130d150002","dumps/main/translations-models.json":"2445d5664eab4b3719094532cc36b1c22fa11a64a010d82158cbd9f477e16125","dumps/main/translations-wasm.json":"08f51644de84bb00ad059d131bef1621028ff802d5014a5c1c63c42c70e18fd3","src/cache.rs":"c6179802017b43885136e7d64004890cc13e8c2d4742e04073cf404b578f63db","src/client.rs":"323327aecef953b2ca5c3417d127b50b7cb1126203b192f588f500c5e0589c08","src/config.rs":"3e322bdab94855e17427187ffe92a59c1a64c9175d5e1f8605df2f6409a3c93f","src/context.rs":"43bab81026b6f1a2509d129e806fffd09ba80110d656798a02589985017a3c21","src/error.rs":"7f56c3ae167811c5a8413b73a7e6abcec2377c67cf48e7520929e15532678eef","src/jexl_filter.rs":"48a9d960e05dae444421f7c4ceeb45eab656f03f1e7071215c8e8d39aab56b54","src/lib.rs":"3e1cb064a01dd566b2359aaf25ede52251f033f05ea43afdd38fd62631b991c1","src/macros.rs":"6b06d0ba42ee95235bfd71bac1a0eed02f60c894775ebee64165648b10e932c4","src/schema.rs":"348e0d5ad1840aaae796b537d21381ef91bd75be262138bfec376d9f88d205b3","src/service.rs":"e917b3f0e9bfa53c7f8ca9c87fb8ca1d868800611955c216bf188d4cbf321bb4","src/signatures.rs":"5dc590aac827b03b144e0d98b8ed71998651aaf6bd09d29c9aef1d4c82cba23c","src/storage.rs":"c33dd92914770e96d3d44dbb9e95f512ce54261710a42c7cf4a896be348c529e","uniffi.toml":"bd7cc0e7c1981f53938f429c4f2541ac454ed4160a8a0b4670659e38acd23ee5"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"9fa186d81541e67cf3a622845782101de9e44de3a43fb27dfb905e183a182876","dumps/main/attachments/regions/world":"00b308033d44f61612b962f572765d14a3999586d92fc8b9fff2217a1ae070e8","dumps/main/attachments/regions/world-buffered":"1d3ed6954fac2a5b31302f5d3e8186c5fa08a20239afc0643ca5dfbb4d8a86fc","dumps/main/attachments/regions/world-buffered.meta.json":"914a71376a152036aceccb6877e079fbb9e3373c6219f24f00dd30e901a72cce","dumps/main/attachments/regions/world.meta.json":"2a47d77834997b98e563265d299723e7f7fd64c8c7a5731afc722862333d6fbd","dumps/main/attachments/search-config-icons/001500a9-1a6c-3f5a-ba15-a5f5a075d256":"fdadf15c6eae7933c3d254ae6311112e0bc8a422c38c758189dbe6a4d7f6b718","dumps/main/attachments/search-config-icons/001500a9-1a6c-3f5a-ba15-a5f5a075d256.meta.json":"6ed1e1c390a45360590e5a1e6d7823218e7b10860581646ddb5e368143aa72fc","dumps/main/attachments/search-config-icons/06cf7432-efd7-f244-927b-5e423005e1ea":"b75ef04a805325e303c4195833cdd077d3d406f360b25b72502fc55880b9150b","dumps/main/attachments/search-config-icons/06cf7432-efd7-f244-927b-5e423005e1ea.meta.json":"0d4cce0ed0dc6b2c46651bea32fc3cc2facfe8b341e1022b65f2cd2231f6b713","dumps/main/attachments/search-config-icons/0a57b0cf-34f0-4d09-96e4-dbd6e3355410":"a7493c6a9d70d60acccf73f62dcbc127a580469570aee60b7482cd42cdb59f69","dumps/main/attachments/search-config-icons/0a57b0cf-34f0-4d09-96e4-dbd6e3355410.meta.json":"d33a128c92b96af2e643158ed3b861d3726bd67a59907fed0795ab2210c82b96","dumps/main/attachments/search-config-icons/0d7668a8-c3f4-cfee-cbc8-536511528937":"7042293af6b04e421cb7b68dc599ac644b76939cdcf5970159e44f658dd6a0cc","dumps/main/attachments/search-config-icons/0d7668a8-c3f4-cfee-cbc8-536511528937.meta.json":"d6523508334a67b201326591606d7e225a04fc53fdce2c1b4d8afac1b41af6b0","dumps/main/attachments/search-config-icons/0eec5640-6fde-d6fe-322a-c72c6d5bd5a2":"64800e32b24b2c8c0582750e1657426d56abd74b65682e20e892f82710d120b6","dumps/main/attachments/search-config-icons/0eec5640-6fde-d6fe-322a-c72c6d5bd5a2.meta.json":"56fb61a078cc45abf7bc3b8fe89b60ef75f3b86ea61d63084749607c4662bbef","dumps/main/attachments/search-config-icons/101ce01d-2691-b729-7f16-9d389803384b":"62d2faa3a8322b1f643aab6e045837500ebe3049c5cb140cb44c4dfc7290337a","dumps/main/attachments/search-config-icons/101ce01d-2691-b729-7f16-9d389803384b.meta.json":"de134ed423a2bd92b4ad8cdf631aad6a83cc2c30f8df9ee251a435ee9f46f28f","dumps/main/attachments/search-config-icons/177aba42-9bed-4078-e36b-580e8794cd7f":"3b88f3ef3cbfaed127d679ec7e44a44fe8dcad688feb89a70a1a9447c1460d15","dumps/main/attachments/search-config-icons/177aba42-9bed-4078-e36b-580e8794cd7f.meta.json":"c35210da5afc11b3af156baf46c23fa523dafac7e8cb2738b4caef80ed48c72e","dumps/main/attachments/search-config-icons/25de0352-aabb-d31f-15f7-bf9299fb004c":"828c3ca82e9be483ae583e5a705dde57b24fd8431e192e3a2d0809871992afa5","dumps/main/attachments/search-config-icons/25de0352-aabb-d31f-15f7-bf9299fb004c.meta.json":"aa5483b5c65427c028a676b2fc13892f6fcaf602613183962744c43ca146d86a","dumps/main/attachments/search-config-icons/2bbe48f4-d3b8-c9e0-86e3-a54c37ec3335":"723ac3228124926537d5a61284d60e198a52895195f9f69b967c578ef7a012ad","dumps/main/attachments/search-config-icons/2bbe48f4-d3b8-c9e0-86e3-a54c37ec3335.meta.json":"d754b38d7e2f79e651d5fe110a7bb9855e0f7269e177be6d047453a36a52a4c5","dumps/main/attachments/search-config-icons/2e835b0e-9709-d1bb-9725-87f59f3445ca":"16ea89d4baa39529d7a84d5152867a4c6ed6867198c4dfa1648b1f43ce6a3f6f","dumps/main/attachments/search-config-icons/2e835b0e-9709-d1bb-9725-87f59f3445ca.meta.json":"7edb361a6610fdabb431a58bc170b7df3f179ca1fadebae6f2e98777b64b35c5","dumps/main/attachments/search-config-icons/2ecca3f8-c1ef-43cc-b053-886d1ae46c36":"774f0a7a613c6c5bea642e3628fa7436851de79e7da9713ad0c96d5db7f44300","dumps/main/attachments/search-config-icons/2ecca3f8-c1ef-43cc-b053-886d1ae46c36.meta.json":"194cb07dd29fd66121f05bbef38291e894291adcbc4c63c373b5f72f6f2e245e","dumps/main/attachments/search-config-icons/32d26d19-aeb0-5c01-32e8-f8970be9246f":"a64f553b79fbb8c45734310dac401ad253ccd05aeabfa58bb5541daa6d8caf70","dumps/main/attachments/search-config-icons/32d26d19-aeb0-5c01-32e8-f8970be9246f.meta.json":"6e56cf6a9470f575b283e40ed6a049e9dbffadcb59fa74a0f941b431c444d795","dumps/main/attachments/search-config-icons/39d0b17d-c020-4890-932f-83c0f6ed130b":"4f409c3ffc67cfa870b05e4089b6ffc3fc81448fa60afba447f0177cd1192b1e","dumps/main/attachments/search-config-icons/39d0b17d-c020-4890-932f-83c0f6ed130b.meta.json":"686c72d6cd220285d8b97af55474198027eab1b1af7ed89508c8935c9e00e7d4","dumps/main/attachments/search-config-icons/41135a88-093d-4077-873b-9de1ae133427":"c2718c5e416670426475dd8cc496f5464bf95224e8f8f0a72b695360ddc917c0","dumps/main/attachments/search-config-icons/41135a88-093d-4077-873b-9de1ae133427.meta.json":"a941fc27ca88b56eccbdec380ce2d3b911f4c62e4aba1f5399bc4498c6601d94","dumps/main/attachments/search-config-icons/41f0d805-3775-4988-8d8c-5ad8ccd86d1c":"755b8939c63b1fcc9acd05cd33ffed675397516d37b5bd8f3a03875e25d3fb43","dumps/main/attachments/search-config-icons/41f0d805-3775-4988-8d8c-5ad8ccd86d1c.meta.json":"25cafe7d629c6b006e15dee98987c26ef509f348ed0350a3ccf1f06838db86f3","dumps/main/attachments/search-config-icons/47da97b5-600f-c450-fd15-a52bb2169c11":"d7fdfd971d874f2ec6f209df6f6b8173d126cd3f7a25daacb94de4259efbcf16","dumps/main/attachments/search-config-icons/47da97b5-600f-c450-fd15-a52bb2169c11.meta.json":"e6b95ca29bf3e750819cf890ae8e879ac506d54b918c3c0ab065adc16a131188","dumps/main/attachments/search-config-icons/48c72361-cd67-412e-bd7f-f81a43c10791":"92da7ef030e1d3ed97235748156383e5d75fa6d2744bd124334ab47dc0b689a1","dumps/main/attachments/search-config-icons/48c72361-cd67-412e-bd7f-f81a43c10791.meta.json":"21d1320d60c981b9c9248b9b186fc49f9d95046a817d7a3145f48465236087e8","dumps/main/attachments/search-config-icons/4e271681-3e0f-91ac-9750-03f665efc171":"189ed3031a2cefd3150c9e5b37bee1ffbc1f7850f7ac0621e4b8d262f2c1048c","dumps/main/attachments/search-config-icons/4e271681-3e0f-91ac-9750-03f665efc171.meta.json":"0a401871b82f1c1cbca91232fd643be1cc1a76c07a48830eaa2a47cdfafb1f14","dumps/main/attachments/search-config-icons/50f6171f-8e7a-b41b-862e-f97397038fb2":"9140bd1b30953f41bc758d2c0ecc873f5163e4f51126c278991eccd38589c541","dumps/main/attachments/search-config-icons/50f6171f-8e7a-b41b-862e-f97397038fb2.meta.json":"805d8ce33bac4611ce12d1f84ef431313555d76bf996264736e401ceb6dabe98","dumps/main/attachments/search-config-icons/5203dd03-2c55-4b53-9c60-58258d587be1":"adb29f6fd95956401630d94967381ac473f57215d96a5bcf500a00e747731380","dumps/main/attachments/search-config-icons/5203dd03-2c55-4b53-9c60-58258d587be1.meta.json":"27a6f994c2c7653a33d380ac13c4cfbc00f543a92f229426aa71d85b1f968357","dumps/main/attachments/search-config-icons/5914932e-66ba-4126-8be5-d37beadd9532":"02f54211387baa59e4246356dc7344e48f39a412f2e5993d7f403aa538df7276","dumps/main/attachments/search-config-icons/5914932e-66ba-4126-8be5-d37beadd9532.meta.json":"2df77daeeef5892fdb7fdeecffb804638bd0d2f7da5b9e617f01303d786dcd09","dumps/main/attachments/search-config-icons/5ded611d-44b2-dc46-fd67-fb116888d75d":"877fb3aca13d2a7c656df1f94df3fa052afbb40b65c99ba5382392ff5499016e","dumps/main/attachments/search-config-icons/5ded611d-44b2-dc46-fd67-fb116888d75d.meta.json":"d1c75915fdc86461e755cd08e670b01da41cd3d76688afe692f841733a9b7ee0","dumps/main/attachments/search-config-icons/5e03d6f4-6ee9-8bc8-cf22-7a5f2cf55c41":"9cd3da38e3938549434d1c3cba6fed249ffa7d91d9a6d7ffb5f4184f527cac76","dumps/main/attachments/search-config-icons/5e03d6f4-6ee9-8bc8-cf22-7a5f2cf55c41.meta.json":"8506d9438825f2dc34875e04e0212e22a2652c5c43aa93e4d184d59ec765316f","dumps/main/attachments/search-config-icons/6644f26f-28ea-4222-929d-5d43a02dae05":"4f1bfbfec1441bd9a304ca7f3b8fd54130e94df185f7b28bb17c86ba517e13b7","dumps/main/attachments/search-config-icons/6644f26f-28ea-4222-929d-5d43a02dae05.meta.json":"f7d37f9c8b87480539cd981f463790c99ed15b2ffc5e3ff4786dd11c25228df4","dumps/main/attachments/search-config-icons/6d10d702-7bd6-1452-90a5-3df665a38f66":"f895a965b68d02e7391cc4504d9be75e1ba7f9b50a1dd59af77bb44a7769c08c","dumps/main/attachments/search-config-icons/6d10d702-7bd6-1452-90a5-3df665a38f66.meta.json":"d782d80f8187cf8051be89c6b8a1ef4700e0b84dcda006843d1fd2f266c4419b","dumps/main/attachments/search-config-icons/6e36a151-e4f4-4117-9067-1ca82c47d01a":"e9849089ffced59563896974afee0fceedac7fc8455bbeaa5bae230f54c933d9","dumps/main/attachments/search-config-icons/6e36a151-e4f4-4117-9067-1ca82c47d01a.meta.json":"0e5a64c06ea0ae875e8e0fdc850feddf5a8714b8290293dcd100d455de32ace0","dumps/main/attachments/search-config-icons/6f4da442-d31e-28f8-03af-797d16bbdd27":"dd5cab3711f778677859e86000a127ed07a6175e8e58aecb0fba71b825ce76d7","dumps/main/attachments/search-config-icons/6f4da442-d31e-28f8-03af-797d16bbdd27.meta.json":"0a947797180fdaf031a9c2d2f841b88243c90ff85f0af873f99ddd770fc59e8b","dumps/main/attachments/search-config-icons/7072564d-a573-4750-bf33-f0a07631c9eb":"0a653ea57472694ac05623d9b237e479232a0d65683d05f89661f996054e3276","dumps/main/attachments/search-config-icons/7072564d-a573-4750-bf33-f0a07631c9eb.meta.json":"bb8a256f72b37166fea2ecd4c3a59f49615854a7210e6963f2571f8dcb3d3a3f","dumps/main/attachments/search-config-icons/70fdd651-6c50-b7bb-09ec-7e85da259173":"31a793dad95b5ffd02d39ebf14fc40877596f418f5926247487265034181dc8f","dumps/main/attachments/search-config-icons/70fdd651-6c50-b7bb-09ec-7e85da259173.meta.json":"8c744e9d2f218256e63f1b1a2193f2fc4a7b980e72464e8d57fbe150446f2efc","dumps/main/attachments/search-config-icons/71f41a0c-5b70-4116-b30f-e62089083522":"5aad083bfcef256d433c1ffa571b814d16f61832bcd7565bf03909011f6a0bfc","dumps/main/attachments/search-config-icons/71f41a0c-5b70-4116-b30f-e62089083522.meta.json":"4a8f0c4e4ee643faa2f8d8cc4ddb8f87d14c740e8c9252223f826181c0117741","dumps/main/attachments/search-config-icons/74793ce1-a918-a5eb-d3c0-2aadaff3c88c":"ca8f102ac4f35189ebcb786d080843b603b234f89b8d8b1c0ef27a0ab7148182","dumps/main/attachments/search-config-icons/74793ce1-a918-a5eb-d3c0-2aadaff3c88c.meta.json":"60a7975cd79156623b0ca58be4110d152e50b6e9caaaa211dad1cd37eabb0345","dumps/main/attachments/search-config-icons/74f94dc2-caf6-4b90-b3d2-f3e2f7714d88":"3376e14529ed2e96c7dc491b3bf11914d7c8ff47a068311b2432c086c2ae0f28","dumps/main/attachments/search-config-icons/74f94dc2-caf6-4b90-b3d2-f3e2f7714d88.meta.json":"3a94a78a846f312c85c0609971b153aaba9819e2b657f25e3b0648a3956933d1","dumps/main/attachments/search-config-icons/764e3b14-fe16-4feb-8384-124c516a5afa":"71413ef23ac14ce2b7bb76f7f5d16b2df267239841a88ddab36b129481e00616","dumps/main/attachments/search-config-icons/764e3b14-fe16-4feb-8384-124c516a5afa.meta.json":"2f16dd51ade97a327d4e5f14d689f822a5c9061b9b27810bbccbf2f406a5e56f","dumps/main/attachments/search-config-icons/7bf4ca37-e2b8-4d31-a1c3-979bc0e85131":"912d20feefcba57d43bffff5e245b8c1e3865155ed686d8ad253bbab71116e83","dumps/main/attachments/search-config-icons/7bf4ca37-e2b8-4d31-a1c3-979bc0e85131.meta.json":"3ec071b0a2940cd8892a72bd28d44237aecfd20d88303661348257ddb98aee43","dumps/main/attachments/search-config-icons/7c81cf98-7c11-4afd-8279-db89118a6dfb":"e988445d87afe0d285bea251705fc23eb70ac42426ab0d7a69d9276585c5573c","dumps/main/attachments/search-config-icons/7c81cf98-7c11-4afd-8279-db89118a6dfb.meta.json":"273dd09cad2a62459cc062e3b39b835d55a06b10cb7d5149aad77dd55451821f","dumps/main/attachments/search-config-icons/7cb4d88a-d4df-45b2-87e4-f896eaf1bbdb":"8dc2e75e6792b8374b20621fa2151ac24b4626e5c1f6a1abec4f912746441859","dumps/main/attachments/search-config-icons/7cb4d88a-d4df-45b2-87e4-f896eaf1bbdb.meta.json":"21d2522ab4e47477e72da3a2d2223e50e55fef442e2ba736d56df1e09593d76f","dumps/main/attachments/search-config-icons/7edaf4fe-a8a0-432b-86d2-bf75ebe80851":"27541cb376bdda829a6cf9cefd13da112728881e3daa4ac3c1178d4ce15f1e8b","dumps/main/attachments/search-config-icons/7edaf4fe-a8a0-432b-86d2-bf75ebe80851.meta.json":"3aea5d0652172940ac33e32628dcc6a03b79fe686c6de752482c8e3ae5cd70eb","dumps/main/attachments/search-config-icons/7efbed51-813c-581d-d8d3-f8758434e451":"b0c6d1850265e3c946917232ca6c6ace3dad23347bfab4f81351eac569326d34","dumps/main/attachments/search-config-icons/7efbed51-813c-581d-d8d3-f8758434e451.meta.json":"5a723c8f04bffa33a69a7054d30a4816caf1a3924081c85e1d9770126f761a96","dumps/main/attachments/search-config-icons/84bb4962-e571-227a-9ef6-2ac5f2aac361":"a1fd5d127a5f2590ddcd439b7a2abb3456b48217ea11daf0345b26e108f520e6","dumps/main/attachments/search-config-icons/84bb4962-e571-227a-9ef6-2ac5f2aac361.meta.json":"5cb0ebdde367b9754ddf6cbd01150414d27977b2d4c5f65cd6bbb89989388f3b","dumps/main/attachments/search-config-icons/87ac4cde-f581-398b-1e32-eb4079183b36":"33ca72f1eac56793d1fd811189cedef98004a067c85b1143083b564814a4b0db","dumps/main/attachments/search-config-icons/87ac4cde-f581-398b-1e32-eb4079183b36.meta.json":"d97eca8063cc17b99c81c55d4ff121d765c793e006ed252fec5f9539bd0fc339","dumps/main/attachments/search-config-icons/8831ce10-b1e4-6eb4-4975-83c67457288e":"ca3cc8786977f6ffeb0546ff8f3bb2b7fd240d1956fbf86777dbf0e8bec9c03b","dumps/main/attachments/search-config-icons/8831ce10-b1e4-6eb4-4975-83c67457288e.meta.json":"45274d848d1f6d398563bb46a2bfa3eee40ff16a5dbf0bbc8904db442f80702c","dumps/main/attachments/search-config-icons/890de5c4-0941-a116-473a-5d240e79497a":"6ba1f0fd1d12014cab32f74daab24dfa16fb26613ace20a1e595267621038a07","dumps/main/attachments/search-config-icons/890de5c4-0941-a116-473a-5d240e79497a.meta.json":"107547059360c3658dcf187a546ffb52bb23fa385e1338151043bebe82bbf640","dumps/main/attachments/search-config-icons/8abb10a7-212f-46b5-a7b4-244f414e3810":"f8780adb4d7b28f2f881db4ca7b697d8fc916cd9fa834ccc445fe7d4b72a6cc7","dumps/main/attachments/search-config-icons/8abb10a7-212f-46b5-a7b4-244f414e3810.meta.json":"5401603c7abbc6ca5bdddb8f9cca7eee2e26e5721cc73f23d95f600d5421d431","dumps/main/attachments/search-config-icons/91a9672d-e945-8e1e-0996-aefdb0190716":"5d53ef1866a08cc29011f5f2a9ce99bbf37cf42e80de7f0e8cc30d13337e8187","dumps/main/attachments/search-config-icons/91a9672d-e945-8e1e-0996-aefdb0190716.meta.json":"4e8ea36e3d659eb22ac7c86498003ca8885bab9c40685bb8ca7796a8230201da","dumps/main/attachments/search-config-icons/94a84724-c30f-4767-ba42-01cc37fc31a4":"98dca7e24cad0a1be96ef2c323e9759beb63c72440756f887e2482d9ce8e8969","dumps/main/attachments/search-config-icons/94a84724-c30f-4767-ba42-01cc37fc31a4.meta.json":"1070966901fe9db82b71bfa74ddeedd4f23ab2ed1eddaf201634e06a604e6006","dumps/main/attachments/search-config-icons/96327a73-c433-5eb4-a16d-b090cadfb80b":"ca6e972004f62355c1ea97656bc2328e1643971bdecab9c6b563d45593b8122e","dumps/main/attachments/search-config-icons/96327a73-c433-5eb4-a16d-b090cadfb80b.meta.json":"c4e3c9e6426e6f35410c287eef95b3e2134e54409e462f02dd440876c06b1bb4","dumps/main/attachments/search-config-icons/9802e63d-05ec-48ba-93f9-746e0981ad98":"6b1b073183eb0012daea0dce351a94d395c8a0b531b610e56eac52b3d1d1da0e","dumps/main/attachments/search-config-icons/9802e63d-05ec-48ba-93f9-746e0981ad98.meta.json":"cceb55c68db8dddd23d064364a281e982069bfe2bb55eba7d282fffcec2aa89f","dumps/main/attachments/search-config-icons/9d96547d-7575-49ca-8908-1e046b8ea90e":"6a743574353de0ec7c85b49f46b2b554caa0fc1d064b90544c5dea0fea2b8901","dumps/main/attachments/search-config-icons/9d96547d-7575-49ca-8908-1e046b8ea90e.meta.json":"10897754c5aafe0b84413afee5e9948fd799262a26aa07bca85fe6fb369beac4","dumps/main/attachments/search-config-icons/a06db97d-1210-ea2e-5474-0e2f7d295bfd":"617dec5d635efb0a12d0de935c6999ef0249f4a63c62bdcb96551518bc3d1812","dumps/main/attachments/search-config-icons/a06db97d-1210-ea2e-5474-0e2f7d295bfd.meta.json":"06cf576ca882bd7c2d54c18329e21e5b1a9cb7732d4954b52cbfa52979a67765","dumps/main/attachments/search-config-icons/a06dc3fd-4bdb-41f3-2ebc-4cbed06a9bd3":"d994f806b1e4225b50be5ab681b2cecf845cc216a19a432d878cea3cb815bafd","dumps/main/attachments/search-config-icons/a06dc3fd-4bdb-41f3-2ebc-4cbed06a9bd3.meta.json":"67524e18799023a017c7d9db1b9ba5c9cc3090d20f8154449a8f44ba22719104","dumps/main/attachments/search-config-icons/a2c7d4e9-f770-51e1-0963-3c2c8401631d":"1bf68aca7bfc75ca8485c3dac9a1daa13c1a3eb480688c32262096af6076adfa","dumps/main/attachments/search-config-icons/a2c7d4e9-f770-51e1-0963-3c2c8401631d.meta.json":"4ab103bba0f8fde581c3950c6c08cfcf6786104d8cbcba240499308f26958d04","dumps/main/attachments/search-config-icons/a83f24e4-602c-47bd-930c-ad0947ee1adf":"66612f999921d892645c8a2b37aa5dad17b134e7fdaed375a683baec7fc10697","dumps/main/attachments/search-config-icons/a83f24e4-602c-47bd-930c-ad0947ee1adf.meta.json":"f985ffbde6cf6ef972b6798c9336922dcfa29ca9a31e3aa4fae1962e069bdb0c","dumps/main/attachments/search-config-icons/b64f09fd-52d1-c48e-af23-4ce918e7bf3b":"c3e8300801c5c585662f14fd8e819d635efd9830783dc3c631212927866e9898","dumps/main/attachments/search-config-icons/b64f09fd-52d1-c48e-af23-4ce918e7bf3b.meta.json":"f7fd846d6717131e75865f8f5ed562e88f40be3dcf1603f2660b425dedabc7d1","dumps/main/attachments/search-config-icons/b882b24d-1776-4ef9-9016-0bdbd935eda3":"076352591c7077af4af5771918f80b5da9c6bf479327cc68390abdb158f3ec03","dumps/main/attachments/search-config-icons/b882b24d-1776-4ef9-9016-0bdbd935eda3.meta.json":"229139bca53bc63bd59b8f261f36c11fbe76b2b45dfeac2580261cf290c41365","dumps/main/attachments/search-config-icons/b8ca5a94-8fff-27ad-6e00-96e244a32e21":"1474c93e49c209aca2a2df2acb61b64574805106bead6edebd67287de21920e0","dumps/main/attachments/search-config-icons/b8ca5a94-8fff-27ad-6e00-96e244a32e21.meta.json":"6fd72c11afb4249d0166d8d98c552ee02d73c0e07f0578bfd3d7e67d70bcaee3","dumps/main/attachments/search-config-icons/b9424309-f601-4a69-98ca-ca68e65633e6":"601d72e7abde5ec864b3d8ca0031896f769107670b84c66053062481a56d8665","dumps/main/attachments/search-config-icons/b9424309-f601-4a69-98ca-ca68e65633e6.meta.json":"f299a7d56c5552fc592c66073d3e1e1d16ce4a99e935dcc0cad7dafcad6b9e3b","dumps/main/attachments/search-config-icons/c411adc1-9661-4fb5-a4c1-8cfe74911943":"150765e8e9b985ba5b820ac9b8e7623023d5a0e24f94663d5e9203d8d7598059","dumps/main/attachments/search-config-icons/c411adc1-9661-4fb5-a4c1-8cfe74911943.meta.json":"c5cc89d5f24ef1fa40b1c47c2e97eaeb01439b8d3b186b9c2fe716c94ead30f2","dumps/main/attachments/search-config-icons/cbf9e891-d079-2b28-5617-283450d463dd":"5b2c34b3c4e8dd898b664dba6c3786e2ff9869eff55d673aa48361f11325ed07","dumps/main/attachments/search-config-icons/cbf9e891-d079-2b28-5617-283450d463dd.meta.json":"b757806fd1b922d81bbecab94c73d3db98cfc2aa2791a4d5137112f795a732ee","dumps/main/attachments/search-config-icons/d87f251c-3e12-a8bf-e2d0-afd43d36c5f9":"865d76c8175a8f11dedc93f0bc212242a97a8a76adac870e8249368cecc81402","dumps/main/attachments/search-config-icons/d87f251c-3e12-a8bf-e2d0-afd43d36c5f9.meta.json":"22594c8870cbabe5fc5d2637509235202502661b466e9e37c5878716f323a34f","dumps/main/attachments/search-config-icons/db0e1627-ae89-4c25-8944-a9481d8512d9":"97a68f0b948b68bbf389a9ef43e2fe6c31ff8dc7889c939fdfdea79378576c67","dumps/main/attachments/search-config-icons/db0e1627-ae89-4c25-8944-a9481d8512d9.meta.json":"1eccc999dcd377af84cf63ed60b7ef23d5d4b936a1e465d12349a5366b1b012d","dumps/main/attachments/search-config-icons/e02f23df-8d48-2b1b-3b5c-6dd27302c61c":"247aa26993083705ce99a8e5612cdf262aca98cde86ba19afc964329ba95986a","dumps/main/attachments/search-config-icons/e02f23df-8d48-2b1b-3b5c-6dd27302c61c.meta.json":"06fc893d29cf406519611da9d1993a13bd9134192940c12bf64536ea571db4f0","dumps/main/attachments/search-config-icons/e718e983-09aa-e8f6-b25f-cd4b395d4785":"809697f48848e7c3638d5f3e0b224ea60b3800504e7bd8417854d55989b85196","dumps/main/attachments/search-config-icons/e718e983-09aa-e8f6-b25f-cd4b395d4785.meta.json":"0d9baef39747776500e5b83e72cd9d901fc09ac08247368dd2117bb4ec011f54","dumps/main/attachments/search-config-icons/e7547f62-187b-b641-d462-e54a3f813d9a":"c971ee33b8c0a57349669d957bf73070b0632b128c94748e845b57d5e15221a4","dumps/main/attachments/search-config-icons/e7547f62-187b-b641-d462-e54a3f813d9a.meta.json":"8ec4f6a7826966f2ff82632ef527366db3452ebc40c90a557602111f0ea956c9","dumps/main/attachments/search-config-icons/eb62e768-151b-45d1-9fe5-9e1d2a5991c5":"aa46b3d1ed8557e5bc7e71988cc6c46b00363b890d2a781973f9dc9073f8dd31","dumps/main/attachments/search-config-icons/eb62e768-151b-45d1-9fe5-9e1d2a5991c5.meta.json":"a06682b589df8dd63b1f25c01630ead55a89217f72c0bc04b391829af3fef59f","dumps/main/attachments/search-config-icons/f312610a-ebfb-a106-ea92-fd643c5d3636":"91d17ba44192a6430ffdb447ff3a11533ef964628f67c13480cc9470212d3d65","dumps/main/attachments/search-config-icons/f312610a-ebfb-a106-ea92-fd643c5d3636.meta.json":"ce26ab2382a7a67a55688330dd74127b4a980610f4030bde8eaaa20b81306559","dumps/main/attachments/search-config-icons/f943d7bc-872e-4a81-810f-94d26465da69":"69e0131f3e85657f827eb4ad3f01c25cf17540fe2db15c7e756f4dcfc1853dd2","dumps/main/attachments/search-config-icons/f943d7bc-872e-4a81-810f-94d26465da69.meta.json":"2e29a77bc8758ac3674f3a94b42fb871171fc53ae45bcb1fec6527c787758a23","dumps/main/attachments/search-config-icons/fa0fc42c-d91d-fca7-34eb-806ff46062dc":"6da5620880159634213e197fafca1dde0272153be3e4590818533fab8d040770","dumps/main/attachments/search-config-icons/fa0fc42c-d91d-fca7-34eb-806ff46062dc.meta.json":"0c3c0eb832be884f25186395b8bf08cdbe0a6e2845b9e55e7cbea5d0f183ed7d","dumps/main/attachments/search-config-icons/fca3e3ee-56cd-f474-dc31-307fd24a891d":"c4d88cfa5262f6d2cf76b167281d25821c9e1770684b739ed6ad3cf7277a121b","dumps/main/attachments/search-config-icons/fca3e3ee-56cd-f474-dc31-307fd24a891d.meta.json":"a40c37a5150e3745849f67305fe2fe1e06ef1c3901f6dc604a8e3f6c94e7b624","dumps/main/attachments/search-config-icons/fe75ce3f-1545-400c-b28c-ad771054e69f":"3a9d06951c7c9d2c19cd00533a760b0f8755b1e2e718af81c710297d030fbe44","dumps/main/attachments/search-config-icons/fe75ce3f-1545-400c-b28c-ad771054e69f.meta.json":"3f353e083d7a885f6d59d36c9276a2d325686a533cf8c502cd41a10172e763ea","dumps/main/attachments/search-config-icons/fed4f021-ff3e-942a-010e-afa43fda2136":"d7fdfd971d874f2ec6f209df6f6b8173d126cd3f7a25daacb94de4259efbcf16","dumps/main/attachments/search-config-icons/fed4f021-ff3e-942a-010e-afa43fda2136.meta.json":"740f77dcc93ece89fd55557baf399a4464373c81154b0a9758b8622f6c458253","dumps/main/attachments/translations-wasm/4fd32605-9889-4dd9-9fc7-577ad1136746":"a3a89d9ad0a4ed8f27bf3e403701b23f5709816f6376438503f2fa5b0182c2dc","dumps/main/attachments/translations-wasm/4fd32605-9889-4dd9-9fc7-577ad1136746.meta.json":"443145b56a534c87db789181355536a2a60062b74ef6de9aa7bdb38bc33c328e","dumps/main/regions.json":"e8990158373f82d3f89fed5089cf29e4177cc85904479128728e05025e9a0c0c","dumps/main/regions.timestamp":"a0109417e42fae00eee42898223a4e4eeadc8d0567ad0aa5a379ced494aac5bf","dumps/main/search-config-icons.json":"9b83df4a7c80c7136917f4ae89624c7f5fc25bb710d77e487d53178c5543c9fb","dumps/main/search-config-icons.timestamp":"eb8bfe4d2b9fce7cde34b9f41f513664015a86ba35254a3524df327b8a29080b","dumps/main/search-config-v2.json":"4a409b410fbb5cf72443cae17c76181ef5852b75d219e90db2af8a7141aa9ed3","dumps/main/search-config-v2.timestamp":"912e3976dc7e6bfd5585322ae4375962ec220148815799fcc949982449872beb","dumps/main/search-telemetry-v2.json":"405b6a0e198f5cc2d2a4e484a5ccd2ca269bd5e08d03857cdc8e102c35f58708","dumps/main/search-telemetry-v2.timestamp":"95f877d4333a744273784096aa9a87f381c40f44bcbd539d17d3686874fae9f9","dumps/main/summarizer-models-config.json":"2785f498567aebcc2c3157b360a06970b8174815506a6e018c4cf9130d150002","dumps/main/summarizer-models-config.timestamp":"a1a521e82e18713743a7c6b7c437072a1b371019fd933ca8138938cd52f1d728","dumps/main/translations-models.json":"2445d5664eab4b3719094532cc36b1c22fa11a64a010d82158cbd9f477e16125","dumps/main/translations-models.timestamp":"d0b4624dcc17bd16572d34e64161ddcc5365d8ce8880f82e6e44e9063efba8dd","dumps/main/translations-wasm.json":"08f51644de84bb00ad059d131bef1621028ff802d5014a5c1c63c42c70e18fd3","dumps/main/translations-wasm.timestamp":"e2f810185686f4fd61c898403428ed17dafa3402272a2dcd585df732527eff89","src/cache.rs":"c6179802017b43885136e7d64004890cc13e8c2d4742e04073cf404b578f63db","src/client.rs":"259e79368110ce96a9e837f73b5f1eb294c4fd7735d837613a28d0a2e15c01dc","src/config.rs":"3e322bdab94855e17427187ffe92a59c1a64c9175d5e1f8605df2f6409a3c93f","src/context.rs":"43bab81026b6f1a2509d129e806fffd09ba80110d656798a02589985017a3c21","src/error.rs":"7f56c3ae167811c5a8413b73a7e6abcec2377c67cf48e7520929e15532678eef","src/jexl_filter.rs":"48a9d960e05dae444421f7c4ceeb45eab656f03f1e7071215c8e8d39aab56b54","src/lib.rs":"3e1cb064a01dd566b2359aaf25ede52251f033f05ea43afdd38fd62631b991c1","src/macros.rs":"a16189ed0c6de18d1c66ee9204edc56541d1b987513eb7491c2472a962263f51","src/schema.rs":"348e0d5ad1840aaae796b537d21381ef91bd75be262138bfec376d9f88d205b3","src/service.rs":"e917b3f0e9bfa53c7f8ca9c87fb8ca1d868800611955c216bf188d4cbf321bb4","src/signatures.rs":"5dc590aac827b03b144e0d98b8ed71998651aaf6bd09d29c9aef1d4c82cba23c","src/storage.rs":"c33dd92914770e96d3d44dbb9e95f512ce54261710a42c7cf4a896be348c529e","uniffi.toml":"bd7cc0e7c1981f53938f429c4f2541ac454ed4160a8a0b4670659e38acd23ee5"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/remote_settings/Cargo.toml b/third_party/rust/remote_settings/Cargo.toml
index 03d1ed2208dbb..590c12dc3a854 100644
--- a/third_party/rust/remote_settings/Cargo.toml
+++ b/third_party/rust/remote_settings/Cargo.toml
@@ -82,7 +82,7 @@ features = ["derive"]
 path = "../support/sql"
 
 [dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 
 [dependencies.viaduct]
 path = "../viaduct"
@@ -106,5 +106,5 @@ features = ["preserve_order"]
 path = "../support/viaduct-dev"
 
 [build-dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 features = ["build"]
diff --git a/third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/7bbe6c5c-fdb8-2845-a4f4-e1382e708a0e b/third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/7bbe6c5c-fdb8-2845-a4f4-e1382e708a0e
deleted file mode 100644
index ba687ca8e70bcf096e238d6fedf374d6bc174bd1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5430
zcmZQzU}Ruo5D;Jh(h3Y2EDQ{43=9kk3K0GZpm-lpOamweWCB${#DNq815o@1BLsu_
zKtlZ0@Bf1dOFjDdS@Fu_N7%5$vu{7}xmEtw%NOAh5g)_D!~bK$VUdx~f#!d~Wroay
z_isWYBcEZ@3la;Bj(#Bd<m*>l`a$ASFMj-zx&Qt>HZ1Y-*I#^k#ewqnJ(Kr)l~o?X
zhAn3=IfPHY^7*^BaJd~OE_?UQTYP4i&s}=ZrLpY*Hf+9l)e(Gpamu~?^-uBA!+SCh
zKfJ-I1}PoN+<*68ck6-Ejvamb1Jcq@1LO1^$o*jv5icZP{P>Q`42c&%{{|%`Uj(ZC
z2lFoy{Vxb;7ATBy>6gC${!>_3_*bx=h=>n?=^1C7+WQXZZ9jMh=%x?2^dXDO-+b{B
z7!MDC_WVN@AFOOxIY2HADrXdc*a3(^<q;SF3!V+k5DXC*eC5nwjgL`x4NQFmEIa<F
zp16KpXXnwgq+r!EH*ZrKXTW;xTTo)s1*EbHYyE{w-Y>7<1hBjzyB;@Pvi2Y@vxyZ~
zKX~psx#3{EV&frV?ZKh$pYpjo_sO*%827(@^9zpv&Bj)55Q>Yh_PtXMl501zKB>o_
zzF=!N;1iR0{{0uS8AFu~Y#aSiK7ap?>hUYrNWn^%9+DmJu&@G#;rGDAl(RU}7NPk6
z?^RSvUb_g|<}q2m@c_AY!}O^iyL=1gA5v-R<Ue4W2dNE53LBjN3W^T{{qh&)9}?)_
z4xRmY+r`AX1tb4Gc>fMtKLlA!l0ct?Si6UkI*I2$eyN_gdevg#%6&#_w;qsq{_`g-
z-7k0J`BTHS+mE_6wCoE`Og;}x8()yqM__v9VW9m~X>Usb`*)iAPG7X0IQ@WMR_<|7
zpAp$ETx_{pukKP32KrkLoDGRjxC%7?H!eGHi9`EE-^jIJ{^s+SK(l}1G9Qol@8HCw
zOB#pHT_V?RkUpIqhe2^lu$%?P#S8!J+>>^bXCBl#aOSe)lP@^?f~2@d>e1(~p;1xy
z(cJJI<Ttmv=0nD7x1LnE@$4ljW|FEFRL5J-TzJrG)}lk|M=#xweE#D%sb-9-ADF(w
OXt)y&ci1?<K+ymVR@6-Z

diff --git a/third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/7bbe6c5c-fdb8-2845-a4f4-e1382e708a0e.meta.json b/third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/7bbe6c5c-fdb8-2845-a4f4-e1382e708a0e.meta.json
deleted file mode 100644
index 2f3be12d73d26..0000000000000
--- a/third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/7bbe6c5c-fdb8-2845-a4f4-e1382e708a0e.meta.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "location": "main-workspace/search-config-icons/4d6f988d-8905-4aa7-aeea-5b04a6197767.ico",
-  "hash": "24daa27a3234d01b5add42e027b0a34000d0ab47c17fe3924c2ca267b7b61c19",
-  "size": 5430
-}
\ No newline at end of file
diff --git a/third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/95ed201d-4ab8-4cb8-831d-454f53cab0f8 b/third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/95ed201d-4ab8-4cb8-831d-454f53cab0f8
deleted file mode 100644
index e5c76d29bde86028026f1eea4f569baff5f3a69e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1357
zcmV-T1+w~yP)<h;3K|Lk000e1NJLTq003YB003YJ0{{R3)kcR30005qP)t-s0002|
z>mK{+7yIfL`|20_>KFU!7yIfL{OmIO>KFX%GW+Tm`|20_>K9j6SN!ZU{p%M0?iK#*
z7E@DM|MC>l$ya`SVE^+IYiUnZR9IG4SINI$|L_!5Raj3@T2oY5Wn@-RQC(SCTv1V3
z^yMIXd1lkeVqINbUS3;bVp(WrQ@yoF>)kH-=o<g<7H4Q~UtnmRnPG&1VOv{U>fJ`|
z-XizsAo}Va|L+-;l5?J#XpxU-SXyJSt6*SYUyh1hzqndhSz1<BS=Y@}Y-&@|$VT+$
zH~8o$=GP?u@FV-`8nm!|cXxDdZgOdAakQ^%W@c)~z-ESnWwozlXJ=%+wqnxCUQ|_H
zcXeCN##+wBS95Y#Z*Eu8$4$+{OvSuR+RsYR#Y&x*NV%{=;MGC4tw7q(Kd`4f?B6)$
z*f{RsG4<v!;nXnl;wb#=BJSTIi-~*L(RhP_beNTMpPO-yjB&%fZ=;`XnU-yNcWu|u
zY`wQ^etl`@+-R1OXmoREYinj{X=SUXWNK+-sG?$OX<*sVU&+8<etTVNXj;p|R=l%R
z!MIVHl~Cc=POGF&myt}?%S*|>Ma8>C<JUvy+Cj|1LDk7V;M6^-pg8B*G1|;7|MDmL
z=_dH+83h3gwEzGB4RlgYQve3i`NeD-&%(fOZ}Taxu}J^`0}@F@K~!ko?V4p*+fW#Q
z16_+P;YQfjED6<BsF$|5`*3%LJIvkP-R-xoWrM)Z+U9L{&p11Ien6gk?|X8ed<a1h
z8QL5Ti2+THHiL+w%ObInrHigVlf+172B9Ufq9qQHSUEswNUUfG5;Lkm6{v#50<;AQ
z03<-d-0Y{tHy<M$jc^FiYPF+QtP47vfxbCfNFsp?kn09d{X#TXoUZ&5vbYgKe@(Dq
z)l<9RS;=R8x%hgyMBYnU0^znu{SMF9*&Ge!11^qc(iR{m6$f6FeCM9DY{m{O4S~x*
zB|tPAy8|=xjVpqDU_imTEQq_4TDxJa>~UCjfMzg8B}N{8$Hn)dHn4!MVX0)uL-D?7
zMnD0{wDXj5>iiL?fDGM&7^G1I6`-~13Q1IK=xl{wcHx$((oTt0wvociObR_fw9q_S
zHf*q)_+%RXI1LoY4$o5K>`brMXcjRDw#(zTY_`;tdL@0lo#;<7X(yARxu%}8;|_c6
z9}cYJD`3b853FQqdj8qfZsXqJ`|hLk1#+n)me5+?NuN9vQ%@Vb$;l6__)2+$!xjuy
zS+CI~Kma+g)_2oIQ_ouw2@t^8{bjTNKD<;xasjggorqM2OmEZ|Z1dn~d`8~N3W&gU
z#>noVPe7sB`}8|lK)<@9rxe3hTYv&oY~v{a`s)HrP-3NEm>WSoKqu@JkcS*dP!xm;
zoEDhC1Qi(8L4pYzR4@*Ue*Pm0hFA#`(C0-80)Nv3e9=62hal^}w+xPcq^3etx_tK1
z=M?TDx~Z%8kRr-QI1(<{YC5L~f!?>lQ3d~8fEZ<@9Q|*x=no!?F<20v`X(W@=$HPC
zeqjtY5mNi48y@|Meo^^V$NJsi=$l~CFT)*uX#sci0|MqIJDYJwe+49%w1Icf1{(6J
zfr7#N1z7aE^swhwg%L3Nek17l9~kIW5w09k{Hlrl3#mlE_`>iJB{T#EJSe5;3*2Ev
zaBB2b!5&n>|0vLqSUHIQw}(6uD|z^TJt1@$4VgM3N=9yWJ{GcbqwD_x&#f{MHU0F9
P00000NkvXXu0mjf%x;(d

diff --git a/third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/95ed201d-4ab8-4cb8-831d-454f53cab0f8.meta.json b/third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/95ed201d-4ab8-4cb8-831d-454f53cab0f8.meta.json
deleted file mode 100644
index 7d5c847fb15fb..0000000000000
--- a/third_party/rust/remote_settings/dumps/main/attachments/search-config-icons/95ed201d-4ab8-4cb8-831d-454f53cab0f8.meta.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "location": "main-workspace/search-config-icons/1229ffe4-7a6f-46d7-b664-5596df0aa730.png",
-  "hash": "3426b5100a6bdb45f8039f0c71a6b68193750ba7bae5b36e5ed31b2b7f372cda",
-  "size": 1357
-}
\ No newline at end of file
diff --git a/third_party/rust/remote_settings/dumps/main/regions.timestamp b/third_party/rust/remote_settings/dumps/main/regions.timestamp
new file mode 100644
index 0000000000000..60ae2308d5e38
--- /dev/null
+++ b/third_party/rust/remote_settings/dumps/main/regions.timestamp
@@ -0,0 +1 @@
+1600363002708
\ No newline at end of file
diff --git a/third_party/rust/remote_settings/dumps/main/search-config-icons.json b/third_party/rust/remote_settings/dumps/main/search-config-icons.json
index 4e4f1783772a5..7c0e10d6118f3 100644
--- a/third_party/rust/remote_settings/dumps/main/search-config-icons.json
+++ b/third_party/rust/remote_settings/dumps/main/search-config-icons.json
@@ -555,23 +555,6 @@
       "last_modified": 1744118264931,
       "schema": 1743687935690
     },
-    {
-      "attachment": {
-        "filename": "azerdict-16-firefox.ico",
-        "hash": "24daa27a3234d01b5add42e027b0a34000d0ab47c17fe3924c2ca267b7b61c19",
-        "location": "main-workspace/search-config-icons/4d6f988d-8905-4aa7-aeea-5b04a6197767.ico",
-        "mimetype": "image/x-icon",
-        "size": 5430
-      },
-      "engineIdentifiers": [
-        "azerdict"
-      ],
-      "filter_expression": "env.appinfo.OS != \"iOS\" && env.appinfo.OS != \"Android\"",
-      "id": "7bbe6c5c-fdb8-2845-a4f4-e1382e708a0e",
-      "imageSize": 16,
-      "last_modified": 1744118264831,
-      "schema": 1743687843227
-    },
     {
       "attachment": {
         "filename": "Icon%2016x16.svg",
@@ -774,23 +757,6 @@
       "last_modified": 1744118264941,
       "schema": 1743687940531
     },
-    {
-      "attachment": {
-        "filename": "azerdict_mobile.png",
-        "hash": "3426b5100a6bdb45f8039f0c71a6b68193750ba7bae5b36e5ed31b2b7f372cda",
-        "location": "main-workspace/search-config-icons/1229ffe4-7a6f-46d7-b664-5596df0aa730.png",
-        "mimetype": "image/png",
-        "size": 1357
-      },
-      "engineIdentifiers": [
-        "azerdict"
-      ],
-      "filter_expression": "env.appinfo.OS == \"iOS\" || env.appinfo.OS == \"Android\"",
-      "id": "95ed201d-4ab8-4cb8-831d-454f53cab0f8",
-      "imageSize": 96,
-      "last_modified": 1744118264962,
-      "schema": 1743687938695
-    },
     {
       "attachment": {
         "filename": "allegro-pl-16-firefox.ico",
@@ -1206,5 +1172,5 @@
       "schema": 1743687832067
     }
   ],
-  "timestamp": 1763049497744
+  "timestamp": 1765918784979
 }
\ No newline at end of file
diff --git a/third_party/rust/remote_settings/dumps/main/search-config-icons.timestamp b/third_party/rust/remote_settings/dumps/main/search-config-icons.timestamp
new file mode 100644
index 0000000000000..1ec63ac809f59
--- /dev/null
+++ b/third_party/rust/remote_settings/dumps/main/search-config-icons.timestamp
@@ -0,0 +1 @@
+1763049497744
\ No newline at end of file
diff --git a/third_party/rust/remote_settings/dumps/main/search-config-v2.timestamp b/third_party/rust/remote_settings/dumps/main/search-config-v2.timestamp
new file mode 100644
index 0000000000000..4451d3c5b24eb
--- /dev/null
+++ b/third_party/rust/remote_settings/dumps/main/search-config-v2.timestamp
@@ -0,0 +1 @@
+1764082724032
\ No newline at end of file
diff --git a/third_party/rust/remote_settings/dumps/main/search-telemetry-v2.timestamp b/third_party/rust/remote_settings/dumps/main/search-telemetry-v2.timestamp
new file mode 100644
index 0000000000000..541e3d4dd79f2
--- /dev/null
+++ b/third_party/rust/remote_settings/dumps/main/search-telemetry-v2.timestamp
@@ -0,0 +1 @@
+1757010621729
\ No newline at end of file
diff --git a/third_party/rust/remote_settings/dumps/main/summarizer-models-config.timestamp b/third_party/rust/remote_settings/dumps/main/summarizer-models-config.timestamp
new file mode 100644
index 0000000000000..2e0b81c77a596
--- /dev/null
+++ b/third_party/rust/remote_settings/dumps/main/summarizer-models-config.timestamp
@@ -0,0 +1 @@
+1755604678567
\ No newline at end of file
diff --git a/third_party/rust/remote_settings/dumps/main/translations-models.timestamp b/third_party/rust/remote_settings/dumps/main/translations-models.timestamp
new file mode 100644
index 0000000000000..a76d3c9f57d0c
--- /dev/null
+++ b/third_party/rust/remote_settings/dumps/main/translations-models.timestamp
@@ -0,0 +1 @@
+1761148716130
\ No newline at end of file
diff --git a/third_party/rust/remote_settings/dumps/main/translations-wasm.timestamp b/third_party/rust/remote_settings/dumps/main/translations-wasm.timestamp
new file mode 100644
index 0000000000000..dfdef03a43778
--- /dev/null
+++ b/third_party/rust/remote_settings/dumps/main/translations-wasm.timestamp
@@ -0,0 +1 @@
+1749069444811
\ No newline at end of file
diff --git a/third_party/rust/remote_settings/src/client.rs b/third_party/rust/remote_settings/src/client.rs
index 84a720d3e23c3..b58a1562d6487 100644
--- a/third_party/rust/remote_settings/src/client.rs
+++ b/third_party/rust/remote_settings/src/client.rs
@@ -146,7 +146,6 @@ impl<C: ApiClient> RemoteSettingsClient<C> {
             "74793ce1-a918-a5eb-d3c0-2aadaff3c88c",
             "74f94dc2-caf6-4b90-b3d2-f3e2f7714d88",
             "764e3b14-fe16-4feb-8384-124c516a5afa",
-            "7bbe6c5c-fdb8-2845-a4f4-e1382e708a0e",
             "7bf4ca37-e2b8-4d31-a1c3-979bc0e85131",
             "7c81cf98-7c11-4afd-8279-db89118a6dfb",
             "7cb4d88a-d4df-45b2-87e4-f896eaf1bbdb",
@@ -159,7 +158,6 @@ impl<C: ApiClient> RemoteSettingsClient<C> {
             "8abb10a7-212f-46b5-a7b4-244f414e3810",
             "91a9672d-e945-8e1e-0996-aefdb0190716",
             "94a84724-c30f-4767-ba42-01cc37fc31a4",
-            "95ed201d-4ab8-4cb8-831d-454f53cab0f8",
             "96327a73-c433-5eb4-a16d-b090cadfb80b",
             "9802e63d-05ec-48ba-93f9-746e0981ad98",
             "9d96547d-7575-49ca-8908-1e046b8ea90e",
@@ -213,10 +211,17 @@ impl<C: ApiClient> RemoteSettingsClient<C> {
         &self.collection_name
     }
 
+    fn load_packaged_timestamp(&self) -> Option<u64> {
+        // Using the macro generated `get_packaged_timestamp` in macros.rs
+        Self::get_packaged_timestamp(&self.collection_name)
+    }
+
     fn load_packaged_data(&self) -> Option<CollectionData> {
         // Using the macro generated `get_packaged_data` in macros.rs
-        Self::get_packaged_data(&self.collection_name)
-            .and_then(|data| serde_json::from_str(data).ok())
+        let str_data = Self::get_packaged_data(&self.collection_name)?;
+        let data: CollectionData = serde_json::from_str(str_data).ok()?;
+        debug_assert_eq!(data.timestamp, self.load_packaged_timestamp().unwrap());
+        Some(data)
     }
 
     fn load_packaged_attachment(&self, filename: &str) -> Option<(&'static [u8], &'static str)> {
@@ -241,6 +246,28 @@ impl<C: ApiClient> RemoteSettingsClient<C> {
             .collect()
     }
 
+    /// Returns the parsed packaged data, but only if it's newer than the data we have
+    /// in storage. This avoids parsing the packaged data if we won't use it.
+    fn get_packaged_data_if_newer(
+        &self,
+        storage: &mut Storage,
+        collection_url: &str,
+    ) -> Result<Option<CollectionData>> {
+        let packaged_ts = self.load_packaged_timestamp();
+        let storage_ts = storage.get_last_modified_timestamp(collection_url)?;
+        let packaged_is_newer = match (packaged_ts, storage_ts) {
+            (Some(packaged_ts), Some(storage_ts)) => packaged_ts > storage_ts,
+            (Some(_), None) => true, // no storage data
+            (None, _) => false,      // no packaged data
+        };
+
+        if packaged_is_newer {
+            Ok(self.load_packaged_data())
+        } else {
+            Ok(None)
+        }
+    }
+
     /// Get the current set of records.
     ///
     /// If records are not present in storage this will normally return None.  Use `sync_if_empty =
@@ -248,23 +275,15 @@ impl<C: ApiClient> RemoteSettingsClient<C> {
     pub fn get_records(&self, sync_if_empty: bool) -> Result<Option<Vec<RemoteSettingsRecord>>> {
         let mut inner = self.inner.lock();
         let collection_url = inner.api_client.collection_url();
-        let is_prod = inner.api_client.is_prod_server()?;
-        let packaged_data = if is_prod {
-            self.load_packaged_data()
-        } else {
-            None
-        };
 
         // Case 1: The packaged data is more recent than the cache
         //
         // This happens when there's no cached data or when we get new packaged data because of a
         // product update
-        if let Some(packaged_data) = packaged_data {
-            let cached_timestamp = inner
-                .storage
-                .get_last_modified_timestamp(&collection_url)?
-                .unwrap_or(0);
-            if packaged_data.timestamp > cached_timestamp {
+        if inner.api_client.is_prod_server()? {
+            if let Some(packaged_data) =
+                self.get_packaged_data_if_newer(&mut inner.storage, &collection_url)?
+            {
                 // Remove previously cached data (packaged data does not have tombstones like diff responses do).
                 inner.storage.empty()?;
                 // Insert new packaged data.
diff --git a/third_party/rust/remote_settings/src/macros.rs b/third_party/rust/remote_settings/src/macros.rs
index 34b14661beda9..dd071b0a98b36 100644
--- a/third_party/rust/remote_settings/src/macros.rs
+++ b/third_party/rust/remote_settings/src/macros.rs
@@ -18,6 +18,26 @@ macro_rules! packaged_collections {
                 _ => None,
             }
         }
+
+        /// Get just the timestamp, which is stored separately. This allows
+        /// checking which data is newer without paying the cost of parsing
+        /// the full packaged JSON.
+        fn get_packaged_timestamp(collection_name: &str) -> Option<u64> {
+            match collection_name {
+                $($collection => {
+                    let timestamp_str = include_str!(concat!(
+                        env!("CARGO_MANIFEST_DIR"),
+                        "/dumps/",
+                        $bucket,
+                        "/",
+                        $collection,
+                        ".timestamp"
+                    ));
+                    timestamp_str.trim().parse().ok()
+                }),*
+                _ => None,
+            }
+        }
     };
 }
 
diff --git a/third_party/rust/search/.cargo-checksum.json b/third_party/rust/search/.cargo-checksum.json
index cd4b70cbbc9bb..948477f5ecc2a 100644
--- a/third_party/rust/search/.cargo-checksum.json
+++ b/third_party/rust/search/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"589d99ebe48437339a95be619a74377eed748a44ebf96530ac88e058afad84fd","README.md":"d59a6ad6232a86a7bd3632ca62c44ba8bd466615c5d47ce0d836b270bac5562c","android/build.gradle":"e3b617d653aa0221f2229bb16c2fd635003fe82d0274c4b9a6f2d8154851985a","android/proguard-rules.pro":"1cf8c57e8f79c250b0af9c1a5a4edad71a5c348a79ab70243b6bae086c150ad2","android/src/main/AndroidManifest.xml":"0a05039a6124be0296764c2b0f41e863b5538d75e6164dd9ae945b59d983c318","src/configuration_overrides_types.rs":"220a5e12ee3deb309a1571c5820ec5132c959f56667c4c48f997bbe2be0c7eeb","src/configuration_types.rs":"f5906e5b0002365a84b0d3e4d36428f69d83ae2fe44eb5c6b66d33f058c69527","src/environment_matching.rs":"5a1ade9a900942c62e8740597528a34df6fb3fdb72c801a647a3386acd42fcc8","src/error.rs":"d3c1eda7a8da15446a321139d4d29dd9ceee99e916519690d5eb2d45ed628598","src/filter.rs":"908cc2c088cd3f7fcfc148d5d4d30f6d1355c9ee0b2980382e6abd09bb977c58","src/lib.rs":"9c83780a74048fbbc7bbba5706067b9dc5db2ae25a0cc751687d2738903723b4","src/selector.rs":"e8a722a7f2692bfe6af59b157a4d08305d86dd3a7ba1a482a55eaa1f051cddb1","src/sort_helpers.rs":"1abd6b7affb392d5e65b2906e5924ef6a54baec5e8cc69a41e1edea862c0e87c","src/types.rs":"b25de9810c3023c986632b8f3d4ecd41b6702bec4c03e08d95250e27bb202455","uniffi.toml":"96f1cd569483ff59e3c73852f085a03889fa24a2ce20ff7a3003799a9f48a51e"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"6c6c4350846640098a3dc5d834a9bb98fd219a99ad465986fa4e8c7ed40f9f75","README.md":"d59a6ad6232a86a7bd3632ca62c44ba8bd466615c5d47ce0d836b270bac5562c","android/build.gradle":"e3b617d653aa0221f2229bb16c2fd635003fe82d0274c4b9a6f2d8154851985a","android/proguard-rules.pro":"1cf8c57e8f79c250b0af9c1a5a4edad71a5c348a79ab70243b6bae086c150ad2","android/src/main/AndroidManifest.xml":"0a05039a6124be0296764c2b0f41e863b5538d75e6164dd9ae945b59d983c318","src/configuration_overrides_types.rs":"220a5e12ee3deb309a1571c5820ec5132c959f56667c4c48f997bbe2be0c7eeb","src/configuration_types.rs":"f5906e5b0002365a84b0d3e4d36428f69d83ae2fe44eb5c6b66d33f058c69527","src/environment_matching.rs":"5a1ade9a900942c62e8740597528a34df6fb3fdb72c801a647a3386acd42fcc8","src/error.rs":"d3c1eda7a8da15446a321139d4d29dd9ceee99e916519690d5eb2d45ed628598","src/filter.rs":"908cc2c088cd3f7fcfc148d5d4d30f6d1355c9ee0b2980382e6abd09bb977c58","src/lib.rs":"bd2a45a5b4f247aee0c483412cd2d192914e00de96c7c30a99185b8fc73e006c","src/selector.rs":"6e48c68f3ddc9baf7352cfafc13e6a705fa6c505d7c06ce6294e831bee97c7b1","src/sort_helpers.rs":"1abd6b7affb392d5e65b2906e5924ef6a54baec5e8cc69a41e1edea862c0e87c","src/test_helpers.rs":"25ca3f3bb3625a04e395bf8ed7363b04f1b09592978dfd76cca8af770507850a","src/types.rs":"b25de9810c3023c986632b8f3d4ecd41b6702bec4c03e08d95250e27bb202455","uniffi.toml":"96f1cd569483ff59e3c73852f085a03889fa24a2ce20ff7a3003799a9f48a51e"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/search/Cargo.toml b/third_party/rust/search/Cargo.toml
index 48025efc91d04..555ae4e2fe041 100644
--- a/third_party/rust/search/Cargo.toml
+++ b/third_party/rust/search/Cargo.toml
@@ -47,7 +47,7 @@ version = "1"
 features = ["derive"]
 
 [dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 
 [dev-dependencies]
 once_cell = "1.18.0"
@@ -64,5 +64,5 @@ default-features = false
 path = "../support/viaduct-dev"
 
 [build-dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 features = ["build"]
diff --git a/third_party/rust/search/src/lib.rs b/third_party/rust/search/src/lib.rs
index a08e8b1fa190c..b338b8435ac81 100644
--- a/third_party/rust/search/src/lib.rs
+++ b/third_party/rust/search/src/lib.rs
@@ -19,3 +19,6 @@ pub use selector::SearchEngineSelector;
 pub type SearchApiResult<T> = std::result::Result<T, error::SearchApiError>;
 
 uniffi::setup_scaffolding!("search");
+
+#[cfg(test)]
+mod test_helpers;
diff --git a/third_party/rust/search/src/selector.rs b/third_party/rust/search/src/selector.rs
index a41bcae076d88..3b55f4c30c946 100644
--- a/third_party/rust/search/src/selector.rs
+++ b/third_party/rust/search/src/selector.rs
@@ -158,7 +158,8 @@ impl SearchEngineSelector {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{types::*, SearchApiError};
+    use crate::test_helpers::{EngineRecord, ExpectedEngine, SubVariant, Variant};
+    use crate::{test_helpers, types::*, SearchApiError};
     use mockito::mock;
     use remote_settings::{RemoteSettingsConfig2, RemoteSettingsContext, RemoteSettingsServer};
     use serde_json::json;
@@ -167,73 +168,33 @@ mod tests {
     fn test_set_config_should_allow_basic_config() {
         let selector = Arc::new(SearchEngineSelector::new());
 
-        let config_result = Arc::clone(&selector).set_search_config(
-            json!({
-              "data": [
-                {
-                  "recordType": "engine",
-                  "identifier": "test",
-                  "base": {
-                    "name": "Test",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com",
-                        "method": "GET"
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true,
-                      "excludedRegions": []
-                    }
-                  }],
-                },
+        let config = json!({
+            "data": [
+                EngineRecord::full("test1", "Test 1").build(),
                 {
-                  "recordType": "defaultEngines",
-                  "globalDefault": "test"
+                    "recordType": "defaultEngines",
+                    "globalDefault": "test"
                 }
-              ]
-            })
-            .to_string(),
-        );
-        assert!(
-            config_result.is_ok(),
-            "Should have set the configuration successfully. {:?}",
-            config_result
-        );
+            ]
+        });
+
+        let config_result = Arc::clone(&selector).set_search_config(config.to_string());
+        config_result.expect("Should have set the configuration successfully");
     }
 
     #[test]
     fn test_set_config_should_allow_extra_fields() {
         let selector = Arc::new(SearchEngineSelector::new());
 
+        let mut engine = EngineRecord::minimal("test", "Test").build();
+        engine["base"]["urls"]["search"]["extraField1"] = json!(true);
+        engine["base"]["extraField2"] = json!("123");
+        engine["extraField3"] = json!(["foo"]);
+
         let config_result = Arc::clone(&selector).set_search_config(
             json!({
               "data": [
-                {
-                  "recordType": "engine",
-                  "identifier": "test",
-                  "base": {
-                    "name": "Test",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com",
-                        "method": "GET",
-                        "extraField1": true
-                      }
-                    },
-                    "extraField2": "123"
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true
-                    }
-                  }],
-                  "extraField3": ["foo"]
-                },
+                engine,
                 {
                   "recordType": "defaultEngines",
                   "globalDefault": "test",
@@ -245,55 +206,28 @@ mod tests {
             })
             .to_string(),
         );
-        assert!(
-            config_result.is_ok(),
-            "Should have set the configuration successfully with extra fields. {:?}",
-            config_result
-        );
+        config_result.expect("Should have set the configuration successfully with extra fields");
     }
 
     #[test]
     fn test_set_config_should_ignore_unknown_record_types() {
         let selector = Arc::new(SearchEngineSelector::new());
-
-        let config_result = Arc::clone(&selector).set_search_config(
-            json!({
-              "data": [
-                {
-                  "recordType": "engine",
-                  "identifier": "test",
-                  "base": {
-                    "name": "Test",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com",
-                        "method": "GET"
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true
-                    }
-                  }],
-                },
+        let config = json!({
+            "data": [
+                EngineRecord::full("test1", "Test 1").build(),
                 {
-                  "recordType": "defaultEngines",
-                  "globalDefault": "test"
+                    "recordType": "defaultEngines",
+                    "globalDefault": "test"
                 },
                 {
                   "recordType": "unknown"
                 }
-              ]
-            })
-            .to_string(),
-        );
-        assert!(
-            config_result.is_ok(),
-            "Should have set the configuration successfully with unknown record types. {:?}",
-            config_result
-        );
+            ]
+        });
+        let config_result = Arc::clone(&selector).set_search_config(config.to_string());
+
+        config_result
+            .expect("Should have set the configuration successfully with unknown record types.");
     }
 
     #[test]
@@ -320,26 +254,8 @@ mod tests {
         let _ = Arc::clone(&selector).set_search_config(
             json!({
               "data": [
-                {
-                  "recordType": "engine",
-                  "identifier": "test",
-                  "base": {
-                    "name": "Test",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com",
-                        "method": "GET",
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true
-                    }
-                  }],
-                },
-              ]
+                EngineRecord::full("test1", "Test 1").build(),
+            ]
             })
             .to_string(),
         );
@@ -362,108 +278,15 @@ mod tests {
     #[test]
     fn test_filter_engine_configuration_returns_basic_engines() {
         let selector = Arc::new(SearchEngineSelector::new());
-
         let config_overrides_result = Arc::clone(&selector).set_config_overrides(
-            json!({
-              "data": [
-                {
-                  "identifier": "overrides-engine",
-                  "partnerCode": "overrides-partner-code",
-                  "clickUrl": "https://example.com/click-url",
-                  "telemetrySuffix": "overrides-telemetry-suffix",
-                  "urls": {
-                    "search": {
-                      "base": "https://example.com/search-overrides",
-                      "method": "GET",
-                      "params": []
-                    }
-                  }
-                }
-              ]
-            })
-            .to_string(),
+            json!({ "data": [test_helpers::overrides_engine()] }).to_string(),
         );
+
         let config_result = Arc::clone(&selector).set_search_config(
             json!({
               "data": [
-                {
-                  "recordType": "engine",
-                  "identifier": "test1",
-                  "base": {
-                    "name": "Test 1",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com/1",
-                        "method": "GET",
-                        "params": [{
-                          "name": "search-name",
-                          "enterpriseValue": "enterprise-value",
-                        }],
-                        "searchTermParamName": "q"
-                      },
-                      "suggestions": {
-                        "base": "https://example.com/suggestions",
-                        "method": "POST",
-                        "params": [{
-                          "name": "suggestion-name",
-                          "value": "suggestion-value",
-                        }],
-                        "searchTermParamName": "suggest"
-                      },
-                      "trending": {
-                        "base": "https://example.com/trending",
-                        "method": "GET",
-                        "params": [{
-                          "name": "trending-name",
-                          "experimentConfig": "trending-experiment-value",
-                        }]
-                      },
-                      "searchForm": {
-                        "base": "https://example.com/search-form",
-                        "method": "GET",
-                        "params": [{
-                          "name": "search-form-name",
-                          "value": "search-form-value",
-                        }]
-                      },
-                      "visualSearch": {
-                        "base": "https://example.com/visual-search",
-                        "method": "GET",
-                        "params": [{
-                          "name": "visual-search-name",
-                          "value": "visual-search-value",
-                        }],
-                        "searchTermParamName": "url",
-                      },
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true
-                    }
-                  }],
-                },
-                {
-                  "recordType": "engine",
-                  "identifier": "test2",
-                  "base": {
-                    "name": "Test 2",
-                    // No classification specified to test fallback.
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com/2",
-                        "method": "GET",
-                        "searchTermParamName": "search"
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true
-                    }
-                  }],
-                },
+                EngineRecord::full("test1", "Test 1").build(),
+                EngineRecord::minimal("test2", "Test 2").build(),
                 {
                   "recordType": "defaultEngines",
                   "globalDefault": "test1",
@@ -473,16 +296,8 @@ mod tests {
             })
             .to_string(),
         );
-        assert!(
-            config_result.is_ok(),
-            "Should have set the configuration successfully. {:?}",
-            config_result
-        );
-        assert!(
-            config_overrides_result.is_ok(),
-            "Should have set the configuration overrides successfully. {:?}",
-            config_overrides_result
-        );
+        config_result.expect("Should have set the configuration successfully");
+        config_overrides_result.expect("Should have set the configuration overrides successfully");
 
         let result = selector.filter_engine_configuration(SearchUserEnvironment {
             ..Default::default()
@@ -497,99 +312,8 @@ mod tests {
             result.unwrap(),
             RefinedSearchConfig {
                 engines: vec!(
-                    SearchEngineDefinition {
-                        charset: "UTF-8".to_string(),
-                        classification: SearchEngineClassification::General,
-                        identifier: "test1".to_string(),
-                        name: "Test 1".to_string(),
-                        urls: SearchEngineUrls {
-                            search: SearchEngineUrl {
-                                base: "https://example.com/1".to_string(),
-                                method: "GET".to_string(),
-                                params: vec![SearchUrlParam {
-                                    name: "search-name".to_string(),
-                                    value: None,
-                                    enterprise_value: Some("enterprise-value".to_string()),
-                                    experiment_config: None
-                                }],
-                                search_term_param_name: Some("q".to_string()),
-                                ..Default::default()
-                            },
-                            suggestions: Some(SearchEngineUrl {
-                                base: "https://example.com/suggestions".to_string(),
-                                method: "POST".to_string(),
-                                params: vec![SearchUrlParam {
-                                    name: "suggestion-name".to_string(),
-                                    value: Some("suggestion-value".to_string()),
-                                    enterprise_value: None,
-                                    experiment_config: None
-                                }],
-                                search_term_param_name: Some("suggest".to_string()),
-                                ..Default::default()
-                            }),
-                            trending: Some(SearchEngineUrl {
-                                base: "https://example.com/trending".to_string(),
-                                method: "GET".to_string(),
-                                params: vec![SearchUrlParam {
-                                    name: "trending-name".to_string(),
-                                    value: None,
-                                    enterprise_value: None,
-                                    experiment_config: Some(
-                                        "trending-experiment-value".to_string()
-                                    )
-                                }],
-                                ..Default::default()
-                            }),
-                            search_form: Some(SearchEngineUrl {
-                                base: "https://example.com/search-form".to_string(),
-                                method: "GET".to_string(),
-                                params: vec![SearchUrlParam {
-                                    name: "search-form-name".to_string(),
-                                    value: Some("search-form-value".to_string()),
-                                    experiment_config: None,
-                                    enterprise_value: None,
-                                }],
-                                ..Default::default()
-                            }),
-                            visual_search: Some(SearchEngineUrl {
-                                base: "https://example.com/visual-search".to_string(),
-                                method: "GET".to_string(),
-                                params: vec![SearchUrlParam {
-                                    name: "visual-search-name".to_string(),
-                                    value: Some("visual-search-value".to_string()),
-                                    experiment_config: None,
-                                    enterprise_value: None,
-                                }],
-                                search_term_param_name: Some("url".to_string()),
-                                ..Default::default()
-                            }),
-                        },
-                        ..Default::default()
-                    },
-                    SearchEngineDefinition {
-                        aliases: Vec::new(),
-                        charset: "UTF-8".to_string(),
-                        classification: SearchEngineClassification::Unknown,
-                        identifier: "test2".to_string(),
-                        is_new_until: None,
-                        name: "Test 2".to_string(),
-                        optional: false,
-                        order_hint: None,
-                        partner_code: String::new(),
-                        telemetry_suffix: String::new(),
-                        urls: SearchEngineUrls {
-                            search: SearchEngineUrl {
-                                base: "https://example.com/2".to_string(),
-                                search_term_param_name: Some("search".to_string()),
-                                ..Default::default()
-                            },
-                            suggestions: None,
-                            trending: None,
-                            search_form: None,
-                            visual_search: None,
-                        },
-                        click_url: None,
-                    }
+                    ExpectedEngine::full("test1", "Test 1").build(),
+                    ExpectedEngine::minimal("test2", "Test 2").build(),
                 ),
                 app_default_engine_id: Some("test1".to_string()),
                 app_private_default_engine_id: Some("test2".to_string())
@@ -600,122 +324,36 @@ mod tests {
     #[test]
     fn test_filter_engine_configuration_handles_basic_variants() {
         let selector = Arc::new(SearchEngineSelector::new());
-
         let config_overrides_result = Arc::clone(&selector).set_config_overrides(
-            json!({
-              "data": [
-                {
-                  "identifier": "overrides-engine",
-                  "partnerCode": "overrides-partner-code",
-                  "clickUrl": "https://example.com/click-url",
-                  "telemetrySuffix": "overrides-telemetry-suffix",
-                  "urls": {
-                    "search": {
-                      "base": "https://example.com/search-overrides",
-                      "method": "GET",
-                      "params": []
-                    }
-                  }
-                }
-              ]
-            })
-            .to_string(),
+            json!({ "data": [test_helpers::overrides_engine()] }).to_string(),
         );
+
         let config_result = Arc::clone(&selector).set_search_config(
             json!({
               "data": [
-                {
-                  "recordType": "engine",
-                  "identifier": "test1",
-                  "base": {
-                    "name": "Test 1",
-                    "classification": "general",
-                    "partnerCode": "star",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com/1",
-                        "method": "GET",
-                        "searchTermParamName": "q"
-                      },
-                      "suggestions": {
-                        "base": "https://example.com/suggestions",
-                        "method": "POST",
-                        "params": [{
-                          "name": "type",
-                          "value": "space",
-                        }],
-                        "searchTermParamName": "suggest"
-                      },
-                      "trending": {
-                        "base": "https://example.com/trending",
-                        "method": "GET",
-                        "params": [{
-                          "name": "area",
-                          "experimentConfig": "area-param",
-                        }]
-                      },
-                      "searchForm": {
-                        "base": "https://example.com/search-form",
-                        "method": "GET",
-                        "params": [{
-                          "name": "search-form-name",
-                          "value": "search-form-value",
-                        }]
-                      },
-                      "visualSearch": {
-                        "base": "https://example.com/visual-search",
-                        "method": "GET",
-                        "params": [{
-                          "name": "visual-search-name",
-                          "value": "visual-search-value",
-                        }],
-                        "searchTermParamName": "url",
-                      },
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true
-                    },
-                  },
-                  {
-                    "environment": {
-                      "regions": ["FR"]
-                    },
-                    "urls": {
-                      "search": {
-                        "method": "POST",
-                        "params": [{
-                          "name": "mission",
-                          "value": "ongoing"
-                        }]
-                      }
-                    }
-                  }],
-                },
-                {
-                  "recordType": "engine",
-                  "identifier": "test2",
-                  "base": {
-                    "name": "Test 2",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com/2",
-                        "method": "GET",
-                        "searchTermParamName": "search"
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true
-                    },
-                    "partnerCode": "ship",
-                    "telemetrySuffix": "E",
-                    "optional": true
-                  }],
-                },
+                EngineRecord::full("test1", "Test 1")
+                .add_variant(
+                    Variant::new()
+                        .regions(&["FR"])
+                        .urls(json!({
+                            "search": {
+                                "method": "POST",
+                                "params": [{
+                                    "name": "mission",
+                                    "value": "ongoing"
+                                }]
+                            }
+                        }))
+                )
+                .build(),
+                EngineRecord::minimal("test2", "Test 2")
+                .add_variant(
+                    Variant::new()
+                        .optional(true)
+                        .partner_code("ship")
+                        .telemetry_suffix("E")
+                )
+                .build(),
                 {
                   "recordType": "defaultEngines",
                   "globalDefault": "test1",
@@ -725,16 +363,8 @@ mod tests {
             })
             .to_string(),
         );
-        assert!(
-            config_result.is_ok(),
-            "Should have set the configuration successfully. {:?}",
-            config_result
-        );
-        assert!(
-            config_overrides_result.is_ok(),
-            "Should have set the configuration overrides successfully. {:?}",
-            config_overrides_result
-        );
+        config_result.expect("Should have set the configuration successfully");
+        config_overrides_result.expect("Should have set the configuration overrides successfully");
 
         let result = selector.filter_engine_configuration(SearchUserEnvironment {
             region: "FR".into(),
@@ -746,221 +376,68 @@ mod tests {
             "Should have filtered the configuration without error. {:?}",
             result
         );
+
+        let expected_1 = ExpectedEngine::full("test1", "Test 1")
+            .search_method("POST")
+            .search_params(vec![SearchUrlParam {
+                name: "mission".to_string(),
+                value: Some("ongoing".to_string()),
+                enterprise_value: None,
+                experiment_config: None,
+            }])
+            .build();
+
+        let expected_2 = ExpectedEngine::minimal("test2", "Test 2")
+            .optional(true)
+            .partner_code("ship")
+            .telemetry_suffix("E")
+            .build();
+
         assert_eq!(
             result.unwrap(),
             RefinedSearchConfig {
-                engines: vec!(
-                    SearchEngineDefinition {
-                        charset: "UTF-8".to_string(),
-                        classification: SearchEngineClassification::General,
-                        identifier: "test1".to_string(),
-                        name: "Test 1".to_string(),
-                        partner_code: "star".to_string(),
-                        urls: SearchEngineUrls {
-                            search: SearchEngineUrl {
-                                base: "https://example.com/1".to_string(),
-                                method: "POST".to_string(),
-                                params: vec![SearchUrlParam {
-                                    name: "mission".to_string(),
-                                    value: Some("ongoing".to_string()),
-                                    enterprise_value: None,
-                                    experiment_config: None
-                                }],
-                                search_term_param_name: Some("q".to_string()),
-                                ..Default::default()
-                            },
-                            suggestions: Some(SearchEngineUrl {
-                                base: "https://example.com/suggestions".to_string(),
-                                method: "POST".to_string(),
-                                params: vec![SearchUrlParam {
-                                    name: "type".to_string(),
-                                    value: Some("space".to_string()),
-                                    enterprise_value: None,
-                                    experiment_config: None
-                                }],
-                                search_term_param_name: Some("suggest".to_string()),
-                                ..Default::default()
-                            }),
-                            trending: Some(SearchEngineUrl {
-                                base: "https://example.com/trending".to_string(),
-                                method: "GET".to_string(),
-                                params: vec![SearchUrlParam {
-                                    name: "area".to_string(),
-                                    value: None,
-                                    enterprise_value: None,
-                                    experiment_config: Some("area-param".to_string())
-                                }],
-                                ..Default::default()
-                            }),
-                            search_form: Some(SearchEngineUrl {
-                                base: "https://example.com/search-form".to_string(),
-                                method: "GET".to_string(),
-                                params: vec![SearchUrlParam {
-                                    name: "search-form-name".to_string(),
-                                    value: Some("search-form-value".to_string()),
-                                    enterprise_value: None,
-                                    experiment_config: None,
-                                }],
-                                ..Default::default()
-                            }),
-                            visual_search: Some(SearchEngineUrl {
-                                base: "https://example.com/visual-search".to_string(),
-                                method: "GET".to_string(),
-                                params: vec![SearchUrlParam {
-                                    name: "visual-search-name".to_string(),
-                                    value: Some("visual-search-value".to_string()),
-                                    enterprise_value: None,
-                                    experiment_config: None,
-                                }],
-                                search_term_param_name: Some("url".to_string()),
-                                ..Default::default()
-                            }),
-                        },
-                        ..Default::default()
-                    },
-                    SearchEngineDefinition {
-                        charset: "UTF-8".to_string(),
-                        classification: SearchEngineClassification::General,
-                        identifier: "test2".to_string(),
-                        name: "Test 2".to_string(),
-                        optional: true,
-                        partner_code: "ship".to_string(),
-                        telemetry_suffix: "E".to_string(),
-                        urls: SearchEngineUrls {
-                            search: SearchEngineUrl {
-                                base: "https://example.com/2".to_string(),
-                                search_term_param_name: Some("search".to_string()),
-                                ..Default::default()
-                            },
-                            ..Default::default()
-                        },
-                        ..Default::default()
-                    }
-                ),
+                engines: vec!(expected_1, expected_2),
                 app_default_engine_id: Some("test1".to_string()),
                 app_private_default_engine_id: Some("test2".to_string())
             }
-        )
+        );
     }
 
     #[test]
     fn test_filter_engine_configuration_handles_basic_subvariants() {
         let selector = Arc::new(SearchEngineSelector::new());
-
         let config_overrides_result = Arc::clone(&selector).set_config_overrides(
-            json!({
-              "data": [
-                {
-                  "identifier": "overrides-engine",
-                  "partnerCode": "overrides-partner-code",
-                  "clickUrl": "https://example.com/click-url",
-                  "telemetrySuffix": "overrides-telemetry-suffix",
-                  "urls": {
-                    "search": {
-                      "base": "https://example.com/search-overrides",
-                      "method": "GET",
-                      "params": []
-                    }
-                  }
-                }
-              ]
-            })
-            .to_string(),
+            json!({ "data": [test_helpers::overrides_engine()] }).to_string(),
         );
+
         let config_result = Arc::clone(&selector).set_search_config(
             json!({
               "data": [
-                {
-                  "recordType": "engine",
-                  "identifier": "test1",
-                  "base": {
-                    "name": "Test 1",
-                    "partnerCode": "star",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com/1",
-                        "method": "GET",
-                        "searchTermParamName": "q"
-                      },
-                      "suggestions": {
-                        "base": "https://example.com/suggestions",
-                        "method": "POST",
-                        "params": [{
-                          "name": "type",
-                          "value": "space",
-                        }],
-                        "searchTermParamName": "suggest"
-                      },
-                      "trending": {
-                        "base": "https://example.com/trending",
-                        "method": "GET",
-                        "params": [{
-                          "name": "area",
-                          "experimentConfig": "area-param",
-                        }]
-                      },
-                      "searchForm": {
-                        "base": "https://example.com/search-form",
-                        "method": "GET",
-                        "params": [{
-                          "name": "search-form-name",
-                          "value": "search-form-value",
-                        }]
-                      },
-                      "visualSearch": {
-                        "base": "https://example.com/visual-search",
-                        "method": "GET",
-                        "params": [{
-                          "name": "visual-search-name",
-                          "value": "visual-search-value",
-                        }],
-                        "searchTermParamName": "url",
-                      },
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true
-                    },
-                  },
-                  {
-                    "environment": {
-                      "regions": ["FR"]
-                    },
-                    "urls": {
-                      "search": {
-                        "method": "POST",
-                        "params": [{
-                          "name": "variant-param-name",
-                          "value": "variant-param-value"
-                        }]
-                      }
-                    },
-                    "subVariants": [
-                      {
-                        "environment": {
-                          "locales": ["fr"]
-                        },
-                        "partnerCode": "fr-partner-code",
-                        "telemetrySuffix": "fr-telemetry-suffix"
-                      },
-                      {
-                        "environment": {
-                          "locales": ["en-CA"]
-                        },
-                        "urls": {
-                          "search": {
-                            "method": "GET",
-                            "params": [{
-                              "name": "en-ca-param-name",
-                              "value": "en-ca-param-value"
-                            }]
-                          }
-                        },
-                      }
-                    ]
-                  }],
-                },
+                EngineRecord::full("test1", "Test 1")
+                  .add_variant(
+                    Variant::new()
+                      .regions(&["FR"])
+                      .add_subvariant(
+                        SubVariant::new()
+                          .locales(&["fr"])
+                          .partner_code("fr-partner-code")
+                          .telemetry_suffix("fr-telemetry-suffix"),
+                      )
+                      .add_subvariant(
+                        SubVariant::new()
+                          .locales(&["en-CA"])
+                          .urls(json!({
+                            "search": {
+                              "method": "GET",
+                              "params": [{
+                                "name": "en-ca-param-name",
+                                "enterpriseValue": "en-ca-param-value"
+                              }]
+                            }
+                          })),
+                      )
+                  )
+                  .build(),
                 {
                   "recordType": "defaultEngines",
                   "globalDefault": "test1"
@@ -973,16 +450,8 @@ mod tests {
             })
             .to_string(),
         );
-        assert!(
-            config_result.is_ok(),
-            "Should have set the configuration successfully. {:?}",
-            config_result
-        );
-        assert!(
-            config_overrides_result.is_ok(),
-            "Should have set the configuration overrides successfully. {:?}",
-            config_overrides_result
-        );
+        config_result.expect("Should have set the configuration successfully");
+        config_overrides_result.expect("Should have set the configuration overrides successfully");
 
         let mut result = Arc::clone(&selector).filter_engine_configuration(SearchUserEnvironment {
             region: "FR".into(),
@@ -995,79 +464,16 @@ mod tests {
             "Should have filtered the configuration without error. {:?}",
             result
         );
+
+        let expected_1 = ExpectedEngine::full("test1", "Test 1")
+            .partner_code("fr-partner-code")
+            .telemetry_suffix("fr-telemetry-suffix")
+            .build();
+
         assert_eq!(
             result.unwrap(),
             RefinedSearchConfig {
-                engines: vec!(SearchEngineDefinition {
-                    charset: "UTF-8".to_string(),
-                    identifier: "test1".to_string(),
-                    name: "Test 1".to_string(),
-                    partner_code: "fr-partner-code".to_string(),
-                    telemetry_suffix: "fr-telemetry-suffix".to_string(),
-                    urls: SearchEngineUrls {
-                        search: SearchEngineUrl {
-                            base: "https://example.com/1".to_string(),
-                            method: "POST".to_string(),
-                            params: vec![SearchUrlParam {
-                                name: "variant-param-name".to_string(),
-                                value: Some("variant-param-value".to_string()),
-                                enterprise_value: None,
-                                experiment_config: None
-                            }],
-                            search_term_param_name: Some("q".to_string()),
-                            ..Default::default()
-                        },
-                        suggestions: Some(SearchEngineUrl {
-                            base: "https://example.com/suggestions".to_string(),
-                            method: "POST".to_string(),
-                            params: vec![SearchUrlParam {
-                                name: "type".to_string(),
-                                value: Some("space".to_string()),
-                                enterprise_value: None,
-                                experiment_config: None
-                            }],
-                            search_term_param_name: Some("suggest".to_string()),
-                            ..Default::default()
-                        }),
-                        trending: Some(SearchEngineUrl {
-                            base: "https://example.com/trending".to_string(),
-                            method: "GET".to_string(),
-                            params: vec![SearchUrlParam {
-                                name: "area".to_string(),
-                                value: None,
-                                enterprise_value: None,
-                                experiment_config: Some("area-param".to_string())
-                            }],
-                            search_term_param_name: None,
-                            ..Default::default()
-                        }),
-                        search_form: Some(SearchEngineUrl {
-                            base: "https://example.com/search-form".to_string(),
-                            method: "GET".to_string(),
-                            params: vec![SearchUrlParam {
-                                name: "search-form-name".to_string(),
-                                value: Some("search-form-value".to_string()),
-                                enterprise_value: None,
-                                experiment_config: None,
-                            }],
-                            search_term_param_name: None,
-                            ..Default::default()
-                        }),
-                        visual_search: Some(SearchEngineUrl {
-                            base: "https://example.com/visual-search".to_string(),
-                            method: "GET".to_string(),
-                            params: vec![SearchUrlParam {
-                                name: "visual-search-name".to_string(),
-                                value: Some("visual-search-value".to_string()),
-                                enterprise_value: None,
-                                experiment_config: None,
-                            }],
-                            search_term_param_name: Some("url".to_string()),
-                            ..Default::default()
-                        }),
-                    },
-                    ..Default::default()
-                }),
+                engines: vec!(expected_1),
                 app_default_engine_id: Some("test1".to_string()),
                 app_private_default_engine_id: None
             },
@@ -1085,78 +491,20 @@ mod tests {
             "Should have filtered the configuration without error. {:?}",
             result
         );
+
+        let expected_2 = ExpectedEngine::full("test1", "Test 1")
+            .search_params(vec![SearchUrlParam {
+                name: "en-ca-param-name".to_string(),
+                value: None,
+                enterprise_value: Some("en-ca-param-value".to_string()),
+                experiment_config: None,
+            }])
+            .build();
+
         assert_eq!(
             result.unwrap(),
             RefinedSearchConfig {
-                engines: vec!(SearchEngineDefinition {
-                    charset: "UTF-8".to_string(),
-                    identifier: "test1".to_string(),
-                    name: "Test 1".to_string(),
-                    partner_code: "star".to_string(),
-                    urls: SearchEngineUrls {
-                        search: SearchEngineUrl {
-                            base: "https://example.com/1".to_string(),
-                            method: "GET".to_string(),
-                            params: vec![SearchUrlParam {
-                                name: "en-ca-param-name".to_string(),
-                                value: Some("en-ca-param-value".to_string()),
-                                enterprise_value: None,
-                                experiment_config: None
-                            }],
-                            search_term_param_name: Some("q".to_string()),
-                            ..Default::default()
-                        },
-                        suggestions: Some(SearchEngineUrl {
-                            base: "https://example.com/suggestions".to_string(),
-                            method: "POST".to_string(),
-                            params: vec![SearchUrlParam {
-                                name: "type".to_string(),
-                                value: Some("space".to_string()),
-                                enterprise_value: None,
-                                experiment_config: None
-                            }],
-                            search_term_param_name: Some("suggest".to_string()),
-                            ..Default::default()
-                        }),
-                        trending: Some(SearchEngineUrl {
-                            base: "https://example.com/trending".to_string(),
-                            method: "GET".to_string(),
-                            params: vec![SearchUrlParam {
-                                name: "area".to_string(),
-                                value: None,
-                                enterprise_value: None,
-                                experiment_config: Some("area-param".to_string())
-                            }],
-                            search_term_param_name: None,
-                            ..Default::default()
-                        }),
-                        search_form: Some(SearchEngineUrl {
-                            base: "https://example.com/search-form".to_string(),
-                            method: "GET".to_string(),
-                            params: vec![SearchUrlParam {
-                                name: "search-form-name".to_string(),
-                                value: Some("search-form-value".to_string()),
-                                enterprise_value: None,
-                                experiment_config: None,
-                            }],
-                            search_term_param_name: None,
-                            ..Default::default()
-                        }),
-                        visual_search: Some(SearchEngineUrl {
-                            base: "https://example.com/visual-search".to_string(),
-                            method: "GET".to_string(),
-                            params: vec![SearchUrlParam {
-                                name: "visual-search-name".to_string(),
-                                value: Some("visual-search-value".to_string()),
-                                enterprise_value: None,
-                                experiment_config: None,
-                            }],
-                            search_term_param_name: Some("url".to_string()),
-                            ..Default::default()
-                        }),
-                    },
-                    ..Default::default()
-                }),
+                engines: vec!(expected_2),
                 app_default_engine_id: Some("test1".to_string()),
                 app_private_default_engine_id: None
             },
@@ -1167,90 +515,26 @@ mod tests {
     #[test]
     fn test_filter_engine_configuration_handles_environments() {
         let selector = Arc::new(SearchEngineSelector::new());
-
         let config_overrides_result = Arc::clone(&selector).set_config_overrides(
-            json!({
-              "data": [
-                {
-                  "identifier": "overrides-engine",
-                  "partnerCode": "overrides-partner-code",
-                  "clickUrl": "https://example.com/click-url",
-                  "telemetrySuffix": "overrides-telemetry-suffix",
-                  "urls": {
-                    "search": {
-                      "base": "https://example.com/search-overrides",
-                      "method": "GET",
-                      "params": []
-                    }
-                  }
-                }
-              ]
-            })
-            .to_string(),
+            json!({ "data": [test_helpers::overrides_engine()] }).to_string(),
         );
+
         let config_result = Arc::clone(&selector).set_search_config(
             json!({
               "data": [
-                {
-                  "recordType": "engine",
-                  "identifier": "test1",
-                  "base": {
-                    "name": "Test 1",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com/1",
-                        "method": "GET",
-                        "searchTermParamName": "q"
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true
-                    }
-                  }],
-                },
-                {
-                  "recordType": "engine",
-                  "identifier": "test2",
-                  "base": {
-                    "name": "Test 2",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com/2",
-                        "method": "GET",
-                        "searchTermParamName": "search"
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "applications": ["firefox-android", "focus-ios"]
-                    }
-                  }],
-                },
-                {
-                  "recordType": "engine",
-                  "identifier": "test3",
-                  "base": {
-                    "name": "Test 3",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com/3",
-                        "method": "GET",
-                        "searchTermParamName": "trek"
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "distributions": ["starship"]
-                    }
-                  }],
-                },
+                EngineRecord::full("test1", "Test 1").build(),
+                EngineRecord::full("test2", "Test 2")
+                .override_variants(
+                    Variant::new()
+                      .applications(&["firefox-android", "focus-ios"])
+                )
+                .build(),
+                EngineRecord::full("test3", "Test 3")
+                .override_variants(
+                    Variant::new()
+                      .distributions(&["starship"])
+                )
+                .build(),
                 {
                   "recordType": "defaultEngines",
                   "globalDefault": "test1",
@@ -1259,16 +543,8 @@ mod tests {
             })
             .to_string(),
         );
-        assert!(
-            config_result.is_ok(),
-            "Should have set the configuration successfully. {:?}",
-            config_result
-        );
-        assert!(
-            config_overrides_result.is_ok(),
-            "Should have set the configuration overrides successfully. {:?}",
-            config_overrides_result
-        );
+        config_result.expect("Should have set the configuration successfully");
+        config_overrides_result.expect("Should have set the configuration overrides successfully");
 
         let mut result = Arc::clone(&selector).filter_engine_configuration(SearchUserEnvironment {
             distribution_id: String::new(),
@@ -1281,26 +557,11 @@ mod tests {
             "Should have filtered the configuration without error. {:?}",
             result
         );
+
         assert_eq!(
             result.unwrap(),
             RefinedSearchConfig {
-                engines: vec!(
-                    SearchEngineDefinition {
-                        charset: "UTF-8".to_string(),
-                        classification: SearchEngineClassification::General,
-                        identifier: "test1".to_string(),
-                        name: "Test 1".to_string(),
-                        urls: SearchEngineUrls {
-                            search: SearchEngineUrl {
-                                base: "https://example.com/1".to_string(),
-                                search_term_param_name: Some("q".to_string()),
-                                ..Default::default()
-                            },
-                            ..Default::default()
-                        },
-                        ..Default::default()
-                      },
-            ),
+                engines: vec!(ExpectedEngine::full("test1", "Test 1").build()),
                 app_default_engine_id: Some("test1".to_string()),
                 app_private_default_engine_id: None
             }, "Should have selected test1 for all matching locales, as the environments do not match for the other two"
@@ -1317,41 +578,13 @@ mod tests {
             "Should have filtered the configuration without error. {:?}",
             result
         );
+
+        let expected_1 = ExpectedEngine::full("test1", "Test 1").build();
+        let expected_2 = ExpectedEngine::full("test2", "Test 2").build();
         assert_eq!(
             result.unwrap(),
             RefinedSearchConfig {
-                engines: vec!(
-                    SearchEngineDefinition {
-                        charset: "UTF-8".to_string(),
-                        classification: SearchEngineClassification::General,
-                        identifier: "test1".to_string(),
-                        name: "Test 1".to_string(),
-                        urls: SearchEngineUrls {
-                            search: SearchEngineUrl {
-                                base: "https://example.com/1".to_string(),
-                                search_term_param_name: Some("q".to_string()),
-                                ..Default::default()
-                            },
-                            ..Default::default()
-                        },
-                        ..Default::default()
-                    },
-                    SearchEngineDefinition {
-                        charset: "UTF-8".to_string(),
-                        classification: SearchEngineClassification::General,
-                        identifier: "test2".to_string(),
-                        name: "Test 2".to_string(),
-                        urls: SearchEngineUrls {
-                            search: SearchEngineUrl {
-                                base: "https://example.com/2".to_string(),
-                                search_term_param_name: Some("search".to_string()),
-                                ..Default::default()
-                            },
-                            ..Default::default()
-                        },
-                        ..Default::default()
-                    },
-                ),
+                engines: vec!(expected_1, expected_2),
                 app_default_engine_id: Some("test1".to_string()),
                 app_private_default_engine_id: None
             },
@@ -1369,41 +602,13 @@ mod tests {
             "Should have filtered the configuration without error. {:?}",
             result
         );
+
+        let expected_1 = ExpectedEngine::full("test1", "Test 1").build();
+        let expected_3 = ExpectedEngine::full("test3", "Test 3").build();
         assert_eq!(
             result.unwrap(),
             RefinedSearchConfig {
-                engines: vec!(
-                    SearchEngineDefinition {
-                        charset: "UTF-8".to_string(),
-                        classification: SearchEngineClassification::General,
-                        identifier: "test1".to_string(),
-                        name: "Test 1".to_string(),
-                        urls: SearchEngineUrls {
-                            search: SearchEngineUrl {
-                                base: "https://example.com/1".to_string(),
-                                search_term_param_name: Some("q".to_string()),
-                                ..Default::default()
-                            },
-                            ..Default::default()
-                        },
-                        ..Default::default()
-                    },
-                    SearchEngineDefinition {
-                        charset: "UTF-8".to_string(),
-                        classification: SearchEngineClassification::General,
-                        identifier: "test3".to_string(),
-                        name: "Test 3".to_string(),
-                        urls: SearchEngineUrls {
-                            search: SearchEngineUrl {
-                                base: "https://example.com/3".to_string(),
-                                search_term_param_name: Some("trek".to_string()),
-                                ..Default::default()
-                            },
-                            ..Default::default()
-                        },
-                        ..Default::default()
-                      },
-                ),
+                engines: vec!(expected_1, expected_3),
                 app_default_engine_id: Some("test1".to_string()),
                 app_private_default_engine_id: None
             }, "Should have selected test1 for all matching locales and test3 for matching the distribution id"
@@ -1413,87 +618,16 @@ mod tests {
     #[test]
     fn test_set_config_should_handle_default_engines() {
         let selector = Arc::new(SearchEngineSelector::new());
-
         let config_overrides_result = Arc::clone(&selector).set_config_overrides(
-            json!({
-              "data": [
-                {
-                  "identifier": "overrides-engine",
-                  "partnerCode": "overrides-partner-code",
-                  "clickUrl": "https://example.com/click-url",
-                  "telemetrySuffix": "overrides-telemetry-suffix",
-                  "urls": {
-                    "search": {
-                      "base": "https://example.com/search-overrides",
-                      "method": "GET",
-                      "params": []
-                    }
-                  }
-                }
-              ]
-            })
-            .to_string(),
+            json!({ "data": [test_helpers::overrides_engine()] }).to_string(),
         );
+
         let config_result = Arc::clone(&selector).set_search_config(
             json!({
               "data": [
-                {
-                  "recordType": "engine",
-                  "identifier": "test",
-                  "base": {
-                    "name": "Test",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com",
-                        "method": "GET",
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true
-                    }
-                  }],
-                },
-                {
-                  "recordType": "engine",
-                  "identifier": "distro-default",
-                  "base": {
-                    "name": "Distribution Default",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com",
-                        "method": "GET"
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true
-                    }
-                  }],
-                },
-                {
-                  "recordType": "engine",
-                  "identifier": "private-default-FR",
-                  "base": {
-                    "name": "Private default FR",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com",
-                        "method": "GET"
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true,
-                    }
-                  }],
-                },
+                EngineRecord::minimal("test", "Test").build(),
+                EngineRecord::minimal("distro-default", "Distribution Default").build(),
+                EngineRecord::minimal("private-default-FR", "Private default FR").build(),
                 {
                   "recordType": "defaultEngines",
                   "globalDefault": "test",
@@ -1513,59 +647,8 @@ mod tests {
             })
             .to_string(),
         );
-        assert!(
-            config_result.is_ok(),
-            "Should have set the configuration successfully. {:?}",
-            config_result
-        );
-        assert!(
-            config_overrides_result.is_ok(),
-            "Should have set the configuration overrides successfully. {:?}",
-            config_overrides_result
-        );
-
-        let test_engine = SearchEngineDefinition {
-            charset: "UTF-8".to_string(),
-            classification: SearchEngineClassification::General,
-            identifier: "test".to_string(),
-            name: "Test".to_string(),
-            urls: SearchEngineUrls {
-                search: SearchEngineUrl {
-                    base: "https://example.com".to_string(),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            ..Default::default()
-        };
-        let distro_default_engine = SearchEngineDefinition {
-            charset: "UTF-8".to_string(),
-            classification: SearchEngineClassification::General,
-            identifier: "distro-default".to_string(),
-            name: "Distribution Default".to_string(),
-            urls: SearchEngineUrls {
-                search: SearchEngineUrl {
-                    base: "https://example.com".to_string(),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            ..Default::default()
-        };
-        let private_default_fr_engine = SearchEngineDefinition {
-            charset: "UTF-8".to_string(),
-            classification: SearchEngineClassification::General,
-            identifier: "private-default-FR".to_string(),
-            name: "Private default FR".to_string(),
-            urls: SearchEngineUrls {
-                search: SearchEngineUrl {
-                    base: "https://example.com".to_string(),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            ..Default::default()
-        };
+        config_result.expect("Should have set the configuration successfully");
+        config_overrides_result.expect("Should have set the configuration overrides successfully");
 
         let result = Arc::clone(&selector).filter_engine_configuration(SearchUserEnvironment {
             distribution_id: "test-distro".to_string(),
@@ -1576,18 +659,19 @@ mod tests {
             "Should have filtered the configuration without error. {:?}",
             result
         );
+
         assert_eq!(
             result.unwrap(),
             RefinedSearchConfig {
                 engines: vec![
-                    distro_default_engine.clone(),
-                    private_default_fr_engine.clone(),
-                    test_engine.clone(),
+                    ExpectedEngine::minimal("distro-default", "Distribution Default").build(),
+                    ExpectedEngine::minimal("private-default-FR", "Private default FR").build(),
+                    ExpectedEngine::minimal("test", "Test").build(),
                 ],
                 app_default_engine_id: Some("distro-default".to_string()),
                 app_private_default_engine_id: None
             },
-            "Should have selected the default engine for the matching specific default"
+            "Should have selected the distro-default engine for the matching specific default"
         );
 
         let result = Arc::clone(&selector).filter_engine_configuration(SearchUserEnvironment {
@@ -1600,13 +684,14 @@ mod tests {
             "Should have filtered the configuration without error. {:?}",
             result
         );
+
         assert_eq!(
             result.unwrap(),
             RefinedSearchConfig {
                 engines: vec![
-                    test_engine,
-                    private_default_fr_engine,
-                    distro_default_engine,
+                    ExpectedEngine::minimal("test", "Test").build(),
+                    ExpectedEngine::minimal("private-default-FR", "Private default FR").build(),
+                    ExpectedEngine::minimal("distro-default", "Distribution Default").build(),
                 ],
                 app_default_engine_id: Some("test".to_string()),
                 app_private_default_engine_id: Some("private-default-FR".to_string())
@@ -1618,125 +703,18 @@ mod tests {
     #[test]
     fn test_filter_engine_orders() {
         let selector = Arc::new(SearchEngineSelector::new());
-
         let config_overrides_result = Arc::clone(&selector).set_config_overrides(
-            json!({
-              "data": [
-                {
-                  "identifier": "overrides-engine",
-                  "partnerCode": "overrides-partner-code",
-                  "clickUrl": "https://example.com/click-url",
-                  "telemetrySuffix": "overrides-telemetry-suffix",
-                  "urls": {
-                    "search": {
-                      "base": "https://example.com/search-overrides",
-                      "method": "GET",
-                      "params": []
-                    }
-                  }
-                }
-              ]
-            })
-            .to_string(),
+            json!({ "data": [test_helpers::overrides_engine()] }).to_string(),
         );
+
         let engine_order_config = Arc::clone(&selector).set_search_config(
             json!({
               "data": [
-                {
-                  "recordType": "engine",
-                  "identifier": "after-defaults",
-                  "base": {
-                    "name": "after-defaults",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com",
-                        "method": "GET"
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true,
-                    }
-                  }],
-                },
-                {
-                  "recordType": "engine",
-                  "identifier": "b-engine",
-                  "base": {
-                    "name": "First Alphabetical",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com",
-                        "method": "GET"
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true
-                    }
-                  }],
-                },
-                {
-                  "recordType": "engine",
-                  "identifier": "a-engine",
-                  "base": {
-                    "name": "Last Alphabetical",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com",
-                        "method": "GET"
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true,
-                    }
-                  }],
-                },
-                {
-                  "recordType": "engine",
-                  "identifier": "default-engine",
-                  "base": {
-                    "name": "default-engine",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com",
-                        "method": "GET"
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true,
-                    }
-                  }],
-                },
-                {
-                  "recordType": "engine",
-                  "identifier": "default-private-engine",
-                  "base": {
-                    "name": "default-private-engine",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com",
-                        "method": "GET"
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true,
-                    }
-                  }],
-                },
+                EngineRecord::minimal("after-defaults", "after-defaults").build(),
+                EngineRecord::minimal("b-engine", "first alphabetical").build(),
+                EngineRecord::minimal("a-engine", "last alphabetical").build(),
+                EngineRecord::minimal("default-engine", "default-engine").build(),
+                EngineRecord::minimal("default-private-engine", "default-privite-engine").build(),
                 {
                   "recordType": "defaultEngines",
                   "globalDefault": "default-engine",
@@ -1762,16 +740,8 @@ mod tests {
             })
             .to_string(),
         );
-        assert!(
-            engine_order_config.is_ok(),
-            "Should have set the configuration successfully. {:?}",
-            engine_order_config
-        );
-        assert!(
-            config_overrides_result.is_ok(),
-            "Should have set the configuration overrides successfully. {:?}",
-            config_overrides_result
-        );
+        engine_order_config.expect("Should have set the configuration successfully");
+        config_overrides_result.expect("Should have set the configuration overrides successfully");
 
         fn assert_actual_engines_equals_expected(
             result: Result<RefinedSearchConfig, SearchApiError>,
@@ -1813,84 +783,22 @@ mod tests {
         let starts_with_wiki_config = Arc::clone(&selector).set_search_config(
             json!({
               "data": [
-                {
-                  "recordType": "engine",
-                  "identifier": "wiki-ca",
-                  "base": {
-                    "name": "wiki-ca",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com",
-                        "method": "GET"
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "locales": ["en-CA"],
-                      "regions": ["CA"],
-                    }
-                  }],
-                },
-                {
-                  "recordType": "engine",
-                  "identifier": "wiki-uk",
-                  "base": {
-                    "name": "wiki-uk",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com",
-                        "method": "GET"
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "locales": ["en-GB"],
-                      "regions": ["GB"],
-                    }
-                  }],
-                },
-                {
-                  "recordType": "engine",
-                  "identifier": "engine-1",
-                  "base": {
-                    "name": "engine-1",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com",
-                        "method": "GET"
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true,
-                    }
-                  }],
-                },
-                {
-                  "recordType": "engine",
-                  "identifier": "engine-2",
-                  "base": {
-                    "name": "engine-2",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com",
-                        "method": "GET"
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true,
-                    }
-                  }],
-                },
+                EngineRecord::minimal("wiki-ca", "wiki-ca")
+                .override_variants(
+                    Variant::new()
+                      .locales(&["en-CA"])
+                      .regions(&["CA"])
+                )
+                .build(),
+                EngineRecord::minimal("wiki-uk", "wiki-uk")
+                .override_variants(
+                    Variant::new()
+                      .locales(&["en-GB"])
+                      .regions(&["GB"])
+                )
+                .build(),
+                EngineRecord::minimal("engine-1", "engine-1").build(),
+                EngineRecord::minimal("engine-2", "engine-2").build(),
                 {
                   "recordType": "engineOrders",
                   "orders": [
@@ -1919,11 +827,7 @@ mod tests {
             })
             .to_string(),
         );
-        assert!(
-            starts_with_wiki_config.is_ok(),
-            "Should have set the configuration successfully. {:?}",
-            starts_with_wiki_config
-        );
+        starts_with_wiki_config.expect("Should have set the configuration successfully");
 
         assert_actual_engines_equals_expected(
             Arc::clone(&selector).filter_engine_configuration(SearchUserEnvironment {
@@ -2017,72 +921,21 @@ mod tests {
           },
           "timestamp": 1000,
           "changes": [
-            {
-              "recordType": "engine",
-              "identifier": "test",
-              "base": {
-                "name": "Test",
-                "classification": "general",
-                "urls": {
-                  "search": {
-                    "base": "https://example.com",
-                    "method": "GET",
-                  }
-                }
-              },
-              "variants": [{
-                "environment": {
-                  "allRegionsAndLocales": true
-                }
-              }],
-              "id": "c5dcd1da-7126-4abb-846b-ec85b0d4d0d7",
-              "schema": 1001,
-              "last_modified": 1000
-            },
-            {
-              "recordType": "engine",
-              "identifier": "distro-default",
-              "base": {
-                "name": "Distribution Default",
-                "classification": "general",
-                "urls": {
-                  "search": {
-                    "base": "https://example.com",
-                    "method": "GET"
-                  }
-                }
-              },
-              "variants": [{
-                "environment": {
-                  "allRegionsAndLocales": true
-                }
-              }],
-              "id": "c5dcd1da-7126-4abb-846b-ec85b0d4d0d8",
-              "schema": 1002,
-              "last_modified": 1000
-            },
-            {
-              "recordType": "engine",
-              "identifier": "private-default-FR",
-              "base": {
-                "name": "Private default FR",
-                "classification": "general",
-                "urls": {
-                  "search": {
-                    "base": "https://example.com",
-                    "method": "GET"
-                  }
-                }
-              },
-              "variants": [{
-                "environment": {
-                  "allRegionsAndLocales": true,
-                }
-              }],
-              "id": "c5dcd1da-7126-4abb-846b-ec85b0d4d0d9",
-              "schema": 1003,
-              "last_modified": 1000
-            },
+            EngineRecord::minimal("test", "Test")
+              .id("c5dcd1da-7126-4abb-846b-ec85b0d4d0d7")
+              .schema(1001)
+              .last_modified(1000)
+              .build(),
+            EngineRecord::minimal("distro-default", "Distribution Default")
+              .id("c5dcd1da-7126-4abb-846b-ec85b0d4d0d8")
+              .schema(1002)
+              .last_modified(1000)
+              .build(),
+            EngineRecord::minimal("private-default-FR", "Private default FR")
+              .id("c5dcd1da-7126-4abb-846b-ec85b0d4d0d9")
+              .schema(1003)
+              .last_modified(1000)
+              .build(),
             {
               "recordType": "defaultEngines",
               "globalDefault": "test",
@@ -2133,50 +986,24 @@ mod tests {
           },
           "timestamp": 1000,
           "changes": [
-            {
-              "recordType": "engine",
-              "identifier": "engine-de",
-              "base": {
-                "name": "German Engine",
-                "classification": "general",
-                "urls": {
-                  "search": {
-                    "base": "https://example.com",
-                    "method": "GET",
-                  }
-                }
-              },
-              "variants": [{
-                "environment": {
-                  "locales": ["de"]
-                }
-              }],
-              "id": "c5dcd1da-7126-4abb-846b-ec85b0d4d0d7",
-              "schema": 1001,
-              "last_modified": 1000
-            },
-            {
-              "recordType": "engine",
-              "identifier": "engine-en-us",
-              "base": {
-                "name": "English US Engine",
-                "classification": "general",
-                "urls": {
-                  "search": {
-                    "base": "https://example.com",
-                    "method": "GET"
-                  }
-                }
-              },
-              "variants": [{
-                "environment": {
-                  "locales": ["en-US"]
-                }
-              }],
-              "id": "c5dcd1da-7126-4abb-846b-ec85b0d4d0d8",
-              "schema": 1002,
-              "last_modified": 1000
-            },
+            EngineRecord::minimal("engine-de", "German Engine")
+              .override_variants(
+                Variant::new()
+                  .locales(&["de"])
+              )
+              .id("c5dcd1da-7126-4abb-846b-ec85b0d4d0d7")
+              .schema(1001)
+              .last_modified(1000)
+              .build(),
+            EngineRecord::minimal("engine-en-us", "English US Engine")
+              .override_variants(
+                Variant::new()
+                  .locales(&["en-US"])
+              )
+              .id("c5dcd1da-7126-4abb-846b-ec85b0d4d0d8")
+              .schema(1002)
+              .last_modified(1000)
+              .build(),
             {
               "recordType": "availableLocales",
               "locales": ["de", "en-US"],
@@ -2190,6 +1017,12 @@ mod tests {
     }
 
     fn response_body_overrides() -> String {
+        let mut engine = test_helpers::overrides_engine();
+        engine["identifier"] = json!("test");
+        engine["id"] = json!("c5dcd1da-7126-4abb-846b-ec85b0d4d0d7");
+        engine["schema"] = json!(1001);
+        engine["last_modified"] = json!(1000);
+
         json!({
           "metadata": {
             "id": "search-config-overrides-v2",
@@ -2201,27 +1034,7 @@ mod tests {
             },
           },
           "timestamp": 1000,
-          "changes": [
-            {
-              "urls": {
-                "search": {
-                  "base": "https://example.com/search-overrides",
-                  "method": "GET",
-                    "params": [{
-                      "name": "overrides-name",
-                      "value": "overrides-value",
-                    }],
-                }
-              },
-              "identifier": "test",
-              "clickUrl": "https://example.com/click-url",
-              "telemetrySuffix": "overrides-telemetry-suffix",
-              "partnerCode": "overrides-partner-code",
-              "id": "c5dcd1da-7126-4abb-846b-ec85b0d4d0d7",
-              "schema": 1001,
-              "last_modified": 1000
-            },
-          ]
+          "changes": [ engine ]
         })
         .to_string()
     }
@@ -2424,29 +1237,19 @@ mod tests {
 
         let selector = setup_remote_settings_test(APPLY_OVERRIDES, RECORDS_PRESENT);
 
-        let test_engine = SearchEngineDefinition {
-            charset: "UTF-8".to_string(),
-            classification: SearchEngineClassification::General,
-            identifier: "test".to_string(),
-            name: "Test".to_string(),
-            partner_code: "overrides-partner-code".to_string(),
-            telemetry_suffix: "overrides-telemetry-suffix".to_string(),
-            click_url: Some("https://example.com/click-url".to_string()),
-            urls: SearchEngineUrls {
-                search: SearchEngineUrl {
-                    base: "https://example.com/search-overrides".to_string(),
-                    params: vec![SearchUrlParam {
-                        name: "overrides-name".to_string(),
-                        value: Some("overrides-value".to_string()),
-                        enterprise_value: None,
-                        experiment_config: None,
-                    }],
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            ..Default::default()
-        };
+        let override_test_engine = ExpectedEngine::minimal("test", "Test")
+            .partner_code("overrides-partner-code")
+            .click_url("https://example.com/click-url")
+            .telemetry_suffix("overrides-telemetry-suffix")
+            .search_base("https://example.com/search-overrides")
+            .search_term_param_name("search")
+            .search_params(vec![SearchUrlParam {
+                name: "overrides-name".to_string(),
+                value: Some("overrides-value".to_string()),
+                enterprise_value: None,
+                experiment_config: None,
+            }])
+            .build();
 
         let result = Arc::clone(&selector).filter_engine_configuration(SearchUserEnvironment {
             ..Default::default()
@@ -2459,7 +1262,7 @@ mod tests {
         );
         assert_eq!(
             result.unwrap().engines[0],
-            test_engine.clone(),
+            override_test_engine.clone(),
             "Should have applied the overrides to the matching engine"
         );
         changes_mock.expect(1).assert();
@@ -2483,48 +1286,11 @@ mod tests {
 
         let selector = setup_remote_settings_test(DO_NOT_APPLY_OVERRIDES, RECORDS_PRESENT);
 
-        let test_engine = SearchEngineDefinition {
-            charset: "UTF-8".to_string(),
-            classification: SearchEngineClassification::General,
-            identifier: "test".to_string(),
-            name: "Test".to_string(),
-            urls: SearchEngineUrls {
-                search: SearchEngineUrl {
-                    base: "https://example.com".to_string(),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            ..Default::default()
-        };
-        let private_default_fr_engine = SearchEngineDefinition {
-            charset: "UTF-8".to_string(),
-            classification: SearchEngineClassification::General,
-            identifier: "private-default-FR".to_string(),
-            name: "Private default FR".to_string(),
-            urls: SearchEngineUrls {
-                search: SearchEngineUrl {
-                    base: "https://example.com".to_string(),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            ..Default::default()
-        };
-        let distro_default_engine = SearchEngineDefinition {
-            charset: "UTF-8".to_string(),
-            classification: SearchEngineClassification::General,
-            identifier: "distro-default".to_string(),
-            name: "Distribution Default".to_string(),
-            urls: SearchEngineUrls {
-                search: SearchEngineUrl {
-                    base: "https://example.com".to_string(),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            ..Default::default()
-        };
+        let test_engine = ExpectedEngine::minimal("test", "Test").build();
+        let private_default_fr_engine =
+            ExpectedEngine::minimal("private-default-FR", "Private default FR").build();
+        let distro_default_engine =
+            ExpectedEngine::minimal("distro-default", "Distribution Default").build();
 
         let result = Arc::clone(&selector).filter_engine_configuration(SearchUserEnvironment {
             distribution_id: "test-distro".to_string(),
@@ -2591,35 +1357,6 @@ mod tests {
 
         let selector = setup_remote_settings_test(DO_NOT_APPLY_OVERRIDES, RECORDS_PRESENT);
 
-        let de_engine = SearchEngineDefinition {
-            charset: "UTF-8".to_string(),
-            classification: SearchEngineClassification::General,
-            identifier: "engine-de".to_string(),
-            name: "German Engine".to_string(),
-            urls: SearchEngineUrls {
-                search: SearchEngineUrl {
-                    base: "https://example.com".to_string(),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            ..Default::default()
-        };
-        let en_us_engine = SearchEngineDefinition {
-            charset: "UTF-8".to_string(),
-            classification: SearchEngineClassification::General,
-            identifier: "engine-en-us".to_string(),
-            name: "English US Engine".to_string(),
-            urls: SearchEngineUrls {
-                search: SearchEngineUrl {
-                    base: "https://example.com".to_string(),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            ..Default::default()
-        };
-
         let result_de = Arc::clone(&selector).filter_engine_configuration(SearchUserEnvironment {
             locale: "de-AT".into(),
             ..Default::default()
@@ -2633,7 +1370,7 @@ mod tests {
         assert_eq!(
             result_de.unwrap(),
             RefinedSearchConfig {
-                engines: vec![de_engine,],
+                engines: vec![ExpectedEngine::minimal("engine-de", "German Engine").build()],
                 app_default_engine_id: None,
                 app_private_default_engine_id: None,
             },
@@ -2647,7 +1384,7 @@ mod tests {
         assert_eq!(
             result_en.unwrap(),
             RefinedSearchConfig {
-                engines: vec![en_us_engine,],
+                engines: vec![ExpectedEngine::minimal("engine-en-us", "English US Engine").build(),],
                 app_default_engine_id: None,
                 app_private_default_engine_id: None,
             },
@@ -2664,22 +1401,7 @@ mod tests {
         let config_overrides_result = Arc::clone(&selector).set_config_overrides(
             json!({
               "data": [
-                {
-                  "identifier": "test",
-                  "partnerCode": "overrides-partner-code",
-                  "clickUrl": "https://example.com/click-url",
-                  "telemetrySuffix": "overrides-telemetry-suffix",
-                  "urls": {
-                    "search": {
-                      "base": "https://example.com/search-overrides",
-                      "method": "GET",
-                        "params": [{
-                          "name": "overrides-name",
-                          "value": "overrides-value",
-                        }],
-                    }
-                  },
-                },
+                test_helpers::overrides_engine(),
                 { // Test partial override with some missing fields
                   "identifier": "distro-default",
                   "partnerCode": "distro-overrides-partner-code",
@@ -2697,100 +1419,40 @@ mod tests {
         let config_result = Arc::clone(&selector).set_search_config(
             json!({
               "data": [
-                {
-                  "recordType": "engine",
-                  "identifier": "test",
-                  "base": {
-                    "name": "Test",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com",
-                        "method": "GET",
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true
-                    }
-                  }],
-                },
-                {
-                  "recordType": "engine",
-                  "identifier": "distro-default",
-                  "base": {
-                    "name": "Distribution Default",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com",
-                        "method": "GET"
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "allRegionsAndLocales": true
-                    },
-                    "telemetrySuffix": "distro-telemetry-suffix",
-                  }],
-                },
+                EngineRecord::minimal("overrides-engine", "Overrides Engine")
+                    .build(),
+                EngineRecord::minimal("distro-default", "Distribution Default")
+                    .override_variants(Variant::new()
+                    .all_regions_and_locales()
+                    .telemetry_suffix("distro-telemetry-suffix"))
+                    .build(),
               ]
             })
             .to_string(),
         );
-        assert!(
-            config_result.is_ok(),
-            "Should have set the configuration successfully. {:?}",
-            config_result
-        );
-        assert!(
-            config_overrides_result.is_ok(),
-            "Should have set the configuration overrides successfully. {:?}",
-            config_overrides_result
-        );
-
-        let test_engine = SearchEngineDefinition {
-            charset: "UTF-8".to_string(),
-            classification: SearchEngineClassification::General,
-            identifier: "test".to_string(),
-            name: "Test".to_string(),
-            partner_code: "overrides-partner-code".to_string(),
-            telemetry_suffix: "overrides-telemetry-suffix".to_string(),
-            click_url: Some("https://example.com/click-url".to_string()),
-            urls: SearchEngineUrls {
-                search: SearchEngineUrl {
-                    base: "https://example.com/search-overrides".to_string(),
-                    params: vec![SearchUrlParam {
-                        name: "overrides-name".to_string(),
-                        value: Some("overrides-value".to_string()),
-                        enterprise_value: None,
-                        experiment_config: None,
-                    }],
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            ..Default::default()
-        };
-        let distro_default_engine = SearchEngineDefinition {
-            charset: "UTF-8".to_string(),
-            classification: SearchEngineClassification::General,
-            identifier: "distro-default".to_string(),
-            name: "Distribution Default".to_string(),
-            partner_code: "distro-overrides-partner-code".to_string(),
-            telemetry_suffix: "distro-telemetry-suffix".to_string(),
-            click_url: Some("https://example.com/click-url-distro".to_string()),
-            urls: SearchEngineUrls {
-                search: SearchEngineUrl {
-                    base: "https://example.com/search-distro".to_string(),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            ..Default::default()
-        };
+        config_result.expect("Should have set the configuration successfully");
+        config_overrides_result.expect("Should have set the configuration overrides successfully");
+
+        let override_test_engine = ExpectedEngine::minimal("overrides-engine", "Overrides Engine")
+            .partner_code("overrides-partner-code")
+            .click_url("https://example.com/click-url")
+            .telemetry_suffix("overrides-telemetry-suffix")
+            .search_base("https://example.com/search-overrides")
+            .search_params(vec![SearchUrlParam {
+                name: "overrides-name".to_string(),
+                value: Some("overrides-value".to_string()),
+                enterprise_value: None,
+                experiment_config: None,
+            }])
+            .build();
+
+        let override_distro_default_engine =
+            ExpectedEngine::minimal("distro-default", "Distribution Default")
+                .partner_code("distro-overrides-partner-code")
+                .click_url("https://example.com/click-url-distro")
+                .search_base("https://example.com/search-distro")
+                .telemetry_suffix("distro-telemetry-suffix")
+                .build();
 
         let result = Arc::clone(&selector).filter_engine_configuration(SearchUserEnvironment {
             ..Default::default()
@@ -2804,7 +1466,10 @@ mod tests {
         assert_eq!(
             result.unwrap(),
             RefinedSearchConfig {
-                engines: vec![distro_default_engine.clone(), test_engine.clone(),],
+                engines: vec![
+                    override_distro_default_engine.clone(),
+                    override_test_engine.clone(),
+                ],
                 app_default_engine_id: None,
                 app_private_default_engine_id: None
             },
@@ -2815,27 +1480,10 @@ mod tests {
     #[test]
     fn test_filter_engine_configuration_negotiate_locales() {
         let selector = Arc::new(SearchEngineSelector::new());
-
         let config_overrides_result = Arc::clone(&selector).set_config_overrides(
-            json!({
-              "data": [
-                {
-                  "identifier": "overrides-engine",
-                  "partnerCode": "overrides-partner-code",
-                  "clickUrl": "https://example.com/click-url",
-                  "telemetrySuffix": "overrides-telemetry-suffix",
-                  "urls": {
-                    "search": {
-                      "base": "https://example.com/search-overrides",
-                      "method": "GET",
-                      "params": []
-                    }
-                  }
-                }
-              ]
-            })
-            .to_string(),
+            json!({ "data": [test_helpers::overrides_engine()] }).to_string(),
         );
+
         let config_result = Arc::clone(&selector).set_search_config(
             json!({
               "data": [
@@ -2843,87 +1491,20 @@ mod tests {
                     "recordType": "availableLocales",
                     "locales": ["de", "en-US"]
                 },
-                {
-                  "recordType": "engine",
-                  "identifier": "engine-de",
-                  "base": {
-                    "name": "German Engine",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com",
-                        "method": "GET",
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "locales": ["de"]
-                    }
-                  }],
-                },
-                {
-                  "recordType": "engine",
-                  "identifier": "engine-en-us",
-                  "base": {
-                    "name": "English US Engine",
-                    "classification": "general",
-                    "urls": {
-                      "search": {
-                        "base": "https://example.com",
-                        "method": "GET"
-                      }
-                    }
-                  },
-                  "variants": [{
-                    "environment": {
-                      "locales": ["en-US"]
-                    }
-                  }],
-                },
+                EngineRecord::minimal("engine-de", "German Engine")
+                    .override_variants(Variant::new()
+                    .locales(&["de"]))
+                    .build(),
+                EngineRecord::minimal("engine-en-us", "English US Engine")
+                .override_variants(Variant::new()
+                    .locales(&["en-US"]))
+                    .build(),
               ]
             })
             .to_string(),
         );
-        assert!(
-            config_result.is_ok(),
-            "Should have set the configuration successfully. {:?}",
-            config_result
-        );
-        assert!(
-            config_overrides_result.is_ok(),
-            "Should have set the configuration overrides successfully. {:?}",
-            config_overrides_result
-        );
-
-        let de_engine = SearchEngineDefinition {
-            charset: "UTF-8".to_string(),
-            classification: SearchEngineClassification::General,
-            identifier: "engine-de".to_string(),
-            name: "German Engine".to_string(),
-            urls: SearchEngineUrls {
-                search: SearchEngineUrl {
-                    base: "https://example.com".to_string(),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            ..Default::default()
-        };
-        let en_us_engine = SearchEngineDefinition {
-            charset: "UTF-8".to_string(),
-            classification: SearchEngineClassification::General,
-            identifier: "engine-en-us".to_string(),
-            name: "English US Engine".to_string(),
-            urls: SearchEngineUrls {
-                search: SearchEngineUrl {
-                    base: "https://example.com".to_string(),
-                    ..Default::default()
-                },
-                ..Default::default()
-            },
-            ..Default::default()
-        };
+        config_result.expect("Should have set the configuration successfully");
+        config_overrides_result.expect("Should have set the configuration overrides successfully");
 
         let result_de = Arc::clone(&selector).filter_engine_configuration(SearchUserEnvironment {
             locale: "de-AT".into(),
@@ -2938,7 +1519,7 @@ mod tests {
         assert_eq!(
             result_de.unwrap(),
             RefinedSearchConfig {
-                engines: vec![de_engine,],
+                engines: vec![ExpectedEngine::minimal("engine-de", "German Engine").build(),],
                 app_default_engine_id: None,
                 app_private_default_engine_id: None,
             },
@@ -2952,7 +1533,7 @@ mod tests {
         assert_eq!(
             result_en.unwrap(),
             RefinedSearchConfig {
-                engines: vec![en_us_engine,],
+                engines: vec![ExpectedEngine::minimal("engine-en-us", "English US Engine").build(),],
                 app_default_engine_id: None,
                 app_private_default_engine_id: None,
             },
diff --git a/third_party/rust/search/src/test_helpers.rs b/third_party/rust/search/src/test_helpers.rs
new file mode 100644
index 0000000000000..186e160be9eb2
--- /dev/null
+++ b/third_party/rust/search/src/test_helpers.rs
@@ -0,0 +1,502 @@
+use crate::{
+    SearchEngineClassification, SearchEngineDefinition, SearchEngineUrl, SearchEngineUrls,
+    SearchUrlParam,
+};
+use serde_json::{json, Value};
+
+#[cfg(test)]
+pub struct EngineRecord {
+    record_type: String,
+    identifier: String,
+    name: String,
+    classification: String,
+    urls: Value,
+    variants: Vec<Value>,
+    partner_code: String,
+
+    // Remote Settings metadata
+    id: Option<String>,
+    schema: Option<i64>,
+    last_modified: Option<i64>,
+}
+
+#[cfg(test)]
+impl EngineRecord {
+    pub fn full(identifier: &str, name: &str) -> Self {
+        Self {
+            record_type: "engine".to_string(),
+            identifier: identifier.to_string(),
+            name: name.to_string(),
+            classification: "general".to_string(),
+            partner_code: "partner-code".to_string(),
+            urls: json!({
+                "search": {
+                    "base": "https://example.com",
+                    "method": "GET",
+                    "params": [{
+                        "name": "search-name",
+                        "enterpriseValue": "enterprise-value",
+                    }],
+                    "searchTermParamName": "q",
+                },
+                "suggestions": {
+                    "base": "https://example.com/suggestions",
+                    "method": "POST",
+                    "params": [{
+                        "name": "suggestion-name",
+                        "value": "suggestion-value",
+                    }],
+                    "searchTermParamName": "suggest",
+                },
+                "trending": {
+                    "base": "https://example.com/trending",
+                    "method": "GET",
+                    "params": [{
+                        "name": "trending-name",
+                        "experimentConfig": "trending-experiment-value",
+                    }],
+                },
+                "searchForm": {
+                    "base": "https://example.com/search-form",
+                    "method": "GET",
+                    "params": [{
+                        "name": "search-form-name",
+                        "value": "search-form-value",
+                    }],
+                },
+                "visualSearch": {
+                    "base": "https://example.com/visual-search",
+                    "method": "GET",
+                    "params": [{
+                        "name": "visual-search-name",
+                        "value": "visual-search-value",
+                    }],
+                    "searchTermParamName": "url",
+                },
+            }),
+            variants: vec![json!({
+                "environment": {
+                    "allRegionsAndLocales": true,
+                }
+            })],
+            // Remote Settings metadata
+            id: None,
+            schema: None,
+            last_modified: None,
+        }
+    }
+    pub fn minimal(identifier: &str, name: &str) -> Self {
+        Self {
+            record_type: "engine".to_string(),
+            identifier: identifier.to_string(),
+            name: name.to_string(),
+            classification: "general".to_string(),
+            partner_code: "partner-code".to_string(),
+            urls: json!({
+                "search": {
+                    "base": "https://example.com",
+                    "method": "GET",
+                    "searchTermParamName": "search",
+                },
+            }),
+            variants: vec![json!({
+                "environment": {
+                    "allRegionsAndLocales": true,
+                }
+            })],
+            // Remote Settings metadata
+            id: None,
+            schema: None,
+            last_modified: None,
+        }
+    }
+
+    pub fn build(self) -> Value {
+        let mut record = json!({
+            "recordType": self.record_type,
+            "identifier": self.identifier,
+            "base": {
+                "name": self.name,
+                "classification": self.classification,
+                "partnerCode": self.partner_code,
+                "urls": self.urls,
+            },
+            "variants": self.variants,
+        });
+
+        if let Some(id) = self.id {
+            record["id"] = json!(id);
+        }
+        if let Some(schema) = self.schema {
+            record["schema"] = json!(schema);
+        }
+        if let Some(last_modified) = self.last_modified {
+            record["last_modified"] = json!(last_modified);
+        }
+        record
+    }
+
+    pub fn add_variant(mut self, vb: Variant) -> Self {
+        self.variants.push(vb.build());
+        self
+    }
+
+    pub fn override_variants(mut self, vb: Variant) -> Self {
+        self.variants = vec![vb.build()];
+        self
+    }
+
+    // Remote Settings metadata
+    pub fn id(mut self, id: &str) -> Self {
+        self.id = Some(id.to_string());
+        self
+    }
+
+    pub fn schema(mut self, schema: i64) -> Self {
+        self.schema = Some(schema);
+        self
+    }
+
+    pub fn last_modified(mut self, last_modified: i64) -> Self {
+        self.last_modified = Some(last_modified);
+        self
+    }
+}
+
+#[cfg(test)]
+pub struct Variant {
+    env: Value,
+    urls: Option<Value>,
+    partner_code: Option<String>,
+    telemetry_suffix: Option<String>,
+    optional: Option<bool>,
+    subvariants: Vec<Value>,
+}
+
+#[cfg(test)]
+impl Variant {
+    pub fn new() -> Self {
+        Self {
+            env: json!({}),
+            urls: None,
+            partner_code: None,
+            telemetry_suffix: None,
+            optional: None,
+            subvariants: vec![],
+        }
+    }
+
+    pub fn all_regions_and_locales(mut self) -> Self {
+        self.env["allRegionsAndLocales"] = serde_json::Value::Bool(true);
+        self
+    }
+
+    pub fn regions(mut self, regions: &[&str]) -> Self {
+        self.env["regions"] = json!(regions);
+        self
+    }
+
+    pub fn locales(mut self, locales: &[&str]) -> Self {
+        self.env["locales"] = json!(locales);
+        self
+    }
+
+    pub fn applications(mut self, applications: &[&str]) -> Self {
+        self.env["applications"] = json!(applications);
+        self
+    }
+
+    pub fn distributions(mut self, distributions: &[&str]) -> Self {
+        self.env["distributions"] = json!(distributions);
+        self
+    }
+
+    pub fn partner_code(mut self, code: &str) -> Self {
+        self.partner_code = Some(code.to_string());
+        self
+    }
+
+    pub fn telemetry_suffix(mut self, suffix: &str) -> Self {
+        self.telemetry_suffix = Some(suffix.to_string());
+        self
+    }
+
+    pub fn optional(mut self, value: bool) -> Self {
+        self.optional = Some(value);
+        self
+    }
+
+    pub fn urls(mut self, urls: Value) -> Self {
+        self.urls = Some(urls);
+        self
+    }
+
+    pub fn add_subvariant(mut self, sv: SubVariant) -> Self {
+        self.subvariants.push(sv.build());
+        self
+    }
+
+    pub fn build(self) -> Value {
+        let mut variant = json!({ "environment": self.env });
+
+        if let Some(urls) = self.urls {
+            variant["urls"] = urls;
+        }
+        if let Some(partner_code) = self.partner_code {
+            variant["partnerCode"] = json!(partner_code);
+        }
+        if let Some(telemetry_suffix) = self.telemetry_suffix {
+            variant["telemetrySuffix"] = json!(telemetry_suffix);
+        }
+        if let Some(optional) = self.optional {
+            variant["optional"] = json!(optional);
+        }
+        if !self.subvariants.is_empty() {
+            variant["subVariants"] = json!(self.subvariants);
+        }
+
+        variant
+    }
+}
+
+#[cfg(test)]
+pub struct SubVariant {
+    env: Value,
+    urls: Option<Value>,
+    partner_code: Option<String>,
+    telemetry_suffix: Option<String>,
+    optional: Option<bool>,
+}
+
+#[cfg(test)]
+impl SubVariant {
+    pub fn new() -> Self {
+        Self {
+            env: json!({}),
+            urls: None,
+            partner_code: None,
+            telemetry_suffix: None,
+            optional: None,
+        }
+    }
+
+    pub fn locales(mut self, locales: &[&str]) -> Self {
+        self.env["locales"] = json!(locales);
+        self
+    }
+
+    pub fn partner_code(mut self, code: &str) -> Self {
+        self.partner_code = Some(code.to_string());
+        self
+    }
+
+    pub fn telemetry_suffix(mut self, suffix: &str) -> Self {
+        self.telemetry_suffix = Some(suffix.to_string());
+        self
+    }
+
+    pub fn urls(mut self, urls: Value) -> Self {
+        self.urls = Some(urls);
+        self
+    }
+
+    pub fn build(self) -> Value {
+        let mut subvariant = json!({ "environment": self.env });
+        if let Some(urls) = self.urls {
+            subvariant["urls"] = urls;
+        }
+        if let Some(partner_code) = self.partner_code {
+            subvariant["partnerCode"] = json!(partner_code);
+        }
+        if let Some(telemetry_suffix) = self.telemetry_suffix {
+            subvariant["telemetrySuffix"] = json!(telemetry_suffix);
+        }
+        if let Some(optional) = self.optional {
+            subvariant["optional"] = json!(optional);
+        }
+        subvariant
+    }
+}
+
+#[cfg(test)]
+pub fn overrides_engine() -> Value {
+    json!({
+      "identifier": "overrides-engine",
+      "name": "Overrides Engine",
+      "partnerCode": "overrides-partner-code",
+      "clickUrl": "https://example.com/click-url",
+      "telemetrySuffix": "overrides-telemetry-suffix",
+      "urls": {
+        "search": {
+          "base": "https://example.com/search-overrides",
+          "method": "GET",
+            "params": [{
+              "name": "overrides-name",
+              "value": "overrides-value",
+            }],
+        }
+      }
+    })
+}
+
+#[cfg(test)]
+pub struct ExpectedEngine {
+    engine: SearchEngineDefinition,
+}
+
+#[cfg(test)]
+impl ExpectedEngine {
+    pub fn full(identifier: &str, name: &str) -> Self {
+        Self {
+            engine: Self::expected_full_engine(identifier, name),
+        }
+    }
+
+    pub fn minimal(identifier: &str, name: &str) -> Self {
+        Self {
+            engine: Self::expected_minimal_engine(identifier, name),
+        }
+    }
+
+    pub fn partner_code(mut self, code: &str) -> Self {
+        self.engine.partner_code = code.to_string();
+        self
+    }
+
+    pub fn telemetry_suffix(mut self, suffix: &str) -> Self {
+        self.engine.telemetry_suffix = suffix.to_string();
+        self
+    }
+
+    pub fn click_url(mut self, url: &str) -> Self {
+        self.engine.click_url = Some(url.to_string());
+        self
+    }
+
+    pub fn optional(mut self, value: bool) -> Self {
+        self.engine.optional = value;
+        self
+    }
+
+    pub fn search_method(mut self, method: &str) -> Self {
+        self.engine.urls.search.method = method.to_string();
+        self
+    }
+
+    pub fn search_base(mut self, base: &str) -> Self {
+        self.engine.urls.search.base = base.to_string();
+        self
+    }
+
+    pub fn search_term_param_name(mut self, param: &str) -> Self {
+        self.engine.urls.search.search_term_param_name = Some(param.to_string());
+        self
+    }
+
+    pub fn search_params(mut self, params: Vec<SearchUrlParam>) -> Self {
+        self.engine.urls.search.params = params;
+        self
+    }
+
+    pub fn build(self) -> SearchEngineDefinition {
+        self.engine
+    }
+
+    fn expected_full_engine(identifier: &str, name: &str) -> SearchEngineDefinition {
+        SearchEngineDefinition {
+            charset: "UTF-8".to_string(),
+            classification: SearchEngineClassification::General,
+            identifier: identifier.to_string(),
+            name: name.to_string(),
+            partner_code: "partner-code".to_string(),
+            urls: SearchEngineUrls {
+                search: SearchEngineUrl {
+                    base: "https://example.com".to_string(),
+                    method: "GET".to_string(),
+                    params: vec![SearchUrlParam {
+                        name: "search-name".to_string(),
+                        value: None,
+                        enterprise_value: Some("enterprise-value".to_string()),
+                        experiment_config: None,
+                    }],
+                    search_term_param_name: Some("q".to_string()),
+                    ..Default::default()
+                },
+                suggestions: Some(SearchEngineUrl {
+                    base: "https://example.com/suggestions".to_string(),
+                    method: "POST".to_string(),
+                    params: vec![SearchUrlParam {
+                        name: "suggestion-name".to_string(),
+                        value: Some("suggestion-value".to_string()),
+                        enterprise_value: None,
+                        experiment_config: None,
+                    }],
+                    search_term_param_name: Some("suggest".to_string()),
+                    ..Default::default()
+                }),
+                trending: Some(SearchEngineUrl {
+                    base: "https://example.com/trending".to_string(),
+                    method: "GET".to_string(),
+                    params: vec![SearchUrlParam {
+                        name: "trending-name".to_string(),
+                        value: None,
+                        enterprise_value: None,
+                        experiment_config: Some("trending-experiment-value".to_string()),
+                    }],
+                    ..Default::default()
+                }),
+                search_form: Some(SearchEngineUrl {
+                    base: "https://example.com/search-form".to_string(),
+                    method: "GET".to_string(),
+                    params: vec![SearchUrlParam {
+                        name: "search-form-name".to_string(),
+                        value: Some("search-form-value".to_string()),
+                        experiment_config: None,
+                        enterprise_value: None,
+                    }],
+                    ..Default::default()
+                }),
+                visual_search: Some(SearchEngineUrl {
+                    base: "https://example.com/visual-search".to_string(),
+                    method: "GET".to_string(),
+                    params: vec![SearchUrlParam {
+                        name: "visual-search-name".to_string(),
+                        value: Some("visual-search-value".to_string()),
+                        experiment_config: None,
+                        enterprise_value: None,
+                    }],
+                    search_term_param_name: Some("url".to_string()),
+                    ..Default::default()
+                }),
+            },
+            ..Default::default()
+        }
+    }
+
+    fn expected_minimal_engine(identifier: &str, name: &str) -> SearchEngineDefinition {
+        SearchEngineDefinition {
+            aliases: Vec::new(),
+            charset: "UTF-8".to_string(),
+            classification: SearchEngineClassification::General,
+            identifier: identifier.to_string(),
+            is_new_until: None,
+            name: name.to_string(),
+            optional: false,
+            order_hint: None,
+            partner_code: "partner-code".to_string(),
+            telemetry_suffix: String::new(),
+            urls: SearchEngineUrls {
+                search: SearchEngineUrl {
+                    base: "https://example.com".to_string(),
+                    search_term_param_name: Some("search".to_string()),
+                    ..Default::default()
+                },
+                suggestions: None,
+                trending: None,
+                search_form: None,
+                visual_search: None,
+            },
+            click_url: None,
+        }
+    }
+}
diff --git a/third_party/rust/sql-support/.cargo-checksum.json b/third_party/rust/sql-support/.cargo-checksum.json
index 6fc63116b35dd..2ed5f19711006 100644
--- a/third_party/rust/sql-support/.cargo-checksum.json
+++ b/third_party/rust/sql-support/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"3f7d58923501bb32fd721524762265c435e15257c5357bf8b6e7783e5cf88fb0","src/conn_ext.rs":"68e56f325ed57898add4fb86c4392a490855baa23a2fc08095be55f4e05c76c3","src/debug_tools.rs":"112c2ff182ba8181e5c62c27bc668c7e67a1a65e9f7ab92e52bf8f611f8c062e","src/each_chunk.rs":"0b4de829ccaf06b743d0ee5bce766399d841e12592cd00d22605b75a5ae6dbd0","src/lazy.rs":"a96b4f4ec572538b49cdfa8fee981dcf5143a5f51163fb8a573d3ac128df70f9","src/lib.rs":"ea2df947bd03cfb97de205274ac0c83660edb4294bc9c2dc427c532786bd5e4b","src/maintenance.rs":"1508244ba4270e7af0aac3d75e34ecf917551ca4ae6ec9c1733c37253a2b9aab","src/maybe_cached.rs":"0b18425595055883a98807fbd62ff27a79c18af34e7cb3439f8c3438463ef2dd","src/open_database.rs":"4cd52e1d4b422efa04a2477cb20aa229537c175f710eabfc3acbac3b218d45a3","src/repeat.rs":"3dad3cbc6f47fc7598fc7b0fbf79b9c915322396d1f64d3d09651d100d428351"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"3f7d58923501bb32fd721524762265c435e15257c5357bf8b6e7783e5cf88fb0","src/conn_ext.rs":"68e56f325ed57898add4fb86c4392a490855baa23a2fc08095be55f4e05c76c3","src/debug_tools.rs":"112c2ff182ba8181e5c62c27bc668c7e67a1a65e9f7ab92e52bf8f611f8c062e","src/each_chunk.rs":"0b4de829ccaf06b743d0ee5bce766399d841e12592cd00d22605b75a5ae6dbd0","src/lazy.rs":"a96b4f4ec572538b49cdfa8fee981dcf5143a5f51163fb8a573d3ac128df70f9","src/lib.rs":"ea2df947bd03cfb97de205274ac0c83660edb4294bc9c2dc427c532786bd5e4b","src/maintenance.rs":"1508244ba4270e7af0aac3d75e34ecf917551ca4ae6ec9c1733c37253a2b9aab","src/maybe_cached.rs":"0b18425595055883a98807fbd62ff27a79c18af34e7cb3439f8c3438463ef2dd","src/open_database.rs":"bfb61df14739abd812b5295598d491b42ef51e2ad809ec32837522bccdf14500","src/repeat.rs":"3dad3cbc6f47fc7598fc7b0fbf79b9c915322396d1f64d3d09651d100d428351"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/sql-support/src/open_database.rs b/third_party/rust/sql-support/src/open_database.rs
index ccbbe08f3cd26..ec715c163376d 100644
--- a/third_party/rust/sql-support/src/open_database.rs
+++ b/third_party/rust/sql-support/src/open_database.rs
@@ -153,6 +153,7 @@ fn do_open_database_with_flags<CI: ConnectionInitializer, P: AsRef<Path>>(
     connection_initializer.prepare(&conn, db_empty)?;
 
     if open_flags.contains(OpenFlags::SQLITE_OPEN_READ_WRITE) {
+        let mut write_schema_version = true;
         let tx = conn.transaction_with_behavior(TransactionBehavior::Immediate)?;
         if db_empty {
             debug!("{}: initializing new database", CI::NAME);
@@ -161,20 +162,25 @@ fn do_open_database_with_flags<CI: ConnectionInitializer, P: AsRef<Path>>(
             let mut current_version = get_schema_version(&tx)?;
             if current_version > CI::END_VERSION {
                 return Err(Error::IncompatibleVersion(current_version));
-            }
-            while current_version < CI::END_VERSION {
-                debug!(
-                    "{}: upgrading database to {}",
-                    CI::NAME,
-                    current_version + 1
-                );
-                connection_initializer.upgrade_from(&tx, current_version)?;
-                current_version += 1;
+            } else if current_version == CI::END_VERSION {
+                write_schema_version = false;
+            } else {
+                while current_version < CI::END_VERSION {
+                    debug!(
+                        "{}: upgrading database to {}",
+                        CI::NAME,
+                        current_version + 1
+                    );
+                    connection_initializer.upgrade_from(&tx, current_version)?;
+                    current_version += 1;
+                }
             }
         }
         debug!("{}: finishing writable database open", CI::NAME);
         connection_initializer.finish(&tx)?;
-        set_schema_version(&tx, CI::END_VERSION)?;
+        if write_schema_version {
+            set_schema_version(&tx, CI::END_VERSION)?;
+        }
         tx.commit()?;
     } else {
         // There's an implied requirement that the first connection to a DB is
diff --git a/third_party/rust/suggest/.cargo-checksum.json b/third_party/rust/suggest/.cargo-checksum.json
index b1550927e66e9..cec26e95fdf28 100644
--- a/third_party/rust/suggest/.cargo-checksum.json
+++ b/third_party/rust/suggest/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"dff441439e78c2441c52403bf52d1dd2bf688da5f26af940631ca71810977a4e","README.md":"60e4f7ca928dd739768925ff26eada1907509b3e48dfd369a00845bc7eac1653","metrics.yaml":"5df9ca1a3415d9a796ccc8dba8e3126cbcc338f7792b0053030e3b5399470149","src/benchmarks/README.md":"ccee8dbddba8762d0453fa855bd6984137b224b8c019f3dd8e86a3c303f51d71","src/benchmarks/client.rs":"e5897d4e2eda06809fa6dc6db4e780b9ef266f613fb113aa6613b83f7005dd0b","src/benchmarks/geoname.rs":"fb4e8eb48e27879fe3f35d6d2415f0237b087b51b89ee03fb50fa635e1c1a3b5","src/benchmarks/ingest.rs":"3e0dc8239452b449df79100bfe21fbfae85f6c55b6bc17336e9f86000a7b4042","src/benchmarks/mod.rs":"2c9a39b7a5144674d2475f4d7d69d77c4545f9aa5f123968cb32574e76f10b1a","src/benchmarks/query.rs":"d54946063e72cf98e7f46d94665c17c66af637774c2bb50cd5798dbe63d74f3c","src/config.rs":"0ca876e845841bb6429862c0904c82265003f53b55aea053fac60aed278586a7","src/db.rs":"9492dfe1660fad68770f7746682c164205fa0e8f4bbaadfda75d18f5d791b42d","src/error.rs":"fd26db688c01987f4f4cbd1e4f728b7f4981c24d4c13bfbc9d92a1322e99c740","src/fakespot.rs":"f501c9fe5296e7c130a9fcb532b861465717652cb5ef688230bc7a3b94df91b1","src/geoname.rs":"adbf29aab9031c2d09242dfcbf351c139b8bb792fa42ed72ef33082c920f69e8","src/lib.rs":"772dfc3625c0733dde442a5e10020d53e54fc86e39c37ce43e84dfb79a534936","src/metrics.rs":"871f0d834efbbc9e26d61f66fa31f0021dcf41444746cd7c082f93ba9628e399","src/provider.rs":"dbf7a0da37f7022c6606c06356ce152b44f799dabd6a6ee734dba426c1d96386","src/query.rs":"d4eeaf43251c8e6404ac75570ed069085c7e3f61be887ab8d127b08c106198c5","src/rs.rs":"60bc209657820050151c7025f14055f6bc56b889ac16fc827bd4697a3033f3f6","src/schema.rs":"490f7544b45361807fb7fe3d213e1827ef0b4f588c2b35fad46eb4478d6a8c5a","src/store.rs":"180c5720e4b7955f02e4a084277247e06f2aee2c160f28070c854428588beae4","src/suggestion.rs":"d97050db6df628da09a8f481a4e650b17ce916f3cd88118c6571d2883d36b964","src/testing/client.rs":"47a32fd84c733001f11e8bfff94dc8c060b6b0780346dca5ddc7a5f5489c1d85","src/testing/data.rs":"4f79c37eb026b02d60fdbcfa871df4e25589d2cd8153753ae0a3f05333ce4423","src/testing/mod.rs":"7b4a507aceb159347843ba09461e0d58962027ba5dcd35aa4b993fe3666508ce","src/util.rs":"22091900a1f83babe126d86da10388f9d4d22b34dd1e67afdd868fedeb460c2b","src/weather.rs":"d7b747a32549d5200f19b2ba851cda84086b8a8f4ee7affe90e95920b22274f2","src/yelp.rs":"1fe3b7eb6b3f7462e9758b6eb62457dfa26f7549a8290cdff7637d2fb3ffea4f","uniffi.toml":"8205e4679ac26d53e70af0f85c013fd27cda1119f4322aebf5f2b9403d45a611"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"f5d1ff1a9b75bfc0eeee9ac46230fa47946f1d4dd91f0539bfbeeeafffcef046","README.md":"60e4f7ca928dd739768925ff26eada1907509b3e48dfd369a00845bc7eac1653","metrics.yaml":"5df9ca1a3415d9a796ccc8dba8e3126cbcc338f7792b0053030e3b5399470149","src/benchmarks/README.md":"ccee8dbddba8762d0453fa855bd6984137b224b8c019f3dd8e86a3c303f51d71","src/benchmarks/client.rs":"e5897d4e2eda06809fa6dc6db4e780b9ef266f613fb113aa6613b83f7005dd0b","src/benchmarks/geoname.rs":"fb4e8eb48e27879fe3f35d6d2415f0237b087b51b89ee03fb50fa635e1c1a3b5","src/benchmarks/ingest.rs":"3e0dc8239452b449df79100bfe21fbfae85f6c55b6bc17336e9f86000a7b4042","src/benchmarks/mod.rs":"2c9a39b7a5144674d2475f4d7d69d77c4545f9aa5f123968cb32574e76f10b1a","src/benchmarks/query.rs":"d54946063e72cf98e7f46d94665c17c66af637774c2bb50cd5798dbe63d74f3c","src/config.rs":"0ca876e845841bb6429862c0904c82265003f53b55aea053fac60aed278586a7","src/db.rs":"9492dfe1660fad68770f7746682c164205fa0e8f4bbaadfda75d18f5d791b42d","src/error.rs":"fd26db688c01987f4f4cbd1e4f728b7f4981c24d4c13bfbc9d92a1322e99c740","src/fakespot.rs":"f501c9fe5296e7c130a9fcb532b861465717652cb5ef688230bc7a3b94df91b1","src/geoname.rs":"adbf29aab9031c2d09242dfcbf351c139b8bb792fa42ed72ef33082c920f69e8","src/lib.rs":"772dfc3625c0733dde442a5e10020d53e54fc86e39c37ce43e84dfb79a534936","src/metrics.rs":"871f0d834efbbc9e26d61f66fa31f0021dcf41444746cd7c082f93ba9628e399","src/provider.rs":"dbf7a0da37f7022c6606c06356ce152b44f799dabd6a6ee734dba426c1d96386","src/query.rs":"d4eeaf43251c8e6404ac75570ed069085c7e3f61be887ab8d127b08c106198c5","src/rs.rs":"60bc209657820050151c7025f14055f6bc56b889ac16fc827bd4697a3033f3f6","src/schema.rs":"490f7544b45361807fb7fe3d213e1827ef0b4f588c2b35fad46eb4478d6a8c5a","src/store.rs":"d1b561668a9ddb4ceabf83a69ca949879c7d8fe333d8b1bad4d1a42623629259","src/suggestion.rs":"d97050db6df628da09a8f481a4e650b17ce916f3cd88118c6571d2883d36b964","src/testing/client.rs":"47a32fd84c733001f11e8bfff94dc8c060b6b0780346dca5ddc7a5f5489c1d85","src/testing/data.rs":"4f79c37eb026b02d60fdbcfa871df4e25589d2cd8153753ae0a3f05333ce4423","src/testing/mod.rs":"7b4a507aceb159347843ba09461e0d58962027ba5dcd35aa4b993fe3666508ce","src/util.rs":"22091900a1f83babe126d86da10388f9d4d22b34dd1e67afdd868fedeb460c2b","src/weather.rs":"d7b747a32549d5200f19b2ba851cda84086b8a8f4ee7affe90e95920b22274f2","src/yelp.rs":"1fe3b7eb6b3f7462e9758b6eb62457dfa26f7549a8290cdff7637d2fb3ffea4f","uniffi.toml":"8205e4679ac26d53e70af0f85c013fd27cda1119f4322aebf5f2b9403d45a611"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/suggest/Cargo.toml b/third_party/rust/suggest/Cargo.toml
index 09a9b5f28df10..9e6d736fb565d 100644
--- a/third_party/rust/suggest/Cargo.toml
+++ b/third_party/rust/suggest/Cargo.toml
@@ -81,7 +81,7 @@ version = "3.2.0"
 optional = true
 
 [dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 
 [dependencies.url]
 version = "2.1"
@@ -103,5 +103,5 @@ features = ["testing"]
 path = "../support/rc_crypto"
 
 [build-dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 features = ["build"]
diff --git a/third_party/rust/suggest/src/store.rs b/third_party/rust/suggest/src/store.rs
index 9d045f1e3f6f7..334c44f317491 100644
--- a/third_party/rust/suggest/src/store.rs
+++ b/third_party/rust/suggest/src/store.rs
@@ -632,6 +632,9 @@ where
         // Read the previously ingested records.  We use this to calculate what's changed
         let ingested_records = write_scope.read(|dao| dao.get_ingested_records())?;
 
+        // Record whether any changes are ingested.
+        let mut has_changes = false;
+
         // For each collection, fetch all records
         for (collection, record_types) in record_types_by_collection {
             breadcrumb!("Ingesting collection {}", collection.name());
@@ -641,14 +644,14 @@ where
             // [Self::ingest_records]
             for record_type in record_types {
                 breadcrumb!("Ingesting record_type: {record_type}");
+                let changes = RecordChanges::new(
+                    records.iter().filter(|r| r.record_type() == record_type),
+                    ingested_records.iter().filter(|i| {
+                        i.record_type == record_type.as_str() && i.collection == collection.name()
+                    }),
+                );
+                has_changes |= changes.has_changes();
                 metrics.measure_ingest(record_type.to_string(), |context| {
-                    let changes = RecordChanges::new(
-                        records.iter().filter(|r| r.record_type() == record_type),
-                        ingested_records.iter().filter(|i| {
-                            i.record_type == record_type.as_str()
-                                && i.collection == collection.name()
-                        }),
-                    );
                     write_scope.write(|dao| {
                         self.process_changes(dao, collection, changes, &constraints, context)
                     })
@@ -656,6 +659,18 @@ where
                 write_scope.err_if_interrupted()?;
             }
         }
+
+        // Truncate the WAL if the DB is updated without interruption.
+        // This avoids the overhead iccurred by handling a large SQLite WAL.
+        // See https://bugzilla.mozilla.org/show_bug.cgi?id=2005613
+        if has_changes {
+            write_scope.err_if_interrupted()?;
+            breadcrumb!("Truncating WAL on changes");
+            write_scope
+                .conn
+                .pragma_update(None, "wal_checkpoint", "TRUNCATE")?;
+        }
+
         breadcrumb!("Ingestion complete");
 
         Ok(metrics)
@@ -870,6 +885,10 @@ impl<'a> RecordChanges<'a> {
             unchanged,
         }
     }
+
+    fn has_changes(&self) -> bool {
+        !self.new.is_empty() || !self.updated.is_empty() || !self.deleted.is_empty()
+    }
 }
 
 #[cfg(feature = "benchmark_api")]
@@ -4000,4 +4019,22 @@ pub(crate) mod tests {
 
         Ok(())
     }
+
+    #[test]
+    fn record_changes_change_detection() -> anyhow::Result<()> {
+        let mut rc = RecordChanges::new(std::iter::empty(), std::iter::empty());
+        assert!(!rc.has_changes(), "No changes");
+
+        let record = Record {
+            id: SuggestRecordId::new("42".to_string()),
+            last_modified: 0,
+            attachment: None,
+            payload: SuggestRecord::Icon,
+            collection: Collection::Other,
+        };
+        rc = RecordChanges::new(std::iter::once(&record), std::iter::empty());
+        assert!(rc.has_changes(), "Has changes");
+
+        Ok(())
+    }
 }
diff --git a/third_party/rust/sync15/.cargo-checksum.json b/third_party/rust/sync15/.cargo-checksum.json
index 9a97c0380e9d2..a164c3185cd3c 100644
--- a/third_party/rust/sync15/.cargo-checksum.json
+++ b/third_party/rust/sync15/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"eaa087f0d5b9b9e5ee7bbc9e64dd4ab9d4daa975284bee814c115bd2b69ebb5e","README.md":"6d4ff5b079ac5340d18fa127f583e7ad793c5a2328b8ecd12c3fc723939804f2","build.rs":"aa971160d67ce8626b26e15c04c34b730f594c45c817aae34cfc9f3ea14ae284","src/bso/content.rs":"c34a689d5d910bc612c5ebfe34db00d5bf6710bfb657d6770e63e62c3cfedbe4","src/bso/crypto.rs":"27602dcccb37d3a55620ee4e16b705da455d49af575de115c7c79c0178eb1d6d","src/bso/mod.rs":"28e4fd3267aff256c3f03be27e6ee38b5f98c3dfeb0852f668c618e0f2573634","src/bso/test_utils.rs":"4ec5a2df5e1c0ec14dc770681e959bdcef6ef04f6fde435999197f46a8ae4831","src/client/coll_state.rs":"db1b5a3d2a274698218b18e9c7552bf2868b8a860815ac677b91ecc4f3ea8afc","src/client/coll_update.rs":"dac04a90c29dd969f8b4250414609c9b6d61daf2dfa4ae77d1c4a165ba970b05","src/client/collection_keys.rs":"c27b2277a3a52033b58ab01490fc2ea7007494195dd5e6dc2c6931a4ca96795a","src/client/mod.rs":"8f588d4a035cf79d96f2500f06d5651c1a7c566127c456ffa5429811ddce3fd6","src/client/request.rs":"2b5d2c77279d4d922b845020ffa0c6f34f84400fffff772cd4ab3a79f23e45a0","src/client/state.rs":"6f425a20f814a9325a42e3fa7c22068b33ee0f481c8cc1825f51bfd911b9c4f6","src/client/status.rs":"f445a8765dac9789444e23b5145148413407bb1d18a15ef56682243997f591bf","src/client/storage_client.rs":"ca74d26cf177a16697627d919add5b7e33f22f5e7357a5c5c546edb6687dd8f8","src/client/sync.rs":"ffcca4a2417ce4a6404363f3c1446def32f1297c14c27750ed69e6c03e23b9c1","src/client/sync_multiple.rs":"6d91cae760d7553f19443df9dc38cbdfb66b996a9a7b3d7a15f4179233c7dff9","src/client/token.rs":"ddfeb461f1be1b775a185c9b0cb372744032cf62ddb30666c672e73f761fab5d","src/client/util.rs":"71cc70ee41f821f53078675e636e9fad9c6046fa1a989e37f5487e340a2277d6","src/client_types.rs":"3c3cac1540b92482f43660d9e43bdde8481c4cc1a98253a68c80e791231f5976","src/clients_engine/engine.rs":"b6556f16eaa83e922686d838fc8ec53498da274445762250c10b69d268f20eda","src/clients_engine/mod.rs":"461729e6f89b66b2cbd89b041a03d4d6a8ba582284ed4f3015cb13e1a0c6da97","src/clients_engine/record.rs":"736870c81dff89a05c0703eef52beda83f45fe9f8d989dfb6e13b88781f1198f","src/clients_engine/ser.rs":"be6a19c45eb8002ff8e7cf746d2f97d9cecd1740f9817a8f1d624825475fd777","src/device_type.rs":"dc2d4296d25e31471c8e68488f1043ff239b902036cd6aea8a686cf79b4ed335","src/enc_payload.rs":"aa3eea7df49b24cd59831680a47c417b73a3e36e6b0f3f4baf14ca66bd68be6b","src/engine/bridged_engine.rs":"00220c64abc42e5c37e87efd6dbfe5c4c48507b9960e9ba722ac93e038ccfd30","src/engine/mod.rs":"d0d031d80fbdd90686c443b8c44720ab2ab0aff2c1106e0fdd7d60c46361fe8b","src/engine/request.rs":"5923025fb9550178339f880a1bf8526d8e853e7a0b2bce6d9d687cc808ac0085","src/engine/sync_engine.rs":"531b35d72ce9e04c3e543c0468c1e450fba2c0dc3d33d68d9b1c0a5c1ad7dd34","src/error.rs":"eb40d5e79ffafc50d3c2998c15007e1c3fc19b11a3e8d14be1e990a6e9c5e61e","src/key_bundle.rs":"a68b484ec8702a269645e892aa0b3161943388dac6b160e87393617139fad22a","src/lib.rs":"a396aeea2b37dc9dd92f41aa0dfe79ae82ca8ee65bc586aa10803f064a40b460","src/record_types.rs":"02bb3d352fb808131d298f9b90d9c95b7e9e0138b97c5401f3b9fdacc5562f44","src/server_timestamp.rs":"63916817796e83fe31fbd598bac025dfa71ec9e1808d09073db258c78a3331cd","src/sync15.udl":"464047a67a7877bc671f9f3aca13f3039cf34beb51756bcdb86015d789a8f400","src/telemetry.rs":"7261f0241587c8533239b6f19345d5849f6242bab62fe46e9dab5b57614a52db","uniffi.toml":"d9a5a5cb0eee5218f5eee4d8d89214cc1d7fb5b49323fd17becdf4adb706a6aa"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"5f51c183dcf682c429756e444e543ce18ff8a1acfc11260b4954e1d74f47dca4","README.md":"6d4ff5b079ac5340d18fa127f583e7ad793c5a2328b8ecd12c3fc723939804f2","build.rs":"aa971160d67ce8626b26e15c04c34b730f594c45c817aae34cfc9f3ea14ae284","src/bso/content.rs":"c34a689d5d910bc612c5ebfe34db00d5bf6710bfb657d6770e63e62c3cfedbe4","src/bso/crypto.rs":"27602dcccb37d3a55620ee4e16b705da455d49af575de115c7c79c0178eb1d6d","src/bso/mod.rs":"28e4fd3267aff256c3f03be27e6ee38b5f98c3dfeb0852f668c618e0f2573634","src/bso/test_utils.rs":"4ec5a2df5e1c0ec14dc770681e959bdcef6ef04f6fde435999197f46a8ae4831","src/client/coll_state.rs":"db1b5a3d2a274698218b18e9c7552bf2868b8a860815ac677b91ecc4f3ea8afc","src/client/coll_update.rs":"dac04a90c29dd969f8b4250414609c9b6d61daf2dfa4ae77d1c4a165ba970b05","src/client/collection_keys.rs":"c27b2277a3a52033b58ab01490fc2ea7007494195dd5e6dc2c6931a4ca96795a","src/client/mod.rs":"8f588d4a035cf79d96f2500f06d5651c1a7c566127c456ffa5429811ddce3fd6","src/client/request.rs":"2b5d2c77279d4d922b845020ffa0c6f34f84400fffff772cd4ab3a79f23e45a0","src/client/state.rs":"6f425a20f814a9325a42e3fa7c22068b33ee0f481c8cc1825f51bfd911b9c4f6","src/client/status.rs":"f445a8765dac9789444e23b5145148413407bb1d18a15ef56682243997f591bf","src/client/storage_client.rs":"ca74d26cf177a16697627d919add5b7e33f22f5e7357a5c5c546edb6687dd8f8","src/client/sync.rs":"ffcca4a2417ce4a6404363f3c1446def32f1297c14c27750ed69e6c03e23b9c1","src/client/sync_multiple.rs":"6d91cae760d7553f19443df9dc38cbdfb66b996a9a7b3d7a15f4179233c7dff9","src/client/token.rs":"ddfeb461f1be1b775a185c9b0cb372744032cf62ddb30666c672e73f761fab5d","src/client/util.rs":"71cc70ee41f821f53078675e636e9fad9c6046fa1a989e37f5487e340a2277d6","src/client_types.rs":"3c3cac1540b92482f43660d9e43bdde8481c4cc1a98253a68c80e791231f5976","src/clients_engine/engine.rs":"b6556f16eaa83e922686d838fc8ec53498da274445762250c10b69d268f20eda","src/clients_engine/mod.rs":"461729e6f89b66b2cbd89b041a03d4d6a8ba582284ed4f3015cb13e1a0c6da97","src/clients_engine/record.rs":"736870c81dff89a05c0703eef52beda83f45fe9f8d989dfb6e13b88781f1198f","src/clients_engine/ser.rs":"be6a19c45eb8002ff8e7cf746d2f97d9cecd1740f9817a8f1d624825475fd777","src/device_type.rs":"dc2d4296d25e31471c8e68488f1043ff239b902036cd6aea8a686cf79b4ed335","src/enc_payload.rs":"aa3eea7df49b24cd59831680a47c417b73a3e36e6b0f3f4baf14ca66bd68be6b","src/engine/bridged_engine.rs":"00220c64abc42e5c37e87efd6dbfe5c4c48507b9960e9ba722ac93e038ccfd30","src/engine/mod.rs":"d0d031d80fbdd90686c443b8c44720ab2ab0aff2c1106e0fdd7d60c46361fe8b","src/engine/request.rs":"5923025fb9550178339f880a1bf8526d8e853e7a0b2bce6d9d687cc808ac0085","src/engine/sync_engine.rs":"531b35d72ce9e04c3e543c0468c1e450fba2c0dc3d33d68d9b1c0a5c1ad7dd34","src/error.rs":"eb40d5e79ffafc50d3c2998c15007e1c3fc19b11a3e8d14be1e990a6e9c5e61e","src/key_bundle.rs":"a68b484ec8702a269645e892aa0b3161943388dac6b160e87393617139fad22a","src/lib.rs":"a396aeea2b37dc9dd92f41aa0dfe79ae82ca8ee65bc586aa10803f064a40b460","src/record_types.rs":"02bb3d352fb808131d298f9b90d9c95b7e9e0138b97c5401f3b9fdacc5562f44","src/server_timestamp.rs":"63916817796e83fe31fbd598bac025dfa71ec9e1808d09073db258c78a3331cd","src/sync15.udl":"464047a67a7877bc671f9f3aca13f3039cf34beb51756bcdb86015d789a8f400","src/telemetry.rs":"7261f0241587c8533239b6f19345d5849f6242bab62fe46e9dab5b57614a52db","uniffi.toml":"d9a5a5cb0eee5218f5eee4d8d89214cc1d7fb5b49323fd17becdf4adb706a6aa"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/sync15/Cargo.toml b/third_party/rust/sync15/Cargo.toml
index ebb2bbba885e4..f635cf4f35410 100644
--- a/third_party/rust/sync15/Cargo.toml
+++ b/third_party/rust/sync15/Cargo.toml
@@ -87,7 +87,7 @@ path = "../support/guid"
 features = ["random"]
 
 [dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 
 [dependencies.url]
 version = "2"
@@ -105,5 +105,5 @@ features = ["testing"]
 path = "../support/rc_crypto/nss"
 
 [build-dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 features = ["build"]
diff --git a/third_party/rust/tabs/.cargo-checksum.json b/third_party/rust/tabs/.cargo-checksum.json
index e22a5cbf55bcd..9087a53e5ca4b 100644
--- a/third_party/rust/tabs/.cargo-checksum.json
+++ b/third_party/rust/tabs/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"9213676f4e0d380d16687f0847b4916a5375ed2b14bbf70ad05dd13419c0b59c","README.md":"1b0262e7b9b9c25787699a249f772a45e490135413b37f46e6fa988253f54139","build.rs":"33e61b811b19ed2b58e319cc65d5988bed258d2c4fea2d706301184c59847a0f","src/error.rs":"6e5fd48a3f228d37977881a3657f8635b1b37e3b16d91ac2d8476174172a2a74","src/lib.rs":"887beb91cdc9fcc91233c25db9f49f6636bb4d54b5becdfef87c5695d4199c72","src/schema.rs":"698118cabf04cea702dfd2201457afd4238116245438fb50738b5e0a393e3f6c","src/storage.rs":"6634976de518c9afe0807deaa59e8fa51144ab685eda542ee84ed05666d1a591","src/store.rs":"871d985e46608d502fdbbd04a9bdd1940eab026e1764661e7e5d12cd97101841","src/sync/bridge.rs":"502d35c07541261879d8144a98760e2802ad848c38092665de9f3a80220099ef","src/sync/engine.rs":"e15ef9d81619ab4f7345dbef17287131d2b233e4b8a9899a14a98df944f1b0ae","src/sync/mod.rs":"02bd15d80065f19f471cb6e063cf09c27151a42f5788b924ec75f6f9376488a5","src/sync/record.rs":"e85a77aaa2ccdb8cc7cc7fe0e55f93b355dea5d1cd5f41f26102c49d429afbe7","src/tabs.udl":"92ed71e1501ab51cd3c46eb5c67dbeb441e90d7f7219c1b078d63b436c442c7d","uniffi.toml":"70a41bac1bbbde7a571f1b023f22636337ca3bffd6891dd67596fe13ab98b2f6"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"ddc5184038709a429c8f6950453ab3d08d55876b762799e244eb42eab4dfe518","README.md":"1b0262e7b9b9c25787699a249f772a45e490135413b37f46e6fa988253f54139","build.rs":"33e61b811b19ed2b58e319cc65d5988bed258d2c4fea2d706301184c59847a0f","src/error.rs":"6e5fd48a3f228d37977881a3657f8635b1b37e3b16d91ac2d8476174172a2a74","src/lib.rs":"887beb91cdc9fcc91233c25db9f49f6636bb4d54b5becdfef87c5695d4199c72","src/schema.rs":"698118cabf04cea702dfd2201457afd4238116245438fb50738b5e0a393e3f6c","src/storage.rs":"6634976de518c9afe0807deaa59e8fa51144ab685eda542ee84ed05666d1a591","src/store.rs":"871d985e46608d502fdbbd04a9bdd1940eab026e1764661e7e5d12cd97101841","src/sync/bridge.rs":"502d35c07541261879d8144a98760e2802ad848c38092665de9f3a80220099ef","src/sync/engine.rs":"e15ef9d81619ab4f7345dbef17287131d2b233e4b8a9899a14a98df944f1b0ae","src/sync/mod.rs":"02bd15d80065f19f471cb6e063cf09c27151a42f5788b924ec75f6f9376488a5","src/sync/record.rs":"e85a77aaa2ccdb8cc7cc7fe0e55f93b355dea5d1cd5f41f26102c49d429afbe7","src/tabs.udl":"92ed71e1501ab51cd3c46eb5c67dbeb441e90d7f7219c1b078d63b436c442c7d","uniffi.toml":"70a41bac1bbbde7a571f1b023f22636337ca3bffd6891dd67596fe13ab98b2f6"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/tabs/Cargo.toml b/third_party/rust/tabs/Cargo.toml
index 012148f225c53..4dacc2397fd10 100644
--- a/third_party/rust/tabs/Cargo.toml
+++ b/third_party/rust/tabs/Cargo.toml
@@ -72,7 +72,7 @@ features = ["sync-engine"]
 path = "../support/types"
 
 [dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 
 [dev-dependencies]
 tempfile = "3.1"
@@ -82,5 +82,5 @@ path = "../support/error"
 features = ["testing"]
 
 [build-dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 features = ["build"]
diff --git a/third_party/rust/tracing-support/.cargo-checksum.json b/third_party/rust/tracing-support/.cargo-checksum.json
index 83e99686a03bc..9320cc69726b6 100644
--- a/third_party/rust/tracing-support/.cargo-checksum.json
+++ b/third_party/rust/tracing-support/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"a70b253ae9ed4a9d8f5a87f05f269f0b12775ba5705a638edb6316970f7e5c03","android/build.gradle":"7eb3991c22ae47043c9754db53091493192a76ca4709f040a13aa8b5cd5bc64f","android/src/main/AndroidManifest.xml":"0edcec96c2345be661da3ead2714e059418ff5154123509923c344b66b4890c1","src/filters.rs":"8d15290905b251bd713f9fdb0513b23898e2f8015d65920ffc90e02bfa784ce0","src/layer.rs":"fea35aa34452c5a9c70b4f3e65a981f57c67745ea509936909260b8417354316","src/lib.rs":"f02180d894933c96720d374b9da6414996d81e0d8092bc589e003ba793ac7b6e","uniffi.toml":"357c46607bdec389b533ea0a908d98586b3fa2b6de2fa6263ca6903d13156f30"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"0596c8d314e2df5d7fac06383a2cee403a123267f3ee9adbecfd1133b2fb341b","android/build.gradle":"7eb3991c22ae47043c9754db53091493192a76ca4709f040a13aa8b5cd5bc64f","android/src/main/AndroidManifest.xml":"0edcec96c2345be661da3ead2714e059418ff5154123509923c344b66b4890c1","src/filters.rs":"8d15290905b251bd713f9fdb0513b23898e2f8015d65920ffc90e02bfa784ce0","src/layer.rs":"fea35aa34452c5a9c70b4f3e65a981f57c67745ea509936909260b8417354316","src/lib.rs":"f02180d894933c96720d374b9da6414996d81e0d8092bc589e003ba793ac7b6e","uniffi.toml":"357c46607bdec389b533ea0a908d98586b3fa2b6de2fa6263ca6903d13156f30"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/tracing-support/Cargo.toml b/third_party/rust/tracing-support/Cargo.toml
index 2beaf334a1cc0..4600fcff53b3d 100644
--- a/third_party/rust/tracing-support/Cargo.toml
+++ b/third_party/rust/tracing-support/Cargo.toml
@@ -40,12 +40,12 @@ features = [
 default-features = false
 
 [dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 
 [dev-dependencies.tracing-subscriber]
 version = "0.3"
 default-features = false
 
 [build-dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 features = ["build"]
diff --git a/third_party/rust/uniffi/.cargo-checksum.json b/third_party/rust/uniffi/.cargo-checksum.json
index 5b32a1e8ff379..76a374163aac6 100644
--- a/third_party/rust/uniffi/.cargo-checksum.json
+++ b/third_party/rust/uniffi/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"5e5440b995ddf729ffe7a64e59adf84804506a88fdd5bce7cfeddb1c82d065ef","Cargo.lock":"4bd69f8c343028bd7124bddb98c84461631c9ace99ca4879a3f91a4cd58b783d","Cargo.toml":"e9cdc3e59d5b1e357fd87298c7ca39695a52e60548678f5e304d13e66f981635","Cargo.toml.orig":"08efcff4b2bc4fa1b858eb2e239556ca039f6470d315ddd883c66b0781f62a15","README.md":"a07b147b4a2f3305f3346ab8a223c287795498d89c0b4781bc93d5f5026b70bc","release.toml":"1aa1b131d4cc93b5eba8758a4401c70bc0d7fe5861e2ec147e9259fe7c0da472","src/cli/mod.rs":"f1c5aa5554362aec95379b292fddc554b56d8b254aaac9ea63e37bb130420fe2","src/cli/swift.rs":"d07106232269f89691ed677d480cce558446d13c0e05247b7efd498b5e729811","src/cli/uniffi_bindgen.rs":"d6c7f05c6305d2625287282dc531083a6559a3b8a6a4f48bfbd9265f0f32ab70","src/lib.rs":"9ec4d6bc3c84d822f233cb1d747fb15f2e056e4880d6b6fbfc829dbf73e3c45e","tests/ui/proc_macro_arc.rs":"fedc429603753e8ef953642a7295323ccb3f76fd3ae1ab181ad90c5eb88212bb","tests/ui/proc_macro_arc.stderr":"5a4e15d6cb239848496e5669e9f8589a19a969e8d9642eb16d13b8b2491b8af2","tests/ui/version_mismatch.rs":"16ea359e5853517ee0d0704c015ae8c825533109fbefd715130d0f4a51f15898","tests/ui/version_mismatch.stderr":"21dcb836253312ba8e3a0502cce6ff279818aaaadcea9628a41b196e0c8c94b6"},"package":"b334fd69b3cf198b63616c096aabf9820ab21ed9b2aa1367ddd4b411068bf520"}
\ No newline at end of file
+{"files":{".cargo_vcs_info.json":"0563039b0cd56ee16454635176f2e7987df5668e905f7d9620ec8fee4df8e304","Cargo.lock":"73381320c99e9eb41223f35edd667b36fbd52854dced04ef92b0f704b5102499","Cargo.toml":"fe4fa94d48f00c9761a99e693044acd3cc9b20d50a9542e5dfed0f9efae1c1e7","Cargo.toml.orig":"8f4aab5af1c03579728f64d9b437992b22c129caa6f170ed525c7884ec223312","README.md":"c48ebaa9337cbe23085b172e2100088b67ae3f3823e114dc532e9d67f5ff6133","release.toml":"1aa1b131d4cc93b5eba8758a4401c70bc0d7fe5861e2ec147e9259fe7c0da472","src/cli/mod.rs":"f1c5aa5554362aec95379b292fddc554b56d8b254aaac9ea63e37bb130420fe2","src/cli/swift.rs":"51c72b0b53e321c2cb9507f69cdcec93f78fece76e0670e93ff8fc42154d9ac8","src/cli/uniffi_bindgen.rs":"5fa06bd4a18f52d76c91573096034f1316cb0e91bd9c6a9cbc06f3338052314a","src/lib.rs":"289b7015b7d697145601f78fc0cab942b489a1b7bbc63df6f19750e097d1ce45","tests/custom_types.rs":"a61182bf9dbb0835967364e46a8bc72f24394d612097e3fd98c471e98c6d9d7a","tests/ui/proc_macro_arc.rs":"fedc429603753e8ef953642a7295323ccb3f76fd3ae1ab181ad90c5eb88212bb","tests/ui/proc_macro_arc.stderr":"b264b9705e9d24602875b0480a84f257c5d282e19b8f1dae5465abf7e0e164f9","tests/ui/version_mismatch.rs":"16ea359e5853517ee0d0704c015ae8c825533109fbefd715130d0f4a51f15898","tests/ui/version_mismatch.stderr":"4670868400439381e799854fa6027caac7738c5864bedd55b628c31afa2146c7","uniffi-bindgen-swift.rs":"ba59f627db612656b205b321629893b8ea82f4f9fcd9dbba2afe17594eb3cc8e","uniffi-bindgen.rs":"7b21629a2bc1184b9c1199a2ca73d51b4a490eac13ba42d8108b16b528cf5231"},"package":"b8c6dec3fc6645f71a16a3fa9ff57991028153bd194ca97f4b55e610c73ce66a"}
\ No newline at end of file
diff --git a/third_party/rust/uniffi/.cargo_vcs_info.json b/third_party/rust/uniffi/.cargo_vcs_info.json
index 22abf0e27040e..b60779d02ce8e 100644
--- a/third_party/rust/uniffi/.cargo_vcs_info.json
+++ b/third_party/rust/uniffi/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "0eda2855d5b4be435013d5baef808d5f9caee0fd"
+    "sha1": "309762f55db3f0548194a9ceba3027fa64b18a93"
   },
   "path_in_vcs": "uniffi"
 }
\ No newline at end of file
diff --git a/third_party/rust/uniffi/Cargo.lock b/third_party/rust/uniffi/Cargo.lock
index f85c134ae9a77..37badd7092f6e 100644
--- a/third_party/rust/uniffi/Cargo.lock
+++ b/third_party/rust/uniffi/Cargo.lock
@@ -31,9 +31,9 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "askama"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a4e46abb203e00ef226442d452769233142bbfdd79c3941e84c8e61c4112543"
+checksum = "f75363874b771be265f4ffe307ca705ef6f3baa19011c149da8674a87f1b75c4"
 dependencies = [
  "askama_derive",
  "itoa",
@@ -44,9 +44,9 @@ dependencies = [
 
 [[package]]
 name = "askama_derive"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54398906821fd32c728135f7b351f0c7494ab95ae421d41b6f5a020e158f28a6"
+checksum = "129397200fe83088e8a68407a8e2b1f826cf0086b21ccdb866a722c8bcd3a94f"
 dependencies = [
  "askama_parser",
  "basic-toml",
@@ -61,9 +61,9 @@ dependencies = [
 
 [[package]]
 name = "askama_parser"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf315ce6524c857bb129ff794935cf6d42c82a6cff60526fe2a63593de4d0d4f"
+checksum = "d6ab5630b3d5eaf232620167977f95eb51f3432fc76852328774afbd242d4358"
 dependencies = [
  "memchr",
  "serde",
@@ -225,7 +225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -295,6 +295,7 @@ checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
  "hashbrown",
+ "serde",
 ]
 
 [[package]]
@@ -363,9 +364,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "percent-encoding"
@@ -434,7 +435,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -504,11 +505,20 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "siphasher"
-version = "0.3.11"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "smawk"
@@ -602,13 +612,45 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.11"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
 dependencies = [
  "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
 ]
 
+[[package]]
+name = "toml_datetime"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_write",
+ "winnow",
+]
+
+[[package]]
+name = "toml_write"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+
 [[package]]
 name = "trybuild"
 version = "1.0.83"
@@ -632,7 +674,7 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "uniffi"
-version = "0.29.3"
+version = "0.31.0"
 dependencies = [
  "anyhow",
  "camino",
@@ -648,9 +690,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_bindgen"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ff0132b533483cf19abb30bba5c72c24d9f3e4d9a2ff71cb3e22e73899fd46e"
+checksum = "4ed0150801958d4825da56a41c71f000a457ac3a4613fa9647df78ac4b6b6881"
 dependencies = [
  "anyhow",
  "askama",
@@ -675,9 +717,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_build"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d84d607076008df3c32dd2100ee4e727269f11d3faa35691af70d144598f666"
+checksum = "b78fd9271a4c2e85bd2c266c5a9ede1fac676eb39fd77f636c27eaf67426fd5f"
 dependencies = [
  "anyhow",
  "camino",
@@ -686,9 +728,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_core"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e3b997192dc15ef1778c842001811ec7f241a093a693ac864e1fc938e64fa9"
+checksum = "b0ef62e69762fbb9386dcb6c87cd3dd05d525fa8a3a579a290892e60ddbda47e"
 dependencies = [
  "anyhow",
  "async-compat",
@@ -699,9 +741,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_internal_macros"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f64bec2f3a33f2f08df8150e67fa45ba59a2ca740bf20c1beb010d4d791f9a1b"
+checksum = "98f51ebca0d9a4b2aa6c644d5ede45c56f73906b96403c08a1985e75ccb64a01"
 dependencies = [
  "anyhow",
  "indexmap",
@@ -712,9 +754,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_macros"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d8708716d2582e4f3d7e9f320290b5966eb951ca421d7630571183615453efc"
+checksum = "db9d12529f1223d014fd501e5f29ca0884d15d6ed5ddddd9f506e55350327dc3"
 dependencies = [
  "camino",
  "fs-err",
@@ -729,9 +771,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_meta"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d226fc167754ce548c5ece9828c8a06f03bf1eea525d2659ba6bd648bd8e2f3"
+checksum = "9df6d413db2827c68588f8149d30d49b71d540d46539e435b23a7f7dbd4d4f86"
 dependencies = [
  "anyhow",
  "siphasher",
@@ -741,9 +783,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_pipeline"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b925b6421df15cf4bedee27714022cd9626fb4d7eee0923522a608b274ba4371"
+checksum = "a806dddc8208f22efd7e95a5cdf88ed43d0f3271e8f63b47e757a8bbdb43b63a"
 dependencies = [
  "anyhow",
  "heck",
@@ -754,9 +796,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_testing"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a8386f86b6f986bc01d6cdaec395980b9125ae493634ddbdc9feef5f50d80af"
+checksum = "4802bed208a296657eef3451a961a6502e1d7aa8930b4b0cd952ed4f81a3957e"
 dependencies = [
  "anyhow",
  "camino",
@@ -767,9 +809,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_udl"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c42649b721df759d9d4692a376b82b62ce3028ec9fc466f4780fb8cdf728996"
+checksum = "0d1a7339539bf6f6fa3e9b534dece13f778bda2d54b1a6d4e40b4d6090ac26e7"
 dependencies = [
  "anyhow",
  "textwrap",
@@ -828,9 +870,9 @@ dependencies = [
 
 [[package]]
 name = "windows-sys"
-version = "0.52.0"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
  "windows-targets 0.52.6",
 ]
@@ -958,9 +1000,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.7.4"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
 dependencies = [
  "memchr",
 ]
diff --git a/third_party/rust/uniffi/Cargo.toml b/third_party/rust/uniffi/Cargo.toml
index 65c819d4f1241..2d329fc34c264 100644
--- a/third_party/rust/uniffi/Cargo.toml
+++ b/third_party/rust/uniffi/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2021"
 name = "uniffi"
-version = "0.29.3"
+version = "0.31.0"
 build = false
 autolib = false
 autobins = false
@@ -68,6 +68,22 @@ wasm-unstable-single-threaded = [
 name = "uniffi"
 path = "src/lib.rs"
 
+[[bin]]
+name = "uniffi-bindgen"
+path = "uniffi-bindgen.rs"
+doc = false
+required-features = ["cli"]
+
+[[bin]]
+name = "uniffi-bindgen-swift"
+path = "uniffi-bindgen-swift.rs"
+doc = false
+required-features = ["cli"]
+
+[[test]]
+name = "custom_types"
+path = "tests/custom_types.rs"
+
 [dependencies.anyhow]
 version = "1"
 
@@ -94,21 +110,22 @@ optional = true
 default-features = false
 
 [dependencies.uniffi_bindgen]
-version = "=0.29.3"
+version = "=0.31.0"
 optional = true
+default-features = false
 
 [dependencies.uniffi_build]
-version = "=0.29.3"
+version = "=0.31.0"
 optional = true
 
 [dependencies.uniffi_core]
-version = "=0.29.3"
+version = "=0.31.0"
 
 [dependencies.uniffi_macros]
-version = "=0.29.3"
+version = "=0.31.0"
 
 [dependencies.uniffi_pipeline]
-version = "=0.29.3"
+version = "=0.31.0"
 
 [dev-dependencies.trybuild]
 version = "1"
diff --git a/third_party/rust/uniffi/Cargo.toml.orig b/third_party/rust/uniffi/Cargo.toml.orig
index 67aff1b7a9f7d..82a0f2c1d5285 100644
--- a/third_party/rust/uniffi/Cargo.toml.orig
+++ b/third_party/rust/uniffi/Cargo.toml.orig
@@ -7,18 +7,18 @@ repository = "https://github.com/mozilla/uniffi-rs"
 # Incrementing the minor version here means a breaking change to consumers.
 #   * See `docs/uniffi-versioning.md` for guidance on when to increment this
 #   * Make sure to also update `uniffi_bindgen::UNIFFI_CONTRACT_VERSION"
-version = "0.29.3"
+version = "0.31.0"
 license = "MPL-2.0"
 edition = "2021"
 keywords = ["ffi", "bindgen"]
 readme = "../README.md"
 
 [dependencies]
-uniffi_bindgen = { path = "../uniffi_bindgen", version = "=0.29.3", optional = true }
-uniffi_build = { path = "../uniffi_build", version = "=0.29.3", optional = true }
-uniffi_core = { path = "../uniffi_core", version = "=0.29.3" }
-uniffi_macros = { path = "../uniffi_macros", version = "=0.29.3" }
-uniffi_pipeline = { path = "../uniffi_pipeline", version = "=0.29.3" }
+uniffi_bindgen = { path = "../uniffi_bindgen", version = "=0.31.0", default-features = false, optional = true }
+uniffi_build = { path = "../uniffi_build", version = "=0.31.0", optional = true }
+uniffi_core = { path = "../uniffi_core", version = "=0.31.0" }
+uniffi_macros = { path = "../uniffi_macros", version = "=0.31.0" }
+uniffi_pipeline = { path = "../uniffi_pipeline", version = "=0.31.0" }
 anyhow = "1"
 camino = { version = "1.0.8", optional = true }
 cargo_metadata = { version = "0.19", optional = true }
@@ -62,3 +62,15 @@ wasm-unstable-single-threaded = [
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--generate-link-to-definition"]
+
+[[bin]]
+name = "uniffi-bindgen"
+path = "uniffi-bindgen.rs"
+required-features = ["cli"]
+doc = false
+
+[[bin]]
+name = "uniffi-bindgen-swift"
+path = "uniffi-bindgen-swift.rs"
+required-features = ["cli"]
+doc = false
diff --git a/third_party/rust/uniffi/README.md b/third_party/rust/uniffi/README.md
index 8ac2fa34bfd33..4450243be81aa 100644
--- a/third_party/rust/uniffi/README.md
+++ b/third_party/rust/uniffi/README.md
@@ -50,12 +50,13 @@ Other tools we know of which try and solve a similarly shaped problem are:
 
 ## Third-party foreign language bindings
 
-* [React Native bindings](https://github.com/jhugman/uniffi-bindgen-react-native). The repository contains tooling to generate bindings for [Hermes](https://github.com/facebook/hermes) and for [creating Turbo Modules](https://reactnative.dev/blog/2024/10/23/the-new-architecture-is-here#new-native-modules).
+* [Javascript bindings](https://github.com/jhugman/uniffi-bindgen-react-native): running in a web page, targeting WASM; and React Native targeting Android, iOS. The repository contains tooling to generate bindings for [Hermes](https://github.com/facebook/hermes), [creating Turbo Modules](https://reactnative.dev/blog/2024/10/23/the-new-architecture-is-here#new-native-modules), and for creating a [`wasm-bindgen` bindings crate](https://rustwasm.github.io/wasm-bindgen).
 * [Kotlin Multiplatform support (Gobley)](https://github.com/gobley/gobley). The repository contains Kotlin Multiplatform bindings generation for UniFFI, letting you target both JVM and Native.
 * [Go bindings](https://github.com/NordSecurity/uniffi-bindgen-go)
 * [C# bindings](https://github.com/NordSecurity/uniffi-bindgen-cs)
 * [Dart bindings](https://github.com/NiallBunting/uniffi-rs-dart)
 * [Java bindings](https://github.com/IronCoreLabs/uniffi-bindgen-java)
+* [Node bindings](https://github.com/livekit/uniffi-bindgen-node) (early development)
 
 ### External resources
 
diff --git a/third_party/rust/uniffi/src/cli/swift.rs b/third_party/rust/uniffi/src/cli/swift.rs
index 4eb6683ec8e28..90486d49fa222 100644
--- a/third_party/rust/uniffi/src/cli/swift.rs
+++ b/third_party/rust/uniffi/src/cli/swift.rs
@@ -13,8 +13,9 @@ use uniffi_bindgen::bindings::{generate_swift_bindings, SwiftBindingsOptions};
 struct Cli {
     #[command(flatten)]
     kinds: Kinds,
-    /// Library path to generate bindings for
-    library_path: Utf8PathBuf,
+    #[clap(name = "PATH_TO_LIBRARY_OR_UDL")]
+    /// UDL File / path to generate bindings for
+    source: Utf8PathBuf,
     /// Directory to generate files in
     out_dir: Utf8PathBuf,
     /// Generate a XCFramework-compatible modulemap
@@ -65,7 +66,7 @@ impl From<Cli> for SwiftBindingsOptions {
             generate_swift_sources: cli.kinds.swift_sources,
             generate_headers: cli.kinds.headers,
             generate_modulemap: cli.kinds.modulemap,
-            library_path: cli.library_path,
+            source: cli.source,
             out_dir: cli.out_dir,
             xcframework: cli.xcframework,
             module_name: cli.module_name,
diff --git a/third_party/rust/uniffi/src/cli/uniffi_bindgen.rs b/third_party/rust/uniffi/src/cli/uniffi_bindgen.rs
index 9999b0b671163..256cd7acc36be 100644
--- a/third_party/rust/uniffi/src/cli/uniffi_bindgen.rs
+++ b/third_party/rust/uniffi/src/cli/uniffi_bindgen.rs
@@ -2,25 +2,24 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use anyhow::{bail, Context, Result};
 use camino::Utf8PathBuf;
 use clap::{Args, Parser, Subcommand, ValueEnum};
 use std::fmt;
+// TODO: remove blanket import
 use uniffi_bindgen::bindings::*;
 use uniffi_bindgen::pipeline::initial;
 use uniffi_pipeline::PrintOptions;
 
-/// Enumeration of all foreign language targets currently supported by our CLI.
-///
-#[derive(Copy, Clone, Eq, PartialEq, Hash, ValueEnum)]
-enum TargetLanguage {
+/// TargetLanguage uniffi_bindgen, with a `clap::ValueEnum` derive.
+#[derive(Copy, Clone, ValueEnum)]
+enum TargetLanguageArg {
     Kotlin,
     Swift,
     Python,
     Ruby,
 }
 
-impl fmt::Display for TargetLanguage {
+impl fmt::Display for TargetLanguageArg {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Self::Kotlin => write!(f, "kotlin"),
@@ -31,36 +30,17 @@ impl fmt::Display for TargetLanguage {
     }
 }
 
-impl TryFrom<&str> for TargetLanguage {
-    type Error = anyhow::Error;
-    fn try_from(value: &str) -> Result<Self> {
-        Ok(match value.to_ascii_lowercase().as_str() {
-            "kotlin" | "kt" | "kts" => TargetLanguage::Kotlin,
-            "swift" => TargetLanguage::Swift,
-            "python" | "py" => TargetLanguage::Python,
-            "ruby" | "rb" => TargetLanguage::Ruby,
-            _ => bail!("Unknown or unsupported target language: \"{value}\""),
-        })
-    }
-}
-
-impl TryFrom<&std::ffi::OsStr> for TargetLanguage {
-    type Error = anyhow::Error;
-    fn try_from(value: &std::ffi::OsStr) -> Result<Self> {
-        match value.to_str() {
-            None => bail!("Unreadable target language"),
-            Some(s) => s.try_into(),
+impl From<TargetLanguageArg> for TargetLanguage {
+    fn from(l: TargetLanguageArg) -> Self {
+        match l {
+            TargetLanguageArg::Kotlin => Self::Kotlin,
+            TargetLanguageArg::Swift => Self::Swift,
+            TargetLanguageArg::Python => Self::Python,
+            TargetLanguageArg::Ruby => Self::Ruby,
         }
     }
 }
 
-impl TryFrom<String> for TargetLanguage {
-    type Error = anyhow::Error;
-    fn try_from(value: String) -> Result<Self> {
-        TryFrom::try_from(value.as_str())
-    }
-}
-
 // Structs to help our cmdline parsing. Note that docstrings below form part
 // of the "help" output.
 
@@ -80,7 +60,7 @@ enum Commands {
     Generate {
         /// Foreign language(s) for which to build bindings.
         #[clap(long, short, value_enum)]
-        language: Vec<TargetLanguage>,
+        language: Vec<TargetLanguageArg>,
 
         /// Directory in which to write generated files. Default is same folder as .udl file.
         #[clap(long, short)]
@@ -94,13 +74,12 @@ enum Commands {
         #[clap(long, short)]
         config: Option<Utf8PathBuf>,
 
-        /// Extract proc-macro metadata from a native lib (cdylib or staticlib) for this crate.
-        #[clap(long)]
-        lib_file: Option<Utf8PathBuf>,
-
-        /// Pass in a cdylib path rather than a UDL file
+        /// Deprecated
+        ///
+        /// This used to signal that a source file is a library rather than a UDL file.
+        /// Nowadays, UniFFI will auto-detect this.
         #[clap(long = "library")]
-        library_mode: bool,
+        _library_mode: bool,
 
         /// When `--library` is passed, only generate bindings for one crate.
         /// When `--library` is not passed, use this as the crate name instead of attempting to
@@ -162,7 +141,7 @@ struct PipelineArgs {
     metadata_no_deps: bool,
 
     /// Bindings Language
-    language: TargetLanguage,
+    language: TargetLanguageArg,
 
     /// Only show passes that match <PASS>
     ///
@@ -183,145 +162,6 @@ struct PipelineArgs {
     filter_name: Option<String>,
 }
 
-fn config_supplier(
-    metadata_no_deps: bool,
-) -> Result<impl uniffi_bindgen::BindgenCrateConfigSupplier> {
-    #[cfg(feature = "cargo-metadata")]
-    {
-        use uniffi_bindgen::cargo_metadata::CrateConfigSupplier;
-        let mut cmd = cargo_metadata::MetadataCommand::new();
-        if metadata_no_deps {
-            cmd.no_deps();
-        }
-        let metadata = cmd.exec().context("error running cargo metadata")?;
-        Ok(CrateConfigSupplier::from(metadata))
-    }
-    #[cfg(not(feature = "cargo-metadata"))]
-    Ok(uniffi_bindgen::EmptyCrateConfigSupplier)
-}
-
-fn gen_library_mode(
-    library_path: &camino::Utf8Path,
-    crate_name: Option<String>,
-    languages: Vec<TargetLanguage>,
-    cfo: Option<&camino::Utf8Path>,
-    out_dir: &camino::Utf8Path,
-    fmt: bool,
-    metadata_no_deps: bool,
-) -> anyhow::Result<()> {
-    use uniffi_bindgen::library_mode::generate_bindings;
-
-    let config_supplier = config_supplier(metadata_no_deps)?;
-
-    for language in languages {
-        // to help avoid mistakes we check the library is actually a cdylib, except
-        // for swift where static libs are often used to extract the metadata.
-        if !matches!(language, TargetLanguage::Swift) && !uniffi_bindgen::is_cdylib(library_path) {
-            anyhow::bail!(
-                "Generate bindings for {language} requires a cdylib, but {library_path} was given"
-            );
-        }
-
-        // Type-bounds on trait implementations makes selecting between languages a bit tedious.
-        match language {
-            TargetLanguage::Kotlin => generate_bindings(
-                library_path,
-                crate_name.clone(),
-                &KotlinBindingGenerator,
-                &config_supplier,
-                cfo,
-                out_dir,
-                fmt,
-            )?
-            .len(),
-            TargetLanguage::Python => generate_bindings(
-                library_path,
-                crate_name.clone(),
-                &PythonBindingGenerator,
-                &config_supplier,
-                cfo,
-                out_dir,
-                fmt,
-            )?
-            .len(),
-            TargetLanguage::Ruby => generate_bindings(
-                library_path,
-                crate_name.clone(),
-                &RubyBindingGenerator,
-                &config_supplier,
-                cfo,
-                out_dir,
-                fmt,
-            )?
-            .len(),
-            TargetLanguage::Swift => generate_bindings(
-                library_path,
-                crate_name.clone(),
-                &SwiftBindingGenerator,
-                &config_supplier,
-                cfo,
-                out_dir,
-                fmt,
-            )?
-            .len(),
-        };
-    }
-    Ok(())
-}
-
-fn gen_bindings(
-    udl_file: &camino::Utf8Path,
-    cfo: Option<&camino::Utf8Path>,
-    languages: Vec<TargetLanguage>,
-    odo: Option<&camino::Utf8Path>,
-    library_file: Option<&camino::Utf8Path>,
-    crate_name: Option<&str>,
-    fmt: bool,
-) -> anyhow::Result<()> {
-    use uniffi_bindgen::generate_bindings;
-    for language in languages {
-        match language {
-            TargetLanguage::Kotlin => generate_bindings(
-                udl_file,
-                cfo,
-                KotlinBindingGenerator,
-                odo,
-                library_file,
-                crate_name,
-                fmt,
-            )?,
-            TargetLanguage::Python => generate_bindings(
-                udl_file,
-                cfo,
-                PythonBindingGenerator,
-                odo,
-                library_file,
-                crate_name,
-                fmt,
-            )?,
-            TargetLanguage::Ruby => generate_bindings(
-                udl_file,
-                cfo,
-                RubyBindingGenerator,
-                odo,
-                library_file,
-                crate_name,
-                fmt,
-            )?,
-            TargetLanguage::Swift => generate_bindings(
-                udl_file,
-                cfo,
-                SwiftBindingGenerator,
-                odo,
-                library_file,
-                crate_name,
-                fmt,
-            )?,
-        };
-    }
-    Ok(())
-}
-
 pub fn run_main() -> anyhow::Result<()> {
     let cli = Cli::parse();
     match cli.command {
@@ -330,43 +170,25 @@ pub fn run_main() -> anyhow::Result<()> {
             out_dir,
             no_format,
             config,
-            lib_file,
             source,
             crate_name,
-            library_mode,
             metadata_no_deps,
+            ..
         } => {
-            if library_mode {
-                if lib_file.is_some() {
-                    panic!("--lib-file is not compatible with --library.")
-                }
-                let out_dir = out_dir.expect("--out-dir is required when using --library");
-                if language.is_empty() {
-                    panic!("please specify at least one language with --language")
-                }
-                gen_library_mode(
-                    &source,
-                    crate_name,
-                    language,
-                    config.as_deref(),
-                    &out_dir,
-                    !no_format,
-                    metadata_no_deps,
-                )?;
-            } else {
-                if metadata_no_deps {
-                    panic!("--metadata-no-deps makes no sense when not in library mode")
-                }
-                gen_bindings(
-                    &source,
-                    config.as_deref(),
-                    language,
-                    out_dir.as_deref(),
-                    lib_file.as_deref(),
-                    crate_name.as_deref(),
-                    !no_format,
-                )?;
+            if language.is_empty() {
+                panic!("please specify at least one language with --language")
             }
+
+            generate(GenerateOptions {
+                languages: language.into_iter().map(TargetLanguage::from).collect(),
+                out_dir: out_dir
+                    .expect("--out-dir is required when generating {language} bindings"),
+                source,
+                config_override: config,
+                crate_filter: crate_name,
+                metadata_no_deps,
+                format: !no_format,
+            })?;
         }
         Commands::Scaffolding {
             out_dir,
@@ -380,11 +202,14 @@ pub fn run_main() -> anyhow::Result<()> {
             )?;
         }
         Commands::Pipeline(args) => {
-            let config_supplier = config_supplier(args.metadata_no_deps)?;
+            let mut paths = uniffi_bindgen::BindgenPaths::default();
+            #[cfg(feature = "cargo-metadata")]
+            paths.add_cargo_metadata_layer(args.metadata_no_deps)?;
+
             let initial_root = if args.library_mode {
-                initial::Root::from_library(config_supplier, &args.source, args.crate_name)?
+                initial::Root::from_library(paths, &args.source, args.crate_name)?
             } else {
-                initial::Root::from_udl(config_supplier, &args.source, args.crate_name)?
+                initial::Root::from_udl(paths, &args.source, args.crate_name)?
             };
 
             let opts = PrintOptions {
@@ -394,7 +219,7 @@ pub fn run_main() -> anyhow::Result<()> {
                 filter_name: args.filter_name,
             };
             match args.language {
-                TargetLanguage::Python => python::pipeline().print_passes(initial_root, opts)?,
+                TargetLanguageArg::Python => python::pipeline().print_passes(initial_root, opts)?,
                 language => unimplemented!("{language} does not use the bindings IR pipeline yet"),
             };
         }
diff --git a/third_party/rust/uniffi/src/lib.rs b/third_party/rust/uniffi/src/lib.rs
index 85fd4216f6d9f..b7aecc7b9de49 100644
--- a/third_party/rust/uniffi/src/lib.rs
+++ b/third_party/rust/uniffi/src/lib.rs
@@ -13,13 +13,13 @@ pub use uniffi_bindgen::bindings::{kotlin_test, python_test, ruby_test, swift_te
 #[cfg(all(feature = "cargo-metadata", feature = "bindgen"))]
 pub use uniffi_bindgen::cargo_metadata::CrateConfigSupplier as CargoMetadataConfigSupplier;
 #[cfg(feature = "bindgen")]
-pub use uniffi_bindgen::library_mode::generate_bindings as generate_bindings_library_mode;
-#[cfg(feature = "bindgen")]
 pub use uniffi_bindgen::{
     bindings::{
-        KotlinBindingGenerator, PythonBindingGenerator, RubyBindingGenerator, SwiftBindingGenerator,
+        generate, generate_swift_bindings, GenerateOptions, SwiftBindingsOptions, TargetLanguage,
     },
-    generate_bindings, print_repr,
+    generate_bindings,
+    library_mode::generate_bindings as generate_bindings_library_mode,
+    print_repr,
 };
 #[cfg(feature = "build")]
 pub use uniffi_build::{generate_scaffolding, generate_scaffolding_for_crate};
diff --git a/third_party/rust/uniffi/tests/custom_types.rs b/third_party/rust/uniffi/tests/custom_types.rs
new file mode 100644
index 0000000000000..db50c48fa367c
--- /dev/null
+++ b/third_party/rust/uniffi/tests/custom_types.rs
@@ -0,0 +1,54 @@
+#[derive(Debug)]
+pub struct ValidatedString(String);
+
+impl From<ValidatedString> for String {
+    fn from(value: ValidatedString) -> String {
+        value.0
+    }
+}
+
+impl TryFrom<String> for ValidatedString {
+    type Error = anyhow::Error;
+
+    fn try_from(value: String) -> Result<Self, Self::Error> {
+        if value.contains("invalid") {
+            Err(anyhow::anyhow!("Value cannot contain 'invalid'"))
+        } else {
+            Ok(ValidatedString(value))
+        }
+    }
+}
+
+#[derive(Debug, uniffi::Record)]
+pub struct RecordWithStrings {
+    pub name: String,
+    pub children: Vec<String>,
+}
+
+#[derive(Debug, uniffi::Record)]
+pub struct RecordWithValidatedStrings {
+    pub name: ValidatedString,
+    pub children: Vec<ValidatedString>,
+}
+
+uniffi::custom_type!(ValidatedString, String);
+
+uniffi::setup_scaffolding!();
+
+#[test]
+fn test_string_validation_failure() {
+    let base = RecordWithStrings {
+        name: String::from("THIS_IS_A_RECORD"),
+        children: vec![String::from("VALID"), String::from("This is invalid")],
+    };
+
+    let result: anyhow::Result<RecordWithValidatedStrings> =
+        uniffi::Lift::<UniFfiTag>::try_lift(uniffi::Lower::<UniFfiTag>::lower(base));
+
+    let expected = r#"Lifting custom type `custom_types::ValidatedString` from FFI type `alloc::string::String` failed at uniffi/tests/custom_types.rs:34
+
+Caused by:
+    Value cannot contain 'invalid'"#;
+
+    assert_eq!(format!("{:?}", result.unwrap_err()), expected);
+}
diff --git a/third_party/rust/uniffi/tests/ui/proc_macro_arc.stderr b/third_party/rust/uniffi/tests/ui/proc_macro_arc.stderr
index 15024dcf53594..a7c069d7a9f83 100644
--- a/third_party/rust/uniffi/tests/ui/proc_macro_arc.stderr
+++ b/third_party/rust/uniffi/tests/ui/proc_macro_arc.stderr
@@ -78,5 +78,5 @@ help: ensure that all possible cases are being handled by adding a match arm wit
    |
 22 ~         match &*foo {
 23 +             _ => todo!(),
-24 +         }
+24 ~         }
    |
diff --git a/third_party/rust/uniffi/tests/ui/version_mismatch.stderr b/third_party/rust/uniffi/tests/ui/version_mismatch.stderr
index bc30714099a9b..c4eb771f645cc 100644
--- a/third_party/rust/uniffi/tests/ui/version_mismatch.stderr
+++ b/third_party/rust/uniffi/tests/ui/version_mismatch.stderr
@@ -1,7 +1,7 @@
-error[E0080]: evaluation of constant value failed
+error[E0080]: attempt to compute `0_usize - 1_usize`, which would overflow
  --> tests/ui/version_mismatch.rs:2:1
   |
 2 | uniffi::assert_compatible_version!("0.0.1"); // An error message would go here.
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to compute `0_usize - 1_usize`, which would overflow
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ evaluation of `_::{constant#0}` failed here
   |
   = note: this error originates in the macro `uniffi::deps::static_assertions::const_assert` which comes from the expansion of the macro `uniffi::assert_compatible_version` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/third_party/rust/uniffi/uniffi-bindgen-swift.rs b/third_party/rust/uniffi/uniffi-bindgen-swift.rs
new file mode 100644
index 0000000000000..a73e68c286650
--- /dev/null
+++ b/third_party/rust/uniffi/uniffi-bindgen-swift.rs
@@ -0,0 +1,9 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use uniffi::uniffi_bindgen_swift;
+
+fn main() {
+    uniffi_bindgen_swift();
+}
diff --git a/third_party/rust/uniffi_bindgen/src/backend/mod.rs b/third_party/rust/uniffi/uniffi-bindgen.rs
similarity index 73%
rename from third_party/rust/uniffi_bindgen/src/backend/mod.rs
rename to third_party/rust/uniffi/uniffi-bindgen.rs
index abb75ea2b70f9..a17b7381d6b3f 100644
--- a/third_party/rust/uniffi_bindgen/src/backend/mod.rs
+++ b/third_party/rust/uniffi/uniffi-bindgen.rs
@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-pub mod filters;
+use uniffi::uniffi_bindgen_main;
 
-pub use crate::interface::{Literal, Type};
+fn main() {
+    uniffi_bindgen_main();
+}
diff --git a/third_party/rust/uniffi_bindgen/.cargo-checksum.json b/third_party/rust/uniffi_bindgen/.cargo-checksum.json
index af9cd7fe76fdf..b1620212b8274 100644
--- a/third_party/rust/uniffi_bindgen/.cargo-checksum.json
+++ b/third_party/rust/uniffi_bindgen/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"7e6834a8cf0f78f4ebaaa8d167101d7468d51dca7707a3b8e6dad43edd417613","Cargo.lock":"4f7f17c26d5915e203f7de0dfc85125eafc5d89699e43f571eccb8780bf1327d","Cargo.toml":"120623af83557ce3cf6e8fbfb746029b909d625b8c351b88d715822318db8620","Cargo.toml.orig":"7f4b3bdc239d66df35146eb86dde15d80d621ab99377d6295b64cd714e174487","README.md":"a07b147b4a2f3305f3346ab8a223c287795498d89c0b4781bc93d5f5026b70bc","askama.toml":"1a245b7803adca782837e125c49100147d2de0d5a1c949ff95e91af1701f6058","src/backend/filters.rs":"65c4831f295267ad485db7daf05926f04a5d7342d30c4a954273736b77b48de1","src/backend/mod.rs":"04cdb95c779b36517eaaa0e2e74943234305544f55796e6bded2e84fe0a6a63a","src/bindings/README.md":"1f367f507e5b76971662b960653b0e743d3baab174597b38ab731ad44fc2e1d0","src/bindings/kotlin/gen_kotlin/callback_interface.rs":"741100c2b4b484583d34408b276394078a24918c47101fbaa6233df9c4da32f2","src/bindings/kotlin/gen_kotlin/compounds.rs":"630c249335d13e0d908d893927deee7d140b466830f3a9789d3ad3eec01b3d2f","src/bindings/kotlin/gen_kotlin/custom.rs":"196cec00121025f4254a357f9b17ef49747e3db2ac607bb30ce7c8ea0b7874eb","src/bindings/kotlin/gen_kotlin/enum_.rs":"bc9b4c74774e42d407fdb4ce82677fefce77de403af9519f53457868052e3b07","src/bindings/kotlin/gen_kotlin/miscellany.rs":"0853a4c6bb909f2e7cd1aa4c52fefa8862c866ba3c464812c500a190822cdfef","src/bindings/kotlin/gen_kotlin/mod.rs":"e22e781e02ee35f9f98991415b01cf72d28c22b1763aeb2308891e5599cdde65","src/bindings/kotlin/gen_kotlin/object.rs":"1cb8d1f5eaf06ceaadb6d2cedca482fdd1502c24500ba270d8fcac48ef2f1231","src/bindings/kotlin/gen_kotlin/primitives.rs":"0f297fccaa2b47c57fa943a2864fbad04a89bac89e6f67237b3f5939a9d4a605","src/bindings/kotlin/gen_kotlin/record.rs":"96fd1a180095a062b4a9b71d4f603b232f0133f46355a3e427c4064701d900f2","src/bindings/kotlin/gen_kotlin/variant.rs":"d111d6888745195fc2c24bdddc57359e771616102a8d182c5c8ad268b0a13460","src/bindings/kotlin/mod.rs":"e71d67b3970160166c1dda70025ab08e1889e28c013092762f4ac0d399fda976","src/bindings/kotlin/templates/Async.kt":"77b53562a08fef74a08abf4f2e2d8b3ec6b37f5f19f6efbd93211d29ff2237e1","src/bindings/kotlin/templates/BooleanHelper.kt":"ea8acfb2f20cc6e9a3d43246e59a2b7432d7d82d4c9efeab1cfd3894e167ec48","src/bindings/kotlin/templates/ByteArrayHelper.kt":"34787b1f40e9d40df08693fa92ce455251b08843c897f8b015f3d06974eea203","src/bindings/kotlin/templates/CallbackInterfaceImpl.kt":"34194ea634f7c048617b4098f70e30b95e0891fa8335baa2f0b07387ada3419b","src/bindings/kotlin/templates/CallbackInterfaceRuntime.kt":"667541abbc6b7241cc5bcc579bdfb8b35b06bd9d4f4ca7364abba534f3dc63e8","src/bindings/kotlin/templates/CallbackInterfaceTemplate.kt":"9d378a76129438b6ef8d3ca7468778bb5b729feee950267b728fd07ca7bc2493","src/bindings/kotlin/templates/CustomTypeTemplate.kt":"568f3a0e786f5593b51c4bd1390d8266d21b4043e2f6da4e4594b0f745ab1ba2","src/bindings/kotlin/templates/DurationHelper.kt":"39b6149bbd87788bb7bc0637a7e018f7b9d106e811db29e508d9d6a916f819d7","src/bindings/kotlin/templates/EnumTemplate.kt":"c0f36c840303b2315fc6d163c492ae48641ad336a144b48eb9ca10ff94952a58","src/bindings/kotlin/templates/ErrorTemplate.kt":"7351c118af726eccbc0618558993bf281ef59efab0a20cd7fba654d3bf75af3b","src/bindings/kotlin/templates/ExternalTypeTemplate.kt":"0b3675b938d33ae55cdfc2e7a4d8897a0e82710ac7f7bbba01c286e5a4c3b6c2","src/bindings/kotlin/templates/FfiConverterTemplate.kt":"73c2f68c04ef3885d98120b9d4fa48c438715aeb8be43178fbed0f327a1a6029","src/bindings/kotlin/templates/Float32Helper.kt":"889d1b78e2fae19981f7749c598d0432ed1db7e4c1e3f8a683ebf9fcb8f14503","src/bindings/kotlin/templates/Float64Helper.kt":"29752b413a7ec3aacca7898a6edc53eaccff2c8860d58f127a357c1c956cc0e9","src/bindings/kotlin/templates/HandleMap.kt":"feb456ea4dfb2ad07331d49d606faf396737817c6f6712a2d9a9d843daebdc1e","src/bindings/kotlin/templates/Helpers.kt":"930685e9c37bca51c5a1fae317a7401437498a74e9b6ce6a2a41ffacd78f90f2","src/bindings/kotlin/templates/Int16Helper.kt":"bda5ce2058e04ca27886d3f32f590c41a892eb5c144e069a6ca9a25113eb2049","src/bindings/kotlin/templates/Int32Helper.kt":"1dfcf9d9d99daf81ef102dc27bcba35a705d4ca29ba4dc8b68abc235ae4b33db","src/bindings/kotlin/templates/Int64Helper.kt":"5cc035397ee05cbd9d728155909d8480bad0685a8eaf9e641ee6a2cebefd43cd","src/bindings/kotlin/templates/Int8Helper.kt":"446f5e0324f791358889b1382719ca6aff88eac9c0a3b0ca2a9684951e837500","src/bindings/kotlin/templates/Interface.kt":"6e9bbc33624f430c1959a928cc25393aeef7963288e6a10dda01b5fdc76b9175","src/bindings/kotlin/templates/MapTemplate.kt":"c6b0de174393dbda653c60147c695f59406edc9d6040c82feae24db6422d66db","src/bindings/kotlin/templates/NamespaceLibraryTemplate.kt":"d5565c2daf52adca43dbbf5583155c4685fec18dc708002aa36a6a27534ad1d2","src/bindings/kotlin/templates/ObjectCleanerHelper.kt":"e11c78fd70ed84a88cd291a487cc6b846a582bd75a8636fa268639e8dba981d4","src/bindings/kotlin/templates/ObjectCleanerHelperAndroid.kt":"049e1e32a23b7923393e3dcabce49532737d44e9dbb331f62984ada67bde3125","src/bindings/kotlin/templates/ObjectCleanerHelperJvm.kt":"b6287f72afdb0ab9af5e56136c28e6a4f5e18a50305bce8923ee061b9406cfc3","src/bindings/kotlin/templates/ObjectTemplate.kt":"7fff8ad1578e1f045b79bdcad988bf97bda6c817dc64ffb0feeaba045ad88b8e","src/bindings/kotlin/templates/OptionalTemplate.kt":"4484e8ac408b96f9addd65fde113ce222f1fff2017691f36bd4c0b7d8497d7ab","src/bindings/kotlin/templates/README.md":"83587ff54a31fa47d2c0849cb5db52d6f079551e1cfb73c76c6dd02a7b164ad9","src/bindings/kotlin/templates/RecordTemplate.kt":"c498f46581078b911d04afdd52431d9d45df18a5f2f047e115ea3a3b8ffff055","src/bindings/kotlin/templates/RustBufferTemplate.kt":"747bd30541886f80fc5727d6d1c24996172cae0e8fd0287d549ff37db5f22ab9","src/bindings/kotlin/templates/SequenceTemplate.kt":"c7c5105146ae5deff589307036a3e77db1dea86895a3dfabcef03126107a4c3d","src/bindings/kotlin/templates/StringHelper.kt":"3c06f9c8170c0d33e520574795020ba96fdaad941cac102cb8c61fc8bbce6400","src/bindings/kotlin/templates/TimestampHelper.kt":"de7955d89d7daa4f42e4767a73dadaa64805ea559528c465cec98346b2b605c3","src/bindings/kotlin/templates/TopLevelFunctionTemplate.kt":"68c714cc8c7fa244166c5902a59c90317cdfc402193624cade405e3454f9bf67","src/bindings/kotlin/templates/Types.kt":"0bfe62f62362a5a621e77df4a3ca3485bf2f01fdb517ee1ac5cbd036281b8ceb","src/bindings/kotlin/templates/UInt16Helper.kt":"03fb99590b0d1c90f2dc988273edbd96168140c0888817e9600483dd85f16a2a","src/bindings/kotlin/templates/UInt32Helper.kt":"e5155f5f3aa0ac698c9f780e0b6794ebb866d50bea90b862cff2d66ae58113ba","src/bindings/kotlin/templates/UInt64Helper.kt":"a8f65247d4034d25e9920b9ac6920fa21abe342fec18b043798571ea97dfff10","src/bindings/kotlin/templates/UInt8Helper.kt":"c3ae1dc8562b7a3a05a8746b7b4561a36be5a00003af6e9bb3be486814885b35","src/bindings/kotlin/templates/macros.kt":"397967a0461f3cb0138a7569c32c3cd54e9505a0dc0990f46337cee54acf511f","src/bindings/kotlin/templates/wrapper.kt":"a3b606341464b4a4d1255f3f867c3669f1551f946fb435d62eec81cf54488607","src/bindings/kotlin/test.rs":"810b22334b3ab542f73948b02e4c2d6fe840793a740f509d0cdeb83abbd9d199","src/bindings/mod.rs":"76c6b52198aae6ada3138c533c8408b3e1cb614e81784605548763e937910294","src/bindings/python/gen_python/callback_interface.rs":"66170f2da8ba320680c9b088ab984b9bfd31a8440174cd640890284604b10395","src/bindings/python/gen_python/compounds.rs":"798089f38d3b6cbac97048d4ac3a33f63f0081add67946719acd145fb98b80b3","src/bindings/python/gen_python/custom.rs":"150fc94d8cb62899555d8966a2a47ae4b99ac90a3fddb755d736b51a57093e3b","src/bindings/python/gen_python/enum_.rs":"41d5f7b24d14da91b96c0c2071a8c71b5170c5248a6fb2b21844f9998eaa84ff","src/bindings/python/gen_python/miscellany.rs":"631e39b1e479eb99ec5be700d2c2ac59bb343358ac9c7c9bd2774dbc5e7cea6f","src/bindings/python/gen_python/mod.rs":"7d379b467c7beb46bc45e2a7d25b45a0c06a5ca464bdae677a51ae511e608396","src/bindings/python/gen_python/object.rs":"da7240d37c4e9260bf1ec29ac99e7f01b798e6968776f9fbf1175e893235aad5","src/bindings/python/gen_python/primitives.rs":"291a4184a7a6999a552e1289612313f5d86d9369fa87743b7f132c7e784781c0","src/bindings/python/gen_python/record.rs":"3d533d6053698de5a2aa075c569b43bf4ba26691842ef0190112f04d685aa0b5","src/bindings/python/mod.rs":"344f236ab503e66d0539c8f71ec70d31216efd29a07676d08d8bc7e31c2cf42d","src/bindings/python/pipeline/mod.rs":"a4ce21eaf5f66b290ed9781eb4b065d544b071a765259ee14cf4b21e7fc64c01","src/bindings/python/templates/Async.py":"8efa90fcb9ed3d41cbd365300ed07597e5960ae632df7aa080fe9cfa3219935c","src/bindings/python/templates/BooleanHelper.py":"cf7bcd414197258b0cfa54c6ad2aeb81a1a6a4a45af5b6aaf6f8e484bc5af59d","src/bindings/python/templates/BytesHelper.py":"8c39cf1760678316cf2b3903632f2bacae4f8aaa961b37eeb03e06e9f07241d1","src/bindings/python/templates/CallbackInterfaceImpl.py":"8f66b4da9166ff997052cc4dcb316844261ffc8b84f6c74312e7645f615fdc28","src/bindings/python/templates/CallbackInterfaceRuntime.py":"8ffe6640283b907cfea9432c7c077da5ce725d2def37c8d23faa4f5f784ed4d1","src/bindings/python/templates/CallbackInterfaceTemplate.py":"c532beaec878dd10b8a4e59b2a58259741f5b5681de13a1dd56a9a1b9269efe8","src/bindings/python/templates/CustomType.py":"dc75d6ad3488cc8853d3c0fb8d59e0dfd59652d59b61048fd2cffb8a9f05e53d","src/bindings/python/templates/DurationHelper.py":"eb9278b546f79b71525ae61a5b30bfe4a1260fd2268c87c600d157bf9b0e2a44","src/bindings/python/templates/EnumTemplate.py":"302550a049ba2bde7221fe62cb7ff8f3c62b9acdba4ac5859ccfd883ddc60e74","src/bindings/python/templates/ErrorTemplate.py":"4318581da6acd8f9edda7dc2ac59349c5390db8de44e1cd5abf244c346f503fc","src/bindings/python/templates/ExternalTemplate.py":"4a074a67f26fcd190599371c2ca2009324bebde4c5dfa3f2731ccf406a6391db","src/bindings/python/templates/Float32Helper.py":"4aa522163f121fcb84d2f024774d8dd9321c31f09b9a95da3a3131b6d2756971","src/bindings/python/templates/Float64Helper.py":"e7fa247fd9c3907b818f0d1ba28c2cee897e75fdd07fdacad1b8a2b5c26ba418","src/bindings/python/templates/HandleMap.py":"6e0ff44a6ca91a7fafd4f72c7f9ee4450d163abab245af191e7cb417755f345d","src/bindings/python/templates/Helpers.py":"8976196887d93f6c25a9025c3164c118b9a5ff17942b75d5467a1ca6c75542cb","src/bindings/python/templates/Int16Helper.py":"613345b35e63e7284caf97de9630747ec9cdadc8dd3f8451d2e878cb762958f5","src/bindings/python/templates/Int32Helper.py":"758b093b66dc0a8d3f0b13b9388d21f47de31b5e948689041c4d43ef98cf2c4f","src/bindings/python/templates/Int64Helper.py":"c7e76441ee14e78e856f8819f73243bc04b33ec16083ae7390e0ec27141855f2","src/bindings/python/templates/Int8Helper.py":"d963a76b218a32ea2b3bb26f265dbbc47e859b7d1bc939b43fd9b93c51a62292","src/bindings/python/templates/MapTemplate.py":"9dc81ebced353d0137ef6fe3187e170e3e72d32a3b5520dbbcc1f95354ebf62d","src/bindings/python/templates/NamespaceLibraryTemplate.py":"fc6f7e855d877c58334a0fefa436ad40479a45e8ddcec8afcf5d6bfa78875eb3","src/bindings/python/templates/ObjectTemplate.py":"6ef1c064f4c6368fc8cdddff2e423222b9200916f68474bde2df49043dfbce60","src/bindings/python/templates/OptionalTemplate.py":"2629f3b46ff394df620bbff1699935e6844d9aa017e74ac43c0b38acd05f8d42","src/bindings/python/templates/Protocol.py":"656d35ef72e96423526bd2bc1f67e5786c23dbd7bf5ad6a32ffea529e3599967","src/bindings/python/templates/README.md":"ff099a3019c7cd81d770ae4f72a4681ab165b296a03cc5c3f0405cce224f4145","src/bindings/python/templates/RecordTemplate.py":"0c0f93982cef83331353f44ca1446f1f4b1d7ac95508af15fdbb33305d2384aa","src/bindings/python/templates/RustBufferHelper.py":"a48e5ed1dcde19993ae50bec9b881afa3bc6dd5f7d8257fd60214f2100224929","src/bindings/python/templates/RustBufferTemplate.py":"52763d122401d12b6cca40940915b1c955c1ca08f9078c371e3d789c4206ee28","src/bindings/python/templates/SequenceTemplate.py":"1b262e5f546a1923de6968e0233cc621a5fae16062e9e6ac874c9b62d8f145df","src/bindings/python/templates/StringHelper.py":"b303b7fcbbc0981a28c6a7d0cc5bd90f8e9c8b8d572792e217a324b2bdb95dbd","src/bindings/python/templates/TimestampHelper.py":"b3da14de54822f44ada4459355c842550b944b3cd2a85a4eac0f59e82d646877","src/bindings/python/templates/TopLevelFunctionTemplate.py":"98987999ab11195e06c5e97ba2553983b0fe5f953767ca4e0fa3456eafc00ea1","src/bindings/python/templates/Types.py":"1940df377535146904ea0634617731f9c3c138ddc84baa2e83dcf80adaf7199f","src/bindings/python/templates/UInt16Helper.py":"8ffe4b69a5d4a2b3c5677ff1d8954efc67ab67713ffe297380e930e0379d493d","src/bindings/python/templates/UInt32Helper.py":"83f9603aceae05f2134c7183313ab0a1a8f64cabd8070ae19557494fe41dd6d2","src/bindings/python/templates/UInt64Helper.py":"97269025377a256e821e57991b07e17af05f4d1c4228e01fe5f243d784cb509d","src/bindings/python/templates/UInt8Helper.py":"4896723ed0ab8f5aef4a58d599e0a0dbd63d373f5740821c21b4b429b6a7afda","src/bindings/python/templates/macros.py":"1dfaf5a21631ef408ad29a0fcce2863445840c92091d0c7c74f58440d2b9b235","src/bindings/python/templates/wrapper.py":"475fc3ddc6a9a09041c73fc8e9df9823e4eb612863eccd1e6d4d9c4f7ff0a917","src/bindings/python/test.rs":"bdb0ced3d5d59ca24ab3da7eb70532b5fec7e729d8cb1a1ac260d55c06cc3e2c","src/bindings/ruby/gen_ruby/mod.rs":"72870bb1ad65b3b0ac6a0aa6418ceaa635ab708acf4a129b6c519c8855f0ddbe","src/bindings/ruby/gen_ruby/tests.rs":"7dcb86b08e643c43503f4cac6396833497f6988b004321c0067700ee29ffbf32","src/bindings/ruby/mod.rs":"076e101e21d35b5fb3af99a47acf0842aef61e9343c893c2bd4ae21c06f527ca","src/bindings/ruby/templates/EnumTemplate.rb":"5480edb347f5829e478d19474691babd72f37616ed846d519b5a61cb1d6cf047","src/bindings/ruby/templates/ErrorTemplate.rb":"d478764c8a0a478d0ccc581593a406522cac22d113da47045b022826a3a54764","src/bindings/ruby/templates/Helpers.rb":"ce7ed4be97dad507b991c69c28dc7bb6427e5e79a4b2fba9dad9dccabc3e090c","src/bindings/ruby/templates/NamespaceLibraryTemplate.rb":"9a24c427b9eba99d9e13181a5559a385b5d1d16beae2b72a402f2645b22a9048","src/bindings/ruby/templates/ObjectTemplate.rb":"a1c0cc38865195d61df3540284f4756f1b6406b205d74e3855e7089d763b2791","src/bindings/ruby/templates/RecordTemplate.rb":"343a4b159cf298045747fb48f17552e3bf2c9775fa5b4fa40b424976dc67e33a","src/bindings/ruby/templates/RustBufferBuilder.rb":"1b5ec7fa47b880a6f0aa84b69fcd84c9ff96fca330973328b533f6f23ab0115f","src/bindings/ruby/templates/RustBufferStream.rb":"0523ef56ab63be8547b97c2f9353248fd8175b2b1ed53b3e0a5eed9a71987fcc","src/bindings/ruby/templates/RustBufferTemplate.rb":"d81bc1aa68074e9db23cc8313e690005cb5d6cf790e7c41d44eb9c9c1a247d90","src/bindings/ruby/templates/TopLevelFunctionTemplate.rb":"26c9c2d53853792270795bd822e41968e995375478d246f808f9935af77a7d6a","src/bindings/ruby/templates/macros.rb":"dc60ed79844b04fe828a24aef3550a6b6c30f7c0b66f03608d7c56725287ceed","src/bindings/ruby/templates/wrapper.rb":"f82b41543546f8e5804cd0e1785f4735d9dd95383566d0e5ba1cd4d9e8c0578d","src/bindings/ruby/test.rs":"05391718d4bb79c4e70413d8213cddc4b92f32741a98b3a9aaf258c3754681e3","src/bindings/swift/gen_swift/callback_interface.rs":"1a2b56d16db841574be0762d66b57fbaef0519273d45c47ca687bf656546f201","src/bindings/swift/gen_swift/compounds.rs":"ebcf4ff907dad0a97f6da8a75a2e8c5806759720d107b3c3b5729e1c6681a49a","src/bindings/swift/gen_swift/custom.rs":"e09c822956b883606d2abb496eb523a9c0b274d777952b2c57c34086a647007a","src/bindings/swift/gen_swift/enum_.rs":"f9a2dc54f67767917bf67fb7764abd3e0dfe6c3e485a3eaf2d49b72b648aa100","src/bindings/swift/gen_swift/miscellany.rs":"7fc2444596d76545ad82ee6c4bed64a29dd4a0438d50bfaafe511f41f6a0e409","src/bindings/swift/gen_swift/mod.rs":"58d6a51abc3f6189ec0ee9b08e9de8ea1f0779fec809cb946d4c194192fa5e1e","src/bindings/swift/gen_swift/object.rs":"45a6d6bb053f3ef397ab8c6feba8d0e126a8d14cd87597d25015f97c6ffc3417","src/bindings/swift/gen_swift/primitives.rs":"9bd9d47ade1eb4d6ea8dd4ede5e9873b2053ff6280848f26add0e893a7e7404f","src/bindings/swift/gen_swift/record.rs":"5ad98ab04a5d8178daf0956db819c87d26aae7bf968184e88d512e34c02feb90","src/bindings/swift/mod.rs":"4627577acf1b4de67f867e8d7ccdff663a790c3f65bd9b51b950f1da6057ba54","src/bindings/swift/templates/Async.swift":"f96c88c6bd3b929467fb5915e99122de57eba4258eb7bfbb7a76164010943537","src/bindings/swift/templates/BooleanHelper.swift":"66d5223e1b83c283dcf45d9eb640831f8f1f14086dc4398d9442c5c653ee36d7","src/bindings/swift/templates/BridgingHeaderTemplate.h":"e3518589b3abbaf2e76cd7141ebd7d65375acc0fef0ec16c05c50e9e0dbb8c56","src/bindings/swift/templates/CallbackInterfaceImpl.swift":"12c2235b260c700736831418cf35149f238ec97277d37bb56c777477890ab432","src/bindings/swift/templates/CallbackInterfaceRuntime.swift":"a5def6b3b41698a42e6ccf5c85d365fe0abc7eff629d9f49d9d396ee90aad3a0","src/bindings/swift/templates/CallbackInterfaceTemplate.swift":"bfc46baf28a402d67e9a6c5d51c1214e8c0547017fda19c51792a5634fad80b4","src/bindings/swift/templates/CustomType.swift":"b17249db3a56ca2627536e9f9774c480ea8fcdcbf66a296b0f81e27b53bea9fa","src/bindings/swift/templates/DataHelper.swift":"7e85e521a718203b364c171ffa28cd9f0770dedc6bced64144a64692d8537801","src/bindings/swift/templates/DurationHelper.swift":"2b93e85236b76b55d7725412d6c70d7ac10aa1919a5f7beaeaefc941fe4bc553","src/bindings/swift/templates/EnumTemplate.swift":"ab2a0d4dd55ae830508a4febcab67306e78276b6b417ffeea51a469181a37956","src/bindings/swift/templates/ErrorTemplate.swift":"77f70f9cd8a7965b8b6b952801400c09a940d8261d9587479d55b9dbebc106fa","src/bindings/swift/templates/Float32Helper.swift":"67bd1e273f04702e218b68e6e993c1dfe41cb77c5bd2d6ab76b8fdc9f7ffad2a","src/bindings/swift/templates/Float64Helper.swift":"88467778f7cedb2b96410c604579c586c7d7cc8b84095bede28418f89f57285b","src/bindings/swift/templates/HandleMap.swift":"05ebecfb78cc0372135a2103fa80e1e51cd6141a4215058e314e9dfa30185bd9","src/bindings/swift/templates/Helpers.swift":"bb21cba2753878e6623b1651e3923985d7c2ed85f1dc2b925be100957e4a996f","src/bindings/swift/templates/Int16Helper.swift":"4ee962e38679e376bccd59c8013decc8fff0b8f40cd102e9f2379fe25252ff21","src/bindings/swift/templates/Int32Helper.swift":"56153b6caecbad1a1f55f0d8b75b99ede2a5b0143010b80bef738e5030e370c9","src/bindings/swift/templates/Int64Helper.swift":"75bc655d7876a5ae9bfa94382b4e1893148564686fa12aa1aeaa63faa1c1fde1","src/bindings/swift/templates/Int8Helper.swift":"cce51f3d8d8cbdeeda7074cd227eca8a3126f0cc72d924f918287fca2a82c128","src/bindings/swift/templates/MapTemplate.swift":"c32d5826f053bfeae480b8acfc1ff9450f5056eb10a36e4ba2704683102fb6fa","src/bindings/swift/templates/ModuleMapTemplate.modulemap":"c3f066343d02b19ae50abbde546490b73815378482a5c971357bbd7a498cd2a9","src/bindings/swift/templates/ObjectTemplate.swift":"4b93d73e51b9698efab28d10d3e51faa891198bea5966923f49d46e17ac18d32","src/bindings/swift/templates/OptionalTemplate.swift":"10787cf1bbaf07c4ef330911a995713628e4b6734e4b16af236d1010ee096757","src/bindings/swift/templates/Protocol.swift":"b9b9b28029e3e0d11026b98948ba49179773e5cb2cfc76eaaf0001aa081ff956","src/bindings/swift/templates/RecordTemplate.swift":"aa2bee27d3eddaa2711f648b73e73e53713a5107736bea0454dca62147e63a54","src/bindings/swift/templates/RustBufferTemplate.swift":"6f6eb374277ed6a57481a1bd1f631c7b9127beb0c9ae290b08b8afa52bb04bb6","src/bindings/swift/templates/SequenceTemplate.swift":"94ab811635b6736fea1f58d558e534d22f964af627a3526445f1e2227a55c283","src/bindings/swift/templates/StringHelper.swift":"c1a92531bff7a2108dcdb3293bcd3f8d4b9a63aca9da8ffcb568a9d001ef1922","src/bindings/swift/templates/TimestampHelper.swift":"83b0278ba802c9c8753959cc555fa86a767b55abc52b41fe3a9bb5ad2d6e8081","src/bindings/swift/templates/TopLevelFunctionTemplate.swift":"7aa473a5b12ad7623f61d6c31f6879f269f51d2c4134dd899ce24c7b31ef35f1","src/bindings/swift/templates/Types.swift":"d0a70e0273868967f6b735156bab27a4123f875c883cee10f0d23f044d71af6a","src/bindings/swift/templates/UInt16Helper.swift":"56baf47f786fd85809d8c2df20430983ad059f149e0ed60f58842aefc1f244de","src/bindings/swift/templates/UInt32Helper.swift":"93177c2b3b23a824d1b5f9b561ca89a5a0fa92fbb466ce70816f007dee61ed45","src/bindings/swift/templates/UInt64Helper.swift":"1db2b06d1f7cda1a605f78318fbb4493e1d9ffa9a6fc1c2fd5fca74ac5e250e9","src/bindings/swift/templates/UInt8Helper.swift":"8f92de2074aa94e9122e91d06e1164fb0415d36f23fb5747a456d9f796e0ae99","src/bindings/swift/templates/macros.swift":"50ab8ce03556518abb6613d572788ccc96449e5febaf3f4536175a32a40816eb","src/bindings/swift/templates/wrapper.swift":"5640a10bb6a4aecc82006e92030396d0cdc008017141b68302843ee420f02f36","src/bindings/swift/test.rs":"7499508b9b70170d3bdb2354f51c965423d46811c43e7361ed090c06c55a314b","src/cargo_metadata.rs":"42116c2e37e06eb90b17831c44e542c87cba44c283ae978a3ad98e6cb2564c91","src/interface/callbacks.rs":"362a21f9f2390bc572d4a925909445fe27bd82f8021460393c91e524a70adf4f","src/interface/enum_.rs":"978ef538dc99f70d4131018c18a38a880d8170d4676cdeb9635e669bf3ad8b37","src/interface/ffi.rs":"3f2f0cf59ce95cc8a4ae509d4de2a53303dd517b473ec3563e464a7300485813","src/interface/function.rs":"788f8258a2c4199181e260ef671fe700d73ad05386200da641acc5bae856a0dd","src/interface/mod.rs":"c7ee5e5b5cae432bb94334c7ef505853b1e8343785cdde5cdc22bbc3f0fec9f0","src/interface/object.rs":"4a1c74469d818f94835da0b326c7f362fb7cc9a292e58d73b7a11ed4e65439ed","src/interface/record.rs":"ee642f3984d6180f788752a0ce251139613d2cbc4bc90eaf8840877c1a71c5ed","src/interface/universe.rs":"bfc5136a70cb728853dc4d2a1ccec599d8e614e18790882bdda46f60b2b6d7c9","src/interface/visit_mut.rs":"8485e446a983cc084c9a173f976177fabb9803813a4c03361a3c21410539ffef","src/lib.rs":"cf817ccf9b400029927c72affbc6e0a2752976aa86dfe3413547eac77d91acb7","src/library_mode.rs":"f2b54ba96fb4aeb2a34b178827670c2567507d88615588756525166e3116c6af","src/macro_metadata/ci.rs":"fe96b9c55303f392f5d59574b066b303da6c19aa1f8538383794e661777ddd1e","src/macro_metadata/extract.rs":"9ff3cd3829cd7287432710aacb509b5212cc5489e84d4ca8e2b447488980b38a","src/macro_metadata/mod.rs":"bcb5e9a015510e9d74c288da928a4bfb8d80926a8ff85227c0eae8cdb2605519","src/pipeline/general/callable.rs":"247de082df902f79d817d190768bd87d3736b77d213c48fd59a8f0f10f90b317","src/pipeline/general/callback_interfaces.rs":"3fb3c9dc6f25ac53cbb8f6053f13e1ed9edca0e73740d847eca68a31b94d0041","src/pipeline/general/checksums.rs":"cf79402edbd80719fb44a03f50f3f5a59fcdacdfc43453fd3bde14e9bf47b4f6","src/pipeline/general/enums.rs":"acbb48b3ccf6d04942f9bc8f3e885cb8b35621988a8e29947a4b886a10f515fa","src/pipeline/general/ffi_async_data.rs":"4a5eb9f2e333bcb4cd42341f618b3b6264baeb6ff299b2f47ab14eb9328e5822","src/pipeline/general/ffi_functions.rs":"91c1e380fbe949ed6774299368dca05c663b7e1655f7c4daa127b082f044fae1","src/pipeline/general/ffi_types.rs":"0c95b7b4fd29fddcca65f2f4d743c7a0ee96cbc3381bc6573213a3200ba45abf","src/pipeline/general/mod.rs":"d5345c4fc4527f5108adfcacc4b1d17844e09b5f5519bf882173e8e1bfeb156c","src/pipeline/general/modules.rs":"e28a9f75b82e01666882361dde2e7b8ece4fb21e2218515fc84a7783bd5b6953","src/pipeline/general/nodes.rs":"634352936aa8f8d232cc919c4fdabdfb1f50fe8965a23c6d197b74a63d55d6c2","src/pipeline/general/objects.rs":"2f752539482670bf3316fbd3586b3bceebb7a3020068d251a3e0261fa527ed45","src/pipeline/general/records.rs":"07040985a61580f84bc667bfd59b4278b8d5f043eea6a8157c2c8a0e398cad6d","src/pipeline/general/rust_buffer.rs":"fe5651f14c6152f936ffcc5b25351d74f3b74ec817904f5f90ea73ab5f48dd3b","src/pipeline/general/rust_future.rs":"54fba1c3973750982ca0f16023b67ef60a87a091a5b1858d62354372efbff379","src/pipeline/general/self_types.rs":"0e706669051f046b3e79b24c6ce544b2536207dd9e959ec1b4edbc1732dfd4e4","src/pipeline/general/sort.rs":"322d25dd504c96b307e997fb10db5ed6bf58208f586c39b7e06dddcc04aec6eb","src/pipeline/general/type_definitions_from_api.rs":"7e304d9147702eebe292889e1aef00298161a4b8e8cc3806af2d61082e984532","src/pipeline/general/type_nodes.rs":"d4b0eb251ac338d108dcfb934d5569546f7cf402279109bd35ea77cb26991a2c","src/pipeline/initial/from_uniffi_meta.rs":"8ed7b870e5454c201b654255876192eff4a2aa896a03be78840ad92dcba95245","src/pipeline/initial/mod.rs":"fddcf8a243b1f128a2f52741bf85f8078a7277cf4c21a9c5c01af7aa7c1684d8","src/pipeline/initial/nodes.rs":"82af65b9ebce0244dfd1ad57b2e73841b8e5deaeee93467bf1a492416b82b64f","src/pipeline/mod.rs":"85498ccd184df5c0b6a241dd51ac491e58e4d53a27b5782815ea4b188bc2560b","src/scaffolding/mod.rs":"a19a9274dffe71b2ab97e9e14bc9ba55f904aea07f005a0ac04c241074006c3e","src/scaffolding/templates/CallbackInterfaceTemplate.rs":"11acee064df46f7b5132401ae49c03c77f296bc04065085d6fd5c4ad6b628718","src/scaffolding/templates/Checksums.rs":"9635cd228a3d7e30504da157e4b04dc51397a731a7e2632328cb46ca7379b56a","src/scaffolding/templates/EnumTemplate.rs":"9b947fb3b00520a0668e0b6dbc2d06a14236e6ac97772fec04eedb1ec8b59bda","src/scaffolding/templates/ErrorTemplate.rs":"3fc6c681144486e042ffd7ce476efa0745b8758378dd909b3c0526e55163b8be","src/scaffolding/templates/ObjectTemplate.rs":"faca75a3e05bddac701d9fee66beafdc5439708f72366466e24325b916f5f4d5","src/scaffolding/templates/RecordTemplate.rs":"6c124ea453beba4136744ea33898ad1f20ed3db6bf32856a8138212dfccf66ee","src/scaffolding/templates/ReexportUniFFIScaffolding.rs":"0c0f15ecddf81d20019c6ff4d3675335b4c946dc3753f6f5c977cd46e75c1243","src/scaffolding/templates/TopLevelFunctionTemplate.rs":"c11a688cafc2e21c3be105533b34c1f73eab55202936f7c8a97191d7e27f26e0","src/scaffolding/templates/UdlMetadata.rs":"dcd561acdc269ec6d325d614a54ee4cecbc613fcf138324984414ca69432ed57","src/scaffolding/templates/macros.rs":"ea6bacd8dd9116ad739bdafe893d70407050f35e4a7ac8dd2c78b8ef34263e8e","src/scaffolding/templates/scaffolding_template.rs":"9b36b7a9cf6ef2abf93cf9357f61023c5d16c1daff6831118ad90ec6fd6fd16c"},"package":"2ff0132b533483cf19abb30bba5c72c24d9f3e4d9a2ff71cb3e22e73899fd46e"}
\ No newline at end of file
+{"files":{".cargo_vcs_info.json":"2f3be4f34aaa9a0b1aa397d700298d12d749a853ade40bf8198661fe5e6fd27d","Cargo.lock":"3611136bd98d2c6a42fce794655ae15915999cf01d04fcd6af347e4370cc36ec","Cargo.toml":"4815e130078f06d8b48582024e71ed8c035d75fb78a492594e30f0cdcd41e8cc","Cargo.toml.orig":"f05e16350e75de2276292259e7264999b4c37c7bbccc048892c73548a017a654","README.md":"c48ebaa9337cbe23085b172e2100088b67ae3f3823e114dc532e9d67f5ff6133","askama.toml":"1a245b7803adca782837e125c49100147d2de0d5a1c949ff95e91af1701f6058","src/bindgen_paths.rs":"e303e5fd0263c38b811b988f58d7d455724afe38856b4ae3c43e67b7f6a3ef40","src/bindings/README.md":"1f367f507e5b76971662b960653b0e743d3baab174597b38ab731ad44fc2e1d0","src/bindings/kotlin/gen_kotlin/callback_interface.rs":"741100c2b4b484583d34408b276394078a24918c47101fbaa6233df9c4da32f2","src/bindings/kotlin/gen_kotlin/compounds.rs":"47e3df12a19487acbfc7aa8a99e3f5e2fdd68aa3a275c17f4215ceda112541fd","src/bindings/kotlin/gen_kotlin/custom.rs":"259a2eddcb1bd20f0e28d56c0c74c30f4338b22fcfd5d7873b508e6b77163256","src/bindings/kotlin/gen_kotlin/enum_.rs":"38f4f59e0fbed5aafa15dda54c2a075fe190074f88764436a09a40b5cff79a7f","src/bindings/kotlin/gen_kotlin/miscellany.rs":"0853a4c6bb909f2e7cd1aa4c52fefa8862c866ba3c464812c500a190822cdfef","src/bindings/kotlin/gen_kotlin/mod.rs":"92a034b4f389fb3c9fcccf7a75099a83004af35fda8324c56846baf02b84cd7a","src/bindings/kotlin/gen_kotlin/object.rs":"1cb8d1f5eaf06ceaadb6d2cedca482fdd1502c24500ba270d8fcac48ef2f1231","src/bindings/kotlin/gen_kotlin/primitives.rs":"a4701ff781facf50954b92b1b749a0f676620ec1a9f32f33102e7fbf2a154f96","src/bindings/kotlin/gen_kotlin/record.rs":"96fd1a180095a062b4a9b71d4f603b232f0133f46355a3e427c4064701d900f2","src/bindings/kotlin/gen_kotlin/variant.rs":"d111d6888745195fc2c24bdddc57359e771616102a8d182c5c8ad268b0a13460","src/bindings/kotlin/mod.rs":"41f68e1043732befd5b4c2eaeb71de1fdaf914c316dad2d2f8a4e7d4d86ef090","src/bindings/kotlin/templates/Async.kt":"23852a396ae889ed914d989df477ffe2cf1f777a7dea1766fe311ce776e2289f","src/bindings/kotlin/templates/BooleanHelper.kt":"ea8acfb2f20cc6e9a3d43246e59a2b7432d7d82d4c9efeab1cfd3894e167ec48","src/bindings/kotlin/templates/ByteArrayHelper.kt":"34787b1f40e9d40df08693fa92ce455251b08843c897f8b015f3d06974eea203","src/bindings/kotlin/templates/CallbackInterfaceImpl.kt":"4abc0b9103ff8d091ea2fea30ff0ec20bbfa6f11cb6e4946960b9fb3b8dd6648","src/bindings/kotlin/templates/CallbackInterfaceRuntime.kt":"667541abbc6b7241cc5bcc579bdfb8b35b06bd9d4f4ca7364abba534f3dc63e8","src/bindings/kotlin/templates/CallbackInterfaceTemplate.kt":"9d378a76129438b6ef8d3ca7468778bb5b729feee950267b728fd07ca7bc2493","src/bindings/kotlin/templates/CustomTypeTemplate.kt":"568f3a0e786f5593b51c4bd1390d8266d21b4043e2f6da4e4594b0f745ab1ba2","src/bindings/kotlin/templates/DurationHelper.kt":"39b6149bbd87788bb7bc0637a7e018f7b9d106e811db29e508d9d6a916f819d7","src/bindings/kotlin/templates/EnumTemplate.kt":"49596b63d84b2e354da0855283e86bb6b88711d01cf354ea5e25b1b3446a814e","src/bindings/kotlin/templates/ErrorTemplate.kt":"7b027f68d88d7839c8bf5cfd67fcc3a92c52f61e9796ff57af83387cdb7d85d9","src/bindings/kotlin/templates/ExternalTypeTemplate.kt":"640fcf3d9963cafe6217b5f052122fb86581a76586bb4f01c9aa454679f730d1","src/bindings/kotlin/templates/FfiConverterTemplate.kt":"73c2f68c04ef3885d98120b9d4fa48c438715aeb8be43178fbed0f327a1a6029","src/bindings/kotlin/templates/Float32Helper.kt":"889d1b78e2fae19981f7749c598d0432ed1db7e4c1e3f8a683ebf9fcb8f14503","src/bindings/kotlin/templates/Float64Helper.kt":"29752b413a7ec3aacca7898a6edc53eaccff2c8860d58f127a357c1c956cc0e9","src/bindings/kotlin/templates/HandleMap.kt":"4fd1b70b068317db8d29d3936d886380f9c26024d1cc4dece5217582ea4b729d","src/bindings/kotlin/templates/Helpers.kt":"5c80c42383dbd08cd14e884849acc9e66952112254cd40d696671caa3e4c5c21","src/bindings/kotlin/templates/Int16Helper.kt":"bda5ce2058e04ca27886d3f32f590c41a892eb5c144e069a6ca9a25113eb2049","src/bindings/kotlin/templates/Int32Helper.kt":"1dfcf9d9d99daf81ef102dc27bcba35a705d4ca29ba4dc8b68abc235ae4b33db","src/bindings/kotlin/templates/Int64Helper.kt":"5cc035397ee05cbd9d728155909d8480bad0685a8eaf9e641ee6a2cebefd43cd","src/bindings/kotlin/templates/Int8Helper.kt":"446f5e0324f791358889b1382719ca6aff88eac9c0a3b0ca2a9684951e837500","src/bindings/kotlin/templates/Interface.kt":"6e9bbc33624f430c1959a928cc25393aeef7963288e6a10dda01b5fdc76b9175","src/bindings/kotlin/templates/MapTemplate.kt":"c6b0de174393dbda653c60147c695f59406edc9d6040c82feae24db6422d66db","src/bindings/kotlin/templates/NamespaceLibraryTemplate.kt":"6d466dee40639c8f963a49aef1d50ca4b3816d1e6e69b661efe0955728ca3bc6","src/bindings/kotlin/templates/ObjectCleanerHelper.kt":"e11c78fd70ed84a88cd291a487cc6b846a582bd75a8636fa268639e8dba981d4","src/bindings/kotlin/templates/ObjectCleanerHelperAndroid.kt":"049e1e32a23b7923393e3dcabce49532737d44e9dbb331f62984ada67bde3125","src/bindings/kotlin/templates/ObjectCleanerHelperJvm.kt":"b6287f72afdb0ab9af5e56136c28e6a4f5e18a50305bce8923ee061b9406cfc3","src/bindings/kotlin/templates/ObjectTemplate.kt":"5757e797184c8d54a05cd30e07c9591eb933102576f782022264e3bc34b1545d","src/bindings/kotlin/templates/OptionalTemplate.kt":"4484e8ac408b96f9addd65fde113ce222f1fff2017691f36bd4c0b7d8497d7ab","src/bindings/kotlin/templates/README.md":"83587ff54a31fa47d2c0849cb5db52d6f079551e1cfb73c76c6dd02a7b164ad9","src/bindings/kotlin/templates/RecordTemplate.kt":"bdb2747d7b23369911ca387a0ba382a077c00751df6e2447d03373180ea831bb","src/bindings/kotlin/templates/RustBufferTemplate.kt":"577405efb6d1921cb30928715636e0b7063fadb49802343ffe0bdf04c60da735","src/bindings/kotlin/templates/SequenceTemplate.kt":"c7c5105146ae5deff589307036a3e77db1dea86895a3dfabcef03126107a4c3d","src/bindings/kotlin/templates/StringHelper.kt":"3c06f9c8170c0d33e520574795020ba96fdaad941cac102cb8c61fc8bbce6400","src/bindings/kotlin/templates/TimestampHelper.kt":"de7955d89d7daa4f42e4767a73dadaa64805ea559528c465cec98346b2b605c3","src/bindings/kotlin/templates/TopLevelFunctionTemplate.kt":"68c714cc8c7fa244166c5902a59c90317cdfc402193624cade405e3454f9bf67","src/bindings/kotlin/templates/Types.kt":"364af17a64bc99cefb2adad33c5aaab9093894ddeb2def1218b12fd8a47d6c4d","src/bindings/kotlin/templates/UInt16Helper.kt":"03fb99590b0d1c90f2dc988273edbd96168140c0888817e9600483dd85f16a2a","src/bindings/kotlin/templates/UInt32Helper.kt":"e5155f5f3aa0ac698c9f780e0b6794ebb866d50bea90b862cff2d66ae58113ba","src/bindings/kotlin/templates/UInt64Helper.kt":"a8f65247d4034d25e9920b9ac6920fa21abe342fec18b043798571ea97dfff10","src/bindings/kotlin/templates/UInt8Helper.kt":"c3ae1dc8562b7a3a05a8746b7b4561a36be5a00003af6e9bb3be486814885b35","src/bindings/kotlin/templates/macros.kt":"53e400d33c1cd89dbb34e65938d5517ba2cc298dde40c9721bdf9b03589a328b","src/bindings/kotlin/templates/wrapper.kt":"a3b606341464b4a4d1255f3f867c3669f1551f946fb435d62eec81cf54488607","src/bindings/kotlin/test.rs":"0915a315c08ad7ffde7b31ae334d2f458590255fff5e302f88ab3ca12d25204c","src/bindings/mod.rs":"6f88f9b6afe6933e73a3ac8f8b86ea14df9443c356f221cf2030ba039cb5949c","src/bindings/python/filters.rs":"5a8617731aea6566286b44edb6b20c8b457713b6f41ae681690407b075b19802","src/bindings/python/mod.rs":"2118e797ad74f644dd9fc91d7aeaec961b754575613752e5235d94882ecd0711","src/bindings/python/pipeline/callback_interfaces.rs":"010ea8dce9a7ebe52872b2e11cf486c2920cae2f728f517ee6adf7b30f3517e9","src/bindings/python/pipeline/config.rs":"95c3fe044ce3b1529cf992bf12a68e245ee3aecc374c2f5a617664be12e6e0fb","src/bindings/python/pipeline/default.rs":"4cfde6ebfc97b011fe5773b3b94ccc55609a13212883b11e5774f90a034cad3f","src/bindings/python/pipeline/error.rs":"cd256c5b6ae3327b214bed696a2c4aefcf9250da33f75037d0f383d2661ec71f","src/bindings/python/pipeline/external_types.rs":"7e4bcd9217fde1072583200ddd0d36f2ba5d9bc44a36fee207360e75c656e67c","src/bindings/python/pipeline/ffi_types.rs":"3caa2db43a9338f0d3bea6014b4605eba6f843251e1b7b0e0f761f6c50d77ec7","src/bindings/python/pipeline/interfaces.rs":"0781a914f2e591be3906249dd11eb40316692a651cad99ef5c4fbef75afbb36d","src/bindings/python/pipeline/mod.rs":"19356ca168ee43340a89215fb7c656b8e306d85eba333dac8123b047ad40217d","src/bindings/python/pipeline/modules.rs":"231865d1df3b9837b2cdf9565f11d454161379b41fa733cd80570f48041eb3a7","src/bindings/python/pipeline/names.rs":"1db1241ca9f5426d8c9692c54b6ec0871f2509401b17fcf89dc2d46f799041a5","src/bindings/python/pipeline/nodes.rs":"2029db68093bcf7432f1e0b2602e97236a9e1c9728b058bdcec21f9b3432a2a3","src/bindings/python/pipeline/types.rs":"a029405c8680851d8351c44569efab08121771ae7aef6250b90710135e16c696","src/bindings/python/templates/Async.py":"0241f8571b27e073a639f44451a1e867479230880326aa6040577cf2c3e6afce","src/bindings/python/templates/CallableArgs.py":"7c4ab6c3e384fcc7093824dd3929b7bf94accc545f5875a7a8db3dd689132c55","src/bindings/python/templates/CallableBody.py":"0fe0fbe76074623093cb404d9065514d613a1888da2f40e2c31e5e7c6f1abca9","src/bindings/python/templates/CallbackInterfaceImpl.py":"0dba5352bf0c1332257818f38e32f105ac01833803da9de2bb521670e98fdec0","src/bindings/python/templates/CallbackInterfaceRuntime.py":"8ffe6640283b907cfea9432c7c077da5ce725d2def37c8d23faa4f5f784ed4d1","src/bindings/python/templates/CallbackInterfaceTemplate.py":"983a878b1c1acc0076fbe3f4077875086471cd29eb39b20b0245ea89cd4c9389","src/bindings/python/templates/CustomType.py":"f515255b9ad3f89ffba528bd2b7cca315f37bb6ca40a7d0bc0e5ba7e5966dac1","src/bindings/python/templates/EnumTemplate.py":"21d15c94a156135eb92e4cfa84e2c2e886952574a1286ce19dfb191addc395a2","src/bindings/python/templates/ErrorTemplate.py":"18c0eebdd00ac99a135da3a713b9b328d12daa5b3a8b5a4b6fb52aa648d46674","src/bindings/python/templates/HandleMap.py":"f35b74c294fc9a4bcb501182c4a46276aa1004ce954d6940a21adb92a02e61ad","src/bindings/python/templates/Helpers.py":"d7b89df6aadf80ee034f3c0e34359c1141dffa207a19d17fb6fcf84966e03a62","src/bindings/python/templates/InterfaceTemplate.py":"1816f6e92ba34246da291eaf85915b3035e6c99bf8100784a5af56c16830f54c","src/bindings/python/templates/MapTemplate.py":"daa90bb064735ea10edae88bfc101631d2ab7aac470d96dd35db456942fd72e0","src/bindings/python/templates/Module.py":"b364b07291efeb1e8ac932d623aa5013d485b22f62770c9a92c5ce1b922a3644","src/bindings/python/templates/NamespaceLibraryTemplate.py":"7def69df0cd88a97c6d95d6726547004015be33fa3d317a3fa3b87b4f953c628","src/bindings/python/templates/OptionalTemplate.py":"e6111c2669aa98ca2088f274cf52b684c933982a740592c90f5e563a6b3d4d0d","src/bindings/python/templates/Protocol.py":"e93becca7b2bd822e1dc7d95a1f53d96ed76a338df3d30256b0cd2e951db8639","src/bindings/python/templates/README.md":"ff099a3019c7cd81d770ae4f72a4681ab165b296a03cc5c3f0405cce224f4145","src/bindings/python/templates/RecordTemplate.py":"0798d15ec764177233f7c75b3aaeb93e186a513dfcba7f2dcb1503ec17b64d88","src/bindings/python/templates/RustBufferHelper.py":"a48e5ed1dcde19993ae50bec9b881afa3bc6dd5f7d8257fd60214f2100224929","src/bindings/python/templates/RustBufferTemplate.py":"68781fed82ab6560972baff55e565500d69ea53c30b92096dec014da3b4d0ddc","src/bindings/python/templates/SequenceTemplate.py":"6a23f986616dbf445cb30eba6fdf972e8cf35b450f167130d2fbd169237edcda","src/bindings/python/templates/TopLevelFunctionTemplate.py":"dafa8c0964453e61724af1b9f65cef9104bdd7d71586fd51eba5aa4498d1ef93","src/bindings/python/templates/Types.py":"a777460b8bca04d9e4dc7624289784ff722f2217db208745276eb2b51980c2ea","src/bindings/python/templates/UniffiTraitImpls.py":"28f51809152444420aca39fe4eef2766dc8e2cb76c309d25ba1e304292d838e2","src/bindings/python/templates/builtins/Boolean.py":"00f448ce34304aa5eea16861592307c474688634d7ac69e282cc327910975589","src/bindings/python/templates/builtins/Bytes.py":"28795f99e43b8c53f2e8331f05fac22c1b89a0e65a93dc4814d28a0f9234c537","src/bindings/python/templates/builtins/Duration.py":"bfa219fb28186b21eeda4a331ac1ccc0510caae84ed57c15eab6b141640b0dfa","src/bindings/python/templates/builtins/Float32.py":"2ca2849cf8d36de1bf30aa26a72ea3414818a42d50a42f11b5db445f94c9e3df","src/bindings/python/templates/builtins/Float64.py":"049f652e4dd49131844ce601c2be37f4c6b47f40842894d89f98c38bc9a696ee","src/bindings/python/templates/builtins/Int16.py":"fe815cbac57d536d973e388b89afba2262b35d08831b7b4668d6cbdbc9ad2ce5","src/bindings/python/templates/builtins/Int32.py":"23e99f8ade725b94b84252e2374d96b97d16f5d494e2bc5cd647be21147ed53b","src/bindings/python/templates/builtins/Int64.py":"0463c1fd1c03493ce288d7e177468cc6d0dd1b473d24beb77b642e36980f1098","src/bindings/python/templates/builtins/Int8.py":"ca8b7563e560970ffcf500725fc2436be6763e682b1d818b6230aa45f5f09583","src/bindings/python/templates/builtins/String.py":"5be6b9d92bb4773a3a46f833e6cfefa2538272bb10e3a086a9b04f4e8d839bf9","src/bindings/python/templates/builtins/Timestamp.py":"5147a9c3411f3526fe1adeb5273af9a7f25997bf2f82bf27f2500ad25c57a35f","src/bindings/python/templates/builtins/UInt16.py":"4d844453677f9a0247c1b9f08cb31e88a40792c012424149a7e55ca4230c6332","src/bindings/python/templates/builtins/UInt32.py":"81f364d7df50fe95c6e06919cf0a93a2bd473e45143216f56deaf0d58fc2084e","src/bindings/python/templates/builtins/UInt64.py":"3d7d53fcde5ea984bb6eda601e4b5c2dc9039bd560abde2df12632a695b66a3b","src/bindings/python/templates/builtins/UInt8.py":"d0b93c8d24eefea7229657148f6551744fdfac06acb08c9f90eb37260e8609f4","src/bindings/python/test.rs":"e770e3bd0c1eb74c2d29a3c05256824e95d53475f4d38807ac0fdeed241cdb85","src/bindings/ruby/gen_ruby/mod.rs":"40a81667591ba0cf48cc0b5b67516119b16d5a34e6e756b75b230482950b210d","src/bindings/ruby/gen_ruby/tests.rs":"7dcb86b08e643c43503f4cac6396833497f6988b004321c0067700ee29ffbf32","src/bindings/ruby/mod.rs":"bf67181779d41123bbffbd4b917f2fd49831556098ab0fe5d088a12c27fe9c5e","src/bindings/ruby/templates/EnumTemplate.rb":"5480edb347f5829e478d19474691babd72f37616ed846d519b5a61cb1d6cf047","src/bindings/ruby/templates/ErrorTemplate.rb":"d478764c8a0a478d0ccc581593a406522cac22d113da47045b022826a3a54764","src/bindings/ruby/templates/Helpers.rb":"ce7ed4be97dad507b991c69c28dc7bb6427e5e79a4b2fba9dad9dccabc3e090c","src/bindings/ruby/templates/NamespaceLibraryTemplate.rb":"9a24c427b9eba99d9e13181a5559a385b5d1d16beae2b72a402f2645b22a9048","src/bindings/ruby/templates/ObjectTemplate.rb":"34d49fed50e71b93b82fde7a04182fe142bfb46a749751e21197bb69540d5610","src/bindings/ruby/templates/RecordTemplate.rb":"e9538ae2e5a0045306b60b2f19381fe44eeb530085df0474f1866be99c418766","src/bindings/ruby/templates/RustBufferBuilder.rb":"e4a88c3de04036d196e33a5e8561d3a5465bf04b2f095404574858acd5aa2188","src/bindings/ruby/templates/RustBufferStream.rb":"5697e67d26d176faefb999ad410ab30bbebd127caf2d8941be4fe81da0bff4f0","src/bindings/ruby/templates/RustBufferTemplate.rb":"d81bc1aa68074e9db23cc8313e690005cb5d6cf790e7c41d44eb9c9c1a247d90","src/bindings/ruby/templates/TopLevelFunctionTemplate.rb":"26c9c2d53853792270795bd822e41968e995375478d246f808f9935af77a7d6a","src/bindings/ruby/templates/macros.rb":"5e84d98f2ce655173c23fe9b89fcf4bebfe9d42db9534ef8828ff257ceecce35","src/bindings/ruby/templates/wrapper.rb":"f82b41543546f8e5804cd0e1785f4735d9dd95383566d0e5ba1cd4d9e8c0578d","src/bindings/ruby/test.rs":"6534457d8c5121201c68c0b8888009eb397824c43496a3579051a7a2dc95cb56","src/bindings/swift/gen_swift/callback_interface.rs":"1a2b56d16db841574be0762d66b57fbaef0519273d45c47ca687bf656546f201","src/bindings/swift/gen_swift/compounds.rs":"fa200d34ac0335f3aa743b3bde3f78eb8434b54109d4a347d6a303132c7d024d","src/bindings/swift/gen_swift/custom.rs":"aac2512436842657993dab21e846c2c251311ba8b54bb5b486645caf39c7d2b0","src/bindings/swift/gen_swift/enum_.rs":"92e50ddbb1bc57f2110950c29cd30bbfebd7a56f21b2d28ab9ecc006de8c1368","src/bindings/swift/gen_swift/miscellany.rs":"7fc2444596d76545ad82ee6c4bed64a29dd4a0438d50bfaafe511f41f6a0e409","src/bindings/swift/gen_swift/mod.rs":"467eb3bbe17dd18f7f4f155a6042e67a2894e6411b4ae5770b5287699e2bfb53","src/bindings/swift/gen_swift/object.rs":"45a6d6bb053f3ef397ab8c6feba8d0e126a8d14cd87597d25015f97c6ffc3417","src/bindings/swift/gen_swift/primitives.rs":"b710e45730554bbb2dab1338fe98f3ad70d2cb071b944487cbc44ce23b9a7563","src/bindings/swift/gen_swift/record.rs":"5ad98ab04a5d8178daf0956db819c87d26aae7bf968184e88d512e34c02feb90","src/bindings/swift/mod.rs":"170a3302eeaa4a4cf55c53836a114887c99a217e6e51edd4c4c69ad69a863b19","src/bindings/swift/templates/Async.swift":"ed38520ba1dcf82ba7522755f96c063eea7072c0ba691462b58de71f00c19519","src/bindings/swift/templates/BooleanHelper.swift":"66d5223e1b83c283dcf45d9eb640831f8f1f14086dc4398d9442c5c653ee36d7","src/bindings/swift/templates/BridgingHeaderTemplate.h":"e3518589b3abbaf2e76cd7141ebd7d65375acc0fef0ec16c05c50e9e0dbb8c56","src/bindings/swift/templates/CallbackInterfaceImpl.swift":"1e3de57e56947777246dfc30c8c0e58ffdc9fe879c5e8a9fcd6fb0145347d3e5","src/bindings/swift/templates/CallbackInterfaceRuntime.swift":"a5def6b3b41698a42e6ccf5c85d365fe0abc7eff629d9f49d9d396ee90aad3a0","src/bindings/swift/templates/CallbackInterfaceTemplate.swift":"bfc46baf28a402d67e9a6c5d51c1214e8c0547017fda19c51792a5634fad80b4","src/bindings/swift/templates/CustomType.swift":"b17249db3a56ca2627536e9f9774c480ea8fcdcbf66a296b0f81e27b53bea9fa","src/bindings/swift/templates/DataHelper.swift":"7e85e521a718203b364c171ffa28cd9f0770dedc6bced64144a64692d8537801","src/bindings/swift/templates/DurationHelper.swift":"2b93e85236b76b55d7725412d6c70d7ac10aa1919a5f7beaeaefc941fe4bc553","src/bindings/swift/templates/EnumTemplate.swift":"55a528d55c9ff4708ed757943ed4911ec0d80bce3f942dd0fd5cd5f597d4f988","src/bindings/swift/templates/ErrorTemplate.swift":"c7e43fbea0aae8982e98de83e8151f763d03cd18e9b94497915e4ec7d366d10a","src/bindings/swift/templates/Float32Helper.swift":"67bd1e273f04702e218b68e6e993c1dfe41cb77c5bd2d6ab76b8fdc9f7ffad2a","src/bindings/swift/templates/Float64Helper.swift":"88467778f7cedb2b96410c604579c586c7d7cc8b84095bede28418f89f57285b","src/bindings/swift/templates/HandleMap.swift":"bdecf329f9bf0231b85936a57b165b290f2638ff23827ff2750bf20bf50acbc0","src/bindings/swift/templates/Helpers.swift":"bb21cba2753878e6623b1651e3923985d7c2ed85f1dc2b925be100957e4a996f","src/bindings/swift/templates/Int16Helper.swift":"4ee962e38679e376bccd59c8013decc8fff0b8f40cd102e9f2379fe25252ff21","src/bindings/swift/templates/Int32Helper.swift":"56153b6caecbad1a1f55f0d8b75b99ede2a5b0143010b80bef738e5030e370c9","src/bindings/swift/templates/Int64Helper.swift":"75bc655d7876a5ae9bfa94382b4e1893148564686fa12aa1aeaa63faa1c1fde1","src/bindings/swift/templates/Int8Helper.swift":"cce51f3d8d8cbdeeda7074cd227eca8a3126f0cc72d924f918287fca2a82c128","src/bindings/swift/templates/MapTemplate.swift":"c32d5826f053bfeae480b8acfc1ff9450f5056eb10a36e4ba2704683102fb6fa","src/bindings/swift/templates/ModuleMapTemplate.modulemap":"c3f066343d02b19ae50abbde546490b73815378482a5c971357bbd7a498cd2a9","src/bindings/swift/templates/ObjectTemplate.swift":"6e9468de947bd4aaab59a8735759565b1342aaaf109fb301669baab0c1527ca4","src/bindings/swift/templates/OptionalTemplate.swift":"10787cf1bbaf07c4ef330911a995713628e4b6734e4b16af236d1010ee096757","src/bindings/swift/templates/Protocol.swift":"b9b9b28029e3e0d11026b98948ba49179773e5cb2cfc76eaaf0001aa081ff956","src/bindings/swift/templates/RecordTemplate.swift":"b28c54b8d133fccaa986cfedf34b0a39fc5afa32f6f0c573edb5c3f0c6627591","src/bindings/swift/templates/RustBufferTemplate.swift":"6f6eb374277ed6a57481a1bd1f631c7b9127beb0c9ae290b08b8afa52bb04bb6","src/bindings/swift/templates/SequenceTemplate.swift":"94ab811635b6736fea1f58d558e534d22f964af627a3526445f1e2227a55c283","src/bindings/swift/templates/StringHelper.swift":"c1a92531bff7a2108dcdb3293bcd3f8d4b9a63aca9da8ffcb568a9d001ef1922","src/bindings/swift/templates/TimestampHelper.swift":"83b0278ba802c9c8753959cc555fa86a767b55abc52b41fe3a9bb5ad2d6e8081","src/bindings/swift/templates/TopLevelFunctionTemplate.swift":"7aa473a5b12ad7623f61d6c31f6879f269f51d2c4134dd899ce24c7b31ef35f1","src/bindings/swift/templates/Types.swift":"d0a70e0273868967f6b735156bab27a4123f875c883cee10f0d23f044d71af6a","src/bindings/swift/templates/UInt16Helper.swift":"56baf47f786fd85809d8c2df20430983ad059f149e0ed60f58842aefc1f244de","src/bindings/swift/templates/UInt32Helper.swift":"93177c2b3b23a824d1b5f9b561ca89a5a0fa92fbb466ce70816f007dee61ed45","src/bindings/swift/templates/UInt64Helper.swift":"1db2b06d1f7cda1a605f78318fbb4493e1d9ffa9a6fc1c2fd5fca74ac5e250e9","src/bindings/swift/templates/UInt8Helper.swift":"8f92de2074aa94e9122e91d06e1164fb0415d36f23fb5747a456d9f796e0ae99","src/bindings/swift/templates/macros.swift":"53a7150362491694393f01eb0d985241ed332ab2f0ca7f2e37bef59278c23111","src/bindings/swift/templates/wrapper.swift":"5640a10bb6a4aecc82006e92030396d0cdc008017141b68302843ee420f02f36","src/bindings/swift/test.rs":"6bd713a4cb06bb133348749b8948c7480bf3cdf64fb1795dc83463dc160c59fe","src/cargo_metadata.rs":"4a6596dcc0715b0b900cf1f3c25843a58e568a8f1de2aad25cb35dfffde4e4a7","src/interface/callbacks.rs":"926bb14d7fc1e63cb2af0e1b8e4089541bae7edfbd1f1963fca72aa3738d5929","src/interface/enum_.rs":"2d2157fae26d282ac45d16e9ef0837ad17091cb57650b3735ea18e7a24bca991","src/interface/ffi.rs":"3aaed4cbf8d9442af9ab70395d31566a7529cd1520a6dace673fabcf53b5d794","src/interface/function.rs":"67dd385a8d3ed09ab61fe85fe132fb998464a00e7e40b98010948ffa4b82b4d4","src/interface/mod.rs":"2e9fb4d5fd2d2bbbb44eee303739a497cccdd6fd81aecf69450d48b85ba38f46","src/interface/object.rs":"0f5604465e365a8cdf5becbb59379057efb9db4f2ecc32966f4bdf075e74769f","src/interface/record.rs":"414a4b2f996b8bec9987ab44aa1c2ad8f3664ad94a2aec22ece5e5032372a000","src/interface/rename.rs":"fd148c4bcdd0ba192297dbbdb2fdd5627e14e2ce4e15401436ea762493d4372d","src/interface/universe.rs":"b79867c28222bc5b048805ac53074f8d1916981db45bc5d3c5dcea2fc740817e","src/interface/visit_mut.rs":"a5798968c275b0dead49c08f121d9c2a1b11af00dde3f026678640706c1430e5","src/lib.rs":"5a6db687bbcaaf1d91deededc081ebf007b35ba9aa98ff934e8807d42d479a38","src/library_mode.rs":"8e1c6e938bc47e5025aa09b49957d532425a99c046d18f5dfbbebfa53bef0210","src/loader.rs":"6f0eb040739cdcca120781e0d560e47b15fd1c4fa72d677b18be70c11fa4ccbf","src/macro_metadata/ci.rs":"41cc6f359b0c1a8e97e9c730eb5dfa2f4f0c5802c0519a4eaeb2a486e62ab290","src/macro_metadata/extract.rs":"cd7e0786f62db31ccdb20e1c56083261a35a2b7a698946fd6d7d8fac9835e6ae","src/macro_metadata/mod.rs":"28035a14d54b9abbb975a9b0d86054e8c9529458359881b73b160423f651ab38","src/pipeline/general/callable.rs":"e03e86477e6710d97d2292c9e6170cd07a9b8e0674183f1af023396b62032728","src/pipeline/general/callback_interfaces.rs":"a8dea380960ad79796ba8f6288d285cb507e2bba30a063cb53c88ed33edf3782","src/pipeline/general/checksums.rs":"9d0b691904a3b3278b388919fbf844659c8286945263569daa9acc2eefee12d1","src/pipeline/general/default.rs":"5101ebcf0f12c9b539288053b05e49cf4dabfe419b4fcfd3f03c9bd9b07abd7c","src/pipeline/general/enums.rs":"acbb48b3ccf6d04942f9bc8f3e885cb8b35621988a8e29947a4b886a10f515fa","src/pipeline/general/ffi_async_data.rs":"453690706e8a03c938e8cdb6f56e964d17bfb7c38953e23f77efb25914c878d3","src/pipeline/general/ffi_functions.rs":"d9ba76b367319aebc009450ab2c9b4f4f09028123b71347452a6d3f838e9d088","src/pipeline/general/ffi_types.rs":"8e62923ba804795eaa71d5b3967aa9676ab6cc21923a23a236dea34e831e833b","src/pipeline/general/mod.rs":"455ea06dddd384250f7c087e43c73033caf689e9883aeb0284be2ebc8e15fe6a","src/pipeline/general/modules.rs":"edeb0b49287a7d526efd6f70c8b5a8f39ad3a3b24dec7209b67a9384a563fb8e","src/pipeline/general/nodes.rs":"b79ef89787803c4525ec8cf5762d217da92464ab3325ed8856df4a71754fbab0","src/pipeline/general/objects.rs":"1fa9a5acd82fafe4fcb439ce5c29f6ee609173b26f6ae9e4d4425ea44cf7a9de","src/pipeline/general/records.rs":"07040985a61580f84bc667bfd59b4278b8d5f043eea6a8157c2c8a0e398cad6d","src/pipeline/general/rename.rs":"b8f2d794bb84ac334508ce440658d7beea7aad390c5f5ad3067e0f01540fcdda","src/pipeline/general/rust_buffer.rs":"34a4bfc489a34d3ed20ab4a1366fafbbfd71656da52bd2c82863acfa50f28bc4","src/pipeline/general/rust_future.rs":"f8a04ae9da7913303bfc3b5fb68008964473e6b49478968a68e88f5dd2a94d26","src/pipeline/general/self_types.rs":"be47aaaa8d27cc069d8f42805c435bff5d92e365946b53ee1af118454d0399f3","src/pipeline/general/sort.rs":"e5be3a38564c107f347845c5689e05a7f2363fd41026792e41aecd116478314b","src/pipeline/general/type_definitions_from_api.rs":"113ff8aa9dde7f6c62a137945f73f4805c7c5c0d5ec67cc2ac8c166a8a035b83","src/pipeline/general/type_nodes.rs":"7decb1cb85203973202cdcfb5a4631c692d1115540acf574be548d5f5d5a4043","src/pipeline/general/uniffi_traits.rs":"db6d23a96be40ead0266c865dc4fc0ff1590f895cf8bbd12b18d59fa6e2156af","src/pipeline/initial/from_uniffi_meta.rs":"2fca4017990a172ea82c566a96998b8450d823232ab1673f288dcdcf5349a3f3","src/pipeline/initial/mod.rs":"575653e91e797169811f8f52544165bc5434d397249d102e4df161f1f373ca04","src/pipeline/initial/nodes.rs":"37774d0e5bcf8de06b7860331c45fc7294b38e93dd3a042ff10432dfa26a93bf","src/pipeline/mod.rs":"1302db67055ce09c926f617bc52bec59a697728cda9578b005ba2159370a7afd","src/scaffolding/mod.rs":"ae0582576112f55c99d049e4174ca32188fcb7b00c16d7c19aff112f503565ac","src/scaffolding/templates/CallbackInterfaceTemplate.rs":"11acee064df46f7b5132401ae49c03c77f296bc04065085d6fd5c4ad6b628718","src/scaffolding/templates/Checksums.rs":"9635cd228a3d7e30504da157e4b04dc51397a731a7e2632328cb46ca7379b56a","src/scaffolding/templates/EnumTemplate.rs":"34828cb483017bc4e4757364e47fddf8eb6be202cee61a285061d4cf7b1f4dc7","src/scaffolding/templates/ErrorTemplate.rs":"3fc6c681144486e042ffd7ce476efa0745b8758378dd909b3c0526e55163b8be","src/scaffolding/templates/ObjectTemplate.rs":"7db48cf34deec372f01004cafc61c6be74ba9bae210b10225d619af62a14f98f","src/scaffolding/templates/RecordTemplate.rs":"222b72331011631b2b82afbf6344b938e412ca5798dad6d0a719f95f966bcb61","src/scaffolding/templates/ReexportUniFFIScaffolding.rs":"0c0f15ecddf81d20019c6ff4d3675335b4c946dc3753f6f5c977cd46e75c1243","src/scaffolding/templates/TopLevelFunctionTemplate.rs":"c11a688cafc2e21c3be105533b34c1f73eab55202936f7c8a97191d7e27f26e0","src/scaffolding/templates/UdlMetadata.rs":"dcd561acdc269ec6d325d614a54ee4cecbc613fcf138324984414ca69432ed57","src/scaffolding/templates/macros.rs":"ea6bacd8dd9116ad739bdafe893d70407050f35e4a7ac8dd2c78b8ef34263e8e","src/scaffolding/templates/scaffolding_template.rs":"0a7cb45b7af08c61da699ab77c6dee9d4095bd37da938ef2e0b48962af524d17"},"package":"4ed0150801958d4825da56a41c71f000a457ac3a4613fa9647df78ac4b6b6881"}
\ No newline at end of file
diff --git a/third_party/rust/uniffi_bindgen/.cargo_vcs_info.json b/third_party/rust/uniffi_bindgen/.cargo_vcs_info.json
index ffee3246e1222..5fd9a92673259 100644
--- a/third_party/rust/uniffi_bindgen/.cargo_vcs_info.json
+++ b/third_party/rust/uniffi_bindgen/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "0eda2855d5b4be435013d5baef808d5f9caee0fd"
+    "sha1": "309762f55db3f0548194a9ceba3027fa64b18a93"
   },
   "path_in_vcs": "uniffi_bindgen"
 }
\ No newline at end of file
diff --git a/third_party/rust/uniffi_bindgen/Cargo.lock b/third_party/rust/uniffi_bindgen/Cargo.lock
index 182eb091a18a4..efa78c567beac 100644
--- a/third_party/rust/uniffi_bindgen/Cargo.lock
+++ b/third_party/rust/uniffi_bindgen/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "askama"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a4e46abb203e00ef226442d452769233142bbfdd79c3941e84c8e61c4112543"
+checksum = "f75363874b771be265f4ffe307ca705ef6f3baa19011c149da8674a87f1b75c4"
 dependencies = [
  "askama_derive",
  "itoa",
@@ -23,9 +23,9 @@ dependencies = [
 
 [[package]]
 name = "askama_derive"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54398906821fd32c728135f7b351f0c7494ab95ae421d41b6f5a020e158f28a6"
+checksum = "129397200fe83088e8a68407a8e2b1f826cf0086b21ccdb866a722c8bcd3a94f"
 dependencies = [
  "askama_parser",
  "basic-toml",
@@ -40,9 +40,9 @@ dependencies = [
 
 [[package]]
 name = "askama_parser"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf315ce6524c857bb129ff794935cf6d42c82a6cff60526fe2a63593de4d0d4f"
+checksum = "d6ab5630b3d5eaf232620167977f95eb51f3432fc76852328774afbd242d4358"
 dependencies = [
  "memchr",
  "serde",
@@ -122,7 +122,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -174,6 +174,7 @@ checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
  "hashbrown",
+ "serde",
 ]
 
 [[package]]
@@ -224,9 +225,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "percent-encoding"
@@ -283,7 +284,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -353,11 +354,20 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "siphasher"
-version = "0.3.11"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "smawk"
@@ -420,13 +430,45 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.11"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
 dependencies = [
  "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
 ]
 
+[[package]]
+name = "toml_datetime"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_write",
+ "winnow",
+]
+
+[[package]]
+name = "toml_write"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.12"
@@ -435,7 +477,7 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "uniffi_bindgen"
-version = "0.29.3"
+version = "0.31.0"
 dependencies = [
  "anyhow",
  "askama",
@@ -460,9 +502,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_internal_macros"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f64bec2f3a33f2f08df8150e67fa45ba59a2ca740bf20c1beb010d4d791f9a1b"
+checksum = "98f51ebca0d9a4b2aa6c644d5ede45c56f73906b96403c08a1985e75ccb64a01"
 dependencies = [
  "anyhow",
  "indexmap",
@@ -473,9 +515,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_meta"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d226fc167754ce548c5ece9828c8a06f03bf1eea525d2659ba6bd648bd8e2f3"
+checksum = "9df6d413db2827c68588f8149d30d49b71d540d46539e435b23a7f7dbd4d4f86"
 dependencies = [
  "anyhow",
  "siphasher",
@@ -485,9 +527,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_pipeline"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b925b6421df15cf4bedee27714022cd9626fb4d7eee0923522a608b274ba4371"
+checksum = "a806dddc8208f22efd7e95a5cdf88ed43d0f3271e8f63b47e757a8bbdb43b63a"
 dependencies = [
  "anyhow",
  "heck",
@@ -498,9 +540,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_testing"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a8386f86b6f986bc01d6cdaec395980b9125ae493634ddbdc9feef5f50d80af"
+checksum = "4802bed208a296657eef3451a961a6502e1d7aa8930b4b0cd952ed4f81a3957e"
 dependencies = [
  "anyhow",
  "camino",
@@ -511,9 +553,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_udl"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c42649b721df759d9d4692a376b82b62ce3028ec9fc466f4780fb8cdf728996"
+checksum = "0d1a7339539bf6f6fa3e9b534dece13f778bda2d54b1a6d4e40b4d6090ac26e7"
 dependencies = [
  "anyhow",
  "textwrap",
@@ -541,9 +583,9 @@ dependencies = [
 
 [[package]]
 name = "windows-sys"
-version = "0.52.0"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
  "windows-targets 0.52.6",
 ]
@@ -671,9 +713,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.7.4"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
 dependencies = [
  "memchr",
 ]
diff --git a/third_party/rust/uniffi_bindgen/Cargo.toml b/third_party/rust/uniffi_bindgen/Cargo.toml
index e64a6b38c1b76..ae8676276b02b 100644
--- a/third_party/rust/uniffi_bindgen/Cargo.toml
+++ b/third_party/rust/uniffi_bindgen/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2021"
 name = "uniffi_bindgen"
-version = "0.29.3"
+version = "0.31.0"
 build = false
 autolib = false
 autobins = false
@@ -50,7 +50,7 @@ path = "src/lib.rs"
 version = "1"
 
 [dependencies.askama]
-version = "0.13.0"
+version = "0.14"
 features = [
     "config",
     "derive",
@@ -79,6 +79,7 @@ version = "0.5"
 
 [dependencies.indexmap]
 version = "2.2"
+features = ["serde"]
 
 [dependencies.once_cell]
 version = "1.12"
@@ -96,20 +97,20 @@ features = ["smawk"]
 default-features = false
 
 [dependencies.toml]
-version = "0.5"
+version = ">=0.8, <=0.9"
 
 [dependencies.uniffi_internal_macros]
-version = "=0.29.3"
+version = "=0.31.0"
 
 [dependencies.uniffi_meta]
-version = "=0.29.3"
+version = "=0.31.0"
 
 [dependencies.uniffi_pipeline]
-version = "=0.29.3"
+version = "=0.31.0"
 
 [dependencies.uniffi_testing]
-version = "=0.29.3"
+version = "=0.31.0"
 optional = true
 
 [dependencies.uniffi_udl]
-version = "=0.29.3"
+version = "=0.31.0"
diff --git a/third_party/rust/uniffi_bindgen/Cargo.toml.orig b/third_party/rust/uniffi_bindgen/Cargo.toml.orig
index 06451fb5342ed..d163b37332e93 100644
--- a/third_party/rust/uniffi_bindgen/Cargo.toml.orig
+++ b/third_party/rust/uniffi_bindgen/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "uniffi_bindgen"
-version = "0.29.3"
+version = "0.31.0"
 description = "a multi-language bindings generator for rust (codegen and cli tooling)"
 documentation = "https://mozilla.github.io/uniffi-rs"
 homepage = "https://mozilla.github.io/uniffi-rs"
@@ -18,23 +18,23 @@ ffi-trace = ["uniffi_testing?/ffi-trace"]
 
 [dependencies]
 anyhow = "1"
-askama = { version = "0.13.0", default-features = false, features = ["config", "derive", "alloc"] }
+askama = { version = "0.14", default-features = false, features = ["config", "derive", "alloc"] }
 camino = "1.0.8"
 cargo_metadata = { version = "0.19", optional = true }
 fs-err = "2.7.0"
 glob = "0.3"
 goblin = "0.8"
 heck = "0.5"
-indexmap = { version = "2.2" }
+indexmap = { version = "2.2", features = ["serde"] }
 once_cell = "1.12"
 serde = { version = "1", features = ["derive"] }
 tempfile = "3"
-toml = "0.5"
-uniffi_internal_macros = { path = "../uniffi_internal_macros", version = "=0.29.3" }
-uniffi_pipeline = { path = "../uniffi_pipeline", version = "=0.29.3" }
-uniffi_meta = { path = "../uniffi_meta", version = "=0.29.3" }
-uniffi_testing = { path = "../uniffi_testing", version = "=0.29.3", optional = true }
-uniffi_udl = { path = "../uniffi_udl", version = "=0.29.3" }
+toml = ">=0.8, <=0.9"
+uniffi_internal_macros = { path = "../uniffi_internal_macros", version = "=0.31.0" }
+uniffi_pipeline = { path = "../uniffi_pipeline", version = "=0.31.0" }
+uniffi_meta = { path = "../uniffi_meta", version = "=0.31.0" }
+uniffi_testing = { path = "../uniffi_testing", version = "=0.31.0", optional = true }
+uniffi_udl = { path = "../uniffi_udl", version = "=0.31.0" }
 # Don't include the `unicode-linebreak` or `unicode-width` since that functionality isn't needed for
 # docstrings.
 textwrap = { version = "0.16", features=["smawk"], default-features = false }
diff --git a/third_party/rust/uniffi_bindgen/README.md b/third_party/rust/uniffi_bindgen/README.md
index 8ac2fa34bfd33..4450243be81aa 100644
--- a/third_party/rust/uniffi_bindgen/README.md
+++ b/third_party/rust/uniffi_bindgen/README.md
@@ -50,12 +50,13 @@ Other tools we know of which try and solve a similarly shaped problem are:
 
 ## Third-party foreign language bindings
 
-* [React Native bindings](https://github.com/jhugman/uniffi-bindgen-react-native). The repository contains tooling to generate bindings for [Hermes](https://github.com/facebook/hermes) and for [creating Turbo Modules](https://reactnative.dev/blog/2024/10/23/the-new-architecture-is-here#new-native-modules).
+* [Javascript bindings](https://github.com/jhugman/uniffi-bindgen-react-native): running in a web page, targeting WASM; and React Native targeting Android, iOS. The repository contains tooling to generate bindings for [Hermes](https://github.com/facebook/hermes), [creating Turbo Modules](https://reactnative.dev/blog/2024/10/23/the-new-architecture-is-here#new-native-modules), and for creating a [`wasm-bindgen` bindings crate](https://rustwasm.github.io/wasm-bindgen).
 * [Kotlin Multiplatform support (Gobley)](https://github.com/gobley/gobley). The repository contains Kotlin Multiplatform bindings generation for UniFFI, letting you target both JVM and Native.
 * [Go bindings](https://github.com/NordSecurity/uniffi-bindgen-go)
 * [C# bindings](https://github.com/NordSecurity/uniffi-bindgen-cs)
 * [Dart bindings](https://github.com/NiallBunting/uniffi-rs-dart)
 * [Java bindings](https://github.com/IronCoreLabs/uniffi-bindgen-java)
+* [Node bindings](https://github.com/livekit/uniffi-bindgen-node) (early development)
 
 ### External resources
 
diff --git a/third_party/rust/uniffi_bindgen/src/backend/filters.rs b/third_party/rust/uniffi_bindgen/src/backend/filters.rs
deleted file mode 100644
index 66546f7dfa7db..0000000000000
--- a/third_party/rust/uniffi_bindgen/src/backend/filters.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-//! Backend-agnostic askama filters
-
-use crate::interface::{AsType, FfiType};
-use std::fmt;
-
-// convert `anyhow::Error` and `&str` etc to askama errors.
-// should only be needed by "filters", otherwise anyhow etc work directly.
-pub fn to_askama_error<T: ToString + ?Sized>(t: &T) -> askama::Error {
-    askama::Error::Custom(Box::new(FilterError(t.to_string())))
-}
-
-// Need a struct to define an error that implements std::error::Error, which neither String nor
-// anyhow::Error do.
-#[derive(Debug)]
-struct FilterError(String);
-
-impl fmt::Display for FilterError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl std::error::Error for FilterError {}
-
-/// Get the FfiType for a Type
-pub fn ffi_type(type_: &impl AsType) -> askama::Result<FfiType, askama::Error> {
-    Ok(type_.as_type().into())
-}
diff --git a/third_party/rust/uniffi_bindgen/src/bindgen_paths.rs b/third_party/rust/uniffi_bindgen/src/bindgen_paths.rs
new file mode 100644
index 0000000000000..40b27f45938f8
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/bindgen_paths.rs
@@ -0,0 +1,109 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use std::fs;
+
+use anyhow::{bail, Context};
+use camino::Utf8PathBuf;
+
+use crate::Result;
+
+/// Responsible for looking up UDL and config paths
+///
+/// This uses a layered approach supporting multiple ways to find the paths.
+/// The first added layer takes precedence.
+#[derive(Default)]
+pub struct BindgenPaths {
+    layers: Vec<Box<dyn BindgenPathsLayer>>,
+}
+
+impl BindgenPaths {
+    #[cfg(feature = "cargo-metadata")]
+    /// Add a layer that finds paths using `cargo metadata`
+    ///
+    /// Requires the `cargo-metadata` feature.
+    pub fn add_cargo_metadata_layer(&mut self, no_deps: bool) -> Result<()> {
+        self.add_layer(
+            crate::cargo_metadata::CrateConfigSupplier::from_cargo_metadata_command(no_deps)?,
+        );
+        Ok(())
+    }
+
+    /// Add a layer that always uses the same path for config files
+    ///
+    /// Used to implement the `--config` CLI flag.
+    pub fn add_config_override_layer(&mut self, path: Utf8PathBuf) {
+        self.add_layer(ConfigOverrideLayer { path })
+    }
+
+    /// Add a layer using a [BindgenPathsLayer]
+    ///
+    /// This can be used to add custom path finding logic.
+    pub fn add_layer(&mut self, layer: impl BindgenPathsLayer + 'static) {
+        self.layers.push(Box::new(layer));
+    }
+
+    /// Get the config table for a crate
+    pub fn get_config(&self, crate_name: &str) -> Result<toml::value::Table> {
+        for layer in &self.layers {
+            if let Some(table) = layer.get_config(crate_name)? {
+                return Ok(table);
+            }
+        }
+        Ok(toml::value::Table::default())
+    }
+
+    /// Get the UDL path for a crate
+    pub fn get_udl_path(&self, crate_name: &str, udl_name: &str) -> Option<Utf8PathBuf> {
+        self.layers
+            .iter()
+            .find_map(|l| l.get_udl_path(crate_name, udl_name))
+    }
+
+    /// Get the UDL source for a crate
+    pub fn get_udl(&self, crate_name: &str, udl_name: &str) -> Result<String> {
+        match self.get_udl_path(crate_name, udl_name) {
+            Some(path) => Ok(fs::read_to_string(path)?),
+            None => bail!("UDL file {udl_name:?} not found for crate {crate_name:?}"),
+        }
+    }
+}
+
+/// Trait for finding UDL and config paths
+pub trait BindgenPathsLayer {
+    /// Lookup and load the config TOML for a crate.
+    ///
+    /// This is usually loaded from `[crate-root]/uniffi.toml`. However, layers are
+    /// free to obtain the TOML table for a crate however they want. For example:
+    /// * There could be a shared TOML file for all crates and this method could
+    ///   return one of the child table values for the specified crate.
+    /// * The TOML could be hard-coded into source code and not loaded from a file at all.
+    /// * etc.
+    fn get_config(&self, _crate_name: &str) -> Result<Option<toml::value::Table>> {
+        Ok(None)
+    }
+
+    /// Lookup the a UDL file path.
+    ///
+    /// This is usually the `[crate-root]/src/[udl_name].udl`
+    fn get_udl_path(&self, _crate_name: &str, _udl_name: &str) -> Option<Utf8PathBuf> {
+        None
+    }
+}
+
+struct ConfigOverrideLayer {
+    path: Utf8PathBuf,
+}
+
+impl BindgenPathsLayer for ConfigOverrideLayer {
+    fn get_config(&self, _crate_name: &str) -> Result<Option<toml::value::Table>> {
+        // ConfigOverrideLayer is used when an expected config override is expected to exist
+        // (eg, --config args), so the file not existing should be an error.
+        let contents = fs::read_to_string(&self.path)
+            .with_context(|| format!("read file: {:?}", self.path))?;
+        let toml = toml::de::from_str(&contents)
+            .with_context(|| format!("parse toml: {:?}", self.path))?;
+        Ok(Some(toml))
+    }
+}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/gen_kotlin/compounds.rs b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/gen_kotlin/compounds.rs
index 354f565b49e79..227fd5ed02c71 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/gen_kotlin/compounds.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/gen_kotlin/compounds.rs
@@ -4,8 +4,9 @@
 
 use super::{AsCodeType, CodeType};
 use crate::{
-    backend::{Literal, Type},
-    bail, ComponentInterface, Result,
+    bail,
+    interface::{DefaultValue, Literal, Type},
+    ComponentInterface, Result,
 };
 
 #[derive(Debug)]
@@ -37,11 +38,13 @@ impl CodeType for OptionalCodeType {
         )
     }
 
-    fn literal(&self, literal: &Literal, ci: &ComponentInterface) -> Result<String> {
-        match literal {
-            Literal::None => Ok("null".into()),
-            Literal::Some { inner } => super::KotlinCodeOracle.find(&self.inner).literal(inner, ci),
-            _ => bail!("Invalid literal for Optional type: {literal:?}"),
+    fn default(&self, default: &DefaultValue, ci: &ComponentInterface) -> Result<String> {
+        match default {
+            DefaultValue::Default | DefaultValue::Literal(Literal::None) => Ok("null".into()),
+            DefaultValue::Literal(Literal::Some { inner }) => {
+                super::KotlinCodeOracle.find(&self.inner).default(inner, ci)
+            }
+            _ => bail!("Invalid literal for Optional type: {default:?}"),
         }
     }
 }
@@ -75,10 +78,12 @@ impl CodeType for SequenceCodeType {
         )
     }
 
-    fn literal(&self, literal: &Literal, _ci: &ComponentInterface) -> Result<String> {
-        match literal {
-            Literal::EmptySequence => Ok("listOf()".into()),
-            _ => bail!("Invalid literal for List type: {literal:?}"),
+    fn default(&self, default: &DefaultValue, _ci: &ComponentInterface) -> Result<String> {
+        match default {
+            DefaultValue::Default | DefaultValue::Literal(Literal::EmptySequence) => {
+                Ok("listOf()".into())
+            }
+            _ => bail!("Invalid literal for List type: {default:?}"),
         }
     }
 }
@@ -120,10 +125,12 @@ impl CodeType for MapCodeType {
         )
     }
 
-    fn literal(&self, literal: &Literal, _ci: &ComponentInterface) -> Result<String> {
-        match literal {
-            Literal::EmptyMap => Ok("mapOf()".into()),
-            _ => bail!("Invalid literal for Map type: {literal:?}"),
+    fn default(&self, default: &DefaultValue, _ci: &ComponentInterface) -> Result<String> {
+        match default {
+            DefaultValue::Default | DefaultValue::Literal(Literal::EmptyMap) => {
+                Ok("mapOf()".into())
+            }
+            _ => bail!("Invalid literal for Map type: {default:?}"),
         }
     }
 }
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/gen_kotlin/custom.rs b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/gen_kotlin/custom.rs
index f1b67e79ae169..add9a1e897b0f 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/gen_kotlin/custom.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/gen_kotlin/custom.rs
@@ -3,16 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use super::CodeType;
-use crate::ComponentInterface;
+use crate::{interface::DefaultValue, ComponentInterface};
 
 #[derive(Debug)]
 pub struct CustomCodeType {
     name: String,
+    builtin: Box<dyn CodeType>,
 }
 
 impl CustomCodeType {
-    pub fn new(name: String) -> Self {
-        CustomCodeType { name }
+    pub fn new(name: String, builtin: Box<dyn CodeType>) -> Self {
+        CustomCodeType { name, builtin }
     }
 }
 
@@ -24,4 +25,10 @@ impl CodeType for CustomCodeType {
     fn canonical_name(&self) -> String {
         format!("Type{}", self.name)
     }
+
+    fn default(&self, default: &DefaultValue, ci: &ComponentInterface) -> anyhow::Result<String> {
+        self.builtin
+            .default(default, ci)
+            .map_err(|_e| anyhow::anyhow!("Unsupported default value for {}", self.type_label(ci)))
+    }
 }
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/gen_kotlin/enum_.rs b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/gen_kotlin/enum_.rs
index 34cc3a5a36d3c..c9fe055833e15 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/gen_kotlin/enum_.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/gen_kotlin/enum_.rs
@@ -3,7 +3,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use super::CodeType;
-use crate::{backend::Literal, bail, ComponentInterface, Result};
+use crate::{
+    bail,
+    interface::{DefaultValue, Literal},
+    ComponentInterface, Result,
+};
 
 #[derive(Debug)]
 pub struct EnumCodeType {
@@ -25,15 +29,15 @@ impl CodeType for EnumCodeType {
         format!("Type{}", self.id)
     }
 
-    fn literal(&self, literal: &Literal, ci: &ComponentInterface) -> Result<String> {
-        if let Literal::Enum(v, _) = literal {
+    fn default(&self, default: &DefaultValue, ci: &ComponentInterface) -> Result<String> {
+        if let DefaultValue::Literal(Literal::Enum(v, _)) = default {
             Ok(format!(
                 "{}.{}",
                 self.type_label(ci),
                 super::KotlinCodeOracle.enum_variant_name(v)
             ))
         } else {
-            bail!("Invalid literal for enum type: {literal:?}")
+            bail!("Invalid literal for enum type: {default:?}")
         }
     }
 }
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/gen_kotlin/mod.rs b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/gen_kotlin/mod.rs
index f4d7d30b7e441..cf4d9d15e5165 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/gen_kotlin/mod.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/gen_kotlin/mod.rs
@@ -4,14 +4,17 @@
 
 use std::borrow::Borrow;
 use std::cell::RefCell;
-use std::collections::{BTreeSet, HashMap, HashSet};
+use std::collections::{BTreeSet, HashMap};
 use std::fmt::Debug;
 
 use askama::Template;
 use heck::{ToLowerCamelCase, ToShoutySnakeCase, ToUpperCamelCase};
 use serde::{Deserialize, Serialize};
 
-use crate::{anyhow, bail, interface::ffi::ExternalFfiMetadata, interface::*, Context, Result};
+use crate::{
+    anyhow, bail, interface::ffi::ExternalFfiMetadata, interface::*, to_askama_error, Context,
+    Result,
+};
 
 mod callback_interface;
 mod compounds;
@@ -35,8 +38,12 @@ trait CodeType: Debug {
     /// with this type only.
     fn canonical_name(&self) -> String;
 
-    fn literal(&self, _literal: &Literal, ci: &ComponentInterface) -> Result<String> {
-        unimplemented!("Unimplemented for {}", self.type_label(ci))
+    // default for named types is to assume a ctor exists.
+    fn default(&self, default: &DefaultValue, ci: &ComponentInterface) -> Result<String> {
+        match default {
+            DefaultValue::Default => Ok(format!("{}()", self.type_label(ci))),
+            DefaultValue::Literal(_) => bail!("Literals for named types are not supported"),
+        }
     }
 
     /// Name of the FfiConverter
@@ -77,6 +84,8 @@ pub struct Config {
     kotlin_target_version: Option<String>,
     #[serde(default)]
     disable_java_cleaner: bool,
+    #[serde(default)]
+    pub(super) rename: toml::Table,
 }
 
 impl Config {
@@ -202,12 +211,33 @@ impl Config {
 
 // Generate kotlin bindings for the given ComponentInterface, as a string.
 pub fn generate_bindings(config: &Config, ci: &ComponentInterface) -> Result<String> {
+    ensure_flat_enum_trait_methods_supported(ci)?;
     KotlinWrapper::new(config.clone(), ci)
         .context("failed to create a binding generator")?
         .render()
         .context("failed to render kotlin bindings")
 }
 
+fn ensure_flat_enum_trait_methods_supported(ci: &ComponentInterface) -> Result<()> {
+    for enum_def in ci.enum_definitions() {
+        if ci.is_name_used_as_error(enum_def.name()) || !enum_def.is_flat() {
+            continue;
+        }
+
+        let trait_methods = enum_def.uniffi_trait_methods();
+        if trait_methods.eq_eq.is_some()
+            || trait_methods.hash_hash.is_some()
+            || trait_methods.ord_cmp.is_some()
+        {
+            anyhow::bail!(
+                "Kotlin bindings do not support exporting Eq/Ord/Hash for flat enum `{}`",
+                enum_def.name()
+            );
+        }
+    }
+    Ok(())
+}
+
 /// A struct to record a Kotlin import statement.
 #[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
 pub enum ImportRequirement {
@@ -312,7 +342,7 @@ impl<'a> KotlinWrapper<'a> {
             .iter_local_types()
             .map(|t| KotlinCodeOracle.find(t))
             .filter_map(|ct| ct.initialization_fn())
-            .map(|fn_name| format!("{fn_name}(lib)"));
+            .map(|fn_name| format!("{fn_name}(this)"));
 
         // Also call global initialization function for any external type we use.
         // For example, we need to make sure that all callback interface vtables are registered
@@ -320,15 +350,16 @@ impl<'a> KotlinWrapper<'a> {
         let extern_module_init_fns = self
             .ci
             .iter_external_types()
-            .filter_map(|ty| ty.module_path())
-            .map(|module_path| {
-                let namespace = ci.namespace_for_module_path(module_path).unwrap();
+            .filter_map(|ty| ty.crate_name())
+            .map(|crate_name| {
+                let namespace = ci.namespace_for_module_path(crate_name).unwrap();
                 let package_name = self
                     .config
-                    .external_package_name(module_path, Some(namespace));
+                    .external_package_name(crate_name, Some(namespace));
                 format!("{package_name}.uniffiEnsureInitialized()")
             })
-            .collect::<HashSet<_>>();
+            // Collect into a btree set to de-dup and order
+            .collect::<BTreeSet<_>>();
 
         init_fns.chain(extern_module_init_fns).collect()
     }
@@ -359,17 +390,28 @@ fn object_interface_name(ci: &ComponentInterface, obj: &Object) -> String {
 
 // *sigh* - same thing for a trait, which might be either Object or CallbackInterface.
 // (we should either fold it into object or kill it!)
-fn trait_interface_name(ci: &ComponentInterface, name: &str) -> Result<String> {
-    let (obj_name, has_callback_interface) = match ci.get_object_definition(name) {
-        Some(obj) => (obj.name(), obj.has_callback_interface()),
-        None => (
-            ci.get_callback_interface_definition(name)
-                .ok_or_else(|| anyhow!("no interface {}", name))?
-                .name(),
-            true,
-        ),
+fn trait_interface_name(ci: &ComponentInterface, trait_ty: &Type) -> Result<String> {
+    let Some(crate_name) = trait_ty.crate_name() else {
+        bail!("Invalid trait_type: {trait_ty:?}");
     };
-    let class_name = KotlinCodeOracle.class_name(ci, obj_name);
+    let Some(ci_look) = ci.find_component_interface(crate_name) else {
+        anyhow::bail!("no interface with crate_name: {}", crate_name);
+    };
+
+    let (obj_name, has_callback_interface) = match trait_ty {
+        Type::Object { name, .. } => {
+            let Some(obj) = ci_look.get_object_definition(name) else {
+                bail!("trait interface not found: {}", name);
+            };
+            (name, obj.has_callback_interface())
+        }
+        Type::CallbackInterface { name, .. } => (name, true),
+        _ => {
+            bail!("Invalid trait_type: {trait_ty:?}")
+        }
+    };
+
+    let class_name = KotlinCodeOracle.class_name(ci_look, obj_name);
     if has_callback_interface {
         Ok(class_name)
     } else {
@@ -399,9 +441,11 @@ impl KotlinCodeOracle {
     fn class_name(&self, ci: &ComponentInterface, nm: &str) -> String {
         let name = nm.to_string().to_upper_camel_case();
         // fixup errors.
-        ci.is_name_used_as_error(nm)
-            .then(|| self.convert_error_suffix(&name))
-            .unwrap_or(name)
+        if ci.is_name_used_as_error(nm) {
+            self.convert_error_suffix(&name)
+        } else {
+            name
+        }
     }
 
     fn convert_error_suffix(&self, nm: &str) -> String {
@@ -475,7 +519,7 @@ impl KotlinCodeOracle {
             FfiType::UInt64 | FfiType::Int64 => "0.toLong()".to_owned(),
             FfiType::Float32 => "0.0f".to_owned(),
             FfiType::Float64 => "0.0".to_owned(),
-            FfiType::RustArcPtr(_) => "Pointer.NULL".to_owned(),
+            FfiType::Handle => "0.toLong()".to_owned(),
             FfiType::RustBuffer(_) => "RustBuffer.ByValue()".to_owned(),
             FfiType::Callback(_) => "null".to_owned(),
             FfiType::RustCallStatus => "UniffiRustCallStatus.ByValue()".to_owned(),
@@ -494,8 +538,8 @@ impl KotlinCodeOracle {
             | FfiType::Int64
             | FfiType::UInt64
             | FfiType::Float32
-            | FfiType::Float64 => format!("{}ByReference", self.ffi_type_label(ffi_type, ci)),
-            FfiType::RustArcPtr(_) => "PointerByReference".to_owned(),
+            | FfiType::Float64
+            | FfiType::Handle => format!("{}ByReference", self.ffi_type_label(ffi_type, ci)),
             // JNA structs default to ByReference
             FfiType::RustBuffer(_) | FfiType::Struct(_) => self.ffi_type_label(ffi_type, ci),
             _ => panic!("{ffi_type:?} by reference is not implemented"),
@@ -514,9 +558,8 @@ impl KotlinCodeOracle {
             FfiType::Float32 => "Float".to_string(),
             FfiType::Float64 => "Double".to_string(),
             FfiType::Handle => "Long".to_string(),
-            FfiType::RustArcPtr(_) => "Pointer".to_string(),
             FfiType::RustBuffer(maybe_external) => match maybe_external {
-                Some(external_meta) if external_meta.module_path != ci.crate_name() => {
+                Some(external_meta) if external_meta.crate_name() != ci.crate_name() => {
                     format!("RustBuffer{}", external_meta.name)
                 }
                 _ => "RustBuffer".to_string(),
@@ -580,77 +623,162 @@ impl<T: AsType> AsCodeType for T {
                 key_type,
                 value_type,
             } => Box::new(compounds::MapCodeType::new(*key_type, *value_type)),
-            Type::Custom { name, .. } => Box::new(custom::CustomCodeType::new(name)),
+            Type::Custom { name, builtin, .. } => {
+                Box::new(custom::CustomCodeType::new(name, builtin.as_codetype()))
+            }
         }
     }
 }
 
-// A work around for #2392 - we can't handle functions with external errors.
-fn can_render_callable(callable: &dyn Callable, ci: &ComponentInterface) -> bool {
-    // can't handle external errors.
-    callable
-        .throws_type()
-        .map(|t| !ci.is_external(t))
-        .unwrap_or(true)
-}
-
 mod filters {
     use super::*;
-    pub use crate::backend::filters::*;
     use uniffi_meta::LiteralMetadata;
 
     pub(super) fn type_name(
         as_ct: &impl AsCodeType,
+        _: &dyn askama::Values,
         ci: &ComponentInterface,
     ) -> Result<String, askama::Error> {
         Ok(as_ct.as_codetype().type_label(ci))
     }
 
-    pub(super) fn canonical_name(as_ct: &impl AsCodeType) -> Result<String, askama::Error> {
+    pub(super) fn canonical_name(
+        as_ct: &impl AsCodeType,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         Ok(as_ct.as_codetype().canonical_name())
     }
 
-    pub(super) fn ffi_converter_name(as_ct: &impl AsCodeType) -> Result<String, askama::Error> {
+    pub(super) fn qualified_type_name<T>(
+        as_type: &T,
+        _: &dyn askama::Values,
+        ci: &ComponentInterface,
+        config: &Config,
+    ) -> Result<String, askama::Error>
+    where
+        T: AsCodeType + AsType,
+    {
+        fully_qualified_type_label(&as_type.as_type(), ci, config)
+            .map_err(|err| to_askama_error(&err))
+    }
+
+    pub(super) fn ffi_converter_name(
+        as_ct: &impl AsCodeType,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         Ok(as_ct.as_codetype().ffi_converter_name())
     }
 
-    pub(super) fn lower_fn(as_ct: &impl AsCodeType) -> Result<String, askama::Error> {
+    pub(super) fn ffi_type(
+        type_: &impl AsType,
+        _: &dyn askama::Values,
+    ) -> askama::Result<FfiType, askama::Error> {
+        Ok(type_.as_type().into())
+    }
+
+    pub(super) fn lower_fn(
+        as_ct: &impl AsCodeType,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         Ok(format!(
             "{}.lower",
             as_ct.as_codetype().ffi_converter_name()
         ))
     }
 
-    pub(super) fn allocation_size_fn(as_ct: &impl AsCodeType) -> Result<String, askama::Error> {
+    pub(super) fn allocation_size_fn(
+        as_ct: &impl AsCodeType,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         Ok(format!(
             "{}.allocationSize",
             as_ct.as_codetype().ffi_converter_name()
         ))
     }
 
-    pub(super) fn write_fn(as_ct: &impl AsCodeType) -> Result<String, askama::Error> {
+    pub(super) fn write_fn(
+        as_ct: &impl AsCodeType,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         Ok(format!(
             "{}.write",
             as_ct.as_codetype().ffi_converter_name()
         ))
     }
 
-    pub(super) fn lift_fn(as_ct: &impl AsCodeType) -> Result<String, askama::Error> {
+    pub(super) fn lift_fn(
+        as_ct: &impl AsCodeType,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         Ok(format!("{}.lift", as_ct.as_codetype().ffi_converter_name()))
     }
 
-    pub(super) fn read_fn(as_ct: &impl AsCodeType) -> Result<String, askama::Error> {
+    pub(super) fn read_fn(
+        as_ct: &impl AsCodeType,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         Ok(format!("{}.read", as_ct.as_codetype().ffi_converter_name()))
     }
 
-    pub fn render_literal(
-        literal: &Literal,
+    fn fully_qualified_type_label(
+        ty: &Type,
+        ci: &ComponentInterface,
+        config: &Config,
+    ) -> Result<String> {
+        match ty {
+            Type::Optional { inner_type } => Ok(format!(
+                "{}?",
+                fully_qualified_type_label(inner_type, ci, config)?
+            )),
+            Type::Sequence { inner_type } => Ok(format!(
+                "List<{}>",
+                fully_qualified_type_label(inner_type, ci, config)?
+            )),
+            Type::Map {
+                key_type,
+                value_type,
+            } => Ok(format!(
+                "Map<{}, {}>",
+                fully_qualified_type_label(key_type, ci, config)?,
+                fully_qualified_type_label(value_type, ci, config)?
+            )),
+            Type::Enum { .. }
+            | Type::Record { .. }
+            | Type::Object { .. }
+            | Type::CallbackInterface { .. }
+            | Type::Custom { .. } => {
+                let class_name = ty
+                    .name()
+                    .map(|nm| KotlinCodeOracle.class_name(ci, nm))
+                    .ok_or_else(|| anyhow::anyhow!("type {:?} has no name", ty))?;
+                let package_name = package_for_type(ty, ci, config)?;
+                Ok(format!("{package_name}.{class_name}"))
+            }
+            _ => Ok(KotlinCodeOracle.find(ty).type_label(ci)),
+        }
+    }
+
+    fn package_for_type(ty: &Type, ci: &ComponentInterface, config: &Config) -> Result<String> {
+        if ci.is_external(ty) {
+            let module_path = ty
+                .module_path()
+                .ok_or_else(|| anyhow::anyhow!("external type {:?} missing module path", ty))?;
+            let namespace = ci.namespace_for_module_path(module_path)?;
+            Ok(config.external_package_name(module_path, Some(namespace)))
+        } else {
+            Ok(config.package_name())
+        }
+    }
+
+    pub fn render_default(
+        default: &DefaultValue,
+        _: &dyn askama::Values,
         as_ct: &impl AsType,
         ci: &ComponentInterface,
     ) -> Result<String, askama::Error> {
         as_ct
             .as_codetype()
-            .literal(literal, ci)
+            .default(default, ci)
             .map_err(|e| to_askama_error(&e))
     }
 
@@ -660,27 +788,38 @@ mod filters {
             match t {
                 Type::Int8 | Type::Int16 | Type::Int32 | Type::Int64 => Ok(base10),
                 Type::UInt8 | Type::UInt16 | Type::UInt32 | Type::UInt64 => Ok(base10 + "u"),
-                _ => Err(to_askama_error("Only ints are supported.")),
+                _ => Err(to_askama_error(&format!(
+                    "Only ints are supported for enum literals: {t:?}"
+                ))),
             }
         } else {
-            Err(to_askama_error("Enum hasn't defined a repr"))
+            Err(to_askama_error(&format!(
+                "Enum hasn't defined a repr: {t:?}"
+            )))
         }
     }
 
     // Get the idiomatic Kotlin rendering of an individual enum variant's discriminant
-    pub fn variant_discr_literal(e: &Enum, index: &usize) -> Result<String, askama::Error> {
+    pub fn variant_discr_literal(
+        e: &Enum,
+        _: &dyn askama::Values,
+        index: &usize,
+    ) -> Result<String, askama::Error> {
         let literal = e.variant_discr(*index).expect("invalid index");
         match literal {
             // Kotlin doesn't convert between signed and unsigned by default
             // so we'll need to make sure we define the type as appropriately
             LiteralMetadata::UInt(v, _, _) => int_literal(e.variant_discr_type(), v.to_string()),
             LiteralMetadata::Int(v, _, _) => int_literal(e.variant_discr_type(), v.to_string()),
-            _ => Err(to_askama_error("Only ints are supported.")),
+            _ => Err(to_askama_error(&format!(
+                "Only ints are supported: {literal:?}"
+            ))),
         }
     }
 
     pub fn ffi_type_name_by_value(
         type_: &FfiType,
+        _: &dyn askama::Values,
         ci: &ComponentInterface,
     ) -> Result<String, askama::Error> {
         Ok(KotlinCodeOracle.ffi_type_label_by_value(type_, ci))
@@ -688,74 +827,93 @@ mod filters {
 
     pub fn ffi_type_name_for_ffi_struct(
         type_: &FfiType,
+        _: &dyn askama::Values,
         ci: &ComponentInterface,
     ) -> Result<String, askama::Error> {
         Ok(KotlinCodeOracle.ffi_type_label_for_ffi_struct(type_, ci))
     }
 
-    pub fn ffi_default_value(type_: FfiType) -> Result<String, askama::Error> {
+    pub fn ffi_default_value(
+        type_: FfiType,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         Ok(KotlinCodeOracle.ffi_default_value(&type_))
     }
 
     /// Get the idiomatic Kotlin rendering of a function name.
     pub fn class_name<S: AsRef<str>>(
         nm: S,
+        _: &dyn askama::Values,
         ci: &ComponentInterface,
     ) -> Result<String, askama::Error> {
         Ok(KotlinCodeOracle.class_name(ci, nm.as_ref()))
     }
 
     /// Get the idiomatic Kotlin rendering of a function name.
-    pub fn fn_name<S: AsRef<str>>(nm: S) -> Result<String, askama::Error> {
+    pub fn fn_name<S: AsRef<str>>(nm: S, _: &dyn askama::Values) -> Result<String, askama::Error> {
         Ok(KotlinCodeOracle.fn_name(nm.as_ref()))
     }
 
     /// Get the idiomatic Kotlin rendering of a variable name.
-    pub fn var_name<S: AsRef<str>>(nm: S) -> Result<String, askama::Error> {
+    pub fn var_name<S: AsRef<str>>(nm: S, _: &dyn askama::Values) -> Result<String, askama::Error> {
         Ok(KotlinCodeOracle.var_name(nm.as_ref()))
     }
 
     /// Get the idiomatic Kotlin rendering of a variable name.
-    pub fn var_name_raw<S: AsRef<str>>(nm: S) -> Result<String, askama::Error> {
+    pub fn var_name_raw<S: AsRef<str>>(
+        nm: S,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         Ok(KotlinCodeOracle.var_name_raw(nm.as_ref()))
     }
 
     /// Get a String representing the name used for an individual enum variant.
-    pub fn variant_name(v: &Variant) -> Result<String, askama::Error> {
+    pub fn variant_name(v: &Variant, _: &dyn askama::Values) -> Result<String, askama::Error> {
         Ok(KotlinCodeOracle.enum_variant_name(v.name()))
     }
 
-    pub fn error_variant_name(v: &Variant) -> Result<String, askama::Error> {
+    pub fn error_variant_name(
+        v: &Variant,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         let name = v.name().to_string().to_upper_camel_case();
         Ok(KotlinCodeOracle.convert_error_suffix(&name))
     }
 
     /// Get the idiomatic Kotlin rendering of an FFI callback function name
-    pub fn ffi_callback_name<S: AsRef<str>>(nm: S) -> Result<String, askama::Error> {
+    pub fn ffi_callback_name<S: AsRef<str>>(
+        nm: S,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         Ok(KotlinCodeOracle.ffi_callback_name(nm.as_ref()))
     }
 
     /// Get the idiomatic Kotlin rendering of an FFI struct name
-    pub fn ffi_struct_name<S: AsRef<str>>(nm: S) -> Result<String, askama::Error> {
+    pub fn ffi_struct_name<S: AsRef<str>>(
+        nm: S,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         Ok(KotlinCodeOracle.ffi_struct_name(nm.as_ref()))
     }
 
     pub fn async_poll(
         callable: impl Callable,
+        _: &dyn askama::Values,
         ci: &ComponentInterface,
     ) -> Result<String, askama::Error> {
         let ffi_func = callable.ffi_rust_future_poll(ci);
         Ok(format!(
-            "{{ future, callback, continuation -> UniffiLib.INSTANCE.{ffi_func}(future, callback, continuation) }}"
+            "{{ future, callback, continuation -> UniffiLib.{ffi_func}(future, callback, continuation) }}"
         ))
     }
 
     pub fn async_complete(
         callable: impl Callable,
+        _: &dyn askama::Values,
         ci: &ComponentInterface,
     ) -> Result<String, askama::Error> {
         let ffi_func = callable.ffi_rust_future_complete(ci);
-        let call = format!("UniffiLib.INSTANCE.{ffi_func}(future, continuation)");
+        let call = format!("UniffiLib.{ffi_func}(future, continuation)");
         // May need to convert the RustBuffer from our package to the RustBuffer of the external package
         let call = match callable.return_type() {
             Some(return_type) if ci.is_external(return_type) => {
@@ -775,12 +933,11 @@ mod filters {
 
     pub fn async_free(
         callable: impl Callable,
+        _: &dyn askama::Values,
         ci: &ComponentInterface,
     ) -> Result<String, askama::Error> {
         let ffi_func = callable.ffi_rust_future_free(ci);
-        Ok(format!(
-            "{{ future -> UniffiLib.INSTANCE.{ffi_func}(future) }}"
-        ))
+        Ok(format!("{{ future -> UniffiLib.{ffi_func}(future) }}"))
     }
 
     /// Remove the "`" chars we put around function/variable names
@@ -788,12 +945,16 @@ mod filters {
     /// These are used to avoid name clashes with kotlin identifiers, but sometimes you want to
     /// render the name unquoted.  One example is the message property for errors where we want to
     /// display the name for the user.
-    pub fn unquote<S: AsRef<str>>(nm: S) -> Result<String, askama::Error> {
+    pub fn unquote<S: AsRef<str>>(nm: S, _: &dyn askama::Values) -> Result<String, askama::Error> {
         Ok(nm.as_ref().trim_matches('`').to_string())
     }
 
     /// Get the idiomatic Kotlin rendering of docstring
-    pub fn docstring<S: AsRef<str>>(docstring: S, spaces: &i32) -> Result<String, askama::Error> {
+    pub fn docstring<S: AsRef<str>>(
+        docstring: S,
+        _: &dyn askama::Values,
+        spaces: &i32,
+    ) -> Result<String, askama::Error> {
         let middle = textwrap::indent(&textwrap::dedent(docstring.as_ref()), " * ");
         let wrapped = format!("/**\n{middle}\n */");
 
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/gen_kotlin/primitives.rs b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/gen_kotlin/primitives.rs
index a7cd952f14895..c2aebd4916ee1 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/gen_kotlin/primitives.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/gen_kotlin/primitives.rs
@@ -4,9 +4,8 @@
 
 use super::CodeType;
 use crate::{
-    backend::Literal,
     bail,
-    interface::{ComponentInterface, Radix, Type},
+    interface::{ComponentInterface, DefaultValue, Literal, Radix, Type},
     Result,
 };
 
@@ -56,7 +55,7 @@ fn render_literal(literal: &Literal, _ci: &ComponentInterface) -> Result<String>
 }
 
 macro_rules! impl_code_type_for_primitive {
-    ($T:ident, $class_name:literal) => {
+    ($T:ident, $class_name:literal, $def:literal) => {
         #[derive(Debug)]
         pub struct $T;
 
@@ -69,23 +68,26 @@ macro_rules! impl_code_type_for_primitive {
                 $class_name.into()
             }
 
-            fn literal(&self, literal: &Literal, ci: &ComponentInterface) -> Result<String> {
-                render_literal(&literal, ci)
+            fn default(&self, default: &DefaultValue, ci: &ComponentInterface) -> Result<String> {
+                match default {
+                    DefaultValue::Default => Ok($def.into()),
+                    DefaultValue::Literal(literal) => render_literal(&literal, ci),
+                }
             }
         }
     };
 }
 
-impl_code_type_for_primitive!(BooleanCodeType, "Boolean");
-impl_code_type_for_primitive!(StringCodeType, "String");
-impl_code_type_for_primitive!(BytesCodeType, "ByteArray");
-impl_code_type_for_primitive!(Int8CodeType, "Byte");
-impl_code_type_for_primitive!(Int16CodeType, "Short");
-impl_code_type_for_primitive!(Int32CodeType, "Int");
-impl_code_type_for_primitive!(Int64CodeType, "Long");
-impl_code_type_for_primitive!(UInt8CodeType, "UByte");
-impl_code_type_for_primitive!(UInt16CodeType, "UShort");
-impl_code_type_for_primitive!(UInt32CodeType, "UInt");
-impl_code_type_for_primitive!(UInt64CodeType, "ULong");
-impl_code_type_for_primitive!(Float32CodeType, "Float");
-impl_code_type_for_primitive!(Float64CodeType, "Double");
+impl_code_type_for_primitive!(BooleanCodeType, "Boolean", "false");
+impl_code_type_for_primitive!(StringCodeType, "String", "\"\"");
+impl_code_type_for_primitive!(BytesCodeType, "ByteArray", "byteArrayOf()");
+impl_code_type_for_primitive!(Int8CodeType, "Byte", "0.toByte()");
+impl_code_type_for_primitive!(Int16CodeType, "Short", "0");
+impl_code_type_for_primitive!(Int32CodeType, "Int", "0");
+impl_code_type_for_primitive!(Int64CodeType, "Long", "0L");
+impl_code_type_for_primitive!(UInt8CodeType, "UByte", "0U");
+impl_code_type_for_primitive!(UInt16CodeType, "UShort", "0U");
+impl_code_type_for_primitive!(UInt32CodeType, "UInt", "0U");
+impl_code_type_for_primitive!(UInt64CodeType, "ULong", "0UL");
+impl_code_type_for_primitive!(Float32CodeType, "Float", "0.0f");
+impl_code_type_for_primitive!(Float64CodeType, "Double", "0.0");
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/mod.rs b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/mod.rs
index 9d3ba647cb442..9d8a31186627b 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/mod.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/mod.rs
@@ -2,7 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use crate::{BindingGenerator, Component, GenerationSettings, Result};
+use crate::{
+    bindings::GenerateOptions, interface::rename, BindgenLoader, Component, ComponentInterface,
+    Result,
+};
 use camino::{Utf8Path, Utf8PathBuf};
 use fs_err as fs;
 use std::collections::HashMap;
@@ -13,82 +16,103 @@ use gen_kotlin::{generate_bindings, Config};
 #[cfg(feature = "bindgen-tests")]
 pub mod test;
 
-pub struct KotlinBindingGenerator;
-impl BindingGenerator for KotlinBindingGenerator {
-    type Config = Config;
+/// Generate Kotlin bindings
+pub fn generate(loader: &BindgenLoader, options: GenerateOptions) -> Result<()> {
+    let metadata = loader.load_metadata(&options.source)?;
+    let cis = loader.load_cis(metadata)?;
+    let cdylib = loader.library_name(&options.source).map(|l| l.to_string());
+    let mut components =
+        loader.load_components(cis, |ci, toml| parse_config(ci, toml, cdylib.clone()))?;
+    apply_renames(&mut components);
 
-    fn new_config(&self, root_toml: &toml::Value) -> Result<Self::Config> {
-        Ok(
-            match root_toml.get("bindings").and_then(|b| b.get("kotlin")) {
-                Some(v) => v.clone().try_into()?,
-                None => Default::default(),
-            },
-        )
+    for c in components.iter_mut() {
+        // Call derive_ffi_functions after `apply_renames`
+        c.ci.derive_ffi_funcs()?;
     }
 
-    fn update_component_configs(
-        &self,
-        settings: &GenerationSettings,
-        components: &mut Vec<Component<Self::Config>>,
-    ) -> Result<()> {
-        for c in &mut *components {
-            c.config
-                .package_name
-                .get_or_insert_with(|| format!("uniffi.{}", c.ci.namespace()));
-            c.config.cdylib_name.get_or_insert_with(|| {
-                settings
-                    .cdylib
-                    .clone()
-                    .unwrap_or_else(|| format!("uniffi_{}", c.ci.namespace()))
-            });
-        }
-        // We need to update package names
-        let packages = HashMap::<String, String>::from_iter(
-            components
-                .iter()
-                .map(|c| (c.ci.crate_name().to_string(), c.config.package_name())),
-        );
-        for c in components {
-            for (ext_crate, ext_package) in &packages {
-                if ext_crate != c.ci.crate_name()
-                    && !c.config.external_packages.contains_key(ext_crate)
-                {
-                    c.config
-                        .external_packages
-                        .insert(ext_crate.to_string(), ext_package.clone());
-                }
+    for Component { ci, config, .. } in components {
+        if let Some(crate_filter) = &options.crate_filter {
+            if ci.crate_name() != crate_filter {
+                continue;
             }
         }
-        Ok(())
-    }
 
-    fn write_bindings(
-        &self,
-        settings: &GenerationSettings,
-        components: &[Component<Self::Config>],
-    ) -> Result<()> {
-        for Component { ci, config, .. } in components {
-            let mut kt_file = full_bindings_path(config, &settings.out_dir);
-            fs::create_dir_all(&kt_file)?;
-            kt_file.push(format!("{}.kt", ci.namespace()));
-            fs::write(&kt_file, generate_bindings(config, ci)?)?;
-            if settings.try_format_code {
+        let mut kt_file = full_bindings_path(&config, &options.out_dir);
+        fs::create_dir_all(&kt_file)?;
+        kt_file.push(format!("{}.kt", ci.namespace()));
+        fs::write(&kt_file, generate_bindings(&config, &ci)?)?;
+        if options.format {
+            println!(
+                "Code generation complete, formatting with ktlint (use --no-format to disable)"
+            );
+            if let Err(e) = Command::new("ktlint").arg("-F").arg(&kt_file).output() {
                 println!(
-                    "Code generation complete, formatting with ktlint (use --no-format to disable)"
+                    "Warning: Unable to auto-format {} using ktlint: {e:?}",
+                    kt_file.file_name().unwrap(),
                 );
-                if let Err(e) = Command::new("ktlint").arg("-F").arg(&kt_file).output() {
-                    println!(
-                        "Warning: Unable to auto-format {} using ktlint: {e:?}",
-                        kt_file.file_name().unwrap(),
-                    );
-                }
             }
         }
-        Ok(())
     }
+    Ok(())
 }
 
 fn full_bindings_path(config: &Config, out_dir: &Utf8Path) -> Utf8PathBuf {
     let package_path: Utf8PathBuf = config.package_name().split('.').collect();
     Utf8PathBuf::from(out_dir).join(package_path)
 }
+
+fn parse_config(
+    ci: &ComponentInterface,
+    root_toml: toml::Value,
+    cdylib: Option<String>,
+) -> Result<Config> {
+    let mut config: Config = match root_toml.get("bindings").and_then(|b| b.get("kotlin")) {
+        Some(v) => v.clone().try_into()?,
+        None => Default::default(),
+    };
+    config
+        .package_name
+        .get_or_insert_with(|| format!("uniffi.{}", ci.namespace()));
+    config.cdylib_name.get_or_insert_with(|| {
+        cdylib
+            .clone()
+            .unwrap_or_else(|| format!("uniffi_{}", ci.namespace()))
+    });
+
+    Ok(config)
+}
+
+// A helper for renaming items.
+fn apply_renames(components: &mut Vec<Component<Config>>) {
+    // Collect all rename configurations from all components, keyed by module_path
+    let mut module_renames = HashMap::new();
+    for c in components.iter() {
+        if !c.config.rename.is_empty() {
+            let module_path = c.ci.crate_name().to_string();
+            module_renames.insert(module_path, c.config.rename.clone());
+        }
+    }
+
+    // Apply rename configurations to all components
+    if !module_renames.is_empty() {
+        for c in &mut *components {
+            rename(&mut c.ci, &module_renames);
+        }
+    }
+    // We need to update package names
+    let packages = HashMap::<String, String>::from_iter(
+        components
+            .iter()
+            .map(|c| (c.ci.crate_name().to_string(), c.config.package_name())),
+    );
+    for c in components {
+        for (ext_crate, ext_package) in &packages {
+            if ext_crate != c.ci.crate_name() && !c.config.external_packages.contains_key(ext_crate)
+            {
+                c.config
+                    .external_packages
+                    .insert(ext_crate.to_string(), ext_package.clone());
+            }
+        }
+    }
+}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/Async.kt b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/Async.kt
index 5775ce6524858..324a4181d15d6 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/Async.kt
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/Async.kt
@@ -1,7 +1,7 @@
 // Async return type handlers
 
 internal const val UNIFFI_RUST_FUTURE_POLL_READY = 0.toByte()
-internal const val UNIFFI_RUST_FUTURE_POLL_MAYBE_READY = 1.toByte()
+internal const val UNIFFI_RUST_FUTURE_POLL_WAKE = 1.toByte()
 
 internal val uniffiContinuationHandleMap = UniffiHandleMap<CancellableContinuation<Byte>>()
 
@@ -44,16 +44,25 @@ internal inline fun<T> uniffiTraitInterfaceCallAsync(
     crossinline makeCall: suspend () -> T,
     crossinline handleSuccess: (T) -> Unit,
     crossinline handleError: (UniffiRustCallStatus.ByValue) -> Unit,
-): UniffiForeignFuture {
+    uniffiOutDroppedCallback: UniffiForeignFutureDroppedCallbackStruct,
+) {
     // Using `GlobalScope` is labeled as a "delicate API" and generally discouraged in Kotlin programs, since it breaks structured concurrency.
     // However, our parent task is a Rust future, so we're going to need to break structure concurrency in any case.
     //
     // Uniffi does its best to support structured concurrency across the FFI.
-    // If the Rust future is dropped, `uniffiForeignFutureFreeImpl` is called, which will cancel the Kotlin coroutine if it's still running.
+    // If the Rust future is dropped, `uniffiForeignFutureDroppedCallbackImpl` is called, which will cancel the Kotlin coroutine if it's still running.
     @OptIn(DelicateCoroutinesApi::class)
-    val job = GlobalScope.launch {
-        try {
-            handleSuccess(makeCall())
+    val job = GlobalScope.launch coroutineBlock@ {
+        // Note: it's important we call either `handleSuccess` or `handleError` exactly once.  Each
+        // call consumes an Arc reference, which means there should be no possibility of a double
+        // call.  The following code is structured so that will will never call both `handleSuccess`
+        // and `handleError`, even in the face of weird exceptions.
+        //
+        // In extreme circumstances we may not call either, for example if we fail to make the JNA
+        // call to `handleSuccess`.  This means we will leak the Arc reference, which is better than
+        // double-freeing it.
+        val callResult = try {
+            makeCall()
         } catch(e: kotlin.Exception) {
             handleError(
                 UniffiRustCallStatus.create(
@@ -61,10 +70,12 @@ internal inline fun<T> uniffiTraitInterfaceCallAsync(
                     {{ Type::String.borrow()|lower_fn }}(e.toString()),
                 )
             )
+            return@coroutineBlock
         }
+        handleSuccess(callResult)
     }
     val handle = uniffiForeignFutureHandleMap.insert(job)
-    return UniffiForeignFuture(handle, uniffiForeignFutureFreeImpl)
+    uniffiOutDroppedCallback.uniffiSetValue(UniffiForeignFutureDroppedCallbackStruct(handle, uniffiForeignFutureDroppedCallbackImpl))
 }
 
 internal inline fun<T, reified E: Throwable> uniffiTraitInterfaceCallAsyncWithError(
@@ -72,12 +83,15 @@ internal inline fun<T, reified E: Throwable> uniffiTraitInterfaceCallAsyncWithEr
     crossinline handleSuccess: (T) -> Unit,
     crossinline handleError: (UniffiRustCallStatus.ByValue) -> Unit,
     crossinline lowerError: (E) -> RustBuffer.ByValue,
-): UniffiForeignFuture {
+    uniffiOutDroppedCallback: UniffiForeignFutureDroppedCallbackStruct,
+) {
     // See uniffiTraitInterfaceCallAsync for details on `DelicateCoroutinesApi`
     @OptIn(DelicateCoroutinesApi::class)
-    val job = GlobalScope.launch {
-        try {
-            handleSuccess(makeCall())
+    val job = GlobalScope.launch coroutineBlock@ {
+        // See the note in uniffiTraitInterfaceCallAsync for details on `handleSuccess` and
+        // `handleError`.
+        val callResult = try {
+            makeCall()
         } catch(e: kotlin.Exception) {
             if (e is E) {
                 handleError(
@@ -94,15 +108,17 @@ internal inline fun<T, reified E: Throwable> uniffiTraitInterfaceCallAsyncWithEr
                     )
                 )
             }
+            return@coroutineBlock
         }
+        handleSuccess(callResult)
     }
     val handle = uniffiForeignFutureHandleMap.insert(job)
-    return UniffiForeignFuture(handle, uniffiForeignFutureFreeImpl)
+    uniffiOutDroppedCallback.uniffiSetValue(UniffiForeignFutureDroppedCallbackStruct(handle, uniffiForeignFutureDroppedCallbackImpl))
 }
 
 internal val uniffiForeignFutureHandleMap = UniffiHandleMap<Job>()
 
-internal object uniffiForeignFutureFreeImpl: UniffiForeignFutureFree {
+internal object uniffiForeignFutureDroppedCallbackImpl: UniffiForeignFutureDroppedCallback {
     override fun callback(handle: Long) {
         val job = uniffiForeignFutureHandleMap.remove(handle)
         if (!job.isCompleted) {
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/CallbackInterfaceImpl.kt b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/CallbackInterfaceImpl.kt
index d0c25b2366097..e8ced2fd32141 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/CallbackInterfaceImpl.kt
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/CallbackInterfaceImpl.kt
@@ -67,23 +67,23 @@ internal object {{ trait_impl }} {
                 )
             }
 
-            uniffiOutReturn.uniffiSetValue(
-                {%- match meth.throws_type() %}
-                {%- when None %}
-                uniffiTraitInterfaceCallAsync(
-                    makeCall,
-                    uniffiHandleSuccess,
-                    uniffiHandleError
-                )
-                {%- when Some(error_type) %}
-                uniffiTraitInterfaceCallAsyncWithError(
-                    makeCall,
-                    uniffiHandleSuccess,
-                    uniffiHandleError,
-                    { e: {{error_type|type_name(ci) }} -> {{ error_type|lower_fn }}(e) }
-                )
-                {%- endmatch %}
+            {%- match meth.throws_type() %}
+            {%- when None %}
+            uniffiTraitInterfaceCallAsync(
+                makeCall,
+                uniffiHandleSuccess,
+                uniffiHandleError,
+                uniffiOutDroppedCallback
+            )
+            {%- when Some(error_type) %}
+            uniffiTraitInterfaceCallAsyncWithError(
+                makeCall,
+                uniffiHandleSuccess,
+                uniffiHandleError,
+                { e: {{error_type|type_name(ci) }} -> {{ error_type|lower_fn }}(e) },
+                uniffiOutDroppedCallback
             )
+            {%- endmatch %}
             {%- endif %}
         }
     }
@@ -95,11 +95,18 @@ internal object {{ trait_impl }} {
         }
     }
 
+    internal object uniffiClone: {{ "CallbackInterfaceClone"|ffi_callback_name }} {
+        override fun callback(handle: Long): Long {
+            return {{ ffi_converter_name }}.handleMap.clone(handle)
+        }
+    }
+
     internal var vtable = {{ vtable|ffi_type_name_by_value(ci) }}(
+        uniffiFree,
+        uniffiClone,
         {%- for (ffi_callback, meth) in vtable_methods.iter() %}
         {{ meth.name()|var_name() }},
         {%- endfor %}
-        uniffiFree,
     )
 
     // Registers the foreign callback with the Rust side.
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/EnumTemplate.kt b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/EnumTemplate.kt
index 89427dd9c9225..c07bd250f2c7a 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/EnumTemplate.kt
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/EnumTemplate.kt
@@ -15,6 +15,14 @@ enum class {{ type_name }} {
     {%- call kt::docstring(variant, 4) %}
     {{ variant|variant_name }}{% if loop.last %};{% else %},{% endif %}
     {%- endfor %}
+
+    {% for meth in e.methods() -%}
+    {%- call kt::func_decl("", meth, 4) %}
+    {% endfor %}
+
+    {%- let uniffi_trait_methods = e.uniffi_trait_methods() %}
+    {%- call kt::uniffi_trait_impls(uniffi_trait_methods) %}
+
     companion object
 }
 {% when Some(variant_discr_type) %}
@@ -23,6 +31,14 @@ enum class {{ type_name }}(val value: {{ variant_discr_type|type_name(ci) }}) {
     {%- call kt::docstring(variant, 4) %}
     {{ variant|variant_name }}({{ e|variant_discr_literal(loop.index0) }}){% if loop.last %};{% else %},{% endif %}
     {%- endfor %}
+
+    {% for meth in e.methods() -%}
+    {%- call kt::func_decl("", meth, 4) %}
+    {% endfor %}
+
+    {%- let uniffi_trait_methods = e.uniffi_trait_methods() %}
+    {%- call kt::uniffi_trait_impls(uniffi_trait_methods) %}
+
     companion object
 }
 {% endmatch %}
@@ -51,7 +67,11 @@ public object {{ e|ffi_converter_name }}: FfiConverterRustBuffer<{{ type_name }}
 {% else %}
 
 {%- call kt::docstring(e, 0) %}
-sealed class {{ type_name }}{% if contains_object_references %}: Disposable {% endif %} {
+sealed class {{ type_name }}{% if contains_object_references %}: Disposable {% endif %}
+{%- let uniffi_trait_methods = e.uniffi_trait_methods() -%}
+{%- if uniffi_trait_methods.ord_cmp.is_some() -%}
+{% if contains_object_references %}, {% else %} : {% endif %}Comparable<{{ type_name }}>
+{%- endif %} {
     {% for variant in e.variants() -%}
     {%- call kt::docstring(variant, 4) %}
     {% if !variant.has_fields() -%}
@@ -60,9 +80,18 @@ sealed class {{ type_name }}{% if contains_object_references %}: Disposable {% e
     data class {{ variant|type_name(ci) }}(
         {%- for field in variant.fields() -%}
         {%- call kt::docstring(field, 8) %}
-        val {% call kt::field_name(field, loop.index) %}: {{ field|type_name(ci) }}{% if loop.last %}{% else %}, {% endif %}
+        val {% call kt::field_name(field, loop.index) %}: {{ field|qualified_type_name(ci, config) }}
+        {%- if let Some(default) = field.default_value() %} = {{ default|render_default(field, ci) }} {% endif %}
+        {%- if loop.last %}{% else %}, {% endif %}
         {%- endfor -%}
-    ) : {{ type_name }}() {
+    ) : {{ type_name }}()
+        {# we need uniffi trait methods on each variant's data-class #}
+        {%- let uniffi_trait_methods = e.uniffi_trait_methods() %}
+        {%- if uniffi_trait_methods.ord_cmp.is_some() %}
+        , Comparable<{{ type_name }}>
+        {%- endif %}
+    {
+        {% call kt::uniffi_trait_impls(uniffi_trait_methods) %}
         companion object
     }
     {%- endif %}
@@ -84,6 +113,15 @@ sealed class {{ type_name }}{% if contains_object_references %}: Disposable {% e
         }.let { /* this makes the `when` an expression, which ensures it is exhaustive */ }
     }
     {% endif %}
+
+    {# We also need to put methods on the object to support variants with no data.
+       We could maybe optimize this so only write when no-data variants actually exist? #}
+    {% for meth in e.methods() -%}
+    {%- call kt::func_decl("", meth, 4) %}
+    {% endfor %}
+
+    {%- call kt::uniffi_trait_impls(uniffi_trait_methods) %}
+
     companion object
 }
 
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/ErrorTemplate.kt b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/ErrorTemplate.kt
index 8f517ffeb6abf..3a6f2510a7080 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/ErrorTemplate.kt
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/ErrorTemplate.kt
@@ -4,7 +4,11 @@
 
 {% if e.is_flat() %}
 {%- call kt::docstring(e, 0) %}
-sealed class {{ type_name }}(message: String): kotlin.Exception(message){% if contains_object_references %}, Disposable {% endif %} {
+sealed class {{ type_name }}(message: String): kotlin.Exception(message){% if contains_object_references %}, Disposable {% endif %}
+{%- let uniffi_trait_methods = e.uniffi_trait_methods() -%}
+{%- if uniffi_trait_methods.ord_cmp.is_some() -%}
+{% if contains_object_references %}, {% else %}, {% endif %}Comparable<{{ type_name }}>
+{%- endif %} {
         {% for variant in e.variants() -%}
         {%- call kt::docstring(variant, 4) %}
         class {{ variant|error_variant_name }}(message: String) : {{ type_name }}(message)
@@ -16,7 +20,11 @@ sealed class {{ type_name }}(message: String): kotlin.Exception(message){% if co
 }
 {%- else %}
 {%- call kt::docstring(e, 0) %}
-sealed class {{ type_name }}: kotlin.Exception(){% if contains_object_references %}, Disposable {% endif %} {
+sealed class {{ type_name }}: kotlin.Exception(){% if contains_object_references %}, Disposable {% endif %}
+{%- let uniffi_trait_methods = e.uniffi_trait_methods() -%}
+{%- if uniffi_trait_methods.ord_cmp.is_some() -%}
+{% if contains_object_references %}, {% else %}, {% endif %}Comparable<{{ type_name }}>
+{%- endif %} {
     {% for variant in e.variants() -%}
     {%- call kt::docstring(variant, 4) %}
     {%- let variant_name = variant|error_variant_name %}
@@ -31,6 +39,12 @@ sealed class {{ type_name }}: kotlin.Exception(){% if contains_object_references
     }
     {% endfor %}
 
+    {% for meth in e.methods() -%}
+    {%- call kt::func_decl("", meth, 8) %}
+    {% endfor %}
+
+    {%- call kt::uniffi_trait_impls(uniffi_trait_methods) %}
+
     companion object ErrorHandler : UniffiRustCallStatusErrorHandler<{{ type_name }}> {
         override fun lift(error_buf: RustBuffer.ByValue): {{ type_name }} = {{ ffi_converter_name }}.lift(error_buf)
     }
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/ExternalTypeTemplate.kt b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/ExternalTypeTemplate.kt
index 01c604d69fc46..3203d70de0ba8 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/ExternalTypeTemplate.kt
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/ExternalTypeTemplate.kt
@@ -8,3 +8,19 @@
 {{- self.add_import(fully_qualified_type_name) }}
 {{- self.add_import(fully_qualified_ffi_converter_name) }}
 {{ self.add_import_as(fully_qualified_rustbuffer_name, local_rustbuffer_name) }}
+
+{%- if ci.is_name_used_as_error(name) %}
+{%- let class_name = name|class_name(ci) %}
+
+object {{ class_name }}ExternalErrorHandler : UniffiRustCallStatusErrorHandler<{{ class_name }}> {
+    override fun lift(error_buf: RustBuffer.ByValue): {{ class_name }} =
+        {{ fully_qualified_type_name }}.ErrorHandler.lift(
+            {{ local_rustbuffer_name }}.ByValue().apply {
+                capacity = error_buf.capacity
+                len = error_buf.len
+                data = error_buf.data
+            }
+        )
+}
+
+{%- endif %}
\ No newline at end of file
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/HandleMap.kt b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/HandleMap.kt
index 3a5664819035a..aeb9715ad8fd8 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/HandleMap.kt
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/HandleMap.kt
@@ -1,20 +1,32 @@
+// Initial value and increment amount for handles. 
+// These ensure that Kotlin-generated handles always have the lowest bit set
+private const val UNIFFI_HANDLEMAP_INITIAL = 1.toLong()
+private const val UNIFFI_HANDLEMAP_DELTA = 2.toLong()
+
 // Map handles to objects
 //
 // This is used pass an opaque 64-bit handle representing a foreign object to the Rust code.
 internal class UniffiHandleMap<T: Any> {
     private val map = ConcurrentHashMap<Long, T>()
-    private val counter = java.util.concurrent.atomic.AtomicLong(0)
+    // Start 
+    private val counter = java.util.concurrent.atomic.AtomicLong(UNIFFI_HANDLEMAP_INITIAL)
 
     val size: Int
         get() = map.size
 
     // Insert a new object into the handle map and get a handle for it
     fun insert(obj: T): Long {
-        val handle = counter.getAndAdd(1)
+        val handle = counter.getAndAdd(UNIFFI_HANDLEMAP_DELTA)
         map.put(handle, obj)
         return handle
     }
 
+    // Clone a handle, creating a new one
+    fun clone(handle: Long): Long {
+        val obj = map.get(handle) ?: throw InternalException("UniffiHandleMap.clone: Invalid handle")
+        return insert(obj)
+    }
+
     // Get an object from the handle map
     fun get(handle: Long): T {
         return map.get(handle) ?: throw InternalException("UniffiHandleMap.get: Invalid handle")
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/Helpers.kt b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/Helpers.kt
index 245cc164de594..618633769516b 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/Helpers.kt
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/Helpers.kt
@@ -102,8 +102,9 @@ internal inline fun<T> uniffiTraitInterfaceCall(
     try {
         writeReturn(makeCall())
     } catch(e: kotlin.Exception) {
+        val err = try { e.stackTraceToString() } catch(_: Throwable) { "" }
         callStatus.code = UNIFFI_CALL_UNEXPECTED_ERROR
-        callStatus.error_buf = {{ Type::String.borrow()|lower_fn }}(e.toString())
+        callStatus.error_buf = {{ Type::String.borrow()|lower_fn }}(err)
     }
 }
 
@@ -120,8 +121,9 @@ internal inline fun<T, reified E: Throwable> uniffiTraitInterfaceCallWithError(
             callStatus.code = UNIFFI_CALL_ERROR
             callStatus.error_buf = lowerError(e)
         } else {
+            val err = try { e.stackTraceToString() } catch(_: Throwable) { "" }
             callStatus.code = UNIFFI_CALL_UNEXPECTED_ERROR
-            callStatus.error_buf = {{ Type::String.borrow()|lower_fn }}(e.toString())
+            callStatus.error_buf = {{ Type::String.borrow()|lower_fn }}(err)
         }
     }
 }
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/NamespaceLibraryTemplate.kt b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/NamespaceLibraryTemplate.kt
index 62f574147a08d..df638a96c1513 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/NamespaceLibraryTemplate.kt
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/NamespaceLibraryTemplate.kt
@@ -7,12 +7,6 @@ private fun findLibraryName(componentName: String): String {
     return "{{ config.cdylib_name() }}"
 }
 
-private inline fun <reified Lib : Library> loadIndirect(
-    componentName: String
-): Lib {
-    return Native.load<Lib>(findLibraryName(componentName), Lib::class.java)
-}
-
 // Define FFI callback types
 {%- for def in ci.ffi_definitions() %}
 {%- match def %}
@@ -51,92 +45,65 @@ internal open class {{ ffi_struct.name()|ffi_struct_name }}(
 
 }
 {%- when FfiDefinition::Function(_) %}
-{# functions are handled below #}
+{#- functions are handled below #}
 {%- endmatch %}
 {%- endfor %}
 
-
 {%- macro decl_kotlin_functions(func_list) -%}
 {% for func in func_list -%}
-fun {{ func.name() }}(
+external fun {{ func.name() }}(
     {%- call kt::arg_list_ffi_decl(func) %}
 ): {% match func.return_type() %}{% when Some with (return_type) %}{{ return_type.borrow()|ffi_type_name_by_value(ci) }}{% when None %}Unit{% endmatch %}
 {% endfor %}
 {%- endmacro %}
 
+// A JNA Library to expose the extern-C FFI definitions.
+// This is an implementation detail which will be called internally by the public API.
+
 // For large crates we prevent `MethodTooLargeException` (see #2340)
-// N.B. the name of the extension is very misleading, since it is 
-// rather `InterfaceTooLargeException`, caused by too many methods 
+// N.B. the name of the extension is very misleading, since it is
+// rather `InterfaceTooLargeException`, caused by too many methods
 // in the interface for large crates.
 //
 // By splitting the otherwise huge interface into two parts
-// * UniffiLib 
-// * IntegrityCheckingUniffiLib (this)
+// * UniffiLib (this)
+// * IntegrityCheckingUniffiLib
+// And all checksum methods are put into `IntegrityCheckingUniffiLib`
 // we allow for ~2x as many methods in the UniffiLib interface.
-// 
-// The `ffi_uniffi_contract_version` method and all checksum methods are put 
-// into `IntegrityCheckingUniffiLib` and these methods are called only once,
-// when the library is loaded.
-internal interface IntegrityCheckingUniffiLib : Library {
-    // Integrity check functions only
-    {# newline below wanted #}
-
-{%- call decl_kotlin_functions(ci.iter_ffi_function_integrity_checks()) %}
-}
-
-// A JNA Library to expose the extern-C FFI definitions.
-// This is an implementation detail which will be called internally by the public API.
-internal interface UniffiLib : Library {
-    companion object {
-        internal val INSTANCE: UniffiLib by lazy {
-            val componentName = "{{ ci.namespace() }}"
-            // For large crates we prevent `MethodTooLargeException` (see #2340)
-            // N.B. the name of the extension is very misleading, since it is 
-            // rather `InterfaceTooLargeException`, caused by too many methods 
-            // in the interface for large crates.
-            //
-            // By splitting the otherwise huge interface into two parts
-            // * UniffiLib (this)
-            // * IntegrityCheckingUniffiLib
-            // And all checksum methods are put into `IntegrityCheckingUniffiLib`
-            // we allow for ~2x as many methods in the UniffiLib interface.
-            // 
-            // Thus we first load the library with `loadIndirect` as `IntegrityCheckingUniffiLib`
-            // so that we can (optionally!) call `uniffiCheckApiChecksums`...
-            loadIndirect<IntegrityCheckingUniffiLib>(componentName)
-                .also { lib: IntegrityCheckingUniffiLib ->
-                    uniffiCheckContractApiVersion(lib)
+//
+// Note: above all written when we used JNA's `loadIndirect` etc.
+// We now use JNA's "direct mapping" - unclear if same considerations apply exactly.
+internal object IntegrityCheckingUniffiLib {
+    init {
+        Native.register(IntegrityCheckingUniffiLib::class.java, findLibraryName(componentName = "{{ ci.namespace() }}"))
+        uniffiCheckContractApiVersion(this)
 {%- if !config.omit_checksums %}
-                    uniffiCheckApiChecksums(lib)
+        uniffiCheckApiChecksums(this)
 {%- endif %}
-                }
-            // ... and then we load the library as `UniffiLib`
-            // N.B. we cannot use `loadIndirect` once and then try to cast it to `UniffiLib`
-            // => results in `java.lang.ClassCastException: com.sun.proxy.$Proxy cannot be cast to ...`
-            // error. So we must call `loadIndirect` twice. For crates large enough
-            // to trigger this issue, the performance impact is negligible, running on
-            // a macOS M1 machine the `loadIndirect` call takes ~50ms.
-            val lib = loadIndirect<UniffiLib>(componentName)
-            // No need to check the contract version and checksums, since 
-            // we already did that with `IntegrityCheckingUniffiLib` above.
-            {% for fn_item in self.initialization_fns(ci) -%}
-            {{ fn_item }}
-            {% endfor -%}
-            // Loading of library with integrity check done.
-            lib
-        }
-        {% if ci.contains_object_types() %}
-        // The Cleaner for the whole library
-        internal val CLEANER: UniffiCleaner by lazy {
-            UniffiCleaner.create()
-        }
-        {%- endif %}
     }
+    {% filter indent(4) %}
+    {%- call decl_kotlin_functions(ci.iter_ffi_function_integrity_checks()) %}
+    {% endfilter %}
+}
 
-    // FFI functions
-    {# newline below before call decl_kotlin_functions is needed #}
+internal object UniffiLib {
+    {% if ci.contains_object_types() %}
+    // The Cleaner for the whole library
+    internal val CLEANER: UniffiCleaner by lazy {
+        UniffiCleaner.create()
+    }
+    {% endif %}
 
+    init {
+        Native.register(UniffiLib::class.java, findLibraryName(componentName = "{{ ci.namespace() }}"))
+        {% for fn_item in self.initialization_fns(ci) -%}
+        {{ fn_item }}
+        {% endfor %}
+    }
+    {#- XXX - this `filter indent` doesn't seem to work, even though the one above does? #}
+    {% filter indent(4) %}
     {%- call decl_kotlin_functions(ci.iter_ffi_function_definitions_excluding_integrity_checks()) %}
+    {% endfilter %}
 }
 
 private fun uniffiCheckContractApiVersion(lib: IntegrityCheckingUniffiLib) {
@@ -164,5 +131,8 @@ private fun uniffiCheckApiChecksums(lib: IntegrityCheckingUniffiLib) {
  * @suppress
  */
 public fun uniffiEnsureInitialized() {
-    UniffiLib.INSTANCE
+    IntegrityCheckingUniffiLib
+    // UniffiLib() initialized as objects are used, but we still need to explicitly
+    // reference it so initialization across crates works as expected.
+    UniffiLib
 }
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/ObjectTemplate.kt b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/ObjectTemplate.kt
index 799b679648afa..d7e75cb33bd6a 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/ObjectTemplate.kt
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/ObjectTemplate.kt
@@ -1,18 +1,15 @@
-// This template implements a class for working with a Rust struct via a Pointer/Arc<T>
+// This template implements a class for working with a Rust struct via a handle
 // to the live Rust struct on the other side of the FFI.
 //
-// Each instance implements core operations for working with the Rust `Arc<T>` and the
-// Kotlin Pointer to work with the live Rust struct on the other side of the FFI.
-//
 // There's some subtlety here, because we have to be careful not to operate on a Rust
 // struct after it has been dropped, and because we must expose a public API for freeing
 // theq Kotlin wrapper object in lieu of reliable finalizers. The core requirements are:
 //
-//   * Each instance holds an opaque pointer to the underlying Rust struct.
-//     Method calls need to read this pointer from the object's state and pass it in to
+//   * Each instance holds an opaque handle to the underlying Rust struct.
+//     Method calls need to read this handle from the object's state and pass it in to
 //     the Rust FFI.
 //
-//   * When an instance is no longer needed, its pointer should be passed to a
+//   * When an instance is no longer needed, its handle should be passed to a
 //     special destructor function provided by the Rust FFI, which will drop the
 //     underlying Rust struct.
 //
@@ -37,13 +34,13 @@
 //      2. the thread is shared across the whole library. This can be tuned by using `android_cleaner = true`,
 //         or `android = true` in the [`kotlin` section of the `uniffi.toml` file](https://mozilla.github.io/uniffi-rs/kotlin/configuration.html).
 //
-// If we try to implement this with mutual exclusion on access to the pointer, there is the
+// If we try to implement this with mutual exclusion on access to the handle, there is the
 // possibility of a race between a method call and a concurrent call to `destroy`:
 //
-//    * Thread A starts a method call, reads the value of the pointer, but is interrupted
-//      before it can pass the pointer over the FFI to Rust.
+//    * Thread A starts a method call, reads the value of the handle, but is interrupted
+//      before it can pass the handle over the FFI to Rust.
 //    * Thread B calls `destroy` and frees the underlying Rust struct.
-//    * Thread A resumes, passing the already-read pointer value to Rust and triggering
+//    * Thread A resumes, passing the already-read handle value to Rust and triggering
 //      a use-after-free.
 //
 // One possible solution would be to use a `ReadWriteLock`, with each method call taking
@@ -101,6 +98,7 @@
 {%- let interface_name = self::object_interface_name(ci, obj) %}
 {%- let impl_class_name = self::object_impl_name(ci, obj) %}
 {%- let methods = obj.methods() %}
+{%- let uniffi_trait_methods = obj.uniffi_trait_methods() %}
 {%- let interface_docstring = obj.docstring() %}
 {%- let is_error = ci.is_name_used_as_error(name) %}
 {%- let ffi_converter_name = obj|ffi_converter_name %}
@@ -113,25 +111,34 @@ open class {{ impl_class_name }} : kotlin.Exception, Disposable, AutoCloseable,
 {% else -%}
 open class {{ impl_class_name }}: Disposable, AutoCloseable, {{ interface_name }}
 {%- for t in obj.trait_impls() %}
-, {{ self::trait_interface_name(ci, t.trait_name)? }}
+, {{ self::trait_interface_name(ci, t.trait_ty)? }}
 {% endfor %}
+{%- if uniffi_trait_methods.ord_cmp.is_some() %}
+, Comparable<{{ impl_class_name }}>
+{%- endif %}
 {
 {%- endif %}
 
-    constructor(pointer: Pointer) {
-        this.pointer = pointer
-        this.cleanable = UniffiLib.CLEANER.register(this, UniffiCleanAction(pointer))
+    @Suppress("UNUSED_PARAMETER")
+    /**
+     * @suppress
+     */
+    constructor(withHandle: UniffiWithHandle, handle: Long) {
+        this.handle = handle
+        this.cleanable = UniffiLib.CLEANER.register(this, UniffiCleanAction(handle))
     }
 
     /**
+     * @suppress
+     *
      * This constructor can be used to instantiate a fake object. Only used for tests. Any
      * attempt to actually use an object constructed this way will fail as there is no
      * connected Rust object.
      */
     @Suppress("UNUSED_PARAMETER")
-    constructor(noPointer: NoPointer) {
-        this.pointer = null
-        this.cleanable = UniffiLib.CLEANER.register(this, UniffiCleanAction(pointer))
+    constructor(noHandle: NoHandle) {
+        this.handle = 0
+        this.cleanable = null
     }
 
     {%- match obj.primary_constructor() %}
@@ -141,13 +148,13 @@ open class {{ impl_class_name }}: Disposable, AutoCloseable, {{ interface_name }
     {%-     else %}
     {%- call kt::docstring(cons, 4) %}
     constructor({% call kt::arg_list(cons, true) -%}) :
-        this({% call kt::to_ffi_call(cons) %})
+        this(UniffiWithHandle, {% call kt::to_ffi_call(cons) %})
     {%-     endif %}
     {%- when None %}
     {%- endmatch %}
 
-    protected val pointer: Pointer?
-    protected val cleanable: UniffiCleaner.Cleanable
+    protected val handle: Long
+    protected val cleanable: UniffiCleaner.Cleanable?
 
     private val wasDestroyed = AtomicBoolean(false)
     private val callCounter = AtomicLong(1)
@@ -158,7 +165,7 @@ open class {{ impl_class_name }}: Disposable, AutoCloseable, {{ interface_name }
         if (this.wasDestroyed.compareAndSet(false, true)) {
             // This decrement always matches the initial count of 1 given at creation time.
             if (this.callCounter.decrementAndGet() == 0L) {
-                cleanable.clean()
+                cleanable?.clean()
             }
         }
     }
@@ -168,7 +175,7 @@ open class {{ impl_class_name }}: Disposable, AutoCloseable, {{ interface_name }
         this.destroy()
     }
 
-    internal inline fun <R> callWithPointer(block: (ptr: Pointer) -> R): R {
+    internal inline fun <R> callWithHandle(block: (handle: Long) -> R): R {
         // Check and increment the call counter, to keep the object alive.
         // This needs a compare-and-set retry loop in case of concurrent updates.
         do {
@@ -180,59 +187,48 @@ open class {{ impl_class_name }}: Disposable, AutoCloseable, {{ interface_name }
                 throw IllegalStateException("${this.javaClass.simpleName} call counter would overflow")
             }
         } while (! this.callCounter.compareAndSet(c, c + 1L))
-        // Now we can safely do the method call without the pointer being freed concurrently.
+        // Now we can safely do the method call without the handle being freed concurrently.
         try {
-            return block(this.uniffiClonePointer())
+            return block(this.uniffiCloneHandle())
         } finally {
             // This decrement always matches the increment we performed above.
             if (this.callCounter.decrementAndGet() == 0L) {
-                cleanable.clean()
+                cleanable?.clean()
             }
         }
     }
 
     // Use a static inner class instead of a closure so as not to accidentally
     // capture `this` as part of the cleanable's action.
-    private class UniffiCleanAction(private val pointer: Pointer?) : Runnable {
+    private class UniffiCleanAction(private val handle: Long) : Runnable {
         override fun run() {
-            pointer?.let { ptr ->
-                uniffiRustCall { status ->
-                    UniffiLib.INSTANCE.{{ obj.ffi_object_free().name() }}(ptr, status)
-                }
+            if (handle == 0.toLong()) {
+                // Fake object created with `NoHandle`, don't try to free.
+                return;
+            }
+            uniffiRustCall { status ->
+                UniffiLib.{{ obj.ffi_object_free().name() }}(handle, status)
             }
         }
     }
 
-    fun uniffiClonePointer(): Pointer {
+    /**
+     * @suppress
+     */
+    fun uniffiCloneHandle(): Long {
+        if (handle == 0.toLong()) {
+            throw InternalException("uniffiCloneHandle() called on NoHandle object");
+        }
         return uniffiRustCall() { status ->
-            UniffiLib.INSTANCE.{{ obj.ffi_object_clone().name() }}(pointer!!, status)
+            UniffiLib.{{ obj.ffi_object_clone().name() }}(handle, status)
         }
     }
 
-    {% for meth in obj.methods() -%}
+    {% for meth in methods -%}
     {%- call kt::func_decl("override", meth, 4) %}
     {% endfor %}
 
-    {%- for tm in obj.uniffi_traits() %}
-    {%-     match tm %}
-    {%         when UniffiTrait::Display { fmt } %}
-    override fun toString(): String {
-        return {{ fmt.return_type().unwrap()|lift_fn }}({% call kt::to_ffi_call(fmt) %})
-    }
-    {%         when UniffiTrait::Eq { eq, ne } %}
-    {# only equals used #}
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other !is {{ impl_class_name}}) return false
-        return {{ eq.return_type().unwrap()|lift_fn }}({% call kt::to_ffi_call(eq) %})
-    }
-    {%         when UniffiTrait::Hash { hash } %}
-    override fun hashCode(): Int {
-        return {{ hash.return_type().unwrap()|lift_fn }}({%- call kt::to_ffi_call(hash) %}).toInt()
-    }
-    {%-         else %}
-    {%-     endmatch %}
-    {%- endfor %}
+    {% call kt::uniffi_trait_impls(uniffi_trait_methods) %}
 
     {# XXX - "companion object" confusion? How to have alternate constructors *and* be an error? #}
     {% if !obj.alternate_constructors().is_empty() -%}
@@ -253,48 +249,84 @@ open class {{ impl_class_name }}: Disposable, AutoCloseable, {{ interface_name }
         }
     }
     {% else %}
+    /**
+     * @suppress
+     */
     companion object
     {% endif %}
 }
 
-{%- if obj.has_callback_interface() %}
+{%- if !obj.has_callback_interface() %}
+{# Simple case: the interface can only be implemented in Rust #}
+
+/**
+ * @suppress
+ */
+public object {{ ffi_converter_name }}: FfiConverter<{{ type_name }}, Long> {
+    override fun lower(value: {{ type_name }}): Long {
+        return value.uniffiCloneHandle()
+    }
+
+    override fun lift(value: Long): {{ type_name }} {
+        return {{ impl_class_name }}(UniffiWithHandle, value)
+    }
+
+    override fun read(buf: ByteBuffer): {{ type_name }} {
+        return lift(buf.getLong())
+    }
+
+    override fun allocationSize(value: {{ type_name }}) = 8UL
+
+    override fun write(value: {{ type_name }}, buf: ByteBuffer) {
+        buf.putLong(lower(value))
+    }
+}
+{%- else %}
+{# 
+ # The interface can be implemented in Rust or Kotlin
+ # * Generate a callback interface implementation to handle the Kotlin side
+ # * In the FfiConverter, check which side a handle came from to know how to handle correctly.
+#}
 {%- let vtable = obj.vtable().expect("trait interface should have a vtable") %}
 {%- let vtable_methods = obj.vtable_methods() %}
 {%- let ffi_init_callback = obj.ffi_init_callback() %}
 {% include "CallbackInterfaceImpl.kt" %}
-{%- endif %}
 
 /**
  * @suppress
  */
-public object {{ ffi_converter_name }}: FfiConverter<{{ type_name }}, Pointer> {
-    {%- if obj.has_callback_interface() %}
+public object {{ ffi_converter_name }}: FfiConverter<{{ type_name }}, Long> {
     internal val handleMap = UniffiHandleMap<{{ type_name }}>()
-    {%- endif %}
 
-    override fun lower(value: {{ type_name }}): Pointer {
-        {%- if obj.has_callback_interface() %}
-        return Pointer(handleMap.insert(value))
-        {%- else %}
-        return value.uniffiClonePointer()
-        {%- endif %}
+    override fun lower(value: {{ type_name }}): Long {
+        if (value is {{ impl_class_name }}) {
+             // Rust-implemented object.  Clone the handle and return it
+            return value.uniffiCloneHandle()
+         } else {
+            // Kotlin object, generate a new vtable handle and return that.
+            return handleMap.insert(value)
+         }
     }
 
-    override fun lift(value: Pointer): {{ type_name }} {
-        return {{ impl_class_name }}(value)
+    override fun lift(value: Long): {{ type_name }} {
+        if ((value and 1.toLong()) == 0.toLong()) {
+            // Rust-generated handle, construct a new class that uses the handle to implement the
+            // interface
+            return {{ impl_class_name }}(UniffiWithHandle, value)
+        } else {
+            // Kotlin-generated handle, get the object from the handle map
+            return handleMap.remove(value)
+        }
     }
 
     override fun read(buf: ByteBuffer): {{ type_name }} {
-        // The Rust code always writes pointers as 8 bytes, and will
-        // fail to compile if they don't fit.
-        return lift(Pointer(buf.getLong()))
+        return lift(buf.getLong())
     }
 
     override fun allocationSize(value: {{ type_name }}) = 8UL
 
     override fun write(value: {{ type_name }}, buf: ByteBuffer) {
-        // The Rust code always expects pointers written as 8 bytes,
-        // and will fail to compile if they don't fit.
-        buf.putLong(Pointer.nativeValue(lower(value)))
+        buf.putLong(lower(value))
     }
 }
+{%- endif %}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/RecordTemplate.kt b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/RecordTemplate.kt
index 4361f1c9e2791..2edf96aa17857 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/RecordTemplate.kt
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/RecordTemplate.kt
@@ -6,13 +6,22 @@ data class {{ type_name }} (
     {%- for field in rec.fields() %}
     {%- call kt::docstring(field, 4) %}
     {% if config.generate_immutable_records() %}val{% else %}var{% endif %} {{ field.name()|var_name }}: {{ field|type_name(ci) -}}
-    {%- match field.default_value() %}
-        {%- when Some(literal) %} = {{ literal|render_literal(field, ci) }}
-        {%- else %}
-    {%- endmatch -%}
+    {%- if let Some(default) = field.default_value() %} = {{ default|render_default(field, ci) }} {% endif %}
     {% if !loop.last %}, {% endif %}
     {%- endfor %}
-) {% if contains_object_references %}: Disposable {% endif %}{
+    {%- let uniffi_trait_methods = rec.uniffi_trait_methods() %}
+    {%- let comparable = uniffi_trait_methods.ord_cmp.is_some() %}
+)
+{%- if comparable && contains_object_references %}: Disposable, Comparable<{{ type_name }}>
+{%- elif contains_object_references  %}: Disposable
+{%- elif comparable  %}: Comparable<{{ type_name }}>
+{% endif -%}
+{
+    {% for meth in rec.methods() -%}
+    {%- call kt::func_decl("", meth, 4) %}
+    {% endfor %}
+
+    {% call kt::uniffi_trait_impls(uniffi_trait_methods) %}
     {% if contains_object_references %}
     @Suppress("UNNECESSARY_SAFE_CALL") // codegen is much simpler if we unconditionally emit safe calls here
     override fun destroy() {
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/RustBufferTemplate.kt b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/RustBufferTemplate.kt
index c12c386d7c969..83040f1793aea 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/RustBufferTemplate.kt
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/RustBufferTemplate.kt
@@ -25,7 +25,7 @@ open class RustBuffer : Structure() {
     companion object {
         internal fun alloc(size: ULong = 0UL) = uniffiRustCall() { status ->
             // Note: need to convert the size to a `Long` value to make this work with JVM.
-            UniffiLib.INSTANCE.{{ ci.ffi_rustbuffer_alloc().name() }}(size.toLong(), status)
+            UniffiLib.{{ ci.ffi_rustbuffer_alloc().name() }}(size.toLong(), status)
         }.also {
             if(it.data == null) {
                throw RuntimeException("RustBuffer.alloc() returned null data pointer (size=${size})")
@@ -41,51 +41,17 @@ open class RustBuffer : Structure() {
         }
 
         internal fun free(buf: RustBuffer.ByValue) = uniffiRustCall() { status ->
-            UniffiLib.INSTANCE.{{ ci.ffi_rustbuffer_free().name() }}(buf, status)
+            UniffiLib.{{ ci.ffi_rustbuffer_free().name() }}(buf, status)
         }
     }
 
     @Suppress("TooGenericExceptionThrown")
     fun asByteBuffer() =
-        this.data?.getByteBuffer(0, this.len.toLong())?.also {
+        this.data?.getByteBuffer(0, this.len)?.also {
             it.order(ByteOrder.BIG_ENDIAN)
         }
 }
 
-/**
- * The equivalent of the `*mut RustBuffer` type.
- * Required for callbacks taking in an out pointer.
- *
- * Size is the sum of all values in the struct.
- *
- * @suppress
- */
-class RustBufferByReference : ByReference(16) {
-    /**
-     * Set the pointed-to `RustBuffer` to the given value.
-     */
-    fun setValue(value: RustBuffer.ByValue) {
-        // NOTE: The offsets are as they are in the C-like struct.
-        val pointer = getPointer()
-        pointer.setLong(0, value.capacity)
-        pointer.setLong(8, value.len)
-        pointer.setPointer(16, value.data)
-    }
-
-    /**
-     * Get a `RustBuffer.ByValue` from this reference.
-     */
-    fun getValue(): RustBuffer.ByValue {
-        val pointer = getPointer()
-        val value = RustBuffer.ByValue()
-        value.writeField("capacity", pointer.getLong(0))
-        value.writeField("len", pointer.getLong(8))
-        value.writeField("data", pointer.getLong(16))
-
-        return value
-    }
-}
-
 // This is a helper for safely passing byte references into the rust code.
 // It's not actually used at the moment, because there aren't many things that you
 // can take a direct pointer to in the JVM, and if we're going to copy something
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/Types.kt b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/Types.kt
index 30bc0141990b2..c1df65ee7aa29 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/Types.kt
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/Types.kt
@@ -58,12 +58,23 @@ inline fun <T : Disposable?, R> T.use(block: (T) -> R) =
         }
     }
 
+/** 
+ * Placeholder object used to signal that we're constructing an interface with a FFI handle.
+ *
+ * This is the first argument for interface constructors that input a raw handle. It exists is that
+ * so we can avoid signature conflicts when an interface has a regular constructor than inputs a
+ * Long.
+ *
+ * @suppress
+ * */
+object UniffiWithHandle
+
 /** 
  * Used to instantiate an interface without an actual pointer, for fakes in tests, mostly.
  *
  * @suppress
  * */
-object NoPointer
+object NoHandle
 
 {%- if ci.has_callback_definitions() %}
 {%- include "CallbackInterfaceRuntime.kt" %}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/macros.kt b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/macros.kt
index 47a329bd3c3d0..7c94fc0793dda 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/macros.kt
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/templates/macros.kt
@@ -5,38 +5,41 @@
 #}
 
 {%- macro to_ffi_call(func) -%}
-    {%- if func.takes_self() %}
-    callWithPointer {
+    {%- match func.self_type() %}
+    {%- when Some(Type::Object { .. }) %}
+    callWithHandle {
         {%- call to_raw_ffi_call(func) %}
     }
     {% else %}
         {%- call to_raw_ffi_call(func) %}
-    {% endif %}
+    {% endmatch %}
 {%- endmacro %}
 
 {%- macro to_raw_ffi_call(func) -%}
     {%- match func.throws_type() %}
     {%- when Some(e) %}
+    {%- if ci.is_external(e) %}
+    uniffiRustCallWithError({{ e|type_name(ci) }}ExternalErrorHandler)
+    {%- else %}
     uniffiRustCallWithError({{ e|type_name(ci) }})
+    {%- endif %}
     {%- else %}
     uniffiRustCall()
     {%- endmatch %} { _status ->
-    UniffiLib.INSTANCE.{{ func.ffi_func().name() }}(
-        {% if func.takes_self() %}it, {% endif -%}
+    UniffiLib.{{ func.ffi_func().name() }}(
+    {%- match func.self_type() %}
+    {%- when Some(Type::Object { .. }) %}
+        it,
+    {%- when Some(t) %}
+        {{- t|lower_fn }}(this),
+    {%- when None %}
+    {% endmatch %}
         {% call arg_list_lowered(func) -%}
         _status)
 }
 {%- endmacro -%}
 
 {%- macro func_decl(func_decl, callable, indent) %}
-    {%- if self::can_render_callable(callable, ci) %}
-        {%- call render_func_decl(func_decl, callable, indent) %}
-    {%- else %}
-// Sorry, the callable "{{ callable.name() }}" isn't supported.
-    {%- endif %}
-{%- endmacro %}
-
-{%- macro render_func_decl(func_decl, callable, indent) %}
     {%- call docstring(callable, indent) %}
 
     {%- match callable.throws_type() -%}
@@ -47,13 +50,13 @@
     {%- if callable.is_async() %}
     @Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
     {{ func_decl }} suspend fun {{ callable.name()|fn_name }}(
-        {%- call arg_list(callable, !callable.takes_self()) -%}
+        {%- call arg_list(callable, callable.self_type().is_none()) -%}
     ){% match callable.return_type() %}{% when Some(return_type) %} : {{ return_type|type_name(ci) }}{% when None %}{%- endmatch %} {
         return {% call call_async(callable) %}
     }
     {%- else -%}
     {{ func_decl }} fun {{ callable.name()|fn_name }}(
-        {%- call arg_list(callable, !callable.takes_self()) -%}
+        {%- call arg_list(callable, callable.self_type().is_none()) -%}
     ){%- match callable.return_type() -%}
     {%-         when Some(return_type) -%}
         : {{ return_type|type_name(ci) }} {
@@ -67,15 +70,15 @@
 
 {%- macro call_async(callable) -%}
     uniffiRustCallAsync(
-{%- if callable.takes_self() %}
-        callWithPointer { thisPtr ->
-            UniffiLib.INSTANCE.{{ callable.ffi_func().name() }}(
-                thisPtr,
+{%- if callable.self_type().is_some() %}
+        callWithHandle { uniffiHandle ->
+            UniffiLib.{{ callable.ffi_func().name() }}(
+                uniffiHandle,
                 {% call arg_list_lowered(callable) %}
             )
         },
 {%- else %}
-        UniffiLib.INSTANCE.{{ callable.ffi_func().name() }}({% call arg_list_lowered(callable) %}),
+        UniffiLib.{{ callable.ffi_func().name() }}({% call arg_list_lowered(callable) %}),
 {%- endif %}
         {{ callable|async_poll(ci) }},
         {{ callable|async_complete(ci) }},
@@ -90,7 +93,11 @@
         // Error FFI converter
         {%- match callable.throws_type() %}
         {%- when Some(e) %}
+        {%- if ci.is_external(e) %}
+        {{ e|type_name(ci) }}ExternalErrorHandler,
+        {%- else %}
         {{ e|type_name(ci) }}.ErrorHandler,
+        {%- endif %}
         {%- when None %}
         UniffiNullRustCallStatusErrorHandler,
         {%- endmatch %}
@@ -114,7 +121,7 @@
         {{ arg.name()|var_name }}: {{ arg|type_name(ci) }}
 {%-     if is_decl %}
 {%-         match arg.default_value() %}
-{%-             when Some(literal) %} = {{ literal|render_literal(arg, ci) }}
+{%-             when Some(default) %} = {{ default|render_default(arg, ci) }}
 {%-             else %}
 {%-         endmatch %}
 {%-     endif %}
@@ -169,3 +176,33 @@ v{{- field_num -}}
 {%- macro docstring(defn, indent_spaces) %}
 {%- call docstring_value(defn.docstring(), indent_spaces) %}
 {%- endmacro %}
+
+// macro for uniffi_trait implementations.
+{% macro uniffi_trait_impls(uniffi_trait_methods) %}
+{# We have 2 display traits, kotlin has 1. Prefer `Display` but use `Debug` otherwise #}
+{%- if let Some(fmt) = uniffi_trait_methods.display_fmt.or(uniffi_trait_methods.debug_fmt.clone()) %}
+    // The local Rust `Display`/`Debug` implementation.
+    override fun toString(): String {
+        return {{ fmt.return_type().unwrap()|lift_fn }}({% call to_ffi_call(fmt) %})
+    }
+{%- endif %}
+{%- if let Some(eq) = uniffi_trait_methods.eq_eq %}
+    // The local Rust `Eq` implementation - only `eq` is used.
+    override fun equals(other: Any?): Boolean {
+        if (other !is {{ eq.object_name()|class_name(ci) }}) return false
+        return {{ eq.return_type().unwrap()|lift_fn }}({% call to_ffi_call(eq) %})
+    }
+{%- endif %}
+{%- if let Some(hash) = uniffi_trait_methods.hash_hash %}
+    // The local Rust `Hash` implementation
+    override fun hashCode(): Int {
+        return {{ hash.return_type().unwrap()|lift_fn }}({%- call to_ffi_call(hash) %}).toInt()
+    }
+{%- endif %}
+{%- if let Some(cmp) = uniffi_trait_methods.ord_cmp %}
+    // The local Rust `Ord` implementation
+    override fun compareTo(other: {{ cmp.object_name()|class_name(ci) }}): Int {
+        return {{ cmp.return_type().unwrap()|lift_fn }}({%- call to_ffi_call(cmp) %}).toInt()
+    }
+{%- endif %}
+{%- endmacro %}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/test.rs b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/test.rs
index 7b06ee4a05709..61cf110541d34 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/kotlin/test.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/kotlin/test.rs
@@ -3,8 +3,9 @@ License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use crate::{
-    bail, bindings::RunScriptOptions, cargo_metadata::CrateConfigSupplier,
-    library_mode::generate_bindings, Context, Result,
+    bail,
+    bindings::{generate, GenerateOptions, RunScriptOptions, TargetLanguage},
+    Context, Result,
 };
 use camino::{Utf8Path, Utf8PathBuf};
 use std::env;
@@ -37,15 +38,12 @@ pub fn run_script(
     let out_dir = test_helper.create_out_dir(tmp_dir, script_path)?;
     let cdylib_path = test_helper.copy_cdylib_to_out_dir(&out_dir)?;
 
-    generate_bindings(
-        &cdylib_path,
-        None,
-        &super::KotlinBindingGenerator,
-        &CrateConfigSupplier::from(test_helper.cargo_metadata()),
-        None,
-        &out_dir,
-        false,
-    )?;
+    generate(GenerateOptions {
+        languages: vec![TargetLanguage::Kotlin],
+        source: cdylib_path.to_path_buf(),
+        out_dir: out_dir.to_path_buf(),
+        ..GenerateOptions::default()
+    })?;
     let jar_file = build_jar(crate_name, &out_dir, options)?;
 
     let mut command = kotlinc_command(options);
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/mod.rs b/third_party/rust/uniffi_bindgen/src/bindings/mod.rs
index 16685370231e1..00e36b6eddfeb 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/mod.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/mod.rs
@@ -7,14 +7,17 @@
 //! This module contains all the code for generating foreign language bindings,
 //! along with some helpers for executing foreign language scripts or tests.
 
+use std::fs;
+
+use anyhow::Result;
+use camino::Utf8PathBuf;
+
+use crate::{BindgenLoader, BindgenPaths};
 mod kotlin;
-pub use kotlin::KotlinBindingGenerator;
 pub mod python;
-pub use python::PythonBindingGenerator;
 mod ruby;
-pub use ruby::RubyBindingGenerator;
 mod swift;
-pub use swift::{generate_swift_bindings, SwiftBindingGenerator, SwiftBindingsOptions};
+pub use swift::{generate_swift_bindings, SwiftBindingsOptions};
 
 #[cfg(feature = "bindgen-tests")]
 pub use self::{
@@ -37,3 +40,75 @@ impl Default for RunScriptOptions {
         }
     }
 }
+
+/// Generate bindings
+///
+/// This implements the default uniffi-bindgen command
+pub fn generate(options: GenerateOptions) -> Result<()> {
+    generate_with_bindgen_paths(options, BindgenPaths::default())
+}
+
+/// Generate bindings with custom bindgen paths.
+pub fn generate_with_bindgen_paths(
+    options: GenerateOptions,
+    mut paths: BindgenPaths,
+) -> Result<()> {
+    if let Some(path) = &options.config_override {
+        paths.add_config_override_layer(path.clone());
+    }
+
+    #[cfg(feature = "cargo-metadata")]
+    paths.add_cargo_metadata_layer(options.metadata_no_deps)?;
+
+    fs::create_dir_all(&options.out_dir)?;
+
+    let loader = BindgenLoader::new(paths);
+    for language in options.languages.iter() {
+        match language {
+            TargetLanguage::Swift => {
+                swift::generate(&loader, options.clone())?;
+            }
+            TargetLanguage::Kotlin => {
+                kotlin::generate(&loader, options.clone())?;
+            }
+            TargetLanguage::Python => {
+                python::generate(&loader, options.clone())?;
+            }
+            TargetLanguage::Ruby => {
+                ruby::generate(&loader, options.clone())?;
+            }
+        }
+    }
+    Ok(())
+}
+
+#[derive(Clone, Default)]
+pub struct GenerateOptions {
+    /// Languages to generate bindings for
+    pub languages: Vec<TargetLanguage>,
+    /// Path to the UDL or library file
+    pub source: Utf8PathBuf,
+    /// Directory to write generated files.
+    pub out_dir: Utf8PathBuf,
+    /// Path to the config file to use, if None bindings generators will load
+    /// `[crate-root]/uniffi.toml`
+    pub config_override: Option<Utf8PathBuf>,
+    /// Run the generated code through a source code formatter
+    pub format: bool,
+    /// Limit binding generate to a single crate
+    pub crate_filter: Option<String>,
+    /// Exclude dependencies when running "cargo metadata".
+    /// This will mean external types may not be resolved if they are implemented in crates
+    /// outside of this workspace.
+    /// This can be used in environments when all types are in the namespace and fetching
+    /// all sub-dependencies causes obscure platform specific problems.
+    pub metadata_no_deps: bool,
+}
+
+#[derive(Clone, Debug)]
+pub enum TargetLanguage {
+    Kotlin,
+    Python,
+    Ruby,
+    Swift,
+}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/filters.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/filters.rs
new file mode 100644
index 0000000000000..c589c34d65f73
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/filters.rs
@@ -0,0 +1,49 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/// Template filters for Askama
+///
+/// In general, prefer adding fields using a pipeline pass to writing filters.
+/// That's allows devs to use the `pipeline` command to follow what's going on.
+///
+/// We currently only use filter functions when we want to implement somewhat complex display
+/// logic, like in the `docstring` filter. Implementing this as a pipeline pass means the pass
+/// would need to know how much each docstring gets indented, which doesn't seem right.
+use askama::Result;
+
+/// Get the idiomatic Python rendering of docstring
+///
+/// If the docstring is set, this returns an indented Python docstring with
+/// a trailing newline. If not, it returns the empty string.
+///
+/// This makes it so the template code can use something like
+/// `{{ item.docstring|docstring(4) -}}` to render the correct docstring in both cases.
+pub fn docstring(
+    docstring: &Option<String>,
+    _: &dyn askama::Values,
+    indent: usize,
+) -> Result<String> {
+    let Some(docstring) = docstring.as_deref() else {
+        return Ok("".to_string());
+    };
+    let docstring = textwrap::dedent(docstring);
+    let indent = " ".repeat(indent);
+    // Escape triple quotes to avoid syntax error
+    let escaped = docstring.replace(r#"""""#, r#"\"\"\""#);
+    let indented = textwrap::indent(&escaped, &indent);
+    Ok(format!("\"\"\"\n{indented}\n\"\"\"\n{indent}"))
+}
+
+/// Get the idiomatic Python import statement for a module
+pub fn import_statement(module: &str, _: &dyn askama::Values) -> Result<String> {
+    Ok(if module.starts_with('.') {
+        let Some((from, name)) = module.rsplit_once('.') else {
+            unreachable!()
+        };
+        let from = if from.is_empty() { "." } else { from };
+        format!("from {from} import {name}")
+    } else {
+        format!("import {module}")
+    })
+}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/callback_interface.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/callback_interface.rs
deleted file mode 100644
index 7793fde625434..0000000000000
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/callback_interface.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use super::CodeType;
-use crate::{backend::Literal, bail, Result};
-
-#[derive(Debug)]
-pub struct CallbackInterfaceCodeType {
-    id: String,
-}
-
-impl CallbackInterfaceCodeType {
-    pub fn new(id: String) -> Self {
-        Self { id }
-    }
-}
-
-impl CodeType for CallbackInterfaceCodeType {
-    fn type_label(&self) -> String {
-        super::PythonCodeOracle.class_name(&self.id)
-    }
-
-    fn canonical_name(&self) -> String {
-        format!("Type{}", self.type_label())
-    }
-
-    fn literal(&self, _literal: &Literal) -> Result<String> {
-        bail!("literals not supported here")
-    }
-}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/compounds.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/compounds.rs
deleted file mode 100644
index b06bfc99744e3..0000000000000
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/compounds.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use super::CodeType;
-use crate::{
-    backend::{Literal, Type},
-    bail,
-    bindings::python::gen_python::AsCodeType,
-    Result,
-};
-
-#[derive(Debug)]
-pub struct OptionalCodeType {
-    inner: Type,
-}
-
-impl OptionalCodeType {
-    pub fn new(inner: Type) -> Self {
-        Self { inner }
-    }
-}
-
-impl CodeType for OptionalCodeType {
-    fn type_label(&self) -> String {
-        format!(
-            "typing.Optional[{}]",
-            super::PythonCodeOracle.find(&self.inner).type_label()
-        )
-    }
-
-    fn canonical_name(&self) -> String {
-        format!(
-            "Optional{}",
-            super::PythonCodeOracle.find(&self.inner).canonical_name(),
-        )
-    }
-
-    fn literal(&self, literal: &Literal) -> Result<String> {
-        match literal {
-            Literal::None => Ok("None".into()),
-            Literal::Some { inner } => super::PythonCodeOracle.find(&self.inner).literal(inner),
-            _ => bail!("Invalid literal for Optional type: {literal:?}"),
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct SequenceCodeType {
-    inner: Type,
-}
-
-impl SequenceCodeType {
-    pub fn new(inner: Type) -> Self {
-        Self { inner }
-    }
-}
-
-impl CodeType for SequenceCodeType {
-    fn type_label(&self) -> String {
-        // Python 3.8 and below do not support `list[T]`
-        format!(
-            "typing.List[{}]",
-            super::PythonCodeOracle.find(&self.inner).type_label()
-        )
-    }
-
-    fn canonical_name(&self) -> String {
-        format!(
-            "Sequence{}",
-            super::PythonCodeOracle.find(&self.inner).canonical_name(),
-        )
-    }
-
-    fn literal(&self, literal: &Literal) -> Result<String> {
-        match literal {
-            Literal::EmptySequence => Ok("[]".into()),
-            _ => bail!("Invalid literal for sequence type: {literal:?}"),
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct MapCodeType {
-    key: Type,
-    value: Type,
-}
-
-impl MapCodeType {
-    pub fn new(key: Type, value: Type) -> Self {
-        Self { key, value }
-    }
-}
-
-impl CodeType for MapCodeType {
-    fn type_label(&self) -> String {
-        format!(
-            "dict[{}, {}]",
-            self.key.as_codetype().type_label(),
-            self.value.as_codetype().type_label()
-        )
-    }
-
-    fn canonical_name(&self) -> String {
-        format!(
-            "Map{}{}",
-            super::PythonCodeOracle.find(&self.key).canonical_name(),
-            super::PythonCodeOracle.find(&self.value).canonical_name(),
-        )
-    }
-
-    fn literal(&self, literal: &Literal) -> Result<String> {
-        match literal {
-            Literal::EmptyMap => Ok("{}".into()),
-            _ => bail!("Invalid literal for map type: {literal:?}"),
-        }
-    }
-}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/custom.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/custom.rs
deleted file mode 100644
index 8782339170de9..0000000000000
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/custom.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use super::CodeType;
-
-#[derive(Debug)]
-pub struct CustomCodeType {
-    name: String,
-}
-
-impl CustomCodeType {
-    pub fn new(name: String) -> Self {
-        Self { name }
-    }
-}
-
-impl CodeType for CustomCodeType {
-    fn type_label(&self) -> String {
-        super::PythonCodeOracle.class_name(&self.name)
-    }
-
-    fn canonical_name(&self) -> String {
-        format!("Type{}", self.type_label())
-    }
-}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/enum_.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/enum_.rs
deleted file mode 100644
index 30419c546e37e..0000000000000
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/enum_.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use super::CodeType;
-use crate::{backend::Literal, bail, Result};
-
-#[derive(Debug)]
-pub struct EnumCodeType {
-    id: String,
-}
-
-impl EnumCodeType {
-    pub fn new(id: String) -> Self {
-        Self { id }
-    }
-}
-
-impl CodeType for EnumCodeType {
-    fn type_label(&self) -> String {
-        super::PythonCodeOracle.class_name(&self.id)
-    }
-
-    fn canonical_name(&self) -> String {
-        format!("Type{}", self.type_label())
-    }
-
-    fn literal(&self, literal: &Literal) -> Result<String> {
-        if let Literal::Enum(v, _) = literal {
-            Ok(format!(
-                "{}.{}",
-                self.type_label(),
-                super::PythonCodeOracle.enum_variant_name(v)
-            ))
-        } else {
-            bail!("Invalid literal for enum type: {literal:?}")
-        }
-    }
-}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/miscellany.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/miscellany.rs
deleted file mode 100644
index 81ce503e3d273..0000000000000
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/miscellany.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use super::CodeType;
-
-macro_rules! impl_code_type_for_miscellany {
-    ($T:ident, $canonical_name:literal) => {
-        #[derive(Debug)]
-        pub struct $T;
-
-        impl CodeType for $T {
-            fn type_label(&self) -> String {
-                format!("{}", $canonical_name)
-            }
-
-            fn canonical_name(&self) -> String {
-                format!("{}", $canonical_name)
-            }
-        }
-    };
-}
-
-impl_code_type_for_miscellany!(TimestampCodeType, "Timestamp");
-
-impl_code_type_for_miscellany!(DurationCodeType, "Duration");
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/mod.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/mod.rs
deleted file mode 100644
index 75ecb9db78799..0000000000000
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/mod.rs
+++ /dev/null
@@ -1,683 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use anyhow::{bail, Context, Result};
-use askama::Template;
-
-use heck::{ToShoutySnakeCase, ToSnakeCase, ToUpperCamelCase};
-use once_cell::sync::Lazy;
-use serde::{Deserialize, Serialize};
-use std::borrow::Borrow;
-use std::cell::RefCell;
-use std::collections::{BTreeSet, HashMap, HashSet};
-use std::fmt::Debug;
-
-use crate::interface::*;
-use crate::VisitMut;
-
-mod callback_interface;
-mod compounds;
-mod custom;
-mod enum_;
-mod miscellany;
-mod object;
-mod primitives;
-mod record;
-
-/// A trait tor the implementation.
-trait CodeType: Debug {
-    /// The language specific label used to reference this type. This will be used in
-    /// method signatures and property declarations.
-    fn type_label(&self) -> String;
-
-    /// A representation of this type label that can be used as part of another
-    /// identifier. e.g. `read_foo()`, or `FooInternals`.
-    ///
-    /// This is especially useful when creating specialized objects or methods to deal
-    /// with this type only.
-    fn canonical_name(&self) -> String {
-        self.type_label()
-    }
-
-    fn literal(&self, _literal: &Literal) -> Result<String> {
-        bail!("Unimplemented for {}", self.type_label())
-    }
-
-    /// Name of the FfiConverter
-    ///
-    /// This is the object that contains the lower, write, lift, and read methods for this type.
-    fn ffi_converter_name(&self) -> String {
-        format!("FfiConverter{}", self.canonical_name())
-    }
-}
-
-// Taken from Python's `keyword.py` module.
-static KEYWORDS: Lazy<HashSet<String>> = Lazy::new(|| {
-    let kwlist = vec![
-        "False",
-        "None",
-        "True",
-        "__peg_parser__",
-        "and",
-        "as",
-        "assert",
-        "async",
-        "await",
-        "break",
-        "class",
-        "continue",
-        "def",
-        "del",
-        "elif",
-        "else",
-        "except",
-        "finally",
-        "for",
-        "from",
-        "global",
-        "if",
-        "import",
-        "in",
-        "is",
-        "lambda",
-        "nonlocal",
-        "not",
-        "or",
-        "pass",
-        "raise",
-        "return",
-        "try",
-        "while",
-        "with",
-        "yield",
-    ];
-    HashSet::from_iter(kwlist.into_iter().map(|s| s.to_string()))
-});
-
-// Config options to customize the generated python.
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-pub struct Config {
-    pub(super) cdylib_name: Option<String>,
-    #[serde(default)]
-    custom_types: HashMap<String, CustomTypeConfig>,
-    #[serde(default)]
-    external_packages: HashMap<String, String>,
-}
-
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(default)]
-pub struct CustomTypeConfig {
-    // This `CustomTypeConfig` doesn't have a `type_name` like the others -- which is why we have
-    // separate structs rather than a shared one.
-    imports: Option<Vec<String>>,
-    into_custom: String, // b/w compat alias for lift
-    lift: String,
-    from_custom: String, // b/w compat alias for lower
-    lower: String,
-}
-
-// functions replace literal "{}" in strings with a specified value.
-impl CustomTypeConfig {
-    fn lift(&self, name: &str) -> String {
-        let converter = if self.lift.is_empty() {
-            &self.into_custom
-        } else {
-            &self.lift
-        };
-        converter.replace("{}", name)
-    }
-    fn lower(&self, name: &str) -> String {
-        let converter = if self.lower.is_empty() {
-            &self.from_custom
-        } else {
-            &self.lower
-        };
-        converter.replace("{}", name)
-    }
-}
-
-impl Config {
-    pub fn cdylib_name(&self) -> String {
-        if let Some(cdylib_name) = &self.cdylib_name {
-            cdylib_name.clone()
-        } else {
-            "uniffi".into()
-        }
-    }
-
-    /// Get the package name for a given external namespace.
-    pub fn module_for_namespace(&self, ns: &str) -> String {
-        let ns = ns.to_string().to_snake_case();
-        match self.external_packages.get(&ns) {
-            None => format!(".{ns}"),
-            Some(value) if value.is_empty() => ns,
-            Some(value) => format!("{value}.{ns}"),
-        }
-    }
-}
-
-// Generate python bindings for the given ComponentInterface, as a string.
-pub fn generate_python_bindings(config: &Config, ci: &mut ComponentInterface) -> Result<String> {
-    PythonWrapper::new(config.clone(), ci)
-        .render()
-        .context("failed to render python bindings")
-}
-
-/// A struct to record a Python import statement.
-#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
-pub enum ImportRequirement {
-    /// A simple module import.
-    Module { mod_name: String },
-    /// A single symbol from a module.
-    Symbol {
-        mod_name: String,
-        symbol_name: String,
-    },
-    /// A single symbol from a module with the specified local name.
-    SymbolAs {
-        mod_name: String,
-        symbol_name: String,
-        as_name: String,
-    },
-}
-
-impl ImportRequirement {
-    /// Render the Python import statement.
-    fn render(&self) -> String {
-        match &self {
-            ImportRequirement::Module { mod_name } => format!("import {mod_name}"),
-            ImportRequirement::Symbol {
-                mod_name,
-                symbol_name,
-            } => format!("from {mod_name} import {symbol_name}"),
-            ImportRequirement::SymbolAs {
-                mod_name,
-                symbol_name,
-                as_name,
-            } => format!("from {mod_name} import {symbol_name} as {as_name}"),
-        }
-    }
-}
-
-/// Renders Python helper code for all types
-///
-/// This template is a bit different than others in that it stores internal state from the render
-/// process.  Make sure to only call `render()` once.
-#[derive(Template)]
-#[template(syntax = "py", escape = "none", path = "Types.py")]
-pub struct TypeRenderer<'a> {
-    python_config: &'a Config,
-    ci: &'a ComponentInterface,
-    // Track imports added with the `add_import()` macro
-    imports: RefCell<BTreeSet<ImportRequirement>>,
-}
-
-impl<'a> TypeRenderer<'a> {
-    fn new(python_config: &'a Config, ci: &'a ComponentInterface) -> Self {
-        Self {
-            python_config,
-            ci,
-            imports: RefCell::new(BTreeSet::new()),
-        }
-    }
-
-    // The following methods are used by the `Types.py` macros.
-
-    // Helper to add an import statement
-    //
-    // Call this inside your template to cause an import statement to be added at the top of the
-    // file.  Imports will be sorted and de-deuped.
-    //
-    // Returns an empty string so that it can be used inside an askama `{{ }}` block.
-    fn add_import(&self, name: &str) -> &str {
-        self.imports.borrow_mut().insert(ImportRequirement::Module {
-            mod_name: name.to_owned(),
-        });
-        ""
-    }
-
-    // Like add_import, but arranges for `from module import name`.
-    fn add_import_of(&self, mod_name: &str, name: &str) -> &str {
-        self.imports.borrow_mut().insert(ImportRequirement::Symbol {
-            mod_name: mod_name.to_owned(),
-            symbol_name: name.to_owned(),
-        });
-        ""
-    }
-
-    // Like add_import, but arranges for `from module import name as other`.
-    fn add_import_of_as(&self, mod_name: &str, symbol_name: &str, as_name: &str) -> &str {
-        self.imports
-            .borrow_mut()
-            .insert(ImportRequirement::SymbolAs {
-                mod_name: mod_name.to_owned(),
-                symbol_name: symbol_name.to_owned(),
-                as_name: as_name.to_owned(),
-            });
-        ""
-    }
-
-    // An inefficient algo to return type aliases needed for custom types
-    // in an order such that dependencies are in the correct order.
-    // Eg, if there's a custom type `Guid` -> `str` and another `GuidWrapper` -> `Guid`,
-    // it's important the type alias for `Guid` appears first. Fails to handle
-    // another level of indirection (eg, `A { builtin: C}, B { }, C { builtin: B })`)
-    // but that's pathological :)
-    fn get_custom_type_aliases(&self) -> Vec<(String, &Type)> {
-        let mut ordered = vec![];
-        for type_ in self.ci.iter_local_types() {
-            if !self.ci.is_external(type_) {
-                if let Type::Custom { name, builtin, .. } = type_ {
-                    match ordered.iter().position(|x: &(&str, &Type)| {
-                        x.1.iter_types()
-                            .any(|nested_type| *name == nested_type.as_codetype().type_label())
-                    }) {
-                        // This 'name' appears as a builtin, so we must insert our type first.
-                        Some(pos) => ordered.insert(pos, (name, builtin)),
-                        // Otherwise at the end.
-                        None => ordered.push((name, builtin)),
-                    }
-                }
-            }
-        }
-        ordered
-            .into_iter()
-            .map(|(n, t)| (PythonCodeOracle.class_name(n), t))
-            .collect()
-    }
-
-    // Sort object types to avoid forward references; traits before everything else.
-    fn iter_sorted_object_types(&self) -> impl Iterator<Item = &Type> {
-        let mut obs: Vec<&Type> = self
-            .ci
-            .iter_local_types()
-            .filter(|t| matches!(t, Type::Object { .. }))
-            .collect();
-        obs.sort_by_key(|t| !matches!(t, Type::Object { imp, .. } if imp.is_trait_interface()));
-        obs.into_iter()
-    }
-}
-
-#[derive(Template)]
-#[template(syntax = "py", escape = "none", path = "wrapper.py")]
-pub struct PythonWrapper<'a> {
-    ci: &'a ComponentInterface,
-    config: Config,
-    type_helper_code: String,
-    type_imports: BTreeSet<ImportRequirement>,
-}
-impl<'a> PythonWrapper<'a> {
-    pub fn new(config: Config, ci: &'a mut ComponentInterface) -> Self {
-        ci.visit_mut(&PythonCodeOracle);
-
-        let type_renderer = TypeRenderer::new(&config, ci);
-        let type_helper_code = type_renderer.render().unwrap();
-        let type_imports = type_renderer.imports.into_inner();
-
-        Self {
-            config,
-            ci,
-            type_helper_code,
-            type_imports,
-        }
-    }
-
-    pub fn imports(&self) -> Vec<ImportRequirement> {
-        self.type_imports.iter().cloned().collect()
-    }
-}
-
-fn fixup_keyword(name: String) -> String {
-    if KEYWORDS.contains(&name) {
-        format!("_{name}")
-    } else {
-        name
-    }
-}
-
-#[derive(Clone, Default)]
-pub struct PythonCodeOracle;
-
-impl PythonCodeOracle {
-    fn find(&self, type_: &Type) -> Box<dyn CodeType> {
-        type_.clone().as_type().as_codetype()
-    }
-
-    /// Get the idiomatic Python rendering of a class name (for enums, records, errors, etc).
-    fn class_name(&self, nm: &str) -> String {
-        fixup_keyword(nm.to_string().to_upper_camel_case())
-    }
-
-    /// Get the idiomatic Python rendering of a function name.
-    fn fn_name(&self, nm: &str) -> String {
-        fixup_keyword(nm.to_string().to_snake_case())
-    }
-
-    /// Get the idiomatic Python rendering of a variable name.
-    fn var_name(&self, nm: &str) -> String {
-        fixup_keyword(nm.to_string().to_snake_case())
-    }
-
-    /// Get the idiomatic Python rendering of an individual enum variant.
-    fn enum_variant_name(&self, nm: &str) -> String {
-        fixup_keyword(nm.to_string().to_shouty_snake_case())
-    }
-
-    /// Get the idiomatic Python rendering of an FFI callback function name
-    fn ffi_callback_name(&self, nm: &str) -> String {
-        format!("_UNIFFI_{}", nm.to_shouty_snake_case())
-    }
-
-    /// Get the idiomatic Python rendering of an FFI struct name
-    fn ffi_struct_name(&self, nm: &str) -> String {
-        // The ctypes docs use both SHOUTY_SNAKE_CASE AND UpperCamelCase for structs. Let's use
-        // UpperCamelCase and reserve shouting for global variables
-        format!("_Uniffi{}", nm.to_upper_camel_case())
-    }
-
-    fn ffi_type_label(&self, ffi_type: &FfiType, ci: &ComponentInterface) -> String {
-        match ffi_type {
-            FfiType::Int8 => "ctypes.c_int8".to_string(),
-            FfiType::UInt8 => "ctypes.c_uint8".to_string(),
-            FfiType::Int16 => "ctypes.c_int16".to_string(),
-            FfiType::UInt16 => "ctypes.c_uint16".to_string(),
-            FfiType::Int32 => "ctypes.c_int32".to_string(),
-            FfiType::UInt32 => "ctypes.c_uint32".to_string(),
-            FfiType::Int64 => "ctypes.c_int64".to_string(),
-            FfiType::UInt64 => "ctypes.c_uint64".to_string(),
-            FfiType::Float32 => "ctypes.c_float".to_string(),
-            FfiType::Float64 => "ctypes.c_double".to_string(),
-            FfiType::Handle => "ctypes.c_uint64".to_string(),
-            FfiType::RustArcPtr(_) => "ctypes.c_void_p".to_string(),
-            FfiType::RustBuffer(maybe_external) => match maybe_external {
-                Some(external_meta) if external_meta.module_path != ci.crate_name() => {
-                    format!("_UniffiRustBuffer{}", self.class_name(&external_meta.name))
-                }
-                _ => "_UniffiRustBuffer".to_string(),
-            },
-            FfiType::RustCallStatus => "_UniffiRustCallStatus".to_string(),
-            FfiType::ForeignBytes => "_UniffiForeignBytes".to_string(),
-            FfiType::Callback(name) => self.ffi_callback_name(name),
-            FfiType::Struct(name) => self.ffi_struct_name(name),
-            // Pointer to an `asyncio.EventLoop` instance
-            FfiType::Reference(inner) | FfiType::MutReference(inner) => {
-                format!("ctypes.POINTER({})", self.ffi_type_label(inner, ci))
-            }
-            FfiType::VoidPointer => "ctypes.c_void_p".to_string(),
-        }
-    }
-
-    /// Default values for FFI types
-    ///
-    /// Used to set a default return value when returning an error
-    fn ffi_default_value(&self, return_type: Option<&FfiType>, ci: &ComponentInterface) -> String {
-        match return_type {
-            Some(t) => match t {
-                FfiType::UInt8
-                | FfiType::Int8
-                | FfiType::UInt16
-                | FfiType::Int16
-                | FfiType::UInt32
-                | FfiType::Int32
-                | FfiType::UInt64
-                | FfiType::Int64 => "0".to_owned(),
-                FfiType::Float32 | FfiType::Float64 => "0.0".to_owned(),
-                FfiType::RustArcPtr(_) => "ctypes.c_void_p()".to_owned(),
-                FfiType::RustBuffer(maybe_external) => match maybe_external {
-                    Some(external_meta) if external_meta.module_path != ci.crate_name() => {
-                        format!("_UniffiRustBuffer{}.default()", external_meta.name)
-                    }
-                    _ => "_UniffiRustBuffer.default()".to_owned(),
-                },
-                _ => unimplemented!("FFI return type: {t:?}"),
-            },
-            // When we need to use a value for void returns, we use a `u8` placeholder
-            None => "0".to_owned(),
-        }
-    }
-}
-
-impl VisitMut for PythonCodeOracle {
-    fn visit_record(&self, record: &mut Record) {
-        record.rename(self.class_name(record.name()));
-    }
-
-    fn visit_object(&self, object: &mut Object) {
-        object.rename(self.class_name(object.name()));
-        for i in object.trait_impls_mut() {
-            i.trait_name = self.class_name(&i.trait_name);
-            // should i.tr_module_path be fixed?
-        }
-    }
-
-    fn visit_field(&self, field: &mut Field) {
-        field.rename(self.var_name(field.name()));
-    }
-
-    fn visit_ffi_field(&self, ffi_field: &mut FfiField) {
-        ffi_field.rename(self.var_name(ffi_field.name()));
-    }
-
-    fn visit_ffi_argument(&self, ffi_argument: &mut FfiArgument) {
-        ffi_argument.rename(self.class_name(ffi_argument.name()));
-    }
-
-    fn visit_enum(&self, _is_error: bool, enum_: &mut Enum) {
-        enum_.rename(self.class_name(enum_.name()));
-    }
-
-    fn visit_enum_key(&self, key: &mut String) -> String {
-        self.class_name(key)
-    }
-
-    fn visit_variant(&self, is_error: bool, variant: &mut Variant) {
-        if is_error {
-            variant.rename(self.class_name(variant.name()));
-        } else {
-            variant.rename(self.enum_variant_name(variant.name()));
-        }
-    }
-
-    fn visit_type(&self, type_: &mut Type) {
-        // Renaming Types is a special case. We have simple types with names like
-        // an Object, but we also have types which have inner_types and builtin types.
-        // Which in turn have a different name. Therefore we pass the patterns as a
-        // function down to the renaming operation of the type itself, which can apply it
-        // to all its nested names if needed.
-        let name_transformer = |name: &str| self.class_name(name);
-        type_.rename_recursive(&name_transformer);
-    }
-
-    fn visit_method(&self, method: &mut Method) {
-        method.rename(self.fn_name(method.name()));
-    }
-
-    fn visit_argument(&self, argument: &mut Argument) {
-        argument.rename(self.var_name(argument.name()));
-    }
-
-    fn visit_constructor(&self, constructor: &mut Constructor) {
-        if !constructor.is_primary_constructor() {
-            constructor.rename(self.fn_name(constructor.name()));
-        }
-    }
-
-    fn visit_function(&self, function: &mut Function) {
-        // Conversions for wrapper.py
-        //TODO: Renaming the function name in wrapper.py is not currently tested
-        function.rename(self.fn_name(function.name()));
-    }
-
-    fn visit_error_name(&self, name: &mut String) {
-        *name = self.class_name(name);
-    }
-}
-
-trait AsCodeType {
-    fn as_codetype(&self) -> Box<dyn CodeType>;
-}
-
-impl<T: AsType> AsCodeType for T {
-    fn as_codetype(&self) -> Box<dyn CodeType> {
-        // Map `Type` instances to a `Box<dyn CodeType>` for that type.
-        //
-        // There is a companion match in `templates/Types.py` which performs a similar function for the
-        // template code.
-        //
-        //   - When adding additional types here, make sure to also add a match arm to the `Types.py` template.
-        //   - To keep things manageable, let's try to limit ourselves to these 2 mega-matches
-        match self.as_type() {
-            Type::UInt8 => Box::new(primitives::UInt8CodeType),
-            Type::Int8 => Box::new(primitives::Int8CodeType),
-            Type::UInt16 => Box::new(primitives::UInt16CodeType),
-            Type::Int16 => Box::new(primitives::Int16CodeType),
-            Type::UInt32 => Box::new(primitives::UInt32CodeType),
-            Type::Int32 => Box::new(primitives::Int32CodeType),
-            Type::UInt64 => Box::new(primitives::UInt64CodeType),
-            Type::Int64 => Box::new(primitives::Int64CodeType),
-            Type::Float32 => Box::new(primitives::Float32CodeType),
-            Type::Float64 => Box::new(primitives::Float64CodeType),
-            Type::Boolean => Box::new(primitives::BooleanCodeType),
-            Type::String => Box::new(primitives::StringCodeType),
-            Type::Bytes => Box::new(primitives::BytesCodeType),
-
-            Type::Timestamp => Box::new(miscellany::TimestampCodeType),
-            Type::Duration => Box::new(miscellany::DurationCodeType),
-
-            Type::Enum { name, .. } => Box::new(enum_::EnumCodeType::new(name)),
-            Type::Object { name, .. } => Box::new(object::ObjectCodeType::new(name)),
-            Type::Record { name, .. } => Box::new(record::RecordCodeType::new(name)),
-            Type::CallbackInterface { name, .. } => {
-                Box::new(callback_interface::CallbackInterfaceCodeType::new(name))
-            }
-            Type::Optional { inner_type } => {
-                Box::new(compounds::OptionalCodeType::new(*inner_type))
-            }
-            Type::Sequence { inner_type } => {
-                Box::new(compounds::SequenceCodeType::new(*inner_type))
-            }
-            Type::Map {
-                key_type,
-                value_type,
-            } => Box::new(compounds::MapCodeType::new(*key_type, *value_type)),
-            Type::Custom { name, .. } => Box::new(custom::CustomCodeType::new(name)),
-        }
-    }
-}
-
-pub mod filters {
-    use crate::backend::filters::to_askama_error;
-
-    use super::*;
-
-    pub(super) fn type_name(as_ct: &impl AsCodeType) -> Result<String, askama::Error> {
-        Ok(as_ct.as_codetype().type_label())
-    }
-
-    pub(super) fn ffi_converter_name(as_ct: &impl AsCodeType) -> Result<String, askama::Error> {
-        Ok(String::from("_Uniffi") + &as_ct.as_codetype().ffi_converter_name()[3..])
-    }
-
-    pub(super) fn canonical_name(as_ct: &impl AsCodeType) -> Result<String, askama::Error> {
-        Ok(as_ct.as_codetype().canonical_name())
-    }
-
-    pub(super) fn lift_fn(as_ct: &impl AsCodeType) -> Result<String, askama::Error> {
-        Ok(format!("{}.lift", ffi_converter_name(as_ct)?))
-    }
-
-    pub(super) fn check_lower_fn(as_ct: &impl AsCodeType) -> Result<String, askama::Error> {
-        Ok(format!("{}.check_lower", ffi_converter_name(as_ct)?))
-    }
-
-    pub(super) fn lower_fn(as_ct: &impl AsCodeType) -> Result<String, askama::Error> {
-        Ok(format!("{}.lower", ffi_converter_name(as_ct)?))
-    }
-
-    pub(super) fn read_fn(as_ct: &impl AsCodeType) -> Result<String, askama::Error> {
-        Ok(format!("{}.read", ffi_converter_name(as_ct)?))
-    }
-
-    pub(super) fn write_fn(as_ct: &impl AsCodeType) -> Result<String, askama::Error> {
-        Ok(format!("{}.write", ffi_converter_name(as_ct)?))
-    }
-
-    pub(super) fn literal_py(
-        literal: &Literal,
-        as_ct: &impl AsCodeType,
-    ) -> Result<String, askama::Error> {
-        as_ct
-            .as_codetype()
-            .literal(literal)
-            .map_err(|e| to_askama_error(&e))
-    }
-
-    // Get the idiomatic Python rendering of an individual enum variant's discriminant
-    pub fn variant_discr_literal(e: &Enum, index: &usize) -> Result<String, askama::Error> {
-        let literal = e
-            .variant_discr(*index)
-            .context("invalid index")
-            .map_err(|e| to_askama_error(&e))?;
-        Type::UInt64
-            .as_codetype()
-            .literal(&literal)
-            .map_err(|e| to_askama_error(&e))
-    }
-
-    pub fn ffi_type_name(
-        type_: &FfiType,
-        ci: &ComponentInterface,
-    ) -> Result<String, askama::Error> {
-        Ok(PythonCodeOracle.ffi_type_label(type_, ci))
-    }
-
-    pub fn ffi_default_value(
-        return_type: Option<FfiType>,
-        ci: &ComponentInterface,
-    ) -> Result<String, askama::Error> {
-        Ok(PythonCodeOracle.ffi_default_value(return_type.as_ref(), ci))
-    }
-
-    /// Get the idiomatic Python rendering of an FFI callback function name
-    pub fn ffi_callback_name(nm: &str) -> Result<String, askama::Error> {
-        Ok(PythonCodeOracle.ffi_callback_name(nm))
-    }
-
-    /// Get the idiomatic Python rendering of an FFI struct name
-    pub fn ffi_struct_name(nm: &str) -> Result<String, askama::Error> {
-        Ok(PythonCodeOracle.ffi_struct_name(nm))
-    }
-
-    /// Get the idiomatic Python rendering of docstring
-    pub fn docstring(docstring: &str, spaces: &i32) -> Result<String, askama::Error> {
-        let docstring = textwrap::dedent(docstring);
-        // Escape triple quotes to avoid syntax error
-        let escaped = docstring.replace(r#"""""#, r#"\"\"\""#);
-
-        let wrapped = format!("\"\"\"\n{escaped}\n\"\"\"");
-
-        let spaces = usize::try_from(*spaces).unwrap_or_default();
-        Ok(textwrap::indent(&wrapped, &" ".repeat(spaces)))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn test_docstring_escape() {
-        let docstring = r#""""This is a docstring beginning with triple quotes.
-Contains "quotes" in it.
-It also has a triple quote: """
-And a even longer quote: """"""#;
-
-        let expected = r#""""
-\"\"\"This is a docstring beginning with triple quotes.
-Contains "quotes" in it.
-It also has a triple quote: \"\"\"
-And a even longer quote: \"\"\"""
-""""#;
-
-        assert_eq!(super::filters::docstring(docstring, &0).unwrap(), expected);
-    }
-}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/object.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/object.rs
deleted file mode 100644
index 092d09b61abfd..0000000000000
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/object.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use super::CodeType;
-
-#[derive(Debug)]
-pub struct ObjectCodeType {
-    id: String,
-}
-
-impl ObjectCodeType {
-    pub fn new(id: String) -> Self {
-        Self { id }
-    }
-}
-
-impl CodeType for ObjectCodeType {
-    fn type_label(&self) -> String {
-        super::PythonCodeOracle.class_name(&self.id)
-    }
-
-    fn canonical_name(&self) -> String {
-        format!("Type{}", self.type_label())
-    }
-}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/primitives.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/primitives.rs
deleted file mode 100644
index 9ff4dab7a19ae..0000000000000
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/primitives.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use super::CodeType;
-use crate::{backend::Literal, bail, interface::Radix, Result};
-
-fn render_literal(literal: &Literal) -> Result<String> {
-    Ok(match literal {
-        Literal::Boolean(v) => {
-            if *v {
-                "True".into()
-            } else {
-                "False".into()
-            }
-        }
-        Literal::String(s) => format!("\"{s}\""),
-        // https://docs.python.org/3/reference/lexical_analysis.html#integer-literals
-        Literal::Int(i, radix, _) => match radix {
-            Radix::Octal => format!("int(0o{i:o})"),
-            Radix::Decimal => format!("{i}"),
-            Radix::Hexadecimal => format!("{i:#x}"),
-        },
-        Literal::UInt(i, radix, _) => match radix {
-            Radix::Octal => format!("0o{i:o}"),
-            Radix::Decimal => format!("{i}"),
-            Radix::Hexadecimal => format!("{i:#x}"),
-        },
-        Literal::Float(string, _type_) => string.clone(),
-
-        _ => bail!("Invalid literal {literal:?}"),
-    })
-}
-
-macro_rules! impl_code_type_for_primitive {
-    ($T:ident, $python_name:literal, $canonical_name:literal) => {
-        #[derive(Debug)]
-        pub struct $T;
-        impl CodeType for $T {
-            fn type_label(&self) -> String {
-                $python_name.into()
-            }
-
-            fn canonical_name(&self) -> String {
-                $canonical_name.into()
-            }
-
-            fn literal(&self, literal: &Literal) -> Result<String> {
-                render_literal(&literal)
-            }
-        }
-    };
-}
-
-impl_code_type_for_primitive!(BooleanCodeType, "bool", "Bool");
-impl_code_type_for_primitive!(StringCodeType, "str", "String");
-impl_code_type_for_primitive!(BytesCodeType, "bytes", "Bytes");
-impl_code_type_for_primitive!(Int8CodeType, "int", "Int8");
-impl_code_type_for_primitive!(Int16CodeType, "int", "Int16");
-impl_code_type_for_primitive!(Int32CodeType, "int", "Int32");
-impl_code_type_for_primitive!(Int64CodeType, "int", "Int64");
-impl_code_type_for_primitive!(UInt8CodeType, "int", "UInt8");
-impl_code_type_for_primitive!(UInt16CodeType, "int", "UInt16");
-impl_code_type_for_primitive!(UInt32CodeType, "int", "UInt32");
-impl_code_type_for_primitive!(UInt64CodeType, "int", "UInt64");
-impl_code_type_for_primitive!(Float32CodeType, "float", "Float");
-impl_code_type_for_primitive!(Float64CodeType, "float", "Double");
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/record.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/record.rs
deleted file mode 100644
index ef14343650d3a..0000000000000
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/gen_python/record.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use super::CodeType;
-
-#[derive(Debug)]
-pub struct RecordCodeType {
-    id: String,
-}
-
-impl RecordCodeType {
-    pub fn new(id: String) -> Self {
-        Self { id }
-    }
-}
-
-impl CodeType for RecordCodeType {
-    fn type_label(&self) -> String {
-        super::PythonCodeOracle.class_name(&self.id)
-    }
-
-    fn canonical_name(&self) -> String {
-        format!("Type{}", self.type_label())
-    }
-}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/mod.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/mod.rs
index 796124b09d00e..0bee77c424612 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/mod.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/mod.rs
@@ -2,70 +2,49 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use std::process::Command;
-
 use anyhow::Result;
+use askama::Template;
+use camino::Utf8Path;
 use fs_err as fs;
 
+use crate::{bindings::GenerateOptions, BindgenLoader};
+
+pub mod filters;
 mod pipeline;
 pub use pipeline::pipeline;
 
-mod gen_python;
 #[cfg(feature = "bindgen-tests")]
 pub mod test;
-use crate::{BindingGenerator, Component, GenerationSettings};
-
-use gen_python::{generate_python_bindings, Config};
 
-pub struct PythonBindingGenerator;
+/// Generate Python bindings
+pub fn generate(loader: &BindgenLoader, options: GenerateOptions) -> Result<()> {
+    let metadata = loader.load_metadata(&options.source)?;
+    let root = loader.load_pipeline_initial_root(&options.source, metadata)?;
+    run_pipeline(root, &options.out_dir, options.crate_filter.as_deref())?;
 
-impl BindingGenerator for PythonBindingGenerator {
-    type Config = Config;
-
-    fn new_config(&self, root_toml: &toml::Value) -> Result<Self::Config> {
-        Ok(
-            match root_toml.get("bindings").and_then(|b| b.get("python")) {
-                Some(v) => v.clone().try_into()?,
-                None => Default::default(),
-            },
-        )
-    }
+    Ok(())
+}
 
-    fn update_component_configs(
-        &self,
-        settings: &GenerationSettings,
-        components: &mut Vec<Component<Self::Config>>,
-    ) -> Result<()> {
-        for c in &mut *components {
-            c.config.cdylib_name.get_or_insert_with(|| {
-                settings
-                    .cdylib
-                    .clone()
-                    .unwrap_or_else(|| format!("uniffi_{}", c.ci.namespace()))
-            });
-        }
-        Ok(())
+pub fn run_pipeline(
+    initial_root: pipeline::initial::Root,
+    out_dir: &Utf8Path,
+    crate_filter: Option<&str>,
+) -> Result<()> {
+    let python_root = pipeline().execute(initial_root)?;
+    println!("writing out {out_dir}");
+    if !out_dir.exists() {
+        fs::create_dir_all(out_dir)?;
     }
-
-    fn write_bindings(
-        &self,
-        settings: &GenerationSettings,
-        components: &[Component<Self::Config>],
-    ) -> Result<()> {
-        for Component { ci, config, .. } in components {
-            let py_file = settings.out_dir.join(format!("{}.py", ci.namespace()));
-            fs::write(&py_file, generate_python_bindings(config, &mut ci.clone())?)?;
-
-            if settings.try_format_code {
-                if let Err(e) = Command::new("yapf").arg(&py_file).output() {
-                    println!(
-                        "Warning: Unable to auto-format {} using yapf: {e:?}",
-                        py_file.file_name().unwrap(),
-                    )
-                }
+    for module in python_root.namespaces.values() {
+        if let Some(crate_filter) = crate_filter {
+            if module.crate_name != crate_filter {
+                continue;
             }
         }
-
-        Ok(())
+        let path = out_dir.join(format!("{}.py", module.name));
+        let content = module.render()?;
+        println!("writing {path}");
+        fs::write(path, content)?;
     }
+    Ok(())
 }
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/callback_interfaces.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/callback_interfaces.rs
new file mode 100644
index 0000000000000..f9ce1165b9ca5
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/callback_interfaces.rs
@@ -0,0 +1,18 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use super::*;
+
+pub fn pass(cbi: &mut CallbackInterface) -> Result<()> {
+    cbi.protocol = Protocol {
+        // Use the main name for the protocol, the callback interface class will get the `Impl`
+        // suffix.
+        name: cbi.name.clone(),
+        base_classes: vec!["typing.Protocol".to_string()],
+        methods: cbi.methods.clone(),
+        docstring: cbi.docstring.clone(),
+    };
+    cbi.name = format!("{}Impl", cbi.name);
+    Ok(())
+}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/config.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/config.rs
new file mode 100644
index 0000000000000..5f18182f53171
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/config.rs
@@ -0,0 +1,34 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use super::*;
+use serde::Deserialize;
+
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
+    let config = match &namespace.config_toml {
+        Some(toml) => toml::from_str(toml)?,
+        None => Config::default(),
+    };
+    let mut config = config.bindings.python;
+    namespace.visit_mut(|custom: &mut CustomType| {
+        custom.config = config.custom_types.shift_remove(&custom.name);
+    });
+    namespace.config = config;
+    Ok(())
+}
+
+// These structs exist so that we can easily deserialize the entire `uniffi.toml` file.
+// We then extract the `PythonConfig`, which is what we actually care about.
+
+#[derive(Debug, Clone, Deserialize, Node)]
+pub struct Config {
+    #[serde(default)]
+    bindings: BindingsConfig,
+}
+
+#[derive(Debug, Clone, Deserialize, Node)]
+pub struct BindingsConfig {
+    #[serde(default)]
+    python: PythonConfig,
+}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/default.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/default.rs
new file mode 100644
index 0000000000000..d9899155f408d
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/default.rs
@@ -0,0 +1,131 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use super::*;
+
+/// A pass to handle literals and other default values.
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
+    // literals first, because the Default pass might use the value.
+    namespace.try_visit_mut(|lit: &mut LiteralNode| {
+        lit.py_lit = render_literal(&lit.lit)?;
+        Ok(())
+    })?;
+
+    namespace.try_visit_mut(|default: &mut DefaultValueNode| {
+        default.py_default = render_default(&default.default)?;
+        // Many types can use the appropriate literal directly.
+        default.arg_literal = match &default.default {
+            DefaultValue::Default(tn) => match &tn.ty {
+                Type::UInt8
+                | Type::UInt16
+                | Type::UInt32
+                | Type::UInt64
+                | Type::Int8
+                | Type::Int16
+                | Type::Int32
+                | Type::Int64
+                | Type::Float32
+                | Type::Float64
+                | Type::Boolean
+                | Type::Bytes
+                | Type::String
+                | Type::Optional { .. } => default.py_default.clone(),
+                _ => "_DEFAULT".to_string(),
+            },
+            DefaultValue::Literal(ln) => {
+                if can_use_literal(&ln.lit) {
+                    default.py_default.clone()
+                } else {
+                    "_DEFAULT".to_string()
+                }
+            }
+        };
+        default.is_arg_literal = default.py_default == default.arg_literal;
+        Ok(())
+    })
+}
+
+pub fn can_use_literal(literal: &Literal) -> bool {
+    match literal {
+        Literal::Boolean(_)
+        | Literal::String(_)
+        | Literal::UInt(_, _, _)
+        | Literal::Int(_, _, _)
+        | Literal::Float(_, _)
+        | Literal::Enum(_, _) => true,
+        Literal::Some { inner } => match &**inner {
+            DefaultValue::Literal(inner_lit) => can_use_literal(&inner_lit.lit),
+            _ => false,
+        },
+        _ => false,
+    }
+}
+pub(super) fn render_default(default: &DefaultValue) -> Result<String> {
+    Ok(match default {
+        DefaultValue::Default(tn) => match &tn.ty {
+            Type::UInt8
+            | Type::UInt16
+            | Type::UInt32
+            | Type::UInt64
+            | Type::Int8
+            | Type::Int16
+            | Type::Int32
+            | Type::Int64 => "0".to_string(),
+            Type::Float32 | Type::Float64 => "0.0".to_string(),
+            Type::Boolean => "False".to_string(),
+            Type::Bytes => "b\"\"".to_string(),
+            Type::String => "\"\"".to_string(),
+            Type::Record { .. }
+            | Type::Enum { .. }
+            | Type::Interface { .. }
+            | Type::CallbackInterface { .. } => format!("{}()", tn.type_name),
+            Type::Optional { .. } => "None".to_string(),
+            Type::Map { .. } => "{}".to_string(),
+            Type::Sequence { .. } => "[]".to_string(),
+            Type::Custom { builtin, .. } => {
+                return render_default(&DefaultValue::Default(TypeNode {
+                    ty: *builtin.clone(),
+                    ..tn.clone()
+                }))
+                .map_err(|_err| anyhow::anyhow!("Default values not supported for {:?}", tn.ty))
+            }
+            _ => bail!("Default values not supported for {:?}", tn.ty),
+        },
+        // We assume the Literal pass has already run, so `py_lit` already has a value.
+        DefaultValue::Literal(lit) => lit.py_lit.clone(),
+    })
+}
+
+fn render_literal(lit: &Literal) -> Result<String> {
+    Ok(match lit {
+        Literal::Boolean(true) => "True".to_string(),
+        Literal::Boolean(false) => "False".to_string(),
+        Literal::String(s) => format!("\"{s}\""),
+        // https://docs.python.org/3/reference/lexical_analysis.html#integer-literals
+        Literal::Int(i, radix, _) => match radix {
+            Radix::Octal => format!("int(0o{i:o})"),
+            Radix::Decimal => format!("{i}"),
+            Radix::Hexadecimal => format!("{i:#x}"),
+        },
+        Literal::UInt(i, radix, _) => match radix {
+            Radix::Octal => format!("0o{i:o}"),
+            Radix::Decimal => format!("{i}"),
+            Radix::Hexadecimal => format!("{i:#x}"),
+        },
+        Literal::Float(value, _) => value.clone(),
+        Literal::EmptySequence => "[]".to_string(),
+        Literal::EmptyMap => "{}".to_string(),
+        Literal::None => "None".to_string(),
+        Literal::Some { inner } => match **inner {
+            DefaultValue::Literal(ref lit) => render_literal(&lit.lit)?,
+            DefaultValue::Default(..) => render_default(inner)?,
+        },
+        Literal::Enum(variant, ty) => match &ty.ty {
+            Type::Enum { name, .. } => format!("{name}.{variant}"),
+            type_kind => {
+                bail!("Invalid type for enum literal: {type_kind:?}")
+            }
+        },
+    })
+}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/error.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/error.rs
new file mode 100644
index 0000000000000..5f6b2d3a3e4c4
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/error.rs
@@ -0,0 +1,15 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use super::*;
+
+pub fn pass(cb: &mut Callable) -> Result<()> {
+    // normalize the custom type to its builtin type
+    if let Some(node) = cb.throws_type.ty.as_mut() {
+        if let Type::Custom { builtin, .. } = &node.ty {
+            node.ty = *builtin.clone();
+        }
+    }
+    Ok(())
+}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/external_types.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/external_types.rs
new file mode 100644
index 0000000000000..cbf6c822415a4
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/external_types.rs
@@ -0,0 +1,76 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use super::*;
+use indexmap::IndexSet;
+
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
+    let namespace_config = namespace.config.clone();
+    let current_namespace_name = namespace.name.clone();
+    let mut module_imports = IndexSet::new();
+    namespace.visit_mut(|ty: &mut Type| {
+        match ty {
+            Type::Enum {
+                namespace,
+                external_package_name,
+                ..
+            }
+            | Type::Record {
+                namespace,
+                external_package_name,
+                ..
+            }
+            | Type::Interface {
+                namespace,
+                external_package_name,
+                ..
+            }
+            | Type::CallbackInterface {
+                namespace,
+                external_package_name,
+                ..
+            }
+            | Type::Custom {
+                namespace,
+                external_package_name,
+                ..
+            } => {
+                if *namespace != current_namespace_name {
+                    match namespace_config.external_packages.get(namespace) {
+                        None => {
+                            // No configuration, use the module name as a relative import
+                            module_imports.insert(format!(".{namespace}"));
+                            *external_package_name = Some(namespace.clone());
+                        }
+                        Some(value) if value.is_empty() => {
+                            // Empty string, use the module name as an absolute import
+                            module_imports.insert(namespace.clone());
+                            *external_package_name = Some(namespace.clone());
+                        }
+                        Some(package_name) => {
+                            // Package name for configuration, use that name
+                            module_imports.insert(package_name.clone());
+                            *external_package_name = Some(package_name.clone());
+                        }
+                    };
+                }
+            }
+            _ => (),
+        };
+    });
+    // Transform RustBuffer namespaces to concrete Python module names
+    namespace.visit_mut(|ffi_type: &mut FfiType| {
+        if let FfiType::RustBuffer(Some(ref mut namespace)) = ffi_type {
+            match namespace_config.external_packages.get(namespace) {
+                Some(package_name) if !package_name.is_empty() => {
+                    *namespace = package_name.clone();
+                }
+                _ => (),
+            }
+        }
+    });
+
+    namespace.imports.extend(module_imports);
+    Ok(())
+}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/ffi_types.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/ffi_types.rs
new file mode 100644
index 0000000000000..2fc83731b5c68
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/ffi_types.rs
@@ -0,0 +1,67 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use super::*;
+
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
+    let module_name = namespace.name.clone();
+    namespace.visit_mut(|node: &mut FfiTypeNode| {
+        node.type_name = ffi_type_name(&module_name, &node.ty);
+    });
+    namespace.try_visit_mut(|meth: &mut VTableMethod| {
+        meth.ffi_default_value = match &meth.callable.return_type.ty {
+            Some(type_node) => match &type_node.ffi_type.ty {
+                FfiType::UInt8
+                | FfiType::Int8
+                | FfiType::UInt16
+                | FfiType::Int16
+                | FfiType::UInt32
+                | FfiType::Int32
+                | FfiType::UInt64
+                | FfiType::Int64
+                | FfiType::Handle(_) => "0".to_string(),
+                FfiType::Float32 | FfiType::Float64 => "0.0".to_string(),
+                FfiType::RustBuffer(Some(buf_module_name)) if *buf_module_name != module_name => {
+                    format!("{buf_module_name}._UniffiRustBuffer.default()")
+                }
+                FfiType::RustBuffer(_) => "_UniffiRustBuffer.default()".to_string(),
+                ffi_type => bail!("Invalid VTable return type: {ffi_type:?}"),
+            },
+            // When we need to use a value for void returns, we use a `u8` placeholder and `0` as
+            // the default.
+            None => "0".to_string(),
+        };
+        Ok(())
+    })?;
+    Ok(())
+}
+
+fn ffi_type_name(module_name: &str, ffi_type: &FfiType) -> String {
+    match ffi_type {
+        FfiType::Int8 => "ctypes.c_int8".to_string(),
+        FfiType::UInt8 => "ctypes.c_uint8".to_string(),
+        FfiType::Int16 => "ctypes.c_int16".to_string(),
+        FfiType::UInt16 => "ctypes.c_uint16".to_string(),
+        FfiType::Int32 => "ctypes.c_int32".to_string(),
+        FfiType::UInt32 => "ctypes.c_uint32".to_string(),
+        FfiType::Int64 => "ctypes.c_int64".to_string(),
+        FfiType::UInt64 => "ctypes.c_uint64".to_string(),
+        FfiType::Float32 => "ctypes.c_float".to_string(),
+        FfiType::Float64 => "ctypes.c_double".to_string(),
+        FfiType::Handle(_) => "ctypes.c_uint64".to_string(),
+        FfiType::RustBuffer(Some(buf_module_name)) if buf_module_name != module_name => {
+            format!("{buf_module_name}._UniffiRustBuffer")
+        }
+        FfiType::RustBuffer(_) => "_UniffiRustBuffer".to_string(),
+        FfiType::RustCallStatus => "_UniffiRustCallStatus".to_string(),
+        FfiType::ForeignBytes => "_UniffiForeignBytes".to_string(),
+        FfiType::Function(name) => name.0.clone(),
+        FfiType::Struct(name) => name.0.clone(),
+        // Pointer to an `asyncio.EventLoop` instance
+        FfiType::Reference(inner) | FfiType::MutReference(inner) => {
+            format!("ctypes.POINTER({})", ffi_type_name(module_name, inner))
+        }
+        FfiType::VoidPointer => "ctypes.c_void_p".to_string(),
+    }
+}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/interfaces.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/interfaces.rs
new file mode 100644
index 0000000000000..449e03b6706d5
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/interfaces.rs
@@ -0,0 +1,75 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use super::*;
+
+pub fn pass(int: &mut Interface) -> Result<()> {
+    match &int.imp {
+        ObjectImpl::Struct | ObjectImpl::Trait => {
+            // Interface that's only implemented in Rust:
+            //   - Give the interface the main name and append the `Protocol` suffix to the protocol
+            //   - Make the protocol inherit from `typing.Protocol`, since the #2264 doesn't affect
+            //     these interfaces
+            int.protocol = Protocol {
+                name: format!("{}Protocol", int.name),
+                base_classes: vec!["typing.Protocol".to_string()],
+                methods: int.methods.clone(),
+                docstring: int.docstring.clone(),
+            };
+        }
+        ObjectImpl::CallbackTrait => {
+            // Trait interface that can be implemented in Rust or Python
+            //   - Give the protocol the main name and append the `Impl` suffix to the interface
+            //   - Don't make the protocol inherit from `typing.Protocol`.  We're going to inherit
+            //     from it so it's not a typical Python protocol
+            //     (http://github.com/mozilla/uniffi-rs/issues/2264).
+            int.protocol = Protocol {
+                name: int.name.clone(),
+                base_classes: vec![],
+                methods: int.methods.clone(),
+                docstring: int.docstring.clone(),
+            };
+            int.name = format!("{}Impl", int.name);
+        }
+    };
+
+    int.base_classes.push(int.protocol.name.clone());
+    if int.self_type.is_used_as_error {
+        int.base_classes.push("Exception".to_string());
+    }
+    for t in int.trait_impls.iter() {
+        let (name, external_package_name) = match &t.trait_ty.ty {
+            Type::Interface {
+                name,
+                external_package_name,
+                imp,
+                ..
+            } => {
+                // For trait interfaces implement in Rust-only, the protocol has `Protocol` appended.
+                // Trait interfaces with foreign implementations don't have that
+                match imp {
+                    ObjectImpl::Trait => (format!("{name}Protocol"), external_package_name),
+                    ObjectImpl::CallbackTrait => (name.to_string(), external_package_name),
+                    ObjectImpl::Struct => {
+                        bail!("Objects can only inherit from traits, not other objects")
+                    }
+                }
+            }
+
+            Type::CallbackInterface {
+                name,
+                external_package_name,
+                ..
+            } => (name.to_string(), external_package_name),
+            _ => bail!("trait_ty {:?} isn't a trait", t),
+        };
+        let fq = match external_package_name {
+            None => name.clone(),
+            Some(package) => format!("{package}.{name}"),
+        };
+        int.base_classes.push(fq);
+    }
+    int.has_primary_constructor = int.has_descendant(|c: &Callable| c.is_primary_constructor());
+    Ok(())
+}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/mod.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/mod.rs
index df367bd4d25c1..51e3509d0fefc 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/mod.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/mod.rs
@@ -2,10 +2,37 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use crate::pipeline::{general, initial, Pipeline};
+use anyhow::{bail, Result};
+
+pub use crate::pipeline::{general, initial};
+use uniffi_pipeline::{Node, Pipeline};
+mod callback_interfaces;
+mod config;
+mod default;
+mod error;
+mod external_types;
+mod ffi_types;
+mod interfaces;
+mod modules;
+mod names;
+pub mod nodes;
+mod types;
+
+pub use nodes::*;
 
 // For now, this is just the general pipeline.
 // Defining this allows us to use the pipeline CLI to inspect the general pipeline.
-pub fn pipeline() -> Pipeline<initial::Root, general::Root> {
-    general::pipeline()
+pub fn pipeline() -> Pipeline<initial::Root, Root> {
+    general::pipeline("python")
+        .convert_ir_pass::<Root>()
+        .pass(config::pass)
+        .pass(external_types::pass)
+        .pass(names::pass)
+        .pass(interfaces::pass)
+        .pass(modules::pass)
+        .pass(callback_interfaces::pass)
+        .pass(types::pass)
+        .pass(default::pass)
+        .pass(ffi_types::pass)
+        .pass(error::pass)
 }
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/modules.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/modules.rs
new file mode 100644
index 0000000000000..9498df69d6450
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/modules.rs
@@ -0,0 +1,46 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+*
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+pub use super::*;
+use indexmap::IndexSet;
+
+pub fn pass(root: &mut Root) -> Result<()> {
+    let default_cdylib = root.cdylib.as_deref().unwrap_or("uniffi").to_string();
+    root.try_visit_mut(|namespace: &mut Namespace| {
+        namespace.cdylib_name = match &namespace.config.cdylib_name {
+            Some(cdylib) => cdylib.clone(),
+            None => default_cdylib.to_string(),
+        };
+
+        namespace.has_async_fns = namespace.has_descendant(|callable: &Callable| callable.is_async);
+        namespace.has_callback_interface =
+            namespace.has_descendant_with_type::<CallbackInterface>();
+        namespace.has_async_callback_method = namespace.has_descendant(|vtable: &VTable| {
+            vtable.has_descendant(|callable: &Callable| callable.is_async)
+        });
+
+        let mut module_imports = IndexSet::new();
+        namespace.visit(|custom_type_config: &CustomTypeConfig| {
+            if let Some(imports) = &custom_type_config.imports {
+                module_imports.extend(imports.clone());
+            }
+        });
+        namespace.imports.extend(module_imports);
+
+        let mut exported_names = vec!["InternalError".to_string()];
+        namespace.visit(|e: &Enum| exported_names.push(e.name.clone()));
+        namespace.visit(|r: &Record| exported_names.push(r.name.clone()));
+        namespace.visit(|f: &Function| exported_names.push(f.callable.name.clone()));
+        namespace.visit(|i: &Interface| {
+            exported_names.push(i.name.clone());
+            exported_names.push(i.protocol.name.clone());
+        });
+        namespace.visit(|c: &CallbackInterface| exported_names.push(c.name.clone()));
+        namespace.exported_names = exported_names;
+
+        Ok(())
+    })?;
+    Ok(())
+}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/names.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/names.rs
new file mode 100644
index 0000000000000..c09c15fd957ec
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/names.rs
@@ -0,0 +1,141 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use heck::{ToShoutySnakeCase, ToSnakeCase, ToUpperCamelCase};
+use once_cell::sync::Lazy;
+
+use std::collections::HashSet;
+
+use super::*;
+
+// Taken from Python's `keyword.py` module.
+static KEYWORDS: Lazy<HashSet<String>> = Lazy::new(|| {
+    let kwlist = vec![
+        "False",
+        "None",
+        "True",
+        "__peg_parser__",
+        "and",
+        "as",
+        "assert",
+        "async",
+        "await",
+        "break",
+        "class",
+        "continue",
+        "def",
+        "del",
+        "elif",
+        "else",
+        "except",
+        "finally",
+        "for",
+        "from",
+        "global",
+        "if",
+        "import",
+        "in",
+        "is",
+        "lambda",
+        "nonlocal",
+        "not",
+        "or",
+        "pass",
+        "raise",
+        "return",
+        "try",
+        "while",
+        "with",
+        "yield",
+    ];
+    HashSet::from_iter(kwlist.into_iter().map(|s| s.to_string()))
+});
+
+/// Convert strings to follow Python naming guidelines
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
+    namespace.visit_mut(|struct_name: &mut FfiStructName| {
+        struct_name.0 = format!("_Uniffi{}", struct_name.0.to_upper_camel_case())
+    });
+    namespace.visit_mut(|function_type: &mut FfiFunctionTypeName| {
+        function_type.0 = format!("_UNIFFI_{}", function_type.0.to_shouty_snake_case())
+    });
+    namespace.visit_mut(|rec: &mut Record| {
+        rec.name = fixup_keyword(rec.name.to_upper_camel_case());
+    });
+    namespace.visit_mut(|e: &mut Enum| {
+        e.name = fixup_keyword(e.name.to_upper_camel_case());
+        match &e.shape {
+            EnumShape::Error { .. } => {
+                e.visit_mut(|v: &mut Variant| {
+                    v.name = fixup_keyword(v.name.to_upper_camel_case());
+                });
+            }
+            _ => {
+                e.visit_mut(|v: &mut Variant| {
+                    v.name = fixup_keyword(v.name.to_shouty_snake_case());
+                });
+            }
+        }
+    });
+    namespace.visit_mut(|int: &mut Interface| {
+        int.name = fixup_keyword(int.name.to_upper_camel_case());
+    });
+    namespace.visit_mut(|cbi: &mut CallbackInterface| {
+        cbi.name = fixup_keyword(cbi.name.to_upper_camel_case());
+    });
+    namespace.visit_mut(|custom: &mut CustomType| {
+        custom.name = fixup_keyword(custom.name.to_upper_camel_case());
+    });
+    namespace.visit_mut(|arg: &mut Argument| {
+        arg.name = fixup_keyword(arg.name.to_snake_case());
+    });
+    namespace.visit_mut(|field: &mut Field| {
+        field.name = fixup_keyword(field.name.to_snake_case());
+    });
+    namespace.visit_mut(|callable: &mut Callable| {
+        if callable.is_primary_constructor() {
+            callable.name = "__init__".to_string()
+        } else {
+            callable.name = fixup_keyword(callable.name.to_snake_case());
+        }
+    });
+    namespace.visit_mut(|ty: &mut Type| {
+        match ty {
+            Type::Enum { name, .. }
+            | Type::Record { name, .. }
+            | Type::Interface { name, .. }
+            | Type::CallbackInterface { name, .. }
+            | Type::Custom { name, .. } => {
+                *name = fixup_keyword(name.to_upper_camel_case());
+            }
+            _ => (),
+        };
+    });
+    namespace.try_visit_mut(|lit: &mut Literal| {
+        if let Literal::Enum(variant, ty) = lit {
+            match &mut ty.ty {
+                Type::Enum { name, .. } => {
+                    *name = fixup_keyword(name.to_upper_camel_case());
+                    // Assume enum literals are not error types and use `to_shouty_snake_case()`
+                    // rather than `to_upper_camel_case()`
+                    *variant = fixup_keyword(variant.to_shouty_snake_case());
+                }
+                type_kind => {
+                    bail!("Invalid type for enum literal: {type_kind:?}")
+                }
+            }
+        }
+        Ok(())
+    })?;
+    Ok(())
+}
+
+/// Fixup a name by ensuring it's not a keyword
+fn fixup_keyword(name: String) -> String {
+    if KEYWORDS.contains(&name) {
+        format!("_{name}")
+    } else {
+        name
+    }
+}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/nodes.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/nodes.rs
new file mode 100644
index 0000000000000..67548e6876b81
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/nodes.rs
@@ -0,0 +1,676 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use askama::Template;
+use heck::ToSnakeCase;
+use indexmap::{IndexMap, IndexSet};
+use serde::Deserialize;
+
+use crate::bindings::python::filters;
+use uniffi_pipeline::Node;
+
+/// Initial IR, this stores the metadata and other data
+#[derive(Debug, Clone, Node)]
+pub struct Root {
+    /// In library mode, the library path the user passed to us
+    pub cdylib: Option<String>,
+    pub namespaces: IndexMap<String, Namespace>,
+}
+
+#[derive(Debug, Clone, Node, Template)]
+#[template(syntax = "py", escape = "none", path = "Module.py")]
+pub struct Namespace {
+    pub name: String,
+    pub crate_name: String,
+    pub config_toml: Option<String>,
+    pub config: PythonConfig,
+    pub docstring: Option<String>,
+    pub functions: Vec<Function>,
+    pub type_definitions: Vec<TypeDefinition>,
+    pub ffi_definitions: IndexSet<FfiDefinition>,
+    pub checksums: Vec<Checksum>,
+    pub ffi_rustbuffer_alloc: RustFfiFunctionName,
+    pub ffi_rustbuffer_from_bytes: RustFfiFunctionName,
+    pub ffi_rustbuffer_free: RustFfiFunctionName,
+    pub ffi_rustbuffer_reserve: RustFfiFunctionName,
+    pub ffi_uniffi_contract_version: RustFfiFunctionName,
+    // Correct contract version value
+    pub correct_contract_version: String,
+    pub string_type_node: TypeNode,
+    pub cdylib_name: String,
+    pub has_async_fns: bool,
+    pub has_callback_interface: bool,
+    pub has_async_callback_method: bool,
+    pub imports: Vec<String>,
+    pub exported_names: Vec<String>,
+}
+
+// Config options to customize the generated python.
+#[derive(Debug, Clone, Deserialize, Node)]
+pub struct PythonConfig {
+    pub(super) cdylib_name: Option<String>,
+    #[serde(default)]
+    pub custom_types: IndexMap<String, CustomTypeConfig>,
+    #[serde(default)]
+    pub external_packages: IndexMap<String, String>,
+}
+
+#[derive(Debug, Clone, Deserialize, Node)]
+#[serde(default)]
+pub struct CustomTypeConfig {
+    pub imports: Option<Vec<String>>,
+    pub type_name: Option<String>, // b/w compat alias for lift
+    pub into_custom: String,       // b/w compat alias for lift
+    pub lift: String,
+    pub from_custom: String, // b/w compat alias for lower
+    pub lower: String,
+}
+
+#[derive(Debug, Clone, Node)]
+pub struct Function {
+    pub callable: Callable,
+    pub docstring: Option<String>,
+}
+
+#[derive(Debug, Clone, Node)]
+pub enum TypeDefinition {
+    Interface(Interface),
+    CallbackInterface(CallbackInterface),
+    Record(Record),
+    Enum(Enum),
+    Custom(CustomType),
+    /// Type that doesn't contain any other type
+    Simple(TypeNode),
+    /// Compound types
+    Optional(OptionalType),
+    Sequence(SequenceType),
+    Map(MapType),
+    /// User types that are defined in another crate
+    External(ExternalType),
+}
+
+#[derive(Debug, Clone, Node)]
+pub struct Constructor {
+    pub callable: Callable,
+    pub docstring: Option<String>,
+}
+
+#[derive(Debug, Clone, Node, Eq, PartialEq, Hash)]
+pub struct Method {
+    pub callable: Callable,
+    pub docstring: Option<String>,
+}
+
+/// Common data from Function/Method/Constructor
+#[derive(Debug, Clone, Node, Eq, PartialEq, Hash)]
+pub struct Callable {
+    pub name: String,
+    pub is_async: bool,
+    pub async_data: Option<AsyncData>,
+    pub kind: CallableKind,
+    pub arguments: Vec<Argument>,
+    pub return_type: ReturnType,
+    pub throws_type: ThrowsType,
+    pub checksum: Option<u16>,
+    pub ffi_func: RustFfiFunctionName,
+}
+
+#[allow(clippy::large_enum_variant)]
+#[derive(Debug, Clone, Node, Eq, PartialEq, Hash)]
+pub enum CallableKind {
+    /// Toplevel function
+    Function,
+    /// Interface/Trait interface method
+    Method { self_type: TypeNode },
+    /// Interface constructor
+    Constructor {
+        interface_name: String,
+        primary: bool,
+    },
+    /// Method inside a VTable or a CallbackInterface
+    ///
+    /// For trait interfaces this only applies to the Callables inside the `vtable.methods` field.
+    /// Callables inside `Interface::methods` will still be `Callable::Method`.
+    VTableMethod { trait_name: String },
+}
+
+#[derive(Debug, Clone, Node, Eq, PartialEq, Hash)]
+pub struct ReturnType {
+    pub ty: Option<TypeNode>,
+    pub type_name: String,
+}
+
+#[derive(Debug, Clone, Node, Eq, PartialEq, Hash)]
+pub struct ThrowsType {
+    pub ty: Option<TypeNode>,
+}
+
+#[derive(Debug, Clone, Node, Eq, PartialEq, Hash)]
+pub struct AsyncData {
+    // FFI types for async Rust functions
+    pub ffi_rust_future_poll: RustFfiFunctionName,
+    pub ffi_rust_future_cancel: RustFfiFunctionName,
+    pub ffi_rust_future_free: RustFfiFunctionName,
+    pub ffi_rust_future_complete: RustFfiFunctionName,
+    // FFI types for async foreign functions
+    pub ffi_foreign_future_complete: FfiFunctionTypeName,
+    pub ffi_foreign_future_result: FfiStructName,
+}
+
+#[derive(Debug, Clone, Node, Eq, PartialEq, Hash)]
+pub struct Argument {
+    pub name: String,
+    pub ty: TypeNode,
+    pub optional: bool,
+    pub default: Option<DefaultValueNode>,
+}
+
+#[derive(Debug, Clone, Node, Eq, PartialEq, Hash)]
+pub enum DefaultValue {
+    Default(TypeNode),
+    Literal(LiteralNode),
+}
+
+#[derive(Debug, Clone, Node, Eq, PartialEq, Hash)]
+pub struct DefaultValueNode {
+    #[node(wraps)]
+    pub default: DefaultValue,
+    /// The default value rendered as a Python string
+    pub py_default: String,
+    /// The default value as specified as a literal in function args.
+    pub arg_literal: String,
+    /// Convenience - whether the arg literal is our literal.
+    pub is_arg_literal: bool,
+}
+
+#[derive(Debug, Clone, Node, Eq, PartialEq, Hash)]
+pub struct LiteralNode {
+    pub lit: Literal,
+    /// The literal rendered as a Python string
+    pub py_lit: String,
+}
+
+#[derive(Debug, Clone, Node, Eq, PartialEq, Hash)]
+pub enum Literal {
+    Boolean(bool),
+    String(String),
+    // Integers are represented as the widest representation we can.
+    // Number formatting vary with language and radix, so we avoid a lot of parsing and
+    // formatting duplication by using only signed and unsigned variants.
+    UInt(u64, Radix, TypeNode),
+    Int(i64, Radix, TypeNode),
+    // Pass the string representation through as typed in the UDL.
+    // This avoids a lot of uncertainty around precision and accuracy,
+    // though bindings for languages less sophisticated number parsing than WebIDL
+    // will have to do extra work.
+    Float(String, TypeNode),
+    Enum(String, TypeNode),
+    EmptySequence,
+    EmptyMap,
+    None,
+    Some { inner: Box<DefaultValue> },
+}
+
+// Represent the radix of integer literal values.
+// We preserve the radix into the generated bindings for readability reasons.
+#[derive(Debug, Clone, Node, Eq, PartialEq, Hash)]
+pub enum Radix {
+    Decimal = 10,
+    Octal = 8,
+    Hexadecimal = 16,
+}
+
+#[derive(Debug, Clone, Node)]
+pub struct Record {
+    pub name: String,
+    pub fields_kind: FieldsKind,
+    pub fields: Vec<Field>,
+    pub docstring: Option<String>,
+    pub self_type: TypeNode,
+    pub constructors: Vec<Constructor>,
+    pub methods: Vec<Method>,
+    pub uniffi_trait_methods: UniffiTraitMethods,
+}
+
+#[derive(Debug, Clone, Node)]
+pub enum FieldsKind {
+    Unit,
+    Named,
+    Unnamed,
+}
+
+#[derive(Debug, Clone, Node)]
+pub struct Field {
+    pub name: String,
+    pub ty: TypeNode,
+    pub default: Option<DefaultValueNode>,
+    pub docstring: Option<String>,
+}
+
+#[derive(Debug, Clone, Node)]
+pub enum EnumShape {
+    Enum,
+    Error { flat: bool },
+}
+
+#[derive(Debug, Clone, Node)]
+pub struct Enum {
+    pub name: String,
+    /// Is this a "flat" enum -- one with no associated data
+    pub is_flat: bool,
+    pub shape: EnumShape,
+    pub variants: Vec<Variant>,
+    pub meta_discr_type: Option<TypeNode>,
+    pub discr_type: TypeNode,
+    pub docstring: Option<String>,
+    pub self_type: TypeNode,
+    pub constructors: Vec<Constructor>,
+    pub methods: Vec<Method>,
+    pub uniffi_trait_methods: UniffiTraitMethods,
+}
+
+#[derive(Debug, Clone, Node)]
+pub struct Variant {
+    pub name: String,
+    pub meta_discr: Option<LiteralNode>,
+    pub discr: LiteralNode,
+    pub fields_kind: FieldsKind,
+    pub fields: Vec<Field>,
+    pub docstring: Option<String>,
+}
+
+#[derive(Debug, Clone, Node)]
+pub struct Interface {
+    pub name: String,
+    pub base_classes: Vec<String>,
+    pub protocol: Protocol,
+    pub docstring: Option<String>,
+    pub constructors: Vec<Constructor>,
+    pub has_primary_constructor: bool,
+    pub methods: Vec<Method>,
+    pub uniffi_trait_methods: UniffiTraitMethods,
+    pub trait_impls: Vec<ObjectTraitImpl>,
+    pub imp: ObjectImpl,
+    pub self_type: TypeNode,
+    pub vtable: Option<VTable>,
+    pub ffi_func_clone: RustFfiFunctionName,
+    pub ffi_func_free: RustFfiFunctionName,
+}
+
+#[derive(Debug, Clone, Node)]
+pub struct Protocol {
+    pub name: String,
+    pub base_classes: Vec<String>,
+    pub docstring: Option<String>,
+    pub methods: Vec<Method>,
+}
+
+#[derive(Debug, Clone, Node)]
+pub struct CallbackInterface {
+    pub name: String,
+    pub docstring: Option<String>,
+    pub protocol: Protocol,
+    pub vtable: VTable,
+    pub methods: Vec<Method>,
+    pub self_type: TypeNode,
+}
+
+#[derive(Debug, Clone, Node)]
+pub struct VTable {
+    /// Vtable struct.  This has field for each callback interface method that stores a function
+    /// pointer for that method.
+    pub struct_type: FfiTypeNode,
+    /// Name of the interface/callback interface that this vtable is for
+    pub interface_name: String,
+    /// Rust FFI function to initialize the vtable.
+    ///
+    /// Foreign code should call this function, passing it a pointer to the VTable struct.
+    pub init_fn: RustFfiFunctionName,
+    pub clone_fn_type: FfiFunctionTypeName,
+    pub free_fn_type: FfiFunctionTypeName,
+    pub methods: Vec<VTableMethod>,
+}
+
+/// Single method in a vtable
+#[derive(Debug, Clone, Node)]
+pub struct VTableMethod {
+    pub callable: Callable,
+    /// FfiType::Function type that corresponds to the method
+    pub ffi_type: FfiTypeNode,
+    pub ffi_default_value: String,
+}
+
+#[derive(Debug, Clone, Node)]
+pub struct ObjectTraitImpl {
+    pub ty: TypeNode,
+    pub trait_ty: TypeNode,
+}
+
+#[derive(Debug, Clone, Node)]
+pub struct CustomType {
+    pub name: String,
+    pub builtin: TypeNode,
+    pub docstring: Option<String>,
+    pub config: Option<CustomTypeConfig>,
+    pub self_type: TypeNode,
+}
+
+#[derive(Debug, Clone, Node)]
+pub struct OptionalType {
+    pub inner: TypeNode,
+    pub self_type: TypeNode,
+}
+
+#[derive(Debug, Clone, Node)]
+pub struct SequenceType {
+    pub inner: TypeNode,
+    pub self_type: TypeNode,
+}
+
+#[derive(Debug, Clone, Node)]
+pub struct MapType {
+    pub key: TypeNode,
+    pub value: TypeNode,
+    pub self_type: TypeNode,
+}
+
+#[derive(Debug, Clone, Node)]
+pub struct ExternalType {
+    pub namespace: String,
+    pub name: String,
+    pub self_type: TypeNode,
+}
+
+/// Wrap `Type` so that we can add extra fields that are set for all variants.
+#[derive(Debug, Clone, Node, Eq, PartialEq, Hash)]
+pub struct TypeNode {
+    pub ty: Type,
+    pub canonical_name: String,
+    pub is_used_as_error: bool,
+    pub type_name: String,
+    pub ffi_converter_name: String,
+    pub ffi_type: FfiTypeNode,
+}
+
+/// Like `TypeNode` but for FFI types.
+///
+/// This exists so that language bindings generators can add extra fields
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
+pub struct FfiTypeNode {
+    pub ty: FfiType,
+    pub type_name: String,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Node)]
+pub enum Type {
+    // Primitive types.
+    UInt8,
+    Int8,
+    UInt16,
+    Int16,
+    UInt32,
+    Int32,
+    UInt64,
+    Int64,
+    Float32,
+    Float64,
+    Boolean,
+    String,
+    Bytes,
+    Timestamp,
+    Duration,
+    // Structurally recursive types.
+    Optional {
+        inner_type: Box<Type>,
+    },
+    Sequence {
+        inner_type: Box<Type>,
+    },
+    Map {
+        key_type: Box<Type>,
+        value_type: Box<Type>,
+    },
+    // User defined types in the API
+    Interface {
+        namespace: String,
+        /// Python package name for external types
+        external_package_name: Option<String>,
+        name: String,
+        imp: ObjectImpl,
+    },
+    Record {
+        namespace: String,
+        external_package_name: Option<String>,
+        name: String,
+    },
+    Enum {
+        namespace: String,
+        external_package_name: Option<String>,
+        name: String,
+    },
+    CallbackInterface {
+        namespace: String,
+        external_package_name: Option<String>,
+        name: String,
+    },
+    Custom {
+        namespace: String,
+        external_package_name: Option<String>,
+        name: String,
+        builtin: Box<Type>,
+    },
+}
+
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
+pub enum ObjectImpl {
+    // A single Rust type
+    Struct,
+    // A trait that's can be implemented by Rust types
+    Trait,
+    // A trait + a callback interface -- can be implemented by both Rust and foreign types.
+    CallbackTrait,
+}
+
+/// flattened uniffi_traits.
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
+pub struct UniffiTraitMethods {
+    pub debug_fmt: Option<Method>,
+    pub display_fmt: Option<Method>,
+    pub eq_eq: Option<Method>,
+    pub eq_ne: Option<Method>,
+    pub hash_hash: Option<Method>,
+    pub ord_cmp: Option<Method>,
+}
+
+#[derive(Debug, Clone, Node, Eq, PartialEq, Hash)]
+pub enum FfiDefinition {
+    /// FFI Function exported in the Rust library
+    RustFunction(FfiFunction),
+    /// FFI Function definition used in the interface, language, for example a callback interface method.
+    FunctionType(FfiFunctionType),
+    /// Struct definition used in the interface, for example a callback interface Vtable.
+    Struct(FfiStruct),
+}
+
+/// Name of a FFI function from the Rust library
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
+pub struct RustFfiFunctionName(pub String);
+
+/// Name of an FfiStruct
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
+pub struct FfiStructName(pub String);
+
+/// Name of an FfiFunctionType (i.e. a function pointer type)
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
+pub struct FfiFunctionTypeName(pub String);
+
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
+pub struct FfiFunction {
+    pub name: RustFfiFunctionName,
+    pub is_async: bool,
+    pub async_data: Option<AsyncData>,
+    pub arguments: Vec<FfiArgument>,
+    pub return_type: FfiReturnType,
+    pub has_rust_call_status_arg: bool,
+    pub kind: FfiFunctionKind,
+}
+
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
+pub enum FfiFunctionKind {
+    Scaffolding,
+    ObjectClone,
+    ObjectFree,
+    RustFuturePoll,
+    RustFutureComplete,
+    RustFutureCancel,
+    RustFutureFree,
+    RustBufferFromBytes,
+    RustBufferFree,
+    RustBufferAlloc,
+    RustBufferReserve,
+    RustVtableInit,
+    UniffiContractVersion,
+    Checksum,
+}
+
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
+pub struct FfiFunctionType {
+    pub name: FfiFunctionTypeName,
+    pub arguments: Vec<FfiArgument>,
+    pub return_type: FfiReturnType,
+    pub has_rust_call_status_arg: bool,
+}
+
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
+pub struct FfiReturnType {
+    pub ty: Option<FfiTypeNode>,
+}
+
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
+pub struct FfiStruct {
+    pub name: FfiStructName,
+    pub fields: Vec<FfiField>,
+}
+
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
+pub struct FfiField {
+    pub name: String,
+    pub ty: FfiTypeNode,
+}
+
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
+pub struct FfiArgument {
+    pub name: String,
+    pub ty: FfiTypeNode,
+}
+
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
+pub enum FfiType {
+    // N.B. there are no booleans at this layer, since they cause problems for JNA.
+    UInt8,
+    Int8,
+    UInt16,
+    Int16,
+    UInt32,
+    Int32,
+    UInt64,
+    Int64,
+    Float32,
+    Float64,
+    /// A byte buffer allocated by rust, and owned by whoever currently holds it.
+    /// If you've got one of these, you must either call the appropriate rust function to free it
+    /// or pass it to someone that will.
+    ///
+    /// For user-defined types like Record, Enum, CustomType, etc., the inner value will be the
+    /// module name for that type.  This is needed for some languages, because each module
+    /// defines a different RustBuffer type and using the wrong one will result in a type
+    /// error.
+    ///
+    /// For builtin types like String, this is always None.  It's safe to assume that the
+    /// RustBuffer is for the local module -- at least this has been true for all our languages
+    /// so far, maybe we should revisit this.
+    RustBuffer(Option<String>),
+    /// A borrowed reference to some raw bytes owned by foreign language code.
+    /// The provider of this reference must keep it alive for the duration of the receiving call.
+    ForeignBytes,
+    /// Value for a FfiDefinition::FunctionType.
+    Function(FfiFunctionTypeName),
+    /// Pointer to a FFI struct (e.g. a VTable).  The inner value matches one of the struct
+    /// definitions in [crate::ComponentInterface::ffi_definitions].
+    Struct(FfiStructName),
+    /// Opaque 64-bit handle
+    ///
+    /// These are used to pass objects across the FFI.
+    Handle(HandleKind),
+    RustCallStatus,
+    /// Const pointer to an FfiType.
+    Reference(Box<FfiType>),
+    /// Mutable pointer to an FfiType.
+    MutReference(Box<FfiType>),
+    /// Opaque pointer
+    VoidPointer,
+}
+
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
+pub enum HandleKind {
+    RustFuture,
+    ForeignFuture,
+    ForeignFutureCallbackData,
+    StructInterface {
+        module_name: String,
+        interface_name: String,
+    },
+    TraitInterface {
+        module_name: String,
+        interface_name: String,
+    },
+}
+
+#[derive(Debug, Clone, Node)]
+pub struct Checksum {
+    pub fn_name: RustFfiFunctionName,
+    pub checksum: u16,
+}
+
+impl Callable {
+    pub fn is_method(&self) -> bool {
+        matches!(self.kind, CallableKind::Method { .. })
+    }
+
+    pub fn self_type(&self) -> Option<TypeNode> {
+        match &self.kind {
+            CallableKind::Method { self_type, .. } => Some(self_type.clone()),
+            _ => None,
+        }
+    }
+
+    pub fn is_primary_constructor(&self) -> bool {
+        matches!(self.kind, CallableKind::Constructor { primary: true, .. })
+    }
+}
+
+impl CustomTypeConfig {
+    fn lift(&self, name: &str) -> String {
+        let converter = if self.lift.is_empty() {
+            &self.into_custom
+        } else {
+            &self.lift
+        };
+        converter.replace("{}", name)
+    }
+    fn lower(&self, name: &str) -> String {
+        let converter = if self.lower.is_empty() {
+            &self.from_custom
+        } else {
+            &self.lower
+        };
+        converter.replace("{}", name)
+    }
+}
+
+impl Variant {
+    fn has_unnamed_fields(&self) -> bool {
+        matches!(self.fields_kind, FieldsKind::Unnamed)
+    }
+}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/types.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/types.rs
new file mode 100644
index 0000000000000..b331074ac54b6
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/pipeline/types.rs
@@ -0,0 +1,104 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use super::*;
+
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
+    namespace.visit_mut(|ty: &mut TypeNode| {
+        let package_name = match &ty.ty {
+            Type::Enum {
+                external_package_name,
+                ..
+            }
+            | Type::Record {
+                external_package_name,
+                ..
+            }
+            | Type::Interface {
+                external_package_name,
+                ..
+            }
+            | Type::CallbackInterface {
+                external_package_name,
+                ..
+            }
+            | Type::Custom {
+                external_package_name,
+                ..
+            } => external_package_name.as_ref(),
+            _ => None,
+        };
+        if let Some(package_name) = package_name {
+            ty.ffi_converter_name =
+                format!("{package_name}._UniffiFfiConverter{}", ty.canonical_name);
+        } else {
+            ty.ffi_converter_name = format!("_UniffiFfiConverter{}", ty.canonical_name);
+        }
+        ty.type_name = type_name(&ty.ty);
+    });
+    namespace.visit_mut(|return_ty: &mut ReturnType| {
+        return_ty.type_name = match &return_ty.ty {
+            Some(type_node) => type_node.type_name.clone(),
+            None => "None".to_string(),
+        }
+    });
+    Ok(())
+}
+
+fn type_name(ty: &Type) -> String {
+    match ty {
+        Type::Boolean => "bool".to_string(),
+        Type::String => "str".to_string(),
+        Type::Bytes => "bytes".to_string(),
+        Type::Int8 => "int".to_string(),
+        Type::Int16
+        | Type::Int32
+        | Type::Int64
+        | Type::UInt8
+        | Type::UInt16
+        | Type::UInt32
+        | Type::UInt64 => "int".to_string(),
+        Type::Duration => "Duration".to_string(),
+        Type::Timestamp => "Timestamp".to_string(),
+        Type::Float32 | Type::Float64 => "float".to_string(),
+        Type::Interface {
+            external_package_name,
+            name,
+            ..
+        }
+        | Type::Record {
+            external_package_name,
+            name,
+            ..
+        }
+        | Type::Enum {
+            external_package_name,
+            name,
+            ..
+        }
+        | Type::CallbackInterface {
+            external_package_name,
+            name,
+            ..
+        }
+        | Type::Custom {
+            external_package_name,
+            name,
+            ..
+        } => match external_package_name {
+            None => name.clone(),
+            Some(package) => format!("{package}.{name}"),
+        },
+        Type::Optional { inner_type } => {
+            format!("typing.Optional[{}]", type_name(inner_type))
+        }
+        Type::Sequence { inner_type } => {
+            format!("typing.List[{}]", type_name(inner_type))
+        }
+        Type::Map {
+            key_type,
+            value_type,
+        } => format!("dict[{}, {}]", type_name(key_type), type_name(value_type)),
+    }
+}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Async.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Async.py
index c80ac0c3f99c4..f978150f1ffea 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Async.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Async.py
@@ -1,6 +1,6 @@
 # RustFuturePoll values
 _UNIFFI_RUST_FUTURE_POLL_READY = 0
-_UNIFFI_RUST_FUTURE_POLL_MAYBE_READY = 1
+_UNIFFI_RUST_FUTURE_POLL_WAKE = 1
 
 # Stores futures for _uniffi_continuation_callback
 _UniffiContinuationHandleMap = _UniffiHandleMap()
@@ -62,53 +62,67 @@ async def _uniffi_rust_call_async(rust_future, ffi_poll, ffi_complete, ffi_free,
     finally:
         ffi_free(rust_future)
 
-{%- if ci.has_async_callback_interface_definition() %}
-def _uniffi_trait_interface_call_async(make_call, handle_success, handle_error):
+{%- if has_async_callback_method %}
+def _uniffi_trait_interface_call_async(make_call, uniffi_out_dropped_callback, handle_success, handle_error):
     async def make_call_and_call_callback():
+        # Note: it's important we call either `handle_success` or `handle_error` exactly once.  Each
+        # call consumes an Arc reference, which means there should be no possibility of a double
+        # call.  The following code is structured so that will will never call both `handle_success`
+        # and `handle_error`, even in the face of weird exceptions.
+        #
+        # In extreme circumstances we may not call either, for example if we fail to make the ctypes
+        # call to `handle_success`.  This means we will leak the Arc reference, which is better than
+        # double-freeing it.
         try:
-            handle_success(await make_call())
+            call_result = await make_call()
         except Exception as e:
             print("UniFFI: Unhandled exception in trait interface call", file=sys.stderr)
             traceback.print_exc(file=sys.stderr)
             handle_error(
                 _UniffiRustCallStatus.CALL_UNEXPECTED_ERROR,
-                {{ Type::String.borrow()|lower_fn }}(repr(e)),
+                {{ string_type_node.ffi_converter_name }}.lower(repr(e)),
             )
+        else:
+            handle_success(call_result)
     eventloop = _uniffi_get_event_loop()
     task = asyncio.run_coroutine_threadsafe(make_call_and_call_callback(), eventloop)
     handle = _UNIFFI_FOREIGN_FUTURE_HANDLE_MAP.insert((eventloop, task))
-    return _UniffiForeignFuture(handle, _uniffi_foreign_future_free)
+    uniffi_out_dropped_callback[0] = _UniffiForeignFutureDroppedCallbackStruct(handle, _uniffi_future_dropped_callback)
 
-def _uniffi_trait_interface_call_async_with_error(make_call, handle_success, handle_error, error_type, lower_error):
+def _uniffi_trait_interface_call_async_with_error(make_call, uniffi_out_dropped_callback, handle_success, handle_error, error_type, lower_error):
     async def make_call_and_call_callback():
+        # See the note in _uniffi_trait_interface_call_async for details on `handle_success` and
+        # `handle_error`.
         try:
             try:
-                handle_success(await make_call())
+                call_result = await make_call()
             except error_type as e:
                 handle_error(
                     _UniffiRustCallStatus.CALL_ERROR,
                     lower_error(e),
                 )
+            else:
+                handle_success(call_result)
         except Exception as e:
             print("UniFFI: Unhandled exception in trait interface call", file=sys.stderr)
             traceback.print_exc(file=sys.stderr)
             handle_error(
                 _UniffiRustCallStatus.CALL_UNEXPECTED_ERROR,
-                {{ Type::String.borrow()|lower_fn }}(repr(e)),
+                {{ string_type_node.ffi_converter_name }}.lower(repr(e)),
             )
     eventloop = _uniffi_get_event_loop()
     task = asyncio.run_coroutine_threadsafe(make_call_and_call_callback(), eventloop)
     handle = _UNIFFI_FOREIGN_FUTURE_HANDLE_MAP.insert((eventloop, task))
-    return _UniffiForeignFuture(handle, _uniffi_foreign_future_free)
+    uniffi_out_dropped_callback[0] = _UniffiForeignFutureDroppedCallbackStruct(handle, _uniffi_future_dropped_callback)
 
 _UNIFFI_FOREIGN_FUTURE_HANDLE_MAP = _UniffiHandleMap()
 
-@_UNIFFI_FOREIGN_FUTURE_FREE
-def _uniffi_foreign_future_free(handle):
+@_UNIFFI_FOREIGN_FUTURE_DROPPED_CALLBACK
+def _uniffi_future_dropped_callback(handle):
     (eventloop, task) = _UNIFFI_FOREIGN_FUTURE_HANDLE_MAP.remove(handle)
-    eventloop.call_soon(_uniffi_foreign_future_do_free, task)
+    eventloop.call_soon(_uniffi_cancel_task, task)
 
-def _uniffi_foreign_future_do_free(task):
+def _uniffi_cancel_task(task):
     if not task.done():
         task.cancel()
 {%- endif %}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CallableArgs.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CallableArgs.py
new file mode 100644
index 0000000000000..cd0d50e8031fe
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CallableArgs.py
@@ -0,0 +1,8 @@
+{%- for arg in callable.arguments -%}
+    {{ arg.name }}
+    {%- match arg.default %}
+    {%- when Some(default) %}: {% if !default.is_arg_literal %}typing.Union[object, {{ arg.ty.type_name }}]{% else %}{{ arg.ty.type_name }}{% endif %} = {{ default.arg_literal }}
+    {%- else %}: {{ arg.ty.type_name }}
+    {%- endmatch %}
+    {%- if !loop.last %},{% endif -%}
+{%- endfor %}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CallableBody.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CallableBody.py
new file mode 100644
index 0000000000000..46c233d01524e
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CallableBody.py
@@ -0,0 +1,71 @@
+{%- for arg in callable.arguments %}
+{%- if let Some(default) = arg.default %}
+{%- if !default.is_arg_literal %}
+if {{ arg.name }} is {{ default.arg_literal }}:
+    {{ arg.name }} = {{ default.py_default }}
+{%- endif %}
+{%- endif %}
+{{ arg.ty.ffi_converter_name }}.check_lower({{ arg.name }})
+{% endfor -%}
+
+ _uniffi_lowered_args = (
+    {%- if let Some(self_type) = callable.self_type() %}
+    {%-     match self_type.ty %}
+    {%-         when Type::Interface { .. } %}
+    self._uniffi_clone_handle(),
+    {%-         else %}
+    {{ self_type.ffi_converter_name }}.lower(self),
+    {%-     endmatch %}
+    {%- endif %}
+    {%- for arg in callable.arguments %}
+    {{ arg.ty.ffi_converter_name }}.lower({{ arg.name }}),
+    {%- endfor %}
+)
+
+{%- match callable.return_type.ty %}
+{%- when Some(return_type) %}
+_uniffi_lift_return = {{ return_type.ffi_converter_name }}.lift
+{%- when None %}
+_uniffi_lift_return = lambda val: None
+{%- endmatch %}
+
+{%- match callable.throws_type.ty %}
+{%- when Some(e) %}
+{%-    match e.ty %}
+{%-    when Type::Enum { .. } %}
+_uniffi_error_converter = {{ e.ffi_converter_name }}
+{%-    when Type::Interface { .. } %}
+_uniffi_error_converter = {{ e.ffi_converter_name }}__as_error
+{%-    else %}
+_uniffi_error_converter = "UNSUPPORTED ERROR TYPE: {{"{:?}"|format(e) }}"
+{%-    endmatch %}
+{%- when None %}
+_uniffi_error_converter = None
+{%- endmatch %}
+
+
+{%- match callable.async_data %}
+{%- when None %}
+_uniffi_ffi_result = _uniffi_rust_call_with_error(
+    _uniffi_error_converter,
+    _UniffiLib.{{ callable.ffi_func.0 }},
+    *_uniffi_lowered_args,
+)
+{%- match callable.kind %}
+{%- when CallableKind::Constructor { primary: true, .. } %}
+self._handle = _uniffi_ffi_result
+{%- when CallableKind::Constructor { primary: false, .. } %}
+return cls._uniffi_make_instance(_uniffi_ffi_result)
+{%- else %}
+return _uniffi_lift_return(_uniffi_ffi_result)
+{%- endmatch %}
+{%- when Some(async_data) %}
+return await _uniffi_rust_call_async(
+    _UniffiLib.{{ callable.ffi_func.0 }}(*_uniffi_lowered_args),
+    _UniffiLib.{{ async_data.ffi_rust_future_poll.0 }},
+    _UniffiLib.{{ async_data.ffi_rust_future_complete.0 }},
+    _UniffiLib.{{ async_data.ffi_rust_future_free.0 }},
+    _uniffi_lift_return,
+    _uniffi_error_converter,
+)
+{%- endmatch %}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CallbackInterfaceImpl.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CallbackInterfaceImpl.py
index b9a0b94b4c1a4..87723f77f34b1 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CallbackInterfaceImpl.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CallbackInterfaceImpl.py
@@ -1,35 +1,41 @@
-{%- let trait_impl=format!("_UniffiTraitImpl{}", name) %}
-
 # Put all the bits inside a class to keep the top-level namespace clean
 class {{ trait_impl }}:
     # For each method, generate a callback function to pass to Rust
-    {%- for (ffi_callback, meth) in vtable_methods.iter() %}
+    {%- for meth in vtable.methods %}
+    {%- let callable = meth.callable %}
 
-    @{{ ffi_callback.name()|ffi_callback_name }}
-    def {{ meth.name() }}(
-            {%- for arg in ffi_callback.arguments() %}
-            {{ arg.name() }},
+    @{{ meth.ffi_type.type_name }}
+    def {{ callable.name }}(
+            uniffi_handle,
+            {%- for arg in callable.arguments %}
+            {{ arg.name }},
             {%- endfor -%}
-            {%- if ffi_callback.has_rust_call_status_arg() %}
+            {%- if !callable.is_async %}
+            uniffi_out_return,
             uniffi_call_status_ptr,
+            {%- else %}
+            uniffi_future_callback,
+            uniffi_callback_data,
+            uniffi_out_dropped_callback,
             {%- endif %}
         ):
         uniffi_obj = {{ ffi_converter_name }}._handle_map.get(uniffi_handle)
         def make_call():
-            args = ({% for arg in meth.arguments() %}{{ arg|lift_fn }}({{ arg.name() }}), {% endfor %})
-            method = uniffi_obj.{{ meth.name() }}
-            return method(*args)
+            uniffi_args = ({% for arg in callable.arguments %}{{ arg.ty.ffi_converter_name }}.lift({{ arg.name }}), {% endfor %})
+            uniffi_method = uniffi_obj.{{ callable.name }}
+            return uniffi_method(*uniffi_args)
 
-        {% if !meth.is_async() %}
-        {%- match meth.return_type() %}
+        {%- match callable.async_data %}
+        {%- when None %}
+        {%- match callable.return_type.ty %}
         {%- when Some(return_type) %}
         def write_return_value(v):
-            uniffi_out_return[0] = {{ return_type|lower_fn }}(v)
+            uniffi_out_return[0] = {{ return_type.ffi_converter_name }}.lower(v)
         {%- when None %}
         write_return_value = lambda v: None
         {%- endmatch %}
 
-        {%- match meth.throws_type() %}
+        {%- match callable.throws_type.ty %}
         {%- when None %}
         _uniffi_trait_interface_call(
                 uniffi_call_status_ptr.contents,
@@ -41,17 +47,17 @@ def write_return_value(v):
                 uniffi_call_status_ptr.contents,
                 make_call,
                 write_return_value,
-                {{ error|type_name }},
-                {{ error|lower_fn }},
+                {{ error.type_name }},
+                {{ error.ffi_converter_name }}.lower,
         )
         {%- endmatch %}
-        {%- else %}
+        {%- when Some(async_data) %}
         def handle_success(return_value):
             uniffi_future_callback(
                 uniffi_callback_data,
-                {{ meth.foreign_future_ffi_result_struct().name()|ffi_struct_name }}(
-                    {%- if let Some(return_type) = meth.return_type() %}
-                    {{ return_type|lower_fn }}(return_value),
+                {{ async_data.ffi_foreign_future_result.0 }}(
+                    {%- if let Some(return_type) = callable.return_type.ty %}
+                    {{ return_type.ffi_converter_name }}.lower(return_value),
                     {%- endif %}
                     _UniffiRustCallStatus.default()
                 )
@@ -60,36 +66,48 @@ def handle_success(return_value):
         def handle_error(status_code, rust_buffer):
             uniffi_future_callback(
                 uniffi_callback_data,
-                {{ meth.foreign_future_ffi_result_struct().name()|ffi_struct_name }}(
-                    {%- match meth.return_type() %}
+                {{ async_data.ffi_foreign_future_result.0 }}(
+                    {%- match callable.return_type.ty %}
                     {%- when Some(return_type) %}
-                    {{ meth.return_type().map(FfiType::from)|ffi_default_value(ci) }},
+                    {{ meth.ffi_default_value }},
                     {%- when None %}
                     {%- endmatch %}
                     _UniffiRustCallStatus(status_code, rust_buffer),
                 )
             )
 
-        {%- match meth.throws_type() %}
+        {%- match callable.throws_type.ty %}
         {%- when None %}
-        uniffi_out_return[0] = _uniffi_trait_interface_call_async(make_call, handle_success, handle_error)
+        _uniffi_trait_interface_call_async(make_call, uniffi_out_dropped_callback, handle_success, handle_error)
         {%- when Some(error) %}
-        uniffi_out_return[0] = _uniffi_trait_interface_call_async_with_error(make_call, handle_success, handle_error, {{ error|type_name }}, {{ error|lower_fn }})
+        _uniffi_trait_interface_call_async_with_error(
+            make_call,
+            uniffi_out_dropped_callback,
+            handle_success,
+            handle_error,
+            {{ error.type_name }},
+            {{ error.ffi_converter_name }}.lower,
+        )
+        {%- endmatch %}
         {%- endmatch %}
-        {%- endif %}
     {%- endfor %}
 
-    @{{ "CallbackInterfaceFree"|ffi_callback_name }}
+    @{{ vtable.free_fn_type.0 }}
     def _uniffi_free(uniffi_handle):
         {{ ffi_converter_name }}._handle_map.remove(uniffi_handle)
 
+    @{{ vtable.clone_fn_type.0 }}
+    def _uniffi_clone(uniffi_handle):
+        return {{ ffi_converter_name }}._handle_map.clone(uniffi_handle)
+
     # Generate the FFI VTable.  This has a field for each callback interface method.
-    _uniffi_vtable = {{ vtable|ffi_type_name(ci) }}(
-        {%- for (_, meth) in vtable_methods.iter() %}
-        {{ meth.name() }},
+    _uniffi_vtable = {{ vtable.struct_type.type_name }}(
+        _uniffi_free,
+        _uniffi_clone,
+        {%- for meth in vtable.methods %}
+        {{ meth.callable.name }},
         {%- endfor %}
-        _uniffi_free
     )
     # Send Rust a pointer to the VTable.  Note: this means we need to keep the struct alive forever,
     # or else bad things will happen when Rust tries to access it.
-    _UniffiLib.{{ ffi_init_callback.name() }}(ctypes.byref(_uniffi_vtable))
+    _UniffiLib.{{ vtable.init_fn.0 }}(ctypes.byref(_uniffi_vtable))
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CallbackInterfaceTemplate.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CallbackInterfaceTemplate.py
index 21e13d9e0e245..c6d6306130ecb 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CallbackInterfaceTemplate.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CallbackInterfaceTemplate.py
@@ -1,11 +1,7 @@
-{%- let cbi = ci.get_callback_interface_definition(name).unwrap() %}
-{%- let ffi_init_callback = cbi.ffi_init_callback() %}
-{%- let protocol_name = type_name.clone() %}
-{%- let protocol_base_class = "typing.Protocol" %}
-{%- let protocol_docstring = cbi.docstring() %}
-{%- let vtable = cbi.vtable() %}
-{%- let methods = cbi.methods() %}
-{%- let vtable_methods = cbi.vtable_methods() %}
+{%- let protocol = cbi.protocol %}
+{%- let vtable = cbi.vtable %}
+{%- let trait_impl=format!("_UniffiTraitImpl{}", cbi.name) %}
+{%- let ffi_converter_name = cbi.self_type.ffi_converter_name %}
 
 {% include "Protocol.py" %}
 {% include "CallbackInterfaceImpl.py" %}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CustomType.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CustomType.py
index 1104f73320d81..04f998aae2e14 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CustomType.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/CustomType.py
@@ -1,59 +1,62 @@
-{%- match python_config.custom_types.get(name.as_str())  %}
+{%- let builtin = custom.builtin %}
+{%- match custom.config %}
 {% when None %}
 {#- No custom type config, just forward all methods to our builtin type #}
-class _UniffiConverterType{{ name }}:
+class {{ custom.self_type.ffi_converter_name }}:
     @staticmethod
     def write(value, buf):
-        {{ builtin|ffi_converter_name }}.write(value, buf)
+        {{ builtin.ffi_converter_name }}.write(value, buf)
 
     @staticmethod
     def read(buf):
-        return {{ builtin|ffi_converter_name }}.read(buf)
+        return {{ builtin.ffi_converter_name }}.read(buf)
 
     @staticmethod
     def lift(value):
-        return {{ builtin|ffi_converter_name }}.lift(value)
+        return {{ builtin.ffi_converter_name }}.lift(value)
 
     @staticmethod
     def check_lower(value):
-        return {{ builtin|ffi_converter_name }}.check_lower(value)
+        return {{ builtin.ffi_converter_name }}.check_lower(value)
 
     @staticmethod
     def lower(value):
-        return {{ builtin|ffi_converter_name }}.lower(value)
+        return {{ builtin.ffi_converter_name }}.lower(value)
+
+{# Render a type alias from the custom type name to the concrete type name #}
+{{ custom.name }} = {{ builtin.type_name -}}
 
 {%- when Some(config) %}
 
-{%- if let Some(imports) = config.imports %}
-{%- for import_name in imports %}
-{{ self.add_import(import_name) }}
-{%- endfor %}
+{%- if let Some(type_name) = config.type_name %}
+{# Render a type alias from the custom type name to the concrete type name #}
+{{ custom.name }} = {{ type_name }}
 {%- endif %}
 
 {#- Custom type config supplied, use it to convert the builtin type #}
-class _UniffiConverterType{{ name }}:
+class {{ custom.self_type.ffi_converter_name }}:
     @staticmethod
     def write(value, buf):
         builtin_value = {{ config.lower("value") }}
-        {{ builtin|write_fn }}(builtin_value, buf)
+        {{ builtin.ffi_converter_name }}.write(builtin_value, buf)
 
     @staticmethod
     def read(buf):
-        builtin_value = {{ builtin|read_fn }}(buf)
+        builtin_value = {{ builtin.ffi_converter_name }}.read(buf)
         return {{ config.lift("builtin_value") }}
 
     @staticmethod
     def lift(value):
-        builtin_value = {{ builtin|lift_fn }}(value)
+        builtin_value = {{ builtin.ffi_converter_name }}.lift(value)
         return {{ config.lift("builtin_value") }}
 
     @staticmethod
     def check_lower(value):
         builtin_value = {{ config.lower("value") }}
-        return {{ builtin|check_lower_fn }}(builtin_value)
+        return {{ builtin.ffi_converter_name }}.check_lower(builtin_value)
 
     @staticmethod
     def lower(value):
         builtin_value = {{ config.lower("value") }}
-        return {{ builtin|lower_fn }}(builtin_value)
+        return {{ builtin.ffi_converter_name }}.lower(builtin_value)
 {%- endmatch %}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/EnumTemplate.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/EnumTemplate.py
index 484aa8b406914..6ac7f46d488ca 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/EnumTemplate.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/EnumTemplate.py
@@ -4,107 +4,160 @@
 # when none of the variants have associated data, or a generic nested-class
 # construct when they do.
 #}
-{% if e.is_flat() %}
+{%- let type_name = e.self_type.type_name %}
+{%- let uniffi_trait_methods = e.uniffi_trait_methods %}
+
+{% if e.is_flat %}
 
 class {{ type_name }}(enum.Enum):
-    {%- call py::docstring(e, 4) %}
-    {%- for variant in e.variants() %}
-    {{ variant.name() }} = {{ e|variant_discr_literal(loop.index0) }}
-    {%- call py::docstring(variant, 4) %}
+    {{ e.docstring|docstring(4) -}}
+    {%- for variant in e.variants %}
+    {{ variant.name }} = {{ variant.discr.py_lit }}
+    {{ variant.docstring|docstring(4) -}}
     {% endfor %}
+
+    {%- for meth in e.methods -%}
+    {%- let callable = meth.callable %}
+    {% if callable.is_async %}async {% endif %}def {{ callable.name }}(self, {% include "CallableArgs.py" %}) -> {{ callable.return_type.type_name }}:
+        {{ meth.docstring|docstring(8) -}}
+        {%- filter indent(8) %}
+        {%- include "CallableBody.py" %}
+        {%- endfilter %}
+    {%- endfor %}
 {% else %}
 
 class {{ type_name }}:
-    {%- call py::docstring(e, 4) %}
+    {{ e.docstring|docstring(4) -}}
     def __init__(self):
         raise RuntimeError("{{ type_name }} cannot be instantiated directly")
 
     # Each enum variant is a nested class of the enum itself.
-    {% for variant in e.variants() -%}
-    class {{ variant.name() }}:
-        {%- call py::docstring(variant, 8) %}
+    {% for variant in e.variants -%}
+    @dataclass
+    class {{ variant.name }}:
+        {{ variant.docstring|docstring(8) -}}
 
-    {%-  if variant.has_nameless_fields() %}
+    {%-  if variant.has_unnamed_fields() %}
         def __init__(self, *values):
-            if len(values) != {{ variant.fields().len() }}:
-                raise TypeError(f"Expected {{ variant.fields().len() }} arguments, found {len(values)}")
+            if len(values) != {{ variant.fields.len() }}:
+                raise TypeError(f"Expected {{ variant.fields.len() }} arguments, found {len(values)}")
             self._values = values
 
         def __getitem__(self, index):
             return self._values[index]
 
+    {% filter indent(8) %}
+    {% include "UniffiTraitImpls.py" %}
+    {% endfilter %}
+
+    {# "builtin" methods not handled by a uniffi_trait #}
+    {%-     if uniffi_trait_methods.display_fmt.is_none() %}
         def __str__(self):
-            return f"{{ type_name }}.{{ variant.name() }}{self._values!r}"
+            return f"{{ type_name }}.{{ variant.name }}{self._values!r}"
+    {%-     endif %}
 
+    {%-     if uniffi_trait_methods.eq_eq.is_none() %}
         def __eq__(self, other):
-            if not other.is_{{ variant.name() }}():
+            if not isinstance(other, {{ type_name }}):
+                return NotImplemented
+            if not other.is_{{ variant.name }}():
                 return False
             return self._values == other._values
-
-    {%-  else -%}
-        {%- for field in variant.fields() %}
-        {{ field.name() }}: "{{ field|type_name }}"
-        {%- call py::docstring(field, 8) %}
-        {%- endfor %}
-
-        def __init__(self,{% for field in variant.fields() %}{{ field.name() }}: "{{- field|type_name }}"{% if loop.last %}{% else %}, {% endif %}{% endfor %}):
-            {%- if variant.has_fields() %}
-            {%- for field in variant.fields() %}
-            self.{{ field.name() }} = {{ field.name() }}
-            {%- endfor %}
+    {%-     endif %}
+
+    {%-  else %}
+        def __init__(self, {% for field in variant.fields %}
+        {{- field.name }}: {{- field.ty.type_name}}
+        {%- if let Some(default) = field.default %} = {{ default.arg_literal }}{% endif %}
+        {%- if !loop.last %}, {% endif %}
+        {%- endfor %}):
+        {%- for field in variant.fields %}
+            {%- match field.default %}
+            {%- when None %}
+            self.{{ field.name }} = {{ field.name }}
+            {%- when Some(default) %}
+            {%- if default.is_arg_literal %}
+            self.{{ field.name }} = {{ field.name }}
             {%- else %}
-            pass
+            if {{ field.name }} is {{ default.arg_literal }}:
+                self.{{ field.name }} = {{ default.py_default }}
+            else:
+                self.{{ field.name }} = {{ field.name }}
             {%- endif %}
+            {%- endmatch %}
+            {# not sure what to do with docstrings - see #2552, suggests putting them after the field init #}
+            {{ field.docstring|docstring(8) -}}
+        {%- endfor %}
+            pass
 
+    {% filter indent(8) %}
+    {%      include "UniffiTraitImpls.py" %}
+    {% endfilter %}
+    {# "builtin" methods not handled by a uniffi_trait #}
+    {%-     if uniffi_trait_methods.display_fmt.is_none() %}
         def __str__(self):
-            return "{{ type_name }}.{{ variant.name() }}({% for field in variant.fields() %}{{ field.name() }}={}{% if loop.last %}{% else %}, {% endif %}{% endfor %})".format({% for field in variant.fields() %}self.{{ field.name() }}{% if loop.last %}{% else %}, {% endif %}{% endfor %})
-
+            return "{{ type_name }}.{{ variant.name }}({% for field in variant.fields %}{{ field.name }}={}{% if loop.last %}{% else %}, {% endif %}{% endfor %})".format({% for field in variant.fields %}self.{{ field.name }}{% if loop.last %}{% else %}, {% endif %}{% endfor %})
+    {%-     endif %}
+    {%-     if uniffi_trait_methods.eq_eq.is_none() %}
         def __eq__(self, other):
-            if not other.is_{{ variant.name() }}():
+            if not isinstance(other, {{ type_name }}):
+                return NotImplemented
+            if not other.is_{{ variant.name }}():
                 return False
-            {%- for field in variant.fields() %}
-            if self.{{ field.name() }} != other.{{ field.name() }}:
+            {%- for field in variant.fields %}
+            if self.{{ field.name }} != other.{{ field.name }}:
                 return False
             {%- endfor %}
             return True
-    {%  endif %}
+    {%-     endif %}
+    {%-  endif %}
+
     {% endfor %}
 
     # For each variant, we have `is_NAME` and `is_name` methods for easily checking
     # whether an instance is that variant.
-    {% for variant in e.variants() -%}
-    def is_{{ variant.name() }}(self) -> bool:
-        return isinstance(self, {{ type_name }}.{{ variant.name() }})
+    {% for variant in e.variants -%}
+    def is_{{ variant.name }}(self) -> bool:
+        return isinstance(self, {{ type_name }}.{{ variant.name }})
 
     {#- We used to think we used `is_NAME` but did `is_name` instead. In #2270 we decided to do both. #}
-    {%- if variant.name() != variant.name().to_snake_case() %}
-    def is_{{ variant.name().to_snake_case() }}(self) -> bool:
-        return isinstance(self, {{ type_name }}.{{ variant.name() }})
+    {%- if variant.name != variant.name.to_snake_case() %}
+    def is_{{ variant.name.to_snake_case() }}(self) -> bool:
+        return isinstance(self, {{ type_name }}.{{ variant.name }})
     {%- endif %}
     {% endfor %}
 
+    {%- for meth in e.methods -%}
+    {%- let callable = meth.callable %}
+    {% if callable.is_async %}async {% endif %}def {{ callable.name }}(self, {% include "CallableArgs.py" %}) -> {{ callable.return_type.type_name }}:
+        {{ meth.docstring|docstring(8) -}}
+        {%- filter indent(8) %}
+        {%- include "CallableBody.py" %}
+        {%- endfilter %}
+    {%- endfor %}
+
 # Now, a little trick - we make each nested variant class be a subclass of the main
 # enum class, so that method calls and instance checks etc will work intuitively.
 # We might be able to do this a little more neatly with a metaclass, but this'll do.
-{% for variant in e.variants() -%}
-{{ type_name }}.{{ variant.name() }} = type("{{ type_name }}.{{ variant.name() }}", ({{ type_name }}.{{variant.name()}}, {{ type_name }},), {})  # type: ignore
+{% for variant in e.variants -%}
+{{ type_name }}.{{ variant.name }} = type("{{ type_name }}.{{ variant.name }}", ({{ type_name }}.{{variant.name}}, {{ type_name }},), {})  # type: ignore
 {% endfor %}
 
 {% endif %}
 
-class {{ ffi_converter_name }}(_UniffiConverterRustBuffer):
+class {{ e.self_type.ffi_converter_name }}(_UniffiConverterRustBuffer):
     @staticmethod
     def read(buf):
         variant = buf.read_i32()
 
-        {%- for variant in e.variants() %}
+        {%- for variant in e.variants %}
         if variant == {{ loop.index }}:
-            {%- if e.is_flat() %}
-            return {{ type_name }}.{{variant.name()}}
+            {%- if e.is_flat %}
+            return {{ type_name }}.{{variant.name}}
             {%- else %}
-            return {{ type_name }}.{{variant.name()}}(
-                {%- for field in variant.fields() %}
-                {{ field|read_fn }}(buf),
+            return {{ type_name }}.{{variant.name}}(
+                {%- for field in variant.fields %}
+                {{ field.ty.ffi_converter_name }}.read(buf),
                 {%- endfor %}
             )
             {%- endif %}
@@ -113,20 +166,20 @@ def read(buf):
 
     @staticmethod
     def check_lower(value):
-        {%- if e.variants().is_empty() %}
+        {%- if e.variants.is_empty() %}
         pass
         {%- else %}
-        {%- for variant in e.variants() %}
-        {%- if e.is_flat() %}
-        if value == {{ type_name }}.{{ variant.name() }}:
+        {%- for variant in e.variants %}
+        {%- if e.is_flat %}
+        if value == {{ type_name }}.{{ variant.name }}:
         {%- else %}
-        if value.is_{{ variant.name() }}():
+        if value.is_{{ variant.name }}():
         {%- endif %}
-            {%- for field in variant.fields() %}
-            {%- if variant.has_nameless_fields() %}
-            {{ field|check_lower_fn }}(value._values[{{ loop.index0 }}])
+            {%- for field in variant.fields %}
+            {%- if variant.has_unnamed_fields() %}
+            {{ field.ty.ffi_converter_name }}.check_lower(value._values[{{ loop.index0 }}])
             {%- else %}
-            {{ field|check_lower_fn }}(value.{{ field.name() }})
+            {{ field.ty.ffi_converter_name }}.check_lower(value.{{ field.name }})
             {%- endif %}
             {%- endfor %}
             return
@@ -136,18 +189,18 @@ def check_lower(value):
 
     @staticmethod
     def write(value, buf):
-        {%- for variant in e.variants() %}
-        {%- if e.is_flat() %}
-        if value == {{ type_name }}.{{ variant.name() }}:
+        {%- for variant in e.variants %}
+        {%- if e.is_flat %}
+        if value == {{ type_name }}.{{ variant.name }}:
             buf.write_i32({{ loop.index }})
         {%- else %}
-        if value.is_{{ variant.name() }}():
+        if value.is_{{ variant.name }}():
             buf.write_i32({{ loop.index }})
-            {%- for field in variant.fields() %}
-            {%- if variant.has_nameless_fields() %}
-            {{ field|write_fn }}(value._values[{{ loop.index0 }}], buf)
+            {%- for field in variant.fields %}
+            {%- if variant.has_unnamed_fields() %}
+            {{ field.ty.ffi_converter_name }}.write(value._values[{{ loop.index0 }}], buf)
             {%- else %}
-            {{ field|write_fn }}(value.{{ field.name() }}, buf)
+            {{ field.ty.ffi_converter_name }}.write(value.{{ field.name }}, buf)
             {%- endif %}
             {%- endfor %}
         {%- endif %}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/ErrorTemplate.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/ErrorTemplate.py
index 9d3b30831d92c..7da96fcc28bf8 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/ErrorTemplate.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/ErrorTemplate.py
@@ -1,3 +1,4 @@
+{%- let type_name = e.self_type.type_name %}
 # {{ type_name }}
 # We want to define each variant as a nested class that's also a subclass,
 # which is tricky in Python.  To accomplish this we're going to create each
@@ -5,32 +6,32 @@
 # __dict__.  All of this happens in dummy class to avoid polluting the module
 # namespace.
 class {{ type_name }}(Exception):
-    {%- call py::docstring(e, 4) %}
+    {{ e.docstring|docstring(4) -}}
     pass
 
 _UniffiTemp{{ type_name }} = {{ type_name }}
 
 class {{ type_name }}:  # type: ignore
-    {%- call py::docstring(e, 4) %}
-    {%- for variant in e.variants() -%}
-    {%- let variant_type_name = variant.name() -%}
-    {%- if e.is_flat() %}
+    {{ e.docstring|docstring(4) -}}
+    {%- for variant in e.variants -%}
+    {%- let variant_type_name = variant.name -%}
+    {%- if e.is_flat %}
     class {{ variant_type_name }}(_UniffiTemp{{ type_name }}):
-        {%- call py::docstring(variant, 8) %}
+        {{ variant.docstring|docstring(8) -}}
 
         def __repr__(self):
             return "{{ type_name }}.{{ variant_type_name }}({})".format(repr(str(self)))
     {%- else %}
     class {{ variant_type_name }}(_UniffiTemp{{ type_name }}):
-        {%- call py::docstring(variant, 8) %}
+        {{ variant.docstring|docstring(8) -}}
 
-    {%-     if variant.has_nameless_fields() %}
+    {%-     if variant.has_unnamed_fields() %}
         def __init__(self, *values):
-            if len(values) != {{ variant.fields().len() }}:
-                raise TypeError(f"Expected {{ variant.fields().len() }} arguments, found {len(values)}")
-        {%- for field in variant.fields() %}
-            if not isinstance(values[{{ loop.index0 }}], {{ field|type_name }}):
-                raise TypeError(f"unexpected type for tuple element {{ loop.index0 }} - expected '{{ field|type_name }}', got '{type(values[{{ loop.index0 }}])}'")
+            if len(values) != {{ variant.fields.len() }}:
+                raise TypeError(f"Expected {{ variant.fields.len() }} arguments, found {len(values)}")
+        {%- for field in variant.fields %}
+            if not isinstance(values[{{ loop.index0 }}], {{ field.ty.type_name }}):
+                raise TypeError(f"unexpected type for tuple element {{ loop.index0 }} - expected '{{ field.ty.type_name }}', got '{type(values[{{ loop.index0 }}])}'")
         {%- endfor %}
             super().__init__(", ".join(map(repr, values)))
             self._values = values
@@ -39,15 +40,15 @@ def __getitem__(self, index):
             return self._values[index]
 
     {%-     else %}
-        def __init__(self{% for field in variant.fields() %}, {{ field.name() }}{% endfor %}):
-            {%- if variant.has_fields() %}
+        def __init__(self{% for field in variant.fields %}, {{ field.name }}{% endfor %}):
+            {%- if !variant.fields.is_empty() %}
             super().__init__(", ".join([
-                {%- for field in variant.fields() %}
-                "{{ field.name() }}={!r}".format({{ field.name() }}),
+                {%- for field in variant.fields %}
+                "{{ field.name }}={!r}".format({{ field.name }}),
                 {%- endfor %}
             ]))
-            {%- for field in variant.fields() %}
-            self.{{ field.name() }} = {{ field.name() }}
+            {%- for field in variant.fields %}
+            self.{{ field.name }} = {{ field.name }}
             {%- endfor %}
             {%- else %}
             pass
@@ -56,6 +57,16 @@ def __init__(self{% for field in variant.fields() %}, {{ field.name() }}{% endfo
 
         def __repr__(self):
             return "{{ type_name }}.{{ variant_type_name }}({})".format(str(self))
+
+    {%-     for meth in e.methods -%}
+    {%-     let callable = meth.callable %}
+        {% if callable.is_async %}async {% endif %}def {{ callable.name }}(self, {% include "CallableArgs.py" %}) -> {{ callable.return_type.type_name }}:
+            {{ meth.docstring|docstring(12) -}}
+    {%-         filter indent(12) %}
+    {%-         include "CallableBody.py" %}
+    {%-         endfilter %}
+    {%-     endfor %}
+
     {%- endif %}
     _UniffiTemp{{ type_name }}.{{ variant_type_name }} = {{ variant_type_name }} # type: ignore
     {%- endfor %}
@@ -64,18 +75,18 @@ def __repr__(self):
 del _UniffiTemp{{ type_name }}
 
 
-class {{ ffi_converter_name }}(_UniffiConverterRustBuffer):
+class {{ e.self_type.ffi_converter_name }}(_UniffiConverterRustBuffer):
     @staticmethod
     def read(buf):
         variant = buf.read_i32()
-        {%- for variant in e.variants() %}
+        {%- for variant in e.variants %}
         if variant == {{ loop.index }}:
-            return {{ type_name }}.{{ variant.name() }}(
-                {%- if e.is_flat() %}
-                {{ Type::String.borrow()|read_fn }}(buf),
+            return {{ type_name }}.{{ variant.name }}(
+                {%- if e.is_flat %}
+                {{ string_type_node.ffi_converter_name }}.read(buf),
                 {%- else %}
-                {%- for field in variant.fields() %}
-                {{ field|read_fn }}(buf),
+                {%- for field in variant.fields %}
+                {{ field.ty.ffi_converter_name }}.read(buf),
                 {%- endfor %}
                 {%- endif %}
             )
@@ -84,16 +95,16 @@ def read(buf):
 
     @staticmethod
     def check_lower(value):
-        {%- if e.variants().is_empty() %}
+        {%- if e.variants.is_empty() %}
         pass
         {%- else %}
-        {%- for variant in e.variants() %}
-        if isinstance(value, {{ type_name }}.{{ variant.name() }}):
-            {%- for field in variant.fields() %}
-            {%-     if variant.has_nameless_fields() %}
-            {{ field|check_lower_fn }}(value._values[{{ loop.index0 }}])
+        {%- for variant in e.variants %}
+        if isinstance(value, {{ type_name }}.{{ variant.name }}):
+            {%- for field in variant.fields %}
+            {%-     if variant.has_unnamed_fields() %}
+            {{ field.ty.ffi_converter_name }}.check_lower(value._values[{{ loop.index0 }}])
             {%-     else %}
-            {{ field|check_lower_fn }}(value.{{ field.name() }})
+            {{ field.ty.ffi_converter_name }}.check_lower(value.{{ field.name }})
             {%-     endif %}
             {%- endfor %}
             return
@@ -102,14 +113,14 @@ def check_lower(value):
 
     @staticmethod
     def write(value, buf):
-        {%- for variant in e.variants() %}
-        if isinstance(value, {{ type_name }}.{{ variant.name() }}):
+        {%- for variant in e.variants %}
+        if isinstance(value, {{ type_name }}.{{ variant.name }}):
             buf.write_i32({{ loop.index }})
-            {%- for field in variant.fields() %}
-            {%-     if variant.has_nameless_fields() %}
-            {{ field|write_fn }}(value._values[{{ loop.index0 }}], buf)
+            {%- for field in variant.fields %}
+            {%-     if variant.has_unnamed_fields() %}
+            {{ field.ty.ffi_converter_name }}.write(value._values[{{ loop.index0 }}], buf)
             {%-     else %}
-            {{ field|write_fn }}(value.{{ field.name() }}, buf)
+            {{ field.ty.ffi_converter_name }}.write(value.{{ field.name }}, buf)
             {%-     endif %}
             {%- endfor %}
         {%- endfor %}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/ExternalTemplate.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/ExternalTemplate.py
deleted file mode 100644
index a24aa03e07f65..0000000000000
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/ExternalTemplate.py
+++ /dev/null
@@ -1,20 +0,0 @@
-{%- let namespace = ci.namespace_for_type(type_)? %}
-{%- let module = python_config.module_for_namespace(namespace) %}
-
-# External type {{ name }}: `from {{ module }} import {{ name }}`
-{%- let ffi_converter_name = "_UniffiConverterType{}"|format(name) %}
-{{- self.add_import_of(module, ffi_converter_name) }}
-{{- self.add_import_of(module, name) }} {#- import the type alias itself -#}
-
-{%- if ci.is_name_used_as_error(name) %}
-# External type {{ name }} is an error.
-{%-     match type_ %}
-{%-         when Type::Object { .. } %}
-{%-             let err_ffi_converter_name = "{}__as_error"|format(ffi_converter_name) %}
-{{- self.add_import_of(module, err_ffi_converter_name) }}
-{%-         else %}
-{%-     endmatch %}
-{%- endif %}
-
-{%- let rustbuffer_local_name = "_UniffiRustBuffer{}"|format(name) %}
-{{- self.add_import_of_as(module, "_UniffiRustBuffer", rustbuffer_local_name) }}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/HandleMap.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/HandleMap.py
index 2d6630fab03b7..d68b1275ac7c1 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/HandleMap.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/HandleMap.py
@@ -1,3 +1,8 @@
+# Initial value and increment amount for handles. 
+# These ensure that Python-generated handles always have the lowest bit set
+_UNIFFI_HANDLEMAP_INITIAL = 1
+_UNIFFI_HANDLEMAP_DELTA = 2
+
 class _UniffiHandleMap:
     """
     A map where inserting, getting and removing data is synchronized with a lock.
@@ -7,27 +12,40 @@ def __init__(self):
         # type Handle = int
         self._map = {}  # type: Dict[Handle, Any]
         self._lock = threading.Lock()
-        self._counter = itertools.count()
+        self._counter = _UNIFFI_HANDLEMAP_INITIAL
 
     def insert(self, obj):
         with self._lock:
-            handle = next(self._counter)
-            self._map[handle] = obj
-            return handle
+            return self._insert(obj)
+
+    """Low-level insert, this assumes `self._lock` is held."""
+    def _insert(self, obj):
+        handle = self._counter
+        self._counter += _UNIFFI_HANDLEMAP_DELTA
+        self._map[handle] = obj
+        return handle
 
     def get(self, handle):
         try:
             with self._lock:
                 return self._map[handle]
         except KeyError:
-            raise InternalError("_UniffiHandleMap.get: Invalid handle")
+            raise InternalError(f"_UniffiHandleMap.get: Invalid handle {handle}")
+
+    def clone(self, handle):
+        try:
+            with self._lock:
+                obj = self._map[handle]
+                return self._insert(obj)
+        except KeyError:
+            raise InternalError(f"_UniffiHandleMap.clone: Invalid handle {handle}")
 
     def remove(self, handle):
         try:
             with self._lock:
                 return self._map.pop(handle)
         except KeyError:
-            raise InternalError("_UniffiHandleMap.remove: Invalid handle")
+            raise InternalError(f"_UniffiHandleMap.remove: Invalid handle: {handle}")
 
     def __len__(self):
         return len(self._map)
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Helpers.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Helpers.py
index 1b1d27840db0c..5ab9019dab203 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Helpers.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Helpers.py
@@ -62,7 +62,7 @@ def _uniffi_check_call_status(error_ffi_converter, call_status):
         # with the message.  But if that code panics, then it just sends back
         # an empty buffer.
         if call_status.error_buf.len > 0:
-            msg = _UniffiConverterString.lift(call_status.error_buf)
+            msg = {{ string_type_node.ffi_converter_name }}.lift(call_status.error_buf)
         else:
             msg = "Unknown rust panic"
         raise InternalError(msg)
@@ -75,7 +75,7 @@ def _uniffi_trait_interface_call(call_status, make_call, write_return_value):
         return write_return_value(make_call())
     except Exception as e:
         call_status.code = _UniffiRustCallStatus.CALL_UNEXPECTED_ERROR
-        call_status.error_buf = {{ Type::String.borrow()|lower_fn }}(repr(e))
+        call_status.error_buf = {{ string_type_node.ffi_converter_name }}.lower(repr(e))
 
 def _uniffi_trait_interface_call_with_error(call_status, make_call, write_return_value, error_type, lower_error):
     try:
@@ -86,4 +86,4 @@ def _uniffi_trait_interface_call_with_error(call_status, make_call, write_return
             call_status.error_buf = lower_error(e)
     except Exception as e:
         call_status.code = _UniffiRustCallStatus.CALL_UNEXPECTED_ERROR
-        call_status.error_buf = {{ Type::String.borrow()|lower_fn }}(repr(e))
+        call_status.error_buf = {{ string_type_node.ffi_converter_name }}.lower(repr(e))
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/InterfaceTemplate.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/InterfaceTemplate.py
new file mode 100644
index 0000000000000..3ed4481c1397c
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/InterfaceTemplate.py
@@ -0,0 +1,168 @@
+{%- let protocol = int.protocol %}
+{%- let ffi_converter_name = int.self_type.ffi_converter_name %}
+{%- include "Protocol.py" %}
+
+class {{ int.name }}({{ int.base_classes|join(", ") }}):
+    {{ int.docstring|docstring(4) }}
+    _handle: ctypes.c_uint64
+
+{%- for cons in int.constructors %}
+{%-     let callable = cons.callable %}
+{%-     if callable.is_primary_constructor() && callable.is_async %}
+    def __init__(self, *args, **kw):
+        raise ValueError("async constructors not supported.")
+{%-     elif callable.is_primary_constructor() %}
+    def __init__(self, {% include "CallableArgs.py" %}):
+        {{ cons.docstring|docstring(8) -}}
+        {%- filter indent(8) %}
+        {%- include "CallableBody.py" %}
+        {%- endfilter %}
+{%-     else %}
+    @classmethod
+    {% if callable.is_async %}async {% endif %}def {{ callable.name }}(cls, {% include "CallableArgs.py" %}) -> {{ callable.return_type.type_name }}:
+        {{ cons.docstring|docstring(8) -}}
+        {%- filter indent(8) %}
+        {%- include "CallableBody.py" %}
+        {%- endfilter %}
+{%-     endif %}
+{%- endfor %}
+
+{%- if !int.has_primary_constructor %}
+    {# Define __init__ to prevent construction without a handle, which can confuse #}
+    def __init__(self, *args, **kwargs):
+        raise ValueError("This class has no default constructor")
+{%- endif %}
+
+    def __del__(self):
+        # In case of partial initialization of instances.
+        handle = getattr(self, "_handle", None)
+        if handle is not None:
+            _uniffi_rust_call(_UniffiLib.{{ int.ffi_func_free.0 }}, handle)
+
+    def _uniffi_clone_handle(self):
+        return _uniffi_rust_call(_UniffiLib.{{ int.ffi_func_clone.0 }}, self._handle)
+
+    # Used by alternative constructors or any methods which return this type.
+    @classmethod
+    def _uniffi_make_instance(cls, handle):
+        # Lightly yucky way to bypass the usual __init__ logic
+        # and just create a new instance with the required handle.
+        inst = cls.__new__(cls)
+        inst._handle = handle
+        return inst
+
+{%- for meth in int.methods -%}
+{%-     let callable = meth.callable %}
+    {% if callable.is_async %}async {% endif %}def {{ callable.name }}(self, {% include "CallableArgs.py" %}) -> {{ callable.return_type.type_name }}:
+        {{ meth.docstring|docstring(8) -}}
+        {%- filter indent(8) %}
+        {%- include "CallableBody.py" %}
+        {%- endfilter %}
+{%- endfor %}
+
+{%- let uniffi_trait_methods = int.uniffi_trait_methods %}
+{% filter indent(4) %}
+{% include "UniffiTraitImpls.py" -%}
+{% endfilter %}
+
+{# Objects as error #}
+{%- if int.self_type.is_used_as_error %}
+{# Due to some mismatches in the ffi converter mechanisms, errors are forced to be a RustBuffer #}
+class {{ ffi_converter_name }}__as_error(_UniffiConverterRustBuffer):
+    @classmethod
+    def read(cls, buf):
+        raise NotImplementedError()
+
+    @classmethod
+    def write(cls, value, buf):
+        raise NotImplementedError()
+
+    @staticmethod
+    def lift(value):
+        # Errors are always a rust buffer holding a handle - which is a "read"
+        with value.consume_with_stream() as stream:
+            return {{ ffi_converter_name }}.read(stream)
+
+    @staticmethod
+    def lower(value):
+        raise NotImplementedError()
+
+{%- endif %}
+
+{%- match int.vtable %}
+{%- when None %}
+{# simple case: the interface can only be implemented in Rust #}
+class {{ ffi_converter_name }}:
+    @staticmethod
+    def lift(value: int) -> {{ int.name }}:
+        return {{ int.name }}._uniffi_make_instance(value)
+
+    @staticmethod
+    def check_lower(value: {{ int.name }}):
+        if not isinstance(value, {{ int.name }}):
+            raise TypeError("Expected {{ int.name }} instance, {} found".format(type(value).__name__))
+
+    @staticmethod
+    def lower(value: {{ int.name }}) -> ctypes.c_uint64:
+        return value._uniffi_clone_handle()
+
+    @classmethod
+    def read(cls, buf: _UniffiRustBuffer) -> {{ int.name }}:
+        ptr = buf.read_u64()
+        if ptr == 0:
+            raise InternalError("Raw handle value was null")
+        return cls.lift(ptr)
+
+    @classmethod
+    def write(cls, value: {{ int.name }}, buf: _UniffiRustBuffer):
+        buf.write_u64(cls.lower(value))
+
+{%- when Some(vtable) %}
+{#
+ # The interface can be implemented in Rust or Python
+
+ # * Generate a callback interface implementation to handle the Python side
+ # * In the FfiConverter, check which side a handle came from to know how to handle correctly.
+ #}
+
+{%- let trait_impl=format!("_UniffiTraitImpl{}", int.name) %}
+{%- include "CallbackInterfaceImpl.py" %}
+
+class {{ ffi_converter_name }}:
+    _handle_map = _UniffiHandleMap()
+
+    @staticmethod
+    def lift(value: int):
+        if (value & 1) == 0:
+            # Rust-generated handle, construct a new class that uses the handle to implement the
+            # interface
+            return {{ int.name }}._uniffi_make_instance(value)
+        else:
+            # Python-generated handle, get the object from the handle map
+            return {{ ffi_converter_name }}._handle_map.remove(value)
+
+    @staticmethod
+    def check_lower(value: {{ protocol.name }}):
+        if not isinstance(value, {{ protocol.name }}):
+            raise TypeError("Expected {{ protocol.name }} subclass, {} found".format(type(value).__name__))
+
+    @staticmethod
+    def lower(value: {{ protocol.name }}):
+         if isinstance(value, {{ int.name }}):
+            # Rust-implementated object.  Clone the handle and return it
+            return value._uniffi_clone_handle()
+         else:
+            # Python-implementated object, generate a new vtable handle and return that.
+            return {{ ffi_converter_name }}._handle_map.insert(value)
+
+    @classmethod
+    def read(cls, buf: _UniffiRustBuffer):
+        ptr = buf.read_u64()
+        if ptr == 0:
+            raise InternalError("Raw handle value was null")
+        return cls.lift(ptr)
+
+    @classmethod
+    def write(cls, value: {{ protocol.name }}, buf: _UniffiRustBuffer):
+        buf.write_u64(cls.lower(value))
+{%- endmatch %}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/MapTemplate.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/MapTemplate.py
index a09ca28a30aa8..6d33356dab785 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/MapTemplate.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/MapTemplate.py
@@ -1,19 +1,16 @@
-{%- let key_ffi_converter = key_type|ffi_converter_name %}
-{%- let value_ffi_converter = value_type|ffi_converter_name %}
-
-class {{ ffi_converter_name }}(_UniffiConverterRustBuffer):
+class {{ map.self_type.ffi_converter_name }}(_UniffiConverterRustBuffer):
     @classmethod
     def check_lower(cls, items):
         for (key, value) in items.items():
-            {{ key_ffi_converter }}.check_lower(key)
-            {{ value_ffi_converter }}.check_lower(value)
+            {{ map.key.ffi_converter_name }}.check_lower(key)
+            {{ map.value.ffi_converter_name }}.check_lower(value)
 
     @classmethod
     def write(cls, items, buf):
         buf.write_i32(len(items))
         for (key, value) in items.items():
-            {{ key_ffi_converter }}.write(key, buf)
-            {{ value_ffi_converter }}.write(value, buf)
+            {{ map.key.ffi_converter_name }}.write(key, buf)
+            {{ map.value.ffi_converter_name }}.write(value, buf)
 
     @classmethod
     def read(cls, buf):
@@ -27,7 +24,7 @@ def read(cls, buf):
         # This loop makes the order explicit: first reading the key, then the value.
         d = {}
         for i in range(count):
-            key = {{ key_ffi_converter }}.read(buf)
-            val = {{ value_ffi_converter }}.read(buf)
+            key = {{ map.key.ffi_converter_name }}.read(buf)
+            val = {{ map.value.ffi_converter_name }}.read(buf)
             d[key] = val
         return d
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/wrapper.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Module.py
similarity index 67%
rename from third_party/rust/uniffi_bindgen/src/bindings/python/templates/wrapper.py
rename to third_party/rust/uniffi_bindgen/src/bindings/python/templates/Module.py
index d97761f19251b..5e051fd00f20b 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/wrapper.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Module.py
@@ -1,5 +1,4 @@
-{%- call py::docstring_value(ci.namespace_docstring(), 0) %}
-
+{{ docstring|docstring(0) -}}
 # This file was autogenerated by some hot garbage in the `uniffi` crate.
 # Trust me, you don't want to mess with it!
 
@@ -19,6 +18,7 @@
 import os
 import sys
 import ctypes
+from dataclasses import dataclass
 import enum
 import struct
 import contextlib
@@ -27,14 +27,15 @@
 import itertools
 import traceback
 import typing
-{%- if ci.has_async_fns() %}
+{%- if has_async_fns %}
 import asyncio
 {%- endif %}
 import platform
-{%- for req in self.imports() %}
-{{ req.render() }}
+{%- for import in imports %}
+{{ import|import_statement }}
 {%- endfor %}
 
+
 # Used for default argument values
 _DEFAULT = object() # type: typing.Any
 
@@ -42,39 +43,27 @@
 {% include "Helpers.py" %}
 {% include "HandleMap.py" %}
 {% include "RustBufferHelper.py" %}
+{%- if has_callback_interface %}
+{%- include "CallbackInterfaceRuntime.py" %}
+{%- endif %}
 
 # Contains loading, initialization code, and the FFI Function declarations.
 {% include "NamespaceLibraryTemplate.py" %}
 
-# Public interface members begin here.
-{{ type_helper_code }}
-
-# Async support
-{%- if ci.has_async_fns() %}
+{# Async support comes after NamespaceLibraryTemplate, since it depends on the FFI types #}
+{%- if has_async_fns %}
 {%- include "Async.py" %}
 {%- endif %}
 
-{%- for func in ci.function_definitions() %}
+# Public interface members begin here.
+{% include "Types.py" %}
+
+{%- for func in functions %}
 {%- include "TopLevelFunctionTemplate.py" %}
 {%- endfor %}
 
 __all__ = [
-    "InternalError",
-    {%- for e in ci.enum_definitions() %}
-    "{{ e.name() }}",
-    {%- endfor %}
-    {%- for record in ci.record_definitions() %}
-    "{{ record.name() }}",
-    {%- endfor %}
-    {%- for func in ci.function_definitions() %}
-    "{{ func.name() }}",
-    {%- endfor %}
-    {%- for obj in ci.object_definitions() %}
-    "{{ obj.name() }}",
-    {%- endfor %}
-    {%- for c in ci.callback_interface_definitions() %}
-    "{{ c.name() }}",
+    {%- for name in exported_names %}
+    "{{ name }}",
     {%- endfor %}
 ]
-
-{% import "macros.py" as py %}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/NamespaceLibraryTemplate.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/NamespaceLibraryTemplate.py
index 365b002dd3e0e..8eff68a090518 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/NamespaceLibraryTemplate.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/NamespaceLibraryTemplate.py
@@ -31,22 +31,22 @@ def _uniffi_load_indirect():
         # Anything else must be an ELF platform - Linux, *BSD, Solaris/illumos
         libname = "lib{}.so"
 
-    libname = libname.format("{{ config.cdylib_name() }}")
+    libname = libname.format("{{ cdylib_name }}")
     path = os.path.join(os.path.dirname(__file__), libname)
     lib = ctypes.cdll.LoadLibrary(path)
     return lib
 
 def _uniffi_check_contract_api_version(lib):
     # Get the bindings contract version from our ComponentInterface
-    bindings_contract_version = {{ ci.uniffi_contract_version() }}
+    bindings_contract_version = {{ correct_contract_version }}
     # Get the scaffolding contract version by calling the into the dylib
-    scaffolding_contract_version = lib.{{ ci.ffi_uniffi_contract_version().name() }}()
+    scaffolding_contract_version = lib.{{ ffi_uniffi_contract_version.0 }}()
     if bindings_contract_version != scaffolding_contract_version:
         raise InternalError("UniFFI contract version mismatch: try cleaning and rebuilding your project")
 
 def _uniffi_check_api_checksums(lib):
-    {%- for (name, expected_checksum) in ci.iter_checksums() %}
-    if lib.{{ name }}() != {{ expected_checksum }}:
+    {%- for checksum in checksums %}
+    if lib.{{ checksum.fn_name.0 }}() != {{ checksum.checksum }}:
         raise InternalError("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     {%- else %}
     pass
@@ -57,33 +57,38 @@ def _uniffi_check_api_checksums(lib):
 
 _UniffiLib = _uniffi_load_indirect()
 
-{%- for def in ci.ffi_definitions() %}
+{%- for def in ffi_definitions %}
 {%- match def %}
-{%- when FfiDefinition::CallbackFunction(callback) %}
-{{ callback.name()|ffi_callback_name }} = ctypes.CFUNCTYPE(
-    {%- match callback.return_type() %}
-    {%- when Some(return_type) %}{{ return_type|ffi_type_name(ci) }},
+{%- when FfiDefinition::FunctionType(function_type) %}
+{{ function_type.name.0 }} = ctypes.CFUNCTYPE(
+    {%- match function_type.return_type.ty %}
+    {%- when Some(return_type) %}{{ return_type.type_name }},
     {%- when None %}None,
     {%- endmatch %}
-    {%- for arg in callback.arguments() -%}
-    {{ arg.type_().borrow()|ffi_type_name(ci) }},
+    {%- for arg in function_type.arguments -%}
+    {{ arg.ty.type_name }},
     {%- endfor -%}
-    {%- if callback.has_rust_call_status_arg() %}
+    {%- if function_type.has_rust_call_status_arg %}
     ctypes.POINTER(_UniffiRustCallStatus),
     {%- endif %}
 )
 {%- when FfiDefinition::Struct(ffi_struct) %}
-class {{ ffi_struct.name()|ffi_struct_name }}(ctypes.Structure):
+class {{ ffi_struct.name.0 }}(ctypes.Structure):
     _fields_ = [
-        {%- for field in ffi_struct.fields() %}
-        ("{{ field.name() }}", {{ field.type_().borrow()|ffi_type_name(ci) }}),
+        {%- for field in ffi_struct.fields %}
+        ("{{ field.name }}", {{ field.ty.type_name }}),
         {%- endfor %}
     ]
-{%- when FfiDefinition::Function(func) %}
-_UniffiLib.{{ func.name() }}.argtypes = (
-    {%- call py::arg_list_ffi_decl(func) -%}
+{%- when FfiDefinition::RustFunction(func) %}
+_UniffiLib.{{ func.name.0 }}.argtypes = (
+    {%- for arg in func.arguments %}
+    {{ arg.ty.type_name }},
+    {%- endfor %}
+    {%- if func.has_rust_call_status_arg %}
+    ctypes.POINTER(_UniffiRustCallStatus),
+    {%- endif %}
 )
-_UniffiLib.{{ func.name() }}.restype = {% match func.return_type() %}{% when Some(type_) %}{{ type_|ffi_type_name(ci) }}{% when None %}None{% endmatch %}
+_UniffiLib.{{ func.name.0 }}.restype = {% match func.return_type.ty %}{% when Some(ffi_type) %}{{ ffi_type.type_name }}{% when None %}None{% endmatch %}
 {%- endmatch %}
 {%- endfor %}
 
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/ObjectTemplate.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/ObjectTemplate.py
deleted file mode 100644
index 33a6e0f917574..0000000000000
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/ObjectTemplate.py
+++ /dev/null
@@ -1,187 +0,0 @@
-{%- let obj = ci.get_object_definition(name).unwrap() %}
-{%- let methods = obj.methods() %}
-{%- let protocol_name = format!("{type_name}Protocol") %}
-{%- let protocol_docstring = obj.docstring() %}
-{%- let protocol_base_class = "typing.Protocol" %}
-{%- include "Protocol.py" %}
-
-{%- let impl_name %}
-{%- if obj.has_callback_interface() %}
-# {{ type_name }} is a foreign trait so treated like a callback interface, where the
-# primary use-case is the trait being implemented locally.
-# It is a base-class local implementations might subclass.
-{# We reuse "Protocol.py" for this, even though here we are not generating a protocol #}
-{%-     let protocol_name = format!("{type_name}") %}
-{%-     let protocol_base_class = "" %}
-{%      include "Protocol.py" %}
-
-{%-     let impl_name = format!("{type_name}Impl") %}
-# `{{ impl_name }}` is the implementation for a Rust implemented version.
-{%- else %}
-# {{ type_name }} is a Rust-only trait - it's a wrapper around a Rust implementation.
-{%-     let impl_name = type_name.clone() %}
-{%- endif %}
-
-{%- if ci.is_name_used_as_error(name) %}
-class {{ impl_name }}(Exception):
-{%- else %}
-class {{ impl_name }}({% for t in obj.trait_impls() %}{{ t.trait_name }},{% endfor %}):
-{%- endif %}
-    {%- call py::docstring(obj, 4) %}
-    _pointer: ctypes.c_void_p
-
-{%- match obj.primary_constructor() %}
-{%-     when Some(cons) %}
-{%-         if cons.is_async() %}
-    def __init__(self, *args, **kw):
-        raise ValueError("async constructors not supported.")
-{%-         else %}
-    def __init__(self, {% call py::arg_list_decl(cons) -%}):
-        {%- call py::docstring(cons, 8) %}
-        {%- call py::setup_args_extra_indent(cons) %}
-        self._pointer = {% call py::to_ffi_call(cons) %}
-{%-         endif %}
-{%-     when None %}
-    {# no __init__ means simple construction without a pointer works, which can confuse #}
-    def __init__(self, *args, **kwargs):
-        raise ValueError("This class has no default constructor")
-{%- endmatch %}
-
-    def __del__(self):
-        # In case of partial initialization of instances.
-        pointer = getattr(self, "_pointer", None)
-        if pointer is not None:
-            _uniffi_rust_call(_UniffiLib.{{ obj.ffi_object_free().name() }}, pointer)
-
-    def _uniffi_clone_pointer(self):
-        return _uniffi_rust_call(_UniffiLib.{{ obj.ffi_object_clone().name() }}, self._pointer)
-
-    # Used by alternative constructors or any methods which return this type.
-    @classmethod
-    def _make_instance_(cls, pointer):
-        # Lightly yucky way to bypass the usual __init__ logic
-        # and just create a new instance with the required pointer.
-        inst = cls.__new__(cls)
-        inst._pointer = pointer
-        return inst
-
-{%- for cons in obj.alternate_constructors() %}
-    @classmethod
-{%-  if cons.is_async() %}
-    async def {{ cons.name() }}(cls, {% call py::arg_list_decl(cons) %}):
-        {%- call py::docstring(cons, 8) %}
-        {%- call py::setup_args_extra_indent(cons) %}
-
-        return await _uniffi_rust_call_async(
-            _UniffiLib.{{ cons.ffi_func().name() }}({% call py::arg_list_lowered(cons) %}),
-            _UniffiLib.{{ cons.ffi_rust_future_poll(ci) }},
-            _UniffiLib.{{ cons.ffi_rust_future_complete(ci) }},
-            _UniffiLib.{{ cons.ffi_rust_future_free(ci) }},
-            {{ ffi_converter_name }}.lift,
-            {% call py::error_ffi_converter(cons) %}
-        )
-{%-  else %}
-    def {{ cons.name() }}(cls, {% call py::arg_list_decl(cons) %}):
-        {%- call py::docstring(cons, 8) %}
-        {%- call py::setup_args_extra_indent(cons) %}
-        # Call the (fallible) function before creating any half-baked object instances.
-        pointer = {% call py::to_ffi_call(cons) %}
-        return cls._make_instance_(pointer)
-{%-  endif %}
-{% endfor %}
-
-{%- for meth in obj.methods() -%}
-    {%- call py::method_decl(meth.name(), meth) %}
-{%- endfor %}
-{%- for tm in obj.uniffi_traits() -%}
-{%-     match tm %}
-{%-         when UniffiTrait::Debug { fmt } %}
-            {%- call py::method_decl("__repr__", fmt) %}
-{%-         when UniffiTrait::Display { fmt } %}
-            {%- call py::method_decl("__str__", fmt) %}
-{%-         when UniffiTrait::Eq { eq, ne } %}
-    def __eq__(self, other: object) -> {{ eq.return_type().unwrap()|type_name }}:
-        if not isinstance(other, {{ type_name }}):
-            return NotImplemented
-
-        return {{ eq.return_type().unwrap()|lift_fn }}({% call py::to_ffi_call_with_prefix("self._uniffi_clone_pointer()", eq) %})
-
-    def __ne__(self, other: object) -> {{ ne.return_type().unwrap()|type_name }}:
-        if not isinstance(other, {{ type_name }}):
-            return NotImplemented
-
-        return {{ ne.return_type().unwrap()|lift_fn }}({% call py::to_ffi_call_with_prefix("self._uniffi_clone_pointer()", ne) %})
-{%-         when UniffiTrait::Hash { hash } %}
-            {%- call py::method_decl("__hash__", hash) %}
-{%-      endmatch %}
-{%- endfor %}
-
-{%- if obj.has_callback_interface() %}
-{%- let ffi_init_callback = obj.ffi_init_callback() %}
-{%- let vtable = obj.vtable().expect("trait interface should have a vtable") %}
-{%- let vtable_methods = obj.vtable_methods() %}
-{% include "CallbackInterfaceImpl.py" %}
-{%- endif %}
-
-{# Objects as error #}
-{%- if ci.is_name_used_as_error(name) %}
-{# Due to some mismatches in the ffi converter mechanisms, errors are forced to be a RustBuffer #}
-class {{ ffi_converter_name }}__as_error(_UniffiConverterRustBuffer):
-    @classmethod
-    def read(cls, buf):
-        raise NotImplementedError()
-
-    @classmethod
-    def write(cls, value, buf):
-        raise NotImplementedError()
-
-    @staticmethod
-    def lift(value):
-        # Errors are always a rust buffer holding a pointer - which is a "read"
-        with value.consume_with_stream() as stream:
-            return {{ ffi_converter_name }}.read(stream)
-
-    @staticmethod
-    def lower(value):
-        raise NotImplementedError()
-
-{%- endif %}
-
-class {{ ffi_converter_name }}:
-    {%- if obj.has_callback_interface() %}
-    _handle_map = _UniffiHandleMap()
-    {%- endif %}
-
-    @staticmethod
-    def lift(value: int):
-        return {{ impl_name }}._make_instance_(value)
-
-    @staticmethod
-    def check_lower(value: {{ type_name }}):
-        {%- if obj.has_callback_interface() %}
-        pass
-        {%- else %}
-        if not isinstance(value, {{ impl_name }}):
-            raise TypeError("Expected {{ impl_name }} instance, {} found".format(type(value).__name__))
-        {%- endif %}
-
-    @staticmethod
-    def lower(value: {{ protocol_name }}):
-        {%- if obj.has_callback_interface() %}
-        return {{ ffi_converter_name }}._handle_map.insert(value)
-        {%- else %}
-        if not isinstance(value, {{ impl_name }}):
-            raise TypeError("Expected {{ impl_name }} instance, {} found".format(type(value).__name__))
-        return value._uniffi_clone_pointer()
-        {%- endif %}
-
-    @classmethod
-    def read(cls, buf: _UniffiRustBuffer):
-        ptr = buf.read_u64()
-        if ptr == 0:
-            raise InternalError("Raw pointer value was null")
-        return cls.lift(ptr)
-
-    @classmethod
-    def write(cls, value: {{ protocol_name }}, buf: _UniffiRustBuffer):
-        buf.write_u64(cls.lower(value))
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/OptionalTemplate.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/OptionalTemplate.py
index 4c07ae3e346f3..ae5eb0acecf08 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/OptionalTemplate.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/OptionalTemplate.py
@@ -1,10 +1,8 @@
-{%- let inner_ffi_converter = inner_type|ffi_converter_name %}
-
-class {{ ffi_converter_name }}(_UniffiConverterRustBuffer):
+class {{ opt.self_type.ffi_converter_name }}(_UniffiConverterRustBuffer):
     @classmethod
     def check_lower(cls, value):
         if value is not None:
-            {{ inner_ffi_converter }}.check_lower(value)
+            {{ opt.inner.ffi_converter_name }}.check_lower(value)
 
     @classmethod
     def write(cls, value, buf):
@@ -13,7 +11,7 @@ def write(cls, value, buf):
             return
 
         buf.write_u8(1)
-        {{ inner_ffi_converter }}.write(value, buf)
+        {{ opt.inner.ffi_converter_name }}.write(value, buf)
 
     @classmethod
     def read(cls, buf):
@@ -21,6 +19,6 @@ def read(cls, buf):
         if flag == 0:
             return None
         elif flag == 1:
-            return {{ inner_ffi_converter }}.read(buf)
+            return {{ opt.inner.ffi_converter_name }}.read(buf)
         else:
             raise InternalError("Unexpected flag byte for optional type")
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Protocol.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Protocol.py
index 0e48bda575045..5b8ec9130b94a 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Protocol.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Protocol.py
@@ -1,9 +1,10 @@
 {# misnamed - a generic "abstract base class". Used as both a protocol and an ABC for traits. #}
-class {{ protocol_name }}({{ protocol_base_class }}):
-    {%- call py::docstring_value(protocol_docstring, 4) %}
-    {%- for meth in methods.iter() %}
-    def {{ meth.name() }}(self, {% call py::arg_list_decl(meth) %}):
-        {%- call py::docstring(meth, 8) %}
+class {{ protocol.name }}({{ protocol.base_classes|join(", ") }}):
+    {{ protocol.docstring|docstring(4) -}}
+    {%- for meth in protocol.methods.iter() %}
+    {%- let callable = meth.callable %}
+    {% if callable.is_async %}async {% endif %}def {{ meth.callable.name }}(self, {% include "CallableArgs.py" %}) -> {{ callable.return_type.type_name }}:
+        {{ meth.docstring|docstring(8) -}}
         raise NotImplementedError
     {%- else %}
     pass
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/RecordTemplate.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/RecordTemplate.py
index d5a3838662098..d6d9dc22c7f48 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/RecordTemplate.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/RecordTemplate.py
@@ -1,65 +1,83 @@
-{%- let rec = ci.get_record_definition(name).unwrap() %}
-class {{ type_name }}:
-    {%- call py::docstring(rec, 4) %}
-    {%- for field in rec.fields() %}
-    {{ field.name() }}: "{{ field|type_name }}"
-    {%- call py::docstring(field, 4) %}
-    {%- endfor %}
-
-    {%- if rec.has_fields() %}
-    def __init__(self, *, {% for field in rec.fields() %}
-    {{- field.name() }}: "{{- field|type_name }}"
-    {%- if field.default_value().is_some() %} = _DEFAULT{% endif %}
+@dataclass
+class {{ rec.self_type.type_name }}:
+    {{ rec.docstring|docstring(4) -}}
+    {%- if !rec.fields.is_empty() -%}
+    def __init__(self, *, {% for field in rec.fields %}
+    {{- field.name }}: {{- field.ty.type_name}}
+    {%- if let Some(default) = field.default %} = {{ default.arg_literal }}{% endif %}
     {%- if !loop.last %}, {% endif %}
     {%- endfor %}):
-        {%- for field in rec.fields() %}
-        {%- let field_name = field.name() %}
-        {%- match field.default_value() %}
+        {%- for field in rec.fields %}
+        {%- match field.default %}
         {%- when None %}
-        self.{{ field_name }} = {{ field_name }}
-        {%- when Some(literal) %}
-        if {{ field_name }} is _DEFAULT:
-            self.{{ field_name }} = {{ literal|literal_py(field) }}
+        self.{{ field.name }} = {{ field.name }}
+        {%- when Some(default) %}
+        {%- if default.is_arg_literal %}
+        self.{{ field.name }} = {{ field.name }}
+        {%- else %}
+        if {{ field.name }} is {{ default.arg_literal }}:
+            self.{{ field.name }} = {{ default.py_default }}
         else:
-            self.{{ field_name }} = {{ field_name }}
+            self.{{ field.name }} = {{ field.name }}
+        {%- endif %}
         {%- endmatch %}
         {%- endfor %}
-    {%- endif %}
+    {%- endif -%}
+
+    {%- let uniffi_trait_methods = rec.uniffi_trait_methods -%}
 
+    {% filter indent(4) %}
+    {% include "UniffiTraitImpls.py" %}
+    {% endfilter %}
+
+{%- for meth in rec.methods -%}
+{%-     let callable = meth.callable %}
+    {% if callable.is_async %}async {% endif %}def {{ callable.name }}(self, {% include "CallableArgs.py" %}) -> {{ callable.return_type.type_name }}:
+        {{ meth.docstring|docstring(8) -}}
+        {%- filter indent(8) %}
+        {%- include "CallableBody.py" %}
+        {%- endfilter %}
+{%- endfor %}
+
+    {# "builtin" methods not handled by a uniffi_trait #}
+    {%- if uniffi_trait_methods.display_fmt.is_none() %}
     def __str__(self):
-        return "{{ type_name }}({% for field in rec.fields() %}{{ field.name() }}={}{% if loop.last %}{% else %}, {% endif %}{% endfor %})".format({% for field in rec.fields() %}self.{{ field.name() }}{% if loop.last %}{% else %}, {% endif %}{% endfor %})
+        return "{{ rec.self_type.type_name }}({% for field in rec.fields %}{{ field.name }}={}{% if loop.last %}{% else %}, {% endif %}{% endfor %})".format({% for field in rec.fields %}self.{{ field.name }}{% if loop.last %}{% else %}, {% endif %}{% endfor %})
+    {%- endif %}
 
+    {%- if uniffi_trait_methods.eq_eq.is_none() %}
     def __eq__(self, other):
-        {%- for field in rec.fields() %}
-        if self.{{ field.name() }} != other.{{ field.name() }}:
+        {%- for field in rec.fields %}
+        if self.{{ field.name }} != other.{{ field.name }}:
             return False
         {%- endfor %}
         return True
+    {%- endif %}
 
-class {{ ffi_converter_name }}(_UniffiConverterRustBuffer):
+class {{ rec.self_type.ffi_converter_name }}(_UniffiConverterRustBuffer):
     @staticmethod
     def read(buf):
-        return {{ type_name }}(
-            {%- for field in rec.fields() %}
-            {{ field.name() }}={{ field|read_fn }}(buf),
+        return {{ rec.self_type.type_name }}(
+            {%- for field in rec.fields %}
+            {{ field.name }}={{ field.ty.ffi_converter_name }}.read(buf),
             {%- endfor %}
         )
 
     @staticmethod
     def check_lower(value):
-        {%- if rec.fields().is_empty() %}
+        {%- if rec.fields.is_empty() %}
         pass
         {%- else %}
-        {%- for field in rec.fields() %}
-        {{ field|check_lower_fn }}(value.{{ field.name() }})
+        {%- for field in rec.fields %}
+        {{ field.ty.ffi_converter_name }}.check_lower(value.{{ field.name }})
         {%- endfor %}
         {%- endif %}
 
     @staticmethod
     def write(value, buf):
-        {%- if rec.has_fields() %}
-        {%- for field in rec.fields() %}
-        {{ field|write_fn }}(value.{{ field.name() }}, buf)
+        {%- if !rec.fields.is_empty() %}
+        {%- for field in rec.fields %}
+        {{ field.ty.ffi_converter_name }}.write(value.{{ field.name }}, buf)
         {%- endfor %}
         {%- else %}
         pass
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/RustBufferTemplate.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/RustBufferTemplate.py
index 5005bd1147dfb..1f30a0bb65950 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/RustBufferTemplate.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/RustBufferTemplate.py
@@ -12,14 +12,14 @@ def default():
 
     @staticmethod
     def alloc(size):
-        return _uniffi_rust_call(_UniffiLib.{{ ci.ffi_rustbuffer_alloc().name() }}, size)
+        return _uniffi_rust_call(_UniffiLib.{{ ffi_rustbuffer_alloc.0 }}, size)
 
     @staticmethod
     def reserve(rbuf, additional):
-        return _uniffi_rust_call(_UniffiLib.{{ ci.ffi_rustbuffer_reserve().name() }}, rbuf, additional)
+        return _uniffi_rust_call(_UniffiLib.{{ ffi_rustbuffer_reserve.0 }}, rbuf, additional)
 
     def free(self):
-        return _uniffi_rust_call(_UniffiLib.{{ ci.ffi_rustbuffer_free().name() }}, self)
+        return _uniffi_rust_call(_UniffiLib.{{ ffi_rustbuffer_free.0 }}, self)
 
     def __str__(self):
         return "_UniffiRustBuffer(capacity={}, len={}, data={})".format(
@@ -53,7 +53,7 @@ def consume_with_stream(self):
             s = _UniffiRustBufferStream.from_rust_buffer(self)
             yield s
             if s.remaining() != 0:
-                raise RuntimeError("junk data left in buffer at end of consume_with_stream")
+                raise RuntimeError(f"junk data left in buffer at end of consume_with_stream {s.remaining()}")
         finally:
             self.free()
 
@@ -67,7 +67,7 @@ def read_with_stream(self):
         s = _UniffiRustBufferStream.from_rust_buffer(self)
         yield s
         if s.remaining() != 0:
-            raise RuntimeError("junk data left in buffer at end of read_with_stream")
+            raise RuntimeError(f"junk data left in buffer at end of read_with_stream {s.remaining()}")
 
 class _UniffiForeignBytes(ctypes.Structure):
     _fields_ = [
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/SequenceTemplate.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/SequenceTemplate.py
index 3c30d9f9f50e3..9a9bf81ba0f8e 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/SequenceTemplate.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/SequenceTemplate.py
@@ -1,17 +1,15 @@
-{%- let inner_ffi_converter = inner_type|ffi_converter_name %}
-
-class {{ ffi_converter_name}}(_UniffiConverterRustBuffer):
+class {{ seq.self_type.ffi_converter_name}}(_UniffiConverterRustBuffer):
     @classmethod
     def check_lower(cls, value):
         for item in value:
-            {{ inner_ffi_converter }}.check_lower(item)
+            {{ seq.inner.ffi_converter_name }}.check_lower(item)
 
     @classmethod
     def write(cls, value, buf):
         items = len(value)
         buf.write_i32(items)
         for item in value:
-            {{ inner_ffi_converter }}.write(item, buf)
+            {{ seq.inner.ffi_converter_name }}.write(item, buf)
 
     @classmethod
     def read(cls, buf):
@@ -20,5 +18,5 @@ def read(cls, buf):
             raise InternalError("Unexpected negative sequence length")
 
         return [
-            {{ inner_ffi_converter }}.read(buf) for i in range(count)
+            {{ seq.inner.ffi_converter_name }}.read(buf) for i in range(count)
         ]
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/TopLevelFunctionTemplate.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/TopLevelFunctionTemplate.py
index ae012a7a06027..88c5f44b19faf 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/TopLevelFunctionTemplate.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/TopLevelFunctionTemplate.py
@@ -1,42 +1,6 @@
-{%- if func.is_async() %}
-
-{%- match func.return_type() -%}
-{%- when Some(return_type) %}
-async def {{ func.name() }}({%- call py::arg_list_decl(func) -%}) -> "{{ return_type|type_name }}":
-{% when None %}
-async def {{ func.name() }}({%- call py::arg_list_decl(func) -%}) -> None:
-{% endmatch %}
-
-    {%- call py::docstring(func, 4) %}
-    {%- call py::setup_args(func) %}
-    return await _uniffi_rust_call_async(
-        _UniffiLib.{{ func.ffi_func().name() }}({% call py::arg_list_lowered(func) %}),
-        _UniffiLib.{{func.ffi_rust_future_poll(ci) }},
-        _UniffiLib.{{func.ffi_rust_future_complete(ci) }},
-        _UniffiLib.{{func.ffi_rust_future_free(ci) }},
-        # lift function
-        {%- match func.return_type() %}
-        {%- when Some(return_type) %}
-        {{ return_type|lift_fn }},
-        {%- when None %}
-        lambda val: None,
-        {% endmatch %}
-        {% call py::error_ffi_converter(func) %}
-    )
-
-{%- else %}
-{%- match func.return_type() -%}
-{%- when Some(return_type) %}
-
-def {{ func.name() }}({%- call py::arg_list_decl(func) -%}) -> "{{ return_type|type_name }}":
-    {%- call py::docstring(func, 4) %}
-    {%- call py::setup_args(func) %}
-    return {{ return_type|lift_fn }}({% call py::to_ffi_call(func) %})
-{% when None %}
-
-def {{ func.name() }}({%- call py::arg_list_decl(func) -%}) -> None:
-    {%- call py::docstring(func, 4) %}
-    {%- call py::setup_args(func) %}
-    {% call py::to_ffi_call(func) %}
-{% endmatch %}
-{%- endif %}
+{%- let callable = func.callable %}
+{% if callable.is_async %}async {% endif %}def {{ callable.name }}({% include "CallableArgs.py" %}) -> {{ callable.return_type.type_name }}:
+    {{ func.docstring|docstring(4) -}}
+    {%- filter indent(4) %}
+    {%- include "CallableBody.py" %}
+    {%- endfilter %}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Types.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Types.py
index e029e1f4790fb..6d09ef9af9e05 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Types.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Types.py
@@ -1,13 +1,4 @@
-{%- import "macros.py" as py %}
-
-{%- if ci.has_callback_definitions() %}
-{%- include "CallbackInterfaceRuntime.py" %}
-{%- endif %}
-
-{%- for type_ in ci.iter_local_types() %}
-{%- let type_name = type_|type_name %}
-{%- let ffi_converter_name = type_|ffi_converter_name %}
-{%- let canonical_type_name = type_|canonical_name %}
+{%- for type_def in type_definitions %}
 
 {#
  # Map `Type` instances to an include statement for that type.
@@ -18,108 +9,90 @@
  #   - When adding additional types here, make sure to also add a match arm to that function.
  #   - To keep things manageable, let's try to limit ourselves to these 2 mega-matches
  #}
-{%- match type_ %}
+{%- match type_def %}
+
+{%- when TypeDefinition::Simple(type_node) %}
+{%- match type_node.ty %}
 
 {%- when Type::Boolean %}
-{%- include "BooleanHelper.py" %}
+{%- include "builtins/Boolean.py" %}
 
 {%- when Type::Int8 %}
-{%- include "Int8Helper.py" %}
+{%- include "builtins/Int8.py" %}
 
 {%- when Type::Int16 %}
-{%- include "Int16Helper.py" %}
+{%- include "builtins/Int16.py" %}
 
 {%- when Type::Int32 %}
-{%- include "Int32Helper.py" %}
+{%- include "builtins/Int32.py" %}
 
 {%- when Type::Int64 %}
-{%- include "Int64Helper.py" %}
+{%- include "builtins/Int64.py" %}
 
 {%- when Type::UInt8 %}
-{%- include "UInt8Helper.py" %}
+{%- include "builtins/UInt8.py" %}
 
 {%- when Type::UInt16 %}
-{%- include "UInt16Helper.py" %}
+{%- include "builtins/UInt16.py" %}
 
 {%- when Type::UInt32 %}
-{%- include "UInt32Helper.py" %}
+{%- include "builtins/UInt32.py" %}
 
 {%- when Type::UInt64 %}
-{%- include "UInt64Helper.py" %}
+{%- include "builtins/UInt64.py" %}
 
 {%- when Type::Float32 %}
-{%- include "Float32Helper.py" %}
+{%- include "builtins/Float32.py" %}
 
 {%- when Type::Float64 %}
-{%- include "Float64Helper.py" %}
+{%- include "builtins/Float64.py" %}
 
 {%- when Type::String %}
-{%- include "StringHelper.py" %}
+{%- include "builtins/String.py" %}
 
 {%- when Type::Bytes %}
-{%- include "BytesHelper.py" %}
-
-{%- when Type::Enum { name, module_path } %}
-{%- let e = ci.get_enum_definition(name).unwrap() %}
-{# For enums, there are either an error *or* an enum, they can't be both. #}
-{%- if ci.is_name_used_as_error(name) %}
-{%- include "ErrorTemplate.py" %}
-{%- else %}
-{%- include "EnumTemplate.py" %}
-{% endif %}
-
-{%- when Type::Record { name, module_path } %}
-{%- include "RecordTemplate.py" %}
+{%- include "builtins/Bytes.py" %}
 
 {%- when Type::Timestamp %}
-{%- include "TimestampHelper.py" %}
+{%- include "builtins/Timestamp.py" %}
 
 {%- when Type::Duration %}
-{%- include "DurationHelper.py" %}
+{%- include "builtins/Duration.py" %}
+
+{%- else %}
+{# Type::Simple shouldn't hold any other Type variants #}
+{%- endmatch %}
 
-{%- when Type::Optional { inner_type } %}
+{%- when TypeDefinition::Optional(opt) %}
 {%- include "OptionalTemplate.py" %}
 
-{%- when Type::Sequence { inner_type } %}
+{%- when TypeDefinition::Sequence(seq) %}
 {%- include "SequenceTemplate.py" %}
 
-{%- when Type::Map { key_type, value_type } %}
+{%- when TypeDefinition::Map(map) %}
 {%- include "MapTemplate.py" %}
 
-{%- when Type::CallbackInterface { name, module_path } %}
+{%- when TypeDefinition::Enum(e) %}
+{# For enums, there are either an error *or* an enum, they can't be both. #}
+{%- if e.self_type.is_used_as_error %}
+{%- include "ErrorTemplate.py" %}
+{%- else %}
+{%- include "EnumTemplate.py" %}
+{% endif %}
+
+{%- when TypeDefinition::Record(rec) %}
+{%- include "RecordTemplate.py" %}
+
+{%- when TypeDefinition::Interface(int) %}
+{%- include "InterfaceTemplate.py" %}
+
+
+{%- when TypeDefinition::CallbackInterface(cbi) %}
 {%- include "CallbackInterfaceTemplate.py" %}
 
-{%- when Type::Custom { name, module_path, builtin } %}
-{%- if ci.is_external(type_) %}
-{%- include "ExternalTemplate.py" %}
-{%- else %}
+{%- when TypeDefinition::Custom(custom) %}
 {%- include "CustomType.py" %}
-{%- endif %}
-
-{%- else %}
-{%- endmatch %}
-{%- endfor %}
 
-# objects.
-{%- for type_ in ci.filter_local_types(self.iter_sorted_object_types()) %}
-{%- match type_ %}
-{%- when Type::Object { name, .. } %}
-{%-     let type_name = type_|type_name %}
-{%-     let ffi_converter_name = type_|ffi_converter_name %}
-{%-     let canonical_type_name = type_|canonical_name %}
-{%-     include "ObjectTemplate.py" %}
 {%- else %}
 {%- endmatch %}
 {%- endfor %}
-
-{%- for type_ in ci.iter_external_types() %}
-{%- let name = type_.name().unwrap() %}
-{%- include "ExternalTemplate.py" %}
-{%- endfor %}
-{#-
-Setup type aliases for our custom types, has complications due to
-forward type references, #2067
--#}
-{%- for (name, ty) in self.get_custom_type_aliases() %}
-{{ name }} = {{ ty|type_name }}
-{%- endfor %}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/UniffiTraitImpls.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/UniffiTraitImpls.py
new file mode 100644
index 0000000000000..fc332840dc6e3
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/UniffiTraitImpls.py
@@ -0,0 +1,72 @@
+{# expects var `uniffi_trait_methods` #}
+{%- if let Some(fmt) = uniffi_trait_methods.debug_fmt %}
+{%-    let callable = fmt.callable %}
+# The Rust `Debug::fmt` implementation.
+def __repr__(self) -> {{ callable.return_type.type_name }}:
+    {% filter indent(4) -%}
+    {% include "CallableBody.py" -%}
+    {% endfilter -%}
+{%- endif %}
+
+{%- if let Some(fmt) = uniffi_trait_methods.display_fmt %}
+{%-    let callable = fmt.callable %}
+# The Rust `Display::fmt` implementation.
+def __str__(self) -> {{ callable.return_type.type_name }}:
+    {% filter indent(4) -%}
+    {% include "CallableBody.py" -%}
+    {% endfilter -%}
+{%- endif %}
+
+{%- if let Some(eq) = uniffi_trait_methods.eq_eq %}
+{%-    let callable = eq.callable %}
+# The Rust `Eq::eq` implementation.
+def __eq__(self, other: object) -> {{ callable.return_type.type_name }}:
+    if not isinstance(other, {{ callable.self_type().unwrap().type_name }}):
+        return NotImplemented
+
+    {% filter indent(4) -%}
+    {% include "CallableBody.py" -%}
+    {% endfilter -%}
+{%- endif %}
+{%- if let Some(ne) = uniffi_trait_methods.eq_ne %}
+{%-    let callable = ne.callable %}
+# The Rust `Eq::ne` implementation.
+def __ne__(self, other: object) -> {{ callable.return_type.type_name }}:
+    if not isinstance(other, {{ callable.self_type().unwrap().type_name }}):
+        return NotImplemented
+    {% filter indent(4) -%}
+    {% include "CallableBody.py" -%}
+    {% endfilter -%}
+{%- endif %}
+
+{%- if let Some(hash) = uniffi_trait_methods.hash_hash %}
+{%-    let callable = hash.callable %}
+# The Rust `Hash::hash` implementation.
+def __hash__(self) -> {{ callable.return_type.type_name }}:
+    {% filter indent(4) -%}
+    {% include "CallableBody.py" -%}
+    {% endfilter -%}
+
+{%- endif %}
+
+{%- if let Some(cmp) = uniffi_trait_methods.ord_cmp %}
+{%-    let callable = cmp.callable %}
+# The Rust `Ord::cmp` implementation.
+# lol/sob, python3 got rid of the perfect python2 `.__cmp__()` :(
+def __rust_cmp__(self, other) -> {{ callable.return_type.type_name }}:
+    {% filter indent(4) -%}
+    {% include "CallableBody.py" -%}
+    {% endfilter %}
+
+def __lt__(self, other) -> bool:
+    return self.__rust_cmp__(other) < 0
+
+def __le__(self, other) -> bool:
+    return self.__rust_cmp__(other) <= 0
+
+def __gt__(self, other) -> bool:
+    return self.__rust_cmp__(other) > 0
+
+def __ge__(self, other) -> bool:
+    return self.__rust_cmp__(other) >= 0
+{%- endif %}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/BooleanHelper.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Boolean.py
similarity index 90%
rename from third_party/rust/uniffi_bindgen/src/bindings/python/templates/BooleanHelper.py
rename to third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Boolean.py
index 3f8c5d1d4db62..6a673ddeaa3da 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/BooleanHelper.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Boolean.py
@@ -1,4 +1,4 @@
-class _UniffiConverterBool:
+class {{ type_node.ffi_converter_name }}:
     @classmethod
     def check_lower(cls, value):
         return not not value
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/BytesHelper.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Bytes.py
similarity index 88%
rename from third_party/rust/uniffi_bindgen/src/bindings/python/templates/BytesHelper.py
rename to third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Bytes.py
index 4d09531322b22..30e13451073e1 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/BytesHelper.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Bytes.py
@@ -1,4 +1,4 @@
-class _UniffiConverterBytes(_UniffiConverterRustBuffer):
+class {{ type_node.ffi_converter_name }}(_UniffiConverterRustBuffer):
     @staticmethod
     def read(buf):
         size = buf.read_i32()
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/DurationHelper.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Duration.py
similarity index 92%
rename from third_party/rust/uniffi_bindgen/src/bindings/python/templates/DurationHelper.py
rename to third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Duration.py
index ecb035b7f40c0..75084f9cb938d 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/DurationHelper.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Duration.py
@@ -4,7 +4,7 @@
 # There is a loss of precision when converting from Rust durations,
 # which are accurate to the nanosecond,
 # to Python durations, which are only accurate to the microsecond.
-class _UniffiConverterDuration(_UniffiConverterRustBuffer):
+class {{ type_node.ffi_converter_name }}(_UniffiConverterRustBuffer):
     @staticmethod
     def read(buf):
         seconds = buf.read_u64()
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Float32Helper.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Float32.py
similarity index 66%
rename from third_party/rust/uniffi_bindgen/src/bindings/python/templates/Float32Helper.py
rename to third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Float32.py
index 49a1a7286efae..c32c6f3482d54 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Float32Helper.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Float32.py
@@ -1,4 +1,4 @@
-class _UniffiConverterFloat(_UniffiConverterPrimitiveFloat):
+class {{ type_node.ffi_converter_name }}(_UniffiConverterPrimitiveFloat):
     @staticmethod
     def read(buf):
         return buf.read_float()
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Float64Helper.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Float64.py
similarity index 66%
rename from third_party/rust/uniffi_bindgen/src/bindings/python/templates/Float64Helper.py
rename to third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Float64.py
index e2084c7b13ec5..fb9f43bd109ec 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Float64Helper.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Float64.py
@@ -1,4 +1,4 @@
-class _UniffiConverterDouble(_UniffiConverterPrimitiveFloat):
+class {{ type_node.ffi_converter_name }}(_UniffiConverterPrimitiveFloat):
     @staticmethod
     def read(buf):
         return buf.read_double()
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Int16Helper.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Int16.py
similarity index 74%
rename from third_party/rust/uniffi_bindgen/src/bindings/python/templates/Int16Helper.py
rename to third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Int16.py
index befa5633846da..ecd0218171fac 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Int16Helper.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Int16.py
@@ -1,4 +1,4 @@
-class _UniffiConverterInt16(_UniffiConverterPrimitiveInt):
+class {{ type_node.ffi_converter_name }}(_UniffiConverterPrimitiveInt):
     CLASS_NAME = "i16"
     VALUE_MIN = -2**15
     VALUE_MAX = 2**15
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Int32Helper.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Int32.py
similarity index 74%
rename from third_party/rust/uniffi_bindgen/src/bindings/python/templates/Int32Helper.py
rename to third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Int32.py
index 70644f6717148..95a4e88d9c63f 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Int32Helper.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Int32.py
@@ -1,4 +1,4 @@
-class _UniffiConverterInt32(_UniffiConverterPrimitiveInt):
+class {{ type_node.ffi_converter_name }}(_UniffiConverterPrimitiveInt):
     CLASS_NAME = "i32"
     VALUE_MIN = -2**31
     VALUE_MAX = 2**31
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Int64Helper.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Int64.py
similarity index 74%
rename from third_party/rust/uniffi_bindgen/src/bindings/python/templates/Int64Helper.py
rename to third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Int64.py
index 232f127bd6ed2..292d427763a79 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Int64Helper.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Int64.py
@@ -1,4 +1,4 @@
-class _UniffiConverterInt64(_UniffiConverterPrimitiveInt):
+class {{ type_node.ffi_converter_name }}(_UniffiConverterPrimitiveInt):
     CLASS_NAME = "i64"
     VALUE_MIN = -2**63
     VALUE_MAX = 2**63
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Int8Helper.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Int8.py
similarity index 74%
rename from third_party/rust/uniffi_bindgen/src/bindings/python/templates/Int8Helper.py
rename to third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Int8.py
index c1de1625e73d7..51e0988298330 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/Int8Helper.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Int8.py
@@ -1,4 +1,4 @@
-class _UniffiConverterInt8(_UniffiConverterPrimitiveInt):
+class {{ type_node.ffi_converter_name }}(_UniffiConverterPrimitiveInt):
     CLASS_NAME = "i8"
     VALUE_MIN = -2**7
     VALUE_MAX = 2**7
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/StringHelper.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/String.py
similarity index 95%
rename from third_party/rust/uniffi_bindgen/src/bindings/python/templates/StringHelper.py
rename to third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/String.py
index d574edd09fa8d..c3c71108a42c5 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/StringHelper.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/String.py
@@ -1,4 +1,4 @@
-class _UniffiConverterString:
+class {{ type_node.ffi_converter_name }}:
     @staticmethod
     def check_lower(value):
         if not isinstance(value, str):
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/TimestampHelper.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Timestamp.py
similarity index 95%
rename from third_party/rust/uniffi_bindgen/src/bindings/python/templates/TimestampHelper.py
rename to third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Timestamp.py
index 76d7f8bcdbaa3..e5861c3060e5d 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/TimestampHelper.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/Timestamp.py
@@ -4,7 +4,7 @@
 # There is a loss of precision when converting from Rust timestamps,
 # which are accurate to the nanosecond,
 # to Python datetimes, which have a variable precision due to the use of float as representation.
-class _UniffiConverterTimestamp(_UniffiConverterRustBuffer):
+class {{ type_node.ffi_converter_name }}(_UniffiConverterRustBuffer):
     @staticmethod
     def read(buf):
         seconds = buf.read_i64()
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/UInt16Helper.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/UInt16.py
similarity index 74%
rename from third_party/rust/uniffi_bindgen/src/bindings/python/templates/UInt16Helper.py
rename to third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/UInt16.py
index 039bf76162f88..0aaf91b152e39 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/UInt16Helper.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/UInt16.py
@@ -1,4 +1,4 @@
-class _UniffiConverterUInt16(_UniffiConverterPrimitiveInt):
+class {{ type_node.ffi_converter_name }}(_UniffiConverterPrimitiveInt):
     CLASS_NAME = "u16"
     VALUE_MIN = 0
     VALUE_MAX = 2**16
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/UInt32Helper.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/UInt32.py
similarity index 74%
rename from third_party/rust/uniffi_bindgen/src/bindings/python/templates/UInt32Helper.py
rename to third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/UInt32.py
index 1650bf9b609fd..71b99d11df1fb 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/UInt32Helper.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/UInt32.py
@@ -1,4 +1,4 @@
-class _UniffiConverterUInt32(_UniffiConverterPrimitiveInt):
+class {{ type_node.ffi_converter_name }}(_UniffiConverterPrimitiveInt):
     CLASS_NAME = "u32"
     VALUE_MIN = 0
     VALUE_MAX = 2**32
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/UInt64Helper.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/UInt64.py
similarity index 74%
rename from third_party/rust/uniffi_bindgen/src/bindings/python/templates/UInt64Helper.py
rename to third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/UInt64.py
index f354545e26be6..9f4d929f98aa0 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/UInt64Helper.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/UInt64.py
@@ -1,4 +1,4 @@
-class _UniffiConverterUInt64(_UniffiConverterPrimitiveInt):
+class {{ type_node.ffi_converter_name }}(_UniffiConverterPrimitiveInt):
     CLASS_NAME = "u64"
     VALUE_MIN = 0
     VALUE_MAX = 2**64
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/UInt8Helper.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/UInt8.py
similarity index 73%
rename from third_party/rust/uniffi_bindgen/src/bindings/python/templates/UInt8Helper.py
rename to third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/UInt8.py
index cee130b4d90f3..8c27a59d76db1 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/UInt8Helper.py
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/builtins/UInt8.py
@@ -1,4 +1,4 @@
-class _UniffiConverterUInt8(_UniffiConverterPrimitiveInt):
+class {{ type_node.ffi_converter_name }}(_UniffiConverterPrimitiveInt):
     CLASS_NAME = "u8"
     VALUE_MIN = 0
     VALUE_MAX = 2**8
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/macros.py b/third_party/rust/uniffi_bindgen/src/bindings/python/templates/macros.py
deleted file mode 100644
index c622dfe3a497c..0000000000000
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/templates/macros.py
+++ /dev/null
@@ -1,178 +0,0 @@
-{#
-// Template to call into rust. Used in several places.
-// Variable names in `arg_list_decl` should match up with arg lists
-// passed to rust via `arg_list_lowered`
-#}
-
-{%- macro to_ffi_call(func) -%}
-{%- call _to_ffi_call_with_prefix_arg("", func) %}
-{%- endmacro -%}
-
-{%- macro to_ffi_call_with_prefix(prefix, func) -%}
-{%- call _to_ffi_call_with_prefix_arg(format!("{},", prefix), func) %}
-{%- endmacro -%}
-
-{%- macro _to_ffi_call_with_prefix_arg(prefix, func) -%}
-{%- match func.throws_type() -%}
-{%-     when Some with (e) -%}
-{%-         match e -%}
-{%-             when Type::Enum { .. } -%}
-_uniffi_rust_call_with_error({{ e|ffi_converter_name }},
-{%-             when Type::Object { .. } -%}
-_uniffi_rust_call_with_error({{ e|ffi_converter_name }}__as_error,
-{%-             else %}
-# unsupported error type!
-{%-         endmatch %}
-{%- else -%}
-_uniffi_rust_call(
-{%- endmatch -%}
-    _UniffiLib.{{ func.ffi_func().name() }},
-    {{- prefix }}
-    {%- call arg_list_lowered(func) -%}
-)
-{%- endmacro -%}
-
-{%- macro arg_list_lowered(func) %}
-    {%- for arg in func.arguments() %}
-        {{ arg|lower_fn }}({{ arg.name() }})
-        {%- if !loop.last %},{% endif %}
-    {%- endfor %}
-{%- endmacro -%}
-
-{%- macro docstring_value(maybe_docstring, indent_spaces) %}
-{%- if let Some(docstring) = maybe_docstring %}
-{{ docstring|docstring(indent_spaces) }}
-{{ "" }}
-{%- endif %}
-{%- endmacro %}
-
-{%- macro docstring(defn, indent_spaces) %}
-{%- call docstring_value(defn.docstring(), indent_spaces) %}
-{%- endmacro %}
-
-{#-
-// Arglist as used in Python declarations of methods, functions and constructors.
-// Note the type_name filters.
--#}
-
-{% macro arg_list_decl(func) %}
-    {%- for arg in func.arguments() -%}
-        {{ arg.name() }}
-        {%- match arg.default_value() %}
-        {%- when Some with(literal) %}: "typing.Union[object, {{ arg|type_name -}}]" = _DEFAULT
-        {%- else %}: "{{ arg|type_name -}}"
-        {%- endmatch %}
-        {%- if !loop.last %},{% endif -%}
-    {%- endfor %}
-{%- endmacro %}
-
-{#-
-// Arglist as used in the _UniffiLib function declarations.
-// Note unfiltered name but ffi_type_name filters.
--#}
-{%- macro arg_list_ffi_decl(func) %}
-    {%- for arg in func.arguments() %}
-    {{ arg.type_().borrow()|ffi_type_name(ci) }},
-    {%- endfor %}
-    {%- if func.has_rust_call_status_arg() %}
-    ctypes.POINTER(_UniffiRustCallStatus),{% endif %}
-{% endmacro -%}
-
-{#
- # Setup function arguments by initializing default values.
- #}
-{%- macro setup_args(func) %}
-    {%- for arg in func.arguments() %}
-    {%- if let Some(literal) = arg.default_value() %}
-    if {{ arg.name() }} is _DEFAULT:
-        {{ arg.name() }} = {{ literal|literal_py(arg.as_type().borrow()) }}
-    {%- endif %}
-    {{ arg|check_lower_fn }}({{ arg.name() }})
-    {% endfor -%}
-{%- endmacro -%}
-
-{#
- # Exactly the same thing as `setup_args()` but with an extra 4 spaces of
- # indent so that it works with object methods.
- #}
-{%- macro setup_args_extra_indent(func) %}
-        {%- for arg in func.arguments() %}
-        {%- if let Some(literal) = arg.default_value() %}
-        if {{ arg.name() }} is _DEFAULT:
-            {{ arg.name() }} = {{ literal|literal_py(arg.as_type().borrow()) }}
-        {%- endif %}
-        {{ arg|check_lower_fn }}({{ arg.name() }})
-        {% endfor -%}
-{%- endmacro -%}
-
-{#
- # Macro to call methods
- #}
-{%- macro method_decl(py_method_name, meth) %}
-{%  if meth.is_async() %}
-
-{%-     match meth.return_type() %}
-{%-         when Some(return_type) %}
-    async def {{ py_method_name }}(self, {% call arg_list_decl(meth) %}) -> "{{ return_type|type_name }}":
-{%-         when None %}
-    async def {{ py_method_name }}(self, {% call arg_list_decl(meth) %}) -> None:
-{%      endmatch %}
-
-        {%- call docstring(meth, 8) %}
-        {%- call setup_args_extra_indent(meth) %}
-        return await _uniffi_rust_call_async(
-            _UniffiLib.{{ meth.ffi_func().name() }}(
-                self._uniffi_clone_pointer(), {% call arg_list_lowered(meth) %}
-            ),
-            _UniffiLib.{{ meth.ffi_rust_future_poll(ci) }},
-            _UniffiLib.{{ meth.ffi_rust_future_complete(ci) }},
-            _UniffiLib.{{ meth.ffi_rust_future_free(ci) }},
-            # lift function
-            {%- match meth.return_type() %}
-            {%- when Some(return_type) %}
-            {{ return_type|lift_fn }},
-            {%- when None %}
-            lambda val: None,
-            {% endmatch %}
-            {% call error_ffi_converter(meth) %}
-        )
-
-{%- else -%}
-{%-     match meth.return_type() %}
-
-{%-         when Some(return_type) %}
-
-    def {{ py_method_name }}(self, {% call arg_list_decl(meth) %}) -> "{{ return_type|type_name }}":
-        {%- call docstring(meth, 8) %}
-        {%- call setup_args_extra_indent(meth) %}
-        return {{ return_type|lift_fn }}(
-            {% call to_ffi_call_with_prefix("self._uniffi_clone_pointer()", meth) %}
-        )
-
-{%-         when None %}
-
-    def {{ py_method_name }}(self, {% call arg_list_decl(meth) %}) -> None:
-        {%- call docstring(meth, 8) %}
-        {%- call setup_args_extra_indent(meth) %}
-        {% call to_ffi_call_with_prefix("self._uniffi_clone_pointer()", meth) %}
-{%      endmatch %}
-{%  endif %}
-
-{% endmacro %}
-
-{%- macro error_ffi_converter(func) %}
-    # Error FFI converter
-{%  match func.throws_type() %}
-{%-     when Some(e) %}
-{%-         match e -%}
-{%-             when Type::Enum { .. } -%}
-    {{ e|ffi_converter_name }},
-{%-             when Type::Object { .. } -%}
-    {{ e|ffi_converter_name }}__as_error,
-{%-             else %}
-    # unsupported error type!
-{%-         endmatch %}
-{%-     when None %}
-    None,
-{%-  endmatch %}
-{% endmacro %}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/python/test.rs b/third_party/rust/uniffi_bindgen/src/bindings/python/test.rs
index 39dbc9c1365be..3969bd0ed1927 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/python/test.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/python/test.rs
@@ -2,9 +2,10 @@
 License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+use crate::bindings::python::pipeline::initial;
+use crate::bindings::python::run_pipeline;
 use crate::bindings::RunScriptOptions;
 use crate::cargo_metadata::CrateConfigSupplier;
-use crate::library_mode::generate_bindings;
 use anyhow::{Context, Result};
 use camino::Utf8Path;
 use std::env;
@@ -37,16 +38,14 @@ pub fn run_script(
     let test_helper = UniFFITestHelper::new(crate_name)?;
     let out_dir = test_helper.create_out_dir(tmp_dir, &script_path)?;
     let cdylib_path = test_helper.copy_cdylib_to_out_dir(&out_dir)?;
-    generate_bindings(
-        &cdylib_path,
-        None,
-        &super::PythonBindingGenerator,
-        &CrateConfigSupplier::from(test_helper.cargo_metadata()),
-        None,
-        &out_dir,
-        false,
-    )?;
 
+    // Generate bindings
+    let mut paths = crate::BindgenPaths::default();
+    paths.add_layer(CrateConfigSupplier::from(test_helper.cargo_metadata()));
+    let root = initial::Root::from_library(paths, &cdylib_path, None)?;
+    run_pipeline(root, &out_dir, None)?;
+
+    // Run the python script
     let pythonpath = env::var_os("PYTHONPATH").unwrap_or_else(|| OsString::from(""));
     let pythonpath = env::join_paths(
         env::split_paths(&pythonpath).chain(vec![out_dir.to_path_buf().into_std_path_buf()]),
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/ruby/gen_ruby/mod.rs b/third_party/rust/uniffi_bindgen/src/bindings/ruby/gen_ruby/mod.rs
index 07e38dfcc016a..2af9c34faae79 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/ruby/gen_ruby/mod.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/ruby/gen_ruby/mod.rs
@@ -115,7 +115,7 @@ impl<'a> RubyWrapper<'a> {
 mod filters {
     use super::*;
 
-    pub fn type_ffi(type_: &FfiType) -> Result<String, askama::Error> {
+    pub fn type_ffi(type_: &FfiType, _: &dyn askama::Values) -> Result<String, askama::Error> {
         Ok(match type_ {
             FfiType::Int8 => ":int8".to_string(),
             FfiType::UInt8 => ":uint8".to_string(),
@@ -128,7 +128,6 @@ mod filters {
             FfiType::Float32 => ":float".to_string(),
             FfiType::Float64 => ":double".to_string(),
             FfiType::Handle => ":uint64".to_string(),
-            FfiType::RustArcPtr(_) => ":pointer".to_string(),
             FfiType::RustBuffer(_) => "RustBuffer.by_value".to_string(),
             FfiType::RustCallStatus => "RustCallStatus".to_string(),
             FfiType::ForeignBytes => "ForeignBytes".to_string(),
@@ -145,7 +144,13 @@ mod filters {
         })
     }
 
-    pub fn literal_rb(literal: &Literal) -> Result<String, askama::Error> {
+    pub fn default_rb(
+        default: &DefaultValue,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
+        let DefaultValue::Literal(literal) = default else {
+            unimplemented!("not supported.");
+        };
         Ok(match literal {
             Literal::Boolean(v) => {
                 if *v {
@@ -157,12 +162,12 @@ mod filters {
             // use the double-quote form to match with the other languages, and quote escapes.
             Literal::String(s) => format!("\"{s}\""),
             Literal::None => "nil".into(),
-            Literal::Some { inner } => literal_rb(inner)?,
+            Literal::Some { inner } => default_rb(inner, &())?,
             Literal::EmptySequence => "[]".into(),
             Literal::EmptyMap => "{}".into(),
             Literal::Enum(v, type_) => match type_ {
                 Type::Enum { name, .. } => {
-                    format!("{}::{}", class_name_rb(name)?, enum_name_rb(v)?)
+                    format!("{}::{}", class_name_rb(name, &())?, enum_name_rb(v, &())?)
                 }
                 _ => panic!("Unexpected type in enum literal: {type_:?}"),
             },
@@ -181,27 +186,28 @@ mod filters {
         })
     }
 
-    pub fn class_name_rb(nm: &str) -> Result<String, askama::Error> {
+    pub fn class_name_rb(nm: &str, _: &dyn askama::Values) -> Result<String, askama::Error> {
         Ok(nm.to_string().to_upper_camel_case())
     }
 
-    pub fn fn_name_rb(nm: &str) -> Result<String, askama::Error> {
+    pub fn fn_name_rb(nm: &str, _: &dyn askama::Values) -> Result<String, askama::Error> {
         Ok(nm.to_string().to_snake_case())
     }
 
-    pub fn var_name_rb(nm: &str) -> Result<String, askama::Error> {
+    pub fn var_name_rb(nm: &str, _: &dyn askama::Values) -> Result<String, askama::Error> {
         let nm = nm.to_string();
         let prefix = if is_reserved_word(&nm) { "_" } else { "" };
 
         Ok(format!("{prefix}{}", nm.to_snake_case()))
     }
 
-    pub fn enum_name_rb(nm: &str) -> Result<String, askama::Error> {
+    pub fn enum_name_rb(nm: &str, _: &dyn askama::Values) -> Result<String, askama::Error> {
         Ok(nm.to_string().to_shouty_snake_case())
     }
 
     pub fn coerce_rb<S1: AsRef<str>, S2: AsRef<str>>(
         nm: S1,
+        _: &dyn askama::Values,
         ns: S2,
         type_: &Type,
     ) -> Result<String, askama::Error> {
@@ -225,9 +231,11 @@ mod filters {
             Type::CallbackInterface { .. } => {
                 panic!("No support for coercing callback interfaces yet")
             }
-            Type::Optional { inner_type: t } => format!("({nm} ? {} : nil)", coerce_rb(nm, ns, t)?),
+            Type::Optional { inner_type: t } => {
+                format!("({nm} ? {} : nil)", coerce_rb(nm, &(), ns, t)?)
+            }
             Type::Sequence { inner_type: t } => {
-                let coerce_code = coerce_rb("v", ns, t)?;
+                let coerce_code = coerce_rb("v", &(), ns, t)?;
                 if coerce_code == "v" {
                     nm.to_string()
                 } else {
@@ -235,8 +243,8 @@ mod filters {
                 }
             }
             Type::Map { value_type: t, .. } => {
-                let k_coerce_code = coerce_rb("k", ns, &Type::String)?;
-                let v_coerce_code = coerce_rb("v", ns, t)?;
+                let k_coerce_code = coerce_rb("k", &(), ns, &Type::String)?;
+                let v_coerce_code = coerce_rb("v", &(), ns, t)?;
 
                 if k_coerce_code == "k" && v_coerce_code == "v" {
                     nm.to_string()
@@ -250,11 +258,15 @@ mod filters {
         })
     }
 
-    pub fn check_lower_rb<S: AsRef<str>>(nm: S, type_: &Type) -> Result<String, askama::Error> {
+    pub fn check_lower_rb<S: AsRef<str>>(
+        nm: S,
+        _: &dyn askama::Values,
+        type_: &Type,
+    ) -> Result<String, askama::Error> {
         let nm = nm.as_ref();
         Ok(match type_ {
             Type::Object { name, .. } => {
-                format!("({}.uniffi_check_lower {nm})", class_name_rb(name)?)
+                format!("({}.uniffi_check_lower {nm})", class_name_rb(name, &())?)
             }
             Type::Enum { .. }
             | Type::Record { .. }
@@ -262,14 +274,18 @@ mod filters {
             | Type::Sequence { .. }
             | Type::Map { .. } => format!(
                 "RustBuffer.check_lower_{}({})",
-                class_name_rb(&canonical_name(type_))?,
+                class_name_rb(&canonical_name(type_), &())?,
                 nm
             ),
             _ => "".to_owned(),
         })
     }
 
-    pub fn lower_rb(nm: &str, type_: &Type) -> Result<String, askama::Error> {
+    pub fn lower_rb(
+        nm: &str,
+        _: &dyn askama::Values,
+        type_: &Type,
+    ) -> Result<String, askama::Error> {
         Ok(match type_ {
             Type::Int8
             | Type::UInt8
@@ -284,7 +300,9 @@ mod filters {
             Type::Boolean => format!("({nm} ? 1 : 0)"),
             Type::String => format!("RustBuffer.allocFromString({nm})"),
             Type::Bytes => format!("RustBuffer.allocFromBytes({nm})"),
-            Type::Object { name, .. } => format!("({}.uniffi_lower {nm})", class_name_rb(name)?),
+            Type::Object { name, .. } => {
+                format!("({}.uniffi_lower {nm})", class_name_rb(name, &())?)
+            }
             Type::CallbackInterface { .. } => {
                 panic!("No support for lowering callback interfaces yet")
             }
@@ -296,14 +314,18 @@ mod filters {
             | Type::Duration
             | Type::Map { .. } => format!(
                 "RustBuffer.alloc_from_{}({})",
-                class_name_rb(&canonical_name(type_))?,
+                class_name_rb(&canonical_name(type_), &())?,
                 nm
             ),
             Type::Custom { .. } => panic!("No support for lowering custom types, yet"),
         })
     }
 
-    pub fn lift_rb(nm: &str, type_: &Type) -> Result<String, askama::Error> {
+    pub fn lift_rb(
+        nm: &str,
+        _: &dyn askama::Values,
+        type_: &Type,
+    ) -> Result<String, askama::Error> {
         Ok(match type_ {
             Type::Int8
             | Type::UInt8
@@ -317,7 +339,9 @@ mod filters {
             Type::Boolean => format!("1 == {nm}"),
             Type::String => format!("{nm}.consumeIntoString"),
             Type::Bytes => format!("{nm}.consumeIntoBytes"),
-            Type::Object { name, .. } => format!("{}.uniffi_allocate({nm})", class_name_rb(name)?),
+            Type::Object { name, .. } => {
+                format!("{}.uniffi_allocate({nm})", class_name_rb(name, &())?)
+            }
             Type::CallbackInterface { .. } => {
                 panic!("No support for lifting callback interfaces, yet")
             }
@@ -325,7 +349,7 @@ mod filters {
                 format!(
                     "{}.consumeInto{}",
                     nm,
-                    class_name_rb(&canonical_name(type_))?
+                    class_name_rb(&canonical_name(type_), &())?
                 )
             }
             Type::Record { .. }
@@ -336,7 +360,7 @@ mod filters {
             | Type::Map { .. } => format!(
                 "{}.consumeInto{}",
                 nm,
-                class_name_rb(&canonical_name(type_))?
+                class_name_rb(&canonical_name(type_), &())?
             ),
             Type::Custom { .. } => panic!("No support for lifting custom types, yet"),
         })
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/ruby/mod.rs b/third_party/rust/uniffi_bindgen/src/bindings/ruby/mod.rs
index e8f3c5f77c0d7..5263a5fbc2226 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/ruby/mod.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/ruby/mod.rs
@@ -4,7 +4,7 @@
 
 use std::process::Command;
 
-use crate::{BindingGenerator, Component, ComponentInterface, GenerationSettings};
+use crate::{bindings::GenerateOptions, BindgenLoader, Component, ComponentInterface};
 use anyhow::{Context, Result};
 use fs_err as fs;
 
@@ -13,55 +13,34 @@ mod gen_ruby;
 pub mod test;
 use gen_ruby::{Config, RubyWrapper};
 
-pub struct RubyBindingGenerator;
-impl BindingGenerator for RubyBindingGenerator {
-    type Config = Config;
-
-    fn new_config(&self, root_toml: &toml::Value) -> Result<Self::Config> {
-        Ok(
-            match root_toml.get("bindings").and_then(|b| b.get("ruby")) {
-                Some(v) => v.clone().try_into()?,
-                None => Default::default(),
-            },
-        )
+pub fn generate(loader: &BindgenLoader, options: GenerateOptions) -> Result<()> {
+    let metadata = loader.load_metadata(&options.source)?;
+    let cis = loader.load_cis(metadata)?;
+    let cdylib = loader.library_name(&options.source).map(|l| l.to_string());
+    let mut components =
+        loader.load_components(cis, |ci, toml| parse_config(ci, toml, cdylib.clone()))?;
+    for c in components.iter_mut() {
+        c.ci.derive_ffi_funcs()?;
     }
-
-    fn update_component_configs(
-        &self,
-        settings: &GenerationSettings,
-        components: &mut Vec<Component<Self::Config>>,
-    ) -> Result<()> {
-        for c in &mut *components {
-            c.config.cdylib_name.get_or_insert_with(|| {
-                settings
-                    .cdylib
-                    .clone()
-                    .unwrap_or_else(|| format!("uniffi_{}", c.ci.namespace()))
-            });
+    for Component { ci, config, .. } in components {
+        if let Some(crate_filter) = &options.crate_filter {
+            if ci.crate_name() != crate_filter {
+                continue;
+            }
         }
-        Ok(())
-    }
+        let rb_file = options.out_dir.join(format!("{}.rb", ci.namespace()));
+        fs::write(&rb_file, generate_ruby_bindings(&config, &ci)?)?;
 
-    fn write_bindings(
-        &self,
-        settings: &GenerationSettings,
-        components: &[Component<Self::Config>],
-    ) -> Result<()> {
-        for Component { ci, config, .. } in components {
-            let rb_file = settings.out_dir.join(format!("{}.rb", ci.namespace()));
-            fs::write(&rb_file, generate_ruby_bindings(config, ci)?)?;
-
-            if settings.try_format_code {
-                if let Err(e) = Command::new("rubocop").arg("-A").arg(&rb_file).output() {
-                    println!(
-                        "Warning: Unable to auto-format {} using rubocop: {e:?}",
-                        rb_file.file_name().unwrap(),
-                    )
-                }
+        if options.format {
+            if let Err(e) = Command::new("rubocop").arg("-A").arg(&rb_file).output() {
+                println!(
+                    "Warning: Unable to auto-format {} using rubocop: {e:?}",
+                    rb_file.file_name().unwrap(),
+                )
             }
         }
-        Ok(())
     }
+    Ok(())
 }
 
 // Generate ruby bindings for the given ComponentInterface, as a string.
@@ -71,3 +50,20 @@ pub fn generate_ruby_bindings(config: &Config, ci: &ComponentInterface) -> Resul
         .render()
         .context("failed to render ruby bindings")
 }
+
+fn parse_config(
+    ci: &ComponentInterface,
+    root_toml: toml::Value,
+    cdylib: Option<String>,
+) -> Result<Config> {
+    let mut config: Config = match root_toml.get("bindings").and_then(|b| b.get("ruby")) {
+        Some(v) => v.clone().try_into()?,
+        None => Default::default(),
+    };
+    config.cdylib_name.get_or_insert_with(|| {
+        cdylib
+            .clone()
+            .unwrap_or_else(|| format!("uniffi_{}", ci.namespace()))
+    });
+    Ok(config)
+}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/ruby/templates/ObjectTemplate.rb b/third_party/rust/uniffi_bindgen/src/bindings/ruby/templates/ObjectTemplate.rb
index ba2caf7380720..69fdc3e63b87c 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/ruby/templates/ObjectTemplate.rb
+++ b/third_party/rust/uniffi_bindgen/src/bindings/ruby/templates/ObjectTemplate.rb
@@ -1,28 +1,27 @@
 class {{ obj.name()|class_name_rb }}
 
-  # A private helper for initializing instances of the class from a raw pointer,
+  # A private helper for initializing instances of the class from a raw handle,
   # bypassing any initialization logic and ensuring they are GC'd properly.
-  def self.uniffi_allocate(pointer)
-    pointer.autorelease = false
+  def self.uniffi_allocate(handle)
     inst = allocate
-    inst.instance_variable_set :@pointer, pointer
-    ObjectSpace.define_finalizer(inst, uniffi_define_finalizer_by_pointer(pointer, inst.object_id))
+    inst.instance_variable_set :@handle, handle
+    ObjectSpace.define_finalizer(inst, uniffi_define_finalizer_by_handle(handle, inst.object_id))
     return inst
   end
 
   # A private helper for registering an object finalizer.
   # N.B. it's important that this does not capture a reference
-  # to the actual instance, only its underlying pointer.
-  def self.uniffi_define_finalizer_by_pointer(pointer, object_id)
+  # to the actual instance, only its underlying handle.
+  def self.uniffi_define_finalizer_by_handle(handle, object_id)
     Proc.new do |_id|
       {{ ci.namespace()|class_name_rb }}.rust_call(
         :{{ obj.ffi_object_free().name() }},
-        pointer
+        handle
       )
     end
   end
 
-  # A private helper for lowering instances into a raw pointer.
+  # A private helper for lowering instances into a raw handle.
   # This does an explicit typecheck, because accidentally lowering a different type of
   # object in a place where this type is expected, could lead to memory unsafety.
   def self.uniffi_check_lower(inst)
@@ -31,24 +30,24 @@ def self.uniffi_check_lower(inst)
     end
   end
 
-  def uniffi_clone_pointer()
+  def uniffi_clone_handle()
     return {{ ci.namespace()|class_name_rb }}.rust_call(
       :{{ obj.ffi_object_clone().name() }},
-      @pointer
+      @handle
     )
   end
 
   def self.uniffi_lower(inst)
-    return inst.uniffi_clone_pointer()
+    return inst.uniffi_clone_handle()
   end
 
   {%- match obj.primary_constructor() %}
   {%- when Some with (cons) %}
   def initialize({% call rb::arg_list_decl(cons) -%})
     {%- call rb::setup_args_extra_indent(cons) %}
-    pointer = {% call rb::to_ffi_call(cons) %}
-    @pointer = pointer
-    ObjectSpace.define_finalizer(self, self.class.uniffi_define_finalizer_by_pointer(pointer, self.object_id))
+    handle = {% call rb::to_ffi_call(cons) %}
+    @handle = handle
+    ObjectSpace.define_finalizer(self, self.class.uniffi_define_finalizer_by_handle(handle, self.object_id))
   end
   {%- when None %}
   {%- endmatch %}
@@ -58,7 +57,7 @@ def self.{{ cons.name()|fn_name_rb }}({% call rb::arg_list_decl(cons) %})
     {%- call rb::setup_args_extra_indent(cons) %}
     # Call the (fallible) function before creating any half-baked object instances.
     # Lightly yucky way to bypass the usual "initialize" logic
-    # and just create a new instance with the required pointer.
+    # and just create a new instance with the required handle.
     return uniffi_allocate({% call rb::to_ffi_call(cons) %})
   end
   {% endfor %}
@@ -69,14 +68,14 @@ def self.{{ cons.name()|fn_name_rb }}({% call rb::arg_list_decl(cons) %})
   {%- when Some with (return_type) -%}
   def {{ meth.name()|fn_name_rb }}({% call rb::arg_list_decl(meth) %})
     {%- call rb::setup_args_extra_indent(meth) %}
-    result = {% call rb::to_ffi_call_with_prefix("uniffi_clone_pointer()", meth) %}
+    result = {% call rb::to_ffi_call_with_prefix("uniffi_clone_handle()", meth) %}
     return {{ "result"|lift_rb(return_type) }}
   end
 
   {%- when None -%}
   def {{ meth.name()|fn_name_rb }}({% call rb::arg_list_decl(meth) %})
       {%- call rb::setup_args_extra_indent(meth) %}
-      {% call rb::to_ffi_call_with_prefix("uniffi_clone_pointer()", meth) %}
+      {% call rb::to_ffi_call_with_prefix("uniffi_clone_handle()", meth) %}
   end
   {% endmatch %}
   {% endfor %}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/ruby/templates/RecordTemplate.rb b/third_party/rust/uniffi_bindgen/src/bindings/ruby/templates/RecordTemplate.rb
index b5a201b248b9a..66ffd13ce9353 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/ruby/templates/RecordTemplate.rb
+++ b/third_party/rust/uniffi_bindgen/src/bindings/ruby/templates/RecordTemplate.rb
@@ -4,7 +4,7 @@ class {{ rec.name()|class_name_rb }}
 
   def initialize({% for field in rec.fields() %}{{ field.name()|var_name_rb -}}:
         {%- match field.default_value() %}
-        {%- when Some with(literal) %} {{ literal|literal_rb }}
+        {%- when Some(default) %} {{ default|default_rb }}
         {%- else %}
         {%- endmatch %}
   {%- if loop.last %}{% else %}, {% endif -%}{% endfor %})
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/ruby/templates/RustBufferBuilder.rb b/third_party/rust/uniffi_bindgen/src/bindings/ruby/templates/RustBufferBuilder.rb
index 34dcb2c3547b1..2c38f92b3637b 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/ruby/templates/RustBufferBuilder.rb
+++ b/third_party/rust/uniffi_bindgen/src/bindings/ruby/templates/RustBufferBuilder.rb
@@ -163,8 +163,8 @@ def write_{{ canonical_type_name }}(v)
   # The Object type {{ object_name }}.
 
   def write_{{ canonical_type_name }}(obj)
-    pointer = {{ object_name|class_name_rb}}.uniffi_lower obj
-    pack_into(8, 'Q>', pointer.address)
+    handle = {{ object_name|class_name_rb}}.uniffi_lower obj
+    pack_into(8, 'Q>', handle)
   end
 
   {% when Type::Enum { name: enum_name, .. } -%}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/ruby/templates/RustBufferStream.rb b/third_party/rust/uniffi_bindgen/src/bindings/ruby/templates/RustBufferStream.rb
index 0f53b8baff059..46be48310f19e 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/ruby/templates/RustBufferStream.rb
+++ b/third_party/rust/uniffi_bindgen/src/bindings/ruby/templates/RustBufferStream.rb
@@ -154,8 +154,8 @@ def read{{ canonical_type_name }}
   # The Object type {{ object_name }}.
 
   def read{{ canonical_type_name }}
-    pointer = FFI::Pointer.new unpack_from 8, 'Q>'
-    return {{ object_name|class_name_rb }}.uniffi_allocate(pointer)
+    handle = unpack_from 8, 'Q>'
+    return {{ object_name|class_name_rb }}.uniffi_allocate(handle)
   end
 
   {% when Type::Enum { name, .. } -%}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/ruby/templates/macros.rb b/third_party/rust/uniffi_bindgen/src/bindings/ruby/templates/macros.rb
index 59fa4ef4cc271..e6a2ea4cde7e9 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/ruby/templates/macros.rb
+++ b/third_party/rust/uniffi_bindgen/src/bindings/ruby/templates/macros.rb
@@ -45,7 +45,7 @@
     {%- for arg in func.arguments() -%}
         {{ arg.name()|var_name_rb }}
         {%- match arg.default_value() %}
-        {%- when Some with(literal) %} = {{ literal|literal_rb }}
+        {%- when Some(default) %} = {{ default|default_rb }}
         {%- else %}
         {%- endmatch %}
         {%- if !loop.last %}, {% endif -%}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/ruby/test.rs b/third_party/rust/uniffi_bindgen/src/bindings/ruby/test.rs
index 47a3b68401fca..77465c8022784 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/ruby/test.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/ruby/test.rs
@@ -2,8 +2,7 @@
 License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use crate::cargo_metadata::CrateConfigSupplier;
-use crate::library_mode::generate_bindings;
+use crate::bindings::{generate, GenerateOptions, TargetLanguage};
 use anyhow::{bail, Context, Result};
 use camino::Utf8Path;
 use std::env;
@@ -34,15 +33,12 @@ pub fn test_script_command(
     let test_helper = UniFFITestHelper::new(fixture_name)?;
     let out_dir = test_helper.create_out_dir(tmp_dir, &script_path)?;
     let cdylib_path = test_helper.copy_cdylib_to_out_dir(&out_dir)?;
-    generate_bindings(
-        &cdylib_path,
-        None,
-        &super::RubyBindingGenerator,
-        &CrateConfigSupplier::from(test_helper.cargo_metadata()),
-        None,
-        &out_dir,
-        false,
-    )?;
+    generate(GenerateOptions {
+        languages: vec![TargetLanguage::Ruby],
+        source: cdylib_path.to_path_buf(),
+        out_dir: out_dir.to_path_buf(),
+        ..GenerateOptions::default()
+    })?;
 
     let rubypath = env::var_os("RUBYLIB").unwrap_or_else(|| OsString::from(""));
     let rubypath = env::join_paths(
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/swift/gen_swift/compounds.rs b/third_party/rust/uniffi_bindgen/src/bindings/swift/gen_swift/compounds.rs
index f6f039414a859..0d85f50ed66e7 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/swift/gen_swift/compounds.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/swift/gen_swift/compounds.rs
@@ -4,8 +4,9 @@
 
 use super::CodeType;
 use crate::{
-    backend::{Literal, Type},
-    bail, Result,
+    bail,
+    interface::{DefaultValue, Literal, Type},
+    Result,
 };
 
 #[derive(Debug)]
@@ -31,11 +32,13 @@ impl CodeType for OptionalCodeType {
         )
     }
 
-    fn literal(&self, literal: &Literal) -> Result<String> {
-        match literal {
-            Literal::None => Ok("nil".into()),
-            Literal::Some { inner } => super::SwiftCodeOracle.find(&self.inner).literal(inner),
-            _ => bail!("Invalid literal for Optional type: {literal:?}"),
+    fn default(&self, default: &DefaultValue) -> Result<String> {
+        match default {
+            DefaultValue::Default | DefaultValue::Literal(Literal::None) => Ok("nil".into()),
+            DefaultValue::Literal(Literal::Some { inner }) => {
+                super::SwiftCodeOracle.find(&self.inner).default(inner)
+            }
+            _ => bail!("Invalid literal for Optional type: {default:?}"),
         }
     }
 }
@@ -66,10 +69,12 @@ impl CodeType for SequenceCodeType {
         )
     }
 
-    fn literal(&self, literal: &Literal) -> Result<String> {
-        match literal {
-            Literal::EmptySequence => Ok("[]".into()),
-            _ => bail!("Invalid literal for sequence type: {literal:?}"),
+    fn default(&self, default: &DefaultValue) -> Result<String> {
+        match default {
+            DefaultValue::Default | DefaultValue::Literal(Literal::EmptySequence) => {
+                Ok("[]".into())
+            }
+            _ => bail!("Invalid literal for sequence type: {default:?}"),
         }
     }
 }
@@ -103,10 +108,10 @@ impl CodeType for MapCodeType {
         )
     }
 
-    fn literal(&self, literal: &Literal) -> Result<String> {
-        match literal {
-            Literal::EmptyMap => Ok("[:]".into()),
-            _ => bail!("Invalid literal for map type: {literal:?}"),
+    fn default(&self, default: &DefaultValue) -> Result<String> {
+        match default {
+            DefaultValue::Default | DefaultValue::Literal(Literal::EmptyMap) => Ok("[:]".into()),
+            _ => bail!("Invalid literal for map type: {default:?}"),
         }
     }
 }
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/swift/gen_swift/custom.rs b/third_party/rust/uniffi_bindgen/src/bindings/swift/gen_swift/custom.rs
index 54aad5adcd55b..47920f02f65eb 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/swift/gen_swift/custom.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/swift/gen_swift/custom.rs
@@ -7,11 +7,12 @@ use super::CodeType;
 #[derive(Debug)]
 pub struct CustomCodeType {
     name: String,
+    builtin: Box<dyn CodeType>,
 }
 
 impl CustomCodeType {
-    pub fn new(name: String) -> Self {
-        CustomCodeType { name }
+    pub fn new(name: String, builtin: Box<dyn CodeType>) -> Self {
+        Self { name, builtin }
     }
 }
 
@@ -23,4 +24,10 @@ impl CodeType for CustomCodeType {
     fn canonical_name(&self) -> String {
         format!("Type{}", self.name)
     }
+
+    fn default(&self, default: &crate::interface::DefaultValue) -> anyhow::Result<String> {
+        self.builtin
+            .default(default)
+            .map_err(|_e| anyhow::anyhow!("Unsupported default value for {}", self.type_label()))
+    }
 }
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/swift/gen_swift/enum_.rs b/third_party/rust/uniffi_bindgen/src/bindings/swift/gen_swift/enum_.rs
index 9ce13c24a8004..937ab0397ab0c 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/swift/gen_swift/enum_.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/swift/gen_swift/enum_.rs
@@ -3,7 +3,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use super::CodeType;
-use crate::{backend::Literal, bail, Result};
+use crate::{
+    bail,
+    interface::{DefaultValue, Literal},
+    Result,
+};
 
 #[derive(Debug)]
 pub struct EnumCodeType {
@@ -25,11 +29,11 @@ impl CodeType for EnumCodeType {
         format!("Type{}", self.id)
     }
 
-    fn literal(&self, literal: &Literal) -> Result<String> {
-        if let Literal::Enum(v, _) = literal {
+    fn default(&self, default: &DefaultValue) -> Result<String> {
+        if let DefaultValue::Literal(Literal::Enum(v, _)) = default {
             Ok(format!(".{}", super::SwiftCodeOracle.enum_variant_name(v)))
         } else {
-            bail!("Invalid literal for enum type: {literal:?}")
+            bail!("Invalid literal for enum type: {default:?}")
         }
     }
 }
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/swift/gen_swift/mod.rs b/third_party/rust/uniffi_bindgen/src/bindings/swift/gen_swift/mod.rs
index 71fa8e53a3d1e..e5ef038a056fe 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/swift/gen_swift/mod.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/swift/gen_swift/mod.rs
@@ -42,8 +42,12 @@ trait CodeType: Debug {
         self.type_label()
     }
 
-    fn literal(&self, _literal: &Literal) -> Result<String> {
-        unimplemented!("Unimplemented for {}", self.type_label())
+    // default for named types is to assume a ctor exists.
+    fn default(&self, default: &DefaultValue) -> Result<String> {
+        match default {
+            DefaultValue::Default => Ok(format!("{}()", self.type_label())),
+            DefaultValue::Literal(_) => crate::bail!("Literals for named types are not supported"),
+        }
     }
 
     /// Name of the FfiConverter
@@ -176,6 +180,8 @@ pub struct Config {
     custom_types: HashMap<String, CustomTypeConfig>,
     #[serde(default)]
     link_frameworks: Vec<String>,
+    #[serde(default)]
+    pub(super) rename: toml::Table,
 }
 
 #[derive(Debug, Default, Clone, Serialize, Deserialize)]
@@ -280,21 +286,218 @@ impl Config {
     pub fn link_frameworks(&self) -> Vec<String> {
         self.link_frameworks.clone()
     }
+
+    /// Does the given Record have protocol conformances to list?
+    ///
+    /// This isn't the most efficient way to do this, but it should be fast enough.
+    pub fn record_has_conformances(&self, rec: &Record, contains_object_references: &bool) -> bool {
+        !self
+            .conformance_list_for_record(rec, contains_object_references)
+            .is_empty()
+    }
+
+    /// Programmatically generate the conformances for Record
+    pub fn conformance_list_for_record(
+        &self,
+        rec: &Record,
+        contains_object_references: &bool,
+    ) -> String {
+        let mut conformances = vec![];
+
+        let uniffi_trait_methods = rec.uniffi_trait_methods();
+
+        // We auto-generate `Equatable, Hashable`, but only if we have no objects. We could do better - see #2409
+        if !contains_object_references || uniffi_trait_methods.eq_eq.is_some() {
+            conformances.push("Equatable");
+        }
+
+        if !contains_object_references || uniffi_trait_methods.hash_hash.is_some() {
+            conformances.push("Hashable");
+        }
+
+        if uniffi_trait_methods.ord_cmp.is_some() {
+            conformances.push("Comparable");
+        }
+
+        if uniffi_trait_methods.debug_fmt.is_some() {
+            conformances.push("CustomDebugStringConvertible");
+        }
+
+        if uniffi_trait_methods.display_fmt.is_some() {
+            conformances.push("CustomStringConvertible");
+        }
+
+        // Objects can't be Codable at the moment, so we can't derive `Codable` conformance if this Record references one
+        if !contains_object_references && self.generate_codable_conformance() {
+            conformances.push("Codable");
+        }
+
+        conformances.join(", ")
+    }
+
+    /// Does the given Enum have protocol conformances to list?
+    ///
+    /// This isn't the most efficient way to do this, but it should be fast enough.
+    pub fn enum_has_conformances(&self, e: &Enum, contains_object_references: &bool) -> bool {
+        !self
+            .conformance_list_for_enum(e, contains_object_references)
+            .is_empty()
+    }
+
+    /// Programmatically generate the conformances for an Enum
+    pub fn conformance_list_for_enum(&self, e: &Enum, contains_object_references: &bool) -> String {
+        let uniffi_trait_methods = e.uniffi_trait_methods();
+
+        let mut conformances = vec![];
+
+        // We auto-generate `Equatable, Hashable`, but only if we have no objects. We could do better - see #2409
+        if !contains_object_references || uniffi_trait_methods.eq_eq.is_some() {
+            conformances.push("Equatable");
+        }
+
+        if !contains_object_references || uniffi_trait_methods.hash_hash.is_some() {
+            conformances.push("Hashable");
+        }
+
+        if uniffi_trait_methods.ord_cmp.is_some() {
+            conformances.push("Comparable");
+        }
+
+        if uniffi_trait_methods.debug_fmt.is_some() {
+            conformances.push("CustomDebugStringConvertible");
+        }
+
+        if uniffi_trait_methods.display_fmt.is_some() {
+            conformances.push("CustomStringConvertible");
+        }
+
+        // Objects can't be Codable at the moment, so we can't derive `Codable` conformance if this Enum references one
+        if !contains_object_references && self.generate_codable_conformance() {
+            conformances.push("Codable");
+        }
+
+        if self.generate_case_iterable_conformance() && !e.contains_variant_fields() {
+            conformances.push("CaseIterable");
+        }
+
+        conformances.join(", ")
+    }
+
+    /// Does the given Error have protocol conformances to list? (aside from the default `Swift.Error`)
+    ///
+    /// This isn't the most efficient way to do this, but it should be fast enough.
+    pub fn error_has_additional_conformances(
+        &self,
+        e: &Enum,
+        contains_object_references: &bool,
+    ) -> bool {
+        !self
+            .additional_conformance_list_for_error(e, contains_object_references)
+            .is_empty()
+    }
+
+    /// Programmatically generate the additional conformances for an Error (aside from the default `Swift.Error`)
+    pub fn additional_conformance_list_for_error(
+        &self,
+        e: &Enum,
+        contains_object_references: &bool,
+    ) -> String {
+        let uniffi_trait_methods = e.uniffi_trait_methods();
+
+        let mut conformances = vec![];
+
+        // We auto-generate `Equatable, Hashable`, but only if we have no objects. We could do better - see #2409
+        if !contains_object_references || uniffi_trait_methods.eq_eq.is_some() {
+            conformances.push("Equatable");
+        }
+
+        if !contains_object_references || uniffi_trait_methods.hash_hash.is_some() {
+            conformances.push("Hashable");
+        }
+
+        if uniffi_trait_methods.ord_cmp.is_some() {
+            conformances.push("Comparable");
+        }
+
+        // Objects can't be Codable at the moment, so we can't derive `Codable` conformance if this Error references one
+        if !contains_object_references && self.generate_codable_conformance() {
+            conformances.push("Codable");
+        }
+
+        if !self.omit_localized_error_conformance() {
+            conformances.push("Foundation.LocalizedError");
+        }
+
+        if self.generate_case_iterable_conformance() && !e.is_flat() && !e.contains_variant_fields()
+        {
+            conformances.push("CaseIterable");
+        }
+
+        conformances.join(", ")
+    }
+
+    /// Programmatically generate the conformances for an Object
+    pub fn conformance_list_for_object(&self, o: &Object, is_error: &bool) -> String {
+        let uniffi_trait_methods = o.uniffi_trait_methods();
+
+        let mut conformances = vec!["@unchecked Sendable"];
+
+        if *is_error {
+            conformances.push("Swift.Error");
+
+            if !self.omit_localized_error_conformance() {
+                conformances.push("Foundation.LocalizedError");
+            }
+        }
+
+        if uniffi_trait_methods.eq_eq.is_some() {
+            conformances.push("Equatable");
+        }
+
+        if uniffi_trait_methods.hash_hash.is_some() {
+            conformances.push("Hashable");
+        }
+
+        if uniffi_trait_methods.ord_cmp.is_some() {
+            conformances.push("Comparable");
+        }
+
+        if uniffi_trait_methods.debug_fmt.is_some() {
+            conformances.push("CustomDebugStringConvertible");
+        }
+
+        if uniffi_trait_methods.display_fmt.is_some() {
+            conformances.push("CustomStringConvertible");
+        }
+
+        conformances.join(", ")
+    }
 }
 
 // Given a trait, work out what the protocol name we generate for it.
 // This differs based on whether the trait supports foreign impls (ie,
 // whether is has a "callback interface".
-fn trait_protocol_name(ci: &ComponentInterface, name: &str) -> Result<String> {
-    let (obj_name, has_callback_interface) = match ci.get_object_definition(name) {
-        Some(obj) => (obj.name(), obj.has_callback_interface()),
-        None => (
-            ci.get_callback_interface_definition(name)
-                .ok_or_else(|| anyhow::anyhow!("no interface {}", name))?
-                .name(),
-            true,
-        ),
+fn trait_protocol_name(ci: &ComponentInterface, trait_ty: &Type) -> Result<String> {
+    let Some(module_path) = &trait_ty.crate_name() else {
+        anyhow::bail!("Invalid trait_type: {trait_ty:?}");
+    };
+    let Some(ci_look) = ci.find_component_interface(module_path) else {
+        anyhow::bail!("no interface with module_path: {}", module_path);
+    };
+
+    let (obj_name, has_callback_interface) = match trait_ty {
+        Type::Object { name, .. } => {
+            let Some(obj) = ci_look.get_object_definition(name) else {
+                anyhow::bail!("trait interface not found: {}", name);
+            };
+            (name, obj.has_callback_interface())
+        }
+        Type::CallbackInterface { name, .. } => (name, true),
+        _ => {
+            anyhow::bail!("Invalid trait_type: {trait_ty:?}")
+        }
     };
+
     let class_name = SwiftCodeOracle.class_name(obj_name);
     if has_callback_interface {
         Ok(class_name)
@@ -484,15 +687,15 @@ impl<'a> SwiftWrapper<'a> {
         let extern_module_init_fns = self
             .ci
             .iter_external_types()
-            .filter_map(|t| t.module_path())
+            .filter_map(|t| t.crate_name())
             .map(|module_path| {
                 format!(
                     "uniffiEnsure{}Initialized",
                     module_path.to_upper_camel_case()
                 )
             })
-            // Collect into a hash set to de-dup
-            .collect::<HashSet<_>>();
+            // Collect into a btree set to de-dup and order
+            .collect::<BTreeSet<_>>();
 
         init_fns.chain(extern_module_init_fns).collect()
     }
@@ -509,6 +712,7 @@ impl SwiftCodeOracle {
     //
     //   - When adding additional types here, make sure to also add a match arm to the `Types.swift` template.
     //   - To keep things manageable, let's try to limit ourselves to these 2 mega-matches
+    #[allow(clippy::only_used_in_recursion)]
     fn create_code_type(&self, type_: Type) -> Box<dyn CodeType> {
         match type_ {
             Type::UInt8 => Box::new(primitives::UInt8CodeType),
@@ -544,7 +748,10 @@ impl SwiftCodeOracle {
                 key_type,
                 value_type,
             } => Box::new(compounds::MapCodeType::new(*key_type, *value_type)),
-            Type::Custom { name, .. } => Box::new(custom::CustomCodeType::new(name)),
+            Type::Custom { name, builtin, .. } => Box::new(custom::CustomCodeType::new(
+                name,
+                self.create_code_type(*builtin),
+            )),
         }
     }
 
@@ -600,7 +807,6 @@ impl SwiftCodeOracle {
             FfiType::Float32 => "Float".into(),
             FfiType::Float64 => "Double".into(),
             FfiType::Handle => "UInt64".into(),
-            FfiType::RustArcPtr(_) => "UnsafeMutableRawPointer".into(),
             FfiType::RustBuffer(_) => "RustBuffer".into(),
             FfiType::RustCallStatus => "RustCallStatus".into(),
             FfiType::ForeignBytes => "ForeignBytes".into(),
@@ -634,7 +840,7 @@ impl SwiftCodeOracle {
                 | FfiType::UInt64
                 | FfiType::Int64 => "0".to_owned(),
                 FfiType::Float32 | FfiType::Float64 => "0.0".to_owned(),
-                FfiType::RustArcPtr(_) => "nil".to_owned(),
+                FfiType::Handle => "0".to_owned(),
                 FfiType::RustBuffer(_) => "RustBuffer.empty()".to_owned(),
                 _ => unimplemented!("FFI return type: {t:?}"),
             },
@@ -664,33 +870,47 @@ impl SwiftCodeOracle {
 
 pub mod filters {
     use super::*;
-    pub use crate::backend::filters::*;
     use uniffi_meta::LiteralMetadata;
 
     fn oracle() -> &'static SwiftCodeOracle {
         &SwiftCodeOracle
     }
 
-    pub fn type_name(as_type: &impl AsType) -> Result<String, askama::Error> {
+    pub fn type_name(
+        as_type: &impl AsType,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         Ok(oracle().find(&as_type.as_type()).type_label())
     }
 
-    pub fn return_type_name(as_type: Option<&impl AsType>) -> Result<String, askama::Error> {
+    pub fn return_type_name(
+        as_type: Option<&impl AsType>,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         Ok(match as_type {
             Some(as_type) => oracle().find(&as_type.as_type()).type_label(),
             None => "()".to_owned(),
         })
     }
 
-    pub fn canonical_name(as_type: &impl AsType) -> Result<String, askama::Error> {
+    pub fn canonical_name(
+        as_type: &impl AsType,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         Ok(oracle().find(&as_type.as_type()).canonical_name())
     }
 
-    pub fn ffi_converter_name(as_type: &impl AsType) -> Result<String, askama::Error> {
+    pub fn ffi_converter_name(
+        as_type: &impl AsType,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         Ok(oracle().find(&as_type.as_type()).ffi_converter_name())
     }
 
-    pub fn ffi_error_converter_name(as_type: &impl AsType) -> Result<String, askama::Error> {
+    pub fn ffi_error_converter_name(
+        as_type: &impl AsType,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         // special handling for types used as errors.
         let mut name = oracle().find(&as_type.as_type()).ffi_converter_name();
         if matches!(&as_type.as_type(), Type::Object { .. }) {
@@ -699,10 +919,20 @@ pub mod filters {
         Ok(name)
     }
 
+    pub(super) fn ffi_type(
+        type_: &impl AsType,
+        _: &dyn askama::Values,
+    ) -> askama::Result<FfiType, askama::Error> {
+        Ok(type_.as_type().into())
+    }
+
     // To better support external types, we always call the "public" lift and lower functions for
     // "named" types, regardless of whether they are being called from a type in the same crate
     // (ie, a "local" type) or from a different crate (ie, an "external" type)
-    pub fn lower_fn(as_type: &impl AsType) -> Result<String, askama::Error> {
+    pub fn lower_fn(
+        as_type: &impl AsType,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         let ty = &as_type.as_type();
         let ffi_converter_name = oracle().find(ty).ffi_converter_name();
         Ok(match ty.name() {
@@ -711,14 +941,17 @@ pub mod filters {
         })
     }
 
-    pub fn write_fn(as_type: &impl AsType) -> Result<String, askama::Error> {
+    pub fn write_fn(
+        as_type: &impl AsType,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         let ty = &as_type.as_type();
         let ffi_converter_name = oracle().find(ty).ffi_converter_name();
         Ok(format!("{}.write", ffi_converter_name))
     }
 
     // See above re lower_fn - we always use the public version for named types.
-    pub fn lift_fn(as_type: &impl AsType) -> Result<String, askama::Error> {
+    pub fn lift_fn(as_type: &impl AsType, _: &dyn askama::Values) -> Result<String, askama::Error> {
         let ty = &as_type.as_type();
         let ffi_converter_name = oracle().find(ty).ffi_converter_name();
         Ok(match ty.name() {
@@ -727,24 +960,29 @@ pub mod filters {
         })
     }
 
-    pub fn read_fn(as_type: &impl AsType) -> Result<String, askama::Error> {
+    pub fn read_fn(as_type: &impl AsType, _: &dyn askama::Values) -> Result<String, askama::Error> {
         let ty = &as_type.as_type();
         let ffi_converter_name = oracle().find(ty).ffi_converter_name();
         Ok(format!("{}.read", ffi_converter_name))
     }
 
-    pub fn literal_swift(
-        literal: &Literal,
+    pub fn default_swift(
+        default: &DefaultValue,
+        _: &dyn askama::Values,
         as_type: &impl AsType,
     ) -> Result<String, askama::Error> {
-        oracle()
+        Ok(oracle()
             .find(&as_type.as_type())
-            .literal(literal)
-            .map_err(|e| to_askama_error(&e))
+            .default(default)
+            .expect("invalid default: {default:?}"))
     }
 
     // Get the idiomatic Swift rendering of an individual enum variant's discriminant
-    pub fn variant_discr_literal(e: &Enum, index: &usize) -> Result<String, askama::Error> {
+    pub fn variant_discr_literal(
+        e: &Enum,
+        _: &dyn askama::Values,
+        index: &usize,
+    ) -> Result<String, askama::Error> {
         let literal = e.variant_discr(*index).expect("invalid index");
         match literal {
             LiteralMetadata::UInt(v, _, _) => Ok(v.to_string()),
@@ -754,17 +992,26 @@ pub mod filters {
     }
 
     /// Get the Swift type for an FFIType
-    pub fn ffi_type_name(ffi_type: &FfiType) -> Result<String, askama::Error> {
+    pub fn ffi_type_name(
+        ffi_type: &FfiType,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         Ok(oracle().ffi_type_label(ffi_type))
     }
 
-    pub fn ffi_default_value(return_type: Option<FfiType>) -> Result<String, askama::Error> {
+    pub fn ffi_default_value(
+        return_type: Option<FfiType>,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         Ok(oracle().ffi_default_value(return_type.as_ref()))
     }
 
     /// Like `ffi_type_name`, but used in `BridgingHeaderTemplate.h` which uses a slightly different
     /// names.
-    pub fn header_ffi_type_name(ffi_type: &FfiType) -> Result<String, askama::Error> {
+    pub fn header_ffi_type_name(
+        ffi_type: &FfiType,
+        _values: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         Ok(match ffi_type {
             FfiType::Int8 => "int8_t".into(),
             FfiType::UInt8 => "uint8_t".into(),
@@ -777,7 +1024,6 @@ pub mod filters {
             FfiType::Float32 => "float".into(),
             FfiType::Float64 => "double".into(),
             FfiType::Handle => "uint64_t".into(),
-            FfiType::RustArcPtr(_) => "void*_Nonnull".into(),
             FfiType::RustBuffer(_) => "RustBuffer".into(),
             FfiType::RustCallStatus => "RustCallStatus".into(),
             FfiType::ForeignBytes => "ForeignBytes".into(),
@@ -786,61 +1032,73 @@ pub mod filters {
             }
             FfiType::Struct(name) => SwiftCodeOracle.ffi_struct_name(name),
             FfiType::Reference(inner) => {
-                format!("const {}* _Nonnull", header_ffi_type_name(inner)?)
+                format!("const {}* _Nonnull", header_ffi_type_name(inner, _values)?)
+            }
+            FfiType::MutReference(inner) => {
+                format!("{}* _Nonnull", header_ffi_type_name(inner, _values)?)
             }
-            FfiType::MutReference(inner) => format!("{}* _Nonnull", header_ffi_type_name(inner)?),
             FfiType::VoidPointer => "void* _Nonnull".into(),
         })
     }
 
     /// Get the idiomatic Swift rendering of a class name (for enums, records, errors, etc).
-    pub fn class_name(nm: &str) -> Result<String, askama::Error> {
+    pub fn class_name(nm: &str, _: &dyn askama::Values) -> Result<String, askama::Error> {
         Ok(oracle().class_name(nm))
     }
 
     /// Get the idiomatic Swift rendering of a function name.
-    pub fn fn_name(nm: &str) -> Result<String, askama::Error> {
+    pub fn fn_name(nm: &str, _: &dyn askama::Values) -> Result<String, askama::Error> {
         Ok(quote_general_keyword(oracle().fn_name(nm)))
     }
 
     /// Get the idiomatic Swift rendering of a variable name.
-    pub fn var_name(nm: &str) -> Result<String, askama::Error> {
+    pub fn var_name(nm: &str, _: &dyn askama::Values) -> Result<String, askama::Error> {
         Ok(quote_general_keyword(oracle().var_name(nm)))
     }
 
     /// Get the idiomatic Swift rendering of an arguments name.
     /// This is the same as the var name but quoting is not required.
-    pub fn arg_name(nm: &str) -> Result<String, askama::Error> {
+    pub fn arg_name(nm: &str, _: &dyn askama::Values) -> Result<String, askama::Error> {
         Ok(quote_arg_keyword(oracle().var_name(nm)))
     }
 
     /// Get the idiomatic Swift rendering of an individual enum variant, quoted if it is a keyword (for use in e.g. declarations)
-    pub fn enum_variant_swift_quoted(nm: &str) -> Result<String, askama::Error> {
+    pub fn enum_variant_swift_quoted(
+        nm: &str,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         Ok(quote_general_keyword(oracle().enum_variant_name(nm)))
     }
 
     /// Like enum_variant_swift_quoted, but a class name.
-    pub fn error_variant_swift_quoted(nm: &str) -> Result<String, askama::Error> {
+    pub fn error_variant_swift_quoted(
+        nm: &str,
+        _: &dyn askama::Values,
+    ) -> Result<String, askama::Error> {
         Ok(quote_general_keyword(oracle().class_name(nm)))
     }
 
     /// Get the idiomatic Swift rendering of an FFI callback function name
-    pub fn ffi_callback_name(nm: &str) -> Result<String, askama::Error> {
+    pub fn ffi_callback_name(nm: &str, _: &dyn askama::Values) -> Result<String, askama::Error> {
         Ok(oracle().ffi_callback_name(nm))
     }
 
     /// Get the idiomatic Swift rendering of an FFI struct name
-    pub fn ffi_struct_name(nm: &str) -> Result<String, askama::Error> {
+    pub fn ffi_struct_name(nm: &str, _: &dyn askama::Values) -> Result<String, askama::Error> {
         Ok(oracle().ffi_struct_name(nm))
     }
 
     /// Get the idiomatic Swift rendering of an if guard name
-    pub fn if_guard_name(nm: &str) -> Result<String, askama::Error> {
+    pub fn if_guard_name(nm: &str, _: &dyn askama::Values) -> Result<String, askama::Error> {
         Ok(oracle().if_guard_name(nm))
     }
 
     /// Get the idiomatic Swift rendering of docstring
-    pub fn docstring(docstring: &str, spaces: &i32) -> Result<String, askama::Error> {
+    pub fn docstring(
+        docstring: &str,
+        _: &dyn askama::Values,
+        spaces: &i32,
+    ) -> Result<String, askama::Error> {
         let middle = textwrap::indent(&textwrap::dedent(docstring), " * ");
         let wrapped = format!("/**\n{middle}\n */");
 
@@ -848,7 +1106,10 @@ pub mod filters {
         Ok(textwrap::indent(&wrapped, &" ".repeat(spaces)))
     }
 
-    pub fn object_names(obj: &Object) -> Result<(String, String), askama::Error> {
+    pub fn object_names(
+        obj: &Object,
+        _: &dyn askama::Values,
+    ) -> Result<(String, String), askama::Error> {
         Ok(SwiftCodeOracle.object_names(obj))
     }
 }
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/swift/gen_swift/primitives.rs b/third_party/rust/uniffi_bindgen/src/bindings/swift/gen_swift/primitives.rs
index 8a3cbc094e92f..e4e7c30ce2b6e 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/swift/gen_swift/primitives.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/swift/gen_swift/primitives.rs
@@ -3,10 +3,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use super::CodeType;
-use crate::backend::Literal;
 use crate::{
     bail,
-    interface::{Radix, Type},
+    interface::{DefaultValue, Literal, Radix, Type},
     Result,
 };
 
@@ -65,7 +64,7 @@ fn render_literal(literal: &Literal) -> Result<String> {
 }
 
 macro_rules! impl_code_type_for_primitive {
-    ($T:ident, $class_name:literal) => {
+    ($T:ident, $class_name:literal, $def:literal) => {
         #[derive(Debug)]
         pub struct $T;
 
@@ -74,23 +73,26 @@ macro_rules! impl_code_type_for_primitive {
                 $class_name.into()
             }
 
-            fn literal(&self, literal: &Literal) -> Result<String> {
-                render_literal(&literal)
+            fn default(&self, default: &DefaultValue) -> Result<String> {
+                match default {
+                    DefaultValue::Default => Ok($def.into()),
+                    DefaultValue::Literal(l) => render_literal(&l),
+                }
             }
         }
     };
 }
 
-impl_code_type_for_primitive!(BooleanCodeType, "Bool");
-impl_code_type_for_primitive!(StringCodeType, "String");
-impl_code_type_for_primitive!(BytesCodeType, "Data");
-impl_code_type_for_primitive!(Int8CodeType, "Int8");
-impl_code_type_for_primitive!(Int16CodeType, "Int16");
-impl_code_type_for_primitive!(Int32CodeType, "Int32");
-impl_code_type_for_primitive!(Int64CodeType, "Int64");
-impl_code_type_for_primitive!(UInt8CodeType, "UInt8");
-impl_code_type_for_primitive!(UInt16CodeType, "UInt16");
-impl_code_type_for_primitive!(UInt32CodeType, "UInt32");
-impl_code_type_for_primitive!(UInt64CodeType, "UInt64");
-impl_code_type_for_primitive!(Float32CodeType, "Float");
-impl_code_type_for_primitive!(Float64CodeType, "Double");
+impl_code_type_for_primitive!(BooleanCodeType, "Bool", "false");
+impl_code_type_for_primitive!(StringCodeType, "String", "\"\"");
+impl_code_type_for_primitive!(BytesCodeType, "Data", "Data([])");
+impl_code_type_for_primitive!(Int8CodeType, "Int8", "Int8(0)");
+impl_code_type_for_primitive!(Int16CodeType, "Int16", "Int16(0)");
+impl_code_type_for_primitive!(Int32CodeType, "Int32", "0");
+impl_code_type_for_primitive!(Int64CodeType, "Int64", "Int64(0)");
+impl_code_type_for_primitive!(UInt8CodeType, "UInt8", "UInt8(0)");
+impl_code_type_for_primitive!(UInt16CodeType, "UInt16", "UInt16(0)");
+impl_code_type_for_primitive!(UInt32CodeType, "UInt32", "UInt32(0)");
+impl_code_type_for_primitive!(UInt64CodeType, "UInt64", "UInt64(0)");
+impl_code_type_for_primitive!(Float32CodeType, "Float", "Float(0)");
+impl_code_type_for_primitive!(Float64CodeType, "Double", "Double(0)");
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/swift/mod.rs b/third_party/rust/uniffi_bindgen/src/bindings/swift/mod.rs
index ba112c2215abf..2e001992fcc24 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/swift/mod.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/swift/mod.rs
@@ -29,10 +29,14 @@
 //!  * How to read from and write into a byte buffer.
 //!
 
-use crate::{BindingGenerator, Component, GenerationSettings};
-use anyhow::{Context, Result};
+use crate::{
+    bindings::GenerateOptions, interface::rename, BindgenLoader, BindgenPaths, Component,
+    ComponentInterface,
+};
+use anyhow::Result;
 use camino::Utf8PathBuf;
 use fs_err as fs;
+use std::collections::HashMap;
 use std::process::Command;
 
 mod gen_swift;
@@ -52,124 +56,103 @@ struct Bindings {
     modulemap: Option<String>,
 }
 
-pub struct SwiftBindingGenerator;
-impl BindingGenerator for SwiftBindingGenerator {
-    type Config = Config;
-
-    fn new_config(&self, root_toml: &toml::Value) -> Result<Self::Config> {
-        Ok(
-            match root_toml.get("bindings").and_then(|b| b.get("swift")) {
-                Some(v) => v.clone().try_into()?,
-                None => Default::default(),
-            },
-        )
-    }
-
-    fn update_component_configs(
-        &self,
-        _settings: &GenerationSettings,
-        components: &mut Vec<Component<Self::Config>>,
-    ) -> Result<()> {
-        for c in &mut *components {
-            c.config
-                .module_name
-                .get_or_insert_with(|| c.ci.namespace().into());
-        }
-        Ok(())
+/// Generate Swift bindings
+///
+/// Returns the components generated
+pub fn generate(
+    loader: &BindgenLoader,
+    options: GenerateOptions,
+) -> Result<Vec<Component<Config>>> {
+    let metadata = loader.load_metadata(&options.source)?;
+    let cis = loader.load_cis(metadata)?;
+    let mut components = loader.load_components(cis, parse_config)?;
+    apply_renames(&mut components);
+    for c in components.iter_mut() {
+        // Call derive_ffi_functions after `apply_renames`
+        c.ci.derive_ffi_funcs()?;
     }
 
-    /// Unlike other target languages, binding to Rust code from Swift involves more than just
-    /// generating a `.swift` file. We also need to produce a `.h` file with the C-level API
-    /// declarations, and a `.modulemap` file to tell Swift how to use it.
-    fn write_bindings(
-        &self,
-        settings: &GenerationSettings,
-        components: &[Component<Self::Config>],
-    ) -> Result<()> {
-        for Component { ci, config, .. } in components {
-            let Bindings {
-                header,
-                library,
-                modulemap,
-            } = generate_bindings(config, ci)?;
-
-            let source_file = settings
-                .out_dir
-                .join(format!("{}.swift", config.module_name()));
-            fs::write(&source_file, library)?;
-
-            let header_file = settings.out_dir.join(config.header_filename());
-            fs::write(header_file, header)?;
-
-            if let Some(modulemap) = modulemap {
-                let modulemap_file = settings.out_dir.join(config.modulemap_filename());
-                fs::write(modulemap_file, modulemap)?;
+    for Component { ci, config, .. } in components.iter_mut() {
+        if let Some(crate_filter) = &options.crate_filter {
+            if ci.crate_name() != crate_filter {
+                continue;
             }
+        }
+        let Bindings {
+            header,
+            library,
+            modulemap,
+        } = generate_bindings(config, ci)?;
+
+        let source_file = options
+            .out_dir
+            .join(format!("{}.swift", config.module_name()));
+        fs::write(&source_file, library)?;
+
+        let header_file = options.out_dir.join(config.header_filename());
+        fs::write(header_file, header)?;
+
+        if let Some(modulemap) = modulemap {
+            let modulemap_file = options.out_dir.join(config.modulemap_filename());
+            fs::write(modulemap_file, modulemap)?;
+        }
 
-            if settings.try_format_code {
-                let commands_to_try = [
-                    // Available in Xcode 16.
-                    vec!["xcrun", "swift-format"],
-                    // The official swift-format command name.
-                    vec!["swift-format"],
-                    // Shortcut for the swift-format command.
-                    vec!["swift", "format"],
-                    vec!["swiftformat"],
-                ];
-
-                let successful_output = commands_to_try.into_iter().find_map(|command| {
-                    Command::new(command[0])
-                        .args(&command[1..])
-                        .arg(source_file.as_str())
-                        .output()
-                        .ok()
-                });
-                if successful_output.is_none() {
-                    println!(
-                        "Warning: Unable to auto-format {} using swift-format. Please make sure it is installed.",
-                        source_file.as_str()
-                    );
-                }
+        if options.format {
+            let commands_to_try = [
+                // Available in Xcode 16.
+                vec!["xcrun", "swift-format"],
+                // The official swift-format command name.
+                vec!["swift-format"],
+                // Shortcut for the swift-format command.
+                vec!["swift", "format"],
+                vec!["swiftformat"],
+            ];
+
+            let successful_output = commands_to_try.into_iter().find_map(|command| {
+                Command::new(command[0])
+                    .args(&command[1..])
+                    .arg(source_file.as_str())
+                    .output()
+                    .ok()
+            });
+            if successful_output.is_none() {
+                println!(
+                    "Warning: Unable to auto-format {} using swift-format. Please make sure it is installed.",
+                    source_file.as_str()
+                );
             }
         }
-
-        Ok(())
     }
+    Ok(components)
 }
 
-/// Generate Swift bindings
+/// Generate Swift bindings (specialized version)
 ///
 /// This is used by the uniffi-bindgen-swift command, which supports Swift-specific options.
 ///
 /// In the future, we may want to replace the generalized `uniffi-bindgen` with a set of
 /// specialized `uniffi-bindgen-[language]` commands.
 pub fn generate_swift_bindings(options: SwiftBindingsOptions) -> Result<()> {
-    #[cfg(feature = "cargo-metadata")]
-    let config_supplier = {
-        use crate::cargo_metadata::CrateConfigSupplier;
-        let mut cmd = cargo_metadata::MetadataCommand::new();
-        if options.metadata_no_deps {
-            cmd.no_deps();
-        }
-        let metadata = cmd.exec().context("error running cargo metadata")?;
-        CrateConfigSupplier::from(metadata)
-    };
     #[cfg(not(feature = "cargo-metadata"))]
-    let config_supplier = crate::EmptyCrateConfigSupplier;
+    let paths = BindgenPaths::default();
+
+    #[cfg(feature = "cargo-metadata")]
+    let mut paths = BindgenPaths::default();
+
+    #[cfg(feature = "cargo-metadata")]
+    paths.add_cargo_metadata_layer(options.metadata_no_deps)?;
 
     fs::create_dir_all(&options.out_dir)?;
 
-    let mut components =
-        crate::library_mode::find_components(&options.library_path, &config_supplier)?
-            // map the TOML configs into a our Config struct
-            .into_iter()
-            .map(|Component { ci, config }| {
-                let config = SwiftBindingGenerator.new_config(&config.into())?;
-                Ok(Component { ci, config })
-            })
-            .collect::<Result<Vec<_>>>()?;
-    SwiftBindingGenerator
-        .update_component_configs(&GenerationSettings::default(), &mut components)?;
+    let loader = BindgenLoader::new(paths);
+    let metadata = loader.load_metadata(&options.source)?;
+    let cis = loader.load_cis(metadata)?;
+    let mut components = loader.load_components(cis, parse_config)?;
+    apply_renames(&mut components);
+    // Call derive_ffi_funcs after apply_renames()
+    for Component { ci, .. } in components.iter_mut() {
+        ci.derive_ffi_funcs()?;
+    }
 
     for Component { ci, config } in &components {
         if options.generate_swift_sources {
@@ -185,24 +168,15 @@ pub fn generate_swift_bindings(options: SwiftBindingsOptions) -> Result<()> {
         }
     }
 
-    // find the library name by stripping the extension and leading `lib` from the library path
-    let library_name = {
-        let stem = options
-            .library_path
-            .file_stem()
-            .with_context(|| format!("Invalid library path {}", options.library_path))?;
-        match stem.strip_prefix("lib") {
-            Some(name) => name,
-            None => stem,
-        }
-    };
+    // Derive the default module_name/modulemap_filename from the source filename.
+    let source_basename = loader.source_basename(&options.source);
 
     let module_name = options
         .module_name
-        .unwrap_or_else(|| library_name.to_string());
+        .unwrap_or_else(|| source_basename.to_string());
     let modulemap_filename = options
         .modulemap_filename
-        .unwrap_or_else(|| format!("{library_name}.modulemap"));
+        .unwrap_or_else(|| format!("{source_basename}.modulemap"));
 
     if options.generate_modulemap {
         let mut header_filenames: Vec<_> = components
@@ -223,12 +197,23 @@ pub fn generate_swift_bindings(options: SwiftBindingsOptions) -> Result<()> {
     Ok(())
 }
 
+fn parse_config(ci: &ComponentInterface, root_toml: toml::Value) -> Result<Config> {
+    let mut config: Config = match root_toml.get("bindings").and_then(|b| b.get("swift")) {
+        Some(v) => v.clone().try_into()?,
+        None => Default::default(),
+    };
+    config
+        .module_name
+        .get_or_insert_with(|| ci.namespace().into());
+    Ok(config)
+}
+
 #[derive(Debug, Default)]
 pub struct SwiftBindingsOptions {
     pub generate_swift_sources: bool,
     pub generate_headers: bool,
     pub generate_modulemap: bool,
-    pub library_path: Utf8PathBuf,
+    pub source: Utf8PathBuf,
     pub out_dir: Utf8PathBuf,
     pub xcframework: bool,
     pub module_name: Option<String>,
@@ -236,3 +221,22 @@ pub struct SwiftBindingsOptions {
     pub metadata_no_deps: bool,
     pub link_frameworks: Vec<String>,
 }
+
+// A helper for renaming items.
+fn apply_renames(components: &mut Vec<Component<Config>>) {
+    let mut module_renames = HashMap::new();
+    // Collect all rename configurations from all components, keyed by module_path
+    for c in components.iter() {
+        if !c.config.rename.is_empty() {
+            let module_path = c.ci.crate_name().to_string();
+            module_renames.insert(module_path, c.config.rename.clone());
+        }
+    }
+
+    // Apply rename configurations to all components
+    if !module_renames.is_empty() {
+        for c in &mut *components {
+            rename(&mut c.ci, &module_renames);
+        }
+    }
+}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/Async.swift b/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/Async.swift
index 1c59d320e36f3..0336ac7c2865c 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/Async.swift
+++ b/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/Async.swift
@@ -1,5 +1,5 @@
 private let UNIFFI_RUST_FUTURE_POLL_READY: Int8 = 0
-private let UNIFFI_RUST_FUTURE_POLL_MAYBE_READY: Int8 = 1
+private let UNIFFI_RUST_FUTURE_POLL_WAKE: Int8 = 1
 
 fileprivate let uniffiContinuationHandleMap = UniffiHandleMap<UnsafeContinuation<Int8, Never>>()
 
@@ -23,7 +23,9 @@ fileprivate func uniffiRustCallAsync<F, T>(
         pollResult = await withUnsafeContinuation {
             pollFunc(
                 rustFuture,
-                uniffiFutureContinuationCallback,
+                { handle, pollResult in
+                    uniffiFutureContinuationCallback(handle: handle, pollResult: pollResult)
+                },
                 uniffiContinuationHandleMap.insert(obj: $0)
             )
         }
@@ -49,37 +51,61 @@ fileprivate func uniffiFutureContinuationCallback(handle: UInt64, pollResult: In
 private func uniffiTraitInterfaceCallAsync<T>(
     makeCall: @escaping () async throws -> T,
     handleSuccess: @escaping (T) -> (),
-    handleError: @escaping (Int8, RustBuffer) -> ()
-) -> UniffiForeignFuture {
+    handleError: @escaping (Int8, RustBuffer) -> (),
+    droppedCallback: UnsafeMutablePointer<UniffiForeignFutureDroppedCallbackStruct>
+) {
     let task = Task {
+        // Note: it's important we call either `handleSuccess` or `handleError` exactly once.  Each
+        // call consumes an Arc reference, which means there should be no possibility of a double
+        // call.  The following code is structured so that will will never call both `handleSuccess`
+        // and `handleError`, even in the face of weird errors.
+        //
+        // On platforms that need extra machinery to make C-ABI calls, like JNA or ctypes, it's
+        // possible that we fail to make either call.  However, it doesn't seem like this is
+        // possible on Swift since swift can just make the C call directly.
+        var callResult: T
         do {
-            handleSuccess(try await makeCall())
+            callResult = try await makeCall()
         } catch {
             handleError(CALL_UNEXPECTED_ERROR, {{ Type::String.borrow()|lower_fn }}(String(describing: error)))
+            return
         }
+        handleSuccess(callResult)
     }
     let handle = UNIFFI_FOREIGN_FUTURE_HANDLE_MAP.insert(obj: task)
-    return UniffiForeignFuture(handle: handle, free: uniffiForeignFutureFree)
-
+    droppedCallback.pointee = UniffiForeignFutureDroppedCallbackStruct(
+        handle: handle,
+        free: uniffiForeignFutureDroppedCallback
+    )
 }
 
 private func uniffiTraitInterfaceCallAsyncWithError<T, E>(
     makeCall: @escaping () async throws -> T,
     handleSuccess: @escaping (T) -> (),
     handleError: @escaping (Int8, RustBuffer) -> (),
-    lowerError: @escaping (E) -> RustBuffer
-) -> UniffiForeignFuture {
+    lowerError: @escaping (E) -> RustBuffer,
+    droppedCallback: UnsafeMutablePointer<UniffiForeignFutureDroppedCallbackStruct>
+) {
     let task = Task {
+        // See the note in uniffiTraitInterfaceCallAsync for details on `handleSuccess` and
+        // `handleError`.
+        var callResult: T
         do {
-            handleSuccess(try await makeCall())
+            callResult = try await makeCall()
         } catch let error as E {
             handleError(CALL_ERROR, lowerError(error))
+            return
         } catch {
             handleError(CALL_UNEXPECTED_ERROR, {{ Type::String.borrow()|lower_fn }}(String(describing: error)))
+            return
         }
+        handleSuccess(callResult)
     }
     let handle = UNIFFI_FOREIGN_FUTURE_HANDLE_MAP.insert(obj: task)
-    return UniffiForeignFuture(handle: handle, free: uniffiForeignFutureFree)
+    droppedCallback.pointee = UniffiForeignFutureDroppedCallbackStruct(
+        handle: handle,
+        free: uniffiForeignFutureDroppedCallback
+    )
 }
 
 // Borrow the callback handle map implementation to store foreign future handles
@@ -96,7 +122,7 @@ fileprivate protocol UniffiForeignFutureTask {
 
 extension Task: UniffiForeignFutureTask {}
 
-private func uniffiForeignFutureFree(handle: UInt64) {
+private func uniffiForeignFutureDroppedCallback(handle: UInt64) {
     do {
         let task = try UNIFFI_FOREIGN_FUTURE_HANDLE_MAP.remove(handle: handle)
         // Set the cancellation flag on the task.  If it's still running, the code can check the
@@ -104,7 +130,7 @@ private func uniffiForeignFutureFree(handle: UInt64) {
         // a no-op.
         task.cancel()
     } catch {
-        print("uniffiForeignFutureFree: handle missing from handlemap")
+        print("uniffiForeignFutureDroppedCallback: handle missing from handlemap")
     }
 }
 
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/CallbackInterfaceImpl.swift b/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/CallbackInterfaceImpl.swift
index ccc7fd40a7b03..5a02742052a29 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/CallbackInterfaceImpl.swift
+++ b/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/CallbackInterfaceImpl.swift
@@ -9,6 +9,20 @@ fileprivate struct {{ trait_impl }} {
     // This creates 1-element array, since this seems to be the only way to construct a const
     // pointer that we can pass to the Rust code.
     static let vtable: [{{ vtable|ffi_type_name }}] = [{{ vtable|ffi_type_name }}(
+        uniffiFree: { (uniffiHandle: UInt64) -> () in
+            do {
+                try {{ ffi_converter_name }}.handleMap.remove(handle: uniffiHandle)
+            } catch {
+                print("Uniffi callback interface {{ name }}: handle missing in uniffiFree")
+            }
+        },
+        uniffiClone: { (uniffiHandle: UInt64) -> UInt64 in
+            do {
+                return try {{ ffi_converter_name }}.handleMap.clone(handle: uniffiHandle)
+            } catch {
+                fatalError("Uniffi callback interface {{ name }}: handle missing in uniffiClone")
+            }
+        },
         {%- for (ffi_callback, meth) in vtable_methods %}
         {{ meth.name()|fn_name }}: { (
             {%- for arg in ffi_callback.arguments() %}
@@ -80,29 +94,24 @@ fileprivate struct {{ trait_impl }} {
 
             {%- match meth.throws_type() %}
             {%- when None %}
-            let uniffiForeignFuture = uniffiTraitInterfaceCallAsync(
+            uniffiTraitInterfaceCallAsync(
                 makeCall: makeCall,
                 handleSuccess: uniffiHandleSuccess,
-                handleError: uniffiHandleError
+                handleError: uniffiHandleError,
+                droppedCallback: uniffiOutDroppedCallback
             )
             {%- when Some(error_type) %}
-            let uniffiForeignFuture = uniffiTraitInterfaceCallAsyncWithError(
+            uniffiTraitInterfaceCallAsyncWithError(
                 makeCall: makeCall,
                 handleSuccess: uniffiHandleSuccess,
                 handleError: uniffiHandleError,
-                lowerError: {{ error_type|lower_fn }}
+                lowerError: {{ error_type|lower_fn }},
+                droppedCallback: uniffiOutDroppedCallback
             )
             {%- endmatch %}
-            uniffiOutReturn.pointee = uniffiForeignFuture
             {%- endif %}
-        },
+        }{% if !loop.last %},{% endif %}
         {%- endfor %}
-        uniffiFree: { (uniffiHandle: UInt64) -> () in
-            let result = try? {{ ffi_converter_name }}.handleMap.remove(handle: uniffiHandle)
-            if result == nil {
-                print("Uniffi callback interface {{ name }}: handle missing in uniffiFree")
-            }
-        }
     )]
 }
 
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/EnumTemplate.swift b/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/EnumTemplate.swift
index 3575f540ae6db..d0c0b1ba35954 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/EnumTemplate.swift
+++ b/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/EnumTemplate.swift
@@ -1,27 +1,37 @@
 // Note that we don't yet support `indirect` for enums.
 // See https://github.com/mozilla/uniffi-rs/issues/396 for further discussion.
 {%- call swift::docstring(e, 0) %}
+{%- let uniffi_trait_methods = e.uniffi_trait_methods() %}
 {% match e.variant_discr_type() %}
 {% when None %}
+{%- if config.enum_has_conformances(e, contains_object_references) %}
+public enum {{ type_name }}: {{ config.conformance_list_for_enum(e, contains_object_references) }} {
+{%- else %}
 public enum {{ type_name }} {
+{%- endif %}
     {% for variant in e.variants() %}
     {%- call swift::docstring(variant, 4) %}
     case {{ variant.name()|enum_variant_swift_quoted }}{% if variant.fields().len() > 0 %}(
         {%- call swift::field_list_decl(variant, variant.has_nameless_fields()) %}
     ){% endif -%}
     {% endfor %}
-}
 {% when Some(variant_discr_type) %}
-public enum {{ type_name }} : {{ variant_discr_type|type_name }} {
+public enum {{ type_name }}: {{ variant_discr_type|type_name }}, {{ config.conformance_list_for_enum(e, contains_object_references) }} {
     {% for variant in e.variants() %}
     {%- call swift::docstring(variant, 4) %}
     case {{ variant.name()|enum_variant_swift_quoted }} = {{ e|variant_discr_literal(loop.index0) }}{% if variant.fields().len() > 0 %}(
         {%- call swift::field_list_decl(variant, variant.has_nameless_fields()) %}
     ){% endif -%}
     {% endfor %}
-}
 {% endmatch %}
 
+{% for meth in e.methods() -%}
+{%- call swift::func_decl("public func", meth, 4) %}
+{% endfor %}
+
+{% call swift::uniffi_trait_impls(uniffi_trait_methods) %}
+}
+
 #if compiler(>=6)
 extension {{ type_name }}: Sendable {}
 #endif
@@ -86,14 +96,3 @@ public func {{ ffi_converter_name }}_lift(_ buf: RustBuffer) throws -> {{ type_n
 public func {{ ffi_converter_name }}_lower(_ value: {{ type_name }}) -> RustBuffer {
     return {{ ffi_converter_name }}.lower(value)
 }
-
-{% if !contains_object_references %}
-extension {{ type_name }}: Equatable, Hashable {}
-{% if config.generate_codable_conformance() %}
-extension {{ type_name }}: Codable {}
-{% endif %}
-{% endif %}
-
-{% if config.generate_case_iterable_conformance() && !e.contains_variant_fields() %}
-extension {{ type_name }}: CaseIterable {}
-{% endif %}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/ErrorTemplate.swift b/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/ErrorTemplate.swift
index e8c3cf65971d6..3f607020b50e4 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/ErrorTemplate.swift
+++ b/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/ErrorTemplate.swift
@@ -1,5 +1,9 @@
 {%- call swift::docstring(e, 0) %}
+{%- if config.error_has_additional_conformances(e, contains_object_references) %}
+public enum {{ type_name }}: Swift.Error, {{ config.additional_conformance_list_for_error(e, contains_object_references) }} {
+{%- else %}
 public enum {{ type_name }}: Swift.Error {
+{%- endif %}
 
     {% if e.is_flat() %}
     {% for variant in e.variants() %}
@@ -16,8 +20,23 @@ public enum {{ type_name }}: Swift.Error {
     {% endfor %}
 
     {%- endif %}
+
+    {% for meth in e.methods() -%}
+    {%- call swift::func_decl("public func", meth, 4) %}
+    {% endfor %}
+
+    {% call swift::uniffi_trait_impls(e.uniffi_trait_methods()) %}
+
+    {% if !config.omit_localized_error_conformance() %}
+    public var errorDescription: String? {
+        String(reflecting: self)
+    }
+    {% endif %}
 }
 
+#if compiler(>=6)
+extension {{ type_name }}: Sendable {}
+#endif
 
 #if swift(>=5.8)
 @_documentation(visibility: private)
@@ -104,22 +123,3 @@ public func {{ ffi_converter_name }}_lift(_ buf: RustBuffer) throws -> {{ type_n
 public func {{ ffi_converter_name }}_lower(_ value: {{ type_name }}) -> RustBuffer {
     return {{ ffi_converter_name }}.lower(value)
 }
-
-{% if !contains_object_references %}
-extension {{ type_name }}: Equatable, Hashable {}
-{% if config.generate_codable_conformance() %}
-extension {{ type_name }}: Codable {}
-{% endif %}
-{% endif %}
-
-{% if !config.omit_localized_error_conformance() %}
-extension {{ type_name }}: Foundation.LocalizedError {
-    public var errorDescription: String? {
-        String(reflecting: self)
-    }
-}
-{% endif %}
-
-{% if config.generate_case_iterable_conformance() && !e.is_flat() && !e.contains_variant_fields() %}
-extension {{ type_name }}: CaseIterable {}
-{% endif %}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/HandleMap.swift b/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/HandleMap.swift
index e4ef8ecb55f58..675bc4db21709 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/HandleMap.swift
+++ b/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/HandleMap.swift
@@ -1,18 +1,28 @@
+// Initial value and increment amount for handles. 
+// These ensure that SWIFT handles always have the lowest bit set
+fileprivate let UNIFFI_HANDLEMAP_INITIAL: UInt64 = 1
+fileprivate let UNIFFI_HANDLEMAP_DELTA: UInt64 = 2
+
 fileprivate final class UniffiHandleMap<T>: @unchecked Sendable {
     // All mutation happens with this lock held, which is why we implement @unchecked Sendable.
     private let lock = NSLock()
     private var map: [UInt64: T] = [:]
-    private var currentHandle: UInt64 = 1
+    private var currentHandle: UInt64 = UNIFFI_HANDLEMAP_INITIAL
 
     func insert(obj: T) -> UInt64 {
         lock.withLock {
-            let handle = currentHandle
-            currentHandle += 1
-            map[handle] = obj
-            return handle
+            return doInsert(obj)
         }
     }
 
+    // Low-level insert function, this assumes `lock` is held.
+    private func doInsert(_ obj: T) -> UInt64 {
+        let handle = currentHandle
+        currentHandle += UNIFFI_HANDLEMAP_DELTA
+        map[handle] = obj
+        return handle
+    }
+
      func get(handle: UInt64) throws -> T {
         try lock.withLock {
             guard let obj = map[handle] else {
@@ -22,6 +32,15 @@ fileprivate final class UniffiHandleMap<T>: @unchecked Sendable {
         }
     }
 
+     func clone(handle: UInt64) throws -> UInt64 {
+        try lock.withLock {
+            guard let obj = map[handle] else {
+                throw UniffiInternalError.unexpectedStaleHandle
+            }
+            return doInsert(obj)
+        }
+    }
+
     @discardableResult
     func remove(handle: UInt64) throws -> T {
         try lock.withLock {
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/ObjectTemplate.swift b/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/ObjectTemplate.swift
index 393bc0e11d8a4..5b7e90f63aa77 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/ObjectTemplate.swift
+++ b/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/ObjectTemplate.swift
@@ -8,14 +8,14 @@
 {% include "Protocol.swift" %}
 
 {%- call swift::docstring(obj, 0) %}
-open class {{ impl_class_name }}: {{ protocol_name }}, @unchecked Sendable {
-    fileprivate let pointer: UnsafeMutableRawPointer!
+open class {{ impl_class_name }}: {{ protocol_name }}, {{ config.conformance_list_for_object(obj, is_error) }} {
+    fileprivate let handle: UInt64
 
-    /// Used to instantiate a [FFIObject] without an actual pointer, for fakes in tests, mostly.
+    /// Used to instantiate a [FFIObject] without an actual handle, for fakes in tests, mostly.
 #if swift(>=5.8)
     @_documentation(visibility: private)
 #endif
-    public struct NoPointer {
+    public struct NoHandle {
         public init() {}
     }
 
@@ -25,27 +25,27 @@ open class {{ impl_class_name }}: {{ protocol_name }}, @unchecked Sendable {
 #if swift(>=5.8)
     @_documentation(visibility: private)
 #endif
-    required public init(unsafeFromRawPointer pointer: UnsafeMutableRawPointer) {
-        self.pointer = pointer
+    required public init(unsafeFromHandle handle: UInt64) {
+        self.handle = handle
     }
 
     // This constructor can be used to instantiate a fake object.
-    // - Parameter noPointer: Placeholder value so we can have a constructor separate from the default empty one that may be implemented for classes extending [FFIObject].
+    // - Parameter noHandle: Placeholder value so we can have a constructor separate from the default empty one that may be implemented for classes extending [FFIObject].
     //
     // - Warning:
-    //     Any object instantiated with this constructor cannot be passed to an actual Rust-backed object. Since there isn't a backing [Pointer] the FFI lower functions will crash.
+    //     Any object instantiated with this constructor cannot be passed to an actual Rust-backed object. Since there isn't a backing handle the FFI lower functions will crash.
 #if swift(>=5.8)
     @_documentation(visibility: private)
 #endif
-    public init(noPointer: NoPointer) {
-        self.pointer = nil
+    public init(noHandle: NoHandle) {
+        self.handle = 0
     }
 
 #if swift(>=5.8)
     @_documentation(visibility: private)
 #endif
-    public func uniffiClonePointer() -> UnsafeMutableRawPointer {
-        return try! rustCall { {{ obj.ffi_object_clone().name() }}(self.pointer, $0) }
+    public func uniffiCloneHandle() -> UInt64 {
+        return try! rustCall { {{ obj.ffi_object_clone().name() }}(self.handle, $0) }
     }
 
     {%- match obj.primary_constructor() %}
@@ -56,11 +56,12 @@ open class {{ impl_class_name }}: {{ protocol_name }}, @unchecked Sendable {
     {%- endmatch %}
 
     deinit {
-        guard let pointer = pointer else {
+        if handle == 0 {
+            // Mock objects have handle=0 don't try to free them
             return
         }
 
-        try! rustCall { {{ obj.ffi_object_free().name() }}(pointer, $0) }
+        try! rustCall { {{ obj.ffi_object_free().name() }}(handle, $0) }
     }
 
     {% for cons in obj.alternate_constructors() %}
@@ -71,115 +72,103 @@ open class {{ impl_class_name }}: {{ protocol_name }}, @unchecked Sendable {
     {%- call swift::func_decl("open func", meth, 4) %}
     {% endfor %}
 
-    {%- for tm in obj.uniffi_traits() %}
-    {%-     match tm %}
-    {%-         when UniffiTrait::Display { fmt } %}
-    open var description: String {
-        return {% call swift::is_try(fmt) %} {{ fmt.return_type().unwrap()|lift_fn }}(
-            {% call swift::to_ffi_call(fmt) %}
-        )
-    }
-    {%-         when UniffiTrait::Debug { fmt } %}
-    open var debugDescription: String {
-        return {% call swift::is_try(fmt) %} {{ fmt.return_type().unwrap()|lift_fn }}(
-            {% call swift::to_ffi_call(fmt) %}
-        )
-    }
-    {%-         when UniffiTrait::Eq { eq, ne } %}
-    public static func == (self: {{ impl_class_name }}, other: {{ impl_class_name }}) -> Bool {
-        return {% call swift::is_try(eq) %} {{ eq.return_type().unwrap()|lift_fn }}(
-            {% call swift::to_ffi_call(eq) %}
-        )
-    }
-    {%-         when UniffiTrait::Hash { hash } %}
-    open func hash(into hasher: inout Hasher) {
-        let val = {% call swift::is_try(hash) %} {{ hash.return_type().unwrap()|lift_fn }}(
-            {% call swift::to_ffi_call(hash) %}
-        )
-        hasher.combine(val)
-    }
-    {%-         else %}
-    {%-    endmatch %}
-    {%- endfor %}
+    {% call swift::uniffi_trait_impls(obj.uniffi_trait_methods()) %}
 
+    {%- if is_error %}
+    {% if !config.omit_localized_error_conformance() %}
+    public var errorDescription: String? {
+        String(reflecting: self)
+    }
+    {% endif %}
+    {% endif %}
 }
 
-{%- if obj.has_callback_interface() %}
+{%- if !obj.has_callback_interface() %}
+{# Simple case: the interface can only be implemented in Rust #}
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+public struct {{ ffi_converter_name }}: FfiConverter {
+    typealias FfiType = UInt64
+    typealias SwiftType = {{ type_name }}
+
+    public static func lift(_ handle: UInt64) throws -> {{ type_name }} {
+        return {{ impl_class_name }}(unsafeFromHandle: handle)
+    }
+
+    public static func lower(_ value: {{ type_name }}) -> UInt64 {
+        return value.uniffiCloneHandle()
+    }
+
+    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> {{ type_name }} {
+        let handle: UInt64 = try readInt(&buf)
+        return try lift(handle)
+    }
+
+    public static func write(_ value: {{ type_name }}, into buf: inout [UInt8]) {
+        writeInt(&buf, lower(value))
+    }
+}
+{%- else %}
+{# 
+ # The interface can be implemented in Rust or Swift
+ # * Generate a callback interface implementation to handle the Swift side
+ # * In the FfiConverter, check which side a handle came from to know how to handle correctly.
+#}
 {%- let callback_handler = format!("uniffiCallbackInterface{}", name) %}
 {%- let callback_init = format!("uniffiCallbackInit{}", name) %}
 {%- let vtable = obj.vtable().expect("trait interface should have a vtable") %}
 {%- let vtable_methods = obj.vtable_methods() %}
 {%- let ffi_init_callback = obj.ffi_init_callback() %}
 {% include "CallbackInterfaceImpl.swift" %}
-{%- endif %}
-
-{%- for tm in obj.uniffi_traits() %}
-{%-     match tm %}
-{%-         when UniffiTrait::Display { fmt } %}
-extension {{ impl_class_name }}: CustomStringConvertible {}
-{%-         when UniffiTrait::Debug { fmt } %}
-extension {{ impl_class_name }}: CustomDebugStringConvertible {}
-{%-         when UniffiTrait::Eq { eq, ne } %}
-extension {{ impl_class_name }}: Equatable {}
-{%-         when UniffiTrait::Hash { hash } %}
-extension {{ impl_class_name }}: Hashable {}
-{%-         else %}
-{%-    endmatch %}
-{%- endfor %}
-
-{%- if is_error %}
-extension {{ impl_class_name }}: Swift.Error {}
-{% endif %}
-
-{%- for t in obj.trait_impls() %}
-extension {{impl_class_name}}: {{ self::trait_protocol_name(ci, t.trait_name)? }} {}
-{% endfor %}
-
 
 #if swift(>=5.8)
 @_documentation(visibility: private)
 #endif
 public struct {{ ffi_converter_name }}: FfiConverter {
-    {%- if obj.has_callback_interface() %}
     fileprivate static let handleMap = UniffiHandleMap<{{ type_name }}>()
-    {%- endif %}
 
-    typealias FfiType = UnsafeMutableRawPointer
+    typealias FfiType = UInt64
     typealias SwiftType = {{ type_name }}
 
-    public static func lift(_ pointer: UnsafeMutableRawPointer) throws -> {{ type_name }} {
-        return {{ impl_class_name }}(unsafeFromRawPointer: pointer)
+    public static func lift(_ handle: UInt64) throws -> {{ type_name }} {
+        if ((handle & 1) == 0) {
+            // Rust-generated handle, construct a new class that uses the handle to implement the
+            // interface
+            return {{ impl_class_name }}(unsafeFromHandle: handle)
+        } else {
+            // Swift-generated handle, get the object from the handle map
+            return try handleMap.remove(handle: handle)
+        }
     }
 
-    public static func lower(_ value: {{ type_name }}) -> UnsafeMutableRawPointer {
-        {%- if obj.has_callback_interface() %}
-        guard let ptr = UnsafeMutableRawPointer(bitPattern: UInt(truncatingIfNeeded: handleMap.insert(obj: value))) else {
-            fatalError("Cast to UnsafeMutableRawPointer failed")
-        }
-        return ptr
-        {%- else %}
-        return value.uniffiClonePointer()
-        {%- endif %}
+    public static func lower(_ value: {{ type_name }}) -> UInt64 {
+         if let rustImpl = value as? {{ impl_class_name }} {
+             // Rust-implemented object.  Clone the handle and return it
+            return rustImpl.uniffiCloneHandle()
+         } else {
+            // Swift object, generate a new vtable handle and return that.
+            return handleMap.insert(obj: value)
+         }
     }
 
     public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> {{ type_name }} {
-        let v: UInt64 = try readInt(&buf)
-        // The Rust code won't compile if a pointer won't fit in a UInt64.
-        // We have to go via `UInt` because that's the thing that's the size of a pointer.
-        let ptr = UnsafeMutableRawPointer(bitPattern: UInt(truncatingIfNeeded: v))
-        if (ptr == nil) {
-            throw UniffiInternalError.unexpectedNullPointer
-        }
-        return try lift(ptr!)
+        let handle: UInt64 = try readInt(&buf)
+        return try lift(handle)
     }
 
     public static func write(_ value: {{ type_name }}, into buf: inout [UInt8]) {
-        // This fiddling is because `Int` is the thing that's the same size as a pointer.
-        // The Rust code won't compile if a pointer won't fit in a `UInt64`.
-        writeInt(&buf, UInt64(bitPattern: Int64(Int(bitPattern: lower(value)))))
+        writeInt(&buf, lower(value))
     }
 }
 
+{%- endif %}
+
+{%- for t in obj.trait_impls() %}
+extension {{impl_class_name}}: {{ self::trait_protocol_name(ci, t.trait_ty)? }} {}
+{% endfor %}
+
 {#
 We always write these public functions just in case the object is used as
 an external type by another crate.
@@ -187,29 +176,21 @@ an external type by another crate.
 #if swift(>=5.8)
 @_documentation(visibility: private)
 #endif
-public func {{ ffi_converter_name }}_lift(_ pointer: UnsafeMutableRawPointer) throws -> {{ type_name }} {
-    return try {{ ffi_converter_name }}.lift(pointer)
+public func {{ ffi_converter_name }}_lift(_ handle: UInt64) throws -> {{ type_name }} {
+    return try {{ ffi_converter_name }}.lift(handle)
 }
 
 #if swift(>=5.8)
 @_documentation(visibility: private)
 #endif
-public func {{ ffi_converter_name }}_lower(_ value: {{ type_name }}) -> UnsafeMutableRawPointer {
+public func {{ ffi_converter_name }}_lower(_ value: {{ type_name }}) -> UInt64 {
     return {{ ffi_converter_name }}.lower(value)
 }
 
 {# Objects as error #}
 {%- if is_error %}
 
-{% if !config.omit_localized_error_conformance() %}
-extension {{ type_name }}: Foundation.LocalizedError {
-    public var errorDescription: String? {
-        String(reflecting: self)
-    }
-}
-{% endif %}
-
-{# Due to some mismatches in the ffi converter mechanisms, errors are a RustBuffer holding a pointer #}
+{# Due to some mismatches in the ffi converter mechanisms, errors are a RustBuffer storing a handle #}
 #if swift(>=5.8)
 @_documentation(visibility: private)
 #endif
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/RecordTemplate.swift b/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/RecordTemplate.swift
index 6a84860f1396a..7f50f2c97df1c 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/RecordTemplate.swift
+++ b/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/RecordTemplate.swift
@@ -1,6 +1,11 @@
 {%- let rec = ci.get_record_definition(name).unwrap() %}
+{%- let uniffi_trait_methods = rec.uniffi_trait_methods() %}
 {%- call swift::docstring(rec, 0) %}
+{%- if config.record_has_conformances(rec, contains_object_references) %}
+public struct {{ type_name }}: {{ config.conformance_list_for_record(rec, contains_object_references) }} {
+{%- else %}
 public struct {{ type_name }} {
+{%- endif %}
     {%- for field in rec.fields() %}
     {%- call swift::docstring(field, 4) %}
     public {% if config.generate_immutable_records() %}let{% else %}var{% endif %} {{ field.name()|var_name }}: {{ field|type_name }}
@@ -13,34 +18,18 @@ public struct {{ type_name }} {
         self.{{ field.name()|var_name }} = {{ field.name()|var_name }}
         {%- endfor %}
     }
+
+    {% for meth in rec.methods() -%}
+    {%- call swift::func_decl("public func", meth, 4) %}
+    {% endfor %}
+
+    {% call swift::uniffi_trait_impls(uniffi_trait_methods) %}
 }
 
 #if compiler(>=6)
 extension {{ type_name }}: Sendable {}
 #endif
 
-{% if !contains_object_references %}
-extension {{ type_name }}: Equatable, Hashable {
-    public static func ==(lhs: {{ type_name }}, rhs: {{ type_name }}) -> Bool {
-        {%- for field in rec.fields() %}
-        if lhs.{{ field.name()|var_name }} != rhs.{{ field.name()|var_name }} {
-            return false
-        }
-        {%- endfor %}
-        return true
-    }
-
-    public func hash(into hasher: inout Hasher) {
-        {%- for field in rec.fields() %}
-        hasher.combine({{ field.name()|var_name }})
-        {%- endfor %}
-    }
-}
-{% if config.generate_codable_conformance() %}
-extension {{ type_name }}: Codable {}
-{% endif %}
-{% endif %}
-
 #if swift(>=5.8)
 @_documentation(visibility: private)
 #endif
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/macros.swift b/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/macros.swift
index 7bc1625dfbb39..d52ce96d079c0 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/macros.swift
+++ b/third_party/rust/uniffi_bindgen/src/bindings/swift/templates/macros.swift
@@ -12,7 +12,13 @@
         rustCall() {
     {%- endif %}
     {{ func.ffi_func().name() }}(
-        {%- if func.takes_self() %}self.uniffiClonePointer(),{% endif %}
+        {%- match func.self_type() %}
+        {%-     when Some(Type::Object { .. }) %}
+            self.uniffiCloneHandle(),
+        {%-     when Some(t) %}
+            {{ t|lower_fn }}(self),
+        {%-     when None %}
+        {%- endmatch %}
         {%- call arg_list_lowered(func) -%} $0
     )
 }
@@ -36,18 +42,18 @@
 public convenience init(
     {%- call arg_list_decl(callable) -%}) {%- call is_async(callable) %} {%- call throws(callable) %} {
     {%- if callable.is_async() %}
-    let pointer =
+    let handle =
         {%- call call_async(callable) %}
         {# The async mechanism returns an already constructed self.
-           We work around that by cloning the pointer from that object, then
-           assune the old object dies as there are no other references possible.
+           We work around that by cloning the handle from that object, then
+           assume the old object dies as there are no other references possible.
         #}
-        .uniffiClonePointer()
+        .uniffiCloneHandle()
     {%- else %}
-    let pointer =
+    let handle =
         {% call to_ffi_call(callable) %}
     {%- endif %}
-    self.init(unsafeFromRawPointer: pointer)
+    self.init(unsafeFromHandle: handle)
 }
 {%- endmacro %}
 
@@ -69,8 +75,8 @@ public convenience init(
         {% call is_try(callable) %} await uniffiRustCallAsync(
             rustFutureFunc: {
                 {{ callable.ffi_func().name() }}(
-                    {%- if callable.takes_self() %}
-                    self.uniffiClonePointer(){% if !callable.arguments().is_empty() %},{% endif %}
+                    {%- if callable.self_type().is_some() %}
+                    self.uniffiCloneHandle(){% if !callable.arguments().is_empty() %},{% endif %}
                     {% endif %}
                     {%- for arg in callable.arguments() -%}
                     {{ arg|lower_fn }}({{ arg.name()|var_name }}){% if !loop.last %},{% endif %}
@@ -110,7 +116,7 @@ public convenience init(
     {%- for arg in func.arguments() -%}
         {% if config.omit_argument_labels() %}_ {% endif %}{{ arg.name()|var_name }}: {{ arg|type_name -}}
         {%- match arg.default_value() %}
-        {%- when Some with(literal) %} = {{ literal|literal_swift(arg) }}
+        {%- when Some with(default) %} = {{ default|default_swift(arg) }}
         {%- else %}
         {%- endmatch %}
         {%- if !loop.last %}, {% endif -%}
@@ -130,7 +136,7 @@ public convenience init(
         {%- else -%}
         {{ field.name()|var_name }}: {{ field|type_name -}}
         {%- match field.default_value() %}
-            {%- when Some with(literal) %} = {{ literal|literal_swift(field) }}
+            {%- when Some with(default) %} = {{ default|default_swift(field) }}
             {%- else %}
         {%- endmatch -%}
         {% if !loop.last %}, {% endif %}
@@ -176,3 +182,48 @@ v{{- field_num -}}
 {%- macro docstring(defn, indent_spaces) %}
 {%- call docstring_value(defn.docstring(), indent_spaces) %}
 {%- endmacro %}
+
+// macro for uniffi_trait implementations.
+{% macro uniffi_trait_impls(uniffi_trait_methods) %}
+{%- if let Some(fmt) = uniffi_trait_methods.debug_fmt %}
+// The local Rust `Debug` implementation.
+public var debugDescription: String {
+    return {% call is_try(fmt) %} {{ fmt.return_type().unwrap()|lift_fn }}(
+        {% call to_ffi_call(fmt) %}
+    )
+}
+{%- endif %}
+{%- if let Some(fmt) = uniffi_trait_methods.display_fmt %}
+// The local Rust `Display` implementation.
+public var description: String {
+    return {% call is_try(fmt) %} {{ fmt.return_type().unwrap()|lift_fn }}(
+        {% call to_ffi_call(fmt) %}
+    )
+}
+{%- endif %}
+{%- if let Some(eq) = uniffi_trait_methods.eq_eq %}
+// The local Rust `Eq` implementation - only `eq` is used.
+public static func == (self: {{ eq.object_name() | class_name }}, other: {{ eq.object_name() | class_name }}) -> Bool {
+    return {% call is_try(eq) %} {{ eq.return_type().unwrap()|lift_fn }}(
+        {% call to_ffi_call(eq) %}
+    )
+}
+{%- endif %}
+{%- if let Some(hash) = uniffi_trait_methods.hash_hash %}
+// The local Rust `Hash` implementation
+public func hash(into hasher: inout Hasher) {
+    let val = {% call is_try(hash) %} {{ hash.return_type().unwrap()|lift_fn }}(
+        {% call to_ffi_call(hash) %}
+    )
+    hasher.combine(val)
+}
+{%- endif %}
+{%- if let Some(cmp) = uniffi_trait_methods.ord_cmp %}
+// The local Rust `Ord` implementation
+public static func < (self: {{ cmp.object_name() | class_name }}, other: {{ cmp.object_name() | class_name }}) -> Bool {
+    return {% call is_try(cmp) %} {{ cmp.return_type().unwrap()|lift_fn }}(
+        {% call to_ffi_call(cmp) %}
+    ) < 0
+}
+{%- endif %}
+{%- endmacro %}
diff --git a/third_party/rust/uniffi_bindgen/src/bindings/swift/test.rs b/third_party/rust/uniffi_bindgen/src/bindings/swift/test.rs
index d02e43fd72406..ecc7294cdf6c3 100644
--- a/third_party/rust/uniffi_bindgen/src/bindings/swift/test.rs
+++ b/third_party/rust/uniffi_bindgen/src/bindings/swift/test.rs
@@ -2,13 +2,13 @@
 License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use crate::bindings::RunScriptOptions;
-use crate::cargo_metadata::CrateConfigSupplier;
-use crate::library_mode::generate_bindings;
+use crate::{
+    bindings::{swift::generate, BindgenLoader, GenerateOptions, RunScriptOptions, TargetLanguage},
+    BindgenPaths,
+};
 
 use anyhow::{bail, Context, Result};
 use camino::{Utf8Path, Utf8PathBuf};
-use cargo_metadata::Metadata;
 use std::env::consts::{DLL_PREFIX, DLL_SUFFIX};
 use std::ffi::OsStr;
 use std::fs::{read_to_string, File};
@@ -41,12 +41,8 @@ pub fn run_script(
     let test_helper = UniFFITestHelper::new(package_name)?;
     let out_dir = test_helper.create_out_dir(tmp_dir, &script_path)?;
     let cdylib_path = test_helper.copy_cdylib_to_out_dir(&out_dir)?;
-    let generated_sources = GeneratedSources::new(
-        test_helper.crate_name(),
-        &cdylib_path,
-        test_helper.cargo_metadata(),
-        &out_dir,
-    )?;
+    let generated_sources =
+        GeneratedSources::new(test_helper.crate_name(), &cdylib_path, &out_dir)?;
 
     // We need something better than this env var, but it's a reasonable start.
     let swift_version = std::env::var("UNIFFI_TEST_SWIFT_VERSION").unwrap_or("5".to_string());
@@ -142,21 +138,20 @@ struct GeneratedSources {
 }
 
 impl GeneratedSources {
-    fn new(
-        crate_name: &str,
-        cdylib_path: &Utf8Path,
-        cargo_metadata: Metadata,
-        out_dir: &Utf8Path,
-    ) -> Result<Self> {
-        let sources = generate_bindings(
-            cdylib_path,
-            None,
-            &super::SwiftBindingGenerator,
-            &CrateConfigSupplier::from(cargo_metadata),
-            None,
-            out_dir,
-            false,
+    fn new(crate_name: &str, cdylib_path: &Utf8Path, out_dir: &Utf8Path) -> Result<Self> {
+        let mut paths = BindgenPaths::default();
+        paths.add_cargo_metadata_layer(false)?;
+        let loader = BindgenLoader::new(paths);
+        let sources = generate(
+            &loader,
+            GenerateOptions {
+                languages: vec![TargetLanguage::Swift],
+                source: cdylib_path.to_path_buf(),
+                out_dir: out_dir.to_path_buf(),
+                ..GenerateOptions::default()
+            },
         )?;
+
         let main_source = sources
             .iter()
             .find(|s| s.ci.crate_name() == crate_name)
diff --git a/third_party/rust/uniffi_bindgen/src/cargo_metadata.rs b/third_party/rust/uniffi_bindgen/src/cargo_metadata.rs
index 2a0009cf7a69b..d0be93cfd2116 100644
--- a/third_party/rust/uniffi_bindgen/src/cargo_metadata.rs
+++ b/third_party/rust/uniffi_bindgen/src/cargo_metadata.rs
@@ -5,34 +5,67 @@
 //! Helpers for data returned by cargo_metadata. Note that this doesn't
 //! execute cargo_metadata, just parses its output.
 
-use anyhow::{bail, Context};
+use anyhow::{bail, Context, Result};
 use camino::Utf8PathBuf;
 use cargo_metadata::Metadata;
 use std::{collections::HashMap, fs};
 
-use crate::BindgenCrateConfigSupplier;
+use crate::{BindgenCrateConfigSupplier, BindgenPathsLayer};
 
 #[derive(Debug, Clone, Default)]
 pub struct CrateConfigSupplier {
     paths: HashMap<String, Utf8PathBuf>,
 }
 
-impl BindgenCrateConfigSupplier for CrateConfigSupplier {
-    fn get_toml(&self, crate_name: &str) -> anyhow::Result<Option<toml::value::Table>> {
-        crate::load_toml_file(self.get_toml_path(crate_name).as_deref())
+impl CrateConfigSupplier {
+    /// Create a new `CrateConfigSupplier` by running `cargo metadata`
+    pub fn from_cargo_metadata_command(no_deps: bool) -> Result<Self> {
+        let mut cmd = cargo_metadata::MetadataCommand::new();
+        if no_deps {
+            cmd.no_deps();
+        }
+        let metadata = cmd.exec().context("error running cargo metadata")?;
+        Ok(Self::from(metadata))
     }
+}
 
-    fn get_toml_path(&self, crate_name: &str) -> Option<Utf8PathBuf> {
-        self.paths.get(crate_name).map(|p| p.join("uniffi.toml"))
+// Newer trait for finding config - it's up to the implementation whether this
+// is loaded from a file or something else.
+impl BindgenPathsLayer for CrateConfigSupplier {
+    fn get_config(&self, crate_name: &str) -> Result<Option<toml::value::Table>> {
+        let crate_root = self.paths.get(crate_name);
+        let Some(crate_root) = crate_root else {
+            return Ok(None);
+        };
+        // Config files are optional so we return None if the file doesn't exist.
+        let config_path = crate_root.join("uniffi.toml");
+        if !config_path.exists() {
+            return Ok(None);
+        }
+        let contents = fs::read_to_string(&config_path)
+            .with_context(|| format!("read file: {:?}", config_path))?;
+        let toml = toml::de::from_str(&contents)
+            .with_context(|| format!("parse toml: {:?}", config_path))?;
+        Ok(Some(toml))
     }
 
-    fn get_udl(&self, crate_name: &str, udl_name: &str) -> anyhow::Result<String> {
-        let path = self
-            .paths
+    fn get_udl_path(&self, crate_name: &str, udl_name: &str) -> Option<Utf8PathBuf> {
+        self.paths
             .get(crate_name)
-            .context(format!("No path known to UDL files for '{crate_name}'"))?
-            .join("src")
-            .join(format!("{udl_name}.udl"));
+            .map(|p| p.join("src").join(format!("{udl_name}.udl")))
+    }
+}
+
+// Older trait for finding config paths
+impl BindgenCrateConfigSupplier for CrateConfigSupplier {
+    fn get_toml(&self, crate_name: &str) -> Result<Option<toml::value::Table>> {
+        self.get_config(crate_name)
+    }
+
+    fn get_udl(&self, crate_name: &str, udl_name: &str) -> Result<String> {
+        let path = self
+            .get_udl_path(crate_name, udl_name)
+            .context(format!("No path known to UDL files for '{crate_name}'"))?;
         if path.exists() {
             Ok(fs::read_to_string(path)?)
         } else {
diff --git a/third_party/rust/uniffi_bindgen/src/interface/callbacks.rs b/third_party/rust/uniffi_bindgen/src/interface/callbacks.rs
index 76d55165ef899..6448a1aa42a46 100644
--- a/third_party/rust/uniffi_bindgen/src/interface/callbacks.rs
+++ b/third_party/rust/uniffi_bindgen/src/interface/callbacks.rs
@@ -180,8 +180,9 @@ pub fn method_ffi_callback(trait_name: &str, method: &Method, index: usize) -> F
                     ),
                     FfiArgument::new("uniffi_callback_data", FfiType::UInt64),
                     FfiArgument::new(
-                        "uniffi_out_return",
-                        FfiType::Struct("ForeignFuture".to_owned()).mut_reference(),
+                        "uniffi_out_dropped_callback",
+                        FfiType::Struct("ForeignFutureDroppedCallbackStruct".to_owned())
+                            .mut_reference(),
                     ),
                 ])
                 .collect(),
@@ -196,7 +197,7 @@ pub fn foreign_future_ffi_result_struct(return_ffi_type: Option<FfiType>) -> Ffi
     let return_type_name =
         FfiType::return_type_name(return_ffi_type.as_ref()).to_upper_camel_case();
     FfiStruct {
-        name: format!("ForeignFutureStruct{return_type_name}"),
+        name: format!("ForeignFutureResult{return_type_name}"),
         fields: match return_ffi_type {
             Some(return_ffi_type) => vec![
                 FfiField::new("return_value", return_ffi_type),
@@ -222,7 +223,7 @@ pub fn ffi_foreign_future_complete(return_ffi_type: Option<FfiType>) -> FfiCallb
             FfiArgument::new("callback_data", FfiType::UInt64),
             FfiArgument::new(
                 "result",
-                FfiType::Struct(format!("ForeignFutureStruct{return_type_name}")),
+                FfiType::Struct(format!("ForeignFutureResult{return_type_name}")),
             ),
         ],
         return_type: None,
@@ -237,20 +238,24 @@ pub fn ffi_foreign_future_complete(return_ffi_type: Option<FfiType>) -> FfiCallb
 pub fn vtable_struct(trait_name: &str, methods: &[Method]) -> FfiStruct {
     FfiStruct {
         name: vtable_name(trait_name),
-        fields: methods
-            .iter()
-            .enumerate()
-            .map(|(i, method)| {
-                FfiField::new(
-                    method.name(),
-                    FfiType::Callback(format!("CallbackInterface{trait_name}Method{i}")),
-                )
-            })
-            .chain([FfiField::new(
+        fields: [
+            FfiField::new(
                 "uniffi_free",
                 FfiType::Callback("CallbackInterfaceFree".to_owned()),
-            )])
-            .collect(),
+            ),
+            FfiField::new(
+                "uniffi_clone",
+                FfiType::Callback("CallbackInterfaceClone".to_owned()),
+            ),
+        ]
+        .into_iter()
+        .chain(methods.iter().enumerate().map(|(i, method)| {
+            FfiField::new(
+                method.name(),
+                FfiType::Callback(format!("CallbackInterface{trait_name}Method{i}")),
+            )
+        }))
+        .collect(),
     }
 }
 
diff --git a/third_party/rust/uniffi_bindgen/src/interface/enum_.rs b/third_party/rust/uniffi_bindgen/src/interface/enum_.rs
index dc8ee15ca5ee0..6cc309f7c02d4 100644
--- a/third_party/rust/uniffi_bindgen/src/interface/enum_.rs
+++ b/third_party/rust/uniffi_bindgen/src/interface/enum_.rs
@@ -162,15 +162,19 @@
 use anyhow::Result;
 use uniffi_meta::{Checksum, EnumShape};
 
+use super::function::Callable;
 use super::record::Field;
-use super::{AsType, Literal, Type, TypeIterator};
+use super::{
+    AsType, Constructor, FfiFunction, Literal, Method, Type, TypeIterator, UniffiTrait,
+    UniffiTraitMethods,
+};
 
 /// Represents an enum with named variants, each of which may have named
 /// and typed fields.
 ///
 /// Enums are passed across the FFI by serializing to a bytebuffer, with a
 /// i32 indicating the variant followed by the serialization of each field.
-#[derive(Debug, Clone, PartialEq, Eq, Checksum)]
+#[derive(Debug, Clone, Checksum)]
 pub struct Enum {
     pub(super) name: String,
     pub(super) module_path: String,
@@ -179,6 +183,10 @@ pub struct Enum {
     pub(super) variants: Vec<Variant>,
     pub(super) shape: EnumShape,
     pub(super) non_exhaustive: bool,
+    pub(super) constructors: Vec<Constructor>,
+    pub(super) methods: Vec<Method>,
+    // The "uniffi trait" methods - eg, `Eq`, `Display` etc.
+    uniffi_traits: Vec<UniffiTrait>,
     #[checksum_ignore]
     pub(super) docstring: Option<String>,
 }
@@ -200,6 +208,14 @@ impl Enum {
         &self.variants
     }
 
+    pub fn constructors(&self) -> &[Constructor] {
+        &self.constructors
+    }
+
+    pub fn methods(&self) -> &[Method] {
+        &self.methods
+    }
+
     // Get the literal value to use for the specified variant's discriminant.
     // Follows Rust's rules when mixing specified and unspecified values; please
     // file a bug if you find a case where it does not.
@@ -257,7 +273,13 @@ impl Enum {
     }
 
     pub fn iter_types(&self) -> TypeIterator<'_> {
-        Box::new(self.variants.iter().flat_map(Variant::iter_types))
+        Box::new(
+            self.variants
+                .iter()
+                .flat_map(Variant::iter_types)
+                .chain(self.constructors.iter().flat_map(Constructor::iter_types))
+                .chain(self.methods.iter().flat_map(Method::iter_types)),
+        )
     }
 
     pub fn docstring(&self) -> Option<&str> {
@@ -267,6 +289,46 @@ impl Enum {
     pub fn contains_variant_fields(&self) -> bool {
         self.variants().iter().any(|v| v.has_fields())
     }
+
+    pub fn uniffi_trait_methods(&self) -> UniffiTraitMethods {
+        UniffiTraitMethods::new(&self.uniffi_traits)
+    }
+
+    pub fn add_uniffi_trait(&mut self, t: UniffiTrait) {
+        self.uniffi_traits.push(t);
+    }
+
+    pub fn derive_ffi_funcs(&mut self) -> Result<()> {
+        for c in self.constructors.iter_mut() {
+            c.derive_ffi_func();
+        }
+        for m in self.methods.iter_mut() {
+            m.derive_ffi_func()?;
+        }
+        for ut in self.uniffi_traits.iter_mut() {
+            ut.derive_ffi_func()?;
+        }
+        Ok(())
+    }
+
+    pub fn iter_ffi_function_definitions(&self) -> impl Iterator<Item = &FfiFunction> {
+        self.constructors
+            .iter()
+            .map(|f| &f.ffi_func)
+            .chain(self.methods.iter().map(|f| &f.ffi_func))
+            .chain(
+                self.uniffi_traits
+                    .iter()
+                    .flat_map(|ut| match ut {
+                        UniffiTrait::Display { fmt: m }
+                        | UniffiTrait::Debug { fmt: m }
+                        | UniffiTrait::Hash { hash: m }
+                        | UniffiTrait::Ord { cmp: m } => vec![m],
+                        UniffiTrait::Eq { eq, ne } => vec![eq, ne],
+                    })
+                    .map(|m| &m.ffi_func),
+            )
+    }
 }
 
 impl TryFrom<uniffi_meta::EnumMetadata> for Enum {
@@ -285,6 +347,9 @@ impl TryFrom<uniffi_meta::EnumMetadata> for Enum {
                 .collect::<Result<_>>()?,
             shape: meta.shape,
             non_exhaustive: meta.non_exhaustive,
+            constructors: vec![],
+            methods: vec![],
+            uniffi_traits: vec![],
             docstring: meta.docstring.clone(),
         })
     }
@@ -372,7 +437,7 @@ mod test {
             enum Testing { "one", "two", "one" };
         "#;
         let ci = ComponentInterface::from_webidl(UDL, "crate_name").unwrap();
-        assert_eq!(ci.enum_definitions().count(), 1);
+        assert_eq!(ci.enum_definitions().len(), 1);
         assert_eq!(
             ci.get_enum_definition("Testing").unwrap().variants().len(),
             3
@@ -404,8 +469,9 @@ mod test {
                 Two();
             };
         "#;
-        let ci = ComponentInterface::from_webidl(UDL, "crate_name").unwrap();
-        assert_eq!(ci.enum_definitions().count(), 3);
+        let mut ci = ComponentInterface::from_webidl(UDL, "crate_name").unwrap();
+        ci.derive_ffi_funcs().unwrap();
+        assert_eq!(ci.enum_definitions().len(), 3);
         assert_eq!(ci.function_definitions().len(), 4);
 
         // The "flat" enum with no associated data.
@@ -537,7 +603,7 @@ mod test {
             enum Testing { "one", "two", "three" };
         "#;
         let ci = ComponentInterface::from_webidl(UDL, "crate_name").unwrap();
-        assert_eq!(ci.enum_definitions().count(), 1);
+        assert_eq!(ci.enum_definitions().len(), 1);
         let error = ci.get_enum_definition("Testing").unwrap();
         assert_eq!(
             error
@@ -561,7 +627,7 @@ mod test {
             enum Testing { "one", "two", "one" };
         "#;
         let ci = ComponentInterface::from_webidl(UDL, "crate_name").unwrap();
-        assert_eq!(ci.enum_definitions().count(), 1);
+        assert_eq!(ci.enum_definitions().len(), 1);
         assert_eq!(
             ci.get_enum_definition("Testing").unwrap().variants().len(),
             3
@@ -583,7 +649,7 @@ mod test {
             };
         "#;
         let ci = ComponentInterface::from_webidl(UDL, "crate_name").unwrap();
-        assert_eq!(ci.enum_definitions().count(), 1);
+        assert_eq!(ci.enum_definitions().len(), 1);
         let error: &Enum = ci.get_enum_definition("Testing").unwrap();
         assert_eq!(
             error
@@ -609,7 +675,7 @@ mod test {
             };
         "#;
         let ci = ComponentInterface::from_webidl(UDL, "crate_name").unwrap();
-        assert_eq!(ci.enum_definitions().count(), 1);
+        assert_eq!(ci.enum_definitions().len(), 1);
         let testing: &Enum = ci.get_enum_definition("Testing").unwrap();
         assert_eq!(
             testing.variants()[0]
@@ -683,6 +749,9 @@ mod test {
             variants: vec![],
             shape: EnumShape::Enum,
             non_exhaustive: false,
+            constructors: vec![],
+            methods: vec![],
+            uniffi_traits: vec![],
             docstring: None,
         };
 
diff --git a/third_party/rust/uniffi_bindgen/src/interface/ffi.rs b/third_party/rust/uniffi_bindgen/src/interface/ffi.rs
index 4dcba38d57ed3..1356808d302a3 100644
--- a/third_party/rust/uniffi_bindgen/src/interface/ffi.rs
+++ b/third_party/rust/uniffi_bindgen/src/interface/ffi.rs
@@ -33,11 +33,6 @@ pub enum FfiType {
     Int64,
     Float32,
     Float64,
-    /// A `*const c_void` pointer to a rust-owned `Arc<T>`.
-    /// If you've got one of these, you must call the appropriate rust function to free it.
-    /// The templates will generate a unique `free` function for each T.
-    /// The inner string references the name of the `T` type.
-    RustArcPtr(String),
     /// A byte buffer allocated by rust, and owned by whoever currently holds it.
     /// If you've got one of these, you must either call the appropriate rust function to free it
     /// or pass it to someone that will.
@@ -89,7 +84,7 @@ impl FfiType {
                 FfiType::Int64 => "i64".to_owned(),
                 FfiType::Float32 => "f32".to_owned(),
                 FfiType::Float64 => "f64".to_owned(),
-                FfiType::RustArcPtr(_) => "pointer".to_owned(),
+                FfiType::Handle => "u64".to_owned(),
                 FfiType::RustBuffer(_) => "rust_buffer".to_owned(),
                 _ => unimplemented!("FFI return type: {t:?}"),
             },
@@ -126,7 +121,7 @@ impl From<&Type> for FfiType {
             // We might add a separate type for borrowed byte strings in future as well.
             Type::Bytes => FfiType::RustBuffer(None),
             // Objects are pointers to an Arc<>
-            Type::Object { name, .. } => FfiType::RustArcPtr(name.to_owned()),
+            Type::Object { .. } => FfiType::Handle,
             // Callback interfaces are passed as opaque integer handles.
             Type::CallbackInterface { .. } => FfiType::UInt64,
             // Other types are serialized into a bytebuffer and deserialized on the other side.
@@ -169,6 +164,12 @@ pub struct ExternalFfiMetadata {
     pub module_path: String,
 }
 
+impl ExternalFfiMetadata {
+    pub fn crate_name(&self) -> &str {
+        self.module_path.split("::").next().unwrap()
+    }
+}
+
 // Needed for rust scaffolding askama template
 impl From<Type> for FfiType {
     fn from(ty: Type) -> Self {
diff --git a/third_party/rust/uniffi_bindgen/src/interface/function.rs b/third_party/rust/uniffi_bindgen/src/interface/function.rs
index 7e543794ea6b5..d24bd1c48ceb9 100644
--- a/third_party/rust/uniffi_bindgen/src/interface/function.rs
+++ b/third_party/rust/uniffi_bindgen/src/interface/function.rs
@@ -36,7 +36,7 @@ use anyhow::Result;
 use uniffi_meta::Checksum;
 
 use super::ffi::{FfiArgument, FfiFunction, FfiType};
-use super::{AsType, ComponentInterface, Literal, ObjectImpl, Type, TypeIterator};
+use super::{AsType, ComponentInterface, DefaultValue, ObjectImpl, Type, TypeIterator};
 
 /// Represents a standalone function.
 ///
@@ -131,6 +131,10 @@ impl Function {
     pub fn docstring(&self) -> Option<&str> {
         self.docstring.as_deref()
     }
+
+    pub fn checksum_from_metadata(meta: uniffi_meta::FnMetadata) -> u16 {
+        uniffi_meta::checksum(&Self::from(meta))
+    }
 }
 
 impl From<uniffi_meta::FnParamMetadata> for Argument {
@@ -183,7 +187,7 @@ pub struct Argument {
     pub(super) type_: Type,
     pub(super) by_ref: bool,
     pub(super) optional: bool,
-    pub(super) default: Option<Literal>,
+    pub(super) default: Option<DefaultValue>,
 }
 
 impl Argument {
@@ -203,7 +207,7 @@ impl Argument {
         matches!(&self.type_, Type::Object { imp, .. } if *imp == ObjectImpl::Trait)
     }
 
-    pub fn default_value(&self) -> Option<&Literal> {
+    pub fn default_value(&self) -> Option<&DefaultValue> {
         self.default.as_ref()
     }
 
@@ -251,9 +255,11 @@ pub trait Callable {
     fn throws_type(&self) -> Option<&Type>;
     fn is_async(&self) -> bool;
     fn docstring(&self) -> Option<&str>;
-    fn takes_self(&self) -> bool {
-        false
+
+    fn self_type(&self) -> Option<Type> {
+        None
     }
+
     fn result_type(&self) -> ResultType<'_> {
         ResultType {
             return_type: self.return_type(),
@@ -354,8 +360,8 @@ impl<T: Callable> Callable for &T {
         (*self).ffi_func()
     }
 
-    fn takes_self(&self) -> bool {
-        (*self).takes_self()
+    fn self_type(&self) -> Option<Type> {
+        (*self).self_type()
     }
 }
 
diff --git a/third_party/rust/uniffi_bindgen/src/interface/mod.rs b/third_party/rust/uniffi_bindgen/src/interface/mod.rs
index 1bb4884321518..9e70566b3ac20 100644
--- a/third_party/rust/uniffi_bindgen/src/interface/mod.rs
+++ b/third_party/rust/uniffi_bindgen/src/interface/mod.rs
@@ -46,7 +46,7 @@
 //!   * Error messages and general developer experience leave a lot to be desired.
 
 use std::{
-    collections::{btree_map::Entry, BTreeMap, BTreeSet, HashSet},
+    collections::{BTreeMap, BTreeSet, HashSet},
     iter,
 };
 
@@ -63,10 +63,13 @@ pub use enum_::{Enum, Variant};
 mod function;
 pub use function::{Argument, Callable, Function, ResultType};
 mod object;
-pub use object::{Constructor, Method, Object, UniffiTrait};
+pub use object::{Constructor, Method, Object, UniffiTrait, UniffiTraitMethods};
 mod record;
 pub use record::{Field, Record};
 
+mod rename;
+pub use rename::rename;
+
 pub mod ffi;
 mod visit_mut;
 pub use ffi::{
@@ -74,10 +77,12 @@ pub use ffi::{
 };
 pub use uniffi_meta::Radix;
 use uniffi_meta::{
-    ConstructorMetadata, LiteralMetadata, NamespaceMetadata, ObjectMetadata,
-    ObjectTraitImplMetadata, TraitMethodMetadata, UniffiTraitMetadata, UNIFFI_CONTRACT_VERSION,
+    ConstructorMetadata, DefaultValueMetadata, LiteralMetadata, MethodMetadata, NamespaceMetadata,
+    ObjectMetadata, ObjectTraitImplMetadata, TraitMethodMetadata, UniffiTraitMetadata,
+    UNIFFI_CONTRACT_VERSION,
 };
 pub type Literal = LiteralMetadata;
+pub type DefaultValue = DefaultValueMetadata;
 
 /// The main public interface for this module, representing the complete details of an interface exposed
 /// by a rust component and the details of consuming it via an extern-C FFI layer.
@@ -88,17 +93,19 @@ pub struct ComponentInterface {
     // anyway, so it's safe to ignore it.
     pub(super) types: TypeUniverse,
     /// The high-level API provided by the component.
-    enums: BTreeMap<String, Enum>,
-    records: BTreeMap<String, Record>,
+    enums: Vec<Enum>,
+    records: Vec<Record>,
     functions: Vec<Function>,
     objects: Vec<Object>,
-    callback_interfaces: Vec<CallbackInterface>,
+    pub(crate) callback_interfaces: Vec<CallbackInterface>,
     // Type names which were seen used as an error.
     errors: HashSet<String>,
     // Types which were seen used as callback interface error.
     callback_interface_throws_types: BTreeSet<Type>,
     // A mapping from an external module path to the external namespace.
     crate_to_namespace: BTreeMap<String, NamespaceMetadata>,
+    // A clone of every CI we know about, including ourself, to help get external type info for bindings.
+    all_component_interfaces: Vec<ComponentInterface>,
 }
 
 impl ComponentInterface {
@@ -191,23 +198,23 @@ impl ComponentInterface {
     }
 
     /// Get the definitions for every Enum type in the interface.
-    pub fn enum_definitions(&self) -> impl Iterator<Item = &Enum> {
-        self.enums.values()
+    pub fn enum_definitions(&self) -> &[Enum] {
+        &self.enums
     }
 
     /// Get an Enum definition by name, or None if no such Enum is defined.
     pub fn get_enum_definition(&self, name: &str) -> Option<&Enum> {
-        self.enums.get(name)
+        self.enums.iter().find(|o| o.name == name)
     }
 
     /// Get the definitions for every Record type in the interface.
-    pub fn record_definitions(&self) -> impl Iterator<Item = &Record> {
-        self.records.values()
+    pub fn record_definitions(&self) -> &[Record] {
+        &self.records
     }
 
     /// Get a Record definition by name, or None if no such Record is defined.
     pub fn get_record_definition(&self, name: &str) -> Option<&Record> {
-        self.records.get(name)
+        self.records.iter().find(|o| o.name == name)
     }
 
     /// Get the definitions for every Function in the interface.
@@ -233,7 +240,6 @@ impl ComponentInterface {
 
     /// Get an Object definition by name, or None if no such Object is defined.
     pub fn get_object_definition(&self, name: &str) -> Option<&Object> {
-        // TODO: probably we could store these internally in a HashMap to make this easier?
         self.objects.iter().find(|o| o.name == name)
     }
 
@@ -360,14 +366,15 @@ impl ComponentInterface {
 
     pub fn namespace_for_type(&self, ty: &Type) -> Result<&str> {
         let mod_path = ty
-            .module_path()
+            .crate_name()
             .ok_or_else(|| anyhow!("type {ty:?} has no module path"))?;
         self.namespace_for_module_path(mod_path)
     }
 
     pub fn namespace_for_module_path(&self, module_path: &str) -> Result<&str> {
+        let crate_name = module_path.split("::").next().unwrap_or(module_path);
         self.crate_to_namespace
-            .get(module_path)
+            .get(crate_name)
             .map(|n| n.name.as_ref())
             // incase not library mode and we've not been told
             .or_else(|| (module_path == self.crate_name()).then(|| self.namespace()))
@@ -426,6 +433,20 @@ impl ComponentInterface {
             .any(|t| matches!(t, Type::Object { .. }))
     }
 
+    pub fn set_all_component_interfaces(&mut self, all: Vec<ComponentInterface>) {
+        self.all_component_interfaces = all;
+    }
+
+    pub fn all_component_interfaces(&self) -> &[ComponentInterface] {
+        &self.all_component_interfaces
+    }
+
+    pub fn find_component_interface(&self, module_path: &str) -> Option<&ComponentInterface> {
+        self.all_component_interfaces
+            .iter()
+            .find(|ci| ci.crate_name() == module_path)
+    }
+
     // The namespace to use in crate-level FFI function definitions. Not used as the ffi
     // namespace for types - each type has its own `module_path` which is used for them.
     fn ffi_namespace(&self) -> &str {
@@ -658,7 +679,7 @@ impl ComponentInterface {
             }
             .into(),
             FfiCallbackFunction {
-                name: "ForeignFutureFree".to_owned(),
+                name: "ForeignFutureDroppedCallback".to_owned(),
                 arguments: vec![FfiArgument::new("handle", FfiType::UInt64)],
                 return_type: None,
                 has_rust_call_status_arg: false,
@@ -671,11 +692,21 @@ impl ComponentInterface {
                 has_rust_call_status_arg: false,
             }
             .into(),
+            FfiCallbackFunction {
+                name: "CallbackInterfaceClone".to_owned(),
+                arguments: vec![FfiArgument::new("handle", FfiType::UInt64)],
+                return_type: Some(FfiType::UInt64),
+                has_rust_call_status_arg: false,
+            }
+            .into(),
             FfiStruct {
-                name: "ForeignFuture".to_owned(),
+                name: "ForeignFutureDroppedCallbackStruct".to_owned(),
                 fields: vec![
                     FfiField::new("handle", FfiType::UInt64),
-                    FfiField::new("free", FfiType::Callback("ForeignFutureFree".to_owned())),
+                    FfiField::new(
+                        "free",
+                        FfiType::Callback("ForeignFutureDroppedCallback".to_owned()),
+                    ),
                 ],
             }
             .into(),
@@ -745,8 +776,9 @@ impl ComponentInterface {
     ///
     /// This includes FFI functions for:
     ///   - Top-level functions
-    ///   - Object methods
+    ///   - Object, Enum and Record data methods
     ///   - Callback interfaces
+    ///   - UniffiTrait methods
     pub fn iter_user_ffi_function_definitions(&self) -> impl Iterator<Item = &FfiFunction> + '_ {
         iter::empty()
             .chain(
@@ -759,6 +791,16 @@ impl ComponentInterface {
                     .iter()
                     .map(|cb| cb.ffi_init_callback()),
             )
+            .chain(
+                self.enums
+                    .iter()
+                    .flat_map(|enum_| enum_.iter_ffi_function_definitions()),
+            )
+            .chain(
+                self.records
+                    .iter()
+                    .flat_map(|r| r.iter_ffi_function_definitions()),
+            )
             .chain(self.functions.iter().map(|f| &f.ffi_func))
     }
 
@@ -785,10 +827,10 @@ impl ComponentInterface {
             Some(FfiType::Int64),
             Some(FfiType::Float32),
             Some(FfiType::Float64),
-            // RustBuffer and RustArcPtr have an inner field which we have to fill in with a
-            // placeholder value.
-            Some(FfiType::RustArcPtr("".to_owned())),
+            // RustBuffer has an inner field which we have to fill in with a placeholder value.
             Some(FfiType::RustBuffer(None)),
+            // `FfiType::Handle` is a 64-bit int and uses the same `ForeignFutureResult` type as
+            // `FfiType::UInt64`
             None,
         ]
         .into_iter()
@@ -857,54 +899,34 @@ impl ComponentInterface {
     //
     /// Called by `APIBuilder` impls to add a newly-parsed enum definition to the `ComponentInterface`.
     pub(super) fn add_enum_definition(&mut self, defn: Enum) -> Result<()> {
-        match self.enums.entry(defn.name().to_owned()) {
-            Entry::Vacant(v) => {
-                if matches!(defn.shape, EnumShape::Error { .. }) {
-                    self.errors.insert(defn.name.clone());
-                }
-                self.types
-                    .add_known_types(defn.iter_types())
-                    .with_context(|| format!("adding enum {defn:?}"))?;
-                v.insert(defn);
-            }
-            Entry::Occupied(o) => {
-                let existing_def = o.get();
-                if defn != *existing_def {
-                    bail!(
-                        "Mismatching definition for enum `{}`!\n\
-                        existing definition: {existing_def:#?},\n\
-                        new definition: {defn:#?}",
-                        defn.name(),
-                    );
-                }
-            }
+        if let Some(existing_def) = self.enums.iter().find(|f| f.name == defn.name) {
+            bail!(
+                "Mismatching definition for enum `{}`!\n\
+                existing definition: {existing_def:#?},\n\
+                new definition: {defn:#?}",
+                defn.name(),
+            );
         }
-
+        if matches!(defn.shape, EnumShape::Error { .. }) {
+            self.errors.insert(defn.name.clone());
+        }
+        self.types
+            .add_known_types(defn.iter_types())
+            .with_context(|| format!("adding enum {defn:?}"))?;
+        self.enums.push(defn);
         Ok(())
     }
 
     /// Adds a newly-parsed record definition to the `ComponentInterface`.
     pub(super) fn add_record_definition(&mut self, defn: Record) -> Result<()> {
-        match self.records.entry(defn.name().to_owned()) {
-            Entry::Vacant(v) => {
-                self.types
-                    .add_known_types(defn.iter_types())
-                    .with_context(|| format!("adding record {defn:?}"))?;
-                v.insert(defn);
-            }
-            Entry::Occupied(o) => {
-                let existing_def = o.get();
-                if defn != *existing_def {
-                    bail!(
-                        "Mismatching definition for record `{}`!\n\
-                         existing definition: {existing_def:#?},\n\
-                         new definition: {defn:#?}",
-                        defn.name(),
-                    );
-                }
-            }
+        if self.records.iter().any(|r| r.name == defn.name) {
+            bail!("duplicate record definition: \"{}\"", defn.name);
         }
 
+        self.types
+            .add_known_types(defn.iter_types())
+            .with_context(|| format!("adding record {defn:?}"))?;
+        self.records.push(defn);
         Ok(())
     }
 
@@ -929,45 +951,97 @@ impl ComponentInterface {
     }
 
     pub(super) fn add_constructor_meta(&mut self, meta: ConstructorMetadata) -> Result<()> {
-        let object = get_object(&mut self.objects, &meta.self_name)
-            .ok_or_else(|| anyhow!("add_constructor_meta: object {} not found", &meta.self_name))?;
-        let defn: Constructor = meta.into();
+        let self_name = &meta.self_name;
 
-        self.types
-            .add_known_types(defn.iter_types())
-            .with_context(|| format!("adding constructor {defn:?}"))?;
-        defn.throws_name()
-            .map(|n| self.errors.insert(n.to_string()));
-        object.constructors.push(defn);
+        if let Some(object) = get_object(&mut self.objects, self_name) {
+            let defn: Constructor = meta.into();
+            self.types
+                .add_known_types(defn.iter_types())
+                .with_context(|| format!("adding constructor {defn:?}"))?;
+            defn.throws_name()
+                .map(|n| self.errors.insert(n.to_string()));
+            object.constructors.push(defn);
+        } else if let Some(record) = self.records.iter_mut().find(|r| &r.name == self_name) {
+            let defn: Constructor = meta.into();
+            self.types
+                .add_known_types(defn.iter_types())
+                .with_context(|| format!("adding constructor {defn:?}"))?;
+            defn.throws_name()
+                .map(|n| self.errors.insert(n.to_string()));
+            record.constructors.push(defn);
+        } else if let Some(enum_) = self.enums.iter_mut().find(|e| &e.name == self_name) {
+            let defn: Constructor = meta.into();
+            self.types
+                .add_known_types(defn.iter_types())
+                .with_context(|| format!("adding constructor {defn:?}"))?;
+            defn.throws_name()
+                .map(|n| self.errors.insert(n.to_string()));
+            enum_.constructors.push(defn);
+        } else {
+            bail!("add_constructor_meta: type {} not found", self_name);
+        }
 
         Ok(())
     }
 
-    pub(super) fn add_method_meta(&mut self, meta: impl Into<Method>) -> Result<()> {
-        let mut method: Method = meta.into();
-        let object = get_object(&mut self.objects, &method.object_name)
-            .ok_or_else(|| anyhow!("add_method_meta: object {} not found", &method.object_name))?;
+    pub(super) fn add_method_meta(&mut self, meta: MethodMetadata) -> Result<()> {
+        let self_name = &meta.self_name;
 
-        self.types
-            .add_known_types(method.iter_types())
-            .with_context(|| format!("adding method {method:?}"))?;
-        method
-            .throws_name()
-            .map(|n| self.errors.insert(n.to_string()));
-        method.object_impl = object.imp;
-        object.methods.push(method);
+        if let Some(object) = get_object(&mut self.objects, self_name) {
+            let method = Method::from_metadata(meta, object.as_type());
+            self.types
+                .add_known_types(method.iter_types())
+                .with_context(|| format!("adding method {method:?}"))?;
+            method
+                .throws_name()
+                .map(|n| self.errors.insert(n.to_string()));
+            object.methods.push(method);
+        } else if let Some(record) = self.records.iter_mut().find(|r| &r.name == self_name) {
+            let method = Method::from_metadata(meta, record.as_type());
+            self.types
+                .add_known_types(method.iter_types())
+                .with_context(|| format!("adding method {method:?}"))?;
+            method
+                .throws_name()
+                .map(|n| self.errors.insert(n.to_string()));
+            record.methods.push(method);
+        } else if let Some(enum_) = self.enums.iter_mut().find(|e| &e.name == self_name) {
+            let method = Method::from_metadata(meta, enum_.as_type());
+            self.types
+                .add_known_types(method.iter_types())
+                .with_context(|| format!("adding method {method:?}"))?;
+            method
+                .throws_name()
+                .map(|n| self.errors.insert(n.to_string()));
+            enum_.methods.push(method);
+        } else {
+            bail!("add_method_meta: type {} not found", self_name);
+        }
         Ok(())
     }
 
     pub(super) fn add_uniffitrait_meta(&mut self, meta: UniffiTraitMetadata) -> Result<()> {
-        let object = get_object(&mut self.objects, meta.self_name())
-            .ok_or_else(|| anyhow!("add_uniffitrait_meta: object not found"))?;
-        let ut: UniffiTrait = meta.into();
+        let self_name = meta.self_name().to_string();
+        let self_type = self
+            .get_type(&self_name)
+            .ok_or_else(|| anyhow!("add_uniffitrait_meta: object {} not found", self_name))?;
+        let ut = UniffiTrait::from_metadata(meta, self_type);
+
         self.types
             .add_known_types(ut.iter_types())
             .with_context(|| format!("adding builtin trait {ut:?}"))?;
-
-        object.uniffi_traits.push(ut);
+        if let Some(object) = get_object(&mut self.objects, &self_name) {
+            object.uniffi_traits.push(ut);
+        } else if let Some(enum_) = self.enums.iter_mut().find(|o| o.name == self_name) {
+            enum_.add_uniffi_trait(ut);
+        } else if let Some(record) = self.records.iter_mut().find(|o| o.name == self_name) {
+            record.add_uniffi_trait(ut);
+        } else {
+            bail!(
+                "add_uniffitrait_meta: object '{}' does not support trait methods.",
+                self_name
+            );
+        }
         Ok(())
     }
 
@@ -988,6 +1062,10 @@ impl ComponentInterface {
 
     pub fn is_name_used_as_error(&self, name: &str) -> bool {
         self.errors.contains(name)
+            || self
+                .all_component_interfaces
+                .iter()
+                .any(|ci| ci.errors.contains(name))
     }
 
     /// Called by `APIBuilder` impls to add a newly-parsed callback interface definition to the `ComponentInterface`.
@@ -1005,7 +1083,7 @@ impl ComponentInterface {
     }
 
     pub(super) fn add_trait_method_meta(&mut self, meta: TraitMethodMetadata) -> Result<()> {
-        if let Some(cbi) = get_callback_interface(&mut self.callback_interfaces, &meta.trait_name) {
+        if let Some(cbi) = self.get_callback_interface_definition(&meta.trait_name) {
             // uniffi_meta should ensure that we process callback interface methods in order, double
             // check that here
             if cbi.methods.len() != meta.index as usize {
@@ -1017,7 +1095,8 @@ impl ComponentInterface {
                     meta.index,
                 );
             }
-            let method: Method = meta.into();
+            let method = Method::from_metadata(meta.clone().into(), cbi.as_type());
+
             if let Some(error) = method.throws_type() {
                 self.callback_interface_throws_types.insert(error.clone());
             }
@@ -1027,9 +1106,13 @@ impl ComponentInterface {
             method
                 .throws_name()
                 .map(|n| self.errors.insert(n.to_string()));
+            // finally take a mut ref to the cbi, to avoid taking an early mut ref to self. unwrap as we know it exists
+            let cbi =
+                get_callback_interface(&mut self.callback_interfaces, &meta.trait_name).unwrap();
             cbi.methods.push(method);
         } else {
-            self.add_method_meta(meta)?;
+            // a trait method on a regular object.
+            self.add_method_meta(meta.into())?;
         }
         Ok(())
     }
@@ -1083,6 +1166,12 @@ impl ComponentInterface {
         for obj in self.objects.iter_mut() {
             obj.derive_ffi_funcs()?;
         }
+        for enum_ in self.enums.iter_mut() {
+            enum_.derive_ffi_funcs()?;
+        }
+        for record in self.records.iter_mut() {
+            record.derive_ffi_funcs()?;
+        }
         for callback in self.callback_interfaces.iter_mut() {
             callback.derive_ffi_funcs();
         }
@@ -1123,7 +1212,7 @@ struct RecursiveTypeIterator<'a> {
     /// The currently-active iterator from which we're yielding.
     current: TypeIterator<'a>,
     /// A set of names of user-defined types that we have already seen.
-    seen: HashSet<&'a str>,
+    seen: HashSet<(&'a str, &'a str)>,
     /// A queue of user-defined types that we need to recurse into.
     pending: Vec<&'a Type>,
 }
@@ -1143,19 +1232,34 @@ impl<'a> RecursiveTypeIterator<'a> {
     /// Add a new type to the queue of pending types, if not previously seen.
     fn add_pending_type(&mut self, type_: &'a Type) {
         match type_ {
-            Type::Record { name, .. }
-            | Type::Enum { name, .. }
-            | Type::Object { name, .. }
-            | Type::CallbackInterface { name, .. } => {
-                if !self.seen.contains(name.as_str()) {
+            Type::Record {
+                module_path, name, ..
+            }
+            | Type::Enum {
+                module_path, name, ..
+            }
+            | Type::Object {
+                module_path, name, ..
+            }
+            | Type::CallbackInterface {
+                module_path, name, ..
+            } => {
+                if !self.seen.contains(&(module_path.as_str(), name.as_str())) {
                     self.pending.push(type_);
-                    self.seen.insert(name.as_str());
+                    self.seen.insert((module_path.as_str(), name.as_str()));
                 }
             }
             _ => (),
         }
     }
 
+    /// Find the component interface with the type definitions for the given module.
+    fn find_ci_for(&self, module_path: &str) -> &'a ComponentInterface {
+        self.ci
+            .find_component_interface(module_path)
+            .unwrap_or(self.ci)
+    }
+
     /// Advance the iterator to recurse into the next pending type, if any.
     ///
     /// This method is called when the current iterator is empty, and it will select
@@ -1167,16 +1271,30 @@ impl<'a> RecursiveTypeIterator<'a> {
             // In the unlikely event that one of them returns `None` then, rather than trying to advance
             // to a non-existent type, we just leave the existing iterator in place and allow the recursive
             // call to `next()` to try again with the next pending type.
+            // (This is fragile - not finding a type for a name will cause difficult to diagnose bugs!)
             let next_iter = match next_type {
-                Type::Record { name, .. } => {
-                    self.ci.get_record_definition(name).map(Record::iter_types)
-                }
-                Type::Enum { name, .. } => self.ci.get_enum_definition(name).map(Enum::iter_types),
-                Type::Object { name, .. } => {
-                    self.ci.get_object_definition(name).map(Object::iter_types)
-                }
-                Type::CallbackInterface { name, .. } => self
-                    .ci
+                Type::Record {
+                    module_path, name, ..
+                } => self
+                    .find_ci_for(module_path)
+                    .get_record_definition(name)
+                    .map(Record::iter_types),
+                Type::Enum {
+                    module_path, name, ..
+                } => self
+                    .find_ci_for(module_path)
+                    .get_enum_definition(name)
+                    .map(Enum::iter_types),
+                Type::Object {
+                    module_path, name, ..
+                } => self
+                    .find_ci_for(module_path)
+                    .get_object_definition(name)
+                    .map(Object::iter_types),
+                Type::CallbackInterface {
+                    module_path, name, ..
+                } => self
+                    .find_ci_for(module_path)
                     .get_callback_interface_definition(name)
                     .map(CallbackInterface::iter_types),
                 _ => None,
@@ -1212,6 +1330,11 @@ fn throws_name(throws: &Option<Type>) -> Option<&str> {
     match throws {
         None => None,
         Some(Type::Enum { name, .. }) | Some(Type::Object { name, .. }) => Some(name),
+        Some(Type::Custom { name, builtin, .. })
+            if matches!(&**builtin, Type::Enum { .. } | Type::Object { .. }) =>
+        {
+            Some(name)
+        }
         _ => panic!("unknown throw type: {throws:?}"),
     }
 }
@@ -1275,6 +1398,9 @@ existing definition: Enum {
     ],
     shape: Enum,
     non_exhaustive: false,
+    constructors: [],
+    methods: [],
+    uniffi_traits: [],
     docstring: None,
 },
 new definition: Enum {
@@ -1300,6 +1426,9 @@ new definition: Enum {
         flat: true,
     },
     non_exhaustive: false,
+    constructors: [],
+    methods: [],
+    uniffi_traits: [],
     docstring: None,
 }",
         );
diff --git a/third_party/rust/uniffi_bindgen/src/interface/object.rs b/third_party/rust/uniffi_bindgen/src/interface/object.rs
index faf2ae444cd25..1c35bbfbf7e8b 100644
--- a/third_party/rust/uniffi_bindgen/src/interface/object.rs
+++ b/third_party/rust/uniffi_bindgen/src/interface/object.rs
@@ -184,6 +184,10 @@ impl Object {
         self.uniffi_traits.iter().collect()
     }
 
+    pub fn uniffi_trait_methods(&self) -> UniffiTraitMethods {
+        UniffiTraitMethods::new(&self.uniffi_traits)
+    }
+
     pub fn trait_impls(&self) -> Vec<&ObjectTraitImplMetadata> {
         self.trait_impls.iter().collect()
     }
@@ -223,7 +227,8 @@ impl Object {
                     .flat_map(|ut| match ut {
                         UniffiTrait::Display { fmt: m }
                         | UniffiTrait::Debug { fmt: m }
-                        | UniffiTrait::Hash { hash: m } => vec![m],
+                        | UniffiTrait::Hash { hash: m }
+                        | UniffiTrait::Ord { cmp: m } => vec![m],
                         UniffiTrait::Eq { eq, ne } => vec![eq, ne],
                     })
                     .map(|m| &m.ffi_func),
@@ -234,13 +239,13 @@ impl Object {
         assert!(!self.ffi_func_clone.name().is_empty());
         assert!(!self.ffi_func_free.name().is_empty());
         self.ffi_func_clone.arguments = vec![FfiArgument {
-            name: "ptr".to_string(),
-            type_: FfiType::RustArcPtr(self.name.to_string()),
+            name: "handle".to_string(),
+            type_: FfiType::Handle,
         }];
-        self.ffi_func_clone.return_type = Some(FfiType::RustArcPtr(self.name.to_string()));
+        self.ffi_func_clone.return_type = Some(FfiType::Handle);
         self.ffi_func_free.arguments = vec![FfiArgument {
-            name: "ptr".to_string(),
-            type_: FfiType::RustArcPtr(self.name.to_string()),
+            name: "handle".to_string(),
+            type_: FfiType::Handle,
         }];
         self.ffi_func_free.return_type = None;
         self.ffi_func_free.is_object_free_function = true;
@@ -349,26 +354,6 @@ impl From<uniffi_meta::ObjectMetadata> for Object {
     }
 }
 
-impl From<uniffi_meta::UniffiTraitMetadata> for UniffiTrait {
-    fn from(meta: uniffi_meta::UniffiTraitMetadata) -> Self {
-        match meta {
-            uniffi_meta::UniffiTraitMetadata::Debug { fmt } => {
-                UniffiTrait::Debug { fmt: fmt.into() }
-            }
-            uniffi_meta::UniffiTraitMetadata::Display { fmt } => {
-                UniffiTrait::Display { fmt: fmt.into() }
-            }
-            uniffi_meta::UniffiTraitMetadata::Eq { eq, ne } => UniffiTrait::Eq {
-                eq: eq.into(),
-                ne: ne.into(),
-            },
-            uniffi_meta::UniffiTraitMetadata::Hash { hash } => {
-                UniffiTrait::Hash { hash: hash.into() }
-            }
-        }
-    }
-}
-
 // Represents a constructor for an object type.
 //
 // In the FFI, this will be a function that returns a pointer to an instance
@@ -456,12 +441,14 @@ impl Constructor {
         self.name == "new"
     }
 
-    fn derive_ffi_func(&mut self) {
+    pub fn derive_ffi_func(&mut self) {
         assert!(!self.ffi_func.name().is_empty());
-        self.ffi_func.init(
-            Some(FfiType::RustArcPtr(self.object_name.clone())),
-            self.arguments.iter().map(Into::into),
-        );
+        self.ffi_func
+            .init(Some(FfiType::Handle), self.arguments.iter().map(Into::into));
+    }
+
+    pub fn checksum_from_metadata(meta: uniffi_meta::ConstructorMetadata) -> u16 {
+        uniffi_meta::checksum(&Self::from(meta))
     }
 }
 
@@ -504,10 +491,11 @@ impl From<uniffi_meta::ConstructorMetadata> for Constructor {
 #[derive(Debug, Clone, Checksum)]
 pub struct Method {
     pub(super) name: String,
-    pub(super) object_name: String,
-    pub(super) object_module_path: String,
     pub(super) is_async: bool,
-    pub(super) object_impl: ObjectImpl,
+    // Ignore `self_type` for the checksum, we never compare the method checksums for methods from
+    // different objects.
+    #[checksum_ignore]
+    pub(super) self_type: Type,
     pub(super) arguments: Vec<Argument>,
     pub(super) return_type: Option<Type>,
     // We don't include the FFIFunc in the hash calculation, because:
@@ -542,7 +530,7 @@ impl Method {
     }
 
     pub fn object_name(&self) -> &str {
-        &self.object_name
+        self.self_type.name().unwrap()
     }
 
     pub fn arguments(&self) -> Vec<&Argument> {
@@ -554,13 +542,7 @@ impl Method {
     pub fn full_arguments(&self) -> Vec<Argument> {
         vec![Argument {
             name: "ptr".to_string(),
-            // TODO: ideally we'd get this via `ci.resolve_type_expression` so that it
-            // is contained in the proper `TypeUniverse`, but this works for now.
-            type_: Type::Object {
-                name: self.object_name.clone(),
-                module_path: self.object_module_path.clone(),
-                imp: self.object_impl,
-            },
+            type_: self.self_type.clone(),
             by_ref: !self.takes_self_by_arc,
             optional: false,
             default: None,
@@ -619,30 +601,25 @@ impl Method {
     pub fn foreign_future_ffi_result_struct(&self) -> FfiStruct {
         callbacks::foreign_future_ffi_result_struct(self.return_type.as_ref().map(FfiType::from))
     }
-}
 
-impl From<uniffi_meta::MethodMetadata> for Method {
-    fn from(meta: uniffi_meta::MethodMetadata) -> Self {
+    // construct from metadata - like `From<>` but with extra args
+    pub fn from_metadata(meta: uniffi_meta::MethodMetadata, receiver: Type) -> Self {
         let ffi_name = meta.ffi_symbol_name();
         let checksum_fn_name = meta.checksum_symbol_name();
-        let is_async = meta.is_async;
-        let return_type = meta.return_type;
         let arguments = meta.inputs.into_iter().map(Into::into).collect();
 
         let ffi_func = FfiFunction {
             name: ffi_name,
-            is_async,
+            is_async: meta.is_async,
             ..FfiFunction::default()
         };
 
         Self {
             name: meta.name,
-            object_name: meta.self_name,
-            object_module_path: meta.module_path,
-            is_async,
-            object_impl: ObjectImpl::Struct, // will be filled in later
+            self_type: receiver,
+            is_async: meta.is_async,
             arguments,
-            return_type,
+            return_type: meta.return_type,
             ffi_func,
             docstring: meta.docstring.clone(),
             throws: meta.throws,
@@ -651,45 +628,22 @@ impl From<uniffi_meta::MethodMetadata> for Method {
             checksum: meta.checksum,
         }
     }
-}
 
-impl From<uniffi_meta::TraitMethodMetadata> for Method {
-    fn from(meta: uniffi_meta::TraitMethodMetadata) -> Self {
-        let ffi_name = meta.ffi_symbol_name();
-        let checksum_fn_name = meta.checksum_symbol_name();
-        let is_async = meta.is_async;
-        let return_type = meta.return_type;
-        let arguments = meta.inputs.into_iter().map(Into::into).collect();
-        let ffi_func = FfiFunction {
-            name: ffi_name,
-            is_async,
-            ..FfiFunction::default()
-        };
-        Self {
-            name: meta.name,
-            object_name: meta.trait_name,
-            object_module_path: meta.module_path,
-            is_async,
-            arguments,
-            return_type,
-            docstring: meta.docstring.clone(),
-            throws: meta.throws,
-            takes_self_by_arc: meta.takes_self_by_arc,
-            checksum_fn_name,
-            checksum: meta.checksum,
-            ffi_func,
-            object_impl: ObjectImpl::Struct,
-        }
+    pub fn checksum_from_metadata(meta: uniffi_meta::MethodMetadata) -> u16 {
+        // We can use an arbitrary `self_type` for this, since it's ignored for the checksum
+        uniffi_meta::checksum(&Self::from_metadata(meta, Type::UInt8))
     }
 }
 
 /// The list of traits we support generating helper methods for.
+#[allow(clippy::large_enum_variant)]
 #[derive(Clone, Debug, Checksum)]
 pub enum UniffiTrait {
     Debug { fmt: Method },
     Display { fmt: Method },
     Eq { eq: Method, ne: Method },
     Hash { hash: Method },
+    Ord { cmp: Method },
 }
 
 impl UniffiTrait {
@@ -698,7 +652,8 @@ impl UniffiTrait {
             match self {
                 UniffiTrait::Display { fmt: m }
                 | UniffiTrait::Debug { fmt: m }
-                | UniffiTrait::Hash { hash: m } => vec![m.iter_types()],
+                | UniffiTrait::Hash { hash: m }
+                | UniffiTrait::Ord { cmp: m } => vec![m.iter_types()],
                 UniffiTrait::Eq { eq, ne } => vec![eq.iter_types(), ne.iter_types()],
             }
             .into_iter()
@@ -710,7 +665,8 @@ impl UniffiTrait {
         match self {
             UniffiTrait::Display { fmt: m }
             | UniffiTrait::Debug { fmt: m }
-            | UniffiTrait::Hash { hash: m } => {
+            | UniffiTrait::Hash { hash: m }
+            | UniffiTrait::Ord { cmp: m } => {
                 m.derive_ffi_func()?;
             }
             UniffiTrait::Eq { eq, ne } => {
@@ -720,6 +676,58 @@ impl UniffiTrait {
         }
         Ok(())
     }
+
+    // construct from metadata - like `From<>` but with extra args
+    pub fn from_metadata(meta: uniffi_meta::UniffiTraitMetadata, receiver: Type) -> Self {
+        match meta {
+            uniffi_meta::UniffiTraitMetadata::Debug { fmt } => UniffiTrait::Debug {
+                fmt: Method::from_metadata(fmt, receiver),
+            },
+            uniffi_meta::UniffiTraitMetadata::Display { fmt } => UniffiTrait::Display {
+                fmt: Method::from_metadata(fmt, receiver),
+            },
+            uniffi_meta::UniffiTraitMetadata::Eq { eq, ne } => UniffiTrait::Eq {
+                eq: Method::from_metadata(eq, receiver.clone()),
+                ne: Method::from_metadata(ne, receiver),
+            },
+            uniffi_meta::UniffiTraitMetadata::Hash { hash } => UniffiTrait::Hash {
+                hash: Method::from_metadata(hash, receiver),
+            },
+            uniffi_meta::UniffiTraitMetadata::Ord { cmp } => UniffiTrait::Ord {
+                cmp: Method::from_metadata(cmp, receiver),
+            },
+        }
+    }
+}
+
+/// flattened uniffi_traits.
+#[derive(Debug, Clone, Default)]
+pub struct UniffiTraitMethods {
+    pub debug_fmt: Option<Method>,
+    pub display_fmt: Option<Method>,
+    pub eq_eq: Option<Method>,
+    pub eq_ne: Option<Method>,
+    pub hash_hash: Option<Method>,
+    pub ord_cmp: Option<Method>,
+}
+
+impl UniffiTraitMethods {
+    pub fn new(uniffi_traits: &[UniffiTrait]) -> Self {
+        let mut new = Self::default();
+        for t in uniffi_traits {
+            match t.clone() {
+                UniffiTrait::Debug { fmt } => new.debug_fmt = Some(fmt),
+                UniffiTrait::Display { fmt } => new.display_fmt = Some(fmt),
+                UniffiTrait::Eq { eq, ne } => {
+                    new.eq_eq = Some(eq);
+                    new.eq_ne = Some(ne);
+                }
+                UniffiTrait::Hash { hash } => new.hash_hash = Some(hash),
+                UniffiTrait::Ord { cmp } => new.ord_cmp = Some(cmp),
+            }
+        }
+        new
+    }
 }
 
 impl Callable for Constructor {
@@ -769,13 +777,13 @@ impl Callable for Method {
         self.is_async
     }
 
-    fn takes_self(&self) -> bool {
-        true
-    }
-
     fn ffi_func(&self) -> &FfiFunction {
         &self.ffi_func
     }
+
+    fn self_type(&self) -> Option<Type> {
+        Some(self.self_type.clone())
+    }
 }
 
 #[cfg(test)]
@@ -823,7 +831,8 @@ mod test {
                 constructor(u32 v);
             };
         "#;
-        let ci = ComponentInterface::from_webidl(UDL, "crate_name").unwrap();
+        let mut ci = ComponentInterface::from_webidl(UDL, "crate_name").unwrap();
+        ci.derive_ffi_funcs().unwrap();
         assert_eq!(ci.object_definitions().len(), 1);
 
         let obj = ci.get_object_definition("Testing").unwrap();
@@ -853,7 +862,8 @@ mod test {
                 constructor(u32 v);
             };
         "#;
-        let ci = ComponentInterface::from_webidl(UDL, "crate_name").unwrap();
+        let mut ci = ComponentInterface::from_webidl(UDL, "crate_name").unwrap();
+        ci.derive_ffi_funcs().unwrap();
         assert_eq!(ci.object_definitions().len(), 1);
 
         let obj = ci.get_object_definition("Testing").unwrap();
diff --git a/third_party/rust/uniffi_bindgen/src/interface/record.rs b/third_party/rust/uniffi_bindgen/src/interface/record.rs
index 370210f151a3b..f368a996157c8 100644
--- a/third_party/rust/uniffi_bindgen/src/interface/record.rs
+++ b/third_party/rust/uniffi_bindgen/src/interface/record.rs
@@ -47,20 +47,26 @@
 use anyhow::Result;
 use uniffi_meta::Checksum;
 
-use super::Literal;
-use super::{AsType, Type, TypeIterator};
+use super::function::Callable;
+use super::{
+    AsType, Constructor, DefaultValue, FfiFunction, Method, Type, TypeIterator, UniffiTrait,
+    UniffiTraitMethods,
+};
 
 /// Represents a "data class" style object, for passing around complex values.
 ///
 /// In the FFI these are represented as a byte buffer, which one side explicitly
 /// serializes the data into and the other serializes it out of. So I guess they're
 /// kind of like "pass by clone" values.
-#[derive(Debug, Clone, PartialEq, Eq, Checksum)]
+#[derive(Debug, Clone, Checksum)]
 pub struct Record {
     pub(super) name: String,
     pub(super) module_path: String,
     pub(super) remote: bool,
     pub(super) fields: Vec<Field>,
+    pub(super) constructors: Vec<Constructor>,
+    pub(super) methods: Vec<Method>,
+    pub uniffi_traits: Vec<UniffiTrait>,
     #[checksum_ignore]
     pub(super) docstring: Option<String>,
 }
@@ -82,17 +88,71 @@ impl Record {
         &self.fields
     }
 
+    pub fn constructors(&self) -> &[Constructor] {
+        &self.constructors
+    }
+
+    pub fn methods(&self) -> &[Method] {
+        &self.methods
+    }
+
     pub fn docstring(&self) -> Option<&str> {
         self.docstring.as_deref()
     }
 
     pub fn iter_types(&self) -> TypeIterator<'_> {
-        Box::new(self.fields.iter().flat_map(Field::iter_types))
+        Box::new(
+            self.fields
+                .iter()
+                .flat_map(Field::iter_types)
+                .chain(self.constructors.iter().flat_map(Constructor::iter_types))
+                .chain(self.methods.iter().flat_map(Method::iter_types)),
+        )
     }
 
     pub fn has_fields(&self) -> bool {
         !self.fields.is_empty()
     }
+
+    pub fn uniffi_trait_methods(&self) -> UniffiTraitMethods {
+        UniffiTraitMethods::new(&self.uniffi_traits)
+    }
+
+    pub fn add_uniffi_trait(&mut self, t: UniffiTrait) {
+        self.uniffi_traits.push(t);
+    }
+
+    pub fn derive_ffi_funcs(&mut self) -> Result<()> {
+        for c in self.constructors.iter_mut() {
+            c.derive_ffi_func();
+        }
+        for m in self.methods.iter_mut() {
+            m.derive_ffi_func()?;
+        }
+        for ut in self.uniffi_traits.iter_mut() {
+            ut.derive_ffi_func()?;
+        }
+        Ok(())
+    }
+
+    pub fn iter_ffi_function_definitions(&self) -> impl Iterator<Item = &FfiFunction> {
+        self.constructors
+            .iter()
+            .map(|f| &f.ffi_func)
+            .chain(self.methods.iter().map(|f| &f.ffi_func))
+            .chain(
+                self.uniffi_traits
+                    .iter()
+                    .flat_map(|ut| match ut {
+                        UniffiTrait::Display { fmt: m }
+                        | UniffiTrait::Debug { fmt: m }
+                        | UniffiTrait::Hash { hash: m }
+                        | UniffiTrait::Ord { cmp: m } => vec![m],
+                        UniffiTrait::Eq { eq, ne } => vec![eq, ne],
+                    })
+                    .map(|m| &m.ffi_func),
+            )
+    }
 }
 
 impl AsType for Record {
@@ -117,6 +177,9 @@ impl TryFrom<uniffi_meta::RecordMetadata> for Record {
                 .into_iter()
                 .map(TryInto::try_into)
                 .collect::<Result<_>>()?,
+            constructors: vec![],
+            methods: vec![],
+            uniffi_traits: vec![],
             docstring: meta.docstring.clone(),
         })
     }
@@ -127,7 +190,7 @@ impl TryFrom<uniffi_meta::RecordMetadata> for Record {
 pub struct Field {
     pub(super) name: String,
     pub(super) type_: Type,
-    pub(super) default: Option<Literal>,
+    pub(super) default: Option<DefaultValue>,
     #[checksum_ignore]
     pub(super) docstring: Option<String>,
 }
@@ -141,7 +204,7 @@ impl Field {
         self.name = name;
     }
 
-    pub fn default_value(&self) -> Option<&Literal> {
+    pub fn default_value(&self) -> Option<&DefaultValue> {
         self.default.as_ref()
     }
 
@@ -178,8 +241,8 @@ impl TryFrom<uniffi_meta::FieldMetadata> for Field {
 
 #[cfg(test)]
 mod test {
-    use super::super::ComponentInterface;
     use super::*;
+    use crate::interface::{ComponentInterface, Literal};
     use uniffi_meta::Radix;
 
     #[test]
@@ -197,7 +260,7 @@ mod test {
             };
         "#;
         let ci = ComponentInterface::from_webidl(UDL, "crate_name").unwrap();
-        assert_eq!(ci.record_definitions().count(), 3);
+        assert_eq!(ci.record_definitions().len(), 3);
 
         let record = ci.get_record_definition("Empty").unwrap();
         assert_eq!(record.name(), "Empty");
@@ -225,7 +288,11 @@ mod test {
         assert_eq!(record.fields()[1].as_type(), Type::UInt32);
         assert!(matches!(
             record.fields()[1].default_value(),
-            Some(Literal::UInt(0, Radix::Decimal, Type::UInt32))
+            Some(DefaultValue::Literal(Literal::UInt(
+                0,
+                Radix::Decimal,
+                Type::UInt32
+            )))
         ));
         assert_eq!(record.fields()[2].name(), "spin");
         assert_eq!(record.fields()[2].as_type(), Type::Boolean);
@@ -242,7 +309,7 @@ mod test {
             };
         "#;
         let ci = ComponentInterface::from_webidl(UDL, "crate_name").unwrap();
-        assert_eq!(ci.record_definitions().count(), 1);
+        assert_eq!(ci.record_definitions().len(), 1);
         let record = ci.get_record_definition("Testing").unwrap();
         assert_eq!(record.fields().len(), 2);
         assert_eq!(record.fields()[0].name(), "maybe_name");
diff --git a/third_party/rust/uniffi_bindgen/src/interface/rename.rs b/third_party/rust/uniffi_bindgen/src/interface/rename.rs
new file mode 100644
index 0000000000000..f0fbc95f16d29
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/interface/rename.rs
@@ -0,0 +1,330 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use super::*;
+/// Implements renaming of items in the CI via toml configuration.
+/// Intended to be called by bindings to update the local names of items
+/// to be generated but not touching names in the ffi we need to use.
+use crate::VisitMut;
+use std::collections::HashMap;
+
+pub fn rename(ci: &mut ComponentInterface, renames: &HashMap<String, toml::Table>) {
+    let this_module_path = ci.crate_name().to_string();
+    ci.visit_mut(&TomlRenamer {
+        this_module_path,
+        renames,
+    })
+}
+
+struct TomlRenamer<'a> {
+    this_module_path: String,
+    renames: &'a HashMap<String, toml::Table>,
+}
+
+impl TomlRenamer<'_> {
+    fn new_name(&self, module_path: &str, name: &str) -> Option<String> {
+        self.renames
+            .get(module_path)
+            .and_then(|rename_table| rename_table.get(name))
+            .and_then(|v| v.as_str())
+            .map(|s| s.to_string())
+    }
+}
+
+impl VisitMut for TomlRenamer<'_> {
+    fn visit_record(&self, record: &mut Record) {
+        let module_path = &record.module_path;
+        let record_name = record.name().to_string();
+        // fields
+        for field in &mut record.fields {
+            let field_path = format!("{}.{}", record_name, field.name);
+            if let Some(new_name) = self.new_name(module_path, &field_path) {
+                field.name = new_name;
+            }
+        }
+        // the record type itself
+        if let Some(new_name) = self.new_name(module_path, &record_name) {
+            record.name = new_name;
+        }
+    }
+
+    fn visit_object(&self, object: &mut Object) {
+        let module_path = &object.module_path;
+        if let Some(new_name) = self.new_name(module_path, object.name()) {
+            object.name = new_name;
+        }
+    }
+
+    fn visit_callback_interface(&self, iface: &mut CallbackInterface) {
+        let module_path = &iface.module_path;
+        if let Some(new_name) = self.new_name(module_path, &iface.name) {
+            iface.name = new_name;
+        }
+    }
+
+    fn visit_enum(&self, _is_error: bool, enum_: &mut Enum) {
+        let module_path = &enum_.module_path;
+        let enum_name = enum_.name().to_string();
+        // enum variants
+        for variant in &mut enum_.variants {
+            let variant_name = variant.name.clone();
+            let variant_path = format!("{}.{}", enum_name, variant_name);
+            for field in &mut variant.fields {
+                let field_path = format!("{}.{}", variant_path, field.name);
+                if let Some(new_name) = self.new_name(module_path, &field_path) {
+                    field.name = new_name;
+                }
+            }
+            if let Some(new_name) = self.new_name(module_path, &variant_path) {
+                variant.name = new_name;
+            }
+        }
+        // the enum type itself
+        if let Some(new_name) = self.new_name(module_path, &enum_name) {
+            enum_.name = new_name;
+        }
+    }
+
+    fn visit_type(&self, type_: &mut Type) {
+        let module_path = type_.module_path().unwrap_or(&self.this_module_path);
+        let self_renames = self.renames.get(module_path);
+        type_.rename_recursive(&|name| {
+            self_renames
+                .and_then(|renames| renames.get(name))
+                .and_then(|value| value.as_str())
+                .unwrap_or(name)
+                .to_string()
+        });
+    }
+
+    fn visit_method(&self, object_name: &str, method: &mut Method) {
+        let method_name = format!("{}.{}", object_name, method.name());
+        // Rename the method
+        if let Some(new_name) = self.new_name(&self.this_module_path, &method_name) {
+            method.name = new_name;
+        }
+        // args
+        for arg in &mut method.arguments {
+            let arg_path = format!("{}.{}", method_name, arg.name);
+            if let Some(new_name) = self.new_name(&self.this_module_path, &arg_path) {
+                arg.name = new_name;
+            }
+        }
+    }
+
+    fn visit_constructor(&self, object_name: &str, constructor: &mut Constructor) {
+        // ctor is the same as a method.
+        let method_name = format!("{}.{}", object_name, constructor.name());
+        if let Some(new_name) = self.new_name(&self.this_module_path, &method_name) {
+            constructor.name = new_name;
+        }
+        for arg in &mut constructor.arguments {
+            let arg_path = format!("{}.{}", method_name, arg.name);
+            if let Some(new_name) = self.new_name(&self.this_module_path, &arg_path) {
+                arg.name = new_name;
+            }
+        }
+    }
+
+    fn visit_function(&self, function: &mut Function) {
+        let original_function_name = function.name.clone();
+        if let Some(new_name) = self.new_name(&self.this_module_path, &function.name) {
+            function.name = new_name;
+        }
+        // args
+        for arg in &mut function.arguments {
+            let arg_path = format!("{}.{}", original_function_name, arg.name);
+            if let Some(new_name) = self.new_name(&self.this_module_path, &arg_path) {
+                arg.name = new_name;
+            }
+        }
+    }
+
+    fn visit_error_name(&self, name: &mut String) {
+        if let Some(new_name) = self.new_name(&self.this_module_path, name) {
+            *name = new_name;
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::interface::{ComponentInterface, Enum, Function, Object, Record};
+    use uniffi_meta::{
+        EnumMetadata, EnumShape, FieldMetadata, FnMetadata, FnParamMetadata, ObjectImpl,
+        ObjectMetadata, RecordMetadata, Type, VariantMetadata,
+    };
+
+    fn create_test_ci() -> ComponentInterface {
+        let mut ci = ComponentInterface::new("test_crate");
+
+        // Add test record with Option<OldEnum> field
+        let record_meta = RecordMetadata {
+            module_path: "test_crate".to_string(),
+            name: "OldRecord".to_string(),
+            remote: false,
+            fields: vec![FieldMetadata {
+                name: "field".to_string(),
+                ty: Type::Optional {
+                    inner_type: Box::new(Type::Enum {
+                        module_path: "test_crate".to_string(),
+                        name: "OldEnum".to_string(),
+                    }),
+                },
+                default: None,
+                docstring: None,
+            }],
+            docstring: None,
+        };
+        let record = Record::try_from(record_meta).unwrap();
+        ci.add_record_definition(record).unwrap();
+
+        // Add test object using metadata
+        let object_meta = ObjectMetadata {
+            module_path: "test_crate".to_string(),
+            name: "OldObject".to_string(),
+            imp: ObjectImpl::Struct,
+            remote: false,
+            docstring: None,
+        };
+        let object = Object::from(object_meta);
+        ci.add_object_definition(object).unwrap();
+
+        // Add test enum with Option<OldRecord> variant
+        let enum_meta = EnumMetadata {
+            module_path: "test_crate".to_string(),
+            name: "OldEnum".to_string(),
+            shape: EnumShape::Enum,
+            discr_type: None,
+            non_exhaustive: false,
+            remote: false,
+            variants: vec![VariantMetadata {
+                name: "WithRecord".to_string(),
+                fields: vec![FieldMetadata {
+                    name: "record".to_string(),
+                    ty: Type::Optional {
+                        inner_type: Box::new(Type::Record {
+                            module_path: "test_crate".to_string(),
+                            name: "OldRecord".to_string(),
+                        }),
+                    },
+                    default: None,
+                    docstring: None,
+                }],
+                docstring: None,
+                discr: None,
+            }],
+            docstring: None,
+        };
+        let enum_ = Enum::try_from(enum_meta).unwrap();
+        ci.add_enum_definition(enum_).unwrap();
+
+        // Add test function with Option<OldRecord> argument
+        let function_meta = FnMetadata {
+            module_path: "test_crate".to_string(),
+            name: "old_function".to_string(),
+            is_async: false,
+            inputs: vec![FnParamMetadata {
+                name: "arg".to_string(),
+                ty: Type::Optional {
+                    inner_type: Box::new(Type::Record {
+                        module_path: "test_crate".to_string(),
+                        name: "OldRecord".to_string(),
+                    }),
+                },
+                by_ref: false,
+                optional: false,
+                default: None,
+            }],
+            return_type: None,
+            throws: None,
+            checksum: None,
+            docstring: None,
+        };
+        let function = Function::from(function_meta);
+        ci.add_function_definition(function).unwrap();
+
+        ci
+    }
+
+    #[test]
+    fn test_dot_notation_renaming() {
+        let mut ci = create_test_ci();
+
+        // Test dot notation for field and variant renaming
+        let toml_str = r#"
+        OldRecord = "NewRecord"
+        "OldRecord.field" = "new_field"
+        OldEnum = "NewEnum"
+        "OldEnum.WithRecord" = "WithNewRecord"
+        "OldEnum.WithRecord.record" = "new_record"
+        old_function = "new_function"
+        "old_function.arg" = "new_arg"
+        "#;
+
+        let renames: toml::Table = toml::from_str(toml_str).unwrap();
+        let mut renames_map = HashMap::new();
+        renames_map.insert("test_crate".to_string(), renames);
+        rename(&mut ci, &renames_map);
+
+        // Check that types were renamed
+        assert_eq!(ci.record_definitions()[0].name(), "NewRecord");
+        assert_eq!(ci.enum_definitions()[0].name(), "NewEnum");
+        assert_eq!(ci.function_definitions()[0].name(), "new_function");
+
+        // Check that field was renamed
+        assert_eq!(ci.record_definitions()[0].fields()[0].name, "new_field");
+
+        // Check that enum variant was renamed
+        assert_eq!(ci.enum_definitions()[0].variants()[0].name, "WithNewRecord");
+
+        // Check that variant field was renamed
+        assert_eq!(
+            ci.enum_definitions()[0].variants()[0].fields()[0].name,
+            "new_record"
+        );
+
+        // Check that function argument was renamed
+        assert_eq!(ci.function_definitions()[0].arguments()[0].name, "new_arg");
+    }
+
+    #[test]
+    fn test_callback_interface_renaming() {
+        use crate::interface::callbacks::CallbackInterface;
+        use crate::interface::ffi::FfiFunction;
+
+        let mut ci = ComponentInterface::new("test_crate");
+
+        // Add a callback interface (trait)
+        let callback_interface = CallbackInterface {
+            name: "OldTrait".to_string(),
+            module_path: "test_crate".to_string(),
+            methods: vec![],
+            docstring: None,
+            ffi_init_callback: FfiFunction {
+                name: "init".to_string(),
+                arguments: vec![],
+                return_type: None,
+                is_async: false,
+                has_rust_call_status_arg: true,
+                is_object_free_function: false,
+            },
+        };
+        ci.callback_interfaces.push(callback_interface);
+
+        // Test callback interface renaming
+        let toml_str = r#"
+        OldTrait = "NewTrait"
+        "#;
+
+        let renames: toml::Table = toml::from_str(toml_str).unwrap();
+        let mut renames_map = HashMap::new();
+        renames_map.insert("test_crate".to_string(), renames);
+        rename(&mut ci, &renames_map);
+
+        // Check that callback interface was renamed
+        assert_eq!(ci.callback_interfaces[0].name, "NewTrait");
+    }
+}
diff --git a/third_party/rust/uniffi_bindgen/src/interface/universe.rs b/third_party/rust/uniffi_bindgen/src/interface/universe.rs
index 7e8d54acb922d..708a126fbedd1 100644
--- a/third_party/rust/uniffi_bindgen/src/interface/universe.rs
+++ b/third_party/rust/uniffi_bindgen/src/interface/universe.rs
@@ -48,7 +48,7 @@ impl TypeUniverse {
                 // mismatched types are bad.
                 let cur = o.get();
                 anyhow::ensure!(
-                    type_ == cur,
+                    normalize_type_module_path(type_) == normalize_type_module_path(cur),
                     "conflicting types:\ncur: {cur:?}\nnew: {type_:?}",
                 );
                 Ok(())
@@ -69,7 +69,8 @@ impl TypeUniverse {
     pub fn add_known_type(&mut self, type_: &Type) -> Result<()> {
         // Types are more likely to already be known than not, so avoid unnecessary cloning.
         if !self.all_known_types.contains(type_) {
-            self.all_known_types.insert(type_.to_owned());
+            self.all_known_types
+                .insert(normalize_type_module_path(type_));
         }
         // all sub-types, but we want to skip this type as we just added it above.
         for sub in type_.iter_nested_types() {
@@ -92,7 +93,7 @@ impl TypeUniverse {
     }
 
     pub fn is_external(&self, t: &Type) -> bool {
-        t.module_path()
+        t.crate_name()
             .map(|p| p != self.namespace.crate_name)
             .unwrap_or(false)
     }
@@ -120,6 +121,78 @@ impl TypeUniverse {
     }
 }
 
+/// Normalize the `module_path` field for a type
+///
+/// Types from proc-macros include the entire module path
+/// while types from `uniffi_udl` only include the crate name.
+/// To avoid issues like #2728, we normalize the module path to only include the crate name.
+fn normalize_type_module_path(ty: &Type) -> Type {
+    match ty {
+        Type::UInt8
+        | Type::Int8
+        | Type::UInt16
+        | Type::Int16
+        | Type::UInt32
+        | Type::Int32
+        | Type::UInt64
+        | Type::Int64
+        | Type::Float32
+        | Type::Float64
+        | Type::Boolean
+        | Type::String
+        | Type::Bytes
+        | Type::Timestamp
+        | Type::Duration => ty.clone(),
+        Type::Object {
+            name,
+            imp,
+            module_path,
+        } => Type::Object {
+            module_path: normalize_module_path(module_path),
+            name: name.clone(),
+            imp: *imp,
+        },
+        Type::Record { name, module_path } => Type::Record {
+            module_path: normalize_module_path(module_path),
+            name: name.clone(),
+        },
+        Type::Enum { name, module_path } => Type::Enum {
+            module_path: normalize_module_path(module_path),
+            name: name.clone(),
+        },
+        Type::CallbackInterface { name, module_path } => Type::CallbackInterface {
+            module_path: normalize_module_path(module_path),
+            name: name.clone(),
+        },
+        Type::Optional { inner_type } => Type::Optional {
+            inner_type: Box::new(normalize_type_module_path(inner_type)),
+        },
+        Type::Sequence { inner_type } => Type::Sequence {
+            inner_type: Box::new(normalize_type_module_path(inner_type)),
+        },
+        Type::Map {
+            key_type,
+            value_type,
+        } => Type::Map {
+            key_type: Box::new(normalize_type_module_path(key_type)),
+            value_type: Box::new(normalize_type_module_path(value_type)),
+        },
+        Type::Custom {
+            name,
+            builtin,
+            module_path,
+        } => Type::Custom {
+            module_path: normalize_module_path(module_path),
+            name: name.clone(),
+            builtin: Box::new(normalize_type_module_path(builtin)),
+        },
+    }
+}
+
+fn normalize_module_path(module_path: &str) -> String {
+    module_path.split("::").next().unwrap().to_string()
+}
+
 #[cfg(test)]
 mod test_type_universe {
     // All the useful functionality of the `TypeUniverse` struct
diff --git a/third_party/rust/uniffi_bindgen/src/interface/visit_mut.rs b/third_party/rust/uniffi_bindgen/src/interface/visit_mut.rs
index 1f157cdcf263e..c6b20f252da32 100644
--- a/third_party/rust/uniffi_bindgen/src/interface/visit_mut.rs
+++ b/third_party/rust/uniffi_bindgen/src/interface/visit_mut.rs
@@ -1,6 +1,10 @@
-use crate::interface::{Enum, FfiDefinition, Record};
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use crate::interface::FfiDefinition;
 use crate::{ComponentInterface, VisitMut};
-use std::collections::{BTreeMap, BTreeSet};
+use std::collections::BTreeSet;
 use uniffi_meta::Type;
 
 impl ComponentInterface {
@@ -26,10 +30,8 @@ impl ComponentInterface {
 
         self.types.all_known_types = all_known_types_altered;
 
-        let mut updated_enums: BTreeMap<String, Enum> = BTreeMap::new();
         let errors_clone = self.errors.clone();
-        for (enum_name, enum_item) in self.enums.iter_mut() {
-            let updated_key = visitor.visit_enum_key(&mut enum_name.clone());
+        for enum_item in self.enums.iter_mut() {
             let is_error = errors_clone.contains(enum_item.name());
 
             visitor.visit_enum(is_error, enum_item);
@@ -42,11 +44,9 @@ impl ComponentInterface {
                     visitor.visit_type(&mut field.type_);
                 }
             }
-            updated_enums.insert(updated_key, enum_item.clone());
         }
-        self.enums = updated_enums;
 
-        for record_item in self.records.values_mut() {
+        for record_item in self.records.iter_mut() {
             visitor.visit_record(record_item);
 
             for field in &mut record_item.fields {
@@ -54,7 +54,6 @@ impl ComponentInterface {
                 visitor.visit_type(&mut field.type_);
             }
         }
-        self.fix_record_keys_after_rename();
 
         for function in self.functions.iter_mut() {
             visitor.visit_function(function);
@@ -65,6 +64,12 @@ impl ComponentInterface {
                 function.return_type = Some(return_type);
             }
 
+            if let Some(error_type) = function.throws_type() {
+                let mut error_type = error_type.clone();
+                visitor.visit_type(&mut error_type);
+                function.throws = Some(error_type);
+            }
+
             for argument in function.arguments.iter_mut() {
                 visitor.visit_argument(argument);
                 visitor.visit_type(&mut argument.type_);
@@ -72,10 +77,13 @@ impl ComponentInterface {
         }
 
         for object in self.objects.iter_mut() {
+            // Capture original object name before any renaming
+            let object_name = object.name().to_string();
+
             visitor.visit_object(object);
 
             for method in object.methods.iter_mut() {
-                visitor.visit_method(method);
+                visitor.visit_method(&object_name, method);
 
                 for argument in method.arguments.iter_mut() {
                     visitor.visit_argument(argument);
@@ -87,10 +95,16 @@ impl ComponentInterface {
                     visitor.visit_type(&mut return_type);
                     method.return_type = Some(return_type);
                 }
+
+                if let Some(error_type) = method.throws_type() {
+                    let mut error_type = error_type.clone();
+                    visitor.visit_type(&mut error_type);
+                    method.throws = Some(error_type);
+                }
             }
 
             for constructor in object.constructors.iter_mut() {
-                visitor.visit_constructor(constructor);
+                visitor.visit_constructor(&object_name, constructor);
 
                 for argument in constructor.arguments.iter_mut() {
                     visitor.visit_argument(argument);
@@ -100,8 +114,9 @@ impl ComponentInterface {
         }
 
         for callback_interface in self.callback_interfaces.iter_mut() {
+            visitor.visit_callback_interface(callback_interface);
             for method in callback_interface.methods.iter_mut() {
-                visitor.visit_method(method);
+                visitor.visit_method(&callback_interface.name, method);
 
                 for argument in method.arguments.iter_mut() {
                     visitor.visit_argument(argument);
@@ -141,14 +156,4 @@ impl ComponentInterface {
             })
             .collect()
     }
-
-    fn fix_record_keys_after_rename(&mut self) {
-        let mut new_records: BTreeMap<String, Record> = BTreeMap::new();
-
-        for record in self.records.values() {
-            new_records.insert(record.name().to_string(), record.clone());
-        }
-
-        self.records = new_records;
-    }
 }
diff --git a/third_party/rust/uniffi_bindgen/src/lib.rs b/third_party/rust/uniffi_bindgen/src/lib.rs
index bd6ab9eb87093..40db3a51890a3 100644
--- a/third_party/rust/uniffi_bindgen/src/lib.rs
+++ b/third_party/rust/uniffi_bindgen/src/lib.rs
@@ -96,14 +96,16 @@ use anyhow::{anyhow, bail, Context, Result};
 use camino::{Utf8Path, Utf8PathBuf};
 use fs_err::{self as fs, File};
 use serde::Deserialize;
+use std::fmt;
 use std::io::prelude::*;
 use std::io::ErrorKind;
 use std::process::Command;
 
-pub mod backend;
+mod bindgen_paths;
 pub mod bindings;
 pub mod interface;
 pub mod library_mode;
+mod loader;
 pub mod macro_metadata;
 pub mod pipeline;
 pub mod scaffolding;
@@ -111,15 +113,19 @@ pub mod scaffolding;
 #[cfg(feature = "cargo-metadata")]
 pub mod cargo_metadata;
 
+use crate::interface::CallbackInterface;
 use crate::interface::{
     Argument, Constructor, Enum, FfiArgument, FfiField, Field, Function, Method, Object, Record,
     Variant,
 };
+pub use bindgen_paths::{BindgenPaths, BindgenPathsLayer};
 pub use interface::ComponentInterface;
 pub use library_mode::find_components;
 use scaffolding::RustScaffolding;
 use uniffi_meta::Type;
 
+pub use loader::BindgenLoader;
+
 /// The options used when creating bindings. Named such
 /// it doesn't cause confusion that it's settings specific to
 /// the generator itself.
@@ -136,6 +142,9 @@ pub struct GenerationSettings {
 ///
 /// External crates that implement binding generators, should implement this type
 /// and call the [`generate_external_bindings`] using a type that implements this trait.
+///
+/// Deprecated: External crates are encouraged to use the `BindgenLoader` type instead, which lets
+/// you control the binding generation process more directly.
 pub trait BindingGenerator: Sized {
     /// Handles configuring the bindings
     type Config;
@@ -177,34 +186,37 @@ pub trait VisitMut {
     /// adjust it to language specific naming conventions.
     fn visit_record(&self, record: &mut Record);
 
-    /// Change the name of an `Object` of a [`ComponentInterface`
+    /// Change the name of an `Object` of a [`ComponentInterface`]
     /// to language specific naming conventions.
     fn visit_object(&self, object: &mut Object);
 
+    /// Change the name of an `Object` of a [`ComponentInterface`]
+    /// to language specific naming conventions.
+    fn visit_callback_interface(&self, _iface: &mut CallbackInterface) {}
+
     /// Change the name of a `Field` of an `Enum` `Variant`
     /// to language specific naming conventions.
-    fn visit_field(&self, field: &mut Field);
+    fn visit_field(&self, _field: &mut Field) {}
 
     /// Change the name of a `FfiField` inside a `FfiStruct`
     /// to language specific naming conventions.
-    fn visit_ffi_field(&self, ffi_field: &mut FfiField);
+    fn visit_ffi_field(&self, _ffi_field: &mut FfiField) {}
 
     /// Change the `Arugment` of a `FfiFunction` in the [`ComponentInterface`]
     /// to language specific naming conventions.
-    fn visit_ffi_argument(&self, ffi_argument: &mut FfiArgument);
+    fn visit_ffi_argument(&self, _ffi_argument: &mut FfiArgument) {}
+
+    /// Change the `FfiType` objects in the [`ComponentInterface`]
+    /// to language specific naming conventions.
+    fn visit_ffi_type(&self, _ffi_type: &mut interface::FfiType) {}
 
     /// Go through each `Enum` of a [`ComponentInterface`] and
     /// adjust it to language specific naming conventions.
     fn visit_enum(&self, is_error: bool, enum_: &mut Enum);
 
-    /// Change the naming of the key in the [`ComponentInterface`]
-    /// `BTreeMap` where all `Enum`s are stored to reflect the changed
-    /// name of an `Enum`.
-    fn visit_enum_key(&self, key: &mut String) -> String;
-
     /// Go through each `Variant` of an `Enum` and
     /// adjust it to language specific naming conventions.
-    fn visit_variant(&self, is_error: bool, variant: &mut Variant);
+    fn visit_variant(&self, _is_error: bool, _variant: &mut Variant) {}
 
     /// Go through each `Type` in the `TypeUniverse` of
     /// a [`ComponentInterface`] and adjust it to language specific
@@ -216,17 +228,17 @@ pub trait VisitMut {
     /// visited.
     fn visit_error_name(&self, name: &mut String);
 
-    /// Go through each `Method` of an `Object` and
+    /// Go through each `Method` of an `Object` or `CallbackInterface` and
     /// adjust it to language specific naming conventions.
-    fn visit_method(&self, method: &mut Method);
+    fn visit_method(&self, object_name: &str, method: &mut Method);
 
     /// Go through each `Argument` of a `Function` and
     /// adjust it to language specific naming conventions.
-    fn visit_argument(&self, argument: &mut Argument);
+    fn visit_argument(&self, _argument: &mut Argument) {}
 
     /// Go through each `Constructor` of a [`ComponentInterface`] and
     /// adjust it to language specific naming conventions.
-    fn visit_constructor(&self, constructor: &mut Constructor);
+    fn visit_constructor(&self, object_name: &str, constructor: &mut Constructor);
 
     /// Go through each `Function` of a [`ComponentInterface`] and
     /// adjust it to language specific naming conventions.
@@ -268,19 +280,30 @@ pub trait BindgenCrateConfigSupplier {
 pub struct EmptyCrateConfigSupplier;
 impl BindgenCrateConfigSupplier for EmptyCrateConfigSupplier {}
 
+impl BindgenCrateConfigSupplier for &&dyn BindgenCrateConfigSupplier {
+    fn get_toml(&self, crate_name: &str) -> Result<Option<toml::value::Table>> {
+        (**self).get_toml(crate_name)
+    }
+
+    fn get_toml_path(&self, crate_name: &str) -> Option<Utf8PathBuf> {
+        (**self).get_toml_path(crate_name)
+    }
+
+    fn get_udl(&self, crate_name: &str, udl_name: &str) -> Result<String> {
+        (**self).get_udl(crate_name, udl_name)
+    }
+}
+
 /// A convenience function for the CLI to help avoid using static libs
 /// in places cdylibs are required.
 pub fn is_cdylib(library_file: impl AsRef<Utf8Path>) -> bool {
     library_mode::calc_cdylib_name(library_file.as_ref()).is_some()
 }
 
-/// Generate bindings for an external binding generator
-/// Ideally, this should replace the [`generate_bindings`] function below
+/// Generate bindings for single crate via a UDL file.
 ///
-/// Implements an entry point for external binding generators.
-/// The function does the following:
-/// - It parses the `udl` in a [`ComponentInterface`]
-/// - Creates an instance of [`BindingGenerator`], based on type argument `B`, and run [`BindingGenerator::write_bindings`] on it
+/// This only works if you have exactly 1 crate and no shared types.
+/// It should be considered deprecated, you should use the multi-crate options instead.
 ///
 /// # Arguments
 /// - `binding_generator`: Type that implements BindingGenerator
@@ -289,6 +312,9 @@ pub fn is_cdylib(library_file: impl AsRef<Utf8Path>) -> bool {
 /// - `out_dir_override`: The path to write the bindings to. If [`None`], it will be the path to the parent directory of the `udl_file`
 /// - `library_file`: The path to a dynamic library to attempt to extract the definitions from and extend the component interface with. No extensions to component interface occur if it's [`None`]
 /// - `crate_name`: Override the default crate name that is guessed from UDL file path.
+///
+/// Deprecated: External crates are encouraged to use the `BindgenLoader` type instead, which lets
+/// you control the binding generation process more directly.
 pub fn generate_external_bindings<T: BindingGenerator>(
     binding_generator: &T,
     udl_file: impl AsRef<Utf8Path>,
@@ -333,6 +359,13 @@ pub fn generate_external_bindings<T: BindingGenerator>(
 
     let mut components = vec![Component { ci, config }];
     binding_generator.update_component_configs(&settings, &mut components)?;
+
+    // need to derive ffi after the bindings have had a chance to update any types.
+    components[0]
+        .ci
+        .derive_ffi_funcs()
+        .context("Failed to derive FFI functions")?;
+
     binding_generator.write_bindings(&settings, &components)
 }
 
@@ -383,6 +416,9 @@ fn generate_component_scaffolding_inner(
 
 // Generate the bindings in the target languages that call the scaffolding
 // Rust code.
+///
+/// Deprecated: External crates are encouraged to use the `BindgenLoader` type instead, which lets
+/// you control the binding generation process more directly.
 pub fn generate_bindings<T: BindingGenerator>(
     udl_file: &Utf8Path,
     config_file_override: Option<&Utf8Path>,
@@ -432,10 +468,10 @@ fn crate_name_from_cargo_toml(udl_file: &Utf8Path) -> Result<String> {
     }
 
     let file = guess_crate_root(udl_file)?.join("Cargo.toml");
-    let cargo_toml_bytes =
-        fs::read(file).context("Can't find Cargo.toml to determine the crate name")?;
+    let cargo_toml_str =
+        fs::read_to_string(file).context("Can't find Cargo.toml to determine the crate name")?;
 
-    let cargo_toml = toml::from_slice::<CargoToml>(&cargo_toml_bytes)?;
+    let cargo_toml = toml::from_str::<CargoToml>(&cargo_toml_str)?;
 
     let lib_crate_name = cargo_toml
         .lib
@@ -541,6 +577,25 @@ fn merge_toml(a: &mut toml::value::Table, b: toml::value::Table) {
     }
 }
 
+// convert `anyhow::Error` and `&str` etc to askama errors.
+// should only be needed by "filters", otherwise anyhow etc work directly.
+pub fn to_askama_error<T: ToString + ?Sized>(t: &T) -> askama::Error {
+    askama::Error::Custom(Box::new(BindingsTemplateError(t.to_string())))
+}
+
+// Need a struct to define an error that implements std::error::Error, which neither String nor
+// anyhow::Error do.
+#[derive(Debug)]
+struct BindingsTemplateError(String);
+
+impl fmt::Display for BindingsTemplateError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl std::error::Error for BindingsTemplateError {}
+
 // FIXME(HACK):
 // Include the askama config file into the build.
 // That way cargo tracks the file and other tools relying on file tracking see it as well.
diff --git a/third_party/rust/uniffi_bindgen/src/library_mode.rs b/third_party/rust/uniffi_bindgen/src/library_mode.rs
index 9333da4c053e9..a552dd28c236e 100644
--- a/third_party/rust/uniffi_bindgen/src/library_mode.rs
+++ b/third_party/rust/uniffi_bindgen/src/library_mode.rs
@@ -34,6 +34,9 @@ use uniffi_meta::{
 /// interface and allows for more flexibility in how the external bindings are generated.
 ///
 /// Returns the list of sources used to generate the bindings, in no particular order.
+///
+/// Deprecated: External crates are encouraged to use the `BindgenLoader` type instead, which lets
+/// you control the binding generation process more directly.
 pub fn generate_bindings<T: BindingGenerator>(
     library_path: &Utf8Path,
     crate_name: Option<String>,
@@ -62,6 +65,21 @@ pub fn generate_bindings<T: BindingGenerator>(
     };
     binding_generator.update_component_configs(&settings, &mut components)?;
 
+    // need to derive ffi after the bindings have had a chance to update any names etc.
+    for component in &mut components {
+        component
+            .ci
+            .derive_ffi_funcs()
+            .context("Failed to derive FFI functions")?;
+    }
+
+    // give every CI a cloned copy of every CI - including itself for simplicity.
+    // we end up taking n^2 copies of all ci's, but it works.
+    let all_cis = components.iter().map(|c| c.ci.clone()).collect::<Vec<_>>();
+    components
+        .iter_mut()
+        .for_each(|c| c.ci.set_all_component_interfaces(all_cis.clone()));
+
     fs::create_dir_all(out_dir)?;
     if let Some(crate_name) = &crate_name {
         let old_elements = components.drain(..);
@@ -100,10 +118,10 @@ pub fn calc_cdylib_name(library_path: &Utf8Path) -> Option<&str> {
 /// calls.
 ///
 /// `config_supplier` is used to find UDL files on disk and load config data.
-pub fn find_components(
+pub fn find_cis(
     library_path: &Utf8Path,
     config_supplier: &dyn BindgenCrateConfigSupplier,
-) -> Result<Vec<Component<TomlTable>>> {
+) -> Result<Vec<ComponentInterface>> {
     let items = macro_metadata::extract_from_library(library_path)?;
     let mut metadata_groups = create_metadata_groups(&items);
     group_metadata(&mut metadata_groups, items)?;
@@ -111,14 +129,7 @@ pub fn find_components(
     for group in metadata_groups.values_mut() {
         let crate_name = group.namespace.crate_name.clone();
         if let Some(udl_group) = load_udl_metadata(group, &crate_name, config_supplier)? {
-            let mut udl_items = udl_group
-                .items
-                .into_iter()
-                // some items are both in UDL and library metadata. For many that's fine but
-                // uniffi-traits aren't trivial to compare meaning we end up with dupes.
-                // We filter out such problematic items here.
-                .filter(|item| !matches!(item, Metadata::UniffiTrait { .. }))
-                .collect();
+            let mut udl_items = udl_group.items.into_iter().collect();
             group.items.append(&mut udl_items);
             if group.namespace_docstring.is_none() {
                 group.namespace_docstring = udl_group.namespace_docstring;
@@ -137,10 +148,29 @@ pub fn find_components(
             let crate_name = &group.namespace.crate_name;
             let mut ci = ComponentInterface::new(crate_name);
             ci.add_metadata(group)?;
+            ci.set_crate_to_namespace_map(crate_to_namespace_map.clone());
+            Ok(ci)
+        })
+        .collect()
+}
+
+/// Find UniFFI components from a shared library file
+///
+/// This method inspects the library file and creates [ComponentInterface] instances for each
+/// component used to build it.  It parses the UDL files from `uniffi::include_scaffolding!` macro
+/// calls.
+///
+/// `config_supplier` is used to find UDL files on disk and load config data.
+pub fn find_components(
+    library_path: &Utf8Path,
+    config_supplier: &dyn BindgenCrateConfigSupplier,
+) -> Result<Vec<Component<TomlTable>>> {
+    find_cis(library_path, config_supplier)?
+        .into_iter()
+        .map(|ci| {
             let config = config_supplier
                 .get_toml(ci.crate_name())?
                 .unwrap_or_default();
-            ci.set_crate_to_namespace_map(crate_to_namespace_map.clone());
             Ok(Component { ci, config })
         })
         .collect()
diff --git a/third_party/rust/uniffi_bindgen/src/loader.rs b/third_party/rust/uniffi_bindgen/src/loader.rs
new file mode 100644
index 0000000000000..83e440f3f584f
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/loader.rs
@@ -0,0 +1,264 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use std::{
+    collections::{BTreeMap, HashMap},
+    fs,
+};
+
+use anyhow::bail;
+use camino::Utf8Path;
+use uniffi_meta::{
+    create_metadata_groups, group_metadata, Metadata, MetadataGroup, MetadataGroupMap,
+    NamespaceMetadata,
+};
+
+use crate::{
+    crate_name_from_cargo_toml, interface, macro_metadata, pipeline, BindgenPaths, Component,
+    ComponentInterface, Result,
+};
+
+/// Load metadata, component interfaces, configuration, etc. for binding generators.
+///
+/// Bindings generators use this to load all of the inputs they need to render their code.
+pub struct BindgenLoader {
+    bindgen_paths: BindgenPaths,
+}
+
+impl BindgenLoader {
+    pub fn new(bindgen_paths: BindgenPaths) -> Self {
+        Self { bindgen_paths }
+    }
+
+    /// Load UniFFI metadata
+    ///
+    /// The metadata describes the exported interface.
+    ///
+    /// `source_path` can be:
+    ///   - A library file (.so, .dylib, .a, etc).  Metadata will be loaded from the symbol table.
+    ///   - A UDL file.  The UDL will be parsed and converted into metadata.
+    pub fn load_metadata(&self, source_path: &Utf8Path) -> Result<MetadataGroupMap> {
+        self.load_metadata_specialized(source_path, |_, _| Ok(None))
+    }
+
+    /// Load UniFFI metadata with a specialized metadata parser
+    ///
+    /// When loading metadata from a library, the passed-in specialized parser will be used to
+    /// parse the data.  The library path and library contents will be passed.  If the parser
+    /// returns `Ok(Some(metadata))` then this metadata will be used. If it returns `Ok(None)` than
+    /// the default parsing will be used.
+    ///
+    /// Use this function when you want to support specialized library formats.
+    pub fn load_metadata_specialized<P>(
+        &self,
+        source_path: &Utf8Path,
+        specialized_parser: P,
+    ) -> Result<MetadataGroupMap>
+    where
+        P: FnOnce(&Utf8Path, &[u8]) -> Result<Option<Vec<Metadata>>>,
+    {
+        if self.is_udl(source_path) {
+            let crate_name = crate_name_from_cargo_toml(source_path)?;
+            let mut group = uniffi_udl::parse_udl(&fs::read_to_string(source_path)?, &crate_name)?;
+            Self::add_checksums_to_udl_group(&mut group);
+            Ok(HashMap::from([(crate_name, group)]))
+        } else {
+            let data = fs::read(source_path)?;
+            let items = match specialized_parser(source_path, &data)? {
+                Some(items) => items,
+                None => macro_metadata::extract_from_bytes(&data)?,
+            };
+            let mut metadata_groups = create_metadata_groups(&items);
+            group_metadata(&mut metadata_groups, items)?;
+
+            for group in metadata_groups.values_mut() {
+                let crate_name = group.namespace.crate_name.clone();
+                if let Some(mut udl_group) = self.load_udl_metadata(group, &crate_name)? {
+                    Self::add_checksums_to_udl_group(&mut udl_group);
+                    group.items.append(&mut udl_group.items);
+                    if group.namespace_docstring.is_none() {
+                        group.namespace_docstring = udl_group.namespace_docstring;
+                    }
+                };
+            }
+            Ok(metadata_groups)
+        }
+    }
+
+    /// Add checksums for metadata parsed from UDL
+    fn add_checksums_to_udl_group(metadata_group: &mut MetadataGroup) {
+        // Need to temporarily take items BTree set, since we're technically mutating it's contents
+        // Each item will be added back at the bottom of the for loop.
+        let items = std::mem::take(&mut metadata_group.items);
+        for mut meta in items {
+            match &mut meta {
+                Metadata::Func(func) if func.checksum.is_none() => {
+                    func.checksum = Some(interface::Function::checksum_from_metadata(func.clone()))
+                }
+                Metadata::Method(meth) if meth.checksum.is_none() => {
+                    meth.checksum = Some(interface::Method::checksum_from_metadata(meth.clone()))
+                }
+                Metadata::Constructor(cons) if cons.checksum.is_none() => {
+                    cons.checksum =
+                        Some(interface::Constructor::checksum_from_metadata(cons.clone()))
+                }
+                // Note: UDL-based callbacks don't have checksum functions, don't set the
+                // checksum for those.
+                _ => (),
+            }
+            metadata_group.items.insert(meta);
+        }
+    }
+
+    /// Load a [ComponentInterface] list
+    ///
+    /// This converts the metadata into `ComponentInterface` instances, which contains additional
+    /// derived information about the interface, like FFI functions signatures.
+    pub fn load_cis(&self, metadata: MetadataGroupMap) -> Result<Vec<ComponentInterface>> {
+        let crate_to_namespace_map: BTreeMap<String, NamespaceMetadata> = metadata
+            .iter()
+            .map(|(k, v)| (k.clone(), v.namespace.clone()))
+            .collect();
+
+        let mut ci_list = metadata
+            .into_values()
+            .map(|group| {
+                let crate_name = &group.namespace.crate_name;
+                let mut ci = ComponentInterface::new(crate_name);
+                ci.add_metadata(group)?;
+                ci.set_crate_to_namespace_map(crate_to_namespace_map.clone());
+                Ok(ci)
+            })
+            .collect::<Result<Vec<ComponentInterface>>>()?;
+
+        // give every CI a cloned copy of every CI - including itself for simplicity.
+        // we end up taking n^2 copies of all ci's, but it works.
+        let ci_list2 = ci_list.clone();
+        ci_list
+            .iter_mut()
+            .for_each(|ci| ci.set_all_component_interfaces(ci_list2.clone()));
+        Ok(ci_list)
+    }
+
+    fn load_udl_metadata(
+        &self,
+        group: &MetadataGroup,
+        crate_name: &str,
+    ) -> Result<Option<MetadataGroup>> {
+        let udl_items = group
+            .items
+            .iter()
+            .filter_map(|i| match i {
+                Metadata::UdlFile(meta) => Some(meta),
+                _ => None,
+            })
+            .collect::<Vec<_>>();
+        // We only support 1 UDL file per crate, for no good reason!
+        match udl_items.len() {
+            0 => Ok(None),
+            1 => {
+                if udl_items[0].module_path != crate_name {
+                    bail!(
+                        "UDL is for crate '{}' but this crate name is '{}'",
+                        udl_items[0].module_path,
+                        crate_name
+                    );
+                }
+                let udl = self
+                    .bindgen_paths
+                    .get_udl(crate_name, &udl_items[0].file_stub)?;
+                let udl_group = uniffi_udl::parse_udl(&udl, crate_name)?;
+                Ok(Some(udl_group))
+            }
+            n => bail!("{n} UDL files found for {crate_name}"),
+        }
+    }
+
+    /// Load a [Component] list
+    ///
+    /// This groups [ComponentInterface] values with configuration data from `uniffi.toml` files.
+    /// Pass in a `parse_config` function which parses raw TOML into your language-specific config structure.
+    ///
+    /// Note: the TOML data will contain the entire config tree.
+    /// You probably want to do something like
+    /// `toml.get("bindings").and_then(|b| b.get("my-language-key"))`
+    /// to extract the data for your bindings.
+    pub fn load_components<P, Config>(
+        &self,
+        cis: Vec<ComponentInterface>,
+        mut parse_config: P,
+    ) -> Result<Vec<Component<Config>>>
+    where
+        P: FnMut(&ComponentInterface, toml::Value) -> Result<Config>,
+        Config: Default,
+    {
+        cis.into_iter()
+            .map(|ci| {
+                let toml = self.bindgen_paths.get_config(ci.crate_name())?;
+                let config = parse_config(&ci, toml.into())?;
+                Ok(Component { ci, config })
+            })
+            .collect()
+    }
+
+    /// Load a [pipeline::initial::Root] value from the metadata
+    pub fn load_pipeline_initial_root(
+        &self,
+        source_path: &Utf8Path,
+        metadata: MetadataGroupMap,
+    ) -> Result<pipeline::initial::Root> {
+        let mut metadata_converter = pipeline::initial::UniffiMetaConverter::default();
+        for metadata_group in metadata.into_values() {
+            let table = self
+                .bindgen_paths
+                .get_config(&metadata_group.namespace.crate_name)?;
+            if !table.is_empty() {
+                metadata_converter
+                    .add_module_config_toml(metadata_group.namespace.name.clone(), table)?;
+            }
+            if let Some(docstring) = metadata_group.namespace_docstring {
+                metadata_converter
+                    .add_module_docstring(metadata_group.namespace.name.clone(), docstring)?;
+            }
+            metadata_converter.add_metadata_item(Metadata::Namespace(metadata_group.namespace))?;
+            for meta in metadata_group.items {
+                metadata_converter.add_metadata_item(meta)?;
+            }
+        }
+        let mut root = metadata_converter.try_into_initial_ir()?;
+        root.cdylib = self.library_name(source_path).map(str::to_string);
+        Ok(root)
+    }
+
+    /// Get the basename for a source file
+    ///
+    /// This will remove any file extension.
+    /// For libraries it will remove the leading `lib`.
+    pub fn source_basename<'a>(&self, source_path: &'a Utf8Path) -> &'a str {
+        let mut basename = match source_path.file_stem() {
+            Some(stem) => stem,
+            None => source_path.as_str(),
+        };
+        if !self.is_udl(source_path) {
+            basename = match basename.strip_prefix("lib") {
+                Some(name) => name,
+                None => basename,
+            }
+        };
+        basename
+    }
+
+    fn is_udl(&self, source_path: &Utf8Path) -> bool {
+        matches!(
+            source_path.extension(),
+            Some(ext) if ext.to_lowercase() == "udl"
+        )
+    }
+
+    /// This is the filename, without the extension and leading `lib`.
+    pub fn library_name<'a>(&self, source_path: &'a Utf8Path) -> Option<&'a str> {
+        let is_library = !self.is_udl(source_path);
+        is_library.then(|| self.source_basename(source_path))
+    }
+}
diff --git a/third_party/rust/uniffi_bindgen/src/macro_metadata/ci.rs b/third_party/rust/uniffi_bindgen/src/macro_metadata/ci.rs
index 8450edb335b62..e7c6228212b26 100644
--- a/third_party/rust/uniffi_bindgen/src/macro_metadata/ci.rs
+++ b/third_party/rust/uniffi_bindgen/src/macro_metadata/ci.rs
@@ -48,9 +48,6 @@ pub fn add_group_to_ci(iface: &mut ComponentInterface, group: MetadataGroup) ->
         add_item_to_ci(iface, item)?
     }
 
-    iface
-        .derive_ffi_funcs()
-        .context("Failed to derive FFI functions")?;
     iface
         .check_consistency()
         .context("ComponentInterface consistency error")?;
diff --git a/third_party/rust/uniffi_bindgen/src/macro_metadata/extract.rs b/third_party/rust/uniffi_bindgen/src/macro_metadata/extract.rs
index 98ba669b06ae9..0c5de12415cf4 100644
--- a/third_party/rust/uniffi_bindgen/src/macro_metadata/extract.rs
+++ b/third_party/rust/uniffi_bindgen/src/macro_metadata/extract.rs
@@ -24,7 +24,7 @@ pub fn extract_from_library(path: &Utf8Path) -> anyhow::Result<Vec<Metadata>> {
     extract_from_bytes(&fs::read(path)?)
 }
 
-fn extract_from_bytes(file_data: &[u8]) -> anyhow::Result<Vec<Metadata>> {
+pub fn extract_from_bytes(file_data: &[u8]) -> anyhow::Result<Vec<Metadata>> {
     match Object::parse(file_data)? {
         Object::Elf(elf) => extract_from_elf(elf, file_data),
         Object::PE(pe) => extract_from_pe(pe, file_data),
@@ -112,10 +112,15 @@ pub fn extract_from_mach(mach: Mach<'_>, file_data: &[u8]) -> anyhow::Result<Vec
     match mach {
         Mach::Binary(macho) => extract_from_macho(macho, file_data),
         // Multi-binary library, just extract the first one
-        Mach::Fat(multi_arch) => match multi_arch.get(0)? {
-            SingleArch::MachO(macho) => extract_from_macho(macho, file_data),
-            SingleArch::Archive(archive) => extract_from_archive(archive, file_data),
-        },
+        Mach::Fat(multi_arch) => {
+            let arches = multi_arch.arches()?;
+            let offset = arches[0].offset;
+            let file_data = &file_data[offset as usize..];
+            match multi_arch.get(0)? {
+                SingleArch::MachO(macho) => extract_from_macho(macho, file_data),
+                SingleArch::Archive(archive) => extract_from_archive(archive, file_data),
+            }
+        }
     }
 }
 
@@ -271,7 +276,7 @@ impl ExtractedItems {
     }
 }
 
-fn is_metadata_symbol(name: &str) -> bool {
+pub fn is_metadata_symbol(name: &str) -> bool {
     // Skip the "_" char that Darwin prepends, if present
     let name = name.strip_prefix('_').unwrap_or(name);
     name.starts_with("UNIFFI_META")
diff --git a/third_party/rust/uniffi_bindgen/src/macro_metadata/mod.rs b/third_party/rust/uniffi_bindgen/src/macro_metadata/mod.rs
index bc5a0a790f622..1bbf13ff09f59 100644
--- a/third_party/rust/uniffi_bindgen/src/macro_metadata/mod.rs
+++ b/third_party/rust/uniffi_bindgen/src/macro_metadata/mod.rs
@@ -10,7 +10,7 @@ mod ci;
 mod extract;
 
 pub use ci::{add_group_to_ci, add_to_ci};
-pub use extract::extract_from_library;
+pub use extract::{extract_from_bytes, extract_from_library};
 
 pub fn add_to_ci_from_library(
     iface: &mut ComponentInterface,
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/general/callable.rs b/third_party/rust/uniffi_bindgen/src/pipeline/general/callable.rs
index ce47dd1196c44..d6bf54fcdccdd 100644
--- a/third_party/rust/uniffi_bindgen/src/pipeline/general/callable.rs
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/general/callable.rs
@@ -6,6 +6,29 @@
 
 use super::*;
 
+fn new_callable_method(meth: &Method, self_type: TypeNode) -> Callable {
+    Callable {
+        name: meth.name.clone(),
+        is_async: meth.is_async,
+        kind: CallableKind::Method { self_type },
+        arguments: meth.inputs.clone(),
+        return_type: ReturnType {
+            ty: meth.return_type.clone().map(|ty| TypeNode {
+                ty,
+                ..TypeNode::default()
+            }),
+        },
+        throws_type: ThrowsType {
+            ty: meth.throws.clone().map(|ty| TypeNode {
+                ty,
+                ..TypeNode::default()
+            }),
+        },
+        checksum: meth.checksum,
+        ..Callable::default()
+    }
+}
+
 pub fn pass(root: &mut Root) -> Result<()> {
     root.visit_mut(|func: &mut Function| {
         func.callable = Callable {
@@ -29,26 +52,27 @@ pub fn pass(root: &mut Root) -> Result<()> {
             ..Callable::default()
         }
     });
-    root.visit_mut(|module: &mut Module| {
-        let module_name = module.name.clone();
-        module.visit_mut(|int: &mut Interface| {
+    root.visit_mut(|namespace: &mut Namespace| {
+        let namespace_name = namespace.name.clone();
+        namespace.visit_mut(|int: &mut Interface| {
             let interface_name = int.name.clone();
-            let interface_imp = int.imp.clone();
+            let interface_imp = int.imp;
+            let self_type = int.self_type.clone();
             int.visit_mut(|cons: &mut Constructor| {
                 cons.callable = Callable {
                     name: cons.name.clone(),
                     is_async: cons.is_async,
                     kind: CallableKind::Constructor {
-                        interface_name: interface_name.clone(),
+                        self_type: self_type.clone(),
                         primary: cons.name == "new",
                     },
                     arguments: cons.inputs.clone(),
                     return_type: ReturnType {
                         ty: Some(TypeNode {
                             ty: Type::Interface {
-                                module_name: module_name.clone(),
+                                namespace: namespace_name.clone(),
                                 name: interface_name.clone(),
-                                imp: interface_imp.clone(),
+                                imp: interface_imp,
                             },
                             ..TypeNode::default()
                         }),
@@ -64,56 +88,28 @@ pub fn pass(root: &mut Root) -> Result<()> {
                 }
             });
             int.visit_mut(|meth: &mut Method| {
-                meth.callable = Callable {
-                    name: meth.name.clone(),
-                    is_async: meth.is_async,
-                    kind: CallableKind::Method {
-                        interface_name: interface_name.clone(),
-                    },
-                    arguments: meth.inputs.clone(),
-                    return_type: ReturnType {
-                        ty: meth.return_type.clone().map(|ty| TypeNode {
-                            ty,
-                            ..TypeNode::default()
-                        }),
-                    },
-                    throws_type: ThrowsType {
-                        ty: meth.throws.clone().map(|ty| TypeNode {
-                            ty,
-                            ..TypeNode::default()
-                        }),
-                    },
-                    checksum: meth.checksum,
-                    ..Callable::default()
-                }
+                meth.callable = new_callable_method(meth, self_type.clone());
             });
         });
     });
     root.visit_mut(|cbi: &mut CallbackInterface| {
-        let interface_name = cbi.name.clone();
-        cbi.visit_mut(|meth: &mut Method| {
-            meth.callable = Callable {
-                name: meth.name.clone(),
-                is_async: meth.is_async,
-                kind: CallableKind::Method {
-                    interface_name: interface_name.clone(),
-                },
-                arguments: meth.inputs.clone(),
-                return_type: ReturnType {
-                    ty: meth.return_type.clone().map(|ty| TypeNode {
-                        ty,
-                        ..TypeNode::default()
-                    }),
-                },
-                throws_type: ThrowsType {
-                    ty: meth.throws.clone().map(|ty| TypeNode {
-                        ty,
-                        ..TypeNode::default()
-                    }),
-                },
-                checksum: meth.checksum,
-                ..Callable::default()
-            }
+        let self_type = cbi.self_type.clone();
+        cbi.visit_mut(|m: &mut Method| {
+            m.callable = new_callable_method(m, self_type.clone());
+        })
+    });
+
+    root.visit_mut(|e: &mut Enum| {
+        let self_type = e.self_type.clone();
+        e.visit_mut(|meth: &mut Method| {
+            meth.callable = new_callable_method(meth, self_type.clone());
+        });
+    });
+
+    root.visit_mut(|r: &mut Record| {
+        let self_type = r.self_type.clone();
+        r.visit_mut(|meth: &mut Method| {
+            meth.callable = new_callable_method(meth, self_type.clone());
         });
     });
     Ok(())
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/general/callback_interfaces.rs b/third_party/rust/uniffi_bindgen/src/pipeline/general/callback_interfaces.rs
index 91605467be09c..d28a23cc6931f 100644
--- a/third_party/rust/uniffi_bindgen/src/pipeline/general/callback_interfaces.rs
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/general/callback_interfaces.rs
@@ -6,16 +6,15 @@
 
 use super::*;
 use heck::ToUpperCamelCase;
-use std::collections::HashSet;
 
-pub fn pass(module: &mut Module) -> Result<()> {
-    let crate_name = module.crate_name.clone();
-    let module_name = module.name.clone();
-    module.try_visit_mut(|cbi: &mut CallbackInterface| {
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
+    let crate_name = namespace.crate_name.clone();
+    let module_name = namespace.name.clone();
+    namespace.try_visit_mut(|cbi: &mut CallbackInterface| {
         cbi.vtable = vtable(&module_name, &crate_name, &cbi.name, cbi.methods.clone())?;
         Ok(())
     })?;
-    module.try_visit_mut(|int: &mut Interface| {
+    namespace.try_visit_mut(|int: &mut Interface| {
         if int.imp.has_callback_interface() {
             int.vtable = Some(vtable(
                 &module_name,
@@ -27,22 +26,22 @@ pub fn pass(module: &mut Module) -> Result<()> {
         Ok(())
     })?;
     // Convert CallableKind:Method to CallableKind:VTableMethod
-    module.try_visit_mut(|cbi: &mut CallbackInterface| {
+    namespace.try_visit_mut(|cbi: &mut CallbackInterface| {
         for meth in cbi.methods.iter_mut() {
             meth.callable.kind = match meth.callable.kind.take() {
-                CallableKind::Method { interface_name } => CallableKind::VTableMethod {
-                    trait_name: interface_name,
+                CallableKind::Method { self_type } => CallableKind::VTableMethod {
+                    self_type: self_type.clone(),
                 },
                 kind => bail!("Unexpected callable kind: {kind:?}"),
             };
         }
         Ok(())
     })?;
-    module.try_visit_mut(|vtable: &mut VTable| {
+    namespace.try_visit_mut(|vtable: &mut VTable| {
         for meth in vtable.methods.iter_mut() {
             meth.callable.kind = match meth.callable.kind.take() {
-                CallableKind::Method { interface_name } => CallableKind::VTableMethod {
-                    trait_name: interface_name,
+                CallableKind::Method { self_type } => CallableKind::VTableMethod {
+                    self_type: self_type.clone(),
                 },
                 kind => bail!("Unexpected callable kind: {kind:?}"),
             };
@@ -50,7 +49,7 @@ pub fn pass(module: &mut Module) -> Result<()> {
         Ok(())
     })?;
 
-    add_vtable_ffi_definitions(module)?;
+    add_vtable_ffi_definitions(namespace)?;
     Ok(())
 }
 
@@ -72,6 +71,10 @@ fn vtable(
             crate_name,
             interface_name,
         )),
+        clone_fn_type: FfiFunctionTypeName(format!(
+            "CallbackInterfaceClone{}_{interface_name}",
+            module_name.to_upper_camel_case(),
+        )),
         free_fn_type: FfiFunctionTypeName(format!(
             "CallbackInterfaceFree{}_{interface_name}",
             module_name.to_upper_camel_case(),
@@ -94,12 +97,15 @@ fn vtable(
     })
 }
 
-fn add_vtable_ffi_definitions(module: &mut Module) -> Result<()> {
+fn add_vtable_ffi_definitions(namespace: &mut Namespace) -> Result<()> {
     let mut ffi_definitions = vec![];
-    let mut seen_return_types = HashSet::new();
-    let module_name = module.name.clone();
-    module.try_visit(|vtable: &VTable| {
+    let module_name = namespace.name.clone();
+    namespace.try_visit(|vtable: &VTable| {
         let interface_name = &vtable.interface_name;
+        let handle_type = FfiType::Handle(HandleKind::TraitInterface {
+            namespace: module_name.to_string(),
+            interface_name: interface_name.to_string(),
+        });
         // FFI Function Type for each method in the VTable
         for (i, meth) in vtable.methods.iter().enumerate() {
             let method_name = format!(
@@ -137,57 +143,61 @@ fn add_vtable_ffi_definitions(module: &mut Module) -> Result<()> {
                 .clone()
                 .map(|return_type| return_type.ffi_type);
 
-            if seen_return_types.insert(ffi_return_type.clone()) {
-                ffi_definitions.extend([
-                    FfiStruct {
-                        name: async_info.ffi_foreign_future_result.clone(),
-                        fields: match ffi_return_type {
-                            Some(return_ffi_type) => vec![
-                                FfiField::new("return_value", return_ffi_type.ty),
-                                FfiField::new("call_status", FfiType::RustCallStatus),
-                            ],
-                            None => vec![
-                                // In Rust, `return_value` is `()` -- a ZST.
-                                // ZSTs are not valid in `C`, but they also take up 0 space.
-                                // Skip the `return_value` field to make the layout correct.
-                                FfiField::new("call_status", FfiType::RustCallStatus),
-                            ],
-                        },
-                    }
-                    .into(),
-                    FfiFunctionType {
-                        name: async_info.ffi_foreign_future_complete.clone(),
-                        arguments: vec![
-                            FfiArgument::new(
-                                "callback_data",
-                                FfiType::Handle(HandleKind::ForeignFuture),
-                            ),
-                            FfiArgument::new(
-                                "result",
-                                FfiType::Struct(async_info.ffi_foreign_future_result.clone()),
-                            ),
+            ffi_definitions.extend([
+                FfiStruct {
+                    name: async_info.ffi_foreign_future_result.clone(),
+                    fields: match ffi_return_type {
+                        Some(return_ffi_type) => vec![
+                            FfiField::new("return_value", return_ffi_type.ty),
+                            FfiField::new("call_status", FfiType::RustCallStatus),
                         ],
-                        return_type: FfiReturnType { ty: None },
-                        has_rust_call_status_arg: false,
-                    }
-                    .into(),
-                ]);
-            }
+                        None => vec![
+                            // In Rust, `return_value` is `()` -- a ZST.
+                            // ZSTs are not valid in `C`, but they also take up 0 space.
+                            // Skip the `return_value` field to make the layout correct.
+                            FfiField::new("call_status", FfiType::RustCallStatus),
+                        ],
+                    },
+                }
+                .into(),
+                FfiFunctionType {
+                    name: async_info.ffi_foreign_future_complete.clone(),
+                    arguments: vec![
+                        FfiArgument::new(
+                            "callback_data",
+                            FfiType::Handle(HandleKind::ForeignFuture),
+                        ),
+                        FfiArgument::new(
+                            "result",
+                            FfiType::Struct(async_info.ffi_foreign_future_result.clone()),
+                        ),
+                    ],
+                    return_type: FfiReturnType { ty: None },
+                    has_rust_call_status_arg: false,
+                }
+                .into(),
+            ]);
         }
         // FFIStruct for the VTable
         ffi_definitions.extend([
+            FfiFunctionType {
+                name: FfiFunctionTypeName(format!(
+                    "CallbackInterfaceClone{}_{interface_name}",
+                    module_name.to_upper_camel_case(),
+                )),
+                arguments: vec![FfiArgument::new("handle", handle_type.clone())],
+                return_type: FfiReturnType {
+                    ty: Some(handle_type.clone().into()),
+                },
+                has_rust_call_status_arg: false,
+            }
+            .into(),
             FfiFunctionType {
                 name: FfiFunctionTypeName(format!(
                     "CallbackInterfaceFree{}_{interface_name}",
                     module_name.to_upper_camel_case(),
                 )),
-                arguments: vec![FfiArgument::new(
-                    "handle",
-                    FfiType::Handle(HandleKind::CallbackInterface {
-                        module_name: module_name.to_string(),
-                        interface_name: interface_name.to_string(),
-                    }),
-                )],
+                arguments: vec![FfiArgument::new("handle", handle_type.clone())],
                 return_type: FfiReturnType { ty: None },
                 has_rust_call_status_arg: false,
             }
@@ -198,21 +208,28 @@ fn add_vtable_ffi_definitions(module: &mut Module) -> Result<()> {
                     module_name.to_upper_camel_case(),
                     interface_name
                 )),
-                fields: vtable
-                    .methods
-                    .iter()
-                    .map(|vtable_meth| FfiField {
-                        name: vtable_meth.callable.name.clone(),
-                        ty: vtable_meth.ffi_type.clone(),
-                    })
-                    .chain([FfiField::new(
+                fields: [
+                    FfiField::new(
                         "uniffi_free",
                         FfiType::Function(FfiFunctionTypeName(format!(
                             "CallbackInterfaceFree{}_{interface_name}",
                             module_name.to_upper_camel_case(),
                         ))),
-                    )])
-                    .collect(),
+                    ),
+                    FfiField::new(
+                        "uniffi_clone",
+                        FfiType::Function(FfiFunctionTypeName(format!(
+                            "CallbackInterfaceClone{}_{interface_name}",
+                            module_name.to_upper_camel_case(),
+                        ))),
+                    ),
+                ]
+                .into_iter()
+                .chain(vtable.methods.iter().map(|vtable_meth| FfiField {
+                    name: vtable_meth.callable.name.clone(),
+                    ty: vtable_meth.ffi_type.clone(),
+                }))
+                .collect(),
             }
             .into(),
         ]);
@@ -234,7 +251,7 @@ fn add_vtable_ffi_definitions(module: &mut Module) -> Result<()> {
         );
         Ok(())
     })?;
-    module.ffi_definitions.extend(ffi_definitions);
+    namespace.ffi_definitions.extend(ffi_definitions);
     Ok(())
 }
 
@@ -248,8 +265,8 @@ fn vtable_method(
         name: FfiFunctionTypeName(method_name),
         arguments: std::iter::once(FfiArgument {
             name: "uniffi_handle".into(),
-            ty: FfiType::Handle(HandleKind::CallbackInterface {
-                module_name: module_name.to_string(),
+            ty: FfiType::Handle(HandleKind::TraitInterface {
+                namespace: module_name.to_string(),
                 interface_name: interface_name.to_string(),
             })
             .into(),
@@ -286,8 +303,8 @@ fn vtable_method_async(
         name: FfiFunctionTypeName(method_name),
         arguments: std::iter::once(FfiArgument {
             name: "uniffi_handle".into(),
-            ty: FfiType::Handle(HandleKind::CallbackInterface {
-                module_name: module_name.to_string(),
+            ty: FfiType::Handle(HandleKind::TraitInterface {
+                namespace: module_name.to_string(),
                 interface_name: interface_name.to_string(),
             })
             .into(),
@@ -308,7 +325,7 @@ fn vtable_method_async(
             FfiArgument {
                 name: "uniffi_out_return".into(),
                 ty: FfiType::MutReference(Box::new(FfiType::Struct(FfiStructName(
-                    "ForeignFuture".to_owned(),
+                    "ForeignFutureDroppedCallbackStruct".to_owned(),
                 ))))
                 .into(),
             },
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/general/checksums.rs b/third_party/rust/uniffi_bindgen/src/pipeline/general/checksums.rs
index 77f3d3cabc1d8..1367bc36d88ee 100644
--- a/third_party/rust/uniffi_bindgen/src/pipeline/general/checksums.rs
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/general/checksums.rs
@@ -5,18 +5,18 @@
 use super::*;
 use anyhow::bail;
 
-pub fn pass(module: &mut Module) -> Result<()> {
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
     // UniFFI contract version function.  This is used to check that there wasn't a breaking
     // change to `uniffi-bindgen`.
-    module.ffi_uniffi_contract_version = RustFfiFunctionName(format!(
+    namespace.ffi_uniffi_contract_version = RustFfiFunctionName(format!(
         "ffi_{}_uniffi_contract_version",
-        &module.crate_name
+        &namespace.crate_name
     ));
-    module.ffi_definitions.push(
+    namespace.ffi_definitions.insert(
         FfiFunction {
             name: RustFfiFunctionName(format!(
                 "ffi_{}_uniffi_contract_version",
-                &module.crate_name
+                &namespace.crate_name
             )),
             async_data: None,
             arguments: vec![],
@@ -40,18 +40,25 @@ pub fn pass(module: &mut Module) -> Result<()> {
         };
         let fn_name = match &callable.kind {
             CallableKind::Function => {
-                uniffi_meta::fn_checksum_symbol_name(&module.crate_name, &callable.name)
+                uniffi_meta::fn_checksum_symbol_name(&namespace.crate_name, &callable.name)
             }
-            CallableKind::Method {
-                interface_name: name,
-            }
-            | CallableKind::VTableMethod { trait_name: name } => {
-                uniffi_meta::method_checksum_symbol_name(&module.crate_name, name, &callable.name)
+            CallableKind::Method { self_type } => {
+                let name = self_type.ty.name().unwrap();
+                uniffi_meta::method_checksum_symbol_name(
+                    &namespace.crate_name,
+                    name,
+                    &callable.name,
+                )
             }
-            CallableKind::Constructor { interface_name, .. } => {
+            CallableKind::VTableMethod { self_type } => uniffi_meta::method_checksum_symbol_name(
+                &namespace.crate_name,
+                self_type.ty.name().unwrap(),
+                &callable.name,
+            ),
+            CallableKind::Constructor { self_type, .. } => {
                 uniffi_meta::constructor_checksum_symbol_name(
-                    &module.crate_name,
-                    interface_name,
+                    &namespace.crate_name,
+                    self_type.ty.name().unwrap(),
                     &callable.name,
                 )
             }
@@ -75,8 +82,8 @@ pub fn pass(module: &mut Module) -> Result<()> {
     // Call `visit_callable` for callables that we have checksums for
     // (functions/constructors/methods), but not ones where we don't (VTable methods and UniFFI
     // traits).
-    module.try_visit(|function: &Function| function.try_visit(&mut visit_callable))?;
-    module.try_visit(|int: &Interface| {
+    namespace.try_visit(|function: &Function| function.try_visit(&mut visit_callable))?;
+    namespace.try_visit(|int: &Interface| {
         for cons in int.constructors.iter() {
             visit_callable(&cons.callable)?;
         }
@@ -87,14 +94,14 @@ pub fn pass(module: &mut Module) -> Result<()> {
     })?;
 
     for (ffi_func, checksum) in checksums {
-        module.checksums.push(Checksum {
+        namespace.checksums.push(Checksum {
             fn_name: ffi_func.name.clone(),
             checksum,
         });
-        module
+        namespace
             .ffi_definitions
-            .push(FfiDefinition::RustFunction(ffi_func));
+            .insert(FfiDefinition::RustFunction(ffi_func));
     }
-    module.correct_contract_version = uniffi_meta::UNIFFI_CONTRACT_VERSION.to_string();
+    namespace.correct_contract_version = uniffi_meta::UNIFFI_CONTRACT_VERSION.to_string();
     Ok(())
 }
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/general/default.rs b/third_party/rust/uniffi_bindgen/src/pipeline/general/default.rs
new file mode 100644
index 0000000000000..8dd77b9e853dd
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/general/default.rs
@@ -0,0 +1,20 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use super::*;
+
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
+    // fields and arguments need `DefaultValue` conversion.
+    namespace.visit_mut(|arg: &mut Argument| {
+        if let Some(DefaultValue::Default(ref mut type_node)) = arg.default {
+            *type_node = arg.ty.clone();
+        }
+    });
+    namespace.visit_mut(|field: &mut Field| {
+        if let Some(DefaultValue::Default(ref mut type_node)) = field.default {
+            *type_node = field.ty.clone();
+        }
+    });
+    Ok(())
+}
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/general/ffi_async_data.rs b/third_party/rust/uniffi_bindgen/src/pipeline/general/ffi_async_data.rs
index 036fa8dc2ddf1..2b144b65048bf 100644
--- a/third_party/rust/uniffi_bindgen/src/pipeline/general/ffi_async_data.rs
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/general/ffi_async_data.rs
@@ -5,27 +5,27 @@
 use super::*;
 use heck::ToUpperCamelCase;
 
-pub fn pass(module: &mut Module) -> Result<()> {
-    let namespace = module.crate_name.clone();
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
+    let crate_name = namespace.crate_name.clone();
 
     // Change `is_async` to `async_data`
-    module.visit_mut(|callable: &mut Callable| {
+    namespace.visit_mut(|callable: &mut Callable| {
         callable.async_data = callable.is_async.then(|| {
             generate_async_data(
-                &namespace,
+                &crate_name,
                 callable.return_type.ty.as_ref().map(|ty| &ty.ffi_type),
             )
         });
     });
-    module.visit_mut(|ffi_func: &mut FfiFunction| {
+    namespace.visit_mut(|ffi_func: &mut FfiFunction| {
         ffi_func.async_data = ffi_func
             .is_async
-            .then(|| generate_async_data(&namespace, ffi_func.return_type.ty.as_ref()));
+            .then(|| generate_async_data(&crate_name, ffi_func.return_type.ty.as_ref()));
     });
     Ok(())
 }
 
-fn generate_async_data(namespace: &str, ffi_return_type: Option<&FfiTypeNode>) -> AsyncData {
+fn generate_async_data(crate_name: &str, ffi_return_type: Option<&FfiTypeNode>) -> AsyncData {
     let return_type_name = match &ffi_return_type.map(|ffi_type| &ffi_type.ty) {
         Some(FfiType::UInt8) => "u8",
         Some(FfiType::Int8) => "i8",
@@ -37,30 +37,35 @@ fn generate_async_data(namespace: &str, ffi_return_type: Option<&FfiTypeNode>) -
         Some(FfiType::Int64) => "i64",
         Some(FfiType::Float32) => "f32",
         Some(FfiType::Float64) => "f64",
-        Some(FfiType::RustArcPtr { .. }) => "pointer",
+        Some(FfiType::Handle(_)) => "u64",
         Some(FfiType::RustBuffer(_)) => "rust_buffer",
         None => "void",
         ty => panic!("Invalid future return type: {ty:?}"),
     };
+    let struct_crate_name = match &ffi_return_type.map(|ffi_type| &ffi_type.ty) {
+        Some(FfiType::RustBuffer(Some(rust_buffer_crate))) => rust_buffer_crate,
+        _ => "",
+    };
+
     AsyncData {
         ffi_rust_future_poll: RustFfiFunctionName(format!(
-            "ffi_{namespace}_rust_future_poll_{return_type_name}"
+            "ffi_{crate_name}_rust_future_poll_{return_type_name}"
         )),
         ffi_rust_future_cancel: RustFfiFunctionName(format!(
-            "ffi_{namespace}_rust_future_cancel_{return_type_name}"
+            "ffi_{crate_name}_rust_future_cancel_{return_type_name}"
         )),
         ffi_rust_future_complete: RustFfiFunctionName(format!(
-            "ffi_{namespace}_rust_future_complete_{return_type_name}"
+            "ffi_{crate_name}_rust_future_complete_{return_type_name}"
         )),
         ffi_rust_future_free: RustFfiFunctionName(format!(
-            "ffi_{namespace}_rust_future_free_{return_type_name}"
+            "ffi_{crate_name}_rust_future_free_{return_type_name}"
         )),
         ffi_foreign_future_result: FfiStructName(format!(
-            "ForeignFutureResult{}",
+            "ForeignFutureResult{struct_crate_name}{}",
             return_type_name.to_upper_camel_case()
         )),
         ffi_foreign_future_complete: FfiFunctionTypeName(format!(
-            "ForeignFutureComplete{return_type_name}"
+            "ForeignFutureComplete{struct_crate_name}{return_type_name}"
         )),
     }
 }
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/general/ffi_functions.rs b/third_party/rust/uniffi_bindgen/src/pipeline/general/ffi_functions.rs
index 36c5f9368a4d4..de89dbc71840e 100644
--- a/third_party/rust/uniffi_bindgen/src/pipeline/general/ffi_functions.rs
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/general/ffi_functions.rs
@@ -6,34 +6,31 @@
 
 use super::*;
 
-pub fn pass(module: &mut Module) -> Result<()> {
-    let crate_name = module.crate_name.clone();
-    let module_name = module.name.clone();
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
+    let crate_name = namespace.crate_name.clone();
     let mut ffi_definitions = vec![];
 
-    module.visit_mut(|callable: &mut Callable| {
+    namespace.visit_mut(|callable: &mut Callable| {
         let name = &callable.name;
         let ffi_func_name = match &callable.kind {
             CallableKind::Function => uniffi_meta::fn_symbol_name(&crate_name, name),
-            CallableKind::Method { interface_name } => {
-                uniffi_meta::method_symbol_name(&crate_name, interface_name, name)
-            }
-            CallableKind::Constructor { interface_name, .. } => {
-                uniffi_meta::constructor_symbol_name(&crate_name, interface_name, name)
+            CallableKind::Method { self_type } => {
+                uniffi_meta::method_symbol_name(&crate_name, self_type.ty.name().unwrap(), name)
             }
+            CallableKind::Constructor { self_type, .. } => uniffi_meta::constructor_symbol_name(
+                &crate_name,
+                self_type.ty.name().unwrap(),
+                name,
+            ),
             // VTable methods for callback interfaces don't have FFI functions for them
             CallableKind::VTableMethod { .. } => return,
         };
         callable.ffi_func = RustFfiFunctionName(ffi_func_name.clone());
 
         let receiver_argument = match &callable.kind {
-            CallableKind::Method { interface_name } => Some(FfiArgument {
-                name: "uniffi_ptr".to_string(),
-                ty: FfiType::RustArcPtr {
-                    module_name: module_name.clone(),
-                    object_name: interface_name.clone(),
-                }
-                .into(),
+            CallableKind::Method { self_type, .. } => Some(FfiArgument {
+                name: "uniffi_self".to_string(),
+                ty: self_type.ffi_type.clone(),
             }),
             _ => None,
         };
@@ -81,6 +78,6 @@ pub fn pass(module: &mut Module) -> Result<()> {
         });
     });
 
-    module.ffi_definitions.extend(ffi_definitions);
+    namespace.ffi_definitions.extend(ffi_definitions);
     Ok(())
 }
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/general/ffi_types.rs b/third_party/rust/uniffi_bindgen/src/pipeline/general/ffi_types.rs
index 0438f93d2e062..aa06c553394af 100644
--- a/third_party/rust/uniffi_bindgen/src/pipeline/general/ffi_types.rs
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/general/ffi_types.rs
@@ -6,15 +6,15 @@
 
 use super::*;
 
-pub fn pass(module: &mut Module) -> Result<()> {
-    let module_name = module.name.clone();
-    module.visit_mut(|node: &mut TypeNode| {
-        node.ffi_type = FfiTypeNode::from(generate_ffi_type(&node.ty, &module_name));
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
+    let namespace_name = namespace.name.clone();
+    namespace.visit_mut(|node: &mut TypeNode| {
+        node.ffi_type = FfiTypeNode::from(generate_ffi_type(&node.ty, &namespace_name));
     });
     Ok(())
 }
 
-fn generate_ffi_type(ty: &Type, current_module_name: &str) -> FfiType {
+fn generate_ffi_type(ty: &Type, current_namespace: &str) -> FfiType {
     match ty {
         // Types that are the same map to themselves, naturally.
         Type::UInt8 => FfiType::UInt8,
@@ -37,21 +37,31 @@ fn generate_ffi_type(ty: &Type, current_module_name: &str) -> FfiType {
         Type::Bytes => FfiType::RustBuffer(None),
         // Objects are pointers to an Arc<>
         Type::Interface {
-            module_name, name, ..
-        } => FfiType::RustArcPtr {
-            module_name: module_name.clone(),
-            object_name: name.clone(),
-        },
+            namespace,
+            name,
+            imp,
+            ..
+        } => FfiType::Handle(if imp.has_struct() {
+            HandleKind::StructInterface {
+                namespace: namespace.clone(),
+                interface_name: name.clone(),
+            }
+        } else {
+            HandleKind::TraitInterface {
+                namespace: namespace.clone(),
+                interface_name: name.clone(),
+            }
+        }),
         // Callback interfaces are passed as opaque integer handles.
-        Type::CallbackInterface { module_name, name } => {
-            FfiType::Handle(HandleKind::CallbackInterface {
-                module_name: module_name.clone(),
+        Type::CallbackInterface { namespace, name } => {
+            FfiType::Handle(HandleKind::TraitInterface {
+                namespace: namespace.clone(),
                 interface_name: name.clone(),
             })
         }
         // Other types are serialized into a bytebuffer and deserialized on the other side.
-        Type::Enum { module_name, .. } | Type::Record { module_name, .. } => {
-            FfiType::RustBuffer((module_name != current_module_name).then_some(module_name.clone()))
+        Type::Enum { namespace, .. } | Type::Record { namespace, .. } => {
+            FfiType::RustBuffer((namespace != current_namespace).then_some(namespace.clone()))
         }
         Type::Optional { .. }
         | Type::Sequence { .. }
@@ -59,17 +69,15 @@ fn generate_ffi_type(ty: &Type, current_module_name: &str) -> FfiType {
         | Type::Timestamp
         | Type::Duration => FfiType::RustBuffer(None),
         Type::Custom {
-            module_name,
-            builtin,
-            ..
+            namespace, builtin, ..
         } => {
-            match generate_ffi_type(builtin, current_module_name) {
+            match generate_ffi_type(builtin, current_namespace) {
                 // Fixup `module_name` for primitive types that lower to `RustBuffer`.
                 //
                 // This is needed to handle external custom types, where the builtin type is
                 // something like `String`.
-                FfiType::RustBuffer(None) if module_name != current_module_name => {
-                    FfiType::RustBuffer(Some(module_name.clone()))
+                FfiType::RustBuffer(None) if namespace != current_namespace => {
+                    FfiType::RustBuffer(Some(namespace.clone()))
                 }
                 ffi_type => ffi_type,
             }
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/general/mod.rs b/third_party/rust/uniffi_bindgen/src/pipeline/general/mod.rs
index 9f5c7f26edf92..0f17c5a74616d 100644
--- a/third_party/rust/uniffi_bindgen/src/pipeline/general/mod.rs
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/general/mod.rs
@@ -2,10 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-//! Initial IR, this is the Metadata from uniffi_meta with some slight changes:
-//!
-//! * The Type/Literal enums are wrapped in TypeNode/LiteralNode structs. This allows for future pipeline passes to add fields.
-//! * module_path is normalized to module_name (UDL and proc-macros determine module_path differently).
+//! General IR - a useful starting point for language-specific IRs.
 
 #[macro_use]
 pub mod nodes;
@@ -13,6 +10,7 @@ pub mod nodes;
 mod callable;
 mod callback_interfaces;
 mod checksums;
+mod default;
 mod enums;
 mod ffi_async_data;
 mod ffi_functions;
@@ -20,12 +18,14 @@ mod ffi_types;
 mod modules;
 mod objects;
 mod records;
+mod rename;
 mod rust_buffer;
 mod rust_future;
 mod self_types;
 mod sort;
 mod type_definitions_from_api;
 mod type_nodes;
+mod uniffi_traits;
 
 use crate::pipeline::initial;
 use anyhow::{bail, Result};
@@ -37,23 +37,27 @@ use uniffi_pipeline::{new_pipeline, Node, Pipeline};
 ///
 /// This is the shared beginning for all bindings pipelines.
 /// Bindings generators will add language-specific passes to this.
-pub fn pipeline() -> Pipeline<initial::Root, Root> {
+pub fn pipeline(bindings_toml_key: &str) -> Pipeline<initial::Root, Root> {
+    let bindings_toml_key = bindings_toml_key.to_string();
     new_pipeline()
         .convert_ir_pass::<Root>()
         .pass(modules::pass)
-        .pass(callable::pass)
         .pass(rust_buffer::pass)
         .pass(rust_future::pass)
         .pass(self_types::pass)
+        .pass(callable::pass)
         .pass(type_definitions_from_api::pass)
-        .pass(enums::pass)
-        .pass(records::pass)
-        .pass(type_nodes::pass)
         .pass(ffi_types::pass)
         .pass(ffi_async_data::pass)
+        .pass(type_nodes::pass)
+        .pass(enums::pass)
+        .pass(records::pass)
         .pass(objects::pass)
         .pass(callback_interfaces::pass)
         .pass(ffi_functions::pass)
         .pass(checksums::pass)
+        .pass(move |root: &mut Root| rename::pass(root, &bindings_toml_key))
         .pass(sort::pass)
+        .pass(default::pass)
+        .pass(uniffi_traits::pass)
 }
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/general/modules.rs b/third_party/rust/uniffi_bindgen/src/pipeline/general/modules.rs
index d2a2b87f800a1..a3d6b0ec95ad5 100644
--- a/third_party/rust/uniffi_bindgen/src/pipeline/general/modules.rs
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/general/modules.rs
@@ -4,8 +4,8 @@
 
 use super::*;
 
-pub fn pass(module: &mut Module) -> Result<()> {
-    module.string_type_node = TypeNode {
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
+    namespace.string_type_node = TypeNode {
         ty: Type::String,
         ..TypeNode::default()
     };
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/general/nodes.rs b/third_party/rust/uniffi_bindgen/src/pipeline/general/nodes.rs
index 61e3f753b393c..b44db2d134d0c 100644
--- a/third_party/rust/uniffi_bindgen/src/pipeline/general/nodes.rs
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/general/nodes.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use indexmap::IndexMap;
+use indexmap::{IndexMap, IndexSet};
 use uniffi_pipeline::Node;
 
 /// Initial IR, this stores the metadata and other data
@@ -10,22 +10,23 @@ use uniffi_pipeline::Node;
 pub struct Root {
     /// In library mode, the library path the user passed to us
     pub cdylib: Option<String>,
-    pub modules: IndexMap<String, Module>,
+    pub namespaces: IndexMap<String, Namespace>,
 }
 
+/// A Namespace is a crate which exposes a uniffi api.
 #[derive(Debug, Clone, Node)]
-pub struct Module {
+pub struct Namespace {
     pub name: String,
     pub crate_name: String,
-    /// contents of the `uniffi.toml` file for this module, if present
+    /// contents of the `uniffi.toml` file for this namespace, if present
     pub config_toml: Option<String>,
     pub docstring: Option<String>,
     pub functions: Vec<Function>,
     pub type_definitions: Vec<TypeDefinition>,
-    pub ffi_definitions: Vec<FfiDefinition>,
+    pub ffi_definitions: IndexSet<FfiDefinition>,
     /// Checksum functions
     pub checksums: Vec<Checksum>,
-    // FFI functions names for this module
+    // FFI functions names in this namespace
     pub ffi_rustbuffer_alloc: RustFfiFunctionName,
     pub ffi_rustbuffer_from_bytes: RustFfiFunctionName,
     pub ffi_rustbuffer_free: RustFfiFunctionName,
@@ -109,17 +110,14 @@ pub enum CallableKind {
     /// Toplevel function
     Function,
     /// Interface/Trait interface method
-    Method { interface_name: String },
+    Method { self_type: TypeNode },
     /// Interface constructor
-    Constructor {
-        interface_name: String,
-        primary: bool,
-    },
+    Constructor { self_type: TypeNode, primary: bool },
     /// Method inside a VTable or a CallbackInterface
     ///
     /// For trait interfaces this only applies to the Callables inside the `vtable.methods` field.
     /// Callables inside `Interface::methods` will still be `Callable::Method`.
-    VTableMethod { trait_name: String },
+    VTableMethod { self_type: TypeNode },
 }
 
 #[derive(Debug, Clone, Node)]
@@ -132,7 +130,7 @@ pub struct ThrowsType {
     pub ty: Option<TypeNode>,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub struct AsyncData {
     // FFI types for async Rust functions
     pub ffi_rust_future_poll: RustFfiFunctionName,
@@ -149,7 +147,13 @@ pub struct Argument {
     pub name: String,
     pub ty: TypeNode,
     pub optional: bool,
-    pub default: Option<LiteralNode>,
+    pub default: Option<DefaultValue>,
+}
+
+#[derive(Debug, Clone, Node)]
+pub enum DefaultValue {
+    Default(TypeNode),
+    Literal(LiteralNode),
 }
 
 #[derive(Debug, Clone, Node)]
@@ -176,7 +180,7 @@ pub enum Literal {
     EmptySequence,
     EmptyMap,
     None,
-    Some { inner: Box<Literal> },
+    Some { inner: Box<DefaultValue> },
 }
 
 // Represent the radix of integer literal values.
@@ -193,8 +197,12 @@ pub struct Record {
     pub name: String,
     pub fields_kind: FieldsKind,
     pub fields: Vec<Field>,
+    pub constructors: Vec<Constructor>,
+    pub methods: Vec<Method>,
     pub docstring: Option<String>,
     pub self_type: TypeNode,
+    pub uniffi_traits: Vec<UniffiTrait>,
+    pub uniffi_trait_methods: UniffiTraitMethods,
 }
 
 #[derive(Debug, Clone, Node)]
@@ -208,7 +216,7 @@ pub enum FieldsKind {
 pub struct Field {
     pub name: String,
     pub ty: TypeNode,
-    pub default: Option<LiteralNode>,
+    pub default: Option<DefaultValue>,
     pub docstring: Option<String>,
 }
 
@@ -233,8 +241,12 @@ pub struct Enum {
     /// values. We try to mimic what `rustc` does, but there's no guarantee that this will be
     /// exactly the same type.
     pub discr_type: TypeNode,
+    pub constructors: Vec<Constructor>,
+    pub methods: Vec<Method>,
     pub docstring: Option<String>,
     pub self_type: TypeNode,
+    pub uniffi_traits: Vec<UniffiTrait>,
+    pub uniffi_trait_methods: UniffiTraitMethods,
 }
 
 #[derive(Debug, Clone, Node)]
@@ -259,6 +271,7 @@ pub struct Interface {
     pub constructors: Vec<Constructor>,
     pub methods: Vec<Method>,
     pub uniffi_traits: Vec<UniffiTrait>,
+    pub uniffi_trait_methods: UniffiTraitMethods,
     pub trait_impls: Vec<ObjectTraitImpl>,
     pub imp: ObjectImpl,
     pub self_type: TypeNode,
@@ -287,6 +300,7 @@ pub struct VTable {
     ///
     /// Foreign code should call this function, passing it a pointer to the VTable struct.
     pub init_fn: RustFfiFunctionName,
+    pub clone_fn_type: FfiFunctionTypeName,
     pub free_fn_type: FfiFunctionTypeName,
     pub methods: Vec<VTableMethod>,
 }
@@ -299,19 +313,20 @@ pub struct VTableMethod {
     pub ffi_type: FfiTypeNode,
 }
 
+#[allow(clippy::large_enum_variant)]
 #[derive(Debug, Clone, Node)]
 pub enum UniffiTrait {
     Debug { fmt: Method },
     Display { fmt: Method },
     Eq { eq: Method, ne: Method },
     Hash { hash: Method },
+    Ord { cmp: Method },
 }
 
 #[derive(Debug, Clone, Node)]
 pub struct ObjectTraitImpl {
     pub ty: TypeNode,
-    pub trait_name: String,
-    pub tr_module_name: Option<String>,
+    pub trait_ty: TypeNode,
 }
 
 #[derive(Debug, Clone, Node)]
@@ -343,7 +358,7 @@ pub struct MapType {
 
 #[derive(Debug, Clone, Node)]
 pub struct ExternalType {
-    pub module_name: String,
+    pub namespace: String,
     pub name: String,
     pub self_type: TypeNode,
 }
@@ -403,30 +418,30 @@ pub enum Type {
     },
     // User defined types in the API
     Interface {
-        module_name: String,
+        namespace: String,
         name: String,
         imp: ObjectImpl,
     },
     Record {
-        module_name: String,
+        namespace: String,
         name: String,
     },
     Enum {
-        module_name: String,
+        namespace: String,
         name: String,
     },
     CallbackInterface {
-        module_name: String,
+        namespace: String,
         name: String,
     },
     Custom {
-        module_name: String,
+        namespace: String,
         name: String,
         builtin: Box<Type>,
     },
 }
 
-#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, Node, PartialEq, Eq, Hash)]
 pub enum ObjectImpl {
     // A single Rust type
     Struct,
@@ -436,7 +451,7 @@ pub enum ObjectImpl {
     CallbackTrait,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub enum FfiDefinition {
     /// FFI Function exported in the Rust library
     RustFunction(FfiFunction),
@@ -458,7 +473,7 @@ pub struct FfiStructName(pub String);
 #[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub struct FfiFunctionTypeName(pub String);
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub struct FfiFunction {
     pub name: RustFfiFunctionName,
     pub is_async: bool,
@@ -469,7 +484,7 @@ pub struct FfiFunction {
     pub kind: FfiFunctionKind,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub enum FfiFunctionKind {
     Scaffolding,
     ObjectClone,
@@ -487,7 +502,7 @@ pub enum FfiFunctionKind {
     Checksum,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub struct FfiFunctionType {
     pub name: FfiFunctionTypeName,
     pub arguments: Vec<FfiArgument>,
@@ -495,24 +510,24 @@ pub struct FfiFunctionType {
     pub has_rust_call_status_arg: bool,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub struct FfiReturnType {
     pub ty: Option<FfiTypeNode>,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub struct FfiStruct {
     pub name: FfiStructName,
     pub fields: Vec<FfiField>,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub struct FfiField {
     pub name: String,
     pub ty: FfiTypeNode,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq, Hash)]
 pub struct FfiArgument {
     pub name: String,
     pub ty: FfiTypeNode,
@@ -531,20 +546,12 @@ pub enum FfiType {
     Int64,
     Float32,
     Float64,
-    /// A `*const c_void` pointer to a rust-owned `Arc<T>`.
-    /// If you've got one of these, you must call the appropriate rust function to free it.
-    /// The templates will generate a unique `free` function for each T.
-    /// The inner string references the name of the `T` type.
-    RustArcPtr {
-        module_name: String,
-        object_name: String,
-    },
     /// A byte buffer allocated by rust, and owned by whoever currently holds it.
     /// If you've got one of these, you must either call the appropriate rust function to free it
     /// or pass it to someone that will.
     ///
     /// For user-defined types like Record, Enum, CustomType, etc., the inner value will be the
-    /// module name for that type.  This is needed for some languages, because each module
+    /// namespace name for that type.  This is needed for some languages, because each module
     /// defines a different RustBuffer type and using the wrong one will result in a type
     /// error.
     ///
@@ -578,12 +585,15 @@ pub enum HandleKind {
     RustFuture,
     ForeignFuture,
     ForeignFutureCallbackData,
-    CallbackInterface {
-        module_name: String,
+    // Interface, trait interface, or callback interface
+    StructInterface {
+        namespace: String,
+        interface_name: String,
+    },
+    TraitInterface {
+        namespace: String,
         interface_name: String,
     },
-    // TODO: dust off https://github.com/mozilla/uniffi-rs/pull/1823 and also use handles for
-    // interfaces and trait interfaces
 }
 
 #[derive(Debug, Clone, Node)]
@@ -592,6 +602,17 @@ pub struct Checksum {
     pub checksum: u16,
 }
 
+/// flattened uniffi_traits.
+#[derive(Debug, Clone, Node)]
+pub struct UniffiTraitMethods {
+    pub debug_fmt: Option<Method>,
+    pub display_fmt: Option<Method>,
+    pub eq_eq: Option<Method>,
+    pub eq_ne: Option<Method>,
+    pub hash_hash: Option<Method>,
+    pub ord_cmp: Option<Method>,
+}
+
 impl FfiDefinition {
     pub fn name(&self) -> &str {
         match self {
@@ -667,4 +688,8 @@ impl ObjectImpl {
     pub fn has_callback_interface(&self) -> bool {
         matches!(self, Self::CallbackTrait)
     }
+
+    pub fn has_struct(&self) -> bool {
+        matches!(self, Self::Struct)
+    }
 }
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/general/objects.rs b/third_party/rust/uniffi_bindgen/src/pipeline/general/objects.rs
index c9e64966f9641..eb8b5685d8351 100644
--- a/third_party/rust/uniffi_bindgen/src/pipeline/general/objects.rs
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/general/objects.rs
@@ -6,11 +6,11 @@ use uniffi_meta;
 
 use super::*;
 
-pub fn pass(module: &mut Module) -> Result<()> {
-    let crate_name = module.crate_name.clone();
-    let module_name = module.name.clone();
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
+    let crate_name = namespace.crate_name.clone();
+    let namespace_name = namespace.name.clone();
     let mut ffi_definitions = vec![];
-    module.visit_mut(|int: &mut Interface| {
+    namespace.visit_mut(|int: &mut Interface| {
         int.ffi_func_clone =
             RustFfiFunctionName(uniffi_meta::clone_fn_symbol_name(&crate_name, &int.name));
         int.ffi_func_free =
@@ -21,18 +21,32 @@ pub fn pass(module: &mut Module) -> Result<()> {
                 is_async: false,
                 arguments: vec![FfiArgument {
                     name: "ptr".to_string(),
-                    ty: FfiType::RustArcPtr {
-                        module_name: module_name.clone(),
-                        object_name: int.name.to_string(),
-                    }
+                    ty: FfiType::Handle(if int.imp.has_struct() {
+                        HandleKind::StructInterface {
+                            namespace: namespace_name.clone(),
+                            interface_name: int.name.to_string(),
+                        }
+                    } else {
+                        HandleKind::TraitInterface {
+                            namespace: namespace_name.clone(),
+                            interface_name: int.name.to_string(),
+                        }
+                    })
                     .into(),
                 }],
                 return_type: FfiReturnType {
                     ty: Some(
-                        FfiType::RustArcPtr {
-                            module_name: module_name.clone(),
-                            object_name: int.name.to_string(),
-                        }
+                        FfiType::Handle(if int.imp.has_struct() {
+                            HandleKind::StructInterface {
+                                namespace: namespace_name.clone(),
+                                interface_name: int.name.to_string(),
+                            }
+                        } else {
+                            HandleKind::TraitInterface {
+                                namespace: namespace_name.clone(),
+                                interface_name: int.name.to_string(),
+                            }
+                        })
                         .into(),
                     ),
                 },
@@ -48,10 +62,17 @@ pub fn pass(module: &mut Module) -> Result<()> {
                 is_async: false,
                 arguments: vec![FfiArgument {
                     name: "ptr".to_string(),
-                    ty: FfiType::RustArcPtr {
-                        module_name: module_name.clone(),
-                        object_name: int.name.to_string(),
-                    }
+                    ty: FfiType::Handle(if int.imp.has_struct() {
+                        HandleKind::StructInterface {
+                            namespace: namespace_name.clone(),
+                            interface_name: int.name.to_string(),
+                        }
+                    } else {
+                        HandleKind::TraitInterface {
+                            namespace: namespace_name.clone(),
+                            interface_name: int.name.to_string(),
+                        }
+                    })
                     .into(),
                 }],
                 return_type: FfiReturnType { ty: None },
@@ -62,6 +83,6 @@ pub fn pass(module: &mut Module) -> Result<()> {
             .into(),
         );
     });
-    module.ffi_definitions.extend(ffi_definitions);
+    namespace.ffi_definitions.extend(ffi_definitions);
     Ok(())
 }
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/general/rename.rs b/third_party/rust/uniffi_bindgen/src/pipeline/general/rename.rs
new file mode 100644
index 0000000000000..c2504aece48f9
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/general/rename.rs
@@ -0,0 +1,184 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+//! Renames items based on TOML table lookups.
+//! Items can only be renamed in their own crate, so we use uniffi.toml from each crate
+//! Then mutate all itens based on these lookups.
+
+use super::*;
+use std::collections::HashMap;
+
+pub fn pass(root: &mut Root, bindings_toml_key: &str) -> Result<()> {
+    let mut namespace_renames: HashMap<String, toml::Table> = HashMap::new();
+
+    for namespace in root.namespaces.values() {
+        if let Some(renames) = extract_rename_table(namespace, bindings_toml_key)? {
+            namespace_renames.insert(namespace.name.clone(), renames);
+        }
+    }
+
+    if namespace_renames.is_empty() {
+        return Ok(());
+    }
+
+    for namespace in root.namespaces.values_mut() {
+        apply_renames(namespace, &namespace_renames)?;
+    }
+
+    Ok(())
+}
+
+fn extract_rename_table(
+    namespace: &Namespace,
+    bindings_toml_key: &str,
+) -> Result<Option<toml::Table>> {
+    let Some(config_toml) = &namespace.config_toml else {
+        return Ok(None);
+    };
+    let config: toml::Table = toml::from_str(config_toml)?;
+
+    Ok(config
+        .get("bindings")
+        .and_then(|b| b.as_table())
+        .and_then(|b| b.get(bindings_toml_key))
+        .and_then(|p| p.as_table())
+        .and_then(|p| p.get("rename"))
+        .and_then(|r| r.as_table())
+        .cloned())
+}
+
+fn apply_renames(
+    namespace: &mut Namespace,
+    namespace_renames: &HashMap<String, toml::Table>,
+) -> Result<()> {
+    let ns = namespace.name.clone();
+
+    namespace.visit_mut(|callable: &mut Callable| {
+        rename_callable(callable, &ns, namespace_renames);
+    });
+
+    // rename all the types and any sub-elements in them.
+    for type_def in namespace.type_definitions.iter_mut() {
+        match type_def {
+            TypeDefinition::Interface(interface) => {
+                if let Some(new_name) = new_name(&ns, &interface.name, namespace_renames) {
+                    interface.name = new_name;
+                }
+            }
+            TypeDefinition::CallbackInterface(callback) => {
+                if let Some(new_name) = new_name(&ns, &callback.name, namespace_renames) {
+                    callback.name = new_name;
+                }
+            }
+            TypeDefinition::Record(record) => {
+                rename_record(record, &ns, namespace_renames);
+            }
+            TypeDefinition::Enum(enum_) => {
+                rename_enum(enum_, &ns, namespace_renames);
+            }
+            _ => {}
+        }
+    }
+
+    rename_types(namespace, namespace_renames);
+
+    Ok(())
+}
+
+fn new_name(namespace: &str, name: &str, renames: &HashMap<String, toml::Table>) -> Option<String> {
+    renames
+        .get(namespace)
+        .and_then(|table| table.get(name))
+        .and_then(|v| v.as_str())
+        .map(|s| s.to_string())
+}
+
+fn rename_types(ns: &mut Namespace, renames: &HashMap<String, toml::Table>) {
+    ns.visit_mut(|ty: &mut Type| match ty {
+        Type::Record {
+            namespace, name, ..
+        }
+        | Type::Enum {
+            namespace, name, ..
+        }
+        | Type::Interface {
+            namespace, name, ..
+        }
+        | Type::Custom {
+            namespace, name, ..
+        } => {
+            if let Some(new_name) = new_name(namespace, name, renames) {
+                *name = new_name;
+            }
+        }
+        _ => {}
+    });
+}
+
+fn rename_callable(
+    callable: &mut Callable,
+    namespace: &str,
+    renames: &HashMap<String, toml::Table>,
+) {
+    let fn_name = callable.name.clone();
+
+    let callable_key = match &callable.kind {
+        CallableKind::Constructor { self_type, .. }
+        | CallableKind::Method { self_type }
+        | CallableKind::VTableMethod { self_type, .. } => Some(self_type.ty.name().unwrap()),
+        CallableKind::Function => None,
+    }
+    .map(|ob_prefix| format!("{ob_prefix}.{fn_name}"))
+    .unwrap_or(fn_name);
+
+    for arg in &mut callable.arguments {
+        let arg_path = format!("{callable_key}.{}", arg.name);
+        if let Some(new_name) = new_name(namespace, &arg_path, renames) {
+            arg.name = new_name;
+        }
+    }
+
+    if let Some(new_name) = new_name(namespace, &callable_key, renames) {
+        callable.name = new_name;
+    }
+}
+
+fn rename_record(record: &mut Record, namespace: &str, renames: &HashMap<String, toml::Table>) {
+    let record_name = record.name.clone();
+
+    for field in &mut record.fields {
+        let field_path = format!("{}.{}", record_name, field.name);
+        if let Some(new_name) = new_name(namespace, &field_path, renames) {
+            field.name = new_name;
+        }
+    }
+
+    if let Some(new_name) = new_name(namespace, &record_name, renames) {
+        record.name = new_name;
+    }
+}
+
+fn rename_enum(enum_: &mut Enum, namespace: &str, renames: &HashMap<String, toml::Table>) {
+    let enum_name = enum_.name.clone();
+
+    for variant in &mut enum_.variants {
+        let variant_name = variant.name.clone();
+        let variant_path = format!("{}.{}", enum_name, variant_name);
+
+        for field in &mut variant.fields {
+            let field_path = format!("{}.{}", variant_path, field.name);
+            if let Some(new_name) = new_name(namespace, &field_path, renames) {
+                field.name = new_name;
+            }
+        }
+
+        if let Some(new_name) = new_name(namespace, &variant_path, renames) {
+            variant.name = new_name;
+        }
+    }
+
+    if let Some(new_name) = new_name(namespace, &enum_name, renames) {
+        enum_.name = new_name;
+    }
+}
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/general/rust_buffer.rs b/third_party/rust/uniffi_bindgen/src/pipeline/general/rust_buffer.rs
index b92c6a66a64c6..a82b5830b3ecf 100644
--- a/third_party/rust/uniffi_bindgen/src/pipeline/general/rust_buffer.rs
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/general/rust_buffer.rs
@@ -6,18 +6,20 @@
 
 use super::*;
 
-pub fn pass(module: &mut Module) -> Result<()> {
-    module.ffi_rustbuffer_alloc =
-        RustFfiFunctionName(format!("ffi_{}_rustbuffer_alloc", &module.crate_name));
-    module.ffi_rustbuffer_from_bytes =
-        RustFfiFunctionName(format!("ffi_{}_rustbuffer_from_bytes", &module.crate_name));
-    module.ffi_rustbuffer_free =
-        RustFfiFunctionName(format!("ffi_{}_rustbuffer_free", &module.crate_name));
-    module.ffi_rustbuffer_reserve =
-        RustFfiFunctionName(format!("ffi_{}_rustbuffer_reserve", &module.crate_name));
-    module.ffi_definitions.extend([
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
+    namespace.ffi_rustbuffer_alloc =
+        RustFfiFunctionName(format!("ffi_{}_rustbuffer_alloc", &namespace.crate_name));
+    namespace.ffi_rustbuffer_from_bytes = RustFfiFunctionName(format!(
+        "ffi_{}_rustbuffer_from_bytes",
+        &namespace.crate_name
+    ));
+    namespace.ffi_rustbuffer_free =
+        RustFfiFunctionName(format!("ffi_{}_rustbuffer_free", &namespace.crate_name));
+    namespace.ffi_rustbuffer_reserve =
+        RustFfiFunctionName(format!("ffi_{}_rustbuffer_reserve", &namespace.crate_name));
+    namespace.ffi_definitions.extend([
         FfiFunction {
-            name: RustFfiFunctionName(format!("ffi_{}_rustbuffer_alloc", &module.crate_name)),
+            name: RustFfiFunctionName(format!("ffi_{}_rustbuffer_alloc", &namespace.crate_name)),
             async_data: None,
             arguments: vec![FfiArgument {
                 name: "size".to_string(),
@@ -32,7 +34,10 @@ pub fn pass(module: &mut Module) -> Result<()> {
         }
         .into(),
         FfiFunction {
-            name: RustFfiFunctionName(format!("ffi_{}_rustbuffer_from_bytes", &module.crate_name)),
+            name: RustFfiFunctionName(format!(
+                "ffi_{}_rustbuffer_from_bytes",
+                &namespace.crate_name
+            )),
             async_data: None,
             arguments: vec![FfiArgument {
                 name: "bytes".to_string(),
@@ -47,7 +52,7 @@ pub fn pass(module: &mut Module) -> Result<()> {
         }
         .into(),
         FfiFunction {
-            name: RustFfiFunctionName(format!("ffi_{}_rustbuffer_free", &module.crate_name)),
+            name: RustFfiFunctionName(format!("ffi_{}_rustbuffer_free", &namespace.crate_name)),
             async_data: None,
             arguments: vec![FfiArgument {
                 name: "buf".to_string(),
@@ -60,7 +65,7 @@ pub fn pass(module: &mut Module) -> Result<()> {
         }
         .into(),
         FfiFunction {
-            name: RustFfiFunctionName(format!("ffi_{}_rustbuffer_reserve", &module.crate_name)),
+            name: RustFfiFunctionName(format!("ffi_{}_rustbuffer_reserve", &namespace.crate_name)),
             async_data: None,
             arguments: vec![
                 FfiArgument {
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/general/rust_future.rs b/third_party/rust/uniffi_bindgen/src/pipeline/general/rust_future.rs
index affde13bffd2a..53a21669250ac 100644
--- a/third_party/rust/uniffi_bindgen/src/pipeline/general/rust_future.rs
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/general/rust_future.rs
@@ -4,11 +4,11 @@
 
 use super::*;
 
-pub fn pass(module: &mut Module) -> Result<()> {
-    let namespace = module.crate_name.clone();
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
+    let crate_name = namespace.crate_name.clone();
 
     // Add Future-related FFI definitions
-    module.ffi_definitions.extend([
+    namespace.ffi_definitions.extend([
         FfiFunctionType {
             name: FfiFunctionTypeName("RustFutureContinuationCallback".to_owned()),
             arguments: vec![
@@ -20,7 +20,7 @@ pub fn pass(module: &mut Module) -> Result<()> {
         }
         .into(),
         FfiFunctionType {
-            name: FfiFunctionTypeName("ForeignFutureFree".to_owned()),
+            name: FfiFunctionTypeName("ForeignFutureDroppedCallback".to_owned()),
             arguments: vec![FfiArgument::new(
                 "handle",
                 FfiType::Handle(HandleKind::ForeignFuture),
@@ -30,12 +30,14 @@ pub fn pass(module: &mut Module) -> Result<()> {
         }
         .into(),
         FfiStruct {
-            name: FfiStructName("ForeignFuture".to_owned()),
+            name: FfiStructName("ForeignFutureDroppedCallbackStruct".to_owned()),
             fields: vec![
                 FfiField::new("handle", FfiType::Handle(HandleKind::ForeignFuture)),
                 FfiField::new(
                     "free",
-                    FfiType::Function(FfiFunctionTypeName("ForeignFutureFree".to_owned())),
+                    FfiType::Function(FfiFunctionTypeName(
+                        "ForeignFutureDroppedCallback".to_owned(),
+                    )),
                 ),
             ],
         }
@@ -55,31 +57,42 @@ pub fn pass(module: &mut Module) -> Result<()> {
         (Some(FfiType::Float32), "f32"),
         (Some(FfiType::Float64), "f64"),
         (
-            Some(FfiType::RustArcPtr {
-                module_name: "".into(),
-                object_name: "".into(),
-            }),
-            "pointer",
+            Some(FfiType::Handle(HandleKind::StructInterface {
+                namespace: "".into(),
+                interface_name: "".into(),
+            })),
+            "u64",
+        ),
+        (
+            Some(FfiType::Handle(HandleKind::TraitInterface {
+                namespace: "".into(),
+                interface_name: "".into(),
+            })),
+            "u64",
         ),
         (Some(FfiType::RustBuffer(None)), "rust_buffer"),
         (None, "void"),
     ];
     for (return_type, return_type_name) in all_async_return_types {
-        let poll_name = format!("ffi_{namespace}_rust_future_poll_{return_type_name}");
-        module.ffi_definitions.push(ffi_rust_future_poll(poll_name));
+        let poll_name = format!("ffi_{crate_name}_rust_future_poll_{return_type_name}");
+        namespace
+            .ffi_definitions
+            .insert(ffi_rust_future_poll(poll_name));
 
-        let cancel_name = format!("ffi_{namespace}_rust_future_cancel_{return_type_name}");
-        module
+        let cancel_name = format!("ffi_{crate_name}_rust_future_cancel_{return_type_name}");
+        namespace
             .ffi_definitions
-            .push(ffi_rust_future_cancel(cancel_name));
+            .insert(ffi_rust_future_cancel(cancel_name));
 
-        let complete_name = format!("ffi_{namespace}_rust_future_complete_{return_type_name}");
-        module
+        let complete_name = format!("ffi_{crate_name}_rust_future_complete_{return_type_name}");
+        namespace
             .ffi_definitions
-            .push(ffi_rust_future_complete(return_type.clone(), complete_name));
+            .insert(ffi_rust_future_complete(return_type.clone(), complete_name));
 
-        let free_name = format!("ffi_{namespace}_rust_future_free_{return_type_name}");
-        module.ffi_definitions.push(ffi_rust_future_free(free_name));
+        let free_name = format!("ffi_{crate_name}_rust_future_free_{return_type_name}");
+        namespace
+            .ffi_definitions
+            .insert(ffi_rust_future_free(free_name));
     }
     Ok(())
 }
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/general/self_types.rs b/third_party/rust/uniffi_bindgen/src/pipeline/general/self_types.rs
index 31fba613a20ad..e3c3c8c471685 100644
--- a/third_party/rust/uniffi_bindgen/src/pipeline/general/self_types.rs
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/general/self_types.rs
@@ -7,49 +7,49 @@
 
 use super::*;
 
-pub fn pass(module: &mut Module) -> Result<()> {
-    let module_name = module.name.clone();
-    module.visit_mut(|rec: &mut Record| {
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
+    let namespace_name = namespace.name.clone();
+    namespace.visit_mut(|rec: &mut Record| {
         rec.self_type = TypeNode {
             ty: Type::Record {
-                module_name: module_name.clone(),
+                namespace: namespace_name.clone(),
                 name: rec.name.clone(),
             },
             ..TypeNode::default()
         }
     });
-    module.visit_mut(|en: &mut Enum| {
+    namespace.visit_mut(|en: &mut Enum| {
         en.self_type = TypeNode {
             ty: Type::Enum {
-                module_name: module_name.clone(),
+                namespace: namespace_name.clone(),
                 name: en.name.clone(),
             },
             ..TypeNode::default()
         };
     });
-    module.visit_mut(|int: &mut Interface| {
+    namespace.visit_mut(|int: &mut Interface| {
         int.self_type = TypeNode {
             ty: Type::Interface {
-                module_name: module_name.clone(),
+                namespace: namespace_name.clone(),
                 name: int.name.clone(),
-                imp: int.imp.clone(),
+                imp: int.imp,
             },
             ..TypeNode::default()
         };
     });
-    module.visit_mut(|cbi: &mut CallbackInterface| {
+    namespace.visit_mut(|cbi: &mut CallbackInterface| {
         cbi.self_type = TypeNode {
             ty: Type::CallbackInterface {
-                module_name: module_name.clone(),
+                namespace: namespace_name.clone(),
                 name: cbi.name.clone(),
             },
             ..TypeNode::default()
         };
     });
-    module.visit_mut(|custom: &mut CustomType| {
+    namespace.visit_mut(|custom: &mut CustomType| {
         custom.self_type = TypeNode {
             ty: Type::Custom {
-                module_name: module_name.clone(),
+                namespace: namespace_name.clone(),
                 name: custom.name.clone(),
                 builtin: Box::new(custom.builtin.ty.clone()),
             },
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/general/sort.rs b/third_party/rust/uniffi_bindgen/src/pipeline/general/sort.rs
index ef45a88562d78..3200f2d3466c5 100644
--- a/third_party/rust/uniffi_bindgen/src/pipeline/general/sort.rs
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/general/sort.rs
@@ -9,18 +9,18 @@
 
 use super::*;
 
-pub fn pass(module: &mut Module) -> Result<()> {
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
     let ffi_dep_sorter = DependencySorter::new(
-        module.ffi_definitions.drain(..),
+        namespace.ffi_definitions.drain(..),
         FfiDefinitionDependencyLogic,
     );
-    module.ffi_definitions = ffi_dep_sorter.sort();
+    namespace.ffi_definitions.extend(ffi_dep_sorter.sort());
 
     let type_sorter = DependencySorter::new(
-        module.type_definitions.drain(..),
+        namespace.type_definitions.drain(..),
         TypeDefinitionDependencyLogic,
     );
-    module.type_definitions = type_sorter.sort();
+    namespace.type_definitions = type_sorter.sort();
     Ok(())
 }
 
@@ -174,7 +174,7 @@ impl DependencyLogic for TypeDefinitionDependencyLogic {
             TypeDefinition::Interface(i) => {
                 i.trait_impls
                     .iter()
-                    .map(|i| format!("Type{}", i.trait_name))
+                    .map(|i| i.trait_ty.canonical_name.clone())
                     .chain(
                         i.methods
                             .iter()
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/general/type_definitions_from_api.rs b/third_party/rust/uniffi_bindgen/src/pipeline/general/type_definitions_from_api.rs
index 6d86eb51996fd..825e91e70d06c 100644
--- a/third_party/rust/uniffi_bindgen/src/pipeline/general/type_definitions_from_api.rs
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/general/type_definitions_from_api.rs
@@ -10,10 +10,10 @@ use indexmap::IndexSet;
 
 use super::*;
 
-pub fn pass(module: &mut Module) -> Result<()> {
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
     // Map types to type definitions to add
     let mut all_types = IndexSet::<Type>::default();
-    module.visit(|ty: &Type| {
+    namespace.visit(|ty: &Type| {
         collect_all_types(&mut all_types, ty);
     });
     for ty in all_types {
@@ -33,7 +33,7 @@ pub fn pass(module: &mut Module) -> Result<()> {
             | Type::Bytes
             | Type::Timestamp
             | Type::Duration => {
-                module
+                namespace
                     .type_definitions
                     .push(TypeDefinition::Simple(TypeNode {
                         ty,
@@ -41,7 +41,7 @@ pub fn pass(module: &mut Module) -> Result<()> {
                     }));
             }
             Type::Optional { inner_type } => {
-                module
+                namespace
                     .type_definitions
                     .push(TypeDefinition::Optional(OptionalType {
                         inner: TypeNode {
@@ -55,7 +55,7 @@ pub fn pass(module: &mut Module) -> Result<()> {
                     }));
             }
             Type::Sequence { inner_type } => {
-                module
+                namespace
                     .type_definitions
                     .push(TypeDefinition::Sequence(SequenceType {
                         inner: TypeNode {
@@ -72,37 +72,47 @@ pub fn pass(module: &mut Module) -> Result<()> {
                 key_type,
                 value_type,
             } => {
-                module.type_definitions.push(TypeDefinition::Map(MapType {
-                    key: TypeNode {
-                        ty: (**key_type).clone(),
-                        ..TypeNode::default()
-                    },
-                    value: TypeNode {
-                        ty: (**value_type).clone(),
-                        ..TypeNode::default()
-                    },
-                    self_type: TypeNode {
-                        ty,
-                        ..TypeNode::default()
-                    },
-                }));
+                namespace
+                    .type_definitions
+                    .push(TypeDefinition::Map(MapType {
+                        key: TypeNode {
+                            ty: (**key_type).clone(),
+                            ..TypeNode::default()
+                        },
+                        value: TypeNode {
+                            ty: (**value_type).clone(),
+                            ..TypeNode::default()
+                        },
+                        self_type: TypeNode {
+                            ty,
+                            ..TypeNode::default()
+                        },
+                    }));
             }
             Type::Record {
-                module_name, name, ..
+                namespace: namespace_name,
+                name,
+                ..
             }
             | Type::Enum {
-                module_name, name, ..
+                namespace: namespace_name,
+                name,
+                ..
             }
             | Type::Interface {
-                module_name, name, ..
+                namespace: namespace_name,
+                name,
+                ..
             }
             | Type::Custom {
-                module_name, name, ..
-            } if *module_name != module.name => {
-                module
+                namespace: namespace_name,
+                name,
+                ..
+            } if *namespace_name != namespace.name => {
+                namespace
                     .type_definitions
                     .push(TypeDefinition::External(ExternalType {
-                        module_name: module_name.clone(),
+                        namespace: namespace_name.clone(),
                         name: name.clone(),
                         self_type: TypeNode {
                             ty: ty.clone(),
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/general/type_nodes.rs b/third_party/rust/uniffi_bindgen/src/pipeline/general/type_nodes.rs
index 70e3e271d9914..abfb7a0633c8f 100644
--- a/third_party/rust/uniffi_bindgen/src/pipeline/general/type_nodes.rs
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/general/type_nodes.rs
@@ -11,9 +11,9 @@ use indexmap::IndexSet;
 
 use super::*;
 
-pub fn pass(module: &mut Module) -> Result<()> {
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
     let mut used_as_error = IndexSet::<String>::default();
-    module.try_visit(|callable: &Callable| {
+    namespace.try_visit(|callable: &Callable| {
         if let Some(ty) = &callable.throws_type.ty {
             let type_name = match ty.ty.name() {
                 Some(name) => name.to_string(),
@@ -27,13 +27,13 @@ pub fn pass(module: &mut Module) -> Result<()> {
     // used as errors in the interface.  See the `FlatInner` error from the `error-types` fixture
     // for an example.  It's not totally clear that this is correct, but this is how things have
     // historically worked.
-    module.visit(|en: &Enum| {
+    namespace.visit(|en: &Enum| {
         if matches!(en.shape, EnumShape::Error { .. }) {
             used_as_error.insert(en.name.clone());
         }
     });
 
-    module.visit_mut(|type_node: &mut TypeNode| {
+    namespace.visit_mut(|type_node: &mut TypeNode| {
         if let Some(name) = type_node.ty.name() {
             type_node.is_used_as_error = used_as_error.contains(name);
         }
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/general/uniffi_traits.rs b/third_party/rust/uniffi_bindgen/src/pipeline/general/uniffi_traits.rs
new file mode 100644
index 0000000000000..bad710df39660
--- /dev/null
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/general/uniffi_traits.rs
@@ -0,0 +1,35 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+//! Removes uniffi_traits from nodes, moving them to uniffi_trait_methods.
+
+use super::*;
+
+pub fn pass(namespace: &mut Namespace) -> Result<()> {
+    namespace.visit_mut(|i: &mut Interface| {
+        consume_from(&mut i.uniffi_trait_methods, &mut i.uniffi_traits);
+    });
+    namespace.visit_mut(|e: &mut Enum| {
+        consume_from(&mut e.uniffi_trait_methods, &mut e.uniffi_traits);
+    });
+    namespace.visit_mut(|rec: &mut Record| {
+        consume_from(&mut rec.uniffi_trait_methods, &mut rec.uniffi_traits);
+    });
+    Ok(())
+}
+
+fn consume_from(dest: &mut UniffiTraitMethods, uniffi_traits: &mut Vec<UniffiTrait>) {
+    for t in uniffi_traits.drain(..) {
+        match t {
+            UniffiTrait::Debug { fmt } => dest.debug_fmt = Some(fmt),
+            UniffiTrait::Display { fmt } => dest.display_fmt = Some(fmt),
+            UniffiTrait::Eq { eq, ne } => {
+                dest.eq_eq = Some(eq);
+                dest.eq_ne = Some(ne);
+            }
+            UniffiTrait::Hash { hash } => dest.hash_hash = Some(hash),
+            UniffiTrait::Ord { cmp } => dest.ord_cmp = Some(cmp),
+        }
+    }
+}
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/initial/from_uniffi_meta.rs b/third_party/rust/uniffi_bindgen/src/pipeline/initial/from_uniffi_meta.rs
index 44cb64f147334..1f60acd56f083 100644
--- a/third_party/rust/uniffi_bindgen/src/pipeline/initial/from_uniffi_meta.rs
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/initial/from_uniffi_meta.rs
@@ -4,9 +4,8 @@
 
 //! Organize the metadata, transforming it from a simple list to a more tree-like structure.
 
-use anyhow::{anyhow, bail, Context, Result};
-use camino::Utf8Path;
-use std::{collections::BTreeMap, fs};
+use anyhow::{anyhow, bail, Result};
+use std::collections::{btree_map::Entry, BTreeMap};
 
 use super::nodes::*;
 use uniffi_pipeline::Node;
@@ -18,19 +17,17 @@ use uniffi_pipeline::Node;
 /// * Call [Self::try_into_initial_ir] to construct a `initial::Root` node.
 #[derive(Default)]
 pub struct UniffiMetaConverter {
-    // Map module_path to `Module::name`
-    //
-    // This is needed because UDL and proc-macro code can generate different module paths.  To
-    // normalize things, we find the `NamespaceMetadata::name` that matches the module path.
-    //
-    // Use BTreeMap for each of these so that things stay consistent, regardless of how the
-    // metadata is ordered.
+    // Use BTreeMap for each of these so that things stay consistent, regardless of how the metadata is ordered.
+    // There are 2 important names here we must not mix up. The namespace name and the rust crate name.
+    // Our metadata usually carries "module_path" reflecting the crate name.
+    // This maps module_paths to namespace names.
     module_path_map: BTreeMap<String, String>,
+    // Everything below here keyed by namespace name, not the module_path.
     // Top level modules
-    modules: BTreeMap<String, Module>,
+    namespaces: BTreeMap<String, Namespace>,
     // Top-level type definitions and functions, keyed by module name
     module_docstrings: BTreeMap<String, String>,
-    module_toml: BTreeMap<String, String>,
+    module_toml: BTreeMap<String, toml::Table>,
     functions: BTreeMap<String, BTreeMap<String, Function>>,
     records: BTreeMap<String, BTreeMap<String, Record>>,
     callback_interfaces: BTreeMap<String, BTreeMap<String, CallbackInterface>>,
@@ -42,7 +39,36 @@ pub struct UniffiMetaConverter {
     methods: BTreeMap<(String, String), BTreeMap<String, Method>>,
     trait_methods: BTreeMap<(String, String), BTreeMap<String, TraitMethod>>,
     uniffi_traits: BTreeMap<(String, String), BTreeMap<String, UniffiTrait>>,
-    trait_impls: BTreeMap<(String, String), BTreeMap<String, ObjectTraitImpl>>,
+    trait_impls: BTreeMap<(String, String), BTreeMap<uniffi_meta::Type, ObjectTraitImpl>>,
+}
+
+/// Utility trait used to insert metadata items into a BTreeMap, but bail on duplicates
+trait InsertUnique<K, V> {
+    fn insert_unique(&mut self, k: K, v: V) -> Result<()>;
+}
+
+impl<K, V> InsertUnique<K, V> for BTreeMap<K, V>
+where
+    K: std::fmt::Debug + Ord,
+    V: std::fmt::Debug + PartialEq,
+{
+    fn insert_unique(&mut self, k: K, v: V) -> Result<()> {
+        match self.entry(k) {
+            Entry::Vacant(e) => {
+                e.insert(v);
+                Ok(())
+            }
+            Entry::Occupied(e) => {
+                if e.get() != &v {
+                    bail!(
+                        "Conflicting metadata types:\nold: {:?}\nnew: {v:?}",
+                        e.get()
+                    );
+                }
+                Ok(())
+            }
+        }
+    }
 }
 
 impl UniffiMetaConverter {
@@ -50,82 +76,83 @@ impl UniffiMetaConverter {
     pub fn add_metadata_item(&mut self, meta: uniffi_meta::Metadata) -> Result<()> {
         match meta {
             uniffi_meta::Metadata::Namespace(namespace) => {
-                // Map both the crate name and module name to the module name.  This simplifies the
-                // code in `get_module`
                 self.module_path_map
                     .insert(namespace.crate_name.clone(), namespace.name.clone());
-                self.module_path_map
-                    .insert(namespace.name.clone(), namespace.name.clone());
                 // Insert a new module
-                self.modules
-                    .entry(namespace.name.clone())
-                    .or_insert(Module {
-                        // TODO: Is this the correct crate name in all cases?  I'm pretty sure
-                        // it is for proc-macro based generation, since the proc-macro
-                        // namespace is added to the metadata list before the UDL one.
-                        // However, I'm not so sure what happens if we're generating from a UDL
-                        // file.
+                self.namespaces.insert_unique(
+                    namespace.name.clone(),
+                    Namespace {
                         crate_name: namespace.crate_name,
                         docstring: None,
                         config_toml: None,
                         name: namespace.name,
                         functions: vec![],
                         type_definitions: vec![],
-                    });
+                    },
+                )?;
             }
             uniffi_meta::Metadata::Func(func) => {
                 self.functions
-                    .entry(func.module_path.clone())
+                    .entry(module_path_to_namespace(&func.module_path))
                     .or_default()
-                    .insert(func.name.clone(), Function::try_from_node(func)?);
+                    .insert_unique(func.name.clone(), Function::try_from_node(func)?)?;
             }
             uniffi_meta::Metadata::Record(rec) => {
                 self.records
-                    .entry(rec.module_path.clone())
+                    .entry(module_path_to_namespace(&rec.module_path))
                     .or_default()
-                    .insert(rec.name.clone(), Record::try_from_node(rec)?);
+                    .insert_unique(rec.name.clone(), Record::try_from_node(rec)?)?;
             }
             uniffi_meta::Metadata::Enum(en) => {
                 self.enums
-                    .entry(en.module_path.clone())
+                    .entry(module_path_to_namespace(&en.module_path))
                     .or_default()
-                    .insert(en.name.clone(), Enum::try_from_node(en)?);
+                    .insert_unique(en.name.clone(), Enum::try_from_node(en)?)?;
             }
             uniffi_meta::Metadata::Object(int) => {
                 self.interfaces
-                    .entry(int.module_path.clone())
+                    .entry(module_path_to_namespace(&int.module_path))
                     .or_default()
-                    .insert(int.name.clone(), Interface::try_from_node(int)?);
+                    .insert_unique(int.name.clone(), Interface::try_from_node(int)?)?;
             }
             uniffi_meta::Metadata::CallbackInterface(cbi) => {
                 self.callback_interfaces
-                    .entry(cbi.module_path.clone())
+                    .entry(module_path_to_namespace(&cbi.module_path))
                     .or_default()
-                    .insert(cbi.name.clone(), CallbackInterface::try_from_node(cbi)?);
+                    .insert_unique(cbi.name.clone(), CallbackInterface::try_from_node(cbi)?)?;
             }
             uniffi_meta::Metadata::CustomType(custom) => {
                 self.custom_types
-                    .entry(custom.module_path.clone())
+                    .entry(module_path_to_namespace(&custom.module_path))
                     .or_default()
-                    .insert(custom.name.clone(), CustomType::try_from_node(custom)?);
+                    .insert_unique(custom.name.clone(), CustomType::try_from_node(custom)?)?;
             }
             uniffi_meta::Metadata::Constructor(cons) => {
                 self.constructors
-                    .entry((cons.module_path.clone(), cons.self_name.clone()))
+                    .entry((
+                        module_path_to_namespace(&cons.module_path),
+                        cons.self_name.to_string(),
+                    ))
                     .or_default()
-                    .insert(cons.name.clone(), Constructor::try_from_node(cons)?);
+                    .insert_unique(cons.name.clone(), Constructor::try_from_node(cons)?)?;
             }
             uniffi_meta::Metadata::Method(meth) => {
                 self.methods
-                    .entry((meth.module_path.clone(), meth.self_name.clone()))
+                    .entry((
+                        module_path_to_namespace(&meth.module_path),
+                        meth.self_name.to_string(),
+                    ))
                     .or_default()
-                    .insert(meth.name.clone(), Method::try_from_node(meth)?);
+                    .insert_unique(meth.name.clone(), Method::try_from_node(meth)?)?;
             }
             uniffi_meta::Metadata::TraitMethod(meth) => {
                 self.trait_methods
-                    .entry((meth.module_path.clone(), meth.trait_name.clone()))
+                    .entry((
+                        module_path_to_namespace(&meth.module_path),
+                        meth.trait_name.to_string(),
+                    ))
                     .or_default()
-                    .insert(meth.name.clone(), TraitMethod::try_from_node(meth)?);
+                    .insert_unique(meth.name.clone(), TraitMethod::try_from_node(meth)?)?;
             }
             uniffi_meta::Metadata::UniffiTrait(ut) => {
                 let meth = match &ut {
@@ -133,12 +160,16 @@ impl UniffiMetaConverter {
                     uniffi_meta::UniffiTraitMetadata::Display { fmt } => fmt,
                     uniffi_meta::UniffiTraitMetadata::Eq { eq, .. } => eq,
                     uniffi_meta::UniffiTraitMetadata::Hash { hash } => hash,
+                    uniffi_meta::UniffiTraitMetadata::Ord { cmp } => cmp,
                 };
 
                 self.uniffi_traits
-                    .entry((meth.module_path.clone(), meth.self_name.clone()))
+                    .entry((
+                        module_path_to_namespace(&meth.module_path),
+                        meth.self_name.to_string(),
+                    ))
                     .or_default()
-                    .insert(ut.name().clone(), UniffiTrait::try_from_node(ut)?);
+                    .insert_unique(ut.name().to_string(), UniffiTrait::try_from_node(ut)?)?;
             }
             uniffi_meta::Metadata::ObjectTraitImpl(imp) => {
                 let (module_path, name) = match &imp.ty {
@@ -160,34 +191,21 @@ impl UniffiMetaConverter {
                     _ => bail!("Invalid ObjectTraitImpl type: {:?}", imp.ty),
                 };
                 self.trait_impls
-                    .entry((module_path.to_string(), name.to_string()))
+                    .entry((module_path_to_namespace(module_path), name.to_string()))
                     .or_default()
-                    .insert(
-                        imp.trait_name.clone(),
-                        ObjectTraitImpl {
-                            tr_module_name: match &imp.tr_module_path {
-                                None => None,
-                                Some(module_path) => Some(
-                                    get_module_name(&self.module_path_map, module_path)?
-                                        .to_string(),
-                                ),
-                            },
-                            ..ObjectTraitImpl::try_from_node(imp)?
-                        },
-                    );
+                    .insert_unique(imp.trait_ty.clone(), ObjectTraitImpl::try_from_node(imp)?)?;
             }
             uniffi_meta::Metadata::UdlFile(_) => (),
         }
         Ok(())
     }
 
-    pub fn add_module_config_toml(&mut self, module_name: String, path: &Utf8Path) -> Result<()> {
-        if !path.exists() {
-            return Ok(());
-        }
-        let contents =
-            fs::read_to_string(path).with_context(|| format!("read file: {:?}", path))?;
-        self.module_toml.insert(module_name, contents);
+    pub fn add_module_config_toml(
+        &mut self,
+        module_name: String,
+        table: toml::Table,
+    ) -> Result<()> {
+        self.module_toml.insert_unique(module_name, table)?;
         Ok(())
     }
 
@@ -195,46 +213,88 @@ impl UniffiMetaConverter {
     ///
     /// This is currently UDL-specific.  Eventually, we should probably make this another metadata
     /// items
-    pub fn add_module_docstring(&mut self, module_name: String, docstring: String) {
-        self.module_docstrings.insert(module_name, docstring);
+    pub fn add_module_docstring(&mut self, namespace: String, docstring: String) -> Result<()> {
+        self.module_docstrings.insert_unique(namespace, docstring)
     }
 
     pub fn try_into_initial_ir(mut self) -> Result<Root> {
         let mut root = Root {
-            modules: self.modules.into_iter().collect(),
+            namespaces: self.namespaces.into_iter().collect(),
             cdylib: None,
         };
 
         // Move child items into their parents
-        for (module_path, docstring) in self.module_docstrings {
-            get_module(&self.module_path_map, &mut root, &module_path)?.docstring = Some(docstring);
+        for (namespace_name, docstring) in self.module_docstrings {
+            // already the namespace name, so no need to convert.
+            let namespace = root.namespaces.get_mut(&namespace_name).ok_or_else(|| {
+                anyhow!("namespace specified in toml doesn't exist: {namespace_name:?}")
+            })?;
+            namespace.docstring = Some(docstring);
         }
-        for (module_path, toml) in self.module_toml {
-            get_module(&self.module_path_map, &mut root, &module_path)?.config_toml = Some(toml);
+        for (namespace_name, table) in self.module_toml {
+            // already the namespace name, so no need to convert.
+            // we should maybe ignore an error here?
+            let namespace = root.namespaces.get_mut(&namespace_name).ok_or_else(|| {
+                anyhow!("namespace specified in toml doesn't exist: {namespace_name:?}")
+            })?;
+            // ideally `namespace.config_toml` would be a `toml::Table`, but all members must implement `Node`.
+            namespace.config_toml = Some(toml::to_string(&table)?);
         }
         for (module_path, funcs) in self.functions {
-            get_module(&self.module_path_map, &mut root, &module_path)?
+            get_namespace(&self.module_path_map, &mut root, &module_path)?
                 .functions
                 .extend(funcs.into_values());
         }
         for (module_path, list) in self.records {
-            get_module(&self.module_path_map, &mut root, &module_path)?
+            get_namespace(&self.module_path_map, &mut root, &module_path)?
                 .type_definitions
-                .extend(list.into_values().map(TypeDefinition::Record));
+                .extend(
+                    list.into_values()
+                        .map(|mut r| {
+                            let key = (module_path.clone(), r.name.clone());
+                            if let Some(methods) = self.methods.remove(&key) {
+                                r.methods.extend(methods.into_values());
+                            }
+                            if let Some(constructors) = self.constructors.remove(&key) {
+                                r.constructors.extend(constructors.into_values())
+                            }
+                            if let Some(uniffi_traits) = self.uniffi_traits.remove(&key) {
+                                r.uniffi_traits.extend(uniffi_traits.into_values())
+                            }
+                            Ok(TypeDefinition::Record(r))
+                        })
+                        .collect::<Result<Vec<_>>>()?,
+                )
         }
         for (module_path, list) in self.enums {
-            get_module(&self.module_path_map, &mut root, &module_path)?
+            get_namespace(&self.module_path_map, &mut root, &module_path)?
                 .type_definitions
-                .extend(list.into_values().map(TypeDefinition::Enum));
+                .extend(
+                    list.into_values()
+                        .map(|mut e| {
+                            let key = (module_path.clone(), e.name.clone());
+                            if let Some(methods) = self.methods.remove(&key) {
+                                e.methods.extend(methods.into_values());
+                            }
+                            if let Some(constructors) = self.constructors.remove(&key) {
+                                e.constructors.extend(constructors.into_values())
+                            }
+                            if let Some(uniffi_traits) = self.uniffi_traits.remove(&key) {
+                                e.uniffi_traits.extend(uniffi_traits.into_values())
+                            }
+                            Ok(TypeDefinition::Enum(e))
+                        })
+                        .collect::<Result<Vec<_>>>()?,
+                )
         }
         for (module_path, list) in self.custom_types {
-            get_module(&self.module_path_map, &mut root, &module_path)?
+            get_namespace(&self.module_path_map, &mut root, &module_path)?
                 .type_definitions
                 .extend(list.into_values().map(TypeDefinition::Custom));
         }
         // Collect child items for interfaces and callback interfaces
         for (module_path, list) in self.interfaces {
-            get_module(&self.module_path_map, &mut root, &module_path)?
+            get_namespace(&self.module_path_map, &mut root, &module_path)?
                 .type_definitions
                 .extend(
                     list.into_values()
@@ -267,7 +327,7 @@ impl UniffiMetaConverter {
                 )
         }
         for (module_path, list) in self.callback_interfaces {
-            get_module(&self.module_path_map, &mut root, &module_path)?
+            get_namespace(&self.module_path_map, &mut root, &module_path)?
                 .type_definitions
                 .extend(list.into_values().map(|mut cbi| {
                     let key = (module_path.clone(), cbi.name.clone());
@@ -294,14 +354,34 @@ impl UniffiMetaConverter {
         if !self.trait_impls.is_empty() {
             bail!("Leftover trait_impls: {:?}", self.trait_impls)
         }
-        // normalize type module names
+        // set the namespace names
         root.try_visit_mut(|ty: &mut Type| match ty {
-            Type::Interface { module_name, .. }
-            | Type::Record { module_name, .. }
-            | Type::Enum { module_name, .. }
-            | Type::CallbackInterface { module_name, .. }
-            | Type::Custom { module_name, .. } => {
-                *module_name = get_module_name(&self.module_path_map, module_name)?.to_string();
+            Type::Interface {
+                module_path,
+                namespace,
+                ..
+            }
+            | Type::Record {
+                module_path,
+                namespace,
+                ..
+            }
+            | Type::Enum {
+                module_path,
+                namespace,
+                ..
+            }
+            | Type::CallbackInterface {
+                module_path,
+                namespace,
+                ..
+            }
+            | Type::Custom {
+                module_path,
+                namespace,
+                ..
+            } => {
+                *namespace = get_namespace_name(&self.module_path_map, module_path)?.to_string();
                 Ok(())
             }
             _ => Ok(()),
@@ -327,23 +407,28 @@ impl UniffiMetaConverter {
     }
 }
 
-fn get_module_name<'a>(
+fn module_path_to_namespace(module_path: &str) -> String {
+    module_path.split("::").next().unwrap().to_string()
+}
+
+fn get_namespace_name<'a>(
     module_path_map: &'a BTreeMap<String, String>,
     module_path: &str,
 ) -> Result<&'a str> {
+    let crate_name = module_path.split("::").next().unwrap();
     module_path_map
-        .get(module_path)
+        .get(crate_name)
         .map(String::as_str)
         .ok_or_else(|| anyhow!("module lookup failed: {module_path:?}"))
 }
 
-fn get_module<'a>(
+fn get_namespace<'a>(
     module_path_map: &BTreeMap<String, String>,
     root: &'a mut Root,
     module_path: &str,
-) -> Result<&'a mut Module> {
-    let module_name = get_module_name(module_path_map, module_path)?;
-    root.modules
-        .get_mut(module_name)
+) -> Result<&'a mut Namespace> {
+    let name = get_namespace_name(module_path_map, module_path)?;
+    root.namespaces
+        .get_mut(name)
         .ok_or_else(|| anyhow!("root module lookup failed: {module_path:?}"))
 }
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/initial/mod.rs b/third_party/rust/uniffi_bindgen/src/pipeline/initial/mod.rs
index 24e1ded62f3fa..59f6a029c5300 100644
--- a/third_party/rust/uniffi_bindgen/src/pipeline/initial/mod.rs
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/initial/mod.rs
@@ -2,6 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+//! Initial IR, this is the Metadata from uniffi_meta with some slight changes:
+//!
+//! * The Type/Literal enums are wrapped in TypeNode/LiteralNode structs. This allows for future pipeline passes to add fields.
+//! * Metadata is normalized and grouped from a Rust module_path/crate_namse into namespace modules.
+
 use std::fs;
 
 mod from_uniffi_meta;
@@ -11,12 +16,12 @@ pub use nodes::*;
 use anyhow::Result;
 use camino::Utf8Path;
 
-use crate::{crate_name_from_cargo_toml, interface, macro_metadata, BindgenCrateConfigSupplier};
-use from_uniffi_meta::UniffiMetaConverter;
+use crate::{crate_name_from_cargo_toml, interface, macro_metadata, BindgenPaths};
+pub use from_uniffi_meta::UniffiMetaConverter;
 
 impl Root {
     pub fn from_library(
-        config_supplier: impl BindgenCrateConfigSupplier,
+        bindgen_paths: BindgenPaths,
         path: &Utf8Path,
         crate_name: Option<String>,
     ) -> Result<Root> {
@@ -28,17 +33,18 @@ impl Root {
 
         let mut udl_to_load = vec![];
 
-        for meta in macro_metadata::extract_from_library(path)? {
+        for meta in all_metadata {
             match meta {
                 uniffi_meta::Metadata::UdlFile(udl) => {
                     udl_to_load.push((
-                        config_supplier.get_udl(&udl.module_path, &udl.file_stub)?,
+                        bindgen_paths.get_udl(&udl.module_path, &udl.file_stub)?,
                         udl.module_path,
                     ));
                 }
                 uniffi_meta::Metadata::Namespace(namespace) => {
-                    if let Some(path) = config_supplier.get_toml_path(&namespace.crate_name) {
-                        metadata_converter.add_module_config_toml(namespace.name.clone(), &path)?;
+                    let table = bindgen_paths.get_config(&namespace.crate_name)?;
+                    if !table.is_empty() {
+                        metadata_converter.add_module_config_toml(namespace.name.clone(), table)?;
                     }
                     metadata_converter
                         .add_metadata_item(uniffi_meta::Metadata::Namespace(namespace))?;
@@ -50,7 +56,7 @@ impl Root {
         for (udl, module_path) in udl_to_load {
             Self::add_metadata_from_udl(
                 &mut metadata_converter,
-                &config_supplier,
+                &bindgen_paths,
                 &udl,
                 &module_path,
                 true,
@@ -62,7 +68,7 @@ impl Root {
     }
 
     pub fn from_udl(
-        config_supplier: impl BindgenCrateConfigSupplier,
+        bindgen_paths: BindgenPaths,
         path: &Utf8Path,
         crate_name: Option<String>,
     ) -> Result<Root> {
@@ -73,7 +79,7 @@ impl Root {
         };
         Self::add_metadata_from_udl(
             &mut metadata_converter,
-            &config_supplier,
+            &bindgen_paths,
             &fs::read_to_string(path)?,
             &crate_name,
             false,
@@ -83,7 +89,7 @@ impl Root {
 
     fn add_metadata_from_udl(
         metadata_converter: &mut UniffiMetaConverter,
-        config_supplier: &impl BindgenCrateConfigSupplier,
+        bindgen_paths: &BindgenPaths,
         udl: &str,
         crate_name: &str,
         library_mode: bool,
@@ -93,24 +99,18 @@ impl Root {
         // start with a raw metadata list
         if let Some(docstring) = metadata_group.namespace_docstring {
             metadata_converter
-                .add_module_docstring(metadata_group.namespace.name.clone(), docstring);
+                .add_module_docstring(metadata_group.namespace.name.clone(), docstring)?;
         }
         if !library_mode {
-            if let Some(path) = config_supplier.get_toml_path(&metadata_group.namespace.crate_name)
-            {
+            let table = bindgen_paths.get_config(&metadata_group.namespace.crate_name)?;
+            if !table.is_empty() {
                 metadata_converter
-                    .add_module_config_toml(metadata_group.namespace.name.clone(), &path)?;
+                    .add_module_config_toml(metadata_group.namespace.name.clone(), table)?;
             }
         }
         metadata_converter
             .add_metadata_item(uniffi_meta::Metadata::Namespace(metadata_group.namespace))?;
         for mut meta in metadata_group.items {
-            // some items are both in UDL and library metadata. For many that's fine but
-            // uniffi-traits aren't trivial to compare meaning we end up with dupes.
-            // We filter out such problematic items here.
-            if library_mode && matches!(meta, uniffi_meta::Metadata::UniffiTrait { .. }) {
-                continue;
-            }
             // Make sure metadata checksums are set
             match &mut meta {
                 uniffi_meta::Metadata::Func(func) => {
@@ -119,9 +119,11 @@ impl Root {
                     )));
                 }
                 uniffi_meta::Metadata::Method(meth) => {
-                    meth.checksum = Some(uniffi_meta::checksum(&interface::Method::from(
-                        meth.clone(),
-                    )));
+                    // making a method is mildly tricky as we need a type for self.
+                    // for the purposes of a checksum we ignore self info from udl.
+                    let method_object =
+                        interface::Method::from_metadata(meth.clone(), uniffi_meta::Type::UInt8);
+                    meth.checksum = Some(uniffi_meta::checksum(&method_object));
                 }
                 uniffi_meta::Metadata::Constructor(cons) => {
                     cons.checksum = Some(uniffi_meta::checksum(&interface::Constructor::from(
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/initial/nodes.rs b/third_party/rust/uniffi_bindgen/src/pipeline/initial/nodes.rs
index 72f240b70b038..1ebcbceaeed36 100644
--- a/third_party/rust/uniffi_bindgen/src/pipeline/initial/nodes.rs
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/initial/nodes.rs
@@ -6,15 +6,15 @@ use indexmap::IndexMap;
 use uniffi_pipeline::Node;
 
 /// Root node of the Initial IR
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 pub struct Root {
-    pub modules: IndexMap<String, Module>,
+    pub namespaces: IndexMap<String, Namespace>,
     /// The library path the user passed to us, if we're in library mode
     pub cdylib: Option<String>,
 }
 
-#[derive(Debug, Clone, Node)]
-pub struct Module {
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
+pub struct Namespace {
     pub name: String,
     pub crate_name: String,
     /// contents of the `uniffi.toml` file for this module, if present
@@ -24,7 +24,7 @@ pub struct Module {
     pub type_definitions: Vec<TypeDefinition>,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 #[node(from(FnMetadata))]
 pub struct Function {
     pub name: String,
@@ -36,7 +36,7 @@ pub struct Function {
     pub docstring: Option<String>,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 pub enum TypeDefinition {
     Interface(Interface),
     CallbackInterface(CallbackInterface),
@@ -45,7 +45,7 @@ pub enum TypeDefinition {
     Custom(CustomType),
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 #[node(from(ConstructorMetadata))]
 pub struct Constructor {
     pub name: String,
@@ -56,7 +56,7 @@ pub struct Constructor {
     pub docstring: Option<String>,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 #[node(from(MethodMetadata))]
 pub struct Method {
     pub name: String,
@@ -68,7 +68,7 @@ pub struct Method {
     pub docstring: Option<String>,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 #[node(from(TraitMethodMetadata))]
 pub struct TraitMethod {
     pub trait_name: String,
@@ -84,16 +84,23 @@ pub struct TraitMethod {
     pub docstring: Option<String>,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 #[node(from(FnParamMetadata))]
 pub struct Argument {
     pub name: String,
     pub ty: Type,
     pub optional: bool,
-    pub default: Option<Literal>,
+    pub default: Option<DefaultValue>,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
+#[node(from(DefaultValueMetadata))]
+pub enum DefaultValue {
+    Default,
+    Literal(Literal),
+}
+
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 #[node(from(LiteralMetadata))]
 pub enum Literal {
     Boolean(bool),
@@ -112,52 +119,58 @@ pub enum Literal {
     EmptySequence,
     EmptyMap,
     None,
-    Some { inner: Box<Literal> },
+    Some { inner: Box<DefaultValue> },
 }
 
 // Represent the radix of integer literal values.
 // We preserve the radix into the generated bindings for readability reasons.
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 pub enum Radix {
     Decimal = 10,
     Octal = 8,
     Hexadecimal = 16,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 #[node(from(RecordMetadata))]
 pub struct Record {
     pub name: String,
     pub fields: Vec<Field>,
+    pub constructors: Vec<Constructor>,
+    pub methods: Vec<Method>,
+    pub uniffi_traits: Vec<UniffiTrait>,
     pub docstring: Option<String>,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 #[node(from(FieldMetadata))]
 pub struct Field {
     pub name: String,
     pub ty: Type,
-    pub default: Option<Literal>,
+    pub default: Option<DefaultValue>,
     pub docstring: Option<String>,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 pub enum EnumShape {
     Enum,
     Error { flat: bool },
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 #[node(from(EnumMetadata))]
 pub struct Enum {
     pub name: String,
     pub shape: EnumShape,
     pub variants: Vec<Variant>,
     pub discr_type: Option<Type>,
+    pub constructors: Vec<Constructor>,
+    pub methods: Vec<Method>,
+    pub uniffi_traits: Vec<UniffiTrait>,
     pub docstring: Option<String>,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 #[node(from(VariantMetadata))]
 pub struct Variant {
     pub name: String,
@@ -166,7 +179,7 @@ pub struct Variant {
     pub docstring: Option<String>,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 #[node(from(ObjectMetadata))]
 pub struct Interface {
     pub name: String,
@@ -178,7 +191,7 @@ pub struct Interface {
     pub imp: ObjectImpl,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 #[node(from(CallbackInterfaceMetadata))]
 pub struct CallbackInterface {
     pub name: String,
@@ -186,24 +199,25 @@ pub struct CallbackInterface {
     pub methods: Vec<Method>,
 }
 
-#[derive(Debug, Clone, Node)]
+#[allow(clippy::large_enum_variant)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 #[node(from(UniffiTraitMetadata))]
 pub enum UniffiTrait {
     Debug { fmt: Method },
     Display { fmt: Method },
     Eq { eq: Method, ne: Method },
     Hash { hash: Method },
+    Ord { cmp: Method },
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 #[node(from(ObjectTraitImplMetadata))]
 pub struct ObjectTraitImpl {
     pub ty: Type,
-    pub trait_name: String,
-    pub tr_module_name: Option<String>,
+    pub trait_ty: Type,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 #[node(from(CustomTypeMetadata))]
 pub struct CustomType {
     pub name: String,
@@ -211,7 +225,7 @@ pub struct CustomType {
     pub docstring: Option<String>,
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 pub enum Type {
     // Primitive types.
     UInt8,
@@ -243,37 +257,35 @@ pub enum Type {
     // User defined types in the API
     #[node(from(Object))]
     Interface {
-        // Name of the module this is defined in.
-        // Taken from `module_path` and normalized
-        #[node(from(module_path))]
-        module_name: String,
+        module_path: String, // from the metadata
+        namespace: String,   // we'll fix this up.
         name: String,
         imp: ObjectImpl,
     },
     Record {
-        #[node(from(module_path))]
-        module_name: String,
+        module_path: String,
+        namespace: String,
         name: String,
     },
     Enum {
-        #[node(from(module_path))]
-        module_name: String,
+        module_path: String,
+        namespace: String,
         name: String,
     },
     CallbackInterface {
-        #[node(from(module_path))]
-        module_name: String,
+        module_path: String,
+        namespace: String,
         name: String,
     },
     Custom {
-        #[node(from(module_path))]
-        module_name: String,
+        module_path: String,
+        namespace: String,
         name: String,
         builtin: Box<Type>,
     },
 }
 
-#[derive(Debug, Clone, Node)]
+#[derive(Debug, Clone, Node, PartialEq, Eq)]
 pub enum ObjectImpl {
     // A single Rust type
     Struct,
diff --git a/third_party/rust/uniffi_bindgen/src/pipeline/mod.rs b/third_party/rust/uniffi_bindgen/src/pipeline/mod.rs
index efb999249b18e..0aa21dbde7400 100644
--- a/third_party/rust/uniffi_bindgen/src/pipeline/mod.rs
+++ b/third_party/rust/uniffi_bindgen/src/pipeline/mod.rs
@@ -5,5 +5,5 @@
 pub mod general;
 pub mod initial;
 
-pub use uniffi_internal_macros::{AsRef, Node};
+pub use uniffi_internal_macros::Node;
 pub use uniffi_pipeline::Pipeline;
diff --git a/third_party/rust/uniffi_bindgen/src/scaffolding/mod.rs b/third_party/rust/uniffi_bindgen/src/scaffolding/mod.rs
index 78b5410ad2385..60eae1ba6e545 100644
--- a/third_party/rust/uniffi_bindgen/src/scaffolding/mod.rs
+++ b/third_party/rust/uniffi_bindgen/src/scaffolding/mod.rs
@@ -23,7 +23,7 @@ impl<'a> RustScaffolding<'a> {
 mod filters {
     use super::*;
 
-    pub fn type_rs(type_: &Type) -> Result<String, askama::Error> {
+    pub fn type_rs(type_: &Type, _values: &dyn askama::Values) -> Result<String, askama::Error> {
         Ok(match type_ {
             Type::Int8 => "i8".into(),
             Type::UInt8 => "u8".into(),
@@ -46,16 +46,18 @@ mod filters {
             }
             Type::CallbackInterface { name, .. } => format!("Box<dyn r#{name}>"),
             Type::Optional { inner_type } => {
-                format!("::std::option::Option<{}>", type_rs(inner_type)?)
+                format!("::std::option::Option<{}>", type_rs(inner_type, _values)?)
+            }
+            Type::Sequence { inner_type } => {
+                format!("std::vec::Vec<{}>", type_rs(inner_type, _values)?)
             }
-            Type::Sequence { inner_type } => format!("std::vec::Vec<{}>", type_rs(inner_type)?),
             Type::Map {
                 key_type,
                 value_type,
             } => format!(
                 "::std::collections::HashMap<{}, {}>",
-                type_rs(key_type)?,
-                type_rs(value_type)?
+                type_rs(key_type, _values)?,
+                type_rs(value_type, _values)?
             ),
             Type::Custom { name, .. } => format!("r#{name}"),
         })
diff --git a/third_party/rust/uniffi_bindgen/src/scaffolding/templates/EnumTemplate.rs b/third_party/rust/uniffi_bindgen/src/scaffolding/templates/EnumTemplate.rs
index b97d65698e6c0..7d04c4156cd59 100644
--- a/third_party/rust/uniffi_bindgen/src/scaffolding/templates/EnumTemplate.rs
+++ b/third_party/rust/uniffi_bindgen/src/scaffolding/templates/EnumTemplate.rs
@@ -2,6 +2,22 @@
 // Forward work to `uniffi_macros` This keeps macro-based and UDL-based generated code consistent.
 #}
 
+{%- let uniffi_trait_methods = e.uniffi_trait_methods() %}
+{%- if uniffi_trait_methods.debug_fmt.is_some() %}
+#[::uniffi::export_for_udl_derive(Debug)]
+{%- endif %}
+{%- if uniffi_trait_methods.debug_fmt.is_some() %}
+#[::uniffi::export_for_udl_derive(Display)]
+{%- endif %}
+{%- if uniffi_trait_methods.hash_hash.is_some() %}
+#[::uniffi::export_for_udl_derive(Hash)]
+{%- endif %}
+{%- if uniffi_trait_methods.ord_cmp.is_some() %}
+#[::uniffi::export_for_udl_derive(Ord)]
+{%- endif %}
+{%- if uniffi_trait_methods.eq_eq.is_some() %}
+#[::uniffi::export_for_udl_derive(Eq)]
+{%- endif %}
 {%- if e.remote() %}
 #[::uniffi::udl_remote(Enum)]
 {%- else %}
diff --git a/third_party/rust/uniffi_bindgen/src/scaffolding/templates/ObjectTemplate.rs b/third_party/rust/uniffi_bindgen/src/scaffolding/templates/ObjectTemplate.rs
index 9c99c74dd1051..1f023c5ae7df9 100644
--- a/third_party/rust/uniffi_bindgen/src/scaffolding/templates/ObjectTemplate.rs
+++ b/third_party/rust/uniffi_bindgen/src/scaffolding/templates/ObjectTemplate.rs
@@ -21,18 +21,22 @@ pub trait r#{{ obj.name() }} {
     {% endfor %}
 }
 {%- else %}
-{%- for tm in obj.uniffi_traits() %}
-{%      match tm %}
-{%          when UniffiTrait::Debug { fmt }%}
-#[uniffi::export(Debug)]
-{%          when UniffiTrait::Display { fmt }%}
-#[uniffi::export(Display)]
-{%          when UniffiTrait::Hash { hash }%}
-#[uniffi::export(Hash)]
-{%          when UniffiTrait::Eq { eq, ne }%}
-#[uniffi::export(Eq)]
-{%      endmatch %}
-{% endfor %}
+{%- let uniffi_trait_methods = obj.uniffi_trait_methods() %}
+{%- if uniffi_trait_methods.debug_fmt.is_some() %}
+#[::uniffi::export_for_udl_derive(Debug)]
+{%- endif %}
+{%- if uniffi_trait_methods.display_fmt.is_some() %}
+#[::uniffi::export_for_udl_derive(Display)]
+{%- endif %}
+{%- if uniffi_trait_methods.hash_hash.is_some() %}
+#[::uniffi::export_for_udl_derive(Hash)]
+{%- endif %}
+{%- if uniffi_trait_methods.ord_cmp.is_some() %}
+#[::uniffi::export_for_udl_derive(Ord)]
+{%- endif %}
+{%- if uniffi_trait_methods.eq_eq.is_some() %}
+#[::uniffi::export_for_udl_derive(Eq)]
+{%- endif %}
 {%- if obj.remote() %}
 #[::uniffi::udl_remote(Object)]
 {%- else %}
diff --git a/third_party/rust/uniffi_bindgen/src/scaffolding/templates/RecordTemplate.rs b/third_party/rust/uniffi_bindgen/src/scaffolding/templates/RecordTemplate.rs
index 970d160a10712..26b2c7880e46e 100644
--- a/third_party/rust/uniffi_bindgen/src/scaffolding/templates/RecordTemplate.rs
+++ b/third_party/rust/uniffi_bindgen/src/scaffolding/templates/RecordTemplate.rs
@@ -2,6 +2,22 @@
 // Forward work to `uniffi_macros` This keeps macro-based and UDL-based generated code consistent.
 #}
 
+{%- let uniffi_trait_methods = rec.uniffi_trait_methods() %}
+{%- if uniffi_trait_methods.debug_fmt.is_some() %}
+#[::uniffi::export_for_udl_derive(Debug)]
+{%- endif %}
+{%- if uniffi_trait_methods.display_fmt.is_some() %}
+#[::uniffi::export_for_udl_derive(Display)]
+{%- endif %}
+{%- if uniffi_trait_methods.hash_hash.is_some() %}
+#[::uniffi::export_for_udl_derive(Hash)]
+{%- endif %}
+{%- if uniffi_trait_methods.ord_cmp.is_some() %}
+#[::uniffi::export_for_udl_derive(Ord)]
+{%- endif %}
+{%- if uniffi_trait_methods.eq_eq.is_some() %}
+#[::uniffi::export_for_udl_derive(Eq)]
+{%- endif %}
 {%- if rec.remote() %}
 #[::uniffi::udl_remote(Record)]
 {%- else %}
diff --git a/third_party/rust/uniffi_bindgen/src/scaffolding/templates/scaffolding_template.rs b/third_party/rust/uniffi_bindgen/src/scaffolding/templates/scaffolding_template.rs
index 46e16da6637cb..fe4b12bf5d17b 100644
--- a/third_party/rust/uniffi_bindgen/src/scaffolding/templates/scaffolding_template.rs
+++ b/third_party/rust/uniffi_bindgen/src/scaffolding/templates/scaffolding_template.rs
@@ -33,7 +33,7 @@ uniffi::deps::static_assertions::assert_impl_all!({{ k|type_rs }}: ::std::cmp::E
 // Top level functions, corresponding to UDL `namespace` functions.
 {%- for func in ci.function_definitions() %}
 {% include "TopLevelFunctionTemplate.rs" %}
-{% endfor -%}
+{% endfor %}
 
 // Object definitions, corresponding to UDL `interface` definitions.
 {% for obj in ci.object_definitions() %}
diff --git a/third_party/rust/uniffi_build/.cargo-checksum.json b/third_party/rust/uniffi_build/.cargo-checksum.json
index c5e30b0573bb4..3de8df9be6c86 100644
--- a/third_party/rust/uniffi_build/.cargo-checksum.json
+++ b/third_party/rust/uniffi_build/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"e816ce2cc7771e9b7676b695b01e0c8bb209df593611a7ee9ffb6c94a4210d8b","Cargo.lock":"41301907e87823e33a5e1ac8e32c1efe6a0e539c1494e1120904f52fb13587b2","Cargo.toml":"358cff02744d3b13314c2b664cf58cb3174d181d1fe7fe58a815af8b6ba2851a","Cargo.toml.orig":"e5bfb39b0bfdbb17219281415d5512d72adb5ff8ed67621ddd60242a72d9cfad","README.md":"a07b147b4a2f3305f3346ab8a223c287795498d89c0b4781bc93d5f5026b70bc","src/lib.rs":"ac17343ae98e1b7ae1df1819104909df86fd61c3f65a6d995d86b3dad1b83a98"},"package":"0d84d607076008df3c32dd2100ee4e727269f11d3faa35691af70d144598f666"}
\ No newline at end of file
+{"files":{".cargo_vcs_info.json":"71b920507ec17d41772230edffc60879fc94560bc74e732a9cfa933cbec44ba2","Cargo.lock":"e0065fe2c9acc604b19a9532a07828aa0d949ec1ccae65d58488603e12cae56a","Cargo.toml":"ae9f2fc45825d9b574db0ca2ce5aa711df082651696bfe2a85086c731f24d469","Cargo.toml.orig":"37c09bc9278ba94a30e3d43585fe5b8b48257b27f9a721302289ae0a2dbdfc63","README.md":"c48ebaa9337cbe23085b172e2100088b67ae3f3823e114dc532e9d67f5ff6133","src/lib.rs":"ac17343ae98e1b7ae1df1819104909df86fd61c3f65a6d995d86b3dad1b83a98"},"package":"b78fd9271a4c2e85bd2c266c5a9ede1fac676eb39fd77f636c27eaf67426fd5f"}
\ No newline at end of file
diff --git a/third_party/rust/uniffi_build/.cargo_vcs_info.json b/third_party/rust/uniffi_build/.cargo_vcs_info.json
index 231193aedd4af..81ad8c125e90c 100644
--- a/third_party/rust/uniffi_build/.cargo_vcs_info.json
+++ b/third_party/rust/uniffi_build/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "0eda2855d5b4be435013d5baef808d5f9caee0fd"
+    "sha1": "309762f55db3f0548194a9ceba3027fa64b18a93"
   },
   "path_in_vcs": "uniffi_build"
 }
\ No newline at end of file
diff --git a/third_party/rust/uniffi_build/Cargo.lock b/third_party/rust/uniffi_build/Cargo.lock
index c6ddc6e3f81b9..46a02c86790ab 100644
--- a/third_party/rust/uniffi_build/Cargo.lock
+++ b/third_party/rust/uniffi_build/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "askama"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a4e46abb203e00ef226442d452769233142bbfdd79c3941e84c8e61c4112543"
+checksum = "f75363874b771be265f4ffe307ca705ef6f3baa19011c149da8674a87f1b75c4"
 dependencies = [
  "askama_derive",
  "itoa",
@@ -23,9 +23,9 @@ dependencies = [
 
 [[package]]
 name = "askama_derive"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54398906821fd32c728135f7b351f0c7494ab95ae421d41b6f5a020e158f28a6"
+checksum = "129397200fe83088e8a68407a8e2b1f826cf0086b21ccdb866a722c8bcd3a94f"
 dependencies = [
  "askama_parser",
  "basic-toml",
@@ -40,9 +40,9 @@ dependencies = [
 
 [[package]]
 name = "askama_parser"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf315ce6524c857bb129ff794935cf6d42c82a6cff60526fe2a63593de4d0d4f"
+checksum = "d6ab5630b3d5eaf232620167977f95eb51f3432fc76852328774afbd242d4358"
 dependencies = [
  "memchr",
  "serde",
@@ -96,7 +96,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -148,6 +148,7 @@ checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
  "hashbrown",
+ "serde",
 ]
 
 [[package]]
@@ -198,9 +199,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "percent-encoding"
@@ -257,7 +258,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -318,11 +319,20 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "siphasher"
-version = "0.3.11"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "smawk"
@@ -365,13 +375,45 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.11"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
 dependencies = [
  "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
 ]
 
+[[package]]
+name = "toml_datetime"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_write",
+ "winnow",
+]
+
+[[package]]
+name = "toml_write"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.12"
@@ -380,9 +422,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "uniffi_bindgen"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ff0132b533483cf19abb30bba5c72c24d9f3e4d9a2ff71cb3e22e73899fd46e"
+checksum = "4ed0150801958d4825da56a41c71f000a457ac3a4613fa9647df78ac4b6b6881"
 dependencies = [
  "anyhow",
  "askama",
@@ -405,7 +447,7 @@ dependencies = [
 
 [[package]]
 name = "uniffi_build"
-version = "0.29.3"
+version = "0.31.0"
 dependencies = [
  "anyhow",
  "camino",
@@ -414,9 +456,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_internal_macros"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f64bec2f3a33f2f08df8150e67fa45ba59a2ca740bf20c1beb010d4d791f9a1b"
+checksum = "98f51ebca0d9a4b2aa6c644d5ede45c56f73906b96403c08a1985e75ccb64a01"
 dependencies = [
  "anyhow",
  "indexmap",
@@ -427,9 +469,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_meta"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d226fc167754ce548c5ece9828c8a06f03bf1eea525d2659ba6bd648bd8e2f3"
+checksum = "9df6d413db2827c68588f8149d30d49b71d540d46539e435b23a7f7dbd4d4f86"
 dependencies = [
  "anyhow",
  "siphasher",
@@ -439,9 +481,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_pipeline"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b925b6421df15cf4bedee27714022cd9626fb4d7eee0923522a608b274ba4371"
+checksum = "a806dddc8208f22efd7e95a5cdf88ed43d0f3271e8f63b47e757a8bbdb43b63a"
 dependencies = [
  "anyhow",
  "heck",
@@ -452,9 +494,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_udl"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c42649b721df759d9d4692a376b82b62ce3028ec9fc466f4780fb8cdf728996"
+checksum = "0d1a7339539bf6f6fa3e9b534dece13f778bda2d54b1a6d4e40b4d6090ac26e7"
 dependencies = [
  "anyhow",
  "textwrap",
@@ -482,9 +524,9 @@ dependencies = [
 
 [[package]]
 name = "windows-sys"
-version = "0.52.0"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
  "windows-targets 0.52.6",
 ]
@@ -612,9 +654,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.7.4"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
 dependencies = [
  "memchr",
 ]
diff --git a/third_party/rust/uniffi_build/Cargo.toml b/third_party/rust/uniffi_build/Cargo.toml
index 35abe6e636593..74681a0724628 100644
--- a/third_party/rust/uniffi_build/Cargo.toml
+++ b/third_party/rust/uniffi_build/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2021"
 name = "uniffi_build"
-version = "0.29.3"
+version = "0.31.0"
 build = false
 autolib = false
 autobins = false
@@ -48,5 +48,5 @@ version = "1"
 version = "1.0.8"
 
 [dependencies.uniffi_bindgen]
-version = "=0.29.3"
+version = "=0.31.0"
 default-features = false
diff --git a/third_party/rust/uniffi_build/Cargo.toml.orig b/third_party/rust/uniffi_build/Cargo.toml.orig
index 4fbd3992b5141..2d49eee00fd39 100644
--- a/third_party/rust/uniffi_build/Cargo.toml.orig
+++ b/third_party/rust/uniffi_build/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "uniffi_build"
-version = "0.29.3"
+version = "0.31.0"
 description = "a multi-language bindings generator for rust (build script helpers)"
 documentation = "https://mozilla.github.io/uniffi-rs"
 homepage = "https://mozilla.github.io/uniffi-rs"
@@ -13,7 +13,7 @@ readme = "../README.md"
 [dependencies]
 anyhow = "1"
 camino = "1.0.8"
-uniffi_bindgen = { path = "../uniffi_bindgen", default-features = false, version = "=0.29.3" }
+uniffi_bindgen = { path = "../uniffi_bindgen", default-features = false, version = "=0.31.0" }
 
 [features]
 default = []
diff --git a/third_party/rust/uniffi_build/README.md b/third_party/rust/uniffi_build/README.md
index 8ac2fa34bfd33..4450243be81aa 100644
--- a/third_party/rust/uniffi_build/README.md
+++ b/third_party/rust/uniffi_build/README.md
@@ -50,12 +50,13 @@ Other tools we know of which try and solve a similarly shaped problem are:
 
 ## Third-party foreign language bindings
 
-* [React Native bindings](https://github.com/jhugman/uniffi-bindgen-react-native). The repository contains tooling to generate bindings for [Hermes](https://github.com/facebook/hermes) and for [creating Turbo Modules](https://reactnative.dev/blog/2024/10/23/the-new-architecture-is-here#new-native-modules).
+* [Javascript bindings](https://github.com/jhugman/uniffi-bindgen-react-native): running in a web page, targeting WASM; and React Native targeting Android, iOS. The repository contains tooling to generate bindings for [Hermes](https://github.com/facebook/hermes), [creating Turbo Modules](https://reactnative.dev/blog/2024/10/23/the-new-architecture-is-here#new-native-modules), and for creating a [`wasm-bindgen` bindings crate](https://rustwasm.github.io/wasm-bindgen).
 * [Kotlin Multiplatform support (Gobley)](https://github.com/gobley/gobley). The repository contains Kotlin Multiplatform bindings generation for UniFFI, letting you target both JVM and Native.
 * [Go bindings](https://github.com/NordSecurity/uniffi-bindgen-go)
 * [C# bindings](https://github.com/NordSecurity/uniffi-bindgen-cs)
 * [Dart bindings](https://github.com/NiallBunting/uniffi-rs-dart)
 * [Java bindings](https://github.com/IronCoreLabs/uniffi-bindgen-java)
+* [Node bindings](https://github.com/livekit/uniffi-bindgen-node) (early development)
 
 ### External resources
 
diff --git a/third_party/rust/uniffi_core/.cargo-checksum.json b/third_party/rust/uniffi_core/.cargo-checksum.json
index 40bedd5b2c1ed..dbfe03ae180da 100644
--- a/third_party/rust/uniffi_core/.cargo-checksum.json
+++ b/third_party/rust/uniffi_core/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"b64d48137a9b154cd94b4bc425a9a7c17e25a4814102726c67b8672562a7a85b","Cargo.lock":"f94ecfae62bcf2a95d96b9c2a626c334620fb3efb5156ad3d9b5be1c0902ba3a","Cargo.toml":"36bd17830c2f47b4ebb0e6b5343d3b5cf9effaa86e75358c01eaff348a0a8e3f","Cargo.toml.orig":"06e0e0c2bb753163cdf1cc4dd4f618a9c7039b6bc8793d518fb6dc47b498a5c0","README.md":"a07b147b4a2f3305f3346ab8a223c287795498d89c0b4781bc93d5f5026b70bc","release.toml":"b150796411fc6ff90b481218cb50f8ac7c07f5845aebdb8e17877d47e55b05b9","src/ffi/callbackinterface.rs":"47819b0b5019d8e2974a64f94523ad6e48187fcbee4ebf08f6e9550c79114159","src/ffi/ffidefault.rs":"c6a521777f2e0b5740548fef79c01af193f95831e756b123566f445619f7a685","src/ffi/ffiserialize.rs":"4230dd1b408860bacdaa007c5d1a9019738bb8c20c1cc33c147dafb0c2a9c3e8","src/ffi/foreignbytes.rs":"d2b46e1a6317aa64801b855e0d12af6bcdef118d8036603d11c3cdaf6f35fdfe","src/ffi/foreigncallbacks.rs":"8850b789e5002897bdde51b33f47f495d110a79c0adbb7d267a9e7f83f65354c","src/ffi/foreignfuture.rs":"2d8f49372724f1e17a4250f7dbd865d13d6388bf27972efaf57d7a3e0e00f3fa","src/ffi/handle.rs":"466935e92bd15f63e594c47f862e9173be92ad765c1f7b283c1e7dcb5d2e20f2","src/ffi/mod.rs":"e4d46229ccda04fa42496cb72b09d57936311a1ac1d82343293613e708644494","src/ffi/rustbuffer.rs":"679aee6691016d078d13b4bf65aa257f43abde62d06f43440e8d42585dbae1a1","src/ffi/rustcalls.rs":"63ffb43192c644cdfefc82e68f225dc6e18bfea27883fa350f8cef9aeb0ec8dc","src/ffi/rustfuture/future.rs":"b8ca1c65a52e5386a3ea7f686c28db6747ee1f4221aa77e646058d167d4eef2d","src/ffi/rustfuture/mod.rs":"1c5f42848576c91b4f14a667a85c5c8fcb928fc849331c1613c1f3e9a81d7d0b","src/ffi/rustfuture/scheduler.rs":"c2115159805e2f80663642c9c0137437b0937aa1fbb4f3d29f90c10e285ad545","src/ffi/rustfuture/tests.rs":"5ddac8e0605bd607339c80d38a8c37a2e60a7a2b26fe4c9ac52097fb1d71041f","src/ffi_converter_impls.rs":"a6f958441c4c38878f08a5bc7d691313682f06bfbb948e200cf048344e77a9db","src/ffi_converter_traits.rs":"1d69229727c423db096405e970074ff882bb5a9c04153ceb7cabbf627c32c3b8","src/lib.rs":"74c4d31048608d268bf9996ab4461d103c007251d5f6665ee09d7f3127ae1fe1","src/metadata.rs":"f5e026ad6b74cf5837e0b4b75741106ff82defbebf7140a66a8c4251e034ede6","src/oneshot.rs":"8f1b7e87cc139d274cacef1a7ad6a9e9bf85423a140ad4e5b61e38be9c6e7bb6"},"package":"53e3b997192dc15ef1778c842001811ec7f241a093a693ac864e1fc938e64fa9"}
\ No newline at end of file
+{"files":{".cargo_vcs_info.json":"e248666ee52412766204c0038addf4a0d15e6548b6e611e2d36b09718a90ebcb","Cargo.lock":"af486ec1bbe42df1e578fdf0380966c1a654655c4b67b28475eed9b7bb465432","Cargo.toml":"804c1d9c2e02aa5cee974a7fa37d9d8fd9cf98b91f84c7aacbd96df8b992cc11","Cargo.toml.orig":"181900741d4d5889890166e16c0ddffce7ef8cf32082afb93ba00701153eb43f","README.md":"c48ebaa9337cbe23085b172e2100088b67ae3f3823e114dc532e9d67f5ff6133","release.toml":"b150796411fc6ff90b481218cb50f8ac7c07f5845aebdb8e17877d47e55b05b9","src/ffi/callbackinterface.rs":"47819b0b5019d8e2974a64f94523ad6e48187fcbee4ebf08f6e9550c79114159","src/ffi/ffidefault.rs":"ee33b64396027f02027fc7a021dd5b9a7c13b055dc752fde390e7b752c287620","src/ffi/ffiserialize.rs":"9d2a1fa1898b4418ec94f3847f4bb963ec91eef2190227928fa6f71945a0cabc","src/ffi/foreignbytes.rs":"d2b46e1a6317aa64801b855e0d12af6bcdef118d8036603d11c3cdaf6f35fdfe","src/ffi/foreigncallbacks.rs":"8850b789e5002897bdde51b33f47f495d110a79c0adbb7d267a9e7f83f65354c","src/ffi/foreignfuture.rs":"77b6dd7cac00e608d43ede4f489d7896ff6c8c454141cc9f6ca7de112bd47448","src/ffi/handle.rs":"9b684d1cbbca1d5b28bb679148606e62d5ebe0d4ea9e8f692e7f511200c01610","src/ffi/mod.rs":"e4d46229ccda04fa42496cb72b09d57936311a1ac1d82343293613e708644494","src/ffi/rustbuffer.rs":"679aee6691016d078d13b4bf65aa257f43abde62d06f43440e8d42585dbae1a1","src/ffi/rustcalls.rs":"7a3f94be607bee8e09da96a742831b5c60ceda0a0a74def6ef00df8dfd992e38","src/ffi/rustfuture/future.rs":"a3ccc86206950522bbe85b33e3f5c28b964aa01f3b45fca4de41764c746c1202","src/ffi/rustfuture/mod.rs":"ee5bbf188ab11709635d326a2e26235bb84626db061f4f0f437b227340726999","src/ffi/rustfuture/scheduler.rs":"49b90b2dc3732e9a6473b849b68f86fc0cd1cae502937c50a3208936231b229f","src/ffi/rustfuture/tests.rs":"f6ef0c3d06d131fd05de8563fc0bd03457d8f3c81fff134b2d372c62c82fb742","src/ffi_converter_impls.rs":"489c17e37db7d10e85d58057148324fef9013973ec054558c04ec9cc987e3645","src/ffi_converter_traits.rs":"84791c621dc0bacf249903c517361285f1034c214ddb68a1f6bf0d77524f5fae","src/lib.rs":"befa3f116b69549ec0f98d03874233e62fe2e01768b54d8c55284ccc232eeb79","src/metadata.rs":"c49acc019a35d18e1a8bb5fabff94cf70867b9e5647180411eeb07adddc779c8","src/oneshot.rs":"8f1b7e87cc139d274cacef1a7ad6a9e9bf85423a140ad4e5b61e38be9c6e7bb6"},"package":"b0ef62e69762fbb9386dcb6c87cd3dd05d525fa8a3a579a290892e60ddbda47e"}
\ No newline at end of file
diff --git a/third_party/rust/uniffi_core/.cargo_vcs_info.json b/third_party/rust/uniffi_core/.cargo_vcs_info.json
index 555d4f8819ac9..8dac4844c636c 100644
--- a/third_party/rust/uniffi_core/.cargo_vcs_info.json
+++ b/third_party/rust/uniffi_core/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "0eda2855d5b4be435013d5baef808d5f9caee0fd"
+    "sha1": "309762f55db3f0548194a9ceba3027fa64b18a93"
   },
   "path_in_vcs": "uniffi_core"
 }
\ No newline at end of file
diff --git a/third_party/rust/uniffi_core/Cargo.lock b/third_party/rust/uniffi_core/Cargo.lock
index df01a91d39860..0360edd981fce 100644
--- a/third_party/rust/uniffi_core/Cargo.lock
+++ b/third_party/rust/uniffi_core/Cargo.lock
@@ -122,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "pin-project-lite"
@@ -156,7 +156,7 @@ dependencies = [
 
 [[package]]
 name = "uniffi_core"
-version = "0.29.3"
+version = "0.31.0"
 dependencies = [
  "anyhow",
  "async-compat",
diff --git a/third_party/rust/uniffi_core/Cargo.toml b/third_party/rust/uniffi_core/Cargo.toml
index 437cdbd7c8b92..13f87a2da50cd 100644
--- a/third_party/rust/uniffi_core/Cargo.toml
+++ b/third_party/rust/uniffi_core/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2021"
 name = "uniffi_core"
-version = "0.29.3"
+version = "0.31.0"
 build = false
 autolib = false
 autobins = false
diff --git a/third_party/rust/uniffi_core/Cargo.toml.orig b/third_party/rust/uniffi_core/Cargo.toml.orig
index f3b41108a2015..5a6bc194de1c5 100644
--- a/third_party/rust/uniffi_core/Cargo.toml.orig
+++ b/third_party/rust/uniffi_core/Cargo.toml.orig
@@ -4,7 +4,7 @@ description = "a multi-language bindings generator for rust (runtime support cod
 documentation = "https://mozilla.github.io/uniffi-rs"
 homepage = "https://mozilla.github.io/uniffi-rs"
 repository = "https://github.com/mozilla/uniffi-rs"
-version = "0.29.3"
+version = "0.31.0"
 license = "MPL-2.0"
 edition = "2021"
 keywords = ["ffi", "bindgen"]
diff --git a/third_party/rust/uniffi_core/README.md b/third_party/rust/uniffi_core/README.md
index 8ac2fa34bfd33..4450243be81aa 100644
--- a/third_party/rust/uniffi_core/README.md
+++ b/third_party/rust/uniffi_core/README.md
@@ -50,12 +50,13 @@ Other tools we know of which try and solve a similarly shaped problem are:
 
 ## Third-party foreign language bindings
 
-* [React Native bindings](https://github.com/jhugman/uniffi-bindgen-react-native). The repository contains tooling to generate bindings for [Hermes](https://github.com/facebook/hermes) and for [creating Turbo Modules](https://reactnative.dev/blog/2024/10/23/the-new-architecture-is-here#new-native-modules).
+* [Javascript bindings](https://github.com/jhugman/uniffi-bindgen-react-native): running in a web page, targeting WASM; and React Native targeting Android, iOS. The repository contains tooling to generate bindings for [Hermes](https://github.com/facebook/hermes), [creating Turbo Modules](https://reactnative.dev/blog/2024/10/23/the-new-architecture-is-here#new-native-modules), and for creating a [`wasm-bindgen` bindings crate](https://rustwasm.github.io/wasm-bindgen).
 * [Kotlin Multiplatform support (Gobley)](https://github.com/gobley/gobley). The repository contains Kotlin Multiplatform bindings generation for UniFFI, letting you target both JVM and Native.
 * [Go bindings](https://github.com/NordSecurity/uniffi-bindgen-go)
 * [C# bindings](https://github.com/NordSecurity/uniffi-bindgen-cs)
 * [Dart bindings](https://github.com/NiallBunting/uniffi-rs-dart)
 * [Java bindings](https://github.com/IronCoreLabs/uniffi-bindgen-java)
+* [Node bindings](https://github.com/livekit/uniffi-bindgen-node) (early development)
 
 ### External resources
 
diff --git a/third_party/rust/uniffi_core/src/ffi/ffidefault.rs b/third_party/rust/uniffi_core/src/ffi/ffidefault.rs
index 919b8d6929c13..759633456911d 100644
--- a/third_party/rust/uniffi_core/src/ffi/ffidefault.rs
+++ b/third_party/rust/uniffi_core/src/ffi/ffidefault.rs
@@ -53,13 +53,6 @@ impl FfiDefault for crate::RustBuffer {
     }
 }
 
-impl FfiDefault for crate::ForeignFuture {
-    fn ffi_default() -> Self {
-        extern "C" fn free(_handle: u64) {}
-        crate::ForeignFuture { handle: 0, free }
-    }
-}
-
 impl<T> FfiDefault for Option<T> {
     fn ffi_default() -> Self {
         None
diff --git a/third_party/rust/uniffi_core/src/ffi/ffiserialize.rs b/third_party/rust/uniffi_core/src/ffi/ffiserialize.rs
index 4e09bd7149e80..c2f2d9519570e 100644
--- a/third_party/rust/uniffi_core/src/ffi/ffiserialize.rs
+++ b/third_party/rust/uniffi_core/src/ffi/ffiserialize.rs
@@ -299,7 +299,7 @@ mod test {
         <*const std::ffi::c_void as FfiSerialize>::write(&mut buf_writer, void_ptr);
         <RustBuffer as FfiSerialize>::write(&mut buf_writer, rust_buffer);
         <RustCallStatus as FfiSerialize>::write(&mut buf_writer, rust_call_status);
-        <Handle as FfiSerialize>::write(&mut buf_writer, handle);
+        <Handle as FfiSerialize>::write(&mut buf_writer, handle.clone());
         #[allow(clippy::needless_borrows_for_generic_args)]
         <() as FfiSerialize>::write(&mut buf_writer, ());
 
diff --git a/third_party/rust/uniffi_core/src/ffi/foreignfuture.rs b/third_party/rust/uniffi_core/src/ffi/foreignfuture.rs
index 3ea0362a2ac93..f2dfe0dc43188 100644
--- a/third_party/rust/uniffi_core/src/ffi/foreignfuture.rs
+++ b/third_party/rust/uniffi_core/src/ffi/foreignfuture.rs
@@ -10,21 +10,15 @@
 //! The foreign side should:
 //!   * Input a [ForeignFutureCallback] and a `u64` handle in their scaffolding function.
 //!     This is the sender, converted to a raw pointer, and an extern "C" function that sends the result.
-//!   * Return a [ForeignFuture], which represents the foreign task object corresponding to the async function.
 //!   * Call the [ForeignFutureCallback] when the async function completes with:
 //!     * The `u64` handle initially passed in
-//!     * The `ForeignFutureResult` for the call
-//!   * Wait for the [ForeignFutureHandle::free] function to be called to free the task object.
-//!     If this is called before the task completes, then the task will be cancelled.
+//!     * The `ForeignFutureResult` struct for the call
+//!   * Optionally, set the `ForeignFutureDroppedCallback` value if you want to be notified when the
+//!     Future is dropped in Rust.  For languages that support it, this can be hooked up to
+//!     cancelling the async task for the method.
 
 use crate::{oneshot, LiftReturn, RustCallStatus};
 
-/// Handle for a foreign future
-pub type ForeignFutureHandle = u64;
-
-/// Handle for a callback data associated with a foreign future.
-pub type ForeignFutureCallbackData = *mut ();
-
 /// Callback that's passed to a foreign async functions.
 ///
 /// See `LiftReturn` trait for how this is implemented.
@@ -40,33 +34,58 @@ pub struct ForeignFutureResult<T> {
     call_status: RustCallStatus,
 }
 
-/// C struct that represents a foreign future, used to perform a call to a foreign async method.
-///
-/// This is what's returned by the async scaffolding functions.
+/// C callback function that's called when the Rust side of a foreign future is dropped
+pub type ForeignFutureDroppedCallback = extern "C" fn(data: u64);
+
+/// C struct that represents a foreign future dropped callback.
 #[repr(C)]
-pub struct ForeignFuture {
-    pub handle: ForeignFutureHandle,
-    pub free: extern "C" fn(handle: ForeignFutureHandle),
+pub struct ForeignFutureDroppedCallbackStruct {
+    pub callback_data: u64,
+    pub callback: ForeignFutureDroppedCallback,
+}
+
+impl Default for ForeignFutureDroppedCallbackStruct {
+    /// The default value implements a no-op callback.
+    /// This will be used for languages that don't set their own callbacks.
+    fn default() -> Self {
+        extern "C" fn callback(_data: u64) {}
+        Self {
+            callback_data: 0,
+            callback,
+        }
+    }
 }
 
-impl Drop for ForeignFuture {
+impl Drop for ForeignFutureDroppedCallbackStruct {
     fn drop(&mut self) {
-        (self.free)(self.handle)
+        (self.callback)(self.callback_data)
     }
 }
 
-unsafe impl Send for ForeignFuture {}
+unsafe impl Send for ForeignFutureDroppedCallbackStruct {}
 
 pub async fn foreign_async_call<F, T, UT>(call_scaffolding_function: F) -> T
 where
-    F: FnOnce(ForeignFutureCallback<T::ReturnType>, u64) -> ForeignFuture,
+    F: FnOnce(ForeignFutureCallback<T::ReturnType>, u64, &mut ForeignFutureDroppedCallbackStruct),
     T: LiftReturn<UT>,
 {
+    // Create a oneshot channel that will receive the result of the callback method
     let (sender, receiver) = oneshot::channel::<ForeignFutureResult<T::ReturnType>>();
-    // Keep the ForeignFuture around, even though we don't ever use it.
-    // The important thing is that the ForeignFuture will be dropped when this Future is.
-    let _foreign_future =
-        call_scaffolding_function(foreign_future_complete::<T, UT>, sender.into_raw() as u64);
+    // Create complete callback/data from the oneshot channel
+    let complete_callback = foreign_future_complete::<T, UT>;
+    let complete_callback_data = sender.into_raw() as u64;
+    // Create a `ForeignFutureDroppedCallback`.
+    // Since this is owned by the `Future` that we're generating, when the future is dropped it
+    // will be dropped to.
+    // future is.
+    let mut foreign_future_dropped_callback = ForeignFutureDroppedCallbackStruct::default();
+    // Call the async method
+    call_scaffolding_function(
+        complete_callback,
+        complete_callback_data,
+        &mut foreign_future_dropped_callback,
+    );
+    // Await the result and use it to return a value
     let result = receiver.await;
     T::lift_foreign_return(result.return_value, result.call_status)
 }
@@ -103,24 +122,25 @@ mod test {
     impl MockForeignFuture {
         fn new() -> Self {
             let callback_info = Arc::new(OnceCell::new());
-            let freed = Arc::new(AtomicU32::new(0));
+            let future_dropped_call_count = Arc::new(AtomicU32::new(0));
 
             let rust_future: Pin<Box<dyn Future<Output = String>>> = {
                 let callback_info = callback_info.clone();
-                let freed = freed.clone();
+                let future_dropped_call_count = future_dropped_call_count.clone();
                 Box::pin(foreign_async_call::<_, String, crate::UniFfiTag>(
-                    move |callback, data| {
+                    move |callback, data, out_dropped_callback| {
                         callback_info.set((callback, data)).unwrap();
-                        ForeignFuture {
-                            handle: Arc::into_raw(freed) as *mut () as u64,
-                            free: Self::free,
-                        }
+                        *out_dropped_callback = ForeignFutureDroppedCallbackStruct {
+                            callback_data: Arc::into_raw(future_dropped_call_count) as *mut ()
+                                as u64,
+                            callback: Self::future_drapped_callback,
+                        };
                     },
                 ))
             };
             let rust_future = Some(rust_future);
             let mut mock_foreign_future = Self {
-                freed,
+                freed: future_dropped_call_count,
                 callback_info,
                 rust_future,
             };
@@ -169,7 +189,7 @@ mod test {
             self.freed.load(Ordering::Relaxed)
         }
 
-        extern "C" fn free(handle: u64) {
+        extern "C" fn future_drapped_callback(handle: u64) {
             let flag = unsafe { Arc::from_raw(handle as *mut AtomicU32) };
             flag.fetch_add(1, Ordering::Relaxed);
         }
diff --git a/third_party/rust/uniffi_core/src/ffi/handle.rs b/third_party/rust/uniffi_core/src/ffi/handle.rs
index 8ca66a41ded7c..dc183957d2f05 100644
--- a/third_party/rust/uniffi_core/src/ffi/handle.rs
+++ b/third_party/rust/uniffi_core/src/ffi/handle.rs
@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+use std::{fmt, sync::Arc};
+
 /// Object handle
 ///
 /// Handles opaque `u64` values used to pass objects across the FFI, both for objects implemented in
@@ -15,7 +17,7 @@
 ///   leaked pointer will be aligned to `size_of::<Arc<T>>()` == `size_of::<*const T>()`).
 ///
 /// Rust handles are mainly managed is through the [crate::HandleAlloc] trait.
-#[derive(Copy, Clone, Default, Debug, PartialEq, Eq)]
+#[derive(Clone, Default, PartialEq, Eq)]
 #[repr(transparent)]
 pub struct Handle(u64);
 
@@ -28,6 +30,14 @@ impl Handle {
         self.0 as *const T
     }
 
+    /// Was this handle generated by the foreign side of the FFI?
+    pub fn is_foreign(&self) -> bool {
+        // Foreign handles have the lowest bit set.
+        // We know that Rust handles will never have this set, since the pointers that they're cast from have alignment > 1;
+        // https://mozilla.github.io/uniffi-rs/latest/internals/object_references.html
+        (self.0 & 1) == 1
+    }
+
     /// # Safety
     /// The raw value must be a valid handle as described above.
     pub unsafe fn from_raw(raw: u64) -> Option<Self> {
@@ -45,4 +55,53 @@ impl Handle {
     pub fn as_raw(&self) -> u64 {
         self.0
     }
+
+    /// Create a handle from an Arc
+    pub fn from_arc<T>(arc: Arc<T>) -> Self {
+        Self::from_pointer(Arc::into_raw(arc))
+    }
+
+    /// Re-create an Arc from a handle
+    ///
+    /// # Safety
+    ///
+    /// * The handle must have been created from `Handle::from_arc`.
+    /// * The handle must only be used once
+    pub unsafe fn into_arc<T>(self) -> Arc<T> {
+        Arc::from_raw(self.as_pointer())
+    }
+
+    /// Re-create an Arc from a borrowed handle
+    ///
+    /// "borrowed" means a handle sent from the other side of the FFI without cloning it first.
+    /// Be very careful with using this, since it's easy to introduce races.
+    /// The one scenario this is currently used for is futures, since we can guarantee that the
+    /// foreign side will not drop the future while in the middle of polling/cancelling it.
+    ///
+    /// # Safety
+    ///
+    /// * The handle must have been created from `Handle::from_arc`.
+    /// * There must be no possibility for the handle to be dropped before the function the
+    ///   borrowed handle is passed to returns.
+    pub unsafe fn into_arc_borrowed<T>(self) -> Arc<T> {
+        self.clone_arc_handle::<T>();
+        Arc::from_raw(self.as_pointer())
+    }
+
+    /// Clone a handle for an Arc
+    ///
+    /// # Safety
+    ///
+    /// The handle must have been created from `Handle::from_arc`.
+    pub unsafe fn clone_arc_handle<T>(&self) -> Self {
+        Arc::increment_strong_count(self.as_pointer::<T>());
+        // This is safe because we just incremented the refcount.
+        Self(self.0)
+    }
+}
+
+impl fmt::Debug for Handle {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "Handle(0x{:x})", self.0)
+    }
 }
diff --git a/third_party/rust/uniffi_core/src/ffi/rustcalls.rs b/third_party/rust/uniffi_core/src/ffi/rustcalls.rs
index 4c7b8d95a848e..7eae9f57592f2 100644
--- a/third_party/rust/uniffi_core/src/ffi/rustcalls.rs
+++ b/third_party/rust/uniffi_core/src/ffi/rustcalls.rs
@@ -134,6 +134,14 @@ pub struct LiftArgsError {
     pub error: anyhow::Error,
 }
 
+impl LiftArgsError {
+    pub fn to_internal_error(self) -> RustCallError {
+        let LiftArgsError { arg_name, error } = self;
+
+        RustCallError::InternalError(format!("Failed to convert arg '{arg_name}':\n{error:?}"))
+    }
+}
+
 /// Handle a scaffolding calls
 ///
 /// `callback` is responsible for making the actual Rust call and returning a special result type:
@@ -161,6 +169,28 @@ where
     rust_call_with_out_status(out_status, callback).unwrap_or_else(R::ffi_default)
 }
 
+/// Result of making a Rust call
+///
+/// The `Ok` side stores successful call results
+/// The `Err` side stores error results, both for `Err` returns and for unexpected errors.
+/// Errors are represented by a `RustCallStatus` which is easy to return across the FFI.
+pub type RustCallResult<T> = Result<T, RustCallStatus>;
+
+/// Try making a Rust call
+///
+/// If the call succeeds this returns Ok(v) with the result.
+/// If the call fails (including Err results), this returns Err(RustCallStatus).
+pub(crate) fn try_rust_call<F, R>(callback: F) -> Result<R, RustCallStatus>
+where
+    F: panic::UnwindSafe + FnOnce() -> Result<R, RustCallError>,
+{
+    let mut out_status = RustCallStatus::default();
+    match rust_call_with_out_status(&mut out_status, callback) {
+        Some(r) => Ok(r),
+        None => Err(out_status),
+    }
+}
+
 /// Make a Rust call and update `RustCallStatus` based on the result.
 ///
 /// If the call succeeds this returns Some(v) and doesn't touch out_status
@@ -263,7 +293,7 @@ mod test {
         assert_eq!(
             <String as Lift<UniFfiTag>>::try_lift(ManuallyDrop::into_inner(status.error_buf))
                 .unwrap(),
-            "Failed to convert arg 'foo': invalid handle"
+            "Failed to convert arg 'foo':\ninvalid handle"
         );
 
         // Panic inside the call
diff --git a/third_party/rust/uniffi_core/src/ffi/rustfuture/future.rs b/third_party/rust/uniffi_core/src/ffi/rustfuture/future.rs
index 6d85cefd616fd..643b3fb7c689c 100644
--- a/third_party/rust/uniffi_core/src/ffi/rustfuture/future.rs
+++ b/third_party/rust/uniffi_core/src/ffi/rustfuture/future.rs
@@ -75,45 +75,67 @@
 //! [`Waker`]: https://doc.rust-lang.org/std/task/struct.Waker.html
 //! [`RawWaker`]: https://doc.rust-lang.org/std/task/struct.RawWaker.html
 
-use std::{
-    future::Future,
-    marker::PhantomData,
-    ops::Deref,
-    panic,
-    pin::Pin,
-    sync::{Arc, Mutex},
-    task::{Context, Poll, Wake},
-};
-
 use super::{
     FutureLowerReturn, RustFutureContinuationCallback, RustFuturePoll, Scheduler,
     UniffiCompatibleFuture,
 };
-use crate::{rust_call_with_out_status, FfiDefault, LiftArgsError, RustCallStatus};
-
-type BoxedFuture<T> = Pin<Box<dyn UniffiCompatibleFuture<Result<T, LiftArgsError>>>>;
+use crate::{try_rust_call, FfiDefault, LiftArgsError, RustCallResult, RustCallStatus};
+use std::{
+    future, panic,
+    pin::{pin, Pin},
+    sync::{Arc, Mutex},
+    task::{Context, Poll, RawWaker, RawWakerVTable, Waker},
+};
 
 /// Wraps the actual future we're polling
-struct WrappedFuture<T, UT>
-where
-    T: FutureLowerReturn<UT> + 'static,
-    UT: Send + 'static,
-{
-    // Note: this could be a single enum, but that would make it easy to mess up the future pinning
-    // guarantee.   For example you might want to call `std::mem::take()` to try to get the result,
-    // but if the future happened to be stored that would move and break all internal references.
-    future: Option<BoxedFuture<T>>,
-    result: Option<Result<T::ReturnType, RustCallStatus>>,
+///
+/// * Lowers the future result into an FFI type
+/// * Splits `Future::poll` into 2 parts.  WrappedFuture::poll(), which returns true if the future
+///   is ready and `WrappedFuture::complete` which extracts the result.  This matches how our FFI
+///   functions work.
+/// * Polls the future inside of `rust_call_with_out_status` so that panics can be caught.
+struct WrappedFuture<FfiType> {
+    // Create an option for the future and result.
+    // This could be a single enum, but makes future pinning harder.
+    // For example if you call `std::mem::take()` while a future was stored in the enum, it would break the pinning guarantee.
+    //
+    // The output is `Result<FfiType, RustCallStatus>`.
+    // Both the `Ok` and `Err` side are easy to pass back across the FFI.
+    future: Option<Pin<Box<dyn UniffiCompatibleFuture<RustCallResult<FfiType>>>>>,
+    result: Option<Result<FfiType, RustCallStatus>>,
 }
 
-impl<T, UT> WrappedFuture<T, UT>
-where
-    T: FutureLowerReturn<UT> + 'static,
-    UT: Send + 'static,
-{
-    fn new(future: BoxedFuture<T>) -> Self {
+impl<FfiType> WrappedFuture<FfiType> {
+    fn new<F, T, UT>(future: F) -> Self
+    where
+        F: UniffiCompatibleFuture<Result<T, LiftArgsError>> + 'static,
+        T: FutureLowerReturn<UT, ReturnType = FfiType>,
+    {
+        let wrapped_future = async {
+            let mut future = pin!(future);
+            future::poll_fn(move |cx| {
+                let call_result = try_rust_call(
+                    // This closure uses a `&mut F` value, which means it's not UnwindSafe by
+                    // default.  If the future panics, it may be in an invalid state.
+                    //
+                    // However, we can safely use `AssertUnwindSafe` since a panic will lead the
+                    // `Err` case below and we will never poll the future again.
+                    panic::AssertUnwindSafe(|| match future.as_mut().poll(cx) {
+                        Poll::Pending => Ok(Poll::Pending),
+                        Poll::Ready(Ok(v)) => T::lower_return(v).map(Poll::Ready),
+                        Poll::Ready(Err(e)) => T::handle_failed_lift(e).map(Poll::Ready),
+                    }),
+                );
+                match call_result {
+                    Ok(Poll::Pending) => Poll::Pending,
+                    Ok(Poll::Ready(v)) => Poll::Ready(Ok(v)),
+                    Err(call_status) => Poll::Ready(Err(call_status)),
+                }
+            })
+            .await
+        };
         Self {
-            future: Some(future),
+            future: Some(Box::pin(wrapped_future)),
             result: None,
         }
     }
@@ -123,37 +145,11 @@ where
         if self.result.is_some() {
             true
         } else if let Some(future) = &mut self.future {
-            // SAFETY: We can call Pin::new_unchecked because:
-            //    - This is the only time we get a &mut to `self.future`
-            //    - We never poll the future after it's moved (for example by using take())
-            //    - We never move RustFuture, which contains us.
-            //    - RustFuture is private to this module so no other code can move it.
-            let pinned = unsafe { Pin::new_unchecked(future) };
-            // Run the poll and lift the result if it's ready
-            let mut out_status = RustCallStatus::default();
-            let result: Option<Poll<T::ReturnType>> = rust_call_with_out_status(
-                &mut out_status,
-                // This closure uses a `&mut F` value, which means it's not UnwindSafe by
-                // default.  If the future panics, it may be in an invalid state.
-                //
-                // However, we can safely use `AssertUnwindSafe` since a panic will lead the `None`
-                // case below and we will never poll the future again.
-                panic::AssertUnwindSafe(|| match pinned.poll(context) {
-                    Poll::Pending => Ok(Poll::Pending),
-                    Poll::Ready(Ok(v)) => T::lower_return(v).map(Poll::Ready),
-                    Poll::Ready(Err(e)) => T::handle_failed_lift(e).map(Poll::Ready),
-                }),
-            );
-            match result {
-                Some(Poll::Pending) => false,
-                Some(Poll::Ready(v)) => {
+            match future.as_mut().poll(context) {
+                Poll::Pending => false,
+                Poll::Ready(result) => {
                     self.future = None;
-                    self.result = Some(Ok(v));
-                    true
-                }
-                None => {
-                    self.future = None;
-                    self.result = Some(Err(out_status));
+                    self.result = Some(result);
                     true
                 }
             }
@@ -163,8 +159,11 @@ where
         }
     }
 
-    fn complete(&mut self, out_status: &mut RustCallStatus) -> T::ReturnType {
-        let mut return_value = T::ReturnType::ffi_default();
+    fn complete(&mut self, out_status: &mut RustCallStatus) -> FfiType
+    where
+        FfiType: FfiDefault,
+    {
+        let mut return_value = FfiType::ffi_default();
         match self.result.take() {
             Some(Ok(v)) => return_value = v,
             Some(Err(call_status)) => *out_status = call_status,
@@ -180,50 +179,31 @@ where
     }
 }
 
-// If F and T are Send, then WrappedFuture is too
-//
-// Rust will not mark it Send by default when T::ReturnType is a raw pointer.  This is promising
-// that we will treat the raw pointer properly, for example by not returning it twice.
-unsafe impl<T, UT> Send for WrappedFuture<T, UT>
-where
-    T: FutureLowerReturn<UT> + 'static,
-    UT: Send + 'static,
-{
-}
-
 /// Future that the foreign code is awaiting
-pub(super) struct RustFuture<T, UT>
-where
-    T: FutureLowerReturn<UT> + 'static,
-    UT: Send + 'static,
-{
+pub(super) struct RustFuture<FfiType> {
     // This Mutex should never block if our code is working correctly, since there should not be
     // multiple threads calling [Self::poll] and/or [Self::complete] at the same time.
-    future: Mutex<WrappedFuture<T, UT>>,
+    future: Mutex<WrappedFuture<FfiType>>,
     scheduler: Mutex<Scheduler>,
-    // UT is used as the generic parameter for [LowerReturn].
-    // Let's model this with PhantomData as a function that inputs a UT value.
-    _phantom: PhantomData<fn(UT) -> ()>,
 }
 
-impl<T, UT> RustFuture<T, UT>
-where
-    T: FutureLowerReturn<UT> + 'static,
-    UT: Send + 'static,
-{
-    pub(super) fn new(future: BoxedFuture<T>, _tag: UT) -> Arc<Self> {
-        Arc::new(Self {
+impl<FfiType> RustFuture<FfiType> {
+    pub(super) fn new<F, T, UT>(future: F, _tag: UT) -> Self
+    where
+        F: UniffiCompatibleFuture<Result<T, LiftArgsError>> + 'static,
+        T: FutureLowerReturn<UT, ReturnType = FfiType>,
+    {
+        Self {
             future: Mutex::new(WrappedFuture::new(future)),
             scheduler: Mutex::new(Scheduler::new()),
-            _phantom: PhantomData,
-        })
+        }
     }
 
     pub(super) fn poll(self: Arc<Self>, callback: RustFutureContinuationCallback, data: u64) {
         let cancelled = self.is_cancelled();
         let ready = cancelled || {
             let mut locked = self.future.lock().unwrap();
-            let waker: std::task::Waker = Arc::clone(&self).into();
+            let waker = Arc::clone(&self).into_waker();
             locked.poll(&mut Context::from_waker(&waker))
         };
         if ready {
@@ -238,16 +218,14 @@ where
         self.scheduler.lock().unwrap().is_cancelled()
     }
 
-    pub(super) fn wake(&self) {
-        trace!("RustFuture::wake called");
-        self.scheduler.lock().unwrap().wake();
-    }
-
     pub(super) fn cancel(&self) {
         self.scheduler.lock().unwrap().cancel();
     }
 
-    pub(super) fn complete(&self, call_status: &mut RustCallStatus) -> T::ReturnType {
+    pub(super) fn complete(&self, call_status: &mut RustCallStatus) -> FfiType
+    where
+        FfiType: FfiDefault,
+    {
         self.future.lock().unwrap().complete(call_status)
     }
 
@@ -259,57 +237,70 @@ where
     }
 }
 
-impl<T, UT> Wake for RustFuture<T, UT>
+// `RawWaker` implementation for RustFuture
+impl<FfiType> RustFuture<FfiType>
 where
-    T: FutureLowerReturn<UT> + 'static,
-    UT: Send + 'static,
+    Scheduler: Send + Sync,
 {
-    fn wake(self: Arc<Self>) {
-        self.deref().wake()
+    unsafe fn waker_clone(ptr: *const ()) -> RawWaker {
+        trace!("RustFuture::waker_clone called ({ptr:?})");
+        Arc::<Self>::increment_strong_count(ptr.cast::<Self>());
+        RawWaker::new(
+            ptr,
+            &RawWakerVTable::new(
+                Self::waker_clone,
+                Self::waker_wake,
+                Self::waker_wake_by_ref,
+                Self::waker_drop,
+            ),
+        )
     }
 
-    fn wake_by_ref(self: &Arc<Self>) {
-        self.deref().wake()
+    unsafe fn waker_wake(ptr: *const ()) {
+        trace!("RustFuture::waker_wake called ({ptr:?})");
+        Self::recreate_arc(ptr).scheduler.lock().unwrap().wake();
     }
-}
-
-/// RustFuture FFI trait.  This allows `Arc<RustFuture<F, T, UT>>` to be cast to
-/// `Arc<dyn RustFutureFfi<T::ReturnType>>`, which is needed to implement the public FFI API.  In particular, this
-/// allows you to use RustFuture functionality without knowing the concrete Future type, which is
-/// unnamable.
-///
-/// This is parametrized on the ReturnType rather than the `T` directly, to reduce the number of
-/// scaffolding functions we need to generate.  If it was parametrized on `T`, then we would need
-/// to create a poll, cancel, complete, and free scaffolding function for each exported async
-/// function.  That would add ~1kb binary size per exported function based on a quick estimate on a
-/// x86-64 machine . By parametrizing on `T::ReturnType` we can instead monomorphize by hand and
-/// only create those functions for each of the 13 possible FFI return types.
-#[doc(hidden)]
-pub trait RustFutureFfi<ReturnType>: Send + Sync {
-    fn ffi_poll(self: Arc<Self>, callback: RustFutureContinuationCallback, data: u64);
-    fn ffi_cancel(&self);
-    fn ffi_complete(&self, call_status: &mut RustCallStatus) -> ReturnType;
-    fn ffi_free(self: Arc<Self>);
-}
 
-impl<T, UT> RustFutureFfi<T::ReturnType> for RustFuture<T, UT>
-where
-    T: FutureLowerReturn<UT> + 'static,
-    UT: Send + 'static,
-{
-    fn ffi_poll(self: Arc<Self>, callback: RustFutureContinuationCallback, data: u64) {
-        self.poll(callback, data)
+    unsafe fn waker_wake_by_ref(ptr: *const ()) {
+        trace!("RustFuture::waker_wake_by_ref called ({ptr:?})");
+        // For wake_by_ref, we can use the pointer directly, without consuming it to re-create the
+        // arc.
+        let ptr = ptr.cast::<Self>();
+        (*ptr).scheduler.lock().unwrap().wake();
     }
 
-    fn ffi_cancel(&self) {
-        self.cancel()
+    unsafe fn waker_drop(ptr: *const ()) {
+        trace!("RustFuture::waker_drop called ({ptr:?})");
+        drop(Self::recreate_arc(ptr));
     }
 
-    fn ffi_complete(&self, call_status: &mut RustCallStatus) -> T::ReturnType {
-        self.complete(call_status)
+    /// Recreate an Arc<Self> from a raw pointer
+    ///
+    /// # Safety
+    /// * ptr must have been created from `Arc::into_raw()`
+    /// * ptr must only be used once to re-create the arc
+    unsafe fn recreate_arc(ptr: *const ()) -> Arc<Self> {
+        let ptr = ptr.cast::<Self>();
+        Arc::<Self>::from_raw(ptr)
     }
 
-    fn ffi_free(self: Arc<Self>) {
-        self.free();
+    fn into_waker(self: Arc<Self>) -> Waker {
+        trace!("RustFuture::creating waker ({:?})", Arc::as_ptr(&self));
+        let raw_waker = RawWaker::new(
+            Arc::into_raw(self).cast::<()>(),
+            &RawWakerVTable::new(
+                Self::waker_clone,
+                Self::waker_wake,
+                Self::waker_wake_by_ref,
+                Self::waker_drop,
+            ),
+        );
+
+        // Safety:
+        //
+        // * The vtable functions are thread-safe, since we only access `Self::scheduler` and that
+        //   has a `Send` + `Sync` bound.
+        // * We manage the raw arc pointers correctly
+        unsafe { Waker::from_raw(raw_waker) }
     }
 }
diff --git a/third_party/rust/uniffi_core/src/ffi/rustfuture/mod.rs b/third_party/rust/uniffi_core/src/ffi/rustfuture/mod.rs
index b5be9611883d6..cd5f94355b459 100644
--- a/third_party/rust/uniffi_core/src/ffi/rustfuture/mod.rs
+++ b/third_party/rust/uniffi_core/src/ffi/rustfuture/mod.rs
@@ -12,7 +12,7 @@ use scheduler::*;
 #[cfg(test)]
 mod tests;
 
-use crate::{derive_ffi_traits, Handle, HandleAlloc, LiftArgsError, LowerReturn, RustCallStatus};
+use crate::{FfiDefault, Handle, LiftArgsError, LowerReturn, RustCallStatus};
 
 /// Result code for [rust_future_poll].  This is passed to the continuation function.
 #[repr(i8)]
@@ -21,7 +21,7 @@ pub enum RustFuturePoll {
     /// The future is ready and is waiting for [rust_future_complete] to be called
     Ready = 0,
     /// The future might be ready and [rust_future_poll] should be called again
-    MaybeReady = 1,
+    Wake = 1,
 }
 
 /// Foreign callback that's passed to [rust_future_poll]
@@ -36,10 +36,11 @@ pub type RustFutureContinuationCallback = extern "C" fn(callback_data: u64, Rust
 /// It should not be considered as a part of the public API, and as such as
 /// an implementation detail and subject to change.
 ///
-/// It is _not_ intended to be implemented by libray users or bindings
-/// implementors.
+/// It is _not_ intended to be implemented by library users or bindings
+/// implementers.
 #[doc(hidden)]
-pub trait UniffiCompatibleFuture<T>: Future<Output = T> {}
+#[cfg(not(all(target_arch = "wasm32", feature = "wasm-unstable-single-threaded")))]
+pub trait UniffiCompatibleFuture<T>: Future<Output = T> + Send {}
 
 #[doc(hidden)]
 pub trait FutureLowerReturn<UT>: LowerReturn<UT> {}
@@ -88,6 +89,9 @@ impl<UT, LR> FutureLowerReturn<UT> for LR where LR: LowerReturn<UT> + Send {}
 /// [webworker]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Using_web_workers
 /// [jsfuture]: https://github.com/rustwasm/wasm-bindgen/blob/main/crates/futures/src/lib.rs
 /// [transferable]: (https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Transferable_objects
+#[cfg(all(target_arch = "wasm32", feature = "wasm-unstable-single-threaded"))]
+pub trait UniffiCompatibleFuture<T>: Future<Output = T> {}
+
 #[cfg(target_arch = "wasm32")]
 impl<T, F> UniffiCompatibleFuture<T> for F where F: Future<Output = T> {}
 #[cfg(all(target_arch = "wasm32", feature = "wasm-unstable-single-threaded"))]
@@ -103,22 +107,11 @@ impl<UT, LR> FutureLowerReturn<UT> for LR where LR: LowerReturn<UT> {}
 #[allow(clippy::let_and_return)]
 pub fn rust_future_new<F, T, UT>(future: F, tag: UT) -> Handle
 where
-    // F is the future type returned by the exported async function.  It needs to be Send + `static
-    // since it will move between threads for an indeterminate amount of time as the foreign
-    // executor calls polls it and the Rust executor wakes it.  It does not need to by `Sync`,
-    // since we synchronize all access to the values.
     F: UniffiCompatibleFuture<Result<T, LiftArgsError>> + 'static,
-    // T is the output of the Future.  It needs to implement [LowerReturn].  Also it must be Send +
-    // 'static for the same reason as F.
     T: FutureLowerReturn<UT> + 'static,
-    // The UniFfiTag ZST. The Send + 'static bound is to keep rustc happy.
-    UT: Send + 'static,
-    // Needed to allocate a handle
-    dyn RustFutureFfi<T::ReturnType>: HandleAlloc<UT>,
 {
-    let handle = HandleAlloc::new_handle(
-        RustFuture::new(Box::pin(future), tag) as Arc<dyn RustFutureFfi<T::ReturnType>>
-    );
+    let rust_future = Arc::new(RustFuture::new(future, tag));
+    let handle = Handle::from_arc(rust_future);
     trace!("rust_future_new: {handle:?}");
     handle
 }
@@ -132,15 +125,13 @@ where
 /// # Safety
 ///
 /// The [Handle] must not previously have been passed to [rust_future_free]
-pub unsafe fn rust_future_poll<ReturnType, UT>(
+pub unsafe fn rust_future_poll<FfiType>(
     handle: Handle,
     callback: RustFutureContinuationCallback,
     data: u64,
-) where
-    dyn RustFutureFfi<ReturnType>: HandleAlloc<UT>,
-{
+) {
     trace!("rust_future_poll: {handle:?}");
-    <dyn RustFutureFfi<ReturnType> as HandleAlloc<UT>>::get_arc(handle).ffi_poll(callback, data)
+    Handle::into_arc_borrowed::<RustFuture<FfiType>>(handle).poll(callback, data)
 }
 
 /// Cancel a Rust future
@@ -153,12 +144,9 @@ pub unsafe fn rust_future_poll<ReturnType, UT>(
 /// # Safety
 ///
 /// The [Handle] must not previously have been passed to [rust_future_free]
-pub unsafe fn rust_future_cancel<ReturnType, UT>(handle: Handle)
-where
-    dyn RustFutureFfi<ReturnType>: HandleAlloc<UT>,
-{
+pub unsafe fn rust_future_cancel<FfiType>(handle: Handle) {
     trace!("rust_future_cancel: {handle:?}");
-    <dyn RustFutureFfi<ReturnType> as HandleAlloc<UT>>::get_arc(handle).ffi_cancel()
+    Handle::into_arc_borrowed::<RustFuture<FfiType>>(handle).cancel()
 }
 
 /// Complete a Rust future
@@ -171,15 +159,15 @@ where
 /// - The [Handle] must not previously have been passed to [rust_future_free]
 /// - The `T` param must correctly correspond to the [rust_future_new] call.  It must
 ///   be `<Output as LowerReturn<UT>>::ReturnType`
-pub unsafe fn rust_future_complete<ReturnType, UT>(
+pub unsafe fn rust_future_complete<FfiType>(
     handle: Handle,
     out_status: &mut RustCallStatus,
-) -> ReturnType
+) -> FfiType
 where
-    dyn RustFutureFfi<ReturnType>: HandleAlloc<UT>,
+    FfiType: FfiDefault,
 {
     trace!("rust_future_complete: {handle:?}");
-    <dyn RustFutureFfi<ReturnType> as HandleAlloc<UT>>::get_arc(handle).ffi_complete(out_status)
+    Handle::into_arc_borrowed::<RustFuture<FfiType>>(handle).complete(out_status)
 }
 
 /// Free a Rust future, dropping the strong reference and releasing all references held by the
@@ -188,25 +176,7 @@ where
 /// # Safety
 ///
 /// The [Handle] must not previously have been passed to [rust_future_free]
-pub unsafe fn rust_future_free<ReturnType, UT>(handle: Handle)
-where
-    dyn RustFutureFfi<ReturnType>: HandleAlloc<UT>,
-{
+pub unsafe fn rust_future_free<FfiType>(handle: Handle) {
     trace!("rust_future_free: {handle:?}");
-    <dyn RustFutureFfi<ReturnType> as HandleAlloc<UT>>::consume_handle(handle).ffi_free()
+    Handle::into_arc_borrowed::<RustFuture<FfiType>>(handle).free()
 }
-
-// Derive HandleAlloc for dyn RustFutureFfi<T> for all FFI return types
-derive_ffi_traits!(impl<UT> HandleAlloc<UT> for dyn RustFutureFfi<u8>);
-derive_ffi_traits!(impl<UT> HandleAlloc<UT> for dyn RustFutureFfi<i8>);
-derive_ffi_traits!(impl<UT> HandleAlloc<UT> for dyn RustFutureFfi<u16>);
-derive_ffi_traits!(impl<UT> HandleAlloc<UT> for dyn RustFutureFfi<i16>);
-derive_ffi_traits!(impl<UT> HandleAlloc<UT> for dyn RustFutureFfi<u32>);
-derive_ffi_traits!(impl<UT> HandleAlloc<UT> for dyn RustFutureFfi<i32>);
-derive_ffi_traits!(impl<UT> HandleAlloc<UT> for dyn RustFutureFfi<u64>);
-derive_ffi_traits!(impl<UT> HandleAlloc<UT> for dyn RustFutureFfi<i64>);
-derive_ffi_traits!(impl<UT> HandleAlloc<UT> for dyn RustFutureFfi<f32>);
-derive_ffi_traits!(impl<UT> HandleAlloc<UT> for dyn RustFutureFfi<f64>);
-derive_ffi_traits!(impl<UT> HandleAlloc<UT> for dyn RustFutureFfi<*const std::ffi::c_void>);
-derive_ffi_traits!(impl<UT> HandleAlloc<UT> for dyn RustFutureFfi<crate::RustBuffer>);
-derive_ffi_traits!(impl<UT> HandleAlloc<UT> for dyn RustFutureFfi<()>);
diff --git a/third_party/rust/uniffi_core/src/ffi/rustfuture/scheduler.rs b/third_party/rust/uniffi_core/src/ffi/rustfuture/scheduler.rs
index a7335d1884745..9ec26a8d8eafb 100644
--- a/third_party/rust/uniffi_core/src/ffi/rustfuture/scheduler.rs
+++ b/third_party/rust/uniffi_core/src/ffi/rustfuture/scheduler.rs
@@ -24,7 +24,7 @@ pub(super) enum Scheduler {
     /// No continuations set, neither wake() nor cancel() called.
     Empty,
     /// `wake()` was called when there was no continuation set.  The next time `store` is called,
-    /// the continuation should be immediately invoked with `RustFuturePoll::MaybeReady`
+    /// the continuation should be immediately invoked with `RustFuturePoll::Wake`
     Waked,
     /// The future has been cancelled, any future `store` calls should immediately result in the
     /// continuation being called with `RustFuturePoll::Ready`.
@@ -52,7 +52,7 @@ impl Scheduler {
             }
             Self::Waked => {
                 *self = Self::Empty;
-                callback(data, RustFuturePoll::MaybeReady);
+                callback(data, RustFuturePoll::Wake);
             }
             Self::Cancelled => {
                 callback(data, RustFuturePoll::Ready);
@@ -67,7 +67,7 @@ impl Scheduler {
                 let old_data = *old_data;
                 let callback = *callback;
                 *self = Self::Empty;
-                callback(old_data, RustFuturePoll::MaybeReady);
+                callback(old_data, RustFuturePoll::Wake);
             }
             // If we were in the `Empty` state, then transition to `Waked`.  The next time `store`
             // is called, we will immediately call the continuation.
diff --git a/third_party/rust/uniffi_core/src/ffi/rustfuture/tests.rs b/third_party/rust/uniffi_core/src/ffi/rustfuture/tests.rs
index 54e9d7d0be20d..316fde905c72f 100644
--- a/third_party/rust/uniffi_core/src/ffi/rustfuture/tests.rs
+++ b/third_party/rust/uniffi_core/src/ffi/rustfuture/tests.rs
@@ -73,20 +73,20 @@ impl Future for Receiver {
 }
 
 // Create a sender and rust future that we can use for testing
-fn channel() -> (Sender, Arc<dyn RustFutureFfi<RustBuffer>>) {
+fn channel() -> (Sender, Arc<RustFuture<RustBuffer>>) {
     let channel = Arc::new(Mutex::new(Channel {
         result: None,
         waker: None,
     }));
     let rust_future = RustFuture::new(Box::pin(Receiver(channel.clone())), crate::UniFfiTag);
-    (Sender(channel), rust_future)
+    (Sender(channel), Arc::new(rust_future))
 }
 
 /// Poll a Rust future and get an OnceCell that's set when the continuation is called
-fn poll(rust_future: &Arc<dyn RustFutureFfi<RustBuffer>>) -> Arc<OnceCell<RustFuturePoll>> {
+fn poll(rust_future: &Arc<RustFuture<RustBuffer>>) -> Arc<OnceCell<RustFuturePoll>> {
     let cell = Arc::new(OnceCell::new());
     let handle = Arc::into_raw(cell.clone()) as u64;
-    rust_future.clone().ffi_poll(poll_continuation, handle);
+    rust_future.clone().poll(poll_continuation, handle);
     cell
 }
 
@@ -95,9 +95,9 @@ extern "C" fn poll_continuation(data: u64, code: RustFuturePoll) {
     cell.set(code).expect("Error setting OnceCell");
 }
 
-fn complete(rust_future: Arc<dyn RustFutureFfi<RustBuffer>>) -> (RustBuffer, RustCallStatus) {
+fn complete(rust_future: Arc<RustFuture<RustBuffer>>) -> (RustBuffer, RustCallStatus) {
     let mut out_status_code = RustCallStatus::default();
-    let return_value = rust_future.ffi_complete(&mut out_status_code);
+    let return_value = rust_future.complete(&mut out_status_code);
     (return_value, out_status_code)
 }
 
@@ -109,13 +109,13 @@ fn test_success() {
     let continuation_result = poll(&rust_future);
     assert_eq!(continuation_result.get(), None);
     sender.wake();
-    assert_eq!(continuation_result.get(), Some(&RustFuturePoll::MaybeReady));
+    assert_eq!(continuation_result.get(), Some(&RustFuturePoll::Wake));
 
     // Test polling the rust future when it's ready
     let continuation_result = poll(&rust_future);
     assert_eq!(continuation_result.get(), None);
     sender.send(Ok("All done".into()));
-    assert_eq!(continuation_result.get(), Some(&RustFuturePoll::MaybeReady));
+    assert_eq!(continuation_result.get(), Some(&RustFuturePoll::Wake));
 
     // Future polls should immediately return ready
     let continuation_result = poll(&rust_future);
@@ -137,7 +137,7 @@ fn test_error() {
     let continuation_result = poll(&rust_future);
     assert_eq!(continuation_result.get(), None);
     sender.send(Err("Something went wrong".into()));
-    assert_eq!(continuation_result.get(), Some(&RustFuturePoll::MaybeReady));
+    assert_eq!(continuation_result.get(), Some(&RustFuturePoll::Wake));
 
     let continuation_result = poll(&rust_future);
     assert_eq!(continuation_result.get(), Some(&RustFuturePoll::Ready));
@@ -160,7 +160,7 @@ fn test_lift_args_error() {
     let continuation_result = poll(&rust_future);
     assert_eq!(continuation_result.get(), None);
     sender.send_lift_args_error("arg0", anyhow::anyhow!("Invalid handle"));
-    assert_eq!(continuation_result.get(), Some(&RustFuturePoll::MaybeReady));
+    assert_eq!(continuation_result.get(), Some(&RustFuturePoll::Wake));
 
     let continuation_result = poll(&rust_future);
     assert_eq!(continuation_result.get(), Some(&RustFuturePoll::Ready));
@@ -172,7 +172,7 @@ fn test_lift_args_error() {
             call_status.error_buf
         ))
         .unwrap(),
-        "Failed to convert arg 'arg0': Invalid handle",
+        "Failed to convert arg 'arg0':\nInvalid handle",
     )
 }
 
@@ -184,7 +184,7 @@ fn test_cancel() {
 
     let continuation_result = poll(&rust_future);
     assert_eq!(continuation_result.get(), None);
-    rust_future.ffi_cancel();
+    rust_future.cancel();
     // Cancellation should immediately invoke the callback with RustFuturePoll::Ready
     assert_eq!(continuation_result.get(), Some(&RustFuturePoll::Ready));
 
@@ -210,7 +210,7 @@ fn test_release_future() {
     let rust_future2 = rust_future.clone();
 
     // Complete the rust future
-    rust_future.ffi_free();
+    rust_future.free();
     // Even though rust_future is still alive, the channel shouldn't be
     assert!(Arc::strong_count(&rust_future2) > 0);
     assert_eq!(channel_weak.strong_count(), 0);
@@ -225,7 +225,7 @@ fn test_complete_with_stored_continuation() {
     let (_sender, rust_future) = channel();
 
     let continuation_result = poll(&rust_future);
-    rust_future.ffi_free();
+    rust_future.free();
     assert_eq!(continuation_result.get(), Some(&RustFuturePoll::Ready));
 }
 
@@ -246,11 +246,11 @@ fn test_wake_during_poll() {
             Poll::Ready(Ok("All done".to_owned()))
         }
     });
-    let rust_future: Arc<dyn RustFutureFfi<RustBuffer>> =
-        RustFuture::new(Box::pin(future), crate::UniFfiTag);
+    let rust_future: Arc<RustFuture<RustBuffer>> =
+        Arc::new(RustFuture::new(Box::pin(future), crate::UniFfiTag));
     let continuation_result = poll(&rust_future);
     // The continuation function should called immediately
-    assert_eq!(continuation_result.get(), Some(&RustFuturePoll::MaybeReady));
+    assert_eq!(continuation_result.get(), Some(&RustFuturePoll::Wake));
     // A second poll should finish the future
     let continuation_result = poll(&rust_future);
     assert_eq!(continuation_result.get(), Some(&RustFuturePoll::Ready));
diff --git a/third_party/rust/uniffi_core/src/ffi_converter_impls.rs b/third_party/rust/uniffi_core/src/ffi_converter_impls.rs
index e835422212480..6225cd3e0b221 100644
--- a/third_party/rust/uniffi_core/src/ffi_converter_impls.rs
+++ b/third_party/rust/uniffi_core/src/ffi_converter_impls.rs
@@ -486,13 +486,14 @@ where
     }
 
     fn handle_failed_lift(error: crate::LiftArgsError) -> Result<Self::ReturnType, RustCallError> {
-        match error.error.downcast::<E>() {
-            Ok(downcast) => Err(RustCallError::Error(E::lower_error(downcast))),
-            Err(e) => {
-                let msg = format!("Failed to convert arg '{}': {e}", error.arg_name);
-                Err(RustCallError::InternalError(msg))
-            }
-        }
+        let crate::LiftArgsError { arg_name, error } = error;
+
+        let error = match error.downcast::<E>() {
+            Ok(user) => RustCallError::Error(<E as LowerError<UT>>::lower_error(user)),
+            Err(error) => crate::LiftArgsError { arg_name, error }.to_internal_error(),
+        };
+
+        Err(error)
     }
 }
 
diff --git a/third_party/rust/uniffi_core/src/ffi_converter_traits.rs b/third_party/rust/uniffi_core/src/ffi_converter_traits.rs
index 8f199ee7031e5..4ef1e5d37b47f 100644
--- a/third_party/rust/uniffi_core/src/ffi_converter_traits.rs
+++ b/third_party/rust/uniffi_core/src/ffi_converter_traits.rs
@@ -306,10 +306,7 @@ pub unsafe trait LowerReturn<UT>: Sized {
     ///   `Err(RustCallError::Error(buf))`. This results in better exception throws on the foreign
     ///   side.
     fn handle_failed_lift(error: LiftArgsError) -> Result<Self::ReturnType, RustCallError> {
-        let LiftArgsError { arg_name, error } = error;
-        Err(RustCallError::InternalError(format!(
-            "Failed to convert arg '{arg_name}': {error}"
-        )))
+        Err(error.to_internal_error())
     }
 }
 
@@ -650,15 +647,14 @@ macro_rules! derive_ffi_traits {
 
 unsafe impl<T: Send + Sync, UT> HandleAlloc<UT> for T {
     fn new_handle(value: Arc<Self>) -> Handle {
-        Handle::from_pointer(Arc::into_raw(value))
+        Handle::from_arc(value)
     }
 
     unsafe fn clone_handle(handle: Handle) -> Handle {
-        Arc::increment_strong_count(handle.as_pointer::<T>());
-        handle
+        handle.clone_arc_handle::<T>()
     }
 
     unsafe fn consume_handle(handle: Handle) -> Arc<Self> {
-        Arc::from_raw(handle.as_pointer())
+        handle.into_arc()
     }
 }
diff --git a/third_party/rust/uniffi_core/src/lib.rs b/third_party/rust/uniffi_core/src/lib.rs
index 0f76612145472..90c2c8651414e 100644
--- a/third_party/rust/uniffi_core/src/lib.rs
+++ b/third_party/rust/uniffi_core/src/lib.rs
@@ -37,7 +37,7 @@
 #[macro_export]
 macro_rules! trace {
     ($($tt:tt)*) => {
-        println!($($tt)*);
+        ::std::println!($($tt)*);
     }
 }
 
diff --git a/third_party/rust/uniffi_core/src/metadata.rs b/third_party/rust/uniffi_core/src/metadata.rs
index acebf22112e57..67190a3be68c7 100644
--- a/third_party/rust/uniffi_core/src/metadata.rs
+++ b/third_party/rust/uniffi_core/src/metadata.rs
@@ -81,12 +81,17 @@ pub mod codes {
     pub const LIT_SOME: u8 = 5;
     pub const LIT_EMPTY_SEQ: u8 = 6;
     pub const LIT_EMPTY_MAP: u8 = 7;
+
+    // DefaultValue codes
+    pub const DEFVALUE_DEFAULT: u8 = 0;
+    pub const DEFVALUE_LITERAL: u8 = 1;
 }
 
-// For large errors (e.g. enums) a buffer size of ~4k - ~8k
-// is not enough. See issues on Github: #1968 and #2041 and
-// for an example see fixture/large-error
-const BUF_SIZE: usize = 16384;
+// For large enums and small items with large docstrings we want this to be
+// large - but not so large the compiler's memory becomes a problem.
+// See eg, #1968, #2041, 2531, fixtures/large-error
+// I guess we keep doubling this until morale improves :)
+const BUF_SIZE: usize = 32768;
 
 // This struct is a kludge around the fact that Rust const generic support doesn't quite handle our
 // needs.
diff --git a/third_party/rust/uniffi_internal_macros/.cargo-checksum.json b/third_party/rust/uniffi_internal_macros/.cargo-checksum.json
index 5d4c5289754ac..b950676c35912 100644
--- a/third_party/rust/uniffi_internal_macros/.cargo-checksum.json
+++ b/third_party/rust/uniffi_internal_macros/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"53956f6781aac82bf87b84a9d922f93e1410c5034e37d67af8d2b9461444f301","Cargo.lock":"50befa63054ecbace0ea65c879433a22a29b7a574cb8eac2317d1adbdb706167","Cargo.toml":"494086944abb53c5f16bea8a5f82dc42535eda9705994e851e7b356f9442b48e","Cargo.toml.orig":"12bcd997bd04a8a7f4b7ec0a15347200644c307e3cf44b459e7349917345584c","README.md":"a07b147b4a2f3305f3346ab8a223c287795498d89c0b4781bc93d5f5026b70bc","src/as_ref.rs":"38ebcc914271380a105cfc0aca5b741ef31cc8bee54643e657e8ac331268ad4a","src/checksum.rs":"f37765bd7cb88fe3bcca4a3295e75a31ad2f7a5fa7d818b6aacf425753df5342","src/ir/ast.rs":"c3745d5e95261040753b9af05aa2cf1bcdf2348c35baf8fcd25269530a0d4964","src/ir/mod.rs":"5dfad799ecf42d37d68e53c4dc3da3537c7411d3503f6ba7086d5c0a988afa79","src/ir/parse.rs":"c97e20e13551de2f9278675bd8bff7b99cf7ff5dc60a1f3f124ab05bfd27eb3a","src/ir/render.rs":"61978d470415548dd5d14fd7d79c7fcd94bb5292bc65f0962a156f8076aeec51","src/lib.rs":"1379a1f38283c96fa1e29987214ef84939b524033f8608d23488427e25c9303f"},"package":"f64bec2f3a33f2f08df8150e67fa45ba59a2ca740bf20c1beb010d4d791f9a1b"}
\ No newline at end of file
+{"files":{".cargo_vcs_info.json":"c1043030eb244252fca38c567f1f5a9168d930a05037c41952f0cd33133c4a19","Cargo.lock":"130e6778db2001b6227f22c0699911ccf24a156a1e6dc015c3456a14498dd309","Cargo.toml":"5bf24e51de42f1f3f210e2f7aea93e8c009841681da52372a9405fb456aa1a28","Cargo.toml.orig":"e31626b64690ee8963c17620b924a4cd85c7cd20de26566a502af1b5ec47390f","README.md":"c48ebaa9337cbe23085b172e2100088b67ae3f3823e114dc532e9d67f5ff6133","src/checksum.rs":"78da6c85e2ac9f48fc6f8ca8cff82cf444bd99ee4d217fc9a549ac48d6830f93","src/ir/ast.rs":"db4ac8c4a5148a352559186c99f3176d1198ef61b142f7a36396491be12a94bc","src/ir/mod.rs":"5dfad799ecf42d37d68e53c4dc3da3537c7411d3503f6ba7086d5c0a988afa79","src/ir/parse.rs":"c97e20e13551de2f9278675bd8bff7b99cf7ff5dc60a1f3f124ab05bfd27eb3a","src/ir/render.rs":"61978d470415548dd5d14fd7d79c7fcd94bb5292bc65f0962a156f8076aeec51","src/lib.rs":"97368ac70c06793788d10dc1947dd5f4b8355ddee7bf10eb6b753356435b5973"},"package":"98f51ebca0d9a4b2aa6c644d5ede45c56f73906b96403c08a1985e75ccb64a01"}
\ No newline at end of file
diff --git a/third_party/rust/uniffi_internal_macros/.cargo_vcs_info.json b/third_party/rust/uniffi_internal_macros/.cargo_vcs_info.json
index 6c3b41bd43493..42836eb01ac7c 100644
--- a/third_party/rust/uniffi_internal_macros/.cargo_vcs_info.json
+++ b/third_party/rust/uniffi_internal_macros/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "0eda2855d5b4be435013d5baef808d5f9caee0fd"
+    "sha1": "309762f55db3f0548194a9ceba3027fa64b18a93"
   },
   "path_in_vcs": "uniffi_internal_macros"
 }
\ No newline at end of file
diff --git a/third_party/rust/uniffi_internal_macros/Cargo.lock b/third_party/rust/uniffi_internal_macros/Cargo.lock
index 251daf32ad91f..fe03aeccc2026 100644
--- a/third_party/rust/uniffi_internal_macros/Cargo.lock
+++ b/third_party/rust/uniffi_internal_macros/Cargo.lock
@@ -67,7 +67,7 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "uniffi_internal_macros"
-version = "0.29.3"
+version = "0.31.0"
 dependencies = [
  "anyhow",
  "indexmap",
diff --git a/third_party/rust/uniffi_internal_macros/Cargo.toml b/third_party/rust/uniffi_internal_macros/Cargo.toml
index a01c48bcbe449..a7b761eca2f5e 100644
--- a/third_party/rust/uniffi_internal_macros/Cargo.toml
+++ b/third_party/rust/uniffi_internal_macros/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2021"
 name = "uniffi_internal_macros"
-version = "0.29.3"
+version = "0.31.0"
 build = false
 autolib = false
 autobins = false
diff --git a/third_party/rust/uniffi_internal_macros/Cargo.toml.orig b/third_party/rust/uniffi_internal_macros/Cargo.toml.orig
index c32d01608d804..26d5b3f8dc205 100644
--- a/third_party/rust/uniffi_internal_macros/Cargo.toml.orig
+++ b/third_party/rust/uniffi_internal_macros/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "uniffi_internal_macros"
-version = "0.29.3"
+version = "0.31.0"
 description = "a multi-language bindings generator for rust (interal macro crate)"
 documentation = "https://mozilla.github.io/uniffi-rs"
 homepage = "https://mozilla.github.io/uniffi-rs"
diff --git a/third_party/rust/uniffi_internal_macros/README.md b/third_party/rust/uniffi_internal_macros/README.md
index 8ac2fa34bfd33..4450243be81aa 100644
--- a/third_party/rust/uniffi_internal_macros/README.md
+++ b/third_party/rust/uniffi_internal_macros/README.md
@@ -50,12 +50,13 @@ Other tools we know of which try and solve a similarly shaped problem are:
 
 ## Third-party foreign language bindings
 
-* [React Native bindings](https://github.com/jhugman/uniffi-bindgen-react-native). The repository contains tooling to generate bindings for [Hermes](https://github.com/facebook/hermes) and for [creating Turbo Modules](https://reactnative.dev/blog/2024/10/23/the-new-architecture-is-here#new-native-modules).
+* [Javascript bindings](https://github.com/jhugman/uniffi-bindgen-react-native): running in a web page, targeting WASM; and React Native targeting Android, iOS. The repository contains tooling to generate bindings for [Hermes](https://github.com/facebook/hermes), [creating Turbo Modules](https://reactnative.dev/blog/2024/10/23/the-new-architecture-is-here#new-native-modules), and for creating a [`wasm-bindgen` bindings crate](https://rustwasm.github.io/wasm-bindgen).
 * [Kotlin Multiplatform support (Gobley)](https://github.com/gobley/gobley). The repository contains Kotlin Multiplatform bindings generation for UniFFI, letting you target both JVM and Native.
 * [Go bindings](https://github.com/NordSecurity/uniffi-bindgen-go)
 * [C# bindings](https://github.com/NordSecurity/uniffi-bindgen-cs)
 * [Dart bindings](https://github.com/NiallBunting/uniffi-rs-dart)
 * [Java bindings](https://github.com/IronCoreLabs/uniffi-bindgen-java)
+* [Node bindings](https://github.com/livekit/uniffi-bindgen-node) (early development)
 
 ### External resources
 
diff --git a/third_party/rust/uniffi_internal_macros/src/as_ref.rs b/third_party/rust/uniffi_internal_macros/src/as_ref.rs
deleted file mode 100644
index e32d59465248b..0000000000000
--- a/third_party/rust/uniffi_internal_macros/src/as_ref.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use proc_macro2::TokenStream;
-use quote::quote;
-use syn::{Attribute, Data, DeriveInput, Field, Fields, Member, Result};
-
-pub fn expand_as_ref(input: DeriveInput) -> Result<TokenStream> {
-    let type_name = &input.ident;
-    let st = match input.data {
-        Data::Struct(st) => st,
-        Data::Enum(_) => return Err(syn::Error::new(input.ident.span(), "Enums not supported")),
-        Data::Union(_) => return Err(syn::Error::new(input.ident.span(), "Union not supported")),
-    };
-    let mut tokens = TokenStream::default();
-
-    if has_as_ref_attr(&input.attrs) {
-        tokens.extend(quote! {
-            impl ::std::convert::AsRef<#type_name> for #type_name {
-                fn as_ref(&self) -> &#type_name {
-                    self
-                }
-            }
-        });
-    }
-
-    for (m, f) in members_and_fields(&st.fields) {
-        if has_as_ref_attr(&f.attrs) {
-            let ty = &f.ty;
-            tokens.extend(quote! {
-                impl ::std::convert::AsRef<#ty> for #type_name {
-                    fn as_ref(&self) -> &#ty {
-                        &self.#m
-                    }
-                }
-
-            })
-        }
-    }
-    Ok(tokens)
-}
-
-fn members_and_fields(fields: &Fields) -> impl Iterator<Item = (Member, &Field)> {
-    fields.iter().enumerate().map(|(idx, f)| {
-        let member = match &f.ident {
-            Some(ident) => Member::from(ident.clone()),
-            None => Member::from(idx),
-        };
-        (member, f)
-    })
-}
-
-fn has_as_ref_attr(attrs: &[Attribute]) -> bool {
-    attrs.iter().any(|attr| attr.path().is_ident("as_ref"))
-}
diff --git a/third_party/rust/uniffi_internal_macros/src/checksum.rs b/third_party/rust/uniffi_internal_macros/src/checksum.rs
index df9422c4427f3..06fcd4377eb9c 100644
--- a/third_party/rust/uniffi_internal_macros/src/checksum.rs
+++ b/third_party/rust/uniffi_internal_macros/src/checksum.rs
@@ -101,7 +101,7 @@ pub fn expand_derive(input: DeriveInput) -> TokenStream {
                 .fields
                 .iter()
                 .enumerate()
-                .filter(|&(_num, field)| (!has_ignore_attribute(&field.attrs)))
+                .filter(|&(_num, field)| !has_ignore_attribute(&field.attrs))
                 .map(|(num, field)| match field.ident.as_ref() {
                     Some(ident) => quote! { Checksum::checksum(&self.#ident, state); },
                     None => {
diff --git a/third_party/rust/uniffi_internal_macros/src/ir/ast.rs b/third_party/rust/uniffi_internal_macros/src/ir/ast.rs
index f1a742f27329a..4bbf53f8b0c50 100644
--- a/third_party/rust/uniffi_internal_macros/src/ir/ast.rs
+++ b/third_party/rust/uniffi_internal_macros/src/ir/ast.rs
@@ -19,6 +19,7 @@ pub struct Node {
     pub def: NodeDef,
 }
 
+#[allow(clippy::large_enum_variant)]
 #[derive(Clone)]
 pub enum NodeDef {
     Struct(Struct),
diff --git a/third_party/rust/uniffi_internal_macros/src/lib.rs b/third_party/rust/uniffi_internal_macros/src/lib.rs
index 4084d3ffe2bfe..3a872f2c52b2f 100644
--- a/third_party/rust/uniffi_internal_macros/src/lib.rs
+++ b/third_party/rust/uniffi_internal_macros/src/lib.rs
@@ -5,7 +5,6 @@
 use proc_macro::TokenStream;
 use syn::parse_macro_input;
 
-mod as_ref;
 mod checksum;
 mod ir;
 
@@ -21,10 +20,3 @@ pub fn node(input: TokenStream) -> TokenStream {
         .unwrap_or_else(syn::Error::into_compile_error)
         .into()
 }
-
-#[proc_macro_derive(AsRef, attributes(as_ref))]
-pub fn expand_as_ref(input: TokenStream) -> TokenStream {
-    as_ref::expand_as_ref(parse_macro_input!(input))
-        .unwrap_or_else(syn::Error::into_compile_error)
-        .into()
-}
diff --git a/third_party/rust/uniffi_macros/.cargo-checksum.json b/third_party/rust/uniffi_macros/.cargo-checksum.json
index 0a251d1374429..a1a52d183e6f4 100644
--- a/third_party/rust/uniffi_macros/.cargo-checksum.json
+++ b/third_party/rust/uniffi_macros/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"24bc5af42a7f3de0d67167428f64d6b74ccffecfb07b9beec91ab595f1935667","Cargo.lock":"a8cead900bb5a631b5b4c3b94cdf974ebf7519b37a5ee1fb598ce3ed2743468e","Cargo.toml":"d5f5d4698fcafbb008a6589e1debe13f22c5098f3bced72797dd69f65d30b2f0","Cargo.toml.orig":"927f5072ee4ea16bcbb207381c7ba556e28b2d1a1ec7afd808190eb4591f626f","README.md":"a07b147b4a2f3305f3346ab8a223c287795498d89c0b4781bc93d5f5026b70bc","src/custom.rs":"1e6b642216717a73c3209c99c4fd11f125a9be026abd982a6b6852fca39f73c9","src/default.rs":"77466ac54da69094bcdccc5927d0980b1e9dd0095647ca825830673c48847a53","src/derive.rs":"70beb2fa76705b8f879b3bb41aecf07341fa2a809585431c517436734e96fff4","src/enum_.rs":"de3807662071222877a1abc4aad9cd04bfa16850f1e36a18f078addfed73e775","src/error.rs":"6d1a9946fbe587622bdb7ad3eabde4bdceac64d542fb686a7031f4a1ded5b55c","src/export.rs":"b87aeb6573706897f890ed7439839481b3a8a76d4fe6741d07c8c505139d6260","src/export/attributes.rs":"29835ea10f0399c98490ab6396e840baa293ab7fa9986c65e637961345df2900","src/export/callback_interface.rs":"dbeb543282da14ca635c272b7c0e728e56ac5a69f17320f6b7464f63484c1f84","src/export/item.rs":"179195a3368d6c8d4b9a3bf45e534e0c1bd08186439685bf95850f5cdc995b5b","src/export/scaffolding.rs":"6b7a65662d934b7fa21582f662ea5c7b3344cccdbb3781a609bc18c9ae018ae1","src/export/trait_interface.rs":"a0cb38155436f7faa5d00969471a10fec50063f5166ad1c8a7b2e38d3fbdf898","src/export/utrait.rs":"9547c8efefd2997f7d56b5d8b08b54b68abac492e205fbfeeb189276f96f4b99","src/ffiops.rs":"4ececc512e1155c350f2e486b3276b1416b4d043a120a30f7ee35cbdce1f17c3","src/fnsig.rs":"2d117c24cdb794667787f7de59930f3d49a4bdb105c1a8e443b94a7d84e6d59c","src/lib.rs":"0b2508476c126707dfcc76a522332b38b701ee7e3c93c1c84ca61859afdfba3a","src/object.rs":"1ad11aea0a72b0f1f37ccb3e2bb57b9387948e0fc5f334f8501438df54634058","src/record.rs":"9d8cc3fe9ef44ff2554b90fdd4b0b9e647a75f6d1002145c4a4291f7cdff20f4","src/remote.rs":"ae1ed719070ba267df4a7c5661b88d15c79dc2e7f43a8c2cafe2b4099fe84261","src/setup_scaffolding.rs":"e620f3675d751329afbabc97bcd69cc9153e39381040f897371ec47a4eda4fff","src/test.rs":"6de5c5719f0ece8b2fb5a3cf838628e8c733f623f31838cb4ee670ca03ebb0de","src/util.rs":"3750924cb97d5dd75d0758e5412d29c0050f698038a408830d3dfaf134542ea0"},"package":"5d8708716d2582e4f3d7e9f320290b5966eb951ca421d7630571183615453efc"}
\ No newline at end of file
+{"files":{".cargo_vcs_info.json":"d92b9f0eed27ed5535af7ee758fd5574f3bcc3930fef4372a7eb13eda9b31572","Cargo.lock":"0ac2b1447d099f10cc6f3989e81783ce325948f302e118b73dc3f1f722ab613e","Cargo.toml":"fa2952f4374e3c43c48a26494ea415a72c2af5a8b167ebb7640d2330a8c48fa8","Cargo.toml.orig":"8f251e5154308b7e6276a8f2752fa4c820f660bb19caaf01d4694804e3ea67d9","README.md":"c48ebaa9337cbe23085b172e2100088b67ae3f3823e114dc532e9d67f5ff6133","src/custom.rs":"d575c43507a2008183d90cd6fbbd431d6c4af997f9b141c8083e23567f5ee261","src/default.rs":"a73b1135843077734ab7dd4a34cd61d25e33ae03a20c3b69143590ecdd52b7a0","src/derive.rs":"70beb2fa76705b8f879b3bb41aecf07341fa2a809585431c517436734e96fff4","src/enum_.rs":"b86f8a05bcf9afcb69609526b7ad38687af385d2b348bbf2743d8d5287cb7380","src/error.rs":"ce7ab7bdef1809ce2ce7d539e34e9baa4ea438e1fe1d6ba219bdf5313f104b3a","src/export.rs":"ae8264a6f75479582c0986c01c2dc1e254a4d57d5d86561ad96401eedab69f8e","src/export/attributes.rs":"69d8319a521f424c05fff9ee7cd36dac780a0d22dd8ad61c56dcf2334bbb6492","src/export/callback_interface.rs":"650f7e0f135f74bc1e624feb7042c44f160fb2c379688ea9ee21c3234aac1d26","src/export/item.rs":"860d73586c7ecb118267bca115d7393cdf08cca3261d15d2e7afe099aa649adc","src/export/scaffolding.rs":"fb00cc5b06cd032b242a90d9e5c0fb2278bc26a4474be0d1ba7b1d6482309d0c","src/export/trait_interface.rs":"831b5a86dfacea9bc0725fad8bc1e4642befb94a4cfbad585061a9670f163f39","src/export/utrait.rs":"d76994bc77e71ffb636bf9cc43f82abe9172b1f3e0ede56219b322768c400c45","src/ffiops.rs":"4ececc512e1155c350f2e486b3276b1416b4d043a120a30f7ee35cbdce1f17c3","src/fnsig.rs":"a34f798b0ee7d4b27926c8db71f4562a4f5fd51f308e41925679a6f9fe40f0b1","src/lib.rs":"b1a335620bcd7b538c929289c72900bfcd927e306e38f5adda2c4cc4e9077719","src/object.rs":"9f2a1af3401d585e26d4e507008ef2db8f8f091c9a0195fe48452fae98208724","src/record.rs":"de1beb2be8821b02bf3a09162578ccbc420d6fa2352c487ae9953e79a65fe03a","src/remote.rs":"ae1ed719070ba267df4a7c5661b88d15c79dc2e7f43a8c2cafe2b4099fe84261","src/setup_scaffolding.rs":"74efd23a078a03e27295e03ac841fa04bde635d42de8b8c60fe25b3855596466","src/test.rs":"6de5c5719f0ece8b2fb5a3cf838628e8c733f623f31838cb4ee670ca03ebb0de","src/util.rs":"be2dbbdb6b45e0e0986a323156990eac75f8d1cb100a0748e91f3b41fa471287"},"package":"db9d12529f1223d014fd501e5f29ca0884d15d6ed5ddddd9f506e55350327dc3"}
\ No newline at end of file
diff --git a/third_party/rust/uniffi_macros/.cargo_vcs_info.json b/third_party/rust/uniffi_macros/.cargo_vcs_info.json
index 489e111913174..08bdb7df766bf 100644
--- a/third_party/rust/uniffi_macros/.cargo_vcs_info.json
+++ b/third_party/rust/uniffi_macros/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "0eda2855d5b4be435013d5baef808d5f9caee0fd"
+    "sha1": "309762f55db3f0548194a9ceba3027fa64b18a93"
   },
   "path_in_vcs": "uniffi_macros"
 }
\ No newline at end of file
diff --git a/third_party/rust/uniffi_macros/Cargo.lock b/third_party/rust/uniffi_macros/Cargo.lock
index f2d166479e60a..e8b343a644a0b 100644
--- a/third_party/rust/uniffi_macros/Cargo.lock
+++ b/third_party/rust/uniffi_macros/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "askama"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a4e46abb203e00ef226442d452769233142bbfdd79c3941e84c8e61c4112543"
+checksum = "f75363874b771be265f4ffe307ca705ef6f3baa19011c149da8674a87f1b75c4"
 dependencies = [
  "askama_derive",
  "itoa",
@@ -23,9 +23,9 @@ dependencies = [
 
 [[package]]
 name = "askama_derive"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54398906821fd32c728135f7b351f0c7494ab95ae421d41b6f5a020e158f28a6"
+checksum = "129397200fe83088e8a68407a8e2b1f826cf0086b21ccdb866a722c8bcd3a94f"
 dependencies = [
  "askama_parser",
  "basic-toml",
@@ -40,9 +40,9 @@ dependencies = [
 
 [[package]]
 name = "askama_parser"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf315ce6524c857bb129ff794935cf6d42c82a6cff60526fe2a63593de4d0d4f"
+checksum = "d6ab5630b3d5eaf232620167977f95eb51f3432fc76852328774afbd242d4358"
 dependencies = [
  "memchr",
  "serde",
@@ -96,7 +96,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -148,6 +148,7 @@ checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
  "hashbrown",
+ "serde",
 ]
 
 [[package]]
@@ -198,9 +199,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "percent-encoding"
@@ -257,7 +258,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -318,11 +319,20 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "siphasher"
-version = "0.3.11"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "smawk"
@@ -365,13 +375,45 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.11"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
 dependencies = [
  "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
 ]
 
+[[package]]
+name = "toml_datetime"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_write",
+ "winnow",
+]
+
+[[package]]
+name = "toml_write"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.12"
@@ -380,9 +422,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "uniffi_bindgen"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ff0132b533483cf19abb30bba5c72c24d9f3e4d9a2ff71cb3e22e73899fd46e"
+checksum = "4ed0150801958d4825da56a41c71f000a457ac3a4613fa9647df78ac4b6b6881"
 dependencies = [
  "anyhow",
  "askama",
@@ -405,9 +447,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_build"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d84d607076008df3c32dd2100ee4e727269f11d3faa35691af70d144598f666"
+checksum = "b78fd9271a4c2e85bd2c266c5a9ede1fac676eb39fd77f636c27eaf67426fd5f"
 dependencies = [
  "anyhow",
  "camino",
@@ -416,9 +458,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_internal_macros"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f64bec2f3a33f2f08df8150e67fa45ba59a2ca740bf20c1beb010d4d791f9a1b"
+checksum = "98f51ebca0d9a4b2aa6c644d5ede45c56f73906b96403c08a1985e75ccb64a01"
 dependencies = [
  "anyhow",
  "indexmap",
@@ -429,7 +471,7 @@ dependencies = [
 
 [[package]]
 name = "uniffi_macros"
-version = "0.29.3"
+version = "0.31.0"
 dependencies = [
  "camino",
  "fs-err",
@@ -445,9 +487,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_meta"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d226fc167754ce548c5ece9828c8a06f03bf1eea525d2659ba6bd648bd8e2f3"
+checksum = "9df6d413db2827c68588f8149d30d49b71d540d46539e435b23a7f7dbd4d4f86"
 dependencies = [
  "anyhow",
  "siphasher",
@@ -457,9 +499,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_pipeline"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b925b6421df15cf4bedee27714022cd9626fb4d7eee0923522a608b274ba4371"
+checksum = "a806dddc8208f22efd7e95a5cdf88ed43d0f3271e8f63b47e757a8bbdb43b63a"
 dependencies = [
  "anyhow",
  "heck",
@@ -470,9 +512,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_udl"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c42649b721df759d9d4692a376b82b62ce3028ec9fc466f4780fb8cdf728996"
+checksum = "0d1a7339539bf6f6fa3e9b534dece13f778bda2d54b1a6d4e40b4d6090ac26e7"
 dependencies = [
  "anyhow",
  "textwrap",
@@ -500,9 +542,9 @@ dependencies = [
 
 [[package]]
 name = "windows-sys"
-version = "0.52.0"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
  "windows-targets 0.52.6",
 ]
@@ -630,9 +672,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.7.4"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
 dependencies = [
  "memchr",
 ]
diff --git a/third_party/rust/uniffi_macros/Cargo.toml b/third_party/rust/uniffi_macros/Cargo.toml
index e7a3dd6de9a0b..6ebb53a486ce8 100644
--- a/third_party/rust/uniffi_macros/Cargo.toml
+++ b/third_party/rust/uniffi_macros/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2021"
 name = "uniffi_macros"
-version = "0.29.3"
+version = "0.31.0"
 build = false
 autolib = false
 autobins = false
@@ -72,11 +72,11 @@ features = [
 ]
 
 [dependencies.toml]
-version = "0.5.9"
+version = ">=0.8, <=0.9"
 
 [dependencies.uniffi_build]
-version = "=0.29.3"
+version = "=0.31.0"
 optional = true
 
 [dependencies.uniffi_meta]
-version = "=0.29.3"
+version = "=0.31.0"
diff --git a/third_party/rust/uniffi_macros/Cargo.toml.orig b/third_party/rust/uniffi_macros/Cargo.toml.orig
index 810b82ce2b3c5..896f8f155f073 100644
--- a/third_party/rust/uniffi_macros/Cargo.toml.orig
+++ b/third_party/rust/uniffi_macros/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "uniffi_macros"
-version = "0.29.3"
+version = "0.31.0"
 description = "a multi-language bindings generator for rust (convenience macros)"
 documentation = "https://mozilla.github.io/uniffi-rs"
 homepage = "https://mozilla.github.io/uniffi-rs"
@@ -21,9 +21,9 @@ proc-macro2 = "1.0"
 quote = "1.0"
 serde = { version = "1.0.136", features = ["derive"] }
 syn = { version = "2.0", features = ["full", "visit-mut"] }
-toml = "0.5.9"
-uniffi_build = { path = "../uniffi_build", version = "=0.29.3", optional = true }
-uniffi_meta = { path = "../uniffi_meta", version = "=0.29.3" }
+toml = ">=0.8, <=0.9"
+uniffi_build = { path = "../uniffi_build", version = "=0.31.0", optional = true }
+uniffi_meta = { path = "../uniffi_meta", version = "=0.31.0" }
 
 [features]
 default = []
diff --git a/third_party/rust/uniffi_macros/README.md b/third_party/rust/uniffi_macros/README.md
index 8ac2fa34bfd33..4450243be81aa 100644
--- a/third_party/rust/uniffi_macros/README.md
+++ b/third_party/rust/uniffi_macros/README.md
@@ -50,12 +50,13 @@ Other tools we know of which try and solve a similarly shaped problem are:
 
 ## Third-party foreign language bindings
 
-* [React Native bindings](https://github.com/jhugman/uniffi-bindgen-react-native). The repository contains tooling to generate bindings for [Hermes](https://github.com/facebook/hermes) and for [creating Turbo Modules](https://reactnative.dev/blog/2024/10/23/the-new-architecture-is-here#new-native-modules).
+* [Javascript bindings](https://github.com/jhugman/uniffi-bindgen-react-native): running in a web page, targeting WASM; and React Native targeting Android, iOS. The repository contains tooling to generate bindings for [Hermes](https://github.com/facebook/hermes), [creating Turbo Modules](https://reactnative.dev/blog/2024/10/23/the-new-architecture-is-here#new-native-modules), and for creating a [`wasm-bindgen` bindings crate](https://rustwasm.github.io/wasm-bindgen).
 * [Kotlin Multiplatform support (Gobley)](https://github.com/gobley/gobley). The repository contains Kotlin Multiplatform bindings generation for UniFFI, letting you target both JVM and Native.
 * [Go bindings](https://github.com/NordSecurity/uniffi-bindgen-go)
 * [C# bindings](https://github.com/NordSecurity/uniffi-bindgen-cs)
 * [Dart bindings](https://github.com/NiallBunting/uniffi-rs-dart)
 * [Java bindings](https://github.com/IronCoreLabs/uniffi-bindgen-java)
+* [Node bindings](https://github.com/livekit/uniffi-bindgen-node) (early development)
 
 ### External resources
 
diff --git a/third_party/rust/uniffi_macros/src/custom.rs b/third_party/rust/uniffi_macros/src/custom.rs
index 05cde6cddfafe..71d30b1814ec3 100644
--- a/third_party/rust/uniffi_macros/src/custom.rs
+++ b/third_party/rust/uniffi_macros/src/custom.rs
@@ -3,8 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use crate::util::{
-    create_metadata_items, either_attribute_arg, ident_to_string, kw, mod_path,
-    parse_comma_separated, UniffiAttributeArgs,
+    create_metadata_items, either_attribute_arg, ident_to_string, kw, parse_comma_separated,
+    UniffiAttributeArgs,
 };
 use proc_macro2::{Ident, TokenStream};
 use quote::{quote, ToTokens};
@@ -168,7 +168,6 @@ pub(crate) fn expand_custom_type(args: CustomTypeArgs) -> syn::Result<TokenStrea
     }
     .map_err(|msg| syn::Error::new(custom_type.span(), msg))?;
 
-    let mod_path = mod_path()?;
     let (impl_spec, derive_ffi_traits) = if options.is_remote() {
         (
             quote! { unsafe impl ::uniffi::FfiConverter<crate::UniFfiTag> for #custom_type },
@@ -192,10 +191,35 @@ pub(crate) fn expand_custom_type(args: CustomTypeArgs) -> syn::Result<TokenStrea
         Some(convert_closure) => convert_closure.token_tuple(),
         None => (
             quote! { val },
-            quote! { Ok(<#uniffi_type as TryInto<#custom_type>>::try_into(val)?) },
+            quote! { ::core::result::Result::Ok(<#uniffi_type as TryInto<#custom_type>>::try_into(val)?) },
         ),
     };
 
+    let build_context = quote::quote! {
+        || {
+            let location = ::core::panic::Location::caller();
+            ::std::format!(
+                "Lifting custom type `{}` from FFI type `{}` failed at {}:{}",
+                ::core::any::type_name::<#custom_type>(),
+                ::core::any::type_name::<#uniffi_type>(),
+                location.file(),
+                location.line()
+            )
+        }
+    };
+
+    // We allow needless_question_mark here because the error type of `TryInto` only needs conversion
+    // iff it is not a `anyhow::Error` already.
+    let try_lift_expr = quote::quote! {
+        #[allow(clippy::needless_question_mark)]
+        {
+            ::uniffi::deps::anyhow::Context::with_context(
+                (move || -> ::uniffi::Result<#custom_type> { #try_lift_expr })(),
+                #build_context
+            )
+        }
+    };
+
     let docstring = ""; // todo...
     let meta_static_var = custom_type_meta_static_var(&name, &uniffi_type, docstring)?;
 
@@ -225,7 +249,7 @@ pub(crate) fn expand_custom_type(args: CustomTypeArgs) -> syn::Result<TokenStrea
             }
 
             const TYPE_ID_META: ::uniffi::MetadataBuffer = ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::TYPE_CUSTOM)
-                .concat_str(#mod_path)
+                .concat_str(module_path!())
                 .concat_str(#name)
                 .concat(<#uniffi_type as ::uniffi::TypeId<crate::UniFfiTag>>::TYPE_ID_META);
         }
@@ -267,11 +291,10 @@ pub(crate) fn custom_type_meta_static_var(
     builtin: &Type,
     docstring: &str,
 ) -> syn::Result<TokenStream> {
-    let module_path = mod_path()?;
     let builtin = crate::ffiops::type_id_meta(builtin);
     let metadata_expr = quote! {
             ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::CUSTOM_TYPE)
-                .concat_str(#module_path)
+                .concat_str(module_path!())
                 .concat_str(#name)
                 .concat(#builtin)
                 .concat_long_str(#docstring)
diff --git a/third_party/rust/uniffi_macros/src/default.rs b/third_party/rust/uniffi_macros/src/default.rs
index 000c205845791..d91359aab6700 100644
--- a/third_party/rust/uniffi_macros/src/default.rs
+++ b/third_party/rust/uniffi_macros/src/default.rs
@@ -16,13 +16,17 @@ use syn::{
 #[derive(Clone)]
 pub enum DefaultValue {
     Literal(Lit),
+    // ie, explicitly `null`/`None`.
     None(kw::None),
     Some {
         some: kw::Some,
         paren: Paren,
         inner: Box<DefaultValue>,
     },
+    // soft deprecated - maps and seqs should prefer `Default`
     EmptySeq(Bracket),
+    // The default value for the type.
+    Default,
 }
 
 impl ToTokens for DefaultValue {
@@ -32,6 +36,7 @@ impl ToTokens for DefaultValue {
             DefaultValue::None(kw) => kw.to_tokens(tokens),
             DefaultValue::Some { inner, .. } => tokens.extend(quote! { Some(#inner) }),
             DefaultValue::EmptySeq(_) => tokens.extend(quote! { [] }),
+            DefaultValue::Default => tokens.extend(quote! { kw::default }),
         }
     }
 }
@@ -73,12 +78,14 @@ impl DefaultValue {
             ),
 
             DefaultValue::Literal(Lit::Str(s)) => Ok(quote! {
+                .concat_value(::uniffi::metadata::codes::DEFVALUE_LITERAL)
                 .concat_value(::uniffi::metadata::codes::LIT_STR)
                 .concat_str(#s)
             }),
             DefaultValue::Literal(Lit::Int(i)) => {
                 let digits = i.base10_digits();
                 Ok(quote! {
+                    .concat_value(::uniffi::metadata::codes::DEFVALUE_LITERAL)
                     .concat_value(::uniffi::metadata::codes::LIT_INT)
                     .concat_str(#digits)
                 })
@@ -86,11 +93,13 @@ impl DefaultValue {
             DefaultValue::Literal(Lit::Float(f)) => {
                 let digits = f.base10_digits();
                 Ok(quote! {
+                    .concat_value(::uniffi::metadata::codes::DEFVALUE_LITERAL)
                     .concat_value(::uniffi::metadata::codes::LIT_FLOAT)
                     .concat_str(#digits)
                 })
             }
             DefaultValue::Literal(Lit::Bool(b)) => Ok(quote! {
+                .concat_value(::uniffi::metadata::codes::DEFVALUE_LITERAL)
                 .concat_value(::uniffi::metadata::codes::LIT_BOOL)
                 .concat_bool(#b)
             }),
@@ -101,20 +110,27 @@ impl DefaultValue {
             )),
 
             DefaultValue::EmptySeq(_) => Ok(quote! {
+                .concat_value(::uniffi::metadata::codes::DEFVALUE_LITERAL)
                 .concat_value(::uniffi::metadata::codes::LIT_EMPTY_SEQ)
             }),
 
             DefaultValue::None(_) => Ok(quote! {
+                .concat_value(::uniffi::metadata::codes::DEFVALUE_LITERAL)
                 .concat_value(::uniffi::metadata::codes::LIT_NONE)
             }),
 
             DefaultValue::Some { inner, .. } => {
                 let inner_calls = inner.metadata_calls()?;
                 Ok(quote! {
+                    .concat_value(::uniffi::metadata::codes::DEFVALUE_LITERAL)
                     .concat_value(::uniffi::metadata::codes::LIT_SOME)
                     #inner_calls
                 })
             }
+
+            DefaultValue::Default => Ok(quote! {
+                .concat_value(::uniffi::metadata::codes::DEFVALUE_DEFAULT)
+            }),
         }
     }
 }
diff --git a/third_party/rust/uniffi_macros/src/enum_.rs b/third_party/rust/uniffi_macros/src/enum_.rs
index b17b5ba63979c..9b68d3b791aab 100644
--- a/third_party/rust/uniffi_macros/src/enum_.rs
+++ b/third_party/rust/uniffi_macros/src/enum_.rs
@@ -2,15 +2,16 @@ use proc_macro2::{Ident, Span, TokenStream};
 use quote::quote;
 use syn::{
     parse::ParseStream, spanned::Spanned, Attribute, Data, DataEnum, DeriveInput, Expr, Index, Lit,
-    Variant,
+    LitStr, Token, Variant,
 };
 
 use crate::{
+    default::default_value_metadata_calls,
     ffiops,
+    record::FieldAttributeArguments,
     util::{
         create_metadata_items, either_attribute_arg, extract_docstring, ident_to_string, kw,
-        mod_path, try_metadata_value_from_usize, try_read_field, AttributeSliceExt,
-        UniffiAttributeArgs,
+        try_metadata_value_from_usize, try_read_field, AttributeSliceExt, UniffiAttributeArgs,
     },
     DeriveOptions,
 };
@@ -111,8 +112,11 @@ impl EnumItem {
         self.discr_type.as_ref()
     }
 
-    pub fn name(&self) -> String {
-        ident_to_string(&self.ident)
+    pub fn foreign_name(&self) -> String {
+        match &self.attr.name {
+            Some(name) => name.clone(),
+            None => ident_to_string(&self.ident),
+        }
     }
 
     pub fn is_flat_error(&self) -> bool {
@@ -163,14 +167,10 @@ fn enum_or_error_ffi_converter_impl(
     options: &DeriveOptions,
     metadata_type_code: TokenStream,
 ) -> TokenStream {
-    let name = item.name();
+    let name = &item.foreign_name();
     let ident = item.ident();
     let impl_spec = options.ffi_impl_header("FfiConverter", ident);
     let derive_ffi_traits = options.derive_all_ffi_traits(ident);
-    let mod_path = match mod_path() {
-        Ok(p) => p,
-        Err(e) => return e.into_compile_error(),
-    };
     let mut write_match_arms: Vec<_> = item
         .enum_()
         .variants
@@ -258,7 +258,7 @@ fn enum_or_error_ffi_converter_impl(
             }
 
             const TYPE_ID_META: ::uniffi::MetadataBuffer = ::uniffi::MetadataBuffer::from_code(#metadata_type_code)
-                .concat_str(#mod_path)
+                .concat_str(module_path!())
                 .concat_str(#name);
         }
 
@@ -267,15 +267,14 @@ fn enum_or_error_ffi_converter_impl(
 }
 
 pub(crate) fn enum_meta_static_var(item: &EnumItem) -> syn::Result<TokenStream> {
-    let name = item.name();
-    let module_path = mod_path()?;
+    let name = &item.foreign_name();
     let non_exhaustive = item.is_non_exhaustive();
     let docstring = item.docstring();
     let shape = EnumShape::Enum.as_u8();
 
     let mut metadata_expr = quote! {
         ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::ENUM)
-            .concat_str(#module_path)
+            .concat_str(module_path!())
             .concat_str(#name)
             .concat_value(#shape)
     };
@@ -291,7 +290,7 @@ pub(crate) fn enum_meta_static_var(item: &EnumItem) -> syn::Result<TokenStream>
         .concat_bool(#non_exhaustive)
         .concat_long_str(#docstring)
     });
-    Ok(create_metadata_items("enum", &name, metadata_expr, None))
+    Ok(create_metadata_items("enum", name, metadata_expr, None))
 }
 
 fn variant_value(v: &Variant) -> syn::Result<TokenStream> {
@@ -367,8 +366,22 @@ pub fn variant_metadata(item: &EnumItem) -> syn::Result<Vec<TokenStream>> {
                 .map(|f| f.ident.as_ref().map(ident_to_string).unwrap_or_default())
                 .collect::<Vec<_>>();
 
-            let name = ident_to_string(&v.ident);
+            let field_defaults = v
+                .fields
+                .iter()
+                .map(|f| {
+                    let attrs = f
+                        .attrs
+                        .parse_uniffi_attr_args::<FieldAttributeArguments>()?;
+                    default_value_metadata_calls(&attrs.default)
+                })
+                .collect::<syn::Result<Vec<_>>>()?;
+
+            let attrs = v.attrs.parse_uniffi_attr_args::<VariantAttr>()?;
+
+            let name = attrs.name.unwrap_or(ident_to_string(&v.ident));
             let value_tokens = variant_value(v)?;
+
             let docstring = extract_docstring(&v.attrs)?;
             let field_docstrings = v
                 .fields
@@ -384,8 +397,7 @@ pub fn variant_metadata(item: &EnumItem) -> syn::Result<Vec<TokenStream>> {
                     #(
                         .concat_str(#field_names)
                         .concat(#field_type_id_metas)
-                        // field defaults not yet supported for enums
-                        .concat_bool(false)
+                        #field_defaults
                         .concat_long_str(#field_docstrings)
                     )*
                 .concat_long_str(#docstring)
@@ -401,6 +413,7 @@ pub struct EnumAttr {
     // can reuse EnumItem for errors.
     pub flat_error: Option<kw::flat_error>,
     pub with_try_read: Option<kw::with_try_read>,
+    pub name: Option<String>,
 }
 
 impl UniffiAttributeArgs for EnumAttr {
@@ -419,6 +432,14 @@ impl UniffiAttributeArgs for EnumAttr {
         } else if lookahead.peek(kw::handle_unknown_callback_error) {
             // Not used anymore, but still allowed
             Ok(Self::default())
+        } else if lookahead.peek(kw::name) {
+            let _: kw::name = input.parse()?;
+            let _: Token![=] = input.parse()?;
+            let name = Some(input.parse::<LitStr>()?.value());
+            Ok(Self {
+                name,
+                ..Self::default()
+            })
         } else {
             Err(lookahead.error())
         }
@@ -428,6 +449,33 @@ impl UniffiAttributeArgs for EnumAttr {
         Ok(Self {
             flat_error: either_attribute_arg(self.flat_error, other.flat_error)?,
             with_try_read: either_attribute_arg(self.with_try_read, other.with_try_read)?,
+            name: either_attribute_arg(self.name, other.name)?,
+        })
+    }
+}
+
+/// Handle #[uniffi(...)] attributes for enum variants
+#[derive(Clone, Default)]
+pub struct VariantAttr {
+    pub name: Option<String>,
+}
+
+impl UniffiAttributeArgs for VariantAttr {
+    fn parse_one(input: ParseStream<'_>) -> syn::Result<Self> {
+        let lookahead = input.lookahead1();
+        if lookahead.peek(kw::name) {
+            let _: kw::name = input.parse()?;
+            let _: Token![=] = input.parse()?;
+            let name = Some(input.parse::<LitStr>()?.value());
+            Ok(Self { name })
+        } else {
+            Err(lookahead.error())
+        }
+    }
+
+    fn merge(self, other: Self) -> syn::Result<Self> {
+        Ok(Self {
+            name: either_attribute_arg(self.name, other.name)?,
         })
     }
 }
diff --git a/third_party/rust/uniffi_macros/src/error.rs b/third_party/rust/uniffi_macros/src/error.rs
index 39e3deca93331..cd3425a15a579 100644
--- a/third_party/rust/uniffi_macros/src/error.rs
+++ b/third_party/rust/uniffi_macros/src/error.rs
@@ -4,11 +4,11 @@ use syn::{DeriveInput, Index};
 use uniffi_meta::EnumShape;
 
 use crate::{
-    enum_::{rich_error_ffi_converter_impl, variant_metadata, EnumItem},
+    enum_::{rich_error_ffi_converter_impl, variant_metadata, EnumItem, VariantAttr},
     ffiops,
     util::{
-        chain, create_metadata_items, extract_docstring, ident_to_string, mod_path,
-        try_metadata_value_from_usize, AttributeSliceExt,
+        create_metadata_items, extract_docstring, ident_to_string, try_metadata_value_from_usize,
+        AttributeSliceExt,
     },
     DeriveOptions,
 };
@@ -25,13 +25,10 @@ pub fn expand_error(input: DeriveInput, options: DeriveOptions) -> syn::Result<T
         .variants
         .iter()
         .flat_map(|variant| {
-            chain(
-                variant.attrs.uniffi_attr_args_not_allowed_here(),
-                variant
-                    .fields
-                    .iter()
-                    .flat_map(|field| field.attrs.uniffi_attr_args_not_allowed_here()),
-            )
+            variant
+                .fields
+                .iter()
+                .flat_map(|field| field.attrs.uniffi_attr_args_not_allowed_here())
         })
         .map(syn::Error::into_compile_error)
         .collect();
@@ -56,16 +53,12 @@ fn error_ffi_converter_impl(item: &EnumItem, options: &DeriveOptions) -> syn::Re
 // These are errors where we only lower the to_string() value, rather than any associated data.
 // We lower the to_string() value unconditionally, whether the enum has associated data or not.
 fn flat_error_ffi_converter_impl(item: &EnumItem, options: &DeriveOptions) -> TokenStream {
-    let name = item.name();
+    let name = &item.foreign_name();
     let ident = item.ident();
     let lower_impl_spec = options.ffi_impl_header("Lower", ident);
     let lift_impl_spec = options.ffi_impl_header("Lift", ident);
     let type_id_impl_spec = options.ffi_impl_header("TypeId", ident);
     let derive_ffi_traits = options.derive_ffi_traits(ident, &["LowerError", "ConvertError"]);
-    let mod_path = match mod_path() {
-        Ok(p) => p,
-        Err(e) => return e.into_compile_error(),
-    };
 
     let lower_impl = {
         let mut match_arms: Vec<_> = item
@@ -169,7 +162,7 @@ fn flat_error_ffi_converter_impl(item: &EnumItem, options: &DeriveOptions) -> To
         #[automatically_derived]
         #type_id_impl_spec {
             const TYPE_ID_META: ::uniffi::MetadataBuffer = ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::TYPE_ENUM)
-                .concat_str(#mod_path)
+                .concat_str(module_path!())
                 .concat_str(#name);
         }
 
@@ -178,15 +171,14 @@ fn flat_error_ffi_converter_impl(item: &EnumItem, options: &DeriveOptions) -> To
 }
 
 pub(crate) fn error_meta_static_var(item: &EnumItem) -> syn::Result<TokenStream> {
-    let name = item.name();
-    let module_path = mod_path()?;
+    let name = &item.foreign_name();
     let non_exhaustive = item.is_non_exhaustive();
     let docstring = item.docstring();
     let flat = item.is_flat_error();
     let shape = EnumShape::Error { flat }.as_u8();
     let mut metadata_expr = quote! {
             ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::ENUM)
-                .concat_str(#module_path)
+                .concat_str(module_path!())
                 .concat_str(#name)
                 .concat_value(#shape)
                 .concat_bool(false) // discr_type: None
@@ -200,7 +192,7 @@ pub(crate) fn error_meta_static_var(item: &EnumItem) -> syn::Result<TokenStream>
         .concat_bool(#non_exhaustive)
         .concat_long_str(#docstring)
     });
-    Ok(create_metadata_items("error", &name, metadata_expr, None))
+    Ok(create_metadata_items("error", name, metadata_expr, None))
 }
 
 pub fn flat_error_variant_metadata(item: &EnumItem) -> syn::Result<Vec<TokenStream>> {
@@ -209,7 +201,9 @@ pub fn flat_error_variant_metadata(item: &EnumItem) -> syn::Result<Vec<TokenStre
         try_metadata_value_from_usize(enum_.variants.len(), "UniFFI limits enums to 256 variants")?;
     std::iter::once(Ok(quote! { .concat_value(#variants_len) }))
         .chain(enum_.variants.iter().map(|v| {
-            let name = ident_to_string(&v.ident);
+            let attrs = v.attrs.parse_uniffi_attr_args::<VariantAttr>()?;
+            let name = attrs.name.unwrap_or(ident_to_string(&v.ident));
+
             let docstring = extract_docstring(&v.attrs)?;
             Ok(quote! {
                 .concat_str(#name)
diff --git a/third_party/rust/uniffi_macros/src/export.rs b/third_party/rust/uniffi_macros/src/export.rs
index 03cf9a6b939ef..b27a3363e7c1b 100644
--- a/third_party/rust/uniffi_macros/src/export.rs
+++ b/third_party/rust/uniffi_macros/src/export.rs
@@ -22,6 +22,7 @@ use self::{
 use crate::util::{create_metadata_items, ident_to_string, mod_path};
 pub use attributes::{AsyncRuntime, DefaultMap, ExportFnArgs};
 pub use callback_interface::ffi_converter_callback_interface_impl;
+pub use trait_interface::alter_trait;
 
 // TODO(jplatte): Ensure no generics, …
 // TODO(jplatte): Aggregate errors instead of short-circuiting, wherever possible
@@ -38,6 +39,9 @@ pub(crate) fn expand_export(
     // new functions outside of the `impl`).
     rewrite_self_type(&mut item);
 
+    // trying to split `udl_mode` into "no meta" and "other"
+    let include_meta = !udl_mode;
+
     let metadata = ExportItem::new(item, all_args)?;
 
     match metadata {
@@ -51,10 +55,12 @@ pub(crate) fn expand_export(
             trait_,
         } => {
             if let Some(rt) = &args.async_runtime {
-                if items
-                    .iter()
-                    .all(|item| !matches!(item, ImplItem::Method(sig) if sig.is_async))
-                {
+                let has_async_methods = items.iter().any(|item| {
+                    matches!(item, ImplItem::Method(sig) if sig.is_async)
+                        || matches!(item, ImplItem::Constructor(sig) if sig.is_async)
+                });
+
+                if !has_async_methods {
                     return Err(syn::Error::new_spanned(
                         rt,
                         "no async methods in this impl block",
@@ -73,22 +79,28 @@ pub(crate) fn expand_export(
                     ImplItem::Method(sig) => {
                         let async_runtime =
                             sig.async_runtime.clone().or(args.async_runtime.clone());
-                        gen_method_scaffolding(sig, async_runtime.as_ref(), udl_mode)
+                        gen_method_scaffolding(
+                            sig,
+                            async_runtime.as_ref(),
+                            udl_mode,
+                            trait_.as_ref(),
+                        )
                     }
                 })
                 .collect::<syn::Result<_>>()?;
             let trait_impl_tokens = trait_.map(|t| {
                 let object_name = ident_to_string(&self_ident);
-                // TODO: parse trait path?
-                let trait_name = ident_to_string(t.get_ident().expect("not a simple trait path"));
-                let trait_path = "";
+                let trait_ident = t.segments
+                    .last()
+                    .map(|s| &s.ident)
+                    .expect("no ident in trait");
+                let trait_name = ident_to_string(trait_ident);
                 let metadata_expr = quote! {
                     ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::OBJECT_TRAIT_IMPL)
                         .concat(::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::TYPE_INTERFACE))
-                        .concat_str(#mod_path)
+                        .concat_str(module_path!())
                         .concat_str(#object_name)
-                        .concat_str(#trait_name)
-                        .concat_str(#trait_path)
+                        .concat(<dyn #t as ::uniffi::TypeId<crate::UniFfiTag>>::TYPE_ID_META)
                 };
                 create_metadata_items(
                     "object_trait_impl",
@@ -124,12 +136,11 @@ pub(crate) fn expand_export(
         } => {
             let trait_name = ident_to_string(&self_ident);
             let trait_impl_ident = callback_interface::trait_impl_ident(&trait_name);
-            let trait_impl = callback_interface::trait_impl(&mod_path, &self_ident, &items)
+            let trait_impl = callback_interface::trait_impl(&mod_path, &self_ident, &items, false)
                 .unwrap_or_else(|e| e.into_compile_error());
             let metadata_items = (!udl_mode).then(|| {
-                let items =
-                    callback_interface::metadata_items(&self_ident, &items, &mod_path, docstring)
-                        .unwrap_or_else(|e| vec![e.into_compile_error()]);
+                let items = callback_interface::metadata_items(&self_ident, &items, docstring)
+                    .unwrap_or_else(|e| vec![e.into_compile_error()]);
                 quote! { #(#items)* }
             });
             let ffi_converter_tokens =
@@ -147,10 +158,12 @@ pub(crate) fn expand_export(
             self_ident,
             uniffi_traits,
             ..
-        } => {
-            assert!(!udl_mode);
-            utrait::expand_uniffi_trait_export(self_ident, uniffi_traits)
-        }
+        } => utrait::expand_uniffi_trait_export(self_ident, uniffi_traits, include_meta),
+        ExportItem::Enum {
+            self_ident,
+            uniffi_traits,
+            ..
+        } => utrait::expand_uniffi_trait_export(self_ident, uniffi_traits, include_meta),
     }
 }
 
@@ -205,3 +218,11 @@ pub fn rewrite_self_type(item: &mut Item) {
         visitor.visit_impl_item_mut(item);
     }
 }
+
+/// Alter the tokens wrapped with the `[uniffi::export]` if needed
+pub fn alter_input(item: &Item) -> TokenStream {
+    match item {
+        Item::Trait(item_trait) => alter_trait(item_trait),
+        _ => quote! { #item },
+    }
+}
diff --git a/third_party/rust/uniffi_macros/src/export/attributes.rs b/third_party/rust/uniffi_macros/src/export/attributes.rs
index ce6387da615eb..2f6eb21032130 100644
--- a/third_party/rust/uniffi_macros/src/export/attributes.rs
+++ b/third_party/rust/uniffi_macros/src/export/attributes.rs
@@ -131,6 +131,7 @@ impl UniffiAttributeArgs for ExportFnArgs {
 #[derive(Default)]
 pub struct ExportImplArgs {
     pub(crate) async_runtime: Option<AsyncRuntime>,
+    pub(crate) name: Option<String>,
 }
 
 impl Parse for ExportImplArgs {
@@ -147,6 +148,15 @@ impl UniffiAttributeArgs for ExportImplArgs {
             let _: Token![=] = input.parse()?;
             Ok(Self {
                 async_runtime: Some(input.parse()?),
+                ..Self::default()
+            })
+        } else if lookahead.peek(kw::name) {
+            let _: kw::name = input.parse()?;
+            let _: Token![=] = input.parse()?;
+            let name = Some(input.parse::<LitStr>()?.value());
+            Ok(Self {
+                name,
+                ..Self::default()
             })
         } else {
             Err(syn::Error::new(
@@ -159,6 +169,7 @@ impl UniffiAttributeArgs for ExportImplArgs {
     fn merge(self, other: Self) -> syn::Result<Self> {
         Ok(Self {
             async_runtime: either_attribute_arg(self.async_runtime, other.async_runtime)?,
+            name: either_attribute_arg(self.name, other.name)?,
         })
     }
 }
@@ -197,6 +208,11 @@ impl UniffiAttributeArgs for ExportStructArgs {
             Ok(Self {
                 traits: HashSet::from([UniffiTraitDiscriminants::Eq]),
             })
+        } else if lookahead.peek(kw::Ord) {
+            input.parse::<Option<kw::Ord>>()?;
+            Ok(Self {
+                traits: HashSet::from([UniffiTraitDiscriminants::Ord]),
+            })
         } else {
             Err(syn::Error::new(
                 input.span(),
@@ -380,16 +396,29 @@ impl Parse for DefaultMap {
 
 pub struct DefaultPair {
     pub name: Ident,
-    pub eq_token: Token![=],
     pub value: DefaultValue,
 }
 
 impl Parse for DefaultPair {
     fn parse(input: ParseStream<'_>) -> syn::Result<Self> {
-        Ok(Self {
-            name: input.parse()?,
-            eq_token: input.parse()?,
-            value: input.parse()?,
-        })
+        // I'm sure there is a better way here - either want (Ident = Value) or (Ident)
+        let lookahead = input.lookahead1();
+        if lookahead.peek(Ident) {
+            let name: Ident = input.parse()?;
+            if input.is_empty() {
+                return Ok(Self {
+                    name,
+                    value: DefaultValue::Default,
+                });
+            }
+            if !input.peek(Token![=]) {
+                return Err(lookahead.error());
+            };
+            let _eq: Token![=] = input.parse()?;
+            let value: DefaultValue = input.parse()?;
+            Ok(Self { name, value })
+        } else {
+            Err(lookahead.error())
+        }
     }
 }
diff --git a/third_party/rust/uniffi_macros/src/export/callback_interface.rs b/third_party/rust/uniffi_macros/src/export/callback_interface.rs
index 601b7d099681d..c0d78e1e368c4 100644
--- a/third_party/rust/uniffi_macros/src/export/callback_interface.rs
+++ b/third_party/rust/uniffi_macros/src/export/callback_interface.rs
@@ -8,7 +8,7 @@ use crate::{
     fnsig::{FnKind, FnSignature, ReceiverArg},
     util::{
         async_trait_annotation, create_metadata_items, derive_ffi_traits, ident_to_string,
-        mod_path, tagged_impl_header, wasm_single_threaded_annotation,
+        tagged_impl_header, wasm_single_threaded_annotation,
     },
 };
 use proc_macro2::{Span, TokenStream};
@@ -26,6 +26,7 @@ pub(super) fn trait_impl(
     mod_path: &str,
     trait_ident: &Ident,
     items: &[ImplItem],
+    for_trait_interface: bool,
 ) -> syn::Result<TokenStream> {
     let trait_name = ident_to_string(trait_ident);
     let trait_impl_ident = trait_impl_ident(&trait_name);
@@ -46,6 +47,15 @@ pub(super) fn trait_impl(
         })
         .collect::<syn::Result<Vec<_>>>()?;
 
+    let uniffi_foreign_handle_method = for_trait_interface.then(|| {
+        quote! {
+            fn uniffi_foreign_handle(&self) -> ::std::option::Option<::uniffi::Handle> {
+                let vtable = #vtable_cell.get();
+                ::std::option::Option::Some(::uniffi::Handle::from_raw_unchecked((vtable.uniffi_clone)(self.handle)))
+            }
+        }
+    });
+
     let vtable_fields = methods.iter().map(|sig| {
         let ident = &sig.ident;
         let param_names = sig.scaffolding_param_names();
@@ -65,9 +75,9 @@ pub(super) fn trait_impl(
                 pub #ident: extern "C" fn(
                     uniffi_handle: u64,
                     #(#param_names: #param_types,)*
-                    uniffi_future_callback: ::uniffi::ForeignFutureCallback<#lift_return_type>,
+                    uniffi_callback: ::uniffi::ForeignFutureCallback<#lift_return_type>,
                     uniffi_callback_data: u64,
-                    uniffi_out_return: &mut ::uniffi::ForeignFuture,
+                    uniffi_out_dropped_callback: &mut ::uniffi::ForeignFutureDroppedCallbackStruct,
                 ),
             }
         }
@@ -87,8 +97,9 @@ pub(super) fn trait_impl(
     Ok(quote! {
         #[allow(missing_docs)]
         pub struct #vtable_type {
-            #(#vtable_fields)*
             pub uniffi_free: extern "C" fn(handle: u64),
+            pub uniffi_clone: extern "C" fn(handle: u64) -> u64,
+            #(#vtable_fields)*
         }
 
         static #vtable_cell: ::uniffi::UniffiForeignPointerCell::<#vtable_type> = ::uniffi::UniffiForeignPointerCell::<#vtable_type>::new();
@@ -116,6 +127,7 @@ pub(super) fn trait_impl(
         #impl_attributes
         impl #trait_ident for #trait_impl_ident {
             #(#trait_impl_methods)*
+            #uniffi_foreign_handle_method
         }
 
         impl ::std::ops::Drop for #trait_impl_ident {
@@ -144,12 +156,12 @@ pub fn ffi_converter_callback_interface_impl(
     let dyn_trait = quote! { dyn #trait_ident };
     let box_dyn_trait = quote! { ::std::boxed::Box<#dyn_trait> };
     let lift_impl_spec = tagged_impl_header("Lift", &box_dyn_trait, remote);
-    let type_id_impl_spec = tagged_impl_header("TypeId", &box_dyn_trait, remote);
+    let type_id_impl_specs = [
+        tagged_impl_header("TypeId", &box_dyn_trait, remote),
+        tagged_impl_header("TypeId", &dyn_trait, remote),
+    ]
+    .into_iter();
     let derive_ffi_traits = derive_ffi_traits(&box_dyn_trait, remote, &["LiftRef", "LiftReturn"]);
-    let mod_path = match mod_path() {
-        Ok(p) => p,
-        Err(e) => return e.into_compile_error(),
-    };
     let try_lift_self = ffiops::try_lift(quote! { Self });
 
     quote! {
@@ -169,15 +181,17 @@ pub fn ffi_converter_callback_interface_impl(
             }
         }
 
-        #[doc(hidden)]
-        #[automatically_derived]
-        #type_id_impl_spec {
-            const TYPE_ID_META: ::uniffi::MetadataBuffer = ::uniffi::MetadataBuffer::from_code(
-                ::uniffi::metadata::codes::TYPE_CALLBACK_INTERFACE,
-            )
-            .concat_str(#mod_path)
-            .concat_str(#trait_name);
-        }
+        #(
+            #[doc(hidden)]
+            #[automatically_derived]
+            #type_id_impl_specs {
+                const TYPE_ID_META: ::uniffi::MetadataBuffer = ::uniffi::MetadataBuffer::from_code(
+                    ::uniffi::metadata::codes::TYPE_CALLBACK_INTERFACE,
+                )
+                .concat_str(module_path!())
+                .concat_str(#trait_name);
+            }
+        )*
 
         #derive_ffi_traits
     }
@@ -241,10 +255,15 @@ fn gen_method_impl(sig: &FnSignature, vtable_cell: &Ident) -> syn::Result<TokenS
         Ok(quote! {
             async fn #ident(#self_param, #(#params),*) -> #return_ty {
                 let vtable = #vtable_cell.get();
-                ::uniffi::foreign_async_call::<_, #return_ty, crate::UniFfiTag>(move |uniffi_future_callback, uniffi_future_callback_data| {
-                    let mut uniffi_foreign_future: ::uniffi::ForeignFuture = ::uniffi::FfiDefault::ffi_default();
-                    (vtable.#ident)(self.handle, #(#lower_exprs,)* uniffi_future_callback, uniffi_future_callback_data, &mut uniffi_foreign_future);
-                    uniffi_foreign_future
+                ::uniffi::foreign_async_call::<_, #return_ty, crate::UniFfiTag>(
+                    move |uniffi_future_callback, uniffi_future_callback_data, uniffi_foreign_future_dropped_callback| {
+                        (vtable.#ident)(
+                            self.handle,
+                            #(#lower_exprs,)*
+                            uniffi_future_callback,
+                            uniffi_future_callback_data,
+                            uniffi_foreign_future_dropped_callback
+                        );
                 }).await
             }
         })
@@ -254,7 +273,6 @@ fn gen_method_impl(sig: &FnSignature, vtable_cell: &Ident) -> syn::Result<TokenS
 pub(super) fn metadata_items(
     self_ident: &Ident,
     items: &[ImplItem],
-    module_path: &str,
     docstring: String,
 ) -> syn::Result<Vec<TokenStream>> {
     let trait_name = ident_to_string(self_ident);
@@ -263,7 +281,7 @@ pub(super) fn metadata_items(
         &trait_name,
         quote! {
             ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::CALLBACK_INTERFACE)
-                .concat_str(#module_path)
+                .concat_str(module_path!())
                 .concat_str(#trait_name)
                 .concat_long_str(#docstring)
         },
diff --git a/third_party/rust/uniffi_macros/src/export/item.rs b/third_party/rust/uniffi_macros/src/export/item.rs
index 8f967b0a0a0dc..03f669dd4db28 100644
--- a/third_party/rust/uniffi_macros/src/export/item.rs
+++ b/third_party/rust/uniffi_macros/src/export/item.rs
@@ -36,6 +36,10 @@ pub(super) enum ExportItem {
         self_ident: Ident,
         uniffi_traits: Vec<UniffiTraitDiscriminants>,
     },
+    Enum {
+        self_ident: Ident,
+        uniffi_traits: Vec<UniffiTraitDiscriminants>,
+    },
 }
 
 impl ExportItem {
@@ -50,11 +54,11 @@ impl ExportItem {
             syn::Item::Impl(item) => Self::from_impl(item, attr_args),
             syn::Item::Trait(item) => Self::from_trait(item, attr_args),
             syn::Item::Struct(item) => Self::from_struct(item, attr_args),
+            syn::Item::Enum(item) => Self::from_enum(item, attr_args),
             // FIXME: Support const / static?
             _ => Err(syn::Error::new(
                 Span::call_site(),
-                "unsupported item: only functions and impl \
-                 blocks may be annotated with this attribute",
+                "unsupported item: This block doesn't support `uniffi::export`",
             )),
         }
     }
@@ -103,9 +107,17 @@ impl ExportItem {
 
                 let docstring = extract_docstring(&impl_fn.attrs)?;
                 let attrs = ExportedImplFnAttributes::new(&impl_fn.attrs)?;
+
+                let foreign_self_ident = if let Some(name) = &args.name {
+                    Ident::new(name, self_ident.span())
+                } else {
+                    self_ident.clone()
+                };
+
                 let item = if attrs.constructor {
                     ImplItem::Constructor(FnSignature::new_constructor(
                         self_ident.clone(),
+                        foreign_self_ident,
                         impl_fn.sig,
                         attrs.args,
                         docstring,
@@ -113,6 +125,7 @@ impl ExportItem {
                 } else {
                     ImplItem::Method(FnSignature::new_method(
                         self_ident.clone(),
+                        foreign_self_ident,
                         impl_fn.sig,
                         attrs.args,
                         docstring,
@@ -159,6 +172,12 @@ impl ExportItem {
                         ));
                     }
                 };
+                if let Some(default) = tim.default {
+                    return Err(syn::Error::new_spanned(
+                        default,
+                        "uniffi::export'd trait methods can't have a default implementation.",
+                    ));
+                }
 
                 let docstring = extract_docstring(&tim.attrs)?;
                 let attrs = ExportedImplFnAttributes::new(&tim.attrs)?;
@@ -171,7 +190,7 @@ impl ExportItem {
                     ImplItem::Method(FnSignature::new_trait_method(
                         self_ident.clone(),
                         tim.sig,
-                        ExportFnArgs::default(),
+                        attrs.args,
                         i as u32,
                         docstring,
                     )?)
@@ -205,6 +224,21 @@ impl ExportItem {
             })
         }
     }
+
+    fn from_enum(item: syn::ItemEnum, attr_args: TokenStream) -> syn::Result<Self> {
+        let args: ExportStructArgs = syn::parse(attr_args)?;
+        let uniffi_traits: Vec<UniffiTraitDiscriminants> = args.traits.into_iter().collect();
+        if uniffi_traits.is_empty() {
+            Err(syn::Error::new(Span::call_site(),
+                "uniffi::export on an enum must supply a builtin trait name. Did you mean `#[derive(uniffi::Enum)]`?"
+            ))
+        } else {
+            Ok(Self::Enum {
+                self_ident: item.ident,
+                uniffi_traits,
+            })
+        }
+    }
 }
 
 pub(super) enum ImplItem {
diff --git a/third_party/rust/uniffi_macros/src/export/scaffolding.rs b/third_party/rust/uniffi_macros/src/export/scaffolding.rs
index d2463cbf9cd79..b2eade6ef3724 100644
--- a/third_party/rust/uniffi_macros/src/export/scaffolding.rs
+++ b/third_party/rust/uniffi_macros/src/export/scaffolding.rs
@@ -35,7 +35,7 @@ pub(super) fn gen_fn_scaffolding(
         sig.metadata_items()
             .unwrap_or_else(syn::Error::into_compile_error)
     });
-    let scaffolding_func = gen_ffi_function(&sig, ar, udl_mode)?;
+    let scaffolding_func = gen_ffi_function(&sig, ar, udl_mode, None)?;
     Ok(quote! {
         #scaffolding_func
         #metadata_items
@@ -57,7 +57,7 @@ pub(super) fn gen_constructor_scaffolding(
         sig.metadata_items()
             .unwrap_or_else(syn::Error::into_compile_error)
     });
-    let scaffolding_func = gen_ffi_function(&sig, ar, udl_mode)?;
+    let scaffolding_func = gen_ffi_function(&sig, ar, udl_mode, None)?;
     Ok(quote! {
         #scaffolding_func
         #metadata_items
@@ -68,6 +68,7 @@ pub(super) fn gen_method_scaffolding(
     sig: FnSignature,
     ar: Option<&AsyncRuntime>,
     udl_mode: bool,
+    use_trait: Option<&syn::Path>,
 ) -> syn::Result<TokenStream> {
     let scaffolding_func = if sig.receiver.is_none() {
         return Err(syn::Error::new(
@@ -75,7 +76,7 @@ pub(super) fn gen_method_scaffolding(
             "associated functions are not currently supported",
         ));
     } else {
-        gen_ffi_function(&sig, ar, udl_mode)?
+        gen_ffi_function(&sig, ar, udl_mode, use_trait)?
     };
 
     let metadata_items = (!udl_mode).then(|| {
@@ -132,33 +133,17 @@ impl ScaffoldingBits {
     ) -> Self {
         let ident = &sig.ident;
         let self_type = if is_trait {
-            quote! { ::std::sync::Arc<dyn #self_ident> }
+            quote! { dyn #self_ident }
         } else {
-            quote! { ::std::sync::Arc<#self_ident> }
-        };
-        let lift_type = ffiops::lift_type(&self_type);
-        let try_lift = ffiops::try_lift(&self_type);
-        let try_lift_self = if is_trait {
-            // For trait interfaces we need to special case this.  Trait interfaces normally lift
-            // foreign trait impl pointers.  However, for a method call, we want to lift a Rust
-            // pointer.
-            quote! {
-                {
-                    let boxed_foreign_arc = unsafe {
-                        ::std::boxed::Box::from_raw(
-                            uniffi_self_lowered as *mut ::std::sync::Arc<dyn #self_ident>,
-                        )
-                    };
-                    // Take a clone for our own use.
-                    ::std::result::Result::Ok(*boxed_foreign_arc)
-                }
-            }
-        } else {
-            quote! { #try_lift(uniffi_self_lowered) }
+            quote! { #self_ident }
         };
 
+        let ref_type = ffiops::lift_ref_type(&self_type);
+        let lift_type = ffiops::lift_type(&ref_type);
+        let try_lift = ffiops::try_lift(&ref_type);
+
         let lift_closure = sig.lift_closure(Some(quote! {
-            match #try_lift_self {
+            match #try_lift(uniffi_self_lowered) {
                 ::std::result::Result::Ok(v) => v,
                 ::std::result::Result::Err(e) => {
                     return ::std::result::Result::Err(("self", e));
@@ -219,6 +204,7 @@ pub(super) fn gen_ffi_function(
     sig: &FnSignature,
     ar: Option<&AsyncRuntime>,
     udl_mode: bool,
+    use_trait: Option<&syn::Path>,
 ) -> syn::Result<TokenStream> {
     let ScaffoldingBits {
         param_names,
@@ -228,13 +214,13 @@ pub(super) fn gen_ffi_function(
         convert_result,
     } = match &sig.kind {
         FnKind::Function => ScaffoldingBits::new_for_function(sig, udl_mode),
-        FnKind::Method { self_ident } => {
+        FnKind::Method { self_ident, .. } => {
             ScaffoldingBits::new_for_method(sig, self_ident, false, udl_mode)
         }
         FnKind::TraitMethod { self_ident, .. } => {
             ScaffoldingBits::new_for_method(sig, self_ident, true, udl_mode)
         }
-        FnKind::Constructor { self_ident } => {
+        FnKind::Constructor { self_ident, .. } => {
             ScaffoldingBits::new_for_constructor(sig, self_ident, udl_mode)
         }
     };
@@ -246,6 +232,7 @@ pub(super) fn gen_ffi_function(
     let ffi_return_ty = ffiops::lower_return_type(return_ty);
     let lower_return = ffiops::lower_return(return_ty);
     let handle_failed_lift = ffiops::lower_return_handle_failed_lift(return_ty);
+    let use_trait = use_trait.map(|tr| quote! { use #tr; });
 
     Ok(if !sig.is_async {
         let scaffolding_fn_ffi_buffer_version =
@@ -257,17 +244,21 @@ pub(super) fn gen_ffi_function(
                 #(#param_names: #param_types,)*
                 call_status: &mut ::uniffi::RustCallStatus,
             ) -> #ffi_return_ty {
+                #use_trait
                 ::uniffi::deps::trace!("calling: {}", #ffi_fn_name);
                 let uniffi_lift_args = #lift_closure;
                 ::uniffi::rust_call(call_status, || {
                     let result = match uniffi_lift_args() {
                         ::std::result::Result::Ok(uniffi_args) => {
-                            ::uniffi::deps::trace!("success: {}", #ffi_fn_name);
+                            ::uniffi::deps::trace!("lift_args success: {}", #ffi_fn_name);
                             let uniffi_result = #rust_fn_call;
-                            #lower_return(#convert_result)
+                            ::uniffi::deps::trace!("call success: {}", #ffi_fn_name);
+                            let uniffi_lowered_return = #lower_return(#convert_result);
+                            ::uniffi::deps::trace!("lower_return success: {}", #ffi_fn_name);
+                            uniffi_lowered_return
                         }
                         ::std::result::Result::Err((arg_name, error)) => {
-                            ::uniffi::deps::trace!("error: {}", #ffi_fn_name);
+                            ::uniffi::deps::trace!("lift_args error: {}", #ffi_fn_name);
                             #handle_failed_lift(::uniffi::LiftArgsError { arg_name, error} )
                         },
                     };
diff --git a/third_party/rust/uniffi_macros/src/export/trait_interface.rs b/third_party/rust/uniffi_macros/src/export/trait_interface.rs
index 25aca7b3371f8..5b13d0bfbfe88 100644
--- a/third_party/rust/uniffi_macros/src/export/trait_interface.rs
+++ b/third_party/rust/uniffi_macros/src/export/trait_interface.rs
@@ -4,6 +4,7 @@
 
 use proc_macro2::{Ident, Span, TokenStream};
 use quote::{quote, quote_spanned};
+use syn::ItemTrait;
 
 use uniffi_meta::ObjectImpl;
 
@@ -30,7 +31,7 @@ pub(super) fn gen_trait_scaffolding(
     }
     let trait_name = ident_to_string(&self_ident);
     let trait_impl = with_foreign.then(|| {
-        callback_interface::trait_impl(mod_path, &self_ident, &items)
+        callback_interface::trait_impl(mod_path, &self_ident, &items, true)
             .unwrap_or_else(|e| e.into_compile_error())
     });
 
@@ -51,18 +52,16 @@ pub(super) fn gen_trait_scaffolding(
         /// Safety: Only pass pointers returned by a UniFFI call.  Do not pass pointers that were
         /// passed to the free function.
         pub unsafe extern "C" fn #clone_fn_ident(
-            ptr: *const ::std::ffi::c_void,
+            handle: ::uniffi::ffi::Handle,
             call_status: &mut ::uniffi::RustCallStatus
-        ) -> *const ::std::ffi::c_void {
-            ::uniffi::deps::trace!("clonining trait: {} ({:?})", #trait_name, ptr);
+        ) -> ::uniffi::ffi::Handle {
+            ::uniffi::deps::trace!("clonining trait: {} ({:?})", #trait_name, handle);
             ::uniffi::rust_call(call_status, || {
-                let ptr = ptr as *mut ::std::sync::Arc<dyn #self_ident>;
-                let arc: ::std::sync::Arc<_> = unsafe { ::std::clone::Clone::clone(&*ptr) };
-                ::std::result::Result::Ok(
-                    ::std::boxed::Box::into_raw(
-                        ::std::boxed::Box::new(arc),
-                    ) as *const ::std::ffi::c_void
-                )
+                unsafe {
+                    ::std::result::Result::Ok(
+                        handle.clone_arc_handle::<::std::sync::Arc<dyn #self_ident>>()
+                    )
+                }
             })
         }
 
@@ -76,16 +75,13 @@ pub(super) fn gen_trait_scaffolding(
         /// Note: clippy doesn't complain about this being unsafe, but it definitely is since it
         /// calls `Box::from_raw`.
         pub unsafe extern "C" fn #free_fn_ident(
-            ptr: *const ::std::ffi::c_void,
+            handle: ::uniffi::ffi::Handle,
             call_status: &mut ::uniffi::RustCallStatus
         ) {
-            ::uniffi::deps::trace!("freeing trait: {} ({:?})", #trait_name, ptr);
+            ::uniffi::deps::trace!("freeing trait: {} ({:?})", #trait_name, handle);
             ::uniffi::rust_call(call_status, || {
-                ::std::assert!(!ptr.is_null());
                 ::std::mem::drop(unsafe {
-                    ::std::boxed::Box::from_raw(
-                        ptr as *mut ::std::sync::Arc<dyn #self_ident>,
-                    )
+                    handle.into_arc::<::std::sync::Arc<dyn #self_ident>>()
                 });
                 ::std::result::Result::Ok(())
             });
@@ -95,7 +91,7 @@ pub(super) fn gen_trait_scaffolding(
     let impl_tokens: TokenStream = items
         .into_iter()
         .map(|item| match item {
-            ImplItem::Method(sig) => gen_method_scaffolding(sig, None, udl_mode),
+            ImplItem::Method(sig) => gen_method_scaffolding(sig, None, udl_mode, None),
             _ => unreachable!("traits have no constructors"),
         })
         .collect::<syn::Result<_>>()?;
@@ -106,10 +102,10 @@ pub(super) fn gen_trait_scaffolding(
         } else {
             ObjectImpl::Trait
         };
-        interface_meta_static_var(&self_ident, imp, mod_path, docstring.as_str())
+        interface_meta_static_var(&ident_to_string(&self_ident), imp, docstring.as_str())
             .unwrap_or_else(syn::Error::into_compile_error)
     });
-    let ffi_converter_tokens = ffi_converter(mod_path, &self_ident, with_foreign);
+    let ffi_converter_tokens = ffi_converter(&self_ident, with_foreign);
 
     Ok(quote_spanned! { self_ident.span() =>
         #meta_static_var
@@ -120,31 +116,51 @@ pub(super) fn gen_trait_scaffolding(
     })
 }
 
-pub(crate) fn ffi_converter(
-    mod_path: &str,
-    trait_ident: &Ident,
-    with_foreign: bool,
-) -> TokenStream {
+pub(crate) fn ffi_converter(trait_ident: &Ident, with_foreign: bool) -> TokenStream {
     // TODO: support defining remote trait interfaces
     let remote = false;
     let impl_spec = tagged_impl_header("FfiConverterArc", &quote! { dyn #trait_ident }, remote);
     let lift_ref_impl_spec = tagged_impl_header("LiftRef", &quote! { dyn #trait_ident }, remote);
+    // Implement `TypeId` for `dyn Trait` directly.  This is what we use to lookup the type ID for
+    // objects that implement the trait.
+    let type_id_impl_spec = tagged_impl_header("TypeId", &quote! { dyn #trait_ident }, remote);
     let trait_name = ident_to_string(trait_ident);
     let try_lift = if with_foreign {
+        // The trait can be implemented by both Rust and the foreign side.
+        // `try_lift` needs to handle both cases
         let trait_impl_ident = callback_interface::trait_impl_ident(&trait_name);
         quote! {
-            fn try_lift(v: Self::FfiType) -> ::uniffi::deps::anyhow::Result<::std::sync::Arc<Self>> {
-                ::std::result::Result::Ok(::std::sync::Arc::new(<#trait_impl_ident>::new(v as u64)))
+            fn try_lift(handle: Self::FfiType) -> ::uniffi::deps::anyhow::Result<::std::sync::Arc<Self>> {
+                if handle.is_foreign() {
+                    // Handle was generated by the foreign side.
+                    // Construct a new instance of our struct that implements the trait using the handle and the registered vtable.
+                    ::std::result::Result::Ok(::std::sync::Arc::new(<#trait_impl_ident>::new(handle.as_raw())))
+                } else {
+                    // Handle was generated by the Rust side.
+                    // Reconstruct the double-wrapped arc that we lowered.
+                    use ::std::clone::Clone;
+                    // Note: handle is for a double-wrapped arc
+                    // https://mozilla.github.io/uniffi-rs/latest/internals/object_references.html
+                    let obj: ::std::sync::Arc<::std::sync::Arc<dyn #trait_ident>> = unsafe {
+                        handle.into_arc()
+                    };
+                    // We have a `Arc<Arc<dyn #trait_ident>>>`, but we need to return an `Arc<dyn #trait_ident>`
+                    // Unfortunately, Rust won't cast the double-arc to a single-arc trait object.
+                    // So we have to clone the inner arc and return that.
+                    ::std::result::Result::Ok((*obj).clone())
+                }
             }
         }
     } else {
+        // The trait can only implemented by Rust.
+        // `try_lift` can assume the Rust-generated case.
         quote! {
-            fn try_lift(v: Self::FfiType) -> ::uniffi::deps::anyhow::Result<::std::sync::Arc<Self>> {
-                unsafe {
-                    ::std::result::Result::Ok(
-                        *::std::boxed::Box::from_raw(v as *mut ::std::sync::Arc<Self>),
-                    )
-                }
+            fn try_lift(handle: Self::FfiType) -> ::uniffi::deps::anyhow::Result<::std::sync::Arc<Self>> {
+                use ::std::clone::Clone;
+                let obj: ::std::sync::Arc<::std::sync::Arc<dyn #trait_ident>> = unsafe {
+                    handle.into_arc()
+                };
+                ::std::result::Result::Ok((*obj).clone())
             }
         }
     };
@@ -167,31 +183,53 @@ pub(crate) fn ffi_converter(
             dyn #trait_ident: ::core::marker::Sync, ::core::marker::Send
         );
 
+        // We're going to be casting raw pointers to `u64` values to pass them across the FFI.
+        // Ensure that we're not on some 128-bit machine where this would overflow.
+        ::uniffi::deps::static_assertions::const_assert!(::std::mem::size_of::<*const ()>() <= 8);
+
         unsafe #impl_spec {
-            type FfiType = *const ::std::os::raw::c_void;
+            type FfiType = ::uniffi::ffi::Handle;
 
             fn lower(obj: ::std::sync::Arc<Self>) -> Self::FfiType {
-                ::std::boxed::Box::into_raw(::std::boxed::Box::new(obj)) as *const ::std::os::raw::c_void
+                match obj.uniffi_foreign_handle() {
+                    // Obj stores a foreign-generated handle that `uniffi_foreign_handle` just
+                    // cloned.  We can return that directly.
+                    ::std::option::Option::Some(handle) => handle,
+                    // Obj is a Rust-implemented trait.
+                    // Wrap `obj` in a second arc and create the handle from that.
+                    // https://mozilla.github.io/uniffi-rs/latest/internals/object_references.html
+                    ::std::option::Option::None => {
+                        use ::std::sync::Arc;
+                        let obj: Arc<Arc<dyn #trait_ident>> = Arc::new(obj);
+                        ::uniffi::ffi::Handle::from_arc(obj)
+                    }
+                }
             }
 
             #try_lift
 
             fn write(obj: ::std::sync::Arc<Self>, buf: &mut ::std::vec::Vec<u8>) {
-                ::uniffi::deps::static_assertions::const_assert!(::std::mem::size_of::<*const ::std::ffi::c_void>() <= 8);
                 ::uniffi::deps::bytes::BufMut::put_u64(
                     buf,
-                    #lower_self(obj) as ::std::primitive::u64,
+                    #lower_self(obj).as_raw()
                 );
             }
 
             fn try_read(buf: &mut &[u8]) -> ::uniffi::Result<::std::sync::Arc<Self>> {
-                ::uniffi::deps::static_assertions::const_assert!(::std::mem::size_of::<*const ::std::ffi::c_void>() <= 8);
                 ::uniffi::check_remaining(buf, 8)?;
-                #try_lift_self(::uniffi::deps::bytes::Buf::get_u64(buf) as Self::FfiType)
+                #try_lift_self(::uniffi::ffi::Handle::from_raw_unchecked(::uniffi::deps::bytes::Buf::get_u64(buf)))
             }
 
             const TYPE_ID_META: ::uniffi::MetadataBuffer = ::uniffi::MetadataBuffer::from_code(#metadata_code)
-                .concat_str(#mod_path)
+                .concat_str(module_path!())
+                .concat_str(#trait_name);
+        }
+
+        #[doc(hidden)]
+        #[automatically_derived]
+        #type_id_impl_spec {
+            const TYPE_ID_META: ::uniffi::MetadataBuffer = ::uniffi::MetadataBuffer::from_code(#metadata_code)
+                .concat_str(module_path!())
                 .concat_str(#trait_name);
         }
 
@@ -200,3 +238,31 @@ pub(crate) fn ffi_converter(
         }
     }
 }
+
+pub fn alter_trait(item: &ItemTrait) -> TokenStream {
+    let ItemTrait {
+        attrs,
+        vis,
+        unsafety,
+        auto_token,
+        trait_token,
+        ident,
+        generics,
+        colon_token,
+        supertraits,
+        items,
+        ..
+    } = item;
+
+    quote! {
+        #(#attrs)*
+        #vis #unsafety #auto_token #trait_token #ident #generics #colon_token #supertraits {
+            #(#items)*
+
+            #[doc(hidden)]
+            fn uniffi_foreign_handle(&self) -> ::std::option::Option<::uniffi::Handle> {
+                ::std::option::Option::None
+            }
+        }
+    }
+}
diff --git a/third_party/rust/uniffi_macros/src/export/utrait.rs b/third_party/rust/uniffi_macros/src/export/utrait.rs
index 6e133cedbd340..51679501d9f0f 100644
--- a/third_party/rust/uniffi_macros/src/export/utrait.rs
+++ b/third_party/rust/uniffi_macros/src/export/utrait.rs
@@ -6,17 +6,15 @@ use proc_macro2::{Ident, TokenStream};
 use quote::quote;
 use syn::ext::IdentExt;
 
-use super::gen_ffi_function;
-use crate::export::ExportFnArgs;
-use crate::fnsig::FnSignature;
-use crate::util::extract_docstring;
+use super::{gen_ffi_function, ExportFnArgs};
+use crate::{fnsig::FnSignature, util::extract_docstring};
 use uniffi_meta::UniffiTraitDiscriminants;
 
 pub(crate) fn expand_uniffi_trait_export(
     self_ident: Ident,
     uniffi_traits: Vec<UniffiTraitDiscriminants>,
+    include_metadata: bool,
 ) -> syn::Result<TokenStream> {
-    let udl_mode = false;
     let mut impl_items = Vec::new();
     let mut global_items = Vec::new();
     for trait_id in uniffi_traits {
@@ -28,23 +26,23 @@ pub(crate) fn expand_uniffi_trait_export(
                         format!("{:?}", self)
                     }
                 };
-                let (ffi_func, method_meta) =
-                    process_uniffi_trait_method(&method, &self_ident, udl_mode)?;
+                let (ffi_func, method_meta) = process_uniffi_trait_method(&method, &self_ident)?;
                 // metadata for the trait - which includes metadata for the method.
                 let discr = UniffiTraitDiscriminants::Debug as u8;
-                let trait_meta = crate::util::create_metadata_items(
-                    "uniffi_trait",
-                    &format!("{}_Debug", self_ident.unraw()),
-                    quote! {
-                        ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::UNIFFI_TRAIT)
-                        .concat_value(#discr)
-                        .concat(#method_meta)
-                    },
-                    None,
-                );
                 impl_items.push(method);
                 global_items.push(ffi_func);
-                global_items.push(trait_meta);
+                if include_metadata {
+                    global_items.push(crate::util::create_metadata_items(
+                        "uniffi_trait",
+                        &format!("{}_Debug", self_ident.unraw()),
+                        quote! {
+                            ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::UNIFFI_TRAIT)
+                            .concat_value(#discr)
+                            .concat(#method_meta)
+                        },
+                        None,
+                    ));
+                }
             }
             UniffiTraitDiscriminants::Display => {
                 let method = quote! {
@@ -53,23 +51,23 @@ pub(crate) fn expand_uniffi_trait_export(
                         format!("{}", self)
                     }
                 };
-                let (ffi_func, method_meta) =
-                    process_uniffi_trait_method(&method, &self_ident, udl_mode)?;
+                let (ffi_func, method_meta) = process_uniffi_trait_method(&method, &self_ident)?;
                 // metadata for the trait - which includes metadata for the method.
                 let discr = UniffiTraitDiscriminants::Display as u8;
-                let trait_meta = crate::util::create_metadata_items(
-                    "uniffi_trait",
-                    &format!("{}_Display", self_ident.unraw()),
-                    quote! {
-                        ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::UNIFFI_TRAIT)
-                        .concat_value(#discr)
-                        .concat(#method_meta)
-                    },
-                    None,
-                );
                 impl_items.push(method);
                 global_items.push(ffi_func);
-                global_items.push(trait_meta);
+                if include_metadata {
+                    global_items.push(crate::util::create_metadata_items(
+                        "uniffi_trait",
+                        &format!("{}_Display", self_ident.unraw()),
+                        quote! {
+                            ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::UNIFFI_TRAIT)
+                            .concat_value(#discr)
+                            .concat(#method_meta)
+                        },
+                        None,
+                    ));
+                }
             }
             UniffiTraitDiscriminants::Hash => {
                 let method = quote! {
@@ -81,23 +79,23 @@ pub(crate) fn expand_uniffi_trait_export(
                         s.finish()
                     }
                 };
-                let (ffi_func, method_meta) =
-                    process_uniffi_trait_method(&method, &self_ident, udl_mode)?;
+                let (ffi_func, method_meta) = process_uniffi_trait_method(&method, &self_ident)?;
                 // metadata for the trait - which includes metadata for the hash method.
                 let discr = UniffiTraitDiscriminants::Hash as u8;
-                let trait_meta = crate::util::create_metadata_items(
-                    "uniffi_trait",
-                    &format!("{}_Hash", self_ident.unraw()),
-                    quote! {
-                        ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::UNIFFI_TRAIT)
-                        .concat_value(#discr)
-                        .concat(#method_meta)
-                    },
-                    None,
-                );
                 impl_items.push(method);
                 global_items.push(ffi_func);
-                global_items.push(trait_meta);
+                if include_metadata {
+                    global_items.push(crate::util::create_metadata_items(
+                        "uniffi_trait",
+                        &format!("{}_Hash", self_ident.unraw()),
+                        quote! {
+                            ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::UNIFFI_TRAIT)
+                            .concat_value(#discr)
+                            .concat(#method_meta)
+                        },
+                        None,
+                    ));
+                }
             }
             UniffiTraitDiscriminants::Eq => {
                 let method_eq = quote! {
@@ -115,27 +113,55 @@ pub(crate) fn expand_uniffi_trait_export(
                     }
                 };
                 let (ffi_func_eq, method_meta_eq) =
-                    process_uniffi_trait_method(&method_eq, &self_ident, udl_mode)?;
+                    process_uniffi_trait_method(&method_eq, &self_ident)?;
                 let (ffi_func_ne, method_meta_ne) =
-                    process_uniffi_trait_method(&method_ne, &self_ident, udl_mode)?;
+                    process_uniffi_trait_method(&method_ne, &self_ident)?;
                 // metadata for the trait itself.
                 let discr = UniffiTraitDiscriminants::Eq as u8;
-                let trait_meta = crate::util::create_metadata_items(
-                    "uniffi_trait",
-                    &format!("{}_Eq", self_ident.unraw()),
-                    quote! {
-                        ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::UNIFFI_TRAIT)
-                        .concat_value(#discr)
-                        .concat(#method_meta_eq)
-                        .concat(#method_meta_ne)
-                    },
-                    None,
-                );
                 impl_items.push(method_eq);
                 impl_items.push(method_ne);
                 global_items.push(ffi_func_eq);
                 global_items.push(ffi_func_ne);
-                global_items.push(trait_meta);
+                if include_metadata {
+                    global_items.push(crate::util::create_metadata_items(
+                        "uniffi_trait",
+                        &format!("{}_Eq", self_ident.unraw()),
+                        quote! {
+                            ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::UNIFFI_TRAIT)
+                            .concat_value(#discr)
+                            .concat(#method_meta_eq)
+                            .concat(#method_meta_ne)
+                        },
+                        None,
+                    ));
+                }
+            }
+            UniffiTraitDiscriminants::Ord => {
+                let method_cmp = quote! {
+                    fn uniffi_trait_ord_cmp(&self, other: &#self_ident) -> i8 {
+                        use ::std::cmp::Ord;
+                        ::uniffi::deps::static_assertions::assert_impl_all!(#self_ident: Ord); // This object has a trait method which requires `Ord` be implemented.
+                        Ord::cmp(self, other) as i8
+                    }
+                };
+                let (ffi_func_cmp, method_meta_cmp) =
+                    process_uniffi_trait_method(&method_cmp, &self_ident)?;
+                // metadata for the trait itself.
+                let discr = UniffiTraitDiscriminants::Ord as u8;
+                impl_items.push(method_cmp);
+                global_items.push(ffi_func_cmp);
+                if include_metadata {
+                    global_items.push(crate::util::create_metadata_items(
+                        "uniffi_trait",
+                        &format!("{}_Ord", self_ident.unraw()),
+                        quote! {
+                            ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::UNIFFI_TRAIT)
+                            .concat_value(#discr)
+                            .concat(#method_meta_cmp)
+                        },
+                        None,
+                    ));
+                }
             }
         }
     }
@@ -151,7 +177,6 @@ pub(crate) fn expand_uniffi_trait_export(
 fn process_uniffi_trait_method(
     method: &TokenStream,
     self_ident: &Ident,
-    udl_mode: bool,
 ) -> syn::Result<(TokenStream, TokenStream)> {
     let item = syn::parse(method.clone().into())?;
 
@@ -163,16 +188,19 @@ fn process_uniffi_trait_method(
 
     let ffi_func = gen_ffi_function(
         &FnSignature::new_method(
+            self_ident.clone(),
             self_ident.clone(),
             item.sig.clone(),
             ExportFnArgs::default(),
             docstring.clone(),
         )?,
         None,
-        udl_mode,
+        false, // udl_mode - We don't need the `Result<>` magic UDL functions get even if we are in UDL.
+        None,
     )?;
     // metadata for the method, which will be packed inside metadata for the trait.
     let method_meta = FnSignature::new_method(
+        self_ident.clone(),
         self_ident.clone(),
         item.sig,
         ExportFnArgs::default(),
diff --git a/third_party/rust/uniffi_macros/src/fnsig.rs b/third_party/rust/uniffi_macros/src/fnsig.rs
index 19774dc3bac50..b23ba1c31d0cb 100644
--- a/third_party/rust/uniffi_macros/src/fnsig.rs
+++ b/third_party/rust/uniffi_macros/src/fnsig.rs
@@ -43,20 +43,38 @@ impl FnSignature {
 
     pub(crate) fn new_method(
         self_ident: Ident,
+        foreign_self_ident: Ident,
         sig: syn::Signature,
         args: ExportFnArgs,
         docstring: String,
     ) -> syn::Result<Self> {
-        Self::new(FnKind::Method { self_ident }, sig, args, docstring)
+        Self::new(
+            FnKind::Method {
+                self_ident,
+                foreign_self_ident,
+            },
+            sig,
+            args,
+            docstring,
+        )
     }
 
     pub(crate) fn new_constructor(
         self_ident: Ident,
+        foreign_self_ident: Ident,
         sig: syn::Signature,
         args: ExportFnArgs,
         docstring: String,
     ) -> syn::Result<Self> {
-        Self::new(FnKind::Constructor { self_ident }, sig, args, docstring)
+        Self::new(
+            FnKind::Constructor {
+                self_ident,
+                foreign_self_ident,
+            },
+            sig,
+            args,
+            docstring,
+        )
     }
 
     pub(crate) fn new_trait_method(
@@ -203,14 +221,21 @@ impl FnSignature {
         let name = &self.name;
         let name = match &self.kind {
             FnKind::Function => uniffi_meta::fn_symbol_name(&self.mod_path, name),
-            FnKind::Method { self_ident } | FnKind::TraitMethod { self_ident, .. } => {
+            FnKind::Method {
+                foreign_self_ident, ..
+            } => {
+                let object_name = ident_to_string(foreign_self_ident);
+                uniffi_meta::method_symbol_name(&self.mod_path, &object_name, name)
+            }
+            FnKind::TraitMethod { self_ident, .. } => {
                 uniffi_meta::method_symbol_name(&self.mod_path, &ident_to_string(self_ident), name)
             }
-            FnKind::Constructor { self_ident } => uniffi_meta::constructor_symbol_name(
-                &self.mod_path,
-                &ident_to_string(self_ident),
-                name,
-            ),
+            FnKind::Constructor {
+                foreign_self_ident, ..
+            } => {
+                let object_name = ident_to_string(foreign_self_ident);
+                uniffi_meta::constructor_symbol_name(&self.mod_path, &object_name, name)
+            }
         };
         Ok(Ident::new(&name, Span::call_site()))
     }
@@ -233,7 +258,6 @@ impl FnSignature {
             name,
             return_ty,
             is_async,
-            mod_path,
             docstring,
             ..
         } = &self;
@@ -254,7 +278,7 @@ impl FnSignature {
         match &self.kind {
             FnKind::Function => Ok(quote! {
                 ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::FUNC)
-                    .concat_str(#mod_path)
+                    .concat_str(module_path!())
                     .concat_str(#name)
                     .concat_bool(#is_async)
                     .concat_value(#args_len)
@@ -263,11 +287,13 @@ impl FnSignature {
                     .concat_long_str(#docstring)
             }),
 
-            FnKind::Method { self_ident } => {
-                let object_name = ident_to_string(self_ident);
+            FnKind::Method {
+                foreign_self_ident, ..
+            } => {
+                let object_name = ident_to_string(foreign_self_ident);
                 Ok(quote! {
                     ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::METHOD)
-                        .concat_str(#mod_path)
+                        .concat_str(module_path!())
                         .concat_str(#object_name)
                         .concat_str(#name)
                         .concat_bool(#is_async)
@@ -282,7 +308,7 @@ impl FnSignature {
                 let object_name = ident_to_string(self_ident);
                 Ok(quote! {
                     ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::TRAIT_METHOD)
-                        .concat_str(#mod_path)
+                        .concat_str(module_path!())
                         .concat_str(#object_name)
                         .concat_u32(#index)
                         .concat_str(#name)
@@ -294,11 +320,13 @@ impl FnSignature {
                 })
             }
 
-            FnKind::Constructor { self_ident } => {
-                let object_name = ident_to_string(self_ident);
+            FnKind::Constructor {
+                foreign_self_ident, ..
+            } => {
+                let object_name = ident_to_string(foreign_self_ident);
                 Ok(quote! {
                     ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::CONSTRUCTOR)
-                        .concat_str(#mod_path)
+                        .concat_str(module_path!())
                         .concat_str(#object_name)
                         .concat_str(#name)
                         .concat_bool(#is_async)
@@ -321,8 +349,10 @@ impl FnSignature {
                 Some(self.checksum_symbol_name()),
             )),
 
-            FnKind::Method { self_ident } => {
-                let object_name = ident_to_string(self_ident);
+            FnKind::Method {
+                foreign_self_ident, ..
+            } => {
+                let object_name = ident_to_string(foreign_self_ident);
                 Ok(create_metadata_items(
                     "method",
                     &format!("{object_name}_{name}"),
@@ -341,8 +371,10 @@ impl FnSignature {
                 ))
             }
 
-            FnKind::Constructor { self_ident } => {
-                let object_name = ident_to_string(self_ident);
+            FnKind::Constructor {
+                foreign_self_ident, ..
+            } => {
+                let object_name = ident_to_string(foreign_self_ident);
                 Ok(create_metadata_items(
                     "constructor",
                     &format!("{object_name}_{name}"),
@@ -357,18 +389,23 @@ impl FnSignature {
         let name = &self.name;
         match &self.kind {
             FnKind::Function => uniffi_meta::fn_checksum_symbol_name(&self.mod_path, name),
-            FnKind::Method { self_ident } | FnKind::TraitMethod { self_ident, .. } => {
-                uniffi_meta::method_checksum_symbol_name(
-                    &self.mod_path,
-                    &ident_to_string(self_ident),
-                    name,
-                )
+            FnKind::Method {
+                foreign_self_ident, ..
+            } => {
+                let object_name = ident_to_string(foreign_self_ident);
+                uniffi_meta::method_checksum_symbol_name(&self.mod_path, &object_name, name)
             }
-            FnKind::Constructor { self_ident } => uniffi_meta::constructor_checksum_symbol_name(
+            FnKind::TraitMethod { self_ident, .. } => uniffi_meta::method_checksum_symbol_name(
                 &self.mod_path,
                 &ident_to_string(self_ident),
                 name,
             ),
+            FnKind::Constructor {
+                foreign_self_ident, ..
+            } => {
+                let object_name = ident_to_string(foreign_self_ident);
+                uniffi_meta::constructor_checksum_symbol_name(&self.mod_path, &object_name, name)
+            }
         }
     }
 }
@@ -378,6 +415,7 @@ pub(crate) struct Arg {
     pub(crate) kind: ArgKind,
 }
 
+#[allow(clippy::large_enum_variant)]
 pub(crate) enum ArgKind {
     Receiver(ReceiverArg),
     Named(NamedArg),
@@ -490,7 +528,16 @@ fn looks_like_result(return_type: &ReturnType) -> bool {
 #[derive(Debug)]
 pub(crate) enum FnKind {
     Function,
-    Constructor { self_ident: Ident },
-    Method { self_ident: Ident },
-    TraitMethod { self_ident: Ident, index: u32 },
+    Constructor {
+        self_ident: Ident,
+        foreign_self_ident: Ident,
+    },
+    Method {
+        self_ident: Ident,
+        foreign_self_ident: Ident,
+    },
+    TraitMethod {
+        self_ident: Ident,
+        index: u32,
+    },
 }
diff --git a/third_party/rust/uniffi_macros/src/lib.rs b/third_party/rust/uniffi_macros/src/lib.rs
index 335e5abaae9b6..ea05c9a19fe87 100644
--- a/third_party/rust/uniffi_macros/src/lib.rs
+++ b/third_party/rust/uniffi_macros/src/lib.rs
@@ -74,23 +74,44 @@ pub fn setup_scaffolding(tokens: TokenStream) -> TokenStream {
 
 #[proc_macro_attribute]
 pub fn export(attr_args: TokenStream, input: TokenStream) -> TokenStream {
-    do_export(attr_args, input, false)
+    do_export(attr_args, input, true, false)
 }
 
-fn do_export(attr_args: TokenStream, input: TokenStream, udl_mode: bool) -> TokenStream {
-    let copied_input = (!udl_mode).then(|| proc_macro2::TokenStream::from(input.clone()));
-
+fn do_export(
+    attr_args: TokenStream,
+    input: TokenStream,
+    keep_input: bool,
+    udl_mode: bool,
+) -> TokenStream {
     let gen_output = || {
         let item = syn::parse(input)?;
-        expand_export(item, attr_args, udl_mode)
+        let altered_input = keep_input.then(|| export::alter_input(&item));
+        let output = expand_export(item, attr_args, udl_mode)?;
+        Ok(quote! {
+            #altered_input
+            #output
+        })
     };
-    let output = gen_output().unwrap_or_else(syn::Error::into_compile_error);
+    gen_output()
+        .unwrap_or_else(syn::Error::into_compile_error)
+        .into()
+}
 
-    quote! {
-        #copied_input
-        #output
-    }
-    .into()
+// Generate export items for UDL mode
+//
+// This works similarly to `udl_derive`, but for #[export].
+#[doc(hidden)]
+#[proc_macro_attribute]
+pub fn export_for_udl(attrs: TokenStream, input: TokenStream) -> TokenStream {
+    do_export(attrs, input, false, true)
+}
+
+// This is for attributes on items we also `udl_derive`. It always keeps the input tokens
+// for `udl_derive` to consume (and then discard!)
+#[doc(hidden)]
+#[proc_macro_attribute]
+pub fn export_for_udl_derive(attrs: TokenStream, input: TokenStream) -> TokenStream {
+    do_export(attrs, input, true, true)
 }
 
 #[proc_macro_derive(Record, attributes(uniffi))]
@@ -100,14 +121,14 @@ pub fn derive_record(input: TokenStream) -> TokenStream {
         .into()
 }
 
-#[proc_macro_derive(Enum)]
+#[proc_macro_derive(Enum, attributes(uniffi))]
 pub fn derive_enum(input: TokenStream) -> TokenStream {
     expand_enum(parse_macro_input!(input), DeriveOptions::default())
         .unwrap_or_else(syn::Error::into_compile_error)
         .into()
 }
 
-#[proc_macro_derive(Object)]
+#[proc_macro_derive(Object, attributes(uniffi))]
 pub fn derive_object(input: TokenStream) -> TokenStream {
     expand_object(parse_macro_input!(input), DeriveOptions::default())
         .unwrap_or_else(syn::Error::into_compile_error)
@@ -194,15 +215,6 @@ pub fn udl_derive(attrs: TokenStream, input: TokenStream) -> TokenStream {
     .into()
 }
 
-// Generate export items for UDL mode
-//
-// This works similarly to `udl_derive`, but for #[export].
-#[doc(hidden)]
-#[proc_macro_attribute]
-pub fn export_for_udl(attrs: TokenStream, input: TokenStream) -> TokenStream {
-    do_export(attrs, input, true)
-}
-
 /// A helper macro to include generated component scaffolding.
 ///
 /// This is a simple convenience macro to include the UniFFI component
@@ -316,3 +328,9 @@ pub fn constructor(_attrs: TokenStream, input: TokenStream) -> TokenStream {
 pub fn method(_attrs: TokenStream, input: TokenStream) -> TokenStream {
     input
 }
+
+/// Attribute for trait interfaces defined in UDL
+#[proc_macro_attribute]
+pub fn trait_interface(_attr_args: TokenStream, input: TokenStream) -> TokenStream {
+    export::alter_trait(&parse_macro_input!(input)).into()
+}
diff --git a/third_party/rust/uniffi_macros/src/object.rs b/third_party/rust/uniffi_macros/src/object.rs
index 17fa854fe5055..6410806578a2b 100644
--- a/third_party/rust/uniffi_macros/src/object.rs
+++ b/third_party/rust/uniffi_macros/src/object.rs
@@ -5,24 +5,57 @@ use syn::DeriveInput;
 use crate::{
     ffiops,
     util::{
-        create_metadata_items, extract_docstring, ident_to_string, mod_path,
-        wasm_single_threaded_annotation,
+        create_metadata_items, either_attribute_arg, extract_docstring, ident_to_string, kw,
+        mod_path, wasm_single_threaded_annotation, AttributeSliceExt, UniffiAttributeArgs,
     },
     DeriveOptions,
 };
+use syn::{parse::ParseStream, LitStr, Token};
 use uniffi_meta::ObjectImpl;
 
+/// Handle #[uniffi(...)] attributes for objects
+#[derive(Clone, Default)]
+pub struct ObjectAttr {
+    pub name: Option<String>,
+}
+
+impl UniffiAttributeArgs for ObjectAttr {
+    fn parse_one(input: ParseStream<'_>) -> syn::Result<Self> {
+        let lookahead = input.lookahead1();
+        if lookahead.peek(kw::name) {
+            let _: kw::name = input.parse()?;
+            let _: Token![=] = input.parse()?;
+            let name = Some(input.parse::<LitStr>()?.value());
+            Ok(Self { name })
+        } else {
+            Err(syn::Error::new(
+                input.span(),
+                format!("attribute `{input}` is not supported here."),
+            ))
+        }
+    }
+
+    fn merge(self, other: Self) -> syn::Result<Self> {
+        Ok(Self {
+            name: either_attribute_arg(self.name, other.name)?,
+        })
+    }
+}
+
 /// Stores parsed data from the Derive Input for the struct/enum.
 struct ObjectItem {
     ident: Ident,
     docstring: String,
+    attr: ObjectAttr,
 }
 
 impl ObjectItem {
     fn new(input: DeriveInput) -> syn::Result<Self> {
+        let attr = input.attrs.parse_uniffi_attr_args::<ObjectAttr>()?;
         Ok(Self {
             ident: input.ident,
             docstring: extract_docstring(&input.attrs)?,
+            attr,
         })
     }
 
@@ -34,6 +67,13 @@ impl ObjectItem {
         ident_to_string(&self.ident)
     }
 
+    fn foreign_name(&self) -> String {
+        match &self.attr.name {
+            Some(name) => name.clone(),
+            None => self.name(),
+        }
+    }
+
     fn docstring(&self) -> &str {
         self.docstring.as_str()
     }
@@ -42,24 +82,19 @@ impl ObjectItem {
 pub fn expand_object(input: DeriveInput, options: DeriveOptions) -> syn::Result<TokenStream> {
     let module_path = mod_path()?;
     let object = ObjectItem::new(input)?;
-    let name = object.name();
+    let name = &object.foreign_name();
     let ident = object.ident();
     let clone_fn_ident = Ident::new(
-        &uniffi_meta::clone_fn_symbol_name(&module_path, &name),
+        &uniffi_meta::clone_fn_symbol_name(&module_path, name),
         Span::call_site(),
     );
     let free_fn_ident = Ident::new(
-        &uniffi_meta::free_fn_symbol_name(&module_path, &name),
+        &uniffi_meta::free_fn_symbol_name(&module_path, name),
         Span::call_site(),
     );
     let meta_static_var = options.generate_metadata.then(|| {
-        interface_meta_static_var(
-            object.ident(),
-            ObjectImpl::Struct,
-            &module_path,
-            object.docstring(),
-        )
-        .unwrap_or_else(syn::Error::into_compile_error)
+        interface_meta_static_var(name, ObjectImpl::Struct, object.docstring())
+            .unwrap_or_else(syn::Error::into_compile_error)
     });
     let interface_impl = interface_impl(&object, &options);
 
@@ -67,29 +102,29 @@ pub fn expand_object(input: DeriveInput, options: DeriveOptions) -> syn::Result<
         #[doc(hidden)]
         #[unsafe(no_mangle)]
         pub unsafe extern "C" fn #clone_fn_ident(
-            ptr: *const ::std::ffi::c_void,
+            handle: ::uniffi::ffi::Handle,
             call_status: &mut ::uniffi::RustCallStatus
-        ) -> *const ::std::ffi::c_void {
-            ::uniffi::deps::trace!("clone: {} ({:?})", #name, ptr);
+        ) -> ::uniffi::ffi::Handle {
+            ::uniffi::deps::trace!("clone: {} ({:?})", #name, handle);
             ::uniffi::rust_call(call_status, || {
-                unsafe { ::std::sync::Arc::increment_strong_count(ptr) };
-                ::std::result::Result::Ok(ptr)
+                unsafe {
+                    handle.clone_arc_handle::<#ident>()
+                };
+                ::std::result::Result::Ok(handle)
             })
         }
 
         #[doc(hidden)]
         #[unsafe(no_mangle)]
         pub unsafe extern "C" fn #free_fn_ident(
-            ptr: *const ::std::ffi::c_void,
+            handle: ::uniffi::ffi::Handle,
             call_status: &mut ::uniffi::RustCallStatus
         ) {
-            ::uniffi::deps::trace!("free: {} ({:?})", #name, ptr);
+            ::uniffi::deps::trace!("free: {} ({:?})", #name, handle);
             ::uniffi::rust_call(call_status, || {
-                assert!(!ptr.is_null());
-                let ptr = ptr.cast::<#ident>();
-                unsafe {
-                    ::std::sync::Arc::decrement_strong_count(ptr);
-                }
+                ::std::mem::drop(unsafe {
+                    handle.into_arc::<#ident>()
+                });
                 ::std::result::Result::Ok(())
             });
         }
@@ -100,17 +135,13 @@ pub fn expand_object(input: DeriveInput, options: DeriveOptions) -> syn::Result<
 }
 
 fn interface_impl(object: &ObjectItem, options: &DeriveOptions) -> TokenStream {
-    let name = object.name();
+    let name = object.foreign_name();
     let ident = object.ident();
     let impl_spec = options.ffi_impl_header("FfiConverterArc", ident);
     let lower_return_impl_spec = options.ffi_impl_header("LowerReturn", ident);
     let lower_error_impl_spec = options.ffi_impl_header("LowerError", ident);
     let type_id_impl_spec = options.ffi_impl_header("TypeId", ident);
     let lift_ref_impl_spec = options.ffi_impl_header("LiftRef", ident);
-    let mod_path = match mod_path() {
-        Ok(p) => p,
-        Err(e) => return e.into_compile_error(),
-    };
     let arc_self_type = quote! { ::std::sync::Arc<Self> };
     let lower_arc = ffiops::lower(&arc_self_type);
     let type_id_meta_arc = ffiops::type_id_meta(&arc_self_type);
@@ -130,6 +161,10 @@ fn interface_impl(object: &ObjectItem, options: &DeriveOptions) -> TokenStream {
             #ident: ::core::marker::Sync, ::core::marker::Send
         );
 
+        // We're going to be casting raw pointers to `u64` values to pass them across the FFI.
+        // Ensure that we're not on some 128-bit machine where this would overflow.
+        ::uniffi::deps::static_assertions::const_assert!(::std::mem::size_of::<*const ()>() <= 8);
+
         #[doc(hidden)]
         #[automatically_derived]
         /// Support for passing reference-counted shared objects via the FFI.
@@ -138,8 +173,7 @@ fn interface_impl(object: &ObjectItem, options: &DeriveOptions) -> TokenStream {
         /// by reference must be encapsulated in an `Arc`, and must be safe to share
         /// across threads.
         unsafe #impl_spec {
-            // Don't use a pointer to <T> as that requires a `pub <T>`
-            type FfiType = *const ::std::os::raw::c_void;
+            type FfiType = ::uniffi::ffi::Handle;
 
             /// When lowering, we have an owned `Arc` and we transfer that ownership
             /// to the foreign-language code, "leaking" it out of Rust's ownership system
@@ -151,16 +185,15 @@ fn interface_impl(object: &ObjectItem, options: &DeriveOptions) -> TokenStream {
             /// call the destructor function specific to the type `T`. Calling the destructor
             /// function for other types may lead to undefined behaviour.
             fn lower(obj: ::std::sync::Arc<Self>) -> Self::FfiType {
-                let ptr = ::std::sync::Arc::into_raw(obj) as Self::FfiType;
-                ::uniffi::deps::trace!("lower: {} ({:?})", #name, ptr);
-                ptr
+                ::uniffi::deps::trace!("lower: {} {:?}", #name, ::std::sync::Arc::as_ptr(&obj));
+                let handle = ::uniffi::ffi::Handle::from_arc(obj);
+                handle
             }
 
             /// When lifting, we receive an owned `Arc` that the foreign language code cloned.
-            fn try_lift(v: Self::FfiType) -> ::uniffi::Result<::std::sync::Arc<Self>> {
-                ::uniffi::deps::trace!("lift: {} ({:?})", #name, v);
-                let v = v as *const #ident;
-                ::std::result::Result::Ok(unsafe { ::std::sync::Arc::<Self>::from_raw(v) })
+            fn try_lift(handle: Self::FfiType) -> ::uniffi::Result<::std::sync::Arc<Self>> {
+                ::uniffi::deps::trace!("lift: {} ({:?})", #name, handle);
+                ::std::result::Result::Ok(unsafe { handle.into_arc() })
             }
 
             /// When writing as a field of a complex structure, make a clone and transfer ownership
@@ -172,8 +205,7 @@ fn interface_impl(object: &ObjectItem, options: &DeriveOptions) -> TokenStream {
             /// call the destructor function specific to the type `T`. Calling the destructor
             /// function for other types may lead to undefined behaviour.
             fn write(obj: ::std::sync::Arc<Self>, buf: &mut ::std::vec::Vec<u8>) {
-                ::uniffi::deps::static_assertions::const_assert!(::std::mem::size_of::<*const ::std::ffi::c_void>() <= 8);
-                ::uniffi::deps::bytes::BufMut::put_u64(buf, #lower_arc(obj) as ::std::primitive::u64);
+                ::uniffi::deps::bytes::BufMut::put_u64(buf, #lower_arc(obj).as_raw());
             }
 
             /// When reading as a field of a complex structure, we receive a "borrow" of the `Arc`
@@ -182,13 +214,12 @@ fn interface_impl(object: &ObjectItem, options: &DeriveOptions) -> TokenStream {
             /// Safety: the buffer must contain a pointer previously obtained by calling
             /// the `lower()` or `write()` method of this impl.
             fn try_read(buf: &mut &[u8]) -> ::uniffi::Result<::std::sync::Arc<Self>> {
-                ::uniffi::deps::static_assertions::const_assert!(::std::mem::size_of::<*const ::std::ffi::c_void>() <= 8);
                 ::uniffi::check_remaining(buf, 8)?;
-                #try_lift_arc(::uniffi::deps::bytes::Buf::get_u64(buf) as Self::FfiType)
+                #try_lift_arc(::uniffi::ffi::Handle::from_raw_unchecked(::uniffi::deps::bytes::Buf::get_u64(buf)))
             }
 
             const TYPE_ID_META: ::uniffi::MetadataBuffer = ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::TYPE_INTERFACE)
-                .concat_str(#mod_path)
+                .concat_str(module_path!())
                 .concat_str(#name);
         }
 
@@ -217,12 +248,10 @@ fn interface_impl(object: &ObjectItem, options: &DeriveOptions) -> TokenStream {
 }
 
 pub(crate) fn interface_meta_static_var(
-    ident: &Ident,
+    name: &str,
     imp: ObjectImpl,
-    module_path: &str,
     docstring: &str,
 ) -> syn::Result<TokenStream> {
-    let name = ident_to_string(ident);
     let code = match imp {
         ObjectImpl::Struct => quote! { ::uniffi::metadata::codes::INTERFACE },
         ObjectImpl::Trait => quote! { ::uniffi::metadata::codes::TRAIT_INTERFACE },
@@ -231,10 +260,10 @@ pub(crate) fn interface_meta_static_var(
 
     Ok(create_metadata_items(
         "interface",
-        &name,
+        name,
         quote! {
             ::uniffi::MetadataBuffer::from_code(#code)
-                .concat_str(#module_path)
+                .concat_str(module_path!())
                 .concat_str(#name)
                 .concat_long_str(#docstring)
         },
diff --git a/third_party/rust/uniffi_macros/src/record.rs b/third_party/rust/uniffi_macros/src/record.rs
index 74629d1915cf5..cafbb75389745 100644
--- a/third_party/rust/uniffi_macros/src/record.rs
+++ b/third_party/rust/uniffi_macros/src/record.rs
@@ -1,23 +1,52 @@
 use proc_macro2::{Ident, Span, TokenStream};
 use quote::quote;
-use syn::{parse::ParseStream, Data, DataStruct, DeriveInput, Field, Token};
+use syn::{parse::ParseStream, Data, DataStruct, DeriveInput, Field, LitStr, Token};
 
 use crate::{
     default::{default_value_metadata_calls, DefaultValue},
     ffiops,
     util::{
         create_metadata_items, either_attribute_arg, extract_docstring, ident_to_string, kw,
-        mod_path, try_metadata_value_from_usize, try_read_field, AttributeSliceExt,
-        UniffiAttributeArgs,
+        try_metadata_value_from_usize, try_read_field, AttributeSliceExt, UniffiAttributeArgs,
     },
     DeriveOptions,
 };
 
+/// Handle #[uniffi(...)] attributes for records
+#[derive(Clone, Default)]
+pub struct RecordAttr {
+    pub name: Option<String>,
+}
+
+impl UniffiAttributeArgs for RecordAttr {
+    fn parse_one(input: ParseStream<'_>) -> syn::Result<Self> {
+        let lookahead = input.lookahead1();
+        if lookahead.peek(kw::name) {
+            let _: kw::name = input.parse()?;
+            let _: Token![=] = input.parse()?;
+            let name = Some(input.parse::<LitStr>()?.value());
+            Ok(Self { name })
+        } else {
+            Err(syn::Error::new(
+                input.span(),
+                format!("attribute `{input}` is not supported here."),
+            ))
+        }
+    }
+
+    fn merge(self, other: Self) -> syn::Result<Self> {
+        Ok(Self {
+            name: either_attribute_arg(self.name, other.name)?,
+        })
+    }
+}
+
 /// Stores parsed data from the Derive Input for the struct.
 struct RecordItem {
     ident: Ident,
     record: DataStruct,
     docstring: String,
+    attr: RecordAttr,
 }
 
 impl RecordItem {
@@ -31,10 +60,12 @@ impl RecordItem {
                 ));
             }
         };
+        let attr = input.attrs.parse_uniffi_attr_args::<RecordAttr>()?;
         Ok(Self {
             ident: input.ident,
             record,
             docstring: extract_docstring(&input.attrs)?,
+            attr,
         })
     }
 
@@ -42,8 +73,11 @@ impl RecordItem {
         &self.ident
     }
 
-    fn name(&self) -> String {
-        ident_to_string(&self.ident)
+    fn foreign_name(&self) -> String {
+        match &self.attr.name {
+            Some(name) => name.clone(),
+            None => ident_to_string(&self.ident),
+        }
     }
 
     fn struct_(&self) -> &DataStruct {
@@ -56,9 +90,6 @@ impl RecordItem {
 }
 
 pub fn expand_record(input: DeriveInput, options: DeriveOptions) -> syn::Result<TokenStream> {
-    if let Some(e) = input.attrs.uniffi_attr_args_not_allowed_here() {
-        return Err(e);
-    }
     let record = RecordItem::new(input)?;
     let ffi_converter =
         record_ffi_converter_impl(&record, &options).unwrap_or_else(syn::Error::into_compile_error);
@@ -79,8 +110,7 @@ fn record_ffi_converter_impl(
     let ident = record.ident();
     let impl_spec = options.ffi_impl_header("FfiConverter", ident);
     let derive_ffi_traits = options.derive_all_ffi_traits(ident);
-    let name = ident_to_string(ident);
-    let mod_path = mod_path()?;
+    let name = &record.foreign_name();
     let write_impl: TokenStream = record.struct_().fields.iter().map(write_field).collect();
     let try_read_fields: TokenStream = record.struct_().fields.iter().map(try_read_field).collect();
 
@@ -98,7 +128,7 @@ fn record_ffi_converter_impl(
             }
 
             const TYPE_ID_META: ::uniffi::MetadataBuffer = ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::TYPE_RECORD)
-                .concat_str(#mod_path)
+                .concat_str(module_path!())
                 .concat_str(#name);
         }
 
@@ -122,8 +152,13 @@ pub struct FieldAttributeArguments {
 impl UniffiAttributeArgs for FieldAttributeArguments {
     fn parse_one(input: ParseStream<'_>) -> syn::Result<Self> {
         let _: kw::default = input.parse()?;
-        let _: Token![=] = input.parse()?;
-        let default = input.parse()?;
+        let lookahead = input.lookahead1();
+        let default = if lookahead.peek(Token![=]) {
+            let _: Token![=] = input.parse()?;
+            input.parse()?
+        } else {
+            DefaultValue::Default
+        };
         Ok(Self {
             default: Some(default),
         })
@@ -137,9 +172,8 @@ impl UniffiAttributeArgs for FieldAttributeArguments {
 }
 
 fn record_meta_static_var(record: &RecordItem) -> syn::Result<TokenStream> {
-    let name = record.name();
+    let name = &record.foreign_name();
     let docstring = record.docstring();
-    let module_path = mod_path()?;
     let fields_len = try_metadata_value_from_usize(
         record.struct_().fields.len(),
         "UniFFI limits structs to 256 fields",
@@ -172,10 +206,10 @@ fn record_meta_static_var(record: &RecordItem) -> syn::Result<TokenStream> {
 
     Ok(create_metadata_items(
         "record",
-        &name,
+        name,
         quote! {
             ::uniffi::MetadataBuffer::from_code(::uniffi::metadata::codes::RECORD)
-                .concat_str(#module_path)
+                .concat_str(module_path!())
                 .concat_str(#name)
                 .concat_value(#fields_len)
                 #concat_fields
diff --git a/third_party/rust/uniffi_macros/src/setup_scaffolding.rs b/third_party/rust/uniffi_macros/src/setup_scaffolding.rs
index d9e0f2f6a0fbd..af08e61b05f0b 100644
--- a/third_party/rust/uniffi_macros/src/setup_scaffolding.rs
+++ b/third_party/rust/uniffi_macros/src/setup_scaffolding.rs
@@ -161,7 +161,6 @@ fn rust_future_scaffolding_fns(module_path: &str) -> TokenStream {
         (quote! { i64 }, "i64"),
         (quote! { f32 }, "f32"),
         (quote! { f64 }, "f64"),
-        (quote! { *const ::std::ffi::c_void }, "pointer"),
         (quote! { ::uniffi::RustBuffer }, "rust_buffer"),
         (quote! { () }, "void"),
     ];
@@ -177,14 +176,14 @@ fn rust_future_scaffolding_fns(module_path: &str) -> TokenStream {
             #[doc(hidden)]
             #[unsafe(no_mangle)]
             pub unsafe extern "C" fn #ffi_rust_future_poll(handle: ::uniffi::Handle, callback: ::uniffi::RustFutureContinuationCallback, data: u64) {
-                ::uniffi::ffi::rust_future_poll::<#return_type, crate::UniFfiTag>(handle, callback, data);
+                ::uniffi::ffi::rust_future_poll::<#return_type>(handle, callback, data);
             }
 
             #[allow(clippy::missing_safety_doc, missing_docs)]
             #[doc(hidden)]
             #[unsafe(no_mangle)]
             pub unsafe extern "C" fn #ffi_rust_future_cancel(handle: ::uniffi::Handle) {
-                ::uniffi::ffi::rust_future_cancel::<#return_type, crate::UniFfiTag>(handle)
+                ::uniffi::ffi::rust_future_cancel::<#return_type>(handle)
             }
 
             #[allow(clippy::missing_safety_doc, missing_docs)]
@@ -194,14 +193,14 @@ fn rust_future_scaffolding_fns(module_path: &str) -> TokenStream {
                 handle: ::uniffi::Handle,
                 out_status: &mut ::uniffi::RustCallStatus
             ) -> #return_type {
-                ::uniffi::ffi::rust_future_complete::<#return_type, crate::UniFfiTag>(handle, out_status)
+                ::uniffi::ffi::rust_future_complete::<#return_type>(handle, out_status)
             }
 
             #[allow(clippy::missing_safety_doc, missing_docs)]
             #[doc(hidden)]
             #[unsafe(no_mangle)]
             pub unsafe extern "C" fn #ffi_rust_future_free(handle: ::uniffi::Handle) {
-                ::uniffi::ffi::rust_future_free::<#return_type, crate::UniFfiTag>(handle)
+                ::uniffi::ffi::rust_future_free::<#return_type>(handle)
             }
         }
     })
diff --git a/third_party/rust/uniffi_macros/src/util.rs b/third_party/rust/uniffi_macros/src/util.rs
index 1bf69e268dea1..1d5a4993027d6 100644
--- a/third_party/rust/uniffi_macros/src/util.rs
+++ b/third_party/rust/uniffi_macros/src/util.rs
@@ -46,9 +46,9 @@ pub fn mod_path() -> syn::Result<String> {
 
     static LIB_CRATE_MOD_PATH: Lazy<Result<String, String>> = Lazy::new(|| {
         let file = manifest_path()?;
-        let cargo_toml_bytes = fs::read(file).map_err(|e| e.to_string())?;
+        let cargo_toml_str = fs::read_to_string(file).map_err(|e| e.to_string())?;
 
-        let cargo_toml = toml::from_slice::<CargoToml>(&cargo_toml_bytes)
+        let cargo_toml = toml::from_str::<CargoToml>(&cargo_toml_str)
             .map_err(|e| format!("Failed to parse `Cargo.toml`: {e}"))?;
 
         let lib_crate_name = cargo_toml
@@ -265,6 +265,7 @@ pub mod kw {
     syn::custom_keyword!(Display);
     syn::custom_keyword!(Eq);
     syn::custom_keyword!(Hash);
+    syn::custom_keyword!(Ord);
     // Not used anymore
     syn::custom_keyword!(handle_unknown_callback_error);
 }
@@ -290,14 +291,19 @@ pub(crate) fn extract_docstring(attrs: &[Attribute]) -> syn::Result<String> {
     attrs
         .iter()
         .filter(|attr| attr.path().is_ident("doc"))
-        .map(|attr| {
-            let name_value = attr.meta.require_name_value()?;
+        .filter_map(|attr| {
+            let Ok(name_value) = attr.meta.require_name_value() else {
+                return None;
+            };
             if let Expr::Lit(expr) = &name_value.value {
                 if let Lit::Str(lit_str) = &expr.lit {
-                    return Ok(lit_str.value().trim().to_owned());
+                    return Some(Ok(lit_str.value().trim().to_owned()));
                 }
             }
-            Err(syn::Error::new_spanned(attr, "Cannot parse doc attribute"))
+            Some(Err(syn::Error::new_spanned(
+                attr,
+                "Cannot parse doc attribute",
+            )))
         })
         .collect::<syn::Result<Vec<_>>>()
         .map(|lines| lines.join("\n"))
diff --git a/third_party/rust/uniffi_meta/.cargo-checksum.json b/third_party/rust/uniffi_meta/.cargo-checksum.json
index d34e8da8f2f40..b3605691a5dc0 100644
--- a/third_party/rust/uniffi_meta/.cargo-checksum.json
+++ b/third_party/rust/uniffi_meta/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"55b0c287ea5bd1e25479e19abac19907a7f4a454fb6607c755473dc915ed5abe","Cargo.lock":"b52e5e4447e6404b622c9bf823ff1be5c83073848076a4e072d032ec4961996a","Cargo.toml":"cc6413ca5c0f47f3b00ccc14c19ec8ed1d63ee38052123b4001fd921521adeff","Cargo.toml.orig":"1d8e7aa2faab552a57dc39df4c35da2459d527186717e060089c90c045796b02","README.md":"a07b147b4a2f3305f3346ab8a223c287795498d89c0b4781bc93d5f5026b70bc","src/ffi_names.rs":"7db91a47da0b8c7207533b6a58a0d4e50f53ce5d77bcdc1269594897f8a75e6b","src/group.rs":"920d14932d19930eb9136b99693bd8c85a47cf0a973ff377d848bed40cba255f","src/lib.rs":"9492bc1f913f02eedbfe9f42240569df6d96cce7dcdd170168a927d2de2659c3","src/metadata.rs":"b227fa3bd7ef351e8b33c86650a402c4d84933fe653cbbe0b66d6c9cb84ee10c","src/reader.rs":"6379a7ffd4af8c6aabcea657086a835616b4ae122990c2b7ff42eaed9dcf0ec7","src/types.rs":"ff87e4f536d6ee1d7ee2a757f2c4d1ebf69732c5fb9d46ffd7931c49ce40ddc0"},"package":"3d226fc167754ce548c5ece9828c8a06f03bf1eea525d2659ba6bd648bd8e2f3"}
\ No newline at end of file
+{"files":{".cargo_vcs_info.json":"701fb8f8651ce60ea2234b65c746ab4c942b6f8e258be041c0d028a3ee07f4b6","Cargo.lock":"c29d71d1293887325d0c0760b81bac7f9639720e65ee7a6188f5b36c8ff13824","Cargo.toml":"5c8d988cf84e2bd05016bfcebbca9babfa5f8da38e945a4e169a16086bc8ef66","Cargo.toml.orig":"ec9ac5f343a0b367f0e5e6d31bef3198dc793419ca604c7a52fb3308b3942a51","README.md":"c48ebaa9337cbe23085b172e2100088b67ae3f3823e114dc532e9d67f5ff6133","src/ffi_names.rs":"de3f3e9770419d2a23edb5610696e120715a49b9aa7599abadba8cf83c7576fc","src/group.rs":"29a2b287cab5478ed91cb1bf65c465edb89fcc164de69171ee00553e37cef6e9","src/lib.rs":"0f80faebd70016f434f4e3b6fead7e3a8e60eb8b6c603886636bfce00d21547b","src/metadata.rs":"6a571ba65b1637a0f9fe394a78f984266ae555b2ec935a48862040053ffe5cba","src/reader.rs":"1ee88cdc199b9c20bdd3478829f906128662e4c7a1823a2ca450fb01f23cf8bb","src/types.rs":"2274b7ef5a5ea62919173ec955d42d9ba395f70f9cf740f7385049f563377524"},"package":"9df6d413db2827c68588f8149d30d49b71d540d46539e435b23a7f7dbd4d4f86"}
\ No newline at end of file
diff --git a/third_party/rust/uniffi_meta/.cargo_vcs_info.json b/third_party/rust/uniffi_meta/.cargo_vcs_info.json
index d3f286711e6cb..371a8ee467b9c 100644
--- a/third_party/rust/uniffi_meta/.cargo_vcs_info.json
+++ b/third_party/rust/uniffi_meta/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "0eda2855d5b4be435013d5baef808d5f9caee0fd"
+    "sha1": "309762f55db3f0548194a9ceba3027fa64b18a93"
   },
   "path_in_vcs": "uniffi_meta"
 }
\ No newline at end of file
diff --git a/third_party/rust/uniffi_meta/Cargo.lock b/third_party/rust/uniffi_meta/Cargo.lock
index e3da1e59f6361..a1b01fc244372 100644
--- a/third_party/rust/uniffi_meta/Cargo.lock
+++ b/third_party/rust/uniffi_meta/Cargo.lock
@@ -39,7 +39,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -119,14 +119,14 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "siphasher"
-version = "0.3.11"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "syn"
@@ -160,9 +160,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "uniffi_internal_macros"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f64bec2f3a33f2f08df8150e67fa45ba59a2ca740bf20c1beb010d4d791f9a1b"
+checksum = "98f51ebca0d9a4b2aa6c644d5ede45c56f73906b96403c08a1985e75ccb64a01"
 dependencies = [
  "anyhow",
  "indexmap",
@@ -173,7 +173,7 @@ dependencies = [
 
 [[package]]
 name = "uniffi_meta"
-version = "0.29.3"
+version = "0.31.0"
 dependencies = [
  "anyhow",
  "siphasher",
@@ -183,9 +183,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_pipeline"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b925b6421df15cf4bedee27714022cd9626fb4d7eee0923522a608b274ba4371"
+checksum = "a806dddc8208f22efd7e95a5cdf88ed43d0f3271e8f63b47e757a8bbdb43b63a"
 dependencies = [
  "anyhow",
  "heck",
@@ -205,9 +205,9 @@ dependencies = [
 
 [[package]]
 name = "windows-sys"
-version = "0.52.0"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
  "windows-targets 0.52.6",
 ]
diff --git a/third_party/rust/uniffi_meta/Cargo.toml b/third_party/rust/uniffi_meta/Cargo.toml
index 3ca265427e9de..60f8693b661b0 100644
--- a/third_party/rust/uniffi_meta/Cargo.toml
+++ b/third_party/rust/uniffi_meta/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2021"
 name = "uniffi_meta"
-version = "0.29.3"
+version = "0.31.0"
 build = false
 autolib = false
 autobins = false
@@ -40,10 +40,10 @@ path = "src/lib.rs"
 version = "1"
 
 [dependencies.siphasher]
-version = "0.3"
+version = "1"
 
 [dependencies.uniffi_internal_macros]
-version = "0.29.3"
+version = "0.31.0"
 
 [dependencies.uniffi_pipeline]
-version = "0.29.3"
+version = "0.31.0"
diff --git a/third_party/rust/uniffi_meta/Cargo.toml.orig b/third_party/rust/uniffi_meta/Cargo.toml.orig
index 88760af84b6b9..be810b6e3362e 100644
--- a/third_party/rust/uniffi_meta/Cargo.toml.orig
+++ b/third_party/rust/uniffi_meta/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "uniffi_meta"
-version = "0.29.3"
+version = "0.31.0"
 edition = "2021"
 description = "uniffi_meta"
 homepage = "https://mozilla.github.io/uniffi-rs"
@@ -11,9 +11,9 @@ readme = "../README.md"
 
 [dependencies]
 anyhow = "1"
-siphasher = "0.3"
-uniffi_internal_macros = { version = "0.29.3", path = "../uniffi_internal_macros" }
-uniffi_pipeline = { version = "0.29.3", path = "../uniffi_pipeline" }
+siphasher = "1"
+uniffi_internal_macros = { version = "0.31.0", path = "../uniffi_internal_macros" }
+uniffi_pipeline = { version = "0.31.0", path = "../uniffi_pipeline" }
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--generate-link-to-definition"]
diff --git a/third_party/rust/uniffi_meta/README.md b/third_party/rust/uniffi_meta/README.md
index 8ac2fa34bfd33..4450243be81aa 100644
--- a/third_party/rust/uniffi_meta/README.md
+++ b/third_party/rust/uniffi_meta/README.md
@@ -50,12 +50,13 @@ Other tools we know of which try and solve a similarly shaped problem are:
 
 ## Third-party foreign language bindings
 
-* [React Native bindings](https://github.com/jhugman/uniffi-bindgen-react-native). The repository contains tooling to generate bindings for [Hermes](https://github.com/facebook/hermes) and for [creating Turbo Modules](https://reactnative.dev/blog/2024/10/23/the-new-architecture-is-here#new-native-modules).
+* [Javascript bindings](https://github.com/jhugman/uniffi-bindgen-react-native): running in a web page, targeting WASM; and React Native targeting Android, iOS. The repository contains tooling to generate bindings for [Hermes](https://github.com/facebook/hermes), [creating Turbo Modules](https://reactnative.dev/blog/2024/10/23/the-new-architecture-is-here#new-native-modules), and for creating a [`wasm-bindgen` bindings crate](https://rustwasm.github.io/wasm-bindgen).
 * [Kotlin Multiplatform support (Gobley)](https://github.com/gobley/gobley). The repository contains Kotlin Multiplatform bindings generation for UniFFI, letting you target both JVM and Native.
 * [Go bindings](https://github.com/NordSecurity/uniffi-bindgen-go)
 * [C# bindings](https://github.com/NordSecurity/uniffi-bindgen-cs)
 * [Dart bindings](https://github.com/NiallBunting/uniffi-rs-dart)
 * [Java bindings](https://github.com/IronCoreLabs/uniffi-bindgen-java)
+* [Node bindings](https://github.com/livekit/uniffi-bindgen-node) (early development)
 
 ### External resources
 
diff --git a/third_party/rust/uniffi_meta/src/ffi_names.rs b/third_party/rust/uniffi_meta/src/ffi_names.rs
index e7b4fc5b5e247..2a801df5c61f8 100644
--- a/third_party/rust/uniffi_meta/src/ffi_names.rs
+++ b/third_party/rust/uniffi_meta/src/ffi_names.rs
@@ -13,71 +13,77 @@
 //! set the UDL namespace to the name of another crate. This seems so pathological that it's not
 //! worth the code complexity to prevent it.
 
+use crate::crate_name;
+
 /// FFI symbol name for a top-level function
-pub fn fn_symbol_name(namespace: &str, name: &str) -> String {
-    let namespace = namespace.replace("::", "__");
+pub fn fn_symbol_name(module_path: &str, name: &str) -> String {
+    let namespace = crate_name(module_path).replace("::", "__");
     let name = name.to_ascii_lowercase();
     format!("uniffi_{namespace}_fn_func_{name}")
 }
 
 /// FFI symbol name for an object constructor
-pub fn constructor_symbol_name(namespace: &str, object_name: &str, name: &str) -> String {
-    let namespace = namespace.replace("::", "__");
+pub fn constructor_symbol_name(module_path: &str, object_name: &str, name: &str) -> String {
+    let namespace = crate_name(module_path).replace("::", "__");
     let object_name = object_name.to_ascii_lowercase();
     let name = name.to_ascii_lowercase();
     format!("uniffi_{namespace}_fn_constructor_{object_name}_{name}")
 }
 
 /// FFI symbol name for an object method
-pub fn method_symbol_name(namespace: &str, object_name: &str, name: &str) -> String {
-    let namespace = namespace.replace("::", "__");
+pub fn method_symbol_name(module_path: &str, object_name: &str, name: &str) -> String {
+    let namespace = crate_name(module_path).replace("::", "__");
     let object_name = object_name.to_ascii_lowercase();
     let name = name.to_ascii_lowercase();
     format!("uniffi_{namespace}_fn_method_{object_name}_{name}")
 }
 
 /// FFI symbol name for the `clone` function for an object.
-pub fn clone_fn_symbol_name(namespace: &str, object_name: &str) -> String {
-    let namespace = namespace.replace("::", "__");
+pub fn clone_fn_symbol_name(module_path: &str, object_name: &str) -> String {
+    let namespace = crate_name(module_path).replace("::", "__");
     let object_name = object_name.to_ascii_lowercase();
     format!("uniffi_{namespace}_fn_clone_{object_name}")
 }
 
 /// FFI symbol name for the `free` function for an object.
-pub fn free_fn_symbol_name(namespace: &str, object_name: &str) -> String {
-    let namespace = namespace.replace("::", "__");
+pub fn free_fn_symbol_name(module_path: &str, object_name: &str) -> String {
+    let namespace = crate_name(module_path).replace("::", "__");
     let object_name = object_name.to_ascii_lowercase();
     format!("uniffi_{namespace}_fn_free_{object_name}")
 }
 
 /// FFI symbol name for the `init_callback` function for a callback interface
 pub fn init_callback_vtable_fn_symbol_name(
-    namespace: &str,
+    module_path: &str,
     callback_interface_name: &str,
 ) -> String {
-    let namespace = namespace.replace("::", "__");
+    let namespace = crate_name(module_path).replace("::", "__");
     let callback_interface_name = callback_interface_name.to_ascii_lowercase();
     format!("uniffi_{namespace}_fn_init_callback_vtable_{callback_interface_name}")
 }
 
 /// FFI checksum symbol name for a top-level function
-pub fn fn_checksum_symbol_name(namespace: &str, name: &str) -> String {
-    let namespace = namespace.replace("::", "__");
+pub fn fn_checksum_symbol_name(module_path: &str, name: &str) -> String {
+    let namespace = crate_name(module_path).replace("::", "__");
     let name = name.to_ascii_lowercase();
     format!("uniffi_{namespace}_checksum_func_{name}")
 }
 
 /// FFI checksum symbol name for an object constructor
-pub fn constructor_checksum_symbol_name(namespace: &str, object_name: &str, name: &str) -> String {
-    let namespace = namespace.replace("::", "__");
+pub fn constructor_checksum_symbol_name(
+    module_path: &str,
+    object_name: &str,
+    name: &str,
+) -> String {
+    let namespace = crate_name(module_path).replace("::", "__");
     let object_name = object_name.to_ascii_lowercase();
     let name = name.to_ascii_lowercase();
     format!("uniffi_{namespace}_checksum_constructor_{object_name}_{name}")
 }
 
 /// FFI checksum symbol name for an object method
-pub fn method_checksum_symbol_name(namespace: &str, object_name: &str, name: &str) -> String {
-    let namespace = namespace.replace("::", "__");
+pub fn method_checksum_symbol_name(module_path: &str, object_name: &str, name: &str) -> String {
+    let namespace = crate_name(module_path).replace("::", "__");
     let object_name = object_name.to_ascii_lowercase();
     let name = name.to_ascii_lowercase();
     format!("uniffi_{namespace}_checksum_method_{object_name}_{name}")
diff --git a/third_party/rust/uniffi_meta/src/group.rs b/third_party/rust/uniffi_meta/src/group.rs
index 7842009c146f5..b2e18e0ac0099 100644
--- a/third_party/rust/uniffi_meta/src/group.rs
+++ b/third_party/rust/uniffi_meta/src/group.rs
@@ -7,7 +7,7 @@ use std::collections::{BTreeSet, HashMap};
 use crate::*;
 use anyhow::{bail, Result};
 
-type MetadataGroupMap = HashMap<String, MetadataGroup>;
+pub type MetadataGroupMap = HashMap<String, MetadataGroup>;
 
 // Create empty metadata groups based on the metadata items.
 pub fn create_metadata_groups(items: &[Metadata]) -> MetadataGroupMap {
@@ -47,7 +47,7 @@ pub fn group_metadata(group_map: &mut MetadataGroupMap, items: Vec<Metadata>) ->
             continue;
         }
 
-        let crate_name = calc_crate_name(item.module_path()).to_owned();
+        let crate_name = crate_name(item.module_path()).to_owned();
         let group = match group_map.get_mut(&crate_name) {
             Some(ns) => ns,
             None => bail!("Unknown namespace for {item:?} ({crate_name})"),
@@ -72,7 +72,3 @@ impl MetadataGroup {
         self.items.insert(item);
     }
 }
-
-fn calc_crate_name(module_path: &str) -> &str {
-    module_path.split("::").next().unwrap()
-}
diff --git a/third_party/rust/uniffi_meta/src/lib.rs b/third_party/rust/uniffi_meta/src/lib.rs
index c27219f606630..be6e438d0d6ae 100644
--- a/third_party/rust/uniffi_meta/src/lib.rs
+++ b/third_party/rust/uniffi_meta/src/lib.rs
@@ -9,7 +9,7 @@ mod ffi_names;
 pub use ffi_names::*;
 
 mod group;
-pub use group::{create_metadata_groups, group_metadata, MetadataGroup};
+pub use group::{create_metadata_groups, group_metadata, MetadataGroup, MetadataGroupMap};
 
 mod reader;
 pub use reader::{read_metadata, read_metadata_type};
@@ -23,7 +23,7 @@ mod metadata;
 // `docs/uniffi-versioning.md` for details.
 //
 // Once we get to 1.0, then we'll need to update the scheme to something like 100 + major_version
-pub const UNIFFI_CONTRACT_VERSION: u32 = 29;
+pub const UNIFFI_CONTRACT_VERSION: u32 = 30;
 
 /// Similar to std::hash::Hash.
 ///
@@ -233,13 +233,30 @@ impl TraitMethodMetadata {
     }
 }
 
+impl From<TraitMethodMetadata> for MethodMetadata {
+    fn from(meta: TraitMethodMetadata) -> Self {
+        MethodMetadata {
+            module_path: meta.module_path,
+            self_name: meta.trait_name,
+            name: meta.name,
+            is_async: meta.is_async,
+            inputs: meta.inputs,
+            return_type: meta.return_type,
+            throws: meta.throws,
+            takes_self_by_arc: meta.takes_self_by_arc,
+            checksum: meta.checksum,
+            docstring: meta.docstring,
+        }
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Node)]
 pub struct FnParamMetadata {
     pub name: String,
     pub ty: Type,
     pub by_ref: bool,
     pub optional: bool,
-    pub default: Option<LiteralMetadata>,
+    pub default: Option<DefaultValueMetadata>,
 }
 
 impl FnParamMetadata {
@@ -272,7 +289,7 @@ pub enum LiteralMetadata {
     EmptySequence,
     EmptyMap,
     None,
-    Some { inner: Box<LiteralMetadata> },
+    Some { inner: Box<DefaultValueMetadata> },
 }
 
 impl LiteralMetadata {
@@ -293,6 +310,14 @@ pub enum Radix {
     Hexadecimal = 16,
 }
 
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Checksum, Node)]
+pub enum DefaultValueMetadata {
+    // unspecified default value
+    Default,
+    // an explicit literal value.
+    Literal(LiteralMetadata),
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Node)]
 pub struct RecordMetadata {
     pub module_path: String,
@@ -306,7 +331,7 @@ pub struct RecordMetadata {
 pub struct FieldMetadata {
     pub name: String,
     pub ty: Type,
-    pub default: Option<LiteralMetadata>,
+    pub default: Option<DefaultValueMetadata>,
     pub docstring: Option<String>,
 }
 
@@ -391,6 +416,7 @@ impl ObjectMetadata {
 /// The list of "builtin" traits we support generating helper methods for.
 /// Some interesting overlap with ObjectTraitImplMetadata, but quite different
 /// implementations for now.
+#[allow(clippy::large_enum_variant)]
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Node)]
 pub enum UniffiTraitMetadata {
     Debug {
@@ -406,35 +432,41 @@ pub enum UniffiTraitMetadata {
     Hash {
         hash: MethodMetadata,
     },
+    Ord {
+        cmp: MethodMetadata,
+    },
 }
 
 impl UniffiTraitMetadata {
-    fn module_path(&self) -> &String {
+    fn module_path(&self) -> &str {
         &match self {
             UniffiTraitMetadata::Debug { fmt } => fmt,
             UniffiTraitMetadata::Display { fmt } => fmt,
             UniffiTraitMetadata::Eq { eq, .. } => eq,
             UniffiTraitMetadata::Hash { hash } => hash,
+            UniffiTraitMetadata::Ord { cmp } => cmp,
         }
         .module_path
     }
 
-    pub fn self_name(&self) -> &String {
+    pub fn self_name(&self) -> &str {
         &match self {
             UniffiTraitMetadata::Debug { fmt } => fmt,
             UniffiTraitMetadata::Display { fmt } => fmt,
             UniffiTraitMetadata::Eq { eq, .. } => eq,
             UniffiTraitMetadata::Hash { hash } => hash,
+            UniffiTraitMetadata::Ord { cmp } => cmp,
         }
         .self_name
     }
 
-    pub fn name(&self) -> &String {
+    pub fn name(&self) -> &str {
         &match self {
             UniffiTraitMetadata::Debug { fmt } => fmt,
             UniffiTraitMetadata::Display { fmt } => fmt,
             UniffiTraitMetadata::Eq { eq, .. } => eq,
             UniffiTraitMetadata::Hash { hash } => hash,
+            UniffiTraitMetadata::Ord { cmp } => cmp,
         }
         .name
     }
@@ -447,6 +479,7 @@ pub enum UniffiTraitDiscriminants {
     Display,
     Eq,
     Hash,
+    Ord,
 }
 
 impl UniffiTraitDiscriminants {
@@ -456,25 +489,24 @@ impl UniffiTraitDiscriminants {
             1 => UniffiTraitDiscriminants::Display,
             2 => UniffiTraitDiscriminants::Eq,
             3 => UniffiTraitDiscriminants::Hash,
+            4 => UniffiTraitDiscriminants::Ord,
             _ => anyhow::bail!("invalid trait discriminant {v}"),
         })
     }
 }
 
 /// This notes that a type implements a Trait.
-/// eg, an `impl Tr for Ob` block. Not many types will support this.
+/// eg, an `impl Tr for Ob` block.
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Node)]
 pub struct ObjectTraitImplMetadata {
     pub ty: Type,
-    pub trait_name: String,
-    pub tr_module_path: Option<String>,
+    pub trait_ty: Type,
 }
 
 impl Checksum for ObjectTraitImplMetadata {
     fn checksum<H: Hasher>(&self, state: &mut H) {
         Checksum::checksum(&self.ty, state);
-        Checksum::checksum(&self.trait_name, state);
-        Checksum::checksum(&self.tr_module_path, state);
+        Checksum::checksum(&self.trait_ty, state);
     }
 }
 
@@ -497,6 +529,7 @@ pub fn checksum<T: Checksum>(val: &T) -> u16 {
 }
 
 /// Enum covering all the possible metadata types
+#[allow(clippy::large_enum_variant)]
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Node)]
 pub enum Metadata {
     Namespace(NamespaceMetadata),
@@ -533,7 +566,7 @@ impl Metadata {
             Metadata::TraitMethod(meta) => &meta.module_path,
             Metadata::CustomType(meta) => &meta.module_path,
             Metadata::UniffiTrait(meta) => meta.module_path(),
-            Metadata::ObjectTraitImpl(t) => t.ty.module_path().expect("type has no module"),
+            Metadata::ObjectTraitImpl(t) => t.ty.crate_name().expect("type has no crate name"),
         }
     }
 }
@@ -615,3 +648,7 @@ impl From<ObjectTraitImplMetadata> for Metadata {
         Self::ObjectTraitImpl(t)
     }
 }
+
+pub fn crate_name(module_path: &str) -> &str {
+    module_path.split("::").next().unwrap()
+}
diff --git a/third_party/rust/uniffi_meta/src/metadata.rs b/third_party/rust/uniffi_meta/src/metadata.rs
index 819141162f1e2..f1812b9010d63 100644
--- a/third_party/rust/uniffi_meta/src/metadata.rs
+++ b/third_party/rust/uniffi_meta/src/metadata.rs
@@ -64,6 +64,10 @@ pub mod codes {
     pub const LIT_SOME: u8 = 5;
     pub const LIT_EMPTY_SEQ: u8 = 6;
     pub const LIT_EMPTY_MAP: u8 = 7;
+
+    // DefaultValue codes
+    pub const DEFVALUE_DEFAULT: u8 = 0;
+    pub const DEFVALUE_LITERAL: u8 = 1;
 }
 
 // Create a checksum for a MetadataBuffer
diff --git a/third_party/rust/uniffi_meta/src/reader.rs b/third_party/rust/uniffi_meta/src/reader.rs
index cf199f666d03c..ecd1170be8a63 100644
--- a/third_party/rust/uniffi_meta/src/reader.rs
+++ b/third_party/rust/uniffi_meta/src/reader.rs
@@ -119,10 +119,6 @@ impl<'a> MetadataReader<'a> {
         String::from_utf8(slice.into()).context("Invalid string data")
     }
 
-    fn read_optional_string(&mut self) -> Result<Option<String>> {
-        Ok(Some(self.read_string()?).filter(|str| !str.is_empty()))
-    }
-
     fn read_long_string(&mut self) -> Result<String> {
         let size = self.read_u16()? as usize;
         let slice;
@@ -280,7 +276,7 @@ impl<'a> MetadataReader<'a> {
     }
 
     fn read_method(&mut self) -> Result<MethodMetadata> {
-        let module_path = self.read_string()?;
+        let self_module_path = self.read_string()?;
         let self_name = self.read_string()?;
         let name = self.read_string()?;
         let is_async = self.read_bool()?;
@@ -288,7 +284,7 @@ impl<'a> MetadataReader<'a> {
         let (return_type, throws) = self.read_return_type()?;
         let docstring = self.read_optional_long_string()?;
         Ok(MethodMetadata {
-            module_path,
+            module_path: self_module_path,
             self_name,
             name,
             is_async,
@@ -378,6 +374,9 @@ impl<'a> MetadataReader<'a> {
             UniffiTraitDiscriminants::Hash => UniffiTraitMetadata::Hash {
                 hash: read_metadata_method()?,
             },
+            UniffiTraitDiscriminants::Ord => UniffiTraitMetadata::Ord {
+                cmp: read_metadata_method()?,
+            },
         })
     }
 
@@ -416,8 +415,7 @@ impl<'a> MetadataReader<'a> {
     fn read_object_trait_impl(&mut self) -> Result<ObjectTraitImplMetadata> {
         Ok(ObjectTraitImplMetadata {
             ty: self.read_type()?,
-            trait_name: self.read_string()?,
-            tr_module_path: self.read_optional_string()?,
+            trait_ty: self.read_type()?,
         })
     }
 
@@ -444,7 +442,7 @@ impl<'a> MetadataReader<'a> {
             .map(|_| {
                 Ok(VariantMetadata {
                     name: self.read_string()?,
-                    discr: self.read_optional_default("<variant-value>", &Type::UInt64)?,
+                    discr: self.read_optional_literal("<variant-value>", &Type::UInt64)?,
                     fields: self.read_fields()?,
                     docstring: self.read_optional_long_string()?,
                 })
@@ -491,7 +489,11 @@ impl<'a> MetadataReader<'a> {
         Some(checksum_metadata(metadata_buf))
     }
 
-    fn read_optional_default(&mut self, name: &str, ty: &Type) -> Result<Option<LiteralMetadata>> {
+    fn read_optional_default(
+        &mut self,
+        name: &str,
+        ty: &Type,
+    ) -> Result<Option<DefaultValueMetadata>> {
         if self.read_bool()? {
             Ok(Some(self.read_default(name, ty)?))
         } else {
@@ -499,9 +501,33 @@ impl<'a> MetadataReader<'a> {
         }
     }
 
-    fn read_default(&mut self, name: &str, ty: &Type) -> Result<LiteralMetadata> {
+    fn read_default(&mut self, name: &str, ty: &Type) -> Result<DefaultValueMetadata> {
+        let default_kind = self.read_u8()?;
+
+        Ok(match default_kind {
+            codes::DEFVALUE_DEFAULT => DefaultValueMetadata::Default,
+            codes::DEFVALUE_LITERAL => DefaultValueMetadata::Literal(self.read_literal(name, ty)?),
+            _ => bail!("Unexpected default value kind code: {default_kind:?}"),
+        })
+    }
+
+    fn read_optional_literal(&mut self, name: &str, ty: &Type) -> Result<Option<LiteralMetadata>> {
+        if self.read_bool()? {
+            Ok(Some(self.read_literal(name, ty)?))
+        } else {
+            Ok(None)
+        }
+    }
+
+    fn read_literal(&mut self, name: &str, ty: &Type) -> Result<LiteralMetadata> {
         let literal_kind = self.read_u8()?;
 
+        let ty = if let Type::Custom { builtin, .. } = ty {
+            builtin
+        } else {
+            ty
+        };
+
         Ok(match literal_kind {
             codes::LIT_STR => {
                 ensure!(
diff --git a/third_party/rust/uniffi_meta/src/types.rs b/third_party/rust/uniffi_meta/src/types.rs
index 5127c53a65290..d64e4cbca1553 100644
--- a/third_party/rust/uniffi_meta/src/types.rs
+++ b/third_party/rust/uniffi_meta/src/types.rs
@@ -155,12 +155,18 @@ impl Type {
         }
     }
 
+    pub fn crate_name(&self) -> Option<&str> {
+        self.module_path()
+            .map(|module_path| module_path.split("::").next().unwrap())
+    }
+
     fn rename(&mut self, new_name: String) {
         match self {
             Type::Object { name, .. } => *name = new_name,
             Type::Record { name, .. } => *name = new_name,
             Type::Enum { name, .. } => *name = new_name,
             Type::Custom { name, .. } => *name = new_name,
+            Type::CallbackInterface { name, .. } => *name = new_name,
             _ => {}
         }
     }
diff --git a/third_party/rust/uniffi_pipeline/.cargo-checksum.json b/third_party/rust/uniffi_pipeline/.cargo-checksum.json
index 91bcd3a43ccbd..2691bad84cac7 100644
--- a/third_party/rust/uniffi_pipeline/.cargo-checksum.json
+++ b/third_party/rust/uniffi_pipeline/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"65f8f903002b250ff67b19bcc6876a05da18e8ae6612226ead3ae72d7bd6b89b","Cargo.lock":"4c2e6650f045cee42a2ec26088906e7632845f6b682e463b2f851986c443b88c","Cargo.toml":"1af99dec54411cefba2c4f40f2c6353632aab22d0768f452fb9c289cfd5eedb2","Cargo.toml.orig":"6edde760cd43ca18106b61910c59a7add764f0ad979741d42685b0d56627a26d","README.md":"a07b147b4a2f3305f3346ab8a223c287795498d89c0b4781bc93d5f5026b70bc","src/lib.rs":"8852b439ee697396d85a556bbe5a5740d63520da7511567fb3081a8c830881dc","src/node.rs":"83931e4ee5890feb71c1c33fc4be2c139239bca269693419085f779d87f3df81","src/pipeline.rs":"af376763412a1c3cd315b92807aa0306e3940883894d3ad0208ec36d10267521","src/value.rs":"eecd283b37b800dc882159ec90d1557854a725fd7d835ec36e437514ec18976b"},"package":"b925b6421df15cf4bedee27714022cd9626fb4d7eee0923522a608b274ba4371"}
\ No newline at end of file
+{"files":{".cargo_vcs_info.json":"3a021e2e51252e47505794941fccedc5a9dbb1f3763f72e45b442c64e077a57e","Cargo.lock":"14aee76c911c0e35bfad7da3ac0664fefd463f7580ce4b68fc359e4ed07e64a2","Cargo.toml":"0b76e06eff1b01b084af137e0fd840aa16e05b25863ec8ef994ab87a11fc47e9","Cargo.toml.orig":"b5da495f06c9e6df8f1ddb810a3ba169bbc39d9d3f641ef878758c1d5d5f26d8","README.md":"c48ebaa9337cbe23085b172e2100088b67ae3f3823e114dc532e9d67f5ff6133","src/lib.rs":"e4c77055db22ff157291e895bfcf1cdefd4a5fdd7d5306637fbb02a2016d99b5","src/node.rs":"83931e4ee5890feb71c1c33fc4be2c139239bca269693419085f779d87f3df81","src/pipeline.rs":"af376763412a1c3cd315b92807aa0306e3940883894d3ad0208ec36d10267521","src/value.rs":"eecd283b37b800dc882159ec90d1557854a725fd7d835ec36e437514ec18976b"},"package":"a806dddc8208f22efd7e95a5cdf88ed43d0f3271e8f63b47e757a8bbdb43b63a"}
\ No newline at end of file
diff --git a/third_party/rust/uniffi_pipeline/.cargo_vcs_info.json b/third_party/rust/uniffi_pipeline/.cargo_vcs_info.json
index 22b7b721959ce..00a5517041b51 100644
--- a/third_party/rust/uniffi_pipeline/.cargo_vcs_info.json
+++ b/third_party/rust/uniffi_pipeline/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "0eda2855d5b4be435013d5baef808d5f9caee0fd"
+    "sha1": "309762f55db3f0548194a9ceba3027fa64b18a93"
   },
   "path_in_vcs": "uniffi_pipeline"
 }
\ No newline at end of file
diff --git a/third_party/rust/uniffi_pipeline/Cargo.lock b/third_party/rust/uniffi_pipeline/Cargo.lock
index 5db0e36c4b5a9..689c59a11771e 100644
--- a/third_party/rust/uniffi_pipeline/Cargo.lock
+++ b/third_party/rust/uniffi_pipeline/Cargo.lock
@@ -39,7 +39,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -119,7 +119,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -154,9 +154,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "uniffi_internal_macros"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f64bec2f3a33f2f08df8150e67fa45ba59a2ca740bf20c1beb010d4d791f9a1b"
+checksum = "98f51ebca0d9a4b2aa6c644d5ede45c56f73906b96403c08a1985e75ccb64a01"
 dependencies = [
  "anyhow",
  "indexmap",
@@ -167,7 +167,7 @@ dependencies = [
 
 [[package]]
 name = "uniffi_pipeline"
-version = "0.29.3"
+version = "0.31.0"
 dependencies = [
  "anyhow",
  "heck",
@@ -187,9 +187,9 @@ dependencies = [
 
 [[package]]
 name = "windows-sys"
-version = "0.52.0"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
  "windows-targets 0.52.6",
 ]
diff --git a/third_party/rust/uniffi_pipeline/Cargo.toml b/third_party/rust/uniffi_pipeline/Cargo.toml
index 81e6e9ff53d6e..dc71e87026dc0 100644
--- a/third_party/rust/uniffi_pipeline/Cargo.toml
+++ b/third_party/rust/uniffi_pipeline/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2021"
 name = "uniffi_pipeline"
-version = "0.29.3"
+version = "0.31.0"
 build = false
 autolib = false
 autobins = false
@@ -50,4 +50,4 @@ version = "2.2"
 version = "3"
 
 [dependencies.uniffi_internal_macros]
-version = "=0.29.3"
+version = "=0.31.0"
diff --git a/third_party/rust/uniffi_pipeline/Cargo.toml.orig b/third_party/rust/uniffi_pipeline/Cargo.toml.orig
index b9f597bde85eb..062847acee98a 100644
--- a/third_party/rust/uniffi_pipeline/Cargo.toml.orig
+++ b/third_party/rust/uniffi_pipeline/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "uniffi_pipeline"
-version = "0.29.3"
+version = "0.31.0"
 description = "a multi-language bindings generator for rust (codegen and cli tooling)"
 documentation = "https://mozilla.github.io/uniffi-rs"
 homepage = "https://mozilla.github.io/uniffi-rs"
@@ -15,7 +15,7 @@ anyhow = "1"
 heck = "0.5"
 indexmap = { version = "2.2" }
 tempfile = "3"
-uniffi_internal_macros = { path = "../uniffi_internal_macros", version = "=0.29.3" }
+uniffi_internal_macros = { path = "../uniffi_internal_macros", version = "=0.31.0" }
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--generate-link-to-definition"]
diff --git a/third_party/rust/uniffi_pipeline/README.md b/third_party/rust/uniffi_pipeline/README.md
index 8ac2fa34bfd33..4450243be81aa 100644
--- a/third_party/rust/uniffi_pipeline/README.md
+++ b/third_party/rust/uniffi_pipeline/README.md
@@ -50,12 +50,13 @@ Other tools we know of which try and solve a similarly shaped problem are:
 
 ## Third-party foreign language bindings
 
-* [React Native bindings](https://github.com/jhugman/uniffi-bindgen-react-native). The repository contains tooling to generate bindings for [Hermes](https://github.com/facebook/hermes) and for [creating Turbo Modules](https://reactnative.dev/blog/2024/10/23/the-new-architecture-is-here#new-native-modules).
+* [Javascript bindings](https://github.com/jhugman/uniffi-bindgen-react-native): running in a web page, targeting WASM; and React Native targeting Android, iOS. The repository contains tooling to generate bindings for [Hermes](https://github.com/facebook/hermes), [creating Turbo Modules](https://reactnative.dev/blog/2024/10/23/the-new-architecture-is-here#new-native-modules), and for creating a [`wasm-bindgen` bindings crate](https://rustwasm.github.io/wasm-bindgen).
 * [Kotlin Multiplatform support (Gobley)](https://github.com/gobley/gobley). The repository contains Kotlin Multiplatform bindings generation for UniFFI, letting you target both JVM and Native.
 * [Go bindings](https://github.com/NordSecurity/uniffi-bindgen-go)
 * [C# bindings](https://github.com/NordSecurity/uniffi-bindgen-cs)
 * [Dart bindings](https://github.com/NiallBunting/uniffi-rs-dart)
 * [Java bindings](https://github.com/IronCoreLabs/uniffi-bindgen-java)
+* [Node bindings](https://github.com/livekit/uniffi-bindgen-node) (early development)
 
 ### External resources
 
diff --git a/third_party/rust/uniffi_pipeline/src/lib.rs b/third_party/rust/uniffi_pipeline/src/lib.rs
index 2dd2a530c8053..d1c487964be97 100644
--- a/third_party/rust/uniffi_pipeline/src/lib.rs
+++ b/third_party/rust/uniffi_pipeline/src/lib.rs
@@ -9,5 +9,5 @@ mod value;
 pub use anyhow::{bail, Result};
 pub use node::{FromValueError, Node};
 pub use pipeline::{new_pipeline, Pass, Pipeline, PipelineRecorder, PrintOptions};
-pub use uniffi_internal_macros::{AsRef, Node};
+pub use uniffi_internal_macros::Node;
 pub use value::Value;
diff --git a/third_party/rust/uniffi_testing/.cargo-checksum.json b/third_party/rust/uniffi_testing/.cargo-checksum.json
index 01b740252896e..f02cf8aa10edc 100644
--- a/third_party/rust/uniffi_testing/.cargo-checksum.json
+++ b/third_party/rust/uniffi_testing/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"aefb221881f668ebce8b726c29123f720b040cb4189b4e10f6f7a30518781a83","Cargo.lock":"8f6d672f4f34eacc14645aca10cabb0f8bdc84eac1df20534cabb9ef1cafac43","Cargo.toml":"eb592e6ca613f306390ab8cc584afb6fdba1f6d0f97cdb7bc1b350a69b1934a7","Cargo.toml.orig":"2f157d766d1d5ca2391061fd8b5db5400de2fba7983eaf1bf41220d5fc3fa87f","README.md":"ec6aba24af9a011ef6647422aa22efabdee519cdee3da1a9f9033b07b7cbdb0d","src/lib.rs":"4977897bc59ac67f8c8dd171ea1af7686eda747210f02c1da3e0223f14e7279b"},"package":"0a8386f86b6f986bc01d6cdaec395980b9125ae493634ddbdc9feef5f50d80af"}
\ No newline at end of file
+{"files":{".cargo_vcs_info.json":"1157e35fb7cbdb9f96ffd029ca05db843e931390be5fab9f018a7e81917b9e66","Cargo.lock":"9592aaa4216aee3dfbd7d13c603e20f3b15582465704382da8e3f1d9628a5314","Cargo.toml":"75ab7d811ab2e6ab158039a686d08867fa68c0863cc1773f5b55e692ea311cf6","Cargo.toml.orig":"cd4a235058636f85b31e4bebc24b5268cc8f8ddc8ff9884fe57b69667f00fa25","README.md":"ec6aba24af9a011ef6647422aa22efabdee519cdee3da1a9f9033b07b7cbdb0d","src/lib.rs":"bda96f6246bf5ab32280411d5c00b0dda39c2a9cd141f75796b74f3a11d53f72"},"package":"4802bed208a296657eef3451a961a6502e1d7aa8930b4b0cd952ed4f81a3957e"}
\ No newline at end of file
diff --git a/third_party/rust/uniffi_testing/.cargo_vcs_info.json b/third_party/rust/uniffi_testing/.cargo_vcs_info.json
index fdd634994f4eb..f79b25f6af477 100644
--- a/third_party/rust/uniffi_testing/.cargo_vcs_info.json
+++ b/third_party/rust/uniffi_testing/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "0eda2855d5b4be435013d5baef808d5f9caee0fd"
+    "sha1": "309762f55db3f0548194a9ceba3027fa64b18a93"
   },
   "path_in_vcs": "uniffi_testing"
 }
\ No newline at end of file
diff --git a/third_party/rust/uniffi_testing/Cargo.lock b/third_party/rust/uniffi_testing/Cargo.lock
index 847f774ecf879..67e37c335c024 100644
--- a/third_party/rust/uniffi_testing/Cargo.lock
+++ b/third_party/rust/uniffi_testing/Cargo.lock
@@ -60,9 +60,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "proc-macro2"
@@ -168,7 +168,7 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "uniffi_testing"
-version = "0.29.3"
+version = "0.31.0"
 dependencies = [
  "anyhow",
  "camino",
diff --git a/third_party/rust/uniffi_testing/Cargo.toml b/third_party/rust/uniffi_testing/Cargo.toml
index c5af177d6ef59..92a07c740f349 100644
--- a/third_party/rust/uniffi_testing/Cargo.toml
+++ b/third_party/rust/uniffi_testing/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2021"
 name = "uniffi_testing"
-version = "0.29.3"
+version = "0.31.0"
 build = false
 autolib = false
 autobins = false
diff --git a/third_party/rust/uniffi_testing/Cargo.toml.orig b/third_party/rust/uniffi_testing/Cargo.toml.orig
index b20ac3a58bc4d..1d33ecfaae652 100644
--- a/third_party/rust/uniffi_testing/Cargo.toml.orig
+++ b/third_party/rust/uniffi_testing/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "uniffi_testing"
-version = "0.29.3"
+version = "0.31.0"
 description = "a multi-language bindings generator for rust (testing helpers)"
 documentation = "https://mozilla.github.io/uniffi-rs"
 homepage = "https://mozilla.github.io/uniffi-rs"
diff --git a/third_party/rust/uniffi_testing/src/lib.rs b/third_party/rust/uniffi_testing/src/lib.rs
index 29da0b1695f7b..fb1a33814db6c 100644
--- a/third_party/rust/uniffi_testing/src/lib.rs
+++ b/third_party/rust/uniffi_testing/src/lib.rs
@@ -64,7 +64,7 @@ impl UniFFITestHelper {
         let cdylib_targets: Vec<&Target> = package
             .targets
             .iter()
-            .filter(|t| t.crate_types.iter().any(|t| *t == CrateType::CDyLib))
+            .filter(|t| t.crate_types.contains(&CrateType::CDyLib))
             .collect();
         let target = match cdylib_targets.len() {
             1 => cdylib_targets[0],
diff --git a/third_party/rust/uniffi_udl/.cargo-checksum.json b/third_party/rust/uniffi_udl/.cargo-checksum.json
index f83d85d3e4b52..661cdd26bc23f 100644
--- a/third_party/rust/uniffi_udl/.cargo-checksum.json
+++ b/third_party/rust/uniffi_udl/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"6dfc51977fd8f9daed7b7674743257546b7115445004aa3b6437a410b45287df","Cargo.lock":"aaf15cde3bc7c597b4f9bf905293203afe5442cf8ad65e79221d9666315ba028","Cargo.toml":"87484b2004f2fedc83af469d17ef076efabe751c5543d41a6454e5a5be5b1d37","Cargo.toml.orig":"0e7df057889f3d4687f1d715617e657fbed26f6377c784501d194fcaadaa8eb7","README.md":"a07b147b4a2f3305f3346ab8a223c287795498d89c0b4781bc93d5f5026b70bc","src/attributes.rs":"957a6e6fdf09625233611f137e3aa751991bb8c211ee2a08ae8db8687c9593e0","src/collectors.rs":"4baed4ec8a3ad5d56905692b9aa9d414170271cf80e7de2ec4ff65524cdd269a","src/converters/callables.rs":"f8687418a8f17a8a1a9651a4c1ed4950212578a270ffb58e305a7cc21dbd7d47","src/converters/enum_.rs":"f3d06f1519ede2e8db07c89d2fd0d0b83d870fe301ffc7aa66ec8c6b0e111909","src/converters/interface.rs":"fe6aa9970ce37947ae132fdcadc288f078a2c9df3c541c7b7f57f6bad224381d","src/converters/mod.rs":"9886e203fc860f99b7977de8af58bf9af1f9a47e3a4094ba681de1b441bc1a77","src/finder.rs":"d8e4c04ff810b2ad00eb23ac4f3ebb64bc15fe9612f54a6254dd6415f386a139","src/lib.rs":"56c50ce61ba5e7266fe7fc9fa9d0022cdbfbe9801730753bd4ee66fed040221c","src/literal.rs":"885849dec944823473aac6fc256a9418ab84b5b1e2e8934b8822b40de084dd68","src/resolver.rs":"c4ff362055dc4ed489e94a063ec0fd3becb8787ad35ce65cdec437a1aae518a0"},"package":"9c42649b721df759d9d4692a376b82b62ce3028ec9fc466f4780fb8cdf728996"}
\ No newline at end of file
+{"files":{".cargo_vcs_info.json":"8fc60155109d1f4e645b4e9ab87e8b1b062fb1307a674c9b614428f1ba6e8854","Cargo.lock":"507334c04c41767790529e55caaad2dd8503cb45ab04f68dee1718b64bfd4620","Cargo.toml":"b384af09b7089c2b67971ce8b9dcfa3ef8dc06eaffa49e7fe6dc0c5baa922861","Cargo.toml.orig":"e814ff60a569e8cc4b2def8766409086fe3683a8aa0db09c2088323b6cb63983","README.md":"c48ebaa9337cbe23085b172e2100088b67ae3f3823e114dc532e9d67f5ff6133","src/attributes.rs":"53ee6ba40650178246da6edb0b5a4aeb53d3a75c54cf018238bfa2aa91a49bff","src/collectors.rs":"4baed4ec8a3ad5d56905692b9aa9d414170271cf80e7de2ec4ff65524cdd269a","src/converters/callables.rs":"cb9b34bb91a43bc47f8a928c69cf3a80c11b62c65176bce5752309a7e3317cd6","src/converters/enum_.rs":"cd1aeebd27c5d9010926499b487ec4647a97c357cd455f056978f44e00757369","src/converters/interface.rs":"81e390ceebc7b4c8a31a0274db4c10d569f0ac3f1bd9542c657d1bba483427c0","src/converters/mod.rs":"fc96972fbe06de1309e58cc100cfd73ef87015fdda281c8e9e20785dc21817d9","src/finder.rs":"d8e4c04ff810b2ad00eb23ac4f3ebb64bc15fe9612f54a6254dd6415f386a139","src/lib.rs":"56c50ce61ba5e7266fe7fc9fa9d0022cdbfbe9801730753bd4ee66fed040221c","src/literal.rs":"b747fd99d43845b51f98c7ccac2dfed9ad8d720a269c322fb378a77be09b2ac7","src/resolver.rs":"c4ff362055dc4ed489e94a063ec0fd3becb8787ad35ce65cdec437a1aae518a0"},"package":"0d1a7339539bf6f6fa3e9b534dece13f778bda2d54b1a6d4e40b4d6090ac26e7"}
\ No newline at end of file
diff --git a/third_party/rust/uniffi_udl/.cargo_vcs_info.json b/third_party/rust/uniffi_udl/.cargo_vcs_info.json
index 50c886267a3f2..415912d71f9f5 100644
--- a/third_party/rust/uniffi_udl/.cargo_vcs_info.json
+++ b/third_party/rust/uniffi_udl/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "0eda2855d5b4be435013d5baef808d5f9caee0fd"
+    "sha1": "309762f55db3f0548194a9ceba3027fa64b18a93"
   },
   "path_in_vcs": "uniffi_udl"
 }
\ No newline at end of file
diff --git a/third_party/rust/uniffi_udl/Cargo.lock b/third_party/rust/uniffi_udl/Cargo.lock
index 34446cc2b15b0..5c34d0691ae47 100644
--- a/third_party/rust/uniffi_udl/Cargo.lock
+++ b/third_party/rust/uniffi_udl/Cargo.lock
@@ -39,7 +39,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -141,14 +141,14 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "siphasher"
-version = "0.3.11"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "smawk"
@@ -197,9 +197,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "uniffi_internal_macros"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f64bec2f3a33f2f08df8150e67fa45ba59a2ca740bf20c1beb010d4d791f9a1b"
+checksum = "98f51ebca0d9a4b2aa6c644d5ede45c56f73906b96403c08a1985e75ccb64a01"
 dependencies = [
  "anyhow",
  "indexmap",
@@ -210,9 +210,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_meta"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d226fc167754ce548c5ece9828c8a06f03bf1eea525d2659ba6bd648bd8e2f3"
+checksum = "9df6d413db2827c68588f8149d30d49b71d540d46539e435b23a7f7dbd4d4f86"
 dependencies = [
  "anyhow",
  "siphasher",
@@ -222,9 +222,9 @@ dependencies = [
 
 [[package]]
 name = "uniffi_pipeline"
-version = "0.29.3"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b925b6421df15cf4bedee27714022cd9626fb4d7eee0923522a608b274ba4371"
+checksum = "a806dddc8208f22efd7e95a5cdf88ed43d0f3271e8f63b47e757a8bbdb43b63a"
 dependencies = [
  "anyhow",
  "heck",
@@ -235,7 +235,7 @@ dependencies = [
 
 [[package]]
 name = "uniffi_udl"
-version = "0.29.3"
+version = "0.31.0"
 dependencies = [
  "anyhow",
  "textwrap",
@@ -263,9 +263,9 @@ dependencies = [
 
 [[package]]
 name = "windows-sys"
-version = "0.52.0"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
  "windows-targets 0.52.6",
 ]
diff --git a/third_party/rust/uniffi_udl/Cargo.toml b/third_party/rust/uniffi_udl/Cargo.toml
index 192099f0b2554..7889ddb4f0785 100644
--- a/third_party/rust/uniffi_udl/Cargo.toml
+++ b/third_party/rust/uniffi_udl/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2021"
 name = "uniffi_udl"
-version = "0.29.3"
+version = "0.31.0"
 build = false
 autolib = false
 autobins = false
@@ -46,7 +46,7 @@ features = ["smawk"]
 default-features = false
 
 [dependencies.uniffi_meta]
-version = "=0.29.3"
+version = "=0.31.0"
 
 [dependencies.weedle2]
 version = "5.0.0"
diff --git a/third_party/rust/uniffi_udl/Cargo.toml.orig b/third_party/rust/uniffi_udl/Cargo.toml.orig
index 7fb4ad7e34fa3..0bf84fa04e73c 100644
--- a/third_party/rust/uniffi_udl/Cargo.toml.orig
+++ b/third_party/rust/uniffi_udl/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "uniffi_udl"
-version = "0.29.3"
+version = "0.31.0"
 description = "udl parsing for the uniffi project"
 documentation = "https://mozilla.github.io/uniffi-rs"
 homepage = "https://mozilla.github.io/uniffi-rs"
@@ -16,7 +16,7 @@ weedle2 = { version = "5.0.0", path = "../weedle2" }
 # Don't include the `unicode-linebreak` or `unicode-width` since that functionality isn't needed for
 # docstrings.
 textwrap = { version = "0.16", features = ["smawk"], default-features = false }
-uniffi_meta = { path = "../uniffi_meta", version = "=0.29.3" }
+uniffi_meta = { path = "../uniffi_meta", version = "=0.31.0" }
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--generate-link-to-definition"]
diff --git a/third_party/rust/uniffi_udl/README.md b/third_party/rust/uniffi_udl/README.md
index 8ac2fa34bfd33..4450243be81aa 100644
--- a/third_party/rust/uniffi_udl/README.md
+++ b/third_party/rust/uniffi_udl/README.md
@@ -50,12 +50,13 @@ Other tools we know of which try and solve a similarly shaped problem are:
 
 ## Third-party foreign language bindings
 
-* [React Native bindings](https://github.com/jhugman/uniffi-bindgen-react-native). The repository contains tooling to generate bindings for [Hermes](https://github.com/facebook/hermes) and for [creating Turbo Modules](https://reactnative.dev/blog/2024/10/23/the-new-architecture-is-here#new-native-modules).
+* [Javascript bindings](https://github.com/jhugman/uniffi-bindgen-react-native): running in a web page, targeting WASM; and React Native targeting Android, iOS. The repository contains tooling to generate bindings for [Hermes](https://github.com/facebook/hermes), [creating Turbo Modules](https://reactnative.dev/blog/2024/10/23/the-new-architecture-is-here#new-native-modules), and for creating a [`wasm-bindgen` bindings crate](https://rustwasm.github.io/wasm-bindgen).
 * [Kotlin Multiplatform support (Gobley)](https://github.com/gobley/gobley). The repository contains Kotlin Multiplatform bindings generation for UniFFI, letting you target both JVM and Native.
 * [Go bindings](https://github.com/NordSecurity/uniffi-bindgen-go)
 * [C# bindings](https://github.com/NordSecurity/uniffi-bindgen-cs)
 * [Dart bindings](https://github.com/NiallBunting/uniffi-rs-dart)
 * [Java bindings](https://github.com/IronCoreLabs/uniffi-bindgen-java)
+* [Node bindings](https://github.com/livekit/uniffi-bindgen-node) (early development)
 
 ### External resources
 
diff --git a/third_party/rust/uniffi_udl/src/attributes.rs b/third_party/rust/uniffi_udl/src/attributes.rs
index dc617ab47b70a..724f65502504e 100644
--- a/third_party/rust/uniffi_udl/src/attributes.rs
+++ b/third_party/rust/uniffi_udl/src/attributes.rs
@@ -159,6 +159,16 @@ impl DictionaryAttributes {
     pub fn contains_remote(&self) -> bool {
         self.0.iter().any(|attr| matches!(attr, Attribute::Remote))
     }
+
+    pub fn get_uniffi_traits(&self) -> Vec<String> {
+        self.0
+            .iter()
+            .find_map(|attr| match attr {
+                Attribute::Traits(inner) => Some(inner.clone()),
+                _ => None,
+            })
+            .unwrap_or_default()
+    }
 }
 
 impl TryFrom<&weedle::attribute::ExtendedAttributeList<'_>> for DictionaryAttributes {
@@ -168,6 +178,7 @@ impl TryFrom<&weedle::attribute::ExtendedAttributeList<'_>> for DictionaryAttrib
     ) -> Result<Self, Self::Error> {
         let attrs = parse_attributes(weedle_attributes, |attr| match attr {
             Attribute::Remote => Ok(()),
+            Attribute::Traits(_) => Ok(()),
             _ => bail!(format!("{attr:?} not supported for dictionaries")),
         })?;
         Ok(Self(attrs))
@@ -204,6 +215,16 @@ impl EnumAttributes {
     pub fn contains_remote(&self) -> bool {
         self.0.iter().any(|attr| matches!(attr, Attribute::Remote))
     }
+
+    pub fn get_uniffi_traits(&self) -> Vec<String> {
+        self.0
+            .iter()
+            .find_map(|attr| match attr {
+                Attribute::Traits(inner) => Some(inner.clone()),
+                _ => None,
+            })
+            .unwrap_or_default()
+    }
 }
 
 impl TryFrom<&weedle::attribute::ExtendedAttributeList<'_>> for EnumAttributes {
@@ -218,6 +239,7 @@ impl TryFrom<&weedle::attribute::ExtendedAttributeList<'_>> for EnumAttributes {
             // Allow `[Enum]`, since we may be parsing an attribute list from an interface with the
             // `[Enum]` attribute.
             Attribute::Enum => Ok(()),
+            Attribute::Traits(_) => Ok(()),
             _ => bail!(format!("{attr:?} not supported for enums")),
         })?;
         Ok(Self(attrs))
@@ -388,8 +410,10 @@ impl TryFrom<&weedle::attribute::ExtendedAttributeList<'_>> for InterfaceAttribu
             Attribute::Remote => Ok(()),
             _ => bail!(format!("{attr:?} not supported for interface definition")),
         })?;
-        if attrs.iter().any(|a| matches!(a, Attribute::Enum)) && attrs.len() != 1 {
-            // If `[Enum]` is specified it must be the only attribute.
+        // If `[Enum]` can only also have `[Traits]`
+        let ok_for_enum =
+            attrs.len() == 1 || attrs.iter().any(|a| matches!(a, Attribute::Traits(_)));
+        if attrs.iter().any(|a| matches!(a, Attribute::Enum)) && !ok_for_enum {
             bail!("conflicting attributes on interface definition");
         }
         Ok(Self(attrs))
@@ -862,6 +886,10 @@ mod test {
         let attrs = DictionaryAttributes::try_from(&node).unwrap();
         assert!(attrs.contains_remote());
 
+        let (_, node) =
+            weedle::attribute::ExtendedAttributeList::parse("[Traits=(Debug)]").unwrap();
+        DictionaryAttributes::try_from(&node).unwrap();
+
         let (_, node) = weedle::attribute::ExtendedAttributeList::parse("[Trait]").unwrap();
         let err = DictionaryAttributes::try_from(&node).unwrap_err();
         assert_eq!(err.to_string(), "Trait not supported for dictionaries");
@@ -881,6 +909,10 @@ mod test {
         let attrs = InterfaceAttributes::try_from(&node).unwrap();
         assert!(!attrs.contains_enum_attr());
 
+        let (_, node) =
+            weedle::attribute::ExtendedAttributeList::parse("[Traits=(Debug), Enum]").unwrap();
+        InterfaceAttributes::try_from(&node).unwrap();
+
         let (_, node) = weedle::attribute::ExtendedAttributeList::parse("[Trait, Enum]").unwrap();
         let err = InterfaceAttributes::try_from(&node).unwrap_err();
         assert_eq!(
@@ -900,6 +932,10 @@ mod test {
         assert!(attrs.contains_non_exhaustive_attr());
         assert!(attrs.contains_remote());
 
+        let (_, node) =
+            weedle::attribute::ExtendedAttributeList::parse("[Traits=(Display)]").unwrap();
+        EnumAttributes::try_from(&node).unwrap();
+
         let (_, node) = weedle::attribute::ExtendedAttributeList::parse("[Trait]").unwrap();
         let err = EnumAttributes::try_from(&node).unwrap_err();
         assert_eq!(err.to_string(), "Trait not supported for enums");
diff --git a/third_party/rust/uniffi_udl/src/converters/callables.rs b/third_party/rust/uniffi_udl/src/converters/callables.rs
index 3724cd4ecfacf..b96931852bc6f 100644
--- a/third_party/rust/uniffi_udl/src/converters/callables.rs
+++ b/third_party/rust/uniffi_udl/src/converters/callables.rs
@@ -11,8 +11,8 @@ use crate::InterfaceCollector;
 use anyhow::{bail, Result};
 
 use uniffi_meta::{
-    ConstructorMetadata, FieldMetadata, FnMetadata, FnParamMetadata, MethodMetadata,
-    TraitMethodMetadata,
+    ConstructorMetadata, DefaultValueMetadata, FieldMetadata, FnMetadata, FnParamMetadata,
+    MethodMetadata, TraitMethodMetadata,
 };
 
 impl APIConverter<FieldMetadata> for weedle::argument::Argument<'_> {
@@ -56,7 +56,9 @@ impl APIConverter<FnParamMetadata> for weedle::argument::SingleArgument<'_> {
         let type_ = ci.resolve_type_expression(&self.type_)?;
         let default = match self.default {
             None => None,
-            Some(v) => Some(convert_default_value(&v.value, &type_)?),
+            Some(v) => Some(DefaultValueMetadata::Literal(convert_default_value(
+                &v.value, &type_,
+            )?)),
         };
         let by_ref = ArgumentAttributes::try_from(self.attributes.as_ref())?.by_ref();
         Ok(FnParamMetadata {
@@ -154,6 +156,8 @@ impl APIConverter<MethodMetadata> for weedle::interface::OperationInterfaceMembe
         let takes_self_by_arc = attributes.get_self_by_arc();
         Ok(MethodMetadata {
             module_path: ci.module_path(),
+            // We don't know the name of the containing `Object` at this point, fill it in later.
+            self_name: Default::default(),
             name: match self.identifier {
                 None => bail!("anonymous methods are not supported {:?}", self),
                 Some(id) => {
@@ -164,8 +168,6 @@ impl APIConverter<MethodMetadata> for weedle::interface::OperationInterfaceMembe
                     name
                 }
             },
-            // We don't know the name of the containing `Object` at this point, fill it in later.
-            self_name: Default::default(),
             is_async,
             inputs: self.args.body.list.convert(ci)?,
             return_type,
diff --git a/third_party/rust/uniffi_udl/src/converters/enum_.rs b/third_party/rust/uniffi_udl/src/converters/enum_.rs
index b4ee8a47411cf..9896be099961c 100644
--- a/third_party/rust/uniffi_udl/src/converters/enum_.rs
+++ b/third_party/rust/uniffi_udl/src/converters/enum_.rs
@@ -6,7 +6,7 @@ use super::APIConverter;
 use crate::{attributes::EnumAttributes, converters::convert_docstring, InterfaceCollector};
 use anyhow::{bail, Result};
 
-use uniffi_meta::{EnumMetadata, EnumShape, VariantMetadata};
+use uniffi_meta::{EnumMetadata, EnumShape, Type, VariantMetadata};
 
 // Note that we have 2 `APIConverter` impls here - one for the `enum` case
 // (including an enum with `[Error]`), and one for the `[Error] interface` cas
@@ -56,6 +56,20 @@ impl APIConverter<EnumMetadata> for weedle::InterfaceDefinition<'_> {
         } else {
             EnumShape::Enum
         };
+        let other = Type::Enum {
+            module_path: ci.module_path().to_string(),
+            name: self.identifier.0.to_string(),
+        };
+
+        for ut in super::make_uniffi_traits(
+            &ci.module_path(),
+            self.identifier.0,
+            &attributes.get_uniffi_traits(),
+            &other,
+        )? {
+            ci.items.insert(ut.into());
+        }
+
         Ok(EnumMetadata {
             module_path: ci.module_path(),
             name: self.identifier.0.to_string(),
diff --git a/third_party/rust/uniffi_udl/src/converters/interface.rs b/third_party/rust/uniffi_udl/src/converters/interface.rs
index efbeb38b6306b..ee4a8a7ccc213 100644
--- a/third_party/rust/uniffi_udl/src/converters/interface.rs
+++ b/third_party/rust/uniffi_udl/src/converters/interface.rs
@@ -48,6 +48,7 @@ impl APIConverter<ObjectMetadata> for weedle::InterfaceDefinition<'_> {
                     if !member_names.insert(method.name.clone()) {
                         bail!("Duplicate interface member name: \"{}\"", method.name)
                     }
+                    // a little smelly that we need to fixup `self_name` here, but it is what it is...
                     method.self_name = object_name.to_string();
                     ci.items.insert(method.into());
                 }
@@ -61,9 +62,8 @@ impl APIConverter<ObjectMetadata> for weedle::InterfaceDefinition<'_> {
          -> Result<MethodMetadata> {
             Ok(MethodMetadata {
                 module_path: ci.module_path(),
-                // The name is used to create the ffi function for the method.
-                name: name.to_string(),
                 self_name: object_name.to_string(),
+                name: name.to_string(),
                 is_async: false,
                 inputs,
                 return_type,
@@ -120,6 +120,23 @@ impl APIConverter<ObjectMetadata> for weedle::InterfaceDefinition<'_> {
                     "Hash" => UniffiTraitMetadata::Hash {
                         hash: make_trait_method("uniffi_trait_hash", vec![], Some(Type::UInt64))?,
                     },
+                    "Ord" => UniffiTraitMetadata::Ord {
+                        cmp: make_trait_method(
+                            "uniffi_trait_ord_cmp",
+                            vec![FnParamMetadata {
+                                name: "other".to_string(),
+                                ty: Type::Object {
+                                    module_path: ci.module_path(),
+                                    name: object_name.to_string(),
+                                    imp: object_impl,
+                                },
+                                by_ref: true,
+                                default: None,
+                                optional: false,
+                            }],
+                            Some(Type::Int8),
+                        )?,
+                    },
                     _ => bail!("Invalid trait name: {}", trait_name),
                 })
             })
@@ -127,6 +144,7 @@ impl APIConverter<ObjectMetadata> for weedle::InterfaceDefinition<'_> {
         for ut in uniffi_traits {
             ci.items.insert(ut.into());
         }
+
         Ok(ObjectMetadata {
             module_path: ci.module_path(),
             name: object_name.to_string(),
diff --git a/third_party/rust/uniffi_udl/src/converters/mod.rs b/third_party/rust/uniffi_udl/src/converters/mod.rs
index 0cc949b725290..2cff8ccbd32ad 100644
--- a/third_party/rust/uniffi_udl/src/converters/mod.rs
+++ b/third_party/rust/uniffi_udl/src/converters/mod.rs
@@ -6,7 +6,9 @@ use crate::{attributes::DictionaryAttributes, literal::convert_default_value, In
 use anyhow::{bail, Result};
 
 use uniffi_meta::{
-    CallbackInterfaceMetadata, FieldMetadata, RecordMetadata, TraitMethodMetadata, VariantMetadata,
+    CallbackInterfaceMetadata, DefaultValueMetadata, FieldMetadata, FnParamMetadata,
+    MethodMetadata, RecordMetadata, TraitMethodMetadata, Type, UniffiTraitMetadata,
+    VariantMetadata,
 };
 
 mod callables;
@@ -95,6 +97,19 @@ impl APIConverter<RecordMetadata> for weedle::DictionaryDefinition<'_> {
         if self.inheritance.is_some() {
             bail!("dictionary inheritance is not supported");
         }
+        let other = Type::Record {
+            module_path: ci.module_path().to_string(),
+            name: self.identifier.0.to_string(),
+        };
+        for ut in make_uniffi_traits(
+            &ci.module_path(),
+            self.identifier.0,
+            &attributes.get_uniffi_traits(),
+            &other,
+        )? {
+            ci.items.insert(ut.into());
+        }
+
         Ok(RecordMetadata {
             module_path: ci.module_path(),
             name: self.identifier.0.to_string(),
@@ -113,7 +128,9 @@ impl APIConverter<FieldMetadata> for weedle::dictionary::DictionaryMember<'_> {
         let type_ = ci.resolve_type_expression(&self.type_)?;
         let default = match self.default {
             None => None,
-            Some(v) => Some(convert_default_value(&v.value, &type_)?),
+            Some(v) => Some(DefaultValueMetadata::Literal(convert_default_value(
+                &v.value, &type_,
+            )?)),
         };
         Ok(FieldMetadata {
             name: self.identifier.0.to_string(),
@@ -162,6 +179,87 @@ impl APIConverter<CallbackInterfaceMetadata> for weedle::CallbackInterfaceDefini
     }
 }
 
+fn make_uniffi_traits(
+    module_path: &str,
+    self_name: &str,
+    names: &[String],
+    other: &Type,
+) -> Result<Vec<UniffiTraitMetadata>> {
+    // A helper for our trait methods
+    let make_trait_method = |name: &str,
+                             inputs: Vec<FnParamMetadata>,
+                             return_type: Option<Type>|
+     -> Result<MethodMetadata> {
+        Ok(MethodMetadata {
+            module_path: module_path.to_string(),
+            self_name: self_name.to_string(),
+            name: name.to_string(),
+            is_async: false,
+            inputs,
+            return_type,
+            throws: None,
+            takes_self_by_arc: false,
+            checksum: None,
+            docstring: None,
+        })
+    };
+
+    names
+        .iter()
+        .map(|trait_name| {
+            Ok(match trait_name.as_str() {
+                "Debug" => UniffiTraitMetadata::Debug {
+                    fmt: make_trait_method("uniffi_trait_debug", vec![], Some(Type::String))?,
+                },
+                "Display" => UniffiTraitMetadata::Display {
+                    fmt: make_trait_method("uniffi_trait_display", vec![], Some(Type::String))?,
+                },
+                "Eq" => UniffiTraitMetadata::Eq {
+                    eq: make_trait_method(
+                        "uniffi_trait_eq_eq",
+                        vec![FnParamMetadata {
+                            name: "other".to_string(),
+                            ty: other.clone(),
+                            by_ref: true,
+                            default: None,
+                            optional: false,
+                        }],
+                        Some(Type::Boolean),
+                    )?,
+                    ne: make_trait_method(
+                        "uniffi_trait_eq_ne",
+                        vec![FnParamMetadata {
+                            name: "other".to_string(),
+                            ty: other.clone(),
+                            by_ref: true,
+                            default: None,
+                            optional: false,
+                        }],
+                        Some(Type::Boolean),
+                    )?,
+                },
+                "Hash" => UniffiTraitMetadata::Hash {
+                    hash: make_trait_method("uniffi_trait_hash", vec![], Some(Type::UInt64))?,
+                },
+                "Ord" => UniffiTraitMetadata::Ord {
+                    cmp: make_trait_method(
+                        "uniffi_trait_ord_cmp",
+                        vec![FnParamMetadata {
+                            name: "other".to_string(),
+                            ty: other.clone(),
+                            by_ref: true,
+                            default: None,
+                            optional: false,
+                        }],
+                        Some(Type::Int8),
+                    )?,
+                },
+                _ => bail!("Invalid trait name: {}", trait_name),
+            })
+        })
+        .collect::<Result<Vec<_>>>()
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
@@ -199,7 +297,11 @@ mod test {
                 assert_eq!(record.fields[1].ty, Type::UInt32);
                 assert!(matches!(
                     record.fields[1].default,
-                    Some(LiteralMetadata::UInt(0, Radix::Decimal, Type::UInt32))
+                    Some(DefaultValueMetadata::Literal(LiteralMetadata::UInt(
+                        0,
+                        Radix::Decimal,
+                        Type::UInt32
+                    )))
                 ));
                 assert_eq!(record.fields[2].name, "spin");
                 assert_eq!(record.fields[2].ty, Type::Boolean);
diff --git a/third_party/rust/uniffi_udl/src/literal.rs b/third_party/rust/uniffi_udl/src/literal.rs
index 5406dadd7cc5a..a9dad53206bad 100644
--- a/third_party/rust/uniffi_udl/src/literal.rs
+++ b/third_party/rust/uniffi_udl/src/literal.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use anyhow::{bail, Result};
-use uniffi_meta::{LiteralMetadata, Radix, Type};
+use uniffi_meta::{DefaultValueMetadata, LiteralMetadata, Radix, Type};
 
 // We are able to use LiteralMetadata directly.
 pub type Literal = LiteralMetadata;
@@ -87,7 +87,10 @@ pub(super) fn convert_default_value(
         }
         (weedle::literal::DefaultValue::Null(_), Type::Optional { .. }) => Literal::None,
         (_, Type::Optional { inner_type, .. }) => Literal::Some {
-            inner: Box::new(convert_default_value(default_value, inner_type)?),
+            inner: Box::new(DefaultValueMetadata::Literal(convert_default_value(
+                default_value,
+                inner_type,
+            )?)),
         },
 
         // We'll ensure the type safety in the convert_* number methods.
diff --git a/third_party/rust/viaduct/.cargo-checksum.json b/third_party/rust/viaduct/.cargo-checksum.json
index aebca7426151e..082975cf2eda1 100644
--- a/third_party/rust/viaduct/.cargo-checksum.json
+++ b/third_party/rust/viaduct/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"e204bc008f9a56fa79975febe7a9dd105c385cac0c9f24963fa45b4881192a44","README.md":"d73ab3e981a55c60a3c0995daa46fee6e513e8d78fb3c34691dd47320547695e","src/backend.rs":"501657c02aff05a987eb9d1a94aef8725a4db0af8a4d7c4959a49b3dc048fa68","src/backend/ffi.rs":"1c07fbfd807ee63ce32d5ac1000b8e0eef0a660ac4aa48c6ff15abf59fdadb75","src/client.rs":"0c35db14ba2a1952a1543bc3e8307bfb94de4b73964f58aecbac599a562b2246","src/error.rs":"2bf09dee6a0fbce7f0a7ffb4d5a01c59d458634336e8767399ed42ce7e9b1287","src/fetch_msg_types.proto":"de8a46a4947a140783a4d714364f18ccf02c4759d6ab5ace9da0b1c058efa6c3","src/headers.rs":"63bfa3ba4953f1900a56e3cc6e15b0eb8bd1268cdb0020a1b86391f1043dab82","src/headers/name.rs":"d7304e006278a5466b5fe09e194a9ca921b565d76e24be491ec6178f527d2d61","src/lib.rs":"9eb7c5a81feca0cf7fa22af3d1f32e8043bf7259765c4018e8cd53ee65d91933","src/mozilla.appservices.httpconfig.protobuf.rs":"9ede762489a0c07bc08a5b852b33013a410cb41b44b92a44555f85bb2db91412","src/new_backend.rs":"c2a7211498c89b3445f0048a79a1d3a4f5e10e53a304fe126cff04a165f90c4e","src/ohttp.rs":"d2edbb15f15d3ade8fad1eb13a767fcfe65e6b0b76b3bfb599af379608be4575","src/ohttp_client.rs":"cb91882a05ddcc1fe759dcab0d4cff7570571600922bef9cce3207b6a79fe249","src/settings.rs":"d2788035fed3bbbb43ed4ddbb832fbd98019cce1c34e32ffa21c74a8c127b540","uniffi.toml":"d73e88bf94a6b2c4a94bd0bada509542dbbadb3be1bf4ad32f52e465af6503d7"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"dd526fa9f4c1ad3ed26edfb0a5650d898f411c8374c6b7e0030039679dd50485","README.md":"d73ab3e981a55c60a3c0995daa46fee6e513e8d78fb3c34691dd47320547695e","src/backend.rs":"501657c02aff05a987eb9d1a94aef8725a4db0af8a4d7c4959a49b3dc048fa68","src/backend/ffi.rs":"1c07fbfd807ee63ce32d5ac1000b8e0eef0a660ac4aa48c6ff15abf59fdadb75","src/client.rs":"9919c9178e2382967b708980a7f12dbf14cada876da53eb515eff676f216c3c2","src/error.rs":"2bf09dee6a0fbce7f0a7ffb4d5a01c59d458634336e8767399ed42ce7e9b1287","src/fetch_msg_types.proto":"de8a46a4947a140783a4d714364f18ccf02c4759d6ab5ace9da0b1c058efa6c3","src/headers.rs":"63bfa3ba4953f1900a56e3cc6e15b0eb8bd1268cdb0020a1b86391f1043dab82","src/headers/name.rs":"d7304e006278a5466b5fe09e194a9ca921b565d76e24be491ec6178f527d2d61","src/lib.rs":"9eb7c5a81feca0cf7fa22af3d1f32e8043bf7259765c4018e8cd53ee65d91933","src/mozilla.appservices.httpconfig.protobuf.rs":"9ede762489a0c07bc08a5b852b33013a410cb41b44b92a44555f85bb2db91412","src/new_backend.rs":"583be624622b3fd9b9261b8d2bc80d6204b0de08520b34eadaede3bc3deb5bf3","src/ohttp.rs":"9ae48d6574e649efab08ecc43cb024132d77eda7d7a3a512becd2ec4d3d502d2","src/ohttp_client.rs":"a530c26ff6b008428bbb68ab1bb68cb1c4e68c515a43b58d6206e8c7393f2976","src/settings.rs":"06ec24040286911581862740759c7086d5b111b91bd91f2809123e922d5cf8a0","uniffi.toml":"d73e88bf94a6b2c4a94bd0bada509542dbbadb3be1bf4ad32f52e465af6503d7"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/viaduct/Cargo.toml b/third_party/rust/viaduct/Cargo.toml
index 011de82faa2b0..c60e2acfc9cc4 100644
--- a/third_party/rust/viaduct/Cargo.toml
+++ b/third_party/rust/viaduct/Cargo.toml
@@ -51,16 +51,14 @@ thiserror = "2"
 url = "2"
 
 [dependencies.bhttp]
-git = "https://github.com/martinthomson/ohttp.git"
-rev = "bf6a983845cc0b540effb3a615e92d914dfcfd0b"
+version = "0.7.2"
 optional = true
 
 [dependencies.error-support]
 path = "../support/error"
 
 [dependencies.ohttp]
-git = "https://github.com/martinthomson/ohttp.git"
-rev = "bf6a983845cc0b540effb3a615e92d914dfcfd0b"
+version = "0.7.2"
 features = [
     "client",
     "server",
@@ -74,4 +72,4 @@ default-features = false
 version = ">=0.11,<=0.12"
 
 [dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
diff --git a/third_party/rust/viaduct/src/client.rs b/third_party/rust/viaduct/src/client.rs
index 5775ba6ee9ea8..7ad970493df1d 100644
--- a/third_party/rust/viaduct/src/client.rs
+++ b/third_party/rust/viaduct/src/client.rs
@@ -2,7 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use crate::{new_backend::get_backend, settings::validate_request, Request, Response, Result};
+use crate::{
+    header_names::USER_AGENT,
+    new_backend::get_backend,
+    settings::{validate_request, GLOBAL_SETTINGS},
+    Request, Response, Result,
+};
 
 /// HTTP Client
 ///
@@ -14,7 +19,8 @@ pub struct Client {
 }
 
 impl Client {
-    pub fn new(settings: ClientSettings) -> Self {
+    pub fn new(mut settings: ClientSettings) -> Self {
+        settings.update_from_global_settings();
         Self { settings }
     }
 
@@ -31,13 +37,19 @@ impl Client {
         }
         let mut client_settings = settings;
         client_settings.ohttp_channel = Some(channel.to_string());
-        Ok(Self {
-            settings: client_settings,
-        })
+        Ok(Self::new(client_settings))
     }
 
-    pub async fn send(&self, request: Request) -> Result<Response> {
+    fn set_user_agent(&self, request: &mut Request) -> Result<()> {
+        if let Some(user_agent) = &self.settings.user_agent {
+            request.headers.insert_if_missing(USER_AGENT, user_agent)?;
+        }
+        Ok(())
+    }
+
+    pub async fn send(&self, mut request: Request) -> Result<Response> {
         validate_request(&request)?;
+        self.set_user_agent(&mut request)?;
 
         // Check if this client should use OHTTP for all requests
         #[cfg(feature = "ohttp")]
@@ -65,15 +77,30 @@ impl Client {
 #[derive(Debug, uniffi::Record, Clone)]
 #[repr(C)]
 pub struct ClientSettings {
-    // Timeout for the entire request in ms (0 indicates no timeout).
+    /// Timeout for the entire request in ms (0 indicates no timeout).
     #[uniffi(default = 0)]
     pub timeout: u32,
-    // Maximum amount of redirects to follow (0 means redirects are not allowed)
+    /// Maximum amount of redirects to follow (0 means redirects are not allowed)
     #[uniffi(default = 10)]
     pub redirect_limit: u32,
-    // OHTTP channel to use for all requests (if any)
+    /// OHTTP channel to use for all requests (if any)
     #[cfg(feature = "ohttp")]
     pub ohttp_channel: Option<String>,
+    /// Client default user-agent.
+    ///
+    /// This overrides the global default user-agent and is used when no `User-agent` header is set
+    /// directly in the Request.
+    #[uniffi(default = None)]
+    pub user_agent: Option<String>,
+}
+
+impl ClientSettings {
+    pub fn update_from_global_settings(&mut self) {
+        let settings = GLOBAL_SETTINGS.read();
+        if self.user_agent.is_none() {
+            self.user_agent = settings.default_user_agent.clone();
+        }
+    }
 }
 
 impl Default for ClientSettings {
@@ -84,8 +111,50 @@ impl Default for ClientSettings {
             #[cfg(not(target_os = "ios"))]
             timeout: 10000,
             redirect_limit: 10,
+            user_agent: None,
             #[cfg(feature = "ohttp")]
             ohttp_channel: None,
         }
     }
 }
+
+#[cfg(test)]
+mod test {
+    use url::Url;
+
+    use super::*;
+    use crate::settings;
+
+    #[test]
+    fn test_user_agent() {
+        let mut req = Request::get(Url::parse("http://example.com/").unwrap());
+        // No default user agent
+        let client = Client::new(ClientSettings::default());
+        client.set_user_agent(&mut req).unwrap();
+        assert_eq!(req.headers.get(USER_AGENT), None);
+        // Global user-agent set
+        settings::set_global_default_user_agent("global-user-agent".into());
+        let client = Client::new(ClientSettings::default());
+        let mut req = Request::get(Url::parse("http://example.com/").unwrap());
+        client.set_user_agent(&mut req).unwrap();
+        assert_eq!(req.headers.get(USER_AGENT), Some("global-user-agent"));
+        // ClientSettings overrides that
+        let client = Client::new(ClientSettings {
+            user_agent: Some("client-settings-user-agent".into()),
+            ..ClientSettings::default()
+        });
+        let mut req = Request::get(Url::parse("http://example.com/").unwrap());
+        client.set_user_agent(&mut req).unwrap();
+        assert_eq!(
+            req.headers.get(USER_AGENT),
+            Some("client-settings-user-agent")
+        );
+        // Request header overrides that
+        let mut req = Request::get(Url::parse("http://example.com/").unwrap());
+        req.headers
+            .insert(USER_AGENT, "request-user-agent")
+            .unwrap();
+        client.set_user_agent(&mut req).unwrap();
+        assert_eq!(req.headers.get(USER_AGENT), Some("request-user-agent"));
+    }
+}
diff --git a/third_party/rust/viaduct/src/new_backend.rs b/third_party/rust/viaduct/src/new_backend.rs
index 4c017c6d13ec0..3e1f0327fe8e3 100644
--- a/third_party/rust/viaduct/src/new_backend.rs
+++ b/third_party/rust/viaduct/src/new_backend.rs
@@ -51,8 +51,7 @@ impl old_backend::Backend for Arc<dyn Backend> {
                 None => 0,
             },
             redirect_limit: if settings.follow_redirects { 10 } else { 0 },
-            #[cfg(feature = "ohttp")]
-            ohttp_channel: None,
+            ..ClientSettings::default()
         };
         pollster::block_on(self.send_request(request, client_settings))
     }
diff --git a/third_party/rust/viaduct/src/ohttp.rs b/third_party/rust/viaduct/src/ohttp.rs
index b33388ddab2af..f4928015fd276 100644
--- a/third_party/rust/viaduct/src/ohttp.rs
+++ b/third_party/rust/viaduct/src/ohttp.rs
@@ -202,8 +202,7 @@ async fn fetch_config_from_network(gateway_host: &str) -> Result<Vec<u8>> {
     let settings = crate::ClientSettings {
         timeout: 10000,
         redirect_limit: 5,
-        #[cfg(feature = "ohttp")]
-        ohttp_channel: None,
+        ..crate::ClientSettings::default()
     };
 
     let response = backend.send_request(request, settings).await?;
diff --git a/third_party/rust/viaduct/src/ohttp_client.rs b/third_party/rust/viaduct/src/ohttp_client.rs
index 68369d6b64b76..6cdf6a5e8c61e 100644
--- a/third_party/rust/viaduct/src/ohttp_client.rs
+++ b/third_party/rust/viaduct/src/ohttp_client.rs
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 use crate::ViaductError;
 use parking_lot::Mutex;
 use std::collections::HashMap;
diff --git a/third_party/rust/viaduct/src/settings.rs b/third_party/rust/viaduct/src/settings.rs
index 796494f85efc9..6367f21112241 100644
--- a/third_party/rust/viaduct/src/settings.rs
+++ b/third_party/rust/viaduct/src/settings.rs
@@ -23,6 +23,7 @@ pub struct Settings {
     pub connect_timeout: Option<Duration>,
     pub follow_redirects: bool,
     pub use_caches: bool,
+    pub default_user_agent: Option<String>,
     // For testing purposes, we allow exactly one additional Url which is
     // allowed to not be https.
     //
@@ -44,6 +45,7 @@ pub static GLOBAL_SETTINGS: Lazy<RwLock<Settings>> = Lazy::new(|| {
         connect_timeout: Some(TIMEOUT_DURATION),
         follow_redirects: true,
         use_caches: false,
+        default_user_agent: None,
         addn_allowed_insecure_url: None,
     })
 });
@@ -56,6 +58,16 @@ pub fn allow_android_emulator_loopback() {
     settings.addn_allowed_insecure_url = Some(url);
 }
 
+/// Set the global default user-agent
+///
+/// This is what's used when no user-agent is set in the `ClientSettings` and no `user-agent`
+/// header is set in the Request.
+#[uniffi::export]
+pub fn set_global_default_user_agent(user_agent: String) {
+    let mut settings = GLOBAL_SETTINGS.write();
+    settings.default_user_agent = Some(user_agent);
+}
+
 /// Validate a request, respecting the `addn_allowed_insecure_url` setting.
 pub fn validate_request(request: &crate::Request) -> Result<(), crate::ViaductError> {
     if request.url.scheme() != "https"
diff --git a/third_party/rust/webext-storage/.cargo-checksum.json b/third_party/rust/webext-storage/.cargo-checksum.json
index 051d49e47ab0b..39e4e6d483eb0 100644
--- a/third_party/rust/webext-storage/.cargo-checksum.json
+++ b/third_party/rust/webext-storage/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"7120f14183fb35760c49936dcaaf4aea1d35a484c3821d5c7e4f2eb6ea7db83b","README.md":"821cac7eb5b963fc3f3fe21dd890427ab2bbf335cb25cbae89b713b3350687c5","build.rs":"f4ff15cd54890d3e3636e77a0458ba9a8882f271ccb0056a0bbae1975cdd75d5","sql/create_schema.sql":"a17311a407ec10e033886b7125da4c8b84bc6d761f6b28edc9594de430e1d964","sql/create_sync_temp_tables.sql":"860ede362c94feb47d85522553fa2852f9bdb9f9b025d6438dd5dee3d4acd527","sql/tests/create_schema_v1.sql":"77cf0c90eaac3e1aea626537147e1b8ec349b68d6076c92fa7ae402aac613050","src/api.rs":"c4ef4f934b5fdf1e26be0752d34490f69f51d0d61ad83621986e4b4d98fcbc05","src/db.rs":"b24a68226889cf84f0020142dddfdecf84949f47e4582c2e0c7b62d4e2883a9d","src/error.rs":"4a37ff2221551ebf53a835085b3e21f9de3f86a74711ddd5903975c7110333a1","src/ffi.rs":"f66a81393bebe7a4b7e7960cb426df106ff1f02bfebcaa6e335b4b8b56c5c936","src/lib.rs":"78d0388e4a21ab39ecd8e6f653e97d181ca0fa9c57b92050c7946b543d828a05","src/migration.rs":"7f09887df071e15f34be5bd24116f43b786410e935e1f1d7e49471877629dd19","src/schema.rs":"0a668212a6db65cf5c59a786eaa342707583d580c1d374c81374335301f758bc","src/store.rs":"b1fdf330760e1271c5abcc77e7c842d941fe95a1b33095d72f677e2abf79bfb6","src/sync/bridge.rs":"14d095bc67e511297b833e279912f61dd67993a877be941cc058afe9017cb058","src/sync/incoming.rs":"8b7cd75463aae7bc08e87d5feb2b125ae68b512bcb712483457d2837c4b0086a","src/sync/mod.rs":"5e6ae17f5a0fe0e278ed1fe552cea4fb7993280811333c36ac40599cde4059d6","src/sync/outgoing.rs":"93328d141d9f1559d60c2f321bf37ed85107e0a828353e73cafe80a24f5f23b8","src/sync/sync_tests.rs":"c5490abbaed5cffc2afa397bdd8386762c30b28b7d95a30ce0825678a72e56b3","src/webext-storage.udl":"18e7d7d9e6fa7ec5655a6cf410374a3af8f8378d5e884019083b2e39747938b1","uniffi.toml":"beeec89c2f877eb89be0090dc304dbc7c74e787385e7459bad78c6165bb66791"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"65686be35fbd69e80a6948b6e71918005b32520b4fd109776f997cc8c8f40667","README.md":"821cac7eb5b963fc3f3fe21dd890427ab2bbf335cb25cbae89b713b3350687c5","build.rs":"f4ff15cd54890d3e3636e77a0458ba9a8882f271ccb0056a0bbae1975cdd75d5","sql/create_schema.sql":"a17311a407ec10e033886b7125da4c8b84bc6d761f6b28edc9594de430e1d964","sql/create_sync_temp_tables.sql":"860ede362c94feb47d85522553fa2852f9bdb9f9b025d6438dd5dee3d4acd527","sql/tests/create_schema_v1.sql":"77cf0c90eaac3e1aea626537147e1b8ec349b68d6076c92fa7ae402aac613050","src/api.rs":"c4ef4f934b5fdf1e26be0752d34490f69f51d0d61ad83621986e4b4d98fcbc05","src/db.rs":"b24a68226889cf84f0020142dddfdecf84949f47e4582c2e0c7b62d4e2883a9d","src/error.rs":"4a37ff2221551ebf53a835085b3e21f9de3f86a74711ddd5903975c7110333a1","src/ffi.rs":"f66a81393bebe7a4b7e7960cb426df106ff1f02bfebcaa6e335b4b8b56c5c936","src/lib.rs":"78d0388e4a21ab39ecd8e6f653e97d181ca0fa9c57b92050c7946b543d828a05","src/migration.rs":"7f09887df071e15f34be5bd24116f43b786410e935e1f1d7e49471877629dd19","src/schema.rs":"0a668212a6db65cf5c59a786eaa342707583d580c1d374c81374335301f758bc","src/store.rs":"b1fdf330760e1271c5abcc77e7c842d941fe95a1b33095d72f677e2abf79bfb6","src/sync/bridge.rs":"14d095bc67e511297b833e279912f61dd67993a877be941cc058afe9017cb058","src/sync/incoming.rs":"8b7cd75463aae7bc08e87d5feb2b125ae68b512bcb712483457d2837c4b0086a","src/sync/mod.rs":"5e6ae17f5a0fe0e278ed1fe552cea4fb7993280811333c36ac40599cde4059d6","src/sync/outgoing.rs":"93328d141d9f1559d60c2f321bf37ed85107e0a828353e73cafe80a24f5f23b8","src/sync/sync_tests.rs":"c5490abbaed5cffc2afa397bdd8386762c30b28b7d95a30ce0825678a72e56b3","src/webext-storage.udl":"18e7d7d9e6fa7ec5655a6cf410374a3af8f8378d5e884019083b2e39747938b1","uniffi.toml":"beeec89c2f877eb89be0090dc304dbc7c74e787385e7459bad78c6165bb66791"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/webext-storage/Cargo.toml b/third_party/rust/webext-storage/Cargo.toml
index e08fd3d53a787..872e55261f7ce 100644
--- a/third_party/rust/webext-storage/Cargo.toml
+++ b/third_party/rust/webext-storage/Cargo.toml
@@ -71,7 +71,7 @@ path = "../../components/sync15"
 features = ["sync-engine"]
 
 [dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 
 [dependencies.url]
 version = "2.1"
@@ -92,5 +92,5 @@ features = ["preserve_order"]
 path = "../support/sql"
 
 [build-dependencies.uniffi]
-version = "0.29.0"
+version = "0.31"
 features = ["build"]

From 55423c8ecc0c50cadf61457e142a7638f70046b6 Mon Sep 17 00:00:00 2001
From: Emma Zuehlcke <emz@mozilla.com>
Date: Thu, 29 Jan 2026 15:04:03 +0000
Subject: [PATCH 079/116] Bug 1986300 - Block and revoke permission if a sender
 is on the safe browsing list and attempts to send a notification.
 r=saschanaz,timhuang

Differential Revision: https://phabricator.services.mozilla.com/D278526
---
 dom/notification/NotificationParent.cpp  | 132 +++++++++++++++++++++--
 dom/notification/NotificationParent.h    |   6 ++
 dom/notification/metrics.yaml            |  15 +++
 dom/notification/moz.build               |   2 +
 modules/libpref/init/StaticPrefList.yaml |   6 ++
 5 files changed, 150 insertions(+), 11 deletions(-)

diff --git a/dom/notification/NotificationParent.cpp b/dom/notification/NotificationParent.cpp
index ab33e10a2fdaa..d3e0079db8a35 100644
--- a/dom/notification/NotificationParent.cpp
+++ b/dom/notification/NotificationParent.cpp
@@ -11,9 +11,12 @@
 #include "mozilla/AlertNotification.h"
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/dom/ServiceWorkerManager.h"
+#include "mozilla/glean/DomNotificationMetrics.h"
 #include "mozilla/ipc/Endpoint.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIServiceWorkerManager.h"
+#include "nsIURIClassifier.h"
+#include "nsNetCID.h"
 #include "nsThreadUtils.h"
 
 namespace mozilla::dom::notification {
@@ -148,6 +151,40 @@ class NotificationObserver final : public nsIObserver {
 
 NS_IMPL_ISUPPORTS(NotificationObserver, nsIObserver)
 
+using SafeBrowsingPromise = MozPromise<bool, nsresult, false>;
+
+class SafeBrowsingClassificationCallback final
+    : public nsIURIClassifierCallback {
+ public:
+  NS_DECL_ISUPPORTS
+
+  SafeBrowsingClassificationCallback() = default;
+
+  already_AddRefed<SafeBrowsingPromise> Promise() {
+    return mPromiseHolder.Ensure(__func__);
+  }
+
+  NS_IMETHOD OnClassifyComplete(nsresult aErrorCode, const nsACString& aList,
+                                const nsACString& aProvider,
+                                const nsACString& aFullHash) override {
+    if (NS_FAILED(aErrorCode)) {
+      mPromiseHolder.Reject(aErrorCode, __func__);
+    } else {
+      mPromiseHolder.Resolve(true, __func__);
+    }
+    return NS_OK;
+  }
+
+ private:
+  ~SafeBrowsingClassificationCallback() {
+    mPromiseHolder.RejectIfExists(NS_ERROR_ABORT, __func__);
+  }
+
+  MozPromiseHolder<SafeBrowsingPromise> mPromiseHolder;
+};
+
+NS_IMPL_ISUPPORTS(SafeBrowsingClassificationCallback, nsIURIClassifierCallback)
+
 nsresult NotificationParent::HandleAlertTopic(AlertTopic aTopic) {
   if (aTopic == AlertTopic::Click) {
     return FireClickEvent();
@@ -238,18 +275,82 @@ mozilla::ipc::IPCResult NotificationParent::RecvShow(Maybe<IPCImage>&& aIcon,
     return IPC_OK();
   }
 
-  // Step 4.2: Run the fetch steps for notification. (Already happened in the
-  // child)
-  //
-  // Step 4.3: Run the show steps for notification.
-  nsresult rv = Show(std::move(aIcon));
-  // It's possible that we synchronously received a notification while in Show,
-  // so mResolver may now be empty.
-  if (NS_FAILED(rv) && mResolver) {
-    mResolver.take().value()(CopyableErrorResult(rv));
+  auto showNotification = [self = RefPtr(this)](Maybe<IPCImage>&& aIcon) {
+    // Step 4.2: Run the fetch steps for notification. (Already happened in the
+    // child)
+    //
+    // Step 4.3: Run the show steps for notification.
+    nsresult rv = self->Show(std::move(aIcon));
+    // It's possible that we synchronously received a notification while in
+    // Show, so mResolver may now be empty.
+    if (NS_FAILED(rv) && self->mResolver) {
+      self->mResolver.take().value()(CopyableErrorResult(rv));
+    }
+    // If not failed, the resolver will be called asynchronously by
+    // NotificationObserver.
+  };
+
+  // Check Safe Browsing blocklist if the feature is enabled (bug 1986300).
+  if (StaticPrefs::dom_webnotifications_block_if_on_safebrowsing()) {
+    nsresult rv = NS_OK;
+    nsCOMPtr<nsIURIClassifier> uriClassifier =
+        do_GetService(NS_URICLASSIFIERSERVICE_CONTRACTID, &rv);
+
+    if (NS_FAILED(rv) || !uriClassifier) {
+      NS_WARNING("URI classifier unavailable for notification check");
+    } else {
+      RefPtr<SafeBrowsingClassificationCallback> callback =
+          new SafeBrowsingClassificationCallback();
+      RefPtr<SafeBrowsingPromise> promise = callback->Promise();
+
+      bool willClassify = false;
+      rv = uriClassifier->Classify(mArgs.mPrincipal, callback, &willClassify);
+
+      if (NS_SUCCEEDED(rv) && willClassify) {
+        glean::web_notification::show_safe_browsing_block.AddToDenominator(1);
+
+        mShowPending = true;
+        promise->Then(
+            GetMainThreadSerialEventTarget(), __func__,
+            [self = RefPtr(this), showNotification,
+             icon = std::move(aIcon)](bool) mutable {
+              self->mShowPending = false;
+
+              // Always show first to register with the alert system, even if
+              // close was requested while pending. This ensures platforms like
+              // Android can properly trigger onCloseNotification callbacks.
+              showNotification(std::move(icon));
+
+              // Handle close() called while SafeBrowsing check was in progress.
+              if (self->mClosePending) {
+                self->mClosePending = false;
+                self->Unregister();
+                self->Close();
+              }
+            },
+            [self = RefPtr(this)](nsresult) {
+              // SafeBrowsing classification determined the notification is
+              // unsafe, reject the show request and revoke permission.
+              self->mShowPending = false;
+              self->mClosePending = false;
+
+              glean::web_notification::show_safe_browsing_block.AddToNumerator(
+                  1);
+              RemovePermission(self->mArgs.mPrincipal);
+
+              CopyableErrorResult rv;
+              rv.ThrowTypeError("Permission to show Notification denied.");
+              self->mResolver.take().value()(rv);
+
+              self->mDangling = true;
+            });
+
+        return IPC_OK();
+      }
+    }
   }
-  // If not failed, the resolver will be called asynchronously by
-  // NotificationObserver
+
+  showNotification(std::move(aIcon));
   return IPC_OK();
 }
 
@@ -317,6 +418,15 @@ nsresult NotificationParent::Show(Maybe<IPCImage>&& aIcon) {
 }
 
 mozilla::ipc::IPCResult NotificationParent::RecvClose() {
+  // If SafeBrowsing check is in progress, defer the close until it completes.
+  // We need to call Show() first to register with the alert system before
+  // Unregister() can properly trigger close callbacks (e.g.,
+  // onCloseNotification on Android).
+  if (mShowPending) {
+    mClosePending = true;
+    return IPC_OK();
+  }
+
   Unregister();
   Close();
   return IPC_OK();
diff --git a/dom/notification/NotificationParent.h b/dom/notification/NotificationParent.h
index c6559a0b065ca..255f65b37c0e1 100644
--- a/dom/notification/NotificationParent.h
+++ b/dom/notification/NotificationParent.h
@@ -72,6 +72,12 @@ class NotificationParent final : public PNotificationParent,
   // either because it's closed or denied permission. We don't have to call
   // CloseAlert if this is the case.
   bool mDangling = false;
+
+  // State tracking for async SafeBrowsing checks (bug 1986300).
+  // When a SafeBrowsing classification is in progress, we track whether a
+  // close was requested before the check completes.
+  bool mShowPending = false;
+  bool mClosePending = false;
 };
 
 }  // namespace mozilla::dom::notification
diff --git a/dom/notification/metrics.yaml b/dom/notification/metrics.yaml
index 6a8b06e051854..c3dc34d6129c5 100644
--- a/dom/notification/metrics.yaml
+++ b/dom/notification/metrics.yaml
@@ -67,3 +67,18 @@ web_notification:
     notification_emails:
       - krosylight@mozilla.com
     expires: never
+  show_safe_browsing_block:
+    type: rate
+    description: >
+      The rate of notification show attempts that are blocked because the
+      origin is on the Safe Browsing blocklist (phishing, malware, etc.).
+      The numerator is the number of blocked attempts, and the denominator
+      is the total number of show attempts that passed the initial
+      permission check.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1986300
+    data_reviews:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1986300
+    notification_emails:
+      - emz@mozilla.com
+    expires: 155
diff --git a/dom/notification/moz.build b/dom/notification/moz.build
index 01571c082adee..c44918a8e446f 100644
--- a/dom/notification/moz.build
+++ b/dom/notification/moz.build
@@ -55,6 +55,8 @@ LOCAL_INCLUDES += [
     "/dom/ipc",
     # NotificationHandler::RespondOnClick, but see bug 1966910.
     "/js/xpconnect/src",
+    # Safe Browsing classification for notifications (bug 1986300).
+    "/netwerk/url-classifier",
 ]
 
 BROWSER_CHROME_MANIFESTS += ["test/browser/browser.toml"]
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
index d7ca509958aeb..bcb1cdf7df134 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -5850,6 +5850,12 @@
   value: false
   mirror: always
 
+# Block notifications and revoke permission for sites on Safe Browsing lists.
+- name: dom.webnotifications.block_if_on_safebrowsing
+  type: RelaxedAtomicBool
+  value: @IS_NIGHTLY_BUILD@
+  mirror: always
+
 - name: dom.worker.canceling.timeoutMilliseconds
   type: RelaxedAtomicUint32
   value: 30000    # 30 seconds

From 3c809692180aaa078b09fc8431e9339d57240026 Mon Sep 17 00:00:00 2001
From: Emma Zuehlcke <emz@mozilla.com>
Date: Thu, 29 Jan 2026 15:04:04 +0000
Subject: [PATCH 080/116] Bug 1986300 - Tests for notification blocking.
 r=saschanaz,timhuang

Differential Revision: https://phabricator.services.mozilla.com/D278527
---
 dom/notification/test/browser/browser.toml    |   6 +
 .../browser/browser_safebrowsing_block.js     | 249 ++++++++++++++++++
 .../test/browser/file_safebrowsing_test.html  |  10 +
 .../file_safebrowsing_test.serviceworker.js   |   9 +
 4 files changed, 274 insertions(+)
 create mode 100644 dom/notification/test/browser/browser_safebrowsing_block.js
 create mode 100644 dom/notification/test/browser/file_safebrowsing_test.html
 create mode 100644 dom/notification/test/browser/file_safebrowsing_test.serviceworker.js

diff --git a/dom/notification/test/browser/browser.toml b/dom/notification/test/browser/browser.toml
index 42a38a428e502..f775f79d96a92 100644
--- a/dom/notification/test/browser/browser.toml
+++ b/dom/notification/test/browser/browser.toml
@@ -10,6 +10,12 @@ support-files = [
 ["browser_permission_dismiss.js"]
 support-files = ["notification.html"]
 
+["browser_safebrowsing_block.js"]
+support-files = [
+  "file_safebrowsing_test.html",
+  "file_safebrowsing_test.serviceworker.js",
+]
+
 ["browser_userContextId_openWindow.js"]
 support-files = [
   "empty.html",
diff --git a/dom/notification/test/browser/browser_safebrowsing_block.js b/dom/notification/test/browser/browser_safebrowsing_block.js
new file mode 100644
index 0000000000000..1d3506d5353db
--- /dev/null
+++ b/dom/notification/test/browser/browser_safebrowsing_block.js
@@ -0,0 +1,249 @@
+"use strict";
+
+const { PermissionTestUtils } = ChromeUtils.importESModule(
+  "resource://testing-common/PermissionTestUtils.sys.mjs"
+);
+
+const { UrlClassifierTestUtils } = ChromeUtils.importESModule(
+  "resource://testing-common/UrlClassifierTestUtils.sys.mjs"
+);
+
+const PHISH_TABLE = "moztest-phish-simple";
+const DYNAMIC_PHISH_TABLE = "mochitest-phish-simple";
+const PHISH_URL = "https://www.itisatrap.org/firefox/its-a-trap.html";
+const NORMAL_URL =
+  "https://example.com/browser/dom/notification/test/browser/file_safebrowsing_test.html";
+const PERMISSION_NAME = "desktop-notification";
+
+async function getTelemetryRate() {
+  await Services.fog.testFlushAllChildren();
+  return (
+    Glean.webNotification.showSafeBrowsingBlock.testGetValue() ?? {
+      numerator: 0,
+      denominator: 0,
+    }
+  );
+}
+
+function waitForDBInit() {
+  let principal = Services.scriptSecurityManager.createContentPrincipal(
+    Services.io.newURI(PHISH_URL),
+    {}
+  );
+  let dbService = Cc["@mozilla.org/url-classifier/dbservice;1"].getService(
+    Ci.nsIUrlClassifierDBService
+  );
+
+  return BrowserTestUtils.waitForCondition(
+    () =>
+      new Promise(resolve => {
+        dbService.lookup(principal, PHISH_TABLE, value => {
+          resolve(value === PHISH_TABLE);
+        });
+      }),
+    "DB lookup confirmed phishing URL is in table"
+  );
+}
+
+function addHostToPhishingTable(host) {
+  let entry = host + "/";
+  let updateData = `n:1000\ni:${DYNAMIC_PHISH_TABLE}\nad:1\na:1:32:${entry.length}\n${entry}\n`;
+
+  return UrlClassifierTestUtils.useTestDatabase({
+    pref: "urlclassifier.phishTable",
+    name: DYNAMIC_PHISH_TABLE,
+    update: updateData,
+  });
+}
+
+add_setup(async function () {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["urlclassifier.phishTable", PHISH_TABLE],
+      ["browser.safebrowsing.phishing.enabled", true],
+      ["dom.webnotifications.block_if_on_safebrowsing", true],
+    ],
+  });
+
+  SafeBrowsing.init();
+  await waitForDBInit();
+});
+
+// Test 1: Normal site registers SW, sends notification - should succeed.
+// This is a control test ensuring notifications work for non-phishing sites.
+// Also verifies telemetry: denominator increments, numerator does not.
+add_task(async function test_sw_notification_allowed_for_normal_site() {
+  Services.fog.testResetFOG();
+
+  let normalPrincipal = Services.scriptSecurityManager.createContentPrincipal(
+    Services.io.newURI("https://example.com"),
+    {}
+  );
+
+  PermissionTestUtils.add(
+    normalPrincipal,
+    PERMISSION_NAME,
+    Services.perms.ALLOW_ACTION
+  );
+
+  // Step 1 & 2: Visit page and register service worker
+  await BrowserTestUtils.withNewTab(
+    {
+      gBrowser,
+      url: NORMAL_URL,
+    },
+    async browser => {
+      let result = await SpecialPowers.spawn(browser, [], async () => {
+        await content.navigator.serviceWorker.register(
+          "file_safebrowsing_test.serviceworker.js"
+        );
+        const reg = await content.navigator.serviceWorker.ready;
+
+        return new Promise(resolve => {
+          content.navigator.serviceWorker.onmessage = event => {
+            resolve(event.data);
+          };
+          reg.active.postMessage("show-notification");
+        });
+      });
+
+      ok(result.success, "Service worker notification should succeed");
+    }
+  );
+
+  // Verify permission is still intact
+  is(
+    PermissionTestUtils.testPermission(normalPrincipal, PERMISSION_NAME),
+    Services.perms.ALLOW_ACTION,
+    "Permission should still be granted for normal site"
+  );
+
+  // Verify telemetry: denominator should be 1, numerator should be 0
+  let rate = await getTelemetryRate();
+  is(rate.denominator, 1, "Denominator should be 1 (one notification checked)");
+  is(rate.numerator, 0, "Numerator should be 0 (no notifications blocked)");
+
+  // Cleanup
+  await SpecialPowers.removeAllServiceWorkerData();
+  PermissionTestUtils.remove(normalPrincipal, PERMISSION_NAME);
+});
+
+// Test 2: Site registers SW when clean, then becomes phishing, then tries to
+// send notification via SW - should be blocked and permission revoked.
+// This is the key scenario we're protecting against.
+// Also verifies telemetry: both numerator and denominator increment.
+add_task(
+  async function test_sw_notification_blocked_when_site_becomes_phishing() {
+    Services.fog.testResetFOG();
+
+    let testOrigin = "https://example.com";
+    let testPrincipal = Services.scriptSecurityManager.createContentPrincipal(
+      Services.io.newURI(testOrigin),
+      {}
+    );
+
+    // Grant notification permission (simulating user granted permission when
+    // site was clean)
+    PermissionTestUtils.add(
+      testPrincipal,
+      PERMISSION_NAME,
+      Services.perms.ALLOW_ACTION
+    );
+
+    // Step 1 & 2: Visit clean page and register service worker
+    await BrowserTestUtils.withNewTab(
+      {
+        gBrowser,
+        url: NORMAL_URL,
+      },
+      async browser => {
+        await SpecialPowers.spawn(browser, [], async () => {
+          await content.navigator.serviceWorker.register(
+            "file_safebrowsing_test.serviceworker.js"
+          );
+          await content.navigator.serviceWorker.ready;
+        });
+      }
+    );
+    // Step 3: Tab is now closed (withNewTab closes it)
+
+    // Step 4: Site becomes phishing - add example.com to phishing table
+    info("Adding example.com to phishing table");
+    await addHostToPhishingTable("example.com");
+
+    // Verify the URL is now in the phishing table
+    let dbService = Cc["@mozilla.org/url-classifier/dbservice;1"].getService(
+      Ci.nsIUrlClassifierDBService
+    );
+    let lookupResult = await new Promise(resolve => {
+      dbService.lookup(testPrincipal, DYNAMIC_PHISH_TABLE, value => {
+        resolve(value);
+      });
+    });
+    is(
+      lookupResult,
+      DYNAMIC_PHISH_TABLE,
+      "example.com should now be in phishing table"
+    );
+
+    // Verify permission is still there before we try the notification
+    is(
+      PermissionTestUtils.testPermission(testPrincipal, PERMISSION_NAME),
+      Services.perms.ALLOW_ACTION,
+      "Permission should still be granted before notification attempt"
+    );
+
+    // Step 5: SW tries to send notification (no tabs open).
+    // We need to trigger the SW to send a notification. We can do this by
+    // opening a new tab to the same origin and messaging the SW.
+    await BrowserTestUtils.withNewTab(
+      {
+        gBrowser,
+        url: NORMAL_URL,
+      },
+      async browser => {
+        let result = await SpecialPowers.spawn(browser, [], async () => {
+          const reg = await content.navigator.serviceWorker.ready;
+
+          return new Promise(resolve => {
+            content.navigator.serviceWorker.onmessage = event => {
+              resolve(event.data);
+            };
+            reg.active.postMessage("show-notification");
+          });
+        });
+
+        ok(
+          !result.success,
+          "Service worker notification should fail for phishing site"
+        );
+        is(
+          result.error,
+          "Permission to show Notification denied.",
+          "Error message should be generic permission denial"
+        );
+      }
+    );
+
+    // Verify permission was revoked
+    is(
+      PermissionTestUtils.testPermission(testPrincipal, PERMISSION_NAME),
+      Services.perms.UNKNOWN_ACTION,
+      "Permission should be revoked after Safe Browsing block"
+    );
+
+    // Verify telemetry: both numerator and denominator should be 1
+    let rate = await getTelemetryRate();
+    is(
+      rate.denominator,
+      1,
+      "Denominator should be 1 (one notification checked)"
+    );
+    is(rate.numerator, 1, "Numerator should be 1 (one notification blocked)");
+
+    // Cleanup
+    await SpecialPowers.removeAllServiceWorkerData();
+    PermissionTestUtils.remove(testPrincipal, PERMISSION_NAME);
+    Services.prefs.setCharPref("urlclassifier.phishTable", PHISH_TABLE);
+  }
+);
diff --git a/dom/notification/test/browser/file_safebrowsing_test.html b/dom/notification/test/browser/file_safebrowsing_test.html
new file mode 100644
index 0000000000000..dcea5d4cb973a
--- /dev/null
+++ b/dom/notification/test/browser/file_safebrowsing_test.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Safe Browsing Notification Test</title>
+</head>
+<body>
+  <h1>Safe Browsing Notification Test Page</h1>
+</body>
+</html>
diff --git a/dom/notification/test/browser/file_safebrowsing_test.serviceworker.js b/dom/notification/test/browser/file_safebrowsing_test.serviceworker.js
new file mode 100644
index 0000000000000..7e19bc7c3a15e
--- /dev/null
+++ b/dom/notification/test/browser/file_safebrowsing_test.serviceworker.js
@@ -0,0 +1,9 @@
+// Service worker that shows a notification when receiving a message
+self.addEventListener("message", async event => {
+  try {
+    await self.registration.showNotification("Test notification from SW");
+    event.source.postMessage({ success: true });
+  } catch (e) {
+    event.source.postMessage({ success: false, error: e.message });
+  }
+});

From 30f74b2df1ccfc742772fc2a6c6a434ca7b107e4 Mon Sep 17 00:00:00 2001
From: fmasalha <fmasalha@mozilla.com>
Date: Thu, 29 Jan 2026 15:12:01 +0000
Subject: [PATCH 081/116] Bug 2010700 - Created public compose root and store
 primitives for s2s r=matt-tighe

Pull request: https://github.com/mozilla-firefox/firefox/pull/46
---
 .../android-components/.buildconfig.yml       |  7 +++
 .../components/feature/summarize/build.gradle | 11 ++++
 .../summarize/SummarizationMiddleware.kt      | 18 ++++++
 .../feature/summarize/SummarizationReducer.kt |  9 +++
 .../feature/summarize/SummarizationScreen.kt  | 61 +++++++++++++++++++
 .../feature/summarize/SummarizationStore.kt   | 36 +++++++++++
 6 files changed, 142 insertions(+)
 create mode 100644 mobile/android/android-components/components/feature/summarize/src/main/java/mozilla/components/feature/summarize/SummarizationMiddleware.kt
 create mode 100644 mobile/android/android-components/components/feature/summarize/src/main/java/mozilla/components/feature/summarize/SummarizationReducer.kt
 create mode 100644 mobile/android/android-components/components/feature/summarize/src/main/java/mozilla/components/feature/summarize/SummarizationScreen.kt
 create mode 100644 mobile/android/android-components/components/feature/summarize/src/main/java/mozilla/components/feature/summarize/SummarizationStore.kt

diff --git a/mobile/android/android-components/.buildconfig.yml b/mobile/android/android-components/.buildconfig.yml
index a596f1c9b05eb..fbe167746f292 100644
--- a/mobile/android/android-components/.buildconfig.yml
+++ b/mobile/android/android-components/.buildconfig.yml
@@ -1390,6 +1390,13 @@ projects:
     path: components/feature/summarize
     publish: true
     upstream_dependencies:
+    - components:concept-base
+    - components:concept-fetch
+    - components:lib-publicsuffixlist
+    - components:lib-state
+    - components:support-base
+    - components:support-ktx
+    - components:support-utils
     - components:tooling-lint
   components:feature-syncedtabs:
     description: Feature that provides access to other devices' tabs in the same account.
diff --git a/mobile/android/android-components/components/feature/summarize/build.gradle b/mobile/android/android-components/components/feature/summarize/build.gradle
index 76446964bba0c..69e50daf9893e 100644
--- a/mobile/android/android-components/components/feature/summarize/build.gradle
+++ b/mobile/android/android-components/components/feature/summarize/build.gradle
@@ -4,6 +4,7 @@
 
 plugins {
     alias(libs.plugins.dependency.analysis)
+    alias(libs.plugins.kotlin.compose)
 }
 
 apply plugin: 'com.android.library'
@@ -16,13 +17,23 @@ android {
 
     buildFeatures {
         buildConfig = true
+        compose = true
     }
 
     namespace = 'mozilla.components.feature.summarize'
 }
 
 dependencies {
+    implementation project(':components:lib-state')
+
     testImplementation libs.androidx.test.junit
+
+    implementation libs.androidx.compose.foundation
+    implementation libs.androidx.compose.ui.tooling.preview
+    implementation libs.androidx.compose.ui
+    implementation libs.androidx.compose.material3
+    debugImplementation libs.androidx.compose.ui.tooling
+
 }
 
 apply from: '../../../common-config.gradle'
diff --git a/mobile/android/android-components/components/feature/summarize/src/main/java/mozilla/components/feature/summarize/SummarizationMiddleware.kt b/mobile/android/android-components/components/feature/summarize/src/main/java/mozilla/components/feature/summarize/SummarizationMiddleware.kt
new file mode 100644
index 0000000000000..f717ccf73d7ab
--- /dev/null
+++ b/mobile/android/android-components/components/feature/summarize/src/main/java/mozilla/components/feature/summarize/SummarizationMiddleware.kt
@@ -0,0 +1,18 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package mozilla.components.feature.summarize
+
+import mozilla.components.lib.state.Middleware
+import mozilla.components.lib.state.Store
+
+internal class SummarizationMiddleware : Middleware<SummarizationState, SummarizationAction> {
+    override fun invoke(
+        store: Store<SummarizationState, SummarizationAction>,
+        next: (SummarizationAction) -> Unit,
+        action: SummarizationAction,
+    ) {
+        TODO("Not yet implemented")
+    }
+}
diff --git a/mobile/android/android-components/components/feature/summarize/src/main/java/mozilla/components/feature/summarize/SummarizationReducer.kt b/mobile/android/android-components/components/feature/summarize/src/main/java/mozilla/components/feature/summarize/SummarizationReducer.kt
new file mode 100644
index 0000000000000..603be90e88bfe
--- /dev/null
+++ b/mobile/android/android-components/components/feature/summarize/src/main/java/mozilla/components/feature/summarize/SummarizationReducer.kt
@@ -0,0 +1,9 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package mozilla.components.feature.summarize
+
+internal fun summarizationReducer(state: SummarizationState, action: SummarizationAction) = when (action) {
+    else -> { state }
+}
diff --git a/mobile/android/android-components/components/feature/summarize/src/main/java/mozilla/components/feature/summarize/SummarizationScreen.kt b/mobile/android/android-components/components/feature/summarize/src/main/java/mozilla/components/feature/summarize/SummarizationScreen.kt
new file mode 100644
index 0000000000000..afeeca9ed7097
--- /dev/null
+++ b/mobile/android/android-components/components/feature/summarize/src/main/java/mozilla/components/feature/summarize/SummarizationScreen.kt
@@ -0,0 +1,61 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package mozilla.components.feature.summarize
+
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+
+/**
+ * Composable function that renders the summarized text of a webpage.
+ **/
+@Composable
+fun SummarizationUi() {
+    SummarizationScreen(
+        SummarizationStore(
+            initialState = SummarizationState(
+                pageSummarizationState = PageSummarizationState.Inert,
+            ),
+            reducer = ::summarizationReducer,
+            middleware = listOf(SummarizationMiddleware()),
+        ),
+    )
+}
+
+@Composable
+private fun SummarizationScreen(store: SummarizationStore) {
+    Text(store.state.summarizedText)
+}
+
+private class SummarizationStatePreviewProvider : PreviewParameterProvider<SummarizationState> {
+    override val values: Sequence<SummarizationState> = sequenceOf(
+        SummarizationState(
+            PageSummarizationState.Summarizing,
+            summarizedText = "Lorem Ipsum",
+        ),
+        SummarizationState(
+            PageSummarizationState.Error(SummarizationError.ContentTooLong),
+        ),
+        SummarizationState(
+            PageSummarizationState.WaitingForPermission,
+        ),
+    )
+}
+
+@Preview
+@Composable
+private fun SummarizationScreenPreview(
+    @PreviewParameter(SummarizationStatePreviewProvider::class) state: SummarizationState,
+) {
+    SummarizationScreen(
+        SummarizationStore(
+            initialState = state,
+            reducer = ::summarizationReducer,
+            middleware = listOf(SummarizationMiddleware()),
+        ),
+    )
+}
diff --git a/mobile/android/android-components/components/feature/summarize/src/main/java/mozilla/components/feature/summarize/SummarizationStore.kt b/mobile/android/android-components/components/feature/summarize/src/main/java/mozilla/components/feature/summarize/SummarizationStore.kt
new file mode 100644
index 0000000000000..7e187d0a74ed2
--- /dev/null
+++ b/mobile/android/android-components/components/feature/summarize/src/main/java/mozilla/components/feature/summarize/SummarizationStore.kt
@@ -0,0 +1,36 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package mozilla.components.feature.summarize
+
+import mozilla.components.lib.state.Action
+import mozilla.components.lib.state.State
+import mozilla.components.lib.state.Store
+
+internal typealias SummarizationStore = Store<SummarizationState, SummarizationAction>
+
+internal interface SummarizationAction : Action
+
+internal data class SummarizationState(
+    val pageSummarizationState: PageSummarizationState,
+    val summarizedText: String = "",
+) : State
+
+internal sealed class PageSummarizationState {
+    data object Inert : PageSummarizationState()
+    data object WaitingForPermission : PageSummarizationState()
+    data object Summarizing : PageSummarizationState()
+    data class Summarized(val text: String) : PageSummarizationState()
+    data class Error(val error: SummarizationError) : PageSummarizationState()
+}
+
+internal sealed class SummarizationError {
+    object PermissionDenied : SummarizationError()
+    object ContentUnavailable : SummarizationError()
+    object ContentTooShort : SummarizationError()
+    object ContentTooLong : SummarizationError()
+    object SummarizationFailed : SummarizationError()
+    object InvalidSummary : SummarizationError()
+    object NetworkError : SummarizationError()
+}

From 7b5dbd8b61a74b8b2d0c363b58a01136d7689dce Mon Sep 17 00:00:00 2001
From: Gian-Carlo Pascutto <gcp@mozilla.com>
Date: Thu, 29 Jan 2026 15:15:53 +0000
Subject: [PATCH 082/116] Bug 2013184 - Close IdentityCredentialStorageService
 memory connection on shutdown even if init failed. r=bvandersloot

BlockShutdown was returning early if WaitForInitialization() failed, without
closing the in-memory SQLite connection. This caused a crash at
xpcom-shutdown-threads when mozStorageService detected an unclosed connection.

The memory connection is created synchronously during Init() before the
background thread attempts to open the disk connection. If the disk connection
fails, mErrored is set, causing WaitForInitialization() to return an error.
The fix closes the memory connection before checking initialization status.

Differential Revision: https://phabricator.services.mozilla.com/D280903
---
 .../IdentityCredentialStorageService.cpp      | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/toolkit/components/credentialmanagement/IdentityCredentialStorageService.cpp b/toolkit/components/credentialmanagement/IdentityCredentialStorageService.cpp
index ac088a51a2efb..9408c737f135e 100644
--- a/toolkit/components/credentialmanagement/IdentityCredentialStorageService.cpp
+++ b/toolkit/components/credentialmanagement/IdentityCredentialStorageService.cpp
@@ -69,15 +69,31 @@ NS_IMETHODIMP IdentityCredentialStorageService::GetName(nsAString& aName) {
 NS_IMETHODIMP IdentityCredentialStorageService::BlockShutdown(
     nsIAsyncShutdownClient* aClient) {
   MOZ_ASSERT(NS_IsMainThread());
-  nsresult rv = WaitForInitialization();
-  NS_ENSURE_SUCCESS(rv, rv);
 
-  MonitorAutoLock lock(mMonitor);
-  mShuttingDown.Flip();
+  // Always close the memory connection if it exists, even if initialization
+  // failed. The memory connection may have been successfully created before
+  // the disk connection failed during async initialization.
+  {
+    MonitorAutoLock lock(mMonitor);
+    mShuttingDown.Flip();
 
-  if (mMemoryDatabaseConnection) {
-    (void)mMemoryDatabaseConnection->Close();
-    mMemoryDatabaseConnection = nullptr;
+    if (mMemoryDatabaseConnection) {
+      (void)mMemoryDatabaseConnection->Close();
+      mMemoryDatabaseConnection = nullptr;
+    }
+  }
+
+  nsresult rv = WaitForInitialization();
+  if (NS_FAILED(rv)) {
+    // Initialization failed, but we've already closed any open connections
+    // above. If the background thread exists, dispatch the finalization to it;
+    // otherwise just remove the blocker directly.
+    if (!mBackgroundThread) {
+      DebugOnly<nsresult> removeRv = aClient->RemoveBlocker(this);
+      MOZ_ASSERT(NS_SUCCEEDED(removeRv));
+      return NS_OK;
+    }
+    // Fall through to dispatch finalization on background thread
   }
 
   RefPtr<IdentityCredentialStorageService> self = this;

From eda116e069cbf42f68f8a179461523a3bb0151e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bargull?= <andre.bargull@gmail.com>
Date: Thu, 29 Jan 2026 15:18:21 +0000
Subject: [PATCH 083/116] Bug 2013278 - Part 1: Update test262 January, 2026.
 r=spidermonkey-reviewers,mgaudet

Differential Revision: https://phabricator.services.mozilla.com/D280942
---
 js/src/tests/test262/GIT-INFO                 |   16 +-
 .../built-ins/Array/fromAsync/shell.js        |   19 +
 .../Array/prototype/fill/coerced-indexes.js   |   27 +-
 .../non-numeric-depth-should-not-throw.js     |    5 +
 .../test262/built-ins/Iterator/from/shell.js  |   19 +
 .../cause_property_native_error.js            |    1 +
 .../touint16-tonumber-throws-bigint.js        |   28 +
 .../touint16-tonumber-throws-valueof.js       |   29 +
 .../prototype/lastIndexOf/not-a-substring.js  |   23 +
 ...propertybag-calendar-invalid-iso-string.js |   28 +
 ...ment-string-calendar-invalid-iso-string.js |   28 +
 .../relativeto-no-fractional-minutes-hours.js |   27 +
 ...iveto-propertybag-invalid-offset-string.js |    1 +
 .../relativeto-string-zoneddatetime.js        |   11 +-
 .../Duration/from/argument-non-string.js      |   36 +-
 .../Duration/from/argument-propertybag.js     |   51 +
 ...t-string-fractional-units-rounding-mode.js |   17 +
 .../Duration/from/argument-string-invalid.js  |   25 +-
 .../Temporal/Duration/out-of-range.js         |   16 +-
 ...propertybag-calendar-invalid-iso-string.js |   27 +
 ...ent-string-calendar-invalid-iso-string.js} |   12 +-
 .../relativeto-no-fractional-minutes-hours.js |   26 +
 ...iveto-propertybag-invalid-offset-string.js |    1 +
 .../round/relativeto-string-datetime.js       |    3 +
 .../Duration/prototype/toJSON/max-value.js    |   92 +-
 .../precision-exact-mathematical-values-5.js  |   27 +
 ...ropertybag-calendar-invalid-iso-string.js} |    9 +-
 ...ment-string-calendar-invalid-iso-string.js |   27 +
 .../prototype/total/relativeto-date-limits.js |    8 +-
 .../relativeto-no-fractional-minutes-hours.js |   26 +
 ...iveto-propertybag-invalid-offset-string.js |    1 +
 .../total/relativeto-string-datetime.js       |    3 +
 .../built-ins/Temporal/Instant/basic.js       |   15 +
 .../compare/no-fractional-minutes-hours.js    |   29 +
 .../Instant/from/argument-object-tostring.js  |    3 +
 .../Instant/from/argument-string-invalid.js   |    3 +
 .../Instant/from/argument-wrong-type.js       |   26 +-
 .../from/no-fractional-minutes-hours.js       |   24 +
 .../Instant/fromEpochNanoseconds/limits.js    |    5 +
 .../Instant/prototype/equals/basic.js}        |    8 +-
 .../equals/no-fractional-minutes-hours.js     |   26 +
 .../prototype/round/rounding-increments.js    |   18 +
 .../since/no-fractional-minutes-hours.js      |   26 +
 .../toJSON/fromEpochMilliseconds.js}          |   17 +-
 .../no-observable-array-iteration.js          |   23 +
 .../until/no-fractional-minutes-hours.js      |   26 +
 .../PlainDate/calendar-invalid-iso-string.js  |    3 +-
 ...propertybag-calendar-invalid-iso-string.js |    8 +-
 ...ment-string-calendar-invalid-iso-string.js |   29 +
 .../compare/no-fractional-minutes-hours.js    |   29 +
 ...propertybag-calendar-invalid-iso-string.js |   10 +-
 .../from/argument-propertybag-calendar.js     |    2 +
 ...ment-string-calendar-invalid-iso-string.js |   24 +
 .../PlainDate/from/argument-string-invalid.js |    3 +
 .../PlainDate/from/argument-wrong-type.js     |   14 +
 .../PlainDate/from/month-code-wrong-type.js   |   27 +
 .../PlainDate/from/negative-month-or-day.js   |   14 +
 .../from/no-fractional-minutes-hours.js       |   24 +
 .../Temporal/PlainDate/from/options-basic.js  |   23 +
 .../PlainDate/from/options-undefined.js       |    3 +
 .../PlainDate/from/options-wrong-type.js      |    3 +
 .../PlainDate/from/overflow-reject.js         |   76 +
 .../from/roundtrip-from-property-bag.js       |   45 +-
 .../with-year-month-day-need-constrain.js     |  104 +-
 .../with-year-monthCode-day-need-constrain.js |   92 +-
 .../built-ins/Temporal/PlainDate/limits.js    |   37 +-
 .../Temporal/PlainDate/missing-arguments.js   |    4 +
 .../argument-duration-max-plus-min-date.js    |   60 +
 .../prototype/add/argument-string.js          |    1 +
 .../Temporal/PlainDate/prototype/add/basic.js |   86 ++
 .../PlainDate/prototype/day/basic.js}         |   10 +-
 .../PlainDate/prototype/dayOfYear/basic.js    |   15 +
 .../PlainDate/prototype/daysInMonth/basic.js  |   28 +
 .../PlainDate/prototype/daysInYear/basic.js   |   19 +
 ...propertybag-calendar-invalid-iso-string.js |    6 +-
 ...ment-string-calendar-invalid-iso-string.js |   26 +
 .../equals/no-fractional-minutes-hours.js     |   26 +
 .../PlainDate/prototype/inLeapYear/basic.js   |   19 +
 .../PlainDate/prototype/month/basic.js        |   14 +
 .../PlainDate/prototype/monthCode/basic.js    |   14 +
 .../PlainDate/prototype/monthsInYear/basic.js |    3 +
 ...propertybag-calendar-invalid-iso-string.js |    6 +-
 ...ment-string-calendar-invalid-iso-string.js |   26 +
 .../prototype/since/basic-arithmetic.js       |  471 ++++++
 .../since/no-fractional-minutes-hours.js      |   26 +
 .../prototype/since/throws-with-time-units.js |   23 +
 .../argument-duration-max-plus-min-date.js    |   60 +
 .../prototype/subtract/argument-string.js     |    4 +-
 .../PlainDate/prototype/subtract/basic.js     |   86 ++
 .../no-observable-array-iteration.js          |   23 +
 ...propertybag-calendar-invalid-iso-string.js |    6 +-
 ...ment-string-calendar-invalid-iso-string.js |   26 +
 .../prototype/until/basic-arithmetic.js       |  116 ++
 .../until/no-fractional-minutes-hours.js      |   26 +
 .../prototype/until/throws-with-time-units.js |   23 +
 .../prototype/with/plaindatelike-invalid.js   |    6 +-
 .../prototype/with/time-units-ignored.js      |   30 +
 .../calendar-invalid-iso-string.js            |    1 +
 .../withCalendar/calendar-time-string.js      |   60 +
 .../PlainDate/prototype/year/basic.js}        |   10 +-
 .../PlainDateTime/argument-convert.js         |   42 +
 .../Temporal/PlainDateTime/basic.js}          |   11 +-
 .../calendar-invalid-iso-string.js            |    3 +-
 ...propertybag-calendar-invalid-iso-string.js |    8 +-
 ...ment-string-calendar-invalid-iso-string.js |   29 +
 .../compare/argument-string-invalid.js        |   15 +
 .../Temporal/PlainDateTime/compare/cast.js    |   75 +
 .../compare/no-fractional-minutes-hours.js    |   29 +
 ...propertybag-calendar-invalid-iso-string.js |   20 +-
 ...ment-string-calendar-invalid-iso-string.js |   24 +
 .../from/argument-string-invalid.js           |    8 +
 .../PlainDateTime/from/argument-wrong-type.js |   14 +
 .../from/month-code-wrong-type.js             |   27 +
 .../from/negative-month-or-day.js             |   14 +
 .../from/no-fractional-minutes-hours.js       |   24 +
 .../PlainDateTime/from/options-wrong-type.js  |    3 +
 .../from/roundtrip-from-property-bag.js       |   24 +-
 .../PlainDateTime/missing-arguments.js        |    4 +
 .../argument-duration-max-plus-min-date.js    |   60 +
 .../PlainDateTime/prototype/day/basic.js      |   14 +
 .../prototype/dayOfYear/basic.js              |   13 +
 .../prototype/daysInMonth/basic.js            |   26 +-
 .../prototype/daysInYear/basic.js             |   11 +
 ...propertybag-calendar-invalid-iso-string.js |    6 +-
 ...ment-string-calendar-invalid-iso-string.js |   26 +
 .../equals/no-fractional-minutes-hours.js     |   26 +
 .../prototype/inLeapYear/basic.js             |   11 +
 .../PlainDateTime/prototype/month/basic.js    |   13 +
 .../prototype/monthCode/basic.js              |   13 +
 .../prototype/monthsInYear/basic.js           |    1 +
 ...propertybag-calendar-invalid-iso-string.js |    6 +-
 ...ment-string-calendar-invalid-iso-string.js |   26 +
 .../since/no-fractional-minutes-hours.js      |   26 +
 .../argument-duration-max-plus-min-date.js    |   60 +
 .../prototype/toPlainDate/basic.js}           |    8 +-
 .../toString/fractionalseconddigits-number.js |    8 +
 .../no-observable-array-iteration.js          |   23 +
 ...propertybag-calendar-invalid-iso-string.js |    6 +-
 ...ment-string-calendar-invalid-iso-string.js |   26 +
 .../until/no-fractional-minutes-hours.js      |   26 +
 .../PlainDateTime/prototype/valueOf/basic.js  |    1 +
 .../prototype/weekOfYear/basic.js             |   30 +-
 .../prototype/with/argument-not-object.js     |    1 +
 .../with/calendar-temporal-object-throws.js   |    3 +
 .../calendar-invalid-iso-string.js            |    3 +-
 .../withCalendar/calendar-time-string.js      |   60 +
 .../PlainDateTime/prototype/year/basic.js     |   14 +
 .../PlainMonthDay/argument-convert.js         |   28 +
 .../calendar-invalid-iso-string.js            |    3 +-
 ...propertybag-calendar-invalid-iso-string.js |   20 +-
 ...ment-string-calendar-invalid-iso-string.js |   24 +
 .../PlainMonthDay/from/argument-wrong-type.js |   14 +
 .../from/negative-month-or-day.js             |   14 +
 .../from/no-fractional-minutes-hours.js       |   24 +
 .../PlainMonthDay/missing-arguments.js        |    2 +
 ...propertybag-calendar-invalid-iso-string.js |    9 +-
 ...ment-string-calendar-invalid-iso-string.js |   26 +
 .../equals/no-fractional-minutes-hours.js     |   26 +
 .../Temporal/PlainTime/argument-convert.js    |   46 +
 .../compare/no-fractional-minutes-hours.js    |   29 +
 .../PlainTime/from/argument-string-invalid.js |   48 +
 .../PlainTime/from/argument-wrong-type.js     |   14 +
 .../from/no-fractional-minutes-hours.js       |   24 +
 .../round/roundingincrement-divides.js        |   50 +
 .../PlainYearMonth/argument-convert.js        |   37 +
 .../calendar-invalid-iso-string.js            |    3 +-
 ...propertybag-calendar-invalid-iso-string.js |    8 +-
 ...ment-string-calendar-invalid-iso-string.js |   29 +
 .../compare/no-fractional-minutes-hours.js    |   29 +
 ...propertybag-calendar-invalid-iso-string.js |   10 +-
 ...ment-string-calendar-invalid-iso-string.js |   24 +
 .../from/argument-wrong-type.js               |   14 +
 .../from/month-code-wrong-type.js             |   27 +
 .../PlainYearMonth/from/negative-month.js     |   13 +
 .../from/no-fractional-minutes-hours.js       |   24 +
 .../PlainYearMonth/missing-arguments.js       |    2 +
 .../prototype/add/argument-duration-max.js    |   38 +-
 .../add/argument-duration-out-of-range.js     |   42 -
 .../prototype/add/argument-lower-units.js     |   47 +-
 .../prototype/add/argument-mixed-sign.js      |    2 +-
 ...rgument-propertybag-optional-properties.js |   12 +-
 ...gument-string-negative-fractional-units.js |   20 -
 .../prototype/add/month-length.js             |   31 -
 ...ions-read-before-algorithmic-validation.js |    9 +
 .../prototype/add/order-of-operations.js      |   16 +-
 .../PlainYearMonth/prototype/add/overflow.js  |   29 +
 .../subtract-from-last-representable-month.js |   14 +-
 ...propertybag-calendar-invalid-iso-string.js |   18 +-
 ...ment-string-calendar-invalid-iso-string.js |   26 +
 .../equals/no-fractional-minutes-hours.js     |   26 +
 .../PlainYearMonth/prototype/month/basic.js   |   14 +
 .../prototype/monthCode/basic.js              |   13 +
 ...propertybag-calendar-invalid-iso-string.js |    9 +-
 ...ment-string-calendar-invalid-iso-string.js |   26 +
 .../since/no-fractional-minutes-hours.js      |   26 +
 .../subtract/argument-duration-max.js         |   38 +-
 .../argument-duration-out-of-range.js         |   42 -
 .../subtract/argument-lower-units.js          |   45 +-
 .../prototype/subtract/argument-mixed-sign.js |    2 +-
 ...rgument-propertybag-optional-properties.js |   12 +-
 ...gument-string-negative-fractional-units.js |   20 -
 .../prototype/subtract/month-length.js        |   31 -
 ...ions-read-before-algorithmic-validation.js |    9 +
 .../prototype/subtract/order-of-operations.js |   16 +-
 .../prototype/subtract/overflow.js            |   29 +
 .../subtract-from-last-representable-month.js |   14 +-
 ...propertybag-calendar-invalid-iso-string.js |   11 +-
 ...ment-string-calendar-invalid-iso-string.js |   26 +
 .../until/no-fractional-minutes-hours.js      |   26 +
 .../PlainYearMonth/prototype/year/basic.js    |   14 +
 .../ZonedDateTime/argument-convert.js         |   21 +
 .../calendar-invalid-iso-string.js            |    3 +-
 ...propertybag-calendar-invalid-iso-string.js |    6 +-
 ...ment-string-calendar-invalid-iso-string.js |   31 +
 .../compare/no-fractional-minutes-hours.js    |   29 +
 ...propertybag-calendar-invalid-iso-string.js |    8 +-
 .../argument-propertybag-timezone-object.js   |   14 +
 ...ment-string-calendar-invalid-iso-string.js |   26 +
 .../from/argument-string-invalid.js           |   32 +
 .../ZonedDateTime/from/argument-wrong-type.js |   14 +
 .../from/month-code-wrong-type.js             |   27 +
 .../from/negative-month-or-day.js             |   14 +
 .../from/no-fractional-minutes-hours.js       |   24 +
 .../from/offset-string-invalid.js             |    9 +-
 .../from/roundtrip-from-property-bag.js       |   24 +-
 .../argument-duration-max-plus-min-date.js    |   60 +
 .../ZonedDateTime/prototype/day/basic.js      |   15 +
 .../prototype/dayOfYear/basic.js              |   27 +
 .../prototype/daysInMonth/basic.js            |   38 +
 .../prototype/daysInWeek/basic.js             |   20 +
 .../prototype/daysInYear/basic.js             |   11 +
 ...propertybag-calendar-invalid-iso-string.js |   11 +-
 ...ment-string-calendar-invalid-iso-string.js |   27 +
 .../equals/no-fractional-minutes-hours.js     |   26 +
 .../prototype/inLeapYear/basic.js             |   11 +
 .../ZonedDateTime/prototype/month/basic.js    |   13 +
 .../prototype/monthCode/basic.js              |   13 +
 .../prototype/monthsInYear/basic.js           |   15 +
 .../prototype/round/rounding-increments.js    |   16 +
 ...propertybag-calendar-invalid-iso-string.js |   11 +-
 ...ment-string-calendar-invalid-iso-string.js |   27 +
 .../since/no-fractional-minutes-hours.js      |   26 +
 .../argument-duration-max-plus-min-date.js    |   60 +
 ...propertybag-calendar-invalid-iso-string.js |   11 +-
 ...ment-string-calendar-invalid-iso-string.js |   27 +
 .../until/no-fractional-minutes-hours.js      |   26 +
 .../prototype/weekOfYear/basic.js             |   40 +
 .../calendar-invalid-iso-string.js            |    6 +-
 .../withCalendar/calendar-time-string.js      |   60 +
 .../ZonedDateTime/prototype/year/basic.js     |   14 +
 .../tests/test262/built-ins/Temporal/shell.js |   19 +
 ...poral-plaindate-formatting-timezonename.js |   34 +
 ...l-plaindatetime-formatting-timezonename.js |   34 +
 ...l-plainmonthday-formatting-timezonename.js |   34 +
 ...poral-plaintime-formatting-timezonename.js |   34 +
 ...-plainyearmonth-formatting-timezonename.js |   34 +
 ...poral-plaindate-formatting-timezonename.js |   35 +
 ...l-plaindatetime-formatting-timezonename.js |   35 +
 ...l-plainmonthday-formatting-timezonename.js |   35 +
 ...poral-plaintime-formatting-timezonename.js |   35 +
 ...-plainyearmonth-formatting-timezonename.js |   35 +
 .../chinese-calendar-dates.js                 |   12 +-
 .../dangi-calendar-dates.js                   |   12 +-
 ...poral-plaindate-formatting-timezonename.js |   32 +
 ...l-plaindatetime-formatting-timezonename.js |   32 +
 ...l-plainmonthday-formatting-timezonename.js |   32 +
 ...poral-plaintime-formatting-timezonename.js |   32 +
 ...-plainyearmonth-formatting-timezonename.js |   32 +
 .../formatToParts/chinese-calendar-dates.js   |   12 +-
 .../formatToParts/dangi-calendar-dates.js     |   12 +-
 ...poral-plaindate-formatting-timezonename.js |   31 +
 ...l-plaindatetime-formatting-timezonename.js |   31 +
 ...l-plainmonthday-formatting-timezonename.js |   31 +
 ...poral-plaintime-formatting-timezonename.js |   31 +
 ...-plainyearmonth-formatting-timezonename.js |   31 +
 .../calendars-accepted-by-DisplayNames.js     |    5 +-
 ...alendars-required-by-intl-era-monthcode.js |   27 +-
 .../PluralRules/prototype/select/notation.js  |   12 +-
 .../Duration/prototype/round/shell.js         |   19 +
 .../Duration/prototype/total/shell.js         |   19 +
 .../toLocaleString/datestyle-and-timestyle.js |   15 +
 .../prototype/toLocaleString/hourcycle.js     |   35 +
 .../PlainDate/canonicalize-calendar.js        |    9 +-
 .../Temporal/PlainDate/compare/shell.js       |   19 +
 .../calendar-invalid-era-with-era-year.js     |   34 +
 .../PlainDate/from/calendar-invalid-era.js    |   45 +
 .../PlainDate/from/era-boundary-japanese.js   |   24 +-
 .../Temporal/PlainDate/from/era-japanese.js   |    4 +-
 .../from/invalid-month-codes-hebrew.js        |    6 +
 .../intl402/Temporal/PlainDate/from/shell.js  |   19 +
 .../Temporal/PlainDate/prototype/add/shell.js |   19 +
 .../PlainDate/prototype/equals/shell.js       |   19 +
 .../PlainDate/prototype/monthCode/shell.js    |   19 +
 .../prototype/since/era-boundary-japanese.js  |   36 +-
 .../PlainDate/prototype/since/shell.js        |   19 +
 .../since/wrapping-at-end-of-month-chinese.js |  114 +-
 .../since/wrapping-at-end-of-month-dangi.js   |  114 +-
 .../since/wrapping-at-end-of-month-hebrew.js  |  177 +++
 .../PlainDate/prototype/subtract/shell.js     |   19 +
 .../toLocaleString/datestyle-and-timestyle.js |   17 +
 .../PlainDate/prototype/toString/shell.js     |   19 +
 .../prototype/toZonedDateTime/shell.js        |   19 +
 .../prototype/until/era-boundary-japanese.js  |   36 +-
 .../PlainDate/prototype/until/shell.js        |   19 +
 .../until/wrapping-at-end-of-month-chinese.js |  114 +-
 .../until/wrapping-at-end-of-month-dangi.js   |  114 +-
 .../until/wrapping-at-end-of-month-hebrew.js  |  177 +++
 .../PlainDate/prototype/with/shell.js         |   19 +
 .../withCalendar/calendar-time-string.js      |   37 +
 .../withCalendar/roundtrip-from-iso8601.js}   |    9 +-
 .../PlainDate/prototype/withCalendar/shell.js |   19 +
 .../prototype/withPlainTime/basic-roc.js      |   24 +
 .../prototype/withPlainTime}/browser.js       |    0
 .../prototype/withPlainTime/shell.js          | 1278 +++++++++++++++++
 .../prototype/year/arithmetic-year.js         |    2 +-
 .../PlainDateTime/canonicalize-calendar.js    |    9 +-
 .../Temporal/PlainDateTime/compare/shell.js   |   19 +
 .../calendar-invalid-era-with-era-year.js     |   34 +
 .../from/calendar-invalid-era.js              |   45 +
 .../from/era-boundary-japanese.js             |   24 +-
 .../PlainDateTime/from/era-japanese.js        |    4 +-
 .../from/invalid-month-codes-hebrew.js        |    6 +
 .../Temporal/PlainDateTime/from/shell.js      |   19 +
 .../PlainDateTime/prototype/add/shell.js      |   19 +
 .../PlainDateTime/prototype/equals/shell.js   |   19 +
 .../prototype/monthCode/shell.js              |   19 +
 .../prototype/since/era-boundary-japanese.js  |   36 +-
 .../PlainDateTime/prototype/since/shell.js    |   19 +
 .../since/wrapping-at-end-of-month-chinese.js |  114 +-
 .../since/wrapping-at-end-of-month-dangi.js   |  114 +-
 .../since/wrapping-at-end-of-month-hebrew.js  |  177 +++
 .../PlainDateTime/prototype/subtract/shell.js |   19 +
 .../toLocaleString/datestyle-and-timestyle.js |   15 +
 .../prototype/toLocaleString/hourcycle.js     |   35 +
 .../PlainDateTime/prototype/toString/shell.js |   19 +
 .../prototype/toZonedDateTime/shell.js        |   19 +
 .../prototype/until/adjusted-dates.js         |   19 +
 .../prototype/until/era-boundary-japanese.js  |   36 +-
 .../PlainDateTime/prototype/until/shell.js    |   19 +
 .../until/wrapping-at-end-of-month-chinese.js |  114 +-
 .../until/wrapping-at-end-of-month-dangi.js   |  114 +-
 .../until/wrapping-at-end-of-month-hebrew.js  |  177 +++
 .../PlainDateTime/prototype/with/shell.js     |   19 +
 .../withCalendar/calendar-time-string.js      |   37 +
 .../withCalendar/roundtrip-from-iso8601.js}   |    9 +-
 .../prototype/withCalendar/shell.js           |   19 +
 .../prototype/year/arithmetic-year.js         |    2 +-
 .../PlainMonthDay/canonicalize-calendar.js    |    9 +-
 .../Temporal/PlainMonthDay/from/shell.js      |   19 +
 .../PlainMonthDay/prototype/equals/shell.js   |   19 +
 .../prototype/monthCode/shell.js              |   19 +
 .../toLocaleString/datestyle-and-timestyle.js |   17 +
 .../prototype/toPlainDate/shell.js            |   19 +
 .../PlainMonthDay/prototype/toString/shell.js |   19 +
 .../toLocaleString/datestyle-and-timestyle.js |   17 +
 .../prototype/toLocaleString/hourcycle.js     |   35 +
 .../PlainYearMonth/canonicalize-calendar.js   |    9 +-
 .../Temporal/PlainYearMonth/compare/shell.js  |   19 +
 .../from/era-boundary-japanese.js             |   24 +-
 .../PlainYearMonth/from/era-japanese.js       |    4 +-
 .../PlainYearMonth/from/extreme-dates.js      |   15 +-
 .../from/extreme-unsupported-dates.js         |   55 +
 .../from/invalid-month-codes-hebrew.js        |    6 +
 .../from/reference-day-japanese.js            |    6 +-
 .../Temporal/PlainYearMonth/from/shell.js     |   19 +
 .../prototype/add/leap-months-chinese.js      |  323 +++++
 .../prototype/add/leap-months-dangi.js        |  323 +++++
 .../prototype/add/leap-months-hebrew.js       |  342 +++++
 .../prototype/add/leap-year-buddhist.js       |  102 ++
 .../prototype/add/leap-year-coptic.js         |   42 +
 .../prototype/add/leap-year-ethioaa.js        |   42 +
 .../prototype/add/leap-year-ethiopic.js       |   42 +
 .../prototype/add/leap-year-gregory.js        |  102 ++
 .../prototype/add/leap-year-indian.js         |   42 +
 .../prototype/add/leap-year-islamic-civil.js  |   45 +
 .../prototype/add/leap-year-islamic-tbla.js   |   45 +
 .../prototype/add/leap-year-japanese.js       |  102 ++
 .../prototype/add/leap-year-persian.js        |   93 ++
 .../prototype/add/leap-year-roc.js            |  102 ++
 .../PlainYearMonth/prototype/add/shell.js     |   19 +
 .../PlainYearMonth/prototype/equals/shell.js  |   19 +
 .../prototype/monthCode/shell.js              |   19 +
 .../prototype/since/era-boundary-japanese.js  |   29 +-
 .../PlainYearMonth/prototype/since/shell.js   |   19 +
 .../prototype/subtract/leap-months-chinese.js |  323 +++++
 .../prototype/subtract/leap-months-dangi.js   |  323 +++++
 .../prototype/subtract/leap-months-hebrew.js  |  342 +++++
 .../prototype/subtract/leap-year-buddhist.js  |  100 ++
 .../prototype/subtract/leap-year-coptic.js    |   42 +
 .../prototype/subtract/leap-year-ethioaa.js   |   42 +
 .../prototype/subtract/leap-year-ethiopic.js  |   42 +
 .../prototype/subtract/leap-year-gregory.js   |  102 ++
 .../prototype/subtract/leap-year-indian.js    |   42 +
 .../subtract/leap-year-islamic-civil.js       |   45 +
 .../subtract/leap-year-islamic-tbla.js        |   45 +
 .../prototype/subtract/leap-year-japanese.js  |  102 ++
 .../prototype/subtract/leap-year-persian.js   |   93 ++
 .../prototype/subtract/leap-year-roc.js       |  102 ++
 .../prototype/subtract/shell.js               |   19 +
 .../toLocaleString/datestyle-and-timestyle.js |   17 +
 .../prototype/toString/shell.js               |   19 +
 .../prototype/until/era-boundary-japanese.js  |   29 +-
 .../PlainYearMonth/prototype/until/shell.js   |   19 +
 .../PlainYearMonth/prototype/with/shell.js    |   19 +
 .../prototype/year/arithmetic-year.js         |    2 +-
 .../ZonedDateTime/canonicalize-calendar.js    |    9 +-
 .../calendar-invalid-era-with-era-year.js     |   34 +
 .../from/calendar-invalid-era.js              |   45 +
 .../from/era-boundary-japanese.js             |   24 +-
 .../ZonedDateTime/from/era-japanese.js        |    4 +-
 .../from/invalid-month-codes-hebrew.js        |    6 +
 .../Temporal/ZonedDateTime/links-africa.js    |   56 -
 .../Temporal/ZonedDateTime/links-asia.js      |   27 -
 .../ZonedDateTime/links-australasia.js        |   23 -
 .../Temporal/ZonedDateTime/links-europe.js    |   35 -
 .../ZonedDateTime/links-northamerica.js       |   42 -
 .../intl402/Temporal/ZonedDateTime/links.js   |  337 +++++
 .../prototype/add/offset-before-1883.js       |   18 +
 .../prototype/since/era-boundary-japanese.js  |   36 +-
 .../since/wrapping-at-end-of-month-chinese.js |  114 +-
 .../since/wrapping-at-end-of-month-dangi.js   |  114 +-
 .../since/wrapping-at-end-of-month-hebrew.js  |  177 +++
 .../prototype/subtract/offset-before-1883.js  |   18 +
 .../toLocaleString/datestyle-and-timestyle.js |   15 +
 .../prototype/toLocaleString/hourcycle.js     |   35 +
 .../toLocaleString/offset-time-zones.js       |   24 +
 .../prototype/toString/timezone.js            |   26 +
 .../prototype/until/era-boundary-japanese.js  |   36 +-
 .../until/wrapping-at-end-of-month-chinese.js |  114 +-
 .../until/wrapping-at-end-of-month-dangi.js   |  114 +-
 .../until/wrapping-at-end-of-month-hebrew.js  |  177 +++
 .../withCalendar/calendar-time-string.js      |   37 +
 .../prototype/year/arithmetic-year.js         |    2 +-
 .../intl402/Temporal/ZonedDateTime/shell.js   |   19 +
 .../ignore-exported-then-super-get.js         |   51 +
 ...ore-exported-then-super-property-define.js |   63 +
 .../ignore-not-exported-then-super-get.js     |   51 +
 ...not-exported-then-super-property-define.js |   63 +
 .../ignore-super-property-set-exported.js     |   37 +
 .../ignore-super-property-set-not-exported.js |   37 +
 .../ignore-symbol-other-super-get.js          |   51 +
 ...nore-symbol-other-super-property-define.js |   63 +
 .../ignore-symbol-toStringTag-super-get.js    |   51 +
 ...ymbol-toStringTag-super-property-define.js |   63 +
 .../trigger-exported-string-super-get.js      |   51 +
 ...r-exported-string-super-property-define.js |   63 +
 .../trigger-not-exported-string-super-get.js  |   51 +
 ...t-exported-string-super-property-define.js |   63 +
 .../await-using/Symbol.asyncDispose-getter.js |   90 ++
 ...Dispose-method-called-with-correct-this.js |   55 +
 .../Symbol.asyncDispose-method-not-async.js   |   59 +
 .../await-using/Symbol.dispose-getter.js      |   90 ++
 ...dispose-method-called-with-correct-this.js |   55 +
 ...Dispose-allows-non-promise-return-value.js |   48 +
 ...Dispose-allows-promiselike-return-value.js |   53 +
 .../await-using-allows-null-initializer.js    |   47 +
 ...wait-using-allows-undefined-initializer.js |   47 +
 ...g-does-not-imply-await-if-not-evaluated.js |  103 ++
 .../await-using-implies-await-if-evaluated.js |  104 ++
 ...local-closure-get-before-initialization.js |   23 +
 ...initialization-in-declaration-statement.js |   19 +
 ...efore-initialization-in-prior-statement.js |   19 +
 .../statements/await-using/fn-name-arrow.js   |   29 +
 .../statements/await-using/fn-name-class.js   |   32 +
 .../statements/await-using/fn-name-cover.js   |   33 +
 .../statements/await-using/fn-name-fn.js      |   32 +
 .../statements/await-using/fn-name-gen.js     |   32 +
 ...local-closure-get-before-initialization.js |   24 +
 ...initialization-in-declaration-statement.js |   18 +
 ...efore-initialization-in-prior-statement.js |   19 +
 ...lizer-Symbol.asyncDispose-property-once.js |   89 ++
 ...spose-after-Symbol.asyncDispose-is-null.js |   93 ++
 ...-after-Symbol.asyncDispose-is-undefined.js |   93 ++
 ...nitializer-Symbol.dispose-property-once.js |   89 ++
 ...l.dispose-if-Symbol.asyncDispose-exists.js |   93 ++
 ...lobal-closure-get-before-initialization.js |   23 +
 ...initialization-in-declaration-statement.js |   20 +
 ...efore-initialization-in-prior-statement.js |   20 +
 ...pose-called-at-end-of-asyncfunctionbody.js |  106 ++
 ...ose-called-at-end-of-asyncgeneratorbody.js |  108 ++
 ...bol.asyncDispose-called-at-end-of-block.js |   59 +
 ...end-of-each-iteration-of-forofstatement.js |   85 ++
 ...ncDispose-called-at-end-of-forstatement.js |   63 +
 ...initializer-throws-in-forstatement-head.js |   69 +
 ...called-if-subsequent-initializer-throws.js |   63 +
 ...pose-called-at-end-of-asyncfunctionbody.js |  106 ++
 ...ose-called-at-end-of-asyncgeneratorbody.js |  108 ++
 ...r-Symbol.dispose-called-at-end-of-block.js |   59 +
 ...end-of-each-iteration-of-forofstatement.js |   85 ++
 ...l.dispose-called-at-end-of-forstatement.js |   63 +
 ...initializer-throws-in-forstatement-head.js |   69 +
 ...called-if-subsequent-initializer-throws.js |   63 +
 ...ple-resources-disposed-in-reverse-order.js |   60 +
 ...sposableresourcestack-multiple-bindings.js |   74 +
 ...sposableresourcestack-subsequent-usings.js |   69 +
 ...within-strict-mode-function-await-using.js |   17 +
 .../language/statements/await-using/shell.js  |  402 ++++++
 ...sing-invalid-switchstatement-caseclause.js |   27 +
 ...g-invalid-switchstatement-defaultclause.js |   27 +
 ...as-is-if-only-one-error-during-disposal.js |   57 +
 ...er-Symbol.asyncDispose-property-is-null.js |   79 +
 ...mbol.asyncDispose-property-is-undefined.js |   79 +
 ...mbol.asyncDispose-property-not-callable.js |  100 ++
 ...ializer-Symbol.dispose-property-is-null.js |   79 +
 ...er-Symbol.dispose-property-is-undefined.js |   79 +
 ...er-Symbol.dispose-property-not-callable.js |  100 ++
 ...-Symbol.asyncDispose-and-Symbol.dispose.js |   80 ++
 ...rror-if-multiple-errors-during-disposal.js |   58 +
 .../statements/using/Symbol.dispose-getter.js |   90 ++
 ...dispose-method-called-with-correct-this.js |   53 +
 ...local-closure-get-before-initialization.js |   23 +
 ...initialization-in-declaration-statement.js |   19 +
 ...efore-initialization-in-prior-statement.js |   19 +
 .../language/statements/using/cptn-value.js   |   29 +
 .../statements/using/fn-name-arrow.js         |   29 +
 .../statements/using/fn-name-class.js         |   31 +
 .../statements/using/fn-name-cover.js         |   33 +
 .../language/statements/using/fn-name-fn.js   |   32 +
 .../language/statements/using/fn-name-gen.js  |   32 +
 ...local-closure-get-before-initialization.js |   23 +
 ...initialization-in-declaration-statement.js |   19 +
 ...efore-initialization-in-prior-statement.js |   19 +
 ...nitializer-Symbol.dispose-property-once.js |   87 ++
 ...lobal-closure-get-before-initialization.js |   23 +
 ...initialization-in-declaration-statement.js |   18 +
 ...efore-initialization-in-prior-statement.js |   18 +
 ...er-disposed-at-end-of-asyncfunctionbody.js |  106 ++
 ...r-disposed-at-end-of-asyncgeneratorbody.js |  108 ++
 .../initializer-disposed-at-end-of-block.js   |   57 +
 ...-end-of-each-iteration-of-forofstatementjs |   80 ++
 ...ializer-disposed-at-end-of-forstatement.js |   61 +
 ...ializer-disposed-at-end-of-functionbody.js |   58 +
 ...alizer-disposed-at-end-of-generatorbody.js |   93 ++
 ...initializer-throws-in-forstatement-head.js |   67 +
 ...sposed-if-subsequent-initializer-throws.js |   61 +
 ...ple-resources-disposed-in-reverse-order.js |   58 +
 ...sposableresourcestack-multiple-bindings.js |   72 +
 ...sposableresourcestack-subsequent-usings.js |   67 +
 ...-from-within-strict-mode-function-using.js |   17 +
 .../language/statements/using/shell.js        |  107 ++
 .../static-init-await-binding-invalid.js      |   28 +
 .../using/static-init-await-binding-valid.js  |   22 +
 ...sing-invalid-switchstatement-caseclause.js |   25 +
 ...g-invalid-switchstatement-defaultclause.js |   25 +
 ...as-is-if-only-one-error-during-disposal.js |   55 +
 ...ializer-Symbol.dispose-property-is-null.js |   75 +
 ...er-Symbol.dispose-property-is-undefined.js |   75 +
 ...er-Symbol.dispose-property-not-callable.js |   96 ++
 ...s-if-initializer-missing-Symbol.dispose.js |   68 +
 ...rror-if-multiple-errors-during-disposal.js |   56 +
 .../using/using-allows-null-initializer.js    |   47 +
 .../using-allows-undefined-initializer.js     |   47 +
 .../staging/Temporal/v8/calendar-date-add.js  |   90 --
 .../Temporal/v8/calendar-date-from-fields.js  |  428 ------
 .../Temporal/v8/calendar-date-until.js        |  159 --
 .../Temporal/v8/calendar-day-of-year.js       |   34 -
 .../Temporal/v8/calendar-days-in-month.js     |   55 -
 .../Temporal/v8/calendar-days-in-week.js      |   17 -
 .../Temporal/v8/calendar-days-in-year.js      |   44 -
 .../Temporal/v8/calendar-in-leap-year.js      |   44 -
 .../Temporal/v8/calendar-month-code.js        |   19 -
 .../v8/calendar-month-day-from-fields.js      |  425 ------
 .../staging/Temporal/v8/calendar-month.js     |   19 -
 .../Temporal/v8/calendar-months-in-year.js    |   20 -
 .../Temporal/v8/calendar-week-of-year.js      |   52 -
 .../v8/calendar-year-month-from-fields.js     |  229 ---
 .../staging/Temporal/v8/duration-abs.js       |   23 -
 .../staging/Temporal/v8/duration-add.js       |   29 -
 .../Temporal/v8/duration-constructor.js       |   52 -
 .../staging/Temporal/v8/duration-from.js      |  146 --
 .../staging/Temporal/v8/duration-negated.js   |   25 -
 .../v8/duration-to-json-boundary-cases.js     |   69 -
 .../staging/Temporal/v8/duration-to-json.js   |  121 --
 .../staging/Temporal/v8/duration-value-of.js  |   16 -
 .../staging/Temporal/v8/duration-with.js      |  109 --
 .../staging/Temporal/v8/instant-add.js        |   35 -
 .../staging/Temporal/v8/instant-compare.js    |   22 -
 .../Temporal/v8/instant-constructor.js        |   44 -
 .../v8/instant-from-epoch-milliseconds.js     |   29 -
 .../v8/instant-from-epoch-nanoseconds.js      |   30 -
 .../staging/Temporal/v8/instant-subtract.js   |   35 -
 .../staging/Temporal/v8/instant-value-of.js   |   16 -
 .../staging/Temporal/v8/plain-date-add.js     |   28 -
 .../staging/Temporal/v8/plain-date-compare.js |   34 -
 .../Temporal/v8/plain-date-constructor.js     |   78 -
 .../staging/Temporal/v8/plain-date-equals.js  |   22 -
 .../staging/Temporal/v8/plain-date-from.js    |   85 --
 .../Temporal/v8/plain-date-get-iso-fields.js  |   29 -
 .../Temporal/v8/plain-date-time-add.js        |   39 -
 .../Temporal/v8/plain-date-time-compare.js    |   37 -
 .../v8/plain-date-time-constructor.js         |  105 --
 .../Temporal/v8/plain-date-time-equals.js     |   37 -
 .../Temporal/v8/plain-date-time-from.js       |  152 --
 .../Temporal/v8/plain-date-time-subtract.js   |   39 -
 .../Temporal/v8/plain-date-time-to-json.js    |   55 -
 .../v8/plain-date-time-to-plain-time.js       |   19 -
 .../Temporal/v8/plain-date-time-value-of.js   |   16 -
 .../v8/plain-date-time-with-plain-time.js     |   37 -
 .../Temporal/v8/plain-date-time-with.js       |   59 -
 .../staging/Temporal/v8/plain-date-to-json.js |   24 -
 .../v8/plain-date-to-plain-date-time.js       |   43 -
 .../v8/plain-date-to-plain-month-day.js       |   19 -
 .../v8/plain-date-to-plain-year-month.js      |   19 -
 .../Temporal/v8/plain-date-value-of.js        |   16 -
 .../staging/Temporal/v8/plain-date-with.js    |   61 -
 .../test262/staging/Temporal/v8/shell.js      | 1259 ----------------
 .../from-chinese-leap-month-uncommon.js       |   67 -
 .../sm/Temporal/PlainMonthDay/from-chinese.js |   67 -
 .../sm/Temporal/PlainMonthDay/from-coptic.js  |   40 -
 .../result-not-after-1972-dec-31.js           |   86 --
 .../sm/Temporal/PlainMonthDay/shell.js        |   50 -
 .../sm/Temporal/ZonedDateTime/browser.js      |    0
 .../sm/Temporal/ZonedDateTime/shell.js        |    0
 .../Temporal/ZonedDateTime/zones-and-links.js |  674 ---------
 .../test262/staging/sm/Temporal/browser.js    |    0
 .../test262/staging/sm/Temporal/shell.js      |    0
 .../sm/TypedArray/toLocaleString-detached.js  |    4 +-
 .../staging/sm/extensions/regress-645160.js   |   18 -
 618 files changed, 22334 insertions(+), 7062 deletions(-)
 create mode 100644 js/src/tests/test262/built-ins/String/fromCharCode/touint16-tonumber-throws-bigint.js
 create mode 100644 js/src/tests/test262/built-ins/String/fromCharCode/touint16-tonumber-throws-valueof.js
 create mode 100644 js/src/tests/test262/built-ins/String/prototype/lastIndexOf/not-a-substring.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/Duration/compare/relativeto-argument-propertybag-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/Duration/compare/relativeto-argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/Duration/compare/relativeto-no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/Duration/from/argument-propertybag.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-argument-propertybag-calendar-invalid-iso-string.js
 rename js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/{relativeto-propertybag-calendar-invalid-iso-string.js => relativeto-argument-string-calendar-invalid-iso-string.js} (61%)
 create mode 100644 js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-no-fractional-minutes-hours.js
 rename js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/{relativeto-propertybag-calendar-invalid-iso-string.js => relativeto-argument-propertybag-calendar-invalid-iso-string.js} (63%)
 create mode 100644 js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/Instant/compare/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/Instant/from/no-fractional-minutes-hours.js
 rename js/src/tests/test262/{staging/Temporal/v8/instant-equals.js => built-ins/Temporal/Instant/prototype/equals/basic.js} (70%)
 create mode 100644 js/src/tests/test262/built-ins/Temporal/Instant/prototype/equals/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/Instant/prototype/since/no-fractional-minutes-hours.js
 rename js/src/tests/test262/{staging/Temporal/v8/instant-to-json.js => built-ins/Temporal/Instant/prototype/toJSON/fromEpochMilliseconds.js} (68%)
 create mode 100644 js/src/tests/test262/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/no-observable-array-iteration.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/Instant/prototype/until/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/compare/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/compare/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/from/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/from/month-code-wrong-type.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/from/negative-month-or-day.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/from/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/from/options-basic.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/from/overflow-reject.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/add/argument-duration-max-plus-min-date.js
 rename js/src/tests/test262/{staging/Temporal/v8/calendar-day.js => built-ins/Temporal/PlainDate/prototype/day/basic.js} (52%)
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/equals/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/equals/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/month/basic.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/monthCode/basic.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/since/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/since/basic-arithmetic.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/since/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/since/throws-with-time-units.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/subtract/argument-duration-max-plus-min-date.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/no-observable-array-iteration.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/until/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/until/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/until/throws-with-time-units.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/with/time-units-ignored.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/withCalendar/calendar-time-string.js
 rename js/src/tests/test262/{staging/Temporal/v8/calendar-year.js => built-ins/Temporal/PlainDate/prototype/year/basic.js} (52%)
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/argument-convert.js
 rename js/src/tests/test262/{staging/Temporal/v8/plain-date-time-get-iso-fields.js => built-ins/Temporal/PlainDateTime/basic.js} (68%)
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/compare/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/compare/argument-string-invalid.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/compare/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/month-code-wrong-type.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/negative-month-or-day.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/add/argument-duration-max-plus-min-date.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/day/basic.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/equals/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/equals/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/month/basic.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/monthCode/basic.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/since/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/since/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/subtract/argument-duration-max-plus-min-date.js
 rename js/src/tests/test262/{staging/Temporal/v8/plain-date-time-to-plain-date.js => built-ins/Temporal/PlainDateTime/prototype/toPlainDate/basic.js} (64%)
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/no-observable-array-iteration.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/until/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/until/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/withCalendar/calendar-time-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/year/basic.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainMonthDay/argument-convert.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainMonthDay/from/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainMonthDay/from/negative-month-or-day.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainMonthDay/from/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainMonthDay/prototype/equals/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainMonthDay/prototype/equals/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainTime/argument-convert.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainTime/compare/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainTime/from/argument-string-invalid.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainTime/from/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainTime/prototype/round/roundingincrement-divides.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/argument-convert.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/compare/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/compare/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/month-code-wrong-type.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/negative-month.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/no-fractional-minutes-hours.js
 delete mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-string-negative-fractional-units.js
 delete mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/month-length.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/overflow.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/equals/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/equals/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/month/basic.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/monthCode/basic.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/since/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/since/no-fractional-minutes-hours.js
 delete mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-string-negative-fractional-units.js
 delete mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/month-length.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/overflow.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/until/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/until/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/year/basic.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/argument-convert.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/compare/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/compare/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-timezone-object.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/argument-string-invalid.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/month-code-wrong-type.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/negative-month-or-day.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/add/argument-duration-max-plus-min-date.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/day/basic.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/dayOfYear/basic.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/daysInMonth/basic.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/daysInWeek/basic.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/equals/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/equals/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/month/basic.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/monthCode/basic.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/monthsInYear/basic.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/since/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/since/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/subtract/argument-duration-max-plus-min-date.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/until/argument-string-calendar-invalid-iso-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/until/no-fractional-minutes-hours.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/weekOfYear/basic.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/withCalendar/calendar-time-string.js
 create mode 100644 js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/year/basic.js
 create mode 100644 js/src/tests/test262/intl402/DateTimeFormat/prototype/format/temporal-plaindate-formatting-timezonename.js
 create mode 100644 js/src/tests/test262/intl402/DateTimeFormat/prototype/format/temporal-plaindatetime-formatting-timezonename.js
 create mode 100644 js/src/tests/test262/intl402/DateTimeFormat/prototype/format/temporal-plainmonthday-formatting-timezonename.js
 create mode 100644 js/src/tests/test262/intl402/DateTimeFormat/prototype/format/temporal-plaintime-formatting-timezonename.js
 create mode 100644 js/src/tests/test262/intl402/DateTimeFormat/prototype/format/temporal-plainyearmonth-formatting-timezonename.js
 create mode 100644 js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRange/temporal-plaindate-formatting-timezonename.js
 create mode 100644 js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRange/temporal-plaindatetime-formatting-timezonename.js
 create mode 100644 js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRange/temporal-plainmonthday-formatting-timezonename.js
 create mode 100644 js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRange/temporal-plaintime-formatting-timezonename.js
 create mode 100644 js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRange/temporal-plainyearmonth-formatting-timezonename.js
 create mode 100644 js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/temporal-plaindate-formatting-timezonename.js
 create mode 100644 js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/temporal-plaindatetime-formatting-timezonename.js
 create mode 100644 js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/temporal-plainmonthday-formatting-timezonename.js
 create mode 100644 js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/temporal-plaintime-formatting-timezonename.js
 create mode 100644 js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/temporal-plainyearmonth-formatting-timezonename.js
 create mode 100644 js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/temporal-plaindate-formatting-timezonename.js
 create mode 100644 js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/temporal-plaindatetime-formatting-timezonename.js
 create mode 100644 js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/temporal-plainmonthday-formatting-timezonename.js
 create mode 100644 js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/temporal-plaintime-formatting-timezonename.js
 create mode 100644 js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/temporal-plainyearmonth-formatting-timezonename.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/Instant/prototype/toLocaleString/datestyle-and-timestyle.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/Instant/prototype/toLocaleString/hourcycle.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainDate/from/calendar-invalid-era-with-era-year.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainDate/from/calendar-invalid-era.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainDate/prototype/since/wrapping-at-end-of-month-hebrew.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainDate/prototype/toLocaleString/datestyle-and-timestyle.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainDate/prototype/until/wrapping-at-end-of-month-hebrew.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withCalendar/calendar-time-string.js
 rename js/src/tests/test262/{staging/Temporal/v8/plain-date-with-calendar.js => intl402/Temporal/PlainDate/prototype/withCalendar/roundtrip-from-iso8601.js} (71%)
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withPlainTime/basic-roc.js
 rename js/src/tests/test262/{staging/sm/Temporal/PlainMonthDay => intl402/Temporal/PlainDate/prototype/withPlainTime}/browser.js (100%)
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withPlainTime/shell.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainDateTime/from/calendar-invalid-era-with-era-year.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainDateTime/from/calendar-invalid-era.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/since/wrapping-at-end-of-month-hebrew.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/toLocaleString/datestyle-and-timestyle.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/toLocaleString/hourcycle.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/adjusted-dates.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/wrapping-at-end-of-month-hebrew.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/withCalendar/calendar-time-string.js
 rename js/src/tests/test262/{staging/Temporal/v8/plain-date-time-with-calendar.js => intl402/Temporal/PlainDateTime/prototype/withCalendar/roundtrip-from-iso8601.js} (72%)
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainMonthDay/prototype/toLocaleString/datestyle-and-timestyle.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainTime/prototype/toLocaleString/datestyle-and-timestyle.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainTime/prototype/toLocaleString/hourcycle.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/extreme-unsupported-dates.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-months-chinese.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-months-dangi.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-months-hebrew.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-buddhist.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-coptic.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-ethioaa.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-ethiopic.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-gregory.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-indian.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-islamic-civil.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-islamic-tbla.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-japanese.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-persian.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-roc.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-months-chinese.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-months-dangi.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-months-hebrew.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-buddhist.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-coptic.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-ethioaa.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-ethiopic.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-gregory.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-indian.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-islamic-civil.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-islamic-tbla.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-japanese.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-persian.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-roc.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/toLocaleString/datestyle-and-timestyle.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/ZonedDateTime/from/calendar-invalid-era-with-era-year.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/ZonedDateTime/from/calendar-invalid-era.js
 delete mode 100644 js/src/tests/test262/intl402/Temporal/ZonedDateTime/links-africa.js
 delete mode 100644 js/src/tests/test262/intl402/Temporal/ZonedDateTime/links-asia.js
 delete mode 100644 js/src/tests/test262/intl402/Temporal/ZonedDateTime/links-australasia.js
 delete mode 100644 js/src/tests/test262/intl402/Temporal/ZonedDateTime/links-europe.js
 delete mode 100644 js/src/tests/test262/intl402/Temporal/ZonedDateTime/links-northamerica.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/ZonedDateTime/links.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/add/offset-before-1883.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/since/wrapping-at-end-of-month-hebrew.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/subtract/offset-before-1883.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/toLocaleString/datestyle-and-timestyle.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/toLocaleString/hourcycle.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/toLocaleString/offset-time-zones.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/toString/timezone.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/until/wrapping-at-end-of-month-hebrew.js
 create mode 100644 js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/withCalendar/calendar-time-string.js
 create mode 100644 js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-exported-then-super-get.js
 create mode 100644 js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-exported-then-super-property-define.js
 create mode 100644 js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-not-exported-then-super-get.js
 create mode 100644 js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-not-exported-then-super-property-define.js
 create mode 100644 js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-super-property-set-exported.js
 create mode 100644 js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-super-property-set-not-exported.js
 create mode 100644 js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-symbol-other-super-get.js
 create mode 100644 js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-symbol-other-super-property-define.js
 create mode 100644 js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-symbol-toStringTag-super-get.js
 create mode 100644 js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-symbol-toStringTag-super-property-define.js
 create mode 100644 js/src/tests/test262/language/import/import-defer/evaluation-triggers/trigger-exported-string-super-get.js
 create mode 100644 js/src/tests/test262/language/import/import-defer/evaluation-triggers/trigger-exported-string-super-property-define.js
 create mode 100644 js/src/tests/test262/language/import/import-defer/evaluation-triggers/trigger-not-exported-string-super-get.js
 create mode 100644 js/src/tests/test262/language/import/import-defer/evaluation-triggers/trigger-not-exported-string-super-property-define.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/Symbol.asyncDispose-getter.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/Symbol.asyncDispose-method-called-with-correct-this.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/Symbol.asyncDispose-method-not-async.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/Symbol.dispose-getter.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/Symbol.dispose-method-called-with-correct-this.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/await-using-Symbol.asyncDispose-allows-non-promise-return-value.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/await-using-Symbol.asyncDispose-allows-promiselike-return-value.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/await-using-allows-null-initializer.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/await-using-allows-undefined-initializer.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/await-using-does-not-imply-await-if-not-evaluated.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/await-using-implies-await-if-evaluated.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/block-local-closure-get-before-initialization.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/block-local-use-before-initialization-in-declaration-statement.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/block-local-use-before-initialization-in-prior-statement.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/fn-name-arrow.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/fn-name-class.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/fn-name-cover.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/fn-name-fn.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/fn-name-gen.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/function-local-closure-get-before-initialization.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/function-local-use-before-initialization-in-declaration-statement.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/function-local-use-before-initialization-in-prior-statement.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/gets-initializer-Symbol.asyncDispose-property-once.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/gets-initializer-Symbol.dispose-after-Symbol.asyncDispose-is-null.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/gets-initializer-Symbol.dispose-after-Symbol.asyncDispose-is-undefined.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/gets-initializer-Symbol.dispose-property-once.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/gets-initializer-does-not-read-Symbol.dispose-if-Symbol.asyncDispose-exists.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/global-closure-get-before-initialization.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/global-use-before-initialization-in-declaration-statement.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/global-use-before-initialization-in-prior-statement.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-at-end-of-asyncfunctionbody.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-at-end-of-asyncgeneratorbody.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-at-end-of-block.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-at-end-of-each-iteration-of-forofstatement.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-at-end-of-forstatement.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-if-subsequent-initializer-throws-in-forstatement-head.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-if-subsequent-initializer-throws.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-at-end-of-asyncfunctionbody.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-at-end-of-asyncgeneratorbody.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-at-end-of-block.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-at-end-of-each-iteration-of-forofstatement.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-at-end-of-forstatement.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-if-subsequent-initializer-throws-in-forstatement-head.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-if-subsequent-initializer-throws.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/multiple-resources-disposed-in-reverse-order.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/puts-initializer-on-top-of-disposableresourcestack-multiple-bindings.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/puts-initializer-on-top-of-disposableresourcestack-subsequent-usings.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/redeclaration-error-from-within-strict-mode-function-await-using.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/syntax/await-using-invalid-switchstatement-caseclause.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/syntax/await-using-invalid-switchstatement-defaultclause.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/throws-error-as-is-if-only-one-error-during-disposal.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.asyncDispose-property-is-null.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.asyncDispose-property-is-undefined.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.asyncDispose-property-not-callable.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.dispose-property-is-null.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.dispose-property-is-undefined.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.dispose-property-not-callable.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/throws-if-initializer-missing-both-Symbol.asyncDispose-and-Symbol.dispose.js
 create mode 100644 js/src/tests/test262/language/statements/await-using/throws-suppressederror-if-multiple-errors-during-disposal.js
 create mode 100644 js/src/tests/test262/language/statements/using/Symbol.dispose-getter.js
 create mode 100644 js/src/tests/test262/language/statements/using/Symbol.dispose-method-called-with-correct-this.js
 create mode 100644 js/src/tests/test262/language/statements/using/block-local-closure-get-before-initialization.js
 create mode 100644 js/src/tests/test262/language/statements/using/block-local-use-before-initialization-in-declaration-statement.js
 create mode 100644 js/src/tests/test262/language/statements/using/block-local-use-before-initialization-in-prior-statement.js
 create mode 100644 js/src/tests/test262/language/statements/using/cptn-value.js
 create mode 100644 js/src/tests/test262/language/statements/using/fn-name-arrow.js
 create mode 100644 js/src/tests/test262/language/statements/using/fn-name-class.js
 create mode 100644 js/src/tests/test262/language/statements/using/fn-name-cover.js
 create mode 100644 js/src/tests/test262/language/statements/using/fn-name-fn.js
 create mode 100644 js/src/tests/test262/language/statements/using/fn-name-gen.js
 create mode 100644 js/src/tests/test262/language/statements/using/function-local-closure-get-before-initialization.js
 create mode 100644 js/src/tests/test262/language/statements/using/function-local-use-before-initialization-in-declaration-statement.js
 create mode 100644 js/src/tests/test262/language/statements/using/function-local-use-before-initialization-in-prior-statement.js
 create mode 100644 js/src/tests/test262/language/statements/using/gets-initializer-Symbol.dispose-property-once.js
 create mode 100644 js/src/tests/test262/language/statements/using/global-closure-get-before-initialization.js
 create mode 100644 js/src/tests/test262/language/statements/using/global-use-before-initialization-in-declaration-statement.js
 create mode 100644 js/src/tests/test262/language/statements/using/global-use-before-initialization-in-prior-statement.js
 create mode 100644 js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-asyncfunctionbody.js
 create mode 100644 js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-asyncgeneratorbody.js
 create mode 100644 js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-block.js
 create mode 100644 js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-each-iteration-of-forofstatementjs
 create mode 100644 js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-forstatement.js
 create mode 100644 js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-functionbody.js
 create mode 100644 js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-generatorbody.js
 create mode 100644 js/src/tests/test262/language/statements/using/initializer-disposed-if-subsequent-initializer-throws-in-forstatement-head.js
 create mode 100644 js/src/tests/test262/language/statements/using/initializer-disposed-if-subsequent-initializer-throws.js
 create mode 100644 js/src/tests/test262/language/statements/using/multiple-resources-disposed-in-reverse-order.js
 create mode 100644 js/src/tests/test262/language/statements/using/puts-initializer-on-top-of-disposableresourcestack-multiple-bindings.js
 create mode 100644 js/src/tests/test262/language/statements/using/puts-initializer-on-top-of-disposableresourcestack-subsequent-usings.js
 create mode 100644 js/src/tests/test262/language/statements/using/redeclaration-error-from-within-strict-mode-function-using.js
 create mode 100644 js/src/tests/test262/language/statements/using/static-init-await-binding-invalid.js
 create mode 100644 js/src/tests/test262/language/statements/using/static-init-await-binding-valid.js
 create mode 100644 js/src/tests/test262/language/statements/using/syntax/using-invalid-switchstatement-caseclause.js
 create mode 100644 js/src/tests/test262/language/statements/using/syntax/using-invalid-switchstatement-defaultclause.js
 create mode 100644 js/src/tests/test262/language/statements/using/throws-error-as-is-if-only-one-error-during-disposal.js
 create mode 100644 js/src/tests/test262/language/statements/using/throws-if-initializer-Symbol.dispose-property-is-null.js
 create mode 100644 js/src/tests/test262/language/statements/using/throws-if-initializer-Symbol.dispose-property-is-undefined.js
 create mode 100644 js/src/tests/test262/language/statements/using/throws-if-initializer-Symbol.dispose-property-not-callable.js
 create mode 100644 js/src/tests/test262/language/statements/using/throws-if-initializer-missing-Symbol.dispose.js
 create mode 100644 js/src/tests/test262/language/statements/using/throws-suppressederror-if-multiple-errors-during-disposal.js
 create mode 100644 js/src/tests/test262/language/statements/using/using-allows-null-initializer.js
 create mode 100644 js/src/tests/test262/language/statements/using/using-allows-undefined-initializer.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/calendar-date-add.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/calendar-date-from-fields.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/calendar-date-until.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/calendar-day-of-year.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/calendar-days-in-month.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/calendar-days-in-week.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/calendar-days-in-year.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/calendar-in-leap-year.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/calendar-month-code.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/calendar-month-day-from-fields.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/calendar-month.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/calendar-months-in-year.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/calendar-week-of-year.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/calendar-year-month-from-fields.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/duration-abs.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/duration-add.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/duration-constructor.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/duration-from.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/duration-negated.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/duration-to-json-boundary-cases.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/duration-to-json.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/duration-value-of.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/duration-with.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/instant-add.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/instant-compare.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/instant-constructor.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/instant-from-epoch-milliseconds.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/instant-from-epoch-nanoseconds.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/instant-subtract.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/instant-value-of.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-add.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-compare.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-constructor.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-equals.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-from.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-get-iso-fields.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-time-add.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-time-compare.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-time-constructor.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-time-equals.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-time-from.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-time-subtract.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-time-to-json.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-time-to-plain-time.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-time-value-of.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-time-with-plain-time.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-time-with.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-to-json.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-to-plain-date-time.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-to-plain-month-day.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-to-plain-year-month.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-value-of.js
 delete mode 100644 js/src/tests/test262/staging/Temporal/v8/plain-date-with.js
 delete mode 100644 js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/from-chinese-leap-month-uncommon.js
 delete mode 100644 js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/from-chinese.js
 delete mode 100644 js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/from-coptic.js
 delete mode 100644 js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/result-not-after-1972-dec-31.js
 delete mode 100644 js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/shell.js
 delete mode 100644 js/src/tests/test262/staging/sm/Temporal/ZonedDateTime/browser.js
 delete mode 100644 js/src/tests/test262/staging/sm/Temporal/ZonedDateTime/shell.js
 delete mode 100644 js/src/tests/test262/staging/sm/Temporal/ZonedDateTime/zones-and-links.js
 delete mode 100644 js/src/tests/test262/staging/sm/Temporal/browser.js
 delete mode 100644 js/src/tests/test262/staging/sm/Temporal/shell.js
 delete mode 100644 js/src/tests/test262/staging/sm/extensions/regress-645160.js

diff --git a/js/src/tests/test262/GIT-INFO b/js/src/tests/test262/GIT-INFO
index 7607486ff76f8..619b8056c49fd 100644
--- a/js/src/tests/test262/GIT-INFO
+++ b/js/src/tests/test262/GIT-INFO
@@ -1,9 +1,13 @@
-commit 4869a68f71f9ea4c1b50ac7b1283e1fc81525581
-Author: Frank Yung-Fong Tang <ftang@chromium.org>
-Date:   Wed Dec 10 08:37:46 2025 -0800
+commit 677ee2634952e762ca57ffcb8fffee91692c7517
+Author: André Bargull <andre.bargull@gmail.com>
+Date:   Thu Jan 29 14:19:46 2026 +0100
 
-    Add test for ECMA402 PR 1015 to verify  (new Intl.Segmenter()).segment("123")[Symbol.iterator].name (#4635)
+    Allow Intl.DisplayNames to support calendars not returned by Intl.supportedValuesOf
     
-    * Add test for ECMA402 PR 1015
+    Change the assertion so that if a calendar is not supported, then it
+    must be a calendar not returned by `Intl.supportedValuesOf("calendar")`.
     
-    https://github.com/tc39/ecma402/pull/1015
+    This allows for example implementations to provide a display name for
+    `"islamic"`.
+    
+    See <https://github.com/tc39/ecma402/issues/1042>.
diff --git a/js/src/tests/test262/built-ins/Array/fromAsync/shell.js b/js/src/tests/test262/built-ins/Array/fromAsync/shell.js
index 9dd780b6d8292..bae26d4551b03 100644
--- a/js/src/tests/test262/built-ins/Array/fromAsync/shell.js
+++ b/js/src/tests/test262/built-ins/Array/fromAsync/shell.js
@@ -370,6 +370,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/built-ins/Array/prototype/fill/coerced-indexes.js b/js/src/tests/test262/built-ins/Array/prototype/fill/coerced-indexes.js
index 3cf5954171f88..cf027e44d4161 100644
--- a/js/src/tests/test262/built-ins/Array/prototype/fill/coerced-indexes.js
+++ b/js/src/tests/test262/built-ins/Array/prototype/fill/coerced-indexes.js
@@ -5,16 +5,15 @@ esid: sec-array.prototype.fill
 description: >
   Fills elements from coerced to Integer `start` and `end` values
 info: |
-  22.1.3.6 Array.prototype.fill (value [ , start [ , end ] ] )
-
-  ...
-  7. Let relativeStart be ToInteger(start).
-  8. ReturnIfAbrupt(relativeStart).
-  9. If relativeStart < 0, let k be max((len + relativeStart),0); else let k be
-  min(relativeStart, len).
-  10. If end is undefined, let relativeEnd be len; else let relativeEnd be
-  ToInteger(end).
-  ...
+  Array.prototype.fill ( _value_ [ , _start_ [ , _end_ ] ] )
+
+  3. Let _relativeStart_ be ? ToIntegerOrInfinity(_start_).
+  4. If _relativeStart_ = -∞, let _k_ be 0.
+  5. Else if _relativeStart_ &lt; 0, let _k_ be max(_len_ + _relativeStart_, 0).
+  
+  7. If _end_ is *undefined*, let _relativeEnd_ be _len_; else let _relativeEnd_ be ? ToIntegerOrInfinity(_end_).
+  8. If _relativeEnd_ = -∞, let _final_ be 0.
+
 includes: [compareArray.js]
 ---*/
 
@@ -74,4 +73,12 @@ assert.compareArray([0, 0].fill(1, 0, 1.5), [1, 0],
   '[0, 0].fill(1, 0, 1.5) must return [1, 0]'
 );
 
+assert.compareArray([0, 0].fill(1, Number.NEGATIVE_INFINITY, 1), [1, 0],
+  '[0, 0].fill(1, Number.NEGATIVE_INFINITY, 1) must return [1, 0]'
+);
+
+assert.compareArray([0, 0].fill(1, 0, Number.NEGATIVE_INFINITY), [0, 0],
+  '[0, 0].fill(1, 0, Number.NEGATIVE_INFINITY) must return [0, 0]'
+);
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Array/prototype/flat/non-numeric-depth-should-not-throw.js b/js/src/tests/test262/built-ins/Array/prototype/flat/non-numeric-depth-should-not-throw.js
index fb86d87595e1f..ae39a115d7555 100644
--- a/js/src/tests/test262/built-ins/Array/prototype/flat/non-numeric-depth-should-not-throw.js
+++ b/js/src/tests/test262/built-ins/Array/prototype/flat/non-numeric-depth-should-not-throw.js
@@ -42,4 +42,9 @@ actual = a.flat(depthNum);
 expected = [1, 2]
 assert.compareArray(actual, expected, 'The value of actual is expected to equal the value of expected');
 
+// undefined depthNum uses the default value of 1
+actual = a.flat(undefined);
+expected = [1, 2];
+assert.compareArray(actual, expected, 'a.flat(undefined) uses default depth of 1');
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Iterator/from/shell.js b/js/src/tests/test262/built-ins/Iterator/from/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/built-ins/Iterator/from/shell.js
+++ b/js/src/tests/test262/built-ins/Iterator/from/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/built-ins/NativeErrors/cause_property_native_error.js b/js/src/tests/test262/built-ins/NativeErrors/cause_property_native_error.js
index bbc5812e4ebdc..1be98f688a4b6 100644
--- a/js/src/tests/test262/built-ins/NativeErrors/cause_property_native_error.js
+++ b/js/src/tests/test262/built-ins/NativeErrors/cause_property_native_error.js
@@ -42,6 +42,7 @@ for (var i = 0; i < nativeErrors.length; ++i) {
 
   verifyProperty(new nativeError(message), "cause", undefined);
   verifyProperty(new nativeError(message, { cause: undefined }), "cause", { value: undefined });
+  verifyProperty(new nativeError(message, {}), "cause", undefined);
 }
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/String/fromCharCode/touint16-tonumber-throws-bigint.js b/js/src/tests/test262/built-ins/String/fromCharCode/touint16-tonumber-throws-bigint.js
new file mode 100644
index 0000000000000..b9dab3fb8932a
--- /dev/null
+++ b/js/src/tests/test262/built-ins/String/fromCharCode/touint16-tonumber-throws-bigint.js
@@ -0,0 +1,28 @@
+// Copyright (C) 2026 Hyunjoon Kim. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-string.fromcharcode
+description: >
+    String.fromCharCode propagates abrupt completion from ToNumber when argument is BigInt via ToUint16.
+info: |
+    String.fromCharCode ( ..._codeUnits_ )
+
+    2. For each element _next_ of _codeUnits_, do
+      a. Let _nextCU_ be the code unit whose numeric value is ℝ(? ToUint16(_next_)).
+
+    ToUint16 ( _argument_ )
+
+    1. Let _number_ be ? ToNumber(_argument_).
+
+    ToNumber ( _argument_ )
+    
+    2. If _argument_ is either a Symbol or a BigInt, throw a *TypeError* exception.
+features: [BigInt]
+---*/
+
+assert.throws(TypeError, function () {
+  String.fromCharCode(0n);
+}, "ToNumber throws when argument is BigInt, and String.fromCharCode must propagate it.");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/String/fromCharCode/touint16-tonumber-throws-valueof.js b/js/src/tests/test262/built-ins/String/fromCharCode/touint16-tonumber-throws-valueof.js
new file mode 100644
index 0000000000000..8daeec617178b
--- /dev/null
+++ b/js/src/tests/test262/built-ins/String/fromCharCode/touint16-tonumber-throws-valueof.js
@@ -0,0 +1,29 @@
+// Copyright (C) 2026 Hyunjoon Kim. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-string.fromcharcode
+description: >
+    String.fromCharCode propagates abrupt completion from ToNumber via ToUint16. (ToPrimitive/valueOf throws)
+info: |
+    String.fromCharCode ( ..._codeUnits_ )
+
+    2. For each element _next_ of _codeUnits_, do
+      a. Let _nextCU_ be the code unit whose numeric value is ℝ(? ToUint16(_next_)).
+
+    ToUint16 ( _argument_ )
+
+    1. Let _number_ be ? ToNumber(_argument_).
+
+    ToNumber ( _argument_ )
+    
+    8. Let _primValue_ be ? ToPrimitive(_argument_, ~number~).    
+---*/
+
+assert.throws(Test262Error, function () {
+  String.fromCharCode({
+    valueOf: function () { throw new Test262Error(); }
+  });
+}, "ToNumber throws when its argument's ToPrimitive step calls a throwing valueOf, and String.fromCharCode must propagate it.");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/String/prototype/lastIndexOf/not-a-substring.js b/js/src/tests/test262/built-ins/String/prototype/lastIndexOf/not-a-substring.js
new file mode 100644
index 0000000000000..abfb6524d17ce
--- /dev/null
+++ b/js/src/tests/test262/built-ins/String/prototype/lastIndexOf/not-a-substring.js
@@ -0,0 +1,23 @@
+// Copyright (C) 2026 Garham Lee. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-string.prototype.lastindexof
+description: >
+    String.prototype.lastIndexOf must be able to return -1
+info: |
+    String.prototype.lastIndexOf ( _searchString_ [ , _position_ ] )
+
+    12. Let _result_ be StringLastIndexOf(_S_, _searchStr_, _start_).
+
+    StringLastIndexOf (_string_, _searchValue_, _fromIndex_)
+
+    4. For each integer _i_ such that 0 ≤ _i_ ≤ _fromIndex_, in descending order, do
+        a. Let _candidate_ be the substring of _string_ from _i_ to _i_ + _searchLen_.
+        b. If _candidate_ is _searchValue_, return _i_.
+    5. Return ~not-found~.
+---*/
+
+assert.sameValue("abc".lastIndexOf("d"), -1, "String.prototype.lastIndexOf returns -1 when searchString is shorter than this and searchString is not a substring of this.");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/compare/relativeto-argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/Duration/compare/relativeto-argument-propertybag-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..3f9a488ae207b
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/compare/relativeto-argument-propertybag-calendar-invalid-iso-string.js
@@ -0,0 +1,28 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.duration.compare
+description: Invalid ISO string as calendar in relativeTo option should throw RangeError
+features: [Temporal]
+---*/
+
+const instance_1 = new Temporal.Duration(1);
+const instance_2 = new Temporal.Duration(2);
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["notacal", "Unknown calendar"],
+];
+
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 2019, monthCode: "M11", day: 1, calendar: cal };
+  assert.throws(
+    RangeError,
+    () => Temporal.Duration.compare(instance_1, instance_2, { relativeTo: arg }),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/compare/relativeto-argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/Duration/compare/relativeto-argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..5c00e39f45322
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/compare/relativeto-argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,28 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.duration.compare
+description: Invalid ISO string as calendar in relativeTo option should throw RangeError
+features: [Temporal]
+---*/
+
+const instance_1 = new Temporal.Duration(1);
+const instance_2 = new Temporal.Duration(2);
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => Temporal.Duration.compare(instance_1, instance_2, { relativeTo: arg }),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/compare/relativeto-no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/Duration/compare/relativeto-no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..55f54e3142067
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/compare/relativeto-no-fractional-minutes-hours.js
@@ -0,0 +1,27 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.duration.compare
+description: Fractional minutes or hours in time string in relativeTo option should throw RangeError
+features: [Temporal]
+---*/
+
+const instance1 = new Temporal.Duration(1, 0, 0, 0, 24)
+const instance2 = new Temporal.Duration(1, 0, 0, 0, 24)
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => Temporal.Duration.compare(instance1, instance2, { relativeTo: arg }),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/compare/relativeto-propertybag-invalid-offset-string.js b/js/src/tests/test262/built-ins/Temporal/Duration/compare/relativeto-propertybag-invalid-offset-string.js
index 3dfa6b72a38a3..317d79a22e1bd 100644
--- a/js/src/tests/test262/built-ins/Temporal/Duration/compare/relativeto-propertybag-invalid-offset-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/compare/relativeto-propertybag-invalid-offset-string.js
@@ -19,6 +19,7 @@ const badOffsets = [
   null,       // must be a string
   true,       // must be a string
   1000n,      // must be a string
+  "+00:0000", // separator must be consistent for hours/minutes and minutes/seconds
 ];
 badOffsets.forEach((offset) => {
   const relativeTo = { year: 2021, month: 10, day: 28, offset, timeZone: "UTC" };
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/compare/relativeto-string-zoneddatetime.js b/js/src/tests/test262/built-ins/Temporal/Duration/compare/relativeto-string-zoneddatetime.js
index f48784d3b5712..c0eda962f2dfb 100644
--- a/js/src/tests/test262/built-ins/Temporal/Duration/compare/relativeto-string-zoneddatetime.js
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/compare/relativeto-string-zoneddatetime.js
@@ -8,16 +8,23 @@ description: The relativeTo option accepts a ZonedDateTime-like ISO 8601 string
 features: [Temporal]
 ---*/
 
+const duration1 = new Temporal.Duration(0, 0, 0, 31);
+const duration2 = new Temporal.Duration(0, 1);
+
 [
   '2000-01-01[UTC]',
   '2000-01-01T00:00[UTC]',
   '2000-01-01T00:00+00:00[UTC]',
   '2000-01-01T00:00+00:00[UTC][u-ca=iso8601]',
 ].forEach((relativeTo) => {
-  const duration1 = new Temporal.Duration(0, 0, 0, 31);
-  const duration2 = new Temporal.Duration(0, 1);
   const result = Temporal.Duration.compare(duration1, duration2, { relativeTo });
   assert.sameValue(result, 0);
 });
 
+[
+  '2025-01-01T00:00:00+00:0000[UTC]'
+].forEach((relativeTo) => {
+  assert.throws(RangeError, () => Temporal.Duration.compare(duration1, duration2, { relativeTo }), "separators in offset are inconsistent");
+});
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/from/argument-non-string.js b/js/src/tests/test262/built-ins/Temporal/Duration/from/argument-non-string.js
index 3d53993e4e392..e9b87fd135cfd 100644
--- a/js/src/tests/test262/built-ins/Temporal/Duration/from/argument-non-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/from/argument-non-string.js
@@ -8,11 +8,35 @@ description: Appropriate error thrown if primitive input cannot convert to a val
 features: [Temporal]
 ---*/
 
-assert.throws(TypeError, () => Temporal.Duration.from(undefined), "undefined");
-assert.throws(TypeError, () => Temporal.Duration.from(null), "null");
-assert.throws(TypeError, () => Temporal.Duration.from(true), "boolean");
-assert.throws(TypeError, () => Temporal.Duration.from(Symbol()), "Symbol");
-assert.throws(TypeError, () => Temporal.Duration.from(5), "number");
-assert.throws(TypeError, () => Temporal.Duration.from(5n), "bigint");
+assert.throws(TypeError, () => Temporal.Duration.from(), "no argument");
+
+const primitiveTests = [
+  [undefined, "undefined"],
+  [null, "null"],
+  [true, "boolean"],
+  [1, "number that doesn't convert to a valid ISO string"],
+  [19761118, "number that would convert to a valid ISO string in other contexts"],
+  [1n, "bigint"],
+  [Symbol(), "symbol"],
+  [{}, "plain object"],
+  [Temporal.Duration, "Temporal.Duration, object"],
+  [Temporal.Duration.prototype, "Temporal.Duration.prototype, object"],
+];
+
+for (const [arg, description] of primitiveTests) {
+  assert.throws(
+    TypeError,
+    () => Temporal.Duration.from(arg),
+    `${description} does not convert to a valid ISO string`
+  );
+
+  for (const options of [undefined, { overflow: 'constrain' }, { overflow: 'reject' }]) {
+    assert.throws(
+      TypeError,
+      () => Temporal.Duration.from(arg, options),
+      `${description} does not convert to a valid ISO string with options ${options}`
+    );
+  }
+}
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/from/argument-propertybag.js b/js/src/tests/test262/built-ins/Temporal/Duration/from/argument-propertybag.js
new file mode 100644
index 0000000000000..80a750270fe47
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/from/argument-propertybag.js
@@ -0,0 +1,51 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright 2021 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.duration.from
+description: Basic propertybag arguments.
+includes: [temporalHelpers.js]
+features: [Temporal]
+---*/
+
+TemporalHelpers.assertDuration(Temporal.Duration.from({
+  years: 0,
+  months: 0,
+  weeks: 0,
+  days: 0,
+  hours: 0,
+  minutes: 0,
+  seconds: 0,
+  milliseconds: 0,
+  microseconds: 0,
+  nanoseconds: 0
+}), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+
+TemporalHelpers.assertDuration(Temporal.Duration.from({
+  years: 1,
+  months: 2,
+  weeks: 3,
+  days: 4,
+  hours: 5,
+  minutes: 6,
+  seconds: 7,
+  milliseconds: 8,
+  microseconds: 9,
+  nanoseconds: 10
+}), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+
+TemporalHelpers.assertDuration(Temporal.Duration.from({
+  years: -1,
+  months: -2,
+  weeks: -3,
+  days: -4,
+  hours: -5,
+  minutes: -6,
+  seconds: -7,
+  milliseconds: -8,
+  microseconds: -9,
+  nanoseconds: -10
+}), -1, -2, -3, -4, -5, -6, -7, -8, -9, -10);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/from/argument-string-fractional-units-rounding-mode.js b/js/src/tests/test262/built-ins/Temporal/Duration/from/argument-string-fractional-units-rounding-mode.js
index 65b257b3551d4..bcbdb292fca74 100644
--- a/js/src/tests/test262/built-ins/Temporal/Duration/from/argument-string-fractional-units-rounding-mode.js
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/from/argument-string-fractional-units-rounding-mode.js
@@ -17,6 +17,15 @@ const resultNegHours = Temporal.Duration.from("-PT1.03125H");
 TemporalHelpers.assertDuration(resultNegHours, 0, 0, 0, 0, -1, -1, -52, -500, 0, 0,
   "negative fractional hours rounded with correct rounding mode");
 
+const resultPosMinutes = Temporal.Duration.from('PT3.125M');
+TemporalHelpers.assertDuration(resultPosMinutes, 0, 0, 0, 0, 0, 3, 7, 500, 0, 0,
+  "positive fractional minutes rounded with correct rounding mode");
+
+const resultNegMinutes = Temporal.Duration.from('-PT3,025M');
+TemporalHelpers.assertDuration(resultNegMinutes, 0, 0, 0, 0, 0, -3, -1, -500, 0, 0,
+  "negative fractional minutes rounded with correct rounding mode");
+
+
 // The following input should not round, but may fail if an implementation does
 // floating point arithmetic too early:
 
@@ -28,4 +37,12 @@ const resultNegSeconds = Temporal.Duration.from("-PT46H66M71.50040904S");
 TemporalHelpers.assertDuration(resultNegSeconds, 0, 0, 0, 0, -46, -66, -71, -500, -409, -40,
   "negative fractional seconds not rounded");
 
+const resultPosSecondsWithDate = Temporal.Duration.from('P11Y22M33W44D' + 'T55H66M77.987654321S');
+TemporalHelpers.assertDuration(resultPosSecondsWithDate, 11, 22, 33, 44, 55, 66, 77, 987, 654, 321,
+  "positive fractional seconds in datetime string not rounded");
+
+const resultNegSecondsWithDate = Temporal.Duration.from('-P11Y22M33W44D' + 'T55H66M77.987654321S');
+TemporalHelpers.assertDuration(resultNegSecondsWithDate, -11, -22, -33, -44, -55, -66, -77, -987, -654, -321,
+  "negative fractional seconds in datetime string not rounded");
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/from/argument-string-invalid.js b/js/src/tests/test262/built-ins/Temporal/Duration/from/argument-string-invalid.js
index 963c72f4af264..f86c5dad61723 100644
--- a/js/src/tests/test262/built-ins/Temporal/Duration/from/argument-string-invalid.js
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/from/argument-string-invalid.js
@@ -25,7 +25,30 @@ const tests = [
   "+PT",
   "P1Y1M1W1DT1H1M1.01Sjunk",
   "P-1Y1M",
-  "P1Y-1M"
+  "P1Y-1M",
+  "P2H",
+  "P2.5M",
+  "P2,5M",
+  "P2S",
+  "PT2.H3M",
+  "PT2,H3M",
+  "PT2.H3S",
+  "PT2,H3S",
+  "PT2.H0.5M",
+  "PT2,H0,5M",
+  "PT2.H0.5S",
+  "PT2,H0,5S",
+  "PT2H3.2M3S",
+  "PT2H3,2M3S",
+  "PT2H3.2M0.3S",
+  "PT2H3,2M0,3S",
+  "PT.1H",
+  "PT,1H",
+  "PT.1M",
+  "PT,1M",
+  "PT.1S",
+  "PT,1S",
+  "",
 ];
 
 for (const input of tests) {
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/out-of-range.js b/js/src/tests/test262/built-ins/Temporal/Duration/out-of-range.js
index 84437a1b04610..5eab2620663be 100644
--- a/js/src/tests/test262/built-ins/Temporal/Duration/out-of-range.js
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/out-of-range.js
@@ -1,5 +1,5 @@
 // |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2023 Igalia, S.L. All rights reserved.
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
@@ -34,7 +34,7 @@ assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 15011998757
 assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, -150119987579017), "minutes < min");
 assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, -150119987579016, -60), "seconds balance into minutes < min");
 
-// 2^53 = 9007199254740992
+// 2^53 = 9007199254740992 = max safe integer + 1
 assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, 9007199254740992), "seconds > max");
 assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, 9007199254740991, 1000), "ms balance into seconds > max");
 assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, 9007199254740991, 999, 1000), "µs balance into seconds > max");
@@ -44,4 +44,16 @@ assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, -9007199
 assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, -9007199254740991, -999, -1000), "µs balance into seconds < min");
 assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, -9007199254740991, -999, -999, -1000), "ns balance into seconds < min");
 
+// max safe integer - floor(max safe integer / 1000) +1 = 8998192055486252
+assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, 8998192055486252, 9007199254740991 , 0, 0), "max ms balance into s > max");
+assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, -8998192055486252, -9007199254740991, 0, 0), "min ms balance into s < min");
+
+// max safe integer - floor(max safe integer / 1000000) +1 = 9007190247541738
+assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, 9007190247541738, 0, 9007199254740991, 0), "max µs balance into s > max");
+assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, -9007190247541738, 0, -9007199254740991, 0), "min µs balance into s < min");
+
+// max safe integer - floor(max safe integer / 1000000000) +1 = 9007199245733793
+assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, 9007199245733793, 0, 0, 9007199254740991), "max ns balance into s > max");
+assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, -9007199245733793, 0, 0, -9007199254740991), "min ns balance into s < min");
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-argument-propertybag-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..0e010d71d1bee
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-argument-propertybag-calendar-invalid-iso-string.js
@@ -0,0 +1,27 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Brage Hogstad, University of Bergen. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.duration.prototype.round
+description: Invalid ISO string as calendar in relativeTo option should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.Duration(1, 0, 0, 0, 24);
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["notacal", "Unknown calendar"],
+];
+
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 2019, monthCode: "M11", day: 1, calendar: cal };
+  assert.throws(
+    RangeError,
+    () => instance.round({ largestUnit: "months", relativeTo: arg }),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-argument-string-calendar-invalid-iso-string.js
similarity index 61%
rename from js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-propertybag-calendar-invalid-iso-string.js
rename to js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-argument-string-calendar-invalid-iso-string.js
index 2b45293a0bc56..fd05684e044d4 100644
--- a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-argument-string-calendar-invalid-iso-string.js
@@ -4,24 +4,24 @@
 
 /*---
 esid: sec-temporal.duration.prototype.round
-description: >
-  An ISO string that cannot be converted to a calendar ID should throw a RangeError
+description: Invalid ISO string as calendar in relativeTo option should throw RangeError
 features: [Temporal]
 ---*/
 
 const instance = new Temporal.Duration(1, 0, 0, 0, 24);
 
 const invalidStrings = [
-  ["", "empty string"]
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
 ];
 
-for (const [calendar, description] of invalidStrings) {
-  const relativeTo = { year: 2019, monthCode: "M11", day: 1, calendar };
+for (const [arg, description] of invalidStrings) {
   assert.throws(
     RangeError,
-    () => instance.round({ largestUnit: "years", relativeTo }),
+    () => instance.round({ largestUnit: "months", relativeTo: arg }),
     `${description} is not a valid calendar ID`
   );
 }
 
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..062f53e5f4ebf
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-no-fractional-minutes-hours.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.duration.prototype.round
+description: Fractional minutes or hours in time string in relativeTo option should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.Duration(1, 0, 0, 0, 24)
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => instance.round({ largestUnit: "months", relativeTo: arg }),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-propertybag-invalid-offset-string.js b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-propertybag-invalid-offset-string.js
index 6203beb0432f4..af89cb7a3d413 100644
--- a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-propertybag-invalid-offset-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-propertybag-invalid-offset-string.js
@@ -19,6 +19,7 @@ const badOffsets = [
   null,       // must be a string
   true,       // must be a string
   1000n,      // must be a string
+  "+00:0000", // separator must be consistent for hours/minutes and minutes/seconds
 ];
 badOffsets.forEach((offset) => {
   const relativeTo = { year: 2021, month: 10, day: 28, offset, timeZone };
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-string-datetime.js b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-string-datetime.js
index 82adc4c7955ba..2d76c79a2eeb4 100644
--- a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-string-datetime.js
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/round/relativeto-string-datetime.js
@@ -38,4 +38,7 @@ assert.throws(RangeError, () => instance.round({ largestUnit: "years", relativeT
 relativeTo = "2019-11-01T00:00+04:15[UTC]";
 assert.throws(RangeError, () => instance.round({ largestUnit: "years", relativeTo }), "date-time + offset + IANA annotation throws if wall time and exact time mismatch");
 
+relativeTo = "2025-01-01T00:00:00+00:0000";
+assert.throws(RangeError, () => instance.round({ largestUnit: "years", relativeTo }), "date-time with offset like 00:0000 shouldn't parse");
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/toJSON/max-value.js b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/toJSON/max-value.js
index 3a7a45f6393f5..b46567f988f56 100644
--- a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/toJSON/max-value.js
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/toJSON/max-value.js
@@ -1,14 +1,98 @@
 // |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2023 Igalia, S.L. All rights reserved.
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
 esid: sec-temporal.duration.prototype.tojson
-description: Balancing the maximum nanoseconds and seconds does not go out of range
+description: Various maximum value combinations do not go out of range
 features: [Temporal]
 ---*/
 
-const d = new Temporal.Duration(0, 0, 0, 0, 0, 0, /* s = */ Number.MAX_SAFE_INTEGER, 0, 0, /* ns = */ 999_999_999);
-assert.sameValue(d.toJSON(), "PT9007199254740991.999999999S", "max value ns and s does not go out of range");
+const maxYMW = Math.pow(2, 32) - 1; // Maximum years, months, weeks
+const maxDays = Math.floor(Number.MAX_SAFE_INTEGER / 86400);
+const maxHours = Math.floor(Number.MAX_SAFE_INTEGER / 3600);
+const maxMinutes = Math.floor(Number.MAX_SAFE_INTEGER / 60);
+const maxSecs = Number.MAX_SAFE_INTEGER; // = 9007199254740991, also max ms, μs, ns
+
+assert.sameValue(new Temporal.Duration(maxYMW).toJSON(),
+  'P' + maxYMW + 'Y', "maximum years");
+assert.sameValue(new Temporal.Duration(-maxYMW).toJSON(),
+  '-P' + maxYMW + 'Y', "minimum years");
+assert.sameValue(new Temporal.Duration(0, maxYMW).toJSON(),
+  'P' + maxYMW + 'M', "maximum months");
+assert.sameValue(new Temporal.Duration(0, -maxYMW).toJSON(),
+  '-P' + maxYMW + 'M', "minimum months");
+assert.sameValue(new Temporal.Duration(0, 0, maxYMW).toJSON(),
+  'P' + maxYMW + 'W', "maximum weeks");
+assert.sameValue(new Temporal.Duration(0, 0, -maxYMW).toJSON(),
+  '-P' + maxYMW + 'W', "minimum weeks");
+assert.sameValue(new Temporal.Duration(0, 0, 0, maxDays).toJSON(),
+  'P' + maxDays + 'D', "maximum days");
+assert.sameValue(new Temporal.Duration(0, 0, 0, -maxDays).toJSON(),
+  '-P' + maxDays + 'D', "minimum days");
+assert.sameValue(new Temporal.Duration(0, 0, 0, 0, maxHours).toJSON(),
+  'PT' + maxHours + 'H', "maximum hours");
+assert.sameValue(new Temporal.Duration(0, 0, 0, 0, -maxHours).toJSON(),
+  '-PT' + maxHours + 'H', "minimum hours");
+assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, maxMinutes).toJSON(),
+   'PT' + maxMinutes + 'M', "maximum minutes");
+assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, -maxMinutes).toJSON(),
+   '-PT' + maxMinutes + 'M', "minimum minutes");
+assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, maxSecs).toJSON(),
+   'PT' + maxSecs + 'S', "maximum seconds");
+assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, -maxSecs).toJSON(),
+   '-PT' + maxSecs + 'S', "minimum seconds");
+assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, maxSecs).toJSON(),
+   'PT' + Math.floor(maxSecs / 1000) + '.' + maxSecs % 1000 + 'S', "maximum milliseconds");
+assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, -maxSecs).toJSON(),
+   '-PT' + Math.floor(maxSecs / 1000) + '.' + maxSecs % 1000 + 'S', "minimum milliseconds");
+assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0,  maxSecs).toJSON(),
+   'PT' + Math.floor(maxSecs / 1000000) + '.' + maxSecs % 1000000 + 'S', "maximum microseconds");
+assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, -maxSecs).toJSON(),
+   '-PT' + Math.floor(maxSecs / 1000000) + '.' + maxSecs % 1000000 + 'S', "minimum microseconds");
+assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 0, maxSecs).toJSON(),
+   'PT' + Math.floor(maxSecs / 1000000000) + '.' + maxSecs % 1000000000 + 'S', "maximum nanoseconds");
+assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 0, -maxSecs).toJSON(),
+   '-PT' + Math.floor(maxSecs / 1000000000) + '.' + maxSecs % 1000000000 + 'S', "minimum nanoseconds");
+
+// Combinations with maximum values without balancing.
+assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, maxSecs, 999).toJSON(),
+  'PT' + maxSecs + '.999S', "max value ms and s does not go out of range");
+assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, -maxSecs, -999).toJSON(),
+  '-PT' + maxSecs + '.999S', "min value ms and s does not go out of range");
+assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, maxSecs, 999, 999).toJSON(),
+  'PT' + maxSecs + '.999999S', "max value ms, μs and s does not go out of range");
+assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, -maxSecs, -999, -999).toJSON(),
+  '-PT' + maxSecs + '.999999S', "min value ms, μs and s does not go out of range");
+assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, maxSecs, 999, 999, 999).toJSON(),
+  'PT' + maxSecs + '.999999999S', "max value ms, μs, ns and s does not go out of range");
+assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, -maxSecs, -999, -999, -999).toJSON(),
+  '-PT' + maxSecs + '.999999999S', "min value ms, μs, ns and s does not go out of range");
+
+// Combinations with maximum values with balancing.
+const balanceMaxSecondsMilliseconds = new Temporal.Duration(
+  0, 0, 0, 0, 0, 0, maxSecs - Math.floor(maxSecs / 1000), maxSecs, 0, 0);
+assert.sameValue(balanceMaxSecondsMilliseconds.toJSON(),
+  'PT' + maxSecs + '.' + maxSecs % 1000 + 'S', "balancing max ms to max s");
+const balanceMinSecondsMilliseconds = new Temporal.Duration(
+  0, 0, 0, 0, 0, 0, -(maxSecs - Math.floor(maxSecs / 1000)), -maxSecs, 0, 0);
+assert.sameValue(balanceMinSecondsMilliseconds.toJSON(),
+  '-PT' + maxSecs + '.' + maxSecs % 1000 + 'S', "balancing min ms to max s");
+const balanceMaxSecondsMicroseconds = new Temporal.Duration(
+  0, 0, 0, 0, 0, 0, maxSecs - Math.floor(maxSecs / 1000000), 0, maxSecs, 0);
+assert.sameValue(balanceMaxSecondsMicroseconds.toJSON(),
+  'PT' + maxSecs + '.' + maxSecs % 1000000 + 'S', "balancing max μs to max s");
+const balanceMinSecondsMicroseconds = new Temporal.Duration(
+  0, 0, 0, 0, 0, 0, -(maxSecs - Math.floor(maxSecs / 1000000)), 0, -maxSecs, 0);
+assert.sameValue(balanceMinSecondsMicroseconds.toJSON(),
+  '-PT' + maxSecs + '.' + maxSecs % 1000000 + 'S', "balancing min μs to min s");
+const balanceMaxSecondsNanoseconds = new Temporal.Duration(
+  0, 0, 0, 0, 0, 0, maxSecs - Math.floor(maxSecs / 1000000000), 0, 0, maxSecs);
+assert.sameValue(balanceMaxSecondsNanoseconds.toJSON(),
+  'PT' + maxSecs + '.' + maxSecs % 1000000000 + 'S', "balancing max ns to max s");
+const balanceMinSecondsNanoseconds = new Temporal.Duration(
+  0, 0, 0, 0, 0, 0, -(maxSecs - Math.floor(maxSecs / 1000000000)), 0, 0, -maxSecs);
+assert.sameValue(balanceMinSecondsNanoseconds.toJSON(),
+  '-PT' + maxSecs + '.' + maxSecs % 1000000000 + 'S', "balancing min ns to min s");
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/precision-exact-mathematical-values-5.js b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/precision-exact-mathematical-values-5.js
index 8ce9ad27114f1..5a6d38bf90d7a 100644
--- a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/precision-exact-mathematical-values-5.js
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/precision-exact-mathematical-values-5.js
@@ -58,4 +58,31 @@ const seconds = 8692288669465520;
   );
 }
 
+{
+  const d = new Temporal.Duration(0, 0, 5, 5);
+
+  const result = d.total({ unit: "months", relativeTo: "1972-01-31" })
+
+/*
+Expected months checked using Decimals in Python:
+
+>>> from decimal import *
+>>> getcontext().prec = 18
+>>> dest_epoch_ns = Decimal(69120000000000000)
+>>> start_epoch_ns = Decimal(68169600000000000)
+>>> end_epoch_ns = 70848000000000000
+>>> progress = ((dest_epoch_ns - start_epoch_ns) / (end_epoch_ns - start_epoch_ns))
+>>> progress
+Decimal('0.354838709677419355')
+>>> Decimal(1) + progress
+Decimal('1.35483870967741936')
+
+The result should be truncated.
+*/
+  const expectedMonths = 1.3548387096774193;
+
+  assert.sameValue(result, expectedMonths,
+    "NudgeToCalendarUnit should implement floating-point calculation correctly for largestUnit months");
+}
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-argument-propertybag-calendar-invalid-iso-string.js
similarity index 63%
rename from js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-propertybag-calendar-invalid-iso-string.js
rename to js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-argument-propertybag-calendar-invalid-iso-string.js
index 5ef9a7433a1c3..318926026172f 100644
--- a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-argument-propertybag-calendar-invalid-iso-string.js
@@ -4,7 +4,7 @@
 
 /*---
 esid: sec-temporal.duration.prototype.total
-description: Various invalid ISO string values for relativeTo.calendar
+description: Invalid ISO string as calendar in relativeTo option should throw RangeError
 features: [Temporal]
 ---*/
 
@@ -12,13 +12,14 @@ const instance = new Temporal.Duration(1, 0, 0, 0, 24);
 
 const invalidStrings = [
   ["", "empty string"],
+  ["notacal", "Unknown calendar"],
 ];
 
-for (const [calendar, description] of invalidStrings) {
-  const relativeTo = { year: 2019, monthCode: "M11", day: 1, calendar };
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 2019, monthCode: "M11", day: 1, calendar: cal };
   assert.throws(
     RangeError,
-    () => instance.total({ unit: "days", relativeTo }),
+    () => instance.total({ unit: "months", relativeTo: arg }),
     `${description} is not a valid calendar ID`
   );
 }
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..a5d38f4319d20
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,27 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.duration.prototype.total
+description: Invalid ISO string as calendar in relativeTo option should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.Duration(1, 0, 0, 0, 24);
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => instance.total({ unit: "months", relativeTo: arg }),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-date-limits.js b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-date-limits.js
index 20a8dca9eb186..947859240b9b0 100644
--- a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-date-limits.js
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-date-limits.js
@@ -34,7 +34,7 @@ assert.sameValue(
   "maximum date is a valid ISO string for PlainDateTime relativeTo"
 );
 
-relativeTo = "+275760-09-12T23:59:60+00:00[UTC]";
+relativeTo = "+275760-09-12T00:00:00+00:00[UTC]";
 const result4 = instance.total({ unit: "days", relativeTo });
 assert.sameValue(
   result4,
@@ -42,6 +42,10 @@ assert.sameValue(
   "maximum date is a valid ISO string for ZonedDateTime relativeTo"
 );
 
+relativeTo = "+275760-09-12T00:00:01+00:00[UTC]";
+assert.throws(RangeError, () => instance.total({ unit: "days", relativeTo }),
+  `${relativeTo} is out of range as a relativeTo argument for total`);
+
 relativeTo = { year: -271821, month: 4, day: 19 };
 const result5 = instance.total({ unit: "days", relativeTo });
 assert.sameValue(
@@ -66,7 +70,7 @@ assert.sameValue(
   "minimum date is valid in a property bag for ZonedDateTime relativeTo"
 );
 
-relativeTo = { year: 275760, month: 9, day: 12, hour: 23, minute: 59, second: 60, timeZone: "UTC" };
+relativeTo = { year: 275760, month: 9, day: 12, hour: 0, minute: 0, second: 0, timeZone: "UTC" };
 const result8 = instance.total({ unit: "days", relativeTo });
 assert.sameValue(
   result8,
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..b2ad973deea60
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-no-fractional-minutes-hours.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.duration.prototype.total
+description: Fractional minutes or hours in time string in relativeTo option should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.Duration(1, 0, 0, 0, 24)
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => instance.total({ unit: "months", relativeTo: arg }),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-propertybag-invalid-offset-string.js b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-propertybag-invalid-offset-string.js
index 58c82cfa6b313..7108edfd12fd5 100644
--- a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-propertybag-invalid-offset-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-propertybag-invalid-offset-string.js
@@ -19,6 +19,7 @@ const badOffsets = [
   null,       // must be a string
   true,       // must be a string
   1000n,      // must be a string
+  "+00:0000", // separator must be consistent for hours/minutes and minutes/seconds
 ];
 badOffsets.forEach((offset) => {
   const relativeTo = { year: 2021, month: 10, day: 28, offset, timeZone };
diff --git a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-string-datetime.js b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-string-datetime.js
index b2e0cd8a56cca..a5b5f5f24850b 100644
--- a/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-string-datetime.js
+++ b/js/src/tests/test262/built-ins/Temporal/Duration/prototype/total/relativeto-string-datetime.js
@@ -37,4 +37,7 @@ assert.throws(RangeError, () => instance.total({ unit: "days", relativeTo }), "d
 relativeTo = "2019-11-01T00:00+04:15[UTC]";
 assert.throws(RangeError, () => instance.total({ unit: "days", relativeTo }), "date-time + offset + IANA annotation throws if wall time and exact time mismatch");
 
+relativeTo = "2025-01-01T00:00:00+00:0000";
+assert.throws(RangeError, () => instance.total({ unit: "days", relativeTo }), "date-time with offset like 00:0000 shouldn't parse");
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Instant/basic.js b/js/src/tests/test262/built-ins/Temporal/Instant/basic.js
index 9b52398cec3bd..649961ceaa9a2 100644
--- a/js/src/tests/test262/built-ins/Temporal/Instant/basic.js
+++ b/js/src/tests/test262/built-ins/Temporal/Instant/basic.js
@@ -11,11 +11,26 @@ features: [Temporal]
 const bigIntInstant = new Temporal.Instant(217175010123456789n);
 assert(bigIntInstant instanceof Temporal.Instant, "BigInt instanceof");
 assert.sameValue(bigIntInstant.epochMilliseconds, 217175010123, "BigInt epochMilliseconds");
+assert.sameValue(bigIntInstant.epochNanoseconds, 217175010123456789n, "BigInt epochNanoseconds");
 
 const stringInstant = new Temporal.Instant("217175010123456789");
 assert(stringInstant instanceof Temporal.Instant, "String instanceof");
 assert.sameValue(stringInstant.epochMilliseconds, 217175010123, "String epochMilliseconds");
+assert.sameValue(stringInstant.epochNanoseconds, 217175010123456789n, "String epochNanoseconds");
+
+const negativeBigIntInstant = new Temporal.Instant(-217175010123456789n);
+assert(negativeBigIntInstant instanceof Temporal.Instant, "negative BigInt instanceof");
+assert.sameValue(negativeBigIntInstant.epochMilliseconds, -217175010124, "negagive BigInt epochMilliseconds");
+assert.sameValue(negativeBigIntInstant.epochNanoseconds, -217175010123456789n, "negative BigInt epochNanoseconds");
+
+const negativeStringInstant = new Temporal.Instant("-217175010123456789");
+assert(negativeStringInstant instanceof Temporal.Instant, "negative String instanceof");
+assert.sameValue(negativeStringInstant.epochMilliseconds, -217175010124, "negative string epochMilliseconds");
+assert.sameValue(negativeStringInstant.epochNanoseconds, -217175010123456789n, "negative string epochNanoseconds");
 
 assert.throws(SyntaxError, () => new Temporal.Instant("abc123"), "invalid BigInt syntax");
 
+assert.sameValue(new Temporal.Instant(true).epochNanoseconds, 1n, "true as argument is 1n");
+assert.sameValue(new Temporal.Instant(false).epochNanoseconds, 0n, "false as argument is 0n");
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Instant/compare/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/Instant/compare/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..319fb75aa6fef
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/Instant/compare/no-fractional-minutes-hours.js
@@ -0,0 +1,29 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.instant.compare
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123[CET]", "Fractional minutes"],
+  ["2025-04-03T12.5[CET]", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => Temporal.Instant.compare(arg, new Temporal.Instant(0n)),
+    `${description} not allowed in time string (first argument)`
+  );
+  assert.throws(
+    RangeError,
+      () => Temporal.Instant.compare(new Temporal.Instant(0n), arg),
+    `${description} not allowed in time string (second argument)`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Instant/from/argument-object-tostring.js b/js/src/tests/test262/built-ins/Temporal/Instant/from/argument-object-tostring.js
index 92af4d6f632a2..411be0ed498db 100644
--- a/js/src/tests/test262/built-ins/Temporal/Instant/from/argument-object-tostring.js
+++ b/js/src/tests/test262/built-ins/Temporal/Instant/from/argument-object-tostring.js
@@ -11,6 +11,9 @@ features: [Temporal]
 const arg = {};
 assert.throws(RangeError, () => Temporal.Instant.from(arg), "[object Object] is not a valid ISO string");
 
+const temporalInstant = Temporal.Instant;
+assert.throws(RangeError, () => Temporal.Instant.from(temporalInstant), "Temporal.Instant object is not a valid ISO string");
+
 arg.toString = function() {
   return "1970-01-01T00:00Z";
 };
diff --git a/js/src/tests/test262/built-ins/Temporal/Instant/from/argument-string-invalid.js b/js/src/tests/test262/built-ins/Temporal/Instant/from/argument-string-invalid.js
index a7e601ee8d64d..c4940b8836f8d 100644
--- a/js/src/tests/test262/built-ins/Temporal/Instant/from/argument-string-invalid.js
+++ b/js/src/tests/test262/built-ins/Temporal/Instant/from/argument-string-invalid.js
@@ -57,6 +57,9 @@ const invalidStrings = [
   // valid, but outside the supported range:
   "-999999-01-01T00:00Z",
   "+999999-01-01T00:00Z",
+  // "00:0000" is invalid (the hour/minute and minute/second separator
+  // or lack thereof needs to match).
+  "2025-01-01T00:00:00+00:0000",
 ];
 for (const arg of invalidStrings) {
   assert.throws(
diff --git a/js/src/tests/test262/built-ins/Temporal/Instant/from/argument-wrong-type.js b/js/src/tests/test262/built-ins/Temporal/Instant/from/argument-wrong-type.js
index eadb4b3963d44..cdf5341732f52 100644
--- a/js/src/tests/test262/built-ins/Temporal/Instant/from/argument-wrong-type.js
+++ b/js/src/tests/test262/built-ins/Temporal/Instant/from/argument-wrong-type.js
@@ -10,35 +10,33 @@ description: >
 features: [BigInt, Symbol, Temporal]
 ---*/
 
+assert.throws(TypeError, () => Temporal.Instant.from(), "no argument");
+
 const primitiveTests = [
   [undefined, 'undefined'],
   [null, 'null'],
   [true, 'boolean'],
-  ['', 'empty string'],
   [1, "number that doesn't convert to a valid ISO string"],
   [19761118, 'number that would convert to a valid ISO string in other contexts'],
   [1n, 'bigint'],
-  [{}, 'plain object'],
-  [Temporal.Instant, 'Temporal.Instant, object']
+  [Symbol(), 'symbol'],
+  [Temporal.Instant.prototype, 'Temporal.Instant.prototype (fails brand check)'],
 ];
 
 for (const [arg, description] of primitiveTests) {
   assert.throws(
-    typeof arg === 'string' || (typeof arg === 'object' && arg !== null) || typeof arg === 'function'
-      ? RangeError
-      : TypeError,
+    TypeError,
     () => Temporal.Instant.from(arg),
     `${description} does not convert to a valid ISO string`
   );
-}
-
-const typeErrorTests = [
-  [Symbol(), 'symbol'],
-  [Temporal.Instant.prototype, 'Temporal.Instant.prototype, object'] // fails brand check in toString()
-];
 
-for (const [arg, description] of typeErrorTests) {
-  assert.throws(TypeError, () => Temporal.Instant.from(arg), `${description} does not convert to a string`);
+  for (const options of [undefined, { overflow: 'constrain' }, { overflow: 'reject' }]) {
+    assert.throws(
+      TypeError,
+      () => Temporal.Instant.from(arg, options),
+      `${description} does not convert to a valid ISO string with options ${options}`
+    );
+  }
 }
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Instant/from/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/Instant/from/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..674635a728ad8
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/Instant/from/no-fractional-minutes-hours.js
@@ -0,0 +1,24 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.instant.from
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123[CET]", "Fractional minutes"],
+  ["2025-04-03T12.5[CET]", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => Temporal.Instant.from(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Instant/fromEpochNanoseconds/limits.js b/js/src/tests/test262/built-ins/Temporal/Instant/fromEpochNanoseconds/limits.js
index 16e10be5c97d3..e14c13a7c999f 100644
--- a/js/src/tests/test262/built-ins/Temporal/Instant/fromEpochNanoseconds/limits.js
+++ b/js/src/tests/test262/built-ins/Temporal/Instant/fromEpochNanoseconds/limits.js
@@ -12,6 +12,7 @@ info: |
   ...
   2. If IsValidEpochNanoseconds(epochNanoseconds) is false, throw a RangeError exception.
   ...
+includes: [temporalHelpers.js]
 features: [Temporal]
 ---*/
 
@@ -19,5 +20,9 @@ var limit = 8640000000000000000000n;
 
 assert.throws(RangeError, () => Temporal.Instant.fromEpochNanoseconds(-limit - 1n));
 assert.throws(RangeError, () => Temporal.Instant.fromEpochNanoseconds(limit + 1n));
+TemporalHelpers.assertInstantsEqual(Temporal.Instant.fromEpochNanoseconds(-limit),
+                                    Temporal.Instant.from("-271821-04-20T00:00:00Z"));
+TemporalHelpers.assertInstantsEqual(Temporal.Instant.fromEpochNanoseconds(limit),
+                                    Temporal.Instant.from("+275760-09-13T00:00:00Z"));
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/instant-equals.js b/js/src/tests/test262/built-ins/Temporal/Instant/prototype/equals/basic.js
similarity index 70%
rename from js/src/tests/test262/staging/Temporal/v8/instant-equals.js
rename to js/src/tests/test262/built-ins/Temporal/Instant/prototype/equals/basic.js
index 050a0ebeb9d71..c2544a976e13b 100644
--- a/js/src/tests/test262/staging/Temporal/v8/instant-equals.js
+++ b/js/src/tests/test262/built-ins/Temporal/Instant/prototype/equals/basic.js
@@ -3,10 +3,8 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: pending
-description: >
-  Automatically ported from instant-equals test
-  in V8's mjsunit test instant-equals.js
+esid: sec-temporal.instant.prototype.equals
+description: Basic functionality for Temporal.Instant.prototype.equals.
 features: [Temporal]
 ---*/
 
@@ -15,7 +13,5 @@ let inst2 = new Temporal.Instant(1234567890123456000n);
 let inst3 = new Temporal.Instant(1234567890123456000n);
 assert(!inst1.equals(inst2));
 assert(inst2.equals(inst3));
-let badInst = { equals: inst1.equals };
-assert.throws(TypeError, () => badInst.equals(inst1));
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Instant/prototype/equals/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/Instant/prototype/equals/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..4dac017cf7251
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/Instant/prototype/equals/no-fractional-minutes-hours.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.instant.prototype.equals
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.Instant(0n)
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123[CET]", "Fractional minutes"],
+  ["2025-04-03T12.5[CET]", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => instance.equals(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Instant/prototype/round/rounding-increments.js b/js/src/tests/test262/built-ins/Temporal/Instant/prototype/round/rounding-increments.js
index 0651b95e4dcc5..6fd8f04f4c996 100644
--- a/js/src/tests/test262/built-ins/Temporal/Instant/prototype/round/rounding-increments.js
+++ b/js/src/tests/test262/built-ins/Temporal/Instant/prototype/round/rounding-increments.js
@@ -47,4 +47,22 @@ TemporalHelpers.assertInstantsEqual(inst.round({
   roundingIncrement: 10
 }), Temporal.Instant.from("1976-11-18T14:23:30.12345679Z"));
 
+const unitsAndIncrements = {
+   "hour": [1, 2, 4, 6, 8, 12, 24],
+   "minute": [1, 5, 10, 20, 30, 40, 80, 120, 720, 1440],
+   "second": [1, 5, 10, 20, 25, 30, 50, 100, 400, 86400],
+   "millisecond": [1, 5, 10, 20, 25, 30, 50, 100, 86_400_000],
+   "microsecond": [1, 5, 10, 20, 25, 30, 50, 100],
+   "nanosecond": [1, 5, 10, 20, 25, 30, 50, 100]
+};
+
+// Just check that each combination of unit and increment doesn't throw
+Object.entries(unitsAndIncrements).forEach(([unit, increments]) => {
+  increments.forEach((increment) => {
+    const result = inst.round({ smallestUnit: unit, roundingMode: "ceil", roundingIncrement: increment });
+    assert.sameValue(result instanceof Temporal.Instant, true, `${unit} ${increment}`);
+  })
+});
+
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Instant/prototype/since/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/Instant/prototype/since/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..9f9c954a785bc
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/Instant/prototype/since/no-fractional-minutes-hours.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.instant.prototype.since
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.Instant(0n)
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123[CET]", "Fractional minutes"],
+  ["2025-04-03T12.5[CET]", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => instance.since(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/instant-to-json.js b/js/src/tests/test262/built-ins/Temporal/Instant/prototype/toJSON/fromEpochMilliseconds.js
similarity index 68%
rename from js/src/tests/test262/staging/Temporal/v8/instant-to-json.js
rename to js/src/tests/test262/built-ins/Temporal/Instant/prototype/toJSON/fromEpochMilliseconds.js
index 6bd564ba54701..5bdd0ab742df1 100644
--- a/js/src/tests/test262/staging/Temporal/v8/instant-to-json.js
+++ b/js/src/tests/test262/built-ins/Temporal/Instant/prototype/toJSON/fromEpochMilliseconds.js
@@ -3,10 +3,8 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: pending
-description: >
-  Automatically ported from instant-to-json test
-  in V8's mjsunit test instant-to-json.js
+esid: sec-temporal.instant.prototype.tojson
+description: Various test cases using fromEpochMilliseconds.
 features: [Temporal]
 ---*/
 
@@ -19,16 +17,5 @@ assert.sameValue(Temporal.Instant.fromEpochMilliseconds(2 * 365 * days_in_ms).to
 assert.sameValue(Temporal.Instant.fromEpochMilliseconds((2 * 365 + 58) * days_in_ms).toJSON(), '1972-02-28T00:00:00Z');
 assert.sameValue(Temporal.Instant.fromEpochMilliseconds((2 * 365 + 59) * days_in_ms).toJSON(), '1972-02-29T00:00:00Z');
 assert.sameValue(Temporal.Instant.fromEpochMilliseconds((15 * 365 + 4) * days_in_ms).toJSON(), '1985-01-01T00:00:00Z');
-const year_in_sec = 24 * 60 * 60 * 365;
-const number_of_random_test = 500;
-for (let i = 0; i < number_of_random_test; i++) {
-  let ms = Math.floor(Math.random() * year_in_sec * 1000 * 10000) - year_in_sec * 1000 * 5000;
-  let d = new Date(ms);
-  const dateout = d.toJSON().substr(0, 19);
-  const temporalout = Temporal.Instant.fromEpochMilliseconds(ms).toJSON().substr(0, 19);
-  if (dateout[0] != '0') {
-    assert.sameValue(temporalout, dateout, ms);
-  }
-}
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/no-observable-array-iteration.js b/js/src/tests/test262/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/no-observable-array-iteration.js
new file mode 100644
index 0000000000000..5fe93f7fce9fd
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/Instant/prototype/toZonedDateTimeISO/no-observable-array-iteration.js
@@ -0,0 +1,23 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.instant.prototype.tozoneddatetimeiso
+description: >
+  Calling GetPossibleEpochNanoseconds (from ToTemporalZonedDateTime > InterpretISODateTimeOffset)
+  causes no observable array iteration.
+features: [Temporal]
+---*/
+
+const arrayPrototypeSymbolIteratorOriginal = Array.prototype[Symbol.iterator];
+Array.prototype[Symbol.iterator] = function arrayIterator() {
+  throw new Test262Error("Array should not be iterated");
+}
+
+let inst = new Temporal.Instant(0n);
+let zdt = inst.toZonedDateTimeISO("UTC");
+
+Array.prototype[Symbol.iterator] = arrayPrototypeSymbolIteratorOriginal;
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/Instant/prototype/until/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/Instant/prototype/until/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..7073bae6db28c
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/Instant/prototype/until/no-fractional-minutes-hours.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.instant.prototype.until
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.Instant(0n)
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123[CET]", "Fractional minutes"],
+  ["2025-04-03T12.5[CET]", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => instance.until(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/calendar-invalid-iso-string.js
index 3e15e4d430c60..6f9ccc65f8f51 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/calendar-invalid-iso-string.js
@@ -4,13 +4,14 @@
 
 /*---
 esid: sec-temporal.plaindate.constructor
-description: Various invalid ISO string values for calendar
+description: Invalid ISO string as calendar should throw RangeError
 features: [Temporal]
 ---*/
 
 const invalidStrings = [
   ["", "empty string"],
   ["1997-12-04[u-ca=iso8601]", "ISO string with calendar annotation"],
+  ["notacal", "Unknown calendar"],
 ];
 
 for (const [arg, description] of invalidStrings) {
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/compare/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/compare/argument-propertybag-calendar-invalid-iso-string.js
index 1b8291396475a..69b46a83d9041 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/compare/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/compare/argument-propertybag-calendar-invalid-iso-string.js
@@ -10,10 +10,12 @@ features: [Temporal]
 
 const invalidStrings = [
   ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
-  
-for (const [calendar, description] of invalidStrings) {
-  const arg = { year: 1976, monthCode: "M11", day: 18, calendar };
+
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1976, monthCode: "M11", day: 18, calendar: cal };
   assert.throws(
     RangeError,
     () => Temporal.PlainDate.compare(arg, new Temporal.PlainDate(1976, 11, 18)),
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/compare/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/compare/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..d11162a79abf3
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/compare/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,29 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.compare
+description: Invalid calendar string should throw RangeError
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => Temporal.PlainDate.compare(arg, new Temporal.PlainDate(1976, 11, 18)),
+    `${description} is not a valid calendar ID (first argument)`
+  );
+  assert.throws(
+    RangeError,
+    () => Temporal.PlainDate.compare(new Temporal.PlainDate(1976, 11, 18), arg),
+    `${description} is not a valid calendar ID (second argument)`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/compare/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/compare/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..9a6fe34715f07
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/compare/no-fractional-minutes-hours.js
@@ -0,0 +1,29 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.compare
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => Temporal.PlainDate.compare(arg, new Temporal.PlainDate(2025, 4, 3)),
+    `${description} not allowed in time string (first argument)`
+  );
+  assert.throws(
+    RangeError,
+      () => Temporal.PlainDate.compare(new Temporal.PlainDate(2025, 4, 3), arg),
+    `${description} not allowed in time string (second argument)`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/argument-propertybag-calendar-invalid-iso-string.js
index e28aa7e2d42a9..588cc71ae4a3c 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/argument-propertybag-calendar-invalid-iso-string.js
@@ -4,16 +4,18 @@
 
 /*---
 esid: sec-temporal.plaindate.from
-description: Various invalid ISO string values for calendar in a property bag
+description: Invalid ISO string as calendar should throw RangeError
 features: [Temporal]
 ---*/
 
 const invalidStrings = [
   ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
-  
-for (const [calendar, description] of invalidStrings) {
-  const arg = { year: 2019, monthCode: "M11", day: 1, calendar };
+
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1976, monthCode: "M11", day: 18, calendar: cal };
   assert.throws(
     RangeError,
     () => Temporal.PlainDate.from(arg),
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/argument-propertybag-calendar.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/argument-propertybag-calendar.js
index 5c7e4c369b919..96de9225a6295 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/argument-propertybag-calendar.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/argument-propertybag-calendar.js
@@ -13,5 +13,7 @@ const calendar = "iso8601";
 const plainDate = Temporal.PlainDate.from({ year: 1976, month: 11, day: 18, calendar });
 TemporalHelpers.assertPlainDate(plainDate, 1976, 11, "M11", 18);
 assert.sameValue(plainDate.calendarId, "iso8601", "calendar string is iso8601");
+const plainDateImplicitCalendar = Temporal.PlainDate.from({ year: 1976, month: 11, day: 18 });
+assert.sameValue(plainDateImplicitCalendar.calendarId, "iso8601", "default calendar is iso8601");
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..4a044012e2844
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,24 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.from
+description: Invalid calendar string should throw RangeError
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => Temporal.PlainDate.from(arg),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/argument-string-invalid.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/argument-string-invalid.js
index d8cd182a203f4..d056caae55a0c 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/argument-string-invalid.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/argument-string-invalid.js
@@ -51,6 +51,9 @@ const invalidStrings = [
   // valid, but outside the supported range:
   "-999999-01-01",
   "+999999-01-01",
+  // non-matching separators
+  "2020-0101",
+  "202001-01",
 ];
 for (const arg of invalidStrings) {
   assert.throws(
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/argument-wrong-type.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/argument-wrong-type.js
index 8f7cf439c25e3..e9c19b9793028 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/argument-wrong-type.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/argument-wrong-type.js
@@ -10,6 +10,8 @@ description: >
 features: [BigInt, Symbol, Temporal]
 ---*/
 
+assert.throws(TypeError, () => Temporal.PlainDate.from(), "no argument");
+
 const primitiveTests = [
   [undefined, "undefined"],
   [null, "null"],
@@ -25,6 +27,14 @@ for (const [arg, description] of primitiveTests) {
     () => Temporal.PlainDate.from(arg),
     `${description} does not convert to a valid ISO string`
   );
+
+  for (const options of [undefined, { overflow: 'constrain' }, { overflow: 'reject' }]) {
+    assert.throws(
+      typeof arg === 'string' ? RangeError : TypeError,
+      () => Temporal.PlainDate.from(arg, options),
+      `${description} does not convert to a valid ISO string with options ${options}`
+    );
+  }
 }
 
 const typeErrorTests = [
@@ -36,6 +46,10 @@ const typeErrorTests = [
 
 for (const [arg, description] of typeErrorTests) {
   assert.throws(TypeError, () => Temporal.PlainDate.from(arg), `${description} is not a valid property bag and does not convert to a string`);
+
+  for (const options of [undefined, { overflow: 'constrain' }, { overflow: 'reject' }]) {
+    assert.throws(TypeError, () => Temporal.PlainDate.from(arg, options), `${description} is not a valid property bag and does not convert to a string with options ${options}`);
+  }
 }
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/month-code-wrong-type.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/month-code-wrong-type.js
new file mode 100644
index 0000000000000..be46bbee93c02
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/month-code-wrong-type.js
@@ -0,0 +1,27 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.from
+description: Month code must be a string
+features: [Temporal]
+---*/
+
+const monthCodeValues = [
+  5, 5n, false, Symbol(), null, { toString: () => 5 }
+];
+
+const year = 2026;
+
+for (const monthCode of monthCodeValues) {
+  assert.throws(TypeError, () => Temporal.PlainDate.from({
+    year,
+    monthCode,
+    day: 1
+  }), typeof monthCode === 'symbol' ?
+      "Symbol should be rejected as month code" :
+      `month code ${monthCode} should be rejected`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/negative-month-or-day.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/negative-month-or-day.js
new file mode 100644
index 0000000000000..ba23a55d75f82
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/negative-month-or-day.js
@@ -0,0 +1,14 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.from
+description: Months and days must be non-negative integers
+features: [Temporal]
+---*/
+
+assert.throws(RangeError, () => Temporal.PlainDate.from({ year: 2000, day: 1, month: -1 }));
+assert.throws(RangeError, () => Temporal.PlainDate.from({ year: 2000, month: 1, day: -1 }));
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..e2f01238857dc
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/no-fractional-minutes-hours.js
@@ -0,0 +1,24 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.from
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => Temporal.PlainDate.from(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/options-basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/options-basic.js
new file mode 100644
index 0000000000000..a0755e36630f4
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/options-basic.js
@@ -0,0 +1,23 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright 2021 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.from
+description: Basic tests with options
+features: [Temporal]
+---*/
+
+[
+  { overflow: 'constrain' },
+  { overflow: 'reject' }
+].forEach(function (validOptions) {
+  let d = new Temporal.PlainDate(1, 2, 3);
+  let d2 = Temporal.PlainDate.from(d, validOptions);
+  assert.sameValue(d2.year, 1);
+  assert.sameValue(d2.month, 2);
+  assert.sameValue(d2.day, 3);
+  assert.sameValue(d2.calendarId, 'iso8601');
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/options-undefined.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/options-undefined.js
index 15b317f3ffce3..07db7e9ec2402 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/options-undefined.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/options-undefined.js
@@ -16,4 +16,7 @@ assert.sameValue(explicit.month, 12, "default overflow is constrain");
 const implicit = Temporal.PlainDate.from(fields);
 assert.sameValue(implicit.month, 12, "default overflow is constrain");
 
+const implicitEmpty = Temporal.PlainDate.from(fields, {});
+assert.sameValue(implicitEmpty.month, 12, "default overflow is constrain");
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/options-wrong-type.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/options-wrong-type.js
index 724b25c5dd1db..98c72d99ec5bb 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/options-wrong-type.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/options-wrong-type.js
@@ -15,6 +15,9 @@ const badOptions = [
   Symbol(),
   1,
   2n,
+  Infinity,
+  NaN,
+  null,
 ];
 
 for (const value of badOptions) {
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/overflow-reject.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/overflow-reject.js
new file mode 100644
index 0000000000000..2d06223cfcea0
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/overflow-reject.js
@@ -0,0 +1,76 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2021 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-temporal.plaindate.from
+description: Out-of-range months/days are rejected with overflow 'reject'
+features: [Temporal]
+---*/
+
+assert.throws(RangeError, () => Temporal.PlainDate.from({
+  year: 2021,
+  month: 1,
+  day: 32
+}, { overflow: 'reject' }));
+assert.throws(RangeError, () => Temporal.PlainDate.from({
+  year: 2021,
+  month: 2,
+  day: 29
+}, { overflow: 'reject' }));
+assert.throws(RangeError, () => Temporal.PlainDate.from({
+  year: 2021,
+  month: 3,
+  day: 32
+}, { overflow: 'reject' }));
+assert.throws(RangeError, () => Temporal.PlainDate.from({
+  year: 2021,
+  month: 4,
+  day: 31
+}, { overflow: 'reject' }));
+assert.throws(RangeError, () => Temporal.PlainDate.from({
+  year: 2021,
+  month: 5,
+  day: 32
+}, { overflow: 'reject' }));
+assert.throws(RangeError, () => Temporal.PlainDate.from({
+  year: 2021,
+  month: 6,
+  day: 31
+}, { overflow: 'reject' }));
+assert.throws(RangeError, () => Temporal.PlainDate.from({
+  year: 2021,
+  month: 7,
+  day: 32
+}, { overflow: 'reject' }));
+assert.throws(RangeError, () => Temporal.PlainDate.from({
+  year: 2021,
+  month: 8,
+  day: 32
+}, { overflow: 'reject' }));
+assert.throws(RangeError, () => Temporal.PlainDate.from({
+  year: 2021,
+  month: 9,
+  day: 31
+}, { overflow: 'reject' }));
+assert.throws(RangeError, () => Temporal.PlainDate.from({
+  year: 2021,
+  month: 10,
+  day: 32
+}, { overflow: 'reject' }));
+assert.throws(RangeError, () => Temporal.PlainDate.from({
+  year: 2021,
+  month: 11,
+  day: 31
+}, { overflow: 'reject' }));
+assert.throws(RangeError, () => Temporal.PlainDate.from({
+  year: 2021,
+  month: 12,
+  day: 32
+}, { overflow: 'reject' }));
+assert.throws(RangeError, () => Temporal.PlainDate.from({
+  year: 2021,
+  month: 13,
+  day: 5
+}, { overflow: 'reject' }));
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/roundtrip-from-property-bag.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/roundtrip-from-property-bag.js
index 1f5d01c490a6c..88eb5632d129d 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/roundtrip-from-property-bag.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/roundtrip-from-property-bag.js
@@ -11,23 +11,40 @@ includes: [temporalHelpers.js]
 features: [Temporal, Intl.Era-monthcode]
 ---*/
 
-const options = { overflow: "reject" };
+const options = [
+  { overflow: "constrain" },
+  { overflow: "reject" }
+]
 
-testRoundtrip(2000);
-testRoundtrip(1);
+const testData = [
+  [2000, 1, "M01", 1],
+  [1, 1, "M01", 1],
+  [2021, 7, "M07", 15],
+  [2021, 7, "M07", 3],
+  [2021, 12, "M12", 31],
+  [2021, 7, "M07", 15],
+];
 
-function testRoundtrip(year) {
-  const dateFromYearMonth = Temporal.PlainDate.from({ year, month: 1, day: 1 }, options);
-  TemporalHelpers.assertPlainDate(
-    dateFromYearMonth,
-    year, 1, "M01", 1,
-    `${dateFromYearMonth} - created from year and month`);
+for (const [year, month, monthCode, day] of testData) {
+  testRoundtrip(year, month, monthCode, day);
+}
+
+function testRoundtrip(year, month, monthCode, day) {
+  for (const opt of options) {
+    const dateFromYearMonth = Temporal.PlainDate.from({ year, month, day }, opt);
+    TemporalHelpers.assertPlainDate(
+      dateFromYearMonth,
+      year, month, monthCode, day,
+      `${dateFromYearMonth} - created from year and month`);
+  }
 
-  const dateFromYearMonthCode = Temporal.PlainDate.from({ year, monthCode: "M01", day: 1 }, options);
-  TemporalHelpers.assertPlainDate(
-    dateFromYearMonthCode,
-    year, 1, "M01", 1,
-    `${dateFromYearMonthCode} - created from year and month code`);
+  for (const opt of options) {
+    const dateFromYearMonthCode = Temporal.PlainDate.from({ year, monthCode, day }, opt);
+    TemporalHelpers.assertPlainDate(
+      dateFromYearMonthCode,
+      year, month, monthCode, day,
+      `${dateFromYearMonthCode} - created from year and month code`);
+  }
 }
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/with-year-month-day-need-constrain.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/with-year-month-day-need-constrain.js
index 987224095886e..6c8f0910b7bff 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/with-year-month-day-need-constrain.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/with-year-month-day-need-constrain.js
@@ -16,74 +16,40 @@ features: [Temporal]
 includes: [temporalHelpers.js]
 ---*/
 
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, month: 1, day: 133}),
-    2021, 1, "M01", 31,
-    "year/month/day with day need to be constrained in Jan");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, month: 2, day: 133}),
-    2021, 2, "M02", 28,
-    "year/month/day with day need to be constrained in Feb");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, month: 3, day: 133}),
-    2021, 3, "M03", 31,
-    "year/month/day with day need to be constrained in March");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, month: 4, day: 133}),
-    2021, 4, "M04", 30,
-    "year/month/day with day need to be constrained in April");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, month: 5, day: 133}),
-    2021, 5, "M05", 31,
-    "year/month/day with day need to be constrained in May");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, month: 6, day: 133}),
-    2021, 6, "M06", 30,
-    "year/month/day with day need to be constrained in Jun");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, month: 7, day: 133}),
-    2021, 7, "M07", 31,
-    "year/month/day with day need to be constrained in July");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, month: 8, day: 133}),
-    2021, 8, "M08", 31,
-    "year/month/day with day need to be constrained in Aug");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, month: 9, day: 133}),
-    2021, 9, "M09", 30,
-    "year/month/day with day need to be constrained in Sept.");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, month: 10, day: 133}),
-    2021, 10, "M10", 31,
-    "year/month/day with day need to be constrained in Oct.");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, month: 11, day: 133}),
-    2021, 11, "M11", 30,
-    "year/month/day with day need to be constrained in Nov.");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, month: 12, day: 133}),
-    2021, 12, "M12", 31,
-    "year/month/day with day need to be constrained in Dec.");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, month: 13, day: 500}),
-    2021, 12, "M12", 31,
-    "year/month/day with month and day need to be constrained");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, month: 999999, day: 500}),
-    2021, 12, "M12", 31,
-    "year/month/day with month and day need to be constrained");
+const year = 2021;
+
+const testData = [
+  [1, 133, "Jan", 1, "M01", 31],
+  [2, 133, "Feb", 2, "M02", 28],
+  [3, 133, "March", 3, "M03", 31],
+  [4, 133, "April", 4, "M04", 30],
+  [5, 133, "May", 5, "M05", 31],
+  [6, 133, "Jun", 6, "M06", 30],
+  [7, 133, "Jul", 7, "M07", 31],
+  [8, 133, "Aug", 8, "M08", 31],
+  [9, 133, "Sept", 9, "M09", 30],
+  [10, 133, "Oct", 10, "M10", 31],
+  [11, 133, "Nov", 11, "M11", 30],
+  [12, 133, "Dec", 12, "M12", 31],
+  [13, 500, "out-of-range month 13", 12, "M12", 31],
+  [999999, 500, "out-of-range month 999999", 12, "M12", 31],
+  [3, 9033, "out-of-range day 9033", 3, "M03", 31],
+  [4, 50, "out-of-range day 50", 4, "M04", 30],
+  [5, 77, "out-of-range day 77", 5, "M05", 31],
+  [6, 33, "out-of-range date 06-33", 6, "M06", 30],
+  [7, 33, "out-of-range day 07-33", 7, "M07", 31],
+  [8, 300, "out-of-range day 300", 8, "M08", 31],
+  [9, 400, "out-of-range date 09-400", 9, "M09", 30],
+  [10, 400, "out-of-range date 10-400", 10, "M10", 31],
+  [11, 400, "out-of-range date 11-400", 11, "M11", 30],
+  [12, 500, "out-of-range day 500", 12, "M12", 31],
+];
+
+for (const [month, day, descr, expectedMonth, expectedMonthCode, expectedDay] of testData) {
+  TemporalHelpers.assertPlainDate(
+    Temporal.PlainDate.from({year, month, day}),
+    year, expectedMonth, expectedMonthCode, expectedDay,
+    `year/month/day need to be constrained in ${descr}`);
+}
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/with-year-monthCode-day-need-constrain.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/with-year-monthCode-day-need-constrain.js
index 33b308535890f..8c6a02f0433f7 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/from/with-year-monthCode-day-need-constrain.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/from/with-year-monthCode-day-need-constrain.js
@@ -16,64 +16,38 @@ features: [Temporal]
 includes: [temporalHelpers.js]
 ---*/
 
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, monthCode: "M01", day: 133}),
-    2021, 1, "M01", 31,
-    "year/monthCode/day with day need to be constrained in Jan");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, monthCode: "M02", day: 133}),
-    2021, 2, "M02", 28,
-    "year/monthCode/day with day need to be constrained in Feb");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, monthCode: "M03", day: 133}),
-    2021, 3, "M03", 31,
-    "year/monthCode/day with day need to be constrained in March");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, monthCode: "M04", day: 133}),
-    2021, 4, "M04", 30,
-    "year/monthCode/day with day need to be constrained in April");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, monthCode: "M05", day: 133}),
-    2021, 5, "M05", 31,
-    "year/monthCode/day with day need to be constrained in May");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, monthCode: "M06", day: 133}),
-    2021, 6, "M06", 30,
-    "year/monthCode/day with day need to be constrained in Jun");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, monthCode: "M07", day: 133}),
-    2021, 7, "M07", 31,
-    "year/monthCode/day with day need to be constrained in July");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, monthCode: "M08", day: 133}),
-    2021, 8, "M08", 31,
-    "year/monthCode/day with day need to be constrained in Aug");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, monthCode: "M09", day: 133}),
-    2021, 9, "M09", 30,
-    "year/monthCode/day with day need to be constrained in Sept.");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, monthCode: "M10", day: 133}),
-    2021, 10, "M10", 31,
-    "year/monthCode/day with day need to be constrained in Oct.");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, monthCode: "M11", day: 133}),
-    2021, 11, "M11", 30,
-    "year/monthCode/day with day need to be constrained in Nov.");
-
-TemporalHelpers.assertPlainDate(
-    Temporal.PlainDate.from({year: 2021, monthCode: "M12", day: 133}),
-    2021, 12, "M12", 31,
-    "year/monthCode/day with day need to be constrained in Dec.");
+const year = 2021;
+
+const testData = [
+  ["M01", 133, "Jan", 1, "M01", 31],
+  ["M02", 133, "Feb", 2, "M02", 28],
+  ["M03", 133, "March", 3, "M03", 31],
+  ["M04", 133, "April", 4, "M04", 30],
+  ["M05", 133, "May", 5, "M05", 31],
+  ["M06", 133, "Jun", 6, "M06", 30],
+  ["M07", 133, "Jul", 7, "M07", 31],
+  ["M08", 133, "Aug", 8, "M08", 31],
+  ["M09", 133, "Sept", 9, "M09", 30],
+  ["M10", 133, "Oct", 10, "M10", 31],
+  ["M11", 133, "Nov", 11, "M11", 30],
+  ["M12", 133, "Dec", 12, "M12", 31],
+  ["M03", 9033, "out-of-range day 9033", 3, "M03", 31],
+  ["M04", 50, "out-of-range day 50", 4, "M04", 30],
+  ["M05", 77, "out-of-range day 77", 5, "M05", 31],
+  ["M06", 33, "out-of-range date 06-33", 6, "M06", 30],
+  ["M07", 33, "out-of-range day 07-33", 7, "M07", 31],
+  ["M08", 300, "out-of-range day 300", 8, "M08", 31],
+  ["M09", 400, "out-of-range date 09-400", 9, "M09", 30],
+  ["M10", 400, "out-of-range date 10-400", 10, "M10", 31],
+  ["M11", 400, "out-of-range date 11-400", 11, "M11", 30],
+  ["M12", 500, "out-of-range day 500", 12, "M12", 31],
+];
+
+for (const [monthCode, day, descr, expectedMonth, expectedMonthCode, expectedDay] of testData) {
+  TemporalHelpers.assertPlainDate(
+    Temporal.PlainDate.from({year, monthCode, day}),
+    year, expectedMonth, expectedMonthCode, expectedDay,
+    `year/month code/day need to be constrained in ${descr}`);
+}
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/limits.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/limits.js
index 10fb6a5e249f9..4fe341aedd8ef 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/limits.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/limits.js
@@ -1,5 +1,5 @@
 // |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2021 Igalia, S.L. All rights reserved.
+// Copyright 2021 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
@@ -9,6 +9,8 @@ includes: [temporalHelpers.js]
 features: [Temporal]
 ---*/
 
+// Year limits
+
 assert.throws(RangeError, () => new Temporal.PlainDate(-271821, 4, 18), "min");
 assert.throws(RangeError, () => new Temporal.PlainDate(275760, 9, 14), "max");
 TemporalHelpers.assertPlainDate(new Temporal.PlainDate(-271821, 4, 19),
@@ -16,4 +18,37 @@ TemporalHelpers.assertPlainDate(new Temporal.PlainDate(-271821, 4, 19),
 TemporalHelpers.assertPlainDate(new Temporal.PlainDate(275760, 9, 13),
   275760, 9, "M09", 13, "max");
 
+// Monthday limits
+
+TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 1, 31), 2021, 1, 'M01', 31);
+TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 2, 28), 2021, 2, 'M02', 28);
+TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 3, 31), 2021, 3, 'M03', 31);
+TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 4, 30), 2021, 4, 'M04', 30);
+TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 5, 31), 2021, 5, 'M05', 31);
+TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 6, 30), 2021, 6, 'M06', 30);
+TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 7, 31), 2021, 7, 'M07', 31);
+TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 8, 31), 2021, 8, 'M08', 31);
+TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 9, 30), 2021, 9, 'M09', 30);
+TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 10, 31), 2021, 10, 'M10', 31);
+TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 11, 30), 2021, 11, 'M11', 30);
+TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 12, 31), 2021, 12, 'M12', 31);
+TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2004, 2, 29), 2004, 2, 'M02', 29);
+assert.throws(RangeError, () => new Temporal.PlainDate(1900, 2, 29));
+assert.throws(RangeError, () => new Temporal.PlainDate(2001, 2, 29));
+assert.throws(RangeError, () => new Temporal.PlainDate(2002, 2, 29));
+assert.throws(RangeError, () => new Temporal.PlainDate(2003, 2, 29));
+assert.throws(RangeError, () => new Temporal.PlainDate(2100, 2, 29));
+assert.throws(RangeError, () => new Temporal.PlainDate(2021, 1, 32));
+assert.throws(RangeError, () => new Temporal.PlainDate(2021, 2, 29));
+assert.throws(RangeError, () => new Temporal.PlainDate(2021, 3, 32));
+assert.throws(RangeError, () => new Temporal.PlainDate(2021, 4, 31));
+assert.throws(RangeError, () => new Temporal.PlainDate(2021, 5, 32));
+assert.throws(RangeError, () => new Temporal.PlainDate(2021, 6, 31));
+assert.throws(RangeError, () => new Temporal.PlainDate(2021, 7, 32));
+assert.throws(RangeError, () => new Temporal.PlainDate(2021, 8, 32));
+assert.throws(RangeError, () => new Temporal.PlainDate(2021, 9, 31));
+assert.throws(RangeError, () => new Temporal.PlainDate(2021, 10, 32));
+assert.throws(RangeError, () => new Temporal.PlainDate(2021, 11, 31));
+assert.throws(RangeError, () => new Temporal.PlainDate(2021, 12, 32));
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/missing-arguments.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/missing-arguments.js
index 86a92f87ef92c..118d91d673099 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/missing-arguments.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/missing-arguments.js
@@ -22,4 +22,8 @@ const args = [
 assert.throws(RangeError, () => new Temporal.PlainDate(...args));
 assert.compareArray(actual, expected, "order of operations");
 
+assert.throws(RangeError, () => new Temporal.PlainDate(), "no arguments");
+assert.throws(RangeError, () => new Temporal.PlainDate(2021), "only year");
+
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/add/argument-duration-max-plus-min-date.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/add/argument-duration-max-plus-min-date.js
new file mode 100644
index 0000000000000..d5f724f7de9a1
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/add/argument-duration-max-plus-min-date.js
@@ -0,0 +1,60 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.prototype.add
+description: Maximum allowed duration adding to minimum allowed date
+includes: [temporalHelpers.js]
+features: [Temporal]
+---*/
+
+const min = Temporal.PlainDate.from({ year: -271821, month: 4, day: 19 });
+
+const maxCases = [
+  ["P547581Y4M25DT23H59M59.999999999S", "string with max years"],
+  [{ years: 547581, months: 4, days: 25, nanoseconds: 86399999999999 }, "property bag with max years"],
+  ["P6570976M25DT23H59M59.999999999S", "string with max months"],
+  [{ months: 6570976, days: 25, nanoseconds: 86399999999999 }, "property bag with max months"],
+  ["P28571428W5DT23H59M59.999999999S", "string with max weeks"],
+  [{ weeks: 28_571_428, days: 5, nanoseconds: 86399999999999 }, "property bag with max weeks"],
+  ["P200000001DT23H59M59.999999999S", "string with max days"],
+  [{ days: 200_000_001, nanoseconds: 86399999999999 }, "property bag with max days"],
+  ["PT4800000047H59M59.999999999S", "string with max hours"],
+  [{ hours: 4_800_000_047, minutes: 59, seconds: 59, milliseconds: 999, microseconds: 999, nanoseconds: 999 }, "property bag with max hours"],
+  ["PT288000002879M59.999999999S", "string with max minutes"],
+  [{ minutes: 288_000_002_879, seconds: 59, milliseconds: 999, microseconds: 999, nanoseconds: 999 }, "property bag with max minutes"],
+  ["PT17280000172799.999999998S", "string with max seconds"],
+  [{ seconds: 17_280_000_172_799, nanoseconds: 999999998 }, "property bag with max seconds"],
+];
+
+for (const [arg, descr] of maxCases) {
+    const result = min.add(arg);
+    TemporalHelpers.assertPlainDate(result, 275760, 9, "M09", 13,  `operation succeeds with ${descr}`);
+}
+
+const max = Temporal.PlainDate.from({ year: 275760, month: 9, day: 13 });
+
+const minCases = [
+  ["-P547581Y4M24DT23H59M59.999999999S", "string with max years"],
+  [{ years: -547581, months: -4, days: -24, nanoseconds: -86399999999999 }, "property bag with max years"],
+  ["-P6570976M24DT23H59M59.999999999S", "string with max months"],
+  [{ months: -6570976, days: -24, nanoseconds: -86399999999999 }, "property bag with max months"],
+  ["-P28571428W5DT23H59M59.999999999S", "string with max weeks"],
+  [{ weeks: -28_571_428, days: -5, nanoseconds: -86399999999999 }, "property bag with max weeks"],
+  ["-P200000001DT23H59M59.999999999S", "string with max days"],
+  [{ days: -200_000_001, nanoseconds: -86399999999999 }, "property bag with max days"],
+  ["-PT4800000047H59M59.999999999S", "string with max hours"],
+  [{ hours: -4_800_000_047, minutes: -59, seconds: -59, milliseconds: -999, microseconds: -999, nanoseconds: -999 }, "property bag with max hours"],
+  ["-PT288000002879M59.999999999S", "string with max minutes"],
+  [{ minutes: -288_000_002_879, seconds: -59, milliseconds: -999, microseconds: -999, nanoseconds: -999 }, "property bag with max minutes"],
+  ["-PT17280000172799.999999998S", "string with max seconds"],
+  [{ seconds: -17_280_000_172_799, nanoseconds: -999999998 }, "property bag with max seconds"],
+];
+
+for (const [arg, descr] of minCases) {
+    const result = max.add(arg);
+    TemporalHelpers.assertPlainDate(result, -271821, 4, "M04", 19,  `operation succeeds with ${descr}`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/add/argument-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/add/argument-string.js
index 0a0cea79ca7d8..d6530b6c054f4 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/add/argument-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/add/argument-string.js
@@ -14,5 +14,6 @@ const result = instance.add("P3D");
 TemporalHelpers.assertPlainDate(result, 2000, 5, "M05", 5);
 
 TemporalHelpers.assertPlainDate(instance.add("P1M1W"), 2000, 6, "M06", 9, "calendar units");
+TemporalHelpers.assertPlainDate(instance.add("-P1M1D"), 2000, 4, "M04", 1, "calendar units");
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/add/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/add/basic.js
index 0d757e712924a..2ab49b56e57b3 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/add/basic.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/add/basic.js
@@ -29,4 +29,90 @@ TemporalHelpers.assertPlainDate(Temporal.PlainDate.from('1976-12-08').add({ days
 TemporalHelpers.assertPlainDate(Temporal.PlainDate.from('2019-02-28').add({ months: -1 }),
   2019, 1, "M01", 28);
 
+let p1y = new Temporal.Duration(1);
+let p4y = new Temporal.Duration(4);
+let p5m = new Temporal.Duration(0, 5);
+let p1y2m = new Temporal.Duration(1, 2);
+let p1y4d = new Temporal.Duration(1, 0, 0, 4);
+let p1y2m4d = new Temporal.Duration(1, 2, 0, 4);
+let p10d = new Temporal.Duration(0, 0, 0, 10);
+let p1w = new Temporal.Duration(0, 0, 1);
+let p6w = new Temporal.Duration(0, 0, 6);
+let p2w3d = new Temporal.Duration(0, 0, 2, 3);
+let p1y2w = new Temporal.Duration(1, 0, 2);
+let p2m3w = new Temporal.Duration(0, 2, 3);
+
+let testData = [
+  [ '2020-02-29', p1y, '2021-02-28' ],
+  [ '2020-02-29', p4y, '2024-02-29' ],
+  [ '2021-07-16', p1y, '2022-07-16' ],
+  [ '2021-07-16', p5m, '2021-12-16' ],
+  [ '2021-08-16', p5m, '2022-01-16' ],
+  [ '2021-10-31', p5m, '2022-03-31' ],
+  [ '2021-09-30', p5m, '2022-02-28' ],
+  [ '2019-09-30', p5m, '2020-02-29' ],
+  [ '2019-10-01', p5m, '2020-03-01' ],
+  [ '2021-07-16', p1y2m, '2022-09-16' ],
+  [ '2021-11-30', p1y2m, '2023-01-30' ],
+  [ '2021-12-31', p1y2m, '2023-02-28' ],
+  [ '2022-12-31', p1y2m, '2024-02-29' ],
+  [ '2021-07-16', p1y4d, '2022-07-20' ],
+  [ '2021-02-27', p1y4d, '2022-03-03' ],
+  [ '2023-02-27', p1y4d, '2024-03-02' ],
+  [ '2021-12-30', p1y4d, '2023-01-03' ],
+  [ '2021-07-30', p1y4d, '2022-08-03' ],
+  [ '2021-06-30', p1y4d, '2022-07-04' ],
+  [ '2021-07-16', p1y2m4d, '2022-09-20' ],
+  [ '2021-02-27', p1y2m4d, '2022-05-01' ],
+  [ '2021-02-26', p1y2m4d, '2022-04-30' ],
+  [ '2023-02-26', p1y2m4d, '2024-04-30' ],
+  [ '2021-12-30', p1y2m4d, '2023-03-04' ],
+  [ '2021-07-30', p1y2m4d, '2022-10-04' ],
+  [ '2021-06-30', p1y2m4d, '2022-09-03' ],
+  [ '2021-07-16', p10d, '2021-07-26' ],
+  [ '2021-07-26', p10d, '2021-08-05' ],
+  [ '2021-12-26', p10d, '2022-01-05' ],
+  [ '2020-02-26', p10d, '2020-03-07' ],
+  [ '2021-02-26', p10d, '2021-03-08' ],
+  [ '2020-02-19', p10d, '2020-02-29' ],
+  [ '2021-02-19', p10d, '2021-03-01' ],
+  [ '2021-02-19', p1w, '2021-02-26' ],
+  [ '2021-02-27', p1w, '2021-03-06' ],
+  [ '2020-02-27', p1w, '2020-03-05' ],
+  [ '2021-12-24', p1w, '2021-12-31' ],
+  [ '2021-12-27', p1w, '2022-01-03' ],
+  [ '2021-01-27', p1w, '2021-02-03' ],
+  [ '2021-06-27', p1w, '2021-07-04' ],
+  [ '2021-07-27', p1w, '2021-08-03' ],
+  [ '2021-02-19', p6w, '2021-04-02' ],
+  [ '2021-02-27', p6w, '2021-04-10' ],
+  [ '2020-02-27', p6w, '2020-04-09' ],
+  [ '2021-12-24', p6w, '2022-02-04' ],
+  [ '2021-12-27', p6w, '2022-02-07' ],
+  [ '2021-01-27', p6w, '2021-03-10' ],
+  [ '2021-06-27', p6w, '2021-08-08' ],
+  [ '2021-07-27', p6w, '2021-09-07' ],
+  [ '2020-02-29', p2w3d, '2020-03-17' ],
+  [ '2020-02-28', p2w3d, '2020-03-16' ],
+  [ '2021-02-28', p2w3d, '2021-03-17' ],
+  [ '2020-12-28', p2w3d, '2021-01-14' ],
+  [ '2020-02-29', p1y2w, '2021-03-14' ],
+  [ '2020-02-28', p1y2w, '2021-03-14' ],
+  [ '2021-02-28', p1y2w, '2022-03-14' ],
+  [ '2020-12-28', p1y2w, '2022-01-11' ],
+  [ '2020-02-29', p2m3w, '2020-05-20' ],
+  [ '2020-02-28', p2m3w, '2020-05-19' ],
+  [ '2021-02-28', p2m3w, '2021-05-19' ],
+  [ '2020-12-28', p2m3w, '2021-03-21' ],
+  [ '2019-12-28', p2m3w, '2020-03-20' ],
+  [ '2019-10-28', p2m3w, '2020-01-18' ],
+  [ '2019-10-31', p2m3w, '2020-01-21' ],
+];
+
+for (let [dateString, duration, resultString] of testData) {
+  const date = Temporal.PlainDate.from(dateString);
+  const result = Temporal.PlainDate.from(resultString);
+  TemporalHelpers.assertPlainDatesEqual(date.add(duration), result);
+}
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/calendar-day.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/day/basic.js
similarity index 52%
rename from js/src/tests/test262/staging/Temporal/v8/calendar-day.js
rename to js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/day/basic.js
index f71391a9d0e09..22f9cb717eeaf 100644
--- a/js/src/tests/test262/staging/Temporal/v8/calendar-day.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/day/basic.js
@@ -1,18 +1,14 @@
 // |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: pending
-description: >
-  Automatically ported from calendar-day test
-  in V8's mjsunit test calendar-day.js
+esid: sec-get-temporal.plaindate.prototype.day
+description: The "day" property of Temporal.PlainDate.prototype
 features: [Temporal]
 ---*/
 
 assert.sameValue((new Temporal.PlainDate(2021, 7, 15)).day, 15);
-assert.sameValue((new Temporal.PlainDateTime(1997, 8, 23, 5, 30, 13)).day, 23);
-assert.sameValue((new Temporal.PlainMonthDay(2, 6)).day, 6);
 assert.sameValue(Temporal.PlainDate.from('2019-03-18').day, 18);
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/dayOfYear/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/dayOfYear/basic.js
index a0b4fc99672dc..f3186285dcda5 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/dayOfYear/basic.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/dayOfYear/basic.js
@@ -13,4 +13,19 @@ for (let i = 1; i <= 7; ++i) {
   assert.sameValue(plainDate.dayOfYear, 319 + i, `${plainDate} should be on day ${319 + i}`);
 }
 
+assert.sameValue((new Temporal.PlainDate(1970, 1, 1)).dayOfYear, 1);
+assert.sameValue((new Temporal.PlainDate(2000, 1, 1)).dayOfYear, 1);
+assert.sameValue((new Temporal.PlainDate(2021, 1, 15)).dayOfYear, 15);
+assert.sameValue((new Temporal.PlainDate(2020, 2, 15)).dayOfYear, 46);
+assert.sameValue((new Temporal.PlainDate(2000, 2, 15)).dayOfYear, 46);
+assert.sameValue((new Temporal.PlainDate(2020, 3, 15)).dayOfYear, 75);
+assert.sameValue((new Temporal.PlainDate(2000, 3, 15)).dayOfYear, 75);
+assert.sameValue((new Temporal.PlainDate(2001, 3, 15)).dayOfYear, 74);
+assert.sameValue((new Temporal.PlainDate(2000, 12, 31)).dayOfYear, 366);
+assert.sameValue((new Temporal.PlainDate(2001, 12, 31)).dayOfYear, 365);
+assert.sameValue(Temporal.PlainDate.from('2019-01-18').dayOfYear, 18);
+assert.sameValue(Temporal.PlainDate.from('2020-02-18').dayOfYear, 49);
+assert.sameValue(Temporal.PlainDate.from('2019-12-31').dayOfYear, 365);
+assert.sameValue(Temporal.PlainDate.from('2000-12-31').dayOfYear, 366);
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/daysInMonth/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/daysInMonth/basic.js
index 022b6d218a9b0..25cf809cc0f6d 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/daysInMonth/basic.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/daysInMonth/basic.js
@@ -13,9 +13,37 @@ const tests = [
   [new Temporal.PlainDate(1976, 11, 18), 30],
   [new Temporal.PlainDate(1976, 12, 18), 31],
   [new Temporal.PlainDate(1977, 2, 18), 28],
+  [new Temporal.PlainDate(2021, 1, 15), 31],
+  [new Temporal.PlainDate(2020, 2, 15), 29],
+  [new Temporal.PlainDate(2000, 2, 15), 29],
+  [new Temporal.PlainDate(2021, 2, 15), 28],
+  [new Temporal.PlainDate(2021, 3, 15), 31],
+  [new Temporal.PlainDate(2021, 4, 15), 30],
+  [new Temporal.PlainDate(2021, 5, 15), 31],
+  [new Temporal.PlainDate(2021, 6, 15), 30],
+  [new Temporal.PlainDate(2021, 7, 15), 31],
+  [new Temporal.PlainDate(2021, 8, 15), 31],
+  [new Temporal.PlainDate(2021, 9, 15), 30],
+  [new Temporal.PlainDate(2021, 10, 15), 31],
+  [new Temporal.PlainDate(2021, 11, 15), 30],
+  [new Temporal.PlainDate(2021, 12, 15), 31],
+  [Temporal.PlainDate.from('2019-01-18'), 31],
+  [Temporal.PlainDate.from('2020-02-18'), 29],
+  [Temporal.PlainDate.from('2019-02-18'), 28],
+  [Temporal.PlainDate.from('2019-03-18'), 31],
+  [Temporal.PlainDate.from('2019-04-18'), 30],
+  [Temporal.PlainDate.from('2019-05-18'), 31],
+  [Temporal.PlainDate.from('2019-06-18'), 30],
+  [Temporal.PlainDate.from('2019-07-18'), 31],
+  [Temporal.PlainDate.from('2019-08-18'), 31],
+  [Temporal.PlainDate.from('2019-09-18'), 30],
+  [Temporal.PlainDate.from('2019-10-18'), 31],
+  [Temporal.PlainDate.from('2019-11-18'), 30],
+  [Temporal.PlainDate.from('2019-12-18'), 31],
 ];
 for (const [plainDate, expected] of tests) {
   assert.sameValue(plainDate.daysInMonth, expected, `${expected} days in the month of ${plainDate}`);
 }
 
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/daysInYear/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/daysInYear/basic.js
index 719a2fd52777d..b5cb842d4f523 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/daysInYear/basic.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/daysInYear/basic.js
@@ -10,5 +10,24 @@ features: [Temporal]
 
 assert.sameValue((new Temporal.PlainDate(1976, 11, 18)).daysInYear, 366, "leap year");
 assert.sameValue((new Temporal.PlainDate(1977, 11, 18)).daysInYear, 365, "non-leap year");
+assert.sameValue((new Temporal.PlainDate(1995, 7, 15)).daysInYear, 365);
+assert.sameValue((new Temporal.PlainDate(1996, 7, 15)).daysInYear, 366);
+assert.sameValue((new Temporal.PlainDate(1997, 7, 15)).daysInYear, 365);
+assert.sameValue((new Temporal.PlainDate(1998, 7, 15)).daysInYear, 365);
+assert.sameValue((new Temporal.PlainDate(1999, 7, 15)).daysInYear, 365);
+assert.sameValue((new Temporal.PlainDate(2000, 7, 15)).daysInYear, 366);
+assert.sameValue((new Temporal.PlainDate(2001, 7, 15)).daysInYear, 365);
+assert.sameValue((new Temporal.PlainDate(2002, 7, 15)).daysInYear, 365);
+assert.sameValue((new Temporal.PlainDate(2003, 7, 15)).daysInYear, 365);
+assert.sameValue((new Temporal.PlainDate(2004, 7, 15)).daysInYear, 366);
+assert.sameValue((new Temporal.PlainDate(2005, 7, 15)).daysInYear, 365);
+assert.sameValue(Temporal.PlainDate.from('2019-03-18').daysInYear, 365);
+assert.sameValue(Temporal.PlainDate.from('2020-03-18').daysInYear, 366);
+assert.sameValue(Temporal.PlainDate.from('2021-03-18').daysInYear, 365);
+assert.sameValue(Temporal.PlainDate.from('2022-03-18').daysInYear, 365);
+assert.sameValue(Temporal.PlainDate.from('2023-03-18').daysInYear, 365);
+assert.sameValue(Temporal.PlainDate.from('2024-03-18').daysInYear, 366);
+assert.sameValue(Temporal.PlainDate.from('2025-03-18').daysInYear, 365);
+assert.sameValue(Temporal.PlainDate.from('2026-03-18').daysInYear, 365);
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/equals/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/equals/argument-propertybag-calendar-invalid-iso-string.js
index 3ba80f54ace1b..1e98dd2cc27a3 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/equals/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/equals/argument-propertybag-calendar-invalid-iso-string.js
@@ -12,10 +12,12 @@ const instance = new Temporal.PlainDate(2000, 5, 2);
 
 const invalidStrings = [
   ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
 
-for (const [calendar, description] of invalidStrings) {
-  const arg = { year: 1976, monthCode: "M11", day: 18, calendar };
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1970, monthCode: "M11", day: 18, calendar: cal };
   assert.throws(
     RangeError,
     () => instance.equals(arg),
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/equals/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/equals/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..ad250de5133c0
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/equals/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.prototype.equals
+description: Invalid ISO string as calendar should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainDate(2000, 5, 2);
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => instance.equals(arg),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/equals/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/equals/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..5f315294f7ec0
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/equals/no-fractional-minutes-hours.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.prototype.equals
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainDate(2000, 5, 2)
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => instance.equals(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/inLeapYear/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/inLeapYear/basic.js
index 8a7aabb4e8b11..1df7550203268 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/inLeapYear/basic.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/inLeapYear/basic.js
@@ -12,5 +12,24 @@ assert.sameValue((new Temporal.PlainDate(1976, 11, 18)).inLeapYear,
   true, "leap year");
 assert.sameValue((new Temporal.PlainDate(1977, 11, 18)).inLeapYear,
   false, "non-leap year");
+assert.sameValue((new Temporal.PlainDate(1995, 7, 15)).inLeapYear, false);
+assert.sameValue((new Temporal.PlainDate(1996, 7, 15)).inLeapYear, true);
+assert.sameValue((new Temporal.PlainDate(1997, 7, 15)).inLeapYear, false);
+assert.sameValue((new Temporal.PlainDate(1998, 7, 15)).inLeapYear, false);
+assert.sameValue((new Temporal.PlainDate(1999, 7, 15)).inLeapYear, false);
+assert.sameValue((new Temporal.PlainDate(2000, 7, 15)).inLeapYear, true);
+assert.sameValue((new Temporal.PlainDate(2001, 7, 15)).inLeapYear, false);
+assert.sameValue((new Temporal.PlainDate(2002, 7, 15)).inLeapYear, false);
+assert.sameValue((new Temporal.PlainDate(2003, 7, 15)).inLeapYear, false);
+assert.sameValue((new Temporal.PlainDate(2004, 7, 15)).inLeapYear, true);
+assert.sameValue((new Temporal.PlainDate(2005, 7, 15)).inLeapYear, false);
+assert.sameValue(Temporal.PlainDate.from('2019-03-18').inLeapYear, false);
+assert.sameValue(Temporal.PlainDate.from('2020-03-18').inLeapYear, true);
+assert.sameValue(Temporal.PlainDate.from('2021-03-18').inLeapYear, false);
+assert.sameValue(Temporal.PlainDate.from('2022-03-18').inLeapYear, false);
+assert.sameValue(Temporal.PlainDate.from('2023-03-18').inLeapYear, false);
+assert.sameValue(Temporal.PlainDate.from('2024-03-18').inLeapYear, true);
+assert.sameValue(Temporal.PlainDate.from('2025-03-18').inLeapYear, false);
+assert.sameValue(Temporal.PlainDate.from('2026-03-18').inLeapYear, false);
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/month/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/month/basic.js
new file mode 100644
index 0000000000000..8b3e294ba6a5c
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/month/basic.js
@@ -0,0 +1,14 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-get-temporal.plaindate.prototype.month
+description: Month property for PlainDate
+features: [Temporal]
+---*/
+
+assert.sameValue((new Temporal.PlainDate(2021, 7, 15)).month, 7);
+assert.sameValue(Temporal.PlainDate.from('2019-03-15').month, 3);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/monthCode/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/monthCode/basic.js
new file mode 100644
index 0000000000000..e9ad1680660ec
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/monthCode/basic.js
@@ -0,0 +1,14 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.prototype.monthcode
+description: monthCode property for PlainDate
+features: [Temporal]
+---*/
+
+assert.sameValue((new Temporal.PlainDate(2021, 7, 15)).monthCode, 'M07');
+assert.sameValue(Temporal.PlainDate.from('2019-03-15').monthCode, 'M03');
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/monthsInYear/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/monthsInYear/basic.js
index e87dbbc43bf50..cf3be7bc31a5c 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/monthsInYear/basic.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/monthsInYear/basic.js
@@ -10,5 +10,8 @@ features: [Temporal]
 
 const plainDate = new Temporal.PlainDate(1976, 11, 18);
 assert.sameValue(plainDate.monthsInYear, 12);
+assert.sameValue((new Temporal.PlainDate(1234, 7, 15)).monthsInYear, 12);
+assert.sameValue(Temporal.PlainDate.from('2019-03-18').monthsInYear, 12);
+assert.sameValue(Temporal.PlainDate.from('1234-03-18').monthsInYear, 12);
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/since/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/since/argument-propertybag-calendar-invalid-iso-string.js
index 182db0f8386b6..aea9696e60334 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/since/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/since/argument-propertybag-calendar-invalid-iso-string.js
@@ -12,10 +12,12 @@ const instance = new Temporal.PlainDate(2000, 5, 2);
 
 const invalidStrings = [
   ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
 
-for (const [calendar, description] of invalidStrings) {
-  const arg = { year: 1976, monthCode: "M11", day: 18, calendar };
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1970, monthCode: "M11", day: 18, calendar: cal };
   assert.throws(
     RangeError,
     () => instance.since(arg),
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/since/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/since/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..b3e17b37e7761
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/since/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.prototype.since
+description: Invalid ISO string as calendar should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainDate(2000, 5, 2);
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => instance.since(arg),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/since/basic-arithmetic.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/since/basic-arithmetic.js
new file mode 100644
index 0000000000000..890f5e81f9bef
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/since/basic-arithmetic.js
@@ -0,0 +1,471 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L., and the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.prototype.until
+description: >
+  Check various basic calculations not involving leap years or constraining
+includes: [temporalHelpers.js]
+features: [Temporal]
+---*/
+
+// Years
+
+const date00011225 = Temporal.PlainDate.from("0001-12-25");
+const date19600216 = Temporal.PlainDate.from("1960-02-16");
+const date19600330 = Temporal.PlainDate.from("1960-03-30");
+const date19690724 = new Temporal.PlainDate(1969, 7, 24);
+const date19970616 = Temporal.PlainDate.from("1997-06-16");
+const date19970716 = Temporal.PlainDate.from("1997-07-16");
+const date19971216 = Temporal.PlainDate.from("1997-12-16");
+const date19971230 = Temporal.PlainDate.from("1997-12-30");
+const date20110716 = Temporal.PlainDate.from("2011-07-16");
+const date20190101 = Temporal.PlainDate.from("2019-01-01");
+const date20190201 = Temporal.PlainDate.from("2019-02-01");
+const date20190724 = Temporal.PlainDate.from({ year: 2019, month: 7, day: 24 });
+const date20191230 = Temporal.PlainDate.from("2019-12-30");
+const date20200201 = Temporal.PlainDate.from("2020-02-01");
+const date20200315 = Temporal.PlainDate.from("2020-03-15");
+const date20200316 = Temporal.PlainDate.from("2020-03-16");
+const date20200330 = Temporal.PlainDate.from("2020-03-30");
+const date20201216 = Temporal.PlainDate.from("2020-12-16");
+const date20201230 = Temporal.PlainDate.from("2020-12-30");
+const date20210105 = Temporal.PlainDate.from("2021-01-05");
+const date20210107 = Temporal.PlainDate.from("2021-01-07");
+const date20210116 = Temporal.PlainDate.from("2021-01-16");
+const date20210201 = Temporal.PlainDate.from("2021-02-01");
+const date20210205 = Temporal.PlainDate.from("2021-02-05");
+const date20210228 = new Temporal.PlainDate(2021, 2, 28);
+const date20210305 = Temporal.PlainDate.from("2021-03-05");
+const date20210307 = Temporal.PlainDate.from("2021-03-07");
+const date20210315 = Temporal.PlainDate.from("2021-03-15");
+const date20210330 = Temporal.PlainDate.from("2021-03-30");
+const date20210615 = Temporal.PlainDate.from("2021-06-15");
+const date20210713 = Temporal.PlainDate.from("2021-07-13");
+const date20210715 = Temporal.PlainDate.from("2021-07-15");
+const date20210716 = Temporal.PlainDate.from("2021-07-16");
+const date20210717 = Temporal.PlainDate.from("2021-07-17");
+const date20210723 = Temporal.PlainDate.from("2021-07-23");
+const date20210813 = Temporal.PlainDate.from("2021-08-13");
+const date20210816 = Temporal.PlainDate.from("2021-08-16");
+const date20210817 = Temporal.PlainDate.from("2021-08-17");
+const date20210916 = Temporal.PlainDate.from("2021-09-16");
+const date20210921 = Temporal.PlainDate.from("2021-09-21");
+const date20211017 = Temporal.PlainDate.from("2021-10-17");
+const date20220228 = new Temporal.PlainDate(2022, 2, 28);
+const date20220716 = Temporal.PlainDate.from("2022-07-16");
+const date20220719 = Temporal.PlainDate.from("2022-07-19");
+const date20220919 = Temporal.PlainDate.from("2022-09-19");
+const date20221017 = Temporal.PlainDate.from("2022-10-17");
+const date20310716 = Temporal.PlainDate.from("2031-07-16");
+const date20311216 = Temporal.PlainDate.from("2031-12-16");
+
+const tests = [
+  [
+    date20210716, date20210716, "same day",
+    ["years", 0, 0, 0, 0],
+    ["months", 0, 0, 0, 0],
+    ["weeks", 0, 0, 0, 0],
+    ["days", 0, 0, 0, 0],
+  ],
+  [
+    date20210716, date20210717, "one day",
+    ["years", 0, 0, 0, 1],
+    ["months", 0, 0, 0, 1],
+    ["weeks", 0, 0, 0, 1],
+    ["days", 0, 0, 0, 1],
+  ],
+  [
+    date20210716, date20210723, "7 days",
+    ["years", 0, 0, 0, 7],
+    ["months", 0, 0, 0, 7],
+    ["weeks", 0, 0, 1, 0],
+  ],
+  [
+    date20210716, date20210817, "32 days",
+    ["years", 0, 1, 0, 1],
+    ["months", 0, 1, 0, 1],
+    ["weeks", 0, 0, 4, 4],
+    ["days", 0, 0, 0, 32],
+  ],
+  [
+    date20210716, date20210916, "62 days",
+    ["years", 0, 2, 0, 0],
+    ["months", 0, 2, 0, 0],
+    ["weeks", 0, 0, 8, 6],
+    ["days", 0, 0, 0, 62],
+  ],
+  [
+    date20210716, date20210813, "4 weeks",
+    ["years", 0, 0, 0, 28],
+    ["months", 0, 0, 0, 28],
+    ["weeks", 0, 0, 4, 0],
+    ["days", 0, 0, 0, 28],
+  ],
+  [
+    date20210716, date20210816, "1 month in same year",
+    ["years", 0, 1, 0, 0],
+    ["months", 0, 1, 0, 0],
+    ["weeks", 0, 0, 4, 3],
+  ],
+  [
+    date20210713, date20210816, "1 month and 3 days",
+    ["years", 0, 1, 0, 3],
+    ["months", 0, 1, 0, 3],
+    ["weeks", 0, 0, 4, 6],
+  ],
+  [
+    date20201216, date20210116, "1 month in different year",
+    ["years", 0, 1, 0, 0],
+    ["months", 0, 1, 0, 0],
+  ],
+  [
+    date20210105, date20210205, "1 month in same year",
+    ["years", 0, 1, 0, 0],
+    ["months", 0, 1, 0, 0],
+  ],
+  [
+    date20210107, date20210307, "2 months in same year",
+    ["years", 0, 2, 0, 0],
+    ["months", 0, 2, 0, 0],
+  ],
+  [
+    date20210716, date20210921, "2 months and 5 days",
+    ["years", 0, 2, 0, 5],
+    ["months", 0, 2, 0, 5],
+  ],
+  [
+    date20210716, date20210817, "1 month and 1 day in a month with 31 days",
+    ["years", 0, 1, 0, 1],
+    ["months", 0, 1, 0, 1],
+    ["days", 0, 0, 0, 32],
+  ],
+  [
+    date20210716, date20210813, "28 days across a month which has 31 days",
+    ["years", 0, 0, 0, 28],
+    ["months", 0, 0, 0, 28],
+    ["weeks", 0, 0, 4, 0],
+  ],
+  [
+    date20210716, date20210916, "2 months which both have 31 days",
+    ["years", 0, 2, 0, 0],
+    ["months", 0, 2, 0, 0],
+    ["weeks", 0, 0, 8, 6],
+    ["days", 0, 0, 0, 62],
+  ],
+  [
+    date20210716, date20220716, "1 year",
+    ["years", 1, 0, 0, 0],
+    ["months", 0, 12, 0, 0],
+    ["weeks", 0, 0, 52, 1],
+    ["days", 0, 0, 0, 365],
+  ],
+  [
+    date20210716, date20220719, "1 year, 3 days",
+    ["years", 1, 0, 0, 3],
+    ["months", 0, 12, 0, 3],
+    ["weeks", 0, 0, 52, 4],
+    ["days", 0, 0, 0, 368],
+  ],
+  [
+    date20210716, date20220919, "1 year, 2 months, 3 days",
+    ["years", 1, 2, 0, 3],
+    ["months", 0, 14, 0, 3],
+  ],
+  [
+    date20210716, date20221017, "1 year, 3 months, 1 day",
+    ["years", 1, 3, 0, 1],
+    ["months", 0, 15, 0, 1],
+  ],
+  [
+    date20200201, date20210201, "start of February",
+    ["years", 1, 0, 0, 0],
+    ["months", 0, 12, 0, 0],
+  ],
+  [
+    date20210228, date20220228, "end of February",
+    ["years", 1, 0, 0, 0],
+    ["months", 0, 12, 0, 0],
+  ],
+  [
+    date20190101, date20190201, "length of January 2019",
+    ["days", 0, 0, 0, 31],
+  ],
+  [
+    date20210716, date20310716, "10 years",
+    ["years", 10, 0, 0, 0],
+    ["months", 0, 120, 0, 0],
+    ["weeks", 0, 0, 521, 5],
+    ["days", 0, 0, 0, 3652],
+  ],
+  [
+    date20210716, date20311216, "10 years and 5 months",
+    ["years", 10, 5, 0, 0],
+    ["months", 0, 125, 0, 0],
+  ],
+  [
+    date20210716, date20220719, "1 year and 3 days",
+    ["years", 1, 0, 0, 3],
+  ],
+  [
+    date20210716, date20220919, "1 year 2 months and 3 days",
+    ["years", 1, 2, 0, 3],
+  ],
+  [
+    date20210716, date20311216, "10 years and 5 months",
+    ["years", 10, 5, 0, 0],
+  ],
+  [
+    date19971216, date20110716, "13 years and 7 months",
+    ["years", 13, 7, 0, 0],
+  ],
+  [
+    date19971216, date20210716, "23 years and 7 months",
+    ["years", 23, 7, 0, 0],
+  ],
+  [
+    date19970716, date20210716, "24 years",
+    ["years", 24, 0, 0, 0],
+  ],
+  [
+    date19970716, date20210715, "23 years, 11 months and 29 days",
+    ["years", 23, 11, 0, 29],
+  ],
+  [
+    date19970616, date20210615, "23 years, 11 months and 30 days",
+    ["years", 23, 11, 0, 30],
+  ],
+  [
+    date19600216, date20200315, "60 years, 28 days",
+    ["years", 60, 0, 0, 28],
+  ],
+  [
+    date19600216, date20200316, "60 years, 1 month",
+    ["years", 60, 1, 0, 0],
+  ],
+  [
+    date20210330, date20210716, "3 months and 16 days",
+    ["years", 0, 3, 0, 16],
+  ],
+  [
+    date20200330, date20210716, "1 year, 3 months and 16 days",
+    ["years", 1, 3, 0, 16],
+  ],
+  [
+    date19600216, date20210315, "61 years, 27 days",
+    ["years", 61, 0, 0, 27],
+  ],
+  [
+    date19600330, date20210716, "61 years, 3 months and 16 days",
+    ["years", 61, 3, 0, 16],
+  ],
+  [
+    date20191230, date20210716, "1 year, 6 months and 16 days",
+    ["years", 1, 6, 0, 16],
+  ],
+  [
+    date20201230, date20210716, "6 months and 16 days",
+    ["years", 0, 6, 0, 16],
+  ],
+  [
+    date19971230, date20210716, "23 years, 6 months and 16 days",
+    ["years", 23, 6, 0, 16],
+  ],
+  [
+    date00011225, date20210716, "2019 years, 6 months and 21 days",
+    ["years", 2019, 6, 0, 21],
+  ],
+  [
+    date20191230, date20210305, "1 year, 2 months and 5 days",
+    ["years", 1, 2, 0, 5],
+  ],
+  [
+    date19690724, date20190724, "crossing epoch",
+    ["years", 50, 0, 0, 0],
+  ],
+  [
+    date20210717, date20210716, "negative one day",
+    ["years", 0, 0, 0, -1],
+    ["months", 0, 0, 0, -1],
+    ["weeks", 0, 0, 0, -1],
+    ["days", 0, 0, 0, -1],
+  ],
+  [
+    date20210723, date20210716, "negative 7 days",
+    ["years", 0, 0, 0, -7],
+    ["months", 0, 0, 0, -7],
+    ["weeks", 0, 0, -1, 0],
+  ],
+  [
+    date20210816, date20210716, "negative 1 month in same year",
+    ["years", 0, -1, 0, 0],
+    ["months", 0, -1, 0, 0],
+    ["weeks", 0, 0, -4, -3],
+  ],
+  [
+    date20210116, date20201216, "negative 1 month in different year",
+    ["years", 0, -1, 0, 0],
+    ["months", 0, -1, 0, 0],
+  ],
+  [
+    date20210205, date20210105, "negative 1 month in same year",
+    ["years", 0, -1, 0, 0],
+    ["months", 0, -1, 0, 0],
+  ],
+  [
+    date20210817, date20210716, "negative 1 month and 1 day in a month with 31 days",
+    ["years", 0, -1, 0, -1],
+    ["months", 0, -1, 0, -1],
+    ["days", 0, 0, 0, -32],
+  ],
+  [
+    date20210816, date20210713, "negative 1 month and 3 days",
+    ["years", 0, -1, 0, -3],
+    ["months", 0, -1, 0, -3],
+    ["weeks", 0, 0, -4, -6],
+  ],
+  [
+    date20210813, date20210716, "negative 28 days across a month which has 31 days",
+    ["years", 0, 0, 0, -28],
+    ["months", 0, 0, 0, -28],
+    ["weeks", 0, 0, -4, 0],
+  ],
+  [
+    date20210916, date20210716, "negative 2 months which both have 31 days",
+    ["years", 0, -2, 0, 0],
+    ["months", 0, -2, 0, 0],
+    ["weeks", 0, 0, -8, -6],
+    ["days", 0, 0, 0, -62],
+  ],
+  [
+    date20210921, date20210716, "negative 2 months and 5 days",
+    ["years", 0, -2, 0, -5],
+    ["months", 0, -2, 0, -5],
+  ],
+  [
+    date20210817, date20210716, "negative 32 days",
+    ["years", 0, -1, 0, -1],
+    ["months", 0, -1, 0, -1],
+    ["weeks", 0, 0, -4, -4],
+    ["days", 0, 0, 0, -32],
+  ],
+  [
+    date20210916, date20210716, "negative 62 days",
+    ["years", 0, -2, 0, 0],
+    ["months", 0, -2, 0, 0],
+    ["weeks", 0, 0, -8, -6],
+    ["days", 0, 0, 0, -62],
+  ],
+  [
+    date20220716, date20210716, "negative 1 year",
+    ["years", -1, 0, 0, 0],
+    ["months", 0, -12, 0, 0],
+    ["weeks", 0, 0, -52, -1],
+    ["days", 0, 0, 0, -365],
+  ],
+  [
+    date20310716, date20210716, "negative 10 years",
+    ["years", -10, 0, 0, 0],
+    ["months", 0, -120, 0, 0],
+    ["weeks", 0, 0, -521, -5],
+    ["days", 0, 0, 0, -3652],
+  ],
+  [
+    date20220719, date20210716, "negative 1 year and 3 days",
+    ["years", -1, 0, 0, -3],
+  ],
+  [
+    date20220919, date20210716, "negative 1 year 2 months and 3 days",
+    ["years", -1, -2, 0, -3],
+  ],
+  [
+    date20221017, date20210716, "negative 1 year, 3 months, and 1 day",
+    ["years", -1, -3, 0, -1],
+    ["months", 0, -15, 0, -1],
+  ],
+  [
+    date20311216, date20210716, "negative 10 years and 5 months",
+    ["years", -10, -5, 0, 0],
+  ],
+  [
+    date20110716, date19971216, "negative 13 years and 7 months",
+    ["years", -13, -7, 0, 0],
+  ],
+  [
+    date20210716, date19971216, "negative 23 years and 7 months",
+    ["years", -23, -7, 0, 0],
+  ],
+  [
+    date20210716, date19970716, "negative 24 years",
+    ["years", -24, 0, 0, 0],
+  ],
+  [
+    date20210715, date19970716, "negative 23 years, 11 months and 30 days",
+    ["years", -23, -11, 0, -30],
+  ],
+  [
+    date20210615, date19970616, "negative 23 years, 11 months and 29 days",
+    ["years", -23, -11, 0, -29],
+  ],
+  [
+    date20200315, date19600216, "negative 60 years, 28 days",
+    ["years", -60, 0, 0, -28],
+  ],
+  [
+    date20200316, date19600216, "negative 60 years, 1 month",
+    ["years", -60, -1, 0, 0],
+  ],
+  [
+    date20210716, date20210330, "negative 3 months and 17 days",
+    ["years", 0, -3, 0, -17],
+  ],
+  [
+    date20210716, date20200330, "negative 1 year, 3 months and 17 days",
+    ["years", -1, -3, 0, -17],
+  ],
+  [
+    date20210716, date19600330, "negative 61 years, 3 months and 17 days",
+    ["years", -61, -3, 0, -17],
+  ],
+  [
+    date20210716, date20191230, "negative 1 year, 6 months and 17 days",
+    ["years", -1, -6, 0, -17],
+  ],
+  [
+    date20210716, date20201230, "negative 6 months and 17 days",
+    ["years", 0, -6, 0, -17],
+  ],
+  [
+    date20210716, date19971230, "negative 23 years, 6 months and 17 days",
+    ["years", -23, -6, 0, -17],
+  ],
+  [
+    date20210716, date00011225, "negative 2019 years, 6 months and 22 days",
+    ["years", -2019, -6, 0, -22],
+  ],
+  [
+    date20210305, date20191230, "negative 1 year, 2 months and 6 days",
+    ["years", -1, -2, 0, -6],
+  ],
+  [
+    date20190724, date19690724, "crossing epoch",
+    ["years", -50, 0, 0, 0],
+  ],
+];
+
+function neg(x) {
+  return (x === 0) ? x : -x;
+}
+
+for (const [one, two, descr, ...units] of tests) {
+  for (const [largestUnit, years, months, weeks, days] of units) {
+    TemporalHelpers.assertDuration(
+      one.since(two, { largestUnit }),
+      neg(years), neg(months), neg(weeks), neg(days), 0, 0, 0, 0, 0, 0,
+      descr
+    );
+  }
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/since/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/since/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..f7c29c1feb4ed
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/since/no-fractional-minutes-hours.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.prototype.since
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainDate(2000, 5, 2)
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => instance.since(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/since/throws-with-time-units.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/since/throws-with-time-units.js
new file mode 100644
index 0000000000000..e38760b26a795
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/since/throws-with-time-units.js
@@ -0,0 +1,23 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.prototype.since
+description: Throws if largestUnit or smallestUnit is a time unit
+features: [Temporal]
+---*/
+
+const from = new Temporal.PlainDate(2021, 7, 16);
+const to = new Temporal.PlainDate(2021, 7, 17);
+
+const units = ['hour', 'minute', 'second', 'millisecond', 'microsecond', 'nanosecond'];
+
+for (const largestUnit of units) {
+  for (const smallestUnit of units) {
+    assert.throws(RangeError, () => from.since(to, { largestUnit, smallestUnit }),
+                 `Can't use ${largestUnit} and ${smallestUnit} as largestUnit and smallestUnit for PlainDate`);
+  }
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/subtract/argument-duration-max-plus-min-date.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/subtract/argument-duration-max-plus-min-date.js
new file mode 100644
index 0000000000000..a1f6910764e12
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/subtract/argument-duration-max-plus-min-date.js
@@ -0,0 +1,60 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.prototype.subtract
+description: Maximum allowed duration subtracting from maximum allowed date
+includes: [temporalHelpers.js]
+features: [Temporal]
+---*/
+
+const max = Temporal.PlainDate.from({ year: 275760, month: 9, day: 13 });
+
+const maxCases = [
+  ["P547581Y4M24DT23H59M59.999999999S", "string with max years"],
+  [{ years: 547581, months: 4, days: 24, nanoseconds: 86399999999999 }, "property bag with max years"],
+  ["P6570976M24DT23H59M59.999999999S", "string with max months"],
+  [{ months: 6570976, days: 24, nanoseconds: 86399999999999 }, "property bag with max months"],
+  ["P28571428W5DT23H59M59.999999999S", "string with max weeks"],
+  [{ weeks: 28_571_428, days: 5, nanoseconds: 86399999999999 }, "property bag with max weeks"],
+  ["P200000001DT23H59M59.999999999S", "string with max days"],
+  [{ days: 200_000_001, nanoseconds: 86399999999999 }, "property bag with max days"],
+  ["PT4800000047H59M59.999999999S", "string with max hours"],
+  [{ hours: 4_800_000_047, minutes: 59, seconds: 59, milliseconds: 999, microseconds: 999, nanoseconds: 999 }, "property bag with max hours"],
+  ["PT288000002879M59.999999999S", "string with max minutes"],
+  [{ minutes: 288_000_002_879, seconds: 59, milliseconds: 999, microseconds: 999, nanoseconds: 999 }, "property bag with max minutes"],
+  ["PT17280000172799.999999998S", "string with max seconds"],
+  [{ seconds: 17_280_000_172_799, nanoseconds: 999999998 }, "property bag with max seconds"],
+];
+
+for (const [arg, descr] of maxCases) {
+    const result = max.subtract(arg);
+    TemporalHelpers.assertPlainDate(result, -271821, 4, "M04", 19,  `operation succeeds with ${descr}`);
+}
+
+const min = Temporal.PlainDate.from({ year: -271821, month: 4, day: 19 });
+
+const minCases = [
+  ["-P547581Y4M25DT23H59M59.999999999S", "string with max years"],
+  [{ years: -547581, months: -4, days: -25, nanoseconds: -86399999999999 }, "property bag with max years"],
+  ["-P6570976M25DT23H59M59.999999999S", "string with max months"],
+  [{ months: -6570976, days: -25, nanoseconds: -86399999999999 }, "property bag with max months"],
+  ["-P28571428W5DT23H59M59.999999999S", "string with max weeks"],
+  [{ weeks: -28_571_428, days: -5, nanoseconds: -86399999999999 }, "property bag with max weeks"],
+  ["-P200000001DT23H59M59.999999999S", "string with max days"],
+  [{ days: -200_000_001, nanoseconds: -86399999999999 }, "property bag with max days"],
+  ["-PT4800000047H59M59.999999999S", "string with max hours"],
+  [{ hours: -4_800_000_047, minutes: -59, seconds: -59, milliseconds: -999, microseconds: -999, nanoseconds: -999 }, "property bag with max hours"],
+  ["-PT288000002879M59.999999999S", "string with max minutes"],
+  [{ minutes: -288_000_002_879, seconds: -59, milliseconds: -999, microseconds: -999, nanoseconds: -999 }, "property bag with max minutes"],
+  ["-PT17280000172799.999999998S", "string with max seconds"],
+  [{ seconds: -17_280_000_172_799, nanoseconds: -999999998 }, "property bag with max seconds"],
+];
+
+for (const [arg, descr] of minCases) {
+    const result = min.subtract(arg);
+    TemporalHelpers.assertPlainDate(result, 275760, 9, "M09", 13,  `operation succeeds with ${descr}`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/subtract/argument-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/subtract/argument-string.js
index 168af12c461a4..e3bb12933b078 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/subtract/argument-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/subtract/argument-string.js
@@ -10,7 +10,7 @@ features: [Temporal]
 ---*/
 
 const instance = Temporal.PlainDate.from({ year: 2000, month: 5, day: 2 });
-const result = instance.subtract("P3D");
-TemporalHelpers.assertPlainDate(result, 2000, 4, "M04", 29);
+TemporalHelpers.assertPlainDate(instance.subtract("P3D"), 2000, 4, "M04", 29);
+TemporalHelpers.assertPlainDate(instance.subtract("-P3D"), 2000, 5, "M05", 5);
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/subtract/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/subtract/basic.js
index a7a928366b0d6..e7cf44cd76128 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/subtract/basic.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/subtract/basic.js
@@ -29,4 +29,90 @@ TemporalHelpers.assertPlainDate(Temporal.PlainDate.from('2019-10-29').subtract({
 TemporalHelpers.assertPlainDate(Temporal.PlainDate.from('2019-01-28').subtract({ months: -1 }),
   2019, 2, "M02", 28);
 
+let p1y = new Temporal.Duration(1);
+let p4y = new Temporal.Duration(4);
+let p5m = new Temporal.Duration(0, 5);
+let p1y2m = new Temporal.Duration(1, 2);
+let p1y4d = new Temporal.Duration(1, 0, 0, 4);
+let p1y2m4d = new Temporal.Duration(1, 2, 0, 4);
+let p10d = new Temporal.Duration(0, 0, 0, 10);
+let p1w = new Temporal.Duration(0, 0, 1);
+let p6w = new Temporal.Duration(0, 0, 6);
+let p2w3d = new Temporal.Duration(0, 0, 2, 3);
+let p1y2w = new Temporal.Duration(1, 0, 2);
+let p2m3w = new Temporal.Duration(0, 2, 3);
+
+let testData = [
+  [ '2020-02-29', p1y, '2021-02-28' ],
+  [ '2020-02-29', p4y, '2024-02-29' ],
+  [ '2021-07-16', p1y, '2022-07-16' ],
+  [ '2021-07-16', p5m, '2021-12-16' ],
+  [ '2021-08-16', p5m, '2022-01-16' ],
+  [ '2021-10-31', p5m, '2022-03-31' ],
+  [ '2021-09-30', p5m, '2022-02-28' ],
+  [ '2019-09-30', p5m, '2020-02-29' ],
+  [ '2019-10-01', p5m, '2020-03-01' ],
+  [ '2021-07-16', p1y2m, '2022-09-16' ],
+  [ '2021-11-30', p1y2m, '2023-01-30' ],
+  [ '2021-12-31', p1y2m, '2023-02-28' ],
+  [ '2022-12-31', p1y2m, '2024-02-29' ],
+  [ '2021-07-16', p1y4d, '2022-07-20' ],
+  [ '2021-02-27', p1y4d, '2022-03-03' ],
+  [ '2023-02-27', p1y4d, '2024-03-02' ],
+  [ '2021-12-30', p1y4d, '2023-01-03' ],
+  [ '2021-07-30', p1y4d, '2022-08-03' ],
+  [ '2021-06-30', p1y4d, '2022-07-04' ],
+  [ '2021-07-16', p1y2m4d, '2022-09-20' ],
+  [ '2021-02-27', p1y2m4d, '2022-05-01' ],
+  [ '2021-02-26', p1y2m4d, '2022-04-30' ],
+  [ '2023-02-26', p1y2m4d, '2024-04-30' ],
+  [ '2021-12-30', p1y2m4d, '2023-03-04' ],
+  [ '2021-07-30', p1y2m4d, '2022-10-04' ],
+  [ '2021-06-30', p1y2m4d, '2022-09-03' ],
+  [ '2021-07-16', p10d, '2021-07-26' ],
+  [ '2021-07-26', p10d, '2021-08-05' ],
+  [ '2021-12-26', p10d, '2022-01-05' ],
+  [ '2020-02-26', p10d, '2020-03-07' ],
+  [ '2021-02-26', p10d, '2021-03-08' ],
+  [ '2020-02-19', p10d, '2020-02-29' ],
+  [ '2021-02-19', p10d, '2021-03-01' ],
+  [ '2021-02-19', p1w, '2021-02-26' ],
+  [ '2021-02-27', p1w, '2021-03-06' ],
+  [ '2020-02-27', p1w, '2020-03-05' ],
+  [ '2021-12-24', p1w, '2021-12-31' ],
+  [ '2021-12-27', p1w, '2022-01-03' ],
+  [ '2021-01-27', p1w, '2021-02-03' ],
+  [ '2021-06-27', p1w, '2021-07-04' ],
+  [ '2021-07-27', p1w, '2021-08-03' ],
+  [ '2021-02-19', p6w, '2021-04-02' ],
+  [ '2021-02-27', p6w, '2021-04-10' ],
+  [ '2020-02-27', p6w, '2020-04-09' ],
+  [ '2021-12-24', p6w, '2022-02-04' ],
+  [ '2021-12-27', p6w, '2022-02-07' ],
+  [ '2021-01-27', p6w, '2021-03-10' ],
+  [ '2021-06-27', p6w, '2021-08-08' ],
+  [ '2021-07-27', p6w, '2021-09-07' ],
+  [ '2020-02-29', p2w3d, '2020-03-17' ],
+  [ '2020-02-28', p2w3d, '2020-03-16' ],
+  [ '2021-02-28', p2w3d, '2021-03-17' ],
+  [ '2020-12-28', p2w3d, '2021-01-14' ],
+  [ '2020-02-29', p1y2w, '2021-03-14' ],
+  [ '2020-02-28', p1y2w, '2021-03-14' ],
+  [ '2021-02-28', p1y2w, '2022-03-14' ],
+  [ '2020-12-28', p1y2w, '2022-01-11' ],
+  [ '2020-02-29', p2m3w, '2020-05-20' ],
+  [ '2020-02-28', p2m3w, '2020-05-19' ],
+  [ '2021-02-28', p2m3w, '2021-05-19' ],
+  [ '2020-12-28', p2m3w, '2021-03-21' ],
+  [ '2019-12-28', p2m3w, '2020-03-20' ],
+  [ '2019-10-28', p2m3w, '2020-01-18' ],
+  [ '2019-10-31', p2m3w, '2020-01-21' ],
+];
+
+for (let [dateString, duration, resultString] of testData) {
+  const date = Temporal.PlainDate.from(dateString);
+  const result = Temporal.PlainDate.from(resultString);
+  TemporalHelpers.assertPlainDatesEqual(date.subtract(duration.negated()), result);
+}
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/no-observable-array-iteration.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/no-observable-array-iteration.js
new file mode 100644
index 0000000000000..628bef5226c14
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/toZonedDateTime/no-observable-array-iteration.js
@@ -0,0 +1,23 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.prototype.tozoneddatetime
+description: >
+  Calling GetPossibleEpochNanoseconds (from ToTemporalZonedDateTime > InterpretISODateTimeOffset)
+  causes no observable array iteration.
+features: [Temporal]
+---*/
+
+const arrayPrototypeSymbolIteratorOriginal = Array.prototype[Symbol.iterator];
+Array.prototype[Symbol.iterator] = function arrayIterator() {
+  throw new Test262Error("Array should not be iterated");
+}
+
+let pd = new Temporal.PlainDate(2000, 1, 1);
+let zdt = pd.toZonedDateTime("UTC");
+
+Array.prototype[Symbol.iterator] = arrayPrototypeSymbolIteratorOriginal;
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/until/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/until/argument-propertybag-calendar-invalid-iso-string.js
index 47a8f7f92e0b5..73273675dd1fc 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/until/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/until/argument-propertybag-calendar-invalid-iso-string.js
@@ -12,10 +12,12 @@ const instance = new Temporal.PlainDate(2000, 5, 2);
 
 const invalidStrings = [
   ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
 
-for (const [calendar, description] of invalidStrings) {
-  const arg = { year: 1976, monthCode: "M11", day: 18, calendar };
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1970, monthCode: "M11", day: 18, calendar: cal };
   assert.throws(
     RangeError,
     () => instance.until(arg),
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/until/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/until/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..087f47dab637e
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/until/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.prototype.until
+description: Invalid ISO string as calendar should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainDate(2000, 5, 2);
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => instance.until(arg),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/until/basic-arithmetic.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/until/basic-arithmetic.js
index 5513978bc1a32..66ab00412b17a 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/until/basic-arithmetic.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/until/basic-arithmetic.js
@@ -20,11 +20,13 @@ const date19970616 = Temporal.PlainDate.from("1997-06-16");
 const date19970716 = Temporal.PlainDate.from("1997-07-16");
 const date19971216 = Temporal.PlainDate.from("1997-12-16");
 const date19971230 = Temporal.PlainDate.from("1997-12-30");
+const date20110716 = Temporal.PlainDate.from("2011-07-16");
 const date20190101 = Temporal.PlainDate.from("2019-01-01");
 const date20190201 = Temporal.PlainDate.from("2019-02-01");
 const date20190724 = Temporal.PlainDate.from({ year: 2019, month: 7, day: 24 });
 const date20191230 = Temporal.PlainDate.from("2019-12-30");
 const date20200201 = Temporal.PlainDate.from("2020-02-01");
+const date20200315 = Temporal.PlainDate.from("2020-03-15");
 const date20200316 = Temporal.PlainDate.from("2020-03-16");
 const date20200330 = Temporal.PlainDate.from("2020-03-30");
 const date20201216 = Temporal.PlainDate.from("2020-12-16");
@@ -37,8 +39,10 @@ const date20210205 = Temporal.PlainDate.from("2021-02-05");
 const date20210228 = new Temporal.PlainDate(2021, 2, 28);
 const date20210305 = Temporal.PlainDate.from("2021-03-05");
 const date20210307 = Temporal.PlainDate.from("2021-03-07");
+const date20210315 = Temporal.PlainDate.from("2021-03-15");
 const date20210330 = Temporal.PlainDate.from("2021-03-30");
 const date20210615 = Temporal.PlainDate.from("2021-06-15");
+const date20210713 = Temporal.PlainDate.from("2021-07-13");
 const date20210715 = Temporal.PlainDate.from("2021-07-15");
 const date20210716 = Temporal.PlainDate.from("2021-07-16");
 const date20210717 = Temporal.PlainDate.from("2021-07-17");
@@ -47,10 +51,13 @@ const date20210813 = Temporal.PlainDate.from("2021-08-13");
 const date20210816 = Temporal.PlainDate.from("2021-08-16");
 const date20210817 = Temporal.PlainDate.from("2021-08-17");
 const date20210916 = Temporal.PlainDate.from("2021-09-16");
+const date20210921 = Temporal.PlainDate.from("2021-09-21");
+const date20211017 = Temporal.PlainDate.from("2021-10-17");
 const date20220228 = new Temporal.PlainDate(2022, 2, 28);
 const date20220716 = Temporal.PlainDate.from("2022-07-16");
 const date20220719 = Temporal.PlainDate.from("2022-07-19");
 const date20220919 = Temporal.PlainDate.from("2022-09-19");
+const date20221017 = Temporal.PlainDate.from("2022-10-17");
 const date20310716 = Temporal.PlainDate.from("2031-07-16");
 const date20311216 = Temporal.PlainDate.from("2031-12-16");
 
@@ -75,12 +82,39 @@ const tests = [
     ["months", 0, 0, 0, 7],
     ["weeks", 0, 0, 1, 0],
   ],
+  [
+    date20210716, date20210817, "32 days",
+    ["years", 0, 1, 0, 1],
+    ["months", 0, 1, 0, 1],
+    ["weeks", 0, 0, 4, 4],
+    ["days", 0, 0, 0, 32],
+  ],
+  [
+    date20210716, date20210916, "62 days",
+    ["years", 0, 2, 0, 0],
+    ["months", 0, 2, 0, 0],
+    ["weeks", 0, 0, 8, 6],
+    ["days", 0, 0, 0, 62],
+  ],
+  [
+    date20210716, date20210813, "4 weeks",
+    ["years", 0, 0, 0, 28],
+    ["months", 0, 0, 0, 28],
+    ["weeks", 0, 0, 4, 0],
+    ["days", 0, 0, 0, 28],
+  ],
   [
     date20210716, date20210816, "1 month in same year",
     ["years", 0, 1, 0, 0],
     ["months", 0, 1, 0, 0],
     ["weeks", 0, 0, 4, 3],
   ],
+  [
+    date20210713, date20210816, "1 month and 3 days",
+    ["years", 0, 1, 0, 3],
+    ["months", 0, 1, 0, 3],
+    ["weeks", 0, 0, 4, 6],
+  ],
   [
     date20201216, date20210116, "1 month in different year",
     ["years", 0, 1, 0, 0],
@@ -91,6 +125,16 @@ const tests = [
     ["years", 0, 1, 0, 0],
     ["months", 0, 1, 0, 0],
   ],
+  [
+    date20210107, date20210307, "2 months in same year",
+    ["years", 0, 2, 0, 0],
+    ["months", 0, 2, 0, 0],
+  ],
+  [
+    date20210716, date20210921, "2 months and 5 days",
+    ["years", 0, 2, 0, 5],
+    ["months", 0, 2, 0, 5],
+  ],
   [
     date20210716, date20210817, "1 month and 1 day in a month with 31 days",
     ["years", 0, 1, 0, 1],
@@ -117,6 +161,23 @@ const tests = [
     ["weeks", 0, 0, 52, 1],
     ["days", 0, 0, 0, 365],
   ],
+  [
+    date20210716, date20220719, "1 year, 3 days",
+    ["years", 1, 0, 0, 3],
+    ["months", 0, 12, 0, 3],
+    ["weeks", 0, 0, 52, 4],
+    ["days", 0, 0, 0, 368],
+  ],
+  [
+    date20210716, date20220919, "1 year, 2 months, 3 days",
+    ["years", 1, 2, 0, 3],
+    ["months", 0, 14, 0, 3],
+  ],
+  [
+    date20210716, date20221017, "1 year, 3 months, 1 day",
+    ["years", 1, 3, 0, 1],
+    ["months", 0, 15, 0, 1],
+  ],
   [
     date20200201, date20210201, "start of February",
     ["years", 1, 0, 0, 0],
@@ -138,6 +199,11 @@ const tests = [
     ["weeks", 0, 0, 521, 5],
     ["days", 0, 0, 0, 3652],
   ],
+  [
+    date20210716, date20311216, "10 years and 5 months",
+    ["years", 10, 5, 0, 0],
+    ["months", 0, 125, 0, 0],
+  ],
   [
     date20210716, date20220719, "1 year and 3 days",
     ["years", 1, 0, 0, 3],
@@ -150,6 +216,10 @@ const tests = [
     date20210716, date20311216, "10 years and 5 months",
     ["years", 10, 5, 0, 0],
   ],
+  [
+    date19971216, date20110716, "13 years and 7 months",
+    ["years", 13, 7, 0, 0],
+  ],
   [
     date19971216, date20210716, "23 years and 7 months",
     ["years", 23, 7, 0, 0],
@@ -166,6 +236,10 @@ const tests = [
     date19970616, date20210615, "23 years, 11 months and 30 days",
     ["years", 23, 11, 0, 30],
   ],
+  [
+    date19600216, date20200315, "60 years, 28 days",
+    ["years", 60, 0, 0, 28],
+  ],
   [
     date19600216, date20200316, "60 years, 1 month",
     ["years", 60, 1, 0, 0],
@@ -178,6 +252,10 @@ const tests = [
     date20200330, date20210716, "1 year, 3 months and 16 days",
     ["years", 1, 3, 0, 16],
   ],
+  [
+    date19600216, date20210315, "61 years, 27 days",
+    ["years", 61, 0, 0, 27],
+  ],
   [
     date19600330, date20210716, "61 years, 3 months and 16 days",
     ["years", 61, 3, 0, 16],
@@ -241,6 +319,12 @@ const tests = [
     ["months", 0, -1, 0, -1],
     ["days", 0, 0, 0, -32],
   ],
+  [
+    date20210816, date20210713, "negative 1 month and 3 days",
+    ["years", 0, -1, 0, -3],
+    ["months", 0, -1, 0, -3],
+    ["weeks", 0, 0, -4, -6],
+  ],
   [
     date20210813, date20210716, "negative 28 days across a month which has 31 days",
     ["years", 0, 0, 0, -28],
@@ -254,6 +338,25 @@ const tests = [
     ["weeks", 0, 0, -8, -6],
     ["days", 0, 0, 0, -62],
   ],
+  [
+    date20210921, date20210716, "negative 2 months and 5 days",
+    ["years", 0, -2, 0, -5],
+    ["months", 0, -2, 0, -5],
+  ],
+  [
+    date20210817, date20210716, "negative 32 days",
+    ["years", 0, -1, 0, -1],
+    ["months", 0, -1, 0, -1],
+    ["weeks", 0, 0, -4, -4],
+    ["days", 0, 0, 0, -32],
+  ],
+  [
+    date20210916, date20210716, "negative 62 days",
+    ["years", 0, -2, 0, 0],
+    ["months", 0, -2, 0, 0],
+    ["weeks", 0, 0, -8, -6],
+    ["days", 0, 0, 0, -62],
+  ],
   [
     date20220716, date20210716, "negative 1 year",
     ["years", -1, 0, 0, 0],
@@ -276,10 +379,19 @@ const tests = [
     date20220919, date20210716, "negative 1 year 2 months and 3 days",
     ["years", -1, -2, 0, -3],
   ],
+  [
+    date20221017, date20210716, "negative 1 year, 3 months, and 1 day",
+    ["years", -1, -3, 0, -1],
+    ["months", 0, -15, 0, -1],
+  ],
   [
     date20311216, date20210716, "negative 10 years and 5 months",
     ["years", -10, -5, 0, 0],
   ],
+  [
+    date20110716, date19971216, "negative 13 years and 7 months",
+    ["years", -13, -7, 0, 0],
+  ],
   [
     date20210716, date19971216, "negative 23 years and 7 months",
     ["years", -23, -7, 0, 0],
@@ -296,6 +408,10 @@ const tests = [
     date20210615, date19970616, "negative 23 years, 11 months and 29 days",
     ["years", -23, -11, 0, -29],
   ],
+  [
+    date20200315, date19600216, "negative 60 years, 28 days",
+    ["years", -60, 0, 0, -28],
+  ],
   [
     date20200316, date19600216, "negative 60 years, 1 month",
     ["years", -60, -1, 0, 0],
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/until/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/until/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..a202dbd3a498b
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/until/no-fractional-minutes-hours.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.prototype.until
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainDate(2000, 5, 2)
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => instance.until(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/until/throws-with-time-units.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/until/throws-with-time-units.js
new file mode 100644
index 0000000000000..44d63b0bf7ad8
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/until/throws-with-time-units.js
@@ -0,0 +1,23 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.prototype.until
+description: Throws if largestUnit or smallestUnit is a time unit
+features: [Temporal]
+---*/
+
+const from = new Temporal.PlainDate(2021, 7, 16);
+const to = new Temporal.PlainDate(2021, 7, 17);
+
+const units = ['hour', 'minute', 'second', 'millisecond', 'microsecond', 'nanosecond'];
+
+for (const largestUnit of units) {
+  for (const smallestUnit of units) {
+    assert.throws(RangeError, () => from.until(to, { largestUnit, smallestUnit }),
+                 `Can't use ${largestUnit} and ${smallestUnit} as largestUnit and smallestUnit for PlainDate`);
+  }
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/with/plaindatelike-invalid.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/with/plaindatelike-invalid.js
index 4d1e4226904e1..1375c31752943 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/with/plaindatelike-invalid.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/with/plaindatelike-invalid.js
@@ -23,6 +23,8 @@ const tests = [
   [Symbol(), "symbol"],
   [42, "number"],
   [42n, "bigint"],
+  [NaN, "NaN"],
+  [Infinity, "Infinity"],
 
   // Step 4.
   //   RejectObjectWithCalendarOrTimeZone step 2.
@@ -37,10 +39,10 @@ const tests = [
   //   RejectObjectWithCalendarOrTimeZone step 5-6.
   [{ year: 2021, timeZone: "UTC" }, "timeZone"],
 
-  // Step 7.
+  // Step 6.
   [{}, "empty object"],
+  [[], "array"],
   [{ months: 12 }, "only plural property"],
-
 ];
 
 for (const [value, message = String(value)] of tests) {
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/with/time-units-ignored.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/with/time-units-ignored.js
new file mode 100644
index 0000000000000..a3a4a64165583
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/with/time-units-ignored.js
@@ -0,0 +1,30 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright 2021 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.prototype.with
+description: Time units in the property bag are ignored
+includes: [temporalHelpers.js]
+features: [Temporal]
+---*/
+
+let d1 = new Temporal.PlainDate(1911, 10, 10);
+TemporalHelpers.assertPlainDate(d1.with({
+  year: 2021,
+  hour: 30
+}), 2021, 10, 'M10', 10);
+TemporalHelpers.assertPlainDate(d1.with({
+  month: 11,
+  minute: 71
+}), 1911, 11, 'M11', 10);
+TemporalHelpers.assertPlainDate(d1.with({
+  monthCode: 'M05',
+  second: 90
+}), 1911, 5, 'M05', 10);
+TemporalHelpers.assertPlainDate(d1.with({
+  day: 30,
+  era: 'BC'
+}), 1911, 10, 'M10', 30);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/withCalendar/calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/withCalendar/calendar-invalid-iso-string.js
index 6541c80ecbe3a..a524d5f240a35 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/withCalendar/calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/withCalendar/calendar-invalid-iso-string.js
@@ -12,6 +12,7 @@ const instance = new Temporal.PlainDate(1976, 11, 18, "iso8601");
 
 const invalidStrings = [
   ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
 ];
 
 for (const [arg, description] of invalidStrings) {
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/withCalendar/calendar-time-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/withCalendar/calendar-time-string.js
new file mode 100644
index 0000000000000..978efac17399b
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/withCalendar/calendar-time-string.js
@@ -0,0 +1,60 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.prototype.withcalendar
+description: A time string is valid input for Calendar; default is iso8601
+features: [Temporal]
+---*/
+
+const tests = [
+  "15:23",
+  "15:23:30",
+  "15:23:30.123",
+  "15:23:30.123456",
+  "15:23:30.123456789",
+  "1976-11-18T15:23:30.1",
+  "1976-11-18T15:23:30.12",
+  "1976-11-18T15:23:30.123",
+  "1976-11-18T15:23:30.1234",
+  "1976-11-18T15:23:30.12345",
+  "1976-11-18T15:23:30.123456",
+  "1976-11-18T15:23:30.1234567",
+  "1976-11-18T15:23:30.12345678",
+  "1976-11-18T15:23:30.123456789",
+  "1976-11-18T15:23:30,12",
+  "1976-11-18T15:23:30.12-02:00",
+  "152330",
+  "152330.1",
+  "152330-08",
+  "152330.1-08",
+  "152330-0800",
+  "152330.1-0800",
+  "1976-11-18T152330.1+00:00",
+  "19761118T15:23:30.1+00:00",
+  "1976-11-18T15:23:30.1+0000",
+  "1976-11-18T152330.1+0000",
+  "19761118T15:23:30.1+0000",
+  "19761118T152330.1+00:00",
+  "19761118T152330.1+0000",
+  "+001976-11-18T152330.1+00:00",
+  "+0019761118T15:23:30.1+00:00",
+  "+001976-11-18T15:23:30.1+0000",
+  "+001976-11-18T152330.1+0000",
+  "+0019761118T15:23:30.1+0000",
+  "+0019761118T152330.1+00:00",
+  "+0019761118T152330.1+0000",
+  "15",
+  "T15:23:30",
+  "t152330",
+];
+
+const instance = Temporal.PlainDate.from({ year: 1976, month: 11, day: 18});
+
+tests.forEach((arg) => {
+  const result = instance.withCalendar(arg);
+  assert.sameValue(result.calendarId, "iso8601", `Calendar created from string "${arg}"`);
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/calendar-year.js b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/year/basic.js
similarity index 52%
rename from js/src/tests/test262/staging/Temporal/v8/calendar-year.js
rename to js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/year/basic.js
index eff09782cbf82..9563f1f05cb2a 100644
--- a/js/src/tests/test262/staging/Temporal/v8/calendar-year.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDate/prototype/year/basic.js
@@ -1,18 +1,14 @@
 // |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: pending
-description: >
-  Automatically ported from calendar-year test
-  in V8's mjsunit test calendar-year.js
+esid: sec-get-temporal.plaindate.prototype.year
+description: The "year" property of Temporal.PlainDate.prototype
 features: [Temporal]
 ---*/
 
 assert.sameValue((new Temporal.PlainDate(2021, 7, 15)).year, 2021);
-assert.sameValue((new Temporal.PlainDateTime(1997, 8, 23, 5, 30, 13)).year, 1997);
-assert.sameValue((new Temporal.PlainYearMonth(1999, 6)).year, 1999);
 assert.sameValue(Temporal.PlainDate.from('2019-03-15').year, 2019);
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/argument-convert.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/argument-convert.js
new file mode 100644
index 0000000000000..5fe0d639b90d8
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/argument-convert.js
@@ -0,0 +1,42 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime
+description: PlainDateTime constructor with non-integer arguments.
+includes: [temporalHelpers.js]
+features: [Temporal]
+---*/
+
+TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2020.6, 11.7, 24.1, 11.9, 12.8, 13.7, 14.6, 15.5, 1.999999),
+  2020, 11, "M11", 24, 11, 12, 13, 14, 15, 1, "positive fractional");
+
+TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(-2020.6, 11.7, 24.1, 11.9, 12.8, 13.7, 14.6, 15.5, 1.999999),
+  -2020, 11, "M11", 24, 11, 12, 13, 14, 15, 1, "negative fractional");
+
+TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(null, 11, 24, 1, 2, 3, 4, 5, 6),
+  0, 11, "M11", 24, 1, 2, 3, 4, 5, 6, "null defaults to zero");
+
+TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(false, 11, 24, true),
+  0, 11, "M11", 24, 1, 0, 0, 0, 0, 0, "boolean defaults");
+
+TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2020, 11, 24, undefined),
+  2020, 11, "M11", 24, 0, 0, 0, 0, 0, 0, "undefined hour defaults to 0");
+
+TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime("2020.6", "11.7", "24.1", "11.9", "12.8", "13.7", "14.6", "15.5", "1.999999"),
+  2020, 11, "M11", 24, 11, 12, 13, 14, 15, 1, "fractional strings");
+
+for (const invalid of [Symbol(), 1n]) {
+  assert.throws(TypeError, () => new Temporal.PlainDateTime(invalid, 11, 24), `year ${typeof invalid}`);
+  assert.throws(TypeError, () => new Temporal.PlainDateTime(2020, invalid, 24), `month ${typeof invalid}`);
+  assert.throws(TypeError, () => new Temporal.PlainDateTime(2020, 11, invalid), `day ${typeof invalid}`);
+}
+
+for (const invalid of [undefined, "invalid"]) {
+  assert.throws(RangeError, () => new Temporal.PlainDateTime(invalid, 11, 24), `year ${typeof invalid}`);
+  assert.throws(RangeError, () => new Temporal.PlainDateTime(2020, invalid, 24), `month ${typeof invalid}`);
+  assert.throws(RangeError, () => new Temporal.PlainDateTime(2020, 11, invalid), `day ${typeof invalid}`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-get-iso-fields.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/basic.js
similarity index 68%
rename from js/src/tests/test262/staging/Temporal/v8/plain-date-time-get-iso-fields.js
rename to js/src/tests/test262/built-ins/Temporal/PlainDateTime/basic.js
index 9924abef0bb09..7070d26b61875 100644
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-get-iso-fields.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/basic.js
@@ -3,10 +3,8 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: pending
-description: >
-  Automatically ported from plain-date-time-get-iso-fields test
-  in V8's mjsunit test plain-date-time-get-iso-fields.js
+esid: sec-temporal.plaindatetime.constructor
+description: basic tests for the PlainDateTime constructor
 includes: [temporalHelpers.js]
 features: [Temporal]
 ---*/
@@ -18,12 +16,7 @@ TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(1, 2, 3, 4, 5, 6)
 TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(1, 2, 3, 4, 5), 1, 2, 'M02', 3, 4, 5, 0, 0, 0, 0);
 TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(1, 2, 3, 4), 1, 2, 'M02', 3, 4, 0, 0, 0, 0, 0);
 TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(1, 2, 3), 1, 2, 'M02', 3, 0, 0, 0, 0, 0, 0);
-assert.throws(RangeError, () => new Temporal.PlainDateTime(1, 2));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(1));
-assert.throws(RangeError, () => new Temporal.PlainDateTime());
 TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(-25406, 1, 1), -25406, 1, 'M01', 1, 0, 0, 0, 0, 0, 0);
 TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(29345, 12, 31, 23, 59, 59, 999, 999, 999), 29345, 12, 'M12', 31, 23, 59, 59, 999, 999, 999);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(false, true, true, undefined, true), 0, 1, 'M01', 1, 0, 1, 0, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(11.9, 12.8, 13.7, 14.6, 15.5, 16.6, 17.7, 18.8, 1.999999), 11, 12, 'M12', 13, 14, 15, 16, 17, 18, 1);
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/calendar-invalid-iso-string.js
index 8c550ae0a6f20..7477c1d3f4f3c 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/calendar-invalid-iso-string.js
@@ -4,13 +4,14 @@
 
 /*---
 esid: sec-temporal.plaindatetime.constructor
-description: Various invalid ISO string values for calendar
+description: Invalid ISO string as calendar should throw RangeError
 features: [Temporal]
 ---*/
 
 const invalidStrings = [
   ["", "empty string"],
   ["1997-12-04[u-ca=iso8601]", "ISO string with calendar annotation"],
+  ["notacal", "Unknown calendar"],
 ];
 
 for (const [arg, description] of invalidStrings) {
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/compare/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/compare/argument-propertybag-calendar-invalid-iso-string.js
index c1c7a62f2f962..fc2bb67b245ff 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/compare/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/compare/argument-propertybag-calendar-invalid-iso-string.js
@@ -10,10 +10,12 @@ features: [Temporal]
 
 const invalidStrings = [
   ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
-  
-for (const [calendar, description] of invalidStrings) {
-  const arg = { year: 1976, monthCode: "M11", day: 18, calendar };
+
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1976, monthCode: "M11", day: 18, calendar: cal };
   assert.throws(
     RangeError,
     () => Temporal.PlainDateTime.compare(arg, new Temporal.PlainDateTime(1976, 11, 18)),
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/compare/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/compare/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..b07a06692ce68
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/compare/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,29 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.compare
+description: Invalid calendar string should throw RangeError
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => Temporal.PlainDateTime.compare(arg, new Temporal.PlainDateTime(1976, 11, 18)),
+    `${description} is not a valid calendar ID (first argument)`
+  );
+  assert.throws(
+    RangeError,
+    () => Temporal.PlainDateTime.compare(new Temporal.PlainDateTime(1976, 11, 18), arg),
+    `${description} is not a valid calendar ID (second argument)`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/compare/argument-string-invalid.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/compare/argument-string-invalid.js
new file mode 100644
index 0000000000000..5018e886ae69b
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/compare/argument-string-invalid.js
@@ -0,0 +1,15 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright 2021 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.compare
+description: Throws RangeError when the argument is an invalid string
+features: [Temporal]
+---*/
+
+let t1 = new Temporal.PlainDateTime(2021, 3, 14, 1, 2, 3, 4, 5, 6);
+assert.throws(RangeError, () => Temporal.PlainDateTime.compare(t1, 'invalid iso8601 string'), "invalid string in second argument");
+assert.throws(RangeError, () => Temporal.PlainDateTime.compare('invalid iso8601 string', t1), "invalid string in first argument");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/compare/cast.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/compare/cast.js
index dfd83e2876847..67c31447c8732 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/compare/cast.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/compare/cast.js
@@ -11,6 +11,8 @@ features: [Temporal]
 const dt1 = new Temporal.PlainDateTime(1976, 11, 18, 15, 23, 30, 123, 456, 789);
 const dt2 = new Temporal.PlainDateTime(2019, 10, 29, 10, 46, 38, 271, 986, 102);
 
+// outcome smaller
+
 assert.sameValue(
   Temporal.PlainDateTime.compare({ year: 1976, month: 11, day: 18, hour: 15 }, dt2),
   -1,
@@ -35,4 +37,77 @@ assert.sameValue(
   "casts second argument (string)"
 );
 
+// outcome equal
+
+assert.sameValue(
+  Temporal.PlainDateTime.compare({
+    year: 2019,
+    month: 10,
+    day: 29,
+    hour: 10,
+    minute: 46,
+    second: 38,
+    millisecond: 271,
+    microsecond: 986,
+    nanosecond: 102
+  }, dt2),
+  0,
+  "casts first argument (plain object)"
+);
+
+assert.sameValue(
+  Temporal.PlainDateTime.compare("2019-10-29T10:46:38,271986102", dt2),
+  0,
+  "casts first argument (string)"
+);
+
+assert.sameValue(
+  Temporal.PlainDateTime.compare(dt2,
+    {
+      year: 2019,
+      month: 10,
+      day: 29,
+      hour: 10,
+      minute: 46,
+      second: 38,
+      millisecond: 271,
+      microsecond: 986,
+      nanosecond: 102
+    }),
+  0,
+  "casts second argument (plain object)"
+);
+
+assert.sameValue(
+  Temporal.PlainDateTime.compare(dt2, "2019-10-29T10:46:38,271986102"),
+  0,
+  "casts second argument (string)"
+);
+
+// larger
+
+assert.sameValue(
+  Temporal.PlainDateTime.compare({ year: 2025, month: 11, day: 18, hour: 15 }, dt2),
+  1,
+  "casts first argument (plain object)"
+);
+
+assert.sameValue(
+  Temporal.PlainDateTime.compare("2025-11-18T15:23:30.123456789", dt2),
+  1,
+  "casts first argument (string)"
+);
+
+assert.sameValue(
+  Temporal.PlainDateTime.compare(dt1, { year: 1800, month: 10, day: 29, hour: 10 }),
+  1,
+  "casts second argument (plain object)"
+);
+
+assert.sameValue(
+  Temporal.PlainDateTime.compare(dt2, "2019-10-29T10:46:38,271986101"),
+  1,
+  "casts second argument (string)"
+);
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/compare/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/compare/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..6daed8e42a3c4
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/compare/no-fractional-minutes-hours.js
@@ -0,0 +1,29 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.compare
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => Temporal.PlainDateTime.compare(arg, new Temporal.PlainDateTime(2025, 4, 3, 20, 4, 3)),
+    `${description} not allowed in time string (first argument)`
+  );
+  assert.throws(
+    RangeError,
+      () => Temporal.PlainDateTime.compare(new Temporal.PlainDateTime(2025, 4, 3, 20, 4, 3), arg),
+    `${description} not allowed in time string (second argument)`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/argument-propertybag-calendar-invalid-iso-string.js
index b8a1b50b72dfe..da6835e721458 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/argument-propertybag-calendar-invalid-iso-string.js
@@ -4,21 +4,23 @@
 
 /*---
 esid: sec-temporal.plaindatetime.from
-description: Various invalid ISO string values for calendar in a property bag
+description: Invalid ISO string as calendar should throw RangeError
 features: [Temporal]
 ---*/
 
 const invalidStrings = [
-	["", "empty string"],
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
 
-for (const [calendar, description] of invalidStrings) {
-	const arg = { year: 2019, monthCode: "M11", day: 1, calendar };
-	assert.throws(
-		RangeError,
-		() => Temporal.PlainDateTime.from(arg),
-		`${description} is not a valid calendar ID`
-	);
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1976, monthCode: "M11", day: 18, calendar: cal };
+  assert.throws(
+    RangeError,
+    () => Temporal.PlainDateTime.from(arg),
+    `${description} is not a valid calendar ID`
+  );
 }
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..73cd4e64f18f9
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,24 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.from
+description: Invalid calendar string should throw RangeError
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => Temporal.PlainDateTime.from(arg),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/argument-string-invalid.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/argument-string-invalid.js
index 0d086de776250..6f0db9c0b1950 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/argument-string-invalid.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/argument-string-invalid.js
@@ -49,6 +49,14 @@ const invalidStrings = [
   // valid, but outside the supported range:
   "-999999-01-01",
   "+999999-01-01",
+  // "00:0000" is invalid (the hour/minute and minute/second separator
+  // or lack thereof needs to match).
+  "2025-01-01T00:00:00+00:0000",
+  "2025-01-01T00:00:00+0000:00",
+  "202501-01T00:00:00",
+  "2025-0101T00:00:00",
+  "2025-01-01T00:0000",
+  "2025-01-01T0000:00",
 ];
 
 invalidStrings.forEach((s) => {
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/argument-wrong-type.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/argument-wrong-type.js
index 13deec81ceb51..53937e7b4eefb 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/argument-wrong-type.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/argument-wrong-type.js
@@ -10,6 +10,8 @@ description: >
 features: [BigInt, Symbol, Temporal]
 ---*/
 
+assert.throws(TypeError, () => Temporal.PlainDateTime.from(), "no argument");
+
 const primitiveTests = [
   [undefined, "undefined"],
   [null, "null"],
@@ -25,6 +27,14 @@ for (const [arg, description] of primitiveTests) {
     () => Temporal.PlainDateTime.from(arg),
     `${description} does not convert to a valid ISO string`
   );
+
+  for (const options of [undefined, { overflow: 'constrain' }, { overflow: 'reject' }]) {
+    assert.throws(
+      typeof arg === 'string' ? RangeError : TypeError,
+      () => Temporal.PlainDateTime.from(arg, options),
+      `${description} does not convert to a valid ISO string with options ${options}`
+    );
+  }
 }
 
 const typeErrorTests = [
@@ -36,6 +46,10 @@ const typeErrorTests = [
 
 for (const [arg, description] of typeErrorTests) {
   assert.throws(TypeError, () => Temporal.PlainDateTime.from(arg), `${description} is not a valid property bag and does not convert to a string`);
+
+  for (const options of [undefined, { overflow: 'constrain' }, { overflow: 'reject' }]) {
+    assert.throws(TypeError, () => Temporal.PlainDateTime.from(arg, options), `${description} is not a valid property bag and does not convert to a string with options ${options}`);
+  }
 }
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/month-code-wrong-type.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/month-code-wrong-type.js
new file mode 100644
index 0000000000000..985d72eaad62c
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/month-code-wrong-type.js
@@ -0,0 +1,27 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.from
+description: Month code must be a string
+features: [Temporal]
+---*/
+
+const monthCodeValues = [
+  5, 5n, false, Symbol(), null, { toString: () => 5 }
+];
+
+const year = 2026;
+
+for (const monthCode of monthCodeValues) {
+  assert.throws(TypeError, () => Temporal.PlainDateTime.from({
+    year,
+    monthCode,
+    day: 1, hour: 12, minute: 34
+  }), typeof monthCode === 'symbol' ?
+      "Symbol should be rejected as month code" :
+      `month code ${monthCode} should be rejected`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/negative-month-or-day.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/negative-month-or-day.js
new file mode 100644
index 0000000000000..3931643657f2f
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/negative-month-or-day.js
@@ -0,0 +1,14 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.from
+description: Months and days must be non-negative integers
+features: [Temporal]
+---*/
+
+assert.throws(RangeError, () => Temporal.PlainDateTime.from({ year: 2000, day: 1, month: -1 }));
+assert.throws(RangeError, () => Temporal.PlainDateTime.from({ year: 2000, month: 1, day: -1 }));
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..3f338a10fabe9
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/no-fractional-minutes-hours.js
@@ -0,0 +1,24 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.from
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => Temporal.PlainDateTime.from(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/options-wrong-type.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/options-wrong-type.js
index 02e8c067e47d5..33daf588ad55f 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/options-wrong-type.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/options-wrong-type.js
@@ -15,6 +15,9 @@ const badOptions = [
   Symbol(),
   1,
   2n,
+  Infinity,
+  NaN,
+  null,
 ];
 
 for (const value of badOptions) {
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/roundtrip-from-property-bag.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/roundtrip-from-property-bag.js
index cddfe41cafb8e..dc8bd625296c9 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/roundtrip-from-property-bag.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/from/roundtrip-from-property-bag.js
@@ -13,20 +13,30 @@ features: [Temporal, Intl.Era-monthcode]
 
 const options = { overflow: "reject" };
 
-testRoundtrip(2000);
-testRoundtrip(1);
+const testData = [
+  [2000, 1, "M01", 1],
+  [1, 1, "M01", 1],
+  [2021, 7, "M07", 15],
+  [2021, 7, "M07", 3],
+  [2021, 12, "M12", 31],
+  [2021, 7, "M07", 15],
+];
 
-function testRoundtrip(year) {
-  const dateFromYearMonth = Temporal.PlainDateTime.from({ year, month: 1, day: 1, hour: 12, minute: 34, second: 56, millisecond: 987, microsecond: 654, nanosecond: 321 }, options);
+for (const [year, month, monthCode, day] of testData) {
+  testRoundtrip(year, month, monthCode, day);
+}
+
+function testRoundtrip(year, month, monthCode, day) {
+  const dateFromYearMonth = Temporal.PlainDateTime.from({ year, month, day, hour: 12, minute: 34, second: 56, millisecond: 987, microsecond: 654, nanosecond: 321 }, options);
   TemporalHelpers.assertPlainDateTime(
     dateFromYearMonth,
-    year, 1, "M01", 1, 12, 34, 56, 987, 654, 321,
+    year, month, monthCode, day, 12, 34, 56, 987, 654, 321,
     `${dateFromYearMonth} - created from year and month`);
 
-  const dateFromYearMonthCode = Temporal.PlainDateTime.from({ year, monthCode: "M01", day: 1, hour: 12, minute: 34, second: 56, millisecond: 987, microsecond: 654, nanosecond: 321 }, options);
+  const dateFromYearMonthCode = Temporal.PlainDateTime.from({ year, monthCode, day, hour: 12, minute: 34, second: 56, millisecond: 987, microsecond: 654, nanosecond: 321 }, options);
   TemporalHelpers.assertPlainDateTime(
     dateFromYearMonthCode,
-    year, 1, "M01", 1, 12, 34, 56, 987, 654, 321,
+    year, month, monthCode, day, 12, 34, 56, 987, 654, 321,
     `${dateFromYearMonthCode} - created from year and month code`);
 }
 
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/missing-arguments.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/missing-arguments.js
index a87d6ebe4c201..fad5f259c224d 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/missing-arguments.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/missing-arguments.js
@@ -22,4 +22,8 @@ const args = [
 assert.throws(RangeError, () => new Temporal.PlainDateTime(...args));
 assert.compareArray(actual, expected, "order of operations");
 
+assert.throws(RangeError, () => new Temporal.PlainDateTime());
+assert.throws(RangeError, () => new Temporal.PlainDateTime(2021));
+assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7));
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/add/argument-duration-max-plus-min-date.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/add/argument-duration-max-plus-min-date.js
new file mode 100644
index 0000000000000..143cda09af82c
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/add/argument-duration-max-plus-min-date.js
@@ -0,0 +1,60 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.prototype.add
+description: Maximum allowed duration adding to minimum allowed date
+includes: [temporalHelpers.js]
+features: [Temporal]
+---*/
+
+const min = Temporal.PlainDateTime.from({ year: -271821, month: 4, day: 19, nanosecond: 1 });
+
+const maxCases = [
+  ["P547581Y4M24DT23H59M59.999999999S", "string with max years"],
+  [{ years: 547581, months: 4, days: 24, nanoseconds: 86399999999999 }, "property bag with max years"],
+  ["P6570976M24DT23H59M59.999999999S", "string with max months"],
+  [{ months: 6570976, days: 24, nanoseconds: 86399999999999 }, "property bag with max months"],
+  ["P28571428W4DT23H59M59.999999999S", "string with max weeks"],
+  [{ weeks: 28_571_428, days: 4, nanoseconds: 86399999999999 }, "property bag with max weeks"],
+  ["P200000000DT23H59M59.999999999S", "string with max days"],
+  [{ days: 200_000_000, nanoseconds: 86399999999999 }, "property bag with max days"],
+  ["PT4800000023H59M59.999999999S", "string with max hours"],
+  [{ hours: 4_800_000_023, minutes: 59, seconds: 59, milliseconds: 999, microseconds: 999, nanoseconds: 999 }, "property bag with max hours"],
+  ["PT288000001439M59.999999999S", "string with max minutes"],
+  [{ minutes: 288_000_001_439, seconds: 59, milliseconds: 999, microseconds: 999, nanoseconds: 999 }, "property bag with max minutes"],
+  ["PT17280000086399.999999999S", "string with max seconds"],
+  [{ seconds: 17_280_000_086_399, nanoseconds: 999999999 }, "property bag with max seconds"],
+];
+
+for (const [arg, descr] of maxCases) {
+    const result = min.add(arg);
+    TemporalHelpers.assertPlainDateTime(result, 275760, 9, "M09", 13, 0, 0, 0, 0, 0, 0,  `operation succeeds with ${descr}`);
+}
+
+const max = Temporal.PlainDateTime.from({ year: 275760, month: 9, day: 13 });
+
+const minCases = [
+  ["-P547581Y4M23DT23H59M59.999999999S", "string with max years"],
+  [{ years: -547581, months: -4, days: -23, nanoseconds: -86399999999999 }, "property bag with max years"],
+  ["-P6570976M23DT23H59M59.999999999S", "string with max months"],
+  [{ months: -6570976, days: -23, nanoseconds: -86399999999999 }, "property bag with max months"],
+  ["-P28571428W4DT23H59M59.999999999S", "string with max weeks"],
+  [{ weeks: -28_571_428, days: -4, nanoseconds: -86399999999999 }, "property bag with max weeks"],
+  ["-P200000000DT23H59M59.999999999S", "string with max days"],
+  [{ days: -200_000_000, nanoseconds: -86399999999999 }, "property bag with max days"],
+  ["-PT4800000023H59M59.999999999S", "string with max hours"],
+  [{ hours: -4_800_000_023, minutes: -59, seconds: -59, milliseconds: -999, microseconds: -999, nanoseconds: -999 }, "property bag with max hours"],
+  ["-PT288000001439M59.999999999S", "string with max minutes"],
+  [{ minutes: -288_000_001_439, seconds: -59, milliseconds: -999, microseconds: -999, nanoseconds: -999 }, "property bag with max minutes"],
+  ["-PT17280000086399.999999999S", "string with max seconds"],
+  [{ seconds: -17_280_000_086_399, nanoseconds: -999999999 }, "property bag with max seconds"],
+];
+
+for (const [arg, descr] of minCases) {
+    const result = max.add(arg);
+    TemporalHelpers.assertPlainDateTime(result, -271821, 4, "M04", 19, 0, 0, 0, 0, 0, 1,  `operation succeeds with ${descr}`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/day/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/day/basic.js
new file mode 100644
index 0000000000000..fb5de03ac699e
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/day/basic.js
@@ -0,0 +1,14 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-get-temporal.plaindatetime.prototype.day
+description: The "day" property of Temporal.PlainDateTime.prototype
+features: [Temporal]
+---*/
+
+assert.sameValue((new Temporal.PlainDateTime(2021, 7, 15, 5, 30, 13)).day, 15);
+assert.sameValue(Temporal.PlainDateTime.from('2019-03-18T05:30:13').day, 18);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/dayOfYear/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/dayOfYear/basic.js
index 8636a89a32daf..ff8430353a898 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/dayOfYear/basic.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/dayOfYear/basic.js
@@ -11,4 +11,17 @@ features: [Temporal]
 const datetime = new Temporal.PlainDateTime(1976, 11, 18, 15, 23, 30, 123, 456, 789, "iso8601");
 assert.sameValue(datetime.dayOfYear, 323, "check day of year information");
 
+assert.sameValue((new Temporal.PlainDateTime(1997, 1, 23, 5, 30, 13)).dayOfYear, 23);
+assert.sameValue((new Temporal.PlainDateTime(1997, 2, 23, 5, 30, 13)).dayOfYear, 54);
+assert.sameValue((new Temporal.PlainDateTime(1996, 3, 23, 5, 30, 13)).dayOfYear, 83);
+assert.sameValue((new Temporal.PlainDateTime(1997, 3, 23, 5, 30, 13)).dayOfYear, 82);
+assert.sameValue((new Temporal.PlainDateTime(1997, 12, 31, 5, 30, 13)).dayOfYear, 365);
+assert.sameValue((new Temporal.PlainDateTime(1996, 12, 31, 5, 30, 13)).dayOfYear, 366);
+assert.sameValue(Temporal.PlainDateTime.from("1997-01-23T05:30:13").dayOfYear, 23);
+assert.sameValue(Temporal.PlainDateTime.from("1997-02-23T05:30:13").dayOfYear, 54);
+assert.sameValue(Temporal.PlainDateTime.from("1996-03-23T05:30:13").dayOfYear, 83);
+assert.sameValue(Temporal.PlainDateTime.from("1997-03-23T05:30:13").dayOfYear, 82);
+assert.sameValue(Temporal.PlainDateTime.from("1997-12-31T05:30:13").dayOfYear, 365);
+assert.sameValue(Temporal.PlainDateTime.from("1996-12-31T05:30:13").dayOfYear, 366);
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/daysInMonth/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/daysInMonth/basic.js
index bfa4e7afc4896..40b0cf9e5111c 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/daysInMonth/basic.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/daysInMonth/basic.js
@@ -9,13 +9,29 @@ features: [Temporal]
 ---*/
 
 const tests = [
-  [new Temporal.PlainDateTime(1976, 2, 18, 15, 23, 30, 123, 456, 789), 29],
-  [new Temporal.PlainDateTime(1976, 11, 18, 15, 23, 30, 123, 456, 789), 30],
-  [new Temporal.PlainDateTime(1976, 12, 18, 15, 23, 30, 123, 456, 789), 31],
-  [new Temporal.PlainDateTime(1977, 2, 18, 15, 23, 30, 123, 456, 789), 28],
+  [1976, 2, 18, 15, 23, 30, 29],
+  [1976, 11, 18, 15, 23, 30, 30],
+  [1976, 12, 18, 15, 23, 30, 31],
+  [1977, 2, 18, 15, 23, 30, 28],
+  [1997, 1, 23, 5, 30, 13, 31],
+  [1996, 2, 23, 5, 30, 13, 29],
+  [2000, 2, 23, 5, 30, 13, 29],
+  [1997, 2, 23, 5, 30, 13, 28],
+  [1997, 3, 23, 5, 30, 13, 31],
+  [1997, 4, 23, 5, 30, 13, 30],
+  [1997, 5, 23, 5, 30, 13, 31],
+  [1997, 6, 23, 5, 30, 13, 30],
+  [1997, 7, 23, 5, 30, 13, 31],
+  [1997, 8, 23, 5, 30, 13, 31],
+  [1997, 9, 23, 5, 30, 13, 30],
+  [1997, 10, 23, 5, 30, 13, 31],
+  [1997, 11, 23, 5, 30, 13, 30],
+  [1997, 12, 23, 5, 30, 13, 31],
 ];
-for (const [plainDateTime, expected] of tests) {
+for (const [year, month, day, hour, minute, second, expected] of tests) {
+  const plainDateTime = new Temporal.PlainDateTime(year, month, day, hour, minute, second, 123, 456, 789);
   assert.sameValue(plainDateTime.daysInMonth, expected, `${expected} days in the month of ${plainDateTime}`);
 }
 
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/daysInYear/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/daysInYear/basic.js
index de422d729bb24..88ed5421c45c8 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/daysInYear/basic.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/daysInYear/basic.js
@@ -12,5 +12,16 @@ assert.sameValue((new Temporal.PlainDateTime(1976, 11, 18, 15, 23, 30, 123, 456,
   366, "leap year");
 assert.sameValue((new Temporal.PlainDateTime(1977, 11, 18, 15, 23, 30, 123, 456, 789)).daysInYear,
   365, "non-leap year");
+assert.sameValue((new Temporal.PlainDateTime(1995, 8, 23, 5, 30, 13)).daysInYear, 365);
+assert.sameValue((new Temporal.PlainDateTime(1996, 8, 23, 5, 30, 13)).daysInYear, 366);
+assert.sameValue((new Temporal.PlainDateTime(1997, 8, 23, 5, 30, 13)).daysInYear, 365);
+assert.sameValue((new Temporal.PlainDateTime(1998, 8, 23, 5, 30, 13)).daysInYear, 365);
+assert.sameValue((new Temporal.PlainDateTime(1999, 8, 23, 5, 30, 13)).daysInYear, 365);
+assert.sameValue((new Temporal.PlainDateTime(2000, 8, 23, 5, 30, 13)).daysInYear, 366);
+assert.sameValue((new Temporal.PlainDateTime(2001, 8, 23, 5, 30, 13)).daysInYear, 365);
+assert.sameValue((new Temporal.PlainDateTime(2002, 8, 23, 5, 30, 13)).daysInYear, 365);
+assert.sameValue((new Temporal.PlainDateTime(2003, 8, 23, 5, 30, 13)).daysInYear, 365);
+assert.sameValue((new Temporal.PlainDateTime(2004, 8, 23, 5, 30, 13)).daysInYear, 366);
+assert.sameValue((new Temporal.PlainDateTime(2005, 8, 23, 5, 30, 13)).daysInYear, 365);
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/equals/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/equals/argument-propertybag-calendar-invalid-iso-string.js
index b112c99a59044..46ebce87f31ae 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/equals/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/equals/argument-propertybag-calendar-invalid-iso-string.js
@@ -12,10 +12,12 @@ const instance = new Temporal.PlainDateTime(2000, 5, 2, 12, 34, 56, 987, 654, 32
 
 const invalidStrings = [
   ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
 
-for (const [calendar, description] of invalidStrings) {
-  const arg = { year: 1976, monthCode: "M11", day: 18, calendar };
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1970, monthCode: "M11", day: 18, calendar: cal };
   assert.throws(
     RangeError,
     () => instance.equals(arg),
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/equals/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/equals/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..8c6fc8f8b611d
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/equals/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.prototype.equals
+description: Invalid ISO string as calendar should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainDateTime(2000, 5, 2, 12, 34, 56, 987, 654, 321);
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => instance.equals(arg),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/equals/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/equals/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..e48fd4d1b5ec8
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/equals/no-fractional-minutes-hours.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.prototype.equals
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainDateTime(2000, 5, 2, 12, 34, 56, 987, 654, 321)
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => instance.equals(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/inLeapYear/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/inLeapYear/basic.js
index a6b88825c3399..368759fab929d 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/inLeapYear/basic.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/inLeapYear/basic.js
@@ -12,5 +12,16 @@ assert.sameValue((new Temporal.PlainDateTime(1976, 11, 18, 15, 23, 30, 123, 456,
   true, "leap year");
 assert.sameValue((new Temporal.PlainDateTime(1977, 11, 18, 15, 23, 30, 123, 456, 789)).inLeapYear,
   false, "non-leap year");
+assert.sameValue((new Temporal.PlainDateTime(1995, 8, 23, 5, 30, 13)).inLeapYear, false);
+assert.sameValue((new Temporal.PlainDateTime(1996, 8, 23, 5, 30, 13)).inLeapYear, true);
+assert.sameValue((new Temporal.PlainDateTime(1997, 8, 23, 5, 30, 13)).inLeapYear, false);
+assert.sameValue((new Temporal.PlainDateTime(1998, 8, 23, 5, 30, 13)).inLeapYear, false);
+assert.sameValue((new Temporal.PlainDateTime(1999, 8, 23, 5, 30, 13)).inLeapYear, false);
+assert.sameValue((new Temporal.PlainDateTime(2000, 8, 23, 5, 30, 13)).inLeapYear, true);
+assert.sameValue((new Temporal.PlainDateTime(2001, 8, 23, 5, 30, 13)).inLeapYear, false);
+assert.sameValue((new Temporal.PlainDateTime(2002, 8, 23, 5, 30, 13)).inLeapYear, false);
+assert.sameValue((new Temporal.PlainDateTime(2003, 8, 23, 5, 30, 13)).inLeapYear, false);
+assert.sameValue((new Temporal.PlainDateTime(2004, 8, 23, 5, 30, 13)).inLeapYear, true);
+assert.sameValue((new Temporal.PlainDateTime(2005, 8, 23, 5, 30, 13)).inLeapYear, false);
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/month/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/month/basic.js
new file mode 100644
index 0000000000000..897e727fcb8ae
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/month/basic.js
@@ -0,0 +1,13 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-get-temporal.plaindate.prototype.month
+description: Month property for PlainDateTime
+features: [Temporal]
+---*/
+
+assert.sameValue((new Temporal.PlainDateTime(1997, 8, 23, 5, 30, 13)).month, 8);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/monthCode/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/monthCode/basic.js
new file mode 100644
index 0000000000000..86b2f455ae303
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/monthCode/basic.js
@@ -0,0 +1,13 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.prototype.monthcode
+description: monthCode property for PlainDateTime
+features: [Temporal]
+---*/
+
+assert.sameValue((new Temporal.PlainDateTime(1997, 8, 23, 5, 30, 13)).monthCode, 'M08');
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/monthsInYear/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/monthsInYear/basic.js
index 82d112afd06f8..545bc2c61d365 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/monthsInYear/basic.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/monthsInYear/basic.js
@@ -10,5 +10,6 @@ features: [Temporal]
 
 const datetime = new Temporal.PlainDateTime(1976, 11, 18, 15, 23, 30, 123, 456, 789, "iso8601");
 assert.sameValue(datetime.monthsInYear, 12, "check months in year information");
+assert.sameValue((new Temporal.PlainDateTime(1234, 8, 23, 5, 30, 13)).monthsInYear, 12);
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/since/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/since/argument-propertybag-calendar-invalid-iso-string.js
index 3e44f90b21d17..1e2881a1d85f8 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/since/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/since/argument-propertybag-calendar-invalid-iso-string.js
@@ -12,10 +12,12 @@ const instance = new Temporal.PlainDateTime(2000, 5, 2, 12, 34, 56, 987, 654, 32
 
 const invalidStrings = [
   ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
 
-for (const [calendar, description] of invalidStrings) {
-  const arg = { year: 1976, monthCode: "M11", day: 18, calendar };
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1970, monthCode: "M11", day: 18, calendar: cal };
   assert.throws(
     RangeError,
     () => instance.since(arg),
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/since/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/since/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..97f269232444b
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/since/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.prototype.since
+description: Invalid ISO string as calendar should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainDateTime(2000, 5, 2, 12, 34, 56, 987, 654, 321);
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => instance.since(arg),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/since/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/since/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..c006edfeda559
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/since/no-fractional-minutes-hours.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.prototype.since
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainDateTime(2000, 5, 2, 12, 34, 56, 987, 654, 321)
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => instance.since(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/subtract/argument-duration-max-plus-min-date.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/subtract/argument-duration-max-plus-min-date.js
new file mode 100644
index 0000000000000..70bbece38f52c
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/subtract/argument-duration-max-plus-min-date.js
@@ -0,0 +1,60 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.prototype.subtract
+description: Maximum allowed duration subtracting from maximum allowed date
+includes: [temporalHelpers.js]
+features: [Temporal]
+---*/
+
+const max = Temporal.PlainDateTime.from({ year: 275760, month: 9, day: 13 });
+
+const maxCases = [
+  ["P547581Y4M23DT23H59M59.999999999S", "string with max years"],
+  [{ years: 547581, months: 4, days: 23, nanoseconds: 86399999999999 }, "property bag with max years"],
+  ["P6570976M23DT23H59M59.999999999S", "string with max months"],
+  [{ months: 6570976, days: 23, nanoseconds: 86399999999999 }, "property bag with max months"],
+  ["P28571428W4DT23H59M59.999999999S", "string with max weeks"],
+  [{ weeks: 28_571_428, days: 4, nanoseconds: 86399999999999 }, "property bag with max weeks"],
+  ["P200000000DT23H59M59.999999999S", "string with max days"],
+  [{ days: 200_000_000, nanoseconds: 86399999999999 }, "property bag with max days"],
+  ["PT4800000023H59M59.999999999S", "string with max hours"],
+  [{ hours: 4_800_000_023, minutes: 59, seconds: 59, milliseconds: 999, microseconds: 999, nanoseconds: 999 }, "property bag with max hours"],
+  ["PT288000001439M59.999999999S", "string with max minutes"],
+  [{ minutes: 288_000_001_439, seconds: 59, milliseconds: 999, microseconds: 999, nanoseconds: 999 }, "property bag with max minutes"],
+  ["PT17280000086399.999999999S", "string with max seconds"],
+  [{ seconds: 17_280_000_086_399, nanoseconds: 999999999 }, "property bag with max seconds"],
+];
+
+for (const [arg, descr] of maxCases) {
+    const result = max.subtract(arg);
+    TemporalHelpers.assertPlainDateTime(result, -271821, 4, "M04", 19, 0, 0, 0, 0, 0, 1,  `operation succeeds with ${descr}`);
+}
+
+const min = Temporal.PlainDateTime.from({ year: -271821, month: 4, day: 19, nanosecond: 1 });
+
+const minCases = [
+  ["-P547581Y4M24DT23H59M59.999999999S", "string with max years"],
+  [{ years: -547581, months: -4, days: -24, nanoseconds: -86399999999999 }, "property bag with max years"],
+  ["-P6570976M24DT23H59M59.999999999S", "string with max months"],
+  [{ months: -6570976, days: -24, nanoseconds: -86399999999999 }, "property bag with max months"],
+  ["-P28571428W4DT23H59M59.999999999S", "string with max weeks"],
+  [{ weeks: -28_571_428, days: -4, nanoseconds: -86399999999999 }, "property bag with max weeks"],
+  ["-P200000000DT23H59M59.999999999S", "string with max days"],
+  [{ days: -200_000_000, nanoseconds: -86399999999999 }, "property bag with max days"],
+  ["-PT4800000023H59M59.999999999S", "string with max hours"],
+  [{ hours: -4_800_000_023, minutes: -59, seconds: -59, milliseconds: -999, microseconds: -999, nanoseconds: -999 }, "property bag with max hours"],
+  ["-PT288000001439M59.999999999S", "string with max minutes"],
+  [{ minutes: -288_000_001_439, seconds: -59, milliseconds: -999, microseconds: -999, nanoseconds: -999 }, "property bag with max minutes"],
+  ["-PT17280000086399.999999999S", "string with max seconds"],
+  [{ seconds: -17_280_000_086_399, nanoseconds: -999999999 }, "property bag with max seconds"],
+];
+
+for (const [arg, descr] of minCases) {
+    const result = min.subtract(arg);
+    TemporalHelpers.assertPlainDateTime(result, 275760, 9, "M09", 13, 0, 0, 0, 0, 0, 0,  `operation succeeds with ${descr}`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-to-plain-date.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/toPlainDate/basic.js
similarity index 64%
rename from js/src/tests/test262/staging/Temporal/v8/plain-date-time-to-plain-date.js
rename to js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/toPlainDate/basic.js
index 6f79432a374a6..8bf07f0a56793 100644
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-to-plain-date.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/toPlainDate/basic.js
@@ -3,17 +3,13 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: pending
-description: >
-  Automatically ported from plain-date-time-to-plain-date test
-  in V8's mjsunit test plain-date-time-to-plain-date.js
+esid: sec-temporal.plaindatetime.prototype.withplaindate
+description: basic tests for toPlainDate
 includes: [temporalHelpers.js]
 features: [Temporal]
 ---*/
 
 let d1 = new Temporal.PlainDateTime(2021, 12, 11, 1, 2, 3, 4, 5, 6);
-let badDateTime = { toPlainDate: d1.toPlainDate };
-assert.throws(TypeError, () => badDateTime.toPlainDate());
 TemporalHelpers.assertPlainDate(d1.toPlainDate(), 2021, 12, 'M12', 11);
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/toString/fractionalseconddigits-number.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/toString/fractionalseconddigits-number.js
index 41eb31d42d7dd..2bd6bb10273f9 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/toString/fractionalseconddigits-number.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/toString/fractionalseconddigits-number.js
@@ -17,6 +17,8 @@ assert.sameValue(fewSeconds.toString({ fractionalSecondDigits: 0 }), "1976-02-04
   "pads parts with 0");
 assert.sameValue(subSeconds.toString({ fractionalSecondDigits: 0 }), "1976-11-18T15:23:30",
   "truncates 4 decimal places to 0");
+assert.sameValue(zeroSeconds.toString({ fractionalSecondDigits: 1 }), "1976-11-18T15:23:00.0",
+  "pads zero seconds to 1 decimal place");
 assert.sameValue(zeroSeconds.toString({ fractionalSecondDigits: 2 }), "1976-11-18T15:23:00.00",
   "pads zero seconds to 2 decimal places");
 assert.sameValue(wholeSeconds.toString({ fractionalSecondDigits: 2 }), "1976-11-18T15:23:30.00",
@@ -25,6 +27,10 @@ assert.sameValue(subSeconds.toString({ fractionalSecondDigits: 2 }), "1976-11-18
   "truncates 4 decimal places to 2");
 assert.sameValue(subSeconds.toString({ fractionalSecondDigits: 3 }), "1976-11-18T15:23:30.123",
   "truncates 4 decimal places to 3");
+assert.sameValue(subSeconds.toString({ fractionalSecondDigits: 4 }), "1976-11-18T15:23:30.1234",
+  "does not pad");
+assert.sameValue(subSeconds.toString({ fractionalSecondDigits: 5 }), "1976-11-18T15:23:30.12340",
+  "pads 4 decimal places to 5");
 assert.sameValue(subSeconds.toString({ fractionalSecondDigits: 6 }), "1976-11-18T15:23:30.123400",
   "pads 4 decimal places to 6");
 assert.sameValue(zeroSeconds.toString({ fractionalSecondDigits: 7 }), "1976-11-18T15:23:00.0000000",
@@ -33,6 +39,8 @@ assert.sameValue(wholeSeconds.toString({ fractionalSecondDigits: 7 }), "1976-11-
   "pads whole seconds to 7 decimal places");
 assert.sameValue(subSeconds.toString({ fractionalSecondDigits: 7 }), "1976-11-18T15:23:30.1234000",
   "pads 4 decimal places to 7");
+assert.sameValue(subSeconds.toString({ fractionalSecondDigits: 8 }), "1976-11-18T15:23:30.12340000",
+  "pads 4 decimal places to 8");
 assert.sameValue(subSeconds.toString({ fractionalSecondDigits: 9 }), "1976-11-18T15:23:30.123400000",
   "pads 4 decimal places to 9");
 
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/no-observable-array-iteration.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/no-observable-array-iteration.js
new file mode 100644
index 0000000000000..7c59da2d2b9af
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/toZonedDateTime/no-observable-array-iteration.js
@@ -0,0 +1,23 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.prototype.tozoneddatetime
+description: >
+  Calling GetPossibleEpochNanoseconds (from ToTemporalZonedDateTime > InterpretISODateTimeOffset)
+  causes no observable array iteration.
+features: [Temporal]
+---*/
+
+const arrayPrototypeSymbolIteratorOriginal = Array.prototype[Symbol.iterator];
+Array.prototype[Symbol.iterator] = function arrayIterator() {
+  throw new Test262Error("Array should not be iterated");
+}
+
+let pdt = new Temporal.PlainDateTime(2000, 1, 1, 12, 0, 0, 0);
+let zdt = pdt.toZonedDateTime("UTC");
+
+Array.prototype[Symbol.iterator] = arrayPrototypeSymbolIteratorOriginal;
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/until/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/until/argument-propertybag-calendar-invalid-iso-string.js
index bc8ea59c4b683..ca487170c3d11 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/until/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/until/argument-propertybag-calendar-invalid-iso-string.js
@@ -12,10 +12,12 @@ const instance = new Temporal.PlainDateTime(2000, 5, 2, 12, 34, 56, 987, 654, 32
 
 const invalidStrings = [
   ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
 
-for (const [calendar, description] of invalidStrings) {
-  const arg = { year: 1976, monthCode: "M11", day: 18, calendar };
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1970, monthCode: "M11", day: 18, calendar: cal };
   assert.throws(
     RangeError,
     () => instance.until(arg),
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/until/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/until/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..4a4f2369e2f97
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/until/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.prototype.until
+description: Invalid ISO string as calendar should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainDateTime(2000, 5, 2, 12, 34, 56, 987, 654, 321);
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => instance.until(arg),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/until/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/until/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..6fb2fc30710cb
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/until/no-fractional-minutes-hours.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.prototype.until
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainDateTime(2000, 5, 2, 12, 34, 56, 987, 654, 321)
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => instance.until(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/valueOf/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/valueOf/basic.js
index 8cc67cdb3bdb2..63187a26733e6 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/valueOf/basic.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/valueOf/basic.js
@@ -12,6 +12,7 @@ const dt1 = new Temporal.PlainDateTime(1963, 2, 13, 9, 36, 29, 123, 456, 789);
 const dt1again = new Temporal.PlainDateTime(1963, 2, 13, 9, 36, 29, 123, 456, 789);
 const dt2 = new Temporal.PlainDateTime(1976, 11, 18, 15, 23, 30, 123, 456, 789);
 
+assert.throws(TypeError, () => dt1.valueOf(), "always throws");
 assert.sameValue(dt1 === dt1, true, "object equality implies ===");
 assert.sameValue(dt1 !== dt1again, true, "object non-equality, even if all data is the same, implies !==");
 assert.throws(TypeError, () => dt1 < dt1, "< throws (same objects)");
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/weekOfYear/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/weekOfYear/basic.js
index 7d451b870c331..e6b298a4b9448 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/weekOfYear/basic.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/weekOfYear/basic.js
@@ -4,11 +4,37 @@
 
 /*---
 esid: sec-get-temporal.plaindatetime.prototype.weekofyear
-description: Checking week of year for a "normal" case (non-undefined, non-boundary case, etc.)
+description: Checking week of year for a "normal" case, as well as for dates near the turn of the year.
 features: [Temporal]
 ---*/
 
-const datetime = new Temporal.PlainDateTime(1976, 11, 18, 15, 23, 30, 123, 456, 789, "iso8601");
+const datetime = new Temporal.PlainDateTime(1976, 11, 18, 15, 23, 30, 123, 456, 789);
 assert.sameValue(datetime.weekOfYear, 47, "check week of year information");
 
+for (let i = 29; i <= 31; ++i) {
+  const datetime = new Temporal.PlainDateTime(1975, 12, i, 15, 23, 30, 123, 456, 789);
+  assert.sameValue(datetime.weekOfYear, 1, `${datetime} should be in week 1`);
+}
+for (let i = 1; i <= 4; ++i) {
+  const datetime = new Temporal.PlainDateTime(1976, 1, i, 15, 23, 30, 123, 456, 789);
+  assert.sameValue(datetime.weekOfYear, 1, `${datetime} should be in week 1`);
+}
+for (let i = 5; i <= 11; ++i) {
+  const datetime = new Temporal.PlainDateTime(1976, 1, i, 15, 23, 30, 123, 456, 789);
+  assert.sameValue(datetime.weekOfYear, 2, `${datetime} should be in week 2`);
+}
+for (let i = 20; i <= 26; ++i) {
+  const datetime = new Temporal.PlainDateTime(1976, 12, i, 15, 23, 30, 123, 456, 789);
+  assert.sameValue(datetime.weekOfYear, 52, `${datetime} should be in week 52`);
+}
+for (let i = 27; i <= 31; ++i) {
+  const datetime = new Temporal.PlainDateTime(1976, 12, i, 15, 23, 30, 123, 456, 789);
+  assert.sameValue(datetime.weekOfYear, 53, `${datetime} should be in week 53`);
+}
+for (let i = 1; i <= 2; ++i) {
+  const datetime = new Temporal.PlainDateTime(1977, 1, i, 15, 23, 30, 123, 456, 789);
+  assert.sameValue(datetime.weekOfYear, 53, `${datetime} should be in week 53`);
+}
+
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/with/argument-not-object.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/with/argument-not-object.js
index f0076b021faf8..d08013167e846 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/with/argument-not-object.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/with/argument-not-object.js
@@ -17,6 +17,7 @@ const args = [
   Symbol(),
   2020,
   2020n,
+  NaN,
 ];
 for (const argument of args) {
   assert.throws(TypeError, () => instance.with(argument), `Does not support ${typeof argument}`);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/with/calendar-temporal-object-throws.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/with/calendar-temporal-object-throws.js
index 9e5eab90fb0f1..b2bec2095ab45 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/with/calendar-temporal-object-throws.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/with/calendar-temporal-object-throws.js
@@ -17,6 +17,9 @@ const values = [
   Temporal.PlainTime.from("15:19:45"),
   Temporal.PlainYearMonth.from("2022-04"),
   Temporal.ZonedDateTime.from("2022-04-12T15:19:45[UTC]"),
+  Temporal.Now.plainDateTimeISO(),
+  Temporal.Now.plainDateISO(),
+  Temporal.Now.plainTimeISO(),
 ];
 
 for (const value of values) {
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/withCalendar/calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/withCalendar/calendar-invalid-iso-string.js
index 671fc947f924a..a49e2089c596a 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/withCalendar/calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/withCalendar/calendar-invalid-iso-string.js
@@ -4,7 +4,7 @@
 
 /*---
 esid: sec-temporal.plaindatetime.prototype.withcalendar
-description: Invalid ISO 8601 string is not accepted as calendar
+description: Invalid ISO string as calendar should throw RangeError
 features: [Temporal]
 ---*/
 
@@ -12,6 +12,7 @@ const instance = new Temporal.PlainDateTime(1976, 11, 18, 15, 23, 30, 123, 456,
 
 const invalidStrings = [
   ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
 ];
 
 for (const [arg, description] of invalidStrings) {
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/withCalendar/calendar-time-string.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/withCalendar/calendar-time-string.js
new file mode 100644
index 0000000000000..7ce3460b1040d
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/withCalendar/calendar-time-string.js
@@ -0,0 +1,60 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.prototype.withcalendar
+description: A time string is valid input for Calendar; default is iso8601
+features: [Temporal]
+---*/
+
+const tests = [
+  "15:23",
+  "15:23:30",
+  "15:23:30.123",
+  "15:23:30.123456",
+  "15:23:30.123456789",
+  "1976-11-18T15:23:30.1",
+  "1976-11-18T15:23:30.12",
+  "1976-11-18T15:23:30.123",
+  "1976-11-18T15:23:30.1234",
+  "1976-11-18T15:23:30.12345",
+  "1976-11-18T15:23:30.123456",
+  "1976-11-18T15:23:30.1234567",
+  "1976-11-18T15:23:30.12345678",
+  "1976-11-18T15:23:30.123456789",
+  "1976-11-18T15:23:30,12",
+  "1976-11-18T15:23:30.12-02:00",
+  "152330",
+  "152330.1",
+  "152330-08",
+  "152330.1-08",
+  "152330-0800",
+  "152330.1-0800",
+  "1976-11-18T152330.1+00:00",
+  "19761118T15:23:30.1+00:00",
+  "1976-11-18T15:23:30.1+0000",
+  "1976-11-18T152330.1+0000",
+  "19761118T15:23:30.1+0000",
+  "19761118T152330.1+00:00",
+  "19761118T152330.1+0000",
+  "+001976-11-18T152330.1+00:00",
+  "+0019761118T15:23:30.1+00:00",
+  "+001976-11-18T15:23:30.1+0000",
+  "+001976-11-18T152330.1+0000",
+  "+0019761118T15:23:30.1+0000",
+  "+0019761118T152330.1+00:00",
+  "+0019761118T152330.1+0000",
+  "15",
+  "T15:23:30",
+  "t152330",
+];
+
+const instance = Temporal.PlainDateTime.from({ year: 1976, month: 11, day: 18, hour: 12, minute: 34});
+
+tests.forEach((arg) => {
+  const result = instance.withCalendar(arg);
+  assert.sameValue(result.calendarId, "iso8601", `Calendar created from string "${arg}"`);
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/year/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/year/basic.js
new file mode 100644
index 0000000000000..2f9ca0b9e3fac
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainDateTime/prototype/year/basic.js
@@ -0,0 +1,14 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-get-temporal.plaindatetime.prototype.year
+description: The "year" property of Temporal.PlainDateTime.prototype
+features: [Temporal]
+---*/
+
+assert.sameValue((new Temporal.PlainDateTime(2021, 7, 15, 15, 30, 26, 123, 456, 789)).year, 2021);
+assert.sameValue(Temporal.PlainDateTime.from('2019-03-15T15:30:26').year, 2019);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/argument-convert.js b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/argument-convert.js
new file mode 100644
index 0000000000000..00e7274bab109
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/argument-convert.js
@@ -0,0 +1,28 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainmonthday
+description: PlainMonthDay constructor with non-integer arguments.
+includes: [temporalHelpers.js]
+features: [Temporal]
+---*/
+
+TemporalHelpers.assertPlainMonthDay(new Temporal.PlainMonthDay(11.7, 24.1),
+  "M11", 24, "positive fractional");
+
+TemporalHelpers.assertPlainMonthDay(new Temporal.PlainMonthDay("11.7", "24.1"),
+  "M11", 24, "fractional strings");
+
+for (const invalid of [Symbol(), 1n]) {
+  assert.throws(TypeError, () => new Temporal.PlainMonthDay(invalid, 24), `month ${typeof invalid}`);
+  assert.throws(TypeError, () => new Temporal.PlainMonthDay(11, invalid), `day ${typeof invalid}`);
+}
+
+for (const invalid of [undefined, "invalid"]) {
+  assert.throws(RangeError, () => new Temporal.PlainMonthDay(invalid, 24), `month ${typeof invalid}`);
+  assert.throws(RangeError, () => new Temporal.PlainMonthDay(11, invalid), `day ${typeof invalid}`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/calendar-invalid-iso-string.js
index 28954173c46aa..03b28447b1d0b 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/calendar-invalid-iso-string.js
@@ -4,13 +4,14 @@
 
 /*---
 esid: sec-temporal.plainmonthday.constructor
-description: Various invalid ISO string values for calendar
+description: Invalid ISO string as calendar should throw RangeError
 features: [Temporal]
 ---*/
 
 const invalidStrings = [
   ["", "empty string"],
   ["1997-12-04[u-ca=iso8601]", "ISO string with calendar annotation"],
+  ["notacal", "Unknown calendar"],
 ];
 
 for (const [arg, description] of invalidStrings) {
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/from/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/from/argument-propertybag-calendar-invalid-iso-string.js
index 7904658110358..aab87f22667a9 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/from/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/from/argument-propertybag-calendar-invalid-iso-string.js
@@ -4,21 +4,23 @@
 
 /*---
 esid: sec-temporal.plainmonthday.from
-description: Various invalid ISO string values for calendar in a property bag
+description: Invalid ISO string as calendar should throw RangeError
 features: [Temporal]
 ---*/
 
 const invalidStrings = [
-	["", "empty string"],
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
 
-for (const [calendar, description] of invalidStrings) {
-	const arg = { monthCode: "M11", day: 18, calendar };
-	assert.throws(
-		RangeError,
-		() => Temporal.PlainMonthDay.from(arg),
-		`${description} is not a valid calendar ID`
-	);
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1976, monthCode: "M11", day: 18, calendar: cal };
+  assert.throws(
+    RangeError,
+    () => Temporal.PlainMonthDay.from(arg),
+    `${description} is not a valid calendar ID`
+  );
 }
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/from/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/from/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..dbff9d6493718
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/from/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,24 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainmonthday.from
+description: Invalid calendar string should throw RangeError
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => Temporal.PlainMonthDay.from(arg),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/from/argument-wrong-type.js b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/from/argument-wrong-type.js
index 7ee63cf148b7f..1083d1c07bcd3 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/from/argument-wrong-type.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/from/argument-wrong-type.js
@@ -10,6 +10,8 @@ description: >
 features: [BigInt, Symbol, Temporal]
 ---*/
 
+assert.throws(TypeError, () => Temporal.PlainMonthDay.from(), "no argument");
+
 const primitiveTests = [
   [undefined, "undefined"],
   [null, "null"],
@@ -25,6 +27,14 @@ for (const [arg, description] of primitiveTests) {
     () => Temporal.PlainMonthDay.from(arg),
     `${description} does not convert to a valid ISO string`
   );
+
+  for (const options of [undefined, { overflow: 'constrain' }, { overflow: 'reject' }]) {
+    assert.throws(
+      typeof arg === 'string' ? RangeError : TypeError,
+      () => Temporal.PlainMonthDay.from(arg, options),
+      `${description} does not convert to a valid ISO string with options ${options}`
+    );
+  }
 }
 
 const typeErrorTests = [
@@ -36,6 +46,10 @@ const typeErrorTests = [
 
 for (const [arg, description] of typeErrorTests) {
   assert.throws(TypeError, () => Temporal.PlainMonthDay.from(arg), `${description} is not a valid property bag and does not convert to a string`);
+
+  for (const options of [undefined, { overflow: 'constrain' }, { overflow: 'reject' }]) {
+    assert.throws(TypeError, () => Temporal.PlainMonthDay.from(arg, options), `${description} is not a valid property bag and does not convert to a string with options ${options}`);
+  }
 }
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/from/negative-month-or-day.js b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/from/negative-month-or-day.js
new file mode 100644
index 0000000000000..c1009c49d324f
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/from/negative-month-or-day.js
@@ -0,0 +1,14 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainmonthday.from
+description: Months and days must be non-negative integers
+features: [Temporal]
+---*/
+
+assert.throws(RangeError, () => Temporal.PlainMonthDay.from({ day: 1, month: -1 }));
+assert.throws(RangeError, () => Temporal.PlainMonthDay.from({ month: 1, day: -1 }));
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/from/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/from/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..89789a3f5dec0
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/from/no-fractional-minutes-hours.js
@@ -0,0 +1,24 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainmonthday.from
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => Temporal.PlainMonthDay.from(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/missing-arguments.js b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/missing-arguments.js
index 31432de575e92..e771256baff63 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/missing-arguments.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/missing-arguments.js
@@ -21,4 +21,6 @@ const args = [
 assert.throws(RangeError, () => new Temporal.PlainMonthDay(...args));
 assert.compareArray(actual, expected, "order of operations");
 
+assert.throws(RangeError, () => new Temporal.PlainMonthDay(), "no arguments");
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/prototype/equals/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/prototype/equals/argument-propertybag-calendar-invalid-iso-string.js
index 7d90de96cd046..6916051dae1bc 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/prototype/equals/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/prototype/equals/argument-propertybag-calendar-invalid-iso-string.js
@@ -4,8 +4,7 @@
 
 /*---
 esid: sec-temporal.plainmonthday.prototype.equals
-description: >
-  A string value for calendar in a property bag that is not a valid calendar ID
+description: Invalid ISO string as calendar should throw RangeError
 features: [Temporal]
 ---*/
 
@@ -13,10 +12,12 @@ const instance = new Temporal.PlainMonthDay(5, 2);
 
 const invalidStrings = [
   ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
 
-for (const [calendar, description] of invalidStrings) {
-  const arg = { year: 2019, monthCode: "M11", day: 1, calendar };
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1970, monthCode: "M11", day: 18, calendar: cal };
   assert.throws(
     RangeError,
     () => instance.equals(arg),
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/prototype/equals/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/prototype/equals/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..c938aa0f73ec7
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/prototype/equals/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainmonthday.prototype.equals
+description: Invalid ISO string as calendar should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainMonthDay(5, 2);
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => instance.equals(arg),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/prototype/equals/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/prototype/equals/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..90cdbdf26fe05
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainMonthDay/prototype/equals/no-fractional-minutes-hours.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainmonthday.prototype.equals
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainMonthDay(5, 2)
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => instance.equals(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainTime/argument-convert.js b/js/src/tests/test262/built-ins/Temporal/PlainTime/argument-convert.js
new file mode 100644
index 0000000000000..32b241b3dc278
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainTime/argument-convert.js
@@ -0,0 +1,46 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaintime
+description: PlainTime constructor with non-integer arguments.
+includes: [temporalHelpers.js]
+features: [Temporal]
+---*/
+
+TemporalHelpers.assertPlainTime(new Temporal.PlainTime(11.9, 12.8, 13.7, 14.6, 15.5, 1.999999),
+  11, 12, 13, 14, 15, 1, "positive fractional");
+
+TemporalHelpers.assertPlainTime(new Temporal.PlainTime(null, 1, 2, 3, 4, 5),
+  0, 1, 2, 3, 4, 5, "null defaults to zero");
+
+TemporalHelpers.assertPlainTime(new Temporal.PlainTime(false, true),
+  0, 1, 0, 0, 0, 0, "boolean defaults");
+
+TemporalHelpers.assertPlainTime(new Temporal.PlainTime(11, 24, undefined),
+  11, 24, 0, 0, 0, 0, "undefined defaults to 0");
+
+TemporalHelpers.assertPlainTime(new Temporal.PlainTime("11.9", "12.8", "13.7", "14.6", "15.5", "1.999999"),
+  11, 12, 13, 14, 15, 1, "fractional strings");
+
+for (const invalid of [Symbol(), 1n]) {
+  assert.throws(TypeError, () => new Temporal.PlainTime(invalid, 2, 3, 4, 5, 6), `hour ${typeof invalid}`);
+  assert.throws(TypeError, () => new Temporal.PlainTime(1, invalid, 3, 4, 5, 6), `minute ${typeof invalid}`);
+  assert.throws(TypeError, () => new Temporal.PlainTime(1, 2, invalid, 4, 5, 6), `second ${typeof invalid}`);
+  assert.throws(TypeError, () => new Temporal.PlainTime(1, 2, 3, invalid, 5, 6), `millisecond ${typeof invalid}`);
+  assert.throws(TypeError, () => new Temporal.PlainTime(1, 2, 3, 4, invalid, 6), `microsecond ${typeof invalid}`);
+  assert.throws(TypeError, () => new Temporal.PlainTime(1, 2, 3, 4, 5, invalid), `nanosecond ${typeof invalid}`);
+}
+
+for (const invalid of ["invalid"]) {
+  assert.throws(RangeError, () => new Temporal.PlainTime(invalid, 2, 3, 4, 5, 6), `hour ${typeof invalid}`);
+  assert.throws(RangeError, () => new Temporal.PlainTime(1, invalid, 3, 4, 5, 6), `minute ${typeof invalid}`);
+  assert.throws(RangeError, () => new Temporal.PlainTime(1, 2, invalid, 4, 5, 6), `second ${typeof invalid}`);
+  assert.throws(RangeError, () => new Temporal.PlainTime(1, 2, 3, invalid, 5, 6), `millisecond ${typeof invalid}`);
+  assert.throws(RangeError, () => new Temporal.PlainTime(1, 2, 3, 4, invalid, 6), `microsecond ${typeof invalid}`);
+  assert.throws(RangeError, () => new Temporal.PlainTime(1, 2, 3, 4, 5, invalid), `nanosecond ${typeof invalid}`);
+}
+
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainTime/compare/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/PlainTime/compare/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..f9846c456c6d2
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainTime/compare/no-fractional-minutes-hours.js
@@ -0,0 +1,29 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaintime.compare
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["05:07.123", "Fractional minutes"],
+  ["12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => Temporal.PlainTime.compare(arg, new Temporal.PlainTime(20, 4, 3)),
+    `${description} not allowed in time string (first argument)`
+  );
+  assert.throws(
+    RangeError,
+      () => Temporal.PlainTime.compare(new Temporal.PlainTime(20, 4, 3), arg),
+    `${description} not allowed in time string (second argument)`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainTime/from/argument-string-invalid.js b/js/src/tests/test262/built-ins/Temporal/PlainTime/from/argument-string-invalid.js
new file mode 100644
index 0000000000000..e34a0c5a555dd
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainTime/from/argument-string-invalid.js
@@ -0,0 +1,48 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaintime.from
+description: >
+  RangeError thrown if an invalid ISO string (or syntactically valid ISO string
+  that is not supported) is used as a PlainTime
+features: [Temporal, arrow-function]
+---*/
+
+const invalidStrings = [
+  // invalid ISO strings:
+  "",
+  "invalid iso8601",
+  "00:00Z",
+  "Z",
+  "25:00:00Z",
+  "01:60:00Z",
+  "01:60:61Z",
+  "00:00Zjunk",
+  "00:00:00Zjunk",
+  "00:00:00.000000000Zjunk",
+  "00:00:00+00:00junk",
+  "00:00:00+00:00[UTC]junk",
+  "00:00:00+00:00[UTC][u-ca=iso8601]junk",
+  "001Z",
+  "01:001Z",
+  "01:01:001Z",
+  "00:00-24:00",
+  "00:00+24:00",
+  // "00:0000" is invalid (the hour/minute and minute/second separator
+  // or lack thereof needs to match).
+  "00:00:00+00:0000",
+  "0000:00",
+  "00:0000",
+  "00:00:00+0000:00",
+];
+for (const arg of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => Temporal.PlainTime.from(arg),
+    `"${arg}" should not be a valid ISO string for a PlainTime`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainTime/from/argument-wrong-type.js b/js/src/tests/test262/built-ins/Temporal/PlainTime/from/argument-wrong-type.js
index 4a3b01707dd1a..68e5e234ccc69 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainTime/from/argument-wrong-type.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainTime/from/argument-wrong-type.js
@@ -10,6 +10,8 @@ description: >
 features: [BigInt, Symbol, Temporal]
 ---*/
 
+assert.throws(TypeError, () => Temporal.PlainTime.from(), "no argument");
+
 const primitiveTests = [
   [undefined, "undefined"],
   [null, "null"],
@@ -25,6 +27,14 @@ for (const [arg, description] of primitiveTests) {
     () => Temporal.PlainTime.from(arg),
     `${description} does not convert to a valid ISO string`
   );
+
+  for (const options of [undefined, { overflow: 'constrain' }, { overflow: 'reject' }]) {
+    assert.throws(
+      typeof arg === 'string' ? RangeError : TypeError,
+      () => Temporal.PlainTime.from(arg, options),
+      `${description} does not convert to a valid ISO string with options ${options}`
+    );
+  }
 }
 
 const typeErrorTests = [
@@ -36,6 +46,10 @@ const typeErrorTests = [
 
 for (const [arg, description] of typeErrorTests) {
   assert.throws(TypeError, () => Temporal.PlainTime.from(arg), `${description} is not a valid property bag and does not convert to a string`);
+
+  for (const options of [undefined, { overflow: 'constrain' }, { overflow: 'reject' }]) {
+    assert.throws(TypeError, () => Temporal.PlainTime.from(arg, options), `${description} is not a valid property bag and does not convert to a string with options ${options}`);
+  }
 }
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainTime/from/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/PlainTime/from/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..b6ff2789aeb50
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainTime/from/no-fractional-minutes-hours.js
@@ -0,0 +1,24 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaintime.from
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["05:07.123", "Fractional minutes"],
+  ["12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => Temporal.PlainTime.from(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainTime/prototype/round/roundingincrement-divides.js b/js/src/tests/test262/built-ins/Temporal/PlainTime/prototype/round/roundingincrement-divides.js
new file mode 100644
index 0000000000000..dfc157cdd3392
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainTime/prototype/round/roundingincrement-divides.js
@@ -0,0 +1,50 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaintime.prototype.round
+description: Rounding increment should properly divide the relevant time unit
+features: [Temporal]
+---*/
+
+const t = new Temporal.PlainTime(14, 23, 30, 123, 456, 789);
+
+const minutesSeconds = [1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30];
+const subSeconds = [1, 2, 4, 5, 8, 10, 20, 25, 40, 50, 100, 200, 250, 500];
+
+const unitsAndIncrements = {
+   "hour": [1, 2, 3, 4, 6, 8, 12],
+   "minute": minutesSeconds,
+   "second": minutesSeconds,
+   "millisecond": subSeconds,
+   "microsecond": subSeconds,
+   "nanosecond": subSeconds,
+};
+
+// Just check that each combination of unit and increment doesn't throw
+Object.entries(unitsAndIncrements).forEach(([unit, increments]) => {
+  increments.forEach((increment) => {
+    const result = t.round({ smallestUnit: unit, roundingMode: "ceil", roundingIncrement: increment });
+    assert.sameValue(result instanceof Temporal.PlainTime, true, `${unit} ${increment}`);
+  })
+});
+
+const nextIncrements = {
+  "hour": 24,
+  "minute": 60,
+  "second": 60,
+  "millisecond": 1000,
+  "microsecond": 1000,
+  "nanosecond": 1000
+};
+
+Object.entries(nextIncrements).forEach(([unit, next]) => {
+  assert.throws(
+    RangeError,
+    () => t.round({ smallestUnit: unit, roundingIncrement: next }),
+    `throws on increments that are equal to the next highest (unit = ${unit}, increment = ${next})`
+  );
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/argument-convert.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/argument-convert.js
new file mode 100644
index 0000000000000..92cbdbc066ac2
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/argument-convert.js
@@ -0,0 +1,37 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth
+description: PlainYearMonth constructor with non-integer arguments.
+includes: [temporalHelpers.js]
+features: [Temporal]
+---*/
+
+TemporalHelpers.assertPlainYearMonth(new Temporal.PlainYearMonth(2020.6, 11.7),
+  2020, 11, "M11", "positive fractional");
+
+TemporalHelpers.assertPlainYearMonth(new Temporal.PlainYearMonth(-2020.6, 11.7),
+  -2020, 11, "M11", "negative fractional");
+
+TemporalHelpers.assertPlainYearMonth(new Temporal.PlainYearMonth(null, 11),
+  0, 11, "M11", "null defaults to zero");
+
+TemporalHelpers.assertPlainYearMonth(new Temporal.PlainYearMonth(false, true),
+  0, 1, "M01", "boolean defaults");
+
+TemporalHelpers.assertPlainYearMonth(new Temporal.PlainYearMonth("2020.6", "11.7"),
+  2020, 11, "M11", "fractional strings");
+
+for (const invalid of [Symbol(), 1n]) {
+  assert.throws(TypeError, () => new Temporal.PlainYearMonth(invalid, 11), `year ${typeof invalid}`);
+  assert.throws(TypeError, () => new Temporal.PlainYearMonth(2020, invalid), `month ${typeof invalid}`);
+}
+
+for (const invalid of [undefined, "invalid"]) {
+  assert.throws(RangeError, () => new Temporal.PlainYearMonth(invalid, 11), `year ${typeof invalid}`);
+  assert.throws(RangeError, () => new Temporal.PlainYearMonth(2020, invalid), `month ${typeof invalid}`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/calendar-invalid-iso-string.js
index dbdce0379a6c5..2111acaf0aaba 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/calendar-invalid-iso-string.js
@@ -4,13 +4,14 @@
 
 /*---
 esid: sec-temporal.plainyearmonth.constructor
-description: Various invalid ISO string values for calendar
+description: Invalid ISO string as calendar should throw RangeError
 features: [Temporal]
 ---*/
 
 const invalidStrings = [
   ["", "empty string"],
   ["1997-12-04[u-ca=iso8601]", "ISO string with calendar annotation"],
+  ["notacal", "Unknown calendar"],
 ];
 
 for (const [arg, description] of invalidStrings) {
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/compare/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/compare/argument-propertybag-calendar-invalid-iso-string.js
index 5328d7eb971d4..aa128be5e67e7 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/compare/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/compare/argument-propertybag-calendar-invalid-iso-string.js
@@ -10,10 +10,12 @@ features: [Temporal]
 
 const invalidStrings = [
   ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
-  
-for (const [calendar, description] of invalidStrings) {
-  const arg = { year: 2019, monthCode: "M06", calendar };
+
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1976, monthCode: "M11", day: 18, calendar: cal };
   assert.throws(
     RangeError,
     () => Temporal.PlainYearMonth.compare(arg, new Temporal.PlainYearMonth(2019, 6)),
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/compare/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/compare/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..a26eae925af3b
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/compare/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,29 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.compare
+description: Invalid calendar string should throw RangeError
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => Temporal.PlainYearMonth.compare(arg, new Temporal.PlainYearMonth(2019, 6)),
+    `${description} is not a valid calendar ID (first argument)`
+  );
+  assert.throws(
+    RangeError,
+    () => Temporal.PlainYearMonth.compare(new Temporal.PlainYearMonth(2019, 6), arg),
+    `${description} is not a valid calendar ID (second argument)`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/compare/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/compare/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..89f154d4b097f
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/compare/no-fractional-minutes-hours.js
@@ -0,0 +1,29 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.compare
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => Temporal.PlainYearMonth.compare(arg, new Temporal.PlainYearMonth(2025, 4)),
+    `${description} not allowed in time string (first argument)`
+  );
+  assert.throws(
+    RangeError,
+      () => Temporal.PlainYearMonth.compare(new Temporal.PlainYearMonth(2025, 4), arg),
+    `${description} not allowed in time string (second argument)`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/argument-propertybag-calendar-invalid-iso-string.js
index b2d4d911f352c..c9f875769f03c 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/argument-propertybag-calendar-invalid-iso-string.js
@@ -4,16 +4,18 @@
 
 /*---
 esid: sec-temporal.plainyearmonth.from
-description: Various invalid ISO string values for calendar in a property bag
+description: Invalid ISO string as calendar should throw RangeError
 features: [Temporal]
 ---*/
 
 const invalidStrings = [
   ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
-  
-for (const [calendar, description] of invalidStrings) {
-  const arg = { year: 2019, monthCode: "M11", calendar };
+
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1976, monthCode: "M11", day: 18, calendar: cal };
   assert.throws(
     RangeError,
     () => Temporal.PlainYearMonth.from(arg),
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..8e1999071fc86
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,24 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.from
+description: Invalid calendar string should throw RangeError
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => Temporal.PlainYearMonth.from(arg),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/argument-wrong-type.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/argument-wrong-type.js
index de5a5590f6a4e..c07075d890bfc 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/argument-wrong-type.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/argument-wrong-type.js
@@ -10,6 +10,8 @@ description: >
 features: [BigInt, Symbol, Temporal]
 ---*/
 
+assert.throws(TypeError, () => Temporal.PlainYearMonth.from(), "no argument");
+
 const primitiveTests = [
   [undefined, "undefined"],
   [null, "null"],
@@ -25,6 +27,14 @@ for (const [arg, description] of primitiveTests) {
     () => Temporal.PlainYearMonth.from(arg),
     `${description} does not convert to a valid ISO string`
   );
+
+  for (const options of [undefined, { overflow: 'constrain' }, { overflow: 'reject' }]) {
+    assert.throws(
+      typeof arg === 'string' ? RangeError : TypeError,
+      () => Temporal.PlainYearMonth.from(arg, options),
+      `${description} does not convert to a valid ISO string with options ${options}`
+    );
+  }
 }
 
 const typeErrorTests = [
@@ -36,6 +46,10 @@ const typeErrorTests = [
 
 for (const [arg, description] of typeErrorTests) {
   assert.throws(TypeError, () => Temporal.PlainYearMonth.from(arg), `${description} is not a valid property bag and does not convert to a string`);
+
+  for (const options of [undefined, { overflow: 'constrain' }, { overflow: 'reject' }]) {
+    assert.throws(TypeError, () => Temporal.PlainYearMonth.from(arg, options), `${description} is not a valid property bag and does not convert to a string with options ${options}`);
+  }
 }
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/month-code-wrong-type.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/month-code-wrong-type.js
new file mode 100644
index 0000000000000..10bf442001563
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/month-code-wrong-type.js
@@ -0,0 +1,27 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.from
+description: Month code must be a string
+features: [Temporal]
+---*/
+
+const monthCodeValues = [
+  5, 5n, false, Symbol(), null, { toString: () => 5 }
+];
+
+const year = 2026;
+
+for (const monthCode of monthCodeValues) {
+  assert.throws(TypeError, () => Temporal.PlainYearMonth.from({
+    year,
+    monthCode,
+    
+  }), typeof monthCode === 'symbol' ?
+      "Symbol should be rejected as month code" :
+      `month code ${monthCode} should be rejected`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/negative-month.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/negative-month.js
new file mode 100644
index 0000000000000..6614fdf122f65
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/negative-month.js
@@ -0,0 +1,13 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.from
+description: Months must be non-negative integers
+features: [Temporal]
+---*/
+
+assert.throws(RangeError, () => Temporal.PlainYearMonth.from({ year: 1, month: -1 }));
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..6481baacd57f8
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/from/no-fractional-minutes-hours.js
@@ -0,0 +1,24 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.from
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => Temporal.PlainYearMonth.from(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/missing-arguments.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/missing-arguments.js
index 0c0f0d973e3b3..a4ed3f2002655 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/missing-arguments.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/missing-arguments.js
@@ -20,4 +20,6 @@ const args = [
 assert.throws(RangeError, () => new Temporal.PlainYearMonth(...args));
 assert.compareArray(actual, expected, "order of operations");
 
+assert.throws(RangeError, () => new Temporal.PlainYearMonth(), "no arguments");
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-duration-max.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-duration-max.js
index 7189fa8806d95..b64ae2344292f 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-duration-max.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-duration-max.js
@@ -12,20 +12,10 @@ features: [Temporal]
 const instance = new Temporal.PlainYearMonth(1970, 1);
 
 const maxCases = [
-  ["P273790Y8M12DT23H59M59.999999999S", "string with max years"],
-  [{ years: 273790, months: 8, days: 12, nanoseconds: 86399999999999 }, "property bag with max years"],
-  ["P3285488M12DT23H59M59.999999999S", "string with max months"],
-  [{ months: 3285488, days: 12, nanoseconds: 86399999999999 }, "property bag with max months"],
-  ["P14285714W2DT23H59M59.999999999S", "string with max weeks"],
-  [{ weeks: 14285714, days: 2, nanoseconds: 86399999999999 }, "property bag with max weeks"],
-  ["P100000000DT23H59M59.999999999S", "string with max days"],
-  [{ days: 100000000, nanoseconds: 86399999999999 }, "property bag with max days"],
-  ["PT2400000023H59M59.999999999S", "string with max hours"],
-  [{ hours: 2400000023, nanoseconds: 3599999999999 }, "property bag with max hours"],
-  ["PT144000001439M59.999999999S", "string with max minutes"],
-  [{ minutes: 144000001439, nanoseconds: 59999999999 }, "property bag with max minutes"],
-  ["PT8640000086399.999999999S", "string with max seconds"],
-  [{ seconds: 8640000086399, nanoseconds: 999999999 }, "property bag with max seconds"],
+  ["P273790Y8M", "string with max years"],
+  [{ years: 273790, months: 8 }, "property bag with max years"],
+  ["P3285488M", "string with max months"],
+  [{ months: 3285488 }, "property bag with max months"],
 ];
 
 for (const [arg, descr] of maxCases) {
@@ -34,25 +24,15 @@ for (const [arg, descr] of maxCases) {
 }
 
 const minCases = [
-  ["-P273790Y8M42DT23H59M59.999999999S", "string with min years"],
-  [{ years: -273790, months: -8, days: -42, nanoseconds: -86399999999999 }, "property bag with min years"],
-  ["-P3285488M42DT23H59M59.999999999S", "string with min months"],
-  [{ months: -3285488, days: -42, nanoseconds: -86399999999999 }, "property bag with min months"],
-  ["-P14285718W5DT23H59M59.999999999S", "string with min weeks"],
-  [{ weeks: -14285718, days: -5, nanoseconds: -86399999999999 }, "property bag with min weeks"],
-  ["-P100000031DT23H59M59.999999999S", "string with min days"],
-  [{ days: -100000031, nanoseconds: -86399999999999 }, "property bag with min days"],
-  ["-PT2400000767H59M59.999999999S", "string with min hours"],
-  [{ hours: -2400000767, nanoseconds: -3599999999999 }, "property bag with min hours"],
-  ["-PT144000046079M59.999999999S", "string with min minutes"],
-  [{ minutes: -144000046079, nanoseconds: -59999999999 }, "property bag with min minutes"],
-  ["-PT8640002764799.999999999S", "string with min seconds"],
-  [{ seconds: -8640002764799, nanoseconds: -999999999 }, "property bag with min seconds"],
+  ["-P273790Y8M", "string with min years"],
+  [{ years: -273790, months: -8 }, "property bag with min years"],
+  ["-P3285488M", "string with min months"],
+  [{ months: -3285488 }, "property bag with min months"],
 ];
 
 for (const [arg, descr] of minCases) {
   const result = instance.add(arg);
-  TemporalHelpers.assertPlainYearMonth(result, -271821, 4, "M04", `operation succeeds with ${descr}`);
+  TemporalHelpers.assertPlainYearMonth(result, -271821, 5, "M05", `operation succeeds with ${descr}`);
 }
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-duration-out-of-range.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-duration-out-of-range.js
index be8dff7e3e540..887fda016e288 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-duration-out-of-range.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-duration-out-of-range.js
@@ -24,48 +24,6 @@ const cases = [
   [{ weeks: 4294967296 }, "property bag with weeks > max"],
   ["-P4294967296W", "string with weeks < min"],
   [{ weeks: -4294967296 }, "property bag with weeks < min"],
-
-  // ceil(max safe integer / 86400) = 104249991375
-  ["P104249991375D", "string with days > max"],
-  [{ days: 104249991375 }, "property bag with days > max"],
-  ["P104249991374DT24H", "string where hours balance into days > max"],
-  [{ days: 104249991374, hours: 24 }, "property bag where hours balance into days > max"],
-  ["-P104249991375D", "string with days < min"],
-  [{ days: -104249991375 }, "property bag with days < min"],
-  ["-P104249991374DT24H", "string where hours balance into days < min"],
-  [{ days: -104249991374, hours: -24 }, "property bag where hours balance into days < min"],
-
-  // ceil(max safe integer / 3600) = 2501999792984
-  ["PT2501999792984H", "string with hours > max"],
-  [{ hours: 2501999792984 }, "property bag with hours > max"],
-  ["PT2501999792983H60M", "string where minutes balance into hours > max"],
-  [{ hours: 2501999792983, minutes: 60 }, "property bag where minutes balance into hours > max"],
-  ["-PT2501999792984H", "string with hours < min"],
-  [{ hours: -2501999792984 }, "property bag with hours < min"],
-  ["-PT2501999792983H60M", "string where minutes balance into hours < min"],
-  [{ hours: -2501999792983, minutes: -60 }, "property bag where minutes balance into hours < min"],
-
-  // ceil(max safe integer / 60) = 150119987579017
-  ["PT150119987579017M", "string with minutes > max"],
-  [{ minutes: 150119987579017 }, "property bag with minutes > max"],
-  ["PT150119987579016M60S", "string where seconds balance into minutes > max"],
-  [{ minutes: 150119987579016, seconds: 60 }, "property bag where seconds balance into minutes > max"],
-  ["-PT150119987579017M", "string with minutes < min"],
-  [{ minutes: -150119987579017 }, "property bag with minutes < min"],
-  ["-PT150119987579016M60S", "string where seconds balance into minutes < min"],
-  [{ minutes: -150119987579016, seconds: -60 }, "property bag where seconds balance into minutes < min"],
-
-  // 2^53 = 9007199254740992
-  ["PT9007199254740992S", "string with seconds > max"],
-  [{ seconds: 9007199254740992 }, "property bag with seconds > max"],
-  [{ seconds: 9007199254740991, milliseconds: 1000 }, "property bag where milliseconds balance into seconds > max"],
-  [{ seconds: 9007199254740991, microseconds: 1000000 }, "property bag where microseconds balance into seconds > max"],
-  [{ seconds: 9007199254740991, nanoseconds: 1000000000 }, "property bag where nanoseconds balance into seconds > max"],
-  ["-PT9007199254740992S", "string with seconds < min"],
-  [{ seconds: -9007199254740992 }, "property bag with seconds < min"],
-  [{ seconds: -9007199254740991, milliseconds: -1000 }, "property bag where milliseconds balance into seconds < min"],
-  [{ seconds: -9007199254740991, microseconds: -1000000 }, "property bag where microseconds balance into seconds < min"],
-  [{ seconds: -9007199254740991, nanoseconds: -1000000000 }, "property bag where nanoseconds balance into seconds < min"],
 ];
 
 for (const [arg, descr] of cases) {
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-lower-units.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-lower-units.js
index e7fe44f2175c4..49d0f9cd34450 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-lower-units.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-lower-units.js
@@ -4,38 +4,37 @@
 
 /*---
 esid: sec-temporal.plainyearmonth.prototype.add
-description: Using lower units in add() works
-includes: [temporalHelpers.js]
+description: Using lower units in add() throws
 features: [Temporal]
 ---*/
 
 const ym = Temporal.PlainYearMonth.from("2019-11");
 
 const tests = [
-  [{ days: 1 }, 2019, 11, "M11"],
-  [{ days: 29 }, 2019, 11, "M11"],
-  [{ hours: 1 }, 2019, 11, "M11"],
-  [{ minutes: 1 }, 2019, 11, "M11"],
-  [{ seconds: 1 }, 2019, 11, "M11"],
-  [{ milliseconds: 1 }, 2019, 11, "M11"],
-  [{ microseconds: 1 }, 2019, 11, "M11"],
-  [{ nanoseconds: 1 }, 2019, 11, "M11"],
-  [{ days: 30 }, 2019, 12, "M12"],
-  [{ days: 31 }, 2019, 12, "M12"],
-  [{ days: 60 }, 2019, 12, "M12"],
-  [{ days: 61 }, 2020, 1, "M01"],
-  [{ hours: 720 }, 2019, 12, "M12"],
-  [{ minutes: 43200 }, 2019, 12, "M12"],
-  [{ seconds: 2592000 }, 2019, 12, "M12"],
-  [{ milliseconds: 2592000_000 }, 2019, 12, "M12"],
-  [{ microseconds: 2592000_000_000 }, 2019, 12, "M12"],
-  [{ nanoseconds: 2592000_000_000_000 }, 2019, 12, "M12"],
+  { days: 1 },
+  { days: 29 },
+  { hours: 1 },
+  { minutes: 1 },
+  { seconds: 1 },
+  { milliseconds: 1 },
+  { microseconds: 1 },
+  { nanoseconds: 1 },
+  { days: 30 },
+  { days: 31 },
+  { days: 60 },
+  { days: 61 },
+  { hours: 720 },
+  { minutes: 43200 },
+  { seconds: 2592000 },
+  { milliseconds: 2592000_000 },
+  { microseconds: 2592000_000_000 },
+  { nanoseconds: 2592000_000_000_000 },
 ];
 
-for (const [argument, ...expected] of tests) {
-  TemporalHelpers.assertPlainYearMonth(ym.add(argument), ...expected, "no options");
-  TemporalHelpers.assertPlainYearMonth(ym.add(argument, { overflow: "constrain" }), ...expected, "constrain");
-  TemporalHelpers.assertPlainYearMonth(ym.add(argument, { overflow: "reject" }), ...expected, "reject");
+for (const argument of tests) {
+  assert.throws(RangeError, function () { ym.add(argument); }, "adding a unit lower than months should throw, no options");
+  assert.throws(RangeError, function () { ym.add(argument, { overflow: "constrain" }); }, "adding a unit lower than months should throw, constrain");
+  assert.throws(RangeError, function () { ym.add(argument, { overflow: "reject" }); }, "adding a unit lower than months should throw, reject");
 }
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-mixed-sign.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-mixed-sign.js
index 100bd0924c97f..ba1ea52b470bd 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-mixed-sign.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-mixed-sign.js
@@ -13,7 +13,7 @@ const instance = new Temporal.PlainYearMonth(2000, 5);
 ["constrain", "reject"].forEach((overflow) => {
   assert.throws(
     RangeError,
-    () => instance.add({ hours: 1, minutes: -30 }, { overflow }),
+    () => instance.add({ years: 1, months: -3 }, { overflow }),
     `mixed positive and negative values always throw (overflow = "${overflow}")`
   );
 });
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-propertybag-optional-properties.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-propertybag-optional-properties.js
index bbdeb279dfd5f..cecb4dd1e69aa 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-propertybag-optional-properties.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-propertybag-optional-properties.js
@@ -5,22 +5,22 @@
 /*---
 esid: sec-temporal.plainyearmonth.prototype.add
 description: >
-  A property bag missing optional properties is equivalent to a property bag
-  with all the optional properties having their default values
+  A duration property bag with value 0 for disallowed properties is the same as
+  a property bag with no disallowed properties
 features: [Temporal]
 ---*/
 
 const instance = new Temporal.PlainYearMonth(1970, 1);
 
 const oneProperty = {
-  hours: 1,
+  months: 1,
 };
 const allProperties = {
   years: 0,
-  months: 0,
+  months: 1,
   weeks: 0,
   days: 0,
-  hours: 1,
+  hours: 0,
   minutes: 0,
   seconds: 0,
   milliseconds: 0,
@@ -29,6 +29,6 @@ const allProperties = {
 };
 const resultWithout = instance.add(oneProperty);
 const resultWith = instance.add(allProperties);
-assert(resultWithout.equals(resultWith), "results should be the same with and without optional properties");
+assert(resultWithout.equals(resultWith), "results should be the same with 0 for disallowed properties and without disallowed properties");
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-string-negative-fractional-units.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-string-negative-fractional-units.js
deleted file mode 100644
index 525a26d87f699..0000000000000
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-string-negative-fractional-units.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2021 Igalia, S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: sec-temporal.plainyearmonth.prototype.add
-description: Strings with fractional duration units are treated with the correct sign
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-const instance = new Temporal.PlainYearMonth(2000, 5);
-
-const resultHours = instance.add("-PT24.567890123H");
-TemporalHelpers.assertPlainYearMonth(resultHours, 2000, 5, "M05", "negative fractional hours");
-
-const resultMinutes = instance.add("-PT1440.567890123M");
-TemporalHelpers.assertPlainYearMonth(resultMinutes, 2000, 5, "M05", "negative fractional minutes");
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/month-length.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/month-length.js
deleted file mode 100644
index 9ab1999987358..0000000000000
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/month-length.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2022 Igalia, S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: sec-temporal.plainyearmonth.prototype.add
-description: add() takes month length into account
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-const ym = Temporal.PlainYearMonth.from("2019-11");
-
-TemporalHelpers.assertPlainYearMonth(Temporal.PlainYearMonth.from("2019-02").add({ days: 27 }),
-  2019, 2, "M02");
-TemporalHelpers.assertPlainYearMonth(Temporal.PlainYearMonth.from("2019-02").add({ days: 28 }),
-  2019, 3, "M03");
-TemporalHelpers.assertPlainYearMonth(Temporal.PlainYearMonth.from("2020-02").add({ days: 28 }),
-  2020, 2, "M02");
-TemporalHelpers.assertPlainYearMonth(Temporal.PlainYearMonth.from("2020-02").add({ days: 29 }),
-  2020, 3, "M03");
-TemporalHelpers.assertPlainYearMonth(Temporal.PlainYearMonth.from("2019-11").add({ days: 29 }),
-  2019, 11, "M11");
-TemporalHelpers.assertPlainYearMonth(Temporal.PlainYearMonth.from("2019-11").add({ days: 30 }),
-  2019, 12, "M12");
-TemporalHelpers.assertPlainYearMonth(Temporal.PlainYearMonth.from("2020-01").add({ days: 30 }),
-  2020, 1, "M01");
-TemporalHelpers.assertPlainYearMonth(Temporal.PlainYearMonth.from("2020-01").add({ days: 31 }),
-  2020, 2, "M02");
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/options-read-before-algorithmic-validation.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/options-read-before-algorithmic-validation.js
index dd159fd36c6ad..c33a398571f28 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/options-read-before-algorithmic-validation.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/options-read-before-algorithmic-validation.js
@@ -28,4 +28,13 @@ assert.throws(RangeError, function () {
 }, "exception thrown when converting -271821-04 to date");
 assert.compareArray(actual, expected, "all options should be read first");
 
+actual.splice(0);  // clear
+
+const instance2 = new Temporal.PlainYearMonth(1999, 12);
+
+assert.throws(RangeError, function () {
+  instance2.add(new Temporal.Duration(0, 0, 1), options);
+}, "exception thrown when attempting to add too-low unit");
+assert.compareArray(actual, expected, "all options should be read first");
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/order-of-operations.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/order-of-operations.js
index bc04566e23a08..df6593bcfdfd2 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/order-of-operations.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/order-of-operations.js
@@ -53,14 +53,14 @@ const instance = new Temporal.PlainYearMonth(2000, 5);
 const fields = TemporalHelpers.propertyBagObserver(actual, {
   years: 1,
   months: 1,
-  weeks: 1,
-  days: 1,
-  hours: 1,
-  minutes: 1,
-  seconds: 1,
-  milliseconds: 1,
-  microseconds: 1,
-  nanoseconds: 1,
+  weeks: 0,
+  days: 0,
+  hours: 0,
+  minutes: 0,
+  seconds: 0,
+  milliseconds: 0,
+  microseconds: 0,
+  nanoseconds: 0,
 }, "fields");
 
 const options = TemporalHelpers.propertyBagObserver(actual, { overflow: "constrain" }, "options");
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/overflow.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/overflow.js
new file mode 100644
index 0000000000000..2ac7ff757dcc8
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/overflow.js
@@ -0,0 +1,29 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.add
+description: Overflow option has no effect in ISO 8601 calendar
+features: [Temporal]
+---*/
+
+const year1 = new Temporal.Duration(1);
+const year1n = new Temporal.Duration(-1);
+const month1 = new Temporal.Duration(0, 1);
+const month1n = new Temporal.Duration(0, -1);
+
+for (const year of [2023, 2024]) {
+  for (const month of [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]) {
+    const yearmonth = new Temporal.PlainYearMonth(year, month);
+    for (const duration of [year1, year1n, month1, month1n]) {
+      const resultConstrain = yearmonth.add(duration, { overflow: "constrain" });
+      const resultReject = yearmonth.add(duration, { overflow: "reject" });
+      assert.sameValue(resultReject.year, resultConstrain.year, "year should be identical");
+      assert.sameValue(resultReject.month, resultConstrain.month, "month should be identical");
+      assert.sameValue(resultReject.toString(), resultConstrain.toString(), "toString should be identical");
+    }
+  }
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/subtract-from-last-representable-month.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/subtract-from-last-representable-month.js
index 8f92191094e65..96c435476fc32 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/subtract-from-last-representable-month.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/add/subtract-from-last-representable-month.js
@@ -4,21 +4,15 @@
 
 /*---
 esid: sec-temporal.plainyearmonth.prototype.add
-description: RangeError thrown when adding negative duration to last representable month.
+description: Adding negative duration to last representable month works
 features: [Temporal]
+includes: [temporalHelpers.js]
 ---*/
 
 const lastMonth = new Temporal.PlainYearMonth(275760, 9);
 
-// See https://tc39.es/proposal-temporal/#sec-temporal-adddurationtoyearmonth
-// (step 10d)
-assert.throws(RangeError, () => lastMonth.add({seconds: -1}));
-assert.throws(RangeError, () => lastMonth.add({minutes: -1}));
-assert.throws(RangeError, () => lastMonth.add({hours: -1}));
-assert.throws(RangeError, () => lastMonth.add({days: -1}));
-assert.throws(RangeError, () => lastMonth.add({weeks: -1}));
-assert.throws(RangeError, () => lastMonth.add({months: -1}));
-assert.throws(RangeError, () => lastMonth.add({years: -1}));
+TemporalHelpers.assertPlainYearMonth(lastMonth.add({ months: -1 }), 275760, 8, "M08", "-1 month");
+TemporalHelpers.assertPlainYearMonth(lastMonth.add({ years: -1 }), 275759, 9, "M09", "-1 year");
 
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/equals/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/equals/argument-propertybag-calendar-invalid-iso-string.js
index 075cb5193ecbc..2014ac1a39acc 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/equals/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/equals/argument-propertybag-calendar-invalid-iso-string.js
@@ -4,24 +4,24 @@
 
 /*---
 esid: sec-temporal.plainyearmonth.prototype.equals
-description: >
-  Appropriate error thrown when a calendar property from a property bag cannot
-  be converted to a calendar ID
-features: [BigInt, Symbol, Temporal]
+description: Invalid ISO string as calendar should throw RangeError
+features: [Temporal]
 ---*/
 
 const instance = new Temporal.PlainYearMonth(2000, 5);
 
-const primitiveTests = [
-  ["", "empty string"]
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
 
-for (const [calendar, description] of primitiveTests) {
-  const arg = { year: 2019, monthCode: "M11", day: 1, calendar };
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1970, monthCode: "M11", day: 18, calendar: cal };
   assert.throws(
     RangeError,
     () => instance.equals(arg),
-    `${description} does not convert to a valid ISO string`
+    `${description} is not a valid calendar ID`
   );
 }
 
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/equals/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/equals/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..0cbe44bce407b
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/equals/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.equals
+description: Invalid ISO string as calendar should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainYearMonth(2000, 5);
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => instance.equals(arg),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/equals/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/equals/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..d87566020a7e9
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/equals/no-fractional-minutes-hours.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.equals
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainYearMonth(2000, 5)
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => instance.equals(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/month/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/month/basic.js
new file mode 100644
index 0000000000000..880acf460cee3
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/month/basic.js
@@ -0,0 +1,14 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-get-temporal.plainyearmonth.prototype.month
+description: Month property for PlainYearMonth
+features: [Temporal]
+---*/
+
+assert.sameValue((new Temporal.PlainYearMonth(1999, 6)).month, 6);
+
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/monthCode/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/monthCode/basic.js
new file mode 100644
index 0000000000000..20b6447de82b9
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/monthCode/basic.js
@@ -0,0 +1,13 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.monthcode
+description: monthCode property for PlainYearMonth
+features: [Temporal]
+---*/
+
+assert.sameValue((new Temporal.PlainYearMonth(1999, 6)).monthCode, 'M06');
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/since/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/since/argument-propertybag-calendar-invalid-iso-string.js
index e07b9f05445f1..660fec22d56b8 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/since/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/since/argument-propertybag-calendar-invalid-iso-string.js
@@ -4,8 +4,7 @@
 
 /*---
 esid: sec-temporal.plainyearmonth.prototype.since
-description: >
-  An ISO string that cannot be converted to a calendar ID should throw a RangeError
+description: Invalid ISO string as calendar should throw RangeError
 features: [Temporal]
 ---*/
 
@@ -13,10 +12,12 @@ const instance = new Temporal.PlainYearMonth(2000, 5);
 
 const invalidStrings = [
   ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
 
-for (const [calendar, description] of invalidStrings) {
-  const arg = { year: 2019, monthCode: "M11", day: 1, calendar };
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1970, monthCode: "M11", day: 18, calendar: cal };
   assert.throws(
     RangeError,
     () => instance.since(arg),
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/since/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/since/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..bad7bab1a8354
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/since/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.since
+description: Invalid ISO string as calendar should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainYearMonth(2000, 5);
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => instance.since(arg),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/since/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/since/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..01eadb2e24bfc
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/since/no-fractional-minutes-hours.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.since
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainYearMonth(2000, 5)
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => instance.since(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-duration-max.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-duration-max.js
index 2396a974c4e87..3b3c07674678e 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-duration-max.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-duration-max.js
@@ -12,42 +12,22 @@ features: [Temporal]
 const instance = new Temporal.PlainYearMonth(1970, 1);
 
 const maxCases = [
-  ["P273790Y8M42DT23H59M59.999999999S", "string with max years"],
-  [{ years: 273790, months: 8, days: 42, nanoseconds: 86399999999999 }, "property bag with max years"],
-  ["P3285488M42DT23H59M59.999999999S", "string with max months"],
-  [{ months: 3285488, days: 42, nanoseconds: 86399999999999 }, "property bag with max months"],
-  ["P14285718W5DT23H59M59.999999999S", "string with max weeks"],
-  [{ weeks: 14285718, days: 5, nanoseconds: 86399999999999 }, "property bag with max weeks"],
-  ["P100000031DT23H59M59.999999999S", "string with max days"],
-  [{ days: 100000031, nanoseconds: 86399999999999 }, "property bag with max days"],
-  ["PT2400000767H59M59.999999999S", "string with max hours"],
-  [{ hours: 2400000767, nanoseconds: 3599999999999 }, "property bag with max hours"],
-  ["PT144000046079M59.999999999S", "string with max minutes"],
-  [{ minutes: 144000046079, nanoseconds: 59999999999 }, "property bag with max minutes"],
-  ["PT8640002764799.999999999S", "string with max seconds"],
-  [{ seconds: 8640002764799, nanoseconds: 999999999 }, "property bag with max seconds"],
+  ["P273790Y8M", "string with max years"],
+  [{ years: 273790, months: 8 }, "property bag with max years"],
+  ["P3285488M", "string with max months"],
+  [{ months: 3285488 }, "property bag with max months"],
 ];
 
 for (const [arg, descr] of maxCases) {
   const result = instance.subtract(arg);
-  TemporalHelpers.assertPlainYearMonth(result, -271821, 4, "M04", `operation succeeds with ${descr}`);
+  TemporalHelpers.assertPlainYearMonth(result, -271821, 5, "M05", `operation succeeds with ${descr}`);
 }
 
 const minCases = [
-  ["-P273790Y8M12DT23H59M59.999999999S", "string with min years"],
-  [{ years: -273790, months: -8, days: -12, nanoseconds: -86399999999999 }, "property bag with min years"],
-  ["-P3285488M12DT23H59M59.999999999S", "string with min months"],
-  [{ months: -3285488, days: -12, nanoseconds: -86399999999999 }, "property bag with min months"],
-  ["-P14285714W2DT23H59M59.999999999S", "string with min weeks"],
-  [{ weeks: -14285714, days: -2, nanoseconds: -86399999999999 }, "property bag with min weeks"],
-  ["-P100000000DT23H59M59.999999999S", "string with min days"],
-  [{ days: -100000000, nanoseconds: -86399999999999 }, "property bag with min days"],
-  ["-PT2400000023H59M59.999999999S", "string with min hours"],
-  [{ hours: -2400000023, nanoseconds: -3599999999999 }, "property bag with min hours"],
-  ["-PT144000001439M59.999999999S", "string with min minutes"],
-  [{ minutes: -144000001439, nanoseconds: -59999999999 }, "property bag with min minutes"],
-  ["-PT8640000086399.999999999S", "string with min seconds"],
-  [{ seconds: -8640000086399, nanoseconds: -999999999 }, "property bag with min seconds"],
+  ["-P273790Y8M", "string with min years"],
+  [{ years: -273790, months: -8 }, "property bag with min years"],
+  ["-P3285488M", "string with min months"],
+  [{ months: -3285488 }, "property bag with min months"],
 ];
 
 for (const [arg, descr] of minCases) {
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-duration-out-of-range.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-duration-out-of-range.js
index d0977de87a810..f4827f45446fa 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-duration-out-of-range.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-duration-out-of-range.js
@@ -24,48 +24,6 @@ const cases = [
   [{ weeks: 4294967296 }, "property bag with weeks > max"],
   ["-P4294967296W", "string with weeks < min"],
   [{ weeks: -4294967296 }, "property bag with weeks < min"],
-
-  // ceil(max safe integer / 86400) = 104249991375
-  ["P104249991375D", "string with days > max"],
-  [{ days: 104249991375 }, "property bag with days > max"],
-  ["P104249991374DT24H", "string where hours balance into days > max"],
-  [{ days: 104249991374, hours: 24 }, "property bag where hours balance into days > max"],
-  ["-P104249991375D", "string with days < min"],
-  [{ days: -104249991375 }, "property bag with days < min"],
-  ["-P104249991374DT24H", "string where hours balance into days < min"],
-  [{ days: -104249991374, hours: -24 }, "property bag where hours balance into days < min"],
-
-  // ceil(max safe integer / 3600) = 2501999792984
-  ["PT2501999792984H", "string with hours > max"],
-  [{ hours: 2501999792984 }, "property bag with hours > max"],
-  ["PT2501999792983H60M", "string where minutes balance into hours > max"],
-  [{ hours: 2501999792983, minutes: 60 }, "property bag where minutes balance into hours > max"],
-  ["-PT2501999792984H", "string with hours < min"],
-  [{ hours: -2501999792984 }, "property bag with hours < min"],
-  ["-PT2501999792983H60M", "string where minutes balance into hours < min"],
-  [{ hours: -2501999792983, minutes: -60 }, "property bag where minutes balance into hours < min"],
-
-  // ceil(max safe integer / 60) = 150119987579017
-  ["PT150119987579017M", "string with minutes > max"],
-  [{ minutes: 150119987579017 }, "property bag with minutes > max"],
-  ["PT150119987579016M60S", "string where seconds balance into minutes > max"],
-  [{ minutes: 150119987579016, seconds: 60 }, "property bag where seconds balance into minutes > max"],
-  ["-PT150119987579017M", "string with minutes < min"],
-  [{ minutes: -150119987579017 }, "property bag with minutes < min"],
-  ["-PT150119987579016M60S", "string where seconds balance into minutes < min"],
-  [{ minutes: -150119987579016, seconds: -60 }, "property bag where seconds balance into minutes < min"],
-
-  // 2^53 = 9007199254740992
-  ["PT9007199254740992S", "string with seconds > max"],
-  [{ seconds: 9007199254740992 }, "property bag with seconds > max"],
-  [{ seconds: 9007199254740991, milliseconds: 1000 }, "property bag where milliseconds balance into seconds > max"],
-  [{ seconds: 9007199254740991, microseconds: 1000000 }, "property bag where microseconds balance into seconds > max"],
-  [{ seconds: 9007199254740991, nanoseconds: 1000000000 }, "property bag where nanoseconds balance into seconds > max"],
-  ["-PT9007199254740992S", "string with seconds < min"],
-  [{ seconds: -9007199254740992 }, "property bag with seconds < min"],
-  [{ seconds: -9007199254740991, milliseconds: -1000 }, "property bag where milliseconds balance into seconds < min"],
-  [{ seconds: -9007199254740991, microseconds: -1000000 }, "property bag where microseconds balance into seconds < min"],
-  [{ seconds: -9007199254740991, nanoseconds: -1000000000 }, "property bag where nanoseconds balance into seconds < min"],
 ];
 
 for (const [arg, descr] of cases) {
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-lower-units.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-lower-units.js
index ea3156580b18d..2d59878231723 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-lower-units.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-lower-units.js
@@ -4,37 +4,36 @@
 
 /*---
 esid: sec-temporal.plainyearmonth.prototype.subtract
-description: Using lower units in subtract() works
-includes: [temporalHelpers.js]
+description: Using lower units in subtract() throws
 features: [Temporal]
 ---*/
 
 const ym = Temporal.PlainYearMonth.from("2019-11");
 
 const tests = [
-  [{ days: 1 }, 2019, 11, "M11"],
-  [{ hours: 1 }, 2019, 11, "M11"],
-  [{ minutes: 1 }, 2019, 11, "M11"],
-  [{ seconds: 1 }, 2019, 11, "M11"],
-  [{ milliseconds: 1 }, 2019, 11, "M11"],
-  [{ microseconds: 1 }, 2019, 11, "M11"],
-  [{ nanoseconds: 1 }, 2019, 11, "M11"],
-  [{ days: 29 }, 2019, 11, "M11"],
-  [{ days: 30 }, 2019, 10, "M10"],
-  [{ days: 60 }, 2019, 10, "M10"],
-  [{ days: 61 }, 2019, 9, "M09"],
-  [{ hours: 720 }, 2019, 10, "M10"],
-  [{ minutes: 43200 }, 2019, 10, "M10"],
-  [{ seconds: 2592000 }, 2019, 10, "M10"],
-  [{ milliseconds: 2592000_000 }, 2019, 10, "M10"],
-  [{ microseconds: 2592000_000_000 }, 2019, 10, "M10"],
-  [{ nanoseconds: 2592000_000_000_000 }, 2019, 10, "M10"],
+  { days: 1 },
+  { hours: 1 },
+  { minutes: 1 },
+  { seconds: 1 },
+  { milliseconds: 1 },
+  { microseconds: 1 },
+  { nanoseconds: 1 },
+  { days: 29 },
+  { days: 30 },
+  { days: 60 },
+  { days: 61 },
+  { hours: 720 },
+  { minutes: 43200 },
+  { seconds: 2592000 },
+  { milliseconds: 2592000_000 },
+  { microseconds: 2592000_000_000 },
+  { nanoseconds: 2592000_000_000_000 },
 ];
 
-for (const [argument, ...expected] of tests) {
-  TemporalHelpers.assertPlainYearMonth(ym.subtract(argument), ...expected, "no options");
-  TemporalHelpers.assertPlainYearMonth(ym.subtract(argument, { overflow: "constrain" }), ...expected, "constrain");
-  TemporalHelpers.assertPlainYearMonth(ym.subtract(argument, { overflow: "reject" }), ...expected, "reject");
+for (const argument of tests) {
+  assert.throws(RangeError, function () { ym.subtract(argument); }, "subtracting a unit lower than months should throw, no options");
+  assert.throws(RangeError, function () { ym.subtract(argument, { overflow: "constrain" }); }, "subtracting a unit lower than months should throw, constrain");
+  assert.throws(RangeError, function () { ym.subtract(argument, { overflow: "reject" }); }, "subtracting a unit lower than months should throw, reject");
 }
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-mixed-sign.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-mixed-sign.js
index f66b8abadacc1..5b17cfff49747 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-mixed-sign.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-mixed-sign.js
@@ -13,7 +13,7 @@ const instance = new Temporal.PlainYearMonth(2000, 5);
 ["constrain", "reject"].forEach((overflow) => {
   assert.throws(
     RangeError,
-    () => instance.subtract({ hours: 1, minutes: -30 }, { overflow }),
+    () => instance.subtract({ years: 1, months: -3 }, { overflow }),
     `mixed positive and negative values always throw (overflow = "${overflow}")`
   );
 });
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-propertybag-optional-properties.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-propertybag-optional-properties.js
index 3b3feea59be63..9ba7fe5501ebf 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-propertybag-optional-properties.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-propertybag-optional-properties.js
@@ -5,22 +5,22 @@
 /*---
 esid: sec-temporal.plainyearmonth.prototype.subtract
 description: >
-  A property bag missing optional properties is equivalent to a property bag
-  with all the optional properties having their default values
+  A duration property bag with value 0 for disallowed properties is the same as
+  a property bag with no disallowed properties
 features: [Temporal]
 ---*/
 
 const instance = new Temporal.PlainYearMonth(1970, 1);
 
 const oneProperty = {
-  hours: 1,
+  months: 1,
 };
 const allProperties = {
   years: 0,
-  months: 0,
+  months: 1,
   weeks: 0,
   days: 0,
-  hours: 1,
+  hours: 0,
   minutes: 0,
   seconds: 0,
   milliseconds: 0,
@@ -29,6 +29,6 @@ const allProperties = {
 };
 const resultWithout = instance.subtract(oneProperty);
 const resultWith = instance.subtract(allProperties);
-assert(resultWithout.equals(resultWith), "results should be the same with and without optional properties");
+assert(resultWithout.equals(resultWith), "results should be the same with 0 for disallowed properties and without disallowed properties");
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-string-negative-fractional-units.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-string-negative-fractional-units.js
deleted file mode 100644
index b3e7c9a74c284..0000000000000
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-string-negative-fractional-units.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2021 Igalia, S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: sec-temporal.plainyearmonth.prototype.subtract
-description: Strings with fractional duration units are treated with the correct sign
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-const instance = new Temporal.PlainYearMonth(2000, 5);
-
-const resultHours = instance.subtract("-PT24.567890123H");
-TemporalHelpers.assertPlainYearMonth(resultHours, 2000, 5, "M05", "negative fractional hours");
-
-const resultMinutes = instance.subtract("-PT1440.567890123M");
-TemporalHelpers.assertPlainYearMonth(resultMinutes, 2000, 5, "M05", "negative fractional minutes");
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/month-length.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/month-length.js
deleted file mode 100644
index ab18f8ef9a63c..0000000000000
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/month-length.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2022 Igalia, S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: sec-temporal.plainyearmonth.prototype.subtract
-description: subtract() takes month length into account
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-const ym = Temporal.PlainYearMonth.from("2019-11");
-
-TemporalHelpers.assertPlainYearMonth(Temporal.PlainYearMonth.from("2019-02").subtract({ days: 27 }),
-  2019, 2, "M02");
-TemporalHelpers.assertPlainYearMonth(Temporal.PlainYearMonth.from("2019-02").subtract({ days: 28 }),
-  2019, 1, "M01");
-TemporalHelpers.assertPlainYearMonth(Temporal.PlainYearMonth.from("2020-02").subtract({ days: 28 }),
-  2020, 2, "M02");
-TemporalHelpers.assertPlainYearMonth(Temporal.PlainYearMonth.from("2020-02").subtract({ days: 29 }),
-  2020, 1, "M01");
-TemporalHelpers.assertPlainYearMonth(Temporal.PlainYearMonth.from("2019-11").subtract({ days: 29 }),
-  2019, 11, "M11");
-TemporalHelpers.assertPlainYearMonth(Temporal.PlainYearMonth.from("2019-11").subtract({ days: 30 }),
-  2019, 10, "M10");
-TemporalHelpers.assertPlainYearMonth(Temporal.PlainYearMonth.from("2020-01").subtract({ days: 30 }),
-  2020, 1, "M01");
-TemporalHelpers.assertPlainYearMonth(Temporal.PlainYearMonth.from("2020-01").subtract({ days: 31 }),
-  2019, 12, "M12");
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/options-read-before-algorithmic-validation.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/options-read-before-algorithmic-validation.js
index c4b9805d3ea8f..e1555f7baf166 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/options-read-before-algorithmic-validation.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/options-read-before-algorithmic-validation.js
@@ -28,4 +28,13 @@ assert.throws(RangeError, function () {
 }, "exception thrown when converting -271821-04 to date");
 assert.compareArray(actual, expected, "all options should be read first");
 
+actual.splice(0);  // clear
+
+const instance2 = new Temporal.PlainYearMonth(1999, 12);
+
+assert.throws(RangeError, function () {
+  instance2.add(new Temporal.Duration(0, 0, 1), options);
+}, "exception thrown when attempting to add too-low unit");
+assert.compareArray(actual, expected, "all options should be read first");
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/order-of-operations.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/order-of-operations.js
index 5dce99a42962b..2da7a789ba665 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/order-of-operations.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/order-of-operations.js
@@ -52,14 +52,14 @@ const instance = new Temporal.PlainYearMonth(2000, 5, "iso8601");
 const fields = TemporalHelpers.propertyBagObserver(actual, {
   years: 1,
   months: 1,
-  weeks: 1,
-  days: 1,
-  hours: 1,
-  minutes: 1,
-  seconds: 1,
-  milliseconds: 1,
-  microseconds: 1,
-  nanoseconds: 1,
+  weeks: 0,
+  days: 0,
+  hours: 0,
+  minutes: 0,
+  seconds: 0,
+  milliseconds: 0,
+  microseconds: 0,
+  nanoseconds: 0,
 }, "fields");
 
 const options = TemporalHelpers.propertyBagObserver(actual, { overflow: "constrain" }, "options");
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/overflow.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/overflow.js
new file mode 100644
index 0000000000000..b4d453ebc161a
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/overflow.js
@@ -0,0 +1,29 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.subtract
+description: Overflow option has no effect in ISO 8601 calendar
+features: [Temporal]
+---*/
+
+const year1 = new Temporal.Duration(1);
+const year1n = new Temporal.Duration(-1);
+const month1 = new Temporal.Duration(0, 1);
+const month1n = new Temporal.Duration(0, -1);
+
+for (const year of [2023, 2024]) {
+  for (const month of [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]) {
+    const yearmonth = new Temporal.PlainYearMonth(year, month);
+    for (const duration of [year1, year1n, month1, month1n]) {
+      const resultConstrain = yearmonth.subtract(duration, { overflow: "constrain" });
+      const resultReject = yearmonth.subtract(duration, { overflow: "reject" });
+      assert.sameValue(resultReject.year, resultConstrain.year, "year should be identical");
+      assert.sameValue(resultReject.month, resultConstrain.month, "month should be identical");
+      assert.sameValue(resultReject.toString(), resultConstrain.toString(), "toString should be identical");
+    }
+  }
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/subtract-from-last-representable-month.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/subtract-from-last-representable-month.js
index efceaa1c46cb4..e09ed6f0fd898 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/subtract-from-last-representable-month.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/subtract-from-last-representable-month.js
@@ -4,21 +4,15 @@
 
 /*---
 esid: sec-temporal.plainyearmonth.prototype.subtract
-description: RangeError thrown when subtracting duration from last representable month.
+description: Subtracting duration from last representable month works
 features: [Temporal]
+includes: [temporalHelpers.js]
 ---*/
 
 const lastMonth = new Temporal.PlainYearMonth(275760, 9);
 
-// See https://tc39.es/proposal-temporal/#sec-temporal-adddurationtoyearmonth
-// (step 10d)
-assert.throws(RangeError, () => lastMonth.subtract({seconds: 1}));
-assert.throws(RangeError, () => lastMonth.subtract({minutes: 1}));
-assert.throws(RangeError, () => lastMonth.subtract({hours: 1}));
-assert.throws(RangeError, () => lastMonth.subtract({days: 1}));
-assert.throws(RangeError, () => lastMonth.subtract({weeks: 1}));
-assert.throws(RangeError, () => lastMonth.subtract({months: 1}));
-assert.throws(RangeError, () => lastMonth.subtract({years: 1}));
+TemporalHelpers.assertPlainYearMonth(lastMonth.subtract({ months: 1 }), 275760, 8, "M08", "1 month");
+TemporalHelpers.assertPlainYearMonth(lastMonth.subtract({ years: 1 }), 275759, 9, "M09", "1 year");
 
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/until/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/until/argument-propertybag-calendar-invalid-iso-string.js
index a0db80c895a66..22b4403f9b2c7 100644
--- a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/until/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/until/argument-propertybag-calendar-invalid-iso-string.js
@@ -4,19 +4,20 @@
 
 /*---
 esid: sec-temporal.plainyearmonth.prototype.until
-description: >
-  An ISO string that cannot be converted to a calendar ID should throw a RangeError
+description: Invalid ISO string as calendar should throw RangeError
 features: [Temporal]
 ---*/
 
 const instance = new Temporal.PlainYearMonth(2000, 5);
 
 const invalidStrings = [
-  ["", "empty string"]
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
 
-for (const [calendar, description] of invalidStrings) {
-  const arg = { year: 2019, monthCode: "M11", day: 1, calendar };
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1970, monthCode: "M11", day: 18, calendar: cal };
   assert.throws(
     RangeError,
     () => instance.until(arg),
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/until/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/until/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..97e754bfc3c5b
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/until/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.until
+description: Invalid ISO string as calendar should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainYearMonth(2000, 5);
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => instance.until(arg),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/until/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/until/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..9ea030ea010c9
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/until/no-fractional-minutes-hours.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.until
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.PlainYearMonth(2000, 5)
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => instance.until(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/year/basic.js b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/year/basic.js
new file mode 100644
index 0000000000000..7e37d7931cd9f
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/PlainYearMonth/prototype/year/basic.js
@@ -0,0 +1,14 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-get-temporal.plainyearmonth.prototype.year
+description: The "year" property of Temporal.PlainYearMonth.prototype
+features: [Temporal]
+---*/
+
+assert.sameValue((new Temporal.PlainYearMonth(2021, 7)).year, 2021);
+assert.sameValue(Temporal.PlainYearMonth.from('2019-03').year, 2019);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/argument-convert.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/argument-convert.js
new file mode 100644
index 0000000000000..a12e8f1d2a532
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/argument-convert.js
@@ -0,0 +1,21 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime
+description: ZonedDateTime constructor with non-integer arguments.
+features: [Temporal]
+---*/
+
+assert.sameValue(new Temporal.ZonedDateTime(false, "UTC").epochNanoseconds,
+  0n, "boolean defaults");
+
+assert.sameValue(new Temporal.ZonedDateTime(true, "UTC").epochNanoseconds,
+  1n, "boolean defaults");
+
+assert.throws(TypeError, () => new Temporal.ZonedDateTime(Symbol(), "UTC"), `symbol`);
+assert.throws(TypeError, () => new Temporal.ZonedDateTime(undefined, "UTC"), `undefined`);
+
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/calendar-invalid-iso-string.js
index b9e504f210751..2f376b61907ed 100644
--- a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/calendar-invalid-iso-string.js
@@ -4,13 +4,14 @@
 
 /*---
 esid: sec-temporal.zoneddatetime.constructor
-description: Various invalid ISO string values for calendar
+description: Invalid ISO string as calendar should throw RangeError
 features: [Temporal]
 ---*/
 
 const invalidStrings = [
   ["", "empty string"],
   ["1997-12-04[u-ca=iso8601]", "ISO string with calendar annotation"],
+  ["notacal", "Unknown calendar"],
 ];
 
 for (const [arg, description] of invalidStrings) {
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/compare/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/compare/argument-propertybag-calendar-invalid-iso-string.js
index 670fdfe7d0e06..618cb1aa2e1d7 100644
--- a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/compare/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/compare/argument-propertybag-calendar-invalid-iso-string.js
@@ -12,10 +12,12 @@ const datetime = new Temporal.ZonedDateTime(0n, "UTC");
 
 const invalidStrings = [
   ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
 
-for (const [calendar, description] of invalidStrings) {
-  const arg = { year: 1970, monthCode: "M01", day: 1, calendar, timeZone: "UTC" };
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1976, monthCode: "M11", day: 18, calendar: cal, timeZone: "UTC" };
   assert.throws(
     RangeError,
     () => Temporal.ZonedDateTime.compare(arg, datetime),
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/compare/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/compare/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..de343f8a05048
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/compare/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,31 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.compare
+description: Invalid calendar string should throw RangeError
+features: [Temporal]
+---*/
+
+const datetime = new Temporal.ZonedDateTime(0n, "UTC");
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => Temporal.ZonedDateTime.compare(arg, datetime),
+    `${description} is not a valid calendar ID (first argument)`
+  );
+  assert.throws(
+    RangeError,
+    () => Temporal.ZonedDateTime.compare(datetime, arg),
+    `${description} is not a valid calendar ID (second argument)`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/compare/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/compare/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..3f50412024232
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/compare/no-fractional-minutes-hours.js
@@ -0,0 +1,29 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.compare
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => Temporal.ZonedDateTime.compare(arg, new Temporal.ZonedDateTime(0n, "CET")),
+    `${description} not allowed in time string (first argument)`
+  );
+  assert.throws(
+    RangeError,
+      () => Temporal.ZonedDateTime.compare(new Temporal.ZonedDateTime(0n, "CET"), arg),
+    `${description} not allowed in time string (second argument)`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-calendar-invalid-iso-string.js
index f3d350d162a51..2f769fc585142 100644
--- a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-calendar-invalid-iso-string.js
@@ -4,7 +4,7 @@
 
 /*---
 esid: sec-temporal.zoneddatetime.from
-description: Various invalid ISO string values for calendar in a property bag
+description: Invalid ISO string as calendar should throw RangeError
 features: [Temporal]
 ---*/
 
@@ -12,10 +12,12 @@ const timeZone = "UTC";
 
 const invalidStrings = [
   ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
 
-for (const [calendar, description] of invalidStrings) {
-  const arg = { year: 1970, monthCode: "M01", day: 1, timeZone, calendar };
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1976, monthCode: "M11", day: 18, calendar: cal };
   assert.throws(
     RangeError,
     () => Temporal.ZonedDateTime.from(arg),
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-timezone-object.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-timezone-object.js
new file mode 100644
index 0000000000000..824a46eac4cfe
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/argument-propertybag-timezone-object.js
@@ -0,0 +1,14 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2022 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.from
+description: A ZonedDateTime is valid in a property bag for a time zone
+features: [Temporal]
+---*/
+
+const result = Temporal.ZonedDateTime.from({ year: 2000, month: 5, day: 2, timeZone: new Temporal.ZonedDateTime(0n, "UTC") });
+assert.sameValue(result.timeZoneId, "UTC", 'Time zone created from ZonedDateTime object');
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..c9837fee874d0
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.from
+description: Invalid calendar string should throw RangeError
+features: [Temporal]
+---*/
+
+const timeZone = "UTC";
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => Temporal.ZonedDateTime.from(arg),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/argument-string-invalid.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/argument-string-invalid.js
new file mode 100644
index 0000000000000..b25fc8cafdebb
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/argument-string-invalid.js
@@ -0,0 +1,32 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.from
+description: >
+  Check that UTC offsets are parsed properly
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  // UTCOffset must be of the form hh:mm:ss or hhmmss");
+  "2025-01-01T00:00:00+00:0000[UTC]",
+  "2025-01-01T00:00:00+0000:00[UTC]",
+  // Invalid date or time components, valid offset
+  "202501-01T00:00:00+00:00[UTC]",
+  "2025-0101T00:00:00+00:00[UTC]",
+  "2025-01-01T00:0000+00:00[UTC]",
+  "2025-01-01T0000:00+00:00[UTC]",
+];
+
+invalidStrings.forEach((s) => {
+  assert.throws(
+    RangeError,
+    () => Temporal.ZonedDateTime.from(s),
+    `invalid date-time string (${s})`
+  );
+});
+
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/argument-wrong-type.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/argument-wrong-type.js
index 874ca33f46473..4abeb74aed4de 100644
--- a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/argument-wrong-type.js
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/argument-wrong-type.js
@@ -10,6 +10,8 @@ description: >
 features: [BigInt, Symbol, Temporal]
 ---*/
 
+assert.throws(TypeError, () => Temporal.ZonedDateTime.from(), "no argument");
+
 const primitiveTests = [
   [undefined, "undefined"],
   [null, "null"],
@@ -26,6 +28,14 @@ for (const [arg, description] of primitiveTests) {
     () => Temporal.ZonedDateTime.from(arg),
     `${description} does not convert to a valid ISO string`
   );
+
+  for (const options of [undefined, { overflow: 'constrain' }, { overflow: 'reject' }]) {
+    assert.throws(
+      typeof arg === 'string' ? RangeError : TypeError,
+      () => Temporal.ZonedDateTime.from(arg, options),
+      `${description} does not convert to a valid ISO string with options ${options}`
+    );
+  }
 }
 
 const typeErrorTests = [
@@ -37,6 +47,10 @@ const typeErrorTests = [
 
 for (const [arg, description] of typeErrorTests) {
   assert.throws(TypeError, () => Temporal.ZonedDateTime.from(arg), `${description} is not a valid property bag and does not convert to a string`);
+
+  for (const options of [undefined, { overflow: 'constrain' }, { overflow: 'reject' }]) {
+    assert.throws(TypeError, () => Temporal.ZonedDateTime.from(arg, options), `${description} is not a valid property bag and does not convert to a string with options ${options}`);
+  }
 }
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/month-code-wrong-type.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/month-code-wrong-type.js
new file mode 100644
index 0000000000000..151d4ac3f9f22
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/month-code-wrong-type.js
@@ -0,0 +1,27 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.from
+description: Month code must be a string
+features: [Temporal]
+---*/
+
+const monthCodeValues = [
+  5, 5n, false, Symbol(), null, { toString: () => 5 }
+];
+
+const year = 2026;
+
+for (const monthCode of monthCodeValues) {
+  assert.throws(TypeError, () => Temporal.ZonedDateTime.from({
+    year,
+    monthCode,
+    day: 1, hour: 12, minute: 34, timeZone: "UTC"
+  }), typeof monthCode === 'symbol' ?
+      "Symbol should be rejected as month code" :
+      `month code ${monthCode} should be rejected`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/negative-month-or-day.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/negative-month-or-day.js
new file mode 100644
index 0000000000000..7f03e77368884
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/negative-month-or-day.js
@@ -0,0 +1,14 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.from
+description: Months and days must be non-negative integers
+features: [Temporal]
+---*/
+
+assert.throws(RangeError, () => Temporal.ZonedDateTime.from({ year: 2000, day: 1, timeZone: "UTC", month: -1 }));
+assert.throws(RangeError, () => Temporal.ZonedDateTime.from({ year: 2000, month: 1, timeZone: "UTC", day: -1 }));
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..04f1020887b51
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/no-fractional-minutes-hours.js
@@ -0,0 +1,24 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.from
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => Temporal.ZonedDateTime.from(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/offset-string-invalid.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/offset-string-invalid.js
index 14190a87cf36a..7598548df1850 100644
--- a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/offset-string-invalid.js
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/offset-string-invalid.js
@@ -4,13 +4,14 @@
 
 /*---
 esid: sec-temporal.zoneddatetime.from
-description: Validation of monthCode
+description: Validation of offset
 features: [Temporal]
 ---*/
 
-const bag = { year: 2024, monthCode: "M10", day: 3, timeZone: "UTC" };
-
-["garbage", "00:00", "+000:00", "-00:000", "-00:00:000", "+00:00.0", "+00:00:00.0000000000"].forEach((offset) => {
+// "+00:0000" is invalid (the hour/minute and minute/second separator
+// or lack thereof needs to match). A valid offset would be either
+// +00:00:00 or +000000.
+["garbage", "00:00", "+000:00", "-00:000", "-00:00:000", "+00:00.0", "+00:00:00.0000000000", "+00:0000"].forEach((offset) => {
   assert.throws(RangeError, () => Temporal.ZonedDateTime.from({ offset, year: 2024, monthCode: "M10", day: 3, timeZone: "UTC" }),
     `UTC offset '${offset}' is not well-formed`);
 });
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/roundtrip-from-property-bag.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/roundtrip-from-property-bag.js
index 7d77669c5ff6f..aaf1c5028de6e 100644
--- a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/roundtrip-from-property-bag.js
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/from/roundtrip-from-property-bag.js
@@ -13,20 +13,30 @@ features: [Temporal, Intl.Era-monthcode]
 
 const options = { overflow: "reject" };
 
-testRoundtrip(2000);
-testRoundtrip(1);
+const testData = [
+  [2000, 1, "M01", 1],
+  [1, 1, "M01", 1],
+  [2021, 7, "M07", 15],
+  [2021, 7, "M07", 3],
+  [2021, 12, "M12", 31],
+  [2021, 7, "M07", 15],
+];
 
-function testRoundtrip(year) {
-  const dateFromYearMonth = Temporal.ZonedDateTime.from({ year, month: 1, day: 1, hour: 12, minute: 34, second: 56, millisecond: 987, microsecond: 654, nanosecond: 321, timeZone: "UTC" }, options);
+for (const [year, month, monthCode, day] of testData) {
+  testRoundtrip(year, month, monthCode, day);
+}
+
+function testRoundtrip(year, month, monthCode, day) {
+  const dateFromYearMonth = Temporal.ZonedDateTime.from({ year, month, day, hour: 12, minute: 34, second: 56, millisecond: 987, microsecond: 654, nanosecond: 321, timeZone: "UTC" }, options);
   TemporalHelpers.assertPlainDateTime(
     dateFromYearMonth.toPlainDateTime(),
-    year, 1, "M01", 1, 12, 34, 56, 987, 654, 321,
+    year, month, monthCode, day, 12, 34, 56, 987, 654, 321,
     `${dateFromYearMonth} - created from year and month`);
 
-  const dateFromYearMonthCode = Temporal.ZonedDateTime.from({ year, monthCode: "M01", day: 1, hour: 12, minute: 34, second: 56, millisecond: 987, microsecond: 654, nanosecond: 321, timeZone: "UTC" }, options);
+  const dateFromYearMonthCode = Temporal.ZonedDateTime.from({ year, monthCode, day, hour: 12, minute: 34, second: 56, millisecond: 987, microsecond: 654, nanosecond: 321, timeZone: "UTC" }, options);
   TemporalHelpers.assertPlainDateTime(
     dateFromYearMonthCode.toPlainDateTime(),
-    year, 1, "M01", 1, 12, 34, 56, 987, 654, 321,
+    year, month, monthCode, day, 12, 34, 56, 987, 654, 321,
     `${dateFromYearMonthCode} - created from year and month code`);
 }
 
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/add/argument-duration-max-plus-min-date.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/add/argument-duration-max-plus-min-date.js
new file mode 100644
index 0000000000000..881a035f0d820
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/add/argument-duration-max-plus-min-date.js
@@ -0,0 +1,60 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.prototype.add
+description: Maximum allowed duration adding to minimum allowed date
+includes: [temporalHelpers.js]
+features: [Temporal]
+---*/
+
+const min = Temporal.ZonedDateTime.from({ year: -271821, month: 4, day: 20, timeZone: "UTC" });
+
+const maxCases = [
+  ["P547581Y4M24D", "string with max years"],
+  [{ years: 547581, months: 4, days: 24 }, "property bag with max years"],
+  ["P6570976M24D", "string with max months"],
+  [{ months: 6570976, days: 24 }, "property bag with max months"],
+  ["P28571428W4D", "string with max weeks"],
+  [{ weeks: 28_571_428, days: 4 }, "property bag with max weeks"],
+  ["P200000000D", "string with max days"],
+  [{ days: 200_000_000 }, "property bag with max days"],
+  ["PT4800000000H", "string with max hours"],
+  [{ hours: 4_800_000_000 }, "property bag with max hours"],
+  ["PT288000000000M", "string with max minutes"],
+  [{ minutes: 288_000_000_000 }, "property bag with max minutes"],
+  ["PT17280000000000S", "string with max seconds"],
+  [{ seconds: 17_280_000_000_000 }, "property bag with max seconds"],
+];
+
+for (const [arg, descr] of maxCases) {
+    const result = min.add(arg);
+    TemporalHelpers.assertPlainDateTime(result.toPlainDateTime(), 275760, 9, "M09", 13, 0, 0, 0, 0, 0, 0,  `operation succeeds with ${descr}`)
+}
+
+const max = Temporal.ZonedDateTime.from({ year: 275760, month: 9, day: 13, timeZone: "UTC" });
+
+const minCases = [
+  ["-P547581Y4M23D", "string with max years"],
+  [{ years: -547581, months: -4, days: -23 }, "property bag with max years"],
+  ["-P6570976M23D", "string with max months"],
+  [{ months: -6570976, days: -23 }, "property bag with max months"],
+  ["-P28571428W4D", "string with max weeks"],
+  [{ weeks: -28_571_428, days: -4 }, "property bag with max weeks"],
+  ["-P200000000D", "string with max days"],
+  [{ days: -200_000_000 }, "property bag with max days"],
+  ["-PT4800000000H", "string with max hours"],
+  [{ hours: -4_800_000_000 }, "property bag with max hours"],
+  ["-PT288000000000M", "string with max minutes"],
+  [{ minutes: -288_000_000_000 }, "property bag with max minutes"],
+  ["-PT17280000000000S", "string with max seconds"],
+  [{ seconds: -17_280_000_000_000 }, "property bag with max seconds"],
+];
+
+for (const [arg, descr] of minCases) {
+    const result = max.add(arg);
+    TemporalHelpers.assertPlainDateTime(result.toPlainDateTime(), -271821, 4, "M04", 20, 0, 0, 0, 0, 0, 0,  `operation succeeds with ${descr}`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/day/basic.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/day/basic.js
new file mode 100644
index 0000000000000..4859c33a87d59
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/day/basic.js
@@ -0,0 +1,15 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-get-temporal.zoneddatetime.prototype.day
+description: The "day" property of Temporal.ZonedDateTime.prototype
+features: [Temporal]
+---*/
+
+// (new Temporal.PlainDateTime(2021, 7, 15, 5, 30, 13)).toZonedDateTime("UTC")
+assert.sameValue(new Temporal.ZonedDateTime(1626327013000000000n, "UTC").day, 15);
+assert.sameValue(Temporal.ZonedDateTime.from('2019-03-18T05:30:13+00:00[UTC]').day, 18);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/dayOfYear/basic.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/dayOfYear/basic.js
new file mode 100644
index 0000000000000..ad1b527cf9583
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/dayOfYear/basic.js
@@ -0,0 +1,27 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-get-temporal.zoneddatetime.prototype.dayofyear
+description: Checking day of year for a "normal" case (non-undefined, non-boundary case, etc.)
+features: [Temporal]
+---*/
+
+const datetime = new Temporal.PlainDateTime(1976, 11, 18, 15, 23, 30, 123, 456, 789, "iso8601").toZonedDateTime("UTC");
+assert.sameValue(datetime.dayOfYear, 323, "check day of year information");
+
+assert.sameValue((new Temporal.PlainDateTime(1997, 1, 23, 5, 30, 13)).toZonedDateTime("UTC").dayOfYear, 23);
+assert.sameValue((new Temporal.PlainDateTime(1997, 2, 23, 5, 30, 13)).toZonedDateTime("UTC").dayOfYear, 54);
+assert.sameValue((new Temporal.PlainDateTime(1996, 3, 23, 5, 30, 13)).toZonedDateTime("UTC").dayOfYear, 83);
+assert.sameValue((new Temporal.PlainDateTime(1997, 3, 23, 5, 30, 13)).toZonedDateTime("UTC").dayOfYear, 82);
+assert.sameValue((new Temporal.PlainDateTime(1997, 12, 31, 5, 30, 13)).toZonedDateTime("UTC").dayOfYear, 365);
+assert.sameValue((new Temporal.PlainDateTime(1996, 12, 31, 5, 30, 13)).toZonedDateTime("UTC").dayOfYear, 366);
+assert.sameValue(Temporal.PlainDateTime.from("1997-01-23T05:30:13").toZonedDateTime("UTC").dayOfYear, 23);
+assert.sameValue(Temporal.PlainDateTime.from("1997-02-23T05:30:13").toZonedDateTime("UTC").dayOfYear, 54);
+assert.sameValue(Temporal.PlainDateTime.from("1996-03-23T05:30:13").toZonedDateTime("UTC").dayOfYear, 83);
+assert.sameValue(Temporal.PlainDateTime.from("1997-03-23T05:30:13").toZonedDateTime("UTC").dayOfYear, 82);
+assert.sameValue(Temporal.PlainDateTime.from("1997-12-31T05:30:13").toZonedDateTime("UTC").dayOfYear, 365);
+assert.sameValue(Temporal.PlainDateTime.from("1996-12-31T05:30:13").toZonedDateTime("UTC").dayOfYear, 366);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/daysInMonth/basic.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/daysInMonth/basic.js
new file mode 100644
index 0000000000000..f874ba05fae56
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/daysInMonth/basic.js
@@ -0,0 +1,38 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-get-temporal.zoneddatetime.prototype.daysinmonth
+description: Checking days in month for a "normal" case (non-undefined, non-boundary case, etc.)
+features: [Temporal]
+---*/
+
+const tests = [
+  [1976, 2, 18, 29],
+  [1976, 11, 18, 30],
+  [1976, 12, 18, 31],
+  [1977, 2, 18, 28],
+  [1997, 1, 23, 31],
+  [1996, 2, 23, 29],
+  [2000, 2, 23, 29],
+  [1997, 2, 23, 28],
+  [1997, 3, 23, 31],
+  [1997, 4, 23, 30],
+  [1997, 5, 23, 31],
+  [1997, 6, 23, 30],
+  [1997, 7, 23, 31],
+  [1997, 8, 23, 31],
+  [1997, 9, 23, 30],
+  [1997, 10, 23, 31],
+  [1997, 11, 23, 30],
+  [1997, 12, 23, 31],
+];
+for (const [y, m, d, expected] of tests) {
+  const plainDateTime = new Temporal.PlainDateTime(y, m, d, 15, 23, 30, 123, 456, 789);
+  assert.sameValue(plainDateTime.toZonedDateTime("UTC").daysInMonth, expected, `${expected} days in the month of ${plainDateTime}`);
+}
+
+
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/daysInWeek/basic.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/daysInWeek/basic.js
new file mode 100644
index 0000000000000..624f47cc8e865
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/daysInWeek/basic.js
@@ -0,0 +1,20 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-get-temporal.zoneddatetime.prototype.daysinweek
+description: Checking days in week for a "normal" case (non-undefined, non-boundary case, etc.)
+features: [Temporal]
+---*/
+
+const tests = [
+  new Temporal.ZonedDateTime(189357810123456789n, "UTC"),
+  new Temporal.ZonedDateTime(217178610123456789n, "UTC"),
+  new Temporal.ZonedDateTime(220893810123456789n, "UTC"),
+];
+for (const zonedDateTime of tests) {
+  assert.sameValue(zonedDateTime.daysInWeek, 7, `Seven days in the week of ${zonedDateTime}`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/daysInYear/basic.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/daysInYear/basic.js
index 1d18d79ffd4a7..112af64bda4d7 100644
--- a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/daysInYear/basic.js
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/daysInYear/basic.js
@@ -12,5 +12,16 @@ assert.sameValue((new Temporal.ZonedDateTime(217178610123456789n, "UTC")).daysIn
   366, "leap year");
 assert.sameValue((new Temporal.ZonedDateTime(248714610123456789n, "UTC")).daysInYear,
   365, "non-leap year");
+assert.sameValue((new Temporal.PlainDateTime(1995, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").daysInYear, 365);
+assert.sameValue((new Temporal.PlainDateTime(1996, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").daysInYear, 366);
+assert.sameValue((new Temporal.PlainDateTime(1997, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").daysInYear, 365);
+assert.sameValue((new Temporal.PlainDateTime(1998, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").daysInYear, 365);
+assert.sameValue((new Temporal.PlainDateTime(1999, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").daysInYear, 365);
+assert.sameValue((new Temporal.PlainDateTime(2000, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").daysInYear, 366);
+assert.sameValue((new Temporal.PlainDateTime(2001, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").daysInYear, 365);
+assert.sameValue((new Temporal.PlainDateTime(2002, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").daysInYear, 365);
+assert.sameValue((new Temporal.PlainDateTime(2003, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").daysInYear, 365);
+assert.sameValue((new Temporal.PlainDateTime(2004, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").daysInYear, 366);
+assert.sameValue((new Temporal.PlainDateTime(2005, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").daysInYear, 365);
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/equals/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/equals/argument-propertybag-calendar-invalid-iso-string.js
index 65a0ea66fd403..ff232f2ab8c39 100644
--- a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/equals/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/equals/argument-propertybag-calendar-invalid-iso-string.js
@@ -4,8 +4,7 @@
 
 /*---
 esid: sec-temporal.zoneddatetime.prototype.equals
-description: >
-  An ISO string that cannot be converted to a calendar ID should throw a RangeError
+description: Invalid ISO string as calendar should throw RangeError
 features: [Temporal]
 ---*/
 
@@ -13,11 +12,13 @@ const timeZone = "UTC";
 const instance = new Temporal.ZonedDateTime(0n, timeZone);
 
 const invalidStrings = [
-  ["", "empty string"]
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
 
-for (const [calendar, description] of invalidStrings) {
-  const arg = { year: 2019, monthCode: "M11", day: 1, calendar };
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1970, monthCode: "M11", day: 18, calendar: cal };
   assert.throws(
     RangeError,
     () => instance.equals(arg),
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/equals/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/equals/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..23ea357010f3e
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/equals/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,27 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.prototype.equals
+description: Invalid ISO string as calendar should throw RangeError
+features: [Temporal]
+---*/
+
+const timeZone = "UTC";
+const instance = new Temporal.ZonedDateTime(0n, timeZone);
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => instance.equals(arg),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/equals/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/equals/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..5464c0d9298e6
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/equals/no-fractional-minutes-hours.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.prototype.equals
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.ZonedDateTime(0n, "CET")
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => instance.equals(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/inLeapYear/basic.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/inLeapYear/basic.js
index 1b745bc8f4f9c..2b5e0d2c1e8bb 100644
--- a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/inLeapYear/basic.js
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/inLeapYear/basic.js
@@ -12,5 +12,16 @@ assert.sameValue((new Temporal.ZonedDateTime(217178610123456789n, "UTC")).inLeap
   true, "leap year");
 assert.sameValue((new Temporal.ZonedDateTime(248714610123456789n, "UTC")).inLeapYear,
   false, "non-leap year");
+assert.sameValue((new Temporal.PlainDateTime(1995, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").inLeapYear, false);
+assert.sameValue((new Temporal.PlainDateTime(1996, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").inLeapYear, true);
+assert.sameValue((new Temporal.PlainDateTime(1997, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").inLeapYear, false);
+assert.sameValue((new Temporal.PlainDateTime(1998, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").inLeapYear, false);
+assert.sameValue((new Temporal.PlainDateTime(1999, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").inLeapYear, false);
+assert.sameValue((new Temporal.PlainDateTime(2000, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").inLeapYear, true);
+assert.sameValue((new Temporal.PlainDateTime(2001, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").inLeapYear, false);
+assert.sameValue((new Temporal.PlainDateTime(2002, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").inLeapYear, false);
+assert.sameValue((new Temporal.PlainDateTime(2003, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").inLeapYear, false);
+assert.sameValue((new Temporal.PlainDateTime(2004, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").inLeapYear, true);
+assert.sameValue((new Temporal.PlainDateTime(2005, 8, 23, 5, 30, 13)).toZonedDateTime("UTC").inLeapYear, false);
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/month/basic.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/month/basic.js
new file mode 100644
index 0000000000000..f8881129bfc16
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/month/basic.js
@@ -0,0 +1,13 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-get-temporal.zoneddatetime.prototype.month
+description: Month property for ZonedDateTime
+features: [Temporal]
+---*/
+
+assert.sameValue((new Temporal.ZonedDateTime(0n, "UTC")).month, 1);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/monthCode/basic.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/monthCode/basic.js
new file mode 100644
index 0000000000000..d9890b3cf570b
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/monthCode/basic.js
@@ -0,0 +1,13 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.prototype.monthcode
+description: monthCode property for ZonedDateTime
+features: [Temporal]
+---*/
+
+assert.sameValue((new Temporal.ZonedDateTime(0n, "UTC")).monthCode, 'M01');
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/monthsInYear/basic.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/monthsInYear/basic.js
new file mode 100644
index 0000000000000..07bfcbc22463e
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/monthsInYear/basic.js
@@ -0,0 +1,15 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-get-temporal.zoneddatetime.prototype.monthsinyear
+description: Checking months in year for a "normal" case (non-undefined, non-boundary case, etc.)
+features: [Temporal]
+---*/
+
+const zdt = new Temporal.ZonedDateTime(217178610123456789n, "UTC");
+assert.sameValue(zdt.monthsInYear, 12, "check months in year information");
+assert.sameValue((new Temporal.ZonedDateTime(-23205637787000000000n, "UTC")).monthsInYear, 12);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/round/rounding-increments.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/round/rounding-increments.js
index 7d4eb667083c4..49c754923f0bf 100644
--- a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/round/rounding-increments.js
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/round/rounding-increments.js
@@ -67,5 +67,21 @@ TemporalHelpers.assertZonedDateTimesEqual(zdt.round({
   roundingIncrement: 1
 }), expected1Day);
 
+const unitsAndIncrements = {
+   "hour": [1, 2, 4, 6, 8, 12],
+   "minute": [1, 3, 5, 6, 10, 30],
+   "second": [1, 3, 5, 6, 10, 30],
+   "millisecond": [1, 5, 10, 20, 25, 50, 100, 500],
+   "microsecond": [1, 5, 10, 20, 25, 50, 100, 500],
+   "nanosecond": [1, 5, 10, 20, 25, 50, 100, 500],
+};
+
+// Just check that each combination of unit and increment doesn't throw
+Object.entries(unitsAndIncrements).forEach(([unit, increments]) => {
+  increments.forEach((increment) => {
+    const result = zdt.round({ smallestUnit: unit, roundingMode: "ceil", roundingIncrement: increment });
+    assert.sameValue(result instanceof Temporal.ZonedDateTime, true, `${unit} ${increment}`);
+  })
+});
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/since/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/since/argument-propertybag-calendar-invalid-iso-string.js
index 883927ee3b340..4ffa47c736f8c 100644
--- a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/since/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/since/argument-propertybag-calendar-invalid-iso-string.js
@@ -4,8 +4,7 @@
 
 /*---
 esid: sec-temporal.zoneddatetime.prototype.since
-description: >
-  An ISO string that cannot be converted to a calendar ID should throw a RangeError
+description: Invalid ISO string as calendar should throw RangeError
 features: [Temporal]
 ---*/
 
@@ -13,11 +12,13 @@ const timeZone = "UTC";
 const instance = new Temporal.ZonedDateTime(0n, timeZone);
 
 const invalidStrings = [
-  ["", "empty string"]
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
 
-for (const [calendar, description] of invalidStrings) {
-  const arg = { year: 2019, monthCode: "M11", day: 1, calendar };
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1970, monthCode: "M11", day: 18, calendar: cal };
   assert.throws(
     RangeError,
     () => instance.since(arg),
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/since/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/since/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..1a239351c65b7
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/since/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,27 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.prototype.since
+description: Invalid ISO string as calendar should throw RangeError
+features: [Temporal]
+---*/
+
+const timeZone = "UTC";
+const instance = new Temporal.ZonedDateTime(0n, timeZone);
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => instance.since(arg),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/since/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/since/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..87dce645d6bb9
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/since/no-fractional-minutes-hours.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.prototype.since
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.ZonedDateTime(0n, "CET")
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => instance.since(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/subtract/argument-duration-max-plus-min-date.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/subtract/argument-duration-max-plus-min-date.js
new file mode 100644
index 0000000000000..4c8c6166e64d3
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/subtract/argument-duration-max-plus-min-date.js
@@ -0,0 +1,60 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.prototype.subtract
+description: Maximum allowed duration subtracting from maximum allowed date
+includes: [temporalHelpers.js]
+features: [Temporal]
+---*/
+
+const max = Temporal.ZonedDateTime.from({ year: 275760, month: 9, day: 13, timeZone: "UTC" });
+
+const maxCases = [
+  ["P547581Y4M23D", "string with max years"],
+  [{ years: 547581, months: 4, days: 23 }, "property bag with max years"],
+  ["P6570976M23D", "string with max months"],
+  [{ months: 6570976, days: 23 }, "property bag with max months"],
+  ["P28571428W4D", "string with max weeks"],
+  [{ weeks: 28_571_428, days: 4 }, "property bag with max weeks"],
+  ["P200000000D", "string with max days"],
+  [{ days: 200_000_000 }, "property bag with max days"],
+  ["PT4800000000H", "string with max hours"],
+  [{ hours: 4_800_000_000 }, "property bag with max hours"],
+  ["PT288000000000M", "string with max minutes"],
+  [{ minutes: 288_000_000_000 }, "property bag with max minutes"],
+  ["PT17280000000000S", "string with max seconds"],
+  [{ seconds: 17_280_000_000_000 }, "property bag with max seconds"],
+];
+
+for (const [arg, descr] of maxCases) {
+    const result = max.subtract(arg);
+    TemporalHelpers.assertPlainDateTime(result.toPlainDateTime(), -271821, 4, "M04", 20, 0, 0, 0, 0, 0, 0,  `operation succeeds with ${descr}`);
+}
+
+const min = Temporal.ZonedDateTime.from({ year: -271821, month: 4, day: 20, timeZone: "UTC" });
+
+const minCases = [
+  ["-P547581Y4M24D", "string with max years"],
+  [{ years: -547581, months: -4, days: -24 }, "property bag with max years"],
+  ["-P6570976M24D", "string with max months"],
+  [{ months: -6570976, days: -24 }, "property bag with max months"],
+  ["-P28571428W4D", "string with max weeks"],
+  [{ weeks: -28_571_428, days: -4 }, "property bag with max weeks"],
+  ["-P200000000D", "string with max days"],
+  [{ days: -200_000_000 }, "property bag with max days"],
+  ["-PT4800000000H", "string with max hours"],
+  [{ hours: -4_800_000_000 }, "property bag with max hours"],
+  ["-PT288000000000M", "string with max minutes"],
+  [{ minutes: -288_000_000_000 }, "property bag with max minutes"],
+  ["-PT17280000000000S", "string with max seconds"],
+  [{ seconds: -17_280_000_000_000 }, "property bag with max seconds"],
+];
+
+for (const [arg, descr] of minCases) {
+    const result = min.subtract(arg);
+    TemporalHelpers.assertPlainDateTime(result.toPlainDateTime(), 275760, 9, "M09", 13, 0, 0, 0, 0, 0, 0,  `operation succeeds with ${descr}`)
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/until/argument-propertybag-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/until/argument-propertybag-calendar-invalid-iso-string.js
index fb4af69eca8fb..42577b1ab887b 100644
--- a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/until/argument-propertybag-calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/until/argument-propertybag-calendar-invalid-iso-string.js
@@ -4,8 +4,7 @@
 
 /*---
 esid: sec-temporal.zoneddatetime.prototype.until
-description: >
-  An ISO string that cannot be converted to a calendar ID should throw a RangeError
+description: Invalid ISO string as calendar should throw RangeError
 features: [Temporal]
 ---*/
 
@@ -13,11 +12,13 @@ const timeZone = "UTC";
 const instance = new Temporal.ZonedDateTime(0n, timeZone);
 
 const invalidStrings = [
-  ["", "empty string"]
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+  ["notacal", "Unknown calendar"],
 ];
 
-for (const [calendar, description] of invalidStrings) {
-  const arg = { year: 2019, monthCode: "M11", day: 1, calendar };
+for (const [cal, description] of invalidStrings) {
+  const arg = { year: 1970, monthCode: "M11", day: 18, calendar: cal };
   assert.throws(
     RangeError,
     () => instance.until(arg),
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/until/argument-string-calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/until/argument-string-calendar-invalid-iso-string.js
new file mode 100644
index 0000000000000..8e6ea7028d3d3
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/until/argument-string-calendar-invalid-iso-string.js
@@ -0,0 +1,27 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.prototype.until
+description: Invalid ISO string as calendar should throw RangeError
+features: [Temporal]
+---*/
+
+const timeZone = "UTC";
+const instance = new Temporal.ZonedDateTime(0n, timeZone);
+
+const invalidStrings = [
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+    () => instance.until(arg),
+    `${description} is not a valid calendar ID`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/until/no-fractional-minutes-hours.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/until/no-fractional-minutes-hours.js
new file mode 100644
index 0000000000000..fe1a49f1e5477
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/until/no-fractional-minutes-hours.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.prototype.until
+description: Fractional minutes or hours in time string should throw RangeError
+features: [Temporal]
+---*/
+
+const instance = new Temporal.ZonedDateTime(0n, "CET")
+
+const invalidStrings = [
+  ["2025-04-03T05:07.123", "Fractional minutes"],
+  ["2025-04-03T12.5", "Fractional hours"],
+];
+
+for (const [arg, description] of invalidStrings) {
+  assert.throws(
+    RangeError,
+      () => instance.until(arg),
+    `${description} not allowed in time string`
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/weekOfYear/basic.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/weekOfYear/basic.js
new file mode 100644
index 0000000000000..6e08e69a3105a
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/weekOfYear/basic.js
@@ -0,0 +1,40 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-get-temporal.zoneddatetime.prototype.weekofyear
+description: Checking week of year for a "normal" case, as well as for dates near the turn of the year.
+features: [Temporal]
+---*/
+
+const zdt = new Temporal.PlainDateTime(1976, 11, 18, 15, 23, 30, 123, 456, 789).toZonedDateTime("UTC");
+assert.sameValue(zdt.weekOfYear, 47, "check week of year information");
+
+for (let i = 29; i <= 31; ++i) {
+  const zdt = new Temporal.PlainDateTime(1975, 12, i, 15, 23, 30, 123, 456, 789).toZonedDateTime("UTC");
+  assert.sameValue(zdt.weekOfYear, 1, `${zdt} should be in week 1`);
+}
+for (let i = 1; i <= 4; ++i) {
+  const zdt = new Temporal.PlainDateTime(1976, 1, i, 15, 23, 30, 123, 456, 789).toZonedDateTime("UTC");
+  assert.sameValue(zdt.weekOfYear, 1, `${zdt} should be in week 1`);
+}
+for (let i = 5; i <= 11; ++i) {
+  const zdt = new Temporal.PlainDateTime(1976, 1, i, 15, 23, 30, 123, 456, 789).toZonedDateTime("UTC");
+  assert.sameValue(zdt.weekOfYear, 2, `${zdt} should be in week 2`);
+}
+for (let i = 20; i <= 26; ++i) {
+  const zdt = new Temporal.PlainDateTime(1976, 12, i, 15, 23, 30, 123, 456, 789).toZonedDateTime("UTC");
+  assert.sameValue(zdt.weekOfYear, 52, `${zdt} should be in week 52`);
+}
+for (let i = 27; i <= 31; ++i) {
+  const zdt = new Temporal.PlainDateTime(1976, 12, i, 15, 23, 30, 123, 456, 789).toZonedDateTime("UTC");
+  assert.sameValue(zdt.weekOfYear, 53, `${zdt} should be in week 53`);
+}
+for (let i = 1; i <= 2; ++i) {
+  const zdt = new Temporal.PlainDateTime(1977, 1, i, 15, 23, 30, 123, 456, 789).toZonedDateTime("UTC");
+  assert.sameValue(zdt.weekOfYear, 53, `${zdt} should be in week 53`);
+}
+
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/withCalendar/calendar-invalid-iso-string.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/withCalendar/calendar-invalid-iso-string.js
index d439f14a9142d..4d5461c4bc8bc 100644
--- a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/withCalendar/calendar-invalid-iso-string.js
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/withCalendar/calendar-invalid-iso-string.js
@@ -4,15 +4,15 @@
 
 /*---
 esid: sec-temporal.zoneddatetime.prototype.withcalendar
-description: >
-  An ISO string that cannot be converted to a calendar ID should throw a RangeError
+description: Invalid ISO string as calendar should throw RangeError
 features: [Temporal]
 ---*/
 
 const instance = new Temporal.ZonedDateTime(1_000_000_000_000_000_000n, "UTC", "iso8601");
 
 const invalidStrings = [
-  ["", "empty string"]
+  ["", "empty string"],
+  ["1997-12-04[u-ca=notacal]", "Unknown calendar"],
 ];
 
 for (const [arg, description] of invalidStrings) {
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/withCalendar/calendar-time-string.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/withCalendar/calendar-time-string.js
new file mode 100644
index 0000000000000..3da967d8f5906
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/withCalendar/calendar-time-string.js
@@ -0,0 +1,60 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.prototype.withcalendar
+description: A time string is valid input for Calendar; default is iso8601
+features: [Temporal]
+---*/
+
+const tests = [
+  "15:23",
+  "15:23:30",
+  "15:23:30.123",
+  "15:23:30.123456",
+  "15:23:30.123456789",
+  "1976-11-18T15:23:30.1",
+  "1976-11-18T15:23:30.12",
+  "1976-11-18T15:23:30.123",
+  "1976-11-18T15:23:30.1234",
+  "1976-11-18T15:23:30.12345",
+  "1976-11-18T15:23:30.123456",
+  "1976-11-18T15:23:30.1234567",
+  "1976-11-18T15:23:30.12345678",
+  "1976-11-18T15:23:30.123456789",
+  "1976-11-18T15:23:30,12",
+  "1976-11-18T15:23:30.12-02:00",
+  "152330",
+  "152330.1",
+  "152330-08",
+  "152330.1-08",
+  "152330-0800",
+  "152330.1-0800",
+  "1976-11-18T152330.1+00:00",
+  "19761118T15:23:30.1+00:00",
+  "1976-11-18T15:23:30.1+0000",
+  "1976-11-18T152330.1+0000",
+  "19761118T15:23:30.1+0000",
+  "19761118T152330.1+00:00",
+  "19761118T152330.1+0000",
+  "+001976-11-18T152330.1+00:00",
+  "+0019761118T15:23:30.1+00:00",
+  "+001976-11-18T15:23:30.1+0000",
+  "+001976-11-18T152330.1+0000",
+  "+0019761118T15:23:30.1+0000",
+  "+0019761118T152330.1+00:00",
+  "+0019761118T152330.1+0000",
+  "15",
+  "T15:23:30",
+  "t152330",
+];
+
+const instance = Temporal.ZonedDateTime.from({ year: 1976, month: 11, day: 18, hour: 12, minute: 34, timeZone: "UTC"});
+
+tests.forEach((arg) => {
+  const result = instance.withCalendar(arg);
+  assert.sameValue(result.calendarId, "iso8601", `Calendar created from string "${arg}"`);
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/year/basic.js b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/year/basic.js
new file mode 100644
index 0000000000000..9cd9c9bafa46a
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Temporal/ZonedDateTime/prototype/year/basic.js
@@ -0,0 +1,14 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-get-temporal.zoneddatetime.prototype.year
+description: The "year" property of Temporal.ZonedDateTime.prototype
+features: [Temporal]
+---*/
+
+assert.sameValue((new Temporal.ZonedDateTime(0n, "UTC")).year, 1970);
+assert.sameValue(Temporal.ZonedDateTime.from('2019-03-15T15:30:26+00:00[UTC]').year, 2019);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Temporal/shell.js b/js/src/tests/test262/built-ins/Temporal/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/built-ins/Temporal/shell.js
+++ b/js/src/tests/test262/built-ins/Temporal/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/format/temporal-plaindate-formatting-timezonename.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/format/temporal-plaindate-formatting-timezonename.js
new file mode 100644
index 0000000000000..c37a075a9be95
--- /dev/null
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/format/temporal-plaindate-formatting-timezonename.js
@@ -0,0 +1,34 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-datetime-format-functions
+description: >
+  PlainDate can be formatted with a formatter created with the timeZoneName
+  option, but no time zone name is included.
+locale: [en-US]
+features: [Temporal]
+---*/
+
+const locale = "en-US";
+const timeZoneNameStyles = [
+  "long", "short", "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+];
+const date = new Temporal.PlainDate(2026, 1, 5);
+
+for (const timeZoneNameStyle of timeZoneNameStyles) {
+  const dtf = new Intl.DateTimeFormat(locale, { timeZoneName: timeZoneNameStyle });
+
+  const timeZoneDisplayName = dtf.formatToParts(Date.UTC(2026, 0, 5)).find(({ type }) => {
+    return type === 'timeZoneName';
+  }).value;
+
+  const result = dtf.format(date);
+  assert.sameValue(typeof result, "string",
+    `can format a PlainDate with timeZoneName = ${timeZoneNameStyle}`);
+  assert.sameValue(result.indexOf(timeZoneDisplayName), -1,
+    `"${result}" should not include ${timeZoneDisplayName}`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/format/temporal-plaindatetime-formatting-timezonename.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/format/temporal-plaindatetime-formatting-timezonename.js
new file mode 100644
index 0000000000000..f5b9b23f5dc24
--- /dev/null
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/format/temporal-plaindatetime-formatting-timezonename.js
@@ -0,0 +1,34 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-datetime-format-functions
+description: >
+  PlainDateTime can be formatted with a formatter created with the timeZoneName
+  option, but no time zone name is included.
+locale: [en-US]
+features: [Temporal]
+---*/
+
+const locale = "en-US";
+const timeZoneNameStyles = [
+  "long", "short", "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+];
+const pdt = new Temporal.PlainDateTime(2026, 1, 5, 11, 22);
+
+for (const timeZoneNameStyle of timeZoneNameStyles) {
+  const dtf = new Intl.DateTimeFormat(locale, { timeZoneName: timeZoneNameStyle });
+
+  const timeZoneDisplayName = dtf.formatToParts(Date.UTC(2026, 0, 5, 11, 22)).find(({ type }) => {
+    return type === 'timeZoneName';
+  }).value;
+
+  const result = dtf.format(pdt);
+  assert.sameValue(typeof result, "string",
+    `can format a PlainDateTime with timeZoneName = ${timeZoneNameStyle}`);
+  assert.sameValue(result.indexOf(timeZoneDisplayName), -1,
+    `"${result}" should not include ${timeZoneDisplayName}`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/format/temporal-plainmonthday-formatting-timezonename.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/format/temporal-plainmonthday-formatting-timezonename.js
new file mode 100644
index 0000000000000..22cab0d710987
--- /dev/null
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/format/temporal-plainmonthday-formatting-timezonename.js
@@ -0,0 +1,34 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-datetime-format-functions
+description: >
+  PlainMonthDay can be formatted with a formatter created with the timeZoneName
+  option, but no time zone name is included.
+locale: [en-US-u-ca-gregory]
+features: [Temporal]
+---*/
+
+const locale = "en-US-u-ca-gregory";
+const timeZoneNameStyles = [
+  "long", "short", "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+];
+const md = new Temporal.PlainMonthDay(1, 5, "gregory", 1972);
+
+for (const timeZoneNameStyle of timeZoneNameStyles) {
+  const dtf = new Intl.DateTimeFormat(locale, { timeZoneName: timeZoneNameStyle });
+
+  const timeZoneDisplayName = dtf.formatToParts(Date.UTC(1972, 0, 5)).find(({ type }) => {
+    return type === 'timeZoneName';
+  }).value;
+
+  const result = dtf.format(md);
+  assert.sameValue(typeof result, "string",
+    `can format a PlainMonthDay with timeZoneName = ${timeZoneNameStyle}`);
+  assert.sameValue(result.indexOf(timeZoneDisplayName), -1,
+    `"${result}" should not include ${timeZoneDisplayName}`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/format/temporal-plaintime-formatting-timezonename.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/format/temporal-plaintime-formatting-timezonename.js
new file mode 100644
index 0000000000000..d53a530ed5fbd
--- /dev/null
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/format/temporal-plaintime-formatting-timezonename.js
@@ -0,0 +1,34 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-datetime-format-functions
+description: >
+  PlainTime can be formatted with a formatter created with the timeZoneName
+  option, but no time zone name is included.
+locale: [en-US]
+features: [Temporal]
+---*/
+
+const locale = "en-US";
+const timeZoneNameStyles = [
+  "long", "short", "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+];
+const time = new Temporal.PlainTime(12, 34);
+
+for (const timeZoneNameStyle of timeZoneNameStyles) {
+  const dtf = new Intl.DateTimeFormat(locale, { timeZoneName: timeZoneNameStyle });
+
+  const timeZoneDisplayName = dtf.formatToParts(Date.UTC(1970, 0, 1, 12, 34)).find(({ type }) => {
+    return type === 'timeZoneName';
+  }).value;
+
+  const result = dtf.format(time);
+  assert.sameValue(typeof result, "string",
+    `can format a PlainTime with timeZoneName = ${timeZoneNameStyle}`);
+  assert.sameValue(result.indexOf(timeZoneDisplayName), -1,
+    `"${result}" should not include ${timeZoneDisplayName}`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/format/temporal-plainyearmonth-formatting-timezonename.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/format/temporal-plainyearmonth-formatting-timezonename.js
new file mode 100644
index 0000000000000..15340e24d4baa
--- /dev/null
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/format/temporal-plainyearmonth-formatting-timezonename.js
@@ -0,0 +1,34 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-datetime-format-functions
+description: >
+  PlainYearMonth can be formatted with a formatter created with the timeZoneName
+  option, but no time zone name is included.
+locale: [en-US]
+features: [Temporal]
+---*/
+
+const locale = "en-US";
+const timeZoneNameStyles = [
+  "long", "short", "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+];
+const ym = new Temporal.PlainYearMonth(2026, 1, "gregory", 1);
+
+for (const timeZoneNameStyle of timeZoneNameStyles) {
+  const dtf = new Intl.DateTimeFormat(locale, { timeZoneName: timeZoneNameStyle });
+
+  const timeZoneDisplayName = dtf.formatToParts(Date.UTC(2026, 0, 1)).find(({ type }) => {
+    return type === 'timeZoneName';
+  }).value;
+
+  const result = dtf.format(ym);
+  assert.sameValue(typeof result, "string",
+    `can format a PlainYearMonth with timeZoneName = ${timeZoneNameStyle}`);
+  assert.sameValue(result.indexOf(timeZoneDisplayName), -1,
+    `"${result}" should not include ${timeZoneDisplayName}`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRange/temporal-plaindate-formatting-timezonename.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRange/temporal-plaindate-formatting-timezonename.js
new file mode 100644
index 0000000000000..a2aee84f13618
--- /dev/null
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRange/temporal-plaindate-formatting-timezonename.js
@@ -0,0 +1,35 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-datetime-format-functions
+description: >
+  PlainDate can be formatted with a formatter created with the timeZoneName
+  option, but no time zone name is included.
+locale: [en-US]
+features: [Temporal]
+---*/
+
+const locale = "en-US";
+const timeZoneNameStyles = [
+  "long", "short", "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+];
+const date1 = new Temporal.PlainDate(2026, 1, 5);
+const date2 = new Temporal.PlainDate(2026, 1, 6);
+
+for (const timeZoneNameStyle of timeZoneNameStyles) {
+  const dtf = new Intl.DateTimeFormat(locale, { timeZoneName: timeZoneNameStyle });
+
+  const timeZoneDisplayName = dtf.formatToParts(Date.UTC(2026, 0, 5)).find(({ type }) => {
+    return type === 'timeZoneName';
+  }).value;
+
+  const result = dtf.formatRange(date1, date2);
+  assert.sameValue(typeof result, "string",
+    `can format a PlainDate with timeZoneName = ${timeZoneNameStyle}`);
+  assert.sameValue(result.indexOf(timeZoneDisplayName), -1,
+    `"${result}" should not include ${timeZoneDisplayName}`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRange/temporal-plaindatetime-formatting-timezonename.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRange/temporal-plaindatetime-formatting-timezonename.js
new file mode 100644
index 0000000000000..552f2b004874e
--- /dev/null
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRange/temporal-plaindatetime-formatting-timezonename.js
@@ -0,0 +1,35 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-datetime-format-functions
+description: >
+  PlainDateTime can be formatted with a formatter created with the timeZoneName
+  option, but no time zone name is included.
+locale: [en-US]
+features: [Temporal]
+---*/
+
+const locale = "en-US";
+const timeZoneNameStyles = [
+  "long", "short", "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+];
+const pdt1 = new Temporal.PlainDateTime(2026, 1, 5, 11, 22);
+const pdt2 = new Temporal.PlainDateTime(2026, 1, 5, 11, 23);
+
+for (const timeZoneNameStyle of timeZoneNameStyles) {
+  const dtf = new Intl.DateTimeFormat(locale, { timeZoneName: timeZoneNameStyle });
+
+  const timeZoneDisplayName = dtf.formatToParts(Date.UTC(2026, 0, 5, 11, 22)).find(({ type }) => {
+    return type === 'timeZoneName';
+  }).value;
+
+  const result = dtf.formatRange(pdt1, pdt2);
+  assert.sameValue(typeof result, "string",
+    `can format a PlainDateTime with timeZoneName = ${timeZoneNameStyle}`);
+  assert.sameValue(result.indexOf(timeZoneDisplayName), -1,
+    `"${result}" should not include ${timeZoneDisplayName}`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRange/temporal-plainmonthday-formatting-timezonename.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRange/temporal-plainmonthday-formatting-timezonename.js
new file mode 100644
index 0000000000000..6ebfacad8cab9
--- /dev/null
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRange/temporal-plainmonthday-formatting-timezonename.js
@@ -0,0 +1,35 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-datetime-format-functions
+description: >
+  PlainMonthDay can be formatted with a formatter created with the timeZoneName
+  option, but no time zone name is included.
+locale: [en-US-u-ca-gregory]
+features: [Temporal]
+---*/
+
+const locale = "en-US-u-ca-gregory";
+const timeZoneNameStyles = [
+  "long", "short", "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+];
+const md1 = new Temporal.PlainMonthDay(1, 5, "gregory", 1972);
+const md2 = new Temporal.PlainMonthDay(1, 6, "gregory", 1972);
+
+for (const timeZoneNameStyle of timeZoneNameStyles) {
+  const dtf = new Intl.DateTimeFormat(locale, { timeZoneName: timeZoneNameStyle });
+
+  const timeZoneDisplayName = dtf.formatToParts(Date.UTC(1972, 0, 5)).find(({ type }) => {
+    return type === 'timeZoneName';
+  }).value;
+
+  const result = dtf.formatRange(md1, md2);
+  assert.sameValue(typeof result, "string",
+    `can format a PlainMonthDay with timeZoneName = ${timeZoneNameStyle}`);
+  assert.sameValue(result.indexOf(timeZoneDisplayName), -1,
+    `"${result}" should not include ${timeZoneDisplayName}`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRange/temporal-plaintime-formatting-timezonename.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRange/temporal-plaintime-formatting-timezonename.js
new file mode 100644
index 0000000000000..f812c5fa5ff32
--- /dev/null
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRange/temporal-plaintime-formatting-timezonename.js
@@ -0,0 +1,35 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-datetime-format-functions
+description: >
+  PlainTime can be formatted with a formatter created with the timeZoneName
+  option, but no time zone name is included.
+locale: [en-US]
+features: [Temporal]
+---*/
+
+const locale = "en-US";
+const timeZoneNameStyles = [
+  "long", "short", "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+];
+const time1 = new Temporal.PlainTime(12, 34);
+const time2 = new Temporal.PlainTime(18, 45);
+
+for (const timeZoneNameStyle of timeZoneNameStyles) {
+  const dtf = new Intl.DateTimeFormat(locale, { timeZoneName: timeZoneNameStyle });
+
+  const timeZoneDisplayName = dtf.formatToParts(Date.UTC(1970, 0, 1, 12, 34)).find(({ type }) => {
+    return type === 'timeZoneName';
+  }).value;
+
+  const result = dtf.formatRange(time1, time2);
+  assert.sameValue(typeof result, "string",
+    `can format a PlainTime with timeZoneName = ${timeZoneNameStyle}`);
+  assert.sameValue(result.indexOf(timeZoneDisplayName), -1,
+    `"${result}" should not include ${timeZoneDisplayName}`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRange/temporal-plainyearmonth-formatting-timezonename.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRange/temporal-plainyearmonth-formatting-timezonename.js
new file mode 100644
index 0000000000000..05c551444494c
--- /dev/null
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRange/temporal-plainyearmonth-formatting-timezonename.js
@@ -0,0 +1,35 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-datetime-format-functions
+description: >
+  PlainYearMonth can be formatted with a formatter created with the timeZoneName
+  option, but no time zone name is included.
+locale: [en-US]
+features: [Temporal]
+---*/
+
+const locale = "en-US";
+const timeZoneNameStyles = [
+  "long", "short", "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+];
+const ym1 = new Temporal.PlainYearMonth(2026, 1, "gregory", 1);
+const ym2 = new Temporal.PlainYearMonth(2026, 2, "gregory", 1);
+
+for (const timeZoneNameStyle of timeZoneNameStyles) {
+  const dtf = new Intl.DateTimeFormat(locale, { timeZoneName: timeZoneNameStyle });
+
+  const timeZoneDisplayName = dtf.formatToParts(Date.UTC(2026, 0, 1)).find(({ type }) => {
+    return type === 'timeZoneName';
+  }).value;
+
+  const result = dtf.formatRange(ym1, ym2);
+  assert.sameValue(typeof result, "string",
+    `can format a PlainYearMonth with timeZoneName = ${timeZoneNameStyle}`);
+  assert.sameValue(result.indexOf(timeZoneDisplayName), -1,
+    `"${result}" should not include ${timeZoneDisplayName}`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/chinese-calendar-dates.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/chinese-calendar-dates.js
index 0b5c8ef311ad1..677b360bac9b1 100644
--- a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/chinese-calendar-dates.js
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/chinese-calendar-dates.js
@@ -21,11 +21,13 @@ function compareFormatRangeToPartsSnapshot(isoString1, isoString2, expectedCompo
     for (let [expectedType, expectedValue] of Object.entries(list)) {
       const part = actualComponents.find(({type, source}) => type === expectedType && source == sourceVal);
       const contextMessage = `${expectedType} component of ${isoString} formatted in ${calendar}`;
-      assert.notSameValue(part, undefined, contextMessage);
-      if (typeof part.value === "string")
-        assert(part.value === expectedValue || (expectedValue.length === 1 && part.value === '0' + expectedValue));
-      else
-        assert.sameValue(part.value, `${expectedValue}`, contextMessage);
+      assert.notSameValue(part, undefined, `${contextMessage} is missing`);
+      assert.sameValue(typeof part.value, "string", `${contextMessage} is not a string`);
+      assert(
+        part.value === String(expectedValue) ||
+          part.value === String(expectedValue).padStart(2, "0"),
+        `${contextMessage} has unexpected value`
+      );
     }
   }
 
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/dangi-calendar-dates.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/dangi-calendar-dates.js
index e44637a7f4db2..19c680ac1cbde 100644
--- a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/dangi-calendar-dates.js
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/dangi-calendar-dates.js
@@ -21,11 +21,13 @@ function compareFormatRangeToPartsSnapshot(isoString1, isoString2, expectedCompo
     for (let [expectedType, expectedValue] of Object.entries(list)) {
       const part = actualComponents.find(({type, source}) => type === expectedType && source == sourceVal);
       const contextMessage = `${expectedType} component of ${isoString} formatted in ${calendar}`;
-      assert.notSameValue(part, undefined, contextMessage);
-      if (typeof part.value === "string")
-        assert(part.value === expectedValue || (expectedValue.length === 1 && part.value === '0' + expectedValue));
-      else
-        assert.sameValue(part.value, `${expectedValue}`, contextMessage);
+      assert.notSameValue(part, undefined, `${contextMessage} is missing`);
+      assert.sameValue(typeof part.value, "string", `${contextMessage} is not a string`);
+      assert(
+        part.value === String(expectedValue) ||
+          part.value === String(expectedValue).padStart(2, "0"),
+        `${contextMessage} has unexpected value`
+      );
     }
   }
 
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/temporal-plaindate-formatting-timezonename.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/temporal-plaindate-formatting-timezonename.js
new file mode 100644
index 0000000000000..3ba262678a615
--- /dev/null
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/temporal-plaindate-formatting-timezonename.js
@@ -0,0 +1,32 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-datetime-format-functions
+description: >
+  PlainDate can be formatted with a formatter created with the timeZoneName
+  option, but no time zone name is included.
+locale: [en-US]
+features: [Temporal]
+---*/
+
+const locale = "en-US";
+const timeZoneNameStyles = [
+  "long", "short", "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+];
+const date1 = new Temporal.PlainDate(2026, 1, 5);
+const date2 = new Temporal.PlainDate(2026, 1, 6);
+
+for (const timeZoneNameStyle of timeZoneNameStyles) {
+  const dtf = new Intl.DateTimeFormat(locale, { timeZoneName: timeZoneNameStyle });
+  const result = dtf.formatRangeToParts(date1, date2);
+  assert(Array.isArray(result),
+    `can format a PlainDate with timeZoneName = ${timeZoneNameStyle}`);
+  for (const { type } of result) {
+    assert.notSameValue(type, "timeZoneName",
+      `formatting a PlainDate with timeZoneName = ${timeZoneNameStyle} should not print a time zone`);
+  }
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/temporal-plaindatetime-formatting-timezonename.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/temporal-plaindatetime-formatting-timezonename.js
new file mode 100644
index 0000000000000..a3c5e62a52819
--- /dev/null
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/temporal-plaindatetime-formatting-timezonename.js
@@ -0,0 +1,32 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-datetime-format-functions
+description: >
+  PlainDateTime can be formatted with a formatter created with the timeZoneName
+  option, but no time zone name is included.
+locale: [en-US]
+features: [Temporal]
+---*/
+
+const locale = "en-US";
+const timeZoneNameStyles = [
+  "long", "short", "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+];
+const pdt1 = new Temporal.PlainDateTime(2026, 1, 5, 11, 22);
+const pdt2 = new Temporal.PlainDateTime(2026, 1, 5, 11, 23);
+
+for (const timeZoneNameStyle of timeZoneNameStyles) {
+  const dtf = new Intl.DateTimeFormat(locale, { timeZoneName: timeZoneNameStyle });
+  const result = dtf.formatRangeToParts(pdt1, pdt2);
+  assert(Array.isArray(result),
+    `can format a PlainDateTime with timeZoneName = ${timeZoneNameStyle}`);
+  for (const { type } of result) {
+    assert.notSameValue(type, "timeZoneName",
+      `formatting a PlainDateTime with timeZoneName = ${timeZoneNameStyle} should not print a time zone`);
+  }
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/temporal-plainmonthday-formatting-timezonename.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/temporal-plainmonthday-formatting-timezonename.js
new file mode 100644
index 0000000000000..7f48929020fa3
--- /dev/null
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/temporal-plainmonthday-formatting-timezonename.js
@@ -0,0 +1,32 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-datetime-format-functions
+description: >
+  PlainMonthDay can be formatted with a formatter created with the timeZoneName
+  option, but no time zone name is included.
+locale: [en-US-u-ca-gregory]
+features: [Temporal]
+---*/
+
+const locale = "en-US-u-ca-gregory";
+const timeZoneNameStyles = [
+  "long", "short", "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+];
+const md1 = new Temporal.PlainMonthDay(1, 5, "gregory", 1972);
+const md2 = new Temporal.PlainMonthDay(1, 6, "gregory", 1972);
+
+for (const timeZoneNameStyle of timeZoneNameStyles) {
+  const dtf = new Intl.DateTimeFormat(locale, { timeZoneName: timeZoneNameStyle });
+  const result = dtf.formatRangeToParts(md1, md2);
+  assert(Array.isArray(result),
+    `can format a PlainMonthDay with timeZoneName = ${timeZoneNameStyle}`);
+  for (const { type } of result) {
+    assert.notSameValue(type, "timeZoneName",
+      `formatting a PlainMonthDay with timeZoneName = ${timeZoneNameStyle} should not print a time zone`);
+  }
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/temporal-plaintime-formatting-timezonename.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/temporal-plaintime-formatting-timezonename.js
new file mode 100644
index 0000000000000..886008512805b
--- /dev/null
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/temporal-plaintime-formatting-timezonename.js
@@ -0,0 +1,32 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-datetime-format-functions
+description: >
+  PlainTime can be formatted with a formatter created with the timeZoneName
+  option, but no time zone name is included.
+locale: [en-US]
+features: [Temporal]
+---*/
+
+const locale = "en-US";
+const timeZoneNameStyles = [
+  "long", "short", "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+];
+const time1 = new Temporal.PlainTime(12, 34);
+const time2 = new Temporal.PlainTime(18, 45);
+
+for (const timeZoneNameStyle of timeZoneNameStyles) {
+  const dtf = new Intl.DateTimeFormat(locale, { timeZoneName: timeZoneNameStyle });
+  const result = dtf.formatRangeToParts(time1, time2);
+  assert(Array.isArray(result),
+    `can format a PlainTime with timeZoneName = ${timeZoneNameStyle}`);
+  for (const { type } of result) {
+    assert.notSameValue(type, "timeZoneName",
+      `formatting a PlainTime with timeZoneName = ${timeZoneNameStyle} should not print a time zone`);
+  }
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/temporal-plainyearmonth-formatting-timezonename.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/temporal-plainyearmonth-formatting-timezonename.js
new file mode 100644
index 0000000000000..86adccd28fcf6
--- /dev/null
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatRangeToParts/temporal-plainyearmonth-formatting-timezonename.js
@@ -0,0 +1,32 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-datetime-format-functions
+description: >
+  PlainYearMonth can be formatted with a formatter created with the timeZoneName
+  option, but no time zone name is included.
+locale: [en-US]
+features: [Temporal]
+---*/
+
+const locale = "en-US";
+const timeZoneNameStyles = [
+  "long", "short", "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+];
+const ym1 = new Temporal.PlainYearMonth(2026, 1, "gregory", 1);
+const ym2 = new Temporal.PlainYearMonth(2026, 2, "gregory", 1);
+
+for (const timeZoneNameStyle of timeZoneNameStyles) {
+  const dtf = new Intl.DateTimeFormat(locale, { timeZoneName: timeZoneNameStyle });
+  const result = dtf.formatRangeToParts(ym1, ym2);
+  assert(Array.isArray(result),
+    `can format a PlainYearMonth with timeZoneName = ${timeZoneNameStyle}`);
+  for (const { type } of result) {
+    assert.notSameValue(type, "timeZoneName",
+      `formatting a PlainYearMonth with timeZoneName = ${timeZoneNameStyle} should not print a time zone`);
+  }
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/chinese-calendar-dates.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/chinese-calendar-dates.js
index 3e4d219aafffe..1a8be0b83ef2e 100644
--- a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/chinese-calendar-dates.js
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/chinese-calendar-dates.js
@@ -18,11 +18,13 @@ function compareFormatToPartsSnapshot(isoString, expectedComponents) {
   for (let [expectedType, expectedValue] of Object.entries(expectedComponents)) {
     const part = actualComponents.find(({type}) => type === expectedType);
     const contextMessage = `${expectedType} component of ${isoString} formatted in ${calendar}`;
-    assert.notSameValue(part, undefined, contextMessage);
-    if (typeof part.value === "string")
-      assert(part.value === expectedValue || (expectedValue.length === 1 && part.value === '0' + expectedValue));
-    else
-      assert.sameValue(part.value, `${expectedValue}`, contextMessage);
+    assert.notSameValue(part, undefined, `${contextMessage} is missing`);
+    assert.sameValue(typeof part.value, "string", `${contextMessage} is not a string`);
+    assert(
+      part.value === String(expectedValue) ||
+        part.value === String(expectedValue).padStart(2, "0"),
+      `${contextMessage} has unexpected value`
+    );
   }
 }
 
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/dangi-calendar-dates.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/dangi-calendar-dates.js
index a04417b2a6fb6..047bf3094be77 100644
--- a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/dangi-calendar-dates.js
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/dangi-calendar-dates.js
@@ -22,11 +22,13 @@ function compareFormatToPartsSnapshot(isoString, expectedComponents) {
   for (let [expectedType, expectedValue] of Object.entries(expectedComponents)) {
     const part = actualComponents.find(({type}) => type === expectedType);
     const contextMessage = `${expectedType} component of ${isoString} formatted in ${calendar}`;
-    assert.notSameValue(part, undefined, contextMessage);
-    if (typeof part.value === "string")
-      assert(part.value === expectedValue || (expectedValue.length === 1 && part.value === '0' + expectedValue));
-    else
-      assert.sameValue(part.value, `${expectedValue}`, contextMessage);
+    assert.notSameValue(part, undefined, `${contextMessage} is missing`);
+    assert.sameValue(typeof part.value, "string", `${contextMessage} is not a string`);
+    assert(
+      part.value === String(expectedValue) ||
+        part.value === String(expectedValue).padStart(2, "0"),
+      `${contextMessage} has unexpected value`
+    );
   }
 }
 
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/temporal-plaindate-formatting-timezonename.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/temporal-plaindate-formatting-timezonename.js
new file mode 100644
index 0000000000000..dfc2b21df1b51
--- /dev/null
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/temporal-plaindate-formatting-timezonename.js
@@ -0,0 +1,31 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-datetime-format-functions
+description: >
+  PlainDate can be formatted with a formatter created with the timeZoneName
+  option, but no time zone name is included.
+locale: [en-US]
+features: [Temporal]
+---*/
+
+const locale = "en-US";
+const timeZoneNameStyles = [
+  "long", "short", "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+];
+const date = new Temporal.PlainDate(2026, 1, 5);
+
+for (const timeZoneNameStyle of timeZoneNameStyles) {
+  const dtf = new Intl.DateTimeFormat(locale, { timeZoneName: timeZoneNameStyle });
+  const result = dtf.formatToParts(date);
+  assert(Array.isArray(result),
+    `can format a PlainDate with timeZoneName = ${timeZoneNameStyle}`);
+  for (const { type } of result) {
+    assert.notSameValue(type, "timeZoneName",
+      `formatting a PlainDate with timeZoneName = ${timeZoneNameStyle} should not print a time zone`);
+  }
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/temporal-plaindatetime-formatting-timezonename.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/temporal-plaindatetime-formatting-timezonename.js
new file mode 100644
index 0000000000000..f6e5ed31499fd
--- /dev/null
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/temporal-plaindatetime-formatting-timezonename.js
@@ -0,0 +1,31 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-datetime-format-functions
+description: >
+  PlainDateTime can be formatted with a formatter created with the timeZoneName
+  option, but no time zone name is included.
+locale: [en-US]
+features: [Temporal]
+---*/
+
+const locale = "en-US";
+const timeZoneNameStyles = [
+  "long", "short", "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+];
+const pdt = new Temporal.PlainDateTime(2026, 1, 5, 11, 22);
+
+for (const timeZoneNameStyle of timeZoneNameStyles) {
+  const dtf = new Intl.DateTimeFormat(locale, { timeZoneName: timeZoneNameStyle });
+  const result = dtf.formatToParts(pdt);
+  assert(Array.isArray(result),
+    `can format a PlainDateTime with timeZoneName = ${timeZoneNameStyle}`);
+  for (const { type } of result) {
+    assert.notSameValue(type, "timeZoneName",
+      `formatting a PlainDateTime with timeZoneName = ${timeZoneNameStyle} should not print a time zone`);
+  }
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/temporal-plainmonthday-formatting-timezonename.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/temporal-plainmonthday-formatting-timezonename.js
new file mode 100644
index 0000000000000..8960fec04d012
--- /dev/null
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/temporal-plainmonthday-formatting-timezonename.js
@@ -0,0 +1,31 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-datetime-format-functions
+description: >
+  PlainMonthDay can be formatted with a formatter created with the timeZoneName
+  option, but no time zone name is included.
+locale: [en-US-u-ca-gregory]
+features: [Temporal]
+---*/
+
+const locale = "en-US-u-ca-gregory";
+const timeZoneNameStyles = [
+  "long", "short", "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+];
+const md = new Temporal.PlainMonthDay(1, 5, "gregory", 1972);
+
+for (const timeZoneNameStyle of timeZoneNameStyles) {
+  const dtf = new Intl.DateTimeFormat(locale, { timeZoneName: timeZoneNameStyle });
+  const result = dtf.formatToParts(md);
+  assert(Array.isArray(result),
+    `can format a PlainMonthDay with timeZoneName = ${timeZoneNameStyle}`);
+  for (const { type } of result) {
+    assert.notSameValue(type, "timeZoneName",
+      `formatting a PlainMonthDay with timeZoneName = ${timeZoneNameStyle} should not print a time zone`);
+  }
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/temporal-plaintime-formatting-timezonename.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/temporal-plaintime-formatting-timezonename.js
new file mode 100644
index 0000000000000..6f8fbccb82561
--- /dev/null
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/temporal-plaintime-formatting-timezonename.js
@@ -0,0 +1,31 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-datetime-format-functions
+description: >
+  PlainTime can be formatted with a formatter created with the timeZoneName
+  option, but no time zone name is included.
+locale: [en-US]
+features: [Temporal]
+---*/
+
+const locale = "en-US";
+const timeZoneNameStyles = [
+  "long", "short", "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+];
+const time = new Temporal.PlainTime(12, 34);
+
+for (const timeZoneNameStyle of timeZoneNameStyles) {
+  const dtf = new Intl.DateTimeFormat(locale, { timeZoneName: timeZoneNameStyle });
+  const result = dtf.formatToParts(time);
+  assert(Array.isArray(result),
+    `can format a PlainTime with timeZoneName = ${timeZoneNameStyle}`);
+  for (const { type } of result) {
+    assert.notSameValue(type, "timeZoneName",
+      `formatting a PlainTime with timeZoneName = ${timeZoneNameStyle} should not print a time zone`);
+  }
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/temporal-plainyearmonth-formatting-timezonename.js b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/temporal-plainyearmonth-formatting-timezonename.js
new file mode 100644
index 0000000000000..8a7bd23753891
--- /dev/null
+++ b/js/src/tests/test262/intl402/DateTimeFormat/prototype/formatToParts/temporal-plainyearmonth-formatting-timezonename.js
@@ -0,0 +1,31 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-datetime-format-functions
+description: >
+  PlainYearMonth can be formatted with a formatter created with the timeZoneName
+  option, but no time zone name is included.
+locale: [en-US]
+features: [Temporal]
+---*/
+
+const locale = "en-US";
+const timeZoneNameStyles = [
+  "long", "short", "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+];
+const ym = new Temporal.PlainYearMonth(2026, 1, "gregory", 1);
+
+for (const timeZoneNameStyle of timeZoneNameStyles) {
+  const dtf = new Intl.DateTimeFormat(locale, { timeZoneName: timeZoneNameStyle });
+  const result = dtf.formatToParts(ym);
+  assert(Array.isArray(result),
+    `can format a PlainYearMonth with timeZoneName = ${timeZoneNameStyle}`);
+  for (const { type } of result) {
+    assert.notSameValue(type, "timeZoneName",
+      `formatting a PlainYearMonth with timeZoneName = ${timeZoneNameStyle} should not print a time zone`);
+  }
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Intl/supportedValuesOf/calendars-accepted-by-DisplayNames.js b/js/src/tests/test262/intl402/Intl/supportedValuesOf/calendars-accepted-by-DisplayNames.js
index b1c34fd51cb5e..a050489fc609c 100644
--- a/js/src/tests/test262/intl402/Intl/supportedValuesOf/calendars-accepted-by-DisplayNames.js
+++ b/js/src/tests/test262/intl402/Intl/supportedValuesOf/calendars-accepted-by-DisplayNames.js
@@ -35,10 +35,7 @@ for (let calendar of calendars) {
 }
 
 for (let calendar of allCalendars()) {
-  if (typeof obj.of(calendar) === "string") {
-    assert(calendars.includes(calendar),
-           `${calendar} supported but not returned by supportedValuesOf`);
-  } else {
+  if (typeof obj.of(calendar) !== "string") {
     assert(!calendars.includes(calendar),
            `${calendar} not supported but returned by supportedValuesOf`);
   }
diff --git a/js/src/tests/test262/intl402/Intl/supportedValuesOf/calendars-required-by-intl-era-monthcode.js b/js/src/tests/test262/intl402/Intl/supportedValuesOf/calendars-required-by-intl-era-monthcode.js
index 7d6e3ab8c03da..e0b1fa824053b 100644
--- a/js/src/tests/test262/intl402/Intl/supportedValuesOf/calendars-required-by-intl-era-monthcode.js
+++ b/js/src/tests/test262/intl402/Intl/supportedValuesOf/calendars-required-by-intl-era-monthcode.js
@@ -19,8 +19,12 @@ info: |
     9. Return CreateArrayFromList( list ).
 
   AvailableCalendars ( )
-    The implementation-defined abstract operation AvailableCalendars takes no arguments and returns a List of calendar types. The returned List is sorted according to lexicographic code unit order, and contains unique calendar types in canonical form (6.9) identifying the calendars for which the implementation provides the functionality of Intl.DateTimeFormat objects, including their aliases (e.g., both of "islamicc" and "islamic-civil"). The List must include the Calendar Type value of every row of Table 1, except the header row.
-locale: [en]
+    The implementation-defined abstract operation AvailableCalendars takes no arguments and returns
+    a List of calendar types. The returned List is sorted according to lexicographic code unit order,
+    and contains unique calendar types in canonical form (6.9) identifying the calendars for which
+    the implementation provides the functionality of Intl.DateTimeFormat objects, including their
+    aliases (e.g., both "islamicc" and "islamic-civil"). The List must consist
+    of the Calendar Type value of every row of Table 1, except the header row.
 features: [Intl-enumeration, Intl.Era-monthcode]
 ---*/
 
@@ -31,21 +35,32 @@ const requiredCalendars = [
   "dangi",
   "ethioaa",
   "ethiopic",
+  // "ethiopic-amete-alem", // Alias for "ethioaa".
   "gregory",
   "hebrew",
   "indian",
   "islamic-civil",
   "islamic-tbla",
   "islamic-umalqura",
+  // "islamicc", // Alias for "islamic-civil".
   "iso8601",
   "japanese",
   "persian",
   "roc"
-]
+];
+
+assert.compareArray(
+  requiredCalendars,
+  requiredCalendars.slice(0).sort(),
+  "requiredCalendars is sorted"
+);
 
 const supportedCalendars = Intl.supportedValuesOf("calendar");
-for (const calendar of requiredCalendars) {
-  assert(supportedCalendars.includes(calendar), "Required calendar: " + calendar + " must be supported");
-}
+
+assert.compareArray(
+  supportedCalendars,
+  requiredCalendars,
+  "only the required calendars are supported"
+);
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/PluralRules/prototype/select/notation.js b/js/src/tests/test262/intl402/PluralRules/prototype/select/notation.js
index 24405bf5088e2..259aa85284883 100644
--- a/js/src/tests/test262/intl402/PluralRules/prototype/select/notation.js
+++ b/js/src/tests/test262/intl402/PluralRules/prototype/select/notation.js
@@ -21,37 +21,27 @@ var values = [
   {
     value: 1e6,
     standard: "many",
-    engineering: "many",
-    scientific: "many",
     compact: "many",
   },
 
   {
     value: 1.5e6,
     standard: "other",
-    engineering: "many",
-    scientific: "many",
     compact: "many",
   },
 
   {
     value: 1e-6,
     standard: "one",
-    engineering: "many",
-    scientific: "many",
     compact: "one",
   },
 ];
 
 var prstandard = new Intl.PluralRules("fr", { notation: "standard" });
-var prengineering = new Intl.PluralRules("fr", { notation: "engineering" });
-var prscientific = new Intl.PluralRules("fr", { notation: "scientific" });
 var prcompact = new Intl.PluralRules("fr", { notation: "compact" });
 
-for (var {value, standard, engineering, scientific, compact} of values) {
+for (var {value, standard, compact} of values) {
   assert.sameValue(prstandard.select(value), standard, `standard notation: ${value}`);
-  assert.sameValue(prengineering.select(value), engineering, `engineering notation: ${value}`);
-  assert.sameValue(prscientific.select(value), scientific, `scientific notation: ${value}`);
   assert.sameValue(prcompact.select(value), compact, `compact notation: ${value}`);
 }
 
diff --git a/js/src/tests/test262/intl402/Temporal/Duration/prototype/round/shell.js b/js/src/tests/test262/intl402/Temporal/Duration/prototype/round/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/Duration/prototype/round/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/Duration/prototype/round/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/Duration/prototype/total/shell.js b/js/src/tests/test262/intl402/Temporal/Duration/prototype/total/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/Duration/prototype/total/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/Duration/prototype/total/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/Instant/prototype/toLocaleString/datestyle-and-timestyle.js b/js/src/tests/test262/intl402/Temporal/Instant/prototype/toLocaleString/datestyle-and-timestyle.js
new file mode 100644
index 0000000000000..f67533fb9afd7
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/Instant/prototype/toLocaleString/datestyle-and-timestyle.js
@@ -0,0 +1,15 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.instant.prototype.tolocalestring
+description: Using both dateStyle and timeStyle should not throw
+features: [Temporal]
+---*/
+
+const item = new Temporal.Instant(0n);
+var result = item.toLocaleString("en", { dateStyle: "full", timeStyle: "full" });
+assert.sameValue(result.includes(":00"), true, "using both dateStyle and timeStyle should not throw");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/Instant/prototype/toLocaleString/hourcycle.js b/js/src/tests/test262/intl402/Temporal/Instant/prototype/toLocaleString/hourcycle.js
new file mode 100644
index 0000000000000..0e240f1328088
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/Instant/prototype/toLocaleString/hourcycle.js
@@ -0,0 +1,35 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.instant.prototype.tolocalestring
+description: Hour cycle should be correctly set when defaults are used
+features: [Temporal]
+---*/
+
+const output0 = "00:00:00";
+const output11 = "0:00:00";
+const output12 = "12:00:00";
+const output24 = "24:00:00";
+
+const item = new Temporal.Instant(0n);
+var result = item.toLocaleString("en", { hour12: false, timeZone: "UTC" });
+assert.sameValue(result.includes(output0), true, `output for hour12: false should include ${output0}`);
+
+result = item.toLocaleString("en", { hour12: true, timeZone: "UTC" });
+assert.sameValue(result.includes(output12), true, `output for hour12: true should include ${output12}`);
+
+result = item.toLocaleString("en", { hourCycle: "h23", timeZone: "UTC" });
+assert.sameValue(result.includes(output0), true, `output for hourCycle: h23 should include ${output0}`);
+
+result = item.toLocaleString("en", { hourCycle: "h24", timeZone: "UTC" });
+assert.sameValue(result.includes(output24), true, `output for hourCycle: h24 should include ${output24}`);
+
+result = item.toLocaleString("en", { hourCycle: "h11", timeZone: "UTC" });
+assert.sameValue(result.includes(output11), true, `output for hourCycle: h11 should include ${output11}`);
+
+result = item.toLocaleString("en", { hourCycle: "h12", timeZone: "UTC" });
+assert.sameValue(result.includes(output12), true, `output for hourCycle: h12 should include ${output12}`);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/canonicalize-calendar.js b/js/src/tests/test262/intl402/Temporal/PlainDate/canonicalize-calendar.js
index 3760c3449db0e..e074eccfb89d3 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/canonicalize-calendar.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/canonicalize-calendar.js
@@ -1,5 +1,5 @@
 // |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2024 Igalia, S.L. All rights reserved.
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
@@ -8,7 +8,12 @@ description: Calendar ID is canonicalized
 features: [Temporal]
 ---*/
 
-const result = new Temporal.PlainDate(2024, 7, 2, "islamicc");
+var result = new Temporal.PlainDate(2024, 7, 2, "islamicc");
 assert.sameValue(result.calendarId, "islamic-civil", "calendar ID is canonicalized");
 
+// May need to be removed in the future.
+// See https://github.com/tc39/ecma402/issues/285
+result = new Temporal.PlainDate(2024, 7, 2, "ethiopic-amete-alem");
+assert.sameValue(result.calendarId, "ethioaa", "calendar ID is canonicalized");
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/compare/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDate/compare/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/compare/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/compare/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/from/calendar-invalid-era-with-era-year.js b/js/src/tests/test262/intl402/Temporal/PlainDate/from/calendar-invalid-era-with-era-year.js
new file mode 100644
index 0000000000000..93a1e8bc9a9d4
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/from/calendar-invalid-era-with-era-year.js
@@ -0,0 +1,34 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.from
+description: RangeError thrown if era is invalid for this calendar with year absent and eraYear present
+features: [Temporal]
+---*/
+
+const calendarsWithEras = [
+  "buddhist",
+  "coptic",
+  "ethioaa",
+  "ethiopic",
+  "gregory",
+  "hebrew",
+  "indian",
+  "islamic-civil",
+  "islamic-tbla",
+  "islamic-umalqura",
+  "japanese",
+  "persian",
+  "roc",
+];
+
+calendarsWithEras.forEach((calendar) => {
+  // "xyz" is not a valid era in any supported calendar
+  assert.throws(RangeError,
+    () => Temporal.PlainDate.from({ month: 1, day: 1, era: "xyz", eraYear: 2025, calendar }),
+    `xyz is not a valid era in calendar ${calendar}`);
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/from/calendar-invalid-era.js b/js/src/tests/test262/intl402/Temporal/PlainDate/from/calendar-invalid-era.js
new file mode 100644
index 0000000000000..4c7414c94d9c1
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/from/calendar-invalid-era.js
@@ -0,0 +1,45 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.from
+description: RangeError thrown if era is invalid for this calendar
+features: [Temporal]
+---*/
+
+const calendarsWithEras = [
+  "buddhist",
+  "coptic",
+  "ethioaa",
+  "ethiopic",
+  "gregory",
+  "hebrew",
+  "indian",
+  "islamic-civil",
+  "islamic-tbla",
+  "islamic-umalqura",
+  "japanese",
+  "persian",
+  "roc",
+];
+
+const calendarsWithoutEras = [
+  "chinese",
+  "dangi",
+];
+
+calendarsWithEras.forEach((calendar) => {
+  // "xyz" is not a valid era in any supported calendar
+  assert.throws(RangeError,
+    () => Temporal.PlainDate.from({ year: 2025, month: 1, day: 1, era: "xyz", eraYear: 2025, calendar }),
+    `xyz is not a valid era in calendar ${calendar}`);
+});
+
+calendarsWithoutEras.forEach((calendar) => {
+  // era is ignored
+  const result = Temporal.PlainDate.from({ year: 2025, month: 1, day: 1, era: "xyz", eraYear: 2025, calendar });
+  assert.sameValue(result instanceof Temporal.PlainDate, true, `era should be ignored for calendar ${calendar}`);
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/from/era-boundary-japanese.js b/js/src/tests/test262/intl402/Temporal/PlainDate/from/era-boundary-japanese.js
index ce1d614259e35..dffc858aa6d2d 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/from/era-boundary-japanese.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/from/era-boundary-japanese.js
@@ -116,6 +116,24 @@ TemporalHelpers.assertPlainDate(
   1868, 10, "M10", 22, "Meiji 1 resolves to CE 1868 before era start date",
   "ce", 1868);
 
+const meiji1AfterStart = Temporal.PlainDate.from({ era: "meiji", eraYear: 1, monthCode: "M10", day: 23, calendar }, options);
+TemporalHelpers.assertPlainDate(
+  meiji1AfterStart,
+  1868, 10, "M10", 23, "Meiji 1 still resolves to CE 1868 after era start date",
+  "ce", 1868);
+
+const meiji5 = Temporal.PlainDate.from({ era: "meiji", eraYear: 5, monthCode: "M12", day: 31, calendar }, options);
+TemporalHelpers.assertPlainDate(
+  meiji5,
+  1872, 12, "M12", 31, "Meiji 5 resolves to CE 1872",
+  "ce", 1872);
+
+const ce1873 = Temporal.PlainDate.from({ era: "ce", eraYear: 1873, monthCode: "M01", day: 1, calendar }, options);
+TemporalHelpers.assertPlainDate(
+  ce1873,
+  1873, 1, "M01", 1, "CE 1873 resolves to Meiji 6",
+  "meiji", 6);
+
 const meiji0 = Temporal.PlainDate.from({ era: "meiji", eraYear: 0, monthCode: "M10", day: 23, calendar }, options);
 TemporalHelpers.assertPlainDate(
   meiji0,
@@ -128,12 +146,6 @@ TemporalHelpers.assertPlainDate(
   1866, 10, "M10", 23, "Meiji -1 resolves to CE 1866",
   "ce", 1866);
 
-const ce1868AfterStart = Temporal.PlainDate.from({ era: "ce", eraYear: 1868, monthCode: "M10", day: 23, calendar }, options);
-TemporalHelpers.assertPlainDate(
-  ce1868AfterStart,
-  1868, 10, "M10", 23, "CE 1868 resolves to Meiji 1 after era start date",
-  "meiji", 1);
-
 const ce0 = Temporal.PlainDate.from({ era: "ce", eraYear: 0, monthCode: "M01", day: 1, calendar }, options);
 TemporalHelpers.assertPlainDate(
   ce0,
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/from/era-japanese.js b/js/src/tests/test262/intl402/Temporal/PlainDate/from/era-japanese.js
index dce348f9bd908..679a6f8e3a332 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/from/era-japanese.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/from/era-japanese.js
@@ -16,7 +16,7 @@ const reiwa = Temporal.PlainDate.from({ era: "reiwa", eraYear: 2, month: 1, day:
 const heisei = Temporal.PlainDate.from({ era: "heisei", eraYear: 2, month: 1, day: 1,  calendar });
 const showa = Temporal.PlainDate.from({ era: "showa", eraYear: 2, month: 1, day: 1,  calendar });
 const taisho = Temporal.PlainDate.from({ era: "taisho", eraYear: 2, month: 1, day: 1,  calendar });
-const meiji = Temporal.PlainDate.from({ era: "meiji", eraYear: 2, month: 1, day: 1,  calendar });
+const meiji = Temporal.PlainDate.from({ era: "meiji", eraYear: 6, month: 1, day: 1,  calendar });
 const ce = Temporal.PlainDate.from({ era: "ce", eraYear: 1000, month: 1, day: 1,  calendar });
 const bce = Temporal.PlainDate.from({ era: "bce", eraYear: 1, month: 1, day: 1,  calendar });
 
@@ -28,7 +28,7 @@ TemporalHelpers.assertPlainDate(showa, 1927, 1, "M01", 1,  `${showa}`, "showa",
 
 TemporalHelpers.assertPlainDate(taisho, 1913, 1, "M01", 1,  `${taisho}`, "taisho", 2);
 
-TemporalHelpers.assertPlainDate(meiji, 1869, 1, "M01", 1,  `${meiji}`, "meiji", 2);
+TemporalHelpers.assertPlainDate(meiji, 1873, 1, "M01", 1,  `${meiji}`, "meiji", 6);
 
 TemporalHelpers.assertPlainDate(ce, 1000, 1, "M01", 1,  `${ce} (CE)`, "ce", 1000);
 
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/from/invalid-month-codes-hebrew.js b/js/src/tests/test262/intl402/Temporal/PlainDate/from/invalid-month-codes-hebrew.js
index 057875a2f2251..3cb8670658991 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/from/invalid-month-codes-hebrew.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/from/invalid-month-codes-hebrew.js
@@ -10,10 +10,16 @@ features: [Temporal, Intl.Era-monthcode]
 
 const calendar = "hebrew";
 
+// 5779 is a leap year
 assert.throws(RangeError, () => {
   Temporal.PlainDate.from({ year: 5779, monthCode: "M13", day: 1, calendar });
 }, "M13 should not be a valid month code");
 
+// 5781 is a common year
+assert.throws(RangeError, () => {
+  Temporal.PlainDate.from({ year: 5781, monthCode: "M13", day: 1, calendar });
+}, "M13 should not be a valid month code");
+
 // Invalid leap months: e.g. M02L
 for (var i = 1; i <= 12; i++) {
   if (i === 5)
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/from/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDate/from/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/from/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/from/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/add/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/add/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/add/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/add/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/equals/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/equals/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/equals/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/equals/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/monthCode/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/monthCode/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/monthCode/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/monthCode/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/since/era-boundary-japanese.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/since/era-boundary-japanese.js
index 87c13aeef56b7..2298bae9027e8 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/since/era-boundary-japanese.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/since/era-boundary-japanese.js
@@ -14,9 +14,9 @@ const options = { overflow: "reject" };
 
 const bce1 = Temporal.PlainDate.from({ era: "bce", eraYear: 1, monthCode: "M06", day: 1, calendar }, options);
 const ce1 = Temporal.PlainDate.from({ era: "ce", eraYear: 1, monthCode: "M06", day: 1, calendar }, options);
-const ce1868 = Temporal.PlainDate.from({ era: "ce", eraYear: 1868, monthCode: "M10", day: 22, calendar }, options);
-const meiji1 = Temporal.PlainDate.from({ era: "meiji", eraYear: 1, monthCode: "M10", day: 23, calendar}, options);
-const meiji5 = Temporal.PlainDate.from({ era: "meiji", eraYear: 5, monthCode: "M01", day: 15, calendar }, options);
+const ce1872 = Temporal.PlainDate.from({ era: "ce", eraYear: 1872, monthCode: "M12", day: 31, calendar }, options);
+const meiji6 = Temporal.PlainDate.from({ era: "meiji", eraYear: 6, monthCode: "M01", day: 1, calendar}, options);
+const meiji7 = Temporal.PlainDate.from({ era: "meiji", eraYear: 7, monthCode: "M01", day: 15, calendar }, options);
 const meiji45 = Temporal.PlainDate.from({ era: "meiji", eraYear: 45, monthCode: "M05", day: 19, calendar }, options);
 const taisho1 = Temporal.PlainDate.from({ era: "taisho", eraYear: 1, monthCode: "M08", day: 9, calendar }, options);
 const taisho6 = Temporal.PlainDate.from({ era: "taisho", eraYear: 6, monthCode: "M03", day: 15, calendar }, options);
@@ -97,18 +97,16 @@ const tests = [
     [0, 7, 0, 10, "7mo 10d from Taisho 15 July 20 to Showa 1 December 30"],
     [0, 7, 0, 10, "7mo 10d from Taisho 15 July 20 to Showa 1 December 30"],
   ],
-  // From Meiji 5 (1872) to Taisho 6 (1917) - crossing era boundary
-  // Note that contemporarily January 15 1872 would have been Meiji 4 in the
-  // pre-1873 lunisolar calendar, but the spec-mandated behaviour is proleptic
+  // From Meiji 7 (1874) to Taisho 6 (1917) - crossing era boundary
   [
-    meiji5, taisho6,
-    [-45, -2, 0, 0, "-45y -2mo backwards from Meiji 5 January to Taisho 6 March"],
-    [0, -542, 0, 0, "-542mo backwards from Meiji 5 January to Taisho 6 March"],
+    meiji7, taisho6,
+    [-43, -2, 0, 0, "-43y -2mo backwards from Meiji 7 January to Taisho 6 March"],
+    [0, -518, 0, 0, "-518mo backwards from Meiji 7 January to Taisho 6 March"],
   ],
   [
-    taisho6, meiji5,
-    [45, 2, 0, 0, "45y 2mo from Meiji 5 January to Taisho 6 March"],
-    [0, 542, 0, 0, "542mo from Meiji 5 January to Taisho 6 March"],
+    taisho6, meiji7,
+    [43, 2, 0, 0, "43y 2mo from Meiji 7 January to Taisho 6 March"],
+    [0, 518, 0, 0, "518mo from Meiji 7 January to Taisho 6 March"],
   ],
   // Within same year but different eras
   [
@@ -121,16 +119,16 @@ const tests = [
     [0, 2, 0, 21, "2mo 21d from Meiji 45 May 19 to Taisho 1 August 9"],
     [0, 2, 0, 21, "2mo 21d from Meiji 45 May 19 to Taisho 1 August 9"],
   ],
-  // Last pre-Meiji day to first day of Meiji era
+  // Last pre-solar-calendar CE day to first solar-calendar day of Meiji era
   [
-    ce1868, meiji1,
-    [0, 0, 0, -1, "backwards from day before Meiji era to first day"],
-    [0, 0, 0, -1, "backwards from day before Meiji era to first day"],
+    ce1872, meiji6,
+    [0, 0, 0, -1, "backwards from day before solar Meiji era to first day"],
+    [0, 0, 0, -1, "backwards from day before solar Meiji era to first day"],
   ],
   [
-    meiji1, ce1868,
-    [0, 0, 0, 1, "from day before Meiji era to first day"],
-    [0, 0, 0, 1, "from day before Meiji era to first day"],
+    meiji6, ce1872,
+    [0, 0, 0, 1, "from day before solar Meiji era to first day"],
+    [0, 0, 0, 1, "from day before solar Meiji era to first day"],
   ],
   // CE-BCE boundary
   [
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/since/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/since/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/since/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/since/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/since/wrapping-at-end-of-month-chinese.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/since/wrapping-at-end-of-month-chinese.js
index 8dae7c7f48af8..2aa70733753a7 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/since/wrapping-at-end-of-month-chinese.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/since/wrapping-at-end-of-month-chinese.js
@@ -10,18 +10,19 @@ features: [Temporal, Intl.Era-monthcode]
 ---*/
 
 const calendar = "chinese";
+const options = { overflow: "reject" };
 
 // Difference between end of 30-day month to end of following 29-day month
 {
-  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M06", day: 29, calendar });
+  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M06", day: 29, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 29, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 29, calendar }, options).since(end, { largestUnit }),
       0, -1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M05-29 (30d) to M06-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 30, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 30, calendar }, options).since(end, { largestUnit }),
       0, 0, 0, -29, 0, 0, 0, 0, 0, 0,
       `M05-30 to M06-29 is 29 days, not one month (${largestUnit})`
     );
@@ -30,15 +31,15 @@ const calendar = "chinese";
 
 // Difference between end of 30-day M04 to end of 29-day M04L
 {
-  const end = Temporal.PlainDate.from({ year: 2020, monthCode: "M04L", day: 29, calendar });
+  const end = Temporal.PlainDate.from({ year: 2020, monthCode: "M04L", day: 29, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2020, monthCode: "M04", day: 29, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2020, monthCode: "M04", day: 29, calendar }, options).since(end, { largestUnit }),
       0, -1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M04-29 (30d) to M04L-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2020, monthCode: "M04", day: 30, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2020, monthCode: "M04", day: 30, calendar }, options).since(end, { largestUnit }),
       0, 0, 0, -29, 0, 0, 0, 0, 0, 0,
       `M04-30 to M04L-29 (29d) is 29 days, not one month (${largestUnit})`
     );
@@ -48,15 +49,15 @@ const calendar = "chinese";
 // Difference between end of 30-day month to end of not-immediately-following
 // 29-day month
 {
-  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M09", day: 29, calendar });
+  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M09", day: 29, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2023, monthCode: "M04", day: 29, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2023, monthCode: "M04", day: 29, calendar }, options).since(end, { largestUnit }),
       0, -5, 0, 0, 0, 0, 0, 0, 0, 0,
       `M04-29 (30d) to M09-29 (29d) is 5 months (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2023, monthCode: "M04", day: 30, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2023, monthCode: "M04", day: 30, calendar }, options).since(end, { largestUnit }),
       0, -4, 0, -29, 0, 0, 0, 0, 0, 0,
       `M04-30 to M09-29 (29d) is 4 months 29 days, not 5 months (${largestUnit})`
     );
@@ -66,27 +67,112 @@ const calendar = "chinese";
 // Difference between end of 30-day month in one year to 29-day month in later
 // year
 {
-  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M09", day: 29, calendar });
+  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M09", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 30, calendar }, options);
   TemporalHelpers.assertDuration(
-    Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 29, calendar }).since(end, { largestUnit: "months" }),
+    start1.since(end, { largestUnit: "months" }),
     0, -29, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 29 days"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 29, calendar }).since(end, { largestUnit: "years" }),
+    start1.since(end, { largestUnit: "years" }),
     -2, -4, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 2 years, 4 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 30, calendar }).since(end, { largestUnit: "months" }),
+    start2.since(end, { largestUnit: "months" }),
     0, -28, 0, -29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 28 months, 29 days, not 29 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 30, calendar }).since(end, { largestUnit: "years" }),
+    start2.since(end, { largestUnit: "years" }),
     -2, -3, 0, -29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 2 years, 3 months, 29 days, not 2 years 4 months"
   );
 }
 
+// Difference between end of 30-day common month and end of the same month with
+// 29 days in a later year
+{
+  const end = Temporal.PlainDate.from({ year: 2019, monthCode: "M02", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 2018, monthCode: "M02", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 2018, monthCode: "M02", day: 30, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 1 year"
+  );
+}
+
+// Difference between end of 30-day leap month and end of the same leap month
+// with 29 days in a later year
+{
+  const end = Temporal.PlainDate.from({ year: 2025, monthCode: "M06L", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 2017, monthCode: "M06L", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 2017, monthCode: "M06L", day: 30, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -99, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2025-M06L-29 is 99 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2025-M06L-29 is 8 years"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -98, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2025-M06L-29 is 98 months 29 days, not 98 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    -7, -12, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2025-M06L-29 is 7 years 12 months 29 days, not 8 years"
+  );
+}
+
+// Case where both the month and day are not constrained
+{
+  const end = Temporal.PlainDate.from({ year: 2018, monthCode: "M06", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 2017, monthCode: "M06L", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 2017, monthCode: "M06L", day: 30, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2018-M06-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2018-M06-29 is 12 months, not 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2018-M06-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2018-M06-29 is 11 months 29 days, not 1 year"
+  );
+}
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/since/wrapping-at-end-of-month-dangi.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/since/wrapping-at-end-of-month-dangi.js
index 9f09a0164d016..a29e1ff8a7a6f 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/since/wrapping-at-end-of-month-dangi.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/since/wrapping-at-end-of-month-dangi.js
@@ -10,18 +10,19 @@ features: [Temporal, Intl.Era-monthcode]
 ---*/
 
 const calendar = "dangi";
+const options = { overflow: "reject" };
 
 // Difference between end of 30-day month to end of following 29-day month
 {
-  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M06", day: 29, calendar });
+  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M06", day: 29, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 29, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 29, calendar }, options).since(end, { largestUnit }),
       0, -1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M05-29 (30d) to M06-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 30, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 30, calendar }, options).since(end, { largestUnit }),
       0, 0, 0, -29, 0, 0, 0, 0, 0, 0,
       `M05-30 to M06-29 is 29 days, not one month (${largestUnit})`
     );
@@ -30,15 +31,15 @@ const calendar = "dangi";
 
 // Difference between end of 30-day M04 to end of 29-day M04L
 {
-  const end = Temporal.PlainDate.from({ year: 2020, monthCode: "M04L", day: 29, calendar });
+  const end = Temporal.PlainDate.from({ year: 2020, monthCode: "M04L", day: 29, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2020, monthCode: "M04", day: 29, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2020, monthCode: "M04", day: 29, calendar }, options).since(end, { largestUnit }),
       0, -1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M04-29 (30d) to M04L-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2020, monthCode: "M04", day: 30, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2020, monthCode: "M04", day: 30, calendar }, options).since(end, { largestUnit }),
       0, 0, 0, -29, 0, 0, 0, 0, 0, 0,
       `M04-30 to M04L-29 (29d) is 29 days, not one month (${largestUnit})`
     );
@@ -48,15 +49,15 @@ const calendar = "dangi";
 // Difference between end of 30-day month to end of not-immediately-following
 // 29-day month
 {
-  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M09", day: 29, calendar });
+  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M09", day: 29, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 29, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 29, calendar }, options).since(end, { largestUnit }),
       0, -4, 0, 0, 0, 0, 0, 0, 0, 0,
       `M05-29 (30d) to M09-29 (29d) is 4 months (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 30, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 30, calendar }, options).since(end, { largestUnit }),
       0, -3, 0, -29, 0, 0, 0, 0, 0, 0,
       `M05-30 to M09-29 (29d) is 3 months 29 days, not 4 months (${largestUnit})`
     );
@@ -66,27 +67,112 @@ const calendar = "dangi";
 // Difference between end of 30-day month in one year to 29-day month in later
 // year
 {
-  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M09", day: 29, calendar });
+  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M09", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 30, calendar }, options);
   TemporalHelpers.assertDuration(
-    Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 29, calendar }).since(end, { largestUnit: "months" }),
+    start1.since(end, { largestUnit: "months" }),
     0, -29, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 29 days"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 29, calendar }).since(end, { largestUnit: "years" }),
+    start1.since(end, { largestUnit: "years" }),
     -2, -4, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 2 years, 4 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 30, calendar }).since(end, { largestUnit: "months" }),
+    start2.since(end, { largestUnit: "months" }),
     0, -28, 0, -29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 28 months, 29 days, not 29 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 30, calendar }).since(end, { largestUnit: "years" }),
+    start2.since(end, { largestUnit: "years" }),
     -2, -3, 0, -29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 2 years, 3 months, 29 days, not 2 years 4 months"
   );
 }
 
+// Difference between end of 30-day common month and end of the same month with
+// 29 days in a later year
+{
+  const end = Temporal.PlainDate.from({ year: 2019, monthCode: "M02", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 2018, monthCode: "M02", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 2018, monthCode: "M02", day: 30, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 1 year"
+  );
+}
+
+// Difference between end of 30-day leap month and end of the same leap month
+// with 29 days in a later year
+{
+  const end = Temporal.PlainDate.from({ year: 1987, monthCode: "M06L", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 1979, monthCode: "M06L", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 1979, monthCode: "M06L", day: 30, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -99, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-29 to 1987-M06L-29 is 99 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-29 to 1987-M06L-29 is 8 years"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -98, 0, -29, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-30 to 1987-M06L-29 is 98 months 29 days, not 98 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    -7, -12, 0, -29, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-30 to 1987-M06L-29 is 7 years 12 months 29 days, not 8 years"
+  );
+}
+
+// Case where both the month and day are not constrained
+{
+  const end = Temporal.PlainDate.from({ year: 1956, monthCode: "M03", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 1955, monthCode: "M03L", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 1955, monthCode: "M03L", day: 30, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-29 to 1956-M03-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-29 to 1956-M03-29 is 12 months, not 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-30 to 1956-M03-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-30 to 1956-M03-29 is 11 months 29 days, not 1 year"
+  );
+}
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/since/wrapping-at-end-of-month-hebrew.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/since/wrapping-at-end-of-month-hebrew.js
new file mode 100644
index 0000000000000..f24670e80572d
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/since/wrapping-at-end-of-month-hebrew.js
@@ -0,0 +1,177 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.prototype.since
+description: Tests balancing of days to months at end of month (Hebrew calendar)
+includes: [temporalHelpers.js]
+features: [Temporal, Intl.Era-monthcode]
+---*/
+
+const calendar = "hebrew";
+const options = { overflow: "reject" };
+
+// 5784 is a leap year.
+
+// 30-day months: 01, 05, 05L, 07, 09, 11
+// 29-day months: 04, 06, 08, 10, 12
+//
+// Cheshvan and Kislev (02, 03) have 29 or 30 days, independent of leap years.
+// Deficient - Cheshvan and Kislev have 29 days
+// Regular - Cheshvan has 29 days, Kislev 30
+// Complete - Cheshvan and Kislev have 30 days
+//
+// Some recent years of each type: 
+// 5778 - regular common year
+// 5779 - complete leap year
+// 5781 - deficient common year
+// 5782 - regular leap year
+// 5783 - complete common year
+// 5784 - deficient leap year
+
+// Difference between end of longer month to end of following shorter month
+{
+  const end = Temporal.PlainDate.from({ year: 5783, monthCode: "M08", day: 29, calendar }, options);
+  for (const largestUnit of ["years", "months"]) {
+    TemporalHelpers.assertDuration(
+      Temporal.PlainDate.from({ year: 5783, monthCode: "M07", day: 29, calendar }, options).since(end, { largestUnit }),
+      0, -1, 0, 0, 0, 0, 0, 0, 0, 0,
+      `Nisan 29th to Iyar 29th is one month (${largestUnit})`
+    );
+    TemporalHelpers.assertDuration(
+      Temporal.PlainDate.from({ year: 5783, monthCode: "M07", day: 30, calendar }, options).since(end, { largestUnit }),
+      0, 0, 0, -29, 0, 0, 0, 0, 0, 0,
+      `Nisan 30th to Iyar 29th is 29 days, not one month (${largestUnit})`
+    );
+  }
+}
+
+// Difference between end of longer month to end of not-immediately-following
+// shorter month
+{
+  const end = Temporal.PlainDate.from({ year: 5783, monthCode: "M12", day: 29, calendar }, options);
+  for (const largestUnit of ["years", "months"]) {
+    TemporalHelpers.assertDuration(
+      Temporal.PlainDate.from({ year: 5783, monthCode: "M09", day: 29, calendar }, options).since(end, { largestUnit }),
+      0, -3, 0, 0, 0, 0, 0, 0, 0, 0,
+      `Sivan 29th to Elul 29th is 3 months (${largestUnit})`
+    );
+    TemporalHelpers.assertDuration(
+      Temporal.PlainDate.from({ year: 5783, monthCode: "M09", day: 30, calendar }, options).since(end, { largestUnit }),
+      0, -2, 0, -29, 0, 0, 0, 0, 0, 0,
+      `Sivan 30th to Elul 29th is 2 months 29 days, not 3 months (${largestUnit})`
+    );
+  }
+}
+
+// Difference between end of longer month in one year to shorter month in
+// later year
+{
+  const end = Temporal.PlainDate.from({ year: 5786, monthCode: "M04", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 5783, monthCode: "M11", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 5783, monthCode: "M11", day: 30, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -30, 0, 0, 0, 0, 0, 0, 0, 0,
+    "Av 29th 5783 to Tevet 29th 5786 is 30 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -2, -5, 0, 0, 0, 0, 0, 0, 0, 0,
+    "Av 29th 5783 to Tevet 29th 5786 is 2 years, 5 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -29, 0, -29, 0, 0, 0, 0, 0, 0,
+    "Av 30th 5783 to Tevet 29th 5786 is 29 months, 29 days, not 30 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    -2, -4, 0, -29, 0, 0, 0, 0, 0, 0,
+    "Av 30th 5783 to Tevet 29th 5786 is 2 years, 4 months, 29 days, not 2 years 5 months"
+  );
+}
+
+// Difference between 30 Kislev and day 29 of 29-day Kislev in a later year
+{
+  const end = Temporal.PlainDate.from({ year: 5784, monthCode: "M02", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 5783, monthCode: "M02", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 5783, monthCode: "M02", day: 30, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Kislev 5783 to 29th Kislev 5784 (deficient year) is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Kislev 5783 to 29th Kislev 5784 (deficient year) is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "30th Kislev 5783 to 29th Kislev 5784 (deficient year) is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "30th Kislev 5783 to 29th Kislev 5784 (deficient year) is 11 months 29 days, not 1 year"
+  );
+}
+
+// Difference between 30 Cheshvan and day 29 of 29-day Cheshvan in a later year
+{
+  const end = Temporal.PlainDate.from({ year: 5784, monthCode: "M03", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 5783, monthCode: "M03", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 5783, monthCode: "M03", day: 30, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "30th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "30th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 11 months 29 days, not 1 year"
+  );
+}
+
+// Case where both the month and day are not constrained
+{
+  const end = Temporal.PlainDate.from({ year: 5785, monthCode: "M06", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 5784, monthCode: "M05L", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 5784, monthCode: "M05L", day: 30, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -13, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Adar I 5784 to 29th Adar 5785 is 13 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Adar I 5784 to 29th Adar 5785 is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -12, 0, -29, 0, 0, 0, 0, 0, 0,
+    "30th Adar I 5784 to 29th Adar 5785 is 12 months 29 days, not 13 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -12, 0, -29, 0, 0, 0, 0, 0, 0,
+    "30th Adar I 5784 to 29th Adar 5785 is 12 months 29 days, not 1 year"
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/subtract/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/subtract/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/subtract/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/subtract/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/toLocaleString/datestyle-and-timestyle.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/toLocaleString/datestyle-and-timestyle.js
new file mode 100644
index 0000000000000..44183d6bd5fb0
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/toLocaleString/datestyle-and-timestyle.js
@@ -0,0 +1,17 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.prototype.tolocalestring
+description: Using timeStyle, even if dateStyle is present, should throw
+features: [Temporal]
+---*/
+
+const item = new Temporal.PlainDate(2026, 1, 20);
+
+assert.throws(TypeError, function() {
+  item.toLocaleString("en", { dateStyle: "full", timeStyle: "full" });
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/toString/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/toString/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/toString/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/toString/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/toZonedDateTime/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/toZonedDateTime/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/toZonedDateTime/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/toZonedDateTime/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/until/era-boundary-japanese.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/until/era-boundary-japanese.js
index 962ee2767c44d..25d810279c40d 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/until/era-boundary-japanese.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/until/era-boundary-japanese.js
@@ -14,9 +14,9 @@ const options = { overflow: "reject" };
 
 const bce1 = Temporal.PlainDate.from({ era: "bce", eraYear: 1, monthCode: "M06", day: 1, calendar }, options);
 const ce1 = Temporal.PlainDate.from({ era: "ce", eraYear: 1, monthCode: "M06", day: 1, calendar }, options);
-const ce1868 = Temporal.PlainDate.from({ era: "ce", eraYear: 1868, monthCode: "M10", day: 22, calendar }, options);
-const meiji1 = Temporal.PlainDate.from({ era: "meiji", eraYear: 1, monthCode: "M10", day: 23, calendar}, options);
-const meiji5 = Temporal.PlainDate.from({ era: "meiji", eraYear: 5, monthCode: "M01", day: 15, calendar }, options);
+const ce1872 = Temporal.PlainDate.from({ era: "ce", eraYear: 1872, monthCode: "M12", day: 31, calendar }, options);
+const meiji6 = Temporal.PlainDate.from({ era: "meiji", eraYear: 6, monthCode: "M01", day: 1, calendar}, options);
+const meiji7 = Temporal.PlainDate.from({ era: "meiji", eraYear: 7, monthCode: "M01", day: 15, calendar }, options);
 const meiji45 = Temporal.PlainDate.from({ era: "meiji", eraYear: 45, monthCode: "M05", day: 19, calendar }, options);
 const taisho1 = Temporal.PlainDate.from({ era: "taisho", eraYear: 1, monthCode: "M08", day: 9, calendar }, options);
 const taisho6 = Temporal.PlainDate.from({ era: "taisho", eraYear: 6, monthCode: "M03", day: 15, calendar }, options);
@@ -97,18 +97,16 @@ const tests = [
     [0, -7, 0, -10, "-7mo -10d backwards from Taisho 15 July 20 to Showa 1 December 30"],
     [0, -7, 0, -10, "-7mo -10d backwards from Taisho 15 July 20 to Showa 1 December 30"],
   ],
-  // From Meiji 5 (1872) to Taisho 6 (1917) - crossing era boundary
-  // Note that contemporarily January 15 1872 would have been Meiji 4 in the
-  // pre-1873 lunisolar calendar, but the spec-mandated behaviour is proleptic
+  // From Meiji 7 (1874) to Taisho 6 (1917) - crossing era boundary
   [
-    meiji5, taisho6,
-    [45, 2, 0, 0, "45y 2mo from Meiji 5 January to Taisho 6 March"],
-    [0, 542, 0, 0, "542mo from Meiji 5 January to Taisho 6 March"],
+    meiji7, taisho6,
+    [43, 2, 0, 0, "43y 2mo from Meiji 7 January to Taisho 6 March"],
+    [0, 518, 0, 0, "518mo from Meiji 7 January to Taisho 6 March"],
   ],
   [
-    taisho6, meiji5,
-    [-45, -2, 0, 0, "-45y -2mo backwards from Meiji 5 January to Taisho 6 March"],
-    [0, -542, 0, 0, "-542mo backwards from Meiji 5 January to Taisho 6 March"],
+    taisho6, meiji7,
+    [-43, -2, 0, 0, "-43y -2mo backwards from Meiji 7 January to Taisho 6 March"],
+    [0, -518, 0, 0, "-518mo backwards from Meiji 7 January to Taisho 6 March"],
   ],
   // Within same year but different eras
   [
@@ -121,16 +119,16 @@ const tests = [
     [0, -2, 0, -21, "-2mo -21d backwards from Meiji 45 May 19 to Taisho 1 August 9"],
     [0, -2, 0, -21, "-2mo -21d backwards from Meiji 45 May 19 to Taisho 1 August 9"],
   ],
-  // Last pre-Meiji day to first day of Meiji era
+  // Last pre-solar-calendar CE day to first solar-calendar day of Meiji era
   [
-    ce1868, meiji1,
-    [0, 0, 0, 1, "from day before Meiji era to first day"],
-    [0, 0, 0, 1, "from day before Meiji era to first day"],
+    ce1872, meiji6,
+    [0, 0, 0, 1, "from day before solar Meiji era to first day"],
+    [0, 0, 0, 1, "from day before solar Meiji era to first day"],
   ],
   [
-    meiji1, ce1868,
-    [0, 0, 0, -1, "backwards from day before Meiji era to first day"],
-    [0, 0, 0, -1, "backwards from day before Meiji era to first day"],
+    meiji6, ce1872,
+    [0, 0, 0, -1, "backwards from day before solar Meiji era to first day"],
+    [0, 0, 0, -1, "backwards from day before solar Meiji era to first day"],
   ],
   // CE-BCE boundary
   [
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/until/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/until/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/until/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/until/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/until/wrapping-at-end-of-month-chinese.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/until/wrapping-at-end-of-month-chinese.js
index 8df9029be3bd2..d9209164ca8b7 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/until/wrapping-at-end-of-month-chinese.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/until/wrapping-at-end-of-month-chinese.js
@@ -10,18 +10,19 @@ features: [Temporal, Intl.Era-monthcode]
 ---*/
 
 const calendar = "chinese";
+const options = { overflow: "reject" };
 
 // Difference between end of 30-day month to end of following 29-day month
 {
-  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M06", day: 29, calendar });
+  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M06", day: 29, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 29, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 29, calendar }, options).until(end, { largestUnit }),
       0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M05-29 (30d) to M06-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 30, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 30, calendar }, options).until(end, { largestUnit }),
       0, 0, 0, 29, 0, 0, 0, 0, 0, 0,
       `M05-30 to M06-29 is 29 days, not one month (${largestUnit})`
     );
@@ -30,15 +31,15 @@ const calendar = "chinese";
 
 // Difference between end of 30-day M04 to end of 29-day M04L
 {
-  const end = Temporal.PlainDate.from({ year: 2020, monthCode: "M04L", day: 29, calendar });
+  const end = Temporal.PlainDate.from({ year: 2020, monthCode: "M04L", day: 29, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2020, monthCode: "M04", day: 29, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2020, monthCode: "M04", day: 29, calendar }, options).until(end, { largestUnit }),
       0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M04-29 (30d) to M04L-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2020, monthCode: "M04", day: 30, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2020, monthCode: "M04", day: 30, calendar }, options).until(end, { largestUnit }),
       0, 0, 0, 29, 0, 0, 0, 0, 0, 0,
       `M04-30 to M04L-29 (29d) is 29 days, not one month (${largestUnit})`
     );
@@ -48,15 +49,15 @@ const calendar = "chinese";
 // Difference between end of 30-day month to end of not-immediately-following
 // 29-day month
 {
-  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M09", day: 29, calendar });
+  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M09", day: 29, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2023, monthCode: "M04", day: 29, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2023, monthCode: "M04", day: 29, calendar }, options).until(end, { largestUnit }),
       0, 5, 0, 0, 0, 0, 0, 0, 0, 0,
       `M04-29 (30d) to M09-29 (29d) is 5 months (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2023, monthCode: "M04", day: 30, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2023, monthCode: "M04", day: 30, calendar }, options).until(end, { largestUnit }),
       0, 4, 0, 29, 0, 0, 0, 0, 0, 0,
       `M04-30 to M09-29 (29d) is 4 months 29 days, not 5 months (${largestUnit})`
     );
@@ -66,27 +67,112 @@ const calendar = "chinese";
 // Difference between end of 30-day month in one year to 29-day month in later
 // year
 {
-  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M09", day: 29, calendar });
+  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M09", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 30, calendar }, options);
   TemporalHelpers.assertDuration(
-    Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 29, calendar }).until(end, { largestUnit: "months" }),
+    start1.until(end, { largestUnit: "months" }),
     0, 29, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 29 days"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 29, calendar }).until(end, { largestUnit: "years" }),
+    start1.until(end, { largestUnit: "years" }),
     2, 4, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 2 years, 4 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 30, calendar }).until(end, { largestUnit: "months" }),
+    start2.until(end, { largestUnit: "months" }),
     0, 28, 0, 29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 28 months, 29 days, not 29 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 30, calendar }).until(end, { largestUnit: "years" }),
+    start2.until(end, { largestUnit: "years" }),
     2, 3, 0, 29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 2 years, 3 months, 29 days, not 2 years 4 months"
   );
 }
 
+// Difference between end of 30-day common month and end of the same month with
+// 29 days in a later year
+{
+  const end = Temporal.PlainDate.from({ year: 2019, monthCode: "M02", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 2018, monthCode: "M02", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 2018, monthCode: "M02", day: 30, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 1 year"
+  );
+}
+
+// Difference between end of 30-day leap month and end of the same leap month
+// with 29 days in a later year
+{
+  const end = Temporal.PlainDate.from({ year: 2025, monthCode: "M06L", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 2017, monthCode: "M06L", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 2017, monthCode: "M06L", day: 30, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 99, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2025-M06L-29 is 99 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2025-M06L-29 is 8 years"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 98, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2025-M06L-29 is 98 months 29 days, not 98 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    7, 12, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2025-M06L-29 is 7 years 12 months 29 days, not 8 years"
+  );
+}
+
+// Case where both the month and day are not constrained
+{
+  const end = Temporal.PlainDate.from({ year: 2018, monthCode: "M06", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 2017, monthCode: "M06L", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 2017, monthCode: "M06L", day: 30, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2018-M06-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2018-M06-29 is 12 months, not 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2018-M06-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2018-M06-29 is 11 months 29 days, not 1 year"
+  );
+}
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/until/wrapping-at-end-of-month-dangi.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/until/wrapping-at-end-of-month-dangi.js
index 099a55548646c..3bbc011e39444 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/until/wrapping-at-end-of-month-dangi.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/until/wrapping-at-end-of-month-dangi.js
@@ -10,18 +10,19 @@ features: [Temporal, Intl.Era-monthcode]
 ---*/
 
 const calendar = "dangi";
+const options = { overflow: "reject" };
 
 // Difference between end of 30-day month to end of following 29-day month
 {
-  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M06", day: 29, calendar });
+  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M06", day: 29, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 29, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 29, calendar }, options).until(end, { largestUnit }),
       0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M05-29 (30d) to M06-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 30, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 30, calendar }, options).until(end, { largestUnit }),
       0, 0, 0, 29, 0, 0, 0, 0, 0, 0,
       `M05-30 to M06-29 is 29 days, not one month (${largestUnit})`
     );
@@ -30,15 +31,15 @@ const calendar = "dangi";
 
 // Difference between end of 30-day M04 to end of 29-day M04L
 {
-  const end = Temporal.PlainDate.from({ year: 2020, monthCode: "M04L", day: 29, calendar });
+  const end = Temporal.PlainDate.from({ year: 2020, monthCode: "M04L", day: 29, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2020, monthCode: "M04", day: 29, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2020, monthCode: "M04", day: 29, calendar }, options).until(end, { largestUnit }),
       0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M04-29 (30d) to M04L-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2020, monthCode: "M04", day: 30, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2020, monthCode: "M04", day: 30, calendar }, options).until(end, { largestUnit }),
       0, 0, 0, 29, 0, 0, 0, 0, 0, 0,
       `M04-30 to M04L-29 (29d) is 29 days, not one month (${largestUnit})`
     );
@@ -48,15 +49,15 @@ const calendar = "dangi";
 // Difference between end of 30-day month to end of not-immediately-following
 // 29-day month
 {
-  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M09", day: 29, calendar });
+  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M09", day: 29, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 29, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 29, calendar }, options).until(end, { largestUnit }),
       0, 4, 0, 0, 0, 0, 0, 0, 0, 0,
       `M05-29 (30d) to M09-29 (29d) is 4 months (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 30, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDate.from({ year: 2023, monthCode: "M05", day: 30, calendar }, options).until(end, { largestUnit }),
       0, 3, 0, 29, 0, 0, 0, 0, 0, 0,
       `M05-30 to M09-29 (29d) is 3 months 29 days, not 4 months (${largestUnit})`
     );
@@ -66,27 +67,112 @@ const calendar = "dangi";
 // Difference between end of 30-day month in one year to 29-day month in later
 // year
 {
-  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M09", day: 29, calendar });
+  const end = Temporal.PlainDate.from({ year: 2023, monthCode: "M09", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 30, calendar }, options);
   TemporalHelpers.assertDuration(
-    Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 29, calendar }).until(end, { largestUnit: "months" }),
+    start1.until(end, { largestUnit: "months" }),
     0, 29, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 29 days"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 29, calendar }).until(end, { largestUnit: "years" }),
+    start1.until(end, { largestUnit: "years" }),
     2, 4, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 2 years, 4 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 30, calendar }).until(end, { largestUnit: "months" }),
+    start2.until(end, { largestUnit: "months" }),
     0, 28, 0, 29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 28 months, 29 days, not 29 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDate.from({ year: 2021, monthCode: "M05", day: 30, calendar }).until(end, { largestUnit: "years" }),
+    start2.until(end, { largestUnit: "years" }),
     2, 3, 0, 29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 2 years, 3 months, 29 days, not 2 years 4 months"
   );
 }
 
+// Difference between end of 30-day common month and end of the same month with
+// 29 days in a later year
+{
+  const end = Temporal.PlainDate.from({ year: 2019, monthCode: "M02", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 2018, monthCode: "M02", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 2018, monthCode: "M02", day: 30, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 1 year"
+  );
+}
+
+// Difference between end of 30-day leap month and end of the same leap month
+// with 29 days in a later year
+{
+  const end = Temporal.PlainDate.from({ year: 1987, monthCode: "M06L", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 1979, monthCode: "M06L", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 1979, monthCode: "M06L", day: 30, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 99, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-29 to 1987-M06L-29 is 99 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-29 to 1987-M06L-29 is 8 years"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 98, 0, 29, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-30 to 1987-M06L-29 is 98 months 29 days, not 98 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    7, 12, 0, 29, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-30 to 1987-M06L-29 is 7 years 12 months 29 days, not 8 years"
+  );
+}
+
+// Case where both the month and day are not constrained
+{
+  const end = Temporal.PlainDate.from({ year: 1956, monthCode: "M03", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 1955, monthCode: "M03L", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 1955, monthCode: "M03L", day: 30, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-29 to 1956-M03-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-29 to 1956-M03-29 is 12 months, not 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-30 to 1956-M03-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-30 to 1956-M03-29 is 11 months 29 days, not 1 year"
+  );
+}
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/until/wrapping-at-end-of-month-hebrew.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/until/wrapping-at-end-of-month-hebrew.js
new file mode 100644
index 0000000000000..e08bf2ded5c7e
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/until/wrapping-at-end-of-month-hebrew.js
@@ -0,0 +1,177 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.prototype.until
+description: Tests balancing of days to months at end of month (Hebrew calendar)
+includes: [temporalHelpers.js]
+features: [Temporal, Intl.Era-monthcode]
+---*/
+
+const calendar = "hebrew";
+const options = { overflow: "reject" };
+
+// 5784 is a leap year.
+
+// 30-day months: 01, 05, 05L, 07, 09, 11
+// 29-day months: 04, 06, 08, 10, 12
+//
+// Cheshvan and Kislev (02, 03) have 29 or 30 days, independent of leap years.
+// Deficient - Cheshvan and Kislev have 29 days
+// Regular - Cheshvan has 29 days, Kislev 30
+// Complete - Cheshvan and Kislev have 30 days
+//
+// Some recent years of each type: 
+// 5778 - regular common year
+// 5779 - complete leap year
+// 5781 - deficient common year
+// 5782 - regular leap year
+// 5783 - complete common year
+// 5784 - deficient leap year
+
+// Difference between end of longer month to end of following shorter month
+{
+  const end = Temporal.PlainDate.from({ year: 5783, monthCode: "M08", day: 29, calendar }, options);
+  for (const largestUnit of ["years", "months"]) {
+    TemporalHelpers.assertDuration(
+      Temporal.PlainDate.from({ year: 5783, monthCode: "M07", day: 29, calendar }, options).until(end, { largestUnit }),
+      0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+      `Nisan 29th to Iyar 29th is one month (${largestUnit})`
+    );
+    TemporalHelpers.assertDuration(
+      Temporal.PlainDate.from({ year: 5783, monthCode: "M07", day: 30, calendar }, options).until(end, { largestUnit }),
+      0, 0, 0, 29, 0, 0, 0, 0, 0, 0,
+      `Nisan 30th to Iyar 29th is 29 days, not one month (${largestUnit})`
+    );
+  }
+}
+
+// Difference between end of longer month to end of not-immediately-following
+// shorter month
+{
+  const end = Temporal.PlainDate.from({ year: 5783, monthCode: "M12", day: 29, calendar }, options);
+  for (const largestUnit of ["years", "months"]) {
+    TemporalHelpers.assertDuration(
+      Temporal.PlainDate.from({ year: 5783, monthCode: "M09", day: 29, calendar }, options).until(end, { largestUnit }),
+      0, 3, 0, 0, 0, 0, 0, 0, 0, 0,
+      `Sivan 29th to Elul 29th is 3 months (${largestUnit})`
+    );
+    TemporalHelpers.assertDuration(
+      Temporal.PlainDate.from({ year: 5783, monthCode: "M09", day: 30, calendar }, options).until(end, { largestUnit }),
+      0, 2, 0, 29, 0, 0, 0, 0, 0, 0,
+      `Sivan 30th to Elul 29th is 2 months 29 days, not 3 months (${largestUnit})`
+    );
+  }
+}
+
+// Difference between end of longer month in one year to shorter month in
+// later year
+{
+  const end = Temporal.PlainDate.from({ year: 5786, monthCode: "M04", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 5783, monthCode: "M11", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 5783, monthCode: "M11", day: 30, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 30, 0, 0, 0, 0, 0, 0, 0, 0,
+    "Av 29th 5783 to Tevet 29th 5786 is 30 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    2, 5, 0, 0, 0, 0, 0, 0, 0, 0,
+    "Av 29th 5783 to Tevet 29th 5786 is 2 years, 5 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 29, 0, 29, 0, 0, 0, 0, 0, 0,
+    "Av 30th 5783 to Tevet 29th 5786 is 29 months, 29 days, not 30 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    2, 4, 0, 29, 0, 0, 0, 0, 0, 0,
+    "Av 30th 5783 to Tevet 29th 5786 is 2 years, 4 months, 29 days, not 2 years 5 months"
+  );
+}
+
+// Difference between 30 Kislev and day 29 of 29-day Kislev in a later year
+{
+  const end = Temporal.PlainDate.from({ year: 5784, monthCode: "M02", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 5783, monthCode: "M02", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 5783, monthCode: "M02", day: 30, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Kislev 5783 to 29th Kislev 5784 (deficient year) is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Kislev 5783 to 29th Kislev 5784 (deficient year) is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "30th Kislev 5783 to 29th Kislev 5784 (deficient year) is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "30th Kislev 5783 to 29th Kislev 5784 (deficient year) is 11 months 29 days, not 1 year"
+  );
+}
+
+// Difference between 30 Cheshvan and day 29 of 29-day Cheshvan in a later year
+{
+  const end = Temporal.PlainDate.from({ year: 5784, monthCode: "M03", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 5783, monthCode: "M03", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 5783, monthCode: "M03", day: 30, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "30th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "30th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 11 months 29 days, not 1 year"
+  );
+}
+
+// Case where both the month and day are not constrained
+{
+  const end = Temporal.PlainDate.from({ year: 5785, monthCode: "M06", day: 29, calendar }, options);
+  const start1 = Temporal.PlainDate.from({ year: 5784, monthCode: "M05L", day: 29, calendar }, options);
+  const start2 = Temporal.PlainDate.from({ year: 5784, monthCode: "M05L", day: 30, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 13, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Adar I 5784 to 29th Adar 5785 is 13 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Adar I 5784 to 29th Adar 5785 is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 12, 0, 29, 0, 0, 0, 0, 0, 0,
+    "30th Adar I 5784 to 29th Adar 5785 is 12 months 29 days, not 13 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 12, 0, 29, 0, 0, 0, 0, 0, 0,
+    "30th Adar I 5784 to 29th Adar 5785 is 12 months 29 days, not 1 year"
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/with/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/with/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/with/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/with/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withCalendar/calendar-time-string.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withCalendar/calendar-time-string.js
new file mode 100644
index 0000000000000..81545f06dbe21
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withCalendar/calendar-time-string.js
@@ -0,0 +1,37 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.prototype.withcalendar
+description: A time string is valid input for Calendar
+features: [Temporal]
+---*/
+
+const instance = Temporal.PlainDate.from({ year: 1976, month: 11, day: 18});
+
+const calendars = [
+  "buddhist",
+  "chinese",
+  "coptic",
+  "dangi",
+  "ethioaa",
+  "ethiopic",
+  "gregory",
+  "hebrew",
+  "indian",
+  "islamic-civil",
+  "islamic-tbla",
+  "islamic-umalqura",
+  "japanese",
+  "persian",
+  "roc",
+]
+
+calendars.forEach((cal) => {
+  const str = `T11:30[u-ca=${cal}]`;
+  const result = instance.withCalendar(str);
+  assert.sameValue(result.calendarId, cal, `Calendar created from string "${str}"`);
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-with-calendar.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withCalendar/roundtrip-from-iso8601.js
similarity index 71%
rename from js/src/tests/test262/staging/Temporal/v8/plain-date-with-calendar.js
rename to js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withCalendar/roundtrip-from-iso8601.js
index 7102c381234cd..710217118c6f1 100644
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-with-calendar.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withCalendar/roundtrip-from-iso8601.js
@@ -3,18 +3,13 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: pending
-description: >
-  Automatically ported from plain-date-with-calendar test
-  in V8's mjsunit test plain-date-with-calendar.js
+esid: sec-temporal.plaindate.prototype.withcalendar
+description: Converting from  iso8601 and back works as expected.
 includes: [temporalHelpers.js]
 features: [Temporal]
 ---*/
 
 let d1 = new Temporal.PlainDate(1911, 10, 10);
-let badDate = { withCalendar: d1.withCalendar };
-assert.throws(TypeError, () => badDate.withCalendar('iso8601'));
-
 let d2 = d1.withCalendar('roc');
 assert.sameValue('roc', d2.calendarId);
 TemporalHelpers.assertPlainDate(d2, 0, 10, 'M10', 10, '', 'broc', 1);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withCalendar/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withCalendar/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withCalendar/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withCalendar/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withPlainTime/basic-roc.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withPlainTime/basic-roc.js
new file mode 100644
index 0000000000000..0670835cab68a
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withPlainTime/basic-roc.js
@@ -0,0 +1,24 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright 2021 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.prototype.withplaintime
+description: withPlainTime should work for roc calendar dates
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+let timeRecord = {
+  hour: 9,
+  minute: 8,
+  second: 7,
+  millisecond: 6,
+  microsecond: 5,
+  nanosecond: 4
+};
+
+let d = new Temporal.PlainDateTime(2020, 3, 15, 4, 5, 6, 7, 8, 9, 'roc');
+TemporalHelpers.assertPlainDateTime(d.withPlainTime(timeRecord), 109, 3, 'M03', 15, 9, 8, 7, 6, 5, 4, '', 'roc', 109);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/browser.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withPlainTime/browser.js
similarity index 100%
rename from js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/browser.js
rename to js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withPlainTime/browser.js
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withPlainTime/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withPlainTime/shell.js
new file mode 100644
index 0000000000000..8d4cef92ca9ea
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/withPlainTime/shell.js
@@ -0,0 +1,1278 @@
+// GENERATED, DO NOT EDIT
+// file: temporalHelpers.js
+// Copyright (C) 2021 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+description: |
+    This defines helper objects and functions for testing Temporal.
+defines: [TemporalHelpers]
+features: [Symbol.species, Symbol.iterator, Temporal]
+---*/
+
+const ASCII_IDENTIFIER = /^[$_a-zA-Z][$_a-zA-Z0-9]*$/u;
+
+function formatPropertyName(propertyKey, objectName = "") {
+  switch (typeof propertyKey) {
+    case "symbol":
+      if (Symbol.keyFor(propertyKey) !== undefined) {
+        return `${objectName}[Symbol.for('${Symbol.keyFor(propertyKey)}')]`;
+      } else if (propertyKey.description.startsWith("Symbol.")) {
+        return `${objectName}[${propertyKey.description}]`;
+      } else {
+        return `${objectName}[Symbol('${propertyKey.description}')]`;
+      }
+    case "string":
+      if (propertyKey !== String(Number(propertyKey))) {
+        if (ASCII_IDENTIFIER.test(propertyKey)) {
+          return objectName ? `${objectName}.${propertyKey}` : propertyKey;
+        }
+        return `${objectName}['${propertyKey.replace(/'/g, "\\'")}']`;
+      }
+      // fall through
+    default:
+      // integer or string integer-index
+      return `${objectName}[${propertyKey}]`;
+  }
+}
+
+const SKIP_SYMBOL = Symbol("Skip");
+
+var TemporalHelpers = {
+  /*
+   * Codes and maximum lengths of months in the ISO 8601 calendar.
+   */
+  ISOMonths: [
+    { month: 1, monthCode: "M01", daysInMonth: 31 },
+    { month: 2, monthCode: "M02", daysInMonth: 29 },
+    { month: 3, monthCode: "M03", daysInMonth: 31 },
+    { month: 4, monthCode: "M04", daysInMonth: 30 },
+    { month: 5, monthCode: "M05", daysInMonth: 31 },
+    { month: 6, monthCode: "M06", daysInMonth: 30 },
+    { month: 7, monthCode: "M07", daysInMonth: 31 },
+    { month: 8, monthCode: "M08", daysInMonth: 31 },
+    { month: 9, monthCode: "M09", daysInMonth: 30 },
+    { month: 10, monthCode: "M10", daysInMonth: 31 },
+    { month: 11, monthCode: "M11", daysInMonth: 30 },
+    { month: 12, monthCode: "M12", daysInMonth: 31 }
+  ],
+
+  /*
+   * List of known calendar eras and their possible aliases.
+   *
+   * https://tc39.es/proposal-intl-era-monthcode/#table-eras
+   */
+  CalendarEras: {
+    buddhist: [
+      { era: "be" },
+    ],
+    coptic: [
+      { era: "am" },
+    ],
+    ethiopic: [
+      { era: "aa", aliases: ["mundi"] },
+      { era: "am", aliases: ["incar"] },
+    ],
+    ethioaa: [
+      { era: "aa", aliases: ["mundi"] },
+    ],
+    gregory: [
+      { era: "bce", aliases: ["bc"] },
+      { era: "ce", aliases: ["ad"] },
+    ],
+    hebrew: [
+      { era: "am" },
+    ],
+    indian: [
+      { era: "shaka" },
+    ],
+    islamic: [
+      { era: "ah" },
+      { era: "bh" },
+    ],
+    "islamic-civil": [
+      { era: "bh" },
+      { era: "ah" },
+    ],
+    "islamic-rgsa": [
+      { era: "bh" },
+      { era: "ah" },
+    ],
+    "islamic-tbla": [
+      { era: "bh" },
+      { era: "ah" },
+    ],
+    "islamic-umalqura": [
+      { era: "bh" },
+      { era: "ah" },
+    ],
+    japanese: [
+      { era: "bce", aliases: ["bc"] },
+      { era: "ce", aliases: ["ad"] },
+      { era: "heisei" },
+      { era: "meiji" },
+      { era: "reiwa" },
+      { era: "showa" },
+      { era: "taisho" },
+    ],
+    persian: [
+      { era: "ap" },
+    ],
+    roc: [
+      { era: "roc", aliases: ["minguo"] },
+      { era: "broc", aliases: ["before-roc", "minguo-qian"] },
+    ],
+  },
+
+  /*
+   * Return the canonical era code.
+   */
+  canonicalizeCalendarEra(calendarId, eraName) {
+    assert.sameValue(typeof calendarId, "string", "calendar must be string in canonicalizeCalendarEra");
+
+    if (!Object.prototype.hasOwnProperty.call(TemporalHelpers.CalendarEras, calendarId)) {
+      assert.sameValue(eraName, undefined);
+      return undefined;
+    }
+
+    assert.sameValue(typeof eraName, "string", "eraName must be string or undefined in canonicalizeCalendarEra");
+
+    for (let {era, aliases = []} of TemporalHelpers.CalendarEras[calendarId]) {
+      if (era === eraName || aliases.includes(eraName)) {
+        return era;
+      }
+    }
+    throw new Test262Error(`Unsupported era name: ${eraName}`);
+  },
+
+  /*
+   * assertDuration(duration, years, ...,  nanoseconds[, description]):
+   *
+   * Shorthand for asserting that each field of a Temporal.Duration is equal to
+   * an expected value.
+   */
+  assertDuration(duration, years, months, weeks, days, hours, minutes, seconds, milliseconds, microseconds, nanoseconds, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(duration instanceof Temporal.Duration, `${prefix}instanceof`);
+    assert.sameValue(duration.years, years, `${prefix}years result:`);
+    assert.sameValue(duration.months, months, `${prefix}months result:`);
+    assert.sameValue(duration.weeks, weeks, `${prefix}weeks result:`);
+    assert.sameValue(duration.days, days, `${prefix}days result:`);
+    assert.sameValue(duration.hours, hours, `${prefix}hours result:`);
+    assert.sameValue(duration.minutes, minutes, `${prefix}minutes result:`);
+    assert.sameValue(duration.seconds, seconds, `${prefix}seconds result:`);
+    assert.sameValue(duration.milliseconds, milliseconds, `${prefix}milliseconds result:`);
+    assert.sameValue(duration.microseconds, microseconds, `${prefix}microseconds result:`);
+    assert.sameValue(duration.nanoseconds, nanoseconds, `${prefix}nanoseconds result`);
+  },
+
+  /*
+   * assertDateDuration(duration, years, months, weeks, days, [, description]):
+   *
+   * Shorthand for asserting that each date field of a Temporal.Duration is
+   * equal to an expected value.
+   */
+  assertDateDuration(duration, years, months, weeks, days, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(duration instanceof Temporal.Duration, `${prefix}instanceof`);
+    assert.sameValue(duration.years, years, `${prefix}years result:`);
+    assert.sameValue(duration.months, months, `${prefix}months result:`);
+    assert.sameValue(duration.weeks, weeks, `${prefix}weeks result:`);
+    assert.sameValue(duration.days, days, `${prefix}days result:`);
+    assert.sameValue(duration.hours, 0, `${prefix}hours result should be zero:`);
+    assert.sameValue(duration.minutes, 0, `${prefix}minutes result should be zero:`);
+    assert.sameValue(duration.seconds, 0, `${prefix}seconds result should be zero:`);
+    assert.sameValue(duration.milliseconds, 0, `${prefix}milliseconds result should be zero:`);
+    assert.sameValue(duration.microseconds, 0, `${prefix}microseconds result should be zero:`);
+    assert.sameValue(duration.nanoseconds, 0, `${prefix}nanoseconds result should be zero:`);
+  },
+
+  /*
+   * assertDurationsEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that each field of a Temporal.Duration is equal to
+   * the corresponding field in another Temporal.Duration.
+   */
+  assertDurationsEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.Duration, `${prefix}expected value should be a Temporal.Duration`);
+    TemporalHelpers.assertDuration(actual, expected.years, expected.months, expected.weeks, expected.days, expected.hours, expected.minutes, expected.seconds, expected.milliseconds, expected.microseconds, expected.nanoseconds, description);
+  },
+
+  /*
+   * assertInstantsEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.Instants are of the correct type
+   * and equal according to their equals() methods.
+   */
+  assertInstantsEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.Instant, `${prefix}expected value should be a Temporal.Instant`);
+    assert(actual instanceof Temporal.Instant, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+  },
+
+  /*
+   * assertPlainDate(date, year, ..., nanosecond[, description[, era, eraYear]]):
+   *
+   * Shorthand for asserting that each field of a Temporal.PlainDate is equal to
+   * an expected value. (Except the `calendar` property, since callers may want
+   * to assert either object equality with an object they put in there, or the
+   * value of date.calendarId.)
+   */
+  assertPlainDate(date, year, month, monthCode, day, description = "", era = undefined, eraYear = undefined) {
+    const prefix = description ? `${description}: ` : "";
+    assert(date instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert.sameValue(
+      TemporalHelpers.canonicalizeCalendarEra(date.calendarId, date.era),
+      TemporalHelpers.canonicalizeCalendarEra(date.calendarId, era),
+      `${prefix}era result:`
+    );
+    assert.sameValue(date.eraYear, eraYear, `${prefix}eraYear result:`);
+    assert.sameValue(date.year, year, `${prefix}year result:`);
+    assert.sameValue(date.month, month, `${prefix}month result:`);
+    assert.sameValue(date.monthCode, monthCode, `${prefix}monthCode result:`);
+    assert.sameValue(date.day, day, `${prefix}day result:`);
+  },
+
+  /*
+   * assertPlainDateTime(datetime, year, ..., nanosecond[, description[, era, eraYear]]):
+   *
+   * Shorthand for asserting that each field of a Temporal.PlainDateTime is
+   * equal to an expected value. (Except the `calendar` property, since callers
+   * may want to assert either object equality with an object they put in there,
+   * or the value of datetime.calendarId.)
+   */
+  assertPlainDateTime(datetime, year, month, monthCode, day, hour, minute, second, millisecond, microsecond, nanosecond, description = "", era = undefined, eraYear = undefined) {
+    const prefix = description ? `${description}: ` : "";
+    assert(datetime instanceof Temporal.PlainDateTime, `${prefix}instanceof`);
+    assert.sameValue(
+      TemporalHelpers.canonicalizeCalendarEra(datetime.calendarId, datetime.era),
+      TemporalHelpers.canonicalizeCalendarEra(datetime.calendarId, era),
+      `${prefix}era result:`
+    );
+    assert.sameValue(datetime.eraYear, eraYear, `${prefix}eraYear result:`);
+    assert.sameValue(datetime.year, year, `${prefix}year result:`);
+    assert.sameValue(datetime.month, month, `${prefix}month result:`);
+    assert.sameValue(datetime.monthCode, monthCode, `${prefix}monthCode result:`);
+    assert.sameValue(datetime.day, day, `${prefix}day result:`);
+    assert.sameValue(datetime.hour, hour, `${prefix}hour result:`);
+    assert.sameValue(datetime.minute, minute, `${prefix}minute result:`);
+    assert.sameValue(datetime.second, second, `${prefix}second result:`);
+    assert.sameValue(datetime.millisecond, millisecond, `${prefix}millisecond result:`);
+    assert.sameValue(datetime.microsecond, microsecond, `${prefix}microsecond result:`);
+    assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
+  },
+
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
+  /*
+   * assertPlainDateTimesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDateTimes are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDateTimesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDateTime, `${prefix}expected value should be a Temporal.PlainDateTime`);
+    assert(actual instanceof Temporal.PlainDateTime, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
+  /*
+   * assertPlainMonthDay(monthDay, monthCode, day[, description [, referenceISOYear]]):
+   *
+   * Shorthand for asserting that each field of a Temporal.PlainMonthDay is
+   * equal to an expected value. (Except the `calendar` property, since callers
+   * may want to assert either object equality with an object they put in there,
+   * or the value of monthDay.calendarId().)
+   */
+  assertPlainMonthDay(monthDay, monthCode, day, description = "", referenceISOYear = 1972) {
+    const prefix = description ? `${description}: ` : "";
+    assert(monthDay instanceof Temporal.PlainMonthDay, `${prefix}instanceof`);
+    assert.sameValue(monthDay.monthCode, monthCode, `${prefix}monthCode result:`);
+    assert.sameValue(monthDay.day, day, `${prefix}day result:`);
+    const isoYear = Number(monthDay.toString({ calendarName: "always" }).split("-")[0]);
+    assert.sameValue(isoYear, referenceISOYear, `${prefix}referenceISOYear result:`);
+  },
+
+  /*
+   * assertPlainTime(time, hour, ..., nanosecond[, description]):
+   *
+   * Shorthand for asserting that each field of a Temporal.PlainTime is equal to
+   * an expected value.
+   */
+  assertPlainTime(time, hour, minute, second, millisecond, microsecond, nanosecond, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(time instanceof Temporal.PlainTime, `${prefix}instanceof`);
+    assert.sameValue(time.hour, hour, `${prefix}hour result:`);
+    assert.sameValue(time.minute, minute, `${prefix}minute result:`);
+    assert.sameValue(time.second, second, `${prefix}second result:`);
+    assert.sameValue(time.millisecond, millisecond, `${prefix}millisecond result:`);
+    assert.sameValue(time.microsecond, microsecond, `${prefix}microsecond result:`);
+    assert.sameValue(time.nanosecond, nanosecond, `${prefix}nanosecond result:`);
+  },
+
+  /*
+   * assertPlainTimesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainTimes are of the correct
+   * type and equal according to their equals() methods.
+   */
+  assertPlainTimesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainTime, `${prefix}expected value should be a Temporal.PlainTime`);
+    assert(actual instanceof Temporal.PlainTime, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+  },
+
+  /*
+   * assertPlainYearMonth(yearMonth, year, month, monthCode[, description[, era, eraYear, referenceISODay]]):
+   *
+   * Shorthand for asserting that each field of a Temporal.PlainYearMonth is
+   * equal to an expected value. (Except the `calendar` property, since callers
+   * may want to assert either object equality with an object they put in there,
+   * or the value of yearMonth.calendarId.)
+   *
+   * Pass null as the referenceISODay if you don't want to give it explicitly.
+   * In that case, the expected referenceISODay will be computed using PlainDate
+   * and only verified for consistency, not for equality with a specific value.
+   */
+  assertPlainYearMonth(yearMonth, year, month, monthCode, description = "", era = undefined, eraYear = undefined, referenceISODay = 1) {
+    const prefix = description ? `${description}: ` : "";
+    assert(typeof referenceISODay === "number" || referenceISODay === null,
+      `TemporalHelpers.assertPlainYearMonth() referenceISODay argument should be a number or null, not ${referenceISODay}`);
+    assert(yearMonth instanceof Temporal.PlainYearMonth, `${prefix}instanceof`);
+    assert.sameValue(
+      TemporalHelpers.canonicalizeCalendarEra(yearMonth.calendarId, yearMonth.era),
+      TemporalHelpers.canonicalizeCalendarEra(yearMonth.calendarId, era),
+      `${prefix}era result:`
+    );
+    assert.sameValue(yearMonth.eraYear, eraYear, `${prefix}eraYear result:`);
+    assert.sameValue(yearMonth.year, year, `${prefix}year result:`);
+    assert.sameValue(yearMonth.month, month, `${prefix}month result:`);
+    assert.sameValue(yearMonth.monthCode, monthCode, `${prefix}monthCode result:`);
+    const isoDay = Number(yearMonth.toString({ calendarName: "always" }).slice(1).split("-")[2].slice(0, 2));
+    const expectedISODay = referenceISODay ?? yearMonth.toPlainDate({ day: 1 }).withCalendar("iso8601").day;
+    assert.sameValue(isoDay, expectedISODay, `${prefix}referenceISODay result:`);
+  },
+
+  /*
+   * assertZonedDateTimesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.ZonedDateTimes are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their time zones and calendar internal slots are the same value.
+   */
+  assertZonedDateTimesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.ZonedDateTime, `${prefix}expected value should be a Temporal.ZonedDateTime`);
+    assert(actual instanceof Temporal.ZonedDateTime, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(actual.timeZoneId, expected.timeZoneId, `${prefix}time zone same value:`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
+  /*
+   * assertUnreachable(description):
+   *
+   * Helper for asserting that code is not executed.
+   */
+  assertUnreachable(description) {
+    let message = "This code should not be executed";
+    if (description) {
+      message = `${message}: ${description}`;
+    }
+    throw new Test262Error(message);
+  },
+
+  /*
+   * checkPlainDateTimeConversionFastPath(func):
+   *
+   * ToTemporalDate and ToTemporalTime should both, if given a
+   * Temporal.PlainDateTime instance, convert to the desired type by reading the
+   * PlainDateTime's internal slots, rather than calling any getters.
+   *
+   * func(datetime) is the actual operation to test, that must
+   * internally call the abstract operation ToTemporalDate or ToTemporalTime.
+   * It is passed a Temporal.PlainDateTime instance.
+   */
+  checkPlainDateTimeConversionFastPath(func, message = "checkPlainDateTimeConversionFastPath") {
+    const actual = [];
+    const expected = [];
+
+    const calendar = "iso8601";
+    const datetime = new Temporal.PlainDateTime(2000, 5, 2, 12, 34, 56, 987, 654, 321, calendar);
+    const prototypeDescrs = Object.getOwnPropertyDescriptors(Temporal.PlainDateTime.prototype);
+    ["year", "month", "monthCode", "day", "hour", "minute", "second", "millisecond", "microsecond", "nanosecond"].forEach((property) => {
+      Object.defineProperty(datetime, property, {
+        get() {
+          actual.push(`get ${formatPropertyName(property)}`);
+          const value = prototypeDescrs[property].get.call(this);
+          return {
+            toString() {
+              actual.push(`toString ${formatPropertyName(property)}`);
+              return value.toString();
+            },
+            valueOf() {
+              actual.push(`valueOf ${formatPropertyName(property)}`);
+              return value;
+            },
+          };
+        },
+      });
+    });
+    Object.defineProperty(datetime, "calendar", {
+      get() {
+        actual.push("get calendar");
+        return calendar;
+      },
+    });
+
+    func(datetime);
+    assert.compareArray(actual, expected, `${message}: property getters not called`);
+  },
+
+  /*
+   * Check that an options bag that accepts units written in the singular form,
+   * also accepts the same units written in the plural form.
+   * func(unit) should call the method with the appropriate options bag
+   * containing unit as a value. This will be called twice for each element of
+   * validSingularUnits, once with singular and once with plural, and the
+   * results of each pair should be the same (whether a Temporal object or a
+   * primitive value.)
+   */
+  checkPluralUnitsAccepted(func, validSingularUnits) {
+    const plurals = {
+      year: "years",
+      month: "months",
+      week: "weeks",
+      day: "days",
+      hour: "hours",
+      minute: "minutes",
+      second: "seconds",
+      millisecond: "milliseconds",
+      microsecond: "microseconds",
+      nanosecond: "nanoseconds",
+    };
+
+    validSingularUnits.forEach((unit) => {
+      const singularValue = func(unit);
+      const pluralValue = func(plurals[unit]);
+      const desc = `Plural ${plurals[unit]} produces the same result as singular ${unit}`;
+      if (singularValue instanceof Temporal.Duration) {
+        TemporalHelpers.assertDurationsEqual(pluralValue, singularValue, desc);
+      } else if (singularValue instanceof Temporal.Instant) {
+        TemporalHelpers.assertInstantsEqual(pluralValue, singularValue, desc);
+      } else if (singularValue instanceof Temporal.PlainDateTime) {
+        TemporalHelpers.assertPlainDateTimesEqual(pluralValue, singularValue, desc);
+      } else if (singularValue instanceof Temporal.PlainTime) {
+        TemporalHelpers.assertPlainTimesEqual(pluralValue, singularValue, desc);
+      } else if (singularValue instanceof Temporal.ZonedDateTime) {
+        TemporalHelpers.assertZonedDateTimesEqual(pluralValue, singularValue, desc);
+      } else {
+        assert.sameValue(pluralValue, singularValue);
+      }
+    });
+  },
+
+  /*
+   * checkRoundingIncrementOptionWrongType(checkFunc, assertTrueResultFunc, assertObjectResultFunc):
+   *
+   * Checks the type handling of the roundingIncrement option.
+   * checkFunc(roundingIncrement) is a function which takes the value of
+   * roundingIncrement to test, and calls the method under test with it,
+   * returning the result. assertTrueResultFunc(result, description) should
+   * assert that result is the expected result with roundingIncrement: true, and
+   * assertObjectResultFunc(result, description) should assert that result is
+   * the expected result with roundingIncrement being an object with a valueOf()
+   * method.
+   */
+  checkRoundingIncrementOptionWrongType(checkFunc, assertTrueResultFunc, assertObjectResultFunc) {
+    // null converts to 0, which is out of range
+    assert.throws(RangeError, () => checkFunc(null), "null");
+    // Booleans convert to either 0 or 1, and 1 is allowed
+    const trueResult = checkFunc(true);
+    assertTrueResultFunc(trueResult, "true");
+    assert.throws(RangeError, () => checkFunc(false), "false");
+    // Symbols and BigInts cannot convert to numbers
+    assert.throws(TypeError, () => checkFunc(Symbol()), "symbol");
+    assert.throws(TypeError, () => checkFunc(2n), "bigint");
+
+    // Objects prefer their valueOf() methods when converting to a number
+    assert.throws(RangeError, () => checkFunc({}), "plain object");
+
+    const expected = [
+      "get roundingIncrement.valueOf",
+      "call roundingIncrement.valueOf",
+    ];
+    const actual = [];
+    const observer = TemporalHelpers.toPrimitiveObserver(actual, 2, "roundingIncrement");
+    const objectResult = checkFunc(observer);
+    assertObjectResultFunc(objectResult, "object with valueOf");
+    assert.compareArray(actual, expected, "order of operations");
+  },
+
+  /*
+   * checkStringOptionWrongType(propertyName, value, checkFunc, assertFunc):
+   *
+   * Checks the type handling of a string option, of which there are several in
+   * Temporal.
+   * propertyName is the name of the option, and value is the value that
+   * assertFunc should expect it to have.
+   * checkFunc(value) is a function which takes the value of the option to test,
+   * and calls the method under test with it, returning the result.
+   * assertFunc(result, description) should assert that result is the expected
+   * result with the option value being an object with a toString() method
+   * which returns the given value.
+   */
+  checkStringOptionWrongType(propertyName, value, checkFunc, assertFunc) {
+    // null converts to the string "null", which is an invalid string value
+    assert.throws(RangeError, () => checkFunc(null), "null");
+    // Booleans convert to the strings "true" or "false", which are invalid
+    assert.throws(RangeError, () => checkFunc(true), "true");
+    assert.throws(RangeError, () => checkFunc(false), "false");
+    // Symbols cannot convert to strings
+    assert.throws(TypeError, () => checkFunc(Symbol()), "symbol");
+    // Numbers convert to strings which are invalid
+    assert.throws(RangeError, () => checkFunc(2), "number");
+    // BigInts convert to strings which are invalid
+    assert.throws(RangeError, () => checkFunc(2n), "bigint");
+
+    // Objects prefer their toString() methods when converting to a string
+    assert.throws(RangeError, () => checkFunc({}), "plain object");
+
+    const expected = [
+      `get ${propertyName}.toString`,
+      `call ${propertyName}.toString`,
+    ];
+    const actual = [];
+    const observer = TemporalHelpers.toPrimitiveObserver(actual, value, propertyName);
+    const result = checkFunc(observer);
+    assertFunc(result, "object with toString");
+    assert.compareArray(actual, expected, "order of operations");
+  },
+
+  /*
+   * checkSubclassingIgnored(construct, constructArgs, method, methodArgs,
+   *   resultAssertions):
+   *
+   * Methods of Temporal classes that return a new instance of the same class,
+   * must not take the constructor of a subclass into account, nor the @@species
+   * property. This helper runs tests to ensure this.
+   *
+   * construct(...constructArgs) must yield a valid instance of the Temporal
+   * class. instance[method](...methodArgs) is the method call under test, which
+   * must also yield a valid instance of the same Temporal class, not a
+   * subclass. See below for the individual tests that this runs.
+   * resultAssertions() is a function that performs additional assertions on the
+   * instance returned by the method under test.
+   */
+  checkSubclassingIgnored(...args) {
+    this.checkSubclassConstructorNotObject(...args);
+    this.checkSubclassConstructorUndefined(...args);
+    this.checkSubclassConstructorThrows(...args);
+    this.checkSubclassConstructorNotCalled(...args);
+    this.checkSubclassSpeciesInvalidResult(...args);
+    this.checkSubclassSpeciesNotAConstructor(...args);
+    this.checkSubclassSpeciesNull(...args);
+    this.checkSubclassSpeciesUndefined(...args);
+    this.checkSubclassSpeciesThrows(...args);
+  },
+
+  /*
+   * Checks that replacing the 'constructor' property of the instance with
+   * various primitive values does not affect the returned new instance.
+   */
+  checkSubclassConstructorNotObject(construct, constructArgs, method, methodArgs, resultAssertions) {
+    function check(value, description) {
+      const instance = new construct(...constructArgs);
+      instance.constructor = value;
+      const result = instance[method](...methodArgs);
+      assert.sameValue(Object.getPrototypeOf(result), construct.prototype, description);
+      resultAssertions(result);
+    }
+
+    check(null, "null");
+    check(true, "true");
+    check("test", "string");
+    check(Symbol(), "Symbol");
+    check(7, "number");
+    check(7n, "bigint");
+  },
+
+  /*
+   * Checks that replacing the 'constructor' property of the subclass with
+   * undefined does not affect the returned new instance.
+   */
+  checkSubclassConstructorUndefined(construct, constructArgs, method, methodArgs, resultAssertions) {
+    let called = 0;
+
+    class MySubclass extends construct {
+      constructor() {
+        ++called;
+        super(...constructArgs);
+      }
+    }
+
+    const instance = new MySubclass();
+    assert.sameValue(called, 1);
+
+    MySubclass.prototype.constructor = undefined;
+
+    const result = instance[method](...methodArgs);
+    assert.sameValue(called, 1);
+    assert.sameValue(Object.getPrototypeOf(result), construct.prototype);
+    resultAssertions(result);
+  },
+
+  /*
+   * Checks that making the 'constructor' property of the instance throw when
+   * called does not affect the returned new instance.
+   */
+  checkSubclassConstructorThrows(construct, constructArgs, method, methodArgs, resultAssertions) {
+    function CustomError() {}
+    const instance = new construct(...constructArgs);
+    Object.defineProperty(instance, "constructor", {
+      get() {
+        throw new CustomError();
+      }
+    });
+    const result = instance[method](...methodArgs);
+    assert.sameValue(Object.getPrototypeOf(result), construct.prototype);
+    resultAssertions(result);
+  },
+
+  /*
+   * Checks that when subclassing, the subclass constructor is not called by
+   * the method under test.
+   */
+  checkSubclassConstructorNotCalled(construct, constructArgs, method, methodArgs, resultAssertions) {
+    let called = 0;
+
+    class MySubclass extends construct {
+      constructor() {
+        ++called;
+        super(...constructArgs);
+      }
+    }
+
+    const instance = new MySubclass();
+    assert.sameValue(called, 1);
+
+    const result = instance[method](...methodArgs);
+    assert.sameValue(called, 1);
+    assert.sameValue(Object.getPrototypeOf(result), construct.prototype);
+    resultAssertions(result);
+  },
+
+  /*
+   * Check that the constructor's @@species property is ignored when it's a
+   * constructor that returns a non-object value.
+   */
+  checkSubclassSpeciesInvalidResult(construct, constructArgs, method, methodArgs, resultAssertions) {
+    function check(value, description) {
+      const instance = new construct(...constructArgs);
+      instance.constructor = {
+        [Symbol.species]: function() {
+          return value;
+        },
+      };
+      const result = instance[method](...methodArgs);
+      assert.sameValue(Object.getPrototypeOf(result), construct.prototype, description);
+      resultAssertions(result);
+    }
+
+    check(undefined, "undefined");
+    check(null, "null");
+    check(true, "true");
+    check("test", "string");
+    check(Symbol(), "Symbol");
+    check(7, "number");
+    check(7n, "bigint");
+    check({}, "plain object");
+  },
+
+  /*
+   * Check that the constructor's @@species property is ignored when it's not a
+   * constructor.
+   */
+  checkSubclassSpeciesNotAConstructor(construct, constructArgs, method, methodArgs, resultAssertions) {
+    function check(value, description) {
+      const instance = new construct(...constructArgs);
+      instance.constructor = {
+        [Symbol.species]: value,
+      };
+      const result = instance[method](...methodArgs);
+      assert.sameValue(Object.getPrototypeOf(result), construct.prototype, description);
+      resultAssertions(result);
+    }
+
+    check(true, "true");
+    check("test", "string");
+    check(Symbol(), "Symbol");
+    check(7, "number");
+    check(7n, "bigint");
+    check({}, "plain object");
+  },
+
+  /*
+   * Check that the constructor's @@species property is ignored when it's null.
+   */
+  checkSubclassSpeciesNull(construct, constructArgs, method, methodArgs, resultAssertions) {
+    let called = 0;
+
+    class MySubclass extends construct {
+      constructor() {
+        ++called;
+        super(...constructArgs);
+      }
+    }
+
+    const instance = new MySubclass();
+    assert.sameValue(called, 1);
+
+    MySubclass.prototype.constructor = {
+      [Symbol.species]: null,
+    };
+
+    const result = instance[method](...methodArgs);
+    assert.sameValue(called, 1);
+    assert.sameValue(Object.getPrototypeOf(result), construct.prototype);
+    resultAssertions(result);
+  },
+
+  /*
+   * Check that the constructor's @@species property is ignored when it's
+   * undefined.
+   */
+  checkSubclassSpeciesUndefined(construct, constructArgs, method, methodArgs, resultAssertions) {
+    let called = 0;
+
+    class MySubclass extends construct {
+      constructor() {
+        ++called;
+        super(...constructArgs);
+      }
+    }
+
+    const instance = new MySubclass();
+    assert.sameValue(called, 1);
+
+    MySubclass.prototype.constructor = {
+      [Symbol.species]: undefined,
+    };
+
+    const result = instance[method](...methodArgs);
+    assert.sameValue(called, 1);
+    assert.sameValue(Object.getPrototypeOf(result), construct.prototype);
+    resultAssertions(result);
+  },
+
+  /*
+   * Check that the constructor's @@species property is ignored when it throws,
+   * i.e. it is not called at all.
+   */
+  checkSubclassSpeciesThrows(construct, constructArgs, method, methodArgs, resultAssertions) {
+    function CustomError() {}
+
+    const instance = new construct(...constructArgs);
+    instance.constructor = {
+      get [Symbol.species]() {
+        throw new CustomError();
+      },
+    };
+
+    const result = instance[method](...methodArgs);
+    assert.sameValue(Object.getPrototypeOf(result), construct.prototype);
+  },
+
+  /*
+   * checkSubclassingIgnoredStatic(construct, method, methodArgs, resultAssertions):
+   *
+   * Static methods of Temporal classes that return a new instance of the class,
+   * must not use the this-value as a constructor. This helper runs tests to
+   * ensure this.
+   *
+   * construct[method](...methodArgs) is the static method call under test, and
+   * must yield a valid instance of the Temporal class, not a subclass. See
+   * below for the individual tests that this runs.
+   * resultAssertions() is a function that performs additional assertions on the
+   * instance returned by the method under test.
+   */
+  checkSubclassingIgnoredStatic(...args) {
+    this.checkStaticInvalidReceiver(...args);
+    this.checkStaticReceiverNotCalled(...args);
+    this.checkThisValueNotCalled(...args);
+  },
+
+  /*
+   * Check that calling the static method with a receiver that's not callable,
+   * still calls the intrinsic constructor.
+   */
+  checkStaticInvalidReceiver(construct, method, methodArgs, resultAssertions) {
+    function check(value, description) {
+      const result = construct[method].apply(value, methodArgs);
+      assert.sameValue(Object.getPrototypeOf(result), construct.prototype);
+      resultAssertions(result);
+    }
+
+    check(undefined, "undefined");
+    check(null, "null");
+    check(true, "true");
+    check("test", "string");
+    check(Symbol(), "symbol");
+    check(7, "number");
+    check(7n, "bigint");
+    check({}, "Non-callable object");
+  },
+
+  /*
+   * Check that calling the static method with a receiver that returns a value
+   * that's not callable, still calls the intrinsic constructor.
+   */
+  checkStaticReceiverNotCalled(construct, method, methodArgs, resultAssertions) {
+    function check(value, description) {
+      const receiver = function () {
+        return value;
+      };
+      const result = construct[method].apply(receiver, methodArgs);
+      assert.sameValue(Object.getPrototypeOf(result), construct.prototype);
+      resultAssertions(result);
+    }
+
+    check(undefined, "undefined");
+    check(null, "null");
+    check(true, "true");
+    check("test", "string");
+    check(Symbol(), "symbol");
+    check(7, "number");
+    check(7n, "bigint");
+    check({}, "Non-callable object");
+  },
+
+  /*
+   * Check that the receiver isn't called.
+   */
+  checkThisValueNotCalled(construct, method, methodArgs, resultAssertions) {
+    let called = false;
+
+    class MySubclass extends construct {
+      constructor(...args) {
+        called = true;
+        super(...args);
+      }
+    }
+
+    const result = MySubclass[method](...methodArgs);
+    assert.sameValue(called, false);
+    assert.sameValue(Object.getPrototypeOf(result), construct.prototype);
+    resultAssertions(result);
+  },
+
+  /*
+   * Check that any calendar-carrying Temporal object has its [[Calendar]]
+   * internal slot read by ToTemporalCalendar, and does not fetch the calendar
+   * by calling getters.
+   */
+  checkToTemporalCalendarFastPath(func) {
+    const plainDate = new Temporal.PlainDate(2000, 5, 2, "iso8601");
+    const plainDateTime = new Temporal.PlainDateTime(2000, 5, 2, 12, 34, 56, 987, 654, 321, "iso8601");
+    const plainMonthDay = new Temporal.PlainMonthDay(5, 2, "iso8601");
+    const plainYearMonth = new Temporal.PlainYearMonth(2000, 5, "iso8601");
+    const zonedDateTime = new Temporal.ZonedDateTime(1_000_000_000_000_000_000n, "UTC", "iso8601");
+
+    [plainDate, plainDateTime, plainMonthDay, plainYearMonth, zonedDateTime].forEach((temporalObject) => {
+      Object.defineProperty(temporalObject, "calendar", {
+        get() {
+          throw new Test262Error("should not get 'calendar' property");
+        },
+      });
+      Object.defineProperty(temporalObject, "calendarId", {
+        get() {
+          throw new Test262Error("should not get 'calendarId' property");
+        },
+      });
+
+      func(temporalObject);
+    });
+  },
+
+  checkToTemporalInstantFastPath(func) {
+    const actual = [];
+    const expected = [];
+
+    const datetime = new Temporal.ZonedDateTime(1_000_000_000_987_654_321n, "UTC");
+    Object.defineProperty(datetime, "toString", {
+      get() {
+        actual.push("get toString");
+        return function (options) {
+          actual.push("call toString");
+          return Temporal.ZonedDateTime.prototype.toString.call(this, options);
+        };
+      },
+    });
+
+    func(datetime);
+    assert.compareArray(actual, expected, "toString not called");
+  },
+
+  checkToTemporalPlainDateTimeFastPath(func) {
+    const actual = [];
+    const expected = [];
+
+    const date = new Temporal.PlainDate(2000, 5, 2, "iso8601");
+    const prototypeDescrs = Object.getOwnPropertyDescriptors(Temporal.PlainDate.prototype);
+    ["year", "month", "monthCode", "day"].forEach((property) => {
+      Object.defineProperty(date, property, {
+        get() {
+          actual.push(`get ${formatPropertyName(property)}`);
+          const value = prototypeDescrs[property].get.call(this);
+          return TemporalHelpers.toPrimitiveObserver(actual, value, property);
+        },
+      });
+    });
+    ["hour", "minute", "second", "millisecond", "microsecond", "nanosecond"].forEach((property) => {
+      Object.defineProperty(date, property, {
+        get() {
+          actual.push(`get ${formatPropertyName(property)}`);
+          return undefined;
+        },
+      });
+    });
+    Object.defineProperty(date, "calendar", {
+      get() {
+        actual.push("get calendar");
+        return "iso8601";
+      },
+    });
+
+    func(date);
+    assert.compareArray(actual, expected, "property getters not called");
+  },
+
+  /*
+   * observeProperty(calls, object, propertyName, value):
+   *
+   * Defines an own property @object.@propertyName with value @value, that
+   * will log any calls to its accessors to the array @calls.
+   */
+  observeProperty(calls, object, propertyName, value, objectName = "") {
+    Object.defineProperty(object, propertyName, {
+      get() {
+        calls.push(`get ${formatPropertyName(propertyName, objectName)}`);
+        return value;
+      },
+      set() {
+        calls.push(`set ${formatPropertyName(propertyName, objectName)}`);
+      }
+    });
+  },
+
+  /*
+   * observeMethod(calls, object, propertyName, value):
+   *
+   * Defines an own property @object.@propertyName with value @value, that
+   * will log any calls of @value to the array @calls.
+   */
+  observeMethod(calls, object, propertyName, objectName = "") {
+    const method = object[propertyName];
+    object[propertyName] = function () {
+      calls.push(`call ${formatPropertyName(propertyName, objectName)}`);
+      return method.apply(object, arguments);
+    };
+  },
+
+  /*
+   * Used for substituteMethod to indicate default behavior instead of a
+   * substituted value
+   */
+  SUBSTITUTE_SKIP: SKIP_SYMBOL,
+
+  /*
+   * substituteMethod(object, propertyName, values):
+   *
+   * Defines an own property @object.@propertyName that will, for each
+   * subsequent call to the method previously defined as
+   * @object.@propertyName:
+   *  - Call the method, if no more values remain
+   *  - Call the method, if the value in @values for the corresponding call
+   *    is SUBSTITUTE_SKIP
+   *  - Otherwise, return the corresponding value in @value
+   */
+  substituteMethod(object, propertyName, values) {
+    let calls = 0;
+    const method = object[propertyName];
+    object[propertyName] = function () {
+      if (calls >= values.length) {
+        return method.apply(object, arguments);
+      } else if (values[calls] === SKIP_SYMBOL) {
+        calls++;
+        return method.apply(object, arguments);
+      } else {
+        return values[calls++];
+      }
+    };
+  },
+
+  /*
+   * propertyBagObserver():
+   * Returns an object that behaves like the given propertyBag but tracks Get
+   * and Has operations on any of its properties, by appending messages to an
+   * array. If the value of a property in propertyBag is a primitive, the value
+   * of the returned object's property will additionally be a
+   * TemporalHelpers.toPrimitiveObserver that will track calls to its toString
+   * and valueOf methods in the same array. This is for the purpose of testing
+   * order of operations that are observable from user code. objectName is used
+   * in the log.
+   * If skipToPrimitive is given, it must be an array of property keys. Those
+   * properties will not have a TemporalHelpers.toPrimitiveObserver returned,
+   * and instead just be returned directly.
+   */
+  propertyBagObserver(calls, propertyBag, objectName, skipToPrimitive) {
+    return new Proxy(propertyBag, {
+      ownKeys(target) {
+        calls.push(`ownKeys ${objectName}`);
+        return Reflect.ownKeys(target);
+      },
+      getOwnPropertyDescriptor(target, key) {
+        calls.push(`getOwnPropertyDescriptor ${formatPropertyName(key, objectName)}`);
+        return Reflect.getOwnPropertyDescriptor(target, key);
+      },
+      get(target, key, receiver) {
+        calls.push(`get ${formatPropertyName(key, objectName)}`);
+        const result = Reflect.get(target, key, receiver);
+        if (result === undefined) {
+          return undefined;
+        }
+        if ((result !== null && typeof result === "object") || typeof result === "function") {
+          return result;
+        }
+        if (skipToPrimitive && skipToPrimitive.indexOf(key) >= 0) {
+          return result;
+        }
+        return TemporalHelpers.toPrimitiveObserver(calls, result, `${formatPropertyName(key, objectName)}`);
+      },
+      has(target, key) {
+        calls.push(`has ${formatPropertyName(key, objectName)}`);
+        return Reflect.has(target, key);
+      },
+    });
+  },
+
+  /*
+   * Returns an object that will append logs of any Gets or Calls of its valueOf
+   * or toString properties to the array calls. Both valueOf and toString will
+   * return the actual primitiveValue. propertyName is used in the log.
+   */
+  toPrimitiveObserver(calls, primitiveValue, propertyName) {
+    return {
+      get valueOf() {
+        calls.push(`get ${propertyName}.valueOf`);
+        return function () {
+          calls.push(`call ${propertyName}.valueOf`);
+          return primitiveValue;
+        };
+      },
+      get toString() {
+        calls.push(`get ${propertyName}.toString`);
+        return function () {
+          calls.push(`call ${propertyName}.toString`);
+          if (primitiveValue === undefined) return undefined;
+          return primitiveValue.toString();
+        };
+      },
+    };
+  },
+
+  /*
+   * An object containing further methods that return arrays of ISO strings, for
+   * testing parsers.
+   */
+  ISO: {
+    /*
+     * PlainMonthDay strings that are not valid.
+     */
+    plainMonthDayStringsInvalid() {
+      return [
+        "11-18junk",
+        "11-18[u-ca=gregory]",
+        "11-18[u-ca=hebrew]",
+        "11-18[U-CA=iso8601]",
+        "11-18[u-CA=iso8601]",
+        "11-18[FOO=bar]",
+        "-999999-01-01[u-ca=gregory]",
+        "-999999-01-01[u-ca=chinese]",
+        "+999999-01-01[u-ca=gregory]",
+        "+999999-01-01[u-ca=chinese]",
+      ];
+    },
+
+    /*
+     * PlainMonthDay strings that are valid and that should produce October 1st.
+     */
+    plainMonthDayStringsValid() {
+      return [
+        "10-01",
+        "1001",
+        "1965-10-01",
+        "1976-10-01T152330.1+00:00",
+        "19761001T15:23:30.1+00:00",
+        "1976-10-01T15:23:30.1+0000",
+        "1976-10-01T152330.1+0000",
+        "19761001T15:23:30.1+0000",
+        "19761001T152330.1+00:00",
+        "19761001T152330.1+0000",
+        "+001976-10-01T152330.1+00:00",
+        "+0019761001T15:23:30.1+00:00",
+        "+001976-10-01T15:23:30.1+0000",
+        "+001976-10-01T152330.1+0000",
+        "+0019761001T15:23:30.1+0000",
+        "+0019761001T152330.1+00:00",
+        "+0019761001T152330.1+0000",
+        "1976-10-01T15:23:00",
+        "1976-10-01T15:23",
+        "1976-10-01T15",
+        "1976-10-01",
+        "--10-01",
+        "--1001",
+        "-999999-10-01",
+        "-999999-10-01[u-ca=iso8601]",
+        "+999999-10-01",
+        "+999999-10-01[u-ca=iso8601]",
+      ];
+    },
+
+    /*
+     * PlainTime strings that may be mistaken for PlainMonthDay or
+     * PlainYearMonth strings, and so require a time designator.
+     */
+    plainTimeStringsAmbiguous() {
+      const ambiguousStrings = [
+        "2021-12",  // ambiguity between YYYY-MM and HHMM-UU
+        "2021-12[-12:00]",  // ditto, TZ does not disambiguate
+        "1214",     // ambiguity between MMDD and HHMM
+        "0229",     //   ditto, including MMDD that doesn't occur every year
+        "1130",     //   ditto, including DD that doesn't occur in every month
+        "12-14",    // ambiguity between MM-DD and HH-UU
+        "12-14[-14:00]",  // ditto, TZ does not disambiguate
+        "202112",   // ambiguity between YYYYMM and HHMMSS
+        "202112[UTC]",  // ditto, TZ does not disambiguate
+      ];
+      // Adding a calendar annotation to one of these strings must not cause
+      // disambiguation in favour of time.
+      const stringsWithCalendar = ambiguousStrings.map((s) => s + "[u-ca=iso8601]");
+      return ambiguousStrings.concat(stringsWithCalendar);
+    },
+
+    /*
+     * PlainTime strings that are of similar form to PlainMonthDay and
+     * PlainYearMonth strings, but are not ambiguous due to components that
+     * aren't valid as months or days.
+     */
+    plainTimeStringsUnambiguous() {
+      return [
+        "2021-13",          // 13 is not a month
+        "202113",           //   ditto
+        "2021-13[-13:00]",  //   ditto
+        "202113[-13:00]",   //   ditto
+        "0000-00",          // 0 is not a month
+        "000000",           //   ditto
+        "0000-00[UTC]",     //   ditto
+        "000000[UTC]",      //   ditto
+        "1314",             // 13 is not a month
+        "13-14",            //   ditto
+        "1232",             // 32 is not a day
+        "0230",             // 30 is not a day in February
+        "0631",             // 31 is not a day in June
+        "0000",             // 0 is neither a month nor a day
+        "00-00",            //   ditto
+      ];
+    },
+
+    /*
+     * PlainYearMonth-like strings that are not valid.
+     */
+    plainYearMonthStringsInvalid() {
+      return [
+        "2020-13",
+        "1976-11[u-ca=gregory]",
+        "1976-11[u-ca=hebrew]",
+        "1976-11[U-CA=iso8601]",
+        "1976-11[u-CA=iso8601]",
+        "1976-11[FOO=bar]",
+        "+999999-01",
+        "-999999-01",
+      ];
+    },
+
+    /*
+     * PlainYearMonth-like strings that are valid and should produce November
+     * 1976 in the ISO 8601 calendar.
+     */
+    plainYearMonthStringsValid() {
+      return [
+        "1976-11",
+        "1976-11-10",
+        "1976-11-01T09:00:00+00:00",
+        "1976-11-01T00:00:00+05:00",
+        "197611",
+        "+00197611",
+        "1976-11-18T15:23:30.1-02:00",
+        "1976-11-18T152330.1+00:00",
+        "19761118T15:23:30.1+00:00",
+        "1976-11-18T15:23:30.1+0000",
+        "1976-11-18T152330.1+0000",
+        "19761118T15:23:30.1+0000",
+        "19761118T152330.1+00:00",
+        "19761118T152330.1+0000",
+        "+001976-11-18T152330.1+00:00",
+        "+0019761118T15:23:30.1+00:00",
+        "+001976-11-18T15:23:30.1+0000",
+        "+001976-11-18T152330.1+0000",
+        "+0019761118T15:23:30.1+0000",
+        "+0019761118T152330.1+00:00",
+        "+0019761118T152330.1+0000",
+        "1976-11-18T15:23",
+        "1976-11-18T15",
+        "1976-11-18",
+      ];
+    },
+
+    /*
+     * PlainYearMonth-like strings that are valid and should produce November of
+     * the ISO year -9999.
+     */
+    plainYearMonthStringsValidNegativeYear() {
+      return [
+        "-009999-11",
+      ];
+    },
+  }
+};
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/year/arithmetic-year.js b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/year/arithmetic-year.js
index c3d136cf40729..684a7f4a9b27c 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/year/arithmetic-year.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDate/prototype/year/arithmetic-year.js
@@ -103,7 +103,7 @@ const tests = {
     [{ era: "bce", eraYear: 2, monthCode: "M06", day: 14 }, -1],
     [{ era: "bce", eraYear: 1, monthCode: "M12", day: 3 }, 0],
     [{ era: "ce", eraYear: 1, monthCode: "M07", day: 26 }, 1],
-    [{ era: "meiji", eraYear: 1, monthCode: "M12", day: 31 }, 1868],
+    [{ era: "meiji", eraYear: 6, monthCode: "M12", day: 31 }, 1873],
     [{ era: "taisho", eraYear: 1, monthCode: "M12", day: 31 }, 1912],
     [{ era: "showa", eraYear: 1, monthCode: "M12", day: 31 }, 1926],
     [{ era: "heisei", eraYear: 1, monthCode: "M12", day: 31 }, 1989],
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/canonicalize-calendar.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/canonicalize-calendar.js
index f7d68eb49bae7..8ebcea74679b9 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/canonicalize-calendar.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/canonicalize-calendar.js
@@ -1,5 +1,5 @@
 // |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2024 Igalia, S.L. All rights reserved.
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
@@ -8,7 +8,12 @@ description: Calendar ID is canonicalized
 features: [Temporal]
 ---*/
 
-const result = new Temporal.PlainDateTime(2024, 7, 2, 12, 34, 56, 987, 654, 321, "islamicc");
+var result = new Temporal.PlainDateTime(2024, 7, 2, 12, 34, 56, 987, 654, 321, "islamicc");
 assert.sameValue(result.calendarId, "islamic-civil", "calendar ID is canonicalized");
 
+// May need to be removed in the future.
+// See https://github.com/tc39/ecma402/issues/285
+result = new Temporal.PlainDateTime(2024, 7, 2, 12, 34, 56, 987, 654, 321, "ethiopic-amete-alem");
+assert.sameValue(result.calendarId, "ethioaa", "calendar ID is canonicalized");
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/compare/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/compare/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/compare/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/compare/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/calendar-invalid-era-with-era-year.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/calendar-invalid-era-with-era-year.js
new file mode 100644
index 0000000000000..e783c093ea262
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/calendar-invalid-era-with-era-year.js
@@ -0,0 +1,34 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.from
+description: RangeError thrown if era is invalid for this calendar with year absent and eraYear present
+features: [Temporal]
+---*/
+
+const calendarsWithEras = [
+  "buddhist",
+  "coptic",
+  "ethioaa",
+  "ethiopic",
+  "gregory",
+  "hebrew",
+  "indian",
+  "islamic-civil",
+  "islamic-tbla",
+  "islamic-umalqura",
+  "japanese",
+  "persian",
+  "roc",
+];
+
+calendarsWithEras.forEach((calendar) => {
+  // "xyz" is not a valid era in any supported calendar
+  assert.throws(RangeError,
+    () => Temporal.PlainDateTime.from({ month: 1, day: 1, hour: 12, minute: 34, era: "xyz", eraYear: 2025, calendar }),
+    `xyz is not a valid era in calendar ${calendar}`);
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/calendar-invalid-era.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/calendar-invalid-era.js
new file mode 100644
index 0000000000000..9b951422bc73c
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/calendar-invalid-era.js
@@ -0,0 +1,45 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.from
+description: RangeError thrown if era is invalid for this calendar
+features: [Temporal]
+---*/
+
+const calendarsWithEras = [
+  "buddhist",
+  "coptic",
+  "ethioaa",
+  "ethiopic",
+  "gregory",
+  "hebrew",
+  "indian",
+  "islamic-civil",
+  "islamic-tbla",
+  "islamic-umalqura",
+  "japanese",
+  "persian",
+  "roc",
+];
+
+const calendarsWithoutEras = [
+  "chinese",
+  "dangi",
+];
+
+calendarsWithEras.forEach((calendar) => {
+  // "xyz" is not a valid era in any supported calendar
+  assert.throws(RangeError,
+    () => Temporal.PlainDateTime.from({ year: 2025, month: 1, day: 1, hour: 12, minute: 34, era: "xyz", eraYear: 2025, calendar }),
+    `xyz is not a valid era in calendar ${calendar}`);
+});
+
+calendarsWithoutEras.forEach((calendar) => {
+  // era is ignored
+  const result = Temporal.PlainDateTime.from({ year: 2025, month: 1, day: 1, hour: 12, minute: 34, era: "xyz", eraYear: 2025, calendar });
+  assert.sameValue(result instanceof Temporal.PlainDateTime, true, `era should be ignored for calendar ${calendar}`);
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/era-boundary-japanese.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/era-boundary-japanese.js
index 2290b083f2f9c..6fb344cf10edb 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/era-boundary-japanese.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/era-boundary-japanese.js
@@ -116,6 +116,24 @@ TemporalHelpers.assertPlainDateTime(
   1868, 10, "M10", 22, 12, 34, 0, 0, 0, 0, "Meiji 1 resolves to CE 1868 before era start date",
   "ce", 1868);
 
+const meiji1AfterStart = Temporal.PlainDateTime.from({ era: "meiji", eraYear: 1, monthCode: "M10", day: 23, hour: 12, minute: 34, calendar }, options);
+TemporalHelpers.assertPlainDateTime(
+  meiji1AfterStart,
+  1868, 10, "M10", 23, 12, 34, 0, 0, 0, 0, "Meiji 1 still resolves to CE 1868 after era start date",
+  "ce", 1868);
+
+const meiji5 = Temporal.PlainDateTime.from({ era: "meiji", eraYear: 5, monthCode: "M12", day: 31, hour: 12, minute: 34, calendar }, options);
+TemporalHelpers.assertPlainDateTime(
+  meiji5,
+  1872, 12, "M12", 31, 12, 34, 0, 0, 0, 0, "Meiji 5 resolves to CE 1872",
+  "ce", 1872);
+
+const ce1873 = Temporal.PlainDateTime.from({ era: "ce", eraYear: 1873, monthCode: "M01", day: 1, hour: 12, minute: 34, calendar }, options);
+TemporalHelpers.assertPlainDateTime(
+  ce1873,
+  1873, 1, "M01", 1, 12, 34, 0, 0, 0, 0, "CE 1873 resolves to Meiji 6",
+  "meiji", 6);
+
 const meiji0 = Temporal.PlainDateTime.from({ era: "meiji", eraYear: 0, monthCode: "M10", day: 23, hour: 12, minute: 34, calendar }, options);
 TemporalHelpers.assertPlainDateTime(
   meiji0,
@@ -128,12 +146,6 @@ TemporalHelpers.assertPlainDateTime(
   1866, 10, "M10", 23, 12, 34, 0, 0, 0, 0, "Meiji -1 resolves to CE 1866",
   "ce", 1866);
 
-const ce1868AfterStart = Temporal.PlainDateTime.from({ era: "ce", eraYear: 1868, monthCode: "M10", day: 23, hour: 12, minute: 34, calendar }, options);
-TemporalHelpers.assertPlainDateTime(
-  ce1868AfterStart,
-  1868, 10, "M10", 23, 12, 34, 0, 0, 0, 0, "CE 1868 resolves to Meiji 1 after era start date",
-  "meiji", 1);
-
 const ce0 = Temporal.PlainDateTime.from({ era: "ce", eraYear: 0, monthCode: "M01", day: 1, hour: 12, minute: 34, calendar }, options);
 TemporalHelpers.assertPlainDateTime(
   ce0,
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/era-japanese.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/era-japanese.js
index b67ac1e333aa1..444ce8f466e13 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/era-japanese.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/era-japanese.js
@@ -16,7 +16,7 @@ const reiwa = Temporal.PlainDateTime.from({ era: "reiwa", eraYear: 2, month: 1,
 const heisei = Temporal.PlainDateTime.from({ era: "heisei", eraYear: 2, month: 1, day: 1, hour: 12, minute: 34,  calendar });
 const showa = Temporal.PlainDateTime.from({ era: "showa", eraYear: 2, month: 1, day: 1, hour: 12, minute: 34,  calendar });
 const taisho = Temporal.PlainDateTime.from({ era: "taisho", eraYear: 2, month: 1, day: 1, hour: 12, minute: 34,  calendar });
-const meiji = Temporal.PlainDateTime.from({ era: "meiji", eraYear: 2, month: 1, day: 1, hour: 12, minute: 34,  calendar });
+const meiji = Temporal.PlainDateTime.from({ era: "meiji", eraYear: 6, month: 1, day: 1, hour: 12, minute: 34,  calendar });
 const ce = Temporal.PlainDateTime.from({ era: "ce", eraYear: 1000, month: 1, day: 1, hour: 12, minute: 34,  calendar });
 const bce = Temporal.PlainDateTime.from({ era: "bce", eraYear: 1, month: 1, day: 1, hour: 12, minute: 34,  calendar });
 
@@ -28,7 +28,7 @@ TemporalHelpers.assertPlainDateTime(showa, 1927, 1, "M01", 1, 12, 34, 0, 0, 0, 0
 
 TemporalHelpers.assertPlainDateTime(taisho, 1913, 1, "M01", 1, 12, 34, 0, 0, 0, 0,  `${taisho}`, "taisho", 2);
 
-TemporalHelpers.assertPlainDateTime(meiji, 1869, 1, "M01", 1, 12, 34, 0, 0, 0, 0,  `${meiji}`, "meiji", 2);
+TemporalHelpers.assertPlainDateTime(meiji, 1873, 1, "M01", 1, 12, 34, 0, 0, 0, 0,  `${meiji}`, "meiji", 6);
 
 TemporalHelpers.assertPlainDateTime(ce, 1000, 1, "M01", 1, 12, 34, 0, 0, 0, 0,  `${ce} (CE)`, "ce", 1000);
 
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/invalid-month-codes-hebrew.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/invalid-month-codes-hebrew.js
index 635ff59ae50d8..bc95bdbf71959 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/invalid-month-codes-hebrew.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/invalid-month-codes-hebrew.js
@@ -10,10 +10,16 @@ features: [Temporal, Intl.Era-monthcode]
 
 const calendar = "hebrew";
 
+// 5779 is a leap year
 assert.throws(RangeError, () => {
   Temporal.PlainDateTime.from({ year: 5779, monthCode: "M13", day: 1, hour: 12, minute: 34, calendar });
 }, "M13 should not be a valid month code");
 
+// 5781 is a common year
+assert.throws(RangeError, () => {
+  Temporal.PlainDateTime.from({ year: 5781, monthCode: "M13", day: 1, hour: 12, minute: 34, calendar });
+}, "M13 should not be a valid month code");
+
 // Invalid leap months: e.g. M02L
 for (var i = 1; i <= 12; i++) {
   if (i === 5)
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/from/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/add/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/add/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/add/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/add/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/equals/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/equals/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/equals/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/equals/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/monthCode/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/monthCode/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/monthCode/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/monthCode/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/since/era-boundary-japanese.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/since/era-boundary-japanese.js
index 69f1430cb7269..52d25a72ecca0 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/since/era-boundary-japanese.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/since/era-boundary-japanese.js
@@ -14,9 +14,9 @@ const options = { overflow: "reject" };
 
 const bce1 = Temporal.PlainDateTime.from({ era: "bce", eraYear: 1, monthCode: "M06", day: 1, hour: 12, minute: 34, calendar }, options);
 const ce1 = Temporal.PlainDateTime.from({ era: "ce", eraYear: 1, monthCode: "M06", day: 1, hour: 12, minute: 34, calendar }, options);
-const ce1868 = Temporal.PlainDateTime.from({ era: "ce", eraYear: 1868, monthCode: "M10", day: 22, hour: 12, minute: 34, calendar }, options);
-const meiji1 = Temporal.PlainDateTime.from({ era: "meiji", eraYear: 1, monthCode: "M10", day: 23, hour: 12, minute: 34, calendar}, options);
-const meiji5 = Temporal.PlainDateTime.from({ era: "meiji", eraYear: 5, monthCode: "M01", day: 15, hour: 12, minute: 34, calendar }, options);
+const ce1872 = Temporal.PlainDateTime.from({ era: "ce", eraYear: 1872, monthCode: "M12", day: 31, hour: 12, minute: 34, calendar }, options);
+const meiji6 = Temporal.PlainDateTime.from({ era: "meiji", eraYear: 6, monthCode: "M01", day: 1, hour: 12, minute: 34, calendar}, options);
+const meiji7 = Temporal.PlainDateTime.from({ era: "meiji", eraYear: 7, monthCode: "M01", day: 15, hour: 12, minute: 34, calendar }, options);
 const meiji45 = Temporal.PlainDateTime.from({ era: "meiji", eraYear: 45, monthCode: "M05", day: 19, hour: 12, minute: 34, calendar }, options);
 const taisho1 = Temporal.PlainDateTime.from({ era: "taisho", eraYear: 1, monthCode: "M08", day: 9, hour: 12, minute: 34, calendar }, options);
 const taisho6 = Temporal.PlainDateTime.from({ era: "taisho", eraYear: 6, monthCode: "M03", day: 15, hour: 12, minute: 34, calendar }, options);
@@ -97,18 +97,16 @@ const tests = [
     [0, 7, 0, 10, "7mo 10d from Taisho 15 July 20 to Showa 1 December 30"],
     [0, 7, 0, 10, "7mo 10d from Taisho 15 July 20 to Showa 1 December 30"],
   ],
-  // From Meiji 5 (1872) to Taisho 6 (1917) - crossing era boundary
-  // Note that contemporarily January 15 1872 would have been Meiji 4 in the
-  // pre-1873 lunisolar calendar, but the spec-mandated behaviour is proleptic
+  // From Meiji 7 (1874) to Taisho 6 (1917) - crossing era boundary
   [
-    meiji5, taisho6,
-    [-45, -2, 0, 0, "-45y -2mo backwards from Meiji 5 January to Taisho 6 March"],
-    [0, -542, 0, 0, "-542mo backwards from Meiji 5 January to Taisho 6 March"],
+    meiji7, taisho6,
+    [-43, -2, 0, 0, "-43y -2mo backwards from Meiji 7 January to Taisho 6 March"],
+    [0, -518, 0, 0, "-518mo backwards from Meiji 7 January to Taisho 6 March"],
   ],
   [
-    taisho6, meiji5,
-    [45, 2, 0, 0, "45y 2mo from Meiji 5 January to Taisho 6 March"],
-    [0, 542, 0, 0, "542mo from Meiji 5 January to Taisho 6 March"],
+    taisho6, meiji7,
+    [43, 2, 0, 0, "43y 2mo from Meiji 7 January to Taisho 6 March"],
+    [0, 518, 0, 0, "518mo from Meiji 7 January to Taisho 6 March"],
   ],
   // Within same year but different eras
   [
@@ -121,16 +119,16 @@ const tests = [
     [0, 2, 0, 21, "2mo 21d from Meiji 45 May 19 to Taisho 1 August 9"],
     [0, 2, 0, 21, "2mo 21d from Meiji 45 May 19 to Taisho 1 August 9"],
   ],
-  // Last pre-Meiji day to first day of Meiji era
+  // Last pre-solar-calendar CE day to first solar-calendar day of Meiji era
   [
-    ce1868, meiji1,
-    [0, 0, 0, -1, "backwards from day before Meiji era to first day"],
-    [0, 0, 0, -1, "backwards from day before Meiji era to first day"],
+    ce1872, meiji6,
+    [0, 0, 0, -1, "backwards from day before solar Meiji era to first day"],
+    [0, 0, 0, -1, "backwards from day before solar Meiji era to first day"],
   ],
   [
-    meiji1, ce1868,
-    [0, 0, 0, 1, "from day before Meiji era to first day"],
-    [0, 0, 0, 1, "from day before Meiji era to first day"],
+    meiji6, ce1872,
+    [0, 0, 0, 1, "from day before solar Meiji era to first day"],
+    [0, 0, 0, 1, "from day before solar Meiji era to first day"],
   ],
   // CE-BCE boundary
   [
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/since/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/since/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/since/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/since/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/since/wrapping-at-end-of-month-chinese.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/since/wrapping-at-end-of-month-chinese.js
index c25d4deb5b497..8cf8e37da1a1c 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/since/wrapping-at-end-of-month-chinese.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/since/wrapping-at-end-of-month-chinese.js
@@ -10,18 +10,19 @@ features: [Temporal, Intl.Era-monthcode]
 ---*/
 
 const calendar = "chinese";
+const options = { overflow: "reject" };
 
 // Difference between end of 30-day month to end of following 29-day month
 {
-  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M06", day: 29, hour: 12, minute: 34, calendar });
+  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M06", day: 29, hour: 12, minute: 34, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }, options).since(end, { largestUnit }),
       0, -1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M05-29 (30d) to M06-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }, options).since(end, { largestUnit }),
       0, 0, 0, -29, 0, 0, 0, 0, 0, 0,
       `M05-30 to M06-29 is 29 days, not one month (${largestUnit})`
     );
@@ -30,15 +31,15 @@ const calendar = "chinese";
 
 // Difference between end of 30-day M04 to end of 29-day M04L
 {
-  const end = Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04L", day: 29, hour: 12, minute: 34, calendar });
+  const end = Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04L", day: 29, hour: 12, minute: 34, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04", day: 29, hour: 12, minute: 34, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04", day: 29, hour: 12, minute: 34, calendar }, options).since(end, { largestUnit }),
       0, -1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M04-29 (30d) to M04L-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04", day: 30, hour: 12, minute: 34, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04", day: 30, hour: 12, minute: 34, calendar }, options).since(end, { largestUnit }),
       0, 0, 0, -29, 0, 0, 0, 0, 0, 0,
       `M04-30 to M04L-29 (29d) is 29 days, not one month (${largestUnit})`
     );
@@ -48,15 +49,15 @@ const calendar = "chinese";
 // Difference between end of 30-day month to end of not-immediately-following
 // 29-day month
 {
-  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, calendar });
+  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M04", day: 29, hour: 12, minute: 34, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M04", day: 29, hour: 12, minute: 34, calendar }, options).since(end, { largestUnit }),
       0, -5, 0, 0, 0, 0, 0, 0, 0, 0,
       `M04-29 (30d) to M09-29 (29d) is 5 months (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M04", day: 30, hour: 12, minute: 34, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M04", day: 30, hour: 12, minute: 34, calendar }, options).since(end, { largestUnit }),
       0, -4, 0, -29, 0, 0, 0, 0, 0, 0,
       `M04-30 to M09-29 (29d) is 4 months 29 days, not 5 months (${largestUnit})`
     );
@@ -66,27 +67,112 @@ const calendar = "chinese";
 // Difference between end of 30-day month in one year to 29-day month in later
 // year
 {
-  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, calendar });
+  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }, options);
   TemporalHelpers.assertDuration(
-    Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }).since(end, { largestUnit: "months" }),
+    start1.since(end, { largestUnit: "months" }),
     0, -29, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 29 days"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }).since(end, { largestUnit: "years" }),
+    start1.since(end, { largestUnit: "years" }),
     -2, -4, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 2 years, 4 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }).since(end, { largestUnit: "months" }),
+    start2.since(end, { largestUnit: "months" }),
     0, -28, 0, -29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 28 months, 29 days, not 29 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }).since(end, { largestUnit: "years" }),
+    start2.since(end, { largestUnit: "years" }),
     -2, -3, 0, -29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 2 years, 3 months, 29 days, not 2 years 4 months"
   );
 }
 
+// Difference between end of 30-day common month and end of the same month with
+// 29 days in a later year
+{
+  const end = Temporal.PlainDateTime.from({ year: 2019, monthCode: "M02", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 2018, monthCode: "M02", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 2018, monthCode: "M02", day: 30, hour: 12, minute: 34, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 1 year"
+  );
+}
+
+// Difference between end of 30-day leap month and end of the same leap month
+// with 29 days in a later year
+{
+  const end = Temporal.PlainDateTime.from({ year: 2025, monthCode: "M06L", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 2017, monthCode: "M06L", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 2017, monthCode: "M06L", day: 30, hour: 12, minute: 34, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -99, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2025-M06L-29 is 99 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2025-M06L-29 is 8 years"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -98, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2025-M06L-29 is 98 months 29 days, not 98 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    -7, -12, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2025-M06L-29 is 7 years 12 months 29 days, not 8 years"
+  );
+}
+
+// Case where both the month and day are not constrained
+{
+  const end = Temporal.PlainDateTime.from({ year: 2018, monthCode: "M06", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 2017, monthCode: "M06L", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 2017, monthCode: "M06L", day: 30, hour: 12, minute: 34, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2018-M06-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2018-M06-29 is 12 months, not 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2018-M06-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2018-M06-29 is 11 months 29 days, not 1 year"
+  );
+}
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/since/wrapping-at-end-of-month-dangi.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/since/wrapping-at-end-of-month-dangi.js
index 5552a020a8b3d..4ce8bdfcb8488 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/since/wrapping-at-end-of-month-dangi.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/since/wrapping-at-end-of-month-dangi.js
@@ -10,18 +10,19 @@ features: [Temporal, Intl.Era-monthcode]
 ---*/
 
 const calendar = "dangi";
+const options = { overflow: "reject" };
 
 // Difference between end of 30-day month to end of following 29-day month
 {
-  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M06", day: 29, hour: 12, minute: 34, calendar });
+  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M06", day: 29, hour: 12, minute: 34, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }, options).since(end, { largestUnit }),
       0, -1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M05-29 (30d) to M06-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }, options).since(end, { largestUnit }),
       0, 0, 0, -29, 0, 0, 0, 0, 0, 0,
       `M05-30 to M06-29 is 29 days, not one month (${largestUnit})`
     );
@@ -30,15 +31,15 @@ const calendar = "dangi";
 
 // Difference between end of 30-day M04 to end of 29-day M04L
 {
-  const end = Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04L", day: 29, hour: 12, minute: 34, calendar });
+  const end = Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04L", day: 29, hour: 12, minute: 34, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04", day: 29, hour: 12, minute: 34, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04", day: 29, hour: 12, minute: 34, calendar }, options).since(end, { largestUnit }),
       0, -1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M04-29 (30d) to M04L-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04", day: 30, hour: 12, minute: 34, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04", day: 30, hour: 12, minute: 34, calendar }, options).since(end, { largestUnit }),
       0, 0, 0, -29, 0, 0, 0, 0, 0, 0,
       `M04-30 to M04L-29 (29d) is 29 days, not one month (${largestUnit})`
     );
@@ -48,15 +49,15 @@ const calendar = "dangi";
 // Difference between end of 30-day month to end of not-immediately-following
 // 29-day month
 {
-  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, calendar });
+  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }, options).since(end, { largestUnit }),
       0, -4, 0, 0, 0, 0, 0, 0, 0, 0,
       `M05-29 (30d) to M09-29 (29d) is 4 months (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }).since(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }, options).since(end, { largestUnit }),
       0, -3, 0, -29, 0, 0, 0, 0, 0, 0,
       `M05-30 to M09-29 (29d) is 3 months 29 days, not 4 months (${largestUnit})`
     );
@@ -66,27 +67,112 @@ const calendar = "dangi";
 // Difference between end of 30-day month in one year to 29-day month in later
 // year
 {
-  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, calendar });
+  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }, options);
   TemporalHelpers.assertDuration(
-    Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }).since(end, { largestUnit: "months" }),
+    start1.since(end, { largestUnit: "months" }),
     0, -29, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 29 days"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }).since(end, { largestUnit: "years" }),
+    start1.since(end, { largestUnit: "years" }),
     -2, -4, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 2 years, 4 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }).since(end, { largestUnit: "months" }),
+    start2.since(end, { largestUnit: "months" }),
     0, -28, 0, -29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 28 months, 29 days, not 29 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }).since(end, { largestUnit: "years" }),
+    start2.since(end, { largestUnit: "years" }),
     -2, -3, 0, -29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 2 years, 3 months, 29 days, not 2 years 4 months"
   );
 }
 
+// Difference between end of 30-day common month and end of the same month with
+// 29 days in a later year
+{
+  const end = Temporal.PlainDateTime.from({ year: 2019, monthCode: "M02", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 2018, monthCode: "M02", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 2018, monthCode: "M02", day: 30, hour: 12, minute: 34, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 1 year"
+  );
+}
+
+// Difference between end of 30-day leap month and end of the same leap month
+// with 29 days in a later year
+{
+  const end = Temporal.PlainDateTime.from({ year: 1987, monthCode: "M06L", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 1979, monthCode: "M06L", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 1979, monthCode: "M06L", day: 30, hour: 12, minute: 34, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -99, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-29 to 1987-M06L-29 is 99 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-29 to 1987-M06L-29 is 8 years"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -98, 0, -29, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-30 to 1987-M06L-29 is 98 months 29 days, not 98 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    -7, -12, 0, -29, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-30 to 1987-M06L-29 is 7 years 12 months 29 days, not 8 years"
+  );
+}
+
+// Case where both the month and day are not constrained
+{
+  const end = Temporal.PlainDateTime.from({ year: 1956, monthCode: "M03", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 1955, monthCode: "M03L", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 1955, monthCode: "M03L", day: 30, hour: 12, minute: 34, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-29 to 1956-M03-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-29 to 1956-M03-29 is 12 months, not 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-30 to 1956-M03-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-30 to 1956-M03-29 is 11 months 29 days, not 1 year"
+  );
+}
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/since/wrapping-at-end-of-month-hebrew.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/since/wrapping-at-end-of-month-hebrew.js
new file mode 100644
index 0000000000000..c1794ac9d58ff
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/since/wrapping-at-end-of-month-hebrew.js
@@ -0,0 +1,177 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.prototype.since
+description: Tests balancing of days to months at end of month (Hebrew calendar)
+includes: [temporalHelpers.js]
+features: [Temporal, Intl.Era-monthcode]
+---*/
+
+const calendar = "hebrew";
+const options = { overflow: "reject" };
+
+// 5784 is a leap year.
+
+// 30-day months: 01, 05, 05L, 07, 09, 11
+// 29-day months: 04, 06, 08, 10, 12
+//
+// Cheshvan and Kislev (02, 03) have 29 or 30 days, independent of leap years.
+// Deficient - Cheshvan and Kislev have 29 days
+// Regular - Cheshvan has 29 days, Kislev 30
+// Complete - Cheshvan and Kislev have 30 days
+//
+// Some recent years of each type: 
+// 5778 - regular common year
+// 5779 - complete leap year
+// 5781 - deficient common year
+// 5782 - regular leap year
+// 5783 - complete common year
+// 5784 - deficient leap year
+
+// Difference between end of longer month to end of following shorter month
+{
+  const end = Temporal.PlainDateTime.from({ year: 5783, monthCode: "M08", day: 29, hour: 12, minute: 34, calendar }, options);
+  for (const largestUnit of ["years", "months"]) {
+    TemporalHelpers.assertDuration(
+      Temporal.PlainDateTime.from({ year: 5783, monthCode: "M07", day: 29, hour: 12, minute: 34, calendar }, options).since(end, { largestUnit }),
+      0, -1, 0, 0, 0, 0, 0, 0, 0, 0,
+      `Nisan 29th to Iyar 29th is one month (${largestUnit})`
+    );
+    TemporalHelpers.assertDuration(
+      Temporal.PlainDateTime.from({ year: 5783, monthCode: "M07", day: 30, hour: 12, minute: 34, calendar }, options).since(end, { largestUnit }),
+      0, 0, 0, -29, 0, 0, 0, 0, 0, 0,
+      `Nisan 30th to Iyar 29th is 29 days, not one month (${largestUnit})`
+    );
+  }
+}
+
+// Difference between end of longer month to end of not-immediately-following
+// shorter month
+{
+  const end = Temporal.PlainDateTime.from({ year: 5783, monthCode: "M12", day: 29, hour: 12, minute: 34, calendar }, options);
+  for (const largestUnit of ["years", "months"]) {
+    TemporalHelpers.assertDuration(
+      Temporal.PlainDateTime.from({ year: 5783, monthCode: "M09", day: 29, hour: 12, minute: 34, calendar }, options).since(end, { largestUnit }),
+      0, -3, 0, 0, 0, 0, 0, 0, 0, 0,
+      `Sivan 29th to Elul 29th is 3 months (${largestUnit})`
+    );
+    TemporalHelpers.assertDuration(
+      Temporal.PlainDateTime.from({ year: 5783, monthCode: "M09", day: 30, hour: 12, minute: 34, calendar }, options).since(end, { largestUnit }),
+      0, -2, 0, -29, 0, 0, 0, 0, 0, 0,
+      `Sivan 30th to Elul 29th is 2 months 29 days, not 3 months (${largestUnit})`
+    );
+  }
+}
+
+// Difference between end of longer month in one year to shorter month in
+// later year
+{
+  const end = Temporal.PlainDateTime.from({ year: 5786, monthCode: "M04", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 5783, monthCode: "M11", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 5783, monthCode: "M11", day: 30, hour: 12, minute: 34, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -30, 0, 0, 0, 0, 0, 0, 0, 0,
+    "Av 29th 5783 to Tevet 29th 5786 is 30 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -2, -5, 0, 0, 0, 0, 0, 0, 0, 0,
+    "Av 29th 5783 to Tevet 29th 5786 is 2 years, 5 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -29, 0, -29, 0, 0, 0, 0, 0, 0,
+    "Av 30th 5783 to Tevet 29th 5786 is 29 months, 29 days, not 30 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    -2, -4, 0, -29, 0, 0, 0, 0, 0, 0,
+    "Av 30th 5783 to Tevet 29th 5786 is 2 years, 4 months, 29 days, not 2 years 5 months"
+  );
+}
+
+// Difference between 30 Kislev and day 29 of 29-day Kislev in a later year
+{
+  const end = Temporal.PlainDateTime.from({ year: 5784, monthCode: "M02", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 5783, monthCode: "M02", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 5783, monthCode: "M02", day: 30, hour: 12, minute: 34, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Kislev 5783 to 29th Kislev 5784 (deficient year) is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Kislev 5783 to 29th Kislev 5784 (deficient year) is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "30th Kislev 5783 to 29th Kislev 5784 (deficient year) is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "30th Kislev 5783 to 29th Kislev 5784 (deficient year) is 11 months 29 days, not 1 year"
+  );
+}
+
+// Difference between 30 Cheshvan and day 29 of 29-day Cheshvan in a later year
+{
+  const end = Temporal.PlainDateTime.from({ year: 5784, monthCode: "M03", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 5783, monthCode: "M03", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 5783, monthCode: "M03", day: 30, hour: 12, minute: 34, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "30th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "30th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 11 months 29 days, not 1 year"
+  );
+}
+
+// Case where both the month and day are not constrained
+{
+  const end = Temporal.PlainDateTime.from({ year: 5785, monthCode: "M06", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 5784, monthCode: "M05L", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 5784, monthCode: "M05L", day: 30, hour: 12, minute: 34, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -13, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Adar I 5784 to 29th Adar 5785 is 13 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Adar I 5784 to 29th Adar 5785 is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -12, 0, -29, 0, 0, 0, 0, 0, 0,
+    "30th Adar I 5784 to 29th Adar 5785 is 12 months 29 days, not 13 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -12, 0, -29, 0, 0, 0, 0, 0, 0,
+    "30th Adar I 5784 to 29th Adar 5785 is 12 months 29 days, not 1 year"
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/subtract/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/subtract/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/subtract/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/subtract/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/toLocaleString/datestyle-and-timestyle.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/toLocaleString/datestyle-and-timestyle.js
new file mode 100644
index 0000000000000..245f2b72c1526
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/toLocaleString/datestyle-and-timestyle.js
@@ -0,0 +1,15 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.prototype.tolocalestring
+description: Using both dateStyle and timeStyle should not throw
+features: [Temporal]
+---*/
+
+const item = new Temporal.PlainDateTime(2000, 5, 2, 0, 0, 0, 0, 0, 0);
+var result = item.toLocaleString("en", { dateStyle: "full", timeStyle: "full" });
+assert.sameValue(result.includes(":00"), true, "using both dateStyle and timeStyle should not throw");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/toLocaleString/hourcycle.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/toLocaleString/hourcycle.js
new file mode 100644
index 0000000000000..be557d2387fc6
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/toLocaleString/hourcycle.js
@@ -0,0 +1,35 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.prototype.tolocalestring
+description: Hour cycle should be correctly set when defaults are used
+features: [Temporal]
+---*/
+
+const output0 = "00:00:00";
+const output11 = "0:00:00";
+const output12 = "12:00:00";
+const output24 = "24:00:00";
+
+const item = new Temporal.PlainDateTime(2000, 5, 2, 0, 0, 0, 0, 0, 0);
+var result = item.toLocaleString("en", { hour12: false, timeZone: "UTC" });
+assert.sameValue(result.includes(output0), true, `output for hour12: false should include ${output0}`);
+
+result = item.toLocaleString("en", { hour12: true, timeZone: "UTC" });
+assert.sameValue(result.includes(output12), true, `output for hour12: true should include ${output12}`);
+
+result = item.toLocaleString("en", { hourCycle: "h23", timeZone: "UTC" });
+assert.sameValue(result.includes(output0), true, `output for hourCycle: h23 should include ${output0}`);
+
+result = item.toLocaleString("en", { hourCycle: "h24", timeZone: "UTC" });
+assert.sameValue(result.includes(output24), true, `output for hourCycle: h24 should include ${output24}`);
+
+result = item.toLocaleString("en", { hourCycle: "h11", timeZone: "UTC" });
+assert.sameValue(result.includes(output11), true, `output for hourCycle: h11 should include ${output11}`);
+
+result = item.toLocaleString("en", { hourCycle: "h12", timeZone: "UTC" });
+assert.sameValue(result.includes(output12), true, `output for hourCycle: h12 should include ${output12}`);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/toString/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/toString/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/toString/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/toString/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/toZonedDateTime/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/toZonedDateTime/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/toZonedDateTime/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/toZonedDateTime/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/adjusted-dates.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/adjusted-dates.js
new file mode 100644
index 0000000000000..41a9550c8013e
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/adjusted-dates.js
@@ -0,0 +1,19 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.prototype.until
+description: A case where date-times are internally adjusted to have the same date component
+includes: [temporalHelpers.js]
+features: [Temporal]
+---*/
+
+for (const largestUnit of ['years', 'months', 'weeks', 'days', 'hours']) {
+  const d1 = new Temporal.PlainDateTime(2026, 1, 6, 11, 2, 0, 0, 0, 0, "gregory");
+  const d2 = new Temporal.PlainDateTime(2026, 1, 7, 9, 2, 0, 0, 0, 0, "gregory");
+  TemporalHelpers.assertDuration(d1.until(d2, { largestUnit }),
+    0, 0, 0, 0, 22, 0, 0, 0, 0, 0, `differencing ${d1} and ${d2}`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/era-boundary-japanese.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/era-boundary-japanese.js
index 399d4577012ae..a5bc839fe69b9 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/era-boundary-japanese.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/era-boundary-japanese.js
@@ -14,9 +14,9 @@ const options = { overflow: "reject" };
 
 const bce1 = Temporal.PlainDateTime.from({ era: "bce", eraYear: 1, monthCode: "M06", day: 1, hour: 12, minute: 34, calendar }, options);
 const ce1 = Temporal.PlainDateTime.from({ era: "ce", eraYear: 1, monthCode: "M06", day: 1, hour: 12, minute: 34, calendar }, options);
-const ce1868 = Temporal.PlainDateTime.from({ era: "ce", eraYear: 1868, monthCode: "M10", day: 22, hour: 12, minute: 34, calendar }, options);
-const meiji1 = Temporal.PlainDateTime.from({ era: "meiji", eraYear: 1, monthCode: "M10", day: 23, hour: 12, minute: 34, calendar}, options);
-const meiji5 = Temporal.PlainDateTime.from({ era: "meiji", eraYear: 5, monthCode: "M01", day: 15, hour: 12, minute: 34, calendar }, options);
+const ce1872 = Temporal.PlainDateTime.from({ era: "ce", eraYear: 1872, monthCode: "M12", day: 31, hour: 12, minute: 34, calendar }, options);
+const meiji6 = Temporal.PlainDateTime.from({ era: "meiji", eraYear: 6, monthCode: "M01", day: 1, hour: 12, minute: 34, calendar}, options);
+const meiji7 = Temporal.PlainDateTime.from({ era: "meiji", eraYear: 7, monthCode: "M01", day: 15, hour: 12, minute: 34, calendar }, options);
 const meiji45 = Temporal.PlainDateTime.from({ era: "meiji", eraYear: 45, monthCode: "M05", day: 19, hour: 12, minute: 34, calendar }, options);
 const taisho1 = Temporal.PlainDateTime.from({ era: "taisho", eraYear: 1, monthCode: "M08", day: 9, hour: 12, minute: 34, calendar }, options);
 const taisho6 = Temporal.PlainDateTime.from({ era: "taisho", eraYear: 6, monthCode: "M03", day: 15, hour: 12, minute: 34, calendar }, options);
@@ -97,18 +97,16 @@ const tests = [
     [0, -7, 0, -10, "-7mo -10d backwards from Taisho 15 July 20 to Showa 1 December 30"],
     [0, -7, 0, -10, "-7mo -10d backwards from Taisho 15 July 20 to Showa 1 December 30"],
   ],
-  // From Meiji 5 (1872) to Taisho 6 (1917) - crossing era boundary
-  // Note that contemporarily January 15 1872 would have been Meiji 4 in the
-  // pre-1873 lunisolar calendar, but the spec-mandated behaviour is proleptic
+  // From Meiji 7 (1874) to Taisho 6 (1917) - crossing era boundary
   [
-    meiji5, taisho6,
-    [45, 2, 0, 0, "45y 2mo from Meiji 5 January to Taisho 6 March"],
-    [0, 542, 0, 0, "542mo from Meiji 5 January to Taisho 6 March"],
+    meiji7, taisho6,
+    [43, 2, 0, 0, "43y 2mo from Meiji 7 January to Taisho 6 March"],
+    [0, 518, 0, 0, "518mo from Meiji 7 January to Taisho 6 March"],
   ],
   [
-    taisho6, meiji5,
-    [-45, -2, 0, 0, "-45y -2mo backwards from Meiji 5 January to Taisho 6 March"],
-    [0, -542, 0, 0, "-542mo backwards from Meiji 5 January to Taisho 6 March"],
+    taisho6, meiji7,
+    [-43, -2, 0, 0, "-43y -2mo backwards from Meiji 7 January to Taisho 6 March"],
+    [0, -518, 0, 0, "-518mo backwards from Meiji 7 January to Taisho 6 March"],
   ],
   // Within same year but different eras
   [
@@ -121,16 +119,16 @@ const tests = [
     [0, -2, 0, -21, "-2mo -21d backwards from Meiji 45 May 19 to Taisho 1 August 9"],
     [0, -2, 0, -21, "-2mo -21d backwards from Meiji 45 May 19 to Taisho 1 August 9"],
   ],
-  // Last pre-Meiji day to first day of Meiji era
+  // Last pre-solar-calendar CE day to first solar-calendar day of Meiji era
   [
-    ce1868, meiji1,
-    [0, 0, 0, 1, "from day before Meiji era to first day"],
-    [0, 0, 0, 1, "from day before Meiji era to first day"],
+    ce1872, meiji6,
+    [0, 0, 0, 1, "from day before solar Meiji era to first day"],
+    [0, 0, 0, 1, "from day before solar Meiji era to first day"],
   ],
   [
-    meiji1, ce1868,
-    [0, 0, 0, -1, "backwards from day before Meiji era to first day"],
-    [0, 0, 0, -1, "backwards from day before Meiji era to first day"],
+    meiji6, ce1872,
+    [0, 0, 0, -1, "backwards from day before solar Meiji era to first day"],
+    [0, 0, 0, -1, "backwards from day before solar Meiji era to first day"],
   ],
   // CE-BCE boundary
   [
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/wrapping-at-end-of-month-chinese.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/wrapping-at-end-of-month-chinese.js
index 1544c93e1a01a..22e2557f98ca8 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/wrapping-at-end-of-month-chinese.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/wrapping-at-end-of-month-chinese.js
@@ -10,18 +10,19 @@ features: [Temporal, Intl.Era-monthcode]
 ---*/
 
 const calendar = "chinese";
+const options = { overflow: "reject" };
 
 // Difference between end of 30-day month to end of following 29-day month
 {
-  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M06", day: 29, hour: 12, minute: 34, calendar });
+  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M06", day: 29, hour: 12, minute: 34, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }, options).until(end, { largestUnit }),
       0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M05-29 (30d) to M06-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }, options).until(end, { largestUnit }),
       0, 0, 0, 29, 0, 0, 0, 0, 0, 0,
       `M05-30 to M06-29 is 29 days, not one month (${largestUnit})`
     );
@@ -30,15 +31,15 @@ const calendar = "chinese";
 
 // Difference between end of 30-day M04 to end of 29-day M04L
 {
-  const end = Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04L", day: 29, hour: 12, minute: 34, calendar });
+  const end = Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04L", day: 29, hour: 12, minute: 34, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04", day: 29, hour: 12, minute: 34, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04", day: 29, hour: 12, minute: 34, calendar }, options).until(end, { largestUnit }),
       0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M04-29 (30d) to M04L-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04", day: 30, hour: 12, minute: 34, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04", day: 30, hour: 12, minute: 34, calendar }, options).until(end, { largestUnit }),
       0, 0, 0, 29, 0, 0, 0, 0, 0, 0,
       `M04-30 to M04L-29 (29d) is 29 days, not one month (${largestUnit})`
     );
@@ -48,15 +49,15 @@ const calendar = "chinese";
 // Difference between end of 30-day month to end of not-immediately-following
 // 29-day month
 {
-  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, calendar });
+  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M04", day: 29, hour: 12, minute: 34, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M04", day: 29, hour: 12, minute: 34, calendar }, options).until(end, { largestUnit }),
       0, 5, 0, 0, 0, 0, 0, 0, 0, 0,
       `M04-29 (30d) to M09-29 (29d) is 5 months (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M04", day: 30, hour: 12, minute: 34, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M04", day: 30, hour: 12, minute: 34, calendar }, options).until(end, { largestUnit }),
       0, 4, 0, 29, 0, 0, 0, 0, 0, 0,
       `M04-30 to M09-29 (29d) is 4 months 29 days, not 5 months (${largestUnit})`
     );
@@ -66,27 +67,112 @@ const calendar = "chinese";
 // Difference between end of 30-day month in one year to 29-day month in later
 // year
 {
-  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, calendar });
+  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }, options);
   TemporalHelpers.assertDuration(
-    Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }).until(end, { largestUnit: "months" }),
+    start1.until(end, { largestUnit: "months" }),
     0, 29, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 29 days"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }).until(end, { largestUnit: "years" }),
+    start1.until(end, { largestUnit: "years" }),
     2, 4, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 2 years, 4 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }).until(end, { largestUnit: "months" }),
+    start2.until(end, { largestUnit: "months" }),
     0, 28, 0, 29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 28 months, 29 days, not 29 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }).until(end, { largestUnit: "years" }),
+    start2.until(end, { largestUnit: "years" }),
     2, 3, 0, 29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 2 years, 3 months, 29 days, not 2 years 4 months"
   );
 }
 
+// Difference between end of 30-day common month and end of the same month with
+// 29 days in a later year
+{
+  const end = Temporal.PlainDateTime.from({ year: 2019, monthCode: "M02", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 2018, monthCode: "M02", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 2018, monthCode: "M02", day: 30, hour: 12, minute: 34, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 1 year"
+  );
+}
+
+// Difference between end of 30-day leap month and end of the same leap month
+// with 29 days in a later year
+{
+  const end = Temporal.PlainDateTime.from({ year: 2025, monthCode: "M06L", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 2017, monthCode: "M06L", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 2017, monthCode: "M06L", day: 30, hour: 12, minute: 34, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 99, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2025-M06L-29 is 99 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2025-M06L-29 is 8 years"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 98, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2025-M06L-29 is 98 months 29 days, not 98 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    7, 12, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2025-M06L-29 is 7 years 12 months 29 days, not 8 years"
+  );
+}
+
+// Case where both the month and day are not constrained
+{
+  const end = Temporal.PlainDateTime.from({ year: 2018, monthCode: "M06", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 2017, monthCode: "M06L", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 2017, monthCode: "M06L", day: 30, hour: 12, minute: 34, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2018-M06-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2018-M06-29 is 12 months, not 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2018-M06-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2018-M06-29 is 11 months 29 days, not 1 year"
+  );
+}
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/wrapping-at-end-of-month-dangi.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/wrapping-at-end-of-month-dangi.js
index 540e8f54a0540..1a47eb4e4897e 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/wrapping-at-end-of-month-dangi.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/wrapping-at-end-of-month-dangi.js
@@ -10,18 +10,19 @@ features: [Temporal, Intl.Era-monthcode]
 ---*/
 
 const calendar = "dangi";
+const options = { overflow: "reject" };
 
 // Difference between end of 30-day month to end of following 29-day month
 {
-  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M06", day: 29, hour: 12, minute: 34, calendar });
+  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M06", day: 29, hour: 12, minute: 34, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }, options).until(end, { largestUnit }),
       0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M05-29 (30d) to M06-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }, options).until(end, { largestUnit }),
       0, 0, 0, 29, 0, 0, 0, 0, 0, 0,
       `M05-30 to M06-29 is 29 days, not one month (${largestUnit})`
     );
@@ -30,15 +31,15 @@ const calendar = "dangi";
 
 // Difference between end of 30-day M04 to end of 29-day M04L
 {
-  const end = Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04L", day: 29, hour: 12, minute: 34, calendar });
+  const end = Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04L", day: 29, hour: 12, minute: 34, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04", day: 29, hour: 12, minute: 34, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04", day: 29, hour: 12, minute: 34, calendar }, options).until(end, { largestUnit }),
       0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M04-29 (30d) to M04L-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04", day: 30, hour: 12, minute: 34, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2020, monthCode: "M04", day: 30, hour: 12, minute: 34, calendar }, options).until(end, { largestUnit }),
       0, 0, 0, 29, 0, 0, 0, 0, 0, 0,
       `M04-30 to M04L-29 (29d) is 29 days, not one month (${largestUnit})`
     );
@@ -48,15 +49,15 @@ const calendar = "dangi";
 // Difference between end of 30-day month to end of not-immediately-following
 // 29-day month
 {
-  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, calendar });
+  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }, options).until(end, { largestUnit }),
       0, 4, 0, 0, 0, 0, 0, 0, 0, 0,
       `M05-29 (30d) to M09-29 (29d) is 4 months (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }).until(end, { largestUnit }),
+      Temporal.PlainDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }, options).until(end, { largestUnit }),
       0, 3, 0, 29, 0, 0, 0, 0, 0, 0,
       `M05-30 to M09-29 (29d) is 3 months 29 days, not 4 months (${largestUnit})`
     );
@@ -66,27 +67,112 @@ const calendar = "dangi";
 // Difference between end of 30-day month in one year to 29-day month in later
 // year
 {
-  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, calendar });
+  const end = Temporal.PlainDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }, options);
   TemporalHelpers.assertDuration(
-    Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }).until(end, { largestUnit: "months" }),
+    start1.until(end, { largestUnit: "months" }),
     0, 29, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 29 days"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, calendar }).until(end, { largestUnit: "years" }),
+    start1.until(end, { largestUnit: "years" }),
     2, 4, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 2 years, 4 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }).until(end, { largestUnit: "months" }),
+    start2.until(end, { largestUnit: "months" }),
     0, 28, 0, 29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 28 months, 29 days, not 29 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.PlainDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, calendar }).until(end, { largestUnit: "years" }),
+    start2.until(end, { largestUnit: "years" }),
     2, 3, 0, 29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 2 years, 3 months, 29 days, not 2 years 4 months"
   );
 }
 
+// Difference between end of 30-day common month and end of the same month with
+// 29 days in a later year
+{
+  const end = Temporal.PlainDateTime.from({ year: 2019, monthCode: "M02", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 2018, monthCode: "M02", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 2018, monthCode: "M02", day: 30, hour: 12, minute: 34, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 1 year"
+  );
+}
+
+// Difference between end of 30-day leap month and end of the same leap month
+// with 29 days in a later year
+{
+  const end = Temporal.PlainDateTime.from({ year: 1987, monthCode: "M06L", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 1979, monthCode: "M06L", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 1979, monthCode: "M06L", day: 30, hour: 12, minute: 34, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 99, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-29 to 1987-M06L-29 is 99 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-29 to 1987-M06L-29 is 8 years"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 98, 0, 29, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-30 to 1987-M06L-29 is 98 months 29 days, not 98 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    7, 12, 0, 29, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-30 to 1987-M06L-29 is 7 years 12 months 29 days, not 8 years"
+  );
+}
+
+// Case where both the month and day are not constrained
+{
+  const end = Temporal.PlainDateTime.from({ year: 1956, monthCode: "M03", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 1955, monthCode: "M03L", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 1955, monthCode: "M03L", day: 30, hour: 12, minute: 34, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-29 to 1956-M03-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-29 to 1956-M03-29 is 12 months, not 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-30 to 1956-M03-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-30 to 1956-M03-29 is 11 months 29 days, not 1 year"
+  );
+}
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/wrapping-at-end-of-month-hebrew.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/wrapping-at-end-of-month-hebrew.js
new file mode 100644
index 0000000000000..76b7cc03d3133
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/until/wrapping-at-end-of-month-hebrew.js
@@ -0,0 +1,177 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.prototype.until
+description: Tests balancing of days to months at end of month (Hebrew calendar)
+includes: [temporalHelpers.js]
+features: [Temporal, Intl.Era-monthcode]
+---*/
+
+const calendar = "hebrew";
+const options = { overflow: "reject" };
+
+// 5784 is a leap year.
+
+// 30-day months: 01, 05, 05L, 07, 09, 11
+// 29-day months: 04, 06, 08, 10, 12
+//
+// Cheshvan and Kislev (02, 03) have 29 or 30 days, independent of leap years.
+// Deficient - Cheshvan and Kislev have 29 days
+// Regular - Cheshvan has 29 days, Kislev 30
+// Complete - Cheshvan and Kislev have 30 days
+//
+// Some recent years of each type: 
+// 5778 - regular common year
+// 5779 - complete leap year
+// 5781 - deficient common year
+// 5782 - regular leap year
+// 5783 - complete common year
+// 5784 - deficient leap year
+
+// Difference between end of longer month to end of following shorter month
+{
+  const end = Temporal.PlainDateTime.from({ year: 5783, monthCode: "M08", day: 29, hour: 12, minute: 34, calendar }, options);
+  for (const largestUnit of ["years", "months"]) {
+    TemporalHelpers.assertDuration(
+      Temporal.PlainDateTime.from({ year: 5783, monthCode: "M07", day: 29, hour: 12, minute: 34, calendar }, options).until(end, { largestUnit }),
+      0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+      `Nisan 29th to Iyar 29th is one month (${largestUnit})`
+    );
+    TemporalHelpers.assertDuration(
+      Temporal.PlainDateTime.from({ year: 5783, monthCode: "M07", day: 30, hour: 12, minute: 34, calendar }, options).until(end, { largestUnit }),
+      0, 0, 0, 29, 0, 0, 0, 0, 0, 0,
+      `Nisan 30th to Iyar 29th is 29 days, not one month (${largestUnit})`
+    );
+  }
+}
+
+// Difference between end of longer month to end of not-immediately-following
+// shorter month
+{
+  const end = Temporal.PlainDateTime.from({ year: 5783, monthCode: "M12", day: 29, hour: 12, minute: 34, calendar }, options);
+  for (const largestUnit of ["years", "months"]) {
+    TemporalHelpers.assertDuration(
+      Temporal.PlainDateTime.from({ year: 5783, monthCode: "M09", day: 29, hour: 12, minute: 34, calendar }, options).until(end, { largestUnit }),
+      0, 3, 0, 0, 0, 0, 0, 0, 0, 0,
+      `Sivan 29th to Elul 29th is 3 months (${largestUnit})`
+    );
+    TemporalHelpers.assertDuration(
+      Temporal.PlainDateTime.from({ year: 5783, monthCode: "M09", day: 30, hour: 12, minute: 34, calendar }, options).until(end, { largestUnit }),
+      0, 2, 0, 29, 0, 0, 0, 0, 0, 0,
+      `Sivan 30th to Elul 29th is 2 months 29 days, not 3 months (${largestUnit})`
+    );
+  }
+}
+
+// Difference between end of longer month in one year to shorter month in
+// later year
+{
+  const end = Temporal.PlainDateTime.from({ year: 5786, monthCode: "M04", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 5783, monthCode: "M11", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 5783, monthCode: "M11", day: 30, hour: 12, minute: 34, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 30, 0, 0, 0, 0, 0, 0, 0, 0,
+    "Av 29th 5783 to Tevet 29th 5786 is 30 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    2, 5, 0, 0, 0, 0, 0, 0, 0, 0,
+    "Av 29th 5783 to Tevet 29th 5786 is 2 years, 5 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 29, 0, 29, 0, 0, 0, 0, 0, 0,
+    "Av 30th 5783 to Tevet 29th 5786 is 29 months, 29 days, not 30 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    2, 4, 0, 29, 0, 0, 0, 0, 0, 0,
+    "Av 30th 5783 to Tevet 29th 5786 is 2 years, 4 months, 29 days, not 2 years 5 months"
+  );
+}
+
+// Difference between 30 Kislev and day 29 of 29-day Kislev in a later year
+{
+  const end = Temporal.PlainDateTime.from({ year: 5784, monthCode: "M02", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 5783, monthCode: "M02", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 5783, monthCode: "M02", day: 30, hour: 12, minute: 34, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Kislev 5783 to 29th Kislev 5784 (deficient year) is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Kislev 5783 to 29th Kislev 5784 (deficient year) is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "30th Kislev 5783 to 29th Kislev 5784 (deficient year) is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "30th Kislev 5783 to 29th Kislev 5784 (deficient year) is 11 months 29 days, not 1 year"
+  );
+}
+
+// Difference between 30 Cheshvan and day 29 of 29-day Cheshvan in a later year
+{
+  const end = Temporal.PlainDateTime.from({ year: 5784, monthCode: "M03", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 5783, monthCode: "M03", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 5783, monthCode: "M03", day: 30, hour: 12, minute: 34, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "30th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "30th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 11 months 29 days, not 1 year"
+  );
+}
+
+// Case where both the month and day are not constrained
+{
+  const end = Temporal.PlainDateTime.from({ year: 5785, monthCode: "M06", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start1 = Temporal.PlainDateTime.from({ year: 5784, monthCode: "M05L", day: 29, hour: 12, minute: 34, calendar }, options);
+  const start2 = Temporal.PlainDateTime.from({ year: 5784, monthCode: "M05L", day: 30, hour: 12, minute: 34, calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 13, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Adar I 5784 to 29th Adar 5785 is 13 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Adar I 5784 to 29th Adar 5785 is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 12, 0, 29, 0, 0, 0, 0, 0, 0,
+    "30th Adar I 5784 to 29th Adar 5785 is 12 months 29 days, not 13 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 12, 0, 29, 0, 0, 0, 0, 0, 0,
+    "30th Adar I 5784 to 29th Adar 5785 is 12 months 29 days, not 1 year"
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/with/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/with/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/with/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/with/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/withCalendar/calendar-time-string.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/withCalendar/calendar-time-string.js
new file mode 100644
index 0000000000000..940f33aa02982
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/withCalendar/calendar-time-string.js
@@ -0,0 +1,37 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindatetime.prototype.withcalendar
+description: A time string is valid input for Calendar
+features: [Temporal]
+---*/
+
+const instance = Temporal.PlainDateTime.from({ year: 1976, month: 11, day: 18, hour: 12, minute: 34});
+
+const calendars = [
+  "buddhist",
+  "chinese",
+  "coptic",
+  "dangi",
+  "ethioaa",
+  "ethiopic",
+  "gregory",
+  "hebrew",
+  "indian",
+  "islamic-civil",
+  "islamic-tbla",
+  "islamic-umalqura",
+  "japanese",
+  "persian",
+  "roc",
+]
+
+calendars.forEach((cal) => {
+  const str = `T11:30[u-ca=${cal}]`;
+  const result = instance.withCalendar(str);
+  assert.sameValue(result.calendarId, cal, `Calendar created from string "${str}"`);
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-with-calendar.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/withCalendar/roundtrip-from-iso8601.js
similarity index 72%
rename from js/src/tests/test262/staging/Temporal/v8/plain-date-time-with-calendar.js
rename to js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/withCalendar/roundtrip-from-iso8601.js
index e620cd813716c..f31f9b25dbee0 100644
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-with-calendar.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/withCalendar/roundtrip-from-iso8601.js
@@ -3,18 +3,13 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-esid: pending
-description: >
-  Automatically ported from plain-date-time-with-calendar test
-  in V8's mjsunit test plain-date-time-with-calendar.js
+esid: sec-temporal.plaindatetime.prototype.withcalendar
+description: Converting to roc and back to iso8601 works as expeced.
 includes: [temporalHelpers.js]
 features: [Temporal]
 ---*/
 
 let d1 = new Temporal.PlainDateTime(1911, 10, 10, 4, 5, 6, 7, 8, 9);
-let badDateTime = { withCalendar: d1.withCalendar };
-assert.throws(TypeError, () => badDateTime.withCalendar('iso8601'));
-
 let d2 = d1.withCalendar('roc');
 assert.sameValue('roc', d2.calendarId);
 TemporalHelpers.assertPlainDateTime(d2, 0, 10, 'M10', 10, 4, 5, 6, 7, 8, 9, '', 'broc', 1);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/withCalendar/shell.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/withCalendar/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/withCalendar/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/withCalendar/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/year/arithmetic-year.js b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/year/arithmetic-year.js
index 692f13d6cc420..543f628beb8d0 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/year/arithmetic-year.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainDateTime/prototype/year/arithmetic-year.js
@@ -103,7 +103,7 @@ const tests = {
     [{ era: "bce", eraYear: 2, monthCode: "M06", day: 14 }, -1],
     [{ era: "bce", eraYear: 1, monthCode: "M12", day: 3 }, 0],
     [{ era: "ce", eraYear: 1, monthCode: "M07", day: 26 }, 1],
-    [{ era: "meiji", eraYear: 1, monthCode: "M12", day: 31 }, 1868],
+    [{ era: "meiji", eraYear: 6, monthCode: "M12", day: 31 }, 1873],
     [{ era: "taisho", eraYear: 1, monthCode: "M12", day: 31 }, 1912],
     [{ era: "showa", eraYear: 1, monthCode: "M12", day: 31 }, 1926],
     [{ era: "heisei", eraYear: 1, monthCode: "M12", day: 31 }, 1989],
diff --git a/js/src/tests/test262/intl402/Temporal/PlainMonthDay/canonicalize-calendar.js b/js/src/tests/test262/intl402/Temporal/PlainMonthDay/canonicalize-calendar.js
index 745aa3ff8b4dd..9ec8bfce2ac94 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainMonthDay/canonicalize-calendar.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainMonthDay/canonicalize-calendar.js
@@ -1,5 +1,5 @@
 // |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2024 Igalia, S.L. All rights reserved.
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
@@ -8,7 +8,12 @@ description: Calendar ID is canonicalized
 features: [Temporal]
 ---*/
 
-const result = new Temporal.PlainMonthDay(2, 11, "islamicc", 1972);
+var result = new Temporal.PlainMonthDay(2, 11, "islamicc", 1972);
 assert.sameValue(result.calendarId, "islamic-civil", "calendar ID is canonicalized");
 
+// May need to be removed in the future.
+// See https://github.com/tc39/ecma402/issues/285
+result = new Temporal.PlainMonthDay(2, 11, "ethiopic-amete-alem");
+assert.sameValue(result.calendarId, "ethioaa", "calendar ID is canonicalized");
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainMonthDay/from/shell.js b/js/src/tests/test262/intl402/Temporal/PlainMonthDay/from/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainMonthDay/from/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainMonthDay/from/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainMonthDay/prototype/equals/shell.js b/js/src/tests/test262/intl402/Temporal/PlainMonthDay/prototype/equals/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainMonthDay/prototype/equals/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainMonthDay/prototype/equals/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainMonthDay/prototype/monthCode/shell.js b/js/src/tests/test262/intl402/Temporal/PlainMonthDay/prototype/monthCode/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainMonthDay/prototype/monthCode/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainMonthDay/prototype/monthCode/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainMonthDay/prototype/toLocaleString/datestyle-and-timestyle.js b/js/src/tests/test262/intl402/Temporal/PlainMonthDay/prototype/toLocaleString/datestyle-and-timestyle.js
new file mode 100644
index 0000000000000..9f8822b13bf07
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainMonthDay/prototype/toLocaleString/datestyle-and-timestyle.js
@@ -0,0 +1,17 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainmonthday.prototype.tolocalestring
+description: Using timeStyle, even if dateStyle is present, should throw
+features: [Temporal]
+---*/
+
+const item = new Temporal.PlainMonthDay(1, 20, "gregory", 1972);
+
+assert.throws(TypeError, function() {
+  item.toLocaleString("en-u-ca-gregory", { dateStyle: "full", timeStyle: "full" });
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainMonthDay/prototype/toPlainDate/shell.js b/js/src/tests/test262/intl402/Temporal/PlainMonthDay/prototype/toPlainDate/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainMonthDay/prototype/toPlainDate/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainMonthDay/prototype/toPlainDate/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainMonthDay/prototype/toString/shell.js b/js/src/tests/test262/intl402/Temporal/PlainMonthDay/prototype/toString/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainMonthDay/prototype/toString/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainMonthDay/prototype/toString/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainTime/prototype/toLocaleString/datestyle-and-timestyle.js b/js/src/tests/test262/intl402/Temporal/PlainTime/prototype/toLocaleString/datestyle-and-timestyle.js
new file mode 100644
index 0000000000000..5e3e74b44ae8f
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainTime/prototype/toLocaleString/datestyle-and-timestyle.js
@@ -0,0 +1,17 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaintime.prototype.tolocalestring
+description: Using dateStyle, even if timeStyle is present, should throw
+features: [Temporal]
+---*/
+
+const item = new Temporal.PlainTime(0, 0);
+
+assert.throws(TypeError, function() {
+  item.toLocaleString("en", { dateStyle: "full", timeStyle: "full" });
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainTime/prototype/toLocaleString/hourcycle.js b/js/src/tests/test262/intl402/Temporal/PlainTime/prototype/toLocaleString/hourcycle.js
new file mode 100644
index 0000000000000..da2a405a131cf
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainTime/prototype/toLocaleString/hourcycle.js
@@ -0,0 +1,35 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaintime.prototype.tolocalestring
+description: Hour cycle should be correctly set when defaults are used
+features: [Temporal]
+---*/
+
+const output0 = "00:00:00";
+const output11 = "0:00:00";
+const output12 = "12:00:00";
+const output24 = "24:00:00";
+
+const item = new Temporal.PlainTime(0, 0);
+var result = item.toLocaleString("en", { hour12: false, timeZone: "UTC" });
+assert.sameValue(result.includes(output0), true, `output for hour12: false should include ${output0}`);
+
+result = item.toLocaleString("en", { hour12: true, timeZone: "UTC" });
+assert.sameValue(result.includes(output12), true, `output for hour12: true should include ${output12}`);
+
+result = item.toLocaleString("en", { hourCycle: "h23", timeZone: "UTC" });
+assert.sameValue(result.includes(output0), true, `output for hourCycle: h23 should include ${output0}`);
+
+result = item.toLocaleString("en", { hourCycle: "h24", timeZone: "UTC" });
+assert.sameValue(result.includes(output24), true, `output for hourCycle: h24 should include ${output24}`);
+
+result = item.toLocaleString("en", { hourCycle: "h11", timeZone: "UTC" });
+assert.sameValue(result.includes(output11), true, `output for hourCycle: h11 should include ${output11}`);
+
+result = item.toLocaleString("en", { hourCycle: "h12", timeZone: "UTC" });
+assert.sameValue(result.includes(output12), true, `output for hourCycle: h12 should include ${output12}`);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/canonicalize-calendar.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/canonicalize-calendar.js
index a66324321ab6f..d86151bbbf323 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/canonicalize-calendar.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/canonicalize-calendar.js
@@ -1,5 +1,5 @@
 // |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2024 Igalia, S.L. All rights reserved.
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
@@ -8,7 +8,12 @@ description: Calendar ID is canonicalized
 features: [Temporal]
 ---*/
 
-const result = new Temporal.PlainYearMonth(2024, 6, "islamicc", 8);
+var result = new Temporal.PlainYearMonth(2024, 6, "islamicc", 8);
 assert.sameValue(result.calendarId, "islamic-civil", "calendar ID is canonicalized");
 
+// May need to be removed in the future.
+// See https://github.com/tc39/ecma402/issues/285
+result = new Temporal.PlainYearMonth(2024, 6, "ethiopic-amete-alem");
+assert.sameValue(result.calendarId, "ethioaa", "calendar ID is canonicalized");
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/compare/shell.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/compare/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/compare/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/compare/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/era-boundary-japanese.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/era-boundary-japanese.js
index cab5a3305cee5..3c24fed282619 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/era-boundary-japanese.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/era-boundary-japanese.js
@@ -117,6 +117,24 @@ TemporalHelpers.assertPlainYearMonth(
   1868, 10, "M10", "Meiji 1 resolves to CE 1868 before era start date",
   "ce", 1868);
 
+const meiji1AfterStart = Temporal.PlainYearMonth.from({ era: "meiji", eraYear: 1, monthCode: "M11", calendar }, options);
+TemporalHelpers.assertPlainYearMonth(
+  meiji1AfterStart,
+  1868, 11, "M11", "Meiji 1 still resolves to CE 1868 after era start date",
+  "ce", 1868);
+
+const meiji5 = Temporal.PlainYearMonth.from({ era: "meiji", eraYear: 5, monthCode: "M12", calendar }, options);
+TemporalHelpers.assertPlainYearMonth(
+  meiji5,
+  1872, 12, "M12", "Meiji 5 resolves to CE 1872",
+  "ce", 1872);
+
+const ce1873 = Temporal.PlainYearMonth.from({ era: "ce", eraYear: 1873, monthCode: "M01", calendar }, options);
+TemporalHelpers.assertPlainYearMonth(
+  ce1873,
+  1873, 1, "M01", "CE 1873 resolves to Meiji 6",
+  "meiji", 6);
+
 const meiji0 = Temporal.PlainYearMonth.from({ era: "meiji", eraYear: 0, monthCode: "M10", calendar }, options);
 TemporalHelpers.assertPlainYearMonth(
   meiji0,
@@ -129,12 +147,6 @@ TemporalHelpers.assertPlainYearMonth(
   1866, 10, "M10", "Meiji -1 resolves to CE 1866",
   "ce", 1866);
 
-const ce1868AfterStart = Temporal.PlainYearMonth.from({ era: "ce", eraYear: 1868, monthCode: "M11", calendar }, options);
-TemporalHelpers.assertPlainYearMonth(
-  ce1868AfterStart,
-  1868, 11, "M11", "CE 1868 resolves to Meiji 1 after era start date",
-  "meiji", 1);
-
 const ce0 = Temporal.PlainYearMonth.from({ era: "ce", eraYear: 0, monthCode: "M01", calendar }, options);
 TemporalHelpers.assertPlainYearMonth(
   ce0,
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/era-japanese.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/era-japanese.js
index ab464ecfea4b8..6d6b9d42d343a 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/era-japanese.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/era-japanese.js
@@ -16,7 +16,7 @@ const reiwa = Temporal.PlainYearMonth.from({ era: "reiwa", eraYear: 2, month: 1,
 const heisei = Temporal.PlainYearMonth.from({ era: "heisei", eraYear: 2, month: 1,  calendar });
 const showa = Temporal.PlainYearMonth.from({ era: "showa", eraYear: 2, month: 1,  calendar });
 const taisho = Temporal.PlainYearMonth.from({ era: "taisho", eraYear: 2, month: 1,  calendar });
-const meiji = Temporal.PlainYearMonth.from({ era: "meiji", eraYear: 2, month: 1,  calendar });
+const meiji = Temporal.PlainYearMonth.from({ era: "meiji", eraYear: 6, month: 1,  calendar });
 const ce = Temporal.PlainYearMonth.from({ era: "ce", eraYear: 1000, month: 1,  calendar });
 const bce = Temporal.PlainYearMonth.from({ era: "bce", eraYear: 1, month: 1,  calendar });
 
@@ -28,7 +28,7 @@ TemporalHelpers.assertPlainYearMonth(showa, 1927, 1, "M01",  `${showa}`, "showa"
 
 TemporalHelpers.assertPlainYearMonth(taisho, 1913, 1, "M01",  `${taisho}`, "taisho", 2);
 
-TemporalHelpers.assertPlainYearMonth(meiji, 1869, 1, "M01",  `${meiji}`, "meiji", 2);
+TemporalHelpers.assertPlainYearMonth(meiji, 1873, 1, "M01",  `${meiji}`, "meiji", 6);
 
 TemporalHelpers.assertPlainYearMonth(ce, 1000, 1, "M01",  `${ce} (CE)`, "ce", 1000);
 
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/extreme-dates.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/extreme-dates.js
index 686c175b3520b..da98240448123 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/extreme-dates.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/extreme-dates.js
@@ -19,15 +19,15 @@ includes: [temporalHelpers.js]
 
 const testData = [
   ["buddhist", -271278, 5, "M05", "be", -271278, 1, 276303, 9, "M09", "be", 276303, 1],
-  ["coptic", -272099, 4, "M04", "am", -272099, 27, 275471, 5, "M05", "am", 275471, 23],
-  ["ethioaa", -266323, 4, "M04", "aa", -266323, 27, 281247, 5, "M05", "aa", 281247, 23],
-  ["ethiopic", -271823, 4, "M04", "aa", -266323, 27, 275747, 5, "M05", "am", 275747, 23],
+  ["coptic", -272099, 4, "M04", "am", -272099, 27, 275471, 6, "M06", "am", 275471, 22],
+  ["ethioaa", -266323, 4, "M04", "aa", -266323, 27, 281247, 6, "M06", "aa", 281247, 22],
+  ["ethiopic", -271823, 4, "M04", "aa", -266323, 27, 275747, 6, "M06", "am", 275747, 22],
   ["gregory", -271821, 5, "M05", "bce", 271822, 1, 275760, 9, "M09", "ce", 275760, 1],
   ["hebrew", -268058, 12, "M12", "am", -268058, 16, 279517, 10, "M09", "am", 279517, 3],
-  ["indian", -271899, 2, "M02", "shaka", -271899, 21, 275682, 6, "M06", "shaka", 275682, 23],
-  ["islamic-civil", -280804, 4, "M04", "bh", 280805, 29, 283583, 5, "M05", "ah", 283583, 22],
-  ["islamic-tbla", -280804, 4, "M04", "bh", 280805, 28, 283583, 5, "M05", "ah", 283583, 21],
-  ["islamic-umalqura", -280804, 4, "M04", "bh", 280805, 29, 283583, 5, "M05", "ah", 283583, 22],
+  ["indian", -271899, 2, "M02", "shaka", -271899, 21, 275682, 7, "M07", "shaka", 275682, 23],
+  ["islamic-civil", -280804, 4, "M04", "bh", 280805, 29, 283583, 6, "M06", "ah", 283583, 21],
+  ["islamic-tbla", -280804, 4, "M04", "bh", 280805, 28, 283583, 6, "M06", "ah", 283583, 20],
+  ["islamic-umalqura", -280804, 4, "M04", "bh", 280805, 29, 283583, 6, "M06", "ah", 283583, 21],
   ["japanese", -271821, 5, "M05", "bce", 271822, 1, 275760, 9, "M09", "reiwa", 273742, 1],
   ["persian", -272442, 2, "M02", "ap", -272442, 12, 275139, 7, "M07", "ap", 275139, 2],
   ["roc", -273732, 5, "M05", "broc", 273733, 1, 273849, 9, "M09", "roc", 273849, 1],
@@ -46,7 +46,6 @@ for (const [calendar, minYear, minMonth, minMonthCode, minEra, minEraYear, minIS
     minYear, minMonth, minMonthCode,
     `${calendar} minimum supported date`,
     minEra, minEraYear, minISODay);
-
   const max = Temporal.PlainYearMonth.from({
     calendar,
     year: maxYear,
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/extreme-unsupported-dates.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/extreme-unsupported-dates.js
new file mode 100644
index 0000000000000..4ce493581e5b1
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/extreme-unsupported-dates.js
@@ -0,0 +1,55 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plaindate.from
+description: from() throws for month before earlier supported month, and month after latest supported month
+features: [Temporal, Intl.Era-monthcode]
+---*/
+
+// Lunisolar/lunar calendars can't accurately predict celestial orbits for dates
+// far into the past/future. Skip `chinese` and `dangi`. `islamic-umalqura` is
+// okay because it is specified to fall back to `islamic-civil` outside the
+// range of accuracy.
+
+// Note that the earliest PlainYearMonth that can be constructed in a calendar
+// is the earliest month whose first day occurs after ISO -271821-04-19
+
+const testData = [
+  ["buddhist", -271278, 3, "M03", "be", -271278, 276303, 10, "M10", "be", 276303],
+  ["coptic", -272099, 3, "M03", "am", -272099, 275471, 7, "M07", "am", 275471],
+  ["ethioaa", -266323, 3, "M03", "aa", -266323, 281247, 7, "M07", "aa", 281247],
+  ["ethiopic", -271823, 3, "M03", "aa", -266323, 275747, 7, "M07", "am", 275747],
+  ["gregory", -271821, 3, "M03", "bce", 271822, 275760, 10, "M10", "ce", 275760],
+  ["hebrew", -268058, 10, "M10", "am", -268058, 279517, 11, "M11", "am", 279517],
+  ["indian", -271899, 1, "M01", "shaka", -271899, 275682, 8, "M08", "shaka", 275682],
+  ["islamic-civil", -280804, 3, "M03", "bh", 280805, 283583, 7, "M07", "ah", 283583],
+  ["islamic-tbla", -280804, 3, "M03", "bh", 280805, 283583, 7, "M07", "ah", 283583],
+  ["islamic-umalqura", -280804, 3, "M03", "bh", 280805, 283583, 7, "M07", "ah", 283583],
+  ["japanese", -271821, 3, "M03", "bce", 271822, 275760, 10, "M10", "reiwa", 273742],
+  ["persian", -272443, 12, "M12", "ap", -272443, 275139, 8, "M08", "ap", 275139],
+  ["roc", -273732, 3, "M03", "broc", 273733, 273849, 10, "M10", "roc", 273849],
+];
+
+for (const [calendar, minYear, minMonth, minMonthCode, minEra, minEraYear, maxYear, maxMonth, maxMonthCode, maxEra, maxEraYear] of testData) {
+  assert.throws(RangeError, () => Temporal.PlainYearMonth.from({
+    calendar,
+    year: minYear,
+    era: minEra,
+    eraYear: minEraYear,
+    month: minMonth,
+    monthCode: minMonthCode,
+  }), `calendar ${calendar}: month before min month should throw`);
+
+  assert.throws(RangeError, () => Temporal.PlainYearMonth.from({
+    calendar,
+    year: maxYear,
+    era: maxEra,
+    eraYear: maxEraYear,
+    month: maxMonth,
+    monthCode: maxMonthCode,
+  }), `calendar ${calendar}: month after max month should throw`);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/invalid-month-codes-hebrew.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/invalid-month-codes-hebrew.js
index a5c5831b41adb..e29d2af6dbe30 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/invalid-month-codes-hebrew.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/invalid-month-codes-hebrew.js
@@ -10,10 +10,16 @@ features: [Temporal, Intl.Era-monthcode]
 
 const calendar = "hebrew";
 
+// 5779 is a leap year
 assert.throws(RangeError, () => {
   Temporal.PlainYearMonth.from({ year: 5779, monthCode: "M13", calendar });
 }, "M13 should not be a valid month code");
 
+// 5781 is a common year
+assert.throws(RangeError, () => {
+  Temporal.PlainYearMonth.from({ year: 5781, monthCode: "M13", calendar });
+}, "M13 should not be a valid month code");
+
 // Invalid leap months: e.g. M02L
 for (var i = 1; i <= 12; i++) {
   if (i === 5)
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/reference-day-japanese.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/reference-day-japanese.js
index 509f16eabf4b8..aae8bdd5c4f4b 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/reference-day-japanese.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/reference-day-japanese.js
@@ -19,7 +19,7 @@ const result1 = Temporal.PlainYearMonth.from({calendar: "japanese", era: "heisei
 TemporalHelpers.assertPlainYearMonth(
   result1,
   1989, 1, "M01",
-  "era is corrected based on reference day (Showa begins on January 8)",
+  "era is corrected based on reference day (Heisei begins on January 8)",
   "showa", 64
 );
 
@@ -27,7 +27,7 @@ const result2 = Temporal.PlainYearMonth.from({calendar: "japanese", era: "showa"
 TemporalHelpers.assertPlainYearMonth(
   result2,
   1926, 12, "M12",
-  "era is corrected based on reference day (Taishō begins on December 25)",
+  "era is corrected based on reference day (Showa begins on December 25)",
   "taisho", 15
 );
 
@@ -35,7 +35,7 @@ const result3 = Temporal.PlainYearMonth.from({calendar: "japanese", era: "taisho
 TemporalHelpers.assertPlainYearMonth(
   result3,
   1912, 7, "M07",
-  "era is corrected based on reference day (Meiji begins on July 30)",
+  "era is corrected based on reference day (Taishō begins on July 30)",
   "meiji", 45
 );
 
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/shell.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/from/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-months-chinese.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-months-chinese.js
new file mode 100644
index 0000000000000..c1222c6c0ef2a
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-months-chinese.js
@@ -0,0 +1,323 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.add
+description: Arithmetic around leap months in the chinese calendar
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "chinese";
+const options = { overflow: "reject" };
+
+// Years
+
+const years1 = new Temporal.Duration(1);
+const years1n = new Temporal.Duration(-1);
+
+const leap193807L = Temporal.PlainYearMonth.from({ year: 1938, monthCode: "M07L", calendar }, options);
+const leap195205L = Temporal.PlainYearMonth.from({ year: 1952, monthCode: "M05L", calendar }, options);
+const leap196603L = Temporal.PlainYearMonth.from({ year: 1966, monthCode: "M03L", calendar }, options);
+const common200008 = Temporal.PlainYearMonth.from({ year: 2000, monthCode: "M08", calendar }, options);
+const common200108 = Temporal.PlainYearMonth.from({ year: 2001, monthCode: "M08", calendar }, options);
+const common201901 = Temporal.PlainYearMonth.from({ year: 2019, monthCode: "M01", calendar }, options);
+const common201904 = Temporal.PlainYearMonth.from({ year: 2019, monthCode: "M04", calendar }, options);
+const leap202004 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M04", calendar }, options);
+const leap202004L = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M04L", calendar }, options);
+const common202104 = Temporal.PlainYearMonth.from({ year: 2021, monthCode: "M04", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201901.add(years1),
+  2020, 1, "M01", "add 1 year from non-leap day",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap196603L.add(years1),
+  1967, 3, "M03", "Adding 1 year to leap month M03L lands in common-year M03 with overflow constrain",
+  undefined, undefined, null
+);
+
+assert.throws(RangeError, function () {
+  leap196603L.add(years1, options);
+}, "Adding 1 year to leap month rejects");
+
+TemporalHelpers.assertPlainYearMonth(
+  leap193807L.add(years1),
+  1939, 7, "M07", "Adding 1 year to leap month M07L on day 30 constrains to M07 day 29",
+  undefined, undefined, null
+);
+
+assert.throws(RangeError, function () {
+  leap193807L.add(years1, options);
+}, "Adding 1 year to leap month day 30 rejects");
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.add(years1, options),
+  2020, 4, "M04", "Adding 1 year to common-year M04 lands in leap-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004.add(years1, options),
+  2021, 4, "M04", "Adding 1 year to leap-year M04 lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2012, monthCode: "M04L", calendar }, options).add(new Temporal.Duration(8), options),
+  2020, 5, "M04L", "Adding years to go from one M04L to the next M04L",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200008.add(years1, options),
+  2001, 9, "M08", "Adding 1 year crossing leap month",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.add(new Temporal.Duration(2), options),
+  2021, 4, "M04", "Adding 2 years to common-year M04 crossing leap year lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201901.add(years1n),
+  2018, 1, "M01", "Subtracting 1 year from non-leap day",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap196603L.add(years1n),
+  1965, 3, "M03", "Subtracting 1 year from leap month M03L lands in common-year M03 with overflow constrain",
+  undefined, undefined, null
+);
+
+assert.throws(RangeError, function () {
+  leap196603L.add(years1n, options);
+}, "Subtracting 1 year from leap month rejects");
+
+TemporalHelpers.assertPlainYearMonth(
+  leap195205L.add(years1n),
+  1951, 5, "M05", "Subtracting 1 year from leap month M05L on day 30 constrains to M05 day 29",
+  undefined, undefined, null
+);
+
+assert.throws(RangeError, function () {
+  leap195205L.add(years1n, options);
+}, "Subtracting 1 year from leap month day 30 rejects");
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.add(years1n, options),
+  2020, 4, "M04", "Subtracting 1 year from common-year M04 lands in leap-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004.add(years1n, options),
+  2019, 4, "M04", "Subtracting 1 year from leap-year M04 lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004L.add(new Temporal.Duration(-8), options),
+  2012, 5, "M04L", "Subtracting years to go from one M04L to the previous M04L",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200108.add(years1n, options),
+  2000, 8, "M08", "Subtracting 1 year crossing leap month",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.add(new Temporal.Duration(-2), options),
+  2019, 4, "M04", "Subtracting 2 years from common-year M04 crossing leap year lands in common-year M04",
+  undefined, undefined, null
+);
+
+// Months
+
+const months1 = new Temporal.Duration(0, 1);
+const months1n = new Temporal.Duration(0, -1);
+const months12 = new Temporal.Duration(0, 12);
+const months12n = new Temporal.Duration(0, -12);
+const months13 = new Temporal.Duration(0, 13);
+const months13n = new Temporal.Duration(0, -13);
+
+const leap202003 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M03", calendar }, options);
+const leap202006 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M06", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 1947, monthCode: "M02L", calendar }, options).add(months1),
+  1947, 4, "M03", "add 1 month, starting at start of leap month",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 1955, monthCode: "M03L", calendar }, options).add(months1),
+  1955, 5, "M04", "add 1 month, starting at start of leap month with 30 days",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202003.add(months1),
+  2020, 4, "M04", "adding 1 month to M03 in leap year lands in M04 (not M04L)",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202003.add(new Temporal.Duration(0, 2)),
+  2020, 5, "M04L", "adding 2 months to M03 in leap year lands in M04L (leap month)",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202003.add(new Temporal.Duration(0, 3)),
+  2020, 6, "M05", "adding 3 months to M03 in leap year lands in M05 (not M06)",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.add(months12),
+  2020, 4, "M04", "Adding 12 months to common-year M04 lands in leap-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.add(months13),
+  2020, 5, "M04L", "Adding 13 months to common-year M04 lands in leap-year M04L",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004.add(months12),
+  2021, 3, "M03", "Adding 12 months to leap-year M04 lands in common-year M03",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004.add(months13),
+  2021, 4, "M04", "Adding 13 months to leap-year M04 lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004L.add(months12),
+  2021, 4, "M04", "Adding 12 months to M04L lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200008.add(new Temporal.Duration(1, 12), options),
+  2002, 8, "M08", "Adding 1y 12mo crossing leap month in the year part",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200108.add(new Temporal.Duration(2, 13), options),
+  2004, 9, "M08", "Adding 1y 13mo crossing leap month in the months part",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.add(new Temporal.Duration(0, 24)),
+  2021, 3, "M03", "Adding 24 months to common-year M04 crossing leap year with M04L, lands in common-year M03",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.add(new Temporal.Duration(0, 25)),
+  2021, 4, "M04", "Adding 25 months to common-year M04 crossing leap year with M04L, lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202006.add(months1n),
+  2020, 6, "M05", "Subtracting 1 month from M06 in leap year lands in M05",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202006.add(new Temporal.Duration(0, -2)),
+  2020, 5, "M04L", "Subtracting 2 months from M06 in leap year lands in M04L (leap month)",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202006.add(new Temporal.Duration(0, -3)),
+  2020, 4, "M04", "Subtracting 3 months from M06 in leap year lands in M04 (not M03)",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M05", calendar }, options).add(months1n),
+  2020, 5, "M04L", "Subtracting 1 month from M05 in leap year lands in M04L",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004L.add(months1n),
+  2020, 4, "M04", "Subtracting 1 month from M04L in calendar lands in M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.add(months12n),
+  2020, 5, "M04L", "Subtracting 12 months from common-year M04 lands in leap-year M04L",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.add(months13n),
+  2020, 4, "M04", "Subtracting 13 months from common-year M04 lands in leap-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004.add(months12n),
+  2019, 4, "M04", "Subtracting 12 months from leap-year M04 lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004L.add(months12n),
+  2019, 5, "M05", "Subtracting 12 months from M04L lands in common-year M05",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004L.add(months13n),
+  2019, 4, "M04", "Subtracting 13 months from M04L lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200108.add(new Temporal.Duration(-1, -12), options),
+  1999, 8, "M08", "Adding 1y 12mo crossing leap month in the year part",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200008.add(new Temporal.Duration(-2, -13), options),
+  1997, 8, "M08", "Adding 1y 13mo crossing leap month in the months part",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.add(new Temporal.Duration(0, -24)),
+  2019, 5, "M05", "Subtracting 24 months from common-year M04 crossing leap year with M04L, lands in common-year M05",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.add(new Temporal.Duration(0, -25)),
+  2019, 4, "M04", "Subtracting 25 months from common-year M04 crossing leap year with M04L, lands in common-year M04",
+  undefined, undefined, null
+);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-months-dangi.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-months-dangi.js
new file mode 100644
index 0000000000000..b8a0d63739e33
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-months-dangi.js
@@ -0,0 +1,323 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.add
+description: Arithmetic around leap months in the dangi calendar
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "dangi";
+const options = { overflow: "reject" };
+
+// Years
+
+const years1 = new Temporal.Duration(1);
+const years1n = new Temporal.Duration(-1);
+
+const leap193807L = Temporal.PlainYearMonth.from({ year: 1938, monthCode: "M07L", calendar }, options);
+const leap195205L = Temporal.PlainYearMonth.from({ year: 1952, monthCode: "M05L", calendar }, options);
+const leap196603L = Temporal.PlainYearMonth.from({ year: 1966, monthCode: "M03L", calendar }, options);
+const common200008 = Temporal.PlainYearMonth.from({ year: 2000, monthCode: "M08", calendar }, options);
+const common200108 = Temporal.PlainYearMonth.from({ year: 2001, monthCode: "M08", calendar }, options);
+const common201901 = Temporal.PlainYearMonth.from({ year: 2019, monthCode: "M01", calendar }, options);
+const common201904 = Temporal.PlainYearMonth.from({ year: 2019, monthCode: "M04", calendar }, options);
+const leap202004 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M04", calendar }, options);
+const leap202004L = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M04L", calendar }, options);
+const common202104 = Temporal.PlainYearMonth.from({ year: 2021, monthCode: "M04", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201901.add(years1),
+  2020, 1, "M01", "add 1 year from non-leap day",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap196603L.add(years1),
+  1967, 3, "M03", "Adding 1 year to leap month M03L lands in common-year M03 with overflow constrain",
+  undefined, undefined, null
+);
+
+assert.throws(RangeError, function () {
+  leap196603L.add(years1, options);
+}, "Adding 1 year to leap month rejects");
+
+TemporalHelpers.assertPlainYearMonth(
+  leap193807L.add(years1),
+  1939, 7, "M07", "Adding 1 year to leap month M07L on day 30 constrains to M07 day 29",
+  undefined, undefined, null
+);
+
+assert.throws(RangeError, function () {
+  leap193807L.add(years1, options);
+}, "Adding 1 year to leap month day 30 rejects");
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.add(years1, options),
+  2020, 4, "M04", "Adding 1 year to common-year M04 lands in leap-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004.add(years1, options),
+  2021, 4, "M04", "Adding 1 year to leap-year M04 lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2012, monthCode: "M03L", calendar }, options).add(new Temporal.Duration(-19), options),
+  1993, 4, "M03L", "Subtracting years to go from one M03L to the previous M03L",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200008.add(years1, options),
+  2001, 9, "M08", "Adding 1 year crossing leap month",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.add(new Temporal.Duration(2), options),
+  2021, 4, "M04", "Adding 2 years to common-year M04 crossing leap year lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201901.add(years1n),
+  2018, 1, "M01", "Subtracting 1 year from non-leap day",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap196603L.add(years1n),
+  1965, 3, "M03", "Subtracting 1 year from leap month M03L lands in common-year M03 with overflow constrain",
+  undefined, undefined, null
+);
+
+assert.throws(RangeError, function () {
+  leap196603L.add(years1n, options);
+}, "Subtracting 1 year from leap month rejects");
+
+TemporalHelpers.assertPlainYearMonth(
+  leap195205L.add(years1n),
+  1951, 5, "M05", "Subtracting 1 year from leap month M05L on day 30 constrains to M05 day 29",
+  undefined, undefined, null
+);
+
+assert.throws(RangeError, function () {
+  leap195205L.add(years1n, options);
+}, "Subtracting 1 year from leap month day 30 rejects");
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.add(years1n, options),
+  2020, 4, "M04", "Subtracting 1 year from common-year M04 lands in leap-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004.add(years1n, options),
+  2019, 4, "M04", "Subtracting 1 year from leap-year M04 lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2012, monthCode: "M03L", calendar }, options).add(new Temporal.Duration(-19), options),
+  1993, 4, "M03L", "Subtracting years to go from one M03L to the previous M03L",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200108.add(years1n, options),
+  2000, 8, "M08", "Subtracting 1 year crossing leap month",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.add(new Temporal.Duration(-2), options),
+  2019, 4, "M04", "Subtracting 2 years from common-year M04 crossing leap year lands in common-year M04",
+  undefined, undefined, null
+);
+
+// Months
+
+const months1 = new Temporal.Duration(0, 1);
+const months1n = new Temporal.Duration(0, -1);
+const months12 = new Temporal.Duration(0, 12);
+const months12n = new Temporal.Duration(0, -12);
+const months13 = new Temporal.Duration(0, 13);
+const months13n = new Temporal.Duration(0, -13);
+
+const leap202003 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M03", calendar }, options);
+const leap202006 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M06", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 1947, monthCode: "M02L", calendar }, options).add(months1),
+  1947, 4, "M03", "add 1 month, starting at start of leap month",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 1955, monthCode: "M03L", calendar }, options).add(months1),
+  1955, 5, "M04", "add 1 month, starting at start of leap month with 30 days",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202003.add(months1),
+  2020, 4, "M04", "adding 1 month to M03 in leap year lands in M04 (not M04L)",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202003.add(new Temporal.Duration(0, 2)),
+  2020, 5, "M04L", "adding 2 months to M03 in leap year lands in M04L (leap month)",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202003.add(new Temporal.Duration(0, 3)),
+  2020, 6, "M05", "adding 3 months to M03 in leap year lands in M05 (not M06)",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.add(months12),
+  2020, 4, "M04", "Adding 12 months to common-year M04 lands in leap-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.add(months13),
+  2020, 5, "M04L", "Adding 13 months to common-year M04 lands in leap-year M04L",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004.add(months12),
+  2021, 3, "M03", "Adding 12 months to leap-year M04 lands in common-year M03",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004.add(months13),
+  2021, 4, "M04", "Adding 13 months to leap-year M04 lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004L.add(months12),
+  2021, 4, "M04", "Adding 12 months to M04L lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200008.add(new Temporal.Duration(1, 12), options),
+  2002, 8, "M08", "Adding 1y 12mo crossing leap month in the year part",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200108.add(new Temporal.Duration(2, 13), options),
+  2004, 9, "M08", "Adding 1y 13mo crossing leap month in the months part",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.add(new Temporal.Duration(0, 24)),
+  2021, 3, "M03", "Adding 24 months to common-year M04 crossing leap year with M04L, lands in common-year M03",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.add(new Temporal.Duration(0, 25)),
+  2021, 4, "M04", "Adding 25 months to common-year M04 crossing leap year with M04L, lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202006.add(months1n),
+  2020, 6, "M05", "Subtracting 1 month from M06 in leap year lands in M05",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202006.add(new Temporal.Duration(0, -2)),
+  2020, 5, "M04L", "Subtracting 2 months from M06 in leap year lands in M04L (leap month)",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202006.add(new Temporal.Duration(0, -3)),
+  2020, 4, "M04", "Subtracting 3 months from M06 in leap year lands in M04 (not M03)",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M05", calendar }, options).add(months1n),
+  2020, 5, "M04L", "Subtracting 1 month from M05 in leap year lands in M04L",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004L.add(months1n),
+  2020, 4, "M04", "Subtracting 1 month from M04L in calendar lands in M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.add(months12n),
+  2020, 5, "M04L", "Subtracting 12 months from common-year M04 lands in leap-year M04L",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.add(months13n),
+  2020, 4, "M04", "Subtracting 13 months from common-year M04 lands in leap-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004.add(months12n),
+  2019, 4, "M04", "Subtracting 12 months from leap-year M04 lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004L.add(months12n),
+  2019, 5, "M05", "Subtracting 12 months from M04L lands in common-year M05",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004L.add(months13n),
+  2019, 4, "M04", "Subtracting 13 months from M04L lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200108.add(new Temporal.Duration(-1, -12), options),
+  1999, 8, "M08", "Adding 1y 12mo crossing leap month in the year part",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200008.add(new Temporal.Duration(-2, -13), options),
+  1997, 8, "M08", "Adding 1y 13mo crossing leap month in the months part",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.add(new Temporal.Duration(0, -24)),
+  2019, 5, "M05", "Subtracting 24 months from common-year M04 crossing leap year with M04L, lands in common-year M05",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.add(new Temporal.Duration(0, -25)),
+  2019, 4, "M04", "Subtracting 25 months from common-year M04 crossing leap year with M04L, lands in common-year M04",
+  undefined, undefined, null
+);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-months-hebrew.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-months-hebrew.js
new file mode 100644
index 0000000000000..af2203036eb3e
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-months-hebrew.js
@@ -0,0 +1,342 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.add
+description: Arithmetic around leap months in the hebrew calendar
+includes: [temporalHelpers.js]
+features: [Temporal, Intl.Era-monthcode]
+---*/
+
+const calendar = "hebrew";
+const options = { overflow: "reject" };
+
+// Years
+
+const years1 = new Temporal.Duration(1);
+const years1n = new Temporal.Duration(-1);
+const years2 = new Temporal.Duration(2);
+const years2n = new Temporal.Duration(-2);
+
+const leap1AdarI = Temporal.PlainYearMonth.from({ year: 5782, monthCode: "M05L", calendar }, options);
+const leap1AdarII = Temporal.PlainYearMonth.from({ year: 5782, monthCode: "M06", calendar }, options);
+const common1Adar = Temporal.PlainYearMonth.from({ year: 5783, monthCode: "M06", calendar }, options);
+const common = Temporal.PlainYearMonth.from({ year: 5783, monthCode: "M08", calendar }, options);
+const leap2AdarI = Temporal.PlainYearMonth.from({ year: 5784, monthCode: "M05L", calendar }, options);
+const leap2AdarII = Temporal.PlainYearMonth.from({ year: 5784, monthCode: "M06", calendar }, options);
+const common2Adar = Temporal.PlainYearMonth.from({ year: 5785, monthCode: "M06", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  common1Adar.add(years1, options),
+  5784, 7, "M06", "Adding 1 year to common-year Adar (M06) lands in leap-year Adar II (M06)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common1Adar.add(years2, options),
+  5785, 6, "M06", "Adding 2 years to common-year Adar (M06) crossing leap year lands in common-year Adar (M06)",
+  "am", 5785, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarI.add(years1),
+  5785, 6, "M06", "Adding 1 year to Adar I (M05L) lands in common-year Adar (M06) with constrain",
+  "am", 5785, null
+);
+
+assert.throws(RangeError, function () {
+  leap2AdarI.add(years1, options);
+}, "Adding 1 year to Adar I (M05L) rejects");
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarII.add(years1, options),
+  5785, 6, "M06", "Adding 1 year to Adar II (M06) lands in common-year Adar (M06) even with reject",
+  "am", 5785, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common.add(years1, options),
+  5784, 9, "M08", "Adding 1 year across Adar I (M05L)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap1AdarI.add(years2, options),
+  5784, 6, "M05L", "Adding 2 years to leap-year Adar I (M05L) lands in leap-year Adar I (M05L)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap1AdarII.add(years2, options),
+  5784, 7, "M06", "Adding 2 years to leap-year Adar II (M06) lands in leap-year Adar II (M06)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common2Adar.add(years1n, options),
+  5784, 7, "M06", "Subtracting 1 year from common-year Adar (M06) lands in leap-year Adar II (M06)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common2Adar.add(years2n, options),
+  5783, 6, "M06", "Subtracting 2 years from common-year Adar (M06) crossing leap year lands in common-year Adar (M06)",
+  "am", 5783, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarI.add(years1n),
+  5783, 6, "M06", "Subtracting 1 year from Adar I (M05L) lands in common-year Adar (M06) with constrain",
+  "am", 5783, null
+);
+
+assert.throws(RangeError, function () {
+  leap2AdarI.add(years1n, options);
+}, "Subtracting 1 year from Adar I (M05L) rejects");
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarII.add(years1n, options),
+  5783, 6, "M06", "Subtracting 1 year from Adar II (M06) lands in common-year Adar (M06) even with reject",
+  "am", 5783, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common.add(years2n, options),
+  5781, 8, "M08", "Subtracting 2 years across Adar I (M05L)",
+  "am", 5781, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarI.add(years2n, options),
+  5782, 6, "M05L", "Subtracting 2 years from leap-year Adar I (M05L) lands in leap-year Adar I (M05L)",
+  "am", 5782, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarII.add(years2n, options),
+  5782, 7, "M06", "Subtracting 2 years from leap-year Adar II (M06) lands in leap-year Adar II (M06)",
+  "am", 5782, null
+);
+
+// Months
+
+const months1 = new Temporal.Duration(0, 1);
+const months1n = new Temporal.Duration(0, -1);
+const months2 = new Temporal.Duration(0, 2);
+const months2n = new Temporal.Duration(0, -2);
+const months12 = new Temporal.Duration(0, 12);
+const months12n = new Temporal.Duration(0, -12);
+const months13 = new Temporal.Duration(0, 13);
+const months13n = new Temporal.Duration(0, -13);
+const months24 = new Temporal.Duration(0, 24);
+const months24n = new Temporal.Duration(0, -24);
+
+const date1 = Temporal.PlainYearMonth.from({ year: 5784, monthCode: "M04", calendar }, options);
+const date3 = Temporal.PlainYearMonth.from({ year: 5784, monthCode: "M07", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date1.add(months1, options),
+  5784, 5, "M05", "Adding 1 month to M04 in leap year lands in M05 (Shevat)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  date1.add(months2, options),
+  5784, 6, "M05L", "Adding 2 months to M04 in leap year lands in M05L (Adar I)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  date1.add(new Temporal.Duration(0, 3), options),
+  5784, 7, "M06", "Adding 3 months to M04 in leap year lands in M06 (Adar II)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarI.add(months1, options),
+  5784, 7, "M06", "Adding 1 month to M05L (Adar I) lands in M06 (Adar II)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 5783, monthCode: "M04", calendar }, options).add(months2, options),
+  5783, 6, "M06", "Adding 2 months to M04 in non-leap year lands in M06 (no M05L)",
+  "am", 5783, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common1Adar.add(months12, options),
+  5784, 6, "M05L", "Adding 12 months to common-year Adar lands in leap-year Adar I (M05L)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common1Adar.add(months13, options),
+  5784, 7, "M06", "Adding 13 months to common-year Adar lands in leap-year Adar II (M06)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarI.add(months12, options),
+  5785, 5, "M05", "Adding 12 months to leap-year Adar I lands in Shevat (M05)",
+  "am", 5785, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarI.add(months13, options),
+  5785, 6, "M06", "Adding 13 months to leap-year Adar I lands in Adar (M06)",
+  "am", 5785, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarII.add(months12, options),
+  5785, 6, "M06", "Adding 12 months to leap-year Adar II lands in Adar (M06)",
+  "am", 5785, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common.add(months13, options),
+  5784, 9, "M08", "Adding 13 months across Adar I (M05L) lands in same month code",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common.add(new Temporal.Duration(1, 12), options),
+  5785, 8, "M08", "Adding 1y 12mo across Adar I (M05L) in the years part lands in same month code",
+  "am", 5785, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  date3.add(new Temporal.Duration(2, 13), options),
+  5787, 8, "M07", "Adding 2y 13mo across Adar I (M05L) in the months part lands in same month code",
+  "am", 5787, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common1Adar.add(months24, options),
+  5785, 5, "M05", "Adding 24 months to common-year Adar crossing a leap year lands in common-year Shevat (M05)",
+  "am", 5785, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common1Adar.add(new Temporal.Duration(0, 25), options),
+  5785, 6, "M06", "Adding 25 months to common-year Adar crossing a leap year lands in common-year Adar (M06)",
+  "am", 5785, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap1AdarI.add(months24, options),
+  5784, 5, "M05", "Adding 24 months to leap-year Adar I lands in leap-year Shevat (M05)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap1AdarII.add(months24, options),
+  5784, 6, "M05L", "Adding 24 months to leap-year Adar II lands in leap-year Adar I (M05L)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  date3.add(months1n, options),
+  5784, 7, "M06", "Subtracting 1 month from M07 in leap year lands in M06 (Adar II)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  date3.add(months2n, options),
+  5784, 6, "M05L", "Subtracting 2 months from M07 in leap year lands in M05L (Adar I)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  date3.add(new Temporal.Duration(0, -3), options),
+  5784, 5, "M05", "Subtracting 3 months from M07 in leap year lands in M05 (Shevat)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarII.add(months1n, options),
+  5784, 6, "M05L", "Subtracting 1 month from M06 (Adar II) in leap year lands in M05L (Adar I)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarI.add(months1n, options),
+  5784, 5, "M05", "Subtracting 1 month from M05L (Adar I) lands in M05 (Shevat)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 5783, monthCode: "M07", calendar }).add(months2n, options),
+  5783, 5, "M05", "Subtracting 2 months from M07 in non-leap year lands in M05 (no M05L)",
+  "am", 5783, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common2Adar.add(months12n, options),
+  5784, 7, "M06", "Subtracting 12 months from common-year Adar lands in leap-year Adar II (M06)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common2Adar.add(months13n, options),
+  5784, 6, "M05L", "Subtracting 13 months from common-year Adar lands in leap-year Adar I (M05L)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarI.add(months12n, options),
+  5783, 6, "M06", "Subtracting 12 months from leap-year Adar I lands in Adar (M06)",
+  "am", 5783, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarI.add(months13n, options),
+  5783, 5, "M05", "Subtracting 13 months from leap-year Adar I lands in Shevat (M05)",
+  "am", 5783, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarII.add(months12n, options),
+  5783, 7, "M07", "Subtracting 12 months from leap-year Adar II lands in Nisan (M07)",
+  "am", 5783, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common2Adar.add(months24n, options),
+  5783, 7, "M07", "Subtracting 24 months from common-year Adar crossing a leap year lands in common-year Nisan (M07)",
+  "am", 5783, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  date1.add(new Temporal.Duration(-2, -12), options),
+  5781, 4, "M04", "Subtracting 2y 12mo across Adar I (M05L) in the years part lands in same month code",
+  "am", 5781, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  date1.add(new Temporal.Duration(-1, -13), options),
+  5782, 4, "M04", "Subtracting 1y 13mo across Adar I (M05L) in the months part lands in same month code",
+  "am", 5782, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common2Adar.add(new Temporal.Duration(0, -25), options),
+  5783, 6, "M06", "Subtracting 25 months from common-year Adar crossing a leap year lands in common-year Adar (M06)",
+  "am", 5783, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarI.add(months24n, options),
+  5782, 7, "M06", "Subtracting 24 months from leap-year Adar I lands in leap-year Adar (M06)",
+  "am", 5782, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarII.add(months24n, options),
+  5782, 8, "M07", "Subtracting 24 months from leap-year Adar II lands in leap-year Nisan (M07)",
+  "am", 5782, null
+);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-buddhist.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-buddhist.js
new file mode 100644
index 0000000000000..bae673087c546
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-buddhist.js
@@ -0,0 +1,102 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L., and the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.add
+description: Check various basic calculations involving leap years (buddhist calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "buddhist";
+const options = { overflow: "reject" };
+
+// Years
+
+const years1 = new Temporal.Duration(1);
+const years1n = new Temporal.Duration(-1);
+const years4 = new Temporal.Duration(4);
+const years4n = new Temporal.Duration(-4);
+
+const date256302 = Temporal.PlainYearMonth.from({ year: 2563, monthCode: "M02", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date256302.add(years1, options),
+  2564, 2, "M02", "add 1y to Feb",
+  "be", 2564);
+
+TemporalHelpers.assertPlainYearMonth(
+  date256302.add(years4, options),
+  2567, 2, "M02", "add 4y to Feb",
+  "be", 2567);
+
+TemporalHelpers.assertPlainYearMonth(
+  date256302.add(years1n, options),
+  2562, 2, "M02", "subtract 1y from Feb",
+  "be", 2562);
+
+TemporalHelpers.assertPlainYearMonth(
+  date256302.add(years4n, options),
+  2559, 2, "M02", "subtract 4y from Feb",
+  "be", 2559);
+
+// Months
+
+const months1 = new Temporal.Duration(0, 1);
+const months1n = new Temporal.Duration(0, -1);
+const months5 = new Temporal.Duration(0, 5);
+const months11n = new Temporal.Duration(0, -11);
+const years1months2 = new Temporal.Duration(1, 2);
+const years1months2n = new Temporal.Duration(-1, -2);
+
+const date256301 = Temporal.PlainYearMonth.from({ year: 2563, monthCode: "M01", calendar }, options);
+const date256303 = Temporal.PlainYearMonth.from({ year: 2563, monthCode: "M03", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date256301.add(months1, options),
+  2563, 2, "M02", "add 1mo to Jan in leap year",
+  "be", 2563);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2564, monthCode: "M09", calendar }, options).add(months5),
+  2565, 2, "M02", "add 5mo with result in the next year",
+  "be", 2565);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2562, monthCode: "M09", calendar }, options).add(months5),
+  2563, 2, "M02", "add 5mo with result in the next leap year",
+  "be", 2563);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2564, monthCode: "M12", calendar }, options).add(years1months2),
+  2566, 2, "M02", "add 1y 2mo with result in the next year",
+  "be", 2566);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2565, monthCode: "M12", calendar }, options).add(years1months2),
+  2567, 2, "M02", "add 1y 2mo with result in the next leap year",
+  "be", 2567);
+
+TemporalHelpers.assertPlainYearMonth(
+  date256303.add(months1n, options),
+  2563, 2, "M02", "subtract 1mo from Mar in leap year",
+  "be", 2563);
+
+TemporalHelpers.assertPlainYearMonth(
+  date256301.add(months11n),
+  2562, 2, "M02", "subtract 11mo with result in the previous year",
+  "be", 2562);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2564, monthCode: "M01", calendar }, options).add(months11n),
+  2563, 2, "M02", "add 11mo with result in the previous leap year",
+  "be", 2563);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2565, monthCode: "M04", calendar }, options).add(years1months2n),
+  2564, 2, "M02", "add 1y 2mo with result in the previous year",
+  "be", 2564);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2564, monthCode: "M04", calendar }, options).add(years1months2n),
+  2563, 2, "M02", "add 1y 2mo with result in the previous leap year",
+  "be", 2563);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-coptic.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-coptic.js
new file mode 100644
index 0000000000000..856d70016b329
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-coptic.js
@@ -0,0 +1,42 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.add
+description: Check various basic calculations involving leap years (coptic calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "coptic";
+const options = { overflow: "reject" };
+
+const epagomenalMonth = Temporal.PlainYearMonth.from({ year: 1739, monthCode: "M13", calendar }, options);
+
+const years1 = new Temporal.Duration(1);
+const years1n = new Temporal.Duration(-1);
+const years4 = new Temporal.Duration(4);
+const years4n = new Temporal.Duration(-4);
+
+TemporalHelpers.assertPlainYearMonth(
+  epagomenalMonth.add(years1, options),
+  1740, 13, "M13", "Adding 1 year to epagomenal month",
+  "am", 1740, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  epagomenalMonth.add(years1n, options),
+  1738, 13, "M13", "Subtracting 1 year from epagomenal month",
+  "am", 1738, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  epagomenalMonth.add(years4, options),
+  1743, 13, "M13", "Adding 4 years to epagomenal month",
+  "am", 1743, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  epagomenalMonth.add(years4n, options),
+  1735, 13, "M13", "Subtracting 4 years from epagomenal month",
+  "am", 1735, null);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-ethioaa.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-ethioaa.js
new file mode 100644
index 0000000000000..9b896836b9f10
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-ethioaa.js
@@ -0,0 +1,42 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.add
+description: Check various basic calculations involving leap years (ethioaa calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "ethioaa";
+const options = { overflow: "reject" };
+
+const epagomenalMonth = Temporal.PlainYearMonth.from({ year: 7515, monthCode: "M13", calendar }, options);
+
+const years1 = new Temporal.Duration(1);
+const years1n = new Temporal.Duration(-1);
+const years4 = new Temporal.Duration(4);
+const years4n = new Temporal.Duration(-4);
+
+TemporalHelpers.assertPlainYearMonth(
+  epagomenalMonth.add(years1, options),
+  7516, 13, "M13", "Adding 1 year to epagomenal month",
+  "aa", 7516, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  epagomenalMonth.add(years1n, options),
+  7514, 13, "M13", "Subtracting 1 year from epagomenal month",
+  "aa", 7514, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  epagomenalMonth.add(years4, options),
+  7519, 13, "M13", "Adding 4 years to epagomenal month",
+  "aa", 7519, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  epagomenalMonth.add(years4n, options),
+  7511, 13, "M13", "Subtracting 4 years from epagomenal month",
+  "aa", 7511, null);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-ethiopic.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-ethiopic.js
new file mode 100644
index 0000000000000..6230dfb721810
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-ethiopic.js
@@ -0,0 +1,42 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.add
+description: Check various basic calculations involving leap years (ethiopic calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "ethiopic";
+const options = { overflow: "reject" };
+
+const epagomenalMonth = Temporal.PlainYearMonth.from({ year: 2015, monthCode: "M13", calendar }, options);
+
+const years1 = new Temporal.Duration(1);
+const years1n = new Temporal.Duration(-1);
+const years4 = new Temporal.Duration(4);
+const years4n = new Temporal.Duration(-4);
+
+TemporalHelpers.assertPlainYearMonth(
+  epagomenalMonth.add(years1, options),
+  2016, 13, "M13", "Adding 1 year to epagomenal month",
+  "am", 2016, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  epagomenalMonth.add(years1n, options),
+  2014, 13, "M13", "Subtracting 1 year from epagomenal month",
+  "am", 2014, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  epagomenalMonth.add(years4, options),
+  2019, 13, "M13", "Adding 4 years to epagomenal month",
+  "am", 2019, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  epagomenalMonth.add(years4n, options),
+  2011, 13, "M13", "Subtracting 4 years from epagomenal month",
+  "am", 2011, null);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-gregory.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-gregory.js
new file mode 100644
index 0000000000000..8dbca9488a129
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-gregory.js
@@ -0,0 +1,102 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L., and the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.add
+description: Check various basic calculations involving leap years (gregory calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "gregory";
+const options = { overflow: "reject" };
+
+// Years
+
+const years1 = new Temporal.Duration(1);
+const years1n = new Temporal.Duration(-1);
+const years4 = new Temporal.Duration(4);
+const years4n = new Temporal.Duration(-4);
+
+const date202002 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M02", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202002.add(years1, options),
+  2021, 2, "M02", "add 1y to Feb",
+  "ce", 2021);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202002.add(years4, options),
+  2024, 2, "M02", "add 4y to Feb",
+  "ce", 2024);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202002.add(years1n, options),
+  2019, 2, "M02", "subtract 1y from Feb",
+  "ce", 2019);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202002.add(years4n, options),
+  2016, 2, "M02", "subtract 4y from Feb",
+  "ce", 2016);
+
+// Months
+
+const months1 = new Temporal.Duration(0, 1);
+const months1n = new Temporal.Duration(0, -1);
+const months5 = new Temporal.Duration(0, 5);
+const months11n = new Temporal.Duration(0, -11);
+const years1months2 = new Temporal.Duration(1, 2);
+const years1months2n = new Temporal.Duration(-1, -2);
+
+const date202001 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M01", calendar }, options);
+const date202003 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M03", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202001.add(months1, options),
+  2020, 2, "M02", "add 1mo to Jan in leap year",
+  "ce", 2020);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2021, monthCode: "M09", calendar }, options).add(months5),
+  2022, 2, "M02", "add 5mo with result in the next year",
+  "ce", 2022);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2019, monthCode: "M09", calendar }, options).add(months5),
+  2020, 2, "M02", "add 5mo with result in the next leap year",
+  "ce", 2020);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2021, monthCode: "M12", calendar }, options).add(years1months2),
+  2023, 2, "M02", "add 1y 2mo with result in the next year",
+  "ce", 2023);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2022, monthCode: "M12", calendar }, options).add(years1months2),
+  2024, 2, "M02", "add 1y 2mo with result in the next leap year",
+  "ce", 2024);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202003.add(months1n, options),
+  2020, 2, "M02", "subtract 1mo from Mar in leap year",
+  "ce", 2020);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202001.add(months11n),
+  2019, 2, "M02", "subtract 11mo with result in the previous year",
+  "ce", 2019);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2021, monthCode: "M01", calendar }, options).add(months11n),
+  2020, 2, "M02", "add 11mo with result in the previous leap year",
+  "ce", 2020);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2022, monthCode: "M04", calendar }, options).add(years1months2n),
+  2021, 2, "M02", "add 1y 2mo with result in the previous year",
+  "ce", 2021);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2021, monthCode: "M04", calendar }, options).add(years1months2n),
+  2020, 2, "M02", "add 1y 2mo with result in the previous leap year",
+  "ce", 2020);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-indian.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-indian.js
new file mode 100644
index 0000000000000..f38462fc215f7
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-indian.js
@@ -0,0 +1,42 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.add
+description: Check various basic calculations involving leap years (indian calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "indian";
+const options = { overflow: "reject" };
+
+const leap = Temporal.PlainYearMonth.from({ year: 1946, monthCode: "M01", calendar }, options);
+
+const years1 = new Temporal.Duration(1);
+const years1n = new Temporal.Duration(-1);
+const years4 = new Temporal.Duration(4);
+const years4n = new Temporal.Duration(-4);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap.add(years1, options),
+  1947, 1, "M01", "Adding 1 year to Chaitra",
+  "shaka", 1947, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap.add(years1n, options),
+  1945, 1, "M01", "Subtracting 1 year from Chaitra",
+  "shaka", 1945, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap.add(years4, options),
+  1950, 1, "M01", "Adding 4 years to Chaitra",
+  "shaka", 1950, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap.add(years4n, options),
+  1942, 1, "M01", "Subtracting 4 years from Chaitra",
+  "shaka", 1942, null);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-islamic-civil.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-islamic-civil.js
new file mode 100644
index 0000000000000..6260a2abb3545
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-islamic-civil.js
@@ -0,0 +1,45 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L., and the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.add
+description: Check various basic calculations involving leap years (islamic-civil calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "islamic-civil";
+const options = { overflow: "reject" };
+
+// Month 12 (Dhu al-Hijjah) has 29 days in common years and 30 in leap years.
+// AH 1442, 1445, and 1447 are leap years.
+
+const years1 = new Temporal.Duration(1);
+const years1n = new Temporal.Duration(-1);
+const years2 = new Temporal.Duration(2);
+const years3n = new Temporal.Duration(-3);
+
+const date144512 = Temporal.PlainYearMonth.from({ year: 1445, monthCode: "M12", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date144512.add(years1, options),
+  1446, 12, "M12", "add 1y to leap",
+  "ah", 1446, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date144512.add(years2, options),
+  1447, 12, "M12", "add 2y to leap landing in next leap year",
+  "ah", 1447, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date144512.add(years1n, options),
+  1444, 12, "M12", "subtract 1y from leap",
+  "ah", 1444, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date144512.add(years3n, options),
+  1442, 12, "M12", "subtract 3y from leap landing in previous leap year",
+  "ah", 1442, null);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-islamic-tbla.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-islamic-tbla.js
new file mode 100644
index 0000000000000..a70525193f27c
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-islamic-tbla.js
@@ -0,0 +1,45 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L., and the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.add
+description: Check various basic calculations involving leap years (islamic-tbla calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "islamic-tbla";
+const options = { overflow: "reject" };
+
+// Month 12 (Dhu al-Hijjah) has 29 days in common years and 30 in leap years.
+// AH 1442, 1445, and 1447 are leap years.
+
+const years1 = new Temporal.Duration(1);
+const years1n = new Temporal.Duration(-1);
+const years2 = new Temporal.Duration(2);
+const years3n = new Temporal.Duration(-3);
+
+const date144512 = Temporal.PlainYearMonth.from({ year: 1445, monthCode: "M12", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date144512.add(years1, options),
+  1446, 12, "M12", "add 1y to leap",
+  "ah", 1446, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date144512.add(years2, options),
+  1447, 12, "M12", "add 2y to leap landing in next leap year",
+  "ah", 1447, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date144512.add(years1n, options),
+  1444, 12, "M12", "subtract 1y from leap",
+  "ah", 1444, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date144512.add(years3n, options),
+  1442, 12, "M12", "subtract 3y from leap landing in previous leap year",
+  "ah", 1442, null);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-japanese.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-japanese.js
new file mode 100644
index 0000000000000..fd2c008ff6689
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-japanese.js
@@ -0,0 +1,102 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L., and the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.add
+description: Check various basic calculations involving leap years (japanese calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "japanese";
+const options = { overflow: "reject" };
+
+// Years
+
+const years1 = new Temporal.Duration(1);
+const years1n = new Temporal.Duration(-1);
+const years4 = new Temporal.Duration(4);
+const years4n = new Temporal.Duration(-4);
+
+const date202002 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M02", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202002.add(years1, options),
+  2021, 2, "M02", "add 1y to Feb",
+  "reiwa", 3);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202002.add(years4, options),
+  2024, 2, "M02", "add 4y to Feb",
+  "reiwa", 6);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202002.add(years1n, options),
+  2019, 2, "M02", "subtract 1y from Feb",
+  "heisei", 31);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202002.add(years4n, options),
+  2016, 2, "M02", "subtract 4y from Feb",
+  "heisei", 28);
+
+// Months
+
+const months1 = new Temporal.Duration(0, 1);
+const months1n = new Temporal.Duration(0, -1);
+const months5 = new Temporal.Duration(0, 5);
+const months11n = new Temporal.Duration(0, -11);
+const years1months2 = new Temporal.Duration(1, 2);
+const years1months2n = new Temporal.Duration(-1, -2);
+
+const date20200131 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M01", calendar }, options);
+const date20200331 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M03", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date20200131.add(months1, options),
+  2020, 2, "M02", "add 1mo to Jan in leap year",
+  "reiwa", 2);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2021, monthCode: "M09", calendar }, options).add(months5),
+  2022, 2, "M02", "add 5mo with result in the next year",
+  "reiwa", 4);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2019, monthCode: "M09", calendar }, options).add(months5),
+  2020, 2, "M02", "add 5mo with result in the next leap year",
+  "reiwa", 2);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2021, monthCode: "M12", calendar }, options).add(years1months2),
+  2023, 2, "M02", "add 1y 2mo with result in the next year",
+  "reiwa", 5);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2022, monthCode: "M12", calendar }, options).add(years1months2),
+  2024, 2, "M02", "add 1y 2mo with result in the next leap year",
+  "reiwa", 6);
+
+TemporalHelpers.assertPlainYearMonth(
+  date20200331.add(months1n, options),
+  2020, 2, "M02", "subtract 1mo from Mar in leap year",
+  "reiwa", 2);
+
+TemporalHelpers.assertPlainYearMonth(
+  date20200131.add(months11n),
+  2019, 2, "M02", "subtract 11mo with result in the previous year",
+  "heisei", 31);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2021, monthCode: "M01", calendar }, options).add(months11n),
+  2020, 2, "M02", "add 11mo with result in the previous leap year",
+  "reiwa", 2);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2022, monthCode: "M04", calendar }, options).add(years1months2n),
+  2021, 2, "M02", "add 1y 2mo with result in the previous year",
+  "reiwa", 3);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2021, monthCode: "M04", calendar }, options).add(years1months2n),
+  2020, 2, "M02", "add 1y 2mo with result in the previous leap year",
+  "reiwa", 2);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-persian.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-persian.js
new file mode 100644
index 0000000000000..40a771edce043
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-persian.js
@@ -0,0 +1,93 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L., and the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.add
+description: Check various basic calculations involving leap years (Persian calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "persian";
+const options = { overflow: "reject" };
+
+// Years
+
+const years1 = new Temporal.Duration(1);
+const years1n = new Temporal.Duration(-1);
+const years4 = new Temporal.Duration(4);
+const years4n = new Temporal.Duration(-4);
+
+const date136212 = Temporal.PlainYearMonth.from({ year: 1362, monthCode: "M12", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date136212.add(years1, options),
+  1363, 12, "M12", "add 1y to leap",
+  "ap", 1363, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date136212.add(years4, options),
+  1366, 12, "M12", "add 4y to leap",
+  "ap", 1366, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date136212.add(years1n, options),
+  1361, 12, "M12", "subtract 1y from leap",
+  "ap", 1361, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date136212.add(years4n, options),
+  1358, 12, "M12", "subtract 4y from leap",
+  "ap", 1358, null);
+
+// Months
+
+const months1n = new Temporal.Duration(0, -1);
+const months6 = new Temporal.Duration(0, 6);
+const months11n = new Temporal.Duration(0, -11);
+const years1months2 = new Temporal.Duration(1, 2);
+const years1months2n = new Temporal.Duration(-1, -2);
+
+const date136206 = Temporal.PlainYearMonth.from({ year: 1362, monthCode: "M06", calendar }, options);
+const date136211 = Temporal.PlainYearMonth.from({ year: 1362, monthCode: "M11", calendar }, options);
+const date136301 = Temporal.PlainYearMonth.from({ year: 1363, monthCode: "M01", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date136206.add(months6, options),
+  1362, 12, "M12", "add 6mo to Shahrivar in leap year",
+  "ap", 1362, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 1362, monthCode: "M10", calendar }, options).add(years1months2),
+  1363, 12, "M12", "add 1y 2mo with result in the next year",
+  "ap", 1363, null);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 1361, monthCode: "M10", calendar }, options).add(years1months2),
+  1362, 12, "M12", "add 1y 2mo with result in the next leap year",
+  "ap", 1362, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date136301.add(months1n, options),
+  1362, 12, "M12", "subtract 1mo from Farvardin in leap year",
+  "ap", 1362, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date136211.add(months11n),
+  1361, 12, "M12", "subtract 11mo with result in the previous year",
+  "ap", 1361, null);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 1363, monthCode: "M11", calendar }, options).add(months11n),
+  1362, 12, "M12", "subtract 11mo with result in the previous leap year",
+  "ap", 1362, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 1364, monthCode: "M02", calendar }, options).add(years1months2n),
+  1362, 12, "M12", "add 1y 2mo with result in the previous year",
+  "ap", 1362, null);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 1365, monthCode: "M02", calendar }, options).add(years1months2n),
+  1363, 12, "M12", "add 1y 2mo with result in the previous leap year",
+  "ap", 1363, null);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-roc.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-roc.js
new file mode 100644
index 0000000000000..11c1976c9bab9
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-roc.js
@@ -0,0 +1,102 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L., and the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.add
+description: Check various basic calculations involving leap years (roc calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "roc";
+const options = { overflow: "reject" };
+
+// Years
+
+const years1 = new Temporal.Duration(1);
+const years1n = new Temporal.Duration(-1);
+const years4 = new Temporal.Duration(4);
+const years4n = new Temporal.Duration(-4);
+
+const date10902 = Temporal.PlainYearMonth.from({ year: 109, monthCode: "M02", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date10902.add(years1, options),
+  110, 2, "M02", "add 1y to Feb",
+  "roc", 110);
+
+TemporalHelpers.assertPlainYearMonth(
+  date10902.add(years4, options),
+  113, 2, "M02", "add 4y to Feb",
+  "roc", 113);
+
+TemporalHelpers.assertPlainYearMonth(
+  date10902.add(years1n, options),
+  108, 2, "M02", "subtract 1y from Feb",
+  "roc", 108);
+
+TemporalHelpers.assertPlainYearMonth(
+  date10902.add(years4n, options),
+  105, 2, "M02", "subtract 4y from Feb",
+  "roc", 105);
+
+// Months
+
+const months1 = new Temporal.Duration(0, 1);
+const months1n = new Temporal.Duration(0, -1);
+const months5 = new Temporal.Duration(0, 5);
+const months11n = new Temporal.Duration(0, -11);
+const years1months2 = new Temporal.Duration(1, 2);
+const years1months2n = new Temporal.Duration(-1, -2);
+
+const date1090131 = Temporal.PlainYearMonth.from({ year: 109, monthCode: "M01", calendar }, options);
+const date1090331 = Temporal.PlainYearMonth.from({ year: 109, monthCode: "M03", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date1090131.add(months1, options),
+  109, 2, "M02", "add 1mo to Jan in leap year",
+  "roc", 109);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 110, monthCode: "M09", calendar }, options).add(months5),
+  111, 2, "M02", "add 5mo with result in the next year",
+  "roc", 111);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 108, monthCode: "M09", calendar }, options).add(months5),
+  109, 2, "M02", "add 5mo with result in the next leap year",
+  "roc", 109);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 110, monthCode: "M12", calendar }, options).add(years1months2),
+  112, 2, "M02", "add 1y 2mo with result in the next year",
+  "roc", 112);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 111, monthCode: "M12", calendar }, options).add(years1months2),
+  113, 2, "M02", "add 1y 2mo with result in the next leap year",
+  "roc", 113);
+
+TemporalHelpers.assertPlainYearMonth(
+  date1090331.add(months1n, options),
+  109, 2, "M02", "subtract 1mo from Mar in leap year",
+  "roc", 109);
+
+TemporalHelpers.assertPlainYearMonth(
+  date1090131.add(months11n),
+  108, 2, "M02", "subtract 11mo with result in the previous year",
+  "roc", 108);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 110, monthCode: "M01", calendar }, options).add(months11n),
+  109, 2, "M02", "add 11mo with result in the previous leap year",
+  "roc", 109);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 111, monthCode: "M04", calendar }, options).add(years1months2n),
+  110, 2, "M02", "add 1y 2mo with result in the previous year",
+  "roc", 110);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 110, monthCode: "M04", calendar }, options).add(years1months2n),
+  109, 2, "M02", "add 1y 2mo with result in the previous leap year",
+  "roc", 109);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/shell.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/add/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/equals/shell.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/equals/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/equals/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/equals/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/monthCode/shell.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/monthCode/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/monthCode/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/monthCode/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/since/era-boundary-japanese.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/since/era-boundary-japanese.js
index 73cae758b07d2..2a4a4fc986d6b 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/since/era-boundary-japanese.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/since/era-boundary-japanese.js
@@ -14,7 +14,9 @@ const options = { overflow: "reject" };
 
 const bce1 = Temporal.PlainYearMonth.from({ era: "bce", eraYear: 1, monthCode: "M06", calendar }, options);
 const ce1 = Temporal.PlainYearMonth.from({ era: "ce", eraYear: 1, monthCode: "M06", calendar }, options);
-const meiji5 = Temporal.PlainYearMonth.from({ era: "meiji", eraYear: 5, monthCode: "M01", calendar }, options);
+const ce1872 = Temporal.PlainYearMonth.from({ era: "ce", eraYear: 1872, monthCode: "M12", calendar }, options);
+const meiji6 = Temporal.PlainYearMonth.from({ era: "meiji", eraYear: 6, monthCode: "M01", calendar}, options);
+const meiji7 = Temporal.PlainYearMonth.from({ era: "meiji", eraYear: 7, monthCode: "M01", calendar }, options);
 const meiji45 = Temporal.PlainYearMonth.from({ era: "meiji", eraYear: 45, monthCode: "M05", calendar }, options);
 const taisho1 = Temporal.PlainYearMonth.from({ era: "taisho", eraYear: 1, monthCode: "M08", calendar }, options);
 const taisho6 = Temporal.PlainYearMonth.from({ era: "taisho", eraYear: 6, monthCode: "M03", calendar }, options);
@@ -82,16 +84,16 @@ const tests = [
     [63, 0, "63y from Taisho 6 March to Showa 55 March"],
     [0, 756, "756mo from Taisho 6 March to Showa 55 March"],
   ],
-  // From Meiji 5 (1872) to Taisho 6 (1917) - crossing era boundary
+  // From Meiji 7 (1874) to Taisho 6 (1917) - crossing era boundary
   [
-    meiji5, taisho6,
-    [-45, -2, "-45y -2mo backwards from Meiji 5 January to Taisho 6 March"],
-    [0, -542, "-542mo backwards from Meiji 5 January to Taisho 6 March"],
+    meiji7, taisho6,
+    [-43, -2, "-43y -2mo backwards from Meiji 7 January to Taisho 6 March"],
+    [0, -518, "-518mo backwards from Meiji 7 January to Taisho 6 March"],
   ],
   [
-    taisho6, meiji5,
-    [45, 2, "45y 2mo from Meiji 5 January to Taisho 6 March"],
-    [0, 542, "542mo from Meiji 5 January to Taisho 6 March"],
+    taisho6, meiji7,
+    [43, 2, "43y 2mo from Meiji 7 January to Taisho 6 March"],
+    [0, 518, "518mo from Meiji 7 January to Taisho 6 March"],
   ],
   // Within same year but different eras
   [
@@ -104,6 +106,17 @@ const tests = [
     [0, 3, "3mo from Meiji 45 May to Taisho 1 August"],
     [0, 3, "3mo from Meiji 45 May to Taisho 1 August"],
   ],
+  // Last pre-solar-calendar CE month to first solar-calendar month of Meiji era
+  [
+    ce1872, meiji6,
+    [0, -1, "backwards from month before solar Meiji era to first month"],
+    [0, -1, "backwards from month before solar Meiji era to first month"],
+  ],
+  [
+    meiji6, ce1872,
+    [0, 1, "from month before solar Meiji era to first month"],
+    [0, 1, "from month before solar Meiji era to first month"],
+  ],
   // CE-BCE boundary
   [
     bce1, ce1,
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/since/shell.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/since/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/since/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/since/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-months-chinese.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-months-chinese.js
new file mode 100644
index 0000000000000..05ffc5187a3ce
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-months-chinese.js
@@ -0,0 +1,323 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.subtract
+description: Arithmetic around leap months in the chinese calendar
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "chinese";
+const options = { overflow: "reject" };
+
+// Years
+
+const years1 = new Temporal.Duration(-1);
+const years1n = new Temporal.Duration(1);
+
+const leap193807L = Temporal.PlainYearMonth.from({ year: 1938, monthCode: "M07L", calendar }, options);
+const leap195205L = Temporal.PlainYearMonth.from({ year: 1952, monthCode: "M05L", calendar }, options);
+const leap196603L = Temporal.PlainYearMonth.from({ year: 1966, monthCode: "M03L", calendar }, options);
+const common200008 = Temporal.PlainYearMonth.from({ year: 2000, monthCode: "M08", calendar }, options);
+const common200108 = Temporal.PlainYearMonth.from({ year: 2001, monthCode: "M08", calendar }, options);
+const common201901 = Temporal.PlainYearMonth.from({ year: 2019, monthCode: "M01", calendar }, options);
+const common201904 = Temporal.PlainYearMonth.from({ year: 2019, monthCode: "M04", calendar }, options);
+const leap202004 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M04", calendar }, options);
+const leap202004L = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M04L", calendar }, options);
+const common202104 = Temporal.PlainYearMonth.from({ year: 2021, monthCode: "M04", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201901.subtract(years1),
+  2020, 1, "M01", "add 1 year from non-leap day",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap196603L.subtract(years1),
+  1967, 3, "M03", "Adding 1 year to leap month M03L lands in common-year M03 with overflow constrain",
+  undefined, undefined, null
+);
+
+assert.throws(RangeError, function () {
+  leap196603L.subtract(years1, options);
+}, "Adding 1 year to leap month rejects");
+
+TemporalHelpers.assertPlainYearMonth(
+  leap193807L.subtract(years1),
+  1939, 7, "M07", "Adding 1 year to leap month M07L on day 30 constrains to M07 day 29",
+  undefined, undefined, null
+);
+
+assert.throws(RangeError, function () {
+  leap193807L.subtract(years1, options);
+}, "Adding 1 year to leap month day 30 rejects");
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.subtract(years1, options),
+  2020, 4, "M04", "Adding 1 year to common-year M04 lands in leap-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004.subtract(years1, options),
+  2021, 4, "M04", "Adding 1 year to leap-year M04 lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2012, monthCode: "M04L", calendar }, options).subtract(new Temporal.Duration(-8), options),
+  2020, 5, "M04L", "Adding years to go from one M04L to the next M04L",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200008.subtract(years1, options),
+  2001, 9, "M08", "Adding 1 year crossing leap month",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.subtract(new Temporal.Duration(-2), options),
+  2021, 4, "M04", "Adding 2 years to common-year M04 crossing leap year lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201901.subtract(years1n),
+  2018, 1, "M01", "Subtracting 1 year from non-leap day",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap196603L.subtract(years1n),
+  1965, 3, "M03", "Subtracting 1 year from leap month M03L lands in common-year M03 with overflow constrain",
+  undefined, undefined, null
+);
+
+assert.throws(RangeError, function () {
+  leap196603L.subtract(years1n, options);
+}, "Subtracting 1 year from leap month rejects");
+
+TemporalHelpers.assertPlainYearMonth(
+  leap195205L.subtract(years1n),
+  1951, 5, "M05", "Subtracting 1 year from leap month M05L on day 30 constrains to M05 day 29",
+  undefined, undefined, null
+);
+
+assert.throws(RangeError, function () {
+  leap195205L.subtract(years1n, options);
+}, "Subtracting 1 year from leap month day 30 rejects");
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.subtract(years1n, options),
+  2020, 4, "M04", "Subtracting 1 year from common-year M04 lands in leap-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004.subtract(years1n, options),
+  2019, 4, "M04", "Subtracting 1 year from leap-year M04 lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004L.subtract(new Temporal.Duration(8), options),
+  2012, 5, "M04L", "Subtracting years to go from one M04L to the previous M04L",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200108.subtract(years1n, options),
+  2000, 8, "M08", "Subtracting 1 year crossing leap month",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.subtract(new Temporal.Duration(2), options),
+  2019, 4, "M04", "Subtracting 2 years from common-year M04 crossing leap year lands in common-year M04",
+  undefined, undefined, null
+);
+
+// Months
+
+const months1 = new Temporal.Duration(0, -1);
+const months1n = new Temporal.Duration(0, 1);
+const months12 = new Temporal.Duration(0, -12);
+const months12n = new Temporal.Duration(0, 12);
+const months13 = new Temporal.Duration(0, -13);
+const months13n = new Temporal.Duration(0, 13);
+
+const leap202003 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M03", calendar }, options);
+const leap202006 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M06", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 1947, monthCode: "M02L", calendar }, options).subtract(months1),
+  1947, 4, "M03", "add 1 month, starting at start of leap month",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 1955, monthCode: "M03L", calendar }, options).subtract(months1),
+  1955, 5, "M04", "add 1 month, starting at start of leap month with 30 days",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202003.subtract(months1),
+  2020, 4, "M04", "adding 1 month to M03 in leap year lands in M04 (not M04L)",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202003.subtract(new Temporal.Duration(0, -2)),
+  2020, 5, "M04L", "adding 2 months to M03 in leap year lands in M04L (leap month)",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202003.subtract(new Temporal.Duration(0, -3)),
+  2020, 6, "M05", "adding 3 months to M03 in leap year lands in M05 (not M06)",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.subtract(months12),
+  2020, 4, "M04", "Adding 12 months to common-year M04 lands in leap-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.subtract(months13),
+  2020, 5, "M04L", "Adding 13 months to common-year M04 lands in leap-year M04L",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004.subtract(months12),
+  2021, 3, "M03", "Adding 12 months to leap-year M04 lands in common-year M03",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004.subtract(months13),
+  2021, 4, "M04", "Adding 13 months to leap-year M04 lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004L.subtract(months12),
+  2021, 4, "M04", "Adding 12 months to M04L lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200008.subtract(new Temporal.Duration(-1, -12), options),
+  2002, 8, "M08", "Adding 1y 12mo crossing leap month in the year part",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200108.subtract(new Temporal.Duration(-2, -13), options),
+  2004, 9, "M08", "Adding 1y 13mo crossing leap month in the months part",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.subtract(new Temporal.Duration(0, -24)),
+  2021, 3, "M03", "Adding 24 months to common-year M04 crossing leap year with M04L, lands in common-year M03",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.subtract(new Temporal.Duration(0, -25)),
+  2021, 4, "M04", "Adding 25 months to common-year M04 crossing leap year with M04L, lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202006.subtract(months1n),
+  2020, 6, "M05", "Subtracting 1 month from M06 in leap year lands in M05",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202006.subtract(new Temporal.Duration(0, 2)),
+  2020, 5, "M04L", "Subtracting 2 months from M06 in leap year lands in M04L (leap month)",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202006.subtract(new Temporal.Duration(0, 3)),
+  2020, 4, "M04", "Subtracting 3 months from M06 in leap year lands in M04 (not M03)",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M05", calendar }, options).subtract(months1n),
+  2020, 5, "M04L", "Subtracting 1 month from M05 in leap year lands in M04L",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004L.subtract(months1n),
+  2020, 4, "M04", "Subtracting 1 month from M04L in calendar lands in M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.subtract(months12n),
+  2020, 5, "M04L", "Subtracting 12 months from common-year M04 lands in leap-year M04L",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.subtract(months13n),
+  2020, 4, "M04", "Subtracting 13 months from common-year M04 lands in leap-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004.subtract(months12n),
+  2019, 4, "M04", "Subtracting 12 months from leap-year M04 lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004L.subtract(months12n),
+  2019, 5, "M05", "Subtracting 12 months from M04L lands in common-year M05",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004L.subtract(months13n),
+  2019, 4, "M04", "Subtracting 13 months from M04L lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200108.subtract(new Temporal.Duration(1, 12), options),
+  1999, 8, "M08", "Adding 1y 12mo crossing leap month in the year part",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200008.subtract(new Temporal.Duration(2, 13), options),
+  1997, 8, "M08", "Adding 1y 13mo crossing leap month in the months part",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.subtract(new Temporal.Duration(0, 24)),
+  2019, 5, "M05", "Subtracting 24 months from common-year M04 crossing leap year with M04L, lands in common-year M05",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.subtract(new Temporal.Duration(0, 25)),
+  2019, 4, "M04", "Subtracting 25 months from common-year M04 crossing leap year with M04L, lands in common-year M04",
+  undefined, undefined, null
+);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-months-dangi.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-months-dangi.js
new file mode 100644
index 0000000000000..fbe1d292ee214
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-months-dangi.js
@@ -0,0 +1,323 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.subtract
+description: Arithmetic around leap months in the dangi calendar
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "dangi";
+const options = { overflow: "reject" };
+
+// Years
+
+const years1 = new Temporal.Duration(-1);
+const years1n = new Temporal.Duration(1);
+
+const leap193807L = Temporal.PlainYearMonth.from({ year: 1938, monthCode: "M07L", calendar }, options);
+const leap195205L = Temporal.PlainYearMonth.from({ year: 1952, monthCode: "M05L", calendar }, options);
+const leap196603L = Temporal.PlainYearMonth.from({ year: 1966, monthCode: "M03L", calendar }, options);
+const common200008 = Temporal.PlainYearMonth.from({ year: 2000, monthCode: "M08", calendar }, options);
+const common200108 = Temporal.PlainYearMonth.from({ year: 2001, monthCode: "M08", calendar }, options);
+const common201901 = Temporal.PlainYearMonth.from({ year: 2019, monthCode: "M01", calendar }, options);
+const common201904 = Temporal.PlainYearMonth.from({ year: 2019, monthCode: "M04", calendar }, options);
+const leap202004 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M04", calendar }, options);
+const leap202004L = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M04L", calendar }, options);
+const common202104 = Temporal.PlainYearMonth.from({ year: 2021, monthCode: "M04", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201901.subtract(years1),
+  2020, 1, "M01", "add 1 year from non-leap day",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap196603L.subtract(years1),
+  1967, 3, "M03", "Adding 1 year to leap month M03L lands in common-year M03 with overflow constrain",
+  undefined, undefined, null
+);
+
+assert.throws(RangeError, function () {
+  leap196603L.subtract(years1, options);
+}, "Adding 1 year to leap month rejects");
+
+TemporalHelpers.assertPlainYearMonth(
+  leap193807L.subtract(years1),
+  1939, 7, "M07", "Adding 1 year to leap month M07L on day 30 constrains to M07 day 29",
+  undefined, undefined, null
+);
+
+assert.throws(RangeError, function () {
+  leap193807L.subtract(years1, options);
+}, "Adding 1 year to leap month day 30 rejects");
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.subtract(years1, options),
+  2020, 4, "M04", "Adding 1 year to common-year M04 lands in leap-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004.subtract(years1, options),
+  2021, 4, "M04", "Adding 1 year to leap-year M04 lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2012, monthCode: "M03L", calendar }, options).subtract(new Temporal.Duration(19), options),
+  1993, 4, "M03L", "Subtracting years to go from one M03L to the previous M03L",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200008.subtract(years1, options),
+  2001, 9, "M08", "Adding 1 year crossing leap month",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.subtract(new Temporal.Duration(-2), options),
+  2021, 4, "M04", "Adding 2 years to common-year M04 crossing leap year lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201901.subtract(years1n),
+  2018, 1, "M01", "Subtracting 1 year from non-leap day",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap196603L.subtract(years1n),
+  1965, 3, "M03", "Subtracting 1 year from leap month M03L lands in common-year M03 with overflow constrain",
+  undefined, undefined, null
+);
+
+assert.throws(RangeError, function () {
+  leap196603L.subtract(years1n, options);
+}, "Subtracting 1 year from leap month rejects");
+
+TemporalHelpers.assertPlainYearMonth(
+  leap195205L.subtract(years1n),
+  1951, 5, "M05", "Subtracting 1 year from leap month M05L on day 30 constrains to M05 day 29",
+  undefined, undefined, null
+);
+
+assert.throws(RangeError, function () {
+  leap195205L.subtract(years1n, options);
+}, "Subtracting 1 year from leap month day 30 rejects");
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.subtract(years1n, options),
+  2020, 4, "M04", "Subtracting 1 year from common-year M04 lands in leap-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004.subtract(years1n, options),
+  2019, 4, "M04", "Subtracting 1 year from leap-year M04 lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2012, monthCode: "M03L", calendar }, options).subtract(new Temporal.Duration(19), options),
+  1993, 4, "M03L", "Subtracting years to go from one M03L to the previous M03L",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200108.subtract(years1n, options),
+  2000, 8, "M08", "Subtracting 1 year crossing leap month",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.subtract(new Temporal.Duration(2), options),
+  2019, 4, "M04", "Subtracting 2 years from common-year M04 crossing leap year lands in common-year M04",
+  undefined, undefined, null
+);
+
+// Months
+
+const months1 = new Temporal.Duration(0, -1);
+const months1n = new Temporal.Duration(0, 1);
+const months12 = new Temporal.Duration(0, -12);
+const months12n = new Temporal.Duration(0, 12);
+const months13 = new Temporal.Duration(0, -13);
+const months13n = new Temporal.Duration(0, 13);
+
+const leap202003 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M03", calendar }, options);
+const leap202006 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M06", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 1947, monthCode: "M02L", calendar }, options).subtract(months1),
+  1947, 4, "M03", "add 1 month, starting at start of leap month",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 1955, monthCode: "M03L", calendar }, options).subtract(months1),
+  1955, 5, "M04", "add 1 month, starting at start of leap month with 30 days",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202003.subtract(months1),
+  2020, 4, "M04", "adding 1 month to M03 in leap year lands in M04 (not M04L)",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202003.subtract(new Temporal.Duration(0, -2)),
+  2020, 5, "M04L", "adding 2 months to M03 in leap year lands in M04L (leap month)",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202003.subtract(new Temporal.Duration(0, -3)),
+  2020, 6, "M05", "adding 3 months to M03 in leap year lands in M05 (not M06)",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.subtract(months12),
+  2020, 4, "M04", "Adding 12 months to common-year M04 lands in leap-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.subtract(months13),
+  2020, 5, "M04L", "Adding 13 months to common-year M04 lands in leap-year M04L",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004.subtract(months12),
+  2021, 3, "M03", "Adding 12 months to leap-year M04 lands in common-year M03",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004.subtract(months13),
+  2021, 4, "M04", "Adding 13 months to leap-year M04 lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004L.subtract(months12),
+  2021, 4, "M04", "Adding 12 months to M04L lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200008.subtract(new Temporal.Duration(-1, -12), options),
+  2002, 8, "M08", "Adding 1y 12mo crossing leap month in the year part",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200108.subtract(new Temporal.Duration(-2, -13), options),
+  2004, 9, "M08", "Adding 1y 13mo crossing leap month in the months part",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.subtract(new Temporal.Duration(0, -24)),
+  2021, 3, "M03", "Adding 24 months to common-year M04 crossing leap year with M04L, lands in common-year M03",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common201904.subtract(new Temporal.Duration(0, -25)),
+  2021, 4, "M04", "Adding 25 months to common-year M04 crossing leap year with M04L, lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202006.subtract(months1n),
+  2020, 6, "M05", "Subtracting 1 month from M06 in leap year lands in M05",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202006.subtract(new Temporal.Duration(0, 2)),
+  2020, 5, "M04L", "Subtracting 2 months from M06 in leap year lands in M04L (leap month)",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202006.subtract(new Temporal.Duration(0, 3)),
+  2020, 4, "M04", "Subtracting 3 months from M06 in leap year lands in M04 (not M03)",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M05", calendar }, options).subtract(months1n),
+  2020, 5, "M04L", "Subtracting 1 month from M05 in leap year lands in M04L",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004L.subtract(months1n),
+  2020, 4, "M04", "Subtracting 1 month from M04L in calendar lands in M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.subtract(months12n),
+  2020, 5, "M04L", "Subtracting 12 months from common-year M04 lands in leap-year M04L",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.subtract(months13n),
+  2020, 4, "M04", "Subtracting 13 months from common-year M04 lands in leap-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004.subtract(months12n),
+  2019, 4, "M04", "Subtracting 12 months from leap-year M04 lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004L.subtract(months12n),
+  2019, 5, "M05", "Subtracting 12 months from M04L lands in common-year M05",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap202004L.subtract(months13n),
+  2019, 4, "M04", "Subtracting 13 months from M04L lands in common-year M04",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200108.subtract(new Temporal.Duration(1, 12), options),
+  1999, 8, "M08", "Adding 1y 12mo crossing leap month in the year part",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common200008.subtract(new Temporal.Duration(2, 13), options),
+  1997, 8, "M08", "Adding 1y 13mo crossing leap month in the months part",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.subtract(new Temporal.Duration(0, 24)),
+  2019, 5, "M05", "Subtracting 24 months from common-year M04 crossing leap year with M04L, lands in common-year M05",
+  undefined, undefined, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common202104.subtract(new Temporal.Duration(0, 25)),
+  2019, 4, "M04", "Subtracting 25 months from common-year M04 crossing leap year with M04L, lands in common-year M04",
+  undefined, undefined, null
+);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-months-hebrew.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-months-hebrew.js
new file mode 100644
index 0000000000000..8bdc79df5a552
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-months-hebrew.js
@@ -0,0 +1,342 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.subtract
+description: Arithmetic around leap months in the hebrew calendar
+includes: [temporalHelpers.js]
+features: [Temporal, Intl.Era-monthcode]
+---*/
+
+const calendar = "hebrew";
+const options = { overflow: "reject" };
+
+// Years
+
+const years1 = new Temporal.Duration(-1);
+const years1n = new Temporal.Duration(1);
+const years2 = new Temporal.Duration(-2);
+const years2n = new Temporal.Duration(2);
+
+const leap1AdarI = Temporal.PlainYearMonth.from({ year: 5782, monthCode: "M05L", calendar }, options);
+const leap1AdarII = Temporal.PlainYearMonth.from({ year: 5782, monthCode: "M06", calendar }, options);
+const common1Adar = Temporal.PlainYearMonth.from({ year: 5783, monthCode: "M06", calendar }, options);
+const common = Temporal.PlainYearMonth.from({ year: 5783, monthCode: "M08", calendar }, options);
+const leap2AdarI = Temporal.PlainYearMonth.from({ year: 5784, monthCode: "M05L", calendar }, options);
+const leap2AdarII = Temporal.PlainYearMonth.from({ year: 5784, monthCode: "M06", calendar }, options);
+const common2Adar = Temporal.PlainYearMonth.from({ year: 5785, monthCode: "M06", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  common1Adar.subtract(years1, options),
+  5784, 7, "M06", "Adding 1 year to common-year Adar (M06) lands in leap-year Adar II (M06)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common1Adar.subtract(years2, options),
+  5785, 6, "M06", "Adding 2 years to common-year Adar (M06) crossing leap year lands in common-year Adar (M06)",
+  "am", 5785, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarI.subtract(years1),
+  5785, 6, "M06", "Adding 1 year to Adar I (M05L) lands in common-year Adar (M06) with constrain",
+  "am", 5785, null
+);
+
+assert.throws(RangeError, function () {
+  leap2AdarI.subtract(years1, options);
+}, "Adding 1 year to Adar I (M05L) rejects");
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarII.subtract(years1, options),
+  5785, 6, "M06", "Adding 1 year to Adar II (M06) lands in common-year Adar (M06) even with reject",
+  "am", 5785, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common.subtract(years1, options),
+  5784, 9, "M08", "Adding 1 year across Adar I (M05L)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap1AdarI.subtract(years2, options),
+  5784, 6, "M05L", "Adding 2 years to leap-year Adar I (M05L) lands in leap-year Adar I (M05L)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap1AdarII.subtract(years2, options),
+  5784, 7, "M06", "Adding 2 years to leap-year Adar II (M06) lands in leap-year Adar II (M06)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common2Adar.subtract(years1n, options),
+  5784, 7, "M06", "Subtracting 1 year from common-year Adar (M06) lands in leap-year Adar II (M06)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common2Adar.subtract(years2n, options),
+  5783, 6, "M06", "Subtracting 2 years from common-year Adar (M06) crossing leap year lands in common-year Adar (M06)",
+  "am", 5783, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarI.subtract(years1n),
+  5783, 6, "M06", "Subtracting 1 year from Adar I (M05L) lands in common-year Adar (M06) with constrain",
+  "am", 5783, null
+);
+
+assert.throws(RangeError, function () {
+  leap2AdarI.subtract(years1n, options);
+}, "Subtracting 1 year from Adar I (M05L) rejects");
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarII.subtract(years1n, options),
+  5783, 6, "M06", "Subtracting 1 year from Adar II (M06) lands in common-year Adar (M06) even with reject",
+  "am", 5783, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common.subtract(years2n, options),
+  5781, 8, "M08", "Subtracting 2 years across Adar I (M05L)",
+  "am", 5781, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarI.subtract(years2n, options),
+  5782, 6, "M05L", "Subtracting 2 years from leap-year Adar I (M05L) lands in leap-year Adar I (M05L)",
+  "am", 5782, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarII.subtract(years2n, options),
+  5782, 7, "M06", "Subtracting 2 years from leap-year Adar II (M06) lands in leap-year Adar II (M06)",
+  "am", 5782, null
+);
+
+// Months
+
+const months1 = new Temporal.Duration(0, -1);
+const months1n = new Temporal.Duration(0, 1);
+const months2 = new Temporal.Duration(0, -2);
+const months2n = new Temporal.Duration(0, 2);
+const months12 = new Temporal.Duration(0, -12);
+const months12n = new Temporal.Duration(0, 12);
+const months13 = new Temporal.Duration(0, -13);
+const months13n = new Temporal.Duration(0, 13);
+const months24 = new Temporal.Duration(0, -24);
+const months24n = new Temporal.Duration(0, 24);
+
+const date1 = Temporal.PlainYearMonth.from({ year: 5784, monthCode: "M04", calendar }, options);
+const date3 = Temporal.PlainYearMonth.from({ year: 5784, monthCode: "M07", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date1.subtract(months1, options),
+  5784, 5, "M05", "Adding 1 month to M04 in leap year lands in M05 (Shevat)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  date1.subtract(months2, options),
+  5784, 6, "M05L", "Adding 2 months to M04 in leap year lands in M05L (Adar I)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  date1.subtract(new Temporal.Duration(0, -3), options),
+  5784, 7, "M06", "Adding 3 months to M04 in leap year lands in M06 (Adar II)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarI.subtract(months1, options),
+  5784, 7, "M06", "Adding 1 month to M05L (Adar I) lands in M06 (Adar II)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 5783, monthCode: "M04", calendar }, options).subtract(months2, options),
+  5783, 6, "M06", "Adding 2 months to M04 in non-leap year lands in M06 (no M05L)",
+  "am", 5783, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common1Adar.subtract(months12, options),
+  5784, 6, "M05L", "Adding 12 months to common-year Adar lands in leap-year Adar I (M05L)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common1Adar.subtract(months13, options),
+  5784, 7, "M06", "Adding 13 months to common-year Adar lands in leap-year Adar II (M06)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarI.subtract(months12, options),
+  5785, 5, "M05", "Adding 12 months to leap-year Adar I lands in Shevat (M05)",
+  "am", 5785, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarI.subtract(months13, options),
+  5785, 6, "M06", "Adding 13 months to leap-year Adar I lands in Adar (M06)",
+  "am", 5785, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarII.subtract(months12, options),
+  5785, 6, "M06", "Adding 12 months to leap-year Adar II lands in Adar (M06)",
+  "am", 5785, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common.subtract(months13, options),
+  5784, 9, "M08", "Adding 13 months across Adar I (M05L) lands in same month code",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common.subtract(new Temporal.Duration(-1, -12), options),
+  5785, 8, "M08", "Adding 1y 12mo across Adar I (M05L) in the years part lands in same month code",
+  "am", 5785, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  date3.subtract(new Temporal.Duration(-2, -13), options),
+  5787, 8, "M07", "Adding 2y 13mo across Adar I (M05L) in the months part lands in same month code",
+  "am", 5787, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common1Adar.subtract(months24, options),
+  5785, 5, "M05", "Adding 24 months to common-year Adar crossing a leap year lands in common-year Shevat (M05)",
+  "am", 5785, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common1Adar.subtract(new Temporal.Duration(0, -25), options),
+  5785, 6, "M06", "Adding 25 months to common-year Adar crossing a leap year lands in common-year Adar (M06)",
+  "am", 5785, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap1AdarI.subtract(months24, options),
+  5784, 5, "M05", "Adding 24 months to leap-year Adar I lands in leap-year Shevat (M05)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap1AdarII.subtract(months24, options),
+  5784, 6, "M05L", "Adding 24 months to leap-year Adar II lands in leap-year Adar I (M05L)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  date3.subtract(months1n, options),
+  5784, 7, "M06", "Subtracting 1 month from M07 in leap year lands in M06 (Adar II)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  date3.subtract(months2n, options),
+  5784, 6, "M05L", "Subtracting 2 months from M07 in leap year lands in M05L (Adar I)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  date3.subtract(new Temporal.Duration(0, 3), options),
+  5784, 5, "M05", "Subtracting 3 months from M07 in leap year lands in M05 (Shevat)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarII.subtract(months1n, options),
+  5784, 6, "M05L", "Subtracting 1 month from M06 (Adar II) in leap year lands in M05L (Adar I)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarI.subtract(months1n, options),
+  5784, 5, "M05", "Subtracting 1 month from M05L (Adar I) lands in M05 (Shevat)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 5783, monthCode: "M07", calendar }).subtract(months2n, options),
+  5783, 5, "M05", "Subtracting 2 months from M07 in non-leap year lands in M05 (no M05L)",
+  "am", 5783, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common2Adar.subtract(months12n, options),
+  5784, 7, "M06", "Subtracting 12 months from common-year Adar lands in leap-year Adar II (M06)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common2Adar.subtract(months13n, options),
+  5784, 6, "M05L", "Subtracting 13 months from common-year Adar lands in leap-year Adar I (M05L)",
+  "am", 5784, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarI.subtract(months12n, options),
+  5783, 6, "M06", "Subtracting 12 months from leap-year Adar I lands in Adar (M06)",
+  "am", 5783, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarI.subtract(months13n, options),
+  5783, 5, "M05", "Subtracting 13 months from leap-year Adar I lands in Shevat (M05)",
+  "am", 5783, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarII.subtract(months12n, options),
+  5783, 7, "M07", "Subtracting 12 months from leap-year Adar II lands in Nisan (M07)",
+  "am", 5783, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common2Adar.subtract(months24n, options),
+  5783, 7, "M07", "Subtracting 24 months from common-year Adar crossing a leap year lands in common-year Nisan (M07)",
+  "am", 5783, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  date1.subtract(new Temporal.Duration(2, 12), options),
+  5781, 4, "M04", "Subtracting 2y 12mo across Adar I (M05L) in the years part lands in same month code",
+  "am", 5781, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  date1.subtract(new Temporal.Duration(1, 13), options),
+  5782, 4, "M04", "Subtracting 1y 13mo across Adar I (M05L) in the months part lands in same month code",
+  "am", 5782, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  common2Adar.subtract(new Temporal.Duration(0, 25), options),
+  5783, 6, "M06", "Subtracting 25 months from common-year Adar crossing a leap year lands in common-year Adar (M06)",
+  "am", 5783, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarI.subtract(months24n, options),
+  5782, 7, "M06", "Subtracting 24 months from leap-year Adar I lands in leap-year Adar (M06)",
+  "am", 5782, null
+);
+
+TemporalHelpers.assertPlainYearMonth(
+  leap2AdarII.subtract(months24n, options),
+  5782, 8, "M07", "Subtracting 24 months from leap-year Adar II lands in leap-year Nisan (M07)",
+  "am", 5782, null
+);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-buddhist.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-buddhist.js
new file mode 100644
index 0000000000000..727c112c8ccf2
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-buddhist.js
@@ -0,0 +1,100 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L., and the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.subtract
+description: Check various basic calculations involving leap years (buddhist calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "buddhist";
+const options = { overflow: "reject" };
+
+// Years
+
+const years1 = new Temporal.Duration(-1);
+const years1n = new Temporal.Duration(1);
+const years4 = new Temporal.Duration(-4);
+const years4n = new Temporal.Duration(4);
+
+const date256302 = Temporal.PlainYearMonth.from({ year: 2563, monthCode: "M02", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date256302.subtract(years1, options),
+  2564, 2, "M02", "add 1y to Feb",
+  "be", 2564);
+TemporalHelpers.assertPlainYearMonth(
+  date256302.subtract(years4, options),
+  2567, 2, "M02", "add 4y to Feb",
+  "be", 2567);
+
+TemporalHelpers.assertPlainYearMonth(
+  date256302.subtract(years1n, options),
+  2562, 2, "M02", "subtract 1y from Feb",
+  "be", 2562);
+TemporalHelpers.assertPlainYearMonth(
+  date256302.subtract(years4n, options),
+  2559, 2, "M02", "subtract 4y from Feb",
+  "be", 2559);
+
+// Months
+
+const months1 = new Temporal.Duration(0, -1);
+const months1n = new Temporal.Duration(0, 1);
+const months5 = new Temporal.Duration(0, -5);
+const months11n = new Temporal.Duration(0, 11);
+const years1months2 = new Temporal.Duration(-1, -2);
+const years1months2n = new Temporal.Duration(1, 2);
+
+const date256301 = Temporal.PlainYearMonth.from({ year: 2563, monthCode: "M01", calendar }, options);
+const date256303 = Temporal.PlainYearMonth.from({ year: 2563, monthCode: "M03", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date256301.subtract(months1, options),
+  2563, 2, "M02", "add 1mo to Jan in leap year",
+  "be", 2563);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2564, monthCode: "M09", calendar }, options).subtract(months5),
+  2565, 2, "M02", "add 5mo with result in the next year",
+  "be", 2565);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2562, monthCode: "M09", calendar }, options).subtract(months5),
+  2563, 2, "M02", "add 5mo with result in the next leap year",
+  "be", 2563);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2564, monthCode: "M12", calendar }, options).subtract(years1months2),
+  2566, 2, "M02", "add 1y 2mo with result in the next year",
+  "be", 2566);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2565, monthCode: "M12", calendar }, options).subtract(years1months2),
+  2567, 2, "M02", "add 1y 2mo with result in the next leap year",
+  "be", 2567);
+
+TemporalHelpers.assertPlainYearMonth(
+  date256303.subtract(months1n, options),
+  2563, 2, "M02", "subtract 1mo from Mar in leap year",
+  "be", 2563);
+
+TemporalHelpers.assertPlainYearMonth(
+  date256301.subtract(months11n, options),
+  2562, 2, "M02", "subtract 11mo with result in the previous year",
+  "be", 2562);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2564, monthCode: "M01", calendar }, options).subtract(months11n, options),
+  2563, 2, "M02", "add 11mo with result in the previous leap year",
+  "be", 2563);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2565, monthCode: "M04", calendar }, options).subtract(years1months2n),
+  2564, 2, "M02", "add 1y 2mo with result in the previous year",
+  "be", 2564);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2564, monthCode: "M04", calendar }, options).subtract(years1months2n),
+  2563, 2, "M02", "add 1y 2mo with result in the previous leap year",
+  "be", 2563);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-coptic.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-coptic.js
new file mode 100644
index 0000000000000..d542cd47636d3
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-coptic.js
@@ -0,0 +1,42 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.subtract
+description: Check various basic calculations involving leap years (coptic calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "coptic";
+const options = { overflow: "reject" };
+
+const leapDay = Temporal.PlainYearMonth.from({ year: 1739, monthCode: "M13", calendar }, options);
+
+const years1 = new Temporal.Duration(-1);
+const years1n = new Temporal.Duration(1);
+const years4 = new Temporal.Duration(-4);
+const years4n = new Temporal.Duration(4);
+
+TemporalHelpers.assertPlainYearMonth(
+  leapDay.subtract(years1, options),
+  1740, 13, "M13", "Adding 1 year to epagomenal month",
+  "am", 1740, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  leapDay.subtract(years1n, options),
+  1738, 13, "M13", "Subtracting 1 year from epagomenal month",
+  "am", 1738, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  leapDay.subtract(years4, options),
+  1743, 13, "M13", "Adding 4 years to epagomenal month",
+  "am", 1743, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  leapDay.subtract(years4n, options),
+  1735, 13, "M13", "Subtracting 4 years from epagomenal month",
+  "am", 1735, null);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-ethioaa.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-ethioaa.js
new file mode 100644
index 0000000000000..1461e8f94f353
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-ethioaa.js
@@ -0,0 +1,42 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.subtract
+description: Check various basic calculations involving leap years (ethioaa calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "ethioaa";
+const options = { overflow: "reject" };
+
+const leapDay = Temporal.PlainYearMonth.from({ year: 7515, monthCode: "M13", calendar }, options);
+
+const years1 = new Temporal.Duration(-1);
+const years1n = new Temporal.Duration(1);
+const years4 = new Temporal.Duration(-4);
+const years4n = new Temporal.Duration(4);
+
+TemporalHelpers.assertPlainYearMonth(
+  leapDay.subtract(years1, options),
+  7516, 13, "M13", "Adding 1 year to epagomenal month",
+  "aa", 7516, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  leapDay.subtract(years1n, options),
+  7514, 13, "M13", "Subtracting 1 year from epagomenal month",
+  "aa", 7514, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  leapDay.subtract(years4, options),
+  7519, 13, "M13", "Adding 4 years to epagomenal month",
+  "aa", 7519, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  leapDay.subtract(years4n, options),
+  7511, 13, "M13", "Subtracting 4 years from epagomenal month",
+  "aa", 7511, null);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-ethiopic.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-ethiopic.js
new file mode 100644
index 0000000000000..0477352923fcb
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-ethiopic.js
@@ -0,0 +1,42 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.subtract
+description: Check various basic calculations involving leap years (ethiopic calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "ethiopic";
+const options = { overflow: "reject" };
+
+const leapDay = Temporal.PlainYearMonth.from({ year: 2015, monthCode: "M13", calendar }, options);
+
+const years1 = new Temporal.Duration(-1);
+const years1n = new Temporal.Duration(1);
+const years4 = new Temporal.Duration(-4);
+const years4n = new Temporal.Duration(4);
+
+TemporalHelpers.assertPlainYearMonth(
+  leapDay.subtract(years1, options),
+  2016, 13, "M13", "Adding 1 year to leap day",
+  "am", 2016, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  leapDay.subtract(years1n, options),
+  2014, 13, "M13", "Subtracting 1 year from leap day",
+  "am", 2014, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  leapDay.subtract(years4, options),
+  2019, 13, "M13", "Adding 4 years to leap day",
+  "am", 2019, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  leapDay.subtract(years4n, options),
+  2011, 13, "M13", "Subtracting 4 years from leap day",
+  "am", 2011, null);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-gregory.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-gregory.js
new file mode 100644
index 0000000000000..a7cd7dfa46153
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-gregory.js
@@ -0,0 +1,102 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L., and the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.subtract
+description: Check various basic calculations involving leap years (gregory calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "gregory";
+const options = { overflow: "reject" };
+
+// Years
+
+const years1 = new Temporal.Duration(-1);
+const years1n = new Temporal.Duration(1);
+const years4 = new Temporal.Duration(-4);
+const years4n = new Temporal.Duration(4);
+
+const date202002 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M02", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202002.subtract(years1, options),
+  2021, 2, "M02", "add 1y to leap day",
+  "ce", 2021);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202002.subtract(years4, options),
+  2024, 2, "M02", "add 4y to leap day",
+  "ce", 2024);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202002.subtract(years1n, options),
+  2019, 2, "M02", "subtract 1y from leap day",
+  "ce", 2019);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202002.subtract(years4n, options),
+  2016, 2, "M02", "subtract 4y from leap day",
+  "ce", 2016);
+
+// Months
+
+const months1 = new Temporal.Duration(0, -1);
+const months1n = new Temporal.Duration(0, 1);
+const months5 = new Temporal.Duration(0, -5);
+const months11n = new Temporal.Duration(0, 11);
+const years1months2 = new Temporal.Duration(-1, -2);
+const years1months2n = new Temporal.Duration(1, 2);
+
+const date202001 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M01", calendar }, options);
+const date202003 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M03", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202001.subtract(months1, options),
+  2020, 2, "M02", "add 1mo to in leap year",
+  "ce", 2020);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2021, monthCode: "M09", calendar }, options).subtract(months5),
+  2022, 2, "M02", "add 5mo with result in the next year",
+  "ce", 2022);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2019, monthCode: "M09", calendar }, options).subtract(months5),
+  2020, 2, "M02", "add 5mo with result in the next leap year",
+  "ce", 2020);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2021, monthCode: "M12", calendar }, options).subtract(years1months2),
+  2023, 2, "M02", "add 1y 2mo with result in the next year",
+  "ce", 2023);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2022, monthCode: "M12", calendar }, options).subtract(years1months2),
+  2024, 2, "M02", "add 1y 2mo with result in the next leap year",
+  "ce", 2024);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202003.subtract(months1n, options),
+  2020, 2, "M02", "subtract 1mo from Mar in leap year",
+  "ce", 2020);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202001.subtract(months11n),
+  2019, 2, "M02", "subtract 11mo with result in the previous year",
+  "ce", 2019);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2021, monthCode: "M01", calendar }, options).subtract(months11n),
+  2020, 2, "M02", "add 11mo with result in the previous leap year",
+  "ce", 2020);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2022, monthCode: "M04", calendar }, options).subtract(years1months2n),
+  2021, 2, "M02", "add 1y 2mo with result in the previous year",
+  "ce", 2021);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2021, monthCode: "M04", calendar }, options).subtract(years1months2n),
+  2020, 2, "M02", "add 1y 2mo with result in the previous leap year",
+  "ce", 2020);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-indian.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-indian.js
new file mode 100644
index 0000000000000..d85d764a1c8a6
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-indian.js
@@ -0,0 +1,42 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.subtract
+description: Check various basic calculations involving leap years (indian calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "indian";
+const options = { overflow: "reject" };
+
+const leapDay = Temporal.PlainYearMonth.from({ year: 1946, monthCode: "M01", calendar }, options);
+
+const years1 = new Temporal.Duration(-1);
+const years1n = new Temporal.Duration(1);
+const years4 = new Temporal.Duration(-4);
+const years4n = new Temporal.Duration(4);
+
+TemporalHelpers.assertPlainYearMonth(
+  leapDay.subtract(years1, options),
+  1947, 1, "M01", "Adding 1 year to Chaitra",
+  "shaka", 1947, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  leapDay.subtract(years1n, options),
+  1945, 1, "M01", "Subtracting 1 year from Chaitra",
+  "shaka", 1945, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  leapDay.subtract(years4, options),
+  1950, 1, "M01", "Adding 4 years to Chaitra",
+  "shaka", 1950, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  leapDay.subtract(years4n, options),
+  1942, 1, "M01", "Subtracting 4 years from Chaitra",
+  "shaka", 1942, null);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-islamic-civil.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-islamic-civil.js
new file mode 100644
index 0000000000000..5a3e5d340f87e
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-islamic-civil.js
@@ -0,0 +1,45 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L., and the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.subtract
+description: Check various basic calculations involving leap years (islamic-civil calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "islamic-civil";
+const options = { overflow: "reject" };
+
+// Month 12 (Dhu al-Hijjah) has 29 days in common years and 30 in leap years.
+// AH 1442, 1445, and 1447 are leap years.
+
+const years1 = new Temporal.Duration(-1);
+const years1n = new Temporal.Duration(1);
+const years2 = new Temporal.Duration(-2);
+const years3n = new Temporal.Duration(3);
+
+const date144512 = Temporal.PlainYearMonth.from({ year: 1445, monthCode: "M12", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date144512.subtract(years1, options),
+  1446, 12, "M12", "add 1y in leap year",
+  "ah", 1446, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date144512.subtract(years2, options),
+  1447, 12, "M12", "add 2y landing in next leap year",
+  "ah", 1447, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date144512.subtract(years1n, options),
+  1444, 12, "M12", "subtract 1y in leap year",
+  "ah", 1444, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date144512.subtract(years3n, options),
+  1442, 12, "M12", "subtract 3y landing in previous leap year",
+  "ah", 1442, null);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-islamic-tbla.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-islamic-tbla.js
new file mode 100644
index 0000000000000..19b2975b6f6cd
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-islamic-tbla.js
@@ -0,0 +1,45 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L., and the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.subtract
+description: Check various basic calculations involving leap years (islamic-tbla calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "islamic-tbla";
+const options = { overflow: "reject" };
+
+// Month 12 (Dhu al-Hijjah) has 29 days in common years and 30 in leap years.
+// AH 1442, 1445, and 1447 are leap years.
+
+const years1 = new Temporal.Duration(-1);
+const years1n = new Temporal.Duration(1);
+const years2 = new Temporal.Duration(-2);
+const years3n = new Temporal.Duration(3);
+
+const date144512 = Temporal.PlainYearMonth.from({ year: 1445, monthCode: "M12", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date144512.subtract(years1, options),
+  1446, 12, "M12", "add 1y in leap year",
+  "ah", 1446, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date144512.subtract(years2, options),
+  1447, 12, "M12", "add 2y landing in next leap year",
+  "ah", 1447, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date144512.subtract(years1n, options),
+  1444, 12, "M12", "subtract 1y in leap year",
+  "ah", 1444, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date144512.subtract(years3n, options),
+  1442, 12, "M12", "subtract 3y landing in previous leap year",
+  "ah", 1442, null);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-japanese.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-japanese.js
new file mode 100644
index 0000000000000..00280b1dfefae
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-japanese.js
@@ -0,0 +1,102 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L., and the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.subtract
+description: Check various basic calculations involving leap years (japanese calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "japanese";
+const options = { overflow: "reject" };
+
+// Years
+
+const years1 = new Temporal.Duration(-1);
+const years1n = new Temporal.Duration(1);
+const years4 = new Temporal.Duration(-4);
+const years4n = new Temporal.Duration(4);
+
+const date202002 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M02", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202002.subtract(years1, options),
+  2021, 2, "M02", "add 1y to Feb",
+  "reiwa", 3);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202002.subtract(years4, options),
+  2024, 2, "M02", "add 4y to Feb",
+  "reiwa", 6);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202002.subtract(years1n, options),
+  2019, 2, "M02", "subtract 1y from Feb",
+  "heisei", 31);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202002.subtract(years4n, options),
+  2016, 2, "M02", "subtract 4y from Feb",
+  "heisei", 28);
+
+// Months
+
+const months1 = new Temporal.Duration(0, -1);
+const months1n = new Temporal.Duration(0, 1);
+const months5 = new Temporal.Duration(0, -5);
+const months11n = new Temporal.Duration(0, 11);
+const years1months2 = new Temporal.Duration(-1, -2);
+const years1months2n = new Temporal.Duration(1, 2);
+
+const date202001 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M01", calendar }, options);
+const date202003 = Temporal.PlainYearMonth.from({ year: 2020, monthCode: "M03", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202001.subtract(months1, options),
+  2020, 2, "M02", "add 1mo to Jan",
+  "reiwa", 2);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2021, monthCode: "M09", calendar }, options).subtract(months5),
+  2022, 2, "M02", "add 5mo with result in the next year",
+  "reiwa", 4);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2019, monthCode: "M09", calendar }, options).subtract(months5),
+  2020, 2, "M02", "add 5mo with result in the next leap year",
+  "reiwa", 2);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2021, monthCode: "M12", calendar }, options).subtract(years1months2),
+  2023, 2, "M02", "add 1y 2mo with result in the next year",
+  "reiwa", 5);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2022, monthCode: "M12", calendar }, options).subtract(years1months2),
+  2024, 2, "M02", "add 1y 2mo with result in the next leap year",
+  "reiwa", 6);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202003.subtract(months1n, options),
+  2020, 2, "M02", "subtract 1mo from Mar",
+  "reiwa", 2);
+
+TemporalHelpers.assertPlainYearMonth(
+  date202001.subtract(months11n, options),
+  2019, 2, "M02", "subtract 11mo with result in the previous year",
+  "heisei", 31);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2021, monthCode: "M01", calendar }, options).subtract(months11n, options),
+  2020, 2, "M02", "add 11mo with result in the previous leap year",
+  "reiwa", 2);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2022, monthCode: "M04", calendar }, options).subtract(years1months2n, options),
+  2021, 2, "M02", "add 1y 2mo with result in the previous year",
+  "reiwa", 3);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 2021, monthCode: "M04", calendar }, options).subtract(years1months2n, options),
+  2020, 2, "M02", "add 1y 2mo with result in the previous leap year",
+  "reiwa", 2);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-persian.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-persian.js
new file mode 100644
index 0000000000000..4cdd1cb080ea6
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-persian.js
@@ -0,0 +1,93 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L., and the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.subtract
+description: Check various basic calculations involving leap years (Persian calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "persian";
+const options = { overflow: "reject" };
+
+// Years
+
+const years1 = new Temporal.Duration(-1);
+const years1n = new Temporal.Duration(1);
+const years4 = new Temporal.Duration(-4);
+const years4n = new Temporal.Duration(4);
+
+const date136212 = Temporal.PlainYearMonth.from({ year: 1362, monthCode: "M12", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date136212.subtract(years1, options),
+  1363, 12, "M12", "add 1y in leap year",
+  "ap", 1363, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date136212.subtract(years4, options),
+  1366, 12, "M12", "add 4y in leap year",
+  "ap", 1366, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date136212.subtract(years1n, options),
+  1361, 12, "M12", "subtract 1y in leap year",
+  "ap", 1361, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date136212.subtract(years4n, options),
+  1358, 12, "M12", "subtract 4y in leap year",
+  "ap", 1358, null);
+
+// Months
+
+const months1n = new Temporal.Duration(0, 1);
+const months6 = new Temporal.Duration(0, -6);
+const months11n = new Temporal.Duration(0, 11);
+const years1months2 = new Temporal.Duration(-1, -2);
+const years1months2n = new Temporal.Duration(1, 2);
+
+const date136206 = Temporal.PlainYearMonth.from({ year: 1362, monthCode: "M06", calendar }, options);
+const date136211 = Temporal.PlainYearMonth.from({ year: 1362, monthCode: "M11", calendar }, options);
+const date136301 = Temporal.PlainYearMonth.from({ year: 1363, monthCode: "M01", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date136206.subtract(months6, options),
+  1362, 12, "M12", "add 6mo to Shahrivar in leap year",
+  "ap", 1362, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 1362, monthCode: "M10", calendar }, options).subtract(years1months2, options),
+  1363, 12, "M12", "add 1y 2mo with result in the next year",
+  "ap", 1363, null);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 1361, monthCode: "M10", calendar }, options).subtract(years1months2),
+  1362, 12, "M12", "add 1y 2mo with result in the next leap year",
+  "ap", 1362, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date136301.subtract(months1n, options),
+  1362, 12, "M12", "subtract 1mo from Farvardin in leap year",
+  "ap", 1362, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  date136211.subtract(months11n, options),
+  1361, 12, "M12", "subtract 11mo with result in the previous year",
+  "ap", 1361, null);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 1363, monthCode: "M11", calendar }, options).subtract(months11n, options),
+  1362, 12, "M12", "subtract 11mo with result in the previous leap year",
+  "ap", 1362, null);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 1364, monthCode: "M02", calendar }, options).subtract(years1months2n, options),
+  1362, 12, "M12", "add 1y 2mo with result in the previous year",
+  "ap", 1362, null);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 1365, monthCode: "M02", calendar }, options).subtract(years1months2n, options),
+  1363, 12, "M12", "add 1y 2mo with result in the previous leap year",
+  "ap", 1363, null);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-roc.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-roc.js
new file mode 100644
index 0000000000000..3231e5bbabfad
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-roc.js
@@ -0,0 +1,102 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L., and the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.subtract
+description: Check various basic calculations involving leap years (roc calendar)
+features: [Temporal, Intl.Era-monthcode]
+includes: [temporalHelpers.js]
+---*/
+
+const calendar = "roc";
+const options = { overflow: "reject" };
+
+// Years
+
+const years1 = new Temporal.Duration(-1);
+const years1n = new Temporal.Duration(1);
+const years4 = new Temporal.Duration(-4);
+const years4n = new Temporal.Duration(4);
+
+const date10902 = Temporal.PlainYearMonth.from({ year: 109, monthCode: "M02", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date10902.subtract(years1),
+  110, 2, "M02", "add 1y in leap year",
+  "roc", 110);
+
+TemporalHelpers.assertPlainYearMonth(
+  date10902.subtract(years4, options),
+  113, 2, "M02", "add 4y in leap year",
+  "roc", 113);
+
+TemporalHelpers.assertPlainYearMonth(
+  date10902.subtract(years1n),
+  108, 2, "M02", "subtract 1y in leap year",
+  "roc", 108);
+
+TemporalHelpers.assertPlainYearMonth(
+  date10902.subtract(years4n, options),
+  105, 2, "M02", "subtract 4y in leap year",
+  "roc", 105);
+
+// Months
+
+const months1 = new Temporal.Duration(0, -1);
+const months1n = new Temporal.Duration(0, 1);
+const months5 = new Temporal.Duration(0, -5);
+const months11n = new Temporal.Duration(0, 11);
+const years1months2 = new Temporal.Duration(-1, -2);
+const years1months2n = new Temporal.Duration(1, 2);
+
+const date10901 = Temporal.PlainYearMonth.from({ year: 109, monthCode: "M01", calendar }, options);
+const date10903 = Temporal.PlainYearMonth.from({ year: 109, monthCode: "M03", calendar }, options);
+
+TemporalHelpers.assertPlainYearMonth(
+  date10901.subtract(months1, options),
+  109, 2, "M02", "add 1mo to Jan in leap year",
+  "roc", 109);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 110, monthCode: "M09", calendar }, options).subtract(months5, options),
+  111, 2, "M02", "add 5mo with result in the next year",
+  "roc", 111);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 108, monthCode: "M09", calendar }, options).subtract(months5, options),
+  109, 2, "M02", "add 5mo with result in the next leap year",
+  "roc", 109);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 110, monthCode: "M12", calendar }, options).subtract(years1months2, options),
+  112, 2, "M02", "add 1y 2mo with result in the next year",
+  "roc", 112);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 111, monthCode: "M12", calendar }, options).subtract(years1months2, options),
+  113, 2, "M02", "add 1y 2mo with result in the next leap year",
+  "roc", 113);
+
+TemporalHelpers.assertPlainYearMonth(
+  date10903.subtract(months1n, options),
+  109, 2, "M02", "subtract 1mo from Mar in leap year",
+  "roc", 109);
+
+TemporalHelpers.assertPlainYearMonth(
+  date10901.subtract(months11n, options),
+  108, 2, "M02", "subtract 11mo with result in the previous year",
+  "roc", 108);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 110, monthCode: "M01", calendar }, options).subtract(months11n, options),
+  109, 2, "M02", "add 11mo with result in the previous leap year",
+  "roc", 109);
+
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 111, monthCode: "M04", calendar }, options).subtract(years1months2n, options),
+  110, 2, "M02", "add 1y 2mo with result in the previous year",
+  "roc", 110);
+TemporalHelpers.assertPlainYearMonth(
+  Temporal.PlainYearMonth.from({ year: 110, monthCode: "M04", calendar }, options).subtract(years1months2n, options),
+  109, 2, "M02", "add 1y 2mo with result in the previous leap year",
+  "roc", 109);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/shell.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/subtract/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/toLocaleString/datestyle-and-timestyle.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/toLocaleString/datestyle-and-timestyle.js
new file mode 100644
index 0000000000000..27c11157fda19
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/toLocaleString/datestyle-and-timestyle.js
@@ -0,0 +1,17 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.prototype.tolocalestring
+description: Using timeStyle, even if dateStyle is present, should throw
+features: [Temporal]
+---*/
+
+const item = new Temporal.PlainYearMonth(2026, 1, "gregory", 1);
+
+assert.throws(TypeError, function() {
+  item.toLocaleString("en-u-ca-gregory", { dateStyle: "full", timeStyle: "full" });
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/toString/shell.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/toString/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/toString/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/toString/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/until/era-boundary-japanese.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/until/era-boundary-japanese.js
index bb88d72cb3f0a..e9a2cc44feb32 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/until/era-boundary-japanese.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/until/era-boundary-japanese.js
@@ -14,7 +14,9 @@ const options = { overflow: "reject" };
 
 const bce1 = Temporal.PlainYearMonth.from({ era: "bce", eraYear: 1, monthCode: "M06", calendar }, options);
 const ce1 = Temporal.PlainYearMonth.from({ era: "ce", eraYear: 1, monthCode: "M06", calendar }, options);
-const meiji5 = Temporal.PlainYearMonth.from({ era: "meiji", eraYear: 5, monthCode: "M01", calendar }, options);
+const ce1872 = Temporal.PlainYearMonth.from({ era: "ce", eraYear: 1872, monthCode: "M12", calendar }, options);
+const meiji6 = Temporal.PlainYearMonth.from({ era: "meiji", eraYear: 6, monthCode: "M01", calendar}, options);
+const meiji7 = Temporal.PlainYearMonth.from({ era: "meiji", eraYear: 7, monthCode: "M01", calendar }, options);
 const meiji45 = Temporal.PlainYearMonth.from({ era: "meiji", eraYear: 45, monthCode: "M05", calendar }, options);
 const taisho1 = Temporal.PlainYearMonth.from({ era: "taisho", eraYear: 1, monthCode: "M08", calendar }, options);
 const taisho6 = Temporal.PlainYearMonth.from({ era: "taisho", eraYear: 6, monthCode: "M03", calendar }, options);
@@ -82,16 +84,16 @@ const tests = [
     [-63, 0, "-63y backwards from Taisho 6 March to Showa 55 March"],
     [0, -756, "-756mo backwards from Taisho 6 March to Showa 55 March"],
   ],
-  // From Meiji 5 (1872) to Taisho 6 (1917) - crossing era boundary
+  // From Meiji 7 (1874) to Taisho 6 (1917) - crossing era boundary
   [
-    meiji5, taisho6,
-    [45, 2, "45y 2mo from Meiji 5 January to Taisho 6 March"],
-    [0, 542, "542mo from Meiji 5 January to Taisho 6 March"],
+    meiji7, taisho6,
+    [43, 2, "43y 2mo from Meiji 7 January to Taisho 6 March"],
+    [0, 518, "518mo from Meiji 7 January to Taisho 6 March"],
   ],
   [
-    taisho6, meiji5,
-    [-45, -2, "-45y -2mo backwards from Meiji 5 January to Taisho 6 March"],
-    [0, -542, "-542mo backwards from Meiji 5 January to Taisho 6 March"],
+    taisho6, meiji7,
+    [-43, -2, "-43y -2mo backwards from Meiji 7 January to Taisho 6 March"],
+    [0, -518, "-518mo backwards from Meiji 7 January to Taisho 6 March"],
   ],
   // Within same year but different eras
   [
@@ -104,6 +106,17 @@ const tests = [
     [0, -3, "-3mo backwards from Meiji 45 May to Taisho 1 August"],
     [0, -3, "-3mo backwards from Meiji 45 May to Taisho 1 August"],
   ],
+  // Last pre-solar-calendar CE month to first solar-calendar month of Meiji era
+  [
+    ce1872, meiji6,
+    [0, 1, "from month before solar Meiji era to first month"],
+    [0, 1, "from month before solar Meiji era to first month"],
+  ],
+  [
+    meiji6, ce1872,
+    [0, -1, "backwards from month before solar Meiji era to first month"],
+    [0, -1, "backwards from month before solar Meiji era to first month"],
+  ],
   // CE-BCE boundary
   [
     bce1, ce1,
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/until/shell.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/until/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/until/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/until/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/with/shell.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/with/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/with/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/with/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/year/arithmetic-year.js b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/year/arithmetic-year.js
index 2a29ddf2c0048..11b8e52b7156a 100644
--- a/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/year/arithmetic-year.js
+++ b/js/src/tests/test262/intl402/Temporal/PlainYearMonth/prototype/year/arithmetic-year.js
@@ -103,7 +103,7 @@ const tests = {
     [{ era: "bce", eraYear: 2, monthCode: "M06" }, -1],
     [{ era: "bce", eraYear: 1, monthCode: "M12" }, 0],
     [{ era: "ce", eraYear: 1, monthCode: "M07" }, 1],
-    [{ era: "meiji", eraYear: 1, monthCode: "M12" }, 1868],
+    [{ era: "meiji", eraYear: 6, monthCode: "M12" }, 1873],
     [{ era: "taisho", eraYear: 1, monthCode: "M12" }, 1912],
     [{ era: "showa", eraYear: 1, monthCode: "M12" }, 1926],
     [{ era: "heisei", eraYear: 1, monthCode: "M12" }, 1989],
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/canonicalize-calendar.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/canonicalize-calendar.js
index bd0265256a526..e44f7b1600ceb 100644
--- a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/canonicalize-calendar.js
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/canonicalize-calendar.js
@@ -1,5 +1,5 @@
 // |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2024 Igalia, S.L. All rights reserved.
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
@@ -8,7 +8,12 @@ description: Calendar ID is canonicalized
 features: [Temporal]
 ---*/
 
-const result = new Temporal.ZonedDateTime(1719923640_000_000_000n, "UTC", "islamicc");
+var result = new Temporal.ZonedDateTime(1719923640_000_000_000n, "UTC", "islamicc");
 assert.sameValue(result.calendarId, "islamic-civil", "calendar ID is canonicalized");
 
+// May need to be removed in the future.
+// See https://github.com/tc39/ecma402/issues/285
+result = new Temporal.ZonedDateTime(1719923640_000_000_000n, "UTC", "ethiopic-amete-alem");
+assert.sameValue(result.calendarId, "ethioaa", "calendar ID is canonicalized");
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/from/calendar-invalid-era-with-era-year.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/from/calendar-invalid-era-with-era-year.js
new file mode 100644
index 0000000000000..9a5962dd16f38
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/from/calendar-invalid-era-with-era-year.js
@@ -0,0 +1,34 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.from
+description: RangeError thrown if era is invalid for this calendar with year absent and eraYear present
+features: [Temporal]
+---*/
+
+const calendarsWithEras = [
+  "buddhist",
+  "coptic",
+  "ethioaa",
+  "ethiopic",
+  "gregory",
+  "hebrew",
+  "indian",
+  "islamic-civil",
+  "islamic-tbla",
+  "islamic-umalqura",
+  "japanese",
+  "persian",
+  "roc",
+];
+
+calendarsWithEras.forEach((calendar) => {
+  // "xyz" is not a valid era in any supported calendar
+  assert.throws(RangeError,
+    () => Temporal.ZonedDateTime.from({ month: 1, day: 1, hour: 12, minute: 34, timeZone: "UTC", era: "xyz", eraYear: 2025, calendar }),
+    `xyz is not a valid era in calendar ${calendar}`);
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/from/calendar-invalid-era.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/from/calendar-invalid-era.js
new file mode 100644
index 0000000000000..5705946a4092b
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/from/calendar-invalid-era.js
@@ -0,0 +1,45 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.from
+description: RangeError thrown if era is invalid for this calendar
+features: [Temporal]
+---*/
+
+const calendarsWithEras = [
+  "buddhist",
+  "coptic",
+  "ethioaa",
+  "ethiopic",
+  "gregory",
+  "hebrew",
+  "indian",
+  "islamic-civil",
+  "islamic-tbla",
+  "islamic-umalqura",
+  "japanese",
+  "persian",
+  "roc",
+];
+
+const calendarsWithoutEras = [
+  "chinese",
+  "dangi",
+];
+
+calendarsWithEras.forEach((calendar) => {
+  // "xyz" is not a valid era in any supported calendar
+  assert.throws(RangeError,
+    () => Temporal.ZonedDateTime.from({ year: 2025, month: 1, day: 1, hour: 12, minute: 34, timeZone: "UTC", era: "xyz", eraYear: 2025, calendar }),
+    `xyz is not a valid era in calendar ${calendar}`);
+});
+
+calendarsWithoutEras.forEach((calendar) => {
+  // era is ignored
+  const result = Temporal.ZonedDateTime.from({ year: 2025, month: 1, day: 1, hour: 12, minute: 34, timeZone: "UTC", era: "xyz", eraYear: 2025, calendar });
+  assert.sameValue(result instanceof Temporal.ZonedDateTime, true, `era should be ignored for calendar ${calendar}`);
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/from/era-boundary-japanese.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/from/era-boundary-japanese.js
index 14c5abbe0864d..d7417332f2123 100644
--- a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/from/era-boundary-japanese.js
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/from/era-boundary-japanese.js
@@ -116,6 +116,24 @@ TemporalHelpers.assertPlainDateTime(
   1868, 10, "M10", 22, 12, 34, 0, 0, 0, 0, "Meiji 1 resolves to CE 1868 before era start date",
   "ce", 1868);
 
+const meiji1AfterStart = Temporal.ZonedDateTime.from({ era: "meiji", eraYear: 1, monthCode: "M10", day: 23, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+TemporalHelpers.assertPlainDateTime(
+  meiji1AfterStart.toPlainDateTime(),
+  1868, 10, "M10", 23, 12, 34, 0, 0, 0, 0, "Meiji 1 still resolves to CE 1868 after era start date",
+  "ce", 1868);
+
+const meiji5 = Temporal.ZonedDateTime.from({ era: "meiji", eraYear: 5, monthCode: "M12", day: 31, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+TemporalHelpers.assertPlainDateTime(
+  meiji5.toPlainDateTime(),
+  1872, 12, "M12", 31, 12, 34, 0, 0, 0, 0, "Meiji 5 resolves to CE 1872",
+  "ce", 1872);
+
+const ce1873 = Temporal.ZonedDateTime.from({ era: "ce", eraYear: 1873, monthCode: "M01", day: 1, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+TemporalHelpers.assertPlainDateTime(
+  ce1873.toPlainDateTime(),
+  1873, 1, "M01", 1, 12, 34, 0, 0, 0, 0, "CE 1873 resolves to Meiji 6",
+  "meiji", 6);
+
 const meiji0 = Temporal.ZonedDateTime.from({ era: "meiji", eraYear: 0, monthCode: "M10", day: 23, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
 TemporalHelpers.assertPlainDateTime(
   meiji0.toPlainDateTime(),
@@ -128,12 +146,6 @@ TemporalHelpers.assertPlainDateTime(
   1866, 10, "M10", 23, 12, 34, 0, 0, 0, 0, "Meiji -1 resolves to CE 1866",
   "ce", 1866);
 
-const ce1868AfterStart = Temporal.ZonedDateTime.from({ era: "ce", eraYear: 1868, monthCode: "M10", day: 23, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
-TemporalHelpers.assertPlainDateTime(
-  ce1868AfterStart.toPlainDateTime(),
-  1868, 10, "M10", 23, 12, 34, 0, 0, 0, 0, "CE 1868 resolves to Meiji 1 after era start date",
-  "meiji", 1);
-
 const ce0 = Temporal.ZonedDateTime.from({ era: "ce", eraYear: 0, monthCode: "M01", day: 1, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
 TemporalHelpers.assertPlainDateTime(
   ce0.toPlainDateTime(),
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/from/era-japanese.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/from/era-japanese.js
index 6c08865b3df07..90a18063e238a 100644
--- a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/from/era-japanese.js
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/from/era-japanese.js
@@ -16,7 +16,7 @@ const reiwa = Temporal.ZonedDateTime.from({ era: "reiwa", eraYear: 2, month: 1,
 const heisei = Temporal.ZonedDateTime.from({ era: "heisei", eraYear: 2, month: 1, day: 1, hour: 12, minute: 34, timeZone: "UTC",  calendar });
 const showa = Temporal.ZonedDateTime.from({ era: "showa", eraYear: 2, month: 1, day: 1, hour: 12, minute: 34, timeZone: "UTC",  calendar });
 const taisho = Temporal.ZonedDateTime.from({ era: "taisho", eraYear: 2, month: 1, day: 1, hour: 12, minute: 34, timeZone: "UTC",  calendar });
-const meiji = Temporal.ZonedDateTime.from({ era: "meiji", eraYear: 2, month: 1, day: 1, hour: 12, minute: 34, timeZone: "UTC",  calendar });
+const meiji = Temporal.ZonedDateTime.from({ era: "meiji", eraYear: 6, month: 1, day: 1, hour: 12, minute: 34, timeZone: "UTC",  calendar });
 const ce = Temporal.ZonedDateTime.from({ era: "ce", eraYear: 1000, month: 1, day: 1, hour: 12, minute: 34, timeZone: "UTC",  calendar });
 const bce = Temporal.ZonedDateTime.from({ era: "bce", eraYear: 1, month: 1, day: 1, hour: 12, minute: 34, timeZone: "UTC",  calendar });
 
@@ -28,7 +28,7 @@ TemporalHelpers.assertPlainDateTime(showa.toPlainDateTime(), 1927, 1, "M01", 1,
 
 TemporalHelpers.assertPlainDateTime(taisho.toPlainDateTime(), 1913, 1, "M01", 1, 12, 34, 0, 0, 0, 0,  `${taisho}`, "taisho", 2);
 
-TemporalHelpers.assertPlainDateTime(meiji.toPlainDateTime(), 1869, 1, "M01", 1, 12, 34, 0, 0, 0, 0,  `${meiji}`, "meiji", 2);
+TemporalHelpers.assertPlainDateTime(meiji.toPlainDateTime(), 1873, 1, "M01", 1, 12, 34, 0, 0, 0, 0,  `${meiji}`, "meiji", 6);
 
 TemporalHelpers.assertPlainDateTime(ce.toPlainDateTime(), 1000, 1, "M01", 1, 12, 34, 0, 0, 0, 0,  `${ce} (CE)`, "ce", 1000);
 
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/from/invalid-month-codes-hebrew.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/from/invalid-month-codes-hebrew.js
index 620ecef94531d..a9b6226c29d66 100644
--- a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/from/invalid-month-codes-hebrew.js
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/from/invalid-month-codes-hebrew.js
@@ -10,10 +10,16 @@ features: [Temporal, Intl.Era-monthcode]
 
 const calendar = "hebrew";
 
+// 5779 is a leap year
 assert.throws(RangeError, () => {
   Temporal.ZonedDateTime.from({ year: 5779, monthCode: "M13", day: 1, hour: 12, minute: 34, timeZone: "UTC", calendar });
 }, "M13 should not be a valid month code");
 
+// 5781 is a common year
+assert.throws(RangeError, () => {
+  Temporal.ZonedDateTime.from({ year: 5781, monthCode: "M13", day: 1, hour: 12, minute: 34, timeZone: "UTC", calendar });
+}, "M13 should not be a valid month code");
+
 // Invalid leap months: e.g. M02L
 for (var i = 1; i <= 12; i++) {
   if (i === 5)
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/links-africa.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/links-africa.js
deleted file mode 100644
index 15e10077587d5..0000000000000
--- a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/links-africa.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2022 André Bargull. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: sec-temporal.zoneddatetime
-description: ZonedDateTime constructor accepts link names as time zone ID input
-features: [Temporal]
----*/
-
-const testCases = [
-  "Africa/Accra",  // Link Africa/Abidjan Africa/Accra        # Ghana
-  "Africa/Bamako",  // Link Africa/Abidjan Africa/Bamako       # Mali
-  "Africa/Banjul",  // Link Africa/Abidjan Africa/Banjul       # The Gambia
-  "Africa/Conakry",  // Link Africa/Abidjan Africa/Conakry      # Guinea
-  "Africa/Dakar",  // Link Africa/Abidjan Africa/Dakar        # Senegal
-  "Africa/Freetown",  // Link Africa/Abidjan Africa/Freetown     # Sierra Leone
-  "Africa/Lome",  // Link Africa/Abidjan Africa/Lome         # Togo
-  "Africa/Nouakchott",  // Link Africa/Abidjan Africa/Nouakchott   # Mauritania
-  "Africa/Ouagadougou",  // Link Africa/Abidjan Africa/Ouagadougou  # Burkina Faso
-  "Atlantic/St_Helena",  // Link Africa/Abidjan Atlantic/St_Helena  # St Helena
-  "Africa/Addis_Ababa",  // Link Africa/Nairobi Africa/Addis_Ababa   # Ethiopia
-  "Africa/Asmara",  // Link Africa/Nairobi Africa/Asmara        # Eritrea
-  "Africa/Dar_es_Salaam",  // Link Africa/Nairobi Africa/Dar_es_Salaam # Tanzania
-  "Africa/Djibouti",  // Link Africa/Nairobi Africa/Djibouti
-  "Africa/Kampala",  // Link Africa/Nairobi Africa/Kampala       # Uganda
-  "Africa/Mogadishu",  // Link Africa/Nairobi Africa/Mogadishu     # Somalia
-  "Indian/Antananarivo",  // Link Africa/Nairobi Indian/Antananarivo  # Madagascar
-  "Indian/Comoro",  // Link Africa/Nairobi Indian/Comoro
-  "Indian/Mayotte",  // Link Africa/Nairobi Indian/Mayotte
-  "Africa/Blantyre",  // Link Africa/Maputo Africa/Blantyre      # Malawi
-  "Africa/Bujumbura",  // Link Africa/Maputo Africa/Bujumbura     # Burundi
-  "Africa/Gaborone",  // Link Africa/Maputo Africa/Gaborone      # Botswana
-  "Africa/Harare",  // Link Africa/Maputo Africa/Harare        # Zimbabwe
-  "Africa/Kigali",  // Link Africa/Maputo Africa/Kigali        # Rwanda
-  "Africa/Lubumbashi",  // Link Africa/Maputo Africa/Lubumbashi    # E Dem. Rep. of Congo
-  "Africa/Lusaka",  // Link Africa/Maputo Africa/Lusaka        # Zambia
-  "Africa/Bangui",  // Link Africa/Lagos Africa/Bangui         # Central African Republic
-  "Africa/Brazzaville",  // Link Africa/Lagos Africa/Brazzaville    # Rep. of the Congo
-  "Africa/Douala",  // Link Africa/Lagos Africa/Douala         # Cameroon
-  "Africa/Kinshasa",  // Link Africa/Lagos Africa/Kinshasa       # Dem. Rep. of the Congo (west)
-  "Africa/Libreville",  // Link Africa/Lagos Africa/Libreville     # Gabon
-  "Africa/Luanda",  // Link Africa/Lagos Africa/Luanda         # Angola
-  "Africa/Malabo",  // Link Africa/Lagos Africa/Malabo         # Equatorial Guinea
-  "Africa/Niamey",  // Link Africa/Lagos Africa/Niamey         # Niger
-  "Africa/Porto-Novo",  // Link Africa/Lagos Africa/Porto-Novo     # Benin
-  "Africa/Maseru",  // Link Africa/Johannesburg Africa/Maseru  # Lesotho
-  "Africa/Mbabane",  // Link Africa/Johannesburg Africa/Mbabane # Eswatini
-];
-
-for (let id of testCases) {
-  const instance = new Temporal.ZonedDateTime(0n, id);
-  assert.sameValue(instance.timeZoneId, id);
-}
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/links-asia.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/links-asia.js
deleted file mode 100644
index a9bd238841059..0000000000000
--- a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/links-asia.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2022 André Bargull. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: sec-temporal.zoneddatetime
-description: ZonedDateTime constructor accepts link names as time zone ID input
-features: [Temporal, canonical-tz]
----*/
-
-const testCases = [
-  "Europe/Nicosia",  // Link    Asia/Nicosia    Europe/Nicosia
-  "Asia/Bahrain",  // Link Asia/Qatar Asia/Bahrain
-  "Antarctica/Syowa",  // Link Asia/Riyadh Antarctica/Syowa
-  "Asia/Aden",  // Link Asia/Riyadh Asia/Aden      # Yemen
-  "Asia/Kuwait",  // Link Asia/Riyadh Asia/Kuwait
-  "Asia/Phnom_Penh",  // Link Asia/Bangkok Asia/Phnom_Penh       # Cambodia
-  "Asia/Vientiane",  // Link Asia/Bangkok Asia/Vientiane        # Laos
-  "Asia/Muscat",  // Link Asia/Dubai Asia/Muscat     # Oman
-];
-
-for (let id of testCases) {
-  const instance = new Temporal.ZonedDateTime(0n, id);
-  assert.sameValue(instance.timeZoneId, id);
-}
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/links-australasia.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/links-australasia.js
deleted file mode 100644
index e543fe2ee7ed9..0000000000000
--- a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/links-australasia.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2022 André Bargull. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: sec-temporal.zoneddatetime
-description: ZonedDateTime constructor accepts link names as time zone ID input
-features: [Temporal]
----*/
-
-const testCases = [
-  "Pacific/Saipan",  // Link Pacific/Guam Pacific/Saipan # N Mariana Is
-  "Antarctica/McMurdo",  // Link Pacific/Auckland Antarctica/McMurdo
-  "Antarctica/DumontDUrville",  // Link Pacific/Port_Moresby Antarctica/DumontDUrville
-  "Pacific/Midway",  // Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands
-];
-
-for (let id of testCases) {
-  const instance = new Temporal.ZonedDateTime(0n, id);
-  assert.sameValue(instance.timeZoneId, id);
-}
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/links-europe.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/links-europe.js
deleted file mode 100644
index 66d40c1b56d08..0000000000000
--- a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/links-europe.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2022 André Bargull. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: sec-temporal.zoneddatetime
-description: ZonedDateTime constructor accepts link names as time zone ID input
-features: [Temporal, canonical-tz]
----*/
-
-const testCases = [
-  "Europe/Jersey",  // Link    Europe/London   Europe/Jersey
-  "Europe/Guernsey",  // Link    Europe/London   Europe/Guernsey
-  "Europe/Isle_of_Man",  // Link    Europe/London   Europe/Isle_of_Man
-  "Europe/Mariehamn",  // Link    Europe/Helsinki Europe/Mariehamn
-  "Europe/Busingen",  // Link    Europe/Zurich   Europe/Busingen
-  "Europe/Vatican",  // Link    Europe/Rome     Europe/Vatican
-  "Europe/San_Marino",  // Link    Europe/Rome     Europe/San_Marino
-  "Europe/Vaduz",  // Link Europe/Zurich Europe/Vaduz
-  "Arctic/Longyearbyen",  // Link    Europe/Oslo     Arctic/Longyearbyen
-  "Europe/Ljubljana",  // Link Europe/Belgrade Europe/Ljubljana   # Slovenia
-  "Europe/Podgorica",  // Link Europe/Belgrade Europe/Podgorica   # Montenegro
-  "Europe/Sarajevo",  // Link Europe/Belgrade Europe/Sarajevo    # Bosnia and Herzegovina
-  "Europe/Skopje",  // Link Europe/Belgrade Europe/Skopje      # North Macedonia
-  "Europe/Zagreb",  // Link Europe/Belgrade Europe/Zagreb      # Croatia
-  "Europe/Bratislava",  // Link Europe/Prague Europe/Bratislava
-  "Asia/Istanbul",  // Link    Europe/Istanbul Asia/Istanbul   # Istanbul is in both continents.
-];
-
-for (let id of testCases) {
-  const instance = new Temporal.ZonedDateTime(0n, id);
-  assert.sameValue(instance.timeZoneId, id);
-}
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/links-northamerica.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/links-northamerica.js
deleted file mode 100644
index 208a25e084571..0000000000000
--- a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/links-northamerica.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2022 André Bargull. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: sec-temporal.zoneddatetime
-description: ZonedDateTime constructor accepts link names as time zone ID input
-features: [Temporal, canonical-tz]
----*/
-
-const testCases = [
-  "America/Creston",  // Link America/Phoenix America/Creston
-  "America/Nassau",  // Link America/Toronto America/Nassau
-  "America/Atikokan",  // Link America/Panama America/Atikokan
-  "America/Cayman",  // Link America/Panama America/Cayman
-  "America/Anguilla",  // Link America/Puerto_Rico America/Anguilla
-  "America/Antigua",  // Link America/Puerto_Rico America/Antigua
-  "America/Aruba",  // Link America/Puerto_Rico America/Aruba
-  "America/Curacao",  // Link America/Puerto_Rico America/Curacao
-  "America/Blanc-Sablon",  // Link America/Puerto_Rico America/Blanc-Sablon   # Quebec (Lower North Shore)
-  "America/Dominica",  // Link America/Puerto_Rico America/Dominica
-  "America/Grenada",  // Link America/Puerto_Rico America/Grenada
-  "America/Guadeloupe",  // Link America/Puerto_Rico America/Guadeloupe
-  "America/Kralendijk",  // Link America/Puerto_Rico America/Kralendijk     # Caribbean Netherlands
-  "America/Lower_Princes",  // Link America/Puerto_Rico America/Lower_Princes  # Sint Maarten
-  "America/Marigot",  // Link America/Puerto_Rico America/Marigot        # St Martin (French part)
-  "America/Montserrat",  // Link America/Puerto_Rico America/Montserrat
-  "America/Port_of_Spain",  // Link America/Puerto_Rico America/Port_of_Spain  # Trinidad & Tobago
-  "America/St_Barthelemy",  // Link America/Puerto_Rico America/St_Barthelemy  # St Barthélemy
-  "America/St_Kitts",  // Link America/Puerto_Rico America/St_Kitts       # St Kitts & Nevis
-  "America/St_Lucia",  // Link America/Puerto_Rico America/St_Lucia
-  "America/St_Thomas",  // Link America/Puerto_Rico America/St_Thomas      # Virgin Islands (US)
-  "America/St_Vincent",  // Link America/Puerto_Rico America/St_Vincent
-  "America/Tortola",  // Link America/Puerto_Rico America/Tortola        # Virgin Islands (UK)
-];
-
-for (let id of testCases) {
-  const instance = new Temporal.ZonedDateTime(0n, id);
-  assert.sameValue(instance.timeZoneId, id);
-}
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/links.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/links.js
new file mode 100644
index 0000000000000..e8950f792c9c1
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/links.js
@@ -0,0 +1,337 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2022 André Bargull. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime
+description: ZonedDateTime constructor accepts link names as time zone ID input
+features: [Temporal, canonical-tz]
+---*/
+
+const asiaTestCases = {
+  "Europe/Nicosia": "Asia/Nicosia",
+  "Asia/Ashkhabad": "Asia/Ashgabat",
+  "Asia/Calcutta": "Asia/Kolkata",
+  "Asia/Choibalsan": "Asia/Ulaanbaatar",
+  "Asia/Chongqing": "Asia/Shanghai",
+  "Asia/Chungking": "Asia/Shanghai",
+  "Asia/Dacca": "Asia/Dhaka",
+  "Asia/Harbin": "Asia/Shanghai",
+  "Asia/Istanbul": "Europe/Istanbul",
+  "Asia/Kashgar": "Asia/Urumqi",
+  "Asia/Katmandu": "Asia/Kathmandu",
+  "Asia/Macao": "Asia/Macau",
+  "Asia/Rangoon": "Asia/Yangon",
+  "Asia/Saigon": "Asia/Ho_Chi_Minh",
+  "Asia/Tel_Aviv": "Asia/Jerusalem",
+  "Asia/Thimbu": "Asia/Thimphu",
+  "Asia/Ujung_Pandang": "Asia/Makassar",
+  "Asia/Ulan_Bator": "Asia/Ulaanbaatar",
+};
+
+const asiaHistoricalTestCases = [
+  "Antarctica/Syowa", // Link Asia/Riyadh Antarctica/Syowa
+  "Asia/Aden", // Link Asia/Riyadh Asia/Aden      # Yemen
+  "Asia/Bahrain", // Link Asia/Qatar Asia/Bahrain
+  "Asia/Kuwait", // Link Asia/Riyadh Asia/Kuwait
+  "Asia/Phnom_Penh", // Link Asia/Bangkok Asia/Phnom_Penh       # Cambodia
+  "Asia/Vientiane", // Link Asia/Bangkok Asia/Vientiane        # Laos
+  "Asia/Muscat", // Link Asia/Dubai Asia/Muscat     # Oman
+];
+
+const africaTestCases = {
+  "Africa/Asmera": "Africa/Asmara",
+  "Africa/Timbuktu": "Africa/Bamako",
+};
+
+const africaHistoricalTestCases = [
+  "Africa/Accra",  // Link Africa/Abidjan Africa/Accra        # Ghana
+  "Africa/Bamako",  // Link Africa/Abidjan Africa/Bamako       # Mali
+  "Africa/Banjul",  // Link Africa/Abidjan Africa/Banjul       # The Gambia
+  "Africa/Conakry",  // Link Africa/Abidjan Africa/Conakry      # Guinea
+  "Africa/Dakar",  // Link Africa/Abidjan Africa/Dakar        # Senegal
+  "Africa/Freetown",  // Link Africa/Abidjan Africa/Freetown     # Sierra Leone
+  "Africa/Lome",  // Link Africa/Abidjan Africa/Lome         # Togo
+  "Africa/Nouakchott",  // Link Africa/Abidjan Africa/Nouakchott   # Mauritania
+  "Africa/Ouagadougou",  // Link Africa/Abidjan Africa/Ouagadougou  # Burkina Faso
+  "Atlantic/St_Helena",  // Link Africa/Abidjan Atlantic/St_Helena  # St Helena
+  "Africa/Addis_Ababa",  // Link Africa/Nairobi Africa/Addis_Ababa   # Ethiopia
+  "Africa/Asmara",  // Link Africa/Nairobi Africa/Asmara        # Eritrea
+  "Africa/Dar_es_Salaam",  // Link Africa/Nairobi Africa/Dar_es_Salaam # Tanzania
+  "Africa/Djibouti",  // Link Africa/Nairobi Africa/Djibouti
+  "Africa/Kampala",  // Link Africa/Nairobi Africa/Kampala       # Uganda
+  "Africa/Mogadishu",  // Link Africa/Nairobi Africa/Mogadishu     # Somalia
+  "Indian/Antananarivo",  // Link Africa/Nairobi Indian/Antananarivo  # Madagascar
+  "Indian/Comoro",  // Link Africa/Nairobi Indian/Comoro
+  "Indian/Mayotte",  // Link Africa/Nairobi Indian/Mayotte
+  "Africa/Blantyre",  // Link Africa/Maputo Africa/Blantyre      # Malawi
+  "Africa/Bujumbura",  // Link Africa/Maputo Africa/Bujumbura     # Burundi
+  "Africa/Gaborone",  // Link Africa/Maputo Africa/Gaborone      # Botswana
+  "Africa/Harare",  // Link Africa/Maputo Africa/Harare        # Zimbabwe
+  "Africa/Kigali",  // Link Africa/Maputo Africa/Kigali        # Rwanda
+  "Africa/Lubumbashi",  // Link Africa/Maputo Africa/Lubumbashi    # E Dem. Rep. of Congo
+  "Africa/Lusaka",  // Link Africa/Maputo Africa/Lusaka        # Zambia
+  "Africa/Bangui",  // Link Africa/Lagos Africa/Bangui         # Central African Republic
+  "Africa/Brazzaville",  // Link Africa/Lagos Africa/Brazzaville    # Rep. of the Congo
+  "Africa/Douala",  // Link Africa/Lagos Africa/Douala         # Cameroon
+  "Africa/Kinshasa",  // Link Africa/Lagos Africa/Kinshasa       # Dem. Rep. of the Congo (west)
+  "Africa/Libreville",  // Link Africa/Lagos Africa/Libreville     # Gabon
+  "Africa/Luanda",  // Link Africa/Lagos Africa/Luanda         # Angola
+  "Africa/Malabo",  // Link Africa/Lagos Africa/Malabo         # Equatorial Guinea
+  "Africa/Niamey",  // Link Africa/Lagos Africa/Niamey         # Niger
+  "Africa/Porto-Novo",  // Link Africa/Lagos Africa/Porto-Novo     # Benin
+  "Africa/Maseru",  // Link Africa/Johannesburg Africa/Maseru  # Lesotho
+  "Africa/Mbabane",  // Link Africa/Johannesburg Africa/Mbabane # Eswatini
+];
+
+const australasiaTestCases = {
+  "Antarctica/South_Pole": "Antarctica/McMurdo",
+  "Australia/ACT": "Australia/Sydney",
+  "Australia/Canberra": "Australia/Sydney",
+  "Australia/Currie": "Australia/Hobart",
+  "Australia/LHI": "Australia/Lord_Howe",
+  "Australia/NSW": "Australia/Sydney",
+  "Australia/North": "Australia/Darwin",
+  "Australia/Queensland": "Australia/Brisbane",
+  "Australia/South": "Australia/Adelaide",
+  "Australia/Tasmania": "Australia/Hobart",
+  "Australia/Victoria": "Australia/Melbourne",
+  "Australia/West": "Australia/Perth",
+  "Australia/Yancowinna": "Australia/Broken_Hill",
+  "Pacific/Enderbury": "Pacific/Kanton",
+  "Pacific/Johnston": "Pacific/Honolulu",
+  "Pacific/Ponape": "Pacific/Pohnpei",
+  "Pacific/Samoa": "Pacific/Pago_Pago",
+  "Pacific/Truk": "Pacific/Chuuk",
+  "Pacific/Yap": "Pacific/Chuuk",
+};
+
+const australasiaHistoricalTestCases = [
+  "Pacific/Saipan",  // Link Pacific/Guam Pacific/Saipan # N Mariana Is
+  "Antarctica/McMurdo",  // Link Pacific/Auckland Antarctica/McMurdo
+  "Antarctica/DumontDUrville",  // Link Pacific/Port_Moresby Antarctica/DumontDUrville
+  "Pacific/Midway",  // Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands
+];
+
+const europeTestCases = {
+  "Europe/Belfast": "Europe/London",
+  "Europe/Kiev": "Europe/Kyiv",
+  "Europe/Nicosia": "Asia/Nicosia",
+  "Europe/Tiraspol": "Europe/Chisinau",
+  "Europe/Uzhgorod": "Europe/Kyiv",
+  "Europe/Zaporozhye": "Europe/Kyiv",
+};
+
+const europeHistoricalTestCases = [
+  "Europe/Jersey",  // Link    Europe/London   Europe/Jersey
+  "Europe/Guernsey",  // Link    Europe/London   Europe/Guernsey
+  "Europe/Isle_of_Man",  // Link    Europe/London   Europe/Isle_of_Man
+  "Europe/Mariehamn",  // Link    Europe/Helsinki Europe/Mariehamn
+  "Europe/Busingen",  // Link    Europe/Zurich   Europe/Busingen
+  "Europe/Vatican",  // Link    Europe/Rome     Europe/Vatican
+  "Europe/San_Marino",  // Link    Europe/Rome     Europe/San_Marino
+  "Europe/Vaduz",  // Link Europe/Zurich Europe/Vaduz
+  "Arctic/Longyearbyen",  // Link    Europe/Oslo     Arctic/Longyearbyen
+  "Europe/Ljubljana",  // Link Europe/Belgrade Europe/Ljubljana   # Slovenia
+  "Europe/Podgorica",  // Link Europe/Belgrade Europe/Podgorica   # Montenegro
+  "Europe/Sarajevo",  // Link Europe/Belgrade Europe/Sarajevo    # Bosnia and Herzegovina
+  "Europe/Skopje",  // Link Europe/Belgrade Europe/Skopje      # North Macedonia
+  "Europe/Zagreb",  // Link Europe/Belgrade Europe/Zagreb      # Croatia
+  "Europe/Bratislava",  // Link Europe/Prague Europe/Bratislava
+  "Asia/Istanbul",  // Link    Europe/Istanbul Asia/Istanbul   # Istanbul is in both continents.
+];
+
+const northAmericaTestCases = {
+  "America/Argentina/ComodRivadavia": "America/Argentina/Catamarca",
+  "America/Atka": "America/Adak",
+  "America/Buenos_Aires": "America/Argentina/Buenos_Aires",
+  "America/Catamarca": "America/Argentina/Catamarca",
+  "America/Coral_Harbour": "America/Atikokan",
+  "America/Cordoba": "America/Argentina/Cordoba",
+  "America/Ensenada": "America/Tijuana",
+  "America/Fort_Wayne": "America/Indiana/Indianapolis",
+  "America/Godthab": "America/Nuuk",
+  "America/Indianapolis": "America/Indiana/Indianapolis",
+  "America/Jujuy": "America/Argentina/Jujuy",
+  "America/Knox_IN": "America/Indiana/Knox",
+  "America/Louisville": "America/Kentucky/Louisville",
+  "America/Mendoza": "America/Argentina/Mendoza",
+  "America/Montreal": "America/Toronto",
+  "America/Nipigon": "America/Toronto",
+  "America/Pangnirtung": "America/Iqaluit",
+  "America/Porto_Acre": "America/Rio_Branco",
+  "America/Rainy_River": "America/Winnipeg",
+  "America/Rosario": "America/Argentina/Cordoba",
+  "America/Santa_Isabel": "America/Tijuana",
+  "America/Shiprock": "America/Denver",
+  "America/Thunder_Bay": "America/Toronto",
+  "America/Virgin": "America/St_Thomas",
+  "America/Yellowknife": "America/Edmonton",
+  "US/Alaska": "America/Anchorage",
+  "US/Aleutian": "America/Adak",
+  "US/Arizona": "America/Phoenix",
+  "US/Central": "America/Chicago",
+  "US/East-Indiana": "America/Indiana/Indianapolis",
+  "US/Eastern": "America/New_York",
+  "US/Hawaii": "Pacific/Honolulu",
+  "US/Indiana-Starke": "America/Indiana/Knox",
+  "US/Michigan": "America/Detroit",
+  "US/Mountain": "America/Denver",
+  "US/Pacific": "America/Los_Angeles",
+  "US/Samoa": "Pacific/Pago_Pago",
+};
+
+const northAmericaHistoricalTestCases = [
+  "America/Creston",  // Link America/Phoenix America/Creston
+  "America/Nassau",  // Link America/Toronto America/Nassau
+  "America/Atikokan",  // Link America/Panama America/Atikokan
+  "America/Cayman",  // Link America/Panama America/Cayman
+  "America/Anguilla",  // Link America/Puerto_Rico America/Anguilla
+  "America/Antigua",  // Link America/Puerto_Rico America/Antigua
+  "America/Aruba",  // Link America/Puerto_Rico America/Aruba
+  "America/Curacao",  // Link America/Puerto_Rico America/Curacao
+  "America/Blanc-Sablon",  // Link America/Puerto_Rico America/Blanc-Sablon   # Quebec (Lower North Shore)
+  "America/Dominica",  // Link America/Puerto_Rico America/Dominica
+  "America/Grenada",  // Link America/Puerto_Rico America/Grenada
+  "America/Guadeloupe",  // Link America/Puerto_Rico America/Guadeloupe
+  "America/Kralendijk",  // Link America/Puerto_Rico America/Kralendijk     # Caribbean Netherlands
+  "America/Lower_Princes",  // Link America/Puerto_Rico America/Lower_Princes  # Sint Maarten
+  "America/Marigot",  // Link America/Puerto_Rico America/Marigot        # St Martin (French part)
+  "America/Montserrat",  // Link America/Puerto_Rico America/Montserrat
+  "America/Port_of_Spain",  // Link America/Puerto_Rico America/Port_of_Spain  # Trinidad & Tobago
+  "America/St_Barthelemy",  // Link America/Puerto_Rico America/St_Barthelemy  # St Barthélemy
+  "America/St_Kitts",  // Link America/Puerto_Rico America/St_Kitts       # St Kitts & Nevis
+  "America/St_Lucia",  // Link America/Puerto_Rico America/St_Lucia
+  "America/St_Thomas",  // Link America/Puerto_Rico America/St_Thomas      # Virgin Islands (US)
+  "America/St_Vincent",  // Link America/Puerto_Rico America/St_Vincent
+  "America/Tortola",  // Link America/Puerto_Rico America/Tortola        # Virgin Islands (UK)
+];
+
+const otherTestCases = {
+  "Atlantic/Faeroe": "Atlantic/Faroe",
+  "Atlantic/Jan_Mayen": "Arctic/Longyearbyen",
+  "Brazil/Acre": "America/Rio_Branco",
+  "Brazil/DeNoronha": "America/Noronha",
+  "Brazil/East": "America/Sao_Paulo",
+  "Brazil/West": "America/Manaus",
+  "CET": "Europe/Brussels",
+  "CST6CDT": "America/Chicago",
+  "Canada/Atlantic": "America/Halifax",
+  "Canada/Central": "America/Winnipeg",
+  "Canada/Eastern": "America/Toronto",
+  "Canada/Mountain": "America/Edmonton",
+  "Canada/Newfoundland": "America/St_Johns",
+  "Canada/Pacific": "America/Vancouver",
+  "Canada/Saskatchewan": "America/Regina",
+  "Canada/Yukon": "America/Whitehorse",
+  "Chile/Continental": "America/Santiago",
+  "Chile/EasterIsland": "Pacific/Easter",
+  "Cuba": "America/Havana",
+  "EET": "Europe/Athens",
+  "EST": "America/Panama",
+  "EST5EDT": "America/New_York",
+  "Egypt": "Africa/Cairo",
+  "Eire": "Europe/Dublin",
+  "Etc/GMT": "UTC",
+  "Etc/GMT+0": "UTC",
+  "Etc/GMT-0": "UTC",
+  "Etc/GMT0": "UTC",
+  "Etc/Greenwich": "UTC",
+  "Etc/UCT": "UTC",
+  "Etc/UTC": "UTC",
+  "Etc/Universal": "UTC",
+  "Etc/Zulu": "UTC",
+  "GB": "Europe/London",
+  "GB-Eire": "Europe/London",
+  "GMT": "UTC",
+  "GMT+0": "UTC",
+  "GMT-0": "UTC",
+  "GMT0": "UTC",
+  "Greenwich": "UTC",
+  "HST": "Pacific/Honolulu",
+  "Hongkong": "Asia/Hong_Kong",
+  "Iceland": "Atlantic/Reykjavik",
+  "Iran": "Asia/Tehran",
+  "Israel": "Asia/Jerusalem",
+  "Jamaica": "America/Jamaica",
+  "Japan": "Asia/Tokyo",
+  "Kwajalein": "Pacific/Kwajalein",
+  "Libya": "Africa/Tripoli",
+  "MET": "Europe/Brussels",
+  "MST": "America/Phoenix",
+  "MST7MDT": "America/Denver",
+  "Mexico/BajaNorte": "America/Tijuana",
+  "Mexico/BajaSur": "America/Mazatlan",
+  "Mexico/General": "America/Mexico_City",
+  "NZ": "Pacific/Auckland",
+  "NZ-CHAT": "Pacific/Chatham",
+  "Navajo": "America/Denver",
+  "PRC": "Asia/Shanghai",
+  "PST8PDT": "America/Los_Angeles",
+  "Poland": "Europe/Warsaw",
+  "Portugal": "Europe/Lisbon",
+  "ROC": "Asia/Taipei",
+  "ROK": "Asia/Seoul",
+  "Singapore": "Asia/Singapore",
+  "Turkey": "Europe/Istanbul",
+  "UCT": "UTC",
+  "Universal": "UTC",
+  "W-SU": "Europe/Moscow",
+  "WET": "Europe/Lisbon",
+  "Zulu": "UTC",
+};
+
+
+let epochNanoseconds = [
+  new Temporal.PlainDate(1900, 1, 1).toZonedDateTime("UTC").epochNanoseconds,
+  new Temporal.PlainDate(1950, 1, 1).toZonedDateTime("UTC").epochNanoseconds,
+  new Temporal.PlainDate(1960, 1, 1).toZonedDateTime("UTC").epochNanoseconds,
+  new Temporal.PlainDate(1970, 1, 1).toZonedDateTime("UTC").epochNanoseconds,
+  new Temporal.PlainDate(1980, 1, 1).toZonedDateTime("UTC").epochNanoseconds,
+  new Temporal.PlainDate(1990, 1, 1).toZonedDateTime("UTC").epochNanoseconds,
+  new Temporal.PlainDate(2000, 1, 1).toZonedDateTime("UTC").epochNanoseconds,
+  new Temporal.PlainDate(2010, 1, 1).toZonedDateTime("UTC").epochNanoseconds,
+  new Temporal.PlainDate(2020, 1, 1).toZonedDateTime("UTC").epochNanoseconds,
+  new Temporal.PlainDate(2030, 1, 1).toZonedDateTime("UTC").epochNanoseconds,
+];
+
+for (const testCases of [asiaHistoricalTestCases,
+                         africaHistoricalTestCases,
+                         australasiaHistoricalTestCases,
+                         europeHistoricalTestCases,
+                         northAmericaHistoricalTestCases]) {
+  for (let link of testCases) {
+    const instanceLink = new Temporal.ZonedDateTime(0n, link);
+    assert.sameValue(instanceLink.timeZoneId, link, `creating ZonedDateTime for ${link}`);
+  }
+}
+
+for (const testCases of [asiaTestCases,
+                         africaTestCases,
+                         australasiaTestCases,
+                         europeTestCases,
+                         northAmericaTestCases,
+                         otherTestCases]) {
+  for (let [link, zone] of Object.entries(testCases)) {
+    const instanceLink = new Temporal.ZonedDateTime(0n, link);
+    assert.sameValue(instanceLink.timeZoneId, link, `creating ZonedDateTime for ${link}`);
+
+    const instanceZone = new Temporal.ZonedDateTime(0n, zone);
+    assert.sameValue(instanceLink.equals(instanceZone), true, `link=${link}, zone=${zone}`);
+
+    assert.sameValue(
+      instanceLink.offsetNanoseconds,
+      instanceZone.offsetNanoseconds,
+      `offsetNanoseconds; link=${link}, zone=${zone}`);
+
+    for (let epochNs of epochNanoseconds) {
+      assert.sameValue(
+        new Temporal.ZonedDateTime(epochNs, link).offsetNanoseconds,
+        new Temporal.ZonedDateTime(epochNs, zone).offsetNanoseconds,
+        `link=${link}, zone=${zone}, epochNs=${epochNs}`
+      );
+    }
+  }
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/add/offset-before-1883.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/add/offset-before-1883.js
new file mode 100644
index 0000000000000..2db76eed449d7
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/add/offset-before-1883.js
@@ -0,0 +1,18 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2023 Justin Grant. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.prototype.add
+description: Addition resulting in a pre-1883 date returns the correct offset
+features: [Temporal]
+---*/
+
+const instance = Temporal.ZonedDateTime.from("2001-09-08T18:46:40-07:00[America/Vancouver]");
+const expectedOffset = "-08:12:28"; // Offset before introduction of standard time zones
+
+assert.sameValue(instance.add(Temporal.Duration.from("-P5432Y1837M")).offset, expectedOffset, `add -P5432Y1837M, offset should be ${expectedOffset}`);
+assert.sameValue(instance.add(Temporal.Duration.from("-P5432Y1836M")).offset, expectedOffset, `add -P5432Y1836M, offset should be ${expectedOffset}`);
+assert.sameValue(instance.add(Temporal.Duration.from("-P5432Y1835M")).offset, expectedOffset, `add -P5432Y1835M, offset should be ${expectedOffset}`);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/since/era-boundary-japanese.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/since/era-boundary-japanese.js
index c54df3d5a9af8..d4e522216b947 100644
--- a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/since/era-boundary-japanese.js
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/since/era-boundary-japanese.js
@@ -14,9 +14,9 @@ const options = { overflow: "reject" };
 
 const bce1 = Temporal.ZonedDateTime.from({ era: "bce", eraYear: 1, monthCode: "M06", day: 1, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
 const ce1 = Temporal.ZonedDateTime.from({ era: "ce", eraYear: 1, monthCode: "M06", day: 1, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
-const ce1868 = Temporal.ZonedDateTime.from({ era: "ce", eraYear: 1868, monthCode: "M10", day: 22, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
-const meiji1 = Temporal.ZonedDateTime.from({ era: "meiji", eraYear: 1, monthCode: "M10", day: 23, hour: 12, minute: 34, timeZone: "UTC", calendar}, options);
-const meiji5 = Temporal.ZonedDateTime.from({ era: "meiji", eraYear: 5, monthCode: "M01", day: 15, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+const ce1872 = Temporal.ZonedDateTime.from({ era: "ce", eraYear: 1872, monthCode: "M12", day: 31, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+const meiji6 = Temporal.ZonedDateTime.from({ era: "meiji", eraYear: 6, monthCode: "M01", day: 1, hour: 12, minute: 34, timeZone: "UTC", calendar}, options);
+const meiji7 = Temporal.ZonedDateTime.from({ era: "meiji", eraYear: 7, monthCode: "M01", day: 15, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
 const meiji45 = Temporal.ZonedDateTime.from({ era: "meiji", eraYear: 45, monthCode: "M05", day: 19, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
 const taisho1 = Temporal.ZonedDateTime.from({ era: "taisho", eraYear: 1, monthCode: "M08", day: 9, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
 const taisho6 = Temporal.ZonedDateTime.from({ era: "taisho", eraYear: 6, monthCode: "M03", day: 15, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
@@ -97,18 +97,16 @@ const tests = [
     [0, 7, 0, 10, "7mo 10d from Taisho 15 July 20 to Showa 1 December 30"],
     [0, 7, 0, 10, "7mo 10d from Taisho 15 July 20 to Showa 1 December 30"],
   ],
-  // From Meiji 5 (1872) to Taisho 6 (1917) - crossing era boundary
-  // Note that contemporarily January 15 1872 would have been Meiji 4 in the
-  // pre-1873 lunisolar calendar, but the spec-mandated behaviour is proleptic
+  // From Meiji 7 (1874) to Taisho 6 (1917) - crossing era boundary
   [
-    meiji5, taisho6,
-    [-45, -2, 0, 0, "-45y -2mo backwards from Meiji 5 January to Taisho 6 March"],
-    [0, -542, 0, 0, "-542mo backwards from Meiji 5 January to Taisho 6 March"],
+    meiji7, taisho6,
+    [-43, -2, 0, 0, "-43y -2mo backwards from Meiji 7 January to Taisho 6 March"],
+    [0, -518, 0, 0, "-518mo backwards from Meiji 7 January to Taisho 6 March"],
   ],
   [
-    taisho6, meiji5,
-    [45, 2, 0, 0, "45y 2mo from Meiji 5 January to Taisho 6 March"],
-    [0, 542, 0, 0, "542mo from Meiji 5 January to Taisho 6 March"],
+    taisho6, meiji7,
+    [43, 2, 0, 0, "43y 2mo from Meiji 7 January to Taisho 6 March"],
+    [0, 518, 0, 0, "518mo from Meiji 7 January to Taisho 6 March"],
   ],
   // Within same year but different eras
   [
@@ -121,16 +119,16 @@ const tests = [
     [0, 2, 0, 21, "2mo 21d from Meiji 45 May 19 to Taisho 1 August 9"],
     [0, 2, 0, 21, "2mo 21d from Meiji 45 May 19 to Taisho 1 August 9"],
   ],
-  // Last pre-Meiji day to first day of Meiji era
+  // Last pre-solar-calendar CE day to first solar-calendar day of Meiji era
   [
-    ce1868, meiji1,
-    [0, 0, 0, -1, "backwards from day before Meiji era to first day"],
-    [0, 0, 0, -1, "backwards from day before Meiji era to first day"],
+    ce1872, meiji6,
+    [0, 0, 0, -1, "backwards from day before solar Meiji era to first day"],
+    [0, 0, 0, -1, "backwards from day before solar Meiji era to first day"],
   ],
   [
-    meiji1, ce1868,
-    [0, 0, 0, 1, "from day before Meiji era to first day"],
-    [0, 0, 0, 1, "from day before Meiji era to first day"],
+    meiji6, ce1872,
+    [0, 0, 0, 1, "from day before solar Meiji era to first day"],
+    [0, 0, 0, 1, "from day before solar Meiji era to first day"],
   ],
   // CE-BCE boundary
   [
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/since/wrapping-at-end-of-month-chinese.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/since/wrapping-at-end-of-month-chinese.js
index e0b7fe948666e..475b049abb26b 100644
--- a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/since/wrapping-at-end-of-month-chinese.js
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/since/wrapping-at-end-of-month-chinese.js
@@ -10,18 +10,19 @@ features: [Temporal, Intl.Era-monthcode]
 ---*/
 
 const calendar = "chinese";
+const options = { overflow: "reject" };
 
 // Difference between end of 30-day month to end of following 29-day month
 {
-  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M06", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar });
+  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M06", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }).since(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).since(end, { largestUnit }),
       0, -1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M05-29 (30d) to M06-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }).since(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).since(end, { largestUnit }),
       0, 0, 0, -29, 0, 0, 0, 0, 0, 0,
       `M05-30 to M06-29 is 29 days, not one month (${largestUnit})`
     );
@@ -30,15 +31,15 @@ const calendar = "chinese";
 
 // Difference between end of 30-day M04 to end of 29-day M04L
 {
-  const end = Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar });
+  const end = Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }).since(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).since(end, { largestUnit }),
       0, -1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M04-29 (30d) to M04L-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }).since(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).since(end, { largestUnit }),
       0, 0, 0, -29, 0, 0, 0, 0, 0, 0,
       `M04-30 to M04L-29 (29d) is 29 days, not one month (${largestUnit})`
     );
@@ -48,15 +49,15 @@ const calendar = "chinese";
 // Difference between end of 30-day month to end of not-immediately-following
 // 29-day month
 {
-  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar });
+  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M04", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }).since(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M04", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).since(end, { largestUnit }),
       0, -5, 0, 0, 0, 0, 0, 0, 0, 0,
       `M04-29 (30d) to M09-29 (29d) is 5 months (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M04", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }).since(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M04", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).since(end, { largestUnit }),
       0, -4, 0, -29, 0, 0, 0, 0, 0, 0,
       `M04-30 to M09-29 (29d) is 4 months 29 days, not 5 months (${largestUnit})`
     );
@@ -66,27 +67,112 @@ const calendar = "chinese";
 // Difference between end of 30-day month in one year to 29-day month in later
 // year
 {
-  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar });
+  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
   TemporalHelpers.assertDuration(
-    Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }).since(end, { largestUnit: "months" }),
+    start1.since(end, { largestUnit: "months" }),
     0, -29, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 29 days"
   );
   TemporalHelpers.assertDuration(
-    Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }).since(end, { largestUnit: "years" }),
+    start1.since(end, { largestUnit: "years" }),
     -2, -4, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 2 years, 4 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }).since(end, { largestUnit: "months" }),
+    start2.since(end, { largestUnit: "months" }),
     0, -28, 0, -29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 28 months, 29 days, not 29 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }).since(end, { largestUnit: "years" }),
+    start2.since(end, { largestUnit: "years" }),
     -2, -3, 0, -29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 2 years, 3 months, 29 days, not 2 years 4 months"
   );
 }
 
+// Difference between end of 30-day common month and end of the same month with
+// 29 days in a later year
+{
+  const end = Temporal.ZonedDateTime.from({ year: 2019, monthCode: "M02", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 2018, monthCode: "M02", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 2018, monthCode: "M02", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 1 year"
+  );
+}
+
+// Difference between end of 30-day leap month and end of the same leap month
+// with 29 days in a later year
+{
+  const end = Temporal.ZonedDateTime.from({ year: 2025, monthCode: "M06L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 2017, monthCode: "M06L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 2017, monthCode: "M06L", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -99, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2025-M06L-29 is 99 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2025-M06L-29 is 8 years"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -98, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2025-M06L-29 is 98 months 29 days, not 98 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    -7, -12, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2025-M06L-29 is 7 years 12 months 29 days, not 8 years"
+  );
+}
+
+// Case where both the month and day are not constrained
+{
+  const end = Temporal.ZonedDateTime.from({ year: 2018, monthCode: "M06", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 2017, monthCode: "M06L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 2017, monthCode: "M06L", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2018-M06-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2018-M06-29 is 12 months, not 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2018-M06-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2018-M06-29 is 11 months 29 days, not 1 year"
+  );
+}
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/since/wrapping-at-end-of-month-dangi.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/since/wrapping-at-end-of-month-dangi.js
index 6b541c0a926bc..7fdb31366d9a9 100644
--- a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/since/wrapping-at-end-of-month-dangi.js
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/since/wrapping-at-end-of-month-dangi.js
@@ -10,18 +10,19 @@ features: [Temporal, Intl.Era-monthcode]
 ---*/
 
 const calendar = "dangi";
+const options = { overflow: "reject" };
 
 // Difference between end of 30-day month to end of following 29-day month
 {
-  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M06", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar });
+  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M06", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }).since(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).since(end, { largestUnit }),
       0, -1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M05-29 (30d) to M06-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }).since(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).since(end, { largestUnit }),
       0, 0, 0, -29, 0, 0, 0, 0, 0, 0,
       `M05-30 to M06-29 is 29 days, not one month (${largestUnit})`
     );
@@ -30,15 +31,15 @@ const calendar = "dangi";
 
 // Difference between end of 30-day M04 to end of 29-day M04L
 {
-  const end = Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar });
+  const end = Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }).since(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).since(end, { largestUnit }),
       0, -1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M04-29 (30d) to M04L-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }).since(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).since(end, { largestUnit }),
       0, 0, 0, -29, 0, 0, 0, 0, 0, 0,
       `M04-30 to M04L-29 (29d) is 29 days, not one month (${largestUnit})`
     );
@@ -48,15 +49,15 @@ const calendar = "dangi";
 // Difference between end of 30-day month to end of not-immediately-following
 // 29-day month
 {
-  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar });
+  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }).since(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).since(end, { largestUnit }),
       0, -4, 0, 0, 0, 0, 0, 0, 0, 0,
       `M05-29 (30d) to M09-29 (29d) is 4 months (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }).since(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).since(end, { largestUnit }),
       0, -3, 0, -29, 0, 0, 0, 0, 0, 0,
       `M05-30 to M09-29 (29d) is 3 months 29 days, not 4 months (${largestUnit})`
     );
@@ -66,27 +67,112 @@ const calendar = "dangi";
 // Difference between end of 30-day month in one year to 29-day month in later
 // year
 {
-  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar });
+  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
   TemporalHelpers.assertDuration(
-    Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }).since(end, { largestUnit: "months" }),
+    start1.since(end, { largestUnit: "months" }),
     0, -29, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 29 days"
   );
   TemporalHelpers.assertDuration(
-    Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }).since(end, { largestUnit: "years" }),
+    start1.since(end, { largestUnit: "years" }),
     -2, -4, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 2 years, 4 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }).since(end, { largestUnit: "months" }),
+    start2.since(end, { largestUnit: "months" }),
     0, -28, 0, -29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 28 months, 29 days, not 29 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }).since(end, { largestUnit: "years" }),
+    start2.since(end, { largestUnit: "years" }),
     -2, -3, 0, -29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 2 years, 3 months, 29 days, not 2 years 4 months"
   );
 }
 
+// Difference between end of 30-day common month and end of the same month with
+// 29 days in a later year
+{
+  const end = Temporal.ZonedDateTime.from({ year: 2019, monthCode: "M02", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 2018, monthCode: "M02", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 2018, monthCode: "M02", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 1 year"
+  );
+}
+
+// Difference between end of 30-day leap month and end of the same leap month
+// with 29 days in a later year
+{
+  const end = Temporal.ZonedDateTime.from({ year: 1987, monthCode: "M06L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 1979, monthCode: "M06L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 1979, monthCode: "M06L", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -99, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-29 to 1987-M06L-29 is 99 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-29 to 1987-M06L-29 is 8 years"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -98, 0, -29, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-30 to 1987-M06L-29 is 98 months 29 days, not 98 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    -7, -12, 0, -29, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-30 to 1987-M06L-29 is 7 years 12 months 29 days, not 8 years"
+  );
+}
+
+// Case where both the month and day are not constrained
+{
+  const end = Temporal.ZonedDateTime.from({ year: 1956, monthCode: "M03", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 1955, monthCode: "M03L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 1955, monthCode: "M03L", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-29 to 1956-M03-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-29 to 1956-M03-29 is 12 months, not 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-30 to 1956-M03-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-30 to 1956-M03-29 is 11 months 29 days, not 1 year"
+  );
+}
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/since/wrapping-at-end-of-month-hebrew.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/since/wrapping-at-end-of-month-hebrew.js
new file mode 100644
index 0000000000000..e318ed115b152
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/since/wrapping-at-end-of-month-hebrew.js
@@ -0,0 +1,177 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.prototype.since
+description: Tests balancing of days to months at end of month (Hebrew calendar)
+includes: [temporalHelpers.js]
+features: [Temporal, Intl.Era-monthcode]
+---*/
+
+const calendar = "hebrew";
+const options = { overflow: "reject" };
+
+// 5784 is a leap year.
+
+// 30-day months: 01, 05, 05L, 07, 09, 11
+// 29-day months: 04, 06, 08, 10, 12
+//
+// Cheshvan and Kislev (02, 03) have 29 or 30 days, independent of leap years.
+// Deficient - Cheshvan and Kislev have 29 days
+// Regular - Cheshvan has 29 days, Kislev 30
+// Complete - Cheshvan and Kislev have 30 days
+//
+// Some recent years of each type: 
+// 5778 - regular common year
+// 5779 - complete leap year
+// 5781 - deficient common year
+// 5782 - regular leap year
+// 5783 - complete common year
+// 5784 - deficient leap year
+
+// Difference between end of longer month to end of following shorter month
+{
+  const end = Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M08", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  for (const largestUnit of ["years", "months"]) {
+    TemporalHelpers.assertDuration(
+      Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M07", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).since(end, { largestUnit }),
+      0, -1, 0, 0, 0, 0, 0, 0, 0, 0,
+      `Nisan 29th to Iyar 29th is one month (${largestUnit})`
+    );
+    TemporalHelpers.assertDuration(
+      Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M07", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).since(end, { largestUnit }),
+      0, 0, 0, -29, 0, 0, 0, 0, 0, 0,
+      `Nisan 30th to Iyar 29th is 29 days, not one month (${largestUnit})`
+    );
+  }
+}
+
+// Difference between end of longer month to end of not-immediately-following
+// shorter month
+{
+  const end = Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M12", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  for (const largestUnit of ["years", "months"]) {
+    TemporalHelpers.assertDuration(
+      Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M09", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).since(end, { largestUnit }),
+      0, -3, 0, 0, 0, 0, 0, 0, 0, 0,
+      `Sivan 29th to Elul 29th is 3 months (${largestUnit})`
+    );
+    TemporalHelpers.assertDuration(
+      Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M09", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).since(end, { largestUnit }),
+      0, -2, 0, -29, 0, 0, 0, 0, 0, 0,
+      `Sivan 30th to Elul 29th is 2 months 29 days, not 3 months (${largestUnit})`
+    );
+  }
+}
+
+// Difference between end of longer month in one year to shorter month in
+// later year
+{
+  const end = Temporal.ZonedDateTime.from({ year: 5786, monthCode: "M04", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M11", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M11", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -30, 0, 0, 0, 0, 0, 0, 0, 0,
+    "Av 29th 5783 to Tevet 29th 5786 is 30 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -2, -5, 0, 0, 0, 0, 0, 0, 0, 0,
+    "Av 29th 5783 to Tevet 29th 5786 is 2 years, 5 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -29, 0, -29, 0, 0, 0, 0, 0, 0,
+    "Av 30th 5783 to Tevet 29th 5786 is 29 months, 29 days, not 30 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    -2, -4, 0, -29, 0, 0, 0, 0, 0, 0,
+    "Av 30th 5783 to Tevet 29th 5786 is 2 years, 4 months, 29 days, not 2 years 5 months"
+  );
+}
+
+// Difference between 30 Kislev and day 29 of 29-day Kislev in a later year
+{
+  const end = Temporal.ZonedDateTime.from({ year: 5784, monthCode: "M02", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M02", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M02", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Kislev 5783 to 29th Kislev 5784 (deficient year) is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Kislev 5783 to 29th Kislev 5784 (deficient year) is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "30th Kislev 5783 to 29th Kislev 5784 (deficient year) is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "30th Kislev 5783 to 29th Kislev 5784 (deficient year) is 11 months 29 days, not 1 year"
+  );
+}
+
+// Difference between 30 Cheshvan and day 29 of 29-day Cheshvan in a later year
+{
+  const end = Temporal.ZonedDateTime.from({ year: 5784, monthCode: "M03", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M03", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M03", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "30th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -11, 0, -29, 0, 0, 0, 0, 0, 0,
+    "30th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 11 months 29 days, not 1 year"
+  );
+}
+
+// Case where both the month and day are not constrained
+{
+  const end = Temporal.ZonedDateTime.from({ year: 5785, monthCode: "M06", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 5784, monthCode: "M05L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 5784, monthCode: "M05L", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "months" }),
+    0, -13, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Adar I 5784 to 29th Adar 5785 is 13 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.since(end, { largestUnit: "years" }),
+    -1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Adar I 5784 to 29th Adar 5785 is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "months" }),
+    0, -12, 0, -29, 0, 0, 0, 0, 0, 0,
+    "30th Adar I 5784 to 29th Adar 5785 is 12 months 29 days, not 13 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.since(end, { largestUnit: "years" }),
+    0, -12, 0, -29, 0, 0, 0, 0, 0, 0,
+    "30th Adar I 5784 to 29th Adar 5785 is 12 months 29 days, not 1 year"
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/subtract/offset-before-1883.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/subtract/offset-before-1883.js
new file mode 100644
index 0000000000000..e627cb0a15615
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/subtract/offset-before-1883.js
@@ -0,0 +1,18 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2023 Justin Grant. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.prototype.subtract
+description: Subtraction resulting in a pre-1883 date returns the correct offset
+features: [Temporal]
+---*/
+
+const instance = Temporal.ZonedDateTime.from("2001-09-08T18:46:40-07:00[America/Vancouver]");
+const expectedOffset = "-08:12:28"; // Offset before introduction of standard time zones
+
+assert.sameValue(instance.subtract(Temporal.Duration.from("P5432Y1837M")).offset, expectedOffset, `subtract -P5432Y1837M, offset should be ${expectedOffset}`);
+assert.sameValue(instance.subtract(Temporal.Duration.from("P5432Y1836M")).offset, expectedOffset, `subtract -P5432Y1836M, offset should be ${expectedOffset}`);
+assert.sameValue(instance.subtract(Temporal.Duration.from("P5432Y1835M")).offset, expectedOffset, `subtract -P5432Y1835M, offset should be ${expectedOffset}`);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/toLocaleString/datestyle-and-timestyle.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/toLocaleString/datestyle-and-timestyle.js
new file mode 100644
index 0000000000000..dad3ddfd33a0b
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/toLocaleString/datestyle-and-timestyle.js
@@ -0,0 +1,15 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.prototype.tolocalestring
+description: Using both dateStyle and timeStyle should not throw
+features: [Temporal]
+---*/
+
+const item = new Temporal.ZonedDateTime(0n, "UTC");
+var result = item.toLocaleString("en", { dateStyle: "full", timeStyle: "full" });
+assert.sameValue(result.includes(":00"), true, "using both dateStyle and timeStyle should not throw");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/toLocaleString/hourcycle.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/toLocaleString/hourcycle.js
new file mode 100644
index 0000000000000..d92ec00ec0978
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/toLocaleString/hourcycle.js
@@ -0,0 +1,35 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.prototype.tolocalestring
+description: Hour cycle should be correctly set when defaults are used
+features: [Temporal]
+---*/
+
+const output0 = "00:00:00";
+const output11 = "0:00:00";
+const output12 = "12:00:00";
+const output24 = "24:00:00";
+
+const item = new Temporal.ZonedDateTime(0n, "UTC");
+var result = item.toLocaleString("en", { hour12: false });
+assert.sameValue(result.includes(output0), true, `output for hour12: false should include ${output0}`);
+
+result = item.toLocaleString("en", { hour12: true });
+assert.sameValue(result.includes(output12), true, `output for hour12: true should include ${output12}`);
+
+result = item.toLocaleString("en", { hourCycle: "h23" });
+assert.sameValue(result.includes(output0), true, `output for hourCycle: h23 should include ${output0}`);
+
+result = item.toLocaleString("en", { hourCycle: "h24" });
+assert.sameValue(result.includes(output24), true, `output for hourCycle: h24 should include ${output24}`);
+
+result = item.toLocaleString("en", { hourCycle: "h11" });
+assert.sameValue(result.includes(output11), true, `output for hourCycle: h11 should include ${output11}`);
+
+result = item.toLocaleString("en", { hourCycle: "h12" });
+assert.sameValue(result.includes(output12), true, `output for hourCycle: h12 should include ${output12}`);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/toLocaleString/offset-time-zones.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/toLocaleString/offset-time-zones.js
new file mode 100644
index 0000000000000..defc623bcd0a7
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/toLocaleString/offset-time-zones.js
@@ -0,0 +1,24 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.prototype.tolocalestring
+description: Tests that a ZonedDateTime with an offset time zone can be formatted with toLocaleString
+locale: [en]
+features: [Temporal]
+---*/
+
+var zdt = new Temporal.ZonedDateTime(0n, "+00:00");
+var result = zdt.toLocaleString("en");
+assert(result.includes("GMT") && !result.includes("+") && !result.includes("-"));
+
+zdt = new Temporal.ZonedDateTime(0n, "+01:00");
+result = zdt.toLocaleString("en");
+assert(result.includes("GMT+1"));
+
+zdt = new Temporal.ZonedDateTime(0n, "-01:00");
+result = zdt.toLocaleString("en");
+assert(result.includes("GMT-1"));
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/toString/timezone.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/toString/timezone.js
new file mode 100644
index 0000000000000..29fa8be1f55ec
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/toString/timezone.js
@@ -0,0 +1,26 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2026 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.prototype.tostring
+description: >
+  toString returns correct output for all time zone identifiers from
+  Intl.supportedValuesOf.
+features: [Temporal, Intl-enumeration]
+---*/
+
+function timeZoneId(zdt) {
+  let str = zdt.toString();
+  let m = str.match(/(?<=\[)[\w\/_+-]+(?=\])/);
+  assert.sameValue(m !== null, true, str);
+  return m[0];
+}
+
+for (let id of Intl.supportedValuesOf("timeZone")) {
+  let instance = new Temporal.ZonedDateTime(0n, id);
+
+  assert.sameValue(timeZoneId(instance), id);
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/until/era-boundary-japanese.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/until/era-boundary-japanese.js
index c3dad3d6c5140..253701fd40593 100644
--- a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/until/era-boundary-japanese.js
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/until/era-boundary-japanese.js
@@ -14,9 +14,9 @@ const options = { overflow: "reject" };
 
 const bce1 = Temporal.ZonedDateTime.from({ era: "bce", eraYear: 1, monthCode: "M06", day: 1, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
 const ce1 = Temporal.ZonedDateTime.from({ era: "ce", eraYear: 1, monthCode: "M06", day: 1, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
-const ce1868 = Temporal.ZonedDateTime.from({ era: "ce", eraYear: 1868, monthCode: "M10", day: 22, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
-const meiji1 = Temporal.ZonedDateTime.from({ era: "meiji", eraYear: 1, monthCode: "M10", day: 23, hour: 12, minute: 34, timeZone: "UTC", calendar}, options);
-const meiji5 = Temporal.ZonedDateTime.from({ era: "meiji", eraYear: 5, monthCode: "M01", day: 15, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+const ce1872 = Temporal.ZonedDateTime.from({ era: "ce", eraYear: 1872, monthCode: "M12", day: 31, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+const meiji6 = Temporal.ZonedDateTime.from({ era: "meiji", eraYear: 6, monthCode: "M01", day: 1, hour: 12, minute: 34, timeZone: "UTC", calendar}, options);
+const meiji7 = Temporal.ZonedDateTime.from({ era: "meiji", eraYear: 7, monthCode: "M01", day: 15, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
 const meiji45 = Temporal.ZonedDateTime.from({ era: "meiji", eraYear: 45, monthCode: "M05", day: 19, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
 const taisho1 = Temporal.ZonedDateTime.from({ era: "taisho", eraYear: 1, monthCode: "M08", day: 9, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
 const taisho6 = Temporal.ZonedDateTime.from({ era: "taisho", eraYear: 6, monthCode: "M03", day: 15, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
@@ -97,18 +97,16 @@ const tests = [
     [0, -7, 0, -10, "-7mo -10d backwards from Taisho 15 July 20 to Showa 1 December 30"],
     [0, -7, 0, -10, "-7mo -10d backwards from Taisho 15 July 20 to Showa 1 December 30"],
   ],
-  // From Meiji 5 (1872) to Taisho 6 (1917) - crossing era boundary
-  // Note that contemporarily January 15 1872 would have been Meiji 4 in the
-  // pre-1873 lunisolar calendar, but the spec-mandated behaviour is proleptic
+  // From Meiji 7 (1874) to Taisho 6 (1917) - crossing era boundary
   [
-    meiji5, taisho6,
-    [45, 2, 0, 0, "45y 2mo from Meiji 5 January to Taisho 6 March"],
-    [0, 542, 0, 0, "542mo from Meiji 5 January to Taisho 6 March"],
+    meiji7, taisho6,
+    [43, 2, 0, 0, "43y 2mo from Meiji 7 January to Taisho 6 March"],
+    [0, 518, 0, 0, "518mo from Meiji 7 January to Taisho 6 March"],
   ],
   [
-    taisho6, meiji5,
-    [-45, -2, 0, 0, "-45y -2mo backwards from Meiji 5 January to Taisho 6 March"],
-    [0, -542, 0, 0, "-542mo backwards from Meiji 5 January to Taisho 6 March"],
+    taisho6, meiji7,
+    [-43, -2, 0, 0, "-43y -2mo backwards from Meiji 7 January to Taisho 6 March"],
+    [0, -518, 0, 0, "-518mo backwards from Meiji 7 January to Taisho 6 March"],
   ],
   // Within same year but different eras
   [
@@ -121,16 +119,16 @@ const tests = [
     [0, -2, 0, -21, "-2mo -21d backwards from Meiji 45 May 19 to Taisho 1 August 9"],
     [0, -2, 0, -21, "-2mo -21d backwards from Meiji 45 May 19 to Taisho 1 August 9"],
   ],
-  // Last pre-Meiji day to first day of Meiji era
+  // Last pre-solar-calendar CE day to first solar-calendar day of Meiji era
   [
-    ce1868, meiji1,
-    [0, 0, 0, 1, "from day before Meiji era to first day"],
-    [0, 0, 0, 1, "from day before Meiji era to first day"],
+    ce1872, meiji6,
+    [0, 0, 0, 1, "from day before solar Meiji era to first day"],
+    [0, 0, 0, 1, "from day before solar Meiji era to first day"],
   ],
   [
-    meiji1, ce1868,
-    [0, 0, 0, -1, "backwards from day before Meiji era to first day"],
-    [0, 0, 0, -1, "backwards from day before Meiji era to first day"],
+    meiji6, ce1872,
+    [0, 0, 0, -1, "backwards from day before solar Meiji era to first day"],
+    [0, 0, 0, -1, "backwards from day before solar Meiji era to first day"],
   ],
   // CE-BCE boundary
   [
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/until/wrapping-at-end-of-month-chinese.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/until/wrapping-at-end-of-month-chinese.js
index 1172096e85b9d..82223ae7f2310 100644
--- a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/until/wrapping-at-end-of-month-chinese.js
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/until/wrapping-at-end-of-month-chinese.js
@@ -10,18 +10,19 @@ features: [Temporal, Intl.Era-monthcode]
 ---*/
 
 const calendar = "chinese";
+const options = { overflow: "reject" };
 
 // Difference between end of 30-day month to end of following 29-day month
 {
-  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M06", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar });
+  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M06", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }).until(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).until(end, { largestUnit }),
       0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M05-29 (30d) to M06-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }).until(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).until(end, { largestUnit }),
       0, 0, 0, 29, 0, 0, 0, 0, 0, 0,
       `M05-30 to M06-29 is 29 days, not one month (${largestUnit})`
     );
@@ -30,15 +31,15 @@ const calendar = "chinese";
 
 // Difference between end of 30-day M04 to end of 29-day M04L
 {
-  const end = Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar });
+  const end = Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }).until(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).until(end, { largestUnit }),
       0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M04-29 (30d) to M04L-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }).until(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).until(end, { largestUnit }),
       0, 0, 0, 29, 0, 0, 0, 0, 0, 0,
       `M04-30 to M04L-29 (29d) is 29 days, not one month (${largestUnit})`
     );
@@ -48,15 +49,15 @@ const calendar = "chinese";
 // Difference between end of 30-day month to end of not-immediately-following
 // 29-day month
 {
-  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar });
+  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M04", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }).until(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M04", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).until(end, { largestUnit }),
       0, 5, 0, 0, 0, 0, 0, 0, 0, 0,
       `M04-29 (30d) to M09-29 (29d) is 5 months (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M04", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }).until(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M04", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).until(end, { largestUnit }),
       0, 4, 0, 29, 0, 0, 0, 0, 0, 0,
       `M04-30 to M09-29 (29d) is 4 months 29 days, not 5 months (${largestUnit})`
     );
@@ -66,27 +67,112 @@ const calendar = "chinese";
 // Difference between end of 30-day month in one year to 29-day month in later
 // year
 {
-  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar });
+  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
   TemporalHelpers.assertDuration(
-    Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }).until(end, { largestUnit: "months" }),
+    start1.until(end, { largestUnit: "months" }),
     0, 29, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 29 days"
   );
   TemporalHelpers.assertDuration(
-    Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }).until(end, { largestUnit: "years" }),
+    start1.until(end, { largestUnit: "years" }),
     2, 4, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 2 years, 4 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }).until(end, { largestUnit: "months" }),
+    start2.until(end, { largestUnit: "months" }),
     0, 28, 0, 29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 28 months, 29 days, not 29 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }).until(end, { largestUnit: "years" }),
+    start2.until(end, { largestUnit: "years" }),
     2, 3, 0, 29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 2 years, 3 months, 29 days, not 2 years 4 months"
   );
 }
 
+// Difference between end of 30-day common month and end of the same month with
+// 29 days in a later year
+{
+  const end = Temporal.ZonedDateTime.from({ year: 2019, monthCode: "M02", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 2018, monthCode: "M02", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 2018, monthCode: "M02", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 1 year"
+  );
+}
+
+// Difference between end of 30-day leap month and end of the same leap month
+// with 29 days in a later year
+{
+  const end = Temporal.ZonedDateTime.from({ year: 2025, monthCode: "M06L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 2017, monthCode: "M06L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 2017, monthCode: "M06L", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 99, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2025-M06L-29 is 99 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2025-M06L-29 is 8 years"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 98, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2025-M06L-29 is 98 months 29 days, not 98 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    7, 12, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2025-M06L-29 is 7 years 12 months 29 days, not 8 years"
+  );
+}
+
+// Case where both the month and day are not constrained
+{
+  const end = Temporal.ZonedDateTime.from({ year: 2018, monthCode: "M06", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 2017, monthCode: "M06L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 2017, monthCode: "M06L", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2018-M06-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-29 to 2018-M06-29 is 12 months, not 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2018-M06-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2017-M06L-30 to 2018-M06-29 is 11 months 29 days, not 1 year"
+  );
+}
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/until/wrapping-at-end-of-month-dangi.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/until/wrapping-at-end-of-month-dangi.js
index 12e6ea7d556f5..83790876c5fdc 100644
--- a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/until/wrapping-at-end-of-month-dangi.js
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/until/wrapping-at-end-of-month-dangi.js
@@ -10,18 +10,19 @@ features: [Temporal, Intl.Era-monthcode]
 ---*/
 
 const calendar = "dangi";
+const options = { overflow: "reject" };
 
 // Difference between end of 30-day month to end of following 29-day month
 {
-  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M06", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar });
+  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M06", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }).until(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).until(end, { largestUnit }),
       0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M05-29 (30d) to M06-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }).until(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).until(end, { largestUnit }),
       0, 0, 0, 29, 0, 0, 0, 0, 0, 0,
       `M05-30 to M06-29 is 29 days, not one month (${largestUnit})`
     );
@@ -30,15 +31,15 @@ const calendar = "dangi";
 
 // Difference between end of 30-day M04 to end of 29-day M04L
 {
-  const end = Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar });
+  const end = Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }).until(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).until(end, { largestUnit }),
       0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
       `M04-29 (30d) to M04L-29 (29d) is one month (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }).until(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2020, monthCode: "M04", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).until(end, { largestUnit }),
       0, 0, 0, 29, 0, 0, 0, 0, 0, 0,
       `M04-30 to M04L-29 (29d) is 29 days, not one month (${largestUnit})`
     );
@@ -48,15 +49,15 @@ const calendar = "dangi";
 // Difference between end of 30-day month to end of not-immediately-following
 // 29-day month
 {
-  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar });
+  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
   for (const largestUnit of ["years", "months"]) {
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }).until(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).until(end, { largestUnit }),
       0, 4, 0, 0, 0, 0, 0, 0, 0, 0,
       `M05-29 (30d) to M09-29 (29d) is 4 months (${largestUnit})`
     );
     TemporalHelpers.assertDuration(
-      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }).until(end, { largestUnit }),
+      Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).until(end, { largestUnit }),
       0, 3, 0, 29, 0, 0, 0, 0, 0, 0,
       `M05-30 to M09-29 (29d) is 3 months 29 days, not 4 months (${largestUnit})`
     );
@@ -66,27 +67,112 @@ const calendar = "dangi";
 // Difference between end of 30-day month in one year to 29-day month in later
 // year
 {
-  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar });
+  const end = Temporal.ZonedDateTime.from({ year: 2023, monthCode: "M09", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
   TemporalHelpers.assertDuration(
-    Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }).until(end, { largestUnit: "months" }),
+    start1.until(end, { largestUnit: "months" }),
     0, 29, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 29 days"
   );
   TemporalHelpers.assertDuration(
-    Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }).until(end, { largestUnit: "years" }),
+    start1.until(end, { largestUnit: "years" }),
     2, 4, 0, 0, 0, 0, 0, 0, 0, 0,
     "2021-M05-29 (30d) to 2023-M09-29 (29d) is 2 years, 4 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }).until(end, { largestUnit: "months" }),
+    start2.until(end, { largestUnit: "months" }),
     0, 28, 0, 29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 28 months, 29 days, not 29 months"
   );
   TemporalHelpers.assertDuration(
-    Temporal.ZonedDateTime.from({ year: 2021, monthCode: "M05", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }).until(end, { largestUnit: "years" }),
+    start2.until(end, { largestUnit: "years" }),
     2, 3, 0, 29, 0, 0, 0, 0, 0, 0,
     "2021-M05-30 to 2023-M09-29 (29d) is 2 years, 3 months, 29 days, not 2 years 4 months"
   );
 }
 
+// Difference between end of 30-day common month and end of the same month with
+// 29 days in a later year
+{
+  const end = Temporal.ZonedDateTime.from({ year: 2019, monthCode: "M02", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 2018, monthCode: "M02", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 2018, monthCode: "M02", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "2018-M02-29 to 2019-M02-29 is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "2018-M02-30 to 2019-M02-29 is 11 months 29 days, not 1 year"
+  );
+}
+
+// Difference between end of 30-day leap month and end of the same leap month
+// with 29 days in a later year
+{
+  const end = Temporal.ZonedDateTime.from({ year: 1987, monthCode: "M06L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 1979, monthCode: "M06L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 1979, monthCode: "M06L", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 99, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-29 to 1987-M06L-29 is 99 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    8, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-29 to 1987-M06L-29 is 8 years"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 98, 0, 29, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-30 to 1987-M06L-29 is 98 months 29 days, not 98 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    7, 12, 0, 29, 0, 0, 0, 0, 0, 0,
+    "1979-M06L-30 to 1987-M06L-29 is 7 years 12 months 29 days, not 8 years"
+  );
+}
+
+// Case where both the month and day are not constrained
+{
+  const end = Temporal.ZonedDateTime.from({ year: 1956, monthCode: "M03", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 1955, monthCode: "M03L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 1955, monthCode: "M03L", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-29 to 1956-M03-29 is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-29 to 1956-M03-29 is 12 months, not 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-30 to 1956-M03-29 is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "1955-M03L-30 to 1956-M03-29 is 11 months 29 days, not 1 year"
+  );
+}
+
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/until/wrapping-at-end-of-month-hebrew.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/until/wrapping-at-end-of-month-hebrew.js
new file mode 100644
index 0000000000000..22dcb1eb6480d
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/until/wrapping-at-end-of-month-hebrew.js
@@ -0,0 +1,177 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.prototype.until
+description: Tests balancing of days to months at end of month (Hebrew calendar)
+includes: [temporalHelpers.js]
+features: [Temporal, Intl.Era-monthcode]
+---*/
+
+const calendar = "hebrew";
+const options = { overflow: "reject" };
+
+// 5784 is a leap year.
+
+// 30-day months: 01, 05, 05L, 07, 09, 11
+// 29-day months: 04, 06, 08, 10, 12
+//
+// Cheshvan and Kislev (02, 03) have 29 or 30 days, independent of leap years.
+// Deficient - Cheshvan and Kislev have 29 days
+// Regular - Cheshvan has 29 days, Kislev 30
+// Complete - Cheshvan and Kislev have 30 days
+//
+// Some recent years of each type: 
+// 5778 - regular common year
+// 5779 - complete leap year
+// 5781 - deficient common year
+// 5782 - regular leap year
+// 5783 - complete common year
+// 5784 - deficient leap year
+
+// Difference between end of longer month to end of following shorter month
+{
+  const end = Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M08", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  for (const largestUnit of ["years", "months"]) {
+    TemporalHelpers.assertDuration(
+      Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M07", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).until(end, { largestUnit }),
+      0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+      `Nisan 29th to Iyar 29th is one month (${largestUnit})`
+    );
+    TemporalHelpers.assertDuration(
+      Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M07", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).until(end, { largestUnit }),
+      0, 0, 0, 29, 0, 0, 0, 0, 0, 0,
+      `Nisan 30th to Iyar 29th is 29 days, not one month (${largestUnit})`
+    );
+  }
+}
+
+// Difference between end of longer month to end of not-immediately-following
+// shorter month
+{
+  const end = Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M12", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  for (const largestUnit of ["years", "months"]) {
+    TemporalHelpers.assertDuration(
+      Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M09", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).until(end, { largestUnit }),
+      0, 3, 0, 0, 0, 0, 0, 0, 0, 0,
+      `Sivan 29th to Elul 29th is 3 months (${largestUnit})`
+    );
+    TemporalHelpers.assertDuration(
+      Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M09", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options).until(end, { largestUnit }),
+      0, 2, 0, 29, 0, 0, 0, 0, 0, 0,
+      `Sivan 30th to Elul 29th is 2 months 29 days, not 3 months (${largestUnit})`
+    );
+  }
+}
+
+// Difference between end of longer month in one year to shorter month in
+// later year
+{
+  const end = Temporal.ZonedDateTime.from({ year: 5786, monthCode: "M04", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M11", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M11", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 30, 0, 0, 0, 0, 0, 0, 0, 0,
+    "Av 29th 5783 to Tevet 29th 5786 is 30 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    2, 5, 0, 0, 0, 0, 0, 0, 0, 0,
+    "Av 29th 5783 to Tevet 29th 5786 is 2 years, 5 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 29, 0, 29, 0, 0, 0, 0, 0, 0,
+    "Av 30th 5783 to Tevet 29th 5786 is 29 months, 29 days, not 30 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    2, 4, 0, 29, 0, 0, 0, 0, 0, 0,
+    "Av 30th 5783 to Tevet 29th 5786 is 2 years, 4 months, 29 days, not 2 years 5 months"
+  );
+}
+
+// Difference between 30 Kislev and day 29 of 29-day Kislev in a later year
+{
+  const end = Temporal.ZonedDateTime.from({ year: 5784, monthCode: "M02", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M02", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M02", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Kislev 5783 to 29th Kislev 5784 (deficient year) is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Kislev 5783 to 29th Kislev 5784 (deficient year) is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "30th Kislev 5783 to 29th Kislev 5784 (deficient year) is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "30th Kislev 5783 to 29th Kislev 5784 (deficient year) is 11 months 29 days, not 1 year"
+  );
+}
+
+// Difference between 30 Cheshvan and day 29 of 29-day Cheshvan in a later year
+{
+  const end = Temporal.ZonedDateTime.from({ year: 5784, monthCode: "M03", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M03", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 5783, monthCode: "M03", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 12, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "30th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 11 months 29 days, not 12 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 11, 0, 29, 0, 0, 0, 0, 0, 0,
+    "30th Cheshvan 5783 to 29th Cheshvan 5784 (deficient year) is 11 months 29 days, not 1 year"
+  );
+}
+
+// Case where both the month and day are not constrained
+{
+  const end = Temporal.ZonedDateTime.from({ year: 5785, monthCode: "M06", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start1 = Temporal.ZonedDateTime.from({ year: 5784, monthCode: "M05L", day: 29, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  const start2 = Temporal.ZonedDateTime.from({ year: 5784, monthCode: "M05L", day: 30, hour: 12, minute: 34, timeZone: "UTC", calendar }, options);
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "months" }),
+    0, 13, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Adar I 5784 to 29th Adar 5785 is 13 months"
+  );
+  TemporalHelpers.assertDuration(
+    start1.until(end, { largestUnit: "years" }),
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    "29th Adar I 5784 to 29th Adar 5785 is 1 year"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "months" }),
+    0, 12, 0, 29, 0, 0, 0, 0, 0, 0,
+    "30th Adar I 5784 to 29th Adar 5785 is 12 months 29 days, not 13 months"
+  );
+  TemporalHelpers.assertDuration(
+    start2.until(end, { largestUnit: "years" }),
+    0, 12, 0, 29, 0, 0, 0, 0, 0, 0,
+    "30th Adar I 5784 to 29th Adar 5785 is 12 months 29 days, not 1 year"
+  );
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/withCalendar/calendar-time-string.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/withCalendar/calendar-time-string.js
new file mode 100644
index 0000000000000..ad81da6327c5c
--- /dev/null
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/withCalendar/calendar-time-string.js
@@ -0,0 +1,37 @@
+// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
+// Copyright (C) 2025 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.zoneddatetime.prototype.withcalendar
+description: A time string is valid input for Calendar
+features: [Temporal]
+---*/
+
+const instance = Temporal.ZonedDateTime.from({ year: 1976, month: 11, day: 18, hour: 12, minute: 34, timeZone: "UTC"});
+
+const calendars = [
+  "buddhist",
+  "chinese",
+  "coptic",
+  "dangi",
+  "ethioaa",
+  "ethiopic",
+  "gregory",
+  "hebrew",
+  "indian",
+  "islamic-civil",
+  "islamic-tbla",
+  "islamic-umalqura",
+  "japanese",
+  "persian",
+  "roc",
+]
+
+calendars.forEach((cal) => {
+  const str = `T11:30[u-ca=${cal}]`;
+  const result = instance.withCalendar(str);
+  assert.sameValue(result.calendarId, cal, `Calendar created from string "${str}"`);
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/year/arithmetic-year.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/year/arithmetic-year.js
index 5cc4bf3de918b..82aa96bbafa93 100644
--- a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/year/arithmetic-year.js
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/prototype/year/arithmetic-year.js
@@ -103,7 +103,7 @@ const tests = {
     [{ era: "bce", eraYear: 2, monthCode: "M06", day: 14 }, -1],
     [{ era: "bce", eraYear: 1, monthCode: "M12", day: 3 }, 0],
     [{ era: "ce", eraYear: 1, monthCode: "M07", day: 26 }, 1],
-    [{ era: "meiji", eraYear: 1, monthCode: "M12", day: 31 }, 1868],
+    [{ era: "meiji", eraYear: 6, monthCode: "M12", day: 31 }, 1873],
     [{ era: "taisho", eraYear: 1, monthCode: "M12", day: 31 }, 1912],
     [{ era: "showa", eraYear: 1, monthCode: "M12", day: 31 }, 1926],
     [{ era: "heisei", eraYear: 1, monthCode: "M12", day: 31 }, 1989],
diff --git a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/shell.js b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/shell.js
index 73e5d07407594..8d4cef92ca9ea 100644
--- a/js/src/tests/test262/intl402/Temporal/ZonedDateTime/shell.js
+++ b/js/src/tests/test262/intl402/Temporal/ZonedDateTime/shell.js
@@ -263,6 +263,25 @@ var TemporalHelpers = {
     assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
   },
 
+  /*
+   * assertPlainDatesEqual(actual, expected[, description]):
+   *
+   * Shorthand for asserting that two Temporal.PlainDates are of the correct
+   * type, equal according to their equals() methods, and additionally that
+   * their calendar internal slots are the same value.
+   */
+  assertPlainDatesEqual(actual, expected, description = "") {
+    const prefix = description ? `${description}: ` : "";
+    assert(expected instanceof Temporal.PlainDate, `${prefix}expected value should be a Temporal.PlainDate`);
+    assert(actual instanceof Temporal.PlainDate, `${prefix}instanceof`);
+    assert(actual.equals(expected), `${prefix}equals method`);
+    assert.sameValue(
+      actual.calendarId,
+      expected.calendarId,
+      `${prefix}calendar same value:`
+    );
+  },
+
   /*
    * assertPlainDateTimesEqual(actual, expected[, description]):
    *
diff --git a/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-exported-then-super-get.js b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-exported-then-super-get.js
new file mode 100644
index 0000000000000..4dd24d1dd6468
--- /dev/null
+++ b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-exported-then-super-get.js
@@ -0,0 +1,51 @@
+// |reftest| skip module -- import-defer is not supported
+// This file was procedurally generated from the following sources:
+// - src/import-defer/super-get.case
+// - src/import-defer/trigger-on-possible-export/then-exported.template
+/*---
+description: _ [[Get]] when namespace is aliased by super (of 'then' when it is an exported name, does not trigger execution)
+esid: sec-module-namespace-exotic-objects
+features: [import-defer]
+flags: [generated, module]
+info: |
+    IsSymbolLikeNamespaceKey ( _P_, _O_ )
+      1. If _P_ is a Symbol, return *true*.
+      1. If _ns_.[[Deferred]] is *true* and _P_ is "then", return *true*.
+      1. Return *false*.
+
+    GetModuleExportsList ( _O_ )
+      1. If _O_.[[Deferred]] is *true*, then
+        1. Let _m_ be _O_.[[Module]].
+        1. If _m_ is a Cyclic Module Record, _m_.[[Status]] is not ~evaluated~, and ReadyForSyncExecution(_m_) is *false*, throw a *TypeError* exception.
+        1. Perform ? EvaluateSync(_m_).
+      1. Return _O_.[[Exports]].
+
+
+    [[Get]] ( _P_, _Receiver_ )
+      1. If IsSymbolLikeNamespaceKey(_P_, _O_), return ! OrdinaryGet(_O_, _P_, _Receiver_).
+      1. Let _exports_ be ? GetModuleExportsList(_O_).
+      1. ...
+
+---*/
+
+
+import "./setup_FIXTURE.js";
+
+import defer * as ns from "./dep-then_FIXTURE.js";
+
+assert.sameValue(globalThis.evaluations.length, 0, "import defer does not trigger evaluation");
+
+var key = "then";
+
+let obj = {
+  superGet(key) {
+    return super[key];
+  }
+}
+
+Object.setPrototypeOf(obj, ns);
+obj.superGet(key);
+
+assert.sameValue(globalThis.evaluations.length, 0, "It does not trigger evaluation");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-exported-then-super-property-define.js b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-exported-then-super-property-define.js
new file mode 100644
index 0000000000000..ffb13b6a4464f
--- /dev/null
+++ b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-exported-then-super-property-define.js
@@ -0,0 +1,63 @@
+// |reftest| skip module -- import-defer is not supported
+// This file was procedurally generated from the following sources:
+// - src/import-defer/super-property-define.case
+// - src/import-defer/trigger-on-possible-export/then-exported.template
+/*---
+description: _ [[DefineOwnProperty]] called from class field definition (of 'then' when it is an exported name, does not trigger execution)
+esid: sec-module-namespace-exotic-objects
+features: [import-defer]
+flags: [generated, module]
+info: |
+    IsSymbolLikeNamespaceKey ( _P_, _O_ )
+      1. If _P_ is a Symbol, return *true*.
+      1. If _ns_.[[Deferred]] is *true* and _P_ is "then", return *true*.
+      1. Return *false*.
+
+    GetModuleExportsList ( _O_ )
+      1. If _O_.[[Deferred]] is *true*, then
+        1. Let _m_ be _O_.[[Module]].
+        1. If _m_ is a Cyclic Module Record, _m_.[[Status]] is not ~evaluated~, and ReadyForSyncExecution(_m_) is *false*, throw a *TypeError* exception.
+        1. Perform ? EvaluateSync(_m_).
+      1. Return _O_.[[Exports]].
+
+
+    [[DefineOwnProperty]] ( _P_, _Desc_ )
+      1. If IsSymbolLikeNamespaceKey(_P_, _O_), return ! OrdinaryDefineOwnProperty(_O_, _Desc_).
+      1. Let _current_ be ? _O_.[[GetOwnProperty]](_P_).
+      1. NOTE: If _O_.[[Deferred]] is *true*, the step above will ensure that the module is evaluated.
+      1. ...
+
+    DefineField ( receiver, fieldRecord )
+      1. Let fieldName be fieldRecord.[[Name]].
+      1. Let initializer be fieldRecord.[[Initializer]].
+      1. ...
+      1. If fieldName is a Private Name, then
+        a. Perform ? PrivateFieldAdd(receiver, fieldName, initValue).
+      1. Else,
+        1. Assert: fieldName is a property key.
+        a. Perform ? CreateDataPropertyOrThrow(receiver, fieldName, initValue).
+      1. Return unused.
+
+---*/
+
+
+import "./setup_FIXTURE.js";
+
+import defer * as ns from "./dep-then_FIXTURE.js";
+
+assert.sameValue(globalThis.evaluations.length, 0, "import defer does not trigger evaluation");
+
+var key = "then";
+
+class A { constructor() { return ns; } };
+class B extends A {
+  [key] = 10; 
+};
+
+try {
+  new B();
+} catch (_) {}
+
+assert.sameValue(globalThis.evaluations.length, 0, "It does not trigger evaluation");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-not-exported-then-super-get.js b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-not-exported-then-super-get.js
new file mode 100644
index 0000000000000..a1bf1a99d7f3e
--- /dev/null
+++ b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-not-exported-then-super-get.js
@@ -0,0 +1,51 @@
+// |reftest| skip module -- import-defer is not supported
+// This file was procedurally generated from the following sources:
+// - src/import-defer/super-get.case
+// - src/import-defer/trigger-on-possible-export/then-not-exported.template
+/*---
+description: _ [[Get]] when namespace is aliased by super (of 'then' when it is not an exported name, does not trigger execution)
+esid: sec-module-namespace-exotic-objects
+features: [import-defer]
+flags: [generated, module]
+info: |
+    IsSymbolLikeNamespaceKey ( _P_, _O_ )
+      1. If _P_ is a Symbol, return *true*.
+      1. If _ns_.[[Deferred]] is *true* and _P_ is "then", return *true*.
+      1. Return *false*.
+
+    GetModuleExportsList ( _O_ )
+      1. If _O_.[[Deferred]] is *true*, then
+        1. Let _m_ be _O_.[[Module]].
+        1. If _m_ is a Cyclic Module Record, _m_.[[Status]] is not ~evaluated~, and ReadyForSyncExecution(_m_) is *false*, throw a *TypeError* exception.
+        1. Perform ? EvaluateSync(_m_).
+      1. Return _O_.[[Exports]].
+
+
+    [[Get]] ( _P_, _Receiver_ )
+      1. If IsSymbolLikeNamespaceKey(_P_, _O_), return ! OrdinaryGet(_O_, _P_, _Receiver_).
+      1. Let _exports_ be ? GetModuleExportsList(_O_).
+      1. ...
+
+---*/
+
+
+import "./setup_FIXTURE.js";
+
+import defer * as ns from "./dep_FIXTURE.js";
+
+assert.sameValue(globalThis.evaluations.length, 0, "import defer does not trigger evaluation");
+
+var key = "then";
+
+let obj = {
+  superGet(key) {
+    return super[key];
+  }
+}
+
+Object.setPrototypeOf(obj, ns);
+obj.superGet(key);
+
+assert.sameValue(globalThis.evaluations.length, 0, "It does not trigger evaluation");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-not-exported-then-super-property-define.js b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-not-exported-then-super-property-define.js
new file mode 100644
index 0000000000000..89a3b7d8dbc79
--- /dev/null
+++ b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-not-exported-then-super-property-define.js
@@ -0,0 +1,63 @@
+// |reftest| skip module -- import-defer is not supported
+// This file was procedurally generated from the following sources:
+// - src/import-defer/super-property-define.case
+// - src/import-defer/trigger-on-possible-export/then-not-exported.template
+/*---
+description: _ [[DefineOwnProperty]] called from class field definition (of 'then' when it is not an exported name, does not trigger execution)
+esid: sec-module-namespace-exotic-objects
+features: [import-defer]
+flags: [generated, module]
+info: |
+    IsSymbolLikeNamespaceKey ( _P_, _O_ )
+      1. If _P_ is a Symbol, return *true*.
+      1. If _ns_.[[Deferred]] is *true* and _P_ is "then", return *true*.
+      1. Return *false*.
+
+    GetModuleExportsList ( _O_ )
+      1. If _O_.[[Deferred]] is *true*, then
+        1. Let _m_ be _O_.[[Module]].
+        1. If _m_ is a Cyclic Module Record, _m_.[[Status]] is not ~evaluated~, and ReadyForSyncExecution(_m_) is *false*, throw a *TypeError* exception.
+        1. Perform ? EvaluateSync(_m_).
+      1. Return _O_.[[Exports]].
+
+
+    [[DefineOwnProperty]] ( _P_, _Desc_ )
+      1. If IsSymbolLikeNamespaceKey(_P_, _O_), return ! OrdinaryDefineOwnProperty(_O_, _Desc_).
+      1. Let _current_ be ? _O_.[[GetOwnProperty]](_P_).
+      1. NOTE: If _O_.[[Deferred]] is *true*, the step above will ensure that the module is evaluated.
+      1. ...
+
+    DefineField ( receiver, fieldRecord )
+      1. Let fieldName be fieldRecord.[[Name]].
+      1. Let initializer be fieldRecord.[[Initializer]].
+      1. ...
+      1. If fieldName is a Private Name, then
+        a. Perform ? PrivateFieldAdd(receiver, fieldName, initValue).
+      1. Else,
+        1. Assert: fieldName is a property key.
+        a. Perform ? CreateDataPropertyOrThrow(receiver, fieldName, initValue).
+      1. Return unused.
+
+---*/
+
+
+import "./setup_FIXTURE.js";
+
+import defer * as ns from "./dep_FIXTURE.js";
+
+assert.sameValue(globalThis.evaluations.length, 0, "import defer does not trigger evaluation");
+
+var key = "then";
+
+class A { constructor() { return ns; } };
+class B extends A {
+  [key] = 10; 
+};
+
+try {
+  new B();
+} catch (_) {}
+
+assert.sameValue(globalThis.evaluations.length, 0, "It does not trigger evaluation");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-super-property-set-exported.js b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-super-property-set-exported.js
new file mode 100644
index 0000000000000..4c8ccbdbc86ae
--- /dev/null
+++ b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-super-property-set-exported.js
@@ -0,0 +1,37 @@
+// |reftest| skip module -- import-defer is not supported
+// This file was procedurally generated from the following sources:
+// - src/import-defer/super-property-set-exported.case
+// - src/import-defer/ignore/ignore.template
+/*---
+description: _ [[Set]] exported called as super access (does not trigger execution)
+esid: sec-module-namespace-exotic-objects
+features: [import-defer]
+flags: [generated, module]
+info: |
+    [[Set]] ( P, V, Receiver )
+      1. return false.
+
+---*/
+
+
+import "./setup_FIXTURE.js";
+
+import defer * as ns from "./dep_FIXTURE.js";
+
+assert.sameValue(globalThis.evaluations.length, 0, "import defer does not trigger evaluation");
+
+class A { constructor() { return ns; } };
+class B extends A {
+  constructor() {
+    super();
+    super.exported = 14;
+  }
+};
+
+try {
+  new B();
+} catch (_) {}
+
+assert.sameValue(globalThis.evaluations.length, 0, "It does not trigger evaluation");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-super-property-set-not-exported.js b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-super-property-set-not-exported.js
new file mode 100644
index 0000000000000..bf311498096c5
--- /dev/null
+++ b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-super-property-set-not-exported.js
@@ -0,0 +1,37 @@
+// |reftest| skip module -- import-defer is not supported
+// This file was procedurally generated from the following sources:
+// - src/import-defer/super-property-set-not-exported.case
+// - src/import-defer/ignore/ignore.template
+/*---
+description: _ [[Set]] not exported called as super access (does not trigger execution)
+esid: sec-module-namespace-exotic-objects
+features: [import-defer]
+flags: [generated, module]
+info: |
+    [[Set]] ( P, V, Receiver )
+      1. return false.
+
+---*/
+
+
+import "./setup_FIXTURE.js";
+
+import defer * as ns from "./dep_FIXTURE.js";
+
+assert.sameValue(globalThis.evaluations.length, 0, "import defer does not trigger evaluation");
+
+class A { constructor() { return ns; } };
+class B extends A {
+  constructor() {
+    super();
+    super.notExported = 14;
+  }
+};
+
+try {
+  new B();
+} catch (_) {}
+
+assert.sameValue(globalThis.evaluations.length, 0, "It does not trigger evaluation");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-symbol-other-super-get.js b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-symbol-other-super-get.js
new file mode 100644
index 0000000000000..f2e93adcfdda7
--- /dev/null
+++ b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-symbol-other-super-get.js
@@ -0,0 +1,51 @@
+// |reftest| skip module -- import-defer is not supported
+// This file was procedurally generated from the following sources:
+// - src/import-defer/super-get.case
+// - src/import-defer/trigger-on-possible-export/symbol-other.template
+/*---
+description: _ [[Get]] when namespace is aliased by super (of a symbol that is not a property of the namespace object, does not trigger execution)
+esid: sec-module-namespace-exotic-objects
+features: [import-defer]
+flags: [generated, module]
+info: |
+    IsSymbolLikeNamespaceKey ( _P_, _O_ )
+      1. If _P_ is a Symbol, return *true*.
+      1. If _ns_.[[Deferred]] is *true* and _P_ is "then", return *true*.
+      1. Return *false*.
+
+    GetModuleExportsList ( _O_ )
+      1. If _O_.[[Deferred]] is *true*, then
+        1. Let _m_ be _O_.[[Module]].
+        1. If _m_ is a Cyclic Module Record, _m_.[[Status]] is not ~evaluated~, and ReadyForSyncExecution(_m_) is *false*, throw a *TypeError* exception.
+        1. Perform ? EvaluateSync(_m_).
+      1. Return _O_.[[Exports]].
+
+
+    [[Get]] ( _P_, _Receiver_ )
+      1. If IsSymbolLikeNamespaceKey(_P_, _O_), return ! OrdinaryGet(_O_, _P_, _Receiver_).
+      1. Let _exports_ be ? GetModuleExportsList(_O_).
+      1. ...
+
+---*/
+
+
+import "./setup_FIXTURE.js";
+
+import defer * as ns from "./dep_FIXTURE.js";
+
+assert.sameValue(globalThis.evaluations.length, 0, "import defer does not trigger evaluation");
+
+var key = Symbol();
+
+let obj = {
+  superGet(key) {
+    return super[key];
+  }
+}
+
+Object.setPrototypeOf(obj, ns);
+obj.superGet(key);
+
+assert.sameValue(globalThis.evaluations.length, 0, "It does not trigger evaluation");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-symbol-other-super-property-define.js b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-symbol-other-super-property-define.js
new file mode 100644
index 0000000000000..7556d28805040
--- /dev/null
+++ b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-symbol-other-super-property-define.js
@@ -0,0 +1,63 @@
+// |reftest| skip module -- import-defer is not supported
+// This file was procedurally generated from the following sources:
+// - src/import-defer/super-property-define.case
+// - src/import-defer/trigger-on-possible-export/symbol-other.template
+/*---
+description: _ [[DefineOwnProperty]] called from class field definition (of a symbol that is not a property of the namespace object, does not trigger execution)
+esid: sec-module-namespace-exotic-objects
+features: [import-defer]
+flags: [generated, module]
+info: |
+    IsSymbolLikeNamespaceKey ( _P_, _O_ )
+      1. If _P_ is a Symbol, return *true*.
+      1. If _ns_.[[Deferred]] is *true* and _P_ is "then", return *true*.
+      1. Return *false*.
+
+    GetModuleExportsList ( _O_ )
+      1. If _O_.[[Deferred]] is *true*, then
+        1. Let _m_ be _O_.[[Module]].
+        1. If _m_ is a Cyclic Module Record, _m_.[[Status]] is not ~evaluated~, and ReadyForSyncExecution(_m_) is *false*, throw a *TypeError* exception.
+        1. Perform ? EvaluateSync(_m_).
+      1. Return _O_.[[Exports]].
+
+
+    [[DefineOwnProperty]] ( _P_, _Desc_ )
+      1. If IsSymbolLikeNamespaceKey(_P_, _O_), return ! OrdinaryDefineOwnProperty(_O_, _Desc_).
+      1. Let _current_ be ? _O_.[[GetOwnProperty]](_P_).
+      1. NOTE: If _O_.[[Deferred]] is *true*, the step above will ensure that the module is evaluated.
+      1. ...
+
+    DefineField ( receiver, fieldRecord )
+      1. Let fieldName be fieldRecord.[[Name]].
+      1. Let initializer be fieldRecord.[[Initializer]].
+      1. ...
+      1. If fieldName is a Private Name, then
+        a. Perform ? PrivateFieldAdd(receiver, fieldName, initValue).
+      1. Else,
+        1. Assert: fieldName is a property key.
+        a. Perform ? CreateDataPropertyOrThrow(receiver, fieldName, initValue).
+      1. Return unused.
+
+---*/
+
+
+import "./setup_FIXTURE.js";
+
+import defer * as ns from "./dep_FIXTURE.js";
+
+assert.sameValue(globalThis.evaluations.length, 0, "import defer does not trigger evaluation");
+
+var key = Symbol();
+
+class A { constructor() { return ns; } };
+class B extends A {
+  [key] = 10; 
+};
+
+try {
+  new B();
+} catch (_) {}
+
+assert.sameValue(globalThis.evaluations.length, 0, "It does not trigger evaluation");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-symbol-toStringTag-super-get.js b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-symbol-toStringTag-super-get.js
new file mode 100644
index 0000000000000..61e8a21e44da6
--- /dev/null
+++ b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-symbol-toStringTag-super-get.js
@@ -0,0 +1,51 @@
+// |reftest| skip module -- import-defer is not supported
+// This file was procedurally generated from the following sources:
+// - src/import-defer/super-get.case
+// - src/import-defer/trigger-on-possible-export/symbol-toStringTag.template
+/*---
+description: _ [[Get]] when namespace is aliased by super (of Symbol.toStringTag, does not trigger execution)
+esid: sec-module-namespace-exotic-objects
+features: [import-defer]
+flags: [generated, module]
+info: |
+    IsSymbolLikeNamespaceKey ( _P_, _O_ )
+      1. If _P_ is a Symbol, return *true*.
+      1. If _ns_.[[Deferred]] is *true* and _P_ is "then", return *true*.
+      1. Return *false*.
+
+    GetModuleExportsList ( _O_ )
+      1. If _O_.[[Deferred]] is *true*, then
+        1. Let _m_ be _O_.[[Module]].
+        1. If _m_ is a Cyclic Module Record, _m_.[[Status]] is not ~evaluated~, and ReadyForSyncExecution(_m_) is *false*, throw a *TypeError* exception.
+        1. Perform ? EvaluateSync(_m_).
+      1. Return _O_.[[Exports]].
+
+
+    [[Get]] ( _P_, _Receiver_ )
+      1. If IsSymbolLikeNamespaceKey(_P_, _O_), return ! OrdinaryGet(_O_, _P_, _Receiver_).
+      1. Let _exports_ be ? GetModuleExportsList(_O_).
+      1. ...
+
+---*/
+
+
+import "./setup_FIXTURE.js";
+
+import defer * as ns from "./dep_FIXTURE.js";
+
+assert.sameValue(globalThis.evaluations.length, 0, "import defer does not trigger evaluation");
+
+var key = Symbol.toStringTag;
+
+let obj = {
+  superGet(key) {
+    return super[key];
+  }
+}
+
+Object.setPrototypeOf(obj, ns);
+obj.superGet(key);
+
+assert.sameValue(globalThis.evaluations.length, 0, "It does not trigger evaluation");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-symbol-toStringTag-super-property-define.js b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-symbol-toStringTag-super-property-define.js
new file mode 100644
index 0000000000000..2e60c11996c2c
--- /dev/null
+++ b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/ignore-symbol-toStringTag-super-property-define.js
@@ -0,0 +1,63 @@
+// |reftest| skip module -- import-defer is not supported
+// This file was procedurally generated from the following sources:
+// - src/import-defer/super-property-define.case
+// - src/import-defer/trigger-on-possible-export/symbol-toStringTag.template
+/*---
+description: _ [[DefineOwnProperty]] called from class field definition (of Symbol.toStringTag, does not trigger execution)
+esid: sec-module-namespace-exotic-objects
+features: [import-defer]
+flags: [generated, module]
+info: |
+    IsSymbolLikeNamespaceKey ( _P_, _O_ )
+      1. If _P_ is a Symbol, return *true*.
+      1. If _ns_.[[Deferred]] is *true* and _P_ is "then", return *true*.
+      1. Return *false*.
+
+    GetModuleExportsList ( _O_ )
+      1. If _O_.[[Deferred]] is *true*, then
+        1. Let _m_ be _O_.[[Module]].
+        1. If _m_ is a Cyclic Module Record, _m_.[[Status]] is not ~evaluated~, and ReadyForSyncExecution(_m_) is *false*, throw a *TypeError* exception.
+        1. Perform ? EvaluateSync(_m_).
+      1. Return _O_.[[Exports]].
+
+
+    [[DefineOwnProperty]] ( _P_, _Desc_ )
+      1. If IsSymbolLikeNamespaceKey(_P_, _O_), return ! OrdinaryDefineOwnProperty(_O_, _Desc_).
+      1. Let _current_ be ? _O_.[[GetOwnProperty]](_P_).
+      1. NOTE: If _O_.[[Deferred]] is *true*, the step above will ensure that the module is evaluated.
+      1. ...
+
+    DefineField ( receiver, fieldRecord )
+      1. Let fieldName be fieldRecord.[[Name]].
+      1. Let initializer be fieldRecord.[[Initializer]].
+      1. ...
+      1. If fieldName is a Private Name, then
+        a. Perform ? PrivateFieldAdd(receiver, fieldName, initValue).
+      1. Else,
+        1. Assert: fieldName is a property key.
+        a. Perform ? CreateDataPropertyOrThrow(receiver, fieldName, initValue).
+      1. Return unused.
+
+---*/
+
+
+import "./setup_FIXTURE.js";
+
+import defer * as ns from "./dep_FIXTURE.js";
+
+assert.sameValue(globalThis.evaluations.length, 0, "import defer does not trigger evaluation");
+
+var key = Symbol.toStringTag;
+
+class A { constructor() { return ns; } };
+class B extends A {
+  [key] = 10; 
+};
+
+try {
+  new B();
+} catch (_) {}
+
+assert.sameValue(globalThis.evaluations.length, 0, "It does not trigger evaluation");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/import/import-defer/evaluation-triggers/trigger-exported-string-super-get.js b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/trigger-exported-string-super-get.js
new file mode 100644
index 0000000000000..ede1faf9dd516
--- /dev/null
+++ b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/trigger-exported-string-super-get.js
@@ -0,0 +1,51 @@
+// |reftest| skip module -- import-defer is not supported
+// This file was procedurally generated from the following sources:
+// - src/import-defer/super-get.case
+// - src/import-defer/trigger-on-possible-export/string-exported.template
+/*---
+description: _ [[Get]] when namespace is aliased by super (of a string that is an exported name, triggers execution)
+esid: sec-module-namespace-exotic-objects
+features: [import-defer]
+flags: [generated, module]
+info: |
+    IsSymbolLikeNamespaceKey ( _P_, _O_ )
+      1. If _P_ is a Symbol, return *true*.
+      1. If _ns_.[[Deferred]] is *true* and _P_ is "then", return *true*.
+      1. Return *false*.
+
+    GetModuleExportsList ( _O_ )
+      1. If _O_.[[Deferred]] is *true*, then
+        1. Let _m_ be _O_.[[Module]].
+        1. If _m_ is a Cyclic Module Record, _m_.[[Status]] is not ~evaluated~, and ReadyForSyncExecution(_m_) is *false*, throw a *TypeError* exception.
+        1. Perform ? EvaluateSync(_m_).
+      1. Return _O_.[[Exports]].
+
+
+    [[Get]] ( _P_, _Receiver_ )
+      1. If IsSymbolLikeNamespaceKey(_P_, _O_), return ! OrdinaryGet(_O_, _P_, _Receiver_).
+      1. Let _exports_ be ? GetModuleExportsList(_O_).
+      1. ...
+
+---*/
+
+
+import "./setup_FIXTURE.js";
+
+import defer * as ns from "./dep_FIXTURE.js";
+
+assert.sameValue(globalThis.evaluations.length, 0, "import defer does not trigger evaluation");
+
+var key = "exported";
+
+let obj = {
+  superGet(key) {
+    return super[key];
+  }
+}
+
+Object.setPrototypeOf(obj, ns);
+obj.superGet(key);
+
+assert(globalThis.evaluations.length > 0, "It triggers evaluation");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/import/import-defer/evaluation-triggers/trigger-exported-string-super-property-define.js b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/trigger-exported-string-super-property-define.js
new file mode 100644
index 0000000000000..98a2b032ee95f
--- /dev/null
+++ b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/trigger-exported-string-super-property-define.js
@@ -0,0 +1,63 @@
+// |reftest| skip module -- import-defer is not supported
+// This file was procedurally generated from the following sources:
+// - src/import-defer/super-property-define.case
+// - src/import-defer/trigger-on-possible-export/string-exported.template
+/*---
+description: _ [[DefineOwnProperty]] called from class field definition (of a string that is an exported name, triggers execution)
+esid: sec-module-namespace-exotic-objects
+features: [import-defer]
+flags: [generated, module]
+info: |
+    IsSymbolLikeNamespaceKey ( _P_, _O_ )
+      1. If _P_ is a Symbol, return *true*.
+      1. If _ns_.[[Deferred]] is *true* and _P_ is "then", return *true*.
+      1. Return *false*.
+
+    GetModuleExportsList ( _O_ )
+      1. If _O_.[[Deferred]] is *true*, then
+        1. Let _m_ be _O_.[[Module]].
+        1. If _m_ is a Cyclic Module Record, _m_.[[Status]] is not ~evaluated~, and ReadyForSyncExecution(_m_) is *false*, throw a *TypeError* exception.
+        1. Perform ? EvaluateSync(_m_).
+      1. Return _O_.[[Exports]].
+
+
+    [[DefineOwnProperty]] ( _P_, _Desc_ )
+      1. If IsSymbolLikeNamespaceKey(_P_, _O_), return ! OrdinaryDefineOwnProperty(_O_, _Desc_).
+      1. Let _current_ be ? _O_.[[GetOwnProperty]](_P_).
+      1. NOTE: If _O_.[[Deferred]] is *true*, the step above will ensure that the module is evaluated.
+      1. ...
+
+    DefineField ( receiver, fieldRecord )
+      1. Let fieldName be fieldRecord.[[Name]].
+      1. Let initializer be fieldRecord.[[Initializer]].
+      1. ...
+      1. If fieldName is a Private Name, then
+        a. Perform ? PrivateFieldAdd(receiver, fieldName, initValue).
+      1. Else,
+        1. Assert: fieldName is a property key.
+        a. Perform ? CreateDataPropertyOrThrow(receiver, fieldName, initValue).
+      1. Return unused.
+
+---*/
+
+
+import "./setup_FIXTURE.js";
+
+import defer * as ns from "./dep_FIXTURE.js";
+
+assert.sameValue(globalThis.evaluations.length, 0, "import defer does not trigger evaluation");
+
+var key = "exported";
+
+class A { constructor() { return ns; } };
+class B extends A {
+  [key] = 10; 
+};
+
+try {
+  new B();
+} catch (_) {}
+
+assert(globalThis.evaluations.length > 0, "It triggers evaluation");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/import/import-defer/evaluation-triggers/trigger-not-exported-string-super-get.js b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/trigger-not-exported-string-super-get.js
new file mode 100644
index 0000000000000..f65fdcd4ebf74
--- /dev/null
+++ b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/trigger-not-exported-string-super-get.js
@@ -0,0 +1,51 @@
+// |reftest| skip module -- import-defer is not supported
+// This file was procedurally generated from the following sources:
+// - src/import-defer/super-get.case
+// - src/import-defer/trigger-on-possible-export/string-not-exported.template
+/*---
+description: _ [[Get]] when namespace is aliased by super (of a string that is not an exported name, triggers execution)
+esid: sec-module-namespace-exotic-objects
+features: [import-defer]
+flags: [generated, module]
+info: |
+    IsSymbolLikeNamespaceKey ( _P_, _O_ )
+      1. If _P_ is a Symbol, return *true*.
+      1. If _ns_.[[Deferred]] is *true* and _P_ is "then", return *true*.
+      1. Return *false*.
+
+    GetModuleExportsList ( _O_ )
+      1. If _O_.[[Deferred]] is *true*, then
+        1. Let _m_ be _O_.[[Module]].
+        1. If _m_ is a Cyclic Module Record, _m_.[[Status]] is not ~evaluated~, and ReadyForSyncExecution(_m_) is *false*, throw a *TypeError* exception.
+        1. Perform ? EvaluateSync(_m_).
+      1. Return _O_.[[Exports]].
+
+
+    [[Get]] ( _P_, _Receiver_ )
+      1. If IsSymbolLikeNamespaceKey(_P_, _O_), return ! OrdinaryGet(_O_, _P_, _Receiver_).
+      1. Let _exports_ be ? GetModuleExportsList(_O_).
+      1. ...
+
+---*/
+
+
+import "./setup_FIXTURE.js";
+
+import defer * as ns from "./dep_FIXTURE.js";
+
+assert.sameValue(globalThis.evaluations.length, 0, "import defer does not trigger evaluation");
+
+var key = "notExported";
+
+let obj = {
+  superGet(key) {
+    return super[key];
+  }
+}
+
+Object.setPrototypeOf(obj, ns);
+obj.superGet(key);
+
+assert(globalThis.evaluations.length > 0, "It triggers evaluation");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/import/import-defer/evaluation-triggers/trigger-not-exported-string-super-property-define.js b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/trigger-not-exported-string-super-property-define.js
new file mode 100644
index 0000000000000..c27e1ec880129
--- /dev/null
+++ b/js/src/tests/test262/language/import/import-defer/evaluation-triggers/trigger-not-exported-string-super-property-define.js
@@ -0,0 +1,63 @@
+// |reftest| skip module -- import-defer is not supported
+// This file was procedurally generated from the following sources:
+// - src/import-defer/super-property-define.case
+// - src/import-defer/trigger-on-possible-export/string-not-exported.template
+/*---
+description: _ [[DefineOwnProperty]] called from class field definition (of a string that is not an exported name, triggers execution)
+esid: sec-module-namespace-exotic-objects
+features: [import-defer]
+flags: [generated, module]
+info: |
+    IsSymbolLikeNamespaceKey ( _P_, _O_ )
+      1. If _P_ is a Symbol, return *true*.
+      1. If _ns_.[[Deferred]] is *true* and _P_ is "then", return *true*.
+      1. Return *false*.
+
+    GetModuleExportsList ( _O_ )
+      1. If _O_.[[Deferred]] is *true*, then
+        1. Let _m_ be _O_.[[Module]].
+        1. If _m_ is a Cyclic Module Record, _m_.[[Status]] is not ~evaluated~, and ReadyForSyncExecution(_m_) is *false*, throw a *TypeError* exception.
+        1. Perform ? EvaluateSync(_m_).
+      1. Return _O_.[[Exports]].
+
+
+    [[DefineOwnProperty]] ( _P_, _Desc_ )
+      1. If IsSymbolLikeNamespaceKey(_P_, _O_), return ! OrdinaryDefineOwnProperty(_O_, _Desc_).
+      1. Let _current_ be ? _O_.[[GetOwnProperty]](_P_).
+      1. NOTE: If _O_.[[Deferred]] is *true*, the step above will ensure that the module is evaluated.
+      1. ...
+
+    DefineField ( receiver, fieldRecord )
+      1. Let fieldName be fieldRecord.[[Name]].
+      1. Let initializer be fieldRecord.[[Initializer]].
+      1. ...
+      1. If fieldName is a Private Name, then
+        a. Perform ? PrivateFieldAdd(receiver, fieldName, initValue).
+      1. Else,
+        1. Assert: fieldName is a property key.
+        a. Perform ? CreateDataPropertyOrThrow(receiver, fieldName, initValue).
+      1. Return unused.
+
+---*/
+
+
+import "./setup_FIXTURE.js";
+
+import defer * as ns from "./dep_FIXTURE.js";
+
+assert.sameValue(globalThis.evaluations.length, 0, "import defer does not trigger evaluation");
+
+var key = "notExported";
+
+class A { constructor() { return ns; } };
+class B extends A {
+  [key] = 10; 
+};
+
+try {
+  new B();
+} catch (_) {}
+
+assert(globalThis.evaluations.length > 0, "It triggers evaluation");
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/await-using/Symbol.asyncDispose-getter.js b/js/src/tests/test262/language/statements/await-using/Symbol.asyncDispose-getter.js
new file mode 100644
index 0000000000000..ab1fd4a5962a1
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/Symbol.asyncDispose-getter.js
@@ -0,0 +1,90 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Invokes [Symbol.asyncDispose] getter
+info: |
+  RS: Evaluation
+    AwaitUsingDeclaration : CoverAwaitExpressionAndAwaitUsingDeclarationHead BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument async-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  2. Else,
+    ...
+  3. Append resource to disposeCapability.[[DisposableResourceStack]].
+  4. Return unused.
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      ...
+    b. Else,
+      i. If V is not an Object, throw a TypeError exception.
+      ii. Set method to ? GetDisposeMethod(V, hint).
+      iii. If method is undefined, throw a TypeError exception.
+  ...
+
+  GetDisposeMethod ( V, hint )
+
+  1. If hint is async-dispose, then
+    a. Let method be ? GetMethod(V, @@asyncDispose).
+    b. If method is undefined, then
+      i. Set method to ? GetMethod(V, @@dispose).
+  2. Else,
+    a. Let method be ? GetMethod(V, @@dispose).
+  3. Return method.
+
+  GetMethod ( V, P )
+
+  1. Let func be ? GetV(V, P).
+  2. If func is either undefined or null, return undefined.
+  3. ...
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var resource = {
+    disposed: false,
+    get [Symbol.asyncDispose]() {
+      return async function () {
+        this.disposed = true;
+      };
+    }
+  };
+
+  {
+    await using _ = resource;
+  }
+
+  assert.sameValue(resource.disposed, true, 'Expected resource to have been disposed');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/Symbol.asyncDispose-method-called-with-correct-this.js b/js/src/tests/test262/language/statements/await-using/Symbol.asyncDispose-method-called-with-correct-this.js
new file mode 100644
index 0000000000000..b3e600051a228
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/Symbol.asyncDispose-method-called-with-correct-this.js
@@ -0,0 +1,55 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-block-runtime-semantics-evaluation
+description: Initialized value is disposed with the correct 'this' value
+info: |
+  RS: Evaluation
+    Block : { StatementList }
+
+    ...
+    5. Let blockValue be the result of evaluating StatementList.
+    6. Set blockValue to DisposeResources(blockEnv.[[DisposeCapability]], blockValue).
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  ...
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var resource = {
+      disposed: false,
+      async [Symbol.asyncDispose]() {
+          assert.sameValue(this, resource);
+      }
+  };
+
+  {
+    await using _ = resource;
+  }
+});
diff --git a/js/src/tests/test262/language/statements/await-using/Symbol.asyncDispose-method-not-async.js b/js/src/tests/test262/language/statements/await-using/Symbol.asyncDispose-method-not-async.js
new file mode 100644
index 0000000000000..0cd011bea7631
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/Symbol.asyncDispose-method-not-async.js
@@ -0,0 +1,59 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-block-runtime-semantics-evaluation
+description: Disposal succeeds even if [Symbol.disposeAsync] does not return a Promise.
+info: |
+  RS: Evaluation
+    Block : { StatementList }
+
+    ...
+    5. Let blockValue be the result of evaluating StatementList.
+    6. Set blockValue to DisposeResources(blockEnv.[[DisposeCapability]], blockValue).
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. ...
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var resource = {
+    disposed: false,
+    [Symbol.asyncDispose]() {
+      this.disposed = true;
+    }
+  };
+
+  {
+    await using _ = resource;
+  }
+
+  assert.sameValue(resource.disposed, true, 'Expected resource to have been disposed');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/Symbol.dispose-getter.js b/js/src/tests/test262/language/statements/await-using/Symbol.dispose-getter.js
new file mode 100644
index 0000000000000..d9f82e6e426ad
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/Symbol.dispose-getter.js
@@ -0,0 +1,90 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Invokes [Symbol.dispose] getter
+info: |
+  RS: Evaluation
+    AwaitUsingDeclaration : CoverAwaitExpressionAndAwaitUsingDeclarationHead BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument async-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  2. Else,
+    ...
+  3. Append resource to disposeCapability.[[DisposableResourceStack]].
+  4. Return unused.
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      ...
+    b. Else,
+      i. If V is not an Object, throw a TypeError exception.
+      ii. Set method to ? GetDisposeMethod(V, hint).
+      iii. If method is undefined, throw a TypeError exception.
+  ...
+
+  GetDisposeMethod ( V, hint )
+
+  1. If hint is async-dispose, then
+    a. Let method be ? GetMethod(V, @@asyncDispose).
+    b. If method is undefined, then
+      i. Set method to ? GetMethod(V, @@dispose).
+  2. Else,
+    a. Let method be ? GetMethod(V, @@dispose).
+  3. Return method.
+
+  GetMethod ( V, P )
+
+  1. Let func be ? GetV(V, P).
+  2. If func is either undefined or null, return undefined.
+  3. ...
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var resource = {
+    disposed: false,
+    get [Symbol.dispose]() {
+      return function() {
+        this.disposed = true;
+      };
+    }
+  };
+
+  {
+    await using _ = resource;
+  }
+
+  assert.sameValue(resource.disposed, true, 'Expected resource to have been disposed');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/Symbol.dispose-method-called-with-correct-this.js b/js/src/tests/test262/language/statements/await-using/Symbol.dispose-method-called-with-correct-this.js
new file mode 100644
index 0000000000000..408db309db9d3
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/Symbol.dispose-method-called-with-correct-this.js
@@ -0,0 +1,55 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-block-runtime-semantics-evaluation
+description: Initialized value is disposed with the correct 'this' value
+info: |
+  RS: Evaluation
+    Block : { StatementList }
+
+    ...
+    5. Let blockValue be the result of evaluating StatementList.
+    6. Set blockValue to DisposeResources(blockEnv.[[DisposeCapability]], blockValue).
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  ...
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function() {
+  var resource = {
+    disposed: false,
+    [Symbol.dispose]() {
+        assert.sameValue(this, resource);
+    }
+  };
+
+  {
+    await using _ = resource;
+  }
+});
diff --git a/js/src/tests/test262/language/statements/await-using/await-using-Symbol.asyncDispose-allows-non-promise-return-value.js b/js/src/tests/test262/language/statements/await-using/await-using-Symbol.asyncDispose-allows-non-promise-return-value.js
new file mode 100644
index 0000000000000..78ed4fcaffc77
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/await-using-Symbol.asyncDispose-allows-non-promise-return-value.js
@@ -0,0 +1,48 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-disposeresources
+description: >
+  `await using` allows a non-Promise return value from `[Symbol.asyncDispose]()`
+info: |
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var resource = {
+    [Symbol.asyncDispose]() {
+    }
+  };
+
+  {
+    await using _ = resource;
+  }
+});
diff --git a/js/src/tests/test262/language/statements/await-using/await-using-Symbol.asyncDispose-allows-promiselike-return-value.js b/js/src/tests/test262/language/statements/await-using/await-using-Symbol.asyncDispose-allows-promiselike-return-value.js
new file mode 100644
index 0000000000000..601d1154cc334
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/await-using-Symbol.asyncDispose-allows-promiselike-return-value.js
@@ -0,0 +1,53 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-disposeresources
+description: >
+  `await using` allows non-native `Promise`-like return value from `[Symbol.asyncDispose]()`
+info: |
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var resource = {
+    [Symbol.asyncDispose]() {
+      return {
+        then(resolve) {
+          resolve();
+        }
+      };
+    }
+  };
+
+  {
+    await using _ = resource;
+  }
+});
diff --git a/js/src/tests/test262/language/statements/await-using/await-using-allows-null-initializer.js b/js/src/tests/test262/language/statements/await-using/await-using-allows-null-initializer.js
new file mode 100644
index 0000000000000..b74f6db39789e
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/await-using-allows-null-initializer.js
@@ -0,0 +1,47 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Allows null in initializer of 'await using'
+info: |
+  RS: Evaluation
+    AwaitUsingDeclaration : CoverAwaitExpressionAndAwaitUsingDeclarationHead BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument async-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    ...
+  ...
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  await using x = null;
+});
diff --git a/js/src/tests/test262/language/statements/await-using/await-using-allows-undefined-initializer.js b/js/src/tests/test262/language/statements/await-using/await-using-allows-undefined-initializer.js
new file mode 100644
index 0000000000000..dad0c49eccb98
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/await-using-allows-undefined-initializer.js
@@ -0,0 +1,47 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Allows undefined in initializer of 'await using'
+info: |
+  RS: Evaluation
+    AwaitUsingDeclaration : CoverAwaitExpressionAndAwaitUsingDeclarationHead BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument async-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    ...
+  ...
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  using x = undefined;
+});
diff --git a/js/src/tests/test262/language/statements/await-using/await-using-does-not-imply-await-if-not-evaluated.js b/js/src/tests/test262/language/statements/await-using/await-using-does-not-imply-await-if-not-evaluated.js
new file mode 100644
index 0000000000000..3167d5769d030
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/await-using-does-not-imply-await-if-not-evaluated.js
@@ -0,0 +1,103 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: An 'await using' does not imply an Await occurs if the statement is not evaluated
+info: |
+  RS: Evaluation
+    AwaitUsingDeclaration : CoverAwaitExpressionAndAwaitUsingDeclarationHead BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument async-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  ...
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      i. Set V to undefined.
+      ii. Set method to undefined.
+    ...
+  ...
+  3. Return the DisposableResource Record { [[ResourceValue]]: V, [[Hint]]: hint, [[DisposeMethod]]: method }.
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var BREAK_EARLY = true;
+  var isRunningInSameMicrotask = true;
+  var wasStartedInSameMicrotask = false;
+  var didEvaluatePrecedingBlockStatementsInSameMicrotask = false;
+  var wasRunningInSameMicrotask = false;
+
+  async function f() {
+    wasStartedInSameMicrotask = isRunningInSameMicrotask;
+    outer: {
+      didEvaluatePrecedingBlockStatementsInSameMicrotask = isRunningInSameMicrotask;
+      if (BREAK_EARLY) break outer;
+      await using _ = null;
+    }
+    wasRunningInSameMicrotask = isRunningInSameMicrotask;
+  }
+
+  var p = f();
+  isRunningInSameMicrotask = false;
+  await p;
+
+  assert.sameValue(wasStartedInSameMicrotask, true, 'Expected async function containing `await using` to start in the same microtask');
+  assert.sameValue(didEvaluatePrecedingBlockStatementsInSameMicrotask, true, 'Expected block statements preceding `await using` to be evaluated in the same microtask');
+  assert.sameValue(wasRunningInSameMicrotask, true, 'Expected statements following the block containing unevaluated `await using` to evaluate in the same microtask');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/await-using-implies-await-if-evaluated.js b/js/src/tests/test262/language/statements/await-using/await-using-implies-await-if-evaluated.js
new file mode 100644
index 0000000000000..b737eccf59212
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/await-using-implies-await-if-evaluated.js
@@ -0,0 +1,104 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: An 'await using' implies an Await occurs if the statement is evaluated, even if all initializers are 'null' or 'undefined'
+info: |
+  RS: Evaluation
+    AwaitUsingDeclaration : CoverAwaitExpressionAndAwaitUsingDeclarationHead BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument async-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  ...
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      i. Set V to undefined.
+      ii. Set method to undefined.
+    ...
+  ...
+  3. Return the DisposableResource Record { [[ResourceValue]]: V, [[Hint]]: hint, [[DisposeMethod]]: method }.
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var isRunningInSameMicrotask = true;
+  var wasStartedInSameMicrotask = false;
+  var didEvaluatePrecedingBlockStatementsInSameMicrotask = false;
+  var didEvaluateFollowingBlockStatementsInSameMicrotask = false;
+  var wasRunningInSameMicrotask = false;
+
+  async function f() {
+    wasStartedInSameMicrotask = isRunningInSameMicrotask;
+    {
+      didEvaluatePrecedingBlockStatementsInSameMicrotask = isRunningInSameMicrotask;
+      await using _ = null;
+      didEvaluateFollowingBlockStatementsInSameMicrotask = isRunningInSameMicrotask;
+    }
+    wasRunningInSameMicrotask = isRunningInSameMicrotask;
+  }
+
+  var p = f();
+  isRunningInSameMicrotask = false;
+  await p;
+
+  assert.sameValue(wasStartedInSameMicrotask, true, 'Expected async function containing `await using` to start in the same microtask');
+  assert.sameValue(didEvaluatePrecedingBlockStatementsInSameMicrotask, true, 'Expected block statements preceding `await using` to be evaluated in the same microtask');
+  assert.sameValue(didEvaluateFollowingBlockStatementsInSameMicrotask, true, 'Expected block statements following `await using` to be evaluated in the same microtask');
+  assert.sameValue(wasRunningInSameMicrotask, false, 'Expected statements following the block containing evaluated `await using` to evaluate in a different microtask');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/block-local-closure-get-before-initialization.js b/js/src/tests/test262/language/statements/await-using/block-local-closure-get-before-initialization.js
new file mode 100644
index 0000000000000..27b7e11d56bad
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/block-local-closure-get-before-initialization.js
@@ -0,0 +1,23 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-declarative-environment-records-getbindingvalue-n-s
+description: >
+    await using: block local closure [[Get]] before initialization.
+    (TDZ, Temporal Dead Zone)
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  function f() { return x + 1; }
+
+  assert.throws(ReferenceError, function() {
+    f();
+  });
+
+  await using x = null;
+});
diff --git a/js/src/tests/test262/language/statements/await-using/block-local-use-before-initialization-in-declaration-statement.js b/js/src/tests/test262/language/statements/await-using/block-local-use-before-initialization-in-declaration-statement.js
new file mode 100644
index 0000000000000..1563bf2603ef8
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/block-local-use-before-initialization-in-declaration-statement.js
@@ -0,0 +1,19 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-declarative-environment-records-getbindingvalue-n-s
+description: >
+    await using: block local use before initialization in declaration statement.
+    (TDZ, Temporal Dead Zone)
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  await assert.throwsAsync(ReferenceError, async function() {
+      await using x = x + 1;
+  });
+});
diff --git a/js/src/tests/test262/language/statements/await-using/block-local-use-before-initialization-in-prior-statement.js b/js/src/tests/test262/language/statements/await-using/block-local-use-before-initialization-in-prior-statement.js
new file mode 100644
index 0000000000000..f9be4280e888e
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/block-local-use-before-initialization-in-prior-statement.js
@@ -0,0 +1,19 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-declarative-environment-records-getbindingvalue-n-s
+description: >
+    await using: block local use before initialization in prior statement.
+    (TDZ, Temporal Dead Zone)
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  await assert.throwsAsync(ReferenceError, async function() {
+    x; await using x = null;
+  });
+});
diff --git a/js/src/tests/test262/language/statements/await-using/fn-name-arrow.js b/js/src/tests/test262/language/statements/await-using/fn-name-arrow.js
new file mode 100644
index 0000000000000..b6bf07a2a3c66
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/fn-name-arrow.js
@@ -0,0 +1,29 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Assignment of function `name` attribute (ArrowFunction)
+info: |
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    3. If IsAnonymousFunctionDefinition(Initializer) is true, then
+       a. Let value be NamedEvaluation of Initializer with argument bindingId
+
+flags: [async]
+includes: [propertyHelper.js, asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+// NOTE: only way to verify is to patch `Function.prototype` so as not to trigger a TypeError from AddDisposableResource
+Function.prototype[Symbol.dispose] = function () {}
+asyncTest(async function () {
+  await using arrow = () => {};
+
+  assert.sameValue(arrow.name, 'arrow');
+  verifyNotEnumerable(arrow, 'name');
+  verifyNotWritable(arrow, 'name');
+  verifyConfigurable(arrow, 'name');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/fn-name-class.js b/js/src/tests/test262/language/statements/await-using/fn-name-class.js
new file mode 100644
index 0000000000000..7e666c1e59056
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/fn-name-class.js
@@ -0,0 +1,32 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Assignment of function `name` attribute (ClassExpression)
+info: |
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    3. If IsAnonymousFunctionDefinition(Initializer) is true, then
+       a. Let value be NamedEvaluation of Initializer with argument bindingId
+
+flags: [async]
+includes: [propertyHelper.js, asyncHelpers.js]
+features: [class, explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+    await using xCls = class x { static async [Symbol.asyncDispose]() {} };
+    await using cls = class { static async [Symbol.asyncDispose]() {} };
+    await using xCls2 = class { static name() {} static async [Symbol.asyncDispose]() {} };
+
+    assert.notSameValue(xCls.name, 'xCls');
+    assert.notSameValue(xCls2.name, 'xCls2');
+
+    assert.sameValue(cls.name, 'cls');
+    verifyNotEnumerable(cls, 'name');
+    verifyNotWritable(cls, 'name');
+    verifyConfigurable(cls, 'name');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/fn-name-cover.js b/js/src/tests/test262/language/statements/await-using/fn-name-cover.js
new file mode 100644
index 0000000000000..ae39299875132
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/fn-name-cover.js
@@ -0,0 +1,33 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: >
+    Assignment of function `name` attribute (CoverParenthesizedExpression)
+info: |
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    3. If IsAnonymousFunctionDefinition(Initializer) is true, then
+       a. Let value be NamedEvaluation of Initializer with argument bindingId
+
+flags: [async]
+includes: [propertyHelper.js, asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+// NOTE: only way to verify is to patch `Function.prototype` so as not to trigger a TypeError from AddDisposableResource
+Function.prototype[Symbol.dispose] = function () {}
+asyncTest(async function () {
+  await using xCover = (0, function() {});
+  await using cover = (function() {});
+
+  assert(xCover.name !== 'xCover');
+
+  assert.sameValue(cover.name, 'cover');
+  verifyNotEnumerable(cover, 'name');
+  verifyNotWritable(cover, 'name');
+  verifyConfigurable(cover, 'name');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/fn-name-fn.js b/js/src/tests/test262/language/statements/await-using/fn-name-fn.js
new file mode 100644
index 0000000000000..306a467bcd884
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/fn-name-fn.js
@@ -0,0 +1,32 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Assignment of function `name` attribute (FunctionExpression)
+info: |
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    3. If IsAnonymousFunctionDefinition(Initializer) is true, then
+       a. Let value be NamedEvaluation of Initializer with argument bindingId
+
+flags: [async]
+includes: [propertyHelper.js, asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+// NOTE: only way to verify is to patch `Function.prototype` so as not to trigger a TypeError from AddDisposableResource
+Function.prototype[Symbol.dispose] = function () {}
+asyncTest(async function() {
+    await using xFn = function x() {};
+    await using fn = function() {};
+
+    assert(xFn.name !== 'xFn');
+
+    assert.sameValue(fn.name, 'fn');
+    verifyNotEnumerable(fn, 'name');
+    verifyNotWritable(fn, 'name');
+    verifyConfigurable(fn, 'name');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/fn-name-gen.js b/js/src/tests/test262/language/statements/await-using/fn-name-gen.js
new file mode 100644
index 0000000000000..b6a3cbc145982
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/fn-name-gen.js
@@ -0,0 +1,32 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Assignment of function `name` attribute (GeneratorExpression)
+info: |
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    3. If IsAnonymousFunctionDefinition(Initializer) is true, then
+       a. Let value be NamedEvaluation of Initializer with argument bindingId
+
+flags: [async]
+includes: [propertyHelper.js, asyncHelpers.js]
+features: [generators,explicit-resource-management]
+---*/
+
+// NOTE: only way to verify is to patch `Function.prototype` so as not to trigger a TypeError from AddDisposableResource
+Function.prototype[Symbol.dispose] = function () {}
+asyncTest(async function() {
+    await using xGen = function* x() {};
+    await using gen = function*() {};
+
+    assert(xGen.name !== 'xGen');
+
+    assert.sameValue(gen.name, 'gen');
+    verifyNotEnumerable(gen, 'name');
+    verifyNotWritable(gen, 'name');
+    verifyConfigurable(gen, 'name');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/function-local-closure-get-before-initialization.js b/js/src/tests/test262/language/statements/await-using/function-local-closure-get-before-initialization.js
new file mode 100644
index 0000000000000..bcc3f345ec63e
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/function-local-closure-get-before-initialization.js
@@ -0,0 +1,24 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-declarative-environment-records-getbindingvalue-n-s
+description: >
+    await using: function local closure [[Get]] before initialization.
+    (TDZ, Temporal Dead Zone)
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function() {
+  function f() { return x + 1; }
+
+  assert.throws(ReferenceError, function() {
+    f();
+  });
+
+  await using x = null;
+});
diff --git a/js/src/tests/test262/language/statements/await-using/function-local-use-before-initialization-in-declaration-statement.js b/js/src/tests/test262/language/statements/await-using/function-local-use-before-initialization-in-declaration-statement.js
new file mode 100644
index 0000000000000..5dbf2807ae2d1
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/function-local-use-before-initialization-in-declaration-statement.js
@@ -0,0 +1,18 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-declarative-environment-records-getbindingvalue-n-s
+description: >
+    await using: function local use before initialization in declaration statement.
+    (TDZ, Temporal Dead Zone)
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+asyncTest(async function () {
+  await assert.throwsAsync(ReferenceError, async function() {
+    await using x = x + 1;
+  });
+});
diff --git a/js/src/tests/test262/language/statements/await-using/function-local-use-before-initialization-in-prior-statement.js b/js/src/tests/test262/language/statements/await-using/function-local-use-before-initialization-in-prior-statement.js
new file mode 100644
index 0000000000000..541915d0e1d76
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/function-local-use-before-initialization-in-prior-statement.js
@@ -0,0 +1,19 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-declarative-environment-records-getbindingvalue-n-s
+description: >
+    await using: function local use before initialization in prior statement.
+    (TDZ, Temporal Dead Zone)
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  await assert.throwsAsync(ReferenceError, async function() {
+    x; await using x = null;
+  });
+});
diff --git a/js/src/tests/test262/language/statements/await-using/gets-initializer-Symbol.asyncDispose-property-once.js b/js/src/tests/test262/language/statements/await-using/gets-initializer-Symbol.asyncDispose-property-once.js
new file mode 100644
index 0000000000000..764b279ef3b32
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/gets-initializer-Symbol.asyncDispose-property-once.js
@@ -0,0 +1,89 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Only reads `[Symbol.asyncDispose]` method once, when initialized.
+info: |
+  RS: Evaluation
+    AwaitUsingDeclaration : CoverAwaitExpressionAndAwaitUsingDeclarationHead BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument async-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    BindingList : BindingList , LexicalBinding
+
+    1. Perform ? BindingEvaluation of BindingList with argument hint.
+    2. Perform ? BindingEvaluation of LexicalBinding with argument hint.
+    3. Return unused.
+
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  ...
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      i. Set V to undefined
+      ii. Set method to undefined
+    b. Else,
+      i. If Type(V) is not Object, throw a TypeError exception.
+      ii. Set method to ? GetDisposeMethod(V, hint).
+      iii. If method is undefined, throw a TypeError exception.
+  2. Else,
+      a. ...
+  3. Return the DisposableResource Record { [[ResourceValue]]: V, [[Hint]]: hint, [[DisposeMethod]]: method }.
+
+  GetDisposeMethod ( V, hint )
+
+  1. If hint is async-dispose, then
+    a. Let method be ? GetMethod(V, @@asyncDispose).
+    b. If method is undefined, then
+      i. Set method to ? GetMethod(V, @@dispose).
+  2. Else,
+    a. Let method be ? GetMethod(V, @@dispose).
+  3. Return method.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var resource = {
+      asyncDisposeReadCount: 0,
+      get [Symbol.asyncDispose]() {
+          this.asyncDisposeReadCount++;
+          return async function() { };
+      }
+  };
+
+  {
+    await using _ = resource;
+  }
+
+  assert.sameValue(resource.asyncDisposeReadCount, 1, 'Expected [Symbol.asyncDispose] to have been read only once');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/gets-initializer-Symbol.dispose-after-Symbol.asyncDispose-is-null.js b/js/src/tests/test262/language/statements/await-using/gets-initializer-Symbol.dispose-after-Symbol.asyncDispose-is-null.js
new file mode 100644
index 0000000000000..076aeac24b1e0
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/gets-initializer-Symbol.dispose-after-Symbol.asyncDispose-is-null.js
@@ -0,0 +1,93 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Reads `[Symbol.dispose]` method if `[Symbol.asyncDispose]` is null
+info: |
+  RS: Evaluation
+    AwaitUsingDeclaration : CoverAwaitExpressionAndAwaitUsingDeclarationHead BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument async-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    BindingList : BindingList , LexicalBinding
+
+    1. Perform ? BindingEvaluation of BindingList with argument hint.
+    2. Perform ? BindingEvaluation of LexicalBinding with argument hint.
+    3. Return unused.
+
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  ...
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      i. Set V to undefined
+      ii. Set method to undefined
+    b. Else,
+      i. If Type(V) is not Object, throw a TypeError exception.
+      ii. Set method to ? GetDisposeMethod(V, hint).
+      iii. If method is undefined, throw a TypeError exception.
+  2. Else,
+      a. ...
+  3. Return the DisposableResource Record { [[ResourceValue]]: V, [[Hint]]: hint, [[DisposeMethod]]: method }.
+
+  GetDisposeMethod ( V, hint )
+
+  1. If hint is async-dispose, then
+    a. Let method be ? GetMethod(V, @@asyncDispose).
+    b. If method is undefined, then
+      i. Set method to ? GetMethod(V, @@dispose).
+  2. Else,
+    a. Let method be ? GetMethod(V, @@dispose).
+  3. Return method.
+
+flags: [async]
+includes: [asyncHelpers.js, deepEqual.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var order = [];
+  var resource = {
+      get [Symbol.asyncDispose]() {
+        order.push('Symbol.asyncDispose');
+        return null;
+      },
+      get [Symbol.dispose]() {
+          order.push('Symbol.dispose');
+          return function() { };
+      }
+  };
+
+  {
+    await using _ = resource;
+  }
+
+  assert.deepEqual(order, ['Symbol.asyncDispose', 'Symbol.dispose'], 'Expected [Symbol.dispose] to have been read after [Symbol.asyncDispose] returns null');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/gets-initializer-Symbol.dispose-after-Symbol.asyncDispose-is-undefined.js b/js/src/tests/test262/language/statements/await-using/gets-initializer-Symbol.dispose-after-Symbol.asyncDispose-is-undefined.js
new file mode 100644
index 0000000000000..951649d8827d6
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/gets-initializer-Symbol.dispose-after-Symbol.asyncDispose-is-undefined.js
@@ -0,0 +1,93 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Reads `[Symbol.dispose]` method if `[Symbol.asyncDispose]` is undefined.
+info: |
+  RS: Evaluation
+    AwaitUsingDeclaration : CoverAwaitExpressionAndAwaitUsingDeclarationHead BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument async-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    BindingList : BindingList , LexicalBinding
+
+    1. Perform ? BindingEvaluation of BindingList with argument hint.
+    2. Perform ? BindingEvaluation of LexicalBinding with argument hint.
+    3. Return unused.
+
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  ...
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      i. Set V to undefined
+      ii. Set method to undefined
+    b. Else,
+      i. If Type(V) is not Object, throw a TypeError exception.
+      ii. Set method to ? GetDisposeMethod(V, hint).
+      iii. If method is undefined, throw a TypeError exception.
+  2. Else,
+      a. ...
+  3. Return the DisposableResource Record { [[ResourceValue]]: V, [[Hint]]: hint, [[DisposeMethod]]: method }.
+
+  GetDisposeMethod ( V, hint )
+
+  1. If hint is async-dispose, then
+    a. Let method be ? GetMethod(V, @@asyncDispose).
+    b. If method is undefined, then
+      i. Set method to ? GetMethod(V, @@dispose).
+  2. Else,
+    a. Let method be ? GetMethod(V, @@dispose).
+  3. Return method.
+
+flags: [async]
+includes: [asyncHelpers.js, deepEqual.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var order = [];
+  var resource = {
+      get [Symbol.asyncDispose]() {
+        order.push('Symbol.asyncDispose');
+        return undefined;
+      },
+      get [Symbol.dispose]() {
+          order.push('Symbol.dispose');
+          return function() { };
+      }
+  };
+
+  {
+    await using _ = resource;
+  }
+
+  assert.deepEqual(order, ['Symbol.asyncDispose', 'Symbol.dispose'], 'Expected [Symbol.dispose] to have been read after [Symbol.asyncDispose] returns undefined');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/gets-initializer-Symbol.dispose-property-once.js b/js/src/tests/test262/language/statements/await-using/gets-initializer-Symbol.dispose-property-once.js
new file mode 100644
index 0000000000000..55677eb4d0c02
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/gets-initializer-Symbol.dispose-property-once.js
@@ -0,0 +1,89 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Only reads `[Symbol.dispose]` method once, when initialized.
+info: |
+  RS: Evaluation
+    AwaitUsingDeclaration : CoverAwaitExpressionAndAwaitUsingDeclarationHead BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument async-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    BindingList : BindingList , LexicalBinding
+
+    1. Perform ? BindingEvaluation of BindingList with argument hint.
+    2. Perform ? BindingEvaluation of LexicalBinding with argument hint.
+    3. Return unused.
+
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  ...
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      i. Set V to undefined
+      ii. Set method to undefined
+    b. Else,
+      i. If Type(V) is not Object, throw a TypeError exception.
+      ii. Set method to ? GetDisposeMethod(V, hint).
+      iii. If method is undefined, throw a TypeError exception.
+  2. Else,
+      a. ...
+  3. Return the DisposableResource Record { [[ResourceValue]]: V, [[Hint]]: hint, [[DisposeMethod]]: method }.
+
+  GetDisposeMethod ( V, hint )
+
+  1. If hint is async-dispose, then
+    a. Let method be ? GetMethod(V, @@asyncDispose).
+    b. If method is undefined, then
+      i. Set method to ? GetMethod(V, @@dispose).
+  2. Else,
+    a. Let method be ? GetMethod(V, @@dispose).
+  3. Return method.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var resource = {
+      disposeReadCount: 0,
+      get [Symbol.dispose]() {
+          this.disposeReadCount++;
+          return function() { };
+      }
+  };
+
+  {
+    await using _ = resource;
+  }
+
+  assert.sameValue(resource.disposeReadCount, 1, 'Expected [Symbol.dispose] to have been read only once');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/gets-initializer-does-not-read-Symbol.dispose-if-Symbol.asyncDispose-exists.js b/js/src/tests/test262/language/statements/await-using/gets-initializer-does-not-read-Symbol.dispose-if-Symbol.asyncDispose-exists.js
new file mode 100644
index 0000000000000..5e1006b6aab3f
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/gets-initializer-does-not-read-Symbol.dispose-if-Symbol.asyncDispose-exists.js
@@ -0,0 +1,93 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Does not read `[Symbol.dispose]` if `[Symbol.asyncDispose]` is neither null or undefined.
+info: |
+  RS: Evaluation
+    AwaitUsingDeclaration : CoverAwaitExpressionAndAwaitUsingDeclarationHead BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument async-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    BindingList : BindingList , LexicalBinding
+
+    1. Perform ? BindingEvaluation of BindingList with argument hint.
+    2. Perform ? BindingEvaluation of LexicalBinding with argument hint.
+    3. Return unused.
+
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  ...
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      i. Set V to undefined
+      ii. Set method to undefined
+    b. Else,
+      i. If Type(V) is not Object, throw a TypeError exception.
+      ii. Set method to ? GetDisposeMethod(V, hint).
+      iii. If method is undefined, throw a TypeError exception.
+  2. Else,
+      a. ...
+  3. Return the DisposableResource Record { [[ResourceValue]]: V, [[Hint]]: hint, [[DisposeMethod]]: method }.
+
+  GetDisposeMethod ( V, hint )
+
+  1. If hint is async-dispose, then
+    a. Let method be ? GetMethod(V, @@asyncDispose).
+    b. If method is undefined, then
+      i. Set method to ? GetMethod(V, @@dispose).
+  2. Else,
+    a. Let method be ? GetMethod(V, @@dispose).
+  3. Return method.
+
+flags: [async]
+includes: [asyncHelpers.js, deepEqual.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var order = [];
+  var resource = {
+      get [Symbol.asyncDispose]() {
+        order.push('Symbol.asyncDispose');
+        return async function() {};
+      },
+      get [Symbol.dispose]() {
+          order.push('Symbol.dispose');
+          return function() { };
+      }
+  };
+
+  {
+    await using _ = resource;
+  }
+
+  assert.deepEqual(order, ['Symbol.asyncDispose'], 'Expected [Symbol.dispose] to not have been read');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/global-closure-get-before-initialization.js b/js/src/tests/test262/language/statements/await-using/global-closure-get-before-initialization.js
new file mode 100644
index 0000000000000..ffd61a91443b6
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/global-closure-get-before-initialization.js
@@ -0,0 +1,23 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-declarative-environment-records-getbindingvalue-n-s
+description: >
+    await using: global closure [[Get]] before initialization.
+    (TDZ, Temporal Dead Zone)
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function() {
+  function f() { return x + 1; }
+
+  assert.throws(ReferenceError, function() {
+    f();
+  });
+
+  await using x = null;
+});
diff --git a/js/src/tests/test262/language/statements/await-using/global-use-before-initialization-in-declaration-statement.js b/js/src/tests/test262/language/statements/await-using/global-use-before-initialization-in-declaration-statement.js
new file mode 100644
index 0000000000000..11edac0d47752
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/global-use-before-initialization-in-declaration-statement.js
@@ -0,0 +1,20 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-declarative-environment-records-getbindingvalue-n-s
+description: >
+    await using: global use before initialization in declaration statement.
+    (TDZ, Temporal Dead Zone)
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  await assert.throwsAsync(ReferenceError, async function() {
+    await using x = x + 1;
+  });
+});
diff --git a/js/src/tests/test262/language/statements/await-using/global-use-before-initialization-in-prior-statement.js b/js/src/tests/test262/language/statements/await-using/global-use-before-initialization-in-prior-statement.js
new file mode 100644
index 0000000000000..d0e51235e8dae
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/global-use-before-initialization-in-prior-statement.js
@@ -0,0 +1,20 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-declarative-environment-records-getbindingvalue-n-s
+description: >
+    await using: global use before initialization in prior statement.
+    (TDZ, Temporal Dead Zone)
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function() {
+  await assert.throwsAsync(ReferenceError, async function () {
+    x; await using x = null;
+  });
+});
diff --git a/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-at-end-of-asyncfunctionbody.js b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-at-end-of-asyncfunctionbody.js
new file mode 100644
index 0000000000000..e40d0529336df
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-at-end-of-asyncfunctionbody.js
@@ -0,0 +1,106 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-asyncblockstart
+description: Initialized value is disposed at end of AsyncFunctionBody
+info: |
+  AsyncBlockStart ( promiseCapability, asyncBody, asyncContext )
+
+  1. Assert: promiseCapability is a PromiseCapability Record.
+  2. Let runningContext be the running execution context.
+  3. Let closure be a new Abstract Closure with no parameters that captures promiseCapability and asyncBody and performs the following steps when called:
+    a. Let acAsyncContext be the running execution context.
+    b. Let result be Completion(Evaluation of asyncBody).
+    c. Assert: If we return here, the async function either threw an exception or performed an implicit or explicit return; all awaiting is done.
+    d. Remove acAsyncContext from the execution context stack and restore the execution context that is at the top of the execution context stack as the running execution context.
+    e. Let env be acAsyncContext's LexicalEnvironment.
+    f. Set result to DisposeResources(env.[[DisposeCapability]], result).
+    g. If result.[[Type]] is normal, then
+      i. Perform ! Call(promiseCapability.[[Resolve]], undefined, « undefined »).
+    h. Else if result.[[Type]] is return, then
+      i. Perform ! Call(promiseCapability.[[Resolve]], undefined, « result.[[Value]] »).
+    i. Else,
+      i. Assert: result.[[Type]] is throw.
+      ii. Perform ! Call(promiseCapability.[[Reject]], undefined, « result.[[Value]] »).
+    j. Return unused.
+  4. Set the code evaluation state of asyncContext such that when evaluation is resumed for that execution context, closure will be called with no arguments.
+  5. Push asyncContext onto the execution context stack; asyncContext is now the running execution context.
+  6. Resume the suspended evaluation of asyncContext. Let result be the value returned by the resumed computation.
+  7. Assert: When we return here, asyncContext has already been removed from the execution context stack and runningContext is the currently running execution context.
+  8. Assert: result is a normal completion with a value of unused. The possible sources of this value are Await or, if the async function doesn't await anything, step 3.h above.
+  9. Return unused.
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+
+  var resource = {
+      disposed: false,
+      async [Symbol.asyncDispose]() {
+          this.disposed = true;
+      }
+  };
+
+  var releaseF1;
+  var suspendFPromise1 = new Promise(function (resolve) { releaseF1 = resolve; });
+
+  var releaseBody;
+  var suspendBodyPromise = new Promise(function (resolve) { releaseBody = resolve; });
+
+  var releaseF2;
+  var suspendFPromise2 = new Promise(function (resolve) { releaseF2 = resolve; });
+
+  async function f() {
+      await using _ = resource;
+      await suspendFPromise1;
+      releaseBody();
+      await suspendFPromise2;
+  }
+
+  var resultPromise = f();
+
+  var wasDisposedWhileSuspended1 = resource.disposed;
+
+  releaseF1();
+  await suspendBodyPromise;
+
+  var wasDisposedWhileSuspended2 = resource.disposed;
+
+  releaseF2();
+  await resultPromise;
+
+  var isDisposedAfterCompleted = resource.disposed;
+
+  assert.sameValue(wasDisposedWhileSuspended1, false, 'Expected resource to not have been disposed while async function is suspended during await');
+  assert.sameValue(wasDisposedWhileSuspended2, false, 'Expected resource to not have been disposed while async function is suspended during await');
+  assert.sameValue(isDisposedAfterCompleted, true, 'Expected resource to have been disposed after async function completed');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-at-end-of-asyncgeneratorbody.js b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-at-end-of-asyncgeneratorbody.js
new file mode 100644
index 0000000000000..617b355675bf7
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-at-end-of-asyncgeneratorbody.js
@@ -0,0 +1,108 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-asyncgeneratorstart
+description: Initialized value is disposed at end of AsyncGeneratorBody
+info: |
+  AsyncGeneratorStart ( generator, generatorBody )
+
+  1. Assert: generator.[[AsyncGeneratorState]] is undefined.
+  2. Let genContext be the running execution context.
+  3. Set the Generator component of genContext to generator.
+  4. Let closure be a new Abstract Closure with no parameters that captures generatorBody and performs the following steps when called:
+    a. Let acGenContext be the running execution context.
+    b. Let acGenerator be the Generator component of acGenContext.
+    c. If generatorBody is a Parse Node, then
+      i. Let result be Completion(Evaluation of generatorBody).
+    d. Else,
+      i. Assert: generatorBody is an Abstract Closure with no parameters.
+      ii. Let result be Completion(generatorBody()).
+    e. Assert: If we return here, the async generator either threw an exception or performed either an implicit or explicit return.
+    f. Remove acGenContext from the execution context stack and restore the execution context that is at the top of the execution context stack as the running execution context.
+    g. Set acGenerator.[[AsyncGeneratorState]] to completed.
+    h. Let env be genContext's LexicalEnvironment.
+    i. If env is not undefined, then
+      i. Assert: env is a Declarative Environment Record
+      ii. Set result to DisposeResources(env.[[DisposeCapability]], result).
+    h. If result.[[Type]] is normal, set result to NormalCompletion(undefined).
+    i. If result.[[Type]] is return, set result to NormalCompletion(result.[[Value]]).
+    j. Perform AsyncGeneratorCompleteStep(acGenerator, result, true).
+    k. Perform AsyncGeneratorDrainQueue(acGenerator).
+    l. Return undefined.
+  5. Set the code evaluation state of genContext such that when evaluation is resumed for that execution context, closure will be called with no arguments.
+  6. Set generator.[[AsyncGeneratorContext]] to genContext.
+  7. Set generator.[[AsyncGeneratorState]] to suspendedStart.
+  8. Set generator.[[AsyncGeneratorQueue]] to a new empty List.
+  9. Return unused.
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+
+  var resource = {
+      disposed: false,
+      async [Symbol.asyncDispose]() {
+          this.disposed = true;
+      }
+  };
+
+  var releaseF;
+  var suspendFPromise = new Promise(function (resolve) { releaseF = resolve; });
+
+  async function * f() {
+      await using _ = resource;
+      yield;
+      await suspendFPromise;
+  }
+
+  var g = f();
+
+  var wasDisposedBeforeAsyncGeneratorStarted = resource.disposed;
+
+  await g.next();
+
+  var wasDisposedWhileSuspendedForYield = resource.disposed;
+
+  var nextPromise = g.next();
+
+  var wasDisposedWhileSuspendedForAwait = resource.disposed;
+
+  releaseF();
+  await nextPromise;
+
+  var isDisposedAfterCompleted = resource.disposed;
+
+  assert.sameValue(wasDisposedBeforeAsyncGeneratorStarted, false, 'Expected resource to not have been disposed prior to async generator start');
+  assert.sameValue(wasDisposedWhileSuspendedForYield, false, 'Expected resource to not have been disposed while async generator function is suspended for yield');
+  assert.sameValue(wasDisposedWhileSuspendedForAwait, false, 'Expected resource to not have been disposed while async generator function is suspended during await');
+  assert.sameValue(isDisposedAfterCompleted, true, 'Expected resource to have been disposed after async generator function completed');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-at-end-of-block.js b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-at-end-of-block.js
new file mode 100644
index 0000000000000..bc4c9ae3dadc1
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-at-end-of-block.js
@@ -0,0 +1,59 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-block-runtime-semantics-evaluation
+description: Initialized value is disposed at end of Block
+info: |
+  RS: Evaluation
+    Block : { StatementList }
+
+    ...
+    5. Let blockValue be the result of evaluating StatementList.
+    6. Set blockValue to DisposeResources(blockEnv.[[DisposeCapability]], blockValue).
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var resource = {
+      disposed: false,
+      async [Symbol.asyncDispose]() {
+          this.disposed = true;
+      }
+  };
+
+  {
+    await using _ = resource;
+  }
+
+  assert.sameValue(resource.disposed, true, 'Expected resource to have been disposed');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-at-end-of-each-iteration-of-forofstatement.js b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-at-end-of-each-iteration-of-forofstatement.js
new file mode 100644
index 0000000000000..5a09b4684f16e
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-at-end-of-each-iteration-of-forofstatement.js
@@ -0,0 +1,85 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-runtime-semantics-forin-div-ofbodyevaluation-lhs-stmt-iterator-lhskind-labelset
+description: Initialized value is disposed at end of each iteration of ForOfStatement
+info: |
+  ForIn/OfBodyEvaluation ( lhs, stmt, iteratorRecord, iterationKind, lhsKind, labelSet [ , iteratorKind ] )
+
+  1. If iteratorKind is not present, set iteratorKind to sync.
+  2. Let oldEnv be the running execution context's LexicalEnvironment.
+  3. Let V be undefined.
+  4. If IsAwaitUsingDeclaration of lhs is true, then
+    a. Let hint be async-dispose.
+  5. Else, if IsUsingDeclaration of lhs is true, then
+    a. Let hint be sync-dispose.
+  6. Else,
+    a. Let hint be normal.
+  7. Let destructuring be IsDestructuring of lhs.
+  8. If destructuring is true and if lhsKind is assignment, then
+    a. Assert: lhs is a LeftHandSideExpression.
+    b. Let assignmentPattern be the AssignmentPattern that is covered by lhs.
+  9. Repeat,
+    ...
+    j. Let result be Completion(Evaluation of stmt).
+    k. If iterationEnv is not undefined, then
+      i. Set result to Completion(DisposeResources(iterationEnv.[[DisposeCapability]], result)).
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var resource = {
+      disposed: false,
+      async [Symbol.asyncDispose]() {
+          this.disposed = true;
+      }
+  };
+
+  var wasDisposedBeforeBody = false;
+  var wasDisposedBeforeIteration = false;
+  var wasDisposedAfterIteration = false;
+
+  function * g() {
+    wasDisposedBeforeIteration = resource.disposed;
+    yield resource;
+    wasDisposedAfterIteration = resource.disposed;
+  }
+
+  for (await using _ of g()) {
+    wasDisposedBeforeBody = resource.disposed;
+  }
+
+  assert.sameValue(wasDisposedBeforeIteration, false, 'Expected resource to not been disposed before the for-of loop has received a value');
+  assert.sameValue(wasDisposedBeforeBody, false, 'Expected resource to not been disposed while for-of loop is still iterating');
+  assert.sameValue(wasDisposedAfterIteration, true, 'Expected resource to have been disposed after the for-of loop advanced to the next value');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-at-end-of-forstatement.js b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-at-end-of-forstatement.js
new file mode 100644
index 0000000000000..c165c4cd6bda2
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-at-end-of-forstatement.js
@@ -0,0 +1,63 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-runtime-semantics-forloopevaluation
+description: Initialized value is disposed at end of ForStatement
+info: |
+  RS: ForLoopEvaluation
+    ForStatement : for ( LexicalDeclaration Expressionopt ; Expressionopt ) Statement
+
+    ...
+    12. Let bodyResult be Completion(ForBodyEvaluation(test, increment, Statement, perIterationLets, labelSet)).
+    13. Set bodyResult to Completion(DisposeResources(loopEnv.[[DisposeCapability]], bodyResult)).
+    14. Assert: If bodyResult.[[Type]] is normal, then bodyResult.[[Value]] is not empty.
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var resource = {
+      disposed: false,
+      async [Symbol.asyncDispose]() {
+          this.disposed = true;
+      }
+  };
+
+  var i = 0;
+  var wasDisposedInForStatement;
+  for (await using _ = resource; i < 1; i++) {
+    wasDisposedInForStatement = resource.disposed;
+  }
+
+  assert.sameValue(wasDisposedInForStatement, false, 'Expected resource to not been disposed while for loop is still iterating');
+  assert.sameValue(resource.disposed, true, 'Expected resource to have been disposed');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-if-subsequent-initializer-throws-in-forstatement-head.js b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-if-subsequent-initializer-throws-in-forstatement-head.js
new file mode 100644
index 0000000000000..7e13240414bfc
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-if-subsequent-initializer-throws-in-forstatement-head.js
@@ -0,0 +1,69 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-runtime-semantics-forloopevaluation
+description: Initialized value is disposed at end of FunctionBody
+info: |
+  RS: ForLoopEvaluation
+    ForStatement : for ( LexicalDeclaration Expressionopt ; Expressionopt ) Statement
+
+    ...
+    7. Let forDcl be Completion(Evaluation of LexicalDeclaration).
+    8. If forDcl is an abrupt completion, then
+      a. Set forDcl to Completion(DisposeResources(loopEnv.[[DisposeCapability]], forDcl)).
+      b. Assert: forDcl is an abrupt completion.
+      c. Set the running execution context's LexicalEnvironment to oldEnv.
+      d. Return ? forDcl.
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var resource = {
+      disposed: false,
+      async [Symbol.asyncDispose]() {
+          this.disposed = true;
+      }
+  };
+
+  function getResource() {
+    throw new Error();
+  }
+
+  await assert.throwsAsync(Error, async function () {
+    var i = 0;
+    for (await using _1 = resource, _2 = getResource(); i < 1; i++) {
+    }
+  }, 'for');
+
+  assert.sameValue(resource.disposed, true, 'Expected resource to have been disposed');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-if-subsequent-initializer-throws.js b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-if-subsequent-initializer-throws.js
new file mode 100644
index 0000000000000..14e233ab46fb8
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.asyncDispose-called-if-subsequent-initializer-throws.js
@@ -0,0 +1,63 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-block-runtime-semantics-evaluation
+description: Initialized value is disposed even if subsequent initializer throws
+info: |
+  RS: Evaluation
+    Block : { StatementList }
+
+    ...
+    5. Let blockValue be the result of evaluating StatementList.
+    6. Set blockValue to DisposeResources(blockEnv.[[DisposeCapability]], blockValue).
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var resource = {
+    disposed: false,
+    async [Symbol.asyncDispose]() {
+        this.disposed = true;
+    }
+  };
+
+  function getResource() {
+    throw new Error();
+  }
+
+  await assert.throwsAsync(Error, async function () {
+    await using _1 = resource, _2 = getResource();
+  });
+
+  assert.sameValue(resource.disposed, true, 'Expected resource to have been disposed');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-at-end-of-asyncfunctionbody.js b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-at-end-of-asyncfunctionbody.js
new file mode 100644
index 0000000000000..5f1a25ce4f6a2
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-at-end-of-asyncfunctionbody.js
@@ -0,0 +1,106 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-asyncblockstart
+description: Initialized value is disposed at end of AsyncFunctionBody
+info: |
+  AsyncBlockStart ( promiseCapability, asyncBody, asyncContext )
+
+  1. Assert: promiseCapability is a PromiseCapability Record.
+  2. Let runningContext be the running execution context.
+  3. Let closure be a new Abstract Closure with no parameters that captures promiseCapability and asyncBody and performs the following steps when called:
+    a. Let acAsyncContext be the running execution context.
+    b. Let result be Completion(Evaluation of asyncBody).
+    c. Assert: If we return here, the async function either threw an exception or performed an implicit or explicit return; all awaiting is done.
+    d. Remove acAsyncContext from the execution context stack and restore the execution context that is at the top of the execution context stack as the running execution context.
+    e. Let env be acAsyncContext's LexicalEnvironment.
+    f. Set result to DisposeResources(env.[[DisposeCapability]], result).
+    g. If result.[[Type]] is normal, then
+      i. Perform ! Call(promiseCapability.[[Resolve]], undefined, « undefined »).
+    h. Else if result.[[Type]] is return, then
+      i. Perform ! Call(promiseCapability.[[Resolve]], undefined, « result.[[Value]] »).
+    i. Else,
+      i. Assert: result.[[Type]] is throw.
+      ii. Perform ! Call(promiseCapability.[[Reject]], undefined, « result.[[Value]] »).
+    j. Return unused.
+  4. Set the code evaluation state of asyncContext such that when evaluation is resumed for that execution context, closure will be called with no arguments.
+  5. Push asyncContext onto the execution context stack; asyncContext is now the running execution context.
+  6. Resume the suspended evaluation of asyncContext. Let result be the value returned by the resumed computation.
+  7. Assert: When we return here, asyncContext has already been removed from the execution context stack and runningContext is the currently running execution context.
+  8. Assert: result is a normal completion with a value of unused. The possible sources of this value are Await or, if the async function doesn't await anything, step 3.h above.
+  9. Return unused.
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+
+  var resource = {
+      disposed: false,
+      [Symbol.dispose]() {
+          this.disposed = true;
+      }
+  };
+
+  var releaseF1;
+  var suspendFPromise1 = new Promise(function (resolve) { releaseF1 = resolve; });
+
+  var releaseBody;
+  var suspendBodyPromise = new Promise(function (resolve) { releaseBody = resolve; });
+
+  var releaseF2;
+  var suspendFPromise2 = new Promise(function (resolve) { releaseF2 = resolve; });
+
+  async function f() {
+      await using _ = resource;
+      await suspendFPromise1;
+      releaseBody();
+      await suspendFPromise2;
+  }
+
+  var resultPromise = f();
+
+  var wasDisposedWhileSuspended1 = resource.disposed;
+
+  releaseF1();
+  await suspendBodyPromise;
+
+  var wasDisposedWhileSuspended2 = resource.disposed;
+
+  releaseF2();
+  await resultPromise;
+
+  var isDisposedAfterCompleted = resource.disposed;
+
+  assert.sameValue(wasDisposedWhileSuspended1, false, 'Expected resource to not have been disposed while async function is suspended during await');
+  assert.sameValue(wasDisposedWhileSuspended2, false, 'Expected resource to not have been disposed while async function is suspended during await');
+  assert.sameValue(isDisposedAfterCompleted, true, 'Expected resource to have been disposed after async function completed');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-at-end-of-asyncgeneratorbody.js b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-at-end-of-asyncgeneratorbody.js
new file mode 100644
index 0000000000000..e6bcd1f1e4b8a
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-at-end-of-asyncgeneratorbody.js
@@ -0,0 +1,108 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-asyncgeneratorstart
+description: Initialized value is disposed at end of AsyncGeneratorBody
+info: |
+  AsyncGeneratorStart ( generator, generatorBody )
+
+  1. Assert: generator.[[AsyncGeneratorState]] is undefined.
+  2. Let genContext be the running execution context.
+  3. Set the Generator component of genContext to generator.
+  4. Let closure be a new Abstract Closure with no parameters that captures generatorBody and performs the following steps when called:
+    a. Let acGenContext be the running execution context.
+    b. Let acGenerator be the Generator component of acGenContext.
+    c. If generatorBody is a Parse Node, then
+      i. Let result be Completion(Evaluation of generatorBody).
+    d. Else,
+      i. Assert: generatorBody is an Abstract Closure with no parameters.
+      ii. Let result be Completion(generatorBody()).
+    e. Assert: If we return here, the async generator either threw an exception or performed either an implicit or explicit return.
+    f. Remove acGenContext from the execution context stack and restore the execution context that is at the top of the execution context stack as the running execution context.
+    g. Set acGenerator.[[AsyncGeneratorState]] to completed.
+    h. Let env be genContext's LexicalEnvironment.
+    i. If env is not undefined, then
+      i. Assert: env is a Declarative Environment Record
+      ii. Set result to DisposeResources(env.[[DisposeCapability]], result).
+    h. If result.[[Type]] is normal, set result to NormalCompletion(undefined).
+    i. If result.[[Type]] is return, set result to NormalCompletion(result.[[Value]]).
+    j. Perform AsyncGeneratorCompleteStep(acGenerator, result, true).
+    k. Perform AsyncGeneratorDrainQueue(acGenerator).
+    l. Return undefined.
+  5. Set the code evaluation state of genContext such that when evaluation is resumed for that execution context, closure will be called with no arguments.
+  6. Set generator.[[AsyncGeneratorContext]] to genContext.
+  7. Set generator.[[AsyncGeneratorState]] to suspendedStart.
+  8. Set generator.[[AsyncGeneratorQueue]] to a new empty List.
+  9. Return unused.
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+
+  var resource = {
+      disposed: false,
+      [Symbol.dispose]() {
+          this.disposed = true;
+      }
+  };
+
+  var releaseF;
+  var suspendFPromise = new Promise(function (resolve) { releaseF = resolve; });
+
+  async function * f() {
+      await using _ = resource;
+      yield;
+      await suspendFPromise;
+  }
+
+  var g = f();
+
+  var wasDisposedBeforeAsyncGeneratorStarted = resource.disposed;
+
+  await g.next();
+
+  var wasDisposedWhileSuspendedForYield = resource.disposed;
+
+  var nextPromise = g.next();
+
+  var wasDisposedWhileSuspendedForAwait = resource.disposed;
+
+  releaseF();
+  await nextPromise;
+
+  var isDisposedAfterCompleted = resource.disposed;
+
+  assert.sameValue(wasDisposedBeforeAsyncGeneratorStarted, false, 'Expected resource to not have been disposed prior to async generator start');
+  assert.sameValue(wasDisposedWhileSuspendedForYield, false, 'Expected resource to not have been disposed while async generator function is suspended for yield');
+  assert.sameValue(wasDisposedWhileSuspendedForAwait, false, 'Expected resource to not have been disposed while async generator function is suspended during await');
+  assert.sameValue(isDisposedAfterCompleted, true, 'Expected resource to have been disposed after async generator function completed');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-at-end-of-block.js b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-at-end-of-block.js
new file mode 100644
index 0000000000000..40092eb4304be
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-at-end-of-block.js
@@ -0,0 +1,59 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-block-runtime-semantics-evaluation
+description: Initialized value is disposed at end of Block
+info: |
+  RS: Evaluation
+    Block : { StatementList }
+
+    ...
+    5. Let blockValue be the result of evaluating StatementList.
+    6. Set blockValue to DisposeResources(blockEnv.[[DisposeCapability]], blockValue).
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var resource = {
+      disposed: false,
+      [Symbol.dispose]() {
+          this.disposed = true;
+      }
+  };
+
+  {
+    await using _ = resource;
+  }
+
+  assert.sameValue(resource.disposed, true, 'Expected resource to have been disposed');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-at-end-of-each-iteration-of-forofstatement.js b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-at-end-of-each-iteration-of-forofstatement.js
new file mode 100644
index 0000000000000..18e970e3b4fa7
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-at-end-of-each-iteration-of-forofstatement.js
@@ -0,0 +1,85 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-runtime-semantics-forin-div-ofbodyevaluation-lhs-stmt-iterator-lhskind-labelset
+description: Initialized value is disposed at end of each iteration of ForOfStatement
+info: |
+  ForIn/OfBodyEvaluation ( lhs, stmt, iteratorRecord, iterationKind, lhsKind, labelSet [ , iteratorKind ] )
+
+  1. If iteratorKind is not present, set iteratorKind to sync.
+  2. Let oldEnv be the running execution context's LexicalEnvironment.
+  3. Let V be undefined.
+  4. If IsAwaitUsingDeclaration of lhs is true, then
+    a. Let hint be async-dispose.
+  5. Else, if IsUsingDeclaration of lhs is true, then
+    a. Let hint be sync-dispose.
+  6. Else,
+    a. Let hint be normal.
+  7. Let destructuring be IsDestructuring of lhs.
+  8. If destructuring is true and if lhsKind is assignment, then
+    a. Assert: lhs is a LeftHandSideExpression.
+    b. Let assignmentPattern be the AssignmentPattern that is covered by lhs.
+  9. Repeat,
+    ...
+    j. Let result be Completion(Evaluation of stmt).
+    k. If iterationEnv is not undefined, then
+      i. Set result to Completion(DisposeResources(iterationEnv.[[DisposeCapability]], result)).
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var resource = {
+      disposed: false,
+      [Symbol.dispose]() {
+          this.disposed = true;
+      }
+  };
+
+  var wasDisposedBeforeBody = false;
+  var wasDisposedBeforeIteration = false;
+  var wasDisposedAfterIteration = false;
+
+  function * g() {
+    wasDisposedBeforeIteration = resource.disposed;
+    yield resource;
+    wasDisposedAfterIteration = resource.disposed;
+  }
+
+  for (await using _ of g()) {
+    wasDisposedBeforeBody = resource.disposed;
+  }
+
+  assert.sameValue(wasDisposedBeforeIteration, false, 'Expected resource to not been disposed before the for-of loop has received a value');
+  assert.sameValue(wasDisposedBeforeBody, false, 'Expected resource to not been disposed while for-of loop is still iterating');
+  assert.sameValue(wasDisposedAfterIteration, true, 'Expected resource to have been disposed after the for-of loop advanced to the next value');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-at-end-of-forstatement.js b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-at-end-of-forstatement.js
new file mode 100644
index 0000000000000..c165c4cd6bda2
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-at-end-of-forstatement.js
@@ -0,0 +1,63 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-runtime-semantics-forloopevaluation
+description: Initialized value is disposed at end of ForStatement
+info: |
+  RS: ForLoopEvaluation
+    ForStatement : for ( LexicalDeclaration Expressionopt ; Expressionopt ) Statement
+
+    ...
+    12. Let bodyResult be Completion(ForBodyEvaluation(test, increment, Statement, perIterationLets, labelSet)).
+    13. Set bodyResult to Completion(DisposeResources(loopEnv.[[DisposeCapability]], bodyResult)).
+    14. Assert: If bodyResult.[[Type]] is normal, then bodyResult.[[Value]] is not empty.
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var resource = {
+      disposed: false,
+      async [Symbol.asyncDispose]() {
+          this.disposed = true;
+      }
+  };
+
+  var i = 0;
+  var wasDisposedInForStatement;
+  for (await using _ = resource; i < 1; i++) {
+    wasDisposedInForStatement = resource.disposed;
+  }
+
+  assert.sameValue(wasDisposedInForStatement, false, 'Expected resource to not been disposed while for loop is still iterating');
+  assert.sameValue(resource.disposed, true, 'Expected resource to have been disposed');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-if-subsequent-initializer-throws-in-forstatement-head.js b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-if-subsequent-initializer-throws-in-forstatement-head.js
new file mode 100644
index 0000000000000..912c710adc571
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-if-subsequent-initializer-throws-in-forstatement-head.js
@@ -0,0 +1,69 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-runtime-semantics-forloopevaluation
+description: Initialized value is disposed at end of FunctionBody
+info: |
+  RS: ForLoopEvaluation
+    ForStatement : for ( LexicalDeclaration Expressionopt ; Expressionopt ) Statement
+
+    ...
+    7. Let forDcl be Completion(Evaluation of LexicalDeclaration).
+    8. If forDcl is an abrupt completion, then
+      a. Set forDcl to Completion(DisposeResources(loopEnv.[[DisposeCapability]], forDcl)).
+      b. Assert: forDcl is an abrupt completion.
+      c. Set the running execution context's LexicalEnvironment to oldEnv.
+      d. Return ? forDcl.
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var resource = {
+      disposed: false,
+      [Symbol.dispose]() {
+          this.disposed = true;
+      }
+  };
+
+  function getResource() {
+    throw new Error();
+  }
+
+  await assert.throwsAsync(Error, async function () {
+    var i = 0;
+    for (await using _1 = resource, _2 = getResource(); i < 1; i++) {
+    }
+  }, 'for');
+
+  assert.sameValue(resource.disposed, true, 'Expected resource to have been disposed');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-if-subsequent-initializer-throws.js b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-if-subsequent-initializer-throws.js
new file mode 100644
index 0000000000000..e8bcc3c62cb28
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/initializer-Symbol.dispose-called-if-subsequent-initializer-throws.js
@@ -0,0 +1,63 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-block-runtime-semantics-evaluation
+description: Initialized value is disposed even if subsequent initializer throws
+info: |
+  RS: Evaluation
+    Block : { StatementList }
+
+    ...
+    5. Let blockValue be the result of evaluating StatementList.
+    6. Set blockValue to DisposeResources(blockEnv.[[DisposeCapability]], blockValue).
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  var resource = {
+    disposed: false,
+    [Symbol.dispose]() {
+        this.disposed = true;
+    }
+  };
+
+  function getResource() {
+    throw new Error();
+  }
+
+  await assert.throwsAsync(Error, async function () {
+    await using _1 = resource, _2 = getResource();
+  });
+
+  assert.sameValue(resource.disposed, true, 'Expected resource to have been disposed');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/multiple-resources-disposed-in-reverse-order.js b/js/src/tests/test262/language/statements/await-using/multiple-resources-disposed-in-reverse-order.js
new file mode 100644
index 0000000000000..d5d040f1056ac
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/multiple-resources-disposed-in-reverse-order.js
@@ -0,0 +1,60 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-disposeresources
+description: Multiple resources are disposed in the reverse of the order in which they were added
+info: |
+  RS: Evaluation
+    Block : { StatementList }
+
+    ...
+    5. Let blockValue be the result of evaluating StatementList.
+    6. Set blockValue to DisposeResources(blockEnv.[[DisposeCapability]], blockValue).
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function() {
+  var disposed = [];
+  var resource1 = { async [Symbol.asyncDispose]() { disposed.push(this); } };
+  var resource2 = { [Symbol.dispose]() { disposed.push(this); } };
+  var resource3 = { async [Symbol.asyncDispose]() { disposed.push(this); } };
+
+  {
+    await using _1 = resource1, _2 = resource2;
+    await using _3 = resource3;
+  }
+
+  assert.sameValue(disposed[0], resource3);
+  assert.sameValue(disposed[1], resource2);
+  assert.sameValue(disposed[2], resource1);
+});
diff --git a/js/src/tests/test262/language/statements/await-using/puts-initializer-on-top-of-disposableresourcestack-multiple-bindings.js b/js/src/tests/test262/language/statements/await-using/puts-initializer-on-top-of-disposableresourcestack-multiple-bindings.js
new file mode 100644
index 0000000000000..ac78446f7f576
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/puts-initializer-on-top-of-disposableresourcestack-multiple-bindings.js
@@ -0,0 +1,74 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: >
+  Puts initialized value on the top of the environment's [[DisposableResourceStack]] with multiple lexical bindings
+  in a single 'await using' declaration
+info: |
+  RS: Evaluation
+    AwaitUsingDeclaration : CoverAwaitExpressionAndAwaitUsingDeclarationHead BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument async-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    BindingList : BindingList , LexicalBinding
+
+    1. Perform ? BindingEvaluation of BindingList with argument hint.
+    2. Perform ? BindingEvaluation of LexicalBinding with argument hint.
+    3. Return unused.
+
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  3. Else,
+    ...
+  3. Append resource to disposeCapability.[[DisposableResourceStack]].
+  4. Return unused.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function() {
+  var disposed = [];
+  var resource1 = {
+      async [Symbol.asyncDispose]() {
+          disposed.push(this);
+      }
+  };
+  var resource2 = {
+      [Symbol.dispose]() {
+          disposed.push(this);
+      }
+  };
+  {
+    await using r1 = resource1, r2 = resource2;
+  }
+  assert.sameValue(2, disposed.length);
+  assert.sameValue(disposed[0], resource2, 'Expected resource2 to be the first disposed resource');
+  assert.sameValue(disposed[1], resource1, 'Expected resource1 to be the second disposed resource');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/puts-initializer-on-top-of-disposableresourcestack-subsequent-usings.js b/js/src/tests/test262/language/statements/await-using/puts-initializer-on-top-of-disposableresourcestack-subsequent-usings.js
new file mode 100644
index 0000000000000..d2f319e3a9170
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/puts-initializer-on-top-of-disposableresourcestack-subsequent-usings.js
@@ -0,0 +1,69 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: >
+  Puts initialized value on the top of the environment's [[DisposableResourceStack]] with multiple subsequent 'await using'
+  declarations in the same block scope
+info: |
+  RS: Evaluation
+    AwaitUsingDeclaration : CoverAwaitExpressionAndAwaitUsingDeclarationHead BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument async-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  3. Else,
+    ...
+  3. Append resource to disposeCapability.[[DisposableResourceStack]].
+  4. Return unused.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function() {
+  var disposed = [];
+  var resource1 = {
+      async [Symbol.asyncDispose]() {
+          disposed.push(this);
+      }
+  };
+  var resource2 = {
+      [Symbol.dispose]() {
+          disposed.push(this);
+      }
+  };
+  {
+    await using r1 = resource1;
+    await using r2 = resource2;
+  }
+  assert.sameValue(2, disposed.length);
+  assert.sameValue(disposed[0], resource2, 'Expected resource2 to be the first disposed resource');
+  assert.sameValue(disposed[1], resource1, 'Expected resource1 to be the second disposed resource');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/redeclaration-error-from-within-strict-mode-function-await-using.js b/js/src/tests/test262/language/statements/await-using/redeclaration-error-from-within-strict-mode-function-await-using.js
new file mode 100644
index 0000000000000..a5205a65ba5d6
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/redeclaration-error-from-within-strict-mode-function-await-using.js
@@ -0,0 +1,17 @@
+// |reftest| error:SyntaxError
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-declarative-environment-records-initializebinding-n-v
+description: >
+    Redeclaration error within strict mode function inside non-strict code.
+negative:
+  phase: parse
+  type: SyntaxError
+flags: [noStrict, explicit-resource-management]
+---*/
+
+$DONOTEVALUATE();
+(async function() { 'use strict'; { await using f = null; var f; } })
+
diff --git a/js/src/tests/test262/language/statements/await-using/shell.js b/js/src/tests/test262/language/statements/await-using/shell.js
index 0222d37d0d23d..953d0a2cea3c5 100644
--- a/js/src/tests/test262/language/statements/await-using/shell.js
+++ b/js/src/tests/test262/language/statements/await-using/shell.js
@@ -105,3 +105,405 @@ assert.throwsAsync = function (expectedErrorConstructor, func, message) {
     ));
   });
 };
+
+// file: deepEqual.js
+// Copyright 2019 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+description: >
+  Compare two values structurally
+defines: [assert.deepEqual]
+---*/
+
+assert.deepEqual = function(actual, expected, message) {
+  var format = assert.deepEqual.format;
+  var mustBeTrue = assert.deepEqual._compare(actual, expected);
+
+  // format can be slow when `actual` or `expected` are large objects, like for
+  // example the global object, so only call it when the assertion will fail.
+  if (mustBeTrue !== true) {
+    message = `Expected ${format(actual)} to be structurally equal to ${format(expected)}. ${(message || '')}`;
+  }
+
+  assert(mustBeTrue, message);
+};
+
+(function() {
+let getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+let join = arr => arr.join(', ');
+function stringFromTemplate(strings, subs) {
+  let parts = strings.map((str, i) => `${i === 0 ? '' : subs[i - 1]}${str}`);
+  return parts.join('');
+}
+function escapeKey(key) {
+  if (typeof key === 'symbol') return `[${String(key)}]`;
+  if (/^[a-zA-Z0-9_$]+$/.test(key)) return key;
+  return assert._formatIdentityFreeValue(key);
+}
+
+assert.deepEqual.format = function(value, seen) {
+  let basic = assert._formatIdentityFreeValue(value);
+  if (basic) return basic;
+  switch (value === null ? 'null' : typeof value) {
+    case 'string':
+    case 'bigint':
+    case 'number':
+    case 'boolean':
+    case 'undefined':
+    case 'null':
+      assert(false, 'values without identity should use basic formatting');
+      break;
+    case 'symbol':
+    case 'function':
+    case 'object':
+      break;
+    default:
+      return typeof value;
+  }
+
+  if (!seen) {
+    seen = {
+      counter: 0,
+      map: new Map()
+    };
+  }
+  let usage = seen.map.get(value);
+  if (usage) {
+    usage.used = true;
+    return `ref #${usage.id}`;
+  }
+  usage = { id: ++seen.counter, used: false };
+  seen.map.set(value, usage);
+
+  // Properly communicating multiple references requires deferred rendering of
+  // all identity-bearing values until the outermost format call finishes,
+  // because the current value can also in appear in a not-yet-visited part of
+  // the object graph (which, when visited, will update the usage object).
+  //
+  // To preserve readability of the desired output formatting, we accomplish
+  // this deferral using tagged template literals.
+  // Evaluation closes over the usage object and returns a function that accepts
+  // "mapper" arguments for rendering the corresponding substitution values and
+  // returns an object with only a toString method which will itself be invoked
+  // when trying to use the result as a string in assert.deepEqual.
+  //
+  // For convenience, any absent mapper is presumed to be `String`, and the
+  // function itself has a toString method that self-invokes with no mappers
+  // (allowing returning the function directly when every mapper is `String`).
+  function lazyResult(strings, ...subs) {
+    function acceptMappers(...mappers) {
+      function toString() {
+        let renderings = subs.map((sub, i) => (mappers[i] || String)(sub));
+        let rendered = stringFromTemplate(strings, renderings);
+        if (usage.used) rendered += ` as #${usage.id}`;
+        return rendered;
+      }
+
+      return { toString };
+    }
+
+    acceptMappers.toString = () => String(acceptMappers());
+    return acceptMappers;
+  }
+
+  let format = assert.deepEqual.format;
+  function lazyString(strings, ...subs) {
+    return { toString: () => stringFromTemplate(strings, subs) };
+  }
+
+  if (typeof value === 'function') {
+    return lazyResult`function${value.name ? ` ${String(value.name)}` : ''}`;
+  }
+  if (typeof value !== 'object') {
+    // probably a symbol
+    return lazyResult`${value}`;
+  }
+  if (Array.isArray ? Array.isArray(value) : value instanceof Array) {
+    return lazyResult`[${value.map(value => format(value, seen))}]`(join);
+  }
+  if (value instanceof Date) {
+    return lazyResult`Date(${format(value.toISOString(), seen)})`;
+  }
+  if (value instanceof Error) {
+    return lazyResult`error ${value.name || 'Error'}(${format(value.message, seen)})`;
+  }
+  if (value instanceof RegExp) {
+    return lazyResult`${value}`;
+  }
+  if (typeof Map !== "undefined" && value instanceof Map) {
+    let contents = Array.from(value).map(pair => lazyString`${format(pair[0], seen)} => ${format(pair[1], seen)}`);
+    return lazyResult`Map {${contents}}`(join);
+  }
+  if (typeof Set !== "undefined" && value instanceof Set) {
+    let contents = Array.from(value).map(value => format(value, seen));
+    return lazyResult`Set {${contents}}`(join);
+  }
+
+  let tag = Symbol.toStringTag && Symbol.toStringTag in value
+    ? value[Symbol.toStringTag]
+    : Object.getPrototypeOf(value) === null ? '[Object: null prototype]' : 'Object';
+  let keys = Reflect.ownKeys(value).filter(key => getOwnPropertyDescriptor(value, key).enumerable);
+  let contents = keys.map(key => lazyString`${escapeKey(key)}: ${format(value[key], seen)}`);
+  return lazyResult`${tag ? `${tag} ` : ''}{${contents}}`(String, join);
+};
+})();
+
+assert.deepEqual._compare = (function () {
+  var EQUAL = 1;
+  var NOT_EQUAL = -1;
+  var UNKNOWN = 0;
+
+  function deepEqual(a, b) {
+    return compareEquality(a, b) === EQUAL;
+  }
+
+  function compareEquality(a, b, cache) {
+    return compareIf(a, b, isOptional, compareOptionality)
+      || compareIf(a, b, isPrimitiveEquatable, comparePrimitiveEquality)
+      || compareIf(a, b, isObjectEquatable, compareObjectEquality, cache)
+      || NOT_EQUAL;
+  }
+
+  function compareIf(a, b, test, compare, cache) {
+    return !test(a)
+      ? !test(b) ? UNKNOWN : NOT_EQUAL
+      : !test(b) ? NOT_EQUAL : cacheComparison(a, b, compare, cache);
+  }
+
+  function tryCompareStrictEquality(a, b) {
+    return a === b ? EQUAL : UNKNOWN;
+  }
+
+  function tryCompareTypeOfEquality(a, b) {
+    return typeof a !== typeof b ? NOT_EQUAL : UNKNOWN;
+  }
+
+  function tryCompareToStringTagEquality(a, b) {
+    var aTag = Symbol.toStringTag in a ? a[Symbol.toStringTag] : undefined;
+    var bTag = Symbol.toStringTag in b ? b[Symbol.toStringTag] : undefined;
+    return aTag !== bTag ? NOT_EQUAL : UNKNOWN;
+  }
+
+  function isOptional(value) {
+    return value === undefined
+      || value === null;
+  }
+
+  function compareOptionality(a, b) {
+    return tryCompareStrictEquality(a, b)
+      || NOT_EQUAL;
+  }
+
+  function isPrimitiveEquatable(value) {
+    switch (typeof value) {
+      case 'string':
+      case 'number':
+      case 'bigint':
+      case 'boolean':
+      case 'symbol':
+        return true;
+      default:
+        return isBoxed(value);
+    }
+  }
+
+  function comparePrimitiveEquality(a, b) {
+    if (isBoxed(a)) a = a.valueOf();
+    if (isBoxed(b)) b = b.valueOf();
+    return tryCompareStrictEquality(a, b)
+      || tryCompareTypeOfEquality(a, b)
+      || compareIf(a, b, isNaNEquatable, compareNaNEquality)
+      || NOT_EQUAL;
+  }
+
+  function isNaNEquatable(value) {
+    return typeof value === 'number';
+  }
+
+  function compareNaNEquality(a, b) {
+    return isNaN(a) && isNaN(b) ? EQUAL : NOT_EQUAL;
+  }
+
+  function isObjectEquatable(value) {
+    return typeof value === 'object' || typeof value === 'function';
+  }
+
+  function compareObjectEquality(a, b, cache) {
+    if (!cache) cache = new Map();
+    return getCache(cache, a, b)
+      || setCache(cache, a, b, EQUAL) // consider equal for now
+      || cacheComparison(a, b, tryCompareStrictEquality, cache)
+      || cacheComparison(a, b, tryCompareToStringTagEquality, cache)
+      || compareIf(a, b, isValueOfEquatable, compareValueOfEquality)
+      || compareIf(a, b, isToStringEquatable, compareToStringEquality)
+      || compareIf(a, b, isArrayLikeEquatable, compareArrayLikeEquality, cache)
+      || compareIf(a, b, isStructurallyEquatable, compareStructuralEquality, cache)
+      || compareIf(a, b, isIterableEquatable, compareIterableEquality, cache)
+      || cacheComparison(a, b, fail, cache);
+  }
+
+  function isBoxed(value) {
+    return value instanceof String
+      || value instanceof Number
+      || value instanceof Boolean
+      || typeof Symbol === 'function' && value instanceof Symbol
+      || typeof BigInt === 'function' && value instanceof BigInt;
+  }
+
+  function isValueOfEquatable(value) {
+    return value instanceof Date;
+  }
+
+  function compareValueOfEquality(a, b) {
+    return compareIf(a.valueOf(), b.valueOf(), isPrimitiveEquatable, comparePrimitiveEquality)
+      || NOT_EQUAL;
+  }
+
+  function isToStringEquatable(value) {
+    return value instanceof RegExp;
+  }
+
+  function compareToStringEquality(a, b) {
+    return compareIf(a.toString(), b.toString(), isPrimitiveEquatable, comparePrimitiveEquality)
+      || NOT_EQUAL;
+  }
+
+  function isArrayLikeEquatable(value) {
+    return (Array.isArray ? Array.isArray(value) : value instanceof Array)
+      || (typeof Uint8Array === 'function' && value instanceof Uint8Array)
+      || (typeof Uint8ClampedArray === 'function' && value instanceof Uint8ClampedArray)
+      || (typeof Uint16Array === 'function' && value instanceof Uint16Array)
+      || (typeof Uint32Array === 'function' && value instanceof Uint32Array)
+      || (typeof Int8Array === 'function' && value instanceof Int8Array)
+      || (typeof Int16Array === 'function' && value instanceof Int16Array)
+      || (typeof Int32Array === 'function' && value instanceof Int32Array)
+      || (typeof Float32Array === 'function' && value instanceof Float32Array)
+      || (typeof Float64Array === 'function' && value instanceof Float64Array)
+      || (typeof BigUint64Array === 'function' && value instanceof BigUint64Array)
+      || (typeof BigInt64Array === 'function' && value instanceof BigInt64Array);
+  }
+
+  function compareArrayLikeEquality(a, b, cache) {
+    if (a.length !== b.length) return NOT_EQUAL;
+    for (var i = 0; i < a.length; i++) {
+      if (compareEquality(a[i], b[i], cache) === NOT_EQUAL) {
+        return NOT_EQUAL;
+      }
+    }
+    return EQUAL;
+  }
+
+  function isStructurallyEquatable(value) {
+    return !(typeof Promise === 'function' && value instanceof Promise // only comparable by reference
+      || typeof WeakMap === 'function' && value instanceof WeakMap // only comparable by reference
+      || typeof WeakSet === 'function' && value instanceof WeakSet // only comparable by reference
+      || typeof Map === 'function' && value instanceof Map // comparable via @@iterator
+      || typeof Set === 'function' && value instanceof Set); // comparable via @@iterator
+  }
+
+  function compareStructuralEquality(a, b, cache) {
+    var aKeys = [];
+    for (var key in a) aKeys.push(key);
+
+    var bKeys = [];
+    for (var key in b) bKeys.push(key);
+
+    if (aKeys.length !== bKeys.length) {
+      return NOT_EQUAL;
+    }
+
+    aKeys.sort();
+    bKeys.sort();
+
+    for (var i = 0; i < aKeys.length; i++) {
+      var aKey = aKeys[i];
+      var bKey = bKeys[i];
+      if (compareEquality(aKey, bKey, cache) === NOT_EQUAL) {
+        return NOT_EQUAL;
+      }
+      if (compareEquality(a[aKey], b[bKey], cache) === NOT_EQUAL) {
+        return NOT_EQUAL;
+      }
+    }
+
+    return compareIf(a, b, isIterableEquatable, compareIterableEquality, cache)
+      || EQUAL;
+  }
+
+  function isIterableEquatable(value) {
+    return typeof Symbol === 'function'
+      && typeof value[Symbol.iterator] === 'function';
+  }
+
+  function compareIteratorEquality(a, b, cache) {
+    if (typeof Map === 'function' && a instanceof Map && b instanceof Map ||
+      typeof Set === 'function' && a instanceof Set && b instanceof Set) {
+      if (a.size !== b.size) return NOT_EQUAL; // exit early if we detect a difference in size
+    }
+
+    var ar, br;
+    while (true) {
+      ar = a.next();
+      br = b.next();
+      if (ar.done) {
+        if (br.done) return EQUAL;
+        if (b.return) b.return();
+        return NOT_EQUAL;
+      }
+      if (br.done) {
+        if (a.return) a.return();
+        return NOT_EQUAL;
+      }
+      if (compareEquality(ar.value, br.value, cache) === NOT_EQUAL) {
+        if (a.return) a.return();
+        if (b.return) b.return();
+        return NOT_EQUAL;
+      }
+    }
+  }
+
+  function compareIterableEquality(a, b, cache) {
+    return compareIteratorEquality(a[Symbol.iterator](), b[Symbol.iterator](), cache);
+  }
+
+  function cacheComparison(a, b, compare, cache) {
+    var result = compare(a, b, cache);
+    if (cache && (result === EQUAL || result === NOT_EQUAL)) {
+      setCache(cache, a, b, /** @type {EQUAL | NOT_EQUAL} */(result));
+    }
+    return result;
+  }
+
+  function fail() {
+    return NOT_EQUAL;
+  }
+
+  function setCache(cache, left, right, result) {
+    var otherCache;
+
+    otherCache = cache.get(left);
+    if (!otherCache) cache.set(left, otherCache = new Map());
+    otherCache.set(right, result);
+
+    otherCache = cache.get(right);
+    if (!otherCache) cache.set(right, otherCache = new Map());
+    otherCache.set(left, result);
+  }
+
+  function getCache(cache, left, right) {
+    var otherCache;
+    var result;
+
+    otherCache = cache.get(left);
+    result = otherCache && otherCache.get(right);
+    if (result) return result;
+
+    otherCache = cache.get(right);
+    result = otherCache && otherCache.get(left);
+    if (result) return result;
+
+    return UNKNOWN;
+  }
+
+  return deepEqual;
+})();
diff --git a/js/src/tests/test262/language/statements/await-using/syntax/await-using-invalid-switchstatement-caseclause.js b/js/src/tests/test262/language/statements/await-using/syntax/await-using-invalid-switchstatement-caseclause.js
new file mode 100644
index 0000000000000..10982b5bf84c1
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/syntax/await-using-invalid-switchstatement-caseclause.js
@@ -0,0 +1,27 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) error:SyntaxError -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2025 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-const-using-and-await-using-declarations-static-semantics-early-errors
+description: Disallowed in switch statement
+info: |
+  - It is a Syntax Error if the goal symbol is |Script| and |AwaitUsingDeclaration| is not contained, either directly or indirectly, within a |Block|, |ForStatement|, |ForInOfStatement|, |FunctionBody|, |GeneratorBody|, |AsyncGeneratorBody|, |AsyncFunctionBody|, or |ClassStaticBlockBody|.
+  - It is a Syntax Error if |AwaitUsingDeclaration| is contained directly within the |StatementList| of either a |CaseClause| or |DefaultClause|.
+
+negative:
+  phase: parse
+  type: SyntaxError
+
+features: [explicit-resource-management]
+---*/
+
+async function f() {
+  switch (0) {
+    case 0:
+      await using _ = null;
+      break;
+  }
+}
+
+$DONOTEVALUATE();
diff --git a/js/src/tests/test262/language/statements/await-using/syntax/await-using-invalid-switchstatement-defaultclause.js b/js/src/tests/test262/language/statements/await-using/syntax/await-using-invalid-switchstatement-defaultclause.js
new file mode 100644
index 0000000000000..38c70e8c6e3d5
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/syntax/await-using-invalid-switchstatement-defaultclause.js
@@ -0,0 +1,27 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) error:SyntaxError -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2025 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-const-using-and-await-using-declarations-static-semantics-early-errors
+description: Disallowed in switch statement
+info: |
+  - It is a Syntax Error if the goal symbol is |Script| and |AwaitUsingDeclaration| is not contained, either directly or indirectly, within a |Block|, |ForStatement|, |ForInOfStatement|, |FunctionBody|, |GeneratorBody|, |AsyncGeneratorBody|, |AsyncFunctionBody|, or |ClassStaticBlockBody|.
+  - It is a Syntax Error if |AwaitUsingDeclaration| is contained directly within the |StatementList| of either a |CaseClause| or |DefaultClause|.
+
+negative:
+  phase: parse
+  type: SyntaxError
+
+features: [explicit-resource-management]
+---*/
+
+async function f() {
+  switch (0) {
+    default:
+      await using _ = null;
+      break;
+  }
+}
+
+$DONOTEVALUATE();
diff --git a/js/src/tests/test262/language/statements/await-using/throws-error-as-is-if-only-one-error-during-disposal.js b/js/src/tests/test262/language/statements/await-using/throws-error-as-is-if-only-one-error-during-disposal.js
new file mode 100644
index 0000000000000..b70e11fd7cff0
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/throws-error-as-is-if-only-one-error-during-disposal.js
@@ -0,0 +1,57 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-disposeresources
+description: >
+  Rethrows an error as-is if it is the only error thrown during evaluation of subsequent statements following 'await using'
+  or from disposal.
+info: |
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function() {
+  class MyError extends Error {}
+  await assert.throwsAsync(MyError, async function () {
+    await using _1 = { async [Symbol.asyncDispose]() { throw new MyError(); } };
+    await using _2 = { [Symbol.dispose]() { } };
+  });
+
+  await assert.throwsAsync(MyError, async function () {
+    await using _1 = { async [Symbol.asyncDispose]() { } };
+    await using _2 = { [Symbol.dispose]() { throw new MyError(); } };
+  });
+
+  await assert.throwsAsync(MyError, async function () {
+    await using _1 = { async [Symbol.asyncDispose]() { } };
+    await using _2 = { [Symbol.dispose]() { } };
+    throw new MyError();
+  });
+});
diff --git a/js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.asyncDispose-property-is-null.js b/js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.asyncDispose-property-is-null.js
new file mode 100644
index 0000000000000..35ecdadbe259a
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.asyncDispose-property-is-null.js
@@ -0,0 +1,79 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Throws if initialized value's Symbol.asyncDispose property is null and Symbol.dispose is not present
+info: |
+  RS: Evaluation
+    AwaitUsingDeclaration : CoverAwaitExpressionAndAwaitUsingDeclarationHead BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument async-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  2. Else,
+    ...
+  3. Append resource to disposeCapability.[[DisposableResourceStack]].
+  4. Return unused.
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      ...
+    b. Else,
+      i. If V is not an Object, throw a TypeError exception.
+      ii. Set method to ? GetDisposeMethod(V, hint).
+      iii. If method is undefined, throw a TypeError exception.
+  ...
+
+  GetDisposeMethod ( V, hint )
+
+  1. If hint is async-dispose, then
+    a. Let method be ? GetMethod(V, @@asyncDispose).
+    b. If method is undefined, then
+      i. Set method to ? GetMethod(V, @@dispose).
+  2. Else,
+    a. Let method be ? GetMethod(V, @@dispose).
+  3. Return method.
+
+  GetMethod ( V, P )
+
+  1. Let func be ? GetV(V, P).
+  2. If func is either undefined or null, return undefined.
+  3. ...
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  await assert.throwsAsync(TypeError, async function () {
+      await using x = { [Symbol.asyncDispose]: null };
+  });
+});
diff --git a/js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.asyncDispose-property-is-undefined.js b/js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.asyncDispose-property-is-undefined.js
new file mode 100644
index 0000000000000..e7432ae4b3e7f
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.asyncDispose-property-is-undefined.js
@@ -0,0 +1,79 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Throws if initialized value's Symbol.asyncDispose property is undefined and Symbol.dispose is not present
+info: |
+  RS: Evaluation
+    AwaitUsingDeclaration : CoverAwaitExpressionAndAwaitUsingDeclarationHead BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument async-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  2. Else,
+    ...
+  3. Append resource to disposeCapability.[[DisposableResourceStack]].
+  4. Return unused.
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      ...
+    b. Else,
+      i. If V is not an Object, throw a TypeError exception.
+      ii. Set method to ? GetDisposeMethod(V, hint).
+      iii. If method is undefined, throw a TypeError exception.
+  ...
+
+  GetDisposeMethod ( V, hint )
+
+  1. If hint is async-dispose, then
+    a. Let method be ? GetMethod(V, @@asyncDispose).
+    b. If method is undefined, then
+      i. Set method to ? GetMethod(V, @@dispose).
+  2. Else,
+    a. Let method be ? GetMethod(V, @@dispose).
+  3. Return method.
+
+  GetMethod ( V, P )
+
+  1. Let func be ? GetV(V, P).
+  2. If func is either undefined or null, return undefined.
+  3. ...
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  await assert.throwsAsync(TypeError, async function () {
+      await using x = { [Symbol.asyncDispose]: undefined };
+  });
+});
diff --git a/js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.asyncDispose-property-not-callable.js b/js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.asyncDispose-property-not-callable.js
new file mode 100644
index 0000000000000..33de7669d52ae
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.asyncDispose-property-not-callable.js
@@ -0,0 +1,100 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Throws if initialized value's Symbol.asyncDispose property is not callable
+info: |
+  RS: Evaluation
+    AwaitUsingDeclaration : CoverAwaitExpressionAndAwaitUsingDeclarationHead BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument async-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  2. Else,
+    ...
+  3. Append resource to disposeCapability.[[DisposableResourceStack]].
+  4. Return unused.
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      i. Set V to undefined.
+      ii. Set method to undefined.
+    b. Else,
+      i. If V is not an Object, throw a TypeError exception.
+      ii. Set method to ? GetDisposeMethod(V, hint).
+      iii. If method is undefined, throw a TypeError exception.
+  2. Else,
+    ...
+  3. Return the DisposableResource Record { [[ResourceValue]]: V, [[Hint]]: hint, [[DisposeMethod]]: method }.
+
+  GetDisposeMethod ( V, hint )
+
+  1. If hint is async-dispose, then
+    a. Let method be ? GetMethod(V, @@asyncDispose).
+    b. If method is undefined, then
+      i. Set method to ? GetMethod(V, @@dispose).
+  2. Else,
+    a. Let method be ? GetMethod(V, @@dispose).
+  3. Return method.
+
+  GetMethod ( V, P )
+
+  1. Let func be ? GetV(V, P).
+  2. If func is either undefined or null, return undefined.
+  3. If IsCallable(func) is false, throw a TypeError exception.
+  4. Return func.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  await assert.throwsAsync(TypeError, async function() {
+    await using x = { [Symbol.asyncDispose]: true };
+  }, 'true');
+
+  await assert.throwsAsync(TypeError, async function() {
+    await using x = { [Symbol.asyncDispose]: false };
+  }, 'false');
+
+  await assert.throwsAsync(TypeError, async function() {
+    await using x = { [Symbol.asyncDispose]: 1 };
+  }, 'number');
+
+  await assert.throwsAsync(TypeError, async function() {
+    await using x = { [Symbol.asyncDispose]: 'object' };
+  }, 'string');
+
+  var s = Symbol();
+  await assert.throwsAsync(TypeError, async function() {
+    await using x = { [Symbol.asyncDispose]: s };
+  }, 'symbol');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.dispose-property-is-null.js b/js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.dispose-property-is-null.js
new file mode 100644
index 0000000000000..145db59e36050
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.dispose-property-is-null.js
@@ -0,0 +1,79 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Throws if initialized value's Symbol.dispose property is null
+info: |
+  RS: Evaluation
+    AwaitUsingDeclaration : CoverAwaitExpressionAndAwaitUsingDeclarationHead BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument async-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  2. Else,
+    ...
+  3. Append resource to disposeCapability.[[DisposableResourceStack]].
+  4. Return unused.
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      ...
+    b. Else,
+      i. If V is not an Object, throw a TypeError exception.
+      ii. Set method to ? GetDisposeMethod(V, hint).
+      iii. If method is undefined, throw a TypeError exception.
+  ...
+
+  GetDisposeMethod ( V, hint )
+
+  1. If hint is async-dispose, then
+    a. Let method be ? GetMethod(V, @@asyncDispose).
+    b. If method is undefined, then
+      i. Set method to ? GetMethod(V, @@dispose).
+  2. Else,
+    a. Let method be ? GetMethod(V, @@dispose).
+  3. Return method.
+
+  GetMethod ( V, P )
+
+  1. Let func be ? GetV(V, P).
+  2. If func is either undefined or null, return undefined.
+  3. ...
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  await assert.throwsAsync(TypeError, async function () {
+      await using x = { [Symbol.dispose]: null };
+  });
+});
diff --git a/js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.dispose-property-is-undefined.js b/js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.dispose-property-is-undefined.js
new file mode 100644
index 0000000000000..d7f513cabd4cd
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.dispose-property-is-undefined.js
@@ -0,0 +1,79 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Throws if initialized value's Symbol.dispose property is undefined
+info: |
+  RS: Evaluation
+    AwaitUsingDeclaration : CoverAwaitExpressionAndAwaitUsingDeclarationHead BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument async-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  2. Else,
+    ...
+  3. Append resource to disposeCapability.[[DisposableResourceStack]].
+  4. Return unused.
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      ...
+    b. Else,
+      i. If V is not an Object, throw a TypeError exception.
+      ii. Set method to ? GetDisposeMethod(V, hint).
+      iii. If method is undefined, throw a TypeError exception.
+  ...
+
+  GetDisposeMethod ( V, hint )
+
+  1. If hint is async-dispose, then
+    a. Let method be ? GetMethod(V, @@asyncDispose).
+    b. If method is undefined, then
+      i. Set method to ? GetMethod(V, @@dispose).
+  2. Else,
+    a. Let method be ? GetMethod(V, @@dispose).
+  3. Return method.
+
+  GetMethod ( V, P )
+
+  1. Let func be ? GetV(V, P).
+  2. If func is either undefined or null, return undefined.
+  3. ...
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  await assert.throwsAsync(TypeError, async function () {
+      await using x = { [Symbol.dispose]: undefined };
+  });
+});
diff --git a/js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.dispose-property-not-callable.js b/js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.dispose-property-not-callable.js
new file mode 100644
index 0000000000000..f68b49aadd10f
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/throws-if-initializer-Symbol.dispose-property-not-callable.js
@@ -0,0 +1,100 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Throws if initialized value's Symbol.dispose property is not callable
+info: |
+  RS: Evaluation
+    AwaitUsingDeclaration : CoverAwaitExpressionAndAwaitUsingDeclarationHead BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument async-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  2. Else,
+    ...
+  3. Append resource to disposeCapability.[[DisposableResourceStack]].
+  4. Return unused.
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      i. Set V to undefined.
+      ii. Set method to undefined.
+    b. Else,
+      i. If V is not an Object, throw a TypeError exception.
+      ii. Set method to ? GetDisposeMethod(V, hint).
+      iii. If method is undefined, throw a TypeError exception.
+  2. Else,
+    ...
+  3. Return the DisposableResource Record { [[ResourceValue]]: V, [[Hint]]: hint, [[DisposeMethod]]: method }.
+
+  GetDisposeMethod ( V, hint )
+
+  1. If hint is async-dispose, then
+    a. Let method be ? GetMethod(V, @@asyncDispose).
+    b. If method is undefined, then
+      i. Set method to ? GetMethod(V, @@dispose).
+  2. Else,
+    a. Let method be ? GetMethod(V, @@dispose).
+  3. Return method.
+
+  GetMethod ( V, P )
+
+  1. Let func be ? GetV(V, P).
+  2. If func is either undefined or null, return undefined.
+  3. If IsCallable(func) is false, throw a TypeError exception.
+  4. Return func.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  await assert.throwsAsync(TypeError, async function () {
+    await using x = { [Symbol.dispose]: true };
+  }, 'true');
+
+  await assert.throwsAsync(TypeError, async function () {
+    await using x = { [Symbol.dispose]: false };
+  }, 'false');
+
+  await assert.throwsAsync(TypeError, async function () {
+    await using x = { [Symbol.dispose]: 1 };
+  }, 'number');
+
+  await assert.throwsAsync(TypeError, async function () {
+    await using x = { [Symbol.dispose]: 'object' };
+  }, 'string');
+
+  var s = Symbol();
+  await assert.throwsAsync(TypeError, async function () {
+    await using x = { [Symbol.dispose]: s };
+  }, 'symbol');
+});
diff --git a/js/src/tests/test262/language/statements/await-using/throws-if-initializer-missing-both-Symbol.asyncDispose-and-Symbol.dispose.js b/js/src/tests/test262/language/statements/await-using/throws-if-initializer-missing-both-Symbol.asyncDispose-and-Symbol.dispose.js
new file mode 100644
index 0000000000000..836564abf6d93
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/throws-if-initializer-missing-both-Symbol.asyncDispose-and-Symbol.dispose.js
@@ -0,0 +1,80 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Throws if initialized value is missing both the Symbol.asyncDispose and Symbol.dispose properties
+info: |
+  RS: Evaluation
+    AwaitUsingDeclaration : CoverAwaitExpressionAndAwaitUsingDeclarationHead BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument async-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    BindingList : BindingList , LexicalBinding
+
+    1. Perform ? BindingEvaluation of BindingList with argument hint.
+    2. Perform ? BindingEvaluation of LexicalBinding with argument hint.
+    3. Return unused.
+
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  3. Else,
+    ...
+  3. Append resource to disposeCapability.[[DisposableResourceStack]].
+  4. Return unused.
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      ...
+    b. Else,
+      i. If V is not an Object, throw a TypeError exception.
+      ii. Set method to ? GetDisposeMethod(V, hint).
+      iii. If method is undefined, throw a TypeError exception.
+  ...
+
+  GetDisposeMethod ( V, hint )
+
+  1. If hint is async-dispose, then
+    a. Let method be ? GetMethod(V, @@asyncDispose).
+    b. If method is undefined, then
+      i. Set method to ? GetMethod(V, @@dispose).
+  2. Else,
+    a. Let method be ? GetMethod(V, @@dispose).
+  3. Return method.
+
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+  await assert.throwsAsync(TypeError, async function () {
+      await using x = {};
+  });
+});
diff --git a/js/src/tests/test262/language/statements/await-using/throws-suppressederror-if-multiple-errors-during-disposal.js b/js/src/tests/test262/language/statements/await-using/throws-suppressederror-if-multiple-errors-during-disposal.js
new file mode 100644
index 0000000000000..28d6b649c8707
--- /dev/null
+++ b/js/src/tests/test262/language/statements/await-using/throws-suppressederror-if-multiple-errors-during-disposal.js
@@ -0,0 +1,58 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-disposeresources
+description: >
+  Throws a nested hierarchy of SuppressedErrors if multiple errors were thrown during evaluation of subsequent statements following 'await using'
+  and/or from disposal.
+info: |
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function() {
+  class MyError extends Error {}
+  const error1 = new MyError();
+  const error2 = new MyError();
+  const error3 = new MyError();
+
+  try {
+    await using _1 = { async [Symbol.asyncDispose]() { throw error1; } };
+    await using _2 = { [Symbol.dispose]() { throw error2; } };
+    throw error3;
+  }
+  catch (e) {
+    assert(e instanceof SuppressedError, "Expected an SuppressedError to have been thrown");
+    assert.sameValue(e.error, error1, "Expected the outermost suppressing error to have been 'error1'");
+    assert(e.suppressed instanceof SuppressedError, "Expected the outermost suppressed error to have been a SuppressedError");
+    assert.sameValue(e.suppressed.error, error2, "Expected the innermost suppressing error to have been 'error2'");
+    assert.sameValue(e.suppressed.suppressed, error3, "Expected the innermost suppressed error to have been 'error3'");
+  }
+});
diff --git a/js/src/tests/test262/language/statements/using/Symbol.dispose-getter.js b/js/src/tests/test262/language/statements/using/Symbol.dispose-getter.js
new file mode 100644
index 0000000000000..760a9cf2ff600
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/Symbol.dispose-getter.js
@@ -0,0 +1,90 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Invokes [Symbol.dispose] getter
+info: |
+  RS: Evaluation
+    UsingDeclaration : using BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument sync-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  2. Else,
+    ...
+  3. Append resource to disposeCapability.[[DisposableResourceStack]].
+  4. Return unused.
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      i. Set V to undefined.
+      ii. Set method to undefined.
+    b. Else,
+      i. If V is not an Object, throw a TypeError exception.
+      ii. Set method to ? GetDisposeMethod(V, hint).
+      iii. If method is undefined, throw a TypeError exception.
+  2. Else,
+    ...
+  3. Return the DisposableResource Record { [[ResourceValue]]: V, [[Hint]]: hint, [[DisposeMethod]]: method }.
+
+  GetDisposeMethod ( V, hint )
+
+  1. If hint is async-dispose, then
+    ...
+  2. Else,
+    a. Let method be ? GetMethod(V, @@dispose).
+  3. Return method.
+
+  GetMethod ( V, P )
+
+  1. Let func be ? GetV(V, P).
+  2. If func is either undefined or null, return undefined.
+  3. If IsCallable(func) is false, throw a TypeError exception.
+  4. Return func.
+
+features: [explicit-resource-management]
+---*/
+
+var resource = {
+  disposed: false,
+  get [Symbol.dispose]() {
+    return function() {
+      this.disposed = true;
+    };
+  }
+};
+
+{
+  using _ = resource;
+}
+
+assert.sameValue(resource.disposed, true, 'Expected resource to have been disposed');
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/Symbol.dispose-method-called-with-correct-this.js b/js/src/tests/test262/language/statements/using/Symbol.dispose-method-called-with-correct-this.js
new file mode 100644
index 0000000000000..3ff9f349bbda5
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/Symbol.dispose-method-called-with-correct-this.js
@@ -0,0 +1,53 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-block-runtime-semantics-evaluation
+description: Initialized value is disposed with the correct 'this' value
+info: |
+  RS: Evaluation
+    Block : { StatementList }
+
+    ...
+    5. Let blockValue be the result of evaluating StatementList.
+    6. Set blockValue to DisposeResources(blockEnv.[[DisposeCapability]], blockValue).
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  ...
+
+features: [explicit-resource-management]
+---*/
+
+var resource = {
+    disposed: false,
+    [Symbol.dispose]() {
+        assert.sameValue(this, resource);
+    }
+};
+
+{
+  using _ = resource;
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/block-local-closure-get-before-initialization.js b/js/src/tests/test262/language/statements/using/block-local-closure-get-before-initialization.js
new file mode 100644
index 0000000000000..c888653f9ff8e
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/block-local-closure-get-before-initialization.js
@@ -0,0 +1,23 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-declarative-environment-records-getbindingvalue-n-s
+description: >
+    using: block local closure [[Get]] before initialization.
+    (TDZ, Temporal Dead Zone)
+features: [explicit-resource-management]
+---*/
+{
+  function f() { return x + 1; }
+
+  assert.throws(ReferenceError, function() {
+    f();
+  });
+
+  using x = null;
+}
+
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/block-local-use-before-initialization-in-declaration-statement.js b/js/src/tests/test262/language/statements/using/block-local-use-before-initialization-in-declaration-statement.js
new file mode 100644
index 0000000000000..482557741c25c
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/block-local-use-before-initialization-in-declaration-statement.js
@@ -0,0 +1,19 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-declarative-environment-records-getbindingvalue-n-s
+description: >
+    using: block local use before initialization in declaration statement.
+    (TDZ, Temporal Dead Zone)
+features: [explicit-resource-management]
+---*/
+
+assert.throws(ReferenceError, function() {
+  {
+    using x = x + 1;
+  }
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/block-local-use-before-initialization-in-prior-statement.js b/js/src/tests/test262/language/statements/using/block-local-use-before-initialization-in-prior-statement.js
new file mode 100644
index 0000000000000..edf86bd42ef70
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/block-local-use-before-initialization-in-prior-statement.js
@@ -0,0 +1,19 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-declarative-environment-records-getbindingvalue-n-s
+description: >
+    using: block local use before initialization in prior statement.
+    (TDZ, Temporal Dead Zone)
+features: [explicit-resource-management]
+---*/
+
+assert.throws(ReferenceError, function() {
+  {
+    x; using x = null;
+  }
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/cptn-value.js b/js/src/tests/test262/language/statements/using/cptn-value.js
new file mode 100644
index 0000000000000..487446518d41f
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/cptn-value.js
@@ -0,0 +1,29 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Returns an empty completion
+info: |
+  UsingDeclaration : using BindingList ;
+
+  1. Perform ? BindingEvaluation of BindingList with argument sync-dispose.
+  2. Return empty.
+
+features: [explicit-resource-management]
+---*/
+
+assert.sameValue(
+  eval('{using test262id1 = null;}'), undefined, 'Single declaration'
+);
+assert.sameValue(
+  eval('{using test262id2 = null, test262id3 = null;}'),
+  undefined,
+  'Multiple declarations'
+);
+
+assert.sameValue(eval('4; {using test262id5 = null;}'), 4);
+assert.sameValue(eval('6; {using test262id7 = null, test262id8 = null;}'), 6);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/fn-name-arrow.js b/js/src/tests/test262/language/statements/using/fn-name-arrow.js
new file mode 100644
index 0000000000000..01f794863a459
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/fn-name-arrow.js
@@ -0,0 +1,29 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Assignment of function `name` attribute (ArrowFunction)
+info: |
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    3. If IsAnonymousFunctionDefinition(Initializer) is true, then
+       a. Let value be NamedEvaluation of Initializer with argument bindingId
+includes: [propertyHelper.js]
+features: [explicit-resource-management]
+---*/
+
+// NOTE: only way to verify is to patch `Function.prototype` so as not to trigger a TypeError from AddDisposableResource
+Function.prototype[Symbol.dispose] = function () {}
+{
+    using arrow = () => {};
+
+    assert.sameValue(arrow.name, 'arrow');
+    verifyNotEnumerable(arrow, 'name');
+    verifyNotWritable(arrow, 'name');
+    verifyConfigurable(arrow, 'name');
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/fn-name-class.js b/js/src/tests/test262/language/statements/using/fn-name-class.js
new file mode 100644
index 0000000000000..0a2f1b9234976
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/fn-name-class.js
@@ -0,0 +1,31 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Assignment of function `name` attribute (ClassExpression)
+info: |
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    3. If IsAnonymousFunctionDefinition(Initializer) is true, then
+       a. Let value be NamedEvaluation of Initializer with argument bindingId
+includes: [propertyHelper.js]
+features: [class, explicit-resource-management]
+---*/
+{
+    using xCls = class x { static [Symbol.dispose]() {} };
+    using cls = class { static [Symbol.dispose]() {} };
+    using xCls2 = class { static name() {} static [Symbol.dispose]() {} };
+
+    assert.notSameValue(xCls.name, 'xCls');
+    assert.notSameValue(xCls2.name, 'xCls2');
+
+    assert.sameValue(cls.name, 'cls');
+    verifyNotEnumerable(cls, 'name');
+    verifyNotWritable(cls, 'name');
+    verifyConfigurable(cls, 'name');
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/fn-name-cover.js b/js/src/tests/test262/language/statements/using/fn-name-cover.js
new file mode 100644
index 0000000000000..8467cefe2109b
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/fn-name-cover.js
@@ -0,0 +1,33 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: >
+    Assignment of function `name` attribute (CoverParenthesizedExpression)
+info: |
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    3. If IsAnonymousFunctionDefinition(Initializer) is true, then
+       a. Let value be NamedEvaluation of Initializer with argument bindingId
+includes: [propertyHelper.js]
+features: [explicit-resource-management]
+---*/
+
+// NOTE: only way to verify is to patch `Function.prototype` so as not to trigger a TypeError from AddDisposableResource
+Function.prototype[Symbol.dispose] = function () {}
+{
+    using xCover = (0, function() {});
+    using cover = (function() {});
+
+    assert(xCover.name !== 'xCover');
+
+    assert.sameValue(cover.name, 'cover');
+    verifyNotEnumerable(cover, 'name');
+    verifyNotWritable(cover, 'name');
+    verifyConfigurable(cover, 'name');
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/fn-name-fn.js b/js/src/tests/test262/language/statements/using/fn-name-fn.js
new file mode 100644
index 0000000000000..900234eb592dd
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/fn-name-fn.js
@@ -0,0 +1,32 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Assignment of function `name` attribute (FunctionExpression)
+info: |
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    3. If IsAnonymousFunctionDefinition(Initializer) is true, then
+       a. Let value be NamedEvaluation of Initializer with argument bindingId
+includes: [propertyHelper.js]
+features: [explicit-resource-management]
+---*/
+
+// NOTE: only way to verify is to patch `Function.prototype` so as not to trigger a TypeError from AddDisposableResource
+Function.prototype[Symbol.dispose] = function () {}
+{
+    using xFn = function x() {};
+    using fn = function() {};
+
+    assert(xFn.name !== 'xFn');
+
+    assert.sameValue(fn.name, 'fn');
+    verifyNotEnumerable(fn, 'name');
+    verifyNotWritable(fn, 'name');
+    verifyConfigurable(fn, 'name');
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/fn-name-gen.js b/js/src/tests/test262/language/statements/using/fn-name-gen.js
new file mode 100644
index 0000000000000..0a595daf1e93d
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/fn-name-gen.js
@@ -0,0 +1,32 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Assignment of function `name` attribute (GeneratorExpression)
+info: |
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    3. If IsAnonymousFunctionDefinition(Initializer) is true, then
+       a. Let value be NamedEvaluation of Initializer with argument bindingId
+includes: [propertyHelper.js]
+features: [generators,explicit-resource-management]
+---*/
+
+// NOTE: only way to verify is to patch `Function.prototype` so as not to trigger a TypeError from AddDisposableResource
+Function.prototype[Symbol.dispose] = function () {}
+{
+    using xGen = function* x() {};
+    using gen = function*() {};
+
+    assert(xGen.name !== 'xGen');
+
+    assert.sameValue(gen.name, 'gen');
+    verifyNotEnumerable(gen, 'name');
+    verifyNotWritable(gen, 'name');
+    verifyConfigurable(gen, 'name');
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/function-local-closure-get-before-initialization.js b/js/src/tests/test262/language/statements/using/function-local-closure-get-before-initialization.js
new file mode 100644
index 0000000000000..d6a8dd6d87260
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/function-local-closure-get-before-initialization.js
@@ -0,0 +1,23 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-declarative-environment-records-getbindingvalue-n-s
+description: >
+    using: function local closure [[Get]] before initialization.
+    (TDZ, Temporal Dead Zone)
+features: [explicit-resource-management]
+---*/
+
+(function() {
+  function f() { return x + 1; }
+
+  assert.throws(ReferenceError, function() {
+    f();
+  });
+
+  using x = null;
+}());
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/function-local-use-before-initialization-in-declaration-statement.js b/js/src/tests/test262/language/statements/using/function-local-use-before-initialization-in-declaration-statement.js
new file mode 100644
index 0000000000000..a5aaed594fe5b
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/function-local-use-before-initialization-in-declaration-statement.js
@@ -0,0 +1,19 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-declarative-environment-records-getbindingvalue-n-s
+description: >
+    using: function local use before initialization in declaration statement.
+    (TDZ, Temporal Dead Zone)
+features: [explicit-resource-management]
+---*/
+
+assert.throws(ReferenceError, function() {
+  (function() {
+    using x = x + 1;
+  }());
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/function-local-use-before-initialization-in-prior-statement.js b/js/src/tests/test262/language/statements/using/function-local-use-before-initialization-in-prior-statement.js
new file mode 100644
index 0000000000000..1919982e06fe9
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/function-local-use-before-initialization-in-prior-statement.js
@@ -0,0 +1,19 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-declarative-environment-records-getbindingvalue-n-s
+description: >
+    using: function local use before initialization in prior statement.
+    (TDZ, Temporal Dead Zone)
+features: [explicit-resource-management]
+---*/
+
+assert.throws(ReferenceError, function() {
+  (function() {
+    x; using x = null;
+  }());
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/gets-initializer-Symbol.dispose-property-once.js b/js/src/tests/test262/language/statements/using/gets-initializer-Symbol.dispose-property-once.js
new file mode 100644
index 0000000000000..8ca84216cab50
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/gets-initializer-Symbol.dispose-property-once.js
@@ -0,0 +1,87 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Only reads `[Symbol.dispose]` method once, when initialized.
+info: |
+  RS: Evaluation
+    UsingDeclaration : using BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument sync-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    BindingList : BindingList , LexicalBinding
+
+    1. Perform ? BindingEvaluation of BindingList with argument hint.
+    2. Perform ? BindingEvaluation of LexicalBinding with argument hint.
+    3. Return unused.
+
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  ...
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      i. Set V to undefined
+      ii. Set method to undefined
+    b. Else,
+      i. If Type(V) is not Object, throw a TypeError exception.
+      ii. Set method to ? GetDisposeMethod(V, hint).
+      iii. If method is undefined, throw a TypeError exception.
+  2. Else,
+      a. ...
+  3. Return the DisposableResource Record { [[ResourceValue]]: V, [[Hint]]: hint, [[DisposeMethod]]: method }.
+
+  GetDisposeMethod ( V, hint )
+
+  1. If hint is async-dispose, then
+    a. Let method be ? GetMethod(V, @@asyncDispose).
+    b. If method is undefined, then
+      i. Set method to ? GetMethod(V, @@dispose).
+  2. Else,
+    a. Let method be ? GetMethod(V, @@dispose).
+  3. Return method.
+
+features: [explicit-resource-management]
+---*/
+
+var resource = {
+    disposeReadCount: 0,
+    get [Symbol.dispose]() {
+        this.disposeReadCount++;
+        return function() { };
+    }
+};
+
+{
+  using _ = resource;
+}
+
+assert.sameValue(resource.disposeReadCount, 1, 'Expected [Symbol.dispose] to have been read only once');
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/global-closure-get-before-initialization.js b/js/src/tests/test262/language/statements/using/global-closure-get-before-initialization.js
new file mode 100644
index 0000000000000..8fb03c28fbece
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/global-closure-get-before-initialization.js
@@ -0,0 +1,23 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-declarative-environment-records-getbindingvalue-n-s
+description: >
+    using: global closure [[Get]] before initialization.
+    (TDZ, Temporal Dead Zone)
+features: [explicit-resource-management]
+---*/
+
+{
+  function f() { return x + 1; }
+
+  assert.throws(ReferenceError, function() {
+    f();
+  });
+
+  using x = null;
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/global-use-before-initialization-in-declaration-statement.js b/js/src/tests/test262/language/statements/using/global-use-before-initialization-in-declaration-statement.js
new file mode 100644
index 0000000000000..e6922e1e8abcd
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/global-use-before-initialization-in-declaration-statement.js
@@ -0,0 +1,18 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) error:ReferenceError -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-declarative-environment-records-getbindingvalue-n-s
+description: >
+    using: global use before initialization in declaration statement.
+    (TDZ, Temporal Dead Zone)
+negative:
+  phase: runtime
+  type: ReferenceError
+features: [explicit-resource-management]
+---*/
+
+{
+  using x = x + 1;
+}
diff --git a/js/src/tests/test262/language/statements/using/global-use-before-initialization-in-prior-statement.js b/js/src/tests/test262/language/statements/using/global-use-before-initialization-in-prior-statement.js
new file mode 100644
index 0000000000000..193eb55da92dc
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/global-use-before-initialization-in-prior-statement.js
@@ -0,0 +1,18 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) error:ReferenceError -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-declarative-environment-records-getbindingvalue-n-s
+description: >
+    using: global use before initialization in prior statement.
+    (TDZ, Temporal Dead Zone)
+negative:
+  phase: runtime
+  type: ReferenceError
+features: [explicit-resource-management]
+---*/
+
+{
+  x; using x = null;
+}
diff --git a/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-asyncfunctionbody.js b/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-asyncfunctionbody.js
new file mode 100644
index 0000000000000..d51bf6eb4666c
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-asyncfunctionbody.js
@@ -0,0 +1,106 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-asyncblockstart
+description: Initialized value is disposed at end of AsyncFunctionBody
+info: |
+  AsyncBlockStart ( promiseCapability, asyncBody, asyncContext )
+
+  1. Assert: promiseCapability is a PromiseCapability Record.
+  2. Let runningContext be the running execution context.
+  3. Let closure be a new Abstract Closure with no parameters that captures promiseCapability and asyncBody and performs the following steps when called:
+    a. Let acAsyncContext be the running execution context.
+    b. Let result be Completion(Evaluation of asyncBody).
+    c. Assert: If we return here, the async function either threw an exception or performed an implicit or explicit return; all awaiting is done.
+    d. Remove acAsyncContext from the execution context stack and restore the execution context that is at the top of the execution context stack as the running execution context.
+    e. Let env be acAsyncContext's LexicalEnvironment.
+    f. Set result to DisposeResources(env.[[DisposeCapability]], result).
+    g. If result.[[Type]] is normal, then
+      i. Perform ! Call(promiseCapability.[[Resolve]], undefined, « undefined »).
+    h. Else if result.[[Type]] is return, then
+      i. Perform ! Call(promiseCapability.[[Resolve]], undefined, « result.[[Value]] »).
+    i. Else,
+      i. Assert: result.[[Type]] is throw.
+      ii. Perform ! Call(promiseCapability.[[Reject]], undefined, « result.[[Value]] »).
+    j. Return unused.
+  4. Set the code evaluation state of asyncContext such that when evaluation is resumed for that execution context, closure will be called with no arguments.
+  5. Push asyncContext onto the execution context stack; asyncContext is now the running execution context.
+  6. Resume the suspended evaluation of asyncContext. Let result be the value returned by the resumed computation.
+  7. Assert: When we return here, asyncContext has already been removed from the execution context stack and runningContext is the currently running execution context.
+  8. Assert: result is a normal completion with a value of unused. The possible sources of this value are Await or, if the async function doesn't await anything, step 3.h above.
+  9. Return unused.
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. ...
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+
+  var resource = {
+      disposed: false,
+      [Symbol.dispose]() {
+          this.disposed = true;
+      }
+  };
+
+  var releaseF1;
+  var suspendFPromise1 = new Promise(function (resolve) { releaseF1 = resolve; });
+
+  var releaseBody;
+  var suspendBodyPromise = new Promise(function (resolve) { releaseBody = resolve; });
+
+  var releaseF2;
+  var suspendFPromise2 = new Promise(function (resolve) { releaseF2 = resolve; });
+
+  async function f() {
+      using _ = resource;
+      await suspendFPromise1;
+      releaseBody();
+      await suspendFPromise2;
+  }
+
+  var resultPromise = f();
+
+  var wasDisposedWhileSuspended1 = resource.disposed;
+
+  releaseF1();
+  await suspendBodyPromise;
+
+  var wasDisposedWhileSuspended2 = resource.disposed;
+
+  releaseF2();
+  await resultPromise;
+
+  var isDisposedAfterCompleted = resource.disposed;
+
+  assert.sameValue(wasDisposedWhileSuspended1, false, 'Expected resource to not have been disposed while async function is suspended during await');
+  assert.sameValue(wasDisposedWhileSuspended2, false, 'Expected resource to not have been disposed while async function is suspended during await');
+  assert.sameValue(isDisposedAfterCompleted, true, 'Expected resource to have been disposed after async function completed');
+});
diff --git a/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-asyncgeneratorbody.js b/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-asyncgeneratorbody.js
new file mode 100644
index 0000000000000..053c6c32e6e4d
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-asyncgeneratorbody.js
@@ -0,0 +1,108 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) async -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-asyncgeneratorstart
+description: Initialized value is disposed at end of AsyncGeneratorBody
+info: |
+  AsyncGeneratorStart ( generator, generatorBody )
+
+  1. Assert: generator.[[AsyncGeneratorState]] is undefined.
+  2. Let genContext be the running execution context.
+  3. Set the Generator component of genContext to generator.
+  4. Let closure be a new Abstract Closure with no parameters that captures generatorBody and performs the following steps when called:
+    a. Let acGenContext be the running execution context.
+    b. Let acGenerator be the Generator component of acGenContext.
+    c. If generatorBody is a Parse Node, then
+      i. Let result be Completion(Evaluation of generatorBody).
+    d. Else,
+      i. Assert: generatorBody is an Abstract Closure with no parameters.
+      ii. Let result be Completion(generatorBody()).
+    e. Assert: If we return here, the async generator either threw an exception or performed either an implicit or explicit return.
+    f. Remove acGenContext from the execution context stack and restore the execution context that is at the top of the execution context stack as the running execution context.
+    g. Set acGenerator.[[AsyncGeneratorState]] to completed.
+    h. Let env be genContext's LexicalEnvironment.
+    i. If env is not undefined, then
+      i. Assert: env is a Declarative Environment Record
+      ii. Set result to DisposeResources(env.[[DisposeCapability]], result).
+    h. If result.[[Type]] is normal, set result to NormalCompletion(undefined).
+    i. If result.[[Type]] is return, set result to NormalCompletion(result.[[Value]]).
+    j. Perform AsyncGeneratorCompleteStep(acGenerator, result, true).
+    k. Perform AsyncGeneratorDrainQueue(acGenerator).
+    l. Return undefined.
+  5. Set the code evaluation state of genContext such that when evaluation is resumed for that execution context, closure will be called with no arguments.
+  6. Set generator.[[AsyncGeneratorContext]] to genContext.
+  7. Set generator.[[AsyncGeneratorState]] to suspendedStart.
+  8. Set generator.[[AsyncGeneratorQueue]] to a new empty List.
+  9. Return unused.
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. ...
+  4. Return undefined.
+
+flags: [async]
+includes: [asyncHelpers.js]
+features: [explicit-resource-management]
+---*/
+
+asyncTest(async function () {
+
+  var resource = {
+      disposed: false,
+      [Symbol.dispose]() {
+          this.disposed = true;
+      }
+  };
+
+  var releaseF;
+  var suspendFPromise = new Promise(function (resolve) { releaseF = resolve; });
+
+  async function * f() {
+      using _ = resource;
+      yield;
+      await suspendFPromise;
+  }
+
+  var g = f();
+
+  var wasDisposedBeforeAsyncGeneratorStarted = resource.disposed;
+
+  await g.next();
+
+  var wasDisposedWhileSuspendedForYield = resource.disposed;
+
+  var nextPromise = g.next();
+
+  var wasDisposedWhileSuspendedForAwait = resource.disposed;
+
+  releaseF();
+  await nextPromise;
+
+  var isDisposedAfterCompleted = resource.disposed;
+
+  assert.sameValue(wasDisposedBeforeAsyncGeneratorStarted, false, 'Expected resource to not have been disposed prior to async generator start');
+  assert.sameValue(wasDisposedWhileSuspendedForYield, false, 'Expected resource to not have been disposed while async generator function is suspended for yield');
+  assert.sameValue(wasDisposedWhileSuspendedForAwait, false, 'Expected resource to not have been disposed while async generator function is suspended during await');
+  assert.sameValue(isDisposedAfterCompleted, true, 'Expected resource to have been disposed after async generator function completed');
+});
diff --git a/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-block.js b/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-block.js
new file mode 100644
index 0000000000000..c0c7006693e8b
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-block.js
@@ -0,0 +1,57 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-block-runtime-semantics-evaluation
+description: Initialized value is disposed at end of Block
+info: |
+  RS: Evaluation
+    Block : { StatementList }
+
+    ...
+    5. Let blockValue be the result of evaluating StatementList.
+    6. Set blockValue to DisposeResources(blockEnv.[[DisposeCapability]], blockValue).
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. ...
+  4. Return undefined.
+
+features: [explicit-resource-management]
+---*/
+
+var resource = {
+    disposed: false,
+    [Symbol.dispose]() {
+        this.disposed = true;
+    }
+};
+
+{
+  using _ = resource;
+}
+
+assert.sameValue(resource.disposed, true, 'Expected resource to have been disposed');
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-each-iteration-of-forofstatementjs b/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-each-iteration-of-forofstatementjs
new file mode 100644
index 0000000000000..391643bce0ba9
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-each-iteration-of-forofstatementjs
@@ -0,0 +1,80 @@
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-runtime-semantics-forin-div-ofbodyevaluation-lhs-stmt-iterator-lhskind-labelset
+description: Initialized value is disposed at end of each iteration of ForOfStatement
+info: |
+  ForIn/OfBodyEvaluation ( lhs, stmt, iteratorRecord, iterationKind, lhsKind, labelSet [ , iteratorKind ] )
+
+  1. If iteratorKind is not present, set iteratorKind to sync.
+  2. Let oldEnv be the running execution context's LexicalEnvironment.
+  3. Let V be undefined.
+  4. If IsAwaitUsingDeclaration of lhs is true, then
+    a. Let hint be async-dispose.
+  5. Else, if IsUsingDeclaration of lhs is true, then
+    a. Let hint be sync-dispose.
+  6. Else,
+    a. Let hint be normal.
+  7. Let destructuring be IsDestructuring of lhs.
+  8. If destructuring is true and if lhsKind is assignment, then
+    a. Assert: lhs is a LeftHandSideExpression.
+    b. Let assignmentPattern be the AssignmentPattern that is covered by lhs.
+  9. Repeat,
+    ...
+    j. Let result be Completion(Evaluation of stmt).
+    k. If iterationEnv is not undefined, then
+      i. Set result to Completion(DisposeResources(iterationEnv.[[DisposeCapability]], result)).
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. ...
+  4. Return undefined.
+
+features: [explicit-resource-management]
+---*/
+
+var resource = {
+    disposed: false,
+    [Symbol.dispose]() {
+        this.disposed = true;
+    }
+};
+
+var wasDisposedBeforeBody = false;
+var wasDisposedBeforeIteration = false;
+var wasDisposedAfterIteration = false;
+
+function * g() {
+  wasDisposedBeforeIteration = resource.disposed;
+  yield resource;
+  wasDisposedAfterIteration = resource.disposed;
+}
+
+for (using _ of g()) {
+  wasDisposedBeforeBody = resource.disposed;
+}
+
+assert.sameValue(wasDisposedBeforeIteration, false, 'Expected resource to not been disposed before the for-of loop has received a value');
+assert.sameValue(wasDisposedBeforeBody, false, 'Expected resource to not been disposed while for-of loop is still iterating');
+assert.sameValue(wasDisposedAfterIteration, true, 'Expected resource to have been disposed after the for-of loop advanced to the next value');
diff --git a/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-forstatement.js b/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-forstatement.js
new file mode 100644
index 0000000000000..e127acecfa569
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-forstatement.js
@@ -0,0 +1,61 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-runtime-semantics-forloopevaluation
+description: Initialized value is disposed at end of ForStatement
+info: |
+  RS: ForLoopEvaluation
+    ForStatement : for ( LexicalDeclaration Expressionopt ; Expressionopt ) Statement
+
+    ...
+    12. Let bodyResult be Completion(ForBodyEvaluation(test, increment, Statement, perIterationLets, labelSet)).
+    13. Set bodyResult to Completion(DisposeResources(loopEnv.[[DisposeCapability]], bodyResult)).
+    14. Assert: If bodyResult.[[Type]] is normal, then bodyResult.[[Value]] is not empty.
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. ...
+  4. Return undefined.
+
+features: [explicit-resource-management]
+---*/
+
+var resource = {
+    disposed: false,
+    [Symbol.dispose]() {
+        this.disposed = true;
+    }
+};
+
+var i = 0;
+var wasDisposedInForStatement;
+for (using _ = resource; i < 1; i++) {
+  wasDisposedInForStatement = resource.disposed;
+}
+
+assert.sameValue(wasDisposedInForStatement, false, 'Expected resource to not been disposed while for loop is still iterating');
+assert.sameValue(resource.disposed, true, 'Expected resource to have been disposed');
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-functionbody.js b/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-functionbody.js
new file mode 100644
index 0000000000000..93b98705f1038
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-functionbody.js
@@ -0,0 +1,58 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-runtime-semantics-evaluatefunctionbody
+description: Initialized value is disposed at end of FunctionBody
+info: |
+  FunctionBody : FunctionStatementList
+
+  ...
+  3. Let result be Completion(Evaluation of FunctionStatementList).
+  4. Let env be the running execution context's LexicalEnvironment.
+  5. Return ? DisposeResources(env.[[DisposeCapability]], result).
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. ...
+  4. Return undefined.
+
+features: [explicit-resource-management]
+---*/
+
+var resource = {
+    disposed: false,
+    [Symbol.dispose]() {
+        this.disposed = true;
+    }
+};
+
+function f() {
+    using _ = resource;
+}
+
+f();
+
+assert.sameValue(resource.disposed, true, 'Expected resource to have been disposed');
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-generatorbody.js b/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-generatorbody.js
new file mode 100644
index 0000000000000..180dade448773
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/initializer-disposed-at-end-of-generatorbody.js
@@ -0,0 +1,93 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-generatorstart
+description: Initialized value is disposed at end of GeneratorBody
+info: |
+  GeneratorStart ( generator, generatorBody )
+  
+  1. Assert: The value of generator.[[GeneratorState]] is undefined.
+  2. Let genContext be the running execution context.
+  3. Set the Generator component of genContext to generator.
+  4. Let closure be a new Abstract Closure with no parameters that captures generatorBody and performs the following steps when called:
+    a. Let acGenContext be the running execution context.
+    b. Let acGenerator be the Generator component of acGenContext.
+    c. If generatorBody is a Parse Node, then
+      i. Let result be Completion(Evaluation of generatorBody).
+    d. Else,
+      i. Assert: generatorBody is an Abstract Closure with no parameters.
+      ii. Let result be generatorBody().
+    e. Assert: If we return here, the generator either threw an exception or performed either an implicit or explicit return.
+    f. Remove acGenContext from the execution context stack and restore the execution context that is at the top of the execution context stack as the running execution context.
+    g. Set acGenerator.[[GeneratorState]] to completed.
+    h. NOTE: Once a generator enters the completed state it never leaves it and its associated execution context is never resumed. Any execution state associated with acGenerator can be discarded at this point.
+    i. Let env be genContext's LexicalEnvironment.
+    j. If env is not undefined, then
+      i. Assert: env is a Declarative Environment Record.
+      i. Set result to DisposeResources(env.[[DisposeCapability]], result).
+    k. If result.[[Type]] is normal, then
+      i. Let resultValue be undefined.
+    l. Else if result.[[Type]] is return, then
+      i. Let resultValue be result.[[Value]].
+    m. Else,
+      i. Assert: result.[[Type]] is throw.
+      ii. Return ? result.
+    n. Return CreateIterResultObject(resultValue, true).
+  5. Set the code evaluation state of genContext such that when evaluation is resumed for that execution context, closure will be called with no arguments.
+  6. Set generator.[[GeneratorContext]] to genContext.
+  7. Set generator.[[GeneratorState]] to suspendedStart.
+  8. Return unused.
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. ...
+  4. Return undefined.
+
+features: [explicit-resource-management]
+---*/
+
+var resource = {
+    disposed: false,
+    [Symbol.dispose]() {
+        this.disposed = true;
+    }
+};
+
+function * f() {
+    using _ = resource;
+    yield;
+}
+
+var g = f();
+var wasDisposedBeforeGeneratorStarted = resource.disposed;
+g.next();
+var wasDisposedWhileSuspended = resource.disposed;
+assert.sameValue(g.next().done, true);
+var isDisposedAfterGeneratorCompleted = resource.disposed;
+
+assert.sameValue(wasDisposedBeforeGeneratorStarted, false, 'Expected resource to not have been disposed prior to generator start');
+assert.sameValue(wasDisposedWhileSuspended, false, 'Expected resource to not have been disposed while generator is suspended');
+assert.sameValue(isDisposedAfterGeneratorCompleted, true, 'Expected resource to have been disposed after generator completed');
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/initializer-disposed-if-subsequent-initializer-throws-in-forstatement-head.js b/js/src/tests/test262/language/statements/using/initializer-disposed-if-subsequent-initializer-throws-in-forstatement-head.js
new file mode 100644
index 0000000000000..f2524b4bf4a3d
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/initializer-disposed-if-subsequent-initializer-throws-in-forstatement-head.js
@@ -0,0 +1,67 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-runtime-semantics-forloopevaluation
+description: Initialized value is disposed at end of FunctionBody
+info: |
+  RS: ForLoopEvaluation
+    ForStatement : for ( LexicalDeclaration Expressionopt ; Expressionopt ) Statement
+
+    ...
+    7. Let forDcl be Completion(Evaluation of LexicalDeclaration).
+    8. If forDcl is an abrupt completion, then
+      a. Set forDcl to Completion(DisposeResources(loopEnv.[[DisposeCapability]], forDcl)).
+      b. Assert: forDcl is an abrupt completion.
+      c. Set the running execution context's LexicalEnvironment to oldEnv.
+      d. Return ? forDcl.
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. ...
+  4. Return undefined.
+
+features: [explicit-resource-management]
+---*/
+
+var resource = {
+    disposed: false,
+    [Symbol.dispose]() {
+        this.disposed = true;
+    }
+};
+
+function getResource() {
+  throw new Error();
+}
+
+assert.throws(Error, function () {
+  var i = 0;
+  for (using _1 = resource, _2 = getResource(); i < 1; i++) {
+  }
+}, 'for');
+
+assert.sameValue(resource.disposed, true, 'Expected resource to have been disposed');
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/initializer-disposed-if-subsequent-initializer-throws.js b/js/src/tests/test262/language/statements/using/initializer-disposed-if-subsequent-initializer-throws.js
new file mode 100644
index 0000000000000..403956dc3c4d1
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/initializer-disposed-if-subsequent-initializer-throws.js
@@ -0,0 +1,61 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-block-runtime-semantics-evaluation
+description: Initialized value is disposed even if subsequent initializer throws
+info: |
+  RS: Evaluation
+    Block : { StatementList }
+
+    ...
+    5. Let blockValue be the result of evaluating StatementList.
+    6. Set blockValue to DisposeResources(blockEnv.[[DisposeCapability]], blockValue).
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. ...
+  4. Return undefined.
+
+features: [explicit-resource-management]
+---*/
+
+var resource = {
+    disposed: false,
+    [Symbol.dispose]() {
+        this.disposed = true;
+    }
+};
+
+function getResource() {
+  throw new Error();
+}
+
+assert.throws(Error, function () {
+  using _1 = resource, _2 = getResource();
+});
+
+assert.sameValue(resource.disposed, true, 'Expected resource to have been disposed');
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/multiple-resources-disposed-in-reverse-order.js b/js/src/tests/test262/language/statements/using/multiple-resources-disposed-in-reverse-order.js
new file mode 100644
index 0000000000000..54ab55abc99f6
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/multiple-resources-disposed-in-reverse-order.js
@@ -0,0 +1,58 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-disposeresources
+description: Multiple resources are disposed in the reverse of the order in which they were added
+info: |
+  RS: Evaluation
+    Block : { StatementList }
+
+    ...
+    5. Let blockValue be the result of evaluating StatementList.
+    6. Set blockValue to DisposeResources(blockEnv.[[DisposeCapability]], blockValue).
+    ...
+
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. ...
+  4. Return undefined.
+
+features: [explicit-resource-management]
+---*/
+
+var disposed = [];
+var resource1 = { [Symbol.dispose]() { disposed.push(this); } };
+var resource2 = { [Symbol.dispose]() { disposed.push(this); } };
+var resource3 = { [Symbol.dispose]() { disposed.push(this); } };
+
+{
+  using _1 = resource1, _2 = resource2;
+  using _3 = resource3;
+}
+
+assert.sameValue(disposed[0], resource3);
+assert.sameValue(disposed[1], resource2);
+assert.sameValue(disposed[2], resource1);
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/puts-initializer-on-top-of-disposableresourcestack-multiple-bindings.js b/js/src/tests/test262/language/statements/using/puts-initializer-on-top-of-disposableresourcestack-multiple-bindings.js
new file mode 100644
index 0000000000000..31ccef59ca622
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/puts-initializer-on-top-of-disposableresourcestack-multiple-bindings.js
@@ -0,0 +1,72 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: >
+  Puts initialized value on the top of the environment's [[DisposableResourceStack]] with multiple lexical bindings
+  in a single 'using' declaration
+info: |
+  RS: Evaluation
+    UsingDeclaration : using BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument sync-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    BindingList : BindingList , LexicalBinding
+
+    1. Perform ? BindingEvaluation of BindingList with argument hint.
+    2. Perform ? BindingEvaluation of LexicalBinding with argument hint.
+    3. Return unused.
+
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  3. Else,
+    ...
+  3. Append resource to disposeCapability.[[DisposableResourceStack]].
+  4. Return unused.
+
+features: [explicit-resource-management]
+---*/
+
+var disposed = [];
+var resource1 = {
+    [Symbol.dispose]() {
+        disposed.push(this);
+    }
+};
+var resource2 = {
+    [Symbol.dispose]() {
+        disposed.push(this);
+    }
+};
+{
+  using r1 = resource1, r2 = resource2;
+}
+assert.sameValue(2, disposed.length);
+assert.sameValue(disposed[0], resource2, 'Expected resource2 to be the first disposed resource');
+assert.sameValue(disposed[1], resource1, 'Expected resource1 to be the second disposed resource');
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/puts-initializer-on-top-of-disposableresourcestack-subsequent-usings.js b/js/src/tests/test262/language/statements/using/puts-initializer-on-top-of-disposableresourcestack-subsequent-usings.js
new file mode 100644
index 0000000000000..1f45986776a98
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/puts-initializer-on-top-of-disposableresourcestack-subsequent-usings.js
@@ -0,0 +1,67 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: >
+  Puts initialized value on the top of the environment's [[DisposableResourceStack]] with multiple subsequent 'using'
+  declarations in the same block scope
+info: |
+  RS: Evaluation
+    UsingDeclaration : using BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument sync-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  3. Else,
+    ...
+  3. Append resource to disposeCapability.[[DisposableResourceStack]].
+  4. Return unused.
+
+features: [explicit-resource-management]
+---*/
+
+var disposed = [];
+var resource1 = {
+    [Symbol.dispose]() {
+        disposed.push(this);
+    }
+};
+var resource2 = {
+    [Symbol.dispose]() {
+        disposed.push(this);
+    }
+};
+{
+  using r1 = resource1;
+  using r2 = resource2;
+}
+assert.sameValue(2, disposed.length);
+assert.sameValue(disposed[0], resource2, 'Expected resource2 to be the first disposed resource');
+assert.sameValue(disposed[1], resource1, 'Expected resource1 to be the second disposed resource');
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/redeclaration-error-from-within-strict-mode-function-using.js b/js/src/tests/test262/language/statements/using/redeclaration-error-from-within-strict-mode-function-using.js
new file mode 100644
index 0000000000000..29d19f663aaf4
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/redeclaration-error-from-within-strict-mode-function-using.js
@@ -0,0 +1,17 @@
+// |reftest| error:SyntaxError
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-declarative-environment-records-initializebinding-n-v
+description: >
+    Redeclaration error within strict mode function inside non-strict code.
+negative:
+  phase: parse
+  type: SyntaxError
+flags: [noStrict, explicit-resource-management]
+---*/
+
+$DONOTEVALUATE();
+(function() { 'use strict'; { using f = null; var f; } })
+
diff --git a/js/src/tests/test262/language/statements/using/shell.js b/js/src/tests/test262/language/statements/using/shell.js
index e69de29bb2d1d..0222d37d0d23d 100644
--- a/js/src/tests/test262/language/statements/using/shell.js
+++ b/js/src/tests/test262/language/statements/using/shell.js
@@ -0,0 +1,107 @@
+// GENERATED, DO NOT EDIT
+// file: asyncHelpers.js
+// Copyright (C) 2022 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+description: |
+    A collection of assertion and wrapper functions for testing asynchronous built-ins.
+defines: [asyncTest, assert.throwsAsync]
+---*/
+
+/**
+ * Defines the **sole** asynchronous test of a file.
+ * @see {@link ../docs/rfcs/async-helpers.md} for background.
+ *
+ * @param {Function} testFunc a callback whose returned promise indicates test results
+ *   (fulfillment for success, rejection for failure)
+ * @returns {void}
+ */
+function asyncTest(testFunc) {
+  if (!Object.prototype.hasOwnProperty.call(globalThis, "$DONE")) {
+    throw new Test262Error("asyncTest called without async flag");
+  }
+  if (typeof testFunc !== "function") {
+    $DONE(new Test262Error("asyncTest called with non-function argument"));
+    return;
+  }
+  try {
+    testFunc().then(
+      function () {
+        $DONE();
+      },
+      function (error) {
+        $DONE(error);
+      }
+    );
+  } catch (syncError) {
+    $DONE(syncError);
+  }
+}
+
+/**
+ * Asserts that a callback asynchronously throws an instance of a particular
+ * error (i.e., returns a promise whose rejection value is an object referencing
+ * the constructor).
+ *
+ * @param {Function} expectedErrorConstructor the expected constructor of the
+ *   rejection value
+ * @param {Function} func the callback
+ * @param {string} [message] the prefix to use for failure messages
+ * @returns {Promise<void>} fulfills if the expected error is thrown,
+ *   otherwise rejects
+ */
+assert.throwsAsync = function (expectedErrorConstructor, func, message) {
+  return new Promise(function (resolve) {
+    var fail = function (detail) {
+      if (message === undefined) {
+        throw new Test262Error(detail);
+      }
+      throw new Test262Error(message + " " + detail);
+    };
+    if (typeof expectedErrorConstructor !== "function") {
+      fail("assert.throwsAsync called with an argument that is not an error constructor");
+    }
+    if (typeof func !== "function") {
+      fail("assert.throwsAsync called with an argument that is not a function");
+    }
+    var expectedName = expectedErrorConstructor.name;
+    var expectation = "Expected a " + expectedName + " to be thrown asynchronously";
+    var res;
+    try {
+      res = func();
+    } catch (thrown) {
+      fail(expectation + " but the function threw synchronously");
+    }
+    if (res === null || typeof res !== "object" || typeof res.then !== "function") {
+      fail(expectation + " but result was not a thenable");
+    }
+    var onResFulfilled, onResRejected;
+    var resSettlementP = new Promise(function (onFulfilled, onRejected) {
+      onResFulfilled = onFulfilled;
+      onResRejected = onRejected;
+    });
+    try {
+      res.then(onResFulfilled, onResRejected)
+    } catch (thrown) {
+      fail(expectation + " but .then threw synchronously");
+    }
+    resolve(resSettlementP.then(
+      function () {
+        fail(expectation + " but no exception was thrown at all");
+      },
+      function (thrown) {
+        var actualName;
+        if (thrown === null || typeof thrown !== "object") {
+          fail(expectation + " but thrown value was not an object");
+        } else if (thrown.constructor !== expectedErrorConstructor) {
+          actualName = thrown.constructor.name;
+          if (expectedName === actualName) {
+            fail(expectation +
+              " but got a different error constructor with the same name");
+          }
+          fail(expectation + " but got a " + actualName);
+        }
+      }
+    ));
+  });
+};
diff --git a/js/src/tests/test262/language/statements/using/static-init-await-binding-invalid.js b/js/src/tests/test262/language/statements/using/static-init-await-binding-invalid.js
new file mode 100644
index 0000000000000..90bded496de92
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/static-init-await-binding-invalid.js
@@ -0,0 +1,28 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) error:SyntaxError -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-class-definitions-static-semantics-early-errors
+description: BindingIdentifier may not be `await` within class static blocks
+info: |
+  BindingIdentifier : Identifier
+
+  [...]
+  - It is a Syntax Error if the code matched by this production is nested,
+    directly or indirectly (but not crossing function or static initialization
+    block boundaries), within a ClassStaticBlock and the StringValue of
+    Identifier is "await".
+negative:
+  phase: parse
+  type: SyntaxError
+features: [class-static-block, explicit-resource-management]
+---*/
+
+$DONOTEVALUATE();
+
+class C {
+  static {
+    using await = null;
+  }
+}
diff --git a/js/src/tests/test262/language/statements/using/static-init-await-binding-valid.js b/js/src/tests/test262/language/statements/using/static-init-await-binding-valid.js
new file mode 100644
index 0000000000000..12a1137371b8b
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/static-init-await-binding-valid.js
@@ -0,0 +1,22 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-class-definitions-static-semantics-early-errors
+description: The `await` keyword is interpreted as an identifier within arrow function bodies
+info: |
+  ClassStaticBlockBody : ClassStaticBlockStatementList
+
+  [...]
+  - It is a Syntax Error if ContainsAwait of ClassStaticBlockStatementList is true.
+features: [class-static-block, explicit-resource-management]
+---*/
+
+class C {
+  static {
+    (() => { using await = null; });
+  }
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/syntax/using-invalid-switchstatement-caseclause.js b/js/src/tests/test262/language/statements/using/syntax/using-invalid-switchstatement-caseclause.js
new file mode 100644
index 0000000000000..c1f3dbda6ced9
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/syntax/using-invalid-switchstatement-caseclause.js
@@ -0,0 +1,25 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) error:SyntaxError -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2025 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-const-using-and-await-using-declarations-static-semantics-early-errors
+description: Disallowed in switch statement
+info: |
+  - It is a Syntax Error if the goal symbol is |Script| and |UsingDeclaration| is not contained, either directly or indirectly, within a |Block|, |ForStatement|, |ForInOfStatement|, |FunctionBody|, |GeneratorBody|, |AsyncGeneratorBody|, |AsyncFunctionBody|, or |ClassStaticBlockBody|.
+  - It is a Syntax Error if |UsingDeclaration| is contained directly within the |StatementList| of either a |CaseClause| or |DefaultClause|.
+
+negative:
+  phase: parse
+  type: SyntaxError
+
+features: [explicit-resource-management]
+---*/
+
+switch (0) {
+  case 0:
+    using _ = null;
+    break;
+}
+
+$DONOTEVALUATE();
diff --git a/js/src/tests/test262/language/statements/using/syntax/using-invalid-switchstatement-defaultclause.js b/js/src/tests/test262/language/statements/using/syntax/using-invalid-switchstatement-defaultclause.js
new file mode 100644
index 0000000000000..57036391ef07c
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/syntax/using-invalid-switchstatement-defaultclause.js
@@ -0,0 +1,25 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) error:SyntaxError -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2025 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-const-using-and-await-using-declarations-static-semantics-early-errors
+description: Disallowed in switch statement
+info: |
+  - It is a Syntax Error if the goal symbol is |Script| and |UsingDeclaration| is not contained, either directly or indirectly, within a |Block|, |ForStatement|, |ForInOfStatement|, |FunctionBody|, |GeneratorBody|, |AsyncGeneratorBody|, |AsyncFunctionBody|, or |ClassStaticBlockBody|.
+  - It is a Syntax Error if |UsingDeclaration| is contained directly within the |StatementList| of either a |CaseClause| or |DefaultClause|.
+
+negative:
+  phase: parse
+  type: SyntaxError
+
+features: [explicit-resource-management]
+---*/
+
+switch (0) {
+  default:
+    using _ = null;
+    break;
+}
+
+$DONOTEVALUATE();
diff --git a/js/src/tests/test262/language/statements/using/throws-error-as-is-if-only-one-error-during-disposal.js b/js/src/tests/test262/language/statements/using/throws-error-as-is-if-only-one-error-during-disposal.js
new file mode 100644
index 0000000000000..0bdf15aa50b54
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/throws-error-as-is-if-only-one-error-during-disposal.js
@@ -0,0 +1,55 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-disposeresources
+description: >
+  Rethrows an error as-is if it is the only error thrown during evaluation of subsequent statements following 'using'
+  or from disposal.
+info: |
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+features: [explicit-resource-management]
+---*/
+
+class MyError extends Error {}
+assert.throws(MyError, function () {
+  using _1 = { [Symbol.dispose]() { throw new MyError(); } };
+  using _2 = { [Symbol.dispose]() { } };
+});
+
+assert.throws(MyError, function () {
+  using _1 = { [Symbol.dispose]() { } };
+  using _2 = { [Symbol.dispose]() { throw new MyError(); } };
+});
+
+assert.throws(MyError, function () {
+  using _1 = { [Symbol.dispose]() { } };
+  using _2 = { [Symbol.dispose]() { } };
+  throw new MyError();
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/throws-if-initializer-Symbol.dispose-property-is-null.js b/js/src/tests/test262/language/statements/using/throws-if-initializer-Symbol.dispose-property-is-null.js
new file mode 100644
index 0000000000000..86645f73de04a
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/throws-if-initializer-Symbol.dispose-property-is-null.js
@@ -0,0 +1,75 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Throws if initialized value's Symbol.dispose property is null
+info: |
+  RS: Evaluation
+    UsingDeclaration : using BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument sync-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  2. Else,
+    ...
+  3. Append resource to disposeCapability.[[DisposableResourceStack]].
+  4. Return unused.
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      ...
+    b. Else,
+      i. If V is not an Object, throw a TypeError exception.
+      ii. Set method to ? GetDisposeMethod(V, hint).
+      iii. If method is undefined, throw a TypeError exception.
+  ...
+
+  GetDisposeMethod ( V, hint )
+
+  1. If hint is async-dispose, then
+    ...
+  2. Else,
+    a. Let method be ? GetMethod(V, @@dispose).
+  3. Return method.
+
+  GetMethod ( V, P )
+
+  1. Let func be ? GetV(V, P).
+  2. If func is either undefined or null, return undefined.
+  3. ...
+
+features: [explicit-resource-management]
+---*/
+
+assert.throws(TypeError, function () {
+    using x = { [Symbol.dispose]: null };
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/throws-if-initializer-Symbol.dispose-property-is-undefined.js b/js/src/tests/test262/language/statements/using/throws-if-initializer-Symbol.dispose-property-is-undefined.js
new file mode 100644
index 0000000000000..69910d04f38a9
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/throws-if-initializer-Symbol.dispose-property-is-undefined.js
@@ -0,0 +1,75 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Throws if initialized value's Symbol.dispose property is undefined
+info: |
+  RS: Evaluation
+    UsingDeclaration : using BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument sync-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  2. Else,
+    ...
+  3. Append resource to disposeCapability.[[DisposableResourceStack]].
+  4. Return unused.
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      ...
+    b. Else,
+      i. If V is not an Object, throw a TypeError exception.
+      ii. Set method to ? GetDisposeMethod(V, hint).
+      iii. If method is undefined, throw a TypeError exception.
+  ...
+
+  GetDisposeMethod ( V, hint )
+
+  1. If hint is async-dispose, then
+    ...
+  2. Else,
+    a. Let method be ? GetMethod(V, @@dispose).
+  3. Return method.
+
+  GetMethod ( V, P )
+
+  1. Let func be ? GetV(V, P).
+  2. If func is either undefined or null, return undefined.
+  3. ...
+
+features: [explicit-resource-management]
+---*/
+
+assert.throws(TypeError, function () {
+    using x = { [Symbol.dispose]: undefined };
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/throws-if-initializer-Symbol.dispose-property-not-callable.js b/js/src/tests/test262/language/statements/using/throws-if-initializer-Symbol.dispose-property-not-callable.js
new file mode 100644
index 0000000000000..ebd612e952d97
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/throws-if-initializer-Symbol.dispose-property-not-callable.js
@@ -0,0 +1,96 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Throws if initialized value's Symbol.dispose property is not callable
+info: |
+  RS: Evaluation
+    UsingDeclaration : using BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument sync-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  2. Else,
+    ...
+  3. Append resource to disposeCapability.[[DisposableResourceStack]].
+  4. Return unused.
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      i. Set V to undefined.
+      ii. Set method to undefined.
+    b. Else,
+      i. If V is not an Object, throw a TypeError exception.
+      ii. Set method to ? GetDisposeMethod(V, hint).
+      iii. If method is undefined, throw a TypeError exception.
+  2. Else,
+    ...
+  3. Return the DisposableResource Record { [[ResourceValue]]: V, [[Hint]]: hint, [[DisposeMethod]]: method }.
+
+  GetDisposeMethod ( V, hint )
+
+  1. If hint is async-dispose, then
+    ...
+  2. Else,
+    a. Let method be ? GetMethod(V, @@dispose).
+  3. Return method.
+
+  GetMethod ( V, P )
+
+  1. Let func be ? GetV(V, P).
+  2. If func is either undefined or null, return undefined.
+  3. If IsCallable(func) is false, throw a TypeError exception.
+  4. Return func.
+
+features: [explicit-resource-management]
+---*/
+
+assert.throws(TypeError, function() {
+  using x = { [Symbol.dispose]: true };
+}, 'true');
+
+assert.throws(TypeError, function() {
+  using x = { [Symbol.dispose]: false };
+}, 'false');
+
+assert.throws(TypeError, function() {
+  using x = { [Symbol.dispose]: 1 };
+}, 'number');
+
+assert.throws(TypeError, function() {
+  using x = { [Symbol.dispose]: 'object' };
+}, 'string');
+
+var s = Symbol();
+assert.throws(TypeError, function() {
+  using x = { [Symbol.dispose]: s };
+}, 'symbol');
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/throws-if-initializer-missing-Symbol.dispose.js b/js/src/tests/test262/language/statements/using/throws-if-initializer-missing-Symbol.dispose.js
new file mode 100644
index 0000000000000..0c2d8b29aaa88
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/throws-if-initializer-missing-Symbol.dispose.js
@@ -0,0 +1,68 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Throws if initialized value is missing Symbol.dispose property
+info: |
+  RS: Evaluation
+    UsingDeclaration : using BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument sync-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    BindingList : BindingList , LexicalBinding
+
+    1. Perform ? BindingEvaluation of BindingList with argument hint.
+    2. Perform ? BindingEvaluation of LexicalBinding with argument hint.
+    3. Return unused.
+
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    b. Let resource be ? CreateDisposableResource(V, hint).
+  3. Else,
+    ...
+  3. Append resource to disposeCapability.[[DisposableResourceStack]].
+  4. Return unused.
+
+  CreateDisposableResource ( V, hint [ , method ] )
+
+  1. If method is not present, then
+    a. If V is either null or undefined, then
+      ...
+    b. Else,
+      i. If V is not an Object, throw a TypeError exception.
+      ii. Set method to ? GetDisposeMethod(V, hint).
+      iii. If method is undefined, throw a TypeError exception.
+  ...
+
+
+features: [explicit-resource-management]
+---*/
+
+assert.throws(TypeError, function () {
+    using x = {};
+});
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/throws-suppressederror-if-multiple-errors-during-disposal.js b/js/src/tests/test262/language/statements/using/throws-suppressederror-if-multiple-errors-during-disposal.js
new file mode 100644
index 0000000000000..ccc76721154b8
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/throws-suppressederror-if-multiple-errors-during-disposal.js
@@ -0,0 +1,56 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-disposeresources
+description: >
+  Throws a nested hierarchy of SuppressedErrors if multiple errors were thrown during evaluation of subsequent statements following 'using'
+  and/or from disposal.
+info: |
+  DisposeResources ( disposeCapability, completion )
+
+  1. For each resource of disposeCapability.[[DisposableResourceStack]], in reverse list order, do
+    a. Let result be Dispose(resource.[[ResourceValue]], resource.[[Hint]], resource.[[DisposeMethod]]).
+    b. If result.[[Type]] is throw, then
+      i. If completion.[[Type]] is throw, then
+        1. Set result to result.[[Value]].
+        2. Let suppressed be completion.[[Value]].
+        3. Let error be a newly created SuppressedError object.
+        4. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "error", result).
+        5. Perform ! CreateNonEnumerableDataPropertyOrThrow(error, "suppressed", suppressed).
+        6. Set completion to ThrowCompletion(error).
+      ii. Else,
+        1. Set completion to result.
+  2. Return completion.
+
+  Dispose ( V, hint, method )
+
+  1. If method is undefined, let result be undefined.
+  2. Else, let result be ? Call(method, V).
+  3. If hint is async-dispose, then
+    a. Perform ? Await(result).
+  4. Return undefined.
+
+features: [explicit-resource-management]
+---*/
+
+class MyError extends Error {}
+const error1 = new MyError();
+const error2 = new MyError();
+const error3 = new MyError();
+
+try {
+  using _1 = { [Symbol.dispose]() { throw error1; } };
+  using _2 = { [Symbol.dispose]() { throw error2; } };
+  throw error3;
+}
+catch (e) {
+  assert(e instanceof SuppressedError, "Expected an SuppressedError to have been thrown");
+  assert.sameValue(e.error, error1, "Expected the outermost suppressing error to have been 'error1'");
+  assert(e.suppressed instanceof SuppressedError, "Expected the outermost suppressed error to have been a SuppressedError");
+  assert.sameValue(e.suppressed.error, error2, "Expected the innermost suppressing error to have been 'error2'");
+  assert.sameValue(e.suppressed.suppressed, error3, "Expected the innermost suppressed error to have been 'error3'");
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/using-allows-null-initializer.js b/js/src/tests/test262/language/statements/using/using-allows-null-initializer.js
new file mode 100644
index 0000000000000..a5fc324ee01a0
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/using-allows-null-initializer.js
@@ -0,0 +1,47 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Allows null in initializer of 'using'
+info: |
+  RS: Evaluation
+    UsingDeclaration : using BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument sync-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    ...
+  ...
+
+features: [explicit-resource-management]
+---*/
+
+{
+  using x = null;
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/language/statements/using/using-allows-undefined-initializer.js b/js/src/tests/test262/language/statements/using/using-allows-undefined-initializer.js
new file mode 100644
index 0000000000000..cd4851cf2abbe
--- /dev/null
+++ b/js/src/tests/test262/language/statements/using/using-allows-undefined-initializer.js
@@ -0,0 +1,47 @@
+// |reftest| shell-option(--enable-explicit-resource-management) skip-if(!(this.hasOwnProperty('getBuildConfiguration')&&getBuildConfiguration('explicit-resource-management'))||!xulRuntime.shell) -- explicit-resource-management is not enabled unconditionally, requires shell-options
+// Copyright (C) 2023 Ron Buckton. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
+description: Allows undefined in initializer of 'using'
+info: |
+  RS: Evaluation
+    UsingDeclaration : using BindingList ;
+
+    1. Perform ? BindingEvaluation of BindingList with argument sync-dispose.
+    2. Return empty.
+
+  RS: BindingEvaluation
+    LexicalBinding : BindingIdentifier Initializer
+
+    ...
+    5. Return ? InitializeReferencedBinding(lhs, value, hint).
+
+  InitializeReferencedBinding ( V, W )
+
+  ...
+  4. Return ? base.InitializeBinding(V.[[ReferencedName]], W).
+
+  InitializeBinding ( N, V, hint )
+
+  ...
+  2. If hint is not normal, perform ? AddDisposableResource(envRec.[[DisposeCapability]], V, hint).
+  ...
+
+  AddDisposableResource ( disposeCapability, V, hint [, method ] )
+
+  1. If method is not present then,
+    a. If V is either null or undefined and hint is sync-dispose, then
+      i. Return unused.
+    ...
+  ...
+
+features: [explicit-resource-management]
+---*/
+
+{
+  using x = undefined;
+}
+
+reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/calendar-date-add.js b/js/src/tests/test262/staging/Temporal/v8/calendar-date-add.js
deleted file mode 100644
index 6a5ebb4079204..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/calendar-date-add.js
+++ /dev/null
@@ -1,90 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from calendar-date-add test
-  in V8's mjsunit test calendar-date-add.js
-features: [Temporal]
----*/
-
-let p1y = new Temporal.Duration(1);
-let p4y = new Temporal.Duration(4);
-let p5m = new Temporal.Duration(0, 5);
-let p1y2m = new Temporal.Duration(1, 2);
-let p1y4d = new Temporal.Duration(1, 0, 0, 4);
-let p1y2m4d = new Temporal.Duration(1, 2, 0, 4);
-let p10d = new Temporal.Duration(0, 0, 0, 10);
-let p1w = new Temporal.Duration(0, 0, 1);
-let p6w = new Temporal.Duration(0, 0, 6);
-let p2w3d = new Temporal.Duration(0, 0, 2, 3);
-let p1y2w = new Temporal.Duration(1, 0, 2);
-let p2m3w = new Temporal.Duration(0, 2, 3);
-assert.sameValue(Temporal.PlainDate.from('2020-02-29').add(p1y).toJSON(), '2021-02-28');
-assert.sameValue(Temporal.PlainDate.from('2020-02-29').add(p4y).toJSON(), '2024-02-29');
-assert.sameValue(Temporal.PlainDate.from('2021-07-16').add(p1y).toJSON(), '2022-07-16');
-assert.sameValue(Temporal.PlainDate.from('2021-07-16').add(p5m).toJSON(), '2021-12-16');
-assert.sameValue(Temporal.PlainDate.from('2021-08-16').add(p5m).toJSON(), '2022-01-16');
-assert.sameValue(Temporal.PlainDate.from('2021-10-31').add(p5m).toJSON(), '2022-03-31');
-assert.sameValue(Temporal.PlainDate.from('2021-09-30').add(p5m).toJSON(), '2022-02-28');
-assert.sameValue(Temporal.PlainDate.from('2019-09-30').add(p5m).toJSON(), '2020-02-29');
-assert.sameValue(Temporal.PlainDate.from('2019-10-01').add(p5m).toJSON(), '2020-03-01');
-assert.sameValue(Temporal.PlainDate.from('2021-07-16').add(p1y2m).toJSON(), '2022-09-16');
-assert.sameValue(Temporal.PlainDate.from('2021-11-30').add(p1y2m).toJSON(), '2023-01-30');
-assert.sameValue(Temporal.PlainDate.from('2021-12-31').add(p1y2m).toJSON(), '2023-02-28');
-assert.sameValue(Temporal.PlainDate.from('2022-12-31').add(p1y2m).toJSON(), '2024-02-29');
-assert.sameValue(Temporal.PlainDate.from('2021-07-16').add(p1y4d).toJSON(), '2022-07-20');
-assert.sameValue(Temporal.PlainDate.from('2021-02-27').add(p1y4d).toJSON(), '2022-03-03');
-assert.sameValue(Temporal.PlainDate.from('2023-02-27').add(p1y4d).toJSON(), '2024-03-02');
-assert.sameValue(Temporal.PlainDate.from('2021-12-30').add(p1y4d).toJSON(), '2023-01-03');
-assert.sameValue(Temporal.PlainDate.from('2021-07-30').add(p1y4d).toJSON(), '2022-08-03');
-assert.sameValue(Temporal.PlainDate.from('2021-06-30').add(p1y4d).toJSON(), '2022-07-04');
-assert.sameValue(Temporal.PlainDate.from('2021-07-16').add(p1y2m4d).toJSON(), '2022-09-20');
-assert.sameValue(Temporal.PlainDate.from('2021-02-27').add(p1y2m4d).toJSON(), '2022-05-01');
-assert.sameValue(Temporal.PlainDate.from('2021-02-26').add(p1y2m4d).toJSON(), '2022-04-30');
-assert.sameValue(Temporal.PlainDate.from('2023-02-26').add(p1y2m4d).toJSON(), '2024-04-30');
-assert.sameValue(Temporal.PlainDate.from('2021-12-30').add(p1y2m4d).toJSON(), '2023-03-04');
-assert.sameValue(Temporal.PlainDate.from('2021-07-30').add(p1y2m4d).toJSON(), '2022-10-04');
-assert.sameValue(Temporal.PlainDate.from('2021-06-30').add(p1y2m4d).toJSON(), '2022-09-03');
-assert.sameValue(Temporal.PlainDate.from('2021-07-16').add(p10d).toJSON(), '2021-07-26');
-assert.sameValue(Temporal.PlainDate.from('2021-07-26').add(p10d).toJSON(), '2021-08-05');
-assert.sameValue(Temporal.PlainDate.from('2021-12-26').add(p10d).toJSON(), '2022-01-05');
-assert.sameValue(Temporal.PlainDate.from('2020-02-26').add(p10d).toJSON(), '2020-03-07');
-assert.sameValue(Temporal.PlainDate.from('2021-02-26').add(p10d).toJSON(), '2021-03-08');
-assert.sameValue(Temporal.PlainDate.from('2020-02-19').add(p10d).toJSON(), '2020-02-29');
-assert.sameValue(Temporal.PlainDate.from('2021-02-19').add(p10d).toJSON(), '2021-03-01');
-assert.sameValue(Temporal.PlainDate.from('2021-02-19').add(p1w).toJSON(), '2021-02-26');
-assert.sameValue(Temporal.PlainDate.from('2021-02-27').add(p1w).toJSON(), '2021-03-06');
-assert.sameValue(Temporal.PlainDate.from('2020-02-27').add(p1w).toJSON(), '2020-03-05');
-assert.sameValue(Temporal.PlainDate.from('2021-12-24').add(p1w).toJSON(), '2021-12-31');
-assert.sameValue(Temporal.PlainDate.from('2021-12-27').add(p1w).toJSON(), '2022-01-03');
-assert.sameValue(Temporal.PlainDate.from('2021-01-27').add(p1w).toJSON(), '2021-02-03');
-assert.sameValue(Temporal.PlainDate.from('2021-06-27').add(p1w).toJSON(), '2021-07-04');
-assert.sameValue(Temporal.PlainDate.from('2021-07-27').add(p1w).toJSON(), '2021-08-03');
-assert.sameValue(Temporal.PlainDate.from('2021-02-19').add(p6w).toJSON(), '2021-04-02');
-assert.sameValue(Temporal.PlainDate.from('2021-02-27').add(p6w).toJSON(), '2021-04-10');
-assert.sameValue(Temporal.PlainDate.from('2020-02-27').add(p6w).toJSON(), '2020-04-09');
-assert.sameValue(Temporal.PlainDate.from('2021-12-24').add(p6w).toJSON(), '2022-02-04');
-assert.sameValue(Temporal.PlainDate.from('2021-12-27').add(p6w).toJSON(), '2022-02-07');
-assert.sameValue(Temporal.PlainDate.from('2021-01-27').add(p6w).toJSON(), '2021-03-10');
-assert.sameValue(Temporal.PlainDate.from('2021-06-27').add(p6w).toJSON(), '2021-08-08');
-assert.sameValue(Temporal.PlainDate.from('2021-07-27').add(p6w).toJSON(), '2021-09-07');
-assert.sameValue(Temporal.PlainDate.from('2020-02-29').add(p2w3d).toJSON(), '2020-03-17');
-assert.sameValue(Temporal.PlainDate.from('2020-02-28').add(p2w3d).toJSON(), '2020-03-16');
-assert.sameValue(Temporal.PlainDate.from('2021-02-28').add(p2w3d).toJSON(), '2021-03-17');
-assert.sameValue(Temporal.PlainDate.from('2020-12-28').add(p2w3d).toJSON(), '2021-01-14');
-assert.sameValue(Temporal.PlainDate.from('2020-02-29').add(p1y2w).toJSON(), '2021-03-14');
-assert.sameValue(Temporal.PlainDate.from('2020-02-28').add(p1y2w).toJSON(), '2021-03-14');
-assert.sameValue(Temporal.PlainDate.from('2021-02-28').add(p1y2w).toJSON(), '2022-03-14');
-assert.sameValue(Temporal.PlainDate.from('2020-12-28').add(p1y2w).toJSON(), '2022-01-11');
-assert.sameValue(Temporal.PlainDate.from('2020-02-29').add(p2m3w).toJSON(), '2020-05-20');
-assert.sameValue(Temporal.PlainDate.from('2020-02-28').add(p2m3w).toJSON(), '2020-05-19');
-assert.sameValue(Temporal.PlainDate.from('2021-02-28').add(p2m3w).toJSON(), '2021-05-19');
-assert.sameValue(Temporal.PlainDate.from('2020-12-28').add(p2m3w).toJSON(), '2021-03-21');
-assert.sameValue(Temporal.PlainDate.from('2019-12-28').add(p2m3w).toJSON(), '2020-03-20');
-assert.sameValue(Temporal.PlainDate.from('2019-10-28').add(p2m3w).toJSON(), '2020-01-18');
-assert.sameValue(Temporal.PlainDate.from('2019-10-31').add(p2m3w).toJSON(), '2020-01-21');
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/calendar-date-from-fields.js b/js/src/tests/test262/staging/Temporal/v8/calendar-date-from-fields.js
deleted file mode 100644
index 27df5f096a0c3..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/calendar-date-from-fields.js
+++ /dev/null
@@ -1,428 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from calendar-date-from-fields test
-  in V8's mjsunit test calendar-date-from-fields.js
-features: [Temporal]
----*/
-
-assert.throws(TypeError, () => Temporal.PlainDate.from());
-[
-  undefined,
-  true,
-  false,
-  123,
-  456n,
-  Symbol(),
-  123.456,
-  NaN,
-  null
-].forEach(function (fields) {
-  assert.throws(TypeError, () => Temporal.PlainDate.from(fields));
-  assert.throws(TypeError, () => Temporal.PlainDate.from(fields, undefined));
-  assert.throws(TypeError, () => Temporal.PlainDate.from(fields, { overflow: 'constrain' }));
-  assert.throws(TypeError, () => Temporal.PlainDate.from(fields, { overflow: 'reject' }));
-});
-assert.throws(RangeError, () => Temporal.PlainDate.from('string'));
-assert.throws(RangeError, () => Temporal.PlainDate.from('string', undefined));
-assert.throws(RangeError, () => Temporal.PlainDate.from('string', { overflow: 'constrain' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from('string', { overflow: 'reject' }));
-assert.throws(TypeError, () => Temporal.PlainDate.from({
-  month: 1,
-  day: 17
-}));
-assert.throws(TypeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  day: 17
-}));
-assert.throws(TypeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 12
-}));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'm1',
-  day: 17
-}));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M1',
-  day: 17
-}));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'm01',
-  day: 17
-}));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 12,
-  monthCode: 'M11',
-  day: 17
-}));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M00',
-  day: 17
-}));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M19',
-  day: 17
-}));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M99',
-  day: 17
-}));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M13',
-  day: 17
-}));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: -1,
-  day: 17
-}));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: -Infinity,
-  day: 17
-}));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 7,
-  day: -17
-}));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 7,
-  day: -Infinity
-}));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 12,
-  day: 0
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 12,
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 1,
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 2,
-  day: 29
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 6,
-  day: 31
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 9,
-  day: 31
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 0,
-  day: 5
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 13,
-  day: 5
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M12',
-  day: 0
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M12',
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M01',
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M02',
-  day: 29
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M06',
-  day: 31
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M09',
-  day: 31
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M00',
-  day: 5
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M13',
-  day: 5
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 12,
-  day: 0
-}));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 0,
-  day: 3
-}));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 7,
-  day: 13
-}, { overflow: 'invalid' }));
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  month: 7,
-  day: 15
-}).toJSON(), '2021-07-15');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  month: 7,
-  day: 3
-}).toJSON(), '2021-07-03');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  month: 12,
-  day: 31
-}).toJSON(), '2021-12-31');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M07',
-  day: 15
-}).toJSON(), '2021-07-15');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M07',
-  day: 3
-}).toJSON(), '2021-07-03');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M12',
-  day: 31
-}).toJSON(), '2021-12-31');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  month: 1,
-  day: 133
-}).toJSON(), '2021-01-31');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  month: 2,
-  day: 133
-}).toJSON(), '2021-02-28');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  month: 3,
-  day: 9033
-}).toJSON(), '2021-03-31');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  month: 4,
-  day: 50
-}).toJSON(), '2021-04-30');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  month: 5,
-  day: 77
-}).toJSON(), '2021-05-31');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  month: 6,
-  day: 33
-}).toJSON(), '2021-06-30');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  month: 7,
-  day: 33
-}).toJSON(), '2021-07-31');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  month: 8,
-  day: 300
-}).toJSON(), '2021-08-31');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  month: 9,
-  day: 400
-}).toJSON(), '2021-09-30');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  month: 10,
-  day: 400
-}).toJSON(), '2021-10-31');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  month: 11,
-  day: 400
-}).toJSON(), '2021-11-30');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  month: 12,
-  day: 500
-}).toJSON(), '2021-12-31');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  month: 13,
-  day: 500
-}).toJSON(), '2021-12-31');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  month: 999999,
-  day: 500
-}).toJSON(), '2021-12-31');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M01',
-  day: 133
-}).toJSON(), '2021-01-31');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M02',
-  day: 133
-}).toJSON(), '2021-02-28');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M03',
-  day: 9033
-}).toJSON(), '2021-03-31');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M04',
-  day: 50
-}).toJSON(), '2021-04-30');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M05',
-  day: 77
-}).toJSON(), '2021-05-31');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M06',
-  day: 33
-}).toJSON(), '2021-06-30');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M07',
-  day: 33
-}).toJSON(), '2021-07-31');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M08',
-  day: 300
-}).toJSON(), '2021-08-31');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M09',
-  day: 400
-}).toJSON(), '2021-09-30');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M10',
-  day: 400
-}).toJSON(), '2021-10-31');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M11',
-  day: 400
-}).toJSON(), '2021-11-30');
-assert.sameValue(Temporal.PlainDate.from({
-  year: 2021,
-  monthCode: 'M12',
-  day: 500
-}).toJSON(), '2021-12-31');
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 1,
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 2,
-  day: 29
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 3,
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 4,
-  day: 31
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 5,
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 6,
-  day: 31
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 7,
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 8,
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 9,
-  day: 31
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 10,
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 11,
-  day: 31
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 12,
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 2021,
-  month: 13,
-  day: 5
-}, { overflow: 'reject' }));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/calendar-date-until.js b/js/src/tests/test262/staging/Temporal/v8/calendar-date-until.js
deleted file mode 100644
index 52b78bacd640c..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/calendar-date-until.js
+++ /dev/null
@@ -1,159 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from calendar-date-until test
-  in V8's mjsunit test calendar-date-until.js
-features: [Temporal]
----*/
-
-[
-  'hour',
-  'minute',
-  'second',
-  'millisecond',
-  'microsecond',
-  'nanosecond'
-].forEach(function (largestUnit) {
-  assert.throws(RangeError, () => Temporal.PlainDate.from('2021-07-16').until('2021-07-17', { largestUnit }));
-});
-assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-07-16').toJSON(), 'PT0S');
-assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-07-17').toJSON(), 'P1D');
-assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-08-17').toJSON(), 'P32D');
-assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-09-16').toJSON(), 'P62D');
-assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2022-07-16').toJSON(), 'P365D');
-assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2031-07-16').toJSON(), 'P3652D');
-assert.sameValue(Temporal.PlainDate.from('2021-07-17').until('2021-07-16').toJSON(), '-P1D');
-assert.sameValue(Temporal.PlainDate.from('2021-08-17').until('2021-07-16').toJSON(), '-P32D');
-assert.sameValue(Temporal.PlainDate.from('2021-09-16').until('2021-07-16').toJSON(), '-P62D');
-assert.sameValue(Temporal.PlainDate.from('2022-07-16').until('2021-07-16').toJSON(), '-P365D');
-assert.sameValue(Temporal.PlainDate.from('2031-07-16').until('2021-07-16').toJSON(), '-P3652D');
-[
-  'day',
-  'days'
-].forEach(function (largestUnit) {
-  let opt = { largestUnit };
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-07-16', opt).toJSON(), 'PT0S');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-07-17', opt).toJSON(), 'P1D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-08-17', opt).toJSON(), 'P32D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-09-16', opt).toJSON(), 'P62D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2022-07-16', opt).toJSON(), 'P365D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2031-07-16', opt).toJSON(), 'P3652D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-17').until('2021-07-16', opt).toJSON(), '-P1D');
-  assert.sameValue(Temporal.PlainDate.from('2021-08-17').until('2021-07-16', opt).toJSON(), '-P32D');
-  assert.sameValue(Temporal.PlainDate.from('2021-09-16').until('2021-07-16', opt).toJSON(), '-P62D');
-  assert.sameValue(Temporal.PlainDate.from('2022-07-16').until('2021-07-16', opt).toJSON(), '-P365D');
-  assert.sameValue(Temporal.PlainDate.from('2031-07-16').until('2021-07-16', opt).toJSON(), '-P3652D');
-});
-[
-  'week',
-  'weeks'
-].forEach(function (largestUnit) {
-  let opt = { largestUnit };
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-07-16', opt).toJSON(), 'PT0S');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-07-17', opt).toJSON(), 'P1D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-07-23', opt).toJSON(), 'P1W');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-08-17', opt).toJSON(), 'P4W4D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-08-13', opt).toJSON(), 'P4W');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-09-16', opt).toJSON(), 'P8W6D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2022-07-16', opt).toJSON(), 'P52W1D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2031-07-16', opt).toJSON(), 'P521W5D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-17').until('2021-07-16', opt).toJSON(), '-P1D');
-  assert.sameValue(Temporal.PlainDate.from('2021-08-17').until('2021-07-16', opt).toJSON(), '-P4W4D');
-  assert.sameValue(Temporal.PlainDate.from('2021-08-13').until('2021-07-16', opt).toJSON(), '-P4W');
-  assert.sameValue(Temporal.PlainDate.from('2021-09-16').until('2021-07-16', opt).toJSON(), '-P8W6D');
-  assert.sameValue(Temporal.PlainDate.from('2022-07-16').until('2021-07-16', opt).toJSON(), '-P52W1D');
-  assert.sameValue(Temporal.PlainDate.from('2031-07-16').until('2021-07-16', opt).toJSON(), '-P521W5D');
-});
-[
-  'month',
-  'months'
-].forEach(function (largestUnit) {
-  let opt = { largestUnit };
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-07-16', opt).toJSON(), 'PT0S');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-07-17', opt).toJSON(), 'P1D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-07-23', opt).toJSON(), 'P7D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-08-16', opt).toJSON(), 'P1M');
-  assert.sameValue(Temporal.PlainDate.from('2020-12-16').until('2021-01-16', opt).toJSON(), 'P1M');
-  assert.sameValue(Temporal.PlainDate.from('2021-01-05').until('2021-02-05', opt).toJSON(), 'P1M');
-  assert.sameValue(Temporal.PlainDate.from('2021-01-07').until('2021-03-07', opt).toJSON(), 'P2M');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-08-17', opt).toJSON(), 'P1M1D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-08-13', opt).toJSON(), 'P28D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-09-16', opt).toJSON(), 'P2M');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2022-07-16', opt).toJSON(), 'P12M');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2031-07-16', opt).toJSON(), 'P120M');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-17').until('2021-07-16', opt).toJSON(), '-P1D');
-  assert.sameValue(Temporal.PlainDate.from('2021-08-17').until('2021-07-16', opt).toJSON(), '-P1M1D');
-  assert.sameValue(Temporal.PlainDate.from('2021-08-13').until('2021-07-16', opt).toJSON(), '-P28D');
-  assert.sameValue(Temporal.PlainDate.from('2021-08-16').until('2021-07-16', opt).toJSON(), '-P1M');
-  assert.sameValue(Temporal.PlainDate.from('2021-08-16').until('2021-07-13', opt).toJSON(), '-P1M3D');
-  assert.sameValue(Temporal.PlainDate.from('2021-09-16').until('2021-07-16', opt).toJSON(), '-P2M');
-  assert.sameValue(Temporal.PlainDate.from('2021-09-21').until('2021-07-16', opt).toJSON(), '-P2M5D');
-  assert.sameValue(Temporal.PlainDate.from('2022-07-16').until('2021-07-16', opt).toJSON(), '-P12M');
-  assert.sameValue(Temporal.PlainDate.from('2022-07-17').until('2021-07-16', opt).toJSON(), '-P12M1D');
-  assert.sameValue(Temporal.PlainDate.from('2031-07-16').until('2021-07-16', opt).toJSON(), '-P120M');
-});
-[
-  'year',
-  'years'
-].forEach(function (largestUnit) {
-  let opt = { largestUnit };
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-07-16', opt).toJSON(), 'PT0S');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-07-17', opt).toJSON(), 'P1D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-07-23', opt).toJSON(), 'P7D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-08-16', opt).toJSON(), 'P1M');
-  assert.sameValue(Temporal.PlainDate.from('2020-12-16').until('2021-01-16', opt).toJSON(), 'P1M');
-  assert.sameValue(Temporal.PlainDate.from('2021-01-05').until('2021-02-05', opt).toJSON(), 'P1M');
-  assert.sameValue(Temporal.PlainDate.from('2021-01-07').until('2021-03-07', opt).toJSON(), 'P2M');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-08-17', opt).toJSON(), 'P1M1D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-08-13', opt).toJSON(), 'P28D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2021-09-16', opt).toJSON(), 'P2M');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2022-07-16', opt).toJSON(), 'P1Y');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2022-07-19', opt).toJSON(), 'P1Y3D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2022-09-19', opt).toJSON(), 'P1Y2M3D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2031-07-16', opt).toJSON(), 'P10Y');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('2031-12-16', opt).toJSON(), 'P10Y5M');
-  assert.sameValue(Temporal.PlainDate.from('1997-12-16').until('2021-07-16', opt).toJSON(), 'P23Y7M');
-  assert.sameValue(Temporal.PlainDate.from('1997-07-16').until('2021-07-16', opt).toJSON(), 'P24Y');
-  assert.sameValue(Temporal.PlainDate.from('1997-07-16').until('2021-07-15', opt).toJSON(), 'P23Y11M29D');
-  assert.sameValue(Temporal.PlainDate.from('1997-06-16').until('2021-06-15', opt).toJSON(), 'P23Y11M30D');
-  assert.sameValue(Temporal.PlainDate.from('1960-02-16').until('2020-03-16', opt).toJSON(), 'P60Y1M');
-  assert.sameValue(Temporal.PlainDate.from('1960-02-16').until('2021-03-15', opt).toJSON(), 'P61Y27D');
-  assert.sameValue(Temporal.PlainDate.from('1960-02-16').until('2020-03-15', opt).toJSON(), 'P60Y28D');
-  assert.sameValue(Temporal.PlainDate.from('2021-03-30').until('2021-07-16', opt).toJSON(), 'P3M16D');
-  assert.sameValue(Temporal.PlainDate.from('2020-03-30').until('2021-07-16', opt).toJSON(), 'P1Y3M16D');
-  assert.sameValue(Temporal.PlainDate.from('1960-03-30').until('2021-07-16', opt).toJSON(), 'P61Y3M16D');
-  assert.sameValue(Temporal.PlainDate.from('2019-12-30').until('2021-07-16', opt).toJSON(), 'P1Y6M16D');
-  assert.sameValue(Temporal.PlainDate.from('2020-12-30').until('2021-07-16', opt).toJSON(), 'P6M16D');
-  assert.sameValue(Temporal.PlainDate.from('1997-12-30').until('2021-07-16', opt).toJSON(), 'P23Y6M16D');
-  assert.sameValue(Temporal.PlainDate.from('0001-12-25').until('2021-07-16', opt).toJSON(), 'P2019Y6M21D');
-  assert.sameValue(Temporal.PlainDate.from('2019-12-30').until('2021-03-05', opt).toJSON(), 'P1Y2M5D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-17').until('2021-07-16', opt).toJSON(), '-P1D');
-  assert.sameValue(Temporal.PlainDate.from('2021-08-17').until('2021-07-16', opt).toJSON(), '-P1M1D');
-  assert.sameValue(Temporal.PlainDate.from('2021-08-13').until('2021-07-16', opt).toJSON(), '-P28D');
-  assert.sameValue(Temporal.PlainDate.from('2021-08-16').until('2021-07-16', opt).toJSON(), '-P1M');
-  assert.sameValue(Temporal.PlainDate.from('2021-08-16').until('2021-07-13', opt).toJSON(), '-P1M3D');
-  assert.sameValue(Temporal.PlainDate.from('2021-09-16').until('2021-07-16', opt).toJSON(), '-P2M');
-  assert.sameValue(Temporal.PlainDate.from('2021-09-21').until('2021-07-16', opt).toJSON(), '-P2M5D');
-  assert.sameValue(Temporal.PlainDate.from('2022-07-16').until('2021-07-16', opt).toJSON(), '-P1Y');
-  assert.sameValue(Temporal.PlainDate.from('2022-07-17').until('2021-07-16', opt).toJSON(), '-P1Y1D');
-  assert.sameValue(Temporal.PlainDate.from('2022-10-17').until('2021-07-16', opt).toJSON(), '-P1Y3M1D');
-  assert.sameValue(Temporal.PlainDate.from('2031-07-16').until('2021-07-16', opt).toJSON(), '-P10Y');
-  assert.sameValue(Temporal.PlainDate.from('2032-07-16').until('2021-08-16', opt).toJSON(), '-P10Y11M');
-  assert.sameValue(Temporal.PlainDate.from('2031-12-16').until('2021-07-16', opt).toJSON(), '-P10Y5M');
-  assert.sameValue(Temporal.PlainDate.from('2011-07-16').until('1997-12-16', opt).toJSON(), '-P13Y7M');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('1997-07-16', opt).toJSON(), '-P24Y');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-15').until('1997-07-16', opt).toJSON(), '-P23Y11M30D');
-  assert.sameValue(Temporal.PlainDate.from('2021-06-15').until('1997-06-16', opt).toJSON(), '-P23Y11M29D');
-  assert.sameValue(Temporal.PlainDate.from('2020-03-16').until('1960-02-16', opt).toJSON(), '-P60Y1M');
-  assert.sameValue(Temporal.PlainDate.from('2021-03-15').until('1960-02-16', opt).toJSON(), '-P61Y28D');
-  assert.sameValue(Temporal.PlainDate.from('2020-03-15').until('1960-02-16', opt).toJSON(), '-P60Y28D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('1960-03-30', opt).toJSON(), '-P61Y3M17D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('0001-12-25', opt).toJSON(), '-P2019Y6M22D');
-  assert.sameValue(Temporal.PlainDate.from('2021-07-16').until('1997-12-30', opt).toJSON(), '-P23Y6M17D');
-});
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/calendar-day-of-year.js b/js/src/tests/test262/staging/Temporal/v8/calendar-day-of-year.js
deleted file mode 100644
index 48929bd405b78..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/calendar-day-of-year.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from calendar-day-of-year test
-  in V8's mjsunit test calendar-day-of-year.js
-features: [Temporal]
----*/
-
-assert.sameValue((new Temporal.PlainDate(1970, 1, 1)).dayOfYear, 1);
-assert.sameValue((new Temporal.PlainDate(2000, 1, 1)).dayOfYear, 1);
-assert.sameValue((new Temporal.PlainDate(2021, 1, 15)).dayOfYear, 15);
-assert.sameValue((new Temporal.PlainDate(2020, 2, 15)).dayOfYear, 46);
-assert.sameValue((new Temporal.PlainDate(2000, 2, 15)).dayOfYear, 46);
-assert.sameValue((new Temporal.PlainDate(2020, 3, 15)).dayOfYear, 75);
-assert.sameValue((new Temporal.PlainDate(2000, 3, 15)).dayOfYear, 75);
-assert.sameValue((new Temporal.PlainDate(2001, 3, 15)).dayOfYear, 74);
-assert.sameValue((new Temporal.PlainDate(2000, 12, 31)).dayOfYear, 366);
-assert.sameValue((new Temporal.PlainDate(2001, 12, 31)).dayOfYear, 365);
-assert.sameValue((new Temporal.PlainDateTime(1997, 1, 23, 5, 30, 13)).dayOfYear, 23);
-assert.sameValue((new Temporal.PlainDateTime(1997, 2, 23, 5, 30, 13)).dayOfYear, 54);
-assert.sameValue((new Temporal.PlainDateTime(1996, 3, 23, 5, 30, 13)).dayOfYear, 83);
-assert.sameValue((new Temporal.PlainDateTime(1997, 3, 23, 5, 30, 13)).dayOfYear, 82);
-assert.sameValue((new Temporal.PlainDateTime(1997, 12, 31, 5, 30, 13)).dayOfYear, 365);
-assert.sameValue((new Temporal.PlainDateTime(1996, 12, 31, 5, 30, 13)).dayOfYear, 366);
-assert.sameValue(Temporal.PlainDate.from('2019-01-18').dayOfYear, 18);
-assert.sameValue(Temporal.PlainDate.from('2020-02-18').dayOfYear, 49);
-assert.sameValue(Temporal.PlainDate.from('2019-12-31').dayOfYear, 365);
-assert.sameValue(Temporal.PlainDate.from('2000-12-31').dayOfYear, 366);
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/calendar-days-in-month.js b/js/src/tests/test262/staging/Temporal/v8/calendar-days-in-month.js
deleted file mode 100644
index 6875825b99d07..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/calendar-days-in-month.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from calendar-days-in-month test
-  in V8's mjsunit test calendar-days-in-month.js
-features: [Temporal]
----*/
-
-assert.sameValue((new Temporal.PlainDate(2021, 1, 15)).daysInMonth, 31);
-assert.sameValue((new Temporal.PlainDate(2020, 2, 15)).daysInMonth, 29);
-assert.sameValue((new Temporal.PlainDate(2000, 2, 15)).daysInMonth, 29);
-assert.sameValue((new Temporal.PlainDate(2021, 2, 15)).daysInMonth, 28);
-assert.sameValue((new Temporal.PlainDate(2021, 3, 15)).daysInMonth, 31);
-assert.sameValue((new Temporal.PlainDate(2021, 4, 15)).daysInMonth, 30);
-assert.sameValue((new Temporal.PlainDate(2021, 5, 15)).daysInMonth, 31);
-assert.sameValue((new Temporal.PlainDate(2021, 6, 15)).daysInMonth, 30);
-assert.sameValue((new Temporal.PlainDate(2021, 7, 15)).daysInMonth, 31);
-assert.sameValue((new Temporal.PlainDate(2021, 8, 15)).daysInMonth, 31);
-assert.sameValue((new Temporal.PlainDate(2021, 9, 15)).daysInMonth, 30);
-assert.sameValue((new Temporal.PlainDate(2021, 10, 15)).daysInMonth, 31);
-assert.sameValue((new Temporal.PlainDate(2021, 11, 15)).daysInMonth, 30);
-assert.sameValue((new Temporal.PlainDate(2021, 12, 15)).daysInMonth, 31);
-assert.sameValue((new Temporal.PlainDateTime(1997, 1, 23, 5, 30, 13)).daysInMonth, 31);
-assert.sameValue((new Temporal.PlainDateTime(1996, 2, 23, 5, 30, 13)).daysInMonth, 29);
-assert.sameValue((new Temporal.PlainDateTime(2000, 2, 23, 5, 30, 13)).daysInMonth, 29);
-assert.sameValue((new Temporal.PlainDateTime(1997, 2, 23, 5, 30, 13)).daysInMonth, 28);
-assert.sameValue((new Temporal.PlainDateTime(1997, 3, 23, 5, 30, 13)).daysInMonth, 31);
-assert.sameValue((new Temporal.PlainDateTime(1997, 4, 23, 5, 30, 13)).daysInMonth, 30);
-assert.sameValue((new Temporal.PlainDateTime(1997, 5, 23, 5, 30, 13)).daysInMonth, 31);
-assert.sameValue((new Temporal.PlainDateTime(1997, 6, 23, 5, 30, 13)).daysInMonth, 30);
-assert.sameValue((new Temporal.PlainDateTime(1997, 7, 23, 5, 30, 13)).daysInMonth, 31);
-assert.sameValue((new Temporal.PlainDateTime(1997, 8, 23, 5, 30, 13)).daysInMonth, 31);
-assert.sameValue((new Temporal.PlainDateTime(1997, 9, 23, 5, 30, 13)).daysInMonth, 30);
-assert.sameValue((new Temporal.PlainDateTime(1997, 10, 23, 5, 30, 13)).daysInMonth, 31);
-assert.sameValue((new Temporal.PlainDateTime(1997, 11, 23, 5, 30, 13)).daysInMonth, 30);
-assert.sameValue((new Temporal.PlainDateTime(1997, 12, 23, 5, 30, 13)).daysInMonth, 31);
-assert.sameValue(Temporal.PlainDate.from('2019-01-18').daysInMonth, 31);
-assert.sameValue(Temporal.PlainDate.from('2020-02-18').daysInMonth, 29);
-assert.sameValue(Temporal.PlainDate.from('2019-02-18').daysInMonth, 28);
-assert.sameValue(Temporal.PlainDate.from('2019-03-18').daysInMonth, 31);
-assert.sameValue(Temporal.PlainDate.from('2019-04-18').daysInMonth, 30);
-assert.sameValue(Temporal.PlainDate.from('2019-05-18').daysInMonth, 31);
-assert.sameValue(Temporal.PlainDate.from('2019-06-18').daysInMonth, 30);
-assert.sameValue(Temporal.PlainDate.from('2019-07-18').daysInMonth, 31);
-assert.sameValue(Temporal.PlainDate.from('2019-08-18').daysInMonth, 31);
-assert.sameValue(Temporal.PlainDate.from('2019-09-18').daysInMonth, 30);
-assert.sameValue(Temporal.PlainDate.from('2019-10-18').daysInMonth, 31);
-assert.sameValue(Temporal.PlainDate.from('2019-11-18').daysInMonth, 30);
-assert.sameValue(Temporal.PlainDate.from('2019-12-18').daysInMonth, 31);
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/calendar-days-in-week.js b/js/src/tests/test262/staging/Temporal/v8/calendar-days-in-week.js
deleted file mode 100644
index 4d93610c2ff11..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/calendar-days-in-week.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from calendar-days-in-week test
-  in V8's mjsunit test calendar-days-in-week.js
-features: [Temporal]
----*/
-
-assert.sameValue((new Temporal.PlainDate(2021, 7, 15)).daysInWeek, 7);
-assert.sameValue((new Temporal.PlainDateTime(1997, 8, 23, 5, 30, 13)).daysInWeek, 7);
-assert.sameValue(Temporal.PlainDate.from('2019-03-18').daysInWeek, 7);
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/calendar-days-in-year.js b/js/src/tests/test262/staging/Temporal/v8/calendar-days-in-year.js
deleted file mode 100644
index 7a89129d487da..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/calendar-days-in-year.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from calendar-days-in-year test
-  in V8's mjsunit test calendar-days-in-year.js
-features: [Temporal]
----*/
-
-assert.sameValue((new Temporal.PlainDate(1995, 7, 15)).daysInYear, 365);
-assert.sameValue((new Temporal.PlainDate(1996, 7, 15)).daysInYear, 366);
-assert.sameValue((new Temporal.PlainDate(1997, 7, 15)).daysInYear, 365);
-assert.sameValue((new Temporal.PlainDate(1998, 7, 15)).daysInYear, 365);
-assert.sameValue((new Temporal.PlainDate(1999, 7, 15)).daysInYear, 365);
-assert.sameValue((new Temporal.PlainDate(2000, 7, 15)).daysInYear, 366);
-assert.sameValue((new Temporal.PlainDate(2001, 7, 15)).daysInYear, 365);
-assert.sameValue((new Temporal.PlainDate(2002, 7, 15)).daysInYear, 365);
-assert.sameValue((new Temporal.PlainDate(2003, 7, 15)).daysInYear, 365);
-assert.sameValue((new Temporal.PlainDate(2004, 7, 15)).daysInYear, 366);
-assert.sameValue((new Temporal.PlainDate(2005, 7, 15)).daysInYear, 365);
-assert.sameValue((new Temporal.PlainDateTime(1995, 8, 23, 5, 30, 13)).daysInYear, 365);
-assert.sameValue((new Temporal.PlainDateTime(1996, 8, 23, 5, 30, 13)).daysInYear, 366);
-assert.sameValue((new Temporal.PlainDateTime(1997, 8, 23, 5, 30, 13)).daysInYear, 365);
-assert.sameValue((new Temporal.PlainDateTime(1998, 8, 23, 5, 30, 13)).daysInYear, 365);
-assert.sameValue((new Temporal.PlainDateTime(1999, 8, 23, 5, 30, 13)).daysInYear, 365);
-assert.sameValue((new Temporal.PlainDateTime(2000, 8, 23, 5, 30, 13)).daysInYear, 366);
-assert.sameValue((new Temporal.PlainDateTime(2001, 8, 23, 5, 30, 13)).daysInYear, 365);
-assert.sameValue((new Temporal.PlainDateTime(2002, 8, 23, 5, 30, 13)).daysInYear, 365);
-assert.sameValue((new Temporal.PlainDateTime(2003, 8, 23, 5, 30, 13)).daysInYear, 365);
-assert.sameValue((new Temporal.PlainDateTime(2004, 8, 23, 5, 30, 13)).daysInYear, 366);
-assert.sameValue((new Temporal.PlainDateTime(2005, 8, 23, 5, 30, 13)).daysInYear, 365);
-assert.sameValue(Temporal.PlainDate.from('2019-03-18').daysInYear, 365);
-assert.sameValue(Temporal.PlainDate.from('2020-03-18').daysInYear, 366);
-assert.sameValue(Temporal.PlainDate.from('2021-03-18').daysInYear, 365);
-assert.sameValue(Temporal.PlainDate.from('2022-03-18').daysInYear, 365);
-assert.sameValue(Temporal.PlainDate.from('2023-03-18').daysInYear, 365);
-assert.sameValue(Temporal.PlainDate.from('2024-03-18').daysInYear, 366);
-assert.sameValue(Temporal.PlainDate.from('2025-03-18').daysInYear, 365);
-assert.sameValue(Temporal.PlainDate.from('2026-03-18').daysInYear, 365);
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/calendar-in-leap-year.js b/js/src/tests/test262/staging/Temporal/v8/calendar-in-leap-year.js
deleted file mode 100644
index 5d356f58aab18..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/calendar-in-leap-year.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from calendar-in-leap-year test
-  in V8's mjsunit test calendar-in-leap-year.js
-features: [Temporal]
----*/
-
-assert.sameValue((new Temporal.PlainDate(1995, 7, 15)).inLeapYear, false);
-assert.sameValue((new Temporal.PlainDate(1996, 7, 15)).inLeapYear, true);
-assert.sameValue((new Temporal.PlainDate(1997, 7, 15)).inLeapYear, false);
-assert.sameValue((new Temporal.PlainDate(1998, 7, 15)).inLeapYear, false);
-assert.sameValue((new Temporal.PlainDate(1999, 7, 15)).inLeapYear, false);
-assert.sameValue((new Temporal.PlainDate(2000, 7, 15)).inLeapYear, true);
-assert.sameValue((new Temporal.PlainDate(2001, 7, 15)).inLeapYear, false);
-assert.sameValue((new Temporal.PlainDate(2002, 7, 15)).inLeapYear, false);
-assert.sameValue((new Temporal.PlainDate(2003, 7, 15)).inLeapYear, false);
-assert.sameValue((new Temporal.PlainDate(2004, 7, 15)).inLeapYear, true);
-assert.sameValue((new Temporal.PlainDate(2005, 7, 15)).inLeapYear, false);
-assert.sameValue((new Temporal.PlainDateTime(1995, 8, 23, 5, 30, 13)).inLeapYear, false);
-assert.sameValue((new Temporal.PlainDateTime(1996, 8, 23, 5, 30, 13)).inLeapYear, true);
-assert.sameValue((new Temporal.PlainDateTime(1997, 8, 23, 5, 30, 13)).inLeapYear, false);
-assert.sameValue((new Temporal.PlainDateTime(1998, 8, 23, 5, 30, 13)).inLeapYear, false);
-assert.sameValue((new Temporal.PlainDateTime(1999, 8, 23, 5, 30, 13)).inLeapYear, false);
-assert.sameValue((new Temporal.PlainDateTime(2000, 8, 23, 5, 30, 13)).inLeapYear, true);
-assert.sameValue((new Temporal.PlainDateTime(2001, 8, 23, 5, 30, 13)).inLeapYear, false);
-assert.sameValue((new Temporal.PlainDateTime(2002, 8, 23, 5, 30, 13)).inLeapYear, false);
-assert.sameValue((new Temporal.PlainDateTime(2003, 8, 23, 5, 30, 13)).inLeapYear, false);
-assert.sameValue((new Temporal.PlainDateTime(2004, 8, 23, 5, 30, 13)).inLeapYear, true);
-assert.sameValue((new Temporal.PlainDateTime(2005, 8, 23, 5, 30, 13)).inLeapYear, false);
-assert.sameValue(Temporal.PlainDate.from('2019-03-18').inLeapYear, false);
-assert.sameValue(Temporal.PlainDate.from('2020-03-18').inLeapYear, true);
-assert.sameValue(Temporal.PlainDate.from('2021-03-18').inLeapYear, false);
-assert.sameValue(Temporal.PlainDate.from('2022-03-18').inLeapYear, false);
-assert.sameValue(Temporal.PlainDate.from('2023-03-18').inLeapYear, false);
-assert.sameValue(Temporal.PlainDate.from('2024-03-18').inLeapYear, true);
-assert.sameValue(Temporal.PlainDate.from('2025-03-18').inLeapYear, false);
-assert.sameValue(Temporal.PlainDate.from('2026-03-18').inLeapYear, false);
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/calendar-month-code.js b/js/src/tests/test262/staging/Temporal/v8/calendar-month-code.js
deleted file mode 100644
index 93b02070f6f3a..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/calendar-month-code.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from calendar-month-code test
-  in V8's mjsunit test calendar-month-code.js
-features: [Temporal]
----*/
-
-assert.sameValue((new Temporal.PlainDate(2021, 7, 15)).monthCode, 'M07');
-assert.sameValue((new Temporal.PlainDateTime(1997, 8, 23, 5, 30, 13)).monthCode, 'M08');
-assert.sameValue((new Temporal.PlainYearMonth(1999, 6)).monthCode, 'M06');
-assert.sameValue((new Temporal.PlainMonthDay(2, 6)).monthCode, 'M02');
-assert.sameValue(Temporal.PlainDate.from('2019-03-15').monthCode, 'M03');
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/calendar-month-day-from-fields.js b/js/src/tests/test262/staging/Temporal/v8/calendar-month-day-from-fields.js
deleted file mode 100644
index 2dc5d3390b3ce..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/calendar-month-day-from-fields.js
+++ /dev/null
@@ -1,425 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from calendar-month-day-from-fields test
-  in V8's mjsunit test calendar-month-day-from-fields.js
-features: [Temporal]
----*/
-
-assert.throws(TypeError, () => Temporal.PlainMonthDay.from());
-[
-  undefined,
-  true,
-  false,
-  123,
-  456n,
-  Symbol(),
-].forEach(function (fields) {
-  assert.throws(TypeError, () => Temporal.PlainMonthDay.from(fields));
-  assert.throws(TypeError, () => Temporal.PlainMonthDay.from(fields, undefined));
-  assert.throws(TypeError, () => Temporal.PlainMonthDay.from(fields, { overflow: 'constrain' }));
-  assert.throws(TypeError, () => Temporal.PlainMonthDay.from(fields, { overflow: 'reject' }));
-});
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from('string'));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from('string', undefined));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from('string', { overflow: 'constrain' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from('string', { overflow: 'reject' }));
-assert.sameValue(Temporal.PlainMonthDay.from({
-  month: 1,
-  day: 17
-}).toJSON(), '01-17');
-assert.throws(TypeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  day: 17
-}));
-assert.throws(TypeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 12
-}));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'm1',
-  day: 17
-}));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M1',
-  day: 17
-}));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'm01',
-  day: 17
-}));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 12,
-  monthCode: 'M11',
-  day: 17
-}));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M00',
-  day: 17
-}));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M19',
-  day: 17
-}));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M99',
-  day: 17
-}));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M13',
-  day: 17
-}));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: -1,
-  day: 17
-}));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: -Infinity,
-  day: 17
-}));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 7,
-  day: -17
-}));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 7,
-  day: -Infinity
-}));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 12,
-  day: 0
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 12,
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 1,
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 2,
-  day: 29
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 6,
-  day: 31
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 9,
-  day: 31
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 0,
-  day: 5
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 13,
-  day: 5
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M12',
-  day: 0
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M12',
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M01',
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M06',
-  day: 31
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M09',
-  day: 31
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M00',
-  day: 5
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M13',
-  day: 5
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 12,
-  day: 0
-}));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 0,
-  day: 3
-}));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 7,
-  day: 13
-}, { overflow: 'invalid' }));
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 7,
-  day: 15
-}).toJSON(), '07-15');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 7,
-  day: 3
-}).toJSON(), '07-03');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 12,
-  day: 31
-}).toJSON(), '12-31');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M07',
-  day: 15
-}).toJSON(), '07-15');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M07',
-  day: 3
-}).toJSON(), '07-03');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M12',
-  day: 31
-}).toJSON(), '12-31');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M02',
-  day: 29
-}).toJSON(), '02-28');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 1,
-  day: 133
-}).toJSON(), '01-31');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 2,
-  day: 133
-}).toJSON(), '02-28');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 3,
-  day: 9033
-}).toJSON(), '03-31');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 4,
-  day: 50
-}).toJSON(), '04-30');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 5,
-  day: 77
-}).toJSON(), '05-31');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 6,
-  day: 33
-}).toJSON(), '06-30');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 7,
-  day: 33
-}).toJSON(), '07-31');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 8,
-  day: 300
-}).toJSON(), '08-31');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 9,
-  day: 400
-}).toJSON(), '09-30');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 10,
-  day: 400
-}).toJSON(), '10-31');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 11,
-  day: 400
-}).toJSON(), '11-30');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 12,
-  day: 500
-}).toJSON(), '12-31');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 13,
-  day: 500
-}).toJSON(), '12-31');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 999999,
-  day: 500
-}).toJSON(), '12-31');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M01',
-  day: 133
-}).toJSON(), '01-31');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M02',
-  day: 133
-}).toJSON(), '02-28');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M03',
-  day: 9033
-}).toJSON(), '03-31');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M04',
-  day: 50
-}).toJSON(), '04-30');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M05',
-  day: 77
-}).toJSON(), '05-31');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M06',
-  day: 33
-}).toJSON(), '06-30');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M07',
-  day: 33
-}).toJSON(), '07-31');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M08',
-  day: 300
-}).toJSON(), '08-31');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M09',
-  day: 400
-}).toJSON(), '09-30');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M10',
-  day: 400
-}).toJSON(), '10-31');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M11',
-  day: 400
-}).toJSON(), '11-30');
-assert.sameValue(Temporal.PlainMonthDay.from({
-  year: 2021,
-  monthCode: 'M12',
-  day: 500
-}).toJSON(), '12-31');
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 1,
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 2,
-  day: 29
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 3,
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 4,
-  day: 31
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 5,
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 6,
-  day: 31
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 7,
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 8,
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 9,
-  day: 31
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 10,
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 11,
-  day: 31
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 12,
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from({
-  year: 2021,
-  month: 13,
-  day: 5
-}, { overflow: 'reject' }));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/calendar-month.js b/js/src/tests/test262/staging/Temporal/v8/calendar-month.js
deleted file mode 100644
index eff2a392c7ebd..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/calendar-month.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from calendar-month test
-  in V8's mjsunit test calendar-month.js
-features: [Temporal]
----*/
-
-assert.sameValue((new Temporal.PlainDate(2021, 7, 15)).month, 7);
-assert.sameValue((new Temporal.PlainDateTime(1997, 8, 23, 5, 30, 13)).month, 8);
-assert.sameValue((new Temporal.PlainYearMonth(1999, 6)).month, 6);
-assert.sameValue(Temporal.PlainDate.from('2019-03-15').month, 3);
-assert.sameValue((new Temporal.PlainMonthDay(3, 16)).month, undefined);
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/calendar-months-in-year.js b/js/src/tests/test262/staging/Temporal/v8/calendar-months-in-year.js
deleted file mode 100644
index 10cb76a829112..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/calendar-months-in-year.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from calendar-months-in-year test
-  in V8's mjsunit test calendar-months-in-year.js
-features: [Temporal]
----*/
-
-assert.sameValue((new Temporal.PlainDate(2021, 7, 15)).monthsInYear, 12);
-assert.sameValue((new Temporal.PlainDate(1234, 7, 15)).monthsInYear, 12);
-assert.sameValue((new Temporal.PlainDateTime(1997, 8, 23, 5, 30, 13)).monthsInYear, 12);
-assert.sameValue((new Temporal.PlainDateTime(1234, 8, 23, 5, 30, 13)).monthsInYear, 12);
-assert.sameValue(Temporal.PlainDate.from('2019-03-18').monthsInYear, 12);
-assert.sameValue(Temporal.PlainDate.from('1234-03-18').monthsInYear, 12);
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/calendar-week-of-year.js b/js/src/tests/test262/staging/Temporal/v8/calendar-week-of-year.js
deleted file mode 100644
index 12fdbc82cf29c..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/calendar-week-of-year.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from calendar-week-of-year test
-  in V8's mjsunit test calendar-week-of-year.js
-features: [Temporal]
----*/
-
-assert.sameValue((new Temporal.PlainDate(1977, 1, 1)).weekOfYear, 53);
-assert.sameValue((new Temporal.PlainDate(1977, 1, 2)).weekOfYear, 53);
-assert.sameValue((new Temporal.PlainDate(1977, 12, 31)).weekOfYear, 52);
-assert.sameValue((new Temporal.PlainDate(1978, 1, 1)).weekOfYear, 52);
-assert.sameValue((new Temporal.PlainDate(1978, 1, 2)).weekOfYear, 1);
-assert.sameValue((new Temporal.PlainDate(1978, 12, 31)).weekOfYear, 52);
-assert.sameValue((new Temporal.PlainDate(1979, 1, 1)).weekOfYear, 1);
-assert.sameValue((new Temporal.PlainDate(1979, 12, 30)).weekOfYear, 52);
-assert.sameValue((new Temporal.PlainDate(1979, 12, 31)).weekOfYear, 1);
-assert.sameValue((new Temporal.PlainDate(1980, 1, 1)).weekOfYear, 1);
-assert.sameValue((new Temporal.PlainDate(1980, 12, 28)).weekOfYear, 52);
-assert.sameValue((new Temporal.PlainDate(1980, 12, 29)).weekOfYear, 1);
-assert.sameValue((new Temporal.PlainDate(1980, 12, 30)).weekOfYear, 1);
-assert.sameValue((new Temporal.PlainDate(1980, 12, 31)).weekOfYear, 1);
-assert.sameValue((new Temporal.PlainDate(1981, 1, 1)).weekOfYear, 1);
-assert.sameValue((new Temporal.PlainDate(1981, 12, 31)).weekOfYear, 53);
-assert.sameValue((new Temporal.PlainDate(1982, 1, 1)).weekOfYear, 53);
-assert.sameValue((new Temporal.PlainDate(1982, 1, 2)).weekOfYear, 53);
-assert.sameValue((new Temporal.PlainDate(1982, 1, 3)).weekOfYear, 53);
-assert.sameValue(Temporal.PlainDate.from('1977-01-01').weekOfYear, 53);
-assert.sameValue(Temporal.PlainDate.from('1977-01-02').weekOfYear, 53);
-assert.sameValue(Temporal.PlainDate.from('1977-12-31').weekOfYear, 52);
-assert.sameValue(Temporal.PlainDate.from('1978-01-01').weekOfYear, 52);
-assert.sameValue(Temporal.PlainDate.from('1978-01-02').weekOfYear, 1);
-assert.sameValue(Temporal.PlainDate.from('1978-12-31').weekOfYear, 52);
-assert.sameValue(Temporal.PlainDate.from('1979-01-01').weekOfYear, 1);
-assert.sameValue(Temporal.PlainDate.from('1979-12-30').weekOfYear, 52);
-assert.sameValue(Temporal.PlainDate.from('1979-12-31').weekOfYear, 1);
-assert.sameValue(Temporal.PlainDate.from('1980-01-01').weekOfYear, 1);
-assert.sameValue(Temporal.PlainDate.from('1980-12-28').weekOfYear, 52);
-assert.sameValue(Temporal.PlainDate.from('1980-12-29').weekOfYear, 1);
-assert.sameValue(Temporal.PlainDate.from('1980-12-30').weekOfYear, 1);
-assert.sameValue(Temporal.PlainDate.from('1980-12-31').weekOfYear, 1);
-assert.sameValue(Temporal.PlainDate.from('1981-01-01').weekOfYear, 1);
-assert.sameValue(Temporal.PlainDate.from('1981-12-31').weekOfYear, 53);
-assert.sameValue(Temporal.PlainDate.from('1982-01-01').weekOfYear, 53);
-assert.sameValue(Temporal.PlainDate.from('1982-01-02').weekOfYear, 53);
-assert.sameValue(Temporal.PlainDate.from('1982-01-03').weekOfYear, 53);
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/calendar-year-month-from-fields.js b/js/src/tests/test262/staging/Temporal/v8/calendar-year-month-from-fields.js
deleted file mode 100644
index 224e8a84b2404..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/calendar-year-month-from-fields.js
+++ /dev/null
@@ -1,229 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from calendar-year-month-from-fields test
-  in V8's mjsunit test calendar-year-month-from-fields.js
-features: [Temporal]
----*/
-
-assert.throws(TypeError, () => Temporal.PlainYearMonth.from());
-[
-  undefined,
-  true,
-  false,
-  123,
-  456n,
-  Symbol(),
-].forEach(function (fields) {
-  assert.throws(TypeError, () => Temporal.PlainYearMonth.from(fields));
-  assert.throws(TypeError, () => Temporal.PlainYearMonth.from(fields, undefined));
-  assert.throws(TypeError, () => Temporal.PlainYearMonth.from(fields, { overflow: 'constrain' }));
-  assert.throws(TypeError, () => Temporal.PlainYearMonth.from(fields, { overflow: 'reject' }));
-});
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from('string'));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from('string', undefined));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from('string', { overflow: 'constrain' }));
-assert.throws(RangeError, () => Temporal.PlainMonthDay.from('string', { overflow: 'reject' }));
-assert.throws(TypeError, () => Temporal.PlainYearMonth.from({ month: 1 }));
-assert.throws(TypeError, () => Temporal.PlainYearMonth.from({ year: 2021 }));
-assert.throws(RangeError, () => Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'm1'
-}));
-assert.throws(RangeError, () => Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M1'
-}));
-assert.throws(RangeError, () => Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'm01'
-}));
-assert.throws(RangeError, () => Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 12,
-  monthCode: 'M11'
-}));
-assert.throws(RangeError, () => Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M00'
-}));
-assert.throws(RangeError, () => Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M19'
-}));
-assert.throws(RangeError, () => Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M99'
-}));
-assert.throws(RangeError, () => Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M13'
-}));
-assert.throws(RangeError, () => Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: -1
-}));
-assert.throws(RangeError, () => Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: -Infinity
-}));
-assert.throws(RangeError, () => Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 0,
-  day: 5
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 13,
-  day: 5
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M00'
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M13'
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 0
-}));
-assert.throws(RangeError, () => Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 7
-}, { overflow: 'invalid' }));
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 7
-}).toJSON(), '2021-07');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 12
-}).toJSON(), '2021-12');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M07'
-}).toJSON(), '2021-07');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M12'
-}).toJSON(), '2021-12');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 1
-}).toJSON(), '2021-01');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 2
-}).toJSON(), '2021-02');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 3
-}).toJSON(), '2021-03');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 4
-}).toJSON(), '2021-04');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 5
-}).toJSON(), '2021-05');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 6
-}).toJSON(), '2021-06');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 7
-}).toJSON(), '2021-07');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 8
-}).toJSON(), '2021-08');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 9
-}).toJSON(), '2021-09');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 10
-}).toJSON(), '2021-10');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 11
-}).toJSON(), '2021-11');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 12
-}).toJSON(), '2021-12');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 13
-}).toJSON(), '2021-12');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 999999
-}).toJSON(), '2021-12');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M01'
-}).toJSON(), '2021-01');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M02'
-}).toJSON(), '2021-02');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M03'
-}).toJSON(), '2021-03');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M04'
-}).toJSON(), '2021-04');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M05'
-}).toJSON(), '2021-05');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M06'
-}).toJSON(), '2021-06');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M07'
-}).toJSON(), '2021-07');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M08'
-}).toJSON(), '2021-08');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M09'
-}).toJSON(), '2021-09');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M10'
-}).toJSON(), '2021-10');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M11'
-}).toJSON(), '2021-11');
-assert.sameValue(Temporal.PlainYearMonth.from({
-  year: 2021,
-  monthCode: 'M12'
-}).toJSON(), '2021-12');
-assert.throws(RangeError, () => Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 13
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainYearMonth.from({
-  year: 2021,
-  month: 9995
-}, { overflow: 'reject' }));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/duration-abs.js b/js/src/tests/test262/staging/Temporal/v8/duration-abs.js
deleted file mode 100644
index f70f71ecaf583..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/duration-abs.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from duration-abs test
-  in V8's mjsunit test duration-abs.js
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-let d1 = new Temporal.Duration();
-TemporalHelpers.assertDuration(d1.abs(), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-let d2 = new Temporal.Duration(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-TemporalHelpers.assertDuration(d2.abs(), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-let d3 = new Temporal.Duration(100000, 200000, 300000, 400000, 500000, 600000, 700000, 800000, 900000, 1000000);
-TemporalHelpers.assertDuration(d3.abs(), 100000, 200000, 300000, 400000, 500000, 600000, 700000, 800000, 900000, 1000000);
-let d4 = new Temporal.Duration(-1, -2, -3, -4, -5, -6, -7, -8, -9, -10);
-TemporalHelpers.assertDuration(d4.abs(), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/duration-add.js b/js/src/tests/test262/staging/Temporal/v8/duration-add.js
deleted file mode 100644
index 117666a8d2872..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/duration-add.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from duration-add test
-  in V8's mjsunit test duration-add.js
-features: [Temporal]
----*/
-
-let d1 = new Temporal.Duration();
-let badDur = { add: d1.add };
-assert.throws(TypeError, () => badDur.add(d1));
-let d2 = new Temporal.Duration(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-assert.throws(RangeError, () => d2.add(d1));
-assert.throws(RangeError, () => d1.add(d2));
-assert.throws(RangeError, () => d2.add(d2));
-let d3 = new Temporal.Duration(100000, 200000, 300000, 400000, 500000, 600000, 700000, 800000, 900000, 1000000);
-assert.throws(RangeError, () => d3.add(d3));
-let d4 = new Temporal.Duration(-1, -2, -3, -4, -5, -6, -7, -8, -9, -10);
-assert.throws(RangeError, () => d4.add(d1));
-assert.throws(RangeError, () => d1.add(d4));
-assert.throws(RangeError, () => d4.add(d4));
-assert.throws(RangeError, () => d2.add(d4));
-assert.throws(RangeError, () => d4.add(d2));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/duration-constructor.js b/js/src/tests/test262/staging/Temporal/v8/duration-constructor.js
deleted file mode 100644
index b8ae34ba3d349..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/duration-constructor.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from duration-constructor test
-  in V8's mjsunit test duration-constructor.js
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-let d1 = new Temporal.Duration();
-TemporalHelpers.assertDuration(d1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-let d2 = new Temporal.Duration(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-TemporalHelpers.assertDuration(d2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-let d3 = new Temporal.Duration(100000, 200000, 300000, 400000, 500000, 600000, 700000, 800000, 900000, 1000000);
-TemporalHelpers.assertDuration(d3, 100000, 200000, 300000, 400000, 500000, 600000, 700000, 800000, 900000, 1000000);
-let d4 = new Temporal.Duration(-1, -2, -3, -4, -5, -6, -7, -8, -9, -10);
-TemporalHelpers.assertDuration(d4, -1, -2, -3, -4, -5, -6, -7, -8, -9, -10);
-assert.throws(TypeError, () => Temporal.Duration());
-TemporalHelpers.assertDuration(new Temporal.Duration(undefined, 234, true, false, '567'), 0, 234, 1, 0, 567, 0, 0, 0, 0, 0);
-assert.throws(TypeError, () => new Temporal.Duration(Symbol(123)));
-assert.throws(TypeError, () => new Temporal.Duration(123n));
-assert.throws(RangeError, () => new Temporal.Duration(1, 2, 3, 4, 5, 6, 7, 8, 9, Infinity));
-assert.throws(RangeError, () => new Temporal.Duration(1, 2, 3, 4, 5, 6, 7, 8, Infinity));
-assert.throws(RangeError, () => new Temporal.Duration(1, 2, 3, 4, 5, 6, 7, Infinity));
-assert.throws(RangeError, () => new Temporal.Duration(1, 2, 3, 4, 5, 6, Infinity));
-assert.throws(RangeError, () => new Temporal.Duration(1, 2, 3, 4, 5, Infinity));
-assert.throws(RangeError, () => new Temporal.Duration(1, 2, 3, 4, Infinity));
-assert.throws(RangeError, () => new Temporal.Duration(1, 2, 3, Infinity));
-assert.throws(RangeError, () => new Temporal.Duration(1, 2, Infinity));
-assert.throws(RangeError, () => new Temporal.Duration(1, Infinity));
-assert.throws(RangeError, () => new Temporal.Duration(Infinity));
-assert.throws(RangeError, () => new Temporal.Duration(-1, -2, -3, -4, -5, -6, -7, -8, -9, -Infinity));
-assert.throws(RangeError, () => new Temporal.Duration(-1, -2, -3, -4, -5, -6, -7, -8, -Infinity));
-assert.throws(RangeError, () => new Temporal.Duration(-1, -2, -3, -4, -5, -6, -7, -Infinity));
-assert.throws(RangeError, () => new Temporal.Duration(-1, -2, -3, -4, -5, -6, -Infinity));
-assert.throws(RangeError, () => new Temporal.Duration(-1, -2, -3, -4, -5, -Infinity));
-assert.throws(RangeError, () => new Temporal.Duration(-1, -2, -3, -4, -Infinity));
-assert.throws(RangeError, () => new Temporal.Duration(-1, -2, -3, -Infinity));
-assert.throws(RangeError, () => new Temporal.Duration(-1, -2, -Infinity));
-assert.throws(RangeError, () => new Temporal.Duration(-1, -Infinity));
-assert.throws(RangeError, () => new Temporal.Duration(-Infinity));
-assert.throws(RangeError, () => new Temporal.Duration(1, -2));
-assert.throws(RangeError, () => new Temporal.Duration(1, 0, -2));
-assert.throws(RangeError, () => new Temporal.Duration(-1, 0, 0, 3));
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 1, -1));
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, -1, 1));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/duration-from.js b/js/src/tests/test262/staging/Temporal/v8/duration-from.js
deleted file mode 100644
index 6ae7928c4d8f2..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/duration-from.js
+++ /dev/null
@@ -1,146 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from duration-from test
-  in V8's mjsunit test duration-from.js
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-let d1 = new Temporal.Duration(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-TemporalHelpers.assertDuration(d1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-let d2 = Temporal.Duration.from(d1);
-TemporalHelpers.assertDuration(d2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-assert.notSameValue(d2, d1);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT0S'), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P1Y'), 1, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P2M'), 0, 2, 0, 0, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P3W'), 0, 0, 3, 0, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P4D'), 0, 0, 0, 4, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT5H'), 0, 0, 0, 0, 5, 0, 0, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT6M'), 0, 0, 0, 0, 0, 6, 0, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT7S'), 0, 0, 0, 0, 0, 0, 7, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT0.008S'), 0, 0, 0, 0, 0, 0, 0, 8, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT0.000009S'), 0, 0, 0, 0, 0, 0, 0, 0, 9, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT0.000000001S'), 0, 0, 0, 0, 0, 0, 0, 0, 0, 1);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P1Y2M3W4DT5H6M7.008009001S'), 1, 2, 3, 4, 5, 6, 7, 8, 9, 1);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P111111111Y222222222M333333333W444444444D' + 'T555555555H666666666M777777777.987654321S'), 111111111, 222222222, 333333333, 444444444, 555555555, 666666666, 777777777, 987, 654, 321);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P1Y3WT5H7.000009001S'), 1, 0, 3, 0, 5, 0, 7, 0, 9, 1);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P2M4DT6M0.008000001S'), 0, 2, 0, 4, 0, 6, 0, 8, 0, 1);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P1Y4DT7.000000001S'), 1, 0, 0, 4, 0, 0, 7, 0, 0, 1);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P2MT5H0.008S'), 0, 2, 0, 0, 5, 0, 0, 8, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P3WT6M0.000009S'), 0, 0, 3, 0, 0, 6, 0, 0, 9, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P1YT5H0.000009000S'), 1, 0, 0, 0, 5, 0, 0, 0, 9, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P2MT6M0.000000001S'), 0, 2, 0, 0, 0, 6, 0, 0, 0, 1);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P3WT7S'), 0, 0, 3, 0, 0, 0, 7, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P4DT0.008S'), 0, 0, 0, 4, 0, 0, 0, 8, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P1YT5H0.000000001S'), 1, 0, 0, 0, 5, 0, 0, 0, 0, 1);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P2MT6M'), 0, 2, 0, 0, 0, 6, 0, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P3WT7S'), 0, 0, 3, 0, 0, 0, 7, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P4DT0.008S'), 0, 0, 0, 4, 0, 0, 0, 8, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT5H0.000009S'), 0, 0, 0, 0, 5, 0, 0, 0, 9, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P1YT6M'), 1, 0, 0, 0, 0, 6, 0, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P2MT7S'), 0, 2, 0, 0, 0, 0, 7, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P3WT0.008S'), 0, 0, 3, 0, 0, 0, 0, 8, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P4DT0.000009S'), 0, 0, 0, 4, 0, 0, 0, 0, 9, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT5H0.000000001S'), 0, 0, 0, 0, 5, 0, 0, 0, 0, 1);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P1YT7S'), 1, 0, 0, 0, 0, 0, 7, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P2MT0.008S'), 0, 2, 0, 0, 0, 0, 0, 8, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P3WT0.000009S'), 0, 0, 3, 0, 0, 0, 0, 0, 9, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('P4DT0.000000001S'), 0, 0, 0, 4, 0, 0, 0, 0, 0, 1);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT5H'), 0, 0, 0, 0, 5, 0, 0, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('-P1Y2M3W4DT5H6M7.008009001S'), -1, -2, -3, -4, -5, -6, -7, -8, -9, -1);
-TemporalHelpers.assertDuration(Temporal.Duration.from('-P111111111Y222222222M333333333W444444444D' + 'T555555555H666666666M777777777.987654321S'), -111111111, -222222222, -333333333, -444444444, -555555555, -666666666, -777777777, -987, -654, -321);
-TemporalHelpers.assertDuration(Temporal.Duration.from('+P1Y2M3W4DT5H6M7.008009001S'), 1, 2, 3, 4, 5, 6, 7, 8, 9, 1);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT2.5H'), 0, 0, 0, 0, 2, 30, 0, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT2.25H'), 0, 0, 0, 0, 2, 15, 0, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT2.05H'), 0, 0, 0, 0, 2, 3, 0, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT2.005H'), 0, 0, 0, 0, 2, 0, 18, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT2.505H'), 0, 0, 0, 0, 2, 30, 18, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT2.0025H'), 0, 0, 0, 0, 2, 0, 9, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT3.5M'), 0, 0, 0, 0, 0, 3, 30, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT3.25M'), 0, 0, 0, 0, 0, 3, 15, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT3.125M'), 0, 0, 0, 0, 0, 3, 7, 500, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT3.025M'), 0, 0, 0, 0, 0, 3, 1, 500, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT3.01M'), 0, 0, 0, 0, 0, 3, 0, 600, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT3.005M'), 0, 0, 0, 0, 0, 3, 0, 300, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT3.001M'), 0, 0, 0, 0, 0, 3, 0, 60, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT3.006M'), 0, 0, 0, 0, 0, 3, 0, 360, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT2,5H'), 0, 0, 0, 0, 2, 30, 0, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT2,25H'), 0, 0, 0, 0, 2, 15, 0, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT2,05H'), 0, 0, 0, 0, 2, 3, 0, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT2,005H'), 0, 0, 0, 0, 2, 0, 18, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT2,505H'), 0, 0, 0, 0, 2, 30, 18, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT2,0025H'), 0, 0, 0, 0, 2, 0, 9, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT3,5M'), 0, 0, 0, 0, 0, 3, 30, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT3,25M'), 0, 0, 0, 0, 0, 3, 15, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT3,125M'), 0, 0, 0, 0, 0, 3, 7, 500, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT3,025M'), 0, 0, 0, 0, 0, 3, 1, 500, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT3,01M'), 0, 0, 0, 0, 0, 3, 0, 600, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT3,005M'), 0, 0, 0, 0, 0, 3, 0, 300, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT3,001M'), 0, 0, 0, 0, 0, 3, 0, 60, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from('PT3,006M'), 0, 0, 0, 0, 0, 3, 0, 360, 0, 0);
-assert.throws(RangeError, () => Temporal.Duration.from('P2H'));
-assert.throws(RangeError, () => Temporal.Duration.from('P2.5M'));
-assert.throws(RangeError, () => Temporal.Duration.from('P2,5M'));
-assert.throws(RangeError, () => Temporal.Duration.from('P2S'));
-assert.throws(RangeError, () => Temporal.Duration.from('PT2.H3M'));
-assert.throws(RangeError, () => Temporal.Duration.from('PT2,H3M'));
-assert.throws(RangeError, () => Temporal.Duration.from('PT2.H3S'));
-assert.throws(RangeError, () => Temporal.Duration.from('PT2,H3S'));
-assert.throws(RangeError, () => Temporal.Duration.from('PT2.H0.5M'));
-assert.throws(RangeError, () => Temporal.Duration.from('PT2,H0,5M'));
-assert.throws(RangeError, () => Temporal.Duration.from('PT2.H0.5S'));
-assert.throws(RangeError, () => Temporal.Duration.from('PT2,H0,5S'));
-assert.throws(RangeError, () => Temporal.Duration.from('PT2H3.2M3S'));
-assert.throws(RangeError, () => Temporal.Duration.from('PT2H3,2M3S'));
-assert.throws(RangeError, () => Temporal.Duration.from('PT2H3.2M0.3S'));
-assert.throws(RangeError, () => Temporal.Duration.from('PT2H3,2M0,3S'));
-assert.throws(RangeError, () => Temporal.Duration.from('PT.1H'));
-assert.throws(RangeError, () => Temporal.Duration.from('PT,1H'));
-assert.throws(RangeError, () => Temporal.Duration.from('PT.1M'));
-assert.throws(RangeError, () => Temporal.Duration.from('PT,1M'));
-assert.throws(RangeError, () => Temporal.Duration.from('PT.1S'));
-assert.throws(RangeError, () => Temporal.Duration.from('PT,1S'));
-TemporalHelpers.assertDuration(Temporal.Duration.from({
-  years: 0,
-  months: 0,
-  weeks: 0,
-  days: 0,
-  hours: 0,
-  minutes: 0,
-  seconds: 0,
-  milliseconds: 0,
-  microseconds: 0,
-  nanoseconds: 0
-}), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertDuration(Temporal.Duration.from({
-  years: 1,
-  months: 2,
-  weeks: 3,
-  days: 4,
-  hours: 5,
-  minutes: 6,
-  seconds: 7,
-  milliseconds: 8,
-  microseconds: 9,
-  nanoseconds: 10
-}), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-TemporalHelpers.assertDuration(Temporal.Duration.from({
-  years: -1,
-  months: -2,
-  weeks: -3,
-  days: -4,
-  hours: -5,
-  minutes: -6,
-  seconds: -7,
-  milliseconds: -8,
-  microseconds: -9,
-  nanoseconds: -10
-}), -1, -2, -3, -4, -5, -6, -7, -8, -9, -10);
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/duration-negated.js b/js/src/tests/test262/staging/Temporal/v8/duration-negated.js
deleted file mode 100644
index 5abe59eefa57f..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/duration-negated.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from duration-negated test
-  in V8's mjsunit test duration-negated.js
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-let d1 = new Temporal.Duration();
-TemporalHelpers.assertDuration(d1.negated(), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-let d2 = new Temporal.Duration(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-TemporalHelpers.assertDuration(d2.negated(), -1, -2, -3, -4, -5, -6, -7, -8, -9, -10);
-let d3 = new Temporal.Duration(100000, 200000, 300000, 400000, 500000, 600000, 700000, 800000, 900000, 1000000);
-TemporalHelpers.assertDuration(d3.negated(), -100000, -200000, -300000, -400000, -500000, -600000, -700000, -800000, -900000, -1000000);
-let d4 = new Temporal.Duration(-1, -2, -3, -4, -5, -6, -7, -8, -9, -10);
-TemporalHelpers.assertDuration(d4.negated(), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-let d5 = new Temporal.Duration(-100000, -200000, -300000, -400000, -500000, -600000, -700000, -800000, -900000, -1000000);
-TemporalHelpers.assertDuration(d5.negated(), 100000, 200000, 300000, 400000, 500000, 600000, 700000, 800000, 900000, 1000000);
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/duration-to-json-boundary-cases.js b/js/src/tests/test262/staging/Temporal/v8/duration-to-json-boundary-cases.js
deleted file mode 100644
index 64da702aa467e..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/duration-to-json-boundary-cases.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2022 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from duration-to-json-boundary-cases test
-  in V8's mjsunit test duration-to-json-boundary-cases.js
-features: [Temporal]
----*/
-
-let MAX_UINT32 = Math.pow(2, 32);
-assert.throws(RangeError, () => new Temporal.Duration(MAX_UINT32));
-assert.throws(RangeError, () => new Temporal.Duration(-MAX_UINT32));
-assert.throws(RangeError, () => new Temporal.Duration(0, MAX_UINT32));
-assert.throws(RangeError, () => new Temporal.Duration(0, -MAX_UINT32));
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, MAX_UINT32));
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, -MAX_UINT32));
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, Number.MAX_SAFE_INTEGER / 86400 + 1));
-assert.sameValue(new Temporal.Duration(0, 0, 0, Math.floor(Number.MAX_SAFE_INTEGER / 86400)).toJSON(), 'P' + Math.floor(Number.MAX_SAFE_INTEGER / 86400) + 'D');
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, -(Number.MAX_SAFE_INTEGER / 86400 + 1)));
-assert.sameValue(new Temporal.Duration(0, 0, 0, -Math.floor(Number.MAX_SAFE_INTEGER / 86400)).toJSON(), '-P' + Math.floor(Number.MAX_SAFE_INTEGER / 86400) + 'D');
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, Number.MAX_SAFE_INTEGER / 3600 + 1));
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, Math.floor(Number.MAX_SAFE_INTEGER / 3600)).toJSON(), 'PT' + Math.floor(Number.MAX_SAFE_INTEGER / 3600) + 'H');
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, -(Number.MAX_SAFE_INTEGER / 3600 + 1)));
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, -Math.floor(Number.MAX_SAFE_INTEGER / 3600)).toJSON(), '-PT' + Math.floor(Number.MAX_SAFE_INTEGER / 3600) + 'H');
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, Number.MAX_SAFE_INTEGER / 60 + 1));
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, Math.floor(Number.MAX_SAFE_INTEGER / 60)).toJSON(), 'PT' + Math.floor(Number.MAX_SAFE_INTEGER / 60) + 'M');
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, -(Number.MAX_SAFE_INTEGER / 60 + 1)));
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, -Math.floor(Number.MAX_SAFE_INTEGER / 60)).toJSON(), '-PT' + Math.floor(Number.MAX_SAFE_INTEGER / 60) + 'M');
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, Number.MAX_SAFE_INTEGER + 1));
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, Number.MAX_SAFE_INTEGER).toJSON(), 'PT' + Number.MAX_SAFE_INTEGER + 'S');
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, -(Number.MAX_SAFE_INTEGER + 1)));
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, -Number.MAX_SAFE_INTEGER).toJSON(), '-PT' + Number.MAX_SAFE_INTEGER + 'S');
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, Number.MAX_SAFE_INTEGER, 1000));
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, Number.MAX_SAFE_INTEGER, 999).toJSON(), 'PT' + Number.MAX_SAFE_INTEGER + '.999S');
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, -Number.MAX_SAFE_INTEGER, -1000));
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, -Number.MAX_SAFE_INTEGER, -999).toJSON(), '-PT' + Number.MAX_SAFE_INTEGER + '.999S');
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, Number.MAX_SAFE_INTEGER, 999, 1000));
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, Number.MAX_SAFE_INTEGER, 999, 999).toJSON(), 'PT' + Number.MAX_SAFE_INTEGER + '.999999S');
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, -Number.MAX_SAFE_INTEGER, -999, -1000));
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, -Number.MAX_SAFE_INTEGER, -999, -999).toJSON(), '-PT' + Number.MAX_SAFE_INTEGER + '.999999S');
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, Number.MAX_SAFE_INTEGER, 999, 999, 1000));
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, Number.MAX_SAFE_INTEGER, 999, 999, 999).toJSON(), 'PT' + Number.MAX_SAFE_INTEGER + '.999999999S');
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, -Number.MAX_SAFE_INTEGER, -999, -999, -1000));
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, -Number.MAX_SAFE_INTEGER, -999, -999, -999).toJSON(), '-PT' + Number.MAX_SAFE_INTEGER + '.999999999S');
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, Number.MAX_SAFE_INTEGER - Math.floor(Number.MAX_SAFE_INTEGER / 1000) + 1, Number.MAX_SAFE_INTEGER, 0, 0));
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, Number.MAX_SAFE_INTEGER - Math.floor(Number.MAX_SAFE_INTEGER / 1000), Number.MAX_SAFE_INTEGER, 0, 0).toJSON(), 'PT' + Number.MAX_SAFE_INTEGER + '.' + Number.MAX_SAFE_INTEGER % 1000 + 'S');
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, -(Number.MAX_SAFE_INTEGER - Math.floor(Number.MAX_SAFE_INTEGER / 1000) + 1), -Number.MAX_SAFE_INTEGER, 0, 0));
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, -(Number.MAX_SAFE_INTEGER - Math.floor(Number.MAX_SAFE_INTEGER / 1000)), -Number.MAX_SAFE_INTEGER, 0, 0).toJSON(), '-PT' + Number.MAX_SAFE_INTEGER + '.' + Number.MAX_SAFE_INTEGER % 1000 + 'S');
-assert.throws(RangeError, () => new Temporal.Duration(0, 0, 0, 0, 0, 0, Number.MAX_SAFE_INTEGER - Math.floor(Number.MAX_SAFE_INTEGER / 1000000) + 1, 0, Number.MAX_SAFE_INTEGER, 0));
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, Number.MAX_SAFE_INTEGER - Math.floor(Number.MAX_SAFE_INTEGER / 1000000), 0, Number.MAX_SAFE_INTEGER, 0).toJSON(), 'PT' + Number.MAX_SAFE_INTEGER + '.' + Number.MAX_SAFE_INTEGER % 1000000 + 'S');
-assert.sameValue(new Temporal.Duration(MAX_UINT32 - 1).toJSON(), 'P' + (MAX_UINT32 - 1) + 'Y');
-assert.sameValue(new Temporal.Duration(-(MAX_UINT32 - 1)).toJSON(), '-P' + (MAX_UINT32 - 1) + 'Y');
-assert.sameValue(new Temporal.Duration(0, MAX_UINT32 - 1).toJSON(), 'P' + (MAX_UINT32 - 1) + 'M');
-assert.sameValue(new Temporal.Duration(0, -(MAX_UINT32 - 1)).toJSON(), '-P' + (MAX_UINT32 - 1) + 'M');
-assert.sameValue(new Temporal.Duration(0, 0, MAX_UINT32 - 1).toJSON(), 'P' + (MAX_UINT32 - 1) + 'W');
-assert.sameValue(new Temporal.Duration(0, 0, -(MAX_UINT32 - 1)).toJSON(), '-P' + (MAX_UINT32 - 1) + 'W');
-assert.sameValue(new Temporal.Duration(0, 0, 0, MAX_UINT32 - 1).toJSON(), 'P' + (MAX_UINT32 - 1) + 'D');
-assert.sameValue(new Temporal.Duration(0, 0, 0, -(MAX_UINT32 - 1)).toJSON(), '-P' + (MAX_UINT32 - 1) + 'D');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, MAX_UINT32 - 1).toJSON(), 'PT' + (MAX_UINT32 - 1) + 'H');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, -(MAX_UINT32 - 1)).toJSON(), '-PT' + (MAX_UINT32 - 1) + 'H');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, MAX_UINT32 - 1).toJSON(), 'PT' + (MAX_UINT32 - 1) + 'M');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, -(MAX_UINT32 - 1)).toJSON(), '-PT' + (MAX_UINT32 - 1) + 'M');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, MAX_UINT32 - 1).toJSON(), 'PT' + (MAX_UINT32 - 1) + 'S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, -(MAX_UINT32 - 1)).toJSON(), '-PT' + (MAX_UINT32 - 1) + 'S');
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/duration-to-json.js b/js/src/tests/test262/staging/Temporal/v8/duration-to-json.js
deleted file mode 100644
index 5a950c927e44b..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/duration-to-json.js
+++ /dev/null
@@ -1,121 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from duration-to-json test
-  in V8's mjsunit test duration-to-json.js
-features: [Temporal]
----*/
-
-assert.sameValue(new Temporal.Duration().toJSON(), 'PT0S');
-assert.sameValue(new Temporal.Duration(1).toJSON(), 'P1Y');
-assert.sameValue(new Temporal.Duration(-1).toJSON(), '-P1Y');
-assert.sameValue(new Temporal.Duration(1234567890).toJSON(), 'P1234567890Y');
-assert.sameValue(new Temporal.Duration(-1234567890).toJSON(), '-P1234567890Y');
-assert.sameValue(new Temporal.Duration(1, 2).toJSON(), 'P1Y2M');
-assert.sameValue(new Temporal.Duration(-1, -2).toJSON(), '-P1Y2M');
-assert.sameValue(new Temporal.Duration(0, 2).toJSON(), 'P2M');
-assert.sameValue(new Temporal.Duration(0, -2).toJSON(), '-P2M');
-assert.sameValue(new Temporal.Duration(0, 1234567890).toJSON(), 'P1234567890M');
-assert.sameValue(new Temporal.Duration(0, -1234567890).toJSON(), '-P1234567890M');
-assert.sameValue(new Temporal.Duration(1, 2, 3).toJSON(), 'P1Y2M3W');
-assert.sameValue(new Temporal.Duration(-1, -2, -3).toJSON(), '-P1Y2M3W');
-assert.sameValue(new Temporal.Duration(0, 0, 3).toJSON(), 'P3W');
-assert.sameValue(new Temporal.Duration(0, 0, -3).toJSON(), '-P3W');
-assert.sameValue(new Temporal.Duration(1, 0, 3).toJSON(), 'P1Y3W');
-assert.sameValue(new Temporal.Duration(-1, 0, -3).toJSON(), '-P1Y3W');
-assert.sameValue(new Temporal.Duration(0, 2, 3).toJSON(), 'P2M3W');
-assert.sameValue(new Temporal.Duration(0, -2, -3).toJSON(), '-P2M3W');
-assert.sameValue(new Temporal.Duration(0, 0, 1234567890).toJSON(), 'P1234567890W');
-assert.sameValue(new Temporal.Duration(0, 0, -1234567890).toJSON(), '-P1234567890W');
-assert.sameValue(new Temporal.Duration(1, 2, 3, 4).toJSON(), 'P1Y2M3W4D');
-assert.sameValue(new Temporal.Duration(-1, -2, -3, -4).toJSON(), '-P1Y2M3W4D');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 1234567890).toJSON(), 'P1234567890D');
-assert.sameValue(new Temporal.Duration(0, 0, 0, -1234567890).toJSON(), '-P1234567890D');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 4).toJSON(), 'P4D');
-assert.sameValue(new Temporal.Duration(0, 0, 0, -4).toJSON(), '-P4D');
-assert.sameValue(new Temporal.Duration(1, 0, 0, 4).toJSON(), 'P1Y4D');
-assert.sameValue(new Temporal.Duration(-1, 0, 0, -4).toJSON(), '-P1Y4D');
-assert.sameValue(new Temporal.Duration(0, 2, 0, 4).toJSON(), 'P2M4D');
-assert.sameValue(new Temporal.Duration(0, -2, 0, -4).toJSON(), '-P2M4D');
-assert.sameValue(new Temporal.Duration(0, 0, 3, 4).toJSON(), 'P3W4D');
-assert.sameValue(new Temporal.Duration(0, 0, -3, -4).toJSON(), '-P3W4D');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 5).toJSON(), 'PT5H');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, -5).toJSON(), '-PT5H');
-assert.sameValue(new Temporal.Duration(1, 0, 0, 0, 5).toJSON(), 'P1YT5H');
-assert.sameValue(new Temporal.Duration(-1, 0, 0, 0, -5).toJSON(), '-P1YT5H');
-assert.sameValue(new Temporal.Duration(0, 2, 0, 0, 5).toJSON(), 'P2MT5H');
-assert.sameValue(new Temporal.Duration(0, -2, 0, 0, -5).toJSON(), '-P2MT5H');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 6).toJSON(), 'PT6M');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, -6).toJSON(), '-PT6M');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 5, 6).toJSON(), 'PT5H6M');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, -5, -6).toJSON(), '-PT5H6M');
-assert.sameValue(new Temporal.Duration(0, 0, 3, 0, 0, 6).toJSON(), 'P3WT6M');
-assert.sameValue(new Temporal.Duration(0, 0, -3, 0, 0, -6).toJSON(), '-P3WT6M');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 4, 0, 6).toJSON(), 'P4DT6M');
-assert.sameValue(new Temporal.Duration(0, 0, 0, -4, 0, -6).toJSON(), '-P4DT6M');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 7).toJSON(), 'PT7S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, -7).toJSON(), '-PT7S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 5, 0, 7).toJSON(), 'PT5H7S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, -5, 0, -7).toJSON(), '-PT5H7S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 6, 7).toJSON(), 'PT6M7S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, -6, -7).toJSON(), '-PT6M7S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 5, 6, 7).toJSON(), 'PT5H6M7S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, -5, -6, -7).toJSON(), '-PT5H6M7S');
-assert.sameValue(new Temporal.Duration(1, 0, 0, 0, 5, 6, 7).toJSON(), 'P1YT5H6M7S');
-assert.sameValue(new Temporal.Duration(-1, 0, 0, 0, -5, -6, -7).toJSON(), '-P1YT5H6M7S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 8).toJSON(), 'PT0.008S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, -8).toJSON(), '-PT0.008S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 80).toJSON(), 'PT0.08S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, -80).toJSON(), '-PT0.08S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 87).toJSON(), 'PT0.087S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, -87).toJSON(), '-PT0.087S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 876).toJSON(), 'PT0.876S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, -876).toJSON(), '-PT0.876S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 876543).toJSON(), 'PT876.543S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, -876543).toJSON(), '-PT876.543S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 9).toJSON(), 'PT0.000009S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, -9).toJSON(), '-PT0.000009S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 90).toJSON(), 'PT0.00009S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, -90).toJSON(), '-PT0.00009S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 98).toJSON(), 'PT0.000098S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, -98).toJSON(), '-PT0.000098S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 900).toJSON(), 'PT0.0009S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, -900).toJSON(), '-PT0.0009S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 987).toJSON(), 'PT0.000987S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, -987).toJSON(), '-PT0.000987S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 987654).toJSON(), 'PT0.987654S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, -987654).toJSON(), '-PT0.987654S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 987654321).toJSON(), 'PT987.654321S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, -987654321).toJSON(), '-PT987.654321S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 0, 1).toJSON(), 'PT0.000000001S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 0, -1).toJSON(), '-PT0.000000001S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 0, 10).toJSON(), 'PT0.00000001S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 0, -10).toJSON(), '-PT0.00000001S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 0, 12).toJSON(), 'PT0.000000012S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 0, -12).toJSON(), '-PT0.000000012S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 0, 100).toJSON(), 'PT0.0000001S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 0, -100).toJSON(), '-PT0.0000001S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 0, 123).toJSON(), 'PT0.000000123S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 0, -123).toJSON(), '-PT0.000000123S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 0, 123456).toJSON(), 'PT0.000123456S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 0, -123456).toJSON(), '-PT0.000123456S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 0, 123456789).toJSON(), 'PT0.123456789S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 0, -123456789).toJSON(), '-PT0.123456789S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 0, 1234567891).toJSON(), 'PT1.234567891S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 0, 0, -1234567891).toJSON(), '-PT1.234567891S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 4, 3, 2, 1).toJSON(), 'PT4.003002001S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, -4, -3, -2, -1).toJSON(), '-PT4.003002001S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 4, 3, 2, 90001).toJSON(), 'PT4.003092001S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, -4, -3, -2, -90001).toJSON(), '-PT4.003092001S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, 4, 3, 2, 90080001).toJSON(), 'PT4.093082001S');
-assert.sameValue(new Temporal.Duration(0, 0, 0, 0, 0, 0, -4, -3, -2, -90080001).toJSON(), '-PT4.093082001S');
-assert.sameValue(new Temporal.Duration(1, 2, 3, 4, 5, 6, 7, 8, 9, 1).toJSON(), 'P1Y2M3W4DT5H6M7.008009001S');
-assert.sameValue(new Temporal.Duration(-1, -2, -3, -4, -5, -6, -7, -8, -9, -1).toJSON(), '-P1Y2M3W4DT5H6M7.008009001S');
-assert.sameValue(new Temporal.Duration(1234, 2345, 3456, 4567, 5678, 6789, 7890, 890, 901, 123).toJSON(), 'P1234Y2345M3456W4567DT5678H6789M7890.890901123S');
-assert.sameValue(new Temporal.Duration(-1234, -2345, -3456, -4567, -5678, -6789, -7890, -890, -901, -123).toJSON(), '-P1234Y2345M3456W4567DT5678H6789M7890.890901123S');
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/duration-value-of.js b/js/src/tests/test262/staging/Temporal/v8/duration-value-of.js
deleted file mode 100644
index e1c6f6e5cd6a4..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/duration-value-of.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from duration-valueOf test
-  in V8's mjsunit test duration-valueOf.js
-features: [Temporal]
----*/
-
-let d1 = new Temporal.Duration();
-assert.throws(TypeError, () => d1.valueOf());
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/duration-with.js b/js/src/tests/test262/staging/Temporal/v8/duration-with.js
deleted file mode 100644
index d3f5aaaa3d478..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/duration-with.js
+++ /dev/null
@@ -1,109 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from duration-with test
-  in V8's mjsunit test duration-with.js
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-let like1 = {
-  years: 9,
-  months: 8,
-  weeks: 7,
-  days: 6,
-  hours: 5,
-  minutes: 4,
-  seconds: 3,
-  milliseconds: 2,
-  microseconds: 1,
-  nanoseconds: 10
-};
-let like2 = {
-  years: 9,
-  hours: 5
-};
-let like3 = {
-  months: 8,
-  minutes: 4
-};
-let like4 = {
-  weeks: 7,
-  seconds: 3
-};
-let like5 = {
-  days: 6,
-  milliseconds: 2
-};
-let like6 = {
-  microseconds: 987,
-  nanoseconds: 123
-};
-let like7 = {
-  years: -9,
-  months: -8,
-  weeks: -7,
-  days: -6,
-  hours: -5,
-  minutes: -4,
-  seconds: -3,
-  milliseconds: -2,
-  microseconds: -1,
-  nanoseconds: -10
-};
-let d1 = new Temporal.Duration();
-TemporalHelpers.assertDuration(d1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertDuration(d1.with(like1), 9, 8, 7, 6, 5, 4, 3, 2, 1, 10);
-TemporalHelpers.assertDuration(d1.with(like2), 9, 0, 0, 0, 5, 0, 0, 0, 0, 0);
-TemporalHelpers.assertDuration(d1.with(like3), 0, 8, 0, 0, 0, 4, 0, 0, 0, 0);
-TemporalHelpers.assertDuration(d1.with(like4), 0, 0, 7, 0, 0, 0, 3, 0, 0, 0);
-TemporalHelpers.assertDuration(d1.with(like5), 0, 0, 0, 6, 0, 0, 0, 2, 0, 0);
-TemporalHelpers.assertDuration(d1.with(like6), 0, 0, 0, 0, 0, 0, 0, 0, 987, 123);
-TemporalHelpers.assertDuration(d1.with(like7), -9, -8, -7, -6, -5, -4, -3, -2, -1, -10);
-let d2 = new Temporal.Duration(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-TemporalHelpers.assertDuration(d2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-TemporalHelpers.assertDuration(d2.with(like1), 9, 8, 7, 6, 5, 4, 3, 2, 1, 10);
-TemporalHelpers.assertDuration(d2.with(like7), -9, -8, -7, -6, -5, -4, -3, -2, -1, -10);
-assert.throws(RangeError, () => d2.with({ years: -1 }));
-assert.throws(RangeError, () => d2.with({ months: -2 }));
-assert.throws(RangeError, () => d2.with({ weeks: -3 }));
-assert.throws(RangeError, () => d2.with({ days: -4 }));
-assert.throws(RangeError, () => d2.with({ hours: -5 }));
-assert.throws(RangeError, () => d2.with({ minutes: -6 }));
-assert.throws(RangeError, () => d2.with({ seconds: -7 }));
-assert.throws(RangeError, () => d2.with({ milliseconds: -8 }));
-assert.throws(RangeError, () => d2.with({ microseconds: -9 }));
-assert.throws(RangeError, () => d2.with({ nanoseconds: -10 }));
-let d3 = new Temporal.Duration(100000, 200000, 300000, 400000, 500000, 600000, 700000, 800000, 900000, 1000000);
-TemporalHelpers.assertDuration(d3, 100000, 200000, 300000, 400000, 500000, 600000, 700000, 800000, 900000, 1000000);
-TemporalHelpers.assertDuration(d3.with(like1), 9, 8, 7, 6, 5, 4, 3, 2, 1, 10);
-TemporalHelpers.assertDuration(d3.with(like7), -9, -8, -7, -6, -5, -4, -3, -2, -1, -10);
-let d4 = new Temporal.Duration(-1, -2, -3, -4, -5, -6, -7, -8, -9, -10);
-TemporalHelpers.assertDuration(d4, -1, -2, -3, -4, -5, -6, -7, -8, -9, -10);
-TemporalHelpers.assertDuration(d4.with(like1), 9, 8, 7, 6, 5, 4, 3, 2, 1, 10);
-assert.throws(RangeError, () => d4.with({ years: 1 }));
-assert.throws(RangeError, () => d4.with({ months: 2 }));
-assert.throws(RangeError, () => d4.with({ weeks: 3 }));
-assert.throws(RangeError, () => d4.with({ days: 4 }));
-assert.throws(RangeError, () => d4.with({ hours: 5 }));
-assert.throws(RangeError, () => d4.with({ minutes: 6 }));
-assert.throws(RangeError, () => d4.with({ seconds: 7 }));
-assert.throws(RangeError, () => d4.with({ milliseconds: 8 }));
-assert.throws(RangeError, () => d4.with({ microseconds: 9 }));
-assert.throws(RangeError, () => d4.with({ nanoseconds: 10 }));
-assert.throws(TypeError, () => d1.with({ year: 1 }));
-assert.throws(TypeError, () => d1.with({ month: 1 }));
-assert.throws(TypeError, () => d1.with({ week: 1 }));
-assert.throws(TypeError, () => d1.with({ day: 1 }));
-assert.throws(TypeError, () => d1.with({ hour: 1 }));
-assert.throws(TypeError, () => d1.with({ minute: 1 }));
-assert.throws(TypeError, () => d1.with({ second: 1 }));
-assert.throws(TypeError, () => d1.with({ millisecond: 1 }));
-assert.throws(TypeError, () => d1.with({ microsecond: 1 }));
-assert.throws(TypeError, () => d1.with({ nanosecond: 1 }));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/instant-add.js b/js/src/tests/test262/staging/Temporal/v8/instant-add.js
deleted file mode 100644
index fa8938354938b..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/instant-add.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from instant-add test
-  in V8's mjsunit test instant-add.js
-features: [Temporal]
----*/
-
-let i1 = new Temporal.Instant(50000n);
-assert.sameValue(i1.add(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 3, 2, 1)).epochNanoseconds, 3052001n);
-assert.sameValue(i1.add(new Temporal.Duration(0, 0, 0, 0, 0, 0, 4, 3, 2, 1)).epochNanoseconds, BigInt(4 * 1000000000) + 3052001n);
-assert.sameValue(i1.add(new Temporal.Duration(0, 0, 0, 0, 0, 5, 4, 3, 2, 1)).epochNanoseconds, BigInt(5 * 60 + 4) * 1000000000n + 3052001n);
-assert.sameValue(i1.add(new Temporal.Duration(0, 0, 0, 0, 6, 5, 4, 3, 2, 1)).epochNanoseconds, BigInt(6 * 3600 + 5 * 60 + 4) * 1000000000n + 3052001n);
-assert.sameValue(i1.add(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, -3, -2, -1)).epochNanoseconds, -2952001n);
-assert.sameValue(i1.add(new Temporal.Duration(0, 0, 0, 0, 0, 0, -4, -3, -2, -1)).epochNanoseconds, BigInt(-4 * 1000000000) - 2952001n);
-assert.sameValue(i1.add(new Temporal.Duration(0, 0, 0, 0, 0, -5, -4, -3, -2, -1)).epochNanoseconds, BigInt(5 * 60 + 4) * -1000000000n - 2952001n);
-assert.sameValue(i1.add(new Temporal.Duration(0, 0, 0, 0, -6, -5, -4, -3, -2, -1)).epochNanoseconds, BigInt(6 * 3600 + 5 * 60 + 4) * -1000000000n - 2952001n);
-let badInstant = { add: i1.add };
-assert.throws(TypeError, () => badInstant.add(new Temporal.Duration(0, 0, 0, 0, 5)));
-assert.throws(RangeError, () => i1.add(new Temporal.Duration(1)));
-assert.throws(RangeError, () => i1.add(new Temporal.Duration(0, 2)));
-assert.throws(RangeError, () => i1.add(new Temporal.Duration(0, 0, 3)));
-assert.throws(RangeError, () => i1.add(new Temporal.Duration(0, 0, 0, 4)));
-assert.throws(RangeError, () => i1.add(new Temporal.Duration(-1)));
-assert.throws(RangeError, () => i1.add(new Temporal.Duration(0, -2)));
-assert.throws(RangeError, () => i1.add(new Temporal.Duration(0, 0, -3)));
-assert.throws(RangeError, () => i1.add(new Temporal.Duration(0, 0, 0, -4)));
-let i2 = new Temporal.Instant(86400n * 99999999999999999n);
-assert.throws(RangeError, () => i2.add(new Temporal.Duration(0, 0, 0, 0, 999999999)));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/instant-compare.js b/js/src/tests/test262/staging/Temporal/v8/instant-compare.js
deleted file mode 100644
index aad985f5b7bc4..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/instant-compare.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from instant-compare test
-  in V8's mjsunit test instant-compare.js
-features: [Temporal]
----*/
-
-let inst1 = new Temporal.Instant(1234567890123456789n);
-let inst2 = new Temporal.Instant(1234567890123456000n);
-let inst3 = new Temporal.Instant(1234567890123456000n);
-assert.sameValue(Temporal.Instant.compare(inst2, inst3), 0);
-assert.sameValue(Temporal.Instant.compare(inst1, inst2), 1);
-assert.sameValue(Temporal.Instant.compare(inst3, inst1), -1);
-assert.throws(RangeError, () => Temporal.Instant.compare(inst1, 'invalid iso8601 string'));
-assert.throws(RangeError, () => Temporal.Instant.compare('invalid iso8601 string', inst1));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/instant-constructor.js b/js/src/tests/test262/staging/Temporal/v8/instant-constructor.js
deleted file mode 100644
index df15cab984daf..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/instant-constructor.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from instant-constructor test
-  in V8's mjsunit test instant-constructor.js
-features: [Temporal]
----*/
-
-let inst1 = new Temporal.Instant(1234567890123456789n);
-assert.sameValue(inst1.epochNanoseconds, 1234567890123456789n);
-assert.sameValue(inst1.epochMilliseconds, 1234567890123);
-let inst2 = new Temporal.Instant(-1234567890123456789n);
-assert.sameValue(inst2.epochNanoseconds, -1234567890123456789n);
-assert.sameValue(inst2.epochMilliseconds, -1234567890124);
-assert.throws(TypeError, () => Temporal.Instant(1234567890123456789n));
-assert.throws(TypeError, () => {
-  let inst = new Temporal.Instant(undefined);
-});
-assert.throws(TypeError, () => {
-  let inst = new Temporal.Instant(null);
-});
-assert.sameValue(new Temporal.Instant(true).epochNanoseconds, 1n);
-assert.sameValue(new Temporal.Instant(false).epochNanoseconds, 0n);
-assert.throws(TypeError, () => {
-  let inst = Temporal.Instant(12345);
-});
-assert.sameValue(new Temporal.Instant('1234567890123456789').epochNanoseconds, 1234567890123456789n);
-assert.throws(TypeError, () => {
-  let inst = new Temporal.Instant(Symbol(12345n));
-});
-assert.throws(RangeError, () => {
-  let inst = new Temporal.Instant(8640000000000000000001n);
-});
-assert.throws(RangeError, () => {
-  let inst = new Temporal.Instant(-8640000000000000000001n);
-});
-assert.sameValue(new Temporal.Instant(8640000000000000000000n).epochNanoseconds, 8640000000000000000000n);
-assert.sameValue(new Temporal.Instant(-8640000000000000000000n).epochNanoseconds, -8640000000000000000000n);
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/instant-from-epoch-milliseconds.js b/js/src/tests/test262/staging/Temporal/v8/instant-from-epoch-milliseconds.js
deleted file mode 100644
index 695100d4c6be7..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/instant-from-epoch-milliseconds.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from instant-from-epoch-milliseconds test
-  in V8's mjsunit test instant-from-epoch-milliseconds.js
-features: [Temporal]
----*/
-
-let bigint_nano = 567890123456789000000n;
-let milli = 567890123456789;
-let bigint_milli = BigInt(milli);
-let inst1 = new Temporal.Instant(bigint_nano);
-assert.throws(TypeError, () => Temporal.Instant.fromEpochMilliseconds(bigint_milli));
-let inst2 = Temporal.Instant.fromEpochMilliseconds(milli);
-assert(inst2.equals(inst1));
-let just_fit_neg = -8640000000000000;
-let just_fit_pos = 8640000000000000;
-let too_big = 8640000000000001;
-let too_small = -8640000000000001;
-assert.throws(RangeError, () => Temporal.Instant.fromEpochMilliseconds(too_small));
-assert.throws(RangeError, () => Temporal.Instant.fromEpochMilliseconds(too_big));
-assert.sameValue(Temporal.Instant.fromEpochMilliseconds(just_fit_neg).epochMilliseconds, just_fit_neg);
-assert.sameValue(Temporal.Instant.fromEpochMilliseconds(just_fit_pos).epochMilliseconds, just_fit_pos);
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/instant-from-epoch-nanoseconds.js b/js/src/tests/test262/staging/Temporal/v8/instant-from-epoch-nanoseconds.js
deleted file mode 100644
index bfa476f076bdf..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/instant-from-epoch-nanoseconds.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from instant-from-epoch-nanoseconds test
-  in V8's mjsunit test instant-from-epoch-nanoseconds.js
-features: [Temporal]
----*/
-
-let bigint1 = 1234567890123456789n;
-let inst1 = new Temporal.Instant(bigint1);
-let inst2 = Temporal.Instant.fromEpochNanoseconds(bigint1);
-assert(inst2.equals(inst1));
-let just_fit_neg_bigint = -8640000000000000000000n;
-let just_fit_pos_bigint = 8640000000000000000000n;
-let too_big_bigint = 8640000000000000000001n;
-let too_small_bigint = -8640000000000000000001n;
-assert.throws(RangeError, () => {
-  let inst = Temporal.Instant.fromEpochNanoseconds(too_small_bigint);
-});
-assert.throws(RangeError, () => {
-  let inst = Temporal.Instant.fromEpochNanoseconds(too_big_bigint);
-});
-assert.sameValue(Temporal.Instant.fromEpochNanoseconds(just_fit_neg_bigint).epochNanoseconds, just_fit_neg_bigint);
-assert.sameValue(Temporal.Instant.fromEpochNanoseconds(just_fit_pos_bigint).epochNanoseconds, just_fit_pos_bigint);
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/instant-subtract.js b/js/src/tests/test262/staging/Temporal/v8/instant-subtract.js
deleted file mode 100644
index de1f91d198a35..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/instant-subtract.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from instant-subtract test
-  in V8's mjsunit test instant-subtract.js
-features: [Temporal]
----*/
-
-let i1 = new Temporal.Instant(50000n);
-assert.sameValue(i1.subtract(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, -3, -2, -1)).epochNanoseconds, 3052001n);
-assert.sameValue(i1.subtract(new Temporal.Duration(0, 0, 0, 0, 0, 0, -4, -3, -2, -1)).epochNanoseconds, BigInt(4 * 1000000000) + 3052001n);
-assert.sameValue(i1.subtract(new Temporal.Duration(0, 0, 0, 0, 0, -5, -4, -3, -2, -1)).epochNanoseconds, BigInt(5 * 60 + 4) * 1000000000n + 3052001n);
-assert.sameValue(i1.subtract(new Temporal.Duration(0, 0, 0, 0, -6, -5, -4, -3, -2, -1)).epochNanoseconds, BigInt(6 * 3600 + 5 * 60 + 4) * 1000000000n + 3052001n);
-assert.sameValue(i1.subtract(new Temporal.Duration(0, 0, 0, 0, 0, 0, 0, 3, 2, 1)).epochNanoseconds, -2952001n);
-assert.sameValue(i1.subtract(new Temporal.Duration(0, 0, 0, 0, 0, 0, 4, 3, 2, 1)).epochNanoseconds, BigInt(-4 * 1000000000) - 2952001n);
-assert.sameValue(i1.subtract(new Temporal.Duration(0, 0, 0, 0, 0, 5, 4, 3, 2, 1)).epochNanoseconds, BigInt(5 * 60 + 4) * -1000000000n - 2952001n);
-assert.sameValue(i1.subtract(new Temporal.Duration(0, 0, 0, 0, 6, 5, 4, 3, 2, 1)).epochNanoseconds, BigInt(6 * 3600 + 5 * 60 + 4) * -1000000000n - 2952001n);
-let badInstant = { subtract: i1.subtract };
-assert.throws(TypeError, () => badInstant.subtract(new Temporal.Duration(0, 0, 0, 0, 5)));
-assert.throws(RangeError, () => i1.subtract(new Temporal.Duration(1)));
-assert.throws(RangeError, () => i1.subtract(new Temporal.Duration(0, 2)));
-assert.throws(RangeError, () => i1.subtract(new Temporal.Duration(0, 0, 3)));
-assert.throws(RangeError, () => i1.subtract(new Temporal.Duration(0, 0, 0, 4)));
-assert.throws(RangeError, () => i1.subtract(new Temporal.Duration(-1)));
-assert.throws(RangeError, () => i1.subtract(new Temporal.Duration(0, -2)));
-assert.throws(RangeError, () => i1.subtract(new Temporal.Duration(0, 0, -3)));
-assert.throws(RangeError, () => i1.subtract(new Temporal.Duration(0, 0, 0, -4)));
-let i2 = new Temporal.Instant(-86400n * 99999999999999999n);
-assert.throws(RangeError, () => i2.subtract(new Temporal.Duration(0, 0, 0, 0, 999999999)));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/instant-value-of.js b/js/src/tests/test262/staging/Temporal/v8/instant-value-of.js
deleted file mode 100644
index b6ce1dc6dd527..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/instant-value-of.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from instant-valueOf test
-  in V8's mjsunit test instant-valueOf.js
-features: [Temporal]
----*/
-
-let d1 = Temporal.Now.instant();
-assert.throws(TypeError, () => d1.valueOf());
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-add.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-add.js
deleted file mode 100644
index 6fa3a07809f82..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-add.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-add test
-  in V8's mjsunit test plain-date-add.js
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-let d = new Temporal.PlainDate(2021, 7, 20);
-TemporalHelpers.assertPlainDate(d.add('P1D'), 2021, 7, 'M07', 21);
-TemporalHelpers.assertPlainDate(d.subtract('-P1D'), 2021, 7, 'M07', 21);
-TemporalHelpers.assertPlainDate(d.add('-P1D'), 2021, 7, 'M07', 19);
-TemporalHelpers.assertPlainDate(d.subtract('P1D'), 2021, 7, 'M07', 19);
-TemporalHelpers.assertPlainDate(d.add('P11D'), 2021, 7, 'M07', 31);
-TemporalHelpers.assertPlainDate(d.subtract('-P11D'), 2021, 7, 'M07', 31);
-TemporalHelpers.assertPlainDate(d.add('P12D'), 2021, 8, 'M08', 1);
-TemporalHelpers.assertPlainDate(d.subtract('-P12D'), 2021, 8, 'M08', 1);
-let goodDate = new Temporal.PlainDate(2021, 7, 20);
-let badDate = { add: goodDate.add };
-assert.throws(TypeError, () => badDate.add('P1D'));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 7, 20).add('bad duration'));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-compare.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-compare.js
deleted file mode 100644
index 3dd0972b0f40c..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-compare.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-compare test
-  in V8's mjsunit test plain-date-compare.js
-features: [Temporal]
----*/
-
-let t1 = new Temporal.PlainDate(2021, 3, 14);
-let t2 = new Temporal.PlainDate(2021, 3, 14);
-let t3 = t1;
-let t4 = new Temporal.PlainDate(2021, 3, 15);
-let t5 = new Temporal.PlainDate(2021, 4, 14);
-let t6 = new Temporal.PlainDate(2022, 3, 14);
-assert.sameValue(Temporal.PlainDate.compare(t1, t1), 0);
-assert.sameValue(Temporal.PlainDate.compare(t1, t2), 0);
-assert.sameValue(Temporal.PlainDate.compare(t1, t3), 0);
-assert.sameValue(Temporal.PlainDate.compare(t1, '2021-03-14'), 0);
-assert.sameValue(Temporal.PlainDate.compare(t1, '2021-03-14T23:59:59'), 0);
-assert.sameValue(Temporal.PlainDate.compare(t4, t1), 1);
-assert.sameValue(Temporal.PlainDate.compare(t5, t1), 1);
-assert.sameValue(Temporal.PlainDate.compare(t6, t1), 1);
-assert.sameValue(Temporal.PlainDate.compare(t1, t4), -1);
-assert.sameValue(Temporal.PlainDate.compare(t1, t5), -1);
-assert.sameValue(Temporal.PlainDate.compare(t1, t6), -1);
-assert.sameValue(Temporal.PlainDate.compare('2021-07-21', t1), 1);
-assert.throws(RangeError, () => Temporal.PlainDate.compare(t1, 'invalid iso8601 string'));
-assert.throws(RangeError, () => Temporal.PlainDate.compare('invalid iso8601 string', t1));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-constructor.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-constructor.js
deleted file mode 100644
index 8d95da9f4d6fd..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-constructor.js
+++ /dev/null
@@ -1,78 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-constructor test
-  in V8's mjsunit test plain-date-constructor.js
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-let d1 = new Temporal.PlainDate(1911, 10, 10);
-TemporalHelpers.assertPlainDate(d1, 1911, 10, 'M10', 10);
-let d2 = new Temporal.PlainDate(2020, 3, 12);
-TemporalHelpers.assertPlainDate(d2, 2020, 3, 'M03', 12);
-let d3 = new Temporal.PlainDate(1, 12, 25);
-TemporalHelpers.assertPlainDate(d3, 1, 12, 'M12', 25);
-let d4 = new Temporal.PlainDate(1970, 1, 1);
-TemporalHelpers.assertPlainDate(d4, 1970, 1, 'M01', 1);
-let d5 = new Temporal.PlainDate(-10, 12, 1);
-TemporalHelpers.assertPlainDate(d5, -10, 12, 'M12', 1);
-let d6 = new Temporal.PlainDate(-25406, 1, 1);
-TemporalHelpers.assertPlainDate(d6, -25406, 1, 'M01', 1);
-let d7 = new Temporal.PlainDate(26890, 12, 31);
-TemporalHelpers.assertPlainDate(d7, 26890, 12, 'M12', 31);
-assert.throws(TypeError, () => Temporal.PlainDate(2021, 7, 1));
-assert.throws(RangeError, () => new Temporal.PlainDate());
-assert.throws(RangeError, () => new Temporal.PlainDate(2021));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 0));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 7));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 13));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 7, 0));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 7, 32));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, -7, 1));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, -7, -1));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 0, 1));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 13, 1));
-TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 1, 31), 2021, 1, 'M01', 31);
-TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 2, 28), 2021, 2, 'M02', 28);
-TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 3, 31), 2021, 3, 'M03', 31);
-TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 4, 30), 2021, 4, 'M04', 30);
-TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 5, 31), 2021, 5, 'M05', 31);
-TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 6, 30), 2021, 6, 'M06', 30);
-TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 7, 31), 2021, 7, 'M07', 31);
-TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 8, 31), 2021, 8, 'M08', 31);
-TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 9, 30), 2021, 9, 'M09', 30);
-TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 10, 31), 2021, 10, 'M10', 31);
-TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 11, 30), 2021, 11, 'M11', 30);
-TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2021, 12, 31), 2021, 12, 'M12', 31);
-assert.throws(RangeError, () => new Temporal.PlainDate(1900, 2, 29));
-TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2000, 2, 29), 2000, 2, 'M02', 29);
-assert.throws(RangeError, () => new Temporal.PlainDate(2001, 2, 29));
-assert.throws(RangeError, () => new Temporal.PlainDate(2002, 2, 29));
-assert.throws(RangeError, () => new Temporal.PlainDate(2003, 2, 29));
-TemporalHelpers.assertPlainDate(new Temporal.PlainDate(2004, 2, 29), 2004, 2, 'M02', 29);
-assert.throws(RangeError, () => new Temporal.PlainDate(2100, 2, 29));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 1, 32));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 2, 29));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 3, 32));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 4, 31));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 5, 32));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 6, 31));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 7, 32));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 8, 32));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 9, 31));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 10, 32));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 11, 31));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 12, 32));
-assert.throws(RangeError, () => new Temporal.PlainDate(Infinity, 12, 1));
-assert.throws(RangeError, () => new Temporal.PlainDate(-Infinity, 12, 1));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 12, Infinity));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, 12, -Infinity));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, -Infinity, 1));
-assert.throws(RangeError, () => new Temporal.PlainDate(2021, Infinity, 1));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-equals.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-equals.js
deleted file mode 100644
index 2cdc96c5c2185..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-equals.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-equals test
-  in V8's mjsunit test plain-date-equals.js
-features: [Temporal]
----*/
-
-let d1 = new Temporal.PlainDate(2021, 2, 28);
-let d2 = Temporal.PlainDate.from('2021-02-28');
-let d3 = Temporal.PlainDate.from('2021-01-28');
-assert(d1.equals(d2));
-assert(!d1.equals(d3));
-assert(!d2.equals(d3));
-let badDate = { equals: d1.equals };
-assert.throws(TypeError, () => badDate.equals(d1));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-from.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-from.js
deleted file mode 100644
index be83b05661b7c..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-from.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-from test
-  in V8's mjsunit test plain-date-from.js
-features: [Temporal]
----*/
-
-let d1 = Temporal.Now.plainDateISO();
-[
-  true,
-  false,
-  'string is invalid',
-  Symbol(),
-  123,
-  456n,
-  Infinity,
-  NaN,
-  null
-].forEach(function (invalidOptions) {
-  assert.throws(TypeError, () => Temporal.PlainDate.from(d1, invalidOptions));
-});
-assert.throws(RangeError, () => Temporal.PlainDate.from(d1, { overflow: 'invalid overflow' }));
-[
-  undefined,
-  {},
-  { overflow: 'constrain' },
-  { overflow: 'reject' }
-].forEach(function (validOptions) {
-  let d = new Temporal.PlainDate(1, 2, 3);
-  let d2 = Temporal.PlainDate.from(d, validOptions);
-  assert.sameValue(d2.year, 1);
-  assert.sameValue(d2.month, 2);
-  assert.sameValue(d2.day, 3);
-  assert.sameValue(d2.calendarId, 'iso8601');
-});
-[
-  undefined,
-  {},
-  { overflow: 'constrain' },
-  { overflow: 'reject' }
-].forEach(function (validOptions) {
-  let d3 = Temporal.PlainDate.from({
-    year: 9,
-    month: 8,
-    day: 7
-  }, validOptions);
-  assert.sameValue(d3.year, 9);
-  assert.sameValue(d3.month, 8);
-  assert.sameValue(d3.monthCode, 'M08');
-  assert.sameValue(d3.day, 7);
-  assert.sameValue(d3.calendarId, 'iso8601');
-});
-[
-  undefined,
-  {},
-  { overflow: 'constrain' }
-].forEach(function (validOptions) {
-  let d4 = Temporal.PlainDate.from({
-    year: 9,
-    month: 14,
-    day: 32
-  }, validOptions);
-  assert.sameValue(d4.year, 9);
-  assert.sameValue(d4.month, 12);
-  assert.sameValue(d4.monthCode, 'M12');
-  assert.sameValue(d4.day, 31);
-  assert.sameValue(d4.calendarId, 'iso8601');
-});
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 9,
-  month: 14,
-  day: 30
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDate.from({
-  year: 9,
-  month: 12,
-  day: 32
-}, { overflow: 'reject' }));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-get-iso-fields.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-get-iso-fields.js
deleted file mode 100644
index 8eb634b4e4357..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-get-iso-fields.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-get-iso-fields test
-  in V8's mjsunit test plain-date-get-iso-fields.js
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-let d1 = new Temporal.PlainDate(1911, 10, 10);
-TemporalHelpers.assertPlainDate(d1, 1911, 10, 'M10', 10);
-let d2 = new Temporal.PlainDate(2020, 3, 12);
-TemporalHelpers.assertPlainDate(d2, 2020, 3, 'M03', 12);
-let d3 = new Temporal.PlainDate(1, 12, 25);
-TemporalHelpers.assertPlainDate(d3, 1, 12, 'M12', 25);
-let d4 = new Temporal.PlainDate(1970, 1, 1);
-TemporalHelpers.assertPlainDate(d4, 1970, 1, 'M01', 1);
-let d5 = new Temporal.PlainDate(-10, 12, 1);
-TemporalHelpers.assertPlainDate(d5, -10, 12, 'M12', 1);
-let d6 = new Temporal.PlainDate(-25406, 1, 1);
-TemporalHelpers.assertPlainDate(d6, -25406, 1, 'M01', 1);
-let d7 = new Temporal.PlainDate(26890, 12, 31);
-TemporalHelpers.assertPlainDate(d7, 26890, 12, 'M12', 31);
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-add.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-time-add.js
deleted file mode 100644
index 88d807f84dc8d..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-add.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-time-add test
-  in V8's mjsunit test plain-date-time-add.js
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3, 4, 5, 6).add('PT9H8M7.080090010S'), 2021, 7, 'M07', 20, 10, 10, 10, 84, 95, 16);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 0, 0, 0, 0, 1, 996).add('PT0.0000071S'), 2021, 7, 'M07', 20, 0, 0, 0, 0, 9, 96);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 0, 0, 0, 1, 996).add('PT0.0071S'), 2021, 7, 'M07', 20, 0, 0, 0, 9, 96, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 0, 0, 1, 996).add('PT7.1S'), 2021, 7, 'M07', 20, 0, 0, 9, 96, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 0, 1, 59).add('PT5M7S'), 2021, 7, 'M07', 20, 0, 7, 6, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 59).add('PT5H7M'), 2021, 7, 'M07', 20, 7, 6, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 19).add('PT8H'), 2021, 7, 'M07', 21, 3, 0, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 21, 52, 53, 994, 995, 996).add('PT5H13M11.404303202S'), 2021, 7, 'M07', 21, 3, 6, 5, 399, 299, 198);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 0, 0, 0, 0, 0, 995).add('PT0.000000006S'), 2021, 7, 'M07', 20, 0, 0, 0, 0, 1, 1);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 0, 0, 0, 0, 0, 995).add('PT0.00000006S'), 2021, 7, 'M07', 20, 0, 0, 0, 0, 1, 55);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 0, 0, 0, 0, 0, 995).add('PT0.0000006S'), 2021, 7, 'M07', 20, 0, 0, 0, 0, 1, 595);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3, 4, 5, 6).add('-PT0.000000007S'), 2021, 7, 'M07', 20, 1, 2, 3, 4, 4, 999);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3, 4, 5, 6).add('-PT0.000005007S'), 2021, 7, 'M07', 20, 1, 2, 3, 3, 999, 999);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3, 4, 5, 6).add('-PT0.004005007S'), 2021, 7, 'M07', 20, 1, 2, 2, 999, 999, 999);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3, 4, 5, 6).add('-PT0.005006007S'), 2021, 7, 'M07', 20, 1, 2, 2, 998, 998, 999);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3, 4, 5, 6).add('-PT4.005006007S'), 2021, 7, 'M07', 20, 1, 1, 58, 998, 998, 999);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3, 4, 5, 6).add('-PT4S'), 2021, 7, 'M07', 20, 1, 1, 59, 4, 5, 6);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3, 4, 5, 6).add('-PT5M'), 2021, 7, 'M07', 20, 0, 57, 3, 4, 5, 6);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3, 4, 5, 6).add('-PT1H5M'), 2021, 7, 'M07', 19, 23, 57, 3, 4, 5, 6);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3, 4, 5, 6).add('-PT1H5M4S'), 2021, 7, 'M07', 19, 23, 56, 59, 4, 5, 6);
-let goodDateTime = new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3);
-let badDateTime = { add: goodDateTime.add };
-assert.throws(TypeError, () => badDateTime.add('PT30M'));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3).add('bad duration'));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-compare.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-time-compare.js
deleted file mode 100644
index 8837ebc722a71..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-compare.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-time-compare test
-  in V8's mjsunit test plain-date-time-compare.js
-features: [Temporal]
----*/
-
-let t1 = new Temporal.PlainDateTime(2021, 3, 14, 1, 2, 3, 4, 5, 6);
-let t2 = new Temporal.PlainDateTime(2021, 3, 14, 1, 2, 3, 4, 5, 6);
-let t3 = t1;
-let t4 = new Temporal.PlainDateTime(2021, 3, 15, 1, 2, 3, 4, 5, 6);
-let t5 = new Temporal.PlainDateTime(2021, 4, 14, 1, 2, 3, 4, 5, 6);
-let t6 = new Temporal.PlainDateTime(2022, 3, 14, 1, 2, 3, 4, 5, 6);
-let t7 = new Temporal.PlainDateTime(2021, 3, 14, 1, 2, 3, 4, 5, 7);
-assert.sameValue(Temporal.PlainDateTime.compare(t1, t1), 0);
-assert.sameValue(Temporal.PlainDateTime.compare(t1, t2), 0);
-assert.sameValue(Temporal.PlainDateTime.compare(t1, t3), 0);
-assert.sameValue(Temporal.PlainDateTime.compare(t1, '2021-03-14T01:02:03'), 1);
-assert.sameValue(Temporal.PlainDateTime.compare(t4, t1), 1);
-assert.sameValue(Temporal.PlainDateTime.compare(t5, t1), 1);
-assert.sameValue(Temporal.PlainDateTime.compare(t6, t1), 1);
-assert.sameValue(Temporal.PlainDateTime.compare(t7, t1), 1);
-assert.sameValue(Temporal.PlainDateTime.compare(t1, t4), -1);
-assert.sameValue(Temporal.PlainDateTime.compare(t1, t5), -1);
-assert.sameValue(Temporal.PlainDateTime.compare(t1, t6), -1);
-assert.sameValue(Temporal.PlainDateTime.compare(t1, t7), -1);
-assert.sameValue(Temporal.PlainDateTime.compare('2021-07-21', t1), 1);
-assert.sameValue(Temporal.PlainDateTime.compare(t1, '2021-03-14T01:02:03.004005006'), 0);
-assert.throws(RangeError, () => Temporal.PlainDateTime.compare(t1, 'invalid iso8601 string'));
-assert.throws(RangeError, () => Temporal.PlainDateTime.compare('invalid iso8601 string', t1));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-constructor.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-time-constructor.js
deleted file mode 100644
index 0cf733cc3af59..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-constructor.js
+++ /dev/null
@@ -1,105 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-time-constructor test
-  in V8's mjsunit test plain-date-time-constructor.js
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-let d1 = new Temporal.PlainDateTime(1911, 10, 10);
-TemporalHelpers.assertPlainDateTime(d1, 1911, 10, 'M10', 10, 0, 0, 0, 0, 0, 0);
-let d2 = new Temporal.PlainDateTime(2020, 3, 12);
-TemporalHelpers.assertPlainDateTime(d2, 2020, 3, 'M03', 12, 0, 0, 0, 0, 0, 0);
-let d3 = new Temporal.PlainDateTime(1, 12, 25);
-TemporalHelpers.assertPlainDateTime(d3, 1, 12, 'M12', 25, 0, 0, 0, 0, 0, 0);
-let d4 = new Temporal.PlainDateTime(1970, 1, 1);
-TemporalHelpers.assertPlainDateTime(d4, 1970, 1, 'M01', 1, 0, 0, 0, 0, 0, 0);
-let d5 = new Temporal.PlainDateTime(-10, 12, 1);
-TemporalHelpers.assertPlainDateTime(d5, -10, 12, 'M12', 1, 0, 0, 0, 0, 0, 0);
-let d6 = new Temporal.PlainDateTime(-25406, 1, 1);
-TemporalHelpers.assertPlainDateTime(d6, -25406, 1, 'M01', 1, 0, 0, 0, 0, 0, 0);
-let d7 = new Temporal.PlainDateTime(26890, 12, 31);
-TemporalHelpers.assertPlainDateTime(d7, 26890, 12, 'M12', 31, 0, 0, 0, 0, 0, 0);
-assert.throws(TypeError, () => Temporal.PlainDateTime(2021, 7, 1));
-assert.throws(RangeError, () => new Temporal.PlainDateTime());
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 0));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 13));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7, 0));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7, 32));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, -7, 1));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, -7, -1));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 0, 1));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 13, 1));
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 1, 31), 2021, 1, 'M01', 31, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 2, 28), 2021, 2, 'M02', 28, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 3, 31), 2021, 3, 'M03', 31, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 4, 30), 2021, 4, 'M04', 30, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 5, 31), 2021, 5, 'M05', 31, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 6, 30), 2021, 6, 'M06', 30, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 31), 2021, 7, 'M07', 31, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 8, 31), 2021, 8, 'M08', 31, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 9, 30), 2021, 9, 'M09', 30, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 10, 31), 2021, 10, 'M10', 31, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 11, 30), 2021, 11, 'M11', 30, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 12, 31), 2021, 12, 'M12', 31, 0, 0, 0, 0, 0, 0);
-assert.throws(RangeError, () => new Temporal.PlainDateTime(1900, 2, 29));
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2000, 2, 29), 2000, 2, 'M02', 29, 0, 0, 0, 0, 0, 0);
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2001, 2, 29));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2002, 2, 29));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2003, 2, 29));
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2004, 2, 29), 2004, 2, 'M02', 29, 0, 0, 0, 0, 0, 0);
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2100, 2, 29));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 1, 32));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 2, 29));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 3, 32));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 4, 31));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 5, 32));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 6, 31));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7, 32));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 8, 32));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 9, 31));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 10, 32));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 11, 31));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 12, 32));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(Infinity, 12, 1));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(-Infinity, 12, 1));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 12, Infinity));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 12, -Infinity));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, -Infinity, 1));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, Infinity, 1));
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 9), 2021, 7, 'M07', 9, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 9, 1, 2, 3, 4, 5, 6), 2021, 7, 'M07', 9, 1, 2, 3, 4, 5, 6);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 9, 1, 2, 3, 4, 5), 2021, 7, 'M07', 9, 1, 2, 3, 4, 5, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 9, 1, 2, 3, 4), 2021, 7, 'M07', 9, 1, 2, 3, 4, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 9, 1, 2, 3), 2021, 7, 'M07', 9, 1, 2, 3, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 9, 1, 2), 2021, 7, 'M07', 9, 1, 2, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 9, 1, 0), 2021, 7, 'M07', 9, 1, 0, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 9, 0, 0, 0, 0, 0, 0), 2021, 7, 'M07', 9, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 9, 23, 59, 59, 999, 999, 999), 2021, 7, 'M07', 9, 23, 59, 59, 999, 999, 999);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 9, true, false, undefined, true), 2021, 7, 'M07', 9, 1, 0, 0, 1, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 9, 11.9, 12.8, 13.7, 14.6, 15.5, 1.999999), 2021, 7, 'M07', 9, 11, 12, 13, 14, 15, 1);
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7, 9, -Infinity));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7, 9, Infinity));
-assert.throws(TypeError, () => new Temporal.PlainDateTime(2021, 7, 9, Symbol(2)));
-assert.throws(TypeError, () => new Temporal.PlainDateTime(2021, 7, 9, 3n));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7, 9, 24));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7, 9, 0, 60));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7, 9, 0, 0, 60));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7, 9, 0, 0, 0, 1000));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7, 9, 0, 0, 0, 0, 1000));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7, 9, 0, 0, 0, 0, 0, 1000));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7, 9, -1));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7, 9, 0, -1));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7, 9, 0, 0, -1));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7, 9, 0, 0, 0, -1));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7, 9, 0, 0, 0, 0, -1));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7, 9, 0, 0, 0, 0, 0, -1));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-equals.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-time-equals.js
deleted file mode 100644
index 5096b6cef7bae..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-equals.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-time-equals test
-  in V8's mjsunit test plain-date-time-equals.js
-features: [Temporal]
----*/
-
-let d1 = new Temporal.PlainDateTime(2021, 2, 28, 11, 12, 13);
-let d2 = Temporal.PlainDateTime.from({
-  year: 2021,
-  month: 2,
-  day: 28,
-  hour: 11,
-  minute: 12,
-  second: 13
-});
-let d3 = Temporal.PlainDateTime.from({
-  year: 2021,
-  month: 2,
-  day: 28,
-  hour: 11,
-  minute: 12,
-  second: 13,
-  nanosecond: 1
-});
-assert(d1.equals(d2));
-assert(!d1.equals(d3));
-assert(!d2.equals(d3));
-let badDate = { equals: d1.equals };
-assert.throws(TypeError, () => badDate.equals(d1));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-from.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-time-from.js
deleted file mode 100644
index 76b23fa733380..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-from.js
+++ /dev/null
@@ -1,152 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-time-from test
-  in V8's mjsunit test plain-date-time-from.js
-features: [Temporal]
----*/
-
-let d1 = Temporal.Now.plainDateTimeISO();
-[
-  true,
-  false,
-  'string is invalid',
-  Symbol(),
-  123,
-  456n,
-  Infinity,
-  NaN,
-  null
-].forEach(function (invalidOptions) {
-  assert.throws(TypeError, () => Temporal.PlainDateTime.from(d1, invalidOptions));
-});
-assert.throws(RangeError, () => Temporal.PlainDateTime.from(d1, { overflow: 'invalid overflow' }));
-[
-  undefined,
-  {},
-  { overflow: 'constrain' },
-  { overflow: 'reject' }
-].forEach(function (validOptions) {
-  let d = new Temporal.PlainDateTime(1, 2, 3, 4, 5, 6, 7, 8, 9);
-  let d2 = Temporal.PlainDateTime.from(d, validOptions);
-  assert.sameValue(d2.year, 1);
-  assert.sameValue(d2.month, 2);
-  assert.sameValue(d2.monthCode, 'M02');
-  assert.sameValue(d2.day, 3);
-  assert.sameValue(d2.hour, 4);
-  assert.sameValue(d2.minute, 5);
-  assert.sameValue(d2.second, 6);
-  assert.sameValue(d2.millisecond, 7);
-  assert.sameValue(d2.microsecond, 8);
-  assert.sameValue(d2.nanosecond, 9);
-  assert.sameValue(d2.calendarId, 'iso8601');
-});
-[
-  undefined,
-  {},
-  { overflow: 'constrain' },
-  { overflow: 'reject' }
-].forEach(function (validOptions) {
-  let d3 = Temporal.PlainDateTime.from({
-    year: 9,
-    month: 8,
-    day: 7,
-    hour: 6,
-    minute: 5,
-    second: 4,
-    millisecond: 3,
-    microsecond: 2,
-    nanosecond: 1
-  }, validOptions);
-  assert.sameValue(d3.year, 9);
-  assert.sameValue(d3.month, 8);
-  assert.sameValue(d3.monthCode, 'M08');
-  assert.sameValue(d3.day, 7);
-  assert.sameValue(d3.hour, 6);
-  assert.sameValue(d3.minute, 5);
-  assert.sameValue(d3.second, 4);
-  assert.sameValue(d3.millisecond, 3);
-  assert.sameValue(d3.microsecond, 2);
-  assert.sameValue(d3.nanosecond, 1);
-  assert.sameValue(d3.calendarId, 'iso8601');
-});
-[
-  undefined,
-  {},
-  { overflow: 'constrain' }
-].forEach(function (validOptions) {
-  let d4 = Temporal.PlainDateTime.from({
-    year: 9,
-    month: 14,
-    day: 32,
-    hour: 24,
-    minute: 60,
-    second: 60,
-    millisecond: 1000,
-    microsecond: 1000,
-    nanosecond: 1000
-  }, validOptions);
-  assert.sameValue(d4.year, 9);
-  assert.sameValue(d4.month, 12);
-  assert.sameValue(d4.monthCode, 'M12');
-  assert.sameValue(d4.day, 31);
-  assert.sameValue(d4.hour, 23);
-  assert.sameValue(d4.minute, 59);
-  assert.sameValue(d4.second, 59);
-  assert.sameValue(d4.millisecond, 999);
-  assert.sameValue(d4.microsecond, 999);
-  assert.sameValue(d4.nanosecond, 999);
-  assert.sameValue(d4.calendarId, 'iso8601');
-});
-assert.throws(RangeError, () => Temporal.PlainDateTime.from({
-  year: 9,
-  month: 14,
-  day: 30
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDateTime.from({
-  year: 9,
-  month: 12,
-  day: 32
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDateTime.from({
-  year: 9,
-  month: 12,
-  day: 31,
-  hour: 24
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDateTime.from({
-  year: 9,
-  month: 12,
-  day: 31,
-  minute: 60
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDateTime.from({
-  year: 9,
-  month: 12,
-  day: 31,
-  second: 60
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDateTime.from({
-  year: 9,
-  month: 12,
-  day: 31,
-  millisecond: 1000
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDateTime.from({
-  year: 9,
-  month: 12,
-  day: 31,
-  microsecond: 1000
-}, { overflow: 'reject' }));
-assert.throws(RangeError, () => Temporal.PlainDateTime.from({
-  year: 9,
-  month: 12,
-  day: 31,
-  nanosecond: 1000
-}, { overflow: 'reject' }));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-subtract.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-time-subtract.js
deleted file mode 100644
index 6a65492f6d335..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-subtract.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-time-subtract test
-  in V8's mjsunit test plain-date-time-subtract.js
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3, 4, 5, 6).subtract('-PT9H8M7.080090010S'), 2021, 7, 'M07', 20, 10, 10, 10, 84, 95, 16);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 0, 0, 0, 0, 1, 996).subtract('-PT0.0000071S'), 2021, 7, 'M07', 20, 0, 0, 0, 0, 9, 96);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 0, 0, 0, 1, 996).subtract('-PT0.0071S'), 2021, 7, 'M07', 20, 0, 0, 0, 9, 96, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 0, 0, 1, 996).subtract('-PT7.1S'), 2021, 7, 'M07', 20, 0, 0, 9, 96, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 0, 1, 59).subtract('-PT5M7S'), 2021, 7, 'M07', 20, 0, 7, 6, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 59).subtract('-PT5H7M'), 2021, 7, 'M07', 20, 7, 6, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 19).subtract('-PT8H'), 2021, 7, 'M07', 21, 3, 0, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 21, 52, 53, 994, 995, 996).subtract('-PT5H13M11.404303202S'), 2021, 7, 'M07', 21, 3, 6, 5, 399, 299, 198);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 0, 0, 0, 0, 0, 995).subtract('-PT0.000000006S'), 2021, 7, 'M07', 20, 0, 0, 0, 0, 1, 1);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 0, 0, 0, 0, 0, 995).subtract('-PT0.00000006S'), 2021, 7, 'M07', 20, 0, 0, 0, 0, 1, 55);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 0, 0, 0, 0, 0, 995).subtract('-PT0.0000006S'), 2021, 7, 'M07', 20, 0, 0, 0, 0, 1, 595);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3, 4, 5, 6).subtract('PT0.000000007S'), 2021, 7, 'M07', 20, 1, 2, 3, 4, 4, 999);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3, 4, 5, 6).subtract('PT0.000005007S'), 2021, 7, 'M07', 20, 1, 2, 3, 3, 999, 999);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3, 4, 5, 6).subtract('PT0.004005007S'), 2021, 7, 'M07', 20, 1, 2, 2, 999, 999, 999);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3, 4, 5, 6).subtract('PT0.005006007S'), 2021, 7, 'M07', 20, 1, 2, 2, 998, 998, 999);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3, 4, 5, 6).subtract('PT4.005006007S'), 2021, 7, 'M07', 20, 1, 1, 58, 998, 998, 999);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3, 4, 5, 6).subtract('PT4S'), 2021, 7, 'M07', 20, 1, 1, 59, 4, 5, 6);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3, 4, 5, 6).subtract('PT5M'), 2021, 7, 'M07', 20, 0, 57, 3, 4, 5, 6);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3, 4, 5, 6).subtract('PT1H5M'), 2021, 7, 'M07', 19, 23, 57, 3, 4, 5, 6);
-TemporalHelpers.assertPlainDateTime(new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3, 4, 5, 6).subtract('PT1H5M4S'), 2021, 7, 'M07', 19, 23, 56, 59, 4, 5, 6);
-let goodDateTime = new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3);
-let badDateTime = { subtract: goodDateTime.subtract };
-assert.throws(TypeError, () => badDateTime.subtract('PT30M'));
-assert.throws(RangeError, () => new Temporal.PlainDateTime(2021, 7, 20, 1, 2, 3).subtract('bad duration'));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-to-json.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-time-to-json.js
deleted file mode 100644
index e5d8f625e5ee1..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-to-json.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-time-to-json test
-  in V8's mjsunit test plain-date-time-to-json.js
-features: [Temporal]
----*/
-
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1).toJSON(), '2021-07-01T00:00:00');
-assert.sameValue(new Temporal.PlainDateTime(9999, 12, 31).toJSON(), '9999-12-31T00:00:00');
-assert.sameValue(new Temporal.PlainDateTime(1000, 1, 1).toJSON(), '1000-01-01T00:00:00');
-assert.sameValue(new Temporal.PlainDateTime(10000, 1, 1).toJSON(), '+010000-01-01T00:00:00');
-assert.sameValue(new Temporal.PlainDateTime(25021, 7, 1).toJSON(), '+025021-07-01T00:00:00');
-assert.sameValue(new Temporal.PlainDateTime(999, 12, 31).toJSON(), '0999-12-31T00:00:00');
-assert.sameValue(new Temporal.PlainDateTime(99, 8, 1).toJSON(), '0099-08-01T00:00:00');
-assert.sameValue(new Temporal.PlainDateTime(-20, 9, 30).toJSON(), '-000020-09-30T00:00:00');
-assert.sameValue(new Temporal.PlainDateTime(-2021, 7, 1).toJSON(), '-002021-07-01T00:00:00');
-assert.sameValue(new Temporal.PlainDateTime(-22021, 7, 1).toJSON(), '-022021-07-01T00:00:00');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 2, 3, 4).toJSON(), '2021-07-01T02:03:04');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 3, 4).toJSON(), '2021-07-01T00:03:04');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 0, 4).toJSON(), '2021-07-01T00:00:04');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 0, 0).toJSON(), '2021-07-01T00:00:00');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 2, 0, 0).toJSON(), '2021-07-01T02:00:00');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 2, 3, 0).toJSON(), '2021-07-01T02:03:00');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 23, 59, 59).toJSON(), '2021-07-01T23:59:59');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59).toJSON(), '2021-07-01T00:59:59');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 0, 0, 1).toJSON(), '2021-07-01T00:59:59.000000001');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 0, 8, 9).toJSON(), '2021-07-01T00:59:59.000008009');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 7, 8, 9).toJSON(), '2021-07-01T00:59:59.007008009');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 0, 0, 90).toJSON(), '2021-07-01T00:59:59.00000009');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 0, 0, 900).toJSON(), '2021-07-01T00:59:59.0000009');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 0, 8).toJSON(), '2021-07-01T00:59:59.000008');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 0, 8, 0).toJSON(), '2021-07-01T00:59:59.000008');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 0, 80).toJSON(), '2021-07-01T00:59:59.00008');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 0, 80, 0).toJSON(), '2021-07-01T00:59:59.00008');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 0, 800).toJSON(), '2021-07-01T00:59:59.0008');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 0, 800, 0).toJSON(), '2021-07-01T00:59:59.0008');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 7, 0, 0).toJSON(), '2021-07-01T00:59:59.007');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 7, 0).toJSON(), '2021-07-01T00:59:59.007');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 7).toJSON(), '2021-07-01T00:59:59.007');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 70, 0, 0).toJSON(), '2021-07-01T00:59:59.07');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 70, 0).toJSON(), '2021-07-01T00:59:59.07');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 70).toJSON(), '2021-07-01T00:59:59.07');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 700, 0, 0).toJSON(), '2021-07-01T00:59:59.7');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 700, 0).toJSON(), '2021-07-01T00:59:59.7');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 700).toJSON(), '2021-07-01T00:59:59.7');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 0, 876).toJSON(), '2021-07-01T00:59:59.000876');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 876).toJSON(), '2021-07-01T00:59:59.876');
-assert.sameValue(new Temporal.PlainDateTime(2021, 7, 1, 0, 59, 59, 0, 0, 876).toJSON(), '2021-07-01T00:59:59.000000876');
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-to-plain-time.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-time-to-plain-time.js
deleted file mode 100644
index 404a1964d83ed..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-to-plain-time.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-time-to-plain-time test
-  in V8's mjsunit test plain-date-time-to-plain-time.js
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-let d1 = new Temporal.PlainDateTime(2021, 12, 11, 1, 2, 3, 4, 5, 6);
-let badDateTime = { toPlainTime: d1.toPlainTime };
-assert.throws(TypeError, () => badDateTime.toPlainTime());
-TemporalHelpers.assertPlainTime(d1.toPlainTime(), 1, 2, 3, 4, 5, 6);
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-value-of.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-time-value-of.js
deleted file mode 100644
index 41bc83c5c71c4..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-value-of.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-time-valueOf test
-  in V8's mjsunit test plain-date-time-valueOf.js
-features: [Temporal]
----*/
-
-let d1 = Temporal.Now.plainDateTimeISO();
-assert.throws(TypeError, () => d1.valueOf());
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-with-plain-time.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-time-with-plain-time.js
deleted file mode 100644
index a6be4ec01000a..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-with-plain-time.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-time-with-plain-time test
-  in V8's mjsunit test plain-date-time-with-plain-time.js
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-let d1 = new Temporal.PlainDateTime(1911, 10, 10, 4, 5, 6, 7, 8, 9);
-let badDate = { withPlainTime: d1.withPlainTime };
-assert.throws(TypeError, () => badDate.withPlainTime());
-let timeRecord = {
-  hour: 9,
-  minute: 8,
-  second: 7,
-  millisecond: 6,
-  microsecond: 5,
-  nanosecond: 4
-};
-TemporalHelpers.assertPlainDateTime(d1.withPlainTime(timeRecord), 1911, 10, 'M10', 10, 9, 8, 7, 6, 5, 4);
-
-let d3 = new Temporal.PlainDateTime(2020, 3, 15, 4, 5, 6, 7, 8, 9, 'roc');
-TemporalHelpers.assertPlainDateTime(d3.withPlainTime(timeRecord), 109, 3, 'M03', 15, 9, 8, 7, 6, 5, 4, '', 'roc', 109);
-assert.throws(TypeError, () => d1.withPlainTime(null));
-assert.throws(TypeError, () => d1.withPlainTime(true));
-assert.throws(TypeError, () => d1.withPlainTime(false));
-assert.throws(TypeError, () => d1.withPlainTime(Infinity));
-assert.throws(RangeError, () => d1.withPlainTime('invalid iso8601 string'));
-assert.throws(TypeError, () => d1.withPlainTime(123));
-assert.throws(TypeError, () => d1.withPlainTime(456n));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-with.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-time-with.js
deleted file mode 100644
index 88e4eb67be43d..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-time-with.js
+++ /dev/null
@@ -1,59 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-time-with test
-  in V8's mjsunit test plain-date-time-with.js
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-let d1 = new Temporal.PlainDateTime(1911, 11, 10, 4, 5, 6, 7, 8, 9);
-let badDate = { with: d1.with };
-assert.throws(TypeError, () => badDate.with());
-assert.throws(TypeError, () => d1.with(null));
-assert.throws(TypeError, () => d1.with(undefined));
-assert.throws(TypeError, () => d1.with('string is invalid'));
-assert.throws(TypeError, () => d1.with(true));
-assert.throws(TypeError, () => d1.with(false));
-assert.throws(TypeError, () => d1.with(NaN));
-assert.throws(TypeError, () => d1.with(Infinity));
-assert.throws(TypeError, () => d1.with(123));
-assert.throws(TypeError, () => d1.with(456n));
-assert.throws(TypeError, () => d1.with(Symbol()));
-let date = Temporal.Now.plainDateISO();
-assert.throws(TypeError, () => d1.with(date));
-let dateTime = Temporal.Now.plainDateTimeISO();
-assert.throws(TypeError, () => d1.with(dateTime));
-let time = Temporal.Now.plainTimeISO();
-assert.throws(TypeError, () => d1.with(time));
-let ym = new Temporal.PlainYearMonth(2021, 7);
-assert.throws(TypeError, () => d1.with(ym));
-let md = new Temporal.PlainMonthDay(12, 25);
-assert.throws(TypeError, () => d1.with(md));
-assert.throws(TypeError, () => d1.with({ calendar: 'iso8601' }));
-assert.throws(TypeError, () => d1.with({ timeZone: 'UTC' }));
-assert.throws(TypeError, () => d1.with({ day: 3 }, null));
-assert.throws(TypeError, () => d1.with({ day: 3 }, 'string is invalid'));
-assert.throws(TypeError, () => d1.with({ day: 3 }, true));
-assert.throws(TypeError, () => d1.with({ day: 3 }, false));
-assert.throws(TypeError, () => d1.with({ day: 3 }, 123));
-assert.throws(TypeError, () => d1.with({ day: 3 }, 456n));
-assert.throws(TypeError, () => d1.with({ day: 3 }, Symbol()));
-assert.throws(TypeError, () => d1.with({ day: 3 }, NaN));
-assert.throws(TypeError, () => d1.with({ day: 3 }, Infinity));
-TemporalHelpers.assertPlainDateTime(d1.with({ year: 2021 }), 2021, 11, 'M11', 10, 4, 5, 6, 7, 8, 9);
-TemporalHelpers.assertPlainDateTime(d1.with({ month: 3 }), 1911, 3, 'M03', 10, 4, 5, 6, 7, 8, 9);
-TemporalHelpers.assertPlainDateTime(d1.with({ monthCode: 'M05' }), 1911, 5, 'M05', 10, 4, 5, 6, 7, 8, 9);
-TemporalHelpers.assertPlainDateTime(d1.with({ day: 1 }), 1911, 11, 'M11', 1, 4, 5, 6, 7, 8, 9);
-TemporalHelpers.assertPlainDateTime(d1.with({ hour: 2 }), 1911, 11, 'M11', 10, 2, 5, 6, 7, 8, 9);
-TemporalHelpers.assertPlainDateTime(d1.with({ minute: 3 }), 1911, 11, 'M11', 10, 4, 3, 6, 7, 8, 9);
-TemporalHelpers.assertPlainDateTime(d1.with({ second: 4 }), 1911, 11, 'M11', 10, 4, 5, 4, 7, 8, 9);
-TemporalHelpers.assertPlainDateTime(d1.with({ millisecond: 5 }), 1911, 11, 'M11', 10, 4, 5, 6, 5, 8, 9);
-TemporalHelpers.assertPlainDateTime(d1.with({ microsecond: 6 }), 1911, 11, 'M11', 10, 4, 5, 6, 7, 6, 9);
-TemporalHelpers.assertPlainDateTime(d1.with({ nanosecond: 7 }), 1911, 11, 'M11', 10, 4, 5, 6, 7, 8, 7);
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-to-json.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-to-json.js
deleted file mode 100644
index 33d91980b00e8..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-to-json.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-to-json test
-  in V8's mjsunit test plain-date-to-json.js
-features: [Temporal]
----*/
-
-assert.sameValue(new Temporal.PlainDate(2021, 7, 1).toJSON(), '2021-07-01');
-assert.sameValue(new Temporal.PlainDate(9999, 12, 31).toJSON(), '9999-12-31');
-assert.sameValue(new Temporal.PlainDate(1000, 1, 1).toJSON(), '1000-01-01');
-assert.sameValue(new Temporal.PlainDate(99, 8, 1).toJSON(), '0099-08-01');
-assert.sameValue(new Temporal.PlainDate(999, 12, 31).toJSON(), '0999-12-31');
-assert.sameValue(new Temporal.PlainDate(10000, 1, 1).toJSON(), '+010000-01-01');
-assert.sameValue(new Temporal.PlainDate(25021, 7, 1).toJSON(), '+025021-07-01');
-assert.sameValue(new Temporal.PlainDate(-20, 9, 30).toJSON(), '-000020-09-30');
-assert.sameValue(new Temporal.PlainDate(-2021, 7, 1).toJSON(), '-002021-07-01');
-assert.sameValue(new Temporal.PlainDate(-22021, 7, 1).toJSON(), '-022021-07-01');
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-to-plain-date-time.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-to-plain-date-time.js
deleted file mode 100644
index aa1b030a6c422..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-to-plain-date-time.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-to-plain-date-time test
-  in V8's mjsunit test plain-date-to-plain-date-time.js
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-let d1 = new Temporal.PlainDate(2021, 12, 11);
-let badDate = { toPlainDateTime: d1.toPlainDateTime };
-assert.throws(TypeError, () => badDate.toPlainDateTime());
-assert.throws(TypeError, () => d1.toPlainDateTime(null));
-assert.throws(RangeError, () => d1.toPlainDateTime('string is invalid'));
-assert.throws(TypeError, () => d1.toPlainDateTime(true));
-assert.throws(TypeError, () => d1.toPlainDateTime(false));
-assert.throws(TypeError, () => d1.toPlainDateTime(NaN));
-assert.throws(TypeError, () => d1.toPlainDateTime(Infinity));
-assert.throws(TypeError, () => d1.toPlainDateTime(123));
-assert.throws(TypeError, () => d1.toPlainDateTime(456n));
-assert.throws(TypeError, () => d1.toPlainDateTime(Symbol()));
-assert.throws(TypeError, () => d1.toPlainDateTime({}));
-TemporalHelpers.assertPlainDateTime(d1.toPlainDateTime({ hour: 23 }), 2021, 12, 'M12', 11, 23, 0, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(d1.toPlainDateTime({ minute: 23 }), 2021, 12, 'M12', 11, 0, 23, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(d1.toPlainDateTime({ second: 23 }), 2021, 12, 'M12', 11, 0, 0, 23, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(d1.toPlainDateTime({ millisecond: 23 }), 2021, 12, 'M12', 11, 0, 0, 0, 23, 0, 0);
-TemporalHelpers.assertPlainDateTime(d1.toPlainDateTime({ microsecond: 23 }), 2021, 12, 'M12', 11, 0, 0, 0, 0, 23, 0);
-TemporalHelpers.assertPlainDateTime(d1.toPlainDateTime({ nanosecond: 23 }), 2021, 12, 'M12', 11, 0, 0, 0, 0, 0, 23);
-TemporalHelpers.assertPlainDateTime(d1.toPlainDateTime(), 2021, 12, 'M12', 11, 0, 0, 0, 0, 0, 0);
-TemporalHelpers.assertPlainDateTime(d1.toPlainDateTime({
-  hour: 9,
-  minute: 8,
-  second: 7,
-  millisecond: 6,
-  microsecond: 5,
-  nanosecond: 4
-}), 2021, 12, 'M12', 11, 9, 8, 7, 6, 5, 4);
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-to-plain-month-day.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-to-plain-month-day.js
deleted file mode 100644
index 0875b4ef2f34e..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-to-plain-month-day.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-to-plain-month-day test
-  in V8's mjsunit test plain-date-to-plain-month-day.js
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-let d1 = new Temporal.PlainDate(2021, 12, 11);
-let badDateTime = { toPlainMonthDay: d1.toPlainMonthDay };
-assert.throws(TypeError, () => badDateTime.toPlainMonthDay());
-TemporalHelpers.assertPlainMonthDay(d1.toPlainMonthDay(), 'M12', 11);
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-to-plain-year-month.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-to-plain-year-month.js
deleted file mode 100644
index 46922af42c0ee..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-to-plain-year-month.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-to-plain-year-month test
-  in V8's mjsunit test plain-date-to-plain-year-month.js
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-let d1 = new Temporal.PlainDate(2021, 12, 11);
-let badDate = { toPlainYearMonth: d1.toPlainYearMonth };
-assert.throws(TypeError, () => badDate.toPlainYearMonth());
-TemporalHelpers.assertPlainYearMonth(d1.toPlainYearMonth(), 2021, 12, 'M12');
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-value-of.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-value-of.js
deleted file mode 100644
index 060254eae1384..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-value-of.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-valueOf test
-  in V8's mjsunit test plain-date-valueOf.js
-features: [Temporal]
----*/
-
-let d1 = Temporal.Now.plainDateISO();
-assert.throws(TypeError, () => d1.valueOf());
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/plain-date-with.js b/js/src/tests/test262/staging/Temporal/v8/plain-date-with.js
deleted file mode 100644
index 9f811f23f7cce..0000000000000
--- a/js/src/tests/test262/staging/Temporal/v8/plain-date-with.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright 2021 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: pending
-description: >
-  Automatically ported from plain-date-with test
-  in V8's mjsunit test plain-date-with.js
-includes: [temporalHelpers.js]
-features: [Temporal]
----*/
-
-let d1 = new Temporal.PlainDate(1911, 10, 10);
-TemporalHelpers.assertPlainDate(d1.with({ year: 2021 }), 2021, 10, 'M10', 10);
-TemporalHelpers.assertPlainDate(d1.with({ month: 11 }), 1911, 11, 'M11', 10);
-TemporalHelpers.assertPlainDate(d1.with({ monthCode: 'M05' }), 1911, 5, 'M05', 10);
-TemporalHelpers.assertPlainDate(d1.with({ day: 30 }), 1911, 10, 'M10', 30);
-TemporalHelpers.assertPlainDate(d1.with({
-  year: 2021,
-  hour: 30
-}), 2021, 10, 'M10', 10);
-TemporalHelpers.assertPlainDate(d1.with({
-  month: 11,
-  minute: 71
-}), 1911, 11, 'M11', 10);
-TemporalHelpers.assertPlainDate(d1.with({
-  monthCode: 'M05',
-  second: 90
-}), 1911, 5, 'M05', 10);
-TemporalHelpers.assertPlainDate(d1.with({
-  day: 30,
-  era: 'BC'
-}), 1911, 10, 'M10', 30);
-
-let d2 = new Temporal.PlainDate(2021, 7, 20, 'roc');
-TemporalHelpers.assertPlainDate(d2, 110, 7, 'M07', 20, '', 'roc', 110);
-TemporalHelpers.assertPlainDate(d2.with({ year: 1912 }), 1912, 7, 'M07', 20, '', 'roc', 1912);
-TemporalHelpers.assertPlainDate(d2.with({ year: 1987 }), 1987, 7, 'M07', 20, '', 'roc', 1987);
-assert.throws(TypeError, () => d1.with(new Temporal.PlainDate(2021, 7, 1)));
-assert.throws(TypeError, () => d1.with(new Temporal.PlainDateTime(2021, 7, 1, 12, 13)));
-assert.throws(TypeError, () => d1.with(new Temporal.PlainTime(1, 12, 13)));
-assert.throws(TypeError, () => d1.with(new Temporal.PlainYearMonth(1991, 12)));
-assert.throws(TypeError, () => d1.with(new Temporal.PlainMonthDay(5, 12)));
-assert.throws(TypeError, () => d1.with('2012-05-13'));
-assert.throws(TypeError, () => d1.with({ calendar: 'iso8601' }));
-assert.throws(TypeError, () => d1.with({ timeZone: 'UTC' }));
-assert.throws(TypeError, () => d1.with(true));
-assert.throws(TypeError, () => d1.with(false));
-assert.throws(TypeError, () => d1.with(NaN));
-assert.throws(TypeError, () => d1.with(Infinity));
-assert.throws(TypeError, () => d1.with(1234));
-assert.throws(TypeError, () => d1.with(567n));
-assert.throws(TypeError, () => d1.with(Symbol()));
-assert.throws(TypeError, () => d1.with('string'));
-assert.throws(TypeError, () => d1.with({}));
-assert.throws(TypeError, () => d1.with([]));
-let badDate = { with: d1.with };
-assert.throws(TypeError, () => badDate.with({ day: 3 }));
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/Temporal/v8/shell.js b/js/src/tests/test262/staging/Temporal/v8/shell.js
index 73e5d07407594..e69de29bb2d1d 100644
--- a/js/src/tests/test262/staging/Temporal/v8/shell.js
+++ b/js/src/tests/test262/staging/Temporal/v8/shell.js
@@ -1,1259 +0,0 @@
-// GENERATED, DO NOT EDIT
-// file: temporalHelpers.js
-// Copyright (C) 2021 Igalia, S.L. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-/*---
-description: |
-    This defines helper objects and functions for testing Temporal.
-defines: [TemporalHelpers]
-features: [Symbol.species, Symbol.iterator, Temporal]
----*/
-
-const ASCII_IDENTIFIER = /^[$_a-zA-Z][$_a-zA-Z0-9]*$/u;
-
-function formatPropertyName(propertyKey, objectName = "") {
-  switch (typeof propertyKey) {
-    case "symbol":
-      if (Symbol.keyFor(propertyKey) !== undefined) {
-        return `${objectName}[Symbol.for('${Symbol.keyFor(propertyKey)}')]`;
-      } else if (propertyKey.description.startsWith("Symbol.")) {
-        return `${objectName}[${propertyKey.description}]`;
-      } else {
-        return `${objectName}[Symbol('${propertyKey.description}')]`;
-      }
-    case "string":
-      if (propertyKey !== String(Number(propertyKey))) {
-        if (ASCII_IDENTIFIER.test(propertyKey)) {
-          return objectName ? `${objectName}.${propertyKey}` : propertyKey;
-        }
-        return `${objectName}['${propertyKey.replace(/'/g, "\\'")}']`;
-      }
-      // fall through
-    default:
-      // integer or string integer-index
-      return `${objectName}[${propertyKey}]`;
-  }
-}
-
-const SKIP_SYMBOL = Symbol("Skip");
-
-var TemporalHelpers = {
-  /*
-   * Codes and maximum lengths of months in the ISO 8601 calendar.
-   */
-  ISOMonths: [
-    { month: 1, monthCode: "M01", daysInMonth: 31 },
-    { month: 2, monthCode: "M02", daysInMonth: 29 },
-    { month: 3, monthCode: "M03", daysInMonth: 31 },
-    { month: 4, monthCode: "M04", daysInMonth: 30 },
-    { month: 5, monthCode: "M05", daysInMonth: 31 },
-    { month: 6, monthCode: "M06", daysInMonth: 30 },
-    { month: 7, monthCode: "M07", daysInMonth: 31 },
-    { month: 8, monthCode: "M08", daysInMonth: 31 },
-    { month: 9, monthCode: "M09", daysInMonth: 30 },
-    { month: 10, monthCode: "M10", daysInMonth: 31 },
-    { month: 11, monthCode: "M11", daysInMonth: 30 },
-    { month: 12, monthCode: "M12", daysInMonth: 31 }
-  ],
-
-  /*
-   * List of known calendar eras and their possible aliases.
-   *
-   * https://tc39.es/proposal-intl-era-monthcode/#table-eras
-   */
-  CalendarEras: {
-    buddhist: [
-      { era: "be" },
-    ],
-    coptic: [
-      { era: "am" },
-    ],
-    ethiopic: [
-      { era: "aa", aliases: ["mundi"] },
-      { era: "am", aliases: ["incar"] },
-    ],
-    ethioaa: [
-      { era: "aa", aliases: ["mundi"] },
-    ],
-    gregory: [
-      { era: "bce", aliases: ["bc"] },
-      { era: "ce", aliases: ["ad"] },
-    ],
-    hebrew: [
-      { era: "am" },
-    ],
-    indian: [
-      { era: "shaka" },
-    ],
-    islamic: [
-      { era: "ah" },
-      { era: "bh" },
-    ],
-    "islamic-civil": [
-      { era: "bh" },
-      { era: "ah" },
-    ],
-    "islamic-rgsa": [
-      { era: "bh" },
-      { era: "ah" },
-    ],
-    "islamic-tbla": [
-      { era: "bh" },
-      { era: "ah" },
-    ],
-    "islamic-umalqura": [
-      { era: "bh" },
-      { era: "ah" },
-    ],
-    japanese: [
-      { era: "bce", aliases: ["bc"] },
-      { era: "ce", aliases: ["ad"] },
-      { era: "heisei" },
-      { era: "meiji" },
-      { era: "reiwa" },
-      { era: "showa" },
-      { era: "taisho" },
-    ],
-    persian: [
-      { era: "ap" },
-    ],
-    roc: [
-      { era: "roc", aliases: ["minguo"] },
-      { era: "broc", aliases: ["before-roc", "minguo-qian"] },
-    ],
-  },
-
-  /*
-   * Return the canonical era code.
-   */
-  canonicalizeCalendarEra(calendarId, eraName) {
-    assert.sameValue(typeof calendarId, "string", "calendar must be string in canonicalizeCalendarEra");
-
-    if (!Object.prototype.hasOwnProperty.call(TemporalHelpers.CalendarEras, calendarId)) {
-      assert.sameValue(eraName, undefined);
-      return undefined;
-    }
-
-    assert.sameValue(typeof eraName, "string", "eraName must be string or undefined in canonicalizeCalendarEra");
-
-    for (let {era, aliases = []} of TemporalHelpers.CalendarEras[calendarId]) {
-      if (era === eraName || aliases.includes(eraName)) {
-        return era;
-      }
-    }
-    throw new Test262Error(`Unsupported era name: ${eraName}`);
-  },
-
-  /*
-   * assertDuration(duration, years, ...,  nanoseconds[, description]):
-   *
-   * Shorthand for asserting that each field of a Temporal.Duration is equal to
-   * an expected value.
-   */
-  assertDuration(duration, years, months, weeks, days, hours, minutes, seconds, milliseconds, microseconds, nanoseconds, description = "") {
-    const prefix = description ? `${description}: ` : "";
-    assert(duration instanceof Temporal.Duration, `${prefix}instanceof`);
-    assert.sameValue(duration.years, years, `${prefix}years result:`);
-    assert.sameValue(duration.months, months, `${prefix}months result:`);
-    assert.sameValue(duration.weeks, weeks, `${prefix}weeks result:`);
-    assert.sameValue(duration.days, days, `${prefix}days result:`);
-    assert.sameValue(duration.hours, hours, `${prefix}hours result:`);
-    assert.sameValue(duration.minutes, minutes, `${prefix}minutes result:`);
-    assert.sameValue(duration.seconds, seconds, `${prefix}seconds result:`);
-    assert.sameValue(duration.milliseconds, milliseconds, `${prefix}milliseconds result:`);
-    assert.sameValue(duration.microseconds, microseconds, `${prefix}microseconds result:`);
-    assert.sameValue(duration.nanoseconds, nanoseconds, `${prefix}nanoseconds result`);
-  },
-
-  /*
-   * assertDateDuration(duration, years, months, weeks, days, [, description]):
-   *
-   * Shorthand for asserting that each date field of a Temporal.Duration is
-   * equal to an expected value.
-   */
-  assertDateDuration(duration, years, months, weeks, days, description = "") {
-    const prefix = description ? `${description}: ` : "";
-    assert(duration instanceof Temporal.Duration, `${prefix}instanceof`);
-    assert.sameValue(duration.years, years, `${prefix}years result:`);
-    assert.sameValue(duration.months, months, `${prefix}months result:`);
-    assert.sameValue(duration.weeks, weeks, `${prefix}weeks result:`);
-    assert.sameValue(duration.days, days, `${prefix}days result:`);
-    assert.sameValue(duration.hours, 0, `${prefix}hours result should be zero:`);
-    assert.sameValue(duration.minutes, 0, `${prefix}minutes result should be zero:`);
-    assert.sameValue(duration.seconds, 0, `${prefix}seconds result should be zero:`);
-    assert.sameValue(duration.milliseconds, 0, `${prefix}milliseconds result should be zero:`);
-    assert.sameValue(duration.microseconds, 0, `${prefix}microseconds result should be zero:`);
-    assert.sameValue(duration.nanoseconds, 0, `${prefix}nanoseconds result should be zero:`);
-  },
-
-  /*
-   * assertDurationsEqual(actual, expected[, description]):
-   *
-   * Shorthand for asserting that each field of a Temporal.Duration is equal to
-   * the corresponding field in another Temporal.Duration.
-   */
-  assertDurationsEqual(actual, expected, description = "") {
-    const prefix = description ? `${description}: ` : "";
-    assert(expected instanceof Temporal.Duration, `${prefix}expected value should be a Temporal.Duration`);
-    TemporalHelpers.assertDuration(actual, expected.years, expected.months, expected.weeks, expected.days, expected.hours, expected.minutes, expected.seconds, expected.milliseconds, expected.microseconds, expected.nanoseconds, description);
-  },
-
-  /*
-   * assertInstantsEqual(actual, expected[, description]):
-   *
-   * Shorthand for asserting that two Temporal.Instants are of the correct type
-   * and equal according to their equals() methods.
-   */
-  assertInstantsEqual(actual, expected, description = "") {
-    const prefix = description ? `${description}: ` : "";
-    assert(expected instanceof Temporal.Instant, `${prefix}expected value should be a Temporal.Instant`);
-    assert(actual instanceof Temporal.Instant, `${prefix}instanceof`);
-    assert(actual.equals(expected), `${prefix}equals method`);
-  },
-
-  /*
-   * assertPlainDate(date, year, ..., nanosecond[, description[, era, eraYear]]):
-   *
-   * Shorthand for asserting that each field of a Temporal.PlainDate is equal to
-   * an expected value. (Except the `calendar` property, since callers may want
-   * to assert either object equality with an object they put in there, or the
-   * value of date.calendarId.)
-   */
-  assertPlainDate(date, year, month, monthCode, day, description = "", era = undefined, eraYear = undefined) {
-    const prefix = description ? `${description}: ` : "";
-    assert(date instanceof Temporal.PlainDate, `${prefix}instanceof`);
-    assert.sameValue(
-      TemporalHelpers.canonicalizeCalendarEra(date.calendarId, date.era),
-      TemporalHelpers.canonicalizeCalendarEra(date.calendarId, era),
-      `${prefix}era result:`
-    );
-    assert.sameValue(date.eraYear, eraYear, `${prefix}eraYear result:`);
-    assert.sameValue(date.year, year, `${prefix}year result:`);
-    assert.sameValue(date.month, month, `${prefix}month result:`);
-    assert.sameValue(date.monthCode, monthCode, `${prefix}monthCode result:`);
-    assert.sameValue(date.day, day, `${prefix}day result:`);
-  },
-
-  /*
-   * assertPlainDateTime(datetime, year, ..., nanosecond[, description[, era, eraYear]]):
-   *
-   * Shorthand for asserting that each field of a Temporal.PlainDateTime is
-   * equal to an expected value. (Except the `calendar` property, since callers
-   * may want to assert either object equality with an object they put in there,
-   * or the value of datetime.calendarId.)
-   */
-  assertPlainDateTime(datetime, year, month, monthCode, day, hour, minute, second, millisecond, microsecond, nanosecond, description = "", era = undefined, eraYear = undefined) {
-    const prefix = description ? `${description}: ` : "";
-    assert(datetime instanceof Temporal.PlainDateTime, `${prefix}instanceof`);
-    assert.sameValue(
-      TemporalHelpers.canonicalizeCalendarEra(datetime.calendarId, datetime.era),
-      TemporalHelpers.canonicalizeCalendarEra(datetime.calendarId, era),
-      `${prefix}era result:`
-    );
-    assert.sameValue(datetime.eraYear, eraYear, `${prefix}eraYear result:`);
-    assert.sameValue(datetime.year, year, `${prefix}year result:`);
-    assert.sameValue(datetime.month, month, `${prefix}month result:`);
-    assert.sameValue(datetime.monthCode, monthCode, `${prefix}monthCode result:`);
-    assert.sameValue(datetime.day, day, `${prefix}day result:`);
-    assert.sameValue(datetime.hour, hour, `${prefix}hour result:`);
-    assert.sameValue(datetime.minute, minute, `${prefix}minute result:`);
-    assert.sameValue(datetime.second, second, `${prefix}second result:`);
-    assert.sameValue(datetime.millisecond, millisecond, `${prefix}millisecond result:`);
-    assert.sameValue(datetime.microsecond, microsecond, `${prefix}microsecond result:`);
-    assert.sameValue(datetime.nanosecond, nanosecond, `${prefix}nanosecond result:`);
-  },
-
-  /*
-   * assertPlainDateTimesEqual(actual, expected[, description]):
-   *
-   * Shorthand for asserting that two Temporal.PlainDateTimes are of the correct
-   * type, equal according to their equals() methods, and additionally that
-   * their calendar internal slots are the same value.
-   */
-  assertPlainDateTimesEqual(actual, expected, description = "") {
-    const prefix = description ? `${description}: ` : "";
-    assert(expected instanceof Temporal.PlainDateTime, `${prefix}expected value should be a Temporal.PlainDateTime`);
-    assert(actual instanceof Temporal.PlainDateTime, `${prefix}instanceof`);
-    assert(actual.equals(expected), `${prefix}equals method`);
-    assert.sameValue(
-      actual.calendarId,
-      expected.calendarId,
-      `${prefix}calendar same value:`
-    );
-  },
-
-  /*
-   * assertPlainMonthDay(monthDay, monthCode, day[, description [, referenceISOYear]]):
-   *
-   * Shorthand for asserting that each field of a Temporal.PlainMonthDay is
-   * equal to an expected value. (Except the `calendar` property, since callers
-   * may want to assert either object equality with an object they put in there,
-   * or the value of monthDay.calendarId().)
-   */
-  assertPlainMonthDay(monthDay, monthCode, day, description = "", referenceISOYear = 1972) {
-    const prefix = description ? `${description}: ` : "";
-    assert(monthDay instanceof Temporal.PlainMonthDay, `${prefix}instanceof`);
-    assert.sameValue(monthDay.monthCode, monthCode, `${prefix}monthCode result:`);
-    assert.sameValue(monthDay.day, day, `${prefix}day result:`);
-    const isoYear = Number(monthDay.toString({ calendarName: "always" }).split("-")[0]);
-    assert.sameValue(isoYear, referenceISOYear, `${prefix}referenceISOYear result:`);
-  },
-
-  /*
-   * assertPlainTime(time, hour, ..., nanosecond[, description]):
-   *
-   * Shorthand for asserting that each field of a Temporal.PlainTime is equal to
-   * an expected value.
-   */
-  assertPlainTime(time, hour, minute, second, millisecond, microsecond, nanosecond, description = "") {
-    const prefix = description ? `${description}: ` : "";
-    assert(time instanceof Temporal.PlainTime, `${prefix}instanceof`);
-    assert.sameValue(time.hour, hour, `${prefix}hour result:`);
-    assert.sameValue(time.minute, minute, `${prefix}minute result:`);
-    assert.sameValue(time.second, second, `${prefix}second result:`);
-    assert.sameValue(time.millisecond, millisecond, `${prefix}millisecond result:`);
-    assert.sameValue(time.microsecond, microsecond, `${prefix}microsecond result:`);
-    assert.sameValue(time.nanosecond, nanosecond, `${prefix}nanosecond result:`);
-  },
-
-  /*
-   * assertPlainTimesEqual(actual, expected[, description]):
-   *
-   * Shorthand for asserting that two Temporal.PlainTimes are of the correct
-   * type and equal according to their equals() methods.
-   */
-  assertPlainTimesEqual(actual, expected, description = "") {
-    const prefix = description ? `${description}: ` : "";
-    assert(expected instanceof Temporal.PlainTime, `${prefix}expected value should be a Temporal.PlainTime`);
-    assert(actual instanceof Temporal.PlainTime, `${prefix}instanceof`);
-    assert(actual.equals(expected), `${prefix}equals method`);
-  },
-
-  /*
-   * assertPlainYearMonth(yearMonth, year, month, monthCode[, description[, era, eraYear, referenceISODay]]):
-   *
-   * Shorthand for asserting that each field of a Temporal.PlainYearMonth is
-   * equal to an expected value. (Except the `calendar` property, since callers
-   * may want to assert either object equality with an object they put in there,
-   * or the value of yearMonth.calendarId.)
-   *
-   * Pass null as the referenceISODay if you don't want to give it explicitly.
-   * In that case, the expected referenceISODay will be computed using PlainDate
-   * and only verified for consistency, not for equality with a specific value.
-   */
-  assertPlainYearMonth(yearMonth, year, month, monthCode, description = "", era = undefined, eraYear = undefined, referenceISODay = 1) {
-    const prefix = description ? `${description}: ` : "";
-    assert(typeof referenceISODay === "number" || referenceISODay === null,
-      `TemporalHelpers.assertPlainYearMonth() referenceISODay argument should be a number or null, not ${referenceISODay}`);
-    assert(yearMonth instanceof Temporal.PlainYearMonth, `${prefix}instanceof`);
-    assert.sameValue(
-      TemporalHelpers.canonicalizeCalendarEra(yearMonth.calendarId, yearMonth.era),
-      TemporalHelpers.canonicalizeCalendarEra(yearMonth.calendarId, era),
-      `${prefix}era result:`
-    );
-    assert.sameValue(yearMonth.eraYear, eraYear, `${prefix}eraYear result:`);
-    assert.sameValue(yearMonth.year, year, `${prefix}year result:`);
-    assert.sameValue(yearMonth.month, month, `${prefix}month result:`);
-    assert.sameValue(yearMonth.monthCode, monthCode, `${prefix}monthCode result:`);
-    const isoDay = Number(yearMonth.toString({ calendarName: "always" }).slice(1).split("-")[2].slice(0, 2));
-    const expectedISODay = referenceISODay ?? yearMonth.toPlainDate({ day: 1 }).withCalendar("iso8601").day;
-    assert.sameValue(isoDay, expectedISODay, `${prefix}referenceISODay result:`);
-  },
-
-  /*
-   * assertZonedDateTimesEqual(actual, expected[, description]):
-   *
-   * Shorthand for asserting that two Temporal.ZonedDateTimes are of the correct
-   * type, equal according to their equals() methods, and additionally that
-   * their time zones and calendar internal slots are the same value.
-   */
-  assertZonedDateTimesEqual(actual, expected, description = "") {
-    const prefix = description ? `${description}: ` : "";
-    assert(expected instanceof Temporal.ZonedDateTime, `${prefix}expected value should be a Temporal.ZonedDateTime`);
-    assert(actual instanceof Temporal.ZonedDateTime, `${prefix}instanceof`);
-    assert(actual.equals(expected), `${prefix}equals method`);
-    assert.sameValue(actual.timeZoneId, expected.timeZoneId, `${prefix}time zone same value:`);
-    assert.sameValue(
-      actual.calendarId,
-      expected.calendarId,
-      `${prefix}calendar same value:`
-    );
-  },
-
-  /*
-   * assertUnreachable(description):
-   *
-   * Helper for asserting that code is not executed.
-   */
-  assertUnreachable(description) {
-    let message = "This code should not be executed";
-    if (description) {
-      message = `${message}: ${description}`;
-    }
-    throw new Test262Error(message);
-  },
-
-  /*
-   * checkPlainDateTimeConversionFastPath(func):
-   *
-   * ToTemporalDate and ToTemporalTime should both, if given a
-   * Temporal.PlainDateTime instance, convert to the desired type by reading the
-   * PlainDateTime's internal slots, rather than calling any getters.
-   *
-   * func(datetime) is the actual operation to test, that must
-   * internally call the abstract operation ToTemporalDate or ToTemporalTime.
-   * It is passed a Temporal.PlainDateTime instance.
-   */
-  checkPlainDateTimeConversionFastPath(func, message = "checkPlainDateTimeConversionFastPath") {
-    const actual = [];
-    const expected = [];
-
-    const calendar = "iso8601";
-    const datetime = new Temporal.PlainDateTime(2000, 5, 2, 12, 34, 56, 987, 654, 321, calendar);
-    const prototypeDescrs = Object.getOwnPropertyDescriptors(Temporal.PlainDateTime.prototype);
-    ["year", "month", "monthCode", "day", "hour", "minute", "second", "millisecond", "microsecond", "nanosecond"].forEach((property) => {
-      Object.defineProperty(datetime, property, {
-        get() {
-          actual.push(`get ${formatPropertyName(property)}`);
-          const value = prototypeDescrs[property].get.call(this);
-          return {
-            toString() {
-              actual.push(`toString ${formatPropertyName(property)}`);
-              return value.toString();
-            },
-            valueOf() {
-              actual.push(`valueOf ${formatPropertyName(property)}`);
-              return value;
-            },
-          };
-        },
-      });
-    });
-    Object.defineProperty(datetime, "calendar", {
-      get() {
-        actual.push("get calendar");
-        return calendar;
-      },
-    });
-
-    func(datetime);
-    assert.compareArray(actual, expected, `${message}: property getters not called`);
-  },
-
-  /*
-   * Check that an options bag that accepts units written in the singular form,
-   * also accepts the same units written in the plural form.
-   * func(unit) should call the method with the appropriate options bag
-   * containing unit as a value. This will be called twice for each element of
-   * validSingularUnits, once with singular and once with plural, and the
-   * results of each pair should be the same (whether a Temporal object or a
-   * primitive value.)
-   */
-  checkPluralUnitsAccepted(func, validSingularUnits) {
-    const plurals = {
-      year: "years",
-      month: "months",
-      week: "weeks",
-      day: "days",
-      hour: "hours",
-      minute: "minutes",
-      second: "seconds",
-      millisecond: "milliseconds",
-      microsecond: "microseconds",
-      nanosecond: "nanoseconds",
-    };
-
-    validSingularUnits.forEach((unit) => {
-      const singularValue = func(unit);
-      const pluralValue = func(plurals[unit]);
-      const desc = `Plural ${plurals[unit]} produces the same result as singular ${unit}`;
-      if (singularValue instanceof Temporal.Duration) {
-        TemporalHelpers.assertDurationsEqual(pluralValue, singularValue, desc);
-      } else if (singularValue instanceof Temporal.Instant) {
-        TemporalHelpers.assertInstantsEqual(pluralValue, singularValue, desc);
-      } else if (singularValue instanceof Temporal.PlainDateTime) {
-        TemporalHelpers.assertPlainDateTimesEqual(pluralValue, singularValue, desc);
-      } else if (singularValue instanceof Temporal.PlainTime) {
-        TemporalHelpers.assertPlainTimesEqual(pluralValue, singularValue, desc);
-      } else if (singularValue instanceof Temporal.ZonedDateTime) {
-        TemporalHelpers.assertZonedDateTimesEqual(pluralValue, singularValue, desc);
-      } else {
-        assert.sameValue(pluralValue, singularValue);
-      }
-    });
-  },
-
-  /*
-   * checkRoundingIncrementOptionWrongType(checkFunc, assertTrueResultFunc, assertObjectResultFunc):
-   *
-   * Checks the type handling of the roundingIncrement option.
-   * checkFunc(roundingIncrement) is a function which takes the value of
-   * roundingIncrement to test, and calls the method under test with it,
-   * returning the result. assertTrueResultFunc(result, description) should
-   * assert that result is the expected result with roundingIncrement: true, and
-   * assertObjectResultFunc(result, description) should assert that result is
-   * the expected result with roundingIncrement being an object with a valueOf()
-   * method.
-   */
-  checkRoundingIncrementOptionWrongType(checkFunc, assertTrueResultFunc, assertObjectResultFunc) {
-    // null converts to 0, which is out of range
-    assert.throws(RangeError, () => checkFunc(null), "null");
-    // Booleans convert to either 0 or 1, and 1 is allowed
-    const trueResult = checkFunc(true);
-    assertTrueResultFunc(trueResult, "true");
-    assert.throws(RangeError, () => checkFunc(false), "false");
-    // Symbols and BigInts cannot convert to numbers
-    assert.throws(TypeError, () => checkFunc(Symbol()), "symbol");
-    assert.throws(TypeError, () => checkFunc(2n), "bigint");
-
-    // Objects prefer their valueOf() methods when converting to a number
-    assert.throws(RangeError, () => checkFunc({}), "plain object");
-
-    const expected = [
-      "get roundingIncrement.valueOf",
-      "call roundingIncrement.valueOf",
-    ];
-    const actual = [];
-    const observer = TemporalHelpers.toPrimitiveObserver(actual, 2, "roundingIncrement");
-    const objectResult = checkFunc(observer);
-    assertObjectResultFunc(objectResult, "object with valueOf");
-    assert.compareArray(actual, expected, "order of operations");
-  },
-
-  /*
-   * checkStringOptionWrongType(propertyName, value, checkFunc, assertFunc):
-   *
-   * Checks the type handling of a string option, of which there are several in
-   * Temporal.
-   * propertyName is the name of the option, and value is the value that
-   * assertFunc should expect it to have.
-   * checkFunc(value) is a function which takes the value of the option to test,
-   * and calls the method under test with it, returning the result.
-   * assertFunc(result, description) should assert that result is the expected
-   * result with the option value being an object with a toString() method
-   * which returns the given value.
-   */
-  checkStringOptionWrongType(propertyName, value, checkFunc, assertFunc) {
-    // null converts to the string "null", which is an invalid string value
-    assert.throws(RangeError, () => checkFunc(null), "null");
-    // Booleans convert to the strings "true" or "false", which are invalid
-    assert.throws(RangeError, () => checkFunc(true), "true");
-    assert.throws(RangeError, () => checkFunc(false), "false");
-    // Symbols cannot convert to strings
-    assert.throws(TypeError, () => checkFunc(Symbol()), "symbol");
-    // Numbers convert to strings which are invalid
-    assert.throws(RangeError, () => checkFunc(2), "number");
-    // BigInts convert to strings which are invalid
-    assert.throws(RangeError, () => checkFunc(2n), "bigint");
-
-    // Objects prefer their toString() methods when converting to a string
-    assert.throws(RangeError, () => checkFunc({}), "plain object");
-
-    const expected = [
-      `get ${propertyName}.toString`,
-      `call ${propertyName}.toString`,
-    ];
-    const actual = [];
-    const observer = TemporalHelpers.toPrimitiveObserver(actual, value, propertyName);
-    const result = checkFunc(observer);
-    assertFunc(result, "object with toString");
-    assert.compareArray(actual, expected, "order of operations");
-  },
-
-  /*
-   * checkSubclassingIgnored(construct, constructArgs, method, methodArgs,
-   *   resultAssertions):
-   *
-   * Methods of Temporal classes that return a new instance of the same class,
-   * must not take the constructor of a subclass into account, nor the @@species
-   * property. This helper runs tests to ensure this.
-   *
-   * construct(...constructArgs) must yield a valid instance of the Temporal
-   * class. instance[method](...methodArgs) is the method call under test, which
-   * must also yield a valid instance of the same Temporal class, not a
-   * subclass. See below for the individual tests that this runs.
-   * resultAssertions() is a function that performs additional assertions on the
-   * instance returned by the method under test.
-   */
-  checkSubclassingIgnored(...args) {
-    this.checkSubclassConstructorNotObject(...args);
-    this.checkSubclassConstructorUndefined(...args);
-    this.checkSubclassConstructorThrows(...args);
-    this.checkSubclassConstructorNotCalled(...args);
-    this.checkSubclassSpeciesInvalidResult(...args);
-    this.checkSubclassSpeciesNotAConstructor(...args);
-    this.checkSubclassSpeciesNull(...args);
-    this.checkSubclassSpeciesUndefined(...args);
-    this.checkSubclassSpeciesThrows(...args);
-  },
-
-  /*
-   * Checks that replacing the 'constructor' property of the instance with
-   * various primitive values does not affect the returned new instance.
-   */
-  checkSubclassConstructorNotObject(construct, constructArgs, method, methodArgs, resultAssertions) {
-    function check(value, description) {
-      const instance = new construct(...constructArgs);
-      instance.constructor = value;
-      const result = instance[method](...methodArgs);
-      assert.sameValue(Object.getPrototypeOf(result), construct.prototype, description);
-      resultAssertions(result);
-    }
-
-    check(null, "null");
-    check(true, "true");
-    check("test", "string");
-    check(Symbol(), "Symbol");
-    check(7, "number");
-    check(7n, "bigint");
-  },
-
-  /*
-   * Checks that replacing the 'constructor' property of the subclass with
-   * undefined does not affect the returned new instance.
-   */
-  checkSubclassConstructorUndefined(construct, constructArgs, method, methodArgs, resultAssertions) {
-    let called = 0;
-
-    class MySubclass extends construct {
-      constructor() {
-        ++called;
-        super(...constructArgs);
-      }
-    }
-
-    const instance = new MySubclass();
-    assert.sameValue(called, 1);
-
-    MySubclass.prototype.constructor = undefined;
-
-    const result = instance[method](...methodArgs);
-    assert.sameValue(called, 1);
-    assert.sameValue(Object.getPrototypeOf(result), construct.prototype);
-    resultAssertions(result);
-  },
-
-  /*
-   * Checks that making the 'constructor' property of the instance throw when
-   * called does not affect the returned new instance.
-   */
-  checkSubclassConstructorThrows(construct, constructArgs, method, methodArgs, resultAssertions) {
-    function CustomError() {}
-    const instance = new construct(...constructArgs);
-    Object.defineProperty(instance, "constructor", {
-      get() {
-        throw new CustomError();
-      }
-    });
-    const result = instance[method](...methodArgs);
-    assert.sameValue(Object.getPrototypeOf(result), construct.prototype);
-    resultAssertions(result);
-  },
-
-  /*
-   * Checks that when subclassing, the subclass constructor is not called by
-   * the method under test.
-   */
-  checkSubclassConstructorNotCalled(construct, constructArgs, method, methodArgs, resultAssertions) {
-    let called = 0;
-
-    class MySubclass extends construct {
-      constructor() {
-        ++called;
-        super(...constructArgs);
-      }
-    }
-
-    const instance = new MySubclass();
-    assert.sameValue(called, 1);
-
-    const result = instance[method](...methodArgs);
-    assert.sameValue(called, 1);
-    assert.sameValue(Object.getPrototypeOf(result), construct.prototype);
-    resultAssertions(result);
-  },
-
-  /*
-   * Check that the constructor's @@species property is ignored when it's a
-   * constructor that returns a non-object value.
-   */
-  checkSubclassSpeciesInvalidResult(construct, constructArgs, method, methodArgs, resultAssertions) {
-    function check(value, description) {
-      const instance = new construct(...constructArgs);
-      instance.constructor = {
-        [Symbol.species]: function() {
-          return value;
-        },
-      };
-      const result = instance[method](...methodArgs);
-      assert.sameValue(Object.getPrototypeOf(result), construct.prototype, description);
-      resultAssertions(result);
-    }
-
-    check(undefined, "undefined");
-    check(null, "null");
-    check(true, "true");
-    check("test", "string");
-    check(Symbol(), "Symbol");
-    check(7, "number");
-    check(7n, "bigint");
-    check({}, "plain object");
-  },
-
-  /*
-   * Check that the constructor's @@species property is ignored when it's not a
-   * constructor.
-   */
-  checkSubclassSpeciesNotAConstructor(construct, constructArgs, method, methodArgs, resultAssertions) {
-    function check(value, description) {
-      const instance = new construct(...constructArgs);
-      instance.constructor = {
-        [Symbol.species]: value,
-      };
-      const result = instance[method](...methodArgs);
-      assert.sameValue(Object.getPrototypeOf(result), construct.prototype, description);
-      resultAssertions(result);
-    }
-
-    check(true, "true");
-    check("test", "string");
-    check(Symbol(), "Symbol");
-    check(7, "number");
-    check(7n, "bigint");
-    check({}, "plain object");
-  },
-
-  /*
-   * Check that the constructor's @@species property is ignored when it's null.
-   */
-  checkSubclassSpeciesNull(construct, constructArgs, method, methodArgs, resultAssertions) {
-    let called = 0;
-
-    class MySubclass extends construct {
-      constructor() {
-        ++called;
-        super(...constructArgs);
-      }
-    }
-
-    const instance = new MySubclass();
-    assert.sameValue(called, 1);
-
-    MySubclass.prototype.constructor = {
-      [Symbol.species]: null,
-    };
-
-    const result = instance[method](...methodArgs);
-    assert.sameValue(called, 1);
-    assert.sameValue(Object.getPrototypeOf(result), construct.prototype);
-    resultAssertions(result);
-  },
-
-  /*
-   * Check that the constructor's @@species property is ignored when it's
-   * undefined.
-   */
-  checkSubclassSpeciesUndefined(construct, constructArgs, method, methodArgs, resultAssertions) {
-    let called = 0;
-
-    class MySubclass extends construct {
-      constructor() {
-        ++called;
-        super(...constructArgs);
-      }
-    }
-
-    const instance = new MySubclass();
-    assert.sameValue(called, 1);
-
-    MySubclass.prototype.constructor = {
-      [Symbol.species]: undefined,
-    };
-
-    const result = instance[method](...methodArgs);
-    assert.sameValue(called, 1);
-    assert.sameValue(Object.getPrototypeOf(result), construct.prototype);
-    resultAssertions(result);
-  },
-
-  /*
-   * Check that the constructor's @@species property is ignored when it throws,
-   * i.e. it is not called at all.
-   */
-  checkSubclassSpeciesThrows(construct, constructArgs, method, methodArgs, resultAssertions) {
-    function CustomError() {}
-
-    const instance = new construct(...constructArgs);
-    instance.constructor = {
-      get [Symbol.species]() {
-        throw new CustomError();
-      },
-    };
-
-    const result = instance[method](...methodArgs);
-    assert.sameValue(Object.getPrototypeOf(result), construct.prototype);
-  },
-
-  /*
-   * checkSubclassingIgnoredStatic(construct, method, methodArgs, resultAssertions):
-   *
-   * Static methods of Temporal classes that return a new instance of the class,
-   * must not use the this-value as a constructor. This helper runs tests to
-   * ensure this.
-   *
-   * construct[method](...methodArgs) is the static method call under test, and
-   * must yield a valid instance of the Temporal class, not a subclass. See
-   * below for the individual tests that this runs.
-   * resultAssertions() is a function that performs additional assertions on the
-   * instance returned by the method under test.
-   */
-  checkSubclassingIgnoredStatic(...args) {
-    this.checkStaticInvalidReceiver(...args);
-    this.checkStaticReceiverNotCalled(...args);
-    this.checkThisValueNotCalled(...args);
-  },
-
-  /*
-   * Check that calling the static method with a receiver that's not callable,
-   * still calls the intrinsic constructor.
-   */
-  checkStaticInvalidReceiver(construct, method, methodArgs, resultAssertions) {
-    function check(value, description) {
-      const result = construct[method].apply(value, methodArgs);
-      assert.sameValue(Object.getPrototypeOf(result), construct.prototype);
-      resultAssertions(result);
-    }
-
-    check(undefined, "undefined");
-    check(null, "null");
-    check(true, "true");
-    check("test", "string");
-    check(Symbol(), "symbol");
-    check(7, "number");
-    check(7n, "bigint");
-    check({}, "Non-callable object");
-  },
-
-  /*
-   * Check that calling the static method with a receiver that returns a value
-   * that's not callable, still calls the intrinsic constructor.
-   */
-  checkStaticReceiverNotCalled(construct, method, methodArgs, resultAssertions) {
-    function check(value, description) {
-      const receiver = function () {
-        return value;
-      };
-      const result = construct[method].apply(receiver, methodArgs);
-      assert.sameValue(Object.getPrototypeOf(result), construct.prototype);
-      resultAssertions(result);
-    }
-
-    check(undefined, "undefined");
-    check(null, "null");
-    check(true, "true");
-    check("test", "string");
-    check(Symbol(), "symbol");
-    check(7, "number");
-    check(7n, "bigint");
-    check({}, "Non-callable object");
-  },
-
-  /*
-   * Check that the receiver isn't called.
-   */
-  checkThisValueNotCalled(construct, method, methodArgs, resultAssertions) {
-    let called = false;
-
-    class MySubclass extends construct {
-      constructor(...args) {
-        called = true;
-        super(...args);
-      }
-    }
-
-    const result = MySubclass[method](...methodArgs);
-    assert.sameValue(called, false);
-    assert.sameValue(Object.getPrototypeOf(result), construct.prototype);
-    resultAssertions(result);
-  },
-
-  /*
-   * Check that any calendar-carrying Temporal object has its [[Calendar]]
-   * internal slot read by ToTemporalCalendar, and does not fetch the calendar
-   * by calling getters.
-   */
-  checkToTemporalCalendarFastPath(func) {
-    const plainDate = new Temporal.PlainDate(2000, 5, 2, "iso8601");
-    const plainDateTime = new Temporal.PlainDateTime(2000, 5, 2, 12, 34, 56, 987, 654, 321, "iso8601");
-    const plainMonthDay = new Temporal.PlainMonthDay(5, 2, "iso8601");
-    const plainYearMonth = new Temporal.PlainYearMonth(2000, 5, "iso8601");
-    const zonedDateTime = new Temporal.ZonedDateTime(1_000_000_000_000_000_000n, "UTC", "iso8601");
-
-    [plainDate, plainDateTime, plainMonthDay, plainYearMonth, zonedDateTime].forEach((temporalObject) => {
-      Object.defineProperty(temporalObject, "calendar", {
-        get() {
-          throw new Test262Error("should not get 'calendar' property");
-        },
-      });
-      Object.defineProperty(temporalObject, "calendarId", {
-        get() {
-          throw new Test262Error("should not get 'calendarId' property");
-        },
-      });
-
-      func(temporalObject);
-    });
-  },
-
-  checkToTemporalInstantFastPath(func) {
-    const actual = [];
-    const expected = [];
-
-    const datetime = new Temporal.ZonedDateTime(1_000_000_000_987_654_321n, "UTC");
-    Object.defineProperty(datetime, "toString", {
-      get() {
-        actual.push("get toString");
-        return function (options) {
-          actual.push("call toString");
-          return Temporal.ZonedDateTime.prototype.toString.call(this, options);
-        };
-      },
-    });
-
-    func(datetime);
-    assert.compareArray(actual, expected, "toString not called");
-  },
-
-  checkToTemporalPlainDateTimeFastPath(func) {
-    const actual = [];
-    const expected = [];
-
-    const date = new Temporal.PlainDate(2000, 5, 2, "iso8601");
-    const prototypeDescrs = Object.getOwnPropertyDescriptors(Temporal.PlainDate.prototype);
-    ["year", "month", "monthCode", "day"].forEach((property) => {
-      Object.defineProperty(date, property, {
-        get() {
-          actual.push(`get ${formatPropertyName(property)}`);
-          const value = prototypeDescrs[property].get.call(this);
-          return TemporalHelpers.toPrimitiveObserver(actual, value, property);
-        },
-      });
-    });
-    ["hour", "minute", "second", "millisecond", "microsecond", "nanosecond"].forEach((property) => {
-      Object.defineProperty(date, property, {
-        get() {
-          actual.push(`get ${formatPropertyName(property)}`);
-          return undefined;
-        },
-      });
-    });
-    Object.defineProperty(date, "calendar", {
-      get() {
-        actual.push("get calendar");
-        return "iso8601";
-      },
-    });
-
-    func(date);
-    assert.compareArray(actual, expected, "property getters not called");
-  },
-
-  /*
-   * observeProperty(calls, object, propertyName, value):
-   *
-   * Defines an own property @object.@propertyName with value @value, that
-   * will log any calls to its accessors to the array @calls.
-   */
-  observeProperty(calls, object, propertyName, value, objectName = "") {
-    Object.defineProperty(object, propertyName, {
-      get() {
-        calls.push(`get ${formatPropertyName(propertyName, objectName)}`);
-        return value;
-      },
-      set() {
-        calls.push(`set ${formatPropertyName(propertyName, objectName)}`);
-      }
-    });
-  },
-
-  /*
-   * observeMethod(calls, object, propertyName, value):
-   *
-   * Defines an own property @object.@propertyName with value @value, that
-   * will log any calls of @value to the array @calls.
-   */
-  observeMethod(calls, object, propertyName, objectName = "") {
-    const method = object[propertyName];
-    object[propertyName] = function () {
-      calls.push(`call ${formatPropertyName(propertyName, objectName)}`);
-      return method.apply(object, arguments);
-    };
-  },
-
-  /*
-   * Used for substituteMethod to indicate default behavior instead of a
-   * substituted value
-   */
-  SUBSTITUTE_SKIP: SKIP_SYMBOL,
-
-  /*
-   * substituteMethod(object, propertyName, values):
-   *
-   * Defines an own property @object.@propertyName that will, for each
-   * subsequent call to the method previously defined as
-   * @object.@propertyName:
-   *  - Call the method, if no more values remain
-   *  - Call the method, if the value in @values for the corresponding call
-   *    is SUBSTITUTE_SKIP
-   *  - Otherwise, return the corresponding value in @value
-   */
-  substituteMethod(object, propertyName, values) {
-    let calls = 0;
-    const method = object[propertyName];
-    object[propertyName] = function () {
-      if (calls >= values.length) {
-        return method.apply(object, arguments);
-      } else if (values[calls] === SKIP_SYMBOL) {
-        calls++;
-        return method.apply(object, arguments);
-      } else {
-        return values[calls++];
-      }
-    };
-  },
-
-  /*
-   * propertyBagObserver():
-   * Returns an object that behaves like the given propertyBag but tracks Get
-   * and Has operations on any of its properties, by appending messages to an
-   * array. If the value of a property in propertyBag is a primitive, the value
-   * of the returned object's property will additionally be a
-   * TemporalHelpers.toPrimitiveObserver that will track calls to its toString
-   * and valueOf methods in the same array. This is for the purpose of testing
-   * order of operations that are observable from user code. objectName is used
-   * in the log.
-   * If skipToPrimitive is given, it must be an array of property keys. Those
-   * properties will not have a TemporalHelpers.toPrimitiveObserver returned,
-   * and instead just be returned directly.
-   */
-  propertyBagObserver(calls, propertyBag, objectName, skipToPrimitive) {
-    return new Proxy(propertyBag, {
-      ownKeys(target) {
-        calls.push(`ownKeys ${objectName}`);
-        return Reflect.ownKeys(target);
-      },
-      getOwnPropertyDescriptor(target, key) {
-        calls.push(`getOwnPropertyDescriptor ${formatPropertyName(key, objectName)}`);
-        return Reflect.getOwnPropertyDescriptor(target, key);
-      },
-      get(target, key, receiver) {
-        calls.push(`get ${formatPropertyName(key, objectName)}`);
-        const result = Reflect.get(target, key, receiver);
-        if (result === undefined) {
-          return undefined;
-        }
-        if ((result !== null && typeof result === "object") || typeof result === "function") {
-          return result;
-        }
-        if (skipToPrimitive && skipToPrimitive.indexOf(key) >= 0) {
-          return result;
-        }
-        return TemporalHelpers.toPrimitiveObserver(calls, result, `${formatPropertyName(key, objectName)}`);
-      },
-      has(target, key) {
-        calls.push(`has ${formatPropertyName(key, objectName)}`);
-        return Reflect.has(target, key);
-      },
-    });
-  },
-
-  /*
-   * Returns an object that will append logs of any Gets or Calls of its valueOf
-   * or toString properties to the array calls. Both valueOf and toString will
-   * return the actual primitiveValue. propertyName is used in the log.
-   */
-  toPrimitiveObserver(calls, primitiveValue, propertyName) {
-    return {
-      get valueOf() {
-        calls.push(`get ${propertyName}.valueOf`);
-        return function () {
-          calls.push(`call ${propertyName}.valueOf`);
-          return primitiveValue;
-        };
-      },
-      get toString() {
-        calls.push(`get ${propertyName}.toString`);
-        return function () {
-          calls.push(`call ${propertyName}.toString`);
-          if (primitiveValue === undefined) return undefined;
-          return primitiveValue.toString();
-        };
-      },
-    };
-  },
-
-  /*
-   * An object containing further methods that return arrays of ISO strings, for
-   * testing parsers.
-   */
-  ISO: {
-    /*
-     * PlainMonthDay strings that are not valid.
-     */
-    plainMonthDayStringsInvalid() {
-      return [
-        "11-18junk",
-        "11-18[u-ca=gregory]",
-        "11-18[u-ca=hebrew]",
-        "11-18[U-CA=iso8601]",
-        "11-18[u-CA=iso8601]",
-        "11-18[FOO=bar]",
-        "-999999-01-01[u-ca=gregory]",
-        "-999999-01-01[u-ca=chinese]",
-        "+999999-01-01[u-ca=gregory]",
-        "+999999-01-01[u-ca=chinese]",
-      ];
-    },
-
-    /*
-     * PlainMonthDay strings that are valid and that should produce October 1st.
-     */
-    plainMonthDayStringsValid() {
-      return [
-        "10-01",
-        "1001",
-        "1965-10-01",
-        "1976-10-01T152330.1+00:00",
-        "19761001T15:23:30.1+00:00",
-        "1976-10-01T15:23:30.1+0000",
-        "1976-10-01T152330.1+0000",
-        "19761001T15:23:30.1+0000",
-        "19761001T152330.1+00:00",
-        "19761001T152330.1+0000",
-        "+001976-10-01T152330.1+00:00",
-        "+0019761001T15:23:30.1+00:00",
-        "+001976-10-01T15:23:30.1+0000",
-        "+001976-10-01T152330.1+0000",
-        "+0019761001T15:23:30.1+0000",
-        "+0019761001T152330.1+00:00",
-        "+0019761001T152330.1+0000",
-        "1976-10-01T15:23:00",
-        "1976-10-01T15:23",
-        "1976-10-01T15",
-        "1976-10-01",
-        "--10-01",
-        "--1001",
-        "-999999-10-01",
-        "-999999-10-01[u-ca=iso8601]",
-        "+999999-10-01",
-        "+999999-10-01[u-ca=iso8601]",
-      ];
-    },
-
-    /*
-     * PlainTime strings that may be mistaken for PlainMonthDay or
-     * PlainYearMonth strings, and so require a time designator.
-     */
-    plainTimeStringsAmbiguous() {
-      const ambiguousStrings = [
-        "2021-12",  // ambiguity between YYYY-MM and HHMM-UU
-        "2021-12[-12:00]",  // ditto, TZ does not disambiguate
-        "1214",     // ambiguity between MMDD and HHMM
-        "0229",     //   ditto, including MMDD that doesn't occur every year
-        "1130",     //   ditto, including DD that doesn't occur in every month
-        "12-14",    // ambiguity between MM-DD and HH-UU
-        "12-14[-14:00]",  // ditto, TZ does not disambiguate
-        "202112",   // ambiguity between YYYYMM and HHMMSS
-        "202112[UTC]",  // ditto, TZ does not disambiguate
-      ];
-      // Adding a calendar annotation to one of these strings must not cause
-      // disambiguation in favour of time.
-      const stringsWithCalendar = ambiguousStrings.map((s) => s + "[u-ca=iso8601]");
-      return ambiguousStrings.concat(stringsWithCalendar);
-    },
-
-    /*
-     * PlainTime strings that are of similar form to PlainMonthDay and
-     * PlainYearMonth strings, but are not ambiguous due to components that
-     * aren't valid as months or days.
-     */
-    plainTimeStringsUnambiguous() {
-      return [
-        "2021-13",          // 13 is not a month
-        "202113",           //   ditto
-        "2021-13[-13:00]",  //   ditto
-        "202113[-13:00]",   //   ditto
-        "0000-00",          // 0 is not a month
-        "000000",           //   ditto
-        "0000-00[UTC]",     //   ditto
-        "000000[UTC]",      //   ditto
-        "1314",             // 13 is not a month
-        "13-14",            //   ditto
-        "1232",             // 32 is not a day
-        "0230",             // 30 is not a day in February
-        "0631",             // 31 is not a day in June
-        "0000",             // 0 is neither a month nor a day
-        "00-00",            //   ditto
-      ];
-    },
-
-    /*
-     * PlainYearMonth-like strings that are not valid.
-     */
-    plainYearMonthStringsInvalid() {
-      return [
-        "2020-13",
-        "1976-11[u-ca=gregory]",
-        "1976-11[u-ca=hebrew]",
-        "1976-11[U-CA=iso8601]",
-        "1976-11[u-CA=iso8601]",
-        "1976-11[FOO=bar]",
-        "+999999-01",
-        "-999999-01",
-      ];
-    },
-
-    /*
-     * PlainYearMonth-like strings that are valid and should produce November
-     * 1976 in the ISO 8601 calendar.
-     */
-    plainYearMonthStringsValid() {
-      return [
-        "1976-11",
-        "1976-11-10",
-        "1976-11-01T09:00:00+00:00",
-        "1976-11-01T00:00:00+05:00",
-        "197611",
-        "+00197611",
-        "1976-11-18T15:23:30.1-02:00",
-        "1976-11-18T152330.1+00:00",
-        "19761118T15:23:30.1+00:00",
-        "1976-11-18T15:23:30.1+0000",
-        "1976-11-18T152330.1+0000",
-        "19761118T15:23:30.1+0000",
-        "19761118T152330.1+00:00",
-        "19761118T152330.1+0000",
-        "+001976-11-18T152330.1+00:00",
-        "+0019761118T15:23:30.1+00:00",
-        "+001976-11-18T15:23:30.1+0000",
-        "+001976-11-18T152330.1+0000",
-        "+0019761118T15:23:30.1+0000",
-        "+0019761118T152330.1+00:00",
-        "+0019761118T152330.1+0000",
-        "1976-11-18T15:23",
-        "1976-11-18T15",
-        "1976-11-18",
-      ];
-    },
-
-    /*
-     * PlainYearMonth-like strings that are valid and should produce November of
-     * the ISO year -9999.
-     */
-    plainYearMonthStringsValidNegativeYear() {
-      return [
-        "-009999-11",
-      ];
-    },
-  }
-};
diff --git a/js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/from-chinese-leap-month-uncommon.js b/js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/from-chinese-leap-month-uncommon.js
deleted file mode 100644
index dd80a574bc69b..0000000000000
--- a/js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/from-chinese-leap-month-uncommon.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2024 Mozilla Corporation. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-includes: [sm/non262-Temporal-PlainMonthDay-shell.js]
-features:
-  - Temporal
-description: |
-  pending
-esid: pending
----*/
-
-// Uncommon leap month with 30 days can be far into the past. Computing the
-// results can take its time, therefore the test is marked as "slow".
-//
-// Month -> ISO year
-// 
-// M01L     1461
-// M02L     <common>
-// M03L     <common>
-// M04L     <common>
-// M05L     <common>
-// M06L     <common>
-// M07L     <common>
-// M08L     <common>
-// M09L     -6482
-// M10L     -4633
-// M11L     -2172
-// M12L     -179
-//
-// See also "The Mathematics of the Chinese Calendar", Table 21 [1] for a
-// distribution of leap months.
-//
-// [1] https://www.xirugu.com/CHI500/Dates_Time/Chinesecalender.pdf
-
-const monthCodes = [
-  "M01L",
-  // M02L..M08L are common leap months.
-  "M09L",
-  "M10L",
-  "M11L",
-  "M12L",
-];
-
-const calendar = "chinese";
-
-// Months can have up to 30 days.
-const day = 30;
-
-for (let monthCode of monthCodes) {
-  let pmd = Temporal.PlainMonthDay.from({calendar, monthCode, day});
-  assert.sameValue(pmd.monthCode, monthCode);
-  assert.sameValue(pmd.day, day);
-
-  let constrain = Temporal.PlainMonthDay.from({calendar, monthCode, day: day + 1}, {overflow: "constrain"});
-  assert.sameValue(constrain.monthCode, monthCode);
-  assert.sameValue(constrain.day, day);
-  assertSameISOFields(constrain, pmd);
-
-  assert.throws(RangeError, () => {
-    Temporal.PlainMonthDay.from({calendar, monthCode, day: day + 1}, {overflow: "reject"});
-  });
-}
-
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/from-chinese.js b/js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/from-chinese.js
deleted file mode 100644
index dc6aad0efd169..0000000000000
--- a/js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/from-chinese.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2024 Mozilla Corporation. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-includes: [sm/non262-Temporal-PlainMonthDay-shell.js]
-features:
-  - Temporal
-description: |
-  pending
-esid: pending
----*/
-
-// Non-leap month should find a result in years around 1972.
-//
-// Month -> ISO year
-// 
-// M01      1970
-// M02      1972
-// M03      1966
-// M04      1970
-// M05      1972
-// M06      1971
-// M07      1972
-// M08      1971
-// M09      1972
-// M10      1972
-// M11      1970
-// M12      1972
-
-const monthCodes = [
-  "M01",
-  "M02",
-  "M03",
-  "M04",
-  "M05",
-  "M06",
-  "M07",
-  "M08",
-  "M09",
-  "M10",
-  "M11",
-  "M12",
-];
-
-const calendar = "chinese";
-
-// Months can have up to 30 days.
-const day = 30;
-
-for (let monthCode of monthCodes) {
-  let pmd = Temporal.PlainMonthDay.from({calendar, monthCode, day});
-  assert.sameValue(pmd.monthCode, monthCode);
-  assert.sameValue(pmd.day, day);
-
-  let constrain = Temporal.PlainMonthDay.from({calendar, monthCode, day: day + 1}, {overflow: "constrain"});
-  assert.sameValue(constrain.monthCode, monthCode);
-  assert.sameValue(constrain.day, day);
-  assertSameISOFields(constrain, pmd);
-
-  assert.throws(RangeError, () => {
-    Temporal.PlainMonthDay.from({calendar, monthCode, day: day + 1}, {overflow: "reject"});
-  });
-}
-
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/from-coptic.js b/js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/from-coptic.js
deleted file mode 100644
index 6f8be5a4f1967..0000000000000
--- a/js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/from-coptic.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2024 Mozilla Corporation. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-includes: [sm/non262-Temporal-PlainMonthDay-shell.js]
-features:
-  - Temporal
-description: |
-  pending
-esid: pending
----*/
-
-// Input which has to skip the first two candidates when starting the search from
-// December 31, 1972.
-//
-// Note: December 31, 1972 is year 1689 in the coptic calendar.
-//
-// 1. First candidate 1689-M13-05 ("1973-09-10[u-ca=coptic]") is after December 31, 1972.
-// 2. Second candidate 1688-M13-05 ("1972-09-10[u-ca=coptic]") is before December 31, 1972,
-//    but day doesn't match.
-// 3. Third candidate 1687-M13-06 ("1971-09-11[u-ca=coptic]") is a full match.
-{
-  let pmd = Temporal.PlainMonthDay.from({
-    calendar: "coptic",
-    monthCode: "M13",
-    day: 7,
-  });
-  assert.sameValue(pmd.monthCode, "M13");
-  assert.sameValue(pmd.day, 6);
-
-  let fields = ISOFields(pmd);
-  assert.sameValue(fields.calendar, "coptic");
-  assert.sameValue(fields.isoYear, 1971);
-  assert.sameValue(fields.isoMonth, 9);
-  assert.sameValue(fields.isoDay, 11);
-}
-
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/result-not-after-1972-dec-31.js b/js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/result-not-after-1972-dec-31.js
deleted file mode 100644
index 385c7d6a42964..0000000000000
--- a/js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/result-not-after-1972-dec-31.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2024 Mozilla Corporation. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-includes: [sm/non262-Temporal-PlainMonthDay-shell.js]
-features:
-  - Temporal
-description: |
-  pending
-esid: pending
----*/
-
-const monthCodes = [
-  "M01",
-  "M02",
-  "M03",
-  "M04",
-  "M05",
-  "M06",
-  "M07",
-  "M08",
-  "M09",
-  "M10",
-  "M11",
-  "M12",
-
-  // Short epagomenal month.
-  "M13",
-
-  // Leap months.
-  "M01L",
-  "M02L",
-  "M03L",
-  "M04L",
-  "M05L",
-  "M06L",
-  "M07L",
-  "M08L",
-  "M09L",
-  "M10L",
-  "M11L",
-  "M12L",
-];
-
-// Chinese and Dangi are excluded to avoid unnecessary slow-downs, see also
-// from-chinese*.js tests.
-const calendars = [
-  "buddhist",
-  // "chinese",
-  "coptic",
-  // "dangi",
-  "ethiopic",
-  "ethioaa",
-  "gregory",
-  "hebrew",
-  "indian",
-  // Islamic calendars are broken in ICU4X 1.5.
-  // https://github.com/unicode-org/icu4x/issues/5069
-  // "islamic",
-  "islamic-civil",
-  // "islamic-rgsa",
-  "islamic-tbla",
-  // "islamic-umalqura",
-  "japanese",
-  "persian",
-  "roc",
-];
-
-for (let calendar of calendars) {
-  const day = 31;
-  for (let monthCode of monthCodes) {
-    let pmd;
-    try {
-      pmd = Temporal.PlainMonthDay.from({calendar, monthCode, day});
-    } catch {
-      continue;
-    }
-    assert.sameValue(pmd.monthCode, monthCode);
-    assert.sameValue(pmd.day <= day, true);
-    assert.sameValue(ISOFields(pmd).isoYear <= 1972, true);
-  }
-}
-
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/shell.js b/js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/shell.js
deleted file mode 100644
index ec75bf58f723d..0000000000000
--- a/js/src/tests/test262/staging/sm/Temporal/PlainMonthDay/shell.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// GENERATED, DO NOT EDIT
-// file: non262-Temporal-PlainMonthDay-shell.js
-/*---
-defines: [ISOFields, assertSameISOFields]
----*/
-
-function ISOFields(monthDay) {
-  let re = /^(?<year>-?\d{4,6})-(?<month>\d{2})-(?<day>\d{2})\[u-ca=(?<calendar>[\w\-]+)\]$/;
-
-  let str = monthDay.toString({calendarName: "always"});
-  let match = str.match(re);
-  assert.sameValue(match !== null, true, `can't match: ${str}`);
-
-  let {year, month, day, calendar} = match.groups;
-  let isoYear = Number(year);
-  let isoMonth = Number(month);
-  let isoDay = Number(day);
-
-  let date = Temporal.PlainDate.from(str);
-  let isoDate = date.withCalendar("iso8601");
-
-  assert.sameValue(calendar, date.calendarId);
-  assert.sameValue(isoYear, isoDate.year);
-  assert.sameValue(isoMonth, isoDate.month);
-  assert.sameValue(isoDay, isoDate.day);
-
-  return {
-    isoYear,
-    isoMonth,
-    isoDay,
-    calendar,
-  };
-}
-
-function assertSameISOFields(actual, expected) {
-  let actualFields = ISOFields(actual);
-  let expectedFields = ISOFields(expected);
-
-  assert.sameValue(typeof actualFields.isoYear, "number");
-  assert.sameValue(typeof actualFields.isoMonth, "number");
-  assert.sameValue(typeof actualFields.isoDay, "number");
-
-  assert.sameValue(actualFields.isoMonth > 0, true);
-  assert.sameValue(actualFields.isoDay > 0, true);
-
-  assert.sameValue(actualFields.isoYear, expectedFields.isoYear);
-  assert.sameValue(actualFields.isoMonth, expectedFields.isoMonth);
-  assert.sameValue(actualFields.isoDay, expectedFields.isoDay);
-  assert.sameValue(actualFields.calendar, expectedFields.calendar);
-}
diff --git a/js/src/tests/test262/staging/sm/Temporal/ZonedDateTime/browser.js b/js/src/tests/test262/staging/sm/Temporal/ZonedDateTime/browser.js
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/js/src/tests/test262/staging/sm/Temporal/ZonedDateTime/shell.js b/js/src/tests/test262/staging/sm/Temporal/ZonedDateTime/shell.js
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/js/src/tests/test262/staging/sm/Temporal/ZonedDateTime/zones-and-links.js b/js/src/tests/test262/staging/sm/Temporal/ZonedDateTime/zones-and-links.js
deleted file mode 100644
index a302857029daa..0000000000000
--- a/js/src/tests/test262/staging/sm/Temporal/ZonedDateTime/zones-and-links.js
+++ /dev/null
@@ -1,674 +0,0 @@
-// |reftest| skip-if(!this.hasOwnProperty('Temporal')) -- Temporal is not enabled unconditionally
-// Copyright (C) 2025 Mozilla Corporation. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-features:
-  - Temporal
-description: |
-  pending
-esid: pending
----*/
-
-// Generated by make_intl_data.py. DO NOT EDIT.
-// tzdata version = 2024b
-const zones = [
-  "Africa/Abidjan",
-  "Africa/Accra",
-  "Africa/Addis_Ababa",
-  "Africa/Algiers",
-  "Africa/Asmara",
-  "Africa/Bamako",
-  "Africa/Bangui",
-  "Africa/Banjul",
-  "Africa/Bissau",
-  "Africa/Blantyre",
-  "Africa/Brazzaville",
-  "Africa/Bujumbura",
-  "Africa/Cairo",
-  "Africa/Casablanca",
-  "Africa/Ceuta",
-  "Africa/Conakry",
-  "Africa/Dakar",
-  "Africa/Dar_es_Salaam",
-  "Africa/Djibouti",
-  "Africa/Douala",
-  "Africa/El_Aaiun",
-  "Africa/Freetown",
-  "Africa/Gaborone",
-  "Africa/Harare",
-  "Africa/Johannesburg",
-  "Africa/Juba",
-  "Africa/Kampala",
-  "Africa/Khartoum",
-  "Africa/Kigali",
-  "Africa/Kinshasa",
-  "Africa/Lagos",
-  "Africa/Libreville",
-  "Africa/Lome",
-  "Africa/Luanda",
-  "Africa/Lubumbashi",
-  "Africa/Lusaka",
-  "Africa/Malabo",
-  "Africa/Maputo",
-  "Africa/Maseru",
-  "Africa/Mbabane",
-  "Africa/Mogadishu",
-  "Africa/Monrovia",
-  "Africa/Nairobi",
-  "Africa/Ndjamena",
-  "Africa/Niamey",
-  "Africa/Nouakchott",
-  "Africa/Ouagadougou",
-  "Africa/Porto-Novo",
-  "Africa/Sao_Tome",
-  "Africa/Tripoli",
-  "Africa/Tunis",
-  "Africa/Windhoek",
-  "America/Adak",
-  "America/Anchorage",
-  "America/Anguilla",
-  "America/Antigua",
-  "America/Araguaina",
-  "America/Argentina/Buenos_Aires",
-  "America/Argentina/Catamarca",
-  "America/Argentina/Cordoba",
-  "America/Argentina/Jujuy",
-  "America/Argentina/La_Rioja",
-  "America/Argentina/Mendoza",
-  "America/Argentina/Rio_Gallegos",
-  "America/Argentina/Salta",
-  "America/Argentina/San_Juan",
-  "America/Argentina/San_Luis",
-  "America/Argentina/Tucuman",
-  "America/Argentina/Ushuaia",
-  "America/Aruba",
-  "America/Asuncion",
-  "America/Atikokan",
-  "America/Bahia",
-  "America/Bahia_Banderas",
-  "America/Barbados",
-  "America/Belem",
-  "America/Belize",
-  "America/Blanc-Sablon",
-  "America/Boa_Vista",
-  "America/Bogota",
-  "America/Boise",
-  "America/Cambridge_Bay",
-  "America/Campo_Grande",
-  "America/Cancun",
-  "America/Caracas",
-  "America/Cayenne",
-  "America/Cayman",
-  "America/Chicago",
-  "America/Chihuahua",
-  "America/Ciudad_Juarez",
-  "America/Costa_Rica",
-  "America/Creston",
-  "America/Cuiaba",
-  "America/Curacao",
-  "America/Danmarkshavn",
-  "America/Dawson",
-  "America/Dawson_Creek",
-  "America/Denver",
-  "America/Detroit",
-  "America/Dominica",
-  "America/Edmonton",
-  "America/Eirunepe",
-  "America/El_Salvador",
-  "America/Fort_Nelson",
-  "America/Fortaleza",
-  "America/Glace_Bay",
-  "America/Goose_Bay",
-  "America/Grand_Turk",
-  "America/Grenada",
-  "America/Guadeloupe",
-  "America/Guatemala",
-  "America/Guayaquil",
-  "America/Guyana",
-  "America/Halifax",
-  "America/Havana",
-  "America/Hermosillo",
-  "America/Indiana/Indianapolis",
-  "America/Indiana/Knox",
-  "America/Indiana/Marengo",
-  "America/Indiana/Petersburg",
-  "America/Indiana/Tell_City",
-  "America/Indiana/Vevay",
-  "America/Indiana/Vincennes",
-  "America/Indiana/Winamac",
-  "America/Inuvik",
-  "America/Iqaluit",
-  "America/Jamaica",
-  "America/Juneau",
-  "America/Kentucky/Louisville",
-  "America/Kentucky/Monticello",
-  "America/Kralendijk",
-  "America/La_Paz",
-  "America/Lima",
-  "America/Los_Angeles",
-  "America/Lower_Princes",
-  "America/Maceio",
-  "America/Managua",
-  "America/Manaus",
-  "America/Marigot",
-  "America/Martinique",
-  "America/Matamoros",
-  "America/Mazatlan",
-  "America/Menominee",
-  "America/Merida",
-  "America/Metlakatla",
-  "America/Mexico_City",
-  "America/Miquelon",
-  "America/Moncton",
-  "America/Monterrey",
-  "America/Montevideo",
-  "America/Montserrat",
-  "America/Nassau",
-  "America/New_York",
-  "America/Nome",
-  "America/Noronha",
-  "America/North_Dakota/Beulah",
-  "America/North_Dakota/Center",
-  "America/North_Dakota/New_Salem",
-  "America/Nuuk",
-  "America/Ojinaga",
-  "America/Panama",
-  "America/Paramaribo",
-  "America/Phoenix",
-  "America/Port-au-Prince",
-  "America/Port_of_Spain",
-  "America/Porto_Velho",
-  "America/Puerto_Rico",
-  "America/Punta_Arenas",
-  "America/Rankin_Inlet",
-  "America/Recife",
-  "America/Regina",
-  "America/Resolute",
-  "America/Rio_Branco",
-  "America/Santarem",
-  "America/Santiago",
-  "America/Santo_Domingo",
-  "America/Sao_Paulo",
-  "America/Scoresbysund",
-  "America/Sitka",
-  "America/St_Barthelemy",
-  "America/St_Johns",
-  "America/St_Kitts",
-  "America/St_Lucia",
-  "America/St_Thomas",
-  "America/St_Vincent",
-  "America/Swift_Current",
-  "America/Tegucigalpa",
-  "America/Thule",
-  "America/Tijuana",
-  "America/Toronto",
-  "America/Tortola",
-  "America/Vancouver",
-  "America/Whitehorse",
-  "America/Winnipeg",
-  "America/Yakutat",
-  "Antarctica/Casey",
-  "Antarctica/Davis",
-  "Antarctica/DumontDUrville",
-  "Antarctica/Macquarie",
-  "Antarctica/Mawson",
-  "Antarctica/McMurdo",
-  "Antarctica/Palmer",
-  "Antarctica/Rothera",
-  "Antarctica/Syowa",
-  "Antarctica/Troll",
-  "Antarctica/Vostok",
-  "Arctic/Longyearbyen",
-  "Asia/Aden",
-  "Asia/Almaty",
-  "Asia/Amman",
-  "Asia/Anadyr",
-  "Asia/Aqtau",
-  "Asia/Aqtobe",
-  "Asia/Ashgabat",
-  "Asia/Atyrau",
-  "Asia/Baghdad",
-  "Asia/Bahrain",
-  "Asia/Baku",
-  "Asia/Bangkok",
-  "Asia/Barnaul",
-  "Asia/Beirut",
-  "Asia/Bishkek",
-  "Asia/Brunei",
-  "Asia/Chita",
-  "Asia/Colombo",
-  "Asia/Damascus",
-  "Asia/Dhaka",
-  "Asia/Dili",
-  "Asia/Dubai",
-  "Asia/Dushanbe",
-  "Asia/Famagusta",
-  "Asia/Gaza",
-  "Asia/Hebron",
-  "Asia/Ho_Chi_Minh",
-  "Asia/Hong_Kong",
-  "Asia/Hovd",
-  "Asia/Irkutsk",
-  "Asia/Jakarta",
-  "Asia/Jayapura",
-  "Asia/Jerusalem",
-  "Asia/Kabul",
-  "Asia/Kamchatka",
-  "Asia/Karachi",
-  "Asia/Kathmandu",
-  "Asia/Khandyga",
-  "Asia/Kolkata",
-  "Asia/Krasnoyarsk",
-  "Asia/Kuala_Lumpur",
-  "Asia/Kuching",
-  "Asia/Kuwait",
-  "Asia/Macau",
-  "Asia/Magadan",
-  "Asia/Makassar",
-  "Asia/Manila",
-  "Asia/Muscat",
-  "Asia/Nicosia",
-  "Asia/Novokuznetsk",
-  "Asia/Novosibirsk",
-  "Asia/Omsk",
-  "Asia/Oral",
-  "Asia/Phnom_Penh",
-  "Asia/Pontianak",
-  "Asia/Pyongyang",
-  "Asia/Qatar",
-  "Asia/Qostanay",
-  "Asia/Qyzylorda",
-  "Asia/Riyadh",
-  "Asia/Sakhalin",
-  "Asia/Samarkand",
-  "Asia/Seoul",
-  "Asia/Shanghai",
-  "Asia/Singapore",
-  "Asia/Srednekolymsk",
-  "Asia/Taipei",
-  "Asia/Tashkent",
-  "Asia/Tbilisi",
-  "Asia/Tehran",
-  "Asia/Thimphu",
-  "Asia/Tokyo",
-  "Asia/Tomsk",
-  "Asia/Ulaanbaatar",
-  "Asia/Urumqi",
-  "Asia/Ust-Nera",
-  "Asia/Vientiane",
-  "Asia/Vladivostok",
-  "Asia/Yakutsk",
-  "Asia/Yangon",
-  "Asia/Yekaterinburg",
-  "Asia/Yerevan",
-  "Atlantic/Azores",
-  "Atlantic/Bermuda",
-  "Atlantic/Canary",
-  "Atlantic/Cape_Verde",
-  "Atlantic/Faroe",
-  "Atlantic/Madeira",
-  "Atlantic/Reykjavik",
-  "Atlantic/South_Georgia",
-  "Atlantic/St_Helena",
-  "Atlantic/Stanley",
-  "Australia/Adelaide",
-  "Australia/Brisbane",
-  "Australia/Broken_Hill",
-  "Australia/Darwin",
-  "Australia/Eucla",
-  "Australia/Hobart",
-  "Australia/Lindeman",
-  "Australia/Lord_Howe",
-  "Australia/Melbourne",
-  "Australia/Perth",
-  "Australia/Sydney",
-  "Etc/GMT+1",
-  "Etc/GMT+10",
-  "Etc/GMT+11",
-  "Etc/GMT+12",
-  "Etc/GMT+2",
-  "Etc/GMT+3",
-  "Etc/GMT+4",
-  "Etc/GMT+5",
-  "Etc/GMT+6",
-  "Etc/GMT+7",
-  "Etc/GMT+8",
-  "Etc/GMT+9",
-  "Etc/GMT-1",
-  "Etc/GMT-10",
-  "Etc/GMT-11",
-  "Etc/GMT-12",
-  "Etc/GMT-13",
-  "Etc/GMT-14",
-  "Etc/GMT-2",
-  "Etc/GMT-3",
-  "Etc/GMT-4",
-  "Etc/GMT-5",
-  "Etc/GMT-6",
-  "Etc/GMT-7",
-  "Etc/GMT-8",
-  "Etc/GMT-9",
-  "Europe/Amsterdam",
-  "Europe/Andorra",
-  "Europe/Astrakhan",
-  "Europe/Athens",
-  "Europe/Belgrade",
-  "Europe/Berlin",
-  "Europe/Bratislava",
-  "Europe/Brussels",
-  "Europe/Bucharest",
-  "Europe/Budapest",
-  "Europe/Busingen",
-  "Europe/Chisinau",
-  "Europe/Copenhagen",
-  "Europe/Dublin",
-  "Europe/Gibraltar",
-  "Europe/Guernsey",
-  "Europe/Helsinki",
-  "Europe/Isle_of_Man",
-  "Europe/Istanbul",
-  "Europe/Jersey",
-  "Europe/Kaliningrad",
-  "Europe/Kirov",
-  "Europe/Kyiv",
-  "Europe/Lisbon",
-  "Europe/Ljubljana",
-  "Europe/London",
-  "Europe/Luxembourg",
-  "Europe/Madrid",
-  "Europe/Malta",
-  "Europe/Mariehamn",
-  "Europe/Minsk",
-  "Europe/Monaco",
-  "Europe/Moscow",
-  "Europe/Oslo",
-  "Europe/Paris",
-  "Europe/Podgorica",
-  "Europe/Prague",
-  "Europe/Riga",
-  "Europe/Rome",
-  "Europe/Samara",
-  "Europe/San_Marino",
-  "Europe/Sarajevo",
-  "Europe/Saratov",
-  "Europe/Simferopol",
-  "Europe/Skopje",
-  "Europe/Sofia",
-  "Europe/Stockholm",
-  "Europe/Tallinn",
-  "Europe/Tirane",
-  "Europe/Ulyanovsk",
-  "Europe/Vaduz",
-  "Europe/Vatican",
-  "Europe/Vienna",
-  "Europe/Vilnius",
-  "Europe/Volgograd",
-  "Europe/Warsaw",
-  "Europe/Zagreb",
-  "Europe/Zurich",
-  "Indian/Antananarivo",
-  "Indian/Chagos",
-  "Indian/Christmas",
-  "Indian/Cocos",
-  "Indian/Comoro",
-  "Indian/Kerguelen",
-  "Indian/Mahe",
-  "Indian/Maldives",
-  "Indian/Mauritius",
-  "Indian/Mayotte",
-  "Indian/Reunion",
-  "Pacific/Apia",
-  "Pacific/Auckland",
-  "Pacific/Bougainville",
-  "Pacific/Chatham",
-  "Pacific/Chuuk",
-  "Pacific/Easter",
-  "Pacific/Efate",
-  "Pacific/Fakaofo",
-  "Pacific/Fiji",
-  "Pacific/Funafuti",
-  "Pacific/Galapagos",
-  "Pacific/Gambier",
-  "Pacific/Guadalcanal",
-  "Pacific/Guam",
-  "Pacific/Honolulu",
-  "Pacific/Kanton",
-  "Pacific/Kiritimati",
-  "Pacific/Kosrae",
-  "Pacific/Kwajalein",
-  "Pacific/Majuro",
-  "Pacific/Marquesas",
-  "Pacific/Midway",
-  "Pacific/Nauru",
-  "Pacific/Niue",
-  "Pacific/Norfolk",
-  "Pacific/Noumea",
-  "Pacific/Pago_Pago",
-  "Pacific/Palau",
-  "Pacific/Pitcairn",
-  "Pacific/Pohnpei",
-  "Pacific/Port_Moresby",
-  "Pacific/Rarotonga",
-  "Pacific/Saipan",
-  "Pacific/Tahiti",
-  "Pacific/Tarawa",
-  "Pacific/Tongatapu",
-  "Pacific/Wake",
-  "Pacific/Wallis",
-  "UTC",
-];
-const links = {
-  "Africa/Asmera": "Africa/Asmara",
-  "Africa/Timbuktu": "Africa/Bamako",
-  "America/Argentina/ComodRivadavia": "America/Argentina/Catamarca",
-  "America/Atka": "America/Adak",
-  "America/Buenos_Aires": "America/Argentina/Buenos_Aires",
-  "America/Catamarca": "America/Argentina/Catamarca",
-  "America/Coral_Harbour": "America/Atikokan",
-  "America/Cordoba": "America/Argentina/Cordoba",
-  "America/Ensenada": "America/Tijuana",
-  "America/Fort_Wayne": "America/Indiana/Indianapolis",
-  "America/Godthab": "America/Nuuk",
-  "America/Indianapolis": "America/Indiana/Indianapolis",
-  "America/Jujuy": "America/Argentina/Jujuy",
-  "America/Knox_IN": "America/Indiana/Knox",
-  "America/Louisville": "America/Kentucky/Louisville",
-  "America/Mendoza": "America/Argentina/Mendoza",
-  "America/Montreal": "America/Toronto",
-  "America/Nipigon": "America/Toronto",
-  "America/Pangnirtung": "America/Iqaluit",
-  "America/Porto_Acre": "America/Rio_Branco",
-  "America/Rainy_River": "America/Winnipeg",
-  "America/Rosario": "America/Argentina/Cordoba",
-  "America/Santa_Isabel": "America/Tijuana",
-  "America/Shiprock": "America/Denver",
-  "America/Thunder_Bay": "America/Toronto",
-  "America/Virgin": "America/St_Thomas",
-  "America/Yellowknife": "America/Edmonton",
-  "Antarctica/South_Pole": "Antarctica/McMurdo",
-  "Asia/Ashkhabad": "Asia/Ashgabat",
-  "Asia/Calcutta": "Asia/Kolkata",
-  "Asia/Choibalsan": "Asia/Ulaanbaatar",
-  "Asia/Chongqing": "Asia/Shanghai",
-  "Asia/Chungking": "Asia/Shanghai",
-  "Asia/Dacca": "Asia/Dhaka",
-  "Asia/Harbin": "Asia/Shanghai",
-  "Asia/Istanbul": "Europe/Istanbul",
-  "Asia/Kashgar": "Asia/Urumqi",
-  "Asia/Katmandu": "Asia/Kathmandu",
-  "Asia/Macao": "Asia/Macau",
-  "Asia/Rangoon": "Asia/Yangon",
-  "Asia/Saigon": "Asia/Ho_Chi_Minh",
-  "Asia/Tel_Aviv": "Asia/Jerusalem",
-  "Asia/Thimbu": "Asia/Thimphu",
-  "Asia/Ujung_Pandang": "Asia/Makassar",
-  "Asia/Ulan_Bator": "Asia/Ulaanbaatar",
-  "Atlantic/Faeroe": "Atlantic/Faroe",
-  "Atlantic/Jan_Mayen": "Arctic/Longyearbyen",
-  "Australia/ACT": "Australia/Sydney",
-  "Australia/Canberra": "Australia/Sydney",
-  "Australia/Currie": "Australia/Hobart",
-  "Australia/LHI": "Australia/Lord_Howe",
-  "Australia/NSW": "Australia/Sydney",
-  "Australia/North": "Australia/Darwin",
-  "Australia/Queensland": "Australia/Brisbane",
-  "Australia/South": "Australia/Adelaide",
-  "Australia/Tasmania": "Australia/Hobart",
-  "Australia/Victoria": "Australia/Melbourne",
-  "Australia/West": "Australia/Perth",
-  "Australia/Yancowinna": "Australia/Broken_Hill",
-  "Brazil/Acre": "America/Rio_Branco",
-  "Brazil/DeNoronha": "America/Noronha",
-  "Brazil/East": "America/Sao_Paulo",
-  "Brazil/West": "America/Manaus",
-  "CET": "Europe/Brussels",
-  "CST6CDT": "America/Chicago",
-  "Canada/Atlantic": "America/Halifax",
-  "Canada/Central": "America/Winnipeg",
-  "Canada/Eastern": "America/Toronto",
-  "Canada/Mountain": "America/Edmonton",
-  "Canada/Newfoundland": "America/St_Johns",
-  "Canada/Pacific": "America/Vancouver",
-  "Canada/Saskatchewan": "America/Regina",
-  "Canada/Yukon": "America/Whitehorse",
-  "Chile/Continental": "America/Santiago",
-  "Chile/EasterIsland": "Pacific/Easter",
-  "Cuba": "America/Havana",
-  "EET": "Europe/Athens",
-  "EST": "America/Panama",
-  "EST5EDT": "America/New_York",
-  "Egypt": "Africa/Cairo",
-  "Eire": "Europe/Dublin",
-  "Etc/GMT": "UTC",
-  "Etc/GMT+0": "UTC",
-  "Etc/GMT-0": "UTC",
-  "Etc/GMT0": "UTC",
-  "Etc/Greenwich": "UTC",
-  "Etc/UCT": "UTC",
-  "Etc/UTC": "UTC",
-  "Etc/Universal": "UTC",
-  "Etc/Zulu": "UTC",
-  "Europe/Belfast": "Europe/London",
-  "Europe/Kiev": "Europe/Kyiv",
-  "Europe/Nicosia": "Asia/Nicosia",
-  "Europe/Tiraspol": "Europe/Chisinau",
-  "Europe/Uzhgorod": "Europe/Kyiv",
-  "Europe/Zaporozhye": "Europe/Kyiv",
-  "GB": "Europe/London",
-  "GB-Eire": "Europe/London",
-  "GMT": "UTC",
-  "GMT+0": "UTC",
-  "GMT-0": "UTC",
-  "GMT0": "UTC",
-  "Greenwich": "UTC",
-  "HST": "Pacific/Honolulu",
-  "Hongkong": "Asia/Hong_Kong",
-  "Iceland": "Atlantic/Reykjavik",
-  "Iran": "Asia/Tehran",
-  "Israel": "Asia/Jerusalem",
-  "Jamaica": "America/Jamaica",
-  "Japan": "Asia/Tokyo",
-  "Kwajalein": "Pacific/Kwajalein",
-  "Libya": "Africa/Tripoli",
-  "MET": "Europe/Brussels",
-  "MST": "America/Phoenix",
-  "MST7MDT": "America/Denver",
-  "Mexico/BajaNorte": "America/Tijuana",
-  "Mexico/BajaSur": "America/Mazatlan",
-  "Mexico/General": "America/Mexico_City",
-  "NZ": "Pacific/Auckland",
-  "NZ-CHAT": "Pacific/Chatham",
-  "Navajo": "America/Denver",
-  "PRC": "Asia/Shanghai",
-  "PST8PDT": "America/Los_Angeles",
-  "Pacific/Enderbury": "Pacific/Kanton",
-  "Pacific/Johnston": "Pacific/Honolulu",
-  "Pacific/Ponape": "Pacific/Pohnpei",
-  "Pacific/Samoa": "Pacific/Pago_Pago",
-  "Pacific/Truk": "Pacific/Chuuk",
-  "Pacific/Yap": "Pacific/Chuuk",
-  "Poland": "Europe/Warsaw",
-  "Portugal": "Europe/Lisbon",
-  "ROC": "Asia/Taipei",
-  "ROK": "Asia/Seoul",
-  "Singapore": "Asia/Singapore",
-  "Turkey": "Europe/Istanbul",
-  "UCT": "UTC",
-  "US/Alaska": "America/Anchorage",
-  "US/Aleutian": "America/Adak",
-  "US/Arizona": "America/Phoenix",
-  "US/Central": "America/Chicago",
-  "US/East-Indiana": "America/Indiana/Indianapolis",
-  "US/Eastern": "America/New_York",
-  "US/Hawaii": "Pacific/Honolulu",
-  "US/Indiana-Starke": "America/Indiana/Knox",
-  "US/Michigan": "America/Detroit",
-  "US/Mountain": "America/Denver",
-  "US/Pacific": "America/Los_Angeles",
-  "US/Samoa": "Pacific/Pago_Pago",
-  "Universal": "UTC",
-  "W-SU": "Europe/Moscow",
-  "WET": "Europe/Lisbon",
-  "Zulu": "UTC",
-};
-
-let epochNanoseconds = [
-  new Temporal.PlainDate(1900, 1, 1).toZonedDateTime("UTC").epochNanoseconds,
-  new Temporal.PlainDate(1950, 1, 1).toZonedDateTime("UTC").epochNanoseconds,
-  new Temporal.PlainDate(1960, 1, 1).toZonedDateTime("UTC").epochNanoseconds,
-  new Temporal.PlainDate(1970, 1, 1).toZonedDateTime("UTC").epochNanoseconds,
-  new Temporal.PlainDate(1980, 1, 1).toZonedDateTime("UTC").epochNanoseconds,
-  new Temporal.PlainDate(1990, 1, 1).toZonedDateTime("UTC").epochNanoseconds,
-  new Temporal.PlainDate(2000, 1, 1).toZonedDateTime("UTC").epochNanoseconds,
-  new Temporal.PlainDate(2010, 1, 1).toZonedDateTime("UTC").epochNanoseconds,
-  new Temporal.PlainDate(2020, 1, 1).toZonedDateTime("UTC").epochNanoseconds,
-  new Temporal.PlainDate(2030, 1, 1).toZonedDateTime("UTC").epochNanoseconds,
-];
-
-function timeZoneId(zdt) {
-  let str = zdt.toString();
-  let m = str.match(/(?<=\[)[\w\/_+-]+(?=\])/);
-  assert.sameValue(m !== null, true, str);
-  return m[0];
-}
-
-for (let zone of zones) {
-  let zdt = new Temporal.ZonedDateTime(0n, zone);
-
-  assert.sameValue(zdt.timeZoneId, zone);
-  assert.sameValue(timeZoneId(zdt), zone);
-}
-
-for (let [link, zone] of Object.entries(links)) {
-  assert.sameValue(link === zone, false, `link=${link}, zone=${zone}`);
-  assert.sameValue(zones.includes(zone), true, `zone=${zone}`);
-
-  let zdtLink = new Temporal.ZonedDateTime(0n, link);
-  let zdtZone = new Temporal.ZonedDateTime(0n, zone);
-
-  assert.sameValue(zdtLink.timeZoneId, link);
-  assert.sameValue(timeZoneId(zdtLink), link);
-
-  assert.sameValue(zdtZone.timeZoneId, zone);
-  assert.sameValue(timeZoneId(zdtZone), zone);
-
-  assert.sameValue(zdtLink.equals(zdtZone), true, `link=${link}, zone=${zone}`);
-
-  assert.sameValue(
-    zdtLink.offsetNanoseconds,
-    zdtZone.offsetNanoseconds,
-    `link=${link}, zone=${zone}`
-  );
-
-  for (let epochNs of epochNanoseconds) {
-    assert.sameValue(
-      new Temporal.ZonedDateTime(epochNs, link).offsetNanoseconds,
-      new Temporal.ZonedDateTime(epochNs, zone).offsetNanoseconds,
-      `link=${link}, zone=${zone}, epochNs=${epochNs}`
-    );
-  }
-}
-
-
-reportCompare(0, 0);
diff --git a/js/src/tests/test262/staging/sm/Temporal/browser.js b/js/src/tests/test262/staging/sm/Temporal/browser.js
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/js/src/tests/test262/staging/sm/Temporal/shell.js b/js/src/tests/test262/staging/sm/Temporal/shell.js
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/js/src/tests/test262/staging/sm/TypedArray/toLocaleString-detached.js b/js/src/tests/test262/staging/sm/TypedArray/toLocaleString-detached.js
index 79066fc6ee48c..05e0588b42fac 100644
--- a/js/src/tests/test262/staging/sm/TypedArray/toLocaleString-detached.js
+++ b/js/src/tests/test262/staging/sm/TypedArray/toLocaleString-detached.js
@@ -10,6 +10,8 @@ esid: pending
 
 const originalNumberToLocaleString = Number.prototype.toLocaleString;
 
+const separator = ["", ""].toLocaleString();
+
 // Throws if array buffer is detached.
 for (let constructor of typedArrayConstructors) {
     let typedArray = new constructor(42);
@@ -37,7 +39,7 @@ for (let constructor of typedArrayConstructors) {
     // And no error if more than one element is present.
     detached = false;
     typedArray = new constructor(2);
-    assert.sameValue(typedArray.toLocaleString(), "0,");
+    assert.sameValue(typedArray.toLocaleString(), "0" + separator);
     assert.sameValue(detached, true);
 }
 Number.prototype.toLocaleString = originalNumberToLocaleString;
diff --git a/js/src/tests/test262/staging/sm/extensions/regress-645160.js b/js/src/tests/test262/staging/sm/extensions/regress-645160.js
deleted file mode 100644
index 4971f3df40e89..0000000000000
--- a/js/src/tests/test262/staging/sm/extensions/regress-645160.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/licenses/publicdomain/
- */
-
-/*---
-flags:
-  - noStrict
-description: |
-  pending
-esid: pending
----*/
-function potatoMasher(obj, arg) { this.eval(arg); }
-potatoMasher(this, "var s = Error().stack");
-assert.sameValue(/potatoMasher/.exec(s) instanceof Array, true);
-
-
-reportCompare(0, 0);

From 52091c33ebc92ff78633f3ff00d6f89a7d3b8d56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bargull?= <andre.bargull@gmail.com>
Date: Thu, 29 Jan 2026 15:18:22 +0000
Subject: [PATCH 084/116] Bug 2013278 - Part 2: Update test262 exclusion lists.
 r=spidermonkey-reviewers,mgaudet

Differential Revision: https://phabricator.services.mozilla.com/D280943
---
 js/src/tests/jstests.list | 225 +++++++++++++++-----------------------
 1 file changed, 91 insertions(+), 134 deletions(-)

diff --git a/js/src/tests/jstests.list b/js/src/tests/jstests.list
index dc836f8bd43cc..19f1ed50fe291 100644
--- a/js/src/tests/jstests.list
+++ b/js/src/tests/jstests.list
@@ -714,142 +714,9 @@ skip script test262/language/expressions/class/decorator/syntax/class-valid/deco
 skip script test262/staging/explicit-resource-management/call-dispose-methods.js
 skip script test262/staging/explicit-resource-management/await-using-in-switch-case-block.js
 
-# https://github.com/tc39/test262/pull/4623
-skip script test262/built-ins/ThrowTypeError/distinct-cross-realm.js
-
-# https://github.com/tc39/test262/issues/4639
-skip script test262/intl402/Intl/supportedValuesOf/calendars-required-by-intl-era-monthcode.js
-
-# https://github.com/tc39/test262/pull/4649
-skip-if(!xulRuntime.shell) script test262/built-ins/Math/sumPrecise/throws-on-non-number.js
-
-# Not yet updated for Unicode 17.
+# https://github.com/tc39/test262/pull/4898
 skip script test262/staging/sm/String/string-upper-lower-mapping.js
 
-# Not yet updated for Unicode 17.
-# https://github.com/tc39/test262/pull/4572
-# https://github.com/tc39/test262/pull/4573
-skip script test262/built-ins/RegExp/property-escapes/generated/Cased.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Tangut.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_-_Inherited.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Inherited.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Extender.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Latin.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Changes_When_Casefolded.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Alphabetic.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Syriac.js
-skip script test262/built-ins/RegExp/property-escapes/generated/XID_Start.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Arabic.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Unified_Ideograph.js
-skip script test262/built-ins/RegExp/property-escapes/generated/XID_Continue.js
-skip script test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Letter.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Math.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Han.js
-skip script test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Cased_Letter.js
-skip script test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Math_Symbol.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_-_Sharada.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Changes_When_Casemapped.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Tirhuta.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Tifinagh.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Changes_When_Titlecased.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Lowercase.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Newa.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_-_Tangut.js
-skip script test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Nonspacing_Mark.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Ideographic.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Changes_When_Lowercased.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Emoji.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_-_Kannada.js
-skip script test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Modifier_Letter.js
-skip script test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Number.js
-skip script test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Nandinagari.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_-_Latin.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Grapheme_Extend.js
-skip script test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Uppercase_Letter.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Kannada.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Case_Ignorable.js
-skip script test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Spacing_Mark.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Changes_When_Uppercased.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Uppercase.js
-skip script test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other_Letter.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_-_Telugu.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_-_Han.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Telugu.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Common.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Extended_Pictographic.js
-skip script test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Decimal_Number.js
-skip script test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Mark.js
-skip script test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Symbol.js
-skip script test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Punctuation.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_-_Common.js
-skip script test262/built-ins/RegExp/property-escapes/generated/ID_Continue.js
-skip script test262/built-ins/RegExp/property-escapes/generated/ID_Start.js
-skip script test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Unassigned.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Grapheme_Base.js
-skip script test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Currency_Symbol.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Assigned.js
-skip script test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other_Symbol.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Sharada.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Emoji_Presentation.js
-skip script test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Lowercase_Letter.js
-skip script test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Letter_Number.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Changes_When_NFKC_Casefolded.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Diacritic.js
-skip script test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other_Punctuation.js
-skip script test262/built-ins/RegExp/property-escapes/generated/Script_-_Arabic.js
-
-# https://github.com/tc39/test262/pull/4659
-skip script test262/staging/Intl402/Temporal/old/indian-calendar.js
-
-# "Intl era and monthCode" proposal should clarify if "islamic" and "islamic-rgsa" are still allowed
-# for Intl.DisplayNames.
-skip script test262/intl402/Intl/supportedValuesOf/calendars-accepted-by-DisplayNames.js
-
-# https://github.com/tc39/test262/pull/4721
-skip script test262/staging/Intl402/Temporal/old/non-iso-calendars-ethioaa.js
-skip script test262/staging/Intl402/Temporal/old/non-iso-calendars-ethiopic.js
-skip script test262/staging/Intl402/Temporal/old/non-iso-calendars-indian.js
-skip script test262/staging/Intl402/Temporal/old/non-iso-calendars-coptic.js
-
-# https://github.com/tc39/proposal-intl-era-monthcode/issues/96
-skip script test262/intl402/Temporal/PlainDateTime/prototype/since/leap-months-chinese.js
-skip script test262/intl402/Temporal/PlainDateTime/prototype/since/leap-months-dangi.js
-skip script test262/intl402/Temporal/PlainDateTime/prototype/since/leap-months-hebrew.js
-skip script test262/intl402/Temporal/PlainDateTime/prototype/until/leap-months-chinese.js
-skip script test262/intl402/Temporal/PlainDateTime/prototype/until/leap-months-dangi.js
-skip script test262/intl402/Temporal/PlainDateTime/prototype/until/leap-months-hebrew.js
-skip script test262/intl402/Temporal/ZonedDateTime/prototype/since/leap-months-chinese.js
-skip script test262/intl402/Temporal/ZonedDateTime/prototype/since/leap-months-dangi.js
-skip script test262/intl402/Temporal/ZonedDateTime/prototype/since/leap-months-hebrew.js
-skip script test262/intl402/Temporal/ZonedDateTime/prototype/until/leap-months-chinese.js
-skip script test262/intl402/Temporal/ZonedDateTime/prototype/until/leap-months-dangi.js
-skip script test262/intl402/Temporal/ZonedDateTime/prototype/until/leap-months-hebrew.js
-skip script test262/intl402/Temporal/PlainDate/prototype/since/leap-months-chinese.js
-skip script test262/intl402/Temporal/PlainDate/prototype/since/leap-months-dangi.js
-skip script test262/intl402/Temporal/PlainDate/prototype/since/leap-months-hebrew.js
-skip script test262/intl402/Temporal/PlainDate/prototype/until/leap-months-chinese.js
-skip script test262/intl402/Temporal/PlainDate/prototype/until/leap-months-dangi.js
-skip script test262/intl402/Temporal/PlainDate/prototype/until/leap-months-hebrew.js
-skip script test262/intl402/Temporal/PlainYearMonth/prototype/until/leap-months-hebrew.js
-skip script test262/intl402/Temporal/PlainYearMonth/prototype/until/leap-months-dangi.js
-skip script test262/intl402/Temporal/PlainYearMonth/prototype/until/leap-months-chinese.js
-skip script test262/intl402/Temporal/PlainYearMonth/prototype/since/leap-months-hebrew.js
-skip script test262/intl402/Temporal/PlainYearMonth/prototype/since/leap-months-dangi.js
-skip script test262/intl402/Temporal/PlainYearMonth/prototype/since/leap-months-chinese.js
-
-# https://github.com/tc39/test262/pull/4676
-skip script test262/intl402/DateTimeFormat/prototype/formatToParts/era.js
-
-# https://github.com/tc39/test262/pull/4778
-skip script test262/built-ins/Temporal/Duration/prototype/total/relativeto-date-limits.js
-
-# https://github.com/tc39/test262/pull/4775
-skip script test262/intl402/DateTimeFormat/prototype/formatToParts/chinese-calendar-dates.js
-skip script test262/intl402/DateTimeFormat/prototype/formatToParts/dangi-calendar-dates.js
-skip script test262/intl402/DateTimeFormat/prototype/formatRangeToParts/chinese-calendar-dates.js
-skip script test262/intl402/DateTimeFormat/prototype/formatRangeToParts/dangi-calendar-dates.js
-
 
 ##############################################
 # Enable Iterator Helpers tests in the shell #
@@ -1037,3 +904,93 @@ skip script test262/built-ins/Temporal/ZonedDateTime/from/argument-string-limits
 skip script test262/built-ins/Temporal/ZonedDateTime/prototype/equals/argument-string-limits.js
 skip script test262/built-ins/Temporal/ZonedDateTime/prototype/since/argument-string-limits.js
 skip script test262/built-ins/Temporal/ZonedDateTime/prototype/until/argument-string-limits.js
+
+# https://github.com/tc39/proposal-temporal/pull/3253
+skip script test262/built-ins/Temporal/PlainYearMonth/prototype/add/overflow.js
+skip script test262/built-ins/Temporal/PlainYearMonth/prototype/add/subtract-from-last-representable-month.js
+skip script test262/built-ins/Temporal/PlainYearMonth/prototype/add/argument-lower-units.js
+skip script test262/built-ins/Temporal/PlainYearMonth/prototype/add/options-read-before-algorithmic-validation.js
+skip script test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/overflow.js
+skip script test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/subtract-from-last-representable-month.js
+skip script test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/argument-lower-units.js
+skip script test262/built-ins/Temporal/PlainYearMonth/prototype/subtract/options-read-before-algorithmic-validation.js
+
+# https://github.com/tc39/proposal-intl-era-monthcode/pull/102
+skip script test262/intl402/Temporal/ZonedDateTime/from/era-boundary-japanese.js
+skip script test262/intl402/Temporal/PlainDate/from/era-boundary-japanese.js
+skip script test262/intl402/Temporal/PlainDateTime/from/era-boundary-japanese.js
+skip script test262/intl402/Temporal/PlainYearMonth/from/era-boundary-japanese.js
+
+# https://github.com/tc39/proposal-intl-era-monthcode/issues/96
+skip script test262/intl402/Temporal/PlainDateTime/prototype/since/leap-months-chinese.js
+skip script test262/intl402/Temporal/PlainDateTime/prototype/since/leap-months-dangi.js
+skip script test262/intl402/Temporal/PlainDateTime/prototype/since/leap-months-hebrew.js
+skip script test262/intl402/Temporal/PlainDateTime/prototype/until/leap-months-chinese.js
+skip script test262/intl402/Temporal/PlainDateTime/prototype/until/leap-months-dangi.js
+skip script test262/intl402/Temporal/PlainDateTime/prototype/until/leap-months-hebrew.js
+skip script test262/intl402/Temporal/ZonedDateTime/prototype/since/leap-months-chinese.js
+skip script test262/intl402/Temporal/ZonedDateTime/prototype/since/leap-months-dangi.js
+skip script test262/intl402/Temporal/ZonedDateTime/prototype/since/leap-months-hebrew.js
+skip script test262/intl402/Temporal/ZonedDateTime/prototype/until/leap-months-chinese.js
+skip script test262/intl402/Temporal/ZonedDateTime/prototype/until/leap-months-dangi.js
+skip script test262/intl402/Temporal/ZonedDateTime/prototype/until/leap-months-hebrew.js
+skip script test262/intl402/Temporal/PlainDate/prototype/since/leap-months-chinese.js
+skip script test262/intl402/Temporal/PlainDate/prototype/since/leap-months-dangi.js
+skip script test262/intl402/Temporal/PlainDate/prototype/since/leap-months-hebrew.js
+skip script test262/intl402/Temporal/PlainDate/prototype/until/leap-months-chinese.js
+skip script test262/intl402/Temporal/PlainDate/prototype/until/leap-months-dangi.js
+skip script test262/intl402/Temporal/PlainDate/prototype/until/leap-months-hebrew.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/until/leap-months-hebrew.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/until/leap-months-dangi.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/until/leap-months-chinese.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/since/leap-months-hebrew.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/since/leap-months-dangi.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/since/leap-months-chinese.js
+
+# https://github.com/tc39/proposal-intl-era-monthcode/pull/101
+skip script test262/intl402/Temporal/ZonedDateTime/prototype/since/wrapping-at-end-of-month-hebrew.js
+skip script test262/intl402/Temporal/ZonedDateTime/prototype/since/wrapping-at-end-of-month-chinese.js
+skip script test262/intl402/Temporal/ZonedDateTime/prototype/since/wrapping-at-end-of-month-dangi.js
+skip script test262/intl402/Temporal/ZonedDateTime/prototype/until/wrapping-at-end-of-month-hebrew.js
+skip script test262/intl402/Temporal/ZonedDateTime/prototype/until/wrapping-at-end-of-month-chinese.js
+skip script test262/intl402/Temporal/ZonedDateTime/prototype/until/wrapping-at-end-of-month-dangi.js
+skip script test262/intl402/Temporal/PlainDate/prototype/since/wrapping-at-end-of-month-hebrew.js
+skip script test262/intl402/Temporal/PlainDate/prototype/since/wrapping-at-end-of-month-chinese.js
+skip script test262/intl402/Temporal/PlainDate/prototype/since/wrapping-at-end-of-month-dangi.js
+skip script test262/intl402/Temporal/PlainDate/prototype/until/wrapping-at-end-of-month-hebrew.js
+skip script test262/intl402/Temporal/PlainDate/prototype/until/wrapping-at-end-of-month-chinese.js
+skip script test262/intl402/Temporal/PlainDate/prototype/until/wrapping-at-end-of-month-dangi.js
+skip script test262/intl402/Temporal/PlainDateTime/prototype/since/wrapping-at-end-of-month-hebrew.js
+skip script test262/intl402/Temporal/PlainDateTime/prototype/since/wrapping-at-end-of-month-chinese.js
+skip script test262/intl402/Temporal/PlainDateTime/prototype/since/wrapping-at-end-of-month-dangi.js
+skip script test262/intl402/Temporal/PlainDateTime/prototype/until/wrapping-at-end-of-month-hebrew.js
+skip script test262/intl402/Temporal/PlainDateTime/prototype/until/wrapping-at-end-of-month-chinese.js
+skip script test262/intl402/Temporal/PlainDateTime/prototype/until/wrapping-at-end-of-month-dangi.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-japanese.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-roc.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-islamic-tbla.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-ethioaa.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-islamic-civil.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-gregory.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-coptic.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-ethiopic.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-months-dangi.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-persian.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-indian.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-months-hebrew.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-months-chinese.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/add/leap-year-buddhist.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-japanese.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-roc.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-islamic-tbla.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-ethioaa.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-islamic-civil.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-coptic.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-gregory.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-ethiopic.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-months-dangi.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-persian.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-indian.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-months-hebrew.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-months-chinese.js
+skip script test262/intl402/Temporal/PlainYearMonth/prototype/subtract/leap-year-buddhist.js

From 8d6389527b1e4dd5ff5a601c52d83c7031526467 Mon Sep 17 00:00:00 2001
From: Giulia Cardieri <gcardieri@mozilla.com>
Date: Thu, 29 Jan 2026 15:25:41 +0000
Subject: [PATCH 085/116] Bug 2008973: Update smartbar background and text for
 dark mode. r=ai-frontend-reviewers,flozia,desktop-theme-reviewers,dao

Figma: https://www.figma.com/design/5KuePTGmOEUFyCHBHCsGim/AI-Mode-%E2%80%94%C2%A0MVP-Scope-Design?node-id=11889-19377&m=dev

Updated for dark mode according to Figma:
1. smart bar background
2. smart bar box shadow effect (using pseudo elements because it's a gradient)
3. smart bar disabled button background and icon color
4. memories toggle icon color

Differential Revision: https://phabricator.services.mozilla.com/D280502
---
 .../ui/assets/input-cta-arrow-icon.svg        |  2 +-
 .../aiwindow/ui/assets/memories-off.svg       |  4 ++--
 .../aiwindow/ui/assets/memories-on.svg        |  2 +-
 .../ui/components/input-cta/input-cta.css     |  3 ++-
 .../memories-icon-button.css                  |  2 +-
 browser/themes/shared/smartbar.css            | 22 ++++++++++++++++---
 6 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/browser/components/aiwindow/ui/assets/input-cta-arrow-icon.svg b/browser/components/aiwindow/ui/assets/input-cta-arrow-icon.svg
index 2f3ade0977c7c..53f8960e011a8 100644
--- a/browser/components/aiwindow/ui/assets/input-cta-arrow-icon.svg
+++ b/browser/components/aiwindow/ui/assets/input-cta-arrow-icon.svg
@@ -2,5 +2,5 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at https://mozilla.org/MPL/2.0/. -->
 <svg width="14" height="12" viewBox="0 0 14 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M11.4391 6.75033H0V5.25033H11.4393L7.24967 1.06066L8.31033 0L13.7803 5.47C13.921 5.61066 14 5.80144 14 6.00036C14 6.19929 13.921 6.39006 13.7803 6.53071L8.31028 11.9997L7.24972 10.939L11.4391 6.75033Z" fill="#5b5b66"/>
+<path d="M11.4391 6.75033H0V5.25033H11.4393L7.24967 1.06066L8.31033 0L13.7803 5.47C13.921 5.61066 14 5.80144 14 6.00036C14 6.19929 13.921 6.39006 13.7803 6.53071L8.31028 11.9997L7.24972 10.939L11.4391 6.75033Z" fill="context-fill"/>
 </svg>
diff --git a/browser/components/aiwindow/ui/assets/memories-off.svg b/browser/components/aiwindow/ui/assets/memories-off.svg
index df5dabd625432..03c7e6a86055d 100644
--- a/browser/components/aiwindow/ui/assets/memories-off.svg
+++ b/browser/components/aiwindow/ui/assets/memories-off.svg
@@ -3,13 +3,13 @@
    - file, You can obtain one at https://mozilla.org/MPL/2.0/. -->
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
   <g clip-path="url(#clip0_9465_133975)">
-  <path d="M8.00293 0C12.4213 0 16.0029 3.5816 16.0029 8C16.0053 10.083 15.1927 12.0843 13.7389 13.576C12.9943 14.3441 12.1027 14.9545 11.1173 15.3709C10.1318 15.7873 9.07272 16.0013 8.00293 16C6.93314 16.0013 5.87401 15.7873 4.8886 15.3709C3.90318 14.9545 3.0116 14.3441 2.26693 13.576C0.813113 12.0843 0.000542392 10.083 0.00293496 8C0.00293496 3.5816 3.58453 0 8.00293 0ZM8.00293 11.2C7.24303 11.1994 6.491 11.3539 5.79289 11.6541C5.09478 11.9542 4.46528 12.3937 3.94293 12.9456C5.08592 13.8878 6.52163 14.4022 8.00293 14.4C9.48395 14.402 10.9194 13.8877 12.0621 12.9456C11.5399 12.3938 10.9105 11.9544 10.2125 11.6542C9.51457 11.3541 8.7627 11.1995 8.00293 11.2ZM8.00293 1.6C6.82029 1.59999 5.66077 1.92766 4.65306 2.54666C3.64536 3.16566 2.82887 4.05178 2.29422 5.10666C1.75956 6.16155 1.52766 7.34395 1.62424 8.52264C1.72081 9.70133 2.1421 10.8302 2.84133 11.784C3.51116 11.0923 4.31334 10.5425 5.2001 10.1672C6.08686 9.79204 7.04006 9.59912 8.00293 9.6C8.96567 9.59923 9.91872 9.7922 10.8053 10.1674C11.6919 10.5426 12.494 11.0924 13.1637 11.784C13.8629 10.8303 14.2842 9.70146 14.3808 8.52284C14.4774 7.34422 14.2456 6.16188 13.711 5.10702C13.1765 4.05216 12.3601 3.16603 11.3525 2.54698C10.3449 1.92792 9.1855 1.60013 8.00293 1.6ZM7.62693 2.656C7.65693 2.58079 7.70879 2.5163 7.77582 2.47087C7.84285 2.42544 7.92196 2.40116 8.00293 2.40116C8.0839 2.40116 8.16301 2.42544 8.23004 2.47087C8.29707 2.5163 8.34893 2.58079 8.37893 2.656L8.58213 3.144C8.92172 3.97206 9.56596 4.63834 10.3821 5.0056L10.9565 5.26C11.2845 5.4064 11.2845 5.8848 10.9565 6.0312L10.3485 6.3016C9.55282 6.65866 8.91976 7.30086 8.57413 8.1016L8.37653 8.5544C8.34577 8.62813 8.29389 8.69111 8.22741 8.73542C8.16092 8.77972 8.08282 8.80336 8.00293 8.80336C7.92304 8.80336 7.84494 8.77972 7.77845 8.73542C7.71197 8.69111 7.66009 8.62813 7.62933 8.5544L7.43253 8.1024C7.08668 7.30107 6.45298 6.65853 5.65653 6.3016L5.04853 6.0312C4.97491 5.99717 4.91257 5.94277 4.86888 5.87444C4.82518 5.80611 4.80197 5.7267 4.80197 5.6456C4.80197 5.56449 4.82518 5.48508 4.86888 5.41675C4.91257 5.34842 4.97491 5.29403 5.04853 5.26L5.62293 5.0056C6.43925 4.6387 7.08378 3.9727 7.42373 3.1448L7.62693 2.656Z" fill="#5B5B66"/>
+  <path d="M8.00293 0C12.4213 0 16.0029 3.5816 16.0029 8C16.0053 10.083 15.1927 12.0843 13.7389 13.576C12.9943 14.3441 12.1027 14.9545 11.1173 15.3709C10.1318 15.7873 9.07272 16.0013 8.00293 16C6.93314 16.0013 5.87401 15.7873 4.8886 15.3709C3.90318 14.9545 3.0116 14.3441 2.26693 13.576C0.813113 12.0843 0.000542392 10.083 0.00293496 8C0.00293496 3.5816 3.58453 0 8.00293 0ZM8.00293 11.2C7.24303 11.1994 6.491 11.3539 5.79289 11.6541C5.09478 11.9542 4.46528 12.3937 3.94293 12.9456C5.08592 13.8878 6.52163 14.4022 8.00293 14.4C9.48395 14.402 10.9194 13.8877 12.0621 12.9456C11.5399 12.3938 10.9105 11.9544 10.2125 11.6542C9.51457 11.3541 8.7627 11.1995 8.00293 11.2ZM8.00293 1.6C6.82029 1.59999 5.66077 1.92766 4.65306 2.54666C3.64536 3.16566 2.82887 4.05178 2.29422 5.10666C1.75956 6.16155 1.52766 7.34395 1.62424 8.52264C1.72081 9.70133 2.1421 10.8302 2.84133 11.784C3.51116 11.0923 4.31334 10.5425 5.2001 10.1672C6.08686 9.79204 7.04006 9.59912 8.00293 9.6C8.96567 9.59923 9.91872 9.7922 10.8053 10.1674C11.6919 10.5426 12.494 11.0924 13.1637 11.784C13.8629 10.8303 14.2842 9.70146 14.3808 8.52284C14.4774 7.34422 14.2456 6.16188 13.711 5.10702C13.1765 4.05216 12.3601 3.16603 11.3525 2.54698C10.3449 1.92792 9.1855 1.60013 8.00293 1.6ZM7.62693 2.656C7.65693 2.58079 7.70879 2.5163 7.77582 2.47087C7.84285 2.42544 7.92196 2.40116 8.00293 2.40116C8.0839 2.40116 8.16301 2.42544 8.23004 2.47087C8.29707 2.5163 8.34893 2.58079 8.37893 2.656L8.58213 3.144C8.92172 3.97206 9.56596 4.63834 10.3821 5.0056L10.9565 5.26C11.2845 5.4064 11.2845 5.8848 10.9565 6.0312L10.3485 6.3016C9.55282 6.65866 8.91976 7.30086 8.57413 8.1016L8.37653 8.5544C8.34577 8.62813 8.29389 8.69111 8.22741 8.73542C8.16092 8.77972 8.08282 8.80336 8.00293 8.80336C7.92304 8.80336 7.84494 8.77972 7.77845 8.73542C7.71197 8.69111 7.66009 8.62813 7.62933 8.5544L7.43253 8.1024C7.08668 7.30107 6.45298 6.65853 5.65653 6.3016L5.04853 6.0312C4.97491 5.99717 4.91257 5.94277 4.86888 5.87444C4.82518 5.80611 4.80197 5.7267 4.80197 5.6456C4.80197 5.56449 4.82518 5.48508 4.86888 5.41675C4.91257 5.34842 4.97491 5.29403 5.04853 5.26L5.62293 5.0056C6.43925 4.6387 7.08378 3.9727 7.42373 3.1448L7.62693 2.656Z" fill="context-fill"/>
     <line
     x1="2"
     y1="14"
     x2="14"
     y2="2"
-    stroke="#5B5B66"
+    stroke="context-fill"
     stroke-width="1.5"
     stroke-linecap="round"
     />
diff --git a/browser/components/aiwindow/ui/assets/memories-on.svg b/browser/components/aiwindow/ui/assets/memories-on.svg
index c02e3cff8ad04..6f45ab5470c9a 100644
--- a/browser/components/aiwindow/ui/assets/memories-on.svg
+++ b/browser/components/aiwindow/ui/assets/memories-on.svg
@@ -3,7 +3,7 @@
    - file, You can obtain one at https://mozilla.org/MPL/2.0/. -->
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
   <g clip-path="url(#clip0_9465_133975)">
-    <path d="M8.00293 0C12.4213 0 16.0029 3.5816 16.0029 8C16.0053 10.083 15.1927 12.0843 13.7389 13.576C12.9943 14.3441 12.1027 14.9545 11.1173 15.3709C10.1318 15.7873 9.07272 16.0013 8.00293 16C6.93314 16.0013 5.87401 15.7873 4.8886 15.3709C3.90318 14.9545 3.0116 14.3441 2.26693 13.576C0.813113 12.0843 0.000542392 10.083 0.00293496 8C0.00293496 3.5816 3.58453 0 8.00293 0ZM8.00293 11.2C7.24303 11.1994 6.491 11.3539 5.79289 11.6541C5.09478 11.9542 4.46528 12.3937 3.94293 12.9456C5.08592 13.8878 6.52163 14.4022 8.00293 14.4C9.48395 14.402 10.9194 13.8877 12.0621 12.9456C11.5399 12.3938 10.9105 11.9544 10.2125 11.6542C9.51457 11.3541 8.7627 11.1995 8.00293 11.2ZM8.00293 1.6C6.82029 1.59999 5.66077 1.92766 4.65306 2.54666C3.64536 3.16566 2.82887 4.05178 2.29422 5.10666C1.75956 6.16155 1.52766 7.34395 1.62424 8.52264C1.72081 9.70133 2.1421 10.8302 2.84133 11.784C3.51116 11.0923 4.31334 10.5425 5.2001 10.1672C6.08686 9.79204 7.04006 9.59912 8.00293 9.6C8.96567 9.59923 9.91872 9.7922 10.8053 10.1674C11.6919 10.5426 12.494 11.0924 13.1637 11.784C13.8629 10.8303 14.2842 9.70146 14.3808 8.52284C14.4774 7.34422 14.2456 6.16188 13.711 5.10702C13.1765 4.05216 12.3601 3.16603 11.3525 2.54698C10.3449 1.92792 9.1855 1.60013 8.00293 1.6ZM7.62693 2.656C7.65693 2.58079 7.70879 2.5163 7.77582 2.47087C7.84285 2.42544 7.92196 2.40116 8.00293 2.40116C8.0839 2.40116 8.16301 2.42544 8.23004 2.47087C8.29707 2.5163 8.34893 2.58079 8.37893 2.656L8.58213 3.144C8.92172 3.97206 9.56596 4.63834 10.3821 5.0056L10.9565 5.26C11.2845 5.4064 11.2845 5.8848 10.9565 6.0312L10.3485 6.3016C9.55282 6.65866 8.91976 7.30086 8.57413 8.1016L8.37653 8.5544C8.34577 8.62813 8.29389 8.69111 8.22741 8.73542C8.16092 8.77972 8.08282 8.80336 8.00293 8.80336C7.92304 8.80336 7.84494 8.77972 7.77845 8.73542C7.71197 8.69111 7.66009 8.62813 7.62933 8.5544L7.43253 8.1024C7.08668 7.30107 6.45298 6.65853 5.65653 6.3016L5.04853 6.0312C4.97491 5.99717 4.91257 5.94277 4.86888 5.87444C4.82518 5.80611 4.80197 5.7267 4.80197 5.6456C4.80197 5.56449 4.82518 5.48508 4.86888 5.41675C4.91257 5.34842 4.97491 5.29403 5.04853 5.26L5.62293 5.0056C6.43925 4.6387 7.08378 3.9727 7.42373 3.1448L7.62693 2.656Z" fill="#5B5B66"/>
+    <path d="M8.00293 0C12.4213 0 16.0029 3.5816 16.0029 8C16.0053 10.083 15.1927 12.0843 13.7389 13.576C12.9943 14.3441 12.1027 14.9545 11.1173 15.3709C10.1318 15.7873 9.07272 16.0013 8.00293 16C6.93314 16.0013 5.87401 15.7873 4.8886 15.3709C3.90318 14.9545 3.0116 14.3441 2.26693 13.576C0.813113 12.0843 0.000542392 10.083 0.00293496 8C0.00293496 3.5816 3.58453 0 8.00293 0ZM8.00293 11.2C7.24303 11.1994 6.491 11.3539 5.79289 11.6541C5.09478 11.9542 4.46528 12.3937 3.94293 12.9456C5.08592 13.8878 6.52163 14.4022 8.00293 14.4C9.48395 14.402 10.9194 13.8877 12.0621 12.9456C11.5399 12.3938 10.9105 11.9544 10.2125 11.6542C9.51457 11.3541 8.7627 11.1995 8.00293 11.2ZM8.00293 1.6C6.82029 1.59999 5.66077 1.92766 4.65306 2.54666C3.64536 3.16566 2.82887 4.05178 2.29422 5.10666C1.75956 6.16155 1.52766 7.34395 1.62424 8.52264C1.72081 9.70133 2.1421 10.8302 2.84133 11.784C3.51116 11.0923 4.31334 10.5425 5.2001 10.1672C6.08686 9.79204 7.04006 9.59912 8.00293 9.6C8.96567 9.59923 9.91872 9.7922 10.8053 10.1674C11.6919 10.5426 12.494 11.0924 13.1637 11.784C13.8629 10.8303 14.2842 9.70146 14.3808 8.52284C14.4774 7.34422 14.2456 6.16188 13.711 5.10702C13.1765 4.05216 12.3601 3.16603 11.3525 2.54698C10.3449 1.92792 9.1855 1.60013 8.00293 1.6ZM7.62693 2.656C7.65693 2.58079 7.70879 2.5163 7.77582 2.47087C7.84285 2.42544 7.92196 2.40116 8.00293 2.40116C8.0839 2.40116 8.16301 2.42544 8.23004 2.47087C8.29707 2.5163 8.34893 2.58079 8.37893 2.656L8.58213 3.144C8.92172 3.97206 9.56596 4.63834 10.3821 5.0056L10.9565 5.26C11.2845 5.4064 11.2845 5.8848 10.9565 6.0312L10.3485 6.3016C9.55282 6.65866 8.91976 7.30086 8.57413 8.1016L8.37653 8.5544C8.34577 8.62813 8.29389 8.69111 8.22741 8.73542C8.16092 8.77972 8.08282 8.80336 8.00293 8.80336C7.92304 8.80336 7.84494 8.77972 7.77845 8.73542C7.71197 8.69111 7.66009 8.62813 7.62933 8.5544L7.43253 8.1024C7.08668 7.30107 6.45298 6.65853 5.65653 6.3016L5.04853 6.0312C4.97491 5.99717 4.91257 5.94277 4.86888 5.87444C4.82518 5.80611 4.80197 5.7267 4.80197 5.6456C4.80197 5.56449 4.82518 5.48508 4.86888 5.41675C4.91257 5.34842 4.97491 5.29403 5.04853 5.26L5.62293 5.0056C6.43925 4.6387 7.08378 3.9727 7.42373 3.1448L7.62693 2.656Z" fill="context-fill"/>
   </g>
   <defs>
     <clipPath id="clip0_9465_133975">
diff --git a/browser/components/aiwindow/ui/components/input-cta/input-cta.css b/browser/components/aiwindow/ui/components/input-cta/input-cta.css
index e0a3e1f6eee32..3a0dfbafc561d 100644
--- a/browser/components/aiwindow/ui/components/input-cta/input-cta.css
+++ b/browser/components/aiwindow/ui/components/input-cta/input-cta.css
@@ -13,11 +13,12 @@
 
 moz-button.input-cta {
   --button-background-color-active: color-mix(in srgb, black 25%, transparent);
-  --button-background-color-disabled: var(--color-gray-20);
+  --button-background-color-disabled: light-dark(var(--color-gray-20), var(--color-gray-60));
   --button-background-color-hover: color-mix(in srgb, black 15%, transparent);
   --button-background-color-selected: color-mix(in srgb, black 25%, transparent);
   --button-background-color: transparent;
   --button-border-radius: var(--border-radius-circle);
+  --button-icon-fill: light-dark(var(--color-gray-60), white);
   --button-padding: 0 var(--space-small) 0 var(--space-large);
   --button-text-color-active: white;
   --button-text-color-disabled: white;
diff --git a/browser/components/aiwindow/ui/components/memories-icon-button/memories-icon-button.css b/browser/components/aiwindow/ui/components/memories-icon-button/memories-icon-button.css
index 3a3d068688e4e..56c5e7fe5bfe2 100644
--- a/browser/components/aiwindow/ui/components/memories-icon-button/memories-icon-button.css
+++ b/browser/components/aiwindow/ui/components/memories-icon-button/memories-icon-button.css
@@ -3,6 +3,6 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 moz-button.memories-icon-button {
-  --button-icon-fill: var(--color-gray-70);
+  --button-icon-fill: light-dark(var(--color-gray-70), white);
   --button-background-color-ghost-selected: transparent;
 }
diff --git a/browser/themes/shared/smartbar.css b/browser/themes/shared/smartbar.css
index a2f5aa50c2b40..f08d4f08ccec5 100644
--- a/browser/themes/shared/smartbar.css
+++ b/browser/themes/shared/smartbar.css
@@ -7,9 +7,10 @@
 :root {
   --smartbar-border-style-gradient: var(--border-width) solid;
   --smartbar-border-color-gradient: linear-gradient(172deg, #321bfd -18%, #cf30e2 53%, #ff9900 89%, #f5c451 109%);
+  --smartbar-border-color-gradient-dark: linear-gradient(270deg, var(--color-orange-40) 0%, var(--color-violet-50) 105.15%);
   --smartbar-max-width: calc(var(--size-item-xlarge) * 12);
-  --smartbar-shadow-color: color-mix(in srgb, var(--color-violet-40) 30%, transparent);
-  --smartbar-shadow: 0 2px 14px var(--smartbar-shadow-color);
+  --smartbar-shadow: 0 2px 14px color-mix(in srgb, var(--color-violet-40) 30%, transparent);
+  --smartbar-background-color: light-dark(white, var(--color-violet-110));
 }
 
 .smartbar {
@@ -26,11 +27,26 @@
 .smartbar > .urlbar-background {
   background-color: white;
   background-clip: padding-box, border-box;
-  background-image: linear-gradient(white, white), var(--smartbar-border-color-gradient);
+  background-image: linear-gradient(var(--smartbar-background-color), var(--smartbar-background-color)), var(--smartbar-border-color-gradient);
   background-origin: border-box;
   border-radius: var(--border-radius-large);
   border: var(--smartbar-border-style-gradient) transparent;
 
+  @media (prefers-color-scheme: dark) {
+    background-image: linear-gradient(var(--smartbar-background-color), var(--smartbar-background-color)), var(--smartbar-border-color-gradient-dark);
+
+    /* creating a gradient box shadow effect for dark mode */
+    &::before {
+      background-image: var(--smartbar-border-color-gradient-dark);
+      border-radius: inherit;
+      content: "";
+      filter: blur(30px) opacity(0.7);
+      inset: 0;
+      position: absolute;
+      z-index: -1;
+    }
+  }
+
   .smartbar[open] > & {
     /* stylelint-disable-next-line stylelint-plugin-mozilla/use-design-tokens */
     box-shadow: var(--smartbar-shadow);

From 515c39efb40b54bf877184846dbd07df66c806c0 Mon Sep 17 00:00:00 2001
From: Tyler Etchart <tetchart@mozilla.com>
Date: Thu, 29 Jan 2026 15:33:25 +0000
Subject: [PATCH 086/116] Bug 1889753 - removed quality model from translations
 JS code r=translations-reviewers,nordzilla

Differential Revision: https://phabricator.services.mozilla.com/D280505
---
 .../actors/TranslationsParent.sys.mjs         | 10 --------
 .../content/translations-engine.worker.js     | 11 +++------
 .../browser_translations_remote_settings.js   | 24 -------------------
 .../components/translations/translations.d.ts |  2 --
 4 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/toolkit/components/translations/actors/TranslationsParent.sys.mjs b/toolkit/components/translations/actors/TranslationsParent.sys.mjs
index acfcda2cc0e35..f62fbab7bf900 100644
--- a/toolkit/components/translations/actors/TranslationsParent.sys.mjs
+++ b/toolkit/components/translations/actors/TranslationsParent.sys.mjs
@@ -3272,11 +3272,6 @@ export class TranslationsParent extends JSWindowActorParent {
     // Use Promise.all to download (or retrieve from cache) the model files in parallel.
     await Promise.all(
       records.map(async record => {
-        if (record.fileType === "qualityModel") {
-          // Do not include the quality models. We do not use them.
-          return;
-        }
-
         if (
           !lazy.TranslationsUtils.langTagsMatch(
             record.sourceLanguage,
@@ -3439,11 +3434,6 @@ export class TranslationsParent extends JSWindowActorParent {
 
     await Promise.all(
       records.map(async record => {
-        if (record.fileType === "qualityModel") {
-          // Do not include the quality models. We do not use them.
-          return;
-        }
-
         if (record.fileType === "lex" && !lazy.useLexicalShortlist) {
           // The current configuration does not use lexical shortlists.
           return;
diff --git a/toolkit/components/translations/content/translations-engine.worker.js b/toolkit/components/translations/content/translations-engine.worker.js
index 3f2d6d67cb337..333f6474d730a 100644
--- a/toolkit/components/translations/content/translations-engine.worker.js
+++ b/toolkit/components/translations/content/translations-engine.worker.js
@@ -39,7 +39,6 @@ const MODEL_FILE_ALIGNMENTS = {
   model: 256,
   lex: 64,
   vocab: 64,
-  qualityModel: 64,
   srcvocab: 64,
   trgvocab: 64,
 };
@@ -524,7 +523,7 @@ class BergamotUtils {
     const { sourceLanguage, targetLanguage, languageModelFiles } =
       translationModelPayload;
 
-    const { model, lex, vocab, qualityModel, srcvocab, trgvocab } =
+    const { model, lex, vocab, srcvocab, trgvocab } =
       BergamotUtils.allocateModelMemory(bergamot, languageModelFiles);
 
     // Transform the bytes to mb, like "10.2mb"
@@ -553,10 +552,6 @@ class BergamotUtils {
       throw new Error("Vocabulary key is not found.");
     }
 
-    if (qualityModel) {
-      memoryLog += `\n  QualityModel: ${getMemory(qualityModel)}\n`;
-    }
-
     const config = BergamotUtils.generateTextConfig({
       "beam-size": "1",
       normalize: "1.0",
@@ -565,7 +560,7 @@ class BergamotUtils {
       "mini-batch-words": "1024",
       workspace: "128",
       "max-length-factor": "2.0",
-      "skip-cost": (!qualityModel).toString(),
+      "skip-cost": "true", // disable quality model
       "cpu-threads": "0",
       quiet: "true",
       "quiet-translation": "true",
@@ -587,7 +582,7 @@ class BergamotUtils {
       model,
       lex ?? null,
       vocabList,
-      qualityModel ?? null
+      null // no quality model
     );
   }
 
diff --git a/toolkit/components/translations/tests/browser/browser_translations_remote_settings.js b/toolkit/components/translations/tests/browser/browser_translations_remote_settings.js
index 6215f1a8c1cb5..bd87c150c89a5 100644
--- a/toolkit/components/translations/tests/browser/browser_translations_remote_settings.js
+++ b/toolkit/components/translations/tests/browser/browser_translations_remote_settings.js
@@ -155,14 +155,6 @@ add_task(async function test_get_records_with_multiple_versions() {
   // Create a list of records that are all version 1.0
   /** @type {TranslationModelRecord[]} */
   const versionOneRecords = [
-    {
-      id: crypto.randomUUID(),
-      name: "qualityModel.enes.bin",
-      fromLang: "en",
-      toLang: "es",
-      fileType: "qualityModel",
-      version: "1.0",
-    },
     {
       id: crypto.randomUUID(),
       name: "vocab.esen.spm",
@@ -230,22 +222,6 @@ add_task(async function test_get_records_with_multiple_versions() {
 
   // Create a list of records that are identical to some of the above, but with higher version numbers.
   const higherVersionRecords = [
-    {
-      id: crypto.randomUUID(),
-      name: "qualityModel.enes.bin",
-      fromLang: "en",
-      toLang: "es",
-      fileType: "qualityModel",
-      version: "1.1",
-    },
-    {
-      id: crypto.randomUUID(),
-      name: "qualityModel.enes.bin",
-      fromLang: "en",
-      toLang: "es",
-      fileType: "qualityModel",
-      version: "1.2",
-    },
     {
       id: crypto.randomUUID(),
       name: "vocab.esen.spm",
diff --git a/toolkit/components/translations/translations.d.ts b/toolkit/components/translations/translations.d.ts
index a7398d9cacded..aadeab75e9541 100644
--- a/toolkit/components/translations/translations.d.ts
+++ b/toolkit/components/translations/translations.d.ts
@@ -236,8 +236,6 @@ interface LanguageTranslationModelFiles {
   // The lexical shortlist that limits possible output of the decoder and makes
   // inference faster.
   lex?: LanguageTranslationModelFile;
-  // A model that can generate a translation quality estimation.
-  qualityModel?: LanguageTranslationModelFile;
 
   // There is either a single vocab file:
   vocab?: LanguageTranslationModelFile;

From 48d55cf7ec80093903e2ef7f58b61a84a22ef716 Mon Sep 17 00:00:00 2001
From: Tyler Etchart <tetchart@mozilla.com>
Date: Thu, 29 Jan 2026 15:47:11 +0000
Subject: [PATCH 087/116] Bug 1968038 - updated translations repo hash to
 vender in autogenerated comment r=nordzilla,translations-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D280504
---
 .../bergamot-translator/bergamot-translator.js           | 9 +++++++--
 .../components/translations/bergamot-translator/moz.yaml | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/toolkit/components/translations/bergamot-translator/bergamot-translator.js b/toolkit/components/translations/bergamot-translator/bergamot-translator.js
index d818d9978c777..4cc89e7b56dfa 100644
--- a/toolkit/components/translations/bergamot-translator/bergamot-translator.js
+++ b/toolkit/components/translations/bergamot-translator/bergamot-translator.js
@@ -1,9 +1,14 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* AUTO-GENERATED. DO NOT MODIFY.
+ * This file is generated by inference/scripts/build-wasm.py from the translations repo
+ * https://github.com/mozilla/translations
+
+
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 function loadBergamot(Module) {
-  var BERGAMOT_VERSION_FULL = "v0.6.0+4a6a44c0";
+  var BERGAMOT_VERSION_FULL = "v0.6.0+eea6e5a8";
   null;
 
   var Module = typeof Module != "undefined" ? Module : {};
diff --git a/toolkit/components/translations/bergamot-translator/moz.yaml b/toolkit/components/translations/bergamot-translator/moz.yaml
index deecb24727bef..0f0aac822d1c1 100644
--- a/toolkit/components/translations/bergamot-translator/moz.yaml
+++ b/toolkit/components/translations/bergamot-translator/moz.yaml
@@ -24,7 +24,7 @@ origin:
 
   # Revision to pull in
   # Must be a long or short commit SHA (long preferred)
-  revision: 1de4a085d3a7afb625c51a60aabb5ad298e4059f
+  revision: eea6e5a80aa4ddd86d9cc35ce9a65b79aa3ab96d
 
   # The package's license, where possible using the mnemonic from
   # https://spdx.org/licenses/

From ab959ec6edc93fd99b8c176909290a182891bb59 Mon Sep 17 00:00:00 2001
From: Andreas Farre <farre@mozilla.com>
Date: Thu, 29 Jan 2026 15:49:53 +0000
Subject: [PATCH 088/116] Bug 1995636 - Increase navigation rate limiting
 threshold. r=smaug,zcorpan

Differential Revision: https://phabricator.services.mozilla.com/D280599
---
 modules/libpref/init/StaticPrefList.yaml                        | 2 +-
 .../history_pushstate_too_many_calls.optional.html              | 2 +-
 .../history_replacestate_too_many_calls.optional.html           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
index bcb1cdf7df134..fb1ec605fb1bf 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -3713,7 +3713,7 @@
 # BrowsingContext. This includes calls to History and Location APIs.
 - name: dom.navigation.navigationRateLimit.count
   type: uint32_t
-  value: 200
+  value: 1000
   mirror: always
 
 # Time span in seconds for location change rate limit.
diff --git a/testing/web-platform/tests/html/browsers/history/the-history-interface/history_pushstate_too_many_calls.optional.html b/testing/web-platform/tests/html/browsers/history/the-history-interface/history_pushstate_too_many_calls.optional.html
index 4242ab488ca2c..e519397ed8684 100644
--- a/testing/web-platform/tests/html/browsers/history/the-history-interface/history_pushstate_too_many_calls.optional.html
+++ b/testing/web-platform/tests/html/browsers/history/the-history-interface/history_pushstate_too_many_calls.optional.html
@@ -10,7 +10,7 @@
     <script>
     test(function () {
       assert_throws_dom("SecurityError", function () {
-        for (let i = 0; i < 500; i++) {
+        for (let i = 0; i < 5000; i++) {
           window.history.pushState(null, null, i);
         }
       });
diff --git a/testing/web-platform/tests/html/browsers/history/the-history-interface/history_replacestate_too_many_calls.optional.html b/testing/web-platform/tests/html/browsers/history/the-history-interface/history_replacestate_too_many_calls.optional.html
index d412983270c42..a59f1768000b5 100644
--- a/testing/web-platform/tests/html/browsers/history/the-history-interface/history_replacestate_too_many_calls.optional.html
+++ b/testing/web-platform/tests/html/browsers/history/the-history-interface/history_replacestate_too_many_calls.optional.html
@@ -10,7 +10,7 @@
     <script>
     test(function () {
       assert_throws_dom("SecurityError", function () {
-        for (let i = 0; i < 500; i++) {
+        for (let i = 0; i < 5000; i++) {
           window.history.replaceState(null, null, i);
         }
       });

From cb149f2775dcc02d0ce5120f6bd61e20851541fa Mon Sep 17 00:00:00 2001
From: ffxbld <ffxbld@mozilla.com>
Date: Thu, 29 Jan 2026 15:53:43 +0000
Subject: [PATCH 089/116] No Bug, mozilla-central repo-update HSTS HPKP
 mobile-experiments ct-logs - r=release-managers,pascalc

Differential Revision: https://phabricator.services.mozilla.com/D280912
---
 .../src/main/res/raw/initial_experiments.json | 153 ------
 security/ct/CTKnownLogs.h                     |   2 +-
 security/manager/ssl/StaticHPKPins.h          |   2 +-
 security/manager/ssl/nsSTSPreloadList.inc     | 456 ++++++------------
 security/manager/tools/log_list.json          |   4 +-
 5 files changed, 143 insertions(+), 474 deletions(-)

diff --git a/mobile/android/fenix/app/src/main/res/raw/initial_experiments.json b/mobile/android/fenix/app/src/main/res/raw/initial_experiments.json
index e35d7a4a60add..dc4cd6f98d370 100644
--- a/mobile/android/fenix/app/src/main/res/raw/initial_experiments.json
+++ b/mobile/android/fenix/app/src/main/res/raw/initial_experiments.json
@@ -1,158 +1,5 @@
 {
   "data": [
-    {
-      "schemaVersion": "1.12.0",
-      "slug": "android-first-run-onboarding",
-      "id": "android-first-run-onboarding",
-      "arguments": {},
-      "application": "org.mozilla.firefox",
-      "appName": "fenix",
-      "appId": "org.mozilla.firefox",
-      "channel": "release",
-      "userFacingName": "Android - First Run Onboarding",
-      "userFacingDescription": "On Boarding",
-      "isEnrollmentPaused": true,
-      "isRollout": false,
-      "bucketConfig": {
-        "randomizationUnit": "nimbus_id",
-        "namespace": "fenix-juno-onboarding-release-15",
-        "start": 0,
-        "count": 10000,
-        "total": 10000
-      },
-      "featureIds": [
-        "juno-onboarding"
-      ],
-      "probeSets": [],
-      "outcomes": [],
-      "branches": [
-        {
-          "slug": "control",
-          "ratio": 1,
-          "feature": {
-            "featureId": "this-is-included-for-mobile-pre-96-support",
-            "enabled": false,
-            "value": {}
-          },
-          "features": [
-            {
-              "featureId": "juno-onboarding",
-              "enabled": true,
-              "value": {
-                "use-onboarding-redesign": false,
-                "cards": {
-                  "theme-selection": {
-                    "enabled": false
-                  }
-                }
-              }
-            }
-          ]
-        },
-        {
-          "slug": "treatment-a",
-          "ratio": 1,
-          "feature": {
-            "featureId": "this-is-included-for-mobile-pre-96-support",
-            "enabled": false,
-            "value": {}
-          },
-          "features": [
-            {
-              "featureId": "juno-onboarding",
-              "enabled": true,
-              "value": {
-                "use-onboarding-redesign": true,
-                "cards": {
-                  "terms-of-service": {
-                    "title": "onboarding_redesign_tou_title",
-                    "primary-button-label": "onboarding_redesign_tou_agree_and_continue_button_label",
-                    "extra-data": {
-                      "term-of-service-data": {
-                        "subheader-one-text": "onboarding_redesign_tou_subheader_one",
-                        "subheader-two-text": "onboarding_redesign_tou_subheader_two",
-                        "subheader-three-text": "onboarding_redesign_tou_subheader_three",
-                        "line-one-text": "onboarding_redesign_tou_body_one",
-                        "line-one-link-text": "onboarding_redesign_tou_body_one_link_text",
-                        "line-two-text": "onboarding_redesign_tou_body_two",
-                        "line-two-link-text": "onboarding_redesign_tou_body_two_link_text",
-                        "line-three-text": "onboarding_redesign_tou_body_three",
-                        "line-three-link-text": "onboarding_redesign_tou_body_three_link_text"
-                      }
-                    }
-                  },
-                  "default-browser": {
-                    "title": "onboarding_redesign_set_default_browser_title",
-                    "body": "onboarding_redesign_set_default_browser_body",
-                    "primary-button-label": "juno_onboarding_default_browser_positive_button",
-                    "secondary-button-label": "juno_onboarding_default_browser_negative_button"
-                  },
-                  "sync-sign-in": {
-                    "title": "onboarding_redesign_sync_title",
-                    "body": "onboarding_redesign_sync_body",
-                    "primary-button-label": "onboarding_redesign_sync_positive_button",
-                    "secondary-button-label": "onboarding_redesign_sync_negative_button"
-                  },
-                  "toolbar-placement": {
-                    "title": "onboarding_redesign_customize_toolbar_title",
-                    "body": "onboarding_customize_toolbar_description",
-                    "image-res": "ic_onboarding_customize_toolbar",
-                    "primary-button-label": "onboarding_redesign_continue_button",
-                    "extra-data": {
-                      "customization-toolbar-data": [
-                        {
-                          "toolbar-type": "toolbar-top",
-                          "label": "onboarding_customize_toolbar_top_option",
-                          "image-res": "ic_onboarding_top_toolbar"
-                        },
-                        {
-                          "toolbar-type": "toolbar-bottom",
-                          "label": "onboarding_customize_toolbar_bottom_option",
-                          "image-res": "ic_onboarding_bottom_toolbar"
-                        }
-                      ]
-                    }
-                  },
-                  "marketing": {
-                    "title": "onboarding_marketing_redesign_title",
-                    "body": "onboarding_marketing_body",
-                    "image-res": "ic_onboarding_marketing_redesign",
-                    "primary-button-label": "onboarding_marketing_redesign_positive_button",
-                    "extra-data": {
-                      "marketing-data": {
-                        "body-line-one-text": "onboarding_marketing_redesign_learn_more",
-                        "body-line-one-link-text": "onboarding_marketing_redesign_learn_more",
-                        "body-line-two-text": "onboarding_marketing_redesign_opt_out_checkbox"
-                      }
-                    }
-                  },
-                  "theme-selection": {
-                    "enabled": false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ],
-      "targeting": "(app_version|versionCompare('146.0.1') >= 0)",
-      "startDate": "2025-12-10",
-      "enrollmentEndDate": "2026-01-22",
-      "endDate": null,
-      "proposedDuration": 28,
-      "proposedEnrollment": 7,
-      "referenceBranch": "control",
-      "featureValidationOptOut": false,
-      "localizations": null,
-      "locales": null,
-      "publishedDate": "2025-12-10T19:36:16.354540Z",
-      "isFirefoxLabsOptIn": false,
-      "firefoxLabsTitle": "",
-      "firefoxLabsDescription": "",
-      "firefoxLabsDescriptionLinks": null,
-      "firefoxLabsGroup": "",
-      "requiresRestart": false
-    },
     {
       "schemaVersion": "1.12.0",
       "slug": "android-ui-redesign-new-users-release-147",
diff --git a/security/ct/CTKnownLogs.h b/security/ct/CTKnownLogs.h
index 3dd5451f581d4..6fcd6e22011cf 100644
--- a/security/ct/CTKnownLogs.h
+++ b/security/ct/CTKnownLogs.h
@@ -14,7 +14,7 @@
 
 #include <stddef.h>
 
-static const PRTime kCTExpirationTime = INT64_C(1775472842000000);
+static const PRTime kCTExpirationTime = INT64_C(1775731982000000);
 
 namespace mozilla::ct {
 
diff --git a/security/manager/ssl/StaticHPKPins.h b/security/manager/ssl/StaticHPKPins.h
index b33af3766f650..8e95817193752 100644
--- a/security/manager/ssl/StaticHPKPins.h
+++ b/security/manager/ssl/StaticHPKPins.h
@@ -681,4 +681,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
 
 static const int32_t kUnknownId = -1;
 
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1777892029322000);
+static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1778151169377000);
diff --git a/security/manager/ssl/nsSTSPreloadList.inc b/security/manager/ssl/nsSTSPreloadList.inc
index 5a9aaceff4493..79a517299f8d1 100644
--- a/security/manager/ssl/nsSTSPreloadList.inc
+++ b/security/manager/ssl/nsSTSPreloadList.inc
@@ -8,7 +8,7 @@
 /*****************************************************************************/
 
 #include <stdint.h>
-const PRTime gPreloadListExpirationTime = INT64_C(1780311224884000);
+const PRTime gPreloadListExpirationTime = INT64_C(1780570364645000);
 %%
 0--1.de, 1
 0-0.io, 1
@@ -1416,7 +1416,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1780311224884000);
 1xbetkor.com, 1
 1xbetkr.com, 1
 1xbetkr1.com, 1
-1xbetmm.com, 1
 1xbetqq.com, 1
 1xbetsd.com, 1
 1xbetst.com, 1
@@ -1879,7 +1878,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1780311224884000);
 2ugaming.com, 1
 2url.link, 1
 2ustyle.com, 1
-2value.com, 1
 2vnews.com, 1
 2vp-an.online, 1
 2wth.com, 1
@@ -2045,6 +2043,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1780311224884000);
 360stone.com, 1
 360system.com, 1
 360techpartner.com, 1
+360trust.com, 1
 360videoshare.com, 1
 360visualmedia.co.uk, 1
 360vrs.com, 1
@@ -2675,7 +2674,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1780311224884000);
 4vf.de, 1
 4vio.com, 1
 4web-hosting.com, 1
-4woods.eu, 1
 4wrd.cc, 1
 4x4-27mc.nl, 1
 4x4coatingen.nl, 1
@@ -2880,7 +2878,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1780311224884000);
 55365t.com, 1
 5557552.com, 1
 555bet86.com, 1
-555btt.com, 1
 555kb.com, 1
 555w.org, 1
 555xl.com, 1
@@ -3544,7 +3541,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1780311224884000);
 7kovrikov.ru, 1
 7kvadratov.by, 1
 7l00p.com, 1
-7matic.net, 1
 7money.co, 1
 7net.uk, 1
 7nets.com, 1
@@ -5093,7 +5089,6 @@ aachc.org, 1
 aachen-quiz.de, 1
 aachen-umzugsunternehmen.de, 1
 aacs-design.com, 1
-aact.org, 1
 aad-gp.com, 1
 aadl.ga, 1
 aadskeuken.nl, 1
@@ -5239,7 +5234,7 @@ abasite.tk, 1
 abasky.net, 1
 abasteo.mx, 1
 abastor.tk, 1
-abaton.es, 0
+abaton.es, 1
 abay-today.tk, 1
 abbadabbabouncycastles.co.uk, 1
 abbas.ch, 1
@@ -6512,7 +6507,6 @@ adihomes.com, 1
 adilsabri.tk, 1
 adimaja.com, 1
 adimco.nl, 0
-adimmo.net, 1
 adimo.com.pl, 1
 adimplere.com.br, 1
 adinaporter.com, 1
@@ -6747,6 +6741,7 @@ adst.dk, 1
 adstasin.com, 1
 adstop.ga, 1
 adstop.ml, 1
+adstune.com, 1
 adsviews.gq, 1
 adswoo.com, 1
 adt.co.za, 1
@@ -7345,7 +7340,6 @@ afterinc.com, 1
 afterlifeos.com, 1
 aftermagic.com, 1
 aftermarketinternational.com, 1
-aftermix.com, 1
 afternoonhereyes.tk, 1
 afteroblivion.tk, 1
 afterpartyme.com, 1
@@ -7945,7 +7939,6 @@ aids.gov, 1
 aie.de, 1
 aiesecarad.ro, 1
 aievaluare.ro, 1
-aifi.or.id, 1
 aifieldmanagement.com, 1
 aifob.tk, 1
 aifriccampbell.com, 1
@@ -8638,7 +8631,6 @@ akaziya.cf, 1
 akbam.co.uk, 1
 akbarsempoi.tk, 1
 akbas.tk, 1
-akblasch.com.au, 1
 akbtv.ru, 1
 akcenty.com.ua, 1
 akcevybuch.cz, 1
@@ -9452,12 +9444,12 @@ alibamu.com, 1
 alibamu.org, 1
 alibi-ua.com.ua, 1
 alibip.de, 1
-alicafe.com, 1
 alicante-spain.tk, 1
 alice-memorial.de, 1
 alice.tw, 1
 alicebaldenegro.tk, 1
 aliceboyle.net, 1
+aliceforchildren.it, 1
 alicehairstyling.tk, 1
 alicehartley.com, 1
 alicekinkycat.net, 1
@@ -9619,6 +9611,8 @@ all-gsm-solutions.tk, 1
 all-mountains.fr, 1
 all-music.ml, 1
 all-music.tk, 1
+all-payroll-solutions.com, 1
+all-payroll-solutions.de, 1
 all-pics.tk, 1
 all-rating.tk, 1
 all-seo.tk, 1
@@ -10051,6 +10045,7 @@ almasoft.ga, 1
 almastabriz.com, 0
 almatinki.com, 1
 almatytips.com, 1
+almawsoa.com, 1
 almayadeen.education, 1
 almayoreo.com.co, 1
 almaz-host.ml, 1
@@ -10098,7 +10093,6 @@ alodokita.com, 1
 aloe-care.tk, 1
 aloe-vera-info.tk, 1
 aloemeda.de, 1
-aloesbienetre.be, 1
 aloesoluciones.com.ar, 1
 aloeveralisboa.pt, 1
 alofone.vn, 1
@@ -10123,11 +10117,9 @@ alonsoluzgas.es, 1
 alonuocsuoi.com, 1
 aloo.ga, 1
 aloomic.com.au, 1
-aloplay.io, 1
 alorimusic.es, 1
 aloris-controle.fr, 1
 aloro.io, 1
-alotennis.ir, 1
 alotso.com, 1
 alottajava.com, 1
 alov.blog, 1
@@ -10323,7 +10315,6 @@ altcodes.nl, 1
 altd.cz, 1
 altdating.co.uk, 1
 altdforyou.tk, 1
-altdubai.com, 1
 alte-wassermuehle-friesoythe.de, 1
 altea.it, 1
 altec.pl, 1
@@ -10515,7 +10506,7 @@ alyafood.com, 1
 alykkelife.com, 1
 alyoung.com, 1
 alyssamilano.tk, 1
-alyusr.com.sa, 0
+alyusr.com.sa, 1
 alyx.sh, 1
 alza.at, 1
 alza.co.uk, 1
@@ -10552,7 +10543,6 @@ amabiligranilhas.com, 1
 amac.tv, 1
 amacuk.co.uk, 1
 amad-bargh.com, 1
-amadera.com, 1
 amaderforum.tk, 1
 amadeusproject.cf, 1
 amadin.tk, 1
@@ -10940,6 +10930,7 @@ amirarsalan.tk, 1
 amirasyraf.com, 0
 amirautos.com, 0
 amirhanova-a.ru, 1
+amirhosseinabutalebi.com, 1
 amirkaraj.tk, 1
 amis-du-cinema.com, 1
 amis-sh.fr, 1
@@ -11232,7 +11223,6 @@ analystexamers.ga, 1
 analysts.com, 1
 analytics-media.com, 1
 analyticscanvas.com, 1
-analyticsinmotion.com, 1
 analyticum.at, 1
 analyticum.com, 1
 analyticum.de, 1
@@ -12554,7 +12544,6 @@ aotech.tw, 1
 aotopo.com, 1
 aova.loan, 1
 aoyagi-farm.jp, 1
-aoyama-azabu-dc.com, 1
 aoyamacc.co.jp, 1
 ap-auto.pl, 1
 ap-bg.eu, 1
@@ -13271,7 +13260,6 @@ arabstar.tk, 1
 arabstreamsystem.tk, 1
 arabtones.tk, 1
 arabwomen.ml, 1
-aracbul.com, 1
 aracelissanchez.com, 1
 arachnid.tk, 1
 arachnida.ml, 1
@@ -13279,7 +13267,6 @@ arackiralama.name.tr, 1
 aradex.de, 1
 aradiantlife.org, 1
 aradiantlyhealthylife.com, 1
-arados.de, 1
 aradpulse.tk, 1
 arafatx.com, 1
 aragotownshipmn.gov, 1
@@ -14924,8 +14911,6 @@ astral.gq, 1
 astral.org.pl, 1
 astralrank.com, 1
 astralriders.tk, 1
-astralus.com, 0
-astralus.de, 0
 astramundo.com, 1
 astrapool.ru, 1
 astratech.com.ph, 1
@@ -15850,6 +15835,7 @@ auto-arsenal.tk, 1
 auto-borse.tk, 1
 auto-delchev.com, 1
 auto-drpciv.ro, 1
+auto-ecole-du-tursan.fr, 1
 auto-ecole-remparts.fr, 1
 auto-graph.eu, 1
 auto-help.tk, 1
@@ -16221,7 +16207,6 @@ autoschool.ga, 1
 autoscoops.tk, 1
 autoscreenshot.click, 1
 autoscuola.roma.it, 1
-autosdsg.ca, 1
 autosecurityfinance.com, 1
 autoshopsolutions.com, 0
 autosiero.nl, 1
@@ -16242,7 +16227,6 @@ autostop-occasions.be, 1
 autostoresystem.com, 1
 autostrady.tk, 1
 autostramites.com, 1
-autostramites.com.ar, 1
 autosupirkimas.tk, 1
 autosynthetix.com, 1
 autoteplo.org, 1
@@ -16636,7 +16620,6 @@ awakengr.com, 0
 awakening-guild.com, 1
 awakenplace.tk, 1
 awakenwow.ga, 1
-awakewatergh.com, 0
 awakinn.co.in, 1
 awamally.com, 1
 awangardaszkola.pl, 1
@@ -18185,7 +18168,6 @@ baratzegrowshop.com, 1
 baravalle.com, 1
 baraxolka.ga, 1
 baraxolka.ml, 1
-barbara-bertagnolli.co.uk, 1
 barbara-fuchs-gruene-fuerth.de, 1
 barbarabryce.com, 1
 barbaraedanielsantos.ga, 1
@@ -18341,7 +18323,7 @@ barranquillero.tk, 1
 barraqueirotransportes.pt, 1
 barrasaccess.com, 1
 barratennis.com.br, 1
-barrebody.com.au, 1
+barrebody.com.au, 0
 barreiroappraisals.com, 1
 barrelfish.org, 1
 barrencountyky.gov, 1
@@ -18394,7 +18376,6 @@ baruzdin.online, 1
 barvarsovia.es, 1
 barwave.com, 1
 barzallof.com, 1
-barzus.com.ua, 1
 barzza.tk, 1
 bas.bio, 1
 bas.codes, 1
@@ -18500,7 +18481,6 @@ basketballnewz.tk, 1
 basketforex.com, 1
 basketglucholazy.pl, 1
 basketsandmore.bg, 1
-basketskenya.com, 1
 baskingalkin.tk, 1
 basllp.co.uk, 1
 basmacioglu.com, 1
@@ -18912,7 +18892,6 @@ bcansw.com.au, 1
 bcarpentrypro.com, 1
 bcbsfepvision.com, 1
 bcbudonline.com, 1
-bccbank.coop, 1
 bcccremeno.it, 1
 bccx.eu.org, 1
 bccxo.com, 1
@@ -19134,6 +19113,7 @@ beatmalaria.org, 1
 beaton.tk, 1
 beatquantum.com, 1
 beatrice-nightscout.herokuapp.com, 1
+beatrice-raws.org, 1
 beatricedailysun.com, 1
 beatriz-urbano-vega.tk, 1
 beatrizaebischer.ch, 0
@@ -19170,7 +19150,6 @@ beautifulsouth.tk, 1
 beauty-blog.gq, 1
 beauty-form.ir, 1
 beauty-haircare.tk, 1
-beauty-salon-lino.com, 1
 beauty-schools.com, 1
 beauty-secrets.ir, 1
 beauty-stories.tk, 1
@@ -19213,6 +19192,7 @@ beautytherapies.gr, 1
 beautywien.at, 1
 beaver-creek.ga, 1
 beavercityut.gov, 1
+beaverdamautos.com, 1
 beaverheadcountymt.gov, 1
 beavertails.com, 1
 beavertales.ca, 1
@@ -19263,7 +19243,6 @@ bebra.io, 1
 bebra.loan, 1
 bebra.lu, 1
 bebra.ms, 1
-bebra.pw, 1
 bebrenok.trade, 1
 bebrev.trade, 1
 bebrik.men, 1
@@ -19963,6 +19942,7 @@ beosocial.de, 1
 beospain.tk, 1
 bep.gov, 1
 bephoenix.org.uk, 0
+bepick.blog, 1
 bepositive.ml, 1
 bepxl.art, 1
 bepzi.com, 1
@@ -20189,7 +20169,6 @@ besensi.com, 1
 besiconstruct.be, 1
 besidemetal.tk, 1
 besikta.se, 1
-besiktasmtsk.com, 1
 besinspain.es, 1
 beskar.pro, 1
 besnard.me, 1
@@ -20804,7 +20783,6 @@ betterhelporg.com, 1
 betterhelpteens.com, 1
 betterhome.ml, 1
 betteridge.com, 1
-betterify.in, 1
 betterjapanese.blog, 1
 betterjapanese.org, 1
 betterjapanese.xyz, 1
@@ -21073,7 +21051,6 @@ bharat.in, 1
 bharatanatyam-dancer.tk, 1
 bharatbillpay.com, 1
 bharath-g.in, 1
-bharatskills.gov.in, 1
 bharatsofttech.com, 1
 bhasha.lk, 1
 bhat.vn, 1
@@ -21865,7 +21842,6 @@ bioscience.co.uk, 0
 biosearch.tk, 1
 bioseguridad.gob.pa, 1
 bioselect.com.cy, 1
-biosency.com, 1
 bioshine.com.sg, 1
 bioshome.de, 1
 biosignalanalytics.com, 1
@@ -23099,7 +23075,6 @@ blue-python.tk, 1
 blue-sky.capital, 1
 blue1.com, 1
 blue2purple.com, 1
-blue3investimentos.com.br, 1
 blue6ix.com.br, 1
 blueangel.org.tw, 1
 bluearrowrecords.com, 1
@@ -23484,7 +23459,6 @@ bodixite.com, 1
 bodkov.com, 1
 bodlsc.com, 1
 bodrumescmagazin.tk, 1
-bodrus.com, 1
 bodsch.com, 1
 bodumo.com, 1
 bodusod.bg, 1
@@ -24194,6 +24168,7 @@ boulderswap.com, 1
 boulderwagonroad.org, 1
 boulebar.duckdns.org, 1
 boulevard-ruijschenbergh.nl, 1
+boulstory.ru, 1
 boulzicourt.fr, 1
 bouma.social, 1
 bounce-a-roo.co.uk, 1
@@ -24249,7 +24224,6 @@ bouncycastlehirehull.co.uk, 1
 bouncycastlehirelouth.co.uk, 1
 bouncycastlehiremalvern.co.uk, 1
 bouncycastlehiresurrey.co.uk, 1
-bouncycastlehirewinchester.co.uk, 1
 bouncycastleman.co.uk, 1
 bouncycastlesgalway.com, 1
 bouncycastleshire.co.uk, 1
@@ -24539,6 +24513,7 @@ brainsik.net, 1
 brainsoftict.nl, 1
 brainspawn.tk, 1
 brainstache.com, 1
+brainstarling.com, 1
 brainstew.tk, 1
 brainstorm-audit.bg, 1
 brainstormproductions.tk, 1
@@ -25412,7 +25387,7 @@ brunchandmatch.be, 1
 brunella.tk, 1
 brunetderochebrune.com, 0
 brunhilde.ml, 1
-brunnerworks.com, 0
+brunnerworks.com, 1
 bruno-pelletier.tk, 1
 brunoamaral.eu, 0
 brunoamezcua.com, 0
@@ -26015,7 +25990,6 @@ bulutimza.com.tr, 1
 bulutkey.com, 1
 bulvar.tk, 1
 bumastemra.nl, 1
-bumble.com, 1
 bumblebee.cf, 1
 bumblebeekids.uk, 1
 bumbleforfriends.com, 1
@@ -26259,7 +26233,7 @@ business-secreti.cf, 1
 business-secreti.ga, 1
 business-secreti.gq, 1
 business-secreti.tk, 1
-business-swiss.ch, 0
+business-swiss.ch, 1
 business.facebook.com, 0
 business.gov, 0
 business.medbank.com.mt, 1
@@ -27128,7 +27102,6 @@ cabinetvoyance.fr, 1
 cable-bg.com, 1
 cable360.de, 1
 cableatierra.tk, 1
-cablebustersllc.com, 0
 cablehighspeed.net, 1
 cableiran.com, 1
 cablemadrid.tk, 1
@@ -27272,7 +27245,6 @@ cafecentral.tk, 1
 cafechesscourt.com, 1
 cafechroma.tk, 1
 cafecobus.tk, 1
-cafedari.ir, 1
 cafedelcielo.co, 1
 cafedesignbooks.com, 1
 cafedospescadores.tk, 1
@@ -27292,7 +27264,7 @@ cafenoorderzon.tk, 1
 cafeobscura.nl, 1
 cafesangtao.com, 1
 cafeterya.tk, 1
-cafethevibes.com, 0
+cafethevibes.com, 1
 cafethrive.co.uk, 1
 cafevelo.org, 1
 cafevs.com, 0
@@ -27969,7 +27941,7 @@ canidelite-toulouse.fr, 1
 canihavesome.coffee, 0
 canile.it, 1
 canine.tools, 1
-caninecadre.net, 1
+caninecadre.net, 0
 caninejournal.com, 1
 caninsulin.com, 1
 caniphish.com, 1
@@ -27990,6 +27962,7 @@ cannabisdiscounter.ca, 1
 cannabisfactsnevada.org, 1
 cannabisfactsnv.org, 1
 cannabishouseyeg.com, 1
+cannabislegality.info, 1
 cannabistraininguniversity.com, 1
 cannabiz.tk, 1
 cannabytes.net, 1
@@ -28309,7 +28282,6 @@ carbonreal-test.azurewebsites.net, 1
 carbonrus.com, 1
 carbonswap.exchange, 1
 carbonswap.finance, 1
-carbontv.com, 1
 carbonvision.cn, 0
 carbuzz.com, 1
 carcatron.org, 1
@@ -28893,6 +28865,7 @@ casasdeapuestasdeportivas.cl, 1
 casasparaperross.com, 1
 casasuara.com, 1
 casasuleletrodomesticos.com.br, 1
+casatemporada.com, 1
 casatendeiro.tk, 1
 casavacanze.estate, 1
 casavaleria.tk, 1
@@ -28988,7 +28961,6 @@ cash-generator.tk, 1
 cash.app, 1
 cash.me, 1
 cash.nyc, 1
-cash1loans.com, 1
 cashadvanceoflebanon.com, 1
 cashamerican.tk, 1
 cashati.com, 1
@@ -30184,7 +30156,7 @@ cernko.de, 1
 ceroresiduo.com, 0
 cerovica.tk, 1
 cerpus-course.com, 1
-cerqa.cloud, 1
+cerqa.cloud, 0
 cerquitamio.com, 1
 cerrad.com.ua, 1
 cerrajeriaamericadelquindio.com, 1
@@ -30257,7 +30229,6 @@ cervenyjezek.eu, 1
 cervera.cat, 1
 cervera.com.br, 1
 ces-ltd.co.uk, 0
-ces-ltd.com, 1
 cesame.ca, 1
 cesar-hector.tk, 1
 cesarecirugiaplastica.com, 0
@@ -32925,7 +32896,6 @@ clearstep.health, 0
 clearstone.au, 1
 clearstoneip.com, 0
 clearstreamcapital.com, 1
-clearsys.ee, 1
 cleartheear.co.uk, 1
 clearview-creative.com, 1
 clearview-psychiatry.com, 1
@@ -33924,6 +33894,7 @@ codeclub.gq, 1
 codecnetworks.com, 1
 codecolliders.com, 1
 codecommunity.io, 1
+codeconnect.ir, 1
 codecool.com, 0
 codecreate.co.uk, 1
 codecrew.us, 1
@@ -34250,6 +34221,7 @@ coldlasers.org, 1
 coldmeat.se, 1
 coldpaste.com, 1
 coldraven.com, 1
+coldsky.net, 1
 coldspegll.gq, 1
 coldspringharborcesspools.com, 1
 coldspringsrancheria.gov, 1
@@ -34453,7 +34425,6 @@ colorbond.vn, 1
 colorbrightongreen.org, 1
 colorcodedlyrics.com, 1
 colorectalpractice.com, 1
-colorfittings.com, 1
 colorfularchive.eu.org, 1
 colorfulcloud.eu.org, 1
 colorfuldots.com, 1
@@ -34497,7 +34468,6 @@ colquittga.gov, 1
 colson-occasions.be, 0
 coltellisurvival.com, 1
 colterris.com, 1
-colthesweep.co.uk, 0
 coltonrb.com, 1
 coluit.nl, 1
 columbiachronicle.com, 1
@@ -35437,6 +35407,7 @@ contaminatie.nl, 1
 contango.xyz, 1
 contecgmbh.com, 1
 contempfleury.com, 1
+contemplativeeducation.org, 1
 contemptevoke.com, 1
 contenedoresdereciclaje.online, 1
 contentcaching.com, 1
@@ -35668,7 +35639,6 @@ cooscountynh.gov, 1
 cooscountyor.gov, 1
 copa.cf, 1
 copabarena.tk, 1
-copabay.com, 1
 copacabanafc.tk, 1
 copadata.be, 1
 copain.com.mx, 1
@@ -35780,7 +35750,6 @@ core3k.org, 1
 core3k.us, 1
 coreapm.com, 1
 coreapm.org, 1
-coreassurance.com, 1
 corebit.nl, 1
 corecapital.cz, 1
 corecdn.org, 1
@@ -36980,7 +36949,7 @@ crisp.watch, 1
 crispinplasticsurgery.com, 1
 crispinusphotography.com, 1
 crisple.info, 1
-crispregional.org, 1
+crispregional.org, 0
 crispsheets.com, 1
 crispybacon.ml, 1
 crisscrossjazz.com, 1
@@ -37207,12 +37176,12 @@ crtclaims.com, 1
 crtevents.co.uk, 1
 crtified.me, 1
 crucial.com, 1
-crucial.de, 1
-crucial.es, 1
-crucial.fr, 1
-crucial.in, 1
-crucial.jp, 1
-crucial.tw, 1
+crucial.de, 0
+crucial.es, 0
+crucial.fr, 0
+crucial.in, 0
+crucial.jp, 0
+crucial.tw, 0
 crucible.io, 1
 crudly.ai, 1
 cruelalice.net, 1
@@ -37335,6 +37304,7 @@ cryptomining.mobi, 1
 cryptomintecho.com, 1
 cryptomixer.io, 1
 cryptomkt.com, 1
+cryptomonnaies.io, 1
 crypton.vercel.app, 1
 crypton.xyz, 1
 cryptonaire.ga, 1
@@ -38880,7 +38850,7 @@ daltoncraven.com, 0
 daltonmi.gov, 1
 daltonohio.gov, 1
 daltons.tk, 1
-dalux.com, 1
+dalux.com, 0
 dalycity.gov, 1
 damadam.pk, 1
 damades.com, 1
@@ -39221,7 +39191,6 @@ daotaoantoan.org, 1
 daoudi.it, 1
 dap-systems.de, 1
 daphnedietz.com, 1
-daplie.com, 1
 dapmalaysia.org, 1
 dapoxetinagenerico.cf, 1
 dapoxetine.gq, 1
@@ -40300,7 +40269,6 @@ deavita.fr, 1
 deavita.net, 1
 deavon.tk, 1
 debacker.biz, 1
-debarbas.com, 1
 debarkader34.tk, 1
 debarras-diogene.paris, 1
 debarrasantony.com, 1
@@ -40524,7 +40492,6 @@ deepid.com, 1
 deepinsight.io, 0
 deepl.com, 1
 deepmountains.tk, 1
-deepneuro.ai, 1
 deepnote.com, 1
 deeps.cat, 1
 deepserve.info, 1
@@ -40640,7 +40607,6 @@ degreeducation.tk, 1
 degreeverify.com, 1
 degreeverify.net, 1
 degreeverify.org, 1
-degressif.com, 1
 degroetenvanrosaline.nl, 1
 degrootenslot.nl, 0
 degroupnews.com, 1
@@ -40664,7 +40630,6 @@ deimos.gq, 1
 deimos.io, 1
 dein-baumdienst.de, 1
 dein-trueffel.de, 1
-dein.mx, 1
 deinballon.de, 1
 deindeal.ch, 1
 deindustry.com, 1
@@ -41322,7 +41287,7 @@ dermatologyandlasergroup.com, 1
 dermax.tk, 1
 dermedia.tk, 1
 dermediq.nl, 1
-dermko.cz, 1
+dermko.cz, 0
 dermnet.ai, 1
 dermody.ga, 1
 dermopigmentista.it, 1
@@ -41388,7 +41353,6 @@ desertfade.eu, 1
 desertfiredesigns.com, 1
 desertfury.tk, 1
 desertgrove.com, 1
-desertheroesteam.com, 1
 deserti.tk, 1
 desertlinealuminium.com, 1
 desertlinegroup.com, 1
@@ -41528,7 +41492,6 @@ destentor.nl, 1
 desterman.ru, 1
 desterrada.tk, 1
 destguides.com, 1
-destileria.net.br, 1
 destilteomarmd.be, 1
 destinflow.com, 1
 destinia.us, 1
@@ -41897,7 +41860,7 @@ dfctaiwan.org, 1
 dffgpro.de, 1
 dfg.re, 1
 dfiik.com, 1
-dfilucky.com, 1
+dfilucky.com, 0
 dfm.ae, 0
 dfmn.berlin, 1
 dfmvf.org, 1
@@ -42031,7 +41994,6 @@ dia-te.ch, 1
 dia.com.br, 1
 diaakademi.com, 1
 diabetes-te.ch, 1
-diabetes.tools, 1
 diabetesdietjournal.com, 1
 diabetessucks.net, 1
 diableros.tk, 1
@@ -42565,7 +42527,6 @@ digitalinberlin.de, 1
 digitalistan.tk, 1
 digitalizer.my.id, 1
 digitalizzazioneverona.it, 0
-digitaljuliac.com.br, 1
 digitalkashmir.ml, 1
 digitalkey.pro, 1
 digitalkuber.com, 1
@@ -42745,15 +42706,10 @@ dimmersnewburypark.com, 1
 dimmersoakpark.com, 1
 dimmersthousandoaks.com, 1
 dimmerswestlakevillage.com, 1
-dimo-crm.fr, 1
-dimo-dematerialisation.com, 1
-dimo-tresorerie.fr, 1
 dimokratikiaristera.gr, 0
-dimomaint.de, 1
 dimonz.com, 1
 dimoredimara.com, 1
 dimory.com, 1
-dimosoftware.fr, 1
 dimseklubben.dk, 1
 dimtrade.rs, 1
 dina.wtf, 1
@@ -43251,7 +43207,6 @@ ditra.ae, 0
 ditte-destree.fr, 1
 dittvertshus.no, 1
 ditxse6.com, 1
-ditxse6.org, 1
 div.energy, 1
 diva-app.de, 1
 divacresent.tk, 1
@@ -43274,7 +43229,6 @@ divernonil.gov, 1
 diversant.bg, 1
 diverscott.com, 1
 diverse-cuts.com, 0
-diverse.systems, 1
 diversificarte.com, 1
 diversify.cf, 1
 diversify.com, 1
@@ -44438,7 +44392,7 @@ domyzitrka.cz, 1
 domznak.ru, 1
 don-news.tk, 1
 don-zalmrol.be, 1
-dona.to, 1
+dona.to, 0
 donacarlota.net.br, 1
 donacije.rs, 1
 donaciondeorganos.gov, 1
@@ -44452,7 +44406,6 @@ donaldwarner.com, 1
 donama.co, 1
 donamadeira.com.br, 1
 donamflor.com, 1
-donarmany.online, 1
 donat.cloud, 1
 donate-streamer.com, 1
 donate.lol, 1
@@ -45705,7 +45658,6 @@ dsgvo-analyse.de, 1
 dsgvo.name, 1
 dsh.io, 1
 dshield.org, 1
-dsigroup.com.tw, 1
 dsimonitor.online, 1
 dsiteam.in, 1
 dsjbvba.be, 1
@@ -46601,7 +46553,6 @@ e-rechnung.digital, 1
 e-recruitment.tk, 1
 e-referendum.cz, 1
 e-repairs.tk, 1
-e-resident.gov.ee, 1
 e-resident.me, 1
 e-rest.tk, 1
 e-rober.tk, 1
@@ -46679,7 +46630,7 @@ e36533.com, 1
 e3lan.net, 1
 e4.chat, 1
 e42.org, 0
-e4a.org, 1
+e4a.org, 0
 e4mc.link, 1
 e4tools.com, 1
 e4work.com.br, 1
@@ -46772,7 +46723,10 @@ eamproperties.com, 1
 eamu.fun, 1
 eandata.com, 0
 eanraig.top, 1
+eaofcarrollton.com, 1
 eaofdfw.com, 1
+eaoffrisco.com, 1
+eaofhouston.com, 1
 eap.vg, 1
 earchi.org, 1
 earhealthsolutions.co.uk, 1
@@ -46804,7 +46758,6 @@ earth-syst-sci-data.net, 1
 earth-system-dynamics.net, 1
 earth-system-science-data.net, 1
 earth.gov, 1
-earthai.ai, 1
 earthbound.tk, 1
 earthcam.com, 1
 earthcam.net, 1
@@ -47101,7 +47054,6 @@ ebdaa-business.com, 1
 eben18.net, 1
 ebenda.org, 1
 ebenica.sk, 1
-ebenisterie-de-villenouvelle.fr, 1
 ebenvloedaanleggen.nl, 1
 eberharter-steine.at, 1
 eberls.com, 1
@@ -48020,7 +47972,6 @@ egbert.net, 1
 egbertsen.tk, 1
 egc.ink, 1
 egdsk.ru, 1
-egegesh.ru, 1
 egehem.se, 1
 egenya.cl, 0
 egeozcan.com, 0
@@ -48168,7 +48119,6 @@ ehub.sk, 1
 ehuber.info, 1
 ehubtt.org, 1
 ei-bo.org, 1
-eiacampoguamal.com, 1
 eiao.me, 1
 eiber.net, 1
 eibich.de, 1
@@ -48610,7 +48560,6 @@ electromotor.tk, 1
 electronic-ignition-system.com, 1
 electronicafacil.net, 1
 electronicaripol.es, 1
-electronics.com.bd, 1
 electronicshelpcare.net, 1
 electronicssrit.tk, 1
 electronictucuman.com, 1
@@ -48691,7 +48640,6 @@ elektromicrosystems.pl, 1
 elektromobil-zubehoer.de, 1
 elektromosev.cz, 1
 elektromotor.tk, 1
-elektron-elektrotechnik.de, 1
 elektronicka-servisni-knizka.cz, 1
 elektronickakancelar.cz, 1
 elektroniksigarasehri1.com, 1
@@ -50541,7 +50489,6 @@ equals.com.br, 1
 equans-kaelte.de, 1
 equate.net.au, 1
 equatetechnologies.com.au, 0
-equeim.ru, 0
 equestrianvaulting.co.uk, 1
 equi.ac, 1
 equiac.com, 1
@@ -50561,7 +50508,6 @@ equinoxe.de, 1
 equinoxit.co.nz, 1
 equinoxtraining.net, 1
 equip.cz, 1
-equipamentosparapostos.com.br, 1
 equipandoloja.net.br, 1
 equipedefrance.tv, 0
 equipedefrente.tk, 1
@@ -50932,7 +50878,7 @@ escmatrix.com, 1
 escobarservice7000.com, 1
 escobeira.pt, 1
 escoben.tk, 1
-escolaaberje.com.br, 1
+escolaaberje.com.br, 0
 escolaconquer.com.br, 1
 escoladejudo.com.br, 1
 escoladepilota.tk, 1
@@ -52082,7 +52028,6 @@ evlqa1sp1tzb05zo-reoo0vhj9a1t5pousfudnkg.com, 0
 evo-ai.com, 1
 evo-exchange.com, 1
 evo.moe, 1
-evobox.store, 1
 evoco.vc, 0
 evodation.com, 1
 evodation.org, 1
@@ -52100,6 +52045,7 @@ evolution-host.ga, 1
 evolution-x.org, 0
 evolution.codes, 1
 evolutionbp.es, 1
+evolutionhomecorp.com, 1
 evolutioninflatables.co.uk, 1
 evolutionlife.za.com, 1
 evolutionmining.com, 1
@@ -52152,7 +52098,6 @@ ewa-hayward.co.uk, 1
 ewacforum.tk, 1
 ewaf.club, 1
 ewaipiotr.pl, 1
-ewananga.ac.nz, 1
 ewanm89.co.uk, 1
 ewanm89.com, 1
 ewanm89.uk, 1
@@ -53541,7 +53486,6 @@ faqexchangeest.ga, 1
 faqiteam.tk, 1
 far-east.tk, 1
 far3link.tk, 1
-fara-frunzis.ro, 1
 fara.gov, 1
 faradome.ws, 1
 faradrive.ir, 1
@@ -53744,7 +53688,6 @@ fashionunited.uk, 1
 fashionusa.gq, 1
 fashionweb.ml, 1
 fashionweek.tk, 1
-fashionweekweb.com, 1
 fashionworlds.ml, 1
 fashionxmas.gq, 1
 fasigbrooks.com, 1
@@ -54380,6 +54323,7 @@ fenix-zone.tk, 1
 fenixcorporative.tk, 1
 fenixmetal.tk, 1
 fenixonlinevirtual.com.br, 1
+fenn.moe, 1
 fennec.wtf, 1
 fennie.onthewifi.com, 0
 fenns.co.za, 1
@@ -54944,7 +54888,6 @@ fillo.com.tr, 1
 film-colleges.com, 1
 film-op-tv.nl, 1
 film-rezensionen.de, 1
-film-storyboards.com, 0
 film-stream.cz, 1
 film-tutorial.com, 1
 film.cz, 1
@@ -55011,7 +54954,6 @@ filtr.me, 0
 filtrmyfeed.com, 1
 filwebasia.com, 1
 fimallc.com, 1
-fimc-biodiversityportal.org, 1
 fimfiction.net, 1
 fimmcyte.com, 1
 fimozin.ga, 1
@@ -55262,6 +55204,7 @@ finverse.com, 0
 finwarriors.tk, 1
 finwe.info, 1
 finy.pl, 1
+finzy.com, 1
 fionahengartner.ch, 1
 fionamcbride.com, 1
 fionna.io, 1
@@ -55524,7 +55467,7 @@ fiskalloy.com, 1
 fiskaly.com, 1
 fiskarsinlaituri.fi, 1
 fisophi.com, 1
-fispan.com, 0
+fispan.com, 1
 fistingtogether.com, 1
 fistwerk.de, 1
 fit-4u.ch, 0
@@ -55800,7 +55743,6 @@ flarewalker.net, 1
 flarewalker.org, 1
 flart.studio, 1
 flart.tk, 1
-flarumplus.com, 1
 flasaki.gr, 1
 flash-games.tk, 1
 flash-payments.com, 1
@@ -57065,7 +57007,6 @@ forourselves.com, 1
 forowarhammer.tk, 1
 forrest79.net, 1
 forrestheller.com, 1
-forrestsolutions.com, 1
 forrestwalkbarbershop.com.au, 1
 forrettabarinn.is, 1
 forro.berlin, 1
@@ -57270,7 +57211,6 @@ fotofast.tk, 1
 fotoflits.net, 1
 fotofofftein.de, 0
 fotofon.tk, 1
-fotofreunde-telegram.eu, 1
 fotograf-website.de, 1
 fotografessa.pl, 1
 fotografiadellalucerossa.com, 1
@@ -57306,6 +57246,7 @@ fotostudio-schweiz.ch, 1
 fotostudio87.nl, 0
 fotostudiobasic.tk, 1
 fotosubmarina.tk, 1
+fotosyeventos.es, 1
 fototaniej.pl, 1
 fototjansterkalmar.se, 1
 fototutorial.tk, 1
@@ -57558,7 +57499,6 @@ framboise314.fr, 1
 framedog.tk, 1
 framegame.ch, 1
 framemo.org, 1
-framenails.fr, 1
 framer.ai, 1
 framer.com, 1
 framer.live, 1
@@ -57649,7 +57589,6 @@ frank-america.com, 1
 frank-gcc.com, 1
 frank-lastia.tk, 1
 frank-wendy.tk, 1
-frank.asia, 1
 frank.fyi, 1
 frankbrennan.art, 1
 frankdilusso.com, 1
@@ -58249,7 +58188,6 @@ freundlieb.ch, 1
 frexxi.com, 1
 freyapearls.com.au, 1
 fribourgviking.net, 1
-fricke.pl, 1
 frickelboxx.de, 1
 frickelmeister.de, 1
 frickenate.com, 1
@@ -58519,7 +58457,6 @@ fruitlandmi.gov, 1
 fruitlawers.ga, 1
 fruitmoose.com, 1
 fruitscale.com, 1
-fruitsexpressdelivery.com.sg, 1
 fruitsfromchile.com, 1
 fruittree.com.my, 1
 fruittree.com.sg, 1
@@ -59007,7 +58944,6 @@ funnybee.tk, 1
 funnybubu.ro, 1
 funnychristianjokes.tk, 1
 funnycommercials.ga, 1
-funnycups.org, 1
 funnylinks.cf, 1
 funnymedia.tk, 1
 funnymetals.com, 1
@@ -59523,7 +59459,6 @@ gabrielsteens.nl, 1
 gabrielvillarreal.com, 0
 gabrielyin.com, 0
 gabryjeluk.tk, 1
-gabskent.de, 1
 gabtitui.gov.au, 0
 gabucho.tk, 1
 gabyclark.com, 1
@@ -60190,6 +60125,7 @@ gaspard-ulliel.tk, 1
 gaspard12aout.ca, 1
 gasparesganga.com, 1
 gassafetycerts.com, 1
+gassafetymanchester.co.uk, 1
 gasscc.id, 1
 gasslerorourke.com, 0
 gassouthkenticoqa.azurewebsites.net, 1
@@ -60351,7 +60287,6 @@ gbcindustry.com, 1
 gbcomm.tk, 1
 gbcsummercamps.com, 1
 gbdavisplasticsurgery.com, 1
-gbecreativeagency.com, 1
 gbedu360.com, 1
 gbenson.net, 1
 gbes.com, 1
@@ -60694,7 +60629,6 @@ gemonite.com, 1
 gemooi.com, 1
 gemour.pl, 1
 gemquery.com, 1
-gemsen.com, 1
 gemstones.com, 1
 gemwerx.com, 1
 gen.cn.eu.org, 1
@@ -60951,7 +60885,7 @@ geo-files.tk, 1
 geo-industrie.fr, 1
 geo-portale.it, 1
 geo-television.de, 1
-geoapps.nl, 1
+geoapps.nl, 0
 geoarchive.tk, 1
 geocaching.hu, 1
 geocar.com, 1
@@ -61213,6 +61147,7 @@ gestione-certificazioni.it, 1
 gestionth.com, 1
 gestorehotel.com, 1
 gestorestecnologicos.com, 1
+gestoriaycontratos.com, 1
 gestus.tk, 1
 gesundheits-fakten.de, 1
 gesundheits-tipps.ch, 1
@@ -61374,7 +61309,6 @@ getplus.com.au, 1
 getpro.plumbing, 1
 getprohealth.com, 1
 getpromo.cf, 1
-getpsolid.com, 1
 getpublii.com, 1
 getraenke-hoffmann.de, 1
 getready2dance.tk, 1
@@ -61667,6 +61601,7 @@ giardinaggio.napoli.it, 1
 giardinaggio.roma.it, 1
 giardiniblog.com, 1
 giardiniblog.it, 1
+giardiniere.bologna.it, 1
 giardiniere.milano.it, 1
 giardiniere.roma.it, 1
 giardinoperfetto.com, 1
@@ -62514,7 +62449,6 @@ gmail, 1
 gmail.com, 0
 gman.bot, 1
 gmanlabs.com, 1
-gmao.com, 1
 gmasil.de, 1
 gmatic.info, 1
 gmavsg.org, 1
@@ -62657,7 +62591,6 @@ goatbots.com, 1
 goathub.io, 0
 goatlord.tk, 1
 goatstore.ca, 1
-goaudits.com, 1
 gobabes.nl, 1
 gobarrelroll.com, 1
 gobebra.com, 1
@@ -63390,7 +63323,6 @@ gousto.co.uk, 1
 goutsmits-tegelwerken.nl, 1
 gouwdata.nl, 0
 gov-online.go.jp, 1
-gov.cz, 1
 gov.exposed, 1
 gov.ky, 1
 gov.md, 1
@@ -63707,7 +63639,6 @@ granitebaydermatologyandlaser.com, 1
 graniteclub.com, 1
 graniteescrow.com, 1
 granitehillcapital.com, 1
-graniteind.com, 1
 granitestateproductions.tk, 1
 granitko.ru, 1
 grannynude.tv, 1
@@ -63721,7 +63652,6 @@ grannytube.tv, 1
 grannytubes.com, 1
 granool.ga, 1
 granotamaniacos.tk, 1
-granplaza.eu, 1
 granpoder-islacristina.tk, 1
 gransfors354.com, 1
 granstor.com, 0
@@ -64214,7 +64144,6 @@ gridgames.tk, 1
 gridgroup.com.tr, 1
 gridsmartercities.com, 1
 gridspace.ca, 1
-gridtennis.net, 1
 gridvis.cloud, 1
 griechische-pfoetchen.de, 1
 griefheart.com, 1
@@ -64490,6 +64419,8 @@ grumpy.fr, 1
 grumpygamers.com, 1
 grumpyguy.ga, 1
 grumpyvegan.com, 1
+grunammgames.com, 1
+grunammgames.de, 1
 grundig.co.uk, 1
 grundlage.fi, 1
 grundrauschen-publishing.de, 1
@@ -64738,7 +64669,6 @@ gubernia37.ml, 1
 gubka.ga, 1
 guc.ci, 1
 guccigame.de, 1
-gudangpangan.id, 1
 gudao.com, 1
 gudbrand.no, 1
 guddaff.de, 1
@@ -65706,7 +65636,6 @@ hallmarkbusiness.com, 1
 halloffameapartments.com, 1
 hallofoddities.tk, 1
 hallofworlds.online, 1
-hallopstyling.com, 1
 halloway.tk, 1
 halloweenmusic.org, 1
 hallsonsservices.com, 1
@@ -67581,6 +67510,7 @@ hellocoding.de, 1
 hellodesign.tk, 1
 helloemailers.ga, 1
 helloemailest.ga, 1
+helloexit.com, 1
 helloheadsup.com, 1
 hellohealthgroup.com, 1
 helloindia.tk, 1
@@ -67613,7 +67543,6 @@ helloteen.tk, 1
 hellothought.net, 1
 hellov.in, 1
 helloverify.com, 1
-hellovillam.com, 1
 helloworldhost.com, 0
 helloyubo.com, 1
 hellpc.net, 0
@@ -68488,7 +68417,6 @@ hindustantimes.ml, 1
 hinduworld.tk, 1
 hindweb.tk, 1
 hinesitecoding.com, 1
-hingehealth.io, 1
 hingle.me, 1
 hinhanhykhoa.com, 1
 hinit.no, 1
@@ -68519,7 +68447,6 @@ hiphopall.tk, 1
 hiphopbolivia.tk, 1
 hiphopdates.de, 1
 hiphopfashion.tk, 1
-hipihapi.org, 1
 hipnos.net, 1
 hipnosecriciuma.com.br, 1
 hipnosisyterapias.com, 1
@@ -69335,7 +69262,6 @@ homedollars.ga, 1
 homeduck.ga, 1
 homeeagle.ga, 1
 homeelectricalupdates.com, 1
-homeer.com, 1
 homeexperience.tk, 1
 homefacialpro.com, 0
 homeflag.ga, 1
@@ -69552,6 +69478,7 @@ honestworknmoney.tk, 1
 honesty.com.pl, 1
 honey.beer, 1
 honeyarcus.art, 1
+honeybadger.io, 0
 honeycomb.io, 1
 honeycome-recruit.com, 0
 honeycreeper.com, 1
@@ -69978,7 +69905,6 @@ hotelbiz.cf, 1
 hotelbiz.ga, 1
 hotelbiz.gq, 1
 hotelbretagne.dk, 1
-hotelcasadelmar.com, 1
 hotelcharlestonsantateresa.com, 1
 hotelcoco.co.uk, 1
 hotelconsulado.com.br, 1
@@ -70129,7 +70055,6 @@ hoursofoperation.biz, 1
 house-sparrow.com, 1
 houseandgarden.co.uk, 1
 houseandhounddogwalkers.com, 1
-houseandofficeclearance.co.uk, 1
 houseareacanada.tk, 1
 houseareaitaly.tk, 1
 housebar.tk, 1
@@ -70250,7 +70175,6 @@ howellpolicenj.gov, 1
 howgoodwasmysex.com, 1
 howiehawkins.us, 1
 howieisawesome.com, 1
-howl.uk.com, 1
 howlers.tk, 1
 howlinhawk.tk, 1
 howlonghaswilliambeenwaitingforhislicence.uk, 1
@@ -70310,7 +70234,7 @@ hozio.com, 1
 hozio.net, 1
 hozkomurcu.com, 1
 hozonshoku.com, 1
-hozy.co, 1
+hozy.co, 0
 hp-67.com, 1
 hp-lexicon.org, 1
 hp42.de, 1
@@ -70671,7 +70595,6 @@ hudhomestore.gov, 1
 hudless.com, 1
 hudnara.se, 1
 hudobniny.net, 1
-hudochharmoni.se, 1
 hudognik.com, 1
 hudsonregional.gov, 1
 hudsonsolutions.com, 1
@@ -70693,7 +70616,6 @@ huertoydesamparados.tk, 1
 hues-in-lee.de, 1
 huesers.de, 1
 huesitos.tk, 1
-huesos.pro, 1
 huez.tech, 1
 hufelare.tk, 1
 huffduffer.com, 1
@@ -70775,7 +70697,7 @@ hultrid.hopto.org, 1
 huluch.cc, 1
 hululkitab.co, 1
 humail.link, 1
-human-centricity.com, 1
+human-centricity.com, 0
 human-clone.com, 1
 human-dev.io, 1
 human-parasites.tk, 1
@@ -70871,7 +70793,6 @@ humorcheck.ga, 1
 humorcheckers.ga, 1
 humorcheckest.ga, 1
 humored.gq, 1
-humorojo.com, 1
 humpen.se, 1
 humphreyscountytn.gov, 1
 humphreystnsheriff.gov, 1
@@ -70879,7 +70800,6 @@ humpydumpy.tk, 1
 humuluslupulus.de, 1
 humus.tk, 1
 huna.viajes, 1
-hunaniinfotech.com, 1
 hund.io, 1
 hund.ml, 1
 hundamosantena3.tk, 1
@@ -71165,6 +71085,7 @@ hypemgmt.com, 1
 hyper-fit.nl, 1
 hyper-matrix.org, 1
 hyper-text.org, 0
+hyper.ai, 1
 hyper.lol, 1
 hyperalgesia.com, 1
 hyperautomotive.com.au, 1
@@ -71537,7 +71458,6 @@ ibo-chemnitz.de, 1
 iboat.eu, 1
 ibodyiq.com, 1
 ibon.org, 1
-iboplayer.de, 1
 iboysoft.com, 1
 ibpegasus.tk, 1
 ibpsrecruitment.co.in, 1
@@ -71762,7 +71682,7 @@ icts.gov, 1
 icttindia.org, 0
 ictv1.com, 1
 ictwebsolution.nl, 1
-icuc.social, 1
+icuc.social, 0
 iculture.nl, 1
 icustomboxes.com, 1
 icyapril.com, 1
@@ -71771,7 +71691,6 @@ icydestiny.com, 0
 icyhealth.com, 0
 icyheroes.com, 1
 icyrock.com, 1
-icytales.com, 0
 icywhiz.com, 1
 iczc.cz, 1
 icze4r.co, 1
@@ -72126,6 +72045,7 @@ igglabs.com, 1
 iggprivate.com, 1
 iggsoft.com, 1
 iggsoftware.com, 1
+iggyz.com, 1
 igi-2.com, 1
 igiftcards.de, 1
 igiftcards.nl, 1
@@ -72202,7 +72122,6 @@ igrovoi-klub.tk, 1
 igrun.com, 1
 igrun80.com, 1
 igrun88.com, 1
-igrunplay.com, 1
 igry-onlayn.ru, 1
 igryalawar.tk, 1
 igshop.ir, 1
@@ -73060,7 +72979,6 @@ imtqy.com, 1
 imttech.co, 1
 imunify360.com, 1
 imusionforum.tk, 1
-imwc.me, 0
 imy.rs, 0
 imyjy.cn, 1
 imzhu.com, 1
@@ -73074,6 +72992,7 @@ in-crypto.tk, 1
 in-depth.wiki, 1
 in-depthoutdoors.com, 1
 in-flame-team.com, 1
+in-flames.com, 1
 in-line.ru, 1
 in-love.tk, 1
 in-melbet.com, 1
@@ -73350,7 +73269,6 @@ indnews.ga, 1
 indo-wiki.fr, 1
 indo4life.tk, 1
 indobia-massage-thun.ch, 1
-indobo.com, 0
 indobrains.id, 1
 indochinatravel.tk, 1
 indodax.com, 1
@@ -73798,7 +73716,6 @@ inglesnarede.com.br, 1
 inglessantacruz.tk, 1
 inglestotal.tk, 1
 ingo-schlueter.de, 1
-ingoldingen.de, 1
 ingolfsskali.is, 1
 ingoschlueter.de, 1
 ingrain-ed.com, 1
@@ -76692,7 +76609,6 @@ jainnatory.ca, 1
 jainnotary.ca, 1
 jaion.tech, 1
 jairoenfrancien.tk, 1
-jairsinho.me, 1
 jaisiam.co.th, 1
 jaispirit.com, 1
 jaiswalfertility.com, 1
@@ -77051,6 +76967,7 @@ jasch.tk, 1
 jascha.wtf, 1
 jaschaa.de, 1
 jasco.gov, 1
+jasekeke.co.kr, 1
 jaseng.ga, 1
 jasewhite.com, 1
 jashinchan.cn, 1
@@ -77637,7 +77554,6 @@ jerusalempersonalsest.ga, 1
 jerusalemplus.tv, 1
 jesec.cn, 1
 jesec.io, 1
-jesen.org, 1
 jesiensredniowiecza.pl, 1
 jesmatboutique.com, 1
 jesmh.de, 1
@@ -78394,7 +78310,7 @@ johannes-sprink.de, 0
 johannes-zinke.de, 1
 johannes.wtf, 1
 johannfritsche.de, 1
-johannhson.com, 1
+johannhson.com, 0
 johanpeeters.com, 1
 johego.org, 1
 johjohannsonkaffe.no, 1
@@ -79012,7 +78928,6 @@ jsfleecefabric.com, 1
 jsfloydlaw.com, 0
 jsg.hk, 1
 jsgr.ca, 1
-jsh.marketing, 1
 jsheard.co.uk, 1
 jsheard.com, 1
 jsheard.me.uk, 1
@@ -79509,7 +79424,6 @@ justnu.se, 0
 justor.ru, 1
 justpass.co.uk, 1
 justpass.uk, 1
-justpaste.it, 1
 justpdf.cf, 1
 justquoteme.ga, 1
 justsa.co.za, 1
@@ -79689,7 +79603,6 @@ k88259.com, 1
 k886.co, 1
 k88670.com, 0
 k88672.com, 0
-k8dalao.com, 1
 k8didi.com, 1
 k8gege.com, 0
 k8ja.co.ke, 1
@@ -79899,7 +79812,7 @@ kak-pohudet-legko.ml, 1
 kak.ao, 1
 kaka.farm, 0
 kakabo.vn, 1
-kakacon.nz, 1
+kakacon.nz, 0
 kakan.ml, 1
 kakaravaara.fi, 1
 kakdolgonline.cf, 1
@@ -80328,7 +80241,6 @@ karikatur.ml, 1
 karikatur.tk, 1
 karimova.tk, 1
 karimsaadati.tk, 1
-karimunsejahtera.com, 1
 karin-ewald.de, 1
 karinahh.net, 1
 karinheinenmaassen.nl, 1
@@ -80935,7 +80847,6 @@ kelamb.com, 1
 kelantan.tk, 1
 kelantanmudah.com, 0
 kelax.tk, 1
-kelbillet.com, 1
 kelcible.fr, 1
 kelcotool.com, 1
 kelder.tk, 1
@@ -81165,7 +81076,6 @@ kerrybluephotography.com, 1
 kerrydavisguitars.tk, 1
 kerrygoldusa.com, 1
 kersmexico.com, 1
-kerstboomkantenklaar.nl, 1
 kerstpagina.tk, 1
 kersvers.agency, 1
 kertis.tk, 1
@@ -82044,7 +81954,6 @@ kiseimarriage.com, 1
 kisel.org, 1
 kish-takhfif.com, 1
 kishcar.co, 1
-kishonti.net, 1
 kisiselveri.com, 1
 kiskeedeesailing.com, 0
 kislepesek.net, 1
@@ -82422,7 +82331,6 @@ klokkenluidersvg.nl, 1
 kloop.kg, 1
 klop.info, 1
 klos-kremperler.at, 1
-klose-besser.com, 1
 klose.family, 1
 klosetestumgebungnextcloud.de, 1
 klosko.net, 1
@@ -82678,6 +82586,7 @@ kochamkoszalin.pl, 1
 kochbar.de, 1
 kochcommunity.com, 1
 kochdigital.dk, 1
+kochen-und-design.de, 1
 kochereva.com, 1
 kocheshkov.cf, 1
 kochhar.net, 1
@@ -82786,7 +82695,6 @@ kokteili.tk, 1
 koktelparty.tk, 1
 kokumoto.com, 1
 kokuyo.co.th, 1
-kokuyocamlin.com, 1
 kokwatersport.nl, 1
 kol7asry.com, 1
 kolabtree.com, 1
@@ -83479,7 +83387,7 @@ kreno.tech, 1
 krenstetter.at, 1
 kreolis.net, 1
 kresimir-blazevic.tk, 1
-krestanskydarek.cz, 1
+krestanskydarek.cz, 0
 kretaforum.dk, 1
 kretschmann.consulting, 1
 kretschmann.it, 1
@@ -83978,7 +83886,6 @@ kundesjekk.no, 0
 kundo.pl, 1
 kundo.se, 1
 kunfu.pl, 1
-kungfudirect.com, 1
 kungsangen.com, 0
 kungsangsgymnasiet.se, 1
 kunitomo.jp, 1
@@ -84095,7 +84002,6 @@ kurtschlatzer.com, 1
 kurtschleinbeck.com, 1
 kurungkurawal.id, 1
 kuruppa.xyz, 1
-kurvysf.com, 1
 kurvytt.com, 1
 kurz.onl, 1
 kurz.pw, 1
@@ -84130,6 +84036,7 @@ kutedaki.com, 1
 kutekeiki.com, 1
 kuti.hu, 1
 kutinsoft.com, 1
+kutny.cz, 1
 kutsankaplan.com, 1
 kuttler.eu, 1
 kutvonen.net, 1
@@ -84858,7 +84765,6 @@ lalaya.fr, 1
 laled.ch, 0
 laleggepertutti.it, 1
 lalegria.tk, 1
-lalegroup.com.tr, 1
 lalelal.me, 1
 lalenteja.net, 1
 lalettrepatriote.com, 0
@@ -84868,7 +84774,7 @@ lalokura.tk, 1
 lalouviere.fr, 1
 lalucepulsata.it, 1
 lalucha.tk, 1
-lalucioledigitale.com, 1
+lalucioledigitale.com, 0
 lalumiere.org, 1
 lalunedangkor.com, 0
 lamac.ae, 1
@@ -85708,6 +85614,7 @@ lawstudio.legal, 1
 lawsuit.tk, 1
 lawsuitconsultanters.ga, 1
 lawsuitconsultantest.ga, 1
+lawtests.ir, 1
 lawtimesnews.com, 1
 lawtrend.in, 1
 lawvize.com, 1
@@ -86135,7 +86042,6 @@ lebenpflegen-march.ch, 1
 lebenpflegen.ch, 1
 lebens-fluss.at, 1
 lebensinselparaguay.tk, 1
-lebensmittelwarnung.de, 0
 lebesis.tk, 1
 lebihan.pl, 1
 lebkuchen-schmidt.com, 1
@@ -86803,7 +86709,6 @@ lertsiritravel.net, 1
 les-aides.fr, 1
 les-ateliers-de-melineo.be, 0
 les-epris.fr, 1
-les-inoxydables.com, 1
 les-plus.com, 1
 les-pros-du-drone.com, 1
 les-universalistes.be, 1
@@ -86893,7 +86798,6 @@ lestoilesdemich.fr, 1
 lestravauxduparticulier.fr, 1
 lestrokeofgenius.com, 1
 lestudiopecot.fr, 1
-lesummeira.is, 1
 lesvertsmaroc.tk, 1
 lesy.eu, 1
 lesycr.cz, 1
@@ -87157,7 +87061,6 @@ lezen.tk, 1
 leziblog.com, 1
 lezzetyurdu.com.tr, 1
 lfashion.eu, 1
-lfasiallc.com, 1
 lfc.com.pl, 1
 lfcnsv.de, 1
 lff.club, 1
@@ -87376,7 +87279,6 @@ libraryofcode.us, 1
 librarytapes.tk, 1
 librarytools.com, 1
 libravatar.org, 1
-librazy.org, 1
 libre-innovation.org, 1
 libre.cr, 1
 libre.net.au, 1
@@ -87947,7 +87849,6 @@ lineengraver.com, 1
 linefire.com, 1
 lineinchina-enterprise.tw, 1
 lineinchina.com.ua, 1
-linejuby.dk, 1
 linelab.cz, 1
 lineru.com, 1
 lineshop.ml, 1
@@ -87955,7 +87856,6 @@ linestep.jp, 1
 lineto.com, 1
 linext.cn, 0
 linfamilygc.com, 1
-linge-ma.ro, 1
 lingerie-coquine.fr, 1
 lingerie.com.br, 1
 lingeriebym.nl, 1
@@ -89215,7 +89115,6 @@ lojavirtualdopsicopedagogo.com.br, 1
 lojavirtualinfopaper.com.br, 1
 lojavisamed.com.br, 1
 lojaxo.com.br, 1
-lojazeustech.com.br, 1
 lojel.com, 1
 lojistaguarani.com.br, 1
 lojix.com, 0
@@ -90188,6 +90087,7 @@ ludwig.im, 1
 ludwiggrill.de, 1
 ludwigjohnson.se, 1
 ludwigpro.net, 1
+ludwigsburger-brauhaus.de, 1
 luedeke-bremen.eu, 1
 lueersen.homedns.org, 1
 luehne.de, 1
@@ -90276,9 +90176,6 @@ lukem.eu, 1
 lukem.net, 1
 lukeplant.me.uk, 1
 luker.org, 1
-lukersallamericanstorage.com, 1
-lukersstorage.com, 1
-lukerstorage.com, 1
 lukertech.net, 1
 lukesbouncycastlehire.com, 1
 lukestert.com, 0
@@ -90374,7 +90271,6 @@ lunarlog.com, 1
 lunarr.fr, 1
 lunartail.nl, 1
 lunarum.tk, 1
-lunascope.ru, 1
 lunasqu.ee, 1
 lunastrail.com, 1
 luncfreak.com, 1
@@ -90672,7 +90568,6 @@ lynntownshipmi.gov, 1
 lynnvartan.com, 1
 lynred.com, 1
 lynt.nl, 1
-lynth.io, 1
 lynwoodca.gov, 1
 lynx-webservice.com, 0
 lynx.com.au, 1
@@ -91004,7 +90899,6 @@ maddin.ga, 1
 made-to-usb.com, 1
 made.md, 1
 made2coach.com, 1
-madebydami.com, 1
 madebyesmel.com, 1
 madebyhand.art, 1
 madebyshore.com, 0
@@ -91580,6 +91474,7 @@ maison-auriat.fr, 1
 maison-coutin.com, 1
 maison-du-mineur.com, 1
 maison-eureka.fr, 1
+maison2com-event.fr, 1
 maisondelafigue.com, 1
 maisondepax.com, 1
 maisondidon.com, 1
@@ -91746,7 +91641,6 @@ malagarental.com, 1
 malahov.tk, 1
 malakye.com, 1
 malami.gr, 1
-malamujercomunicacion.com, 1
 malamutedoalasca.com.br, 1
 malardalenvvs.se, 1
 malariaadvice.gq, 1
@@ -92353,6 +92247,7 @@ marbellaclub.com, 1
 marbellaoptic.ro, 1
 marbermedical.com, 1
 marble.com, 1
+marblecapitallp.com, 1
 marblecare.ae, 1
 marbleceramiccorp.com.au, 1
 marbleme.jp, 1
@@ -92493,6 +92388,7 @@ margo-co.ch, 0
 margo.ml, 1
 margolcia.com.pl, 1
 margolis.gq, 1
+margolisphoto.com, 1
 margotbworldnews.tk, 1
 margotdesign.ovh, 1
 margots.biz, 1
@@ -92786,7 +92682,7 @@ markus289.com, 1
 markusabraham.com, 1
 markusehrlicher.de, 1
 markusgran.de, 1
-markushof.it, 1
+markushof.it, 0
 markusjanzen.de, 1
 markuskeppeler.de, 1
 markuskeppeler.no-ip.biz, 1
@@ -93043,7 +92939,6 @@ marvnetforum.gq, 1
 marvnetforum.ml, 1
 marvnetforum.tk, 1
 marvos.se, 1
-marw.org, 1
 marwadionline.com, 1
 marxist-club.org, 1
 marxist.party, 1
@@ -93051,6 +92946,7 @@ marxists.org, 1
 marxmyths.org, 1
 marxpark.tk, 1
 mary-e-kay.tk, 1
+maryamghorbani.com, 1
 maryannhaircpa.com, 1
 marycowanceramics.com, 1
 maryeileen90.party, 1
@@ -93956,7 +93852,6 @@ mbinf.de, 0
 mbinformatik.de, 0
 mbjeng.com, 0
 mbk.net.pl, 1
-mblankhorst.nl, 1
 mble.mg, 1
 mbm-law.net, 1
 mbmassageterapi.se, 1
@@ -94002,7 +93897,7 @@ mcaps-mn.gov, 1
 mcar5b.com, 1
 mcavallo.com, 1
 mcaz.nl, 1
-mcb-bank.com, 0
+mcb-bank.com, 1
 mcba.com.br, 1
 mcc.edu.ph, 1
 mccabes.com.au, 1
@@ -94675,6 +94570,7 @@ medicompany.tk, 1
 mediconnect.net, 1
 medictools.de, 1
 medicus.ai, 1
+medidata.co.nz, 1
 medidordehumedad.online, 1
 mediengestalter-website.de, 1
 medienhelden.de, 1
@@ -94844,7 +94740,6 @@ meezjewelry.vn, 1
 meeztech.com, 1
 meeztertom.nl, 1
 mefano.com, 1
-meffrepatrimoine.com, 1
 meg-a-bounce.co.uk, 1
 mega-aukcion.ru, 1
 mega-byte.nl, 0
@@ -95242,6 +95137,7 @@ meme.com, 1
 meme.fi, 1
 meme.institute, 1
 memecoin.org, 1
+memecoincook.com, 1
 mememan.org, 1
 memememememememe.me, 1
 memento-mori.cf, 1
@@ -95517,7 +95413,6 @@ mercercountypa.gov, 1
 mercerisland.gov, 1
 merchant-portal.co.kr, 1
 merchantaccountsolutions.com, 1
-merchcity.com, 1
 merchstudio.ru, 1
 merck-animal-health.ca, 1
 merck-animal-health.com, 1
@@ -95686,7 +95581,7 @@ meta.ai, 1
 meta.com, 1
 meta4.be, 1
 meta48.live, 1
-metaalshopper.nl, 1
+metaalshopper.nl, 0
 metablog.xyz, 1
 metabolicmenu.com, 1
 metabound.co.uk, 1
@@ -95738,7 +95633,7 @@ metallokonstruktsii.com, 1
 metallomania.it, 1
 metallosajding.ru, 1
 metallrecycling.org, 1
-metallshopper.de, 1
+metallshopper.de, 0
 metalmaniac.tk, 1
 metalmonocle.com, 0
 metalnight.tk, 1
@@ -96452,7 +96347,6 @@ midrocket.com, 1
 midspace.co.uk, 1
 midspss.lt, 1
 midterm.us, 1
-midtownattowncenter.com, 1
 midtowndentist5thave.com, 1
 midtownsouthcc.org, 1
 midvalleysewer.gov, 1
@@ -96992,7 +96886,6 @@ mind-media.com, 1
 mind-moves.es, 1
 mindandfull.ga, 1
 mindask.tk, 1
-mindblown.pl, 1
 mindbodybalance.health, 1
 mindbodycoaching.no, 1
 mindbodysoul.us, 1
@@ -97052,7 +96945,6 @@ mine-craftlife.com, 1
 mine-pixl.de, 1
 mine-temoin.fr, 1
 mine260309.me, 0
-mineads.gg, 1
 minebbs.com, 0
 minebitcoin.tk, 1
 minecity.fun, 1
@@ -97204,7 +97096,6 @@ ministeriodeeducacion.gob.do, 1
 ministory.tk, 1
 ministryhire.com, 1
 ministryofinternet.eu, 1
-ministryofsound.com, 1
 ministryofvillas.com, 1
 ministudio.ml, 1
 ministyle.ro, 1
@@ -97741,6 +97632,7 @@ mjhs.org, 1
 mjhsfoundation.org, 1
 mjjshow.eu.org, 1
 mjlwebdev.pl, 1
+mjmoccasions.com, 1
 mjmpartnerlink.com.au, 1
 mjniessen.com, 1
 mjoldfield.com, 1
@@ -97971,7 +97863,6 @@ mne.moe, 1
 mnec.io, 1
 mneeb.de, 1
 mnemonic.ninja, 1
-mnews.it, 1
 mngfam.ddns.net, 1
 mnguyen.io, 1
 mnhc.gov, 1
@@ -98276,7 +98167,6 @@ modusawperandi.com, 1
 modusgames.com, 1
 modusit.co.za, 1
 modusmundi.com, 1
-modussystems.com, 1
 modvigilonlinerx.com, 1
 modxvm.com, 1
 modzcenter.com, 1
@@ -99217,7 +99107,6 @@ mostlyharmless.at, 1
 mostlyoverhead.com, 1
 mostmost.tk, 1
 mosurist.tk, 1
-moswand.nl, 1
 motability.co.uk, 1
 motabilitychargeshare.co.uk, 1
 motabilitydealer.co.uk, 1
@@ -99336,6 +99225,7 @@ motorzone.od.ua, 1
 motoselfservices.fr, 1
 motospaya.com, 0
 motostorie.blog, 1
+motostyle.ua, 1
 mototax.ch, 0
 mototeam.tk, 1
 mototsi.com, 1
@@ -99539,7 +99429,6 @@ mozgb.ru, 1
 mozgovoy.tk, 1
 mozilla-russia.org, 1
 mozilla.cz, 1
-mozo.com.au, 1
 moztopup.com, 1
 mozzak.tk, 1
 mozzez.de, 1
@@ -99798,7 +99687,6 @@ msar.eu, 1
 msbmb.com, 1
 msc-fivem.shop, 1
 mscc.mu, 1
-msd-animal-health.com, 1
 msd-tiergesundheit.de, 1
 msda23.gov, 1
 msdnicrosoft.cn, 0
@@ -99947,7 +99835,7 @@ mtehe-square.com, 1
 mtel.gr, 1
 mteleport.net, 1
 mtelizabeth.com, 1
-mtex.net.ua, 1
+mtex.net.ua, 0
 mtf.party, 1
 mtf.rip, 1
 mtf.wiki, 1
@@ -100507,7 +100395,6 @@ musselsblog.com, 1
 mussila.com, 1
 mussonsppe.com, 1
 mussonstrading.com, 1
-musta.ch, 1
 mustangapparel.ca, 1
 mustangmessenger.net, 1
 mustasj.no, 1
@@ -100787,7 +100674,6 @@ myanmar.gov.mm, 1
 myapexcard.com, 1
 myaquaterra.tk, 1
 myareaf2a.com, 1
-myarpico.com, 1
 myarticlelibrary.cf, 1
 myasb.club, 1
 myathena.ai, 0
@@ -100933,7 +100819,6 @@ mycrypnet.io, 1
 mycts.org, 1
 mycues.gov, 1
 mycumortgage.com, 1
-mycyberspace.tech, 1
 mydarkness.cf, 1
 mydarksite.tk, 1
 mydarkstar.net, 1
@@ -101515,7 +101400,6 @@ mysimsem.com, 0
 mysisterandi.co.za, 1
 myslc.gov, 1
 mysmallbusinesssidekick.com, 1
-mysmartserve.com, 0
 mysmsapp.cn, 1
 mysociety.ml, 1
 mysockfactory.ch, 1
@@ -101634,7 +101518,6 @@ myvau.lt, 1
 myvawic.org, 0
 myvc.in, 1
 myvcc.ru, 1
-myvegasadvisor.com, 1
 myveritext.ca, 1
 myveritext.net, 1
 myvermont.gov, 1
@@ -102040,7 +101923,7 @@ namastehomecooking.com, 1
 namastenaturo.fr, 1
 namazon.org, 1
 namazvakitleri.com.tr, 0
-namdu.uz, 1
+namdu.uz, 0
 name.am, 1
 name.ax, 1
 nameabusiness.com, 1
@@ -102581,6 +102464,7 @@ nauris.fi, 1
 nauseainthemorning.ml, 1
 nausempreendimentos.com, 1
 nausicaahotel.it, 1
+nauss.edu.sa, 1
 naut.ca, 1
 nautadutilh.com, 1
 nautholl.is, 1
@@ -102643,7 +102527,6 @@ nawroth.info, 1
 nawt.pl, 1
 nax.io, 0
 naxcivan.tk, 1
-naxe.lv, 1
 nayakaaerial.com, 1
 nayanaas.com, 1
 nayapakistan.tk, 1
@@ -102711,7 +102594,6 @@ nbalive.cn, 1
 nbalivecn.com, 1
 nbalivex.com, 1
 nbaot.org, 1
-nbapc.org, 1
 nbapwned.com, 1
 nbari.com, 1
 nbasky.com, 1
@@ -102982,6 +102864,7 @@ neelen-gym.nl, 1
 neemo.nz, 1
 neenahwi.gov, 1
 neenan.com, 1
+neepscambaiting.com, 1
 neera.ro, 1
 neero.fr, 1
 nees.ga, 1
@@ -103125,7 +103008,6 @@ nelnetbank.com, 1
 nelosculpteur.fr, 1
 nelson-marine.com, 0
 nelsoncountyky.gov, 1
-nelsonrecruitmentservices.co.uk, 1
 nelsonrodrigues.tk, 1
 nelsontwpoh.gov, 1
 nelsonworldwide.com, 1
@@ -103342,7 +103224,6 @@ nerven.se, 0
 nervi.ga, 1
 nesabamedia.com, 1
 nesaltin.com, 1
-neseari.com, 1
 nesheims.com, 1
 nesheimswaterrestoration.com, 1
 neshkorowi.gov, 1
@@ -104317,7 +104198,6 @@ nfl.duckdns.org, 1
 nfl.zapto.org, 1
 nflbox.me, 1
 nflchan.org, 1
-nflo.pl, 1
 nfls.io, 1
 nfmhof.com, 1
 nfo.co.il, 1
@@ -104357,6 +104237,7 @@ ngergs.de, 1
 nggukbo9lbfadcf5.gq, 1
 nghe.net, 1
 nghien4banh.com, 1
+nghiengacha.com, 1
 ngiemboon.net, 1
 nginx.io, 1
 nginxtest.ml, 1
@@ -105272,15 +105153,15 @@ noaccess.tk, 1
 noacore.ch, 1
 noadi-pixels.tk, 1
 noagendahr.org, 1
+noahdigital.com.br, 1
 noahenco.nl, 1
 noahjacobson.com, 1
 noahmodas.com.br, 1
 noahs.com, 1
 noahsaso.com, 1
-noamweb.com, 1
 noangel.tk, 1
 noart.tk, 1
-noatec.eu, 1
+noatec.eu, 0
 noawildschut.com, 1
 noawildschut.nl, 1
 nob.ro, 1
@@ -105710,6 +105591,7 @@ northcountykiaparts.com, 1
 northcreekresort.com, 1
 northcreekresortblue.ca, 1
 northdakotatitlesearch.com, 1
+northdallasendo.com, 1
 northdavisfireut.gov, 1
 northdevonbouncycastles.co.uk, 1
 northeastconference.org, 1
@@ -106051,7 +105933,6 @@ novel543.com, 1
 novelacuba.com, 1
 novelas.net.br, 1
 noveldadigital.es, 1
-novelenergylighting.com, 1
 novelfm.com, 1
 novelinglife.net, 0
 novelly.in, 1
@@ -106993,7 +106874,6 @@ obelis.ltd, 1
 obelisco.tk, 1
 obelix05.duckdns.org, 1
 oberam.de, 1
-obercodosguardas.pt, 1
 oberdachstetten.de, 1
 obereg.cf, 1
 obereg.ga, 1
@@ -108203,7 +108083,6 @@ omskweb.tk, 1
 omstars.com, 1
 omtcloud.jp, 1
 omundojornalismo.pt, 1
-omva.de, 1
 omxz8.com, 1
 omxz80.com, 1
 omxz9.com, 1
@@ -109095,6 +108974,7 @@ oplata-mvd.ga, 1
 oplata-vklike.tk, 1
 oplata.uz, 1
 oplium.com, 1
+oplop.appspot.com, 1
 opm.gov, 1
 opmaakonderscheidingen.nl, 1
 opnx.dk, 1
@@ -109263,7 +109143,6 @@ opture.ch, 1
 optykgill.pl, 1
 optymyze.com, 1
 opulentdivision.com, 0
-opulentranch.com, 1
 opus-codium.fr, 1
 opus-labs.fr, 1
 opus4.com, 1
@@ -109301,6 +109180,7 @@ orange.bf, 1
 orange.legal, 1
 orange.md, 1
 orangeacademy.cz, 1
+orangeappalam.com, 1
 orangecityfl.gov, 1
 orangecorners.com, 1
 orangefinanse.com.pl, 1
@@ -109369,6 +109249,7 @@ orcamarine.tk, 1
 orcas.tk, 1
 orcasecurity.io, 1
 orchardnh.org, 1
+orchestra-ppm.io, 1
 orchestra.tk, 1
 orchestremetropolitain.com, 1
 orchidee-mariage.com, 1
@@ -109973,7 +109854,6 @@ oudersvannu.nl, 1
 ouestacro.fr, 1
 ouestlebug.com, 1
 ouezzan.tk, 1
-ouglor.com, 1
 oui-mais-toscope.info, 1
 ouin.land, 1
 ouiouibunny.ch, 1
@@ -110629,7 +110509,6 @@ packservice.it, 1
 packsquare.in, 1
 packtracking.org, 1
 packwire.com, 1
-paclease.com.my, 1
 pacman.ltd, 1
 pacnyc.org, 1
 pacobarbera.tk, 1
@@ -110804,7 +110683,6 @@ paintstaintt.com, 1
 paio2-rec.com, 1
 paipuman.jp, 1
 paireepinart.com, 1
-pairin.com, 1
 pairsclassifiedads.tk, 1
 paisa-dev.azurewebsites.net, 1
 paisano-online.com, 1
@@ -111275,7 +111153,7 @@ paradisu.fr, 1
 paradoxdesigns.org, 1
 paradoxhotels.com, 1
 paradoxium.ml, 1
-paradymecompanies.com, 1
+paradymecompanies.com, 0
 paraelganzo.tk, 1
 parafarmacia.it, 1
 paragardmdlportal.com, 1
@@ -111495,7 +111373,7 @@ parkr.io, 0
 parkshark.io, 1
 parksi.top, 1
 parksinta.com, 1
-parkstonegp.com, 1
+parkstonegp.com, 0
 parkstreet.com, 1
 parktownpatrols.co.za, 1
 parkujkladne.cz, 1
@@ -111513,6 +111391,7 @@ parleu2017.ee, 1
 parleur.net, 1
 parliament.gov.to, 1
 parliamentcamp.com, 1
+parmacityfutsal.it, 1
 parmartecultura.it, 1
 parmatoday.it, 1
 parmatwp.gov, 1
@@ -112682,7 +112561,6 @@ pelican.ie, 1
 pelicanbaytx.gov, 1
 pelicanconveyancing.co.uk, 1
 pelicanottertailmn.gov, 1
-pelicanparty.games, 1
 pelicans.tk, 1
 peliculaonline.tk, 1
 peliculaslatino.tk, 1
@@ -113143,7 +113021,6 @@ persian-clan.tk, 1
 persianasmodernasluxury.com, 1
 persiandating.tk, 1
 persianmassagetherapy.com, 1
-persianpool.ir, 1
 persianrom.com, 1
 persiart.shop, 1
 persiennexperten.se, 1
@@ -113303,6 +113180,7 @@ petdish.ga, 1
 petdollar.ga, 1
 petech.ro, 1
 petelew.is, 1
+petemerges.com, 1
 petemerges.xyz, 1
 peter-r.co.uk, 1
 peter-rader.pro, 1
@@ -113660,7 +113538,6 @@ pharmasyncers.ga, 1
 pharmasyncest.ga, 1
 pharmatender.cl, 1
 pharmgkb.org, 1
-pharmica.uk, 1
 pharosconsulting.com, 1
 pharosiq.com, 1
 pharside.dyndns.org, 1
@@ -113922,7 +113799,6 @@ photographerforwedding.tk, 1
 photographersdaydream.com, 1
 photography-workshops.net, 1
 photographyandvideo.tk, 1
-photographybyctware.com, 1
 photographybyjamiebrown.com, 1
 photographyforchange.org, 1
 photographyontherun.com, 1
@@ -114194,7 +114070,6 @@ picrew.me, 1
 picsalesers.ga, 1
 picsastock.com, 1
 picshare.nz, 1
-picsnmore.de, 0
 picstar.tk, 1
 picsto.re, 0
 pictominoes.com, 1
@@ -114594,7 +114469,6 @@ piratejeeptours.com, 1
 piraten-basel.ch, 1
 piraten-kleinbasel.ch, 1
 piraten-recording.tk, 1
-pirateparty.org.uk, 1
 piratepay.io, 0
 pirates-comic.com, 1
 piratesbrewcoffee.net, 1
@@ -114734,7 +114608,6 @@ pixelion.tk, 1
 pixelissues.com, 1
 pixelkraft.net, 1
 pixelmania.se, 1
-pixelmateexhibitionltd.hk, 1
 pixelmateexpo.com, 1
 pixelmattic.com, 1
 pixelmedianetwork.com, 1
@@ -114985,6 +114858,8 @@ planisanin.tk, 1
 planiserin.tk, 1
 planisware.academy, 1
 planisware.cn, 1
+planisware.io, 1
+planisware.live, 1
 planisys.net, 1
 planit-inc.com, 1
 planitz.com, 1
@@ -115240,7 +115115,6 @@ please-uwu.me, 1
 pleasesavemypc.com, 1
 pleaseuseansnisupportedbrowser.ml, 1
 pleasure-science.com, 1
-pleasure.box, 1
 pleasured.tk, 1
 pleasureplanetbrothel.com.au, 1
 pleb.cc, 1
@@ -116692,6 +116566,7 @@ poway.gov, 1
 powayiliad.com, 1
 powch-dev.com, 1
 powch-dev2.com, 1
+powdercoatatl.com, 1
 powdercoatingatl.com, 1
 powderedcloud.cf, 1
 powderedcloud.ga, 1
@@ -117465,7 +117340,6 @@ primalsurvivor.net, 1
 primananda.com, 1
 primanota.ch, 0
 primapak.bg, 1
-primariachisineucris.ro, 1
 primarium.info, 1
 primary.health, 1
 primarycareconnect.com.au, 1
@@ -117478,7 +117352,6 @@ prime, 1
 prime-host.ml, 1
 prime-likes.com, 1
 prime-seo.net, 1
-primeauconsultinggroup.com, 1
 primecapsslim.com.br, 1
 primechasedata.com, 1
 primechef.com.mx, 1
@@ -117911,7 +117784,6 @@ productpeo.pl, 1
 products-for-health.tk, 1
 products4more.at, 1
 productsandfeatures.com, 1
-productupdates.org, 1
 produform.it, 1
 produits-dantan.com, 1
 produkt.cf, 1
@@ -118285,7 +118157,7 @@ proofwiki.org, 1
 proon.org, 1
 proos.nl, 1
 prop365.com, 1
-propaganda.love, 0
+propaganda.love, 1
 propagandablog.de, 0
 propagationtools.com, 1
 propanesale.cf, 1
@@ -118528,6 +118400,7 @@ provisionircd.tk, 1
 provlas.se, 1
 provo.gov, 1
 prowebservices.ca, 1
+prowechsel.de, 1
 prowi.se, 1
 prowindow.sk, 1
 prowise.com, 1
@@ -118762,7 +118635,6 @@ psw-group.de, 1
 psw-training.de, 1
 psyart.tk, 1
 psycenter.tk, 1
-psych2go.net, 1
 psychcare.cz, 1
 psychcaremd.com, 1
 psychedelia.com, 1
@@ -119831,7 +119703,6 @@ quaketips.ga, 1
 quakeworld.tk, 1
 qualbe.com, 1
 qualebroker.com, 1
-qualescegliere.it, 1
 qualiacomputers.com, 1
 qualifio.com, 1
 qualishomes.co.uk, 1
@@ -119975,7 +119846,6 @@ qubitsandbytes.co.uk, 1
 qubyte.codes, 1
 quchronicle.com, 1
 qudini.com, 1
-quebec.ca, 1
 quebeccat.com, 1
 quebeccats.com, 1
 quebecdogs.com, 1
@@ -121298,7 +121168,6 @@ raskruti.ga, 1
 raskruti.ml, 1
 raskrutka.cf, 1
 rasmera.ddns.net, 1
-rasmushaslund.com, 1
 rasnyder.com, 1
 rasolutions.it.com, 1
 rasp.moe, 1
@@ -121512,7 +121381,6 @@ rbcosmetici.it, 1
 rbd.events, 1
 rbensch.com, 0
 rbet.tk, 1
-rbfalcon.com, 1
 rbh.co.uk, 1
 rbi-admin.com, 1
 rbi-umbrella.com, 1
@@ -121602,6 +121470,7 @@ rda.run, 1
 rdactive.de, 1
 rdap.ss, 1
 rdb.vote, 1
+rdc-metalworks.com, 1
 rdcdesign.com, 1
 rddjapan.info, 1
 rded.nl, 1
@@ -122700,7 +122569,6 @@ relaxhavefun.com, 1
 relaxmasaz.cz, 1
 relaxpointhyncice.cz, 1
 relaxti.me, 1
-relaxxed.nl, 1
 relaxxxed.com, 1
 relaybox.io, 1
 relaypay.io, 1
@@ -123073,7 +122941,6 @@ repeatresponse.com.au, 1
 repertuarim.com.tr, 1
 repettoshoes.tk, 1
 repin.in.ua, 1
-repinger.com, 1
 repinger.my.id, 1
 repintadoautomotriz.com, 1
 repl.ga, 1
@@ -123176,6 +123043,7 @@ resalerental.com, 1
 resanebartar.tk, 1
 resbi.tk, 1
 resc.la, 1
+rescatec.com, 1
 resch-verlag.com, 1
 rescms-secure.com, 1
 rescuenode.com, 1
@@ -123279,7 +123147,6 @@ resoundpro.ca, 1
 resourceconnect.com, 1
 resourceguruapp.com, 1
 resources.flowfinity.com, 1
-resourcesab.eu, 1
 resourcesmanagementcorp.com, 1
 resourcespace.com, 1
 respawwn.com, 1
@@ -123722,6 +123589,7 @@ rgdoi.net, 1
 rgdt.tk, 1
 rgfundraising.com, 1
 rggraphics.mx, 1
+rgmdtri.ru, 1
 rgnext.com, 1
 rgpd-elearning.com, 1
 rgservice.ml, 1
@@ -125163,6 +125031,7 @@ rosabellas.co.uk, 1
 rosabrasiv.ga, 1
 rosacosmos.tn, 1
 rosaflorbijoux.com.br, 1
+rosakkreditatsiya-forum.ru, 1
 rosalinda.cl, 1
 rosalindturner.co.uk, 1
 rosalopezcortes.tk, 1
@@ -125861,7 +125730,6 @@ ruhrmobil-e.de, 1
 ruhrpott-media.com, 1
 ruhrpott.rodeo, 1
 rui-vet.com, 1
-ruiduntrading.com, 1
 ruihuabao.com.cn, 1
 ruileal.pt, 1
 ruileitao.pt, 1
@@ -125946,7 +125814,6 @@ runeworldforums.tk, 1
 runews.cf, 1
 runfitcoaching.com, 1
 rungie.com, 0
-rungisinternational.com, 1
 rungstedhave.dk, 1
 rungutan.com, 1
 runharbor.com, 1
@@ -126559,7 +126426,7 @@ saf.earth, 1
 safagiza.ml, 1
 safalfasalonline.in, 1
 safar.sk, 1
-safarilaw.com, 0
+safarilaw.com, 1
 safaris-uganda.com, 1
 safarisbonafricatours.com, 1
 safarisop.com, 1
@@ -126982,6 +126849,7 @@ salfordepc.uk, 1
 salfraedingarnir.is, 1
 salge.rocks, 1
 salgueirocarlos.com, 1
+salianmod.ir, 1
 salibandy.tk, 1
 salidaswap.com, 1
 salient-dialers.com, 1
@@ -127065,7 +126933,7 @@ saltcave.gq, 1
 saltedfish.network, 1
 saltedfishes.com, 1
 saltedge.com, 1
-saltedpasta.com, 0
+saltedpasta.com, 1
 saltercane.com, 0
 saltlakecounty.gov, 1
 saltlakehealth.gov, 1
@@ -127424,6 +127292,7 @@ sangoandmiroku.tk, 1
 sangowen.xyz, 1
 sangreytinta.tk, 1
 sanguanini.farm, 1
+sanguinebio.com, 1
 sangwanbeach.tk, 1
 sangyo-rock.com, 1
 sanhotel.ml, 1
@@ -127580,7 +127449,6 @@ santmark.org, 1
 santo.fi, 1
 santodelgiorno.it, 1
 santong.tk, 1
-santons-fouque.fr, 1
 santorinidress.com, 1
 santoscarmelitas.tk, 1
 santosdecordoba.tk, 1
@@ -127945,7 +127813,6 @@ save-me-aachen.de, 1
 save-me-aachen.eu, 1
 save-me-koeln.de, 1
 save-spb.ru, 1
-save.ch, 1
 save.gov, 1
 saveaward.gov, 1
 savebees.org, 1
@@ -128339,7 +128206,6 @@ schella.network, 1
 schellebelle.tk, 1
 schellenberg-web.de, 1
 schellenberg.ac, 1
-schellevis.net, 0
 schenectadycountyny.gov, 1
 schenkel.tk, 1
 schenkes.de, 0
@@ -128577,7 +128443,6 @@ schtiehve.duckdns.org, 1
 schu.be, 1
 schuan.cn, 1
 schubertgmbh-ingelheim.de, 1
-schubertnest.at, 1
 schuelerzeitung-ideenlos.de, 1
 schuermannhof.de, 1
 schuetzenverein-haselbach.de, 1
@@ -129048,7 +128913,6 @@ se.com, 1
 se.gg, 1
 se.search.yahoo.com, 0
 se2.com, 1
-se6.io, 1
 sea-airinternational.tk, 1
 sea-force.com.au, 1
 sea-godzilla.com, 1
@@ -129336,7 +129200,7 @@ sectv.com, 1
 secudoc.nl, 1
 secularweb.org, 1
 secumailer.com, 0
-secumailer.nl, 1
+secumailer.nl, 0
 secundity.com, 1
 secundity.nl, 1
 secunm.org, 1
@@ -129401,6 +129265,7 @@ securist.nl, 1
 securite.jp, 1
 securiteincendie.fr, 1
 securitelandry.com, 1
+securitepubliqueaem.com, 1
 securiti.ai, 1
 securitum.pl, 1
 security-24-7.com, 1
@@ -129415,7 +129280,6 @@ security.gov.uk, 1
 security.pl, 1
 security.xn--q9jyb4c, 1
 securityabstract.com, 1
-securityanalystservices.com, 1
 securityaware.me, 1
 securitybasegroup.com, 1
 securitybrief.asia, 1
@@ -129802,7 +129666,6 @@ semantics.ga, 1
 semaphore-studios.com, 1
 semari.or.id, 1
 sembosihosting.tk, 1
-semboyan35.com, 1
 sembska.de, 1
 sembyotic.com, 1
 semcensurabrag.com.br, 1
@@ -130019,7 +129882,7 @@ seo-analyse.com, 1
 seo-blog12.tk, 1
 seo-dr-it.com, 1
 seo-dvizh.ru, 1
-seo-forum.nu, 0
+seo-forum.nu, 1
 seo-inc.ru, 1
 seo-linz.at, 1
 seo-obmen.tk, 1
@@ -130144,7 +130007,6 @@ seovisits.tk, 1
 seoviziti50.tk, 1
 seowerkz.com, 0
 seowhizone.com, 1
-seowordpress.pl, 1
 seowork.tk, 1
 seozel.tk, 1
 seozen.top, 1
@@ -130205,7 +130067,6 @@ serc.ac.uk, 1
 sercanazizoglu.com, 1
 sercasindustry.tk, 1
 sercoapprenticeships.uk, 1
-serdarakyildiz.com, 1
 serdarwork.com, 1
 serdengolpinar.tk, 1
 serecoponsillo.it, 1
@@ -130432,7 +130293,6 @@ serviciosfncs.com, 1
 servicioskoinonia.org, 1
 serviciosprevisionfuneraria.com, 1
 serviciotecnicoencomputacion.com.ve, 0
-serviciotecnicosantcugat.es, 1
 servier.com, 1
 servietten-grosshandel.at, 1
 servietten-grosshandel.be, 1
@@ -131200,7 +131060,6 @@ sheehyinfinitioftysonsparts.com, 1
 sheekdeveloper.com, 1
 sheelyuu.art, 1
 sheepfriends.com, 1
-sheepproductions.com, 1
 sheeprock.tk, 1
 sheepsound.tk, 1
 sheerchain.com, 1
@@ -131329,7 +131188,6 @@ shiawasedo.co.jp, 1
 shibahara-shika.com, 1
 shibainu.com.br, 1
 shibakery.com, 1
-shibashake.com, 1
 shibayan.jp, 1
 shibbydex.com, 1
 shibeflix.com, 1
@@ -131367,6 +131225,7 @@ shiga1.jp, 1
 shigaben.or.jp, 1
 shiganmartialarts.com, 1
 shiggles.net, 1
+shiggles.org, 1
 shigizemi.com, 1
 shigotoarimasu.com, 1
 shigotoba.com, 1
@@ -131651,6 +131510,7 @@ shopmalinka.cf, 1
 shopmaxilife.com.ph, 1
 shopmontrose.com, 1
 shopnemp.com, 1
+shopofturkey.com, 1
 shoponlinedeals.tk, 1
 shopopop.com, 1
 shoporangetheory.com, 1
@@ -131874,7 +131734,6 @@ shost.ga, 1
 shota-sekkotsuin.com, 1
 shota.pictures, 1
 shotbow.net, 1
-shotcounter.nl, 1
 shotdeck.com, 1
 shotoniphone.ga, 1
 shotsbyferry.nl, 1
@@ -132333,7 +132192,6 @@ sikkasoft.com, 1
 sikkind.com, 0
 siku-shop.ch, 1
 siku.pro, 1
-sil.box, 1
 sil.co.id, 1
 sila.qa, 1
 silagra.ml, 1
@@ -133033,6 +132891,7 @@ sisqo.tk, 1
 sisseastumine.ee, 1
 sissyroulette.com, 1
 sisteltestserver.com, 1
+sistem-maklumat.com, 1
 sistem-maklumat.com.my, 1
 sistema-trenirovok.ml, 1
 sistema20k.tk, 1
@@ -133225,7 +133084,6 @@ sk-ii.com, 1
 sk.tl, 1
 sk4y.net, 1
 skaala.com, 1
-skaalen.com, 1
 skaapkraalonline.co.za, 1
 skabour.co.uk, 1
 skachat-programmylini.ga, 1
@@ -133532,7 +133390,6 @@ skux.ch, 1
 skvele-cesko.cz, 1
 skvelecesko.cz, 1
 skvot.de, 1
-skvot.io, 1
 skwile-cafe.com, 1
 skwlkrs.com, 1
 sky-aroma.com, 1
@@ -134125,7 +133982,6 @@ smartfaktor.pl, 1
 smartfire.pt, 1
 smartfirm.com.au, 1
 smartfit.cz, 1
-smartfixmarburg.de, 1
 smartfons.tk, 1
 smartfreedomstrategies.com, 1
 smartfridge-ai.com, 1
@@ -134342,7 +134198,6 @@ smithf.red, 1
 smithikakart.in, 1
 smithmont.com, 1
 smithmountainlake.com, 1
-smithrobertsonpromotions.com, 1
 smithsonian.gov, 1
 smithsstational-fpd.gov, 1
 smithsstational.gov, 1
@@ -135767,6 +135622,7 @@ southpeacearchives.org, 1
 southphoenixair.tk, 1
 southportland.gov, 1
 southridgeservices.com, 1
+southrock.com, 1
 southsands.com, 1
 southshoreautowash.com, 1
 southside-crew.com, 1
@@ -137240,7 +137096,6 @@ stail.eu, 1
 stainfilm.com, 0
 stainhaufen.de, 1
 stainless-steel-cookware.tk, 1
-stainlessgames.com, 1
 stainternational.com, 1
 stairlin.com, 0
 stairmaster.fr, 1
@@ -137298,7 +137153,6 @@ stamppadinks.com, 1
 stamurai.com, 1
 stan.store, 1
 stanandjerre.org, 1
-stanard.com, 1
 stanbeukers.com, 1
 stancer.com, 1
 stanchierifamilylaw.com, 1
@@ -137770,7 +137624,7 @@ steelnavi.jp, 1
 steeloncall.com, 1
 steelpoint.com.pl, 1
 steelsheds.biz, 1
-steelstructuresltd.com, 1
+steelsoldiers.com, 1
 steelvortex.tk, 1
 steelzone.tk, 1
 steemit.com, 1
@@ -138259,6 +138113,7 @@ stlouisparkmn.gov, 1
 stlouisstabilizing.com, 1
 stlpassports.com, 1
 stlpoolattendants.com, 1
+stltacticals.com, 1
 stlu.de, 1
 stlucieclerk.gov, 1
 stluciesheriff.gov, 1
@@ -138473,7 +138328,6 @@ storage-books.gq, 1
 storageideas.uk, 1
 storageioblog.com, 1
 storagenewsletter.com, 1
-storageshedsnc.com, 1
 storagex.co.uk, 1
 storck.com, 1
 stordbatlag.no, 1
@@ -139321,7 +139175,6 @@ sublettecountywy.gov, 1
 sublimacaoshop.com.br, 1
 sublimated.tk, 1
 sublimationsouthafrica.com, 1
-sublimesurface.fr, 1
 sublimigeek.fr, 1
 subliminalrecorder.com, 1
 submeet.vet, 1
@@ -140049,7 +139902,6 @@ supportrelatecare.org, 1
 supportsave.com, 1
 supportyourapp.com, 1
 suppos-net.tk, 1
-supra-forge.com, 1
 supra.tf, 1
 supracube.com, 1
 supraelco.com, 1
@@ -140401,7 +140253,6 @@ svseglobal.com, 1
 svsewerut.gov, 1
 svsg.co, 1
 svswebmarketing.com, 1
-svtemplemn.org, 1
 svtl.ch, 1
 svtr.de, 1
 svtv.org, 1
@@ -140840,7 +140691,6 @@ syncspace.live, 1
 synctera.com, 1
 synder.com, 1
 synderapp.com, 1
-syndicats.de, 1
 syndigo.com, 1
 syndika.co, 1
 syndikalismus-im-laendle.tk, 1
@@ -140909,6 +140759,7 @@ syrianair.cf, 1
 syrianair.ga, 1
 syrianair.ml, 1
 syrianet.cf, 1
+syrianskaif.com, 1
 syrius.tk, 1
 syronex.com, 1
 syrover.ru, 1
@@ -141286,7 +141137,6 @@ taconic.com, 1
 tacoroumen.nl, 1
 tacotown.tk, 1
 tacti.cc, 1
-tactical.zone, 1
 tacticalavocado.com, 1
 tacticalsquare.com, 1
 tacticalvote.co.uk, 1
@@ -141615,6 +141465,7 @@ tama.ga, 1
 tamagotchicenter.com, 1
 tamalcloud.com, 1
 tamamlayici.com.tr, 1
+tamamlayicisagliksigortasi.com.tr, 1
 tamanlapanganindah.com, 1
 tamaoka-eyeclinic.com, 1
 tamarac.gov, 1
@@ -142193,7 +142044,6 @@ tb.org.tw, 1
 tbahn.de, 1
 tbassistant.xyz, 1
 tbatr.tk, 1
-tbbank.gov.tm, 1
 tbcinteriorismo.com, 1
 tbcloud.site, 0
 tbejos.com, 1
@@ -142452,7 +142302,7 @@ teampadu.com, 1
 teampages.com, 1
 teampassword.com, 1
 teampatat.nl, 1
-teamphotonetwork.com, 1
+teamphotonetwork.com, 0
 teampoison.tk, 1
 teampz.com, 1
 teamr3set.com, 1
@@ -143079,7 +142929,6 @@ tehplace.club, 1
 tehpod.com.ua, 1
 tehrabbitt.com, 0
 tehrankey.ir, 1
-tehranservicekaran.com, 1
 teia.art, 1
 teichroeb.net, 1
 teier.eu, 1
@@ -143274,7 +143123,6 @@ telework.gov, 1
 teleworkouts.com, 1
 telexit.de, 1
 telexsus.com, 1
-teleyal.blog, 1
 telezon.ru, 1
 telfaircountyga.gov, 1
 telfas.de, 1
@@ -143324,7 +143172,6 @@ temirgaliev.tk, 1
 temis.nl, 1
 temizim.com, 1
 temizlik.ml, 1
-temizmama.com, 1
 teml.in, 1
 temnacepel.cz, 1
 temnikova.tk, 1
@@ -143629,6 +143476,7 @@ terremetisagency.com, 1
 terremoto.com.br, 1
 terrenal.tk, 1
 terrenasparadise.com, 1
+terrenosparainvertir.com, 1
 terres-et-territoires.com, 1
 terresmagiques.com, 0
 terrimcaleerphotography.com, 1
@@ -143887,6 +143735,7 @@ textiles.bg, 1
 textiles.tk, 1
 textilstore.de, 1
 textlinktausch.tk, 1
+textme26.site, 1
 textonly.email, 1
 textpages.tk, 1
 textpattern.com, 1
@@ -144141,7 +143990,6 @@ the5th.nl, 1
 the7eye.org.il, 1
 the8rules.co.uk, 1
 thea-team.net, 1
-theacademicpapers.co.uk, 1
 theacc.com, 1
 theaccountant-online.com, 1
 theaccountingcompanyleeds.co.uk, 1
@@ -144410,6 +144258,7 @@ thechatlinenumbers.com, 1
 thechavs.xyz, 1
 thecheapairlinetickets.com, 1
 thecheat.tk, 1
+thecheese.co.nz, 1
 thechels.uk, 1
 thechelseadrugstore.ie, 1
 thechemistryisdead.tk, 1
@@ -144892,7 +144741,6 @@ thelegionshirley.co.uk, 1
 thelematics.com, 1
 thelemonlawcalifornia.com, 0
 thelencystore.com, 1
-thelevelman.com, 1
 thelevelsfinancial.co.uk, 1
 thelewispartnership.co.uk, 1
 thelibertinephilosophy.ga, 1
@@ -145189,7 +145037,6 @@ thepokerbank.com, 1
 thepokerforum.com, 1
 thepokerpeople.com, 1
 thepoliticsofpesticides.com, 1
-thepollitochicken.com, 1
 thepool.tk, 1
 thepopcornfactory.com, 1
 theportalbroker.com, 1
@@ -145604,7 +145451,6 @@ thewellbeingarchitect.ie, 1
 thewellblog.com, 1
 thewest.tk, 1
 thewhiteboxxx.com, 1
-thewhitedog9487.xyz, 1
 thewhitehorses.tk, 1
 thewhiterabbit.space, 1
 thewhitneypaige.com, 1
@@ -145885,6 +145731,7 @@ thors-hearth.tk, 1
 thorsteinsson.com, 1
 thorsten-schaefer.com, 1
 thorstenschaefer.name, 1
+those.jp, 1
 thost3.de, 1
 thotcomputed.com, 1
 thots.org, 1
@@ -146612,7 +146459,6 @@ tinmarin.org, 1
 tinmouthvt.gov, 1
 tinneke.tk, 1
 tinnhanhvietnam.tk, 1
-tinnitus.tirol, 1
 tino-dtb.de, 1
 tinselandtwigllc.com, 1
 tint.edu.in, 1
@@ -147491,7 +147337,6 @@ toobug.net, 0
 tooelecity.gov, 1
 tooeleco.gov, 1
 tooelecountyvotes.gov, 1
-toofab.com, 1
 toohka.org, 1
 tooij.com, 1
 tookan.tech, 1
@@ -149094,7 +148939,6 @@ travelgirlsclub.com, 1
 travelglamour.ga, 1
 travelgratis.ga, 1
 travelhands.ga, 1
-travelholicworld.com, 1
 travelhunter.nl, 1
 travelhusky.ga, 1
 traveling-thailand.info, 1
@@ -149227,7 +149071,6 @@ treasureboxgreetings.com, 1
 treasureboxhomes.org, 1
 treasurecoastconnector.com, 1
 treasureislandbeads.ga, 1
-treasuremountainmining.com, 1
 treasuretrooperguide.tk, 1
 treasury.gov.lk, 1
 treasurydirect.gov, 1
@@ -149687,8 +149530,6 @@ tronnews.news, 1
 tronnews.xyz, 1
 tronox.com, 1
 troomcafe.com, 1
-troonnorthgolf.com, 0
-troopaid.info, 1
 troopers.de, 1
 trootech.com, 1
 trophcomplewin.ml, 1
@@ -150583,7 +150424,6 @@ tusconsultorex.com, 1
 tusdtapi.com, 1
 tusharwalaskar.com, 1
 tusi.co, 1
-tusic.net, 1
 tuslamparasonline.com, 1
 tusmedicamentos.com, 1
 tusociofinanciero.com, 1
@@ -150843,6 +150683,7 @@ twistapp.com, 1
 twistbets.com, 1
 twistedfamilies.com, 1
 twistedoakonline.com, 1
+twistedservers.com.au, 1
 twistedtea.com, 1
 twistedwave.com, 1
 twistersolutions.com, 1
@@ -150862,7 +150703,6 @@ twitchy.tk, 1
 twitcker.com, 1
 twittelzie.nl, 1
 twitter.ax, 1
-twitter.com, 1
 twitterdriver.io, 1
 twittpr.com, 1
 twizzle.net, 1
@@ -151983,7 +151823,6 @@ unis-pour-la-planete.com, 1
 unis-pour-le-climat.com, 1
 uniselectweb.com, 1
 uniserve.com, 1
-unisnu.ac.id, 1
 unison-d.com, 1
 unisonglobal.com, 1
 unisontech.org, 1
@@ -152343,7 +152182,6 @@ upguard.org, 1
 upguardinc.com, 1
 uphabit.io, 1
 uphold-15-party.com, 1
-upholsterycleanerslondon.co.uk, 1
 upholsterydesign.com.au, 1
 uphost.be, 1
 uphshrine.net, 1
@@ -152912,7 +152750,6 @@ utilityapi.com, 1
 utko12.ru, 1
 utleg.gov, 1
 utloperadora.com.br, 1
-utobo.com, 1
 utodyg.ga, 1
 utonia.ch, 1
 utop.io, 1
@@ -153268,7 +153105,6 @@ valeriansaliou.name, 1
 valeriapanarina.com, 0
 valerieadolff.com, 0
 valerielittlewood.uk, 1
-valeriya.life, 1
 valeriymaleev.com, 1
 valeryvenom.net, 1
 valescarodrigues.com.br, 1
@@ -153548,7 +153384,6 @@ vanyavpn.cz, 1
 vanyavpn.ec, 1
 vanyavpn.gd, 1
 vanyavpn.gg, 1
-vanyavpn.gl, 1
 vanyavpn.gs, 1
 vanyavpn.hn, 1
 vanyavpn.im, 1
@@ -153556,7 +153391,6 @@ vanyavpn.in, 1
 vanyavpn.io, 1
 vanyavpn.net, 1
 vanyavpn.org, 1
-vanyavpn.ru, 1
 vaoig.gov, 1
 vapebarstore.com, 1
 vapebarstore.hu, 1
@@ -153675,6 +153509,7 @@ vatadezahar.com, 1
 vatav.eu, 1
 vatav.tk, 1
 vatazhok.com, 1
+vatc.org, 1
 vatcompliance.com, 1
 vates.tech, 1
 vatikantour.tk, 1
@@ -153716,6 +153551,7 @@ vayaprecio.es, 1
 vayavotarcolorado.gov, 1
 vaygren.com, 1
 vazdemelloconsultoria.com.br, 1
+vazon.pp.ua, 1
 vb-barbara-beck.de, 1
 vb.com.br, 1
 vbanu.com.ua, 1
@@ -154077,7 +153913,6 @@ venstar.com, 1
 ventajasdesventajas.com, 1
 ventana.kz, 1
 ventanillaproveedorespit.com, 1
-ventanita.com.ar, 1
 ventasdeseguridad.com, 1
 ventasreit.com, 1
 ventassantillan.com, 1
@@ -154990,7 +154825,6 @@ vilans.nl, 1
 vilantice.cz, 1
 vilaonze.com.br, 1
 vilasantina.com.br, 1
-vilavilma.si, 1
 vilavyhlidka.cz, 1
 vilawatt.cat, 1
 vilaydin.com, 1
@@ -155123,7 +154957,6 @@ villasintrabali.com, 1
 villasupport.it, 1
 villaumbrales.tk, 1
 villavaltava.fi, 1
-villaville.com, 1
 villawirz.it, 1
 ville-gennevilliers.fr, 1
 ville-ideale.fr, 1
@@ -155739,7 +155572,6 @@ vivaio.roma.it, 1
 vivaiocolombo.com, 1
 vivalacloud.ru, 1
 vivalajack.de, 1
-vivalakidsworld.com, 1
 vivaldi.club, 1
 vivaldi.com, 1
 vivaldi.net, 1
@@ -155958,7 +155790,6 @@ vliegendklokske.com, 1
 vliegherrie.nl, 1
 vlijmscherrup.tk, 1
 vlike.ml, 1
-vlndc.org, 1
 vloeck.de, 1
 vloggerfaire.com, 1
 vloggerspace.tk, 1
@@ -156291,6 +156122,7 @@ voltmalta.org, 1
 voltnederland.org, 1
 voltnorway.org, 1
 voltoesterreich.org, 1
+voltpoland.org, 1
 voltpolska.org, 1
 voltportugal.org, 1
 voltromania.org, 1
@@ -157359,7 +157191,6 @@ wallofclocks.com, 1
 wallowacounty.gov, 1
 wallpaperstreet.tk, 1
 wallpaperswide.com, 1
-wallpapertag.com, 1
 walls.io, 0
 wallsauce.com, 1
 wallsbreaker.top, 1
@@ -157594,7 +157425,6 @@ warrinainnisfail.com.au, 1
 warringtonkidsbouncycastles.co.uk, 1
 warringtonsownbuses.co.uk, 1
 warriorofmars.com, 1
-warrnamboolaero.club, 1
 warrock-es.tk, 1
 warrs.com, 1
 wars.aw, 1
@@ -157860,7 +157690,6 @@ waxlrs.com, 1
 way.ac, 1
 way2tech.de, 1
 wayaberolodge.com, 1
-wayakcomm.com, 1
 waybinary.com, 1
 waycoolmail.tk, 1
 waycraze.com, 1
@@ -158279,6 +158108,7 @@ webemployed.com, 1
 webencrypt.org, 1
 webengage.com, 1
 webepc.it, 1
+weber-immobilienberatung.de, 1
 weber.com, 1
 weber911.gov, 1
 webera.lt, 1
@@ -158943,7 +158773,6 @@ weosx.com, 1
 wep.pw, 1
 wepa.pe, 1
 wepaempowercenter.org, 1
-wepay.com, 1
 wepbiz.com, 1
 weplan-app.com, 1
 weplananalytics.com, 1
@@ -159448,7 +159277,6 @@ whitechristmas.com.au, 1
 whitecollar.net, 1
 whitecollarfraud.com, 1
 whitecreekny.gov, 1
-whitedragonmartialarts.org, 1
 whitefieldnhpd.gov, 1
 whitefishtownshipmi.gov, 1
 whitefordtownshipmi.gov, 1
@@ -159802,7 +159630,6 @@ wikimediacommons.jp.net, 1
 wikimediacommons.mobi, 1
 wikimediacommons.net, 1
 wikimediacommons.org, 1
-wikimediaendowment.org, 1
 wikimediaenterprise.com, 1
 wikimediafoundation.com, 1
 wikimediafoundation.info, 1
@@ -160647,7 +160474,7 @@ woh.org, 0
 woheni.de, 1
 wohlgefuehl-massagen.de, 1
 wohlpa.de, 0
-wohnbau-mobilitaet.ch, 1
+wohnbau-mobilitaet.ch, 0
 wohnberatung-wien.at, 1
 wohnsitz-ausland.com, 1
 wohnungsaufloesung-berlin.net, 1
@@ -161253,6 +161080,7 @@ wowlegacy.ml, 1
 wowlifedesignandco.jp, 1
 wowlove.tk, 1
 wownskportal.tk, 1
+wowowow.com, 1
 wowpilates.com, 1
 wowra.net.pl, 1
 wows-mods.tk, 1
@@ -161591,7 +161419,6 @@ wurstbrot.cf, 1
 wurstmineberg.de, 1
 wurzelchaos.de, 1
 wurzelkanal.de, 1
-wushka.com.au, 1
 wusu.tk, 1
 wuxian.ml, 0
 wuya.eu.org, 1
@@ -161749,10 +161576,10 @@ www.tiaa.org, 1
 www.tl, 1
 www.torproject.org, 0
 www.tumblr.com, 0
+www.twitter.com, 1
 www.united.com, 1
 www.usaa.com, 0
 www.vino.com, 0
-www.wepay.com, 1
 www.wordpress.com, 0
 www.zdnet.com, 1
 www68277.com, 1
@@ -162000,7 +161827,6 @@ xb8861.com, 1
 xb9009.com, 1
 xb906.com, 1
 xb913.com, 1
-xb925.com, 0
 xb937.com, 1
 xb957.com, 0
 xb961.com, 1
@@ -162010,7 +161836,6 @@ xb972.com, 1
 xb980.com, 1
 xb982.com, 1
 xbanner.tk, 1
-xbb.hk, 1
 xbb.li, 1
 xbc.nz, 1
 xbdm.fun, 1
@@ -162163,7 +161988,6 @@ xevietanh.com, 1
 xevnet.com, 1
 xevolkswagen.com, 1
 xexpert.ro, 1
-xfair.com, 0
 xfantasy.su, 1
 xfcy.me, 1
 xfd3.de, 1
@@ -162179,11 +162003,11 @@ xg9gbbbr.nsupdate.info, 1
 xgadget.de, 1
 xgameshst.com, 1
 xgclan.com, 1
+xgeni.us, 1
 xgn.es, 1
 xgp.pl, 1
 xgpu.deals, 1
 xgzepto.cn, 1
-xh-ws.com, 1
 xh.ax, 1
 xhamiadituria.com, 1
 xhamster.com, 1
@@ -163102,7 +162926,6 @@ xnopyt.info, 1
 xntrik.wtf, 1
 xnu.kr, 1
 xnxxporns.com, 1
-xo.wtf, 1
 xoan.cf, 1
 xobot.su, 1
 xobotun.com, 1
@@ -163174,6 +162997,7 @@ xpsauto.com, 1
 xpsautomation.com, 1
 xpsfactory.com, 1
 xpsinnovation.com, 1
+xpsnow.net, 1
 xpsrobotics.com, 1
 xptrack.com, 1
 xptrackstaging.com, 1
@@ -163226,6 +163050,7 @@ xsz.jp, 1
 xt.om, 1
 xt177.com, 1
 xt71uc.top, 1
+xtaboo3d.com, 1
 xtarget.ru, 1
 xtec.eu.org, 1
 xtechtecnologia.tec.br, 1
@@ -164591,7 +164416,6 @@ youtubekids.com, 1
 youtubelet.com, 1
 youtuberis.lt, 1
 youtuberus.tk, 1
-youwebcams.org, 1
 youwillnever.be, 1
 youyuan.rocks, 1
 youyuandesign.top, 1
@@ -165126,7 +164950,6 @@ zaloghaz.ro, 1
 zalohovaniburian.cz, 1
 zalow.com, 1
 zaltv.com, 1
-zalvus.com, 1
 zam0th.tk, 1
 zamadaftar.com, 1
 zamalektoday.com, 1
@@ -166072,7 +165895,6 @@ zocode.tk, 1
 zocoxx.com, 1
 zode.co, 1
 zodee.com.au, 1
-zodgame.xyz, 1
 zodiacohouses.com, 1
 zodiaconline.com, 1
 zodiak.tk, 1
diff --git a/security/manager/tools/log_list.json b/security/manager/tools/log_list.json
index 6beda476b59bd..d9154dc269c55 100644
--- a/security/manager/tools/log_list.json
+++ b/security/manager/tools/log_list.json
@@ -1,6 +1,6 @@
 {
-  "version": "82.2",
-  "log_list_timestamp": "2026-01-25T12:54:32Z",
+  "version": "82.5",
+  "log_list_timestamp": "2026-01-28T12:53:32Z",
   "operators": [
     {
       "name": "Google",

From 726344b075e2b181119d4564e031b2d5001ef05e Mon Sep 17 00:00:00 2001
From: Cristina Horotan <chorotan@mozilla.com>
Date: Thu, 29 Jan 2026 18:18:44 +0200
Subject: [PATCH 090/116] Revert "Bug 2010993 - Update Android Test
 Expectations r=ohall,geckoview-reviewers,translations-reviewers" for causing
 bc failures on browser_preferences_usage.js

This reverts commit fe1114298a60fe0011a845964c5f66af6f5ab33b.

Revert "Bug 2010993 - Add TranslationsFeature Telemetry r=translations-reviewers,gregtatum"

This reverts commit 45bd6451cfeccaba8b10308445fa26aa8d113696.

Revert "Bug 2010993 - Make FullPage Translations react to feature enabledness r=translations-reviewers,gregtatum"

This reverts commit 1288d8c4183d101073ba695fe17f7f4cb055b202.

Revert "Bug 2010993 - Rework StatePerTopChromeWindow to StatePerTab r=translations-reviewers,gregtatum"

This reverts commit cceadb3a8154ecfccc27999891d42767c4a5d170.

Revert "Bug 2010993 - Make AppMenu react to Translations feature enabledness r=translations-reviewers,gregtatum"

This reverts commit 63d9a87bfefcdc3fbc907f1982a1364ff28e7bf0.

Revert "Bug 2010993 - Make SelectTranslations react to feature enabledness r=translations-reviewers,gregtatum"

This reverts commit accc09b6ed8362ea0a23090532f4b5e7ea60e9b0.

Revert "Bug 2010993 - Make Translate QuickAction react to feature enabledness r=daleharvey,translations-reviewers,urlbar-reviewers,gregtatum,mak"

This reverts commit e97e9bb23240d0b0c2359119f7c19cacc1bc5d3c.

Revert "Bug 2010993 - Make about:translations react to feature enabledness r=translations-reviewers,gregtatum"

This reverts commit f78f5e861274bd8617c2ea4199ccb2e53a4cbe00.

Revert "Bug 2010993 - Ensure TranslationsEngine is destroyed when disabling Translations r=translations-reviewers,gregtatum"

This reverts commit 97239f8ed9c38963deae816f3a7c19fd1b926595.
---
 browser/base/content/browser-init.js          |  50 --
 browser/base/content/browser.js               |  18 +-
 browser/base/content/browser.js.globals       |   1 +
 browser/base/content/nsContextMenu.sys.mjs    |   4 +-
 .../content/fullPageTranslationsPanel.js      |  28 +-
 .../tests/browser/browser_full.toml           |  10 -
 .../tests/browser/browser_select.toml         |   2 -
 ...nslations_full_page_ai_feature_app_menu.js | 142 -----
 ...ons_full_page_ai_feature_auto_translate.js | 176 ------
 ...ns_full_page_ai_feature_mid_translation.js | 381 -----------
 ...lations_full_page_ai_feature_navigation.js | 159 -----
 ...ions_full_page_ai_feature_urlbar_button.js | 302 ---------
 .../browser_translations_select_ai_feature.js | 119 ----
 .../translations/tests/browser/head.js        |  67 +-
 .../urlbar/QuickActionsLoaderDefault.sys.mjs  |   9 +-
 .../browser/browser_quickactions_translate.js | 135 ----
 .../geckoview/test/TranslationsTest.kt        |  30 +-
 .../translations/TranslationsFeature.sys.mjs  |  33 +-
 .../TranslationsTelemetry.sys.mjs             |  21 -
 .../translations/TranslationsUtils.mjs        |  18 +-
 .../actors/AboutTranslationsChild.sys.mjs     |  21 +-
 .../actors/AboutTranslationsParent.sys.mjs    |  34 +-
 .../actors/TranslationsChild.sys.mjs          |   4 -
 .../actors/TranslationsParent.sys.mjs         | 593 ++++++------------
 .../content/about-translations.mjs            | 171 +----
 .../content/translations-engine.sys.mjs       |  58 +-
 toolkit/components/translations/metrics.yaml  |  43 --
 .../browser_about_translations_enabling.js    | 168 ++---
 .../browser_translations_ai_feature.js        |  40 +-
 .../translations/tests/browser/shared-head.js |  18 +-
 toolkit/modules/ActorManagerParent.sys.mjs    |   7 +-
 31 files changed, 337 insertions(+), 2525 deletions(-)
 delete mode 100644 browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_app_menu.js
 delete mode 100644 browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_auto_translate.js
 delete mode 100644 browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_mid_translation.js
 delete mode 100644 browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_navigation.js
 delete mode 100644 browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_urlbar_button.js
 delete mode 100644 browser/components/translations/tests/browser/browser_translations_select_ai_feature.js

diff --git a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js
index 51f6ad46d0478..f02d7241e71d6 100644
--- a/browser/base/content/browser-init.js
+++ b/browser/base/content/browser-init.js
@@ -20,39 +20,6 @@ var gBrowserInit = {
   _firstContentWindowPaintDeferred: Promise.withResolvers(),
   idleTasksFinished: Promise.withResolvers(),
 
-  /**
-   * Handles considerations when the enabled state of the Translations feature
-   * changes during runtime, such as being blocked or re-enabled in the AI Settings.
-   */
-  _translationsEnabledStateObserver: {
-    observe(_subject, topic, data) {
-      if (topic !== "translations:enabled-state-changed") {
-        console.warn(`received unexpected topic: ${topic}`);
-        return;
-      }
-
-      // Ensures that the Application Menu correctly includes or omits the translate-page menu item.
-      XULBrowserWindow._updateElementsForContentType();
-
-      if (data === "enabled") {
-        // When the feature is re-enabled, ensure that actor instances exist for all tabs.
-        // This loop is synchronous, but should be lightweight to instantiate only the actor objects.
-        // Any expensive work is scheduled asynchronously to the event loop by the actor itself after construction.
-        for (const tab of gBrowser.tabs) {
-          try {
-            // Ensure that a Translations actor instance is (re)created for each open tab that is allowed to have one.
-            tab.linkedBrowser?.browsingContext?.currentWindowGlobal?.getActor(
-              "Translations"
-            );
-          } catch {
-            // Not every tab is allowed to have a Translations actor, which is okay.
-            // See ActorManagerParent for the official allow list of URLs.
-          }
-        }
-      }
-    },
-  },
-
   _setupFirstContentWindowPaintPromise() {
     let lastTransactionId = window.windowUtils.lastTransactionId;
     let layerTreeListener = () => {
@@ -249,14 +216,6 @@ var gBrowserInit = {
       "TranslationsParent:OfferTranslation",
       FullPageTranslationsPanel
     );
-    gBrowser.tabContainer.addEventListener("TabSelect", () => {
-      // This ensures that the Translations URL-bar button becomes hidden when
-      // the feature becomes disabled, even when switching from tabs such as
-      // about:newtab that do not have an actor instance available to them.
-      if (!TranslationsParent.AIFeature.isEnabled) {
-        FullPageTranslationsPanel.buttonElements.button.hidden = true;
-      }
-    });
     gBrowser.addTabsProgressListener(FullPageTranslationsPanel);
 
     window.addEventListener("AppCommand", HandleAppCommandEvent, true);
@@ -460,11 +419,6 @@ var gBrowserInit = {
     Services.obs.addObserver(gXPInstallObserver, "addon-install-confirmation");
     Services.obs.addObserver(gKeywordURIFixup, "keyword-uri-fixup");
     Services.obs.addObserver(gLocaleChangeObserver, "intl:app-locales-changed");
-    TranslationsParent.ensurePrefObservers();
-    Services.obs.addObserver(
-      this._translationsEnabledStateObserver,
-      "translations:enabled-state-changed"
-    );
 
     BrowserOffline.init();
 
@@ -1209,10 +1163,6 @@ var gBrowserInit = {
         gLocaleChangeObserver,
         "intl:app-locales-changed"
       );
-      Services.obs.removeObserver(
-        this._translationsEnabledStateObserver,
-        "translations:enabled-state-changed"
-      );
 
       BrowserOffline.uninit();
       PanelUI.uninit();
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index baaf142459118..4cf700009937c 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -604,6 +604,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
   }
 );
 
+XPCOMUtils.defineLazyPreferenceGetter(
+  this,
+  "gTranslationsEnabled",
+  "browser.translations.enable",
+  false
+);
+
 XPCOMUtils.defineLazyPreferenceGetter(
   this,
   "gUseFeltPrivacyUI",
@@ -2371,11 +2378,12 @@ var XULBrowserWindow = {
     } else {
       this._menuItemForTranslations.removeAttribute("disabled");
     }
-    if (
-      TranslationsParent.AIFeature.isEnabled &&
-      TranslationsParent.getIsTranslationsEngineSupported()
-    ) {
-      this._menuItemForTranslations.removeAttribute("hidden");
+    if (gTranslationsEnabled) {
+      if (TranslationsParent.getIsTranslationsEngineSupported()) {
+        this._menuItemForTranslations.removeAttribute("hidden");
+      } else {
+        this._menuItemForTranslations.setAttribute("hidden", "true");
+      }
     } else {
       this._menuItemForTranslations.setAttribute("hidden", "true");
     }
diff --git a/browser/base/content/browser.js.globals b/browser/base/content/browser.js.globals
index adf7005531cb4..8e8ebc111c633 100644
--- a/browser/base/content/browser.js.globals
+++ b/browser/base/content/browser.js.globals
@@ -228,6 +228,7 @@
   "gAddonAbuseReportEnabled",
   "gMiddleClickNewTabUsesPasteboard",
   "gPrintEnabled",
+  "gTranslationsEnabled",
   "gUseFeltPrivacyUI",
   "gReduceMotion",
   "gFindBar",
diff --git a/browser/base/content/nsContextMenu.sys.mjs b/browser/base/content/nsContextMenu.sys.mjs
index 45712b1fc01c6..1bc46140ca1cf 100644
--- a/browser/base/content/nsContextMenu.sys.mjs
+++ b/browser/base/content/nsContextMenu.sys.mjs
@@ -2708,7 +2708,9 @@ export class nsContextMenu {
     const translateSelectionItem = this.document.getElementById(
       "context-translate-selection"
     );
-    const translationsEnabled = lazy.TranslationsParent.AIFeature.isEnabled;
+    const translationsEnabled = Services.prefs.getBoolPref(
+      "browser.translations.enable"
+    );
     const selectTranslationsEnabled = Services.prefs.getBoolPref(
       "browser.translations.select.enable"
     );
diff --git a/browser/components/translations/content/fullPageTranslationsPanel.js b/browser/components/translations/content/fullPageTranslationsPanel.js
index 1107e99571b1b..ab8c30923722c 100644
--- a/browser/components/translations/content/fullPageTranslationsPanel.js
+++ b/browser/components/translations/content/fullPageTranslationsPanel.js
@@ -1418,19 +1418,9 @@ var FullPageTranslationsPanel = new (class {
    * @param {tabbrowser} browser
    */
   onLocationChange(browser) {
-    if (browser !== gBrowser.selectedBrowser) {
-      // If the given browser is not for the active tab, we should not process it right now.
-      // Its state will be processed accordingly whenever that tab becomes active.
-      return;
-    }
-
     if (browser.currentURI.spec.startsWith("about:reader")) {
       // Hide the translations button when entering reader mode.
       this.buttonElements.button.hidden = true;
-    } else if (!TranslationsParent.AIFeature.isEnabled) {
-      // When the Translations feature is disabled, no actor instance is created, therefore no
-      // event will be dispatched to update button visibility. We need to handle it here instead.
-      this.buttonElements.button.hidden = true;
     }
   }
 
@@ -1581,17 +1571,15 @@ var FullPageTranslationsPanel = new (class {
         }
 
         if (
-          // Only show the button if the Translations feature is enabled.
-          TranslationsParent.AIFeature.isEnabled &&
           // We've already requested to translate this page, so always show the icon.
-          (requestedLanguagePair ||
-            // There was an error translating, so always show the icon. This can happen
-            // when a user manually invokes the translation and we wouldn't normally show
-            // the icon.
-            error ||
-            // Finally check that we can translate this language.
-            (hasSupportedLanguage &&
-              TranslationsParent.getIsTranslationsEngineSupported()))
+          requestedLanguagePair ||
+          // There was an error translating, so always show the icon. This can happen
+          // when a user manually invokes the translation and we wouldn't normally show
+          // the icon.
+          error ||
+          // Finally check that we can translate this language.
+          (hasSupportedLanguage &&
+            TranslationsParent.getIsTranslationsEngineSupported())
         ) {
           // Keep track if the button was originally hidden, because it will be shown now.
           const wasButtonHidden = button.hidden;
diff --git a/browser/components/translations/tests/browser/browser_full.toml b/browser/components/translations/tests/browser/browser_full.toml
index fe4b36c0dc7b1..ec84239d13066 100644
--- a/browser/components/translations/tests/browser/browser_full.toml
+++ b/browser/components/translations/tests/browser/browser_full.toml
@@ -6,16 +6,6 @@ support-files = [
   "!/toolkit/components/translations/tests/browser/translations-test.mjs",
 ]
 
-["browser_translations_full_page_ai_feature_app_menu.js"]
-
-["browser_translations_full_page_ai_feature_auto_translate.js"]
-
-["browser_translations_full_page_ai_feature_mid_translation.js"]
-
-["browser_translations_full_page_ai_feature_navigation.js"]
-
-["browser_translations_full_page_ai_feature_urlbar_button.js"]
-
 ["browser_translations_full_page_intersection_content_eager.js"]
 
 ["browser_translations_full_page_intersection_find_bar.js"]
diff --git a/browser/components/translations/tests/browser/browser_select.toml b/browser/components/translations/tests/browser/browser_select.toml
index 1bd6fe7058ac2..a76ea3e2a760d 100644
--- a/browser/components/translations/tests/browser/browser_select.toml
+++ b/browser/components/translations/tests/browser/browser_select.toml
@@ -6,8 +6,6 @@ support-files = [
   "!/toolkit/components/translations/tests/browser/translations-test.mjs",
 ]
 
-["browser_translations_select_ai_feature.js"]
-
 ["browser_translations_select_context_menu_engine_unsupported.js"]
 
 ["browser_translations_select_context_menu_feature_disabled.js"]
diff --git a/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_app_menu.js b/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_app_menu.js
deleted file mode 100644
index ec929d4cefaa9..0000000000000
--- a/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_app_menu.js
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   https://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-/**
- * This test case ensures that the Application Menu Translate item responds to the
- * Translations feature becoming enabled, and then disabled again.
- */
-add_task(async function test_app_menu_ai_feature_toggle_from_disabled() {
-  const { cleanup, runInPage } = await loadTestPage({
-    page: SPANISH_PAGE_URL,
-    languagePairs: LANGUAGE_PAIRS,
-    autoDownloadFromRemoteSettings: true,
-    prefs: [
-      ["browser.translations.enable", false],
-      ["browser.ai.control.default", "blocked"],
-      ["browser.ai.control.translations", "blocked"],
-    ],
-  });
-
-  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
-  await FullPageTranslationsTestUtils.assertAppMenuTranslateItemVisibility(
-    { visible: false },
-    "The app-menu translate button is hidden when the page loads with Translations feature disabled."
-  );
-
-  await TranslationsParent.AIFeature.enable();
-  await FullPageTranslationsTestUtils.assertAppMenuTranslateItemVisibility(
-    { visible: true },
-    "The app-menu translate button is visible when the Translations feature is enabled."
-  );
-
-  await FullPageTranslationsTestUtils.openPanel({
-    expectedFromLanguage: "es",
-    expectedToLanguage: "en",
-    openFromAppMenu: true,
-    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
-  });
-
-  await FullPageTranslationsTestUtils.clickTranslateButton();
-
-  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
-    fromLanguage: "es",
-    toLanguage: "en",
-    runInPage,
-  });
-
-  await FullPageTranslationsTestUtils.openPanel({
-    expectedToLanguage: "en",
-    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit,
-  });
-
-  await FullPageTranslationsTestUtils.clickRestoreButton();
-
-  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
-
-  await TranslationsParent.AIFeature.disable();
-  await FullPageTranslationsTestUtils.assertAppMenuTranslateItemVisibility(
-    { visible: false },
-    "The app-menu translate button is hidden after disabling the Translations feature."
-  );
-
-  await cleanup();
-});
-
-/**
- * This test case ensures that the Application Menu Translate item responds to the
- * Translations feature becoming disabled, and then enabled again.
- */
-add_task(async function test_app_menu_ai_feature_toggle_from_enabled() {
-  const { cleanup, runInPage } = await loadTestPage({
-    page: SPANISH_PAGE_URL,
-    languagePairs: LANGUAGE_PAIRS,
-    autoDownloadFromRemoteSettings: true,
-    prefs: [
-      ["browser.ai.control.default", "available"],
-      ["browser.ai.control.translations", "default"],
-    ],
-  });
-
-  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
-
-  await TranslationsParent.AIFeature.enable();
-  await FullPageTranslationsTestUtils.assertAppMenuTranslateItemVisibility(
-    { visible: true },
-    "The app-menu translate button is visible when the Translations feature is enabled."
-  );
-
-  await FullPageTranslationsTestUtils.openPanel({
-    expectedFromLanguage: "es",
-    expectedToLanguage: "en",
-    openFromAppMenu: true,
-    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
-  });
-
-  await FullPageTranslationsTestUtils.clickTranslateButton();
-
-  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
-    fromLanguage: "es",
-    toLanguage: "en",
-    runInPage,
-  });
-
-  await FullPageTranslationsTestUtils.openPanel({
-    expectedToLanguage: "en",
-    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit,
-  });
-
-  await FullPageTranslationsTestUtils.clickRestoreButton();
-
-  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
-
-  await TranslationsParent.AIFeature.disable();
-  await FullPageTranslationsTestUtils.assertAppMenuTranslateItemVisibility(
-    { visible: false },
-    "The app-menu translate button is hidden when the Translations feature is disabled."
-  );
-
-  await TranslationsParent.AIFeature.enable();
-  await FullPageTranslationsTestUtils.assertAppMenuTranslateItemVisibility(
-    { visible: true },
-    "The app-menu translate button is visible after enabling the Translations feature."
-  );
-
-  await FullPageTranslationsTestUtils.openPanel({
-    expectedFromLanguage: "es",
-    expectedToLanguage: "en",
-    openFromAppMenu: true,
-    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault,
-  });
-
-  await FullPageTranslationsTestUtils.clickTranslateButton();
-
-  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
-    fromLanguage: "es",
-    toLanguage: "en",
-    runInPage,
-  });
-
-  await cleanup();
-});
diff --git a/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_auto_translate.js b/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_auto_translate.js
deleted file mode 100644
index 06d26309d39cb..0000000000000
--- a/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_auto_translate.js
+++ /dev/null
@@ -1,176 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   https://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-/**
- * This test case verifies that when the Translations feature is re-enabled for pages
- * that would auto-translate, the active tab translates immediately, but background tabs
- * will not translate until invoked, in this case by page reload.
- */
-add_task(
-  async function test_auto_translate_on_reenable_requires_reload_in_background_tab() {
-    const { cleanup, runInPage: runInPage1 } = await loadTestPage({
-      page: SPANISH_PAGE_URL,
-      languagePairs: LANGUAGE_PAIRS,
-      autoDownloadFromRemoteSettings: true,
-      prefs: [
-        ["browser.translations.enable", false],
-        ["browser.ai.control.default", "blocked"],
-        ["browser.ai.control.translations", "blocked"],
-        ["browser.translations.alwaysTranslateLanguages", "es"],
-      ],
-    });
-
-    const tab1 = gBrowser.selectedTab;
-
-    await FullPageTranslationsTestUtils.assertTranslationsButton(
-      { button: false },
-      "The URL bar translate button is hidden in tab 1 with Translations feature disabled."
-    );
-
-    await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage1);
-
-    info("Opening a second tab while Translations feature is still disabled.");
-    const { removeTab: removeTab2, runInPage: runInPage2 } = await addTab(
-      SPANISH_PAGE_URL,
-      "Opening second Spanish tab"
-    );
-
-    await FullPageTranslationsTestUtils.assertTranslationsButton(
-      { button: false },
-      "The URL bar translate button is hidden in tab 2 with Translations feature disabled."
-    );
-
-    await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage2);
-
-    info("Re-enabling the Translations feature from tab 2 (active tab).");
-    await TranslationsParent.AIFeature.enable();
-
-    await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated(
-      {
-        fromLanguage: "es",
-        toLanguage: "en",
-        runInPage: runInPage2,
-      }
-    );
-
-    await FullPageTranslationsTestUtils.assertTranslationsButton(
-      { button: true, circleArrows: false, locale: true, icon: true },
-      "The URL bar translate button shows locale indicator after auto-translation in tab 2."
-    );
-
-    info("Switching to tab 1 to verify it does not auto-translate.");
-    await switchTab(tab1, "Switching to tab 1");
-
-    await FullPageTranslationsTestUtils.assertTranslationsButton(
-      { button: true, circleArrows: false, locale: false, icon: true },
-      "The URL bar translate button is visible in tab 1 but without circleArrows, indicating no auto-translate occurred."
-    );
-
-    await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage1);
-
-    await navigate("Manually reloading tab 1. Auto-translate should trigger", {
-      url: SPANISH_PAGE_URL,
-    });
-
-    await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated(
-      {
-        fromLanguage: "es",
-        toLanguage: "en",
-        runInPage: runInPage1,
-      }
-    );
-
-    await FullPageTranslationsTestUtils.assertTranslationsButton(
-      { button: true, circleArrows: false, locale: true, icon: true },
-      "The URL bar translate button shows locale indicator after auto-translation."
-    );
-
-    await removeTab2();
-    await cleanup();
-  }
-);
-
-/**
- * This test case verifies that when the Translations feature is re-enabled for pages
- * that would auto-translate, the active tab translates immediately, but background tabs
- * will not translate until invoked, in this case via the Translations panel.
- */
-add_task(async function test_manual_translate_on_reenable_in_background_tab() {
-  const { cleanup, runInPage: runInPage1 } = await loadTestPage({
-    page: SPANISH_PAGE_URL,
-    languagePairs: LANGUAGE_PAIRS,
-    autoDownloadFromRemoteSettings: true,
-    prefs: [
-      ["browser.translations.enable", false],
-      ["browser.ai.control.default", "blocked"],
-      ["browser.ai.control.translations", "blocked"],
-      ["browser.translations.alwaysTranslateLanguages", "es"],
-    ],
-  });
-
-  const tab1 = gBrowser.selectedTab;
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: false },
-    "The URL bar translate button is hidden in tab 1 with Translations feature disabled."
-  );
-
-  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage1);
-
-  info("Opening a second tab while Translations feature is still disabled.");
-  const { removeTab: removeTab2, runInPage: runInPage2 } = await addTab(
-    SPANISH_PAGE_URL,
-    "Opening second Spanish tab"
-  );
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: false },
-    "The URL bar translate button is hidden in tab 2 with Translations feature disabled."
-  );
-
-  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage2);
-
-  info("Re-enabling the Translations feature from tab 2 (active tab).");
-  await TranslationsParent.AIFeature.enable();
-
-  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
-    fromLanguage: "es",
-    toLanguage: "en",
-    runInPage: runInPage2,
-  });
-
-  info("Switching to tab 1 to verify it does not auto-translate.");
-  await switchTab(tab1, "Switching to tab 1");
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: false, locale: false, icon: true },
-    "The URL bar translate button is visible in tab 1 but no auto-translate occurred."
-  );
-
-  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage1);
-
-  info("Manually translating tab 1 by opening the panel.");
-  await FullPageTranslationsTestUtils.openPanel({
-    expectedFromLanguage: "es",
-    expectedToLanguage: "en",
-    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault,
-  });
-
-  await FullPageTranslationsTestUtils.clickTranslateButton();
-
-  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
-    fromLanguage: "es",
-    toLanguage: "en",
-    runInPage: runInPage1,
-  });
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: false, locale: true, icon: true },
-    "The URL bar translate button shows locale indicator after translation."
-  );
-
-  await removeTab2();
-  await cleanup();
-});
diff --git a/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_mid_translation.js b/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_mid_translation.js
deleted file mode 100644
index 2d8f03298667a..0000000000000
--- a/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_mid_translation.js
+++ /dev/null
@@ -1,381 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   https://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-/**
- * This test case verifies that when the Translations feature is disabled while a translation
- * is active, the button disappears and the page is left in a partially translated state.
- * Upon re-enabling the Translations feature, the page in the active tab should automatically
- * reload to restore the original content.
- */
-add_task(async function test_mid_translation_disable_and_reenable_active_tab() {
-  const { cleanup, runInPage } = await loadTestPage({
-    page: SPANISH_PAGE_URL,
-    languagePairs: LANGUAGE_PAIRS,
-    autoDownloadFromRemoteSettings: true,
-    prefs: [
-      ["browser.ai.control.default", "available"],
-      ["browser.ai.control.translations", "default"],
-    ],
-  });
-
-  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
-
-  await TranslationsParent.AIFeature.enable();
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: false, locale: false, icon: true },
-    "The URL bar translate button is visible when the Translations feature is enabled."
-  );
-
-  await FullPageTranslationsTestUtils.openPanel({
-    expectedFromLanguage: "es",
-    expectedToLanguage: "en",
-    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
-  });
-
-  await FullPageTranslationsTestUtils.clickTranslateButton();
-
-  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
-    fromLanguage: "es",
-    toLanguage: "en",
-    runInPage,
-  });
-
-  info("Verifying that H1 is translated but final paragraph is not.");
-  await FullPageTranslationsTestUtils.assertPageH1ContentIsTranslated({
-    fromLanguage: "es",
-    toLanguage: "en",
-    runInPage,
-  });
-
-  await FullPageTranslationsTestUtils.assertPageFinalParagraphContentIsNotTranslated(
-    { runInPage }
-  );
-
-  info("Disabling the Translations feature while translation is active.");
-  const browser = gBrowser.selectedBrowser;
-  const reloadPromise = BrowserTestUtils.browserLoaded(browser);
-
-  await TranslationsParent.AIFeature.disable();
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: false },
-    "The URL bar translate button is hidden after disabling the Translations feature."
-  );
-
-  info("Scrolling to bottom to verify no new translations occur.");
-  await scrollToBottomOfPage(runInPage);
-
-  await FullPageTranslationsTestUtils.assertPageFinalParagraphContentIsNotTranslated(
-    {
-      runInPage,
-      message:
-        "The final paragraph should not be translated after feature was disabled.",
-    }
-  );
-
-  info(
-    "Re-enabling the Translations feature. Page should automatically reload."
-  );
-  await TranslationsParent.AIFeature.enable();
-
-  info("Waiting for page reload to complete.");
-  await reloadPromise;
-
-  info("Scrolling to top of page after reload.");
-  await scrollToTopOfPage(runInPage);
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: false, locale: false, icon: true },
-    "The URL bar translate button is visible after page reload."
-  );
-
-  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
-
-  info("Verifying that a new translation can be started successfully.");
-  await FullPageTranslationsTestUtils.openPanel({
-    expectedFromLanguage: "es",
-    expectedToLanguage: "en",
-    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault,
-  });
-
-  await FullPageTranslationsTestUtils.clickTranslateButton();
-
-  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
-    fromLanguage: "es",
-    toLanguage: "en",
-    runInPage,
-  });
-
-  await cleanup();
-});
-
-/**
- * This test case verifies that when the Translations feature is disabled while a translation
- * is active, the button disappears and the page is left in a partially translated state.
- * Upon re-enabling the Translations feature, the page in the background tab should show the
- * Translations button, but not automatically refresh. Upon switching to the background tab,
- * the page should refresh itself to restore the original content, after which a new
- * translation can be invoked.
- */
-add_task(
-  async function test_mid_translation_disable_and_reenable_background_tab() {
-    const { cleanup, runInPage: runInPage1 } = await loadTestPage({
-      page: SPANISH_PAGE_URL,
-      languagePairs: LANGUAGE_PAIRS,
-      autoDownloadFromRemoteSettings: true,
-      prefs: [
-        ["browser.ai.control.default", "available"],
-        ["browser.ai.control.translations", "default"],
-      ],
-    });
-
-    const tab1 = gBrowser.selectedTab;
-
-    await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage1);
-
-    await TranslationsParent.AIFeature.enable();
-    await FullPageTranslationsTestUtils.assertTranslationsButton(
-      { button: true, circleArrows: false, locale: false, icon: true },
-      "The URL bar translate button is visible in tab 1."
-    );
-
-    await FullPageTranslationsTestUtils.openPanel({
-      expectedFromLanguage: "es",
-      expectedToLanguage: "en",
-      onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
-    });
-
-    await FullPageTranslationsTestUtils.clickTranslateButton();
-
-    await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated(
-      {
-        fromLanguage: "es",
-        toLanguage: "en",
-        runInPage: runInPage1,
-      }
-    );
-
-    info("Verifying that H1 is translated but final paragraph is not.");
-    await FullPageTranslationsTestUtils.assertPageH1ContentIsTranslated({
-      fromLanguage: "es",
-      toLanguage: "en",
-      runInPage: runInPage1,
-    });
-
-    await FullPageTranslationsTestUtils.assertPageFinalParagraphContentIsNotTranslated(
-      { runInPage: runInPage1 }
-    );
-
-    info("Disabling the Translations feature while translation is active.");
-    await TranslationsParent.AIFeature.disable();
-
-    await FullPageTranslationsTestUtils.assertTranslationsButton(
-      { button: false },
-      "The URL bar translate button is hidden after disabling the Translations feature."
-    );
-
-    info("Opening a second tab.");
-    const { removeTab: removeTab2 } = await addTab(
-      SPANISH_PAGE_URL,
-      "Opening second Spanish tab"
-    );
-
-    await FullPageTranslationsTestUtils.assertTranslationsButton(
-      { button: false },
-      "The URL bar translate button is hidden in tab 2 while feature is disabled."
-    );
-
-    info("Re-enabling the Translations feature from tab 2.");
-    await TranslationsParent.AIFeature.enable();
-
-    await FullPageTranslationsTestUtils.assertTranslationsButton(
-      { button: true, circleArrows: false, locale: false, icon: true },
-      "The URL bar translate button is visible in tab 2 after re-enabling."
-    );
-
-    info("Setting up reload promise for tab 1 before switching to it.");
-    const browser1 = tab1.linkedBrowser;
-    const reloadPromise = BrowserTestUtils.browserLoaded(browser1);
-
-    info("Switching back to tab 1. Page should reload.");
-    await switchTab(tab1, "Switching to tab 1");
-
-    info("Waiting for tab 1 to reload.");
-    await reloadPromise;
-
-    await FullPageTranslationsTestUtils.assertTranslationsButton(
-      { button: true, circleArrows: false, locale: false, icon: true },
-      "The URL bar translate button is visible in tab 1 after reload, indicating page is not translated."
-    );
-
-    await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage1);
-
-    info("Verifying that a new translation can be started successfully.");
-    await FullPageTranslationsTestUtils.openPanel({
-      expectedFromLanguage: "es",
-      expectedToLanguage: "en",
-      onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault,
-    });
-
-    await FullPageTranslationsTestUtils.clickTranslateButton();
-
-    await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated(
-      {
-        fromLanguage: "es",
-        toLanguage: "en",
-        runInPage: runInPage1,
-      }
-    );
-
-    await FullPageTranslationsTestUtils.assertTranslationsButton(
-      { button: true, circleArrows: false, locale: true, icon: true },
-      "The URL bar translate button shows locale indicator after translation."
-    );
-
-    await removeTab2();
-    await cleanup();
-  }
-);
-
-/**
- * This test case verifies that when translation is active in a background tab,
- * and the Translations feature is disabled from an active tab that has no actor
- * instance (such as about:blank), then the translate button is properly
- * hidden when switching back to a background tab that had an active translation.
- */
-add_task(async function test_mid_translation_disable_from_tab_without_actor() {
-  const { cleanup, runInPage } = await loadTestPage({
-    page: SPANISH_PAGE_URL,
-    languagePairs: LANGUAGE_PAIRS,
-    autoDownloadFromRemoteSettings: true,
-    prefs: [
-      ["browser.ai.control.default", "available"],
-      ["browser.ai.control.translations", "default"],
-    ],
-  });
-
-  const tab1 = gBrowser.selectedTab;
-
-  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
-
-  await TranslationsParent.AIFeature.enable();
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: false, locale: false, icon: true },
-    "The URL bar translate button is visible in tab 1."
-  );
-
-  await FullPageTranslationsTestUtils.openPanel({
-    expectedFromLanguage: "es",
-    expectedToLanguage: "en",
-    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
-  });
-
-  await FullPageTranslationsTestUtils.clickTranslateButton();
-
-  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
-    fromLanguage: "es",
-    toLanguage: "en",
-    runInPage,
-  });
-
-  info("Opening about:blank tab.");
-  const { removeTab } = await addTab("about:blank", "Opening about:blank tab");
-
-  info("Disabling the Translations feature from about:blank tab.");
-  await TranslationsParent.AIFeature.disable();
-
-  info("Switching back to tab 1 with active translation.");
-  await switchTab(tab1, "Switching to tab 1");
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: false },
-    "The URL bar translate button is hidden in tab 1 after disabling from about:blank."
-  );
-
-  await removeTab();
-  await cleanup();
-});
-
-/**
- * This test case verifies behavior when the Translations feature is disabled while language models
- * are still loading, then the feature is re-enabled and a subsequent translation attempt is invoked
- * for the same language pair.
- */
-add_task(async function test_disable_feature_during_model_loading() {
-  const { cleanup, runInPage, resolveDownloads } = await loadTestPage({
-    page: SPANISH_PAGE_URL,
-    languagePairs: LANGUAGE_PAIRS,
-    autoDownloadFromRemoteSettings: false,
-    prefs: [
-      ["browser.ai.control.default", "available"],
-      ["browser.ai.control.translations", "default"],
-    ],
-  });
-
-  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
-
-  await TranslationsParent.AIFeature.enable();
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: false, locale: false, icon: true },
-    "The URL bar translate button is visible when the Translations feature is enabled."
-  );
-
-  await FullPageTranslationsTestUtils.openPanel({
-    expectedFromLanguage: "es",
-    expectedToLanguage: "en",
-    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
-  });
-
-  info(
-    "Clicking translate button without resolving downloads to simulate models loading."
-  );
-  await FullPageTranslationsTestUtils.clickTranslateButton({
-    downloadHandler: null,
-  });
-
-  info("Waiting for the button to show the loading indicator.");
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: true, locale: false, icon: true },
-    "The button shows the loading indicator while models are downloading."
-  );
-
-  info(
-    "Disabling the Translations feature while models are still loading (downloads not resolved)."
-  );
-  await TranslationsParent.AIFeature.disable();
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: false },
-    "The URL bar translate button is hidden after disabling the Translations feature."
-  );
-
-  info("Re-enabling the Translations feature.");
-  await TranslationsParent.AIFeature.enable();
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: false, locale: false, icon: true },
-    "The URL bar translate button is visible after re-enabling."
-  );
-
-  info("Attempting to translate again with the same language pair.");
-  await FullPageTranslationsTestUtils.openPanel({
-    expectedFromLanguage: "es",
-    expectedToLanguage: "en",
-    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault,
-  });
-
-  info("This time, resolve downloads so translation can complete.");
-  await FullPageTranslationsTestUtils.clickTranslateButton({
-    downloadHandler: resolveDownloads,
-  });
-
-  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
-    fromLanguage: "es",
-    toLanguage: "en",
-    runInPage,
-  });
-
-  await cleanup();
-});
diff --git a/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_navigation.js b/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_navigation.js
deleted file mode 100644
index 32f350fdddf8c..0000000000000
--- a/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_navigation.js
+++ /dev/null
@@ -1,159 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   https://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-/**
- * This test case verifies that language detection works correctly when the
- * feature is disabled and immediately re-enabled on the same page without
- * navigation.
- */
-add_task(async function test_toggle_without_navigation_detects_language() {
-  const { cleanup } = await loadTestPage({
-    page: SPANISH_PAGE_URL,
-    languagePairs: LANGUAGE_PAIRS,
-    autoDownloadFromRemoteSettings: true,
-    prefs: [
-      ["browser.ai.control.default", "available"],
-      ["browser.ai.control.translations", "default"],
-    ],
-  });
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: false, locale: false, icon: true },
-    "The URL bar translate button is visible on Spanish page."
-  );
-
-  info("Disabling and immediately re-enabling without navigation.");
-  await TranslationsParent.AIFeature.disable();
-  await TranslationsParent.AIFeature.enable();
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: false, locale: false, icon: true },
-    "The URL bar translate button is visible after toggling."
-  );
-
-  info("Verifying Spanish is still detected correctly by translating.");
-  await FullPageTranslationsTestUtils.openPanel({
-    expectedFromLanguage: "es",
-    expectedToLanguage: "en",
-    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
-  });
-
-  await FullPageTranslationsTestUtils.clickTranslateButton();
-
-  await cleanup();
-});
-
-/**
- * This test case verifies that when the Translations feature is disabled, then the user
- * navigates to a different-language page, and the feature is re-enabled, the
- * detected languages correctly reflect the new page's language.
- */
-add_task(async function test_navigation_while_disabled_detects_current_page() {
-  const { cleanup } = await loadTestPage({
-    page: SPANISH_PAGE_URL,
-    languagePairs: LANGUAGE_PAIRS,
-    autoDownloadFromRemoteSettings: true,
-    prefs: [
-      ["browser.ai.control.default", "available"],
-      ["browser.ai.control.translations", "default"],
-    ],
-  });
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: false, locale: false, icon: true },
-    "The URL bar translate button is visible on Spanish page."
-  );
-
-  info("Disabling the Translations feature while on Spanish page.");
-  await TranslationsParent.AIFeature.disable();
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: false },
-    "The URL bar translate button is hidden after disabling the Translations feature."
-  );
-
-  await navigate("Navigating to French page while feature is disabled", {
-    url: FRENCH_PAGE_URL,
-  });
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: false },
-    "The URL bar translate button is still hidden on French page."
-  );
-
-  info("Re-enabling the Translations feature on French page.");
-  await TranslationsParent.AIFeature.enable();
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: false, locale: false, icon: true },
-    "The URL bar translate button is visible after re-enabling."
-  );
-
-  info("Verifying French is detected by translating the page.");
-  await FullPageTranslationsTestUtils.openPanel({
-    expectedFromLanguage: "fr",
-    expectedToLanguage: "en",
-    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
-  });
-
-  await FullPageTranslationsTestUtils.clickTranslateButton();
-
-  await cleanup();
-});
-
-/**
- * This test case verifies that after multiple navigations while the Translations
- * feature is disabled, the detected languages correctly reflect the current page's
- * language when the feature is re-enabled, not any previously visited pages.
- */
-add_task(async function test_multiple_navigations_while_disabled() {
-  const { cleanup } = await loadTestPage({
-    page: SPANISH_PAGE_URL,
-    languagePairs: LANGUAGE_PAIRS,
-    autoDownloadFromRemoteSettings: true,
-    prefs: [
-      ["browser.ai.control.default", "available"],
-      ["browser.ai.control.translations", "default"],
-    ],
-  });
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: false, locale: false, icon: true },
-    "The URL bar translate button is visible on Spanish page."
-  );
-
-  info("Disabling the Translations feature on Spanish page.");
-  await TranslationsParent.AIFeature.disable();
-
-  await navigate("Navigating to French page while feature is disabled", {
-    url: FRENCH_PAGE_URL,
-  });
-
-  await navigate(
-    "Navigating back to Spanish page, still with feature disabled",
-    {
-      url: SPANISH_PAGE_URL,
-    }
-  );
-
-  info("Re-enabling the Translations feature on Spanish page.");
-  await TranslationsParent.AIFeature.enable();
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: false, locale: false, icon: true },
-    "The URL bar translate button is visible after re-enabling."
-  );
-
-  info("Verifying Spanish is detected by translating the page.");
-  await FullPageTranslationsTestUtils.openPanel({
-    expectedFromLanguage: "es",
-    expectedToLanguage: "en",
-    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
-  });
-
-  await FullPageTranslationsTestUtils.clickTranslateButton();
-
-  await cleanup();
-});
diff --git a/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_urlbar_button.js b/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_urlbar_button.js
deleted file mode 100644
index 82ee8b03d2569..0000000000000
--- a/browser/components/translations/tests/browser/browser_translations_full_page_ai_feature_urlbar_button.js
+++ /dev/null
@@ -1,302 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   https://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-/**
- * This test case ensures that the URL-bar translate button responds to the
- * Translations feature becoming enabled when the page was loaded while
- * the feature was disabled, and that Translations works correctly once invoked.
- */
-add_task(async function test_urlbar_button_ai_feature_toggle_from_disabled() {
-  const { cleanup, runInPage } = await loadTestPage({
-    page: SPANISH_PAGE_URL,
-    languagePairs: LANGUAGE_PAIRS,
-    autoDownloadFromRemoteSettings: true,
-    prefs: [
-      ["browser.translations.enable", false],
-      ["browser.ai.control.default", "blocked"],
-      ["browser.ai.control.translations", "blocked"],
-    ],
-  });
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: false },
-    "The URL bar translate button is hidden when the page loads with Translations feature disabled."
-  );
-
-  await TranslationsParent.AIFeature.enable();
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: false, locale: false, icon: true },
-    "The URL bar translate button is visible when the Translations feature is enabled."
-  );
-
-  await FullPageTranslationsTestUtils.openPanel({
-    expectedFromLanguage: "es",
-    expectedToLanguage: "en",
-    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
-  });
-
-  await FullPageTranslationsTestUtils.clickTranslateButton();
-
-  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
-    fromLanguage: "es",
-    toLanguage: "en",
-    runInPage,
-  });
-
-  await FullPageTranslationsTestUtils.openPanel({
-    expectedToLanguage: "en",
-    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit,
-  });
-
-  await FullPageTranslationsTestUtils.clickRestoreButton();
-
-  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
-
-  await TranslationsParent.AIFeature.disable();
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: false },
-    "The URL bar translate button is hidden after disabling the Translations feature."
-  );
-
-  await cleanup();
-});
-
-/**
- * This test case ensures that the URL bar translate button responds to the
- * Translations feature becoming disabled, and then enabled again, and that
- * Translations continues to function correctly when invoked after re-enabling.
- */
-add_task(async function test_urlbar_button_ai_feature_toggle_from_enabled() {
-  const { cleanup, runInPage } = await loadTestPage({
-    page: SPANISH_PAGE_URL,
-    languagePairs: LANGUAGE_PAIRS,
-    autoDownloadFromRemoteSettings: true,
-    prefs: [
-      ["browser.ai.control.default", "available"],
-      ["browser.ai.control.translations", "default"],
-    ],
-  });
-
-  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
-
-  await TranslationsParent.AIFeature.enable();
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: false, locale: false, icon: true },
-    "The URL bar translate button is visible when the Translations feature is enabled."
-  );
-
-  await FullPageTranslationsTestUtils.openPanel({
-    expectedFromLanguage: "es",
-    expectedToLanguage: "en",
-    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewIntro,
-  });
-
-  await FullPageTranslationsTestUtils.clickTranslateButton();
-
-  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
-    fromLanguage: "es",
-    toLanguage: "en",
-    runInPage,
-  });
-
-  await FullPageTranslationsTestUtils.openPanel({
-    expectedToLanguage: "en",
-    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewRevisit,
-  });
-
-  await FullPageTranslationsTestUtils.clickRestoreButton();
-
-  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage);
-
-  await TranslationsParent.AIFeature.disable();
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: false },
-    "The URL bar translate button is hidden when the Translations feature is disabled."
-  );
-
-  await TranslationsParent.AIFeature.enable();
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: false, locale: false, icon: true },
-    "The URL bar translate button is visible after enabling the Translations feature."
-  );
-
-  await FullPageTranslationsTestUtils.openPanel({
-    expectedFromLanguage: "es",
-    expectedToLanguage: "en",
-    onOpenPanel: FullPageTranslationsTestUtils.assertPanelViewDefault,
-  });
-
-  await FullPageTranslationsTestUtils.changeSelectedToLanguage({
-    langTag: "fr",
-  });
-
-  await FullPageTranslationsTestUtils.clickTranslateButton();
-
-  await FullPageTranslationsTestUtils.assertOnlyIntersectingNodesAreTranslated({
-    fromLanguage: "es",
-    toLanguage: "fr",
-    runInPage,
-  });
-
-  await cleanup();
-});
-
-/**
- * This test case verifies that the URL-bar translate button state is correctly
- * updated across multiple tabs when the Translations feature is toggled. When
- * disabled, the button should be hidden in all tabs, and when re-enabled, the
- * button should be visible in each tab with a translatable page.
- */
-add_task(async function test_urlbar_button_ai_feature_toggle_multiple_tabs() {
-  const { runInPage: runInPage1, cleanup: cleanupWindow1 } = await loadTestPage(
-    {
-      page: SPANISH_PAGE_URL,
-      languagePairs: LANGUAGE_PAIRS,
-      prefs: [
-        ["browser.ai.control.default", "available"],
-        ["browser.ai.control.translations", "default"],
-      ],
-    }
-  );
-
-  const tab1 = gBrowser.selectedTab;
-
-  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage1);
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: false, locale: false, icon: true },
-    "The URL bar translate button is visible in tab 1."
-  );
-
-  const { removeTab, runInPage: runInPage2 } = await addTab(
-    SPANISH_PAGE_URL,
-    "Creating a second Spanish page tab"
-  );
-
-  const tab2 = gBrowser.selectedTab;
-
-  await FullPageTranslationsTestUtils.assertPageIsNotTranslated(runInPage2);
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: false, locale: false, icon: true },
-    "The URL bar translate button is visible in tab 2."
-  );
-
-  await TranslationsParent.AIFeature.disable();
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: false },
-    "The URL bar translate button is hidden in tab 2 after disabling."
-  );
-
-  await switchTab(tab1, "Switching to tab 1");
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: false },
-    "The URL bar translate button is hidden in tab 1 after disabling."
-  );
-
-  await TranslationsParent.AIFeature.enable();
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: false, locale: false, icon: true },
-    "The URL bar translate button is visible in tab 1 after re-enabling."
-  );
-
-  await switchTab(tab2, "Switching to tab 2");
-
-  await FullPageTranslationsTestUtils.assertTranslationsButton(
-    { button: true, circleArrows: false, locale: false, icon: true },
-    "The URL bar translate button is visible in tab 2 after re-enabling."
-  );
-
-  await removeTab();
-  await cleanupWindow1();
-});
-
-/**
- * This test case verifies that when the Translations feature is disabled from an active
- * tab that has no actor (such as about:blank), then translate button is properly hidden
- * when switching back to a background tab that previously would have had the button visible.
- */
-add_task(
-  async function test_urlbar_button_ai_feature_disable_from_tab_without_actor() {
-    const { cleanup } = await loadTestPage({
-      page: SPANISH_PAGE_URL,
-      languagePairs: LANGUAGE_PAIRS,
-      autoDownloadFromRemoteSettings: true,
-      prefs: [
-        ["browser.ai.control.default", "available"],
-        ["browser.ai.control.translations", "default"],
-      ],
-    });
-
-    const tab1 = gBrowser.selectedTab;
-
-    await TranslationsParent.AIFeature.enable();
-    await FullPageTranslationsTestUtils.assertTranslationsButton(
-      { button: true, circleArrows: false, locale: false, icon: true },
-      "The URL bar translate button is visible in tab 1."
-    );
-
-    const { removeTab } = await addTab(
-      "about:blank",
-      "Opening about:blank tab"
-    );
-
-    await TranslationsParent.AIFeature.disable();
-
-    await switchTab(tab1, "Switching to tab 1");
-
-    await FullPageTranslationsTestUtils.assertTranslationsButton(
-      { button: false },
-      "The URL bar translate button is hidden in tab 1 after disabling from about:blank."
-    );
-
-    await removeTab();
-    await cleanup();
-  }
-);
-
-/**
- * This test case verifies that when the Translations feature is enabled from an active tab
- * that has no actor (such as about:blank), then the translate button is properly shown when
- * switching back to a background tab whose page would display the translate url-bar button.
- */
-add_task(
-  async function test_urlbar_button_ai_feature_enable_from_tab_without_actor() {
-    const { cleanup } = await loadTestPage({
-      page: SPANISH_PAGE_URL,
-      languagePairs: LANGUAGE_PAIRS,
-      autoDownloadFromRemoteSettings: true,
-      prefs: [
-        ["browser.ai.control.default", "available"],
-        ["browser.ai.control.translations", "blocked"],
-      ],
-    });
-
-    const tab1 = gBrowser.selectedTab;
-
-    await FullPageTranslationsTestUtils.assertTranslationsButton(
-      { button: false },
-      "The URL bar translate button is hidden when feature is disabled."
-    );
-
-    const { removeTab } = await addTab(
-      "about:blank",
-      "Opening about:blank tab"
-    );
-
-    await TranslationsParent.AIFeature.enable();
-
-    await switchTab(tab1, "Switching to tab 1");
-
-    await FullPageTranslationsTestUtils.assertTranslationsButton(
-      { button: true, circleArrows: false, locale: false, icon: true },
-      "The URL bar translate button is visible in tab 1 after enabling from about:blank."
-    );
-
-    await removeTab();
-    await cleanup();
-  }
-);
diff --git a/browser/components/translations/tests/browser/browser_translations_select_ai_feature.js b/browser/components/translations/tests/browser/browser_translations_select_ai_feature.js
deleted file mode 100644
index 85791e95c61eb..0000000000000
--- a/browser/components/translations/tests/browser/browser_translations_select_ai_feature.js
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   https://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-/**
- * This test case ensures that the Select Translations flow responds to the Translations
- * AIFeature becoming enabled, and then disabled again.
- */
-add_task(
-  async function test_select_translations_ai_feature_toggle_from_disabled() {
-    const { cleanup, runInPage } = await loadTestPage({
-      page: SELECT_TEST_PAGE_URL,
-      languagePairs: LANGUAGE_PAIRS,
-      autoDownloadFromRemoteSettings: true,
-      prefs: [
-        ["browser.translations.enable", false],
-        ["browser.ai.control.default", "blocked"],
-        ["browser.ai.control.translations", "blocked"],
-        ["browser.translations.select.enable", true],
-      ],
-    });
-
-    await TranslationsParent.AIFeature.disable();
-
-    await SelectTranslationsTestUtils.assertContextMenuTranslateSelectionItem(
-      runInPage,
-      {
-        selectSpanishSentence: true,
-        openAtSpanishSentence: true,
-        expectMenuItemVisible: false,
-      },
-      "The translate-selection context menu item is hidden when the Translations feature is disabled."
-    );
-
-    await TranslationsParent.AIFeature.enable();
-
-    await SelectTranslationsTestUtils.openPanel(runInPage, {
-      selectSpanishSentence: true,
-      openAtSpanishSentence: true,
-      expectedFromLanguage: "es",
-      expectedToLanguage: "en",
-      onOpenPanel: SelectTranslationsTestUtils.assertPanelViewTranslated,
-    });
-
-    await SelectTranslationsTestUtils.clickDoneButton();
-
-    await TranslationsParent.AIFeature.disable();
-
-    await SelectTranslationsTestUtils.assertContextMenuTranslateSelectionItem(
-      runInPage,
-      {
-        selectSpanishSentence: true,
-        openAtSpanishSentence: true,
-        expectMenuItemVisible: false,
-      },
-      "The translate-selection context menu item is hidden after disabling the Translations feature."
-    );
-
-    await cleanup();
-  }
-);
-
-/**
- * This test case ensures that the Select Translations flow responds to the Translations
- * AIFeature becoming disabled, and then re-enabled again.
- */
-add_task(
-  async function test_select_translations_ai_feature_toggle_from_enabled() {
-    const { cleanup, runInPage } = await loadTestPage({
-      page: SELECT_TEST_PAGE_URL,
-      languagePairs: LANGUAGE_PAIRS,
-      autoDownloadFromRemoteSettings: true,
-      prefs: [
-        ["browser.ai.control.default", "available"],
-        ["browser.ai.control.translations", "default"],
-        ["browser.translations.select.enable", true],
-      ],
-    });
-
-    await TranslationsParent.AIFeature.enable();
-
-    await SelectTranslationsTestUtils.openPanel(runInPage, {
-      selectSpanishSentence: true,
-      openAtSpanishSentence: true,
-      expectedFromLanguage: "es",
-      expectedToLanguage: "en",
-      onOpenPanel: SelectTranslationsTestUtils.assertPanelViewTranslated,
-    });
-
-    await SelectTranslationsTestUtils.clickDoneButton();
-
-    await TranslationsParent.AIFeature.disable();
-
-    await SelectTranslationsTestUtils.assertContextMenuTranslateSelectionItem(
-      runInPage,
-      {
-        selectSpanishSentence: true,
-        openAtSpanishSentence: true,
-        expectMenuItemVisible: false,
-      },
-      "The translate-selection context menu item is hidden after disabling the Translations feature."
-    );
-
-    await TranslationsParent.AIFeature.enable();
-
-    await SelectTranslationsTestUtils.openPanel(runInPage, {
-      selectSpanishSentence: true,
-      openAtSpanishSentence: true,
-      expectedFromLanguage: "es",
-      expectedToLanguage: "en",
-      onOpenPanel: SelectTranslationsTestUtils.assertPanelViewTranslated,
-    });
-
-    await SelectTranslationsTestUtils.clickDoneButton();
-
-    await cleanup();
-  }
-);
diff --git a/browser/components/translations/tests/browser/head.js b/browser/components/translations/tests/browser/head.js
index 515af0ee454e7..093360b81d533 100644
--- a/browser/components/translations/tests/browser/head.js
+++ b/browser/components/translations/tests/browser/head.js
@@ -1502,12 +1502,8 @@ class FullPageTranslationsTestUtils {
    */
   static async waitForAllPendingTranslationsToComplete(runInPage) {
     await runInPage(async ({ waitForCondition }) => {
-      let translationsChild;
-      try {
-        translationsChild = content.windowGlobalChild.getActor("Translations");
-      } catch {
-        return;
-      }
+      const translationsChild =
+        content.windowGlobalChild.getActor("Translations");
 
       while (
         translationsChild.translatedDoc?.hasPendingTranslationRequests() ||
@@ -1537,12 +1533,8 @@ class FullPageTranslationsTestUtils {
    */
   static async assertNoElementsAreObservedForContentIntersection(runInPage) {
     await runInPage(async ({ waitForCondition }) => {
-      let translationsChild;
-      try {
-        translationsChild = content.windowGlobalChild.getActor("Translations");
-      } catch {
-        return;
-      }
+      const translationsChild =
+        content.windowGlobalChild.getActor("Translations");
 
       await waitForCondition(
         () =>
@@ -1561,12 +1553,8 @@ class FullPageTranslationsTestUtils {
    */
   static async assertNoElementsAreObservedForAttributeIntersection(runInPage) {
     await runInPage(async ({ waitForCondition }) => {
-      let translationsChild;
-      try {
-        translationsChild = content.windowGlobalChild.getActor("Translations");
-      } catch {
-        return;
-      }
+      const translationsChild =
+        content.windowGlobalChild.getActor("Translations");
 
       await waitForCondition(
         () =>
@@ -2679,49 +2667,6 @@ class FullPageTranslationsTestUtils {
     );
   }
 
-  /**
-   * Opens the app menu and asserts the translate button visibility.
-   *
-   * @param {object} options
-   * @param {boolean} options.visible
-   * @param {string} message
-   */
-  static async assertAppMenuTranslateItemVisibility({ visible }, message) {
-    if (message) {
-      info(message);
-    }
-
-    if (window.PanelUI.panel.state !== "closed") {
-      const panelHidden = BrowserTestUtils.waitForEvent(
-        window.PanelUI.panel,
-        "popuphidden"
-      );
-      window.PanelUI.hide();
-      await panelHidden;
-    }
-
-    const panelShown = BrowserTestUtils.waitForEvent(
-      window.PanelUI.panel,
-      "popupshown"
-    );
-    window.PanelUI.show();
-    await panelShown;
-
-    const translateSiteButton = maybeGetById("appMenu-translate-button", false);
-    is(
-      translateSiteButton.hidden,
-      !visible,
-      "The app-menu translate button visibility should match the expected state."
-    );
-
-    const panelHidden = BrowserTestUtils.waitForEvent(
-      window.PanelUI.panel,
-      "popuphidden"
-    );
-    window.PanelUI.hide();
-    await panelHidden;
-  }
-
   /**
    * Opens the translations panel via the translations button.
    *
diff --git a/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs b/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs
index f3b49ad155f5c..a7a50ae918895 100644
--- a/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs
+++ b/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs
@@ -275,12 +275,9 @@ const DEFAULT_ACTIONS = {
     icon: "chrome://browser/skin/translations.svg",
     label: "quickactions-translate",
     isVisible: () => {
-      return (
-        lazy.TranslationsParent.AIFeature.isEnabled &&
-        Services.prefs.getBoolPref(
-          "browser.translations.quickAction.enabled",
-          false
-        )
+      return Services.prefs.getBoolPref(
+        "browser.translations.quickAction.enabled",
+        false
       );
     },
     onPick: async () => {
diff --git a/browser/components/urlbar/tests/browser/browser_quickactions_translate.js b/browser/components/urlbar/tests/browser/browser_quickactions_translate.js
index c26ca80c85b6c..0c2ecb37019c9 100644
--- a/browser/components/urlbar/tests/browser/browser_quickactions_translate.js
+++ b/browser/components/urlbar/tests/browser/browser_quickactions_translate.js
@@ -24,7 +24,6 @@ add_setup(async function setup() {
     set: [
       ["browser.urlbar.quickactions.enabled", true],
       ["browser.translations.quickAction.enabled", true],
-      ["browser.translations.enable", true],
       ["browser.urlbar.quickactions.timesShownOnboardingLabel", 0],
     ],
   });
@@ -68,140 +67,6 @@ add_task(async function test_translate_disabled() {
   await SpecialPowers.popPrefEnv();
 });
 
-add_task(async function test_translate_ai_feature_toggle_from_disabled() {
-  info("Start from disabled and ensure the translate quick action is hidden");
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.ai.control.default", "blocked"],
-      ["browser.ai.control.translations", "blocked"],
-      ["browser.translations.enable", false],
-    ],
-  });
-
-  await TranslationsParent.AIFeature.disable();
-
-  info("Search for the translate quick action keyword");
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: "translate",
-  });
-
-  let hasTranslateAction = Boolean(
-    window.document.querySelector(
-      `.urlbarView-action-btn[data-action=translate]`
-    )
-  );
-  Assert.ok(
-    !hasTranslateAction,
-    "Translate action is not shown when the AI feature is disabled"
-  );
-
-  await UrlbarTestUtils.promisePopupClose(window, () => {
-    EventUtils.synthesizeKey("KEY_Escape");
-  });
-
-  await TranslationsParent.AIFeature.enable();
-
-  info("Search for the translate quick action keyword after enable");
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: "translate",
-  });
-
-  await assertAction("translate");
-
-  await UrlbarTestUtils.promisePopupClose(window, () => {
-    EventUtils.synthesizeKey("KEY_Escape");
-  });
-
-  await TranslationsParent.AIFeature.disable();
-
-  info("Search for the translate quick action keyword after disable again");
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: "translate",
-  });
-
-  hasTranslateAction = Boolean(
-    window.document.querySelector(
-      `.urlbarView-action-btn[data-action=translate]`
-    )
-  );
-  Assert.ok(
-    !hasTranslateAction,
-    "Translate action is not shown when the AI feature is disabled"
-  );
-
-  await UrlbarTestUtils.promisePopupClose(window, () => {
-    EventUtils.synthesizeKey("KEY_Escape");
-  });
-
-  await SpecialPowers.popPrefEnv();
-});
-
-add_task(async function test_translate_ai_feature_toggle_from_enabled() {
-  info("Start from enabled and ensure the translate quick action is visible");
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.ai.control.default", "available"],
-      ["browser.ai.control.translations", "default"],
-      ["browser.translations.enable", true],
-    ],
-  });
-
-  await TranslationsParent.AIFeature.enable();
-
-  info("Search for the translate quick action keyword");
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: "translate",
-  });
-
-  await assertAction("translate");
-
-  await UrlbarTestUtils.promisePopupClose(window, () => {
-    EventUtils.synthesizeKey("KEY_Escape");
-  });
-
-  await TranslationsParent.AIFeature.disable();
-
-  info("Search for the translate quick action keyword after disable");
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: "translate",
-  });
-
-  let hasTranslateAction = Boolean(
-    window.document.querySelector(
-      `.urlbarView-action-btn[data-action=translate]`
-    )
-  );
-  Assert.ok(
-    !hasTranslateAction,
-    "Translate action is not shown when the AI feature is disabled"
-  );
-
-  await UrlbarTestUtils.promisePopupClose(window, () => {
-    EventUtils.synthesizeKey("KEY_Escape");
-  });
-
-  await TranslationsParent.AIFeature.enable();
-
-  info("Search for the translate quick action keyword after enable");
-  await UrlbarTestUtils.promiseAutocompleteResultPopup({
-    window,
-    value: "translate",
-  });
-
-  await assertAction("translate");
-
-  await UrlbarTestUtils.promisePopupClose(window, () => {
-    EventUtils.synthesizeKey("KEY_Escape");
-  });
-
-  await SpecialPowers.popPrefEnv();
-});
-
 add_task(async function test_translate_keyword() {
   info("Search with the primary translate keyword");
   await UrlbarTestUtils.promiseAutocompleteResultPopup({
diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TranslationsTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TranslationsTest.kt
index c3a587f79fd3a..b4fe34bf4292e 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TranslationsTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TranslationsTest.kt
@@ -128,7 +128,7 @@ class TranslationsTest : BaseSessionTest() {
     fun onTranslationStateChangeDelegateTest() {
         if (sessionRule.env.isAutomation) {
             sessionRule.delegateDuringNextWait(object : Delegate {
-                @AssertCalled(count = 2)
+                @AssertCalled(count = 1)
                 override fun onTranslationStateChange(
                     session: GeckoSession,
                     translationState: TranslationState?,
@@ -138,7 +138,7 @@ class TranslationsTest : BaseSessionTest() {
         } else {
             // For use when running from Android Studio
             sessionRule.delegateDuringNextWait(object : Delegate {
-                @AssertCalled(count = 3)
+                @AssertCalled(count = 2)
                 override fun onTranslationStateChange(
                     session: GeckoSession,
                     translationState: TranslationState?,
@@ -292,32 +292,26 @@ class TranslationsTest : BaseSessionTest() {
     fun translateTest() {
         var delegateCalled = 0
         sessionRule.delegateUntilTestEnd(object : Delegate {
-            @AssertCalled(count = 4)
+            @AssertCalled(count = 3)
             override fun onTranslationStateChange(
                 session: GeckoSession,
                 translationState: TranslationState?,
             ) {
                 delegateCalled++
-                // Actor created
+                // Before page load
                 if (delegateCalled == 1) {
                     assertTrue(
                         "Translations correctly does not have a requested pair.",
                         translationState?.requestedTranslationPair == null,
                     )
                 }
-
                 // Page load
                 if (delegateCalled == 2) {
-                    // Nothing to check here.
-                }
-
-                // Detection complete
-                if (delegateCalled == 3) {
                     assertTrue("Translations correctly has detected a page language. ", translationState?.detectedLanguages?.docLangTag == "es")
                 }
 
                 // Translate
-                if (delegateCalled == 4) {
+                if (delegateCalled == 3) {
                     assertTrue("Translations correctly has set a translation pair from language. ", translationState?.requestedTranslationPair?.fromLanguage == "es")
                     assertTrue("Translations correctly has set a translation pair to language. ", translationState?.requestedTranslationPair?.toLanguage == "en")
                 }
@@ -717,9 +711,17 @@ class TranslationsTest : BaseSessionTest() {
                 .operation(DELETE)
                 .operationLevel(ALL)
                 .build()
-            // Deleting from an empty database is a no-op.
-            sessionRule.waitForResult(RuntimeTranslation.manageLanguageModel(allDeleteAttempt))
-            assertTrue("Delete from empty database succeeds gracefully.", true)
+            try {
+                sessionRule.waitForResult(RuntimeTranslation.manageLanguageModel(allDeleteAttempt))
+                fail("Should not complete deletes in automation.")
+            } catch (e: RuntimeException) {
+                // Wait call causes a runtime exception too.
+                val te = e.cause as TranslationsException
+                assertTrue(
+                    "Correctly could not delete on automated test harness.",
+                    te.code == ERROR_MODEL_COULD_NOT_DELETE,
+                )
+            }
 
             val malformedRequest = ModelManagementOptions.Builder()
                 .operation("not-a-function")
diff --git a/toolkit/components/translations/TranslationsFeature.sys.mjs b/toolkit/components/translations/TranslationsFeature.sys.mjs
index d4d8c5264716f..d63a27bfd0e03 100644
--- a/toolkit/components/translations/TranslationsFeature.sys.mjs
+++ b/toolkit/components/translations/TranslationsFeature.sys.mjs
@@ -3,26 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import { AIFeature } from "chrome://global/content/ml/AIFeature.sys.mjs";
+import { TranslationsUtils } from "chrome://global/content/translations/TranslationsUtils.mjs";
 
-/**
- * @typedef {object} Lazy
- * @property {typeof console} console
- * @property {typeof import("chrome://global/content/translations/TranslationsUtils.mjs").TranslationsUtils} TranslationsUtils
- * @property {typeof import("chrome://global/content/ml/EngineProcess.sys.mjs").EngineProcess} EngineProcess
- * @property {typeof import("chrome://global/content/translations/TranslationsTelemetry.sys.mjs").TranslationsTelemetry} TranslationsTelemetry
- */
-
-/** @type {Lazy} */
 const lazy = {};
 
-ChromeUtils.defineESModuleGetters(lazy, {
-  TranslationsUtils:
-    "chrome://global/content/translations/TranslationsUtils.mjs",
-  EngineProcess: "chrome://global/content/ml/EngineProcess.sys.mjs",
-  TranslationsTelemetry:
-    "chrome://global/content/translations/TranslationsTelemetry.sys.mjs",
-});
-
 ChromeUtils.defineLazyGetter(lazy, "console", () => {
   return console.createInstance({
     maxLogLevelPref: "browser.translations.logLevel",
@@ -60,7 +44,6 @@ export class TranslationsFeature extends AIFeature {
 
     Services.prefs.setStringPref(AI_CONTROL_TRANSLATIONS_PREF, "enabled");
     Services.prefs.setBoolPref(TRANSLATIONS_ENABLE_PREF, true);
-    lazy.TranslationsTelemetry.onFeatureEnable();
   }
 
   /**
@@ -78,11 +61,7 @@ export class TranslationsFeature extends AIFeature {
     Services.prefs.setStringPref(AI_CONTROL_TRANSLATIONS_PREF, "blocked");
     Services.prefs.setBoolPref(TRANSLATIONS_ENABLE_PREF, false);
 
-    await Promise.allSettled([
-      lazy.EngineProcess.destroyTranslationsEngine(),
-      TranslationsFeature.#deleteAllArtifacts(),
-    ]);
-    lazy.TranslationsTelemetry.onFeatureDisable();
+    await TranslationsFeature.#deleteAllArtifacts();
   }
 
   /**
@@ -100,11 +79,7 @@ export class TranslationsFeature extends AIFeature {
     Services.prefs.clearUserPref(AI_CONTROL_TRANSLATIONS_PREF);
     Services.prefs.clearUserPref(TRANSLATIONS_ENABLE_PREF);
 
-    await Promise.allSettled([
-      lazy.EngineProcess.destroyTranslationsEngine(),
-      TranslationsFeature.#deleteAllArtifacts(),
-    ]);
-    lazy.TranslationsTelemetry.onFeatureReset();
+    await TranslationsFeature.#deleteAllArtifacts();
   }
 
   /**
@@ -160,7 +135,7 @@ export class TranslationsFeature extends AIFeature {
    */
   static async #deleteAllArtifacts() {
     try {
-      await lazy.TranslationsUtils.deleteAllLanguageFiles();
+      await TranslationsUtils.deleteAllLanguageFiles();
     } catch (error) {
       lazy.console.error(
         "Failed to delete Translations language files.",
diff --git a/toolkit/components/translations/TranslationsTelemetry.sys.mjs b/toolkit/components/translations/TranslationsTelemetry.sys.mjs
index a8b0268c6efd6..20cfd03ff4a04 100644
--- a/toolkit/components/translations/TranslationsTelemetry.sys.mjs
+++ b/toolkit/components/translations/TranslationsTelemetry.sys.mjs
@@ -432,27 +432,6 @@ export class TranslationsTelemetry {
       }
     );
   }
-
-  static onFeatureEnable() {
-    Glean.translationsFeature.enable.record();
-    TranslationsTelemetry.logEventToConsole(
-      TranslationsTelemetry.onFeatureEnable
-    );
-  }
-
-  static onFeatureDisable() {
-    Glean.translationsFeature.disable.record();
-    TranslationsTelemetry.logEventToConsole(
-      TranslationsTelemetry.onFeatureDisable
-    );
-  }
-
-  static onFeatureReset() {
-    Glean.translationsFeature.reset.record();
-    TranslationsTelemetry.logEventToConsole(
-      TranslationsTelemetry.onFeatureReset
-    );
-  }
 }
 
 /**
diff --git a/toolkit/components/translations/TranslationsUtils.mjs b/toolkit/components/translations/TranslationsUtils.mjs
index 06840b679fbcc..18671a7feab93 100644
--- a/toolkit/components/translations/TranslationsUtils.mjs
+++ b/toolkit/components/translations/TranslationsUtils.mjs
@@ -9,7 +9,6 @@
 /**
  * @typedef {object} Lazy
  * @property {typeof console} console
- * @property {typeof import("resource://services-settings/RemoteSettingsClient.sys.mjs").RemoteSettingsClient} RemoteSettingsClient
  */
 
 /** @type {Lazy} */
@@ -22,11 +21,6 @@ ChromeUtils.defineLazyGetter(lazy, "console", () => {
   });
 });
 
-ChromeUtils.defineESModuleGetters(lazy, {
-  RemoteSettingsClient:
-    "resource://services-settings/RemoteSettingsClient.sys.mjs",
-});
-
 /**
  * A set of global static utility functions that are useful throughout the
  * Translations ecosystem within the Firefox code base.
@@ -175,17 +169,7 @@ export class TranslationsUtils {
     const client = RemoteSettings(
       TranslationsUtils.translationsModelsCollectionName
     );
-
-    try {
-      await client.attachments.deleteAll();
-    } catch (error) {
-      if (!(error instanceof lazy.RemoteSettingsClient.EmptyDatabaseError)) {
-        lazy.console.error(
-          "Failed to delete Translations language files.",
-          error
-        );
-      }
-    }
+    await client.attachments.deleteAll();
 
     try {
       const records = await client.get({
diff --git a/toolkit/components/translations/actors/AboutTranslationsChild.sys.mjs b/toolkit/components/translations/actors/AboutTranslationsChild.sys.mjs
index 3659382b17cb8..74bed28da60f9 100644
--- a/toolkit/components/translations/actors/AboutTranslationsChild.sys.mjs
+++ b/toolkit/components/translations/actors/AboutTranslationsChild.sys.mjs
@@ -39,30 +39,21 @@ export class AboutTranslationsChild extends JSWindowActorChild {
     "browser.translations.useHTML"
   );
 
-  async handleEvent(event) {
+  handleEvent(event) {
     if (event.type === "DOMDocElementInserted") {
       this.#exportFunctions();
     }
 
-    if (event.type === "DOMContentLoaded") {
-      const enabled = await this.sendQuery("AboutTranslations:GetEnabledState");
-      this.#sendEventToContent({
-        type: "enabled-state-changed",
-        enabled,
-      });
+    if (
+      event.type === "DOMContentLoaded" &&
+      Services.prefs.getBoolPref("browser.translations.enable")
+    ) {
+      this.#sendEventToContent({ type: "enable" });
     }
   }
 
   receiveMessage({ name, data }) {
     switch (name) {
-      case "AboutTranslations:EnabledStateChanged": {
-        const { enabled } = data;
-        this.#sendEventToContent({
-          type: "enabled-state-changed",
-          enabled,
-        });
-        break;
-      }
       case "AboutTranslations:SendTranslationsPort": {
         const { languagePair, port } = data;
         const transferables = [port];
diff --git a/toolkit/components/translations/actors/AboutTranslationsParent.sys.mjs b/toolkit/components/translations/actors/AboutTranslationsParent.sys.mjs
index c3d0889a28783..25c70fb80c4eb 100644
--- a/toolkit/components/translations/actors/AboutTranslationsParent.sys.mjs
+++ b/toolkit/components/translations/actors/AboutTranslationsParent.sys.mjs
@@ -33,16 +33,11 @@ export class AboutTranslationsParent extends JSWindowActorParent {
   #languageDisplayNames = null;
 
   actorCreated() {
-    lazy.TranslationsParent.ensurePrefObservers();
     this.#boundObserve = this.#observe.bind(this);
     Services.obs.addObserver(
       this.#boundObserve,
       "translations:model-records-changed"
     );
-    Services.obs.addObserver(
-      this.#boundObserve,
-      "translations:enabled-state-changed"
-    );
   }
 
   didDestroy() {
@@ -51,39 +46,15 @@ export class AboutTranslationsParent extends JSWindowActorParent {
         this.#boundObserve,
         "translations:model-records-changed"
       );
-      Services.obs.removeObserver(
-        this.#boundObserve,
-        "translations:enabled-state-changed"
-      );
       this.#boundObserve = null;
     }
     this.#isDestroyed = true;
   }
 
-  /**
-   * Observes notifications for about:translations updates.
-   *
-   * @param {nsISupports} _subject
-   * @param {string} topic
-   * @param {string} data
-   *
-   * @see {nsIObserver}
-   */
-  #observe(_subject, topic, data) {
-    if (this.#isDestroyed) {
-      return;
-    }
-
+  #observe(subject, topic) {
     switch (topic) {
       case "translations:model-records-changed": {
         this.sendAsyncMessage("AboutTranslations:RebuildTranslator");
-        break;
-      }
-      case "translations:enabled-state-changed": {
-        this.sendAsyncMessage("AboutTranslations:EnabledStateChanged", {
-          enabled: data === "enabled",
-        });
-        break;
       }
     }
   }
@@ -139,9 +110,6 @@ export class AboutTranslationsParent extends JSWindowActorParent {
       case "AboutTranslations:IsTranslationsEngineSupported": {
         return lazy.TranslationsParent.getIsTranslationsEngineSupported();
       }
-      case "AboutTranslations:GetEnabledState": {
-        return lazy.TranslationsParent.AIFeature.isEnabled;
-      }
       case "AboutTranslations:OpenSupportPage": {
         const browser = this.browsingContext.top.embedderElement;
         browser.ownerGlobal.openTrustedLinkIn(
diff --git a/toolkit/components/translations/actors/TranslationsChild.sys.mjs b/toolkit/components/translations/actors/TranslationsChild.sys.mjs
index b328dab5b3a40..0f1daa5e09c6b 100644
--- a/toolkit/components/translations/actors/TranslationsChild.sys.mjs
+++ b/toolkit/components/translations/actors/TranslationsChild.sys.mjs
@@ -140,10 +140,6 @@ export class TranslationsChild extends JSWindowActorChild {
       case "Translations:GetDocumentElementLang": {
         return this.document.documentElement.lang;
       }
-      case "Translations:IsDocumentReady": {
-        const state = this.document.readyState;
-        return state === "interactive" || state === "complete";
-      }
       case "Translations:AcquirePort": {
         this.addProfilerMarker("Acquired a port, resuming translations");
         this.#translatedDoc.acquirePort(data.port);
diff --git a/toolkit/components/translations/actors/TranslationsParent.sys.mjs b/toolkit/components/translations/actors/TranslationsParent.sys.mjs
index f62fbab7bf900..e5437f25ff743 100644
--- a/toolkit/components/translations/actors/TranslationsParent.sys.mjs
+++ b/toolkit/components/translations/actors/TranslationsParent.sys.mjs
@@ -30,8 +30,6 @@ const MOST_RECENT_TARGET_LANGS_PREF =
   "browser.translations.mostRecentTargetLanguages";
 const TOPIC_NS_PREF_CHANGED = "nsPref:changed";
 const TOPIC_TRANSLATIONS_PREF_CHANGED = "translations:pref-changed";
-const TOPIC_TRANSLATIONS_ENABLED_STATE_CHANGED =
-  "translations:enabled-state-changed";
 const TOPIC_MAYBE_UPDATE_USER_LANG_TAG =
   "translations:maybe-update-user-lang-tag";
 const TOPIC_APP_LOCALES_CHANGED = "intl:app-locales-changed";
@@ -104,6 +102,12 @@ ChromeUtils.defineLazyGetter(lazy, "console", () => {
   });
 });
 
+XPCOMUtils.defineLazyPreferenceGetter(
+  lazy,
+  "translationsEnabledPref",
+  "browser.translations.enable"
+);
+
 /**
  * Returns whether Translations should utilize lexical shortlisting.
  */
@@ -238,72 +242,65 @@ const VERIFY_SIGNATURES_FROM_FS = false;
  */
 
 /**
- * The state that is stored per tab.
+ * The state that is stored per a "top" ChromeWindow. This "top" ChromeWindow is the JS
+ * global associated with a browser window. Some state is unique to a browser window, and
+ * using the top ChromeWindow is a unique key that ensures the state will be unique to
+ * that browser window.
  *
+ * See BrowsingContext.webidl for information on the "top"
  * See the TranslationsParent JSDoc for more information on the state management.
  */
-class StatePerTab {
+class StatePerTopChromeWindow {
   /**
-   * A mapping from the browser element to the state for this tab.
+   * The storage backing for the states.
    *
-   * @type {WeakMap<object, StatePerTab>}
+   * @type {WeakMap<ChromeWindow, StatePerTopChromeWindow>}
    */
   static #states = new WeakMap();
 
   /**
    * When reloading the page, store the language pair that needs translating.
    *
-   * @type {LanguagePair | null}
+   * @type {null | LanguagePair}
    */
   translateOnPageReload = null;
 
   /**
-   * Remember the detected languages on a page reload. This will keep the translations
-   * button from disappearing and reappearing, which causes the button to lose focus.
-   *
-   * @type {LangTags | null}
-   */
-  detectedLanguages = null;
-
-  /**
-   * The URL of the page where detectedLanguages was captured.
-   *
-   * This is used to ensure that the cached detectedLanguage are only considered
-   * if we are on the same URL that they were captured from, otherwise they are
-   * ignored and discarded.
+   * The page may auto-translate due to user settings. On a page restore, always
+   * skip the page restore logic.
    *
-   * @type {string | null}
+   * @type {boolean}
    */
-  url = null;
+  isPageRestored = false;
 
   /**
-   * The page may auto-translate due to user settings. On a page restore, always
-   * skip the logic that would cause an immediate auto re-translation.
+   * Remember the detected languages on a page reload. This will keep the translations
+   * button from disappearing and reappearing, which causes the button to lose focus.
    *
-   * @type {boolean}
+   * @type {LangTags | null} previousDetectedLanguages
    */
-  skipAutoTranslate = false;
+  previousDetectedLanguages = null;
 
+  static #id = 0;
   /**
-   * If a translation was active when the feature was disabled, the page content
-   * is in a partially translated state and needs to be reloaded before allowing
-   * a new translation.
-   *
-   * @type {boolean}
+   * @param {ChromeWindow} topChromeWindow
    */
-  needsReloadBeforeTranslation = false;
+  constructor(topChromeWindow) {
+    this.id = StatePerTopChromeWindow.#id++;
+    StatePerTopChromeWindow.#states.set(topChromeWindow, this);
+  }
 
   /**
-   * @param {object} browser
-   * @returns {StatePerTab}
+   * @param {ChromeWindow} topChromeWindow
+   * @returns {StatePerTopChromeWindow}
    */
-  static getOrCreate(browser) {
-    let state = StatePerTab.#states.get(browser);
+  static getOrCreate(topChromeWindow) {
+    let state = StatePerTopChromeWindow.#states.get(topChromeWindow);
     if (state) {
       return state;
     }
-    state = new StatePerTab();
-    StatePerTab.#states.set(browser, state);
+    state = new StatePerTopChromeWindow(topChromeWindow);
+    StatePerTopChromeWindow.#states.set(topChromeWindow, state);
     return state;
   }
 }
@@ -316,7 +313,7 @@ class StatePerTab {
  * Care must be taken for the life cycle of the state management and data caching. The
  * following examples use a fictitious `myState` property to show how state can be stored.
  *
- * There is only one TranslationsParent static class in the parent process. At this
+ * There is only 1 TranslationsParent static class in the parent process. At this
  * layer it is safe to store things like translation models and general browser
  * configuration as these don't change across browser windows. This is accessed like
  * `TranslationsParent.myState`
@@ -328,30 +325,26 @@ class StatePerTab {
  * abstraction, like `this.getWindowState().myState`. This layer also consists of a
  * `FullPageTranslationsPanel` instance per top ChromeWindow (at least on Desktop).
  *
- * The final layer consists of the TranslationsParent actor instances, which exist per tab
- * and are recreated on page reload. Data for this layer is safe to store on the
- * TranslationsParent instance, like `this.myState`. However, any data related to the actor
- * instance that needs to persist between page loads or navigation should be stored in the
- * StatePerTab map.
+ * The final layer consists of the multiple tabs and navigation history inside of a
+ * ChromeWindow. Data for this layer is safe to store on the TranslationsParent instance,
+ * like `this.myState`.
  *
  * Below is an ascii diagram of this relationship.
  *
  *   ┌─────────────────────────────────────────────────────────────────────────────┐
  *   │                           static TranslationsParent                         │
  *   └─────────────────────────────────────────────────────────────────────────────┘
- *                    |                                         |
- *                    v                                         v
+ *                  |                                       |
+ *                  v                                       v
  * ┌──────────────────────────────────────┐   ┌──────────────────────────────────────┐
  * │         top ChromeWindow             │   │        top ChromeWindow              │
  * │ (FullPageTranslationsPanel instance) │   │ (FullPageTranslationsPanel instance) │
- * │ + (Translations URL Button instance) │   │ + (Translations URL Button instance) │
  * └──────────────────────────────────────┘   └──────────────────────────────────────┘
  *             |               |       |                |              |       |
  *             v               v       v                v              v       v
  *   ┌────────────────────┐ ┌─────┐ ┌─────┐  ┌────────────────────┐ ┌─────┐ ┌─────┐
  *   │ TranslationsParent │ │ ... │ │ ... │  │ TranslationsParent │ │ ... │ │ ... │
  *   │  (actor instance)  │ │     │ │     │  │  (actor instance)  │ │     │ │     │
- *   │   + StatePerTab    │ │     │ │     │  │   + StatePerTab    │ │     │ │     │
  *   └────────────────────┘ └─────┘ └─────┘  └────────────────────┘ └─────┘ └─────┘
  */
 export class TranslationsParent extends JSWindowActorParent {
@@ -502,27 +495,16 @@ export class TranslationsParent extends JSWindowActorParent {
   static #REACT_TO_PAGE_LANGUAGE_TIMEOUT = 500;
 
   /**
-   * Tracks the language-detection lifecycle for the page associated with this actor.
-   * - null: Detection has not started.
-   * - PromiseWithResolvers: Detection has started.
-   *
-   * The promise resolves with the reason that detection started, so that it can be
-   * logged to the console.
-   *
-   * Detection may start due to 3 scenarios.
-   *
-   * 1) The page loaded while the Translations feature was disabled, and then the user
-   *    enabled the feature in a different tab via the Firefox AI Settings.
+   * A race that determines when to react to to the page's language tag.
    *
-   * 2) The page loaded with the Translations feature enabled, and we received the "load"
-   *    event before our timeout, signaling that we are ready to scrape the page content.
+   * Ideally, we want to wait for the page to fully load, but we may have
+   * to take action before that.
    *
-   * 3) The page is loading with the Translations feature enabled, and we received DOMContentLoaded,
-   *    but have not received the "load" event before our specified timeout.
+   * @see {TranslationsParent#REACT_TO_PAGE_LANGUAGE_TIMEOUT}
    *
    * @type {PromiseWithResolvers<string> | null}
    */
-  #languageDetectionReason = null;
+  #reactToPageLanguageRace = null;
 
   /**
    * Contains the state that would affect UI. Anytime this state is changed, a dispatch
@@ -575,41 +557,39 @@ export class TranslationsParent extends JSWindowActorParent {
     return this.#findBar;
   }
 
-  actorCreated() {
-    const browser = this.browsingContext?.top?.embedderElement;
-    if (!browser) {
-      lazy.console.warn("Actor created for invalid browser element");
-      return;
-    }
-
-    this.innerWindowId = browser.innerWindowID;
-    const tabState = StatePerTab.getOrCreate(browser);
-
-    const currentUrl = browser.currentURI?.spec;
-    const detectedLanguages =
-      currentUrl === tabState.url ? tabState.detectedLanguages : null;
-
-    tabState.detectedLanguages = null;
-    tabState.url = null;
+  /**
+   * There is only one static TranslationsParent for all of the top ChromeWindows.
+   * The top ChromeWindow maps to the user's conception of a window such as when you hit
+   * cmd+n or ctrl+n.
+   *
+   * @returns {StatePerTopChromeWindow}
+   */
+  getWindowState() {
+    const state = StatePerTopChromeWindow.getOrCreate(
+      this.browsingContext.top.embedderWindowGlobal
+    );
+    return state;
+  }
 
-    this.languageState = new TranslationsLanguageState(this, detectedLanguages);
+  actorCreated() {
+    this.innerWindowId = this.browsingContext.top.embedderElement.innerWindowID;
+    const windowState = this.getWindowState();
+    this.languageState = new TranslationsLanguageState(
+      this,
+      windowState.previousDetectedLanguages
+    );
+    windowState.previousDetectedLanguages = null;
 
     this.#boundObserve = this.#observe.bind(this);
     Services.obs.addObserver(
       this.#boundObserve,
       TOPIC_MAYBE_UPDATE_USER_LANG_TAG
     );
-    Services.obs.addObserver(
-      this.#boundObserve,
-      TOPIC_TRANSLATIONS_ENABLED_STATE_CHANGED
-    );
-
-    this.#registerFindBarEventListeners(browser);
 
-    if (tabState.translateOnPageReload) {
+    if (windowState.translateOnPageReload) {
       // The actor was recreated after a page reload, start the translation.
-      const languagePair = tabState.translateOnPageReload;
-      tabState.translateOnPageReload = null;
+      const languagePair = windowState.translateOnPageReload;
+      windowState.translateOnPageReload = null;
 
       lazy.console.log(
         `Translating on a page reload from "${lazy.TranslationsUtils.serializeLanguagePair(languagePair)}".`
@@ -619,92 +599,12 @@ export class TranslationsParent extends JSWindowActorParent {
         languagePair,
         false // reportAsAutoTranslate
       );
-
-      return;
-    }
-
-    // On Android there is no gBrowser, but there is effectively only one tab visible
-    // at a time, so treat Android as always having the selected tab.
-    const isSelectedTab =
-      AppConstants.platform === "android" ||
-      browser === browser.ownerGlobal?.gBrowser?.selectedBrowser;
-
-    if (tabState.needsReloadBeforeTranslation && isSelectedTab) {
-      tabState.needsReloadBeforeTranslation = false;
-      browser.reload();
-      return;
     }
 
-    this.languageState.dispatch({ reason: "actor-created" });
-    this.#maybeDetectLanguagesIfDocumentReady(isSelectedTab);
-  }
-
-  /**
-   * If the document is already in an interactive or complete state, run language detection.
-   * Otherwise, do nothing, since the language detection will trigger when the page loads.
-   *
-   * This is needed when the feature is re-enabled on pages that are already loaded.
-   *
-   * @param {boolean} isSelectedTab
-   */
-  async #maybeDetectLanguagesIfDocumentReady(isSelectedTab) {
-    if (this.languageState.detectedLanguages || this.#languageDetectionReason) {
-      // Detection already completed or is in progress.
-      return;
-    }
-
-    let isDocumentReady;
-    try {
-      isDocumentReady = await this.sendQuery("Translations:IsDocumentReady");
-    } catch (error) {
-      lazy.console.error("Failed to check document readiness.", error);
-      return;
-    }
-
-    if (this.#isDestroyed) {
-      return;
-    }
-
-    if (!isDocumentReady) {
-      // The document is not ready yet. Language detection will be triggered when the page loads.
-      return;
-    }
-
-    if (this.#languageDetectionReason) {
-      // The document is ready, but the DOMContentLoaded path already triggered language detection.
-      return;
+    const browser = this.browsingContext.top.embedderElement;
+    if (browser) {
+      this.#registerFindBarEventListeners(browser);
     }
-
-    this.#languageDetectionReason = Promise.withResolvers();
-    this.#languageDetectionReason.resolve("actor-created");
-
-    await this.#languageDetectionReason.promise.then(async reason => {
-      try {
-        if (this.#isDestroyed) {
-          return;
-        }
-
-        const htmlLangAttribute = await this.queryDocumentElementLang();
-        if (this.#isDestroyed) {
-          return;
-        }
-
-        if (isSelectedTab) {
-          await this.#reactToPageLanguage(htmlLangAttribute, reason);
-        } else {
-          const detectedLanguages =
-            await this.getDetectedLanguages(htmlLangAttribute);
-
-          if (this.#isDestroyed || !detectedLanguages) {
-            return;
-          }
-
-          this.languageState.detectedLanguages = detectedLanguages;
-        }
-      } catch (error) {
-        lazy.console.error("Failed to run language detection.", error);
-      }
-    });
   }
 
   /**
@@ -1219,21 +1119,6 @@ export class TranslationsParent extends JSWindowActorParent {
     TranslationsParent.#preferredLanguages = null;
   }
 
-  /**
-   * Notifies observers when the Translations feature enabled state changes.
-   * Called by ActorManagerParent after the actor has been registered or unregistered,
-   * ensuring that actors are available when observers receive the notification.
-   *
-   * @param {boolean} isEnabled
-   */
-  static onIsEnabledChanged(isEnabled) {
-    Services.obs.notifyObservers(
-      null,
-      TOPIC_TRANSLATIONS_ENABLED_STATE_CHANGED,
-      isEnabled ? "enabled" : "disabled"
-    );
-  }
-
   /**
    * Provide a way for tests to override the system locales.
    *
@@ -1377,7 +1262,7 @@ export class TranslationsParent extends JSWindowActorParent {
    * Initializes static pref observers exactly once the first time this is called.
    * Does nothing on subsequent calls.
    */
-  static ensurePrefObservers() {
+  static #maybeStartObservingPrefs() {
     if (TranslationsParent.#observingPrefs) {
       // We have already initialized the observers.
       return;
@@ -1544,12 +1429,6 @@ export class TranslationsParent extends JSWindowActorParent {
         this.#maybeUpdateUserLangTag();
         break;
       }
-      case TOPIC_TRANSLATIONS_ENABLED_STATE_CHANGED: {
-        this.languageState?.dispatch({
-          reason: "feature-enabled-state-changed",
-        });
-        break;
-      }
       default: {
         lazy.console.error(
           `Unexpected topic observed by TranslationsParent actor: '${topic}'`
@@ -1620,12 +1499,8 @@ export class TranslationsParent extends JSWindowActorParent {
    * Updates the user's language tag if it has changed from the current.
    */
   #maybeUpdateUserLangTag() {
-    if (!this.languageState) {
-      return;
-    }
-    const docLangTag = this.languageState.detectedLanguages?.docLangTag;
     const langTag = TranslationsParent.getPreferredLanguages({
-      excludeLangTags: docLangTag ? [docLangTag] : [],
+      excludeLangTags: [this.languageState.detectedLanguages?.docLangTag],
     })[0];
     this.languageState.maybeUpdateUserLangTag(langTag);
   }
@@ -1653,7 +1528,7 @@ export class TranslationsParent extends JSWindowActorParent {
       );
     }
 
-    TranslationsParent.ensurePrefObservers();
+    TranslationsParent.#maybeStartObservingPrefs();
 
     const preferredLanguages = new Set([
       ...TranslationsParent.#getMostRecentTargetLanguages(),
@@ -1775,22 +1650,17 @@ export class TranslationsParent extends JSWindowActorParent {
 
     switch (name) {
       case "Translations:DOMContentLoaded": {
-        if (
-          this.languageState?.detectedLanguages ||
-          this.#languageDetectionReason
-        ) {
-          return undefined;
-        }
-
         const { htmlLangAttribute } = data;
-        this.#languageDetectionReason = Promise.withResolvers();
-        const { promise, resolve } = this.#languageDetectionReason;
 
-        promise.then(async reason => {
+        this.#reactToPageLanguageRace = Promise.withResolvers();
+        const { promise, resolve } = this.#reactToPageLanguageRace;
+
+        promise.then(reason => {
           if (this.#isDestroyed) {
             return;
           }
-          await this.#reactToPageLanguage(htmlLangAttribute, reason);
+          this.#reactToPageLanguage(htmlLangAttribute, reason);
+          this.#reactToPageLanguageRace = null;
         });
 
         lazy.setTimeout(() => {
@@ -1800,16 +1670,10 @@ export class TranslationsParent extends JSWindowActorParent {
         return undefined;
       }
       case "Translations:Load": {
-        this.#languageDetectionReason?.resolve("load");
+        this.#reactToPageLanguageRace?.resolve("load");
         return undefined;
       }
       case "Translations:RequestPort": {
-        if (!this.languageState) {
-          lazy.console.error(
-            "A port was requested but the actor was not fully initialized"
-          );
-          return undefined;
-        }
         const { requestedLanguagePair } = this.languageState;
         if (!requestedLanguagePair) {
           lazy.console.error(
@@ -1854,9 +1718,7 @@ export class TranslationsParent extends JSWindowActorParent {
         return undefined;
       }
       case "Translations:ReportFirstVisibleChange": {
-        if (this.languageState) {
-          this.languageState.hasVisibleChange = true;
-        }
+        this.languageState.hasVisibleChange = true;
       }
     }
     return undefined;
@@ -1948,11 +1810,10 @@ export class TranslationsParent extends JSWindowActorParent {
    * @returns {boolean}
    */
   #maybeAutoTranslate(langTags) {
-    const browser = this.browsingContext.top.embedderElement;
-    const tabState = StatePerTab.getOrCreate(browser);
-    if (tabState.skipAutoTranslate) {
+    const windowState = this.getWindowState();
+    if (windowState.isPageRestored) {
       // The user clicked the restore button. Respect it for one page load.
-      tabState.skipAutoTranslate = false;
+      windowState.isPageRestored = false;
 
       // Skip this auto-translation.
       return false;
@@ -2546,7 +2407,7 @@ export class TranslationsParent extends JSWindowActorParent {
       return TranslationsParent.#translationModelRecords;
     }
 
-    TranslationsParent.ensurePrefObservers();
+    TranslationsParent.#maybeStartObservingPrefs();
 
     // Load the models. If no data is present, then there will be an initial sync.
     // Rely on Remote Settings for the syncing strategy for receiving updates.
@@ -3569,152 +3430,110 @@ export class TranslationsParent extends JSWindowActorParent {
       );
       return;
     }
-    const browser = this.browsingContext.top.embedderElement;
-    const tabState = StatePerTab.getOrCreate(browser);
-
-    if (tabState.needsReloadBeforeTranslation) {
-      tabState.needsReloadBeforeTranslation = false;
-      tabState.translateOnPageReload = languagePair;
-      browser.reload();
-      return;
-    }
-
-    if (!this.languageState) {
-      lazy.console.error(
-        "Translation requested but actor not fully initialized"
-      );
-      return;
-    }
-
     if (this.languageState.requestedLanguagePair) {
-      tabState.translateOnPageReload = languagePair;
-      this.restorePage();
-      return;
-    }
-
-    const detectedLanguages =
-      await this.#ensureDetectedLanguagesForTranslation();
-    if (!detectedLanguages) {
-      return;
-    }
+      // This page has already been translated, restore it and translate it
+      // again once the actor has been recreated.
+      const windowState = this.getWindowState();
+      windowState.translateOnPageReload = languagePair;
+      this.restorePage(sourceLanguage);
+    } else {
+      const { docLangTag } = this.languageState.detectedLanguages;
 
-    const { docLangTag } = detectedLanguages;
+      if (!this.innerWindowId) {
+        throw new Error(
+          "The innerWindowId for the TranslationsParent was not available."
+        );
+      }
 
-    if (!this.innerWindowId) {
-      throw new Error(
-        "The innerWindowId for the TranslationsParent was not available."
+      // The MessageChannel will be used for communicating directly between the content
+      // process and the engine's process.
+      const port = await TranslationsParent.requestTranslationsPort(
+        languagePair,
+        this
       );
-    }
 
-    // The MessageChannel will be used for communicating directly between the content
-    // process and the engine's process.
-    const port = await TranslationsParent.requestTranslationsPort(
-      languagePair,
-      this
-    );
-
-    if (!port) {
-      lazy.console.error(
-        `Failed to create a translations port for language pair: (${lazy.TranslationsUtils.serializeLanguagePair(languagePair)})`
-      );
-      return;
-    }
+      if (!port) {
+        lazy.console.error(
+          `Failed to create a translations port for language pair: (${lazy.TranslationsUtils.serializeLanguagePair(languagePair)})`
+        );
+        return;
+      }
 
-    this.languageState.requestedLanguagePair = languagePair;
+      this.languageState.requestedLanguagePair = languagePair;
 
-    const preferredLanguages = TranslationsParent.getPreferredLanguages();
-    const topPreferredLanguage =
-      preferredLanguages && preferredLanguages.length
-        ? preferredLanguages[0]
-        : null;
+      const preferredLanguages = TranslationsParent.getPreferredLanguages();
+      const topPreferredLanguage =
+        preferredLanguages && preferredLanguages.length
+          ? preferredLanguages[0]
+          : null;
 
-    TranslationsParent.telemetry().onTranslate({
-      docLangTag,
-      sourceLanguage,
-      targetLanguage,
-      topPreferredLanguage,
-      autoTranslate: reportAsAutoTranslate,
-      requestTarget: "full_page",
-    });
+      TranslationsParent.telemetry().onTranslate({
+        docLangTag,
+        sourceLanguage,
+        targetLanguage,
+        topPreferredLanguage,
+        autoTranslate: reportAsAutoTranslate,
+        requestTarget: "full_page",
+      });
 
-    TranslationsParent.storeMostRecentTargetLanguage(targetLanguage);
+      TranslationsParent.storeMostRecentTargetLanguage(targetLanguage);
 
-    let isFindBarOpen;
+      let isFindBarOpen;
 
-    if (this.#findBar) {
-      isFindBarOpen = !this.#findBar.hidden;
-    }
+      if (this.#findBar) {
+        isFindBarOpen = !this.#findBar.hidden;
+      }
 
-    if (isFindBarOpen === undefined && AppConstants.platform !== "android") {
-      /* eslint-disable-next-line no-shadow */
-      const browser = this.browsingContext?.top.embedderElement;
-      if (browser) {
-        const tabBrowser = browser.getTabBrowser();
-        const findBar = tabBrowser.getCachedFindBar();
+      if (isFindBarOpen === undefined && AppConstants.platform !== "android") {
+        const browser = this.browsingContext?.top.embedderElement;
+        if (browser) {
+          const tabBrowser = browser.getTabBrowser();
+          const findBar = tabBrowser.getCachedFindBar();
 
-        if (findBar) {
-          isFindBarOpen = findBar.hidden;
-        } else {
-          isFindBarOpen = false;
+          if (findBar) {
+            isFindBarOpen = findBar.hidden;
+          } else {
+            isFindBarOpen = false;
+          }
         }
       }
-    }
 
-    this.sendAsyncMessage(
-      "Translations:TranslatePage",
-      {
-        isFindBarOpen,
-        languagePair,
-        port,
-      },
-      // https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Transferable_objects
-      // Mark the MessageChannel port as transferable.
-      [port]
-    );
+      this.sendAsyncMessage(
+        "Translations:TranslatePage",
+        {
+          isFindBarOpen,
+          languagePair,
+          port,
+        },
+        // https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Transferable_objects
+        // Mark the MessageChannel port as transferable.
+        [port]
+      );
+    }
   }
 
   /**
    * Restore the page to the original language by doing a hard reload.
    */
   restorePage() {
-    if (!this.languageState) {
-      lazy.console.error(
-        "Restore page requested but actor not fully initialized"
-      );
-      return;
-    }
     TranslationsParent.telemetry().onRestorePage();
-    const browser = this.browsingContext.embedderElement;
-    const tabState = StatePerTab.getOrCreate(browser);
-    tabState.skipAutoTranslate = true;
-    tabState.needsReloadBeforeTranslation = false;
-    tabState.detectedLanguages = this.languageState.detectedLanguages;
-    tabState.url = browser.currentURI?.spec;
+    // Skip auto-translate for one page load.
+    const windowState = this.getWindowState();
+    windowState.isPageRestored = true;
     this.languageState.hasVisibleChange = false;
     this.languageState.requestedLanguagePair = null;
+    windowState.previousDetectedLanguages =
+      this.languageState.detectedLanguages;
 
+    const browser = this.browsingContext.embedderElement;
     browser.reload();
   }
 
-  /**
-   * Called when the browser's location changes. This is only invoked for location
-   * changes in the currently selected browser, not for background tabs.
-   *
-   * @param {object} browser
-   */
   static onLocationChange(browser) {
-    if (!TranslationsParent.AIFeature.isEnabled) {
+    if (!lazy.translationsEnabledPref) {
       // The pref isn't enabled, so don't attempt to get the actor.
       return;
     }
-
-    const tabState = StatePerTab.getOrCreate(browser);
-    if (tabState.needsReloadBeforeTranslation) {
-      tabState.needsReloadBeforeTranslation = false;
-      browser.reload();
-      return;
-    }
-
     let actor;
     try {
       actor =
@@ -3722,7 +3541,6 @@ export class TranslationsParent extends JSWindowActorParent {
     } catch {
       // The actor may not be supported on this page, which throws an error.
     }
-
     actor?.languageState.locationChanged();
   }
 
@@ -4172,34 +3990,6 @@ export class TranslationsParent extends JSWindowActorParent {
     return langTags;
   }
 
-  /**
-   * Ensures that detected languages are available for translation, performing detection if necessary.
-   *
-   * @returns {Promise<LangTags | null>} The detected languages, or null if detection failed
-   */
-  async #ensureDetectedLanguagesForTranslation() {
-    if (this.languageState.detectedLanguages) {
-      return this.languageState.detectedLanguages;
-    }
-
-    const htmlLangAttribute = await this.queryDocumentElementLang();
-    const detectedLanguages =
-      await this.getDetectedLanguages(htmlLangAttribute);
-
-    if (!detectedLanguages) {
-      lazy.console.error("Failed to detect languages for translation request.");
-      return null;
-    }
-
-    this.languageState.detectedLanguages = detectedLanguages;
-
-    await this.maybeOfferTranslations(detectedLanguages).catch(error =>
-      lazy.console.error(error)
-    );
-
-    return detectedLanguages;
-  }
-
   /**
    * The pref for if we can always offer a translation when it's available.
    */
@@ -4537,33 +4327,16 @@ export class TranslationsParent extends JSWindowActorParent {
    * are misbehaving.
    */
   #ensureTranslationsDiscarded() {
-    if (this.engineActor && this.languageState?.requestedLanguagePair) {
+    if (this.engineActor && this.languageState.requestedLanguagePair) {
       this.engineActor.discardTranslations(this.innerWindowId);
     }
   }
 
   didDestroy() {
-    if (!TranslationsParent.AIFeature.isEnabled) {
-      // If the actor is getting destroyed due to the feature becoming disabled,
-      // we have a few things we need to cache in case the user re-enables Translations.
-      //
-      // This can occur if someone flips the global Block AI toggle in the settings,
-      // and then individually re-enables the Translations feature.
-      this.languageState?.dispatch({ reason: "feature-disabled" });
-
-      const browser = this.browsingContext?.top?.embedderElement;
-      if (browser) {
-        const tabState = StatePerTab.getOrCreate(browser);
-
-        if (this.languageState?.detectedLanguages) {
-          tabState.detectedLanguages = this.languageState.detectedLanguages;
-          tabState.url = browser.currentURI?.spec;
-        }
-
-        if (this.languageState?.requestedLanguagePair) {
-          tabState.needsReloadBeforeTranslation = true;
-        }
-      }
+    if (!this.innerWindowId) {
+      throw new Error(
+        "The innerWindowId for the TranslationsParent was not available."
+      );
     }
 
     if (this.#boundObserve) {
@@ -4571,10 +4344,6 @@ export class TranslationsParent extends JSWindowActorParent {
         this.#boundObserve,
         TOPIC_MAYBE_UPDATE_USER_LANG_TAG
       );
-      Services.obs.removeObserver(
-        this.#boundObserve,
-        TOPIC_TRANSLATIONS_ENABLED_STATE_CHANGED
-      );
       this.#boundObserve = null;
     }
 
@@ -4658,26 +4427,22 @@ class TranslationsLanguageState {
    * Dispatch anytime the language details change, so that any UI can react to it.
    */
   dispatch({ reason } = {}) {
-    try {
-      const browser = this.#actor?.browsingContext?.top?.embedderElement;
-      if (!browser) {
-        return;
-      }
-
-      /* eslint-disable-next-line no-shadow */
-      const { CustomEvent } = browser.ownerGlobal;
-      browser.dispatchEvent(
-        new CustomEvent("TranslationsParent:LanguageState", {
-          bubbles: true,
-          detail: {
-            actor: this.#actor,
-            reason,
-          },
-        })
-      );
-    } catch {
-      // The actor may be destroyed. There is nothing to recover here.
+    const browser = this.#actor.browsingContext.top.embedderElement;
+    if (!browser) {
+      return;
     }
+
+    /* eslint-disable-next-line no-shadow */
+    const { CustomEvent } = browser.ownerGlobal;
+    browser.dispatchEvent(
+      new CustomEvent("TranslationsParent:LanguageState", {
+        bubbles: true,
+        detail: {
+          actor: this.#actor,
+          reason,
+        },
+      })
+    );
   }
 
   /**
diff --git a/toolkit/components/translations/content/about-translations.mjs b/toolkit/components/translations/content/about-translations.mjs
index fd806cf607f4b..9547e8e0956ec 100644
--- a/toolkit/components/translations/content/about-translations.mjs
+++ b/toolkit/components/translations/content/about-translations.mjs
@@ -60,20 +60,6 @@ class AboutTranslations {
    */
   #translationId = 0;
 
-  /**
-   * Whether the Translations feature is enabled for this page.
-   *
-   * @type {boolean}
-   */
-  #isFeatureEnabled = true;
-
-  /**
-   * Whether the current system supports the translations engine.
-   *
-   * @type {boolean}
-   */
-  #isTranslationsEngineSupported;
-
   /**
    * The previous source text that was translated.
    *
@@ -180,8 +166,6 @@ class AboutTranslations {
    *        Whether the translations engine is supported by the current system.
    */
   constructor(isTranslationsEngineSupported) {
-    this.#isTranslationsEngineSupported = isTranslationsEngineSupported;
-
     AT_telemetry("onOpen", {
       maintainFlow: false,
     });
@@ -212,47 +196,6 @@ class AboutTranslations {
     await this.#readyPromiseWithResolvers.promise;
   }
 
-  /**
-   * Enables the feature and updates the UI to match the enabled state.
-   *
-   * @returns {Promise<void>}
-   */
-  async onFeatureEnabled() {
-    this.#isFeatureEnabled = true;
-
-    if (!this.#isTranslationsEngineSupported) {
-      this.#showUnsupportedInfoMessage();
-      document.body.style.visibility = "visible";
-      return;
-    }
-
-    if (!this.#supportedLanguages) {
-      this.#showLanguageLoadErrorMessage();
-      document.body.style.visibility = "visible";
-      return;
-    }
-
-    this.#updateSourceScriptDirection();
-    this.#updateTargetScriptDirection();
-    this.#updateSourceSectionClearButtonVisibility();
-    this.#requestSectionHeightsUpdate({ scheduleCallback: false });
-    this.#maybeRequestTranslation();
-
-    document.body.style.visibility = "visible";
-  }
-
-  /**
-   * Disables the feature and clears any active translations.
-   */
-  onFeatureDisabled() {
-    // Ensure any active translation request becomes stale.
-    this.#translationId += 1;
-    this.#isFeatureEnabled = false;
-    this.#destroyTranslator();
-
-    document.body.style.visibility = "hidden";
-  }
-
   /**
    * Instantiates and returns the elements that comprise the UI.
    *
@@ -1450,13 +1393,8 @@ class AboutTranslations {
      * in a new translation request.
      */
     onDebounce: async () => {
-      if (!this.#isFeatureEnabled) {
-        return;
-      }
-
       try {
         this.#updateURLFromUI();
-
         this.#requestSectionHeightsUpdate({ scheduleCallback: false });
 
         await this.#maybeUpdateDetectedSourceLanguage();
@@ -1535,10 +1473,6 @@ class AboutTranslations {
     // Mark the events so that they show up in the Firefox Profiler. This makes it handy
     // to visualize the debouncing behavior.
     doEveryTime: () => {
-      if (!this.#isFeatureEnabled) {
-        return;
-      }
-
       const sourceText = this.#getSourceText();
       performance.mark(
         `Translations: input changed to ${sourceText.length} code units.`
@@ -1854,95 +1788,38 @@ class AboutTranslations {
   }
 }
 
-/**
- * A promise used to ensure the about:translations page initializes once.
- *
- * @type {Promise<void> | null}
- */
-let aboutTranslationsInitPromise = null;
-
-/**
- * Initializes the about:translations page if it has not been initialized yet.
- *
- * @returns {Promise<void>}
- */
-async function ensureAboutTranslationsInitialized() {
-  if (aboutTranslationsInitPromise) {
-    return aboutTranslationsInitPromise;
-  }
-
-  aboutTranslationsInitPromise = AT_isTranslationEngineSupported()
-    .then(async isTranslationsEngineSupported => {
-      window.aboutTranslations = new AboutTranslations(
-        isTranslationsEngineSupported
-      );
-      await window.aboutTranslations.ready();
-    })
-    .catch(error => {
-      AT_logError(error);
-    });
-
-  return aboutTranslationsInitPromise;
-}
-
-/**
- * Marks that the document is ready for automated testing to being making assertions.
- *
- * @returns {void}
- */
-function markReadyForTesting() {
-  document.body.setAttribute("ready-for-testing", "");
-}
-
-/**
- * Whether the initial enabled state has been applied.
- *
- * @type {boolean}
- */
-let initialEnabledStateApplied = false;
-
-/**
- * Applies the enabled state to the about:translations UI.
- *
- * @param {boolean} enabled
- * @returns {Promise<void>}
- */
-async function setFeatureEnabledState(enabled) {
-  await ensureAboutTranslationsInitialized();
-
-  if (!window.aboutTranslations) {
-    return;
-  }
-
-  if (enabled) {
-    await window.aboutTranslations.onFeatureEnabled();
-  } else {
-    window.aboutTranslations.onFeatureDisabled();
-  }
-
-  if (initialEnabledStateApplied) {
-    document.dispatchEvent(
-      new CustomEvent("AboutTranslationsTest:EnabledStateChanged", {
-        detail: { enabled },
-      })
-    );
-  }
-
-  initialEnabledStateApplied = true;
-  markReadyForTesting();
-}
-
 /**
  * Listen for events coming from the AboutTranslations actor.
  */
 window.addEventListener("AboutTranslationsChromeToContent", ({ detail }) => {
   switch (detail.type) {
-    case "enabled-state-changed": {
-      void setFeatureEnabledState(detail.enabled);
+    case "enable": {
+      if (window.aboutTranslations) {
+        throw new Error(
+          "Attempt to initialize about:translations page more than once."
+        );
+      }
+
+      AT_isTranslationEngineSupported()
+        .then(async isTranslationsEngineSupported => {
+          window.aboutTranslations = new AboutTranslations(
+            isTranslationsEngineSupported
+          );
+          await window.aboutTranslations.ready();
+        })
+        .catch(error => {
+          AT_logError(error);
+        })
+        .finally(() => {
+          // This lets test cases know that they can start making assertions.
+          document.body.setAttribute("ready-for-testing", "");
+          document.body.style.visibility = "visible";
+        });
+
       break;
     }
     case "rebuild-translator": {
-      window.aboutTranslations?.rebuildTranslator();
+      window.aboutTranslations.rebuildTranslator();
       break;
     }
     default: {
diff --git a/toolkit/components/translations/content/translations-engine.sys.mjs b/toolkit/components/translations/content/translations-engine.sys.mjs
index 52ff8827d3fe3..9590fbe076aa5 100644
--- a/toolkit/components/translations/content/translations-engine.sys.mjs
+++ b/toolkit/components/translations/content/translations-engine.sys.mjs
@@ -74,48 +74,22 @@
 // unprivileged Cu.Sandbox, with these specific methods re-exported into the
 // sandbox scope.
 
-function getEngineActor() {
-  try {
-    return ChromeUtils.domProcessChild.getActor("TranslationsEngine");
-  } catch (error) {
-    if (error.name === "NotFoundError") {
-      return null;
-    }
-    throw error;
-  }
-}
-
-function TE_addProfilerMarker(...args) {
-  return getEngineActor()?.TE_addProfilerMarker(...args);
-}
-function TE_getLogLevel(...args) {
-  return getEngineActor()?.TE_getLogLevel(...args);
-}
-function TE_log(...args) {
-  return getEngineActor()?.TE_log(...args);
-}
-function TE_logError(...args) {
-  return getEngineActor()?.TE_logError(...args);
-}
-function TE_requestEnginePayload(...args) {
-  const actor = getEngineActor();
-  if (!actor) {
-    throw new Error("TranslationsEngine actor not available.");
-  }
-  return actor.TE_requestEnginePayload(...args);
-}
-function TE_reportEnginePerformance(...args) {
-  return getEngineActor()?.TE_reportEnginePerformance(...args);
-}
-function TE_reportEngineStatus(...args) {
-  return getEngineActor()?.TE_reportEngineStatus(...args);
-}
-function TE_resolveForceShutdown(...args) {
-  return getEngineActor()?.TE_resolveForceShutdown(...args);
-}
-function TE_destroyEngineProcess(...args) {
-  return getEngineActor()?.TE_destroyEngineProcess(...args);
-}
+const engineActor = ChromeUtils.domProcessChild.getActor("TranslationsEngine");
+
+const TE_addProfilerMarker = engineActor.TE_addProfilerMarker.bind(engineActor);
+const TE_getLogLevel = engineActor.TE_getLogLevel.bind(engineActor);
+const TE_log = engineActor.TE_log.bind(engineActor);
+const TE_logError = engineActor.TE_logError.bind(engineActor);
+const TE_requestEnginePayload =
+  engineActor.TE_requestEnginePayload.bind(engineActor);
+const TE_reportEnginePerformance =
+  engineActor.TE_reportEnginePerformance.bind(engineActor);
+const TE_reportEngineStatus =
+  engineActor.TE_reportEngineStatus.bind(engineActor);
+const TE_resolveForceShutdown =
+  engineActor.TE_resolveForceShutdown.bind(engineActor);
+const TE_destroyEngineProcess =
+  engineActor.TE_destroyEngineProcess.bind(engineActor);
 
 // How long the cache remains alive between uses, in milliseconds. In automation the
 // engine is manually created and destroyed to avoid timing issues.
diff --git a/toolkit/components/translations/metrics.yaml b/toolkit/components/translations/metrics.yaml
index 8e1a3aa056c00..9b1d1b88229e4 100644
--- a/toolkit/components/translations/metrics.yaml
+++ b/toolkit/components/translations/metrics.yaml
@@ -942,46 +942,3 @@ translations.about_translations_page:
     notification_emails:
       - translations-telemetry-alerts@mozilla.com
     expires: never
-
-translations.feature:
-  enable:
-    type: event
-    description: >
-      Triggers when the Translations feature is enabled via the AI Feature API.
-    bugs:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=2010993
-    data_reviews:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=2010993
-    data_sensitivity:
-      - interaction
-    notification_emails:
-      - translations-telemetry-alerts@mozilla.com
-    expires: never
-
-  disable:
-    type: event
-    description: >
-      Triggers when the Translations feature is disabled via the AI Feature API.
-    bugs:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=2010993
-    data_reviews:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=2010993
-    data_sensitivity:
-      - interaction
-    notification_emails:
-      - translations-telemetry-alerts@mozilla.com
-    expires: never
-
-  reset:
-    type: event
-    description: >
-      Triggers when the Translations feature is reset via the AI Feature API.
-    bugs:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=2010993
-    data_reviews:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=2010993
-    data_sensitivity:
-      - interaction
-    notification_emails:
-      - translations-telemetry-alerts@mozilla.com
-    expires: never
diff --git a/toolkit/components/translations/tests/browser/browser_about_translations_enabling.js b/toolkit/components/translations/tests/browser/browser_about_translations_enabling.js
index fd7555ceccb1b..9875371cab21a 100644
--- a/toolkit/components/translations/tests/browser/browser_about_translations_enabling.js
+++ b/toolkit/components/translations/tests/browser/browser_about_translations_enabling.js
@@ -3,143 +3,55 @@
 
 "use strict";
 
-const AI_PREFS = [
-  ["browser.translations.enable", false],
-  ["browser.ai.control.default", "blocked"],
-  ["browser.ai.control.translations", "blocked"],
-];
-
-const HIDDEN_UI = {
-  pageHeader: false,
-  mainUserInterface: false,
-  sourceLanguageSelector: false,
-  targetLanguageSelector: false,
-  copyButton: false,
-  swapLanguagesButton: false,
-  sourceSectionTextArea: false,
-  targetSectionTextArea: false,
-  unsupportedInfoMessage: false,
-  languageLoadErrorMessage: false,
-};
-
-const VISIBLE_UI = {
-  pageHeader: true,
-  mainUserInterface: true,
-  sourceLanguageSelector: true,
-  targetLanguageSelector: true,
-  copyButton: true,
-  swapLanguagesButton: true,
-  sourceSectionTextArea: true,
-  targetSectionTextArea: true,
-  unsupportedInfoMessage: false,
-  languageLoadErrorMessage: false,
-};
-
 /**
- * Checks the about:translations UI updates with AIFeature enable/disable starting from disabled.
+ * Checks that nothing appears when the global Translations pref is disabled.
  */
-add_task(
-  async function test_about_translations_ai_feature_toggle_from_disabled() {
-    const { aboutTranslationsTestUtils, cleanup } = await openAboutTranslations(
-      {
-        disabled: true,
-        autoDownloadFromRemoteSettings: true,
-        prefs: [
-          ["browser.translations.enable", false],
-          ["browser.ai.control.default", "blocked"],
-          ["browser.ai.control.translations", "blocked"],
-        ],
-      }
-    );
-
-    await aboutTranslationsTestUtils.assertIsVisible(HIDDEN_UI);
-
-    await aboutTranslationsTestUtils.assertEvents(
-      {
-        expected: [
-          [
-            AboutTranslationsTestUtils.Events.EnabledStateChanged,
-            { enabled: true },
-          ],
-        ],
-      },
-      async () => {
-        await TranslationsParent.AIFeature.enable();
-      }
-    );
-    await aboutTranslationsTestUtils.assertIsVisible(VISIBLE_UI);
+add_task(async function test_about_translations_disabled() {
+  const { aboutTranslationsTestUtils, cleanup } = await openAboutTranslations({
+    disabled: true,
+    autoDownloadFromRemoteSettings: true,
+  });
 
-    await aboutTranslationsTestUtils.assertEvents(
-      {
-        expected: [
-          [
-            AboutTranslationsTestUtils.Events.EnabledStateChanged,
-            { enabled: false },
-          ],
-        ],
-      },
-      async () => {
-        await TranslationsParent.AIFeature.disable();
-      }
-    );
-    await aboutTranslationsTestUtils.assertIsVisible(HIDDEN_UI);
+  await aboutTranslationsTestUtils.assertIsVisible({
+    pageHeader: false,
+    mainUserInterface: false,
+    sourceLanguageSelector: false,
+    targetLanguageSelector: false,
+    copyButton: false,
+    swapLanguagesButton: false,
+    sourceSectionTextArea: false,
+    targetSectionTextArea: false,
+    unsupportedInfoMessage: false,
+    languageLoadErrorMessage: false,
+  });
 
-    await cleanup();
-  }
-);
+  await cleanup();
+});
 
 /**
- * Checks the about:translations UI updates with AIFeature disable/enable starting from enabled.
+ * Checks that the page loads correctly when the global Translations pref is enabled.
  */
-add_task(
-  async function test_about_translations_ai_feature_toggle_from_enabled() {
-    const { aboutTranslationsTestUtils, cleanup } = await openAboutTranslations(
-      {
-        disabled: false,
-        autoDownloadFromRemoteSettings: true,
-        prefs: [
-          ["browser.translations.enable", true],
-          ["browser.ai.control.default", "available"],
-          ["browser.ai.control.translations", "default"],
-        ],
-      }
-    );
-
-    await aboutTranslationsTestUtils.assertIsVisible(VISIBLE_UI);
-
-    await aboutTranslationsTestUtils.assertEvents(
-      {
-        expected: [
-          [
-            AboutTranslationsTestUtils.Events.EnabledStateChanged,
-            { enabled: false },
-          ],
-        ],
-      },
-      async () => {
-        await TranslationsParent.AIFeature.disable();
-      }
-    );
-    await aboutTranslationsTestUtils.assertIsVisible(HIDDEN_UI);
+add_task(async function test_about_translations_enabled() {
+  const { aboutTranslationsTestUtils, cleanup } = await openAboutTranslations({
+    disabled: false,
+    autoDownloadFromRemoteSettings: true,
+  });
 
-    await aboutTranslationsTestUtils.assertEvents(
-      {
-        expected: [
-          [
-            AboutTranslationsTestUtils.Events.EnabledStateChanged,
-            { enabled: true },
-          ],
-        ],
-      },
-      async () => {
-        await TranslationsParent.AIFeature.enable();
-      }
-    );
-    await aboutTranslationsTestUtils.assertIsVisible(VISIBLE_UI);
+  await aboutTranslationsTestUtils.assertIsVisible({
+    pageHeader: true,
+    mainUserInterface: true,
+    sourceLanguageSelector: true,
+    targetLanguageSelector: true,
+    copyButton: true,
+    swapLanguagesButton: true,
+    sourceSectionTextArea: true,
+    targetSectionTextArea: true,
+    unsupportedInfoMessage: false,
+    languageLoadErrorMessage: false,
+  });
 
-    await cleanup();
-  }
-);
+  await cleanup();
+});
 
 /**
  * Checks that the page loads correctly when the global Translations pref is enabled.
diff --git a/toolkit/components/translations/tests/browser/browser_translations_ai_feature.js b/toolkit/components/translations/tests/browser/browser_translations_ai_feature.js
index 2e9dafe2cb671..c6ba7214f3ec5 100644
--- a/toolkit/components/translations/tests/browser/browser_translations_ai_feature.js
+++ b/toolkit/components/translations/tests/browser/browser_translations_ai_feature.js
@@ -8,7 +8,7 @@ const AI_CONTROL_TRANSLATIONS_PREF = "browser.ai.control.translations";
 const TRANSLATIONS_ENABLE_PREF = "browser.translations.enable";
 
 /**
- * This test case ensures that the Translations feature contains the proper id.
+ * This test case ensures that the Translations AI feature contains the proper id.
  */
 add_task(async function test_ai_feature_id() {
   is(
@@ -19,7 +19,7 @@ add_task(async function test_ai_feature_id() {
 });
 
 /**
- * This test case ensures that the Translations feature availability is correct
+ * This test case ensures that the Translations AI feature availability is correct
  * for all combinations of the prefs that control its enabled state.
  */
 add_task(async function test_ai_feature_state_combinations() {
@@ -189,7 +189,7 @@ add_task(async function test_ai_feature_state_combinations() {
     expectEnabled,
   } of cases) {
     const description = `default=${defaultPref} translations=${translationsPref} enabled=${enabledPref}`;
-    info(`Translations feature state: ${description}`);
+    info(`AI feature state: ${description}`);
     Services.prefs.setStringPref(AI_CONTROL_DEFAULT_PREF, defaultPref);
     Services.prefs.setStringPref(
       AI_CONTROL_TRANSLATIONS_PREF,
@@ -206,7 +206,7 @@ add_task(async function test_ai_feature_state_combinations() {
 });
 
 /**
- * This test case ensures that enabling the Translations feature updates prefs without deleting artifacts.
+ * This test case ensures that enabling the AI feature updates prefs without deleting artifacts.
  */
 add_task(async function test_ai_feature_enable() {
   await SpecialPowers.pushPrefEnv({
@@ -240,22 +240,14 @@ add_task(async function test_ai_feature_enable() {
       "Enable turns on translations"
     );
     is(deleteCalls, 0, "Enable does not delete artifacts");
-
-    await TestTranslationsTelemetry.assertEvent(
-      Glean.translationsFeature.enable,
-      {
-        expectedEventCount: 1,
-      }
-    );
   } finally {
     TranslationsUtils.deleteAllLanguageFiles = originalDeleteAllLanguageFiles;
     await SpecialPowers.popPrefEnv();
-    TestTranslationsTelemetry.cleanup();
   }
 });
 
 /**
- * This test case ensures that disabling the Translations feature updates prefs and deletes artifacts.
+ * This test case ensures that disabling the AI feature updates prefs and deletes artifacts.
  */
 add_task(async function test_ai_feature_disable() {
   await SpecialPowers.pushPrefEnv({
@@ -294,22 +286,14 @@ add_task(async function test_ai_feature_disable() {
       "Disable turns off translations"
     );
     is(deleteCalls, 1, "Disable deletes artifacts");
-
-    await TestTranslationsTelemetry.assertEvent(
-      Glean.translationsFeature.disable,
-      {
-        expectedEventCount: 1,
-      }
-    );
   } finally {
     TranslationsUtils.deleteAllLanguageFiles = originalDeleteAllLanguageFiles;
     await SpecialPowers.popPrefEnv();
-    TestTranslationsTelemetry.cleanup();
   }
 });
 
 /**
- * This test case ensures that resetting the Translations feature clears prefs and deletes artifacts.
+ * This test case ensures that resetting the AI feature clears prefs and deletes artifacts.
  */
 add_task(async function test_ai_feature_reset() {
   await SpecialPowers.pushPrefEnv({
@@ -341,22 +325,14 @@ add_task(async function test_ai_feature_reset() {
       "Reset clears the translations enabled pref"
     );
     is(deleteCalls, 1, "Reset deletes artifacts");
-
-    await TestTranslationsTelemetry.assertEvent(
-      Glean.translationsFeature.reset,
-      {
-        expectedEventCount: 1,
-      }
-    );
   } finally {
     TranslationsUtils.deleteAllLanguageFiles = originalDeleteAllLanguageFiles;
     await SpecialPowers.popPrefEnv();
-    TestTranslationsTelemetry.cleanup();
   }
 });
 
 /**
- * This test case ensures that policy-managed translations enable pref rejects Translations feature changes.
+ * This test case ensures that policy-managed translations enable pref rejects AI feature changes.
  */
 add_task(async function test_ai_feature_policy_lock_enable_pref() {
   await SpecialPowers.pushPrefEnv({
@@ -410,7 +386,7 @@ add_task(async function test_ai_feature_policy_lock_enable_pref() {
 });
 
 /**
- * This test case ensures that policy-managed AI control pref rejects Translations feature changes.
+ * This test case ensures that policy-managed AI control pref rejects AI feature changes.
  */
 add_task(async function test_ai_feature_policy_lock_ai_control_pref() {
   await SpecialPowers.pushPrefEnv({
diff --git a/toolkit/components/translations/tests/browser/shared-head.js b/toolkit/components/translations/tests/browser/shared-head.js
index ac95ff5c33d67..715049b507050 100644
--- a/toolkit/components/translations/tests/browser/shared-head.js
+++ b/toolkit/components/translations/tests/browser/shared-head.js
@@ -312,7 +312,8 @@ async function openAboutTranslations({
       await EngineProcess.destroyTranslationsEngine();
 
       await SpecialPowers.popPrefEnv();
-      TestTranslationsTelemetry.cleanup();
+      TestTranslationsTelemetry.reset();
+      Services.fog.testResetFOG();
     },
   };
 }
@@ -2394,7 +2395,7 @@ async function setupActorTest({
       await EngineProcess.destroyTranslationsEngine();
       BrowserTestUtils.removeTab(tab);
       await removeMocks();
-      TestTranslationsTelemetry.cleanup();
+      TestTranslationsTelemetry.reset();
       return SpecialPowers.popPrefEnv();
     },
   };
@@ -2875,10 +2876,11 @@ async function loadTestPage({
         await cleanupLocales();
       }
       restoreA11yUtils();
+      Services.fog.testResetFOG();
       TranslationsParent.testAutomaticPopup = false;
       TranslationsParent.resetHostsOffered();
       BrowserTestUtils.removeTab(tab);
-      TestTranslationsTelemetry.cleanup();
+      TestTranslationsTelemetry.reset();
       return Promise.all([
         SpecialPowers.popPrefEnv(),
         SpecialPowers.popPermissions(),
@@ -3606,7 +3608,7 @@ async function setupAboutPreferences(
     BrowserTestUtils.removeTab(tab);
     await removeMocks();
     await SpecialPowers.popPrefEnv();
-    TestTranslationsTelemetry.cleanup();
+    TestTranslationsTelemetry.reset();
   }
 
   return {
@@ -3721,9 +3723,8 @@ async function mockLocales({ systemLocales, appLocales, webLanguages }) {
 class TestTranslationsTelemetry {
   static #previousFlowId = null;
 
-  static cleanup() {
+  static reset() {
     TestTranslationsTelemetry.#previousFlowId = null;
-    Services.fog.testResetFOG();
   }
 
   /**
@@ -4106,11 +4107,6 @@ class AboutTranslationsTestUtils {
    * A collection of custom events that the about:translations document may dispatch.
    */
   static Events = class Events {
-    /**
-     * Event fired when the enabled state of the Translations feature changes.
-     */
-    static EnabledStateChanged = "AboutTranslationsTest:EnabledStateChanged";
-
     /**
      * Event fired when the detected language updates.
      *
diff --git a/toolkit/modules/ActorManagerParent.sys.mjs b/toolkit/modules/ActorManagerParent.sys.mjs
index 8358aa43ae7ea..944f70cccb2bb 100644
--- a/toolkit/modules/ActorManagerParent.sys.mjs
+++ b/toolkit/modules/ActorManagerParent.sys.mjs
@@ -619,12 +619,6 @@ let JSWINDOWACTORS = {
     matches: ["http://*/*", "https://*/*", "file:///*", "moz-extension://*"],
     messageManagerGroups: ["browsers"],
     enablePreference: "browser.translations.enable",
-    onPreferenceChanged(isEnabled) {
-      const { TranslationsParent } = ChromeUtils.importESModule(
-        "resource://gre/actors/TranslationsParent.sys.mjs"
-      );
-      TranslationsParent.onIsEnabledChanged(isEnabled);
-    },
   },
 
   UAWidgets: {
@@ -773,6 +767,7 @@ if (AppConstants.platform != "android") {
     },
     matches: ["about:translations"],
     remoteTypes: ["privilegedabout"],
+    enablePreference: "browser.translations.enable",
   };
 
   JSWINDOWACTORS.ColorPicker = {

From f2fcc4ff3fbc60b309fbf6cf6b537ccadfe3871a Mon Sep 17 00:00:00 2001
From: Cristina Horotan <chorotan@mozilla.com>
Date: Thu, 29 Jan 2026 18:57:50 +0200
Subject: [PATCH 091/116] Revert "Bug 1995636 - Increase navigation rate
 limiting threshold. r=smaug,zcorpan" for causing wpt failures on
 replaceState-inside-back-handler-infinite.optional.html

This reverts commit ab959ec6edc93fd99b8c176909290a182891bb59.
---
 modules/libpref/init/StaticPrefList.yaml                        | 2 +-
 .../history_pushstate_too_many_calls.optional.html              | 2 +-
 .../history_replacestate_too_many_calls.optional.html           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
index fb1ec605fb1bf..bcb1cdf7df134 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -3713,7 +3713,7 @@
 # BrowsingContext. This includes calls to History and Location APIs.
 - name: dom.navigation.navigationRateLimit.count
   type: uint32_t
-  value: 1000
+  value: 200
   mirror: always
 
 # Time span in seconds for location change rate limit.
diff --git a/testing/web-platform/tests/html/browsers/history/the-history-interface/history_pushstate_too_many_calls.optional.html b/testing/web-platform/tests/html/browsers/history/the-history-interface/history_pushstate_too_many_calls.optional.html
index e519397ed8684..4242ab488ca2c 100644
--- a/testing/web-platform/tests/html/browsers/history/the-history-interface/history_pushstate_too_many_calls.optional.html
+++ b/testing/web-platform/tests/html/browsers/history/the-history-interface/history_pushstate_too_many_calls.optional.html
@@ -10,7 +10,7 @@
     <script>
     test(function () {
       assert_throws_dom("SecurityError", function () {
-        for (let i = 0; i < 5000; i++) {
+        for (let i = 0; i < 500; i++) {
           window.history.pushState(null, null, i);
         }
       });
diff --git a/testing/web-platform/tests/html/browsers/history/the-history-interface/history_replacestate_too_many_calls.optional.html b/testing/web-platform/tests/html/browsers/history/the-history-interface/history_replacestate_too_many_calls.optional.html
index a59f1768000b5..d412983270c42 100644
--- a/testing/web-platform/tests/html/browsers/history/the-history-interface/history_replacestate_too_many_calls.optional.html
+++ b/testing/web-platform/tests/html/browsers/history/the-history-interface/history_replacestate_too_many_calls.optional.html
@@ -10,7 +10,7 @@
     <script>
     test(function () {
       assert_throws_dom("SecurityError", function () {
-        for (let i = 0; i < 5000; i++) {
+        for (let i = 0; i < 500; i++) {
           window.history.replaceState(null, null, i);
         }
       });

From 09c0ab9f3a3e3f9eb59fe760adf6592d14d0c417 Mon Sep 17 00:00:00 2001
From: AndiAJ <andiaj@users.noreply.github.com>
Date: Thu, 29 Jan 2026 16:04:26 +0000
Subject: [PATCH 092/116] Bug 2013286 - Fix for compose snapshot state being
 observed from multiple threads when opening the main menu r=aaronmt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added composeTestRule.waitForIdle() after clicking the menu to ensure Compose finishes recomposition and drawing before continuing the test and also removed the UIAutomator assertion.

verifyAddonsCanBeUninstalledTest - successfully passed 150x on Firebase ✅

All UI tests successfully passed 2x on Firebase ✅

Differential Revision: https://phabricator.services.mozilla.com/D280946
---
 .../java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
index b6745caba5c26..1d703aee6df01 100644
--- a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
+++ b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt
@@ -562,11 +562,9 @@ class HomeScreenRobot(private val composeTestRule: ComposeTestRule) {
             composeTestRule.onNodeWithContentDescription(getStringResource(R.string.content_description_menu)).performClick()
             Log.i(TAG, "openThreeDotMenu: Clicked main menu button")
 
-            composeTestRule.runOnIdle {
-                Log.i(TAG, "runOnIdle: Compose is idle, thread=${Thread.currentThread().name}")
-            }
-
-            assertUIObjectExists(itemWithResId("$packageName:id/design_bottom_sheet"))
+            Log.i(TAG, "openThreeDotMenu: Waiting for compose rule to be idle")
+            composeTestRule.waitForIdle()
+            Log.i(TAG, "openThreeDotMenu: Waited for compose rule to be idle")
 
             ThreeDotMenuMainRobot(composeTestRule).interact()
             return ThreeDotMenuMainRobot.Transition(composeTestRule)

From 8f7cff6f04d90330a625198115479a9923b977ab Mon Sep 17 00:00:00 2001
From: Irene Ni <ini@mozilla.com>
Date: Thu, 29 Jan 2026 16:13:05 +0000
Subject: [PATCH 093/116] Bug 2008160 - Use alt="" to programmatically identify
 arrow icon in moz-box-button. r=mstriemer

Differential Revision: https://phabricator.services.mozilla.com/D280772
---
 toolkit/content/widgets/moz-box-button/moz-box-button.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/content/widgets/moz-box-button/moz-box-button.mjs b/toolkit/content/widgets/moz-box-button/moz-box-button.mjs
index 6e4ddd7e3457b..1f8032797cf04 100644
--- a/toolkit/content/widgets/moz-box-button/moz-box-button.mjs
+++ b/toolkit/content/widgets/moz-box-button/moz-box-button.mjs
@@ -72,7 +72,7 @@ export default class MozBoxButton extends MozBoxBase {
         <img
           class="icon nav-icon"
           src="chrome://global/skin/icons/arrow-right.svg"
-          role="presentation"
+          alt=""
         />
       </button>
     `;

From 611fbfa8813f65536a9ad32d1080c8e1dcd5c647 Mon Sep 17 00:00:00 2001
From: Kelly Cochrane <kcochrane@mozilla.com>
Date: Thu, 29 Jan 2026 16:19:28 +0000
Subject: [PATCH 094/116] Bug 2009661 - Ensure unloading and reloading split
 view tabs works as expected r=tabbrowser-reviewers,dao

Differential Revision: https://phabricator.services.mozilla.com/D278677
---
 .../tabbrowser/content/split-view-footer.js   |  8 +-
 .../tabbrowser/content/tabbrowser.js          | 12 ++-
 .../browser_tab_splitview_about_opentabs.js   | 81 ++++++++++++++++++-
 3 files changed, 94 insertions(+), 7 deletions(-)

diff --git a/browser/components/tabbrowser/content/split-view-footer.js b/browser/components/tabbrowser/content/split-view-footer.js
index 8a415f7369cd8..96a6df397fd1b 100644
--- a/browser/components/tabbrowser/content/split-view-footer.js
+++ b/browser/components/tabbrowser/content/split-view-footer.js
@@ -217,9 +217,11 @@
     #resetTab() {
       if (this.#tab) {
         this.#tab.removeEventListener("TabAttrModified", this);
-        this.#tab.linkedBrowser?.removeProgressListener(
-          this.#browserProgressListener
-        );
+        if (this.#tab.linkedBrowser?.webProgress) {
+          this.#tab.linkedBrowser.removeProgressListener(
+            this.#browserProgressListener
+          );
+        }
       }
       this.#tab = null;
     }
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
index 7af4588ca8f17..a8c22577366a0 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -3446,6 +3446,7 @@
           panels.push(tab.linkedPanel);
         }
       }
+      this.setIsSplitViewActive(true, tabs);
       this.tabpanels.splitViewPanels = panels;
     }
 
@@ -5924,15 +5925,22 @@
       }
       let unloadSelectedTab = false;
       let allTabsUnloaded = false;
-      if (tabs.some(tab => tab.selected)) {
+      if (tabs.some(tab => tab.selected || tab.splitview?.hasActiveTab)) {
         // Unloading the currently selected tab.
         // Need to select a different one before unloading.
         // Avoid selecting any tab we're unloading now or
         // any tab that is already unloaded.
         unloadSelectedTab = true;
-        const tabsToExclude = tabs.concat(
+        let tabsToExclude = tabs.concat(
           this.tabContainer.allTabs.filter(tab => !tab.linkedPanel)
         );
+        for (const tab of tabs) {
+          if (tab.splitview) {
+            tabsToExclude.push(
+              ...tab.splitview.tabs.filter(splitViewTab => splitViewTab != tab)
+            );
+          }
+        }
         let newTab = this._findTabToBlurTo(this.selectedTab, tabsToExclude);
         if (newTab) {
           this.selectedTab = newTab;
diff --git a/browser/components/tabbrowser/test/browser/tabs/browser_tab_splitview_about_opentabs.js b/browser/components/tabbrowser/test/browser/tabs/browser_tab_splitview_about_opentabs.js
index 2e6afc6777476..7f3d6979a95f3 100644
--- a/browser/components/tabbrowser/test/browser/tabs/browser_tab_splitview_about_opentabs.js
+++ b/browser/components/tabbrowser/test/browser/tabs/browser_tab_splitview_about_opentabs.js
@@ -58,13 +58,14 @@ const withTabMenu = async function (tab, callback) {
   const moveTabToNewSplitViewItem = document.getElementById(
     "context_moveTabToSplitView"
   );
+  const unloadTabItem = document.getElementById("context_unloadTab");
   const unsplitTabItem = document.getElementById("context_separateSplitView");
 
   let contextMenuHidden = BrowserTestUtils.waitForPopupEvent(
     tabContextMenu,
     "hidden"
   );
-  await callback(moveTabToNewSplitViewItem, unsplitTabItem);
+  await callback(moveTabToNewSplitViewItem, unloadTabItem, unsplitTabItem);
   tabContextMenu.hidePopup();
   info("Hide popup");
   return await contextMenuHidden;
@@ -245,7 +246,7 @@ add_task(async function test_contextMenuMoveTabsToNewSplitView() {
 
   await withTabMenu(
     tabToClick,
-    async (moveTabToNewSplitViewItem, unsplitTabItem) => {
+    async (moveTabToNewSplitViewItem, unloadTabItem, unsplitTabItem) => {
       await BrowserTestUtils.waitForMutationCondition(
         unsplitTabItem,
         { attributes: true },
@@ -410,3 +411,79 @@ add_task(async function test_containerIndicators() {
     BrowserTestUtils.removeTab(gBrowser.tabs.at(-1));
   }
 });
+
+add_task(async function test_splitview_with_unloaded_tab() {
+  const tab1 = await addTab();
+  await addTab();
+
+  // Click the first tab in our test split view to make sure the default tab at the
+  // start of the tab strip is deselected
+  EventUtils.synthesizeMouseAtCenter(tab1, {});
+
+  // Test adding split view with one tab and new tab
+
+  let tabToClick = tab1;
+  let tabContainer = gBrowser.tabContainer;
+  let splitViewCreated = BrowserTestUtils.waitForEvent(
+    tabContainer,
+    "SplitViewCreated"
+  );
+  await withTabMenu(
+    tabToClick,
+    async (moveTabToNewSplitViewItem, unloadTabItem) => {
+      await BrowserTestUtils.waitForMutationCondition(
+        unloadTabItem,
+        { attributes: true },
+        () => !unloadTabItem.hidden && !unloadTabItem.disabled,
+        "unloadTabItem is visible and not disabled"
+      );
+      Assert.ok(
+        !unloadTabItem.hidden && !unloadTabItem.disabled,
+        "unloadTabItem is visible and not disabled"
+      );
+
+      info("Click menu option to unload tab");
+      unloadTabItem.click();
+      await BrowserTestUtils.waitForMutationCondition(
+        tab1,
+        { attributes: true },
+        () => tab1.hasAttribute("discarded"),
+        "tab1 has been unloaded"
+      );
+      info("Tab has been unloaded");
+    }
+  );
+
+  await withTabMenu(tabToClick, async moveTabToNewSplitViewItem => {
+    await BrowserTestUtils.waitForMutationCondition(
+      moveTabToNewSplitViewItem,
+      { attributes: true },
+      () =>
+        !moveTabToNewSplitViewItem.hidden &&
+        !moveTabToNewSplitViewItem.disabled,
+      "moveTabToNewSplitViewItem is visible and not disabled"
+    );
+    Assert.ok(
+      !moveTabToNewSplitViewItem.hidden && !moveTabToNewSplitViewItem.disabled,
+      "moveTabToNewSplitViewItem is visible and not disabled"
+    );
+
+    info("Click menu option to add new split view");
+    moveTabToNewSplitViewItem.click();
+    await splitViewCreated;
+  });
+
+  let splitview = tab1.splitview;
+
+  Assert.equal(tab1.splitview, splitview, `tab1 is in split view`);
+
+  Assert.ok(
+    !tab1.hasAttribute("discarded"),
+    "tab1 is no longer unloaded once added to split view"
+  );
+
+  splitview.unsplitTabs();
+  while (gBrowser.tabs.length > 1) {
+    BrowserTestUtils.removeTab(gBrowser.tabs.at(-1));
+  }
+});

From 5ec9ba7c7ad610194c4d5cbf6308f8d27ebf8510 Mon Sep 17 00:00:00 2001
From: mcarare <48995920+mcarare@users.noreply.github.com>
Date: Thu, 29 Jan 2026 16:40:27 +0000
Subject: [PATCH 095/116] Bug 2013268 - Replace `runTestOnMain` and
 `MainCoroutineRule` with standard `kotlinx.coroutines.test.runTest` in media
 feature tests. r=android-reviewers,giorga

Differential Revision: https://phabricator.services.mozilla.com/D280972
---
 .../feature/media/MediaSessionFeature.kt      |   6 +-
 .../MediaSessionFullscreenFeature.kt          |   5 +-
 .../service/MediaSessionServiceDelegate.kt    |   3 +-
 .../feature/media/MediaSessionFeatureTest.kt  | 590 ++++++++++--------
 .../feature/media/focus/AudioFocusTest.kt     |   5 -
 .../MediaSessionFullscreenFeatureTest.kt      |  85 ++-
 .../MediaSessionServiceDelegateTest.kt        | 129 ++--
 7 files changed, 473 insertions(+), 350 deletions(-)

diff --git a/mobile/android/android-components/components/feature/media/src/main/java/mozilla/components/feature/media/MediaSessionFeature.kt b/mobile/android/android-components/components/feature/media/src/main/java/mozilla/components/feature/media/MediaSessionFeature.kt
index dcc4013fda923..b058fb09f14c2 100644
--- a/mobile/android/android-components/components/feature/media/src/main/java/mozilla/components/feature/media/MediaSessionFeature.kt
+++ b/mobile/android/android-components/components/feature/media/src/main/java/mozilla/components/feature/media/MediaSessionFeature.kt
@@ -10,7 +10,9 @@ import android.content.Intent
 import android.content.ServiceConnection
 import android.os.IBinder
 import androidx.annotation.VisibleForTesting
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.distinctUntilChangedBy
 import kotlinx.coroutines.flow.map
@@ -30,11 +32,13 @@ import mozilla.components.lib.state.ext.flowScoped
  * @param applicationContext the application's [Context].
  * @param mediaServiceClass the media service class will handle the media playback state
  * @param store Reference to the browser store where tab state is located.
+ * @param mainDispatcher Dispatcher used for main thread operations.
  */
 class MediaSessionFeature(
     val applicationContext: Context,
     val mediaServiceClass: Class<*>,
     val store: BrowserStore,
+    private val mainDispatcher: CoroutineDispatcher = Dispatchers.Main,
 ) {
     @VisibleForTesting
     internal var scope: CoroutineScope? = null
@@ -62,7 +66,7 @@ class MediaSessionFeature(
      * Starts the feature.
      */
     fun start() {
-        scope = store.flowScoped { flow ->
+        scope = store.flowScoped(dispatcher = mainDispatcher) { flow ->
             flow.map { state -> state.findActiveMediaTab() }
                 .distinctUntilChangedBy { tab -> tab?.mediaSessionState }
                 .collect { state -> showMediaStatus(state) }
diff --git a/mobile/android/android-components/components/feature/media/src/main/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeature.kt b/mobile/android/android-components/components/feature/media/src/main/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeature.kt
index d9296bb4ae577..b1a6bdcd55b2e 100644
--- a/mobile/android/android-components/components/feature/media/src/main/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeature.kt
+++ b/mobile/android/android-components/components/feature/media/src/main/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeature.kt
@@ -7,7 +7,9 @@ package mozilla.components.feature.media.fullscreen
 import android.app.Activity
 import android.content.pm.ActivityInfo
 import android.view.WindowManager
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
@@ -25,12 +27,13 @@ class MediaSessionFullscreenFeature(
     private val activity: Activity,
     private val store: BrowserStore,
     private val tabId: String?,
+    private val mainDispatcher: CoroutineDispatcher = Dispatchers.Main,
 ) : LifecycleAwareFeature {
 
     private var scope: CoroutineScope? = null
 
     override fun start() {
-        scope = store.flowScoped { flow ->
+        scope = store.flowScoped(dispatcher = mainDispatcher) { flow ->
             flow.map {
                 it.tabs + it.customTabs
             }.map { tab ->
diff --git a/mobile/android/android-components/components/feature/media/src/main/java/mozilla/components/feature/media/service/MediaSessionServiceDelegate.kt b/mobile/android/android-components/components/feature/media/src/main/java/mozilla/components/feature/media/service/MediaSessionServiceDelegate.kt
index a598745b6a62f..22f373ff6104a 100644
--- a/mobile/android/android-components/components/feature/media/src/main/java/mozilla/components/feature/media/service/MediaSessionServiceDelegate.kt
+++ b/mobile/android/android-components/components/feature/media/src/main/java/mozilla/components/feature/media/service/MediaSessionServiceDelegate.kt
@@ -69,6 +69,7 @@ internal class MediaSessionServiceDelegate(
     @get:VisibleForTesting internal val store: BrowserStore,
     @get:VisibleForTesting internal val crashReporter: CrashReporting?,
     @get:VisibleForTesting internal val notificationsDelegate: NotificationsDelegate,
+    @get:VisibleForTesting internal val mainScope: CoroutineScope = MainScope(),
 ) : MediaSessionDelegate {
     private val logger = Logger("MediaSessionService")
 
@@ -104,7 +105,7 @@ internal class MediaSessionServiceDelegate(
     fun onCreate() {
         logger.debug("Service created")
         mediaSession.setCallback(MediaSessionCallback(store))
-        notificationScope = MainScope()
+        notificationScope = mainScope
     }
 
     fun onDestroy() {
diff --git a/mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/MediaSessionFeatureTest.kt b/mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/MediaSessionFeatureTest.kt
index 6ff2af6a777a2..da3feae9383bc 100644
--- a/mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/MediaSessionFeatureTest.kt
+++ b/mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/MediaSessionFeatureTest.kt
@@ -8,8 +8,8 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.test.runTest
 import mozilla.components.browser.state.action.MediaSessionAction
 import mozilla.components.browser.state.state.BrowserState
 import mozilla.components.browser.state.state.MediaSessionState
@@ -24,25 +24,21 @@ import mozilla.components.support.test.any
 import mozilla.components.support.test.argumentCaptor
 import mozilla.components.support.test.eq
 import mozilla.components.support.test.mock
-import mozilla.components.support.test.rule.MainCoroutineRule
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mockito.anyInt
 import org.mockito.Mockito.doReturn
 import org.mockito.Mockito.verify
+import kotlin.coroutines.ContinuationInterceptor
 
 @RunWith(AndroidJUnit4::class)
 class MediaSessionFeatureTest {
 
-    @get:Rule
-    val coroutinesTestRule = MainCoroutineRule()
-
     @Test
-    fun `WHEN the feature starts THEN it starts observing the store`() {
+    fun `WHEN the feature starts THEN it starts observing the store`() = runTest {
         val store: BrowserStore = mock()
         val feature = MediaSessionFeature(
             mock(),
@@ -57,285 +53,346 @@ class MediaSessionFeatureTest {
     }
 
     @Test
-    fun `GIVEN a started feature WHEN it is stopped THEN the store is not observed for updates anymore`() {
-        val feature = MediaSessionFeature(
-            mock(),
-            MediaSessionServiceDelegate::class.java,
-            mock(),
-        )
-        feature.scope = CoroutineScope(Dispatchers.Default)
+    fun `GIVEN a started feature WHEN it is stopped THEN the store is not observed for updates anymore`() =
+        runTest {
+            val feature = MediaSessionFeature(
+                mock(),
+                MediaSessionServiceDelegate::class.java,
+                mock(),
+                mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
+            )
 
-        feature.stop()
+            feature.stop()
 
-        assertNull(feature.scope)
-    }
+            assertNull(feature.scope)
+        }
 
     @Test
-    fun `WHEN the media service is bound THEN store this and show the current media playing status`() {
-        val mediaTab = getMediaTab(PlaybackState.PLAYING)
-        val initialState = BrowserState(tabs = listOf(mediaTab))
-        val store = BrowserStore(initialState)
-        val mediaServiceClass = MediaSessionServiceDelegate::class.java
-        val feature = MediaSessionFeature(
-            mock(),
-            mediaServiceClass,
-            store,
-        )
-        val mediaService: MediaSessionServiceDelegate = mock()
-        val binder = MediaServiceBinder(mediaService)
-
-        feature.mediaServiceConnection.onServiceConnected(mock(), binder)
-
-        assertEquals(mediaService, feature.mediaService)
-        verify(feature.mediaService)!!.handleMediaPlaying(mediaTab)
-    }
+    fun `WHEN the media service is bound THEN store this and show the current media playing status`() =
+        runTest {
+            val mediaTab = getMediaTab(PlaybackState.PLAYING)
+            val initialState = BrowserState(tabs = listOf(mediaTab))
+            val store = BrowserStore(initialState)
+            val mediaServiceClass = MediaSessionServiceDelegate::class.java
+            val feature = MediaSessionFeature(
+                mock(),
+                mediaServiceClass,
+                store,
+                mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
+            )
+
+            val mediaService: MediaSessionServiceDelegate = mock()
+            val binder = MediaServiceBinder(mediaService)
+
+            feature.mediaServiceConnection.onServiceConnected(mock(), binder)
+
+            assertEquals(mediaService, feature.mediaService)
+            verify(feature.mediaService)!!.handleMediaPlaying(mediaTab)
+        }
 
     @Test
-    fun `GIVEN media service is bound WHEN the service is disconnected THEN cleanup local properties`() {
-        val mediaService: ComponentName = mock()
-        val feature = MediaSessionFeature(mock(), mediaService.javaClass, mock())
-        feature.mediaService = mock()
-
-        feature.mediaServiceConnection.onServiceDisconnected(mediaService)
-
-        assertNull(feature.mediaService)
-    }
+    fun `GIVEN media service is bound WHEN the service is disconnected THEN cleanup local properties`() =
+        runTest {
+            val mediaService: ComponentName = mock()
+            val feature = MediaSessionFeature(
+                mock(),
+                mediaService.javaClass,
+                mock(),
+                mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
+            )
+            feature.mediaService = mock()
+
+            feature.mediaServiceConnection.onServiceDisconnected(mediaService)
+
+            assertNull(feature.mediaService)
+        }
 
     @Test
-    fun `GIVEN feature is started but media service is not WHEN media starts playing THEN bind to the media service and show the playing status`() {
-        val mockApplicationContext: Context = mock()
-        val mediaTab = getMediaTab(PlaybackState.PLAYING)
-        val initialState = BrowserState(tabs = listOf(mediaTab))
-        val store = BrowserStore(initialState)
-        val mediaServiceClass = MediaSessionServiceDelegate::class.java
-        val feature = MediaSessionFeature(
-            mockApplicationContext,
-            mediaServiceClass,
-            store,
-        )
-        doReturn(true).`when`(mockApplicationContext).bindService(
-            any<Intent>(),
-            any(),
-            anyInt(),
-        )
-        val mediaServiceIntentCaptor = argumentCaptor<Intent>()
-
-        feature.start()
-
-        verify(mockApplicationContext).bindService(
-            mediaServiceIntentCaptor.capture(),
-            any(),
-            eq(Context.BIND_AUTO_CREATE),
-        )
-        assertEquals(mediaServiceClass.name, mediaServiceIntentCaptor.value.component!!.className)
-    }
+    fun `GIVEN feature is started but media service is not WHEN media starts playing THEN bind to the media service and show the playing status`() =
+        runTest {
+            val mockApplicationContext: Context = mock()
+            val mediaTab = getMediaTab(PlaybackState.PLAYING)
+            val initialState = BrowserState(tabs = listOf(mediaTab))
+            val store = BrowserStore(initialState)
+            val mediaServiceClass = MediaSessionServiceDelegate::class.java
+            val feature = MediaSessionFeature(
+                mockApplicationContext,
+                mediaServiceClass,
+                store,
+                mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
+            )
+
+            doReturn(true).`when`(mockApplicationContext).bindService(
+                any<Intent>(),
+                any(),
+                anyInt(),
+            )
+            val mediaServiceIntentCaptor = argumentCaptor<Intent>()
+
+            feature.start()
+            testScheduler.advanceUntilIdle()
+
+            verify(mockApplicationContext).bindService(
+                mediaServiceIntentCaptor.capture(),
+                any(),
+                eq(Context.BIND_AUTO_CREATE),
+            )
+            assertEquals(
+                mediaServiceClass.name,
+                mediaServiceIntentCaptor.value.component!!.className,
+            )
+        }
 
     @Test
-    fun `GIVEN feature and media service are started WHEN media starts playing in a normal tab THEN handle showing the new playing status`() {
-        val mediaTab = getMediaTab(PlaybackState.PLAYING)
-        val initialState = BrowserState(
-            tabs = listOf(mediaTab),
-        )
-        val store = BrowserStore(initialState)
-        val feature = MediaSessionFeature(
-            mock(),
-            MediaSessionServiceDelegate::class.java,
-            store,
-        )
-        feature.mediaService = mock()
-
-        feature.start()
-
-        verify(feature.mediaService)!!.handleMediaPlaying(mediaTab)
-    }
+    fun `GIVEN feature and media service are started WHEN media starts playing in a normal tab THEN handle showing the new playing status`() =
+        runTest {
+            val mediaTab = getMediaTab(PlaybackState.PLAYING)
+            val initialState = BrowserState(
+                tabs = listOf(mediaTab),
+            )
+            val store = BrowserStore(initialState)
+            val feature = MediaSessionFeature(
+                mock(),
+                MediaSessionServiceDelegate::class.java,
+                store,
+                mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
+            )
+
+            feature.mediaService = mock()
+
+            feature.start()
+            testScheduler.advanceUntilIdle()
+
+            verify(feature.mediaService)!!.handleMediaPlaying(mediaTab)
+        }
 
     @Test
-    fun `GIVEN feature and media service are started WHEN media starts playing in a custom tab THEN handle showing the new playing status`() {
-        val mediaTab = getCustomTabWithMedia(PlaybackState.PLAYING)
-        val initialState = BrowserState(
-            customTabs = listOf(mediaTab),
-        )
-        val store = BrowserStore(initialState)
-        val feature = MediaSessionFeature(
-            mock(),
-            MediaSessionServiceDelegate::class.java,
-            store,
-        )
-        feature.mediaService = mock()
-
-        feature.start()
-
-        verify(feature.mediaService)!!.handleMediaPlaying(mediaTab)
-    }
+    fun `GIVEN feature and media service are started WHEN media starts playing in a custom tab THEN handle showing the new playing status`() =
+        runTest {
+            val mediaTab = getCustomTabWithMedia(PlaybackState.PLAYING)
+            val initialState = BrowserState(
+                customTabs = listOf(mediaTab),
+            )
+            val store = BrowserStore(initialState)
+            val feature = MediaSessionFeature(
+                mock(),
+                MediaSessionServiceDelegate::class.java,
+                store,
+                mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
+            )
+
+            feature.mediaService = mock()
+
+            feature.start()
+            testScheduler.advanceUntilIdle()
+
+            verify(feature.mediaService)!!.handleMediaPlaying(mediaTab)
+        }
 
     @Test
-    fun `GIVEN feature and media service are started WHEN media is paused in a normal tab THEN handle showing the new playing status`() {
-        val mediaTab = getMediaTab(PlaybackState.PAUSED)
-        val initialState = BrowserState(
-            tabs = listOf(mediaTab),
-        )
-        val store = BrowserStore(initialState)
-        val feature = MediaSessionFeature(
-            mock(),
-            MediaSessionServiceDelegate::class.java,
-            store,
-        )
-        feature.mediaService = mock()
-
-        feature.start()
-
-        verify(feature.mediaService)!!.handleMediaPaused(mediaTab)
-    }
+    fun `GIVEN feature and media service are started WHEN media is paused in a normal tab THEN handle showing the new playing status`() =
+        runTest {
+            val mediaTab = getMediaTab(PlaybackState.PAUSED)
+            val initialState = BrowserState(
+                tabs = listOf(mediaTab),
+            )
+            val store = BrowserStore(initialState)
+            val feature = MediaSessionFeature(
+                mock(),
+                MediaSessionServiceDelegate::class.java,
+                store,
+                mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
+            )
+
+            feature.mediaService = mock()
+
+            feature.start()
+            testScheduler.advanceUntilIdle()
+
+            verify(feature.mediaService)!!.handleMediaPaused(mediaTab)
+        }
 
     @Test
-    fun `GIVEN feature and media service are started WHEN media is paused in a custom tab THEN handle showing the new playing status`() {
-        val mediaTab = getCustomTabWithMedia(PlaybackState.PAUSED)
-        val initialState = BrowserState(
-            customTabs = listOf(mediaTab),
-        )
-        val store = BrowserStore(initialState)
-        val feature = MediaSessionFeature(
-            mock(),
-            MediaSessionServiceDelegate::class.java,
-            store,
-        )
-        feature.mediaService = mock()
-
-        feature.start()
-
-        verify(feature.mediaService)!!.handleMediaPaused(mediaTab)
-    }
+    fun `GIVEN feature and media service are started WHEN media is paused in a custom tab THEN handle showing the new playing status`() =
+        runTest {
+            val mediaTab = getCustomTabWithMedia(PlaybackState.PAUSED)
+            val initialState = BrowserState(
+                customTabs = listOf(mediaTab),
+            )
+            val store = BrowserStore(initialState)
+            val feature = MediaSessionFeature(
+                mock(),
+                MediaSessionServiceDelegate::class.java,
+                store,
+                mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
+            )
+
+            feature.mediaService = mock()
+
+            feature.start()
+            testScheduler.advanceUntilIdle()
+
+            verify(feature.mediaService)!!.handleMediaPaused(mediaTab)
+        }
 
     @Test
-    fun `GIVEN feature and media service are started WHEN media is stopped in a normal tab THEN handle showing the new playing status`() {
-        val mediaTab = getMediaTab(PlaybackState.STOPPED)
-        val initialState = BrowserState(
-            tabs = listOf(mediaTab),
-        )
-        val store = BrowserStore(initialState)
-        val feature = MediaSessionFeature(
-            mock(),
-            MediaSessionServiceDelegate::class.java,
-            store,
-        )
-        feature.mediaService = mock()
-
-        feature.start()
-
-        verify(feature.mediaService)!!.handleMediaStopped(mediaTab)
-    }
+    fun `GIVEN feature and media service are started WHEN media is stopped in a normal tab THEN handle showing the new playing status`() =
+        runTest {
+            val mediaTab = getMediaTab(PlaybackState.STOPPED)
+            val initialState = BrowserState(
+                tabs = listOf(mediaTab),
+            )
+            val store = BrowserStore(initialState)
+            val feature = MediaSessionFeature(
+                mock(),
+                MediaSessionServiceDelegate::class.java,
+                store,
+                mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
+            )
+
+            feature.mediaService = mock()
+
+            feature.start()
+            testScheduler.advanceUntilIdle()
+
+            verify(feature.mediaService)!!.handleMediaStopped(mediaTab)
+        }
 
     @Test
-    fun `GIVEN feature and media service are started WHEN media is stopped in a custom tab THEN handle showing the new playing status`() {
-        val mediaTab = getCustomTabWithMedia(PlaybackState.STOPPED)
-        val initialState = BrowserState(
-            customTabs = listOf(mediaTab),
-        )
-        val store = BrowserStore(initialState)
-        val feature = MediaSessionFeature(
-            mock(),
-            MediaSessionServiceDelegate::class.java,
-            store,
-        )
-        feature.mediaService = mock()
-
-        feature.start()
-
-        verify(feature.mediaService)!!.handleMediaStopped(mediaTab)
-    }
+    fun `GIVEN feature and media service are started WHEN media is stopped in a custom tab THEN handle showing the new playing status`() =
+        runTest {
+            val mediaTab = getCustomTabWithMedia(PlaybackState.STOPPED)
+            val initialState = BrowserState(
+                customTabs = listOf(mediaTab),
+            )
+            val store = BrowserStore(initialState)
+            val feature = MediaSessionFeature(
+                mock(),
+                MediaSessionServiceDelegate::class.java,
+                store,
+                mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
+            )
+
+            feature.mediaService = mock()
+
+            feature.start()
+            testScheduler.advanceUntilIdle()
+
+            verify(feature.mediaService)!!.handleMediaStopped(mediaTab)
+        }
 
     @Test
-    fun `GIVEN feature and media service are started WHEN the media status is unknown THEN disconnect the media service and cleanup`() {
-        val mockApplicationContext: Context = mock()
-        val mediaTab = getMediaTab(PlaybackState.UNKNOWN)
-        val initialState = BrowserState(
-            tabs = listOf(mediaTab),
-        )
-        val store = BrowserStore(initialState)
-        val feature = MediaSessionFeature(
-            mockApplicationContext,
-            MediaSessionServiceDelegate::class.java,
-            store,
-        )
-        val mediaService: MediaSessionDelegate = mock()
-        feature.mediaService = mediaService
-
-        feature.start()
-
-        verify(mediaService).handleNoMedia()
-        verify(mockApplicationContext).unbindService(feature.mediaServiceConnection)
-        assertNull(feature.mediaService)
-    }
+    fun `GIVEN feature and media service are started WHEN the media status is unknown THEN disconnect the media service and cleanup`() =
+        runTest {
+            val mockApplicationContext: Context = mock()
+            val mediaTab = getMediaTab(PlaybackState.UNKNOWN)
+            val initialState = BrowserState(
+                tabs = listOf(mediaTab),
+            )
+            val store = BrowserStore(initialState)
+            val feature = MediaSessionFeature(
+                mockApplicationContext,
+                MediaSessionServiceDelegate::class.java,
+                store,
+                mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
+            )
+
+            val mediaService: MediaSessionDelegate = mock()
+            feature.mediaService = mediaService
+
+            feature.start()
+            testScheduler.advanceUntilIdle()
+
+            verify(mediaService).handleNoMedia()
+            verify(mockApplicationContext).unbindService(feature.mediaServiceConnection)
+            assertNull(feature.mediaService)
+        }
 
     @Test
-    fun `GIVEN feature and media service are started WHEN there is no media tab THEN stop the media service and cleanup`() {
-        val mockApplicationContext: Context = mock()
-        val initialState = BrowserState()
-        val store = BrowserStore(initialState)
-        val feature = MediaSessionFeature(
-            mockApplicationContext,
-            MediaSessionServiceDelegate::class.java,
-            store,
-        )
-        val mediaService: MediaSessionDelegate = mock()
-        feature.mediaService = mediaService
-
-        feature.start()
-
-        verify(mediaService).handleNoMedia()
-        verify(mockApplicationContext).unbindService(feature.mediaServiceConnection)
-        assertNull(feature.mediaService)
-    }
+    fun `GIVEN feature and media service are started WHEN there is no media tab THEN stop the media service and cleanup`() =
+        runTest {
+            val mockApplicationContext: Context = mock()
+            val initialState = BrowserState()
+            val store = BrowserStore(initialState)
+            val feature = MediaSessionFeature(
+                mockApplicationContext,
+                MediaSessionServiceDelegate::class.java,
+                store,
+                mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
+            )
+
+            val mediaService: MediaSessionDelegate = mock()
+            feature.mediaService = mediaService
+
+            feature.start()
+            testScheduler.advanceUntilIdle()
+
+            verify(mediaService).handleNoMedia()
+            verify(mockApplicationContext).unbindService(feature.mediaServiceConnection)
+            assertNull(feature.mediaService)
+        }
 
     @Test
-    fun `GIVEN a normal tab is playing media WHEN media is deactivated THEN stop the media service and cleanup`() {
-        val mockApplicationContext: Context = mock()
-        val mediaTab = getMediaTab(PlaybackState.PLAYING)
-        val initialState = BrowserState(
-            tabs = listOf(mediaTab),
-        )
-        val store = BrowserStore(initialState)
-        val feature = MediaSessionFeature(
-            mockApplicationContext,
-            MediaSessionServiceDelegate::class.java,
-            store,
-        )
-        val mediaService: MediaSessionDelegate = mock()
-        feature.mediaService = mediaService
-        feature.start()
-
-        store.dispatch(MediaSessionAction.DeactivatedMediaSessionAction(store.state.tabs[0].id))
-
-        verify(mediaService).handleNoMedia()
-        verify(mockApplicationContext).unbindService(feature.mediaServiceConnection)
-        assertNull(feature.mediaService)
-    }
+    fun `GIVEN a normal tab is playing media WHEN media is deactivated THEN stop the media service and cleanup`() =
+        runTest {
+            val mockApplicationContext: Context = mock()
+            val mediaTab = getMediaTab(PlaybackState.PLAYING)
+            val initialState = BrowserState(
+                tabs = listOf(mediaTab),
+            )
+            val store = BrowserStore(initialState)
+            val feature = MediaSessionFeature(
+                mockApplicationContext,
+                MediaSessionServiceDelegate::class.java,
+                store,
+                mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
+            )
+
+            val mediaService: MediaSessionDelegate = mock()
+            feature.mediaService = mediaService
+
+            feature.start()
+            testScheduler.advanceUntilIdle()
+
+            store.dispatch(MediaSessionAction.DeactivatedMediaSessionAction(store.state.tabs[0].id))
+            testScheduler.advanceUntilIdle()
+
+            verify(mediaService).handleNoMedia()
+            verify(mockApplicationContext).unbindService(feature.mediaServiceConnection)
+            assertNull(feature.mediaService)
+        }
 
     @Test
-    fun `GIVEN a custom tab is playing media WHEN media is deactivated THEN stop the media service and cleanup`() {
-        val mockApplicationContext: Context = mock()
-        val mediaTab = getMediaTab(PlaybackState.UNKNOWN)
-        val customTabWithMedia = getCustomTabWithMedia(PlaybackState.PLAYING)
-        val initialState = BrowserState(
-            tabs = listOf(mediaTab),
-            customTabs = listOf(customTabWithMedia),
-        )
-        val store = BrowserStore(initialState)
-        val feature = MediaSessionFeature(
-            mockApplicationContext,
-            MediaSessionServiceDelegate::class.java,
-            store,
-        )
-        val mediaService: MediaSessionDelegate = mock()
-        feature.mediaService = mediaService
-        feature.start()
-
-        store.dispatch(MediaSessionAction.DeactivatedMediaSessionAction(store.state.customTabs[0].id))
-
-        verify(mediaService).handleNoMedia()
-        verify(mockApplicationContext).unbindService(feature.mediaServiceConnection)
-        assertNull(feature.mediaService)
-    }
+    fun `GIVEN a custom tab is playing media WHEN media is deactivated THEN stop the media service and cleanup`() =
+        runTest {
+            val mockApplicationContext: Context = mock()
+            val mediaTab = getMediaTab(PlaybackState.UNKNOWN)
+            val customTabWithMedia = getCustomTabWithMedia(PlaybackState.PLAYING)
+            val initialState = BrowserState(
+                tabs = listOf(mediaTab),
+                customTabs = listOf(customTabWithMedia),
+            )
+            val store = BrowserStore(initialState)
+            val feature = MediaSessionFeature(
+                mockApplicationContext,
+                MediaSessionServiceDelegate::class.java,
+                store,
+                mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
+            )
+
+            val mediaService: MediaSessionDelegate = mock()
+            feature.mediaService = mediaService
+
+            feature.start()
+            testScheduler.advanceUntilIdle()
+
+            store.dispatch(MediaSessionAction.DeactivatedMediaSessionAction(store.state.customTabs[0].id))
+            testScheduler.advanceUntilIdle()
+
+            verify(mediaService).handleNoMedia()
+            verify(mockApplicationContext).unbindService(feature.mediaServiceConnection)
+            assertNull(feature.mediaService)
+        }
 
     private fun getMediaTab(playbackState: PlaybackState = PlaybackState.PLAYING) = createTab(
         "https://www.mozilla.org",
@@ -345,11 +402,12 @@ class MediaSessionFeatureTest {
         ),
     )
 
-    private fun getCustomTabWithMedia(playbackState: PlaybackState = PlaybackState.PLAYING) = createCustomTab(
-        "https://www.mozilla.org",
-        mediaSessionState = MediaSessionState(
-            mock(),
-            playbackState = playbackState,
-        ),
-    )
+    private fun getCustomTabWithMedia(playbackState: PlaybackState = PlaybackState.PLAYING) =
+        createCustomTab(
+            "https://www.mozilla.org",
+            mediaSessionState = MediaSessionState(
+                mock(),
+                playbackState = playbackState,
+            ),
+        )
 }
diff --git a/mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/focus/AudioFocusTest.kt b/mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/focus/AudioFocusTest.kt
index c206d995205cc..cdf513c12a5d4 100644
--- a/mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/focus/AudioFocusTest.kt
+++ b/mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/focus/AudioFocusTest.kt
@@ -18,9 +18,7 @@ import mozilla.components.support.base.android.NotificationsDelegate
 import mozilla.components.support.test.any
 import mozilla.components.support.test.mock
 import mozilla.components.support.test.robolectric.testContext
-import mozilla.components.support.test.rule.MainCoroutineRule
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mockito.doReturn
@@ -32,9 +30,6 @@ import org.mockito.Mockito.verifyNoMoreInteractions
 class AudioFocusTest {
     private lateinit var audioManager: AudioManager
 
-    @get:Rule
-    val coroutinesTestRule = MainCoroutineRule()
-
     @Before
     fun setUp() {
         audioManager = mock()
diff --git a/mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeatureTest.kt b/mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeatureTest.kt
index d39ed64b06445..fa8b11aad9f44 100644
--- a/mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeatureTest.kt
+++ b/mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/fullscreen/MediaSessionFullscreenFeatureTest.kt
@@ -10,6 +10,8 @@ import android.os.Build
 import android.view.Window
 import android.view.WindowManager
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.test.runTest
 import mozilla.components.browser.state.action.ContentAction
 import mozilla.components.browser.state.action.CustomTabListAction
 import mozilla.components.browser.state.action.MediaSessionAction
@@ -22,12 +24,10 @@ import mozilla.components.browser.state.state.createTab
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.concept.engine.mediasession.MediaSession
 import mozilla.components.support.test.mock
-import mozilla.components.support.test.rule.MainCoroutineRule
 import mozilla.components.support.test.whenever
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Assert.assertTrue
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mockito.clearInvocations
@@ -35,15 +35,13 @@ import org.mockito.Mockito.never
 import org.mockito.Mockito.verify
 import org.robolectric.Robolectric
 import org.robolectric.annotation.Config
+import kotlin.coroutines.ContinuationInterceptor
 
 @RunWith(AndroidJUnit4::class)
 class MediaSessionFullscreenFeatureTest {
 
-    @get:Rule
-    val coroutinesTestRule = MainCoroutineRule()
-
     @Test
-    fun `GIVEN the currently selected tab is not in fullscreen WHEN the feature is running THEN orientation is set to default`() {
+    fun `GIVEN the currently selected tab is not in fullscreen WHEN the feature is running THEN orientation is set to default`() = runTest {
         val activity: Activity = mock()
         val elementMetadata = MediaSession.ElementMetadata()
         val initialState = BrowserState(
@@ -66,15 +64,17 @@ class MediaSessionFullscreenFeatureTest {
             activity,
             store,
             null,
+            mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
         )
 
         feature.start()
+        testScheduler.advanceUntilIdle()
 
         verify(activity).setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER)
     }
 
     @Test
-    fun `GIVEN the currently selected tab plays portrait media WHEN the feature is running THEN orientation is set to portrait`() {
+    fun `GIVEN the currently selected tab plays portrait media WHEN the feature is running THEN orientation is set to portrait`() = runTest {
         val activity: Activity = mock()
         val window: Window = mock()
         whenever(activity.window).thenReturn(window)
@@ -100,15 +100,17 @@ class MediaSessionFullscreenFeatureTest {
             activity,
             store,
             null,
+            mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
         )
 
         feature.start()
+        testScheduler.advanceUntilIdle()
 
         verify(activity).setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT)
     }
 
     @Test
-    fun `GIVEN the currently selected tab plays media with no size WHEN the feature is running THEN orientation is unchanged`() {
+    fun `GIVEN the currently selected tab plays media with no size WHEN the feature is running THEN orientation is unchanged`() = runTest {
         val activity: Activity = mock()
         val window: Window = mock()
         whenever(activity.window).thenReturn(window)
@@ -134,15 +136,17 @@ class MediaSessionFullscreenFeatureTest {
             activity,
             store,
             null,
+            mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
         )
 
         feature.start()
+        testScheduler.advanceUntilIdle()
 
         verify(activity).setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER)
     }
 
     @Test
-    fun `GIVEN the currently selected tab plays landscape media WHEN it enters fullscreen THEN set orientation to landscape`() {
+    fun `GIVEN the currently selected tab plays landscape media WHEN it enters fullscreen THEN set orientation to landscape`() = runTest {
         val activity: Activity = mock()
         val window: Window = mock()
         whenever(activity.window).thenReturn(window)
@@ -168,9 +172,11 @@ class MediaSessionFullscreenFeatureTest {
             activity,
             store,
             null,
+            mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
         )
 
         feature.start()
+        testScheduler.advanceUntilIdle()
 
         verify(activity).setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE)
     }
@@ -178,7 +184,7 @@ class MediaSessionFullscreenFeatureTest {
     @Suppress("Deprecation")
     @Test
     @Config(sdk = [Build.VERSION_CODES.O])
-    fun `GIVEN the currently selected tab plays landscape media WHEN it enters pip mode THEN set orientation to unspecified`() {
+    fun `GIVEN the currently selected tab plays landscape media WHEN it enters pip mode THEN set orientation to unspecified`() = runTest {
         val activity = Robolectric.buildActivity(Activity::class.java).setup().get()
         val elementMetadata = MediaSession.ElementMetadata(width = 100, height = 100)
         val initialState = BrowserState(
@@ -201,13 +207,17 @@ class MediaSessionFullscreenFeatureTest {
             activity,
             store,
             null,
+            mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
         )
 
         feature.start()
+        testScheduler.advanceUntilIdle()
+
         activity.enterPictureInPictureMode()
 
         assertTrue(activity.isInPictureInPictureMode)
         store.dispatch(ContentAction.PictureInPictureChangedAction("tab1", true))
+        testScheduler.advanceUntilIdle()
 
         assertEquals(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED, activity.requestedOrientation)
     }
@@ -215,7 +225,7 @@ class MediaSessionFullscreenFeatureTest {
     @Suppress("Deprecation")
     @Test
     @Config(sdk = [Build.VERSION_CODES.O])
-    fun `GIVEN the currently selected tab is in pip mode WHEN an external intent arrives THEN set orientation to default`() {
+    fun `GIVEN the currently selected tab is in pip mode WHEN an external intent arrives THEN set orientation to default`() = runTest {
         val activity = Robolectric.buildActivity(Activity::class.java).setup().get()
         val elementMetadata = MediaSession.ElementMetadata(width = 100, height = 100)
         val initialState = BrowserState(
@@ -238,11 +248,16 @@ class MediaSessionFullscreenFeatureTest {
             activity,
             store,
             null,
+            mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
         )
 
         feature.start()
+        testScheduler.advanceUntilIdle()
+
         activity.enterPictureInPictureMode()
         store.dispatch(ContentAction.PictureInPictureChangedAction("tab1", true))
+        testScheduler.advanceUntilIdle()
+
         assertEquals(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED, activity.requestedOrientation)
 
         val tab2 = createTab(
@@ -257,6 +272,8 @@ class MediaSessionFullscreenFeatureTest {
                 MediaSession.ElementMetadata(),
             ),
         )
+        testScheduler.advanceUntilIdle()
+
         assertEquals(ActivityInfo.SCREEN_ORIENTATION_USER, activity.requestedOrientation)
         assertEquals(tab2.id, store.state.selectedTabId)
     }
@@ -264,7 +281,7 @@ class MediaSessionFullscreenFeatureTest {
     @Suppress("Deprecation")
     @Test
     @Config(sdk = [Build.VERSION_CODES.O])
-    fun `GIVEN the currently selected tab is in pip mode WHEN it exits pip mode THEN set orientation to default`() {
+    fun `GIVEN the currently selected tab is in pip mode WHEN it exits pip mode THEN set orientation to default`() = runTest {
         val activity = Robolectric.buildActivity(Activity::class.java).setup().get()
         val elementMetadata = MediaSession.ElementMetadata(width = 100, height = 100)
         val initialState = BrowserState(
@@ -287,13 +304,17 @@ class MediaSessionFullscreenFeatureTest {
             activity,
             store,
             null,
+            mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
         )
 
         feature.start()
+        testScheduler.advanceUntilIdle()
+
         activity.enterPictureInPictureMode()
 
         assertTrue(activity.isInPictureInPictureMode)
         store.dispatch(ContentAction.PictureInPictureChangedAction("tab1", true))
+        testScheduler.advanceUntilIdle()
 
         assertEquals(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED, activity.requestedOrientation)
 
@@ -304,6 +325,7 @@ class MediaSessionFullscreenFeatureTest {
                 MediaSession.ElementMetadata(),
             ),
         )
+        testScheduler.advanceUntilIdle()
 
         assertEquals(ActivityInfo.SCREEN_ORIENTATION_USER, activity.requestedOrientation)
     }
@@ -311,7 +333,7 @@ class MediaSessionFullscreenFeatureTest {
     @Suppress("Deprecation")
     @Test
     @Config(sdk = [Build.VERSION_CODES.O])
-    fun `GIVEN the currently selected tab is in pip mode WHEN a custom tab loads THEN display custom tab in device's current orientation`() {
+    fun `GIVEN the currently selected tab is in pip mode WHEN a custom tab loads THEN display custom tab in device's current orientation`() = runTest {
         val activity = Robolectric.buildActivity(Activity::class.java).setup().get()
         val elementMetadata = MediaSession.ElementMetadata(width = 100, height = 100)
         val initialState = BrowserState(
@@ -335,12 +357,17 @@ class MediaSessionFullscreenFeatureTest {
             activity,
             store,
             null,
+            mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
         )
 
         feature.start()
+        testScheduler.advanceUntilIdle()
+
         activity.enterPictureInPictureMode()
 
         store.dispatch(ContentAction.PictureInPictureChangedAction("tab1", true))
+        testScheduler.advanceUntilIdle()
+
         assertEquals(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED, activity.requestedOrientation)
 
         val customTab = createCustomTab(
@@ -349,6 +376,8 @@ class MediaSessionFullscreenFeatureTest {
             id = "tab2",
         )
         store.dispatch(CustomTabListAction.AddCustomTabAction(customTab))
+        testScheduler.advanceUntilIdle()
+
         val externalActivity = Robolectric.buildActivity(Activity::class.java).setup().get()
         assertEquals(1, store.state.customTabs.size)
         val featureForExternalAppBrowser = MediaSessionFullscreenFeature(
@@ -362,7 +391,7 @@ class MediaSessionFullscreenFeatureTest {
     }
 
     @Test
-    fun `GIVEN the selected tab in fullscreen mode WHEN the media is paused or stopped THEN release the wake lock of the device`() {
+    fun `GIVEN the selected tab in fullscreen mode WHEN the media is paused or stopped THEN release the wake lock of the device`() = runTest {
         val activity: Activity = mock()
         val window: Window = mock()
 
@@ -390,24 +419,34 @@ class MediaSessionFullscreenFeatureTest {
             activity,
             store,
             null,
+            mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
         )
+
         feature.start()
+        testScheduler.advanceUntilIdle()
+
         verify(activity.window).addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
 
         store.dispatch(MediaSessionAction.UpdateMediaPlaybackStateAction("tab1", MediaSession.PlaybackState.PAUSED))
+        testScheduler.advanceUntilIdle()
+
         verify(activity.window).clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
 
         clearInvocations(activity.window)
 
         store.dispatch(MediaSessionAction.UpdateMediaPlaybackStateAction("tab1", MediaSession.PlaybackState.PLAYING))
+        testScheduler.advanceUntilIdle()
+
         verify(activity.window).addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
 
         store.dispatch(MediaSessionAction.DeactivatedMediaSessionAction("tab1"))
+        testScheduler.advanceUntilIdle()
+
         verify(activity.window).clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
     }
 
     @Test
-    fun `GIVEN the selected tab is not in fullscreen mode WHEN it enters fullscreen THEN lock the wake lock of the device`() {
+    fun `GIVEN the selected tab is not in fullscreen mode WHEN it enters fullscreen THEN lock the wake lock of the device`() = runTest {
         val activity: Activity = mock()
         val window: Window = mock()
 
@@ -435,21 +474,29 @@ class MediaSessionFullscreenFeatureTest {
             activity,
             store,
             null,
+            mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
         )
+
         feature.start()
+        testScheduler.advanceUntilIdle()
+
         verify(activity.window, never()).addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
 
         store.dispatch(MediaSessionAction.UpdateMediaFullscreenAction("tab1", true, elementMetadata))
+        testScheduler.advanceUntilIdle()
+
         verify(activity.window).addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
 
         clearInvocations(activity.window)
 
         store.dispatch(MediaSessionAction.UpdateMediaFullscreenAction("tab1", false, elementMetadata))
+        testScheduler.advanceUntilIdle()
+
         verify(activity.window).clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
     }
 
     @Test
-    fun `GIVEN the selected tab in fullscreen mode WHEN the active tab is changed to no media tab THEN release the wake lock of the device`() {
+    fun `GIVEN the selected tab in fullscreen mode WHEN the active tab is changed to no media tab THEN release the wake lock of the device`() = runTest {
         val activity: Activity = mock()
         val window: Window = mock()
 
@@ -477,8 +524,12 @@ class MediaSessionFullscreenFeatureTest {
             activity,
             store,
             null,
+            mainDispatcher = coroutineContext[ContinuationInterceptor] as CoroutineDispatcher,
         )
+
         feature.start()
+        testScheduler.advanceUntilIdle()
+
         verify(activity.window).addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
 
         val tab2 = createTab(
@@ -488,6 +539,8 @@ class MediaSessionFullscreenFeatureTest {
         clearInvocations(activity.window)
         store.dispatch(TabListAction.AddTabAction(tab2, select = true))
         store.dispatch(MediaSessionAction.UpdateMediaFullscreenAction(store.state.tabs[0].id, false, elementMetadata))
+        testScheduler.advanceUntilIdle()
+
         verify(activity.window).clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         assertEquals(tab2.id, store.state.selectedTabId)
     }
diff --git a/mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/service/MediaSessionServiceDelegateTest.kt b/mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/service/MediaSessionServiceDelegateTest.kt
index 8880f602960a2..e3b42b1e27e28 100644
--- a/mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/service/MediaSessionServiceDelegateTest.kt
+++ b/mobile/android/android-components/components/feature/media/src/test/java/mozilla/components/feature/media/service/MediaSessionServiceDelegateTest.kt
@@ -17,6 +17,7 @@ import android.support.v4.media.session.PlaybackStateCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.test.runTest
 import mozilla.components.browser.state.state.BrowserState
 import mozilla.components.browser.state.state.MediaSessionState
 import mozilla.components.browser.state.state.createTab
@@ -40,8 +41,6 @@ import mozilla.components.support.test.coMock
 import mozilla.components.support.test.eq
 import mozilla.components.support.test.mock
 import mozilla.components.support.test.robolectric.testContext
-import mozilla.components.support.test.rule.MainCoroutineRule
-import mozilla.components.support.test.rule.runTestOnMain
 import mozilla.components.support.test.whenever
 import mozilla.components.support.utils.ext.stopForegroundCompat
 import org.junit.Assert.assertEquals
@@ -50,7 +49,6 @@ import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertSame
 import org.junit.Assert.assertTrue
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mockito.anyInt
@@ -66,14 +64,11 @@ import android.media.session.PlaybackState as AndroidPlaybackState
 @RunWith(AndroidJUnit4::class)
 class MediaSessionServiceDelegateTest {
 
-    @get:Rule
-    val coroutinesTestRule = MainCoroutineRule()
-
     private val notificationId = SharedIdsHelper.getIdForTag(testContext, AbstractMediaSessionService.NOTIFICATION_TAG)
 
     @Test
-    fun `WHEN the service is created THEN create a new notification scope audio focus manager`() {
-        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock())
+    fun `WHEN the service is created THEN create a new notification scope audio focus manager`() = runTest {
+        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock(), this)
         delegate.mediaSession = mock()
         val mediaCallbackCaptor = argumentCaptor<MediaSessionCallback>()
 
@@ -84,8 +79,8 @@ class MediaSessionServiceDelegateTest {
     }
 
     @Test
-    fun `WHEN the service is destroyed THEN stop notification updates and abandon audio focus`() {
-        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock())
+    fun `WHEN the service is destroyed THEN stop notification updates and abandon audio focus`() = runTest {
+        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock(), this)
         delegate.audioFocus = mock()
 
         delegate.onDestroy()
@@ -96,8 +91,8 @@ class MediaSessionServiceDelegateTest {
     }
 
     @Test
-    fun `GIVEN media playing started WHEN a new play command is received THEN resume media and emit telemetry`() {
-        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock())
+    fun `GIVEN media playing started WHEN a new play command is received THEN resume media and emit telemetry`() = runTest {
+        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock(), this)
         delegate.controller = mock() // simulate media already started playing
 
         CollectionProcessor.withFactCollection { facts ->
@@ -114,8 +109,8 @@ class MediaSessionServiceDelegateTest {
     }
 
     @Test
-    fun `GIVEN media playing started WHEN a new pause command is received THEN pause media and emit telemetry`() {
-        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock())
+    fun `GIVEN media playing started WHEN a new pause command is received THEN pause media and emit telemetry`() = runTest {
+        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock(), this)
         delegate.controller = mock() // simulate media already started playing
 
         CollectionProcessor.withFactCollection { facts ->
@@ -132,7 +127,7 @@ class MediaSessionServiceDelegateTest {
     }
 
     @Test
-    fun `WHEN the task is removed THEN stop media in all tabs and shutdown`() {
+    fun `WHEN the task is removed THEN stop media in all tabs and shutdown`() = runTest {
         val notificationManagerCompat: NotificationManagerCompat = mock()
         val notificationsDelegate: NotificationsDelegate = mock()
         whenever(notificationsDelegate.notificationManagerCompat).thenReturn(notificationManagerCompat)
@@ -156,9 +151,9 @@ class MediaSessionServiceDelegateTest {
     }
 
     @Test
-    fun `WHEN handling playing media THEN emit telemetry`() {
+    fun `WHEN handling playing media THEN emit telemetry`() = runTest {
         val mediaTab = getMediaTab()
-        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock())
+        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock(), this)
         delegate.audioFocus = mock()
 
         CollectionProcessor.withFactCollection { facts ->
@@ -174,7 +169,7 @@ class MediaSessionServiceDelegateTest {
     }
 
     @Test
-    fun `WHEN handling playing media THEN setup internal properties`() {
+    fun `WHEN handling playing media THEN setup internal properties`() = runTest {
         val mediaTab = getMediaTab()
         val delegate = spy(MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock()))
         delegate.audioFocus = mock()
@@ -187,38 +182,40 @@ class MediaSessionServiceDelegateTest {
     }
 
     @Test
-    fun `GIVEN the service is already in foreground WHEN handling playing media THEN setup internal properties`() = runTestOnMain {
+    fun `GIVEN the service is already in foreground WHEN handling playing media THEN setup internal properties`() = runTest {
         val mediaTab = getMediaTab()
         val notificationsDelegate: NotificationsDelegate = mock()
-        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), notificationsDelegate)
+        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), notificationsDelegate, this)
         delegate.onCreate()
         delegate.audioFocus = mock()
         delegate.isForegroundService = true
 
         delegate.handleMediaPlaying(mediaTab)
+        testScheduler.advanceUntilIdle()
 
         verify(notificationsDelegate).notify(any(), eq(delegate.notificationId), any(), any(), any(), eq(false))
     }
 
     @Test
-    fun `GIVEN the service is not in foreground WHEN handling playing media THEN start the media service as foreground`() {
+    fun `GIVEN the service is not in foreground WHEN handling playing media THEN start the media service as foreground`() = runTest {
         val mediaTab = getMediaTab()
-        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock())
+        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock(), this)
         delegate.onCreate()
         delegate.audioFocus = mock()
         delegate.isForegroundService = false
 
         delegate.handleMediaPlaying(mediaTab)
+        testScheduler.advanceUntilIdle()
 
         verify(delegate.service).startForeground(eq(delegate.notificationId), any())
         assertTrue(delegate.isForegroundService)
     }
 
     @Test
-    fun `WHEN updating the notification for a new media state THEN post a new notification`() = runTestOnMain {
+    fun `WHEN updating the notification for a new media state THEN post a new notification`() = runTest {
         val mediaTab = getMediaTab()
         val notificationsDelegate: NotificationsDelegate = mock()
-        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), notificationsDelegate)
+        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), notificationsDelegate, this)
         delegate.onCreate()
         val notification: Notification = mock()
         delegate.notificationHelper = coMock {
@@ -226,28 +223,30 @@ class MediaSessionServiceDelegateTest {
         }
 
         delegate.updateNotification(mediaTab)
+        testScheduler.advanceUntilIdle()
 
         verify(notificationsDelegate).notify(any(), eq(delegate.notificationId), eq(notification), any(), any(), eq(false))
     }
 
     @Test
-    fun `WHEN starting the service as foreground THEN use start with a new notification for the current media state`() = runTestOnMain {
+    fun `WHEN starting the service as foreground THEN use start with a new notification for the current media state`() = runTest {
         val mediaTab = getMediaTab()
-        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock())
+        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock(), this)
         delegate.onCreate()
         val notification: Notification = mock()
         delegate.notificationHelper = coMock {
             doReturn(notification).`when`(this).create(mediaTab, delegate.mediaSession)
         }
 
-        delegate.startForeground(mediaTab)
+        delegate.startForeground(mediaTab, coroutineContext)
+        testScheduler.advanceUntilIdle()
 
         verify(delegate.service).startForeground(eq(delegate.notificationId), eq(notification))
         assertTrue(delegate.isForegroundService)
     }
 
     @Test
-    fun `GIVEN media is paused WHEN media is handling resuming media THEN resume the right session`() {
+    fun `GIVEN media is paused WHEN media is handling resuming media THEN resume the right session`() = runTest {
         val mediaTab1 = getMediaTab()
         val mediaTab2 = getMediaTab(PlaybackState.PAUSED)
         val store = BrowserStore(
@@ -269,9 +268,9 @@ class MediaSessionServiceDelegateTest {
     }
 
     @Test
-    fun `WHEN handling paused media THEN emit telemetry`() {
+    fun `WHEN handling paused media THEN emit telemetry`() = runTest {
         val mediaTab = getMediaTab(PlaybackState.PAUSED)
-        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock())
+        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock(), this)
 
         CollectionProcessor.withFactCollection { facts ->
             delegate.handleMediaPaused(mediaTab)
@@ -286,7 +285,7 @@ class MediaSessionServiceDelegateTest {
     }
 
     @Test
-    fun `WHEN handling paused media THEN update internal state and notification and stop the service`() = runTestOnMain {
+    fun `WHEN handling paused media THEN update internal state and notification and stop the service`() = runTest {
         val mediaTab = getMediaTab(PlaybackState.PAUSED)
         val notificationManagerCompat = spy(NotificationManagerCompat.from(testContext))
         val notificationsDelegate = spy(NotificationsDelegate(notificationManagerCompat))
@@ -297,7 +296,7 @@ class MediaSessionServiceDelegateTest {
         val mediaSession: MediaSessionCompat = mock()
         val notificationId = SharedIdsHelper.getIdForTag(testContext, AbstractMediaSessionService.NOTIFICATION_TAG)
 
-        val delegate = spy(MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), notificationsDelegate))
+        val delegate = spy(MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), notificationsDelegate, this))
         delegate.isForegroundService = true
         delegate.mediaSession = mediaSession
         delegate.notificationHelper = notificationHelper
@@ -307,6 +306,7 @@ class MediaSessionServiceDelegateTest {
         delegate.onCreate()
 
         delegate.handleMediaPaused(mediaTab)
+        testScheduler.advanceUntilIdle()
 
         verify(delegate).updateMediaSession(mediaTab)
         verify(delegate).unregisterBecomingNoisyListenerIfNeeded()
@@ -316,9 +316,9 @@ class MediaSessionServiceDelegateTest {
     }
 
     @Test
-    fun `WHEN handling stopped media THEN emit telemetry`() {
+    fun `WHEN handling stopped media THEN emit telemetry`() = runTest {
         val mediaTab = getMediaTab(PlaybackState.STOPPED)
-        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock())
+        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock(), this)
 
         CollectionProcessor.withFactCollection { facts ->
             delegate.handleMediaStopped(mediaTab)
@@ -333,15 +333,16 @@ class MediaSessionServiceDelegateTest {
     }
 
     @Test
-    fun `WHEN handling stopped media THEN update internal state and notification and stop the service`() = runTestOnMain {
+    fun `WHEN handling stopped media THEN update internal state and notification and stop the service`() = runTest {
         val mediaTab = getMediaTab(PlaybackState.STOPPED)
         val notificationsDelegate: NotificationsDelegate = mock()
 
-        val delegate = spy(MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), notificationsDelegate))
+        val delegate = spy(MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), notificationsDelegate, this))
         delegate.isForegroundService = true
         delegate.onCreate()
 
         delegate.handleMediaStopped(mediaTab)
+        testScheduler.advanceUntilIdle()
 
         verify(delegate).updateMediaSession(mediaTab)
         verify(delegate).unregisterBecomingNoisyListenerIfNeeded()
@@ -351,7 +352,7 @@ class MediaSessionServiceDelegateTest {
     }
 
     @Test
-    fun `WHEN there is no media playing THEN stop the media service`() {
+    fun `WHEN there is no media playing THEN stop the media service`() = runTest {
         val notificationManagerCompat: NotificationManagerCompat = mock()
         val notificationsDelegate: NotificationsDelegate = mock()
         whenever(notificationsDelegate.notificationManagerCompat).thenReturn(notificationManagerCompat)
@@ -368,7 +369,7 @@ class MediaSessionServiceDelegateTest {
 
     @Suppress("Deprecation")
     @Test
-    fun `WHEN updating the media session THEN use the values from the current media session`() {
+    fun `WHEN updating the media session THEN use the values from the current media session`() = runTest {
         val bitmap: Bitmap = mock()
         val getArtwork: (suspend () -> Bitmap?) = { bitmap }
         val metadata = Metadata("title", "artist", "album", getArtwork)
@@ -379,7 +380,7 @@ class MediaSessionServiceDelegateTest {
             mediaSessionState = MediaSessionState(mock(), metadata = metadata),
         )
 
-        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock())
+        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock(), this)
         delegate.mediaSession = mock()
         delegate.onCreate()
         val metadataCaptor = argumentCaptor<MediaMetadataCompat>()
@@ -388,6 +389,7 @@ class MediaSessionServiceDelegateTest {
         val expectedPlaybackState = mediaTab.mediaSessionState!!.toPlaybackState()
 
         delegate.updateMediaSession(mediaTab)
+        testScheduler.advanceUntilIdle()
 
         verify(delegate.mediaSession).isActive = true
         verify(delegate.mediaSession).setPlaybackState(playbackStateCaptor.capture())
@@ -423,8 +425,8 @@ class MediaSessionServiceDelegateTest {
     }
 
     @Test
-    fun `WHEN stopping running in foreground THEN stop the foreground service`() {
-        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock())
+    fun `WHEN stopping running in foreground THEN stop the foreground service`() = runTest {
+        val delegate = MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock(), this)
         delegate.isForegroundService = true
 
         delegate.stopForeground()
@@ -434,7 +436,7 @@ class MediaSessionServiceDelegateTest {
     }
 
     @Test
-    fun `GIVEN a audio noisy receiver is already registered WHEN trying to register a new one THEN return early`() {
+    fun `GIVEN a audio noisy receiver is already registered WHEN trying to register a new one THEN return early`() = runTest {
         val context = spy(testContext)
         val delegate = MediaSessionServiceDelegate(context, mock(), mock(), mock(), mock())
         delegate.noisyAudioStreamReceiver = mock()
@@ -445,7 +447,7 @@ class MediaSessionServiceDelegateTest {
     }
 
     @Test
-    fun `GIVEN a audio noisy receiver is not already registered WHEN trying to register a new one THEN register it`() {
+    fun `GIVEN a audio noisy receiver is not already registered WHEN trying to register a new one THEN register it`() = runTest {
         val delegate = spy(MediaSessionServiceDelegate(testContext, mock(), mock(), mock(), mock()))
         val receiverCaptor = argumentCaptor<BroadcastReceiver>()
 
@@ -456,7 +458,7 @@ class MediaSessionServiceDelegateTest {
     }
 
     @Test
-    fun `GIVEN a audio noisy receiver is already registered WHEN trying to unregister one THEN unregister it`() {
+    fun `GIVEN a audio noisy receiver is already registered WHEN trying to unregister one THEN unregister it`() = runTest {
         val context = spy(testContext)
         val delegate = MediaSessionServiceDelegate(context, mock(), mock(), mock(), mock())
         delegate.noisyAudioStreamReceiver = mock()
@@ -475,7 +477,7 @@ class MediaSessionServiceDelegateTest {
     }
 
     @Test
-    fun `GIVEN a audio noisy receiver is not already registered WHEN trying to unregister one THEN return early`() {
+    fun `GIVEN a audio noisy receiver is not already registered WHEN trying to unregister one THEN return early`() = runTest {
         val context = spy(testContext)
         val delegate = MediaSessionServiceDelegate(context, mock(), mock(), mock(), mock())
 
@@ -485,7 +487,7 @@ class MediaSessionServiceDelegateTest {
     }
 
     @Test
-    fun `WHEN the delegate is shutdown THEN cleanup resources and stop the media service`() {
+    fun `WHEN the delegate is shutdown THEN cleanup resources and stop the media service`() = runTest {
         val notificationManagerCompat: NotificationManagerCompat = mock()
         val notificationsDelegate: NotificationsDelegate = mock()
         whenever(notificationsDelegate.notificationManagerCompat).thenReturn(notificationManagerCompat)
@@ -501,7 +503,7 @@ class MediaSessionServiceDelegateTest {
     }
 
     @Test
-    fun `when device is becoming noisy, playback is paused`() {
+    fun `when device is becoming noisy, playback is paused`() = runTest {
         val controller: MediaSession.Controller = mock()
         val initialState = BrowserState(
             tabs = listOf(
@@ -523,10 +525,10 @@ class MediaSessionServiceDelegateTest {
     }
 
     @Test
-    fun `GIVEN device is at least API level 31 WHEN startForeground throws an exception THEN catch and pass the exception to the crash reporter`() = runTestOnMain {
+    fun `GIVEN device is at least API level 31 WHEN startForeground throws an exception THEN catch and pass the exception to the crash reporter`() = runTest {
         val crashReporter: CrashReporting = mock()
         val service: AbstractMediaSessionService = mock()
-        val delegate = MediaSessionServiceDelegate(testContext, service, mock(), crashReporter, mock())
+        val delegate = MediaSessionServiceDelegate(testContext, service, mock(), crashReporter, mock(), this)
         delegate.onCreate()
         val notification: Notification = mock()
         delegate.notificationHelper = coMock {
@@ -537,22 +539,30 @@ class MediaSessionServiceDelegateTest {
         doThrow(exception).`when`(service).startForeground(anyInt(), any())
         setSdkInt(31)
 
-        delegate.startForeground(mock())
+        delegate.startForeground(mock(), coroutineContext)
+        testScheduler.advanceUntilIdle()
 
         verify(crashReporter).submitCaughtException(exception)
     }
 
     @Test(expected = ForegroundServiceStartNotAllowedException::class)
-    fun `GIVEN device is less than 31 WHEN startForeground throws an exception THEN rethrow the exception`() {
-        var throwable: Throwable? = null
-        val exceptionHandler = CoroutineExceptionHandler { _, t ->
-            throwable = t
-        }
+    fun `GIVEN device is less than 31 WHEN startForeground throws an exception THEN rethrow the exception`() =
+        runTest {
+            var throwable: Throwable? = null
+            val exceptionHandler = CoroutineExceptionHandler { _, t ->
+                throwable = t
+            }
 
-        runTestOnMain {
             val crashReporter: CrashReporting = mock()
             val service: AbstractMediaSessionService = mock()
-            val delegate = MediaSessionServiceDelegate(testContext, service, mock(), crashReporter, mock())
+            val delegate = MediaSessionServiceDelegate(
+                testContext,
+                service,
+                mock(),
+                crashReporter,
+                mock(),
+                this,
+            )
             delegate.onCreate()
             val notification: Notification = mock()
             delegate.notificationHelper = coMock {
@@ -564,10 +574,9 @@ class MediaSessionServiceDelegateTest {
             setSdkInt(30)
 
             delegate.startForeground(mock(), exceptionHandler)
-        }
 
-        throwable?.let { throw it }
-    }
+            throwable?.let { throw it }
+        }
 
     private fun getMediaTab(playbackState: PlaybackState = PlaybackState.PLAYING) = createTab(
         title = "Mozilla",

From 5099e99133140e543bc3244ebf4cad0160785e2b Mon Sep 17 00:00:00 2001
From: Alex Finder <afinder@mozilla.com>
Date: Thu, 29 Jan 2026 17:03:44 +0000
Subject: [PATCH 096/116] Bug 2001125 - Set up Monitoring for Decision task 
 r=perftest-reviewers,sparky

Differential Revision: https://phabricator.services.mozilla.com/D280280
---
 taskcluster/mach_commands.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/taskcluster/mach_commands.py b/taskcluster/mach_commands.py
index e86834b29a62c..10ba1e6234d7a 100644
--- a/taskcluster/mach_commands.py
+++ b/taskcluster/mach_commands.py
@@ -301,7 +301,10 @@ def taskgraph_decision(command_context, **options):
                         "name": "decision",
                         "value": end - start,
                         "lowerIsBetter": True,
-                        "shouldAlert": True,
+                        "monitor": True,
+                        "alertNotifyEmails": [
+                            "release+gecko-decision-alerts@mozilla.com"
+                        ],
                         "subtests": [],
                     }
                 ],

From 23721b7e0202ed631143a6f4dec6e05af78ac29f Mon Sep 17 00:00:00 2001
From: Edgar Chen <echen@mozilla.com>
Date: Thu, 29 Jan 2026 17:13:00 +0000
Subject: [PATCH 097/116] Bug 1978714 - Ignore UAWidget when
 nsContentUtils::GetIndexInParent() is called with TreeKind::Flat; r=masayuki

nsContentUtils::GetIndexInParent() with Flat TreeKind can be called from layout
or selection code. In the selection case, the UAWidget is ingored while compute the
parent node, and the shadow host is used instead. This patch attempts to detect
that situation and use the appropriate way to compute the index.

Bug 2012637 is going to introduce a TreeKind for selection, at which point this
hacky detection will no longer be needed.

Differential Revision: https://phabricator.services.mozilla.com/D280752
---
 dom/base/nsContentUtils.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
index b0c98e4197e23..ed175f9f2fe32 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@@ -12569,7 +12569,22 @@ Maybe<int32_t> nsContentUtils::GetIndexInParent(const nsINode* aParent,
                 aKind == TreeKind::ShadowIncludingDOM) {
     idx = aParent->ComputeIndexOf(aNode);
   } else {
-    idx = aParent->ComputeFlatTreeIndexOf(aNode);
+    idx = [&]() -> Maybe<uint32_t> {
+      if (aNode->IsContent()) {
+        if (HTMLSlotElement* slot = aNode->AsContent()->GetAssignedSlot()) {
+          // If the assigned slot is in the UAWidget anonymous subtree of
+          // aParent, this is likely being called for selection purposes. In
+          // this case, we should ignore the UAWidget.
+          // XXX: Bug 2008277 is going to introduce a TreeKind for selection and
+          // then we can use that here instead.
+          if (slot->GetClosestNativeAnonymousSubtreeRootParentOrHost() ==
+              aParent) {
+            return aParent->ComputeIndexOf(aNode);
+          }
+        }
+      }
+      return aParent->ComputeFlatTreeIndexOf(aNode);
+    }();
   }
 
   if (idx) {

From d7693f55e44a55119a462e2f9ed2d94214757a1e Mon Sep 17 00:00:00 2001
From: Edgar Chen <echen@mozilla.com>
Date: Thu, 29 Jan 2026 17:13:01 +0000
Subject: [PATCH 098/116] Bug 1994763 - Ignore UAWidget when computing the
 offset iin nsContentUtils::GetFlattenedTreeAncestorsAndOffsets(); r=masayuki

The UAWidget is ignored when computing the ancestors, so we should do the same
when computing the offsets.

Differential Revision: https://phabricator.services.mozilla.com/D277672
---
 dom/base/nsContentUtils.cpp                   |  20 ++-
 dom/base/nsContentUtils.h                     |   2 +
 dom/serializers/nsDocumentEncoder.cpp         |  12 +-
 .../tests/mochitest/mochitest.toml            |   2 +
 .../test_htmlcopyencoder_details.html         | 160 ++++++++++++++++++
 5 files changed, 194 insertions(+), 2 deletions(-)
 create mode 100644 dom/serializers/tests/mochitest/test_htmlcopyencoder_details.html

diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
index ed175f9f2fe32..be53d54487d58 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@@ -3266,6 +3266,20 @@ nsresult nsContentUtils::GetInclusiveAncestorsAndOffsets(
       });
 }
 
+static inline Maybe<uint32_t> ComputeFlatTreeIndexOfForSelection(
+    const nsIContent* const aParent, const nsIContent* const aPossibleChild) {
+  MOZ_ASSERT(aParent);
+  MOZ_ASSERT(aPossibleChild);
+  if (HTMLSlotElement* slot = aPossibleChild->GetAssignedSlot()) {
+    if (const ShadowRoot* shadowRoot = slot->GetContainingShadow()) {
+      if (shadowRoot->IsUAWidget()) {
+        return aParent->ComputeIndexOf(aPossibleChild);
+      }
+    }
+  }
+  return aParent->ComputeFlatTreeIndexOf(aPossibleChild);
+}
+
 nsresult nsContentUtils::GetFlattenedTreeAncestorsAndOffsets(
     nsINode* aNode, uint32_t aOffset, nsTArray<nsIContent*>& aAncestorNodes,
     nsTArray<Maybe<uint32_t>>& aAncestorOffsets) {
@@ -3276,7 +3290,11 @@ nsresult nsContentUtils::GetFlattenedTreeAncestorsAndOffsets(
             GetParentFuncForComparison<TreeKind::Flat>(aContent));
       },
       [](nsIContent* aParent, nsIContent* aChild) {
-        return aParent->ComputeFlatTreeIndexOf(aChild);
+        // GetParentFuncForComparison() with TreeKind::Flat ignores the
+        // UAWidget, so we should do the same when computing the offset.
+        // XXX: Maybe we should use RawRangeBoundary instead of holding ancestor
+        // and offset separately.
+        return ComputeFlatTreeIndexOfForSelection(aParent, aChild);
       });
 }
 
diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h
index e9a23b6e762c8..36892f876552c 100644
--- a/dom/base/nsContentUtils.h
+++ b/dom/base/nsContentUtils.h
@@ -519,6 +519,8 @@ class nsContentUtils {
    *
    * When the current content is a ShadowRoot, the offset of it from
    * its ancestor (the host element) will be Nothing().
+   *
+   * The UAWidget won't be included in the ancestor list.
    */
   static nsresult GetFlattenedTreeAncestorsAndOffsets(
       nsINode* aNode, uint32_t aOffset, nsTArray<nsIContent*>& aAncestorNodes,
diff --git a/dom/serializers/nsDocumentEncoder.cpp b/dom/serializers/nsDocumentEncoder.cpp
index d88c70284185f..518a3d63b058f 100644
--- a/dom/serializers/nsDocumentEncoder.cpp
+++ b/dom/serializers/nsDocumentEncoder.cpp
@@ -1234,6 +1234,16 @@ nsDocumentEncoder::RangeSerializer::SerializeNodePartiallyContainedInRange(
   return NS_OK;
 }
 
+static nsINode* GetChildAtInFlatTreeForSelection(const nsINode& aNode,
+                                                 const uint32_t aIndex) {
+  if (ShadowRoot* shadowRoot = aNode.GetShadowRoot()) {
+    if (shadowRoot->IsUAWidget()) {
+      return aNode.GetChildAt_Deprecated(aIndex);
+    }
+  }
+  return aNode.GetChildAtInFlatTree(aIndex);
+}
+
 nsresult nsDocumentEncoder::RangeSerializer::SerializeChildrenOfContent(
     nsIContent& aContent, uint32_t aStartOffset, uint32_t aEndOffset,
     const nsRange* aRange, int32_t aDepth) {
@@ -1252,7 +1262,7 @@ nsresult nsDocumentEncoder::RangeSerializer::SerializeChildrenOfContent(
 
   nsINode* childAsNode =
       mAllowCrossShadowBoundary == AllowRangeCrossShadowBoundary::Yes
-          ? aContent.GetChildAtInFlatTree(aStartOffset)
+          ? GetChildAtInFlatTreeForSelection(aContent, aStartOffset)
           : aContent.GetChildAt_Deprecated(aStartOffset);
 
   MOZ_ASSERT_IF(childAsNode, childAsNode->IsContent());
diff --git a/dom/serializers/tests/mochitest/mochitest.toml b/dom/serializers/tests/mochitest/mochitest.toml
index 5482779e765fe..039420fcb0b39 100644
--- a/dom/serializers/tests/mochitest/mochitest.toml
+++ b/dom/serializers/tests/mochitest/mochitest.toml
@@ -132,6 +132,8 @@ skip-if = [
 
 ["test_htmlcopyencoder_common_ancestor.html"]
 
+["test_htmlcopyencoder_details.html"]
+
 ["test_htmlcopyencoder_list.html"]
 
 ["test_htmlcopyencoder_table.html"]
diff --git a/dom/serializers/tests/mochitest/test_htmlcopyencoder_details.html b/dom/serializers/tests/mochitest/test_htmlcopyencoder_details.html
new file mode 100644
index 0000000000000..4990feec95e6a
--- /dev/null
+++ b/dom/serializers/tests/mochitest/test_htmlcopyencoder_details.html
@@ -0,0 +1,160 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+-->
+<head>
+<title>Test on the html copy encoder for details selection</title>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1994763">Mozilla Bug 1994763</a>
+<p id="display"></p>
+<div id="content" style="display: none"></div>
+<div id="container">
+  <details id="basic" open>
+    <summary>Basic</summary>First<br>Second<br>Third<br>
+  </details>
+  <details id="nested" open>
+    <summary>Outer</summary>Before<br>
+    <details open>
+      <summary>Inner</summary>First<br>Second<br>Third
+    </details>
+    <br>After<br>
+  </details>
+  <details id="nested-shadow" open>
+    <summary>Outer</summary>
+    <br>Before<br>
+    <div>
+      <template shadowrootmode="open">
+        <br>InnerBefore<br>
+        <slot></slot>
+        <br>InnerAfter<br>
+      </template>
+      <details open>
+        <summary>Inner</summary>First<br>Second<br>Third
+      </details>
+    </div>
+    <br>After<br>
+  </details>
+</div>
+<script>
+
+/* global describe, it, beforeEach */
+
+const de = SpecialPowers.Ci.nsIDocumentEncoder;
+const encoder = SpecialPowers.Cu.createHTMLCopyEncoder();
+
+function testSelectDetailsAndSerialize(aDescription, aSetupSelection, aExpectedTextResult,
+                                       aExpectedHTMLResult) {
+  it(aDescription, () => {
+    info("Setup selection");
+    const selection = window.getSelection();
+    selection.removeAllRanges();
+    aSetupSelection(selection);
+
+    info("Initialize encoder for text/plain");
+    encoder.init(document, "text/plain", de.AllowCrossShadowBoundary);
+    encoder.setSelection(selection);
+    is(encoder.encodeToString(), aExpectedTextResult, "check text/plain result");
+
+    info("Initialize encoder for text/html");
+    encoder.init(document, "text/html", de.AllowCrossShadowBoundary);
+    encoder.setSelection(selection);
+
+    const htmlContext = { value: '' };
+    const htmlInfo = { value: '' };
+    is(encoder.encodeToStringWithContext(htmlContext, htmlInfo),
+       aExpectedHTMLResult, "check text/html result");
+  });
+}
+
+testSelectDetailsAndSerialize(
+  "Test selecting summary content",
+  (aSelection) => {
+    const details = document.querySelector("details#basic");
+    const range = document.createRange();
+    range.selectNodeContents(details.firstElementChild);
+    aSelection.addRange(range);
+  },
+  "Basic",
+  "Basic"
+);
+
+testSelectDetailsAndSerialize(
+  "Test selecting partial details content",
+  (aSelection) => {
+    const details = document.querySelector("details#basic");
+    const range = document.createRange();
+    // Start at the beginning of "Second"
+    range.setStart(details.childNodes[4], 0);
+    // End at the end of "Third"
+    range.setEnd(details.childNodes[6], 5);
+    aSelection.addRange(range);
+  },
+  "Second\nThird",
+  "Second<br>Third"
+);
+
+testSelectDetailsAndSerialize(
+  "Test selecting whole details content",
+  (aSelection) => {
+    const details = document.querySelector("details#basic");
+    const range = document.createRange();
+    // Start at the beginning of <summary>
+    range.setStart(details.childNodes[1], 0);
+    // End at the end of "Third"
+    range.setEnd(details.childNodes[6], 5);
+    aSelection.addRange(range);
+  },
+  "Basic\nFirst\nSecond\nThird",
+  "<summary>Basic</summary>First<br>Second<br>Third"
+);
+
+testSelectDetailsAndSerialize(
+  "Test selecting nested details content",
+  (aSelection) => {
+    const details = document.querySelector("details#nested");
+    const range = document.createRange();
+    // Start at the beginning of "Before"
+    range.setStart(details.childNodes[2], 0);
+    // End at the end of "After"
+    range.setEnd(details.childNodes[8], 5);
+    aSelection.addRange(range);
+  },
+  "Before\nInner\nFirst\nSecond\nThird\n\nAfter",
+  "Before<br>\n" +
+    "    <details open=\"\">\n" +
+    "      <summary>Inner</summary>First<br>Second<br>Third\n" +
+    "    </details>\n" +
+    "    <br>After"
+);
+
+testSelectDetailsAndSerialize(
+  "Test selecting nested-shadow details content",
+  (aSelection) => {
+    const details = document.querySelector("details#nested-shadow");
+    const range = document.createRange();
+    // Start at the beginning of "Before"
+    range.setStart(details.childNodes[4], 0);
+    // End at the end of "After"
+    range.setEnd(details.childNodes[10], 5);
+    aSelection.addRange(range);
+  },
+  "Before\n\nInnerBefore\nInner\nFirst\nSecond\nThird\n\nInnerAfter\n\nAfter",
+  "Before<br>\n" +
+    "    <div>\n" +
+    "        <br>InnerBefore<br>\n" +
+    "        <slot>\n      \n" +
+    "      <details open=\"\">\n" +
+    "        <summary>Inner</summary>First<br>Second<br>Third\n" +
+    "      </details>\n" +
+    "    </slot>\n" +
+    "        <br>InnerAfter<br>\n" +
+    "      </div>\n" +
+    "    <br>After"
+);
+
+</script>
+</body>
+</html>

From 3c11870b6aafec041443025c86a3187170cc2003 Mon Sep 17 00:00:00 2001
From: Fred Chasen <fchasen@mozilla.com>
Date: Thu, 29 Jan 2026 17:13:32 +0000
Subject: [PATCH 099/116] Bug 2011977 - Update IPPNimbusHelper to only check
 for the control branch. r=ip-protection-reviewers,rking

- Updates `IPPNimbusHelper.isEligible` to reject when in the control branch of an experiment.
- Updates tests to no longer enroll into the experiment by default.

Differential Revision: https://phabricator.services.mozilla.com/D280827
---
 .../ipprotection/IPPNimbusHelper.sys.mjs      |  7 ++++---
 .../tests/browser/browser_IPPProxyManager.js  | 14 +++++++-------
 .../browser/browser_IPProtectionService.js    |  7 ++++---
 .../browser/browser_ipprotection_toolbar.js   | 19 +++++++++++++------
 .../ipprotection/tests/browser/head.js        | 10 ++++------
 .../tests/xpcshell/test_IPPAutoRestore.js     |  4 ++--
 .../test_IPPOnboardingMessageHelper.js        |  8 +++++---
 .../tests/xpcshell/test_IPProtectionPanel.js  |  4 ++--
 .../xpcshell/test_IPProtectionService.js      |  2 +-
 .../tests/xpcshell/test_IPProtectionStates.js |  3 ++-
 .../tests/xpcshell/test_IPProxyManager.js     |  8 +++++---
 11 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/browser/components/ipprotection/IPPNimbusHelper.sys.mjs b/browser/components/ipprotection/IPPNimbusHelper.sys.mjs
index bc13e1eb7d178..a226fda851820 100644
--- a/browser/components/ipprotection/IPPNimbusHelper.sys.mjs
+++ b/browser/components/ipprotection/IPPNimbusHelper.sys.mjs
@@ -33,21 +33,22 @@ class IPPNimbusHelperSingleton {
   }
 
   /**
-   * Check if this device is in the experiment with a variant branch.
+   * Check that this device is not in the control branch of an experiment.
    *
    * @returns {boolean}
    */
   get isEligible() {
     let inExperiment = lazy.NimbusFeatures.ipProtection.getEnrollmentMetadata();
-    let isEligible = inExperiment?.branch && inExperiment.branch !== "control";
 
     if (inExperiment) {
       lazy.NimbusFeatures.ipProtection.recordExposureEvent({
         once: true,
       });
+
+      return inExperiment.branch !== "control";
     }
 
-    return isEligible;
+    return true;
   }
 }
 
diff --git a/browser/components/ipprotection/tests/browser/browser_IPPProxyManager.js b/browser/components/ipprotection/tests/browser/browser_IPPProxyManager.js
index 044d14d598bb7..ae76d38745041 100644
--- a/browser/components/ipprotection/tests/browser/browser_IPPProxyManager.js
+++ b/browser/components/ipprotection/tests/browser/browser_IPPProxyManager.js
@@ -8,15 +8,13 @@ const { IPProtectionServerlist } = ChromeUtils.importESModule(
   "moz-src:///browser/components/ipprotection/IPProtectionServerlist.sys.mjs"
 );
 
-// Don't add an experiment so we can test adding and removing it.
-DEFAULT_EXPERIMENT = null;
-
 add_task(async function test_IPPProxyManager_handleProxyErrorEvent() {
   setupService({
     isSignedIn: true,
     canEnroll: true,
   });
-  let cleanupAlpha = await setupExperiment({ enabled: true, variant: "alpha" });
+
+  IPProtectionService.updateState();
 
   await IPProtectionServerlist.maybeFetchList();
 
@@ -115,7 +113,6 @@ add_task(async function test_IPPProxyManager_handleProxyErrorEvent() {
     "Should not return a promise when connection is inactive"
   );
 
-  await cleanupAlpha();
   cleanupService();
 });
 
@@ -128,6 +125,8 @@ add_task(async function test_IPPProxyManager_bug_1999946() {
     "moz-src:///browser/components/ipprotection/IPPChannelFilter.sys.mjs"
   );
 
+  Services.prefs.clearUserPref("browser.ipProtection.enabled");
+
   // Hook the Call to create to capture the created channel filter
   let channelFilterRef = null;
   const sandbox = sinon.createSandbox();
@@ -145,7 +144,9 @@ add_task(async function test_IPPProxyManager_bug_1999946() {
     canEnroll: true,
   });
 
-  let cleanupAlpha = await setupExperiment({ enabled: true, variant: "alpha" });
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.ipProtection.enabled", true]],
+  });
 
   await IPProtectionServerlist.maybeFetchList();
 
@@ -158,6 +159,5 @@ add_task(async function test_IPPProxyManager_bug_1999946() {
   );
 
   sandbox.restore();
-  await cleanupAlpha();
   cleanupService();
 });
diff --git a/browser/components/ipprotection/tests/browser/browser_IPProtectionService.js b/browser/components/ipprotection/tests/browser/browser_IPProtectionService.js
index 55b9be0ae3e47..2274317ef04a7 100644
--- a/browser/components/ipprotection/tests/browser/browser_IPProtectionService.js
+++ b/browser/components/ipprotection/tests/browser/browser_IPProtectionService.js
@@ -22,9 +22,6 @@ const { TelemetryTestUtils } = ChromeUtils.importESModule(
 
 AddonTestUtils.initMochitest(this);
 
-// Don't add an experiment so we can test adding and removing it.
-DEFAULT_EXPERIMENT = null;
-
 /**
  * Tests getting eligibility from a Nimbus experiment and
  * creating and destroying the widget.
@@ -64,6 +61,7 @@ add_task(async function test_IPProtectionService_updateEligibility() {
  * Tests a user who was previously enrolled will be shown the widget.
  */
 add_task(async function test_IPProtectionService_updateEnrollment() {
+  Services.prefs.clearUserPref("browser.ipProtection.enabled");
   setupService({
     isSignedIn: true,
     isEnrolledAndEntitled: true,
@@ -132,6 +130,7 @@ add_task(async function test_IPProtectionService_enroll() {
  */
 add_task(
   async function test_IPProtectionService_enroll_when_enrolled_in_experiment() {
+    Services.prefs.clearUserPref("browser.ipProtection.enabled");
     setupService({
       isEnrolledAndEntitled: false,
       isSignedIn: true,
@@ -210,6 +209,7 @@ add_task(
  * Tests the entitlement updates when not in the experiment.
  */
 add_task(async function test_IPProtectionService_updateEntitlement() {
+  Services.prefs.clearUserPref("browser.ipProtection.enabled");
   setupService({
     isSignedIn: true,
     isEnrolledAndEntitled: true,
@@ -232,6 +232,7 @@ add_task(async function test_IPProtectionService_updateEntitlement() {
 });
 
 add_task(async function test_ipprotection_ready() {
+  Services.prefs.clearUserPref("browser.ipProtection.enabled");
   setupService({
     isSignedIn: true,
     isEnrolledAndEntitled: true,
diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_toolbar.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_toolbar.js
index bc461cc069155..fb7b2e34e9d46 100644
--- a/browser/components/ipprotection/tests/browser/browser_ipprotection_toolbar.js
+++ b/browser/components/ipprotection/tests/browser/browser_ipprotection_toolbar.js
@@ -36,12 +36,14 @@ add_task(async function toolbar_added_and_removed() {
     "IP Protection widget added in the correct position"
   );
   // Disable the feature
-  await cleanupExperiment();
+  Services.prefs.clearUserPref("browser.ipProtection.enabled");
   widget = document.getElementById(IPProtectionWidget.WIDGET_ID);
   Assert.equal(widget, null, "IP Protection widget is removed");
 
   // Reenable the feature
-  await setupExperiment();
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.ipProtection.enabled", true]],
+  });
   widget = document.getElementById(IPProtectionWidget.WIDGET_ID);
   Assert.ok(
     BrowserTestUtils.isVisible(widget),
@@ -232,7 +234,8 @@ add_task(async function toolbar_placement_customized() {
   );
 
   // Disable the feature
-  await cleanupExperiment();
+  Services.prefs.clearUserPref("browser.ipProtection.enabled");
+
   let widget = document.getElementById(IPProtectionWidget.WIDGET_ID);
   Assert.equal(widget, null, "IP Protection widget is removed");
 
@@ -244,7 +247,9 @@ add_task(async function toolbar_placement_customized() {
   );
 
   // Reenable the feature
-  await setupExperiment();
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.ipProtection.enabled", true]],
+  });
 
   await waitForStateChange;
 
@@ -287,7 +292,7 @@ add_task(async function toolbar_removed() {
   Assert.equal(end, null, "IP Protection widget is removed");
 
   // Disable the feature
-  await cleanupExperiment();
+  Services.prefs.clearUserPref("browser.ipProtection.enabled");
 
   const waitForStateChange = BrowserTestUtils.waitForEvent(
     lazy.IPProtectionService,
@@ -297,7 +302,9 @@ add_task(async function toolbar_removed() {
   );
 
   // Reenable the feature
-  await setupExperiment();
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.ipProtection.enabled", true]],
+  });
 
   await waitForStateChange;
 
diff --git a/browser/components/ipprotection/tests/browser/head.js b/browser/components/ipprotection/tests/browser/head.js
index 73730a1eb5e0b..9cea829a351c9 100644
--- a/browser/components/ipprotection/tests/browser/head.js
+++ b/browser/components/ipprotection/tests/browser/head.js
@@ -295,17 +295,15 @@ add_setup(async function setupVPN() {
   setupService();
 
   await putServerInRemoteSettings(DEFAULT_SERVICE_STATUS.serverList);
-  await IPProtectionService.init();
 
-  if (DEFAULT_EXPERIMENT) {
-    await setupExperiment();
-  }
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.ipProtection.enabled", true]],
+  });
 
   registerCleanupFunction(async () => {
     cleanupService();
-    IPProtectionService.uninit();
+    Services.prefs.clearUserPref("browser.ipProtection.enabled");
     setupSandbox.restore();
-    cleanupExperiment();
     CustomizableUI.reset();
     Services.prefs.clearUserPref(IPProtectionWidget.ADDED_PREF);
     Services.prefs.clearUserPref("browser.ipProtection.panelOpenCount");
diff --git a/browser/components/ipprotection/tests/xpcshell/test_IPPAutoRestore.js b/browser/components/ipprotection/tests/xpcshell/test_IPPAutoRestore.js
index f171cbfbb93e9..7d4a8a69aa409 100644
--- a/browser/components/ipprotection/tests/xpcshell/test_IPPAutoRestore.js
+++ b/browser/components/ipprotection/tests/xpcshell/test_IPPAutoRestore.js
@@ -124,8 +124,8 @@ add_task(async function test_IPPAutoRestore_if_notReady() {
 
   Assert.equal(
     IPProtectionService.state,
-    IPProtectionStates.UNAVAILABLE,
-    "State is UNAVAILABLE when user is not signed in"
+    IPProtectionStates.UNAUTHENTICATED,
+    "State is UNAUTHENTICATED when user is not signed in"
   );
 
   let autoRestore = new IPPAutoRestoreSingleton();
diff --git a/browser/components/ipprotection/tests/xpcshell/test_IPPOnboardingMessageHelper.js b/browser/components/ipprotection/tests/xpcshell/test_IPPOnboardingMessageHelper.js
index b914ec16682fe..279acd3ac746f 100644
--- a/browser/components/ipprotection/tests/xpcshell/test_IPPOnboardingMessageHelper.js
+++ b/browser/components/ipprotection/tests/xpcshell/test_IPPOnboardingMessageHelper.js
@@ -24,14 +24,16 @@ add_task(async function test_IPPOnboardingMessage() {
   let sandbox = sinon.createSandbox();
   setupStubs(sandbox);
 
-  IPProtectionService.init();
-
-  await waitForEvent(
+  let readyEventPromise = waitForEvent(
     IPProtectionService,
     "IPProtectionService:StateChanged",
     () => IPProtectionService.state === IPProtectionStates.READY
   );
 
+  IPProtectionService.init();
+
+  await readyEventPromise;
+
   Assert.ok(
     !IPPProxyManager.activatedAt,
     "IP Protection service should not be active initially"
diff --git a/browser/components/ipprotection/tests/xpcshell/test_IPProtectionPanel.js b/browser/components/ipprotection/tests/xpcshell/test_IPProtectionPanel.js
index 2119654942686..a767eccc10d4a 100644
--- a/browser/components/ipprotection/tests/xpcshell/test_IPProtectionPanel.js
+++ b/browser/components/ipprotection/tests/xpcshell/test_IPProtectionPanel.js
@@ -174,7 +174,7 @@ add_task(async function test_IPProtectionPanel_signedIn() {
 });
 
 /**
- * Tests that IPProtectionService unavailable state event updates the state.
+ * Tests that IPProtectionService unauthenticated state event updates the state.
  */
 add_task(async function test_IPProtectionPanel_signedOut() {
   let sandbox = sinon.createSandbox();
@@ -189,7 +189,7 @@ add_task(async function test_IPProtectionPanel_signedOut() {
   let signedOutEventPromise = waitForEvent(
     IPProtectionService,
     "IPProtectionService:StateChanged",
-    () => IPProtectionService.state === IPProtectionStates.UNAVAILABLE
+    () => IPProtectionService.state === IPProtectionStates.UNAUTHENTICATED
   );
   IPProtectionService.updateState();
 
diff --git a/browser/components/ipprotection/tests/xpcshell/test_IPProtectionService.js b/browser/components/ipprotection/tests/xpcshell/test_IPProtectionService.js
index b02f76d26cf4a..d1825d750fcf9 100644
--- a/browser/components/ipprotection/tests/xpcshell/test_IPProtectionService.js
+++ b/browser/components/ipprotection/tests/xpcshell/test_IPProtectionService.js
@@ -77,7 +77,7 @@ add_task(async function test_IPProtectionService_updateState_signedOut() {
   let signedOutEventPromise = waitForEvent(
     IPProtectionService,
     "IPProtectionService:StateChanged",
-    () => IPProtectionService.state === IPProtectionStates.UNAVAILABLE
+    () => IPProtectionService.state === IPProtectionStates.UNAUTHENTICATED
   );
 
   IPProtectionService.updateState();
diff --git a/browser/components/ipprotection/tests/xpcshell/test_IPProtectionStates.js b/browser/components/ipprotection/tests/xpcshell/test_IPProtectionStates.js
index 43b75adb9f4ab..47a008a31ef44 100644
--- a/browser/components/ipprotection/tests/xpcshell/test_IPProtectionStates.js
+++ b/browser/components/ipprotection/tests/xpcshell/test_IPProtectionStates.js
@@ -35,7 +35,7 @@ add_task(async function test_IPProtectionStates_uninitialized() {
 
   Assert.equal(
     IPProtectionService.state,
-    IPProtectionStates.UNAVAILABLE,
+    IPProtectionStates.UNAUTHENTICATED,
     "IP Protection service should be initialized"
   );
 
@@ -57,6 +57,7 @@ add_task(async function test_IPProtectionStates_uninitialized() {
   sandbox
     .stub(IPProtectionService.guardian, "isLinkedToGuardian")
     .resolves(false);
+  sandbox.stub(IPPNimbusHelper, "isEligible").get(() => false);
 
   await IPProtectionService.init();
 
diff --git a/browser/components/ipprotection/tests/xpcshell/test_IPProxyManager.js b/browser/components/ipprotection/tests/xpcshell/test_IPProxyManager.js
index 662a59b8d481a..5e22e0d38d8e4 100644
--- a/browser/components/ipprotection/tests/xpcshell/test_IPProxyManager.js
+++ b/browser/components/ipprotection/tests/xpcshell/test_IPProxyManager.js
@@ -19,14 +19,16 @@ add_task(async function test_IPPProxyManager_start() {
   let sandbox = sinon.createSandbox();
   setupStubs(sandbox);
 
-  IPProtectionService.init();
-
-  await waitForEvent(
+  let readyEventPromise = waitForEvent(
     IPProtectionService,
     "IPProtectionService:StateChanged",
     () => IPProtectionService.state === IPProtectionStates.READY
   );
 
+  IPProtectionService.init();
+
+  await readyEventPromise;
+
   Assert.ok(
     !IPPProxyManager.activatedAt,
     "IP Protection service should not be active initially"

From 6cd36524bb418fc5eaf432d1e9005526e4a089b9 Mon Sep 17 00:00:00 2001
From: "John M. Schanck" <jschanck@mozilla.com>
Date: Thu, 29 Jan 2026 17:42:27 +0000
Subject: [PATCH 100/116] Bug 1958716 - android support for webauthn PRF
 extension. r=m_kato,keeler,geckoview-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D280690
---
 dom/webauthn/WebAuthnResult.h                 |  33 ++++++
 .../org/mozilla/gecko/util/WebAuthnUtils.java | 112 +++++++++++++++++-
 .../mozilla/gecko/util/WebAuthnUtilsTest.java |  76 +++++++++++-
 3 files changed, 216 insertions(+), 5 deletions(-)

diff --git a/dom/webauthn/WebAuthnResult.h b/dom/webauthn/WebAuthnResult.h
index c7b54ad936ce0..6330c428d3c2e 100644
--- a/dom/webauthn/WebAuthnResult.h
+++ b/dom/webauthn/WebAuthnResult.h
@@ -86,6 +86,25 @@ class WebAuthnRegisterResult final : public nsIWebAuthnRegisterResult {
       mCredPropsRk = Some(java::sdk::Boolean::Ref::From(aResponse->CredProps())
                               ->BooleanValue());
     }
+    if (aResponse->PrfEnabled()) {
+      mPrfSupported =
+          Some(java::sdk::Boolean::Ref::From(aResponse->PrfEnabled())
+                   ->BooleanValue());
+    }
+    if (aResponse->PrfFirst() && aResponse->PrfFirst()->Length() > 0) {
+      mPrfFirst.emplace();
+      mPrfFirst->AppendElements(
+          reinterpret_cast<uint8_t*>(
+              aResponse->PrfFirst()->GetElements().Elements()),
+          aResponse->PrfFirst()->Length());
+    }
+    if (aResponse->PrfSecond() && aResponse->PrfSecond()->Length() > 0) {
+      mPrfSecond.emplace();
+      mPrfSecond->AppendElements(
+          reinterpret_cast<uint8_t*>(
+              aResponse->PrfSecond()->GetElements().Elements()),
+          aResponse->PrfSecond()->Length());
+    }
   }
 #endif
 
@@ -275,6 +294,20 @@ class WebAuthnSignResult final : public nsIWebAuthnSignResult {
         aResponse->UserHandle()->Length());
     mAuthenticatorAttachment =
         Some(aResponse->AuthenticatorAttachment()->ToString());
+    if (aResponse->PrfFirst() && aResponse->PrfFirst()->Length() > 0) {
+      mPrfFirst.emplace();
+      mPrfFirst->AppendElements(
+          reinterpret_cast<uint8_t*>(
+              aResponse->PrfFirst()->GetElements().Elements()),
+          aResponse->PrfFirst()->Length());
+    }
+    if (aResponse->PrfSecond() && aResponse->PrfSecond()->Length() > 0) {
+      mPrfSecond.emplace();
+      mPrfSecond->AppendElements(
+          reinterpret_cast<uint8_t*>(
+              aResponse->PrfSecond()->GetElements().Elements()),
+          aResponse->PrfSecond()->Length());
+    }
   }
 #endif
 
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/WebAuthnUtils.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/WebAuthnUtils.java
index 7403b6cea09b5..b52756074e9f6 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/WebAuthnUtils.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/WebAuthnUtils.java
@@ -133,6 +133,9 @@ public static class MakeCredentialResponse {
     public final String[] transports;
     public final String authenticatorAttachment;
     public final Boolean credProps;
+    public final Boolean prfEnabled;
+    public final byte[] prfFirst;
+    public final byte[] prfSecond;
 
     public static final class Builder {
       private byte[] mClientDataJson;
@@ -141,6 +144,9 @@ public static final class Builder {
       private String[] mTransports;
       private String mAuthenticatorAttachment;
       private Boolean mCredProps;
+      private Boolean mPrfEnabled;
+      private byte[] mPrfFirst;
+      private byte[] mPrfSecond;
 
       public Builder() {}
 
@@ -174,6 +180,21 @@ public Builder setCredProps(final boolean credProps) {
         return this;
       }
 
+      public Builder setPrfEnabled(final boolean prfEnabled) {
+        this.mPrfEnabled = Boolean.valueOf(prfEnabled);
+        return this;
+      }
+
+      public Builder setPrfFirst(final byte[] prfFirst) {
+        this.mPrfFirst = prfFirst;
+        return this;
+      }
+
+      public Builder setPrfSecond(final byte[] prfSecond) {
+        this.mPrfSecond = prfSecond;
+        return this;
+      }
+
       public MakeCredentialResponse build() {
         return new MakeCredentialResponse(this);
       }
@@ -187,6 +208,9 @@ protected MakeCredentialResponse(final Builder builder) {
       this.transports = builder.mTransports;
       this.authenticatorAttachment = builder.mAuthenticatorAttachment;
       this.credProps = builder.mCredProps;
+      this.prfEnabled = builder.mPrfEnabled;
+      this.prfFirst = builder.mPrfFirst;
+      this.prfSecond = builder.mPrfSecond;
     }
 
     @WrapForJNI(skip = true)
@@ -212,6 +236,21 @@ public String toString() {
       if (this.credProps != null) {
         sb.append(", credProps=").append(this.credProps.booleanValue());
       }
+      if (this.prfEnabled != null) {
+        sb.append(", prfEnabled=").append(this.prfEnabled.booleanValue());
+      }
+      if (this.prfFirst != null) {
+        sb.append(", prfFirst=")
+            .append(
+                Base64.encodeToString(
+                    this.prfFirst, Base64.URL_SAFE | Base64.NO_WRAP | Base64.NO_PADDING));
+      }
+      if (this.prfSecond != null) {
+        sb.append(", prfSecond=")
+            .append(
+                Base64.encodeToString(
+                    this.prfSecond, Base64.URL_SAFE | Base64.NO_WRAP | Base64.NO_PADDING));
+      }
       sb.append("}");
       return sb.toString();
     }
@@ -225,6 +264,8 @@ public static class GetAssertionResponse {
     public final byte[] signature;
     public final byte[] userHandle;
     public final String authenticatorAttachment;
+    public final byte[] prfFirst;
+    public final byte[] prfSecond;
 
     public static final class Builder {
       private byte[] mClientDataJson;
@@ -233,6 +274,8 @@ public static final class Builder {
       private byte[] mSignature;
       private byte[] mUserHandle;
       private String mAuthenticatorAttachment;
+      private byte[] mPrfFirst;
+      private byte[] mPrfSecond;
 
       public Builder() {}
 
@@ -266,6 +309,16 @@ public Builder setAuthenticatorAttachment(final String authenticatorAttachment)
         return this;
       }
 
+      public Builder setPrfFirst(final byte[] prfFirst) {
+        this.mPrfFirst = prfFirst;
+        return this;
+      }
+
+      public Builder setPrfSecond(final byte[] prfSecond) {
+        this.mPrfSecond = prfSecond;
+        return this;
+      }
+
       public GetAssertionResponse build() {
         return new GetAssertionResponse(this);
       }
@@ -283,6 +336,8 @@ protected GetAssertionResponse(final Builder builder) {
         this.userHandle = builder.mUserHandle;
       }
       this.authenticatorAttachment = builder.mAuthenticatorAttachment;
+      this.prfFirst = builder.mPrfFirst;
+      this.prfSecond = builder.mPrfSecond;
     }
 
     @WrapForJNI(skip = true)
@@ -312,8 +367,20 @@ public String toString() {
                       this.userHandle, Base64.URL_SAFE | Base64.NO_WRAP | Base64.NO_PADDING)
                   : "(empty)")
           .append(", authenticatorAttachment=")
-          .append(this.authenticatorAttachment)
-          .append("}");
+          .append(this.authenticatorAttachment);
+      if (this.prfFirst != null) {
+        sb.append(", prfFirst=")
+            .append(
+                Base64.encodeToString(
+                    this.prfFirst, Base64.URL_SAFE | Base64.NO_WRAP | Base64.NO_PADDING));
+      }
+      if (this.prfSecond != null) {
+        sb.append(", prfSecond=")
+            .append(
+                Base64.encodeToString(
+                    this.prfSecond, Base64.URL_SAFE | Base64.NO_WRAP | Base64.NO_PADDING));
+      }
+      sb.append("}");
       return sb.toString();
     }
   }
@@ -338,8 +405,29 @@ public static MakeCredentialResponse getMakeCredentialResponse(final @NonNull St
 
     try {
       final JSONObject clientExtensionResults = json.getJSONObject("clientExtensionResults");
-      final JSONObject credProps = clientExtensionResults.getJSONObject("credProps");
-      builder.setCredProps(credProps.getBoolean("rk"));
+      try {
+        final JSONObject credProps = clientExtensionResults.getJSONObject("credProps");
+        builder.setCredProps(credProps.getBoolean("rk"));
+      } catch (final JSONException e) {
+        // credProps is optional
+      }
+      try {
+        final JSONObject prf = clientExtensionResults.getJSONObject("prf");
+        if (prf.has("enabled")) {
+          builder.setPrfEnabled(prf.getBoolean("enabled"));
+        }
+        if (prf.has("results")) {
+          final JSONObject prfResults = prf.getJSONObject("results");
+          if (prfResults.has("first")) {
+            builder.setPrfFirst(Base64.decode(prfResults.getString("first"), Base64.URL_SAFE));
+          }
+          if (prfResults.has("second")) {
+            builder.setPrfSecond(Base64.decode(prfResults.getString("second"), Base64.URL_SAFE));
+          }
+        }
+      } catch (final JSONException e) {
+        // prf is optional
+      }
     } catch (final JSONException e) {
       // clientExtensionResults is an optional. Ignore exception if nothing.
     }
@@ -372,6 +460,22 @@ public static GetAssertionResponse getGetAssertionResponse(final @NonNull String
       // userHandle is an optional. Ignore exception if nothing.
     }
 
+    try {
+      final JSONObject clientExtensionResults = json.getJSONObject("clientExtensionResults");
+      final JSONObject prf = clientExtensionResults.getJSONObject("prf");
+      if (prf.has("results")) {
+        final JSONObject prfResults = prf.getJSONObject("results");
+        if (prfResults.has("first")) {
+          builder.setPrfFirst(Base64.decode(prfResults.getString("first"), Base64.URL_SAFE));
+        }
+        if (prfResults.has("second")) {
+          builder.setPrfSecond(Base64.decode(prfResults.getString("second"), Base64.URL_SAFE));
+        }
+      }
+    } catch (final JSONException e) {
+      // prf is optional
+    }
+
     // This response may have clientDataJson value, but signed hash is generated by request
     // parameter's hash. So we don't use the value into response.
 
diff --git a/mobile/android/geckoview/src/test/java/org/mozilla/gecko/util/WebAuthnUtilsTest.java b/mobile/android/geckoview/src/test/java/org/mozilla/gecko/util/WebAuthnUtilsTest.java
index f59316eb851a0..c232805aeefe3 100644
--- a/mobile/android/geckoview/src/test/java/org/mozilla/gecko/util/WebAuthnUtilsTest.java
+++ b/mobile/android/geckoview/src/test/java/org/mozilla/gecko/util/WebAuthnUtilsTest.java
@@ -28,7 +28,7 @@ public void responseJSONForMakeCredential() throws Exception {
             + "\"type\": \"public-key\" ,"
             + "\"authenticatorAttachment\": \"platform\", "
             + "\"response\": {\"attestationObject\": \"AQIDBAUGBwgJCgsMDQ4PEA\", \"transports\": [ \"internal\" ]},"
-            + "\"clientExtensionResults\": {\"credProps\": {\"rk\": true } }"
+            + "\"clientExtensionResults\": {\"credProps\": {\"rk\": true }, \"prf\": {\"enabled\": true}}"
             + "}";
     final WebAuthnUtils.MakeCredentialResponse response =
         WebAuthnUtils.getMakeCredentialResponse(responseJSON);
@@ -45,6 +45,9 @@ public void responseJSONForMakeCredential() throws Exception {
         Arrays.equals(response.attestationObject, attestationObject));
     assertEquals("No clientDataJson in response", response.clientDataJson, null);
     assertTrue("handle credProps", response.credProps);
+    assertTrue("prfEnabled should be true", response.prfEnabled);
+    assertEquals("prfFirst should be null", response.prfFirst, null);
+    assertEquals("prfSecond should be null", response.prfSecond, null);
   }
 
   @Test(expected = JSONException.class)
@@ -127,4 +130,75 @@ public void transportValue() throws Exception {
       assertEquals("JSON's transport should be matched", array.get(i), expectedJsonTransports[i]);
     }
   }
+
+  @Test
+  public void responseJSONForMakeCredentialWithPrf() throws Exception {
+    final String responseJSON =
+        "{"
+            + "\"id\": \"AAECAwQFBgcICQoLDA0ODw\" ,"
+            + "\"rawId\": \"AAECAwQFBgcICQoLDA0ODw\" ,"
+            + "\"type\": \"public-key\" ,"
+            + "\"authenticatorAttachment\": \"platform\", "
+            + "\"response\": {\"attestationObject\": \"AQIDBAUGBwgJCgsMDQ4PEA\", \"transports\": [ \"internal\" ]},"
+            + "\"clientExtensionResults\": {"
+            + "  \"prf\": {"
+            + "    \"enabled\": true,"
+            + "    \"results\": {"
+            + "      \"first\": \"AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8\","
+            + "      \"second\": \"ICEiIyQlJicoKSorLC0uLzAxMjM0NTY3ODk6Ozw9Pj8\""
+            + "    }"
+            + "  }"
+            + "}"
+            + "}";
+    final WebAuthnUtils.MakeCredentialResponse response =
+        WebAuthnUtils.getMakeCredentialResponse(responseJSON);
+
+    final byte[] expectedFirst =
+        new byte[] {
+          0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf,
+          0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e,
+              0x1f
+        };
+    final byte[] expectedSecond =
+        new byte[] {
+          0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e,
+              0x2f,
+          0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e,
+              0x3f
+        };
+
+    assertTrue("prfEnabled should be true", response.prfEnabled);
+    assertTrue("prfFirst should be matched", Arrays.equals(response.prfFirst, expectedFirst));
+    assertTrue("prfSecond should be matched", Arrays.equals(response.prfSecond, expectedSecond));
+  }
+
+  @Test
+  public void responseJSONForGetAssertionWithPrf() throws Exception {
+    final String responseJSON =
+        "{"
+            + "\"id\": \"AAECAwQFBgcICQoLDA0ODw\" ,"
+            + "\"rawId\": \"AAECAwQFBgcICQoLDA0ODw\" ,"
+            + "\"authenticatorAttachment\": \"platform\", "
+            + "\"response\": {\"authenticatorData\": \"AQIDBAUGBwgJCgsMDQ4PEA\", \"signature\": \"AgMEBQYHCAkKCwwNDg8QEQ\"},"
+            + "\"clientExtensionResults\": {"
+            + "  \"prf\": {"
+            + "    \"results\": {"
+            + "      \"first\": \"AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8\""
+            + "    }"
+            + "  }"
+            + "}"
+            + "}";
+    final WebAuthnUtils.GetAssertionResponse response =
+        WebAuthnUtils.getGetAssertionResponse(responseJSON);
+
+    final byte[] expectedFirst =
+        new byte[] {
+          0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf,
+          0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e,
+              0x1f
+        };
+
+    assertTrue("prfFirst should be matched", Arrays.equals(response.prfFirst, expectedFirst));
+    assertEquals("prfSecond should be null", response.prfSecond, null);
+  }
 }

From 9d1a0a5a785be59bc989fa2dcbe8b081c6302e03 Mon Sep 17 00:00:00 2001
From: "John M. Schanck" <jschanck@mozilla.com>
Date: Thu, 29 Jan 2026 17:42:28 +0000
Subject: [PATCH 101/116] Bug 2012854 - android support for the WebAuthn
 largeBlob extension. r=m_kato,keeler,geckoview-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D280692
---
 dom/webauthn/WebAuthnResult.h                 | 18 +++++
 .../org/mozilla/gecko/util/WebAuthnUtils.java | 75 +++++++++++++++++--
 .../mozilla/gecko/util/WebAuthnUtilsTest.java | 28 ++++++-
 3 files changed, 111 insertions(+), 10 deletions(-)

diff --git a/dom/webauthn/WebAuthnResult.h b/dom/webauthn/WebAuthnResult.h
index 6330c428d3c2e..1f67398bf99f4 100644
--- a/dom/webauthn/WebAuthnResult.h
+++ b/dom/webauthn/WebAuthnResult.h
@@ -105,6 +105,11 @@ class WebAuthnRegisterResult final : public nsIWebAuthnRegisterResult {
               aResponse->PrfSecond()->GetElements().Elements()),
           aResponse->PrfSecond()->Length());
     }
+    if (aResponse->LargeBlobSupported()) {
+      mLargeBlobSupported =
+          Some(java::sdk::Boolean::Ref::From(aResponse->LargeBlobSupported())
+                   ->BooleanValue());
+    }
   }
 #endif
 
@@ -308,6 +313,19 @@ class WebAuthnSignResult final : public nsIWebAuthnSignResult {
               aResponse->PrfSecond()->GetElements().Elements()),
           aResponse->PrfSecond()->Length());
     }
+    if (aResponse->LargeBlobBlob() &&
+        aResponse->LargeBlobBlob()->Length() > 0) {
+      mLargeBlobValue.emplace();
+      mLargeBlobValue->AppendElements(
+          reinterpret_cast<uint8_t*>(
+              aResponse->LargeBlobBlob()->GetElements().Elements()),
+          aResponse->LargeBlobBlob()->Length());
+    }
+    if (aResponse->LargeBlobWritten()) {
+      mLargeBlobWritten =
+          Some(java::sdk::Boolean::Ref::From(aResponse->LargeBlobWritten())
+                   ->BooleanValue());
+    }
   }
 #endif
 
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/WebAuthnUtils.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/WebAuthnUtils.java
index b52756074e9f6..57999b74af5ca 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/WebAuthnUtils.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/WebAuthnUtils.java
@@ -136,6 +136,7 @@ public static class MakeCredentialResponse {
     public final Boolean prfEnabled;
     public final byte[] prfFirst;
     public final byte[] prfSecond;
+    public final Boolean largeBlobSupported;
 
     public static final class Builder {
       private byte[] mClientDataJson;
@@ -147,6 +148,7 @@ public static final class Builder {
       private Boolean mPrfEnabled;
       private byte[] mPrfFirst;
       private byte[] mPrfSecond;
+      private Boolean mLargeBlobSupported;
 
       public Builder() {}
 
@@ -195,6 +197,11 @@ public Builder setPrfSecond(final byte[] prfSecond) {
         return this;
       }
 
+      public Builder setLargeBlobSupported(final boolean largeBlobSupported) {
+        this.mLargeBlobSupported = Boolean.valueOf(largeBlobSupported);
+        return this;
+      }
+
       public MakeCredentialResponse build() {
         return new MakeCredentialResponse(this);
       }
@@ -211,6 +218,7 @@ protected MakeCredentialResponse(final Builder builder) {
       this.prfEnabled = builder.mPrfEnabled;
       this.prfFirst = builder.mPrfFirst;
       this.prfSecond = builder.mPrfSecond;
+      this.largeBlobSupported = builder.mLargeBlobSupported;
     }
 
     @WrapForJNI(skip = true)
@@ -251,6 +259,9 @@ public String toString() {
                 Base64.encodeToString(
                     this.prfSecond, Base64.URL_SAFE | Base64.NO_WRAP | Base64.NO_PADDING));
       }
+      if (this.largeBlobSupported != null) {
+        sb.append(", largeBlobSupported=").append(this.largeBlobSupported.booleanValue());
+      }
       sb.append("}");
       return sb.toString();
     }
@@ -266,6 +277,8 @@ public static class GetAssertionResponse {
     public final String authenticatorAttachment;
     public final byte[] prfFirst;
     public final byte[] prfSecond;
+    public final byte[] largeBlobBlob;
+    public final Boolean largeBlobWritten;
 
     public static final class Builder {
       private byte[] mClientDataJson;
@@ -276,6 +289,8 @@ public static final class Builder {
       private String mAuthenticatorAttachment;
       private byte[] mPrfFirst;
       private byte[] mPrfSecond;
+      private byte[] mLargeBlobBlob;
+      private Boolean mLargeBlobWritten;
 
       public Builder() {}
 
@@ -319,6 +334,16 @@ public Builder setPrfSecond(final byte[] prfSecond) {
         return this;
       }
 
+      public Builder setLargeBlobBlob(final byte[] largeBlobBlob) {
+        this.mLargeBlobBlob = largeBlobBlob;
+        return this;
+      }
+
+      public Builder setLargeBlobWritten(final boolean largeBlobWritten) {
+        this.mLargeBlobWritten = Boolean.valueOf(largeBlobWritten);
+        return this;
+      }
+
       public GetAssertionResponse build() {
         return new GetAssertionResponse(this);
       }
@@ -338,6 +363,8 @@ protected GetAssertionResponse(final Builder builder) {
       this.authenticatorAttachment = builder.mAuthenticatorAttachment;
       this.prfFirst = builder.mPrfFirst;
       this.prfSecond = builder.mPrfSecond;
+      this.largeBlobBlob = builder.mLargeBlobBlob;
+      this.largeBlobWritten = builder.mLargeBlobWritten;
     }
 
     @WrapForJNI(skip = true)
@@ -380,6 +407,15 @@ public String toString() {
                 Base64.encodeToString(
                     this.prfSecond, Base64.URL_SAFE | Base64.NO_WRAP | Base64.NO_PADDING));
       }
+      if (this.largeBlobBlob != null) {
+        sb.append(", largeBlobBlob=")
+            .append(
+                Base64.encodeToString(
+                    this.largeBlobBlob, Base64.URL_SAFE | Base64.NO_WRAP | Base64.NO_PADDING));
+      }
+      if (this.largeBlobWritten != null) {
+        sb.append(", largeBlobWritten=").append(this.largeBlobWritten.booleanValue());
+      }
       sb.append("}");
       return sb.toString();
     }
@@ -428,6 +464,14 @@ public static MakeCredentialResponse getMakeCredentialResponse(final @NonNull St
       } catch (final JSONException e) {
         // prf is optional
       }
+      try {
+        final JSONObject largeBlob = clientExtensionResults.getJSONObject("largeBlob");
+        if (largeBlob.has("supported")) {
+          builder.setLargeBlobSupported(largeBlob.getBoolean("supported"));
+        }
+      } catch (final JSONException e) {
+        // largeBlob is optional
+      }
     } catch (final JSONException e) {
       // clientExtensionResults is an optional. Ignore exception if nothing.
     }
@@ -462,18 +506,33 @@ public static GetAssertionResponse getGetAssertionResponse(final @NonNull String
 
     try {
       final JSONObject clientExtensionResults = json.getJSONObject("clientExtensionResults");
-      final JSONObject prf = clientExtensionResults.getJSONObject("prf");
-      if (prf.has("results")) {
-        final JSONObject prfResults = prf.getJSONObject("results");
-        if (prfResults.has("first")) {
-          builder.setPrfFirst(Base64.decode(prfResults.getString("first"), Base64.URL_SAFE));
+      try {
+        final JSONObject prf = clientExtensionResults.getJSONObject("prf");
+        if (prf.has("results")) {
+          final JSONObject prfResults = prf.getJSONObject("results");
+          if (prfResults.has("first")) {
+            builder.setPrfFirst(Base64.decode(prfResults.getString("first"), Base64.URL_SAFE));
+          }
+          if (prfResults.has("second")) {
+            builder.setPrfSecond(Base64.decode(prfResults.getString("second"), Base64.URL_SAFE));
+          }
+        }
+      } catch (final JSONException e) {
+        // prf is optional
+      }
+      try {
+        final JSONObject largeBlob = clientExtensionResults.getJSONObject("largeBlob");
+        if (largeBlob.has("blob")) {
+          builder.setLargeBlobBlob(Base64.decode(largeBlob.getString("blob"), Base64.URL_SAFE));
         }
-        if (prfResults.has("second")) {
-          builder.setPrfSecond(Base64.decode(prfResults.getString("second"), Base64.URL_SAFE));
+        if (largeBlob.has("written")) {
+          builder.setLargeBlobWritten(largeBlob.getBoolean("written"));
         }
+      } catch (final JSONException e) {
+        // largeBlob is optional
       }
     } catch (final JSONException e) {
-      // prf is optional
+      // clientExtensionResults is optional
     }
 
     // This response may have clientDataJson value, but signed hash is generated by request
diff --git a/mobile/android/geckoview/src/test/java/org/mozilla/gecko/util/WebAuthnUtilsTest.java b/mobile/android/geckoview/src/test/java/org/mozilla/gecko/util/WebAuthnUtilsTest.java
index c232805aeefe3..85a42de77b123 100644
--- a/mobile/android/geckoview/src/test/java/org/mozilla/gecko/util/WebAuthnUtilsTest.java
+++ b/mobile/android/geckoview/src/test/java/org/mozilla/gecko/util/WebAuthnUtilsTest.java
@@ -28,7 +28,7 @@ public void responseJSONForMakeCredential() throws Exception {
             + "\"type\": \"public-key\" ,"
             + "\"authenticatorAttachment\": \"platform\", "
             + "\"response\": {\"attestationObject\": \"AQIDBAUGBwgJCgsMDQ4PEA\", \"transports\": [ \"internal\" ]},"
-            + "\"clientExtensionResults\": {\"credProps\": {\"rk\": true }, \"prf\": {\"enabled\": true}}"
+            + "\"clientExtensionResults\": {\"credProps\": {\"rk\": true }, \"prf\": {\"enabled\": true}, \"largeBlob\": {\"supported\": true}}"
             + "}";
     final WebAuthnUtils.MakeCredentialResponse response =
         WebAuthnUtils.getMakeCredentialResponse(responseJSON);
@@ -48,6 +48,7 @@ public void responseJSONForMakeCredential() throws Exception {
     assertTrue("prfEnabled should be true", response.prfEnabled);
     assertEquals("prfFirst should be null", response.prfFirst, null);
     assertEquals("prfSecond should be null", response.prfSecond, null);
+    assertTrue("largeBlobSupported should be true", response.largeBlobSupported);
   }
 
   @Test(expected = JSONException.class)
@@ -72,7 +73,8 @@ public void responseJSONForGetAssertion() throws Exception {
             + "\"id\": \"AAECAwQFBgcICQoLDA0ODw\" ,"
             + "\"rawId\": \"AAECAwQFBgcICQoLDA0ODw\" ,"
             + "\"authenticatorAttachment\": \"platform\", "
-            + "\"response\": {\"authenticatorData\": \"AQIDBAUGBwgJCgsMDQ4PEA\", \"signature\": \"AgMEBQYHCAkKCwwNDg8QEQ\"}"
+            + "\"response\": {\"authenticatorData\": \"AQIDBAUGBwgJCgsMDQ4PEA\", \"signature\": \"AgMEBQYHCAkKCwwNDg8QEQ\"},"
+            + "\"clientExtensionResults\": {\"largeBlob\": {\"blob\": \"AAECAwQFBgcICQoLDA0ODw\"}}"
             + "}";
     final WebAuthnUtils.GetAssertionResponse response =
         WebAuthnUtils.getGetAssertionResponse(responseJSON);
@@ -87,12 +89,17 @@ public void responseJSONForGetAssertion() throws Exception {
         new byte[] {
           0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0x10, 0x11
         };
+    final byte[] largeBlobBlob =
+        new byte[] {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf};
     assertTrue("rawId should be matched", Arrays.equals(response.keyHandle, rawId));
     assertTrue("authenticatorData should be matched", Arrays.equals(response.authData, authData));
     assertTrue("signature should be matched", Arrays.equals(response.signature, signature));
     assertEquals(
         "authenticatorAttachment should be matched", response.authenticatorAttachment, "platform");
     assertEquals("No clientDataJson in response", response.clientDataJson, null);
+    assertTrue(
+        "largeBlobBlob should be matched", Arrays.equals(response.largeBlobBlob, largeBlobBlob));
+    assertEquals("largeBlobWritten should be null", response.largeBlobWritten, null);
   }
 
   @Test(expected = JSONException.class)
@@ -201,4 +208,21 @@ public void responseJSONForGetAssertionWithPrf() throws Exception {
     assertTrue("prfFirst should be matched", Arrays.equals(response.prfFirst, expectedFirst));
     assertEquals("prfSecond should be null", response.prfSecond, null);
   }
+
+  @Test
+  public void responseJSONForGetAssertionWithLargeBlobWritten() throws Exception {
+    final String responseJSON =
+        "{"
+            + "\"id\": \"AAECAwQFBgcICQoLDA0ODw\" ,"
+            + "\"rawId\": \"AAECAwQFBgcICQoLDA0ODw\" ,"
+            + "\"authenticatorAttachment\": \"platform\", "
+            + "\"response\": {\"authenticatorData\": \"AQIDBAUGBwgJCgsMDQ4PEA\", \"signature\": \"AgMEBQYHCAkKCwwNDg8QEQ\"},"
+            + "\"clientExtensionResults\": {\"largeBlob\": {\"written\": true}}"
+            + "}";
+    final WebAuthnUtils.GetAssertionResponse response =
+        WebAuthnUtils.getGetAssertionResponse(responseJSON);
+
+    assertTrue("largeBlobWritten should be true", response.largeBlobWritten);
+    assertEquals("largeBlobBlob should be null", response.largeBlobBlob, null);
+  }
 }

From 525f3639cd22f50d2fd248b8ed684c4f694aa29a Mon Sep 17 00:00:00 2001
From: mailelucks <maile.lucks@gmail.com>
Date: Thu, 29 Jan 2026 17:42:57 +0000
Subject: [PATCH 102/116] Bug 2001496 - Chat History in FXView -
 r=omarg,fluent-reviewers,desktop-theme-reviewers,fxview-reviewers,ai-frontend-reviewers,sfoster,bolsson

Differential Revision: https://phabricator.services.mozilla.com/D277264
---
 browser/app/profile/firefox.js                |   1 +
 .../aiwindow/ui/modules/ChatStore.sys.mjs     |   9 +-
 .../aiwindow/ui/modules/ChatUtils.sys.mjs     |  13 +-
 .../firefoxview/ChatsController.sys.mjs       | 459 ++++++++++++++++++
 .../components/firefoxview/chats-tab-list.css |  14 +
 .../components/firefoxview/chats-tab-list.mjs | 170 +++++++
 browser/components/firefoxview/chats.mjs      | 323 ++++++++++++
 .../firefoxview/content/empty-chat.svg        |  12 +
 .../firefoxview/content/view-chats.svg        |   6 +
 .../components/firefoxview/firefoxview.html   |   9 +
 .../components/firefoxview/firefoxview.mjs    |  17 +
 browser/components/firefoxview/jar.mn         |   5 +
 .../firefoxview/tests/browser/browser.toml    |   2 +
 .../browser/browser_chats_firefoxview.js      | 455 +++++++++++++++++
 browser/locales/en-US/browser/firefoxView.ftl |  21 +
 15 files changed, 1510 insertions(+), 6 deletions(-)
 create mode 100644 browser/components/firefoxview/ChatsController.sys.mjs
 create mode 100644 browser/components/firefoxview/chats-tab-list.css
 create mode 100644 browser/components/firefoxview/chats-tab-list.mjs
 create mode 100644 browser/components/firefoxview/chats.mjs
 create mode 100644 browser/components/firefoxview/content/empty-chat.svg
 create mode 100644 browser/components/firefoxview/content/view-chats.svg
 create mode 100644 browser/components/firefoxview/tests/browser/browser_chats_firefoxview.js

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 10babe5b7e467..0f3834ea38023 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -2269,6 +2269,7 @@ pref("browser.ml.pageAssist.enabled", false);
 // AI Window Feature
 pref("browser.aiwindow.apiKey", '');
 pref("browser.aiwindow.chatStore.loglevel", "Error");
+pref("browser.aiwindow.chatHistory.loglevel", "Error");
 pref("browser.aiwindow.enabled", false);
 pref("browser.aiwindow.endpoint", "https://mlpa-prod-prod-mozilla.global.ssl.fastly.net/v1");
 pref("browser.aiwindow.memories", true);
diff --git a/browser/components/aiwindow/ui/modules/ChatStore.sys.mjs b/browser/components/aiwindow/ui/modules/ChatStore.sys.mjs
index 86776433ee3d9..9b33cb6f48037 100644
--- a/browser/components/aiwindow/ui/modules/ChatStore.sys.mjs
+++ b/browser/components/aiwindow/ui/modules/ChatStore.sys.mjs
@@ -427,12 +427,13 @@ class ChatStore {
    * in the message.content.body field
    *
    * @param {string} searchString - The string to search with for conversations
+   * @param {boolean} [includeMessages=true] - Whether to fetch messages for each conversation
    *
-   * @returns {Array<ChatConversation>} - An array of conversations with messages
+   * @returns {Array<ChatConversation>} - An array of conversations with or without messages
    * that contain a message that matches the search string in the conversation
    * titles
    */
-  async search(searchString) {
+  async search(searchString, includeMessages = true) {
     await this.#ensureDatabase().catch(e => {
       lazy.log.error(
         "Could not ensure a database connection.",
@@ -456,6 +457,10 @@ class ChatStore {
 
     const conversations = rows.map(parseConversationRow);
 
+    if (!includeMessages) {
+      return conversations;
+    }
+
     return await this.#getMessagesForConversations(conversations);
   }
 
diff --git a/browser/components/aiwindow/ui/modules/ChatUtils.sys.mjs b/browser/components/aiwindow/ui/modules/ChatUtils.sys.mjs
index f078769d7d497..3c5fde6869afb 100644
--- a/browser/components/aiwindow/ui/modules/ChatUtils.sys.mjs
+++ b/browser/components/aiwindow/ui/modules/ChatUtils.sys.mjs
@@ -87,15 +87,20 @@ export function parseMessageRows(rows) {
  */
 export function parseChatHistoryViewRows(rows) {
   return rows.map(row => {
+    const urlsString = row.getResultByName("urls");
+    const urls = urlsString
+      ? urlsString
+          .split(",")
+          .filter(url => url && url.trim())
+          .map(url => new URL(url.trim()))
+      : [];
+
     return new ChatHistoryResult({
       convId: row.getResultByName("conv_id"),
       title: row.getResultByName("title"),
       createdDate: row.getResultByName("created_date"),
       updatedDate: row.getResultByName("updated_date"),
-      urls: row
-        .getResultByName("urls")
-        .split(",")
-        .map(url => new URL(url)),
+      urls,
     });
   });
 }
diff --git a/browser/components/firefoxview/ChatsController.sys.mjs b/browser/components/firefoxview/ChatsController.sys.mjs
new file mode 100644
index 0000000000000..168a98bef65c9
--- /dev/null
+++ b/browser/components/firefoxview/ChatsController.sys.mjs
@@ -0,0 +1,459 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const lazy = {};
+
+import { getLogger } from "chrome://browser/content/firefoxview/helpers.mjs";
+
+ChromeUtils.defineESModuleGetters(lazy, {
+  AIWindow:
+    "moz-src:///browser/components/aiwindow/ui/modules/AIWindow.sys.mjs",
+});
+
+const CHAT_MAP_L10N_IDS = {
+  "chat-date-today": "firefoxview-chat-date-today",
+  "chat-date-yesterday": "firefoxview-chat-date-yesterday",
+  "chat-date-this-month": "firefoxview-chat-date-this-month",
+  "chat-date-prev-month": "firefoxview-chat-date-prev-month",
+};
+
+const DAYS_IN_MILLIS = 86400000;
+
+/**
+ * A list of chat items displayed on a card.
+ *
+ * @typedef {object} CardEntry
+ * @property {Array} items - Chat items for this card
+ * @property {string} l10nId - Localization ID for the card header
+ */
+
+/**
+ * Manages chat history display and organization in Firefox View.
+ * Handles fetching, searching, grouping by date, and normalizing chat data for display.
+ */
+export class ChatsController {
+  /**
+   * @type {{ entries: CardEntry[]; searchQuery: string; }}
+   */
+  cache;
+
+  /** @type {object} The host element this controller is attached to */
+  host;
+
+  // TODO Bug 2009070 - Implement Search
+  /** @type {string} Current search query string */
+  // searchQuery;
+
+  /** @type {Date} Today's date at midnight */
+  #todaysDate;
+
+  /** @type {Date} Yesterday's date at midnight */
+  #yesterdaysDate;
+
+  /**
+   * Creates a ChatsController instance.
+   *
+   * @param {object} host - The host element that this controller manages
+   * @param {object} [_options] - Configuration options (unused until Bug 2009070)
+   * @param {number} [_options.searchResultsLimit=300] - Maximum number of search results to return
+   *
+   * TODO: The _options parameter is prefixed with underscore because it's currently unused
+   * while search functionality is disabled. When implementing Bug 2009070 (search), rename
+   * this back to 'options' and uncomment the search-related code below.
+   */
+  constructor(host, _options) {
+    this.chatStore = lazy.AIWindow.chatStore;
+    // TODO Bug 2009070 - Implement Search
+    // this.searchQuery = "";
+    // this.searchResultsLimit = options?.searchResultsLimit || 300;
+    this.cache = {
+      entries: null,
+      // TODO Bug 2009070 - Implement Search
+      // searchQuery: null,
+    };
+    this.host = host;
+
+    host.addController(this);
+  }
+
+  async deleteChat() {
+    const convID = this.host.triggerNode.closedId;
+    if (convID) {
+      await this.chatStore.deleteConversationById(convID);
+      await this.updateCache();
+    }
+  }
+
+  // TODO Bug 2009070 - Implement Search
+  /**
+   * Handles search query events and updates the chat cache.
+   *
+   * @param {CustomEvent} e - The search query event
+   * @param {object} e.detail - Event details
+   * @param {string} e.detail.query - The search query string
+   */
+  // onSearchQuery(e) {
+  //   this.searchQuery = e.detail.query;
+  //   this.updateCache();
+  // }
+
+  /**
+   * Gets all chat entries from the cache.
+   *
+   * @returns {CardEntry[]} Array of card entries containing chat items
+   */
+  get totalChats() {
+    return this.cache.entries || [];
+  }
+
+  // TODO Bug 2009070 - Implement Search
+  /**
+   * Gets the current search results.
+   *
+   * @returns {Array} Array of search result items, or empty array if no search is active
+   */
+  // get searchResults() {
+  //   if (this.cache.searchQuery && this.cache.entries?.length) {
+  //     return this.cache.entries[0].items;
+  //   }
+  //   return [];
+  // }
+
+  /**
+   * Gets the total number of chat items across all entries.
+   *
+   * @returns {number} Total count of chat items
+   */
+  get totalVisitsCount() {
+    return this.totalChats.reduce(
+      (count, entry) => count + entry.items.length,
+      0
+    );
+  }
+
+  /**
+   * Checks if there are no chats to display.
+   *
+   * @returns {boolean} True if there are no chat entries
+   */
+  get isChatEmpty() {
+    return !this.totalChats.length;
+  }
+
+  /**
+   * Updates the cached chat data based on current search query.
+   * Fetches either search results or all chats grouped by date.
+   * Normalizes chat items and triggers host UI update.
+   */
+  async updateCache() {
+    // TODO Bug 2009070 - Implement Search
+    // const { searchQuery } = this;
+    // const entries = searchQuery
+    //   ? await this.#getChatsForSearchQuery(searchQuery)
+    //   : await this.#getAllChatsGroupedByDate();
+    const entries = await this.#getAllChatsGroupedByDate();
+
+    // TODO Bug 2009070 - Implement Search
+    // if (this.searchQuery !== searchQuery || !entries) {
+    //   // This query is stale, discard results and do not update the cache / UI.
+    //   return;
+    // }
+    if (!entries) {
+      return;
+    }
+
+    // Normalize chat items for display
+    for (const { items } of entries) {
+      for (const item of items) {
+        this.#normalizeChat(item);
+      }
+    }
+
+    // TODO Bug 2009070 - Implement Search
+    // this.cache = { entries, searchQuery };
+    this.cache = { entries };
+    this.host.requestUpdate();
+  }
+
+  /**
+   * Normalize chat data for fxview-tabs-list.
+   *
+   * @param {ChatHistoryResult} chat
+   *   The chat to format.
+   */
+  #normalizeChat(chat) {
+    // Get most recent page URL (skip if it's the AI Window URL)
+    const mostRecentPage = chat.urls?.[chat.urls.length - 1];
+    const pageUrl =
+      mostRecentPage?.href === lazy.AIWindow.newTabURL
+        ? null
+        : mostRecentPage?.href;
+
+    // All chats link to AI Window - click handler will decide what to load
+    const targetURI = lazy.AIWindow.newTabURL;
+
+    if (pageUrl) {
+      chat.icon = pageUrl;
+      chat.pageUrl = pageUrl;
+      chat.primaryL10nId = "fxviewtabrow-tabs-list-tab";
+      chat.primaryL10nArgs = JSON.stringify({
+        targetURI,
+      });
+    }
+    chat.url = targetURI;
+    chat.time = chat.updatedDate;
+    chat.closedId = chat.convId;
+    chat.secondaryL10nId = "fxviewtabrow-options-menu-button";
+    chat.secondaryL10nArgs = JSON.stringify({
+      tabTitle: chat.title || "Untitled Chat",
+    });
+  }
+
+  // TODO Bug 2009070 - Implement Search
+  /**
+   * Fetches and formats chats matching a search query.
+   *
+   * @param {string} searchQuery - The search query string
+   * @returns {Promise<CardEntry[]>} Array with single entry containing search results
+   */
+  // async #getChatsForSearchQuery(searchQuery) {
+  //   try {
+  //     const conversations = await this.chatStore.search(searchQuery, false);
+
+  //     // Add aliases to conversation objects for display compatibility
+  //     conversations.forEach(conv => {
+  //       conv.convId = conv.id;
+  //       conv.urls = conv.pageMeta?.urls || [];
+  //     });
+
+  //     return [{ items: conversations }];
+  //   } catch (e) {
+  //     getLogger("ChatsController").warn(
+  //       "There is a new search query in progress, cancelling this one.",
+  //       e
+  //     );
+  //     return [{ items: [] }];
+  //   }
+  // }
+
+  /**
+   * Fetches all chats and groups them by date categories.
+   *
+   * @returns {Promise<CardEntry[]>} Array of card entries grouped by date
+   */
+  async #getAllChatsGroupedByDate() {
+    const chats = await this.#fetchChats();
+    if (!chats || !chats.length) {
+      return [];
+    }
+
+    this.#setTodaysDate();
+    return this.#getChatsForDate(chats);
+  }
+
+  /**
+   * Groups chats into date-based categories: today, yesterday, this month, previous months.
+   *
+   * @param {Array} chats - Array of chat objects to group
+   * @returns {CardEntry[]} Array of card entries organized by date categories
+   */
+  #getChatsForDate(chats) {
+    const entries = [];
+    const chatsFromToday = this.#getChatsFromToday(chats);
+    const chatsFromYesterday = this.#getChatsFromYesterday(chats);
+    const chatsByDay = this.#getChatsByDay(chats);
+    const chatsByMonth = this.#getChatsByMonth(chats);
+
+    if (chatsFromToday.length) {
+      entries.push({
+        l10nId: CHAT_MAP_L10N_IDS["chat-date-today"],
+        items: chatsFromToday,
+      });
+    }
+
+    if (chatsFromYesterday.length) {
+      entries.push({
+        l10nId: CHAT_MAP_L10N_IDS["chat-date-yesterday"],
+        items: chatsFromYesterday,
+      });
+    }
+
+    chatsByDay.forEach(dayChats => {
+      entries.push({
+        l10nId: CHAT_MAP_L10N_IDS["chat-date-this-month"],
+        items: dayChats,
+      });
+    });
+
+    chatsByMonth.forEach(monthChats => {
+      entries.push({
+        l10nId: CHAT_MAP_L10N_IDS["chat-date-prev-month"],
+        items: monthChats,
+      });
+    });
+
+    return entries;
+  }
+
+  /**
+   * Filters chats that were updated today.
+   *
+   * @param {Array} chats - Array of chat objects
+   * @returns {Array} Chats from today
+   */
+  #getChatsFromToday(chats) {
+    const todayStart = this.#todaysDate.getTime();
+    const todayEnd = todayStart + DAYS_IN_MILLIS;
+    return chats.filter(
+      chat => chat.updatedDate >= todayStart && chat.updatedDate < todayEnd
+    );
+  }
+
+  /**
+   * Filters chats that were updated yesterday.
+   *
+   * @param {Array} chats - Array of chat objects
+   * @returns {Array} Chats from yesterday
+   */
+  #getChatsFromYesterday(chats) {
+    const todayStart = this.#todaysDate.getTime();
+    const yesterdayStart = this.#yesterdaysDate.getTime();
+    return chats.filter(
+      chat =>
+        chat.updatedDate >= yesterdayStart && chat.updatedDate < todayStart
+    );
+  }
+
+  /**
+   * Groups chats by individual days within the current month.
+   * Excludes today and yesterday chats.
+   *
+   * @param {Array} chats - Array of chat objects
+   * @returns {Array<Array>} Array of arrays, each containing chats from the same day
+   */
+  #getChatsByDay(chats) {
+    const yesterdayStart = this.#yesterdaysDate.getTime();
+    const chatsPerDay = [];
+    let currentDay = null;
+    let currentDayChats = [];
+
+    for (const chat of chats) {
+      if (chat.updatedDate >= yesterdayStart) {
+        continue;
+      }
+
+      const chatDate = new Date(chat.updatedDate);
+      if (!this.#isSameMonth(chatDate, this.#todaysDate)) {
+        break;
+      }
+
+      const dayKey = `${chatDate.getFullYear()}-${chatDate.getMonth()}-${chatDate.getDate()}`;
+      if (dayKey !== currentDay) {
+        if (currentDayChats.length) {
+          chatsPerDay.push(currentDayChats);
+        }
+        currentDay = dayKey;
+        currentDayChats = [chat];
+      } else {
+        currentDayChats.push(chat);
+      }
+    }
+
+    if (currentDayChats.length) {
+      chatsPerDay.push(currentDayChats);
+    }
+
+    return chatsPerDay;
+  }
+
+  /**
+   * Groups chats by month for dates outside the current month.
+   * Excludes today, yesterday, and current month chats.
+   *
+   * @param {Array} chats - Array of chat objects
+   * @returns {Array<Array>} Array of arrays, each containing chats from the same month
+   */
+  #getChatsByMonth(chats) {
+    const yesterdayStart = this.#yesterdaysDate.getTime();
+    const chatsPerMonth = [];
+    let currentMonth = null;
+    let currentMonthChats = [];
+
+    for (const chat of chats) {
+      if (chat.updatedDate >= yesterdayStart) {
+        continue;
+      }
+
+      const chatDate = new Date(chat.updatedDate);
+      if (this.#isSameMonth(chatDate, this.#todaysDate)) {
+        continue;
+      }
+
+      const monthKey = `${chatDate.getFullYear()}-${chatDate.getMonth()}`;
+      if (monthKey !== currentMonth) {
+        if (currentMonthChats.length) {
+          chatsPerMonth.push(currentMonthChats);
+        }
+        currentMonth = monthKey;
+        currentMonthChats = [chat];
+      } else {
+        currentMonthChats.push(chat);
+      }
+    }
+
+    if (currentMonthChats.length) {
+      chatsPerMonth.push(currentMonthChats);
+    }
+
+    return chatsPerMonth;
+  }
+
+  /**
+   * Check if two dates have the same month and year.
+   *
+   * @param {Date} dateToCheck
+   * @param {Date} month
+   * @returns {boolean}
+   */
+  #isSameMonth(dateToCheck, month) {
+    return (
+      dateToCheck.getMonth() === month.getMonth() &&
+      dateToCheck.getFullYear() === month.getFullYear()
+    );
+  }
+
+  /**
+   * Sets today's and yesterday's dates at midnight for date comparison operations.
+   */
+  #setTodaysDate() {
+    const now = new Date();
+    this.#todaysDate = new Date(
+      now.getFullYear(),
+      now.getMonth(),
+      now.getDate()
+    );
+    this.#yesterdaysDate = new Date(
+      now.getFullYear(),
+      now.getMonth(),
+      now.getDate() - 1
+    );
+  }
+
+  /**
+   * Fetches chats from the chat store.
+   *
+   * @returns {Promise<Array>} Array of chat objects, or empty array on error
+   */
+  async #fetchChats() {
+    try {
+      // Use chatHistoryView for paginated, optimized results
+      // Get first 100 chats, sorted by date descending
+      const chats = await this.chatStore.chatHistoryView(1, 100, "desc");
+      return chats;
+    } catch (e) {
+      getLogger("ChatsController").error("Error fetching chats", e);
+      return [];
+    }
+  }
+}
diff --git a/browser/components/firefoxview/chats-tab-list.css b/browser/components/firefoxview/chats-tab-list.css
new file mode 100644
index 0000000000000..f45f1efb635e3
--- /dev/null
+++ b/browser/components/firefoxview/chats-tab-list.css
@@ -0,0 +1,14 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@import url("chrome://browser/content/firefoxview/fxview-tab-list.css");
+
+.fxview-tab-row-favicon.chat-overlay {
+  /* stylelint-disable-next-line stylelint-plugin-mozilla/use-design-tokens */
+  background-size: 50%, 100%;
+  background-position:
+    center calc(50% - 2px),
+    center;
+  background-repeat: no-repeat, no-repeat;
+}
diff --git a/browser/components/firefoxview/chats-tab-list.mjs b/browser/components/firefoxview/chats-tab-list.mjs
new file mode 100644
index 0000000000000..1d871c2b0c199
--- /dev/null
+++ b/browser/components/firefoxview/chats-tab-list.mjs
@@ -0,0 +1,170 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import {
+  classMap,
+  html,
+  ifDefined,
+  styleMap,
+  when,
+} from "chrome://global/content/vendor/lit.all.mjs";
+import {
+  FxviewTabListBase,
+  FxviewTabRowBase,
+} from "chrome://browser/content/firefoxview/fxview-tab-list.mjs";
+
+/**
+ * A list of clickable chat history items
+ */
+export class ChatsTabList extends FxviewTabListBase {
+  static queries = {
+    ...FxviewTabListBase.queries,
+    rowEls: {
+      all: "chats-tab-row",
+    },
+  };
+
+  itemTemplate = (tabItem, i) => {
+    let time;
+    if (tabItem.time || tabItem.closedAt) {
+      let stringTime = (tabItem.time || tabItem.closedAt).toString();
+      // Different APIs return time in different units, so we use
+      // the length to decide if it's milliseconds or nanoseconds.
+      if (stringTime.length === 16) {
+        time = (tabItem.time || tabItem.closedAt) / 1000;
+      } else {
+        time = tabItem.time || tabItem.closedAt;
+      }
+    }
+
+    return html`<chats-tab-row
+      ?active=${i == this.activeIndex}
+      ?compact=${this.compactRows}
+      .currentActiveElementId=${this.currentActiveElementId}
+      .favicon=${ifDefined(tabItem.icon)}
+      .pageUrl=${ifDefined(tabItem.pageUrl)}
+      .primaryL10nId=${tabItem.primaryL10nId}
+      .primaryL10nArgs=${ifDefined(tabItem.primaryL10nArgs)}
+      .secondaryL10nId=${tabItem.secondaryL10nId}
+      .secondaryL10nArgs=${ifDefined(tabItem.secondaryL10nArgs)}
+      .tertiaryL10nId=${ifDefined(tabItem.tertiaryL10nId)}
+      .tertiaryL10nArgs=${ifDefined(tabItem.tertiaryL10nArgs)}
+      .secondaryActionClass=${this.secondaryActionClass}
+      .tertiaryActionClass=${ifDefined(this.tertiaryActionClass)}
+      .sourceClosedId=${ifDefined(tabItem.sourceClosedId)}
+      .sourceWindowId=${ifDefined(tabItem.sourceWindowId)}
+      .closedId=${ifDefined(tabItem.closedId || tabItem.closedId)}
+      role="listitem"
+      .time=${ifDefined(time)}
+      .title=${tabItem.title}
+      .url=${tabItem.url}
+      .searchQuery=${ifDefined(this.searchQuery)}
+      .timeMsPref=${ifDefined(this.timeMsPref)}
+      .hasPopup=${this.hasPopup}
+      .dateTimeFormat=${this.dateTimeFormat}
+      .convId=${tabItem.convId}
+    ></chats-tab-row>`;
+  };
+}
+
+customElements.define("chats-tab-list", ChatsTabList);
+
+/**
+ * A chat history item that displays favicon with optional overlay, title, url, and time
+ *
+ * @property {string} pageUrl - The last visited URL associated with this chat, if any
+ */
+export class ChatsTabRow extends FxviewTabRowBase {
+  static properties = {
+    ...FxviewTabRowBase.properties,
+    pageUrl: { type: String },
+    convId: { type: String },
+  };
+
+  faviconTemplate() {
+    // Determine the icon and overlay based on whether chat has an associated page URL
+    let faviconUrl;
+    let overlayUrl = null;
+
+    // Treat about: URLs as internal/no external page
+    const hasExternalUrl = this.pageUrl && !this.pageUrl.startsWith("about:");
+
+    if (hasExternalUrl) {
+      // Chat has an associated page URL - show page favicon with chat overlay
+      faviconUrl = this.getImageUrl(this.favicon, this.pageUrl);
+      overlayUrl = "chrome://browser/content/firefoxview/empty-chat.svg";
+    } else {
+      // Chat has no page URL or internal about: page - show generic chat icon, no overlay
+      faviconUrl = "chrome://browser/content/firefoxview/view-chats.svg";
+    }
+
+    const backgroundImage = overlayUrl
+      ? `url(${faviconUrl}), url(${overlayUrl})`
+      : `url(${faviconUrl})`;
+
+    return html`<span
+      class=${classMap({
+        "fxview-tab-row-favicon": true,
+        icon: true,
+        "chat-overlay": !!overlayUrl,
+      })}
+      id="fxview-tab-row-favicon"
+      style=${styleMap({
+        backgroundImage,
+      })}
+    ></span>`;
+  }
+
+  urlTemplate() {
+    const urlToDisplay =
+      this.pageUrl && !this.pageUrl.startsWith("about:") ? this.pageUrl : "";
+
+    return html`<span
+      class="fxview-tab-row-url text-truncated-ellipsis"
+      id="fxview-tab-row-url"
+    >
+      ${when(
+        this.searchQuery,
+        () => this.highlightSearchMatches(this.searchQuery, urlToDisplay),
+        () => urlToDisplay
+      )}
+    </span>`;
+  }
+
+  render() {
+    return html`
+      ${this.stylesheets()}
+      <link
+        rel="stylesheet"
+        href="chrome://browser/content/firefoxview/chats-tab-list.css"
+      />
+      <a
+        href=${ifDefined(this.url)}
+        class="fxview-tab-row-main"
+        id="fxview-tab-row-main"
+        tabindex=${this.active &&
+        this.currentActiveElementId === "fxview-tab-row-main"
+          ? "0"
+          : "-1"}
+        data-l10n-id=${ifDefined(this.primaryL10nId)}
+        data-l10n-args=${ifDefined(this.primaryL10nArgs)}
+        @click=${this.primaryActionHandler}
+        @keydown=${this.primaryActionHandler}
+        title=${!this.primaryL10nId ? this.url : null}
+        data-conv-id=${ifDefined(this.convId)}
+      >
+        ${this.faviconTemplate()} ${this.titleTemplate()}
+        ${when(
+          !this.compact,
+          () =>
+            html`${this.urlTemplate()} ${this.dateTemplate()}
+            ${this.timeTemplate()}`
+        )}
+      </a>
+      ${this.secondaryButtonTemplate()} ${this.tertiaryButtonTemplate()}
+    `;
+  }
+}
+
+customElements.define("chats-tab-row", ChatsTabRow);
diff --git a/browser/components/firefoxview/chats.mjs b/browser/components/firefoxview/chats.mjs
new file mode 100644
index 0000000000000..13dfc3346c7cc
--- /dev/null
+++ b/browser/components/firefoxview/chats.mjs
@@ -0,0 +1,323 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// TODO Bug 2009070 - Implement Search
+import { html /*, when */ } from "chrome://global/content/vendor/lit.all.mjs";
+// TODO Bug 2009070 - Implement Search
+// import { escapeHtmlEntities } from "./helpers.mjs";
+import { ViewPage } from "./viewpage.mjs";
+// eslint-disable-next-line import/no-unassigned-import
+import "chrome://global/content/elements/moz-button.mjs";
+// eslint-disable-next-line import/no-unassigned-import
+import "chrome://browser/content/firefoxview/chats-tab-list.mjs";
+
+const lazy = {};
+
+ChromeUtils.defineESModuleGetters(lazy, {
+  AIWindow:
+    "moz-src:///browser/components/aiwindow/ui/modules/AIWindow.sys.mjs",
+  AIWindowUI:
+    "moz-src:///browser/components/aiwindow/ui/modules/AIWindowUI.sys.mjs",
+  ChatsController: "resource:///modules/ChatsController.sys.mjs",
+  URILoadingHelper: "resource:///modules/URILoadingHelper.sys.mjs",
+});
+
+ChromeUtils.defineLazyGetter(lazy, "log", function () {
+  return console.createInstance({
+    prefix: "ChatHistory",
+    maxLogLevelPref: "browser.aiwindow.chatHistory.loglevel",
+  });
+});
+
+// TODO Bug 2009070 - Implement Search
+// const SEARCH_RESULTS_LIMIT = 300;
+
+class ChatsInView extends ViewPage {
+  static properties = {};
+
+  static queries = {
+    cards: { all: "card-container:not([hidden])" },
+    emptyState: "fxview-empty-state",
+    lists: { all: "chats-tab-list" },
+    // TODO Bug 2009070 - Implement Search
+    // searchTextbox: "moz-input-search",
+    panelList: "panel-list",
+  };
+
+  constructor() {
+    super();
+    this._started = false;
+    // Setting maxTabsLength to -1 for no max
+    this.maxTabsLength = -1;
+    this.fullyUpdated = false;
+    // TODO Bug 2009070 - Implement Search
+    // this.cumulativeSearches = 0;
+  }
+
+  controller = new lazy.ChatsController(this, {
+    // TODO Bug 2009070 - Implement Search
+    // searchResultsLimit: SEARCH_RESULTS_LIMIT,
+  });
+
+  disconnectedCallback() {
+    super.disconnectedCallback();
+    this.stop();
+  }
+
+  viewVisibleCallback() {
+    this.start();
+  }
+
+  viewHiddenCallback() {
+    this.stop();
+  }
+
+  willUpdate() {
+    this.fullyUpdated = false;
+  }
+
+  updated() {
+    this.fullyUpdated = true;
+    if (this.lists?.length) {
+      this.toggleVisibilityInCardContainer();
+    }
+  }
+
+  async getUpdateComplete() {
+    await super.getUpdateComplete();
+    await Promise.all(Array.from(this.cards).map(card => card.updateComplete));
+  }
+
+  start() {
+    if (this._started) {
+      return;
+    }
+    this._started = true;
+
+    this.controller.updateCache();
+
+    this.toggleVisibilityInCardContainer();
+  }
+
+  stop() {
+    if (!this._started) {
+      return;
+    }
+    this._started = false;
+
+    this.toggleVisibilityInCardContainer();
+  }
+
+  async onPrimaryAction(event) {
+    event.preventDefault();
+
+    const item = event.detail?.item;
+    const convId = item?.convId;
+
+    if (!convId) {
+      lazy.log.error(
+        "No conversation ID found in clicked item",
+        event.message,
+        event.stack
+      );
+      return;
+    }
+
+    const conversation =
+      await lazy.AIWindow.chatStore.findConversationById(convId);
+
+    if (!conversation) {
+      lazy.log.error("Conversation not found:", convId);
+      return;
+    }
+
+    const win = event.target.ownerGlobal;
+    const mostRecentPage = conversation.getMostRecentPageVisited();
+
+    if (mostRecentPage?.href) {
+      // Chat has a page URL - open the page and sidebar
+      lazy.URILoadingHelper.openTrustedLinkIn(win, mostRecentPage.href, "tab", {
+        resolveOnContentBrowserCreated: async targetBrowser => {
+          lazy.AIWindowUI.openSidebar(targetBrowser.ownerGlobal, conversation);
+        },
+      });
+    } else {
+      // Chat has no page URL - open AI Window directly in fullpage mode
+      lazy.URILoadingHelper.openTrustedLinkIn(
+        win,
+        lazy.AIWindow.newTabURL,
+        "tab",
+        {
+          resolveOnContentBrowserCreated: async targetBrowser => {
+            lazy.AIWindowUI.openInFullWindow(targetBrowser, conversation);
+          },
+        }
+      );
+    }
+
+    // TODO Bug 2009070 - Implement Search
+    // if (this.controller.searchQuery) {
+    //   this.cumulativeSearches = 0;
+    // }
+  }
+
+  onSecondaryAction(e) {
+    this.triggerNode = e.originalTarget;
+    this.panelList.toggle(e.detail.originalEvent);
+  }
+
+  deleteChat(e) {
+    this.controller
+      .deleteChat()
+      .catch(
+        lazy.log.error("Could not delete conversation.", e.message, e.stack)
+      );
+  }
+
+  // TODO Bug 2009070 - Implement Search
+  // onSearchQuery(e) {
+  //   this.controller.onSearchQuery(e);
+  //   this.cumulativeSearches = this.controller.searchQuery
+  //     ? this.cumulativeSearches + 1
+  //     : 0;
+  // }
+
+  panelListTemplate() {
+    return html`
+      <panel-list slot="menu" data-tab-type="chat">
+        <panel-item
+          @click=${this.deleteChat}
+          data-l10n-id="firefoxview-chat-context-delete"
+          data-l10n-attrs="accesskey"
+        ></panel-item>
+      </panel-list>
+    `;
+  }
+
+  /**
+   * The template to use for cards-container.
+   */
+  get cardsTemplate() {
+    // TODO Bug 2009070 - Implement Search
+    // if (this.controller.searchResults.length) {
+    //   return this.#searchResultsTemplate();
+    // } else
+    if (!this.controller.isChatEmpty) {
+      return this.#chatCardsTemplate();
+    }
+    return this.#emptyMessageTemplate();
+  }
+
+  #chatCardsTemplate() {
+    return this.controller.totalChats.map(chat => {
+      let dateArg = JSON.stringify({ date: chat.items[0].time });
+      return html`<card-container>
+        <h3
+          slot="header"
+          data-l10n-id=${chat.l10nId}
+          data-l10n-args=${dateArg}
+        ></h3>
+        <chats-tab-list
+          slot="main"
+          .updatesPaused=${false}
+          secondaryActionClass="options-button"
+          dateTimeFormat=${chat.l10nId.includes("prev-month")
+            ? "dateTime"
+            : "time"}
+          hasPopup="menu"
+          maxTabsLength=${this.maxTabsLength}
+          .tabItems=${chat.items}
+          @fxview-tab-list-primary-action=${this.onPrimaryAction}
+          @fxview-tab-list-secondary-action=${this.onSecondaryAction}
+        >
+        </chats-tab-list>
+      </card-container>`;
+    });
+  }
+
+  #emptyMessageTemplate() {
+    const descriptionHeader = "firefoxview-history-empty-header";
+    const descriptionLabels = [
+      "firefoxview-history-empty-description",
+      "firefoxview-history-empty-description-two",
+    ];
+    const descriptionLink = {
+      url: "about:preferences#privacy",
+      name: "history-settings-url",
+    };
+
+    return html`
+      <fxview-empty-state
+        headerLabel=${descriptionHeader}
+        .descriptionLabels=${descriptionLabels}
+        .descriptionLink=${descriptionLink}
+        class="empty-state chats"
+        ?isSelectedTab=${this.selectedTab}
+        mainImageUrl="chrome://browser/content/firefoxview/history-empty.svg"
+      >
+      </fxview-empty-state>
+    `;
+  }
+
+  // TODO Bug 2009070 - Implement Search
+  // #searchResultsTemplate() {
+  //   return html` <card-container toggleDisabled>
+  //     <h3
+  //       slot="header"
+  //       data-l10n-id="firefoxview-search-results-header"
+  //       data-l10n-args=${JSON.stringify({
+  //         query: escapeHtmlEntities(this.controller.searchQuery),
+  //       })}
+  //     ></h3>
+  //     ${when(
+  //       this.controller.searchResults.length,
+  //       () =>
+  //         html`<h3
+  //           slot="secondary-header"
+  //           data-l10n-id="firefoxview-search-results-count"
+  //           data-l10n-args=${JSON.stringify({
+  //             count: this.controller.searchResults.length,
+  //           })}
+  //         ></h3>`
+  //     )}
+  //     <chats-tab-list
+  //       slot="main"
+  //       .updatesPaused=${false}
+  //       secondaryActionClass="options-button"
+  //       dateTimeFormat="dateTime"
+  //       hasPopup="menu"
+  //       maxTabsLength="-1"
+  //       .searchQuery=${this.controller.searchQuery}
+  //       .tabItems=${this.controller.searchResults}
+  //       @fxview-tab-list-primary-action=${this.onPrimaryAction}
+  //       @fxview-tab-list-secondary-action=${this.onSecondaryAction}
+  //     >
+  //     </chats-tab-list>
+  //   </card-container>`;
+  // }
+
+  render() {
+    if (!this.selectedTab) {
+      return null;
+    }
+    return html`
+      <link
+        rel="stylesheet"
+        href="chrome://browser/content/firefoxview/firefoxview.css"
+      />
+      ${this.panelListTemplate()}
+      <div class="sticky-container bottom-fade">
+        <h2 class="page-header" data-l10n-id="firefoxview-chats-header"></h2>
+        <!-- TODO Bug 2009070 - Implement Search -->
+        <!-- <moz-input-search
+          data-l10n-id="firefoxview-search-text-box-chats"
+          data-l10n-attrs="placeholder"
+          @MozInputSearch:search=${this.onSearchQuery}
+        ></moz-input-search> -->
+      </div>
+      <div class="cards-container">${this.cardsTemplate}</div>
+    `;
+  }
+}
+customElements.define("view-chats", ChatsInView);
diff --git a/browser/components/firefoxview/content/empty-chat.svg b/browser/components/firefoxview/content/empty-chat.svg
new file mode 100644
index 0000000000000..b1c508892a282
--- /dev/null
+++ b/browser/components/firefoxview/content/empty-chat.svg
@@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" id="emptyChat" width="16" height="16" viewBox="0 0 16 16" fill="none">
+  <path fill="url(#a)" d="m13.886 1.429.685.685v8.343l-.685.686h-2.172a.57.57 0 0 0-.571.571v2.456L7.67 11.393a1.14 1.14 0 0 0-.714-.25H2.114l-.685-.686V2.114l.685-.685ZM13.714 0H2.286A2.286 2.286 0 0 0 0 2.286v8a2.286 2.286 0 0 0 2.286 2.285h4.571L11.143 16h1.428v-3.429h1.143A2.286 2.286 0 0 0 16 10.286v-8A2.286 2.286 0 0 0 13.714 0" style="fill:url(#a);stroke-width:1.14285"/>
+  <defs>
+    <linearGradient id="a" x1="0" x2="14" y1="7" y2="7" gradientTransform="scale(1.14286)" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#8341ca"/>
+      <stop offset="1" stop-color="#656fff"/>
+    </linearGradient>
+  </defs>
+</svg>
\ No newline at end of file
diff --git a/browser/components/firefoxview/content/view-chats.svg b/browser/components/firefoxview/content/view-chats.svg
new file mode 100644
index 0000000000000..038992168fde8
--- /dev/null
+++ b/browser/components/firefoxview/content/view-chats.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" id="viewChats" width="16" height="16" viewBox="0 0 16 16" fill="context-fill">
+  <path fill-rule="evenodd" d="M13.714 0H2.286C1.68 0 1.098.241.67.67L.518.837A2.3 2.3 0 0 0 0 2.286v8c0 .606.241 1.187.67 1.616l.167.152c.407.333.918.517 1.449.517h4.571L11.143 16h1.428v-3.429h1.143A2.286 2.286 0 0 0 16 10.286v-8A2.286 2.286 0 0 0 13.714 0M1.43 2.114l.685-.685h11.772l.685.685v8.344l-.685.685h-2.172a.57.57 0 0 0-.571.571v2.457L7.67 11.393a1.14 1.14 0 0 0-.715-.25H2.114l-.685-.685Zm12.457-.685v-.273q.111.017.216.056zm-2.315 3.428H4.43a.714.714 0 0 1 0-1.428h7.142a.714.714 0 1 1 0 1.428M10 7.571c0 .19-.075.372-.209.506l-.11.088a.7.7 0 0 1-.395.12H4.429a.7.7 0 0 1-.397-.12l-.109-.088a.715.715 0 0 1 .506-1.22h4.857a.715.715 0 0 1 .714.714" clip-rule="evenodd"/>
+</svg>
diff --git a/browser/components/firefoxview/firefoxview.html b/browser/components/firefoxview/firefoxview.html
index 99a030c61262c..262cc69da78eb 100644
--- a/browser/components/firefoxview/firefoxview.html
+++ b/browser/components/firefoxview/firefoxview.html
@@ -58,6 +58,14 @@
         iconSrc="chrome://browser/content/firefoxview/view-history.svg"
       >
       </moz-page-nav-button>
+      <moz-page-nav-button
+        view="chats"
+        id="firefoxview-chats-nav"
+        data-l10n-id="firefoxview-chats-nav"
+        iconSrc="chrome://browser/content/firefoxview/view-chats.svg"
+        hidden
+      >
+      </moz-page-nav-button>
     </moz-page-nav>
     <main id="pages" role="application" data-l10n-id="firefoxview-page-label">
       <div class="main-container">
@@ -87,6 +95,7 @@
             name="syncedtabs"
             type="page"
           ></view-syncedtabs>
+          <view-chats name="chats" type="page" hidden></view-chats>
         </named-deck>
       </div>
     </main>
diff --git a/browser/components/firefoxview/firefoxview.mjs b/browser/components/firefoxview/firefoxview.mjs
index e004b5346a095..d50b71db8e43f 100644
--- a/browser/components/firefoxview/firefoxview.mjs
+++ b/browser/components/firefoxview/firefoxview.mjs
@@ -21,6 +21,12 @@ let pageNav = null;
 let activeComponent = null;
 let searchKeyboardShortcut = null;
 
+const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+  AIWindow:
+    "moz-src:///browser/components/aiwindow/ui/modules/AIWindow.sys.mjs",
+});
+
 const { topChromeWindow } = window.browsingContext;
 
 function onHashChange() {
@@ -68,6 +74,7 @@ async function updateSearchTextboxSize() {
     { id: "firefoxview-search-text-box-recentlyclosed" },
     { id: "firefoxview-search-text-box-tabs" },
     { id: "firefoxview-search-text-box-history" },
+    { id: "firefoxview-search-text-box-chats" },
   ];
   let maxLength = 30;
   for (const msg of await document.l10n.formatMessages(msgs)) {
@@ -100,6 +107,12 @@ function updateSyncVisibility() {
 window.addEventListener("DOMContentLoaded", async () => {
   recordEnteredTelemetry();
 
+  if (isAIWindow()) {
+    await import("chrome://browser/content/firefoxview/chats.mjs");
+    document.getElementById("firefoxview-chats-nav").hidden = false;
+    document.querySelector("view-chats").hidden = false;
+  }
+
   pageNav = document.querySelector("moz-page-nav");
   viewsDeck = document.querySelector("named-deck");
 
@@ -192,3 +205,7 @@ function onLocalesChanged() {
     updateSearchKeyboardShortcut();
   });
 }
+
+function isAIWindow() {
+  return lazy.AIWindow.isAIWindowActiveAndEnabled(topChromeWindow);
+}
diff --git a/browser/components/firefoxview/jar.mn b/browser/components/firefoxview/jar.mn
index fb3ac508b2a76..e5da10dd53a1e 100644
--- a/browser/components/firefoxview/jar.mn
+++ b/browser/components/firefoxview/jar.mn
@@ -5,6 +5,9 @@
 browser.jar:
     content/browser/firefoxview/card-container.css
     content/browser/firefoxview/card-container.mjs
+    content/browser/firefoxview/chats.mjs
+    content/browser/firefoxview/chats-tab-list.css
+    content/browser/firefoxview/chats-tab-list.mjs
     content/browser/firefoxview/firefoxview.html
     content/browser/firefoxview/firefoxview.mjs
     content/browser/firefoxview/history.css
@@ -34,6 +37,8 @@ browser.jar:
     content/browser/firefoxview/synced-tabs-error.svg (content/synced-tabs-error.svg)
     content/browser/callout-tab-pickup.svg (content/callout-tab-pickup.svg)
     content/browser/callout-tab-pickup-dark.svg (content/callout-tab-pickup-dark.svg)
+    content/browser/firefoxview/empty-chat.svg (content/empty-chat.svg)
+    content/browser/firefoxview/view-chats.svg (content/view-chats.svg)
     content/browser/firefoxview/view-history.svg (content/view-history.svg)
     content/browser/firefoxview/view-opentabs.svg (content/view-opentabs.svg)
     content/browser/firefoxview/view-recentbrowsing.svg (content/view-recentbrowsing.svg)
diff --git a/browser/components/firefoxview/tests/browser/browser.toml b/browser/components/firefoxview/tests/browser/browser.toml
index c4237a5744f12..7189237fd02b8 100644
--- a/browser/components/firefoxview/tests/browser/browser.toml
+++ b/browser/components/firefoxview/tests/browser/browser.toml
@@ -6,6 +6,8 @@ prefs = [
   "browser.tabs.firefox-view.logLevel=All",
 ]
 
+["browser_chats_firefoxview.js"]
+
 ["browser_dragDrop_after_opening_fxViewTab.js"]
 skip-if = [
   "!headless", # Bug 1936459
diff --git a/browser/components/firefoxview/tests/browser/browser_chats_firefoxview.js b/browser/components/firefoxview/tests/browser/browser_chats_firefoxview.js
new file mode 100644
index 0000000000000..a2fee8de27455
--- /dev/null
+++ b/browser/components/firefoxview/tests/browser/browser_chats_firefoxview.js
@@ -0,0 +1,455 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const { ChatStore, ChatConversation } = ChromeUtils.importESModule(
+  "moz-src:///browser/components/aiwindow/ui/modules/ChatStore.sys.mjs"
+);
+// AIWindow is provided by the test environment (e.g. head.js or the browser window); do not import it here.
+
+const TEST_URL1 = "https://example.com/";
+const TEST_URL2 = "https://mozilla.org/";
+const DAY_MS = 24 * 60 * 60 * 1000;
+
+let gChatStore;
+let gAIWindow;
+
+/**
+ * Creates a test chat conversation with optional parameters.
+ *
+ * @param {object} options - Configuration options for the test chat
+ * @param {string} [options.title="Test Chat"] - Title of the chat
+ * @param {string} [options.url=TEST_URL1] - URL associated with the chat
+ * @param {Date} [options.createdDate=new Date()] - When the chat was created
+ * @param {Date} [options.updatedDate=createdDate] - When the chat was last updated
+ * @param {number} [options.messageCount=1] - Number of message pairs to add
+ * @returns {Promise<ChatConversation>} The created conversation object
+ */
+async function addTestChat(options = {}) {
+  const {
+    title = "Test Chat",
+    url = TEST_URL1,
+    createdDate = new Date(),
+    updatedDate = createdDate,
+    messageCount = 1,
+  } = options;
+
+  const conversation = new ChatConversation({
+    createdDate: createdDate.getTime(),
+    updatedDate: updatedDate.getTime(),
+    pageUrl: url ? new URL(url) : null,
+  });
+  conversation.title = title;
+
+  for (let i = 0; i < messageCount; i++) {
+    conversation.addUserMessage(
+      `Test message ${i + 1}`,
+      url ? new URL(url) : null
+    );
+    conversation.addAssistantMessage("text", `Assistant response ${i + 1}`);
+  }
+
+  await gChatStore.updateConversation(conversation);
+  return conversation;
+}
+
+/**
+ * Creates a test chat conversation without an associated URL.
+ *
+ * @param {object} options - Configuration options for the test chat
+ * @returns {Promise<ChatConversation>} The created conversation object
+ */
+async function addTestChatWithoutUrl(options = {}) {
+  return addTestChat({ ...options, url: null });
+}
+
+/**
+ * Gets the rendered chat lists from the chats view.
+ *
+ * @param {Browser} browser - The browser containing the Firefox View
+ * @returns {Promise<Array>} Array of chat list elements
+ */
+async function getChatsList(browser) {
+  const { document } = browser.contentWindow;
+  const chatsView = document.querySelector("view-chats");
+  await TestUtils.waitForCondition(
+    () => chatsView && chatsView.lists?.length,
+    "Waiting for chats lists to render"
+  );
+  return chatsView.lists;
+}
+
+/**
+ * Opens a new AI Window and waits for it to be ready.
+ * The AI Window has the "ai-window" attribute on its document element,
+ * which enables AI-specific features in Firefox View.
+ *
+ * @returns {Promise<Window>} The opened AI Window
+ */
+async function openAIWindow() {
+  const win = await BrowserTestUtils.openNewBrowserWindow({ aiWindow: true });
+  await BrowserTestUtils.waitForMutationCondition(
+    win.document.documentElement,
+    { attributes: true },
+    () => win.document.documentElement.hasAttribute("ai-window")
+  );
+  return win;
+}
+
+/**
+ * Waits for the chats navigation button to become visible in Firefox View.
+ * The chats nav is only shown when an AI Window is active.
+ *
+ * @param {Document} document - The Firefox View document
+ */
+async function waitForChatsNavVisible(document) {
+  await TestUtils.waitForCondition(() => {
+    const chatsNav = document.getElementById("firefoxview-chats-nav");
+    return chatsNav && !chatsNav.hidden;
+  }, "Waiting for chats navigation button to be visible");
+}
+
+/**
+ * Waits for the chats view to render with the expected number of chat items.
+ * This waits for both the controller cache to be ready and the DOM to render.
+ *
+ * @param {Browser} browser - The browser containing the Firefox View
+ * @param {number} expectedCount - The expected number of chat items to render
+ */
+async function waitForChatsReady(browser, expectedCount) {
+  const { document } = browser.contentWindow;
+  const chatsView = document.querySelector("view-chats");
+
+  // Wait for controller to update
+  await TestUtils.waitForCondition(
+    () => chatsView.controller && chatsView.controller.cache.entries,
+    "Waiting for controller cache to be ready"
+  );
+
+  // Wait for lists to render with expected count
+  await TestUtils.waitForCondition(
+    () => {
+      const lists = chatsView.lists;
+      if (!lists || !lists.length) {
+        return false;
+      }
+      const totalItems = Array.from(lists).reduce(
+        (sum, list) => sum + (list.rowEls?.length || 0),
+        0
+      );
+      return totalItems === expectedCount;
+    },
+    `Waiting for ${expectedCount} chat items to render`,
+    200,
+    100
+  );
+}
+
+add_setup(async function () {
+  // Enable AI Window feature
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["browser.aiwindow.enabled", true],
+      ["browser.aiwindow.chatHistory.enabled", true],
+      ["browser.aiwindow.firstrun.hasCompleted", true],
+    ],
+  });
+
+  // Open an AI Window so Firefox View detects AI Window is active
+  gAIWindow = await openAIWindow();
+
+  gChatStore = AIWindow.chatStore;
+
+  // Clean database before tests
+  await gChatStore.destroyDatabase();
+
+  registerCleanupFunction(async () => {
+    await gChatStore.destroyDatabase();
+    if (gAIWindow) {
+      await BrowserTestUtils.closeWindow(gAIWindow);
+    }
+  });
+});
+
+add_task(async function test_chats_view_renders() {
+  await withFirefoxView({}, async browser => {
+    const { document } = browser.contentWindow;
+
+    await waitForChatsNavVisible(document);
+    await navigateToViewAndWait(document, "chats");
+
+    const chatsView = document.querySelector("view-chats");
+    Assert.ok(chatsView, "Chats view should be rendered");
+
+    // Wait for view to fully render
+    await TestUtils.waitForCondition(() => {
+      const emptyState = chatsView.emptyState;
+      return emptyState && BrowserTestUtils.isVisible(emptyState);
+    }, "Waiting for empty state to be visible");
+
+    const emptyState = chatsView.emptyState;
+    Assert.ok(emptyState, "Empty state element should exist");
+    Assert.ok(
+      BrowserTestUtils.isVisible(emptyState),
+      "Empty state should be visible when no chats exist"
+    );
+  });
+});
+
+add_task(async function test_chat_list_displays_items() {
+  const chat1 = await addTestChat({
+    title: "Chat with example.com",
+    url: TEST_URL1,
+  });
+  const chat2 = await addTestChat({
+    title: "Chat with example.org",
+    url: TEST_URL2,
+  });
+
+  await withFirefoxView({}, async browser => {
+    const { document } = browser.contentWindow;
+    await waitForChatsNavVisible(document);
+    await navigateToViewAndWait(document, "chats");
+
+    await waitForChatsReady(browser, 2);
+
+    const lists = await getChatsList(browser);
+    Assert.ok(lists.length, "At least one card should be rendered");
+
+    const totalItems = Array.from(lists).reduce(
+      (sum, list) => sum + list.rowEls.length,
+      0
+    );
+    Assert.equal(totalItems, 2, "Should display 2 chat items");
+
+    const firstRow = lists[0].rowEls[0];
+    const titleEl = firstRow.shadowRoot.querySelector(".fxview-tab-row-title");
+    Assert.ok(titleEl, "Chat should have title element");
+    Assert.ok(
+      titleEl.textContent.includes("Chat"),
+      "Chat title should be displayed"
+    );
+  });
+
+  await gChatStore.deleteConversationById(chat1.id);
+  await gChatStore.deleteConversationById(chat2.id);
+});
+
+add_task(async function test_chat_with_url_has_icon() {
+  const chat = await addTestChat({
+    title: "Chat with favicon",
+    url: TEST_URL1,
+  });
+
+  await withFirefoxView({}, async browser => {
+    const { document } = browser.contentWindow;
+    await waitForChatsNavVisible(document);
+    await navigateToViewAndWait(document, "chats");
+
+    await waitForChatsReady(browser, 1);
+
+    const lists = await getChatsList(browser);
+    const firstRow = lists[0].rowEls[0];
+    const icon = firstRow.shadowRoot.querySelector(".fxview-tab-row-favicon");
+
+    Assert.ok(icon, "Chat item should have favicon element");
+    const hasBackgroundImage =
+      icon.style.backgroundImage &&
+      icon.style.backgroundImage !== "none" &&
+      icon.style.backgroundImage !== '""';
+    Assert.ok(hasBackgroundImage, "Favicon should have a background image set");
+  });
+
+  await gChatStore.deleteConversationById(chat.id);
+});
+
+add_task(async function test_chat_without_url_displays() {
+  const chat = await addTestChatWithoutUrl({
+    title: "Chat without URL",
+  });
+
+  await withFirefoxView({}, async browser => {
+    const { document } = browser.contentWindow;
+    await waitForChatsNavVisible(document);
+    await navigateToViewAndWait(document, "chats");
+
+    await waitForChatsReady(browser, 1);
+
+    const lists = await getChatsList(browser);
+    Assert.ok(lists.length, "Should have at least one card");
+
+    const firstRow = lists[0].rowEls[0];
+    Assert.ok(firstRow, "Chat item should be displayed");
+
+    const titleEl = firstRow.shadowRoot.querySelector(".fxview-tab-row-title");
+    Assert.ok(
+      titleEl.textContent.includes("Chat without URL"),
+      "Chat title should be displayed for chat without URL"
+    );
+  });
+
+  await gChatStore.deleteConversationById(chat.id);
+});
+
+add_task(async function test_date_grouping_today() {
+  const chat = await addTestChat({
+    title: "Today's chat",
+    updatedDate: new Date(),
+  });
+
+  await withFirefoxView({}, async browser => {
+    const { document } = browser.contentWindow;
+    await waitForChatsNavVisible(document);
+    await navigateToViewAndWait(document, "chats");
+
+    await waitForChatsReady(browser, 1);
+
+    const lists = await getChatsList(browser);
+    Assert.greater(lists.length, 0, "Should have chat list for today");
+    Assert.equal(
+      lists[0].rowEls.length,
+      1,
+      "Should have 1 chat in today's list"
+    );
+  });
+
+  await gChatStore.deleteConversationById(chat.id);
+});
+
+add_task(async function test_date_grouping_yesterday() {
+  const yesterday = new Date(Date.now() - DAY_MS);
+  const chat = await addTestChat({
+    title: "Yesterday's chat",
+    updatedDate: yesterday,
+  });
+
+  await withFirefoxView({}, async browser => {
+    const { document } = browser.contentWindow;
+    await waitForChatsNavVisible(document);
+    await navigateToViewAndWait(document, "chats");
+
+    await waitForChatsReady(browser, 1);
+
+    const lists = await getChatsList(browser);
+    Assert.equal(
+      lists[0].rowEls.length,
+      1,
+      "Should have 1 chat from yesterday"
+    );
+  });
+
+  await gChatStore.deleteConversationById(chat.id);
+});
+
+add_task(async function test_chat_with_url_opens_sidebar() {
+  requestLongerTimeout(2);
+
+  const { AIWindowUI } = ChromeUtils.importESModule(
+    "moz-src:///browser/components/aiwindow/ui/modules/AIWindowUI.sys.mjs"
+  );
+
+  const chat = await addTestChat({
+    title: "Chat with URL for sidebar",
+    url: TEST_URL1,
+  });
+
+  await withFirefoxView({}, async browser => {
+    const { document } = browser.contentWindow;
+    await waitForChatsNavVisible(document);
+    await navigateToViewAndWait(document, "chats");
+
+    await waitForChatsReady(browser, 1);
+
+    const lists = await getChatsList(browser);
+    const firstRow = lists[0].rowEls[0];
+
+    // Verify the chat has a URL (which determines sidebar vs fullpage)
+    const conversation = await gChatStore.findConversationById(chat.id);
+    const mostRecentPage = conversation.getMostRecentPageVisited();
+    Assert.ok(mostRecentPage?.href, "Chat should have a URL for sidebar mode");
+    Assert.equal(
+      mostRecentPage.href,
+      TEST_URL1,
+      "Chat should have the correct URL"
+    );
+
+    const tabBrowser = browser.getTabBrowser();
+
+    const mainEl = firstRow.shadowRoot.querySelector(".fxview-tab-row-main");
+    const tabOpenedPromise = BrowserTestUtils.waitForNewTab(
+      tabBrowser,
+      TEST_URL1
+    );
+    EventUtils.synthesizeMouseAtCenter(mainEl, {}, browser.contentWindow);
+
+    const newTab = await tabOpenedPromise;
+    await BrowserTestUtils.browserLoaded(newTab.linkedBrowser);
+
+    // Verify the new tab loaded the URL
+    Assert.ok(
+      newTab.linkedBrowser.currentURI.spec.includes("example.com"),
+      "New tab should load the page URL"
+    );
+
+    // Wait for sidebar to open with longer timeout
+    await TestUtils.waitForCondition(
+      () => AIWindowUI.isSidebarOpen(newTab.ownerGlobal),
+      "Waiting for sidebar to open",
+      5000,
+      100
+    );
+
+    Assert.ok(
+      AIWindowUI.isSidebarOpen(newTab.ownerGlobal),
+      "Sidebar should be open in the new tab"
+    );
+
+    // Clean up
+    BrowserTestUtils.removeTab(newTab);
+  });
+
+  await gChatStore.deleteConversationById(chat.id);
+});
+
+add_task(async function test_delete_chat() {
+  const chat = await addTestChat({ title: "Chat to Delete" });
+
+  await withFirefoxView({}, async browser => {
+    const { document } = browser.contentWindow;
+    await waitForChatsNavVisible(document);
+    await navigateToViewAndWait(document, "chats");
+
+    await waitForChatsReady(browser, 1);
+
+    let lists = await getChatsList(browser);
+    Assert.equal(
+      lists[0].rowEls.length,
+      1,
+      "Should have 1 chat before deletion"
+    );
+
+    const chatsView = document.querySelector("view-chats");
+    const firstRow = lists[0].rowEls[0];
+
+    chatsView.triggerNode = firstRow;
+    await chatsView.controller.deleteChat();
+
+    // Wait for controller cache to update
+    await TestUtils.waitForCondition(
+      () => {
+        const cache = chatsView.controller.cache;
+        return (
+          !cache.entries ||
+          cache.entries.length === 0 ||
+          cache.entries.every(e => e.items.length === 0)
+        );
+      },
+      "Waiting for cache to reflect deletion",
+      200,
+      50
+    );
+
+    // Verify chat was deleted from database
+    const deletedChat = await gChatStore.findConversationById(chat.id);
+    Assert.equal(deletedChat, null, "Chat should be deleted from database");
+  });
+});
diff --git a/browser/locales/en-US/browser/firefoxView.ftl b/browser/locales/en-US/browser/firefoxView.ftl
index 2cc71acb274a7..af71fa7b3344a 100644
--- a/browser/locales/en-US/browser/firefoxView.ftl
+++ b/browser/locales/en-US/browser/firefoxView.ftl
@@ -109,6 +109,15 @@ firefoxview-synced-tabs-nav = Tabs from other devices
   .title = Tabs from other devices
 firefoxview-synced-tabs-header = Tabs from other devices
 
+## Chats in this context refers to chats saved from the AI Window Assistant
+
+firefoxview-chats-nav = Chats
+  .title = Chats
+firefoxview-chats-header = Chats
+
+firefoxview-chat-context-delete = Delete from Chats
+    .accesskey = D
+
 ##
 
 # Used for a link in collapsible cards, in the ’Recent browsing’ page of Firefox View
@@ -151,6 +160,10 @@ firefoxview-search-text-box-tabs =
 firefoxview-search-text-box-opentabs =
   .placeholder = Search open tabs
 
+# Placeholder for the input field to search in open tabs ("search" is a verb).
+firefoxview-search-text-box-chats =
+  .placeholder = Search chats
+
 # "Search" is a noun (as in "Results of the search for")
 # Variables:
 #   $query (String) - The search query used for searching through browser history.
@@ -190,6 +203,14 @@ firefoxview-history-site-localhost = (local files)
 
 firefoxview-show-all-history = Show all history
 
+## Variables:
+##   $date (string) - Date to be formatted based on locale
+
+firefoxview-chat-date-today = Today - { DATETIME($date, dateStyle: "full") }
+firefoxview-chat-date-yesterday = Yesterday - { DATETIME($date, dateStyle: "full") }
+firefoxview-chat-date-this-month = { DATETIME($date, dateStyle: "full") }
+firefoxview-chat-date-prev-month = { DATETIME($date, month: "long", year: "numeric") }
+
 ## Message displayed in Firefox View when the user has no history data
 
 firefoxview-history-empty-header = Get back to where you’ve been

From 3cc49bdcba20faab9a48dc6bccab02acc6e36d7c Mon Sep 17 00:00:00 2001
From: Julian Descottes <jdescottes@mozilla.com>
Date: Thu, 29 Jan 2026 17:51:46 +0000
Subject: [PATCH 103/116] Bug 2012028 - [devtools] Skip
 browser_touch_all_events_long_tap.js on linux r=devtools-reviewers,nchevobbe

Differential Revision: https://phabricator.services.mozilla.com/D280977
---
 devtools/client/responsive/test/browser/browser.toml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/devtools/client/responsive/test/browser/browser.toml b/devtools/client/responsive/test/browser/browser.toml
index d557f64f42f2d..4f009f0fc7a5a 100644
--- a/devtools/client/responsive/test/browser/browser.toml
+++ b/devtools/client/responsive/test/browser/browser.toml
@@ -192,9 +192,7 @@ skip-if = [
 ["browser_touch_all_events_long_tap.js"]
 skip-if = [
   "a11y_checks",
-  "os == 'linux' && os_version == '24.04' && arch == 'x86_64' && display == 'x11' && asan", # Bug 1980013
-  "os == 'linux' && os_version == '24.04' && arch == 'x86_64' && display == 'x11' && debug", # Bug 1980013
-  "os == 'linux' && os_version == '24.04' && arch == 'x86_64' && display == 'x11' && tsan", # Bug 1980013
+  "os == 'linux' && os_version == '24.04' && arch == 'x86_64' && display == 'x11'", # Bug 2012028, Frequently failing on all linux variants
   "os == 'mac' && os_version == '14.70' && arch == 'x86_64' && debug", # Bug 1980013
   "os == 'mac' && os_version == '14.70' && arch == 'x86_64' && verify", # can be too slow in chaos mode to trigger dblclick events
   "os == 'win'", # Bug 1977557 and Bug 1977558

From 3f2d7d734203145e001f5cd40b09996c758dfd96 Mon Sep 17 00:00:00 2001
From: Giulia Cardieri <gcardieri@mozilla.com>
Date: Thu, 29 Jan 2026 17:55:58 +0000
Subject: [PATCH 104/116] Bug 2011554 - Hide navbar items for firstrun and new
 tab on vertical tabs r=Gijs,ai-frontend-reviewers

Figma
- New tab: https://www.figma.com/design/5KuePTGmOEUFyCHBHCsGim/AI-Mode-%E2%80%94%C2%A0MVP-Scope-Design?node-id=1-32143&p=f&m=dev
- First run: https://www.figma.com/design/5KuePTGmOEUFyCHBHCsGim/AI-Mode-%E2%80%94%C2%A0MVP-Scope-Design?node-id=16014-62500&p=f

Updates
- Hide ask button for new tab on both vertical/horizontal tabs -> we shouldn't open a second sidebar when the assistant is full page
- Hide navbar buttons according to Figma for vertical tabs first run and new tab
- Add opacity and pointer-events: none for vertical tabs

Differential Revision: https://phabricator.services.mozilla.com/D280449
---
 browser/themes/shared/browser-shared.css | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
index 058233a7646cd..f454c39e7583d 100644
--- a/browser/themes/shared/browser-shared.css
+++ b/browser/themes/shared/browser-shared.css
@@ -1447,7 +1447,7 @@ popupnotificationcontent {
   }
 }
 
-/* AI window immersive view (hidden address bar and buttons) */
+/* AI window immersive view (hidden nav bar and buttons) */
 :root[ai-window][aiwindow-immersive-view] {
   #nav-bar:not(.browser-titlebar) {
     height: 0;
@@ -1455,12 +1455,28 @@ popupnotificationcontent {
     visibility: hidden;
   }
 
+  #urlbar-container,
+  #aiwindow-ask-button,
+  #nav-bar-customization-target > *:not(#sidebar-button),
+  #nav-bar-overflow-button,
+  #PanelUI-button {
+    visibility: hidden;
+  }
+
   /* immersive view styles exclusive for first run */
   &[aiwindow-first-run] {
-    .toolbar-items {
+    #TabsToolbar > .toolbar-items {
       opacity: 0.2;
       pointer-events: none;
     }
+
+    /* stylelint-disable-next-line media-query-no-invalid */
+    @media -moz-pref("sidebar.verticalTabs") {
+      #sidebar-main {
+        opacity: 0.2;
+        pointer-events: none;
+      }
+    }
   }
 }
 

From dd4f67f464661cd1a965e2108f266975e5c89e43 Mon Sep 17 00:00:00 2001
From: kpatenio <kpatenio@mozilla.com>
Date: Thu, 29 Jan 2026 17:56:41 +0000
Subject: [PATCH 105/116] =?UTF-8?q?Bug=202009534=20=E2=80=94=20update=20co?=
 =?UTF-8?q?nnected/disconnected=20state=20UI=20for=20ip=20protection.=20r?=
 =?UTF-8?q?=3Ddesktop-theme-reviewers,ip-protection-reviewers,fluent-revie?=
 =?UTF-8?q?wers,dao,flod,fchasen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Uses ipprotection-status-box component to create disconnected / connected states
- Replaces moz-box-group and items with new disconnected / connected lit templates in ipprotection-status-card.mjs
- Modifies tests to query the turn on / off buttons instead of old toggle
- Removes unused fluent ids

Differential Revision: https://phabricator.services.mozilla.com/D280512
---
 .../content/ipprotection-content.css          |   1 +
 .../content/ipprotection-content.mjs          |   3 -
 .../content/ipprotection-status-box.css       |  48 ++-
 .../content/ipprotection-status-box.mjs       |  18 +-
 .../content/ipprotection-status-card.mjs      | 201 ++++--------
 .../browser/browser_IPProtectionService.js    |  43 +--
 ...rowser_ipprotection_keyboard_navigation.js |   7 +-
 .../browser_ipprotection_status_card.js       | 304 ++++++------------
 .../browser/browser_ipprotection_telemetry.js |  21 +-
 .../browser/browser_ipprotection_toolbar.js   |  18 +-
 browser/locales-preview/ipProtection.ftl      |  18 +-
 11 files changed, 272 insertions(+), 410 deletions(-)

diff --git a/browser/components/ipprotection/content/ipprotection-content.css b/browser/components/ipprotection/content/ipprotection-content.css
index ea438728d42ad..79456113d3bb9 100644
--- a/browser/components/ipprotection/content/ipprotection-content.css
+++ b/browser/components/ipprotection/content/ipprotection-content.css
@@ -96,6 +96,7 @@ hr {
   display: flex;
   justify-content: space-between;
   margin-inline: var(--space-xlarge);
+  padding-block: var(--space-large);
 }
 
 #site-exclusion-icon {
diff --git a/browser/components/ipprotection/content/ipprotection-content.mjs b/browser/components/ipprotection/content/ipprotection-content.mjs
index 4a2a0af1089a4..dc2928147237c 100644
--- a/browser/components/ipprotection/content/ipprotection-content.mjs
+++ b/browser/components/ipprotection/content/ipprotection-content.mjs
@@ -41,9 +41,6 @@ export default class IPProtectionContentElement extends MozLitElement {
     state: { type: Object, attribute: false },
     _showMessageBar: { type: Boolean, state: true },
     _messageDismissed: { type: Boolean, state: true },
-    // Track toggle state separately so that we can tell when the toggle
-    // is enabled because of the existing protection state or because of user action.
-    _toggleEnabled: { type: Boolean, state: true },
   };
 
   constructor() {
diff --git a/browser/components/ipprotection/content/ipprotection-status-box.css b/browser/components/ipprotection/content/ipprotection-status-box.css
index 9cecaa96572db..8317cda6b9fc7 100644
--- a/browser/components/ipprotection/content/ipprotection-status-box.css
+++ b/browser/components/ipprotection/content/ipprotection-status-box.css
@@ -12,16 +12,32 @@
   background-color: var(--background-color-box-info);
 }
 
+.connected {
+  background-color: var(--background-color-success);
+
+  ::slotted([slot="icon"]) {
+    -moz-context-properties: fill;
+    fill: var(--icon-color-success);
+  }
+}
+
 #content-container {
+  display: flex;
+  flex-direction: column;
   margin-inline: var(--space-small);
   border-radius: var(--border-radius-medium);
   padding: var(--space-medium);
 }
 
-#title {
+#header {
+  display: flex;
+  justify-content: space-between;
   /* Intentionally using a larger font size for clearer visual hierarchy */
   /* stylelint-disable-next-line stylelint-plugin-mozilla/use-design-tokens */
-  font-size: 1.8em;
+  font-size: 1.4lh;
+}
+
+#title {
   font-weight: var(--font-weight-semibold);
   padding-bottom: var(--space-xsmall);
   margin-block: 0;
@@ -34,7 +50,35 @@
   color: var(--text-color-deemphasized);
 }
 
+#content {
+  display: flex;
+  flex-direction: column;
+}
+
+#bandwidth,
+#location {
+  display: flex;
+  align-items: center;
+  gap: var(--space-xsmall);
+  margin-top: var(--space-xsmall);
+}
+
 ::slotted([slot="content"]) {
   border-top: var(--border-width) solid var(--border-color-deemphasized);
   margin-top: var(--space-large);
 }
+
+::slotted([slot="location-icon"]) {
+  -moz-context-properties: fill;
+  fill: currentColor;
+}
+
+::slotted([slot="bandwidth"]),
+::slotted([slot="location"]) {
+  color: var(--text-color-deemphasized);
+}
+
+::slotted([slot="action"]) {
+  align-self: flex-end;
+  margin-block-start: var(--space-large);
+}
diff --git a/browser/components/ipprotection/content/ipprotection-status-box.mjs b/browser/components/ipprotection/content/ipprotection-status-box.mjs
index 34992ff1993ac..56657ca6b78d2 100644
--- a/browser/components/ipprotection/content/ipprotection-status-box.mjs
+++ b/browser/components/ipprotection/content/ipprotection-status-box.mjs
@@ -5,8 +5,11 @@
 import { MozLitElement } from "chrome://global/content/lit-utils.mjs";
 import { html } from "chrome://global/content/vendor/lit.all.mjs";
 
+// eslint-disable-next-line import/no-unassigned-import
+import "chrome://browser/content/ipprotection/ipprotection-status-box.mjs";
+
 /**
- * Custom element that implements a status card for IP protection.
+ * Custom element that implements the state UI for the status card.
  */
 export default class IPProtectionStatusBox extends MozLitElement {
   static queries = {
@@ -82,8 +85,17 @@ export default class IPProtectionStatusBox extends MozLitElement {
           <slot name="icon"></slot>
         </span>
         <div id="content">
-          <span id="description" data-l10n-id=${this.descriptionL10nId}></span>
-          <slot name="location"></slot>
+          ${this.descriptionL10nId
+            ? html`<span
+                id="description"
+                data-l10n-id=${this.descriptionL10nId}
+              ></span>`
+            : null}
+          <slot name="bandwidth"></slot>
+          <div id="location">
+            <slot name="location-icon"></slot>
+            <slot name="location"></slot>
+          </div>
         </div>
         <slot name="action"></slot>
         <slot name="content"></slot>
diff --git a/browser/components/ipprotection/content/ipprotection-status-card.mjs b/browser/components/ipprotection/content/ipprotection-status-card.mjs
index 36f246f89911e..43d51170f4f98 100644
--- a/browser/components/ipprotection/content/ipprotection-status-card.mjs
+++ b/browser/components/ipprotection/content/ipprotection-status-card.mjs
@@ -3,11 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import { MozLitElement } from "chrome://global/content/lit-utils.mjs";
-import {
-  html,
-  classMap,
-  styleMap,
-} from "chrome://global/content/vendor/lit.all.mjs";
+import { html } from "chrome://global/content/vendor/lit.all.mjs";
 
 // eslint-disable-next-line import/no-unassigned-import
 import "chrome://global/content/elements/moz-toggle.mjs";
@@ -22,10 +18,8 @@ export default class IPProtectionStatusCard extends MozLitElement {
   TOGGLE_OFF_EVENT = "ipprotection-status-card:user-toggled-off";
 
   static queries = {
-    statusGroupEl: "#status-card",
-    connectionToggleEl: "#connection-toggle",
-    connectionButtonEl: "#connection-toggle-button",
-    locationEl: "#location-wrapper",
+    statusBoxEl: "ipprotection-status-box",
+    actionButtonEl: 'moz-button[slot="action"]',
   };
 
   static shadowRootOptions = {
@@ -35,12 +29,8 @@ export default class IPProtectionStatusCard extends MozLitElement {
 
   static properties = {
     protectionEnabled: { type: Boolean },
-    canShowTime: { type: Boolean },
     enabledSince: { type: Object },
     location: { type: Object },
-    // Track toggle state separately so that we can tell when the toggle
-    // is enabled because of the existing protection state or because of user action.
-    _toggleEnabled: { type: Boolean, state: true },
     bandwidthUsage: { type: Object },
   };
 
@@ -60,32 +50,8 @@ export default class IPProtectionStatusCard extends MozLitElement {
     this.removeEventListener("keydown", this.keyListener, { capture: true });
   }
 
-  handleToggleConnect(event) {
-    let isEnabled = event.target.pressed;
-
-    if (isEnabled) {
-      this.dispatchEvent(
-        new CustomEvent(this.TOGGLE_ON_EVENT, {
-          bubbles: true,
-          composed: true,
-        })
-      );
-    } else {
-      this.dispatchEvent(
-        new CustomEvent(this.TOGGLE_OFF_EVENT, {
-          bubbles: true,
-          composed: true,
-        })
-      );
-    }
-
-    this._toggleEnabled = isEnabled;
-  }
-
-  handleOnOffButtonClick() {
-    let isEnabled = !this._toggleEnabled;
-
-    if (isEnabled) {
+  handleButtonClick() {
+    if (!this.protectionEnabled) {
       this.dispatchEvent(
         new CustomEvent(this.TOGGLE_ON_EVENT, {
           bubbles: true,
@@ -100,12 +66,11 @@ export default class IPProtectionStatusCard extends MozLitElement {
         })
       );
     }
-
-    this._toggleEnabled = isEnabled;
   }
 
   focus() {
-    this.connectionToggleEl?.focus();
+    const button = this.shadowRoot.querySelector(`moz-button[slot="action"]`);
+    button?.focus();
   }
 
   #keyListener(event) {
@@ -132,105 +97,79 @@ export default class IPProtectionStatusCard extends MozLitElement {
     }
   }
 
-  updated(changedProperties) {
-    super.updated(changedProperties);
-
-    // If the toggle state isn't set, do so now and let it
-    // match the protection state.
-    if (!changedProperties.has("_toggleEnabled")) {
-      this._toggleEnabled = this.protectionEnabled;
-    }
-
-    if (!this.protectionEnabled && this._toggleEnabled) {
-      // After pressing the toggle, if somehow protection was turned off
-      // (eg. error thrown), unset the toggle.
-      this._toggleEnabled = false;
-    }
+  bandwidthUsageTemplate() {
+    return this.bandwidthUsage
+      ? html`<bandwidth-usage
+          slot="bandwidth"
+          value=${this.bandwidthUsage.currentBandwidthUsage}
+          max=${this.bandwidthUsage.maxBandwidth}
+          numeric
+        ></bandwidth-usage>`
+      : null;
   }
 
-  cardContentTemplate() {
-    const statusCardL10nId = this.protectionEnabled
-      ? "ipprotection-connection-status-on"
-      : "ipprotection-connection-status-off";
-    const toggleL10nId = this.protectionEnabled
-      ? "ipprotection-toggle-active"
-      : "ipprotection-toggle-inactive";
-    const toggleButtonType = this.protectionEnabled ? "secondary" : "primary";
-    const toggleButtonL10nId = this.protectionEnabled
-      ? "ipprotection-button-turn-vpn-off"
-      : "ipprotection-button-turn-vpn-on";
-
-    return html` <link
-        rel="stylesheet"
-        href="chrome://browser/content/ipprotection/ipprotection-status-card.css"
-      />
-      <moz-box-group class="vpn-status-group">
-        <moz-box-item
-          id="status-card"
-          class=${classMap({
-            "is-enabled": this.protectionEnabled,
-          })}
-          layout="default"
-          data-l10n-id=${statusCardL10nId}
-          .description=${this.cardDescriptionTemplate()}
-        >
-          <moz-toggle
-            id="connection-toggle"
-            data-l10n-id=${toggleL10nId}
-            @click=${this.handleToggleConnect}
-            ?pressed=${this._toggleEnabled}
-            slot="actions"
-          ></moz-toggle>
-        </moz-box-item>
-      </moz-box-group>
-      <moz-button
-        type=${toggleButtonType}
-        id="connection-toggle-button"
-        data-l10n-id=${toggleButtonL10nId}
-        @click=${this.handleOnOffButtonClick}
-        hidden
-      >
-      </moz-button>`;
+  locationTemplate() {
+    return this.location
+      ? html` <img
+            slot="location-icon"
+            role="presentation"
+            src="chrome://browser/skin/notification-icons/geo.svg"
+          />
+          <span slot="location">${this.location.name}</span>`
+      : null;
   }
 
-  cardDescriptionTemplate() {
-    // To work around mox-box-item description elements being hard to reach because of the shadowDOM,
-    // let's use a lit stylemap to apply style changes directly.
-    let labelStyles = styleMap({
-      display: "flex",
-      gap: "var(--space-small)",
-    });
-    let imgStyles = styleMap({
-      "-moz-context-properties": "fill",
-      fill: "currentColor",
-    });
-
+  statusTemplate({
+    type,
+    headerL10nId,
+    buttonL10nId,
+    buttonType = "default",
+    buttonDisabled = false,
+    iconSrc = null,
+  }) {
     return html`
-      <div id="vpn-details">
-        ${this.bandwidthUsage
-          ? html`<bandwidth-usage
-              value=${this.bandwidthUsage.currentBandwidthUsage}
-              max=${this.bandwidthUsage.maxBandwidth}
-              numeric
-            ></bandwidth-usage>`
+      <ipprotection-status-box .headerL10nId=${headerL10nId} .type=${type}>
+        ${iconSrc
+          ? html`<img
+              slot="icon"
+              role="presentation"
+              class="icon"
+              src=${iconSrc}
+            />`
           : null}
-        ${this.location
-          ? html`<div id="location-label" style=${labelStyles}>
-              <span>${this.location.name}</span>
-              <img
-                src="chrome://global/skin/icons/info.svg"
-                data-l10n-id="ipprotection-location-title"
-                style=${imgStyles}
-              />
-            </div>`
-          : null}
-      </div>
+        ${this.bandwidthUsageTemplate()} ${this.locationTemplate()}
+        <moz-button
+          slot="action"
+          type=${buttonType}
+          data-l10n-id=${buttonL10nId}
+          @click=${this.handleButtonClick}
+          ?disabled=${buttonDisabled}
+        ></moz-button>
+      </ipprotection-status-box>
     `;
   }
 
   render() {
-    let content = this.cardContentTemplate();
-    return html`${content}`;
+    if (this.protectionEnabled) {
+      return html`
+        ${this.statusTemplate({
+          type: "connected",
+          headerL10nId: "ipprotection-connection-status-connected",
+          buttonL10nId: "ipprotection-button-turn-vpn-off",
+          iconSrc:
+            "chrome://browser/content/ipprotection/assets/states/ipprotection-on.svg",
+        })}
+      `;
+    }
+
+    return html`
+      ${this.statusTemplate({
+        type: "disconnected",
+        headerL10nId: "ipprotection-connection-status-disconnected",
+        buttonL10nId: "ipprotection-button-turn-vpn-on",
+        buttonType: "primary",
+      })}
+    `;
   }
 }
 
diff --git a/browser/components/ipprotection/tests/browser/browser_IPProtectionService.js b/browser/components/ipprotection/tests/browser/browser_IPProtectionService.js
index 2274317ef04a7..ed208a40de615 100644
--- a/browser/components/ipprotection/tests/browser/browser_IPProtectionService.js
+++ b/browser/components/ipprotection/tests/browser/browser_IPProtectionService.js
@@ -159,11 +159,9 @@ add_task(
 
     let statusCard = content.statusCardEl;
 
-    // User is already signed in so the toggle should be available.
-    Assert.ok(
-      statusCard?.connectionToggleEl,
-      "Status card connection toggle should be present"
-    );
+    // User is already signed in so the turn on button should be available.
+    let turnOnButton = statusCard?.actionButtonEl;
+    Assert.ok(turnOnButton, "Status card turn on button should be present");
 
     cleanupService();
     await cleanupAlpha();
@@ -283,16 +281,11 @@ add_task(async function test_IPProtectionService_pass_errors() {
 
   let statusCard = content.statusCardEl;
 
-  let toggleChangedPromise = BrowserTestUtils.waitForMutationCondition(
-    statusCard.shadowRoot,
-    { childList: true, subtree: true },
-    () => !statusCard.toggleEnabled
-  );
+  let turnOnButton = statusCard.actionButtonEl;
 
-  statusCard.connectionToggleEl.click();
+  turnOnButton.click();
 
   await messageBarLoadedPromise;
-  await toggleChangedPromise;
 
   Assert.equal(
     IPPProxyManager.state,
@@ -303,8 +296,8 @@ add_task(async function test_IPProtectionService_pass_errors() {
   let messageBar = content.shadowRoot.querySelector("ipprotection-message-bar");
 
   Assert.ok(
-    !statusCard.connectionToggleEl.pressed,
-    "Toggle is still turned off because of an error"
+    turnOnButton,
+    "Turn on button is still present because of an error"
   );
   Assert.ok(messageBar, "Message bar should be present");
   Assert.equal(
@@ -356,7 +349,8 @@ add_task(async function test_IPProtectionService_retry_errors() {
     false,
     () => !!IPPProxyManager.activatedAt
   );
-  statusCard.connectionToggleEl.click();
+  let turnOnButton = statusCard.actionButtonEl;
+  turnOnButton.click();
 
   await startedEventPromise;
 
@@ -388,10 +382,8 @@ add_task(async function test_IPProtectionService_stop_on_signout() {
     BrowserTestUtils.isVisible(content),
     "ipprotection content component should be present"
   );
-  Assert.ok(
-    statusCard.connectionToggleEl,
-    "Status card connection toggle should be present"
-  );
+  let turnOnButton = statusCard.actionButtonEl;
+  Assert.ok(turnOnButton, "Status card turn on button should be present");
 
   let startedEventPromise = BrowserTestUtils.waitForEvent(
     IPPProxyManager,
@@ -399,7 +391,7 @@ add_task(async function test_IPProtectionService_stop_on_signout() {
     false,
     () => !!IPPProxyManager.activatedAt
   );
-  statusCard.connectionToggleEl.click();
+  turnOnButton.click();
 
   await startedEventPromise;
 
@@ -456,19 +448,18 @@ add_task(async function test_IPProtectionService_reload() {
     BrowserTestUtils.isVisible(content),
     "ipprotection content component should be present"
   );
-  Assert.ok(
-    statusCard.connectionToggleEl,
-    "Status card connection toggle should be present"
-  );
+  let turnOnButton = statusCard.actionButtonEl;
+  Assert.ok(turnOnButton, "Status card turn on button should be present");
 
   let tabReloaded = waitForTabReloaded(gBrowser.selectedTab);
-  statusCard.connectionToggleEl.click();
+  turnOnButton.click();
   await tabReloaded;
 
   Assert.equal(IPPProxyManager.state, IPPProxyStates.ACTIVE, "Proxy is active");
 
   tabReloaded = waitForTabReloaded(gBrowser.selectedTab);
-  statusCard.connectionToggleEl.click();
+  let turnOffButton = statusCard.actionButtonEl;
+  turnOffButton.click();
   await tabReloaded;
 
   Assert.notStrictEqual(
diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_keyboard_navigation.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_keyboard_navigation.js
index ff078785caf29..a6d1c50387349 100644
--- a/browser/components/ipprotection/tests/browser/browser_ipprotection_keyboard_navigation.js
+++ b/browser/components/ipprotection/tests/browser/browser_ipprotection_keyboard_navigation.js
@@ -60,8 +60,9 @@ add_task(async function test_keyboard_navigation_in_panel() {
   );
 
   let statusCard = content.statusCardEl;
+  let turnOnButton = statusCard.actionButtonEl;
 
-  await expectFocusAfterKey("Tab", statusCard.connectionToggleEl);
+  await expectFocusAfterKey("Tab", turnOnButton);
 
   await expectFocusAfterKey("Tab", content.settingsButtonEl);
 
@@ -72,7 +73,7 @@ add_task(async function test_keyboard_navigation_in_panel() {
       `#${IPProtectionPanel.HEADER_BUTTON_ID}`
     )
   );
-  await expectFocusAfterKey("Tab", statusCard.connectionToggleEl);
+  await expectFocusAfterKey("Tab", turnOnButton);
 
   await expectFocusAfterKey("Tab", content.settingsButtonEl);
 
@@ -83,7 +84,7 @@ add_task(async function test_keyboard_navigation_in_panel() {
       `#${IPProtectionPanel.HEADER_BUTTON_ID}`
     )
   );
-  await expectFocusAfterKey("ArrowDown", statusCard.connectionToggleEl);
+  await expectFocusAfterKey("ArrowDown", turnOnButton);
 
   // Loop backwards
   await expectFocusAfterKey(
diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js
index deaa24dcccc83..db1a7a3b3ea58 100644
--- a/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js
+++ b/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js
@@ -9,17 +9,17 @@ const { LINKS } = ChromeUtils.importESModule(
 );
 const lazy = {};
 
-ChromeUtils.defineESModuleGetters(lazy, {
-  IPProtectionWidget:
-    "moz-src:///browser/components/ipprotection/IPProtection.sys.mjs",
-  IPProtectionPanel:
-    "moz-src:///browser/components/ipprotection/IPProtectionPanel.sys.mjs",
-});
+const mockLocation = {
+  name: "United States",
+  code: "us",
+};
 
-/**
- * Tests UI updates to the status card in the panel after enable/disables.
- */
-add_task(async function test_status_card_in_panel() {
+const mockBandwidthUsage = {
+  currentBandwidthUsage: 50,
+  maxBandwidth: 150,
+};
+
+async function setupStatusCardTest() {
   setupService({
     isSignedIn: true,
     isEnrolledAndEntitled: true,
@@ -32,127 +32,65 @@ add_task(async function test_status_card_in_panel() {
   });
   await IPPEnrollAndEntitleManager.refetchEntitlement();
 
-  const l10nIdOn = "ipprotection-connection-status-on";
-  const l10nIdOff = "ipprotection-connection-status-off";
-  const mockLocation = {
-    name: "United States",
-    code: "us",
-  };
-
   await SpecialPowers.pushPrefEnv({
     set: [["browser.ipProtection.bandwidth.enabled", true]],
   });
+}
 
-  let content = await openPanel({
-    location: mockLocation,
-    bandwidthUsage: { currentBandwidthUsage: 50, maxBandwidth: 150 },
-  });
-
-  Assert.ok(
-    BrowserTestUtils.isVisible(content),
-    "ipprotection content component should be present"
-  );
-
-  let statusCard = content.statusCardEl;
-  Assert.ok(content.statusCardEl, "ipprotection-status-card should be present");
-
-  Assert.equal(
-    statusCard?.statusGroupEl.getAttribute("data-l10n-id"),
-    l10nIdOff,
-    "Status card connection toggle data-l10n-id should be correct by default"
-  );
-
-  const locationEl =
-    statusCard.statusGroupEl.shadowRoot.querySelector("#location-label");
+async function cleanupStatusCardTest() {
+  cleanupService();
+  await SpecialPowers.popPrefEnv();
+}
 
+function checkLocationAndBandwidth(statusBoxEl, location, bandwidth) {
+  const locationEl = statusBoxEl.shadowRoot
+    .querySelector(`slot[name="location"]`)
+    .assignedElements()[0];
   Assert.ok(
     BrowserTestUtils.isVisible(locationEl),
     "Location element should be present and visible"
   );
   Assert.equal(
     locationEl.textContent.trim(),
-    mockLocation.name,
+    location.name,
     "Location element should be showing correct location"
   );
 
-  // Set state as if protection is enabled
-  await setPanelState({
-    location: mockLocation,
-    isProtectionEnabled: true,
-  });
-
-  content.requestUpdate();
-
-  await content.updateComplete;
-
-  Assert.equal(
-    statusCard?.statusGroupEl.getAttribute("data-l10n-id"),
-    l10nIdOn,
-    "Status card connection toggle data-l10n-id should be correct when protection is enabled"
-  );
-
-  const bandwidthEl =
-    statusCard.statusGroupEl.shadowRoot.querySelector("bandwidth-usage");
+  const bandwidthEl = statusBoxEl.shadowRoot
+    .querySelector(`slot[name="bandwidth"]`)
+    .assignedElements()[0];
   Assert.ok(
     BrowserTestUtils.isVisible(bandwidthEl),
     "bandwidth-usage should be present and visible"
   );
-  Assert.equal(bandwidthEl.value, 50, "Bandwidth should have 50 GB used");
+  Assert.equal(
+    bandwidthEl.value,
+    bandwidth.currentBandwidthUsage,
+    `Bandwidth should have ${bandwidth.currentBandwidthUsage} GB used`
+  );
   Assert.equal(
     bandwidthEl.bandwidthLeft,
-    100,
-    "Bandwidth should have 100 GB left"
+    bandwidth.maxBandwidth - bandwidth.currentBandwidthUsage,
+    `Bandwidth should have ${bandwidth.maxBandwidth - bandwidth.currentBandwidthUsage} GB left`
   );
   Assert.equal(
     bandwidthEl.max,
-    150,
-    "Bandwidth should have a max value of 150"
+    bandwidth.maxBandwidth,
+    `Bandwidth should have a max value of ${bandwidth.maxBandwidth}`
   );
-
-  await closePanel();
-  cleanupService();
-});
+}
 
 /**
- * Tests that the correct IPProtection events are dispatched on toggle.
+ * Tests the disconnected state UI.
  */
-add_task(async function test_ipprotection_events_on_toggle() {
-  // These events are different from the ones sent by
-  // ipprotection-status-card. The prefixed "IPProtection:" events
-  // actually change the connection state in the service when dispatched.
-  // If the IPProtection events are sent, then we know that the status-card
-  // events worked.
-  const userEnableEventName = "IPProtection:UserEnable";
-  const userDisableEventName = "IPProtection:UserDisable";
-
-  // Reset service state.
-  cleanupService();
-  IPProtectionService.updateState();
+add_task(async function test_status_card_disconnected() {
+  await setupStatusCardTest();
 
-  setupService({
-    isSignedIn: true,
-    isEnrolledAndEntitled: true,
-    canEnroll: true,
-    proxyPass: {
-      status: 200,
-      error: undefined,
-      pass: makePass(),
-    },
+  let content = await openPanel({
+    location: mockLocation,
+    isProtectionEnabled: false,
+    bandwidthUsage: mockBandwidthUsage,
   });
-  await IPPEnrollAndEntitleManager.refetchEntitlement();
-
-  let button = document.getElementById(lazy.IPProtectionWidget.WIDGET_ID);
-  let panelView = PanelMultiView.getViewNode(
-    document,
-    lazy.IPProtectionWidget.PANEL_ID
-  );
-
-  let panelShownPromise = waitForPanelEvent(document, "popupshown");
-  // Open the panel
-  button.click();
-  await panelShownPromise;
-
-  let content = panelView.querySelector(lazy.IPProtectionPanel.CONTENT_TAGNAME);
 
   Assert.ok(
     BrowserTestUtils.isVisible(content),
@@ -160,80 +98,57 @@ add_task(async function test_ipprotection_events_on_toggle() {
   );
 
   let statusCard = content.statusCardEl;
+  Assert.ok(content.statusCardEl, "ipprotection-status-card should be present");
 
-  Assert.ok(statusCard, "Status card should be present");
+  let statusBoxEl = statusCard.statusBoxEl;
+  Assert.ok(statusBoxEl, "Status box should be present");
 
-  let toggle = statusCard?.connectionToggleEl;
-  Assert.ok(toggle, "Status card connection toggle should be present");
+  checkLocationAndBandwidth(statusBoxEl, mockLocation, mockBandwidthUsage);
 
-  let startedProxyPromise = BrowserTestUtils.waitForEvent(
-    IPPProxyManager,
-    "IPPProxyManager:StateChanged",
-    false,
-    () => !!IPPProxyManager.activatedAt
-  );
-  let enableEventPromise = BrowserTestUtils.waitForEvent(
-    window,
-    userEnableEventName
-  );
+  const turnOnButtonEl = statusCard.actionButtonEl;
+  Assert.ok(turnOnButtonEl, "Button to turn on VPN should be present");
+
+  await closePanel();
+  await cleanupStatusCardTest();
+});
 
-  toggle.click();
-  info("Clicked toggle to turn VPN on");
+/**
+ * Tests the connected state UI.
+ */
+add_task(async function test_status_card_connected() {
+  await setupStatusCardTest();
 
-  await Promise.all([startedProxyPromise, enableEventPromise]);
-  Assert.ok(
-    true,
-    "Enable event and proxy started event were found after clicking the toggle"
-  );
+  let content = await openPanel({
+    location: mockLocation,
+    isProtectionEnabled: true,
+    bandwidthUsage: mockBandwidthUsage,
+  });
 
-  let userEnabledPref = Services.prefs.getBoolPref(
-    "browser.ipProtection.userEnabled",
-    false
+  Assert.ok(
+    BrowserTestUtils.isVisible(content),
+    "ipprotection content component should be present"
   );
-  Assert.equal(userEnabledPref, true, "userEnabled pref should be set to true");
 
-  let stoppedProxyPromise = BrowserTestUtils.waitForEvent(
-    IPPProxyManager,
-    "IPPProxyManager:StateChanged",
-    false,
-    () => !IPPProxyManager.activatedAt
-  );
-  let disableEventPromise = BrowserTestUtils.waitForEvent(
-    window,
-    userDisableEventName
-  );
+  let statusCard = content.statusCardEl;
+  Assert.ok(content.statusCardEl, "ipprotection-status-card should be present");
 
-  toggle = statusCard?.connectionToggleEl;
-  toggle.click();
-  info("Clicked toggle to turn VPN off");
+  let statusBoxEl = statusCard.statusBoxEl;
+  Assert.ok(statusBoxEl, "Status box should be present");
 
-  await Promise.all([stoppedProxyPromise, disableEventPromise]);
-  Assert.ok(
-    true,
-    "Disable event and stopped proxy event were found after clicking the toggle"
-  );
+  checkLocationAndBandwidth(statusBoxEl, mockLocation, mockBandwidthUsage);
 
-  userEnabledPref = Services.prefs.getBoolPref(
-    "browser.ipProtection.userEnabled",
-    true
-  );
-  Assert.equal(
-    userEnabledPref,
-    false,
-    "userEnabled pref should be set to false"
-  );
+  const turnOffVPNButtonEl = statusCard.actionButtonEl;
+  Assert.ok(turnOffVPNButtonEl, "Button to turn off VPN should be present");
 
-  // Close the panel
-  let panelHiddenPromise = waitForPanelEvent(document, "popuphidden");
-  EventUtils.synthesizeKey("KEY_Escape");
-  await panelHiddenPromise;
-  cleanupService();
+  await closePanel();
+  await cleanupStatusCardTest();
 });
 
 /**
- * Tests that the correct IPProtection events are dispatched on button click.
+ * Tests that the correct IPProtection events are dispatched when
+ * we enable or disable VPN protection.
  */
-add_task(async function test_ipprotection_events_on_button_click() {
+add_task(async function test_ipprotection_events_on_toggle() {
   // These events are different from the ones sent by
   // ipprotection-status-card. The prefixed "IPProtection:" events
   // actually change the connection state in the service when dispatched.
@@ -246,30 +161,13 @@ add_task(async function test_ipprotection_events_on_button_click() {
   cleanupService();
   IPProtectionService.updateState();
 
-  setupService({
-    isSignedIn: true,
-    isEnrolledAndEntitled: true,
-    canEnroll: true,
-    proxyPass: {
-      status: 200,
-      error: undefined,
-      pass: makePass(),
-    },
-  });
-  await IPPEnrollAndEntitleManager.refetchEntitlement();
-
-  let button = document.getElementById(lazy.IPProtectionWidget.WIDGET_ID);
-  let panelView = PanelMultiView.getViewNode(
-    document,
-    lazy.IPProtectionWidget.PANEL_ID
-  );
-
-  let panelShownPromise = waitForPanelEvent(document, "popupshown");
-  // Open the panel
-  button.click();
-  await panelShownPromise;
+  await setupStatusCardTest();
 
-  let content = panelView.querySelector(lazy.IPProtectionPanel.CONTENT_TAGNAME);
+  let content = await openPanel({
+    location: mockLocation,
+    isProtectionEnabled: false,
+    bandwidthUsage: mockBandwidthUsage,
+  });
 
   Assert.ok(
     BrowserTestUtils.isVisible(content),
@@ -277,21 +175,14 @@ add_task(async function test_ipprotection_events_on_button_click() {
   );
 
   let statusCard = content.statusCardEl;
+  Assert.ok(content.statusCardEl, "ipprotection-status-card should be present");
 
-  await BrowserTestUtils.waitForMutationCondition(
-    content.shadowRoot,
-    { childList: true, subtree: true },
-    () => content.statusCardEl
-  );
-
-  Assert.ok(statusCard, "Status card should be present");
+  let statusBoxEl = statusCard.statusBoxEl;
+  Assert.ok(statusBoxEl, "Status box should be present");
 
-  let connectionButton = statusCard?.connectionButtonEl;
-  connectionButton.hidden = false;
-  Assert.ok(
-    connectionButton,
-    "Status card connection button should be present"
-  );
+  // Now click "Turn on"
+  let turnOnVPNButtonEl = statusCard.actionButtonEl;
+  Assert.ok(turnOnVPNButtonEl, "Button to turn on VPN should be present");
 
   let startedProxyPromise = BrowserTestUtils.waitForEvent(
     IPPProxyManager,
@@ -304,10 +195,10 @@ add_task(async function test_ipprotection_events_on_button_click() {
     userEnableEventName
   );
 
-  connectionButton.click();
-  info("Clicked toggle to turn VPN on");
+  turnOnVPNButtonEl.click();
 
   await Promise.all([startedProxyPromise, enableEventPromise]);
+
   Assert.ok(
     true,
     "Enable event and proxy started event were found after clicking the toggle"
@@ -319,6 +210,10 @@ add_task(async function test_ipprotection_events_on_button_click() {
   );
   Assert.equal(userEnabledPref, true, "userEnabled pref should be set to true");
 
+  // Now click "Turn off"
+  let turnOffVPNButtonEl = statusCard.actionButtonEl;
+  Assert.ok(turnOffVPNButtonEl, "Button to turn off VPN should be present");
+
   let stoppedProxyPromise = BrowserTestUtils.waitForEvent(
     IPPProxyManager,
     "IPPProxyManager:StateChanged",
@@ -330,9 +225,7 @@ add_task(async function test_ipprotection_events_on_button_click() {
     userDisableEventName
   );
 
-  connectionButton = statusCard?.connectionButtonEl;
-  connectionButton.click();
-  info("Clicked toggle to turn VPN off");
+  turnOffVPNButtonEl.click();
 
   await Promise.all([stoppedProxyPromise, disableEventPromise]);
   Assert.ok(
@@ -350,11 +243,6 @@ add_task(async function test_ipprotection_events_on_button_click() {
     "userEnabled pref should be set to false"
   );
 
-  connectionButton.hidden = true;
-
-  // Close the panel
-  let panelHiddenPromise = waitForPanelEvent(document, "popuphidden");
-  EventUtils.synthesizeKey("KEY_Escape");
-  await panelHiddenPromise;
-  cleanupService();
+  await closePanel();
+  await cleanupStatusCardTest();
 });
diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_telemetry.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_telemetry.js
index 9f7c556d6b41b..d5abd2714cced 100644
--- a/browser/components/ipprotection/tests/browser/browser_ipprotection_telemetry.js
+++ b/browser/components/ipprotection/tests/browser/browser_ipprotection_telemetry.js
@@ -62,8 +62,8 @@ add_task(async function user_toggle_on_and_off() {
 
   let statusCard = content.shadowRoot.querySelector("ipprotection-status-card");
 
-  let toggle = statusCard.connectionToggleEl;
-  Assert.ok(toggle, "Status card connection toggle should be present");
+  let turnOnButton = statusCard.actionButtonEl;
+  Assert.ok(turnOnButton, "Status card turn on button should be present");
 
   Services.fog.testResetFOG();
   await Services.fog.testFlushAllChildren();
@@ -73,8 +73,8 @@ add_task(async function user_toggle_on_and_off() {
     false,
     () => !!IPPProxyManager.activatedAt
   );
-  // Toggle the VPN on
-  toggle.click();
+  // Turn the VPN on
+  turnOnButton.click();
   await vpnOnPromise;
   let toggledEvents = Glean.ipprotection.toggled.testGetValue();
   Assert.equal(toggledEvents.length, 1, "should have recorded a toggle");
@@ -89,8 +89,9 @@ add_task(async function user_toggle_on_and_off() {
     false,
     () => !IPPProxyManager.activatedAt
   );
-  // Toggle the VPN off
-  toggle.click();
+  // Turn the VPN off
+  let turnOffButton = statusCard.actionButtonEl;
+  turnOffButton.click();
   await vpnOffPromise;
   toggledEvents = Glean.ipprotection.toggled.testGetValue();
   Assert.equal(toggledEvents.length, 2, "should have recorded a second toggle");
@@ -149,8 +150,8 @@ add_task(async function toggle_off_on_shutdown() {
   await putServerInRemoteSettings();
 
   let statusCard = content.statusCardEl;
-  let toggle = statusCard.connectionToggleEl;
-  Assert.ok(toggle, "Status card connection toggle should be present");
+  let turnOnButton = statusCard.actionButtonEl;
+  Assert.ok(turnOnButton, "Status card turn on button should be present");
 
   Services.fog.testResetFOG();
 
@@ -160,8 +161,8 @@ add_task(async function toggle_off_on_shutdown() {
     false,
     () => !!IPPProxyManager.activatedAt
   );
-  // Toggle the VPN on
-  toggle.click();
+  // Turn the VPN on
+  turnOnButton.click();
   await vpnOnPromise;
   let toggledEvents = Glean.ipprotection.toggled.testGetValue();
   Assert.equal(toggledEvents.length, 1, "should have recorded a toggle");
diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_toolbar.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_toolbar.js
index fb7b2e34e9d46..3c9b37672ce33 100644
--- a/browser/components/ipprotection/tests/browser/browser_ipprotection_toolbar.js
+++ b/browser/components/ipprotection/tests/browser/browser_ipprotection_toolbar.js
@@ -86,8 +86,8 @@ add_task(async function toolbar_icon_status() {
   Assert.ok(content, "Panel content should be present");
 
   let statusCard = content.statusCardEl;
-  let toggle = statusCard.connectionToggleEl;
-  Assert.ok(toggle, "Status card connection toggle should be present");
+  let turnOnButton = statusCard.actionButtonEl;
+  Assert.ok(turnOnButton, "Status card turn on button should be present");
 
   let vpnOnPromise = BrowserTestUtils.waitForEvent(
     lazy.IPPProxyManager,
@@ -95,8 +95,8 @@ add_task(async function toolbar_icon_status() {
     false,
     () => !!IPPProxyManager.activatedAt
   );
-  // Toggle the VPN on
-  toggle.click();
+  // Turn the VPN on
+  turnOnButton.click();
   await vpnOnPromise;
   Assert.ok(
     button.classList.contains("ipprotection-on"),
@@ -108,8 +108,9 @@ add_task(async function toolbar_icon_status() {
     false,
     () => lazy.IPProtectionService.state === lazy.IPProtectionStates.READY
   );
-  // Toggle the VPN off
-  toggle.click();
+  // Turn the VPN off
+  let turnOffButton = statusCard.actionButtonEl;
+  turnOffButton.click();
   await vpnOffPromise;
   Assert.ok(
     !button.classList.contains("ipprotection-on"),
@@ -142,9 +143,10 @@ add_task(async function toolbar_icon_status_new_window() {
     false,
     () => !!IPPProxyManager.activatedAt
   );
-  // Toggle the VPN on
+  // Turn the VPN on
   let statusCard = content.statusCardEl;
-  statusCard.connectionToggleEl.click();
+  let turnOnButton = statusCard.actionButtonEl;
+  turnOnButton.click();
   await vpnOnPromise;
 
   let button = document.getElementById(IPProtectionWidget.WIDGET_ID);
diff --git a/browser/locales-preview/ipProtection.ftl b/browser/locales-preview/ipProtection.ftl
index bd1c28c4a877b..48895b7311cfb 100644
--- a/browser/locales-preview/ipProtection.ftl
+++ b/browser/locales-preview/ipProtection.ftl
@@ -49,22 +49,8 @@ ipprotection-settings-link =
 
 ## Status card
 
-ipprotection-connection-status-on =
-  .label = VPN is on
-ipprotection-connection-status-off =
-  .label = VPN is off
-
-# The panel status card has a header, as well as VPN server location name displayed under it when the VPN is on.
-# Location refers to the VPN server geographical position.
-ipprotection-location-title =
-  .title = Location selected based on fastest server
-
-# When VPN is toggled on
-ipprotection-toggle-active =
-  .aria-label = Turn VPN off
-# When VPN is toggled off
-ipprotection-toggle-inactive =
-  .aria-label = Turn VPN on
+ipprotection-connection-status-connected = VPN is on
+ipprotection-connection-status-disconnected = VPN is off
 
 # Button to turn off the VPN
 ipprotection-button-turn-vpn-off = Turn off VPN

From bac0c7c5ed4386c7c3858d330cb91746332f2166 Mon Sep 17 00:00:00 2001
From: kpatenio <kpatenio@mozilla.com>
Date: Thu, 29 Jan 2026 17:56:42 +0000
Subject: [PATCH 106/116] =?UTF-8?q?Bug=202009535=20=E2=80=94=20add=20exclu?=
 =?UTF-8?q?ded=20site=20state=20UI=20for=20ip=20protection.=20r=3Dip-prote?=
 =?UTF-8?q?ction-reviewers,fluent-reviewers,desktop-theme-reviewers,flod,f?=
 =?UTF-8?q?chasen,dao?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Differential Revision: https://phabricator.services.mozilla.com/D280885
---
 .../content/ipprotection-content.mjs          | 13 +++--
 .../content/ipprotection-status-box.css       | 10 ++++
 .../content/ipprotection-status-card.mjs      | 13 +++++
 .../browser_ipprotection_status_card.js       | 49 ++++++++++++++++++-
 browser/locales-preview/ipProtection.ftl      |  4 ++
 5 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/browser/components/ipprotection/content/ipprotection-content.mjs b/browser/components/ipprotection/content/ipprotection-content.mjs
index dc2928147237c..7412cb490a6c4 100644
--- a/browser/components/ipprotection/content/ipprotection-content.mjs
+++ b/browser/components/ipprotection/content/ipprotection-content.mjs
@@ -95,6 +95,10 @@ export default class IPProtectionContentElement extends MozLitElement {
     return this.state && this.state.isProtectionEnabled && !this.state.error;
   }
 
+  get hasSiteExclusion() {
+    return this.state?.siteData?.isExclusion ?? false;
+  }
+
   get #hasErrors() {
     return !this.state || !!this.state.error;
   }
@@ -256,11 +260,14 @@ export default class IPProtectionContentElement extends MozLitElement {
   }
 
   statusCardTemplate() {
+    let hasExclusion = this.hasSiteExclusion;
+
     return html`
       <ipprotection-status-card
         .protectionEnabled=${this.canEnableConnection}
         .location=${this.state.location}
         .bandwidthUsage=${ifDefined(this.state.bandwidthUsage)}
+        .hasExclusion=${hasExclusion}
       ></ipprotection-status-card>
     `;
   }
@@ -314,8 +321,8 @@ export default class IPProtectionContentElement extends MozLitElement {
       return null;
     }
 
-    const isExclusion = this.state.siteData.isExclusion;
-    const siteExclusionToggleStateL10nId = isExclusion
+    const hasExclusion = this.hasSiteExclusion;
+    const siteExclusionToggleStateL10nId = hasExclusion
       ? "site-exclusion-toggle-disabled"
       : "site-exclusion-toggle-enabled";
     return html` <div id="site-exclusion-control">
@@ -334,7 +341,7 @@ export default class IPProtectionContentElement extends MozLitElement {
         data-l10n-id=${siteExclusionToggleStateL10nId}
         data-l10n-attrs="label"
         id="site-exclusion-toggle"
-        ?pressed=${!isExclusion}
+        ?pressed=${!hasExclusion}
         @toggle=${this.handleToggleUseVPN}
       >
       </moz-toggle>
diff --git a/browser/components/ipprotection/content/ipprotection-status-box.css b/browser/components/ipprotection/content/ipprotection-status-box.css
index 8317cda6b9fc7..53efc73d92ec6 100644
--- a/browser/components/ipprotection/content/ipprotection-status-box.css
+++ b/browser/components/ipprotection/content/ipprotection-status-box.css
@@ -21,6 +21,16 @@
   }
 }
 
+.excluded {
+  background-color: var(--background-color-success);
+
+  ::slotted([slot="icon"]) {
+    -moz-context-properties: fill, stroke;
+    fill: transparent;
+    stroke: var(--icon-color-success);
+  }
+}
+
 #content-container {
   display: flex;
   flex-direction: column;
diff --git a/browser/components/ipprotection/content/ipprotection-status-card.mjs b/browser/components/ipprotection/content/ipprotection-status-card.mjs
index 43d51170f4f98..dd238c234221d 100644
--- a/browser/components/ipprotection/content/ipprotection-status-card.mjs
+++ b/browser/components/ipprotection/content/ipprotection-status-card.mjs
@@ -32,6 +32,7 @@ export default class IPProtectionStatusCard extends MozLitElement {
     enabledSince: { type: Object },
     location: { type: Object },
     bandwidthUsage: { type: Object },
+    hasExclusion: { type: Boolean },
   };
 
   constructor() {
@@ -150,6 +151,18 @@ export default class IPProtectionStatusCard extends MozLitElement {
   }
 
   render() {
+    if (this.hasExclusion && this.protectionEnabled) {
+      return html`
+        ${this.statusTemplate({
+          type: "excluded",
+          headerL10nId: "ipprotection-connection-status-excluded",
+          buttonL10nId: "ipprotection-button-turn-vpn-off-excluded-site",
+          iconSrc:
+            "chrome://browser/content/ipprotection/assets/states/ipprotection-excluded.svg",
+        })}
+      `;
+    }
+
     if (this.protectionEnabled) {
       return html`
         ${this.statusTemplate({
diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js
index db1a7a3b3ea58..dc4efced8b727 100644
--- a/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js
+++ b/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js
@@ -7,7 +7,9 @@
 const { LINKS } = ChromeUtils.importESModule(
   "chrome://browser/content/ipprotection/ipprotection-constants.mjs"
 );
-const lazy = {};
+const { IPPExceptionsManager } = ChromeUtils.importESModule(
+  "moz-src:///browser/components/ipprotection/IPPExceptionsManager.sys.mjs"
+);
 
 const mockLocation = {
   name: "United States",
@@ -246,3 +248,48 @@ add_task(async function test_ipprotection_events_on_toggle() {
   await closePanel();
   await cleanupStatusCardTest();
 });
+
+/**
+ * Tests the excluded site state UI.
+ */
+add_task(async function test_status_card_excluded() {
+  let sandbox = sinon.createSandbox();
+  sandbox.stub(IPPExceptionsManager, "hasExclusion").returns(true);
+
+  await setupStatusCardTest();
+
+  let content = await openPanel({
+    location: mockLocation,
+    isProtectionEnabled: true,
+    bandwidthUsage: { currentBandwidthUsage: 50, maxBandwidth: 150 },
+  });
+
+  Assert.ok(
+    BrowserTestUtils.isVisible(content),
+    "ipprotection content component should be present"
+  );
+
+  let statusCard = content.statusCardEl;
+  Assert.ok(content.statusCardEl, "ipprotection-status-card should be present");
+
+  let statusBoxEl = statusCard.statusBoxEl;
+  Assert.ok(statusBoxEl, "Status box should be present");
+
+  Assert.equal(
+    statusBoxEl.type,
+    "excluded",
+    "Status box should have excluded type"
+  );
+
+  checkLocationAndBandwidth(statusBoxEl, mockLocation, {
+    currentBandwidthUsage: 50,
+    maxBandwidth: 150,
+  });
+
+  const turnOffVPNButtonEl = statusCard.actionButtonEl;
+  Assert.ok(turnOffVPNButtonEl, "Button to turn off VPN should be present");
+
+  await closePanel();
+  await cleanupStatusCardTest();
+  sandbox.restore();
+});
diff --git a/browser/locales-preview/ipProtection.ftl b/browser/locales-preview/ipProtection.ftl
index 48895b7311cfb..fcbf032611004 100644
--- a/browser/locales-preview/ipProtection.ftl
+++ b/browser/locales-preview/ipProtection.ftl
@@ -51,9 +51,13 @@ ipprotection-settings-link =
 
 ipprotection-connection-status-connected = VPN is on
 ipprotection-connection-status-disconnected = VPN is off
+ipprotection-connection-status-excluded = VPN is off for this site
 
 # Button to turn off the VPN
 ipprotection-button-turn-vpn-off = Turn off VPN
+# Button to turn off the VPN when the VPN panel is open while viewing
+# a page from an excluded site.
+ipprotection-button-turn-vpn-off-excluded-site = Turn off VPN everywhere
 # Button to turn on the VPN
 ipprotection-button-turn-vpn-on = Turn on VPN
 

From 2ebed9a3bc7604e2e7351eed8131009496cd635f Mon Sep 17 00:00:00 2001
From: Irene Ni <ini@mozilla.com>
Date: Thu, 29 Jan 2026 17:57:41 +0000
Subject: [PATCH 107/116] Bug 2012765 - Fix extra padding on New Tab panel list
 reusable component. r=home-newtab-reviewers,desktop-theme-reviewers,dao,maxx

Differential Revision: https://phabricator.services.mozilla.com/D280644
---
 .../extensions/newtab/content-src/styles/activity-stream.scss | 4 ++++
 browser/extensions/newtab/css/activity-stream.css             | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/browser/extensions/newtab/content-src/styles/activity-stream.scss b/browser/extensions/newtab/content-src/styles/activity-stream.scss
index 1694ee9f84667..c77ef033aae2d 100644
--- a/browser/extensions/newtab/content-src/styles/activity-stream.scss
+++ b/browser/extensions/newtab/content-src/styles/activity-stream.scss
@@ -134,6 +134,10 @@ input {
   }
 }
 
+panel-item::part(button) {
+  padding-inline-start: var(--space-medium);
+}
+
 // These styles are needed for -webkit-line-clamp to work correctly, so reuse
 // this class name while separately setting a clamp value via CSS or JS.
 .clamp {
diff --git a/browser/extensions/newtab/css/activity-stream.css b/browser/extensions/newtab/css/activity-stream.css
index f79cfaa3de384..ba6e06651fde6 100644
--- a/browser/extensions/newtab/css/activity-stream.css
+++ b/browser/extensions/newtab/css/activity-stream.css
@@ -425,6 +425,10 @@ input[type=text], input[type=search] {
   border-radius: var(--border-radius-small);
 }
 
+panel-item::part(button) {
+  padding-inline-start: var(--space-medium);
+}
+
 .clamp {
   -webkit-box-orient: vertical;
   display: -webkit-box;

From d7fbd8018f08f4aea34af2464edf3bdd3065337f Mon Sep 17 00:00:00 2001
From: Sandor Molnar <smolnar@mozilla.com>
Date: Thu, 29 Jan 2026 20:45:49 +0200
Subject: [PATCH 108/116] Revert "Bug 2001496 - Chat History in FXView -
 r=omarg,fluent-reviewers,desktop-theme-reviewers,fxview-reviewers,ai-frontend-reviewers,sfoster,bolsson"
 for causing bc failures @ browser_exclude_fxview_hidden_tabs.js

This reverts commit 525f3639cd22f50d2fd248b8ed684c4f694aa29a.
---
 browser/app/profile/firefox.js                |   1 -
 .../aiwindow/ui/modules/ChatStore.sys.mjs     |   9 +-
 .../aiwindow/ui/modules/ChatUtils.sys.mjs     |  13 +-
 .../firefoxview/ChatsController.sys.mjs       | 459 ------------------
 .../components/firefoxview/chats-tab-list.css |  14 -
 .../components/firefoxview/chats-tab-list.mjs | 170 -------
 browser/components/firefoxview/chats.mjs      | 323 ------------
 .../firefoxview/content/empty-chat.svg        |  12 -
 .../firefoxview/content/view-chats.svg        |   6 -
 .../components/firefoxview/firefoxview.html   |   9 -
 .../components/firefoxview/firefoxview.mjs    |  17 -
 browser/components/firefoxview/jar.mn         |   5 -
 .../firefoxview/tests/browser/browser.toml    |   2 -
 .../browser/browser_chats_firefoxview.js      | 455 -----------------
 browser/locales/en-US/browser/firefoxView.ftl |  21 -
 15 files changed, 6 insertions(+), 1510 deletions(-)
 delete mode 100644 browser/components/firefoxview/ChatsController.sys.mjs
 delete mode 100644 browser/components/firefoxview/chats-tab-list.css
 delete mode 100644 browser/components/firefoxview/chats-tab-list.mjs
 delete mode 100644 browser/components/firefoxview/chats.mjs
 delete mode 100644 browser/components/firefoxview/content/empty-chat.svg
 delete mode 100644 browser/components/firefoxview/content/view-chats.svg
 delete mode 100644 browser/components/firefoxview/tests/browser/browser_chats_firefoxview.js

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 0f3834ea38023..10babe5b7e467 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -2269,7 +2269,6 @@ pref("browser.ml.pageAssist.enabled", false);
 // AI Window Feature
 pref("browser.aiwindow.apiKey", '');
 pref("browser.aiwindow.chatStore.loglevel", "Error");
-pref("browser.aiwindow.chatHistory.loglevel", "Error");
 pref("browser.aiwindow.enabled", false);
 pref("browser.aiwindow.endpoint", "https://mlpa-prod-prod-mozilla.global.ssl.fastly.net/v1");
 pref("browser.aiwindow.memories", true);
diff --git a/browser/components/aiwindow/ui/modules/ChatStore.sys.mjs b/browser/components/aiwindow/ui/modules/ChatStore.sys.mjs
index 9b33cb6f48037..86776433ee3d9 100644
--- a/browser/components/aiwindow/ui/modules/ChatStore.sys.mjs
+++ b/browser/components/aiwindow/ui/modules/ChatStore.sys.mjs
@@ -427,13 +427,12 @@ class ChatStore {
    * in the message.content.body field
    *
    * @param {string} searchString - The string to search with for conversations
-   * @param {boolean} [includeMessages=true] - Whether to fetch messages for each conversation
    *
-   * @returns {Array<ChatConversation>} - An array of conversations with or without messages
+   * @returns {Array<ChatConversation>} - An array of conversations with messages
    * that contain a message that matches the search string in the conversation
    * titles
    */
-  async search(searchString, includeMessages = true) {
+  async search(searchString) {
     await this.#ensureDatabase().catch(e => {
       lazy.log.error(
         "Could not ensure a database connection.",
@@ -457,10 +456,6 @@ class ChatStore {
 
     const conversations = rows.map(parseConversationRow);
 
-    if (!includeMessages) {
-      return conversations;
-    }
-
     return await this.#getMessagesForConversations(conversations);
   }
 
diff --git a/browser/components/aiwindow/ui/modules/ChatUtils.sys.mjs b/browser/components/aiwindow/ui/modules/ChatUtils.sys.mjs
index 3c5fde6869afb..f078769d7d497 100644
--- a/browser/components/aiwindow/ui/modules/ChatUtils.sys.mjs
+++ b/browser/components/aiwindow/ui/modules/ChatUtils.sys.mjs
@@ -87,20 +87,15 @@ export function parseMessageRows(rows) {
  */
 export function parseChatHistoryViewRows(rows) {
   return rows.map(row => {
-    const urlsString = row.getResultByName("urls");
-    const urls = urlsString
-      ? urlsString
-          .split(",")
-          .filter(url => url && url.trim())
-          .map(url => new URL(url.trim()))
-      : [];
-
     return new ChatHistoryResult({
       convId: row.getResultByName("conv_id"),
       title: row.getResultByName("title"),
       createdDate: row.getResultByName("created_date"),
       updatedDate: row.getResultByName("updated_date"),
-      urls,
+      urls: row
+        .getResultByName("urls")
+        .split(",")
+        .map(url => new URL(url)),
     });
   });
 }
diff --git a/browser/components/firefoxview/ChatsController.sys.mjs b/browser/components/firefoxview/ChatsController.sys.mjs
deleted file mode 100644
index 168a98bef65c9..0000000000000
--- a/browser/components/firefoxview/ChatsController.sys.mjs
+++ /dev/null
@@ -1,459 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const lazy = {};
-
-import { getLogger } from "chrome://browser/content/firefoxview/helpers.mjs";
-
-ChromeUtils.defineESModuleGetters(lazy, {
-  AIWindow:
-    "moz-src:///browser/components/aiwindow/ui/modules/AIWindow.sys.mjs",
-});
-
-const CHAT_MAP_L10N_IDS = {
-  "chat-date-today": "firefoxview-chat-date-today",
-  "chat-date-yesterday": "firefoxview-chat-date-yesterday",
-  "chat-date-this-month": "firefoxview-chat-date-this-month",
-  "chat-date-prev-month": "firefoxview-chat-date-prev-month",
-};
-
-const DAYS_IN_MILLIS = 86400000;
-
-/**
- * A list of chat items displayed on a card.
- *
- * @typedef {object} CardEntry
- * @property {Array} items - Chat items for this card
- * @property {string} l10nId - Localization ID for the card header
- */
-
-/**
- * Manages chat history display and organization in Firefox View.
- * Handles fetching, searching, grouping by date, and normalizing chat data for display.
- */
-export class ChatsController {
-  /**
-   * @type {{ entries: CardEntry[]; searchQuery: string; }}
-   */
-  cache;
-
-  /** @type {object} The host element this controller is attached to */
-  host;
-
-  // TODO Bug 2009070 - Implement Search
-  /** @type {string} Current search query string */
-  // searchQuery;
-
-  /** @type {Date} Today's date at midnight */
-  #todaysDate;
-
-  /** @type {Date} Yesterday's date at midnight */
-  #yesterdaysDate;
-
-  /**
-   * Creates a ChatsController instance.
-   *
-   * @param {object} host - The host element that this controller manages
-   * @param {object} [_options] - Configuration options (unused until Bug 2009070)
-   * @param {number} [_options.searchResultsLimit=300] - Maximum number of search results to return
-   *
-   * TODO: The _options parameter is prefixed with underscore because it's currently unused
-   * while search functionality is disabled. When implementing Bug 2009070 (search), rename
-   * this back to 'options' and uncomment the search-related code below.
-   */
-  constructor(host, _options) {
-    this.chatStore = lazy.AIWindow.chatStore;
-    // TODO Bug 2009070 - Implement Search
-    // this.searchQuery = "";
-    // this.searchResultsLimit = options?.searchResultsLimit || 300;
-    this.cache = {
-      entries: null,
-      // TODO Bug 2009070 - Implement Search
-      // searchQuery: null,
-    };
-    this.host = host;
-
-    host.addController(this);
-  }
-
-  async deleteChat() {
-    const convID = this.host.triggerNode.closedId;
-    if (convID) {
-      await this.chatStore.deleteConversationById(convID);
-      await this.updateCache();
-    }
-  }
-
-  // TODO Bug 2009070 - Implement Search
-  /**
-   * Handles search query events and updates the chat cache.
-   *
-   * @param {CustomEvent} e - The search query event
-   * @param {object} e.detail - Event details
-   * @param {string} e.detail.query - The search query string
-   */
-  // onSearchQuery(e) {
-  //   this.searchQuery = e.detail.query;
-  //   this.updateCache();
-  // }
-
-  /**
-   * Gets all chat entries from the cache.
-   *
-   * @returns {CardEntry[]} Array of card entries containing chat items
-   */
-  get totalChats() {
-    return this.cache.entries || [];
-  }
-
-  // TODO Bug 2009070 - Implement Search
-  /**
-   * Gets the current search results.
-   *
-   * @returns {Array} Array of search result items, or empty array if no search is active
-   */
-  // get searchResults() {
-  //   if (this.cache.searchQuery && this.cache.entries?.length) {
-  //     return this.cache.entries[0].items;
-  //   }
-  //   return [];
-  // }
-
-  /**
-   * Gets the total number of chat items across all entries.
-   *
-   * @returns {number} Total count of chat items
-   */
-  get totalVisitsCount() {
-    return this.totalChats.reduce(
-      (count, entry) => count + entry.items.length,
-      0
-    );
-  }
-
-  /**
-   * Checks if there are no chats to display.
-   *
-   * @returns {boolean} True if there are no chat entries
-   */
-  get isChatEmpty() {
-    return !this.totalChats.length;
-  }
-
-  /**
-   * Updates the cached chat data based on current search query.
-   * Fetches either search results or all chats grouped by date.
-   * Normalizes chat items and triggers host UI update.
-   */
-  async updateCache() {
-    // TODO Bug 2009070 - Implement Search
-    // const { searchQuery } = this;
-    // const entries = searchQuery
-    //   ? await this.#getChatsForSearchQuery(searchQuery)
-    //   : await this.#getAllChatsGroupedByDate();
-    const entries = await this.#getAllChatsGroupedByDate();
-
-    // TODO Bug 2009070 - Implement Search
-    // if (this.searchQuery !== searchQuery || !entries) {
-    //   // This query is stale, discard results and do not update the cache / UI.
-    //   return;
-    // }
-    if (!entries) {
-      return;
-    }
-
-    // Normalize chat items for display
-    for (const { items } of entries) {
-      for (const item of items) {
-        this.#normalizeChat(item);
-      }
-    }
-
-    // TODO Bug 2009070 - Implement Search
-    // this.cache = { entries, searchQuery };
-    this.cache = { entries };
-    this.host.requestUpdate();
-  }
-
-  /**
-   * Normalize chat data for fxview-tabs-list.
-   *
-   * @param {ChatHistoryResult} chat
-   *   The chat to format.
-   */
-  #normalizeChat(chat) {
-    // Get most recent page URL (skip if it's the AI Window URL)
-    const mostRecentPage = chat.urls?.[chat.urls.length - 1];
-    const pageUrl =
-      mostRecentPage?.href === lazy.AIWindow.newTabURL
-        ? null
-        : mostRecentPage?.href;
-
-    // All chats link to AI Window - click handler will decide what to load
-    const targetURI = lazy.AIWindow.newTabURL;
-
-    if (pageUrl) {
-      chat.icon = pageUrl;
-      chat.pageUrl = pageUrl;
-      chat.primaryL10nId = "fxviewtabrow-tabs-list-tab";
-      chat.primaryL10nArgs = JSON.stringify({
-        targetURI,
-      });
-    }
-    chat.url = targetURI;
-    chat.time = chat.updatedDate;
-    chat.closedId = chat.convId;
-    chat.secondaryL10nId = "fxviewtabrow-options-menu-button";
-    chat.secondaryL10nArgs = JSON.stringify({
-      tabTitle: chat.title || "Untitled Chat",
-    });
-  }
-
-  // TODO Bug 2009070 - Implement Search
-  /**
-   * Fetches and formats chats matching a search query.
-   *
-   * @param {string} searchQuery - The search query string
-   * @returns {Promise<CardEntry[]>} Array with single entry containing search results
-   */
-  // async #getChatsForSearchQuery(searchQuery) {
-  //   try {
-  //     const conversations = await this.chatStore.search(searchQuery, false);
-
-  //     // Add aliases to conversation objects for display compatibility
-  //     conversations.forEach(conv => {
-  //       conv.convId = conv.id;
-  //       conv.urls = conv.pageMeta?.urls || [];
-  //     });
-
-  //     return [{ items: conversations }];
-  //   } catch (e) {
-  //     getLogger("ChatsController").warn(
-  //       "There is a new search query in progress, cancelling this one.",
-  //       e
-  //     );
-  //     return [{ items: [] }];
-  //   }
-  // }
-
-  /**
-   * Fetches all chats and groups them by date categories.
-   *
-   * @returns {Promise<CardEntry[]>} Array of card entries grouped by date
-   */
-  async #getAllChatsGroupedByDate() {
-    const chats = await this.#fetchChats();
-    if (!chats || !chats.length) {
-      return [];
-    }
-
-    this.#setTodaysDate();
-    return this.#getChatsForDate(chats);
-  }
-
-  /**
-   * Groups chats into date-based categories: today, yesterday, this month, previous months.
-   *
-   * @param {Array} chats - Array of chat objects to group
-   * @returns {CardEntry[]} Array of card entries organized by date categories
-   */
-  #getChatsForDate(chats) {
-    const entries = [];
-    const chatsFromToday = this.#getChatsFromToday(chats);
-    const chatsFromYesterday = this.#getChatsFromYesterday(chats);
-    const chatsByDay = this.#getChatsByDay(chats);
-    const chatsByMonth = this.#getChatsByMonth(chats);
-
-    if (chatsFromToday.length) {
-      entries.push({
-        l10nId: CHAT_MAP_L10N_IDS["chat-date-today"],
-        items: chatsFromToday,
-      });
-    }
-
-    if (chatsFromYesterday.length) {
-      entries.push({
-        l10nId: CHAT_MAP_L10N_IDS["chat-date-yesterday"],
-        items: chatsFromYesterday,
-      });
-    }
-
-    chatsByDay.forEach(dayChats => {
-      entries.push({
-        l10nId: CHAT_MAP_L10N_IDS["chat-date-this-month"],
-        items: dayChats,
-      });
-    });
-
-    chatsByMonth.forEach(monthChats => {
-      entries.push({
-        l10nId: CHAT_MAP_L10N_IDS["chat-date-prev-month"],
-        items: monthChats,
-      });
-    });
-
-    return entries;
-  }
-
-  /**
-   * Filters chats that were updated today.
-   *
-   * @param {Array} chats - Array of chat objects
-   * @returns {Array} Chats from today
-   */
-  #getChatsFromToday(chats) {
-    const todayStart = this.#todaysDate.getTime();
-    const todayEnd = todayStart + DAYS_IN_MILLIS;
-    return chats.filter(
-      chat => chat.updatedDate >= todayStart && chat.updatedDate < todayEnd
-    );
-  }
-
-  /**
-   * Filters chats that were updated yesterday.
-   *
-   * @param {Array} chats - Array of chat objects
-   * @returns {Array} Chats from yesterday
-   */
-  #getChatsFromYesterday(chats) {
-    const todayStart = this.#todaysDate.getTime();
-    const yesterdayStart = this.#yesterdaysDate.getTime();
-    return chats.filter(
-      chat =>
-        chat.updatedDate >= yesterdayStart && chat.updatedDate < todayStart
-    );
-  }
-
-  /**
-   * Groups chats by individual days within the current month.
-   * Excludes today and yesterday chats.
-   *
-   * @param {Array} chats - Array of chat objects
-   * @returns {Array<Array>} Array of arrays, each containing chats from the same day
-   */
-  #getChatsByDay(chats) {
-    const yesterdayStart = this.#yesterdaysDate.getTime();
-    const chatsPerDay = [];
-    let currentDay = null;
-    let currentDayChats = [];
-
-    for (const chat of chats) {
-      if (chat.updatedDate >= yesterdayStart) {
-        continue;
-      }
-
-      const chatDate = new Date(chat.updatedDate);
-      if (!this.#isSameMonth(chatDate, this.#todaysDate)) {
-        break;
-      }
-
-      const dayKey = `${chatDate.getFullYear()}-${chatDate.getMonth()}-${chatDate.getDate()}`;
-      if (dayKey !== currentDay) {
-        if (currentDayChats.length) {
-          chatsPerDay.push(currentDayChats);
-        }
-        currentDay = dayKey;
-        currentDayChats = [chat];
-      } else {
-        currentDayChats.push(chat);
-      }
-    }
-
-    if (currentDayChats.length) {
-      chatsPerDay.push(currentDayChats);
-    }
-
-    return chatsPerDay;
-  }
-
-  /**
-   * Groups chats by month for dates outside the current month.
-   * Excludes today, yesterday, and current month chats.
-   *
-   * @param {Array} chats - Array of chat objects
-   * @returns {Array<Array>} Array of arrays, each containing chats from the same month
-   */
-  #getChatsByMonth(chats) {
-    const yesterdayStart = this.#yesterdaysDate.getTime();
-    const chatsPerMonth = [];
-    let currentMonth = null;
-    let currentMonthChats = [];
-
-    for (const chat of chats) {
-      if (chat.updatedDate >= yesterdayStart) {
-        continue;
-      }
-
-      const chatDate = new Date(chat.updatedDate);
-      if (this.#isSameMonth(chatDate, this.#todaysDate)) {
-        continue;
-      }
-
-      const monthKey = `${chatDate.getFullYear()}-${chatDate.getMonth()}`;
-      if (monthKey !== currentMonth) {
-        if (currentMonthChats.length) {
-          chatsPerMonth.push(currentMonthChats);
-        }
-        currentMonth = monthKey;
-        currentMonthChats = [chat];
-      } else {
-        currentMonthChats.push(chat);
-      }
-    }
-
-    if (currentMonthChats.length) {
-      chatsPerMonth.push(currentMonthChats);
-    }
-
-    return chatsPerMonth;
-  }
-
-  /**
-   * Check if two dates have the same month and year.
-   *
-   * @param {Date} dateToCheck
-   * @param {Date} month
-   * @returns {boolean}
-   */
-  #isSameMonth(dateToCheck, month) {
-    return (
-      dateToCheck.getMonth() === month.getMonth() &&
-      dateToCheck.getFullYear() === month.getFullYear()
-    );
-  }
-
-  /**
-   * Sets today's and yesterday's dates at midnight for date comparison operations.
-   */
-  #setTodaysDate() {
-    const now = new Date();
-    this.#todaysDate = new Date(
-      now.getFullYear(),
-      now.getMonth(),
-      now.getDate()
-    );
-    this.#yesterdaysDate = new Date(
-      now.getFullYear(),
-      now.getMonth(),
-      now.getDate() - 1
-    );
-  }
-
-  /**
-   * Fetches chats from the chat store.
-   *
-   * @returns {Promise<Array>} Array of chat objects, or empty array on error
-   */
-  async #fetchChats() {
-    try {
-      // Use chatHistoryView for paginated, optimized results
-      // Get first 100 chats, sorted by date descending
-      const chats = await this.chatStore.chatHistoryView(1, 100, "desc");
-      return chats;
-    } catch (e) {
-      getLogger("ChatsController").error("Error fetching chats", e);
-      return [];
-    }
-  }
-}
diff --git a/browser/components/firefoxview/chats-tab-list.css b/browser/components/firefoxview/chats-tab-list.css
deleted file mode 100644
index f45f1efb635e3..0000000000000
--- a/browser/components/firefoxview/chats-tab-list.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-@import url("chrome://browser/content/firefoxview/fxview-tab-list.css");
-
-.fxview-tab-row-favicon.chat-overlay {
-  /* stylelint-disable-next-line stylelint-plugin-mozilla/use-design-tokens */
-  background-size: 50%, 100%;
-  background-position:
-    center calc(50% - 2px),
-    center;
-  background-repeat: no-repeat, no-repeat;
-}
diff --git a/browser/components/firefoxview/chats-tab-list.mjs b/browser/components/firefoxview/chats-tab-list.mjs
deleted file mode 100644
index 1d871c2b0c199..0000000000000
--- a/browser/components/firefoxview/chats-tab-list.mjs
+++ /dev/null
@@ -1,170 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-import {
-  classMap,
-  html,
-  ifDefined,
-  styleMap,
-  when,
-} from "chrome://global/content/vendor/lit.all.mjs";
-import {
-  FxviewTabListBase,
-  FxviewTabRowBase,
-} from "chrome://browser/content/firefoxview/fxview-tab-list.mjs";
-
-/**
- * A list of clickable chat history items
- */
-export class ChatsTabList extends FxviewTabListBase {
-  static queries = {
-    ...FxviewTabListBase.queries,
-    rowEls: {
-      all: "chats-tab-row",
-    },
-  };
-
-  itemTemplate = (tabItem, i) => {
-    let time;
-    if (tabItem.time || tabItem.closedAt) {
-      let stringTime = (tabItem.time || tabItem.closedAt).toString();
-      // Different APIs return time in different units, so we use
-      // the length to decide if it's milliseconds or nanoseconds.
-      if (stringTime.length === 16) {
-        time = (tabItem.time || tabItem.closedAt) / 1000;
-      } else {
-        time = tabItem.time || tabItem.closedAt;
-      }
-    }
-
-    return html`<chats-tab-row
-      ?active=${i == this.activeIndex}
-      ?compact=${this.compactRows}
-      .currentActiveElementId=${this.currentActiveElementId}
-      .favicon=${ifDefined(tabItem.icon)}
-      .pageUrl=${ifDefined(tabItem.pageUrl)}
-      .primaryL10nId=${tabItem.primaryL10nId}
-      .primaryL10nArgs=${ifDefined(tabItem.primaryL10nArgs)}
-      .secondaryL10nId=${tabItem.secondaryL10nId}
-      .secondaryL10nArgs=${ifDefined(tabItem.secondaryL10nArgs)}
-      .tertiaryL10nId=${ifDefined(tabItem.tertiaryL10nId)}
-      .tertiaryL10nArgs=${ifDefined(tabItem.tertiaryL10nArgs)}
-      .secondaryActionClass=${this.secondaryActionClass}
-      .tertiaryActionClass=${ifDefined(this.tertiaryActionClass)}
-      .sourceClosedId=${ifDefined(tabItem.sourceClosedId)}
-      .sourceWindowId=${ifDefined(tabItem.sourceWindowId)}
-      .closedId=${ifDefined(tabItem.closedId || tabItem.closedId)}
-      role="listitem"
-      .time=${ifDefined(time)}
-      .title=${tabItem.title}
-      .url=${tabItem.url}
-      .searchQuery=${ifDefined(this.searchQuery)}
-      .timeMsPref=${ifDefined(this.timeMsPref)}
-      .hasPopup=${this.hasPopup}
-      .dateTimeFormat=${this.dateTimeFormat}
-      .convId=${tabItem.convId}
-    ></chats-tab-row>`;
-  };
-}
-
-customElements.define("chats-tab-list", ChatsTabList);
-
-/**
- * A chat history item that displays favicon with optional overlay, title, url, and time
- *
- * @property {string} pageUrl - The last visited URL associated with this chat, if any
- */
-export class ChatsTabRow extends FxviewTabRowBase {
-  static properties = {
-    ...FxviewTabRowBase.properties,
-    pageUrl: { type: String },
-    convId: { type: String },
-  };
-
-  faviconTemplate() {
-    // Determine the icon and overlay based on whether chat has an associated page URL
-    let faviconUrl;
-    let overlayUrl = null;
-
-    // Treat about: URLs as internal/no external page
-    const hasExternalUrl = this.pageUrl && !this.pageUrl.startsWith("about:");
-
-    if (hasExternalUrl) {
-      // Chat has an associated page URL - show page favicon with chat overlay
-      faviconUrl = this.getImageUrl(this.favicon, this.pageUrl);
-      overlayUrl = "chrome://browser/content/firefoxview/empty-chat.svg";
-    } else {
-      // Chat has no page URL or internal about: page - show generic chat icon, no overlay
-      faviconUrl = "chrome://browser/content/firefoxview/view-chats.svg";
-    }
-
-    const backgroundImage = overlayUrl
-      ? `url(${faviconUrl}), url(${overlayUrl})`
-      : `url(${faviconUrl})`;
-
-    return html`<span
-      class=${classMap({
-        "fxview-tab-row-favicon": true,
-        icon: true,
-        "chat-overlay": !!overlayUrl,
-      })}
-      id="fxview-tab-row-favicon"
-      style=${styleMap({
-        backgroundImage,
-      })}
-    ></span>`;
-  }
-
-  urlTemplate() {
-    const urlToDisplay =
-      this.pageUrl && !this.pageUrl.startsWith("about:") ? this.pageUrl : "";
-
-    return html`<span
-      class="fxview-tab-row-url text-truncated-ellipsis"
-      id="fxview-tab-row-url"
-    >
-      ${when(
-        this.searchQuery,
-        () => this.highlightSearchMatches(this.searchQuery, urlToDisplay),
-        () => urlToDisplay
-      )}
-    </span>`;
-  }
-
-  render() {
-    return html`
-      ${this.stylesheets()}
-      <link
-        rel="stylesheet"
-        href="chrome://browser/content/firefoxview/chats-tab-list.css"
-      />
-      <a
-        href=${ifDefined(this.url)}
-        class="fxview-tab-row-main"
-        id="fxview-tab-row-main"
-        tabindex=${this.active &&
-        this.currentActiveElementId === "fxview-tab-row-main"
-          ? "0"
-          : "-1"}
-        data-l10n-id=${ifDefined(this.primaryL10nId)}
-        data-l10n-args=${ifDefined(this.primaryL10nArgs)}
-        @click=${this.primaryActionHandler}
-        @keydown=${this.primaryActionHandler}
-        title=${!this.primaryL10nId ? this.url : null}
-        data-conv-id=${ifDefined(this.convId)}
-      >
-        ${this.faviconTemplate()} ${this.titleTemplate()}
-        ${when(
-          !this.compact,
-          () =>
-            html`${this.urlTemplate()} ${this.dateTemplate()}
-            ${this.timeTemplate()}`
-        )}
-      </a>
-      ${this.secondaryButtonTemplate()} ${this.tertiaryButtonTemplate()}
-    `;
-  }
-}
-
-customElements.define("chats-tab-row", ChatsTabRow);
diff --git a/browser/components/firefoxview/chats.mjs b/browser/components/firefoxview/chats.mjs
deleted file mode 100644
index 13dfc3346c7cc..0000000000000
--- a/browser/components/firefoxview/chats.mjs
+++ /dev/null
@@ -1,323 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// TODO Bug 2009070 - Implement Search
-import { html /*, when */ } from "chrome://global/content/vendor/lit.all.mjs";
-// TODO Bug 2009070 - Implement Search
-// import { escapeHtmlEntities } from "./helpers.mjs";
-import { ViewPage } from "./viewpage.mjs";
-// eslint-disable-next-line import/no-unassigned-import
-import "chrome://global/content/elements/moz-button.mjs";
-// eslint-disable-next-line import/no-unassigned-import
-import "chrome://browser/content/firefoxview/chats-tab-list.mjs";
-
-const lazy = {};
-
-ChromeUtils.defineESModuleGetters(lazy, {
-  AIWindow:
-    "moz-src:///browser/components/aiwindow/ui/modules/AIWindow.sys.mjs",
-  AIWindowUI:
-    "moz-src:///browser/components/aiwindow/ui/modules/AIWindowUI.sys.mjs",
-  ChatsController: "resource:///modules/ChatsController.sys.mjs",
-  URILoadingHelper: "resource:///modules/URILoadingHelper.sys.mjs",
-});
-
-ChromeUtils.defineLazyGetter(lazy, "log", function () {
-  return console.createInstance({
-    prefix: "ChatHistory",
-    maxLogLevelPref: "browser.aiwindow.chatHistory.loglevel",
-  });
-});
-
-// TODO Bug 2009070 - Implement Search
-// const SEARCH_RESULTS_LIMIT = 300;
-
-class ChatsInView extends ViewPage {
-  static properties = {};
-
-  static queries = {
-    cards: { all: "card-container:not([hidden])" },
-    emptyState: "fxview-empty-state",
-    lists: { all: "chats-tab-list" },
-    // TODO Bug 2009070 - Implement Search
-    // searchTextbox: "moz-input-search",
-    panelList: "panel-list",
-  };
-
-  constructor() {
-    super();
-    this._started = false;
-    // Setting maxTabsLength to -1 for no max
-    this.maxTabsLength = -1;
-    this.fullyUpdated = false;
-    // TODO Bug 2009070 - Implement Search
-    // this.cumulativeSearches = 0;
-  }
-
-  controller = new lazy.ChatsController(this, {
-    // TODO Bug 2009070 - Implement Search
-    // searchResultsLimit: SEARCH_RESULTS_LIMIT,
-  });
-
-  disconnectedCallback() {
-    super.disconnectedCallback();
-    this.stop();
-  }
-
-  viewVisibleCallback() {
-    this.start();
-  }
-
-  viewHiddenCallback() {
-    this.stop();
-  }
-
-  willUpdate() {
-    this.fullyUpdated = false;
-  }
-
-  updated() {
-    this.fullyUpdated = true;
-    if (this.lists?.length) {
-      this.toggleVisibilityInCardContainer();
-    }
-  }
-
-  async getUpdateComplete() {
-    await super.getUpdateComplete();
-    await Promise.all(Array.from(this.cards).map(card => card.updateComplete));
-  }
-
-  start() {
-    if (this._started) {
-      return;
-    }
-    this._started = true;
-
-    this.controller.updateCache();
-
-    this.toggleVisibilityInCardContainer();
-  }
-
-  stop() {
-    if (!this._started) {
-      return;
-    }
-    this._started = false;
-
-    this.toggleVisibilityInCardContainer();
-  }
-
-  async onPrimaryAction(event) {
-    event.preventDefault();
-
-    const item = event.detail?.item;
-    const convId = item?.convId;
-
-    if (!convId) {
-      lazy.log.error(
-        "No conversation ID found in clicked item",
-        event.message,
-        event.stack
-      );
-      return;
-    }
-
-    const conversation =
-      await lazy.AIWindow.chatStore.findConversationById(convId);
-
-    if (!conversation) {
-      lazy.log.error("Conversation not found:", convId);
-      return;
-    }
-
-    const win = event.target.ownerGlobal;
-    const mostRecentPage = conversation.getMostRecentPageVisited();
-
-    if (mostRecentPage?.href) {
-      // Chat has a page URL - open the page and sidebar
-      lazy.URILoadingHelper.openTrustedLinkIn(win, mostRecentPage.href, "tab", {
-        resolveOnContentBrowserCreated: async targetBrowser => {
-          lazy.AIWindowUI.openSidebar(targetBrowser.ownerGlobal, conversation);
-        },
-      });
-    } else {
-      // Chat has no page URL - open AI Window directly in fullpage mode
-      lazy.URILoadingHelper.openTrustedLinkIn(
-        win,
-        lazy.AIWindow.newTabURL,
-        "tab",
-        {
-          resolveOnContentBrowserCreated: async targetBrowser => {
-            lazy.AIWindowUI.openInFullWindow(targetBrowser, conversation);
-          },
-        }
-      );
-    }
-
-    // TODO Bug 2009070 - Implement Search
-    // if (this.controller.searchQuery) {
-    //   this.cumulativeSearches = 0;
-    // }
-  }
-
-  onSecondaryAction(e) {
-    this.triggerNode = e.originalTarget;
-    this.panelList.toggle(e.detail.originalEvent);
-  }
-
-  deleteChat(e) {
-    this.controller
-      .deleteChat()
-      .catch(
-        lazy.log.error("Could not delete conversation.", e.message, e.stack)
-      );
-  }
-
-  // TODO Bug 2009070 - Implement Search
-  // onSearchQuery(e) {
-  //   this.controller.onSearchQuery(e);
-  //   this.cumulativeSearches = this.controller.searchQuery
-  //     ? this.cumulativeSearches + 1
-  //     : 0;
-  // }
-
-  panelListTemplate() {
-    return html`
-      <panel-list slot="menu" data-tab-type="chat">
-        <panel-item
-          @click=${this.deleteChat}
-          data-l10n-id="firefoxview-chat-context-delete"
-          data-l10n-attrs="accesskey"
-        ></panel-item>
-      </panel-list>
-    `;
-  }
-
-  /**
-   * The template to use for cards-container.
-   */
-  get cardsTemplate() {
-    // TODO Bug 2009070 - Implement Search
-    // if (this.controller.searchResults.length) {
-    //   return this.#searchResultsTemplate();
-    // } else
-    if (!this.controller.isChatEmpty) {
-      return this.#chatCardsTemplate();
-    }
-    return this.#emptyMessageTemplate();
-  }
-
-  #chatCardsTemplate() {
-    return this.controller.totalChats.map(chat => {
-      let dateArg = JSON.stringify({ date: chat.items[0].time });
-      return html`<card-container>
-        <h3
-          slot="header"
-          data-l10n-id=${chat.l10nId}
-          data-l10n-args=${dateArg}
-        ></h3>
-        <chats-tab-list
-          slot="main"
-          .updatesPaused=${false}
-          secondaryActionClass="options-button"
-          dateTimeFormat=${chat.l10nId.includes("prev-month")
-            ? "dateTime"
-            : "time"}
-          hasPopup="menu"
-          maxTabsLength=${this.maxTabsLength}
-          .tabItems=${chat.items}
-          @fxview-tab-list-primary-action=${this.onPrimaryAction}
-          @fxview-tab-list-secondary-action=${this.onSecondaryAction}
-        >
-        </chats-tab-list>
-      </card-container>`;
-    });
-  }
-
-  #emptyMessageTemplate() {
-    const descriptionHeader = "firefoxview-history-empty-header";
-    const descriptionLabels = [
-      "firefoxview-history-empty-description",
-      "firefoxview-history-empty-description-two",
-    ];
-    const descriptionLink = {
-      url: "about:preferences#privacy",
-      name: "history-settings-url",
-    };
-
-    return html`
-      <fxview-empty-state
-        headerLabel=${descriptionHeader}
-        .descriptionLabels=${descriptionLabels}
-        .descriptionLink=${descriptionLink}
-        class="empty-state chats"
-        ?isSelectedTab=${this.selectedTab}
-        mainImageUrl="chrome://browser/content/firefoxview/history-empty.svg"
-      >
-      </fxview-empty-state>
-    `;
-  }
-
-  // TODO Bug 2009070 - Implement Search
-  // #searchResultsTemplate() {
-  //   return html` <card-container toggleDisabled>
-  //     <h3
-  //       slot="header"
-  //       data-l10n-id="firefoxview-search-results-header"
-  //       data-l10n-args=${JSON.stringify({
-  //         query: escapeHtmlEntities(this.controller.searchQuery),
-  //       })}
-  //     ></h3>
-  //     ${when(
-  //       this.controller.searchResults.length,
-  //       () =>
-  //         html`<h3
-  //           slot="secondary-header"
-  //           data-l10n-id="firefoxview-search-results-count"
-  //           data-l10n-args=${JSON.stringify({
-  //             count: this.controller.searchResults.length,
-  //           })}
-  //         ></h3>`
-  //     )}
-  //     <chats-tab-list
-  //       slot="main"
-  //       .updatesPaused=${false}
-  //       secondaryActionClass="options-button"
-  //       dateTimeFormat="dateTime"
-  //       hasPopup="menu"
-  //       maxTabsLength="-1"
-  //       .searchQuery=${this.controller.searchQuery}
-  //       .tabItems=${this.controller.searchResults}
-  //       @fxview-tab-list-primary-action=${this.onPrimaryAction}
-  //       @fxview-tab-list-secondary-action=${this.onSecondaryAction}
-  //     >
-  //     </chats-tab-list>
-  //   </card-container>`;
-  // }
-
-  render() {
-    if (!this.selectedTab) {
-      return null;
-    }
-    return html`
-      <link
-        rel="stylesheet"
-        href="chrome://browser/content/firefoxview/firefoxview.css"
-      />
-      ${this.panelListTemplate()}
-      <div class="sticky-container bottom-fade">
-        <h2 class="page-header" data-l10n-id="firefoxview-chats-header"></h2>
-        <!-- TODO Bug 2009070 - Implement Search -->
-        <!-- <moz-input-search
-          data-l10n-id="firefoxview-search-text-box-chats"
-          data-l10n-attrs="placeholder"
-          @MozInputSearch:search=${this.onSearchQuery}
-        ></moz-input-search> -->
-      </div>
-      <div class="cards-container">${this.cardsTemplate}</div>
-    `;
-  }
-}
-customElements.define("view-chats", ChatsInView);
diff --git a/browser/components/firefoxview/content/empty-chat.svg b/browser/components/firefoxview/content/empty-chat.svg
deleted file mode 100644
index b1c508892a282..0000000000000
--- a/browser/components/firefoxview/content/empty-chat.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" id="emptyChat" width="16" height="16" viewBox="0 0 16 16" fill="none">
-  <path fill="url(#a)" d="m13.886 1.429.685.685v8.343l-.685.686h-2.172a.57.57 0 0 0-.571.571v2.456L7.67 11.393a1.14 1.14 0 0 0-.714-.25H2.114l-.685-.686V2.114l.685-.685ZM13.714 0H2.286A2.286 2.286 0 0 0 0 2.286v8a2.286 2.286 0 0 0 2.286 2.285h4.571L11.143 16h1.428v-3.429h1.143A2.286 2.286 0 0 0 16 10.286v-8A2.286 2.286 0 0 0 13.714 0" style="fill:url(#a);stroke-width:1.14285"/>
-  <defs>
-    <linearGradient id="a" x1="0" x2="14" y1="7" y2="7" gradientTransform="scale(1.14286)" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#8341ca"/>
-      <stop offset="1" stop-color="#656fff"/>
-    </linearGradient>
-  </defs>
-</svg>
\ No newline at end of file
diff --git a/browser/components/firefoxview/content/view-chats.svg b/browser/components/firefoxview/content/view-chats.svg
deleted file mode 100644
index 038992168fde8..0000000000000
--- a/browser/components/firefoxview/content/view-chats.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" id="viewChats" width="16" height="16" viewBox="0 0 16 16" fill="context-fill">
-  <path fill-rule="evenodd" d="M13.714 0H2.286C1.68 0 1.098.241.67.67L.518.837A2.3 2.3 0 0 0 0 2.286v8c0 .606.241 1.187.67 1.616l.167.152c.407.333.918.517 1.449.517h4.571L11.143 16h1.428v-3.429h1.143A2.286 2.286 0 0 0 16 10.286v-8A2.286 2.286 0 0 0 13.714 0M1.43 2.114l.685-.685h11.772l.685.685v8.344l-.685.685h-2.172a.57.57 0 0 0-.571.571v2.457L7.67 11.393a1.14 1.14 0 0 0-.715-.25H2.114l-.685-.685Zm12.457-.685v-.273q.111.017.216.056zm-2.315 3.428H4.43a.714.714 0 0 1 0-1.428h7.142a.714.714 0 1 1 0 1.428M10 7.571c0 .19-.075.372-.209.506l-.11.088a.7.7 0 0 1-.395.12H4.429a.7.7 0 0 1-.397-.12l-.109-.088a.715.715 0 0 1 .506-1.22h4.857a.715.715 0 0 1 .714.714" clip-rule="evenodd"/>
-</svg>
diff --git a/browser/components/firefoxview/firefoxview.html b/browser/components/firefoxview/firefoxview.html
index 262cc69da78eb..99a030c61262c 100644
--- a/browser/components/firefoxview/firefoxview.html
+++ b/browser/components/firefoxview/firefoxview.html
@@ -58,14 +58,6 @@
         iconSrc="chrome://browser/content/firefoxview/view-history.svg"
       >
       </moz-page-nav-button>
-      <moz-page-nav-button
-        view="chats"
-        id="firefoxview-chats-nav"
-        data-l10n-id="firefoxview-chats-nav"
-        iconSrc="chrome://browser/content/firefoxview/view-chats.svg"
-        hidden
-      >
-      </moz-page-nav-button>
     </moz-page-nav>
     <main id="pages" role="application" data-l10n-id="firefoxview-page-label">
       <div class="main-container">
@@ -95,7 +87,6 @@
             name="syncedtabs"
             type="page"
           ></view-syncedtabs>
-          <view-chats name="chats" type="page" hidden></view-chats>
         </named-deck>
       </div>
     </main>
diff --git a/browser/components/firefoxview/firefoxview.mjs b/browser/components/firefoxview/firefoxview.mjs
index d50b71db8e43f..e004b5346a095 100644
--- a/browser/components/firefoxview/firefoxview.mjs
+++ b/browser/components/firefoxview/firefoxview.mjs
@@ -21,12 +21,6 @@ let pageNav = null;
 let activeComponent = null;
 let searchKeyboardShortcut = null;
 
-const lazy = {};
-ChromeUtils.defineESModuleGetters(lazy, {
-  AIWindow:
-    "moz-src:///browser/components/aiwindow/ui/modules/AIWindow.sys.mjs",
-});
-
 const { topChromeWindow } = window.browsingContext;
 
 function onHashChange() {
@@ -74,7 +68,6 @@ async function updateSearchTextboxSize() {
     { id: "firefoxview-search-text-box-recentlyclosed" },
     { id: "firefoxview-search-text-box-tabs" },
     { id: "firefoxview-search-text-box-history" },
-    { id: "firefoxview-search-text-box-chats" },
   ];
   let maxLength = 30;
   for (const msg of await document.l10n.formatMessages(msgs)) {
@@ -107,12 +100,6 @@ function updateSyncVisibility() {
 window.addEventListener("DOMContentLoaded", async () => {
   recordEnteredTelemetry();
 
-  if (isAIWindow()) {
-    await import("chrome://browser/content/firefoxview/chats.mjs");
-    document.getElementById("firefoxview-chats-nav").hidden = false;
-    document.querySelector("view-chats").hidden = false;
-  }
-
   pageNav = document.querySelector("moz-page-nav");
   viewsDeck = document.querySelector("named-deck");
 
@@ -205,7 +192,3 @@ function onLocalesChanged() {
     updateSearchKeyboardShortcut();
   });
 }
-
-function isAIWindow() {
-  return lazy.AIWindow.isAIWindowActiveAndEnabled(topChromeWindow);
-}
diff --git a/browser/components/firefoxview/jar.mn b/browser/components/firefoxview/jar.mn
index e5da10dd53a1e..fb3ac508b2a76 100644
--- a/browser/components/firefoxview/jar.mn
+++ b/browser/components/firefoxview/jar.mn
@@ -5,9 +5,6 @@
 browser.jar:
     content/browser/firefoxview/card-container.css
     content/browser/firefoxview/card-container.mjs
-    content/browser/firefoxview/chats.mjs
-    content/browser/firefoxview/chats-tab-list.css
-    content/browser/firefoxview/chats-tab-list.mjs
     content/browser/firefoxview/firefoxview.html
     content/browser/firefoxview/firefoxview.mjs
     content/browser/firefoxview/history.css
@@ -37,8 +34,6 @@ browser.jar:
     content/browser/firefoxview/synced-tabs-error.svg (content/synced-tabs-error.svg)
     content/browser/callout-tab-pickup.svg (content/callout-tab-pickup.svg)
     content/browser/callout-tab-pickup-dark.svg (content/callout-tab-pickup-dark.svg)
-    content/browser/firefoxview/empty-chat.svg (content/empty-chat.svg)
-    content/browser/firefoxview/view-chats.svg (content/view-chats.svg)
     content/browser/firefoxview/view-history.svg (content/view-history.svg)
     content/browser/firefoxview/view-opentabs.svg (content/view-opentabs.svg)
     content/browser/firefoxview/view-recentbrowsing.svg (content/view-recentbrowsing.svg)
diff --git a/browser/components/firefoxview/tests/browser/browser.toml b/browser/components/firefoxview/tests/browser/browser.toml
index 7189237fd02b8..c4237a5744f12 100644
--- a/browser/components/firefoxview/tests/browser/browser.toml
+++ b/browser/components/firefoxview/tests/browser/browser.toml
@@ -6,8 +6,6 @@ prefs = [
   "browser.tabs.firefox-view.logLevel=All",
 ]
 
-["browser_chats_firefoxview.js"]
-
 ["browser_dragDrop_after_opening_fxViewTab.js"]
 skip-if = [
   "!headless", # Bug 1936459
diff --git a/browser/components/firefoxview/tests/browser/browser_chats_firefoxview.js b/browser/components/firefoxview/tests/browser/browser_chats_firefoxview.js
deleted file mode 100644
index a2fee8de27455..0000000000000
--- a/browser/components/firefoxview/tests/browser/browser_chats_firefoxview.js
+++ /dev/null
@@ -1,455 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-const { ChatStore, ChatConversation } = ChromeUtils.importESModule(
-  "moz-src:///browser/components/aiwindow/ui/modules/ChatStore.sys.mjs"
-);
-// AIWindow is provided by the test environment (e.g. head.js or the browser window); do not import it here.
-
-const TEST_URL1 = "https://example.com/";
-const TEST_URL2 = "https://mozilla.org/";
-const DAY_MS = 24 * 60 * 60 * 1000;
-
-let gChatStore;
-let gAIWindow;
-
-/**
- * Creates a test chat conversation with optional parameters.
- *
- * @param {object} options - Configuration options for the test chat
- * @param {string} [options.title="Test Chat"] - Title of the chat
- * @param {string} [options.url=TEST_URL1] - URL associated with the chat
- * @param {Date} [options.createdDate=new Date()] - When the chat was created
- * @param {Date} [options.updatedDate=createdDate] - When the chat was last updated
- * @param {number} [options.messageCount=1] - Number of message pairs to add
- * @returns {Promise<ChatConversation>} The created conversation object
- */
-async function addTestChat(options = {}) {
-  const {
-    title = "Test Chat",
-    url = TEST_URL1,
-    createdDate = new Date(),
-    updatedDate = createdDate,
-    messageCount = 1,
-  } = options;
-
-  const conversation = new ChatConversation({
-    createdDate: createdDate.getTime(),
-    updatedDate: updatedDate.getTime(),
-    pageUrl: url ? new URL(url) : null,
-  });
-  conversation.title = title;
-
-  for (let i = 0; i < messageCount; i++) {
-    conversation.addUserMessage(
-      `Test message ${i + 1}`,
-      url ? new URL(url) : null
-    );
-    conversation.addAssistantMessage("text", `Assistant response ${i + 1}`);
-  }
-
-  await gChatStore.updateConversation(conversation);
-  return conversation;
-}
-
-/**
- * Creates a test chat conversation without an associated URL.
- *
- * @param {object} options - Configuration options for the test chat
- * @returns {Promise<ChatConversation>} The created conversation object
- */
-async function addTestChatWithoutUrl(options = {}) {
-  return addTestChat({ ...options, url: null });
-}
-
-/**
- * Gets the rendered chat lists from the chats view.
- *
- * @param {Browser} browser - The browser containing the Firefox View
- * @returns {Promise<Array>} Array of chat list elements
- */
-async function getChatsList(browser) {
-  const { document } = browser.contentWindow;
-  const chatsView = document.querySelector("view-chats");
-  await TestUtils.waitForCondition(
-    () => chatsView && chatsView.lists?.length,
-    "Waiting for chats lists to render"
-  );
-  return chatsView.lists;
-}
-
-/**
- * Opens a new AI Window and waits for it to be ready.
- * The AI Window has the "ai-window" attribute on its document element,
- * which enables AI-specific features in Firefox View.
- *
- * @returns {Promise<Window>} The opened AI Window
- */
-async function openAIWindow() {
-  const win = await BrowserTestUtils.openNewBrowserWindow({ aiWindow: true });
-  await BrowserTestUtils.waitForMutationCondition(
-    win.document.documentElement,
-    { attributes: true },
-    () => win.document.documentElement.hasAttribute("ai-window")
-  );
-  return win;
-}
-
-/**
- * Waits for the chats navigation button to become visible in Firefox View.
- * The chats nav is only shown when an AI Window is active.
- *
- * @param {Document} document - The Firefox View document
- */
-async function waitForChatsNavVisible(document) {
-  await TestUtils.waitForCondition(() => {
-    const chatsNav = document.getElementById("firefoxview-chats-nav");
-    return chatsNav && !chatsNav.hidden;
-  }, "Waiting for chats navigation button to be visible");
-}
-
-/**
- * Waits for the chats view to render with the expected number of chat items.
- * This waits for both the controller cache to be ready and the DOM to render.
- *
- * @param {Browser} browser - The browser containing the Firefox View
- * @param {number} expectedCount - The expected number of chat items to render
- */
-async function waitForChatsReady(browser, expectedCount) {
-  const { document } = browser.contentWindow;
-  const chatsView = document.querySelector("view-chats");
-
-  // Wait for controller to update
-  await TestUtils.waitForCondition(
-    () => chatsView.controller && chatsView.controller.cache.entries,
-    "Waiting for controller cache to be ready"
-  );
-
-  // Wait for lists to render with expected count
-  await TestUtils.waitForCondition(
-    () => {
-      const lists = chatsView.lists;
-      if (!lists || !lists.length) {
-        return false;
-      }
-      const totalItems = Array.from(lists).reduce(
-        (sum, list) => sum + (list.rowEls?.length || 0),
-        0
-      );
-      return totalItems === expectedCount;
-    },
-    `Waiting for ${expectedCount} chat items to render`,
-    200,
-    100
-  );
-}
-
-add_setup(async function () {
-  // Enable AI Window feature
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.aiwindow.enabled", true],
-      ["browser.aiwindow.chatHistory.enabled", true],
-      ["browser.aiwindow.firstrun.hasCompleted", true],
-    ],
-  });
-
-  // Open an AI Window so Firefox View detects AI Window is active
-  gAIWindow = await openAIWindow();
-
-  gChatStore = AIWindow.chatStore;
-
-  // Clean database before tests
-  await gChatStore.destroyDatabase();
-
-  registerCleanupFunction(async () => {
-    await gChatStore.destroyDatabase();
-    if (gAIWindow) {
-      await BrowserTestUtils.closeWindow(gAIWindow);
-    }
-  });
-});
-
-add_task(async function test_chats_view_renders() {
-  await withFirefoxView({}, async browser => {
-    const { document } = browser.contentWindow;
-
-    await waitForChatsNavVisible(document);
-    await navigateToViewAndWait(document, "chats");
-
-    const chatsView = document.querySelector("view-chats");
-    Assert.ok(chatsView, "Chats view should be rendered");
-
-    // Wait for view to fully render
-    await TestUtils.waitForCondition(() => {
-      const emptyState = chatsView.emptyState;
-      return emptyState && BrowserTestUtils.isVisible(emptyState);
-    }, "Waiting for empty state to be visible");
-
-    const emptyState = chatsView.emptyState;
-    Assert.ok(emptyState, "Empty state element should exist");
-    Assert.ok(
-      BrowserTestUtils.isVisible(emptyState),
-      "Empty state should be visible when no chats exist"
-    );
-  });
-});
-
-add_task(async function test_chat_list_displays_items() {
-  const chat1 = await addTestChat({
-    title: "Chat with example.com",
-    url: TEST_URL1,
-  });
-  const chat2 = await addTestChat({
-    title: "Chat with example.org",
-    url: TEST_URL2,
-  });
-
-  await withFirefoxView({}, async browser => {
-    const { document } = browser.contentWindow;
-    await waitForChatsNavVisible(document);
-    await navigateToViewAndWait(document, "chats");
-
-    await waitForChatsReady(browser, 2);
-
-    const lists = await getChatsList(browser);
-    Assert.ok(lists.length, "At least one card should be rendered");
-
-    const totalItems = Array.from(lists).reduce(
-      (sum, list) => sum + list.rowEls.length,
-      0
-    );
-    Assert.equal(totalItems, 2, "Should display 2 chat items");
-
-    const firstRow = lists[0].rowEls[0];
-    const titleEl = firstRow.shadowRoot.querySelector(".fxview-tab-row-title");
-    Assert.ok(titleEl, "Chat should have title element");
-    Assert.ok(
-      titleEl.textContent.includes("Chat"),
-      "Chat title should be displayed"
-    );
-  });
-
-  await gChatStore.deleteConversationById(chat1.id);
-  await gChatStore.deleteConversationById(chat2.id);
-});
-
-add_task(async function test_chat_with_url_has_icon() {
-  const chat = await addTestChat({
-    title: "Chat with favicon",
-    url: TEST_URL1,
-  });
-
-  await withFirefoxView({}, async browser => {
-    const { document } = browser.contentWindow;
-    await waitForChatsNavVisible(document);
-    await navigateToViewAndWait(document, "chats");
-
-    await waitForChatsReady(browser, 1);
-
-    const lists = await getChatsList(browser);
-    const firstRow = lists[0].rowEls[0];
-    const icon = firstRow.shadowRoot.querySelector(".fxview-tab-row-favicon");
-
-    Assert.ok(icon, "Chat item should have favicon element");
-    const hasBackgroundImage =
-      icon.style.backgroundImage &&
-      icon.style.backgroundImage !== "none" &&
-      icon.style.backgroundImage !== '""';
-    Assert.ok(hasBackgroundImage, "Favicon should have a background image set");
-  });
-
-  await gChatStore.deleteConversationById(chat.id);
-});
-
-add_task(async function test_chat_without_url_displays() {
-  const chat = await addTestChatWithoutUrl({
-    title: "Chat without URL",
-  });
-
-  await withFirefoxView({}, async browser => {
-    const { document } = browser.contentWindow;
-    await waitForChatsNavVisible(document);
-    await navigateToViewAndWait(document, "chats");
-
-    await waitForChatsReady(browser, 1);
-
-    const lists = await getChatsList(browser);
-    Assert.ok(lists.length, "Should have at least one card");
-
-    const firstRow = lists[0].rowEls[0];
-    Assert.ok(firstRow, "Chat item should be displayed");
-
-    const titleEl = firstRow.shadowRoot.querySelector(".fxview-tab-row-title");
-    Assert.ok(
-      titleEl.textContent.includes("Chat without URL"),
-      "Chat title should be displayed for chat without URL"
-    );
-  });
-
-  await gChatStore.deleteConversationById(chat.id);
-});
-
-add_task(async function test_date_grouping_today() {
-  const chat = await addTestChat({
-    title: "Today's chat",
-    updatedDate: new Date(),
-  });
-
-  await withFirefoxView({}, async browser => {
-    const { document } = browser.contentWindow;
-    await waitForChatsNavVisible(document);
-    await navigateToViewAndWait(document, "chats");
-
-    await waitForChatsReady(browser, 1);
-
-    const lists = await getChatsList(browser);
-    Assert.greater(lists.length, 0, "Should have chat list for today");
-    Assert.equal(
-      lists[0].rowEls.length,
-      1,
-      "Should have 1 chat in today's list"
-    );
-  });
-
-  await gChatStore.deleteConversationById(chat.id);
-});
-
-add_task(async function test_date_grouping_yesterday() {
-  const yesterday = new Date(Date.now() - DAY_MS);
-  const chat = await addTestChat({
-    title: "Yesterday's chat",
-    updatedDate: yesterday,
-  });
-
-  await withFirefoxView({}, async browser => {
-    const { document } = browser.contentWindow;
-    await waitForChatsNavVisible(document);
-    await navigateToViewAndWait(document, "chats");
-
-    await waitForChatsReady(browser, 1);
-
-    const lists = await getChatsList(browser);
-    Assert.equal(
-      lists[0].rowEls.length,
-      1,
-      "Should have 1 chat from yesterday"
-    );
-  });
-
-  await gChatStore.deleteConversationById(chat.id);
-});
-
-add_task(async function test_chat_with_url_opens_sidebar() {
-  requestLongerTimeout(2);
-
-  const { AIWindowUI } = ChromeUtils.importESModule(
-    "moz-src:///browser/components/aiwindow/ui/modules/AIWindowUI.sys.mjs"
-  );
-
-  const chat = await addTestChat({
-    title: "Chat with URL for sidebar",
-    url: TEST_URL1,
-  });
-
-  await withFirefoxView({}, async browser => {
-    const { document } = browser.contentWindow;
-    await waitForChatsNavVisible(document);
-    await navigateToViewAndWait(document, "chats");
-
-    await waitForChatsReady(browser, 1);
-
-    const lists = await getChatsList(browser);
-    const firstRow = lists[0].rowEls[0];
-
-    // Verify the chat has a URL (which determines sidebar vs fullpage)
-    const conversation = await gChatStore.findConversationById(chat.id);
-    const mostRecentPage = conversation.getMostRecentPageVisited();
-    Assert.ok(mostRecentPage?.href, "Chat should have a URL for sidebar mode");
-    Assert.equal(
-      mostRecentPage.href,
-      TEST_URL1,
-      "Chat should have the correct URL"
-    );
-
-    const tabBrowser = browser.getTabBrowser();
-
-    const mainEl = firstRow.shadowRoot.querySelector(".fxview-tab-row-main");
-    const tabOpenedPromise = BrowserTestUtils.waitForNewTab(
-      tabBrowser,
-      TEST_URL1
-    );
-    EventUtils.synthesizeMouseAtCenter(mainEl, {}, browser.contentWindow);
-
-    const newTab = await tabOpenedPromise;
-    await BrowserTestUtils.browserLoaded(newTab.linkedBrowser);
-
-    // Verify the new tab loaded the URL
-    Assert.ok(
-      newTab.linkedBrowser.currentURI.spec.includes("example.com"),
-      "New tab should load the page URL"
-    );
-
-    // Wait for sidebar to open with longer timeout
-    await TestUtils.waitForCondition(
-      () => AIWindowUI.isSidebarOpen(newTab.ownerGlobal),
-      "Waiting for sidebar to open",
-      5000,
-      100
-    );
-
-    Assert.ok(
-      AIWindowUI.isSidebarOpen(newTab.ownerGlobal),
-      "Sidebar should be open in the new tab"
-    );
-
-    // Clean up
-    BrowserTestUtils.removeTab(newTab);
-  });
-
-  await gChatStore.deleteConversationById(chat.id);
-});
-
-add_task(async function test_delete_chat() {
-  const chat = await addTestChat({ title: "Chat to Delete" });
-
-  await withFirefoxView({}, async browser => {
-    const { document } = browser.contentWindow;
-    await waitForChatsNavVisible(document);
-    await navigateToViewAndWait(document, "chats");
-
-    await waitForChatsReady(browser, 1);
-
-    let lists = await getChatsList(browser);
-    Assert.equal(
-      lists[0].rowEls.length,
-      1,
-      "Should have 1 chat before deletion"
-    );
-
-    const chatsView = document.querySelector("view-chats");
-    const firstRow = lists[0].rowEls[0];
-
-    chatsView.triggerNode = firstRow;
-    await chatsView.controller.deleteChat();
-
-    // Wait for controller cache to update
-    await TestUtils.waitForCondition(
-      () => {
-        const cache = chatsView.controller.cache;
-        return (
-          !cache.entries ||
-          cache.entries.length === 0 ||
-          cache.entries.every(e => e.items.length === 0)
-        );
-      },
-      "Waiting for cache to reflect deletion",
-      200,
-      50
-    );
-
-    // Verify chat was deleted from database
-    const deletedChat = await gChatStore.findConversationById(chat.id);
-    Assert.equal(deletedChat, null, "Chat should be deleted from database");
-  });
-});
diff --git a/browser/locales/en-US/browser/firefoxView.ftl b/browser/locales/en-US/browser/firefoxView.ftl
index af71fa7b3344a..2cc71acb274a7 100644
--- a/browser/locales/en-US/browser/firefoxView.ftl
+++ b/browser/locales/en-US/browser/firefoxView.ftl
@@ -109,15 +109,6 @@ firefoxview-synced-tabs-nav = Tabs from other devices
   .title = Tabs from other devices
 firefoxview-synced-tabs-header = Tabs from other devices
 
-## Chats in this context refers to chats saved from the AI Window Assistant
-
-firefoxview-chats-nav = Chats
-  .title = Chats
-firefoxview-chats-header = Chats
-
-firefoxview-chat-context-delete = Delete from Chats
-    .accesskey = D
-
 ##
 
 # Used for a link in collapsible cards, in the ’Recent browsing’ page of Firefox View
@@ -160,10 +151,6 @@ firefoxview-search-text-box-tabs =
 firefoxview-search-text-box-opentabs =
   .placeholder = Search open tabs
 
-# Placeholder for the input field to search in open tabs ("search" is a verb).
-firefoxview-search-text-box-chats =
-  .placeholder = Search chats
-
 # "Search" is a noun (as in "Results of the search for")
 # Variables:
 #   $query (String) - The search query used for searching through browser history.
@@ -203,14 +190,6 @@ firefoxview-history-site-localhost = (local files)
 
 firefoxview-show-all-history = Show all history
 
-## Variables:
-##   $date (string) - Date to be formatted based on locale
-
-firefoxview-chat-date-today = Today - { DATETIME($date, dateStyle: "full") }
-firefoxview-chat-date-yesterday = Yesterday - { DATETIME($date, dateStyle: "full") }
-firefoxview-chat-date-this-month = { DATETIME($date, dateStyle: "full") }
-firefoxview-chat-date-prev-month = { DATETIME($date, month: "long", year: "numeric") }
-
 ## Message displayed in Firefox View when the user has no history data
 
 firefoxview-history-empty-header = Get back to where you’ve been

From 1d8c4813c95e127821ecb7c71dccb63993f51218 Mon Sep 17 00:00:00 2001
From: Release Engineering Landoscript <release+landoscript@mozilla.com>
Date: Thu, 29 Jan 2026 18:49:15 +0000
Subject: [PATCH 109/116] No Bug - Bumping Firefox l10n changesets r=release
 a=l10n-bump DONTBUILD CLOSED TREE

ach -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
af -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
an -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ar -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ast -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
az -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
be -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
bg -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
bn -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
bo -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
br -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
brx -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
bs -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ca -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ca-valencia -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
cak -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ckb -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
cs -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
cy -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
da -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
de -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
dsb -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
el -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
en-CA -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
en-GB -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
eo -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
es-AR -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
es-CL -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
es-ES -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
es-MX -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
et -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
eu -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
fa -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ff -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
fi -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
fr -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
fur -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
fy-NL -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ga-IE -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
gd -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
gl -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
gn -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
gu-IN -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
he -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
hi-IN -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
hr -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
hsb -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
hu -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
hy-AM -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
hye -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ia -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
id -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
is -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
it -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ja -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ja-JP-mac -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ka -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
kab -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
kk -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
km -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
kn -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ko -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
lij -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
lo -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
lt -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ltg -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
lv -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
meh -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
mk -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ml -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
mr -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ms -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
my -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
nb-NO -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ne-NP -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
nl -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
nn-NO -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
oc -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
pa-IN -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
pl -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
pt-BR -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
pt-PT -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
rm -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ro -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ru -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
sat -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
sc -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
scn -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
sco -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
si -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
sk -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
skr -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
sl -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
son -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
sq -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
sr -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
sv-SE -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
szl -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ta -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
te -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
tg -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
th -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
tl -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
tr -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
trs -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
uk -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ur -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
uz -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
vi -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
wo -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
xh -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
zh-CN -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
zh-TW -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
---
 browser/locales/l10n-changesets.json | 226 +++++++++++++--------------
 1 file changed, 113 insertions(+), 113 deletions(-)

diff --git a/browser/locales/l10n-changesets.json b/browser/locales/l10n-changesets.json
index 83c42adc8d30a..1a5654375014f 100644
--- a/browser/locales/l10n-changesets.json
+++ b/browser/locales/l10n-changesets.json
@@ -15,7 +15,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "af": {
         "pin": false,
@@ -33,7 +33,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "an": {
         "pin": false,
@@ -51,7 +51,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ar": {
         "pin": false,
@@ -69,7 +69,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ast": {
         "pin": false,
@@ -87,7 +87,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "az": {
         "pin": false,
@@ -105,7 +105,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "be": {
         "pin": false,
@@ -123,7 +123,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "bg": {
         "pin": false,
@@ -141,7 +141,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "bn": {
         "pin": false,
@@ -159,7 +159,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "bo": {
         "pin": false,
@@ -177,7 +177,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "br": {
         "pin": false,
@@ -195,7 +195,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "brx": {
         "pin": false,
@@ -213,7 +213,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "bs": {
         "pin": false,
@@ -231,7 +231,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ca": {
         "pin": false,
@@ -249,7 +249,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ca-valencia": {
         "pin": false,
@@ -267,7 +267,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "cak": {
         "pin": false,
@@ -285,7 +285,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ckb": {
         "pin": false,
@@ -303,7 +303,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "cs": {
         "pin": false,
@@ -321,7 +321,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "cy": {
         "pin": false,
@@ -339,7 +339,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "da": {
         "pin": false,
@@ -357,7 +357,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "de": {
         "pin": false,
@@ -375,7 +375,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "dsb": {
         "pin": false,
@@ -393,7 +393,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "el": {
         "pin": false,
@@ -411,7 +411,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "en-CA": {
         "pin": false,
@@ -429,7 +429,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "en-GB": {
         "pin": false,
@@ -447,7 +447,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "eo": {
         "pin": false,
@@ -465,7 +465,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "es-AR": {
         "pin": false,
@@ -483,7 +483,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "es-CL": {
         "pin": false,
@@ -501,7 +501,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "es-ES": {
         "pin": false,
@@ -519,7 +519,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "es-MX": {
         "pin": false,
@@ -537,7 +537,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "et": {
         "pin": false,
@@ -555,7 +555,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "eu": {
         "pin": false,
@@ -573,7 +573,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "fa": {
         "pin": false,
@@ -591,7 +591,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ff": {
         "pin": false,
@@ -609,7 +609,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "fi": {
         "pin": false,
@@ -627,7 +627,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "fr": {
         "pin": false,
@@ -645,7 +645,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "fur": {
         "pin": false,
@@ -663,7 +663,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "fy-NL": {
         "pin": false,
@@ -681,7 +681,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ga-IE": {
         "pin": false,
@@ -699,7 +699,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "gd": {
         "pin": false,
@@ -717,7 +717,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "gl": {
         "pin": false,
@@ -735,7 +735,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "gn": {
         "pin": false,
@@ -753,7 +753,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "gu-IN": {
         "pin": false,
@@ -771,7 +771,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "he": {
         "pin": false,
@@ -789,7 +789,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "hi-IN": {
         "pin": false,
@@ -807,7 +807,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "hr": {
         "pin": false,
@@ -825,7 +825,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "hsb": {
         "pin": false,
@@ -843,7 +843,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "hu": {
         "pin": false,
@@ -861,7 +861,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "hy-AM": {
         "pin": false,
@@ -879,7 +879,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "hye": {
         "pin": false,
@@ -897,7 +897,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ia": {
         "pin": false,
@@ -915,7 +915,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "id": {
         "pin": false,
@@ -933,7 +933,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "is": {
         "pin": false,
@@ -951,7 +951,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "it": {
         "pin": false,
@@ -969,7 +969,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ja": {
         "pin": false,
@@ -985,7 +985,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ja-JP-mac": {
         "pin": false,
@@ -993,7 +993,7 @@
             "macosx64",
             "macosx64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ka": {
         "pin": false,
@@ -1011,7 +1011,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "kab": {
         "pin": false,
@@ -1029,7 +1029,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "kk": {
         "pin": false,
@@ -1047,7 +1047,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "km": {
         "pin": false,
@@ -1065,7 +1065,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "kn": {
         "pin": false,
@@ -1083,7 +1083,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ko": {
         "pin": false,
@@ -1101,7 +1101,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "lij": {
         "pin": false,
@@ -1119,7 +1119,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "lo": {
         "pin": false,
@@ -1137,7 +1137,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "lt": {
         "pin": false,
@@ -1155,7 +1155,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ltg": {
         "pin": false,
@@ -1173,7 +1173,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "lv": {
         "pin": false,
@@ -1191,7 +1191,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "meh": {
         "pin": false,
@@ -1209,7 +1209,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "mk": {
         "pin": false,
@@ -1227,7 +1227,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ml": {
         "pin": false,
@@ -1245,7 +1245,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "mr": {
         "pin": false,
@@ -1263,7 +1263,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ms": {
         "pin": false,
@@ -1281,7 +1281,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "my": {
         "pin": false,
@@ -1299,7 +1299,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "nb-NO": {
         "pin": false,
@@ -1317,7 +1317,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ne-NP": {
         "pin": false,
@@ -1335,7 +1335,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "nl": {
         "pin": false,
@@ -1353,7 +1353,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "nn-NO": {
         "pin": false,
@@ -1371,7 +1371,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "oc": {
         "pin": false,
@@ -1389,7 +1389,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "pa-IN": {
         "pin": false,
@@ -1407,7 +1407,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "pl": {
         "pin": false,
@@ -1425,7 +1425,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "pt-BR": {
         "pin": false,
@@ -1443,7 +1443,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "pt-PT": {
         "pin": false,
@@ -1461,7 +1461,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "rm": {
         "pin": false,
@@ -1479,7 +1479,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ro": {
         "pin": false,
@@ -1497,7 +1497,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ru": {
         "pin": false,
@@ -1515,7 +1515,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "sat": {
         "pin": false,
@@ -1533,7 +1533,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "sc": {
         "pin": false,
@@ -1551,7 +1551,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "scn": {
         "pin": false,
@@ -1569,7 +1569,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "sco": {
         "pin": false,
@@ -1587,7 +1587,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "si": {
         "pin": false,
@@ -1605,7 +1605,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "sk": {
         "pin": false,
@@ -1623,7 +1623,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "skr": {
         "pin": false,
@@ -1641,7 +1641,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "sl": {
         "pin": false,
@@ -1659,7 +1659,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "son": {
         "pin": false,
@@ -1677,7 +1677,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "sq": {
         "pin": false,
@@ -1695,7 +1695,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "sr": {
         "pin": false,
@@ -1713,7 +1713,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "sv-SE": {
         "pin": false,
@@ -1731,7 +1731,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "szl": {
         "pin": false,
@@ -1749,7 +1749,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ta": {
         "pin": false,
@@ -1767,7 +1767,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "te": {
         "pin": false,
@@ -1785,7 +1785,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "tg": {
         "pin": false,
@@ -1803,7 +1803,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "th": {
         "pin": false,
@@ -1821,7 +1821,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "tl": {
         "pin": false,
@@ -1839,7 +1839,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "tr": {
         "pin": false,
@@ -1857,7 +1857,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "trs": {
         "pin": false,
@@ -1875,7 +1875,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "uk": {
         "pin": false,
@@ -1893,7 +1893,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ur": {
         "pin": false,
@@ -1911,7 +1911,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "uz": {
         "pin": false,
@@ -1929,7 +1929,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "vi": {
         "pin": false,
@@ -1947,7 +1947,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "wo": {
         "pin": false,
@@ -1965,7 +1965,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "xh": {
         "pin": false,
@@ -1983,7 +1983,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "zh-CN": {
         "pin": false,
@@ -2001,7 +2001,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "zh-TW": {
         "pin": false,
@@ -2019,6 +2019,6 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     }
 }
\ No newline at end of file

From 4cede2f9841a60569951e80fce5015200b75c07c Mon Sep 17 00:00:00 2001
From: Release Engineering Landoscript <release+landoscript@mozilla.com>
Date: Thu, 29 Jan 2026 18:49:17 +0000
Subject: [PATCH 110/116] No Bug - Bumping Mobile l10n changesets r=release
 a=l10n-bump DONTBUILD CLOSED TREE

ach -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
an -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ar -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ast -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
az -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
be -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
bg -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
bn -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
br -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
bs -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ca -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
cak -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
cs -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
cy -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
da -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
de -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
dsb -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
el -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
en-CA -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
en-GB -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
eo -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
es-AR -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
es-CL -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
es-ES -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
es-MX -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
et -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
eu -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
fa -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ff -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
fi -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
fr -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
fy-NL -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ga-IE -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
gd -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
gl -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
gn -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
gu-IN -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
he -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
hi-IN -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
hr -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
hsb -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
hu -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
hy-AM -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ia -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
id -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
is -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
it -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ja -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ka -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
kab -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
kk -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
km -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
kn -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ko -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
lij -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
lo -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
lt -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ltg -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
lv -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
meh -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
mix -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ml -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
mr -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ms -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
my -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
nb-NO -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ne-NP -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
nl -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
nn-NO -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
oc -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
pa-IN -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
pl -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
pt-BR -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
pt-PT -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
rm -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ro -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ru -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
sk -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
sl -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
son -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
sq -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
sr -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
sv-SE -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ta -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
te -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
th -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
tl -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
tr -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
trs -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
uk -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
ur -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
uz -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
vi -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
wo -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
xh -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
zam -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
zh-CN -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
zh-TW -> 7c77718c6cc1c3607cb5584c7272359a7a51f120
---
 mobile/locales/l10n-changesets.json | 196 ++++++++++++++--------------
 1 file changed, 98 insertions(+), 98 deletions(-)

diff --git a/mobile/locales/l10n-changesets.json b/mobile/locales/l10n-changesets.json
index 67f3c8317f87b..ae7497e707c72 100644
--- a/mobile/locales/l10n-changesets.json
+++ b/mobile/locales/l10n-changesets.json
@@ -6,7 +6,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "an": {
         "pin": false,
@@ -15,7 +15,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ar": {
         "pin": false,
@@ -24,7 +24,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ast": {
         "pin": false,
@@ -33,7 +33,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "az": {
         "pin": false,
@@ -42,7 +42,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "be": {
         "pin": false,
@@ -51,7 +51,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "bg": {
         "pin": false,
@@ -60,7 +60,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "bn": {
         "pin": false,
@@ -69,7 +69,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "br": {
         "pin": false,
@@ -78,7 +78,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "bs": {
         "pin": false,
@@ -87,7 +87,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ca": {
         "pin": false,
@@ -96,7 +96,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "cak": {
         "pin": false,
@@ -105,7 +105,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "cs": {
         "pin": false,
@@ -114,7 +114,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "cy": {
         "pin": false,
@@ -123,7 +123,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "da": {
         "pin": false,
@@ -132,7 +132,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "de": {
         "pin": false,
@@ -141,7 +141,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "dsb": {
         "pin": false,
@@ -150,7 +150,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "el": {
         "pin": false,
@@ -159,7 +159,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "en-CA": {
         "pin": false,
@@ -168,7 +168,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "en-GB": {
         "pin": false,
@@ -177,7 +177,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "eo": {
         "pin": false,
@@ -186,7 +186,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "es-AR": {
         "pin": false,
@@ -195,7 +195,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "es-CL": {
         "pin": false,
@@ -204,7 +204,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "es-ES": {
         "pin": false,
@@ -213,7 +213,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "es-MX": {
         "pin": false,
@@ -222,7 +222,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "et": {
         "pin": false,
@@ -231,7 +231,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "eu": {
         "pin": false,
@@ -240,7 +240,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "fa": {
         "pin": false,
@@ -249,7 +249,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ff": {
         "pin": false,
@@ -258,7 +258,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "fi": {
         "pin": false,
@@ -267,7 +267,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "fr": {
         "pin": false,
@@ -276,7 +276,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "fy-NL": {
         "pin": false,
@@ -285,7 +285,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ga-IE": {
         "pin": false,
@@ -294,7 +294,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "gd": {
         "pin": false,
@@ -303,7 +303,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "gl": {
         "pin": false,
@@ -312,7 +312,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "gn": {
         "pin": false,
@@ -321,7 +321,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "gu-IN": {
         "pin": false,
@@ -330,7 +330,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "he": {
         "pin": false,
@@ -339,7 +339,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "hi-IN": {
         "pin": false,
@@ -348,7 +348,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "hr": {
         "pin": false,
@@ -357,7 +357,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "hsb": {
         "pin": false,
@@ -366,7 +366,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "hu": {
         "pin": false,
@@ -375,7 +375,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "hy-AM": {
         "pin": false,
@@ -384,7 +384,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ia": {
         "pin": false,
@@ -393,7 +393,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "id": {
         "pin": false,
@@ -402,7 +402,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "is": {
         "pin": false,
@@ -411,7 +411,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "it": {
         "pin": false,
@@ -420,7 +420,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ja": {
         "pin": false,
@@ -429,7 +429,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ka": {
         "pin": false,
@@ -438,7 +438,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "kab": {
         "pin": false,
@@ -447,7 +447,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "kk": {
         "pin": false,
@@ -456,7 +456,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "km": {
         "pin": false,
@@ -465,7 +465,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "kn": {
         "pin": false,
@@ -474,7 +474,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ko": {
         "pin": false,
@@ -483,7 +483,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "lij": {
         "pin": false,
@@ -492,7 +492,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "lo": {
         "pin": false,
@@ -501,7 +501,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "lt": {
         "pin": false,
@@ -510,7 +510,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ltg": {
         "pin": false,
@@ -519,7 +519,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "lv": {
         "pin": false,
@@ -528,7 +528,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "meh": {
         "pin": false,
@@ -537,7 +537,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "mix": {
         "pin": false,
@@ -546,7 +546,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ml": {
         "pin": false,
@@ -555,7 +555,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "mr": {
         "pin": false,
@@ -564,7 +564,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ms": {
         "pin": false,
@@ -573,7 +573,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "my": {
         "pin": false,
@@ -582,7 +582,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "nb-NO": {
         "pin": false,
@@ -591,7 +591,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ne-NP": {
         "pin": false,
@@ -600,7 +600,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "nl": {
         "pin": false,
@@ -609,7 +609,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "nn-NO": {
         "pin": false,
@@ -618,7 +618,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "oc": {
         "pin": false,
@@ -627,7 +627,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "pa-IN": {
         "pin": false,
@@ -636,7 +636,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "pl": {
         "pin": false,
@@ -645,7 +645,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "pt-BR": {
         "pin": false,
@@ -654,7 +654,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "pt-PT": {
         "pin": false,
@@ -663,7 +663,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "rm": {
         "pin": false,
@@ -672,7 +672,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ro": {
         "pin": false,
@@ -681,7 +681,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ru": {
         "pin": false,
@@ -690,7 +690,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "sk": {
         "pin": false,
@@ -699,7 +699,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "sl": {
         "pin": false,
@@ -708,7 +708,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "son": {
         "pin": false,
@@ -717,7 +717,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "sq": {
         "pin": false,
@@ -726,7 +726,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "sr": {
         "pin": false,
@@ -735,7 +735,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "sv-SE": {
         "pin": false,
@@ -744,7 +744,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ta": {
         "pin": false,
@@ -753,7 +753,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "te": {
         "pin": false,
@@ -762,7 +762,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "th": {
         "pin": false,
@@ -771,7 +771,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "tl": {
         "pin": false,
@@ -780,7 +780,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "tr": {
         "pin": false,
@@ -789,7 +789,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "trs": {
         "pin": false,
@@ -798,7 +798,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "uk": {
         "pin": false,
@@ -807,7 +807,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "ur": {
         "pin": false,
@@ -816,7 +816,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "uz": {
         "pin": false,
@@ -825,7 +825,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "vi": {
         "pin": false,
@@ -834,7 +834,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "wo": {
         "pin": false,
@@ -843,7 +843,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "xh": {
         "pin": false,
@@ -852,7 +852,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "zam": {
         "pin": false,
@@ -861,7 +861,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "zh-CN": {
         "pin": false,
@@ -870,7 +870,7 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     },
     "zh-TW": {
         "pin": false,
@@ -879,6 +879,6 @@
             "android-arm",
             "android-multilocale"
         ],
-        "revision": "a703deb818613cc35e3e8b5d9a9a31880686b901"
+        "revision": "7c77718c6cc1c3607cb5584c7272359a7a51f120"
     }
 }
\ No newline at end of file

From b27319d90e9affb58951f8fc9383cce188d60d37 Mon Sep 17 00:00:00 2001
From: Sandor Molnar <smolnar@mozilla.com>
Date: Thu, 29 Jan 2026 20:51:29 +0200
Subject: [PATCH 111/116] Revert "Bug 1994763 - Ignore UAWidget when computing
 the offset iin nsContentUtils::GetFlattenedTreeAncestorsAndOffsets();
 r=masayuki" for causing mochitest failures @ test_htmlcopyencoder_details

This reverts commit d7693f55e44a55119a462e2f9ed2d94214757a1e.
---
 dom/base/nsContentUtils.cpp                   |  20 +--
 dom/base/nsContentUtils.h                     |   2 -
 dom/serializers/nsDocumentEncoder.cpp         |  12 +-
 .../tests/mochitest/mochitest.toml            |   2 -
 .../test_htmlcopyencoder_details.html         | 160 ------------------
 5 files changed, 2 insertions(+), 194 deletions(-)
 delete mode 100644 dom/serializers/tests/mochitest/test_htmlcopyencoder_details.html

diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
index be53d54487d58..ed175f9f2fe32 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@@ -3266,20 +3266,6 @@ nsresult nsContentUtils::GetInclusiveAncestorsAndOffsets(
       });
 }
 
-static inline Maybe<uint32_t> ComputeFlatTreeIndexOfForSelection(
-    const nsIContent* const aParent, const nsIContent* const aPossibleChild) {
-  MOZ_ASSERT(aParent);
-  MOZ_ASSERT(aPossibleChild);
-  if (HTMLSlotElement* slot = aPossibleChild->GetAssignedSlot()) {
-    if (const ShadowRoot* shadowRoot = slot->GetContainingShadow()) {
-      if (shadowRoot->IsUAWidget()) {
-        return aParent->ComputeIndexOf(aPossibleChild);
-      }
-    }
-  }
-  return aParent->ComputeFlatTreeIndexOf(aPossibleChild);
-}
-
 nsresult nsContentUtils::GetFlattenedTreeAncestorsAndOffsets(
     nsINode* aNode, uint32_t aOffset, nsTArray<nsIContent*>& aAncestorNodes,
     nsTArray<Maybe<uint32_t>>& aAncestorOffsets) {
@@ -3290,11 +3276,7 @@ nsresult nsContentUtils::GetFlattenedTreeAncestorsAndOffsets(
             GetParentFuncForComparison<TreeKind::Flat>(aContent));
       },
       [](nsIContent* aParent, nsIContent* aChild) {
-        // GetParentFuncForComparison() with TreeKind::Flat ignores the
-        // UAWidget, so we should do the same when computing the offset.
-        // XXX: Maybe we should use RawRangeBoundary instead of holding ancestor
-        // and offset separately.
-        return ComputeFlatTreeIndexOfForSelection(aParent, aChild);
+        return aParent->ComputeFlatTreeIndexOf(aChild);
       });
 }
 
diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h
index 36892f876552c..e9a23b6e762c8 100644
--- a/dom/base/nsContentUtils.h
+++ b/dom/base/nsContentUtils.h
@@ -519,8 +519,6 @@ class nsContentUtils {
    *
    * When the current content is a ShadowRoot, the offset of it from
    * its ancestor (the host element) will be Nothing().
-   *
-   * The UAWidget won't be included in the ancestor list.
    */
   static nsresult GetFlattenedTreeAncestorsAndOffsets(
       nsINode* aNode, uint32_t aOffset, nsTArray<nsIContent*>& aAncestorNodes,
diff --git a/dom/serializers/nsDocumentEncoder.cpp b/dom/serializers/nsDocumentEncoder.cpp
index 518a3d63b058f..d88c70284185f 100644
--- a/dom/serializers/nsDocumentEncoder.cpp
+++ b/dom/serializers/nsDocumentEncoder.cpp
@@ -1234,16 +1234,6 @@ nsDocumentEncoder::RangeSerializer::SerializeNodePartiallyContainedInRange(
   return NS_OK;
 }
 
-static nsINode* GetChildAtInFlatTreeForSelection(const nsINode& aNode,
-                                                 const uint32_t aIndex) {
-  if (ShadowRoot* shadowRoot = aNode.GetShadowRoot()) {
-    if (shadowRoot->IsUAWidget()) {
-      return aNode.GetChildAt_Deprecated(aIndex);
-    }
-  }
-  return aNode.GetChildAtInFlatTree(aIndex);
-}
-
 nsresult nsDocumentEncoder::RangeSerializer::SerializeChildrenOfContent(
     nsIContent& aContent, uint32_t aStartOffset, uint32_t aEndOffset,
     const nsRange* aRange, int32_t aDepth) {
@@ -1262,7 +1252,7 @@ nsresult nsDocumentEncoder::RangeSerializer::SerializeChildrenOfContent(
 
   nsINode* childAsNode =
       mAllowCrossShadowBoundary == AllowRangeCrossShadowBoundary::Yes
-          ? GetChildAtInFlatTreeForSelection(aContent, aStartOffset)
+          ? aContent.GetChildAtInFlatTree(aStartOffset)
           : aContent.GetChildAt_Deprecated(aStartOffset);
 
   MOZ_ASSERT_IF(childAsNode, childAsNode->IsContent());
diff --git a/dom/serializers/tests/mochitest/mochitest.toml b/dom/serializers/tests/mochitest/mochitest.toml
index 039420fcb0b39..5482779e765fe 100644
--- a/dom/serializers/tests/mochitest/mochitest.toml
+++ b/dom/serializers/tests/mochitest/mochitest.toml
@@ -132,8 +132,6 @@ skip-if = [
 
 ["test_htmlcopyencoder_common_ancestor.html"]
 
-["test_htmlcopyencoder_details.html"]
-
 ["test_htmlcopyencoder_list.html"]
 
 ["test_htmlcopyencoder_table.html"]
diff --git a/dom/serializers/tests/mochitest/test_htmlcopyencoder_details.html b/dom/serializers/tests/mochitest/test_htmlcopyencoder_details.html
deleted file mode 100644
index 4990feec95e6a..0000000000000
--- a/dom/serializers/tests/mochitest/test_htmlcopyencoder_details.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
--->
-<head>
-<title>Test on the html copy encoder for details selection</title>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1994763">Mozilla Bug 1994763</a>
-<p id="display"></p>
-<div id="content" style="display: none"></div>
-<div id="container">
-  <details id="basic" open>
-    <summary>Basic</summary>First<br>Second<br>Third<br>
-  </details>
-  <details id="nested" open>
-    <summary>Outer</summary>Before<br>
-    <details open>
-      <summary>Inner</summary>First<br>Second<br>Third
-    </details>
-    <br>After<br>
-  </details>
-  <details id="nested-shadow" open>
-    <summary>Outer</summary>
-    <br>Before<br>
-    <div>
-      <template shadowrootmode="open">
-        <br>InnerBefore<br>
-        <slot></slot>
-        <br>InnerAfter<br>
-      </template>
-      <details open>
-        <summary>Inner</summary>First<br>Second<br>Third
-      </details>
-    </div>
-    <br>After<br>
-  </details>
-</div>
-<script>
-
-/* global describe, it, beforeEach */
-
-const de = SpecialPowers.Ci.nsIDocumentEncoder;
-const encoder = SpecialPowers.Cu.createHTMLCopyEncoder();
-
-function testSelectDetailsAndSerialize(aDescription, aSetupSelection, aExpectedTextResult,
-                                       aExpectedHTMLResult) {
-  it(aDescription, () => {
-    info("Setup selection");
-    const selection = window.getSelection();
-    selection.removeAllRanges();
-    aSetupSelection(selection);
-
-    info("Initialize encoder for text/plain");
-    encoder.init(document, "text/plain", de.AllowCrossShadowBoundary);
-    encoder.setSelection(selection);
-    is(encoder.encodeToString(), aExpectedTextResult, "check text/plain result");
-
-    info("Initialize encoder for text/html");
-    encoder.init(document, "text/html", de.AllowCrossShadowBoundary);
-    encoder.setSelection(selection);
-
-    const htmlContext = { value: '' };
-    const htmlInfo = { value: '' };
-    is(encoder.encodeToStringWithContext(htmlContext, htmlInfo),
-       aExpectedHTMLResult, "check text/html result");
-  });
-}
-
-testSelectDetailsAndSerialize(
-  "Test selecting summary content",
-  (aSelection) => {
-    const details = document.querySelector("details#basic");
-    const range = document.createRange();
-    range.selectNodeContents(details.firstElementChild);
-    aSelection.addRange(range);
-  },
-  "Basic",
-  "Basic"
-);
-
-testSelectDetailsAndSerialize(
-  "Test selecting partial details content",
-  (aSelection) => {
-    const details = document.querySelector("details#basic");
-    const range = document.createRange();
-    // Start at the beginning of "Second"
-    range.setStart(details.childNodes[4], 0);
-    // End at the end of "Third"
-    range.setEnd(details.childNodes[6], 5);
-    aSelection.addRange(range);
-  },
-  "Second\nThird",
-  "Second<br>Third"
-);
-
-testSelectDetailsAndSerialize(
-  "Test selecting whole details content",
-  (aSelection) => {
-    const details = document.querySelector("details#basic");
-    const range = document.createRange();
-    // Start at the beginning of <summary>
-    range.setStart(details.childNodes[1], 0);
-    // End at the end of "Third"
-    range.setEnd(details.childNodes[6], 5);
-    aSelection.addRange(range);
-  },
-  "Basic\nFirst\nSecond\nThird",
-  "<summary>Basic</summary>First<br>Second<br>Third"
-);
-
-testSelectDetailsAndSerialize(
-  "Test selecting nested details content",
-  (aSelection) => {
-    const details = document.querySelector("details#nested");
-    const range = document.createRange();
-    // Start at the beginning of "Before"
-    range.setStart(details.childNodes[2], 0);
-    // End at the end of "After"
-    range.setEnd(details.childNodes[8], 5);
-    aSelection.addRange(range);
-  },
-  "Before\nInner\nFirst\nSecond\nThird\n\nAfter",
-  "Before<br>\n" +
-    "    <details open=\"\">\n" +
-    "      <summary>Inner</summary>First<br>Second<br>Third\n" +
-    "    </details>\n" +
-    "    <br>After"
-);
-
-testSelectDetailsAndSerialize(
-  "Test selecting nested-shadow details content",
-  (aSelection) => {
-    const details = document.querySelector("details#nested-shadow");
-    const range = document.createRange();
-    // Start at the beginning of "Before"
-    range.setStart(details.childNodes[4], 0);
-    // End at the end of "After"
-    range.setEnd(details.childNodes[10], 5);
-    aSelection.addRange(range);
-  },
-  "Before\n\nInnerBefore\nInner\nFirst\nSecond\nThird\n\nInnerAfter\n\nAfter",
-  "Before<br>\n" +
-    "    <div>\n" +
-    "        <br>InnerBefore<br>\n" +
-    "        <slot>\n      \n" +
-    "      <details open=\"\">\n" +
-    "        <summary>Inner</summary>First<br>Second<br>Third\n" +
-    "      </details>\n" +
-    "    </slot>\n" +
-    "        <br>InnerAfter<br>\n" +
-    "      </div>\n" +
-    "    <br>After"
-);
-
-</script>
-</body>
-</html>

From 070651af740ab281a1b7ec860fe7ad09e38e051a Mon Sep 17 00:00:00 2001
From: Sandor Molnar <smolnar@mozilla.com>
Date: Thu, 29 Jan 2026 20:51:51 +0200
Subject: [PATCH 112/116] Revert "Bug 1978714 - Ignore UAWidget when
 nsContentUtils::GetIndexInParent() is called with TreeKind::Flat; r=masayuki"
 for causing mochitest failures @ test_htmlcopyencoder_details

This reverts commit 23721b7e0202ed631143a6f4dec6e05af78ac29f.
---
 dom/base/nsContentUtils.cpp | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
index ed175f9f2fe32..b0c98e4197e23 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@@ -12569,22 +12569,7 @@ Maybe<int32_t> nsContentUtils::GetIndexInParent(const nsINode* aParent,
                 aKind == TreeKind::ShadowIncludingDOM) {
     idx = aParent->ComputeIndexOf(aNode);
   } else {
-    idx = [&]() -> Maybe<uint32_t> {
-      if (aNode->IsContent()) {
-        if (HTMLSlotElement* slot = aNode->AsContent()->GetAssignedSlot()) {
-          // If the assigned slot is in the UAWidget anonymous subtree of
-          // aParent, this is likely being called for selection purposes. In
-          // this case, we should ignore the UAWidget.
-          // XXX: Bug 2008277 is going to introduce a TreeKind for selection and
-          // then we can use that here instead.
-          if (slot->GetClosestNativeAnonymousSubtreeRootParentOrHost() ==
-              aParent) {
-            return aParent->ComputeIndexOf(aNode);
-          }
-        }
-      }
-      return aParent->ComputeFlatTreeIndexOf(aNode);
-    }();
+    idx = aParent->ComputeFlatTreeIndexOf(aNode);
   }
 
   if (idx) {

From 4ef53c128491861f1582800785bc79e6be8883bd Mon Sep 17 00:00:00 2001
From: Sandor Molnar <smolnar@mozilla.com>
Date: Thu, 29 Jan 2026 21:14:18 +0200
Subject: [PATCH 113/116] Revert "Bug 2009780 - persist our webcompat
 intervention and SmartBlock content scripts across browser restarts;
 r=denschub,webcompat-reviewers,ksenia" for causing Bug 2013323

This reverts commit bc55aef412c0bb46579b45cca09b33c0fb870eb3.
---
 .../webcompat/experiment-apis/appConstants.js |  27 --
 .../experiment-apis/appConstants.json         |  10 -
 .../webcompat/lib/intervention_helpers.js     | 113 +------
 .../extensions/webcompat/lib/interventions.js |  83 ++----
 browser/extensions/webcompat/lib/shims.js     |  54 +---
 browser/extensions/webcompat/manifest.json    |   2 +-
 browser/extensions/webcompat/moz.build        |   2 -
 .../webcompat/tests/browser/head.js           |   2 +
 .../webcompat/tests/marionette/manifest.toml  |   6 -
 .../test_persistent_contentscripts.py         | 277 ------------------
 10 files changed, 45 insertions(+), 531 deletions(-)
 delete mode 100644 browser/extensions/webcompat/tests/marionette/manifest.toml
 delete mode 100644 browser/extensions/webcompat/tests/marionette/test_persistent_contentscripts.py

diff --git a/browser/extensions/webcompat/experiment-apis/appConstants.js b/browser/extensions/webcompat/experiment-apis/appConstants.js
index 277890fca8f3f..0c20caf6ab9a4 100644
--- a/browser/extensions/webcompat/experiment-apis/appConstants.js
+++ b/browser/extensions/webcompat/experiment-apis/appConstants.js
@@ -6,26 +6,6 @@
 
 /* global AppConstants, ExtensionAPI, XPCOMUtils */
 
-const lazy = {};
-
-if (AppConstants.ENABLE_WEBDRIVER) {
-  XPCOMUtils.defineLazyServiceGetter(
-    lazy,
-    "Marionette",
-    "@mozilla.org/remote/marionette;1",
-    Ci.nsIMarionette
-  );
-  XPCOMUtils.defineLazyServiceGetter(
-    lazy,
-    "RemoteAgent",
-    "@mozilla.org/remote/agent;1",
-    Ci.nsIRemoteAgent
-  );
-} else {
-  lazy.Marionette = { running: false };
-  lazy.RemoteAgent = { running: false };
-}
-
 this.appConstants = class extends ExtensionAPI {
   getAPI() {
     return {
@@ -68,13 +48,6 @@ this.appConstants = class extends ExtensionAPI {
           }
           return "unknown";
         },
-        isInAutomation: () => {
-          return (
-            Cu.isInAutomation ||
-            lazy.Marionette.running ||
-            lazy.RemoteAgent.running
-          );
-        },
       },
     };
   }
diff --git a/browser/extensions/webcompat/experiment-apis/appConstants.json b/browser/extensions/webcompat/experiment-apis/appConstants.json
index e48807e751e15..4ccf13bed6d75 100644
--- a/browser/extensions/webcompat/experiment-apis/appConstants.json
+++ b/browser/extensions/webcompat/experiment-apis/appConstants.json
@@ -52,16 +52,6 @@
           "type": "string",
           "description": "The release branch (dev_edition, early_beta_or_earlier, nightly, release_or_beta, or unknown)."
         }
-      },
-      {
-        "name": "isInAutomation",
-        "type": "function",
-        "description": "",
-        "parameters": [],
-        "returns": {
-          "type": "boolean",
-          "description": "Whether Firefox is running in automation."
-        }
       }
     ]
   }
diff --git a/browser/extensions/webcompat/lib/intervention_helpers.js b/browser/extensions/webcompat/lib/intervention_helpers.js
index 6f90e3a619e79..19020bbb7c02c 100644
--- a/browser/extensions/webcompat/lib/intervention_helpers.js
+++ b/browser/extensions/webcompat/lib/intervention_helpers.js
@@ -552,111 +552,20 @@ var InterventionHelpers = {
         stillNeeded
       );
     } catch (e) {
-      for (const script of scriptsToReg) {
-        try {
-          await browser.scripting.registerContentScripts(scriptsToReg);
-        } catch (e2) {
-          console.error(
-            `Error while registering ${typeStr} content script`,
-            script,
-            e2
-          );
-        }
-      }
-      debugLog(
-        `Registered ${typeStr} content scripts after error registering just non-active ones`,
-        scriptsToReg,
-        e
-      );
-    }
-  },
-
-  async ensureOnlyTheseContentScripts(contentScriptsToRegister, type) {
-    if (type != "webcompat intervention" && type != "SmartBlock shim") {
-      throw new Error(
-        '`type` must be "webcompat intervention" or "SmartBlock shim"'
-      );
-    }
-
-    // Check which content scripts are already registered persistently.
-    // (we may need to disable ones we no longer need, and also register
-    // any new ones which are not persisted yet).
-    const desiredContentScriptIds = new Set(
-      contentScriptsToRegister.map(s => s.id)
-    );
-    const activeContentScripts =
-      await browser.scripting.getRegisteredContentScripts();
-
-    const interventionContentScripts = activeContentScripts.filter(s =>
-      s.id.includes(type)
-    );
-
-    const oldContentScriptsToUnregister = interventionContentScripts.filter(
-      ({ id }) => !desiredContentScriptIds.has(id)
-    );
-
-    if (oldContentScriptsToUnregister.length) {
-      debugLog(
-        `Unregistering no-longer-needed ${type} content scripts`,
-        oldContentScriptsToUnregister
-      );
-      try {
-        await browser.scripting.unregisterContentScripts({
-          ids: oldContentScriptsToUnregister.map(s => s.id),
-        });
-      } catch (_) {
-        for (const script of oldContentScriptsToUnregister) {
-          try {
-            await browser.scripting.unregisterContentScripts({
-              ids: [script.id],
-            });
-          } catch (e) {
-            console.error("Error unregistering content script", script, e);
-          }
-        }
-      }
-    }
-
-    const interventionContentScriptIds = new Set(
-      interventionContentScripts.map(s => s.id)
-    );
-    const newContentScriptsToRegister = contentScriptsToRegister.filter(
-      ({ id }) => !interventionContentScriptIds.has(id)
-    );
-    if (newContentScriptsToRegister.length) {
-      debugLog(
-        `Registering new ${type} content scripts`,
-        newContentScriptsToRegister
-      );
       try {
-        await browser.scripting.registerContentScripts(
-          newContentScriptsToRegister
+        await browser.scripting.registerContentScripts(scriptsToReg);
+        debugLog(
+          `Registered all ${typeStr} content scripts after error registering just non-active ones`,
+          scriptsToReg,
+          e
+        );
+      } catch (e2) {
+        console.error(
+          `Error while registering ${typeStr} content scripts:`,
+          e2,
+          scriptsToReg
         );
-      } catch (_) {
-        for (const script of newContentScriptsToRegister) {
-          try {
-            await browser.scripting.registerContentScripts([script]);
-          } catch (e) {
-            console.error("Error registering content script", script, e);
-          }
-        }
       }
     }
-
-    const alreadyRegisteredContentScripts = contentScriptsToRegister.filter(
-      ({ id }) => interventionContentScriptIds.has(id)
-    );
-    if (alreadyRegisteredContentScripts.length) {
-      debugLog(
-        `Already have registered ${type} content scripts`,
-        alreadyRegisteredContentScripts
-      );
-    }
-
-    return {
-      alreadyRegisteredContentScripts,
-      newContentScriptsToRegister,
-      oldContentScriptsToUnregister,
-    };
   },
 };
diff --git a/browser/extensions/webcompat/lib/interventions.js b/browser/extensions/webcompat/lib/interventions.js
index 342cabe9fe324..6100d9936d7c1 100644
--- a/browser/extensions/webcompat/lib/interventions.js
+++ b/browser/extensions/webcompat/lib/interventions.js
@@ -159,14 +159,7 @@ class Interventions {
   constructor(availableInterventions, customFunctions) {
     this.#customFunctions = customFunctions;
     this.#originalInterventions = availableInterventions;
-    let interventions = availableInterventions;
-    if (browser.appConstants.isInAutomation()) {
-      const override = browser.aboutConfigPrefs.getPref("test_interventions");
-      if (override) {
-        interventions = JSON.parse(override);
-      }
-    }
-    this.#onSourceJSONChanged(interventions);
+    this.#onSourceJSONChanged(availableInterventions);
   }
 
   #onSourceJSONChanged(availableInterventions) {
@@ -198,9 +191,7 @@ class Interventions {
       this.#stopListenersForTogglingIndividualInterventions();
       await this.#disableInterventionsInternal();
       this.#onSourceJSONChanged(newInterventions);
-      await this.#enableInterventionsInternal({
-        alsoClearObsoleteContentScripts: true,
-      });
+      await this.#enableInterventionsInternal();
       await this.#signalInterventionChangesToAboutCompat(
         this.#availableInterventions
       );
@@ -239,7 +230,7 @@ class Interventions {
       });
     }, ENABLE_INTERVENTIONS_PREF);
 
-    this.#checkInterventionPref(true).then(doneBootingUp);
+    this.#checkInterventionPref().then(doneBootingUp);
   }
 
   async updateInterventions(_data) {
@@ -257,22 +248,20 @@ class Interventions {
           this.#availableInterventions.push(intervention);
         }
       }
-      await this.#enableInterventionsInternal({ whichInterventions: data });
+      await this.#enableInterventionsInternal(data);
       await this.#signalInterventionChangesToAboutCompat(data ?? false);
       return data;
     });
   }
 
-  #checkInterventionPref(alsoClearObsoleteContentScripts = false) {
+  #checkInterventionPref() {
     const value = browser.aboutConfigPrefs.getPref(
       ENABLE_INTERVENTIONS_PREF,
       true
     );
     this.#interventionsEnabledByPref = value;
     if (value) {
-      return this.#enableInterventionsInternal({
-        alsoClearObsoleteContentScripts,
-      });
+      return this.#enableInterventionsInternal();
     }
     return this.#disableInterventionsInternal();
   }
@@ -292,7 +281,7 @@ class Interventions {
   async enableInterventions(ids, force = false) {
     await this.#postStartupAtomicOperation(async () => {
       const whichInterventions = this.getInterventionsByIds(ids);
-      await this.#enableInterventionsInternal({ force, whichInterventions });
+      await this.#enableInterventionsInternal(whichInterventions, force);
       await this.#signalInterventionChangesToAboutCompat(
         whichInterventions ?? false
       );
@@ -438,9 +427,7 @@ class Interventions {
       if (prefValue === true) {
         await this.#disableInterventionsInternal([config]);
       } else {
-        await this.#enableInterventionsInternal({
-          whichInterventions: [config],
-        });
+        await this.#enableInterventionsInternal([config]);
       }
       return this.#signalInterventionChangesToAboutCompat([config]);
     });
@@ -488,13 +475,10 @@ class Interventions {
     this.#individualDisablingPrefListeners = new Map();
   }
 
-  #enableInterventionsInternal(options) {
-    const {
-      alsoClearObsoleteContentScripts = false,
-      force = false,
-      whichInterventions = this.#availableInterventions,
-    } = options ?? {};
-
+  #enableInterventionsInternal(
+    whichInterventions = this.#availableInterventions,
+    force = false
+  ) {
     const enabledUAoverrides = [];
     const enabledRequestBlocks = [];
     const enabledCustomFuncs = [];
@@ -660,25 +644,10 @@ class Interventions {
       this.#uaOverridesListener.restartListener();
     }
 
-    return Promise.resolve().then(async () => {
-      // If we're still booting up, we need to clean out any persisted content
-      // scripts for which the intervention has been removed, before we register
-      // the ones we have chosen to activate above.
-      if (alsoClearObsoleteContentScripts) {
-        const info = await InterventionHelpers.ensureOnlyTheseContentScripts(
-          contentScriptsToRegister,
-          "webcompat intervention"
-        );
-        if (browser.appConstants.isInAutomation()) {
-          this._lastEnabledInfo = info;
-        }
-      } else {
-        await InterventionHelpers.registerContentScripts(
-          contentScriptsToRegister,
-          "webcompat"
-        );
-      }
-
+    return InterventionHelpers.registerContentScripts(
+      contentScriptsToRegister,
+      "webcompat"
+    ).then(() => {
       if (enabledUAoverrides.length) {
         debugLog(
           "Enabled",
@@ -796,20 +765,10 @@ class Interventions {
         ids: contentScripts.map(s => s.id),
       })
     )?.map(script => script.id);
-    try {
-      await browser.scripting.unregisterContentScripts({ ids });
-    } catch (_) {
-      for (const id of ids) {
-        try {
-          await browser.scripting.unregisterContentScripts({ ids: [id] });
-        } catch (e) {
-          console.error(
-            `Error while unregistering intervention content script`,
-            id,
-            e
-          );
-        }
-      }
+    for (const id of ids) {
+      try {
+        await browser.scripting.unregisterContentScripts({ ids: [id] });
+      } catch (_) {}
     }
   }
 
@@ -817,7 +776,7 @@ class Interventions {
     const registration = {
       id: `webcompat intervention for ${label}: ${JSON.stringify(intervention.content_scripts)}`,
       matches,
-      persistAcrossSessions: true,
+      persistAcrossSessions: false,
     };
 
     let { all_frames, css, js, run_at } = intervention.content_scripts;
diff --git a/browser/extensions/webcompat/lib/shims.js b/browser/extensions/webcompat/lib/shims.js
index db4af8294fb53..587caa476d535 100644
--- a/browser/extensions/webcompat/lib/shims.js
+++ b/browser/extensions/webcompat/lib/shims.js
@@ -477,16 +477,8 @@ class Shims {
       return;
     }
 
-    let shims = availableShims;
-    if (browser.appConstants.isInAutomation()) {
-      const override = browser.aboutConfigPrefs.getPref("test_shims");
-      if (override) {
-        shims = JSON.parse(override);
-      }
-    }
-
     this._readyPromise = new Promise(done => (this._resolveReady = done));
-    this._registerShims(shims);
+    this._registerShims(availableShims);
 
     onMessageFromTab(this._onMessageFromShim.bind(this));
 
@@ -643,7 +635,7 @@ class Shims {
     }
 
     // Batch-register the content scripts during startup to improve IPC performance.
-    this._registerContentScriptsForShims(this.shims.values(), true);
+    this._registerContentScriptsForShims();
 
     // Register onBeforeRequest listener which handles storage access requests
     // on matching redirects.
@@ -1307,13 +1299,10 @@ class Shims {
     return undefined;
   }
 
-  async _registerContentScriptsForShims(
-    shims,
-    alsoClearObsoleteContentScripts
-  ) {
+  async _registerContentScriptsForShims(shims) {
     const contentScriptsToRegister = [];
 
-    for (const shim of shims) {
+    for (const shim of shims ?? this.shims.values()) {
       if (
         shim.disabledReason ||
         !shim.contentScripts.length ||
@@ -1333,7 +1322,7 @@ class Shims {
           Object.assign(
             {
               id,
-              persistAcrossSessions: true,
+              persistAcrossSessions: false,
             },
             options
           )
@@ -1341,29 +1330,12 @@ class Shims {
       }
     }
 
-    // If we're still booting up, we need to clean out any persisted content
-    // scripts for which the intervention has been removed, before we register
-    // the ones we have chosen to activate above.
-    if (alsoClearObsoleteContentScripts) {
-      const info = await InterventionHelpers.ensureOnlyTheseContentScripts(
-        contentScriptsToRegister,
-        "SmartBlock shim"
-      );
-      if (browser.appConstants.isInAutomation()) {
-        this._lastEnabledInfo = info;
-      }
-    } else {
+    if (contentScriptsToRegister.length) {
       await InterventionHelpers.registerContentScripts(
         contentScriptsToRegister,
         "SmartBlock"
       );
     }
-
-    if (alsoClearObsoleteContentScripts) {
-      // If we're still booting up, we need to clean out any persisted content
-      // scripts for which the intervention has been removed, before we register
-      // the ones we have chosen to activate above.
-    }
   }
 
   async _unregisterContentScriptsForShims(shims) {
@@ -1372,16 +1344,10 @@ class Shims {
       ids.push(...shim._contentScriptRegistrations);
       shim._contentScriptRegistrations = [];
     }
-    try {
-      await browser.scripting.unregisterContentScripts({ ids });
-    } catch (_) {
-      for (const id of ids) {
-        try {
-          await browser.scripting.unregisterContentScripts({ ids: [id] });
-        } catch (e) {
-          console.error(`Error while unregistering shim content script`, id, e);
-        }
-      }
+    for (const id of ids) {
+      try {
+        await browser.scripting.unregisterContentScripts({ ids: [id] });
+      } catch (_) {}
     }
   }
 }
diff --git a/browser/extensions/webcompat/manifest.json b/browser/extensions/webcompat/manifest.json
index ccdf06fa50845..b512669bb1090 100644
--- a/browser/extensions/webcompat/manifest.json
+++ b/browser/extensions/webcompat/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Web Compatibility Interventions",
   "description": "Urgent post-release fixes for web compatibility.",
-  "version": "149.5.0",
+  "version": "149.4.0",
   "browser_specific_settings": {
     "gecko": {
       "id": "webcompat@mozilla.org",
diff --git a/browser/extensions/webcompat/moz.build b/browser/extensions/webcompat/moz.build
index fe9ba908c8220..19689b83a42c1 100644
--- a/browser/extensions/webcompat/moz.build
+++ b/browser/extensions/webcompat/moz.build
@@ -17,7 +17,5 @@ BROWSER_CHROME_MANIFESTS += [
     "tests/browser/browser_uuid_migration.toml",
 ]
 
-MARIONETTE_MANIFESTS += ["tests/marionette/manifest.toml"]
-
 with Files("**"):
     BUG_COMPONENT = ("Web Compatibility", "Tooling & Investigations")
diff --git a/browser/extensions/webcompat/tests/browser/head.js b/browser/extensions/webcompat/tests/browser/head.js
index 27e2bc7b9861a..bd5e59b6347dc 100644
--- a/browser/extensions/webcompat/tests/browser/head.js
+++ b/browser/extensions/webcompat/tests/browser/head.js
@@ -57,6 +57,8 @@ const WebCompatExtension = new (class WebCompatExtension {
   async resetInterventionsAndShimsToDefaults() {
     return this.#run(async function () {
       await content.wrappedJSObject._downgradeForTesting();
+      await content.wrappedJSObject.interventions.resetToDefaultInterventions();
+      await content.wrappedJSObject.shims._resetToDefaultShims();
     }).catch(_ => {});
   }
 
diff --git a/browser/extensions/webcompat/tests/marionette/manifest.toml b/browser/extensions/webcompat/tests/marionette/manifest.toml
deleted file mode 100644
index f77bb772f13e3..0000000000000
--- a/browser/extensions/webcompat/tests/marionette/manifest.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[DEFAULT]
-run-if = [
-  "buildapp == 'browser'",
-]
-
-["test_persistent_contentscripts.py"]
diff --git a/browser/extensions/webcompat/tests/marionette/test_persistent_contentscripts.py b/browser/extensions/webcompat/tests/marionette/test_persistent_contentscripts.py
deleted file mode 100644
index 283d53f20c870..0000000000000
--- a/browser/extensions/webcompat/tests/marionette/test_persistent_contentscripts.py
+++ /dev/null
@@ -1,277 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-import json
-
-from marionette_harness import MarionetteTestCase
-
-
-class ContentScriptsAreCorrectlyPersistedTest(MarionetteTestCase):
-    def setUp(self):
-        super().setUp()
-        self.marionette.enforce_gecko_prefs({
-            "extensions.background.idle.timeout": 300000,
-        })
-
-    def tearDown(self):
-        try:
-            # Make sure subsequent tests get a clean profile
-            self.marionette.restart(in_app=False, clean=True)
-        finally:
-            super().tearDown()
-
-    def testContentScriptsAreCorrectlyPersisted(self):
-        # We check that as the addon starts up, the expected content scripts are all
-        # started up as well, and in the expected way (either being registered, or
-        # being already registered as they are marked as persistentAcrossSessions.
-
-        # We also check that if the list of interventions/shims changes (for instance
-        # in a new version of the addon), any no-longer-needed content scripts which
-        # are not in its list of interventions or shims are properly unregsitered,
-        # so they do not persist.
-
-        # First see what happens on first start-up. All content scripts ought to be
-        # registered by the compat addon, rather than already being there.
-        lastUpdateInfo, interventionContentScriptPath, shimContentScriptPath = (
-            self.wait_until_webcompat_addon_is_ready().values()
-        )
-        self.assertEqual(
-            lastUpdateInfo["alreadyRegisteredContentScripts"],
-            [],
-            "no content scripts were already registered on first startup",
-        )
-        self.assertEqual(
-            lastUpdateInfo["oldContentScriptsToUnregister"],
-            [],
-            "no content scripts were unregistered on first startup",
-        )
-        defaultContentScriptCount = len(lastUpdateInfo["newContentScriptsToRegister"])
-        self.assertTrue(
-            defaultContentScriptCount > 0,
-            "the addon registerd some content scripts on first startup",
-        )
-        self.assertTrue(
-            len(interventionContentScriptPath) > 0,
-            "sanity check: we have an intervention content script to test with",
-        )
-        self.assertTrue(
-            len(shimContentScriptPath) > 0,
-            "sanity check: we have a shim content script to test with",
-        )
-
-        # Restart Firefox and confirm that the content scripts were all registered
-        # already before the addon started up (because they are persistent)
-        self.marionette.restart(in_app=True)
-        lastUpdateInfo, _, _ = self.wait_until_webcompat_addon_is_ready().values()
-        self.assertEqual(
-            len(lastUpdateInfo["alreadyRegisteredContentScripts"]),
-            defaultContentScriptCount,
-            "all of the content scripts were already registered on second boot",
-        )
-        self.assertEqual(
-            lastUpdateInfo["oldContentScriptsToUnregister"],
-            [],
-            "no content scripts were unregistered on second boot",
-        )
-        self.assertEqual(
-            lastUpdateInfo["newContentScriptsToRegister"],
-            [],
-            "no new content scripts were registered on second boot",
-        )
-
-        # First we prepare a few intervention and shim configurations with content scripts
-        # to use for the remaining tests. (Note that we need to grab one of the content scripts
-        # actually in the addon right now, hence the sanity checks above).
-        bug1 = self.buildInterventionConfig("bug1", interventionContentScriptPath)
-        bug2 = self.buildInterventionConfig("bug2", interventionContentScriptPath)
-        bug3 = self.buildInterventionConfig("bug3", interventionContentScriptPath)
-
-        def getInterventionScriptId(bug):
-            return f"""webcompat intervention for {bug}: {{"js":["{interventionContentScriptPath}"]}}"""
-
-        expectedBug1ScriptId = getInterventionScriptId("bug1")
-        expectedBug2ScriptId = getInterventionScriptId("bug2")
-        expectedBug3ScriptId = getInterventionScriptId("bug3")
-
-        shim1 = self.buildShimConfig("bug1", shimContentScriptPath)
-        shim2 = self.buildShimConfig("bug2", shimContentScriptPath)
-        shim3 = self.buildShimConfig("bug3", shimContentScriptPath)
-
-        def getShimScriptId(bug):
-            return f"""SmartBlock shim for {bug}: {{"js":["/shims/{shimContentScriptPath}"],"matches":["*://example.com/*"],"runAt":"document_start"}}"""
-
-        expectedShim1ScriptId = getShimScriptId("bug1")
-        expectedShim2ScriptId = getShimScriptId("bug2")
-        expectedShim3ScriptId = getShimScriptId("bug3")
-
-        # Now we simulate a few addon updates to see if things work as expected.
-        # first across addon-restarts, and then with our RemoteSettings update client.
-        def runTests(whichMethod):
-            # Now we simulate a few addon updates to see what happens. First we simulate
-            # an update with no interventions or shims, to see if they're all unregistered.
-            lastUpdateInfo, _, _ = self.rebootWithInterventionsAndShims({}, []).values()
-            self.verifyBootupContentScripts(lastUpdateInfo, [], [])
-
-            # Now restart with one intervention and one shim, and confirm that both
-            # content scripts were newly registered.
-            lastUpdateInfo, _, _ = whichMethod({"bug1": bug1}, [shim1]).values()
-            self.verifyBootupContentScripts(
-                lastUpdateInfo, [expectedBug1ScriptId, expectedShim1ScriptId], []
-            )
-
-            # Now restart with one different intervention and shim, and
-            # confirm that bug1 was unregistered (since it's no longer in the new
-            # update's config), and that the new bug2's was registered.
-            lastUpdateInfo, _, _ = whichMethod({"bug2": bug2}, [shim2]).values()
-            self.verifyBootupContentScripts(
-                lastUpdateInfo,
-                [expectedBug2ScriptId, expectedShim2ScriptId],
-                [expectedBug1ScriptId, expectedShim1ScriptId],
-            )
-
-            # Now restart with both an already-existing intervention and shim (to see
-            # if it is already started before the addon does), and a new intervention
-            # and shim, to confirm that it's also registered.
-            lastUpdateInfo, _, _ = whichMethod(
-                {"bug2": bug2, "bug3": bug3}, [shim2, shim3]
-            ).values()
-            self.verifyBootupContentScripts(
-                lastUpdateInfo,
-                [
-                    expectedBug2ScriptId,
-                    expectedBug3ScriptId,
-                    expectedShim2ScriptId,
-                    expectedShim3ScriptId,
-                ],
-                [],
-            )
-
-        # First run the tests simulating an addon-update.
-        runTests(self.rebootWithInterventionsAndShims)
-        self.marionette.clear_pref("extensions.webcompat.test_interventions")
-        self.marionette.clear_pref("extensions.webcompat.test_shims")
-
-        # Not re-run the same tests with RemoteSettings client updates.
-        self.nextRemoteSettingsUpdateVersion = 9000
-        runTests(self.simulateRemoteSettingsUpdate)
-
-    def rebootWithInterventionsAndShims(self, interventions, shims):
-        self.marionette.set_pref(
-            "extensions.webcompat.test_interventions", json.dumps(interventions)
-        )
-        self.marionette.set_pref("extensions.webcompat.test_shims", json.dumps(shims))
-        self.marionette.restart(in_app=True)
-        return self.wait_until_webcompat_addon_is_ready()
-
-    def simulateRemoteSettingsUpdate(self, interventions, shims):
-        version = self.nextRemoteSettingsUpdateVersion
-        self.nextRemoteSettingsUpdateVersion += 1
-        with self.marionette.using_context("chrome"):
-            self.marionette.execute_async_script(
-                """
-                const [version, interventions, shims, done] = arguments;
-                const { RemoteSettings } = ChromeUtils.importESModule(
-                  "resource://services-settings/remote-settings.sys.mjs"
-                );
-                const client = RemoteSettings("webcompat-interventions");
-                const update = {
-                    id: 1, // RemoteSettings record id",
-                    last_modified: 1368273600000,
-                    version: `9999.9999.9999.${version}`,
-                    interventions,
-                    shims,
-                };
-                client.emit("sync", { data: { current: [update] } }).then(done);
-            """,
-                script_args=(version, interventions, shims),
-            )
-        return self.wait_until_webcompat_addon_is_ready()
-
-    def wait_until_webcompat_addon_is_ready(self):
-        self.marionette.navigate("about:compat")
-        return self.marionette.execute_async_script(
-            """
-                const bg = window.wrappedJSObject.browser.extension.getBackgroundPage();
-                Promise.allSettled([
-                    bg.interventions.allSettled(),
-                    bg.shims.ready(),
-                ]).then(() => {
-                    const lastUpdateInfo = {};
-                    for (const type of ["interventions", "shims"]) {
-                        for (const [key, value] of Object.entries(
-                            bg[type]._lastEnabledInfo
-                        )) {
-                            lastUpdateInfo[key] = [
-                                lastUpdateInfo[key] ?? [],
-                                value.map(script => script.id),
-                            ].flat();
-                        }
-                    }
-
-                    const interventionContentScriptPath = bg.interventions?.getAvailableInterventions()
-                        .find(i => i.interventions.find(v => v.content_scripts.js))
-                        ?.interventions.find(v => v.content_scripts.js).content_scripts.js[0];
-
-                    const shimContentScriptPath = bg.shims?.shims.values().find(s => s?.contentScripts.length)?.contentScripts[0].js[0].replace("/shims/", "");
-
-                    return {
-                        lastUpdateInfo,
-                        interventionContentScriptPath,
-                        shimContentScriptPath,
-                    };
-               }).then(arguments[0]);
-        """
-        )
-
-    def verifyBootupContentScripts(
-        self, infoOnBoot, expectAddedOrPresent, expectNotAddedOrPresent
-    ):
-        registeredContentScripts = set(
-            infoOnBoot["alreadyRegisteredContentScripts"]
-            + infoOnBoot["newContentScriptsToRegister"]
-        )
-
-        self.assertEqual(
-            len(registeredContentScripts),
-            len(expectAddedOrPresent),
-            "only expected content scripts are registered",
-        )
-
-        for wantedScript in expectAddedOrPresent:
-            self.assertTrue(
-                wantedScript in registeredContentScripts,
-                f"content script is active: {wantedScript}",
-            )
-
-        notRegisteredContentScripts = set(infoOnBoot["oldContentScriptsToUnregister"])
-        for unwantedScript in expectNotAddedOrPresent:
-            self.assertTrue(
-                (unwantedScript in notRegisteredContentScripts)
-                or not (unwantedScript in registeredContentScripts),
-                f"content script is NOT active: {unwantedScript}",
-            )
-
-    def buildInterventionConfig(self, id, jsContentScriptPath):
-        return {
-            "id": id,
-            "label": id,
-            "bugs": {"issue1": {"matches": ["*://example.com/*"]}},
-            "interventions": [
-                {"platforms": ["all"], "content_scripts": {"js": [jsContentScriptPath]}}
-            ],
-        }
-
-    def buildShimConfig(self, id, jsContentScriptPath):
-        return {
-            "id": id,
-            "platform": "all",
-            "name": id,
-            "contentScripts": [
-                {
-                    "js": jsContentScriptPath,
-                    "matches": ["*://example.com/*"],
-                    "runAt": "document_start",
-                }
-            ],
-        }

From 5b18cf4e429796f8e10350734e46db4e402dffdb Mon Sep 17 00:00:00 2001
From: Sandor Molnar <smolnar@mozilla.com>
Date: Thu, 29 Jan 2026 21:52:00 +0200
Subject: [PATCH 114/116] =?UTF-8?q?Revert=20"Bug=202009535=20=E2=80=94=20a?=
 =?UTF-8?q?dd=20excluded=20site=20state=20UI=20for=20ip=20protection.=20r?=
 =?UTF-8?q?=3Dip-protection-reviewers,fluent-reviewers,desktop-theme-revie?=
 =?UTF-8?q?wers,flod,fchasen,dao"=20for=20causing=20bc=20failures=20@=20br?=
 =?UTF-8?q?owser/content/ipprotection/ipprotection-status-card.css?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit bac0c7c5ed4386c7c3858d330cb91746332f2166.
---
 .../content/ipprotection-content.mjs          | 13 ++---
 .../content/ipprotection-status-box.css       | 10 ----
 .../content/ipprotection-status-card.mjs      | 13 -----
 .../browser_ipprotection_status_card.js       | 49 +------------------
 browser/locales-preview/ipProtection.ftl      |  4 --
 5 files changed, 4 insertions(+), 85 deletions(-)

diff --git a/browser/components/ipprotection/content/ipprotection-content.mjs b/browser/components/ipprotection/content/ipprotection-content.mjs
index 7412cb490a6c4..dc2928147237c 100644
--- a/browser/components/ipprotection/content/ipprotection-content.mjs
+++ b/browser/components/ipprotection/content/ipprotection-content.mjs
@@ -95,10 +95,6 @@ export default class IPProtectionContentElement extends MozLitElement {
     return this.state && this.state.isProtectionEnabled && !this.state.error;
   }
 
-  get hasSiteExclusion() {
-    return this.state?.siteData?.isExclusion ?? false;
-  }
-
   get #hasErrors() {
     return !this.state || !!this.state.error;
   }
@@ -260,14 +256,11 @@ export default class IPProtectionContentElement extends MozLitElement {
   }
 
   statusCardTemplate() {
-    let hasExclusion = this.hasSiteExclusion;
-
     return html`
       <ipprotection-status-card
         .protectionEnabled=${this.canEnableConnection}
         .location=${this.state.location}
         .bandwidthUsage=${ifDefined(this.state.bandwidthUsage)}
-        .hasExclusion=${hasExclusion}
       ></ipprotection-status-card>
     `;
   }
@@ -321,8 +314,8 @@ export default class IPProtectionContentElement extends MozLitElement {
       return null;
     }
 
-    const hasExclusion = this.hasSiteExclusion;
-    const siteExclusionToggleStateL10nId = hasExclusion
+    const isExclusion = this.state.siteData.isExclusion;
+    const siteExclusionToggleStateL10nId = isExclusion
       ? "site-exclusion-toggle-disabled"
       : "site-exclusion-toggle-enabled";
     return html` <div id="site-exclusion-control">
@@ -341,7 +334,7 @@ export default class IPProtectionContentElement extends MozLitElement {
         data-l10n-id=${siteExclusionToggleStateL10nId}
         data-l10n-attrs="label"
         id="site-exclusion-toggle"
-        ?pressed=${!hasExclusion}
+        ?pressed=${!isExclusion}
         @toggle=${this.handleToggleUseVPN}
       >
       </moz-toggle>
diff --git a/browser/components/ipprotection/content/ipprotection-status-box.css b/browser/components/ipprotection/content/ipprotection-status-box.css
index 53efc73d92ec6..8317cda6b9fc7 100644
--- a/browser/components/ipprotection/content/ipprotection-status-box.css
+++ b/browser/components/ipprotection/content/ipprotection-status-box.css
@@ -21,16 +21,6 @@
   }
 }
 
-.excluded {
-  background-color: var(--background-color-success);
-
-  ::slotted([slot="icon"]) {
-    -moz-context-properties: fill, stroke;
-    fill: transparent;
-    stroke: var(--icon-color-success);
-  }
-}
-
 #content-container {
   display: flex;
   flex-direction: column;
diff --git a/browser/components/ipprotection/content/ipprotection-status-card.mjs b/browser/components/ipprotection/content/ipprotection-status-card.mjs
index dd238c234221d..43d51170f4f98 100644
--- a/browser/components/ipprotection/content/ipprotection-status-card.mjs
+++ b/browser/components/ipprotection/content/ipprotection-status-card.mjs
@@ -32,7 +32,6 @@ export default class IPProtectionStatusCard extends MozLitElement {
     enabledSince: { type: Object },
     location: { type: Object },
     bandwidthUsage: { type: Object },
-    hasExclusion: { type: Boolean },
   };
 
   constructor() {
@@ -151,18 +150,6 @@ export default class IPProtectionStatusCard extends MozLitElement {
   }
 
   render() {
-    if (this.hasExclusion && this.protectionEnabled) {
-      return html`
-        ${this.statusTemplate({
-          type: "excluded",
-          headerL10nId: "ipprotection-connection-status-excluded",
-          buttonL10nId: "ipprotection-button-turn-vpn-off-excluded-site",
-          iconSrc:
-            "chrome://browser/content/ipprotection/assets/states/ipprotection-excluded.svg",
-        })}
-      `;
-    }
-
     if (this.protectionEnabled) {
       return html`
         ${this.statusTemplate({
diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js
index dc4efced8b727..db1a7a3b3ea58 100644
--- a/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js
+++ b/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js
@@ -7,9 +7,7 @@
 const { LINKS } = ChromeUtils.importESModule(
   "chrome://browser/content/ipprotection/ipprotection-constants.mjs"
 );
-const { IPPExceptionsManager } = ChromeUtils.importESModule(
-  "moz-src:///browser/components/ipprotection/IPPExceptionsManager.sys.mjs"
-);
+const lazy = {};
 
 const mockLocation = {
   name: "United States",
@@ -248,48 +246,3 @@ add_task(async function test_ipprotection_events_on_toggle() {
   await closePanel();
   await cleanupStatusCardTest();
 });
-
-/**
- * Tests the excluded site state UI.
- */
-add_task(async function test_status_card_excluded() {
-  let sandbox = sinon.createSandbox();
-  sandbox.stub(IPPExceptionsManager, "hasExclusion").returns(true);
-
-  await setupStatusCardTest();
-
-  let content = await openPanel({
-    location: mockLocation,
-    isProtectionEnabled: true,
-    bandwidthUsage: { currentBandwidthUsage: 50, maxBandwidth: 150 },
-  });
-
-  Assert.ok(
-    BrowserTestUtils.isVisible(content),
-    "ipprotection content component should be present"
-  );
-
-  let statusCard = content.statusCardEl;
-  Assert.ok(content.statusCardEl, "ipprotection-status-card should be present");
-
-  let statusBoxEl = statusCard.statusBoxEl;
-  Assert.ok(statusBoxEl, "Status box should be present");
-
-  Assert.equal(
-    statusBoxEl.type,
-    "excluded",
-    "Status box should have excluded type"
-  );
-
-  checkLocationAndBandwidth(statusBoxEl, mockLocation, {
-    currentBandwidthUsage: 50,
-    maxBandwidth: 150,
-  });
-
-  const turnOffVPNButtonEl = statusCard.actionButtonEl;
-  Assert.ok(turnOffVPNButtonEl, "Button to turn off VPN should be present");
-
-  await closePanel();
-  await cleanupStatusCardTest();
-  sandbox.restore();
-});
diff --git a/browser/locales-preview/ipProtection.ftl b/browser/locales-preview/ipProtection.ftl
index fcbf032611004..48895b7311cfb 100644
--- a/browser/locales-preview/ipProtection.ftl
+++ b/browser/locales-preview/ipProtection.ftl
@@ -51,13 +51,9 @@ ipprotection-settings-link =
 
 ipprotection-connection-status-connected = VPN is on
 ipprotection-connection-status-disconnected = VPN is off
-ipprotection-connection-status-excluded = VPN is off for this site
 
 # Button to turn off the VPN
 ipprotection-button-turn-vpn-off = Turn off VPN
-# Button to turn off the VPN when the VPN panel is open while viewing
-# a page from an excluded site.
-ipprotection-button-turn-vpn-off-excluded-site = Turn off VPN everywhere
 # Button to turn on the VPN
 ipprotection-button-turn-vpn-on = Turn on VPN
 

From 62df450f452e48ce61587213a9a4266f0c9c1f75 Mon Sep 17 00:00:00 2001
From: Sandor Molnar <smolnar@mozilla.com>
Date: Thu, 29 Jan 2026 21:52:55 +0200
Subject: [PATCH 115/116] =?UTF-8?q?Revert=20"Bug=202009534=20=E2=80=94=20u?=
 =?UTF-8?q?pdate=20connected/disconnected=20state=20UI=20for=20ip=20protec?=
 =?UTF-8?q?tion.=20r=3Ddesktop-theme-reviewers,ip-protection-reviewers,flu?=
 =?UTF-8?q?ent-reviewers,dao,flod,fchasen"=20for=20causing=20bc=20failures?=
 =?UTF-8?q?=20@=20browser/content/ipprotection/ipprotection-status-card.cs?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit dd4f67f464661cd1a965e2108f266975e5c89e43.
---
 .../content/ipprotection-content.css          |   1 -
 .../content/ipprotection-content.mjs          |   3 +
 .../content/ipprotection-status-box.css       |  48 +--
 .../content/ipprotection-status-box.mjs       |  18 +-
 .../content/ipprotection-status-card.mjs      | 201 ++++++++----
 .../browser/browser_IPProtectionService.js    |  43 ++-
 ...rowser_ipprotection_keyboard_navigation.js |   7 +-
 .../browser_ipprotection_status_card.js       | 304 ++++++++++++------
 .../browser/browser_ipprotection_telemetry.js |  21 +-
 .../browser/browser_ipprotection_toolbar.js   |  18 +-
 browser/locales-preview/ipProtection.ftl      |  18 +-
 11 files changed, 410 insertions(+), 272 deletions(-)

diff --git a/browser/components/ipprotection/content/ipprotection-content.css b/browser/components/ipprotection/content/ipprotection-content.css
index 79456113d3bb9..ea438728d42ad 100644
--- a/browser/components/ipprotection/content/ipprotection-content.css
+++ b/browser/components/ipprotection/content/ipprotection-content.css
@@ -96,7 +96,6 @@ hr {
   display: flex;
   justify-content: space-between;
   margin-inline: var(--space-xlarge);
-  padding-block: var(--space-large);
 }
 
 #site-exclusion-icon {
diff --git a/browser/components/ipprotection/content/ipprotection-content.mjs b/browser/components/ipprotection/content/ipprotection-content.mjs
index dc2928147237c..4a2a0af1089a4 100644
--- a/browser/components/ipprotection/content/ipprotection-content.mjs
+++ b/browser/components/ipprotection/content/ipprotection-content.mjs
@@ -41,6 +41,9 @@ export default class IPProtectionContentElement extends MozLitElement {
     state: { type: Object, attribute: false },
     _showMessageBar: { type: Boolean, state: true },
     _messageDismissed: { type: Boolean, state: true },
+    // Track toggle state separately so that we can tell when the toggle
+    // is enabled because of the existing protection state or because of user action.
+    _toggleEnabled: { type: Boolean, state: true },
   };
 
   constructor() {
diff --git a/browser/components/ipprotection/content/ipprotection-status-box.css b/browser/components/ipprotection/content/ipprotection-status-box.css
index 8317cda6b9fc7..9cecaa96572db 100644
--- a/browser/components/ipprotection/content/ipprotection-status-box.css
+++ b/browser/components/ipprotection/content/ipprotection-status-box.css
@@ -12,32 +12,16 @@
   background-color: var(--background-color-box-info);
 }
 
-.connected {
-  background-color: var(--background-color-success);
-
-  ::slotted([slot="icon"]) {
-    -moz-context-properties: fill;
-    fill: var(--icon-color-success);
-  }
-}
-
 #content-container {
-  display: flex;
-  flex-direction: column;
   margin-inline: var(--space-small);
   border-radius: var(--border-radius-medium);
   padding: var(--space-medium);
 }
 
-#header {
-  display: flex;
-  justify-content: space-between;
+#title {
   /* Intentionally using a larger font size for clearer visual hierarchy */
   /* stylelint-disable-next-line stylelint-plugin-mozilla/use-design-tokens */
-  font-size: 1.4lh;
-}
-
-#title {
+  font-size: 1.8em;
   font-weight: var(--font-weight-semibold);
   padding-bottom: var(--space-xsmall);
   margin-block: 0;
@@ -50,35 +34,7 @@
   color: var(--text-color-deemphasized);
 }
 
-#content {
-  display: flex;
-  flex-direction: column;
-}
-
-#bandwidth,
-#location {
-  display: flex;
-  align-items: center;
-  gap: var(--space-xsmall);
-  margin-top: var(--space-xsmall);
-}
-
 ::slotted([slot="content"]) {
   border-top: var(--border-width) solid var(--border-color-deemphasized);
   margin-top: var(--space-large);
 }
-
-::slotted([slot="location-icon"]) {
-  -moz-context-properties: fill;
-  fill: currentColor;
-}
-
-::slotted([slot="bandwidth"]),
-::slotted([slot="location"]) {
-  color: var(--text-color-deemphasized);
-}
-
-::slotted([slot="action"]) {
-  align-self: flex-end;
-  margin-block-start: var(--space-large);
-}
diff --git a/browser/components/ipprotection/content/ipprotection-status-box.mjs b/browser/components/ipprotection/content/ipprotection-status-box.mjs
index 56657ca6b78d2..34992ff1993ac 100644
--- a/browser/components/ipprotection/content/ipprotection-status-box.mjs
+++ b/browser/components/ipprotection/content/ipprotection-status-box.mjs
@@ -5,11 +5,8 @@
 import { MozLitElement } from "chrome://global/content/lit-utils.mjs";
 import { html } from "chrome://global/content/vendor/lit.all.mjs";
 
-// eslint-disable-next-line import/no-unassigned-import
-import "chrome://browser/content/ipprotection/ipprotection-status-box.mjs";
-
 /**
- * Custom element that implements the state UI for the status card.
+ * Custom element that implements a status card for IP protection.
  */
 export default class IPProtectionStatusBox extends MozLitElement {
   static queries = {
@@ -85,17 +82,8 @@ export default class IPProtectionStatusBox extends MozLitElement {
           <slot name="icon"></slot>
         </span>
         <div id="content">
-          ${this.descriptionL10nId
-            ? html`<span
-                id="description"
-                data-l10n-id=${this.descriptionL10nId}
-              ></span>`
-            : null}
-          <slot name="bandwidth"></slot>
-          <div id="location">
-            <slot name="location-icon"></slot>
-            <slot name="location"></slot>
-          </div>
+          <span id="description" data-l10n-id=${this.descriptionL10nId}></span>
+          <slot name="location"></slot>
         </div>
         <slot name="action"></slot>
         <slot name="content"></slot>
diff --git a/browser/components/ipprotection/content/ipprotection-status-card.mjs b/browser/components/ipprotection/content/ipprotection-status-card.mjs
index 43d51170f4f98..36f246f89911e 100644
--- a/browser/components/ipprotection/content/ipprotection-status-card.mjs
+++ b/browser/components/ipprotection/content/ipprotection-status-card.mjs
@@ -3,7 +3,11 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import { MozLitElement } from "chrome://global/content/lit-utils.mjs";
-import { html } from "chrome://global/content/vendor/lit.all.mjs";
+import {
+  html,
+  classMap,
+  styleMap,
+} from "chrome://global/content/vendor/lit.all.mjs";
 
 // eslint-disable-next-line import/no-unassigned-import
 import "chrome://global/content/elements/moz-toggle.mjs";
@@ -18,8 +22,10 @@ export default class IPProtectionStatusCard extends MozLitElement {
   TOGGLE_OFF_EVENT = "ipprotection-status-card:user-toggled-off";
 
   static queries = {
-    statusBoxEl: "ipprotection-status-box",
-    actionButtonEl: 'moz-button[slot="action"]',
+    statusGroupEl: "#status-card",
+    connectionToggleEl: "#connection-toggle",
+    connectionButtonEl: "#connection-toggle-button",
+    locationEl: "#location-wrapper",
   };
 
   static shadowRootOptions = {
@@ -29,8 +35,12 @@ export default class IPProtectionStatusCard extends MozLitElement {
 
   static properties = {
     protectionEnabled: { type: Boolean },
+    canShowTime: { type: Boolean },
     enabledSince: { type: Object },
     location: { type: Object },
+    // Track toggle state separately so that we can tell when the toggle
+    // is enabled because of the existing protection state or because of user action.
+    _toggleEnabled: { type: Boolean, state: true },
     bandwidthUsage: { type: Object },
   };
 
@@ -50,8 +60,32 @@ export default class IPProtectionStatusCard extends MozLitElement {
     this.removeEventListener("keydown", this.keyListener, { capture: true });
   }
 
-  handleButtonClick() {
-    if (!this.protectionEnabled) {
+  handleToggleConnect(event) {
+    let isEnabled = event.target.pressed;
+
+    if (isEnabled) {
+      this.dispatchEvent(
+        new CustomEvent(this.TOGGLE_ON_EVENT, {
+          bubbles: true,
+          composed: true,
+        })
+      );
+    } else {
+      this.dispatchEvent(
+        new CustomEvent(this.TOGGLE_OFF_EVENT, {
+          bubbles: true,
+          composed: true,
+        })
+      );
+    }
+
+    this._toggleEnabled = isEnabled;
+  }
+
+  handleOnOffButtonClick() {
+    let isEnabled = !this._toggleEnabled;
+
+    if (isEnabled) {
       this.dispatchEvent(
         new CustomEvent(this.TOGGLE_ON_EVENT, {
           bubbles: true,
@@ -66,11 +100,12 @@ export default class IPProtectionStatusCard extends MozLitElement {
         })
       );
     }
+
+    this._toggleEnabled = isEnabled;
   }
 
   focus() {
-    const button = this.shadowRoot.querySelector(`moz-button[slot="action"]`);
-    button?.focus();
+    this.connectionToggleEl?.focus();
   }
 
   #keyListener(event) {
@@ -97,79 +132,105 @@ export default class IPProtectionStatusCard extends MozLitElement {
     }
   }
 
-  bandwidthUsageTemplate() {
-    return this.bandwidthUsage
-      ? html`<bandwidth-usage
-          slot="bandwidth"
-          value=${this.bandwidthUsage.currentBandwidthUsage}
-          max=${this.bandwidthUsage.maxBandwidth}
-          numeric
-        ></bandwidth-usage>`
-      : null;
+  updated(changedProperties) {
+    super.updated(changedProperties);
+
+    // If the toggle state isn't set, do so now and let it
+    // match the protection state.
+    if (!changedProperties.has("_toggleEnabled")) {
+      this._toggleEnabled = this.protectionEnabled;
+    }
+
+    if (!this.protectionEnabled && this._toggleEnabled) {
+      // After pressing the toggle, if somehow protection was turned off
+      // (eg. error thrown), unset the toggle.
+      this._toggleEnabled = false;
+    }
   }
 
-  locationTemplate() {
-    return this.location
-      ? html` <img
-            slot="location-icon"
-            role="presentation"
-            src="chrome://browser/skin/notification-icons/geo.svg"
-          />
-          <span slot="location">${this.location.name}</span>`
-      : null;
+  cardContentTemplate() {
+    const statusCardL10nId = this.protectionEnabled
+      ? "ipprotection-connection-status-on"
+      : "ipprotection-connection-status-off";
+    const toggleL10nId = this.protectionEnabled
+      ? "ipprotection-toggle-active"
+      : "ipprotection-toggle-inactive";
+    const toggleButtonType = this.protectionEnabled ? "secondary" : "primary";
+    const toggleButtonL10nId = this.protectionEnabled
+      ? "ipprotection-button-turn-vpn-off"
+      : "ipprotection-button-turn-vpn-on";
+
+    return html` <link
+        rel="stylesheet"
+        href="chrome://browser/content/ipprotection/ipprotection-status-card.css"
+      />
+      <moz-box-group class="vpn-status-group">
+        <moz-box-item
+          id="status-card"
+          class=${classMap({
+            "is-enabled": this.protectionEnabled,
+          })}
+          layout="default"
+          data-l10n-id=${statusCardL10nId}
+          .description=${this.cardDescriptionTemplate()}
+        >
+          <moz-toggle
+            id="connection-toggle"
+            data-l10n-id=${toggleL10nId}
+            @click=${this.handleToggleConnect}
+            ?pressed=${this._toggleEnabled}
+            slot="actions"
+          ></moz-toggle>
+        </moz-box-item>
+      </moz-box-group>
+      <moz-button
+        type=${toggleButtonType}
+        id="connection-toggle-button"
+        data-l10n-id=${toggleButtonL10nId}
+        @click=${this.handleOnOffButtonClick}
+        hidden
+      >
+      </moz-button>`;
   }
 
-  statusTemplate({
-    type,
-    headerL10nId,
-    buttonL10nId,
-    buttonType = "default",
-    buttonDisabled = false,
-    iconSrc = null,
-  }) {
+  cardDescriptionTemplate() {
+    // To work around mox-box-item description elements being hard to reach because of the shadowDOM,
+    // let's use a lit stylemap to apply style changes directly.
+    let labelStyles = styleMap({
+      display: "flex",
+      gap: "var(--space-small)",
+    });
+    let imgStyles = styleMap({
+      "-moz-context-properties": "fill",
+      fill: "currentColor",
+    });
+
     return html`
-      <ipprotection-status-box .headerL10nId=${headerL10nId} .type=${type}>
-        ${iconSrc
-          ? html`<img
-              slot="icon"
-              role="presentation"
-              class="icon"
-              src=${iconSrc}
-            />`
+      <div id="vpn-details">
+        ${this.bandwidthUsage
+          ? html`<bandwidth-usage
+              value=${this.bandwidthUsage.currentBandwidthUsage}
+              max=${this.bandwidthUsage.maxBandwidth}
+              numeric
+            ></bandwidth-usage>`
           : null}
-        ${this.bandwidthUsageTemplate()} ${this.locationTemplate()}
-        <moz-button
-          slot="action"
-          type=${buttonType}
-          data-l10n-id=${buttonL10nId}
-          @click=${this.handleButtonClick}
-          ?disabled=${buttonDisabled}
-        ></moz-button>
-      </ipprotection-status-box>
+        ${this.location
+          ? html`<div id="location-label" style=${labelStyles}>
+              <span>${this.location.name}</span>
+              <img
+                src="chrome://global/skin/icons/info.svg"
+                data-l10n-id="ipprotection-location-title"
+                style=${imgStyles}
+              />
+            </div>`
+          : null}
+      </div>
     `;
   }
 
   render() {
-    if (this.protectionEnabled) {
-      return html`
-        ${this.statusTemplate({
-          type: "connected",
-          headerL10nId: "ipprotection-connection-status-connected",
-          buttonL10nId: "ipprotection-button-turn-vpn-off",
-          iconSrc:
-            "chrome://browser/content/ipprotection/assets/states/ipprotection-on.svg",
-        })}
-      `;
-    }
-
-    return html`
-      ${this.statusTemplate({
-        type: "disconnected",
-        headerL10nId: "ipprotection-connection-status-disconnected",
-        buttonL10nId: "ipprotection-button-turn-vpn-on",
-        buttonType: "primary",
-      })}
-    `;
+    let content = this.cardContentTemplate();
+    return html`${content}`;
   }
 }
 
diff --git a/browser/components/ipprotection/tests/browser/browser_IPProtectionService.js b/browser/components/ipprotection/tests/browser/browser_IPProtectionService.js
index ed208a40de615..2274317ef04a7 100644
--- a/browser/components/ipprotection/tests/browser/browser_IPProtectionService.js
+++ b/browser/components/ipprotection/tests/browser/browser_IPProtectionService.js
@@ -159,9 +159,11 @@ add_task(
 
     let statusCard = content.statusCardEl;
 
-    // User is already signed in so the turn on button should be available.
-    let turnOnButton = statusCard?.actionButtonEl;
-    Assert.ok(turnOnButton, "Status card turn on button should be present");
+    // User is already signed in so the toggle should be available.
+    Assert.ok(
+      statusCard?.connectionToggleEl,
+      "Status card connection toggle should be present"
+    );
 
     cleanupService();
     await cleanupAlpha();
@@ -281,11 +283,16 @@ add_task(async function test_IPProtectionService_pass_errors() {
 
   let statusCard = content.statusCardEl;
 
-  let turnOnButton = statusCard.actionButtonEl;
+  let toggleChangedPromise = BrowserTestUtils.waitForMutationCondition(
+    statusCard.shadowRoot,
+    { childList: true, subtree: true },
+    () => !statusCard.toggleEnabled
+  );
 
-  turnOnButton.click();
+  statusCard.connectionToggleEl.click();
 
   await messageBarLoadedPromise;
+  await toggleChangedPromise;
 
   Assert.equal(
     IPPProxyManager.state,
@@ -296,8 +303,8 @@ add_task(async function test_IPProtectionService_pass_errors() {
   let messageBar = content.shadowRoot.querySelector("ipprotection-message-bar");
 
   Assert.ok(
-    turnOnButton,
-    "Turn on button is still present because of an error"
+    !statusCard.connectionToggleEl.pressed,
+    "Toggle is still turned off because of an error"
   );
   Assert.ok(messageBar, "Message bar should be present");
   Assert.equal(
@@ -349,8 +356,7 @@ add_task(async function test_IPProtectionService_retry_errors() {
     false,
     () => !!IPPProxyManager.activatedAt
   );
-  let turnOnButton = statusCard.actionButtonEl;
-  turnOnButton.click();
+  statusCard.connectionToggleEl.click();
 
   await startedEventPromise;
 
@@ -382,8 +388,10 @@ add_task(async function test_IPProtectionService_stop_on_signout() {
     BrowserTestUtils.isVisible(content),
     "ipprotection content component should be present"
   );
-  let turnOnButton = statusCard.actionButtonEl;
-  Assert.ok(turnOnButton, "Status card turn on button should be present");
+  Assert.ok(
+    statusCard.connectionToggleEl,
+    "Status card connection toggle should be present"
+  );
 
   let startedEventPromise = BrowserTestUtils.waitForEvent(
     IPPProxyManager,
@@ -391,7 +399,7 @@ add_task(async function test_IPProtectionService_stop_on_signout() {
     false,
     () => !!IPPProxyManager.activatedAt
   );
-  turnOnButton.click();
+  statusCard.connectionToggleEl.click();
 
   await startedEventPromise;
 
@@ -448,18 +456,19 @@ add_task(async function test_IPProtectionService_reload() {
     BrowserTestUtils.isVisible(content),
     "ipprotection content component should be present"
   );
-  let turnOnButton = statusCard.actionButtonEl;
-  Assert.ok(turnOnButton, "Status card turn on button should be present");
+  Assert.ok(
+    statusCard.connectionToggleEl,
+    "Status card connection toggle should be present"
+  );
 
   let tabReloaded = waitForTabReloaded(gBrowser.selectedTab);
-  turnOnButton.click();
+  statusCard.connectionToggleEl.click();
   await tabReloaded;
 
   Assert.equal(IPPProxyManager.state, IPPProxyStates.ACTIVE, "Proxy is active");
 
   tabReloaded = waitForTabReloaded(gBrowser.selectedTab);
-  let turnOffButton = statusCard.actionButtonEl;
-  turnOffButton.click();
+  statusCard.connectionToggleEl.click();
   await tabReloaded;
 
   Assert.notStrictEqual(
diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_keyboard_navigation.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_keyboard_navigation.js
index a6d1c50387349..ff078785caf29 100644
--- a/browser/components/ipprotection/tests/browser/browser_ipprotection_keyboard_navigation.js
+++ b/browser/components/ipprotection/tests/browser/browser_ipprotection_keyboard_navigation.js
@@ -60,9 +60,8 @@ add_task(async function test_keyboard_navigation_in_panel() {
   );
 
   let statusCard = content.statusCardEl;
-  let turnOnButton = statusCard.actionButtonEl;
 
-  await expectFocusAfterKey("Tab", turnOnButton);
+  await expectFocusAfterKey("Tab", statusCard.connectionToggleEl);
 
   await expectFocusAfterKey("Tab", content.settingsButtonEl);
 
@@ -73,7 +72,7 @@ add_task(async function test_keyboard_navigation_in_panel() {
       `#${IPProtectionPanel.HEADER_BUTTON_ID}`
     )
   );
-  await expectFocusAfterKey("Tab", turnOnButton);
+  await expectFocusAfterKey("Tab", statusCard.connectionToggleEl);
 
   await expectFocusAfterKey("Tab", content.settingsButtonEl);
 
@@ -84,7 +83,7 @@ add_task(async function test_keyboard_navigation_in_panel() {
       `#${IPProtectionPanel.HEADER_BUTTON_ID}`
     )
   );
-  await expectFocusAfterKey("ArrowDown", turnOnButton);
+  await expectFocusAfterKey("ArrowDown", statusCard.connectionToggleEl);
 
   // Loop backwards
   await expectFocusAfterKey(
diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js
index db1a7a3b3ea58..deaa24dcccc83 100644
--- a/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js
+++ b/browser/components/ipprotection/tests/browser/browser_ipprotection_status_card.js
@@ -9,17 +9,17 @@ const { LINKS } = ChromeUtils.importESModule(
 );
 const lazy = {};
 
-const mockLocation = {
-  name: "United States",
-  code: "us",
-};
-
-const mockBandwidthUsage = {
-  currentBandwidthUsage: 50,
-  maxBandwidth: 150,
-};
+ChromeUtils.defineESModuleGetters(lazy, {
+  IPProtectionWidget:
+    "moz-src:///browser/components/ipprotection/IPProtection.sys.mjs",
+  IPProtectionPanel:
+    "moz-src:///browser/components/ipprotection/IPProtectionPanel.sys.mjs",
+});
 
-async function setupStatusCardTest() {
+/**
+ * Tests UI updates to the status card in the panel after enable/disables.
+ */
+add_task(async function test_status_card_in_panel() {
   setupService({
     isSignedIn: true,
     isEnrolledAndEntitled: true,
@@ -32,65 +32,127 @@ async function setupStatusCardTest() {
   });
   await IPPEnrollAndEntitleManager.refetchEntitlement();
 
+  const l10nIdOn = "ipprotection-connection-status-on";
+  const l10nIdOff = "ipprotection-connection-status-off";
+  const mockLocation = {
+    name: "United States",
+    code: "us",
+  };
+
   await SpecialPowers.pushPrefEnv({
     set: [["browser.ipProtection.bandwidth.enabled", true]],
   });
-}
 
-async function cleanupStatusCardTest() {
-  cleanupService();
-  await SpecialPowers.popPrefEnv();
-}
+  let content = await openPanel({
+    location: mockLocation,
+    bandwidthUsage: { currentBandwidthUsage: 50, maxBandwidth: 150 },
+  });
+
+  Assert.ok(
+    BrowserTestUtils.isVisible(content),
+    "ipprotection content component should be present"
+  );
+
+  let statusCard = content.statusCardEl;
+  Assert.ok(content.statusCardEl, "ipprotection-status-card should be present");
+
+  Assert.equal(
+    statusCard?.statusGroupEl.getAttribute("data-l10n-id"),
+    l10nIdOff,
+    "Status card connection toggle data-l10n-id should be correct by default"
+  );
+
+  const locationEl =
+    statusCard.statusGroupEl.shadowRoot.querySelector("#location-label");
 
-function checkLocationAndBandwidth(statusBoxEl, location, bandwidth) {
-  const locationEl = statusBoxEl.shadowRoot
-    .querySelector(`slot[name="location"]`)
-    .assignedElements()[0];
   Assert.ok(
     BrowserTestUtils.isVisible(locationEl),
     "Location element should be present and visible"
   );
   Assert.equal(
     locationEl.textContent.trim(),
-    location.name,
+    mockLocation.name,
     "Location element should be showing correct location"
   );
 
-  const bandwidthEl = statusBoxEl.shadowRoot
-    .querySelector(`slot[name="bandwidth"]`)
-    .assignedElements()[0];
+  // Set state as if protection is enabled
+  await setPanelState({
+    location: mockLocation,
+    isProtectionEnabled: true,
+  });
+
+  content.requestUpdate();
+
+  await content.updateComplete;
+
+  Assert.equal(
+    statusCard?.statusGroupEl.getAttribute("data-l10n-id"),
+    l10nIdOn,
+    "Status card connection toggle data-l10n-id should be correct when protection is enabled"
+  );
+
+  const bandwidthEl =
+    statusCard.statusGroupEl.shadowRoot.querySelector("bandwidth-usage");
   Assert.ok(
     BrowserTestUtils.isVisible(bandwidthEl),
     "bandwidth-usage should be present and visible"
   );
-  Assert.equal(
-    bandwidthEl.value,
-    bandwidth.currentBandwidthUsage,
-    `Bandwidth should have ${bandwidth.currentBandwidthUsage} GB used`
-  );
+  Assert.equal(bandwidthEl.value, 50, "Bandwidth should have 50 GB used");
   Assert.equal(
     bandwidthEl.bandwidthLeft,
-    bandwidth.maxBandwidth - bandwidth.currentBandwidthUsage,
-    `Bandwidth should have ${bandwidth.maxBandwidth - bandwidth.currentBandwidthUsage} GB left`
+    100,
+    "Bandwidth should have 100 GB left"
   );
   Assert.equal(
     bandwidthEl.max,
-    bandwidth.maxBandwidth,
-    `Bandwidth should have a max value of ${bandwidth.maxBandwidth}`
+    150,
+    "Bandwidth should have a max value of 150"
   );
-}
+
+  await closePanel();
+  cleanupService();
+});
 
 /**
- * Tests the disconnected state UI.
+ * Tests that the correct IPProtection events are dispatched on toggle.
  */
-add_task(async function test_status_card_disconnected() {
-  await setupStatusCardTest();
+add_task(async function test_ipprotection_events_on_toggle() {
+  // These events are different from the ones sent by
+  // ipprotection-status-card. The prefixed "IPProtection:" events
+  // actually change the connection state in the service when dispatched.
+  // If the IPProtection events are sent, then we know that the status-card
+  // events worked.
+  const userEnableEventName = "IPProtection:UserEnable";
+  const userDisableEventName = "IPProtection:UserDisable";
 
-  let content = await openPanel({
-    location: mockLocation,
-    isProtectionEnabled: false,
-    bandwidthUsage: mockBandwidthUsage,
+  // Reset service state.
+  cleanupService();
+  IPProtectionService.updateState();
+
+  setupService({
+    isSignedIn: true,
+    isEnrolledAndEntitled: true,
+    canEnroll: true,
+    proxyPass: {
+      status: 200,
+      error: undefined,
+      pass: makePass(),
+    },
   });
+  await IPPEnrollAndEntitleManager.refetchEntitlement();
+
+  let button = document.getElementById(lazy.IPProtectionWidget.WIDGET_ID);
+  let panelView = PanelMultiView.getViewNode(
+    document,
+    lazy.IPProtectionWidget.PANEL_ID
+  );
+
+  let panelShownPromise = waitForPanelEvent(document, "popupshown");
+  // Open the panel
+  button.click();
+  await panelShownPromise;
+
+  let content = panelView.querySelector(lazy.IPProtectionPanel.CONTENT_TAGNAME);
 
   Assert.ok(
     BrowserTestUtils.isVisible(content),
@@ -98,57 +160,80 @@ add_task(async function test_status_card_disconnected() {
   );
 
   let statusCard = content.statusCardEl;
-  Assert.ok(content.statusCardEl, "ipprotection-status-card should be present");
 
-  let statusBoxEl = statusCard.statusBoxEl;
-  Assert.ok(statusBoxEl, "Status box should be present");
+  Assert.ok(statusCard, "Status card should be present");
 
-  checkLocationAndBandwidth(statusBoxEl, mockLocation, mockBandwidthUsage);
+  let toggle = statusCard?.connectionToggleEl;
+  Assert.ok(toggle, "Status card connection toggle should be present");
 
-  const turnOnButtonEl = statusCard.actionButtonEl;
-  Assert.ok(turnOnButtonEl, "Button to turn on VPN should be present");
-
-  await closePanel();
-  await cleanupStatusCardTest();
-});
-
-/**
- * Tests the connected state UI.
- */
-add_task(async function test_status_card_connected() {
-  await setupStatusCardTest();
+  let startedProxyPromise = BrowserTestUtils.waitForEvent(
+    IPPProxyManager,
+    "IPPProxyManager:StateChanged",
+    false,
+    () => !!IPPProxyManager.activatedAt
+  );
+  let enableEventPromise = BrowserTestUtils.waitForEvent(
+    window,
+    userEnableEventName
+  );
 
-  let content = await openPanel({
-    location: mockLocation,
-    isProtectionEnabled: true,
-    bandwidthUsage: mockBandwidthUsage,
-  });
+  toggle.click();
+  info("Clicked toggle to turn VPN on");
 
+  await Promise.all([startedProxyPromise, enableEventPromise]);
   Assert.ok(
-    BrowserTestUtils.isVisible(content),
-    "ipprotection content component should be present"
+    true,
+    "Enable event and proxy started event were found after clicking the toggle"
   );
 
-  let statusCard = content.statusCardEl;
-  Assert.ok(content.statusCardEl, "ipprotection-status-card should be present");
+  let userEnabledPref = Services.prefs.getBoolPref(
+    "browser.ipProtection.userEnabled",
+    false
+  );
+  Assert.equal(userEnabledPref, true, "userEnabled pref should be set to true");
 
-  let statusBoxEl = statusCard.statusBoxEl;
-  Assert.ok(statusBoxEl, "Status box should be present");
+  let stoppedProxyPromise = BrowserTestUtils.waitForEvent(
+    IPPProxyManager,
+    "IPPProxyManager:StateChanged",
+    false,
+    () => !IPPProxyManager.activatedAt
+  );
+  let disableEventPromise = BrowserTestUtils.waitForEvent(
+    window,
+    userDisableEventName
+  );
 
-  checkLocationAndBandwidth(statusBoxEl, mockLocation, mockBandwidthUsage);
+  toggle = statusCard?.connectionToggleEl;
+  toggle.click();
+  info("Clicked toggle to turn VPN off");
 
-  const turnOffVPNButtonEl = statusCard.actionButtonEl;
-  Assert.ok(turnOffVPNButtonEl, "Button to turn off VPN should be present");
+  await Promise.all([stoppedProxyPromise, disableEventPromise]);
+  Assert.ok(
+    true,
+    "Disable event and stopped proxy event were found after clicking the toggle"
+  );
 
-  await closePanel();
-  await cleanupStatusCardTest();
+  userEnabledPref = Services.prefs.getBoolPref(
+    "browser.ipProtection.userEnabled",
+    true
+  );
+  Assert.equal(
+    userEnabledPref,
+    false,
+    "userEnabled pref should be set to false"
+  );
+
+  // Close the panel
+  let panelHiddenPromise = waitForPanelEvent(document, "popuphidden");
+  EventUtils.synthesizeKey("KEY_Escape");
+  await panelHiddenPromise;
+  cleanupService();
 });
 
 /**
- * Tests that the correct IPProtection events are dispatched when
- * we enable or disable VPN protection.
+ * Tests that the correct IPProtection events are dispatched on button click.
  */
-add_task(async function test_ipprotection_events_on_toggle() {
+add_task(async function test_ipprotection_events_on_button_click() {
   // These events are different from the ones sent by
   // ipprotection-status-card. The prefixed "IPProtection:" events
   // actually change the connection state in the service when dispatched.
@@ -161,13 +246,30 @@ add_task(async function test_ipprotection_events_on_toggle() {
   cleanupService();
   IPProtectionService.updateState();
 
-  await setupStatusCardTest();
-
-  let content = await openPanel({
-    location: mockLocation,
-    isProtectionEnabled: false,
-    bandwidthUsage: mockBandwidthUsage,
+  setupService({
+    isSignedIn: true,
+    isEnrolledAndEntitled: true,
+    canEnroll: true,
+    proxyPass: {
+      status: 200,
+      error: undefined,
+      pass: makePass(),
+    },
   });
+  await IPPEnrollAndEntitleManager.refetchEntitlement();
+
+  let button = document.getElementById(lazy.IPProtectionWidget.WIDGET_ID);
+  let panelView = PanelMultiView.getViewNode(
+    document,
+    lazy.IPProtectionWidget.PANEL_ID
+  );
+
+  let panelShownPromise = waitForPanelEvent(document, "popupshown");
+  // Open the panel
+  button.click();
+  await panelShownPromise;
+
+  let content = panelView.querySelector(lazy.IPProtectionPanel.CONTENT_TAGNAME);
 
   Assert.ok(
     BrowserTestUtils.isVisible(content),
@@ -175,14 +277,21 @@ add_task(async function test_ipprotection_events_on_toggle() {
   );
 
   let statusCard = content.statusCardEl;
-  Assert.ok(content.statusCardEl, "ipprotection-status-card should be present");
 
-  let statusBoxEl = statusCard.statusBoxEl;
-  Assert.ok(statusBoxEl, "Status box should be present");
+  await BrowserTestUtils.waitForMutationCondition(
+    content.shadowRoot,
+    { childList: true, subtree: true },
+    () => content.statusCardEl
+  );
 
-  // Now click "Turn on"
-  let turnOnVPNButtonEl = statusCard.actionButtonEl;
-  Assert.ok(turnOnVPNButtonEl, "Button to turn on VPN should be present");
+  Assert.ok(statusCard, "Status card should be present");
+
+  let connectionButton = statusCard?.connectionButtonEl;
+  connectionButton.hidden = false;
+  Assert.ok(
+    connectionButton,
+    "Status card connection button should be present"
+  );
 
   let startedProxyPromise = BrowserTestUtils.waitForEvent(
     IPPProxyManager,
@@ -195,10 +304,10 @@ add_task(async function test_ipprotection_events_on_toggle() {
     userEnableEventName
   );
 
-  turnOnVPNButtonEl.click();
+  connectionButton.click();
+  info("Clicked toggle to turn VPN on");
 
   await Promise.all([startedProxyPromise, enableEventPromise]);
-
   Assert.ok(
     true,
     "Enable event and proxy started event were found after clicking the toggle"
@@ -210,10 +319,6 @@ add_task(async function test_ipprotection_events_on_toggle() {
   );
   Assert.equal(userEnabledPref, true, "userEnabled pref should be set to true");
 
-  // Now click "Turn off"
-  let turnOffVPNButtonEl = statusCard.actionButtonEl;
-  Assert.ok(turnOffVPNButtonEl, "Button to turn off VPN should be present");
-
   let stoppedProxyPromise = BrowserTestUtils.waitForEvent(
     IPPProxyManager,
     "IPPProxyManager:StateChanged",
@@ -225,7 +330,9 @@ add_task(async function test_ipprotection_events_on_toggle() {
     userDisableEventName
   );
 
-  turnOffVPNButtonEl.click();
+  connectionButton = statusCard?.connectionButtonEl;
+  connectionButton.click();
+  info("Clicked toggle to turn VPN off");
 
   await Promise.all([stoppedProxyPromise, disableEventPromise]);
   Assert.ok(
@@ -243,6 +350,11 @@ add_task(async function test_ipprotection_events_on_toggle() {
     "userEnabled pref should be set to false"
   );
 
-  await closePanel();
-  await cleanupStatusCardTest();
+  connectionButton.hidden = true;
+
+  // Close the panel
+  let panelHiddenPromise = waitForPanelEvent(document, "popuphidden");
+  EventUtils.synthesizeKey("KEY_Escape");
+  await panelHiddenPromise;
+  cleanupService();
 });
diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_telemetry.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_telemetry.js
index d5abd2714cced..9f7c556d6b41b 100644
--- a/browser/components/ipprotection/tests/browser/browser_ipprotection_telemetry.js
+++ b/browser/components/ipprotection/tests/browser/browser_ipprotection_telemetry.js
@@ -62,8 +62,8 @@ add_task(async function user_toggle_on_and_off() {
 
   let statusCard = content.shadowRoot.querySelector("ipprotection-status-card");
 
-  let turnOnButton = statusCard.actionButtonEl;
-  Assert.ok(turnOnButton, "Status card turn on button should be present");
+  let toggle = statusCard.connectionToggleEl;
+  Assert.ok(toggle, "Status card connection toggle should be present");
 
   Services.fog.testResetFOG();
   await Services.fog.testFlushAllChildren();
@@ -73,8 +73,8 @@ add_task(async function user_toggle_on_and_off() {
     false,
     () => !!IPPProxyManager.activatedAt
   );
-  // Turn the VPN on
-  turnOnButton.click();
+  // Toggle the VPN on
+  toggle.click();
   await vpnOnPromise;
   let toggledEvents = Glean.ipprotection.toggled.testGetValue();
   Assert.equal(toggledEvents.length, 1, "should have recorded a toggle");
@@ -89,9 +89,8 @@ add_task(async function user_toggle_on_and_off() {
     false,
     () => !IPPProxyManager.activatedAt
   );
-  // Turn the VPN off
-  let turnOffButton = statusCard.actionButtonEl;
-  turnOffButton.click();
+  // Toggle the VPN off
+  toggle.click();
   await vpnOffPromise;
   toggledEvents = Glean.ipprotection.toggled.testGetValue();
   Assert.equal(toggledEvents.length, 2, "should have recorded a second toggle");
@@ -150,8 +149,8 @@ add_task(async function toggle_off_on_shutdown() {
   await putServerInRemoteSettings();
 
   let statusCard = content.statusCardEl;
-  let turnOnButton = statusCard.actionButtonEl;
-  Assert.ok(turnOnButton, "Status card turn on button should be present");
+  let toggle = statusCard.connectionToggleEl;
+  Assert.ok(toggle, "Status card connection toggle should be present");
 
   Services.fog.testResetFOG();
 
@@ -161,8 +160,8 @@ add_task(async function toggle_off_on_shutdown() {
     false,
     () => !!IPPProxyManager.activatedAt
   );
-  // Turn the VPN on
-  turnOnButton.click();
+  // Toggle the VPN on
+  toggle.click();
   await vpnOnPromise;
   let toggledEvents = Glean.ipprotection.toggled.testGetValue();
   Assert.equal(toggledEvents.length, 1, "should have recorded a toggle");
diff --git a/browser/components/ipprotection/tests/browser/browser_ipprotection_toolbar.js b/browser/components/ipprotection/tests/browser/browser_ipprotection_toolbar.js
index 3c9b37672ce33..fb7b2e34e9d46 100644
--- a/browser/components/ipprotection/tests/browser/browser_ipprotection_toolbar.js
+++ b/browser/components/ipprotection/tests/browser/browser_ipprotection_toolbar.js
@@ -86,8 +86,8 @@ add_task(async function toolbar_icon_status() {
   Assert.ok(content, "Panel content should be present");
 
   let statusCard = content.statusCardEl;
-  let turnOnButton = statusCard.actionButtonEl;
-  Assert.ok(turnOnButton, "Status card turn on button should be present");
+  let toggle = statusCard.connectionToggleEl;
+  Assert.ok(toggle, "Status card connection toggle should be present");
 
   let vpnOnPromise = BrowserTestUtils.waitForEvent(
     lazy.IPPProxyManager,
@@ -95,8 +95,8 @@ add_task(async function toolbar_icon_status() {
     false,
     () => !!IPPProxyManager.activatedAt
   );
-  // Turn the VPN on
-  turnOnButton.click();
+  // Toggle the VPN on
+  toggle.click();
   await vpnOnPromise;
   Assert.ok(
     button.classList.contains("ipprotection-on"),
@@ -108,9 +108,8 @@ add_task(async function toolbar_icon_status() {
     false,
     () => lazy.IPProtectionService.state === lazy.IPProtectionStates.READY
   );
-  // Turn the VPN off
-  let turnOffButton = statusCard.actionButtonEl;
-  turnOffButton.click();
+  // Toggle the VPN off
+  toggle.click();
   await vpnOffPromise;
   Assert.ok(
     !button.classList.contains("ipprotection-on"),
@@ -143,10 +142,9 @@ add_task(async function toolbar_icon_status_new_window() {
     false,
     () => !!IPPProxyManager.activatedAt
   );
-  // Turn the VPN on
+  // Toggle the VPN on
   let statusCard = content.statusCardEl;
-  let turnOnButton = statusCard.actionButtonEl;
-  turnOnButton.click();
+  statusCard.connectionToggleEl.click();
   await vpnOnPromise;
 
   let button = document.getElementById(IPProtectionWidget.WIDGET_ID);
diff --git a/browser/locales-preview/ipProtection.ftl b/browser/locales-preview/ipProtection.ftl
index 48895b7311cfb..bd1c28c4a877b 100644
--- a/browser/locales-preview/ipProtection.ftl
+++ b/browser/locales-preview/ipProtection.ftl
@@ -49,8 +49,22 @@ ipprotection-settings-link =
 
 ## Status card
 
-ipprotection-connection-status-connected = VPN is on
-ipprotection-connection-status-disconnected = VPN is off
+ipprotection-connection-status-on =
+  .label = VPN is on
+ipprotection-connection-status-off =
+  .label = VPN is off
+
+# The panel status card has a header, as well as VPN server location name displayed under it when the VPN is on.
+# Location refers to the VPN server geographical position.
+ipprotection-location-title =
+  .title = Location selected based on fastest server
+
+# When VPN is toggled on
+ipprotection-toggle-active =
+  .aria-label = Turn VPN off
+# When VPN is toggled off
+ipprotection-toggle-inactive =
+  .aria-label = Turn VPN on
 
 # Button to turn off the VPN
 ipprotection-button-turn-vpn-off = Turn off VPN

From 8d8cb89b010e9214fdb87a915511f265eeb06530 Mon Sep 17 00:00:00 2001
From: Alex Hochheiden <ahochheiden@mozilla.com>
Date: Thu, 29 Jan 2026 18:27:20 +0000
Subject: [PATCH 116/116] Bug 2009742 - Add missing `terser` toolchain to
 searchfox opt tasks r=RyanVM

Differential Revision: https://phabricator.services.mozilla.com/D281024
---
 taskcluster/kinds/searchfox/kind.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/taskcluster/kinds/searchfox/kind.yml b/taskcluster/kinds/searchfox/kind.yml
index 80c8cfc8f0aa5..c420ab42fa7a1 100644
--- a/taskcluster/kinds/searchfox/kind.yml
+++ b/taskcluster/kinds/searchfox/kind.yml
@@ -69,6 +69,7 @@ tasks:
                 - linux64-pkgconf
                 - sysroot-x86_64-linux-gnu
                 - sysroot-wasm32-wasi
+                - terser
 
     linux64-searchfox/debug:
         description: "Linux64 Debug Searchfox"
@@ -163,6 +164,7 @@ tasks:
                 - macosx64-sdk
                 - sysroot-x86_64-linux-gnu
                 - sysroot-wasm32-wasi
+                - terser
 
     macosx64-aarch64-searchfox/debug:
         description: "MacOS X aarch64 Debug Cross-compile Searchfox"
@@ -267,6 +269,7 @@ tasks:
                 - nsis
                 - sysroot-x86_64-linux-gnu
                 - sysroot-wasm32-wasi
+                - terser
                 - vs
                 - dxc-x86_64-pc-windows-msvc
                 - winappsdk-x86_64-pc-windows-msvc